diff --git a/build/config/colors.conf b/build/config/colors.conf
new file mode 100644
index 00000000..b5917137
--- /dev/null
+++ b/build/config/colors.conf
@@ -0,0 +1,41 @@
+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/config/palette.conf b/build/config/palette.conf
new file mode 100644
index 00000000..6e6263b0
--- /dev/null
+++ b/build/config/palette.conf
@@ -0,0 +1,72 @@
+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/config/pevents.conf b/build/config/pevents.conf
new file mode 100644
index 00000000..6d22238d
--- /dev/null
+++ b/build/config/pevents.conf
@@ -0,0 +1,396 @@
+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/release-x86.bat b/build/release-x86.bat
index 3bef1277..803e988b 100644
--- a/build/release-x86.bat
+++ b/build/release-x86.bat
@@ -29,6 +29,7 @@ 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 config %XCHAT_DEST%\config
 copy ..\COPYING %XCHAT_DEST%
 copy %SSL_BIN%\..\LICENSE.OPENSSL %XCHAT_DEST%
 copy %SSL_BIN%\..\LICENSE.ZLIB %XCHAT_DEST%
diff --git a/build/xchat-wdk.iss b/build/xchat-wdk.iss
index 95f61d6c..134235bf 100644
--- a/build/xchat-wdk.iss
+++ b/build/xchat-wdk.iss
@@ -1,9 +1,9 @@
 [Setup]
 AppName=XChat-WDK
-AppVerName=XChat-WDK r1464-2
-AppVersion=14.64.2
-VersionInfoVersion=14.64.2
-OutputBaseFilename=XChat-WDK r1464-2
+AppVerName=XChat-WDK r1464-3
+AppVersion=14.64.3
+VersionInfoVersion=14.64.3
+OutputBaseFilename=XChat-WDK r1464-3
 AppPublisher=XChat-WDK
 AppPublisherURL=http://code.google.com/p/xchat-wdk/
 AppCopyright=Copyright (C) 1998-2010 Peter Zelezny
@@ -22,8 +22,8 @@ SourceDir=..\..\xchat-wdk-uni
 OutputDir=..\xchat-wdk\build
 FlatComponentsList=no
 PrivilegesRequired=none
-CreateUninstallRegKey=not IsTaskSelected('portablemode')
-Uninstallable=not IsTaskSelected('portablemode')
+CreateUninstallRegKey=not IsTaskSelected('portable')
+Uninstallable=not IsTaskSelected('portable')
 ArchitecturesAllowed=x86 x64
 ArchitecturesInstallIn64BitMode=x64
 
@@ -43,9 +43,10 @@ Name: "plugins\python"; Description: "Python (needs ActivePython 2.6)"; Types: f
 Name: "plugins\tcl"; Description: "Tcl (needs ActiveTcl 8.5)"; Types: full custom
 
 [Tasks]
-Name: portablemode; Description: "Yes"; GroupDescription: "Portable Install (no Registry entries, no Start Menu icons, no uninstaller):"; Flags: unchecked
 Name: x86; Description: "x86"; GroupDescription: "XChat-WDK version:"; Flags: exclusive unchecked
 Name: x64; Description: "x64"; GroupDescription: "XChat-WDK version:"; Flags: exclusive; Check: Is64BitInstallMode
+Name: portable; Description: "Portable (no Registry entries, no Start Menu icons, no uninstaller)"; GroupDescription: "XChat-WDK version:"; Flags: unchecked
+Name: portable\blacktheme; Description: "Black Theme"; Flags: unchecked dontinheritcheck
 Name: perl58; Description: "5.8"; GroupDescription: "ActivePerl version:"; Flags: exclusive unchecked; Components: plugins\perl
 Name: perl510; Description: "5.10"; GroupDescription: "ActivePerl version:"; Flags: exclusive unchecked; Components: plugins\perl
 Name: perl512; Description: "5.12"; GroupDescription: "ActivePerl version:"; Flags: exclusive; Components: plugins\perl
@@ -54,7 +55,8 @@ Name: perl512; Description: "5.12"; GroupDescription: "ActivePerl version:"; Fla
 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: portablemode
+Source: "portable-mode"; DestDir: "{app}"; Tasks: portable
+Source: "config\*"; DestDir: "{app}\config"; Tasks: portable\blacktheme
 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
@@ -179,8 +181,8 @@ Source: "plugins\xcperl-512.dll"; DestDir: "{app}\plugins"; DestName: "xcperl.dl
 Source: "plugins\xcperl-512.dll.x64"; DestDir: "{app}\plugins"; DestName: "xcperl.dll"; Components: plugins\perl; Tasks: x64 and perl512
 
 [Icons]
-Name: "{group}\XChat-WDK"; Filename: "{app}\xchat.exe"; Tasks: not portablemode
-Name: "{group}\Uninstall XChat-WDK"; Filename: "{uninstallexe}"; Tasks: not portablemode
+Name: "{group}\XChat-WDK"; Filename: "{app}\xchat.exe"; Tasks: not portable
+Name: "{group}\Uninstall XChat-WDK"; Filename: "{uninstallexe}"; Tasks: not portable
 
 [Messages]
 BeveledLabel= XChat-WDK
@@ -236,7 +238,7 @@ end;
 /////////////////////////////////////////////////////////////////////
 procedure CurStepChanged(CurStep: TSetupStep);
 begin
-  if not (IsTaskSelected('portablemode')) then
+  if not (IsTaskSelected('portable')) then
   begin
     if (CurStep=ssInstall) then
     begin
diff --git a/config.h b/config.h
index 649f54e1..4219f14c 100644
--- a/config.h
+++ b/config.h
@@ -6,7 +6,7 @@
 #define USE_GTKSPELL
 #endif*/
 #define PACKAGE_NAME "xchat"
-#define PACKAGE_VERSION "r1464-2"
+#define PACKAGE_VERSION "r1464-3"
 #define XCHATLIBDIR "."
 #define XCHATSHAREDIR "."
 #define OLD_PERL