diff --git a/app/src/main/res/layout/fragment_my_repositories.xml b/app/src/main/res/layout/fragment_my_repositories.xml
index a5321ad9..f079ce0f 100644
--- a/app/src/main/res/layout/fragment_my_repositories.xml
+++ b/app/src/main/res/layout/fragment_my_repositories.xml
@@ -14,7 +14,7 @@
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@color/colorPrimary"
+            android:background="?attr/primaryBackgroundColor"
             android:padding="4dp"
             android:scrollbars="vertical" />
 
@@ -47,7 +47,7 @@
         android:layout_height="match_parent"
         android:layout_margin="15dp"
         android:text="@string/noData"
-        android:textColor="@color/white"
+        android:textColor="?attr/primaryTextColor"
         android:gravity="center"
         android:textSize="20sp"
         android:visibility="gone" />
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index 7202296d..37325ca1 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -2,12 +2,12 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorPrimary">
+    android:background="?attr/primaryBackgroundColor">
 
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/backgroundColor" >
+        android:background="?attr/primaryBackgroundColor" >
 
         <RelativeLayout
             android:layout_width="match_parent"
@@ -27,7 +27,6 @@
                 android:layout_marginTop="20dp"
                 android:layout_marginBottom="20dp"
                 android:layout_below="@id/timeLayout"
-                android:background="@color/divider"
                 />
 
             <include
diff --git a/app/src/main/res/layout/fragment_starred_repositories.xml b/app/src/main/res/layout/fragment_starred_repositories.xml
index 9ebb0f8c..21c475a9 100644
--- a/app/src/main/res/layout/fragment_starred_repositories.xml
+++ b/app/src/main/res/layout/fragment_starred_repositories.xml
@@ -14,7 +14,7 @@
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@color/colorPrimary"
+            android:background="?attr/primaryBackgroundColor"
             android:padding="4dp"
             android:scrollbars="vertical"
             />
@@ -28,7 +28,7 @@
         android:layout_margin="15dp"
         android:gravity="center"
         android:text="@string/noData"
-        android:textColor="@color/white"
+        android:textColor="?attr/primaryTextColor"
         android:textSize="20sp"
         android:visibility="gone" />
 
diff --git a/app/src/main/res/layout/layout_settings_appearance.xml b/app/src/main/res/layout/layout_settings_appearance.xml
index ddcf6a23..57beb3e6 100644
--- a/app/src/main/res/layout/layout_settings_appearance.xml
+++ b/app/src/main/res/layout/layout_settings_appearance.xml
@@ -4,7 +4,7 @@
     android:layout_height="wrap_content"
     android:id="@+id/layoutTime"
     android:orientation="vertical"
-    android:background="@color/colorPrimary">
+    android:background="?attr/primaryBackgroundColor">
 
     <TextView
         android:id="@+id/tvAppearance"
@@ -14,6 +14,7 @@
         android:drawableStart="@drawable/ic_color"
         android:drawablePadding="20dp"
         android:text="@string/settingsAppearanceHeader"
+        android:textStyle="bold"
         android:textColor="@color/colorDarkGreen"/>
 
     <LinearLayout
@@ -32,7 +33,7 @@
             android:layout_marginStart="44dp"
             android:layout_marginEnd="4dp"
             android:text="@string/settingsDateTimeHeaderText"
-            android:textColor="@color/white"/>
+            android:textColor="?attr/primaryTextColor"/>
 
         <TextView
             android:id="@+id/tvDateTimeSelected"
@@ -42,7 +43,7 @@
             android:layout_marginStart="44dp"
             android:layout_marginEnd="4dp"
             android:text="@string/settingsDateTimeHeaderDefault"
-            android:textColor="@color/white"/>
+            android:textColor="?attr/selectedTextColor"/>
 
     </LinearLayout>
 
@@ -61,7 +62,7 @@
             android:layout_marginStart="44dp"
             android:layout_marginEnd="4dp"
             android:text="@string/settingsIssueBadgeHeaderText"
-            android:textColor="@color/white"/>
+            android:textColor="?attr/primaryTextColor"/>
 
         <Switch
             android:id="@+id/switchIssuesBadge"
@@ -91,7 +92,7 @@
             android:layout_marginStart="44dp"
             android:layout_marginEnd="4dp"
             android:text="@string/codeBlockHeaderText"
-            android:textColor="@color/white"/>
+            android:textColor="?attr/primaryTextColor"/>
 
         <TextView
             android:id="@+id/codeBlockSelected"
@@ -101,7 +102,7 @@
             android:layout_marginStart="44dp"
             android:layout_marginEnd="4dp"
             android:text="@string/codeBlockSelectedText"
-            android:textColor="@color/white"/>
+            android:textColor="?attr/selectedTextColor"/>
 
     </LinearLayout>
 
@@ -121,7 +122,7 @@
             android:layout_marginStart="44dp"
             android:layout_marginEnd="4dp"
             android:text="@string/settingsHomeScreenHeaderText"
-            android:textColor="@color/white"/>
+            android:textColor="?attr/primaryTextColor"/>
 
         <TextView
             android:id="@+id/homeScreenSelected"
@@ -131,7 +132,7 @@
             android:layout_marginStart="44dp"
             android:layout_marginEnd="4dp"
             android:text="@string/settingsHomeScreenSelectedText"
-            android:textColor="@color/white"/>
+            android:textColor="?attr/selectedTextColor"/>
 
     </LinearLayout>
 
@@ -151,7 +152,7 @@
             android:layout_marginStart="44dp"
             android:layout_marginEnd="4dp"
             android:text="@string/settingsCustomFontHeaderText"
-            android:textColor="@color/white"/>
+            android:textColor="?attr/primaryTextColor"/>
 
         <TextView
             android:id="@+id/customFontSelected"
@@ -161,7 +162,7 @@
             android:layout_marginStart="44dp"
             android:layout_marginEnd="4dp"
             android:text="@string/defaultCopy"
-            android:textColor="@color/white"/>
+            android:textColor="?attr/selectedTextColor"/>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/layout_settings_languages.xml b/app/src/main/res/layout/layout_settings_languages.xml
index 41a0453f..cae6160c 100644
--- a/app/src/main/res/layout/layout_settings_languages.xml
+++ b/app/src/main/res/layout/layout_settings_languages.xml
@@ -4,7 +4,7 @@
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:layout_below="@+id/translationDivider"
-    android:background="@color/colorPrimary">
+    android:background="?attr/primaryBackgroundColor">
 
     <TextView
         android:id="@+id/tvLanguage"
@@ -14,6 +14,7 @@
         android:drawableStart="@drawable/ic_language"
         android:drawablePadding="20dp"
         android:text="@string/settingsLanguageHeaderText"
+        android:textStyle="bold"
         android:textColor="@color/colorDarkGreen"/>
 
     <LinearLayout
@@ -32,7 +33,7 @@
             android:layout_marginStart="44dp"
             android:layout_marginEnd="4dp"
             android:text="@string/settingsLanguageSelectorHeader"
-            android:textColor="@color/white"/>
+            android:textColor="?attr/primaryTextColor"/>
 
         <TextView
             android:id="@+id/tvLanguageSelected"
@@ -42,7 +43,7 @@
             android:layout_marginStart="44dp"
             android:layout_marginEnd="4dp"
             android:text="@string/settingsLanguageSelectedHeaderDefault"
-            android:textColor="@color/white"/>
+            android:textColor="?attr/selectedTextColor"/>
 
         <TextView
             android:id="@+id/helpTranslate"
diff --git a/app/src/main/res/layout/my_repos_list.xml b/app/src/main/res/layout/my_repos_list.xml
index 6a76758b..84c64108 100644
--- a/app/src/main/res/layout/my_repos_list.xml
+++ b/app/src/main/res/layout/my_repos_list.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/backgroundColor" >
+    android:background="?attr/primaryBackgroundColor" >
 
     <TextView
         android:id="@+id/repoType"
@@ -20,7 +20,6 @@
         android:fitsSystemWindows="true"
         android:orientation="vertical"
         android:padding="10dp"
-        android:theme="@style/AppTheme"
         tools:context=".activities.MainActivity">
 
         <ImageView
@@ -51,7 +50,7 @@
                     android:layout_weight=".95"
                     android:layout_marginBottom="5dp"
                     android:text="@string/repoName"
-                    android:textColor="@color/white"
+                    android:textColor="?attr/primaryTextColor"
                     android:textSize="18sp" />
 
                 <ImageView
@@ -71,7 +70,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="5dp"
                 android:text="@string/repoFullname"
-                android:textColor="@color/colorWhite"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp" />
 
             <TextView
@@ -80,7 +79,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="10dp"
                 android:text="@string/repoDescription"
-                android:textColor="@color/colorWhite"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:visibility="gone" />
 
@@ -101,7 +100,7 @@
                     android:gravity="center_vertical"
                     android:layout_gravity="center_vertical"
                     android:text="@string/repoWatchers"
-                    android:textColor="@color/colorWhite"
+                    android:textColor="?attr/primaryTextColor"
                     android:textSize="16sp" />
 
                 <TextView
@@ -114,7 +113,7 @@
                     android:gravity="center_vertical"
                     android:layout_gravity="center_vertical"
                     android:text="@string/repoStars"
-                    android:textColor="@color/colorWhite"
+                    android:textColor="?attr/primaryTextColor"
                     android:textSize="16sp" />
 
                 <TextView
@@ -127,7 +126,7 @@
                     android:gravity="center_vertical"
                     android:layout_gravity="center_vertical"
                     android:text="@string/repoWatchers"
-                    android:textColor="@color/colorWhite"
+                    android:textColor="?attr/primaryTextColor"
                     android:textSize="16sp" />
 
                 <ImageView
diff --git a/app/src/main/res/layout/starred_repos_list.xml b/app/src/main/res/layout/starred_repos_list.xml
index 32c4cedc..2b6dabb3 100644
--- a/app/src/main/res/layout/starred_repos_list.xml
+++ b/app/src/main/res/layout/starred_repos_list.xml
@@ -10,8 +10,7 @@
     android:fitsSystemWindows="true"
     android:orientation="vertical"
     android:padding="10dp"
-    android:theme="@style/AppTheme"
-    android:background="@color/backgroundColor"
+    android:background="?attr/primaryBackgroundColor"
     tools:context=".activities.MainActivity">
 
     <TextView
@@ -48,7 +47,7 @@
                 android:layout_weight=".95"
                 android:layout_marginBottom="5dp"
                 android:text="@string/repoName"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="18sp" />
 
             <ImageView
@@ -68,7 +67,7 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="5dp"
             android:text="@string/repoFullname"
-            android:textColor="@color/colorWhite"
+            android:textColor="?attr/primaryTextColor"
             android:textSize="16sp" />
 
         <TextView
@@ -77,7 +76,7 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="10dp"
             android:text="@string/repoDescription"
-            android:textColor="@color/colorWhite"
+            android:textColor="?attr/primaryTextColor"
             android:textSize="16sp"
             android:visibility="gone" />
 
@@ -98,7 +97,7 @@
                 android:gravity="center_vertical"
                 android:layout_gravity="center_vertical"
                 android:text="@string/repoWatchers"
-                android:textColor="@color/colorWhite"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="14sp" />
 
             <TextView
@@ -111,7 +110,7 @@
                 android:gravity="center_vertical"
                 android:layout_gravity="center_vertical"
                 android:text="@string/repoStars"
-                android:textColor="@color/colorWhite"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="14sp" />
 
             <TextView
@@ -124,7 +123,7 @@
                 android:gravity="center_vertical"
                 android:layout_gravity="center_vertical"
                 android:text="@string/repoWatchers"
-                android:textColor="@color/colorWhite"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="14sp" />
 
             <ImageView
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 862be9e5..aa54a526 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -4,4 +4,5 @@
     <attr name="primaryBackgroundColor" format="reference" />
     <attr name="inputBackgroundColor" format="reference" />
     <attr name="inputTextColor" format="reference" />
+    <attr name="selectedTextColor" format="reference" />
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index ed64bb5f..08d65633 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -12,6 +12,7 @@
         <item name="inputBackgroundColor">@color/inputBackground</item>
         <item name="inputTextColor">@color/colorWhite</item>
         <item name="checkboxStyle">@style/AppThemeCheckBoxStyle</item>
+        <item name="selectedTextColor">@color/darkGreen</item>
     </style>
 
     <!-- Light theme -->
@@ -25,6 +26,7 @@
         <item name="inputBackgroundColor">@color/lightThemeInputBackground</item>
         <item name="inputTextColor">@color/lightThemeInputTextColor</item>
         <item name="checkboxStyle">@style/AppThemeLightCheckBoxStyle</item>
+        <item name="selectedTextColor">@color/darkGreen</item>
     </style>
 
     <style name="AppThemeLightCheckBoxStyle" parent="Base.Widget.AppCompat.CompoundButton.CheckBox">