--- a/Contrib/ExperienceUI/Lang.nsh	Mon Aug 03 21:26:49 2009 -0400
+++ b/Contrib/ExperienceUI/Lang.nsh	Mon Aug 03 21:36:03 2009 -0400
@@ -119,7 +119,7 @@
 !insertmacro XPUI_LANGPAGE_COMPILE_ATTRIB_FORCE XPUI_BRANDINGTEXT_COLOR_FG
 !insertmacro XPUI_LANGPAGE_COMPILE_ATTRIB_FORCE XPUI_BRANDINGTEXT_COLOR_BG
 
-!execute `"${NSISDIR}\MakeNSIS.exe" "/NOCD" "/V0" "/DCHECKLIST=${XPUI_LANGPAGE_CHECKFILE}" "/DXPUI_LANGINI_LIST_B=${XPUI_LANGINI_LIST}" "/DXPUI_LANGIDLIST_LIST_B=${XPUI_LANGIDLIST_LIST}" ${XPUI_LANGPAGE_COMPILE_PARAMS} "${XPUI_SYSDIR}\LangPage.nsi"`
+!execute `"${NSISDIR}\MakeNSIS.exe" "/NOCD" "/V0" "/DCHECKLIST=${XPUI_LANGPAGE_CHECKFILE}" "/DXPUI_LANGINI_LIST_B=${XPUI_LANGINI_LIST}" "/DXPUI_LANGIDLIST_LIST_B=${XPUI_LANGIDLIST_LIST}" ${XPUI_LANGPAGE_COMPILE_PARAMS} "${XPUI_SYSDIR}\Langpage.nsi"`
 
 !macroend
 
@@ -140,7 +140,7 @@
 !insertmacro XPUI_LANGPAGE_COMPILE
 InitPluginsDir
 SetOutPath $PLUGINSDIR
-File `${XPUI_SYSDIR}\LangDialog.exe`
+File `$%TEMP%\LangDialog.exe`
 !system `del "${XPUI_SYSDIR}\LangDialog.exe"`
 ExecWait $PLUGINSDIR\LangDialog.exe $LANGUAGE
 Delete $PLUGINSDIR\LangDialog.exe

--- a/Contrib/ExperienceUI/Langpage.nsi	Mon Aug 03 21:26:49 2009 -0400
+++ b/Contrib/ExperienceUI/Langpage.nsi	Mon Aug 03 21:36:03 2009 -0400
@@ -10,7 +10,7 @@
 
 Name "Select Language"
 Caption " "
-OutFile "${NSISDIR}\Contrib\ExperienceUI\LangDialog.exe"
+OutFile "$%TEMP%\LangDialog.exe"
 
 MiscButtonText "" "" "" OK
 !define XPUI_DISABLEBG
@@ -30,7 +30,7 @@
 StrCmp $0 "/CancelDialog" 0 +2
 Abort
 SetOutPath $PLUGINSDIR
-File "${NSISDIR}\Contrib\ExperienceUI\INI\LangDlg.ini"
+File "${XPUI_SYSDIR}\INI\LangDlg.ini"
 WriteINIStr "$PLUGINSDIR\LangDlg.ini" "Field 1" ListItems "${XPUI_LANGINI_LIST_B}"
 StrCpy $XPUI_TEMP1 "${XPUI_LANGINI_LIST_B}"
 StrCpy $XPUI_HWND 0