From c05cf00db7b1f5878cac9130cadbebbf0649b8dc Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Thu, 14 Nov 2013 09:00:19 -0500
Subject: [PATCH] Update standard tag colors to match TB and improve tags id
 generation.

---
 SoObjects/SOGo/SOGoDefaults.plist       | 10 +++++-----
 UI/WebServerResources/UIxPreferences.js |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/SoObjects/SOGo/SOGoDefaults.plist b/SoObjects/SOGo/SOGoDefaults.plist
index 72b05742f..9b5b7050d 100644
--- a/SoObjects/SOGo/SOGoDefaults.plist
+++ b/SoObjects/SOGo/SOGoDefaults.plist
@@ -78,10 +78,10 @@
     SOGoSearchMinimumWordLength = 2;
 
     SOGoMailLabelsColors = {
-        $label1 = ("Important", "#ff0000");
-        $label2 = ("Work", "#ff9a00");
-        $label3 = ("Personal", "#009a00");
-        $label4 = ("To Do", "#3130ff");
-        $label5 = ("Later", "#9c309c");
+        $label1 = ("Important", "#FF0000");
+        $label2 = ("Work", "#FF9900");
+        $label3 = ("Personal", "#009900");
+        $label4 = ("To Do", "#3333FF");
+        $label5 = ("Later", "#993399");
     };
 }
diff --git a/UI/WebServerResources/UIxPreferences.js b/UI/WebServerResources/UIxPreferences.js
index ca67c9ddc..417246950 100644
--- a/UI/WebServerResources/UIxPreferences.js
+++ b/UI/WebServerResources/UIxPreferences.js
@@ -1083,7 +1083,7 @@ function serializeMailLabels() {
         
         /* if name is null, that's because we've just added a new tag */
         if (!name) {
-            name = label.replace(/ /g,"_");
+            name = label.replace(/[ \(\)\/\{%\*<>\\\"]/g, "_");
         }
 
         values.push("\"" + name + "\": [\"" + label + "\", \"" + color + "\"]");