diff --git a/.github/workflows/angular-deploy.yml b/.github/workflows/angular-deploy.yml
new file mode 100644
index 00000000..7dded6f8
--- /dev/null
+++ b/.github/workflows/angular-deploy.yml
@@ -0,0 +1,47 @@
+name: Deploy Angular Project to Firebase Hosting
+
+on:
+  push:
+    branches:
+      - deployment/frontend
+
+jobs:
+  build-and-deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v2
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: "18"
+
+      - name: Install Firebase CLI
+        run:  npm install -g firebase-tools@13.0.2
+
+      - name: Install Dependencies
+        run: npm install --legacy-peer-deps
+        working-directory: ./frontend
+
+      - name: Build Angular Project
+        run: npm run build_prod
+        working-directory: ./frontend
+
+      - name: Enable to Firebase webframeworks
+        run: firebase experiments:enable webframeworks
+        working-directory: ./frontend
+
+      - name: Setup Google Cloud Credentials
+        env:
+            SERVICE_ACCOUNT_KEY: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
+        run: |
+            echo "$SERVICE_ACCOUNT_KEY" > ./gcloud-service-key.json
+            echo "GOOGLE_APPLICATION_CREDENTIALS=${PWD}/gcloud-service-key.json" >> $GITHUB_ENV
+
+      - name: Deploy to Firebase Hosting
+        run: firebase deploy --only hosting
+        # env:
+        #     FIREBASE_TOKEN: ${{ secrets.FIREBASE_TOKEN }}  # Optional if we use service account, should be deleted later on
+        working-directory: ./frontend
diff --git a/.github/workflows/firebase-hosting-merge.2yml b/.github/workflows/firebase-hosting-merge.2yml
new file mode 100644
index 00000000..0a567e84
--- /dev/null
+++ b/.github/workflows/firebase-hosting-merge.2yml
@@ -0,0 +1,20 @@
+# # This file was auto-generated by the Firebase CLI
+# # https://github.com/firebase/firebase-tools
+
+# name: Deploy to Firebase Hosting on merge
+# 'on':
+#   push:
+#     branches:
+#       - deployment/prod
+# jobs:
+#   build_and_deploy:
+#     runs-on: ubuntu-latest
+#     steps:
+#       - uses: actions/checkout@v3
+#       - run: npm ci && npm run build
+#       - uses: FirebaseExtended/action-hosting-deploy@v0
+#         with:
+#           repoToken: '${{ secrets.GITHUB_TOKEN }}'
+#           firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_KAWTHARUNA_PROD }}'
+#           channelId: live
+#           projectId: kawtharuna-prod
diff --git a/.github/workflows/firebase-hosting-pull-request.2yml b/.github/workflows/firebase-hosting-pull-request.2yml
new file mode 100644
index 00000000..ad96703a
--- /dev/null
+++ b/.github/workflows/firebase-hosting-pull-request.2yml
@@ -0,0 +1,17 @@
+# # This file was auto-generated by the Firebase CLI
+# # https://github.com/firebase/firebase-tools
+
+# name: Deploy to Firebase Hosting on PR
+# 'on': pull_request
+# jobs:
+#   build_and_preview:
+#     if: '${{ github.event.pull_request.head.repo.full_name == github.repository }}'
+#     runs-on: ubuntu-latest
+#     steps:
+#       - uses: actions/checkout@v3
+#       - run: npm ci && npm run build
+#       - uses: FirebaseExtended/action-hosting-deploy@v0
+#         with:
+#           repoToken: '${{ secrets.GITHUB_TOKEN }}'
+#           firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_KAWTHARUNA_PROD }}'
+#           projectId: kawtharuna-prod
diff --git a/frontend/.gitignore b/frontend/.gitignore
index 0711527e..72660892 100644
--- a/frontend/.gitignore
+++ b/frontend/.gitignore
@@ -36,6 +36,7 @@ yarn-error.log
 /libpeerconnection.log
 testem.log
 /typings
+.keys/
 
 # System files
 .DS_Store
diff --git a/mobile/lib/src/modules/app_widget.dart b/mobile/lib/src/modules/app_widget.dart
index aeaaef7a..c9eb0468 100644
--- a/mobile/lib/src/modules/app_widget.dart
+++ b/mobile/lib/src/modules/app_widget.dart
@@ -93,9 +93,11 @@ class MyApp extends StatelessWidget {
                   return MaterialApp.router(
                     title: envVariables.appName,
                     debugShowCheckedModeBanner: false,
-                    theme: appTheme.isDarkMode
-                        ? appTheme.getDarkTheme
-                        : appTheme.getLightTheme,
+                    theme:
+                        // appTheme.isDarkMode
+                        //     ? appTheme.getDarkTheme
+                        //     :
+                        appTheme.getLightTheme,
                     // scaffoldMessengerKey: scaffoldMessengerKey,
                     locale: appLanguage.appLocal,
                     supportedLocales: Translations.delegate.supportedLocales,