diff --git a/app/src/main/java/us/shandian/giga/get/DownloadRunnable.java b/app/src/main/java/us/shandian/giga/get/DownloadRunnable.java
index 48990bde6..1db03c4be 100644
--- a/app/src/main/java/us/shandian/giga/get/DownloadRunnable.java
+++ b/app/src/main/java/us/shandian/giga/get/DownloadRunnable.java
@@ -1,6 +1,5 @@
 package us.shandian.giga.get;
 
-import android.os.Handler;
 import android.util.Log;
 
 import java.io.BufferedInputStream;
diff --git a/app/src/main/java/us/shandian/giga/util/Utility.java b/app/src/main/java/us/shandian/giga/util/Utility.java
index 774edd0bc..25412660c 100644
--- a/app/src/main/java/us/shandian/giga/util/Utility.java
+++ b/app/src/main/java/us/shandian/giga/util/Utility.java
@@ -176,41 +176,23 @@ public class Utility
 	
 	public static int getBackgroundForFileType(FileType type) {
 		switch (type) {
-			case APP:
-				return R.color.orange;
 			case MUSIC:
-				return R.color.cyan;
-			case ARCHIVE:
-				return R.color.blue;
+				return R.color.audio_left_to_load_color;
 			case VIDEO:
-				return R.color.green;
-			case WORD:
-			case EXCEL:
-			case POWERPOINT:
-				return R.color.brown;
-			case UNKNOWN:
+				return R.color.video_left_to_load_color;
 			default:
-				return R.color.bluegray;
+				return R.color.gray;
 		}
 	}
 	
 	public static int getForegroundForFileType(FileType type) {
 		switch (type) {
-			case APP:
-				return R.color.orange_dark;
 			case MUSIC:
-				return R.color.cyan_dark;
-			case ARCHIVE:
-				return R.color.blue_dark;
+				return R.color.audio_already_load_color;
 			case VIDEO:
-				return R.color.green_dark;
-			case WORD:
-			case EXCEL:
-			case POWERPOINT:
-				return R.color.brown_dark;
-			case UNKNOWN:
+				return R.color.video_already_load_color;
 			default:
-				return R.color.bluegray_dark;
+				return R.color.gray;
 		}
 	}
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 9cc8ba2a1..269034168 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -18,19 +18,14 @@
     <color name="video_overlay_color">#66000000</color>
     <color name="background_notification_color">#323232</color>
 
-    <!-- GigaGet Theme colors -->
-    <color name="blue">#2979FF</color>
-    <color name="blue_dark">#1565C0</color>
+    <!-- GigaGet theme -->
     <color name="bluegray">#607D8B</color>
-    <color name="bluegray_dark">#546E7A</color>
-    <color name="cyan">#00BCD4</color>
-    <color name="cyan_dark">#00ACC1</color>
-    <color name="orange">#FF9800</color>
-    <color name="orange_dark">#EF6C00</color>
-    <color name="green">#4CAF50</color>
-    <color name="green_dark">#388E3C</color>
-    <color name="brown">#795548</color>
-    <color name="brown_dark">#5D4037</color>
+
+    <!-- GigaGet download Theme colors -->
+    <color name="audio_left_to_load_color">#555555</color>
+    <color name="audio_already_load_color">#000000</color>
+    <color name="video_left_to_load_color">#CD5656</color>
+    <color name="video_already_load_color">#BC211D</color>
 
     <!-- GigaGet Component colors -->
     <color name="white">#FFFFFF</color>