Prepare to add different themes. Try fixing timeout issue in okhttp3.

21 files changed, 205 insertions, 76 deletions

diff --git a/app/src/main/res/layout/activity_multi_reddit_listing.xml b/app/src/main/res/layout/activity_multi_reddit_listing.xml
index 1669a8c8..ef04c4e7 100644
--- a/app/src/main/res/layout/activity_multi_reddit_listing.xml
+++ b/app/src/main/res/layout/activity_multi_reddit_listing.xml
@@ -76,7 +76,7 @@
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/fab_margin"
         android:layout_gravity="bottom|end"
-        app:backgroundTint="@color/backgroundColorPrimary"
+        app:backgroundTint="?attr/colorPrimaryLightTheme"
         app:srcCompat="@drawable/ic_add_bottom_app_bar_24dp"
         app:tint="@android:color/white" />
 
diff --git a/app/src/main/res/layout/activity_post_image.xml b/app/src/main/res/layout/activity_post_image.xml
index 9c320679..92254896 100644
--- a/app/src/main/res/layout/activity_post_image.xml
+++ b/app/src/main/res/layout/activity_post_image.xml
@@ -92,7 +92,7 @@
                     android:textSize="?attr/font_default"
                     android:visibility="gone"
                     app:lib_setRadius="3dp"
-                    app:lib_setRoundedBorderColor="@color/colorPrimaryDarkDayNightTheme"
+                    app:lib_setRoundedBorderColor="?attr/flairColor"
                     app:lib_setRoundedView="true"
                     app:lib_setShape="rectangle" />
 
@@ -106,7 +106,7 @@
                     android:textColor="@color/primaryTextColor"
                     android:textSize="?attr/font_default"
                     app:lib_setRadius="3dp"
-                    app:lib_setRoundedBorderColor="@color/colorPrimaryDarkDayNightTheme"
+                    app:lib_setRoundedBorderColor="?attr/spoilerColor"
                     app:lib_setRoundedView="true"
                     app:lib_setShape="rectangle" />
 
@@ -164,7 +164,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintEnd_toStartOf="@+id/select_from_library_fab_post_image_activity"
                     app:layout_constraintHorizontal_chainStyle="spread"
-                    app:backgroundTint="@color/backgroundColorPrimary"
+                    app:backgroundTint="?attr/colorPrimaryLightTheme"
                     app:tint="@android:color/white" />
 
                 <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -177,7 +177,7 @@
                     app:layout_constraintStart_toEndOf="@+id/capture_fab_post_image_activity"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintHorizontal_chainStyle="spread"
-                    app:backgroundTint="@color/backgroundColorPrimary"
+                    app:backgroundTint="?attr/colorPrimaryLightTheme"
                     app:tint="@android:color/white" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_post_link.xml b/app/src/main/res/layout/activity_post_link.xml
index 24ba75b6..7aed97e1 100644
--- a/app/src/main/res/layout/activity_post_link.xml
+++ b/app/src/main/res/layout/activity_post_link.xml
@@ -92,7 +92,7 @@
                     android:textSize="?attr/font_default"
                     android:visibility="gone"
                     app:lib_setRadius="3dp"
-                    app:lib_setRoundedBorderColor="@color/colorPrimaryDarkDayNightTheme"
+                    app:lib_setRoundedBorderColor="?attr/flairColor"
                     app:lib_setRoundedView="true"
                     app:lib_setShape="rectangle" />
 
@@ -106,7 +106,7 @@
                     android:textColor="@color/primaryTextColor"
                     android:textSize="?attr/font_default"
                     app:lib_setRadius="3dp"
-                    app:lib_setRoundedBorderColor="@color/colorPrimaryDarkDayNightTheme"
+                    app:lib_setRoundedBorderColor="?attr/spoilerColor"
                     app:lib_setRoundedView="true"
                     app:lib_setShape="rectangle" />
 
diff --git a/app/src/main/res/layout/activity_post_text.xml b/app/src/main/res/layout/activity_post_text.xml
index 7cabdf0b..5f6d638d 100644
--- a/app/src/main/res/layout/activity_post_text.xml
+++ b/app/src/main/res/layout/activity_post_text.xml
@@ -92,7 +92,7 @@
                     android:textSize="?attr/font_default"
                     android:visibility="gone"
                     app:lib_setRadius="3dp"
-                    app:lib_setRoundedBorderColor="@color/colorPrimaryDarkDayNightTheme"
+                    app:lib_setRoundedBorderColor="?attr/flairColor"
                     app:lib_setRoundedView="true"
                     app:lib_setShape="rectangle" />
 
@@ -106,7 +106,7 @@
                     android:textColor="@color/primaryTextColor"
                     android:textSize="?attr/font_default"
                     app:lib_setRadius="3dp"
-                    app:lib_setRoundedBorderColor="@color/colorPrimaryDarkDayNightTheme"
+                    app:lib_setRoundedBorderColor="?attr/spoilerColor"
                     app:lib_setRoundedView="true"
                     app:lib_setShape="rectangle" />
 
diff --git a/app/src/main/res/layout/activity_post_video.xml b/app/src/main/res/layout/activity_post_video.xml
index 2e3057d5..341034a7 100644
--- a/app/src/main/res/layout/activity_post_video.xml
+++ b/app/src/main/res/layout/activity_post_video.xml
@@ -92,7 +92,7 @@
                     android:textSize="?attr/font_default"
                     android:visibility="gone"
                     app:lib_setRadius="3dp"
-                    app:lib_setRoundedBorderColor="@color/colorPrimaryDarkDayNightTheme"
+                    app:lib_setRoundedBorderColor="?attr/flairColor"
                     app:lib_setRoundedView="true"
                     app:lib_setShape="rectangle" />
 
@@ -106,7 +106,7 @@
                     android:textColor="@color/primaryTextColor"
                     android:textSize="?attr/font_default"
                     app:lib_setRadius="3dp"
-                    app:lib_setRoundedBorderColor="@color/colorPrimaryDarkDayNightTheme"
+                    app:lib_setRoundedBorderColor="?attr/spoilerColor"
                     app:lib_setRoundedView="true"
                     app:lib_setShape="rectangle" />
 
@@ -164,7 +164,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintEnd_toStartOf="@+id/select_from_library_fab_post_video_activity"
                     app:layout_constraintHorizontal_chainStyle="spread"
-                    app:backgroundTint="@color/backgroundColorPrimary"
+                    app:backgroundTint="?attr/colorPrimaryLightTheme"
                     app:tint="@android:color/white" />
 
                 <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -177,7 +177,7 @@
                     app:layout_constraintStart_toEndOf="@+id/capture_fab_post_video_activity"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintHorizontal_chainStyle="spread"
-                    app:backgroundTint="@color/backgroundColorPrimary"
+                    app:backgroundTint="?attr/colorPrimaryLightTheme"
                     app:tint="@android:color/white" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_view_post_detail.xml b/app/src/main/res/layout/activity_view_post_detail.xml
index 4ee9dff7..fb9bb240 100644
--- a/app/src/main/res/layout/activity_view_post_detail.xml
+++ b/app/src/main/res/layout/activity_view_post_detail.xml
@@ -76,7 +76,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_margin="@dimen/fab_margin"
-        app:backgroundTint="@color/backgroundColorPrimary"
+        app:backgroundTint="?attr/colorPrimaryLightTheme"
         app:tint="@android:color/white"
         app:srcCompat="@drawable/ic_keyboard_arrow_down_24dp" />
 
diff --git a/app/src/main/res/layout/activity_view_subreddit_detail.xml b/app/src/main/res/layout/activity_view_subreddit_detail.xml
index 6743aef0..f36640ce 100644
--- a/app/src/main/res/layout/activity_view_subreddit_detail.xml
+++ b/app/src/main/res/layout/activity_view_subreddit_detail.xml
@@ -203,7 +203,7 @@
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/fab_margin"
         android:visibility="gone"
-        app:backgroundTint="@color/backgroundColorPrimary"
+        app:backgroundTint="?attr/colorPrimaryLightTheme"
         app:srcCompat="@drawable/ic_add_bottom_app_bar_24dp"
         app:tint="@android:color/white"
         app:layout_anchor="@id/bottom_navigation_view_subreddit_detail_activity" />
diff --git a/app/src/main/res/layout/activity_view_user_detail.xml b/app/src/main/res/layout/activity_view_user_detail.xml
index efeee887..f1d257e6 100644
--- a/app/src/main/res/layout/activity_view_user_detail.xml
+++ b/app/src/main/res/layout/activity_view_user_detail.xml
@@ -66,7 +66,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginTop="16dp"
                         android:textSize="?attr/font_18"
-                        android:textColor="@color/colorPrimaryDarkDayNightTheme"
+                        android:textColor="?attr/username"
                         android:layout_gravity="center_horizontal"/>
 
                     <TextView
diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
index 34b44e02..88de7dcf 100644
--- a/app/src/main/res/layout/app_bar_main.xml
+++ b/app/src/main/res/layout/app_bar_main.xml
@@ -131,7 +131,7 @@
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/fab_margin"
         android:visibility="gone"
-        app:backgroundTint="@color/backgroundColorPrimary"
+        app:backgroundTint="?attr/colorPrimaryLightTheme"
         app:srcCompat="@drawable/ic_add_bottom_app_bar_24dp"
         app:tint="@android:color/white"
         app:layout_anchor="@id/bottom_navigation_main_activity" />
diff --git a/app/src/main/res/layout/item_comment.xml b/app/src/main/res/layout/item_comment.xml
index f80d6bfb..88307a62 100644
--- a/app/src/main/res/layout/item_comment.xml
+++ b/app/src/main/res/layout/item_comment.xml
@@ -14,8 +14,7 @@
         <View
             android:id="@+id/vertical_block_item_post_comment"
             android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:background="@color/colorPrimaryDarkDayNightTheme"/>
+            android:layout_height="match_parent" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -48,7 +47,7 @@
                     android:layout_marginEnd="8dp"
                     android:ellipsize="end"
                     android:maxLines="2"
-                    android:textColor="@color/colorPrimaryDarkDayNightTheme"
+                    android:textColor="?attr/username"
                     android:textSize="?attr/font_default"
                     app:layout_constraintBottom_toTopOf="@id/author_flair_text_view_item_post_comment"
                     app:layout_constraintEnd_toStartOf="@+id/barrier"
@@ -62,7 +61,7 @@
                     android:layout_marginEnd="8dp"
                     android:ellipsize="end"
                     android:maxLines="2"
-                    android:textColor="@color/authorFlairTextColor"
+                    android:textColor="?attr/authorFlairTextColor"
                     android:textSize="?attr/font_12"
                     android:visibility="gone"
                     app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/item_footer_error.xml b/app/src/main/res/layout/item_footer_error.xml
index 161ad1ab..fba52052 100644
--- a/app/src/main/res/layout/item_footer_error.xml
+++ b/app/src/main/res/layout/item_footer_error.xml
@@ -22,7 +22,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
         android:layout_centerVertical="true"
-        android:backgroundTint="@color/backgroundColorPrimary"
+        android:backgroundTint="?attr/colorPrimaryLightTheme"
         android:textColor="@android:color/white"
         android:text="@string/retry"
         android:textSize="?attr/font_default" />
diff --git a/app/src/main/res/layout/item_load_more_comments_placeholder.xml b/app/src/main/res/layout/item_load_more_comments_placeholder.xml
index 0a4a0047..8c0fb3e1 100644
--- a/app/src/main/res/layout/item_load_more_comments_placeholder.xml
+++ b/app/src/main/res/layout/item_load_more_comments_placeholder.xml
@@ -12,8 +12,7 @@
         <View
             android:id="@+id/vertical_block_item_load_more_comments"
             android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:background="@color/colorPrimaryDarkDayNightTheme" />
+            android:layout_height="match_parent" />
 
         <TextView
             android:id="@+id/placeholder_text_view_item_load_more_comments"
diff --git a/app/src/main/res/layout/item_post.xml b/app/src/main/res/layout/item_post.xml
index 80fee855..113f6855 100644
--- a/app/src/main/res/layout/item_post.xml
+++ b/app/src/main/res/layout/item_post.xml
@@ -49,7 +49,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="16dp"
                 android:layout_marginEnd="8dp"
-                android:textColor="@color/colorPrimaryDarkDayNightTheme"
+                android:textColor="?attr/username"
                 android:textSize="?attr/font_default"
                 android:maxLines="2"
                 android:ellipsize="end"
@@ -64,7 +64,7 @@
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:layout_marginEnd="8dp"
-                android:tint="@color/backgroundColorPrimaryDark"
+                android:tint="?attr/stickiedPost"
                 android:visibility="gone"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toEndOf="@id/name_text_view_item_post"
@@ -127,8 +127,8 @@
                 android:padding="4dp"
                 android:textSize="?attr/font_12"
                 android:textColor="@android:color/white"
-                app:lib_setRoundedBGColor="@color/backgroundColorPrimaryDark"
-                app:lib_setRoundedBorderColor="@color/backgroundColorPrimaryDark"
+                app:lib_setRoundedBGColor="?attr/post_type"
+                app:lib_setRoundedBorderColor="?attr/post_type"
                 app:lib_setRadius="3dp"
                 app:lib_setRoundedView="true"
                 app:lib_setShape="rectangle" />
@@ -144,8 +144,8 @@
                 android:padding="4dp"
                 android:visibility="gone"
                 app:lib_setRadius="3dp"
-                app:lib_setRoundedBGColor="@color/spoilerBackgroundColor"
-                app:lib_setRoundedBorderColor="@color/spoilerBackgroundColor"
+                app:lib_setRoundedBGColor="?attr/spoilerColor"
+                app:lib_setRoundedBorderColor="?attr/spoilerColor"
                 app:lib_setRoundedView="true"
                 app:lib_setShape="rectangle" />
 
@@ -174,8 +174,8 @@
                 android:padding="4dp"
                 android:visibility="gone"
                 app:lib_setRadius="3dp"
-                app:lib_setRoundedBGColor="@color/flairBackgroundColor"
-                app:lib_setRoundedBorderColor="@color/flairBackgroundColor"
+                app:lib_setRoundedBGColor="?attr/flairColor"
+                app:lib_setRoundedBorderColor="?attr/flairColor"
                 app:lib_setRoundedView="true"
                 app:lib_setShape="rectangle" />
 
@@ -194,7 +194,7 @@
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:src="@drawable/ic_archive_outline"
-                android:tint="@color/archivedTint"
+                android:tint="?attr/archivedTint"
                 android:visibility="gone" />
 
             <ImageView
@@ -202,7 +202,7 @@
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:src="@drawable/ic_outline_lock_24dp"
-                android:tint="@color/lockedIconTint"
+                android:tint="?attr/lockedIconTint"
                 android:visibility="gone" />
 
             <ImageView
@@ -210,7 +210,7 @@
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:src="@drawable/crosspost"
-                android:tint="@color/colorAccent"
+                android:tint="?attr/crosspost"
                 android:visibility="gone" />
 
         </com.nex3z.flowlayout.FlowLayout>
diff --git a/app/src/main/res/layout/item_post_compact.xml b/app/src/main/res/layout/item_post_compact.xml
index 7123c4db..ef7c2fe9 100644
--- a/app/src/main/res/layout/item_post_compact.xml
+++ b/app/src/main/res/layout/item_post_compact.xml
@@ -47,7 +47,7 @@
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:layout_marginEnd="8dp"
-                android:tint="@color/backgroundColorPrimaryDark"
+                android:tint="?attr/stickiedPost"
                 android:visibility="gone"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@+id/guideline2"
@@ -115,8 +115,8 @@
                     android:textColor="@android:color/white"
                     android:textSize="?attr/font_10"
                     app:lib_setRadius="3dp"
-                    app:lib_setRoundedBGColor="@color/backgroundColorPrimaryDark"
-                    app:lib_setRoundedBorderColor="@color/backgroundColorPrimaryDark"
+                    app:lib_setRoundedBGColor="?attr/post_type"
+                    app:lib_setRoundedBorderColor="?attr/post_type"
                     app:lib_setRoundedView="true"
                     app:lib_setShape="rectangle" />
 
@@ -131,8 +131,8 @@
                     android:textSize="?attr/font_10"
                     android:visibility="gone"
                     app:lib_setRadius="3dp"
-                    app:lib_setRoundedBGColor="@color/spoilerBackgroundColor"
-                    app:lib_setRoundedBorderColor="@color/spoilerBackgroundColor"
+                    app:lib_setRoundedBGColor="?attr/spoilerColor"
+                    app:lib_setRoundedBorderColor="?attr/spoilerColor"
                     app:lib_setRoundedView="true"
                     app:lib_setShape="rectangle" />
 
@@ -161,8 +161,8 @@
                     android:textSize="?attr/font_10"
                     android:visibility="gone"
                     app:lib_setRadius="3dp"
-                    app:lib_setRoundedBGColor="@color/flairBackgroundColor"
-                    app:lib_setRoundedBorderColor="@color/flairBackgroundColor"
+                    app:lib_setRoundedBGColor="?attr/flairColor"
+                    app:lib_setRoundedBorderColor="?attr/flairColor"
                     app:lib_setRoundedView="true"
                     app:lib_setShape="rectangle" />
 
@@ -181,7 +181,7 @@
                     android:layout_width="24dp"
                     android:layout_height="24dp"
                     android:src="@drawable/ic_archive_outline"
-                    android:tint="@color/archivedTint"
+                    android:tint="?attr/archivedTint"
                     android:visibility="gone" />
 
                 <ImageView
@@ -189,7 +189,7 @@
                     android:layout_width="24dp"
                     android:layout_height="24dp"
                     android:src="@drawable/ic_outline_lock_24dp"
-                    android:tint="@color/lockedIconTint"
+                    android:tint="?attr/lockedIconTint"
                     android:visibility="gone" />
 
                 <ImageView
@@ -197,7 +197,7 @@
                     android:layout_width="24dp"
                     android:layout_height="24dp"
                     android:src="@drawable/crosspost"
-                    android:tint="@color/colorAccent"
+                    android:tint="?attr/crosspost"
                     android:visibility="gone" />
 
             </com.nex3z.flowlayout.FlowLayout>
diff --git a/app/src/main/res/layout/item_post_detail.xml b/app/src/main/res/layout/item_post_detail.xml
index 54d48283..e0bcc418 100644
--- a/app/src/main/res/layout/item_post_detail.xml
+++ b/app/src/main/res/layout/item_post_detail.xml
@@ -26,7 +26,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             android:layout_marginEnd="8dp"
-            android:textColor="@color/colorAccent"
+            android:textColor="?attr/subreddit"
             android:textSize="?attr/font_default"
             android:maxLines="2"
             android:ellipsize="end"
@@ -41,7 +41,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             android:layout_marginEnd="8dp"
-            android:textColor="@color/colorPrimaryDarkDayNightTheme"
+            android:textColor="?attr/username"
             android:textSize="?attr/font_default"
             android:maxLines="2"
             android:ellipsize="end"
@@ -109,8 +109,8 @@
             android:padding="4dp"
             android:textSize="?attr/font_12"
             android:textColor="@android:color/white"
-            app:lib_setRoundedBGColor="@color/backgroundColorPrimaryDark"
-            app:lib_setRoundedBorderColor="@color/backgroundColorPrimaryDark"
+            app:lib_setRoundedBGColor="?attr/post_type"
+            app:lib_setRoundedBorderColor="?attr/post_type"
             app:lib_setRadius="3dp"
             app:lib_setRoundedView="true"
             app:lib_setShape="rectangle" />
@@ -126,8 +126,8 @@
             android:padding="4dp"
             android:visibility="gone"
             app:lib_setRadius="3dp"
-            app:lib_setRoundedBGColor="@color/spoilerBackgroundColor"
-            app:lib_setRoundedBorderColor="@color/spoilerBackgroundColor"
+            app:lib_setRoundedBGColor="?attr/spoilerColor"
+            app:lib_setRoundedBorderColor="?attr/spoilerColor"
             app:lib_setRoundedView="true"
             app:lib_setShape="rectangle" />
 
@@ -156,8 +156,8 @@
             android:textColor="@android:color/white"
             android:visibility="gone"
             app:lib_setRadius="3dp"
-            app:lib_setRoundedBGColor="@color/flairBackgroundColor"
-            app:lib_setRoundedBorderColor="@color/flairBackgroundColor"
+            app:lib_setRoundedBGColor="?attr/flairColor"
+            app:lib_setRoundedBorderColor="?attr/flairColor"
             app:lib_setRoundedView="true"
             app:lib_setShape="rectangle" />
 
@@ -176,7 +176,7 @@
             android:layout_width="20dp"
             android:layout_height="20dp"
             android:src="@drawable/ic_archive_outline"
-            android:tint="@color/archivedTint"
+            android:tint="?attr/archivedTint"
             android:visibility="gone" />
 
         <ImageView
@@ -184,7 +184,7 @@
             android:layout_width="20dp"
             android:layout_height="20dp"
             android:src="@drawable/ic_outline_lock_24dp"
-            android:tint="@color/lockedIconTint"
+            android:tint="?attr/lockedIconTint"
             android:visibility="gone" />
 
         <ImageView
@@ -192,7 +192,7 @@
             android:layout_width="20dp"
             android:layout_height="20dp"
             android:src="@drawable/crosspost"
-            android:tint="@color/colorAccent"
+            android:tint="?attr/crosspost"
             android:visibility="gone" />
 
     </com.nex3z.flowlayout.FlowLayout>
diff --git a/app/src/main/res/layout/item_subreddit_listing.xml b/app/src/main/res/layout/item_subreddit_listing.xml
index 68157c95..f9797e7e 100644
--- a/app/src/main/res/layout/item_subreddit_listing.xml
+++ b/app/src/main/res/layout/item_subreddit_listing.xml
@@ -36,7 +36,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:src="@drawable/ic_add_24dp"
-        android:tint="@color/colorPrimaryDarkDayNightTheme"
+        android:tint="?attr/unsubscribed"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/item_user_listing.xml b/app/src/main/res/layout/item_user_listing.xml
index a69b6a37..9ba6d291 100644
--- a/app/src/main/res/layout/item_user_listing.xml
+++ b/app/src/main/res/layout/item_user_listing.xml
@@ -36,7 +36,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:src="@drawable/ic_add_24dp"
-        android:tint="@color/colorPrimaryDarkDayNightTheme"
+        android:tint="?attr/unsubscribed"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index f5d0ec6c..61bd090a 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -10,7 +10,7 @@
 
     <color name="primaryTextColor">#FFFFFF</color>
 
-    <color name="colorPrimaryDarkDayNightTheme">#1E88E5</color>
+    <!--<color name="colorPrimaryDarkDayNightTheme">#1E88E5</color>-->
 
     <color name="dividerColor">#69666C</color>
 
@@ -18,9 +18,9 @@
 
     <color name="backgroundColor">#121212</color>
 
-    <color name="backgroundColorPrimary">#1565C0</color>
+    <!--<color name="backgroundColorPrimary">#1565C0</color>
 
-    <color name="backgroundColorPrimaryDark">#1565C0</color>
+    <color name="backgroundColorPrimaryDark">#1565C0</color>-->
 
     <color name="backgroundColorInverse">#FFFFFF</color>
 
@@ -28,7 +28,7 @@
 
     <color name="voteAndReplyUnavailableVoteButtonColor">#3C3C3C</color>
 
-    <color name="tabLayoutWithExpandedCollapsingToolbarTextColor">#FFFFFF</color>
+    <!--<color name="tabLayoutWithExpandedCollapsingToolbarTextColor">#FFFFFF</color>
 
     <color name="tabLayoutWithExpandedCollapsingToolbarTabBackground">@color/backgroundColor</color>
 
@@ -38,7 +38,7 @@
 
     <color name="tabLayoutWithCollapsedCollapsingToolbarTabBackground">@color/colorPrimary</color>
 
-    <color name="tabLayoutWithCollapsedCollapsingToolbarTabIndicator">@color/tabLayoutWithCollapsedCollapsingToolbarTextColor</color>
+    <color name="tabLayoutWithCollapsedCollapsingToolbarTabIndicator">@color/tabLayoutWithCollapsedCollapsingToolbarTextColor</color>-->
 
     <color name="navBarColor">@color/backgroundColor</color>
 
@@ -60,5 +60,5 @@
     <color name="commentVerticalBar6">#00B925</color>
     <color name="commentVerticalBar7">#EE4602</color>
 
-    <color name="toolbarAndTabBackgroundColor">#282828</color>
+    <!--<color name="toolbarAndTabBackgroundColor">#282828</color>-->
 </resources>
diff --git a/app/src/main/res/values/attr.xml b/app/src/main/res/values/attr.xml
index 37fc5341..9f35b9be 100644
--- a/app/src/main/res/values/attr.xml
+++ b/app/src/main/res/values/attr.xml
@@ -30,13 +30,36 @@
     <declare-styleable name="Theme">
         <attr name="colorPrimary" format="color"/>
         <attr name="colorPrimaryDark" format="color"/>
+        <attr name="colorAccent" format="color" />
+        <attr name="colorPrimaryLightTheme" format="color" />
         <attr name="backgroundColor" format="color"/>
         <attr name="roundedBottomSheetPrimaryBackground" format="color"/>
         <attr name="cardViewBackgroundColor" format="color"/>
         <attr name="toolbarAndTabBackgroundColor" format="color"/>
         <attr name="circularProgressBarBackground" format="color"/>
         <attr name="tabLayoutWithExpandedCollapsingToolbarTabBackground" format="color"/>
+        <attr name="tabLayoutWithExpandedCollapsingToolbarTextColor" format="color" />
+        <attr name="tabLayoutWithExpandedCollapsingToolbarTabIndicator" format="color" />
         <attr name="tabLayoutWithCollapsedCollapsingToolbarTabBackground" format="color"/>
+        <attr name="tabLayoutWithCollapsedCollapsingToolbarTextColor" format="color" />
+        <attr name="tabLayoutWithCollapsedCollapsingToolbarTabIndicator" format="color" />
         <attr name="navBarColor" format="color" />
+        <attr name="upvoted" format="color" />
+        <attr name="downvoted" format="color" />
+        <attr name="post_type" format="color" />
+        <attr name="spoilerColor" format="color" />
+        <attr name="nsfwColor" format="color" />
+        <attr name="flairColor" format="color" />
+        <attr name="archivedTint" format="color" />
+        <attr name="lockedIconTint" format="color" />
+        <attr name="crosspost" format="color" />
+        <attr name="stickiedPost" format="color" />
+        <attr name="subscribed" format="color" />
+        <attr name="unsubscribed" format="color" />
+        <attr name="username" format="color" />
+        <attr name="subreddit" format="color" />
+        <attr name="authorFlairTextColor" format="color" />
+        <attr name="submitter" format="color" />
+        <attr name="moderator" format="color" />
     </declare-styleable>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 43811d56..c7880cd7 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -10,7 +10,7 @@
 
     <color name="primaryTextColor">#000000</color>
 
-    <color name="colorPrimaryDarkDayNightTheme">@color/colorPrimaryDark</color>
+    <!--<color name="colorPrimaryDarkDayNightTheme">@color/colorPrimaryDark</color>-->
 
     <color name="dividerColor">#E0E0E0</color>
 
@@ -18,9 +18,9 @@
 
     <color name="backgroundColor">#FFFFFF</color>
 
-    <color name="backgroundColorPrimary">@color/colorPrimary</color>
+    <!--<color name="backgroundColorPrimary">@color/colorPrimary</color>
 
-    <color name="backgroundColorPrimaryDark">@color/colorPrimaryDark</color>
+    <color name="backgroundColorPrimaryDark">@color/colorPrimaryDark</color>-->
 
     <color name="backgroundColorInverse">#000000</color>
 
@@ -28,13 +28,13 @@
 
     <color name="roundedBottomSheetPrimaryNavigationBarColor">@android:color/black</color>
 
-    <color name="upvoted">#E91E63</color>
+    <!--<color name="upvoted">#E91E63</color>
 
-    <color name="downvoted">#007DDE</color>
+    <color name="downvoted">#007DDE</color>-->
 
     <color name="voteAndReplyUnavailableVoteButtonColor">#F0F0F0</color>
 
-    <color name="tabLayoutWithExpandedCollapsingToolbarTextColor">@color/colorPrimary</color>
+    <!--<color name="tabLayoutWithExpandedCollapsingToolbarTextColor">@color/colorPrimary</color>
 
     <color name="tabLayoutWithExpandedCollapsingToolbarTabBackground">#FFFFFF</color>
 
@@ -44,7 +44,7 @@
 
     <color name="tabLayoutWithCollapsedCollapsingToolbarTabBackground">@color/colorPrimary</color>
 
-    <color name="tabLayoutWithCollapsedCollapsingToolbarTabIndicator">@color/tabLayoutWithCollapsedCollapsingToolbarTextColor</color>
+    <color name="tabLayoutWithCollapsedCollapsingToolbarTabIndicator">@color/tabLayoutWithCollapsedCollapsingToolbarTextColor</color>-->
 
     <color name="navBarColor">#FFFFFF</color>
 
@@ -54,9 +54,9 @@
 
     <color name="unreadMessageBackgroundColor">#B3E5F9</color>
 
-    <color name="archivedTint">#B4009F</color>
+    <!--<color name="archivedTint">#B4009F</color>
 
-    <color name="lockedIconTint">#EE7302</color>
+    <color name="lockedIconTint">#EE7302</color>-->
 
     <color name="notificationIconColor">@color/colorPrimary</color>
 
@@ -70,7 +70,7 @@
     <color name="commentVerticalBar6">#02EE6E</color>
     <color name="commentVerticalBar7">#EE4602</color>
 
-    <color name="toolbarAndTabBackgroundColor">@color/colorPrimary</color>
+    <!--<color name="toolbarAndTabBackgroundColor">@color/colorPrimary</color>
 
     <color name="submitter">#EE8A02</color>
 
@@ -84,5 +84,5 @@
 
     <color name="usernameColor">#0D47A1</color>
 
-    <color name="subredditNameColor">#FF4081</color>
+    <color name="subredditNameColor">#FF4081</color>-->
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b91ecdb1..79085b9b 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -218,7 +218,7 @@
 
     <style name="Theme" />
 
-    <style name="Theme.Default">
+    <!--<style name="Theme.Default">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="backgroundColor">@color/backgroundColor</item>
@@ -255,6 +255,114 @@
         <item name="tabLayoutWithExpandedCollapsingToolbarTabBackground">#000000</item>
         <item name="tabLayoutWithCollapsedCollapsingToolbarTabBackground">#000000</item>
         <item name="navBarColor">#000000</item>
+    </style>-->
+
+    <style name="Theme.Default">
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="colorPrimaryLightTheme">@color/colorPrimary</item>
+        <item name="backgroundColor">@color/backgroundColor</item>
+        <item name="roundedBottomSheetPrimaryBackground">@color/roundedBottomSheetPrimaryBackground</item>
+        <item name="cardViewBackgroundColor">@color/cardViewBackgroundColor</item>
+        <item name="toolbarAndTabBackgroundColor">@color/colorPrimary</item>
+        <item name="circularProgressBarBackground">#FFFFFF</item>
+        <item name="tabLayoutWithExpandedCollapsingToolbarTabBackground">#FFFFFF</item>
+        <item name="tabLayoutWithExpandedCollapsingToolbarTextColor">@color/colorPrimary</item>
+        <item name="tabLayoutWithExpandedCollapsingToolbarTabIndicator">@color/colorPrimary</item>
+        <item name="tabLayoutWithCollapsedCollapsingToolbarTabBackground">@color/colorPrimary</item>
+        <item name="tabLayoutWithCollapsedCollapsingToolbarTextColor">#FFFFFF</item>
+        <item name="tabLayoutWithCollapsedCollapsingToolbarTabIndicator">#FFFFFF</item>
+        <item name="navBarColor">@color/backgroundColor</item>
+        <item name="upvoted">#E91E63</item>
+        <item name="downvoted">#007DDE</item>
+        <item name="post_type">@color/colorPrimaryDark</item>
+        <item name="spoilerColor">#EE02EB</item>
+        <item name="nsfwColor">@color/colorAccent</item>
+        <item name="flairColor">#00AA8C</item>
+        <item name="archivedTint">#B4009F</item>
+        <item name="lockedIconTint">#EE7302</item>
+        <item name="crosspost">@color/colorAccent</item>
+        <item name="stickiedPost">@color/colorPrimaryDark</item>
+        <item name="subscribed">@color/colorAccent</item>
+        <item name="unsubscribed">@color/colorPrimaryDark</item>
+        <item name="username">@color/colorPrimaryDark</item>
+        <item name="subreddit">@color/colorAccent</item>
+        <item name="authorFlairTextColor">#EE02C4</item>
+        <item name="submitter">#EE8A02</item>
+        <item name="moderator">#00BA81</item>
+    </style>
+
+    <style name="Theme.Default.NormalDark">
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="colorPrimaryLightTheme">#1565C0</item>
+        <item name="backgroundColor">@color/backgroundColor</item>
+        <item name="roundedBottomSheetPrimaryBackground">@color/roundedBottomSheetPrimaryBackground</item>
+        <item name="cardViewBackgroundColor">@color/cardViewBackgroundColor</item>
+        <item name="toolbarAndTabBackgroundColor">#282828</item>
+        <item name="circularProgressBarBackground">@color/colorPrimary</item>
+        <item name="tabLayoutWithExpandedCollapsingToolbarTabBackground">@color/backgroundColor</item>
+        <item name="tabLayoutWithExpandedCollapsingToolbarTextColor">#FFFFFF</item>
+        <item name="tabLayoutWithExpandedCollapsingToolbarTabIndicator">#FFFFFF</item>
+        <item name="tabLayoutWithCollapsedCollapsingToolbarTabBackground">@color/colorPrimary</item>
+        <item name="tabLayoutWithCollapsedCollapsingToolbarTextColor">#FFFFFF</item>
+        <item name="tabLayoutWithCollapsedCollapsingToolbarTabIndicator">#FFFFFF</item>
+        <item name="navBarColor">@color/backgroundColor</item>
+        <item name="upvoted">#E91E63</item>
+        <item name="downvoted">#007DDE</item>
+        <item name="post_type">#0D47A1</item>
+        <item name="spoilerColor">#EE02EB</item>
+        <item name="nsfwColor">@color/colorAccent</item>
+        <item name="flairColor">#00AA8C</item>
+        <item name="archivedTint">#B4009F</item>
+        <item name="lockedIconTint">#EE7302</item>
+        <item name="crosspost">@color/colorAccent</item>
+        <item name="stickiedPost">#1565C0</item>
+        <item name="subscribed">@color/colorAccent</item>
+        <item name="unsubscribed">#1565C0</item>
+        <item name="username">#0D47A1</item>
+        <item name="subreddit">@color/colorAccent</item>
+        <item name="authorFlairTextColor">#EE02C4</item>
+        <item name="submitter">#EE8A02</item>
+        <item name="moderator">#00BA81</item>
+    </style>
+
+    <style name="Theme.Default.AmoledDark">
+        <item name="colorPrimary">#000000</item>
+        <item name="colorPrimaryDark">#000000</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="colorPrimaryLightTheme">#1565C0</item>
+        <item name="backgroundColor">#000000</item>
+        <item name="roundedBottomSheetPrimaryBackground">#000000</item>
+        <item name="cardViewBackgroundColor">#000000</item>
+        <item name="toolbarAndTabBackgroundColor">#000000</item>
+        <item name="circularProgressBarBackground">#000000</item>
+        <item name="tabLayoutWithExpandedCollapsingToolbarTabBackground">@color/backgroundColor</item>
+        <item name="tabLayoutWithExpandedCollapsingToolbarTextColor">#FFFFFF</item>
+        <item name="tabLayoutWithExpandedCollapsingToolbarTabIndicator">#FFFFFF</item>
+        <item name="tabLayoutWithCollapsedCollapsingToolbarTabBackground">@color/colorPrimary</item>
+        <item name="tabLayoutWithCollapsedCollapsingToolbarTextColor">#FFFFFF</item>
+        <item name="tabLayoutWithCollapsedCollapsingToolbarTabIndicator">#FFFFFF</item>
+        <item name="navBarColor">#000000</item>
+        <item name="upvoted">#E91E63</item>
+        <item name="downvoted">#007DDE</item>
+        <item name="post_type">#0D47A1</item>
+        <item name="spoilerColor">#EE02EB</item>
+        <item name="nsfwColor">@color/colorAccent</item>
+        <item name="flairColor">#00AA8C</item>
+        <item name="archivedTint">#B4009F</item>
+        <item name="lockedIconTint">#EE7302</item>
+        <item name="crosspost">@color/colorAccent</item>
+        <item name="stickiedPost">#1565C0</item>
+        <item name="subscribed">@color/colorAccent</item>
+        <item name="unsubscribed">#1565C0</item>
+        <item name="username">#0D47A1</item>
+        <item name="subreddit">@color/colorAccent</item>
+        <item name="authorFlairTextColor">#EE02C4</item>
+        <item name="submitter">#EE8A02</item>
+        <item name="moderator">#00BA81</item>
     </style>
 
 </resources>