diff --git a/app/src/main/res/drawable/bg_bottomsheet.xml b/app/src/main/res/drawable/bg_bottomsheet.xml
index 277d05c23..aa2832c4a 100644
--- a/app/src/main/res/drawable/bg_bottomsheet.xml
+++ b/app/src/main/res/drawable/bg_bottomsheet.xml
@@ -21,9 +21,9 @@
     <item>
         <shape android:shape="rectangle">
             <corners
-                android:topLeftRadius="8dp"
-                android:topRightRadius="8dp" />
-            <solid android:color="?colorAccent" />
+                android:topLeftRadius="14dp"
+                android:topRightRadius="14dp" />
+            <solid android:color="?colorPrimary" />
         </shape>
     </item>
 </layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_details_install.xml b/app/src/main/res/layout/layout_details_install.xml
index 3c627f3fb..018284b7d 100644
--- a/app/src/main/res/layout/layout_details_install.xml
+++ b/app/src/main/res/layout/layout_details_install.xml
@@ -49,7 +49,8 @@
             android:layout_marginTop="@dimen/margin_xsmall"
             android:layout_marginBottom="@dimen/margin_xsmall"
             android:text="@string/action_install"
-            app:btnActionText="@string/action_install" />
+            app:btnActionText="@string/action_install"
+            app:btnActionTextColor="?colorOnPrimary" />
 
         <RelativeLayout
             android:id="@+id/progress_layout"
@@ -69,6 +70,9 @@
                 android:layout_toStartOf="@id/img_cancel"
                 android:background="@drawable/bg_rounded_transparent"
                 android:indeterminate="true"
+                android:indeterminateTint="?colorOnPrimary"
+                app:indicatorColor="?colorControlHighlight"
+                app:trackColor="?colorAccent"
                 app:trackThickness="@dimen/icon_size_small" />
 
             <LinearLayout
@@ -90,7 +94,7 @@
                     android:text="0%"
                     android:textAlignment="center"
                     android:textAppearance="@style/TextAppearance.Aurora.Title"
-                    android:textColor="@color/colorWhite"
+                    android:textColor="?colorOnPrimary"
                     android:textSize="32sp" />
 
                 <LinearLayout
@@ -106,7 +110,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:text="@string/download_speed_estimating"
-                        android:textColor="@color/colorWhite" />
+                        android:textColor="?colorOnPrimary" />
 
                     <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/txt_eta"
@@ -114,7 +118,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:text="@string/download_eta_calculating"
-                        android:textColor="@color/colorWhite" />
+                        android:textColor="?colorOnPrimary" />
                 </LinearLayout>
             </LinearLayout>
 
@@ -149,7 +153,8 @@
             android:layout_height="wrap_content"
             android:alpha=".75"
             android:text="@string/purchase_failed"
-            android:textAlignment="center" />
+            android:textAlignment="center"
+            android:textColor="?colorOnPrimary" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/txt_purchase_error"
@@ -157,7 +162,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textAlignment="center"
-            android:textColor="@color/colorWhite"
+            android:textColor="?colorOnPrimary"
             tools:text="@string/purchase_invalid" />
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/view_action_button.xml b/app/src/main/res/layout/view_action_button.xml
index 66cda5727..8c0177610 100644
--- a/app/src/main/res/layout/view_action_button.xml
+++ b/app/src/main/res/layout/view_action_button.xml
@@ -45,7 +45,6 @@
                 android:textAllCaps="true"
                 android:textAppearance="@style/TextAppearance.Aurora.SubTitle"
                 app:iconPadding="@dimen/padding_large"
-                app:iconTint="@color/colorWhite"
                 tools:text="Install" />
         </RelativeLayout>
 
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 74c3089cb..17f8959e7 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -18,13 +18,6 @@
   -->
 
 <resources>
-    <declare-styleable name="AuroraTheme">
-        <attr name="scrim" format="color" />
-        <attr name="scrimAccent" format="color" />
-        <attr name="scrimAlt" format="color" />
-        <attr name="scrimBlack" format="color" />
-    </declare-styleable>
-
     <declare-styleable name="ActionHeaderLayout">
         <attr name="headerTitle" format="string" />
         <attr name="headerSubtitle" format="string" />