Rebranding on the file level

8 files changed, 218 insertions, 218 deletions

diff --git a/win32/copy/copy.vcxproj b/win32/copy/copy.vcxproj
index 7a3cf9d9..799ee8bf 100644
--- a/win32/copy/copy.vcxproj
+++ b/win32/copy/copy.vcxproj
@@ -34,11 +34,11 @@
   </ImportGroup>

   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-    <Import Project="..\xchat.props" />

+    <Import Project="..\hexchat.props" />

   </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-    <Import Project="..\xchat.props" />

+    <Import Project="..\hexchat.props" />

   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

@@ -62,74 +62,74 @@
       <OptimizeReferences>true</OptimizeReferences>

     </Link>

     <PreBuildEvent>

-      <Command>rmdir /q /s "$(XChatDest)"

-mkdir "$(XChatDest)"

+      <Command>rmdir /q /s "$(HexChatDest)"

+mkdir "$(HexChatDest)"

 echo 2&gt; portable-mode

-move portable-mode "$(XChatDest)"

-copy "$(OutDir)\xchat.exe" "$(XChatDest)"

-copy "$(OutDir)\xchat-text.exe" "$(XChatDest)"

-copy "$(OutDir)\thememan.exe" "$(XChatDest)"

-copy "$(DepsRoot)\bin\libatk-1.0-0.dll" "$(XChatDest)"

-copy "$(DepsRoot)\bin\libcairo-2.dll" "$(XChatDest)"

-copy "$(DepsRoot)\bin\libexpat-1.dll" "$(XChatDest)"

-copy "$(DepsRoot)\bin\libfontconfig-1.dll" "$(XChatDest)"

-copy "$(DepsRoot)\bin\freetype6.dll" "$(XChatDest)"

-copy "$(DepsRoot)\bin\libgdk_pixbuf-2.0-0.dll" "$(XChatDest)"

-copy "$(DepsRoot)\bin\libgdk-win32-2.0-0.dll" "$(XChatDest)"

-copy "$(DepsRoot)\bin\libgio-2.0-0.dll" "$(XChatDest)"

-copy "$(DepsRoot)\bin\libglib-2.0-0.dll" "$(XChatDest)"

-copy "$(DepsRoot)\bin\libgmodule-2.0-0.dll" "$(XChatDest)"

-copy "$(DepsRoot)\bin\libgobject-2.0-0.dll" "$(XChatDest)

-copy "$(DepsRoot)\bin\libgthread-2.0-0.dll" "$(XChatDest)"

-copy "$(DepsRoot)\bin\libgtk-win32-2.0-0.dll" "$(XChatDest)"

-copy "$(DepsRoot)\bin\intl.dll" "$(XChatDest)"

-copy "$(DepsRoot)\bin\libpango-1.0-0.dll" "$(XChatDest)"

-copy "$(DepsRoot)\bin\libpangocairo-1.0-0.dll" "$(XChatDest)"

-copy "$(DepsRoot)\bin\libpangoft2-1.0-0.dll" "$(XChatDest)"

-copy "$(DepsRoot)\bin\libpangowin32-1.0-0.dll" "$(XChatDest)"

-copy "$(DepsRoot)\bin\libpng14-14.dll" "$(XChatDest)"

-copy "$(DepsRoot)\bin\libxml2.dll" "$(XChatDest)"

-xcopy /q /s /i "$(DepsRoot)\lib\gtk-2.0\2.10.0\engines" "$(XChatDest)\lib\gtk-2.0\2.10.0\engines"

-xcopy /q /s /i "$(DepsRoot)\lib\gtk-2.0\modules\libgail.dll" "$(XChatDest)\lib\gtk-2.0\modules\"

-xcopy /q /s /i etc "$(XChatDest)\etc"

-xcopy /q /s /i share "$(XChatDest)\share"

-copy "..\..\COPYING" "$(XChatDest)"

-copy "$(DepsRoot)\LICENSE.OPENSSL" "$(XChatDest)"

-copy "$(DepsRoot)\LICENSE.ZLIB" "$(XChatDest)"

-copy "$(DepsRoot)\share\gettext\intl\COPYING.LIB-2.0" "$(XChatDest)\LICENSE.GTK"

-copy "$(DepsRoot)\share\gettext\intl\COPYING.LIB-2.1" "$(XChatDest)\LICENSE.CAIRO"

-copy "$(DepsRoot)\LICENSE.LUA" "$(XChatDest)"

-copy "$(DepsRoot)\LICENSE.ENCHANT" "$(XChatDest)"

-copy "$(DepsRoot)\LICENSE.LIBXML" "$(XChatDest)"

-copy "$(DepsRoot)\bin\libeay32.dll" "$(XChatDest)"

-copy "$(DepsRoot)\bin\ssleay32.dll" "$(XChatDest)"

-copy "$(DepsRoot)\bin\zlib1.dll" "$(XChatDest)"

-copy "$(DepsRoot)\bin\cert.pem" "$(XChatDest)"

-copy "$(DepsRoot)\bin\libenchant.dll" "$(XChatDest)"

-xcopy /q /s /i "$(DepsRoot)\lib\enchant\libenchant_myspell.dll" "$(XChatDest)\lib\enchant\"

-xcopy /q /s /i "$(OutDir)xcchecksum.dll" "$(XChatDest)\plugins\"

-copy "$(OutDir)\xcdns.dll" "$(XChatDest)\plugins"

-copy "$(OutDir)\xcdoat.dll" "$(XChatDest)\plugins"

-copy "$(OutDir)\xcexec.dll" "$(XChatDest)\plugins"

-copy "$(OutDir)\xcfishlim.dll" "$(XChatDest)\plugins"

-copy "$(OutDir)\xclua.dll" "$(XChatDest)\plugins"

-copy "$(OutDir)\xcmpcinfo.dll" "$(XChatDest)\plugins"

-copy "$(OutDir)\xcperl-512.dll" "$(XChatDest)\plugins"

-copy "$(OutDir)\xcperl-514.dll" "$(XChatDest)\plugins"

-copy "$(OutDir)\xcperl-516.dll" "$(XChatDest)\plugins"

-copy "$(OutDir)\xcpython.dll" "$(XChatDest)\plugins"

-copy "$(OutDir)\xctcl.dll" "$(XChatDest)\plugins"

-copy "$(OutDir)\xcupd.dll" "$(XChatDest)\plugins"

-copy "$(OutDir)\xcxsasl.dll" "$(XChatDest)\plugins"

-copy "$(OutDir)\xtray.dll" "$(XChatDest)\plugins"

-copy "$(OutDir)\xcwinamp.dll" "$(XChatDest)\plugins"

-copy "$(OutDir)\xcwinsys.dll" "$(XChatDest)\plugins"

-copy "$(OutDir)\xcwmpa.dll" "$(XChatDest)\plugins"

-copy "$(DepsRoot)\bin\lua51.dll" "$(XChatDest)"

-xcopy /q /s /i "$(OutDir)\locale" "$(XChatDest)\locale"

-xcopy /q /s /i "$(DepsRoot)\share\locale" "$(XChatDest)\share\locale"

-copy "$(ProgramFiles)\Codejock Software\ISSkin\ISSkinU.dll" "$(XChatDest)"

-copy "..\installer\watercolorlite-green.cjstyles" "$(XChatDest)"</Command>

+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)xcchecksum.dll" "$(HexChatDest)\plugins\"

+copy "$(OutDir)\xcdns.dll" "$(HexChatDest)\plugins"

+copy "$(OutDir)\xcdoat.dll" "$(HexChatDest)\plugins"

+copy "$(OutDir)\xcexec.dll" "$(HexChatDest)\plugins"

+copy "$(OutDir)\xcfishlim.dll" "$(HexChatDest)\plugins"

+copy "$(OutDir)\xclua.dll" "$(HexChatDest)\plugins"

+copy "$(OutDir)\xcmpcinfo.dll" "$(HexChatDest)\plugins"

+copy "$(OutDir)\xcperl-512.dll" "$(HexChatDest)\plugins"

+copy "$(OutDir)\xcperl-514.dll" "$(HexChatDest)\plugins"

+copy "$(OutDir)\xcperl-516.dll" "$(HexChatDest)\plugins"

+copy "$(OutDir)\xcpython.dll" "$(HexChatDest)\plugins"

+copy "$(OutDir)\xctcl.dll" "$(HexChatDest)\plugins"

+copy "$(OutDir)\xcupd.dll" "$(HexChatDest)\plugins"

+copy "$(OutDir)\xcxsasl.dll" "$(HexChatDest)\plugins"

+copy "$(OutDir)\xtray.dll" "$(HexChatDest)\plugins"

+copy "$(OutDir)\xcwinamp.dll" "$(HexChatDest)\plugins"

+copy "$(OutDir)\xcwinsys.dll" "$(HexChatDest)\plugins"

+copy "$(OutDir)\xcwmpa.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)"

+copy "..\installer\watercolorlite-green.cjstyles" "$(HexChatDest)"</Command>

     </PreBuildEvent>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

@@ -145,74 +145,74 @@ copy "..\installer\watercolorlite-green.cjstyles" "$(XChatDest)"</Command>
       <OptimizeReferences>true</OptimizeReferences>

     </Link>

     <PreBuildEvent>

-      <Command>rmdir /q /s "$(XChatDest)"

-mkdir "$(XChatDest)"

+      <Command>rmdir /q /s "$(HexChatDest)"

+mkdir "$(HexChatDest)"

 echo 2&gt; portable-mode

-move portable-mode "$(XChatDest)"

-copy "$(OutDir)\xchat.exe" "$(XChatDest)"

-copy "$(OutDir)\xchat-text.exe" "$(XChatDest)"

-copy "$(OutDir)\thememan.exe" "$(XChatDest)"

-copy "$(DepsRoot)\bin\libatk-1.0-0.dll" "$(XChatDest)"

-copy "$(DepsRoot)\bin\libcairo-2.dll" "$(XChatDest)"

-copy "$(DepsRoot)\bin\libexpat-1.dll" "$(XChatDest)"

-copy "$(DepsRoot)\bin\libfontconfig-1.dll" "$(XChatDest)"

-copy "$(DepsRoot)\bin\libfreetype-6.dll" "$(XChatDest)"

-copy "$(DepsRoot)\bin\libgdk_pixbuf-2.0-0.dll" "$(XChatDest)"

-copy "$(DepsRoot)\bin\libgdk-win32-2.0-0.dll" "$(XChatDest)"

-copy "$(DepsRoot)\bin\libgio-2.0-0.dll" "$(XChatDest)"

-copy "$(DepsRoot)\bin\libglib-2.0-0.dll" "$(XChatDest)"

-copy "$(DepsRoot)\bin\libgmodule-2.0-0.dll" "$(XChatDest)"

-copy "$(DepsRoot)\bin\libgobject-2.0-0.dll" "$(XChatDest)

-copy "$(DepsRoot)\bin\libgthread-2.0-0.dll" "$(XChatDest)"

-copy "$(DepsRoot)\bin\libgtk-win32-2.0-0.dll" "$(XChatDest)"

-copy "$(DepsRoot)\bin\libintl-8.dll" "$(XChatDest)"

-copy "$(DepsRoot)\bin\libpango-1.0-0.dll" "$(XChatDest)"

-copy "$(DepsRoot)\bin\libpangocairo-1.0-0.dll" "$(XChatDest)"

-copy "$(DepsRoot)\bin\libpangoft2-1.0-0.dll" "$(XChatDest)"

-copy "$(DepsRoot)\bin\libpangowin32-1.0-0.dll" "$(XChatDest)"

-copy "$(DepsRoot)\bin\libpng14-14.dll" "$(XChatDest)"

-copy "$(DepsRoot)\bin\libxml2.dll" "$(XChatDest)"

-xcopy /q /s /i "$(DepsRoot)\lib\gtk-2.0\2.10.0\engines" "$(XChatDest)\lib\gtk-2.0\2.10.0\engines"

-xcopy /q /s /i "$(DepsRoot)\lib\gtk-2.0\modules\libgail.dll" "$(XChatDest)\lib\gtk-2.0\modules\"

-xcopy /q /s /i etc "$(XChatDest)\etc"

-xcopy /q /s /i share "$(XChatDest)\share"

-copy "..\..\COPYING" "$(XChatDest)"

-copy "$(DepsRoot)\LICENSE.OPENSSL" "$(XChatDest)"

-copy "$(DepsRoot)\LICENSE.ZLIB" "$(XChatDest)"

-copy "$(DepsRoot)\share\gettext\intl\COPYING.LIB-2.0" "$(XChatDest)\LICENSE.GTK"

-copy "$(DepsRoot)\share\gettext\intl\COPYING.LIB-2.1" "$(XChatDest)\LICENSE.CAIRO"

-copy "$(DepsRoot)\LICENSE.LUA" "$(XChatDest)"

-copy "$(DepsRoot)\LICENSE.ENCHANT" "$(XChatDest)"

-copy "$(DepsRoot)\LICENSE.LIBXML" "$(XChatDest)"

-copy "$(DepsRoot)\bin\libeay32.dll" "$(XChatDest)"

-copy "$(DepsRoot)\bin\ssleay32.dll" "$(XChatDest)"

-copy "$(DepsRoot)\bin\zlib1.dll" "$(XChatDest)"

-copy "$(DepsRoot)\bin\cert.pem" "$(XChatDest)"

-copy "$(DepsRoot)\bin\libenchant.dll" "$(XChatDest)"

-xcopy /q /s /i "$(DepsRoot)\lib\enchant\libenchant_myspell.dll" "$(XChatDest)\lib\enchant\"

-xcopy /q /s /i "$(OutDir)xcchecksum.dll" "$(XChatDest)\plugins\"

-copy "$(OutDir)\xcdns.dll" "$(XChatDest)\plugins"

-copy "$(OutDir)\xcdoat.dll" "$(XChatDest)\plugins"

-copy "$(OutDir)\xcexec.dll" "$(XChatDest)\plugins"

-copy "$(OutDir)\xcfishlim.dll" "$(XChatDest)\plugins"

-copy "$(OutDir)\xclua.dll" "$(XChatDest)\plugins"

-copy "$(OutDir)\xcmpcinfo.dll" "$(XChatDest)\plugins"

-copy "$(OutDir)\xcperl-512.dll" "$(XChatDest)\plugins"

-copy "$(OutDir)\xcperl-514.dll" "$(XChatDest)\plugins"

-copy "$(OutDir)\xcperl-516.dll" "$(XChatDest)\plugins"

-copy "$(OutDir)\xcpython.dll" "$(XChatDest)\plugins"

-copy "$(OutDir)\xctcl.dll" "$(XChatDest)\plugins"

-copy "$(OutDir)\xcupd.dll" "$(XChatDest)\plugins"

-copy "$(OutDir)\xcxsasl.dll" "$(XChatDest)\plugins"

-copy "$(OutDir)\xtray.dll" "$(XChatDest)\plugins"

-copy "$(OutDir)\xcwinamp.dll" "$(XChatDest)\plugins"

-copy "$(OutDir)\xcwinsys.dll" "$(XChatDest)\plugins"

-copy "$(OutDir)\xcwmpa.dll" "$(XChatDest)\plugins"

-copy "$(DepsRoot)\bin\lua51.dll" "$(XChatDest)"

-xcopy /q /s /i "$(OutDir)\locale" "$(XChatDest)\locale"

-xcopy /q /s /i "$(DepsRoot)\share\locale" "$(XChatDest)\share\locale"

-copy "$(ProgramFiles)\Codejock Software\ISSkin\ISSkinU.dll" "$(XChatDest)"

-copy "..\installer\watercolorlite-blue.cjstyles" "$(XChatDest)"</Command>

+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)xcchecksum.dll" "$(HexChatDest)\plugins\"

+copy "$(OutDir)\xcdns.dll" "$(HexChatDest)\plugins"

+copy "$(OutDir)\xcdoat.dll" "$(HexChatDest)\plugins"

+copy "$(OutDir)\xcexec.dll" "$(HexChatDest)\plugins"

+copy "$(OutDir)\xcfishlim.dll" "$(HexChatDest)\plugins"

+copy "$(OutDir)\xclua.dll" "$(HexChatDest)\plugins"

+copy "$(OutDir)\xcmpcinfo.dll" "$(HexChatDest)\plugins"

+copy "$(OutDir)\xcperl-512.dll" "$(HexChatDest)\plugins"

+copy "$(OutDir)\xcperl-514.dll" "$(HexChatDest)\plugins"

+copy "$(OutDir)\xcperl-516.dll" "$(HexChatDest)\plugins"

+copy "$(OutDir)\xcpython.dll" "$(HexChatDest)\plugins"

+copy "$(OutDir)\xctcl.dll" "$(HexChatDest)\plugins"

+copy "$(OutDir)\xcupd.dll" "$(HexChatDest)\plugins"

+copy "$(OutDir)\xcxsasl.dll" "$(HexChatDest)\plugins"

+copy "$(OutDir)\xtray.dll" "$(HexChatDest)\plugins"

+copy "$(OutDir)\xcwinamp.dll" "$(HexChatDest)\plugins"

+copy "$(OutDir)\xcwinsys.dll" "$(HexChatDest)\plugins"

+copy "$(OutDir)\xcwmpa.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)"

+copy "..\installer\watercolorlite-blue.cjstyles" "$(HexChatDest)"</Command>

     </PreBuildEvent>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/win32/xchat.props b/win32/hexchat.props
index 22f0cd5a..448765be 100644
--- a/win32/xchat.props
+++ b/win32/hexchat.props
@@ -3,7 +3,7 @@
   <ImportGroup Label="PropertySheets" />

   <PropertyGroup Label="UserMacros">

     <!-- SPECIFY YOUR DEPENDENCY DIRECTORIES HERE -->

-    <YourDepsPath>c:\mozilla build\xchat-deps</YourDepsPath>

+    <YourDepsPath>c:\mozilla build\hexchat-deps</YourDepsPath>

     <YourGendefPath>c:\mozilla build\gendef</YourGendefPath>

     <YourTclPath>c:\mozilla build\tcl-8.5</YourTclPath>

     <YourPerl512Path>c:\mozilla build\perl-5.12</YourPerl512Path>

@@ -33,9 +33,9 @@
     <PythonOutput>xcpython</PythonOutput>

     <Glib>$(DepsRoot)\include\glib-2.0;$(DepsRoot)\lib\glib-2.0\include;$(DepsRoot)\include\libxml2</Glib>

     <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" xchatpng "$(SolutionDir)\..\xchat.png"</Pixmaps>

+    <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" xchatpng "$(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;intl.lib;libxml2.lib;libeay32.lib;ssleay32.lib;wininet.lib;winmm.lib;ws2_32.lib</DepLibs>

-    <XChatDest>$(SolutionDir)build\$(PlatformName)\rel</XChatDest>

+    <HexChatDest>$(SolutionDir)build\$(PlatformName)\rel</HexChatDest>

   </PropertyGroup>

   <ItemDefinitionGroup />

   <ItemGroup />

diff --git a/win32/xchat.sln b/win32/hexchat.sln
index 42969f38..30333ab2 100644
--- a/win32/xchat.sln
+++ b/win32/hexchat.sln
@@ -23,7 +23,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fe-text", "..\src\fe-text\f
 		{98B56DF9-E4F1-4696-A565-5F7823CF214D} = {98B56DF9-E4F1-4696-A565-5F7823CF214D}

 	EndProjectSection

 EndProject

-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "xchat", "xchat", "{AAACEB12-9475-410E-AF5A-FDFF907E9043}"

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "hexchat", "hexchat", "{AAACEB12-9475-410E-AF5A-FDFF907E9043}"

 EndProject

 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "plugins", "plugins", "{561126F4-FA18-45FC-A2BF-8F858F161D6D}"

 EndProject

diff --git a/win32/installer/xchat-wdk-x64.skel.iss b/win32/installer/hexchat-x64.skel.iss
index a309b1b6..0d3d754d 100644
--- a/win32/installer/xchat-wdk-x64.skel.iss
+++ b/win32/installer/hexchat-x64.skel.iss
@@ -1,14 +1,14 @@
-AppName=XChat-WDK (x64)

-AppPublisher=XChat-WDK

-AppPublisherURL=http://www.xchat-wdk.org/

+AppName=HexChat (x64)

+AppPublisher=HexChat

+AppPublisherURL=http://www.hexchat.org/

 AppCopyright=Copyright (C) 1998-2010 Peter Zelezny

-AppSupportURL=http://code.google.com/p/xchat-wdk/issues/list

-AppUpdatesURL=http://www.xchat-wdk.org/home/downloads

+AppSupportURL=https://github.com/hexchat/hexchat/issues

+AppUpdatesURL=http://www.hexchat.org/home/downloads

 LicenseFile=COPYING

-UninstallDisplayIcon={app}\xchat.exe

-UninstallDisplayName=XChat-WDK (x64)

-DefaultDirName={pf}\XChat-WDK

-DefaultGroupName=XChat-WDK

+UninstallDisplayIcon={app}\hexchat.exe

+UninstallDisplayName=HexChat (x64)

+DefaultDirName={pf}\HexChat

+DefaultGroupName=HexChat

 DisableProgramGroupPage=yes

 SolidCompression=yes

 SourceDir=..\rel

@@ -28,9 +28,9 @@ Name: "minimal"; Description: "Minimal Installation"
 Name: "custom"; Description: "Custom Installation"; Flags: iscustom

 

 [Components]

-Name: "libs"; Description: "XChat-WDK"; Types: normal full minimal custom; Flags: fixed

-Name: "xctext"; Description: "XChat-Text"; Types: full custom; Flags: disablenouninstallwarning

-Name: "xtm"; Description: "XChat Theme Manager (Requires .NET 4.0)"; Types: full custom; Flags: disablenouninstallwarning

+Name: "libs"; Description: "HexChat"; Types: normal full minimal custom; Flags: fixed

+Name: "xctext"; Description: "HexChat-Text"; Types: full custom; Flags: disablenouninstallwarning

+Name: "xtm"; Description: "HexChat Theme Manager (Requires .NET 4.0)"; Types: full custom; Flags: disablenouninstallwarning

 Name: "translations"; Description: "Translations"; Types: normal full custom; Flags: disablenouninstallwarning

 ;obs Name: "gtkengines"; Description: "GTK+ Engines"; Types: full custom; Flags: disablenouninstallwarning

 ;Name: "spelling"; Description: "Spelling Dictionaries"; Types: full custom; Flags: disablenouninstallwarning

@@ -66,19 +66,19 @@ Name: perl516; Description: "5.16"; GroupDescription: "Perl version:"; Flags: ex
 Root: HKCR; Subkey: "irc"; ValueType: none; ValueName: ""; ValueData: ""; Flags: deletekey uninsdeletekey; Tasks: not portable

 Root: HKCR; Subkey: "irc"; ValueType: string; ValueName: ""; ValueData: "URL:IRC Protocol"; Flags: uninsdeletevalue; Tasks: not portable

 Root: HKCR; Subkey: "irc"; ValueType: string; ValueName: "URL Protocol"; ValueData: ""; Flags: uninsdeletevalue; Tasks: not portable

-Root: HKCR; Subkey: "irc\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\xchat.exe,0"; Flags: uninsdeletevalue; Tasks: not portable

+Root: HKCR; Subkey: "irc\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\hexchat.exe,0"; Flags: uninsdeletevalue; Tasks: not portable

 Root: HKCR; Subkey: "irc\shell"; ValueType: string; ValueName: ""; ValueData: "open"; Flags: uninsdeletevalue; Tasks: not portable

-Root: HKCR; Subkey: "irc\shell\open\command"; ValueType: string; ValueName: ""; ValueData: "{app}\xchat.exe --url=""%1"""; Flags: uninsdeletevalue; Tasks: not portable

+Root: HKCR; Subkey: "irc\shell\open\command"; ValueType: string; ValueName: ""; ValueData: "{app}\hexchat.exe --url=""%1"""; Flags: uninsdeletevalue; Tasks: not portable

 

 Root: HKCR; Subkey: ".xct"; ValueType: none; ValueName: ""; ValueData: ""; Flags: deletekey uninsdeletekey; Components:xtm; Tasks: not portable

-Root: HKCR; Subkey: ".xct"; ValueType: string; ValueName: ""; ValueData: "XChat Theme File"; Flags: uninsdeletevalue; Components:xtm; Tasks: not portable

-Root: HKCR; Subkey: ".xct"; ValueType: string; ValueName: "XChat Theme File"; ValueData: ""; Flags: uninsdeletevalue; Components:xtm; Tasks: not portable

+Root: HKCR; Subkey: ".xct"; ValueType: string; ValueName: ""; ValueData: "HexChat Theme File"; Flags: uninsdeletevalue; Components:xtm; Tasks: not portable

+Root: HKCR; Subkey: ".xct"; ValueType: string; ValueName: "HexChat Theme File"; ValueData: ""; Flags: uninsdeletevalue; Components:xtm; Tasks: not portable

 Root: HKCR; Subkey: ".xct\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\thememan.exe,0"; Flags: uninsdeletevalue; Components:xtm; Tasks: not portable

 Root: HKCR; Subkey: ".xct\shell"; ValueType: string; ValueName: ""; ValueData: "open"; Flags: uninsdeletevalue; Components:xtm; Tasks: not portable

 Root: HKCR; Subkey: ".xct\shell\open\command"; ValueType: string; ValueName: ""; ValueData: "{app}\thememan.exe ""%1"""; Flags: uninsdeletevalue; Components:xtm; Tasks: not portable

 

 [Run]

-Filename: "{app}\xchat.exe"; Description: "Run XChat-WDK after closing the Wizard"; Flags: nowait postinstall skipifsilent

+Filename: "{app}\hexchat.exe"; Description: "Run HexChat after closing the Wizard"; Flags: nowait postinstall skipifsilent

 

 [Files]

 ; Add the ISSkin DLL used for skinning Inno Setup installations.

@@ -184,18 +184,18 @@ Source: "plugins\xcperl-512.dll"; DestDir: "{app}\plugins"; DestName: "xcperl.dl
 Source: "plugins\xcperl-514.dll"; DestDir: "{app}\plugins"; DestName: "xcperl.dll"; Flags: ignoreversion; Components: langs\perl; Tasks: perl514

 Source: "plugins\xcperl-516.dll"; DestDir: "{app}\plugins"; DestName: "xcperl.dll"; Flags: ignoreversion; Components: langs\perl; Tasks: perl516

 

-Source: "xchat.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: libs

-Source: "xchat-text.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: xctext

+Source: "hexchat.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: libs

+Source: "hexchat-text.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: xctext

 Source: "thememan.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: xtm

 

 [Icons]

-Name: "{group}\XChat-WDK (x64)"; Filename: "{app}\xchat.exe"; Tasks: not portable

-Name: "{group}\XChat-Text (x64)"; Filename: "{app}\xchat-text.exe"; Components: xctext; Tasks: not portable

-Name: "{group}\XChat Theme Manager (x64)"; Filename: "{app}\thememan.exe"; Components: xtm; Tasks: not portable

-Name: "{group}\Uninstall XChat-WDK (x64)"; Filename: "{uninstallexe}"; Tasks: not portable

+Name: "{group}\HexChat (x64)"; Filename: "{app}\hexchat.exe"; Tasks: not portable

+Name: "{group}\HexChat-Text (x64)"; Filename: "{app}\hexchat-text.exe"; Components: xctext; Tasks: not portable

+Name: "{group}\HexChat Theme Manager (x64)"; Filename: "{app}\thememan.exe"; Components: xtm; Tasks: not portable

+Name: "{group}\Uninstall HexChat (x64)"; Filename: "{uninstallexe}"; Tasks: not portable

 

 [Messages]

-BeveledLabel= XChat-WDK

+BeveledLabel= HexChat

 

 [Code]

 /////////////////////////////////////////////////////////////////////

@@ -206,7 +206,7 @@ var
 	sUnInstPath: String;

 	sUnInstallString: String;

 begin

-	sUnInstPath := ExpandConstant('Software\Microsoft\Windows\CurrentVersion\Uninstall\XChat-WDK (x64)_is1');

+	sUnInstPath := ExpandConstant('Software\Microsoft\Windows\CurrentVersion\Uninstall\HexChat (x64)_is1');

 	sUnInstallString := '';

 	if not RegQueryStringValue(HKLM, sUnInstPath, 'UninstallString', sUnInstallString) then

 		RegQueryStringValue(HKCU, sUnInstPath, 'UninstallString', sUnInstallString);

diff --git a/win32/installer/xchat-wdk-x86.skel.iss b/win32/installer/hexchat-x86.skel.iss
index 5cf32c47..eb6f3e32 100644
--- a/win32/installer/xchat-wdk-x86.skel.iss
+++ b/win32/installer/hexchat-x86.skel.iss
@@ -1,14 +1,14 @@
-AppName=XChat-WDK (x86)

-AppPublisher=XChat-WDK

-AppPublisherURL=http://www.xchat-wdk.org/

+AppName=HexChat (x86)

+AppPublisher=HexChat

+AppPublisherURL=http://www.hexchat.org/

 AppCopyright=Copyright (C) 1998-2010 Peter Zelezny

-AppSupportURL=http://code.google.com/p/xchat-wdk/issues/list

-AppUpdatesURL=http://www.xchat-wdk.org/home/downloads

+AppSupportURL=https://github.com/hexchat/hexchat/issues

+AppUpdatesURL=http://www.hexchat.org/home/downloads

 LicenseFile=COPYING

-UninstallDisplayIcon={app}\xchat.exe

-UninstallDisplayName=XChat-WDK (x86)

-DefaultDirName={pf}\XChat-WDK

-DefaultGroupName=XChat-WDK

+UninstallDisplayIcon={app}\hexchat.exe

+UninstallDisplayName=HexChat (x86)

+DefaultDirName={pf}\HexChat

+DefaultGroupName=HexChat

 DisableProgramGroupPage=yes

 SolidCompression=yes

 SourceDir=..\rel

@@ -27,9 +27,9 @@ Name: "minimal"; Description: "Minimal Installation"
 Name: "custom"; Description: "Custom Installation"; Flags: iscustom

 

 [Components]

-Name: "libs"; Description: "XChat-WDK"; Types: normal full minimal custom; Flags: fixed

-Name: "xctext"; Description: "XChat-Text"; Types: full custom; Flags: disablenouninstallwarning

-Name: "xtm"; Description: "XChat Theme Manager (Requires .NET 4.0)"; Types: full custom; Flags: disablenouninstallwarning

+Name: "libs"; Description: "HexChat"; Types: normal full minimal custom; Flags: fixed

+Name: "xctext"; Description: "HexChat-Text"; Types: full custom; Flags: disablenouninstallwarning

+Name: "xtm"; Description: "HexChat Theme Manager (Requires .NET 4.0)"; Types: full custom; Flags: disablenouninstallwarning

 Name: "translations"; Description: "Translations"; Types: normal full custom; Flags: disablenouninstallwarning

 ;obs Name: "gtkengines"; Description: "GTK+ Engines"; Types: full custom; Flags: disablenouninstallwarning

 ;Name: "spelling"; Description: "Spelling Dictionaries"; Types: full custom; Flags: disablenouninstallwarning

@@ -65,19 +65,19 @@ Name: perl516; Description: "5.16"; GroupDescription: "Perl version:"; Flags: ex
 Root: HKCR; Subkey: "irc"; ValueType: none; ValueName: ""; ValueData: ""; Flags: deletekey uninsdeletekey; Tasks: not portable

 Root: HKCR; Subkey: "irc"; ValueType: string; ValueName: ""; ValueData: "URL:IRC Protocol"; Flags: uninsdeletevalue; Tasks: not portable

 Root: HKCR; Subkey: "irc"; ValueType: string; ValueName: "URL Protocol"; ValueData: ""; Flags: uninsdeletevalue; Tasks: not portable

-Root: HKCR; Subkey: "irc\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\xchat.exe,0"; Flags: uninsdeletevalue; Tasks: not portable

+Root: HKCR; Subkey: "irc\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\hexchat.exe,0"; Flags: uninsdeletevalue; Tasks: not portable

 Root: HKCR; Subkey: "irc\shell"; ValueType: string; ValueName: ""; ValueData: "open"; Flags: uninsdeletevalue; Tasks: not portable

-Root: HKCR; Subkey: "irc\shell\open\command"; ValueType: string; ValueName: ""; ValueData: "{app}\xchat.exe --url=""%1"""; Flags: uninsdeletevalue; Tasks: not portable

+Root: HKCR; Subkey: "irc\shell\open\command"; ValueType: string; ValueName: ""; ValueData: "{app}\hexchat.exe --url=""%1"""; Flags: uninsdeletevalue; Tasks: not portable

 

 Root: HKCR; Subkey: ".xct"; ValueType: none; ValueName: ""; ValueData: ""; Flags: deletekey uninsdeletekey; Components:xtm; Tasks: not portable

-Root: HKCR; Subkey: ".xct"; ValueType: string; ValueName: ""; ValueData: "XChat Theme File"; Flags: uninsdeletevalue; Components:xtm; Tasks: not portable

-Root: HKCR; Subkey: ".xct"; ValueType: string; ValueName: "XChat Theme File"; ValueData: ""; Flags: uninsdeletevalue; Components:xtm; Tasks: not portable

+Root: HKCR; Subkey: ".xct"; ValueType: string; ValueName: ""; ValueData: "HexChat Theme File"; Flags: uninsdeletevalue; Components:xtm; Tasks: not portable

+Root: HKCR; Subkey: ".xct"; ValueType: string; ValueName: "HexChat Theme File"; ValueData: ""; Flags: uninsdeletevalue; Components:xtm; Tasks: not portable

 Root: HKCR; Subkey: ".xct\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\thememan.exe,0"; Flags: uninsdeletevalue; Components:xtm; Tasks: not portable

 Root: HKCR; Subkey: ".xct\shell"; ValueType: string; ValueName: ""; ValueData: "open"; Flags: uninsdeletevalue; Components:xtm; Tasks: not portable

 Root: HKCR; Subkey: ".xct\shell\open\command"; ValueType: string; ValueName: ""; ValueData: "{app}\thememan.exe ""%1"""; Flags: uninsdeletevalue; Components:xtm; Tasks: not portable

 

 [Run]

-Filename: "{app}\xchat.exe"; Description: "Run XChat-WDK after closing the Wizard"; Flags: nowait postinstall skipifsilent

+Filename: "{app}\hexchat.exe"; Description: "Run HexChat after closing the Wizard"; Flags: nowait postinstall skipifsilent

 

 [Files]

 ; Add the ISSkin DLL used for skinning Inno Setup installations.

@@ -185,18 +185,18 @@ Source: "plugins\xcperl-512.dll"; DestDir: "{app}\plugins"; DestName: "xcperl.dl
 Source: "plugins\xcperl-514.dll"; DestDir: "{app}\plugins"; DestName: "xcperl.dll"; Flags: ignoreversion; Components: langs\perl; Tasks: perl514

 Source: "plugins\xcperl-516.dll"; DestDir: "{app}\plugins"; DestName: "xcperl.dll"; Flags: ignoreversion; Components: langs\perl; Tasks: perl516

 

-Source: "xchat.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: libs

-Source: "xchat-text.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: xctext

+Source: "hexchat.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: libs

+Source: "hexchat-text.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: xctext

 Source: "thememan.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: xtm

 

 [Icons]

-Name: "{group}\XChat-WDK (x86)"; Filename: "{app}\xchat.exe"; Tasks: not portable

-Name: "{group}\XChat-Text (x86)"; Filename: "{app}\xchat-text.exe"; Components: xctext; Tasks: not portable

-Name: "{group}\XChat Theme Manager (x86)"; Filename: "{app}\thememan.exe"; Components: xtm; Tasks: not portable

-Name: "{group}\Uninstall XChat-WDK (x86)"; Filename: "{uninstallexe}"; Tasks: not portable

+Name: "{group}\HexChat (x86)"; Filename: "{app}\hexchat.exe"; Tasks: not portable

+Name: "{group}\HexChat-Text (x86)"; Filename: "{app}\hexchat-text.exe"; Components: xctext; Tasks: not portable

+Name: "{group}\HexChat Theme Manager (x86)"; Filename: "{app}\thememan.exe"; Components: xtm; Tasks: not portable

+Name: "{group}\Uninstall HexChat (x86)"; Filename: "{uninstallexe}"; Tasks: not portable

 

 [Messages]

-BeveledLabel= XChat-WDK

+BeveledLabel= HexChat

 

 [Code]

 /////////////////////////////////////////////////////////////////////

@@ -207,7 +207,7 @@ var
 	sUnInstPath: String;

 	sUnInstallString: String;

 begin

-	sUnInstPath := ExpandConstant('Software\Microsoft\Windows\CurrentVersion\Uninstall\XChat-WDK (x86)_is1');

+	sUnInstPath := ExpandConstant('Software\Microsoft\Windows\CurrentVersion\Uninstall\HexChat (x86)_is1');

 	sUnInstallString := '';

 	if not RegQueryStringValue(HKLM, sUnInstPath, 'UninstallString', sUnInstallString) then

 		RegQueryStringValue(HKCU, sUnInstPath, 'UninstallString', sUnInstallString);

diff --git a/win32/installer/installer.vcxproj b/win32/installer/installer.vcxproj
index 0fcba484..ed1c4b74 100644
--- a/win32/installer/installer.vcxproj
+++ b/win32/installer/installer.vcxproj
@@ -34,11 +34,11 @@
   </ImportGroup>

   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-    <Import Project="..\xchat.props" />

+    <Import Project="..\hexchat.props" />

   </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-    <Import Project="..\xchat.props" />

+    <Import Project="..\hexchat.props" />

   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

@@ -62,16 +62,16 @@
       <OptimizeReferences>true</OptimizeReferences>

     </Link>

     <PreBuildEvent>

-      <Command>echo [Setup] &gt; "$(OutDir)\xchat-wdk-x86.iss"

-echo WizardImageFile="$(ProjectDir)\wizardimage.bmp" &gt;&gt; "$(OutDir)\xchat-wdk-x86.iss"

-echo WizardSmallImageFile="$(ProjectDir)\wizardsmallimage.bmp" &gt;&gt; "$(OutDir)\xchat-wdk-x86.iss"

-"$(OutDir)\version" -a &gt;&gt; "$(OutDir)\xchat-wdk-x86.iss"

-"$(OutDir)\version" -v &gt;&gt; "$(OutDir)\xchat-wdk-x86.iss"

-"$(OutDir)\version" -i &gt;&gt; "$(OutDir)\xchat-wdk-x86.iss"

-"$(OutDir)\version" -o &gt;&gt; "$(OutDir)\xchat-wdk-x86.iss"

-echo SetupIconFile="$(SolutionDir)\..\xchat.ico" &gt;&gt; "$(OutDir)\xchat-wdk-x86.iss"

-type xchat-wdk-x86.skel.iss &gt;&gt; "$(OutDir)\xchat-wdk-x86.iss"

-"$(ProgramFiles)\Inno Setup 5\compil32" /cc "$(OutDir)\xchat-wdk-x86.iss"</Command>

+      <Command>echo [Setup] &gt; "$(OutDir)\hexchat-x86.iss"

+echo WizardImageFile="$(ProjectDir)\wizardimage.bmp" &gt;&gt; "$(OutDir)\hexchat-x86.iss"

+echo WizardSmallImageFile="$(ProjectDir)\wizardsmallimage.bmp" &gt;&gt; "$(OutDir)\hexchat-x86.iss"

+"$(OutDir)\version" -a &gt;&gt; "$(OutDir)\hexchat-x86.iss"

+"$(OutDir)\version" -v &gt;&gt; "$(OutDir)\hexchat-x86.iss"

+"$(OutDir)\version" -i &gt;&gt; "$(OutDir)\hexchat-x86.iss"

+"$(OutDir)\version" -o &gt;&gt; "$(OutDir)\hexchat-x86.iss"

+echo SetupIconFile="$(SolutionDir)\..\hexchat.ico" &gt;&gt; "$(OutDir)\hexchat-x86.iss"

+type hexchat-x86.skel.iss &gt;&gt; "$(OutDir)\hexchat-x86.iss"

+"$(ProgramFiles)\Inno Setup 5\compil32" /cc "$(OutDir)\hexchat-x86.iss"</Command>

     </PreBuildEvent>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

@@ -87,16 +87,16 @@ type xchat-wdk-x86.skel.iss &gt;&gt; "$(OutDir)\xchat-wdk-x86.iss"
       <OptimizeReferences>true</OptimizeReferences>

     </Link>

     <PreBuildEvent>

-      <Command>echo [Setup] &gt; "$(OutDir)\xchat-wdk-x64.iss"

-echo WizardImageFile="$(ProjectDir)\wizardimage.bmp" &gt;&gt; "$(OutDir)\xchat-wdk-x64.iss"

-echo WizardSmallImageFile="$(ProjectDir)\wizardsmallimage.bmp" &gt;&gt; "$(OutDir)\xchat-wdk-x64.iss"

-"$(OutDir)\version" -a &gt;&gt; "$(OutDir)\xchat-wdk-x64.iss"

-"$(OutDir)\version" -v &gt;&gt; "$(OutDir)\xchat-wdk-x64.iss"

-"$(OutDir)\version" -i &gt;&gt; "$(OutDir)\xchat-wdk-x64.iss"

-"$(OutDir)\version" -o &gt;&gt; "$(OutDir)\xchat-wdk-x64.iss"

-echo SetupIconFile="$(SolutionDir)\..\xchat.ico" &gt;&gt; "$(OutDir)\xchat-wdk-x64.iss"

-type xchat-wdk-x64.skel.iss &gt;&gt; "$(OutDir)\xchat-wdk-x64.iss"

-"$(ProgramFiles)\Inno Setup 5\compil32" /cc "$(OutDir)\xchat-wdk-x64.iss"</Command>

+      <Command>echo [Setup] &gt; "$(OutDir)\hexchat-x64.iss"

+echo WizardImageFile="$(ProjectDir)\wizardimage.bmp" &gt;&gt; "$(OutDir)\hexchat-x64.iss"

+echo WizardSmallImageFile="$(ProjectDir)\wizardsmallimage.bmp" &gt;&gt; "$(OutDir)\hexchat-x64.iss"

+"$(OutDir)\version" -a &gt;&gt; "$(OutDir)\hexchat-x64.iss"

+"$(OutDir)\version" -v &gt;&gt; "$(OutDir)\hexchat-x64.iss"

+"$(OutDir)\version" -i &gt;&gt; "$(OutDir)\hexchat-x64.iss"

+"$(OutDir)\version" -o &gt;&gt; "$(OutDir)\hexchat-x64.iss"

+echo SetupIconFile="$(SolutionDir)\..\hexchat.ico" &gt;&gt; "$(OutDir)\hexchat-x64.iss"

+type hexchat-x64.skel.iss &gt;&gt; "$(OutDir)\hexchat-x64.iss"

+"$(ProgramFiles)\Inno Setup 5\compil32" /cc "$(OutDir)\hexchat-x64.iss"</Command>

     </PreBuildEvent>

   </ItemDefinitionGroup>

   <ItemGroup>

@@ -104,8 +104,8 @@ type xchat-wdk-x64.skel.iss &gt;&gt; "$(OutDir)\xchat-wdk-x64.iss"
     <None Include="watercolorlite-green.cjstyles" />

     <None Include="wizardimage.bmp" />

     <None Include="wizardsmallimage.bmp" />

-    <None Include="xchat-wdk-x64.skel.iss" />

-    <None Include="xchat-wdk-x86.skel.iss" />

+    <None Include="hexchat-x64.skel.iss" />

+    <None Include="hexchat-x86.skel.iss" />

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

diff --git a/win32/installer/installer.vcxproj.filters b/win32/installer/installer.vcxproj.filters
index b18a6411..ce194a17 100644
--- a/win32/installer/installer.vcxproj.filters
+++ b/win32/installer/installer.vcxproj.filters
@@ -7,10 +7,10 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <None Include="xchat-wdk-x64.skel.iss">

+    <None Include="hexchat-x64.skel.iss">

       <Filter>Resource Files</Filter>

     </None>

-    <None Include="xchat-wdk-x86.skel.iss">

+    <None Include="hexchat-x86.skel.iss">

       <Filter>Resource Files</Filter>

     </None>

     <None Include="watercolorlite-blue.cjstyles">

diff --git a/win32/nls/nls.vcxproj b/win32/nls/nls.vcxproj
index 9c0ecff4..11b538c5 100644
--- a/win32/nls/nls.vcxproj
+++ b/win32/nls/nls.vcxproj
@@ -34,11 +34,11 @@
   </ImportGroup>

   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-    <Import Project="..\xchat.props" />

+    <Import Project="..\hexchat.props" />

   </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-    <Import Project="..\xchat.props" />

+    <Import Project="..\hexchat.props" />

   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">