diff --git a/app/src/main/res/layout/activity_add_source.xml b/app/src/main/res/layout/activity_add_source.xml
index c9166c0..5ae96f4 100644
--- a/app/src/main/res/layout/activity_add_source.xml
+++ b/app/src/main/res/layout/activity_add_source.xml
@@ -55,7 +55,8 @@
                 android:layout_marginRight="16dp"
                 android:layout_marginStart="16dp"
                 app:layout_constraintLeft_toLeftOf="parent"
-                android:layout_marginLeft="16dp"/>
+                android:layout_marginLeft="16dp"
+                android:gravity="center_horizontal" />
 
             <EditText
                 android:layout_width="match_parent"
@@ -67,7 +68,9 @@
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
                 android:inputType="text"
-                android:hint="@string/add_source_hint_name"/>
+                android:hint="@string/add_source_hint_name"
+                android:textColorHint="?android:textColorPrimary"
+                android:autofillHints="false" />
 
             <EditText
                 android:layout_width="match_parent"
@@ -76,10 +79,12 @@
                 android:ems="10"
                 android:id="@+id/sourceUri"
                 android:hint="@string/add_source_hint_url"
+                android:textColorHint="?android:textColorPrimary"
                 android:layout_marginTop="16dp"
                 app:layout_constraintTop_toBottomOf="@+id/nameInput"
                 app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintLeft_toLeftOf="parent"/>
+                app:layout_constraintLeft_toLeftOf="parent"
+                android:autofillHints="false" />
 
             <EditText
                 android:layout_width="match_parent"
@@ -91,7 +96,9 @@
                 android:layout_marginTop="16dp"
                 app:layout_constraintTop_toBottomOf="@+id/sourceUri"
                 android:hint="@string/add_source_hint_tags"
-                android:inputType="text"/>
+                android:textColorHint="?android:textColorPrimary"
+                android:inputType="text"
+                android:autofillHints="false" />
 
             <Spinner
                 android:layout_width="match_parent"
@@ -100,7 +107,8 @@
                 app:layout_constraintTop_toBottomOf="@+id/tags"
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintLeft_toLeftOf="parent"
-                android:layout_height="40dp"/>
+                android:layout_height="40dp"
+                android:theme="@style/App.Spinner"/>
 
             <Button
                 android:text="@string/add_source_save"
diff --git a/app/src/main/res/layout/source_list_item.xml b/app/src/main/res/layout/source_list_item.xml
index 575eb1e..1671514 100644
--- a/app/src/main/res/layout/source_list_item.xml
+++ b/app/src/main/res/layout/source_list_item.xml
@@ -26,6 +26,7 @@
         android:maxLines="1"
         android:textAlignment="textStart"
         android:textSize="13sp"
+        android:textColor="?android:textColorPrimary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/deleteBtn"
         app:layout_constraintStart_toEndOf="@+id/itemImage"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f5d5e4a..fdf7efb 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -58,4 +58,9 @@
         <item name="android:tint">?android:textColorPrimary</item>
     </style>
 
+    <!-- Spinner Theme -->
+    <style name="App.Spinner" parent="Widget.AppCompat.Light.DropDownItem.Spinner">
+        <item name="android:textColor">?android:textColorPrimary</item>
+    </style>
+
 </resources>