diff --git a/build/build-x86.bat b/build/build-x86.bat
index 981f7150..58e9388e 100644
--- a/build/build-x86.bat
+++ b/build/build-x86.bat
@@ -4,7 +4,7 @@ type makeinc.skel > makeinc.mak
 set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\api\crt\stl70;c:\mozilla-build\build\xchat-dev32\include
 set LIB=c:\WinDDK\7600.16385.1\lib\wxp\i386;c:\WinDDK\7600.16385.1\lib\Crt\i386
 set OPATH=%PATH%
-set PATH=c:\WinDDK\7600.16385.1\bin\x86\x86;c:\WinDDK\7600.16385.1\bin\x86;c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin;c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin;c:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE;c:\mozilla-build\build\xchat-dev32\bin;c:\mozilla-build\mingw32\bin
+set PATH=c:\WinDDK\7600.16385.1\bin\x86\x86;c:\WinDDK\7600.16385.1\bin\x86;c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin;c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin;c:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE;c:\mozilla-build\build\xchat-dev32\bin
 nmake /nologo /f makefile.mak clean
 cd pixmaps
 nmake /nologo /f makefile.mak
diff --git a/build/release-x86.bat b/build/release-x86.bat
index f4bfbb77..61a0282c 100644
--- a/build/release-x86.bat
+++ b/build/release-x86.bat
@@ -31,7 +31,6 @@ xcopy /q /s /i %GTK_BIN%\..\lib\gtk-2.0\2.10.0\engines\libpixmap.dll %XCHAT_DEST
 copy %GTK_BIN%\..\lib\gtk-2.0\2.10.0\engines\libwimp.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines
 xcopy /q /s /i %GTK_BIN%\..\lib\gtk-2.0\modules\libgail.dll %XCHAT_DEST%\lib\gtk-2.0\modules\
 xcopy /q /s /i etc %XCHAT_DEST%\etc
-xcopy /q /s /i themes %XCHAT_DEST%\themes
 copy ..\COPYING %XCHAT_DEST%
 copy %SSL_BIN%\..\LICENSE.OPENSSL %XCHAT_DEST%
 copy %SSL_BIN%\..\LICENSE.ZLIB %XCHAT_DEST%
diff --git a/build/themes/black/colors.conf b/build/themes/black/colors.conf
deleted file mode 100644
index b5917137..00000000
--- a/build/themes/black/colors.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-color_0 = cf3c cf3c cf3c
-color_1 = 0000 0000 0000
-color_2 = 0000 0000 cccc
-color_3 = 0000 cccc 0000
-color_4 = dddd 0000 0000
-color_5 = aaaa 0000 0000
-color_6 = bbbb 0000 bbbb
-color_7 = ffff aaaa 0000
-color_8 = eeee dddd 2222
-color_9 = 3333 dede 5555
-color_10 = 0000 cccc cccc
-color_11 = 3333 eeee ffff
-color_12 = 0000 0000 ffff
-color_13 = eeee 2222 eeee
-color_14 = 7777 7777 7777
-color_15 = 9999 9999 9999
-color_16 = cf3c cf3c cf3c
-color_17 = 0000 0000 0000
-color_18 = 0000 0000 cccc
-color_19 = 0000 cccc 0000
-color_20 = dddd 0000 0000
-color_21 = aaaa 0000 0000
-color_22 = bbbb 0000 bbbb
-color_23 = ffff aaaa 0000
-color_24 = eeee dddd 2222
-color_25 = 3333 dede 5555
-color_26 = 0000 cccc cccc
-color_27 = 3333 eeee ffff
-color_28 = 0000 0000 ffff
-color_29 = eeee 2222 eeee
-color_30 = 7777 7777 7777
-color_31 = 9999 9999 9999
-color_256 = 0000 0000 0000
-color_257 = a4a4 dfdf ffff
-color_258 = df3c df3c df3c
-color_259 = 0000 0000 0000
-color_260 = cccc 1010 1010
-color_261 = 8c8c 1010 1010
-color_262 = 0000 0000 ffff
-color_263 = f5f5 0000 0000
-color_264 = 9999 9999 9999
diff --git a/build/themes/black/palette.conf b/build/themes/black/palette.conf
deleted file mode 100644
index 6e6263b0..00000000
--- a/build/themes/black/palette.conf
+++ /dev/null
@@ -1,72 +0,0 @@
-color_0_red = 53052
-color_0_grn = 53052
-color_0_blu = 53052
-color_1_red = 0
-color_1_grn = 0
-color_1_blu = 0
-color_2_red = 0
-color_2_grn = 0
-color_2_blu = 52428
-color_3_red = 0
-color_3_grn = 52428
-color_3_blu = 0
-color_4_red = 56797
-color_4_grn = 0
-color_4_blu = 0
-color_5_red = 43690
-color_5_grn = 0
-color_5_blu = 0
-color_6_red = 48059
-color_6_grn = 0
-color_6_blu = 48059
-color_7_red = 65535
-color_7_grn = 43690
-color_7_blu = 0
-color_8_red = 61166
-color_8_grn = 56797
-color_8_blu = 8738
-color_9_red = 13107
-color_9_grn = 57054
-color_9_blu = 21845
-color_10_red = 0
-color_10_grn = 52428
-color_10_blu = 52428
-color_11_red = 13107
-color_11_grn = 61166
-color_11_blu = 65535
-color_12_red = 0
-color_12_grn = 0
-color_12_blu = 65535
-color_13_red = 61166
-color_13_grn = 8738
-color_13_blu = 61166
-color_14_red = 30583
-color_14_grn = 30583
-color_14_blu = 30583
-color_15_red = 39321
-color_15_grn = 39321
-color_15_blu = 39321
-color_16_red = 42148
-color_16_grn = 57311
-color_16_blu = 65535
-color_17_red = 0
-color_17_grn = 0
-color_17_blu = 0
-color_18_red = 57148
-color_18_grn = 57148
-color_18_blu = 57148
-color_19_red = 0
-color_19_grn = 0
-color_19_blu = 0
-color_20_red = 35980
-color_20_grn = 4112
-color_20_blu = 4112
-color_21_red = 0
-color_21_grn = 0
-color_21_blu = 65535
-color_22_red = 62965
-color_22_grn = 0
-color_22_blu = 0
-color_23_red = 39321
-color_23_grn = 39321
-color_23_blu = 39321
diff --git a/build/themes/black/pevents.conf b/build/themes/black/pevents.conf
deleted file mode 100644
index 6d22238d..00000000
--- a/build/themes/black/pevents.conf
+++ /dev/null
@@ -1,396 +0,0 @@
-event_name=Add Notify
-event_text=-%C10-%C11-%O$t$1 added to notify list.
-
-event_name=Ban List
-event_text=-%C10-%C11-%O$t$1 Banlist: %C3$4 %C4$2 %C5$3%O
-
-event_name=Banned
-event_text=-%C10-%C11-%O$tCannot join%C11 %B$1 %O(You are banned).
-
-event_name=Change Nick
-event_text=-%C10-%C11-%O$t$1 is now known as $2
-
-event_name=Channel Action
-event_text=%C13*%O$t$1%O $2%O
-
-event_name=Channel Action Hilight
-event_text=%C13*%O$t%C8%B$1%B%O $2%O
-
-event_name=Channel Ban
-event_text=-%C10-%C11-%O$t$1 sets ban on $2
-
-event_name=Channel Creation
-event_text=-%C10-%C11-%O$tChannel $1 created on $2
-
-event_name=Channel DeHalfOp
-event_text=-%C10-%C11-%O$t%C11$1%O removes channel half-operator status from %C11$2
-
-event_name=Channel DeOp
-event_text=-%C10-%C11-%O$t%C11$1%O removes channel operator status from %C11$2
-
-event_name=Channel DeVoice
-event_text=-%C10-%C11-%O$t%C11$1%O removes voice from %C11$2
-
-event_name=Channel Exempt
-event_text=-%C10-%C11-%O$t$1 sets exempt on $2
-
-event_name=Channel Half-Operator
-event_text=-%C10-%C11-%O$t%C11$1%O gives channel half-operator status to %C11$2
-
-event_name=Channel INVITE
-event_text=-%C10-%C11-%O$t$1 sets invite on $2
-
-event_name=Channel List
-event_text=%UChannel          Users   Topic%O
-
-event_name=Channel Message
-event_text=%C2<%O$1%C2>%O$t$2%O
-
-event_name=Channel Mode Generic
-event_text=-%C10-%C11-%O$t$1 sets mode $2$3 $4
-
-event_name=Channel Modes
-event_text=-%C10-%C11-%O$tChannel $1 modes: $2
-
-event_name=Channel Msg Hilight
-event_text=%C2<%C8%B$1%B%C2>%O$t$2%O
-
-event_name=Channel Notice
-event_text=%C12-%C13$1/$2%C12-%O$t$3%O
-
-event_name=Channel Operator
-event_text=-%C10-%C11-%O$t%C11$1%O gives channel operator status to %C11$2
-
-event_name=Channel Remove Exempt
-event_text=-%C10-%C11-%O$t$1 removes exempt on $2
-
-event_name=Channel Remove Invite
-event_text=-%C10-%C11-%O$t$1 removes invite on $2
-
-event_name=Channel Remove Keyword
-event_text=-%C10-%C11-%O$t$1 removes channel keyword
-
-event_name=Channel Remove Limit
-event_text=-%C10-%C11-%O$t$1 removes user limit
-
-event_name=Channel Set Key
-event_text=-%C10-%C11-%O$t$1 sets channel keyword to $2
-
-event_name=Channel Set Limit
-event_text=-%C10-%C11-%O$t$1 sets channel limit to $2
-
-event_name=Channel UnBan
-event_text=-%C10-%C11-%O$t$1 removes ban on $2
-
-event_name=Channel Voice
-event_text=-%C10-%C11-%O$t%C11$1%O gives voice to %C11$2
-
-event_name=Connected
-event_text=-%C10-%C11-%O$tConnected. Now logging in..
-
-event_name=Connecting
-event_text=-%C10-%C11-%O$tConnecting to %C11$1 %C14(%C11$2%C14)%C port %C11$3%C..
-
-event_name=Connection Failed
-event_text=-%C10-%C11-%O$tConnection failed. Error: $1
-
-event_name=CTCP Generic
-event_text=-%C10-%C11-%O$tReceived a CTCP $1 from $2
-
-event_name=CTCP Generic to Channel
-event_text=-%C10-%C11-%O$tReceived a CTCP $1 from $2 (to $3)
-
-event_name=CTCP Send
-event_text=%C3>%O$1%C3<%O$tCTCP $2%O
-
-event_name=CTCP Sound
-event_text=-%C10-%C11-%O$tReceived a CTCP Sound $1 from $2
-
-event_name=DCC CHAT Abort
-event_text=-%C10-%C11-%O$tDCC CHAT to %C11$1%O aborted.
-
-event_name=DCC CHAT Connect
-event_text=-%C10-%C11-%O$tDCC CHAT connection established to %C11$1 %C14[%O$2%C14]%O
-
-event_name=DCC CHAT Failed
-event_text=-%C10-%C11-%O$tDCC CHAT to %C11$1%O lost. $4.
-
-event_name=DCC CHAT Offer
-event_text=-%C10-%C11-%O$tReceived a DCC CHAT offer from $1
-
-event_name=DCC CHAT Offering
-event_text=-%C10-%C11-%O$tOffering DCC CHAT to $1
-
-event_name=DCC CHAT Reoffer
-event_text=-%C10-%C11-%O$tAlready offering CHAT to $1
-
-event_name=DCC Conection Failed
-event_text=-%C10-%C11-%O$tDCC $1 connect attempt to %C11$2%O failed (err=$3).
-
-event_name=DCC Generic Offer
-event_text=-%C10-%C11-%O$tReceived '$1%O' from $2
-
-event_name=DCC Header
-event_text=%C8,2 Type  To/From    Status  Size    Pos     File      %O%010%B%C9----------------------------------------------------%O
-
-event_name=DCC Malformed
-event_text=-%C10-%C11-%O$tReceived a malformed DCC request from %C11$1%O.%010-%C10-%C11-%O$tContents of packet: $2
-
-event_name=DCC Offer
-event_text=-%C10-%C11-%O$tOffering %C11$1 %Cto %C11$2%O
-
-event_name=DCC Offer Not Valid
-event_text=-%C10-%C11-%O$tNo such DCC offer.
-
-event_name=DCC RECV Abort
-event_text=-%C10-%C11-%O$tDCC RECV %C11$2%O to %C11$1%O aborted.
-
-event_name=DCC RECV Complete
-event_text=-%C10-%C11-%O$tDCC RECV %C11$1%O from %C11$3%O complete %C14[%C11$4%O cps%C14]%O.
-
-event_name=DCC RECV Connect
-event_text=-%C10-%C11-%O$tDCC RECV connection established to %C11$1 %C14[%O$2%C14]%O
-
-event_name=DCC RECV Failed
-event_text=-%C10-%C11-%O$tDCC RECV %C11$1%O from %C11$3%O failed. $4.
-
-event_name=DCC RECV File Open Error
-event_text=-%C10-%C11-%O$tDCC RECV: Cannot open $1 for writing ($2).
-
-event_name=DCC Rename
-event_text=-%C10-%C11-%O$tThe file %C11$1%C already exists, saving it as %C11$2%O instead.
-
-event_name=DCC RESUME Request
-event_text=-%C10-%C11-%O$t%C11$1 %Chas requested to resume %C11$2 %Cfrom %C11$3%C.
-
-event_name=DCC SEND Abort
-event_text=-%C10-%C11-%O$tDCC SEND %C11$2%O to %C11$1%O aborted.
-
-event_name=DCC SEND Complete
-event_text=-%C10-%C11-%O$tDCC SEND %C11$1%O to %C11$2%O complete %C14[%C11$3%O cps%C14]%O.
-
-event_name=DCC SEND Connect
-event_text=-%C10-%C11-%O$tDCC SEND connection established to %C11$1 %C14[%O$2%C14]%O
-
-event_name=DCC SEND Failed
-event_text=-%C10-%C11-%O$tDCC SEND %C11$1%O to %C11$2%O failed. $3
-
-event_name=DCC SEND Offer
-event_text=-%C10-%C11-%O$t%C11$1 %Chas offered %C11$2 %C(%C11$3 %Cbytes)
-
-event_name=DCC Stall
-event_text=-%C10-%C11-%O$tDCC $1 %C11$2 %Cto %C11$3 %Cstalled - aborting.
-
-event_name=DCC Timeout
-event_text=-%C10-%C11-%O$tDCC $1 %C11$2 %Cto %C11$3 %Ctimed out - aborting.
-
-event_name=Delete Notify
-event_text=-%C10-%C11-%O$t$1 deleted from notify list.
-
-event_name=Disconnected
-event_text=-%C10-%C11-%O$tDisconnected ($1).
-
-event_name=Found IP
-event_text=-%C10-%C11-%O$tFound your IP: [$1]
-
-event_name=Generic Message
-event_text=$1$t$2
-
-event_name=Ignore Add
-event_text=%O%C11$1%O added to ignore list.
-
-event_name=Ignore Changed
-event_text=Ignore on %C11$1%O changed.
-
-event_name=Ignore Footer
-event_text=%C08,02                                                              %O
-
-event_name=Ignore Header
-event_text=%C08,02 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG %O
-
-event_name=Ignore Remove
-event_text=%O%C11$1%O removed from ignore list.
-
-event_name=Ignorelist Empty
-event_text=  Ignore list is empty.
-
-event_name=Invite
-event_text=-%C10-%C11-%O$tCannot join%C11 %B$1 %O(Channel is invite only).
-
-event_name=Invited
-event_text=-%C10-%C11-%O$tYou have been invited to %C11$1%C by %C11$2%C (%C11$3%C)
-
-event_name=Join
-event_text=-%C10-%C11>%O$t%B$1%B %C14(%C10$3%C14)%C has joined $2
-
-event_name=Keyword
-event_text=-%C10-%C11-%O$tCannot join%C11 %B$1 %O(Requires keyword).
-
-event_name=Kick
-event_text=<%C10-%C11-%O$t$1 has kicked $2 from $3 ($4%O)
-
-event_name=Killed
-event_text=-%C10-%C11-%O$tYou have been killed by $1 ($2%O)
-
-event_name=Message Send
-event_text=%C3>%O$1%C3<%O$t$2%O
-
-event_name=Motd
-event_text=-%C10-%C11-%O$t$1%O
-
-event_name=MOTD Skipped
-event_text=-%C10-%C11-%O$tMOTD Skipped.
-
-event_name=Nick Clash
-event_text=-%C10-%C11-%O$t$1 already in use. Retrying with $2..
-
-event_name=Nick Failed
-event_text=-%C10-%C11-%O$tNickname already in use. Use /NICK to try another.
-
-event_name=No DCC
-event_text=-%C10-%C11-%O$tNo such DCC.
-
-event_name=No Running Process
-event_text=-%C10-%C11-%O$tNo process is currently running
-
-event_name=Notice
-event_text=%C12-%C13$1%C12-%O$t$2%O
-
-event_name=Notice Send
-event_text=%C3>%O$1%C3<%O$t$2%O
-
-event_name=Notify Empty
-event_text=-%C10-%C11-%O$tNotify list is empty.
-
-event_name=Notify Header
-event_text=%C08,02 %B-- Notify List --------------- %O
-
-event_name=Notify Number
-event_text=-%C10-%C11-%O$t$1 users in notify list.
-
-event_name=Notify Offline
-event_text=-%C10-%C11-%O$tNotify: $1 is offline ($2).
-
-event_name=Notify Online
-event_text=-%C10-%C11-%O$tNotify: $1 is online ($2).
-
-event_name=Part
-event_text=<%C10-%C11-%O$t$1 %C14(%O$2%C14)%C has left $3
-
-event_name=Part with Reason
-event_text=<%C10-%C11-%O$t$1 %C14(%O$2%C14)%C has left $3 %C14(%O$4%C14)%O
-
-event_name=Ping Reply
-event_text=-%C10-%C11-%O$tPing reply from $1 : $2 second(s)
-
-event_name=Ping Timeout
-event_text=-%C10-%C11-%O$tNo ping reply for $1 seconds, disconnecting.
-
-event_name=Private Message
-event_text=%C12*%C13$1%C12*$t%O$2%O
-
-event_name=Private Message to Dialog
-event_text=%C2<%O$1%C2>%O$t$2%O
-
-event_name=Process Already Running
-event_text=-%C10-%C11-%O$tA process is already running
-
-event_name=Quit
-event_text=<%C10-%C11-%O$t$1 has quit %C14(%O$2%O%C14)%O
-
-event_name=Raw Modes
-event_text=-%C10-%C11-%O$t$1 sets modes%B %C14[%O$2%B%C14]%O
-
-event_name=Receive Wallops
-event_text=%C12-%C13$1/Wallops%C12-%O$t$2%O
-
-event_name=Resolving User
-event_text=-%C10-%C11-%O$tLooking up IP number for%C11 $1%O..
-
-event_name=Server Connected
-event_text=-%C10-%C11-%O$tConnected.
-
-event_name=Server Error
-event_text=-%C10-%C11-%O$t$1%O
-
-event_name=Server Lookup
-event_text=-%C10-%C11-%O$tLooking up %C11$1%C..
-
-event_name=Server Notice
-event_text=-%C10-%C11-%O$t$1%O
-
-event_name=Server Text
-event_text=-%C10-%C11-%O$t$1%O
-
-event_name=Stop Connection
-event_text=-%C10-%C11-%O$tStopped previous connection attempt (pid=$1)
-
-event_name=Topic
-event_text=-%C10-%C11-%O$tTopic for %C11$1%C is %C11$2%O
-
-event_name=Topic Creation
-event_text=-%C10-%C11-%O$tTopic for %C11$1%C set by %C11$2%C at %C11$3%O
-
-event_name=Topic Change
-event_text=-%C10-%C11-%O$t$1 has changed the topic to: $2%O
-
-event_name=Unknown Host
-event_text=-%C10-%C11-%O$tUnknown host. Maybe you misspelled it?
-
-event_name=User Limit
-event_text=-%C10-%C11-%O$tCannot join%C11 %B$1 %O(User limit reached).
-
-event_name=Users On Channel
-event_text=-%C10-%C11-%O$t%C11Users on $1:%C $2
-
-event_name=WhoIs Away Line
-event_text=-%C10-%C11-%O$t%C12[%O$1%C12] %Cis away %C14(%O$2%O%C14)
-
-event_name=WhoIs Channel/Oper Line
-event_text=-%C10-%C11-%O$t%C12[%O$1%C12]%C $2
-
-event_name=WhoIs End
-event_text=-%C10-%C11-%O$t%C12[%O$1%C12] %CEnd of WHOIS list.
-
-event_name=WhoIs Identified
-event_text=-%C10-%C11-%O$t%C12[%O$1%C12] %O$2
-
-event_name=WhoIs Authenticated
-event_text=-%C10-%C11-%O$t%C12[%O$1%C12] %O$2 %C11$3%O
-
-event_name=WhoIs Real Host
-event_text=-%C10-%C11-%O$t%C12[%O$1%C12] %Oreal user@host %C11$2%O, real IP %C11$3%O
-
-event_name=WhoIs Idle Line
-event_text=-%C10-%C11-%O$t%C12[%O$1%C12]%O idle %C11$2%O
-
-event_name=WhoIs Idle Line with Signon
-event_text=-%C10-%C11-%O$t%C12[%O$1%C12]%O idle %C11$2%O, signon: %C11$3%O
-
-event_name=WhoIs Name Line
-event_text=-%C10-%C11-%O$t%C12[%O$1%C12] %C14(%O$2@$3%C14) %O: $4%O
-
-event_name=WhoIs Server Line
-event_text=-%C10-%C11-%O$t%C12[%O$1%C12]%O $2
-
-event_name=You Join
-event_text=-%C10-%C11>%O$t%BYou%B are now talking on %C11$2%O
-
-event_name=You Part
-event_text=-%C10-%C11-%O$tYou have left channel $3
-
-event_name=You Part with Reason
-event_text=-%C10-%C11-%O$tYou have left channel $3 %C14(%O$4%C14)%O
-
-event_name=You Kicked
-event_text=-%C10-%C11-%O$tYou have been kicked from $2 by $3 ($4%O)
-
-event_name=Your Invitation
-event_text=-%C10-%C11-%O$tYou're inviting %C11$1%C to %C11$2%C (%C11$3%C)
-
-event_name=Your Message
-event_text=%C6<%O$1%C6>%O$t$2%O
-
-event_name=Your Nick Changing
-event_text=-%C10-%C11-%O$tYou are now known as $2
-
diff --git a/build/themes/glyphed/colors.conf b/build/themes/glyphed/colors.conf
deleted file mode 100644
index 99bd783a..00000000
--- a/build/themes/glyphed/colors.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-color_0 = ffff ffff ffff
-color_1 = 0000 0000 0000
-color_2 = 2020 4a4a 8787
-color_3 = 4e4e 9a9a 0606
-color_4 = a4a4 0000 0000
-color_5 = efef 2929 2929
-color_6 = 5c5c 3535 6666
-color_7 = 8f8f 5959 0202
-color_8 = fcfc e9e9 4f4f
-color_9 = 8a8a e2e2 3434
-color_10 = 3434 6565 a4a4
-color_11 = 7575 5050 7b7b
-color_12 = 7272 7f7f cfcf
-color_13 = adad 7f7f a8a8
-color_14 = 5555 5757 5353
-color_15 = baba bdbd b6b6
-color_16 = ffff ffff ffff
-color_17 = 0000 0000 0000
-color_18 = 2020 4a4a 8787
-color_19 = 4e4e 9a9a 0606
-color_20 = a4a4 0000 0000
-color_21 = efef 2929 2929
-color_22 = 92ff 75ba 9a80
-color_23 = 8f8f 5959 0202
-color_24 = fcfc e9e9 4f4f
-color_25 = 8a8a e2e2 3434
-color_26 = 3434 6565 a4a4
-color_27 = 7575 5050 7b7b
-color_28 = 7272 7f7f cfcf
-color_29 = adad 7f7f a8a8
-color_30 = 5555 5757 5353
-color_31 = baba bdbd b6b6
-color_256 = ffff ffff ffff
-color_257 = 7373 d2d2 1616
-color_258 = eeee eeee ecec
-color_259 = 37be 37be 37be
-color_260 = a4a4 0000 0000
-color_261 = 50aa a403 0000
-color_262 = 2020 4a4a 8787
-color_263 = a4a4 0000 0000
-color_264 = 5555 5757 5353
diff --git a/build/themes/glyphed/pevents.conf b/build/themes/glyphed/pevents.conf
deleted file mode 100644
index 32e9ae9d..00000000
--- a/build/themes/glyphed/pevents.conf
+++ /dev/null
@@ -1,411 +0,0 @@
-event_name=Add Notify
-event_text=%C22❮▲❯%O$t$1 added to notify list.
-
-event_name=Ban List
-event_text=%C22❨○❩%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3
-
-event_name=Banned
-event_text=%C20❨✘❩$tCannot join %C21%B$1%B%C20 (You are banned).
-
-event_name=Beep
-event_text=
-
-event_name=Change Nick
-event_text=%C29❨❢❩$t$1 is now known as $2
-
-event_name=Channel Action
-event_text=%C22✽$t$3%C22$1 $2
-
-event_name=Channel Action Hilight
-event_text=%C21❢ ✽$t$3%C21$1%C22 $2
-
-event_name=Channel Ban
-event_text=%C20❮▲❯%O$t%C26$1%C21 sets ban on %C26$2
-
-event_name=Channel Creation
-event_text=%C22❨✽❩$tChannel $1 created on $2
-
-event_name=Channel DeHalfOp
-event_text=%C22❮▼❯%O$t%C26$1%O removes channel half-operator status from%C26 $2
-
-event_name=Channel DeOp
-event_text=%C22❮▼❯%O$t%C26$1%O removes channel operator status from%C26 $2
-
-event_name=Channel DeVoice
-event_text=%C22❮▼❯%O$t%C26$1%O removes voice from%C26 $2
-
-event_name=Channel Exempt
-event_text=%C22❮▲❯%O$t%C26$1%O sets exempt on %C26$2
-
-event_name=Channel Half-Operator
-event_text=%C25❮▲❯%O$t%C26$1%O gives channel half-operator status to%C26 $2
-
-event_name=Channel INVITE
-event_text=%C22❮▲❯%O$t%C26$1%O sets invite on %C26$2
-
-event_name=Channel List
-event_text=%UChannel          Users   Topic
-
-event_name=Channel Message
-event_text=%H<%H$4$3$1%O%H>%H$t$2
-
-event_name=Channel Mode Generic
-event_text=%C22❨❢❩%O$t$1 sets mode $2$3 $4
-
-event_name=Channel Modes
-event_text=%C22❨✽❩$t%C22Channel $1 modes: $2
-
-event_name=Channel Msg Hilight
-event_text=%B%H<%H$4$3$1%O%B%H>%H%O$t%C21$2
-
-event_name=Channel Notice
-event_text=%C28◄%C29$1/$2%C28►%O$t$3
-
-event_name=Channel Operator
-event_text=%C25❮▲❯%O$t%C26$1%O gives channel operator status to%C26 $2
-
-event_name=Channel Remove Exempt
-event_text=%C22❮▼❯%O$t%C26$1%O removes exempt on %C26$2
-
-event_name=Channel Remove Invite
-event_text=%C22❮▼❯%O$t%C26$1%O removes invite on %C26$2
-
-event_name=Channel Remove Keyword
-event_text=%C22❮▼❯%O$t%C26$1%O removes channel keyword
-
-event_name=Channel Remove Limit
-event_text=%C22❮▼❯%O$t%C26$1%O removes user limit
-
-event_name=Channel Set Key
-event_text=%C22❮▲❯%O$t%C26$1%O sets channel keyword to %C26$2
-
-event_name=Channel Set Limit
-event_text=%C22❮▲❯%O$t%C26$1%O sets channel limit to %C26$2
-
-event_name=Channel UnBan
-event_text=%C22❮▼❯%O$t%C26$1%O removes ban on %C26$2
-
-event_name=Channel Voice
-event_text=%C25❮▲❯%O$t%C26$1%O gives voice to%C26 $2
-
-event_name=Connected
-event_text=%C22❨❢❩%O$t%C22Connected. Now logging in...
-
-event_name=Connecting
-event_text=%C22❨✸❩%O$t%C22Connecting to $1 ($2) port $3%O...
-
-event_name=Connection Failed
-event_text=%C21❮✘❯%O$t%C21Connection failed. Error: $1
-
-event_name=CTCP Generic
-event_text=%C18❮◀❯$tReceived a CTCP $1 from $2
-
-event_name=CTCP Generic to Channel
-event_text=%C18❮◀❯$tReceived a CTCP $1 from $2 (to $3)
-
-event_name=CTCP Send
-event_text=%C19>%O$1%C19<%O$tCTCP $2
-
-event_name=CTCP Sound
-event_text=%C18❮◀❯$tReceived a CTCP Sound $1 from $2
-
-event_name=CTCP Sound to Channel
-event_text=%C18❮◀❯$tReceived a CTCP Sound $1 from $2 (to $3)
-
-event_name=DCC CHAT Abort
-event_text=%C22❨✘❩%O$tDCC CHAT to %C26$1%O aborted.
-
-event_name=DCC CHAT Connect
-event_text=%C22❨❢❩%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]
-
-event_name=DCC CHAT Failed
-event_text=%C22❨✘❩%O$tDCC CHAT to %C26$1%O lost ($4).
-
-event_name=DCC CHAT Offer
-event_text=%C22❨❣❩%O$tReceived a DCC CHAT offer from $1
-
-event_name=DCC CHAT Offering
-event_text=%C22❨❢❩%O$tOffering DCC CHAT to $1
-
-event_name=DCC CHAT Reoffer
-event_text=%C22❨❢❩%O$tAlready offering CHAT to $1
-
-event_name=DCC Conection Failed
-event_text=%C22❨✘❩%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3).
-
-event_name=DCC Generic Offer
-event_text=%C22━═━%O$tReceived '$1%O' from $2
-
-event_name=DCC Header
-event_text=%C24,18 Type  To/From    Status  Size    Pos     File         
-
-event_name=DCC Malformed
-event_text=%C22━▞━%O$tReceived a malformed DCC request from %C26$1%O.%010%C22▬▞▬%O$tContents of packet: $2
-
-event_name=DCC Offer
-event_text=%C22❨❢❩%O$tOffering%C26 $1%O to%C26 $2
-
-event_name=DCC Offer Not Valid
-event_text=%C22━▞━%O$tNo such DCC offer.
-
-event_name=DCC RECV Abort
-event_text=%C22❨✘❩%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted.
-
-event_name=DCC RECV Complete
-event_text=%C22❨✔❩%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O.
-
-event_name=DCC RECV Connect
-event_text=%C22❨✔❩%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]
-
-event_name=DCC RECV Failed
-event_text=%C22❨✘❩%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4).
-
-event_name=DCC RECV File Open Error
-event_text=%C22❨✘❩%O$tDCC RECV: Cannot open $1 for writing ($2).
-
-event_name=DCC Rename
-event_text=%C22❨❢❩%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead.
-
-event_name=DCC RESUME Request
-event_text=%C22❨❢❩%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C.
-
-event_name=DCC SEND Abort
-event_text=%C22❨✘❩%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted.
-
-event_name=DCC SEND Complete
-event_text=%C22❨✔❩%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O.
-
-event_name=DCC SEND Connect
-event_text=%C22❨✔❩%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]
-
-event_name=DCC SEND Failed
-event_text=%C22❨✘❩%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3
-
-event_name=DCC SEND Offer
-event_text=%C22❨❢❩%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)
-
-event_name=DCC Stall
-event_text=%C22❨✘❩%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting.
-
-event_name=DCC Timeout
-event_text=%C22❨✘❩%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting.
-
-event_name=Delete Notify
-event_text=%C22❮▼❯%O$t$1 deleted from notify list.
-
-event_name=Disconnected
-event_text=%C22❨✘❩%O$tDisconnected ($1).
-
-event_name=Found IP
-event_text=%C22❨✽❩%O$tFound your IP: [$1]
-
-event_name=Generic Message
-event_text=$1$t$2
-
-event_name=Ignore Add
-event_text=%O%C26$1%O added to ignore list.
-
-event_name=Ignore Changed
-event_text=Ignore on %C26$1%O changed.
-
-event_name=Ignore Footer
-event_text=%C24,18                                                              
-
-event_name=Ignore Header
-event_text=%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG 
-
-event_name=Ignore Remove
-event_text=%C22❮▼❯$t%O%C26$1%O removed from ignore list.
-
-event_name=Ignorelist Empty
-event_text=  Ignore list is empty.
-
-event_name=Invite
-event_text=%C22❨✘❩%O$tCannot join%C26 %B$1 %O(Channel is invite only).
-
-event_name=Invited
-event_text=%C22❨♥❩%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)
-
-event_name=Join
-event_text=%C19━━▶ Joins:$t$1 ($3)
-
-event_name=Keyword
-event_text=%C22❨✘❩%O$tCannot join%C26 %B$1 %O(Requires keyword).
-
-event_name=Kick
-event_text=%C21◢✘◣$t$2 was kicked by $1 ($4%O%C21)
-
-event_name=Killed
-event_text=%C20◂%C21✘%C20▸$tYou have been killed by $1 ($2%O%C20)
-
-event_name=Message Send
-event_text=%C19>%O$1%C19<%O$t$2%O
-
-event_name=Motd
-event_text=%C16✉%O$t$1%O
-
-event_name=MOTD Skipped
-event_text=%C22✘%O$t%C22MOTD Skipped.
-
-event_name=Nick Clash
-event_text=%C22❨❢❩%O$t$1 already in use. Retrying with $2...
-
-event_name=Nick Failed
-event_text=%C22❨❢❩%O$tNickname already in use. Use /NICK to try another.
-
-event_name=No DCC
-event_text=%C22❨✸❩%O$tNo such DCC.
-
-event_name=No Running Process
-event_text=%C22❨◯❩%O$tNo process is currently running
-
-event_name=Notice
-event_text=%C28◄%C29$1%C28►%O$t$2
-
-event_name=Notice Send
-event_text=%C19►%O$1%C19◀%O$t$2
-
-event_name=Notify Empty
-event_text=$tNotify list is empty.
-
-event_name=Notify Header
-event_text=%C24,18 %B  Notify List                           
-
-event_name=Notify Number
-event_text=%C22❨❢❩%O$t$1 users in notify list.
-
-event_name=Notify Offline
-event_text=%C22❨❢❩%O$tNotify: $1 is offline ($2).
-
-event_name=Notify Online
-event_text=%C22❨❢❩%O$tNotify: $1 is online ($2).
-
-event_name=Open Dialog
-event_text=
-
-event_name=Part
-event_text=%C24◀━━ Parts:$t$1 ($2)
-
-event_name=Part with Reason
-event_text=%C24◀━━ Parts:$t$1 ($2) ($4)
-
-event_name=Ping Reply
-event_text=%C22▬▭▬%O$tPing reply from $1: $2 second(s)
-
-event_name=Ping Timeout
-event_text=%C22━✘━%O$tNo ping reply for $1 seconds, disconnecting.
-
-event_name=Private Message
-event_text=%C28*%C29$3$1%C28*$t%O$2
-
-event_name=Private Message to Dialog
-event_text=(%C18$3$1%O)$t$2
-
-event_name=Process Already Running
-event_text=%C22❨❢❩%O$tA process is already running
-
-event_name=Quit
-event_text=%C23◀━━ Quits:$t$1 ($3) ($2)
-
-event_name=Raw Modes
-event_text=%C27❨✽❩$t$1 sets mode: $2
-
-event_name=Receive Wallops
-event_text=%C28-%C29$1/Wallops%C28-%O$t$2
-
-event_name=Resolving User
-event_text=%C22❨✽❩%O$tLooking up IP number for%C26 $1%O...
-
-event_name=Server Connected
-event_text=%C25❨✽❩%O$t%C22Connected.
-
-event_name=Server Error
-event_text=%C22❨✘❩%O$t$1
-
-event_name=Server Lookup
-event_text=%C22❨✽❩%O$t%C22Looking up $1
-
-event_name=Server Notice
-event_text=%C22❨☎❩%O$t$1
-
-event_name=Server Text
-event_text=%C22❨✉❩%O$t$1
-
-event_name=Stop Connection
-event_text=%C22❨✘❩%O$tStopped previous connection attempt (pid=$1)
-
-event_name=Topic
-event_text=%C29❨✽❩%O$t%C29Topic for $1%C %C29is: $2
-
-event_name=Topic Change
-event_text=%C22❨❢❩%C29$t$1 has changed the topic to: $2
-
-event_name=Topic Creation
-event_text=%C29❨✽❩%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3
-
-event_name=Unknown Host
-event_text=%C23❨❢❩%O$tUnknown host. Maybe you misspelled it?
-
-event_name=User Limit
-event_text=%C20❨✘❩%O$tCannot join%C26 %B$1 %O(User limit reached).
-
-event_name=Users On Channel
-event_text=%C22●%O$t%C26Users on $1:%C $2
-
-event_name=WhoIs Authenticated
-event_text=%C22●%O$t%C28[%O$1%C28] %O$2%C27 $3
-
-event_name=WhoIs Away Line
-event_text=%C22●%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)
-
-event_name=WhoIs Channel/Oper Line
-event_text=%C22●%O$t%C28[%O$1%C28]%O $2
-
-event_name=WhoIs End
-event_text=%C22●%O$t%C28[%O$1%C28] %OEnd of WHOIS list.
-
-event_name=WhoIs Identified
-event_text=%C22●%O$t%C28[%O$1%C28] %O$2
-
-event_name=WhoIs Idle Line
-event_text=%C22●%O$t%C28[%O$1%C28]%O idle%C26 $2
-
-event_name=WhoIs Idle Line with Signon
-event_text=%C22●%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3
-
-event_name=WhoIs Name Line
-event_text=%C22●%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4
-
-event_name=WhoIs Real Host
-event_text=%C22●%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3
-
-event_name=WhoIs Server Line
-event_text=%C22●%O$t%C28[%O$1%C28]%O $2
-
-event_name=WhoIs Special
-event_text=%C22●%O$t%C28[%O$1%C28]%O $2
-
-event_name=You Join
-event_text=%C19▕━▶$t%C19Now talking on $2
-
-event_name=You Kicked
-event_text=%C23◂%C20✘%C23▸$tYou have been kicked from $2 by $3 ($4%O%C23)
-
-event_name=You Part
-event_text=%C23◀━▏$tYou have left channel $3
-
-event_name=You Part with Reason
-event_text=%C23◀━▏$tYou have left channel $3 (%O%C23$4%O%C23)
-
-event_name=Your Action
-event_text=%C22✽$t$3%C29$1%C22 $2
-
-event_name=Your Invitation
-event_text=%C22❨♥❩%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)
-
-event_name=Your Message
-event_text=%H<%H%C18$4$3$1%O%H>%H$t$2
-
-event_name=Your Nick Changing
-event_text=%C22❨❢❩$tYou are now known as $2
-
diff --git a/build/xchat-wdk.iss b/build/xchat-wdk.iss
index 2e6db4fb..cfa608c6 100644
--- a/build/xchat-wdk.iss
+++ b/build/xchat-wdk.iss
@@ -54,10 +54,6 @@ Name: x64; Description: "x64"; GroupDescription: "XChat-WDK version:"; Flags: ex
 
 Name: portable; Description: "Yes"; GroupDescription: "Portable Install (no Registry entries, no Start Menu icons, no uninstaller):"; Flags: unchecked
 
-Name: thdefault; Description: "Default"; GroupDescription: "Theme (only for portable installs)"; Flags: exclusive
-Name: thblack; Description: "Black"; GroupDescription: "Theme (only for portable installs)"; Flags: exclusive unchecked
-Name: thglyphed; Description: "Simply Glyphed Tango Dark"; GroupDescription: "Theme (only for portable installs)"; Flags: exclusive unchecked
-
 Name: xtray; Description: "X-Tray"; GroupDescription: "Tray Icon"; Flags: exclusive
 Name: noxtray; Description: "Plugin-Tray"; GroupDescription: "Tray Icon"; Flags: exclusive unchecked
 
@@ -70,8 +66,6 @@ Source: "COPYING"; DestDir: "{app}"; Components: libs
 Source: "LICENSE.OPENSSL"; DestDir: "{app}"; Components: libs
 Source: "LICENSE.ZLIB"; DestDir: "{app}"; Components: libs
 Source: "portable-mode"; DestDir: "{app}"; Tasks: portable
-Source: "themes\glyphed\*"; DestDir: "{app}\config"; Tasks: thglyphed
-Source: "themes\black\*"; DestDir: "{app}\config"; Tasks: thblack
 Source: "etc\*"; DestDir: "{app}\etc"; Flags: createallsubdirs recursesubdirs; Components: libs
 Source: "locale\*"; DestDir: "{app}\locale"; Flags: createallsubdirs recursesubdirs; Components: translations
 Source: "share\*"; DestDir: "{app}\share"; Flags: createallsubdirs recursesubdirs; Components: translations
diff --git a/ext/openssl-wdk/build-x64.bat b/ext/openssl-wdk/build-x64.bat
index cc57f8d0..400310a1 100644
--- a/ext/openssl-wdk/build-x64.bat
+++ b/ext/openssl-wdk/build-x64.bat
@@ -1,7 +1,7 @@
 @echo off
 set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\ddk;c:\mozilla-build\build\openssl-1.0.0a\ms;c:\mozilla-build\build\zlib-x64\include
 set LIB=c:\WinDDK\7600.16385.1\lib\wnet\amd64;c:\WinDDK\7600.16385.1\lib\Crt\amd64;c:\mozilla-build\build\zlib-x64\lib
-set PATH=c:\WinDDK\7600.16385.1\bin\x86\amd64;c:\WinDDK\7600.16385.1\bin\x86;c:\Program Files\Microsoft SDKs\Windows\v6.0A\Bin;c:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin;c:\mozilla-build\perl-5.12-x64\bin;c:\Windows\System32;c:\mozilla-build\nasm;c:\mozilla-build\build\zlib-x64\bin\
+set PATH=c:\WinDDK\7600.16385.1\bin\x86\amd64;c:\WinDDK\7600.16385.1\bin\x86;c:\Program Files\Microsoft SDKs\Windows\v6.0A\Bin;c:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin;c:\mozilla-build\perl-5.12-x64\bin;c:\Windows\System32;c:\mozilla-build\nasm;c:\mozilla-build\build\zlib-x64\bin
 perl Configure VC-WIN64A enable-camellia no-asm zlib-dynamic --openssldir=c:/mozilla-build/build/openssl-wdk-1.0.0a-x64
 call ms\do_win64a
 nmake -f ms\ntdll.mak vclean
diff --git a/plugins/dns/makefile.mak b/plugins/dns/makefile.mak
deleted file mode 100644
index f1dd4c73..00000000
--- a/plugins/dns/makefile.mak
+++ /dev/null
@@ -1,19 +0,0 @@
-include "..\..\src\makeinc.mak"
-
-xcdns.dll: plugin-dns.obj dns.def
-	link $(LDFLAGS) /dll /out:xcdns.dll /def:dns.def plugin-dns.obj ws2_32.lib
-	dir xcdns.dll
-
-dns.def:
-	echo EXPORTS > dns.def
-	echo xchat_plugin_init >> dns.def
-	echo xchat_plugin_deinit >> dns.def
-
-plugin-dns.obj: plugin-dns.c makefile.mak thread.c
-	cl $(CFLAGS) /I.. -Dsnprintf=_snprintf plugin-dns.c
-
-clean:
-	del *.obj
-	del *.dll
-	del *.exp
-	del *.lib
diff --git a/plugins/dns/plugin-dns.c b/plugins/dns/plugin-dns.c
deleted file mode 100644
index 526c4368..00000000
--- a/plugins/dns/plugin-dns.c
+++ /dev/null
@@ -1,339 +0,0 @@
-/* XChat Win32 DNS Plugin
- * Copyright (C) 2003-2004 Peter Zelezny.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-/*
- * Requires MS Visual Studio and IPV6 headers to compile (run nmake).
- * Compiling with gcc (mingw) will fail due to missing gai_strerror.
- */
-
-#define DNS_VERSION "2.4"
-
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <fcntl.h>
-
-#define IPV6
-
-#ifdef _WIN32
-#ifdef IPV6
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#else
-#include <winsock2.h>
-#endif
-#else
-#include <netdb.h>
-#include <sys/socket.h>
-#endif
-
-#include "xchat-plugin.h"
-#include "thread.c"
-
-#define HELP "Usage: DNS <nickname|hostname|numerical address>\n"
-#define HEAD "\0034[DNS]\017\t"
-
-#define PIPE_READ 0
-#define PIPE_WRITE 1
-#define MAX_HOSTNAME 128
-
-static xchat_plugin *ph;
-static thread *active_thread = NULL;
-
-
-static int
-waitline (void *source, char *buf, int bufsize)
-{
-	int i = 0;
-	int len;
-
-	while(1)
-	{
-		len = 1;
-		/* we can't read() here, due to glib's giowin32 */
-		if(ph->xchat_read_fd(ph, source, buf + i, &len) != 0)
-			return -1;
-		if(buf[i] == '\n' || bufsize == i + 1)
-		{
-			buf[i] = 0;
-			return i;
-		}
-		i++;
-	}
-}
-
-static void *
-thread_function (void *ud)
-{
-#ifdef IPV6
-	struct addrinfo *ent;
-	struct addrinfo *cur;
-	struct addrinfo hints;
-#else
-	struct hostent *ent;
-#endif
-	thread *th = ud;
-	int fd = th->pipe_fd[PIPE_WRITE];
-	int ret;
-	char ipstring[MAX_HOSTNAME];
-	char reverse[MAX_HOSTNAME];
-//	int i;
-
-	active_thread = th;
-
-#ifdef IPV6
-	memset (&hints, 0, sizeof (hints));
-	hints.ai_family = PF_UNSPEC; /* support ipv6 and ipv4 */
-	hints.ai_flags = AI_CANONNAME;
-//	hints.ai_socktype = SOCK_STREAM;
-
-	ret = getaddrinfo (th->userdata, NULL, &hints, &ent);
-	if (ret != 0)
-	{
-		sprintf (ipstring, "1%d\n", ret);	/* failed */
-		write (fd, ipstring, strlen (ipstring));
-//		Sleep (3000);
-		active_thread = NULL;
-		return 0;
-	}
-
-//	i = 0;
-	cur = ent;
-	while (cur)
-	{
-		/* find the numeric IP number */
-		ipstring[0] = 0;
-		getnameinfo (cur->ai_addr, cur->ai_addrlen,
-						 ipstring, sizeof (ipstring), NULL, 0, NI_NUMERICHOST);
-
-		if (cur->ai_canonname)
-		{
-			/* force reverse lookup if canonname & ipstring are the same */
-			if (/*i == 0 &&*/ strcmp (cur->ai_canonname, ipstring) == 0)
-				goto lamecode;
-		}
-
-		if (cur->ai_canonname)
-		{
-			write (fd, "0", 1);
-			write (fd, ipstring, strlen (ipstring));
-			write (fd, "\n", 1);
-			write (fd, cur->ai_canonname, strlen (cur->ai_canonname));
-		} else
-		{
-lamecode:
-	//		ret = 1;
-	//		if (i == 0)
-			{
-				/* reverse lookup */
-				reverse[0] = 0;
-				ret = getnameinfo (cur->ai_addr, cur->ai_addrlen,
-							 reverse, sizeof (reverse), NULL, 0, NI_NAMEREQD);
-			}
-
-			write (fd, "0", 1);
-			write (fd, ipstring, strlen (ipstring));
-
-			write (fd, "\n", 1);
-			if (ret == 0)
-				write (fd, reverse, strlen (reverse));
-		}
-		write (fd, "\n", 1);
-
-//		i++;
-		cur = cur->ai_next;
-	}
-
-	/* tell the parent we're done */
-	write (fd, "2\n", 2);
-	freeaddrinfo (ent);
-
-#else
-	ent = gethostbyname (th->userdata);
-	if (ent)
-	{
-		write (fd, "0", 1);
-		write (fd, ent->h_name, strlen (ent->h_name));
-		write (fd, "\n", 1);
-		write (fd, ent->h_name, strlen (ent->h_name));
-		write (fd, "\n", 1);
-		write (fd, "2\n", 2);
-	} else
-	{
-		write (fd, "10\n", 1);
-	}
-#endif
-
-//	Sleep (3000);
-	active_thread = NULL;	/* race condition, better than nothing */
-
-	return 0;
-}
-
-static int
-dns_close_pipe (int fd)
-{
-	close (fd);
-	return 0;
-}
-
-/* read messages comming from the child (through the pipe) */
-
-static int
-dns_read_cb (int fd, int flags, thread *th, void *source)
-{
-	char buf[512];
-	char buf2[512];
-
-	while (waitline (source, buf, sizeof (buf)))
-	{
-		switch (buf[0])
-		{
-		case '0':		/* got data to show */
-			waitline (source, buf2, sizeof (buf2));
-			if (buf2[0] == 0)
-				xchat_printf(ph, HEAD"\002Numerical\002: %s\n", buf + 1);
-			else
-				xchat_printf(ph, HEAD"\002Canonical\002: %s \002Numerical\002: %s\n", buf2, buf + 1);
-			return 1;
-
-		case '1':		/* failed */
-			xchat_printf(ph, HEAD"Lookup failed. %s\n", gai_strerrorA (atoi (buf + 1)));
-
-		case '2':		/* done */
-		//	close (th->pipe_fd[PIPE_WRITE]);
-		//	close (th->pipe_fd[PIPE_READ]);
-			xchat_hook_timer(ph, 3000, dns_close_pipe, (void *)th->pipe_fd[PIPE_WRITE]);
-			xchat_hook_timer(ph, 4000, dns_close_pipe, (void *)th->pipe_fd[PIPE_READ]);
-			free (th->userdata); 	/* hostname strdup'ed */
-			free (th);
-			return 0;
-		}
-	}
-
-	return 1;
-}
-
-/* find hostname from nickname (search the userlist, current chan only) */
-
-static char *
-find_nick_host (char *nick)
-{
-	xchat_list *list;
-	char *at;
-	const char *host;
-
-	list = xchat_list_get (ph, "users");
-	if (!list)
-		return NULL;
-
-	while (xchat_list_next (ph, list))
-	{
-		if (stricmp (nick, xchat_list_str (ph, list, "nick")) == 0)
-		{
-			host = xchat_list_str (ph, list, "host");
-			if (host)
-			{
-				at = strrchr (host, '@');
-				if (at)
-					return at + 1;
-			}
-			break;
-		}
-	}
-
-	return NULL;
-}
-
-static int
-dns_cmd_cb (char *word[], char *word_eol[], void *ud)
-{
-	thread *th;
-	char *nickhost;
-
-	if (!word[2][0])
-	{
-		xchat_print (ph, HELP);
-		return XCHAT_EAT_ALL;
-	}
-
-	th = thread_new ();
-	if (th)
-	{
-		nickhost = find_nick_host (word[2]);
-		if (nickhost)
-		{
-			xchat_printf (ph, HEAD"Looking up %s (%s)...\n", nickhost, word[2]);
-			th->userdata = strdup (nickhost);
-		} else
-		{
-			xchat_printf (ph, HEAD"Looking up %s...\n", word[2]);
-			th->userdata = strdup (word[2]);
-		}
-
-		if (thread_start (th, thread_function, th))
-		{
-			xchat_hook_fd(ph, th->pipe_fd[PIPE_READ],
-							XCHAT_FD_READ | XCHAT_FD_EXCEPTION | XCHAT_FD_NOTSOCKET,
-							(void *)dns_read_cb, th);
-
-		}
-	}
-
-	return XCHAT_EAT_ALL;
-}
-
-int
-xchat_plugin_deinit (xchat_plugin *plugin_handle)
-{
-	while (active_thread)	/* children will set this var to NULL soon... */
-	{
-		Sleep (1000);
-	}
-	
-	xchat_print(ph, "DNS plugin unloaded\n");
-	return 1;
-}
-
-int
-#ifdef STATIC
-exec_plugin_init
-#else
-xchat_plugin_init
-#endif
-				(xchat_plugin *plugin_handle, char **plugin_name,
-				char **plugin_desc, char **plugin_version, char *arg)
-{
-	/* we need to save this for use with any xchat_* functions */
-	ph = plugin_handle;
-
-	/*if((void *)ph->xchat_read_fd == ph->dummy7)
-	{
-		xchat_print(ph, HEAD"This version of xchat is too old.\n");
-		return 0;
-	}*/
-
-	*plugin_name = "DNS";
-	*plugin_desc = "Threaded IPv4/6 DNS Command";
-	*plugin_version = DNS_VERSION;
-
-	xchat_hook_command(ph, "DNS", XCHAT_PRI_LOW, dns_cmd_cb, HELP, 0);
-
-	xchat_print(ph, "DNS plugin loaded\n");
-
-	return 1;       /* return 1 for success */
-}
diff --git a/plugins/dns/thread.c b/plugins/dns/thread.c
deleted file mode 100644
index aa153137..00000000
--- a/plugins/dns/thread.c
+++ /dev/null
@@ -1,111 +0,0 @@
-#include <stdlib.h>
-
-#define USE_PTHREAD
-
-#ifdef WIN32
-
-#include <windows.h>
-#define pthread_t DWORD
-#define pipe(a) _pipe(a,4096,_O_BINARY)
-
-#else
-#ifdef USE_PTHREAD
-
-#include <pthread.h>
-
-#else
-
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <signal.h>
-#define pthread_t int
-
-#endif
-#endif
-
-
-typedef struct
-{
-	pthread_t threadid;
-	int pipe_fd[2];
-	void *userdata;
-} thread;
-
-thread *
-thread_new (void)
-{
-	thread *th;
-
-	th = calloc (1, sizeof (*th));
-	if (!th)
-		return NULL;
-
-	if (pipe (th->pipe_fd) == -1)
-	{
-		free (th);
-		return NULL;
-	}
-
-#ifdef __EMX__ /* os/2 */
-	setmode (pipe_fd[0], O_BINARY);
-	setmode (pipe_fd[1], O_BINARY);
-#endif
-
-	return th;
-}
-
-int
-thread_start (thread *th, void *(*start_routine)(void *), void *arg)
-{
-	pthread_t id;
-
-#ifdef WIN32
-	CloseHandle (CreateThread (NULL, 0,
-										(LPTHREAD_START_ROUTINE)start_routine,
-										arg, 0, (DWORD *)&id));
-#else
-#ifdef USE_PTHREAD
-	if (pthread_create (&id, NULL, start_routine, arg) != 0)
-		return 0;
-#else
-	switch (id = fork ())
-	{
-	case -1:
-		return 0;
-	case 0:
-		/* this is the child */
-		setuid (getuid ());
-		start_routine (arg);
-		_exit (0);
-	}
-#endif
-#endif
-
-	th->threadid = id;
-
-	return 1;
-}
-
-/*void
-thread_kill (thread *th)
-{
-#ifdef WIN32
-	PostThreadMessage (th->threadid, WM_QUIT, 0, 0);
-#else
-#ifdef USE_PTHREAD
-	pthread_cancel (th->threadid);
-	pthread_join (th->threadid, (void *)&th);
-#else
-	kill (th->threadid, SIGKILL);
-	waitpid (th->threadid, NULL, 0);
-#endif
-#endif
-}
-
-void
-thread_free (thread *th)
-{
-	close (th->pipe_fd[0]);
-	close (th->pipe_fd[1]);
-	free (th);
-}*/
diff --git a/src/fe-gtk/makefile.mak b/src/fe-gtk/makefile.mak
index e3d1f972..4b1f1a21 100644
--- a/src/fe-gtk/makefile.mak
+++ b/src/fe-gtk/makefile.mak
@@ -11,9 +11,6 @@ PROG = xchat.exe
 
 all: $(PROG)
 
-mmx_cmod.o: mmx_cmod.S
-	gcc -DUNDERSCORE_SYMBOLS -c mmx_cmod.S
-
 .c.obj:
 	$(CC) $(CFLAGS) -I..\..\plugins $(GLIB) $(GTK) $(SPELL) $<
 
@@ -31,7 +28,6 @@ xchat-icon.obj: xchat.res
 
 clean:
 	@del *.obj
-	@del mmx_cmod.o
 	@del $(PROG)
 	@del xchat.rc
 	@del xchat.res
diff --git a/src/makefile.mak b/src/makefile.mak
index 88ac57d7..2826de8c 100644
--- a/src/makefile.mak
+++ b/src/makefile.mak
@@ -10,7 +10,6 @@ clean:
 	@del common\*.obj
 	@del common\xchatcommon.lib
 	@del fe-gtk\*.obj
-	@del fe-gtk\mmx_cmod.o
 	@del fe-gtk\xchat.exe
 	@del fe-gtk\xchat.rc
 	@del fe-gtk\xchat.res
diff --git a/src/makeinc.skel b/src/makeinc.skel
index ebaa9c22..becb9341 100644
--- a/src/makeinc.skel
+++ b/src/makeinc.skel
@@ -43,8 +43,6 @@ LDFLAGS = $(LDFLAGS) msvcrt_winxp.obj
 LUAPATH = c:\mozilla-build\build\lua-wdk-5.1.4-2-x86
 PYTHONPATH = c:\mozilla-build\python-2.6-x86
 TCLPATH = c:\mozilla-build\tcl-8.5-x86
-
-MMX = YES
 !endif
 #############################################################
 
@@ -113,8 +111,3 @@ textgui.obj \
 urlgrab.obj \
 userlistgui.obj \
 xtext.obj
-
-!ifdef MMX
-FEGTK_OBJECTS = $(FEGTK_OBJECTS) mmx_cmod.o
-CFLAGS = $(CFLAGS) -DUSE_MMX
-!endif
diff --git a/xchat-wdk.patch b/xchat-wdk.patch
index 4d358ce4..3ed2a5c0 100644
--- a/xchat-wdk.patch
+++ b/xchat-wdk.patch
@@ -187,15 +187,27 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/cfgfiles.c xchat-wdk/src
  	}
  	return xdir_fs;
  }
-@@ -461,6 +466,7 @@
+@@ -536,6 +541,7 @@
  
- #ifdef WIN32
- 	{"identd", P_OFFINT (identd), TYPE_BOOL},
+ 	{"tab_chans", P_OFFINT (tabchannels), TYPE_BOOL},
+ 	{"tab_dialogs", P_OFFINT (privmsgtab), TYPE_BOOL},
++	{"tab_icons", P_OFFINT (tab_icons), TYPE_BOOL},
+ 	{"tab_layout", P_OFFINT (tab_layout), TYPE_INT},
+ 	{"tab_new_to_front", P_OFFINT (newtabstofront), TYPE_INT},
+ 	{"tab_notices", P_OFFINT (notices_tabs), TYPE_BOOL},
+@@ -546,9 +552,11 @@
+ 	{"tab_sort", P_OFFINT (tab_sort), TYPE_BOOL},
+ 	{"tab_trunc", P_OFFINT (truncchans), TYPE_INT},
+ 	{"tab_utils", P_OFFINT (windows_as_tabs), TYPE_BOOL},
++	{"tab_xp", P_OFFINT (tab_xp), TYPE_BOOL},
+ 
+ 	{"text_background", P_OFFSET (background), TYPE_STR},
+ 	{"text_color_nicks", P_OFFINT (colorednicks), TYPE_BOOL},
 +	{"text_emoticons", P_OFFINT (emoticons), TYPE_BOOL},
- #endif
- 	{"input_balloon_chans", P_OFFINT (input_balloon_chans), TYPE_BOOL},
- 	{"input_balloon_hilight", P_OFFINT (input_balloon_hilight), TYPE_BOOL},
-@@ -648,6 +654,7 @@
+ 	{"text_font", P_OFFSET (font_normal), TYPE_STR},
+ 	{"text_indent", P_OFFINT (indent_nicks), TYPE_BOOL},
+ 	{"text_max_indent", P_OFFINT (max_auto_indent), TYPE_INT},
+@@ -648,6 +656,7 @@
  	prefs.dialog_height = 256;
  	prefs.gui_join_dialog = 1;
  	prefs.gui_quit_dialog = 1;
@@ -655,11 +667,13 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/xchat.h xchat-wdk/src/co
  #include <direct.h>
  #define	F_OK	0
  #define	X_OK	1
-@@ -297,6 +299,7 @@
+@@ -297,6 +299,9 @@
  	unsigned int confmode;
  	unsigned int utf8_locale;
  	unsigned int identd;
 +	unsigned int emoticons;
++	unsigned int tab_icons;
++	unsigned int tab_xp;
  
  	unsigned int ctcp_number_limit;	/*flood */
  	unsigned int ctcp_time_limit;	/*seconds of floods */
@@ -674,6 +688,15 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/about.c xchat-wdk/src/fe
  #include "palette.h"
  #include "pixmaps.h"
  #include "gtkutil.h"
+@@ -95,7 +96,7 @@
+ 	}
+ 
+ 	about = gtk_dialog_new ();
+-	gtk_window_set_position (GTK_WINDOW (about), GTK_WIN_POS_CENTER);
++	gtk_window_set_position (GTK_WINDOW (about), GTK_WIN_POS_CENTER_ON_PARENT);
+ 	gtk_window_set_resizable (GTK_WINDOW (about), FALSE);
+ 	gtk_window_set_title (GTK_WINDOW (about), _("About "DISPLAY_NAME));
+ 	if (parent_window)
 @@ -114,35 +115,38 @@
  	g_get_charset (&locale);
  	(snprintf) (buf, sizeof (buf),
@@ -956,7 +979,23 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/maingui.c xchat-wdk/src/
  }
  
  /* set a tab plain, red, light-red, or blue */
-@@ -2957,11 +2903,7 @@
+@@ -1190,7 +1136,14 @@
+ 						  "Close them all?"), i);
+ 		g_signal_connect (G_OBJECT (dialog), "response",
+ 								G_CALLBACK (mg_tab_close_cb), sess);
+-		gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
++		if (prefs.tab_layout)
++		{
++			gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
++		}
++		else
++		{
++			gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ON_PARENT);		
++		}
+ 		gtk_widget_show (dialog);
+ 	}
+ }
+@@ -2957,11 +2910,7 @@
  		gtk_xtext_check_marker_visibility (GTK_XTEXT (current_sess->gui->xtext));
  		plugin_emit_dummy_print (current_sess, "Focus Window");
  	}
@@ -968,7 +1007,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/maingui.c xchat-wdk/src/
  	return FALSE;
  }
  
-@@ -2972,11 +2914,7 @@
+@@ -2972,11 +2921,7 @@
  	if (!sess->server->server_session)
  		sess->server->server_session = sess;
  	gtk_xtext_check_marker_visibility(GTK_XTEXT (current_sess->gui->xtext));
@@ -1166,7 +1205,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/search.c xchat-wdk/src/f
  }
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/servlistgui.c xchat-wdk/src/fe-gtk/servlistgui.c
 --- xchat-wdk.orig/src/fe-gtk/servlistgui.c	2010-08-07 07:14:45 +0000
-+++ xchat-wdk/src/fe-gtk/servlistgui.c	2010-09-22 17:30:33 +0000
++++ xchat-wdk/src/fe-gtk/servlistgui.c	2010-09-25 00:29:23 +0000
 @@ -486,6 +486,41 @@
  	return FALSE;
  }
@@ -1229,6 +1268,15 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/servlistgui.c xchat-wdk/
  
  	gtk_widget_show (win);
  }
+@@ -1782,7 +1823,7 @@
+ 	gtk_container_add (GTK_CONTAINER (hbox), checkbutton_fav);
+ 	g_signal_connect (G_OBJECT (checkbutton_fav), "toggled",
+ 							G_CALLBACK (fav_servlist), 0);
+-	gtk_widget_show (checkbutton_fav);
++	/* gtk_widget_show (checkbutton_fav); don't show this until it's completed */
+ 
+ 	vbuttonbox2 = gtk_vbutton_box_new ();
+ 	gtk_box_set_spacing (GTK_BOX (vbuttonbox2), 3);
 @@ -1875,6 +1916,8 @@
  							"changed", G_CALLBACK (servlist_network_row_cb), NULL);
  	g_signal_connect (G_OBJECT (networks_tree), "key_press_event",