From: Chris Porter <redacted>
Date: Thu, 19 Jun 2008 19:47:42 +0000 (+0100)
Subject: Dos2Unix
X-Git-Url: https://jfr.im/git/irc/quakenet/qwebirc.git/commitdiff_plain/9e769c12bfb7ac3beafbcfee9604f8aadcd8f2ca?hp=0019128d23892af53330295b65db0ecebe8135a0

Dos2Unix
---

diff --git a/TODO.txt b/TODO.txt
index 39c9325..1b61349 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -1,8 +1,8 @@
-TODO:
-  - isp transparent proxy issue
-  - new UI
-  - connect UI (do with newUI?)
-  - better error handling server side
-  - better error handling client side
-
-
+TODO:
+  - isp transparent proxy issue
+  - tidy up UI
+  - connect UI (do with newUI?)
+  - better error handling server side
+  - better error handling client side
+
+
diff --git a/js/copyright.js b/js/copyright.js
index 21b9828..642bd83 100644
--- a/js/copyright.js
+++ b/js/copyright.js
@@ -1,2 +1,2 @@
-/* qwebirc -- Copyright (C) 2008 Chris Porter --- All rights reserved. */
-
+/* qwebirc -- Copyright (C) 2008 Chris Porter --- All rights reserved. */
+
diff --git a/js/irc/baseirc.js b/js/irc/baseirc.js
index 29184ed..46e51bd 100644
--- a/js/irc/baseirc.js
+++ b/js/irc/baseirc.js
@@ -1,314 +1,314 @@
-var Numerics = {"001": "RPL_WELCOME", "433": "ERR_NICKNAMEINUSE", "004": "RPL_MYINFO", "005": "RPL_ISUPPORT", "353": "RPL_NAMREPLY", "366": "RPL_ENDOFNAMES", "331": "RPL_NOTOPIC", "332": "RPL_TOPIC", "333": "RPL_TOPICWHOTIME"};
-
-var RegisteredCTCPs = {
-  "VERSION": function(x) {
-    return "qwebirc v" + QWEBIRC_VERSION + ", copyright (C) Chris Porter 2008 -- user agent: " + Browser.Engine.name + " (" + Browser.Platform.name + ")";
-  },
-  "USERINFO": function(x) { return "qwebirc"; },
-  "TIME": function(x) { return IRCTime(new Date()); },
-  "PING": function(x) { return x; },
-  "CLIENTINFO": function(x) { return "PING VERSION TIME USERINFO CLIENTINFO"; }
-};
-
-var BaseIRCClient = new Class({
-  Implements: [Options],
-  options: {
-    nickname: "WCunset",
-  },
-  initialize: function(options) {
-    this.setOptions(options);
-
-    this.nickname = this.options.nickname;
-    
-    this.__signedOn = false;
-    this.pmodes = ["b", "k,", "o", "l", "v"];
-    this.channels = {}
-    this.nextctcp = 0;    
-
-    this.connection = new IRCConnection({initialNickname: this.nickname, onRecv: this.dispatch.bind(this)});
-  
-    this.send = this.connection.send.bind(this.connection);
-    this.connect = this.connection.connect.bind(this.connection);
-    this.disconnect = this.connection.disconnect;
-  },
-  dispatch: function(data) {
-    var message = data[0];
-    if(message == "connect") {
-      this.connected();
-    } else if(message == "disconnect") {
-      this.disconnected();
-    } else if(message == "c") {
-      var command = data[1].toUpperCase();
-       
-      var prefix = data[2];
-      var sl = data[3];
-      var n = Numerics[command];
-      
-      var x = n;
-      if(!n)
-        n = command;  
-
-      var o = this["irc_" + n];
-      
-      if(o) {
-        var r = o.attempt([prefix, sl], this);
-        if(!r)
-          this.rawNumeric(command, prefix, sl);
-      } else {
-        this.rawNumeric(command, prefix, sl);
-      }
-    }
-  },
-
-  irc_RPL_WELCOME: function(prefix, params) {
-    this.nickname = params[0];
-    
-    this.__signedOn = true;
-    this.signedOn(this.nickname);
-  },
-  irc_ERR_NICKNAMEINUSE: function(prefix, params) {
-    if(this.__signedOn)
-      return;
-    
-    var newnick = params[1] + "_";
-    if(newnick == this.lastnick)
-      newnick = "webchat" + Math.floor(Math.random() * 1024 * 1024);
-
-    this.send("NICK " + newnick);
-    this.lastnick = newnick;
-  },
-  irc_NICK: function(prefix, params) {
-    var user = prefix;
-    var oldnick = user.hostToNick();
-    var newnick = params[0];
-    
-    if(this.nickname == oldnick)
-      this.nickname = newnick;
-      
-    this.nickChanged(user, newnick);
-    
-    return true;
-  },
-  irc_QUIT: function(prefix, params) {
-    var user = prefix;
-    
-    var message = params.indexFromEnd(-1);
-    
-    this.userQuit(user, message);
-    
-    return true;
-  },
-  irc_PART: function(prefix, params) {
-    var user = prefix;
-    var channel = params[0];
-    var message = params[1];
-
-    var nick = user.hostToNick();
-    
-    if((nick == this.nickname) && this.channels[channel])
-      delete this.channels[channel];
-      
-    this.userPart(user, channel, message);
-    
-    return true;
-  },
-  irc_KICK: function(prefix, params) {
-    var kicker = prefix;
-    var channel = params[0];
-    var kickee = params[1];
-    var message = params[2];
-    
-    if((kickee == this.nickname) && this.channels[channel])
-      delete this.channels[channel];
-      
-    this.userKicked(kicker, channel, kickee, message);
-    
-    return true;
-  },
-  irc_PING: function(prefix, params) {
-    this.send("PONG :" + params.indexFromEnd(-1));
-    
-    return true;
-  },
-  irc_JOIN: function(prefix, params) {
-    var channel = params[0];
-    var user = prefix;
-    var nick = user.hostToNick();
-        
-    if(nick == this.nickname)
-      this.channels[channel] = true;
-    
-    this.userJoined(user, channel);
-    
-    return true;
-  },
-  irc_TOPIC: function(prefix, params) {
-    var user = prefix;
-    var channel = params[0];
-    var topic = params.indexFromEnd(-1);
-    
-    this.channelTopic(user, channel, topic);
-    
-    return true;
-  },
-  processCTCP: function(message) {
-    if(message.charAt(0) != "\x01")
-      return;
-    
-    if(message.charAt(message.length - 1) == "\x01") {
-      message = message.substr(1, message.length - 2);
-    } else {
-      message = message.substr(1);
-    }
-    return message.splitMax(" ", 2);
-  },
-  irc_PRIVMSG: function(prefix, params) {
-    var user = prefix;
-    var target = params[0];
-    var message = params.indexFromEnd(-1);
-    
-    var ctcp = this.processCTCP(message);
-    if(ctcp) {
-      var type = ctcp[0].toUpperCase();
-      
-      var replyfn = RegisteredCTCPs[type];
-      if(replyfn) {
-        var t = new Date().getTime() / 1000;
-        if(t > this.nextctcp)
-          this.send("NOTICE " + user.hostToNick() + " :\x01" + type + " " + replyfn(ctcp[1]) + "\x01");
-        this.nextctcp = t + 5;
-      }
-      
-      if(target == this.nickname) {
-        this.userCTCP(user, type, ctcp[1]);
-      } else {
-        this.channelCTCP(user, target, type, ctcp[1]);
-      }
-    } else {
-      if(target == this.nickname) {
-        this.userPrivmsg(user, message);
-      } else {
-        this.channelPrivmsg(user, target, message);
-      }
-    }
-    
-    return true;
-  },
-  irc_NOTICE: function(prefix, params) {
-    var user = prefix;
-    var target = params[0];
-    var message = params.indexFromEnd(-1);
-    
-    if(user == "") {
-      this.serverNotice(message);
-    } else if(target == this.nickname) {
-      var ctcp = this.processCTCP(message);
-      if(ctcp) {
-        this.userCTCPReply(user, ctcp[0], ctcp[1]);
-      } else {
-        this.userNotice(user, message);
-      }
-    } else {
-      this.channelNotice(user, target, message);
-    }
-    
-    return true;
-  },
-  irc_INVITE: function(prefix, params) {
-    var user = prefix;
-    var channel = params.indexFromEnd(-1);
-    
-    this.userInvite(user, channel);
-    
-    return true;
-  },
-  irc_ERROR: function(prefix, params) {
-    var message = params.indexFromEnd(-1);
-    
-    this.serverError(message);
-    
-    return true;
-  },
-  irc_MODE: function(prefix, params) {
-    var user = prefix;
-    var target = params[0];
-    var args = params.slice(1);
-    
-    if(target == this.nickname) {
-      this.userMode(args);
-    } else {
-      var modes = args[0].split("");
-      var xargs = args.slice(1);
-      
-      var data = []
-      var carg = 0;
-      var pos = 0;
-      var cmode = "+";
-      
-      modes.each(function(mode) {
-        if((mode == "+") || (mode == "-")) {
-          cmode = mode;
-          return;
-        }
-
-        if(this.pmodes[mode]) { 
-          d = [cmode, mode, xargs[carg++]]
-        } else {
-          d = [cmode, mode]
-        }
-        
-        data.push(d);
-      }, this);
-      
-      this.channelMode(user, target, data, args);
-    }
-    
-    return true;
-  },  
-  irc_RPL_ISUPPORT: function(prefix, params) {
-    var supported = params.slice(1, -1);
-    var supportedhash = {};
-    
-    for(var i=0;i<supported.length;i++) {
-      var l = supported[i].splitMax("=", 2);
-      this.supported(l[0], l[1]);
-    }
-  },  
-  irc_RPL_MYINFO: function(prefix, params) {
-    var pmodes = params[5].split("");
-    this.pmodes = {}
-    
-    pmodes.each(function(pmode) {
-      this.pmodes[pmode] = true;
-    }, this);
-  },  
-  irc_RPL_NAMREPLY: function(prefix, params) {
-    var channel = params[2];    
-    var names = params[3];
-    
-    this.channelNames(channel, names.split(" "));
-    
-    return true;
-  },
-  irc_RPL_ENDOFNAMES: function(prefix, params) {
-    var channel = params[1];
-
-    this.channelNames(channel, []);
-    return true;
-  },
-  irc_RPL_NOTOPIC: function(prefix, params) {
-    return true;
-  },  
-  irc_RPL_TOPIC: function(prefix, params) {
-    var channel = params[1];
-    var topic = params.indexFromEnd(-1);
-    
-    if(this.channels[channel]) {
-      this.initialTopic(channel, topic);
-      return true;
-    }
-  },  
-  irc_RPL_TOPICWHOTIME: function(prefix, params) {
-    return true;
-  }
-});
+var Numerics = {"001": "RPL_WELCOME", "433": "ERR_NICKNAMEINUSE", "004": "RPL_MYINFO", "005": "RPL_ISUPPORT", "353": "RPL_NAMREPLY", "366": "RPL_ENDOFNAMES", "331": "RPL_NOTOPIC", "332": "RPL_TOPIC", "333": "RPL_TOPICWHOTIME"};
+
+var RegisteredCTCPs = {
+  "VERSION": function(x) {
+    return "qwebirc v" + QWEBIRC_VERSION + ", copyright (C) Chris Porter 2008 -- user agent: " + Browser.Engine.name + " (" + Browser.Platform.name + ")";
+  },
+  "USERINFO": function(x) { return "qwebirc"; },
+  "TIME": function(x) { return IRCTime(new Date()); },
+  "PING": function(x) { return x; },
+  "CLIENTINFO": function(x) { return "PING VERSION TIME USERINFO CLIENTINFO"; }
+};
+
+var BaseIRCClient = new Class({
+  Implements: [Options],
+  options: {
+    nickname: "WCunset",
+  },
+  initialize: function(options) {
+    this.setOptions(options);
+
+    this.nickname = this.options.nickname;
+    
+    this.__signedOn = false;
+    this.pmodes = ["b", "k,", "o", "l", "v"];
+    this.channels = {}
+    this.nextctcp = 0;    
+
+    this.connection = new IRCConnection({initialNickname: this.nickname, onRecv: this.dispatch.bind(this)});
+  
+    this.send = this.connection.send.bind(this.connection);
+    this.connect = this.connection.connect.bind(this.connection);
+    this.disconnect = this.connection.disconnect;
+  },
+  dispatch: function(data) {
+    var message = data[0];
+    if(message == "connect") {
+      this.connected();
+    } else if(message == "disconnect") {
+      this.disconnected();
+    } else if(message == "c") {
+      var command = data[1].toUpperCase();
+       
+      var prefix = data[2];
+      var sl = data[3];
+      var n = Numerics[command];
+      
+      var x = n;
+      if(!n)
+        n = command;  
+
+      var o = this["irc_" + n];
+      
+      if(o) {
+        var r = o.attempt([prefix, sl], this);
+        if(!r)
+          this.rawNumeric(command, prefix, sl);
+      } else {
+        this.rawNumeric(command, prefix, sl);
+      }
+    }
+  },
+
+  irc_RPL_WELCOME: function(prefix, params) {
+    this.nickname = params[0];
+    
+    this.__signedOn = true;
+    this.signedOn(this.nickname);
+  },
+  irc_ERR_NICKNAMEINUSE: function(prefix, params) {
+    if(this.__signedOn)
+      return;
+    
+    var newnick = params[1] + "_";
+    if(newnick == this.lastnick)
+      newnick = "webchat" + Math.floor(Math.random() * 1024 * 1024);
+
+    this.send("NICK " + newnick);
+    this.lastnick = newnick;
+  },
+  irc_NICK: function(prefix, params) {
+    var user = prefix;
+    var oldnick = user.hostToNick();
+    var newnick = params[0];
+    
+    if(this.nickname == oldnick)
+      this.nickname = newnick;
+      
+    this.nickChanged(user, newnick);
+    
+    return true;
+  },
+  irc_QUIT: function(prefix, params) {
+    var user = prefix;
+    
+    var message = params.indexFromEnd(-1);
+    
+    this.userQuit(user, message);
+    
+    return true;
+  },
+  irc_PART: function(prefix, params) {
+    var user = prefix;
+    var channel = params[0];
+    var message = params[1];
+
+    var nick = user.hostToNick();
+    
+    if((nick == this.nickname) && this.channels[channel])
+      delete this.channels[channel];
+      
+    this.userPart(user, channel, message);
+    
+    return true;
+  },
+  irc_KICK: function(prefix, params) {
+    var kicker = prefix;
+    var channel = params[0];
+    var kickee = params[1];
+    var message = params[2];
+    
+    if((kickee == this.nickname) && this.channels[channel])
+      delete this.channels[channel];
+      
+    this.userKicked(kicker, channel, kickee, message);
+    
+    return true;
+  },
+  irc_PING: function(prefix, params) {
+    this.send("PONG :" + params.indexFromEnd(-1));
+    
+    return true;
+  },
+  irc_JOIN: function(prefix, params) {
+    var channel = params[0];
+    var user = prefix;
+    var nick = user.hostToNick();
+        
+    if(nick == this.nickname)
+      this.channels[channel] = true;
+    
+    this.userJoined(user, channel);
+    
+    return true;
+  },
+  irc_TOPIC: function(prefix, params) {
+    var user = prefix;
+    var channel = params[0];
+    var topic = params.indexFromEnd(-1);
+    
+    this.channelTopic(user, channel, topic);
+    
+    return true;
+  },
+  processCTCP: function(message) {
+    if(message.charAt(0) != "\x01")
+      return;
+    
+    if(message.charAt(message.length - 1) == "\x01") {
+      message = message.substr(1, message.length - 2);
+    } else {
+      message = message.substr(1);
+    }
+    return message.splitMax(" ", 2);
+  },
+  irc_PRIVMSG: function(prefix, params) {
+    var user = prefix;
+    var target = params[0];
+    var message = params.indexFromEnd(-1);
+    
+    var ctcp = this.processCTCP(message);
+    if(ctcp) {
+      var type = ctcp[0].toUpperCase();
+      
+      var replyfn = RegisteredCTCPs[type];
+      if(replyfn) {
+        var t = new Date().getTime() / 1000;
+        if(t > this.nextctcp)
+          this.send("NOTICE " + user.hostToNick() + " :\x01" + type + " " + replyfn(ctcp[1]) + "\x01");
+        this.nextctcp = t + 5;
+      }
+      
+      if(target == this.nickname) {
+        this.userCTCP(user, type, ctcp[1]);
+      } else {
+        this.channelCTCP(user, target, type, ctcp[1]);
+      }
+    } else {
+      if(target == this.nickname) {
+        this.userPrivmsg(user, message);
+      } else {
+        this.channelPrivmsg(user, target, message);
+      }
+    }
+    
+    return true;
+  },
+  irc_NOTICE: function(prefix, params) {
+    var user = prefix;
+    var target = params[0];
+    var message = params.indexFromEnd(-1);
+    
+    if(user == "") {
+      this.serverNotice(message);
+    } else if(target == this.nickname) {
+      var ctcp = this.processCTCP(message);
+      if(ctcp) {
+        this.userCTCPReply(user, ctcp[0], ctcp[1]);
+      } else {
+        this.userNotice(user, message);
+      }
+    } else {
+      this.channelNotice(user, target, message);
+    }
+    
+    return true;
+  },
+  irc_INVITE: function(prefix, params) {
+    var user = prefix;
+    var channel = params.indexFromEnd(-1);
+    
+    this.userInvite(user, channel);
+    
+    return true;
+  },
+  irc_ERROR: function(prefix, params) {
+    var message = params.indexFromEnd(-1);
+    
+    this.serverError(message);
+    
+    return true;
+  },
+  irc_MODE: function(prefix, params) {
+    var user = prefix;
+    var target = params[0];
+    var args = params.slice(1);
+    
+    if(target == this.nickname) {
+      this.userMode(args);
+    } else {
+      var modes = args[0].split("");
+      var xargs = args.slice(1);
+      
+      var data = []
+      var carg = 0;
+      var pos = 0;
+      var cmode = "+";
+      
+      modes.each(function(mode) {
+        if((mode == "+") || (mode == "-")) {
+          cmode = mode;
+          return;
+        }
+
+        if(this.pmodes[mode]) { 
+          d = [cmode, mode, xargs[carg++]]
+        } else {
+          d = [cmode, mode]
+        }
+        
+        data.push(d);
+      }, this);
+      
+      this.channelMode(user, target, data, args);
+    }
+    
+    return true;
+  },  
+  irc_RPL_ISUPPORT: function(prefix, params) {
+    var supported = params.slice(1, -1);
+    var supportedhash = {};
+    
+    for(var i=0;i<supported.length;i++) {
+      var l = supported[i].splitMax("=", 2);
+      this.supported(l[0], l[1]);
+    }
+  },  
+  irc_RPL_MYINFO: function(prefix, params) {
+    var pmodes = params[5].split("");
+    this.pmodes = {}
+    
+    pmodes.each(function(pmode) {
+      this.pmodes[pmode] = true;
+    }, this);
+  },  
+  irc_RPL_NAMREPLY: function(prefix, params) {
+    var channel = params[2];    
+    var names = params[3];
+    
+    this.channelNames(channel, names.split(" "));
+    
+    return true;
+  },
+  irc_RPL_ENDOFNAMES: function(prefix, params) {
+    var channel = params[1];
+
+    this.channelNames(channel, []);
+    return true;
+  },
+  irc_RPL_NOTOPIC: function(prefix, params) {
+    return true;
+  },  
+  irc_RPL_TOPIC: function(prefix, params) {
+    var channel = params[1];
+    var topic = params.indexFromEnd(-1);
+    
+    if(this.channels[channel]) {
+      this.initialTopic(channel, topic);
+      return true;
+    }
+  },  
+  irc_RPL_TOPICWHOTIME: function(prefix, params) {
+    return true;
+  }
+});
diff --git a/js/irc/commandparser.js b/js/irc/commandparser.js
index 0eb60b5..71ed66c 100644
--- a/js/irc/commandparser.js
+++ b/js/irc/commandparser.js
@@ -1,147 +1,147 @@
-var CommandParser = new Class({
-  initialize: function(parentObject) {
-    this.aliases = {
-      "J": "JOIN",
-      "K": "KICK",
-      "MSG": "PRIVMSG",
-      "Q": "QUERY"
-    };
-    
-    this.send = parentObject.send;
-    this.parentObject = parentObject;
-  },
-  newTargetLine: function(target, type, message, extra) {
-    if(!extra)
-      extra = {}
-
-    extra["n"] = this.parentObject.getNickname();
-    extra["m"] = message;
-    extra["t"] = target;
-
-    var window = this.parentObject.getWindow(target);
-    var channel;
-    if(!window) {
-      type = "TARGETED" + type;
-      target = false;
-    } else if(window.type == WINDOW_CHANNEL) {
-      type = "CHAN" + type;
-    } else {
-      type = "PRIV" + type;
-    }
-
-    this.parentObject.newLine(target, "OUR" + type, extra);
-  },
-  dispatch: function(line) {
-    if(line.length == 0)
-      return;
-
-    if(line.charAt(0) != "/")
-      line = "/SAY " + line;
-    
-    var line = line.substr(1);
-    var allargs = line.splitMax(" ", 2);
-    var command = allargs[0].toUpperCase();
-    var args = allargs[1];
-        
-    var aliascmd = this.aliases[command];
-    if(aliascmd)
-      command = aliascmd;
-    
-    for(;;) {
-      var cmdopts = this["cmd_" + command];
-      if(!cmdopts) {
-        if(args) {
-          this.send(command + " " + args);
-        } else {
-          this.send(command);
-        }
-        return;
-      }
-      
-      var activewin = cmdopts[0];
-      var splitargs = cmdopts[1];
-      var minargs = cmdopts[2];  
-      var fn = cmdopts[3];
-      
-      var w = this.parentObject.getActiveWindow();
-      if(activewin && w.type == WINDOW_STATUS) {
-        w.errorMessage("Can't use this command in this window");
-        return;
-      }
-    
-      if(splitargs != undefined)
-        args = args.splitMax(" ", splitargs);
-      
-      if((minargs != undefined) && (minargs > args.length)) {
-        w.errorMessage("Insufficient arguments for command.")
-        return;
-      }
-      
-      var ret = fn.attempt([args], this);
-      if(ret == undefined)
-        return;
-        
-      command = ret[0];
-      args = ret[1];
-    }
-  },
-  
-  
-  cmd_ME: [true, undefined, undefined, function(args) {
-    if(args == undefined)
-      args = "";
-    return ["SAY", "\x01ACTION " + args + "\x01"];
-  }],
-  cmd_CTCP: [false, 3, 2, function(args) {
-    var target = args[0];
-    var type = args[1].toUpperCase();
-    var message = args[2];
-    
-    if(message == undefined)
-      message = "";
-
-    if(message == "") {
-      this.send("PRIVMSG " + target + " :\x01" + type + "\x01");
-    } else {
-      this.send("PRIVMSG " + target + " :\x01" + type + " " + message + "\x01");
-    }
-  
-    this.newTargetLine(target, "CTCP", message, {"x": type});
-  }],
-  cmd_PRIVMSG: [false, 2, 2, function(args) {
-    var target = args[0];
-    var message = args[1];
-    
-    this.newTargetLine(target, "MSG", message, {});
-    
-    this.send("PRIVMSG " + target + " :" + message);
-  }],
-  cmd_NOTICE: [false, 2, 2, function(args) {
-    var target = args[0];
-    var message = args[1];
-
-    this.newTargetLine(target, "NOTICE", message);
-    this.send("NOTICE " + target + " :" + message);
-  }],
-  cmd_QUERY: [false, 2, 1, function(args) {
-    this.parentObject.newWindow(args[0], WINDOW_QUERY, true);
-
-    if((args.length > 1) && (args[1] != ""))
-      return ["SAY", args[1]];
-  }],
-  cmd_SAY: [true, undefined, undefined, function(args) {
-    if(args == undefined)
-      args = "";
-      
-    return ["PRIVMSG", this.parentObject.getActiveWindow().name + " " + args]
-  }],
-  KICK: [true, 3, 2, function(args) {
-    var channel = args[0];
-    var target = args[1];
-    var message = args[2];
-    if(!message)
-      message = "";
-    
-    this.send("KICK " + channel + " " + target + " :" + message);
-  }],
-});
+var CommandParser = new Class({
+  initialize: function(parentObject) {
+    this.aliases = {
+      "J": "JOIN",
+      "K": "KICK",
+      "MSG": "PRIVMSG",
+      "Q": "QUERY"
+    };
+    
+    this.send = parentObject.send;
+    this.parentObject = parentObject;
+  },
+  newTargetLine: function(target, type, message, extra) {
+    if(!extra)
+      extra = {}
+
+    extra["n"] = this.parentObject.getNickname();
+    extra["m"] = message;
+    extra["t"] = target;
+
+    var window = this.parentObject.getWindow(target);
+    var channel;
+    if(!window) {
+      type = "TARGETED" + type;
+      target = false;
+    } else if(window.type == WINDOW_CHANNEL) {
+      type = "CHAN" + type;
+    } else {
+      type = "PRIV" + type;
+    }
+
+    this.parentObject.newLine(target, "OUR" + type, extra);
+  },
+  dispatch: function(line) {
+    if(line.length == 0)
+      return;
+
+    if(line.charAt(0) != "/")
+      line = "/SAY " + line;
+    
+    var line = line.substr(1);
+    var allargs = line.splitMax(" ", 2);
+    var command = allargs[0].toUpperCase();
+    var args = allargs[1];
+        
+    var aliascmd = this.aliases[command];
+    if(aliascmd)
+      command = aliascmd;
+    
+    for(;;) {
+      var cmdopts = this["cmd_" + command];
+      if(!cmdopts) {
+        if(args) {
+          this.send(command + " " + args);
+        } else {
+          this.send(command);
+        }
+        return;
+      }
+      
+      var activewin = cmdopts[0];
+      var splitargs = cmdopts[1];
+      var minargs = cmdopts[2];  
+      var fn = cmdopts[3];
+      
+      var w = this.parentObject.getActiveWindow();
+      if(activewin && w.type == WINDOW_STATUS) {
+        w.errorMessage("Can't use this command in this window");
+        return;
+      }
+    
+      if(splitargs != undefined)
+        args = args.splitMax(" ", splitargs);
+      
+      if((minargs != undefined) && (minargs > args.length)) {
+        w.errorMessage("Insufficient arguments for command.")
+        return;
+      }
+      
+      var ret = fn.attempt([args], this);
+      if(ret == undefined)
+        return;
+        
+      command = ret[0];
+      args = ret[1];
+    }
+  },
+  
+  
+  cmd_ME: [true, undefined, undefined, function(args) {
+    if(args == undefined)
+      args = "";
+    return ["SAY", "\x01ACTION " + args + "\x01"];
+  }],
+  cmd_CTCP: [false, 3, 2, function(args) {
+    var target = args[0];
+    var type = args[1].toUpperCase();
+    var message = args[2];
+    
+    if(message == undefined)
+      message = "";
+
+    if(message == "") {
+      this.send("PRIVMSG " + target + " :\x01" + type + "\x01");
+    } else {
+      this.send("PRIVMSG " + target + " :\x01" + type + " " + message + "\x01");
+    }
+  
+    this.newTargetLine(target, "CTCP", message, {"x": type});
+  }],
+  cmd_PRIVMSG: [false, 2, 2, function(args) {
+    var target = args[0];
+    var message = args[1];
+    
+    this.newTargetLine(target, "MSG", message, {});
+    
+    this.send("PRIVMSG " + target + " :" + message);
+  }],
+  cmd_NOTICE: [false, 2, 2, function(args) {
+    var target = args[0];
+    var message = args[1];
+
+    this.newTargetLine(target, "NOTICE", message);
+    this.send("NOTICE " + target + " :" + message);
+  }],
+  cmd_QUERY: [false, 2, 1, function(args) {
+    this.parentObject.newWindow(args[0], WINDOW_QUERY, true);
+
+    if((args.length > 1) && (args[1] != ""))
+      return ["SAY", args[1]];
+  }],
+  cmd_SAY: [true, undefined, undefined, function(args) {
+    if(args == undefined)
+      args = "";
+      
+    return ["PRIVMSG", this.parentObject.getActiveWindow().name + " " + args]
+  }],
+  KICK: [true, 3, 2, function(args) {
+    var channel = args[0];
+    var target = args[1];
+    var message = args[2];
+    if(!message)
+      message = "";
+    
+    this.send("KICK " + channel + " " + target + " :" + message);
+  }],
+});
diff --git a/js/irc/ircclient.js b/js/irc/ircclient.js
index 2c8d822..e974a96 100644
--- a/js/irc/ircclient.js
+++ b/js/irc/ircclient.js
@@ -1,364 +1,364 @@
-var IRCClient = new Class({
-  Extends: BaseIRCClient,
-  options: {
-    nickname: "WCunset",
-    autojoin: "",
-  },
-  initialize: function(options, ui) {
-    this.parent(options);
-
-    this.ui = ui;
-
-    this.prefixes = "@+";
-    this.modeprefixes = "ov";
-    this.windows = {};
-    
-    this.commandparser = new CommandParser(this);
-    this.exec = this.commandparser.dispatch.bind(this.commandparser);
-
-    this.statusWindow = this.ui.newClient(this);
-  },
-  newLine: function(window, type, data) {
-    if(!data)
-      data = {};
-      
-    var w = this.getWindow(window);
-    if(w) {
-      w.addLine(type, data);
-    } else {
-      this.statusWindow.addLine(type, data);
-    }
-  },
-  newChanLine: function(channel, type, user, extra) {
-    if(!extra)
-      extra = {};
-
-    extra["n"] = user.hostToNick();
-    extra["h"] = user.hostToHost();
-    extra["c"] = channel;
-    extra["-"] = this.nickname;
-    
-    this.newLine(channel, type, extra);
-  },
-  newServerLine: function(type, data) {
-    this.statusWindow.addLine(type, data);
-  },
-  newActiveLine: function(type, data) {
-    this.ui.getActiveWindow().addLine(type, data);
-  },
-  updateNickList: function(channel) {
-    var n1 = this.tracker.getChannel(channel);
-    var names = new Array();
-    var tff = String.fromCharCode(255);
-    var nh = {}
-    
-    /* MEGAHACK */
-    for(var n in n1) {
-      var nc = n1[n];
-      var nx;
-      
-      if(nc.prefixes.length > 0) {
-        var c = nc.prefixes.charAt(0);
-        nx = String.fromCharCode(this.prefixes.indexOf(c)) + n.toIRCLower();
-        nh[nx] = c + n;
-      } else {
-        nx = tff + n.toIRCLower();
-        nh[nx] = n;
-      }
-      names.push(nx);
-    };
-    
-    names.sort();
-    
-    var sortednames = new Array();
-    names.each(function(name) {
-      sortednames.push(nh[name]);
-    });
-    
-    var w = this.getWindow(channel);
-    if(w)
-      w.updateNickList(sortednames);
-  },
-  getWindow: function(name) {
-    return this.windows[name];
-  },
-  newWindow: function(name, type, select) {
-    var w = this.getWindow(name);
-    if(!w) {
-      w = this.windows[name] = this.ui.newWindow(this, type, name);
-      
-      w.addEvent("close", function(w) {
-        delete this.windows[name];
-      }.bind(this));
-    }
-    
-    if(select)
-      this.ui.selectWindow(w);
-      
-    return w;
-  },
-  getActiveWindow: function() {
-    return this.ui.getActiveWindow();
-  },
-  getNickname: function() {
-    return this.nickname;
-  },
-  addPrefix: function(nickchanentry, prefix) {
-    var ncp = nickchanentry.prefixes + prefix;
-    var prefixes = [];
-    
-    /* O(n^2) */
-    for(var i=0;i<this.prefixes.length;i++) {
-      var pc = this.prefixes.charAt(i);
-      var index = ncp.indexOf(pc);
-      if(index != -1)
-        prefixes.push(pc);
-    }
-    
-    nickchanentry.prefixes = prefixes.join("");
-  },
-  removePrefix: function(nickchanentry, prefix) {
-    nickchanentry.prefixes = nickchanentry.prefixes.replaceAll(prefix, "");
-  },
-  
-  /* from here down are events */
-  rawNumeric: function(numeric, prefix, params) {
-    this.newServerLine("RAW", {"n": "numeric", "m": params.slice(1).join(" ")});
-  },
-  signedOn: function(nickname) {
-    this.tracker = new IRCTracker();
-    this.nickname = nickname;
-    this.newServerLine("SIGNON");
-    
-    if(this.autojoin)
-      this.send("JOIN " + this.autojoin);
-  },
-  userJoined: function(user, channel) {
-    var nick = user.hostToNick();
-    var host = user.hostToHost();
-    
-    if((nick == this.nickname) && !this.getWindow(channel))
-      this.newWindow(channel, WINDOW_CHANNEL, true);
-    this.tracker.addNickToChannel(nick, channel);
-
-    this.newChanLine(channel, "JOIN", user);
-    this.updateNickList(channel);
-  },
-  userPart: function(user, channel, message) {
-    var nick = user.hostToNick();
-    var host = user.hostToHost();
-        
-    if(nick == this.nickname) {
-      this.tracker.removeChannel(channel);
-    } else {
-      this.tracker.removeNickFromChannel(nick, channel);
-      this.newChanLine(channel, "PART", user, {"m": message});
-    }
-  
-    this.updateNickList(channel);
-    
-    var w = this.getWindow(channel)
-    if(w)
-      w.close();
-  },
-  userKicked: function(kicker, channel, kickee, message) {
-    if(kickee == this.nickname) {
-      this.tracker.removeChannel(channel);
-      this.getWindow(channel).close();
-    } else {
-      this.tracker.removeNickFromChannel(kickee, channel);
-      this.updateNickList(channel);
-    }
-      
-    this.newChanLine(channel, "KICK", kicker, {"v": kickee, "m": message});
-  },
-  channelMode: function(user, channel, modes, raw) {
-    modes.each(function(mo) {
-      var direction = mo[0];
-      var mode = mo[1];
-
-      var prefixindex = this.modeprefixes.indexOf(mode);
-      if(prefixindex == -1)
-        return;
-        
-      var nick = mo[2];
-      var prefixchar = this.prefixes.charAt(prefixindex);
-
-      var nc = this.tracker.getOrCreateNickOnChannel(nick, channel);
-      if(direction == "-") {
-        this.removePrefix(nc, prefixchar);
-      } else {
-        this.addPrefix(nc, prefixchar);
-      }
-    }, this);
-
-    this.newChanLine(channel, "MODE", user, {"m": raw.join(" ")});
-    
-    this.updateNickList(channel);
-  },
-  userQuit: function(user, message) {
-    var nick = user.hostToNick();
-    
-    var channels = this.tracker.getNick(nick);
-    
-    var clist = [];
-    for(var c in channels) {
-      clist.push(c);
-      this.newChanLine(c, "QUIT", user, {"m": message});
-    }
-    
-    this.tracker.removeNick(nick);
-    
-    clist.each(function(cli) {
-      this.updateNickList(cli);
-    }, this);
-  },
-  nickChanged: function(user, newnick) {
-    var oldnick = user.hostToNick();
-    
-    if(oldnick == this.nickname)
-      this.nickname = newnick;
-      
-    this.tracker.renameNick(oldnick, newnick);
-
-    var channels = this.tracker.getNick(newnick);
-    
-    for(var c in channels) {
-      this.newChanLine(c, "NICK", user, {"w": newnick});
-      /* TODO: rename queries */
-      this.updateNickList(c);
-    }
-  },
-  channelTopic: function(user, channel, topic) {
-    this.newChanLine(channel, "TOPIC", user, {"m": topic});
-    this.getWindow(channel).updateTopic(topic);
-  },
-  initialTopic: function(channel, topic) {
-    this.getWindow(channel).updateTopic(topic);
-  },
-  channelCTCP: function(user, channel, type, args) {
-    if(args == undefined)
-      args = "";
-
-    if(type == "ACTION") {
-      this.newChanLine(channel, "CHANACTION", user, {"m": args, "c": channel});
-      return;
-    }
-    
-    this.newChanLine(channel, "CHANCTCP", user, {"x": type, "m": args, "c": channel});
-  },
-  userCTCP: function(user, type, args) {
-    var nick = user.hostToNick();
-    var host = user.hostToHost();
-    if(args == undefined)
-      args = "";
-    
-    if(type == "ACTION") {      
-      this.newWindow(nick, WINDOW_QUERY);
-      this.newLine(nick, "PRIVACTION", {"m": args, "x": type, "h": host, "n": nick});
-      return;
-    }
-    
-    if(this.getWindow(nick)) {
-      this.newLine(nick, "PRIVCTCP", {"m": args, "x": type, "h": host, "n": nick, "-": this.nickname});
-    } else {
-      this.newActiveLine("PRIVCTCP", {"m": args, "x": type, "h": host, "n": nick, "-": this.nickname});
-    }
-  },
-  userCTCPReply: function(user, type, args) {
-    var nick = user.hostToNick();
-    var host = user.hostToHost();
-    if(args == undefined)
-      args = "";
-    
-    if(this.getWindow(nick)) {
-      this.newLine(nick, "CTCPREPLY", {"m": args, "x": type, "h": host, "n": nick, "-": this.nickname});
-    } else {
-      this.newActiveLine("CTCPREPLY", {"m": args, "x": type, "h": host, "n": nick, "-": this.nickname});
-    }
-  },
-  channelPrivmsg: function(user, channel, message) {
-    this.newChanLine(channel, "CHANMSG", user, {"m": message});
-  },
-  channelNotice: function(user, channel, message) {
-    this.newChanLine(channel, "CHANNOTICE", user, {"m": message});
-  },
-  userPrivmsg: function(user, message) {
-    var nick = user.hostToNick();
-    var host = user.hostToHost();
-    
-    this.newWindow(nick, WINDOW_QUERY);
-    
-    this.newLine(nick, "PRIVMSG", {"m": message, "h": host, "n": nick});
-  },
-  serverNotice: function(message) {
-    this.newServerLine("SERVERNOTICE", {"m": message});
-  },
-  userNotice: function(user, message) {
-    var nick = user.hostToNick();
-    var host = user.hostToHost();
-
-    if(this.getWindow(nick)) {
-      this.newLine(nick, "PRIVNOTICE", {"m": message, "h": host, "n": nick});
-    } else {
-      this.newActiveLine("PRIVNOTICE", {"m": message, "h": host, "n": nick});
-    }
-  },
-  userInvite: function(user, channel) {
-    var nick = user.hostToNick();
-    var host = user.hostToHost();
-
-    this.newServerLine("INVITE", {"c": channel, "h": host, "n": nick});
-  },
-  userMode: function(modes) {
-    this.newServerLine("UMODE", {"m": modes, "n": this.nickname});
-  },
-  channelNames: function(channel, names) {
-    if(names.length == 0) {
-      this.updateNickList(channel);
-      return;
-    }
-    
-    names.each(function(nick) {
-      var prefixes = [];
-      var splitnick = nick.split("");
-      
-      splitnick.every(function(c, i) {
-        if(this.prefixes.indexOf(c) == -1) {
-          nick = nick.substr(i);
-          return false;
-        }
-        
-        prefixes.push(c);
-        return true;
-      }, this);
-
-      var nc = this.tracker.addNickToChannel(nick, channel);
-      prefixes.each(function(p) {
-        this.addPrefix(nc, p);
-      }, this);
-    }, this);
-  },
-  disconnected: function() {
-    for(var x in this.parent.channels)
-      this.ui.closeWindow(x);
-
-    this.tracker = undefined;
-    
-    this.newServerLine("DISCONNECT");
-  },
-  supported: function(key, value) {
-    if(key == "PREFIX") {
-      var l = (value.length - 2) / 2;
-
-      this.modeprefixes = value.substr(1, l);
-      this.prefixes = value.substr(l + 2, l);
-    }
-  },
-  connected: function() {
-    this.newServerLine("CONNECT");
-  },
-  serverError: function(message) {
-    this.newServerLine("ERROR", {"m": message});
-  }
-});
+var IRCClient = new Class({
+  Extends: BaseIRCClient,
+  options: {
+    nickname: "WCunset",
+    autojoin: "",
+  },
+  initialize: function(options, ui) {
+    this.parent(options);
+
+    this.ui = ui;
+
+    this.prefixes = "@+";
+    this.modeprefixes = "ov";
+    this.windows = {};
+    
+    this.commandparser = new CommandParser(this);
+    this.exec = this.commandparser.dispatch.bind(this.commandparser);
+
+    this.statusWindow = this.ui.newClient(this);
+  },
+  newLine: function(window, type, data) {
+    if(!data)
+      data = {};
+      
+    var w = this.getWindow(window);
+    if(w) {
+      w.addLine(type, data);
+    } else {
+      this.statusWindow.addLine(type, data);
+    }
+  },
+  newChanLine: function(channel, type, user, extra) {
+    if(!extra)
+      extra = {};
+
+    extra["n"] = user.hostToNick();
+    extra["h"] = user.hostToHost();
+    extra["c"] = channel;
+    extra["-"] = this.nickname;
+    
+    this.newLine(channel, type, extra);
+  },
+  newServerLine: function(type, data) {
+    this.statusWindow.addLine(type, data);
+  },
+  newActiveLine: function(type, data) {
+    this.ui.getActiveWindow().addLine(type, data);
+  },
+  updateNickList: function(channel) {
+    var n1 = this.tracker.getChannel(channel);
+    var names = new Array();
+    var tff = String.fromCharCode(255);
+    var nh = {}
+    
+    /* MEGAHACK */
+    for(var n in n1) {
+      var nc = n1[n];
+      var nx;
+      
+      if(nc.prefixes.length > 0) {
+        var c = nc.prefixes.charAt(0);
+        nx = String.fromCharCode(this.prefixes.indexOf(c)) + n.toIRCLower();
+        nh[nx] = c + n;
+      } else {
+        nx = tff + n.toIRCLower();
+        nh[nx] = n;
+      }
+      names.push(nx);
+    };
+    
+    names.sort();
+    
+    var sortednames = new Array();
+    names.each(function(name) {
+      sortednames.push(nh[name]);
+    });
+    
+    var w = this.getWindow(channel);
+    if(w)
+      w.updateNickList(sortednames);
+  },
+  getWindow: function(name) {
+    return this.windows[name];
+  },
+  newWindow: function(name, type, select) {
+    var w = this.getWindow(name);
+    if(!w) {
+      w = this.windows[name] = this.ui.newWindow(this, type, name);
+      
+      w.addEvent("close", function(w) {
+        delete this.windows[name];
+      }.bind(this));
+    }
+    
+    if(select)
+      this.ui.selectWindow(w);
+      
+    return w;
+  },
+  getActiveWindow: function() {
+    return this.ui.getActiveWindow();
+  },
+  getNickname: function() {
+    return this.nickname;
+  },
+  addPrefix: function(nickchanentry, prefix) {
+    var ncp = nickchanentry.prefixes + prefix;
+    var prefixes = [];
+    
+    /* O(n^2) */
+    for(var i=0;i<this.prefixes.length;i++) {
+      var pc = this.prefixes.charAt(i);
+      var index = ncp.indexOf(pc);
+      if(index != -1)
+        prefixes.push(pc);
+    }
+    
+    nickchanentry.prefixes = prefixes.join("");
+  },
+  removePrefix: function(nickchanentry, prefix) {
+    nickchanentry.prefixes = nickchanentry.prefixes.replaceAll(prefix, "");
+  },
+  
+  /* from here down are events */
+  rawNumeric: function(numeric, prefix, params) {
+    this.newServerLine("RAW", {"n": "numeric", "m": params.slice(1).join(" ")});
+  },
+  signedOn: function(nickname) {
+    this.tracker = new IRCTracker();
+    this.nickname = nickname;
+    this.newServerLine("SIGNON");
+    
+    if(this.autojoin)
+      this.send("JOIN " + this.autojoin);
+  },
+  userJoined: function(user, channel) {
+    var nick = user.hostToNick();
+    var host = user.hostToHost();
+    
+    if((nick == this.nickname) && !this.getWindow(channel))
+      this.newWindow(channel, WINDOW_CHANNEL, true);
+    this.tracker.addNickToChannel(nick, channel);
+
+    this.newChanLine(channel, "JOIN", user);
+    this.updateNickList(channel);
+  },
+  userPart: function(user, channel, message) {
+    var nick = user.hostToNick();
+    var host = user.hostToHost();
+        
+    if(nick == this.nickname) {
+      this.tracker.removeChannel(channel);
+    } else {
+      this.tracker.removeNickFromChannel(nick, channel);
+      this.newChanLine(channel, "PART", user, {"m": message});
+    }
+  
+    this.updateNickList(channel);
+    
+    var w = this.getWindow(channel)
+    if(w)
+      w.close();
+  },
+  userKicked: function(kicker, channel, kickee, message) {
+    if(kickee == this.nickname) {
+      this.tracker.removeChannel(channel);
+      this.getWindow(channel).close();
+    } else {
+      this.tracker.removeNickFromChannel(kickee, channel);
+      this.updateNickList(channel);
+    }
+      
+    this.newChanLine(channel, "KICK", kicker, {"v": kickee, "m": message});
+  },
+  channelMode: function(user, channel, modes, raw) {
+    modes.each(function(mo) {
+      var direction = mo[0];
+      var mode = mo[1];
+
+      var prefixindex = this.modeprefixes.indexOf(mode);
+      if(prefixindex == -1)
+        return;
+        
+      var nick = mo[2];
+      var prefixchar = this.prefixes.charAt(prefixindex);
+
+      var nc = this.tracker.getOrCreateNickOnChannel(nick, channel);
+      if(direction == "-") {
+        this.removePrefix(nc, prefixchar);
+      } else {
+        this.addPrefix(nc, prefixchar);
+      }
+    }, this);
+
+    this.newChanLine(channel, "MODE", user, {"m": raw.join(" ")});
+    
+    this.updateNickList(channel);
+  },
+  userQuit: function(user, message) {
+    var nick = user.hostToNick();
+    
+    var channels = this.tracker.getNick(nick);
+    
+    var clist = [];
+    for(var c in channels) {
+      clist.push(c);
+      this.newChanLine(c, "QUIT", user, {"m": message});
+    }
+    
+    this.tracker.removeNick(nick);
+    
+    clist.each(function(cli) {
+      this.updateNickList(cli);
+    }, this);
+  },
+  nickChanged: function(user, newnick) {
+    var oldnick = user.hostToNick();
+    
+    if(oldnick == this.nickname)
+      this.nickname = newnick;
+      
+    this.tracker.renameNick(oldnick, newnick);
+
+    var channels = this.tracker.getNick(newnick);
+    
+    for(var c in channels) {
+      this.newChanLine(c, "NICK", user, {"w": newnick});
+      /* TODO: rename queries */
+      this.updateNickList(c);
+    }
+  },
+  channelTopic: function(user, channel, topic) {
+    this.newChanLine(channel, "TOPIC", user, {"m": topic});
+    this.getWindow(channel).updateTopic(topic);
+  },
+  initialTopic: function(channel, topic) {
+    this.getWindow(channel).updateTopic(topic);
+  },
+  channelCTCP: function(user, channel, type, args) {
+    if(args == undefined)
+      args = "";
+
+    if(type == "ACTION") {
+      this.newChanLine(channel, "CHANACTION", user, {"m": args, "c": channel});
+      return;
+    }
+    
+    this.newChanLine(channel, "CHANCTCP", user, {"x": type, "m": args, "c": channel});
+  },
+  userCTCP: function(user, type, args) {
+    var nick = user.hostToNick();
+    var host = user.hostToHost();
+    if(args == undefined)
+      args = "";
+    
+    if(type == "ACTION") {      
+      this.newWindow(nick, WINDOW_QUERY);
+      this.newLine(nick, "PRIVACTION", {"m": args, "x": type, "h": host, "n": nick});
+      return;
+    }
+    
+    if(this.getWindow(nick)) {
+      this.newLine(nick, "PRIVCTCP", {"m": args, "x": type, "h": host, "n": nick, "-": this.nickname});
+    } else {
+      this.newActiveLine("PRIVCTCP", {"m": args, "x": type, "h": host, "n": nick, "-": this.nickname});
+    }
+  },
+  userCTCPReply: function(user, type, args) {
+    var nick = user.hostToNick();
+    var host = user.hostToHost();
+    if(args == undefined)
+      args = "";
+    
+    if(this.getWindow(nick)) {
+      this.newLine(nick, "CTCPREPLY", {"m": args, "x": type, "h": host, "n": nick, "-": this.nickname});
+    } else {
+      this.newActiveLine("CTCPREPLY", {"m": args, "x": type, "h": host, "n": nick, "-": this.nickname});
+    }
+  },
+  channelPrivmsg: function(user, channel, message) {
+    this.newChanLine(channel, "CHANMSG", user, {"m": message});
+  },
+  channelNotice: function(user, channel, message) {
+    this.newChanLine(channel, "CHANNOTICE", user, {"m": message});
+  },
+  userPrivmsg: function(user, message) {
+    var nick = user.hostToNick();
+    var host = user.hostToHost();
+    
+    this.newWindow(nick, WINDOW_QUERY);
+    
+    this.newLine(nick, "PRIVMSG", {"m": message, "h": host, "n": nick});
+  },
+  serverNotice: function(message) {
+    this.newServerLine("SERVERNOTICE", {"m": message});
+  },
+  userNotice: function(user, message) {
+    var nick = user.hostToNick();
+    var host = user.hostToHost();
+
+    if(this.getWindow(nick)) {
+      this.newLine(nick, "PRIVNOTICE", {"m": message, "h": host, "n": nick});
+    } else {
+      this.newActiveLine("PRIVNOTICE", {"m": message, "h": host, "n": nick});
+    }
+  },
+  userInvite: function(user, channel) {
+    var nick = user.hostToNick();
+    var host = user.hostToHost();
+
+    this.newServerLine("INVITE", {"c": channel, "h": host, "n": nick});
+  },
+  userMode: function(modes) {
+    this.newServerLine("UMODE", {"m": modes, "n": this.nickname});
+  },
+  channelNames: function(channel, names) {
+    if(names.length == 0) {
+      this.updateNickList(channel);
+      return;
+    }
+    
+    names.each(function(nick) {
+      var prefixes = [];
+      var splitnick = nick.split("");
+      
+      splitnick.every(function(c, i) {
+        if(this.prefixes.indexOf(c) == -1) {
+          nick = nick.substr(i);
+          return false;
+        }
+        
+        prefixes.push(c);
+        return true;
+      }, this);
+
+      var nc = this.tracker.addNickToChannel(nick, channel);
+      prefixes.each(function(p) {
+        this.addPrefix(nc, p);
+      }, this);
+    }, this);
+  },
+  disconnected: function() {
+    for(var x in this.parent.channels)
+      this.ui.closeWindow(x);
+
+    this.tracker = undefined;
+    
+    this.newServerLine("DISCONNECT");
+  },
+  supported: function(key, value) {
+    if(key == "PREFIX") {
+      var l = (value.length - 2) / 2;
+
+      this.modeprefixes = value.substr(1, l);
+      this.prefixes = value.substr(l + 2, l);
+    }
+  },
+  connected: function() {
+    this.newServerLine("CONNECT");
+  },
+  serverError: function(message) {
+    this.newServerLine("ERROR", {"m": message});
+  }
+});
diff --git a/js/irc/ircconnection.js b/js/irc/ircconnection.js
index 9b7d8f2..ebb965c 100644
--- a/js/irc/ircconnection.js
+++ b/js/irc/ircconnection.js
@@ -1,57 +1,57 @@
-var IRCConnection = new Class({
-  Implements: [Events, Options],
-  options: {
-    initialNickname: "ircconnX"
-  },
-  initialize: function(options) {
-    this.setOptions(options);
-    
-    this.initialNickname = this.options.initialNickname;
-    
-    this.counter = 0;
-    this.disconnected = false;
-  },
-  send: function(data) {
-    var r = new Request.JSON({url: "/e/p/" + this.sessionid + "?c=" + encodeURIComponent(data) + "&t=" + this.counter++, onComplete: function(o) {
-      if(o[0] == false)
-        alert("An error occured: " + o[1]);
-    }});
-    
-    r.get();
-  },
-  x: function() {
-    this.fireEvent("recv", [[false, "moo"]]);
-  },
-  recv: function() {
-    if(this.disconnected)
-      return;
-      
-    var r = new Request.JSON({url: "/e/s/" + this.sessionid + "?t=" + this.counter++, onComplete: function(o) {
-      if(o[0] == false) {
-        alert("An error occured: " + o[1]);
-        return;
-      }
-      o.each(function(x) {
-        this.fireEvent("recv", [x]);
-      }, this);
-      
-      this.recv();
-    }.bind(this)});    
-    r.get();
-  },
-  connect: function() {
-    var r = new Request.JSON({url: "/e/n?nick=" + encodeURIComponent(this.initialNickname) + "&r=" + Math.random() * 1024 * 1024, onComplete: function(o) {
-      if(o[0] == false) {
-        alert("An error occured: " + o[1]);
-        return;
-      }
-      this.sessionid = o[1];
-      
-      this.recv();    
-    }.bind(this)});
-    r.get();
-  },
-  disconnect: function() {
-    this.disconnected = true;
-  }
-});
+var IRCConnection = new Class({
+  Implements: [Events, Options],
+  options: {
+    initialNickname: "ircconnX"
+  },
+  initialize: function(options) {
+    this.setOptions(options);
+    
+    this.initialNickname = this.options.initialNickname;
+    
+    this.counter = 0;
+    this.disconnected = false;
+  },
+  send: function(data) {
+    var r = new Request.JSON({url: "/e/p/" + this.sessionid + "?c=" + encodeURIComponent(data) + "&t=" + this.counter++, onComplete: function(o) {
+      if(o[0] == false)
+        alert("An error occured: " + o[1]);
+    }});
+    
+    r.get();
+  },
+  x: function() {
+    this.fireEvent("recv", [[false, "moo"]]);
+  },
+  recv: function() {
+    if(this.disconnected)
+      return;
+      
+    var r = new Request.JSON({url: "/e/s/" + this.sessionid + "?t=" + this.counter++, onComplete: function(o) {
+      if(o[0] == false) {
+        alert("An error occured: " + o[1]);
+        return;
+      }
+      o.each(function(x) {
+        this.fireEvent("recv", [x]);
+      }, this);
+      
+      this.recv();
+    }.bind(this)});    
+    r.get();
+  },
+  connect: function() {
+    var r = new Request.JSON({url: "/e/n?nick=" + encodeURIComponent(this.initialNickname) + "&r=" + Math.random() * 1024 * 1024, onComplete: function(o) {
+      if(o[0] == false) {
+        alert("An error occured: " + o[1]);
+        return;
+      }
+      this.sessionid = o[1];
+      
+      this.recv();    
+    }.bind(this)});
+    r.get();
+  },
+  disconnect: function() {
+    this.disconnected = true;
+  }
+});
diff --git a/js/irc/irclib.js b/js/irc/irclib.js
index 0087424..8e53c38 100644
--- a/js/irc/irclib.js
+++ b/js/irc/irclib.js
@@ -1,95 +1,95 @@
-var IRCLowerTable = [
-/* x00-x07 */ '\x00', '\x01', '\x02', '\x03', '\x04', '\x05', '\x06', '\x07',
-/* x08-x0f */ '\x08', '\x09', '\x0a', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
-/* x10-x17 */ '\x10', '\x11', '\x12', '\x13', '\x14', '\x15', '\x16', '\x17',
-/* x18-x1f */ '\x18', '\x19', '\x1a', '\x1b', '\x1c', '\x1d', '\x1e', '\x1f',
-/* ' '-x27 */    ' ',    '!',    '"',    '#',    '$',    '%',    '&', '\x27',
-/* '('-'/' */    '(',    ')',    '*',    '+',    ',',    '-',    '.',    '/',
-/* '0'-'7' */    '0',    '1',    '2',    '3',    '4',    '5',    '6',    '7',
-/* '8'-'?' */    '8',    '9',    ':',    ';',    '<',    '=',    '>',    '?',
-/* '@'-'G' */    '@',    'a',    'b',    'c',    'd',    'e',    'f',    'g',
-/* 'H'-'O' */    'h',    'i',    'j',    'k',    'l',    'm',    'n',    'o',
-/* 'P'-'W' */    'p',    'q',    'r',    's',    't',    'u',    'v',    'w',
-/* 'X'-'_' */    'x',    'y',    'z',    '{',    '|',    '}',    '~',    '_',
-/* '`'-'g' */    '`',    'a',    'b',    'c',    'd',    'e',    'f',    'g',
-/* 'h'-'o' */    'h',    'i',    'j',    'k',    'l',    'm',    'n',    'o',
-/* 'p'-'w' */    'p',    'q',    'r',    's',    't',    'u',    'v',    'w',
-/* 'x'-x7f */    'x',    'y',    'z',    '{',    '|',    '}',    '~', '\x7f',
-/* x80-x87 */ '\x80', '\x81', '\x82', '\x83', '\x84', '\x85', '\x86', '\x87',
-/* x88-x8f */ '\x88', '\x89', '\x8a', '\x8b', '\x8c', '\x8d', '\x8e', '\x8f',
-/* x90-x97 */ '\x90', '\x91', '\x92', '\x93', '\x94', '\x95', '\x96', '\x97',
-/* x98-x9f */ '\x98', '\x99', '\x9a', '\x9b', '\x9c', '\x9d', '\x9e', '\x9f',
-/* xa0-xa7 */ '\xa0', '\xa1', '\xa2', '\xa3', '\xa4', '\xa5', '\xa6', '\xa7',
-/* xa8-xaf */ '\xa8', '\xa9', '\xaa', '\xab', '\xac', '\xad', '\xae', '\xaf',
-/* xb0-xb7 */ '\xb0', '\xb1', '\xb2', '\xb3', '\xb4', '\xb5', '\xb6', '\xb7',
-/* xb8-xbf */ '\xb8', '\xb9', '\xba', '\xbb', '\xbc', '\xbd', '\xbe', '\xbf',
-/* xc0-xc7 */ '\xe0', '\xe1', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6', '\xe7',
-/* xc8-xcf */ '\xe8', '\xe9', '\xea', '\xeb', '\xec', '\xed', '\xee', '\xef',
-/* xd0-xd7 */ '\xf0', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', '\xf6', '\xd7',
-/* xd8-xdf */ '\xf8', '\xf9', '\xfa', '\xfb', '\xfc', '\xfd', '\xfe', '\xdf',
-/* xe0-xe7 */ '\xe0', '\xe1', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6', '\xe7',
-/* xe8-xef */ '\xe8', '\xe9', '\xea', '\xeb', '\xec', '\xed', '\xee', '\xef',
-/* xf0-xf7 */ '\xf0', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', '\xf6', '\xf7',
-/* xf8-xff */ '\xf8', '\xf9', '\xfa', '\xfb', '\xfc', '\xfd', '\xfe', '\xff'
-];
-
-String.prototype.toIRCLower = function() {
-  var x = this;
-  
-  var p = [];
-  for(var i=0;i<x.length;i++) {
-    var l = x.charCodeAt(i);
-
-    p.push(IRCLowerTable[l]);
-  }
-    
-  return p.join("");
-}
-
-String.prototype.hostToNick = function() {
-  return this.split("!", 1)[0];
-}
-
-String.prototype.hostToHost = function() {
-  return this.split("!", 2)[1];
-}
-
-function IRCTimestamp(d) {
-  function pad(x) {
-    x = "" + x;
-    if(x.length == 1)
-      return "0" + x;
-    return x
-  }
-  
-  return "[" + pad(d.getHours()) + ":" + pad(d.getMinutes()) + "]";
-}
-
-var DaysOfWeek = {
-  0: "Sun",
-  1: "Mon",
-  2: "Tue",
-  3: "Wed",
-  4: "Thu",
-  5: "Fri",
-  6: "Sat"
-};
-
-var MonthsOfYear = {
-  0: "Jan",
-  1: "Feb",
-  2: "Mar",
-  3: "Apr",
-  4: "May",
-  5: "Jun",
-  6: "Jul",
-  7: "Aug",
-  8: "Sep",
-  9: "Oct",
-  10: "Nov",
-  11: "Dec"
-};
-
-function IRCDate(d) {
-  return DaysOfWeek[d.getDay()] + " " + MonthsOfYear[d.getMonth()] + " " + pad(d.getDate()) + " "  + pad(d.getHours()) + ":" + pad(d.getMinutes()) + ":" + pad(d.getSeconds()) + " " + d.getFullYear();
+var IRCLowerTable = [
+/* x00-x07 */ '\x00', '\x01', '\x02', '\x03', '\x04', '\x05', '\x06', '\x07',
+/* x08-x0f */ '\x08', '\x09', '\x0a', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
+/* x10-x17 */ '\x10', '\x11', '\x12', '\x13', '\x14', '\x15', '\x16', '\x17',
+/* x18-x1f */ '\x18', '\x19', '\x1a', '\x1b', '\x1c', '\x1d', '\x1e', '\x1f',
+/* ' '-x27 */    ' ',    '!',    '"',    '#',    '$',    '%',    '&', '\x27',
+/* '('-'/' */    '(',    ')',    '*',    '+',    ',',    '-',    '.',    '/',
+/* '0'-'7' */    '0',    '1',    '2',    '3',    '4',    '5',    '6',    '7',
+/* '8'-'?' */    '8',    '9',    ':',    ';',    '<',    '=',    '>',    '?',
+/* '@'-'G' */    '@',    'a',    'b',    'c',    'd',    'e',    'f',    'g',
+/* 'H'-'O' */    'h',    'i',    'j',    'k',    'l',    'm',    'n',    'o',
+/* 'P'-'W' */    'p',    'q',    'r',    's',    't',    'u',    'v',    'w',
+/* 'X'-'_' */    'x',    'y',    'z',    '{',    '|',    '}',    '~',    '_',
+/* '`'-'g' */    '`',    'a',    'b',    'c',    'd',    'e',    'f',    'g',
+/* 'h'-'o' */    'h',    'i',    'j',    'k',    'l',    'm',    'n',    'o',
+/* 'p'-'w' */    'p',    'q',    'r',    's',    't',    'u',    'v',    'w',
+/* 'x'-x7f */    'x',    'y',    'z',    '{',    '|',    '}',    '~', '\x7f',
+/* x80-x87 */ '\x80', '\x81', '\x82', '\x83', '\x84', '\x85', '\x86', '\x87',
+/* x88-x8f */ '\x88', '\x89', '\x8a', '\x8b', '\x8c', '\x8d', '\x8e', '\x8f',
+/* x90-x97 */ '\x90', '\x91', '\x92', '\x93', '\x94', '\x95', '\x96', '\x97',
+/* x98-x9f */ '\x98', '\x99', '\x9a', '\x9b', '\x9c', '\x9d', '\x9e', '\x9f',
+/* xa0-xa7 */ '\xa0', '\xa1', '\xa2', '\xa3', '\xa4', '\xa5', '\xa6', '\xa7',
+/* xa8-xaf */ '\xa8', '\xa9', '\xaa', '\xab', '\xac', '\xad', '\xae', '\xaf',
+/* xb0-xb7 */ '\xb0', '\xb1', '\xb2', '\xb3', '\xb4', '\xb5', '\xb6', '\xb7',
+/* xb8-xbf */ '\xb8', '\xb9', '\xba', '\xbb', '\xbc', '\xbd', '\xbe', '\xbf',
+/* xc0-xc7 */ '\xe0', '\xe1', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6', '\xe7',
+/* xc8-xcf */ '\xe8', '\xe9', '\xea', '\xeb', '\xec', '\xed', '\xee', '\xef',
+/* xd0-xd7 */ '\xf0', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', '\xf6', '\xd7',
+/* xd8-xdf */ '\xf8', '\xf9', '\xfa', '\xfb', '\xfc', '\xfd', '\xfe', '\xdf',
+/* xe0-xe7 */ '\xe0', '\xe1', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6', '\xe7',
+/* xe8-xef */ '\xe8', '\xe9', '\xea', '\xeb', '\xec', '\xed', '\xee', '\xef',
+/* xf0-xf7 */ '\xf0', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', '\xf6', '\xf7',
+/* xf8-xff */ '\xf8', '\xf9', '\xfa', '\xfb', '\xfc', '\xfd', '\xfe', '\xff'
+];
+
+String.prototype.toIRCLower = function() {
+  var x = this;
+  
+  var p = [];
+  for(var i=0;i<x.length;i++) {
+    var l = x.charCodeAt(i);
+
+    p.push(IRCLowerTable[l]);
+  }
+    
+  return p.join("");
+}
+
+String.prototype.hostToNick = function() {
+  return this.split("!", 1)[0];
+}
+
+String.prototype.hostToHost = function() {
+  return this.split("!", 2)[1];
+}
+
+function IRCTimestamp(d) {
+  function pad(x) {
+    x = "" + x;
+    if(x.length == 1)
+      return "0" + x;
+    return x
+  }
+  
+  return "[" + pad(d.getHours()) + ":" + pad(d.getMinutes()) + "]";
+}
+
+var DaysOfWeek = {
+  0: "Sun",
+  1: "Mon",
+  2: "Tue",
+  3: "Wed",
+  4: "Thu",
+  5: "Fri",
+  6: "Sat"
+};
+
+var MonthsOfYear = {
+  0: "Jan",
+  1: "Feb",
+  2: "Mar",
+  3: "Apr",
+  4: "May",
+  5: "Jun",
+  6: "Jul",
+  7: "Aug",
+  8: "Sep",
+  9: "Oct",
+  10: "Nov",
+  11: "Dec"
+};
+
+function IRCDate(d) {
+  return DaysOfWeek[d.getDay()] + " " + MonthsOfYear[d.getMonth()] + " " + pad(d.getDate()) + " "  + pad(d.getHours()) + ":" + pad(d.getMinutes()) + ":" + pad(d.getSeconds()) + " " + d.getFullYear();
 }
\ No newline at end of file
diff --git a/js/irc/irctracker.js b/js/irc/irctracker.js
index d301a4f..b52796d 100644
--- a/js/irc/irctracker.js
+++ b/js/irc/irctracker.js
@@ -1,108 +1,108 @@
-function NickChanEntry() {
-  this.prefixes = "";
-}
-
-var IRCTracker = new Class({
-  initialize: function() {
-    this.channels = {};
-    this.nicknames = {};
-  },
-  isEmpty: function(hash) {
-    for(var x in hash)
-      return false;
-    return true;
-  },
-  getNick: function(nick) {
-    return this.nicknames[nick];
-  },
-  getOrCreateNick: function(nick) {
-    var n = this.getNick(nick);
-    if(!n)
-      n = this.nicknames[nick] = {};
-    return n;
-  },
-  getChannel: function(channel) {
-    return this.channels[channel];
-  },
-  getOrCreateChannel: function(channel) {
-    var c = this.getChannel(channel);
-    if(!c)
-      c = this.channels[channel] = {};
-    return c;
-  },
-  getOrCreateNickOnChannel: function(nick, channel) {
-    var n = this.getNick(nick);
-    
-    var nc = n[channel];
-    if(!nc)
-      return this.addNickToChannel(nick, channel);
-      
-    return nc;
-  },
-  addNickToChannel: function(nick, channel) {
-    var nc = new NickChanEntry();
-
-    var n = this.getOrCreateNick(nick);
-    n[channel] = nc;
-    
-    var c = this.getOrCreateChannel(channel);
-    c[nick] = nc;
-    
-    return nc;
-  },
-  removeNick: function(nick) {
-    var n = this.getNick(nick);
-    if(!n)
-      return;
-      
-    for(var channel in n) {
-      var c = this.channels[channel];
-      
-      delete c[nick];
-      if(this.isEmpty(c))
-        delete this.channels[channel];
-    }
-    delete this.nicknames[nick];
-  },
-  removeChannel: function(channel) {
-    var c = this.getChannel(channel);
-    if(!c)
-      return;
-      
-    for(var nick in c) {
-      var n = this.nicknames[nick];
-      
-      delete n[channel];
-      if(this.isEmpty(n))
-        delete this.nicknames[nick];
-    }
-    delete this.channels[channel];
-  },
-  removeNickFromChannel: function(nick, channel) {
-    var n = this.getNick(nick);
-    var c = this.getChannel(channel);
-    if(!n || !c)
-      return;
-      
-    delete n[channel];
-    delete c[nick];
-    
-    if(this.isEmpty(n))
-      delete this.nicknames[nick];
-    if(this.isEmpty(c))
-      delete this.channels[channel];
-  },
-  renameNick: function(oldnick, newnick) {
-    var n = this.getNick(oldnick);
-    if(!n)
-      return;
-      
-    for(var channel in n) {
-      this.channels[channel][newnick] = this.channels[channel][oldnick];
-      delete this.channels[channel][oldnick];
-    }    
-    
-    this.nicknames[newnick] = this.nicknames[oldnick];
-    delete this.nicknames[oldnick];
-  }
-});
+function NickChanEntry() {
+  this.prefixes = "";
+}
+
+var IRCTracker = new Class({
+  initialize: function() {
+    this.channels = {};
+    this.nicknames = {};
+  },
+  isEmpty: function(hash) {
+    for(var x in hash)
+      return false;
+    return true;
+  },
+  getNick: function(nick) {
+    return this.nicknames[nick];
+  },
+  getOrCreateNick: function(nick) {
+    var n = this.getNick(nick);
+    if(!n)
+      n = this.nicknames[nick] = {};
+    return n;
+  },
+  getChannel: function(channel) {
+    return this.channels[channel];
+  },
+  getOrCreateChannel: function(channel) {
+    var c = this.getChannel(channel);
+    if(!c)
+      c = this.channels[channel] = {};
+    return c;
+  },
+  getOrCreateNickOnChannel: function(nick, channel) {
+    var n = this.getNick(nick);
+    
+    var nc = n[channel];
+    if(!nc)
+      return this.addNickToChannel(nick, channel);
+      
+    return nc;
+  },
+  addNickToChannel: function(nick, channel) {
+    var nc = new NickChanEntry();
+
+    var n = this.getOrCreateNick(nick);
+    n[channel] = nc;
+    
+    var c = this.getOrCreateChannel(channel);
+    c[nick] = nc;
+    
+    return nc;
+  },
+  removeNick: function(nick) {
+    var n = this.getNick(nick);
+    if(!n)
+      return;
+      
+    for(var channel in n) {
+      var c = this.channels[channel];
+      
+      delete c[nick];
+      if(this.isEmpty(c))
+        delete this.channels[channel];
+    }
+    delete this.nicknames[nick];
+  },
+  removeChannel: function(channel) {
+    var c = this.getChannel(channel);
+    if(!c)
+      return;
+      
+    for(var nick in c) {
+      var n = this.nicknames[nick];
+      
+      delete n[channel];
+      if(this.isEmpty(n))
+        delete this.nicknames[nick];
+    }
+    delete this.channels[channel];
+  },
+  removeNickFromChannel: function(nick, channel) {
+    var n = this.getNick(nick);
+    var c = this.getChannel(channel);
+    if(!n || !c)
+      return;
+      
+    delete n[channel];
+    delete c[nick];
+    
+    if(this.isEmpty(n))
+      delete this.nicknames[nick];
+    if(this.isEmpty(c))
+      delete this.channels[channel];
+  },
+  renameNick: function(oldnick, newnick) {
+    var n = this.getNick(oldnick);
+    if(!n)
+      return;
+      
+    for(var channel in n) {
+      this.channels[channel][newnick] = this.channels[channel][oldnick];
+      delete this.channels[channel][oldnick];
+    }    
+    
+    this.nicknames[newnick] = this.nicknames[oldnick];
+    delete this.nicknames[oldnick];
+  }
+});
diff --git a/js/irc/version.js b/js/irc/version.js
index b828086..2daf346 100644
--- a/js/irc/version.js
+++ b/js/irc/version.js
@@ -1 +1 @@
-QWEBIRC_VERSION = "0.01";
+QWEBIRC_VERSION = "0.01";
diff --git a/js/jslib.js b/js/jslib.js
index e2f1e98..2450a00 100644
--- a/js/jslib.js
+++ b/js/jslib.js
@@ -1,31 +1,31 @@
-Array.prototype.indexFromEnd = function(d) {
-  var p = this;
-  
-  if(d < 0)
-    return p[p.length + d];
-
-  return p[d];
-}
-
-/* how horribly inefficient */
-String.prototype.replaceAll = function(f, t) {
-  var i = this.indexOf(f);
-  var c = this;
- 
-  while(i > -1) {
-    c = c.replace(f, t);
-    i = c.indexOf(f);
-  }
-  return c;
-}
-
-/* how horribly inefficient (again) */
-String.prototype.splitMax = function(by, max) {
-  var items = this.split(by);
-  var newitems = items.slice(0, max-1);
-
-  if(items.length >= max)
-    newitems.push(items.slice(max-1).join(by));
-  
-  return newitems;
-}
+Array.prototype.indexFromEnd = function(d) {
+  var p = this;
+  
+  if(d < 0)
+    return p[p.length + d];
+
+  return p[d];
+}
+
+/* how horribly inefficient */
+String.prototype.replaceAll = function(f, t) {
+  var i = this.indexOf(f);
+  var c = this;
+ 
+  while(i > -1) {
+    c = c.replace(f, t);
+    i = c.indexOf(f);
+  }
+  return c;
+}
+
+/* how horribly inefficient (again) */
+String.prototype.splitMax = function(by, max) {
+  var items = this.split(by);
+  var newitems = items.slice(0, max-1);
+
+  if(items.length >= max)
+    newitems.push(items.slice(max-1).join(by));
+  
+  return newitems;
+}
diff --git a/js/ui/basetheme.js b/js/ui/basetheme.js
index 80ab6cc..e81a92e 100644
--- a/js/ui/basetheme.js
+++ b/js/ui/basetheme.js
@@ -1,39 +1,39 @@
-/* don't even attempt to use a $! */
-var DefaultTheme = {
-  "PREFIX": ["$C4==$O "],
-  "SIGNON": ["Signed on!", true],
-  "CONNECT": ["Connected to server.", true],
-  "RAW": ["$m", true],
-  "DISCONNECT": ["Disconnected from server.", true],
-  "ERROR": ["ERROR: $m", true],
-  "SERVERNOTICE": ["$m", true],
-  "JOIN": ["$n [$h] has joined $c", true],
-  "PART": ["$n [$h] has left $c [$m]", true],
-  "KICK": ["$v was kicked from $c by $n [$m]", true],
-  "MODE": ["mode/$c [$m] by $n", true],
-  "QUIT": ["$n [$h] has quit [$m]", true],
-  "NICK": ["$n has changed nick to $w", true],
-  "TOPIC": ["$n changed the topic of $c to: $m", true],
-  "UMODE": ["MODE $n $m", true],
-  "INVITE": ["$n invites you to join $c", true],
-  "CHANMSG": ["<$n> $m"],
-  "PRIVMSG": ["<$n> $m"],
-  "CHANNOTICE": ["-$n:$c- $m"],
-  "PRIVNOTICE": ["-$n- $m"],
-  "OURCHANMSG": ["<$n> $m"],
-  "OURPRIVMSG": ["<$n> $m"],
-  "OURTARGETEDMSG": ["*$t* $m"],
-  "OURTARGETEDNOTICE": ["[notice($t)] $m"],
-  "OURCHANNOTICE": ["-$n:$t- $m"],
-  "OURPRIVNOTICE": ["-$n- $m"],
-  "OURCHANACTION": [" * $n $m"],
-  "OURPRIVACTION": [" * $n $m"],
-  "CHANACTION": [" * $n $m"],
-  "PRIVACTION": [" * $n $m"],
-  "CHANCTCP": ["$n [$h] requested CTCP $x from $c: $m"],
-  "PRIVCTCP": ["$n [$h] requested CTCP $x from $-: $m"],
-  "CTCPREPLY": ["CTCP $x reply from $n: $m"],
-  "OURCHANCTCP": ["[ctcp($t)] $x $m"],
-  "OURPRIVCTCP": ["[ctcp($t)] $x $m"],
-  "OURTARGETEDCTCP": ["[ctcp($t)] $x $m"]
-}
+/* don't even attempt to use a $! */
+var DefaultTheme = {
+  "PREFIX": ["$C4==$O "],
+  "SIGNON": ["Signed on!", true],
+  "CONNECT": ["Connected to server.", true],
+  "RAW": ["$m", true],
+  "DISCONNECT": ["Disconnected from server.", true],
+  "ERROR": ["ERROR: $m", true],
+  "SERVERNOTICE": ["$m", true],
+  "JOIN": ["$n [$h] has joined $c", true],
+  "PART": ["$n [$h] has left $c [$m]", true],
+  "KICK": ["$v was kicked from $c by $n [$m]", true],
+  "MODE": ["mode/$c [$m] by $n", true],
+  "QUIT": ["$n [$h] has quit [$m]", true],
+  "NICK": ["$n has changed nick to $w", true],
+  "TOPIC": ["$n changed the topic of $c to: $m", true],
+  "UMODE": ["MODE $n $m", true],
+  "INVITE": ["$n invites you to join $c", true],
+  "CHANMSG": ["<$n> $m"],
+  "PRIVMSG": ["<$n> $m"],
+  "CHANNOTICE": ["-$n:$c- $m"],
+  "PRIVNOTICE": ["-$n- $m"],
+  "OURCHANMSG": ["<$n> $m"],
+  "OURPRIVMSG": ["<$n> $m"],
+  "OURTARGETEDMSG": ["*$t* $m"],
+  "OURTARGETEDNOTICE": ["[notice($t)] $m"],
+  "OURCHANNOTICE": ["-$n:$t- $m"],
+  "OURPRIVNOTICE": ["-$n- $m"],
+  "OURCHANACTION": [" * $n $m"],
+  "OURPRIVACTION": [" * $n $m"],
+  "CHANACTION": [" * $n $m"],
+  "PRIVACTION": [" * $n $m"],
+  "CHANCTCP": ["$n [$h] requested CTCP $x from $c: $m"],
+  "PRIVCTCP": ["$n [$h] requested CTCP $x from $-: $m"],
+  "CTCPREPLY": ["CTCP $x reply from $n: $m"],
+  "OURCHANCTCP": ["[ctcp($t)] $x $m"],
+  "OURPRIVCTCP": ["[ctcp($t)] $x $m"],
+  "OURTARGETEDCTCP": ["[ctcp($t)] $x $m"]
+}
diff --git a/js/ui/baseui.js b/js/ui/baseui.js
index 02a1d9a..4769cc6 100644
--- a/js/ui/baseui.js
+++ b/js/ui/baseui.js
@@ -1,93 +1,93 @@
-WINDOW_STATUS = 1;
-WINDOW_QUERY = 2;
-WINDOW_CHANNEL = 3;
-
-var UIWindow = new Class({
-  Implements: [Events],
-  initialize: function(parentObject, client, type, name, identifier) {
-    this.parentObject = parentObject;
-    this.type = type;
-    this.name = name;
-    this.active = false;
-    this.client = client;
-    this.identifier = identifier;
-  },
-  updateNickList: function(nicks) {
-  },
-  updateTopic: function(topic)  {
-  },
-  close: function() {
-    this.parentObject.__closed(this);
-    this.fireEvent("close", this);
-  },
-  select: function() {
-    this.active = true;
-    this.parentObject.__setActiveWindow(this);
-  },
-  deselect: function() {
-    this.active = false;
-  },
-  addLine: function(type, line, colour) {
-  },
-  errorMessage: function(message) {
-    this.addLine("", message, "red");
-  }
-});
-
-var UI = new Class({
-  initialize: function(parentElement, windowClass, uiName) {
-    this.windows = {};
-    this.windowArray = [];
-    this.windowClass = windowClass;
-    this.parentElement = parentElement;
-    this.parentElement.addClass("qwebirc");
-    this.parentElement.addClass("qwebirc-" + uiName);
-  },
-  newClient: function(client) {
-    this.windows[client] = {}
-    var w = this.newWindow(client, WINDOW_STATUS, "Status");
-    this.selectWindow(w);
-    
-    return w;
-  },
-  newWindow: function(client, type, name) {
-    var identifier = name;
-    if(type == WINDOW_STATUS)
-      identifier = "";
-      
-    var w = this.windows[client][identifier] = new this.windowClass(this, client, type, name, identifier);
-    this.windowArray.push(w);
-    
-    return w;
-  },
-  getActiveWindow: function() {
-    return this.active;
-  },
-  __setActiveWindow: function(window) {
-    this.active = window;
-  },
-  selectWindow: function(window) {
-    if(this.active)
-      this.active.deselect();
-    window.select();  /* calls setActiveWindow */
-  },
-  __closed: function(window) {
-    if(window.active) {
-      this.active = undefined;
-      if(this.windowArray.length == 1) {
-        this.windowArray = [];
-      } else {
-        var index = this.windowArray.indexOf(window);
-        if(index == 0) {
-          this.selectWindow(this.windowArray[1]);
-        } else {
-          this.selectWindow(this.windowArray[index - 1]);
-        }
-        
-        this.windowArray = this.windowArray.erase(window);
-      }
-    }
-    
-    delete this.windows[window.client][window.identifier];
-  }
-});
+WINDOW_STATUS = 1;
+WINDOW_QUERY = 2;
+WINDOW_CHANNEL = 3;
+
+var UIWindow = new Class({
+  Implements: [Events],
+  initialize: function(parentObject, client, type, name, identifier) {
+    this.parentObject = parentObject;
+    this.type = type;
+    this.name = name;
+    this.active = false;
+    this.client = client;
+    this.identifier = identifier;
+  },
+  updateNickList: function(nicks) {
+  },
+  updateTopic: function(topic)  {
+  },
+  close: function() {
+    this.parentObject.__closed(this);
+    this.fireEvent("close", this);
+  },
+  select: function() {
+    this.active = true;
+    this.parentObject.__setActiveWindow(this);
+  },
+  deselect: function() {
+    this.active = false;
+  },
+  addLine: function(type, line, colour) {
+  },
+  errorMessage: function(message) {
+    this.addLine("", message, "red");
+  }
+});
+
+var UI = new Class({
+  initialize: function(parentElement, windowClass, uiName) {
+    this.windows = {};
+    this.windowArray = [];
+    this.windowClass = windowClass;
+    this.parentElement = parentElement;
+    this.parentElement.addClass("qwebirc");
+    this.parentElement.addClass("qwebirc-" + uiName);
+  },
+  newClient: function(client) {
+    this.windows[client] = {}
+    var w = this.newWindow(client, WINDOW_STATUS, "Status");
+    this.selectWindow(w);
+    
+    return w;
+  },
+  newWindow: function(client, type, name) {
+    var identifier = name;
+    if(type == WINDOW_STATUS)
+      identifier = "";
+      
+    var w = this.windows[client][identifier] = new this.windowClass(this, client, type, name, identifier);
+    this.windowArray.push(w);
+    
+    return w;
+  },
+  getActiveWindow: function() {
+    return this.active;
+  },
+  __setActiveWindow: function(window) {
+    this.active = window;
+  },
+  selectWindow: function(window) {
+    if(this.active)
+      this.active.deselect();
+    window.select();  /* calls setActiveWindow */
+  },
+  __closed: function(window) {
+    if(window.active) {
+      this.active = undefined;
+      if(this.windowArray.length == 1) {
+        this.windowArray = [];
+      } else {
+        var index = this.windowArray.indexOf(window);
+        if(index == 0) {
+          this.selectWindow(this.windowArray[1]);
+        } else {
+          this.selectWindow(this.windowArray[index - 1]);
+        }
+        
+        this.windowArray = this.windowArray.erase(window);
+      }
+    }
+    
+    delete this.windows[window.client][window.identifier];
+  }
+});
diff --git a/js/ui/colour.js b/js/ui/colour.js
index 47daba7..3bd29ea 100644
--- a/js/ui/colour.js
+++ b/js/ui/colour.js
@@ -1,103 +1,103 @@
-function Colourise(line, entity) {
-  var fg;
-  var bg;
-  var underline = false;
-  var bold = false;
-
-  var out = [];
-  var xline = line.split("");
-  var element = document.createElement("span");
-
-  entity.addClass("colourline");
-  
-  function isNum(x) {
-    return x >= '0' && x <= '9';
-  }
-
-  function parseColours(xline, i) {
-    if(!isNum(xline[i + 1])) {
-      fg = undefined;
-      bg = undefined;
-      return i;
-    }
-    i++;
-    if(isNum(xline[i + 1])) {
-      fg = parseInt(xline[i] + xline[i + 1]);
-      i++;
-    } else {
-      fg = parseInt(xline[i]);
-    }
-    if(xline[i + 1] != ",")
-      return i;
-    if(!isNum(xline[i + 2]))
-      return i;
-    i+=2;
-    
-    if(isNum(xline[i + 1])) {
-      bg = parseInt(xline[i] + xline[i + 1]);
-      i++;
-    } else {
-      bg = parseInt(xline[i]);
-    }
-    return i;
-  }
-
-  function emitEndToken() {
-    if(out.length > 0) {
-      element.appendChild(document.createTextNode(out.join("")));
-      entity.appendChild(element);
-      out = [];
-    }
-    element = document.createElement("span");
-  }  
-  function emitStartToken() {
-    classes = []
-    if(fg != undefined)
-      classes.push("Xc" + fg);
-    if(bg != undefined)
-      classes.push("Xbc" + bg);
-    if(bold)
-      classes.push("Xb");
-    if(underline)
-      classes.push("Xu");
-    element.className = classes.join(" ");
-  }
-  
-  for(i=0;i<xline.length;i++) {
-    var lc = xline[i];
-    if(lc == "\x02") {
-      emitEndToken();
-
-      bold = !bold;
-      
-      emitStartToken();
-    } else if(lc == "\x1F") {
-      emitEndToken();
-
-      underline = !underline;
-      
-      emitStartToken();
-    } else if(lc == "\x0F") {
-      emitEndToken();
-      
-      fg = undefined;
-      bg = undefined;
-      underline = false;
-      bold = false;
-    } else if(lc == "\x03") {
-      emitEndToken();
-      
-      i = parseColours(xline, i);
-      if(bg > 15)
-        bg = undefined;
-      if(fg > 15)
-        fg = undefined;
-        
-      emitStartToken();
-    } else {
-      out.push(lc);
-    }
-  }
-  
-  emitEndToken();
+function Colourise(line, entity) {
+  var fg;
+  var bg;
+  var underline = false;
+  var bold = false;
+
+  var out = [];
+  var xline = line.split("");
+  var element = document.createElement("span");
+
+  entity.addClass("colourline");
+  
+  function isNum(x) {
+    return x >= '0' && x <= '9';
+  }
+
+  function parseColours(xline, i) {
+    if(!isNum(xline[i + 1])) {
+      fg = undefined;
+      bg = undefined;
+      return i;
+    }
+    i++;
+    if(isNum(xline[i + 1])) {
+      fg = parseInt(xline[i] + xline[i + 1]);
+      i++;
+    } else {
+      fg = parseInt(xline[i]);
+    }
+    if(xline[i + 1] != ",")
+      return i;
+    if(!isNum(xline[i + 2]))
+      return i;
+    i+=2;
+    
+    if(isNum(xline[i + 1])) {
+      bg = parseInt(xline[i] + xline[i + 1]);
+      i++;
+    } else {
+      bg = parseInt(xline[i]);
+    }
+    return i;
+  }
+
+  function emitEndToken() {
+    if(out.length > 0) {
+      element.appendChild(document.createTextNode(out.join("")));
+      entity.appendChild(element);
+      out = [];
+    }
+    element = document.createElement("span");
+  }  
+  function emitStartToken() {
+    classes = []
+    if(fg != undefined)
+      classes.push("Xc" + fg);
+    if(bg != undefined)
+      classes.push("Xbc" + bg);
+    if(bold)
+      classes.push("Xb");
+    if(underline)
+      classes.push("Xu");
+    element.className = classes.join(" ");
+  }
+  
+  for(i=0;i<xline.length;i++) {
+    var lc = xline[i];
+    if(lc == "\x02") {
+      emitEndToken();
+
+      bold = !bold;
+      
+      emitStartToken();
+    } else if(lc == "\x1F") {
+      emitEndToken();
+
+      underline = !underline;
+      
+      emitStartToken();
+    } else if(lc == "\x0F") {
+      emitEndToken();
+      
+      fg = undefined;
+      bg = undefined;
+      underline = false;
+      bold = false;
+    } else if(lc == "\x03") {
+      emitEndToken();
+      
+      i = parseColours(xline, i);
+      if(bg > 15)
+        bg = undefined;
+      if(fg > 15)
+        fg = undefined;
+        
+      emitStartToken();
+    } else {
+      out.push(lc);
+    }
+  }
+  
+  emitEndToken();
 }
\ No newline at end of file
diff --git a/js/ui/swmlayout.js b/js/ui/swmlayout.js
index edd33be..17a0e31 100644
--- a/js/ui/swmlayout.js
+++ b/js/ui/swmlayout.js
@@ -1,106 +1,106 @@
-var SWM_ANCHOR_NONE =   0x00;
-var SWM_ANCHOR_TOP =    0x01;
-var SWM_ANCHOR_BOTTOM = 0x02;
-var SWM_ANCHOR_LEFT =   0x04;
-var SWM_ANCHOR_RIGHT =  0x08;
-
-var SWMPanel = new Class({
-  initialize: function(parent, hidden) {
-    this.parent = parent;
-    
-    var element = new Element("div", {"styles": { "position": "absolute" } });
-    this.element = element;
-    this.element.wmpanel = this;
-    
-    if(hidden) {
-      this.setHidden(true);
-    } else {
-      this.hidden = false;
-    }
-    parent.addClass("swmelement");
-    
-    parent.appendChild(this.element);
-    this.anchor = SWM_ANCHOR_NONE;
-  },
-  setHeight: function(height) {
-    this.height = height;
-  },
-  setWidth: function(width) {
-    this.width = width;
-  },
-  setHidden: function(value) {
-    this.hidden = value;
-    if(value) {
-      this.element.setStyle("display", "none");
-    } else {
-      this.element.setStyle("display", "block");
-    }
-  }
-});
-
-window.addEvent("domready", function() {
-  function reworkLayout(container) {
-    function anchorFilter(x, anchor) {
-      return x.filter(function(y) {
-        if(y.anchor == anchor)
-          return true;
-      });
-    }
-    var x = container.getChildren().map(function(x) {
-      return x.wmpanel
-    });
-    var top = anchorFilter(x, SWM_ANCHOR_TOP);
-    var bottom = anchorFilter(x, SWM_ANCHOR_BOTTOM);
-    var none = anchorFilter(x, SWM_ANCHOR_NONE);
-
-    var left = anchorFilter(x, SWM_ANCHOR_LEFT);
-    var right = anchorFilter(x, SWM_ANCHOR_RIGHT);
-    
-    var tpos = 0;
-    for(var i=0;i<top.length;i++) {
-      if(top[i].hidden)
-        continue;
-      var obj = top[i].element;
-      obj.setStyles({"top": tpos + "px", "left": "0px", "right": "0px"});
-      tpos = tpos + obj.getSize().y;
-    }
-    
-    var bpos = 0;
-    for(var i=0;i<bottom.length;i++) {
-      if(bottom[i].hidden)
-        continue;
-      var obj = bottom[i].element;
-      obj.setStyles({"bottom": bpos + "px", "left": "0px", "right": "0px"});
-      bpos = bpos + obj.getSize().y;
-    }
-    
-    var lpos = 0;
-    for(var i=0;i<left.length;i++) {
-      if(left[i].hidden)
-        continue;
-      var obj = left[i].element;
-      obj.setStyles({"left": lpos + "px", "top": tpos + "px", "bottom": bpos + "px"});
-      lpos = lpos + obj.getSize().x;
-    }
-
-    var rpos = 0;
-    for(var i=0;i<right.length;i++) {
-      if(right[i].hidden)
-        continue;
-      var obj = right[i].element;
-      obj.setStyles({"right": rpos + "px", "top": tpos + "px", "bottom": bpos + "px"});
-      rpos = rpos + obj.getSize().x;
-    }
-
-    for(var i=0;i<none.length;i++) {
-      if(none[i].hidden)
-        continue;
-      var obj = none[i].element;
-      obj.setStyles({"left": lpos + "px", "right": rpos + "px", "top": tpos + "px", "bottom": bpos + "px"});
-    }
-  }
-  
-  window.addEvent("resize", function() {
-    $$("div.swmelement").each(reworkLayout);
-  });
+var SWM_ANCHOR_NONE =   0x00;
+var SWM_ANCHOR_TOP =    0x01;
+var SWM_ANCHOR_BOTTOM = 0x02;
+var SWM_ANCHOR_LEFT =   0x04;
+var SWM_ANCHOR_RIGHT =  0x08;
+
+var SWMPanel = new Class({
+  initialize: function(parent, hidden) {
+    this.parent = parent;
+    
+    var element = new Element("div", {"styles": { "position": "absolute" } });
+    this.element = element;
+    this.element.wmpanel = this;
+    
+    if(hidden) {
+      this.setHidden(true);
+    } else {
+      this.hidden = false;
+    }
+    parent.addClass("swmelement");
+    
+    parent.appendChild(this.element);
+    this.anchor = SWM_ANCHOR_NONE;
+  },
+  setHeight: function(height) {
+    this.height = height;
+  },
+  setWidth: function(width) {
+    this.width = width;
+  },
+  setHidden: function(value) {
+    this.hidden = value;
+    if(value) {
+      this.element.setStyle("display", "none");
+    } else {
+      this.element.setStyle("display", "block");
+    }
+  }
+});
+
+window.addEvent("domready", function() {
+  function reworkLayout(container) {
+    function anchorFilter(x, anchor) {
+      return x.filter(function(y) {
+        if(y.anchor == anchor)
+          return true;
+      });
+    }
+    var x = container.getChildren().map(function(x) {
+      return x.wmpanel
+    });
+    var top = anchorFilter(x, SWM_ANCHOR_TOP);
+    var bottom = anchorFilter(x, SWM_ANCHOR_BOTTOM);
+    var none = anchorFilter(x, SWM_ANCHOR_NONE);
+
+    var left = anchorFilter(x, SWM_ANCHOR_LEFT);
+    var right = anchorFilter(x, SWM_ANCHOR_RIGHT);
+    
+    var tpos = 0;
+    for(var i=0;i<top.length;i++) {
+      if(top[i].hidden)
+        continue;
+      var obj = top[i].element;
+      obj.setStyles({"top": tpos + "px", "left": "0px", "right": "0px"});
+      tpos = tpos + obj.getSize().y;
+    }
+    
+    var bpos = 0;
+    for(var i=0;i<bottom.length;i++) {
+      if(bottom[i].hidden)
+        continue;
+      var obj = bottom[i].element;
+      obj.setStyles({"bottom": bpos + "px", "left": "0px", "right": "0px"});
+      bpos = bpos + obj.getSize().y;
+    }
+    
+    var lpos = 0;
+    for(var i=0;i<left.length;i++) {
+      if(left[i].hidden)
+        continue;
+      var obj = left[i].element;
+      obj.setStyles({"left": lpos + "px", "top": tpos + "px", "bottom": bpos + "px"});
+      lpos = lpos + obj.getSize().x;
+    }
+
+    var rpos = 0;
+    for(var i=0;i<right.length;i++) {
+      if(right[i].hidden)
+        continue;
+      var obj = right[i].element;
+      obj.setStyles({"right": rpos + "px", "top": tpos + "px", "bottom": bpos + "px"});
+      rpos = rpos + obj.getSize().x;
+    }
+
+    for(var i=0;i<none.length;i++) {
+      if(none[i].hidden)
+        continue;
+      var obj = none[i].element;
+      obj.setStyles({"left": lpos + "px", "right": rpos + "px", "top": tpos + "px", "bottom": bpos + "px"});
+    }
+  }
+  
+  window.addEvent("resize", function() {
+    $$("div.swmelement").each(reworkLayout);
+  });
 });
\ No newline at end of file
diff --git a/js/ui/swmui.js b/js/ui/swmui.js
index e29d975..2d37e56 100644
--- a/js/ui/swmui.js
+++ b/js/ui/swmui.js
@@ -1,176 +1,176 @@
-var SWMUIWindow = new Class({
-  Extends: UIWindow,
-  
-  initialize: function(parentObject, client, type, name) {
-    this.parent(parentObject, client, type, name);
-    this.contentPanel = new SWMPanel(parentObject.mainPanel.element, true);
-    this.contentPanel.element.addClass("content");
-    this.contentPanel.element.setStyle("overflow", "auto");
-
-    if(type == WINDOW_CHANNEL) {
-      this.nickList = new SWMPanel(this.contentPanel.element);
-      this.nickList.anchor = SWM_ANCHOR_RIGHT;
-      this.nickList.element.setStyle("overflow", "auto");
-      this.nickList.element.addClass("nicklist");
-    }
-
-    if(type == WINDOW_CHANNEL) {
-      this.topic = new SWMPanel(this.contentPanel.element);
-      this.topic.anchor = SWM_ANCHOR_TOP;
-      this.topic.element.addClass("topic");
-    }
-    
-    this.lines = new SWMPanel(this.contentPanel.element);
-    this.lines.element.setStyle("overflow", "auto");
-    
-    this.tab = new Element("span");
-    this.tab.addClass("tab");
-    
-    this.tab.appendText(name);
-    this.tab.addEvent("click", function() {
-      parentObject.selectWindow(this);
-    }.bind(this));
-
-    parentObject.tabPanel.element.appendChild(this.tab);
-    parentObject.resize();
-    
-    if(type != WINDOW_STATUS) {
-      tabclose = new Element("span");
-      tabclose.addClass("tabclose");
-      tabclose.addEvent("click", function(e) {
-        new Event(e).stop();
-        
-        if(type == WINDOW_CHANNEL)
-          this.client.exec("/PART " + name);
-
-        this.close();
-      }.bind(this));
-      tabclose.set("text", "X");
-      this.tab.appendChild(tabclose);
-    }
-  },
-  updateNickList: function(nicks) {
-    this.parent(nicks);
-
-    var n = this.nickList.element;
-    while(n.firstChild)
-      n.removeChild(n.firstChild);
-
-    nicks.each(function(nick) {
-      var e = new Element("div");
-      n.appendChild(e);
-      e.appendChild(document.createTextNode(nick));
-    });
-    
-    this.parentObject.resize();
-  },
-  updateTopic: function(topic) {
-    this.parent(topic);
-    var t = this.topic.element;
-    
-    while(t.firstChild)
-      t.removeChild(t.firstChild);
-
-    Colourise(topic, t);
-
-    this.parentObject.resize();
-  },
-  select: function() {
-    this.parent();
-
-    this.contentPanel.setHidden(false);
-    this.parentObject.resize();
-    this.tab.removeClass("tab-highlighted");
-    this.tab.removeClass("tab-unselected");
-    this.tab.addClass("tab-selected");
-  },
-  deselect: function() {
-    this.parent();
-
-    this.contentPanel.setHidden(true);
-    this.parentObject.resize();
-    this.tab.removeClass("tab-selected");
-    this.tab.addClass("tab-unselected");
-  },
-  close: function() {
-    this.parent();
-
-    this.parentObject.mainPanel.element.removeChild(this.contentPanel.element);
-    this.parentObject.tabPanel.element.removeChild(this.tab);
-  },
-  addLine: function(type, line, colour) {
-    this.parent(type, line, colour);
-    
-    var e = new Element("div");
-
-    if(colour) {
-      e.addStyle("background", colour);
-    } else if(this.lastcolour) {
-      e.addClass("linestyle1");
-    } else {
-      e.addClass("linestyle2");
-    }
-    
-    if(type)
-      line = this.parentObject.theme.message(type, line);
-    
-    Colourise(IRCTimestamp(new Date()) + " " + line, e);
-    
-    this.lastcolour = !this.lastcolour;
-    
-    var prev = this.lines.element.getScroll();
-    var prevbottom = this.lines.element.getScrollSize().y;
-    var prevsize = this.lines.element.getSize();
-    this.lines.element.appendChild(e);
-    
-    if(prev.y + prevsize.y == prevbottom)
-      this.lines.element.scrollTo(prev.x, this.lines.element.getScrollSize().y);
-      
-    if(!this.active)
-      this.tab.addClass("tab-highlighted");
-  }
-});
-
-var SWMUI = new Class({
-  Extends: UI,
-  initialize: function(parentElement, theme) {
-    this.parent(parentElement, SWMUIWindow, "swmui");
-    this.theme = theme;
-    
-    this.tabPanel = new SWMPanel(parentElement);
-    this.tabPanel.anchor = SWM_ANCHOR_TOP;
-    this.tabPanel.element.addClass("tabs");
-    
-    this.mainPanel = new SWMPanel(parentElement);
-    this.mainPanel.element.addClass("main");
-    
-    this.entryPanel = new SWMPanel(parentElement);
-    this.entryPanel.anchor = SWM_ANCHOR_BOTTOM;
-    this.entryPanel.element.addClass("entry");
-
-    var form = new Element("form");
-    
-    var inputbox = new Element("input");
-    
-    window.addEvent("resize", function() {
-      var s = this.entryPanel.element.getSize().x - 4;
-      inputbox.setStyle("width", s + "px");
-    }.bind(this));
-
-    form.addEvent("submit", function(e) {
-      new Event(e).stop();
-    
-      this.getActiveWindow().client.exec(inputbox.value);
-      inputbox.value = "";
-    }.bind(this));
-
-    this.entryPanel.element.appendChild(form);
-    form.appendChild(inputbox);
-    inputbox.focus();
-
-    this.resize();
-  },
-  resize: function() {
-    window.fireEvent("resize");
-  }
-});
+var SWMUIWindow = new Class({
+  Extends: UIWindow,
+  
+  initialize: function(parentObject, client, type, name) {
+    this.parent(parentObject, client, type, name);
+    this.contentPanel = new SWMPanel(parentObject.mainPanel.element, true);
+    this.contentPanel.element.addClass("content");
+    this.contentPanel.element.setStyle("overflow", "auto");
+
+    if(type == WINDOW_CHANNEL) {
+      this.nickList = new SWMPanel(this.contentPanel.element);
+      this.nickList.anchor = SWM_ANCHOR_RIGHT;
+      this.nickList.element.setStyle("overflow", "auto");
+      this.nickList.element.addClass("nicklist");
+    }
+
+    if(type == WINDOW_CHANNEL) {
+      this.topic = new SWMPanel(this.contentPanel.element);
+      this.topic.anchor = SWM_ANCHOR_TOP;
+      this.topic.element.addClass("topic");
+    }
+    
+    this.lines = new SWMPanel(this.contentPanel.element);
+    this.lines.element.setStyle("overflow", "auto");
+    
+    this.tab = new Element("span");
+    this.tab.addClass("tab");
+    
+    this.tab.appendText(name);
+    this.tab.addEvent("click", function() {
+      parentObject.selectWindow(this);
+    }.bind(this));
+
+    parentObject.tabPanel.element.appendChild(this.tab);
+    parentObject.resize();
+    
+    if(type != WINDOW_STATUS) {
+      tabclose = new Element("span");
+      tabclose.addClass("tabclose");
+      tabclose.addEvent("click", function(e) {
+        new Event(e).stop();
+        
+        if(type == WINDOW_CHANNEL)
+          this.client.exec("/PART " + name);
+
+        this.close();
+      }.bind(this));
+      tabclose.set("text", "X");
+      this.tab.appendChild(tabclose);
+    }
+  },
+  updateNickList: function(nicks) {
+    this.parent(nicks);
+
+    var n = this.nickList.element;
+    while(n.firstChild)
+      n.removeChild(n.firstChild);
+
+    nicks.each(function(nick) {
+      var e = new Element("div");
+      n.appendChild(e);
+      e.appendChild(document.createTextNode(nick));
+    });
+    
+    this.parentObject.resize();
+  },
+  updateTopic: function(topic) {
+    this.parent(topic);
+    var t = this.topic.element;
+    
+    while(t.firstChild)
+      t.removeChild(t.firstChild);
+
+    Colourise(topic, t);
+
+    this.parentObject.resize();
+  },
+  select: function() {
+    this.parent();
+
+    this.contentPanel.setHidden(false);
+    this.parentObject.resize();
+    this.tab.removeClass("tab-highlighted");
+    this.tab.removeClass("tab-unselected");
+    this.tab.addClass("tab-selected");
+  },
+  deselect: function() {
+    this.parent();
+
+    this.contentPanel.setHidden(true);
+    this.parentObject.resize();
+    this.tab.removeClass("tab-selected");
+    this.tab.addClass("tab-unselected");
+  },
+  close: function() {
+    this.parent();
+
+    this.parentObject.mainPanel.element.removeChild(this.contentPanel.element);
+    this.parentObject.tabPanel.element.removeChild(this.tab);
+  },
+  addLine: function(type, line, colour) {
+    this.parent(type, line, colour);
+    
+    var e = new Element("div");
+
+    if(colour) {
+      e.addStyle("background", colour);
+    } else if(this.lastcolour) {
+      e.addClass("linestyle1");
+    } else {
+      e.addClass("linestyle2");
+    }
+    
+    if(type)
+      line = this.parentObject.theme.message(type, line);
+    
+    Colourise(IRCTimestamp(new Date()) + " " + line, e);
+    
+    this.lastcolour = !this.lastcolour;
+    
+    var prev = this.lines.element.getScroll();
+    var prevbottom = this.lines.element.getScrollSize().y;
+    var prevsize = this.lines.element.getSize();
+    this.lines.element.appendChild(e);
+    
+    if(prev.y + prevsize.y == prevbottom)
+      this.lines.element.scrollTo(prev.x, this.lines.element.getScrollSize().y);
+      
+    if(!this.active)
+      this.tab.addClass("tab-highlighted");
+  }
+});
+
+var SWMUI = new Class({
+  Extends: UI,
+  initialize: function(parentElement, theme) {
+    this.parent(parentElement, SWMUIWindow, "swmui");
+    this.theme = theme;
+    
+    this.tabPanel = new SWMPanel(parentElement);
+    this.tabPanel.anchor = SWM_ANCHOR_TOP;
+    this.tabPanel.element.addClass("tabs");
+    
+    this.mainPanel = new SWMPanel(parentElement);
+    this.mainPanel.element.addClass("main");
+    
+    this.entryPanel = new SWMPanel(parentElement);
+    this.entryPanel.anchor = SWM_ANCHOR_BOTTOM;
+    this.entryPanel.element.addClass("entry");
+
+    var form = new Element("form");
+    
+    var inputbox = new Element("input");
+    
+    window.addEvent("resize", function() {
+      var s = this.entryPanel.element.getSize().x - 4;
+      inputbox.setStyle("width", s + "px");
+    }.bind(this));
+
+    form.addEvent("submit", function(e) {
+      new Event(e).stop();
+    
+      this.getActiveWindow().client.exec(inputbox.value);
+      inputbox.value = "";
+    }.bind(this));
+
+    this.entryPanel.element.appendChild(form);
+    form.appendChild(inputbox);
+    inputbox.focus();
+
+    this.resize();
+  },
+  resize: function() {
+    window.fireEvent("resize");
+  }
+});
diff --git a/js/ui/theme.js b/js/ui/theme.js
index f4657b0..9e5ffc2 100644
--- a/js/ui/theme.js
+++ b/js/ui/theme.js
@@ -1,99 +1,99 @@
-var ThemeControlCodeMap = {
-  "C": "\x03",
-  "B": "\x02",
-  "U": "\x1F",
-  "O": "\x0F",
-  "$": "$"
-};
-
-var DefaultTheme = {
-  "PREFIX": ["$C4==$O "],
-  "SIGNON": ["Signed on!", true],
-  "CONNECT": ["Connected to server.", true],
-  "RAW": ["$m", true],
-  "DISCONNECT": ["Disconnected from server.", true],
-  "ERROR": ["ERROR: $m", true],
-  "SERVERNOTICE": ["$m", true],
-  "JOIN": ["$n [$h] has joined $c", true],
-  "PART": ["$n [$h] has left $c [$m]", true],
-  "KICK": ["$v was kicked from $c by $n [$m]", true],
-  "MODE": ["mode/$c [$m] by $n", true],
-  "QUIT": ["$n [$h] has quit [$m]", true],
-  "NICK": ["$n has changed nick to $w", true],
-  "TOPIC": ["$n changed the topic of $c to: $m", true],
-  "UMODE": ["MODE $n $m", true],
-  "INVITE": ["$n invites you to join $c", true],
-  "CHANMSG": ["<$n> $m"],
-  "PRIVMSG": ["<$n> $m"],
-  "CHANNOTICE": ["-$n:$c- $m"],
-  "PRIVNOTICE": ["-$n- $m"],
-  "OURCHANMSG": ["<$n> $m"],
-  "OURPRIVMSG": ["<$n> $m"],
-  "OURTARGETEDMSG": ["*$t* $m"],
-  "OURTARGETEDNOTICE": ["[notice($t)] $m"],
-  "OURCHANNOTICE": ["-$n:$t- $m"],
-  "OURPRIVNOTICE": ["-$n- $m"],
-  "OURCHANACTION": [" * $n $m"],
-  "OURPRIVACTION": [" * $n $m"],
-  "CHANACTION": [" * $n $m"],
-  "PRIVACTION": [" * $n $m"],
-  "CHANCTCP": ["$n [$h] requested CTCP $x from $c: $m"],
-  "PRIVCTCP": ["$n [$h] requested CTCP $x from $-: $m"],
-  "CTCPREPLY": ["CTCP $x reply from $n: $m"],
-  "OURCHANCTCP": ["[ctcp($t)] $x $m"],
-  "OURPRIVCTCP": ["[ctcp($t)] $x $m"],
-  "OURTARGETEDCTCP": ["[ctcp($t)] $x $m"]
-};
-
-var Theme = new Class({
-  initialize: function(themeDict) {
-    this.__theme = {};
-    
-    for(var k in DefaultTheme)
-      this.__theme[k] = DefaultTheme[k];
-  
-    if(themeDict)
-      for(var k in themeDict)
-        this.__theme[k] = themeDict[k];
-
-    for(var k in this.__theme) {
-      if(k == "PREFIX")
-        continue;
-
-      var data = this.__theme[k];
-      if(data[1]) {
-        this.__theme[k] = this.__theme["PREFIX"] + data[0];
-      } else {
-        this.__theme[k] = data[0];
-      }
-    }
-  },
-  __dollarSubstitute: function(x, h) {
-    var msg = [];
-
-    var n = x.split("");
-    for(var i=0;i<n.length;i++) {
-      var c = n[i];
-      if(c == "$" && (i <= n.length - 1)) {
-        var c2 = n[++i];
-
-        var o = ThemeControlCodeMap[c2];
-        if(!o)
-          o = h[c2];
-        if(o)
-          msg.push(o);
-      } else {
-        msg.push(c);
-      }
-    }
-    
-    return msg.join("");
-  },
-  message: function(type, data) {
-    var msg = this.__theme[type];
-    
-    msg = this.__dollarSubstitute(msg, data);
-
-    return msg;
-  }
-});
+var ThemeControlCodeMap = {
+  "C": "\x03",
+  "B": "\x02",
+  "U": "\x1F",
+  "O": "\x0F",
+  "$": "$"
+};
+
+var DefaultTheme = {
+  "PREFIX": ["$C4==$O "],
+  "SIGNON": ["Signed on!", true],
+  "CONNECT": ["Connected to server.", true],
+  "RAW": ["$m", true],
+  "DISCONNECT": ["Disconnected from server.", true],
+  "ERROR": ["ERROR: $m", true],
+  "SERVERNOTICE": ["$m", true],
+  "JOIN": ["$n [$h] has joined $c", true],
+  "PART": ["$n [$h] has left $c [$m]", true],
+  "KICK": ["$v was kicked from $c by $n [$m]", true],
+  "MODE": ["mode/$c [$m] by $n", true],
+  "QUIT": ["$n [$h] has quit [$m]", true],
+  "NICK": ["$n has changed nick to $w", true],
+  "TOPIC": ["$n changed the topic of $c to: $m", true],
+  "UMODE": ["MODE $n $m", true],
+  "INVITE": ["$n invites you to join $c", true],
+  "CHANMSG": ["<$n> $m"],
+  "PRIVMSG": ["<$n> $m"],
+  "CHANNOTICE": ["-$n:$c- $m"],
+  "PRIVNOTICE": ["-$n- $m"],
+  "OURCHANMSG": ["<$n> $m"],
+  "OURPRIVMSG": ["<$n> $m"],
+  "OURTARGETEDMSG": ["*$t* $m"],
+  "OURTARGETEDNOTICE": ["[notice($t)] $m"],
+  "OURCHANNOTICE": ["-$n:$t- $m"],
+  "OURPRIVNOTICE": ["-$n- $m"],
+  "OURCHANACTION": [" * $n $m"],
+  "OURPRIVACTION": [" * $n $m"],
+  "CHANACTION": [" * $n $m"],
+  "PRIVACTION": [" * $n $m"],
+  "CHANCTCP": ["$n [$h] requested CTCP $x from $c: $m"],
+  "PRIVCTCP": ["$n [$h] requested CTCP $x from $-: $m"],
+  "CTCPREPLY": ["CTCP $x reply from $n: $m"],
+  "OURCHANCTCP": ["[ctcp($t)] $x $m"],
+  "OURPRIVCTCP": ["[ctcp($t)] $x $m"],
+  "OURTARGETEDCTCP": ["[ctcp($t)] $x $m"]
+};
+
+var Theme = new Class({
+  initialize: function(themeDict) {
+    this.__theme = {};
+    
+    for(var k in DefaultTheme)
+      this.__theme[k] = DefaultTheme[k];
+  
+    if(themeDict)
+      for(var k in themeDict)
+        this.__theme[k] = themeDict[k];
+
+    for(var k in this.__theme) {
+      if(k == "PREFIX")
+        continue;
+
+      var data = this.__theme[k];
+      if(data[1]) {
+        this.__theme[k] = this.__theme["PREFIX"] + data[0];
+      } else {
+        this.__theme[k] = data[0];
+      }
+    }
+  },
+  __dollarSubstitute: function(x, h) {
+    var msg = [];
+
+    var n = x.split("");
+    for(var i=0;i<n.length;i++) {
+      var c = n[i];
+      if(c == "$" && (i <= n.length - 1)) {
+        var c2 = n[++i];
+
+        var o = ThemeControlCodeMap[c2];
+        if(!o)
+          o = h[c2];
+        if(o)
+          msg.push(o);
+      } else {
+        msg.push(c);
+      }
+    }
+    
+    return msg.join("");
+  },
+  message: function(type, data) {
+    var msg = this.__theme[type];
+    
+    msg = this.__dollarSubstitute(msg, data);
+
+    return msg;
+  }
+});
diff --git a/js/ui/uglyui.js b/js/ui/uglyui.js
index 5b609f1..d2a5031 100644
--- a/js/ui/uglyui.js
+++ b/js/ui/uglyui.js
@@ -1,167 +1,167 @@
-var UglyUIWindow = new Class({
-  Extends: UIWindow,
-  
-  initialize: function(parentObject, client, type, name) {
-    this.parent(parentObject, client, type, name);
-        
-    this.outerContainer = new Element("div");
-    this.outerContainer.addClass("outercontainer");
-    this.outerContainer.addClass("tab-invisible");
-    
-    parentObject.container.appendChild(this.outerContainer);
-    
-    if(type == WINDOW_CHANNEL) {
-      this.nicklist = new Element("div");
-      this.nicklist.addClass("nicklist");
-      
-      this.outerContainer.appendChild(this.nicklist);
-    }
-    
-    var innerContainer = new Element("div");
-    innerContainer.addClass("innercontainer");
-    this.outerContainer.appendChild(innerContainer);
-    
-    if(type == WINDOW_CHANNEL) {
-      this.topic = new Element("div");
-      this.topic.addClass("topic");
-      innerContainer.appendChild(this.topic);
-    }
-    
-    this.lines = new Element("div");
-    this.lines.addClass("lines");
-    innerContainer.appendChild(this.lines);
-    
-    this.tab = new Element("span");
-    this.tab.addClass("tab");
-    
-    this.tab.appendText(name);
-    this.tab.addEvent("click", function() {
-      parentObject.selectWindow(this);
-    }.bind(this));
-
-    parentObject.tabs.appendChild(this.tab);
-    
-    if(type != WINDOW_STATUS) {
-      tabclose = new Element("span");
-      tabclose.addClass("tabclose");
-      tabclose.addEvent("click", function(e) {
-        new Event(e).stop();
-        
-        if(type == WINDOW_CHANNEL)
-          this.client.exec("/PART " + name);
-
-        this.close();
-      }.bind(this));
-      tabclose.set("text", "X");
-      this.tab.appendChild(tabclose);
-    }
-  },
-  updateNickList: function(nicks) {
-    this.parent(nicks);
-    
-    var n = this.nicklist;
-    while(n.firstChild)
-      n.removeChild(n.firstChild);
-
-    nicks.each(function(nick) {
-      var e = new Element("div");
-      n.appendChild(e);
-      e.appendChild(document.createTextNode(nick));
-    });
-  },
-  updateTopic: function(topic) {
-    this.parent(topic);
-    
-    var t = this.topic;
-    
-    while(t.firstChild)
-      t.removeChild(t.firstChild);
-
-    Colourise(topic, t);
-  },
-  select: function() {
-    this.parent();
-    
-    this.outerContainer.removeClass("tab-invisible");
-    this.tab.removeClass("tab-unselected");
-    this.tab.removeClass("tab-highlighted");
-    this.tab.addClass("tab-selected");
-  },
-  deselect: function() {
-    this.parent();
-    
-    this.outerContainer.addClass("tab-invisible");
-    this.tab.removeClass("tab-selected");
-    this.tab.addClass("tab-unselected");
-  },
-  close: function() {
-    this.parent();
-    
-    this.parentObject.container.removeChild(this.outerContainer);
-    this.parentObject.tabs.removeChild(this.tab);
-  },
-  addLine: function(type, line, colour) {
-    this.parent(type, line, colour);
-    
-    var e = new Element("div");
-
-    if(colour) {
-      e.addStyle("background", colour);
-    } else if(this.lastcolour) {
-      e.addClass("linestyle1");
-    } else {
-      e.addClass("linestyle2");
-    }
-    
-    if(type)
-      line = this.parentObject.theme.message(type, line);
-    
-    Colourise(IRCTimestamp(new Date()) + " " + line, e);
-    
-    this.lastcolour = !this.lastcolour;
-    
-    var prev = this.lines.getScroll();
-    var prevbottom = this.lines.getScrollSize().y;
-    var prevsize = this.lines.getSize();
-    this.lines.appendChild(e);
-    
-    if(prev.y + prevsize.y == prevbottom)
-      this.lines.scrollTo(prev.x, this.lines.getScrollSize().y);
-      
-    if(!this.active)
-      this.tab.addClass("tab-highlighted");
-  }
-});
-
-var UglyUI = new Class({
-  Extends: UI,
-  initialize: function(parentElement, theme) {
-    this.parent(parentElement, UglyUIWindow, "uglyui");
-    
-    this.theme = theme;
-    
-    this.tabs = new Element("div");
-    this.tabs.addClass("tabbar");
-    
-    parentElement.appendChild(this.tabs);
-    
-    this.container = new Element("div");
-    this.container.addClass("container");
-    
-    parentElement.appendChild(this.container);
-  
-    var form = new Element("form");
-    var inputbox = new Element("input");
-    inputbox.addClass("input");
-  
-    form.addEvent("submit", function(e) {
-      new Event(e).stop();
-    
-      this.getActiveWindow().client.exec(inputbox.value);
-      inputbox.value = "";
-    }.bind(this));
-    parentElement.appendChild(form);  
-    form.appendChild(inputbox);
-    inputbox.focus();
-  }
+var UglyUIWindow = new Class({
+  Extends: UIWindow,
+  
+  initialize: function(parentObject, client, type, name) {
+    this.parent(parentObject, client, type, name);
+        
+    this.outerContainer = new Element("div");
+    this.outerContainer.addClass("outercontainer");
+    this.outerContainer.addClass("tab-invisible");
+    
+    parentObject.container.appendChild(this.outerContainer);
+    
+    if(type == WINDOW_CHANNEL) {
+      this.nicklist = new Element("div");
+      this.nicklist.addClass("nicklist");
+      
+      this.outerContainer.appendChild(this.nicklist);
+    }
+    
+    var innerContainer = new Element("div");
+    innerContainer.addClass("innercontainer");
+    this.outerContainer.appendChild(innerContainer);
+    
+    if(type == WINDOW_CHANNEL) {
+      this.topic = new Element("div");
+      this.topic.addClass("topic");
+      innerContainer.appendChild(this.topic);
+    }
+    
+    this.lines = new Element("div");
+    this.lines.addClass("lines");
+    innerContainer.appendChild(this.lines);
+    
+    this.tab = new Element("span");
+    this.tab.addClass("tab");
+    
+    this.tab.appendText(name);
+    this.tab.addEvent("click", function() {
+      parentObject.selectWindow(this);
+    }.bind(this));
+
+    parentObject.tabs.appendChild(this.tab);
+    
+    if(type != WINDOW_STATUS) {
+      tabclose = new Element("span");
+      tabclose.addClass("tabclose");
+      tabclose.addEvent("click", function(e) {
+        new Event(e).stop();
+        
+        if(type == WINDOW_CHANNEL)
+          this.client.exec("/PART " + name);
+
+        this.close();
+      }.bind(this));
+      tabclose.set("text", "X");
+      this.tab.appendChild(tabclose);
+    }
+  },
+  updateNickList: function(nicks) {
+    this.parent(nicks);
+    
+    var n = this.nicklist;
+    while(n.firstChild)
+      n.removeChild(n.firstChild);
+
+    nicks.each(function(nick) {
+      var e = new Element("div");
+      n.appendChild(e);
+      e.appendChild(document.createTextNode(nick));
+    });
+  },
+  updateTopic: function(topic) {
+    this.parent(topic);
+    
+    var t = this.topic;
+    
+    while(t.firstChild)
+      t.removeChild(t.firstChild);
+
+    Colourise(topic, t);
+  },
+  select: function() {
+    this.parent();
+    
+    this.outerContainer.removeClass("tab-invisible");
+    this.tab.removeClass("tab-unselected");
+    this.tab.removeClass("tab-highlighted");
+    this.tab.addClass("tab-selected");
+  },
+  deselect: function() {
+    this.parent();
+    
+    this.outerContainer.addClass("tab-invisible");
+    this.tab.removeClass("tab-selected");
+    this.tab.addClass("tab-unselected");
+  },
+  close: function() {
+    this.parent();
+    
+    this.parentObject.container.removeChild(this.outerContainer);
+    this.parentObject.tabs.removeChild(this.tab);
+  },
+  addLine: function(type, line, colour) {
+    this.parent(type, line, colour);
+    
+    var e = new Element("div");
+
+    if(colour) {
+      e.addStyle("background", colour);
+    } else if(this.lastcolour) {
+      e.addClass("linestyle1");
+    } else {
+      e.addClass("linestyle2");
+    }
+    
+    if(type)
+      line = this.parentObject.theme.message(type, line);
+    
+    Colourise(IRCTimestamp(new Date()) + " " + line, e);
+    
+    this.lastcolour = !this.lastcolour;
+    
+    var prev = this.lines.getScroll();
+    var prevbottom = this.lines.getScrollSize().y;
+    var prevsize = this.lines.getSize();
+    this.lines.appendChild(e);
+    
+    if(prev.y + prevsize.y == prevbottom)
+      this.lines.scrollTo(prev.x, this.lines.getScrollSize().y);
+      
+    if(!this.active)
+      this.tab.addClass("tab-highlighted");
+  }
+});
+
+var UglyUI = new Class({
+  Extends: UI,
+  initialize: function(parentElement, theme) {
+    this.parent(parentElement, UglyUIWindow, "uglyui");
+    
+    this.theme = theme;
+    
+    this.tabs = new Element("div");
+    this.tabs.addClass("tabbar");
+    
+    parentElement.appendChild(this.tabs);
+    
+    this.container = new Element("div");
+    this.container.addClass("container");
+    
+    parentElement.appendChild(this.container);
+  
+    var form = new Element("form");
+    var inputbox = new Element("input");
+    inputbox.addClass("input");
+  
+    form.addEvent("submit", function(e) {
+      new Event(e).stop();
+    
+      this.getActiveWindow().client.exec(inputbox.value);
+      inputbox.value = "";
+    }.bind(this));
+    parentElement.appendChild(form);  
+    form.appendChild(inputbox);
+    inputbox.focus();
+  }
 });
\ No newline at end of file
diff --git a/js/version.js b/js/version.js
index 5f092b9..aa3bdf3 100644
--- a/js/version.js
+++ b/js/version.js
@@ -1 +1 @@
-QWEBIRC_VERSION = "0.01"
+QWEBIRC_VERSION = "0.01"
diff --git a/qwebirc/__init__.py b/qwebirc/__init__.py
index f6b7a69..6e27e2a 100644
--- a/qwebirc/__init__.py
+++ b/qwebirc/__init__.py
@@ -1 +1 @@
-from root import RootSite
+from root import RootSite
diff --git a/qwebirc/ajaxengine.py b/qwebirc/ajaxengine.py
index dd252c9..92b6228 100644
--- a/qwebirc/ajaxengine.py
+++ b/qwebirc/ajaxengine.py
@@ -1,144 +1,144 @@
-from twisted.web import resource, server, static
-from twisted.names import client
-from twisted.internet import reactor
-import simplejson, md5, sys, os, ircclient, time, config
-
-Sessions = {}
-
-def get_session_id():
-  return md5.md5(os.urandom(16)).hexdigest()
-  
-def jsondump(fn):
-  def decorator(*args, **kwargs):
-    x = fn(*args, **kwargs)
-    if isinstance(x, list):
-      return simplejson.dumps(x)
-    return x
-  return decorator
-
-class IRCSession:
-  def __init__(self, id):
-    self.id = id
-    self.subscriptions = []
-    self.buffer = []
-    self.throttle = 0
-    self.schedule = None
-    
-  def subscribe(self, channel):
-    self.subscriptions.append(channel)
-    self.flush()
-      
-  def flush(self, scheduled=False):
-    if scheduled:
-      self.schedule = None
-      
-    if not self.buffer or not self.subscriptions:
-      return
-        
-    t = time.time()
-    
-    if t < self.throttle:
-      if not self.schedule:
-        self.schedule = reactor.callLater(self.throttle - t, self.flush, True)
-      return
-    else:
-      # process the rest of the packet
-      if not scheduled:
-        if not self.schedule:
-          self.schedule = reactor.callLater(0, self.flush, True)
-        return
-        
-    self.throttle = t + config.UPDATE_FREQ
-
-    encdata = simplejson.dumps(self.buffer)
-    self.buffer = []
-    
-    newsubs = []
-    for x in self.subscriptions:
-      if x.write(encdata):
-        newsubs.append(x)
-
-    self.subscriptions = newsubs
-     
-  def event(self, data):
-    self.buffer.append(data)
-    self.flush()
-    
-  def push(self, data):
-    self.client.write(data)
- 
-class Channel:
-  def __init__(self, request):
-    self.request = request
-  
-class SingleUseChannel(Channel):
-  def write(self, data):
-    self.request.write(data)
-    self.request.finish()
-    return False
-    
-class MultipleUseChannel(Channel):
-  def write(self, data):
-    self.request.write(data)
-    return True
-
-class AJAXEngine(resource.Resource):
-  isLeaf = True
-  
-  def __init__(self, prefix):
-    self.prefix = prefix
-
-  @jsondump
-  def render_GET(self, request):
-    path = request.path[len(self.prefix):]
-    if path == "/n":
-      ip = request.transport.getPeer()
-      ip = ip[1]
-
-      nick, ident = request.args.get("nick"), "webchat"
-      if not nick:
-        return [False, "Nickname not supplied"]
-        
-      nick = nick[0]
-      
-      id = get_session_id()
-      
-      session = IRCSession(id)
-
-      client = ircclient.createIRC(session, nick=nick, ident=ident, ip=ip, realname=nick)
-      session.client = client
-      
-      Sessions[id] = session
-      
-      return [True, id]
-          
-    if path.startswith("/s/"):
-      sessionid = path[3:]
-      session = Sessions.get(sessionid)
-      
-      if not session:
-        return [False, "Bad session ID"]
-
-      session.subscribe(SingleUseChannel(request))
-      return server.NOT_DONE_YET
-    if path.startswith("/p/"):
-      command = request.args.get("c")
-      if not command:
-        return [False, "No command specified"]
-
-      command = command[0]
-      
-      sessionid = path[3:]
-      session = Sessions.get(sessionid)
-      if not session:
-        return [False, "Bad session ID"]
-
-      try:
-        decoded = command.decode("utf-8")
-      except UnicodeDecodeError:
-        decoded = command.decode("iso-8859-1", "ignore")
-      session.push(decoded)
-      return [True]
-
-    return [False, "404"]
-
+from twisted.web import resource, server, static
+from twisted.names import client
+from twisted.internet import reactor
+import simplejson, md5, sys, os, ircclient, time, config
+
+Sessions = {}
+
+def get_session_id():
+  return md5.md5(os.urandom(16)).hexdigest()
+  
+def jsondump(fn):
+  def decorator(*args, **kwargs):
+    x = fn(*args, **kwargs)
+    if isinstance(x, list):
+      return simplejson.dumps(x)
+    return x
+  return decorator
+
+class IRCSession:
+  def __init__(self, id):
+    self.id = id
+    self.subscriptions = []
+    self.buffer = []
+    self.throttle = 0
+    self.schedule = None
+    
+  def subscribe(self, channel):
+    self.subscriptions.append(channel)
+    self.flush()
+      
+  def flush(self, scheduled=False):
+    if scheduled:
+      self.schedule = None
+      
+    if not self.buffer or not self.subscriptions:
+      return
+        
+    t = time.time()
+    
+    if t < self.throttle:
+      if not self.schedule:
+        self.schedule = reactor.callLater(self.throttle - t, self.flush, True)
+      return
+    else:
+      # process the rest of the packet
+      if not scheduled:
+        if not self.schedule:
+          self.schedule = reactor.callLater(0, self.flush, True)
+        return
+        
+    self.throttle = t + config.UPDATE_FREQ
+
+    encdata = simplejson.dumps(self.buffer)
+    self.buffer = []
+    
+    newsubs = []
+    for x in self.subscriptions:
+      if x.write(encdata):
+        newsubs.append(x)
+
+    self.subscriptions = newsubs
+     
+  def event(self, data):
+    self.buffer.append(data)
+    self.flush()
+    
+  def push(self, data):
+    self.client.write(data)
+ 
+class Channel:
+  def __init__(self, request):
+    self.request = request
+  
+class SingleUseChannel(Channel):
+  def write(self, data):
+    self.request.write(data)
+    self.request.finish()
+    return False
+    
+class MultipleUseChannel(Channel):
+  def write(self, data):
+    self.request.write(data)
+    return True
+
+class AJAXEngine(resource.Resource):
+  isLeaf = True
+  
+  def __init__(self, prefix):
+    self.prefix = prefix
+
+  @jsondump
+  def render_GET(self, request):
+    path = request.path[len(self.prefix):]
+    if path == "/n":
+      ip = request.transport.getPeer()
+      ip = ip[1]
+
+      nick, ident = request.args.get("nick"), "webchat"
+      if not nick:
+        return [False, "Nickname not supplied"]
+        
+      nick = nick[0]
+      
+      id = get_session_id()
+      
+      session = IRCSession(id)
+
+      client = ircclient.createIRC(session, nick=nick, ident=ident, ip=ip, realname=nick)
+      session.client = client
+      
+      Sessions[id] = session
+      
+      return [True, id]
+          
+    if path.startswith("/s/"):
+      sessionid = path[3:]
+      session = Sessions.get(sessionid)
+      
+      if not session:
+        return [False, "Bad session ID"]
+
+      session.subscribe(SingleUseChannel(request))
+      return server.NOT_DONE_YET
+    if path.startswith("/p/"):
+      command = request.args.get("c")
+      if not command:
+        return [False, "No command specified"]
+
+      command = command[0]
+      
+      sessionid = path[3:]
+      session = Sessions.get(sessionid)
+      if not session:
+        return [False, "Bad session ID"]
+
+      try:
+        decoded = command.decode("utf-8")
+      except UnicodeDecodeError:
+        decoded = command.decode("iso-8859-1", "ignore")
+      session.push(decoded)
+      return [True]
+
+    return [False, "404"]
+
diff --git a/qwebirc/config.py.example b/qwebirc/config.py.example
index e6349ae..1b93404 100644
--- a/qwebirc/config.py.example
+++ b/qwebirc/config.py.example
@@ -1,4 +1,4 @@
-IRCSERVER, IRCPORT = "moo.com", 6667
-HMACKEY = "mrmoo"
-HMACTEMPORAL = 30
-UPDATE_FREQ = 0.5
+IRCSERVER, IRCPORT = "moo.com", 6667
+HMACKEY = "mrmoo"
+HMACTEMPORAL = 30
+UPDATE_FREQ = 0.5
diff --git a/qwebirc/ircclient.py b/qwebirc/ircclient.py
index 2794d75..06589a4 100644
--- a/qwebirc/ircclient.py
+++ b/qwebirc/ircclient.py
@@ -1,82 +1,82 @@
-import twisted, sys
-from twisted.words.protocols import irc
-from twisted.internet import reactor, protocol
-from twisted.web import resource, server
-from twisted.protocols import basic
-
-import hmac, time, config
-from config import HMACTEMPORAL
-HMACKEY = hmac.HMAC(key=config.HMACKEY)
-
-def hmacfn(*args):
-  h = HMACKEY.copy()
-  h.update("%d %s" % (int(time.time() / HMACTEMPORAL), " ".join(args)))
-  return h.hexdigest()
-
-class QWebIRCClient(basic.LineReceiver):
-  delimiter = "\n"
-  
-  def dataReceived(self, data):
-    basic.LineReceiver.dataReceived(self, data.replace("\r", ""))
-
-  def lineReceived(self, line):
-    line = irc.lowDequote(line)
-    try:
-      line = line.decode("utf-8")
-    except UnicodeDecodeError:
-      line = line.decode("iso-8859-1", "ignore")
-    
-    try:
-      prefix, command, params = irc.parsemsg(line)
-      self.handleCommand(command, prefix, params)
-    except irc.IRCBadMessage:
-      self.badMessage(line, *sys.exc_info())
-        
-  def badMessage(self, args):
-    self("badmessage", args)
-  
-  def handleCommand(self, command, prefix, params):
-    self("c", command, prefix, params)
-    
-  def __call__(self, *args):
-    self.factory.publisher.event(args)
-    
-  def write(self, data):
-    self.transport.write("%s\r\n" % irc.lowQuote(data.encode("utf-8")))
-      
-  def connectionMade(self):
-    basic.LineReceiver.connectionMade(self)
-    
-    f = self.factory.ircinit
-    nick, ident, ip, realname = f["nick"], f["ident"], f["ip"], f["realname"]
-    
-    hmac = hmacfn(ident, ip)
-    self.write("USER %s bleh bleh %s %s :%s" % (ident, ip, hmac, realname))
-    self.write("NICK %s" % nick)
-    
-    self.factory.client = self
-    self("connect")
-
-  def connectionLost(self, reason):
-    self.factory.client = None
-    basic.LineReceiver.connectionLost(self, reason)
-    self("disconnect")
-    
-class QWebIRCFactory(protocol.ClientFactory):
-  protocol = QWebIRCClient
-  def __init__(self, publisher, **kwargs):
-    self.client = None
-    self.publisher = publisher
-    self.ircinit = kwargs
-    
-  def write(self, data):
-    self.client.write(data)
-    
-def createIRC(*args, **kwargs):
-  f = QWebIRCFactory(*args, **kwargs)
-  reactor.connectTCP(config.IRCSERVER, config.IRCPORT, f)
-  return f
-
-if __name__ == "__main__":
-  e = createIRC(lambda x: 2, nick="slug__moo", ident="mooslug", ip="1.2.3.6", realname="mooooo")
+import twisted, sys
+from twisted.words.protocols import irc
+from twisted.internet import reactor, protocol
+from twisted.web import resource, server
+from twisted.protocols import basic
+
+import hmac, time, config
+from config import HMACTEMPORAL
+HMACKEY = hmac.HMAC(key=config.HMACKEY)
+
+def hmacfn(*args):
+  h = HMACKEY.copy()
+  h.update("%d %s" % (int(time.time() / HMACTEMPORAL), " ".join(args)))
+  return h.hexdigest()
+
+class QWebIRCClient(basic.LineReceiver):
+  delimiter = "\n"
+  
+  def dataReceived(self, data):
+    basic.LineReceiver.dataReceived(self, data.replace("\r", ""))
+
+  def lineReceived(self, line):
+    line = irc.lowDequote(line)
+    try:
+      line = line.decode("utf-8")
+    except UnicodeDecodeError:
+      line = line.decode("iso-8859-1", "ignore")
+    
+    try:
+      prefix, command, params = irc.parsemsg(line)
+      self.handleCommand(command, prefix, params)
+    except irc.IRCBadMessage:
+      self.badMessage(line, *sys.exc_info())
+        
+  def badMessage(self, args):
+    self("badmessage", args)
+  
+  def handleCommand(self, command, prefix, params):
+    self("c", command, prefix, params)
+    
+  def __call__(self, *args):
+    self.factory.publisher.event(args)
+    
+  def write(self, data):
+    self.transport.write("%s\r\n" % irc.lowQuote(data.encode("utf-8")))
+      
+  def connectionMade(self):
+    basic.LineReceiver.connectionMade(self)
+    
+    f = self.factory.ircinit
+    nick, ident, ip, realname = f["nick"], f["ident"], f["ip"], f["realname"]
+    
+    hmac = hmacfn(ident, ip)
+    self.write("USER %s bleh bleh %s %s :%s" % (ident, ip, hmac, realname))
+    self.write("NICK %s" % nick)
+    
+    self.factory.client = self
+    self("connect")
+
+  def connectionLost(self, reason):
+    self.factory.client = None
+    basic.LineReceiver.connectionLost(self, reason)
+    self("disconnect")
+    
+class QWebIRCFactory(protocol.ClientFactory):
+  protocol = QWebIRCClient
+  def __init__(self, publisher, **kwargs):
+    self.client = None
+    self.publisher = publisher
+    self.ircinit = kwargs
+    
+  def write(self, data):
+    self.client.write(data)
+    
+def createIRC(*args, **kwargs):
+  f = QWebIRCFactory(*args, **kwargs)
+  reactor.connectTCP(config.IRCSERVER, config.IRCPORT, f)
+  return f
+
+if __name__ == "__main__":
+  e = createIRC(lambda x: 2, nick="slug__moo", ident="mooslug", ip="1.2.3.6", realname="mooooo")
   reactor.run()
\ No newline at end of file
diff --git a/qwebirc/root.py b/qwebirc/root.py
index 7e6e194..9543528 100644
--- a/qwebirc/root.py
+++ b/qwebirc/root.py
@@ -1,17 +1,17 @@
-from ajaxengine import AJAXEngine
-
-from twisted.web import resource, server, static
-
-class RootResource(resource.Resource):
-  isLeaf = True
-  def render_GET(self, request):
-    return "moo"
-    
-class RootSite(server.Site):
-  def __init__(self, path, *args, **kwargs):
-    root = resource.Resource()
-    server.Site.__init__(self, root, *args, **kwargs)
-    
-    root.putChild("", RootResource())
-    root.putChild("e", AJAXEngine("/e"))
-    root.putChild("static", static.File(path))
+from ajaxengine import AJAXEngine
+
+from twisted.web import resource, server, static
+
+class RootResource(resource.Resource):
+  isLeaf = True
+  def render_GET(self, request):
+    return "moo"
+    
+class RootSite(server.Site):
+  def __init__(self, path, *args, **kwargs):
+    root = resource.Resource()
+    server.Site.__init__(self, root, *args, **kwargs)
+    
+    root.putChild("", RootResource())
+    root.putChild("e", AJAXEngine("/e"))
+    root.putChild("static", static.File(path))
diff --git a/static/css/colours.css b/static/css/colours.css
index e567ea1..58bfc20 100644
--- a/static/css/colours.css
+++ b/static/css/colours.css
@@ -1,102 +1,102 @@
-.qwebirc .colourline .Xc0 {
-  color: white;
-}
-.qwebirc .colourline .Xc1 {
-  color: black;
-}
-.qwebirc .colourline .Xc2 {
-  color: darkBlue;
-}
-.qwebirc .colourline .Xc3 {
-  color: darkGreen;
-}
-.qwebirc .colourline .Xc4 {
-  color: red;
-}
-.qwebirc .colourline .Xc5 {
-  color: darkRed;
-}
-.qwebirc .colourline .Xc6 {
-  color: purple;
-}
-.qwebirc .colourline .Xc7 {
-  color: orange;
-}
-.qwebirc .colourline .Xc8 {
-  color: yellow;
-}
-.qwebirc .colourline .Xc9 {
-  color: green;
-}
-.qwebirc .colourline .Xc10 {
-  color: teal;
-}
-.qwebirc .colourline .Xc11 {
-  color: cyan;
-}
-.qwebirc .colourline .Xc12 {
-  color: blue;
-}
-.qwebirc .colourline .Xc13 {
-  color: fuchsia;
-}
-.qwebirc .colourline .Xc14 {
-  color: darkGray;
-}
-.qwebirc .colourline .Xc15 {
-  color: gray;
-}
-.qwebirc .colourline .Xbc0 {
-  background-color: white;
-}
-.qwebirc .colourline .Xbc1 {
-  background-color: black;
-}
-.qwebirc .colourline .Xbc2 {
-  background-color: darkBlue;
-}
-.qwebirc .colourline .Xbc3 {
-  background-color: darkGreen;
-}
-.qwebirc .colourline .Xbc4 {
-  background-color: red;
-}
-.qwebirc .colourline .Xbc5 {
-  background-color: darkRed;
-}
-.qwebirc .colourline .Xbc6 {
-  background-color: purple;
-}
-.qwebirc .colourline .Xbc7 {
-  background-color: orange;
-}
-.qwebirc .colourline .Xbc8 {
-  background-color: yellow;
-}
-.qwebirc .colourline .Xbc9 {
-  background-color: green;
-}
-.qwebirc .colourline .Xbc10 {
-  background-color: teal;
-}
-.qwebirc .colourline .Xbc11 {
-  background-color: cyan;
-}
-.qwebirc .colourline .Xbc12 {
-  background-color: blue;
-}
-.qwebirc .colourline .Xbc13 {
-  background-color: fuchsia;
-}
-.qwebirc .colourline .Xbc14 {
-  background-color: darkGray;
-}
-.qwebirc .colourline .Xbc15 {
-  background-color: gray;
-}
-.qwebirc .colourline .Xb {
-  font-weight: bold;
-}
-.qwebirc .colourline .Xu {
-  text-decoration: underline;
-}
+.qwebirc .colourline .Xc0 {
+  color: white;
+}
+.qwebirc .colourline .Xc1 {
+  color: black;
+}
+.qwebirc .colourline .Xc2 {
+  color: darkBlue;
+}
+.qwebirc .colourline .Xc3 {
+  color: darkGreen;
+}
+.qwebirc .colourline .Xc4 {
+  color: red;
+}
+.qwebirc .colourline .Xc5 {
+  color: darkRed;
+}
+.qwebirc .colourline .Xc6 {
+  color: purple;
+}
+.qwebirc .colourline .Xc7 {
+  color: orange;
+}
+.qwebirc .colourline .Xc8 {
+  color: yellow;
+}
+.qwebirc .colourline .Xc9 {
+  color: green;
+}
+.qwebirc .colourline .Xc10 {
+  color: teal;
+}
+.qwebirc .colourline .Xc11 {
+  color: cyan;
+}
+.qwebirc .colourline .Xc12 {
+  color: blue;
+}
+.qwebirc .colourline .Xc13 {
+  color: fuchsia;
+}
+.qwebirc .colourline .Xc14 {
+  color: darkGray;
+}
+.qwebirc .colourline .Xc15 {
+  color: gray;
+}
+.qwebirc .colourline .Xbc0 {
+  background-color: white;
+}
+.qwebirc .colourline .Xbc1 {
+  background-color: black;
+}
+.qwebirc .colourline .Xbc2 {
+  background-color: darkBlue;
+}
+.qwebirc .colourline .Xbc3 {
+  background-color: darkGreen;
+}
+.qwebirc .colourline .Xbc4 {
+  background-color: red;
+}
+.qwebirc .colourline .Xbc5 {
+  background-color: darkRed;
+}
+.qwebirc .colourline .Xbc6 {
+  background-color: purple;
+}
+.qwebirc .colourline .Xbc7 {
+  background-color: orange;
+}
+.qwebirc .colourline .Xbc8 {
+  background-color: yellow;
+}
+.qwebirc .colourline .Xbc9 {
+  background-color: green;
+}
+.qwebirc .colourline .Xbc10 {
+  background-color: teal;
+}
+.qwebirc .colourline .Xbc11 {
+  background-color: cyan;
+}
+.qwebirc .colourline .Xbc12 {
+  background-color: blue;
+}
+.qwebirc .colourline .Xbc13 {
+  background-color: fuchsia;
+}
+.qwebirc .colourline .Xbc14 {
+  background-color: darkGray;
+}
+.qwebirc .colourline .Xbc15 {
+  background-color: gray;
+}
+.qwebirc .colourline .Xb {
+  font-weight: bold;
+}
+.qwebirc .colourline .Xu {
+  text-decoration: underline;
+}
diff --git a/static/css/swmui.css b/static/css/swmui.css
index 9f383c2..34a5ca6 100644
--- a/static/css/swmui.css
+++ b/static/css/swmui.css
@@ -1,75 +1,75 @@
-body, html {
-  height: 100%;
-  width: 100%;
-  margin: 0;
-  padding: 0;
-  font-family: "Lucida Console", sans-serif;
-}
-
-.qwebirc-swmui .container {
-  height: 100%;
-  width: 100%;
-}
-
-.qwebirc-swmui .tabs {
-  background: #fdd;
-}
-
-.qwebirc-swmui .main {
-  background: #ddf;
-}
-
-.qwebirc-swmui .entry {
-  background: #dfd;
-}
-
-.qwebirc-swmui .content {
-  background: #ddf;
-}
-
-.qwebirc-swmui .nicklist {
-  background: #dff;
-}
-
-.qwebirc-swmui .tab {
-  float: left;
-  min-width: 100px;
-  width: 100px;
-  display: block;
-  border: 1px solid black;
-  margin-right: 2px;
-  cursor: default;
-}
-
-.qwebirc-swmui .tabclose {
-  border: 1px solid black;
-  margin: 2px;
-  font-size: 0.5em;
-}
-
-.qwebirc-swmui .entry input {
-  padding: 0px;
-}
-
-.qwebirc-swmui .entry {
-}
-
-.qwebirc-swmui .tab-highlighted {
-  color: red;
-}
-
-.qwebirc-swmui .linestyle1 {
-  background: #efefef;
-}
-
-.qwebirc-swmui .linestyle2 {
-  background: #eeffff;
-}
-
-.qwebirc-swmui .tab-selected {
-  background: #fef;
-}
-
-.qwebirc-swmui .tab-unselected {
-  background: #eee;
+body, html {
+  height: 100%;
+  width: 100%;
+  margin: 0;
+  padding: 0;
+  font-family: "Lucida Console", sans-serif;
+}
+
+.qwebirc-swmui .container {
+  height: 100%;
+  width: 100%;
+}
+
+.qwebirc-swmui .tabs {
+  background: #fdd;
+}
+
+.qwebirc-swmui .main {
+  background: #ddf;
+}
+
+.qwebirc-swmui .entry {
+  background: #dfd;
+}
+
+.qwebirc-swmui .content {
+  background: #ddf;
+}
+
+.qwebirc-swmui .nicklist {
+  background: #dff;
+}
+
+.qwebirc-swmui .tab {
+  float: left;
+  min-width: 100px;
+  width: 100px;
+  display: block;
+  border: 1px solid black;
+  margin-right: 2px;
+  cursor: default;
+}
+
+.qwebirc-swmui .tabclose {
+  border: 1px solid black;
+  margin: 2px;
+  font-size: 0.5em;
+}
+
+.qwebirc-swmui .entry input {
+  padding: 0px;
+}
+
+.qwebirc-swmui .entry {
+}
+
+.qwebirc-swmui .tab-highlighted {
+  color: red;
+}
+
+.qwebirc-swmui .linestyle1 {
+  background: #efefef;
+}
+
+.qwebirc-swmui .linestyle2 {
+  background: #eeffff;
+}
+
+.qwebirc-swmui .tab-selected {
+  background: #fef;
+}
+
+.qwebirc-swmui .tab-unselected {
+  background: #eee;
 }
\ No newline at end of file
diff --git a/static/css/uglyui.css b/static/css/uglyui.css
index 6857baf..89cc2b8 100644
--- a/static/css/uglyui.css
+++ b/static/css/uglyui.css
@@ -1,86 +1,86 @@
-.qwebirc-uglyui .tabbar {
-  border: 1px solid black;
-  padding: 4px;
-  font-family: "Lucida Console", sans-serif;
-}
-
-.qwebirc-uglyui .tab {
-  border: 1px black solid;
-  padding: 2px;
-  cursor: default;
-  margin-right: 2px;
-  background: #eee;
-  clear: both;
-}
-
-.qwebirc-uglyui .container {
-  border: 1px solid black;
-  margin: 2px 0px 0px 0px;
-  height: 480px;
-}
-
-.qwebirc-uglyui .input {
-  width: 400px;
-  border: 1px solid black;
-  margin: 2px 0px 0px 0px;
-}
-
-.qwebirc-uglyui .tabclose {
-  border: 1px black solid;
-  margin-left: 5px;
-  padding: 2px;
-  font-size: 0.5em;
-}
-
-.qwebirc-uglyui .nicklist {
-  border-left: 1px solid black;
-  width: 125px;
-  float: right;
-  height: 480px;
-  clear: both;
-  overflow: auto;
-  background: white;
-}
-
-.qwebirc-uglyui .tab-invisible {
-  display: none;
-}
-
-.qwebirc-uglyui .outercontainer {
-  font-family: Lucida Console;
-}
-
-.qwebirc-uglyui .innercontainer {
-  height: 480px;
-}
-
-.qwebirc-uglyui .topic {
-  background: #fef;
-  height: 20px;
-}
-
-.qwebirc-uglyui .tab-selected {
-  background: #eff;
-}
-
-.qwebirc-uglyui .tab-unselected {
-  background: #eee;
-}
-
-.qwebirc-uglyui .tab-highlighted {
-  color: red;
-}
-
-.qwebirc-uglyui .lines {
-  height: 460px;
-  overflow: auto;
-  word-wrap: break-word;
-}
-
-.qwebirc-uglyui .linestyle1 {
-  background: #efefef;
-}
-
-.qwebirc-uglyui .linestyle2 {
-  background: #eeffff;
-}
+.qwebirc-uglyui .tabbar {
+  border: 1px solid black;
+  padding: 4px;
+  font-family: "Lucida Console", sans-serif;
+}
+
+.qwebirc-uglyui .tab {
+  border: 1px black solid;
+  padding: 2px;
+  cursor: default;
+  margin-right: 2px;
+  background: #eee;
+  clear: both;
+}
+
+.qwebirc-uglyui .container {
+  border: 1px solid black;
+  margin: 2px 0px 0px 0px;
+  height: 480px;
+}
+
+.qwebirc-uglyui .input {
+  width: 400px;
+  border: 1px solid black;
+  margin: 2px 0px 0px 0px;
+}
+
+.qwebirc-uglyui .tabclose {
+  border: 1px black solid;
+  margin-left: 5px;
+  padding: 2px;
+  font-size: 0.5em;
+}
+
+.qwebirc-uglyui .nicklist {
+  border-left: 1px solid black;
+  width: 125px;
+  float: right;
+  height: 480px;
+  clear: both;
+  overflow: auto;
+  background: white;
+}
+
+.qwebirc-uglyui .tab-invisible {
+  display: none;
+}
+
+.qwebirc-uglyui .outercontainer {
+  font-family: Lucida Console;
+}
+
+.qwebirc-uglyui .innercontainer {
+  height: 480px;
+}
+
+.qwebirc-uglyui .topic {
+  background: #fef;
+  height: 20px;
+}
+
+.qwebirc-uglyui .tab-selected {
+  background: #eff;
+}
+
+.qwebirc-uglyui .tab-unselected {
+  background: #eee;
+}
+
+.qwebirc-uglyui .tab-highlighted {
+  color: red;
+}
+
+.qwebirc-uglyui .lines {
+  height: 460px;
+  overflow: auto;
+  word-wrap: break-word;
+}
+
+.qwebirc-uglyui .linestyle1 {
+  background: #efefef;
+}
+
+.qwebirc-uglyui .linestyle2 {
+  background: #eeffff;
+}
diff --git a/static/iframe.html b/static/iframe.html
index be78b47..c651dc1 100644
--- a/static/iframe.html
+++ b/static/iframe.html
@@ -1,5 +1,5 @@
-<html>
-<body>
-  <iframe src="swmui.html" height="600" width="600"/>
-</body>
+<html>
+<body>
+  <iframe src="swmui.html" height="600" width="600"/>
+</body>
 </html>
\ No newline at end of file
diff --git a/static/swmui.html b/static/swmui.html
index ce85322..9b8217c 100644
--- a/static/swmui.html
+++ b/static/swmui.html
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
-"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-<head>
-  <title>QuakeNet Web IRC</title>
-  <link rel="stylesheet" href="css/colours.css" type="text/css">
-  <link rel="stylesheet" href="css/swmui.css" type="text/css">
-  <script type="text/javascript" src="js/mootools-1.2-core.js"></script>
-  <!--<script type="text/javascript" src="js/debug/version.js"></script>
-  <script type="text/javascript" src="js/debug/jslib.js"></script>
-  <script type="text/javascript" src="js/debug/irc/ircconnection.js"></script>
-  <script type="text/javascript" src="js/debug/irc/irclib.js"></script>
-  <script type="text/javascript" src="js/debug/irc/baseirc.js"></script>
-  <script type="text/javascript" src="js/debug/irc/irctracker.js"></script>
-  <script type="text/javascript" src="js/debug/irc/commandparser.js"></script>
-  <script type="text/javascript" src="js/debug/irc/ircclient.js"></script>
-  <script type="text/javascript" src="js/debug/ui/baseui.js"></script>
-  <script type="text/javascript" src="js/debug/ui/colour.js"></script>
-  <script type="text/javascript" src="js/debug/ui/theme.js"></script>
-  <script type="text/javascript" src="js/debug/ui/swmlayout.js"></script>
-  <script type="text/javascript" src="js/debug/ui/swmui.js"></script>-->
-  <script type="text/javascript" src="js/qwebirc.js"></script>
-  <script type="text/javascript" src="js/swmui.js"></script>
-  <script type="text/javascript">  
-    window.addEvent("domready", function() {
-      var theme = new Theme();
-      var ui = new SWMUI($("ircui"), theme);
-
-      var IRC = new IRCClient({nickname: "mcgoogle"}, ui);
-      IRC.connect();
-
-    });
-  </script>
-</head>
-<body>
-  <div id="ircui"></div>
-</body>
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+  <title>QuakeNet Web IRC</title>
+  <link rel="stylesheet" href="css/colours.css" type="text/css">
+  <link rel="stylesheet" href="css/swmui.css" type="text/css">
+  <script type="text/javascript" src="js/mootools-1.2-core.js"></script>
+  <!--<script type="text/javascript" src="js/debug/version.js"></script>
+  <script type="text/javascript" src="js/debug/jslib.js"></script>
+  <script type="text/javascript" src="js/debug/irc/ircconnection.js"></script>
+  <script type="text/javascript" src="js/debug/irc/irclib.js"></script>
+  <script type="text/javascript" src="js/debug/irc/baseirc.js"></script>
+  <script type="text/javascript" src="js/debug/irc/irctracker.js"></script>
+  <script type="text/javascript" src="js/debug/irc/commandparser.js"></script>
+  <script type="text/javascript" src="js/debug/irc/ircclient.js"></script>
+  <script type="text/javascript" src="js/debug/ui/baseui.js"></script>
+  <script type="text/javascript" src="js/debug/ui/colour.js"></script>
+  <script type="text/javascript" src="js/debug/ui/theme.js"></script>
+  <script type="text/javascript" src="js/debug/ui/swmlayout.js"></script>
+  <script type="text/javascript" src="js/debug/ui/swmui.js"></script>-->
+  <script type="text/javascript" src="js/qwebirc.js"></script>
+  <script type="text/javascript" src="js/swmui.js"></script>
+  <script type="text/javascript">  
+    window.addEvent("domready", function() {
+      var theme = new Theme();
+      var ui = new SWMUI($("ircui"), theme);
+
+      var IRC = new IRCClient({nickname: "mcgoogle"}, ui);
+      IRC.connect();
+
+    });
+  </script>
+</head>
+<body>
+  <div id="ircui"></div>
+</body>
 </html>
\ No newline at end of file
diff --git a/static/uglyui.html b/static/uglyui.html
index 83fa8d7..5359cdb 100644
--- a/static/uglyui.html
+++ b/static/uglyui.html
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
-"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-<head>
-  <title>QuakeNet Web IRC</title>
-  <link rel="stylesheet" href="css/colours.css" type="text/css">
-  <link rel="stylesheet" href="css/uglyui.css" type="text/css">
-  <script type="text/javascript" src="js/mootools-1.2-core.js"></script>
-  <!--<script type="text/javascript" src="js/debug/version.js"></script>
-  <script type="text/javascript" src="js/debug/jslib.js"></script>
-  <script type="text/javascript" src="js/debug/irc/ircconnection.js"></script>
-  <script type="text/javascript" src="js/debug/irc/irclib.js"></script>
-  <script type="text/javascript" src="js/debug/irc/baseirc.js"></script>
-  <script type="text/javascript" src="js/debug/irc/irctracker.js"></script>
-  <script type="text/javascript" src="js/debug/irc/commandparser.js"></script>
-  <script type="text/javascript" src="js/debug/irc/ircclient.js"></script>
-  <script type="text/javascript" src="js/debug/ui/baseui.js"></script>
-  <script type="text/javascript" src="js/debug/ui/colour.js"></script>
-  <script type="text/javascript" src="js/debug/ui/theme.js"></script>
-  <script type="text/javascript" src="js/debug/ui/uglyui.js"></script>-->
-  <script type="text/javascript" src="js/qwebirc.js"></script>
-  <script type="text/javascript" src="js/uglyui.js"></script>
-  <script type="text/javascript">  
-    window.addEvent("domready", function() {
-      var theme = new Theme();
-      var ui = new UglyUI($("ircui"), theme);
-
-      var IRC = new IRCClient({nickname: "mcgoogle"}, ui);
-      IRC.connect();
-    });
-  </script>
-</head>
-<body>
-  <div id="ircui"></div>
-</body>
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+  <title>QuakeNet Web IRC</title>
+  <link rel="stylesheet" href="css/colours.css" type="text/css">
+  <link rel="stylesheet" href="css/uglyui.css" type="text/css">
+  <script type="text/javascript" src="js/mootools-1.2-core.js"></script>
+  <!--<script type="text/javascript" src="js/debug/version.js"></script>
+  <script type="text/javascript" src="js/debug/jslib.js"></script>
+  <script type="text/javascript" src="js/debug/irc/ircconnection.js"></script>
+  <script type="text/javascript" src="js/debug/irc/irclib.js"></script>
+  <script type="text/javascript" src="js/debug/irc/baseirc.js"></script>
+  <script type="text/javascript" src="js/debug/irc/irctracker.js"></script>
+  <script type="text/javascript" src="js/debug/irc/commandparser.js"></script>
+  <script type="text/javascript" src="js/debug/irc/ircclient.js"></script>
+  <script type="text/javascript" src="js/debug/ui/baseui.js"></script>
+  <script type="text/javascript" src="js/debug/ui/colour.js"></script>
+  <script type="text/javascript" src="js/debug/ui/theme.js"></script>
+  <script type="text/javascript" src="js/debug/ui/uglyui.js"></script>-->
+  <script type="text/javascript" src="js/qwebirc.js"></script>
+  <script type="text/javascript" src="js/uglyui.js"></script>
+  <script type="text/javascript">  
+    window.addEvent("domready", function() {
+      var theme = new Theme();
+      var ui = new UglyUI($("ircui"), theme);
+
+      var IRC = new IRCClient({nickname: "mcgoogle"}, ui);
+      IRC.connect();
+    });
+  </script>
+</head>
+<body>
+  <div id="ircui"></div>
+</body>
 </html>
\ No newline at end of file
diff --git a/twisted/plugins/webirc.py b/twisted/plugins/webirc.py
index fbb2c18..05d8fe7 100644
--- a/twisted/plugins/webirc.py
+++ b/twisted/plugins/webirc.py
@@ -1,58 +1,58 @@
-from zope.interface import implements
-
-from twisted.python import usage
-from twisted.internet import task
-from twisted.plugin import IPlugin
-from twisted.application.service import IServiceMaker
-from twisted.application import internet, strports
-from twisted.web import static, server
-
-from qwebirc import RootSite
-
-class Options(usage.Options):
-  optParameters = [["port", "p", "9090","Port to start the server on."],
-    ["logfile", "l", None, "Path to web CLF (Combined Log Format) log file."],
-    ["https", None, None, "Port to listen on for Secure HTTP."],
-    ["certificate", "c", "server.pem", "SSL certificate to use for HTTPS. "],
-    ["privkey", "k", "server.pem", "SSL certificate to use for HTTPS."],
-    ["staticpath", "s", "static", "Path to static content"],
-  ]
-
-  optFlags = [["notracebacks", "n", "Display tracebacks in broken web pages. " +
-              "Displaying tracebacks to users may be security risk!"],
-             ]
-             
-  zsh_actions = {"logfile" : "_files -g '*.log'", "certificate" : "_files -g '*.pem'",
-                 "privkey" : "_files -g '*.pem'"}  
-
-  def postOptions(self):
-    if self['https']:
-      try:
-        from twisted.internet.ssl import DefaultOpenSSLContextFactory
-      except ImportError:
-        raise usage.UsageError("SSL support not installed")
-        
-class QWebIRCServiceMaker(object):
-  implements(IServiceMaker, IPlugin)
-  tapname = "qwebirc"
-  description = "QuakeNet web-based IRC client"
-  options = Options
-
-  
-  def makeService(self, config):
-    if config['logfile']:
-      site = RootSite(config['staticpath'], logPath=config['logfile'])
-    else:
-      site = RootSite(config['staticpath'])
-    
-    
-    site.displayTracebacks = not config["notracebacks"]
-    if config['https']:
-      from twisted.internet.ssl import DefaultOpenSSLContextFactory
-      i = internet.SSLServer(int(config['https']), site, DefaultOpenSSLContextFactory(config['privkey'], config['certificate']))
-    else:
-      i = internet.TCPServer(int(config['port']), site)
-      
-    return i
-  
+from zope.interface import implements
+
+from twisted.python import usage
+from twisted.internet import task
+from twisted.plugin import IPlugin
+from twisted.application.service import IServiceMaker
+from twisted.application import internet, strports
+from twisted.web import static, server
+
+from qwebirc import RootSite
+
+class Options(usage.Options):
+  optParameters = [["port", "p", "9090","Port to start the server on."],
+    ["logfile", "l", None, "Path to web CLF (Combined Log Format) log file."],
+    ["https", None, None, "Port to listen on for Secure HTTP."],
+    ["certificate", "c", "server.pem", "SSL certificate to use for HTTPS. "],
+    ["privkey", "k", "server.pem", "SSL certificate to use for HTTPS."],
+    ["staticpath", "s", "static", "Path to static content"],
+  ]
+
+  optFlags = [["notracebacks", "n", "Display tracebacks in broken web pages. " +
+              "Displaying tracebacks to users may be security risk!"],
+             ]
+             
+  zsh_actions = {"logfile" : "_files -g '*.log'", "certificate" : "_files -g '*.pem'",
+                 "privkey" : "_files -g '*.pem'"}  
+
+  def postOptions(self):
+    if self['https']:
+      try:
+        from twisted.internet.ssl import DefaultOpenSSLContextFactory
+      except ImportError:
+        raise usage.UsageError("SSL support not installed")
+        
+class QWebIRCServiceMaker(object):
+  implements(IServiceMaker, IPlugin)
+  tapname = "qwebirc"
+  description = "QuakeNet web-based IRC client"
+  options = Options
+
+  
+  def makeService(self, config):
+    if config['logfile']:
+      site = RootSite(config['staticpath'], logPath=config['logfile'])
+    else:
+      site = RootSite(config['staticpath'])
+    
+    
+    site.displayTracebacks = not config["notracebacks"]
+    if config['https']:
+      from twisted.internet.ssl import DefaultOpenSSLContextFactory
+      i = internet.SSLServer(int(config['https']), site, DefaultOpenSSLContextFactory(config['privkey'], config['certificate']))
+    else:
+      i = internet.TCPServer(int(config['port']), site)
+      
+    return i
+  
 serviceMaker = QWebIRCServiceMaker()
\ No newline at end of file