diff --git a/android/app/src/main/res/layout/layout.xml b/android/app/src/main/res/layout/layout.xml
index 2cb088e..7f109ae 100644
--- a/android/app/src/main/res/layout/layout.xml
+++ b/android/app/src/main/res/layout/layout.xml
@@ -2,7 +2,6 @@
 
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:card_view="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     tools:ignore="DuplicateIds,HardcodedText">
 
@@ -14,7 +13,6 @@
     <!-- Generated with detail form template named "Simple Header Detail" -->
 
     <androidx.core.widget.NestedScrollView
-        style="@style/Theme.QMobileApp.Custom.Background.Alt4"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:fillViewport="true">
@@ -30,12 +28,11 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
-                <androidx.cardview.widget.CardView
-                    style="@style/Theme.QMobileApp.Card.Background.Alt3"
+                <com.google.android.material.card.MaterialCardView
+                    style="?attr/materialCardViewElevatedStyle"
                     android:layout_width="0dp"
-                    android:layout_height="280dp"
+                    android:layout_height="wrap_content"
                     android:layout_marginBottom="12dp"
-                    app:cardElevation="4dp"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
@@ -44,9 +41,7 @@
                     <LinearLayout
                         android:id="@+id/headerview"
                         android:layout_width="match_parent"
-                        android:layout_height="280dp"
-                        android:layout_marginBottom="16dp"
-                        android:elevation="4dp"
+                        android:layout_height="wrap_content"
                         android:orientation="vertical">
 
                         <View
@@ -61,11 +56,10 @@
                             android:layout_marginStart="8dp"
                             android:layout_marginTop="20dp"
                             android:layout_marginEnd="8dp"
-                            android:elevation="4dp"
                             android:scrollbars="none"
                             android:text="___TEXT_1___"
                             android:textAlignment="center"
-                            android:textAppearance="@style/TextAppearance.MaterialComponents.Headline5"
+                            android:textAppearance="@style/TextAppearance.Material3.HeadlineSmall"
                             android:textColor="?colorOnSurface"
                             android:textStyle="bold"
                             app:layout_constraintEnd_toEndOf="parent"
@@ -79,10 +73,9 @@
                             android:layout_marginStart="8dp"
                             android:layout_marginTop="20dp"
                             android:layout_marginEnd="8dp"
-                            android:elevation="4dp"
                             android:scrollbars="none"
                             android:text="___FIELD_LABEL_2___"
-                            android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
+                            android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
                             android:textColor="?colorPrimary"
                             android:textStyle="bold"
                             app:layout_constraintEnd_toEndOf="parent"
@@ -98,11 +91,10 @@
                             android:layout_marginTop="8dp"
                             android:layout_marginEnd="8dp"
                             android:layout_marginBottom="8dp"
-                            android:elevation="4dp"
                             android:paddingBottom="16dp"
                             android:scrollbars="none"
                             android:text="___TEXT_2___"
-                            android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
+                            android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
                             android:textColor="?colorOnSurface"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintStart_toStartOf="parent"
@@ -115,10 +107,9 @@
                             android:layout_marginStart="8dp"
                             android:layout_marginTop="10dp"
                             android:layout_marginEnd="8dp"
-                            android:elevation="4dp"
                             android:scrollbars="none"
                             android:text="___FIELD_LABEL_3___"
-                            android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
+                            android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
                             android:textColor="?colorPrimary"
                             android:textStyle="bold"
                             app:layout_constraintEnd_toEndOf="parent"
@@ -133,12 +124,10 @@
                             android:layout_marginStart="8dp"
                             android:layout_marginTop="8dp"
                             android:layout_marginEnd="8dp"
-                            android:layout_marginBottom="8dp"
-                            android:elevation="4dp"
-                            android:paddingBottom="16dp"
+                            android:layout_marginBottom="20dp"
                             android:scrollbars="none"
                             android:text="___TEXT_3___"
-                            android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
+                            android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
                             android:textColor="?colorOnSurface"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintStart_toStartOf="parent"
@@ -147,7 +136,7 @@
 
                     </LinearLayout>
 
-                </androidx.cardview.widget.CardView>
+                </com.google.android.material.card.MaterialCardView>
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -155,12 +144,12 @@
                  TEMPLATE IN THE PROJECT EDITOR -->
 
             <!--FOR_EACH_FIELD-->
-            <androidx.cardview.widget.CardView
-                style="@style/Theme.QMobileApp.Card.Background.Alt3"
+            <com.google.android.material.card.MaterialCardView
+                style="?attr/materialCardViewElevatedStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:layout_marginVertical="10dp">
+                android:layout_marginVertical="6dp">
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
@@ -177,7 +166,7 @@
                         android:layout_marginEnd="8dp"
                         android:layout_marginBottom="8dp"
                         android:text="___BUTTON___"
-                        android:textAppearance="@style/TextAppearance.MaterialComponents.Button"
+                        android:textAppearance="@style/TextAppearance.Material3.LabelLarge"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
@@ -196,7 +185,7 @@
                         android:layout_marginEnd="12dp"
                         android:scrollbars="none"
                         android:text="___FIELD_LABEL___"
-                        android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
+                        android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
                         android:textColor="?colorOnSurface"
                         android:textStyle="bold"
                         app:layout_constraintBottom_toTopOf="@+id/___VALUE_ID___"
@@ -232,8 +221,7 @@
                         android:scrollbars="none"
                         android:text="___TEXT___"
                         android:textAlignment="textStart"
-                        android:textAllCaps="false"
-                        android:textAppearance="@style/TextAppearance.MaterialComponents.Body2"
+                        android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
                         android:textColor="?colorOnSurface"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
@@ -246,7 +234,7 @@
 
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
-            </androidx.cardview.widget.CardView>
+            </com.google.android.material.card.MaterialCardView>
 
             <!--END_FOR_EACH_FIELD-->
         </LinearLayout>