78 files changed, 23 insertions, 23 deletions
diff --git a/build/bitmaps/wizardimage.bmp b/win32/bitmaps/wizardimage.bmp
index 9f5a4c90..9f5a4c90 100644
--- a/build/bitmaps/wizardimage.bmp
+++ b/win32/bitmaps/wizardimage.bmp
Binary files differdiff --git a/build/bitmaps/wizardsmallimage.bmp b/win32/bitmaps/wizardsmallimage.bmp
index 1bb8b790..1bb8b790 100644
--- a/build/bitmaps/wizardsmallimage.bmp
+++ b/win32/bitmaps/wizardsmallimage.bmp
Binary files differdiff --git a/build/build-spell.bat b/win32/build-spell.bat
index 7300e41d..7325e426 100644
--- a/build/build-spell.bat
+++ b/win32/build-spell.bat
@@ -1,6 +1,6 @@
 @echo off
-set DEPS_ROOT=..\dep-x86
-set XCHAT_DEST=..\tmp-spell
+set DEPS_ROOT=deps-x86
+set XCHAT_DEST=tmp-spell
 rmdir /q /s %XCHAT_DEST%
 mkdir %XCHAT_DEST%
 xcopy /q /s /i %DEPS_ROOT%\myspell %XCHAT_DEST%\share\myspell
diff --git a/build/build-x64.bat b/win32/build-x64.bat
index b7a12351..6b5b9d99 100644
--- a/build/build-x64.bat
+++ b/win32/build-x64.bat
@@ -3,7 +3,7 @@ set WDK_ROOT=c:\WinDDK\7600.16385.1
 set INCLUDE=%WDK_ROOT%\inc\api;%WDK_ROOT%\inc\crt;%WDK_ROOT%\inc\api\crt\stl70;%WDK_ROOT%\inc\mfc42;%WDK_ROOT%\inc\ddk;%WDK_ROOT%\inc\api\dao360
 set LIB=%WDK_ROOT%\lib\wnet\amd64;%WDK_ROOT%\lib\Crt\amd64;%WDK_ROOT%\lib\Mfc\amd64;%WDK_ROOT%\lib\ATL\amd64
 set OPATH=%PATH%
-set DEV_64=%cd%\..\dep-x64
+set DEV_64=%cd%\deps-x64
 set PATH=%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\VC\bin\amd64;%PROGRAMFILES(X86)%\Microsoft SDKs\Windows\v7.0A\Bin\x64;%DEV_64%\bin;c:\mozilla-build\gendef
 set PERL_512=c:\mozilla-build\perl-5.12-x64\perl
 set PERL_514=c:\mozilla-build\perl-5.14-x64\perl
@@ -17,9 +17,9 @@ version -v >> xchat-wdk-x64.iss
 version -i >> xchat-wdk-x64.iss
 version -o64 >> xchat-wdk-x64.iss
 cd ..
-build\version -r > resource.h
-echo SetupIconFile=%cd%\xchat.ico >> build\xchat-wdk-x64.iss
-type build\xchat-wdk-x64.skel.iss >> build\xchat-wdk-x64.iss
+win32\version -r > resource.h
+echo SetupIconFile=%cd%\xchat.ico >> win32\xchat-wdk-x64.iss
+type win32\xchat-wdk-x64.skel.iss >> win32\xchat-wdk-x64.iss
 cd src
 echo DEV = %DEV_64% > makeinc.mak
 echo X64 = YES >> makeinc.mak
@@ -37,7 +37,7 @@ nmake /nologo /s /f makefile-512.mak
 set PATH=%OOPATH%;%PERL_514%\bin
 nmake /nologo /s /f makefile-514.mak clean
 nmake /nologo /s /f makefile-514.mak
-cd ..\..\build
+cd ..\..\win32
 call compile-po-files.bat
 set PATH=%OPATH%
 call release-x64.bat
diff --git a/build/build-x86.bat b/win32/build-x86.bat
index 2e31a69b..85c7c2d1 100644
--- a/build/build-x86.bat
+++ b/win32/build-x86.bat
@@ -3,7 +3,7 @@ set WDK_ROOT=c:\WinDDK\7600.16385.1
 set INCLUDE=%WDK_ROOT%\inc\api;%WDK_ROOT%\inc\crt;%WDK_ROOT%\inc\api\crt\stl70;%WDK_ROOT%\inc\mfc42;%WDK_ROOT%\inc\ddk;%WDK_ROOT%\inc\api\dao360
 set LIB=%WDK_ROOT%\lib\wxp\i386;%WDK_ROOT%\lib\Crt\i386;%WDK_ROOT%\lib\Mfc\i386;%WDK_ROOT%\lib\ATL\i386
 set OPATH=%PATH%
-set DEV_32=%cd%\..\dep-x86
+set DEV_32=%cd%\deps-x86
 set PATH=%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\VC\bin;%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\Common7\IDE;%PROGRAMFILES(X86)%\Microsoft SDKs\Windows\v7.0A\Bin;%DEV_32%\bin;c:\mozilla-build\gendef
 set PERL_512=c:\mozilla-build\perl-5.12-x86\perl
 set PERL_514=c:\mozilla-build\perl-5.14-x86\perl
@@ -17,9 +17,9 @@ version -v >> xchat-wdk-x86.iss
 version -i >> xchat-wdk-x86.iss
 version -o32 >> xchat-wdk-x86.iss
 cd ..
-build\version -r > resource.h
-echo SetupIconFile=%cd%\xchat.ico >> build\xchat-wdk-x86.iss
-type build\xchat-wdk-x86.skel.iss >> build\xchat-wdk-x86.iss
+win32\version -r > resource.h
+echo SetupIconFile=%cd%\xchat.ico >> win32\xchat-wdk-x86.iss
+type win32\xchat-wdk-x86.skel.iss >> win32\xchat-wdk-x86.iss
 cd src
 echo DEV = %DEV_32% > makeinc.mak
 type makeinc.skel.mak >> makeinc.mak
@@ -36,7 +36,7 @@ nmake /nologo /s /f makefile-512.mak
 set PATH=%OOPATH%;%PERL_514%\bin
 nmake /nologo /s /f makefile-514.mak clean
 nmake /nologo /s /f makefile-514.mak
-cd ..\..\build
+cd ..\..\win32
 call compile-po-files.bat
 set PATH=%OPATH%
 call release-x86.bat
diff --git a/build/compile-po-files.bat b/win32/compile-po-files.bat
index 5d47abc3..6ffde997 100644
--- a/build/compile-po-files.bat
+++ b/win32/compile-po-files.bat
@@ -7,4 +7,4 @@ for %%A in (*.po) do (
 	mkdir locale\%%~nA\LC_MESSAGES
 	msgfmt -co locale\%%~nA\LC_MESSAGES\xchat.mo %%A
 )
-cd ..\build
+cd ..\win32
diff --git a/build/compress.bat b/win32/compress.bat
index 37df1292..37df1292 100644
--- a/build/compress.bat
+++ b/win32/compress.bat
diff --git a/build/deb-extract.bat b/win32/deb-extract.bat
index 913397b9..913397b9 100644
--- a/build/deb-extract.bat
+++ b/win32/deb-extract.bat
diff --git a/build/dep-extract-x64.bat b/win32/dep-extract-x64.bat
index efc6386d..e346891a 100644
--- a/build/dep-extract-x64.bat
+++ b/win32/dep-extract-x64.bat
@@ -1,7 +1,7 @@
 @echo off
 set PATH=%PATH%;%PROGRAMW6432%\7-Zip;c:\mozilla-build\gendef
 
-cd ..\dep-x64
+cd deps-x64
 ::obs 7z x -y *.rpm
 ::obs 7z x *.cpio
 ::obs del *.cpio
diff --git a/build/dep-extract-x86.bat b/win32/dep-extract-x86.bat
index 9fd3d6e2..702e3bf2 100644
--- a/build/dep-extract-x86.bat
+++ b/win32/dep-extract-x86.bat
@@ -1,7 +1,7 @@
 @echo off
 set PATH=%PATH%;%PROGRAMW6432%\7-Zip;c:\mozilla-build\gendef
 
-cd ..\dep-x86
+cd deps-x86
 ::obs 7z x -y *.rpm
 ::obs 7z x *.cpio
 ::obs del *.cpio
diff --git a/dep-x64/deps-x64.txt b/win32/deps-x64/deps-x64.txt
index ed52c2ca..ed52c2ca 100644
--- a/dep-x64/deps-x64.txt
+++ b/win32/deps-x64/deps-x64.txt
diff --git a/dep-x86/deps-x86.txt b/win32/deps-x86/deps-x86.txt
index 9f5a3bdb..9f5a3bdb 100644
--- a/dep-x86/deps-x86.txt
+++ b/win32/deps-x86/deps-x86.txt
diff --git a/build/etc/download.png b/win32/etc/download.png
index 43253432..43253432 100644
--- a/build/etc/download.png
+++ b/win32/etc/download.png
Binary files differdiff --git a/build/etc/gtk-2.0/gtkrc b/win32/etc/gtk-2.0/gtkrc
index 6ac7b76c..6ac7b76c 100644
--- a/build/etc/gtk-2.0/gtkrc
+++ b/win32/etc/gtk-2.0/gtkrc
diff --git a/build/etc/gtkpref.png b/win32/etc/gtkpref.png
index 9a6c9cf9..9a6c9cf9 100644
--- a/build/etc/gtkpref.png
+++ b/win32/etc/gtkpref.png
Binary files differdiff --git a/build/etc/music.png b/win32/etc/music.png
index 3a72f118..3a72f118 100644
--- a/build/etc/music.png
+++ b/win32/etc/music.png
Binary files differdiff --git a/build/etc/system.png b/win32/etc/system.png
index fc4282c7..fc4282c7 100644
--- a/build/etc/system.png
+++ b/win32/etc/system.png
Binary files differdiff --git a/ext/enchant-wdk/src/build-x64.bat b/win32/ext/enchant-wdk/src/build-x64.bat
index 332af68f..332af68f 100644
--- a/ext/enchant-wdk/src/build-x64.bat
+++ b/win32/ext/enchant-wdk/src/build-x64.bat
diff --git a/ext/enchant-wdk/src/build-x86.bat b/win32/ext/enchant-wdk/src/build-x86.bat
index f5cc71b9..f5cc71b9 100644
--- a/ext/enchant-wdk/src/build-x86.bat
+++ b/win32/ext/enchant-wdk/src/build-x86.bat
diff --git a/ext/enchant-wdk/src/config.h b/win32/ext/enchant-wdk/src/config.h
index d91c69c6..d91c69c6 100644
--- a/ext/enchant-wdk/src/config.h
+++ b/win32/ext/enchant-wdk/src/config.h
diff --git a/ext/enchant-wdk/src/libenchant.rc b/win32/ext/enchant-wdk/src/libenchant.rc
index f8f52651..f8f52651 100644
--- a/ext/enchant-wdk/src/libenchant.rc
+++ b/win32/ext/enchant-wdk/src/libenchant.rc
diff --git a/ext/enchant-wdk/src/makefile.mak b/win32/ext/enchant-wdk/src/makefile.mak
index 77925ad6..77925ad6 100644
--- a/ext/enchant-wdk/src/makefile.mak
+++ b/win32/ext/enchant-wdk/src/makefile.mak
diff --git a/ext/enchant-wdk/src/release-x64.bat b/win32/ext/enchant-wdk/src/release-x64.bat
index 0a40fc71..0a40fc71 100644
--- a/ext/enchant-wdk/src/release-x64.bat
+++ b/win32/ext/enchant-wdk/src/release-x64.bat
diff --git a/ext/enchant-wdk/src/release-x86.bat b/win32/ext/enchant-wdk/src/release-x86.bat
index a33bec76..a33bec76 100644
--- a/ext/enchant-wdk/src/release-x86.bat
+++ b/win32/ext/enchant-wdk/src/release-x86.bat
diff --git a/ext/libxml-wdk/libxml-wdk.patch b/win32/ext/libxml-wdk/libxml-wdk.patch
index fa8979b2..fa8979b2 100644
--- a/ext/libxml-wdk/libxml-wdk.patch
+++ b/win32/ext/libxml-wdk/libxml-wdk.patch
diff --git a/ext/libxml-wdk/win32/build-x64.bat b/win32/ext/libxml-wdk/win32/build-x64.bat
index fadfe4c8..fadfe4c8 100644
--- a/ext/libxml-wdk/win32/build-x64.bat
+++ b/win32/ext/libxml-wdk/win32/build-x64.bat
diff --git a/ext/libxml-wdk/win32/build-x86.bat b/win32/ext/libxml-wdk/win32/build-x86.bat
index 961fafc8..961fafc8 100644
--- a/ext/libxml-wdk/win32/build-x86.bat
+++ b/win32/ext/libxml-wdk/win32/build-x86.bat
diff --git a/ext/lua-wdk/build-x64.bat b/win32/ext/lua-wdk/build-x64.bat
index a160cd97..a160cd97 100644
--- a/ext/lua-wdk/build-x64.bat
+++ b/win32/ext/lua-wdk/build-x64.bat
diff --git a/ext/lua-wdk/build-x86.bat b/win32/ext/lua-wdk/build-x86.bat
index 75a054ed..75a054ed 100644
--- a/ext/lua-wdk/build-x86.bat
+++ b/win32/ext/lua-wdk/build-x86.bat
diff --git a/ext/lua-wdk/lua-wdk.patch b/win32/ext/lua-wdk/lua-wdk.patch
index 8173d951..8173d951 100644
--- a/ext/lua-wdk/lua-wdk.patch
+++ b/win32/ext/lua-wdk/lua-wdk.patch
diff --git a/ext/nss-wdk/build-x64.bat b/win32/ext/nss-wdk/build-x64.bat
index 96bb0422..96bb0422 100644
--- a/ext/nss-wdk/build-x64.bat
+++ b/win32/ext/nss-wdk/build-x64.bat
diff --git a/ext/nss-wdk/build-x86.bat b/win32/ext/nss-wdk/build-x86.bat
index c6d4868e..c6d4868e 100644
--- a/ext/nss-wdk/build-x86.bat
+++ b/win32/ext/nss-wdk/build-x86.bat
diff --git a/ext/nss-wdk/nss-wdk.patch b/win32/ext/nss-wdk/nss-wdk.patch
index fdbdbf8c..fdbdbf8c 100644
--- a/ext/nss-wdk/nss-wdk.patch
+++ b/win32/ext/nss-wdk/nss-wdk.patch
diff --git a/ext/openssl-wdk/build-x64.bat b/win32/ext/openssl-wdk/build-x64.bat
index 7fdedb24..7fdedb24 100644
--- a/ext/openssl-wdk/build-x64.bat
+++ b/win32/ext/openssl-wdk/build-x64.bat
diff --git a/ext/openssl-wdk/build-x86.bat b/win32/ext/openssl-wdk/build-x86.bat
index 66c1e4dd..66c1e4dd 100644
--- a/ext/openssl-wdk/build-x86.bat
+++ b/win32/ext/openssl-wdk/build-x86.bat
diff --git a/ext/openssl-wdk/certdata.txt b/win32/ext/openssl-wdk/certdata.txt
index ef6ab23f..ef6ab23f 100644
--- a/ext/openssl-wdk/certdata.txt
+++ b/win32/ext/openssl-wdk/certdata.txt
diff --git a/ext/openssl-wdk/mk-ca-bundle.pl b/win32/ext/openssl-wdk/mk-ca-bundle.pl
index 3b4e16ae..3b4e16ae 100644
--- a/ext/openssl-wdk/mk-ca-bundle.pl
+++ b/win32/ext/openssl-wdk/mk-ca-bundle.pl
diff --git a/ext/openssl-wdk/openssl-wdk.patch b/win32/ext/openssl-wdk/openssl-wdk.patch
index ceab5fed..ceab5fed 100644
--- a/ext/openssl-wdk/openssl-wdk.patch
+++ b/win32/ext/openssl-wdk/openssl-wdk.patch
diff --git a/ext/zlib-wdk/LICENSE.ZLIB b/win32/ext/zlib-wdk/LICENSE.ZLIB
index a62a5d7b..a62a5d7b 100644
--- a/ext/zlib-wdk/LICENSE.ZLIB
+++ b/win32/ext/zlib-wdk/LICENSE.ZLIB
diff --git a/ext/zlib-wdk/install.props b/win32/ext/zlib-wdk/install.props
index d3517733..d3517733 100644
--- a/ext/zlib-wdk/install.props
+++ b/win32/ext/zlib-wdk/install.props
diff --git a/ext/zlib-wdk/install.vcxproj b/win32/ext/zlib-wdk/install.vcxproj
index f19aba87..f19aba87 100644
--- a/ext/zlib-wdk/install.vcxproj
+++ b/win32/ext/zlib-wdk/install.vcxproj
diff --git a/ext/zlib-wdk/install.vcxproj.filters b/win32/ext/zlib-wdk/install.vcxproj.filters
index 86fd366d..86fd366d 100644
--- a/ext/zlib-wdk/install.vcxproj.filters
+++ b/win32/ext/zlib-wdk/install.vcxproj.filters
diff --git a/ext/zlib-wdk/install.vcxproj.user b/win32/ext/zlib-wdk/install.vcxproj.user
index 695b5c78..695b5c78 100644
--- a/ext/zlib-wdk/install.vcxproj.user
+++ b/win32/ext/zlib-wdk/install.vcxproj.user
diff --git a/ext/zlib-wdk/miniunz.vcxproj b/win32/ext/zlib-wdk/miniunz.vcxproj
index 56b846d0..56b846d0 100644
--- a/ext/zlib-wdk/miniunz.vcxproj
+++ b/win32/ext/zlib-wdk/miniunz.vcxproj
diff --git a/ext/zlib-wdk/miniunz.vcxproj.filters b/win32/ext/zlib-wdk/miniunz.vcxproj.filters
index 0b2a3de2..0b2a3de2 100644
--- a/ext/zlib-wdk/miniunz.vcxproj.filters
+++ b/win32/ext/zlib-wdk/miniunz.vcxproj.filters
diff --git a/ext/zlib-wdk/miniunz.vcxproj.user b/win32/ext/zlib-wdk/miniunz.vcxproj.user
index 695b5c78..695b5c78 100644
--- a/ext/zlib-wdk/miniunz.vcxproj.user
+++ b/win32/ext/zlib-wdk/miniunz.vcxproj.user
diff --git a/ext/zlib-wdk/minizip.vcxproj b/win32/ext/zlib-wdk/minizip.vcxproj
index aed19fe1..aed19fe1 100644
--- a/ext/zlib-wdk/minizip.vcxproj
+++ b/win32/ext/zlib-wdk/minizip.vcxproj
diff --git a/ext/zlib-wdk/minizip.vcxproj.filters b/win32/ext/zlib-wdk/minizip.vcxproj.filters
index dd73cd31..dd73cd31 100644
--- a/ext/zlib-wdk/minizip.vcxproj.filters
+++ b/win32/ext/zlib-wdk/minizip.vcxproj.filters
diff --git a/ext/zlib-wdk/minizip.vcxproj.user b/win32/ext/zlib-wdk/minizip.vcxproj.user
index 695b5c78..695b5c78 100644
--- a/ext/zlib-wdk/minizip.vcxproj.user
+++ b/win32/ext/zlib-wdk/minizip.vcxproj.user
diff --git a/ext/zlib-wdk/testzlib.vcxproj b/win32/ext/zlib-wdk/testzlib.vcxproj
index ab7f1abc..ab7f1abc 100644
--- a/ext/zlib-wdk/testzlib.vcxproj
+++ b/win32/ext/zlib-wdk/testzlib.vcxproj
diff --git a/ext/zlib-wdk/testzlib.vcxproj.filters b/win32/ext/zlib-wdk/testzlib.vcxproj.filters
index 249daa89..249daa89 100644
--- a/ext/zlib-wdk/testzlib.vcxproj.filters
+++ b/win32/ext/zlib-wdk/testzlib.vcxproj.filters
diff --git a/ext/zlib-wdk/testzlib.vcxproj.user b/win32/ext/zlib-wdk/testzlib.vcxproj.user
index 695b5c78..695b5c78 100644
--- a/ext/zlib-wdk/testzlib.vcxproj.user
+++ b/win32/ext/zlib-wdk/testzlib.vcxproj.user
diff --git a/ext/zlib-wdk/testzlibdll.vcxproj b/win32/ext/zlib-wdk/testzlibdll.vcxproj
index 600b3586..600b3586 100644
--- a/ext/zlib-wdk/testzlibdll.vcxproj
+++ b/win32/ext/zlib-wdk/testzlibdll.vcxproj
diff --git a/ext/zlib-wdk/testzlibdll.vcxproj.filters b/win32/ext/zlib-wdk/testzlibdll.vcxproj.filters
index 53a8693b..53a8693b 100644
--- a/ext/zlib-wdk/testzlibdll.vcxproj.filters
+++ b/win32/ext/zlib-wdk/testzlibdll.vcxproj.filters
diff --git a/ext/zlib-wdk/testzlibdll.vcxproj.user b/win32/ext/zlib-wdk/testzlibdll.vcxproj.user
index 695b5c78..695b5c78 100644
--- a/ext/zlib-wdk/testzlibdll.vcxproj.user
+++ b/win32/ext/zlib-wdk/testzlibdll.vcxproj.user
diff --git a/ext/zlib-wdk/zlib.rc b/win32/ext/zlib-wdk/zlib.rc
index f8224508..f8224508 100644
--- a/ext/zlib-wdk/zlib.rc
+++ b/win32/ext/zlib-wdk/zlib.rc
diff --git a/ext/zlib-wdk/zlibstat.vcxproj b/win32/ext/zlib-wdk/zlibstat.vcxproj
index 13d887ff..13d887ff 100644
--- a/ext/zlib-wdk/zlibstat.vcxproj
+++ b/win32/ext/zlib-wdk/zlibstat.vcxproj
diff --git a/ext/zlib-wdk/zlibstat.vcxproj.filters b/win32/ext/zlib-wdk/zlibstat.vcxproj.filters
index c8c7f7ea..c8c7f7ea 100644
--- a/ext/zlib-wdk/zlibstat.vcxproj.filters
+++ b/win32/ext/zlib-wdk/zlibstat.vcxproj.filters
diff --git a/ext/zlib-wdk/zlibstat.vcxproj.user b/win32/ext/zlib-wdk/zlibstat.vcxproj.user
index 695b5c78..695b5c78 100644
--- a/ext/zlib-wdk/zlibstat.vcxproj.user
+++ b/win32/ext/zlib-wdk/zlibstat.vcxproj.user
diff --git a/ext/zlib-wdk/zlibvc.def b/win32/ext/zlib-wdk/zlibvc.def
index 0269ef72..0269ef72 100644
--- a/ext/zlib-wdk/zlibvc.def
+++ b/win32/ext/zlib-wdk/zlibvc.def
diff --git a/ext/zlib-wdk/zlibvc.sln b/win32/ext/zlib-wdk/zlibvc.sln
index de207fdc..de207fdc 100644
--- a/ext/zlib-wdk/zlibvc.sln
+++ b/win32/ext/zlib-wdk/zlibvc.sln
diff --git a/ext/zlib-wdk/zlibvc.vcxproj b/win32/ext/zlib-wdk/zlibvc.vcxproj
index 0d2448d4..0d2448d4 100644
--- a/ext/zlib-wdk/zlibvc.vcxproj
+++ b/win32/ext/zlib-wdk/zlibvc.vcxproj
diff --git a/ext/zlib-wdk/zlibvc.vcxproj.filters b/win32/ext/zlib-wdk/zlibvc.vcxproj.filters
index 180b71cd..180b71cd 100644
--- a/ext/zlib-wdk/zlibvc.vcxproj.filters
+++ b/win32/ext/zlib-wdk/zlibvc.vcxproj.filters
diff --git a/ext/zlib-wdk/zlibvc.vcxproj.user b/win32/ext/zlib-wdk/zlibvc.vcxproj.user
index 695b5c78..695b5c78 100644
--- a/ext/zlib-wdk/zlibvc.vcxproj.user
+++ b/win32/ext/zlib-wdk/zlibvc.vcxproj.user
diff --git a/build/glibconfig-x64.h b/win32/glibconfig-x64.h
index 84a6e22b..84a6e22b 100644
--- a/build/glibconfig-x64.h
+++ b/win32/glibconfig-x64.h
diff --git a/build/glibconfig-x86.h b/win32/glibconfig-x86.h
index 7f8a0636..7f8a0636 100644
--- a/build/glibconfig-x86.h
+++ b/win32/glibconfig-x86.h
diff --git a/build/isskin/watercolorlite-blue.cjstyles b/win32/isskin/watercolorlite-blue.cjstyles
index a457029b..a457029b 100644
--- a/build/isskin/watercolorlite-blue.cjstyles
+++ b/win32/isskin/watercolorlite-blue.cjstyles
Binary files differdiff --git a/build/isskin/watercolorlite-green.cjstyles b/win32/isskin/watercolorlite-green.cjstyles
index 2b77026d..2b77026d 100644
--- a/build/isskin/watercolorlite-green.cjstyles
+++ b/win32/isskin/watercolorlite-green.cjstyles
Binary files differdiff --git a/build/release-src.bat b/win32/release-src.bat
index 9df98250..9df98250 100644
--- a/build/release-src.bat
+++ b/win32/release-src.bat
diff --git a/build/release-x64.bat b/win32/release-x64.bat
index 4e658fc6..6483a950 100644
--- a/build/release-x64.bat
+++ b/win32/release-x64.bat
@@ -1,6 +1,6 @@
 @echo off
-set DEPS_ROOT=..\dep-x64
-set XCHAT_DEST=..\dist-x64
+set DEPS_ROOT=deps-x64
+set XCHAT_DEST=dist-x64
 rmdir /q /s %XCHAT_DEST%
 mkdir %XCHAT_DEST%
 echo 2> portable-mode
diff --git a/build/release-x86.bat b/win32/release-x86.bat
index a2598399..dc45146a 100644
--- a/build/release-x86.bat
+++ b/win32/release-x86.bat
@@ -1,6 +1,6 @@
 @echo off
-set DEPS_ROOT=..\dep-x86
-set XCHAT_DEST=..\dist-x86
+set DEPS_ROOT=deps-x86
+set XCHAT_DEST=dist-x86
 rmdir /q /s %XCHAT_DEST%
 mkdir %XCHAT_DEST%
 echo 2> portable-mode
diff --git a/build/share/themes/Murrine/gtk-2.0/gtkrc b/win32/share/themes/Murrine/gtk-2.0/gtkrc
index b9d95848..b9d95848 100644
--- a/build/share/themes/Murrine/gtk-2.0/gtkrc
+++ b/win32/share/themes/Murrine/gtk-2.0/gtkrc
diff --git a/build/share/xml/iso-codes/iso_3166.xml b/win32/share/xml/iso-codes/iso_3166.xml
index 77c72eb2..77c72eb2 100644
--- a/build/share/xml/iso-codes/iso_3166.xml
+++ b/win32/share/xml/iso-codes/iso_3166.xml
diff --git a/build/share/xml/iso-codes/iso_639.xml b/win32/share/xml/iso-codes/iso_639.xml
index 02fa01fb..02fa01fb 100644
--- a/build/share/xml/iso-codes/iso_639.xml
+++ b/win32/share/xml/iso-codes/iso_639.xml
diff --git a/build/version.c b/win32/version.c
index 0201d298..0201d298 100644
--- a/build/version.c
+++ b/win32/version.c
diff --git a/build/xchat-wdk-spell.skel.iss b/win32/xchat-wdk-spell.skel.iss
index 6d1b26b6..6d1b26b6 100644
--- a/build/xchat-wdk-spell.skel.iss
+++ b/win32/xchat-wdk-spell.skel.iss
diff --git a/build/xchat-wdk-x64.skel.iss b/win32/xchat-wdk-x64.skel.iss
index 83e8031c..3b1abd2b 100644
--- a/build/xchat-wdk-x64.skel.iss
+++ b/win32/xchat-wdk-x64.skel.iss
@@ -11,8 +11,8 @@ DefaultDirName={pf}\XChat-WDK
 DefaultGroupName=XChat-WDK
 DisableProgramGroupPage=yes
 SolidCompression=yes
-SourceDir=..\dist-x64
-OutputDir=..\build
+SourceDir=dist-x64
+OutputDir=..\
 FlatComponentsList=no
 PrivilegesRequired=none
 ShowComponentSizes=no
diff --git a/build/xchat-wdk-x86.skel.iss b/win32/xchat-wdk-x86.skel.iss
index f0131dec..3b16fe0d 100644
--- a/build/xchat-wdk-x86.skel.iss
+++ b/win32/xchat-wdk-x86.skel.iss
@@ -11,8 +11,8 @@ DefaultDirName={pf}\XChat-WDK
 DefaultGroupName=XChat-WDK
 DisableProgramGroupPage=yes
 SolidCompression=yes
-SourceDir=..\dist-x86
-OutputDir=..\build
+SourceDir=dist-x86
+OutputDir=..\
 FlatComponentsList=no
 PrivilegesRequired=none
 ShowComponentSizes=no