diff --git a/win32/copy/copy-xp.vcxproj b/win32/copy/copy-xp.vcxproj
index d763f7e3..0d77753a 100644
--- a/win32/copy/copy-xp.vcxproj
+++ b/win32/copy/copy-xp.vcxproj
@@ -63,72 +63,9 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
     <PreBuildEvent>
-      <Command>rmdir /q /s "$(HexChatRel)"
-mkdir "$(HexChatRel)"
-echo 2&gt; portable-mode
-move portable-mode "$(HexChatRel)"
-copy "$(OutDir)\hexchat.exe" "$(HexChatRel)"
-copy "$(OutDir)\hexchat-text.exe" "$(HexChatRel)"
-copy "$(OutDir)\thememan.exe" "$(HexChatRel)"
-copy "$(DepsRoot)\bin\libatk-1.0-0.dll" "$(HexChatRel)"
-copy "$(DepsRoot)\bin\libcairo-2.dll" "$(HexChatRel)"
-copy "$(DepsRoot)\bin\libexpat-1.dll" "$(HexChatRel)"
-copy "$(DepsRoot)\bin\libfontconfig-1.dll" "$(HexChatRel)"
+      <Command>$(HexChatCopy)
 copy "$(DepsRoot)\bin\freetype6.dll" "$(HexChatRel)"
-copy "$(DepsRoot)\bin\libgdk_pixbuf-2.0-0.dll" "$(HexChatRel)"
-copy "$(DepsRoot)\bin\libgdk-win32-2.0-0.dll" "$(HexChatRel)"
-copy "$(DepsRoot)\bin\libgio-2.0-0.dll" "$(HexChatRel)"
-copy "$(DepsRoot)\bin\libglib-2.0-0.dll" "$(HexChatRel)"
-copy "$(DepsRoot)\bin\libgmodule-2.0-0.dll" "$(HexChatRel)"
-copy "$(DepsRoot)\bin\libgobject-2.0-0.dll" "$(HexChatRel)
-copy "$(DepsRoot)\bin\libgthread-2.0-0.dll" "$(HexChatRel)"
-copy "$(DepsRoot)\bin\libgtk-win32-2.0-0.dll" "$(HexChatRel)"
 copy "$(DepsRoot)\bin\intl.dll" "$(HexChatRel)"
-copy "$(DepsRoot)\bin\libpango-1.0-0.dll" "$(HexChatRel)"
-copy "$(DepsRoot)\bin\libpangocairo-1.0-0.dll" "$(HexChatRel)"
-copy "$(DepsRoot)\bin\libpangoft2-1.0-0.dll" "$(HexChatRel)"
-copy "$(DepsRoot)\bin\libpangowin32-1.0-0.dll" "$(HexChatRel)"
-copy "$(DepsRoot)\bin\libpng14-14.dll" "$(HexChatRel)"
-copy "$(DepsRoot)\bin\libxml2.dll" "$(HexChatRel)"
-xcopy /q /s /i "$(DepsRoot)\lib\gtk-2.0\2.10.0\engines" "$(HexChatRel)\lib\gtk-2.0\2.10.0\engines"
-xcopy /q /s /i "$(DepsRoot)\lib\gtk-2.0\modules\libgail.dll" "$(HexChatRel)\lib\gtk-2.0\modules\"
-xcopy /q /s /i etc "$(HexChatRel)\etc"
-xcopy /q /s /i share "$(HexChatRel)\share"
-copy "..\..\COPYING" "$(HexChatRel)"
-copy "$(DepsRoot)\LICENSE.OPENSSL" "$(HexChatRel)"
-copy "$(DepsRoot)\LICENSE.ZLIB" "$(HexChatRel)"
-copy "$(DepsRoot)\share\gettext\intl\COPYING.LIB-2.0" "$(HexChatRel)\LICENSE.GTK"
-copy "$(DepsRoot)\share\gettext\intl\COPYING.LIB-2.1" "$(HexChatRel)\LICENSE.CAIRO"
-copy "$(DepsRoot)\LICENSE.LUA" "$(HexChatRel)"
-copy "$(DepsRoot)\LICENSE.ENCHANT" "$(HexChatRel)"
-copy "$(DepsRoot)\LICENSE.LIBXML" "$(HexChatRel)"
-copy "$(DepsRoot)\bin\libeay32.dll" "$(HexChatRel)"
-copy "$(DepsRoot)\bin\ssleay32.dll" "$(HexChatRel)"
-copy "$(DepsRoot)\bin\zlib1.dll" "$(HexChatRel)"
-copy "$(DepsRoot)\bin\cert.pem" "$(HexChatRel)"
-copy "$(DepsRoot)\bin\libenchant.dll" "$(HexChatRel)"
-xcopy /q /s /i "$(DepsRoot)\lib\enchant\libenchant_myspell.dll" "$(HexChatRel)\lib\enchant\"
-xcopy /q /s /i "$(OutDir)hcchecksum.dll" "$(HexChatRel)\plugins\"
-copy "$(OutDir)\hcdns.dll" "$(HexChatRel)\plugins"
-copy "$(OutDir)\hcdoat.dll" "$(HexChatRel)\plugins"
-copy "$(OutDir)\hcexec.dll" "$(HexChatRel)\plugins"
-copy "$(OutDir)\hcfishlim.dll" "$(HexChatRel)\plugins"
-copy "$(OutDir)\hclua.dll" "$(HexChatRel)\plugins"
-copy "$(OutDir)\hcperl-512.dll" "$(HexChatRel)\plugins"
-copy "$(OutDir)\hcperl-514.dll" "$(HexChatRel)\plugins"
-copy "$(OutDir)\hcperl-516.dll" "$(HexChatRel)\plugins"
-copy "$(OutDir)\hcpython.dll" "$(HexChatRel)\plugins"
-copy "$(OutDir)\hctcl.dll" "$(HexChatRel)\plugins"
-copy "$(OutDir)\hcupd.dll" "$(HexChatRel)\plugins"
-copy "$(OutDir)\hcsasl.dll" "$(HexChatRel)\plugins"
-copy "$(OutDir)\hextray.dll" "$(HexChatRel)\plugins"
-copy "$(OutDir)\hcwinamp.dll" "$(HexChatRel)\plugins"
-copy "$(OutDir)\hcwinsys.dll" "$(HexChatRel)\plugins"
-copy "$(OutDir)\hcwmpa.dll" "$(HexChatRel)\plugins"
-copy "$(DepsRoot)\bin\lua51.dll" "$(HexChatRel)"
-xcopy /q /s /i "$(OutDir)\locale" "$(HexChatRel)\locale"
-xcopy /q /s /i "$(DepsRoot)\share\locale" "$(HexChatRel)\share\locale"
-copy "$(ProgramFiles)\Codejock Software\ISSkin\ISSkinU.dll" "$(HexChatRel)"
 copy "..\installer\watercolorlite-green.cjstyles" "$(HexChatRel)"</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
@@ -145,72 +82,9 @@ copy "..\installer\watercolorlite-green.cjstyles" "$(HexChatRel)"</Command>
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
     <PreBuildEvent>
-      <Command>rmdir /q /s "$(HexChatRel)"
-mkdir "$(HexChatRel)"
-echo 2&gt; portable-mode
-move portable-mode "$(HexChatRel)"
-copy "$(OutDir)\hexchat.exe" "$(HexChatRel)"
-copy "$(OutDir)\hexchat-text.exe" "$(HexChatRel)"
-copy "$(OutDir)\thememan.exe" "$(HexChatRel)"
-copy "$(DepsRoot)\bin\libatk-1.0-0.dll" "$(HexChatRel)"
-copy "$(DepsRoot)\bin\libcairo-2.dll" "$(HexChatRel)"
-copy "$(DepsRoot)\bin\libexpat-1.dll" "$(HexChatRel)"
-copy "$(DepsRoot)\bin\libfontconfig-1.dll" "$(HexChatRel)"
+      <Command>$(HexChatCopy)
 copy "$(DepsRoot)\bin\libfreetype-6.dll" "$(HexChatRel)"
-copy "$(DepsRoot)\bin\libgdk_pixbuf-2.0-0.dll" "$(HexChatRel)"
-copy "$(DepsRoot)\bin\libgdk-win32-2.0-0.dll" "$(HexChatRel)"
-copy "$(DepsRoot)\bin\libgio-2.0-0.dll" "$(HexChatRel)"
-copy "$(DepsRoot)\bin\libglib-2.0-0.dll" "$(HexChatRel)"
-copy "$(DepsRoot)\bin\libgmodule-2.0-0.dll" "$(HexChatRel)"
-copy "$(DepsRoot)\bin\libgobject-2.0-0.dll" "$(HexChatRel)
-copy "$(DepsRoot)\bin\libgthread-2.0-0.dll" "$(HexChatRel)"
-copy "$(DepsRoot)\bin\libgtk-win32-2.0-0.dll" "$(HexChatRel)"
 copy "$(DepsRoot)\bin\libintl-8.dll" "$(HexChatRel)"
-copy "$(DepsRoot)\bin\libpango-1.0-0.dll" "$(HexChatRel)"
-copy "$(DepsRoot)\bin\libpangocairo-1.0-0.dll" "$(HexChatRel)"
-copy "$(DepsRoot)\bin\libpangoft2-1.0-0.dll" "$(HexChatRel)"
-copy "$(DepsRoot)\bin\libpangowin32-1.0-0.dll" "$(HexChatRel)"
-copy "$(DepsRoot)\bin\libpng14-14.dll" "$(HexChatRel)"
-copy "$(DepsRoot)\bin\libxml2.dll" "$(HexChatRel)"
-xcopy /q /s /i "$(DepsRoot)\lib\gtk-2.0\2.10.0\engines" "$(HexChatRel)\lib\gtk-2.0\2.10.0\engines"
-xcopy /q /s /i "$(DepsRoot)\lib\gtk-2.0\modules\libgail.dll" "$(HexChatRel)\lib\gtk-2.0\modules\"
-xcopy /q /s /i etc "$(HexChatRel)\etc"
-xcopy /q /s /i share "$(HexChatRel)\share"
-copy "..\..\COPYING" "$(HexChatRel)"
-copy "$(DepsRoot)\LICENSE.OPENSSL" "$(HexChatRel)"
-copy "$(DepsRoot)\LICENSE.ZLIB" "$(HexChatRel)"
-copy "$(DepsRoot)\share\gettext\intl\COPYING.LIB-2.0" "$(HexChatRel)\LICENSE.GTK"
-copy "$(DepsRoot)\share\gettext\intl\COPYING.LIB-2.1" "$(HexChatRel)\LICENSE.CAIRO"
-copy "$(DepsRoot)\LICENSE.LUA" "$(HexChatRel)"
-copy "$(DepsRoot)\LICENSE.ENCHANT" "$(HexChatRel)"
-copy "$(DepsRoot)\LICENSE.LIBXML" "$(HexChatRel)"
-copy "$(DepsRoot)\bin\libeay32.dll" "$(HexChatRel)"
-copy "$(DepsRoot)\bin\ssleay32.dll" "$(HexChatRel)"
-copy "$(DepsRoot)\bin\zlib1.dll" "$(HexChatRel)"
-copy "$(DepsRoot)\bin\cert.pem" "$(HexChatRel)"
-copy "$(DepsRoot)\bin\libenchant.dll" "$(HexChatRel)"
-xcopy /q /s /i "$(DepsRoot)\lib\enchant\libenchant_myspell.dll" "$(HexChatRel)\lib\enchant\"
-xcopy /q /s /i "$(OutDir)hcchecksum.dll" "$(HexChatRel)\plugins\"
-copy "$(OutDir)\hcdns.dll" "$(HexChatRel)\plugins"
-copy "$(OutDir)\hcdoat.dll" "$(HexChatRel)\plugins"
-copy "$(OutDir)\hcexec.dll" "$(HexChatRel)\plugins"
-copy "$(OutDir)\hcfishlim.dll" "$(HexChatRel)\plugins"
-copy "$(OutDir)\hclua.dll" "$(HexChatRel)\plugins"
-copy "$(OutDir)\hcperl-512.dll" "$(HexChatRel)\plugins"
-copy "$(OutDir)\hcperl-514.dll" "$(HexChatRel)\plugins"
-copy "$(OutDir)\hcperl-516.dll" "$(HexChatRel)\plugins"
-copy "$(OutDir)\hcpython.dll" "$(HexChatRel)\plugins"
-copy "$(OutDir)\hctcl.dll" "$(HexChatRel)\plugins"
-copy "$(OutDir)\hcupd.dll" "$(HexChatRel)\plugins"
-copy "$(OutDir)\hcsasl.dll" "$(HexChatRel)\plugins"
-copy "$(OutDir)\hextray.dll" "$(HexChatRel)\plugins"
-copy "$(OutDir)\hcwinamp.dll" "$(HexChatRel)\plugins"
-copy "$(OutDir)\hcwinsys.dll" "$(HexChatRel)\plugins"
-copy "$(OutDir)\hcwmpa.dll" "$(HexChatRel)\plugins"
-copy "$(DepsRoot)\bin\lua51.dll" "$(HexChatRel)"
-xcopy /q /s /i "$(OutDir)\locale" "$(HexChatRel)\locale"
-xcopy /q /s /i "$(DepsRoot)\share\locale" "$(HexChatRel)\share\locale"
-copy "$(ProgramFiles)\Codejock Software\ISSkin\ISSkinU.dll" "$(HexChatRel)"
 copy "..\installer\watercolorlite-blue.cjstyles" "$(HexChatRel)"</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
diff --git a/win32/hexchat-xp.props b/win32/hexchat-xp.props
index de41b504..9fa5baf6 100644
--- a/win32/hexchat-xp.props
+++ b/win32/hexchat-xp.props
@@ -39,6 +39,72 @@
     <HexChatBin>$(HexChatBuild)\$(PlatformName)\bin\</HexChatBin>
     <HexChatObj>$(HexChatBuild)\$(PlatformName)\obj\</HexChatObj>
     <HexChatRel>$(HexChatBuild)\$(PlatformName)\rel</HexChatRel>
+	<HexChatCopy>
+rmdir /q /s "$(HexChatRel)"
+mkdir "$(HexChatRel)"
+echo 2&gt; portable-mode
+move portable-mode "$(HexChatRel)"
+copy "$(OutDir)\hexchat.exe" "$(HexChatRel)"
+copy "$(OutDir)\hexchat-text.exe" "$(HexChatRel)"
+copy "$(OutDir)\thememan.exe" "$(HexChatRel)"
+copy "$(DepsRoot)\bin\libatk-1.0-0.dll" "$(HexChatRel)"
+copy "$(DepsRoot)\bin\libcairo-2.dll" "$(HexChatRel)"
+copy "$(DepsRoot)\bin\libexpat-1.dll" "$(HexChatRel)"
+copy "$(DepsRoot)\bin\libfontconfig-1.dll" "$(HexChatRel)"
+copy "$(DepsRoot)\bin\libgdk_pixbuf-2.0-0.dll" "$(HexChatRel)"
+copy "$(DepsRoot)\bin\libgdk-win32-2.0-0.dll" "$(HexChatRel)"
+copy "$(DepsRoot)\bin\libgio-2.0-0.dll" "$(HexChatRel)"
+copy "$(DepsRoot)\bin\libglib-2.0-0.dll" "$(HexChatRel)"
+copy "$(DepsRoot)\bin\libgmodule-2.0-0.dll" "$(HexChatRel)"
+copy "$(DepsRoot)\bin\libgobject-2.0-0.dll" "$(HexChatRel)
+copy "$(DepsRoot)\bin\libgthread-2.0-0.dll" "$(HexChatRel)"
+copy "$(DepsRoot)\bin\libgtk-win32-2.0-0.dll" "$(HexChatRel)"
+copy "$(DepsRoot)\bin\libpango-1.0-0.dll" "$(HexChatRel)"
+copy "$(DepsRoot)\bin\libpangocairo-1.0-0.dll" "$(HexChatRel)"
+copy "$(DepsRoot)\bin\libpangoft2-1.0-0.dll" "$(HexChatRel)"
+copy "$(DepsRoot)\bin\libpangowin32-1.0-0.dll" "$(HexChatRel)"
+copy "$(DepsRoot)\bin\libpng14-14.dll" "$(HexChatRel)"
+copy "$(DepsRoot)\bin\libxml2.dll" "$(HexChatRel)"
+xcopy /q /s /i "$(DepsRoot)\lib\gtk-2.0\2.10.0\engines" "$(HexChatRel)\lib\gtk-2.0\2.10.0\engines"
+xcopy /q /s /i "$(DepsRoot)\lib\gtk-2.0\modules\libgail.dll" "$(HexChatRel)\lib\gtk-2.0\modules\"
+xcopy /q /s /i etc "$(HexChatRel)\etc"
+xcopy /q /s /i share "$(HexChatRel)\share"
+copy "..\..\COPYING" "$(HexChatRel)"
+copy "$(DepsRoot)\LICENSE.OPENSSL" "$(HexChatRel)"
+copy "$(DepsRoot)\LICENSE.ZLIB" "$(HexChatRel)"
+copy "$(DepsRoot)\share\gettext\intl\COPYING.LIB-2.0" "$(HexChatRel)\LICENSE.GTK"
+copy "$(DepsRoot)\share\gettext\intl\COPYING.LIB-2.1" "$(HexChatRel)\LICENSE.CAIRO"
+copy "$(DepsRoot)\LICENSE.LUA" "$(HexChatRel)"
+copy "$(DepsRoot)\LICENSE.ENCHANT" "$(HexChatRel)"
+copy "$(DepsRoot)\LICENSE.LIBXML" "$(HexChatRel)"
+copy "$(DepsRoot)\bin\libeay32.dll" "$(HexChatRel)"
+copy "$(DepsRoot)\bin\ssleay32.dll" "$(HexChatRel)"
+copy "$(DepsRoot)\bin\zlib1.dll" "$(HexChatRel)"
+copy "$(DepsRoot)\bin\cert.pem" "$(HexChatRel)"
+copy "$(DepsRoot)\bin\libenchant.dll" "$(HexChatRel)"
+xcopy /q /s /i "$(DepsRoot)\lib\enchant\libenchant_myspell.dll" "$(HexChatRel)\lib\enchant\"
+xcopy /q /s /i "$(OutDir)hcchecksum.dll" "$(HexChatRel)\plugins\"
+copy "$(OutDir)\hcdns.dll" "$(HexChatRel)\plugins"
+copy "$(OutDir)\hcdoat.dll" "$(HexChatRel)\plugins"
+copy "$(OutDir)\hcexec.dll" "$(HexChatRel)\plugins"
+copy "$(OutDir)\hcfishlim.dll" "$(HexChatRel)\plugins"
+copy "$(OutDir)\hclua.dll" "$(HexChatRel)\plugins"
+copy "$(OutDir)\hcperl-512.dll" "$(HexChatRel)\plugins"
+copy "$(OutDir)\hcperl-514.dll" "$(HexChatRel)\plugins"
+copy "$(OutDir)\hcperl-516.dll" "$(HexChatRel)\plugins"
+copy "$(OutDir)\hcpython.dll" "$(HexChatRel)\plugins"
+copy "$(OutDir)\hctcl.dll" "$(HexChatRel)\plugins"
+copy "$(OutDir)\hcupd.dll" "$(HexChatRel)\plugins"
+copy "$(OutDir)\hcsasl.dll" "$(HexChatRel)\plugins"
+copy "$(OutDir)\hextray.dll" "$(HexChatRel)\plugins"
+copy "$(OutDir)\hcwinamp.dll" "$(HexChatRel)\plugins"
+copy "$(OutDir)\hcwinsys.dll" "$(HexChatRel)\plugins"
+copy "$(OutDir)\hcwmpa.dll" "$(HexChatRel)\plugins"
+copy "$(DepsRoot)\bin\lua51.dll" "$(HexChatRel)"
+xcopy /q /s /i "$(OutDir)\locale" "$(HexChatRel)\locale"
+xcopy /q /s /i "$(DepsRoot)\share\locale" "$(HexChatRel)\share\locale"
+copy "$(ProgramFiles)\Codejock Software\ISSkin\ISSkinU.dll" "$(HexChatRel)"
+	</HexChatCopy>
   </PropertyGroup>
   <ItemDefinitionGroup />
   <ItemGroup />