diff --git a/client/css/style.css b/client/css/style.css
index d4d17811..10c10fd8 100644
--- a/client/css/style.css
+++ b/client/css/style.css
@@ -782,40 +782,8 @@ button,
 #chat .user.color-28 { color: #469c00; }
 #chat .user.color-29 { color: #ff0f95; }
 #chat .user.color-30 { color: #ff7615; }
-#chat .user.color-31 { color: #ff0eb2; }
+#chat .user.color-31 { color: #ff4846; }
 #chat .user.color-32 { color: #ff199b; }
-#chat .user.color-33 { color: #ffcd7d; }
-#chat .user.color-34 { color: #009a47; }
-#chat .user.color-35 { color: #ffa804; }
-#chat .user.color-36 { color: #e100ad; }
-#chat .user.color-37 { color: #ff9e6b; }
-#chat .user.color-38 { color: #0001dc; }
-#chat .user.color-39 { color: #007d86; }
-#chat .user.color-40 { color: #ff00b1; }
-#chat .user.color-41 { color: #ff2086; }
-#chat .user.color-42 { color: #00bb72; }
-#chat .user.color-43 { color: #ff9901; }
-#chat .user.color-44 { color: #0d32d7; }
-#chat .user.color-45 { color: #ff0b62; }
-#chat .user.color-46 { color: #0057c4; }
-#chat .user.color-47 { color: #001488; }
-#chat .user.color-48 { color: #006f1c; }
-#chat .user.color-49 { color: #1d2b16; }
-#chat .user.color-50 { color: #00cb53; }
-#chat .user.color-51 { color: #ff598b; }
-#chat .user.color-52 { color: #0009e4; }
-#chat .user.color-53 { color: #ff31b7; }
-#chat .user.color-54 { color: #ff0290; }
-#chat .user.color-55 { color: #1e79e4; }
-#chat .user.color-56 { color: #ff76bc; }
-#chat .user.color-57 { color: #1e9563; }
-#chat .user.color-58 { color: #0000a4; }
-#chat .user.color-59 { color: #ffd500; }
-#chat .user.color-60 { color: #ff298f; }
-#chat .user.color-61 { color: #2d960e; }
-#chat .user.color-62 { color: #ff4846; }
-#chat .user.color-63 { color: #0094c0; }
-#chat .user.color-64 { color: #0000c4; }
 
 #chat .text {
 	padding-left: 10px;
diff --git a/client/js/libs/handlebars/colorClass.js b/client/js/libs/handlebars/colorClass.js
index 966be252..bd371910 100644
--- a/client/js/libs/handlebars/colorClass.js
+++ b/client/js/libs/handlebars/colorClass.js
@@ -1,13 +1,13 @@
 "use strict";
 
 Handlebars.registerHelper(
-	// Generates a string from "color-1" to "color-64" based on an input string
+	// Generates a string from "color-1" to "color-32" based on an input string
 	"colorClass", function(str) {
 		var hash = 0;
 		for (var i = 0; i < str.length; i++) {
 			hash += str.charCodeAt(i);
 		}
 
-		return "color-" + (1 + hash % 64);
+		return "color-" + (1 + hash % 32);
 	}
 );
diff --git a/client/themes/morning.css b/client/themes/morning.css
index 4cf15e70..1af0c5e1 100644
--- a/client/themes/morning.css
+++ b/client/themes/morning.css
@@ -104,6 +104,39 @@ QUIT #d0907d
 	color: #fefefe !important;
 }
 
+#chat .user.color-1 { color: #f7adf7; }
+#chat .user.color-2 { color: #abf99f; }
+#chat .user.color-3 { color: #86efdc; }
+#chat .user.color-4 { color: #b76ee5; }
+#chat .user.color-5 { color: #f9a4b3; }
+#chat .user.color-6 { color: #f7999a; }
+#chat .user.color-7 { color: #f497b9; }
+#chat .user.color-8 { color: #f9a9d7; }
+#chat .user.color-9 { color: #7fa2e2; }
+#chat .user.color-10 { color: #a8b8ff; }
+#chat .user.color-11 { color: #ad88fc; }
+#chat .user.color-12 { color: #f4aead; }
+#chat .user.color-13 { color: #fc71ab; }
+#chat .user.color-14 { color: #ff72e0; }
+#chat .user.color-15 { color: #8cb6ea; }
+#chat .user.color-16 { color: #f9857c; }
+#chat .user.color-17 { color: #ed9b82; }
+#chat .user.color-18 { color: #8df484; }
+#chat .user.color-19 { color: #ffcce3; }
+#chat .user.color-20 { color: #efcc81; }
+#chat .user.color-21 { color: #90a1ed; }
+#chat .user.color-22 { color: #f4d484; }
+#chat .user.color-23 { color: #97ea70; }
+#chat .user.color-24 { color: #fcbbba; }
+#chat .user.color-25 { color: #eef975; }
+#chat .user.color-26 { color: #c7ff93; }
+#chat .user.color-27 { color: #ffade1; }
+#chat .user.color-28 { color: #98ecf2; }
+#chat .user.color-29 { color: #7187f2; }
+#chat .user.color-30 { color: #9676e2; }
+#chat .user.color-31 { color: #f2a4eb; }
+#chat .user.color-32 { color: #85f27d; }
+
 #chat a {
 	color: #428bca;
 }
diff --git a/client/themes/zenburn.css b/client/themes/zenburn.css
index e92187f9..0896be34 100644
--- a/client/themes/zenburn.css
+++ b/client/themes/zenburn.css
@@ -134,6 +134,39 @@ body {
 	color: #dcdccc !important;
 }
 
+#chat .user.color-1 { color: #f7adf7; }
+#chat .user.color-2 { color: #abf99f; }
+#chat .user.color-3 { color: #86efdc; }
+#chat .user.color-4 { color: #b76ee5; }
+#chat .user.color-5 { color: #f9a4b3; }
+#chat .user.color-6 { color: #f7999a; }
+#chat .user.color-7 { color: #f497b9; }
+#chat .user.color-8 { color: #f9a9d7; }
+#chat .user.color-9 { color: #7fa2e2; }
+#chat .user.color-10 { color: #a8b8ff; }
+#chat .user.color-11 { color: #ad88fc; }
+#chat .user.color-12 { color: #f4aead; }
+#chat .user.color-13 { color: #fc71ab; }
+#chat .user.color-14 { color: #ff72e0; }
+#chat .user.color-15 { color: #8cb6ea; }
+#chat .user.color-16 { color: #f9857c; }
+#chat .user.color-17 { color: #ed9b82; }
+#chat .user.color-18 { color: #8df484; }
+#chat .user.color-19 { color: #ffcce3; }
+#chat .user.color-20 { color: #efcc81; }
+#chat .user.color-21 { color: #90a1ed; }
+#chat .user.color-22 { color: #f4d484; }
+#chat .user.color-23 { color: #97ea70; }
+#chat .user.color-24 { color: #fcbbba; }
+#chat .user.color-25 { color: #eef975; }
+#chat .user.color-26 { color: #c7ff93; }
+#chat .user.color-27 { color: #ffade1; }
+#chat .user.color-28 { color: #98ecf2; }
+#chat .user.color-29 { color: #7187f2; }
+#chat .user.color-30 { color: #9676e2; }
+#chat .user.color-31 { color: #f2a4eb; }
+#chat .user.color-32 { color: #85f27d; }
+
 #chat a {
 	color: #8c8cbc;
 }