diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 6eab85d1..65ac8596 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -3,62 +3,9 @@
     <color name="colorPrimary">#242424</color>
     <color name="colorPrimaryDark">#121212</color>
     <color name="colorAccent">#FF4081</color>
-
     <color name="transparentActionBarAndExoPlayerControllerColor">#88000000</color>
-
     <color name="gold">#FFC107</color>
-
-    <!--<color name="primaryTextColor">#FFFFFF</color>-->
-
-    <!--<color name="colorPrimaryDarkDayNightTheme">#1E88E5</color>-->
-
-    <!--<color name="dividerColor">#69666C</color>-->
-
-    <!--<color name="grey">#424242</color>-->
-
     <color name="backgroundColor">#121212</color>
-
-    <!--<color name="backgroundColorPrimary">#1565C0</color>
-
-    <color name="backgroundColorPrimaryDark">#1565C0</color>-->
-
     <color name="playButtonBackgroundColor">#FFFFFF</color>
-
     <color name="roundedBottomSheetPrimaryBackground">#242424</color>
-
-    <!--<color name="voteAndReplyUnavailableVoteButtonColor">#3C3C3C</color>-->
-
-    <!--<color name="tabLayoutWithExpandedCollapsingToolbarTextColor">#FFFFFF</color>
-
-    <color name="tabLayoutWithExpandedCollapsingToolbarTabBackground">@color/backgroundColor</color>
-
-    <color name="tabLayoutWithExpandedCollapsingToolbarTabIndicator">@color/tabLayoutWithExpandedCollapsingToolbarTextColor</color>
-
-    <color name="tabLayoutWithCollapsedCollapsingToolbarTextColor">#FFFFFF</color>
-
-    <color name="tabLayoutWithCollapsedCollapsingToolbarTabBackground">@color/colorPrimary</color>
-
-    <color name="tabLayoutWithCollapsedCollapsingToolbarTabIndicator">@color/tabLayoutWithCollapsedCollapsingToolbarTextColor</color>-->
-
-    <!--<color name="navBarColor">@color/backgroundColor</color>-->
-
-    <!--<color name="cardViewBackgroundColor">#242424</color>-->
-
-    <!--<color name="singleCommentThreadBackgroundColor">#123E77</color>-->
-
-    <!--<color name="unreadMessageBackgroundColor">#123E77</color>-->
-
-    <!--<color name="notificationIconColor">#1565C0</color>-->
-
-    <!--<color name="defaultTextColor">#B3FFFFFF</color>-->
-
-    <!--<color name="commentVerticalBar1">#1565C0</color>
-    <color name="commentVerticalBar2">#C300B3</color>
-    <color name="commentVerticalBar3">#00B8DA</color>
-    <color name="commentVerticalBar4">#EDCA00</color>
-    <color name="commentVerticalBar5">#EE0219</color>
-    <color name="commentVerticalBar6">#00B925</color>
-    <color name="commentVerticalBar7">#EE4602</color>-->
-
-    <!--<color name="toolbarAndTabBackgroundColor">#282828</color>-->
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f5e397c5..59bbdad0 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,86 +3,10 @@
     <color name="colorPrimary">#1565C0</color>
     <color name="colorPrimaryDark">#0D47A1</color>
     <color name="colorAccent">#FF4081</color>
-
     <color name="transparentActionBarAndExoPlayerControllerColor">#88000000</color>
-    
     <color name="gold">#FFC107</color>
-
-    <!--<color name="primaryTextColor">#000000</color>-->
-
-    <!--<color name="colorPrimaryDarkDayNightTheme">@color/colorPrimaryDark</color>-->
-
-    <!--<color name="dividerColor">#E0E0E0</color>-->
-
-    <!--<color name="grey">#E0E0E0</color>-->
-
     <color name="backgroundColor">#FFFFFF</color>
-
-    <!--<color name="backgroundColorPrimary">@color/colorPrimary</color>
-
-    <color name="backgroundColorPrimaryDark">@color/colorPrimaryDark</color>-->
-
     <color name="playButtonBackgroundColor">#000000</color>
-
     <color name="roundedBottomSheetPrimaryBackground">#FFFFFF</color>
-
     <color name="roundedBottomSheetPrimaryNavigationBarColor">#000000</color>
-
-    <!--<color name="upvoted">#E91E63</color>
-
-    <color name="downvoted">#007DDE</color>-->
-
-    <!--<color name="voteAndReplyUnavailableVoteButtonColor">#F0F0F0</color>-->
-
-    <!--<color name="tabLayoutWithExpandedCollapsingToolbarTextColor">@color/colorPrimary</color>
-
-    <color name="tabLayoutWithExpandedCollapsingToolbarTabBackground">#FFFFFF</color>
-
-    <color name="tabLayoutWithExpandedCollapsingToolbarTabIndicator">@color/tabLayoutWithExpandedCollapsingToolbarTextColor</color>
-
-    <color name="tabLayoutWithCollapsedCollapsingToolbarTextColor">#FFFFFF</color>
-
-    <color name="tabLayoutWithCollapsedCollapsingToolbarTabBackground">@color/colorPrimary</color>
-
-    <color name="tabLayoutWithCollapsedCollapsingToolbarTabIndicator">@color/tabLayoutWithCollapsedCollapsingToolbarTextColor</color>-->
-
-    <!--<color name="navBarColor">#FFFFFF</color>-->
-
-    <!--<color name="cardViewBackgroundColor">#FFFFFF</color>-->
-
-    <!--<color name="singleCommentThreadBackgroundColor">#B3E5F9</color>-->
-
-    <!--<color name="unreadMessageBackgroundColor">#B3E5F9</color>-->
-
-    <!--<color name="archivedTint">#B4009F</color>
-
-    <color name="lockedIconTint">#EE7302</color>-->
-
-    <!--<color name="notificationIconColor">@color/colorPrimary</color>-->
-
-    <!--<color name="defaultTextColor">#8A000000</color>-->
-
-    <!--<color name="commentVerticalBar1">#1565C0</color>
-    <color name="commentVerticalBar2">#EE02BE</color>
-    <color name="commentVerticalBar3">#02DFEE</color>
-    <color name="commentVerticalBar4">#EED502</color>
-    <color name="commentVerticalBar5">#EE0220</color>
-    <color name="commentVerticalBar6">#02EE6E</color>
-    <color name="commentVerticalBar7">#EE4602</color>-->
-
-    <!--<color name="toolbarAndTabBackgroundColor">@color/colorPrimary</color>
-
-    <color name="submitter">#EE8A02</color>
-
-    <color name="moderator">#00BA81</color>
-
-    <color name="spoilerBackgroundColor">#EE02EB</color>
-
-    <color name="flairBackgroundColor">#00AA8C</color>
-
-    <color name="authorFlairTextColor">#EE02C4</color>
-
-    <color name="usernameColor">#0D47A1</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 61c2bdea..dc7024a9 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -218,45 +218,6 @@
 
     <style name="Theme" />
 
-    <!--<style name="Theme.Default">
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="backgroundColor">@color/backgroundColor</item>
-        <item name="roundedBottomSheetPrimaryBackground">@color/roundedBottomSheetPrimaryBackground</item>
-        <item name="cardViewBackgroundColor">@color/cardViewBackgroundColor</item>
-        <item name="toolbarAndTabBackgroundColor">@color/toolbarAndTabBackgroundColor</item>
-        <item name="circularProgressBarBackground">#FFFFFF</item>
-        <item name="tabLayoutWithExpandedCollapsingToolbarTabBackground">#FFFFFF</item>
-        <item name="tabLayoutWithCollapsedCollapsingToolbarTabBackground">@color/colorPrimary</item>
-        <item name="navBarColor">@color/backgroundColor</item>
-    </style>
-
-    <style name="Theme.Default.NormalDark">
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="backgroundColor">@color/backgroundColor</item>
-        <item name="roundedBottomSheetPrimaryBackground">@color/roundedBottomSheetPrimaryBackground</item>
-        <item name="cardViewBackgroundColor">@color/cardViewBackgroundColor</item>
-        <item name="toolbarAndTabBackgroundColor">@color/toolbarAndTabBackgroundColor</item>
-        <item name="circularProgressBarBackground">@color/colorPrimary</item>
-        <item name="tabLayoutWithExpandedCollapsingToolbarTabBackground">@color/backgroundColor</item>
-        <item name="tabLayoutWithCollapsedCollapsingToolbarTabBackground">@color/colorPrimary</item>
-        <item name="navBarColor">@color/backgroundColor</item>
-    </style>
-
-    <style name="Theme.Default.AmoledDark">
-        <item name="colorPrimary">#000000</item>
-        <item name="colorPrimaryDark">#000000</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">#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>