diff --git a/application/components/ChannelDelegate.qml b/application/components/ChannelDelegate.qml
index aa4fa89a..dbcb096c 100644
--- a/application/components/ChannelDelegate.qml
+++ b/application/components/ChannelDelegate.qml
@@ -26,8 +26,8 @@ ItemDelegate {
             Layout.topMargin: 2
             Layout.bottomMargin: 2
 
-            color: text === "development" ? "orangered" :
-                   text === "release-candidate" ? "blueviolet" : "limegreen"
+            color: text === "development" ? "blueviolet" :
+                   text === "release" ? "limegreen" : "orangered"
         }
 
         TextLabel {
diff --git a/application/components/HomeOverlay.qml b/application/components/HomeOverlay.qml
index 4b62215d..1084cb87 100644
--- a/application/components/HomeOverlay.qml
+++ b/application/components/HomeOverlay.qml
@@ -249,13 +249,13 @@ AbstractOverlay {
 
         linkColor: {
             if(Preferences.updateChannel === "development") {
-                return Theme.color.lightred2;
+                return "blueviolet";
             } else if(Preferences.updateChannel === "release-candidate") {
                 return "blueviolet";
             } else if(Preferences.updateChannel === "release") {
                 return Theme.color.lightgreen;
             } else {
-                return Theme.color.lightorange2;
+                return Theme.color.lightred2;
             }
         }
 
@@ -323,7 +323,7 @@ AbstractOverlay {
             } else if(Preferences.updateChannel === "release") {
                 str = "Release";
             } else {
-                str = "Unknown";
+                str = Preferences.updateChannel.replace(/^wip-/, '');
             }
 
             let splitVersion = Backend.latestFirmwareVersion.number.split("-");
diff --git a/backend/updateregistry.cpp b/backend/updateregistry.cpp
index c0cb98a1..eb876974 100644
--- a/backend/updateregistry.cpp
+++ b/backend/updateregistry.cpp
@@ -82,9 +82,9 @@ const QStringList UpdateRegistry::channelNames() const
 {
     auto names = m_channels.keys();
 
-    // Move Development channel to the bottom of the list
+    // Move Development channel after release
     if(names.first().startsWith(QStringLiteral("dev"))) {
-        names.move(0, names.size() - 1);
+        names.move(0, 1);
     }
 
     return names;