diff --git a/src/components/Torrent.vue b/src/components/Torrent.vue
index 9efa3655..58f7f6fe 100644
--- a/src/components/Torrent.vue
+++ b/src/components/Torrent.vue
@@ -175,10 +175,7 @@ export default {
 
 <style>
 .project.done {
-    border-left: 4px solid #2E5EAA;
-}
-.project.downloading {
-    border-left: 4px solid #1FC176;
+    border-left: 4px solid #3cd1c2;
 }
 .project.busy {
     border-left: 4px solid #ffaa2c;
@@ -187,13 +184,13 @@ export default {
     border-left: 4px solid #f83e70;
 }
 .project.paused {
-    border-left: 4px solid #EB8A90;
+    border-left: 4px solid #cfd8dc;
+}
+.project.queued {
+    border-left: 4px solid #2e5eaa;
 }
 .v-chip.done {
-    background: #2E5EAA !important;
-}
-.v-chip.downloading {
-    background: #1FC176 !important;
+    background: #3cd1c2 !important;
 }
 .v-chip.busy {
     background: #ffaa2c !important;
@@ -202,15 +199,19 @@ export default {
     background: #f83e70 !important;
 }
 .v-chip.paused {
-    background: #EB8A90 !important;
+    background: #cfd8dc !important;
 }
+.v-chip.queued {
+    background: #2e5eaa !important;
+}
+
 .noselect {
     -webkit-touch-callout: none; /* iOS Safari */
     -webkit-user-select: none; /* Safari */
-     -khtml-user-select: none; /* Konqueror HTML */
-       -moz-user-select: none; /* Firefox */
-        -ms-user-select: none; /* Internet Explorer/Edge */
-            user-select: none; /* Non-prefixed version, currently
+    -khtml-user-select: none; /* Konqueror HTML */
+    -moz-user-select: none; /* Firefox */
+    -ms-user-select: none; /* Internet Explorer/Edge */
+    user-select: none; /* Non-prefixed version, currently
                                   supported by Chrome and Opera */
 }
 .pointer {
diff --git a/src/models/torrent.js b/src/models/torrent.js
index f1771160..8d26f2d8 100644
--- a/src/models/torrent.js
+++ b/src/models/torrent.js
@@ -26,12 +26,11 @@ export default class Torrent {
     }
 
     formatState(state) {
-
         switch (state) {
             case 'pausedDL':
                 return 'paused'
             case 'downloading':
-                return 'downloading'
+                return 'busy'
             case 'stalledDL':
                 return 'fail'
             case 'pausedUP':
@@ -41,7 +40,7 @@ export default class Torrent {
             case 'stalledUP':
                 return 'done'
             case 'queuedUP':
-                return 'busy'
+                return 'queued'
             default:
                 return 'fail'
         }