diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ba9012d51..045de18ea 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -268,7 +268,6 @@
             android:name="code.name.monkey.retromusic.glide.RetroMusicGlideModule"
             android:value="GlideModule" />
 
-
         <meta-data
             android:name="com.bumptech.glide.integration.okhttp3.OkHttpGlideModule"
             android:value="GlideModule" />
diff --git a/app/src/main/res/layout/app_widget_card.xml b/app/src/main/res/layout/app_widget_card.xml
index 2eae7e4a6..d0eea3498 100755
--- a/app/src/main/res/layout/app_widget_card.xml
+++ b/app/src/main/res/layout/app_widget_card.xml
@@ -16,7 +16,8 @@
             android:layout_width="@dimen/app_widget_card_image_size"
             android:layout_height="@dimen/app_widget_card_image_size"
             android:scaleType="centerInside"
-            tools:ignore="ContentDescription" />
+            tools:ignore="ContentDescription"
+            tools:src="@drawable/default_album_art" />
 
         <LinearLayout
             android:id="@+id/media_titles"
@@ -38,23 +39,16 @@
                 android:textColor="@color/ate_primary_text_light"
                 tools:text="Title" />
 
-            <LinearLayout
+            <TextView
+                android:id="@+id/text"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="4dp"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:id="@+id/text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_vertical"
-                    android:singleLine="true"
-                    android:textAppearance="@style/TextViewBody2"
-                    android:textColor="@color/ate_secondary_text_light"
-                    tools:text="Album" />
-
-            </LinearLayout>
+                android:gravity="center_vertical"
+                android:singleLine="true"
+                android:textAppearance="@style/TextViewCaption"
+                android:textColor="@color/ate_secondary_text_light"
+                tools:text="Text" />
 
         </LinearLayout>
 
@@ -86,7 +80,7 @@
                 android:layout_weight="1"
                 android:background="@drawable/widget_selector_light"
                 tools:ignore="ContentDescription"
-                tools:src="@drawable/ic_play_arrow_white_32dp"
+                tools:src="@drawable/ic_play_arrow_white_24dp"
                 tools:tint="@color/ate_secondary_text_light" />
 
             <ImageButton
@@ -100,7 +94,5 @@
                 tools:tint="@color/ate_secondary_text_light" />
 
         </LinearLayout>
-
     </LinearLayout>
-
 </FrameLayout>
diff --git a/app/src/main/res/layout/app_widget_small.xml b/app/src/main/res/layout/app_widget_small.xml
index dae155418..c1a115bb5 100755
--- a/app/src/main/res/layout/app_widget_small.xml
+++ b/app/src/main/res/layout/app_widget_small.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#AA000000"
+    android:background="@drawable/card"
     android:columnCount="2"
     android:gravity="top"
     android:rowCount="3">
@@ -13,7 +13,8 @@
         android:layout_width="@dimen/app_widget_small_image_size"
         android:layout_height="@dimen/app_widget_small_image_size"
         android:scaleType="centerInside"
-        tools:ignore="ContentDescription" />
+        tools:ignore="ContentDescription"
+        tools:src="@drawable/default_album_art" />
 
     <LinearLayout
         android:id="@+id/media_actions"
@@ -28,30 +29,30 @@
             android:layout_width="0dp"
             android:layout_height="@dimen/app_widget_small_button_height"
             android:layout_weight="1"
-            android:background="@drawable/widget_selector"
+            android:background="@drawable/widget_selector_light"
             tools:ignore="ContentDescription"
             tools:src="@drawable/ic_skip_previous_white_24dp"
-            tools:tint="@color/ate_secondary_text_dark" />
+            tools:tint="@color/ate_secondary_text_light" />
 
         <ImageButton
             android:id="@+id/button_toggle_play_pause"
             android:layout_width="0dp"
             android:layout_height="@dimen/app_widget_small_button_height"
             android:layout_weight="1"
-            android:background="@drawable/widget_selector"
+            android:background="@drawable/widget_selector_light"
             tools:ignore="ContentDescription"
-            tools:src="@drawable/ic_play_arrow_white_32dp"
-            tools:tint="@color/ate_secondary_text_dark" />
+            tools:src="@drawable/ic_play_arrow_white_24dp"
+            tools:tint="@color/ate_secondary_text_light" />
 
         <ImageButton
             android:id="@+id/button_next"
             android:layout_width="0dp"
             android:layout_height="@dimen/app_widget_small_button_height"
             android:layout_weight="1"
-            android:background="@drawable/widget_selector"
+            android:background="@drawable/widget_selector_light"
             tools:ignore="ContentDescription"
             tools:src="@drawable/ic_skip_next_white_24dp"
-            tools:tint="@color/ate_secondary_text_dark" />
+            tools:tint="@color/ate_secondary_text_light" />
 
     </LinearLayout>
 
@@ -81,7 +82,7 @@
             android:gravity="center_vertical"
             android:singleLine="true"
             android:textAppearance="@style/TextViewBody2"
-            android:textColor="@color/ate_primary_text_dark"
+            android:textColor="@color/ate_primary_text_light"
             tools:text="Title" />
 
         <TextView
@@ -93,7 +94,7 @@
             android:paddingRight="4dp"
             android:singleLine="true"
             android:textAppearance="@style/TextViewBody1"
-            android:textColor="@color/ate_secondary_text_dark"
+            android:textColor="@color/ate_secondary_text_light"
             tools:ignore="HardcodedText"
             tools:text="•" />
 
@@ -104,7 +105,7 @@
             android:gravity="center_vertical"
             android:singleLine="true"
             android:textAppearance="@style/TextViewBody1"
-            android:textColor="@color/ate_secondary_text_dark"
+            android:textColor="@color/ate_secondary_text_light"
             tools:text="Text" />
 
     </LinearLayout>
diff --git a/app/src/main/res/xml/app_widget_big_info.xml b/app/src/main/res/xml/app_widget_big_info.xml
index da8521690..e219579c7 100755
--- a/app/src/main/res/xml/app_widget_big_info.xml
+++ b/app/src/main/res/xml/app_widget_big_info.xml
@@ -2,8 +2,8 @@
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:initialLayout="@layout/app_widget_big"
-    android:minHeight="@dimen/app_widget_big_min_height"
     android:minWidth="@dimen/app_widget_big_min_width"
+    android:minHeight="@dimen/app_widget_big_min_height"
     android:resizeMode="horizontal|vertical"
     android:updatePeriodMillis="0"
     android:widgetCategory="keyguard|home_screen"
diff --git a/app/src/main/res/xml/app_widget_card_info.xml b/app/src/main/res/xml/app_widget_card_info.xml
index 18ac28cd9..d5f7a6220 100755
--- a/app/src/main/res/xml/app_widget_card_info.xml
+++ b/app/src/main/res/xml/app_widget_card_info.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
-                    xmlns:tools="http://schemas.android.com/tools"
-                    android:initialLayout="@layout/app_widget_card"
-                    android:minHeight="@dimen/app_widget_card_min_height"
-                    android:minWidth="@dimen/app_widget_card_min_width"
-                    android:resizeMode="horizontal|vertical"
-                    android:updatePeriodMillis="0"
-                    android:widgetCategory="keyguard|home_screen"
-                    tools:ignore="UnusedAttribute"/>
+    xmlns:tools="http://schemas.android.com/tools"
+    android:initialLayout="@layout/app_widget_card"
+    android:minWidth="@dimen/app_widget_card_min_width"
+    android:minHeight="@dimen/app_widget_small_min_height"
+    android:resizeMode="horizontal|vertical"
+    android:updatePeriodMillis="0"
+    android:widgetCategory="keyguard|home_screen"
+    tools:ignore="UnusedAttribute" />
 
     <!--android:previewImage="@drawable/app_widget_classic"-->
\ No newline at end of file
diff --git a/app/src/main/res/xml/app_widget_classic_info.xml b/app/src/main/res/xml/app_widget_classic_info.xml
index 4bb90657a..0ec4b8247 100755
--- a/app/src/main/res/xml/app_widget_classic_info.xml
+++ b/app/src/main/res/xml/app_widget_classic_info.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
-                    xmlns:tools="http://schemas.android.com/tools"
-                    android:initialLayout="@layout/app_widget_classic"
-                    android:minHeight="@dimen/app_widget_classic_min_height"
-                    android:minWidth="@dimen/app_widget_classic_min_width"
-                    android:resizeMode="horizontal|vertical"
-                    android:updatePeriodMillis="0"
-                    android:widgetCategory="keyguard|home_screen"
-                    tools:ignore="UnusedAttribute"/>
+    xmlns:tools="http://schemas.android.com/tools"
+    android:initialLayout="@layout/app_widget_classic"
+    android:minWidth="@dimen/app_widget_classic_min_width"
+    android:minHeight="@dimen/app_widget_classic_min_height"
+    android:resizeMode="horizontal|vertical"
+    android:updatePeriodMillis="0"
+    android:widgetCategory="keyguard|home_screen"
+    tools:ignore="UnusedAttribute" />
 
     <!--android:previewImage="@drawable/app_widget_classic"-->
\ No newline at end of file