diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 17e5fa2..89e140c 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -1,20 +1,21 @@
 {
 	"appName": {
-		"message": "Spongy Chat Client",
-		"description": "Application name"
+		"description": "Application name",
+		"message": "Spongy Chat Client"
 	},
 	"appShortName": {
-		"message": "Spongy Chat",
-		"description": "Short application name"
+		"description": "Short application name",
+		"message": "Spongy Chat"
 	},
 	"appDesc": {
-		"message": "Chat client for the Spongy bouncer thingamajiggy",
-		"description": "Application description for app store listing"
+		"description": "Application description for app store listing",
+		"message": "Chat client for the Spongy bouncer thingamajiggy"
 	},
 
 
 	"unknownCommand": {
-	  "message": "$COMMAND$ $ARGS$ $TEXT$",
+	  "description": "Text for unrecognized command",
+	  "message": "??? $COMMAND$ $ARGS$ $TEXT$",
 	  "placeholders": {
 	    "fullSender": {
   	    "content": "$1",
@@ -44,20 +45,31 @@
 	},
 
 	"privmsgCommand": {
+    "description": "Text for a privmsg (a regular chat message)",
+	  "message": "$6"
+	},
+
+	"noticeCommand": {
+	  "description": "Text for a notice",
 	  "message": "$6"
 	},
 
 	"nickCommand": {
+    "description": "Text for nickname change",
 	  "message": "$1 is now known as $3"
 	},
 
 	"modeCommand": {
-	  "message": "$3 sets channel mode $5"
+	  "message": "sets channel mode $5"
 	},
 
-	"joinCommand": {
-	  "message": "joins the channel."
+  "joinCommand": {
+    "description": "Channel join",
+    "message": "joins the channel."
+  },
+
+  "faultCommand": {
+    "description": "Spongy fault",
+    "message": "Spongy error: $6"
 	}
-
-
 }
diff --git a/app/message_style.css b/app/message_style.css
index 5da3f16..bc03844 100644
--- a/app/message_style.css
+++ b/app/message_style.css
@@ -4,169 +4,162 @@
 
 .message.notice {
   color: #97008B;
+  font-style: oblique;
 }
 
 .message.error {
   color: #B33B2D;
 }
 
-.message.update {
-  color: #00068F;
-}
-
-.message.update.self {
+.message.self {
   color: #005816;
 }
 
-.message.update.privmsg {
+.message.privmsg {
   color: #505053;
 }
 
-.message.update.privmsg.self {
+.message.privmsg.self {
   color: gray;
 }
 
-.message.update.privmsg.mention {
+.message.privmsg.mention {
   color: darkred;
 }
 
-.message.update.privmsg.mention .source {
+.message.privmsg.mention .source {
   font-weight: bold;
 }
 
-.message.update.privmsg.direct .source {
+.message.privmsg.direct .source {
   color: #488AA8;
 }
 
-.message.update.privmsg.notice .source {
-  color: #97008B;
-}
-
 /* Nickname Colors. Taken from Textual */
 
-.message.update.privmsg.self .source-content-container .source {
+.message.privmsg.self .source-content-container .source {
   color: #ea0d68;
 }
 
-.message.update.privmsg:not(.self) .source-content-container .source[colornumber='0'] {
+.message.privmsg:not(.self) .source-content-container .source[colornumber='0'] {
   color: #0080ff;
 }
 
-.message.update.privmsg:not(.self) .source-content-container .source[colornumber='1'] {
+.message.privmsg:not(.self) .source-content-container .source[colornumber='1'] {
   color: #059005;
 }
 
-.message.update.privmsg:not(.self) .source-content-container .source[colornumber='2'] {
+.message.privmsg:not(.self) .source-content-container .source[colornumber='2'] {
   color: #a80054;
 }
 
-.message.update.privmsg:not(.self) .source-content-container .source[colornumber='3'] {
+.message.privmsg:not(.self) .source-content-container .source[colornumber='3'] {
   color: #9b0db1;
 }
 
-.message.update.privmsg:not(.self) .source-content-container .source[colornumber='4'] {
+.message.privmsg:not(.self) .source-content-container .source[colornumber='4'] {
   color: #108860;
 }
 
-.message.update.privmsg:not(.self) .source-content-container .source[colornumber='5'] {
+.message.privmsg:not(.self) .source-content-container .source[colornumber='5'] {
   color: #7F4FFF;
 }
 
-.message.update.privmsg:not(.self) .source-content-container .source[colornumber='6'] {
+.message.privmsg:not(.self) .source-content-container .source[colornumber='6'] {
   color: #58701a;
 }
 
-.message.update.privmsg:not(.self) .source-content-container .source[colornumber='7'] {
+.message.privmsg:not(.self) .source-content-container .source[colornumber='7'] {
   color: #620a8e;
 }
 
-.message.update.privmsg:not(.self) .source-content-container .source[colornumber='8'] {
+.message.privmsg:not(.self) .source-content-container .source[colornumber='8'] {
   color: #BB0008;
 }
 
-.message.update.privmsg:not(.self) .source-content-container .source[colornumber='9'] {
+.message.privmsg:not(.self) .source-content-container .source[colornumber='9'] {
   color: #44345f;
 }
 
-.message.update.privmsg:not(.self) .source-content-container .source[colornumber='10'] {
+.message.privmsg:not(.self) .source-content-container .source[colornumber='10'] {
   color: #2f5353;
 }
 
-.message.update.privmsg:not(.self) .source-content-container .source[colornumber='11'] {
+.message.privmsg:not(.self) .source-content-container .source[colornumber='11'] {
   color: #904000;
 }
 
-.message.update.privmsg:not(.self) .source-content-container .source[colornumber='12'] {
+.message.privmsg:not(.self) .source-content-container .source[colornumber='12'] {
   color: #808000;
 }
 
-.message.update.privmsg:not(.self) .source-content-container .source[colornumber='13'] {
+.message.privmsg:not(.self) .source-content-container .source[colornumber='13'] {
   color: #57797e;
 }
 
-.message.update.privmsg:not(.self) .source-content-container .source[colornumber='14'] {
+.message.privmsg:not(.self) .source-content-container .source[colornumber='14'] {
   color: #3333dd;
 }
 
-.message.update.privmsg:not(.self) .source-content-container .source[colornumber='15'] {
+.message.privmsg:not(.self) .source-content-container .source[colornumber='15'] {
   color: #5f4d22;
 }
 
-.message.update.privmsg:not(.self) .source-content-container .source[colornumber='16'] {
+.message.privmsg:not(.self) .source-content-container .source[colornumber='16'] {
   color: #706616;
 }
 
-.message.update.privmsg:not(.self) .source-content-container .source[colornumber='17'] {
+.message.privmsg:not(.self) .source-content-container .source[colornumber='17'] {
   color: #46799c;
 }
 
-.message.update.privmsg:not(.self) .source-content-container .source[colornumber='18'] {
+.message.privmsg:not(.self) .source-content-container .source[colornumber='18'] {
   color: #80372e;
 }
 
-.message.update.privmsg:not(.self) .source-content-container .source[colornumber='19'] {
+.message.privmsg:not(.self) .source-content-container .source[colornumber='19'] {
   color: #8F478E;
 }
 
-.message.update.privmsg:not(.self) .source-content-container .source[colornumber='20'] {
+.message.privmsg:not(.self) .source-content-container .source[colornumber='20'] {
   color: #5b9e4c;
 }
 
-.message.update.privmsg:not(.self) .source-content-container .source[colornumber='21'] {
+.message.privmsg:not(.self) .source-content-container .source[colornumber='21'] {
   color: #13826c;
 }
 
-.message.update.privmsg:not(.self) .source-content-container .source[colornumber='22'] {
+.message.privmsg:not(.self) .source-content-container .source[colornumber='22'] {
   color: #b13637;
 }
 
-.message.update.privmsg:not(.self) .source-content-container .source[colornumber='23'] {
+.message.privmsg:not(.self) .source-content-container .source[colornumber='23'] {
   color: #e45d59;
 }
 
-.message.update.privmsg:not(.self) .source-content-container .source[colornumber='24'] {
+.message.privmsg:not(.self) .source-content-container .source[colornumber='24'] {
   color: #1b51ae;
 }
 
-.message.update.privmsg:not(.self) .source-content-container .source[colornumber='25'] {
+.message.privmsg:not(.self) .source-content-container .source[colornumber='25'] {
   color: #4855ac;
 }
 
-.message.update.privmsg:not(.self) .source-content-container .source[colornumber='26'] {
+.message.privmsg:not(.self) .source-content-container .source[colornumber='26'] {
   color: #7f1d86;
 }
-.message.update.privmsg:not(.self) .source-content-container .source[colornumber='27'] {
+.message.privmsg:not(.self) .source-content-container .source[colornumber='27'] {
   color: #73643f;
 }
 
-.message.update.privmsg:not(.self) .source-content-container .source[colornumber='28'] {
+.message.privmsg:not(.self) .source-content-container .source[colornumber='28'] {
   color: #0b9578;
 }
 
-.message.update.privmsg:not(.self) .source-content-container .source[colornumber='29'] {
+.message.privmsg:not(.self) .source-content-container .source[colornumber='29'] {
   color: #569c96;
 }
 
-.message.update.privmsg:not(.self) .source-content-container .source[colornumber='30'] {
+.message.privmsg:not(.self) .source-content-container .source[colornumber='30'] {
   color: #08465f;
 }
diff --git a/app/room.js b/app/room.js
index 32891d7..8fd0ba1 100644
--- a/app/room.js
+++ b/app/room.js
@@ -98,7 +98,6 @@ function newRoom(element, network, name, maxSize) {
     var eSource = message.getElementsByClassName("source")[0];
     var eContent = message.getElementsByClassName("content")[0];
 
-    message.classList.add("update");
     message.classList.add(command);
     if (sender == ".") {
       message.classList.add("self");