Merge pull request #248 from yaso-meth/NEW--MIH-Color-Alignment

NEW--MIH-Color-Alignment

Frontend/Dockerfile

@@ -6,13 +6,13 @@ FROM debian:latest AS build-env
 
 RUN apt-get update --fix-missing
 
-RUN apt-get install -y curl git wget unzip libgconf-2-4 gdb libstdc++6 libglu1-mesa fonts-droid-fallback
+RUN apt-get install -y curl git wget unzip gdb libstdc++6 libglu1-mesa fonts-droid-fallback
+# RUN apt-get install -y curl git wget unzip libgconf-2-4 gdb libstdc++6 libglu1-mesa fonts-droid-fallback
 RUN apt-get install python3 -y
-# RUN apt-get update --fix-missing
+
-# RUN apt-get install python3-Jinja2
 # download Flutter SDK from Flutter Github repo
-RUN git clone -b stable https://github.com/flutter/flutter.git /usr/local/flutter
+RUN git clone -b flutter-3.32-candidate.0 https://github.com/flutter/flutter.git /usr/local/flutter
-#RUN git clone https://github.com/flutter/flutter.git /usr/local/flutter
+# RUN git clone -b stable https://github.com/flutter/flutter.git /usr/local/flutter
 
 # Set flutter environment path
 ENV PATH="/usr/local/flutter/bin:/usr/local/flutter/bin/cache/dart-sdk/bin:${PATH}"
@@ -21,17 +21,13 @@ ENV PATH="/usr/local/flutter/bin:/usr/local/flutter/bin/cache/dart-sdk/bin:${PAT
 RUN flutter doctor -v
 
 # Enable flutter web
-RUN flutter channel stable
+RUN flutter channel flutter-3.32-candidate.0
-# RUN flutter upgrade
+# RUN flutter channel stable
-#RUN flutter pub add web:^0.5.0
 RUN flutter config --enable-web
 
 # Copy files to container and build
 RUN mkdir /app/
 COPY . /app/
-# COPY ./server/MIH_web_server.py /app/build/web/
-# VOLUME ["/app"]
-
 
 WORKDIR /app
 # RUN flutter upgrade

Frontend/lib/main.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'mih_config/mih_env.dart';
 import 'mih_config/mih_routeGenerator.dart';
 import 'mih_config/mih_theme.dart';
@@ -20,7 +21,7 @@ class _MzansiInnovationHubState extends State<MzansiInnovationHub> {
   late MihTheme theme;
 
   Color getPrimany() {
-    return theme.primaryColor();
+    return MihColors.getPrimaryColor(theme.mode == "Dark");
   }
 
   String getTitle() {
@@ -60,9 +61,9 @@ class _MzansiInnovationHubState extends State<MzansiInnovationHub> {
     // } else {
     //   theme.mode = "Light";
     // }
+    super.initState();
     theme.mode = "Dark";
     theme.platform = Theme.of(context).platform;
-    super.initState();
     //doInit();
   }
 

Frontend/lib/mih_components/mih_layout/mih_body.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import '../../main.dart';
 
 class MIHBody extends StatefulWidget {
@@ -46,10 +47,12 @@ class _MIHBodyState extends State<MIHBody> {
   Decoration? getBoader() {
     if (widget.borderOn) {
       return BoxDecoration(
-        color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+        color: MihColors.getPrimaryColor(
+            MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         borderRadius: BorderRadius.circular(25.0),
         border: Border.all(
-            color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+            color: MihColors.getSecondaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             width: 3.0),
       );
     } else {

Frontend/lib/mih_components/mih_layout/mih_notification_drawer.dart

@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
+import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/notification.dart';
-import '../../main.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:supertokens_flutter/http.dart' as http;
-
 import '../../mih_config/mih_env.dart';
 import '../mih_pop_up_messages/mih_error_message.dart';
 
@@ -78,13 +78,15 @@ class _MIHNotificationDrawerState extends State<MIHNotificationDrawer> {
       title: Text(
         title,
         style: TextStyle(
-          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MihColors.getSecondaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         ),
       ),
       subtitle: Text(
         subtitle,
         style: TextStyle(
-          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MihColors.getSecondaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         ),
       ),
       onTap: () {},
@@ -101,7 +103,8 @@ class _MIHNotificationDrawerState extends State<MIHNotificationDrawer> {
         children: [
           Icon(
             Icons.circle_notifications,
-            color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+            color: MihColors.getRedColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
           ),
           const SizedBox(
             width: 5,
@@ -110,7 +113,8 @@ class _MIHNotificationDrawerState extends State<MIHNotificationDrawer> {
             child: Text(
               title,
               style: TextStyle(
-                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MihColors.getSecondaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               ),
             ),
           ),
@@ -124,7 +128,8 @@ class _MIHNotificationDrawerState extends State<MIHNotificationDrawer> {
             child: Text(
               title,
               style: TextStyle(
-                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MihColors.getSecondaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               ),
             ),
           ),
@@ -136,7 +141,8 @@ class _MIHNotificationDrawerState extends State<MIHNotificationDrawer> {
       subtitle: Text(
         subtitle,
         style: TextStyle(
-          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MihColors.getSecondaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         ),
       ),
       onTap: () {
@@ -159,7 +165,8 @@ class _MIHNotificationDrawerState extends State<MIHNotificationDrawer> {
         physics: const NeverScrollableScrollPhysics(),
         separatorBuilder: (BuildContext context, index) {
           return Divider(
-            color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+            color: MihColors.getSecondaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
           );
         },
         itemCount: widget.notifications.length,
@@ -198,14 +205,15 @@ class _MIHNotificationDrawerState extends State<MIHNotificationDrawer> {
   Widget build(BuildContext context) {
     return SafeArea(
       child: Drawer(
-          //backgroundColor:  MzansiInnovationHub.of(context)!.theme.primaryColor(),
+          //backgroundColor:  MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
           child: SingleChildScrollView(
         child: Column(
           mainAxisSize: MainAxisSize.max,
           mainAxisAlignment: MainAxisAlignment.start,
           children: [
             Container(
-              color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+              color: MihColors.getSecondaryColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               child: Row(
                 mainAxisAlignment: MainAxisAlignment.center,
                 crossAxisAlignment: CrossAxisAlignment.center,
@@ -215,9 +223,9 @@ class _MIHNotificationDrawerState extends State<MIHNotificationDrawer> {
                     child: Text(
                       "Notifications",
                       style: TextStyle(
-                        color: MzansiInnovationHub.of(context)!
+                        color: MihColors.getPrimaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .primaryColor(),
+                                "Dark"),
                         fontWeight: FontWeight.bold,
                         fontSize: 20,
                       ),
@@ -232,7 +240,7 @@ class _MIHNotificationDrawerState extends State<MIHNotificationDrawer> {
             //   physics: const NeverScrollableScrollPhysics(),
             //   separatorBuilder: (BuildContext context, index) {
             //     return Divider(
-            //       color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+            //       color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             //     );
             //   },
             //   itemCount: widget.notifications.length,

Frontend/lib/mih_components/mih_layout/mih_tile.dart

@@ -2,6 +2,7 @@ import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_yt_video_player.dart';
 import 'package:flutter/material.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 
 class MIHTile extends StatefulWidget {
   final String tileName;
@@ -83,7 +84,7 @@ class _MIHTileState extends State<MIHTile> {
             child: Material(
               color: mainC,
               // shadowColor:
-              //     MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+              //     MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               // elevation: 5,
               borderRadius: BorderRadius.circular(80),
               child: InkWell(
@@ -94,10 +95,10 @@ class _MIHTileState extends State<MIHTile> {
                   displayHint();
                 },
                 // hoverDuration: ,
-                splashColor:
+                splashColor: MihColors.getHighlightColor(
-                    MzansiInnovationHub.of(context)!.theme.highlightColor(),
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                highlightColor:
+                highlightColor: MihColors.getHighlightColor(
-                    MzansiInnovationHub.of(context)!.theme.highlightColor(),
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 child: widget.tileIcon,
               ),
             ),
@@ -111,7 +112,8 @@ class _MIHTileState extends State<MIHTile> {
               softWrap: true,
               overflow: TextOverflow.visible,
               style: TextStyle(
-                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MihColors.getSecondaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 fontSize: 40.0,
                 fontWeight: FontWeight.bold,
               ),

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

@@ -7,6 +7,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/Exam
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/Example/package_tools/package_tool_two.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart';
 import 'package:flutter/material.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 
 class PackageTest extends StatefulWidget {
   // final AppUser user;
@@ -66,7 +67,8 @@ class _PackageTestState extends State<PackageTest> {
           alertIcon: Icon(
             Icons.warning_amber_rounded,
             size: 100,
-            color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+            color: MihColors.getRedColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
           ),
           alertTitle: "Oops! Looks like some fields are missing.",
           alertBody: Column(
@@ -74,8 +76,8 @@ class _PackageTestState extends State<PackageTest> {
               Text(
                 "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:
+                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   fontSize: 15,
                   fontWeight: FontWeight.bold,
                 ),
@@ -84,8 +86,8 @@ class _PackageTestState extends State<PackageTest> {
               RichText(
                 text: TextSpan(
                   style: TextStyle(
-                    color:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: 15,
                     fontWeight: FontWeight.bold,
                   ),
@@ -94,16 +96,16 @@ class _PackageTestState extends State<PackageTest> {
                         text: "Here's a quick tip: ",
                         style: TextStyle(
                             fontStyle: FontStyle.italic,
-                            color: MzansiInnovationHub.of(context)!
+                            color: MihColors.getRedColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .errorColor())),
+                                    "Dark"))),
                     const TextSpan(text: "Look for fields with an asterisk ("),
                     TextSpan(
                         text: "*",
                         style: TextStyle(
-                            color: MzansiInnovationHub.of(context)!
+                            color: MihColors.getRedColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .errorColor())),
+                                    "Dark"))),
                     const TextSpan(
                         text: ") next to them, as these are mandatory."),
                   ],
@@ -111,7 +113,8 @@ class _PackageTestState extends State<PackageTest> {
               ),
             ],
           ),
-          alertColour: MzansiInnovationHub.of(context)!.theme.errorColor(),
+          alertColour: MihColors.getRedColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         );
       },
     );

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

@@ -101,17 +101,19 @@ class _PackageToolOneState extends State<PackageToolOne> {
             SpeedDialChild(
               child: Icon(
                 Icons.add,
-                color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                color: MihColors.getPrimaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               ),
               label: "Show New Window",
-              labelBackgroundColor:
+              labelBackgroundColor: MihColors.getGreenColor(
-                  MzansiInnovationHub.of(context)!.theme.successColor(),
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               labelStyle: TextStyle(
-                color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                color: MihColors.getPrimaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 fontWeight: FontWeight.bold,
               ),
-              backgroundColor:
+              backgroundColor: MihColors.getGreenColor(
-                  MzansiInnovationHub.of(context)!.theme.successColor(),
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               onTap: () {
                 // showTestWindow();
               },
@@ -180,9 +182,9 @@ class _PackageToolOneState extends State<PackageToolOne> {
                       style: TextStyle(
                         fontSize: 25,
                         fontWeight: FontWeight.bold,
-                        color: MzansiInnovationHub.of(context)!
+                        color: MihColors.getSecondaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .secondaryColor(),
+                                "Dark"),
                       ),
                     ),
                   ],
@@ -193,15 +195,16 @@ class _PackageToolOneState extends State<PackageToolOne> {
                     onPressed: () {
                       KenLogger.success("Successfully tested");
                     },
-                    buttonColor: MihColors.getGreenColor(context),
+                    buttonColor: MihColors.getGreenColor(
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     elevation: 10,
                     width: 300,
                     child: Text(
                       "Success Logger",
                       style: TextStyle(
-                        color: MzansiInnovationHub.of(context)!
+                        color: MihColors.getPrimaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .primaryColor(),
+                                "Dark"),
                         fontSize: 20,
                         fontWeight: FontWeight.bold,
                       ),
@@ -214,15 +217,16 @@ class _PackageToolOneState extends State<PackageToolOne> {
                     onPressed: () {
                       KenLogger.error("Successfully tested");
                     },
-                    buttonColor: MihColors.getRedColor(context),
+                    buttonColor: MihColors.getRedColor(
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     elevation: 10,
                     width: 300,
                     child: Text(
                       "Error Logger",
                       style: TextStyle(
-                        color: MzansiInnovationHub.of(context)!
+                        color: MihColors.getPrimaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .primaryColor(),
+                                "Dark"),
                         fontSize: 20,
                         fontWeight: FontWeight.bold,
                       ),
@@ -235,15 +239,16 @@ class _PackageToolOneState extends State<PackageToolOne> {
                     onPressed: () {
                       KenLogger.warning("Successfully tested");
                     },
-                    buttonColor: MihColors.getOrangeColor(context),
+                    buttonColor: MihColors.getOrangeColor(
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     elevation: 10,
                     width: 300,
                     child: Text(
                       "Warning Logger",
                       style: TextStyle(
-                        color: MzansiInnovationHub.of(context)!
+                        color: MihColors.getPrimaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .primaryColor(),
+                                "Dark"),
                         fontSize: 20,
                         fontWeight: FontWeight.bold,
                       ),
@@ -256,15 +261,16 @@ class _PackageToolOneState extends State<PackageToolOne> {
                     onPressed: () {
                       KenLogger.info("Successfully tested");
                     },
-                    buttonColor: MihColors.getBluishPurpleColor(context),
+                    buttonColor: MihColors.getBluishPurpleColor(
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     elevation: 10,
                     width: 300,
                     child: Text(
                       "Info Logger",
                       style: TextStyle(
-                        color: MzansiInnovationHub.of(context)!
+                        color: MihColors.getPrimaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .primaryColor(),
+                                "Dark"),
                         fontSize: 20,
                         fontWeight: FontWeight.bold,
                       ),
@@ -280,10 +286,10 @@ class _PackageToolOneState extends State<PackageToolOne> {
                   initialSelection: '+27',
                   showDropDownButton: false,
                   pickerStyle: PickerStyle.bottomSheet,
-                  dialogBackgroundColor:
+                  dialogBackgroundColor: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  barrierColor:
+                  barrierColor: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 ),
                 const SizedBox(height: 10),
                 Center(
@@ -298,16 +304,16 @@ class _PackageToolOneState extends State<PackageToolOne> {
                         },
                       );
                     },
-                    buttonColor:
+                    buttonColor: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     elevation: 10,
                     width: 300,
                     child: Text(
                       "Show Loading",
                       style: TextStyle(
-                        color: MzansiInnovationHub.of(context)!
+                        color: MihColors.getPrimaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .primaryColor(),
+                                "Dark"),
                         fontSize: 20,
                         fontWeight: FontWeight.bold,
                       ),
@@ -324,9 +330,9 @@ class _PackageToolOneState extends State<PackageToolOne> {
                       style: TextStyle(
                         fontSize: 15,
                         fontWeight: FontWeight.bold,
-                        color: MzansiInnovationHub.of(context)!
+                        color: MihColors.getSecondaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .secondaryColor(),
+                                "Dark"),
                       ),
                     ),
                   ],
@@ -345,9 +351,9 @@ class _PackageToolOneState extends State<PackageToolOne> {
                       style: TextStyle(
                         fontSize: 15,
                         fontWeight: FontWeight.bold,
-                        color: MzansiInnovationHub.of(context)!
+                        color: MihColors.getSecondaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .secondaryColor(),
+                                "Dark"),
                       ),
                     ),
                   ],
@@ -424,8 +430,8 @@ class _PackageToolOneState extends State<PackageToolOne> {
                 ),
                 const SizedBox(height: 10),
                 Divider(
-                  color:
+                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   thickness: 2,
                 ),
                 const SizedBox(height: 10),
@@ -438,9 +444,9 @@ class _PackageToolOneState extends State<PackageToolOne> {
                       style: TextStyle(
                         fontSize: 25,
                         fontWeight: FontWeight.bold,
-                        color: MzansiInnovationHub.of(context)!
+                        color: MihColors.getSecondaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .secondaryColor(),
+                                "Dark"),
                       ),
                     ),
                   ],
@@ -448,8 +454,8 @@ class _PackageToolOneState extends State<PackageToolOne> {
                 MihBannerAd(),
                 const SizedBox(height: 10),
                 Divider(
-                  color:
+                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   thickness: 2,
                 ),
                 const SizedBox(height: 10),
@@ -458,11 +464,12 @@ class _PackageToolOneState extends State<PackageToolOne> {
                   formFields: [
                     MihTextFormField(
                       width: 200,
-                      fillColor: MzansiInnovationHub.of(context)!
+                      fillColor: MihColors.getSecondaryColor(
-                          .theme
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                          .secondaryColor(),
+                              "Dark"),
-                      inputColor:
+                      inputColor: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                       controller: _textFieldZeroController,
                       multiLineInput: false,
                       requiredText: false,
@@ -473,11 +480,12 @@ class _PackageToolOneState extends State<PackageToolOne> {
                     ),
                     const SizedBox(height: 10),
                     MihTextFormField(
-                      fillColor: MzansiInnovationHub.of(context)!
+                      fillColor: MihColors.getSecondaryColor(
-                          .theme
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                          .secondaryColor(),
+                              "Dark"),
-                      inputColor:
+                      inputColor: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                       controller: _textFieldOneController,
                       multiLineInput: false,
                       requiredText: true,
@@ -489,11 +497,12 @@ class _PackageToolOneState extends State<PackageToolOne> {
                     ),
                     const SizedBox(height: 10),
                     MihTextFormField(
-                      fillColor: MzansiInnovationHub.of(context)!
+                      fillColor: MihColors.getSecondaryColor(
-                          .theme
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                          .secondaryColor(),
+                              "Dark"),
-                      inputColor:
+                      inputColor: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                       controller: _textFieldTwoController,
                       multiLineInput: false,
                       requiredText: true,
@@ -506,11 +515,12 @@ class _PackageToolOneState extends State<PackageToolOne> {
                     ),
                     const SizedBox(height: 10),
                     MihTextFormField(
-                      fillColor: MzansiInnovationHub.of(context)!
+                      fillColor: MihColors.getSecondaryColor(
-                          .theme
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                          .secondaryColor(),
+                              "Dark"),
-                      inputColor:
+                      inputColor: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                       controller: _textFieldThreeController,
                       multiLineInput: false,
                       requiredText: true,
@@ -523,11 +533,12 @@ class _PackageToolOneState extends State<PackageToolOne> {
                     const SizedBox(height: 10),
                     MihNumericStepper(
                       controller: _textFieldFiveController,
-                      fillColor: MzansiInnovationHub.of(context)!
+                      fillColor: MihColors.getSecondaryColor(
-                          .theme
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                          .secondaryColor(),
+                              "Dark"),
-                      inputColor:
+                      inputColor: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                       hintText: "Number Stepper",
                       requiredText: true,
                       minValue: 1,
@@ -538,11 +549,12 @@ class _PackageToolOneState extends State<PackageToolOne> {
                     MihToggle(
                       hintText: "Toggle",
                       initialPostion: switchpositioin,
-                      fillColor: MzansiInnovationHub.of(context)!
+                      fillColor: MihColors.getSecondaryColor(
-                          .theme
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                          .secondaryColor(),
+                              "Dark"),
-                      secondaryFillColor:
+                      secondaryFillColor: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                       readOnly: false,
                       onChange: (value) {
                         setState(() {
@@ -555,11 +567,12 @@ class _PackageToolOneState extends State<PackageToolOne> {
                     MihRadioOptions(
                       controller: _textFieldSixController,
                       hintText: "Radio Options",
-                      fillColor: MzansiInnovationHub.of(context)!
+                      fillColor: MihColors.getSecondaryColor(
-                          .theme
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                          .secondaryColor(),
+                              "Dark"),
-                      secondaryFillColor:
+                      secondaryFillColor: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                       requiredText: true,
                       radioOptions: const ["Option 1", "Option 2"],
                     ),
@@ -600,11 +613,12 @@ class _PackageToolOneState extends State<PackageToolOne> {
                     const SizedBox(height: 10),
                     MihTextFormField(
                       height: 250,
-                      fillColor: MzansiInnovationHub.of(context)!
+                      fillColor: MihColors.getSecondaryColor(
-                          .theme
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                          .secondaryColor(),
+                              "Dark"),
-                      inputColor:
+                      inputColor: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                       controller: _textFieldFourController,
                       multiLineInput: true,
                       requiredText: false,
@@ -628,17 +642,17 @@ class _PackageToolOneState extends State<PackageToolOne> {
                             MihAlertServices().formNotFilledCompletely(context);
                           }
                         },
-                        buttonColor: MzansiInnovationHub.of(context)!
+                        buttonColor: MihColors.getSecondaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .secondaryColor(),
+                                "Dark"),
                         elevation: 10,
                         width: 300,
                         child: Text(
                           "Submit Form",
                           style: TextStyle(
-                            color: MzansiInnovationHub.of(context)!
+                            color: MihColors.getPrimaryColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .primaryColor(),
+                                    "Dark"),
                             fontSize: 20,
                             fontWeight: FontWeight.bold,
                           ),
@@ -649,8 +663,8 @@ class _PackageToolOneState extends State<PackageToolOne> {
                 ),
                 const SizedBox(height: 10),
                 Divider(
-                  color:
+                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   thickness: 2,
                 ),
                 const SizedBox(height: 10),
@@ -661,10 +675,10 @@ class _PackageToolOneState extends State<PackageToolOne> {
                   prefixIcon: Icons.search,
                   prefixAltIcon: MihIcons.mzansiAi,
                   width: 300,
-                  fillColor:
+                  fillColor: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  hintColor:
+                  hintColor: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   onPrefixIconTap: () {
                     print("Search Icon Pressed: ${_searchController.text}");
                   },
@@ -675,15 +689,16 @@ class _PackageToolOneState extends State<PackageToolOne> {
                   onPressed: () {
                     print("Button Pressed");
                   },
-                  buttonColor:
+                  buttonColor: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   elevation: 10,
                   width: 300,
                   child: Text(
                     "Click Me",
                     style: TextStyle(
-                      color:
+                      color: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                       fontSize: 20,
                       fontWeight: FontWeight.bold,
                     ),
@@ -694,24 +709,24 @@ class _PackageToolOneState extends State<PackageToolOne> {
                   onPressed: () {
                     print("Button Pressed");
                   },
-                  buttonColor:
+                  buttonColor: MihColors.getGreenColor(
-                      MzansiInnovationHub.of(context)!.theme.successColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   width: 300,
                   child: Row(
                     mainAxisAlignment: MainAxisAlignment.center,
                     children: [
                       Icon(
                         Icons.delete,
-                        color: MzansiInnovationHub.of(context)!
+                        color: MihColors.getPrimaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .primaryColor(),
+                                "Dark"),
                       ),
                       Text(
                         "Click Me",
                         style: TextStyle(
-                          color: MzansiInnovationHub.of(context)!
+                          color: MihColors.getPrimaryColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .primaryColor(),
+                                  "Dark"),
                           fontSize: 20,
                           fontWeight: FontWeight.bold,
                         ),
@@ -724,14 +739,15 @@ class _PackageToolOneState extends State<PackageToolOne> {
                   onPressed: () {
                     print("Button Pressed");
                   },
-                  buttonColor:
+                  buttonColor: MihColors.getRedColor(
-                      MzansiInnovationHub.of(context)!.theme.errorColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   width: 300,
                   child: Text(
                     "Click Me",
                     style: TextStyle(
-                      color:
+                      color: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                       fontSize: 20,
                       fontWeight: FontWeight.bold,
                     ),
@@ -748,8 +764,9 @@ class _PackageToolOneState extends State<PackageToolOne> {
                     onPressed: () {},
                     icon: Icon(
                       MihIcons.mihLogo,
-                      color:
+                      color: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                     ),
                   ),
                 ),
@@ -760,10 +777,10 @@ class _PackageToolOneState extends State<PackageToolOne> {
                   editable: false,
                   fileNameController: _fileNameController,
                   userSelectedfile: file,
-                  frameColor:
+                  frameColor: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  backgroundColor:
+                  backgroundColor: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   onChange: (selectedImage) {
                     setState(() {
                       file = selectedImage;
@@ -772,10 +789,10 @@ class _PackageToolOneState extends State<PackageToolOne> {
                 ),
                 const SizedBox(height: 10),
                 MihTextFormField(
-                  fillColor:
+                  fillColor: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  inputColor:
+                  inputColor: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   controller: _fileNameController,
                   hintText: "Selected Avatar File",
                   requiredText: false,
@@ -797,10 +814,10 @@ class _PackageToolOneState extends State<PackageToolOne> {
                 ),
                 const SizedBox(height: 10),
                 MihTextFormField(
-                  fillColor:
+                  fillColor: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  inputColor:
+                  inputColor: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   controller: _imagefileController,
                   hintText: "Selected Image File",
                   requiredText: false,
@@ -820,19 +837,19 @@ class _PackageToolOneState extends State<PackageToolOne> {
                 SpeedDialChild(
                   child: Icon(
                     Icons.add,
-                    color:
+                    color: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   ),
                   label: "Show New Window",
-                  labelBackgroundColor:
+                  labelBackgroundColor: MihColors.getGreenColor(
-                      MzansiInnovationHub.of(context)!.theme.successColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   labelStyle: TextStyle(
-                    color:
+                    color: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontWeight: FontWeight.bold,
                   ),
-                  backgroundColor:
+                  backgroundColor: MihColors.getGreenColor(
-                      MzansiInnovationHub.of(context)!.theme.successColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   onTap: () {
                     showTestWindow();
                   },
@@ -840,19 +857,19 @@ class _PackageToolOneState extends State<PackageToolOne> {
                 SpeedDialChild(
                   child: Icon(
                     Icons.add,
-                    color:
+                    color: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   ),
                   label: "Show New Full Window",
-                  labelBackgroundColor:
+                  labelBackgroundColor: MihColors.getGreenColor(
-                      MzansiInnovationHub.of(context)!.theme.successColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   labelStyle: TextStyle(
-                    color:
+                    color: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontWeight: FontWeight.bold,
                   ),
-                  backgroundColor:
+                  backgroundColor: MihColors.getGreenColor(
-                      MzansiInnovationHub.of(context)!.theme.successColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   onTap: () {
                     showTestFullWindow();
                   },

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

@@ -4,6 +4,7 @@ import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 
 class PackageToolTwo extends StatefulWidget {
   const PackageToolTwo({super.key});
@@ -33,7 +34,8 @@ class _PackageToolTwoState extends State<PackageToolTwo> {
             style: TextStyle(
               fontSize: 25,
               fontWeight: FontWeight.bold,
-              color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+              color: MihColors.getSecondaryColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             ),
           ),
           const SizedBox(height: 10),
@@ -55,7 +57,8 @@ class _PackageToolTwoState extends State<PackageToolTwo> {
               onPressed: () {},
               icon: Icon(
                 MihIcons.mihLogo,
-                color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                color: MihColors.getPrimaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               ),
             ),
           )

Frontend/lib/mih_components/mih_package_components/mih_business_profile_preview.dart

@@ -4,6 +4,7 @@ import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/business.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_circle_avatar.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_file_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_location_services.dart';
 
@@ -61,26 +62,26 @@ class _MihBusinessProfilePreviewState extends State<MihBusinessProfilePreview> {
                     editable: false,
                     fileNameController: TextEditingController(),
                     userSelectedfile: file,
-                    frameColor:
+                    frameColor: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    backgroundColor:
+                    backgroundColor: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     onChange: () {},
                   );
                 } else {
                   return Icon(
                     MihIcons.iDontKnow,
                     size: profilePictureWidth,
-                    color:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   );
                 }
               } else {
                 return Icon(
                   MihIcons.mihRing,
                   size: profilePictureWidth,
-                    color:
+                  color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 );
               }
             }),

Frontend/lib/mih_components/mih_package_components/mih_calendar.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
-import '../../../main.dart';
+import 'package:mzansi_innovation_hub/main.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:table_calendar/table_calendar.dart';
 
 class MIHCalendar extends StatefulWidget {
@@ -37,7 +38,8 @@ class _MIHCalendarState extends State<MIHCalendar> {
           formatButtonDecoration: BoxDecoration(
             border: Border.fromBorderSide(
               BorderSide(
-                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MihColors.getSecondaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               ),
             ),
             borderRadius: const BorderRadius.all(
@@ -61,29 +63,36 @@ class _MIHCalendarState extends State<MIHCalendar> {
         calendarStyle: CalendarStyle(
           outsideDaysVisible: false,
           todayTextStyle: TextStyle(
-            color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+            color: MihColors.getPrimaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
           ),
           todayDecoration: BoxDecoration(
-            color: MzansiInnovationHub.of(context)!.theme.successColor(),
+            color: MihColors.getGreenColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             shape: BoxShape.circle,
           ),
           selectedTextStyle: TextStyle(
-            color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+            color: MihColors.getPrimaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
           ),
           selectedDecoration: BoxDecoration(
-            color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+            color: MihColors.getSecondaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             shape: BoxShape.circle,
           ),
           weekendTextStyle: TextStyle(
-            color: MzansiInnovationHub.of(context)!.theme.messageTextColor(),
+            color: MihColors.getGreyColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
           ),
         ),
         daysOfWeekStyle: DaysOfWeekStyle(
           weekdayStyle: TextStyle(
-            color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+            color: MihColors.getSecondaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
           ),
           weekendStyle: TextStyle(
-            color: MzansiInnovationHub.of(context)!.theme.messageTextColor(),
+            color: MihColors.getGreyColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
           ),
         ),
       ),

Frontend/lib/mih_components/mih_package_components/mih_date_field.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:mzansi_innovation_hub/main.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 
 class MihDateField extends StatefulWidget {
   final TextEditingController controller;
@@ -47,7 +48,6 @@ class _MihDateFieldState extends State<MihDateField> {
 
   @override
   Widget build(BuildContext context) {
-    final theme = MzansiInnovationHub.of(context)!.theme;
     return Center(
       child: SizedBox(
         width: widget.width,
@@ -61,7 +61,8 @@ class _MihDateFieldState extends State<MihDateField> {
                 Text(
                   widget.labelText,
                   style: TextStyle(
-                    color: theme.secondaryColor(),
+                    color: MihColors.getSecondaryColor(
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: 18,
                     fontWeight: FontWeight.bold,
                   ),
@@ -70,7 +71,9 @@ class _MihDateFieldState extends State<MihDateField> {
                   Text(
                     "(Optional)",
                     style: TextStyle(
-                      color: theme.secondaryColor(),
+                      color: MihColors.getSecondaryColor(
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                       fontSize: 15,
                       fontWeight: FontWeight.bold,
                     ),
@@ -96,25 +99,35 @@ class _MihDateFieldState extends State<MihDateField> {
                         readOnly: true,
                         onTap: () => _selectDate(context),
                         style: TextStyle(
-                          color: theme.primaryColor(),
+                          color: MihColors.getPrimaryColor(
+                              MzansiInnovationHub.of(context)!.theme.mode ==
+                                  "Dark"),
                           fontWeight: FontWeight.w500,
                         ),
                         decoration: InputDecoration(
                           suffixIcon: Icon(
                             Icons.calendar_today,
-                            color: theme.primaryColor(),
+                            color: MihColors.getPrimaryColor(
+                                MzansiInnovationHub.of(context)!.theme.mode ==
+                                    "Dark"),
                           ),
                           errorStyle: const TextStyle(height: 0, fontSize: 0),
                           contentPadding: const EdgeInsets.symmetric(
                               horizontal: 10.0, vertical: 8.0),
                           filled: true,
-                          fillColor: theme.secondaryColor(),
+                          fillColor: MihColors.getSecondaryColor(
+                              MzansiInnovationHub.of(context)!.theme.mode ==
+                                  "Dark"),
                           border: OutlineInputBorder(
                             borderRadius: BorderRadius.circular(
                                 widget.borderRadius ?? 8.0),
                             borderSide: field.hasError
                                 ? BorderSide(
-                                    color: theme.errorColor(),
+                                    color: MihColors.getRedColor(
+                                        MzansiInnovationHub.of(context)!
+                                                .theme
+                                                .mode ==
+                                            "Dark"),
                                     width: 2.0,
                                   )
                                 : BorderSide.none,
@@ -129,8 +142,16 @@ class _MihDateFieldState extends State<MihDateField> {
                                 widget.borderRadius ?? 8.0),
                             borderSide: BorderSide(
                               color: field.hasError
-                                  ? theme.errorColor()
+                                  ? MihColors.getRedColor(
-                                  : theme.secondaryColor(),
+                                      MzansiInnovationHub.of(context)!
+                                              .theme
+                                              .mode ==
+                                          "Dark")
+                                  : MihColors.getSecondaryColor(
+                                      MzansiInnovationHub.of(context)!
+                                              .theme
+                                              .mode ==
+                                          "Dark"),
                               width: 3.0,
                             ),
                           ),
@@ -138,7 +159,9 @@ class _MihDateFieldState extends State<MihDateField> {
                             borderRadius: BorderRadius.circular(
                                 widget.borderRadius ?? 8.0),
                             borderSide: BorderSide(
-                              color: theme.errorColor(),
+                              color: MihColors.getRedColor(
+                                  MzansiInnovationHub.of(context)!.theme.mode ==
+                                      "Dark"),
                               width: 3.0,
                             ),
                           ),
@@ -146,7 +169,9 @@ class _MihDateFieldState extends State<MihDateField> {
                             borderRadius: BorderRadius.circular(
                                 widget.borderRadius ?? 8.0),
                             borderSide: BorderSide(
-                              color: theme.errorColor(),
+                              color: MihColors.getRedColor(
+                                  MzansiInnovationHub.of(context)!.theme.mode ==
+                                      "Dark"),
                               width: 3.0,
                             ),
                           ),
@@ -163,7 +188,9 @@ class _MihDateFieldState extends State<MihDateField> {
                           field.errorText ?? '',
                           style: TextStyle(
                             fontSize: 12,
-                            color: theme.errorColor(),
+                            color: MihColors.getRedColor(
+                                MzansiInnovationHub.of(context)!.theme.mode ==
+                                    "Dark"),
                             fontWeight: FontWeight.bold,
                           ),
                         ),

Frontend/lib/mih_components/mih_package_components/mih_dropdwn_field.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
-import '../../main.dart';
+import 'package:mzansi_innovation_hub/main.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 
 class MihDropdownField extends StatefulWidget {
   final TextEditingController controller;
@@ -30,13 +31,13 @@ class _MihDropdownFieldState extends State<MihDropdownField> {
 
   List<DropdownMenuEntry<String>> buildMenuOptions(List<String> options) {
     List<DropdownMenuEntry<String>> menuList = [];
-    final theme = MzansiInnovationHub.of(context)!.theme;
     for (final i in options) {
       menuList.add(DropdownMenuEntry(
         value: i,
         label: i,
         style: ButtonStyle(
-          foregroundColor: WidgetStatePropertyAll(theme.primaryColor()),
+          foregroundColor: WidgetStatePropertyAll(MihColors.getPrimaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark")),
         ),
       ));
     }
@@ -59,8 +60,6 @@ class _MihDropdownFieldState extends State<MihDropdownField> {
 
   @override
   Widget build(BuildContext context) {
-    final theme = MzansiInnovationHub.of(context)!.theme;
-
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
@@ -70,7 +69,8 @@ class _MihDropdownFieldState extends State<MihDropdownField> {
             Text(
               widget.hintText,
               style: TextStyle(
-                color: theme.secondaryColor(),
+                color: MihColors.getSecondaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 fontSize: 18,
                 fontWeight: FontWeight.bold,
               ),
@@ -79,7 +79,8 @@ class _MihDropdownFieldState extends State<MihDropdownField> {
               Text(
                 "(Optional)",
                 style: TextStyle(
-                  color: theme.secondaryColor(),
+                  color: MihColors.getSecondaryColor(
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   fontSize: 15,
                   fontWeight: FontWeight.bold,
                 ),
@@ -98,10 +99,16 @@ class _MihDropdownFieldState extends State<MihDropdownField> {
                 Theme(
                   data: Theme.of(context).copyWith(
                     textSelectionTheme: TextSelectionThemeData(
-                      cursorColor: theme.primaryColor(),
+                      cursorColor: MihColors.getPrimaryColor(
-                      selectionColor:
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                          theme.primaryColor().withValues(alpha: 0.3),
+                              "Dark"),
-                      selectionHandleColor: theme.primaryColor(),
+                      selectionColor: MihColors.getPrimaryColor(
+                              MzansiInnovationHub.of(context)!.theme.mode ==
+                                  "Dark")
+                          .withValues(alpha: 0.3),
+                      selectionHandleColor: MihColors.getPrimaryColor(
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                     ),
                   ),
                   child: DropdownMenu(
@@ -115,16 +122,22 @@ class _MihDropdownFieldState extends State<MihDropdownField> {
                     menuHeight: 400,
                     expandedInsets: EdgeInsets.zero,
                     textStyle: TextStyle(
-                      color: theme.primaryColor(),
+                      color: MihColors.getPrimaryColor(
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                       fontWeight: FontWeight.w500,
                     ),
                     trailingIcon: Icon(
                       Icons.arrow_drop_down,
-                      color: theme.primaryColor(),
+                      color: MihColors.getPrimaryColor(
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                     ),
                     selectedTrailingIcon: Icon(
                       Icons.arrow_drop_up,
-                      color: theme.primaryColor(),
+                      color: MihColors.getPrimaryColor(
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                     ),
                     leadingIcon: IconButton(
                       onPressed: () {
@@ -133,17 +146,25 @@ class _MihDropdownFieldState extends State<MihDropdownField> {
                       },
                       icon: Icon(
                         Icons.delete_outline_rounded,
-                        color: theme.primaryColor(),
+                        color: MihColors.getPrimaryColor(
+                            MzansiInnovationHub.of(context)!.theme.mode ==
+                                "Dark"),
                       ),
                     ),
                     onSelected: (String? selectedValue) {
                       field.didChange(selectedValue);
                     },
                     menuStyle: MenuStyle(
-                      backgroundColor:
+                      backgroundColor: WidgetStatePropertyAll(
-                          WidgetStatePropertyAll(theme.secondaryColor()),
+                          MihColors.getSecondaryColor(
+                              MzansiInnovationHub.of(context)!.theme.mode ==
+                                  "Dark")),
                       side: WidgetStatePropertyAll(
-                        BorderSide(color: theme.primaryColor(), width: 1.0),
+                        BorderSide(
+                            color: MihColors.getPrimaryColor(
+                                MzansiInnovationHub.of(context)!.theme.mode ==
+                                    "Dark"),
+                            width: 1.0),
                       ),
                       shape: WidgetStatePropertyAll(
                         RoundedRectangleBorder(
@@ -157,7 +178,9 @@ class _MihDropdownFieldState extends State<MihDropdownField> {
                       contentPadding: const EdgeInsets.symmetric(
                           horizontal: 10.0, vertical: 8.0),
                       filled: true,
-                      fillColor: theme.secondaryColor(),
+                      fillColor: MihColors.getSecondaryColor(
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                       enabledBorder: OutlineInputBorder(
                         borderRadius: BorderRadius.circular(8.0),
                         borderSide: BorderSide.none,
@@ -166,22 +189,30 @@ class _MihDropdownFieldState extends State<MihDropdownField> {
                         borderRadius: BorderRadius.circular(8.0),
                         borderSide: BorderSide(
                           color: field.hasError
-                              ? theme.errorColor()
+                              ? MihColors.getRedColor(
-                              : theme.secondaryColor(),
+                                  MzansiInnovationHub.of(context)!.theme.mode ==
+                                      "Dark")
+                              : MihColors.getSecondaryColor(
+                                  MzansiInnovationHub.of(context)!.theme.mode ==
+                                      "Dark"),
                           width: 3.0,
                         ),
                       ),
                       errorBorder: OutlineInputBorder(
                         borderRadius: BorderRadius.circular(8.0),
                         borderSide: BorderSide(
-                          color: theme.errorColor(),
+                          color: MihColors.getRedColor(
+                              MzansiInnovationHub.of(context)!.theme.mode ==
+                                  "Dark"),
                           width: 3.0,
                         ),
                       ),
                       focusedErrorBorder: OutlineInputBorder(
                         borderRadius: BorderRadius.circular(8.0),
                         borderSide: BorderSide(
-                          color: theme.errorColor(),
+                          color: MihColors.getRedColor(
+                              MzansiInnovationHub.of(context)!.theme.mode ==
+                                  "Dark"),
                           width: 3.0,
                         ),
                       ),
@@ -195,7 +226,9 @@ class _MihDropdownFieldState extends State<MihDropdownField> {
                       field.errorText ?? '',
                       style: TextStyle(
                         fontSize: 12,
-                        color: theme.errorColor(),
+                        color: MihColors.getRedColor(
+                            MzansiInnovationHub.of(context)!.theme.mode ==
+                                "Dark"),
                         fontWeight: FontWeight.bold,
                       ),
                     ),

Frontend/lib/mih_components/mih_package_components/mih_floating_menu.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_speed_dial/flutter_speed_dial.dart';
 import 'package:mzansi_innovation_hub/main.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 
 class MihFloatingMenu extends StatefulWidget {
   final IconData? icon;
@@ -30,10 +31,12 @@ class _MihFloatingMenuState extends State<MihFloatingMenu> {
       animatedIcon: widget.animatedIcon,
       direction: widget.direction ?? SpeedDialDirection.up,
       activeIcon: Icons.close,
-      backgroundColor: MzansiInnovationHub.of(context)!.theme.successColor(),
+      backgroundColor: MihColors.getGreenColor(
-      activeBackgroundColor:
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-          MzansiInnovationHub.of(context)!.theme.errorColor(),
+      activeBackgroundColor: MihColors.getRedColor(
-      foregroundColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+      foregroundColor: MihColors.getPrimaryColor(
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
       overlayColor: Colors.black,
       overlayOpacity: 0.5,
       children: widget.children,

Frontend/lib/mih_components/mih_package_components/mih_image_display.dart

@@ -3,6 +3,7 @@ import 'dart:io';
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
 import 'package:mzansi_innovation_hub/main.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 
 class MihImageDisplay extends StatefulWidget {
   final ImageProvider<Object>? imageFile;
@@ -33,7 +34,9 @@ class _MihImageDisplayState extends State<MihImageDisplay> {
   ImageProvider<Object>? getImage() {
     Color dark = const Color(0XFF3A4454);
     if (widget.imageFile == null) {
-      if (MzansiInnovationHub.of(context)!.theme.secondaryColor() == dark) {
+      if (MihColors.getSecondaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark") ==
+          dark) {
         print("here in light icon");
         return const AssetImage(
             'lib/mih_components/mih_package_components/assets/images/i-dont-know-dark.png');
@@ -77,10 +80,11 @@ class _MihImageDisplayState extends State<MihImageDisplay> {
               right: 0,
               child: IconButton.filled(
                 style: IconButton.styleFrom(
-                  backgroundColor:
+                  backgroundColor: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 ),
-                color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                color: MihColors.getPrimaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 onPressed: () async {
                   try {
                     FilePickerResult? result =

Frontend/lib/mih_components/mih_package_components/mih_numeric_stepper.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:mzansi_innovation_hub/main.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.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';
 
@@ -109,9 +110,9 @@ class _MihNumericStepperState extends State<MihNumericStepper> {
                       child: IconButton.filled(
                         style: ButtonStyle(
                           backgroundColor: WidgetStateProperty.all<Color>(
-                              MzansiInnovationHub.of(context)!
+                              MihColors.getRedColor(
-                                  .theme
+                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                  .errorColor()),
+                                      "Dark")),
                         ),
                         color: widget.inputColor,
                         iconSize: 20,
@@ -193,9 +194,9 @@ class _MihNumericStepperState extends State<MihNumericStepper> {
                       child: IconButton.filled(
                         style: ButtonStyle(
                           backgroundColor: WidgetStateProperty.all<Color>(
-                              MzansiInnovationHub.of(context)!
+                              MihColors.getGreenColor(
-                                  .theme
+                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                  .successColor()),
+                                      "Dark")),
                         ),
                         color: widget.inputColor,
                         iconSize: 20,

Frontend/lib/mih_components/mih_package_components/mih_package_alert.dart

@@ -1,5 +1,6 @@
 import 'package:mzansi_innovation_hub/main.dart';
 import 'package:flutter/material.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 
 class MihPackageAlert extends StatefulWidget {
   final Widget alertIcon;
@@ -64,7 +65,8 @@ class _MihPackageAlertState extends State<MihPackageAlert> {
             width: popUpWidth,
             height: popUpheight,
             decoration: BoxDecoration(
-              color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+              color: MihColors.getPrimaryColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               borderRadius: BorderRadius.circular(25.0),
               border: Border.all(color: widget.alertColour, width: 5.0),
             ),
@@ -101,7 +103,8 @@ class _MihPackageAlertState extends State<MihPackageAlert> {
               },
               icon: Icon(
                 Icons.close,
-                color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+                color: MihColors.getRedColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 size: 35,
               ),
             ),

Frontend/lib/mih_components/mih_package_components/mih_package_tile.dart

@@ -2,6 +2,7 @@ import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_yt_video_player.dart';
 import 'package:flutter/material.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 
 class MihPackageTile extends StatefulWidget {
   final String appName;
@@ -84,8 +85,8 @@ class _MihPackageTileState extends State<MihPackageTile> {
                   // softWrap: true,
                   // overflow: TextOverflow.visible,
                   style: TextStyle(
-                    color:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: 20.0,
                     fontWeight: FontWeight.bold,
                   ),

Frontend/lib/mih_components/mih_package_components/mih_package_tool_body.dart

@@ -1,5 +1,6 @@
 import 'package:mzansi_innovation_hub/main.dart';
 import 'package:flutter/material.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 
 class MihPackageToolBody extends StatefulWidget {
   final bool borderOn;
@@ -48,19 +49,23 @@ class _MihPackageToolBodyState extends State<MihPackageToolBody> {
     if (widget.borderOn) {
       _innerBodyPadding = 10.0;
       return BoxDecoration(
-        color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+        color: MihColors.getPrimaryColor(
+            MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         borderRadius: BorderRadius.circular(25.0),
         border: Border.all(
-            color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+            color: MihColors.getSecondaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             width: 3.0),
       );
     } else {
       _innerBodyPadding = 0.0;
       return BoxDecoration(
-        color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+        color: MihColors.getPrimaryColor(
+            MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         borderRadius: BorderRadius.circular(25.0),
         border: Border.all(
-            color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+            color: MihColors.getPrimaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             width: 3.0),
       );
     }

Frontend/lib/mih_components/mih_package_components/mih_package_window.dart

@@ -3,6 +3,7 @@ import 'package:flutter_speed_dial/flutter_speed_dial.dart';
 import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_floating_menu.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 
 class MihPackageWindow extends StatefulWidget {
   final String windowTitle;
@@ -84,9 +85,12 @@ class _MihPackageWindowState extends State<MihPackageWindow> {
               child: IconButton.filled(
                 style: ButtonStyle(
                   backgroundColor: WidgetStateProperty.all<Color>(
-                      MzansiInnovationHub.of(context)!.theme.errorColor()),
+                      MihColors.getRedColor(
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark")),
                 ),
-                color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                color: MihColors.getPrimaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 iconSize: 20,
                 onPressed: () {
                   widget.onWindowTapClose();
@@ -108,7 +112,8 @@ class _MihPackageWindowState extends State<MihPackageWindow> {
               style: TextStyle(
                 fontSize: windowTitleSize,
                 fontWeight: FontWeight.bold,
-                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MihColors.getSecondaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               ),
             ),
           ),
@@ -165,10 +170,12 @@ class _MihPackageWindowState extends State<MihPackageWindow> {
       insetAnimationDuration: Durations.short1,
       child: Container(
         decoration: BoxDecoration(
-          color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+          color: MihColors.getPrimaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
           borderRadius: BorderRadius.circular(25.0),
           border: Border.all(
-              color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+              color: MihColors.getSecondaryColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               width: 5.0),
         ),
         child: widget.fullscreen

Frontend/lib/mih_components/mih_package_components/mih_personal_profile_preview.dart

@@ -4,6 +4,7 @@ import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_circle_avatar.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_file_services.dart';
 
 class MihPersonalProfilePreview extends StatefulWidget {
@@ -47,25 +48,26 @@ class _MihPersonalProfilePreviewState extends State<MihPersonalProfilePreview> {
                   editable: false,
                   fileNameController: TextEditingController(),
                   userSelectedfile: file,
-                  frameColor:
+                  frameColor: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  backgroundColor:
+                  backgroundColor: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   onChange: () {},
                 );
               } else {
                 return Icon(
                   MihIcons.iDontKnow,
                   size: profilePictureWidth,
-                  color:
+                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 );
               }
             } else {
               return Icon(
                 MihIcons.mihRing,
                 size: profilePictureWidth,
-                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MihColors.getSecondaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               );
             }
           },

Frontend/lib/mih_components/mih_package_components/mih_text_form_field.dart

@@ -2,6 +2,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:mzansi_innovation_hub/main.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 
 class MihTextFormField extends StatefulWidget {
   final double? width;
@@ -215,9 +216,11 @@ class _MihTextFormFieldState extends State<MihTextFormField> {
                                     widget.borderRadius ?? 8.0),
                                 borderSide: field.hasError
                                     ? BorderSide(
-                                        color: MzansiInnovationHub.of(context)!
+                                        color: MihColors.getRedColor(
+                                            MzansiInnovationHub.of(context)!
                                                     .theme
-                                            .errorColor(),
+                                                    .mode ==
+                                                "Dark"),
                                         width: 2.0,
                                       )
                                     : BorderSide.none,
@@ -232,9 +235,11 @@ class _MihTextFormFieldState extends State<MihTextFormField> {
                                     widget.borderRadius ?? 8.0),
                                 borderSide: BorderSide(
                                   color: field.hasError
-                                      ? MzansiInnovationHub.of(context)!
+                                      ? MihColors.getRedColor(
+                                          MzansiInnovationHub.of(context)!
                                                   .theme
-                                          .errorColor()
+                                                  .mode ==
+                                              "Dark")
                                       : widget.inputColor,
                                   width: 3.0,
                                 ),
@@ -243,9 +248,11 @@ class _MihTextFormFieldState extends State<MihTextFormField> {
                                 borderRadius: BorderRadius.circular(
                                     widget.borderRadius ?? 8.0),
                                 borderSide: BorderSide(
-                                  color: MzansiInnovationHub.of(context)!
+                                  color: MihColors.getRedColor(
+                                      MzansiInnovationHub.of(context)!
                                               .theme
-                                      .errorColor(),
+                                              .mode ==
+                                          "Dark"),
                                   width: 3.0,
                                 ),
                               ),
@@ -253,9 +260,11 @@ class _MihTextFormFieldState extends State<MihTextFormField> {
                                 borderRadius: BorderRadius.circular(
                                     widget.borderRadius ?? 8.0),
                                 borderSide: BorderSide(
-                                  color: MzansiInnovationHub.of(context)!
+                                  color: MihColors.getRedColor(
+                                      MzansiInnovationHub.of(context)!
                                               .theme
-                                      .errorColor(),
+                                              .mode ==
+                                          "Dark"),
                                   width: 3.0,
                                 ),
                               ),
@@ -276,9 +285,11 @@ class _MihTextFormFieldState extends State<MihTextFormField> {
                                 field.errorText ?? '',
                                 style: TextStyle(
                                   fontSize: 12,
-                                  color: MzansiInnovationHub.of(context)!
+                                  color: MihColors.getRedColor(
+                                      MzansiInnovationHub.of(context)!
                                               .theme
-                                      .errorColor(),
+                                              .mode ==
+                                          "Dark"),
                                   fontWeight: FontWeight.bold,
                                 ),
                               ),

Frontend/lib/mih_components/mih_package_components/mih_time_field.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
-import '../../main.dart';
+import 'package:mzansi_innovation_hub/main.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 
 class MihTimeField extends StatefulWidget {
   final TextEditingController controller;
@@ -57,7 +58,6 @@ class _MihTimeFieldState extends State<MihTimeField> {
 
   @override
   Widget build(BuildContext context) {
-    final theme = MzansiInnovationHub.of(context)!.theme;
     return Center(
       child: SizedBox(
         width: widget.width,
@@ -71,7 +71,8 @@ class _MihTimeFieldState extends State<MihTimeField> {
                 Text(
                   widget.labelText,
                   style: TextStyle(
-                    color: theme.secondaryColor(),
+                    color: MihColors.getSecondaryColor(
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: 18,
                     fontWeight: FontWeight.bold,
                   ),
@@ -80,7 +81,9 @@ class _MihTimeFieldState extends State<MihTimeField> {
                   Text(
                     "(Optional)",
                     style: TextStyle(
-                      color: theme.secondaryColor(),
+                      color: MihColors.getSecondaryColor(
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                       fontSize: 15,
                       fontWeight: FontWeight.bold,
                     ),
@@ -106,25 +109,35 @@ class _MihTimeFieldState extends State<MihTimeField> {
                         readOnly: true,
                         onTap: () => _selectTime(context),
                         style: TextStyle(
-                          color: theme.primaryColor(),
+                          color: MihColors.getPrimaryColor(
+                              MzansiInnovationHub.of(context)!.theme.mode ==
+                                  "Dark"),
                           fontWeight: FontWeight.w500,
                         ),
                         decoration: InputDecoration(
                           suffixIcon: Icon(
                             Icons.access_time,
-                            color: theme.primaryColor(),
+                            color: MihColors.getPrimaryColor(
+                                MzansiInnovationHub.of(context)!.theme.mode ==
+                                    "Dark"),
                           ),
                           errorStyle: const TextStyle(height: 0, fontSize: 0),
                           contentPadding: const EdgeInsets.symmetric(
                               horizontal: 10.0, vertical: 8.0),
                           filled: true,
-                          fillColor: theme.secondaryColor(),
+                          fillColor: MihColors.getSecondaryColor(
+                              MzansiInnovationHub.of(context)!.theme.mode ==
+                                  "Dark"),
                           border: OutlineInputBorder(
                             borderRadius: BorderRadius.circular(
                                 widget.borderRadius ?? 8.0),
                             borderSide: field.hasError
                                 ? BorderSide(
-                                    color: theme.errorColor(),
+                                    color: MihColors.getRedColor(
+                                        MzansiInnovationHub.of(context)!
+                                                .theme
+                                                .mode ==
+                                            "Dark"),
                                     width: 2.0,
                                   )
                                 : BorderSide.none,
@@ -139,8 +152,16 @@ class _MihTimeFieldState extends State<MihTimeField> {
                                 widget.borderRadius ?? 8.0),
                             borderSide: BorderSide(
                               color: field.hasError
-                                  ? theme.errorColor()
+                                  ? MihColors.getRedColor(
-                                  : theme.secondaryColor(),
+                                      MzansiInnovationHub.of(context)!
+                                              .theme
+                                              .mode ==
+                                          "Dark")
+                                  : MihColors.getSecondaryColor(
+                                      MzansiInnovationHub.of(context)!
+                                              .theme
+                                              .mode ==
+                                          "Dark"),
                               width: 3.0,
                             ),
                           ),
@@ -148,7 +169,9 @@ class _MihTimeFieldState extends State<MihTimeField> {
                             borderRadius: BorderRadius.circular(
                                 widget.borderRadius ?? 8.0),
                             borderSide: BorderSide(
-                              color: theme.errorColor(),
+                              color: MihColors.getRedColor(
+                                  MzansiInnovationHub.of(context)!.theme.mode ==
+                                      "Dark"),
                               width: 3.0,
                             ),
                           ),
@@ -156,7 +179,9 @@ class _MihTimeFieldState extends State<MihTimeField> {
                             borderRadius: BorderRadius.circular(
                                 widget.borderRadius ?? 8.0),
                             borderSide: BorderSide(
-                              color: theme.errorColor(),
+                              color: MihColors.getRedColor(
+                                  MzansiInnovationHub.of(context)!.theme.mode ==
+                                      "Dark"),
                               width: 3.0,
                             ),
                           ),
@@ -173,7 +198,9 @@ class _MihTimeFieldState extends State<MihTimeField> {
                           field.errorText ?? '',
                           style: TextStyle(
                             fontSize: 12,
-                            color: theme.errorColor(),
+                            color: MihColors.getRedColor(
+                                MzansiInnovationHub.of(context)!.theme.mode ==
+                                    "Dark"),
                             fontWeight: FontWeight.bold,
                           ),
                         ),

Frontend/lib/mih_components/mih_package_components/mih_toggle.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:mzansi_innovation_hub/main.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 
 class MihToggle extends StatefulWidget {
   final String hintText;
@@ -66,25 +67,27 @@ class _MihToggleState extends State<MihToggle> {
                 return Colors.grey;
               }
               if (states.contains(WidgetState.selected)) {
-                return MzansiInnovationHub.of(context)!
+                return MihColors.getGreenColor(
-                    .theme
+                    MzansiInnovationHub.of(context)!.theme.mode ==
-                    .successColor(); // Outline color when active
+                        "Dark"); // Outline color when active
               }
-              return MzansiInnovationHub.of(context)!
+              return MihColors.getRedColor(
-                  .theme
+                  MzansiInnovationHub.of(context)!.theme.mode ==
-                  .errorColor(); // Outline color when active
+                      "Dark"); // Outline color when active
             },
           ),
           activeColor:
               widget.readOnly == true ? Colors.grey : widget.secondaryFillColor,
           activeTrackColor: widget.readOnly == true
               ? Colors.grey.shade400
-              : MzansiInnovationHub.of(context)!.theme.successColor(),
+              : MihColors.getGreenColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
           inactiveThumbColor:
               widget.readOnly == true ? Colors.grey : widget.secondaryFillColor,
           inactiveTrackColor: widget.readOnly == true
               ? Colors.grey.shade400
-              : MzansiInnovationHub.of(context)!.theme.errorColor(),
+              : MihColors.getRedColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
           // activeColor: widget.secondaryFillColor,
           // activeTrackColor: widget.fillColor,
           // inactiveThumbColor: widget.fillColor,

Frontend/lib/mih_components/mih_pop_up_messages/mih_delete_message.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import '../../main.dart';
 
 class MIHDeleteMessage extends StatefulWidget {
@@ -59,10 +60,12 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
           width: popUpWidth,
           height: popUpheight,
           decoration: BoxDecoration(
-            color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+            color: MihColors.getPrimaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             borderRadius: BorderRadius.circular(25.0),
             border: Border.all(
-                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MihColors.getSecondaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 width: 5.0),
           ),
           child: SingleChildScrollView(
@@ -72,16 +75,16 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
                 Icon(
                   Icons.warning_amber_rounded,
                   size: popUpIconSize,
-                  color:
+                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 ),
                 //const SizedBox(height: 15),
                 Text(
                   "Are you sure you want to delete this?",
                   textAlign: TextAlign.center,
                   style: TextStyle(
-                    color:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: popUpTitleSize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -90,8 +93,8 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
                 Text(
                   "This note will be deleted permanently. Are you certain you want to delete it?",
                   style: TextStyle(
-                    color:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: popUpBodySize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -99,14 +102,15 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
                 const SizedBox(height: 15),
                 MihButton(
                   onPressed: widget.onTap,
-                  buttonColor:
+                  buttonColor: MihColors.getRedColor(
-                      MzansiInnovationHub.of(context)!.theme.errorColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   width: 300,
                   child: Text(
                     "Delete",
                     style: TextStyle(
-                      color:
+                      color: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                       fontSize: 20,
                       fontWeight: FontWeight.bold,
                     ),
@@ -127,7 +131,8 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
             },
             icon: Icon(
               Icons.close,
-              color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+              color: MihColors.getRedColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               size: 35,
             ),
           ),
@@ -144,10 +149,12 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
           width: popUpWidth,
           height: popUpheight,
           decoration: BoxDecoration(
-            color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+            color: MihColors.getPrimaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             borderRadius: BorderRadius.circular(25.0),
             border: Border.all(
-                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MihColors.getSecondaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 width: 5.0),
           ),
           child: SingleChildScrollView(
@@ -157,16 +164,16 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
                 Icon(
                   Icons.warning_amber_rounded,
                   size: popUpIconSize,
-                  color:
+                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 ),
                 //const SizedBox(height: 15),
                 Text(
                   "Are you sure you want to delete this?",
                   textAlign: TextAlign.center,
                   style: TextStyle(
-                    color:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: popUpTitleSize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -175,8 +182,8 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
                 Text(
                   "This file will be deleted permanently. Are you certain you want to delete it?",
                   style: TextStyle(
-                    color:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: popUpBodySize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -184,14 +191,15 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
                 const SizedBox(height: 15),
                 MihButton(
                   onPressed: widget.onTap,
-                  buttonColor:
+                  buttonColor: MihColors.getRedColor(
-                      MzansiInnovationHub.of(context)!.theme.errorColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   width: 300,
                   child: Text(
                     "Delete",
                     style: TextStyle(
-                      color:
+                      color: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                       fontSize: 20,
                       fontWeight: FontWeight.bold,
                     ),
@@ -212,7 +220,8 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
             },
             icon: Icon(
               Icons.close,
-              color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+              color: MihColors.getRedColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               size: 35,
             ),
           ),
@@ -229,10 +238,12 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
           width: popUpWidth,
           height: popUpheight,
           decoration: BoxDecoration(
-            color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+            color: MihColors.getPrimaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             borderRadius: BorderRadius.circular(25.0),
             border: Border.all(
-                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MihColors.getSecondaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 width: 5.0),
           ),
           child: SingleChildScrollView(
@@ -242,16 +253,16 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
                 Icon(
                   Icons.warning_amber_rounded,
                   size: popUpIconSize,
-                  color:
+                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 ),
                 //const SizedBox(height: 15),
                 Text(
                   "Are you sure you want to delete this?",
                   textAlign: TextAlign.center,
                   style: TextStyle(
-                    color:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: popUpTitleSize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -260,8 +271,8 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
                 Text(
                   "This team member will be deleted permanently from the business profile. Are you certain you want to delete it?",
                   style: TextStyle(
-                    color:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: popUpBodySize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -270,14 +281,15 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
 
                 MihButton(
                   onPressed: widget.onTap,
-                  buttonColor:
+                  buttonColor: MihColors.getRedColor(
-                      MzansiInnovationHub.of(context)!.theme.errorColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   width: 300,
                   child: Text(
                     "Delete",
                     style: TextStyle(
-                      color:
+                      color: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                       fontSize: 20,
                       fontWeight: FontWeight.bold,
                     ),
@@ -298,7 +310,8 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
             },
             icon: Icon(
               Icons.close,
-              color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+              color: MihColors.getRedColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               size: 35,
             ),
           ),
@@ -315,10 +328,12 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
           width: popUpWidth,
           height: popUpheight,
           decoration: BoxDecoration(
-            color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+            color: MihColors.getPrimaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             borderRadius: BorderRadius.circular(25.0),
             border: Border.all(
-                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MihColors.getSecondaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 width: 5.0),
           ),
           child: SingleChildScrollView(
@@ -328,16 +343,16 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
                 Icon(
                   Icons.warning_amber_rounded,
                   size: popUpIconSize,
-                  color:
+                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 ),
                 //const SizedBox(height: 15),
                 Text(
                   "Are you sure you want to delete this?",
                   textAlign: TextAlign.center,
                   style: TextStyle(
-                    color:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: popUpTitleSize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -346,8 +361,8 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
                 Text(
                   "This appointment will be deleted permanently from your calendar. Are you certain you want to delete it?",
                   style: TextStyle(
-                    color:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: popUpBodySize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -355,14 +370,15 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
                 const SizedBox(height: 15),
                 MihButton(
                   onPressed: widget.onTap,
-                  buttonColor:
+                  buttonColor: MihColors.getRedColor(
-                      MzansiInnovationHub.of(context)!.theme.errorColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   width: 300,
                   child: Text(
                     "Delete",
                     style: TextStyle(
-                      color:
+                      color: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                       fontSize: 20,
                       fontWeight: FontWeight.bold,
                     ),
@@ -383,7 +399,8 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
             },
             icon: Icon(
               Icons.close,
-              color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+              color: MihColors.getRedColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               size: 35,
             ),
           ),
@@ -400,10 +417,12 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
           width: popUpWidth,
           height: popUpheight,
           decoration: BoxDecoration(
-            color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+            color: MihColors.getPrimaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             borderRadius: BorderRadius.circular(25.0),
             border: Border.all(
-                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MihColors.getSecondaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 width: 5.0),
           ),
           child: SingleChildScrollView(
@@ -413,16 +432,16 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
                 Icon(
                   Icons.warning_amber_rounded,
                   size: popUpIconSize,
-                  color:
+                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 ),
                 //const SizedBox(height: 15),
                 Text(
                   "Are you sure you want to delete this?",
                   textAlign: TextAlign.center,
                   style: TextStyle(
-                    color:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: popUpTitleSize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -431,8 +450,8 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
                 Text(
                   "This Card will be deleted permanently from your Mzansi Wallet. Are you certain you want to delete it?",
                   style: TextStyle(
-                    color:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: popUpBodySize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -440,14 +459,15 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
                 const SizedBox(height: 15),
                 MihButton(
                   onPressed: widget.onTap,
-                  buttonColor:
+                  buttonColor: MihColors.getRedColor(
-                      MzansiInnovationHub.of(context)!.theme.errorColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   width: 300,
                   child: Text(
                     "Delete",
                     style: TextStyle(
-                      color:
+                      color: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                       fontSize: 20,
                       fontWeight: FontWeight.bold,
                     ),
@@ -468,7 +488,8 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
             },
             icon: Icon(
               Icons.close,
-              color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+              color: MihColors.getRedColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               size: 35,
             ),
           ),

Frontend/lib/mih_components/mih_pop_up_messages/mih_error_message.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import '../../main.dart';
 
 class MIHErrorMessage extends StatefulWidget {
@@ -55,10 +56,12 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
           width: popUpWidth,
           height: popUpheight,
           decoration: BoxDecoration(
-            color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+            color: MihColors.getPrimaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             borderRadius: BorderRadius.circular(25.0),
             border: Border.all(
-                color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+                color: MihColors.getRedColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 width: 5.0),
           ),
           child: SingleChildScrollView(
@@ -68,14 +71,16 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                 Icon(
                   Icons.warning_amber_rounded,
                   size: popUpIconSize,
-                  color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+                  color: MihColors.getRedColor(
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 ),
                 //const SizedBox(height: 5),
                 Text(
                   "Oops! Looks like some fields are missing.",
                   textAlign: TextAlign.center,
                   style: TextStyle(
-                    color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+                    color: MihColors.getRedColor(
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: popUpTitleSize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -84,8 +89,8 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                 Text(
                   "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:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: popUpBodySize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -94,9 +99,9 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                 RichText(
                   text: TextSpan(
                     style: TextStyle(
-                      color: MzansiInnovationHub.of(context)!
+                      color: MihColors.getSecondaryColor(
-                          .theme
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                          .secondaryColor(),
+                              "Dark"),
                       fontSize: popUpBodySize,
                       fontWeight: FontWeight.bold,
                     ),
@@ -105,17 +110,17 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                           text: "Here's a quick tip: ",
                           style: TextStyle(
                               fontStyle: FontStyle.italic,
-                              color: MzansiInnovationHub.of(context)!
+                              color: MihColors.getRedColor(
-                                  .theme
+                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                  .errorColor())),
+                                      "Dark"))),
                       const TextSpan(
                           text: "Look for fields with an asterisk ("),
                       TextSpan(
                           text: "*",
                           style: TextStyle(
-                              color: MzansiInnovationHub.of(context)!
+                              color: MihColors.getRedColor(
-                                  .theme
+                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                  .errorColor())),
+                                      "Dark"))),
                       const TextSpan(
                           text: ") next to them, as these are mandatory."),
                     ],
@@ -137,7 +142,8 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
             },
             icon: Icon(
               Icons.close,
-              color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+              color: MihColors.getRedColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               size: 35,
             ),
           ),
@@ -154,10 +160,12 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
           width: popUpWidth,
           height: popUpheight,
           decoration: BoxDecoration(
-            color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+            color: MihColors.getPrimaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             borderRadius: BorderRadius.circular(25.0),
             border: Border.all(
-                color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+                color: MihColors.getRedColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 width: 5.0),
           ),
           child: SingleChildScrollView(
@@ -167,14 +175,16 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                 Icon(
                   Icons.warning_amber_rounded,
                   size: popUpIconSize,
-                  color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+                  color: MihColors.getRedColor(
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 ),
                 //const SizedBox(height: 15),
                 Text(
                   "Password Doesn't Meet Requirements",
                   textAlign: TextAlign.center,
                   style: TextStyle(
-                    color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+                    color: MihColors.getRedColor(
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: popUpTitleSize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -183,8 +193,8 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                 Text(
                   "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:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: popUpBodySize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -193,9 +203,9 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                 RichText(
                   text: TextSpan(
                     style: TextStyle(
-                      color: MzansiInnovationHub.of(context)!
+                      color: MihColors.getSecondaryColor(
-                          .theme
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                          .secondaryColor(),
+                              "Dark"),
                       fontSize: 15.0,
                       fontWeight: FontWeight.bold,
                     ),
@@ -205,9 +215,9 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                           style: TextStyle(
                               fontStyle: FontStyle.italic,
                               fontSize: popUpBodySize,
-                              color: MzansiInnovationHub.of(context)!
+                              color: MihColors.getRedColor(
-                                  .theme
+                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                  .errorColor())),
+                                      "Dark"))),
                       const TextSpan(
                         text: "1) Contailes at least 8 characters\n",
                       ),
@@ -243,7 +253,8 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
             },
             icon: Icon(
               Icons.close,
-              color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+              color: MihColors.getRedColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               size: 35,
             ),
           ),
@@ -260,10 +271,12 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
           width: popUpWidth,
           height: popUpheight,
           decoration: BoxDecoration(
-            color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+            color: MihColors.getPrimaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             borderRadius: BorderRadius.circular(25.0),
             border: Border.all(
-                color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+                color: MihColors.getRedColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 width: 5.0),
           ),
           child: SingleChildScrollView(
@@ -273,14 +286,16 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                 Icon(
                   Icons.warning_amber_rounded,
                   size: popUpIconSize,
-                  color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+                  color: MihColors.getRedColor(
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 ),
                 //const SizedBox(height: 15),
                 Text(
                   "Let's Fix That Username",
                   textAlign: TextAlign.center,
                   style: TextStyle(
-                    color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+                    color: MihColors.getRedColor(
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: popUpTitleSize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -289,8 +304,8 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                 Text(
                   "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:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: popUpBodySize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -311,7 +326,8 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
             },
             icon: Icon(
               Icons.close,
-              color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+              color: MihColors.getRedColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               size: 35,
             ),
           ),
@@ -328,10 +344,12 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
           width: popUpWidth,
           height: popUpheight,
           decoration: BoxDecoration(
-            color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+            color: MihColors.getPrimaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             borderRadius: BorderRadius.circular(25.0),
             border: Border.all(
-                color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+                color: MihColors.getRedColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 width: 5.0),
           ),
           child: SingleChildScrollView(
@@ -341,14 +359,16 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                 Icon(
                   Icons.warning_amber_rounded,
                   size: popUpIconSize,
-                  color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+                  color: MihColors.getRedColor(
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 ),
                 //const SizedBox(height: 15),
                 Text(
                   "Oops! Invalid Email",
                   textAlign: TextAlign.center,
                   style: TextStyle(
-                    color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+                    color: MihColors.getRedColor(
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: popUpTitleSize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -357,8 +377,8 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                 Text(
                   "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:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: popUpBodySize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -379,7 +399,8 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
             },
             icon: Icon(
               Icons.close,
-              color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+              color: MihColors.getRedColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               size: 35,
             ),
           ),
@@ -396,10 +417,12 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
           width: popUpWidth,
           height: popUpheight,
           decoration: BoxDecoration(
-            color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+            color: MihColors.getPrimaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             borderRadius: BorderRadius.circular(25.0),
             border: Border.all(
-                color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+                color: MihColors.getRedColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 width: 5.0),
           ),
           child: SingleChildScrollView(
@@ -409,14 +432,16 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                 Icon(
                   Icons.warning_amber_rounded,
                   size: popUpIconSize,
-                  color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+                  color: MihColors.getRedColor(
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 ),
                 //SizedBox(height: 15),
                 Text(
                   "Email Already Exists",
                   textAlign: TextAlign.center,
                   style: TextStyle(
-                    color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+                    color: MihColors.getRedColor(
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: popUpTitleSize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -425,8 +450,8 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                 Text(
                   "An account is already registered with this email address. Please try logging in or use a different email.",
                   style: TextStyle(
-                    color:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: popUpBodySize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -435,7 +460,8 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                 Text(
                   "Here are some things to keep in mind:",
                   style: TextStyle(
-                    color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+                    color: MihColors.getRedColor(
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: popUpSubtitleSize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -445,8 +471,8 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                   "1) Are you sure you're using the correct email address associated with your account?\n2) Is your caps lock key on? Passwords are case-sensitive.\n3) If you've forgotten your password, no worries! Click on \"Forgot Password?\" to reset it.",
                   textAlign: TextAlign.left,
                   style: TextStyle(
-                    color:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: 15.0,
                     fontWeight: FontWeight.bold,
                   ),
@@ -466,7 +492,8 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
             },
             icon: Icon(
               Icons.close,
-              color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+              color: MihColors.getRedColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               size: 35,
             ),
           ),
@@ -483,10 +510,12 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
           width: popUpWidth,
           height: popUpheight,
           decoration: BoxDecoration(
-            color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+            color: MihColors.getPrimaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             borderRadius: BorderRadius.circular(25.0),
             border: Border.all(
-                color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+                color: MihColors.getRedColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 width: 5.0),
           ),
           child: SingleChildScrollView(
@@ -496,14 +525,16 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                 Icon(
                   Icons.warning_amber_rounded,
                   size: popUpIconSize,
-                  color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+                  color: MihColors.getRedColor(
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 ),
                 //SizedBox(height: 15),
                 Text(
                   "Passwords Don't Match",
                   textAlign: TextAlign.center,
                   style: TextStyle(
-                    color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+                    color: MihColors.getRedColor(
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: popUpTitleSize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -512,8 +543,8 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                 Text(
                   "The password and confirm password fields do not match. Please make sure they are identical.",
                   style: TextStyle(
-                    color:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: popUpBodySize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -522,7 +553,8 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                 Text(
                   "Here are some things to keep in mind:",
                   style: TextStyle(
-                    color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+                    color: MihColors.getRedColor(
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: popUpSubtitleSize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -532,8 +564,8 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                   "1) Are you sure you're using the correct email address associated with your account?\n2) Is your caps lock key on? Passwords are case-sensitive.\n3) If you've forgotten your password, no worries! Click on \"Forgot Password?\" to reset it.",
                   textAlign: TextAlign.left,
                   style: TextStyle(
-                    color:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: popUpBodySize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -554,7 +586,8 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
             },
             icon: Icon(
               Icons.close,
-              color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+              color: MihColors.getRedColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               size: 35,
             ),
           ),
@@ -571,10 +604,12 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
           width: popUpWidth,
           height: popUpheight,
           decoration: BoxDecoration(
-            color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+            color: MihColors.getPrimaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             borderRadius: BorderRadius.circular(25.0),
             border: Border.all(
-                color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+                color: MihColors.getRedColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 width: 5.0),
           ),
           child: SingleChildScrollView(
@@ -584,14 +619,16 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                 Icon(
                   Icons.warning_amber_rounded,
                   size: popUpIconSize,
-                  color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+                  color: MihColors.getRedColor(
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 ),
                 //SizedBox(height: 15),
                 Text(
                   "Uh oh! Login attempt unsuccessful.",
                   textAlign: TextAlign.center,
                   style: TextStyle(
-                    color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+                    color: MihColors.getRedColor(
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: popUpTitleSize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -600,8 +637,8 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                 Text(
                   "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:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: popUpBodySize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -610,7 +647,8 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                 Text(
                   "Here are some things to keep in mind:",
                   style: TextStyle(
-                    color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+                    color: MihColors.getRedColor(
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: popUpSubtitleSize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -620,8 +658,8 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                   "1) Are you sure you're using the correct email address associated with your account?\n2) Is your caps lock key on? Passwords are case-sensitive.\n3) If you've forgotten your password, no worries! Click on \"Forgot Password?\" to reset it.",
                   textAlign: TextAlign.left,
                   style: TextStyle(
-                    color:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: popUpBodySize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -642,7 +680,8 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
             },
             icon: Icon(
               Icons.close,
-              color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+              color: MihColors.getRedColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               size: 35,
             ),
           ),
@@ -659,10 +698,12 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
           width: popUpWidth,
           height: popUpheight,
           decoration: BoxDecoration(
-            color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+            color: MihColors.getPrimaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             borderRadius: BorderRadius.circular(25.0),
             border: Border.all(
-                color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+                color: MihColors.getRedColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 width: 5.0),
           ),
           child: SingleChildScrollView(
@@ -672,14 +713,16 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                 Icon(
                   Icons.warning_amber_rounded,
                   size: popUpIconSize,
-                  color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+                  color: MihColors.getRedColor(
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 ),
                 //const SizedBox(height: 15),
                 Text(
                   "Internet Connection Lost!",
                   textAlign: TextAlign.center,
                   style: TextStyle(
-                    color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+                    color: MihColors.getRedColor(
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: popUpTitleSize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -688,8 +731,8 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                 Text(
                   "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:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: popUpBodySize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -698,7 +741,8 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                 Text(
                   "Here are a few things you can try:",
                   style: TextStyle(
-                    color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+                    color: MihColors.getRedColor(
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: popUpSubtitleSize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -708,8 +752,8 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                   "1) Check your Wi-Fi signal strength or try connecting to a different network.\n2) Restart your device (computer, phone, etc.) and your router/modem.\n3) If you're using cellular data, ensure you have a strong signal and haven't reached your data limit.",
                   textAlign: TextAlign.left,
                   style: TextStyle(
-                    color:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: popUpBodySize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -730,7 +774,8 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
             },
             icon: Icon(
               Icons.close,
-              color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+              color: MihColors.getRedColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               size: 35,
             ),
           ),
@@ -747,10 +792,12 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
           width: popUpWidth,
           height: popUpheight,
           decoration: BoxDecoration(
-            color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+            color: MihColors.getPrimaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             borderRadius: BorderRadius.circular(25.0),
             border: Border.all(
-                color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+                color: MihColors.getRedColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 width: 5.0),
           ),
           child: SingleChildScrollView(
@@ -760,14 +807,16 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                 Icon(
                   Icons.warning_amber_rounded,
                   size: popUpIconSize,
-                  color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+                  color: MihColors.getRedColor(
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 ),
                 //const SizedBox(height: 15),
                 Text(
                   "Location Services Not Enabled",
                   textAlign: TextAlign.center,
                   style: TextStyle(
-                    color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+                    color: MihColors.getRedColor(
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: popUpTitleSize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -776,8 +825,8 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                 Text(
                   "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:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: popUpBodySize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -786,7 +835,7 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                 // Text(
                 //   "Here are a few things you can try:",
                 //   style: TextStyle(
-                //     color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+                //     color: MihColors.getRedColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 //     fontSize: popUpSubtitleSize,
                 //     fontWeight: FontWeight.bold,
                 //   ),
@@ -797,7 +846,7 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
                 //   textAlign: TextAlign.left,
                 //   style: TextStyle(
                 //     color:
-                //         MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                //         MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 //     fontSize: popUpBodySize,
                 //     fontWeight: FontWeight.bold,
                 //   ),
@@ -818,7 +867,8 @@ class _MIHErrorMessageState extends State<MIHErrorMessage> {
             },
             icon: Icon(
               Icons.close,
-              color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+              color: MihColors.getRedColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               size: 35,
             ),
           ),

Frontend/lib/mih_components/mih_pop_up_messages/mih_loading_circle.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import '../../main.dart';
 import 'package:gif_view/gif_view.dart';
 
@@ -58,11 +59,12 @@ class _MihloadingcircleState extends State<Mihloadingcircle> {
               // width: 250,
               // height: 275,
               decoration: BoxDecoration(
-                color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                color: MihColors.getPrimaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 borderRadius: BorderRadius.circular(25.0),
                 border: Border.all(
-                    color:
+                    color: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     width: 5.0),
               ),
               child: Column(

Frontend/lib/mih_components/mih_pop_up_messages/mih_notification_message.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import '../../main.dart';
 import '../../mih_components/mih_objects/arguments.dart';
 
@@ -131,8 +132,10 @@ class _MIHNotificationMessageState extends State<MIHNotificationMessage>
   void initState() {
     super.initState();
     setState(() {
-      primary = MzansiInnovationHub.of(context)!.theme.primaryColor();
+      primary = MihColors.getPrimaryColor(
-      secondary = MzansiInnovationHub.of(context)!.theme.errorColor();
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark");
+      secondary = MihColors.getRedColor(
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark");
     });
     _animationController = AnimationController(
       vsync: this,

Frontend/lib/mih_components/mih_pop_up_messages/mih_success_message.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import '../../main.dart';
 
 class MIHSuccessMessage extends StatefulWidget {
@@ -59,10 +60,12 @@ class _MIHSuccessMessageState extends State<MIHSuccessMessage> {
           width: popUpWidth,
           height: popUpheight,
           decoration: BoxDecoration(
-            color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+            color: MihColors.getPrimaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             borderRadius: BorderRadius.circular(25.0),
             border: Border.all(
-                color: MzansiInnovationHub.of(context)!.theme.successColor(),
+                color: MihColors.getGreenColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 width: 5.0),
           ),
           child: Column(
@@ -71,14 +74,16 @@ class _MIHSuccessMessageState extends State<MIHSuccessMessage> {
               Icon(
                 Icons.check_circle_outline_rounded,
                 size: popUpIconSize,
-                color: MzansiInnovationHub.of(context)!.theme.successColor(),
+                color: MihColors.getGreenColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               ),
               //const SizedBox(height: 15),
               Text(
                 "Success!",
                 textAlign: TextAlign.center,
                 style: TextStyle(
-                  color: MzansiInnovationHub.of(context)!.theme.successColor(),
+                  color: MihColors.getGreenColor(
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   fontSize: popUpTitleSize,
                   fontWeight: FontWeight.bold,
                 ),
@@ -88,8 +93,8 @@ class _MIHSuccessMessageState extends State<MIHSuccessMessage> {
                 child: Text(
                   message,
                   style: TextStyle(
-                    color:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: popUpBodySize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -100,14 +105,14 @@ class _MIHSuccessMessageState extends State<MIHSuccessMessage> {
                 onPressed: () {
                   Navigator.pop(context);
                 },
-                buttonColor:
+                buttonColor: MihColors.getGreenColor(
-                    MzansiInnovationHub.of(context)!.theme.successColor(),
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 width: 300,
                 child: Text(
                   "Dismiss",
                   style: TextStyle(
-                    color:
+                    color: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: 20,
                     fontWeight: FontWeight.bold,
                   ),

Frontend/lib/mih_components/mih_pop_up_messages/mih_warning_message.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import '../../main.dart';
 
 class MIHWarningMessage extends StatefulWidget {
@@ -56,10 +57,12 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
           width: popUpWidth,
           height: popUpheight,
           decoration: BoxDecoration(
-            color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+            color: MihColors.getPrimaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             borderRadius: BorderRadius.circular(25.0),
             border: Border.all(
-                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MihColors.getSecondaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 width: 5.0),
           ),
           child: SingleChildScrollView(
@@ -69,16 +72,16 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
                 Icon(
                   Icons.warning_amber_rounded,
                   size: popUpIconSize,
-                  color:
+                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 ),
                 //const SizedBox(height: 15),
                 Text(
                   "Access Pending",
                   textAlign: TextAlign.center,
                   style: TextStyle(
-                    color:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: popUpTitleSize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -87,8 +90,8 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
                 Text(
                   "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:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: popUpBodySize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -109,7 +112,8 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
             },
             icon: Icon(
               Icons.close,
-              color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+              color: MihColors.getRedColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               size: 35,
             ),
           ),
@@ -126,10 +130,12 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
           width: popUpWidth,
           height: popUpheight,
           decoration: BoxDecoration(
-            color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+            color: MihColors.getPrimaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             borderRadius: BorderRadius.circular(25.0),
             border: Border.all(
-                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MihColors.getSecondaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 width: 5.0),
           ),
           child: SingleChildScrollView(
@@ -139,16 +145,16 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
                 Icon(
                   Icons.warning_amber_rounded,
                   size: popUpIconSize,
-                  color:
+                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 ),
                 //const SizedBox(height: 15),
                 Text(
                   "Patient Profile Access Needed",
                   textAlign: TextAlign.center,
                   style: TextStyle(
-                    color:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: popUpTitleSize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -157,8 +163,8 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
                 Text(
                   "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:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: popUpBodySize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -179,7 +185,8 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
             },
             icon: Icon(
               Icons.close,
-              color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+              color: MihColors.getRedColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               size: 35,
             ),
           ),
@@ -196,10 +203,12 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
           width: popUpWidth,
           height: popUpheight,
           decoration: BoxDecoration(
-            color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+            color: MihColors.getPrimaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             borderRadius: BorderRadius.circular(25.0),
             border: Border.all(
-                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MihColors.getSecondaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 width: 5.0),
           ),
           child: SingleChildScrollView(
@@ -209,16 +218,16 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
                 Icon(
                   Icons.warning_amber_rounded,
                   size: popUpIconSize,
-                  color:
+                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 ),
                 //const SizedBox(height: 15),
                 Text(
                   "Appointment Cancelled",
                   textAlign: TextAlign.center,
                   style: TextStyle(
-                    color:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: popUpTitleSize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -227,8 +236,8 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
                 Text(
                   "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:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: popUpBodySize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -249,7 +258,8 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
             },
             icon: Icon(
               Icons.close,
-              color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+              color: MihColors.getRedColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               size: 35,
             ),
           ),
@@ -266,10 +276,12 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
           width: popUpWidth,
           height: popUpheight,
           decoration: BoxDecoration(
-            color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+            color: MihColors.getPrimaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             borderRadius: BorderRadius.circular(25.0),
             border: Border.all(
-                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MihColors.getSecondaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 width: 5.0),
           ),
           child: SingleChildScrollView(
@@ -279,16 +291,16 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
                 Icon(
                   Icons.warning_amber_rounded,
                   size: popUpIconSize,
-                  color:
+                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 ),
                 //const SizedBox(height: 15),
                 Text(
                   "Access Cancelled",
                   textAlign: TextAlign.center,
                   style: TextStyle(
-                    color:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: popUpTitleSize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -297,8 +309,8 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
                 Text(
                   "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:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: popUpBodySize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -319,7 +331,8 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
             },
             icon: Icon(
               Icons.close,
-              color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+              color: MihColors.getRedColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               size: 35,
             ),
           ),
@@ -336,10 +349,12 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
           width: popUpWidth,
           height: popUpheight,
           decoration: BoxDecoration(
-            color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+            color: MihColors.getPrimaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             borderRadius: BorderRadius.circular(25.0),
             border: Border.all(
-                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MihColors.getSecondaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 width: 5.0),
           ),
           child: SingleChildScrollView(
@@ -349,16 +364,16 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
                 Icon(
                   Icons.warning_amber_rounded,
                   size: popUpIconSize,
-                  color:
+                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 ),
                 //const SizedBox(height: 15),
                 Text(
                   "Access Declined",
                   textAlign: TextAlign.center,
                   style: TextStyle(
-                    color:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: popUpTitleSize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -367,8 +382,8 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
                 Text(
                   "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:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: popUpBodySize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -389,7 +404,8 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
             },
             icon: Icon(
               Icons.close,
-              color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+              color: MihColors.getRedColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               size: 35,
             ),
           ),
@@ -406,10 +422,12 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
           width: popUpWidth,
           height: popUpheight,
           decoration: BoxDecoration(
-            color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+            color: MihColors.getPrimaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             borderRadius: BorderRadius.circular(25.0),
             border: Border.all(
-                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MihColors.getSecondaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 width: 5.0),
           ),
           child: SingleChildScrollView(
@@ -419,16 +437,16 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
                 Icon(
                   Icons.warning_amber_rounded,
                   size: popUpIconSize,
-                  color:
+                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 ),
                 //const SizedBox(height: 15),
                 Text(
                   "Access Expired",
                   textAlign: TextAlign.center,
                   style: TextStyle(
-                    color:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: popUpTitleSize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -437,8 +455,8 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
                 Text(
                   "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:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: popUpBodySize,
                     fontWeight: FontWeight.bold,
                   ),
@@ -459,7 +477,8 @@ class _MIHDeleteMessageState extends State<MIHWarningMessage> {
             },
             icon: Icon(
               Icons.close,
-              color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+              color: MihColors.getRedColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               size: 35,
             ),
           ),

Frontend/lib/mih_config/mih_colors.dart

@@ -1,74 +1,96 @@
 import 'package:flutter/material.dart';
-import 'package:mzansi_innovation_hub/main.dart';
 
 class MihColors {
-
+  static Color getPrimaryColor(bool darkMode) {
-  static Color getPrimaryColor(BuildContext context) {
+    if (darkMode == true) {
-    if(MzansiInnovationHub.of(context)!.theme.mode == "Dark"){
       return const Color(0XFF3A4454);
-    }else{
+    } else {
       return const Color(0XFFbedcfe);
     }
   }
 
-  static Color getSecondaryColor(BuildContext context) {
+  static Color getSecondaryColor(bool darkMode) {
-    if(MzansiInnovationHub.of(context)!.theme.mode == "Dark"){
+    if (darkMode == true) {
       return const Color(0XFFbedcfe);
-    }else{
+    } else {
       return const Color(0XFF3A4454);
     }
   }
 
-  static Color getGreenColor(BuildContext context) {
+  static Color getHighlightColor(bool darkMode) {
-    if(MzansiInnovationHub.of(context)!.theme.mode == "Dark"){
+    if (darkMode == true) {
+      return const Color(0XFF9bc7fa);
+    } else {
+      return const Color(0XFF354866);
+    }
+  }
+
+  static Color getGreyColor(bool darkMode) {
+    if (darkMode == true) {
+      return const Color(0XFFc8c8c8);
+    } else {
+      return const Color(0XFF747474);
+    }
+  }
+
+  static Color getGreenColor(bool darkMode) {
+    if (darkMode == true) {
       return const Color(0xff8ae290);
-    }else{
+    } else {
       return const Color(0xffB0F2B4);
     }
   }
 
-  static Color getRedColor(BuildContext context) {
+  static Color getRedColor(bool darkMode) {
-    if(MzansiInnovationHub.of(context)!.theme.mode == "Dark"){
+    if (darkMode == true) {
       return const Color(0xffD87E8B);
-    }else{
+    } else {
       return const Color(0xffbb3d4f);
     }
   }
 
-  static Color getPinkColor(BuildContext context) {
+  static Color getPinkColor(bool darkMode) {
-    if(MzansiInnovationHub.of(context)!.theme.mode == "Dark"){
+    if (darkMode == true) {
       return const Color(0xffdaa2e9);
-    }else{
+    } else {
       // Add a different shade of pink for light mode
       return const Color(0xffdaa2e9);
     }
   }
 
-  static Color getOrangeColor(BuildContext context) {
+  static Color getOrangeColor(bool darkMode) {
-    if(MzansiInnovationHub.of(context)!.theme.mode == "Dark"){
+    if (darkMode == true) {
       return const Color(0xffd69d7d);
-    }else{
+    } else {
       // Add a different shade of pink for light mode
       return const Color(0xffd69d7d);
     }
   }
 
-  static Color getYellowColor(BuildContext context) {
+  static Color getYellowColor(bool darkMode) {
-    if(MzansiInnovationHub.of(context)!.theme.mode == "Dark"){
+    if (darkMode == true) {
       return const Color(0xfff4e467);
-    }else{
+    } else {
       // Add a different shade of pink for light mode
       return const Color(0xffd4af37);
     }
-}
+  }
 
-  static Color getBluishPurpleColor(BuildContext context) {
+  static Color getBluishPurpleColor(bool darkMode) {
-    if(MzansiInnovationHub.of(context)!.theme.mode == "Dark"){
+    if (darkMode == true) {
       return const Color(0xff6e7dcc);
-    }else{
+    } else {
       // Add a different shade of pink for light mode
       return const Color(0xff6e7dcc);
     }
-}
+  }
 
+  static Color getPurpleColor(bool darkMode) {
+    if (darkMode == true) {
+      return const Color(0xffb682e7);
+    } else {
+      // Add a different shade of pink for light mode
+      return const Color(0xffb682e7);
+    }
+  }
 }

Frontend/lib/mih_config/mih_theme.dart

@@ -1,12 +1,13 @@
 import 'package:flutter/material.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import "package:universal_html/html.dart" as html;
 
 class MihTheme {
-  late int _mainColor;
+  // late int _mainColor;
-  late int _secondColor;
+  // late int _secondColor;
   //late int _errColor;
   //late int _succColor;
-  late int _mesColor;
+  // late int _mesColor;
   late String mode;
   late String screenType;
   late AssetImage loading;
@@ -32,10 +33,10 @@ class MihTheme {
     //_mesColor = 0xffc8c8c8d9;
   }
 
-  ThemeData getData() {
+  ThemeData getData(bool bool) {
     return ThemeData(
         fontFamily: 'Segoe UI',
-        scaffoldBackgroundColor: primaryColor(),
+        scaffoldBackgroundColor: MihColors.getPrimaryColor(mode == "Dark"),
         // pageTransitionsTheme: PageTransitionsTheme(
         //   builders: Map<TargetPlatform, PageTransitionsBuilder>.fromIterable(
         //     TargetPlatform.values,
@@ -44,36 +45,37 @@ class MihTheme {
         // ),
         colorScheme: ColorScheme(
           brightness: getBritness(),
-          primary: secondaryColor(),
+          primary: MihColors.getSecondaryColor(mode == "Dark"),
-          onPrimary: primaryColor(),
+          onPrimary: MihColors.getPrimaryColor(mode == "Dark"),
-          secondary: primaryColor(),
+          secondary: MihColors.getPrimaryColor(mode == "Dark"),
-          onSecondary: secondaryColor(),
+          onSecondary: MihColors.getSecondaryColor(mode == "Dark"),
-          error: errorColor(),
+          error: MihColors.getRedColor(mode == "Dark"),
-          onError: primaryColor(),
+          onError: MihColors.getPrimaryColor(mode == "Dark"),
-          surface: primaryColor(),
+          surface: MihColors.getPrimaryColor(mode == "Dark"),
-          onSurface: secondaryColor(),
+          onSurface: MihColors.getSecondaryColor(mode == "Dark"),
         ),
         datePickerTheme: DatePickerThemeData(
-          backgroundColor: primaryColor(),
+          backgroundColor: MihColors.getPrimaryColor(mode == "Dark"),
-          headerBackgroundColor: secondaryColor(),
+          headerBackgroundColor: MihColors.getSecondaryColor(mode == "Dark"),
-          headerForegroundColor: primaryColor(),
+          headerForegroundColor: MihColors.getPrimaryColor(mode == "Dark"),
         ),
         appBarTheme: AppBarTheme(
-          color: secondaryColor(),
+          color: MihColors.getSecondaryColor(mode == "Dark"),
-          foregroundColor: primaryColor(),
+          foregroundColor: MihColors.getPrimaryColor(mode == "Dark"),
           titleTextStyle: TextStyle(
-            color: primaryColor(),
+            color: MihColors.getPrimaryColor(mode == "Dark"),
             fontSize: 25,
             fontWeight: FontWeight.bold,
           ),
         ),
         floatingActionButtonTheme: FloatingActionButtonThemeData(
-          backgroundColor: secondaryColor(),
+          backgroundColor: MihColors.getSecondaryColor(mode == "Dark"),
-          foregroundColor: primaryColor(),
+          foregroundColor: MihColors.getPrimaryColor(mode == "Dark"),
-          extendedTextStyle: TextStyle(color: primaryColor()),
+          extendedTextStyle:
+              TextStyle(color: MihColors.getPrimaryColor(mode == "Dark")),
         ),
         drawerTheme: DrawerThemeData(
-          backgroundColor: primaryColor(),
+          backgroundColor: MihColors.getPrimaryColor(mode == "Dark"),
         ));
   }
 
@@ -110,15 +112,15 @@ class MihTheme {
   }
 
   ThemeData getThemeData() {
-    return getData();
+    return getData(mode == "Dark");
   }
 
   ThemeData darkMode() {
-    return getData();
+    return getData(mode == "Dark");
   }
 
   ThemeData lightMode() {
-    return getData();
+    return getData(mode == "Dark");
   }
 
   Brightness getBritness() {
@@ -129,39 +131,39 @@ class MihTheme {
     }
   }
 
-  Color messageTextColor() {
+  // Color messageTextColor() {
-    if (mode == "Dark") {
+  //   if (mode == "Dark") {
-      _mesColor = 0XFFc8c8c8;
+  //     _mesColor = 0XFFc8c8c8;
-    } else {
+  //   } else {
-      _mesColor = 0XFF747474;
+  //     _mesColor = 0XFF747474;
-    }
+  //   }
-    return Color(_mesColor);
+  //   return Color(_mesColor);
-  }
+  // }
 
-  Color errorColor() {
+  // Color errorColor() {
-    if (mode == "Dark") {
+  //   if (mode == "Dark") {
-      return const Color(0xffD87E8B);
+  //     return const Color(0xffD87E8B);
-    } else {
+  //   } else {
-      return const Color(0xffbb3d4f);
+  //     return const Color(0xffbb3d4f);
-    }
+  //   }
-    //return Color(_errColor);
+  //   //return Color(_errColor);
-  }
+  // }
 
-  Color highlightColor() {
+  // Color highlightColor() {
-    if (mode == "Dark") {
+  //   if (mode == "Dark") {
-      return const Color(0XFF9bc7fa);
+  //     return const Color(0XFF9bc7fa);
-    } else {
+  //   } else {
-      return const Color(0XFF354866);
+  //     return const Color(0XFF354866);
-    }
+  //   }
-  }
+  // }
 
-  Color successColor() {
+  // Color successColor() {
-    if (mode == "Dark") {
+  //   if (mode == "Dark") {
-      return const Color(0xffB0F2B4);
+  //     return const Color(0xffB0F2B4);
-    } else {
+  //   } else {
-      return const Color(0xff56a95b);
+  //     return const Color(0xff56a95b);
-    }
+  //   }
-  }
+  // }
 
   AssetImage loadingImage() {
     if (mode == "Dark") {
@@ -231,21 +233,21 @@ class MihTheme {
     }
   }
 
-  Color primaryColor() {
+  // Color MihColors.getPrimaryColor(mode == "Dark") {
-    if (mode == "Dark") {
+  //   if (mode == "Dark") {
-      _mainColor = 0XFF3A4454;
+  //     _mainColor = 0XFF3A4454;
-    } else {
+  //   } else {
-      _mainColor = 0XFFbedcfe;
+  //     _mainColor = 0XFFbedcfe;
-    }
+  //   }
-    return Color(_mainColor);
+  //   return Color(_mainColor);
-  }
+  // }
 
-  Color secondaryColor() {
+//   Color MihColors.getSecondaryColor(mode == "Dark") {
-    if (mode == "Dark") {
+//     if (mode == "Dark") {
-      _secondColor = 0XFFbedcfe;
+//       _secondColor = 0XFFbedcfe;
-    } else {
+//     } else {
-      _secondColor = 0XFF3A4454;
+//       _secondColor = 0XFF3A4454;
-    }
+//     }
-    return Color(_secondColor);
+//     return Color(_secondColor);
-  }
+//   }
 }

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

@@ -1,6 +1,7 @@
-import 'package:mzansi_innovation_hub/main.dart';
 import 'package:flutter/material.dart';
+import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 
 class PolicyAndTermsText {
   List<Widget> getPrivacyPolicyText(BuildContext context) {
@@ -30,7 +31,8 @@ class PolicyAndTermsText {
         child: FittedBox(
           child: Icon(
             MihIcons.mihLogo,
-            color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+            color: MihColors.getSecondaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
           ),
         ),
       ),
@@ -427,7 +429,8 @@ class PolicyAndTermsText {
         child: FittedBox(
           child: Icon(
             MihIcons.mihLogo,
-            color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+            color: MihColors.getSecondaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
           ),
         ),
       ),

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

@@ -2,6 +2,7 @@ import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tile.dart';
 import 'package:flutter/material.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 
 class AboutMihTile extends StatefulWidget {
   final double packageSize;
@@ -27,12 +28,15 @@ class _AboutMihTileState extends State<AboutMihTile> {
       appName: "About MIH",
       appIcon: Icon(
         MihIcons.aboutMih,
-        color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+        color: MihColors.getSecondaryColor(
+            MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         // size: widget.packageSize,
       ),
       iconSize: widget.packageSize,
-      primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      primaryColor: MihColors.getSecondaryColor(
-      secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+      secondaryColor: MihColors.getPrimaryColor(
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
     );
   }
 }

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

@@ -4,6 +4,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 class MihAttributes extends StatefulWidget {
@@ -34,8 +35,8 @@ class _MihAttributesState extends State<MihAttributes> {
                   child: Icon(
                     icon,
                     // size: 125,
-                    color:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   ),
                 ),
               ),
@@ -70,13 +71,14 @@ class _MihAttributesState extends State<MihAttributes> {
                   ),
                 );
               },
-              buttonColor:
+              buttonColor: MihColors.getGreenColor(
-                  MzansiInnovationHub.of(context)!.theme.successColor(),
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               width: 100,
               child: Text(
                 "Visit",
                 style: TextStyle(
-                  color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                  color: MihColors.getPrimaryColor(
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   fontSize: 20,
                   fontWeight: FontWeight.bold,
                 ),
@@ -110,7 +112,8 @@ class _MihAttributesState extends State<MihAttributes> {
         children: [
           Icon(
             MihIcons.mihLogo,
-            color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+            color: MihColors.getSecondaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             size: 165,
           ),
           const SizedBox(

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

@@ -1,5 +1,6 @@
 import 'package:flutter_speed_dial/flutter_speed_dial.dart';
 import 'package:mzansi_innovation_hub/main.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_install_services.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_layout/mih_tile.dart';
@@ -62,8 +63,8 @@ class _MihInfoState extends State<MihInfo> {
               Padding(
                 padding: const EdgeInsets.only(left: 4.0),
                 child: CircleAvatar(
-                  backgroundColor:
+                  backgroundColor: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   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'),
@@ -73,7 +74,8 @@ class _MihInfoState extends State<MihInfo> {
               Icon(
                 MihIcons.mihRing,
                 size: 165,
-                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MihColors.getSecondaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               ),
             ],
           ),
@@ -233,12 +235,15 @@ class _MihInfoState extends State<MihInfo> {
       tileIcon: Center(
         child: FaIcon(
           FontAwesomeIcons.youtube,
-          color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+          color: MihColors.getPrimaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
           size: 175,
         ),
       ),
-      p: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      p: MihColors.getSecondaryColor(
-      s: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+      s: MihColors.getPrimaryColor(
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
     ));
     //==================================================================
     socials.add(MIHTile(
@@ -249,12 +254,15 @@ class _MihInfoState extends State<MihInfo> {
       tileIcon: Center(
         child: FaIcon(
           FontAwesomeIcons.tiktok,
-          color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+          color: MihColors.getPrimaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
           size: 200,
         ),
       ),
-      p: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      p: MihColors.getSecondaryColor(
-      s: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+      s: MihColors.getPrimaryColor(
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
     ));
     //==================================================================
     socials.add(MIHTile(
@@ -265,12 +273,15 @@ class _MihInfoState extends State<MihInfo> {
       tileIcon: Center(
         child: FaIcon(
           FontAwesomeIcons.twitch,
-          color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+          color: MihColors.getPrimaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
           size: 200,
         ),
       ),
-      p: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      p: MihColors.getSecondaryColor(
-      s: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+      s: MihColors.getPrimaryColor(
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
     ));
     //==================================================================
     socials.add(MIHTile(
@@ -281,12 +292,15 @@ class _MihInfoState extends State<MihInfo> {
       tileIcon: Center(
         child: FaIcon(
           FontAwesomeIcons.threads,
-          color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+          color: MihColors.getPrimaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
           size: 200,
         ),
       ),
-      p: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      p: MihColors.getSecondaryColor(
-      s: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+      s: MihColors.getPrimaryColor(
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
     ));
     //==================================================================
     socials.add(MIHTile(
@@ -297,12 +311,15 @@ class _MihInfoState extends State<MihInfo> {
       tileIcon: Center(
         child: FaIcon(
           FontAwesomeIcons.whatsapp,
-          color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+          color: MihColors.getPrimaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
           size: 200,
         ),
       ),
-      p: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      p: MihColors.getSecondaryColor(
-      s: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+      s: MihColors.getPrimaryColor(
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
     ));
     //==================================================================
     socials.add(MIHTile(
@@ -313,12 +330,15 @@ class _MihInfoState extends State<MihInfo> {
       tileIcon: Center(
         child: FaIcon(
           FontAwesomeIcons.instagram,
-          color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+          color: MihColors.getPrimaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
           size: 200,
         ),
       ),
-      p: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      p: MihColors.getSecondaryColor(
-      s: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+      s: MihColors.getPrimaryColor(
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
     ));
     //==================================================================
 
@@ -330,12 +350,15 @@ class _MihInfoState extends State<MihInfo> {
       tileIcon: Center(
         child: FaIcon(
           FontAwesomeIcons.xTwitter,
-          color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+          color: MihColors.getPrimaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
           size: 200,
         ),
       ),
-      p: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      p: MihColors.getSecondaryColor(
-      s: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+      s: MihColors.getPrimaryColor(
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
     ));
     //==================================================================
     socials.add(MIHTile(
@@ -346,12 +369,15 @@ class _MihInfoState extends State<MihInfo> {
       tileIcon: Center(
         child: FaIcon(
           FontAwesomeIcons.linkedin,
-          color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+          color: MihColors.getPrimaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
           size: 200,
         ),
       ),
-      p: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      p: MihColors.getSecondaryColor(
-      s: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+      s: MihColors.getPrimaryColor(
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
     ));
     //==================================================================
     socials.add(MIHTile(
@@ -362,12 +388,15 @@ class _MihInfoState extends State<MihInfo> {
       tileIcon: Center(
         child: FaIcon(
           FontAwesomeIcons.facebook,
-          color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+          color: MihColors.getPrimaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
           size: 200,
         ),
       ),
-      p: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      p: MihColors.getSecondaryColor(
-      s: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+      s: MihColors.getPrimaryColor(
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
     ));
     //==================================================================
     socials.add(MIHTile(
@@ -378,12 +407,15 @@ class _MihInfoState extends State<MihInfo> {
       tileIcon: Center(
         child: FaIcon(
           FontAwesomeIcons.reddit,
-          color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+          color: MihColors.getPrimaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
           size: 200,
         ),
       ),
-      p: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      p: MihColors.getSecondaryColor(
-      s: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+      s: MihColors.getPrimaryColor(
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
     ));
     //==================================================================
     socials.add(MIHTile(
@@ -395,19 +427,22 @@ class _MihInfoState extends State<MihInfo> {
         child: Text(
           "KICK",
           style: TextStyle(
-            color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+            color: MihColors.getPrimaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             fontWeight: FontWeight.bold,
             fontSize: 100,
           ),
         ),
         // FaIcon(
         //   FontAwesomeIcons.tv,
-        //   color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+        //   color: MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         //   size: 200,
         // ),
       ),
-      p: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      p: MihColors.getSecondaryColor(
-      s: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+      s: MihColors.getPrimaryColor(
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
     ));
     //==================================================================
     return socials;
@@ -447,13 +482,15 @@ class _MihInfoState extends State<MihInfo> {
       children: [
         FaIcon(
           platformIcon,
-          color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+          color: MihColors.getPrimaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         ),
         const SizedBox(width: 10),
         Text(
           btnText,
           style: TextStyle(
-            color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+            color: MihColors.getPrimaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             fontSize: 20,
             fontWeight: FontWeight.bold,
           ),
@@ -489,8 +526,8 @@ class _MihInfoState extends State<MihInfo> {
                 child: FittedBox(
                   child: Icon(
                     MihIcons.mihLogo,
-                    color:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   ),
                 ),
               ),
@@ -541,8 +578,9 @@ class _MihInfoState extends State<MihInfo> {
                       onPressed: () {
                         MihInstallServices().installMihTrigger(context);
                       },
-                      buttonColor:
+                      buttonColor: MihColors.getGreenColor(
-                          MzansiInnovationHub.of(context)!.theme.successColor(),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                       width: 300,
                       child: getInstallButtonText(),
                     ),
@@ -554,25 +592,26 @@ class _MihInfoState extends State<MihInfo> {
                           ),
                         );
                       },
-                      buttonColor:
+                      buttonColor: MihColors.getGreenColor(
-                          MzansiInnovationHub.of(context)!.theme.successColor(),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                       width: 300,
                       child: Row(
                         mainAxisAlignment: MainAxisAlignment.center,
                         children: [
                           FaIcon(
                             FontAwesomeIcons.youtube,
-                            color: MzansiInnovationHub.of(context)!
+                            color: MihColors.getPrimaryColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .primaryColor(),
+                                    "Dark"),
                           ),
                           const SizedBox(width: 10),
                           Text(
                             "MIH Beginners Guide",
                             style: TextStyle(
-                              color: MzansiInnovationHub.of(context)!
+                              color: MihColors.getPrimaryColor(
-                                  .theme
+                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                  .primaryColor(),
+                                      "Dark"),
                               fontSize: 20,
                               fontWeight: FontWeight.bold,
                             ),
@@ -588,25 +627,26 @@ class _MihInfoState extends State<MihInfo> {
                           ),
                         );
                       },
-                      buttonColor:
+                      buttonColor: MihColors.getGreenColor(
-                          MzansiInnovationHub.of(context)!.theme.successColor(),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                       width: 300,
                       child: Row(
                         mainAxisAlignment: MainAxisAlignment.center,
                         children: [
                           FaIcon(
                             FontAwesomeIcons.patreon,
-                            color: MzansiInnovationHub.of(context)!
+                            color: MihColors.getPrimaryColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .primaryColor(),
+                                    "Dark"),
                           ),
                           const SizedBox(width: 10),
                           Text(
                             "Support Our Journey",
                             style: TextStyle(
-                              color: MzansiInnovationHub.of(context)!
+                              color: MihColors.getPrimaryColor(
-                                  .theme
+                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                  .primaryColor(),
+                                      "Dark"),
                               fontSize: 20,
                               fontWeight: FontWeight.bold,
                             ),
@@ -650,17 +690,19 @@ class _MihInfoState extends State<MihInfo> {
               SpeedDialChild(
                 child: Icon(
                   Icons.vpn_lock,
-                  color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                  color: MihColors.getPrimaryColor(
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 ),
                 label: "MIH - Web",
-                labelBackgroundColor:
+                labelBackgroundColor: MihColors.getGreenColor(
-                    MzansiInnovationHub.of(context)!.theme.successColor(),
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 labelStyle: TextStyle(
-                  color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                  color: MihColors.getPrimaryColor(
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   fontWeight: FontWeight.bold,
                 ),
-                backgroundColor:
+                backgroundColor: MihColors.getGreenColor(
-                    MzansiInnovationHub.of(context)!.theme.successColor(),
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 onTap: () {
                   shareMIHLink(
                     context,
@@ -672,17 +714,19 @@ class _MihInfoState extends State<MihInfo> {
               SpeedDialChild(
                 child: Icon(
                   Icons.apple,
-                  color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                  color: MihColors.getPrimaryColor(
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 ),
                 label: "MIH - iOS",
-                labelBackgroundColor:
+                labelBackgroundColor: MihColors.getGreenColor(
-                    MzansiInnovationHub.of(context)!.theme.successColor(),
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 labelStyle: TextStyle(
-                  color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                  color: MihColors.getPrimaryColor(
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   fontWeight: FontWeight.bold,
                 ),
-                backgroundColor:
+                backgroundColor: MihColors.getGreenColor(
-                    MzansiInnovationHub.of(context)!.theme.successColor(),
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 onTap: () {
                   shareMIHLink(
                     context,
@@ -694,17 +738,19 @@ class _MihInfoState extends State<MihInfo> {
               SpeedDialChild(
                 child: Icon(
                   Icons.android,
-                  color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                  color: MihColors.getPrimaryColor(
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 ),
                 label: "MIH - Android",
-                labelBackgroundColor:
+                labelBackgroundColor: MihColors.getGreenColor(
-                    MzansiInnovationHub.of(context)!.theme.successColor(),
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 labelStyle: TextStyle(
-                  color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                  color: MihColors.getPrimaryColor(
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   fontWeight: FontWeight.bold,
                 ),
-                backgroundColor:
+                backgroundColor: MihColors.getGreenColor(
-                    MzansiInnovationHub.of(context)!.theme.successColor(),
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 onTap: () {
                   shareMIHLink(
                     context,

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

@@ -7,6 +7,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_
 import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_success_message.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_warning_message.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_config/mih_env.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/access_request.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart';
@@ -132,25 +133,28 @@ class _BuildPatientsListState extends State<BuildAccessRequestList> {
       accessWithColour = TextSpan(
           text: "$access\n",
           style: TextStyle(
-              color: MzansiInnovationHub.of(context)!.theme.successColor()));
+              color: MihColors.getGreenColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark")));
     } else if (access == "PENDING") {
       accessWithColour = TextSpan(
           text: "$access\n",
           style: TextStyle(
-              color:
+              color: MihColors.getGreyColor(
-                  MzansiInnovationHub.of(context)!.theme.messageTextColor()));
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark")));
     } else {
       accessWithColour = TextSpan(
           text: "$access\n",
           style: TextStyle(
-              color: MzansiInnovationHub.of(context)!.theme.errorColor()));
+              color: MihColors.getRedColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark")));
     }
 
     return ListTile(
       title: Text(
         line1,
         style: TextStyle(
-          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MihColors.getSecondaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         ),
       ),
       subtitle: RichText(
@@ -166,7 +170,7 @@ class _BuildPatientsListState extends State<BuildAccessRequestList> {
       // Text(
       //   subtitle,
       //   style: TextStyle(
-      //     color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      //     color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
       //   ),
       // ),
       onTap: () {
@@ -178,7 +182,7 @@ class _BuildPatientsListState extends State<BuildAccessRequestList> {
       },
       // trailing: Icon(
       //   Icons.arrow_forward,
-      //   color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      //   color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
       // ),
     );
   }
@@ -233,8 +237,8 @@ class _BuildPatientsListState extends State<BuildAccessRequestList> {
                   subtitle,
                   textAlign: TextAlign.left,
                   style: TextStyle(
-                    color:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: popUpBodySize,
                     //fontWeight: FontWeight.bold,
                   ),
@@ -248,15 +252,15 @@ class _BuildPatientsListState extends State<BuildAccessRequestList> {
                     onPressed: () {
                       updateAccessAPICall(index, "declined");
                     },
-                    buttonColor:
+                    buttonColor: MihColors.getRedColor(
-                        MzansiInnovationHub.of(context)!.theme.errorColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     width: 300,
                     child: Text(
                       "Decline",
                       style: TextStyle(
-                        color: MzansiInnovationHub.of(context)!
+                        color: MihColors.getPrimaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .primaryColor(),
+                                "Dark"),
                         fontSize: 20,
                         fontWeight: FontWeight.bold,
                       ),
@@ -266,15 +270,15 @@ class _BuildPatientsListState extends State<BuildAccessRequestList> {
                     onPressed: () {
                       updateAccessAPICall(index, "approved");
                     },
-                    buttonColor:
+                    buttonColor: MihColors.getGreenColor(
-                        MzansiInnovationHub.of(context)!.theme.successColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     width: 300,
                     child: Text(
                       "Approve",
                       style: TextStyle(
-                        color: MzansiInnovationHub.of(context)!
+                        color: MihColors.getPrimaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .primaryColor(),
+                                "Dark"),
                         fontSize: 20,
                         fontWeight: FontWeight.bold,
                       ),
@@ -311,7 +315,8 @@ class _BuildPatientsListState extends State<BuildAccessRequestList> {
       physics: const NeverScrollableScrollPhysics(),
       separatorBuilder: (BuildContext context, index) {
         return Divider(
-          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MihColors.getSecondaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         );
       },
       itemCount: widget.accessRequests.length,

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

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:mzansi_innovation_hub/main.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_service_calls.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart';
@@ -85,25 +86,28 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
       accessWithColour = TextSpan(
           text: "$access\n",
           style: TextStyle(
-              color: MzansiInnovationHub.of(context)!.theme.successColor()));
+              color: MihColors.getGreenColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark")));
     } else if (access == "PENDING") {
       accessWithColour = TextSpan(
           text: "$access\n",
           style: TextStyle(
-              color:
+              color: MihColors.getGreyColor(
-                  MzansiInnovationHub.of(context)!.theme.messageTextColor()));
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark")));
     } else {
       accessWithColour = TextSpan(
           text: "$access\n",
           style: TextStyle(
-              color: MzansiInnovationHub.of(context)!.theme.errorColor()));
+              color: MihColors.getRedColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark")));
     }
 
     return ListTile(
       title: Text(
         line1,
         style: TextStyle(
-          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MihColors.getSecondaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         ),
       ),
       subtitle: RichText(
@@ -118,7 +122,7 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
       // Text(
       //   subtitle,
       //   style: TextStyle(
-      //     color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      //     color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
       //   ),
       // ),
       onTap: () {
@@ -126,7 +130,7 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
       },
       // trailing: Icon(
       //   Icons.arrow_forward,
-      //   color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      //   color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
       // ),
     );
   }
@@ -194,8 +198,8 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
                   subtitle,
                   textAlign: TextAlign.left,
                   style: TextStyle(
-                    color:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: popUpBodySize,
                     //fontWeight: FontWeight.bold,
                   ),
@@ -212,16 +216,18 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
                       "Important Notice: Approving Profile Access",
                       style: TextStyle(
                         fontWeight: FontWeight.bold,
-                        color:
+                        color: MihColors.getRedColor(
-                            MzansiInnovationHub.of(context)!.theme.errorColor(),
+                            MzansiInnovationHub.of(context)!.theme.mode ==
+                                "Dark"),
                       ),
                     ),
                     Text(
                       "You are about to accept access to your patient's profile. Please be aware of the following important points:",
                       style: TextStyle(
                         fontWeight: FontWeight.normal,
-                        color:
+                        color: MihColors.getRedColor(
-                            MzansiInnovationHub.of(context)!.theme.errorColor(),
+                            MzansiInnovationHub.of(context)!.theme.mode ==
+                                "Dark"),
                       ),
                     ),
                     SizedBox(
@@ -230,9 +236,9 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
                         "1. Permanent Access: Once you accepts this access request, it will become permanent.",
                         style: TextStyle(
                           fontWeight: FontWeight.normal,
-                          color: MzansiInnovationHub.of(context)!
+                          color: MihColors.getRedColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .errorColor(),
+                                  "Dark"),
                         ),
                       ),
                     ),
@@ -242,9 +248,9 @@ 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: MzansiInnovationHub.of(context)!
+                          color: MihColors.getRedColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .errorColor(),
+                                  "Dark"),
                         ),
                       ),
                     ),
@@ -254,9 +260,9 @@ 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: MzansiInnovationHub.of(context)!
+                          color: MihColors.getRedColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .errorColor(),
+                                  "Dark"),
                         ),
                       ),
                     ),
@@ -264,8 +270,9 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
                       "By pressing the \"Approve\" button you accept the above terms.",
                       style: TextStyle(
                         fontWeight: FontWeight.bold,
-                        color:
+                        color: MihColors.getRedColor(
-                            MzansiInnovationHub.of(context)!.theme.errorColor(),
+                            MzansiInnovationHub.of(context)!.theme.mode ==
+                                "Dark"),
                       ),
                     ),
                   ],
@@ -281,16 +288,18 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
                       "Important Notice: Approved Profile Access",
                       style: TextStyle(
                         fontWeight: FontWeight.bold,
-                        color:
+                        color: MihColors.getRedColor(
-                            MzansiInnovationHub.of(context)!.theme.errorColor(),
+                            MzansiInnovationHub.of(context)!.theme.mode ==
+                                "Dark"),
                       ),
                     ),
                     Text(
                       "You have accepted access to your patient's profile. Please be aware of the following important points:",
                       style: TextStyle(
                         fontWeight: FontWeight.normal,
-                        color:
+                        color: MihColors.getRedColor(
-                            MzansiInnovationHub.of(context)!.theme.errorColor(),
+                            MzansiInnovationHub.of(context)!.theme.mode ==
+                                "Dark"),
                       ),
                     ),
                     SizedBox(
@@ -299,9 +308,9 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
                         "1. Permanent Access: This access is permanent.",
                         style: TextStyle(
                           fontWeight: FontWeight.normal,
-                          color: MzansiInnovationHub.of(context)!
+                          color: MihColors.getRedColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .errorColor(),
+                                  "Dark"),
                         ),
                       ),
                     ),
@@ -311,9 +320,9 @@ 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: MzansiInnovationHub.of(context)!
+                          color: MihColors.getRedColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .errorColor(),
+                                  "Dark"),
                         ),
                       ),
                     ),
@@ -323,9 +332,9 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
                         "3. Irreversible Access: You cannot revoke this access to your patient's profile.",
                         style: TextStyle(
                           fontWeight: FontWeight.normal,
-                          color: MzansiInnovationHub.of(context)!
+                          color: MihColors.getRedColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .errorColor(),
+                                  "Dark"),
                         ),
                       ),
                     ),
@@ -355,15 +364,16 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
                           context,
                         );
                       },
-                      buttonColor:
+                      buttonColor: MihColors.getRedColor(
-                          MzansiInnovationHub.of(context)!.theme.errorColor(),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                       width: 300,
                       child: Text(
                         "Decline",
                         style: TextStyle(
-                          color: MzansiInnovationHub.of(context)!
+                          color: MihColors.getPrimaryColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .primaryColor(),
+                                  "Dark"),
                           fontSize: 20,
                           fontWeight: FontWeight.bold,
                         ),
@@ -382,15 +392,16 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
                           context,
                         );
                       },
-                      buttonColor:
+                      buttonColor: MihColors.getGreenColor(
-                          MzansiInnovationHub.of(context)!.theme.successColor(),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                       width: 300,
                       child: Text(
                         "Approve",
                         style: TextStyle(
-                          color: MzansiInnovationHub.of(context)!
+                          color: MihColors.getPrimaryColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .primaryColor(),
+                                  "Dark"),
                           fontSize: 20,
                           fontWeight: FontWeight.bold,
                         ),
@@ -428,7 +439,8 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
       physics: const NeverScrollableScrollPhysics(),
       separatorBuilder: (BuildContext context, index) {
         return Divider(
-          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MihColors.getSecondaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         );
       },
       itemCount: widget.patientAccessList.length,

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

@@ -3,6 +3,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart';
 import 'package:flutter/material.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 
 class MihAccessTile extends StatefulWidget {
   final AppUser signedInUser;
@@ -31,12 +32,15 @@ class _MihAccessTileState extends State<MihAccessTile> {
       appName: "Access Controls",
       appIcon: Icon(
         MihIcons.accessControl,
-        color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+        color: MihColors.getSecondaryColor(
+            MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         // size: widget.packageSize,
       ),
       iconSize: widget.packageSize,
-      primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      primaryColor: MihColors.getSecondaryColor(
-      secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+      secondaryColor: MihColors.getPrimaryColor(
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
     );
   }
 }

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

@@ -1,11 +1,12 @@
+import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_dropdwn_field.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart';
 import 'package:flutter/material.dart';
-import '../../../main.dart';
 import '../../../mih_services/mih_service_calls.dart';
 import '../../../mih_components/mih_layout/mih_action.dart';
 import '../../../mih_components/mih_layout/mih_header.dart';
@@ -197,9 +198,9 @@ class _MihAccessRequestState extends State<MihAccessRequest> {
                         Icon(
                           MihIcons.accessControl,
                           size: 165,
-                          color: MzansiInnovationHub.of(context)!
+                          color: MihColors.getSecondaryColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .secondaryColor(),
+                                  "Dark"),
                         ),
                         const SizedBox(height: 10),
                         Text(
@@ -209,9 +210,9 @@ class _MihAccessRequestState extends State<MihAccessRequest> {
                           style: TextStyle(
                             fontSize: 25,
                             fontWeight: FontWeight.bold,
-                            color: MzansiInnovationHub.of(context)!
+                            color: MihColors.getSecondaryColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .secondaryColor(),
+                                    "Dark"),
                           ),
                         ),
                         // const SizedBox(height: 10),
@@ -269,9 +270,9 @@ class _MihAccessRequestState extends State<MihAccessRequest> {
                     "$errorCode: Error pulling Patients Data\n$baseUrl/queue/patients/\n$errorBody",
                     style: TextStyle(
                         fontSize: 25,
-                        color: MzansiInnovationHub.of(context)!
+                        color: MihColors.getGreenColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .errorColor()),
+                                "Dark")),
                     textAlign: TextAlign.center,
                   ),
                 );

Frontend/lib/mih_packages/authentication/biometric_check.dart

@@ -6,6 +6,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_layout/mih_layout_build
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_packages/mih_home/mih_profile_getter.dart';
 import 'package:flutter/material.dart';
 import 'package:local_auth/local_auth.dart';
@@ -38,7 +39,8 @@ class _BiometricCheckState extends State<BiometricCheck> {
           child: FittedBox(
             child: Icon(
               MihIcons.mihLogo,
-              color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+              color: MihColors.getSecondaryColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             ),
           ),
         ),
@@ -109,7 +111,8 @@ class _BiometricCheckState extends State<BiometricCheck> {
     Widget alertpopUp = MihPackageAlert(
       alertIcon: Icon(
         Icons.fingerprint,
-        color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+        color: MihColors.getRedColor(
+            MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         size: 100,
       ),
       alertTitle: "Biometric Authentication Error",
@@ -120,7 +123,8 @@ 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: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+              color: MihColors.getSecondaryColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             ),
           ),
           const SizedBox(height: 20),
@@ -137,14 +141,14 @@ class _BiometricCheckState extends State<BiometricCheck> {
                   );
                   Navigator.of(context).pop();
                 },
-                buttonColor:
+                buttonColor: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 width: 300,
                 child: Text(
                   "Set Up Authentication",
                   style: TextStyle(
-                    color:
+                    color: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: 20,
                     fontWeight: FontWeight.bold,
                   ),
@@ -155,14 +159,14 @@ class _BiometricCheckState extends State<BiometricCheck> {
                   Navigator.of(context).pop();
                   authenticateUser();
                 },
-                buttonColor:
+                buttonColor: MihColors.getGreenColor(
-                    MzansiInnovationHub.of(context)!.theme.successColor(),
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 width: 300,
                 child: Text(
                   "Authenticate Now",
                   style: TextStyle(
-                    color:
+                    color: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: 20,
                     fontWeight: FontWeight.bold,
                   ),
@@ -172,7 +176,8 @@ class _BiometricCheckState extends State<BiometricCheck> {
           ),
         ],
       ),
-      alertColour: MzansiInnovationHub.of(context)!.theme.errorColor(),
+      alertColour: MihColors.getRedColor(
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
     );
     showDialog(
       context: context,
@@ -197,8 +202,8 @@ class _BiometricCheckState extends State<BiometricCheck> {
                   Icon(
                     Icons.fingerprint,
                     size: 100,
-                    color:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   ),
                   //spacer
                   const SizedBox(height: 10),
@@ -209,9 +214,9 @@ class _BiometricCheckState extends State<BiometricCheck> {
                     style: TextStyle(
                       fontSize: 25,
                       fontWeight: FontWeight.bold,
-                      color: MzansiInnovationHub.of(context)!
+                      color: MihColors.getSecondaryColor(
-                          .theme
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                          .secondaryColor(),
+                              "Dark"),
                     ),
                   ),
                   //spacer
@@ -220,23 +225,23 @@ class _BiometricCheckState extends State<BiometricCheck> {
                   Icon(
                     Icons.lock,
                     size: 200,
-                    color:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   ),
                   const SizedBox(height: 30),
                   MihButton(
                     onPressed: () {
                       authenticateUser();
                     },
-                    buttonColor:
+                    buttonColor: MihColors.getGreenColor(
-                        MzansiInnovationHub.of(context)!.theme.successColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     width: 300,
                     child: Text(
                       "Authenticate Now",
                       style: TextStyle(
-                        color: MzansiInnovationHub.of(context)!
+                        color: MihColors.getPrimaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .primaryColor(),
+                                "Dark"),
                         fontSize: 20,
                         fontWeight: FontWeight.bold,
                       ),

Frontend/lib/mih_packages/authentication/forgot_password.dart

@@ -2,6 +2,7 @@ import 'dart:convert';
 
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart';
@@ -79,11 +80,13 @@ class _ForgotPasswordState extends State<ForgotPassword> {
   }
 
   Color getPrim() {
-    return MzansiInnovationHub.of(context)!.theme.secondaryColor();
+    return MihColors.getSecondaryColor(
+        MzansiInnovationHub.of(context)!.theme.mode == "Dark");
   }
 
   Color getSec() {
-    return MzansiInnovationHub.of(context)!.theme.primaryColor();
+    return MihColors.getPrimaryColor(
+        MzansiInnovationHub.of(context)!.theme.mode == "Dark");
   }
 
   void prePassResteWarning() {
@@ -94,7 +97,8 @@ class _ForgotPasswordState extends State<ForgotPassword> {
           alertIcon: Icon(
             Icons.warning_amber_rounded,
             size: 100,
-            color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+            color: MihColors.getSecondaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
           ),
           alertTitle: "Password Reset Confirmation",
           alertBody: Column(
@@ -105,8 +109,8 @@ class _ForgotPasswordState extends State<ForgotPassword> {
                 child: Text(
                   "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:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: 15.0,
                     fontWeight: FontWeight.bold,
                   ),
@@ -121,14 +125,14 @@ class _ForgotPasswordState extends State<ForgotPassword> {
                   Navigator.of(context).pop();
                   validateInput();
                 },
-                buttonColor:
+                buttonColor: MihColors.getGreenColor(
-                    MzansiInnovationHub.of(context)!.theme.successColor(),
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 width: 300,
                 child: Text(
                   "Continue",
                   style: TextStyle(
-                    color:
+                    color: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: 20,
                     fontWeight: FontWeight.bold,
                   ),
@@ -136,7 +140,8 @@ class _ForgotPasswordState extends State<ForgotPassword> {
               ),
             ],
           ),
-          alertColour: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+          alertColour: MihColors.getSecondaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         );
       },
     );
@@ -236,9 +241,9 @@ class _ForgotPasswordState extends State<ForgotPassword> {
                       Icon(
                         Icons.lock,
                         size: 100,
-                        color: MzansiInnovationHub.of(context)!
+                        color: MihColors.getSecondaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .secondaryColor(),
+                                "Dark"),
                       ),
                       //spacer
                       const SizedBox(height: 10),
@@ -248,9 +253,9 @@ class _ForgotPasswordState extends State<ForgotPassword> {
                         style: TextStyle(
                           fontSize: 25,
                           fontWeight: FontWeight.bold,
-                          color: MzansiInnovationHub.of(context)!
+                          color: MihColors.getSecondaryColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .secondaryColor(),
+                                  "Dark"),
                         ),
                       ),
                       const SizedBox(height: 25),
@@ -258,12 +263,12 @@ class _ForgotPasswordState extends State<ForgotPassword> {
                         formKey: _formKey,
                         formFields: [
                           MihTextFormField(
-                            fillColor: MzansiInnovationHub.of(context)!
+                            fillColor: MihColors.getSecondaryColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .secondaryColor(),
+                                    "Dark"),
-                            inputColor: MzansiInnovationHub.of(context)!
+                            inputColor: MihColors.getPrimaryColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .primaryColor(),
+                                    "Dark"),
                             controller: emailController,
                             multiLineInput: false,
                             requiredText: true,
@@ -286,16 +291,18 @@ class _ForgotPasswordState extends State<ForgotPassword> {
                                       .formNotFilledCompletely(context);
                                 }
                               },
-                              buttonColor: MzansiInnovationHub.of(context)!
+                              buttonColor: MihColors.getGreenColor(
-                                  .theme
+                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                  .successColor(),
+                                      "Dark"),
                               width: 300,
                               child: Text(
                                 "Reset Password",
                                 style: TextStyle(
-                                  color: MzansiInnovationHub.of(context)!
+                                  color: MihColors.getPrimaryColor(
+                                      MzansiInnovationHub.of(context)!
                                               .theme
-                                      .primaryColor(),
+                                              .mode ==
+                                          "Dark"),
                                   fontSize: 20,
                                   fontWeight: FontWeight.bold,
                                 ),

Frontend/lib/mih_packages/authentication/register.dart

@@ -1,5 +1,6 @@
 import 'dart:convert';
 
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_install_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart';
@@ -239,12 +240,14 @@ class _RegisterState extends State<Register> {
             onPressed: () {
               MihInstallServices().installMihTrigger(context);
             },
-            buttonColor: MzansiInnovationHub.of(context)!.theme.successColor(),
+            buttonColor: MihColors.getGreenColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             width: 150,
             child: Text(
               "Install MIH",
               style: TextStyle(
-                color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                color: MihColors.getPrimaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 fontSize: 20,
                 fontWeight: FontWeight.bold,
               ),
@@ -268,7 +271,8 @@ class _RegisterState extends State<Register> {
           child: FittedBox(
             child: Icon(
               MihIcons.mihLogo,
-              color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+              color: MihColors.getSecondaryColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             ),
           ),
         ),
@@ -331,9 +335,9 @@ class _RegisterState extends State<Register> {
                     Icon(
                       Icons.lock,
                       size: 100,
-                      color: MzansiInnovationHub.of(context)!
+                      color: MihColors.getSecondaryColor(
-                          .theme
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                          .secondaryColor(),
+                              "Dark"),
                     ),
                     //spacer
                     const SizedBox(height: 10),
@@ -343,9 +347,9 @@ class _RegisterState extends State<Register> {
                       style: TextStyle(
                         fontSize: 25,
                         fontWeight: FontWeight.bold,
-                        color: MzansiInnovationHub.of(context)!
+                        color: MihColors.getSecondaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .secondaryColor(),
+                                "Dark"),
                       ),
                     ),
                     //spacer
@@ -355,12 +359,12 @@ class _RegisterState extends State<Register> {
                       formFields: [
                         //email input
                         MihTextFormField(
-                          fillColor: MzansiInnovationHub.of(context)!
+                          fillColor: MihColors.getSecondaryColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .secondaryColor(),
+                                  "Dark"),
-                          inputColor: MzansiInnovationHub.of(context)!
+                          inputColor: MihColors.getPrimaryColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .primaryColor(),
+                                  "Dark"),
                           controller: emailController,
                           multiLineInput: false,
                           requiredText: true,
@@ -374,12 +378,12 @@ class _RegisterState extends State<Register> {
                         const SizedBox(height: 10),
                         //password input
                         MihTextFormField(
-                          fillColor: MzansiInnovationHub.of(context)!
+                          fillColor: MihColors.getSecondaryColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .secondaryColor(),
+                                  "Dark"),
-                          inputColor: MzansiInnovationHub.of(context)!
+                          inputColor: MihColors.getPrimaryColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .primaryColor(),
+                                  "Dark"),
                           controller: passwordController,
                           multiLineInput: false,
                           requiredText: true,
@@ -394,12 +398,12 @@ class _RegisterState extends State<Register> {
                         //spacer
                         const SizedBox(height: 10),
                         MihTextFormField(
-                          fillColor: MzansiInnovationHub.of(context)!
+                          fillColor: MihColors.getSecondaryColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .secondaryColor(),
+                                  "Dark"),
-                          inputColor: MzansiInnovationHub.of(context)!
+                          inputColor: MihColors.getPrimaryColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .primaryColor(),
+                                  "Dark"),
                           controller: confirmPasswordController,
                           multiLineInput: false,
                           requiredText: true,
@@ -430,16 +434,20 @@ class _RegisterState extends State<Register> {
                                         .formNotFilledCompletely(context);
                                   }
                                 },
-                                buttonColor: MzansiInnovationHub.of(context)!
+                                buttonColor: MihColors.getGreenColor(
+                                    MzansiInnovationHub.of(context)!
                                             .theme
-                                    .successColor(),
+                                            .mode ==
+                                        "Dark"),
                                 width: 300,
                                 child: Text(
                                   "Create New Account",
                                   style: TextStyle(
-                                    color: MzansiInnovationHub.of(context)!
+                                    color: MihColors.getPrimaryColor(
+                                        MzansiInnovationHub.of(context)!
                                                 .theme
-                                        .primaryColor(),
+                                                .mode ==
+                                            "Dark"),
                                     fontSize: 20,
                                     fontWeight: FontWeight.bold,
                                   ),
@@ -447,16 +455,20 @@ class _RegisterState extends State<Register> {
                               ),
                               MihButton(
                                 onPressed: widget.onTap,
-                                buttonColor: MzansiInnovationHub.of(context)!
+                                buttonColor: MihColors.getSecondaryColor(
+                                    MzansiInnovationHub.of(context)!
                                             .theme
-                                    .secondaryColor(),
+                                            .mode ==
+                                        "Dark"),
                                 width: 300,
                                 child: Text(
                                   "I have an account",
                                   style: TextStyle(
-                                    color: MzansiInnovationHub.of(context)!
+                                    color: MihColors.getPrimaryColor(
+                                        MzansiInnovationHub.of(context)!
                                                 .theme
-                                        .primaryColor(),
+                                                .mode ==
+                                            "Dark"),
                                     fontSize: 20,
                                     fontWeight: FontWeight.bold,
                                   ),

Frontend/lib/mih_packages/authentication/reset_password.dart

@@ -2,6 +2,7 @@ import 'dart:convert';
 
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart';
@@ -98,11 +99,13 @@ class _ResetPasswordState extends State<ResetPassword> {
   }
 
   Color getPrim() {
-    return MzansiInnovationHub.of(context)!.theme.secondaryColor();
+    return MihColors.getSecondaryColor(
+        MzansiInnovationHub.of(context)!.theme.mode == "Dark");
   }
 
   Color getSec() {
-    return MzansiInnovationHub.of(context)!.theme.primaryColor();
+    return MihColors.getPrimaryColor(
+        MzansiInnovationHub.of(context)!.theme.mode == "Dark");
   }
 
   void loginError() {
@@ -214,9 +217,9 @@ class _ResetPasswordState extends State<ResetPassword> {
                       Icon(
                         Icons.lock,
                         size: 100,
-                        color: MzansiInnovationHub.of(context)!
+                        color: MihColors.getSecondaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .secondaryColor(),
+                                "Dark"),
                       ),
                       //spacer
                       const SizedBox(height: 10),
@@ -226,9 +229,9 @@ class _ResetPasswordState extends State<ResetPassword> {
                         style: TextStyle(
                           fontSize: 25,
                           fontWeight: FontWeight.bold,
-                          color: MzansiInnovationHub.of(context)!
+                          color: MihColors.getSecondaryColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .secondaryColor(),
+                                  "Dark"),
                         ),
                       ),
                       //spacer
@@ -237,12 +240,12 @@ class _ResetPasswordState extends State<ResetPassword> {
                         formKey: _formKey,
                         formFields: [
                           MihTextFormField(
-                            fillColor: MzansiInnovationHub.of(context)!
+                            fillColor: MihColors.getSecondaryColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .secondaryColor(),
+                                    "Dark"),
-                            inputColor: MzansiInnovationHub.of(context)!
+                            inputColor: MihColors.getPrimaryColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .primaryColor(),
+                                    "Dark"),
                             controller: passwordController,
                             multiLineInput: false,
                             requiredText: true,
@@ -257,12 +260,12 @@ class _ResetPasswordState extends State<ResetPassword> {
                           //spacer
                           const SizedBox(height: 10),
                           MihTextFormField(
-                            fillColor: MzansiInnovationHub.of(context)!
+                            fillColor: MihColors.getSecondaryColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .secondaryColor(),
+                                    "Dark"),
-                            inputColor: MzansiInnovationHub.of(context)!
+                            inputColor: MihColors.getPrimaryColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .primaryColor(),
+                                    "Dark"),
                             controller: confirmPasswordController,
                             multiLineInput: false,
                             requiredText: true,
@@ -288,16 +291,18 @@ class _ResetPasswordState extends State<ResetPassword> {
                                       .formNotFilledCompletely(context);
                                 }
                               },
-                              buttonColor: MzansiInnovationHub.of(context)!
+                              buttonColor: MihColors.getGreenColor(
-                                  .theme
+                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                  .successColor(),
+                                      "Dark"),
                               width: 300,
                               child: Text(
                                 "Reset Password",
                                 style: TextStyle(
-                                  color: MzansiInnovationHub.of(context)!
+                                  color: MihColors.getPrimaryColor(
+                                      MzansiInnovationHub.of(context)!
                                               .theme
-                                      .primaryColor(),
+                                              .mode ==
+                                          "Dark"),
                                   fontSize: 20,
                                   fontWeight: FontWeight.bold,
                                 ),

Frontend/lib/mih_packages/authentication/signin.dart

@@ -1,4 +1,5 @@
 import 'dart:convert';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_install_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart';
@@ -87,11 +88,13 @@ class _SignInState extends State<SignIn> {
   }
 
   Color getPrim() {
-    return MzansiInnovationHub.of(context)!.theme.secondaryColor();
+    return MihColors.getSecondaryColor(
+        MzansiInnovationHub.of(context)!.theme.mode == "Dark");
   }
 
   Color getSec() {
-    return MzansiInnovationHub.of(context)!.theme.primaryColor();
+    return MihColors.getPrimaryColor(
+        MzansiInnovationHub.of(context)!.theme.mode == "Dark");
   }
 
   void setSandboxProfiles(List<MIHTile> tileList) {
@@ -211,7 +214,7 @@ class _SignInState extends State<SignIn> {
       context: context,
       builder: (context) {
         return Dialog(
-          //backgroundColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+          //backgroundColor: MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
           child: Stack(
             children: [
               Container(
@@ -219,12 +222,13 @@ class _SignInState extends State<SignIn> {
                 width: 500.0,
                 height: 500,
                 decoration: BoxDecoration(
-                  color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                  color: MihColors.getPrimaryColor(
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   borderRadius: BorderRadius.circular(25.0),
                   border: Border.all(
-                      color: MzansiInnovationHub.of(context)!
+                      color: MihColors.getSecondaryColor(
-                          .theme
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                          .secondaryColor(),
+                              "Dark"),
                       width: 5.0),
                 ),
                 child: Column(
@@ -234,9 +238,9 @@ class _SignInState extends State<SignIn> {
                       "Sandbox Profiles",
                       textAlign: TextAlign.center,
                       style: TextStyle(
-                        color: MzansiInnovationHub.of(context)!
+                        color: MihColors.getSecondaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .secondaryColor(),
+                                "Dark"),
                         fontSize: 25.0,
                         fontWeight: FontWeight.bold,
                       ),
@@ -246,9 +250,9 @@ 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: MzansiInnovationHub.of(context)!
+                        color: MihColors.getSecondaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .secondaryColor(),
+                                "Dark"),
                         fontSize: 15.0,
                         fontWeight: FontWeight.bold,
                       ),
@@ -281,7 +285,8 @@ class _SignInState extends State<SignIn> {
                   },
                   icon: Icon(
                     Icons.close,
-                    color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+                    color: MihColors.getRedColor(
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     size: 35,
                   ),
                 ),
@@ -303,12 +308,14 @@ class _SignInState extends State<SignIn> {
             onPressed: () {
               MihInstallServices().installMihTrigger(context);
             },
-            buttonColor: MzansiInnovationHub.of(context)!.theme.successColor(),
+            buttonColor: MihColors.getGreenColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             width: 150,
             child: Text(
               "Install MIH",
               style: TextStyle(
-                color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                color: MihColors.getPrimaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 fontSize: 20,
                 fontWeight: FontWeight.bold,
               ),
@@ -335,7 +342,8 @@ class _SignInState extends State<SignIn> {
           child: FittedBox(
             child: Icon(
               MihIcons.mihLogo,
-              color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+              color: MihColors.getSecondaryColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             ),
           ),
         ),
@@ -399,9 +407,9 @@ class _SignInState extends State<SignIn> {
                         Icon(
                           Icons.lock,
                           size: 100,
-                          color: MzansiInnovationHub.of(context)!
+                          color: MihColors.getSecondaryColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .secondaryColor(),
+                                  "Dark"),
                         ),
                         //spacer
                         const SizedBox(height: 10),
@@ -411,9 +419,9 @@ class _SignInState extends State<SignIn> {
                           style: TextStyle(
                             fontSize: 25,
                             fontWeight: FontWeight.bold,
-                            color: MzansiInnovationHub.of(context)!
+                            color: MihColors.getSecondaryColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .secondaryColor(),
+                                    "Dark"),
                           ),
                         ),
                         //spacer
@@ -422,12 +430,12 @@ class _SignInState extends State<SignIn> {
                           formKey: _formKey,
                           formFields: [
                             MihTextFormField(
-                              fillColor: MzansiInnovationHub.of(context)!
+                              fillColor: MihColors.getSecondaryColor(
-                                  .theme
+                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                  .secondaryColor(),
+                                      "Dark"),
-                              inputColor: MzansiInnovationHub.of(context)!
+                              inputColor: MihColors.getPrimaryColor(
-                                  .theme
+                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                  .primaryColor(),
+                                      "Dark"),
                               controller: emailController,
                               multiLineInput: false,
                               requiredText: true,
@@ -442,12 +450,12 @@ class _SignInState extends State<SignIn> {
                             const SizedBox(height: 10),
                             //password input
                             MihTextFormField(
-                              fillColor: MzansiInnovationHub.of(context)!
+                              fillColor: MihColors.getSecondaryColor(
-                                  .theme
+                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                  .secondaryColor(),
+                                      "Dark"),
-                              inputColor: MzansiInnovationHub.of(context)!
+                              inputColor: MihColors.getPrimaryColor(
-                                  .theme
+                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                  .primaryColor(),
+                                      "Dark"),
                               controller: passwordController,
                               multiLineInput: false,
                               requiredText: true,
@@ -476,9 +484,11 @@ class _SignInState extends State<SignIn> {
                                       'Forgot Password?',
                                       style: TextStyle(
                                         fontSize: 15,
-                                        color: MzansiInnovationHub.of(context)!
+                                        color: MihColors.getSecondaryColor(
+                                            MzansiInnovationHub.of(context)!
                                                     .theme
-                                            .secondaryColor(),
+                                                    .mode ==
+                                                "Dark"),
                                         fontWeight: FontWeight.bold,
                                       ),
                                     ),
@@ -506,17 +516,20 @@ class _SignInState extends State<SignIn> {
                                             .formNotFilledCompletely(context);
                                       }
                                     },
-                                    buttonColor:
+                                    buttonColor: MihColors.getGreenColor(
                                         MzansiInnovationHub.of(context)!
                                                 .theme
-                                            .successColor(),
+                                                .mode ==
+                                            "Dark"),
                                     width: 300,
                                     child: Text(
                                       "Sign In",
                                       style: TextStyle(
-                                        color: MzansiInnovationHub.of(context)!
+                                        color: MihColors.getPrimaryColor(
+                                            MzansiInnovationHub.of(context)!
                                                     .theme
-                                            .primaryColor(),
+                                                    .mode ==
+                                                "Dark"),
                                         fontSize: 20,
                                         fontWeight: FontWeight.bold,
                                       ),
@@ -524,17 +537,20 @@ class _SignInState extends State<SignIn> {
                                   ),
                                   MihButton(
                                     onPressed: widget.onTap,
-                                    buttonColor:
+                                    buttonColor: MihColors.getSecondaryColor(
                                         MzansiInnovationHub.of(context)!
                                                 .theme
-                                            .secondaryColor(),
+                                                .mode ==
+                                            "Dark"),
                                     width: 300,
                                     child: Text(
                                       "Create New Account",
                                       style: TextStyle(
-                                        color: MzansiInnovationHub.of(context)!
+                                        color: MihColors.getPrimaryColor(
+                                            MzansiInnovationHub.of(context)!
                                                     .theme
-                                            .primaryColor(),
+                                                    .mode ==
+                                                "Dark"),
                                         fontSize: 20,
                                         fontWeight: FontWeight.bold,
                                       ),
@@ -569,10 +585,13 @@ class _SignInState extends State<SignIn> {
                                           style: TextStyle(
                                               fontWeight: FontWeight.bold,
                                               fontSize: 15,
-                                              color: MzansiInnovationHub.of(
+                                              color:
+                                                  MihColors.getSecondaryColor(
+                                                      MzansiInnovationHub.of(
                                                                   context)!
                                                               .theme
-                                                  .secondaryColor()),
+                                                              .mode ==
+                                                          "Dark")),
                                         ),
                                         onTap: () {
                                           setState(() {
@@ -619,10 +638,11 @@ 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:
+                                          color: MihColors.getSecondaryColor(
                                               MzansiInnovationHub.of(context)!
                                                       .theme
-                                                  .secondaryColor(),
+                                                      .mode ==
+                                                  "Dark"),
                                           fontSize: 15.0,
                                           fontWeight: FontWeight.bold,
                                         ),

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

@@ -2,6 +2,7 @@ import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tile.dart';
 import 'package:flutter/material.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 
 class MihCalculatorTile extends StatefulWidget {
   final bool personalSelected;
@@ -30,12 +31,15 @@ class _MihCalculatorTileState extends State<MihCalculatorTile> {
       appName: "Calculator",
       appIcon: Icon(
         MihIcons.calculator,
-        color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+        color: MihColors.getSecondaryColor(
+            MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         // size: widget.packageSize,
       ),
       iconSize: widget.packageSize,
-      primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      primaryColor: MihColors.getSecondaryColor(
-      secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+      secondaryColor: MihColors.getPrimaryColor(
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
     );
   }
 }

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

@@ -10,6 +10,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_text_form_field.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_currency_exchange_rate_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart';
@@ -76,7 +77,8 @@ class _CurrencyExchangeRateState extends State<CurrencyExchangeRate> {
             Icon(
               Icons.currency_exchange,
               size: 150,
-              color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+              color: MihColors.getSecondaryColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             ),
             const SizedBox(height: 20),
             FittedBox(
@@ -86,8 +88,8 @@ class _CurrencyExchangeRateState extends State<CurrencyExchangeRate> {
                 style: TextStyle(
                   fontSize: 30,
                   fontWeight: FontWeight.bold,
-                  color:
+                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 ),
               ),
             ),
@@ -102,9 +104,9 @@ class _CurrencyExchangeRateState extends State<CurrencyExchangeRate> {
                     style: TextStyle(
                       fontSize: 30,
                       fontWeight: FontWeight.bold,
-                      color: MzansiInnovationHub.of(context)!
+                      color: MihColors.getSecondaryColor(
-                          .theme
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                          .secondaryColor(),
+                              "Dark"),
                     ),
                   ),
                 ),
@@ -116,9 +118,9 @@ class _CurrencyExchangeRateState extends State<CurrencyExchangeRate> {
                     style: TextStyle(
                       fontSize: 30,
                       fontWeight: FontWeight.bold,
-                      color: MzansiInnovationHub.of(context)!
+                      color: MihColors.getSecondaryColor(
-                          .theme
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                          .secondaryColor(),
+                              "Dark"),
                     ),
                   ),
                 ),
@@ -135,9 +137,9 @@ class _CurrencyExchangeRateState extends State<CurrencyExchangeRate> {
                     style: TextStyle(
                       fontSize: 30,
                       fontWeight: FontWeight.bold,
-                      color: MzansiInnovationHub.of(context)!
+                      color: MihColors.getSecondaryColor(
-                          .theme
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                          .secondaryColor(),
+                              "Dark"),
                     ),
                   ),
                 ),
@@ -149,9 +151,9 @@ class _CurrencyExchangeRateState extends State<CurrencyExchangeRate> {
                     style: TextStyle(
                       fontSize: 30,
                       fontWeight: FontWeight.bold,
-                      color: MzansiInnovationHub.of(context)!
+                      color: MihColors.getSecondaryColor(
-                          .theme
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                          .secondaryColor(),
+                              "Dark"),
                     ),
                   ),
                 ),
@@ -186,7 +188,8 @@ class _CurrencyExchangeRateState extends State<CurrencyExchangeRate> {
               textAlign: TextAlign.center,
               style: TextStyle(
                 fontSize: 25,
-                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MihColors.getSecondaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 fontWeight: FontWeight.bold,
               ),
             ),
@@ -206,7 +209,8 @@ 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: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MihColors.getSecondaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 fontWeight: FontWeight.normal,
               ),
             ),
@@ -217,7 +221,8 @@ 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: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MihColors.getSecondaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 fontWeight: FontWeight.normal,
               ),
             ),
@@ -228,7 +233,8 @@ 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: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MihColors.getSecondaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 fontWeight: FontWeight.normal,
               ),
             ),
@@ -243,7 +249,8 @@ class _CurrencyExchangeRateState extends State<CurrencyExchangeRate> {
       text: TextSpan(
         style: TextStyle(
           fontSize: 15,
-          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MihColors.getSecondaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
           fontWeight: FontWeight.normal,
         ),
         children: <TextSpan>[
@@ -300,12 +307,12 @@ class _CurrencyExchangeRateState extends State<CurrencyExchangeRate> {
                       formKey: _formKey,
                       formFields: <Widget>[
                         MihTextFormField(
-                          fillColor: MzansiInnovationHub.of(context)!
+                          fillColor: MihColors.getSecondaryColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .secondaryColor(),
+                                  "Dark"),
-                          inputColor: MzansiInnovationHub.of(context)!
+                          inputColor: MihColors.getPrimaryColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .primaryColor(),
+                                  "Dark"),
                           controller: _fromAmountController,
                           multiLineInput: false,
                           requiredText: true,
@@ -345,9 +352,9 @@ class _CurrencyExchangeRateState extends State<CurrencyExchangeRate> {
                           text: TextSpan(
                             style: TextStyle(
                               fontSize: 15,
-                              color: MzansiInnovationHub.of(context)!
+                              color: MihColors.getRedColor(
-                                  .theme
+                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                  .errorColor(),
+                                      "Dark"),
                             ),
                             children: [
                               const TextSpan(
@@ -357,9 +364,11 @@ class _CurrencyExchangeRateState extends State<CurrencyExchangeRate> {
                                 text: "Diclaimer",
                                 style: TextStyle(
                                   decoration: TextDecoration.underline,
-                                  color: MzansiInnovationHub.of(context)!
+                                  color: MihColors.getSecondaryColor(
+                                      MzansiInnovationHub.of(context)!
                                               .theme
-                                      .secondaryColor(),
+                                              .mode ==
+                                          "Dark"),
                                   fontWeight: FontWeight.bold,
                                 ),
                                 recognizer: TapGestureRecognizer()
@@ -388,16 +397,20 @@ class _CurrencyExchangeRateState extends State<CurrencyExchangeRate> {
                                         .formNotFilledCompletely(context);
                                   }
                                 },
-                                buttonColor: MzansiInnovationHub.of(context)!
+                                buttonColor: MihColors.getGreenColor(
+                                    MzansiInnovationHub.of(context)!
                                             .theme
-                                    .successColor(),
+                                            .mode ==
+                                        "Dark"),
                                 width: 300,
                                 child: Text(
                                   "Calculate",
                                   style: TextStyle(
-                                    color: MzansiInnovationHub.of(context)!
+                                    color: MihColors.getPrimaryColor(
+                                        MzansiInnovationHub.of(context)!
                                                 .theme
-                                        .primaryColor(),
+                                                .mode ==
+                                            "Dark"),
                                     fontSize: 20,
                                     fontWeight: FontWeight.bold,
                                   ),
@@ -407,16 +420,20 @@ class _CurrencyExchangeRateState extends State<CurrencyExchangeRate> {
                                 onPressed: () {
                                   clearInput();
                                 },
-                                buttonColor: MzansiInnovationHub.of(context)!
+                                buttonColor: MihColors.getRedColor(
+                                    MzansiInnovationHub.of(context)!
                                             .theme
-                                    .errorColor(),
+                                            .mode ==
+                                        "Dark"),
                                 width: 300,
                                 child: Text(
                                   "Clear",
                                   style: TextStyle(
-                                    color: MzansiInnovationHub.of(context)!
+                                    color: MihColors.getPrimaryColor(
+                                        MzansiInnovationHub.of(context)!
                                                 .theme
-                                        .primaryColor(),
+                                                .mode ==
+                                            "Dark"),
                                     fontSize: 20,
                                     fontWeight: FontWeight.bold,
                                   ),
@@ -437,7 +454,8 @@ class _CurrencyExchangeRateState extends State<CurrencyExchangeRate> {
                 "Error pulling Currency Exchange Data.",
                 style: TextStyle(
                     fontSize: 25,
-                    color: MzansiInnovationHub.of(context)!.theme.errorColor()),
+                    color: MihColors.getRedColor(
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark")),
                 textAlign: TextAlign.center,
               ),
             );

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

@@ -4,6 +4,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart';
 import 'package:flutter/material.dart';
 import 'package:math_expressions/math_expressions.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 
 class SimpleCalc extends StatefulWidget {
   const SimpleCalc({super.key});
@@ -107,8 +108,8 @@ class _SimpleCalcState extends State<SimpleCalc> {
                 userInput,
                 style: TextStyle(
                   fontSize: 40,
-                  color:
+                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 ),
               ),
             ),
@@ -122,8 +123,8 @@ class _SimpleCalcState extends State<SimpleCalc> {
               answer,
               style: TextStyle(
                   fontSize: 30,
-                  color:
+                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   fontWeight: FontWeight.bold),
             ),
           ),
@@ -158,16 +159,18 @@ class _SimpleCalcState extends State<SimpleCalc> {
                             answer = '0';
                           });
                         },
-                        buttonColor: const Color.fromRGBO(214, 171, 255, 1),
+                        buttonColor: MihColors.getPurpleColor(
+                            MzansiInnovationHub.of(context)!.theme.mode ==
+                                "Dark"),
                         width: 50,
                         height: 50,
                         borderRadius: 5,
                         child: Text(
                           buttons[index],
                           style: TextStyle(
-                            color: MzansiInnovationHub.of(context)!
+                            color: MihColors.getPrimaryColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .primaryColor(),
+                                    "Dark"),
                             fontSize: 20,
                             fontWeight: FontWeight.bold,
                           ),
@@ -186,18 +189,18 @@ class _SimpleCalcState extends State<SimpleCalc> {
                             userInput += buttons[index];
                           });
                         },
-                        buttonColor: MzansiInnovationHub.of(context)!
+                        buttonColor: MihColors.getGreyColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .messageTextColor(),
+                                "Dark"),
                         width: 50,
                         height: 50,
                         borderRadius: 5,
                         child: Text(
                           buttons[index],
                           style: TextStyle(
-                            color: MzansiInnovationHub.of(context)!
+                            color: MihColors.getPrimaryColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .primaryColor(),
+                                    "Dark"),
                             fontSize: 20,
                             fontWeight: FontWeight.bold,
                           ),
@@ -215,18 +218,18 @@ class _SimpleCalcState extends State<SimpleCalc> {
                             userInput += buttons[index];
                           });
                         },
-                        buttonColor: MzansiInnovationHub.of(context)!
+                        buttonColor: MihColors.getGreyColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .messageTextColor(),
+                                "Dark"),
                         width: 50,
                         height: 50,
                         borderRadius: 5,
                         child: Text(
                           buttons[index],
                           style: TextStyle(
-                            color: MzansiInnovationHub.of(context)!
+                            color: MihColors.getPrimaryColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .primaryColor(),
+                                    "Dark"),
                             fontSize: 20,
                             fontWeight: FontWeight.bold,
                           ),
@@ -255,18 +258,18 @@ class _SimpleCalcState extends State<SimpleCalc> {
                             });
                           }
                         },
-                        buttonColor: MzansiInnovationHub.of(context)!
+                        buttonColor: MihColors.getGreyColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .messageTextColor(),
+                                "Dark"),
                         width: 50,
                         height: 50,
                         borderRadius: 5,
                         child: Text(
                           buttons[index],
                           style: TextStyle(
-                            color: MzansiInnovationHub.of(context)!
+                            color: MihColors.getPrimaryColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .primaryColor(),
+                                    "Dark"),
                             fontSize: 20,
                             fontWeight: FontWeight.bold,
                           ),
@@ -295,16 +298,17 @@ class _SimpleCalcState extends State<SimpleCalc> {
                             equalPressed();
                           });
                         },
-                        buttonColor:
+                        buttonColor: MihColors.getRedColor(
-                            MzansiInnovationHub.of(context)!.theme.errorColor(),
+                            MzansiInnovationHub.of(context)!.theme.mode ==
+                                "Dark"),
                         width: 50,
                         height: 50,
                         borderRadius: 5,
                         child: Icon(
                           Icons.backspace,
-                          color: MzansiInnovationHub.of(context)!
+                          color: MihColors.getPrimaryColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .primaryColor(),
+                                  "Dark"),
                         ),
                       ),
                     );
@@ -320,18 +324,18 @@ class _SimpleCalcState extends State<SimpleCalc> {
                             userInput = answer;
                           });
                         },
-                        buttonColor: MzansiInnovationHub.of(context)!
+                        buttonColor: MihColors.getGreenColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .successColor(),
+                                "Dark"),
                         width: 50,
                         height: 50,
                         borderRadius: 5,
                         child: Text(
                           buttons[index],
                           style: TextStyle(
-                            color: MzansiInnovationHub.of(context)!
+                            color: MihColors.getPrimaryColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .primaryColor(),
+                                    "Dark"),
                             fontSize: 20,
                             fontWeight: FontWeight.bold,
                           ),
@@ -350,18 +354,18 @@ class _SimpleCalcState extends State<SimpleCalc> {
                             equalPressed();
                           });
                         },
-                        buttonColor: MzansiInnovationHub.of(context)!
+                        buttonColor: MihColors.getSecondaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .secondaryColor(),
+                                "Dark"),
                         width: 50,
                         height: 50,
                         borderRadius: 5,
                         child: Text(
                           buttons[index],
                           style: TextStyle(
-                            color: MzansiInnovationHub.of(context)!
+                            color: MihColors.getPrimaryColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .primaryColor(),
+                                    "Dark"),
                             fontSize: 20,
                             fontWeight: FontWeight.bold,
                           ),

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

@@ -1,5 +1,6 @@
 import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_banner_ad.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart';
@@ -110,8 +111,8 @@ class _TipCalcState extends State<TipCalc> {
               children: [
                 FaIcon(
                   FontAwesomeIcons.coins,
-                  color:
+                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   size: 35,
                 ),
                 const SizedBox(width: 15),
@@ -121,8 +122,8 @@ class _TipCalcState extends State<TipCalc> {
                   style: TextStyle(
                     fontSize: 25,
                     fontWeight: FontWeight.bold,
-                    color:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   ),
                 ),
               ],
@@ -133,7 +134,8 @@ class _TipCalcState extends State<TipCalc> {
               style: TextStyle(
                 fontSize: 30,
                 fontWeight: FontWeight.bold,
-                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MihColors.getSecondaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               ),
             ),
             const Divider(),
@@ -143,8 +145,8 @@ class _TipCalcState extends State<TipCalc> {
               children: [
                 FaIcon(
                   FontAwesomeIcons.moneyBills,
-                  color:
+                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   size: 35,
                 ),
                 const SizedBox(width: 15),
@@ -154,8 +156,8 @@ class _TipCalcState extends State<TipCalc> {
                   style: TextStyle(
                     fontSize: 25,
                     fontWeight: FontWeight.bold,
-                    color:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   ),
                 ),
               ],
@@ -166,7 +168,8 @@ class _TipCalcState extends State<TipCalc> {
               style: TextStyle(
                 fontSize: 30,
                 fontWeight: FontWeight.bold,
-                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MihColors.getSecondaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               ),
             ),
             Text(
@@ -175,7 +178,8 @@ class _TipCalcState extends State<TipCalc> {
               style: TextStyle(
                 fontSize: 30,
                 fontWeight: FontWeight.bold,
-                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MihColors.getSecondaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               ),
             ),
             if (splitBillController.text == "Yes") const Divider(),
@@ -186,8 +190,8 @@ class _TipCalcState extends State<TipCalc> {
                 children: [
                   FaIcon(
                     FontAwesomeIcons.peopleGroup,
-                    color:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     size: 35,
                   ),
                   const SizedBox(width: 15),
@@ -197,9 +201,9 @@ class _TipCalcState extends State<TipCalc> {
                     style: TextStyle(
                       fontSize: 25,
                       fontWeight: FontWeight.bold,
-                      color: MzansiInnovationHub.of(context)!
+                      color: MihColors.getSecondaryColor(
-                          .theme
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                          .secondaryColor(),
+                              "Dark"),
                     ),
                   ),
                 ],
@@ -211,8 +215,8 @@ class _TipCalcState extends State<TipCalc> {
                 style: TextStyle(
                   fontSize: 30,
                   fontWeight: FontWeight.bold,
-                  color:
+                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 ),
               ),
             if (splitBillController.text == "Yes")
@@ -222,8 +226,8 @@ class _TipCalcState extends State<TipCalc> {
                 style: TextStyle(
                   fontSize: 30,
                   fontWeight: FontWeight.bold,
-                  color:
+                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 ),
               ),
             SizedBox(height: 10),
@@ -267,10 +271,10 @@ class _TipCalcState extends State<TipCalc> {
               formKey: _formKey,
               formFields: [
                 MihTextFormField(
-                  fillColor:
+                  fillColor: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  inputColor:
+                  inputColor: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   controller: billAmountController,
                   multiLineInput: false,
                   requiredText: true,
@@ -282,10 +286,10 @@ class _TipCalcState extends State<TipCalc> {
                 ),
                 const SizedBox(height: 10),
                 MihTextFormField(
-                  fillColor:
+                  fillColor: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  inputColor:
+                  inputColor: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   controller: tipPercentageController,
                   multiLineInput: false,
                   requiredText: true,
@@ -299,10 +303,10 @@ class _TipCalcState extends State<TipCalc> {
                 MihToggle(
                   hintText: "Split Bill",
                   initialPostion: splitPosition,
-                  fillColor:
+                  fillColor: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  secondaryFillColor:
+                  secondaryFillColor: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   onChange: (value) {
                     setState(() {
                       splitBillController.text = value ? "Yes" : "No";
@@ -339,12 +343,12 @@ class _TipCalcState extends State<TipCalc> {
                         children: [
                           MihNumericStepper(
                             controller: noPeopleController,
-                            fillColor: MzansiInnovationHub.of(context)!
+                            fillColor: MihColors.getSecondaryColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .secondaryColor(),
+                                    "Dark"),
-                            inputColor: MzansiInnovationHub.of(context)!
+                            inputColor: MihColors.getPrimaryColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .primaryColor(),
+                                    "Dark"),
                             hintText: "No. People",
                             requiredText: temp == "Yes",
                             minValue: 2,
@@ -392,16 +396,16 @@ class _TipCalcState extends State<TipCalc> {
                             MihAlertServices().formNotFilledCompletely(context);
                           }
                         },
-                        buttonColor: MzansiInnovationHub.of(context)!
+                        buttonColor: MihColors.getGreenColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .successColor(),
+                                "Dark"),
                         width: 300,
                         child: Text(
                           "Calculate",
                           style: TextStyle(
-                            color: MzansiInnovationHub.of(context)!
+                            color: MihColors.getPrimaryColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .primaryColor(),
+                                    "Dark"),
                             fontSize: 20,
                             fontWeight: FontWeight.bold,
                           ),
@@ -411,15 +415,16 @@ class _TipCalcState extends State<TipCalc> {
                         onPressed: () {
                           clearInput();
                         },
-                        buttonColor:
+                        buttonColor: MihColors.getRedColor(
-                            MzansiInnovationHub.of(context)!.theme.errorColor(),
+                            MzansiInnovationHub.of(context)!.theme.mode ==
+                                "Dark"),
                         width: 300,
                         child: Text(
                           "Clear",
                           style: TextStyle(
-                            color: MzansiInnovationHub.of(context)!
+                            color: MihColors.getPrimaryColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .primaryColor(),
+                                    "Dark"),
                             fontSize: 20,
                             fontWeight: FontWeight.bold,
                           ),

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

@@ -5,6 +5,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_objects/access_request.
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 
 import 'package:supertokens_flutter/http.dart' as http;
 
@@ -134,25 +135,28 @@ class _BuildPatientsListState extends State<BuildAccessRequestList> {
       accessWithColour = TextSpan(
           text: "$access\n",
           style: TextStyle(
-              color: MzansiInnovationHub.of(context)!.theme.successColor()));
+              color: MihColors.getGreenColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark")));
     } else if (access == "PENDING") {
       accessWithColour = TextSpan(
           text: "$access\n",
           style: TextStyle(
-              color:
+              color: MihColors.getGreyColor(
-                  MzansiInnovationHub.of(context)!.theme.messageTextColor()));
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark")));
     } else {
       accessWithColour = TextSpan(
           text: "$access\n",
           style: TextStyle(
-              color: MzansiInnovationHub.of(context)!.theme.errorColor()));
+              color: MihColors.getRedColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark")));
     }
 
     return ListTile(
       title: Text(
         line1,
         style: TextStyle(
-          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MihColors.getSecondaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         ),
       ),
       subtitle: RichText(
@@ -168,7 +172,7 @@ class _BuildPatientsListState extends State<BuildAccessRequestList> {
       // Text(
       //   subtitle,
       //   style: TextStyle(
-      //     color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      //     color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
       //   ),
       // ),
       onTap: () {
@@ -180,7 +184,7 @@ class _BuildPatientsListState extends State<BuildAccessRequestList> {
       },
       // trailing: Icon(
       //   Icons.arrow_forward,
-      //   color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      //   color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
       // ),
     );
   }
@@ -235,8 +239,8 @@ class _BuildPatientsListState extends State<BuildAccessRequestList> {
                   subtitle,
                   textAlign: TextAlign.left,
                   style: TextStyle(
-                    color:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: popUpBodySize,
                     //fontWeight: FontWeight.bold,
                   ),
@@ -250,15 +254,15 @@ class _BuildPatientsListState extends State<BuildAccessRequestList> {
                     onPressed: () {
                       updateAccessAPICall(index, "declined");
                     },
-                    buttonColor:
+                    buttonColor: MihColors.getRedColor(
-                        MzansiInnovationHub.of(context)!.theme.errorColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     width: 300,
                     child: Text(
                       "Decline",
                       style: TextStyle(
-                        color: MzansiInnovationHub.of(context)!
+                        color: MihColors.getPrimaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .primaryColor(),
+                                "Dark"),
                         fontSize: 20,
                         fontWeight: FontWeight.bold,
                       ),
@@ -268,15 +272,15 @@ class _BuildPatientsListState extends State<BuildAccessRequestList> {
                     onPressed: () {
                       updateAccessAPICall(index, "approved");
                     },
-                    buttonColor:
+                    buttonColor: MihColors.getGreenColor(
-                        MzansiInnovationHub.of(context)!.theme.successColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     width: 300,
                     child: Text(
                       "Approve",
                       style: TextStyle(
-                        color: MzansiInnovationHub.of(context)!
+                        color: MihColors.getPrimaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .primaryColor(),
+                                "Dark"),
                         fontSize: 20,
                         fontWeight: FontWeight.bold,
                       ),
@@ -313,7 +317,8 @@ class _BuildPatientsListState extends State<BuildAccessRequestList> {
       physics: const NeverScrollableScrollPhysics(),
       separatorBuilder: (BuildContext context, index) {
         return Divider(
-          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MihColors.getSecondaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         );
       },
       itemCount: widget.accessRequests.length,

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

@@ -1,5 +1,6 @@
 import 'package:flutter_speed_dial/flutter_speed_dial.dart';
 import 'package:mzansi_innovation_hub/main.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_mzansi_calendar_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart';
@@ -88,19 +89,19 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
     // print("Date: $date");
     // print("Appointment Date: $appointDate");
     // print("Appointment Hour: $appointHour");
-    Color appointmentColor =
+    Color appointmentColor = MihColors.getSecondaryColor(
-        MzansiInnovationHub.of(context)!.theme.secondaryColor();
+        MzansiInnovationHub.of(context)!.theme.mode == "Dark");
     if (date == appointDate) {
       if (appointHour < hourNow) {
-        appointmentColor =
+        appointmentColor = MihColors.getGreyColor(
-            MzansiInnovationHub.of(context)!.theme.messageTextColor();
+            MzansiInnovationHub.of(context)!.theme.mode == "Dark");
       } else if (appointHour == hourNow) {
-        appointmentColor =
+        appointmentColor = MihColors.getGreenColor(
-            MzansiInnovationHub.of(context)!.theme.successColor();
+            MzansiInnovationHub.of(context)!.theme.mode == "Dark");
       }
     } else if (DateTime.parse(appointDate).isBefore(DateTime.parse(date))) {
-      appointmentColor =
+      appointmentColor = MihColors.getGreyColor(
-          MzansiInnovationHub.of(context)!.theme.messageTextColor();
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark");
     }
 
     return Container(
@@ -158,17 +159,19 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
             SpeedDialChild(
               child: Icon(
                 Icons.edit,
-                color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                color: MihColors.getPrimaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               ),
               label: "Edit Appointment",
-              labelBackgroundColor:
+              labelBackgroundColor: MihColors.getGreenColor(
-                  MzansiInnovationHub.of(context)!.theme.successColor(),
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               labelStyle: TextStyle(
-                color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                color: MihColors.getPrimaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 fontWeight: FontWeight.bold,
               ),
-              backgroundColor:
+              backgroundColor: MihColors.getGreenColor(
-                  MzansiInnovationHub.of(context)!.theme.successColor(),
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               onTap: () {
                 appointmentUpdateWindow(index, bodyWidth);
               },
@@ -176,17 +179,19 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
             SpeedDialChild(
               child: Icon(
                 Icons.delete,
-                color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                color: MihColors.getPrimaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               ),
               label: "Delete Appointment",
-              labelBackgroundColor:
+              labelBackgroundColor: MihColors.getGreenColor(
-                  MzansiInnovationHub.of(context)!.theme.successColor(),
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               labelStyle: TextStyle(
-                color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                color: MihColors.getPrimaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 fontWeight: FontWeight.bold,
               ),
-              backgroundColor:
+              backgroundColor: MihColors.getGreenColor(
-                  MzansiInnovationHub.of(context)!.theme.successColor(),
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               onTap: () {
                 deleteAppointmentConfirmationWindow(index);
               },
@@ -208,10 +213,10 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
               children: [
                 const SizedBox(height: 10),
                 MihTextFormField(
-                  fillColor:
+                  fillColor: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  inputColor:
+                  inputColor: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   controller: widget.titleController,
                   multiLineInput: false,
                   requiredText: true,
@@ -220,10 +225,10 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
                 ),
                 const SizedBox(height: 10),
                 MihTextFormField(
-                  fillColor:
+                  fillColor: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  inputColor:
+                  inputColor: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   controller: widget.dateController,
                   multiLineInput: false,
                   requiredText: true,
@@ -232,10 +237,10 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
                 ),
                 const SizedBox(height: 10),
                 MihTextFormField(
-                  fillColor:
+                  fillColor: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  inputColor:
+                  inputColor: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   controller: widget.timeController,
                   multiLineInput: false,
                   requiredText: true,
@@ -244,10 +249,10 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
                 ),
                 const SizedBox(height: 10),
                 MihTextFormField(
-                  fillColor:
+                  fillColor: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  inputColor:
+                  inputColor: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   controller: widget.descriptionIDController,
                   multiLineInput: true,
                   height: 250,
@@ -276,17 +281,19 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
             SpeedDialChild(
               child: Icon(
                 Icons.edit,
-                color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                color: MihColors.getPrimaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               ),
               label: "Edit Appointment",
-              labelBackgroundColor:
+              labelBackgroundColor: MihColors.getGreenColor(
-                  MzansiInnovationHub.of(context)!.theme.successColor(),
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               labelStyle: TextStyle(
-                color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                color: MihColors.getPrimaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 fontWeight: FontWeight.bold,
               ),
-              backgroundColor:
+              backgroundColor: MihColors.getGreenColor(
-                  MzansiInnovationHub.of(context)!.theme.successColor(),
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               onTap: () {
                 appointmentUpdateWindow(index, bodyWidth);
               },
@@ -294,17 +301,19 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
             SpeedDialChild(
               child: Icon(
                 Icons.delete,
-                color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                color: MihColors.getPrimaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               ),
               label: "Delete Appointment",
-              labelBackgroundColor:
+              labelBackgroundColor: MihColors.getGreenColor(
-                  MzansiInnovationHub.of(context)!.theme.successColor(),
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               labelStyle: TextStyle(
-                color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                color: MihColors.getPrimaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 fontWeight: FontWeight.bold,
               ),
-              backgroundColor:
+              backgroundColor: MihColors.getGreenColor(
-                  MzansiInnovationHub.of(context)!.theme.successColor(),
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               onTap: () {
                 deleteAppointmentConfirmationWindow(index);
               },
@@ -326,10 +335,10 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
               children: [
                 const SizedBox(height: 10),
                 MihTextFormField(
-                  fillColor:
+                  fillColor: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  inputColor:
+                  inputColor: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   controller: widget.titleController,
                   multiLineInput: false,
                   requiredText: true,
@@ -338,10 +347,10 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
                 ),
                 const SizedBox(height: 10),
                 MihTextFormField(
-                  fillColor:
+                  fillColor: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  inputColor:
+                  inputColor: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   controller: widget.dateController,
                   multiLineInput: false,
                   requiredText: true,
@@ -350,10 +359,10 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
                 ),
                 const SizedBox(height: 10),
                 MihTextFormField(
-                  fillColor:
+                  fillColor: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  inputColor:
+                  inputColor: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   controller: widget.timeController,
                   multiLineInput: false,
                   requiredText: true,
@@ -362,10 +371,10 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
                 ),
                 const SizedBox(height: 10),
                 MihTextFormField(
-                  fillColor:
+                  fillColor: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  inputColor:
+                  inputColor: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   controller: widget.descriptionIDController,
                   multiLineInput: true,
                   height: 250,
@@ -425,11 +434,12 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
                   formKey: _formKey,
                   formFields: [
                     MihTextFormField(
-                      fillColor: MzansiInnovationHub.of(context)!
+                      fillColor: MihColors.getSecondaryColor(
-                          .theme
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                          .secondaryColor(),
+                              "Dark"),
-                      inputColor:
+                      inputColor: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                       controller: widget.titleController,
                       multiLineInput: false,
                       requiredText: true,
@@ -458,11 +468,12 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
                     ),
                     const SizedBox(height: 10),
                     MihTextFormField(
-                      fillColor: MzansiInnovationHub.of(context)!
+                      fillColor: MihColors.getSecondaryColor(
-                          .theme
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                          .secondaryColor(),
+                              "Dark"),
-                      inputColor:
+                      inputColor: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                       controller: widget.descriptionIDController,
                       multiLineInput: true,
                       height: 250,
@@ -488,16 +499,18 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
                                     .formNotFilledCompletely(context);
                               }
                             },
-                            buttonColor: MzansiInnovationHub.of(context)!
+                            buttonColor: MihColors.getGreenColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .successColor(),
+                                    "Dark"),
                             width: 300,
                             child: Text(
                               "Update",
                               style: TextStyle(
-                                color: MzansiInnovationHub.of(context)!
+                                color: MihColors.getPrimaryColor(
+                                    MzansiInnovationHub.of(context)!
                                             .theme
-                                    .primaryColor(),
+                                            .mode ==
+                                        "Dark"),
                                 fontSize: 20,
                                 fontWeight: FontWeight.bold,
                               ),

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

@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
+import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/patient_queue.dart';
-
+import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_warning_message.dart';
-import '../../../main.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
-import '../../../mih_components/mih_pop_up_messages/mih_warning_message.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_env.dart';
-import '../../../mih_config/mih_env.dart';
 
 class BuildQueueList extends StatefulWidget {
   final List<PatientQueue> patientQueue;
@@ -44,7 +44,8 @@ class _BuildQueueListState extends State<BuildQueueList> {
       title: Text(
         title,
         style: TextStyle(
-          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MihColors.getSecondaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         ),
       ),
       subtitle: RichText(
@@ -121,7 +122,8 @@ class _BuildQueueListState extends State<BuildQueueList> {
       shrinkWrap: true,
       separatorBuilder: (BuildContext context, index) {
         return Divider(
-          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MihColors.getSecondaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         );
       },
       itemCount: widget.patientQueue.length,

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

@@ -3,6 +3,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart';
 import 'package:flutter/material.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 
 class MzansiCalendarTile extends StatefulWidget {
   final CalendarArguments arguments;
@@ -31,12 +32,15 @@ class _MzansiCalendarTileState extends State<MzansiCalendarTile> {
       appName: "Calendar",
       appIcon: Icon(
         MihIcons.calendar,
-        color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+        color: MihColors.getSecondaryColor(
+            MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         // size: widget.packageSize,
       ),
       iconSize: widget.packageSize,
-      primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      primaryColor: MihColors.getSecondaryColor(
-      secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+      secondaryColor: MihColors.getPrimaryColor(
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
     );
   }
 }

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

@@ -1,5 +1,6 @@
 import 'package:flutter_speed_dial/flutter_speed_dial.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_mzansi_calendar_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart';
@@ -93,7 +94,8 @@ class _PatientAccessRequestState extends State<Appointments> {
             Icon(
               MihIcons.calendar,
               size: 165,
-              color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+              color: MihColors.getSecondaryColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             ),
             const SizedBox(height: 10),
             Text(
@@ -103,7 +105,8 @@ class _PatientAccessRequestState extends State<Appointments> {
               style: TextStyle(
                 fontSize: 25,
                 fontWeight: FontWeight.bold,
-                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MihColors.getSecondaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               ),
             ),
             const SizedBox(height: 25),
@@ -114,8 +117,8 @@ class _PatientAccessRequestState extends State<Appointments> {
                   style: TextStyle(
                     fontSize: 20,
                     fontWeight: FontWeight.normal,
-                    color:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   ),
                   children: [
                     TextSpan(text: "Press "),
@@ -124,9 +127,9 @@ class _PatientAccessRequestState extends State<Appointments> {
                       child: Icon(
                         Icons.menu,
                         size: 20,
-                        color: MzansiInnovationHub.of(context)!
+                        color: MihColors.getSecondaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .secondaryColor(),
+                                "Dark"),
                       ),
                     ),
                     TextSpan(
@@ -149,7 +152,7 @@ class _PatientAccessRequestState extends State<Appointments> {
     //         "No Appointments for $selectedDay",
     //         style: TextStyle(
     //           fontSize: 25,
-    //           color: MzansiInnovationHub.of(context)!.theme.messageTextColor(),
+    //           color: MihColors.getGreyColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
     //         ),
     //         textAlign: TextAlign.center,
     //         softWrap: true,
@@ -185,11 +188,12 @@ class _PatientAccessRequestState extends State<Appointments> {
                   formKey: _formKey,
                   formFields: [
                     MihTextFormField(
-                      fillColor: MzansiInnovationHub.of(context)!
+                      fillColor: MihColors.getSecondaryColor(
-                          .theme
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                          .secondaryColor(),
+                              "Dark"),
-                      inputColor:
+                      inputColor: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                       controller: _appointmentTitleController,
                       multiLineInput: false,
                       requiredText: true,
@@ -218,11 +222,12 @@ class _PatientAccessRequestState extends State<Appointments> {
                     ),
                     const SizedBox(height: 10),
                     MihTextFormField(
-                      fillColor: MzansiInnovationHub.of(context)!
+                      fillColor: MihColors.getSecondaryColor(
-                          .theme
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                          .secondaryColor(),
+                              "Dark"),
-                      inputColor:
+                      inputColor: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                       controller: _appointmentDescriptionIDController,
                       multiLineInput: true,
                       height: 250,
@@ -242,16 +247,16 @@ class _PatientAccessRequestState extends State<Appointments> {
                             MihAlertServices().formNotFilledCompletely(context);
                           }
                         },
-                        buttonColor: MzansiInnovationHub.of(context)!
+                        buttonColor: MihColors.getGreenColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .successColor(),
+                                "Dark"),
                         width: 300,
                         child: Text(
                           "Add",
                           style: TextStyle(
-                            color: MzansiInnovationHub.of(context)!
+                            color: MihColors.getPrimaryColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .primaryColor(),
+                                    "Dark"),
                             fontSize: 20,
                             fontWeight: FontWeight.bold,
                           ),
@@ -355,7 +360,7 @@ class _PatientAccessRequestState extends State<Appointments> {
                     });
                   }),
               // Divider(
-              //   color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+              //   color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               // ),
               Row(
                 mainAxisSize: MainAxisSize.max,
@@ -377,9 +382,11 @@ class _PatientAccessRequestState extends State<Appointments> {
                               "Error pulling appointments",
                               style: TextStyle(
                                   fontSize: 25,
-                                  color: MzansiInnovationHub.of(context)!
+                                  color: MihColors.getRedColor(
+                                      MzansiInnovationHub.of(context)!
                                               .theme
-                                      .errorColor()),
+                                              .mode ==
+                                          "Dark")),
                               textAlign: TextAlign.center,
                             ),
                           );
@@ -400,17 +407,19 @@ class _PatientAccessRequestState extends State<Appointments> {
               SpeedDialChild(
                 child: Icon(
                   Icons.add,
-                  color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                  color: MihColors.getPrimaryColor(
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 ),
                 label: "Add Appointment",
-                labelBackgroundColor:
+                labelBackgroundColor: MihColors.getGreenColor(
-                    MzansiInnovationHub.of(context)!.theme.successColor(),
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 labelStyle: TextStyle(
-                  color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                  color: MihColors.getPrimaryColor(
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   fontWeight: FontWeight.bold,
                 ),
-                backgroundColor:
+                backgroundColor: MihColors.getGreenColor(
-                    MzansiInnovationHub.of(context)!.theme.successColor(),
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 onTap: () {
                   addAppointmentWindow(width);
                 },

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

@@ -11,6 +11,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_text_form_field.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_config/mih_env.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_user_services.dart';
@@ -159,18 +160,21 @@ class _MihRegisterState extends State<MihRegister> {
         return MihPackageAlert(
           alertIcon: Icon(
             Icons.warning_amber_rounded,
-            color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+            color: MihColors.getRedColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             size: 100,
           ),
           alertTitle: "Error While Signing Up",
           alertBody: Text(
             "An error occurred while signing up. Please try again later.",
             style: TextStyle(
-              color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+              color: MihColors.getSecondaryColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               fontSize: 18,
             ),
           ),
-          alertColour: MzansiInnovationHub.of(context)!.theme.errorColor(),
+          alertColour: MihColors.getRedColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         );
       },
     );
@@ -257,7 +261,8 @@ class _MihRegisterState extends State<MihRegister> {
               Icon(
                 Icons.lock,
                 size: 100,
-                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MihColors.getSecondaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               ),
               //spacer
               const SizedBox(height: 10),
@@ -267,8 +272,8 @@ class _MihRegisterState extends State<MihRegister> {
                 style: TextStyle(
                   fontSize: 25,
                   fontWeight: FontWeight.bold,
-                  color:
+                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 ),
               ),
               //spacer
@@ -278,10 +283,10 @@ class _MihRegisterState extends State<MihRegister> {
                 formFields: [
                   //email input
                   MihTextFormField(
-                    fillColor:
+                    fillColor: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    inputColor:
+                    inputColor: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     controller: emailController,
                     multiLineInput: false,
                     requiredText: true,
@@ -295,10 +300,10 @@ class _MihRegisterState extends State<MihRegister> {
                   const SizedBox(height: 10),
                   //password input
                   MihTextFormField(
-                    fillColor:
+                    fillColor: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    inputColor:
+                    inputColor: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     controller: passwordController,
                     multiLineInput: false,
                     requiredText: true,
@@ -312,10 +317,10 @@ class _MihRegisterState extends State<MihRegister> {
                   //spacer
                   const SizedBox(height: 10),
                   MihTextFormField(
-                    fillColor:
+                    fillColor: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    inputColor:
+                    inputColor: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     controller: confirmPasswordController,
                     multiLineInput: false,
                     requiredText: true,
@@ -345,16 +350,16 @@ class _MihRegisterState extends State<MihRegister> {
                                   .formNotFilledCompletely(context);
                             }
                           },
-                          buttonColor: MzansiInnovationHub.of(context)!
+                          buttonColor: MihColors.getGreenColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .successColor(),
+                                  "Dark"),
                           width: 300,
                           child: Text(
                             "Create New Account",
                             style: TextStyle(
-                              color: MzansiInnovationHub.of(context)!
+                              color: MihColors.getPrimaryColor(
-                                  .theme
+                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                  .primaryColor(),
+                                      "Dark"),
                               fontSize: 20,
                               fontWeight: FontWeight.bold,
                             ),
@@ -362,16 +367,16 @@ class _MihRegisterState extends State<MihRegister> {
                         ),
                         MihButton(
                           onPressed: widget.onExistingUserButtonTap,
-                          buttonColor: MzansiInnovationHub.of(context)!
+                          buttonColor: MihColors.getSecondaryColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .secondaryColor(),
+                                  "Dark"),
                           width: 300,
                           child: Text(
                             "I have an account",
                             style: TextStyle(
-                              color: MzansiInnovationHub.of(context)!
+                              color: MihColors.getPrimaryColor(
-                                  .theme
+                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                  .primaryColor(),
+                                      "Dark"),
                               fontSize: 20,
                               fontWeight: FontWeight.bold,
                             ),

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

@@ -9,6 +9,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_text_form_field.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_config/mih_env.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_authentication_services.dart';
@@ -159,11 +160,13 @@ class _MihSignInState extends State<MihSignIn> {
   }
 
   Color getPrim() {
-    return MzansiInnovationHub.of(context)!.theme.secondaryColor();
+    return MihColors.getSecondaryColor(
+        MzansiInnovationHub.of(context)!.theme.mode == "Dark");
   }
 
   Color getSec() {
-    return MzansiInnovationHub.of(context)!.theme.primaryColor();
+    return MihColors.getPrimaryColor(
+        MzansiInnovationHub.of(context)!.theme.mode == "Dark");
   }
 
   void loginError() {
@@ -232,16 +235,16 @@ class _MihSignInState extends State<MihSignIn> {
                           onPressed: () {
                             MihInstallServices().installMihTrigger(context);
                           },
-                          buttonColor: MzansiInnovationHub.of(context)!
+                          buttonColor: MihColors.getGreenColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .successColor(),
+                                  "Dark"),
                           width: 150,
                           child: Text(
                             "Install MIH",
                             style: TextStyle(
-                              color: MzansiInnovationHub.of(context)!
+                              color: MihColors.getPrimaryColor(
-                                  .theme
+                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                  .primaryColor(),
+                                      "Dark"),
                               fontSize: 20,
                               fontWeight: FontWeight.bold,
                             ),
@@ -255,8 +258,8 @@ class _MihSignInState extends State<MihSignIn> {
                 Icon(
                   Icons.lock,
                   size: 100,
-                  color:
+                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 ),
                 //spacer
                 const SizedBox(height: 10),
@@ -266,8 +269,8 @@ class _MihSignInState extends State<MihSignIn> {
                   style: TextStyle(
                     fontSize: 25,
                     fontWeight: FontWeight.bold,
-                    color:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   ),
                 ),
                 //spacer
@@ -276,11 +279,12 @@ class _MihSignInState extends State<MihSignIn> {
                   formKey: _formKey,
                   formFields: [
                     MihTextFormField(
-                      fillColor: MzansiInnovationHub.of(context)!
+                      fillColor: MihColors.getSecondaryColor(
-                          .theme
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                          .secondaryColor(),
+                              "Dark"),
-                      inputColor:
+                      inputColor: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                       controller: emailController,
                       multiLineInput: false,
                       requiredText: true,
@@ -294,11 +298,12 @@ class _MihSignInState extends State<MihSignIn> {
                     const SizedBox(height: 10),
                     //password input
                     MihTextFormField(
-                      fillColor: MzansiInnovationHub.of(context)!
+                      fillColor: MihColors.getSecondaryColor(
-                          .theme
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                          .secondaryColor(),
+                              "Dark"),
-                      inputColor:
+                      inputColor: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                       controller: passwordController,
                       multiLineInput: false,
                       requiredText: true,
@@ -327,9 +332,11 @@ class _MihSignInState extends State<MihSignIn> {
                               'Forgot Password?',
                               style: TextStyle(
                                 fontSize: 15,
-                                color: MzansiInnovationHub.of(context)!
+                                color: MihColors.getSecondaryColor(
+                                    MzansiInnovationHub.of(context)!
                                             .theme
-                                    .secondaryColor(),
+                                            .mode ==
+                                        "Dark"),
                                 fontWeight: FontWeight.bold,
                               ),
                             ),
@@ -357,16 +364,18 @@ class _MihSignInState extends State<MihSignIn> {
                                     .formNotFilledCompletely(context);
                               }
                             },
-                            buttonColor: MzansiInnovationHub.of(context)!
+                            buttonColor: MihColors.getGreenColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .successColor(),
+                                    "Dark"),
                             width: 300,
                             child: Text(
                               "Sign In",
                               style: TextStyle(
-                                color: MzansiInnovationHub.of(context)!
+                                color: MihColors.getPrimaryColor(
+                                    MzansiInnovationHub.of(context)!
                                             .theme
-                                    .primaryColor(),
+                                            .mode ==
+                                        "Dark"),
                                 fontSize: 20,
                                 fontWeight: FontWeight.bold,
                               ),
@@ -374,16 +383,18 @@ class _MihSignInState extends State<MihSignIn> {
                           ),
                           MihButton(
                             onPressed: widget.onNewUserButtonTap,
-                            buttonColor: MzansiInnovationHub.of(context)!
+                            buttonColor: MihColors.getSecondaryColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .secondaryColor(),
+                                    "Dark"),
                             width: 300,
                             child: Text(
                               "Create New Account",
                               style: TextStyle(
-                                color: MzansiInnovationHub.of(context)!
+                                color: MihColors.getPrimaryColor(
+                                    MzansiInnovationHub.of(context)!
                                             .theme
-                                    .primaryColor(),
+                                            .mode ==
+                                        "Dark"),
                                 fontSize: 20,
                                 fontWeight: FontWeight.bold,
                               ),
@@ -420,9 +431,11 @@ class _MihSignInState extends State<MihSignIn> {
                                     style: TextStyle(
                                         fontWeight: FontWeight.bold,
                                         fontSize: 15,
-                                        color: MzansiInnovationHub.of(context)!
+                                        color: MihColors.getSecondaryColor(
+                                            MzansiInnovationHub.of(context)!
                                                     .theme
-                                            .secondaryColor()),
+                                                    .mode ==
+                                                "Dark")),
                                   ),
                                   onTap: () {
                                     setState(() {
@@ -469,9 +482,11 @@ 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: MzansiInnovationHub.of(context)!
+                                  color: MihColors.getRedColor(
+                                      MzansiInnovationHub.of(context)!
                                               .theme
-                                      .errorColor(),
+                                              .mode ==
+                                          "Dark"),
                                   fontSize: 15.0,
                                   fontWeight: FontWeight.bold,
                                 ),

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

@@ -3,6 +3,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_circle_avatar.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import '../../../main.dart';
 import 'package:supertokens_flutter/supertokens.dart';
 
@@ -57,9 +58,10 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
         fileNameController: proPicController,
         onChange: (_) {},
         userSelectedfile: null,
-        frameColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+        frameColor: MihColors.getPrimaryColor(
-        backgroundColor:
+            MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+        backgroundColor: MihColors.getSecondaryColor(
+            MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
       ),
     );
   }
@@ -84,7 +86,7 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
     //     MzansiInnovationHub.of(context)!.theme.logoImage().image, context);
     return SafeArea(
       child: Drawer(
-        //backgroundColor:  MzansiInnovationHub.of(context)!.theme.primaryColor(),
+        //backgroundColor:  MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         child: LayoutBuilder(
           builder: (BuildContext context, BoxConstraints constraints) {
             return Stack(
@@ -97,9 +99,9 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
                   children: [
                     DrawerHeader(
                       decoration: BoxDecoration(
-                        color: MzansiInnovationHub.of(context)!
+                        color: MihColors.getSecondaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .secondaryColor(),
+                                "Dark"),
                       ),
                       child: SizedBox(
                         height: 400,
@@ -113,9 +115,11 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
                               "${widget.signedInUser.fname} ${widget.signedInUser.lname}",
                               style: TextStyle(
                                 fontWeight: FontWeight.bold,
-                                color: MzansiInnovationHub.of(context)!
+                                color: MihColors.getPrimaryColor(
+                                    MzansiInnovationHub.of(context)!
                                             .theme
-                                    .primaryColor(),
+                                            .mode ==
+                                        "Dark"),
                               ),
                             ),
                             Text(
@@ -123,9 +127,11 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
                               style: TextStyle(
                                 fontSize: 12,
                                 fontWeight: FontWeight.bold,
-                                color: MzansiInnovationHub.of(context)!
+                                color: MihColors.getPrimaryColor(
+                                    MzansiInnovationHub.of(context)!
                                             .theme
-                                    .primaryColor(),
+                                            .mode ==
+                                        "Dark"),
                               ),
                             ),
                             Text(
@@ -133,9 +139,11 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
                               style: TextStyle(
                                 fontSize: 10,
                                 fontWeight: FontWeight.bold,
-                                color: MzansiInnovationHub.of(context)!
+                                color: MihColors.getPrimaryColor(
+                                    MzansiInnovationHub.of(context)!
                                             .theme
-                                    .primaryColor(),
+                                            .mode ==
+                                        "Dark"),
                               ),
                             ),
                           ],
@@ -149,7 +157,7 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
                     //       Icon(
                     //         Icons.home_outlined,
                     //         color:
-                    //             MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                    //             MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     //       ),
                     //       const SizedBox(width: 25.0),
                     //       Text(
@@ -179,18 +187,22 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
                               children: [
                                 Icon(
                                   Icons.policy,
-                                  color: MzansiInnovationHub.of(context)!
+                                  color: MihColors.getSecondaryColor(
+                                      MzansiInnovationHub.of(context)!
                                               .theme
-                                      .secondaryColor(),
+                                              .mode ==
+                                          "Dark"),
                                 ),
                                 const SizedBox(width: 25.0),
                                 Text(
                                   "Privacy Policy",
                                   style: TextStyle(
                                     //fontWeight: FontWeight.bold,
-                                    color: MzansiInnovationHub.of(context)!
+                                    color: MihColors.getSecondaryColor(
+                                        MzansiInnovationHub.of(context)!
                                                 .theme
-                                        .secondaryColor(),
+                                                .mode ==
+                                            "Dark"),
                                   ),
                                 ),
                               ],
@@ -208,18 +220,22 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
                               children: [
                                 Icon(
                                   Icons.design_services_rounded,
-                                  color: MzansiInnovationHub.of(context)!
+                                  color: MihColors.getSecondaryColor(
+                                      MzansiInnovationHub.of(context)!
                                               .theme
-                                      .secondaryColor(),
+                                              .mode ==
+                                          "Dark"),
                                 ),
                                 const SizedBox(width: 25.0),
                                 Text(
                                   "Terms of Service",
                                   style: TextStyle(
                                     //fontWeight: FontWeight.bold,
-                                    color: MzansiInnovationHub.of(context)!
+                                    color: MihColors.getSecondaryColor(
+                                        MzansiInnovationHub.of(context)!
                                                 .theme
-                                        .secondaryColor(),
+                                                .mode ==
+                                            "Dark"),
                                   ),
                                 ),
                               ],
@@ -237,18 +253,22 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
                               children: [
                                 Icon(
                                   Icons.logout,
-                                  color: MzansiInnovationHub.of(context)!
+                                  color: MihColors.getSecondaryColor(
+                                      MzansiInnovationHub.of(context)!
                                               .theme
-                                      .secondaryColor(),
+                                              .mode ==
+                                          "Dark"),
                                 ),
                                 const SizedBox(width: 25.0),
                                 Text(
                                   "Sign Out",
                                   style: TextStyle(
                                     //fontWeight: FontWeight.bold,
-                                    color: MzansiInnovationHub.of(context)!
+                                    color: MihColors.getSecondaryColor(
+                                        MzansiInnovationHub.of(context)!
                                                 .theme
-                                        .secondaryColor(),
+                                                .mode ==
+                                            "Dark"),
                                   ),
                                 ),
                               ],
@@ -303,8 +323,9 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
                     },
                     child: Icon(
                       MihIcons.mihLogo,
-                      color:
+                      color: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                     ),
                   ),
                   // IconButton(
@@ -324,7 +345,7 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
                   //   },
                   //   icon: Icon(
                   //     Icons.light_mode,
-                  //     color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                  //     color: MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   //     size: 35,
                   //   ),
                   // ),

Frontend/lib/mih_packages/mih_home/mih_home.dart

@@ -8,6 +8,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_objects/business.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/business_user.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/notification.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/patients.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_packages/mih_home/components/mih_app_drawer.dart';
 import 'package:mzansi_innovation_hub/mih_packages/mih_home/package_tools/mih_business_home.dart';
 import 'package:mzansi_innovation_hub/mih_packages/mih_home/package_tools/mih_personal_home.dart';
@@ -117,9 +118,10 @@ class _MihHomeState extends State<MihHome> {
             fileNameController: proPicController,
             userSelectedfile: null,
             // frameColor: frameColor,
-            frameColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+            frameColor: MihColors.getSecondaryColor(
-            backgroundColor:
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                MzansiInnovationHub.of(context)!.theme.primaryColor(),
+            backgroundColor: MihColors.getPrimaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             onChange: (_) {},
           ),
           // MIHProfilePicture(
@@ -130,7 +132,7 @@ class _MihHomeState extends State<MihHome> {
           //   radius: 21,
           //   drawerMode: false,
           //   editable: false,
-          //   frameColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+          //   frameColor: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
           //   onChange: (newProPic) {},
           // ),
         ),

Frontend/lib/mih_packages/mih_home/mih_home_legacy.dart

@@ -15,6 +15,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_objects/patients.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import '../../main.dart';
 import 'package:supertokens_flutter/http.dart' as http;
 import "package:universal_html/html.dart" as html;
@@ -862,19 +863,21 @@ class _MIHHomeLegacyState extends State<MIHHomeLegacy> {
                   SpeedDialChild(
                     child: Icon(
                       Icons.delete,
-                      color:
+                      color: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                     ),
                     label: "Delete File",
-                    labelBackgroundColor:
+                    labelBackgroundColor: MihColors.getGreenColor(
-                        MzansiInnovationHub.of(context)!.theme.successColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     labelStyle: TextStyle(
-                      color:
+                      color: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                       fontWeight: FontWeight.bold,
                     ),
-                    backgroundColor:
+                    backgroundColor: MihColors.getGreenColor(
-                        MzansiInnovationHub.of(context)!.theme.successColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     onTap: () {},
                   ),
                 ],
@@ -951,11 +954,13 @@ class _MIHHomeLegacyState extends State<MIHHomeLegacy> {
   }
 
   Color getPrim() {
-    return MzansiInnovationHub.of(context)!.theme.secondaryColor();
+    return MihColors.getSecondaryColor(
+        MzansiInnovationHub.of(context)!.theme.mode == "Dark");
   }
 
   Color getSec() {
-    return MzansiInnovationHub.of(context)!.theme.primaryColor();
+    return MihColors.getPrimaryColor(
+        MzansiInnovationHub.of(context)!.theme.mode == "Dark");
   }
 
   bool isBusinessUser(AppUser signedInUser) {
@@ -992,7 +997,7 @@ class _MIHHomeLegacyState extends State<MIHHomeLegacy> {
           //   radius: 21,
           //   drawerMode: false,
           //   editable: false,
-          //   frameColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+          //   frameColor: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
           //   onChange: (newProPic) {},
           // ),
         ),
@@ -1022,7 +1027,8 @@ class _MIHHomeLegacyState extends State<MIHHomeLegacy> {
             child: Icon(
               Icons.circle,
               size: 10,
-              color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+              color: MihColors.getRedColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             ),
           )
         ],
@@ -1089,10 +1095,10 @@ class _MIHHomeLegacyState extends State<MIHHomeLegacy> {
                     hintText: "Ask Mzansi",
                     prefixIcon: Icons.search,
                     prefixAltIcon: MihIcons.mzansiAi,
-                    fillColor:
+                    fillColor: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    hintColor:
+                    hintColor: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     onPrefixIconTap: () {
                       print("Search Text: ${searchController.text}");
                       setState(() {
@@ -1167,11 +1173,11 @@ class _MIHHomeLegacyState extends State<MIHHomeLegacy> {
         child: Placeholder(),
         // GNav(
         //   //hoverColor: Colors.lightBlueAccent,
-        //   color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+        //   color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         //   iconSize: 35.0,
-        //   activeColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+        //   activeColor: MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         //   tabBackgroundColor:
-        //       MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+        //       MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         //   //gap: 20,
         //   //padding: EdgeInsets.all(15),
         //   tabs: [

Frontend/lib/mih_packages/mih_home/mih_profile_getter.dart

@@ -7,6 +7,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_action.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tools.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_packages/mih_home/mih_home.dart';
 import 'package:flutter/material.dart';
 
@@ -92,7 +93,8 @@ class _MIHProfileGetterState extends State<MIHProfileGetter> {
               "Connection Error",
               textAlign: TextAlign.center,
               style: TextStyle(
-                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MihColors.getSecondaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 fontSize: 35,
                 fontWeight: FontWeight.bold,
               ),
@@ -100,7 +102,8 @@ class _MIHProfileGetterState extends State<MIHProfileGetter> {
             Icon(
               Icons.power_off_outlined,
               size: 150,
-              color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+              color: MihColors.getSecondaryColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             ),
             SizedBox(
               width: 500,
@@ -108,8 +111,8 @@ class _MIHProfileGetterState extends State<MIHProfileGetter> {
                 "Looks like we ran into an issue getting your data.\nPlease check you internet connection and try again.",
                 textAlign: TextAlign.center,
                 style: TextStyle(
-                  color:
+                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   fontSize: 20,
                   fontWeight: FontWeight.bold,
                 ),
@@ -120,13 +123,14 @@ class _MIHProfileGetterState extends State<MIHProfileGetter> {
               onPressed: () {
                 Navigator.of(context).popAndPushNamed("/");
               },
-              buttonColor:
+              buttonColor: MihColors.getGreenColor(
-                  MzansiInnovationHub.of(context)!.theme.successColor(),
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               width: 300,
               child: Text(
                 "Refresh",
                 style: TextStyle(
-                  color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                  color: MihColors.getPrimaryColor(
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   fontSize: 20,
                   fontWeight: FontWeight.bold,
                 ),
@@ -142,8 +146,9 @@ class _MIHProfileGetterState extends State<MIHProfileGetter> {
                     "Error: $error",
                     textAlign: TextAlign.left,
                     style: TextStyle(
-                      color:
+                      color: MihColors.getRedColor(
-                          MzansiInnovationHub.of(context)!.theme.errorColor(),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                       fontSize: 15,
                       fontWeight: FontWeight.bold,
                     ),

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

@@ -7,6 +7,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/business.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/business_user.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_packages/about_mih/package_tile/about_mih_tile.dart';
 import 'package:mzansi_innovation_hub/mih_packages/calculator/package_tiles/mih_calculator_tile.dart';
 import 'package:mzansi_innovation_hub/mih_packages/calendar/package_tiles/mzansi_calendar_tile.dart';
@@ -215,7 +216,7 @@ class _MihBusinessHomeState extends State<MihBusinessHome>
           // Icon(
           //   MihIcons.mihLogo,
           //   size: width / 2,
-          //   color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+          //   color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
           // ),
           // const SizedBox(height: 10),
           // Text(
@@ -225,7 +226,7 @@ class _MihBusinessHomeState extends State<MihBusinessHome>
           //   style: TextStyle(
           //     fontSize: 30,
           //     fontWeight: FontWeight.bold,
-          //     color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+          //     color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
           //   ),
           // ),
           // const SizedBox(height: 20),
@@ -238,10 +239,10 @@ class _MihBusinessHomeState extends State<MihBusinessHome>
                 hintText: "Ask Mzansi",
                 prefixIcon: Icons.search,
                 prefixAltIcon: MihIcons.mzansiAi,
-                fillColor:
+                fillColor: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                hintColor:
+                hintColor: MihColors.getPrimaryColor(
-                    MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 onPrefixIconTap: () {
                   Navigator.of(context).pushNamed(
                     '/mzansi-ai',
@@ -292,9 +293,9 @@ class _MihBusinessHomeState extends State<MihBusinessHome>
                     Icon(
                       MihIcons.mzansiAi,
                       size: 165,
-                      color: MzansiInnovationHub.of(context)!
+                      color: MihColors.getSecondaryColor(
-                          .theme
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                          .secondaryColor(),
+                              "Dark"),
                     ),
                     const SizedBox(height: 10),
                     Text(
@@ -304,9 +305,9 @@ class _MihBusinessHomeState extends State<MihBusinessHome>
                       style: TextStyle(
                         fontSize: 25,
                         fontWeight: FontWeight.bold,
-                        color: MzansiInnovationHub.of(context)!
+                        color: MihColors.getSecondaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .secondaryColor(),
+                                "Dark"),
                       ),
                     ),
                   ],

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

@@ -8,6 +8,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/business.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/business_user.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_packages/about_mih/package_tile/about_mih_tile.dart';
 import 'package:mzansi_innovation_hub/mih_packages/access_review/package_tile/mih_access_tile.dart';
 import 'package:mzansi_innovation_hub/mih_packages/calculator/package_tiles/mih_calculator_tile.dart';
@@ -171,11 +172,14 @@ class _MihPersonalHomeState extends State<MihPersonalHome>
           appName: "Test",
           appIcon: Icon(
             Icons.warning_amber_rounded,
-            color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+            color: MihColors.getSecondaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
           ),
           iconSize: packageSize,
-          primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+          primaryColor: MihColors.getSecondaryColor(
-          secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+          secondaryColor: MihColors.getPrimaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         )
       });
     }
@@ -267,7 +271,7 @@ class _MihPersonalHomeState extends State<MihPersonalHome>
           // Icon(
           //   MihIcons.mihLogo,
           //   size: 200,
-          //   color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+          //   color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
           // ),
           // const SizedBox(height: 10),
           // Text(
@@ -277,7 +281,7 @@ class _MihPersonalHomeState extends State<MihPersonalHome>
           //   style: TextStyle(
           //     fontSize: 30,
           //     fontWeight: FontWeight.bold,
-          //     color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+          //     color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
           //   ),
           // ),
           // const SizedBox(height: 20),
@@ -290,10 +294,10 @@ class _MihPersonalHomeState extends State<MihPersonalHome>
                 hintText: "Ask Mzansi",
                 prefixIcon: Icons.search,
                 prefixAltIcon: MihIcons.mzansiAi,
-                fillColor:
+                fillColor: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                hintColor:
+                hintColor: MihColors.getPrimaryColor(
-                    MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 onPrefixIconTap: () {
                   Navigator.of(context).pushNamed(
                     '/mzansi-ai',
@@ -345,9 +349,9 @@ class _MihPersonalHomeState extends State<MihPersonalHome>
                     Icon(
                       MihIcons.mzansiAi,
                       size: 165,
-                      color: MzansiInnovationHub.of(context)!
+                      color: MihColors.getSecondaryColor(
-                          .theme
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                          .secondaryColor(),
+                              "Dark"),
                     ),
                     const SizedBox(height: 10),
                     Text(
@@ -357,9 +361,9 @@ class _MihPersonalHomeState extends State<MihPersonalHome>
                       style: TextStyle(
                         fontSize: 25,
                         fontWeight: FontWeight.bold,
-                        color: MzansiInnovationHub.of(context)!
+                        color: MihColors.getSecondaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .secondaryColor(),
+                                "Dark"),
                       ),
                     ),
                   ],

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

@@ -4,6 +4,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart';
 import 'package:flutter/material.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 
 class MzansiAiTile extends StatefulWidget {
   final AppUser signedInUser;
@@ -35,12 +36,15 @@ class _MzansiAiTileState extends State<MzansiAiTile> {
       appName: "Mzansi AI",
       appIcon: Icon(
         MihIcons.mzansiAi,
-        color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+        color: MihColors.getSecondaryColor(
+            MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         // size: widget.packageSize,
       ),
       iconSize: widget.packageSize,
-      primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      primaryColor: MihColors.getSecondaryColor(
-      secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+      secondaryColor: MihColors.getPrimaryColor(
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
     );
   }
 }

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

@@ -3,6 +3,7 @@ import 'dart:convert';
 import 'package:flutter_speed_dial/flutter_speed_dial.dart';
 import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_dropdwn_field.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_numeric_stepper.dart';
@@ -188,21 +189,23 @@ class _AiChatState extends State<AiChat> {
                     SpeedDialChild(
                       child: Icon(
                         Icons.volume_up,
-                        color: MzansiInnovationHub.of(context)!
+                        color: MihColors.getPrimaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .primaryColor(),
+                                "Dark"),
                       ),
                       label: "Read Aloud",
-                      labelBackgroundColor:
+                      labelBackgroundColor: MihColors.getGreenColor(
-                          MzansiInnovationHub.of(context)!.theme.successColor(),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                       labelStyle: TextStyle(
-                        color: MzansiInnovationHub.of(context)!
+                        color: MihColors.getPrimaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .primaryColor(),
+                                "Dark"),
                         fontWeight: FontWeight.bold,
                       ),
-                      backgroundColor:
+                      backgroundColor: MihColors.getGreenColor(
-                          MzansiInnovationHub.of(context)!.theme.successColor(),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                       onTap: () {
                         _speakText(snapshot.requireData);
                       },
@@ -223,9 +226,9 @@ class _AiChatState extends State<AiChat> {
                     snapshot.requireData,
                     textAlign: TextAlign.left,
                     style: TextStyle(
-                      color: MzansiInnovationHub.of(context)!
+                      color: MihColors.getSecondaryColor(
-                          .theme
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                          .secondaryColor(),
+                              "Dark"),
                       fontSize: _chatFrontSize,
                       fontWeight: FontWeight.bold,
                     ),
@@ -306,29 +309,37 @@ class _AiChatState extends State<AiChat> {
 
   ChatTheme getChatTheme() {
     return DarkChatTheme(
-      backgroundColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+      backgroundColor: MihColors.getPrimaryColor(
-      inputBackgroundColor:
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-          MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      inputBackgroundColor: MihColors.getSecondaryColor(
-      inputTextColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-      inputTextCursorColor:
+      inputTextColor: MihColors.getPrimaryColor(
-          MzansiInnovationHub.of(context)!.theme.primaryColor(),
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-      primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      inputTextCursorColor: MihColors.getPrimaryColor(
-      secondaryColor: MzansiInnovationHub.of(context)!.theme.successColor(),
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-      errorColor: MzansiInnovationHub.of(context)!.theme.errorColor(),
+      primaryColor: MihColors.getSecondaryColor(
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+      secondaryColor: MihColors.getGreenColor(
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+      errorColor: MihColors.getRedColor(
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
       sentMessageBodyTextStyle: TextStyle(
-        color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+        color: MihColors.getPrimaryColor(
+            MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         fontSize: _chatFrontSize,
         fontWeight: FontWeight.w500,
         fontFamily: 'Segoe UI',
       ),
       receivedMessageBodyTextStyle: TextStyle(
-        color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+        color: MihColors.getPrimaryColor(
+            MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         fontSize: _chatFrontSize,
         fontWeight: FontWeight.w500,
         fontFamily: 'Segoe UI',
       ),
       emptyChatPlaceholderTextStyle: TextStyle(
-        color: MzansiInnovationHub.of(context)!.theme.messageTextColor(),
+        color: MihColors.getGreyColor(
+            MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         fontSize: _chatFrontSize,
         fontWeight: FontWeight.w500,
         fontFamily: 'Segoe UI',
@@ -350,13 +361,13 @@ class _AiChatState extends State<AiChat> {
                 child: Container(
                   padding: const EdgeInsets.all(10.0),
                   decoration: BoxDecoration(
-                    color:
+                    color: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     borderRadius: BorderRadius.circular(25.0),
                     border: Border.all(
-                        color: MzansiInnovationHub.of(context)!
+                        color: MihColors.getSecondaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .secondaryColor(),
+                                "Dark"),
                         width: 3.0),
                   ),
                   child: Column(
@@ -371,9 +382,9 @@ class _AiChatState extends State<AiChat> {
                             style: TextStyle(
                               fontSize: 25,
                               fontWeight: FontWeight.bold,
-                              color: MzansiInnovationHub.of(context)!
+                              color: MihColors.getSecondaryColor(
-                                  .theme
+                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                  .secondaryColor(),
+                                      "Dark"),
                             ),
                           ),
                         ],
@@ -386,13 +397,12 @@ class _AiChatState extends State<AiChat> {
                             child: MihRadioOptions(
                               controller: _modelController,
                               hintText: "AI Model",
-                              fillColor: MzansiInnovationHub.of(context)!
+                              fillColor: MihColors.getSecondaryColor(
-                                  .theme
+                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                  .secondaryColor(),
+                                      "Dark"),
-                              secondaryFillColor:
+                              secondaryFillColor: MihColors.getPrimaryColor(
-                                  MzansiInnovationHub.of(context)!
+                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      .theme
+                                      "Dark"),
-                                      .primaryColor(),
                               requiredText: true,
                               radioOptions: [getModel()],
                             ),
@@ -446,13 +456,17 @@ class _AiChatState extends State<AiChat> {
                                   style: ButtonStyle(
                                     backgroundColor:
                                         WidgetStateProperty.all<Color>(
+                                            MihColors.getGreenColor(
                                                 MzansiInnovationHub.of(context)!
                                                         .theme
-                                                .successColor()),
+                                                        .mode ==
+                                                    "Dark")),
                                   ),
-                                  color: MzansiInnovationHub.of(context)!
+                                  color: MihColors.getPrimaryColor(
+                                      MzansiInnovationHub.of(context)!
                                               .theme
-                                      .primaryColor(),
+                                              .mode ==
+                                          "Dark"),
                                   iconSize: 25,
                                   onPressed: () {
                                     print("Start TTS now");
@@ -475,12 +489,12 @@ class _AiChatState extends State<AiChat> {
                             width: 300,
                             child: MihNumericStepper(
                               controller: _fontSizeController,
-                              fillColor: MzansiInnovationHub.of(context)!
+                              fillColor: MihColors.getSecondaryColor(
-                                  .theme
+                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                  .secondaryColor(),
+                                      "Dark"),
-                              inputColor: MzansiInnovationHub.of(context)!
+                              inputColor: MihColors.getPrimaryColor(
-                                  .theme
+                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                  .primaryColor(),
+                                      "Dark"),
                               hintText: "Font Size",
                               requiredText: true,
                               minValue: 1,
@@ -698,10 +712,12 @@ class _AiChatState extends State<AiChat> {
                   child: IconButton.filled(
                     style: ButtonStyle(
                       backgroundColor: WidgetStateProperty.all<Color>(
-                          MzansiInnovationHub.of(context)!.theme.errorColor()),
+                          MihColors.getRedColor(
+                              MzansiInnovationHub.of(context)!.theme.mode ==
+                                  "Dark")),
                     ),
-                    color:
+                    color: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     iconSize: 20,
                     onPressed: () {
                       if (_showModelOptions.value == true) {
@@ -749,17 +765,19 @@ class _AiChatState extends State<AiChat> {
               SpeedDialChild(
                 child: Icon(
                   Icons.refresh,
-                  color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                  color: MihColors.getPrimaryColor(
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 ),
                 label: "New Chat",
-                labelBackgroundColor:
+                labelBackgroundColor: MihColors.getGreenColor(
-                    MzansiInnovationHub.of(context)!.theme.successColor(),
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 labelStyle: TextStyle(
-                  color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                  color: MihColors.getPrimaryColor(
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   fontWeight: FontWeight.bold,
                 ),
-                backgroundColor:
+                backgroundColor: MihColors.getGreenColor(
-                    MzansiInnovationHub.of(context)!.theme.successColor(),
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 onTap: () {
                   _resetChat();
                 },
@@ -767,17 +785,19 @@ class _AiChatState extends State<AiChat> {
               SpeedDialChild(
                 child: Icon(
                   Icons.settings,
-                  color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                  color: MihColors.getPrimaryColor(
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 ),
                 label: "Settings",
-                labelBackgroundColor:
+                labelBackgroundColor: MihColors.getGreenColor(
-                    MzansiInnovationHub.of(context)!.theme.successColor(),
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 labelStyle: TextStyle(
-                  color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                  color: MihColors.getPrimaryColor(
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   fontWeight: FontWeight.bold,
                 ),
-                backgroundColor:
+                backgroundColor: MihColors.getGreenColor(
-                    MzansiInnovationHub.of(context)!.theme.successColor(),
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 onTap: () {
                   if (_showModelOptions.value == true) {
                     setState(() {
@@ -808,7 +828,8 @@ class _AiChatState extends State<AiChat> {
           Icon(
             MihIcons.mzansiAi,
             size: 165,
-            color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+            color: MihColors.getSecondaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
           ),
           const SizedBox(height: 10),
           Text(
@@ -818,7 +839,8 @@ class _AiChatState extends State<AiChat> {
             style: TextStyle(
               fontSize: 25,
               fontWeight: FontWeight.bold,
-              color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+              color: MihColors.getSecondaryColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             ),
           ),
           const SizedBox(height: 25),
@@ -829,8 +851,8 @@ class _AiChatState extends State<AiChat> {
                 style: TextStyle(
                   fontSize: 20,
                   fontWeight: FontWeight.normal,
-                  color:
+                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 ),
                 children: [
                   TextSpan(

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

@@ -3,6 +3,7 @@ import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/business.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_business_profile_preview.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 
 class BuildBusinessSearchResultsList extends StatefulWidget {
   final List<Business> businessList;
@@ -30,12 +31,14 @@ class _BuildBusinessSearchResultsListState
       itemCount: widget.businessList.length,
       separatorBuilder: (BuildContext context, index) {
         return Divider(
-          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MihColors.getSecondaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         );
       },
       itemBuilder: (context, index) {
         return Material(
-          color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+          color: MihColors.getPrimaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
           child: InkWell(
             onTap: () {
               Navigator.of(context).pushNamed(
@@ -46,9 +49,8 @@ class _BuildBusinessSearchResultsListState
                 ),
               );
             },
-            splashColor: MzansiInnovationHub.of(context)!
+            splashColor: MihColors.getSecondaryColor(
-                .theme
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark")
-                .secondaryColor()
                 .withOpacity(0.2),
             borderRadius: BorderRadius.circular(15),
             child: Padding(

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

@@ -3,6 +3,7 @@ import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/business.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_business_profile_preview.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 
 class BuildFavouriteBusinessesList extends StatefulWidget {
   final List<Business?> favouriteBusinesses;
@@ -39,7 +40,8 @@ class _BuildFavouriteBusinessesListState
         }
 
         return Material(
-          color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+          color: MihColors.getPrimaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
           child: InkWell(
             onTap: () {
               Navigator.of(context).pushNamed(
@@ -50,9 +52,8 @@ class _BuildFavouriteBusinessesListState
                 ),
               );
             },
-            splashColor: MzansiInnovationHub.of(context)!
+            splashColor: MihColors.getSecondaryColor(
-                .theme
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark")
-                .secondaryColor()
                 .withOpacity(0.2),
             borderRadius: BorderRadius.circular(15),
             child: Padding(

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

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_personal_profile_preview.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 
 class BuildUserSearchResultsList extends StatefulWidget {
   final List<AppUser> userList;
@@ -25,12 +26,14 @@ class _BuildUserSearchResultsListState
       itemCount: widget.userList.length,
       separatorBuilder: (BuildContext context, index) {
         return Divider(
-          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MihColors.getSecondaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         );
       },
       itemBuilder: (context, index) {
         return Material(
-          color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+          color: MihColors.getPrimaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
           child: InkWell(
             onTap: () {
               Navigator.of(context).pushNamed(
@@ -38,9 +41,8 @@ class _BuildUserSearchResultsListState
                 arguments: widget.userList[index],
               );
             },
-            splashColor: MzansiInnovationHub.of(context)!
+            splashColor: MihColors.getSecondaryColor(
-                .theme
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark")
-                .secondaryColor()
                 .withOpacity(0.2),
             borderRadius: BorderRadius.circular(15),
             child: Padding(

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

@@ -3,6 +3,7 @@ import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tile.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 
 class MzansiDirectoryTile extends StatefulWidget {
   final double packageSize;
@@ -31,12 +32,15 @@ class _MzansiDirectoryTileState extends State<MzansiDirectoryTile> {
       appName: "Mzansi Directory",
       appIcon: Icon(
         MihIcons.mzansiDirectory,
-        color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+        color: MihColors.getSecondaryColor(
+            MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         // size: widget.packageSize,
       ),
       iconSize: widget.packageSize,
-      primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      primaryColor: MihColors.getSecondaryColor(
-      secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+      secondaryColor: MihColors.getPrimaryColor(
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
     );
   }
 }

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

@@ -3,6 +3,7 @@ import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_search_bar.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 
 class MihContacts extends StatefulWidget {
   const MihContacts({super.key});
@@ -35,9 +36,10 @@ class _MihContactsState extends State<MihContacts> {
               controller: contactSearchController,
               hintText: "Search Contacts",
               prefixIcon: Icons.search,
-              fillColor:
+              fillColor: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              hintColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+              hintColor: MihColors.getPrimaryColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               onPrefixIconTap: () {},
               searchFocusNode: searchFocusNode,
             ),

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

@@ -1,5 +1,4 @@
 import 'dart:async';
-
 import 'package:flutter/material.dart';
 import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/bookmarked_business.dart';
@@ -9,6 +8,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_search_bar.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_packages/mzansi_directory/builders/build_favourite_businesses_list.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_business_details_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_mzansi_directory_services.dart';
@@ -114,9 +114,10 @@ class _MihFavouriteBusinessesState extends State<MihFavouriteBusinesses> {
               controller: businessSearchController,
               hintText: "Search Businesses",
               prefixIcon: Icons.search,
-              fillColor:
+              fillColor: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              hintColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+              hintColor: MihColors.getPrimaryColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               onPrefixIconTap: () {},
               searchFocusNode: searchFocusNode,
             ),
@@ -146,9 +147,11 @@ class _MihFavouriteBusinessesState extends State<MihFavouriteBusinesses> {
                               Icon(
                                 MihIcons.iDontKnow,
                                 size: 165,
-                                color: MzansiInnovationHub.of(context)!
+                                color: MihColors.getSecondaryColor(
+                                    MzansiInnovationHub.of(context)!
                                             .theme
-                                    .secondaryColor(),
+                                            .mode ==
+                                        "Dark"),
                               ),
                               const SizedBox(height: 10),
                               Text(
@@ -158,9 +161,11 @@ class _MihFavouriteBusinessesState extends State<MihFavouriteBusinesses> {
                                 style: TextStyle(
                                   fontSize: 25,
                                   fontWeight: FontWeight.bold,
-                                  color: MzansiInnovationHub.of(context)!
+                                  color: MihColors.getSecondaryColor(
+                                      MzansiInnovationHub.of(context)!
                                               .theme
-                                      .secondaryColor(),
+                                              .mode ==
+                                          "Dark"),
                                 ),
                               ),
                             ],
@@ -186,9 +191,9 @@ class _MihFavouriteBusinessesState extends State<MihFavouriteBusinesses> {
                           Icon(
                             MihIcons.businessProfile,
                             size: 165,
-                            color: MzansiInnovationHub.of(context)!
+                            color: MihColors.getSecondaryColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .secondaryColor(),
+                                    "Dark"),
                           ),
                           const SizedBox(height: 10),
                           Text(
@@ -198,9 +203,9 @@ class _MihFavouriteBusinessesState extends State<MihFavouriteBusinesses> {
                             style: TextStyle(
                               fontSize: 25,
                               fontWeight: FontWeight.bold,
-                              color: MzansiInnovationHub.of(context)!
+                              color: MihColors.getSecondaryColor(
-                                  .theme
+                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                  .secondaryColor(),
+                                      "Dark"),
                             ),
                           ),
                           const SizedBox(height: 25),
@@ -211,9 +216,11 @@ class _MihFavouriteBusinessesState extends State<MihFavouriteBusinesses> {
                                 style: TextStyle(
                                   fontSize: 20,
                                   fontWeight: FontWeight.normal,
-                                  color: MzansiInnovationHub.of(context)!
+                                  color: MihColors.getSecondaryColor(
+                                      MzansiInnovationHub.of(context)!
                                               .theme
-                                      .secondaryColor(),
+                                              .mode ==
+                                          "Dark"),
                                 ),
                                 children: [
                                   TextSpan(text: "Use the mzansi search"),

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

@@ -9,6 +9,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_search_bar.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_packages/mzansi_directory/builders/build_business_search_resultsList.dart';
 import 'package:mzansi_innovation_hub/mih_packages/mzansi_directory/builders/build_user_search_results_list.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart';
@@ -144,16 +145,16 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
                         icon: Icon(
                           Icons.swap_horiz_rounded,
                           size: 35,
-                          color: MzansiInnovationHub.of(context)!
+                          color: MihColors.getPrimaryColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .primaryColor(),
+                                  "Dark"),
                         ),
                       ),
                     ],
-                    fillColor:
+                    fillColor: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    hintColor:
+                    hintColor: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     onPrefixIconTap: () {
                       searchPressed();
                     },
@@ -183,9 +184,9 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
                           ? Icons.filter_list_rounded
                           : Icons.filter_list_off_rounded,
                       size: 35,
-                      color: MzansiInnovationHub.of(context)!
+                      color: MihColors.getSecondaryColor(
-                          .theme
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                          .secondaryColor(),
+                              "Dark"),
                     ),
                   ),
                 ),
@@ -231,16 +232,16 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
                               );
                             }
                           },
-                          buttonColor: MzansiInnovationHub.of(context)!
+                          buttonColor: MihColors.getGreenColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .successColor(),
+                                  "Dark"),
                           elevation: 10,
                           child: Text(
                             "Search",
                             style: TextStyle(
-                              color: MzansiInnovationHub.of(context)!
+                              color: MihColors.getPrimaryColor(
-                                  .theme
+                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                  .primaryColor(),
+                                      "Dark"),
                               fontSize: 20,
                               fontWeight: FontWeight.bold,
                             ),
@@ -292,8 +293,8 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
                   Icon(
                     MihIcons.personalProfile,
                     size: 165,
-                    color:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   ),
                   const SizedBox(height: 10),
                   Text(
@@ -303,9 +304,9 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
                     style: TextStyle(
                       fontSize: 25,
                       fontWeight: FontWeight.bold,
-                      color: MzansiInnovationHub.of(context)!
+                      color: MihColors.getSecondaryColor(
-                          .theme
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                          .secondaryColor(),
+                              "Dark"),
                     ),
                   ),
                   const SizedBox(height: 25),
@@ -316,9 +317,9 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
                         style: TextStyle(
                           fontSize: 20,
                           fontWeight: FontWeight.normal,
-                          color: MzansiInnovationHub.of(context)!
+                          color: MihColors.getSecondaryColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .secondaryColor(),
+                                  "Dark"),
                         ),
                         children: [
                           TextSpan(text: "Press "),
@@ -327,9 +328,9 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
                             child: Icon(
                               Icons.swap_horiz_rounded,
                               size: 20,
-                              color: MzansiInnovationHub.of(context)!
+                              color: MihColors.getSecondaryColor(
-                                  .theme
+                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                  .secondaryColor(),
+                                      "Dark"),
                             ),
                           ),
                           TextSpan(text: " to search for businesses of Mzansi"),
@@ -349,7 +350,7 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
             //       MihIcons.personalProfile,
             //       size: 165,
             //       color:
-            //           MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+            //           MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             //     ),
             //     const SizedBox(height: 10),
             //     Text(
@@ -360,7 +361,7 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
             //         fontSize: 25,
             //         fontWeight: FontWeight.bold,
             //         color:
-            //             MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+            //             MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             //       ),
             //     ),
             //   ],
@@ -375,8 +376,8 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
                 Icon(
                   MihIcons.iDontKnow,
                   size: 165,
-                  color:
+                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 ),
                 const SizedBox(height: 10),
                 Text(
@@ -386,8 +387,8 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
                   style: TextStyle(
                     fontSize: 25,
                     fontWeight: FontWeight.bold,
-                    color:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   ),
                 ),
               ],
@@ -398,7 +399,8 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
                 "Error pulling Patients Data\n/users/search/${mzansiSearchController.text}",
                 style: TextStyle(
                     fontSize: 25,
-                    color: MzansiInnovationHub.of(context)!.theme.errorColor()),
+                    color: MihColors.getRedColor(
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark")),
                 textAlign: TextAlign.center,
               ),
             );
@@ -440,8 +442,8 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
                 Icon(
                   MihIcons.iDontKnow,
                   size: 165,
-                  color:
+                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 ),
                 const SizedBox(height: 25),
                 Text(
@@ -451,8 +453,8 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
                   style: TextStyle(
                     fontSize: 25,
                     fontWeight: FontWeight.bold,
-                    color:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   ),
                 ),
               ],
@@ -468,8 +470,8 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
                   Icon(
                     MihIcons.businessProfile,
                     size: 165,
-                    color:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   ),
                   const SizedBox(height: 10),
                   Text(
@@ -479,9 +481,9 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
                     style: TextStyle(
                       fontSize: 25,
                       fontWeight: FontWeight.bold,
-                      color: MzansiInnovationHub.of(context)!
+                      color: MihColors.getSecondaryColor(
-                          .theme
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                          .secondaryColor(),
+                              "Dark"),
                     ),
                   ),
                   const SizedBox(height: 25),
@@ -492,9 +494,9 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
                         style: TextStyle(
                           fontSize: 20,
                           fontWeight: FontWeight.normal,
-                          color: MzansiInnovationHub.of(context)!
+                          color: MihColors.getSecondaryColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .secondaryColor(),
+                                  "Dark"),
                         ),
                         children: [
                           TextSpan(text: "Press "),
@@ -503,9 +505,9 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
                             child: Icon(
                               Icons.swap_horiz_rounded,
                               size: 20,
-                              color: MzansiInnovationHub.of(context)!
+                              color: MihColors.getSecondaryColor(
-                                  .theme
+                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                  .secondaryColor(),
+                                      "Dark"),
                             ),
                           ),
                           TextSpan(text: " to search for people of Mzansi"),
@@ -521,9 +523,9 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
                         style: TextStyle(
                           fontSize: 20,
                           fontWeight: FontWeight.normal,
-                          color: MzansiInnovationHub.of(context)!
+                          color: MihColors.getSecondaryColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .secondaryColor(),
+                                  "Dark"),
                         ),
                         children: [
                           TextSpan(text: "Press "),
@@ -532,9 +534,9 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
                             child: Icon(
                               Icons.filter_list_rounded,
                               size: 20,
-                              color: MzansiInnovationHub.of(context)!
+                              color: MihColors.getSecondaryColor(
-                                  .theme
+                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                  .secondaryColor(),
+                                      "Dark"),
                             ),
                           ),
                           TextSpan(text: " to filter business types"),
@@ -551,7 +553,8 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
                 "Error pulling Patients Data\n/users/search/${mzansiSearchController.text}",
                 style: TextStyle(
                     fontSize: 25,
-                    color: MzansiInnovationHub.of(context)!.theme.errorColor()),
+                    color: MihColors.getRedColor(
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark")),
                 textAlign: TextAlign.center,
               ),
             );

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

@@ -2,6 +2,7 @@ import 'dart:convert';
 
 import 'package:flutter_speed_dial/flutter_speed_dial.dart';
 import 'package:mzansi_innovation_hub/main.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart';
@@ -161,17 +162,19 @@ class _BuildEmployeeListState extends State<BuildEmployeeList> {
           SpeedDialChild(
             child: Icon(
               Icons.delete,
-              color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+              color: MihColors.getPrimaryColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             ),
             label: "Delete Employee",
-            labelBackgroundColor:
+            labelBackgroundColor: MihColors.getGreenColor(
-                MzansiInnovationHub.of(context)!.theme.successColor(),
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             labelStyle: TextStyle(
-              color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+              color: MihColors.getPrimaryColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               fontWeight: FontWeight.bold,
             ),
-            backgroundColor:
+            backgroundColor: MihColors.getGreenColor(
-                MzansiInnovationHub.of(context)!.theme.successColor(),
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             onTap: () {
               showDeleteWarning(index);
             },
@@ -191,10 +194,10 @@ class _BuildEmployeeListState extends State<BuildEmployeeList> {
                 formKey: _formKey,
                 formFields: [
                   MihTextFormField(
-                    fillColor:
+                    fillColor: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    inputColor:
+                    inputColor: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     controller: fnameController,
                     multiLineInput: false,
                     requiredText: true,
@@ -203,10 +206,10 @@ class _BuildEmployeeListState extends State<BuildEmployeeList> {
                   ),
                   const SizedBox(height: 10.0),
                   MihTextFormField(
-                    fillColor:
+                    fillColor: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    inputColor:
+                    inputColor: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     controller: lnameController,
                     multiLineInput: false,
                     requiredText: true,
@@ -257,15 +260,16 @@ class _BuildEmployeeListState extends State<BuildEmployeeList> {
                           MihAlertServices().formNotFilledCompletely(context);
                         }
                       },
-                      buttonColor:
+                      buttonColor: MihColors.getGreenColor(
-                          MzansiInnovationHub.of(context)!.theme.successColor(),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                       width: 300,
                       child: Text(
                         "Update",
                         style: TextStyle(
-                          color: MzansiInnovationHub.of(context)!
+                          color: MihColors.getPrimaryColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .primaryColor(),
+                                  "Dark"),
                           fontSize: 20,
                           fontWeight: FontWeight.bold,
                         ),
@@ -309,7 +313,8 @@ class _BuildEmployeeListState extends State<BuildEmployeeList> {
       physics: const NeverScrollableScrollPhysics(),
       separatorBuilder: (BuildContext context, index) {
         return Divider(
-          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MihColors.getSecondaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         );
       },
       itemCount: widget.employees.length,
@@ -327,7 +332,8 @@ class _BuildEmployeeListState extends State<BuildEmployeeList> {
           subtitle: Text(
             "${widget.employees[index].username}\n${widget.employees[index].email}\nAccess: ${widget.employees[index].access}",
             style: TextStyle(
-              color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+              color: MihColors.getSecondaryColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             ),
           ),
           onTap: () {

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

@@ -1,6 +1,7 @@
 import 'dart:convert';
 
 import 'package:mzansi_innovation_hub/main.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart';
@@ -142,12 +143,12 @@ class _BuildUserListState extends State<BuildUserList> {
                     formKey: _formKey,
                     formFields: [
                       MihTextFormField(
-                        fillColor: MzansiInnovationHub.of(context)!
+                        fillColor: MihColors.getSecondaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .secondaryColor(),
+                                "Dark"),
-                        inputColor: MzansiInnovationHub.of(context)!
+                        inputColor: MihColors.getPrimaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .primaryColor(),
+                                "Dark"),
                         controller: usernameController,
                         multiLineInput: false,
                         requiredText: true,
@@ -156,12 +157,12 @@ class _BuildUserListState extends State<BuildUserList> {
                       ),
                       const SizedBox(height: 10.0),
                       MihTextFormField(
-                        fillColor: MzansiInnovationHub.of(context)!
+                        fillColor: MihColors.getSecondaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .secondaryColor(),
+                                "Dark"),
-                        inputColor: MzansiInnovationHub.of(context)!
+                        inputColor: MihColors.getPrimaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .primaryColor(),
+                                "Dark"),
                         controller: emailController,
                         multiLineInput: false,
                         requiredText: true,
@@ -213,16 +214,16 @@ class _BuildUserListState extends State<BuildUserList> {
                                   .formNotFilledCompletely(context);
                             }
                           },
-                          buttonColor: MzansiInnovationHub.of(context)!
+                          buttonColor: MihColors.getGreenColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .successColor(),
+                                  "Dark"),
                           width: 300,
                           child: Text(
                             "Add",
                             style: TextStyle(
-                              color: MzansiInnovationHub.of(context)!
+                              color: MihColors.getPrimaryColor(
-                                  .theme
+                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                  .primaryColor(),
+                                      "Dark"),
                               fontSize: 20,
                               fontWeight: FontWeight.bold,
                             ),
@@ -256,7 +257,8 @@ class _BuildUserListState extends State<BuildUserList> {
       physics: const NeverScrollableScrollPhysics(),
       separatorBuilder: (BuildContext context, index) {
         return Divider(
-          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MihColors.getSecondaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         );
       },
       itemCount: widget.users.length,
@@ -271,7 +273,8 @@ class _BuildUserListState extends State<BuildUserList> {
           subtitle: Text(
             "Email: ${hideEmail(widget.users[index].email)}",
             style: TextStyle(
-              color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+              color: MihColors.getSecondaryColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             ),
           ),
           onTap: () {

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

@@ -62,11 +62,13 @@ class _MihAddBookmarkAlertState extends State<MihAddBookmarkAlert> {
   @override
   Widget build(BuildContext context) {
     return MihPackageAlert(
-      alertColour: MihColors.getSecondaryColor(context),
+      alertColour: MihColors.getSecondaryColor(
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
       alertIcon: Icon(
         Icons.warning_rounded,
         size: 100,
-        color: MihColors.getSecondaryColor(context),
+        color: MihColors.getSecondaryColor(
+            MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
       ),
       alertTitle: "Bookmark Business",
       alertBody: Column(
@@ -74,7 +76,8 @@ class _MihAddBookmarkAlertState extends State<MihAddBookmarkAlert> {
           Text(
             "Are you sure you want to save ${widget.business.Name} to your Mzansi Directory?",
             style: TextStyle(
-              color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+              color: MihColors.getSecondaryColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               fontSize: 15,
             ),
           ),
@@ -88,13 +91,13 @@ class _MihAddBookmarkAlertState extends State<MihAddBookmarkAlert> {
                 onPressed: () async {
                   Navigator.of(context).pop();
                 },
-                buttonColor:
+                buttonColor: MihColors.getRedColor(
-                    MzansiInnovationHub.of(context)!.theme.errorColor(),
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 child: Text(
                   "Cancel",
                   style: TextStyle(
-                    color:
+                    color: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: 20,
                     fontWeight: FontWeight.bold,
                   ),
@@ -105,13 +108,13 @@ class _MihAddBookmarkAlertState extends State<MihAddBookmarkAlert> {
                 onPressed: () {
                   addBookmark(widget.business.business_id);
                 },
-                buttonColor:
+                buttonColor: MihColors.getGreenColor(
-                    MzansiInnovationHub.of(context)!.theme.successColor(),
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 child: Text(
                   "Bookmark Business",
                   style: TextStyle(
-                    color:
+                    color: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: 20,
                     fontWeight: FontWeight.bold,
                   ),

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

@@ -35,7 +35,8 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
   RedactedConfiguration getRedactedConfiguration() {
     return RedactedConfiguration(
       // redactedColor: Colors.pink,
-      redactedColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+      redactedColor: MihColors.getPrimaryColor(
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
     );
   }
 
@@ -52,7 +53,8 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
               alertIcon: Icon(
                 Icons.warning_rounded,
                 size: 100,
-                color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+                color: MihColors.getRedColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               ),
               alertTitle: "Error Making Call",
               alertBody: Column(
@@ -60,15 +62,16 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
                   Text(
                     "We couldn't open your phone app to call ${widget.business.contact_no}. To fix this, make sure you have a phone application installed and it's set as your default dialer.",
                     style: TextStyle(
-                      color: MzansiInnovationHub.of(context)!
+                      color: MihColors.getSecondaryColor(
-                          .theme
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                          .secondaryColor(),
+                              "Dark"),
                       fontSize: 15,
                     ),
                   ),
                 ],
               ),
-              alertColour: MzansiInnovationHub.of(context)!.theme.errorColor(),
+              alertColour: MihColors.getRedColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             );
           });
     }
@@ -102,7 +105,8 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
               alertIcon: Icon(
                 Icons.warning_rounded,
                 size: 100,
-                color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+                color: MihColors.getRedColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               ),
               alertTitle: "Error Creating Email",
               alertBody: Column(
@@ -110,15 +114,16 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
                   Text(
                     "We couldn't launch your email app to send a message to ${widget.business.bus_email}. To fix this, please confirm that you have an email application installed and that it's set as your default.",
                     style: TextStyle(
-                      color: MzansiInnovationHub.of(context)!
+                      color: MihColors.getSecondaryColor(
-                          .theme
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                          .secondaryColor(),
+                              "Dark"),
                       fontSize: 15,
                     ),
                   ),
                 ],
               ),
-              alertColour: MzansiInnovationHub.of(context)!.theme.errorColor(),
+              alertColour: MihColors.getRedColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             );
           });
     }
@@ -143,7 +148,8 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
                 alertIcon: Icon(
                   Icons.warning_rounded,
                   size: 100,
-                  color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+                  color: MihColors.getRedColor(
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 ),
                 alertTitle: "Error Creating Maps",
                 alertBody: Column(
@@ -151,16 +157,16 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
                     Text(
                       "There was an issue opening maps for ${widget.business.Name}. 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: MzansiInnovationHub.of(context)!
+                        color: MihColors.getSecondaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .secondaryColor(),
+                                "Dark"),
                         fontSize: 15,
                       ),
                     ),
                   ],
                 ),
-                alertColour:
+                alertColour: MihColors.getRedColor(
-                    MzansiInnovationHub.of(context)!.theme.errorColor(),
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               );
             });
       }
@@ -172,7 +178,8 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
               alertIcon: Icon(
                 Icons.warning_rounded,
                 size: 100,
-                color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+                color: MihColors.getRedColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               ),
               alertTitle: "Error Creating Maps",
               alertBody: Column(
@@ -180,15 +187,16 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
                   Text(
                     "There was an issue opening maps for ${widget.business.Name}. 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: MzansiInnovationHub.of(context)!
+                      color: MihColors.getSecondaryColor(
-                          .theme
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                          .secondaryColor(),
+                              "Dark"),
                       fontSize: 15,
                     ),
                   ),
                 ],
               ),
-              alertColour: MzansiInnovationHub.of(context)!.theme.errorColor(),
+              alertColour: MihColors.getRedColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             );
           });
     }
@@ -212,7 +220,8 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
                 alertIcon: Icon(
                   Icons.warning_rounded,
                   size: 100,
-                  color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+                  color: MihColors.getRedColor(
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 ),
                 alertTitle: "Error Opening Website",
                 alertBody: Column(
@@ -220,16 +229,16 @@ 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: MzansiInnovationHub.of(context)!
+                        color: MihColors.getSecondaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .secondaryColor(),
+                                "Dark"),
                         fontSize: 15,
                       ),
                     ),
                   ],
                 ),
-                alertColour:
+                alertColour: MihColors.getRedColor(
-                    MzansiInnovationHub.of(context)!.theme.errorColor(),
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               );
             });
       }
@@ -241,7 +250,8 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
               alertIcon: Icon(
                 Icons.warning_rounded,
                 size: 100,
-                color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+                color: MihColors.getRedColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               ),
               alertTitle: "Error Opening Website",
               alertBody: Column(
@@ -249,15 +259,16 @@ 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: MzansiInnovationHub.of(context)!
+                      color: MihColors.getSecondaryColor(
-                          .theme
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                          .secondaryColor(),
+                              "Dark"),
                       fontSize: 15,
                     ),
                   ),
                 ],
               ),
-              alertColour: MzansiInnovationHub.of(context)!.theme.errorColor(),
+              alertColour: MihColors.getRedColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             );
           });
     }
@@ -272,12 +283,12 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
     Function()? ontap,
   ) {
     return Material(
-      color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      color: MihColors.getSecondaryColor(
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
       child: InkWell(
         onTap: ontap,
-        splashColor: MzansiInnovationHub.of(context)!
+        splashColor: MihColors.getPrimaryColor(
-            .theme
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark")
-            .primaryColor()
             .withOpacity(0.2),
         borderRadius: BorderRadius.circular(15),
         child: Padding(
@@ -299,8 +310,8 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
                   child: Icon(
                     icon,
                     // size: 35,
-                    color:
+                    color: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   ),
                 ),
               ).redacted(
@@ -320,9 +331,9 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
                       style: TextStyle(
                         fontSize: 20,
                         fontWeight: FontWeight.bold,
-                        color: MzansiInnovationHub.of(context)!
+                        color: MihColors.getPrimaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .primaryColor(),
+                                "Dark"),
                         height: 1.0,
                       ),
                     ).redacted(
@@ -335,9 +346,9 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
                       style: TextStyle(
                         fontSize: 12,
                         fontWeight: FontWeight.w700,
-                        color: MzansiInnovationHub.of(context)!
+                        color: MihColors.getPrimaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .primaryColor(),
+                                "Dark"),
                       ),
                     ).redacted(
                       context: context,
@@ -387,16 +398,16 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
   Widget build(BuildContext context) {
     // double screenWidth = MediaQuery.of(context).size.width;
     return Material(
-      color: MzansiInnovationHub.of(context)!
+      color: MihColors.getSecondaryColor(
-          .theme
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark")
-          .secondaryColor()
           .withValues(alpha: 0.6),
       borderRadius: BorderRadius.circular(25),
       elevation: 10,
       shadowColor: Colors.black,
       child: Container(
         decoration: BoxDecoration(
-          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MihColors.getSecondaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
           borderRadius: BorderRadius.circular(10),
         ),
         child: Column(
@@ -406,7 +417,8 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
               "Call",
               "Give us a quick call.",
               Icons.phone,
-              MihColors.getGreenColor(context),
+              MihColors.getGreenColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               false,
               () {
                 // print("Calling ${widget.cellNumber}");
@@ -414,13 +426,15 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
               },
             ),
             Divider(
-              color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+              color: MihColors.getPrimaryColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             ),
             _buildContactInfo(
               "Email",
               "Send us an email.",
               Icons.email,
-              MihColors.getPinkColor(context),
+              MihColors.getPinkColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               false,
               () {
                 // print("Emailing ${widget.email}");
@@ -436,14 +450,15 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
               child: Column(
                 children: [
                   Divider(
-                    color:
+                    color: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   ),
                   _buildContactInfo(
                     "Location",
                     "Come visit us.",
                     Icons.location_on,
-                    MihColors.getOrangeColor(context),
+                    MihColors.getOrangeColor(
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     false,
                     () {
                       final latitude = double.parse(
@@ -465,14 +480,15 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
               child: Column(
                 children: [
                   Divider(
-                    color:
+                    color: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   ),
                   _buildContactInfo(
                     "Website",
                     "Find out more about us.",
                     Icons.vpn_lock,
-                    MihColors.getRedColor(context),
+                    MihColors.getRedColor(
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     false,
                     () {
                       _launchWebsite(widget.business.website);
@@ -491,9 +507,9 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
                       Padding(
                         padding: const EdgeInsets.symmetric(horizontal: 10.0),
                         child: Divider(
-                          color: MzansiInnovationHub.of(context)!
+                          color: MihColors.getPrimaryColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .primaryColor(),
+                                  "Dark"),
                         ),
                       ),
                       Container(
@@ -501,7 +517,9 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
                           "Loading Rating",
                           "Loading your rating.",
                           Icons.star_rate_rounded,
-                          MihColors.getYellowColor(context),
+                          MihColors.getYellowColor(
+                              MzansiInnovationHub.of(context)!.theme.mode ==
+                                  "Dark"),
                           true,
                           null,
                         ),
@@ -521,16 +539,18 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
                       Padding(
                         padding: const EdgeInsets.symmetric(horizontal: 10.0),
                         child: Divider(
-                          color: MzansiInnovationHub.of(context)!
+                          color: MihColors.getPrimaryColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .primaryColor(),
+                                  "Dark"),
                         ),
                       ),
                       _buildContactInfo(
                         ratingDisplayTitle,
                         "Let us know how we are doing.",
                         Icons.star_rate_rounded,
-                        MihColors.getYellowColor(context),
+                        MihColors.getYellowColor(
+                            MzansiInnovationHub.of(context)!.theme.mode ==
+                                "Dark"),
                         false,
                         () {
                           businessReviewRatingWindow(
@@ -552,9 +572,9 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
                       Padding(
                         padding: const EdgeInsets.symmetric(horizontal: 10.0),
                         child: Divider(
-                          color: MzansiInnovationHub.of(context)!
+                          color: MihColors.getPrimaryColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .primaryColor(),
+                                  "Dark"),
                         ),
                       ),
                       Container(
@@ -562,7 +582,9 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
                           "Loading Bookmark",
                           "Loading your bookmark.",
                           Icons.bookmark_add_rounded,
-                          MihColors.getBluishPurpleColor(context),
+                          MihColors.getBluishPurpleColor(
+                              MzansiInnovationHub.of(context)!.theme.mode ==
+                                  "Dark"),
                           true,
                           null,
                         ),
@@ -582,9 +604,9 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
                       Padding(
                         padding: const EdgeInsets.symmetric(horizontal: 10.0),
                         child: Divider(
-                          color: MzansiInnovationHub.of(context)!
+                          color: MihColors.getPrimaryColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .primaryColor(),
+                                  "Dark"),
                         ),
                       ),
                       _buildContactInfo(
@@ -593,7 +615,9 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
                         bookmarkBusiness == null
                             ? Icons.bookmark_add_rounded
                             : Icons.bookmark_remove_rounded,
-                        MihColors.getBluishPurpleColor(context),
+                        MihColors.getBluishPurpleColor(
+                            MzansiInnovationHub.of(context)!.theme.mode ==
+                                "Dark"),
                         false,
                         () {
                           // _launchWebsite(widget.website);
@@ -612,14 +636,14 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
             // Padding(
             //   padding: const EdgeInsets.symmetric(horizontal: 10.0),
             //   child: Divider(
-            //     color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+            //     color: MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             //   ),
             // ),
             // _buildContactInfo(
             //   "Bookmark",
             //   "Save us for later.",
             //   Icons.bookmark_add_rounded,
-            //   MihColors.getBluishPurpleColor(context),
+            //   MihColors.getBluishPurpleColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             //   () {
             //     // _launchWebsite(widget.website);
             //     print("Saving ${widget.business.Name} to Directory");
@@ -630,7 +654,7 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
             // Padding(
             //   padding: const EdgeInsets.symmetric(horizontal: 10.0),
             //   child: Divider(
-            //     color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+            //     color: MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             //   ),
             // ),
           ],

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

@@ -77,11 +77,13 @@ class _MihDeleteBookmarkAlertState extends State<MihDeleteBookmarkAlert> {
   @override
   Widget build(BuildContext context) {
     return MihPackageAlert(
-      alertColour: MihColors.getSecondaryColor(context),
+      alertColour: MihColors.getSecondaryColor(
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
       alertIcon: Icon(
         Icons.warning_rounded,
         size: 100,
-        color: MihColors.getSecondaryColor(context),
+        color: MihColors.getSecondaryColor(
+            MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
       ),
       alertTitle: "Remove Bookmark",
       alertBody: Column(
@@ -89,7 +91,8 @@ class _MihDeleteBookmarkAlertState extends State<MihDeleteBookmarkAlert> {
           Text(
             "Are you sure you want to remove ${widget.business.Name} from your Mzansi Directory?",
             style: TextStyle(
-              color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+              color: MihColors.getSecondaryColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               fontSize: 15,
             ),
           ),
@@ -103,13 +106,13 @@ class _MihDeleteBookmarkAlertState extends State<MihDeleteBookmarkAlert> {
                 onPressed: () async {
                   Navigator.of(context).pop();
                 },
-                buttonColor:
+                buttonColor: MihColors.getGreenColor(
-                    MzansiInnovationHub.of(context)!.theme.successColor(),
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 child: Text(
                   "Cancel",
                   style: TextStyle(
-                    color:
+                    color: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: 20,
                     fontWeight: FontWeight.bold,
                   ),
@@ -122,13 +125,13 @@ class _MihDeleteBookmarkAlertState extends State<MihDeleteBookmarkAlert> {
                   deleteBookmark(
                       widget.bookmarkBusiness!.idbookmarked_businesses);
                 },
-                buttonColor:
+                buttonColor: MihColors.getRedColor(
-                    MzansiInnovationHub.of(context)!.theme.errorColor(),
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 child: Text(
                   "Remove Business",
                   style: TextStyle(
-                    color:
+                    color: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: 20,
                     fontWeight: FontWeight.bold,
                   ),

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

@@ -52,11 +52,13 @@ class _MihReviewBusinessWindowState extends State<MihReviewBusinessWindow> {
     showDialog(
       context: context,
       builder: (context) => MihPackageAlert(
-        alertColour: MzansiInnovationHub.of(context)!.theme.errorColor(),
+        alertColour: MihColors.getRedColor(
+            MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         alertIcon: Icon(
           Icons.warning_rounded,
           size: 100,
-          color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+          color: MihColors.getRedColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         ),
         alertTitle: "Delete Review",
         alertBody: Column(
@@ -64,7 +66,8 @@ class _MihReviewBusinessWindowState extends State<MihReviewBusinessWindow> {
             Text(
               "Are you sure you want to delete this review? This action cannot be undone.",
               style: TextStyle(
-                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MihColors.getSecondaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 fontSize: 15,
               ),
             ),
@@ -117,13 +120,14 @@ class _MihReviewBusinessWindowState extends State<MihReviewBusinessWindow> {
                       }
                     });
                   },
-                  buttonColor:
+                  buttonColor: MihColors.getRedColor(
-                      MzansiInnovationHub.of(context)!.theme.errorColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   child: Text(
                     "Delete",
                     style: TextStyle(
-                      color:
+                      color: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                       fontSize: 20,
                       fontWeight: FontWeight.bold,
                     ),
@@ -134,13 +138,14 @@ class _MihReviewBusinessWindowState extends State<MihReviewBusinessWindow> {
                   onPressed: () {
                     Navigator.of(context).pop();
                   },
-                  buttonColor:
+                  buttonColor: MihColors.getGreenColor(
-                      MzansiInnovationHub.of(context)!.theme.successColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   child: Text(
                     "Cancel",
                     style: TextStyle(
-                      color:
+                      color: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                       fontSize: 20,
                       fontWeight: FontWeight.bold,
                     ),
@@ -156,9 +161,11 @@ class _MihReviewBusinessWindowState extends State<MihReviewBusinessWindow> {
 
   Color getMissionVisionLimitColor(int limit) {
     if (_counter.value <= limit) {
-      return MzansiInnovationHub.of(context)!.theme.secondaryColor();
+      return MihColors.getSecondaryColor(
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark");
     } else {
-      return MzansiInnovationHub.of(context)!.theme.errorColor();
+      return MihColors.getRedColor(
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark");
     }
   }
 
@@ -302,17 +309,19 @@ class _MihReviewBusinessWindowState extends State<MihReviewBusinessWindow> {
               SpeedDialChild(
                 child: Icon(
                   Icons.delete,
-                  color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                  color: MihColors.getPrimaryColor(
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 ),
                 label: "Delete Review",
-                labelBackgroundColor:
+                labelBackgroundColor: MihColors.getGreenColor(
-                    MzansiInnovationHub.of(context)!.theme.successColor(),
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 labelStyle: TextStyle(
-                  color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                  color: MihColors.getPrimaryColor(
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   fontWeight: FontWeight.bold,
                 ),
-                backgroundColor:
+                backgroundColor: MihColors.getGreenColor(
-                    MzansiInnovationHub.of(context)!.theme.successColor(),
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 onTap: () {
                   showDeleteReviewAlert();
                 },
@@ -340,9 +349,9 @@ class _MihReviewBusinessWindowState extends State<MihReviewBusinessWindow> {
                         "Business Rating",
                         textAlign: TextAlign.left,
                         style: TextStyle(
-                          color: MzansiInnovationHub.of(context)!
+                          color: MihColors.getSecondaryColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .secondaryColor(),
+                                  "Dark"),
                           fontSize: 18,
                           fontWeight: FontWeight.bold,
                         ),
@@ -357,14 +366,18 @@ class _MihReviewBusinessWindowState extends State<MihReviewBusinessWindow> {
                           filledIcon: Icons.star,
                           emptyIcon: Icons.star_border,
                           halfFilledIcon: Icons.star_half,
-                          filledColor: MihColors.getYellowColor(context),
+                          filledColor: MihColors.getYellowColor(
+                              MzansiInnovationHub.of(context)!.theme.mode ==
+                                  "Dark"),
                           // filledColor: MzansiInnovationHub.of(context)!
                           //     .theme
                           //     .secondaryColor(),
-                          emptyColor: MzansiInnovationHub.of(context)!
+                          emptyColor: MihColors.getSecondaryColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .secondaryColor(),
+                                  "Dark"),
-                          halfFilledColor: MihColors.getYellowColor(context),
+                          halfFilledColor: MihColors.getYellowColor(
+                              MzansiInnovationHub.of(context)!.theme.mode ==
+                                  "Dark"),
                           // MzansiInnovationHub.of(context)!
                           //     .theme
                           //     .secondaryColor(),
@@ -380,11 +393,15 @@ class _MihReviewBusinessWindowState extends State<MihReviewBusinessWindow> {
                           filledIcon: Icons.star,
                           emptyIcon: Icons.star_border,
                           halfFilledIcon: Icons.star_half,
-                          filledColor: MihColors.getYellowColor(context),
+                          filledColor: MihColors.getYellowColor(
-                          emptyColor: MzansiInnovationHub.of(context)!
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .theme
+                                  "Dark"),
-                              .secondaryColor(),
+                          emptyColor: MihColors.getSecondaryColor(
-                          halfFilledColor: MihColors.getYellowColor(context),
+                              MzansiInnovationHub.of(context)!.theme.mode ==
+                                  "Dark"),
+                          halfFilledColor: MihColors.getYellowColor(
+                              MzansiInnovationHub.of(context)!.theme.mode ==
+                                  "Dark"),
                           isHalfAllowed: true,
                           initialRating: widget.businessReview != null
                               ? double.parse(_reviewScoreController.text)
@@ -406,11 +423,12 @@ class _MihReviewBusinessWindowState extends State<MihReviewBusinessWindow> {
                     visible: widget.readOnly,
                     child: MihTextFormField(
                       // width: 200,
-                      fillColor: MzansiInnovationHub.of(context)!
+                      fillColor: MihColors.getSecondaryColor(
-                          .theme
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                          .secondaryColor(),
+                              "Dark"),
-                      inputColor:
+                      inputColor: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                       controller: _reviewReviewerController,
                       multiLineInput: false,
                       requiredText: true,
@@ -424,10 +442,10 @@ class _MihReviewBusinessWindowState extends State<MihReviewBusinessWindow> {
                   const SizedBox(height: 10),
                   MihTextFormField(
                     // width: 200,
-                    fillColor:
+                    fillColor: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    inputColor:
+                    inputColor: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     controller: _reviewTitleController,
                     multiLineInput: false,
                     requiredText: true,
@@ -441,10 +459,10 @@ class _MihReviewBusinessWindowState extends State<MihReviewBusinessWindow> {
                   const SizedBox(height: 10),
                   MihTextFormField(
                     height: 250,
-                    fillColor:
+                    fillColor: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    inputColor:
+                    inputColor: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     controller: _reviewDescriptionController,
                     multiLineInput: true,
                     requiredText: widget.readOnly,
@@ -504,18 +522,18 @@ class _MihReviewBusinessWindowState extends State<MihReviewBusinessWindow> {
                             MihAlertServices().formNotFilledCompletely(context);
                           }
                         },
-                        buttonColor: MzansiInnovationHub.of(context)!
+                        buttonColor: MihColors.getGreenColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .successColor(),
+                                "Dark"),
                         width: 300,
                         child: Text(
                           widget.businessReview != null
                               ? "Update Review"
                               : "Add Review",
                           style: TextStyle(
-                            color: MzansiInnovationHub.of(context)!
+                            color: MihColors.getPrimaryColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .primaryColor(),
+                                    "Dark"),
                             fontSize: 20,
                             fontWeight: FontWeight.bold,
                           ),

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

@@ -3,6 +3,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart';
 import 'package:flutter/material.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 
 class MzansiBusinessProfileTile extends StatefulWidget {
   final BusinessArguments arguments;
@@ -31,12 +32,15 @@ class _MzansiBusinessProfileTileState extends State<MzansiBusinessProfileTile> {
       appName: "Business Profile",
       appIcon: Icon(
         MihIcons.businessProfile,
-        color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+        color: MihColors.getSecondaryColor(
+            MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         // size: widget.packageSize,
       ),
       iconSize: widget.packageSize,
-      primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      primaryColor: MihColors.getSecondaryColor(
-      secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+      secondaryColor: MihColors.getPrimaryColor(
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
     );
   }
 }

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

@@ -3,6 +3,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart';
 import 'package:flutter/material.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 
 class MzansiSetupBusinessProfileTile extends StatefulWidget {
   final AppUser signedInUser;
@@ -32,11 +33,14 @@ class _MzansiSetupBusinessProfileTileState
       appName: "Set Up Business",
       appIcon: Icon(
         MihIcons.businessSetup,
-        color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+        color: MihColors.getSecondaryColor(
+            MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
       ),
       iconSize: widget.packageSize,
-      primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      primaryColor: MihColors.getSecondaryColor(
-      secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+      secondaryColor: MihColors.getPrimaryColor(
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
     );
   }
 }

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

@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_packages/mzansi_profile/business_profile/components/mih_business_info_card.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_business_details_services.dart';
@@ -104,7 +105,8 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
               return MihPackageAlert(
                 alertIcon: Icon(
                   Icons.warning_rounded,
-                  color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+                  color: MihColors.getRedColor(
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 ),
                 alertTitle: "Error Updating Business Details",
                 alertBody: Column(
@@ -112,15 +114,15 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
                     Text(
                       "An error occurred while updating the business details. Please check internet connection and try again.",
                       style: TextStyle(
-                        color: MzansiInnovationHub.of(context)!
+                        color: MihColors.getSecondaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .secondaryColor(),
+                                "Dark"),
                       ),
                     ),
                   ],
                 ),
-                alertColour:
+                alertColour: MihColors.getRedColor(
-                    MzansiInnovationHub.of(context)!.theme.errorColor(),
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               );
             },
           );
@@ -253,12 +255,12 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
                               editable: true,
                               fileNameController: fileNameController,
                               userSelectedfile: imageFile,
-                              frameColor: MzansiInnovationHub.of(context)!
+                              frameColor: MihColors.getSecondaryColor(
-                                  .theme
+                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                  .secondaryColor(),
+                                      "Dark"),
-                              backgroundColor: MzansiInnovationHub.of(context)!
+                              backgroundColor: MihColors.getPrimaryColor(
-                                  .theme
+                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                  .primaryColor(),
+                                      "Dark"),
                               onChange: (selectedfile) {
                                 setState(() {
                                   imageFile = selectedfile;
@@ -269,12 +271,12 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
                           Visibility(
                             visible: false,
                             child: MihTextFormField(
-                              fillColor: MzansiInnovationHub.of(context)!
+                              fillColor: MihColors.getSecondaryColor(
-                                  .theme
+                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                  .secondaryColor(),
+                                      "Dark"),
-                              inputColor: MzansiInnovationHub.of(context)!
+                              inputColor: MihColors.getPrimaryColor(
-                                  .theme
+                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                  .primaryColor(),
+                                      "Dark"),
                               controller: fileNameController,
                               multiLineInput: false,
                               requiredText: true,
@@ -284,12 +286,12 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
                           ),
                           const SizedBox(height: 20),
                           MihTextFormField(
-                            fillColor: MzansiInnovationHub.of(context)!
+                            fillColor: MihColors.getSecondaryColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .secondaryColor(),
+                                    "Dark"),
-                            inputColor: MzansiInnovationHub.of(context)!
+                            inputColor: MihColors.getPrimaryColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .primaryColor(),
+                                    "Dark"),
                             controller: nameController,
                             multiLineInput: false,
                             requiredText: true,
@@ -300,12 +302,12 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
                           ),
                           const SizedBox(height: 10),
                           MihTextFormField(
-                            fillColor: MzansiInnovationHub.of(context)!
+                            fillColor: MihColors.getSecondaryColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .secondaryColor(),
+                                    "Dark"),
-                            inputColor: MzansiInnovationHub.of(context)!
+                            inputColor: MihColors.getPrimaryColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .primaryColor(),
+                                    "Dark"),
                             controller: typeController,
                             multiLineInput: false,
                             requiredText: true,
@@ -316,12 +318,12 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
                           ),
                           const SizedBox(height: 10),
                           MihTextFormField(
-                            fillColor: MzansiInnovationHub.of(context)!
+                            fillColor: MihColors.getSecondaryColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .secondaryColor(),
+                                    "Dark"),
-                            inputColor: MzansiInnovationHub.of(context)!
+                            inputColor: MihColors.getPrimaryColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .primaryColor(),
+                                    "Dark"),
                             controller: emailController,
                             multiLineInput: false,
                             requiredText: true,
@@ -360,21 +362,29 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
                                 showDropDownButton: false,
                                 pickerStyle: PickerStyle.bottomSheet,
                                 dialogBackgroundColor:
+                                    MihColors.getPrimaryColor(
                                         MzansiInnovationHub.of(context)!
                                                 .theme
-                                        .primaryColor(),
+                                                .mode ==
-                                barrierColor: MzansiInnovationHub.of(context)!
+                                            "Dark"),
+                                barrierColor: MihColors.getPrimaryColor(
+                                    MzansiInnovationHub.of(context)!
                                             .theme
-                                    .primaryColor(),
+                                            .mode ==
+                                        "Dark"),
                               ),
                               Expanded(
                                 child: MihTextFormField(
-                                  fillColor: MzansiInnovationHub.of(context)!
+                                  fillColor: MihColors.getSecondaryColor(
+                                      MzansiInnovationHub.of(context)!
                                               .theme
-                                      .secondaryColor(),
+                                              .mode ==
-                                  inputColor: MzansiInnovationHub.of(context)!
+                                          "Dark"),
+                                  inputColor: MihColors.getPrimaryColor(
+                                      MzansiInnovationHub.of(context)!
                                               .theme
-                                      .primaryColor(),
+                                              .mode ==
+                                          "Dark"),
                                   controller: contactController,
                                   numberMode: true,
                                   multiLineInput: false,
@@ -391,12 +401,12 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
                           const SizedBox(height: 10),
                           MihTextFormField(
                             height: 250,
-                            fillColor: MzansiInnovationHub.of(context)!
+                            fillColor: MihColors.getSecondaryColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .secondaryColor(),
+                                    "Dark"),
-                            inputColor: MzansiInnovationHub.of(context)!
+                            inputColor: MihColors.getPrimaryColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .primaryColor(),
+                                    "Dark"),
                             controller: missionVisionController,
                             multiLineInput: true,
                             requiredText: true,
@@ -438,12 +448,12 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
                           ),
                           const SizedBox(height: 10.0),
                           MihTextFormField(
-                            fillColor: MzansiInnovationHub.of(context)!
+                            fillColor: MihColors.getSecondaryColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .secondaryColor(),
+                                    "Dark"),
-                            inputColor: MzansiInnovationHub.of(context)!
+                            inputColor: MihColors.getPrimaryColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .primaryColor(),
+                                    "Dark"),
                             controller: websiteController,
                             multiLineInput: false,
                             requiredText: false,
@@ -455,12 +465,12 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
                           ),
                           const SizedBox(height: 10),
                           MihTextFormField(
-                            fillColor: MzansiInnovationHub.of(context)!
+                            fillColor: MihColors.getSecondaryColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .secondaryColor(),
+                                    "Dark"),
-                            inputColor: MzansiInnovationHub.of(context)!
+                            inputColor: MihColors.getPrimaryColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .primaryColor(),
+                                    "Dark"),
                             controller: regController,
                             multiLineInput: false,
                             requiredText: false,
@@ -472,12 +482,12 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
                           ),
                           const SizedBox(height: 10),
                           MihTextFormField(
-                            fillColor: MzansiInnovationHub.of(context)!
+                            fillColor: MihColors.getSecondaryColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .secondaryColor(),
+                                    "Dark"),
-                            inputColor: MzansiInnovationHub.of(context)!
+                            inputColor: MihColors.getPrimaryColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .primaryColor(),
+                                    "Dark"),
                             controller: practiceNoController,
                             multiLineInput: false,
                             requiredText: false,
@@ -488,12 +498,12 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
                           ),
                           const SizedBox(height: 10),
                           MihTextFormField(
-                            fillColor: MzansiInnovationHub.of(context)!
+                            fillColor: MihColors.getSecondaryColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .secondaryColor(),
+                                    "Dark"),
-                            inputColor: MzansiInnovationHub.of(context)!
+                            inputColor: MihColors.getPrimaryColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .primaryColor(),
+                                    "Dark"),
                             controller: vatNoController,
                             multiLineInput: false,
                             requiredText: false,
@@ -509,12 +519,16 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
                             children: [
                               Flexible(
                                 child: MihTextFormField(
-                                  fillColor: MzansiInnovationHub.of(context)!
+                                  fillColor: MihColors.getSecondaryColor(
+                                      MzansiInnovationHub.of(context)!
                                               .theme
-                                      .secondaryColor(),
+                                              .mode ==
-                                  inputColor: MzansiInnovationHub.of(context)!
+                                          "Dark"),
+                                  inputColor: MihColors.getPrimaryColor(
+                                      MzansiInnovationHub.of(context)!
                                               .theme
-                                      .primaryColor(),
+                                              .mode ==
+                                          "Dark"),
                                   controller: locationController,
                                   multiLineInput: false,
                                   requiredText: true,
@@ -546,16 +560,20 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
                                     Navigator.of(context).pop();
                                   });
                                 },
-                                buttonColor: MzansiInnovationHub.of(context)!
+                                buttonColor: MihColors.getSecondaryColor(
+                                    MzansiInnovationHub.of(context)!
                                             .theme
-                                    .secondaryColor(),
+                                            .mode ==
+                                        "Dark"),
                                 width: 100,
                                 child: Text(
                                   "Set",
                                   style: TextStyle(
-                                    color: MzansiInnovationHub.of(context)!
+                                    color: MihColors.getPrimaryColor(
+                                        MzansiInnovationHub.of(context)!
                                                 .theme
-                                        .primaryColor(),
+                                                .mode ==
+                                            "Dark"),
                                     fontSize: 20,
                                     fontWeight: FontWeight.bold,
                                   ),
@@ -574,16 +592,18 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
                                       .formNotFilledCompletely(context);
                                 }
                               },
-                              buttonColor: MzansiInnovationHub.of(context)!
+                              buttonColor: MihColors.getGreenColor(
-                                  .theme
+                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                  .successColor(),
+                                      "Dark"),
                               width: 300,
                               child: Text(
                                 "Update",
                                 style: TextStyle(
-                                  color: MzansiInnovationHub.of(context)!
+                                  color: MihColors.getPrimaryColor(
+                                      MzansiInnovationHub.of(context)!
                                               .theme
-                                      .primaryColor(),
+                                              .mode ==
+                                          "Dark"),
                                   fontSize: 20,
                                   fontWeight: FontWeight.bold,
                                 ),
@@ -602,9 +622,11 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
 
   Color getMissionVisionLimitColor(int limit) {
     if (_counter.value <= limit) {
-      return MzansiInnovationHub.of(context)!.theme.secondaryColor();
+      return MihColors.getSecondaryColor(
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark");
     } else {
-      return MzansiInnovationHub.of(context)!.theme.errorColor();
+      return MihColors.getRedColor(
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark");
     }
   }
 
@@ -688,10 +710,10 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
                     editable: false,
                     fileNameController: fileNameController,
                     userSelectedfile: imageFile,
-                    frameColor:
+                    frameColor: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    backgroundColor:
+                    backgroundColor: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     onChange: (selectedfile) {
                       setState(() {
                         imageFile = selectedfile;
@@ -705,9 +727,9 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
                     style: TextStyle(
                       fontSize: 35,
                       fontWeight: FontWeight.bold,
-                      color: MzansiInnovationHub.of(context)!
+                      color: MihColors.getSecondaryColor(
-                          .theme
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                          .secondaryColor(),
+                              "Dark"),
                     ),
                   ),
                 ),
@@ -717,9 +739,9 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
                     style: TextStyle(
                       fontSize: 20,
                       fontWeight: FontWeight.w600,
-                      color: MzansiInnovationHub.of(context)!
+                      color: MihColors.getSecondaryColor(
-                          .theme
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                          .secondaryColor(),
+                              "Dark"),
                     ),
                   ),
                 ),
@@ -747,9 +769,9 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
                       style: TextStyle(
                         fontSize: 15,
                         fontWeight: FontWeight.bold,
-                        color: MzansiInnovationHub.of(context)!
+                        color: MihColors.getSecondaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .secondaryColor(),
+                                "Dark"),
                       ),
                     ),
                   ),
@@ -779,15 +801,15 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
                       // Connect with the user
                       editBizProfileWindow(width);
                     },
-                    buttonColor:
+                    buttonColor: MihColors.getGreenColor(
-                        MzansiInnovationHub.of(context)!.theme.successColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     width: 300,
                     child: Text(
                       "Edit Profile",
                       style: TextStyle(
-                        color: MzansiInnovationHub.of(context)!
+                        color: MihColors.getPrimaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .primaryColor(),
+                                "Dark"),
                         fontSize: 20,
                         fontWeight: FontWeight.bold,
                       ),
@@ -807,17 +829,17 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
         //       SpeedDialChild(
         //         child: Icon(
         //           Icons.edit,
-        //           color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+        //           color: MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         //         ),
         //         label: "Edit Profile",
         //         labelBackgroundColor:
-        //             MzansiInnovationHub.of(context)!.theme.successColor(),
+        //             MihColors.getGreenColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         //         labelStyle: TextStyle(
-        //           color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+        //           color: MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         //           fontWeight: FontWeight.bold,
         //         ),
         //         backgroundColor:
-        //             MzansiInnovationHub.of(context)!.theme.successColor(),
+        //             MihColors.getGreenColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         //         onTap: () {
         //           editBizProfileWindow(width);
         //         },

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

@@ -75,30 +75,30 @@ class _MihBusinessDetailsViewState extends State<MihBusinessDetailsView> {
                             editable: false,
                             fileNameController: TextEditingController(),
                             userSelectedfile: file,
-                            frameColor: MzansiInnovationHub.of(context)!
+                            frameColor: MihColors.getSecondaryColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .secondaryColor(),
+                                    "Dark"),
-                            backgroundColor: MzansiInnovationHub.of(context)!
+                            backgroundColor: MihColors.getPrimaryColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .primaryColor(),
+                                    "Dark"),
                             onChange: () {},
                           );
                         } else {
                           return Icon(
                             MihIcons.iDontKnow,
                             size: profilePictureWidth,
-                            color: MzansiInnovationHub.of(context)!
+                            color: MihColors.getSecondaryColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .secondaryColor(),
+                                    "Dark"),
                           );
                         }
                       } else {
                         return Icon(
                           MihIcons.mihRing,
                           size: profilePictureWidth,
-                          color: MzansiInnovationHub.of(context)!
+                          color: MihColors.getSecondaryColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .secondaryColor(),
+                                  "Dark"),
                         );
                       }
                     }),
@@ -110,9 +110,9 @@ class _MihBusinessDetailsViewState extends State<MihBusinessDetailsView> {
                 //     fileNameController: fileNameController,
                 //     userSelectedfile: imageFile,
                 //     frameColor:
-                //         MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                //         MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 //     backgroundColor:
-                //         MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                //         MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 //     onChange: (selectedfile) {
                 //       setState(() {
                 //         imageFile = selectedfile;
@@ -126,9 +126,9 @@ class _MihBusinessDetailsViewState extends State<MihBusinessDetailsView> {
                     style: TextStyle(
                       fontSize: 35,
                       fontWeight: FontWeight.bold,
-                      color: MzansiInnovationHub.of(context)!
+                      color: MihColors.getSecondaryColor(
-                          .theme
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                          .secondaryColor(),
+                              "Dark"),
                     ),
                   ),
                 ),
@@ -138,9 +138,9 @@ class _MihBusinessDetailsViewState extends State<MihBusinessDetailsView> {
                     style: TextStyle(
                       fontSize: 20,
                       fontWeight: FontWeight.w600,
-                      color: MzansiInnovationHub.of(context)!
+                      color: MihColors.getSecondaryColor(
-                          .theme
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                          .secondaryColor(),
+                              "Dark"),
                     ),
                   ),
                 ),
@@ -168,9 +168,9 @@ class _MihBusinessDetailsViewState extends State<MihBusinessDetailsView> {
                       style: TextStyle(
                         fontSize: 15,
                         fontWeight: FontWeight.bold,
-                        color: MzansiInnovationHub.of(context)!
+                        color: MihColors.getSecondaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .secondaryColor(),
+                                "Dark"),
                       ),
                     ),
                   ),
@@ -182,11 +182,14 @@ class _MihBusinessDetailsViewState extends State<MihBusinessDetailsView> {
                   filledIcon: Icons.star,
                   emptyIcon: Icons.star_border,
                   halfFilledIcon: Icons.star_half,
-              filledColor: MihColors.getYellowColor(context),
+                  filledColor: MihColors.getYellowColor(
-              // MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              emptyColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                  // MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              halfFilledColor: MihColors.getYellowColor(context),
+                  emptyColor: MihColors.getSecondaryColor(
-              // MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  halfFilledColor: MihColors.getYellowColor(
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  // MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   isHalfAllowed: true,
                   initialRating: widget.business.rating.isNotEmpty
                       ? double.parse(widget.business.rating)

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

@@ -76,17 +76,17 @@ class _MihBusinessReviewsState extends State<MihBusinessReviews> {
                           child: Icon(
                             MihIcons.mihRing,
                             size: 165,
-                            color: MzansiInnovationHub.of(context)!
+                            color: MihColors.getSecondaryColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .secondaryColor(),
+                                    "Dark"),
                           ),
                         ),
                         Icon(
                           Icons.star_rate_rounded,
                           size: 150,
-                          color: MzansiInnovationHub.of(context)!
+                          color: MihColors.getSecondaryColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .secondaryColor(),
+                                  "Dark"),
                         ),
                       ],
                     ),
@@ -98,9 +98,9 @@ class _MihBusinessReviewsState extends State<MihBusinessReviews> {
                       style: TextStyle(
                         fontSize: 25,
                         fontWeight: FontWeight.bold,
-                        color: MzansiInnovationHub.of(context)!
+                        color: MihColors.getSecondaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .secondaryColor(),
+                                "Dark"),
                       ),
                     ),
                     // const SizedBox(height: 10),
@@ -142,7 +142,7 @@ class _MihBusinessReviewsState extends State<MihBusinessReviews> {
               //       Icons.star_rate_rounded,
               //       size: 150,
               //       color:
-              //           MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+              //           MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               //     ),
               //     Text(
               //       "No reviews yet, be the first the review\n${widget.business.Name}",
@@ -170,19 +170,23 @@ class _MihBusinessReviewsState extends State<MihBusinessReviews> {
                       filledIcon: Icons.star,
                       emptyIcon: Icons.star_border,
                       halfFilledIcon: Icons.star_half,
-                      filledColor: MihColors.getYellowColor(context),
+                      filledColor: MihColors.getYellowColor(
-                      // MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                      emptyColor: MzansiInnovationHub.of(context)!
+                              "Dark"),
-                          .theme
+                      // MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                          .secondaryColor(),
+                      emptyColor: MihColors.getSecondaryColor(
-                      halfFilledColor: MihColors.getYellowColor(context),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                      // MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                              "Dark"),
+                      halfFilledColor: MihColors.getYellowColor(
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
+                      // MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                       // filledColor:
-                      //     MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      //     MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                       // emptyColor:
-                      //     MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      //     MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                       // halfFilledColor:
-                      //     MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      //     MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                       isHalfAllowed: true,
                       initialRating: double.parse(reviews[index].rating_score),
                       maxRating: 5,

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

@@ -6,6 +6,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_
 import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_packages/mzansi_profile/business_profile/builders/build_user_list.dart';
 import 'package:flutter/material.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_user_services.dart';
@@ -70,7 +71,8 @@ class _MihBusinessUserSearchState extends State<MihBusinessUserSearch> {
           Icon(
             MihIcons.iDontKnow,
             size: 165,
-            color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+            color: MihColors.getSecondaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
           ),
           const SizedBox(height: 10),
           Text(
@@ -80,7 +82,8 @@ class _MihBusinessUserSearchState extends State<MihBusinessUserSearch> {
             style: TextStyle(
               fontSize: 25,
               fontWeight: FontWeight.bold,
-              color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+              color: MihColors.getSecondaryColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             ),
           ),
         ],
@@ -96,7 +99,8 @@ class _MihBusinessUserSearchState extends State<MihBusinessUserSearch> {
             Icon(
               MihIcons.personalProfile,
               size: 165,
-              color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+              color: MihColors.getSecondaryColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             ),
             const SizedBox(height: 10),
             Text(
@@ -106,7 +110,8 @@ class _MihBusinessUserSearchState extends State<MihBusinessUserSearch> {
               style: TextStyle(
                 fontSize: 25,
                 fontWeight: FontWeight.bold,
-                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MihColors.getSecondaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               ),
             ),
             const SizedBox(height: 25),
@@ -117,8 +122,8 @@ class _MihBusinessUserSearchState extends State<MihBusinessUserSearch> {
                   style: TextStyle(
                     fontSize: 20,
                     fontWeight: FontWeight.normal,
-                    color:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   ),
                   children: [
                     TextSpan(
@@ -147,7 +152,7 @@ class _MihBusinessUserSearchState extends State<MihBusinessUserSearch> {
     //     "Enter Username or Email to search",
     //     style: TextStyle(
     //         fontSize: 25,
-    //         color: MzansiInnovationHub.of(context)!.theme.messageTextColor()),
+    //         color: MihColors.getGreyColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark")),
     //     textAlign: TextAlign.center,
     //   ),
     // );
@@ -186,8 +191,10 @@ class _MihBusinessUserSearchState extends State<MihBusinessUserSearch> {
             controller: searchController,
             hintText: "Search Users",
             prefixIcon: Icons.search,
-            fillColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+            fillColor: MihColors.getSecondaryColor(
-            hintColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+            hintColor: MihColors.getPrimaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             onPrefixIconTap: () {
               submitUserForm();
             },
@@ -224,8 +231,9 @@ class _MihBusinessUserSearchState extends State<MihBusinessUserSearch> {
                   "$errorCode: Error pulling Patients Data\n/users/search/$userSearch\n$errorBody",
                   style: TextStyle(
                       fontSize: 25,
-                      color:
+                      color: MihColors.getRedColor(
-                          MzansiInnovationHub.of(context)!.theme.errorColor()),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark")),
                   textAlign: TextAlign.center,
                 ),
               );

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

@@ -1,9 +1,9 @@
 import 'dart:convert';
-
 import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_config/mih_env.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/business_employee.dart';
@@ -60,7 +60,8 @@ class _MihMyBusinessTeamState extends State<MihMyBusinessTeam> {
         "",
         style: TextStyle(
             fontSize: 25,
-            color: MzansiInnovationHub.of(context)!.theme.messageTextColor()),
+            color: MihColors.getGreyColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark")),
         textAlign: TextAlign.center,
       ),
     );
@@ -105,8 +106,9 @@ class _MihMyBusinessTeamState extends State<MihMyBusinessTeam> {
                   "$errorCode: Error pulling Patients Data\n${AppEnviroment.baseApiUrl}/business-user/users/${widget.arguments.businessUser!.business_id}\n$errorBody",
                   style: TextStyle(
                       fontSize: 25,
-                      color:
+                      color: MihColors.getRedColor(
-                          MzansiInnovationHub.of(context)!.theme.errorColor()),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark")),
                   textAlign: TextAlign.center,
                 ),
               );

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

@@ -1,6 +1,7 @@
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
 import 'package:mzansi_innovation_hub/main.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_file_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_my_business_user_services.dart';
@@ -126,7 +127,8 @@ class _MihMyBusinessUserState extends State<MihMyBusinessUser> {
               return MihPackageAlert(
                 alertIcon: Icon(
                   Icons.warning_rounded,
-                  color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+                  color: MihColors.getRedColor(
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 ),
                 alertTitle: "Error Updating Business User Details",
                 alertBody: Column(
@@ -134,15 +136,15 @@ 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: MzansiInnovationHub.of(context)!
+                        color: MihColors.getSecondaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .secondaryColor(),
+                                "Dark"),
                       ),
                     ),
                   ],
                 ),
-                alertColour:
+                alertColour: MihColors.getRedColor(
-                    MzansiInnovationHub.of(context)!.theme.errorColor(),
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               );
             },
           );
@@ -226,20 +228,20 @@ class _MihMyBusinessUserState extends State<MihMyBusinessUser> {
                     editable: false,
                     fileNameController: fileNameController,
                     userSelectedfile: userPicFile,
-                    frameColor:
+                    frameColor: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    backgroundColor:
+                    backgroundColor: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     onChange: (_) {},
                   ),
                 ),
                 Visibility(
                   visible: false,
                   child: MihTextFormField(
-                    fillColor:
+                    fillColor: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    inputColor:
+                    inputColor: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     controller: fileNameController,
                     multiLineInput: false,
                     requiredText: true,
@@ -249,10 +251,10 @@ class _MihMyBusinessUserState extends State<MihMyBusinessUser> {
                 ),
                 const SizedBox(height: 20),
                 MihTextFormField(
-                  fillColor:
+                  fillColor: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  inputColor:
+                  inputColor: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   controller: titleTextController,
                   multiLineInput: false,
                   requiredText: true,
@@ -264,10 +266,10 @@ class _MihMyBusinessUserState extends State<MihMyBusinessUser> {
                 ),
                 const SizedBox(height: 10),
                 MihTextFormField(
-                  fillColor:
+                  fillColor: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  inputColor:
+                  inputColor: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   controller: fnameController,
                   multiLineInput: false,
                   requiredText: true,
@@ -279,10 +281,10 @@ class _MihMyBusinessUserState extends State<MihMyBusinessUser> {
                 ),
                 const SizedBox(height: 10),
                 MihTextFormField(
-                  fillColor:
+                  fillColor: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  inputColor:
+                  inputColor: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   controller: lnameController,
                   multiLineInput: false,
                   requiredText: true,
@@ -294,10 +296,10 @@ class _MihMyBusinessUserState extends State<MihMyBusinessUser> {
                 ),
                 const SizedBox(height: 10),
                 MihTextFormField(
-                  fillColor:
+                  fillColor: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  inputColor:
+                  inputColor: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   controller: accessController,
                   multiLineInput: false,
                   requiredText: true,
@@ -338,10 +340,10 @@ class _MihMyBusinessUserState extends State<MihMyBusinessUser> {
                 Visibility(
                   visible: false,
                   child: MihTextFormField(
-                    fillColor:
+                    fillColor: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    inputColor:
+                    inputColor: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     controller: fileNameController,
                     multiLineInput: false,
                     requiredText: true,
@@ -359,15 +361,15 @@ class _MihMyBusinessUserState extends State<MihMyBusinessUser> {
                         MihAlertServices().formNotFilledCompletely(context);
                       }
                     },
-                    buttonColor:
+                    buttonColor: MihColors.getGreenColor(
-                        MzansiInnovationHub.of(context)!.theme.successColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     width: 300,
                     child: Text(
                       "Update",
                       style: TextStyle(
-                        color: MzansiInnovationHub.of(context)!
+                        color: MihColors.getPrimaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .primaryColor(),
+                                "Dark"),
                         fontSize: 20,
                         fontWeight: FontWeight.bold,
                       ),

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

@@ -4,6 +4,7 @@ import 'package:country_code_picker/country_code_picker.dart';
 import 'package:http/http.dart';
 import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_business_details_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_file_services.dart';
@@ -257,9 +258,11 @@ class _ProfileBusinessAddState extends State<ProfileBusinessAdd> {
 
   Color getMissionVisionLimitColor(int limit) {
     if (_counter.value <= limit) {
-      return MzansiInnovationHub.of(context)!.theme.secondaryColor();
+      return MihColors.getSecondaryColor(
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark");
     } else {
-      return MzansiInnovationHub.of(context)!.theme.errorColor();
+      return MihColors.getRedColor(
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark");
     }
   }
 
@@ -296,20 +299,20 @@ class _ProfileBusinessAddState extends State<ProfileBusinessAdd> {
                     ),
                   ),
                   Divider(
-                      color: MzansiInnovationHub.of(context)!
+                      color: MihColors.getSecondaryColor(
-                          .theme
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                          .secondaryColor()),
+                              "Dark")),
                   const SizedBox(height: 10.0),
                   MihForm(
                     formKey: _formKey,
                     formFields: [
                       MihTextFormField(
-                        fillColor: MzansiInnovationHub.of(context)!
+                        fillColor: MihColors.getSecondaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .secondaryColor(),
+                                "Dark"),
-                        inputColor: MzansiInnovationHub.of(context)!
+                        inputColor: MihColors.getPrimaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .primaryColor(),
+                                "Dark"),
                         controller: nameController,
                         multiLineInput: false,
                         requiredText: true,
@@ -320,12 +323,12 @@ class _ProfileBusinessAddState extends State<ProfileBusinessAdd> {
                       ),
                       const SizedBox(height: 10.0),
                       MihTextFormField(
-                        fillColor: MzansiInnovationHub.of(context)!
+                        fillColor: MihColors.getSecondaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .secondaryColor(),
+                                "Dark"),
-                        inputColor: MzansiInnovationHub.of(context)!
+                        inputColor: MihColors.getPrimaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .primaryColor(),
+                                "Dark"),
                         controller: typeController,
                         multiLineInput: false,
                         requiredText: true,
@@ -336,12 +339,12 @@ class _ProfileBusinessAddState extends State<ProfileBusinessAdd> {
                       ),
                       const SizedBox(height: 10.0),
                       MihTextFormField(
-                        fillColor: MzansiInnovationHub.of(context)!
+                        fillColor: MihColors.getSecondaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .secondaryColor(),
+                                "Dark"),
-                        inputColor: MzansiInnovationHub.of(context)!
+                        inputColor: MihColors.getPrimaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .primaryColor(),
+                                "Dark"),
                         controller: emailController,
                         multiLineInput: false,
                         requiredText: true,
@@ -378,22 +381,21 @@ class _ProfileBusinessAddState extends State<ProfileBusinessAdd> {
                             initialSelection: countryCodeController.text,
                             showDropDownButton: false,
                             pickerStyle: PickerStyle.bottomSheet,
-                            dialogBackgroundColor:
+                            dialogBackgroundColor: MihColors.getPrimaryColor(
-                                MzansiInnovationHub.of(context)!
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    .theme
+                                    "Dark"),
-                                    .primaryColor(),
+                            barrierColor: MihColors.getPrimaryColor(
-                            barrierColor: MzansiInnovationHub.of(context)!
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .theme
+                                    "Dark"),
-                                .primaryColor(),
                           ),
                           Expanded(
                             child: MihTextFormField(
-                              fillColor: MzansiInnovationHub.of(context)!
+                              fillColor: MihColors.getSecondaryColor(
-                                  .theme
+                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                  .secondaryColor(),
+                                      "Dark"),
-                              inputColor: MzansiInnovationHub.of(context)!
+                              inputColor: MihColors.getPrimaryColor(
-                                  .theme
+                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                  .primaryColor(),
+                                      "Dark"),
                               controller: contactController,
                               numberMode: true,
                               multiLineInput: false,
@@ -409,12 +411,12 @@ class _ProfileBusinessAddState extends State<ProfileBusinessAdd> {
                       const SizedBox(height: 10.0),
                       MihTextFormField(
                         height: 250,
-                        fillColor: MzansiInnovationHub.of(context)!
+                        fillColor: MihColors.getSecondaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .secondaryColor(),
+                                "Dark"),
-                        inputColor: MzansiInnovationHub.of(context)!
+                        inputColor: MihColors.getPrimaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .primaryColor(),
+                                "Dark"),
                         controller: missionVisionController,
                         multiLineInput: true,
                         requiredText: true,
@@ -456,12 +458,12 @@ class _ProfileBusinessAddState extends State<ProfileBusinessAdd> {
                       ),
                       const SizedBox(height: 10.0),
                       MihTextFormField(
-                        fillColor: MzansiInnovationHub.of(context)!
+                        fillColor: MihColors.getSecondaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .secondaryColor(),
+                                "Dark"),
-                        inputColor: MzansiInnovationHub.of(context)!
+                        inputColor: MihColors.getPrimaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .primaryColor(),
+                                "Dark"),
                         controller: websiteController,
                         multiLineInput: false,
                         requiredText: false,
@@ -474,12 +476,12 @@ class _ProfileBusinessAddState extends State<ProfileBusinessAdd> {
                       const SizedBox(height: 10.0),
 
                       MihTextFormField(
-                        fillColor: MzansiInnovationHub.of(context)!
+                        fillColor: MihColors.getSecondaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .secondaryColor(),
+                                "Dark"),
-                        inputColor: MzansiInnovationHub.of(context)!
+                        inputColor: MihColors.getPrimaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .primaryColor(),
+                                "Dark"),
                         controller: regController,
                         multiLineInput: false,
                         requiredText: false,
@@ -491,12 +493,12 @@ class _ProfileBusinessAddState extends State<ProfileBusinessAdd> {
                       ),
                       const SizedBox(height: 10.0),
                       MihTextFormField(
-                        fillColor: MzansiInnovationHub.of(context)!
+                        fillColor: MihColors.getSecondaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .secondaryColor(),
+                                "Dark"),
-                        inputColor: MzansiInnovationHub.of(context)!
+                        inputColor: MihColors.getPrimaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .primaryColor(),
+                                "Dark"),
                         controller: practiceNoController,
                         multiLineInput: false,
                         requiredText: false,
@@ -508,12 +510,12 @@ class _ProfileBusinessAddState extends State<ProfileBusinessAdd> {
 
                       const SizedBox(height: 10.0),
                       MihTextFormField(
-                        fillColor: MzansiInnovationHub.of(context)!
+                        fillColor: MihColors.getSecondaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .secondaryColor(),
+                                "Dark"),
-                        inputColor: MzansiInnovationHub.of(context)!
+                        inputColor: MihColors.getPrimaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .primaryColor(),
+                                "Dark"),
                         controller: vatNoController,
                         multiLineInput: false,
                         requiredText: false,
@@ -529,12 +531,12 @@ class _ProfileBusinessAddState extends State<ProfileBusinessAdd> {
                         children: [
                           Flexible(
                             child: MihTextFormField(
-                              fillColor: MzansiInnovationHub.of(context)!
+                              fillColor: MihColors.getSecondaryColor(
-                                  .theme
+                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                  .secondaryColor(),
+                                      "Dark"),
-                              inputColor: MzansiInnovationHub.of(context)!
+                              inputColor: MihColors.getPrimaryColor(
-                                  .theme
+                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                  .primaryColor(),
+                                      "Dark"),
                               controller: locationController,
                               multiLineInput: false,
                               requiredText: true,
@@ -565,16 +567,18 @@ class _ProfileBusinessAddState extends State<ProfileBusinessAdd> {
                                 Navigator.of(context).pop();
                               });
                             },
-                            buttonColor: MzansiInnovationHub.of(context)!
+                            buttonColor: MihColors.getSecondaryColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .secondaryColor(),
+                                    "Dark"),
                             width: 100,
                             child: Text(
                               "Set",
                               style: TextStyle(
-                                color: MzansiInnovationHub.of(context)!
+                                color: MihColors.getPrimaryColor(
+                                    MzansiInnovationHub.of(context)!
                                             .theme
-                                    .primaryColor(),
+                                            .mode ==
+                                        "Dark"),
                                 fontSize: 20,
                                 fontWeight: FontWeight.bold,
                               ),
@@ -594,17 +598,17 @@ class _ProfileBusinessAddState extends State<ProfileBusinessAdd> {
                         ),
                       ),
                       Divider(
-                          color: MzansiInnovationHub.of(context)!
+                          color: MihColors.getSecondaryColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .secondaryColor()),
+                                  "Dark")),
                       const SizedBox(height: 10.0),
                       MihTextFormField(
-                        fillColor: MzansiInnovationHub.of(context)!
+                        fillColor: MihColors.getSecondaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .secondaryColor(),
+                                "Dark"),
-                        inputColor: MzansiInnovationHub.of(context)!
+                        inputColor: MihColors.getPrimaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .primaryColor(),
+                                "Dark"),
                         controller: titleController,
                         multiLineInput: false,
                         requiredText: true,
@@ -626,12 +630,12 @@ class _ProfileBusinessAddState extends State<ProfileBusinessAdd> {
                       // ),
                       const SizedBox(height: 10.0),
                       MihTextFormField(
-                        fillColor: MzansiInnovationHub.of(context)!
+                        fillColor: MihColors.getSecondaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .secondaryColor(),
+                                "Dark"),
-                        inputColor: MzansiInnovationHub.of(context)!
+                        inputColor: MihColors.getPrimaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .primaryColor(),
+                                "Dark"),
                         controller: fnameController,
                         multiLineInput: false,
                         requiredText: true,
@@ -643,12 +647,12 @@ class _ProfileBusinessAddState extends State<ProfileBusinessAdd> {
                       ),
                       const SizedBox(height: 10.0),
                       MihTextFormField(
-                        fillColor: MzansiInnovationHub.of(context)!
+                        fillColor: MihColors.getSecondaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .secondaryColor(),
+                                "Dark"),
-                        inputColor: MzansiInnovationHub.of(context)!
+                        inputColor: MihColors.getPrimaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .primaryColor(),
+                                "Dark"),
                         controller: lnameController,
                         multiLineInput: false,
                         requiredText: true,
@@ -660,12 +664,12 @@ class _ProfileBusinessAddState extends State<ProfileBusinessAdd> {
                       ),
                       const SizedBox(height: 15.0),
                       MihTextFormField(
-                        fillColor: MzansiInnovationHub.of(context)!
+                        fillColor: MihColors.getSecondaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .secondaryColor(),
+                                "Dark"),
-                        inputColor: MzansiInnovationHub.of(context)!
+                        inputColor: MihColors.getPrimaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .primaryColor(),
+                                "Dark"),
                         controller: accessController,
                         multiLineInput: false,
                         requiredText: true,
@@ -697,16 +701,16 @@ class _ProfileBusinessAddState extends State<ProfileBusinessAdd> {
                                   .formNotFilledCompletely(context);
                             }
                           },
-                          buttonColor: MzansiInnovationHub.of(context)!
+                          buttonColor: MihColors.getGreenColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .successColor(),
+                                  "Dark"),
                           width: 300,
                           child: Text(
                             "Add",
                             style: TextStyle(
-                              color: MzansiInnovationHub.of(context)!
+                              color: MihColors.getPrimaryColor(
-                                  .theme
+                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                  .primaryColor(),
+                                      "Dark"),
                               fontSize: 20,
                               fontWeight: FontWeight.bold,
                             ),

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

@@ -4,6 +4,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart';
 import 'package:flutter/material.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 
 class MzansiProfileTile extends StatefulWidget {
   final AppUser signedInUser;
@@ -38,12 +39,15 @@ class _MzansiProfileTileState extends State<MzansiProfileTile> {
       appName: "Mzansi Profile",
       appIcon: Icon(
         MihIcons.mihLogo,
-        color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+        color: MihColors.getSecondaryColor(
+            MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         // size: widget.packageSize,
       ),
       iconSize: widget.packageSize,
-      primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      primaryColor: MihColors.getSecondaryColor(
-      secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+      secondaryColor: MihColors.getPrimaryColor(
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
     );
   }
 }

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

@@ -4,6 +4,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart';
 import 'package:flutter/material.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 
 class MzansiSetupProfileTile extends StatefulWidget {
   final AppUser signedInUser;
@@ -37,12 +38,15 @@ class _MzansiSetupProfileTileState extends State<MzansiSetupProfileTile> {
       appName: "Set Up Profile",
       appIcon: Icon(
         MihIcons.profileSetup,
-        color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+        color: MihColors.getSecondaryColor(
+            MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         // size: widget.packageSize,
       ),
       iconSize: widget.packageSize,
-      primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      primaryColor: MihColors.getSecondaryColor(
-      secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+      secondaryColor: MihColors.getPrimaryColor(
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
     );
   }
 }

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

@@ -1,5 +1,6 @@
 import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_file_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_user_services.dart';
@@ -53,7 +54,8 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
           alertIcon: Icon(
             Icons.warning_amber_rounded,
             size: 100,
-            color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+            color: MihColors.getRedColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
           ),
           alertTitle: "Too Slow, That Username is Taken",
           alertBody: const Text(
@@ -62,7 +64,8 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
               fontSize: 15,
             ),
           ),
-          alertColour: MzansiInnovationHub.of(context)!.theme.errorColor(),
+          alertColour: MihColors.getRedColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         );
       },
     );
@@ -193,9 +196,11 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
 
   Color getPurposeLimitColor(int limit) {
     if (_counter.value <= limit) {
-      return MzansiInnovationHub.of(context)!.theme.secondaryColor();
+      return MihColors.getSecondaryColor(
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark");
     } else {
-      return MzansiInnovationHub.of(context)!.theme.errorColor();
+      return MihColors.getRedColor(
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark");
     }
   }
 
@@ -226,11 +231,12 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
                       editable: true,
                       fileNameController: proPicController,
                       userSelectedfile: proPic,
-                      frameColor: MzansiInnovationHub.of(context)!
+                      frameColor: MihColors.getSecondaryColor(
-                          .theme
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                          .secondaryColor(),
+                              "Dark"),
-                      backgroundColor:
+                      backgroundColor: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                       onChange: (selectedImage) {
                         setState(() {
                           proPic = selectedImage;
@@ -242,11 +248,12 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
                   Visibility(
                     visible: false,
                     child: MihTextFormField(
-                      fillColor: MzansiInnovationHub.of(context)!
+                      fillColor: MihColors.getSecondaryColor(
-                          .theme
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                          .secondaryColor(),
+                              "Dark"),
-                      inputColor:
+                      inputColor: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                       controller: proPicController,
                       multiLineInput: false,
                       requiredText: true,
@@ -256,10 +263,10 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
                   ),
                   const SizedBox(height: 10.0),
                   MihTextFormField(
-                    fillColor:
+                    fillColor: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    inputColor:
+                    inputColor: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     controller: usernameController,
                     multiLineInput: false,
                     requiredText: true,
@@ -270,10 +277,10 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
                   ),
                   const SizedBox(height: 10.0),
                   MihTextFormField(
-                    fillColor:
+                    fillColor: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    inputColor:
+                    inputColor: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     controller: fnameController,
                     multiLineInput: false,
                     requiredText: true,
@@ -284,10 +291,10 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
                   ),
                   const SizedBox(height: 10.0),
                   MihTextFormField(
-                    fillColor:
+                    fillColor: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    inputColor:
+                    inputColor: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     controller: lnameController,
                     multiLineInput: false,
                     requiredText: true,
@@ -299,10 +306,10 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
                   const SizedBox(height: 10.0),
                   MihTextFormField(
                     height: 250,
-                    fillColor:
+                    fillColor: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    inputColor:
+                    inputColor: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     controller: purposeController,
                     multiLineInput: true,
                     requiredText: true,
@@ -346,10 +353,10 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
                   MihToggle(
                     hintText: "Activate Business Account",
                     initialPostion: businessUser,
-                    fillColor:
+                    fillColor: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    secondaryFillColor:
+                    secondaryFillColor: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     onChange: (value) {
                       setState(() {
                         businessUser = value;
@@ -367,15 +374,16 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
                           MihAlertServices().formNotFilledCompletely(context);
                         }
                       },
-                      buttonColor:
+                      buttonColor: MihColors.getGreenColor(
-                          MzansiInnovationHub.of(context)!.theme.successColor(),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                       width: 300,
                       child: Text(
                         "Update",
                         style: TextStyle(
-                          color: MzansiInnovationHub.of(context)!
+                          color: MihColors.getPrimaryColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .primaryColor(),
+                                  "Dark"),
                           fontSize: 20,
                           fontWeight: FontWeight.bold,
                         ),
@@ -464,10 +472,10 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
                     editable: false,
                     fileNameController: proPicController,
                     userSelectedfile: proPic,
-                    frameColor:
+                    frameColor: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    backgroundColor:
+                    backgroundColor: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     onChange: (selectedImage) {
                       setState(() {
                         proPic = selectedImage;
@@ -483,9 +491,9 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
                     style: TextStyle(
                       fontSize: 35,
                       fontWeight: FontWeight.bold,
-                      color: MzansiInnovationHub.of(context)!
+                      color: MihColors.getSecondaryColor(
-                          .theme
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                          .secondaryColor(),
+                              "Dark"),
                     ),
                   ),
                 ),
@@ -497,9 +505,9 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
                     style: TextStyle(
                       fontSize: 25,
                       fontWeight: FontWeight.bold,
-                      color: MzansiInnovationHub.of(context)!
+                      color: MihColors.getSecondaryColor(
-                          .theme
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                          .secondaryColor(),
+                              "Dark"),
                     ),
                   ),
                 ),
@@ -509,9 +517,9 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
                     style: TextStyle(
                       fontSize: 15,
                       fontWeight: FontWeight.bold,
-                      color: MzansiInnovationHub.of(context)!
+                      color: MihColors.getSecondaryColor(
-                          .theme
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                          .secondaryColor(),
+                              "Dark"),
                     ),
                   ),
                 ),
@@ -527,9 +535,9 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
                       style: TextStyle(
                         fontSize: 15,
                         fontWeight: FontWeight.bold,
-                        color: MzansiInnovationHub.of(context)!
+                        color: MihColors.getSecondaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .secondaryColor(),
+                                "Dark"),
                       ),
                     ),
                   ),
@@ -541,17 +549,17 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
                       // Connect with the user
                       editProfileWindow(width);
                     },
-                    buttonColor:
+                    buttonColor: MihColors.getGreenColor(
-                        MzansiInnovationHub.of(context)!.theme.successColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     width: 300,
                     child: Text(
                       widget.arguments.signedInUser.username.isEmpty
                           ? "Set Up Profile"
                           : "Edit Profile",
                       style: TextStyle(
-                        color: MzansiInnovationHub.of(context)!
+                        color: MihColors.getPrimaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .primaryColor(),
+                                "Dark"),
                         fontSize: 20,
                         fontWeight: FontWeight.bold,
                       ),
@@ -571,17 +579,17 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
         //       SpeedDialChild(
         //         child: Icon(
         //           Icons.edit,
-        //           color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+        //           color: MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         //         ),
         //         label: "Edit Profile",
         //         labelBackgroundColor:
-        //             MzansiInnovationHub.of(context)!.theme.successColor(),
+        //             MihColors.getGreenColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         //         labelStyle: TextStyle(
-        //           color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+        //           color: MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         //           fontWeight: FontWeight.bold,
         //         ),
         //         backgroundColor:
-        //             MzansiInnovationHub.of(context)!.theme.successColor(),
+        //             MihColors.getGreenColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         //         onTap: () {
         //           editProfileWindow(width);
         //         },

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

@@ -1,6 +1,7 @@
 import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_file_services.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart';
@@ -67,30 +68,30 @@ class _MihPersonalProfileViewState extends State<MihPersonalProfileView> {
                         editable: false,
                         fileNameController: TextEditingController(),
                         userSelectedfile: file,
-                        frameColor: MzansiInnovationHub.of(context)!
+                        frameColor: MihColors.getSecondaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .secondaryColor(),
+                                "Dark"),
-                        backgroundColor: MzansiInnovationHub.of(context)!
+                        backgroundColor: MihColors.getPrimaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .primaryColor(),
+                                "Dark"),
                         onChange: () {},
                       );
                     } else {
                       return Icon(
                         MihIcons.iDontKnow,
                         size: profilePictureWidth,
-                        color: MzansiInnovationHub.of(context)!
+                        color: MihColors.getSecondaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .secondaryColor(),
+                                "Dark"),
                       );
                     }
                   } else {
                     return Icon(
                       MihIcons.mihRing,
                       size: profilePictureWidth,
-                      color: MzansiInnovationHub.of(context)!
+                      color: MihColors.getSecondaryColor(
-                          .theme
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                          .secondaryColor(),
+                              "Dark"),
                     );
                   }
                   // return Center(
@@ -104,7 +105,7 @@ class _MihPersonalProfileViewState extends State<MihPersonalProfileView> {
                   //         .theme
                   //         .secondaryColor(),
                   //     backgroundColor:
-                  //         MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                  //         MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   //     onChange: (selectedImage) {
                   //       setState(() {
                   //         proPic = selectedImage;
@@ -121,8 +122,8 @@ class _MihPersonalProfileViewState extends State<MihPersonalProfileView> {
                 style: TextStyle(
                   fontSize: 35,
                   fontWeight: FontWeight.bold,
-                  color:
+                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 ),
               ),
             ),
@@ -134,8 +135,8 @@ class _MihPersonalProfileViewState extends State<MihPersonalProfileView> {
                 style: TextStyle(
                   fontSize: 25,
                   fontWeight: FontWeight.bold,
-                  color:
+                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 ),
               ),
             ),
@@ -145,8 +146,8 @@ class _MihPersonalProfileViewState extends State<MihPersonalProfileView> {
                 style: TextStyle(
                   fontSize: 15,
                   fontWeight: FontWeight.bold,
-                  color:
+                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 ),
               ),
             ),
@@ -162,8 +163,8 @@ class _MihPersonalProfileViewState extends State<MihPersonalProfileView> {
                   style: TextStyle(
                     fontSize: 15,
                     fontWeight: FontWeight.bold,
-                    color:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   ),
                 ),
               ),
@@ -175,7 +176,7 @@ class _MihPersonalProfileViewState extends State<MihPersonalProfileView> {
             //       // Connect with the user
             //     },
             //     buttonColor:
-            //         MzansiInnovationHub.of(context)!.theme.successColor(),
+            //         MihColors.getGreenColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             //     width: 300,
             //     child: Text(
             //       widget.user.username.isEmpty
@@ -183,7 +184,7 @@ class _MihPersonalProfileViewState extends State<MihPersonalProfileView> {
             //           : "Edit Profile",
             //       style: TextStyle(
             //         color:
-            //             MzansiInnovationHub.of(context)!.theme.primaryColor(),
+            //             MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             //         fontSize: 20,
             //         fontWeight: FontWeight.bold,
             //       ),

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

@@ -1,4 +1,5 @@
 import 'package:mzansi_innovation_hub/main.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_user_services.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart';
@@ -38,7 +39,8 @@ class _MihPersonalSettingsState extends State<MihPersonalSettings> {
           alertIcon: Icon(
             Icons.warning_amber_rounded,
             size: 100,
-            color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+            color: MihColors.getRedColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
           ),
           alertTitle:
               "Are you sure you want to permanently delete your MIH account?",
@@ -48,8 +50,8 @@ class _MihPersonalSettingsState extends State<MihPersonalSettings> {
               Text(
                 "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:
+                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   fontSize: 15,
                   fontWeight: FontWeight.bold,
                 ),
@@ -64,15 +66,15 @@ class _MihPersonalSettingsState extends State<MihPersonalSettings> {
                       MihUserServices.deleteAccount(
                           widget.signedInUser.app_id, context);
                     },
-                    buttonColor:
+                    buttonColor: MihColors.getRedColor(
-                        MzansiInnovationHub.of(context)!.theme.errorColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     width: 300,
                     child: Text(
                       "Delete",
                       style: TextStyle(
-                        color: MzansiInnovationHub.of(context)!
+                        color: MihColors.getPrimaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .primaryColor(),
+                                "Dark"),
                         fontSize: 20,
                         fontWeight: FontWeight.bold,
                       ),
@@ -82,15 +84,15 @@ class _MihPersonalSettingsState extends State<MihPersonalSettings> {
                     onPressed: () {
                       Navigator.pop(context);
                     },
-                    buttonColor:
+                    buttonColor: MihColors.getGreenColor(
-                        MzansiInnovationHub.of(context)!.theme.successColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     width: 300,
                     child: Text(
                       "Cancel",
                       style: TextStyle(
-                        color: MzansiInnovationHub.of(context)!
+                        color: MihColors.getPrimaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .primaryColor(),
+                                "Dark"),
                         fontSize: 20,
                         fontWeight: FontWeight.bold,
                       ),
@@ -100,7 +102,8 @@ class _MihPersonalSettingsState extends State<MihPersonalSettings> {
               )
             ],
           ),
-          alertColour: MzansiInnovationHub.of(context)!.theme.errorColor(),
+          alertColour: MihColors.getRedColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         );
       },
     );
@@ -113,7 +116,8 @@ class _MihPersonalSettingsState extends State<MihPersonalSettings> {
           Center(
             child: FaIcon(
               FontAwesomeIcons.trashCan,
-              color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+              color: MihColors.getSecondaryColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               size: 150,
             ),
           ),
@@ -124,7 +128,8 @@ class _MihPersonalSettingsState extends State<MihPersonalSettings> {
             style: TextStyle(
               fontSize: 18,
               fontWeight: FontWeight.bold,
-              color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+              color: MihColors.getSecondaryColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             ),
           ),
           const SizedBox(height: 10.0),
@@ -132,12 +137,14 @@ class _MihPersonalSettingsState extends State<MihPersonalSettings> {
             onPressed: () {
               deleteAccountPopUp(context);
             },
-            buttonColor: MzansiInnovationHub.of(context)!.theme.errorColor(),
+            buttonColor: MihColors.getRedColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             width: 300,
             child: Text(
               "Delete Account",
               style: TextStyle(
-                color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                color: MihColors.getPrimaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 fontSize: 20,
                 fontWeight: FontWeight.bold,
               ),

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

@@ -2,6 +2,7 @@ import 'package:flutter_speed_dial/flutter_speed_dial.dart';
 import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_banner_ad.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_mzansi_wallet_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart';
@@ -77,10 +78,10 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
                 formKey: _formKey,
                 formFields: [
                   MihTextFormField(
-                    fillColor:
+                    fillColor: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    inputColor:
+                    inputColor: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     controller: _nicknameController,
                     multiLineInput: false,
                     requiredText: false,
@@ -94,12 +95,12 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
                     children: [
                       Flexible(
                         child: MihTextFormField(
-                          fillColor: MzansiInnovationHub.of(context)!
+                          fillColor: MihColors.getSecondaryColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .secondaryColor(),
+                                  "Dark"),
-                          inputColor: MzansiInnovationHub.of(context)!
+                          inputColor: MihColors.getPrimaryColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .primaryColor(),
+                                  "Dark"),
                           controller: _cardNumberController,
                           multiLineInput: false,
                           requiredText: true,
@@ -115,16 +116,16 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
                         onPressed: () {
                           openscanner();
                         },
-                        buttonColor: MzansiInnovationHub.of(context)!
+                        buttonColor: MihColors.getSecondaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .secondaryColor(),
+                                "Dark"),
                         width: 100,
                         child: Text(
                           "Scan",
                           style: TextStyle(
-                            color: MzansiInnovationHub.of(context)!
+                            color: MihColors.getPrimaryColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .primaryColor(),
+                                    "Dark"),
                             fontSize: 20,
                             fontWeight: FontWeight.bold,
                           ),
@@ -151,15 +152,16 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
                           MihAlertServices().formNotFilledCompletely(context);
                         }
                       },
-                      buttonColor:
+                      buttonColor: MihColors.getGreenColor(
-                          MzansiInnovationHub.of(context)!.theme.successColor(),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                       width: 300,
                       child: Text(
                         "Update",
                         style: TextStyle(
-                          color: MzansiInnovationHub.of(context)!
+                          color: MihColors.getPrimaryColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .primaryColor(),
+                                  "Dark"),
                           fontSize: 20,
                           fontWeight: FontWeight.bold,
                         ),
@@ -200,10 +202,12 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
       barrierDismissible: false,
       builder: (context) {
         return MihPackageAlert(
-          alertColour: MzansiInnovationHub.of(context)!.theme.successColor(),
+          alertColour: MihColors.getGreenColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
           alertIcon: Icon(
             Icons.favorite,
-            color: MzansiInnovationHub.of(context)!.theme.successColor(),
+            color: MihColors.getGreenColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             size: 100,
           ),
           alertTitle: "Add to Favourites",
@@ -213,8 +217,8 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
                 "Are you sure you want to add this card to your favourites?",
                 style: TextStyle(
                   fontSize: 20,
-                  color:
+                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 ),
               ),
               const SizedBox(
@@ -233,14 +237,14 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
                     ctxt,
                   );
                 },
-                buttonColor:
+                buttonColor: MihColors.getGreenColor(
-                    MzansiInnovationHub.of(context)!.theme.successColor(),
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 width: 300,
                 child: Text(
                   "Add",
                   style: TextStyle(
-                    color:
+                    color: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: 20,
                     fontWeight: FontWeight.bold,
                   ),
@@ -259,10 +263,12 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
       barrierDismissible: false,
       builder: (context) {
         return MihPackageAlert(
-          alertColour: MzansiInnovationHub.of(context)!.theme.errorColor(),
+          alertColour: MihColors.getRedColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
           alertIcon: Icon(
             Icons.favorite_border,
-            color: MzansiInnovationHub.of(context)!.theme.errorColor(),
+            color: MihColors.getRedColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             size: 100,
           ),
           alertTitle: "Remove From Favourites",
@@ -272,8 +278,8 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
                 "Are you sure you want to remove this card from your favourites?",
                 style: TextStyle(
                   fontSize: 20,
-                  color:
+                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 ),
               ),
               const SizedBox(
@@ -292,14 +298,14 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
                     ctxt,
                   );
                 },
-                buttonColor:
+                buttonColor: MihColors.getRedColor(
-                    MzansiInnovationHub.of(context)!.theme.errorColor(),
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 width: 300,
                 child: Text(
                   "Remove",
                   style: TextStyle(
-                    color:
+                    color: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontSize: 20,
                     fontWeight: FontWeight.bold,
                   ),
@@ -332,25 +338,26 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
             child: widget.cardList[index].favourite == ""
                 ? Icon(
                     Icons.favorite,
-                    color:
+                    color: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   )
                 : Icon(
                     Icons.favorite_border,
-                    color:
+                    color: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   ),
             label: widget.cardList[index].favourite == ""
                 ? "Add to Favourite"
                 : "Remove from Favourite",
-            labelBackgroundColor:
+            labelBackgroundColor: MihColors.getGreenColor(
-                MzansiInnovationHub.of(context)!.theme.successColor(),
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             labelStyle: TextStyle(
-              color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+              color: MihColors.getPrimaryColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               fontWeight: FontWeight.bold,
             ),
-            backgroundColor:
+            backgroundColor: MihColors.getGreenColor(
-                MzansiInnovationHub.of(context)!.theme.successColor(),
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             onTap: () {
               if (widget.cardList[index].favourite == "") {
                 addToFavCardWindow(context, index);
@@ -362,17 +369,19 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
           SpeedDialChild(
             child: Icon(
               Icons.edit,
-              color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+              color: MihColors.getPrimaryColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             ),
             label: "Edit Card Details",
-            labelBackgroundColor:
+            labelBackgroundColor: MihColors.getGreenColor(
-                MzansiInnovationHub.of(context)!.theme.successColor(),
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             labelStyle: TextStyle(
-              color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+              color: MihColors.getPrimaryColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               fontWeight: FontWeight.bold,
             ),
-            backgroundColor:
+            backgroundColor: MihColors.getGreenColor(
-                MzansiInnovationHub.of(context)!.theme.successColor(),
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             onTap: () {
               setState(() {
                 _cardNumberController.text = widget.cardList[index].card_number;
@@ -384,17 +393,19 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
           SpeedDialChild(
             child: Icon(
               Icons.delete,
-              color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+              color: MihColors.getPrimaryColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             ),
             label: "Delete Card",
-            labelBackgroundColor:
+            labelBackgroundColor: MihColors.getGreenColor(
-                MzansiInnovationHub.of(context)!.theme.successColor(),
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             labelStyle: TextStyle(
-              color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+              color: MihColors.getPrimaryColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               fontWeight: FontWeight.bold,
             ),
-            backgroundColor:
+            backgroundColor: MihColors.getGreenColor(
-                MzansiInnovationHub.of(context)!.theme.successColor(),
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             onTap: () {
               deleteCardWindow(context, index);
             },
@@ -432,7 +443,7 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
                       height: 75,
                       // width: 300,
                       child: BarcodeWidget(
-                        //color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        //color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                         barcode: Barcode.code128(),
                         backgroundColor: Colors.white,
                         data: widget.cardList[index].card_number,
@@ -454,7 +465,7 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
                         color: Colors.black,
                         fontSize: 25,
                         fontWeight: FontWeight.bold
-                        //MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        //MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                         ),
                   ),
                 ],
@@ -536,7 +547,8 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
               Icon(
                 MihIcons.iDontKnow,
                 size: 165,
-                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MihColors.getSecondaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               ),
               const SizedBox(height: 10),
               Text(
@@ -546,8 +558,8 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
                 style: TextStyle(
                   fontSize: 25,
                   fontWeight: FontWeight.bold,
-                  color:
+                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 ),
               ),
             ],
@@ -563,7 +575,8 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
               Icon(
                 MihIcons.mzansiWallet,
                 size: 165,
-                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MihColors.getSecondaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               ),
               const SizedBox(height: 10),
               Text(
@@ -573,8 +586,8 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
                 style: TextStyle(
                   fontSize: 25,
                   fontWeight: FontWeight.bold,
-                  color:
+                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 ),
               ),
               const SizedBox(height: 25),
@@ -585,9 +598,9 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
                     style: TextStyle(
                       fontSize: 20,
                       fontWeight: FontWeight.normal,
-                      color: MzansiInnovationHub.of(context)!
+                      color: MihColors.getSecondaryColor(
-                          .theme
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                          .secondaryColor(),
+                              "Dark"),
                     ),
                     children: [
                       TextSpan(text: "Press "),
@@ -596,9 +609,9 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
                         child: Icon(
                           Icons.menu,
                           size: 20,
-                          color: MzansiInnovationHub.of(context)!
+                          color: MihColors.getSecondaryColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .secondaryColor(),
+                                  "Dark"),
                         ),
                       ),
                       TextSpan(text: " to add your first loyalty card"),
@@ -620,7 +633,8 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
               Icon(
                 MihIcons.mzansiWallet,
                 size: 165,
-                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MihColors.getSecondaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               ),
               const SizedBox(height: 10),
               Text(
@@ -630,8 +644,8 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
                 style: TextStyle(
                   fontSize: 25,
                   fontWeight: FontWeight.bold,
-                  color:
+                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 ),
               ),
               const SizedBox(height: 25),
@@ -642,9 +656,9 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
                     style: TextStyle(
                       fontSize: 20,
                       fontWeight: FontWeight.normal,
-                      color: MzansiInnovationHub.of(context)!
+                      color: MihColors.getSecondaryColor(
-                          .theme
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                          .secondaryColor(),
+                              "Dark"),
                     ),
                     children: [
                       TextSpan(text: "Press "),
@@ -653,9 +667,9 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
                         child: Icon(
                           Icons.menu,
                           size: 20,
-                          color: MzansiInnovationHub.of(context)!
+                          color: MihColors.getSecondaryColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .secondaryColor(),
+                                  "Dark"),
                         ),
                       ),
                       TextSpan(

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

@@ -1,9 +1,9 @@
 import 'dart:async';
-
-import 'package:mzansi_innovation_hub/main.dart';
 import 'package:flutter/material.dart';
 import 'package:mobile_scanner/mobile_scanner.dart';
+import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 
 class MihBarcodeScanner extends StatefulWidget {
   final TextEditingController cardNumberController;
@@ -105,9 +105,9 @@ class _MihBarcodeScannerState extends State<MihBarcodeScanner>
                   decoration: BoxDecoration(
                     border: Border.all(
                       width: 5,
-                      color: MzansiInnovationHub.of(context)!
+                      color: MihColors.getSecondaryColor(
-                          .theme
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                          .secondaryColor(),
+                              "Dark"),
                     ),
                   ),
                 ),
@@ -125,16 +125,17 @@ class _MihBarcodeScannerState extends State<MihBarcodeScanner>
                         _scannerController.stop();
                         Navigator.of(context).pop();
                       },
-                      buttonColor:
+                      buttonColor: MihColors.getRedColor(
-                          MzansiInnovationHub.of(context)!.theme.errorColor(),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                       width: 100,
                       height: 50,
                       child: Text(
                         "Cancel",
                         style: TextStyle(
-                          color: MzansiInnovationHub.of(context)!
+                          color: MihColors.getPrimaryColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .primaryColor(),
+                                  "Dark"),
                           fontSize: 20,
                           fontWeight: FontWeight.bold,
                         ),

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

@@ -4,6 +4,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart';
 import 'package:flutter/material.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 
 class MihWalletTile extends StatefulWidget {
   final AppUser signedInUser;
@@ -32,12 +33,15 @@ class _MihWalletTileState extends State<MihWalletTile> {
       appName: "Mzansi Wallet",
       appIcon: Icon(
         MihIcons.mzansiWallet,
-        color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+        color: MihColors.getSecondaryColor(
+            MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         // size: widget.packageSize,
       ),
       iconSize: widget.packageSize,
-      primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      primaryColor: MihColors.getSecondaryColor(
-      secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+      secondaryColor: MihColors.getPrimaryColor(
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
     );
   }
 }

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

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

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

@@ -1,6 +1,7 @@
 import 'package:flutter_speed_dial/flutter_speed_dial.dart';
 import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_banner_ad.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_mzansi_wallet_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart';
@@ -187,10 +188,10 @@ class _MihCardsState extends State<MihCards> {
                   ),
                   const SizedBox(height: 10),
                   MihTextFormField(
-                    fillColor:
+                    fillColor: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    inputColor:
+                    inputColor: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     controller: _nicknameController,
                     multiLineInput: false,
                     requiredText: false,
@@ -204,12 +205,12 @@ class _MihCardsState extends State<MihCards> {
                     children: [
                       Flexible(
                         child: MihTextFormField(
-                          fillColor: MzansiInnovationHub.of(context)!
+                          fillColor: MihColors.getSecondaryColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .secondaryColor(),
+                                  "Dark"),
-                          inputColor: MzansiInnovationHub.of(context)!
+                          inputColor: MihColors.getPrimaryColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .primaryColor(),
+                                  "Dark"),
                           controller: cardNumberController,
                           multiLineInput: false,
                           requiredText: true,
@@ -225,16 +226,16 @@ class _MihCardsState extends State<MihCards> {
                         onPressed: () {
                           openscanner();
                         },
-                        buttonColor: MzansiInnovationHub.of(context)!
+                        buttonColor: MihColors.getSecondaryColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .secondaryColor(),
+                                "Dark"),
                         width: 100,
                         child: Text(
                           "Scan",
                           style: TextStyle(
-                            color: MzansiInnovationHub.of(context)!
+                            color: MihColors.getPrimaryColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .primaryColor(),
+                                    "Dark"),
                             fontSize: 20,
                             fontWeight: FontWeight.bold,
                           ),
@@ -272,15 +273,16 @@ class _MihCardsState extends State<MihCards> {
                           MihAlertServices().formNotFilledCompletely(context);
                         }
                       },
-                      buttonColor:
+                      buttonColor: MihColors.getGreenColor(
-                          MzansiInnovationHub.of(context)!.theme.successColor(),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                       width: 300,
                       child: Text(
                         "Add",
                         style: TextStyle(
-                          color: MzansiInnovationHub.of(context)!
+                          color: MihColors.getPrimaryColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .primaryColor(),
+                                  "Dark"),
                           fontSize: 20,
                           fontWeight: FontWeight.bold,
                         ),
@@ -341,10 +343,10 @@ class _MihCardsState extends State<MihCards> {
                   hintText: "Search Cards",
                   // prefixIcon: Icons.search,
                   prefixIcon: Icons.search,
-                  fillColor:
+                  fillColor: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  hintColor:
+                  hintColor: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   onPrefixIconTap: () {
                     // print("Search Icon Pressed: ${cardSearchController.text}");
                   },
@@ -402,19 +404,19 @@ class _MihCardsState extends State<MihCards> {
                 SpeedDialChild(
                   child: Icon(
                     Icons.add,
-                    color:
+                    color: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   ),
                   label: "Add Loyalty Card",
-                  labelBackgroundColor:
+                  labelBackgroundColor: MihColors.getGreenColor(
-                      MzansiInnovationHub.of(context)!.theme.successColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   labelStyle: TextStyle(
-                    color:
+                    color: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     fontWeight: FontWeight.bold,
                   ),
-                  backgroundColor:
+                  backgroundColor: MihColors.getGreenColor(
-                      MzansiInnovationHub.of(context)!.theme.successColor(),
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   onTap: () {
                     addCardWindow(context, width);
                   },

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

@@ -1,6 +1,6 @@
 import 'dart:convert';
-
 import 'package:mzansi_innovation_hub/main.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_service_calls.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart';
@@ -218,9 +218,10 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
         windowBody: Column(
           children: [
             MihTextFormField(
-              fillColor:
+              fillColor: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+              inputColor: MihColors.getPrimaryColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               controller: idController,
               multiLineInput: false,
               requiredText: true,
@@ -232,9 +233,10 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
             ),
             const SizedBox(height: 10.0),
             MihTextFormField(
-              fillColor:
+              fillColor: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+              inputColor: MihColors.getPrimaryColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               controller: fnameController,
               multiLineInput: false,
               requiredText: true,
@@ -246,9 +248,10 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
             ),
             const SizedBox(height: 10.0),
             MihTextFormField(
-              fillColor:
+              fillColor: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+              inputColor: MihColors.getPrimaryColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               controller: lnameController,
               multiLineInput: false,
               requiredText: true,
@@ -260,9 +263,10 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
             ),
             const SizedBox(height: 10.0),
             MihTextFormField(
-              fillColor:
+              fillColor: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+              inputColor: MihColors.getPrimaryColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               controller: accessStatusController,
               multiLineInput: false,
               requiredText: true,
@@ -283,16 +287,18 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
                     "Important Notice: Requesting Patient Profile Access",
                     style: TextStyle(
                       fontWeight: FontWeight.bold,
-                      color:
+                      color: MihColors.getRedColor(
-                          MzansiInnovationHub.of(context)!.theme.errorColor(),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                     ),
                   ),
                   Text(
                     "You are about to request access to a patient's profile. Please be aware of the following important points:",
                     style: TextStyle(
                       fontWeight: FontWeight.normal,
-                      color:
+                      color: MihColors.getRedColor(
-                          MzansiInnovationHub.of(context)!.theme.errorColor(),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                     ),
                   ),
                   SizedBox(
@@ -301,8 +307,9 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
                       "1. Permanent Access: Once the patient accepts your access request, it will become permanent.",
                       style: TextStyle(
                         fontWeight: FontWeight.normal,
-                        color:
+                        color: MihColors.getRedColor(
-                            MzansiInnovationHub.of(context)!.theme.errorColor(),
+                            MzansiInnovationHub.of(context)!.theme.mode ==
+                                "Dark"),
                       ),
                     ),
                   ),
@@ -312,8 +319,9 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
                       "2. Shared Information: Any updates you make to the patient's profile will be visible to others who have access to the profile.",
                       style: TextStyle(
                         fontWeight: FontWeight.normal,
-                        color:
+                        color: MihColors.getRedColor(
-                            MzansiInnovationHub.of(context)!.theme.errorColor(),
+                            MzansiInnovationHub.of(context)!.theme.mode ==
+                                "Dark"),
                       ),
                     ),
                   ),
@@ -323,8 +331,9 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
                       "3. Irreversible Access: Once granted, you cannot revoke your access to the patient's profile.",
                       style: TextStyle(
                         fontWeight: FontWeight.normal,
-                        color:
+                        color: MihColors.getRedColor(
-                            MzansiInnovationHub.of(context)!.theme.errorColor(),
+                            MzansiInnovationHub.of(context)!.theme.mode ==
+                                "Dark"),
                       ),
                     ),
                   ),
@@ -332,8 +341,9 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
                     "By pressing the \"Request Access\" button you accept the above terms.\n",
                     style: TextStyle(
                       fontWeight: FontWeight.bold,
-                      color:
+                      color: MihColors.getRedColor(
-                          MzansiInnovationHub.of(context)!.theme.errorColor(),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                     ),
                   ),
                 ],
@@ -366,16 +376,16 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
                             noAccessWarning();
                           }
                         },
-                        buttonColor: MzansiInnovationHub.of(context)!
+                        buttonColor: MihColors.getGreenColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .successColor(),
+                                "Dark"),
                         width: 300,
                         child: Text(
                           "View Profile",
                           style: TextStyle(
-                            color: MzansiInnovationHub.of(context)!
+                            color: MihColors.getPrimaryColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .primaryColor(),
+                                    "Dark"),
                             fontSize: 20,
                             fontWeight: FontWeight.bold,
                           ),
@@ -402,16 +412,16 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
                             context,
                           );
                         },
-                        buttonColor: MzansiInnovationHub.of(context)!
+                        buttonColor: MihColors.getGreenColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .successColor(),
+                                "Dark"),
                         width: 300,
                         child: Text(
                           "Request Access",
                           style: TextStyle(
-                            color: MzansiInnovationHub.of(context)!
+                            color: MihColors.getPrimaryColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .primaryColor(),
+                                    "Dark"),
                             fontSize: 20,
                             fontWeight: FontWeight.bold,
                           ),
@@ -436,16 +446,16 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
                             context,
                           );
                         },
-                        buttonColor: MzansiInnovationHub.of(context)!
+                        buttonColor: MihColors.getGreenColor(
-                            .theme
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                            .successColor(),
+                                "Dark"),
                         width: 300,
                         child: Text(
                           "Re-apply",
                           style: TextStyle(
-                            color: MzansiInnovationHub.of(context)!
+                            color: MihColors.getPrimaryColor(
-                                .theme
+                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                .primaryColor(),
+                                    "Dark"),
                             fontSize: 20,
                             fontWeight: FontWeight.bold,
                           ),
@@ -486,7 +496,8 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
             // "$firstLetterFName$fnameStar $firstLetterLName$lnameStar",
             "${widget.patients[index].first_name} ${widget.patients[index].last_name}",
             style: TextStyle(
-              color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+              color: MihColors.getSecondaryColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             ),
           ),
           const SizedBox(
@@ -494,7 +505,8 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
           ),
           Icon(
             Icons.star_border_rounded,
-            color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+            color: MihColors.getSecondaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
           ),
         ],
       );
@@ -503,7 +515,8 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
         // "$firstLetterFName$fnameStar $firstLetterLName$lnameStar",
         "${widget.patients[index].first_name} ${widget.patients[index].last_name}",
         style: TextStyle(
-          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MihColors.getSecondaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         ),
       );
     }
@@ -520,7 +533,8 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
         subtitle: Text(
           "ID No.: $startedOutPatientIdNo\nMedical Aid No.: $medAidNoStar",
           style: TextStyle(
-            color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+            color: MihColors.getSecondaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
           ),
         ),
         onTap: () {
@@ -535,7 +549,8 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
         },
         trailing: Icon(
           Icons.arrow_forward,
-          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MihColors.getSecondaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         ),
       );
     } else {
@@ -544,7 +559,8 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
         subtitle: Text(
           "ID No.: $startedOutPatientIdNo\nMedical Aid No.: $medAidNoStar",
           style: TextStyle(
-            color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+            color: MihColors.getSecondaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
           ),
         ),
         onTap: () {
@@ -558,7 +574,8 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
         },
         trailing: Icon(
           Icons.add,
-          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MihColors.getSecondaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         ),
       );
     }
@@ -582,7 +599,8 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
       physics: const NeverScrollableScrollPhysics(),
       separatorBuilder: (BuildContext context, index) {
         return Divider(
-          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MihColors.getSecondaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         );
       },
       itemCount: widget.patients.length,

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

@@ -1,4 +1,5 @@
 import 'package:mzansi_innovation_hub/main.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_service_calls.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_mzansi_calendar_services.dart';
@@ -108,10 +109,10 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
                 formKey: _formKey,
                 formFields: [
                   MihTextFormField(
-                    fillColor:
+                    fillColor: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    inputColor:
+                    inputColor: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     controller: idController,
                     multiLineInput: false,
                     requiredText: true,
@@ -123,10 +124,10 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
                   ),
                   const SizedBox(height: 10.0),
                   MihTextFormField(
-                    fillColor:
+                    fillColor: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    inputColor:
+                    inputColor: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     controller: fnameController,
                     multiLineInput: false,
                     requiredText: true,
@@ -138,10 +139,10 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
                   ),
                   const SizedBox(height: 10.0),
                   MihTextFormField(
-                    fillColor:
+                    fillColor: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    inputColor:
+                    inputColor: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     controller: lnameController,
                     multiLineInput: false,
                     requiredText: true,
@@ -190,15 +191,16 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
                           MihAlertServices().formNotFilledCompletely(context);
                         }
                       },
-                      buttonColor:
+                      buttonColor: MihColors.getGreenColor(
-                          MzansiInnovationHub.of(context)!.theme.successColor(),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                       width: 300,
                       child: Text(
                         "Book Appointment",
                         style: TextStyle(
-                          color: MzansiInnovationHub.of(context)!
+                          color: MihColors.getPrimaryColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .primaryColor(),
+                                  "Dark"),
                           fontSize: 20,
                           fontWeight: FontWeight.bold,
                         ),
@@ -269,10 +271,10 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
           child: Column(
             children: [
               MihTextFormField(
-                fillColor:
+                fillColor: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                inputColor:
+                inputColor: MihColors.getPrimaryColor(
-                    MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 controller: idController,
                 multiLineInput: false,
                 requiredText: true,
@@ -284,10 +286,10 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
               ),
               const SizedBox(height: 10.0),
               MihTextFormField(
-                fillColor:
+                fillColor: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                inputColor:
+                inputColor: MihColors.getPrimaryColor(
-                    MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 controller: fnameController,
                 multiLineInput: false,
                 requiredText: true,
@@ -299,10 +301,10 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
               ),
               const SizedBox(height: 10.0),
               MihTextFormField(
-                fillColor:
+                fillColor: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                inputColor:
+                inputColor: MihColors.getPrimaryColor(
-                    MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                 controller: lnameController,
                 multiLineInput: false,
                 requiredText: true,
@@ -322,15 +324,16 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
                       onPressed: () {
                         appointmentPopUp(index, width);
                       },
-                      buttonColor:
+                      buttonColor: MihColors.getGreenColor(
-                          MzansiInnovationHub.of(context)!.theme.successColor(),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                       width: 300,
                       child: Text(
                         "Book Appointment",
                         style: TextStyle(
-                          color: MzansiInnovationHub.of(context)!
+                          color: MihColors.getPrimaryColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .primaryColor(),
+                                  "Dark"),
                           fontSize: 20,
                           fontWeight: FontWeight.bold,
                         ),
@@ -348,16 +351,16 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
                                   "business",
                                 ));
                       },
-                      buttonColor: MzansiInnovationHub.of(context)!
+                      buttonColor: MihColors.getSecondaryColor(
-                          .theme
+                          MzansiInnovationHub.of(context)!.theme.mode ==
-                          .secondaryColor(),
+                              "Dark"),
                       width: 300,
                       child: Text(
                         "View Medical Records",
                         style: TextStyle(
-                          color: MzansiInnovationHub.of(context)!
+                          color: MihColors.getPrimaryColor(
-                              .theme
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                              .primaryColor(),
+                                  "Dark"),
                           fontSize: 20,
                           fontWeight: FontWeight.bold,
                         ),
@@ -387,29 +390,32 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
       accessWithColour = TextSpan(
           text: "$access\n",
           style: TextStyle(
-              color: MzansiInnovationHub.of(context)!.theme.successColor()));
+              color: MihColors.getGreenColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark")));
     } else if (access == "PENDING") {
       firstName = "${widget.patientAccesses[index].fname[0]}********";
       lastName = "${widget.patientAccesses[index].lname[0]}********";
       accessWithColour = TextSpan(
           text: "$access\n",
           style: TextStyle(
-              color:
+              color: MihColors.getGreyColor(
-                  MzansiInnovationHub.of(context)!.theme.messageTextColor()));
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark")));
     } else {
       firstName = "${widget.patientAccesses[index].fname[0]}********";
       lastName = "${widget.patientAccesses[index].lname[0]}********";
       accessWithColour = TextSpan(
           text: "$access\n",
           style: TextStyle(
-              color: MzansiInnovationHub.of(context)!.theme.errorColor()));
+              color: MihColors.getRedColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark")));
     }
 
     return ListTile(
       title: Text(
         "$firstName $lastName",
         style: TextStyle(
-          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MihColors.getSecondaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         ),
       ),
       subtitle: RichText(
@@ -438,7 +444,8 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
       },
       trailing: Icon(
         Icons.arrow_forward,
-        color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+        color: MihColors.getSecondaryColor(
+            MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
       ),
     );
   }
@@ -461,7 +468,8 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
       physics: const NeverScrollableScrollPhysics(),
       separatorBuilder: (BuildContext context, index) {
         return Divider(
-          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MihColors.getSecondaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         );
       },
       itemCount: widget.patientAccesses.length,

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

@@ -3,6 +3,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart';
 import 'package:flutter/material.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 
 class PatManagerTile extends StatefulWidget {
   final PatManagerArguments arguments;
@@ -30,12 +31,15 @@ class _PatManagerTileState extends State<PatManagerTile> {
       appName: "Patient Manager",
       appIcon: Icon(
         MihIcons.patientManager,
-        color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+        color: MihColors.getSecondaryColor(
+            MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
         // size: widget.packageSize,
       ),
       iconSize: widget.packageSize,
-      primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      primaryColor: MihColors.getSecondaryColor(
-      secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+      secondaryColor: MihColors.getPrimaryColor(
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
     );
   }
 }

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

@@ -1,5 +1,6 @@
 import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_service_calls.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart';
@@ -50,8 +51,10 @@ class _MihPatientSearchState extends State<MihPatientSearch> {
             controller: _mihPatientSearchController,
             hintText: "Search Patient ID/ Aid No.",
             prefixIcon: Icons.search,
-            fillColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+            fillColor: MihColors.getSecondaryColor(
-            hintColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+            hintColor: MihColors.getPrimaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             onPrefixIconTap: () {
               submitPatientSearch();
             },
@@ -92,8 +95,9 @@ class _MihPatientSearchState extends State<MihPatientSearch> {
                   "Error pulling Patients Data\n$baseUrl/patients/search/$_mihPatientSearchString",
                   style: TextStyle(
                       fontSize: 25,
-                      color:
+                      color: MihColors.getRedColor(
-                          MzansiInnovationHub.of(context)!.theme.errorColor()),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark")),
                   textAlign: TextAlign.center,
                 ),
               );
@@ -133,7 +137,8 @@ class _MihPatientSearchState extends State<MihPatientSearch> {
           Icon(
             MihIcons.iDontKnow,
             size: 165,
-            color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+            color: MihColors.getSecondaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
           ),
           const SizedBox(height: 10),
           Text(
@@ -143,7 +148,8 @@ class _MihPatientSearchState extends State<MihPatientSearch> {
             style: TextStyle(
               fontSize: 25,
               fontWeight: FontWeight.bold,
-              color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+              color: MihColors.getSecondaryColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             ),
           ),
         ],
@@ -159,7 +165,8 @@ class _MihPatientSearchState extends State<MihPatientSearch> {
             Icon(
               MihIcons.patientProfile,
               size: 165,
-              color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+              color: MihColors.getSecondaryColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             ),
             const SizedBox(height: 10),
             Text(
@@ -169,7 +176,8 @@ class _MihPatientSearchState extends State<MihPatientSearch> {
               style: TextStyle(
                 fontSize: 25,
                 fontWeight: FontWeight.bold,
-                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MihColors.getSecondaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               ),
             ),
             const SizedBox(height: 25),
@@ -180,8 +188,8 @@ class _MihPatientSearchState extends State<MihPatientSearch> {
                   style: TextStyle(
                     fontSize: 20,
                     fontWeight: FontWeight.normal,
-                    color:
+                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                   ),
                   children: [
                     TextSpan(
@@ -213,7 +221,7 @@ class _MihPatientSearchState extends State<MihPatientSearch> {
       //       style: TextStyle(
       //           fontSize: 25,
       //           color:
-      //               MzansiInnovationHub.of(context)!.theme.messageTextColor()),
+      //               MihColors.getGreyColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark")),
       //       textAlign: TextAlign.center,
       //     ),
       //   ),