diff --git a/app/build.gradle b/app/build.gradle
index 073fbc27c9..a8dac28813 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "org.ole.planet.myplanet"
         minSdkVersion 21
         targetSdkVersion 34
-        versionCode 1829
-        versionName "0.18.29"
+        versionCode 1830
+        versionName "0.18.30"
         ndkVersion '21.3.6528147'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/userprofile/EditAchievementFragment.kt b/app/src/main/java/org/ole/planet/myplanet/ui/userprofile/EditAchievementFragment.kt
index 976fedce1d..52753bf4e4 100644
--- a/app/src/main/java/org/ole/planet/myplanet/ui/userprofile/EditAchievementFragment.kt
+++ b/app/src/main/java/org/ole/planet/myplanet/ui/userprofile/EditAchievementFragment.kt
@@ -193,8 +193,11 @@ class EditAchievementFragment : BaseContainerFragment(), DatePickerDialog.OnDate
             showResourceListDialog(prevList)
         }
         val alertAddAttachmentView: View = alertAddAttachmentBinding.root
-        AlertDialog.Builder(requireActivity()).setTitle(R.string.add_achievement)
-            .setIcon(R.drawable.ic_edit).setView(alertAddAttachmentView).setCancelable(false)
+        AlertDialog.Builder(requireActivity(), R.style.AlertDialogTheme)
+            .setTitle(R.string.add_achievement)
+            .setIcon(R.drawable.ic_edit)
+            .setView(alertAddAttachmentView)
+            .setCancelable(false)
             .setPositiveButton("Submit") { _: DialogInterface?, _: Int ->
                 val desc = alertAddAttachmentBinding.etDesc.text.toString().trim { it <= ' ' }
                 val title = alertAddAttachmentBinding.etTitle.text.toString().trim { it <= ' ' }
diff --git a/app/src/main/java/org/ole/planet/myplanet/utilities/DialogUtils.kt b/app/src/main/java/org/ole/planet/myplanet/utilities/DialogUtils.kt
index 410efa7ef1..463fcf228a 100644
--- a/app/src/main/java/org/ole/planet/myplanet/utilities/DialogUtils.kt
+++ b/app/src/main/java/org/ole/planet/myplanet/utilities/DialogUtils.kt
@@ -102,7 +102,7 @@ object DialogUtils {
 
     @JvmStatic
     fun getAlertDialog(context: Context, title: String, v: View): AlertDialog {
-        return AlertDialog.Builder(context)
+        return AlertDialog.Builder(ContextThemeWrapper(context, R.style.AlertDialogTheme))
             .setTitle(title)
             .setIcon(R.drawable.ic_edit)
             .setView(v)
diff --git a/app/src/main/res/layout/alert_add_attachment.xml b/app/src/main/res/layout/alert_add_attachment.xml
index c2ddacd44a..f7ed3addeb 100644
--- a/app/src/main/res/layout/alert_add_attachment.xml
+++ b/app/src/main/res/layout/alert_add_attachment.xml
@@ -8,16 +8,17 @@
     <com.google.android.material.textfield.TextInputLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="@dimen/padding_normal">
+        android:padding="@dimen/padding_normal"
+        android:textColorHint="@color/hint_color">
 
         <EditText
             android:id="@+id/et_title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:hint="@string/title_asterisk" />
+            android:hint="@string/title_asterisk"
+            android:textColor="@color/daynight_textColor" />
     </com.google.android.material.textfield.TextInputLayout>
 
-
     <TextView
         android:id="@+id/tv_date"
         android:layout_width="match_parent"
@@ -29,18 +30,21 @@
         android:padding="@dimen/padding_normal"
         android:text="@string/date"
         android:textSize="@dimen/text_size_mid"
-        app:drawableRightCompat="@drawable/ic_date" />
-
+        android:textColor="@color/daynight_textColor"
+        app:drawableRightCompat="@drawable/ic_date"
+        app:drawableTint="@color/daynight_textColor" />
     <com.google.android.material.textfield.TextInputLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="@dimen/padding_normal">
+        android:padding="@dimen/padding_normal"
+        android:textColorHint="@color/hint_color">
 
         <EditText
             android:id="@+id/et_desc"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:hint="@string/description" />
+            android:hint="@string/description"
+            android:textColor="@color/daynight_textColor" />
     </com.google.android.material.textfield.TextInputLayout>
 
     <Button
@@ -51,4 +55,4 @@
         android:background="@drawable/buttongrey"
         android:padding="@dimen/padding_normal"
         android:text="@string/add_resources" />
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/alert_reference.xml b/app/src/main/res/layout/alert_reference.xml
index 3fc73a1d3f..d2021c397b 100644
--- a/app/src/main/res/layout/alert_reference.xml
+++ b/app/src/main/res/layout/alert_reference.xml
@@ -8,53 +8,56 @@
         android:id="@+id/tl_name"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="@dimen/padding_normal">
+        android:padding="@dimen/padding_normal"
+        android:textColorHint="@color/hint_color">
 
         <EditText
             android:id="@+id/et_name"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:hint="@string/name_asterisk" />
-
+            android:hint="@string/name_asterisk"
+            android:textColor="@color/daynight_textColor" />
     </com.google.android.material.textfield.TextInputLayout>
 
     <com.google.android.material.textfield.TextInputLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="@dimen/padding_normal">
+        android:padding="@dimen/padding_normal"
+        android:textColorHint="@color/hint_color">
 
         <EditText
             android:id="@+id/et_relationship"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:hint="@string/relationship" />
-
+            android:hint="@string/relationship"
+            android:textColor="@color/daynight_textColor" />
     </com.google.android.material.textfield.TextInputLayout>
 
     <com.google.android.material.textfield.TextInputLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="@dimen/padding_normal">
+        android:padding="@dimen/padding_normal"
+        android:textColorHint="@color/hint_color">
 
         <EditText
             android:id="@+id/et_phone"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:hint="@string/phone_number" />
-
+            android:hint="@string/phone_number"
+            android:textColor="@color/daynight_textColor" />
     </com.google.android.material.textfield.TextInputLayout>
 
     <com.google.android.material.textfield.TextInputLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="@dimen/padding_normal">
+        android:padding="@dimen/padding_normal"
+        android:textColorHint="@color/hint_color">
 
         <EditText
             android:id="@+id/et_email"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:hint="@string/email" />
-
+            android:hint="@string/email"
+            android:textColor="@color/daynight_textColor" />
     </com.google.android.material.textfield.TextInputLayout>
-
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_edit_achievement.xml b/app/src/main/res/layout/fragment_edit_achievement.xml
index 6a836b3a8a..5b34acc0e4 100644
--- a/app/src/main/res/layout/fragment_edit_achievement.xml
+++ b/app/src/main/res/layout/fragment_edit_achievement.xml
@@ -6,17 +6,16 @@
     android:layout_height="match_parent"
     tools:context=".ui.userprofile.EditAchievementFragment">
 
-
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:background="@color/secondary_bg">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:orientation="vertical">
 
-
             <LinearLayout
                 android:id="@+id/ll_actions"
                 android:layout_width="match_parent"
@@ -36,7 +35,6 @@
                     android:textColor="@color/md_white_1000"
                     android:textSize="24sp"
                     android:textStyle="bold" />
-
                 <Button
                     android:id="@+id/btn_edit"
                     style="@style/YellowButtons"
@@ -47,11 +45,8 @@
                     android:contentDescription="@string/edit_achievement"
                     android:padding="@dimen/padding_normal"
                     android:text="@string/edit_achievement" />
-
-
             </LinearLayout>
 
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -67,55 +62,52 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:padding="@dimen/padding_normal">
+                        android:padding="@dimen/padding_normal"
+                        android:textColorHint="@color/hint_color">
 
                         <EditText
                             android:id="@+id/et_fname"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-
-                            android:hint="@string/first_name" />
-
+                            android:hint="@string/first_name"
+                            android:textColor="@color/daynight_textColor" />
                     </com.google.android.material.textfield.TextInputLayout>
 
                     <com.google.android.material.textfield.TextInputLayout
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:padding="@dimen/padding_normal">
+                        android:padding="@dimen/padding_normal"
+                        android:textColorHint="@color/hint_color">
 
                         <EditText
                             android:id="@+id/et_mname"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-
-                            android:hint="@string/middle_name" />
-
+                            android:hint="@string/middle_name"
+                            android:textColor="@color/daynight_textColor" />
                     </com.google.android.material.textfield.TextInputLayout>
 
                     <com.google.android.material.textfield.TextInputLayout
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:padding="@dimen/padding_normal">
+                        android:padding="@dimen/padding_normal"
+                        android:textColorHint="@color/hint_color">
 
                         <EditText
                             android:id="@+id/et_lname"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:hint="@string/last_name" />
-
+                            android:hint="@string/last_name"
+                            android:textColor="@color/daynight_textColor" />
                     </com.google.android.material.textfield.TextInputLayout>
-
-
                 </LinearLayout>
 
-
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
 
-
                     <TextView
                         android:id="@+id/txt_dob"
                         android:layout_width="0dp"
@@ -128,29 +120,30 @@
                         android:padding="@dimen/padding_normal"
                         android:text="@string/birth_date"
                         android:textSize="@dimen/text_size_mid"
-                        app:drawableRightCompat="@drawable/ic_date" />
-
+                        android:textColor="@color/daynight_textColor"
+                        app:drawableRightCompat="@drawable/ic_date"
+                        app:drawableTint="@color/daynight_textColor" />
                     <com.google.android.material.textfield.TextInputLayout
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:padding="@dimen/padding_normal">
+                        android:padding="@dimen/padding_normal"
+                        android:textColorHint="@color/hint_color">
 
                         <EditText
                             android:id="@+id/et_birthplace"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:hint="@string/birth_place" />
-
+                            android:hint="@string/birth_place"
+                            android:textColor="@color/daynight_textColor" />
                     </com.google.android.material.textfield.TextInputLayout>
-
-
                 </LinearLayout>
 
                 <com.google.android.material.textfield.TextInputLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:padding="@dimen/padding_normal">
+                    android:padding="@dimen/padding_normal"
+                    android:textColorHint="@color/hint_color">
 
                     <EditText
                         android:id="@+id/et_purpose"
@@ -158,14 +151,15 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
                         android:hint="My Purpose - What are your educational and professional ambitions?"
-                        android:textSize="20sp" />
-
+                        android:textSize="20sp"
+                        android:textColor="@color/daynight_textColor" />
                 </com.google.android.material.textfield.TextInputLayout>
 
                 <com.google.android.material.textfield.TextInputLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:padding="@dimen/padding_normal">
+                    android:padding="@dimen/padding_normal"
+                    android:textColorHint="@color/hint_color">
 
                     <EditText
                         android:id="@+id/et_goals"
@@ -173,14 +167,15 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
                         android:hint="My Goals - What are your goals for next 10 years?"
-                        android:textSize="20sp" />
-
+                        android:textSize="20sp"
+                        android:textColor="@color/daynight_textColor" />
                 </com.google.android.material.textfield.TextInputLayout>
 
                 <com.google.android.material.textfield.TextInputLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:padding="@dimen/padding_normal">
+                    android:padding="@dimen/padding_normal"
+                    android:textColorHint="@color/hint_color">
 
                     <EditText
                         android:id="@+id/et_achievement"
@@ -188,23 +183,21 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
                         android:hint="Summery of achievements - Briefly summarize your achievement and add related materials below"
-                        android:textSize="20sp" />
-
+                        android:textSize="20sp"
+                        android:textColor="@color/daynight_textColor" />
                 </com.google.android.material.textfield.TextInputLayout>
 
-
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:padding="@dimen/padding_small"
-                    android:text="Add any materials demonstrating your achievements below" />
-
+                    android:text="Add any materials demonstrating your achievements below"
+                    android:textColor="@color/daynight_textColor" />
                 <LinearLayout
                     android:id="@+id/ll_attachment"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="vertical" />
-
                 <Button
                     android:id="@+id/btn_achievement"
                     android:layout_width="wrap_content"
@@ -213,20 +206,17 @@
                     android:contentDescription="@string/add_an_achievement"
                     android:text="@string/add_an_achievement"
                     android:theme="@style/PrimaryButton" />
-
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:padding="@dimen/padding_small"
-                    android:text="Add any references below" />
-
+                    android:text="Add any references below"
+                    android:textColor="@color/daynight_textColor" />
                 <LinearLayout
                     android:id="@+id/ll_other_info"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="vertical" />
-
-
                 <Button
                     android:id="@+id/btn_other"
                     android:layout_width="wrap_content"
@@ -235,7 +225,6 @@
                     android:contentDescription="@string/add_a_reference"
                     android:text="@string/add_a_reference"
                     android:theme="@style/PrimaryButton" />
-
                 <CheckBox
                     android:id="@+id/cb_send_to_nation"
                     android:layout_width="match_parent"
@@ -243,8 +232,9 @@
                     android:layout_gravity="center"
                     android:padding="@dimen/padding_normal"
                     android:text="@string/send_to_nation"
-                    android:textSize="@dimen/text_size_large" />
-
+                    android:textSize="@dimen/text_size_large"
+                    android:textColor="@color/daynight_textColor"
+                    app:buttonTint="@color/daynight_textColor" />
                 <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -257,7 +247,6 @@
                         android:contentDescription="@string/button_update"
                         android:text="@string/button_update"
                         android:theme="@style/PrimaryButton" />
-
                     <Button
                         android:id="@+id/btn_cancel"
                         android:layout_width="wrap_content"
@@ -265,15 +254,8 @@
                         android:contentDescription="@string/button_cancel"
                         android:text="@string/button_cancel"
                         android:theme="@style/AccentButton" />
-
                 </LinearLayout>
-
             </LinearLayout>
-
-
         </LinearLayout>
-
     </androidx.core.widget.NestedScrollView>
-
-
 </FrameLayout>