diff --git a/win32/copy/copy.vcxproj b/win32/copy/copy.vcxproj
index c5d96c31..6f4894af 100644
--- a/win32/copy/copy.vcxproj
+++ b/win32/copy/copy.vcxproj
@@ -62,72 +62,7 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
     <PreBuildEvent>
-      <Command>rmdir /q /s "$(HexChatDest)"
-mkdir "$(HexChatDest)"
-echo 2&gt; portable-mode
-move portable-mode "$(HexChatDest)"
-copy "$(OutDir)\hexchat.exe" "$(HexChatDest)"
-copy "$(OutDir)\hexchat-text.exe" "$(HexChatDest)"
-copy "$(OutDir)\thememan.exe" "$(HexChatDest)"
-copy "$(DepsRoot)\bin\libatk-1.0-0.dll" "$(HexChatDest)"
-copy "$(DepsRoot)\bin\libcairo-2.dll" "$(HexChatDest)"
-copy "$(DepsRoot)\bin\libexpat-1.dll" "$(HexChatDest)"
-copy "$(DepsRoot)\bin\libfontconfig-1.dll" "$(HexChatDest)"
-copy "$(DepsRoot)\bin\freetype6.dll" "$(HexChatDest)"
-copy "$(DepsRoot)\bin\libgdk_pixbuf-2.0-0.dll" "$(HexChatDest)"
-copy "$(DepsRoot)\bin\libgdk-win32-2.0-0.dll" "$(HexChatDest)"
-copy "$(DepsRoot)\bin\libgio-2.0-0.dll" "$(HexChatDest)"
-copy "$(DepsRoot)\bin\libglib-2.0-0.dll" "$(HexChatDest)"
-copy "$(DepsRoot)\bin\libgmodule-2.0-0.dll" "$(HexChatDest)"
-copy "$(DepsRoot)\bin\libgobject-2.0-0.dll" "$(HexChatDest)
-copy "$(DepsRoot)\bin\libgthread-2.0-0.dll" "$(HexChatDest)"
-copy "$(DepsRoot)\bin\libgtk-win32-2.0-0.dll" "$(HexChatDest)"
-copy "$(DepsRoot)\bin\intl.dll" "$(HexChatDest)"
-copy "$(DepsRoot)\bin\libpango-1.0-0.dll" "$(HexChatDest)"
-copy "$(DepsRoot)\bin\libpangocairo-1.0-0.dll" "$(HexChatDest)"
-copy "$(DepsRoot)\bin\libpangoft2-1.0-0.dll" "$(HexChatDest)"
-copy "$(DepsRoot)\bin\libpangowin32-1.0-0.dll" "$(HexChatDest)"
-copy "$(DepsRoot)\bin\libpng14-14.dll" "$(HexChatDest)"
-copy "$(DepsRoot)\bin\libxml2.dll" "$(HexChatDest)"
-xcopy /q /s /i "$(DepsRoot)\lib\gtk-2.0\2.10.0\engines" "$(HexChatDest)\lib\gtk-2.0\2.10.0\engines"
-xcopy /q /s /i "$(DepsRoot)\lib\gtk-2.0\modules\libgail.dll" "$(HexChatDest)\lib\gtk-2.0\modules\"
-xcopy /q /s /i etc "$(HexChatDest)\etc"
-xcopy /q /s /i share "$(HexChatDest)\share"
-copy "..\..\COPYING" "$(HexChatDest)"
-copy "$(DepsRoot)\LICENSE.OPENSSL" "$(HexChatDest)"
-copy "$(DepsRoot)\LICENSE.ZLIB" "$(HexChatDest)"
-copy "$(DepsRoot)\share\gettext\intl\COPYING.LIB-2.0" "$(HexChatDest)\LICENSE.GTK"
-copy "$(DepsRoot)\share\gettext\intl\COPYING.LIB-2.1" "$(HexChatDest)\LICENSE.CAIRO"
-copy "$(DepsRoot)\LICENSE.LUA" "$(HexChatDest)"
-copy "$(DepsRoot)\LICENSE.ENCHANT" "$(HexChatDest)"
-copy "$(DepsRoot)\LICENSE.LIBXML" "$(HexChatDest)"
-copy "$(DepsRoot)\bin\libeay32.dll" "$(HexChatDest)"
-copy "$(DepsRoot)\bin\ssleay32.dll" "$(HexChatDest)"
-copy "$(DepsRoot)\bin\zlib1.dll" "$(HexChatDest)"
-copy "$(DepsRoot)\bin\cert.pem" "$(HexChatDest)"
-copy "$(DepsRoot)\bin\libenchant.dll" "$(HexChatDest)"
-xcopy /q /s /i "$(DepsRoot)\lib\enchant\libenchant_myspell.dll" "$(HexChatDest)\lib\enchant\"
-xcopy /q /s /i "$(OutDir)hcchecksum.dll" "$(HexChatDest)\plugins\"
-copy "$(OutDir)\hcdns.dll" "$(HexChatDest)\plugins"
-copy "$(OutDir)\hcdoat.dll" "$(HexChatDest)\plugins"
-copy "$(OutDir)\hcexec.dll" "$(HexChatDest)\plugins"
-copy "$(OutDir)\hcfishlim.dll" "$(HexChatDest)\plugins"
-copy "$(OutDir)\hclua.dll" "$(HexChatDest)\plugins"
-copy "$(OutDir)\hcperl-512.dll" "$(HexChatDest)\plugins"
-copy "$(OutDir)\hcperl-514.dll" "$(HexChatDest)\plugins"
-copy "$(OutDir)\hcperl-516.dll" "$(HexChatDest)\plugins"
-copy "$(OutDir)\hcpython.dll" "$(HexChatDest)\plugins"
-copy "$(OutDir)\hctcl.dll" "$(HexChatDest)\plugins"
-copy "$(OutDir)\hcupd.dll" "$(HexChatDest)\plugins"
-copy "$(OutDir)\hcsasl.dll" "$(HexChatDest)\plugins"
-copy "$(OutDir)\hextray.dll" "$(HexChatDest)\plugins"
-copy "$(OutDir)\hcwinamp.dll" "$(HexChatDest)\plugins"
-copy "$(OutDir)\hcwinsys.dll" "$(HexChatDest)\plugins"
-copy "$(OutDir)\hcwmpa.dll" "$(HexChatDest)\plugins"
-copy "$(DepsRoot)\bin\lua51.dll" "$(HexChatDest)"
-xcopy /q /s /i "$(OutDir)\locale" "$(HexChatDest)\locale"
-xcopy /q /s /i "$(DepsRoot)\share\locale" "$(HexChatDest)\share\locale"
-copy "$(ProgramFiles)\Codejock Software\ISSkin\ISSkinU.dll" "$(HexChatDest)"
+      <Command>$(HexChatCopy)
 copy "..\installer\watercolorlite-green.cjstyles" "$(HexChatDest)"</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
@@ -144,72 +79,7 @@ copy "..\installer\watercolorlite-green.cjstyles" "$(HexChatDest)"</Command>
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
     <PreBuildEvent>
-      <Command>rmdir /q /s "$(HexChatDest)"
-mkdir "$(HexChatDest)"
-echo 2&gt; portable-mode
-move portable-mode "$(HexChatDest)"
-copy "$(OutDir)\hexchat.exe" "$(HexChatDest)"
-copy "$(OutDir)\hexchat-text.exe" "$(HexChatDest)"
-copy "$(OutDir)\thememan.exe" "$(HexChatDest)"
-copy "$(DepsRoot)\bin\libatk-1.0-0.dll" "$(HexChatDest)"
-copy "$(DepsRoot)\bin\libcairo-2.dll" "$(HexChatDest)"
-copy "$(DepsRoot)\bin\libexpat-1.dll" "$(HexChatDest)"
-copy "$(DepsRoot)\bin\libfontconfig-1.dll" "$(HexChatDest)"
-copy "$(DepsRoot)\bin\libfreetype-6.dll" "$(HexChatDest)"
-copy "$(DepsRoot)\bin\libgdk_pixbuf-2.0-0.dll" "$(HexChatDest)"
-copy "$(DepsRoot)\bin\libgdk-win32-2.0-0.dll" "$(HexChatDest)"
-copy "$(DepsRoot)\bin\libgio-2.0-0.dll" "$(HexChatDest)"
-copy "$(DepsRoot)\bin\libglib-2.0-0.dll" "$(HexChatDest)"
-copy "$(DepsRoot)\bin\libgmodule-2.0-0.dll" "$(HexChatDest)"
-copy "$(DepsRoot)\bin\libgobject-2.0-0.dll" "$(HexChatDest)
-copy "$(DepsRoot)\bin\libgthread-2.0-0.dll" "$(HexChatDest)"
-copy "$(DepsRoot)\bin\libgtk-win32-2.0-0.dll" "$(HexChatDest)"
-copy "$(DepsRoot)\bin\libintl-8.dll" "$(HexChatDest)"
-copy "$(DepsRoot)\bin\libpango-1.0-0.dll" "$(HexChatDest)"
-copy "$(DepsRoot)\bin\libpangocairo-1.0-0.dll" "$(HexChatDest)"
-copy "$(DepsRoot)\bin\libpangoft2-1.0-0.dll" "$(HexChatDest)"
-copy "$(DepsRoot)\bin\libpangowin32-1.0-0.dll" "$(HexChatDest)"
-copy "$(DepsRoot)\bin\libpng14-14.dll" "$(HexChatDest)"
-copy "$(DepsRoot)\bin\libxml2.dll" "$(HexChatDest)"
-xcopy /q /s /i "$(DepsRoot)\lib\gtk-2.0\2.10.0\engines" "$(HexChatDest)\lib\gtk-2.0\2.10.0\engines"
-xcopy /q /s /i "$(DepsRoot)\lib\gtk-2.0\modules\libgail.dll" "$(HexChatDest)\lib\gtk-2.0\modules\"
-xcopy /q /s /i etc "$(HexChatDest)\etc"
-xcopy /q /s /i share "$(HexChatDest)\share"
-copy "..\..\COPYING" "$(HexChatDest)"
-copy "$(DepsRoot)\LICENSE.OPENSSL" "$(HexChatDest)"
-copy "$(DepsRoot)\LICENSE.ZLIB" "$(HexChatDest)"
-copy "$(DepsRoot)\share\gettext\intl\COPYING.LIB-2.0" "$(HexChatDest)\LICENSE.GTK"
-copy "$(DepsRoot)\share\gettext\intl\COPYING.LIB-2.1" "$(HexChatDest)\LICENSE.CAIRO"
-copy "$(DepsRoot)\LICENSE.LUA" "$(HexChatDest)"
-copy "$(DepsRoot)\LICENSE.ENCHANT" "$(HexChatDest)"
-copy "$(DepsRoot)\LICENSE.LIBXML" "$(HexChatDest)"
-copy "$(DepsRoot)\bin\libeay32.dll" "$(HexChatDest)"
-copy "$(DepsRoot)\bin\ssleay32.dll" "$(HexChatDest)"
-copy "$(DepsRoot)\bin\zlib1.dll" "$(HexChatDest)"
-copy "$(DepsRoot)\bin\cert.pem" "$(HexChatDest)"
-copy "$(DepsRoot)\bin\libenchant.dll" "$(HexChatDest)"
-xcopy /q /s /i "$(DepsRoot)\lib\enchant\libenchant_myspell.dll" "$(HexChatDest)\lib\enchant\"
-xcopy /q /s /i "$(OutDir)hcchecksum.dll" "$(HexChatDest)\plugins\"
-copy "$(OutDir)\hcdns.dll" "$(HexChatDest)\plugins"
-copy "$(OutDir)\hcdoat.dll" "$(HexChatDest)\plugins"
-copy "$(OutDir)\hcexec.dll" "$(HexChatDest)\plugins"
-copy "$(OutDir)\hcfishlim.dll" "$(HexChatDest)\plugins"
-copy "$(OutDir)\hclua.dll" "$(HexChatDest)\plugins"
-copy "$(OutDir)\hcperl-512.dll" "$(HexChatDest)\plugins"
-copy "$(OutDir)\hcperl-514.dll" "$(HexChatDest)\plugins"
-copy "$(OutDir)\hcperl-516.dll" "$(HexChatDest)\plugins"
-copy "$(OutDir)\hcpython.dll" "$(HexChatDest)\plugins"
-copy "$(OutDir)\hctcl.dll" "$(HexChatDest)\plugins"
-copy "$(OutDir)\hcupd.dll" "$(HexChatDest)\plugins"
-copy "$(OutDir)\hcsasl.dll" "$(HexChatDest)\plugins"
-copy "$(OutDir)\hextray.dll" "$(HexChatDest)\plugins"
-copy "$(OutDir)\hcwinamp.dll" "$(HexChatDest)\plugins"
-copy "$(OutDir)\hcwinsys.dll" "$(HexChatDest)\plugins"
-copy "$(OutDir)\hcwmpa.dll" "$(HexChatDest)\plugins"
-copy "$(DepsRoot)\bin\lua51.dll" "$(HexChatDest)"
-xcopy /q /s /i "$(OutDir)\locale" "$(HexChatDest)\locale"
-xcopy /q /s /i "$(DepsRoot)\share\locale" "$(HexChatDest)\share\locale"
-copy "$(ProgramFiles)\Codejock Software\ISSkin\ISSkinU.dll" "$(HexChatDest)"
+      <Command>$(HexChatCopy)
 copy "..\installer\watercolorlite-blue.cjstyles" "$(HexChatDest)"</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
diff --git a/win32/hexchat-xp.props b/win32/hexchat-xp.props
index cfb7fc57..70f4616e 100644
--- a/win32/hexchat-xp.props
+++ b/win32/hexchat-xp.props
@@ -35,7 +35,7 @@
     <Gtk>$(DepsRoot)\include\gtk-2.0;$(DepsRoot)\lib\gtk-2.0\include;$(DepsRoot)\include\atk-1.0;$(DepsRoot)\include\cairo;$(DepsRoot)\include\pango-1.0;$(DepsRoot)\include\gdk-pixbuf-2.0</Gtk>
     <Pixmaps>bookpng "$(SolutionDir)\..\src\pixmaps\book.png" hoppng "$(SolutionDir)\..\src\pixmaps\hop.png" oppng "$(SolutionDir)\..\src\pixmaps\op.png" purplepng "$(SolutionDir)\..\src\pixmaps\purple.png" redpng "$(SolutionDir)\..\src\pixmaps\red.png" trayfilepng "$(SolutionDir)\..\src\pixmaps\fileoffer.png" trayhilightpng "$(SolutionDir)\..\src\pixmaps\highlight.png" traymsgpng "$(SolutionDir)\..\src\pixmaps\message.png" voicepng "$(SolutionDir)\..\src\pixmaps\voice.png" hexchatpng "$(SolutionDir)\..\hexchat.png"</Pixmaps>
     <DepLibs>gtk-win32-2.0.lib;gdk-win32-2.0.lib;atk-1.0.lib;gio-2.0.lib;gdk_pixbuf-2.0.lib;pangowin32-1.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;gobject-2.0.lib;gmodule-2.0.lib;glib-2.0.lib;libintl.lib;libxml2.lib;libeay32.lib;ssleay32.lib;wininet.lib;winmm.lib;ws2_32.lib</DepLibs>
-    <HexChatDest>$(SolutionDir)build\$(PlatformName)\rel</HexChatDest>
+    <HexChatDest>$(SolutionDir)build-xp\$(PlatformName)\rel</HexChatDest>
   </PropertyGroup>
   <ItemDefinitionGroup />
   <ItemGroup />
diff --git a/win32/hexchat.props b/win32/hexchat.props
index 3ecf176d..a10d5951 100644
--- a/win32/hexchat.props
+++ b/win32/hexchat.props
@@ -36,6 +36,81 @@
     <Pixmaps>bookpng "$(SolutionDir)\..\src\pixmaps\book.png" hoppng "$(SolutionDir)\..\src\pixmaps\hop.png" oppng "$(SolutionDir)\..\src\pixmaps\op.png" purplepng "$(SolutionDir)\..\src\pixmaps\purple.png" redpng "$(SolutionDir)\..\src\pixmaps\red.png" trayfilepng "$(SolutionDir)\..\src\pixmaps\fileoffer.png" trayhilightpng "$(SolutionDir)\..\src\pixmaps\highlight.png" traymsgpng "$(SolutionDir)\..\src\pixmaps\message.png" voicepng "$(SolutionDir)\..\src\pixmaps\voice.png" hexchatpng "$(SolutionDir)\..\hexchat.png"</Pixmaps>
     <DepLibs>gtk-win32-2.0.lib;gdk-win32-2.0.lib;atk-1.0.lib;gio-2.0.lib;gdk_pixbuf-2.0.lib;pangowin32-1.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;gobject-2.0.lib;gmodule-2.0.lib;glib-2.0.lib;libintl.lib;libxml2.lib;libeay32.lib;ssleay32.lib;wininet.lib;winmm.lib;ws2_32.lib</DepLibs>
     <HexChatDest>$(SolutionDir)build\$(PlatformName)\rel</HexChatDest>
+	<HexChatCopy>
+rmdir /q /s "$(HexChatDest)"
+mkdir "$(HexChatDest)"
+echo 2&gt; portable-mode
+move portable-mode "$(HexChatDest)"
+copy "$(OutDir)\hexchat.exe" "$(HexChatDest)"
+copy "$(OutDir)\hexchat-text.exe" "$(HexChatDest)"
+copy "$(OutDir)\thememan.exe" "$(HexChatDest)"
+copy "$(DepsRoot)\bin\atk-1.0.dll" "$(HexChatDest)"
+copy "$(DepsRoot)\bin\cairo.dll" "$(HexChatDest)"
+copy "$(DepsRoot)\bin\fontconfig.dll" "$(HexChatDest)"
+copy "$(DepsRoot)\bin\gdk_pixbuf-2.0.dll" "$(HexChatDest)"
+copy "$(DepsRoot)\bin\gdk-win32-2.0.dll" "$(HexChatDest)"
+copy "$(DepsRoot)\bin\gio-2.0.dll" "$(HexChatDest)"
+copy "$(DepsRoot)\bin\glib-2.0.dll" "$(HexChatDest)"
+copy "$(DepsRoot)\bin\gmodule-2.0.dll" "$(HexChatDest)"
+copy "$(DepsRoot)\bin\gobject-2.0.dll" "$(HexChatDest)
+copy "$(DepsRoot)\bin\gthread-2.0.dll" "$(HexChatDest)"
+copy "$(DepsRoot)\bin\gtk-win32-2.0.dll" "$(HexChatDest)"
+copy "$(DepsRoot)\bin\libintl.dll" "$(HexChatDest)"
+copy "$(DepsRoot)\bin\libpng15.dll" "$(HexChatDest)"
+copy "$(DepsRoot)\bin\libxml2.dll" "$(HexChatDest)"
+copy "$(DepsRoot)\bin\pango-1.0.dll" "$(HexChatDest)"
+copy "$(DepsRoot)\bin\pangocairo-1.0.dll" "$(HexChatDest)"
+copy "$(DepsRoot)\bin\pangoft2-1.0.dll" "$(HexChatDest)"
+copy "$(DepsRoot)\bin\pangowin32-1.0.dll" "$(HexChatDest)"
+xcopy /q /s /i "$(DepsRoot)\lib\gtk-2.0\2.10.0\engines" "$(HexChatDest)\lib\gtk-2.0\2.10.0\engines"
+xcopy /q /s /i "$(DepsRoot)\lib\gtk-2.0\modules\libgail.dll" "$(HexChatDest)\lib\gtk-2.0\modules\"
+xcopy /q /s /i etc "$(HexChatDest)\etc"
+xcopy /q /s /i share "$(HexChatDest)\share"
+copy "..\..\COPYING" "$(HexChatDest)"
+copy "$(DepsRoot)\LICENSE.ATK" "$(HexChatDest)\share"
+copy "$(DepsRoot)\LICENSE.CAIRO" "$(HexChatDest)\share"
+copy "$(DepsRoot)\LICENSE.ENCHANT" "$(HexChatDest)\share"
+copy "$(DepsRoot)\LICENSE.FONTCONFIG" "$(HexChatDest)\share"
+copy "$(DepsRoot)\LICENSE.FREETYPE" "$(HexChatDest)\share"
+copy "$(DepsRoot)\LICENSE.GDKPIXBUF" "$(HexChatDest)\share"
+copy "$(DepsRoot)\LICENSE.GETTEXT" "$(HexChatDest)\share"
+copy "$(DepsRoot)\LICENSE.GLIB" "$(HexChatDest)\share"
+copy "$(DepsRoot)\LICENSE.GTK" "$(HexChatDest)\share"
+copy "$(DepsRoot)\LICENSE.LIBFFI" "$(HexChatDest)\share"
+copy "$(DepsRoot)\LICENSE.LIBPNG" "$(HexChatDest)\share"
+copy "$(DepsRoot)\LICENSE.LIBXML2" "$(HexChatDest)\share"
+copy "$(DepsRoot)\LICENSE.OPENSSL" "$(HexChatDest)\share"
+copy "$(DepsRoot)\LICENSE.PANGO" "$(HexChatDest)\share"
+copy "$(DepsRoot)\LICENSE.PIXMAN" "$(HexChatDest)\share"
+copy "$(DepsRoot)\LICENSE.ZLIB" "$(HexChatDest)\share"
+copy "$(DepsRoot)\bin\libeay32.dll" "$(HexChatDest)"
+copy "$(DepsRoot)\bin\ssleay32.dll" "$(HexChatDest)"
+copy "$(DepsRoot)\bin\zlib1.dll" "$(HexChatDest)"
+copy "$(DepsRoot)\bin\cert.pem" "$(HexChatDest)"
+copy "$(DepsRoot)\bin\libenchant.dll" "$(HexChatDest)"
+xcopy /q /s /i "$(DepsRoot)\lib\enchant\libenchant_myspell.dll" "$(HexChatDest)\lib\enchant\"
+xcopy /q /s /i "$(OutDir)hcchecksum.dll" "$(HexChatDest)\plugins\"
+copy "$(OutDir)\hcdns.dll" "$(HexChatDest)\plugins"
+copy "$(OutDir)\hcdoat.dll" "$(HexChatDest)\plugins"
+copy "$(OutDir)\hcexec.dll" "$(HexChatDest)\plugins"
+copy "$(OutDir)\hcfishlim.dll" "$(HexChatDest)\plugins"
+copy "$(OutDir)\hclua.dll" "$(HexChatDest)\plugins"
+copy "$(OutDir)\hcperl-512.dll" "$(HexChatDest)\plugins"
+copy "$(OutDir)\hcperl-514.dll" "$(HexChatDest)\plugins"
+copy "$(OutDir)\hcperl-516.dll" "$(HexChatDest)\plugins"
+copy "$(OutDir)\hcpython.dll" "$(HexChatDest)\plugins"
+copy "$(OutDir)\hctcl.dll" "$(HexChatDest)\plugins"
+copy "$(OutDir)\hcupd.dll" "$(HexChatDest)\plugins"
+copy "$(OutDir)\hcsasl.dll" "$(HexChatDest)\plugins"
+copy "$(OutDir)\hextray.dll" "$(HexChatDest)\plugins"
+copy "$(OutDir)\hcwinamp.dll" "$(HexChatDest)\plugins"
+copy "$(OutDir)\hcwinsys.dll" "$(HexChatDest)\plugins"
+copy "$(OutDir)\hcwmpa.dll" "$(HexChatDest)\plugins"
+copy "$(DepsRoot)\bin\lua51.dll" "$(HexChatDest)"
+xcopy /q /s /i "$(OutDir)\locale" "$(HexChatDest)\locale"
+xcopy /q /s /i "$(DepsRoot)\share\locale" "$(HexChatDest)\share\locale"
+copy "$(ProgramFiles)\Codejock Software\ISSkin\ISSkinU.dll" "$(HexChatDest)"
+	</HexChatCopy>
   </PropertyGroup>
   <ItemDefinitionGroup />
   <ItemGroup />