diff --git a/mifospay/build.gradle b/mifospay/build.gradle
index 3a1e4b874..5843b1ed7 100644
--- a/mifospay/build.gradle
+++ b/mifospay/build.gradle
@@ -29,6 +29,7 @@ android {
     }
 
     lintOptions {
+        abortOnError false
         disable 'InvalidPackage'
     }
 
@@ -99,8 +100,8 @@ dependencies {
 
     implementation project(':core')
 
-    implementation 'com.github.rahul-gill.mifos-ui-library:uihouse:alpha-test'
-    lintChecks 'com.github.rahul-gill.mifos-ui-library:lint:alpha-test'
+    implementation 'com.github.rahul-gill.mifos-ui-library:uihouse:alpha-2.1'
+    lintChecks 'com.github.rahul-gill.mifos-ui-library:lint:alpha-2.1'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/mifospay/src/main/res/layout/activity_bank_account_detail.xml b/mifospay/src/main/res/layout/activity_bank_account_detail.xml
index a42d8028c..3df9f79c1 100644
--- a/mifospay/src/main/res/layout/activity_bank_account_detail.xml
+++ b/mifospay/src/main/res/layout/activity_bank_account_detail.xml
@@ -114,7 +114,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/Mifos.DesignSystem.Spacing.screenHorizontalMargin"
-                style="@style/Widget.Material3.Button.OutlinedButton"
+                style="@style/Mifos.DesignSystem.Components.Button.Outline"
                 android:text="@string/setup_upi"
                 android:visibility="visible"/>
 
@@ -123,7 +123,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsMedium"
-                style="@style/Widget.Material3.Button.OutlinedButton"
+                style="@style/Mifos.DesignSystem.Components.Button.Outline"
                 android:text="@string/delete_bank"
                 android:visibility="visible"/>
 
@@ -131,12 +131,9 @@
 
 
         <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
+            style="@style/Mifos.DesignSystem.Components.HorizontalSpacer"
             android:layout_marginVertical="@dimen/Mifos.DesignSystem.Spacing.marginBetweenSectionsHalf"
-            android:layout_marginHorizontal="@dimen/Mifos.DesignSystem.Spacing.screenHorizontalMargin"
-            android:background="?attr/colorOnBackground"
-            android:alpha="@dimen/alpha_least_emphasis"/>
+            android:layout_marginHorizontal="@dimen/Mifos.DesignSystem.Spacing.screenHorizontalMargin"/>
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -149,13 +146,13 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 app:contentPadding="@dimen/Mifos.DesignSystem.Spacing.CardInnerPaddingLarger"
-                style="@style/Widget.Material3.CardView.Filled">
+                style="@style/Mifos.DesignSystem.Components.Cards.Filled">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/change_upi_pin"
-                    style="@style/TextAppearance.Material3.TitleMedium"/>
+                    style="@style/Mifos.DesignSystem.TextStyle.CardTitle"/>
 
                 <ImageView
                     android:layout_width="@dimen/Mifos.DesignSystem.Size.SmallIcon"
@@ -170,14 +167,14 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsMedium"
-                style="@style/Widget.Material3.CardView.Filled"
+                style="@style/Mifos.DesignSystem.Components.Cards.Filled"
                 app:contentPadding="@dimen/Mifos.DesignSystem.Spacing.CardInnerPaddingLarger">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/forgot_upi_pin"
-                    style="@style/TextAppearance.Material3.TitleMedium"/>
+                    style="@style/Mifos.DesignSystem.TextStyle.CardTitle"/>
 
                 <ImageView
                     android:layout_width="@dimen/Mifos.DesignSystem.Size.SmallIcon"
diff --git a/mifospay/src/main/res/layout/activity_edit_password.xml b/mifospay/src/main/res/layout/activity_edit_password.xml
index 6437e9d0e..d8b11ff49 100644
--- a/mifospay/src/main/res/layout/activity_edit_password.xml
+++ b/mifospay/src/main/res/layout/activity_edit_password.xml
@@ -38,7 +38,6 @@
             android:layout_marginHorizontal="@dimen/Mifos.DesignSystem.Spacing.screenHorizontalMargin"
             android:paddingVertical="@dimen/Mifos.DesignSystem.Spacing.screenVerticalMargin">
             <com.google.android.material.textfield.TextInputLayout
-                style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
                 android:id="@+id/til_edit_password_current"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -94,7 +93,7 @@
                 android:layout_height="wrap_content">
 
                 <Button
-                    style="@style/Widget.Material3.Button.OutlinedButton"
+                    style="@style/Mifos.DesignSystem.Components.Button.Outline"
                     android:id="@+id/btn_cancel"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
diff --git a/mifospay/src/main/res/layout/activity_invoice.xml b/mifospay/src/main/res/layout/activity_invoice.xml
index 2bdad5d8b..36b52ef04 100644
--- a/mifospay/src/main/res/layout/activity_invoice.xml
+++ b/mifospay/src/main/res/layout/activity_invoice.xml
@@ -41,13 +41,12 @@
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    style="@style/TextAppearance.Material3.LabelLarge"
+                    style="@style/Mifos.DesignSystem.TextStyle.BodyLarger"
                     android:text="@string/invoice_details" />
 
                 <TextView
                     android:id="@+id/tv_merchantId"
                     android:layout_width="match_parent"
-                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsMedium"/>
 
@@ -55,21 +54,18 @@
                     android:id="@+id/tv_consumerId"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsSmall"/>
 
                 <TextView
                     android:id="@+id/tv_amount"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsSmall"/>
 
                 <TextView
                     android:id="@+id/tv_itemsBought"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsSmall"
                     android:text="@string/items_bought"/>
 
@@ -77,7 +73,6 @@
                     android:id="@+id/tv_status"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsSmall"
                     android:text="@string/status"/>
 
@@ -95,7 +90,6 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsSmall"
-                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:text="@string/date"/>
 
             </LinearLayout>
@@ -108,8 +102,7 @@
                 android:layout_height="wrap_content"
                 android:gravity="center_horizontal"
                 android:layout_marginVertical="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsSmall"
-                android:text="@string/payment_options_will_be_fetched_from_upi"
-                style="@style/TextAppearance.Material3.LabelLarge"/>
+                android:text="@string/payment_options_will_be_fetched_from_upi" />
 
 
             <View
@@ -121,7 +114,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/unique_payment_link"
                 android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsSmall"
-                style="@style/TextAppearance.Material3.LabelLarge"/>
+                style="@style/Mifos.DesignSystem.TextStyle.BodyLarger"/>
 
             <TextView
                 android:id="@+id/tv_paymentLink"
@@ -150,8 +143,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/unique_receipt_link"
-                    style="@style/TextAppearance.Material3.LabelLarge"/>
+                    android:text="@string/unique_receipt_link"/>
 
                 <TextView
                     android:id="@+id/tv_receiptLink"
diff --git a/mifospay/src/main/res/layout/activity_link_bank_account.xml b/mifospay/src/main/res/layout/activity_link_bank_account.xml
index 5f26e884b..648fa2358 100644
--- a/mifospay/src/main/res/layout/activity_link_bank_account.xml
+++ b/mifospay/src/main/res/layout/activity_link_bank_account.xml
@@ -53,7 +53,7 @@
             android:layout_marginHorizontal="@dimen/Mifos.DesignSystem.Spacing.screenHorizontalMargin">
 
             <TextView
-                style="@style/TextAppearance.Material3.LabelLarge"
+                style="@style/Mifos.DesignSystem.TextStyle.BodyLarger"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:id="@+id/popular_banks"
@@ -75,7 +75,7 @@
                 android:text="@string/no_bank_account"
                 android:padding="@dimen/Mifos.DesignSystem.Spacing.CardInnerPadding"
                 android:gravity="center"
-                style="@style/TextAppearance.Material3.LabelSmall"
+                style="@style/Mifos.DesignSystem.TextStyle.Label"
                 android:visibility="gone"/>
 
             <TextView
@@ -84,7 +84,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsLarge"
                 android:layout_marginBottom="@dimen/Mifos.DesignSystem.Spacing.listHeaderSpacing"
-                style="@style/TextAppearance.Material3.LabelLarge"
+                style="@style/Mifos.DesignSystem.TextStyle.BodyLarger"
                 android:text="@string/other_banks"/>
 
             <androidx.recyclerview.widget.RecyclerView
diff --git a/mifospay/src/main/res/layout/activity_login.xml b/mifospay/src/main/res/layout/activity_login.xml
index c9419a5f9..436657c5a 100644
--- a/mifospay/src/main/res/layout/activity_login.xml
+++ b/mifospay/src/main/res/layout/activity_login.xml
@@ -98,7 +98,7 @@
                 android:layout_marginStart="0dp"
                 android:layout_width="wrap_content"
                 android:text="@string/don_t_have_an_account"
-                android:alpha="@dimen/alpha_low_emphasis"/>
+                style="@style/Mifos.DesignSystem.TextStyle.Label"/>
 
             <TextView
                 android:id="@+id/tv_create_account"
diff --git a/mifospay/src/main/res/layout/activity_merchant_transaction.xml b/mifospay/src/main/res/layout/activity_merchant_transaction.xml
index 86e79bd6a..dff2f00cc 100644
--- a/mifospay/src/main/res/layout/activity_merchant_transaction.xml
+++ b/mifospay/src/main/res/layout/activity_merchant_transaction.xml
@@ -87,7 +87,7 @@
                 android:layout_gravity="center"
                 android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsSmall"
                 android:text="@string/test_user"
-                style="@style/TextAppearance.Material3.TitleLarge" />
+                style="@style/Mifos.DesignSystem.TextStyle.Heading" />
 
             <TextView
                 android:id="@+id/tv_pay_to_vpa"
@@ -96,8 +96,7 @@
                 android:layout_gravity="center"
                 android:layout_marginTop="@dimen/marginItemsInSectionSmall"
                 android:text="@string/test_vpa"
-                style="@style/TextAppearance.Material3.TitleLarge"
-                android:alpha="@dimen/alpha_low_emphasis"/>
+                style="@style/Mifos.DesignSystem.TextStyle.SubHeading"/>
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/et_amount"
diff --git a/mifospay/src/main/res/layout/activity_mobile_verification.xml b/mifospay/src/main/res/layout/activity_mobile_verification.xml
index ad4ef82cf..80843d80d 100644
--- a/mifospay/src/main/res/layout/activity_mobile_verification.xml
+++ b/mifospay/src/main/res/layout/activity_mobile_verification.xml
@@ -47,7 +47,7 @@
                     android:focusable="true"
                     android:focusableInTouchMode="true"
                     android:text="@string/enter_mobile_number"
-                    style="@style/TextAppearance.Material3.TitleLarge">
+                    style="@style/Mifos.DesignSystem.TextStyle.Heading">
 
                 </TextView>
 
@@ -56,8 +56,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="@dimen/value_10dp"
                     android:layout_marginTop="@dimen/value_5dp"
-                    android:text="@string/enter_mobile_number_description"
-                    style="@style/TextAppearance.Material3.BodyMedium"/>
+                    android:text="@string/enter_mobile_number_description" />
 
             </LinearLayout>
 
diff --git a/mifospay/src/main/res/layout/activity_new_si.xml b/mifospay/src/main/res/layout/activity_new_si.xml
index c96aa23f2..ecc96739f 100644
--- a/mifospay/src/main/res/layout/activity_new_si.xml
+++ b/mifospay/src/main/res/layout/activity_new_si.xml
@@ -95,7 +95,7 @@
                     android:layout_height="wrap_content"
                     android:text="@string/valid_till"
                     android:layout_marginBottom="@dimen/marginItemsInSectionSmall"
-                    style="@style/TextAppearance.Material3.BodyLarge"
+                    style="@style/Mifos.DesignSystem.TextStyle.BodyLarger"
                     android:layout_gravity="center" />
                 <Button
                     android:id="@+id/btn_valid_till"
@@ -126,35 +126,32 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/sending_to"
-                    style="@style/Mifos.DesignSystem.TextStyle.PrimaryColorBody"/>
+                    style="@style/Mifos.DesignSystem.TextStyle.Label"/>
 
                 <TextView
                     android:id="@+id/tv_client_name"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    style="@style/TextAppearance.Material3.TitleLarge"
                     android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsSmall"/>
 
                 <TextView
                     android:id="@+id/tv_client_vpa"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsSmall"
-                    style="@style/TextAppearance.Material3.TitleMedium"/>
+                    android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsSmall"/>
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsLarge"
                     android:text="@string/amount"
-                    style="@style/Mifos.DesignSystem.TextStyle.PrimaryColorBody"/>
+                    style="@style/Mifos.DesignSystem.TextStyle.Label"/>
 
                 <TextView
                     android:id="@+id/tv_amount"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsSmall"
-                    style="@style/TextAppearance.Material3.TitleLarge"/>
+                    android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsSmall"/>
 
                 <LinearLayout
                     android:id="@+id/ll_confirm_cancel"
@@ -169,7 +166,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/cancel"
-                        style="@style/Widget.Material3.Button.OutlinedButton"/>
+                        style="@style/Mifos.DesignSystem.Components.Button.Outline"/>
 
                     <Button
                         android:id="@+id/btn_confirm"
diff --git a/mifospay/src/main/res/layout/activity_notification.xml b/mifospay/src/main/res/layout/activity_notification.xml
index 880405568..ae6ed367b 100644
--- a/mifospay/src/main/res/layout/activity_notification.xml
+++ b/mifospay/src/main/res/layout/activity_notification.xml
@@ -44,8 +44,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:text="@string/no_notification_found"
-        style="@style/TextAppearance.Material3.BodyLarge"
-        android:alpha="@dimen/alpha_low_emphasis"
+        style="@style/Mifos.DesignSystem.TextStyle.Label"
         android:visibility="gone"/>
 
 
diff --git a/mifospay/src/main/res/layout/activity_receipt.xml b/mifospay/src/main/res/layout/activity_receipt.xml
index d925e6f72..6c47ed479 100644
--- a/mifospay/src/main/res/layout/activity_receipt.xml
+++ b/mifospay/src/main/res/layout/activity_receipt.xml
@@ -48,7 +48,7 @@
                 android:id="@+id/tv_amount"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                style="@style/TextAppearance.Material3.DisplaySmall"/>
+                style="@style/Mifos.DesignSystem.TextStyle.Heading"/>
 
             <TextView
                 android:id="@+id/tv_operation"
@@ -62,7 +62,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsSmall"
                 android:gravity="center"
-                style="@style/TextAppearance.Material3.TitleLarge"
+                style="@style/Mifos.DesignSystem.TextStyle.BodyLarger"
                 android:layout_gravity="center"/>
 
             <LinearLayout
@@ -73,72 +73,60 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    style="@style/TextAppearance.Material3.BodyMedium"
-                    android:alpha="@dimen/alpha_low_emphasis"
+                    style="@style/Mifos.DesignSystem.TextStyle.Label"
                     android:text="@string/transaction_id"/>
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:id="@+id/tv_transaction_ID"
-                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_marginBottom="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsMedium" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:alpha="@dimen/alpha_low_emphasis"
-                    style="@style/TextAppearance.Material3.BodyMedium"
+                    style="@style/Mifos.DesignSystem.TextStyle.Label"
                     android:text="@string/transaction_date"/>
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:id="@+id/tv_transaction_date"
-                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_marginBottom="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsMedium" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:alpha="@dimen/alpha_low_emphasis"
-                    style="@style/TextAppearance.Material3.BodyMedium"
+                    style="@style/Mifos.DesignSystem.TextStyle.Label"
                     android:text="@string/to"/>
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:id="@+id/tv_transaction_to_name"
-                    style="@style/TextAppearance.Material3.BodyMedium" />
+                    android:id="@+id/tv_transaction_to_name" />
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:id="@+id/tv_transaction_to_number"
-                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_marginBottom="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsMedium" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:alpha="@dimen/alpha_low_emphasis"
-                    style="@style/TextAppearance.Material3.BodyMedium"
+                    style="@style/Mifos.DesignSystem.TextStyle.Label"
                     android:text="@string/from"/>
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:id="@+id/tv_transaction_from_name"
-                    style="@style/TextAppearance.Material3.BodyMedium" />
+                    android:id="@+id/tv_transaction_from_name" />
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:id="@+id/tv_transaction_from_number"
-
-                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_marginBottom="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsMedium" />
 
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:alpha="@dimen/alpha_low_emphasis"
-                    style="@style/TextAppearance.Material3.BodyMedium"
+                    style="@style/Mifos.DesignSystem.TextStyle.Label"
                     android:text="@string/unique_receipt_link"/>
 
                 <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/mifospay/src/main/res/layout/activity_settings.xml b/mifospay/src/main/res/layout/activity_settings.xml
index 3df4c1ded..344f8e6ce 100644
--- a/mifospay/src/main/res/layout/activity_settings.xml
+++ b/mifospay/src/main/res/layout/activity_settings.xml
@@ -34,14 +34,14 @@
             android:id="@+id/cv_notification_setting"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            style="@style/Widget.Material3.CardView.Filled">
+            style="@style/Mifos.DesignSystem.Components.Cards.Filled">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_margin="@dimen/Mifos.DesignSystem.Spacing.CardInnerPaddingLarger"
                 android:text="@string/notification_settings"
-                style="@style/TextAppearance.Material3.TitleMedium"/>
+                style="@style/Mifos.DesignSystem.TextStyle.CardTitle"/>
 
         </com.google.android.material.card.MaterialCardView>
 
@@ -50,14 +50,14 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsLarge"
-            style="@style/Widget.Material3.CardView.Filled">
+            style="@style/Mifos.DesignSystem.Components.Cards.Filled">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_margin="@dimen/Mifos.DesignSystem.Spacing.CardInnerPaddingLarger"
                 android:text="@string/application_theme"
-                style="@style/TextAppearance.Material3.TitleMedium"/>
+                style="@style/Mifos.DesignSystem.TextStyle.CardTitle"/>
 
         </com.google.android.material.card.MaterialCardView>
 
diff --git a/mifospay/src/main/res/layout/activity_setup_upi_pin.xml b/mifospay/src/main/res/layout/activity_setup_upi_pin.xml
index 67f5b36f8..d1015072a 100644
--- a/mifospay/src/main/res/layout/activity_setup_upi_pin.xml
+++ b/mifospay/src/main/res/layout/activity_setup_upi_pin.xml
@@ -32,7 +32,7 @@
             android:id="@+id/cv_debit_card"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            style="@style/Widget.Material3.CardView.Filled"
+            style="@style/Mifos.DesignSystem.Components.Cards.Filled"
             app:contentPadding="@dimen/Mifos.DesignSystem.Spacing.CardInnerPaddingLarger">
 
             <LinearLayout
@@ -48,7 +48,7 @@
                         android:layout_height="wrap_content"
                         android:layout_width="wrap_content"
                         android:text="@string/debit_card_details"
-                        style="@style/TextAppearance.Material3.BodyLarge"/>
+                        style="@style/Mifos.DesignSystem.TextStyle.CardTitle"/>
 
                     <TextView
                         android:id="@+id/tv_debit_card"
@@ -75,7 +75,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsLarge"
-            style="@style/Widget.Material3.CardView.Filled"
+            style="@style/Mifos.DesignSystem.Components.Cards.Filled"
             app:contentPadding="@dimen/Mifos.DesignSystem.Spacing.CardInnerPaddingLarger">
 
             <LinearLayout
@@ -90,7 +90,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/one_time_password"
-                        style="@style/TextAppearance.Material3.BodyLarge"/>
+                        style="@style/Mifos.DesignSystem.TextStyle.CardTitle"/>
 
                     <TextView
                         android:id="@+id/tv_otp"
@@ -118,7 +118,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsLarge"
-            style="@style/Widget.Material3.CardView.Filled"
+            style="@style/Mifos.DesignSystem.Components.Cards.Filled"
             app:contentPadding="@dimen/Mifos.DesignSystem.Spacing.CardInnerPaddingLarger">
 
             <LinearLayout
@@ -134,7 +134,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/upi_pin_setup"
-                        style="@style/TextAppearance.Material3.BodyLarge"/>
+                        style="@style/Mifos.DesignSystem.TextStyle.CardTitle"/>
 
                     <TextView
                         android:id="@+id/tv_upi"
diff --git a/mifospay/src/main/res/layout/activity_show_qr.xml b/mifospay/src/main/res/layout/activity_show_qr.xml
index b1d0a51ff..191050eaf 100644
--- a/mifospay/src/main/res/layout/activity_show_qr.xml
+++ b/mifospay/src/main/res/layout/activity_show_qr.xml
@@ -54,7 +54,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                style="@style/TextAppearance.Material3.TitleSmall"
+                style="@style/Mifos.DesignSystem.TextStyle.BodyLarger"
                 android:text="@string/qr_code_details"/>
 
             <TextView
diff --git a/mifospay/src/main/res/layout/activity_si_details.xml b/mifospay/src/main/res/layout/activity_si_details.xml
index 1f1497d81..ff0e74130 100644
--- a/mifospay/src/main/res/layout/activity_si_details.xml
+++ b/mifospay/src/main/res/layout/activity_si_details.xml
@@ -37,7 +37,7 @@
                 android:id="@+id/tv_si_name"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                style="@style/TextAppearance.Material3.HeadlineLarge"
+                style="@style/Mifos.DesignSystem.TextStyle.Heading"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
@@ -51,8 +51,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    style="@style/TextAppearance.Material3.BodyLarge"
-                    android:alpha="@dimen/alpha_low_emphasis"
+                    style="@style/Mifos.DesignSystem.TextStyle.Label"
                     android:text="@string/standing_instruction_id"/>
                 <TextView
                     android:layout_width="wrap_content"
@@ -64,8 +63,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    style="@style/TextAppearance.Material3.BodyLarge"
-                    android:alpha="@dimen/alpha_low_emphasis"
+                    style="@style/Mifos.DesignSystem.TextStyle.Label"
                     android:text="@string/amount_header"/>
                 <LinearLayout
                     android:orientation="horizontal"
@@ -76,8 +74,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:id="@+id/tv_si_amount"
-                        style="@style/TextAppearance.Material3.TitleMedium" />
+                        android:id="@+id/tv_si_amount" />
 
                     <com.google.android.material.textfield.TextInputLayout
                         android:id="@+id/til_si_edit_amount"
@@ -100,21 +97,18 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    style="@style/TextAppearance.Material3.BodyLarge"
-                    android:alpha="@dimen/alpha_low_emphasis"
+                    style="@style/Mifos.DesignSystem.TextStyle.Label"
                     android:text="Valid From:"/>
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:id="@+id/tv_valid_from"
-                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_marginBottom="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsMedium" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    style="@style/TextAppearance.Material3.BodyLarge"
-                    android:alpha="@dimen/alpha_low_emphasis"
+                    style="@style/Mifos.DesignSystem.TextStyle.Label"
                     android:text="Valid Till:"/>
                 <LinearLayout
                     android:layout_width="wrap_content"
@@ -126,7 +120,6 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:id="@+id/tv_valid_till"
-                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_marginRight="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsMedium"/>
 
                     <TextView
@@ -142,44 +135,37 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    style="@style/TextAppearance.Material3.BodyLarge"
-                    android:alpha="@dimen/alpha_low_emphasis"
+                    style="@style/Mifos.DesignSystem.TextStyle.Label"
                     android:text="@string/to"/>
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:id="@+id/tv_si_to_name"
-                    style="@style/TextAppearance.Material3.BodyLarge"/>
+                    android:id="@+id/tv_si_to_name"/>
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:id="@+id/tv_si_to_number"
-                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_marginBottom="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsMedium" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    style="@style/TextAppearance.Material3.BodyLarge"
-                    android:alpha="@dimen/alpha_low_emphasis"
+                    style="@style/Mifos.DesignSystem.TextStyle.Label"
                     android:text="@string/from"/>
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:id="@+id/tv_si_from_name"
-                    style="@style/TextAppearance.Material3.BodyLarge"/>
+                    android:id="@+id/tv_si_from_name"/>
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:id="@+id/tv_si_from_number"
-                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_marginBottom="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsMedium" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    style="@style/TextAppearance.Material3.BodyLarge"
-                    android:alpha="@dimen/alpha_low_emphasis"
+                    style="@style/Mifos.DesignSystem.TextStyle.Label"
                     android:text="Recurrence Interval in Months:"/>
                 <LinearLayout
                     android:orientation="horizontal"
@@ -190,8 +176,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:id="@+id/tv_recurrence_interval"
-                        style="@style/TextAppearance.Material3.BodyLarge"/>
+                        android:id="@+id/tv_recurrence_interval"/>
 
                     <com.google.android.material.textfield.TextInputLayout
                         android:id="@+id/til_si_edit_interval"
@@ -212,8 +197,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    style="@style/TextAppearance.Material3.BodyLarge"
-                    android:alpha="@dimen/alpha_low_emphasis"
+                    style="@style/Mifos.DesignSystem.TextStyle.Label"
                     android:text="Status:"/>
                 <TextView
                     android:layout_width="wrap_content"
diff --git a/mifospay/src/main/res/layout/activity_signup.xml b/mifospay/src/main/res/layout/activity_signup.xml
index 79d7a3157..f91b8685f 100644
--- a/mifospay/src/main/res/layout/activity_signup.xml
+++ b/mifospay/src/main/res/layout/activity_signup.xml
@@ -42,7 +42,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/all_fields_are_mandatory"
-                style="@style/TextAppearance.Material3.LabelSmall"/>
+                style="@style/Mifos.DesignSystem.TextStyle.Label"/>
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -196,7 +196,7 @@
                     android:id="@+id/et_state_layout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    style="@style/Widget.Material3.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                    style="@style/Mifos.DesignSystem.Components.ExposedDropdownMenuField"
                     android:layout_marginBottom="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsMedium"
                     app:placeholderText="@string/click_to_select_state">
 
diff --git a/mifospay/src/main/res/layout/content_bottom_sheet_account_details.xml b/mifospay/src/main/res/layout/content_bottom_sheet_account_details.xml
index 22a618280..6067fa706 100644
--- a/mifospay/src/main/res/layout/content_bottom_sheet_account_details.xml
+++ b/mifospay/src/main/res/layout/content_bottom_sheet_account_details.xml
@@ -45,7 +45,7 @@
 
     <Button
         android:id="@+id/btn_profile_bottom_sheet_action"
-        style="@style/Widget.Material3.Button.OutlinedButton"
+        style="@style/Mifos.DesignSystem.Components.Button.Outline"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenSections"
diff --git a/mifospay/src/main/res/layout/dialog_add_card.xml b/mifospay/src/main/res/layout/dialog_add_card.xml
index 68eb177a1..1f6360629 100644
--- a/mifospay/src/main/res/layout/dialog_add_card.xml
+++ b/mifospay/src/main/res/layout/dialog_add_card.xml
@@ -62,7 +62,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsSmall"
-        style="@style/TextAppearance.Material3.TitleSmall"
         android:text="@string/expiry_date"/>
 
     <LinearLayout
@@ -116,7 +115,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/cancel_txt"
-            style="@style/Widget.Material3.Button.OutlinedButton"/>
+            style="@style/Mifos.DesignSystem.Components.Button.Outline"/>
 
         <Button
             android:id="@+id/btn_add"
diff --git a/mifospay/src/main/res/layout/dialog_choose_signup_method.xml b/mifospay/src/main/res/layout/dialog_choose_signup_method.xml
index c4d48d0aa..bc8acb9f5 100644
--- a/mifospay/src/main/res/layout/dialog_choose_signup_method.xml
+++ b/mifospay/src/main/res/layout/dialog_choose_signup_method.xml
@@ -12,7 +12,7 @@
         android:layout_width="match_parent">
 
         <Button
-            style="@style/Widget.Material3.Button.OutlinedButton"
+            style="@style/Mifos.DesignSystem.Components.Button.Outline"
             android:id="@+id/btn_merchant"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsLarge"
@@ -23,7 +23,7 @@
             app:layout_constraintTop_toBottomOf="@+id/textView4" />
 
         <Button
-            style="@style/Widget.Material3.Button.OutlinedButton"
+            style="@style/Mifos.DesignSystem.Components.Button.Outline"
             android:id="@+id/btn_customer"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenSectionsHalf"
diff --git a/mifospay/src/main/res/layout/dialog_choose_sim_dialog.xml b/mifospay/src/main/res/layout/dialog_choose_sim_dialog.xml
index ca0d16073..cc8ff8a90 100644
--- a/mifospay/src/main/res/layout/dialog_choose_sim_dialog.xml
+++ b/mifospay/src/main/res/layout/dialog_choose_sim_dialog.xml
@@ -21,13 +21,12 @@
                 android:layout_gravity="center_vertical|center_horizontal"
                 android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenSections"
                 android:text="@string/verify_mobile_number"
-                style="@style/TextAppearance.Material3.TitleLarge"/>
+                style="@style/Mifos.DesignSystem.TextStyle.Heading"/>
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical|center_horizontal"
-                style="@style/TextAppearance.Material3.BodyMedium"
                 android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsSmall"
                 android:gravity="center"
                 android:text="@string/confirm_mobile_number_message" />
diff --git a/mifospay/src/main/res/layout/dialog_set_amt.xml b/mifospay/src/main/res/layout/dialog_set_amt.xml
index ca68c7da1..f1a88a5ea 100644
--- a/mifospay/src/main/res/layout/dialog_set_amt.xml
+++ b/mifospay/src/main/res/layout/dialog_set_amt.xml
@@ -2,8 +2,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    style="@style/MaterialAlertDialog.Material3"
     android:orientation="vertical">
     <com.google.android.material.textfield.TextInputLayout
         android:layout_width="match_parent"
diff --git a/mifospay/src/main/res/layout/dialog_setup_upi_pin.xml b/mifospay/src/main/res/layout/dialog_setup_upi_pin.xml
index cbc348dfa..c7953c1cd 100644
--- a/mifospay/src/main/res/layout/dialog_setup_upi_pin.xml
+++ b/mifospay/src/main/res/layout/dialog_setup_upi_pin.xml
@@ -55,7 +55,7 @@
                     android:layout_marginHorizontal="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsSmall"
                     android:gravity="bottom"
                     android:text="@string/slash"
-                    style="@style/TextAppearance.Material3.HeadlineLarge" />
+                    style="@style/Mifos.DesignSystem.TextStyle.Heading"/>
 
                 <com.alimuzaffar.lib.pin.PinEntryEditText
                     android:id="@+id/pe_year"
@@ -94,7 +94,7 @@
                 android:layout_gravity="center"
                 android:gravity="center"
                 android:text="@string/enter_otp"
-                style="@style/TextAppearance.Material3.TitleLarge"/>
+                style="@style/Mifos.DesignSystem.TextStyle.Heading"/>
 
             <com.alimuzaffar.lib.pin.PinEntryEditText
                 android:id="@+id/pe_otp"
@@ -123,7 +123,7 @@
                 android:layout_gravity="center"
                 android:gravity="center"
                 android:text="@string/enter_upi_pin"
-                style="@style/TextAppearance.Material3.TitleLarge"/>
+                style="@style/Mifos.DesignSystem.TextStyle.Heading"/>
 
             <com.alimuzaffar.lib.pin.PinEntryEditText
                 android:id="@+id/pe_upi_pin"
@@ -150,7 +150,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/cancel_txt"
-                style="@style/Widget.Material3.Button.OutlinedButton"/>
+                style="@style/Mifos.DesignSystem.Components.Button.Outline"/>
 
             <Button
                 android:id="@+id/btn_next"
diff --git a/mifospay/src/main/res/layout/dialog_transaction_detail.xml b/mifospay/src/main/res/layout/dialog_transaction_detail.xml
index 438408343..e266afa3f 100644
--- a/mifospay/src/main/res/layout/dialog_transaction_detail.xml
+++ b/mifospay/src/main/res/layout/dialog_transaction_detail.xml
@@ -49,24 +49,21 @@
                     android:id="@+id/tv_transaction_date"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    style="@style/TextAppearance.Material3.BodyMedium"
-                    android:alpha="@dimen/alpha_low_emphasis"/>
+                    style="@style/Mifos.DesignSystem.TextStyle.Label"/>
 
                 <TextView
                     android:id="@+id/tv_receiptId"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_gravity="bottom"
-                    style="@style/TextAppearance.Material3.BodyMedium"
+                    style="@style/Mifos.DesignSystem.TextStyle.BodyLarger"
                     android:visibility="visible"/>
 
                 <TextView
                     android:id="@+id/tv_transaction_status"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="bottom"
-                    style="@style/TextAppearance.Material3.BodyMedium"
-                    android:alpha="@dimen/alpha_low_emphasis"/>
+                    android:layout_gravity="bottom"/>
 
             </LinearLayout>
 
@@ -78,7 +75,7 @@
                 android:layout_centerVertical="true"
                 android:layout_marginRight="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsSmall"
                 android:text="$100"
-                style="@style/TextAppearance.Material3.HeadlineLarge"/>
+                style="@style/Mifos.DesignSystem.TextStyle.Heading"/>
 
         </RelativeLayout>
 
@@ -114,7 +111,6 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:text="@string/client_name"
                     />
 
@@ -123,7 +119,6 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:text="@string/account"
                     />
 
@@ -156,7 +151,6 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:text="@string/client_name"
                     />
 
@@ -165,7 +159,6 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:text="@string/account"
                     />
 
@@ -188,7 +181,7 @@
             android:foregroundGravity="center"
             android:gravity="center"
             android:layout_marginBottom="@dimen/Mifos.DesignSystem.Spacing.screenVerticalMargin"
-            style="@style/Widget.Material3.Button.TextButton"
+            style="@style/Mifos.DesignSystem.Components.Button.Text"
             android:text="@string/view_receipt" />
 
     </LinearLayout>
diff --git a/mifospay/src/main/res/layout/fragment_accounts.xml b/mifospay/src/main/res/layout/fragment_accounts.xml
index e898797da..120ed4a3c 100644
--- a/mifospay/src/main/res/layout/fragment_accounts.xml
+++ b/mifospay/src/main/res/layout/fragment_accounts.xml
@@ -20,7 +20,7 @@
         android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.screenVerticalMargin"
         android:layout_width="wrap_content"
         android:text="@string/linked_bank_account"
-        style="@style/TextAppearance.Material3.BodyLarge" />
+        style="@style/Mifos.DesignSystem.TextStyle.BodyLarger"/>
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_accounts"
         android:layout_below="@id/linked_bank_account_text"
diff --git a/mifospay/src/main/res/layout/fragment_debit_card.xml b/mifospay/src/main/res/layout/fragment_debit_card.xml
index 3ff9605e6..2735c742d 100644
--- a/mifospay/src/main/res/layout/fragment_debit_card.xml
+++ b/mifospay/src/main/res/layout/fragment_debit_card.xml
@@ -50,7 +50,7 @@
             android:layout_marginRight="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsSmall"
             android:gravity="bottom"
             android:text="@string/slash"
-            style="@style/TextAppearance.Material3.HeadlineLarge"/>
+            style="@style/Mifos.DesignSystem.TextStyle.Heading"/>
 
         <com.alimuzaffar.lib.pin.PinEntryEditText
             android:id="@+id/pe_year"
diff --git a/mifospay/src/main/res/layout/fragment_home.xml b/mifospay/src/main/res/layout/fragment_home.xml
index bec7c1878..9c5032a4b 100644
--- a/mifospay/src/main/res/layout/fragment_home.xml
+++ b/mifospay/src/main/res/layout/fragment_home.xml
@@ -22,7 +22,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal|top"
             android:text="@string/fetching"
-            style="@style/TextAppearance.Material3.DisplaySmall" />
+            style="@style/Mifos.DesignSystem.TextStyle.Heading"/>
 
         <TextView
             android:layout_gravity="center|bottom"
@@ -32,8 +32,7 @@
             android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsSmall"
             android:text="@string/balance_hint"
             android:textAllCaps="true"
-            android:alpha="@dimen/alpha_low_emphasis"
-            style="@style/TextAppearance.Material3.LabelSmall" />
+            style="@style/Mifos.DesignSystem.TextStyle.Label"/>
 
         <TextView
             android:layout_width="wrap_content"
@@ -112,7 +111,7 @@
 
             <Button
                 android:visibility="gone"
-                style="@style/Widget.Material3.Button.OutlinedButton"
+                style="@style/Mifos.DesignSystem.Components.Button.Outline"
                 android:layout_gravity="center_horizontal"
                 android:id="@+id/btn_home_bottom_sheet_action"
                 android:layout_width="wrap_content"
diff --git a/mifospay/src/main/res/layout/fragment_kyc.xml b/mifospay/src/main/res/layout/fragment_kyc.xml
index 22aca43cf..120574d27 100644
--- a/mifospay/src/main/res/layout/fragment_kyc.xml
+++ b/mifospay/src/main/res/layout/fragment_kyc.xml
@@ -16,7 +16,7 @@
             android:text="@string/complete_kyc"
             android:textAlignment="center"
             android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.screenVerticalMargin"
-            style="@style/TextAppearance.Material3.BodyLarge"/>
+            style="@style/Mifos.DesignSystem.TextStyle.BodyLarger"/>
 
         <LinearLayout
             android:id="@+id/lv1"
diff --git a/mifospay/src/main/res/layout/fragment_kyc_desc.xml b/mifospay/src/main/res/layout/fragment_kyc_desc.xml
index 007aa454f..f82098458 100644
--- a/mifospay/src/main/res/layout/fragment_kyc_desc.xml
+++ b/mifospay/src/main/res/layout/fragment_kyc_desc.xml
@@ -20,7 +20,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/value_30dp"
-            style="@style/Widget.Material3.CardView.Filled">
+            style="@style/Mifos.DesignSystem.Components.Cards.Filled">
 
             <LinearLayout
                 android:id="@+id/ll_lvl1"
@@ -34,17 +34,7 @@
                     android:layout_height="wrap_content"
                     android:layout_margin="@dimen/value_10dp"
                     android:text="@string/level_1"
-                    style="@style/TextAppearance.Material3.HeadlineMedium"/>
-
-                <!--<TextView-->
-                <!--android:layout_width="wrap_content"-->
-                <!--android:layout_height="wrap_content"-->
-                <!--android:layout_marginBottom="@dimen/value_5dp"-->
-                <!--android:layout_marginLeft="@dimen/value_10dp"-->
-                <!--android:layout_marginRight="@dimen/value_10dp"-->
-                <!--android:layout_marginTop="@dimen/value_10dp"-->
-                <!--android:text="@string/level_1_description"-->
-                <!--android:textColor="@color/gray"/>-->
+                    style="@style/Mifos.DesignSystem.TextStyle.CardTitle"/>
 
             </LinearLayout>
 
@@ -55,7 +45,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/value_30dp"
-            style="@style/Widget.Material3.CardView.Filled"
+            style="@style/Mifos.DesignSystem.Components.Cards.Filled"
             >
 
             <LinearLayout
@@ -70,17 +60,7 @@
                     android:layout_height="wrap_content"
                     android:layout_margin="@dimen/value_10dp"
                     android:text="@string/level_2"
-                    style="@style/TextAppearance.Material3.HeadlineMedium"/>
-
-                <!--<TextView-->
-                <!--android:layout_width="wrap_content"-->
-                <!--android:layout_height="wrap_content"-->
-                <!--android:layout_marginBottom="@dimen/value_5dp"-->
-                <!--android:layout_marginLeft="@dimen/value_10dp"-->
-                <!--android:layout_marginRight="@dimen/value_10dp"-->
-                <!--android:layout_marginTop="@dimen/value_10dp"-->
-                <!--android:text="@string/level_2_description"-->
-                <!--android:textColor="@color/gray"/>-->
+                    style="@style/Mifos.DesignSystem.TextStyle.CardTitle"/>
 
             </LinearLayout>
 
@@ -91,7 +71,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/value_30dp"
-            style="@style/Widget.Material3.CardView.Filled"
+            style="@style/Mifos.DesignSystem.Components.Cards.Filled"
             >
 
             <LinearLayout
@@ -106,17 +86,7 @@
                     android:layout_height="wrap_content"
                     android:layout_margin="@dimen/value_10dp"
                     android:text="@string/level_3"
-                    style="@style/TextAppearance.Material3.HeadlineMedium"/>
-
-                <!--<TextView-->
-                <!--android:layout_width="wrap_content"-->
-                <!--android:layout_height="wrap_content"-->
-                <!--android:layout_marginBottom="@dimen/value_5dp"-->
-                <!--android:layout_marginLeft="@dimen/value_10dp"-->
-                <!--android:layout_marginRight="@dimen/value_10dp"-->
-                <!--android:layout_marginTop="@dimen/value_10dp"-->
-                <!--android:text="@string/level_3_description"-->
-                <!--android:textColor="@color/gray"/>-->
+                    style="@style/Mifos.DesignSystem.TextStyle.CardTitle"/>
 
             </LinearLayout>
 
diff --git a/mifospay/src/main/res/layout/fragment_kyc_lvl2.xml b/mifospay/src/main/res/layout/fragment_kyc_lvl2.xml
index 98b1116d2..4966e70de 100644
--- a/mifospay/src/main/res/layout/fragment_kyc_lvl2.xml
+++ b/mifospay/src/main/res/layout/fragment_kyc_lvl2.xml
@@ -38,8 +38,7 @@
             tools:text="/storage/emulated/0/Whatsapp/Media/Whatsapp Images/id.jpg"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            style="@style/TextAppearance.Material3.BodyMedium"/>
+            android:layout_gravity="center_vertical"/>
 
     </LinearLayout>
 
diff --git a/mifospay/src/main/res/layout/fragment_make_transfer.xml b/mifospay/src/main/res/layout/fragment_make_transfer.xml
index 78bfef943..4607adb26 100644
--- a/mifospay/src/main/res/layout/fragment_make_transfer.xml
+++ b/mifospay/src/main/res/layout/fragment_make_transfer.xml
@@ -17,7 +17,7 @@
         android:focusable="true"
         android:focusableInTouchMode="true"
         android:text="@string/send_money"
-        style="@style/TextAppearance.Material3.TitleMedium"/>
+        style="@style/Mifos.DesignSystem.TextStyle.BodyLarger"/>
 
     <FrameLayout
         android:layout_width="match_parent"
@@ -29,7 +29,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:visibility="gone">
+            android:visibility="visible">
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -49,14 +49,14 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginWords"
                     tools:text="Alex Chi"
-                    style="@style/TextAppearance.Material3.TitleLarge" />
+                    style="@style/Mifos.DesignSystem.TextStyle.Heading"/>
 
                 <TextView
                     android:id="@+id/tv_client_vpa"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     tools:text="VPA: 232r32"
-                    style="@style/TextAppearance.Material3.BodyLarge"
+                    style="@style/Mifos.DesignSystem.TextStyle.SubHeading"
                     android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginWords"/>
 
                 <TextView
@@ -72,7 +72,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginWords"
                     tools:text="$ 1000"
-                    style="@style/TextAppearance.Material3.TitleLarge"/>
+                    style="@style/Mifos.DesignSystem.TextStyle.Heading"/>
 
             </LinearLayout>
 
@@ -88,7 +88,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/cancel"
-                    style="@style/Widget.Material3.Button.OutlinedButton"/>
+                    style="@style/Mifos.DesignSystem.Components.Button.Outline"/>
 
                 <Button
                     android:id="@+id/btn_confirm"
diff --git a/mifospay/src/main/res/layout/fragment_merchants.xml b/mifospay/src/main/res/layout/fragment_merchants.xml
index 614da4dc8..4ee3f4936 100644
--- a/mifospay/src/main/res/layout/fragment_merchants.xml
+++ b/mifospay/src/main/res/layout/fragment_merchants.xml
@@ -29,7 +29,7 @@
             android:layout_height="wrap_content"
             android:id="@+id/trusted_merchant_text"
             android:text="@string/trusted_merchants"
-            style="@style/TextAppearance.Material3.BodyLarge"
+            style="@style/Mifos.DesignSystem.TextStyle.BodyLarger"
             android:layout_marginHorizontal="@dimen/Mifos.DesignSystem.Spacing.screenHorizontalMargin"
             android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.screenVerticalMargin"/>
 
diff --git a/mifospay/src/main/res/layout/fragment_request.xml b/mifospay/src/main/res/layout/fragment_request.xml
index 6504e82ad..1019e8c5c 100644
--- a/mifospay/src/main/res/layout/fragment_request.xml
+++ b/mifospay/src/main/res/layout/fragment_request.xml
@@ -30,7 +30,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                style="@style/TextAppearance.Material3.LabelLarge"
+                style="@style/Mifos.DesignSystem.TextStyle.Label"
                 android:text="@string/virtual_payment_address_vpa"/>
 
             <TextView
@@ -38,13 +38,13 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 tools:text="fwef3w"
-                style="@style/TextAppearance.Material3.BodyLarge"/>
+                style="@style/Mifos.DesignSystem.TextStyle.Body"/>
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsSmall"
-                style="@style/TextAppearance.Material3.LabelLarge"
+                style="@style/Mifos.DesignSystem.TextStyle.Label"
                 android:text="@string/mobile_number"/>
 
             <TextView
@@ -52,7 +52,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 tools:text="+911234567890"
-                style="@style/TextAppearance.Material3.BodyLarge"/>
+                style="@style/Mifos.DesignSystem.TextStyle.Body"/>
 
         </LinearLayout>
 
diff --git a/mifospay/src/main/res/layout/fragment_send.xml b/mifospay/src/main/res/layout/fragment_send.xml
index 63bd8e89d..7c15cd36c 100644
--- a/mifospay/src/main/res/layout/fragment_send.xml
+++ b/mifospay/src/main/res/layout/fragment_send.xml
@@ -21,7 +21,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/select_transfer_method"
-            style="@style/TextAppearance.Material3.BodyLarge"/>
+            style="@style/Mifos.DesignSystem.TextStyle.BodyLarger"/>
 
         <com.google.android.material.button.MaterialButtonToggleGroup
             android:id="@+id/transfer_method_toggle"
diff --git a/mifospay/src/main/res/layout/invoice_item.xml b/mifospay/src/main/res/layout/invoice_item.xml
index b5a9b563c..cc26abeb1 100644
--- a/mifospay/src/main/res/layout/invoice_item.xml
+++ b/mifospay/src/main/res/layout/invoice_item.xml
@@ -32,7 +32,7 @@
                 android:id="@+id/tv_invoice_title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                style="@style/TextAppearance.Material3.BodyLarge"
+                style="@style/Mifos.DesignSystem.TextStyle.CardTitle"
                 tools:text="Logo for Richard" />
 
 
@@ -41,8 +41,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:textAlignment="viewEnd"
-                style="@style/TextAppearance.Material3.BodyMedium"
-                android:alpha="@dimen/alpha_low_emphasis"
+                style="@style/Mifos.DesignSystem.TextStyle.Label"
                 tools:text="$3000"
                 android:gravity="end" />
 
@@ -54,8 +53,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom"
-            style="@style/TextAppearance.Material3.BodyMedium"
-            android:alpha="@dimen/alpha_low_emphasis"/>
+            style="@style/Mifos.DesignSystem.TextStyle.Label"/>
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -68,16 +66,14 @@
             tools:text="12/3/4"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            style="@style/TextAppearance.Material3.BodyMedium"
-            android:alpha="@dimen/alpha_low_emphasis"/>
+            style="@style/Mifos.DesignSystem.TextStyle.Label"/>
 
             <TextView
                 android:id="@+id/tv_invoice_id"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 tools:text="Invoice id:12345"
-                style="@style/TextAppearance.Material3.BodyMedium"
-                android:alpha="@dimen/alpha_low_emphasis"
+                style="@style/Mifos.DesignSystem.TextStyle.Label"
                 android:gravity="end" />
         </LinearLayout>
 
diff --git a/mifospay/src/main/res/layout/item_bank_account.xml b/mifospay/src/main/res/layout/item_bank_account.xml
index 3297f11ec..e159a5e0a 100644
--- a/mifospay/src/main/res/layout/item_bank_account.xml
+++ b/mifospay/src/main/res/layout/item_bank_account.xml
@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     app:contentPadding="@dimen/Mifos.DesignSystem.Spacing.CardInnerPaddingLarger"
-    style="@style/Widget.Material3.CardView.Filled"
+    style="@style/Mifos.DesignSystem.Components.Cards.Filled"
     tools:layout_margin="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsSmall">
 
     <LinearLayout
@@ -16,41 +16,46 @@
 
         <LinearLayout
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:layout_marginRight="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsLarge"
             android:orientation="vertical">
 
             <TextView
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                style="@style/TextAppearance.Material3.BodyMedium"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                style="@style/Mifos.DesignSystem.TextStyle.Label"
                 android:text="@string/bank_name"/>
 
             <TextView
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                style="@style/TextAppearance.Material3.BodyMedium"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                style="@style/Mifos.DesignSystem.TextStyle.Label"
                 android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsSmall"
                 android:text="@string/ac_holder_name"/>
 
             <TextView
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                style="@style/TextAppearance.Material3.BodyMedium"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                style="@style/Mifos.DesignSystem.TextStyle.Label"
                 android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsSmall"
                 android:text="@string/branch_name"/>
 
             <TextView
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                style="@style/TextAppearance.Material3.BodyMedium"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                style="@style/Mifos.DesignSystem.TextStyle.Label"
                 android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsSmall"
                 android:text="@string/ifsc"/>
 
             <TextView
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                style="@style/TextAppearance.Material3.BodyMedium"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                style="@style/Mifos.DesignSystem.TextStyle.Label"
                 android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsSmall"
                 android:text="@string/type"/>
 
@@ -58,49 +63,54 @@
 
         <LinearLayout
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:orientation="vertical">
 
             <TextView
                 android:id="@+id/tv_bank_name"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                style="@style/TextAppearance.Material3.BodyMedium"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:gravity="center_vertical"
                 tools:text="International Bank"
                 />
 
             <TextView
                 android:id="@+id/tv_account_holder_name"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:gravity="center_vertical"
                 tools:text="Dimmy"
-                style="@style/TextAppearance.Material3.BodyMedium"
                 android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsSmall"
                 />
 
             <TextView
                 android:id="@+id/tv_branch"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:gravity="center_vertical"
                 tools:text="Official Branch"
-                style="@style/TextAppearance.Material3.BodyMedium"
                 android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsSmall"
                 />
 
             <TextView
                 android:id="@+id/tv_ifsc"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:gravity="center_vertical"
                 tools:text="IFSC352532"
-                style="@style/TextAppearance.Material3.BodyMedium"
                 android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsSmall"
                 />
 
             <TextView
                 android:id="@+id/tv_type"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                style="@style/TextAppearance.Material3.BodyMedium"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:gravity="center_vertical"
                 tools:text="Saving Tpye"
                 android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsSmall"
                 />
diff --git a/mifospay/src/main/res/layout/item_card.xml b/mifospay/src/main/res/layout/item_card.xml
index 7029bb869..be149e8b2 100644
--- a/mifospay/src/main/res/layout/item_card.xml
+++ b/mifospay/src/main/res/layout/item_card.xml
@@ -24,7 +24,6 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textAllCaps="true"
-                style="@style/TextAppearance.Material3.BodyMedium"
                 tools:text="Rahul"/>
 
             <TextView
@@ -33,7 +32,6 @@
                 tools:text="Gill"
                 android:layout_marginStart="@dimen/Mifos.DesignSystem.Spacing.marginWords"
                 android:layout_width="wrap_content"
-                style="@style/TextAppearance.Material3.BodyMedium"
                 android:textAllCaps="true" />
 
         </LinearLayout>
@@ -43,7 +41,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@android:color/transparent"
-            style="@style/TextAppearance.Material3.TitleLarge"
+            style="@style/Mifos.DesignSystem.TextStyle.Heading"
             tools:text="8754753895326"/>
 
 
@@ -52,7 +50,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             tools:text="Expiry date: 22 June 2099"
-            android:alpha="@dimen/alpha_low_emphasis"/>
+            style="@style/Mifos.DesignSystem.TextStyle.Label"/>
 
 
     </LinearLayout>
diff --git a/mifospay/src/main/res/layout/item_casual_list.xml b/mifospay/src/main/res/layout/item_casual_list.xml
index d37d4f92e..187e400d9 100644
--- a/mifospay/src/main/res/layout/item_casual_list.xml
+++ b/mifospay/src/main/res/layout/item_casual_list.xml
@@ -49,7 +49,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/Mifos.DesignSystem.Spacing.CardInnerPadding"
-        style="@style/TextAppearance.Material3.BodySmall"
         app:layout_constraintBottom_toBottomOf="@+id/tv_item_casual_list_subtitle"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@+id/tv_item_casual_list_title" />
diff --git a/mifospay/src/main/res/layout/item_notification.xml b/mifospay/src/main/res/layout/item_notification.xml
index 89dc4c8b2..90d055ac6 100644
--- a/mifospay/src/main/res/layout/item_notification.xml
+++ b/mifospay/src/main/res/layout/item_notification.xml
@@ -11,20 +11,19 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         tools:text="Title"
-        style="@style/TextAppearance.Material3.TitleLarge" />
+        style="@style/Mifos.DesignSystem.TextStyle.Heading"/>
 
     <TextView
         android:id="@+id/tv_body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        tools:text="This is sample body text"
-        style="@style/TextAppearance.Material3.BodyMedium"/>
+        tools:text="This is sample body text"/>
 
     <TextView
         android:id="@+id/tv_timestamp"
         tools:text="17-2-2002"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        style="@style/TextAppearance.Material3.LabelSmall" />
+        style="@style/Mifos.DesignSystem.TextStyle.Label"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/mifospay/src/main/res/layout/item_other_banks.xml b/mifospay/src/main/res/layout/item_other_banks.xml
index 2576a1ef6..31f6e46fb 100644
--- a/mifospay/src/main/res/layout/item_other_banks.xml
+++ b/mifospay/src/main/res/layout/item_other_banks.xml
@@ -22,6 +22,6 @@
         android:layout_gravity="center"
         android:layout_marginStart="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsLarge"
         tools:text="Sample National Bank"
-        style="@style/TextAppearance.Material3.BodyLarge"/>
+        style="@style/Mifos.DesignSystem.TextStyle.CardTitle"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/mifospay/src/main/res/layout/item_popular_banks.xml b/mifospay/src/main/res/layout/item_popular_banks.xml
index 857d7a81c..bafa7cdfd 100644
--- a/mifospay/src/main/res/layout/item_popular_banks.xml
+++ b/mifospay/src/main/res/layout/item_popular_banks.xml
@@ -6,7 +6,7 @@
     android:layout_width="@dimen/Mifos.DesignSystem.Size.BankCardSize"
     android:clickable="true"
     android:focusable="true"
-    style="@style/Widget.Material3.CardView.Filled"
+    style="@style/Mifos.DesignSystem.Components.Cards.Filled"
     app:contentPadding="@dimen/Mifos.DesignSystem.Spacing.CardInnerPadding">
     <LinearLayout
         android:layout_height="match_parent"
diff --git a/mifospay/src/main/res/layout/item_search.xml b/mifospay/src/main/res/layout/item_search.xml
index 8bb5ea6de..802e8489f 100644
--- a/mifospay/src/main/res/layout/item_search.xml
+++ b/mifospay/src/main/res/layout/item_search.xml
@@ -9,6 +9,6 @@
         android:id="@+id/tv_search_result"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        style="@style/TextAppearance.Material3.BodyLarge"/>
+        style="@style/Mifos.DesignSystem.TextStyle.CardTitle"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/mifospay/src/main/res/layout/item_si.xml b/mifospay/src/main/res/layout/item_si.xml
index cb37c181c..8f182245f 100644
--- a/mifospay/src/main/res/layout/item_si.xml
+++ b/mifospay/src/main/res/layout/item_si.xml
@@ -18,7 +18,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         tools:text="From: Rahul Gill"
-        style="@style/TextAppearance.Material3.BodyLarge"
+        style="@style/Mifos.DesignSystem.TextStyle.CardTitle"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -28,7 +28,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsSmall"
         tools:text="To: Rakesh Kumar"
-        style="@style/TextAppearance.Material3.BodyLarge"
+        style="@style/Mifos.DesignSystem.TextStyle.CardTitle"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tv_from_client_name" />
 
@@ -38,8 +38,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginWords"
         tools:text="Valid till: 30-6-2022"
-        style="@style/TextAppearance.Material3.BodyMedium"
-        android:alpha="@dimen/alpha_low_emphasis"
+        style="@style/Mifos.DesignSystem.TextStyle.Label"
         app:layout_constraintStart_toStartOf="@+id/tv_to_client_name"
         app:layout_constraintTop_toBottomOf="@+id/tv_to_client_name" />
 
diff --git a/mifospay/src/main/res/layout/item_specific_transaction.xml b/mifospay/src/main/res/layout/item_specific_transaction.xml
index c751a30ca..d0142e9e8 100644
--- a/mifospay/src/main/res/layout/item_specific_transaction.xml
+++ b/mifospay/src/main/res/layout/item_specific_transaction.xml
@@ -28,15 +28,13 @@
                 android:id="@+id/tv_fromClientName"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                style="@style/TextAppearance.Material3.BodyMedium"/>
+                android:layout_gravity="center"/>
 
             <TextView
                 android:id="@+id/tv_fromAccountNo"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                style="@style/TextAppearance.Material3.BodyMedium"/>
+                android:layout_gravity="center"/>
 
         </LinearLayout>
 
@@ -66,15 +64,14 @@
                 android:id="@+id/tv_toClientName"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                style="@style/TextAppearance.Material3.BodyMedium"/>
+                android:layout_gravity="center"/>
 
             <TextView
                 android:id="@+id/tv_toAccountNo"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                style="@style/TextAppearance.Material3.BodyMedium"/>
+                />
 
         </LinearLayout>
 
@@ -110,15 +107,13 @@
                 android:id="@+id/tv_transaction_date"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                style="@style/TextAppearance.Material3.BodyMedium"
-                android:alpha="@dimen/alpha_low_emphasis"/>
+                style="@style/Mifos.DesignSystem.TextStyle.Label"/>
 
             <TextView
                 android:id="@+id/tv_transaction_status"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="bottom"
-                style="@style/TextAppearance.Material3.BodyMedium"/>
+                android:layout_gravity="bottom"/>
 
         </LinearLayout>
 
diff --git a/mifospay/src/main/res/layout/nav_drawer_header.xml b/mifospay/src/main/res/layout/nav_drawer_header.xml
index b9cb35646..1c9a27608 100644
--- a/mifospay/src/main/res/layout/nav_drawer_header.xml
+++ b/mifospay/src/main/res/layout/nav_drawer_header.xml
@@ -32,7 +32,7 @@
             android:ellipsize="end"
             android:lines="1"
             tools:text="Sample Name"
-            style="@style/TextAppearance.Material3.BodyLarge"/>
+            style="@style/Mifos.DesignSystem.TextStyle.CardTitle"/>
 
         <TextView
             android:id="@+id/tv_user_email"
@@ -42,8 +42,7 @@
             android:layout_marginTop="3dp"
             android:ellipsize="end"
             tools:text="sample@samplemail.com"
-            android:lines="1"
-            style="@style/TextAppearance.Material3.BodySmall"/>
+            android:lines="1"/>
 
     </LinearLayout>
 
diff --git a/mifospay/src/main/res/layout/placeholder_state.xml b/mifospay/src/main/res/layout/placeholder_state.xml
index 01031d7ca..942724e7e 100644
--- a/mifospay/src/main/res/layout/placeholder_state.xml
+++ b/mifospay/src/main/res/layout/placeholder_state.xml
@@ -18,7 +18,7 @@
         android:id="@+id/tv_empty_no_transaction_history_title"
         android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsLarge"
         android:text="@string/error_oops"
-        style="@style/TextAppearance.Material3.BodyLarge"
+        style="@style/Mifos.DesignSystem.TextStyle.CardTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content" />
 
@@ -30,6 +30,5 @@
         android:layout_marginBottom="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsLarge"
         android:text="@string/unexpected_error_subtitle"
         android:textAlignment="center"
-        android:alpha="@dimen/alpha_low_emphasis"
-        style="@style/TextAppearance.Material3.BodyMedium" />
+        style="@style/Mifos.DesignSystem.TextStyle.Label"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/mifospay/src/main/res/layout/profile_username_and_image.xml b/mifospay/src/main/res/layout/profile_username_and_image.xml
index 9c836c579..4ca3fb38d 100644
--- a/mifospay/src/main/res/layout/profile_username_and_image.xml
+++ b/mifospay/src/main/res/layout/profile_username_and_image.xml
@@ -28,7 +28,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsSmall"
-        style="@style/TextAppearance.Material3.TitleLarge"
+        style="@style/Mifos.DesignSystem.TextStyle.CardTitle"
         app:layout_constraintEnd_toEndOf="@+id/iv_user_image"
         app:layout_constraintStart_toStartOf="@+id/iv_user_image"
         app:layout_constraintTop_toBottomOf="@+id/iv_user_image" />
diff --git a/mifospay/src/main/res/layout/scrollable_tab_layout.xml b/mifospay/src/main/res/layout/scrollable_tab_layout.xml
index 2c3a8bc37..50ca690a2 100644
--- a/mifospay/src/main/res/layout/scrollable_tab_layout.xml
+++ b/mifospay/src/main/res/layout/scrollable_tab_layout.xml
@@ -10,7 +10,6 @@
 
         <com.google.android.material.tabs.TabLayout
             android:id="@+id/tl_tab_layout"
-            style="@style/Widget.Material3.TabLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:tabGravity="fill"