diff --git a/.gitignore b/.gitignore
index e6ad413..d2ba2cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,11 +10,11 @@
 
 /*.pyc
 
-/Data/**
+/bin/**
 
-/Other/Source/PortableApps.comInstaller*
-/App/AppInfo/Launcher/Debug.nsh
-/App/AppInfo/Launcher/Custom.nsh
+/etc/source/PortableApps.comInstaller*
+/App/AppInfo/Debug.nsh
+/App/AppInfo/ExtendedWrapper.nsh
 
 # generated by sphinx from Other/Source/Manual
 /App/Manual/**
diff --git a/Other/Source/CheckForPlatformSplashDisable.nsh b/Other/Source/CheckForPlatformSplashDisable.nsh
deleted file mode 100644
index 788c647..0000000
--- a/Other/Source/CheckForPlatformSplashDisable.nsh
+++ /dev/null
@@ -1,51 +0,0 @@
-; CheckForPlatformSplashDisable 1.0 (2010-06-16)
-;
-; Checks if the platform wants the splash screen disabled
-; Copyright 2008-2010 John T. Haller of PortableApps.com
-; Released under the GPL
-;
-; Usage: ${CheckForPlatformSplashDisable} _v
-;
-; Example: ${CheckForPlatformSplashDisable} $DISABLESPLASHSCREEN
-;    If the platform wants it disabled, $DISABLESPLASHSCREEN will be true.
-;    Otherwise it will be whatever its previous value was
-
-!macro CheckForPlatformSplashDisable _v
-	StrCmp ${_v} true _CFPSDEnd
-		;Get the parameter and sort out the stack
-		Push $0
-		Push $1
-		Push $R0
-		
-		StrCpy $0 ${_v}
-
-		;Read from the INI
-		ReadEnvStr $1 PortableApps.comDisableSplash
-		StrCmp $1 true "" _CFPSDStackEnd
-
-		${GetParent} $EXEDIR $1
-		IfFileExists $1\PortableApps.com\PortableAppsPlatform.exe "" _CFPSDStackEnd
-
-		MoreInfo::GetProductName `$1\PortableApps.com\PortableAppsPlatform.exe`
-		Pop $R0
-		StrCmp $R0 "PortableApps.com Platform" "" _CFPSDStackEnd
-
-		MoreInfo::GetCompanyName `$1\PortableApps.com\PortableAppsPlatform.exe`
-		Pop $R0
-		StrCmp $R0 PortableApps.com "" _CFPSDStackEnd
-
-		FindProc $R0 PortableAppsPlatform.exe
-		IntCmp $R0 1 "" _CFPSDStackEnd _CFPSDStackEnd
-
-		StrCpy $0 true
-
-		_CFPSDStackEnd:
-		; Restore the stack and sort everything out
-		Pop $R0
-		Pop $1
-		Exch $0
-		Pop ${_v}
-
-	_CFPSDEnd:
-!macroend
-!define CheckForPlatformSplashDisable '!insertmacro CheckForPlatformSplashDisable'
diff --git a/Other/Source/CompilerWizard.nsi b/Other/Source/CompilerWizard.nsi
deleted file mode 100644
index 65e4cb5..0000000
--- a/Other/Source/CompilerWizard.nsi
+++ /dev/null
@@ -1,366 +0,0 @@
-/**
- * PortableApps Compiler developed by Devin "demon.devin" Gaul
- * For support, visit the GitHub project page:
- * https://github.com/demondevin/pac-man
- *
- */
-
-;=== For NSIS3
-Unicode true 
-;ManifestDPIAware true
-
-!define CustomIconAndName
-
-;=== Require at least Unicode NSIS 2.46
-!include RequireLatestNSIS.nsh
-
-;=== Program Details
-Name "PortableApps Compiler"
-OutFile ..\..\PortableAppsCompiler.exe
-Icon ..\..\App\AppInfo\appicon.ico
-Caption "PortableApps Compiler"
-VIProductVersion 3.0.0.0
-VIAddVersionKey ProductName "PortableApps Compiler"
-VIAddVersionKey Comments "A compiler for custom-built, portable applications based on PortableApps.com Launcher provided by PortableApps.com"
-VIAddVersionKey CompanyName "How Dumb, LLC"
-VIAddVersionKey LegalCopyright "Copyleft demon.devin"
-VIAddVersionKey FileDescription "PortableApps Compiler"
-VIAddVersionKey FileVersion 3.0.0.0
-VIAddVersionKey ProductVersion 3.0.0.0
-VIAddVersionKey InternalName "PortableApps Compiler"
-VIAddVersionKey LegalTrademarks "PortableApps.com is a Trademark of Rare Ideas, LLC."
-VIAddVersionKey OriginalFilename PortableAppsCompiler.exe
-
-;=== Runtime Switches
-RequestExecutionLevel user
-
-; Best Compression
-SetCompress Auto
-SetCompressor /SOLID lzma
-SetCompressorDictSize 32
-SetDatablockOptimize On
-
-;=== Include
-;(Standard)
-!include FileFunc.nsh
-!include LogicLib.nsh
-!include MUI.nsh
-
-;(NSIS Plugins)
-!include NewTextReplace.nsh
-!AddPluginDir Plugins
-
-;(Custom)
-!include ReplaceInFileWithTextReplace.nsh
-
-;=== Icon & Stye ===
-!define MUI_ICON "..\..\App\AppInfo\appicon.ico"
-!define MUI_HEADERIMAGE
-!define MUI_HEADERIMAGE_RIGHT
-!define MUI_HEADERIMAGE_BITMAP header.bmp
-
-BrandingText "PortableApps Compiler - Port And Let Portable!"
-InstallButtonText "Go >" 
-ShowInstDetails show
-SubCaption 3 " | Compiling Portable Launcher"
-
-
-;=== Variables
-Var FINISHTEXT
-Var FINISHTITLE
-Var NSIS
-Var PACKAGE
-Var SKIPWELCOMEPAGE
-Var AUTOMATICCOMPILE
-Var ERROROCCURED
-Var AppID
-Var Name
-
-;=== Pages
-!define MUI_WELCOMEFINISHPAGE_BITMAP welcomefinish.bmp
-!define MUI_WELCOMEPAGE_TITLE "PortableApps Compiler"
-!define MUI_WELCOMEPAGE_TEXT "Welcome to the PortableApps Compiler.\r\n\r\nThis utility is based on the PortableApps.com Launcher Generator. This advanced compiler allows you to create a portable launcher for an application in the PortableApps.com Format specifications. Click next to start the compiling process."
-!define MUI_PAGE_CUSTOMFUNCTION_PRE ShowWelcomeWindow
-!insertmacro MUI_PAGE_WELCOME
-Page custom ShowOptionsWindow LeaveOptionsWindow " | Portable App Folder Selection" 
-Page instfiles
-!define MUI_PAGE_CUSTOMFUNCTION_PRE ShowFinishPage
-!define MUI_FINISHPAGE_TITLE "$FINISHTITLE"
-!define MUI_FINISHPAGE_TEXT "$FINISHTEXT"
-!define MUI_FINISHPAGE_RUN
-!define MUI_FINISHPAGE_RUN_NOTCHECKED
-!define MUI_FINISHPAGE_RUN_TEXT "Test Launcher"
-!define MUI_FINISHPAGE_RUN_FUNCTION "RunOnFinish"
-!define MUI_FINISHPAGE_SHOWREADME "$EXEDIR\Data\PortableAppsCompilerLog.txt"
-!define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
-!define MUI_FINISHPAGE_SHOWREADME_TEXT "View log file"
-!insertmacro MUI_PAGE_FINISH
-
-;=== Languages
-;!insertmacro MUI_LANGUAGE "English"
-
-Function .onInit
-	!insertmacro MUI_INSTALLOPTIONS_EXTRACT "CompilerWizardForm.ini"
-	SetOutPath $EXEDIR
-	
-	CreateDirectory $EXEDIR\Data
-	
-	ReadINIStr $SKIPWELCOMEPAGE $EXEDIR\Data\settings.ini CompilerWizard SkipWelcomePage
-	ReadINIStr $0 $EXEDIR\Data\settings.ini CompilerWizard Drive
-	ReadINIStr $PACKAGE $EXEDIR\Data\settings.ini CompilerWizard Package
-	; Update drive letter; doesn't matter if $0 == ""
-	StrLen $1 $0
-	StrCpy $2 $PACKAGE $1
-	${If} $2 == $0
-		StrCpy $PACKAGE $PACKAGE "" $1
-		StrCpy $PACKAGE $0$PACKAGE
-	${EndIf}
-
-	;StrCpy $NSIS "$EXEDIR\App\NSIS\makensis.exe"
-	ReadINIStr $NSIS $EXEDIR\Data\settings.ini CompilerWizard makensis
-	${If} $NSIS == ""
-		StrCpy $NSIS ..\NSISPortable\App\NSIS\makensis.exe
-		WriteINIStr $EXEDIR\Data\settings.ini CompilerWizard makensis $NSIS
-	${EndIf}	
-
-	${GetParameters} $R0
-	StrCmp $R0 "" PreFillForm
-		StrCpy $PACKAGE $R0
-		StrCpy $SKIPWELCOMEPAGE "true"
-		StrCpy $AUTOMATICCOMPILE "true"
-		;Strip quotes from $PACKAGE
-		StrCpy $R0 $PACKAGE 1
-		StrCmp $R0 `"` "" PreFillForm
-		StrCpy $PACKAGE $PACKAGE "" 1
-		StrCpy $PACKAGE $PACKAGE -1
-
-	PreFillForm:
-		;=== Pre-Fill Path with Directory
-		WriteINIStr $PLUGINSDIR\CompilerWizardForm.ini "Field 2" "State" "$PACKAGE"
-FunctionEnd
-
-Function ShowWelcomeWindow
-	StrCmp $SKIPWELCOMEPAGE "true" "" ShowWelcomeWindowEnd
-		Abort
-	ShowWelcomeWindowEnd:
-FunctionEnd
-
-Function ShowOptionsWindow
-	!insertmacro MUI_HEADER_TEXT "PortableApps Compiler" "a better alternative to PA.c Launcher"
-	${IfThen} $AUTOMATICCOMPILE == "true" ${|} Abort ${|}
-	InstallOptions::InitDialog /NOUNLOAD "$PLUGINSDIR\CompilerWizardForm.ini"
-    Pop $0
-    InstallOptions::Show
-FunctionEnd
-
-Function LeaveOptionsWindow
-	ReadINIStr $PACKAGE $PLUGINSDIR\CompilerWizardForm.ini "Field 2" "State"
-
-	${If} $PACKAGE == ""
-		MessageBox MB_OK|MB_ICONEXCLAMATION `Please select a valid portable app's base directory to create a launcher for.`
-		Abort
-	${EndIf}
-	${GetRoot} $EXEDIR $0
-	WriteINIStr $EXEDIR\Data\settings.ini CompilerWizard Drive $0
-	WriteINIStr $EXEDIR\Data\settings.ini CompilerWizard Package $PACKAGE
-FunctionEnd
-
-!define WriteErrorToLog "!insertmacro WriteErrorToLog"
-
-!macro WriteErrorToLog ErrorToWrite
-	FileOpen $9 "$EXEDIR\Data\PortableAppsCompilerLog.txt" a
-	FileSeek $9 0 END
-	FileWrite $9 `ERROR: ${ErrorToWrite}`
-	FileWriteByte $9 "13"
-	FileWriteByte $9 "10"
-	FileClose $9
-	StrCpy $ERROROCCURED "true"
-!macroend
-
-!macro UpdatePath Source Target
-	${If} ${FileExists} "$PACKAGE\${Source}"
-		DetailPrint "${Source} -> ${Target}"
-		SetDetailsPrint none
-		Rename "$PACKAGE\${Source}" "$PACKAGE\${Target}"
-		SetDetailsPrint lastused
-	${EndIf}
-!macroend
-
-Function UpdateLanguageEnvironmentVariables
-	Pop $9 # file
-
-	FileOpen $8 $9 r
-	FileReadWord $8 $7
-	FileClose $8
-
-	SetDetailsPrint none
-	${If} $7 = 0xFEFF
-		${ReplaceInFileUTF16LE} $9 PortableApps.comLanguageCode  PAL:LanguageCode
-		${ReplaceInFileUTF16LE} $9 PortableApps.comLocaleCode2   PAL:LanguageCode2
-		${ReplaceInFileUTF16LE} $9 PortableApps.comLocaleCode3   PAL:LanguageCode3
-		${ReplaceInFileUTF16LE} $9 PortableApps.comLocaleGlibc   PAL:LanguageGlibc
-		${ReplaceInFileUTF16LE} $9 PortableApps.comLocaleWinName PAL:LanguageNSIS
-		${ReplaceInFileUTF16LE} $9 PortableApps.comLocaleName    PAL:LanguageName
-		${ReplaceInFileUTF16LE} $9 PortableApps.comLocaleID      PAL:LanguageLCID
-	${Else}
-		${ReplaceInFile} $9 PortableApps.comLanguageCode  PAL:LanguageCode
-		${ReplaceInFile} $9 PortableApps.comLocaleCode2   PAL:LanguageCode2
-		${ReplaceInFile} $9 PortableApps.comLocaleCode3   PAL:LanguageCode3
-		${ReplaceInFile} $9 PortableApps.comLocaleGlibc   PAL:LanguageGlibc
-		${ReplaceInFile} $9 PortableApps.comLocaleWinName PAL:LanguageNSIS
-		${ReplaceInFile} $9 PortableApps.comLocaleName    PAL:LanguageName
-		${ReplaceInFile} $9 PortableApps.comLocaleID      PAL:LanguageLCID
-	${EndIf}
-	SetDetailsPrint lastused
-FunctionEnd
-
-Section Main
-	${IfNot} ${FileExists} $NSIS
-		StrCpy $ERROROCCURED true
-		${WriteErrorToLog} "NSIS not found at $NSIS."
-		MessageBox MB_ICONSTOP "NSIS was not found! (Looked for it in $NSIS)$\r$\n$\r$\nYou can specify a custom path to makensis.exe in $EXEDIR\Data\settings.ini, [CompilerWizard]:makensis"
-		Abort
-	${EndIf}
-
-	; Fix the package path, if necessary
-	StrCpy $R1 $PACKAGE 1 -1
-	${IfThen} $R1 == "\" ${|} StrCpy $PACKAGE $PACKAGE -1 ${|}
-
-	SetDetailsPrint ListOnly
-	DetailPrint "App: $PACKAGE"
-	DetailPrint " "
-	RealProgress::SetProgress /NOUNLOAD 0
-	RealProgress::GradualProgress /NOUNLOAD 1 20 90 "Processing complete."
-
-	; Check if any upgrade needs to be done from 2.0 to 2.1
-	; ${If}   ${FileExists} $PACKAGE\Other\Source\PortableApps.comLauncherCustom.nsh
-	; ${OrIf} ${FileExists} $PACKAGE\Other\Source\PortableApps.comLauncherDebug.nsh
-		; DetailPrint "Upgrading from 2.0 to 2.1..."
-		; !insertmacro UpdatePath Other\Source\PortableApps.comLauncherCustom.nsh App\AppInfo\Launcher\Custom.nsh
-		; !insertmacro UpdatePath Other\Source\PortableApps.comLauncherDebug.nsh  App\AppInfo\Launcher\Debug.nsh
-
-		;Replace ${ReadUserOverrideConfig} with ${ReadUserConfig}
-		;Check if it's UTF-16LE
-		; FileOpen $0 $PACKAGE\App\AppInfo\Launcher\Custom.nsh r
-		; FileReadWord $0 $1
-		; FileClose $0
-		;Avoid ${...} being taken amiss
-		; StrCpy $0 $${ReadUser
-		; ${If} $1 = 0xFEFF
-			; ${If} $5 == UTF-16LE
-				; ${ReplaceInFileUTF16LECS} $PACKAGE\App\AppInfo\Launcher\Custom.nsh $0OverrideConfig} $0Config}
-			; ${Else}
-				; ${ReplaceInFileCS} $PACKAGE\App\AppInfo\Launcher\Custom.nsh $0OverrideConfig} $0Config}
-			; ${EndIf}
-		; ${EndIf}
-		; DetailPrint " "
-	; ${EndIf}
-
-	; Check if any upgrade needs to be done from 2.1
-	; DetailPrint "Upgrading from 2.1 if needed..."
-	; Replace the PortableApps.com language environment variables with their PAL counterparts
-	;Push $PACKAGE\App\AppInfo\Launcher\Custom.nsh
-	;Call UpdateLanguageEnvironmentVariables
-	;FindFirst $0 $1 $PACKAGE\App\AppInfo\Launcher\*.ini
-	;${DoUntil} $1 == ""
-	;	Push $PACKAGE\App\AppInfo\Launcher\$1
-	;	Call UpdateLanguageEnvironmentVariables
-	;	FindNext $0 $1
-	;${Loop}
-	;FindClose $0
-	;DetailPrint " "
-
-
-	DetailPrint "Compiling portable launcher..."
-	SetDetailsPrint none
-	
-	Delete "$EXEDIR\Data\PortableAppsCompilerLog.txt"
-
-	!ifdef CustomIconAndName
-		!define _ $PACKAGE
-	!else
-		!define _ $EXEDIR
-	!endif
-	${IfNot} ${FileExists} "${_}\App\AppInfo\appinfo.ini"
-		StrCpy $ERROROCCURED true
-		${WriteErrorToLog} "${_}\App\AppInfo\appinfo.ini doesn't exist!"
-	${Else}
-		ClearErrors
-		ReadINIStr $Name "${_}\App\AppInfo\appinfo.ini" Details Name
-		ReadINIStr $AppID "${_}\App\AppInfo\appinfo.ini" Details AppID
-		ReadINIStr $1 "$EXEDIR\App\AppInfo\appinfo.ini" Version PackageVersion
-
-		${If} ${Errors}
-			StrCpy $ERROROCCURED true
-			${WriteErrorToLog} "[Details]:Name [Details]:AppID or [Version]:PackageVersion not found in appinfo.ini files"
-		${Else}
-			;Delete existing installer if there is one
-			Delete "$PACKAGE\$AppID.exe"
-			${If} ${FileExists} "$PACKAGE\$AppID.exe"
-				StrCpy $ERROROCCURED true
-				${WriteErrorToLog} "Unable to delete $PACKAGE\$AppID.exe, is it running?"
-			${EndIf}
-		${EndIf}
-	${EndIf}
-
-	${If} ${FileExists} "${_}\App\AppInfo\Launcher\$AppID.ini"
-		; If not, never mind.  It'll complain when the user tries to run it if they haven't created it yet.
-
-		StrCpy $2 ""
-		; See if we need to enable XML
-		ReadINIStr $3 "${_}\App\AppInfo\Launcher\$AppID.ini" Activate XML
-		${If} $3 == true
-			StrCpy $2 "$2 /DXML_ENABLED"
-		${EndIf}
-
-		; See if we need to use the RequestExecutionLevel admin
-		ReadINIStr $3 "${_}\App\AppInfo\Launcher\$AppID.ini" Launch RunAsAdmin
-		${If} $3 == compile-force
-			StrCpy $2 "$2 /DRUNASADMIN_COMPILEFORCE"
-		${EndIf}
-	${EndIf}
-
-	${If} $ERROROCCURED != true
-		; Build the thing
-		ExecDos::exec `"$NSIS" /O"$EXEDIR\Data\PortableAppsCompilerLog.txt" /DPACKAGE="$PACKAGE" /DNamePortable="$Name" /DAppID="$AppID" /DVersion="$1"$2 "$EXEDIR\Other\Source\PortableAppsCompiler.nsi"` "" ""
-		Pop $R1
-		${If} $R1 <> 0
-			StrCpy $ERROROCCURED true
-			${WriteErrorToLog} "MakeNSIS exited with status code $R1"
-		${EndIf}
-	${EndIf}
-
-	SetDetailsPrint ListOnly
-
-	DetailPrint " "
-	DetailPrint "Processing complete."
-	${If} ${FileExists} $PACKAGE\$AppID.exe
-		StrCpy $FINISHTITLE "Launcher Created"
-		StrCpy $FINISHTEXT "The launcher has been created. Launcher location:\r\n$PACKAGE\r\n\r\nLauncher name:\r\n$AppID.exe" 
-	${Else}
-		StrCpy $FINISHTITLE "An Error Occurred"
-		StrCpy $FINISHTEXT "The launcher was not created. You can view the log file for more information."
-		StrCpy $ERROROCCURED true
-	${EndIf}
-SectionEnd
-
-Function ShowFinishPage
-	${If} $AUTOMATICCOMPILE == "true"
-	${AndIf} $ERROROCCURED != true
-		Abort
-	${Else}
-		${If} $ERROROCCURED == true
-			!insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Flags" "DISABLED"
-			!insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 5" "State" "1"
-		${EndIf}
-	${EndIf}
-FunctionEnd
-
-Function RunOnFinish
-	Exec $PACKAGE\$AppID.exe
-FunctionEnd
-
-Function .onGUIEnd
-	RealProgress::Unload
-FunctionEnd
-
diff --git a/Other/Source/Debug.nsh b/Other/Source/Debug.nsh
deleted file mode 100644
index d09dc66..0000000
--- a/Other/Source/Debug.nsh
+++ /dev/null
@@ -1,87 +0,0 @@
-; Macro: check if in debug mode for the current section {{{1
-!macro !getdebug
-	!ifdef DEBUG
-		!undef DEBUG
-	!endif
-	!ifdef DEBUG_ALL
-		!define DEBUG
-	!else
-		!ifdef Segment
-			!ifdef DEBUG_SEGMENT_${Segment}
-				!define DEBUG
-			!endif
-		!else ifdef DEBUG_GLOBAL
-			!define DEBUG
-		!endif
-	!endif
-!macroend
-!define !getdebug "!insertmacro !getdebug"
-
-; Macro: print a debug message {{{1
-!macro DebugMsg _MSG
-	${!getdebug}
-	!ifdef DEBUG
-
-		; Logging to file {{{2
-		!ifndef DEBUG_OUTPUT
-			!define _DebugMsg_OK
-		!else if ${DEBUG_OUTPUT} == file
-			!define _DebugMsg_OK
-		!endif
-		!ifdef _DebugMsg_OK
-			!ifdef Segment
-				!define _DebugMsg_Seg "${Segment}/${__FUNCTION__}"
-			!else
-				!define _DebugMsg_Seg "Global"
-			!endif
-			!ifndef _DebugMsg_FileOpened
-				Var /GLOBAL _DebugMsg_File
-				FileOpen $_DebugMsg_File $EXEDIR\Data\debug.log w
-				FileWrite $_DebugMsg_File "PortableApps Compiler ${Version} debug messages for ${NamePortable} (${AppID})$\r$\n"
-				; TODO: hg revision number from .hg/branch, branchheads.cache
-				; My ${!ifexist} doesn't work in Wine, not sure if I can fix it
-				!define _DebugMsg_FileOpened
-			!else
-				FileOpen  $_DebugMsg_File $EXEDIR\Data\debug.log a
-				FileSeek  $_DebugMsg_File 0 END
-			!endif
-			FileWrite $_DebugMsg_File "${_DebugMsg_Seg} (line ${__LINE__}): ${_MSG}$\r$\n$\r$\n"
-			FileClose $_DebugMsg_File
-			!undef _DebugMsg_Seg
-			!undef _DebugMsg_OK
-		!endif ;}}}
-
-		; Logging to display: message box {{{2
-		!ifndef DEBUG_OUTPUT
-			!define _DebugMsg_OK
-		!else if ${DEBUG_OUTPUT} == messagebox
-			!define _DebugMsg_OK
-		!endif
-		!ifdef _DebugMsg_OK
-			!ifdef Segment
-				!define _DebugMsg_Seg "$\r$\n$\r$\nSegment: ${Segment}$\r$\nHook: ${__FUNCTION__}"
-			!else
-				!define _DebugMsg_Seg ""
-			!endif
-			MessageBox MB_OKCANCEL|MB_ICONINFORMATION "Debug message at line ${__LINE__}${_DebugMsg_Seg}$\r$\n____________________$\r$\n$\r$\n${_MSG}" IDOK +2
-				Abort
-			!undef _DebugMsg_Seg
-			!undef _DebugMsg_OK
-		!endif ;}}}
-	!endif
-!macroend
-!define DebugMsg "!insertmacro DebugMsg" ; }}}
-
-; If you want to debug this, create Debug.nsh in the package's
-; App\AppInfo\Launcher directory. It should then have lines like these:
-; · Debug everything
-;     !define DEBUG_ALL
-;   · This leaves out the "about to execute segment" and "finished executing
-;     segment" messages unless you put this line in:
-;       !define DEBUG_SEGWRAP
-; · Debug just certain portions
-;   · Debug outside any segments
-;       !define DEBUG_GLOBAL
-;   · Debug a given segment or segments
-;       !define DEBUG_SEGMENT_[SegmentName]
-!include /NONFATAL "${PACKAGE}\App\AppInfo\Launcher\Debug.nsh"
diff --git a/Other/Source/Defines.nsh b/Other/Source/Defines.nsh
deleted file mode 100644
index 3d053c7..0000000
--- a/Other/Source/Defines.nsh
+++ /dev/null
@@ -1,448 +0,0 @@
-;=#
-;
-; Defines.nsh
-; 
-; This file gathers all the necessary settings definitions for runtime.
-; 
-!define APPINFOINI		`${PACKAGE}\App\AppInfo\appinfo.ini`
-!define CUSTOM			`${PACKAGE}\App\AppInfo\Launcher\custom.nsh`
-!define LAUNCHERINI		`${PACKAGE}\App\AppInfo\Launcher\${AppID}.ini`
-
-${!ECHO} "${NEWLINE}Retrieving information from files in the AppInfo directory...${NEWLINE}${NEWLINE}"
-
-!searchparse /ignorecase /noerrors /file "${LAUNCHERINI}" `ProgramExecutable64=` APPEXE64
-!searchparse /ignorecase /noerrors /file "${LAUNCHERINI}" `Registry=` REGISTRY
-!searchparse /ignorecase /noerrors /file "${LAUNCHERINI}" `Java=` JAVA
-!searchparse /ignorecase /noerrors /file "${LAUNCHERINI}" `JDK=` JDK
-!searchparse /ignorecase /noerrors /file "${LAUNCHERINI}" `XML=` XML_PLUGIN
-!searchparse /ignorecase /noerrors /file "${LAUNCHERINI}" `Services=` SERVICES
-!searchparse /ignorecase /noerrors /file "${LAUNCHERINI}" `RegDLLs=` REGISTERDLL
-!searchparse /ignorecase /noerrors /file "${LAUNCHERINI}" `Ghostscript=` GHOSTSCRIPT
-!searchparse /ignorecase /noerrors /file "${LAUNCHERINI}" `RunAsAdmin=` UAC
-!searchparse /ignorecase /noerrors /file "${LAUNCHERINI}" `ExecAsUser=` ExecAsUser
-!searchparse /ignorecase /noerrors /file "${LAUNCHERINI}" `RegRedirection=` DISABLEFSR
-!searchparse /ignorecase /noerrors /file "${LAUNCHERINI}" `Redirection=` SYSTEMWIDE_DISABLEREDIR
-!searchparse /ignorecase /noerrors /file "${LAUNCHERINI}" `ForceRedirection=` FORCE_SYSTEMWIDE_DISABLEREDIR
-!searchparse /ignorecase /noerrors /file "${LAUNCHERINI}" `Tasks=` TaskCleanUp
-!searchparse /ignorecase /noerrors /file "${LAUNCHERINI}" `RegCopyKeys=` RegCopy
-!searchparse /ignorecase /noerrors /file "${LAUNCHERINI}" `FileCleanup=` FileCleanup
-!searchparse /ignorecase /noerrors /file "${LAUNCHERINI}" `DirectoryCleanup=` DirectoryCleanup
-!searchparse /ignorecase /noerrors /file "${LAUNCHERINI}" `FontsFolder=` FONTS_ENABLE
-
-!searchparse /ignorecase /noerrors /file "${APPINFOINI}" `AppID=` APPNAME
-!searchparse /ignorecase /noerrors /file "${APPINFOINI}" `Name=` PORTABLEAPPNAME
-!searchparse /ignorecase /noerrors /file "${APPINFOINI}" `CertSigning=` Certificate
-!searchparse /ignorecase /noerrors /file "${APPINFOINI}" `UsesDotNetVersion=` dotNET_Version
-!searchparse /ignorecase /noerrors /file "${APPINFOINI}" `ElevatedPrivileges=` Elevate
-!searchparse /ignorecase /noerrors /file "${APPINFOINI}" `FileWriteReplace=` REPLACE
-!searchparse /ignorecase /noerrors /file "${APPINFOINI}" `RegistryValueWrite=` RegValueWrite
-!searchparse /ignorecase /noerrors /file "${APPINFOINI}" `UseStdUtils=` StdUtils
-!searchparse /ignorecase /noerrors /file "${APPINFOINI}" `InstallINF=` INF_Install
-!searchparse /ignorecase /noerrors /file "${APPINFOINI}" `FileLocking=` FileLocking
-!searchparse /ignorecase /noerrors /file "${APPINFOINI}" `Junctions=` NTFS
-!searchparse /ignorecase /noerrors /file "${APPINFOINI}" `ACLRegSupport=` ACL
-!searchparse /ignorecase /noerrors /file "${APPINFOINI}" `ACLDirSupport=` ACL_DIR
-!searchparse /ignorecase /noerrors /file "${APPINFOINI}" `RMEmptyDir=` RMEMPTYDIRECTORIES
-!searchparse /ignorecase /noerrors /file "${APPINFOINI}" `LocalLow=` LocalLow
-!searchparse /ignorecase /noerrors /file "${APPINFOINI}" `PublicDoc=` PublicDoc
-!searchparse /ignorecase /noerrors /file "${APPINFOINI}" `CompareVersions=` CompareVersions
-!searchparse /ignorecase /noerrors /file "${APPINFOINI}" `ConfigFunctions=` ConFunc
-!searchparse /ignorecase /noerrors /file "${APPINFOINI}" `CloseWindow=` CloseWindow
-!searchparse /ignorecase /noerrors /file "${APPINFOINI}" `JSONSupport=` JSON
-!searchparse /ignorecase /noerrors /file "${APPINFOINI}" `RestartSleep=` SleepValue
-!searchparse /ignorecase /noerrors /file "${APPINFOINI}" `WinMessages=` WinMessages
-!searchparse /ignorecase /noerrors /file "${APPINFOINI}" `LineWrite=` LineWrite
-!searchparse /ignorecase /noerrors /file "${APPINFOINI}" `TrimString=` TrimString
-!searchparse /ignorecase /noerrors /file "${APPINFOINI}" `CloseProcess=` CloseProc
-!searchparse /ignorecase /noerrors /file "${APPINFOINI}" `Include64=` Include64
-!searchparse /ignorecase /noerrors /file "${APPINFOINI}" `IncludeWordRep=` IncludeWordRep
-!searchparse /ignorecase /noerrors /file "${APPINFOINI}" `GetBetween=` GetBetween
-
-!searchreplace APP "${APPNAME}" "Portable" ""
-!searchreplace FULLNAME "${PORTABLEAPPNAME}" " Portable" ""
-!define APPDIR			`$EXEDIR\App\${APP}`
-!if ! "${APPEXE64}" == ""
-	!searchreplace APP64 "${APPNAME}" "Portable" "64"
-!else
-	!ifdef APPEXE64
-		!undef APPEXE64
-	!endif
-!endif
-!ifdef APP64
-	!define APPDIR64	`$EXEDIR\App\${APP64}`
-!endif
-!if "${Certificate}" == true
-	!define /REDEF Certificate
-!else
-	!ifdef Certificate
-		!undef Certificate
-	!endif
-!endif
-!if "${REGISTRY}" == true
-	!define /REDEF REGISTRY
-	!ifdef APP64
-		!if ${DISABLEFSR} == true
-			!define /REDEF DISABLEFSR 	;= Disable Registry redirection for x64 machines.
-		!endif
-	!endif
-!else
-	!ifdef REGISTRY
-		!undef REGISTRY
-	!endif
-!endif
-!ifdef dotNET_Version
-	!if ! ${dotNET_Version} == ""
-		!define DOTNET
-		!include DotNetVer.nsh
-	!else
-		!error "The key 'UsesDotNetVersion' in AppInfo.ini is set but has no value! If this PAF does not require the .NET Framework please omit this key entirely."
-	!endif
-!else
-	!ifdef dotNET_Version
-		!undef dotNET_Version
-	!endif
-!endif
-!if "${JAVA}" == "find"
-	!define /REDEF JAVA
-!else if "${JAVA}" == "require"
-	!define /REDEF JAVA
-!else
-	!ifdef JAVA
-		!undef JAVA
-	!endif
-!endif
-!if "${JDK}" == "find"
-	!define /REDEF JDK
-!else if "${JDK}" == "require"
-	!define /REDEF JDK
-!else
-	!ifdef JDK
-		!undef JDK
-	!endif
-!endif
-!if "${XML_PLUGIN}" == true
-	!define /REDEF XML_PLUGIN
-	!include XML.nsh
-!else
-	!ifdef XML_PLUGIN
-		!undef XML_PLUGIN
-	!endif
-!endif
-!if "${GHOSTSCRIPT}" == "find"
-	!define /REDEF GHOSTSCRIPT
-!else if "${GHOSTSCRIPT}" == "require"
-	!define /REDEF GHOSTSCRIPT
-!else
-	!ifdef GHOSTSCRIPT
-		!undef GHOSTSCRIPT
-	!endif
-!endif
-!if ! ${TrimString} == ""
-	!if ${TrimString} == true
-		!define /REDEF TrimString
-	!else if ${TrimString} == false
-		!undef TrimString
-	!endif
-!else
-	!error "The key 'TrimString' in AppInfo.ini needs a true/false value!${NewLine}${NewLine}If support for this isn't needed, omit this key entirely!"
-!endif
-!if ! ${CloseProc} == ""
-	!if ${CloseProc} == true
-		!define /REDEF CloseProc
-	!else if ${CloseProc} == false
-		!undef CloseProc
-	!endif
-!else
-	!error "The key 'CloseProcess' in AppInfo.ini needs a true/false value!${NewLine}${NewLine}If support for this isn't needed, omit this key entirely!"
-!endif
-!if "${UAC}" == "force"
-	!define /REDEF UAC
-	!ifndef TrimString
-		!define TrimString
-	!endif
-!else if  "${UAC}" == "compile-force"
-	!define /REDEF UAC
-	!ifndef TrimString
-		!define TrimString
-	!endif
-!else if "${UAC}" == "try"
-	!define /REDEF UAC
-	!ifndef TrimString
-		!define TrimString
-	!endif
-	!include UAC.nsh
-!else if "${Elevate}" == "auto"
-	!define /REDEF UAC
-	!ifndef TrimString
-		!define TrimString
-	!endif
-!else
-	!ifdef UAC
-		!undef UAC
-	!endif
-!endif
-!if ${SERVICES} == true
-	!define /REDEF SERVICES 			;= Enable support for Services
-!else
-	!ifdef SERVICES
-		!undef SERVICES
-	!endif
-!endif
-!if ${REGISTERDLL} == true
-	!define /REDEF REGISTERDLL 			;= Enable support for registering library (DLLs) files
-!else
-	!ifdef REGISTERDLL
-		!undef REGISTERDLL
-	!endif
-!endif
-!if ! ${SleepValue} == ""
-	!define Sleep ${SleepValue}			;= Specify a number (milliseconds) to set a Sleep value for applications that need to restart.
-!else
-	!error "The key 'RestartSleep' in AppInfo.ini needs a value that's an integer!${NewLine}${NewLine}If support for this isn't needed, omit this key entirely!"
-!endif
-!if ! ${LineWrite} == ""
-	!if ${LineWrite} == true 			;= include LineWrite.nsh
-		!define Include_LineWrite
-	!else if ${LineWrite} == false
-		!undef LineWrite
-	!endif
-!else
-	!error "The key 'LineWrite' in AppInfo.ini needs a true/false value!${NewLine}${NewLine}If support for this isn't needed, omit this key entirely!"
-!endif
-!if ! ${WinMessages} == ""
-	!if ${WinMessages} == true 			;= include WinMessages.nsh
-		!define Include_WinMessages
-	!else if ${WinMessages} == false
-		!undef WinMessages
-	!endif
-!else
-	!error "The key 'WinMessages' in AppInfo.ini needs a true/false value!${NewLine}${NewLine}If support for this isn't needed, omit this key entirely!"
-!endif
-!if ! ${GetBetween} == ""
-	!if ${GetBetween} == true 			;= include GetBetween.nsh
-		!define GetBetween.nsh
-	!else if ${GetBetween} == false
-		!undef GetBetween
-	!endif
-!else
-	!error "The key 'GetBetween' in AppInfo.ini needs a true/false value!${NewLine}${NewLine}If support for this isn't needed, omit this key entirely!"
-!endif
-!if ! ${IncludeWordRep} == ""
-	!if ${IncludeWordRep} == true 			;= include the WordRep(S) functions.
-		!define Include_WordRep
-	!else if ${IncludeWordRep} == false
-		!undef IncludeWordRep
-	!endif
-!else
-	!error "The key 'IncludeWordRep' in AppInfo.ini needs a true/false value!${NewLine}${NewLine}If support for this isn't needed, omit this key entirely!"
-!endif
-!if ! ${Include64} == ""
-	!if ${Include64} == true 			;= include x64.nsh
-		!define 64.nsh
-	!else if ${Include64} == false
-		!undef Include64
-	!endif
-!else
-	!error "The key 'Include64' in AppInfo.ini needs a true/false value!${NewLine}${NewLine}If support for this isn't needed, omit this key entirely!"
-!endif
-!if ! ${ConFunc} == ""
-	!if ${ConFunc} == true 				;= Enable ConfigWrite(S), ConfigRead(S) Functions.
-		!define /REDEF ConFunc
-	!else if ${ConFunc} == false
-		!undef ConFunc
-	!endif
-!else
-	!error "The key 'ConfigFunctions' in AppInfo.ini needs a true/false value!${NewLine}${NewLine}If support for this isn't needed, omit this key entirely!"
-!endif
-!if ! ${LocalLow} == ""
-	!if ${LocalLow} == true 			;= Enable GetLocalAppDataLow Function.
-		!define /REDEF LocalLow
-	!else if ${LocalLow} == false
-		!undef LocalLow
-	!endif
-!else
-	!error "The key 'LocalLow' in AppInfo.ini needs a true/false value!${NewLine}${NewLine}If support for this isn't needed, omit this key entirely!"
-!endif
-!if ! ${CompareVersions} == ""
-	!if ${CompareVersions} == true 		;= Enable VersionCompare Function.
-		!define /REDEF CompareVersions
-	!else if ${CompareVersions} == false
-		!undef CompareVersions
-	!endif
-!else
-	!error "The key 'CompareVersions' in AppInfo.ini needs a true/false value!${NewLine}${NewLine}If support for this isn't needed, omit this key entirely!"
-!endif
-!if ! ${PublicDoc} == ""
-	!if ${PublicDoc} == true 			;= Enable GetPublicDoc Function.
-		!define /REDEF PublicDoc
-	!else if ${PublicDoc} == false
-		!undef PublicDoc
-	!endif
-!else
-	!error "The key 'PublicDoc' in AppInfo.ini needs a true/false value!${NewLine}${NewLine}If support for this isn't needed, omit this key entirely!"
-!endif
-!if ! ${RegValueWrite} == ""
-	!if ${RegValueWrite} == true
-		!define RegSleep 50 			;= Sleep value for the [RegistryValueWrite] section. Function is inaccurate otherwise.
-	!else if ${RegValueWrite} == false
-		!undef RegValueWrite
-	!endif
-!else
-	!error "The key 'RegistryValueWrite' in AppInfo.ini needs a true/false value!${NewLine}${NewLine}If support for this isn't needed, omit this key entirely!"
-!endif
-!if ! ${REPLACE} == ""
-	!if ${REPLACE} == true 				;= Enables Replace functionality in [FileWrite]
-		!define /REDEF REPLACE
-	!else if ${REPLACE} == false
-		!undef REPLACE
-	!endif
-!else
-	!error "The key 'FileWriteReplace' in AppInfo.ini needs a true/false value!${NewLine}${NewLine}If support for this isn't needed, omit this key entirely!"
-!endif
-!if ! ${RMEMPTYDIRECTORIES} == ""
-	!if ${RMEMPTYDIRECTORIES} == true 	;= Enable RMEmptyDir Function.
-		!define /REDEF RMEMPTYDIRECTORIES
-	!else if ${RMEMPTYDIRECTORIES} == false
-		!undef RMEMPTYDIRECTORIES
-	!endif
-!else
-	!error "The key 'RMEmptyDir' in AppInfo.ini needs a true/false value!${NewLine}${NewLine}If support for this isn't needed, omit this key entirely!"
-!endif
-!if ! ${StdUtils} == ""
-	!if ${StdUtils} == true
-		!define /REDEF StdUtils 		;= Include StndUtils without ExecAsUser
-	!else if ${StdUtils} == false
-		!undef StdUtils
-	!endif
-!else
-	!error "The key 'UseStdUtils' in AppInfo.ini needs a true/false value!${NewLine}${NewLine}If support for this isn't needed, omit this key entirely!"
-!endif
-!if ! ${ExecAsUser} == ""
-	!if ${ExecAsUser} == true
-		!define /REDEF ExecAsUser 		;= For applications which need to run as normal user. 
-	!else if ${ExecAsUser} == false
-		!undef ExecAsUser
-	!endif
-!else
-	!error "The key 'ExecAsUser' in AppInfo.ini needs a true/false value!${NewLine}${NewLine}If support for this isn't needed, omit this key entirely!"
-!endif
-!if ! ${INF_Install} == ""
-	!if ${INF_Install} == true
-		!define /REDEF INF_Install 		;= Enable for INF installation support.
-	!else if ${INF_Install} == false
-		!undef INF_Install
-	!endif
-!else
-	!error "The key 'InstallINF' in AppInfo.ini needs a true/false value!${NewLine}${NewLine}If support for this isn't needed, omit this key entirely!"
-!endif
-!if ! ${SYSTEMWIDE_DISABLEREDIR} == ""
-	!if ${SYSTEMWIDE_DISABLEREDIR} == true
-		!define /REDEF SYSTEMWIDE_DISABLEREDIR
-	!else if ${SYSTEMWIDE_DISABLEREDIR} == false
-		!undef SYSTEMWIDE_DISABLEREDIR
-	!endif
-!else
-	!error "The key 'DisableRedirection' in AppInfo.ini needs a true/false value!${NewLine}${NewLine}If support for this isn't needed, omit this key entirely!"
-!endif
-!if ! ${FORCE_SYSTEMWIDE_DISABLEREDIR} == ""
-	!if ${FORCE_SYSTEMWIDE_DISABLEREDIR} == true
-		!define /REDEF FORCE_SYSTEMWIDE_DISABLEREDIR
-	!else if ${FORCE_SYSTEMWIDE_DISABLEREDIR} == false
-		!undef FORCE_SYSTEMWIDE_DISABLEREDIR
-	!endif
-!else
-	!error "The key 'ForceDisableRedirection' in AppInfo.ini needs a true/false value!${NewLine}${NewLine}If support for this isn't needed, omit this key entirely!"
-!endif
-!if ! ${FONTS_ENABLE} == ""
-	!if ${FONTS_ENABLE} == true
-		!define /REDEF FONTS_ENABLE 	;= Enable font support in ..\Data\Fonts
-	!else if ${FONTS_ENABLE} == false
-		!undef FONTS_ENABLE 
-	!endif
-!else
-	!error "The key 'FontsFolder' in AppInfo.ini needs a true/false value!${NewLine}${NewLine}If support for this isn't needed, omit this key entirely!"
-!endif
-!if ! ${JSON} == ""
-	!if ${JSON} == true
-		!define /REDEF JSON		;= Enable the Close function
-	!else if ${JSON} == false
-		!undef JSON 
-	!endif
-!else
-	!error "The key 'JSONSupport' in AppInfo.ini needs a true/false value!${NewLine}${NewLine}If support for this isn't needed, omit this key entirely!"
-!endif
-!if ! ${CloseWindow} == ""
-	!if ${CloseWindow} == true
-		!define /REDEF CloseWindow		;= Enable the Close function
-	!else if ${CloseWindow} == false
-		!undef CloseWindow 
-	!endif
-!else
-	!error "The key 'CloseWindow' in AppInfo.ini needs a true/false value!${NewLine}${NewLine}If support for this isn't needed, omit this key entirely!"
-!endif
-!if ! ${FileLocking} == ""
-	!if ${FileLocking} == true
-		!define IsFileLocked 			;= If enabled, PortableApp will ensure DLL(s) are unlocked.
-		!ifndef CloseWindow
-			!define CloseWindow
-		!endif
-	!else if ${FileLocking} == false
-		!undef FileLocking 				;= Disable 
-	!endif
-!else
-	!error "The key 'FileLocking' in AppInfo.ini needs a true/false value!${NewLine}${NewLine}If support for this isn't needed, omit this key entirely!"
-!endif
-!if ! ${NTFS} == ""
-	!if ${NTFS} == true
-		!define /REDEF NTFS 			;= Enable support for Junctions (Symlinks)
-	!else if ${NTFS} == false
-		!undef NTFS 					;= Disable
-	!endif
-!else
-	!error "The key 'Junctions' in AppInfo.ini needs a true/false value!${NewLine}${NewLine}If support for this isn't needed, omit this key entirely!"
-!endif
-!if ! ${ACL} == ""
-	!if ${ACL} == true
-		!define /REDEF ACL 				;= Enable AccessControl support for registry keys
-	!else if ${ACL} == false
-		!undef ACL 						;= Disable AccessControl support for registry keys
-	!endif
-!else
-	!error "The key 'ACLRegSupport' in AppInfo.ini needs a true/false value!${NewLine}${NewLine}If support for this isn't needed, omit this key entirely!"
-!endif
-!if ! ${ACL_DIR} == ""
-	!if ${ACL_DIR} == true
-		!define /REDEF ACL_DIR 			;= Enable AccessControl support for directories
-	!else if ${ACL_DIR} == false
-		!undef ACL_DIR 					;= Disable AccessControl support for directories
-	!endif
-!else
-	!error "The key 'ACLDirSupport' in AppInfo.ini needs a true/false value!${NewLine}${NewLine}If support for this isn't needed, omit this key entirely!"
-!endif
-!if ! ${FileCleanup} == ""
-	!if ${FileCleanup} == true
-		!define /REDEF FileCleanup 		;= Enable FileCleanup segment
-	!else if ${FileCleanup} == false
-		!undef FileCleanup 				;= Disable FileCleanup segment
-	!endif
-!else
-	!error "The key 'FileCleanup' in AppInfo.ini needs a true/false value!${NewLine}${NewLine}If support for this isn't needed, omit this key entirely!"
-!endif
-!if ! ${DirectoryCleanup} == ""
-	!if ${DirectoryCleanup} == true
-		!define /REDEF DirectoryCleanup 		;= Enable DirectoryCleanup segment
-	!else if ${DirectoryCleanup} == false
-		!undef DirectoryCleanup 				;= Disable DirectoryCleanup segment
-	!endif
-!else
-	!error "The key 'DirectoryCleanup' in AppInfo.ini needs a true/false value!${NewLine}${NewLine}If support for this isn't needed, omit this key entirely!"
-!endif
-!if ! ${TaskCleanup} == ""
-	!if ${TaskCleanup} == true
-		!define /REDEF TaskCleanup 		;= Enable TaskCleanup segment
-	!else if ${TaskCleanup} == false
-		!undef TaskCleanup 				;= Disable TaskCleanup segment
-	!endif
-!else
-	!error "The key 'TaskCleanup' in AppInfo.ini needs a true/false value!${NewLine}${NewLine}If support for this isn't needed, omit this key entirely!"
-!endif
diff --git a/Other/Source/License.txt b/Other/Source/License.txt
deleted file mode 100644
index d6a3987..0000000
--- a/Other/Source/License.txt
+++ /dev/null
@@ -1,344 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-		  NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE,
-THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT
-PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED
-IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND,
-EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY
-AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
-NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR
-AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY
-OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM
-AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING
-ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM
-(INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY
-OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS
-BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-	     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) 19yy name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
\ No newline at end of file
diff --git a/Other/Source/Manual/_static/donation_button.png b/Other/Source/Manual/_static/donation_button.png
deleted file mode 100644
index f19dea7..0000000
Binary files a/Other/Source/Manual/_static/donation_button.png and /dev/null differ
diff --git a/Other/Source/Manual/_static/favicon.ico b/Other/Source/Manual/_static/favicon.ico
deleted file mode 100644
index ed849b2..0000000
Binary files a/Other/Source/Manual/_static/favicon.ico and /dev/null differ
diff --git a/Other/Source/Manual/_static/help_background_footer.png b/Other/Source/Manual/_static/help_background_footer.png
deleted file mode 100644
index 5ebdc02..0000000
Binary files a/Other/Source/Manual/_static/help_background_footer.png and /dev/null differ
diff --git a/Other/Source/Manual/_static/help_background_header.png b/Other/Source/Manual/_static/help_background_header.png
deleted file mode 100644
index cf1ebf7..0000000
Binary files a/Other/Source/Manual/_static/help_background_header.png and /dev/null differ
diff --git a/Other/Source/Manual/_static/help_logo_top.png b/Other/Source/Manual/_static/help_logo_top.png
deleted file mode 100644
index 1a70505..0000000
Binary files a/Other/Source/Manual/_static/help_logo_top.png and /dev/null differ
diff --git a/Other/Source/Readme.txt b/Other/Source/Readme.txt
deleted file mode 100644
index 10402c7..0000000
--- a/Other/Source/Readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-Please read help.html for documentation and examples.
diff --git a/Other/Source/Segments/Environment.nsh b/Other/Source/Segments/Environment.nsh
deleted file mode 100644
index 6236aac..0000000
--- a/Other/Source/Segments/Environment.nsh
+++ /dev/null
@@ -1,12 +0,0 @@
-${SegmentFile}
-${SegmentInit}
-	!ifmacrodef Variables
-		!insertmacro Variables
-	!endif
-!macroend
-${SegmentPre}
-	${ForEachINIPair} Environment $0 $1
-		ExpandEnvStrings $1 $1
-		System::Call `Kernel32::SetEnvironmentVariable(tr0,tr1)`
-	${NextINIPair}
-!macroend
diff --git a/Other/Source/Segments/RegistryCopyKeys.nsh b/Other/Source/Segments/RegistryCopyKeys.nsh
deleted file mode 100644
index fccc1e8..0000000
--- a/Other/Source/Segments/RegistryCopyKeys.nsh
+++ /dev/null
@@ -1,85 +0,0 @@
-!ifndef PAF
-	!define PAF `HKCU\Software\PortableApps`
-!endif
-!ifndef PAFKEYS
-	!define PAFKEYS `${PAF}\Keys`
-!endif
-${SegmentFile}
-${SegmentPrePrimary}
-	${If} $Registry == true
-		${ForEachINIPair} RegistryCopyKeys $R0 $R1
-			${ValidateRegistryKey} $R1
-			ExpandEnvStrings $R1 $R1
-			${IfNot} ${RegistryKeyExists} `${PAFKEYS}\$R1`
-			${AndIf} ${RegistryKeyExists} $R1
-				StrCpy $R2 $R1 4
-				StrCmp $R2 HKLM 0 +2
-				StrCmp $ADMIN true 0 +3
-				Registry::_CopyKey /NOUNLOAD $R1 `${PAFKEYS}\$R1`
-				Pop $R2
-			${EndIf}
-			StrCmp $R0 - +11
-			ExpandEnvStrings $R0 $R0
-			IfFileExists `${SET}\$R0.reg` 0 +9
-			IfFileExists `${REGEDIT}` 0 +5
-			!ifdef DisableFSR
-				ExecDos::exec /TOSTACK /DISABLEFSR `"${REGEDIT}" /s "${SET}\$R0.reg"`
-			!else
-				ExecDos::exec /TOSTACK `"${REGEDIT}" /s "${SET}\$R0.reg"`
-			!endif
-			Pop $R1
-			Pop $R2
-			StrCmp $R1 0 +4
-			!ifdef DisableFSR
-				ExecDos::exec /TOSTACK /DISABLEFSR `"${REGEXE}" IMPORT "${SET}\$R0.reg"`
-			!else
-				ExecDos::exec /TOSTACK `"${REGEXE}" IMPORT "${SET}\$R0.reg"`
-			!endif
-			Pop $R1
-			Pop $R2
-		${NextINIPair}
-	${EndIf}
-!macroend
-${SegmentPostPrimary}
-	${If} $REGISTRY == true
-		${ForEachINIPair} RegistryCopyKeys $R0 $R1
-			${ValidateRegistryKey} $R1
-			ExpandEnvStrings $R1 $R1
-			StrCmp $R0 - +14
-			StrCmp $RunLocally true +13
-			ExpandEnvStrings $R0 $R0
-			Registry::_SaveKey /NOUNLOAD $R1 `${SET}\$R0.reg` ""
-			Pop $R2
-			StrCmp $R2 0 +9
-			IfFileExists `${REGEDIT}` 0 +5
-			!ifdef DisableFSR
-				ExecDos::exec /TOSTACK /DISABLEFSR `"${REGEDIT}" /e "${SET}\$R0.reg" "$R1"`
-			!else
-				ExecDos::exec /TOSTACK `"${REGEDIT}" /e "${SET}\$R0.reg" "$R1"`
-			!endif
-			Pop $R2
-			Pop $R3
-			StrCmp $R2 0 +4
-			!ifdef DisableFSR
-				ExecDos::exec /TOSTACK /DISABLEFSR `"${REGEXE}" SAVE "$R1" "${SET}\$R0.reg"`
-			!else
-				ExecDos::exec /TOSTACK `"${REGEXE}" SAVE "$R1" "${SET}\$R0.reg"`
-			!endif
-			Pop $R2
-			Pop $R3
-			Registry::_DeleteKey /NOUNLOAD $R1
-			Pop $R2
-			${If} ${RegistryKeyExists} `${PAFKEYS}\$R1`
-				Registry::_MoveKey /NOUNLOAD `${PAFKEYS}\$R1` $R1
-				Pop $R2
-				${Do}
-					${GetParent} $R1 $R1
-					Registry::_DeleteKeyEmpty /NOUNLOAD `${PAFKEYS}\$R1`
-					Pop $R2
-				${LoopUntil} $R1 == ""
-			${EndIf}
-		${NextINIPair}
-		Registry::_DeleteKeyEmpty /NOUNLOAD `${PAF}`
-		Pop $R2
-	${EndIf}
-!macroend
\ No newline at end of file
diff --git a/Other/Source/Segments/RunBeforeAfter.nsh b/Other/Source/Segments/RunBeforeAfter.nsh
deleted file mode 100644
index d697c93..0000000
--- a/Other/Source/Segments/RunBeforeAfter.nsh
+++ /dev/null
@@ -1,28 +0,0 @@
-${SegmentFile}
-
-!macro _RunBeforeAfter_Contents Time
-	StrCpy $R0 1
-	${Do}
-		ClearErrors
-		${ReadLauncherConfig} $1 Launch Run${Time}$R0
-		${IfThen} ${Errors} ${|} ${ExitDo} ${|}
-		${ParseLocations} $1
-
-		; Safety check so paths with spaces work
-		StrCpy $R1 $1 1
-		${If} $R1 != '"'
-			MessageBox MB_ICONEXCLAMATION `[Launch]:Run${Time}$R0 doesn't have the path quoted, which is against the rules (remember to have a line like Run${Time}$R0='"$1"').`
-		${EndIf}
-
-		ExecWait $1
-		IntOp $R0 $R0 + 1
-	${Loop}
-!macroend
-
-${SegmentPreExec}
-	!insertmacro _RunBeforeAfter_Contents Before
-!macroend
-
-${SegmentPostExec}
-	!insertmacro _RunBeforeAfter_Contents After
-!macroend
diff --git a/Other/Source/Segments/SplashScreen.nsh b/Other/Source/Segments/SplashScreen.nsh
deleted file mode 100644
index 76c0c23..0000000
--- a/Other/Source/Segments/SplashScreen.nsh
+++ /dev/null
@@ -1,44 +0,0 @@
-; ${SegmentFile}
-
-; Var DisableSplashScreen
-
-; ${SegmentInit}
-	; ${If} $DisableSplashScreen != true
-		; ${ReadUserConfig} $DisableSplashScreen DisableSplashScreen
-		; Hmm... I think we'll skip validating this.
-
-		; ClearErrors
-		; ${ReadLauncherConfig} $0 Launch SplashTime
-		; ${IfNot} ${Errors}
-		; ${AndIf} $0 = 0 ; = is IntCmp, which which a string is 0
-		; ${AndIf} $0 != 0 ; ... but "0" is valid.  Silly, but valid.
-			; ${InvalidValueError} [Launch]:SplashTime $0 ; string, not int
-		; ${EndIf}
-
-		; ${IfNotThen} ${FileExists} $EXEDIR\App\AppInfo\Launcher\splash.jpg ${|} StrCpy $DisableSplashScreen true ${|}
-
-		; ${CheckForPlatformSplashDisable} $DisableSplashScreen
-
-		; ${If} $DisableSplashScreen != true
-			; ${IfThen} $0 = 0 ${|} StrCpy $0 1200 ${|}
-			; newadvsplash::show /NOUNLOAD $0 0 0 -1 /L $EXEDIR\App\AppInfo\Launcher\splash.jpg
-		; ${EndIf}
-	; ${EndIf}
-; !macroend
-
-; ${SegmentPreExecPrimary}
-	; ClearErrors
-	; ${ReadLauncherConfig} $DisableSplashScreen Launch LaunchAppAfterSplash
-	; ${If} $DisableSplashScreen == true
-		; newadvsplash::stop /WAIT
-	; ${ElseIfNot} ${Errors}
-	; ${AndIf} $DisableSplashScreen != false
-		; ${InvalidValueError} [Launch]:LaunchAppAfterSplash $DisableSplashScreen
-	; ${EndIf}
-; !macroend
-
-; ${SegmentUnload}
-	; ${If} $DisableSplashScreen != true
-		; newadvsplash::stop /WAIT
-	; ${EndIf}
-; !macroend
diff --git a/Other/Source/Segments/WorkingDirectory.nsh b/Other/Source/Segments/WorkingDirectory.nsh
deleted file mode 100644
index efc661e..0000000
--- a/Other/Source/Segments/WorkingDirectory.nsh
+++ /dev/null
@@ -1,8 +0,0 @@
-${SegmentFile}
-${SegmentPreExec}
-	ClearErrors
-	${ReadLauncherConfig} $0 Launch WorkingDirectory
-	IfErrors +3
-	ExpandEnvStrings $0 $0
-	SetOutPath $0
-!macroend
\ No newline at end of file
diff --git a/Other/Source/Segments/XML.nsh b/Other/Source/Segments/XML.nsh
deleted file mode 100644
index d2e31ab..0000000
--- a/Other/Source/Segments/XML.nsh
+++ /dev/null
@@ -1,19 +0,0 @@
-${SegmentFile}
-
-; For usage of XML features, see FileWrite.nsh and Language.nsh.
-
-; !ifdef XML_ENABLED
-	; !include MyXML.nsh
-; !endif
-
-; Used in combination with XML_ENABLED in FileWrite.nsh and Language.nsh to
-; warn the user if they try to use XML features without enabling it.
-!macro XML_WarnNotActivated Section
-	MessageBox MB_OK|MB_ICONSTOP "To use XML features of the Launcher you must set [Activate]:XML=true and then regenerate the launcher. Continuing, but ${Section} will not be used."
-!macroend
-
-; ${SegmentUnload}
-; !ifdef XML_ENABLED
-	; ${xml::Unload}
-; !endif
-; !macroend
diff --git a/Other/Source/Version.nsh b/Other/Source/Version.nsh
deleted file mode 100644
index 1b7d6ea..0000000
--- a/Other/Source/Version.nsh
+++ /dev/null
@@ -1,8 +0,0 @@
-;=#
-;
-; Version.nsh
-; 
-; This file gathers all the necessary settings definitions for runtime.
-; 
-!define PACVER		"2.0.1.0"
-!define PACUSERVER	"2.0.1"
diff --git a/PortableAppsCompiler.exe b/PortableAppsCompiler.exe
index 9ff42e5..80b4781 100644
Binary files a/PortableAppsCompiler.exe and b/PortableAppsCompiler.exe differ
diff --git a/README.md b/README.md
index a13559a..ab5840c 100644
--- a/README.md
+++ b/README.md
@@ -1,25 +1,98 @@
 # PortableApps Compiler - _Development Branch_
 ----------
 
-This branch is meant for the cutting-edge of development. Don't expect this version to work flawlessly. There may be bugs hidden throughout this experimental version of PortableApps Compiler. With this branch you will find the code stylings of Chris Morgan, FukenGruven, Azure Zanculmarktum, and myself (demon.devin). You will also see minor influence from other contributors like LegendaryHawk, DoomStorm, and other fellow developers as well. So you can expect to see great things to come out of this experimental build.
+This branch is meant for the cutting-edge of development. Don't expect this version to work flawlessly. There may be bugs hidden throughout this experimental version of PortableApps Compiler. With this branch you will find the coding practices of Chris Morgan, FukenGruven, Azure Zanculmarktum, and myself (daemon.devin). You will also see minor influence from contributors like LegendaryHawk, DoomStorm, and other fellow developers as well. So you can expect to see great things to come out of this experimental build.
 
 With all that said, enjoy the fresh ideas which are currently being worked out.
 
 ## CHANGES
 ----------
 
+##### Environment Variables
 - All environment variables that start with `PAL` have been changed to `PAC` 
   - _I.E._ `%PAL:AppDir%` is now `%PAC:AppDir%` and so on..
 - All environment variables that start with `PortableApps.com` have been changed to `PortableApps` 
   - _I.E._ `%PortableApps.comDocuments%` is now `%PortableAppsDocuments%` and so on..
 
+##### Folder Structure
+- I've changed the folder structure. To illustrate the new directory layout let's imagine we're looking at a portable version of 7-Zip which was compiled using this new design layout.
+
+> Example Directory Tree:
+> ```
+> 7-ZipPortable (Root)
+>       |   7-ZipPortable.exe (Portable Launcher)
+>       |   7-ZipPortable.ini (User Config File)
+>       |   
+>       +---app
+>       |    +---AppInfo   (Kept for Compatibility with PA.c Menu)
+>       |    |       AppIcon.ico            (Needed with PA.c Menu)
+>       |    |       AppIcon_128.png          ' '     ' '     ' '
+>       |    |       AppIcon_16.png           ' '     ' '     ' '
+>       |    |       AppIcon_32.png           ' '     ' '     ' '
+>       |    |       AppInfo.ini              ' '     ' '     ' '
+>       |    |       CompilerInstaller.ini  (Formally Installer.ini)
+>       |    |       CompilerWrapper.ini    (Formally Launcher.ini)
+>       |    |       EULA.txt
+>       |    |       ExtendedInstaller.nsh  (Formally InstallerCustom.nsh)
+>       |    |       ExtendedWrapper.nsh    (Formally Custom.nsh)
+>       |    |       
+>       |    \---DefaultSettings (Formally DefaultData)
+>       |        |   DEFAULT 7-ZIP SETTINGS HERE
+>       |        |
+>       |        \---Config (Formally Default Settings)
+>       |            7-Zip.reg
+>       |               
+>       +---bin
+>       |    +---7-Zip (32-Bit Program Files)
+>       |    |   |   7-zip.dll
+>       |    |   |   7z.dll
+>       |    |   |   7z.exe
+>       |    |   |   7zFM.exe
+>       |    |   |   '' '' ''
+>       |    |   |   
+>       |    |   \---Lang
+>       |    |        af.txt
+>       |    |        an.txt
+>       |    |        ar.txt
+>       |    |        ''  ''
+>       |    |
+>       |    +---7-Zip64 (64-Bit Program Files)
+>       |    |   |    7-zip.dll
+>       |    |   |    7z.dll
+>       |    |   |    7z.exe
+>       |    |   |    7zFM.exe
+>       |    |   |    '' '' ''
+>       |    |   |   
+>       |    |   \---Lang
+>       |    |        af.txt
+>       |    |        an.txt
+>       |    |        ar.txt
+>       |    |        ''  ''
+>       |    |
+>       |    \---Settings (Fromally Data)
+>       |        |    7-ZIP SETTINGS HERE
+>       |        |   
+>       |        \---Config (Fromally Settings)
+>       |             7-Zip.reg
+>       |             7-ZipPortableSettings.ini
+>       |
+>       \---etc
+>            7-ZipPortable.ini
+>            README
+>            UNLICENSE (using Unlicense.org/ now)
+> ```
+
+##### PAF to PAC Conversion
+- The compiler can now handle converting PAF PortableApps to the above folder layout. Everything is handled automatically so you do not need to manually set the files in the correct place. I also added support for converting FukenGruven's old PAFs as well.
+- Do not expect the PA.c Installer to work out of the box for this new folder structure. Since I've renamed and moved around the applicable configuration files, PA.c Installer won't be able to locate the right files anymore and most likely won't be able to pack your portable anymore. However, I haven't tested this out yet.
+
 ## Features
 ----------
 
 The following is a list of features that is currently available with PortableApps Compiler. Everything listed here has been tested and is in working order.
 
 - Everything that is available with [PortableApps.com Launcher](https://portableapps.com/apps/development/portableapps.com_launcher) is also available with PortableApps Compiler.
-- Minipulating Windows Services.
+- Manipulating Windows Services.
 - Dealing with Windows Tasks.
 - Registering DLL files.
 - Registry redirection support.
@@ -34,7 +107,7 @@ The following is a list of features that is currently available with PortableApp
 
 __Environment Variables__
 
-- `%PROGRAMDATA%` has now been added and kept `%ALLUSERSAPPDATA%` for backwards compatibility. Both can be used anywhere you can use an evironment variable.
+- `%PROGRAMDATA%` has now been added and kept `%ALLUSERSAPPDATA%` for backwards compatibility. Both can be used anywhere you can use an environment variable.
 - `%PAC:CommonFiles%` may now be used within the _Launcher.ini_ configuration file. This environment variable will point to `..\PortableApps\CommonFiles` if applicable. Can be used anywhere you can use an environment variable.
 > Example:
 > ```INI
@@ -240,7 +313,7 @@ GetBetween=true
 
 * __UsesGhostscript:__ Specifies whether the portable application makes use of [Ghostscript Portable][GhostscriptPortable].
 
-* __UsesDotNetVersion:__ Specify the minimum required version of the .NET framework the portable application needs. Values can be from `1.0` thru `4.7` (*e.g.* `UsesDotNetVersion=1.1` or `UsesDotNetVersion=4.6.2`).
+* __UsesDotNetVersion:__ Specify the minimum required version of the .NET framework the portable application needs. Values can be from `1.0` through `4.7` (*e.g.* `UsesDotNetVersion=1.1` or `UsesDotNetVersion=4.6.2`).
 
 * __UseStdUtils:__ Include the _StdUtils_ plug-in without `ExecAsUser`
 
diff --git a/etc/UNLICENSE b/etc/UNLICENSE
new file mode 100644
index 0000000..00d2e13
--- /dev/null
+++ b/etc/UNLICENSE
@@ -0,0 +1,24 @@
+This is free and unencumbered software released into the public domain.
+
+Anyone is free to copy, modify, publish, use, compile, sell, or
+distribute this software, either in source code form or as a compiled
+binary, for any purpose, commercial or non-commercial, and by any
+means.
+
+In jurisdictions that recognize copyright laws, the author or authors
+of this software dedicate any and all copyright interest in the
+software to the public domain. We make this dedication for the benefit
+of the public at large and to the detriment of our heirs and
+successors. We intend this dedication to be an overt act of
+relinquishment in perpetuity of all present and future rights to this
+software under copyright law.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+For more information, please refer to <http://unlicense.org/>
\ No newline at end of file
diff --git a/Other/Source/CallANSIPlugin.nsh b/etc/source/CallANSIPlugin.nsh
similarity index 100%
rename from Other/Source/CallANSIPlugin.nsh
rename to etc/source/CallANSIPlugin.nsh
diff --git a/Other/Source/CmdExec.nsh b/etc/source/CmdExec.nsh
similarity index 97%
rename from Other/Source/CmdExec.nsh
rename to etc/source/CmdExec.nsh
index ecf13d9..694f1c5 100644
--- a/Other/Source/CmdExec.nsh
+++ b/etc/source/CmdExec.nsh
@@ -1,46 +1,46 @@
-/*CmdExec
-http://nsis.sourceforge.net/CmdExec
-
-Description
-Macro that uses the windows default command line interpreter 
-(usually $sysdir\cmd.exe) to execute a command and its parameters, 
-with working directory, optional pause, stay-in-prompt and execwait.
-
-Example:
-${CmdPause} `$ParentFolder` `"d:\tools\free_upx\upx.exe" -v --brute $FileNames`
-*/
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;  Execute a command with cmd.exe 
-;;  P1 :in: Working directory (""=$outdir) 
-;;  P2 :in: Command and parameters 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-!define CmdNoWait    "!insertmacro _CmdExec 0"  ; nopause/nowait
-!define CmdWait      "!insertmacro _CmdExec 1"  ; wait for end of execution
-!define CmdPause     "!insertmacro _CmdExec 2"  ; pause before exiting
-!define CmdPauseWait "!insertmacro _CmdExec 3"  ; pause + execwait
-!define CmdStay      "!insertmacro _CmdExec 4"  ; stay in command prompt
-!define CmdStayWait  "!insertmacro _CmdExec 5"  ; stay + execwait
-!macro _CmdExec _Mode_ _WorkDir_ _CommandAndParams_
-	Push $R0
-	ExpandEnvStrings $R0 '%COMSPEC%'
-	StrCmp "${_WorkDir_}" "" +3
-	Push $OutDir
-	SetOutPath "${_WorkDir_}"
-	!if '${_Mode_}' = 1
-		Exec `"$R0" /c "${_CommandAndParams_}" & echo. & echo. & pause`
-	!else if '${_Mode_}' = 2
-		ExecWait `"$R0" /c "${_CommandAndParams_}"`
-	!else if '${_Mode_}' = 3
-		ExecWait `"$R0" /c "${_CommandAndParams_}" & echo. & echo. & pause`
-	!else if '${_Mode_}' = 4
-		Exec `"$R0" /k "${_CommandAndParams_}"`
-	!else if '${_Mode_}' = 5
-		ExecWait `"$R0" /k "${_CommandAndParams_}"`
-	!else
-		Exec `"$R0" /c "${_CommandAndParams_}"`
-	!endif
-	StrCmp "${_WorkDir_}" "" +3
-	Pop $R0
-	SetOutPath "$R0"
-	Pop $R0
+/*CmdExec
+http://nsis.sourceforge.net/CmdExec
+
+Description
+Macro that uses the windows default command line interpreter 
+(usually $sysdir\cmd.exe) to execute a command and its parameters, 
+with working directory, optional pause, stay-in-prompt and execwait.
+
+Example:
+${CmdPause} `$ParentFolder` `"d:\tools\free_upx\upx.exe" -v --brute $FileNames`
+*/
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;  Execute a command with cmd.exe 
+;;  P1 :in: Working directory (""=$outdir) 
+;;  P2 :in: Command and parameters 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+!define CmdNoWait    "!insertmacro _CmdExec 0"  ; nopause/nowait
+!define CmdWait      "!insertmacro _CmdExec 1"  ; wait for end of execution
+!define CmdPause     "!insertmacro _CmdExec 2"  ; pause before exiting
+!define CmdPauseWait "!insertmacro _CmdExec 3"  ; pause + execwait
+!define CmdStay      "!insertmacro _CmdExec 4"  ; stay in command prompt
+!define CmdStayWait  "!insertmacro _CmdExec 5"  ; stay + execwait
+!macro _CmdExec _Mode_ _WorkDir_ _CommandAndParams_
+	Push $R0
+	ExpandEnvStrings $R0 '%COMSPEC%'
+	StrCmp "${_WorkDir_}" "" +3
+	Push $OutDir
+	SetOutPath "${_WorkDir_}"
+	!if '${_Mode_}' = 1
+		Exec `"$R0" /c "${_CommandAndParams_}" & echo. & echo. & pause`
+	!else if '${_Mode_}' = 2
+		ExecWait `"$R0" /c "${_CommandAndParams_}"`
+	!else if '${_Mode_}' = 3
+		ExecWait `"$R0" /c "${_CommandAndParams_}" & echo. & echo. & pause`
+	!else if '${_Mode_}' = 4
+		Exec `"$R0" /k "${_CommandAndParams_}"`
+	!else if '${_Mode_}' = 5
+		ExecWait `"$R0" /k "${_CommandAndParams_}"`
+	!else
+		Exec `"$R0" /c "${_CommandAndParams_}"`
+	!endif
+	StrCmp "${_WorkDir_}" "" +3
+	Pop $R0
+	SetOutPath "$R0"
+	Pop $R0
 !macroend
\ No newline at end of file
diff --git a/etc/source/CompilerWizard.nsi b/etc/source/CompilerWizard.nsi
new file mode 100644
index 0000000..da5adf0
--- /dev/null
+++ b/etc/source/CompilerWizard.nsi
@@ -0,0 +1,972 @@
+;=#
+; 
+; PORTABLEAPPS COMPILER 
+; Developed by daemon.devin
+;
+; For support visit the GitHub project:
+; https://github.com/demondevin/pac-man
+; 
+; CompilerWizard.nsi
+; Version 1.1
+;
+
+;= RUNTIME SWITCHES
+;= ################
+Unicode true 
+ManifestDPIAware true
+RequestExecutionLevel user
+
+!define CustomIconAndName
+
+;= NSIS VERSION
+;= ################
+!include RequireLatestNSIS.nsh
+
+;= PAC DETAILS
+;= ################
+Name "PortableApps Compiler"
+OutFile ..\..\PortableAppsCompiler.exe
+Icon ..\..\app\AppInfo\appicon.ico
+Caption "PortableApps Compiler"
+VIProductVersion 3.0.0.0
+VIAddVersionKey ProductName "PortableApps Compiler"
+VIAddVersionKey Comments "A small utility for generating a portable wrapper for an application."
+VIAddVersionKey CompanyName "How Dumb, LLC"
+VIAddVersionKey LegalCopyright "Copyright daemon.devin"
+VIAddVersionKey FileDescription "PortableApps Compiler"
+VIAddVersionKey FileVersion 3.0.0.0
+VIAddVersionKey ProductVersion 3.0.0.0
+VIAddVersionKey InternalName "PortableApps Compiler"
+VIAddVersionKey OriginalFilename PortableAppsCompiler.exe
+
+;= COMPRESSION
+;= ################
+SetCompress Auto
+SetCompressor /SOLID lzma
+SetCompressorDictSize 32
+SetDatablockOptimize On
+
+;= INCLUDES/PLUGINS
+;= ################
+;(Standard)
+!include FileFunc.nsh
+!include LogicLib.nsh
+!include MUI.nsh
+;!include StrRep.nsh
+!include NewTextReplace.nsh
+!AddPluginDir Plugins
+!include ReplaceInFileWithTextReplace.nsh
+
+;= ICON & STYLE
+;= ################
+!define MUI_ICON "..\..\App\AppInfo\appicon.ico"
+!define MUI_HEADERIMAGE
+!define MUI_HEADERIMAGE_RIGHT
+!define MUI_HEADERIMAGE_BITMAP header.bmp
+BrandingText "PortableApps Compiler - Port And Let Portable!"
+InstallButtonText "Go >" 
+ShowInstDetails show
+SubCaption 3 " | Compiling Portable Wrapper"
+
+;= VARIABLES
+;= ################
+Var FINISHTEXT
+Var FINISHTITLE
+Var NSIS
+Var PACKAGE
+Var SKIPWELCOMEPAGE
+Var AUTOMATICCOMPILE
+Var DEFINES
+Var ERROROCCURED
+Var AppShortname
+Var AppFullname
+Var AppID
+Var Name
+
+;= PAGES
+;= ################
+!define MUI_WELCOMEFINISHPAGE_BITMAP welcomefinish.bmp
+!define MUI_WELCOMEPAGE_TITLE "PortableApps Compiler"
+!define MUI_WELCOMEPAGE_TEXT "Welcome to the PortableApps Compiler.\r\n\r\nThis utility is an advanced compiler which allows you to create a portable wrapper for an application which adheres to the PortableApps Compiler format specifications. Click next to start the compiling process."
+!define MUI_PAGE_CUSTOMFUNCTION_PRE ShowWelcomeWindow
+!insertmacro MUI_PAGE_WELCOME
+Page custom ShowOptionsWindow LeaveOptionsWindow " | Portable App Folder Selection" 
+Page instfiles
+!define MUI_PAGE_CUSTOMFUNCTION_PRE ShowFinishPage
+!define MUI_FINISHPAGE_TITLE "$FINISHTITLE"
+!define MUI_FINISHPAGE_TEXT "$FINISHTEXT"
+!define MUI_FINISHPAGE_RUN
+!define MUI_FINISHPAGE_RUN_NOTCHECKED
+!define MUI_FINISHPAGE_RUN_TEXT "Test Wrapper"
+!define MUI_FINISHPAGE_RUN_FUNCTION "RunOnFinish"
+!define MUI_FINISHPAGE_SHOWREADME "$EXEDIR\bin\PortableAppsCompilerLog.txt"
+!define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
+!define MUI_FINISHPAGE_SHOWREADME_TEXT "Review Log"
+!insertmacro MUI_PAGE_FINISH
+
+;= DEFINITIONS
+;= ################
+!define NEWLINE		"$\r$\n"
+!define EXTENDED	"$PACKAGE\App\AppInfo\ExtendedWrapper.nsh"
+!define CWRAPPER	"$PACKAGE\App\AppInfo\CompilerWrapper.ini"
+!define DEFINES		"$EXEDIR\etc\Source\PortableAppsCompilerDefines.nsh"
+!define DEFSTART	";=# ${NEWLINE}; ${NEWLINE}; PORTABLEAPPS COMPILER${NEWLINE}; Developed by daemon.devin${NEWLINE}; ${NEWLINE}; For support visit the GitHub project:${NEWLINE}; https://github.com/demondevin/pac-man${NEWLINE}; ${NEWLINE}; PortableAppsCompilerDefines.nsh${NEWLINE}; This file was automatically generated by the PortableApps Compiler and should not be edited!${NEWLINE}; ${NEWLINE}"
+
+;= MACROS
+;= ################
+!define ReadAppInfoConfig `!insertmacro _ReadAppInfoConfig`
+!macro _ReadAppInfoConfig _VALUE _SECTION _KEY
+	ReadINIStr ${_VALUE} `${_}\App\AppInfo\AppInfo.ini` `${_SECTION}` `${_KEY}`
+!macroend
+!define ReadWrapperConfig `!insertmacro _ReadWrapperConfig`
+!macro _ReadWrapperConfig _VALUE _SECTION _KEY
+	ReadINIStr ${_VALUE} `${_}\App\AppInfo\CompilerWrapper.ini` `${_SECTION}` `${_KEY}`
+!macroend
+!define WriteDefineConfig "!insertmacro _WriteDefineConfig"
+!macro _WriteDefineConfig _DEFINE _VALUE
+	!if ! "${_VALUE}" == ""
+		FileWrite $DEFINES "!define ${_DEFINE} `${_VALUE}`${NEWLINE}"
+	!else 
+		FileWrite $DEFINES "!define ${_DEFINE}${NEWLINE}"
+	!endif
+!macroend
+!define AddConditionIfNot "!insertmacro _AddConditionIfNot"
+!macro _AddConditionIfNot _DEFINE
+	FileWrite $DEFINES `!ifndef ${_DEFINE}${NEWLINE}$\t!define ${_DEFINE}${NEWLINE}!endif${NEWLINE}`
+!macroend
+!define WriteErrorLog "!insertmacro _WriteErrorLog"
+!macro _WriteErrorLog _ERROR
+	FileOpen $9 "$EXEDIR\bin\PortableAppsCompilerLog.txt" a
+	FileSeek $9 0 END
+	FileWrite $9 `ERROR: ${_ERROR}`
+	FileWriteByte $9 "13"
+	FileWriteByte $9 "10"
+	FileClose $9
+	StrCpy $ERROROCCURED "true"
+!macroend
+!define ConvertPath "!insertmacro _ConvertPath"
+!macro _ConvertPath _SOURCE _TARGET
+	${If} ${FileExists} "$PACKAGE\${_SOURCE}"
+		DetailPrint "${_SOURCE} -> ${_TARGET}"
+		SetDetailsPrint none
+		Rename "$PACKAGE\${_SOURCE}" "$PACKAGE\${_TARGET}"
+		SetDetailsPrint lastused
+	${EndIf}
+!macroend
+!define StringConvertInFile `!insertmacro _StringConvertInFile`
+!macro _StringConvertInFile _FILE _SEARCH _REPLACE
+	FileOpen $R8 ${_FILE} r
+	FileReadWord $R8 $R7
+	FileClose $R8
+	SetDetailsPrint none
+	${If} $R7 = 0xFEFF
+		${ReplaceInFileUTF16LE} ${_FILE} ${_SEARCH} ${_REPLACE}
+	${Else}
+		${ReplaceInFile} ${_FILE} ${_SEARCH} ${_REPLACE}
+	${EndIf}
+	SetDetailsPrint lastused
+!macroend
+
+;= LANGUAGES
+;= ################
+!insertmacro MUI_LANGUAGE "English"
+
+;= FUNCTIONS
+;= ################
+Function .onInit
+	!insertmacro MUI_INSTALLOPTIONS_EXTRACT "CompilerWizardForm.ini"
+	SetOutPath $EXEDIR
+	
+	CreateDirectory $EXEDIR\bin
+	
+	ReadINIStr $SKIPWELCOMEPAGE $EXEDIR\bin\settings.ini CompilerWizard SkipWelcomePage
+	ReadINIStr $0 $EXEDIR\bin\settings.ini CompilerWizard Drive
+	ReadINIStr $PACKAGE $EXEDIR\bin\settings.ini CompilerWizard Package
+	; Update drive letter; doesn't matter if $0 == ""
+	StrLen $1 $0
+	StrCpy $2 $PACKAGE $1
+	${If} $2 == $0
+		StrCpy $PACKAGE $PACKAGE "" $1
+		StrCpy $PACKAGE $0$PACKAGE
+	${EndIf}
+
+	;StrCpy $NSIS "$EXEDIR\App\NSIS\makensis.exe"
+	ReadINIStr $NSIS $EXEDIR\bin\settings.ini CompilerWizard makensis
+	${If} $NSIS == ""
+		StrCpy $NSIS ..\NSISPortable\App\NSIS\makensis.exe
+		WriteINIStr $EXEDIR\bin\settings.ini CompilerWizard makensis $NSIS
+	${EndIf}	
+
+	${GetParameters} $R0
+	StrCmp $R0 "" PreFillForm
+		StrCpy $PACKAGE $R0
+		StrCpy $SKIPWELCOMEPAGE "true"
+		StrCpy $AUTOMATICCOMPILE "true"
+		;Strip quotes from $PACKAGE
+		StrCpy $R0 $PACKAGE 1
+		StrCmp $R0 `"` "" PreFillForm
+		StrCpy $PACKAGE $PACKAGE "" 1
+		StrCpy $PACKAGE $PACKAGE -1
+
+	PreFillForm:
+		;=== Pre-Fill Path with Directory
+		WriteINIStr $PLUGINSDIR\CompilerWizardForm.ini "Field 2" "State" "$PACKAGE"
+FunctionEnd
+
+Function ShowWelcomeWindow
+	StrCmp $SKIPWELCOMEPAGE "true" "" ShowWelcomeWindowEnd
+		Abort
+	ShowWelcomeWindowEnd:
+FunctionEnd
+
+Function ShowOptionsWindow
+	!insertmacro MUI_HEADER_TEXT "PortableApps Compiler" "a better alternative to PA.c Launcher"
+	${IfThen} $AUTOMATICCOMPILE == "true" ${|} Abort ${|}
+	InstallOptions::InitDialog /NOUNLOAD "$PLUGINSDIR\CompilerWizardForm.ini"
+    Pop $0
+    InstallOptions::Show
+FunctionEnd
+
+Function LeaveOptionsWindow
+	ReadINIStr $PACKAGE $PLUGINSDIR\CompilerWizardForm.ini "Field 2" "State"
+
+	${If} $PACKAGE == ""
+		MessageBox MB_OK|MB_ICONEXCLAMATION `Please select a valid base directory to create a wrapper for.`
+		Abort
+	${EndIf}
+	${GetRoot} $EXEDIR $0
+	WriteINIStr $EXEDIR\bin\settings.ini CompilerWizard Drive $0
+	WriteINIStr $EXEDIR\bin\settings.ini CompilerWizard Package $PACKAGE
+FunctionEnd
+
+Function ConvertLanguageEnvironmentVariables
+	Pop $9 # file
+
+	FileOpen $8 $9 r
+	FileReadWord $8 $7
+	FileClose $8
+
+	SetDetailsPrint none
+	${If} $7 = 0xFEFF
+		; Convert old PAL to PAC
+		${ReplaceInFileUTF16LE} $9 PortableApps.comLanguageCode  PAC:LanguageCode
+		${ReplaceInFileUTF16LE} $9 PortableApps.comLocaleCode2   PAC:LanguageCode2
+		${ReplaceInFileUTF16LE} $9 PortableApps.comLocaleCode3   PAC:LanguageCode3
+		${ReplaceInFileUTF16LE} $9 PortableApps.comLocaleGlibc   PAC:LanguageGlibc
+		${ReplaceInFileUTF16LE} $9 PortableApps.comLocaleWinName PAC:LanguageNSIS
+		${ReplaceInFileUTF16LE} $9 PortableApps.comLocaleName    PAC:LanguageName
+		${ReplaceInFileUTF16LE} $9 PortableApps.comLocaleID      PAC:LanguageLCID
+		; Convert new PAL to PAC
+		${ReplaceInFileUTF16LE} $9 PAL:LanguageCode  PAC:LanguageCode
+		${ReplaceInFileUTF16LE} $9 PAL:LocaleCode2   PAC:LanguageCode2
+		${ReplaceInFileUTF16LE} $9 PAL:LocaleCode3   PAC:LanguageCode3
+		${ReplaceInFileUTF16LE} $9 PAL:LocaleGlibc   PAC:LanguageGlibc
+		${ReplaceInFileUTF16LE} $9 PAL:LocaleWinName PAC:LanguageNSIS
+		${ReplaceInFileUTF16LE} $9 PAL:LocaleName    PAC:LanguageName
+		${ReplaceInFileUTF16LE} $9 PAL:LocaleID      PAC:LanguageLCID
+	${Else}
+		; Convert old PAL to PAC
+		${ReplaceInFile} $9 PortableApps.comLanguageCode  PAC:LanguageCode
+		${ReplaceInFile} $9 PortableApps.comLocaleCode2   PAC:LanguageCode2
+		${ReplaceInFile} $9 PortableApps.comLocaleCode3   PAC:LanguageCode3
+		${ReplaceInFile} $9 PortableApps.comLocaleGlibc   PAC:LanguageGlibc
+		${ReplaceInFile} $9 PortableApps.comLocaleWinName PAC:LanguageNSIS
+		${ReplaceInFile} $9 PortableApps.comLocaleName    PAC:LanguageName
+		${ReplaceInFile} $9 PortableApps.comLocaleID      PAC:LanguageLCID
+		; Convert new PAL to PAC
+		${ReplaceInFile} $9 PAL:LanguageCode  PAC:LanguageCode
+		${ReplaceInFile} $9 PAL:LocaleCode2   PAC:LanguageCode2
+		${ReplaceInFile} $9 PAL:LocaleCode3   PAC:LanguageCode3
+		${ReplaceInFile} $9 PAL:LocaleGlibc   PAC:LanguageGlibc
+		${ReplaceInFile} $9 PAL:LocaleWinName PAC:LanguageNSIS
+		${ReplaceInFile} $9 PAL:LocaleName    PAC:LanguageName
+		${ReplaceInFile} $9 PAL:LocaleID      PAC:LanguageLCID
+	${EndIf}
+	SetDetailsPrint lastused
+FunctionEnd
+
+Function ConvertDefines
+	Pop $9 # file
+
+	FileOpen $8 $9 r
+	FileReadWord $8 $7
+	FileClose $8
+
+	SetDetailsPrint none
+	StrCpy $0 $${
+	${If} $7 = 0xFEFF
+		${ReplaceInFileUTF16LE} $9 PortableApps.comLanguageCode		PortableAppsLanguageCode
+		${ReplaceInFileUTF16LE} $9 PortableApps.comLocaleCode2		PortableAppsLocaleCode2
+		${ReplaceInFileUTF16LE} $9 PortableApps.comLocaleCode3		PortableAppsLocaleCode3
+		${ReplaceInFileUTF16LE} $9 PortableApps.comLocaleGlibc		PortableAppsLocaleGlibc
+		${ReplaceInFileUTF16LE} $9 PortableApps.comLocaleWinName	PortableAppsLocaleWinName
+		${ReplaceInFileUTF16LE} $9 PortableApps.comLocaleName		PortableAppsLocaleName
+		${ReplaceInFileUTF16LE} $9 PortableApps.comLocaleID			PortableAppsLocaleID
+		${ReplaceInFileUTF16LE} $9 $0ReadUser}						$0ReadUserConfig}
+		${ReplaceInFileUTF16LE} $9 $0LAUNCHER}						$0WRAPPER}
+		${ReplaceInFileUTF16LE} $9 $0LAUNCHER2}						$0WRAPPER2}
+		${ReplaceInFileUTF16LE} $9 $0OTHER}							$0ETC}
+		${ReplaceInFileUTF16LE} $9 $0SETINI}						$0CONFIGINI}
+		${ReplaceInFileUTF16LE} $9 $0PAL}							$0PAC}
+		${ReplaceInFileUTF16LE} $9 $0DEFSET}						$0DEFCONF}
+		${ReplaceInFileUTF16LE} $9 $0SET}							$0CONF}
+		${ReplaceInFileUTF16LE} $9 $0DEFDATA}						$0DEFSET}
+		${ReplaceInFileUTF16LE} $9 $0DATA}							$0SET}
+		${ReplaceInFileUTF16LE} $9 $0ReadLauncherConfig}			$0ReadWrapperConfig}
+		${ReplaceInFileUTF16LE} $9 $0WriteLauncherConfig}			$0WriteWrapperConfig}
+		${ReplaceInFileUTF16LE} $9 $0DeleteLauncherConfig}			$0DeleteWrapperConfig}
+		${ReplaceInFileUTF16LE} $9 $0DeleteLauncherConfigSec}		$0DeleteWrapperConfigSec}
+		${ReplaceInFileUTF16LE} $9 $0ReadLauncherConfigWithDefault}	$0ReadWrapperConfigWithDefault}
+		${ReplaceInFileUTF16LE} $9 $0PAF}							$0TREE}
+		${ReplaceInFileUTF16LE} $9 $0PAFKEYS}						$0TREEKEYS}		
+		${ReplaceInFileUTF16LE} $9 PAL:LanguageCode					PAC:LanguageCode
+		${ReplaceInFileUTF16LE} $9 PAL:LocaleCode2					PAC:LanguageCode2
+		${ReplaceInFileUTF16LE} $9 PAL:LocaleCode3					PAC:LanguageCode3
+		${ReplaceInFileUTF16LE} $9 PAL:LocaleGlibc					PAC:LanguageGlibc
+		${ReplaceInFileUTF16LE} $9 PAL:LocaleWinName				PAC:LanguageNSIS
+		${ReplaceInFileUTF16LE} $9 PAL:LocaleName					PAC:LanguageName
+		${ReplaceInFileUTF16LE} $9 PAL:LocaleID						PAC:LanguageLCID
+	${Else}
+		${ReplaceInFile} $9 PortableApps.comLanguageCode		PortableAppsLanguageCode
+		${ReplaceInFile} $9 PortableApps.comLocaleCode2			PortableAppsLocaleCode2
+		${ReplaceInFile} $9 PortableApps.comLocaleCode3			PortableAppsLocaleCode3
+		${ReplaceInFile} $9 PortableApps.comLocaleGlibc			PortableAppsLocaleGlibc
+		${ReplaceInFile} $9 PortableApps.comLocaleWinName		PortableAppsLocaleWinName
+		${ReplaceInFile} $9 PortableApps.comLocaleName			PortableAppsLocaleName
+		${ReplaceInFile} $9 PortableApps.comLocaleID			PortableAppsLocaleID
+		${ReplaceInFile} $9 $0ReadUser}							$0ReadUserConfig}
+		${ReplaceInFile} $9 $0LAUNCHER}							$0WRAPPER}
+		${ReplaceInFile} $9 $0LAUNCHER2}						$0WRAPPER2}
+		${ReplaceInFile} $9 $0OTHER}							$0ETC}
+		${ReplaceInFile} $9 $0SETINI}							$0CONFIGINI}
+		${ReplaceInFile} $9 $0PAL}								$0PAC}
+		${ReplaceInFile} $9 $0DEFSET}							$0DEFCONF}
+		${ReplaceInFile} $9 $0SET}								$0CONF}
+		${ReplaceInFile} $9 $0DEFDATA}							$0DEFSET}
+		${ReplaceInFile} $9 $0DATA}								$0SET}
+		${ReplaceInFile} $9 $0ReadLauncherConfig}				$0ReadWrapperConfig}
+		${ReplaceInFile} $9 $0WriteLauncherConfig}				$0WriteWrapperConfig}
+		${ReplaceInFile} $9 $0DeleteLauncherConfig}				$0DeleteWrapperConfig}
+		${ReplaceInFile} $9 $0DeleteLauncherConfigSec}			$0DeleteWrapperConfigSec}
+		${ReplaceInFile} $9 $0ReadLauncherConfigWithDefault}	$0ReadWrapperConfigWithDefault}
+		${ReplaceInFile} $9 $0PAF}								$0TREE}
+		${ReplaceInFile} $9 $0PAFKEYS}							$0TREEKEYS}		
+		${ReplaceInFile} $9 PAL:LanguageCode					PAC:LanguageCode
+		${ReplaceInFile} $9 PAL:LocaleCode2						PAC:LanguageCode2
+		${ReplaceInFile} $9 PAL:LocaleCode3						PAC:LanguageCode3
+		${ReplaceInFile} $9 PAL:LocaleGlibc						PAC:LanguageGlibc
+		${ReplaceInFile} $9 PAL:LocaleWinName					PAC:LanguageNSIS
+		${ReplaceInFile} $9 PAL:LocaleName						PAC:LanguageName
+		${ReplaceInFile} $9 PAL:LocaleID						PAC:LanguageLCID
+	${EndIf}
+	SetDetailsPrint lastused
+FunctionEnd
+
+Section Main
+	${IfNot} ${FileExists} $NSIS
+		StrCpy $ERROROCCURED true
+		${WriteErrorLog} "NSIS not found at $NSIS."
+		MessageBox MB_ICONSTOP "NSIS was not found! (Looked for it in $NSIS)${NEWLINE}${NEWLINE}You can specify a custom path to makensis.exe in $EXEDIR\bin\settings.ini, [CompilerWizard]:makensis"
+		Abort
+	${EndIf}
+
+	; Fix the package path, if necessary
+	StrCpy $R1 $PACKAGE 1 -1
+	${IfThen} $R1 == "\" ${|} StrCpy $PACKAGE $PACKAGE -1 ${|}
+
+	SetDetailsPrint ListOnly
+	DetailPrint "App: $PACKAGE"
+	DetailPrint " "
+	RealProgress::SetProgress /NOUNLOAD 0
+	RealProgress::GradualProgress /NOUNLOAD 1 20 90 "Processing complete."
+
+	; Convert from PAF to PAC needs to be done..
+	${If}   ${FileExists} "$PACKAGE\App\AppInfo\Launcher\Custom.nsh"
+	${OrIf} ${FileExists} "$PACKAGE\App\AppInfo\Launcher\Debug.nsh"
+		DetailPrint "Converting package from PAF to PAC..."
+		${ConvertPath} "App\AppInfo\Launcher\Custom.nsh" "App\AppInfo\ExtendedWrapper.nsh"
+		${ConvertPath} "App\AppInfo\Launcher\Debug.nsh" "App\AppInfo\ExtendedDebug.nsh"
+		${ConvertPath} "App\AppInfo\installer.ini" "App\AppInfo\CompilerInstaller.ini"
+		
+		; Replace old defines to new defines | i.e. ${LAUNCHER} -> ${WRAPPER}
+		; Check if it's UTF-16LE
+		; FileOpen $0 "${EXTENDED}" r
+		; FileReadWord $0 $1
+		; FileClose $0
+		; StrCpy $0 $${
+		; ${If} $1 = 0xFEFF
+			; ${If} $5 == UTF-16LE
+				; ${ReplaceInFileUTF16LECS} "${EXTENDED}" $0ReadUser} $0ReadUserConfig}
+				; ${ReplaceInFileUTF16LECS} "${EXTENDED}" $0LAUNCHER} $0WRAPPER}
+				; ${ReplaceInFileUTF16LECS} "${EXTENDED}" $0LAUNCHER2} $0WRAPPER2}
+				; ${ReplaceInFileUTF16LECS} "${EXTENDED}" $0OTHER} $0ETC}
+				; ${ReplaceInFileUTF16LECS} "${EXTENDED}" $0SETINI} $0CONFIGINI}
+				; ${ReplaceInFileUTF16LECS} "${EXTENDED}" $0PAL} $0PAC}
+				; ${ReplaceInFileUTF16LECS} "${EXTENDED}" $0DEFSET} $0DEFCONF}
+				; ${ReplaceInFileUTF16LECS} "${EXTENDED}" $0DEFDATA} $0DEFSET}
+				; ${ReplaceInFileUTF16LECS} "${EXTENDED}" $0ReadLauncherConfig} $0ReadWrapperConfig}
+				; ${ReplaceInFileUTF16LECS} "${EXTENDED}" $0WriteLauncherConfig} $0WriteWrapperConfig}
+				; ${ReplaceInFileUTF16LECS} "${EXTENDED}" $0DeleteLauncherConfig} $0DeleteWrapperConfig}
+				; ${ReplaceInFileUTF16LECS} "${EXTENDED}" $0DeleteLauncherConfigSec} $0DeleteWrapperConfigSec}
+				; ${ReplaceInFileUTF16LECS} "${EXTENDED}" $0ReadLauncherConfigWithDefault} $0ReadWrapperConfigWithDefault}
+				; ${ReplaceInFileUTF16LECS} "${EXTENDED}" $0PAF} $0TREE}
+				; ${ReplaceInFileUTF16LECS} "${EXTENDED}" $0PAFKEYS} $0TREEKEYS}
+			; ${Else}
+				; ${ReplaceInFileCS} "${EXTENDED}" $0ReadUser} $0ReadUserConfig}
+				; ${ReplaceInFileCS} "${EXTENDED}" $0LAUNCHER} $0WRAPPER}
+				; ${ReplaceInFileCS} "${EXTENDED}" $0LAUNCHER2} $0WRAPPER2}
+				; ${ReplaceInFileCS} "${EXTENDED}" $0OTHER} $0ETC}
+				; ${ReplaceInFileCS} "${EXTENDED}" $0SETINI} $0CONFIGINI}
+				; ${ReplaceInFileCS} "${EXTENDED}" $0PAL} $0PAC}
+				; ${ReplaceInFileCS} "${EXTENDED}" $0DEFSET} $0DEFCONF}
+				; ${ReplaceInFileCS} "${EXTENDED}" $0DEFDATA} $0DEFSET}
+				; ${ReplaceInFileCS} "${EXTENDED}" $0ReadLauncherConfig} $0ReadWrapperConfig}
+				; ${ReplaceInFileCS} "${EXTENDED}" $0WriteLauncherConfig} $0WriteWrapperConfig}
+				; ${ReplaceInFileCS} "${EXTENDED}" $0DeleteLauncherConfig} $0DeleteWrapperConfig}
+				; ${ReplaceInFileCS} "${EXTENDED}" $0DeleteLauncherConfigSec} $0DeleteWrapperConfigSec}
+				; ${ReplaceInFileCS} "${EXTENDED}" $0ReadLauncherConfigWithDefault} $0ReadWrapperConfigWithDefault}
+				; ${ReplaceInFileCS} "${EXTENDED}" $0PAF} $0TREE}
+				; ${ReplaceInFileCS} "${EXTENDED}" $0PAFKEYS} $0TREEKEYS}
+			; ${EndIf}
+		; ${EndIf}
+		; StrCpy $0 $${
+		; ${StringRIP} "${EXTENDED}" "$0ReadUser}" "$0ReadUserConfig}"
+		; ${StringRIP} "${EXTENDED}" "$0ReadUser}" "$0ReadUserConfig}"
+		; ${StringRIP} "${EXTENDED}" "$0LAUNCHER}" "$0WRAPPER}"
+		; ${StringRIP} "${EXTENDED}" "$0LAUNCHER2}" "$0WRAPPER2}"
+		; ${StringRIP} "${EXTENDED}" "$0OTHER}" "$0ETC}"
+		; ${StringRIP} "${EXTENDED}" "$0SETINI}" "$0CONFIGINI}"
+		; ${StringRIP} "${EXTENDED}" "$0PAL}" "$0PAC}"
+		; ${StringRIP} "${EXTENDED}" "$0DEFSET}" "$0DEFCONF}"
+		; ${StringRIP} "${EXTENDED}" "$0DEFDATA}" "$0DEFSET}"
+		; ${StringRIP} "${EXTENDED}" "$0ReadLauncherConfig}" "$0ReadWrapperConfig}"
+		; ${StringRIP} "${EXTENDED}" "$0WriteLauncherConfig}" "$0WriteWrapperConfig}"
+		; ${StringRIP} "${EXTENDED}" "$0DeleteLauncherConfig}" "$0DeleteWrapperConfig}"
+		; ${StringRIP} "${EXTENDED}" "$0DeleteLauncherConfigSec}" "$0DeleteWrapperConfigSec}"
+		; ${StringRIP} "${EXTENDED}" "$0ReadLauncherConfigWithDefault}" "$0ReadWrapperConfigWithDefault}"
+		; ${StringRIP} "${EXTENDED}" "$0PAF}" "$0TREE}"
+		; ${StringRIP} "${EXTENDED}" "$0PAFKEYS}" "$0TREEKEYS}"
+		; ${StringRIP} "${CWRAPPER}" "$0ReadUser}" "$0ReadUserConfig}"
+		; ${StringRIP} "${CWRAPPER}" "$0ReadUser}" "$0ReadUserConfig}"
+		; ${StringRIP} "${CWRAPPER}" "$0LAUNCHER}" "$0WRAPPER}"
+		; ${StringRIP} "${CWRAPPER}" "$0LAUNCHER2}" "$0WRAPPER2}"
+		; ${StringRIP} "${CWRAPPER}" "$0OTHER}" "$0ETC}"
+		; ${StringRIP} "${CWRAPPER}" "$0SETINI}" "$0CONFIGINI}"
+		; ${StringRIP} "${CWRAPPER}" "$0PAL}" "$0PAC}"
+		; ${StringRIP} "${CWRAPPER}" "$0DEFSET}" "$0DEFCONF}"
+		; ${StringRIP} "${CWRAPPER}" "$0DEFDATA}" "$0DEFSET}"
+		; ${StringRIP} "${CWRAPPER}" "$0ReadLauncherConfig}" "$0ReadWrapperConfig}"
+		; ${StringRIP} "${CWRAPPER}" "$0WriteLauncherConfig}" "$0WriteWrapperConfig}"
+		; ${StringRIP} "${CWRAPPER}" "$0DeleteLauncherConfig}" "$0DeleteWrapperConfig}"
+		; ${StringRIP} "${CWRAPPER}" "$0DeleteLauncherConfigSec}" "$0DeleteWrapperConfigSec}"
+		; ${StringRIP} "${CWRAPPER}" "$0ReadLauncherConfigWithDefault}" "$0ReadWrapperConfigWithDefault}"
+		; ${StringRIP} "${CWRAPPER}" "$0PAF}" "$0TREE}"
+		; ${StringRIP} "${CWRAPPER}" "$0PAFKEYS}" "$0TREEKEYS}"
+		; DetailPrint " "
+	${EndIf}
+
+	; Check if any conversion needs to be done from PAL to PAC
+	; DetailPrint "Converting PAL to PAC..."
+	; Replace the PA.c language environment variables with their PAC counterparts
+	Push "${CWRAPPER}"
+	Call ConvertLanguageEnvironmentVariables
+	Push "${EXTENDED}"
+	Call ConvertDefines
+	; FindFirst $0 $1 "$PACKAGE\App\AppInfo\*.ini"
+	; ${DoUntil} $1 == ""
+		; Push "$PACKAGE\App\AppInfo\$1"
+		; Call ConvertLanguageEnvironmentVariables
+		; FindNext $0 $1
+	; ${Loop}
+	; FindClose $0
+	DetailPrint " "
+	
+	DetailPrint "Compiling portable wrapper..."
+	SetDetailsPrint none
+	
+	Delete "$EXEDIR\bin\PortableAppsCompilerLog.txt"
+
+	Delete "${DEFINES}"
+
+	!ifdef CustomIconAndName
+		!define _ $PACKAGE
+	!else
+		!define _ $EXEDIR
+	!endif
+	
+	Delete "${DEFINES}"
+	
+	; Read/write the needed defines to PortableAppsCompilerDefines.nsh
+	FileOpen $DEFINES "${DEFINES}" a
+	FileSeek $DEFINES 0 END
+	FileWrite $DEFINES `${DEFSTART}`
+	
+	${IfNot} ${FileExists} "${_}\App\AppInfo\AppInfo.ini"
+		StrCpy $ERROROCCURED true
+		${WriteErrorLog} "${_}\App\AppInfo\AppInfo.ini doesn't exist!"
+	${Else}
+		; ${ReadAppInfoConfig} $0 "Section" "Key"
+		; ${WriteDefineConfig} "Define" "Value"
+		ClearErrors
+		${ReadAppInfoConfig} $Name "Details" "Name"
+		${WriteDefineConfig} "PORTABLEAPPNAME" "$Name"
+		StrCpy $AppFullname $Name -9
+		${WriteDefineConfig} "FULLNAME" "$AppFullname"
+		
+		${ReadAppInfoConfig} $AppID "Details" "AppID"
+		${WriteDefineConfig} "APPNAME" "$AppID"
+		StrCpy $AppShortname $AppID -8
+		${WriteDefineConfig} "APP" "$AppShortname"
+		${WriteDefineConfig} "APPDIR" "$$EXEDIR\bin\$${APP}"
+		${WriteDefineConfig} "APP64" "$AppShortname64"
+		${WriteDefineConfig} "APPDIR64" "$$EXEDIR\bin\$${APP64}"
+
+		${ReadAppInfoConfig} $1 "Version" "PackageVersion"
+		${WriteDefineConfig} "PACKAGE_VERSION" "$1"
+
+		${If} ${Errors}
+			StrCpy $ERROROCCURED true
+			${WriteErrorLog} "[Details]:Name [Details]:AppID or [Version]:PackageVersion not found in appinfo.ini files"
+		${Else}
+			;Delete existing installer if there is one
+			Delete "$PACKAGE\$AppID.exe"
+			${If} ${FileExists} "$PACKAGE\$AppID.exe"
+				StrCpy $ERROROCCURED true
+				${WriteErrorLog} "ERROR: Cannot remove $PACKAGE\$AppID.exe! Is $AppID currently running?"
+			${EndIf}
+		${EndIf}
+
+		ClearErrors
+		${ReadAppInfoConfig} $0 "Team" "Developer"
+		${If} $0 == "demon.devin"
+			StrCpy $0 "daemon.devin"
+		${EndIf}
+		${WriteDefineConfig} "DEVELOPER" "$0"				
+		ClearErrors
+		${ReadAppInfoConfig} $0 "Team" "Contributors"
+		${IfNot} ${Errors}
+			${WriteDefineConfig} "CONTRIBUTORS" "$0"
+		${EndIf}
+		ClearErrors
+		${ReadAppInfoConfig} $0 "Details" "Publisher"
+		${IfNot} ${Errors}
+			${WriteDefineConfig} "PUBLISHER" "$0"
+		${EndIf}
+		ClearErrors
+		${ReadAppInfoConfig} $0 "Details" "Trademarks"
+		${IfNot} ${Errors}
+			${WriteDefineConfig} "TRADEMARK" "$0"
+		${EndIf}
+		ClearErrors
+		${ReadAppInfoConfig} $0 "Control" "Start"
+		${IfNot} ${Errors}
+			${WriteDefineConfig} "OUTFILE" "$0"
+		${EndIf}		
+		ClearErrors
+		${ReadAppInfoConfig} $0 "Dependencies" "UsesDotNetVersion"
+		${IfNot} ${Errors}
+			${If} $0 != false
+				${WriteDefineConfig} "DOTNET" ""
+			${EndIf}
+		${EndIf}
+		ClearErrors
+		${ReadAppInfoConfig} $0 "Dependencies" "UseStdUtils"
+		${IfNot} ${Errors}
+			${WriteDefineConfig} "UseStdUtils" ""
+		${EndIf}
+		ClearErrors
+		${ReadAppInfoConfig} $0 "Dependencies" "INF_Install"
+		${IfNot} ${Errors}
+			${WriteDefineConfig} "INF_Install" ""
+		${EndIf}
+		ClearErrors
+		${ReadAppInfoConfig} $0 "Dependencies" "RegistryValueWrite"
+		${IfNot} ${Errors}
+			${WriteDefineConfig} "RegSleep" "50"
+		${EndIf}
+		ClearErrors
+		${ReadAppInfoConfig} $0 "Dependencies" "FileWriteReplace"
+		${IfNot} ${Errors}
+			${WriteDefineConfig} "REPLACE" ""
+		${EndIf}
+		ClearErrors
+		${ReadAppInfoConfig} $0 "Dependencies" "CloseWindow"
+		${IfNot} ${Errors}
+			${WriteDefineConfig} "CloseWindow" ""
+		${EndIf}
+		ClearErrors
+		${ReadAppInfoConfig} $0 "Dependencies" "FileLocking"
+		${IfNot} ${Errors}
+			${WriteDefineConfig} "IsFileLocked" ""
+			${AddConditionIfNot} "CloseWindow"
+		${EndIf}
+		ClearErrors
+		${ReadAppInfoConfig} $0 "Dependencies" "Firewall"
+		${IfNot} ${Errors}
+			${WriteDefineConfig} "FIREWALL" ""
+		${EndIf}
+		ClearErrors
+		${ReadAppInfoConfig} $0 "Dependencies" "Junctions"
+		${IfNot} ${Errors}
+			${WriteDefineConfig} "NTFS" ""
+		${EndIf}
+		ClearErrors
+		${ReadAppInfoConfig} $0 "Dependencies" "ACLRegSupport"
+		${IfNot} ${Errors}
+			${WriteDefineConfig} "ACL" ""
+		${EndIf}
+		ClearErrors
+		${ReadAppInfoConfig} $0 "Dependencies" "ACLDirSupport"
+		${IfNot} ${Errors}
+			${WriteDefineConfig} "ACL_DIR" ""
+		${EndIf}
+		ClearErrors
+		${ReadAppInfoConfig} $0 "Dependencies" "RMEmptyDir"
+		${IfNot} ${Errors}
+			${WriteDefineConfig} "RMEMPTYDIRECTORIES" ""
+		${EndIf}
+		ClearErrors
+		${ReadAppInfoConfig} $0 "Dependencies" "LocalLow"
+		${IfNot} ${Errors}
+			${WriteDefineConfig} "LocalLow" ""
+		${EndIf}
+		ClearErrors
+		${ReadAppInfoConfig} $0 "Dependencies" "PublicDoc"
+		${IfNot} ${Errors}
+			${WriteDefineConfig} "PublicDoc" ""
+		${EndIf}
+		ClearErrors
+		${ReadAppInfoConfig} $0 "Dependencies" "CompareVersions"
+		${IfNot} ${Errors}
+			${WriteDefineConfig} "CompareVersions" ""
+		${EndIf}
+		ClearErrors
+		${ReadAppInfoConfig} $0 "Dependencies" "ConfigFunctions"
+		${IfNot} ${Errors}
+			${WriteDefineConfig} "ConFunc" ""
+		${EndIf}
+		ClearErrors
+		${ReadAppInfoConfig} $0 "Dependencies" "JSONSupport"
+		${IfNot} ${Errors}
+			${WriteDefineConfig} "JSON" ""
+		${EndIf}
+		ClearErrors
+		${ReadAppInfoConfig} $0 "Dependencies" "RestartSleep"
+		${IfNot} ${Errors}
+			${WriteDefineConfig} "Sleep" "$0"
+		${EndIf}
+		ClearErrors
+		${ReadAppInfoConfig} $0 "Dependencies" "WinMessages"
+		${IfNot} ${Errors}
+			${WriteDefineConfig} "Include_WinMessages" ""
+		${EndIf}
+		ClearErrors
+		${ReadAppInfoConfig} $0 "Dependencies" "LineWrite"
+		${IfNot} ${Errors}
+			${WriteDefineConfig} "Include_LineWrite" ""
+		${EndIf}
+		ClearErrors
+		${ReadAppInfoConfig} $0 "Dependencies" "TrimString"
+		${IfNot} ${Errors}
+			${WriteDefineConfig} "TrimString" ""
+		${EndIf}
+		ClearErrors
+		${ReadAppInfoConfig} $0 "Dependencies" "CloseProcess"
+		${IfNot} ${Errors}
+			${WriteDefineConfig} "CloseProc" ""
+		${EndIf}
+		ClearErrors
+		${ReadAppInfoConfig} $0 "Dependencies" "Include64"
+		${IfNot} ${Errors}
+			${WriteDefineConfig} "64.nsh" ""
+		${EndIf}
+		ClearErrors
+		${ReadAppInfoConfig} $0 "Dependencies" "IncludeWordRep"
+		${IfNot} ${Errors}
+			${WriteDefineConfig} "Include_WordRep" ""
+		${EndIf}
+		ClearErrors
+		${ReadAppInfoConfig} $0 "Dependencies" "GetBetween"
+		${IfNot} ${Errors}
+			${WriteDefineConfig} "GetBetween.nsh" ""
+		${EndIf}
+		ClearErrors
+		${ReadAppInfoConfig} $0 "Dependencies" "DisableLanguageCustom"
+		${IfNot} ${Errors}
+			${WriteDefineConfig} "DisablePAC:LanguageCustom" ""
+		${EndIf}
+		ClearErrors
+		${ReadAppInfoConfig} $0 "Dependencies" "DisableProgramExecSegment"
+		${IfNot} ${Errors}
+			${WriteDefineConfig} "DisableProgramExecSegment" ""
+		${EndIf}
+		ClearErrors
+		${ReadAppInfoConfig} $0 "Dependencies" "TLB_FUNCTION"
+		${IfNot} ${Errors}
+			${WriteDefineConfig} "TLB_FUNCTION" ""
+		${EndIf}
+		
+	${EndIf}
+	
+	${If} ${FileExists} "$PACKAGE\App\AppInfo\Launcher\$AppID.ini"
+		${ConvertPath} "App\AppInfo\Launcher\$AppID.ini" "App\AppInfo\CompilerWrapper.ini"
+		RMDir /r "$PACKAGE\App\AppInfo\Launcher"
+	${EndIf}
+	${If} ${FileExists} "$PACKAGE\App\$AppShortname\*.*"
+		CopyFiles /SILENT "$PACKAGE\App\$AppShortname" "$PACKAGE\bin\$AppShortname"
+		RMDir /r "$PACKAGE\App\$AppShortname"
+	${EndIf}
+	${If} ${FileExists} "$PACKAGE\App\$AppShortname64\*.*"
+		CopyFiles /SILENT "$PACKAGE\App\$AppShortname64" "$PACKAGE\bin\$AppShortname64"
+		RMDir /r "$PACKAGE\App\$AppShortname64"
+	${EndIf}
+	${If} ${FileExists} "$PACKAGE\App\DefaultData\*.*"
+		${If} ${FileExists} "$PACKAGE\App\DefaultData\settings\*.*"
+			Rename "$PACKAGE\App\DefaultData\settings" "$PACKAGE\App\DefaultData\Config"
+		${EndIf}
+		Rename "$PACKAGE\App\DefaultData" "$PACKAGE\App\DefaultSettings"
+	${EndIf}
+	${If} ${FileExists} "$PACKAGE\Data\*.*"
+		${If} ${FileExists} "$PACKAGE\Data\settings\*.*"
+			Rename "$PACKAGE\Data\settings" "$PACKAGE\Data\Config"
+		${EndIf}
+		CopyFiles /SILENT "$PACKAGE\Data" "$PACKAGE\bin\Settings"
+		RMDir /r "$PACKAGE\Data"
+	${EndIf}
+
+	${StringConvertInFile} "$PACKAGE\bin\Settings\Config\$AppIDSettings.ini" PAL: PAC:
+	${StringConvertInFile} "$PACKAGE\bin\Settings\Config\$AppIDSettings.ini" PortableApps.comLauncher PortableAppsCompiler
+	${StringConvertInFile} "${CWRAPPER}" %PAL: %PAC:
+	${StringConvertInFile} "${CWRAPPER}" PortableApps.comLauncher PortableAppsCompiler
+	${StringConvertInFile} "${CWRAPPER}" PortableApps.com PortableApps
+
+	${IfNot} ${FileExists} "${_}\App\AppInfo\CompilerWrapper.ini"
+		StrCpy $ERROROCCURED true
+		${WriteErrorLog} "${_}\App\AppInfo\CompilerWrapper.ini doesn't exist!"
+	${Else}
+		ClearErrors
+		${ReadWrapperConfig} $0 "Launch" "RunAsAdmin"
+        ${IfNot} ${Errors}
+			${If} $0 == "try"
+			${OrIf} $0 == "force"
+			${OrIf} $0 == "compile-force"
+				${WriteDefineConfig} "UAC" ""
+			${EndIf}
+		${EndIf}
+		ClearErrors
+		${ReadWrapperConfig} $0 "Activate" "Registry"
+		${IfNot} ${Errors}
+			${WriteDefineConfig} "REGISTRY" ""
+		${EndIf}
+		ClearErrors
+		${ReadWrapperConfig} $0 "Activate" "RegRedirection"
+		${IfNot} ${Errors}
+			${WriteDefineConfig} "DISABLEFSR" ""
+		${EndIf}
+		ClearErrors
+		${ReadWrapperConfig} $0 "Activate" "RegCopyKeys"
+		${IfNot} ${Errors}
+			${WriteDefineConfig} "RegCopy" ""
+		${EndIf}
+		ClearErrors
+		${ReadWrapperConfig} $0 "Activate" "Redirection"
+		${IfNot} ${Errors}
+			${WriteDefineConfig} "SYSTEMWIDE_DISABLEREDIR" ""
+		${EndIf}
+		ClearErrors
+		${ReadWrapperConfig} $0 "Activate" "ForceRedirection"
+		${IfNot} ${Errors}
+			${WriteDefineConfig} "FORCE_SYSTEMWIDE_DISABLEREDIR" ""
+		${EndIf}
+		ClearErrors
+		${ReadWrapperConfig} $0 "Activate" "ExecAsUser"
+		${IfNot} ${Errors}
+			${WriteDefineConfig} "ExecAsUser" ""
+		${EndIf}
+		ClearErrors
+		${ReadWrapperConfig} $0 "Activate" "Services"
+		${IfNot} ${Errors}
+			${WriteDefineConfig} "SERVICES" ""
+		${EndIf}
+		ClearErrors
+		${ReadWrapperConfig} $0 "Activate" "RegDLLs"
+		${IfNot} ${Errors}
+			${WriteDefineConfig} "REGISTERDLL" ""
+		${EndIf}
+		ClearErrors
+		${ReadWrapperConfig} $0 "Activate" "Tasks"
+		${IfNot} ${Errors}
+			${WriteDefineConfig} "TaskCleanUp" ""
+		${EndIf}
+		ClearErrors
+		${ReadWrapperConfig} $0 "Activate" "Java"
+		${IfNot} ${Errors}
+			${If} $0 == "find"
+			${OrIf} $0 == "require"
+				${WriteDefineConfig} "JAVA" ""
+			${EndIf}
+		${EndIf}
+		ClearErrors
+		${ReadWrapperConfig} $0 "Activate" "XML"
+		${IfNot} ${Errors}
+			${WriteDefineConfig} "XML_PLUGIN" ""
+		${EndIf}
+		ClearErrors
+		${ReadWrapperConfig} $0 "Activate" "Ghostscript"
+		${IfNot} ${Errors}
+			${WriteDefineConfig} "GHOSTSCRIPT" ""
+		${EndIf}
+		ClearErrors
+		${ReadWrapperConfig} $0 "Activate" "FontsFolder"
+		${IfNot} ${Errors}
+			${WriteDefineConfig} "FONTS_ENABLE" ""
+		${EndIf}
+		ClearErrors
+		${ReadWrapperConfig} $0 "Activate" "FileCleanup"
+		${IfNot} ${Errors}
+			${WriteDefineConfig} "FileCleanup" ""
+		${EndIf}
+		ClearErrors
+		${ReadWrapperConfig} $0 "Activate" "DirectoryCleanup"
+		${IfNot} ${Errors}
+			${WriteDefineConfig} "DirectoryCleanup" ""
+		${EndIf}
+		
+		FileClose $DEFINES
+		
+		${If} ${FileExists} "$PACKAGE\App\Readme.txt"
+			Delete "$PACKAGE\App\Readme.txt"
+		${EndIf}
+		${If} ${FileExists} "$PACKAGE\help.html"
+			Delete "$PACKAGE\help.html"
+		${EndIf}	
+		${If} ${FileExists} "$PACKAGE\App\AppInfo\eula.txt"
+			Rename "$PACKAGE\App\AppInfo\eula.txt" "$PACKAGE\App\AppInfo\eula.txt.temp"
+			Rename "$PACKAGE\App\AppInfo\eula.txt.temp" "$PACKAGE\App\AppInfo\EULA.txt"
+		${EndIf}
+		${If} ${FileExists} "$PACKAGE\App\DefaultData\*.*"
+			${ConvertPath} "App\DefaultData" "App\DefaultSettings"
+		${EndIf}
+		${If} ${FileExists} "$PACKAGE\Other\*.*"
+			${If} ${FileExists} "$PACKAGE\Other\Help\*.*"
+				RMDir /r "$PACKAGE\Other\Help"
+			${EndIf}
+			${IfNot} ${FileExists} "$PACKAGE\bin\*.*"
+				CreateDirectory "$PACKAGE\bin"
+			${EndIf}
+			${IfNot} ${FileExists} "$PACKAGE\etc\*.*"
+				CreateDirectory "$PACKAGE\etc"
+			${EndIf}
+			${If} ${FileExists} "$PACKAGE\Other\Source\PortableApps.comInstallerCustom.nsh"
+				${ConvertPath} "Other\Source\PortableApps.comInstallerCustom.nsh" "App\AppInfo\ExtendedInstaller.nsh"
+			${EndIf}
+			${If} ${FileExists} "$PACKAGE\Other\Source\$AppID.ini"
+				${ConvertPath} "Other\Source\$AppID.ini" "etc\$AppID.ini"
+				Delete "$PACKAGE\Other\Source\$AppID.ini"
+			${EndIf}
+			${If} ${FileExists} "$PACKAGE\Other\Source\Readme.txt"
+				${ConvertPath} "Other\Source\Readme.txt" "etc\README"
+				Delete "$PACKAGE\Other\Source\Readme.txt"
+			${EndIf}
+			${If} ${FileExists} "$PACKAGE\Other\notes.txt"
+				${ConvertPath} "Other\notes.txt" "etc\NOTES"
+				Delete "$PACKAGE\Other\notes.txt"
+			${EndIf}
+			${If} ${FileExists} "$PACKAGE\Other\*.nsi"
+				${ConvertPath} "Other\*.nsi" "etc\*.nsi"
+				Delete "$PACKAGE\Other\*.nsi"
+			${EndIf}
+			${If} ${FileExists} "$PACKAGE\Other\*.png"
+				${ConvertPath} "Other\*.png" "etc\*.png"
+				Delete "$PACKAGE\Other\*.png"
+			${EndIf}
+			${If} ${FileExists} "$PACKAGE\Other\Source\LauncherLicense.txt"
+				Delete "$PACKAGE\Other\Source\LauncherLicense.txt"
+			${EndIf}
+			${If} ${FileExists} "$PACKAGE\Other\Source\COPYING"
+				Delete "$PACKAGE\Other\Source\COPYING"
+			${EndIf}
+			${IfNot} ${FileExists} "$PACKAGE\etc\UNLICENSE"
+				CopyFiles /SILENT "$EXEDIR\etc\UNLICENSE" "$PACKAGE\etc\UNLICENSE"
+			${EndIf}
+			CopyFiles /SILENT "App\Other\*.*" "$PACKAGE\etc"
+			RMDir /r "$PACKAGE\Other"
+			Rename "$PACKAGE\App" "$PACKAGE\AppTemp"
+			Rename "$PACKAGE\AppTemp" "$PACKAGE\app"
+			Rename "$PACKAGE\App\AppInfo\appinfo.ini" "$PACKAGE\App\AppInfo\appinfo.ini.temp"
+			Rename "$PACKAGE\App\AppInfo\appinfo.ini.temp" "$PACKAGE\App\AppInfo\AppInfo.ini"
+			Rename "$PACKAGE\App\AppInfo\appicon.ico" "$PACKAGE\App\AppInfo\appicon.ico.temp"
+			Rename "$PACKAGE\App\AppInfo\appicon.ico.temp" "$PACKAGE\App\AppInfo\AppIcon.ico"
+			Rename "$PACKAGE\App\AppInfo\appicon_16.png" "$PACKAGE\App\AppInfo\appicon_16.png.temp"
+			Rename "$PACKAGE\App\AppInfo\appicon_16.png.temp" "$PACKAGE\App\AppInfo\AppIcon_16.png"
+			Rename "$PACKAGE\App\AppInfo\appicon_32.png" "$PACKAGE\App\AppInfo\appicon_32.png.temp"
+			Rename "$PACKAGE\App\AppInfo\appicon_32.png.temp" "$PACKAGE\App\AppInfo\AppIcon_32.png"
+			Rename "$PACKAGE\App\AppInfo\appicon_128.png" "$PACKAGE\App\AppInfo\appicon_128.png.temp"
+			Rename "$PACKAGE\App\AppInfo\appicon_128.png.temp" "$PACKAGE\App\AppInfo\AppIcon_128.png"
+		${EndIf}
+	
+		StrCpy $2 ""
+		; See if we need to enable XML
+		ReadINIStr $3 "${_}\App\AppInfo\CompilerWrapper.ini" Activate XML
+		${If} $3 == true
+			StrCpy $2 "$2 /DXML_ENABLED"
+		${EndIf}
+
+		; See if we need to use the RequestExecutionLevel admin
+		ReadINIStr $3 "${_}\App\AppInfo\CompilerWrapper.ini" Launch RunAsAdmin
+		${If} $3 == compile-force
+			StrCpy $2 "$2 /DRUNASADMIN_COMPILEFORCE"
+		${EndIf}
+		
+		; See if automatic signing is requested
+		ReadINIStr $3 "${_}\App\AppInfo\AppInfo.ini" Team CertSigning
+		${If} $3 == true
+			StrCpy $2 "$2 /DCertificate"
+			ReadINIStr $4 "${_}\App\AppInfo\AppInfo.ini" Team CertExtension
+			StrCpy $2 "$2 /DCertExtension=$4"
+			ReadINIStr $5 "${_}\App\AppInfo\AppInfo.ini" Team CertTimestamp
+			StrCpy $2 "$2 /DCertTimestamp=$5"
+		${EndIf}
+		
+	${EndIf}
+
+	${If} $ERROROCCURED != true
+		; Build the thing
+		ExecDos::exec `"$NSIS" /O"$EXEDIR\bin\PortableAppsCompilerLog.txt" /DPACKAGE="$PACKAGE" /DNamePortable="$Name" /DAppID="$AppID" /DVersion="$1"$2 "$EXEDIR\etc\source\PortableAppsCompiler.nsi"` "" ""
+		Pop $R1
+		${If} $R1 <> 0
+			StrCpy $ERROROCCURED true
+			${WriteErrorLog} "MakeNSIS exited with status code $R1"
+		${EndIf}
+	${EndIf}
+
+	SetDetailsPrint ListOnly
+
+	DetailPrint " "
+	DetailPrint "Processing complete."
+	${If} ${FileExists} $PACKAGE\$AppID.exe
+		StrCpy $FINISHTITLE "Wrapper Created"
+		StrCpy $FINISHTEXT "The wrapper has been created. Wrapper location:\r\n$PACKAGE\r\n\r\nWrapper name:\r\n$AppID.exe" 
+	${Else}
+		StrCpy $FINISHTITLE "An Error Occurred"
+		StrCpy $FINISHTEXT "The wrapper was not created. You can view the log file for more information."
+		StrCpy $ERROROCCURED true
+	${EndIf}
+SectionEnd
+Function ShowFinishPage
+	${If} $AUTOMATICCOMPILE == "true"
+	${AndIf} $ERROROCCURED != true
+		Abort
+	${Else}
+		${If} $ERROROCCURED == true
+			!insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Flags" "DISABLED"
+			!insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 5" "State" "1"
+		${EndIf}
+	${EndIf}
+FunctionEnd
+Function RunOnFinish
+	Exec $PACKAGE\$AppID.exe
+FunctionEnd
+Function .onGUIEnd
+	RealProgress::Unload
+FunctionEnd
diff --git a/Other/Source/CompilerWizardForm.ini b/etc/source/CompilerWizardForm.ini
similarity index 90%
rename from Other/Source/CompilerWizardForm.ini
rename to etc/source/CompilerWizardForm.ini
index b8b6bf5..acb2444 100644
--- a/Other/Source/CompilerWizardForm.ini
+++ b/etc/source/CompilerWizardForm.ini
@@ -1,17 +1,17 @@
-[Settings]
-NumFields=2
-
-[Field 1]
-Type=Label
-Left=0
-Top=0
-Right=296
-Bottom=8
-Text=Create Launcher For:
-
-[Field 2]
-Type=DirRequest
-Left=0
-Top=12
-Right=297
-Bottom=26
+[Settings]
+NumFields=2
+
+[Field 1]
+Type=Label
+Left=0
+Top=0
+Right=296
+Bottom=8
+Text=Create Launcher For:
+
+[Field 2]
+Type=DirRequest
+Left=0
+Top=12
+Right=297
+Bottom=26
diff --git a/Other/Source/Contrib/bin/7z.dll b/etc/source/Contrib/bin/7z.dll
similarity index 100%
rename from Other/Source/Contrib/bin/7z.dll
rename to etc/source/Contrib/bin/7z.dll
diff --git a/Other/Source/Contrib/bin/7z.exe b/etc/source/Contrib/bin/7z.exe
similarity index 100%
rename from Other/Source/Contrib/bin/7z.exe
rename to etc/source/Contrib/bin/7z.exe
diff --git a/Other/Source/Contrib/bin/7z.txt b/etc/source/Contrib/bin/7z.txt
similarity index 97%
rename from Other/Source/Contrib/bin/7z.txt
rename to etc/source/Contrib/bin/7z.txt
index 7c66b64..d7d62e6 100644
--- a/Other/Source/Contrib/bin/7z.txt
+++ b/etc/source/Contrib/bin/7z.txt
@@ -1,160 +1,160 @@
-Switch ao. The "ao" switch allows you to specify whether you want to overwrite old files. Be careful�you cannot restore an overwritten file normally. This switch takes another argument.
-
-Switch -aoa:
-This switch overwrites all destination files. Use it when the new versions are preferred.
-
-Switch -aos:
-Skip over existing files without overwriting. Use this for files where the earliest version is most important.
-
-Switch -aou:
-Avoid name collisions. New files extracted will have a number appending to their names. You will have to deal with them later.
-
-Switch -aot:
-Rename existing files. This will not rename the new files, just the old ones already there.
-
-Examples:
-7z x test.zip -aoa
-
-7z:       use the 7-zip executable
-x:        use the extract command
-test.zip: extract files from this archive
--aoa:     overwrite all existing files
-
-Command Line Syntax
-
-7z <command> [<switch>...] <base_archive_name> [<arguments>...]
-<arguments> ::= <switch> | <wildcard> | <filename> | <list_file>
-<switch>::= <switch_symbol><switch_characters>[<option>]
-<switch_symbol> ::= '/' | '-' 
-<list_file> ::= @{filename}
-Expressions in square brackets (between '[' and ']') are optional.
-
-Expressions in curly braces ('{' and '}') mean that instead of that Expression (including braces), the user must substitute some string.
-
-Expression
-
-expression1 | expression2 | ... | expressionN
-means that any (but only one) from these expressions must be specified.
-
-Commands and switches can be entered in upper or lower case.
-
-Command is the first non-switch argument.
-
-The "base_archive_name" must be the first filename on the command line after the command.
-
-The switches and other filenames can be in any order.
-
-Wildcards or filenames with spaces must be quoted:
-
-    "Dir\Program files\*"
-    Dir\"Program files"\*
-Switch options can be combined to save command line length. However, some switch options take optional string arguments and therefore, must be the last option in a combined argument token string because 7-Zip accepts the rest of the argument token as the optional argument.
-
-7-Zip uses wild name matching similar to Windows 95:
-
-'*' means a sequence of arbitrary characters.
-'?' means any character.
-7-Zip doesn't uses the system wildcard parser. 7-Zip doesn't follow the archaic rule by which *.* means any file. 7-Zip treats *.* as matching the name of any file that has an extension. To process all files, you must use a * wildcard.
-
-Examples:
-
-*.txt	means all files with an extension of ".txt"
-?a*	means all files with a second character of "a"
-*1*	means all names that contains character "1"
-*.*.*	means all names that contain two at least "." characters
-The default wildcard "*" will be used if there is no filename/wildcard in the command line.
-
-Slash ('\') at the end of a path means a directory. Without a Slash ('\') at the end of the path, the path can refer either to a file or a directory.
-
-List file
-
-You can supply one or more filenames or wildcards for special list files (files containing lists of files). The filenames in such list file must be separated by new line symbol(s).
-
-For list files, 7-Zip uses UTF-8 encoding by default. You can change encoding using -scs switch.
-
-Multiple list files are supported.
-
-For example, if the file "listfile.txt" contains the following:
-
-    My programs\*.cpp
-    Src\*.cpp
-then the command
-
-    7z a -tzip archive.zip @listfile.txt
-adds to the archive "archive.zip" all "*.cpp" files from directories "My programs" and "Src".
-
-Short and Long File Names
-
-7-Zip supports short file names (like FILENA~1.TXT) in some cases. However, it's strongly recommended to use only the real (long) file names.
-
-
-
-
-
-
-
-Command Line Switches
-
-Syntax
-
-<switch>::= <switch_symbol><switch_characters>[<option>]
-<switch_symbol> ::= '/' | '-' 
-
-On the command line, a switch consists of a switch specifier, either a dash (-) or a forward slash (/), followed by the name of the switch. Switch names cannot be abbreviated.
-
-Some switches take an argument after the switch name. No spaces or tabs are allowed within a switch specification. Switch names are not case sensitive, but arguments can be case sensitive.
-
-Switch can be used in any place in command line.
-
-See also Command Line Syntax for more details about using the command line.
-
-Switch quick reference
-
-Switch	Description
---	Stop switches parsing
--ai	Include archive filenames
--an	Disable parsing of archive_name
--ao	Overwrite mode
--ax	Exclude archive filenames
--i	Include filenames
--m	Set Compression Method
--o	Set Output directory
--p	Set Password
--r	Recurse subdirectories
--scc	Set charset for for console input/output
--scs	Set charset for list files
--seml	Send archive by email
--slp	Set Large Pages mode
--slt	Show technical information
--sfx	Create SFX archive
--si	Read data from StdIn
--so	Write data to StdOut
--ssc	Set Sensitive Case mode
--ssw	Compress files open for writing
--t	Type of archive
--u	Update options
--v	Create Volumes
--w	Set Working directory
--x	Exclude filenames
--y	Assume Yes on all queries
-
-
-Command Line Commands
-
-The command is the first non-switch argument on the command line.
-
-Command names are not case sensitive.
-
-See also Command Line Syntax for more details about using the command line.
-
-Commands quick reference
-
-Command	Description
-a	Add
-b	Benchmark
-d	Delete
-e	Extract
-l	List
-t	Test
-u	Update
-x	eXtract with full paths
+Switch ao. The "ao" switch allows you to specify whether you want to overwrite old files. Be careful�you cannot restore an overwritten file normally. This switch takes another argument.
+
+Switch -aoa:
+This switch overwrites all destination files. Use it when the new versions are preferred.
+
+Switch -aos:
+Skip over existing files without overwriting. Use this for files where the earliest version is most important.
+
+Switch -aou:
+Avoid name collisions. New files extracted will have a number appending to their names. You will have to deal with them later.
+
+Switch -aot:
+Rename existing files. This will not rename the new files, just the old ones already there.
+
+Examples:
+7z x test.zip -aoa
+
+7z:       use the 7-zip executable
+x:        use the extract command
+test.zip: extract files from this archive
+-aoa:     overwrite all existing files
+
+Command Line Syntax
+
+7z <command> [<switch>...] <base_archive_name> [<arguments>...]
+<arguments> ::= <switch> | <wildcard> | <filename> | <list_file>
+<switch>::= <switch_symbol><switch_characters>[<option>]
+<switch_symbol> ::= '/' | '-' 
+<list_file> ::= @{filename}
+Expressions in square brackets (between '[' and ']') are optional.
+
+Expressions in curly braces ('{' and '}') mean that instead of that Expression (including braces), the user must substitute some string.
+
+Expression
+
+expression1 | expression2 | ... | expressionN
+means that any (but only one) from these expressions must be specified.
+
+Commands and switches can be entered in upper or lower case.
+
+Command is the first non-switch argument.
+
+The "base_archive_name" must be the first filename on the command line after the command.
+
+The switches and other filenames can be in any order.
+
+Wildcards or filenames with spaces must be quoted:
+
+    "Dir\Program files\*"
+    Dir\"Program files"\*
+Switch options can be combined to save command line length. However, some switch options take optional string arguments and therefore, must be the last option in a combined argument token string because 7-Zip accepts the rest of the argument token as the optional argument.
+
+7-Zip uses wild name matching similar to Windows 95:
+
+'*' means a sequence of arbitrary characters.
+'?' means any character.
+7-Zip doesn't uses the system wildcard parser. 7-Zip doesn't follow the archaic rule by which *.* means any file. 7-Zip treats *.* as matching the name of any file that has an extension. To process all files, you must use a * wildcard.
+
+Examples:
+
+*.txt	means all files with an extension of ".txt"
+?a*	means all files with a second character of "a"
+*1*	means all names that contains character "1"
+*.*.*	means all names that contain two at least "." characters
+The default wildcard "*" will be used if there is no filename/wildcard in the command line.
+
+Slash ('\') at the end of a path means a directory. Without a Slash ('\') at the end of the path, the path can refer either to a file or a directory.
+
+List file
+
+You can supply one or more filenames or wildcards for special list files (files containing lists of files). The filenames in such list file must be separated by new line symbol(s).
+
+For list files, 7-Zip uses UTF-8 encoding by default. You can change encoding using -scs switch.
+
+Multiple list files are supported.
+
+For example, if the file "listfile.txt" contains the following:
+
+    My programs\*.cpp
+    Src\*.cpp
+then the command
+
+    7z a -tzip archive.zip @listfile.txt
+adds to the archive "archive.zip" all "*.cpp" files from directories "My programs" and "Src".
+
+Short and Long File Names
+
+7-Zip supports short file names (like FILENA~1.TXT) in some cases. However, it's strongly recommended to use only the real (long) file names.
+
+
+
+
+
+
+
+Command Line Switches
+
+Syntax
+
+<switch>::= <switch_symbol><switch_characters>[<option>]
+<switch_symbol> ::= '/' | '-' 
+
+On the command line, a switch consists of a switch specifier, either a dash (-) or a forward slash (/), followed by the name of the switch. Switch names cannot be abbreviated.
+
+Some switches take an argument after the switch name. No spaces or tabs are allowed within a switch specification. Switch names are not case sensitive, but arguments can be case sensitive.
+
+Switch can be used in any place in command line.
+
+See also Command Line Syntax for more details about using the command line.
+
+Switch quick reference
+
+Switch	Description
+--	Stop switches parsing
+-ai	Include archive filenames
+-an	Disable parsing of archive_name
+-ao	Overwrite mode
+-ax	Exclude archive filenames
+-i	Include filenames
+-m	Set Compression Method
+-o	Set Output directory
+-p	Set Password
+-r	Recurse subdirectories
+-scc	Set charset for for console input/output
+-scs	Set charset for list files
+-seml	Send archive by email
+-slp	Set Large Pages mode
+-slt	Show technical information
+-sfx	Create SFX archive
+-si	Read data from StdIn
+-so	Write data to StdOut
+-ssc	Set Sensitive Case mode
+-ssw	Compress files open for writing
+-t	Type of archive
+-u	Update options
+-v	Create Volumes
+-w	Set Working directory
+-x	Exclude filenames
+-y	Assume Yes on all queries
+
+
+Command Line Commands
+
+The command is the first non-switch argument on the command line.
+
+Command names are not case sensitive.
+
+See also Command Line Syntax for more details about using the command line.
+
+Commands quick reference
+
+Command	Description
+a	Add
+b	Benchmark
+d	Delete
+e	Extract
+l	List
+t	Test
+u	Update
+x	eXtract with full paths
diff --git a/Other/Source/Contrib/bin/FastCopy.exe b/etc/source/Contrib/bin/FastCopy.exe
similarity index 100%
rename from Other/Source/Contrib/bin/FastCopy.exe
rename to etc/source/Contrib/bin/FastCopy.exe
diff --git a/Other/Source/Contrib/bin/FastCopy64.exe b/etc/source/Contrib/bin/FastCopy64.exe
similarity index 100%
rename from Other/Source/Contrib/bin/FastCopy64.exe
rename to etc/source/Contrib/bin/FastCopy64.exe
diff --git a/Other/Source/Contrib/bin/ResHacker.exe b/etc/source/Contrib/bin/ResHacker.exe
similarity index 100%
rename from Other/Source/Contrib/bin/ResHacker.exe
rename to etc/source/Contrib/bin/ResHacker.exe
diff --git a/Other/Source/Contrib/bin/ResHacker.hlp b/etc/source/Contrib/bin/ResHacker.hlp
similarity index 100%
rename from Other/Source/Contrib/bin/ResHacker.hlp
rename to etc/source/Contrib/bin/ResHacker.hlp
diff --git a/Other/Source/Contrib/bin/ResHacker.ini b/etc/source/Contrib/bin/ResHacker.ini
similarity index 92%
rename from Other/Source/Contrib/bin/ResHacker.ini
rename to etc/source/Contrib/bin/ResHacker.ini
index ab1eef3..57736bd 100644
--- a/Other/Source/Contrib/bin/ResHacker.ini
+++ b/etc/source/Contrib/bin/ResHacker.ini
@@ -1,20 +1,20 @@
-[MRU List]
-
-
-[Setup]
-left=297
-top=164
-width=681
-height=367
-MaximizedState=0
-vsplit=200
-LastOpenedDir=C:\Users\Devin\AppData\Local\Temp\Notepad++PortableTemp
-LastSavedDir=
-
-[Font]
-Name=Courier New
-Size=10
-CharSet=1
-Color=-2147483640
-Style=0
-
+[MRU List]
+
+
+[Setup]
+left=297
+top=164
+width=681
+height=367
+MaximizedState=0
+vsplit=200
+LastOpenedDir=C:\Users\Devin\AppData\Local\Temp\Notepad++PortableTemp
+LastSavedDir=
+
+[Font]
+Name=Courier New
+Size=10
+CharSet=1
+Color=-2147483640
+Style=0
+
diff --git a/Other/Source/Contrib/bin/UnRAR.exe b/etc/source/Contrib/bin/UnRAR.exe
similarity index 100%
rename from Other/Source/Contrib/bin/UnRAR.exe
rename to etc/source/Contrib/bin/UnRAR.exe
diff --git a/Other/Source/Contrib/bin/UnRAR64.exe b/etc/source/Contrib/bin/UnRAR64.exe
similarity index 100%
rename from Other/Source/Contrib/bin/UnRAR64.exe
rename to etc/source/Contrib/bin/UnRAR64.exe
diff --git a/Other/Source/Contrib/bin/cmd.txt b/etc/source/Contrib/bin/cmd.txt
similarity index 97%
rename from Other/Source/Contrib/bin/cmd.txt
rename to etc/source/Contrib/bin/cmd.txt
index 17aaa57..7e08b73 100644
--- a/Other/Source/Contrib/bin/cmd.txt
+++ b/etc/source/Contrib/bin/cmd.txt
@@ -1,61 +1,61 @@
-
-UNRAR 5.01 freeware      Copyright (c) 1993-2013 Alexander Roshal
-
-Usage:     unrar <command> -<switch 1> -<switch N> <archive> <files...>
-               <@listfiles...> <path_to_extract\>
-
-<Commands>
-  e             Extract files without archived paths
-  l[t[a],b]     List archive contents [technical[all], bare]
-  p             Print file to stdout
-  t             Test archive files
-  v[t[a],b]     Verbosely list archive contents [technical[all],bare]
-  x             Extract files with full path
-
-<Switches>
-  -             Stop switches scanning
-  @[+]          Disable [enable] file lists
-  ac            Clear Archive attribute after compression or extraction
-  ad            Append archive name to destination path
-  ag[format]    Generate archive name using the current date
-  ai            Ignore file attributes
-  ap<path>      Set path inside archive
-  c-            Disable comments show
-  cfg-          Disable read configuration
-  cl            Convert names to lower case
-  cu            Convert names to upper case
-  dh            Open shared files
-  ep            Exclude paths from names
-  ep3           Expand paths to full including the drive letter
-  f             Freshen files
-  id[c,d,p,q]   Disable messages
-  ierr          Send all messages to stderr
-  inul          Disable all messages
-  ioff          Turn PC off after completing an operation
-  kb            Keep broken extracted files
-  n<file>       Additionally filter included files
-  n@            Read additional filter masks from stdin
-  n@<list>      Read additional filter masks from list file
-  o[+|-]        Set the overwrite mode
-  oc            Set NTFS Compressed attribute
-  or            Rename files automatically
-  ow            Save or restore file owner and group
-  p[password]   Set password
-  p-            Do not query password
-  r             Recurse subdirectories
-  ri<P>[:<S>]   Set priority (0-default,1-min..15-max) and sleep time in ms
-  sl<size>      Process files with size less than specified
-  sm<size>      Process files with size more than specified
-  ta<date>      Process files modified after <date> in YYYYMMDDHHMMSS format
-  tb<date>      Process files modified before <date> in YYYYMMDDHHMMSS format
-  tn<time>      Process files newer than <time>
-  to<time>      Process files older than <time>
-  ts<m,c,a>[N]  Save or restore file time (modification, creation, access)
-  u             Update files
-  v             List all volumes
-  ver[n]        File version control
-  vp            Pause before each volume
-  x<file>       Exclude specified file
-  x@            Read file names to exclude from stdin
-  x@<list>      Exclude files listed in specified list file
-  y             Assume Yes on all queries
+
+UNRAR 5.01 freeware      Copyright (c) 1993-2013 Alexander Roshal
+
+Usage:     unrar <command> -<switch 1> -<switch N> <archive> <files...>
+               <@listfiles...> <path_to_extract\>
+
+<Commands>
+  e             Extract files without archived paths
+  l[t[a],b]     List archive contents [technical[all], bare]
+  p             Print file to stdout
+  t             Test archive files
+  v[t[a],b]     Verbosely list archive contents [technical[all],bare]
+  x             Extract files with full path
+
+<Switches>
+  -             Stop switches scanning
+  @[+]          Disable [enable] file lists
+  ac            Clear Archive attribute after compression or extraction
+  ad            Append archive name to destination path
+  ag[format]    Generate archive name using the current date
+  ai            Ignore file attributes
+  ap<path>      Set path inside archive
+  c-            Disable comments show
+  cfg-          Disable read configuration
+  cl            Convert names to lower case
+  cu            Convert names to upper case
+  dh            Open shared files
+  ep            Exclude paths from names
+  ep3           Expand paths to full including the drive letter
+  f             Freshen files
+  id[c,d,p,q]   Disable messages
+  ierr          Send all messages to stderr
+  inul          Disable all messages
+  ioff          Turn PC off after completing an operation
+  kb            Keep broken extracted files
+  n<file>       Additionally filter included files
+  n@            Read additional filter masks from stdin
+  n@<list>      Read additional filter masks from list file
+  o[+|-]        Set the overwrite mode
+  oc            Set NTFS Compressed attribute
+  or            Rename files automatically
+  ow            Save or restore file owner and group
+  p[password]   Set password
+  p-            Do not query password
+  r             Recurse subdirectories
+  ri<P>[:<S>]   Set priority (0-default,1-min..15-max) and sleep time in ms
+  sl<size>      Process files with size less than specified
+  sm<size>      Process files with size more than specified
+  ta<date>      Process files modified after <date> in YYYYMMDDHHMMSS format
+  tb<date>      Process files modified before <date> in YYYYMMDDHHMMSS format
+  tn<time>      Process files newer than <time>
+  to<time>      Process files older than <time>
+  ts<m,c,a>[N]  Save or restore file time (modification, creation, access)
+  u             Update files
+  v             List all volumes
+  ver[n]        File version control
+  vp            Pause before each volume
+  x<file>       Exclude specified file
+  x@            Read file names to exclude from stdin
+  x@<list>      Exclude files listed in specified list file
+  y             Assume Yes on all queries
diff --git a/Other/Source/Contrib/bin/devcon.exe b/etc/source/Contrib/bin/devcon.exe
similarity index 100%
rename from Other/Source/Contrib/bin/devcon.exe
rename to etc/source/Contrib/bin/devcon.exe
diff --git a/Other/Source/Contrib/bin/dmv.exe b/etc/source/Contrib/bin/dmv.exe
similarity index 100%
rename from Other/Source/Contrib/bin/dmv.exe
rename to etc/source/Contrib/bin/dmv.exe
diff --git a/Other/Source/Contrib/bin/dmv64.exe b/etc/source/Contrib/bin/dmv64.exe
similarity index 100%
rename from Other/Source/Contrib/bin/dmv64.exe
rename to etc/source/Contrib/bin/dmv64.exe
diff --git a/Other/Source/Contrib/bin/innounp.exe b/etc/source/Contrib/bin/innounp.exe
similarity index 100%
rename from Other/Source/Contrib/bin/innounp.exe
rename to etc/source/Contrib/bin/innounp.exe
diff --git a/Other/Source/Contrib/bin/innounp.txt b/etc/source/Contrib/bin/innounp.txt
similarity index 97%
rename from Other/Source/Contrib/bin/innounp.txt
rename to etc/source/Contrib/bin/innounp.txt
index 4315f4c..8260e15 100644
--- a/Other/Source/Contrib/bin/innounp.txt
+++ b/etc/source/Contrib/bin/innounp.txt
@@ -1,42 +1,42 @@
-innounp, the Inno Setup Unpacker. Version 0.43
-Usage: innounp [command] [options] <setup.exe or setup.0> [@filelist] [filemask ...]
-Commands:
-  (no)   display general installation info
-  -v     verbosely list the files (with sizes and timestamps)
-  -x     extract the files from the installation (to the current directory, also see -d)
-  -e     extract files without paths
-  -t     test files for integrity
-Options:
-  -b     batch (non-interactive) mode - will not prompt for password or disk changes
-  -q     do not indicate progress while extracting
-  -m     extract internal embedded files (such as license and uninstall.exe)
-  -pPASS decrypt the installation with a password
-  -dDIR  extract the files into DIR (can be absolute or relative path)
-  -cDIR  specifies that DIR is the current directory in the installation
-  -n     don't attempt to unpack new versions
-  -fFILE same as -p but reads the password from FILE
-  -a     extract all copies of duplicate files
-  -y     assume Yes on all queries (e.g. overwrite files)
-
-http://innounp.sourceforge.net/
-
-;=== ExecDos causes inounp to freeze.
-	SetOutPath `$PLUGINSDIR\Downloaded`
-	File `${NSISDIR}\..\7zip\innounp.exe`
-	CreateDirectory `$INSTDIR\TEMP`
-	nsExec::Exec `"$PLUGINSDIR\innounp.exe" -x -a "$DOWNLOADEDFILE" -d"$INSTDIR\TEMP"`
-	Sleep 1000
-	Rename `$INSTDIR\TEMP\{app}` `$INSTDIR\App\iUnlocker`
-
-NOTE: use -a to avoid extraction problems. innounp can leave out files. 
--a process all copies of duplicate files
-================================================================================
-nsExec::Exec `"$PLUGINSDIR\innounp.exe" -x -a "$DOWNLOADEDFILE" -d"$INSTDIR\TEMP"`
-
-
-# HAD TO USE THIS FOR ASHAMPOO.. ELSE DUPLICATES WEREN'T REPLACED CAUSING APP ERRORS.
-================================================================================
-	CreateDirectory `$INSTDIR\TEMP`
-	nsExec::Exec `"$PLUGINSDIR\innounp.exe" -x -m -y -q -n "$DOWNLOADEDFILE" -d"$INSTDIR\TEMP"`
-	Sleep 1000
+innounp, the Inno Setup Unpacker. Version 0.43
+Usage: innounp [command] [options] <setup.exe or setup.0> [@filelist] [filemask ...]
+Commands:
+  (no)   display general installation info
+  -v     verbosely list the files (with sizes and timestamps)
+  -x     extract the files from the installation (to the current directory, also see -d)
+  -e     extract files without paths
+  -t     test files for integrity
+Options:
+  -b     batch (non-interactive) mode - will not prompt for password or disk changes
+  -q     do not indicate progress while extracting
+  -m     extract internal embedded files (such as license and uninstall.exe)
+  -pPASS decrypt the installation with a password
+  -dDIR  extract the files into DIR (can be absolute or relative path)
+  -cDIR  specifies that DIR is the current directory in the installation
+  -n     don't attempt to unpack new versions
+  -fFILE same as -p but reads the password from FILE
+  -a     extract all copies of duplicate files
+  -y     assume Yes on all queries (e.g. overwrite files)
+
+http://innounp.sourceforge.net/
+
+;=== ExecDos causes inounp to freeze.
+	SetOutPath `$PLUGINSDIR\Downloaded`
+	File `${NSISDIR}\..\7zip\innounp.exe`
+	CreateDirectory `$INSTDIR\TEMP`
+	nsExec::Exec `"$PLUGINSDIR\innounp.exe" -x -a "$DOWNLOADEDFILE" -d"$INSTDIR\TEMP"`
+	Sleep 1000
+	Rename `$INSTDIR\TEMP\{app}` `$INSTDIR\App\iUnlocker`
+
+NOTE: use -a to avoid extraction problems. innounp can leave out files. 
+-a process all copies of duplicate files
+================================================================================
+nsExec::Exec `"$PLUGINSDIR\innounp.exe" -x -a "$DOWNLOADEDFILE" -d"$INSTDIR\TEMP"`
+
+
+# HAD TO USE THIS FOR ASHAMPOO.. ELSE DUPLICATES WEREN'T REPLACED CAUSING APP ERRORS.
+================================================================================
+	CreateDirectory `$INSTDIR\TEMP`
+	nsExec::Exec `"$PLUGINSDIR\innounp.exe" -x -m -y -q -n "$DOWNLOADEDFILE" -d"$INSTDIR\TEMP"`
+	Sleep 1000
 	Rename `$INSTDIR\TEMP\{app}` `${APPDIR}`
\ No newline at end of file
diff --git a/Other/Source/Contrib/bin/junction.exe b/etc/source/Contrib/bin/junction.exe
similarity index 100%
rename from Other/Source/Contrib/bin/junction.exe
rename to etc/source/Contrib/bin/junction.exe
diff --git a/Other/Source/Contrib/bin/lessmsi.exe b/etc/source/Contrib/bin/lessmsi.exe
similarity index 100%
rename from Other/Source/Contrib/bin/lessmsi.exe
rename to etc/source/Contrib/bin/lessmsi.exe
diff --git a/Other/Source/Contrib/bin/lessmsi.txt b/etc/source/Contrib/bin/lessmsi.txt
similarity index 100%
rename from Other/Source/Contrib/bin/lessmsi.txt
rename to etc/source/Contrib/bin/lessmsi.txt
diff --git a/Other/Source/Contrib/bin/patch.exe b/etc/source/Contrib/bin/patch.exe
similarity index 100%
rename from Other/Source/Contrib/bin/patch.exe
rename to etc/source/Contrib/bin/patch.exe
diff --git a/Other/Source/Contrib/bin/patch.txt b/etc/source/Contrib/bin/patch.txt
similarity index 98%
rename from Other/Source/Contrib/bin/patch.txt
rename to etc/source/Contrib/bin/patch.txt
index 79344aa..11989a0 100644
--- a/Other/Source/Contrib/bin/patch.txt
+++ b/etc/source/Contrib/bin/patch.txt
@@ -1,23 +1,23 @@
 
 Hexadecimal patcher for files, find and replaces.
 
-HEXPATCHER hexsource [hexreplace] [-max n] [-query] [-noBackup] [-quiet]
+HEXPATCHER hexsource [hexreplace] [-max n] [-query] [-noBackup] [-quiet]
 [-startFrom start] [-startWith hex] [-verbose] [-help] file
 
-  hexsource		Hex string to find
-  hexreplace		Hex string to replace
-  -max n		Don't replace more than n times
-  -query		Query user before each replacement
-  -noBackup		Don't create any backup file
-  -quiet		Hide messages and errors
-  -startFrom start	First match to begin replacements
-  -startWith hex	Find this hex string and begin from there
-  -verbose		Show debug messages and alerts
-  -help			Display this help
+  hexsource		Hex string to find
+  hexreplace		Hex string to replace
+  -max n		Don't replace more than n times
+  -query		Query user before each replacement
+  -noBackup		Don't create any backup file
+  -quiet		Hide messages and errors
+  -startFrom start	First match to begin replacements
+  -startWith hex	Find this hex string and begin from there
+  -verbose		Show debug messages and alerts
+  -help			Display this help
   file			Input file path
 
 ExecDos::Exec /TOSTACK `"${APPDIR}\patch.exe" 740AB8FEFFFFFF 9090B800000000 FreeRIP3.exe`
 
-You may set wildcards in hexsource, hexreplace and hex strings. Just use
-an "??" if you want to match any hex value in some part of your strings.
-Wildcards inside hexreplace string just represents original file data.
+You may set wildcards in hexsource, hexreplace and hex strings. Just use
+an "??" if you want to match any hex value in some part of your strings.
+Wildcards inside hexreplace string just represents original file data.
diff --git a/Other/Source/Contrib/bin/regtlib.exe b/etc/source/Contrib/bin/regtlib.exe
similarity index 100%
rename from Other/Source/Contrib/bin/regtlib.exe
rename to etc/source/Contrib/bin/regtlib.exe
diff --git a/Other/Source/Contrib/bin/regtlib64.exe b/etc/source/Contrib/bin/regtlib64.exe
similarity index 100%
rename from Other/Source/Contrib/bin/regtlib64.exe
rename to etc/source/Contrib/bin/regtlib64.exe
diff --git a/Other/Source/Contrib/bin/signtool.exe b/etc/source/Contrib/bin/signtool.exe
similarity index 100%
rename from Other/Source/Contrib/bin/signtool.exe
rename to etc/source/Contrib/bin/signtool.exe
diff --git a/Other/Source/Contrib/bin/signtool64.exe b/etc/source/Contrib/bin/signtool64.exe
similarity index 100%
rename from Other/Source/Contrib/bin/signtool64.exe
rename to etc/source/Contrib/bin/signtool64.exe
diff --git a/Other/Source/Contrib/bin/sqlite3.exe b/etc/source/Contrib/bin/sqlite3.exe
similarity index 100%
rename from Other/Source/Contrib/bin/sqlite3.exe
rename to etc/source/Contrib/bin/sqlite3.exe
diff --git a/Other/Source/Contrib/bin/subinacl.exe b/etc/source/Contrib/bin/subinacl.exe
similarity index 100%
rename from Other/Source/Contrib/bin/subinacl.exe
rename to etc/source/Contrib/bin/subinacl.exe
diff --git a/Other/Source/Contrib/bin/unrar.txt b/etc/source/Contrib/bin/unrar.txt
similarity index 97%
rename from Other/Source/Contrib/bin/unrar.txt
rename to etc/source/Contrib/bin/unrar.txt
index 9aac715..46c0c0f 100644
--- a/Other/Source/Contrib/bin/unrar.txt
+++ b/etc/source/Contrib/bin/unrar.txt
@@ -1,63 +1,63 @@
-
-UNRAR 5.30 beta 2 freeware      Copyright (c) 1993-2015 Alexander Roshal
-
-Usage:     unrar <command> -<switch 1> -<switch N> <archive> <files...>
-               <@listfiles...> <path_to_extract\>
-
-<Commands>
-  e             Extract files without archived paths
-  l[t[a],b]     List archive contents [technical[all], bare]
-  p             Print file to stdout
-  t             Test archive files
-  v[t[a],b]     Verbosely list archive contents [technical[all],bare]
-  x             Extract files with full path
-
-<Switches>
-  -             Stop switches scanning
-  @[+]          Disable [enable] file lists
-  ac            Clear Archive attribute after compression or extraction
-  ad            Append archive name to destination path
-  ag[format]    Generate archive name using the current date
-  ai            Ignore file attributes
-  ap<path>      Set path inside archive
-  c-            Disable comments show
-  cfg-          Disable read configuration
-  cl            Convert names to lower case
-  cu            Convert names to upper case
-  dh            Open shared files
-  ep            Exclude paths from names
-  ep3           Expand paths to full including the drive letter
-  f             Freshen files
-  id[c,d,p,q]   Disable messages
-  ierr          Send all messages to stderr
-  inul          Disable all messages
-  ioff          Turn PC off after completing an operation
-  kb            Keep broken extracted files
-  n<file>       Additionally filter included files
-  n@            Read additional filter masks from stdin
-  n@<list>      Read additional filter masks from list file
-  o[+|-]        Set the overwrite mode
-  oc            Set NTFS Compressed attribute
-  ol[a]         Process symbolic links as the link [absolute paths]
-  or            Rename files automatically
-  ow            Save or restore file owner and group
-  p[password]   Set password
-  p-            Do not query password
-  r             Recurse subdirectories
-  ri<P>[:<S>]   Set priority (0-default,1-min..15-max) and sleep time in ms
-  sc<chr>[obj]  Specify the character set
-  sl<size>      Process files with size less than specified
-  sm<size>      Process files with size more than specified
-  ta<date>      Process files modified after <date> in YYYYMMDDHHMMSS format
-  tb<date>      Process files modified before <date> in YYYYMMDDHHMMSS format
-  tn<time>      Process files newer than <time>
-  to<time>      Process files older than <time>
-  ts<m,c,a>[N]  Save or restore file time (modification, creation, access)
-  u             Update files
-  v             List all volumes
-  ver[n]        File version control
-  vp            Pause before each volume
-  x<file>       Exclude specified file
-  x@            Read file names to exclude from stdin
-  x@<list>      Exclude files listed in specified list file
-  y             Assume Yes on all queries
+
+UNRAR 5.30 beta 2 freeware      Copyright (c) 1993-2015 Alexander Roshal
+
+Usage:     unrar <command> -<switch 1> -<switch N> <archive> <files...>
+               <@listfiles...> <path_to_extract\>
+
+<Commands>
+  e             Extract files without archived paths
+  l[t[a],b]     List archive contents [technical[all], bare]
+  p             Print file to stdout
+  t             Test archive files
+  v[t[a],b]     Verbosely list archive contents [technical[all],bare]
+  x             Extract files with full path
+
+<Switches>
+  -             Stop switches scanning
+  @[+]          Disable [enable] file lists
+  ac            Clear Archive attribute after compression or extraction
+  ad            Append archive name to destination path
+  ag[format]    Generate archive name using the current date
+  ai            Ignore file attributes
+  ap<path>      Set path inside archive
+  c-            Disable comments show
+  cfg-          Disable read configuration
+  cl            Convert names to lower case
+  cu            Convert names to upper case
+  dh            Open shared files
+  ep            Exclude paths from names
+  ep3           Expand paths to full including the drive letter
+  f             Freshen files
+  id[c,d,p,q]   Disable messages
+  ierr          Send all messages to stderr
+  inul          Disable all messages
+  ioff          Turn PC off after completing an operation
+  kb            Keep broken extracted files
+  n<file>       Additionally filter included files
+  n@            Read additional filter masks from stdin
+  n@<list>      Read additional filter masks from list file
+  o[+|-]        Set the overwrite mode
+  oc            Set NTFS Compressed attribute
+  ol[a]         Process symbolic links as the link [absolute paths]
+  or            Rename files automatically
+  ow            Save or restore file owner and group
+  p[password]   Set password
+  p-            Do not query password
+  r             Recurse subdirectories
+  ri<P>[:<S>]   Set priority (0-default,1-min..15-max) and sleep time in ms
+  sc<chr>[obj]  Specify the character set
+  sl<size>      Process files with size less than specified
+  sm<size>      Process files with size more than specified
+  ta<date>      Process files modified after <date> in YYYYMMDDHHMMSS format
+  tb<date>      Process files modified before <date> in YYYYMMDDHHMMSS format
+  tn<time>      Process files newer than <time>
+  to<time>      Process files older than <time>
+  ts<m,c,a>[N]  Save or restore file time (modification, creation, access)
+  u             Update files
+  v             List all volumes
+  ver[n]        File version control
+  vp            Pause before each volume
+  x<file>       Exclude specified file
+  x@            Read file names to exclude from stdin
+  x@<list>      Exclude files listed in specified list file
+  y             Assume Yes on all queries
diff --git a/Other/Source/Contrib/bin/upx.exe b/etc/source/Contrib/bin/upx.exe
similarity index 100%
rename from Other/Source/Contrib/bin/upx.exe
rename to etc/source/Contrib/bin/upx.exe
diff --git a/Other/Source/Contrib/bin/wget.exe b/etc/source/Contrib/bin/wget.exe
similarity index 100%
rename from Other/Source/Contrib/bin/wget.exe
rename to etc/source/Contrib/bin/wget.exe
diff --git a/Other/Source/Contrib/bin/wget.nsh b/etc/source/Contrib/bin/wget.nsh
similarity index 97%
rename from Other/Source/Contrib/bin/wget.nsh
rename to etc/source/Contrib/bin/wget.nsh
index 27f1fae..ce57ade 100644
--- a/Other/Source/Contrib/bin/wget.nsh
+++ b/etc/source/Contrib/bin/wget.nsh
@@ -1,130 +1,130 @@
-# Some sites will block wget.
-; the code below will trick website it's a Browser by using referrers & user agent.
-http://www.gnu.org/software/wget/manual/wget.html#Download-Options
-
-SetOutPath `$PLUGINSDIR\Downloaded`
-File `${NSISDIR}\..\7zip\wget.exe`
-WGET:
-ExecDos::Exec /TOSTACK /TIMEOUT=20000 `"$PLUGINSDIR\Downloaded\wget.exe" --referer="http://www.google.com" --user-agent="Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.6) Gecko/20070725 Firefox/2.0.0.6" -T 10 ${WGET}`
-Pop $0
-Pop $1
-${If} $0 = 1
-	StrCmp $2 1 +3
-	StrCpy $2 1
-	Goto WGET
-	MessageBox MB_OK|MB_ICONEXCLAMATION `$(downloadfailed)`
-	Goto OfflineInstallOnly
-${EndIf}
-
-# Sometimes.. sites will require SSL, or certificate... at which time.. add: --no-check-certificate
-ExecDos::Exec /TOSTACK /TIMEOUT=20000 `"$PLUGINSDIR\wget.exe" --referer="http://www.google.com" --user-agent="Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.6) Gecko/20070725 Firefox/2.0.0.6" -T 10 --no-check-certificate "http://mpc-hc.org/downloads/"`
-Pop $0
-Pop $1
-
-# NORMAL CONDITIONS
-SetOutPath `$PLUGINSDIR\Downloaded`
-File `${NSISDIR}\..\7zip\wget.exe`
-WGET:
-SetOutPath `$PLUGINSDIR\Downloaded`
-ExecDos::Exec /TOSTACK /TIMEOUT=20000 `"$PLUGINSDIR\Downloaded\wget.exe" --html-extension -S -t 2 -T 10 "${WGET}"`
-Pop $0
-Pop $1
-${If} $0 = 1
-	StrCmp $2 1 +3
-	StrCpy $2 1
-	Goto WGET
-	MessageBox MB_OK|MB_ICONEXCLAMATION `$(downloadfailed)`
-	Goto OfflineInstallOnly
-${EndIf}
-
-
-
-
-
-
-1. Download a single file from the Internet
-wget http://example.com/file.iso
-
-2. Download a file but save it locally under a different name
-wget --output-document=filename.html example.com
-
-3. Download a file and save it in a specific folder
-wget --directory-prefix=folder/subfolder example.com
-
-4. Resume an interrupted download previously started by wget itself
-wget --continue example.com/big.file.iso
-
-5. Download a file but only if the version on server is newer than your local copy
-wget --continue --timestamping wordpress.org/latest.zip
-
-6. Download multiple URLs with wget. Put the list of URLs in another text file on separate lines and pass it to wget.
-wget --input list-of-file-urls.txt
-
-7. Download a list of sequentially numbered files from a server
-wget http://example.com/images/{1..20}.jpg
-
-8. Download a web page with all assets � like stylesheets and inline images � that are required to properly display the web page offline.
-wget --page-requisites --span-hosts --convert-links --adjust-extension http://example.com/dir/file
-
-Mirror websites with Wget
-
-9. Download an entire website including all the linked pages and files
-wget --execute robots=off --recursive --no-parent --continue --no-clobber http://example.com/
-
-10. Download all the MP3 files from a sub directory
-wget --level=1 --recursive --no-parent --accept mp3,MP3 http://example.com/mp3/
-
-11. Download all images from a website in a common folder
-wget --directory-prefix=files/pictures --no-directories --recursive --no-clobber --accept jpg,gif,png,jpeg http://example.com/images/
-
-12. Download the PDF documents from a website through recursion but stay within specific domains.
-wget --mirror --domains=abc.com,files.abc.com,docs.abc.com --accept=pdf http://abc.com/
-
-13. Download all files from a website but exclude a few directories.
-wget --recursive --no-clobber --no-parent --exclude-directories /forums,/support http://example.com
-
-Wget for Downloading Restricted Content
-
-Wget can be used for downloading content from sites that are behind a login screen or ones that check for the HTTP referer and the User Agent strings of the bot to prevent screen scraping.
-
-14. Download files from websites that check the User Agent and the HTTP Referer
-wget --refer=http://google.com --user-agent=�Mozilla/5.0 Firefox/4.0.1? http://nytimes.com
-
-15. Download files from a password protected sites
-wget --http-user=labnol --http-password=hello123 http://example.com/secret/file.zip
-
-16. Fetch pages that are behind a login page. You need to replace user and password with the actual form fields while the URL should point to the Form Submit (action) page.
-wget --cookies=on --save-cookies cookies.txt --keep-session-cookies --post-data �user=labnol&password=123' http://example.com/login.php
-wget --cookies=on --load-cookies cookies.txt --keep-session-cookies http://example.com/paywall
-
-Retrieve File Details with wget
-
-17. Find the size of a file without downloading it (look for Content Length in the response, the size is in bytes)
-wget --spider --server-response http://example.com/file.iso
-
-18. Download a file and display the content on screen without saving it locally.
-wget --output-document � --quiet google.com/humans.txt
-
-wget
-19. Know the last modified date of a web page (check the Last Modified tag in the HTTP header).
-wget --server-response --spider http://www.labnol.org/
-
-20. Check the links on your website to ensure that they are working. The spider option will not save the pages locally.
-wget --output-file=logfile.txt --recursive --spider http://example.com
-
-Also see: Essential Linux Commands
-
-Wget � How to be nice to the server?
-
-The wget tool is essentially a spider that scrapes / leeches web pages but some web hosts may block these spiders with the robots.txt files. Also, wget will not follow links on web pages that use the rel=nofollow attribute.
-
-You can however force wget to ignore the robots.txt and the nofollow directives by adding the switch --execute robots=off to all your wget commands. If a web host is blocking wget requests by looking at the User Agent string, you can always fake that with the --user-agent=Mozilla switch.
-
-The wget command will put additional strain on the site�s server because it will continuously traverse the links and download files. A good scraper would therefore limit the retrieval rate and also include a wait period between consecutive fetch requests to reduce the server load.
-
-wget --limit-rate=20k --wait=60 --random-wait --mirror example.com
-
-In the above example, we have limited the download bandwidth rate to 20 KB/s and the wget utility will wait anywhere between 30s and 90 seconds before retrieving the next resource.
-
-Finally, a little quiz. What do you think this wget command will do?
+# Some sites will block wget.
+; the code below will trick website it's a Browser by using referrers & user agent.
+http://www.gnu.org/software/wget/manual/wget.html#Download-Options
+
+SetOutPath `$PLUGINSDIR\Downloaded`
+File `${NSISDIR}\..\7zip\wget.exe`
+WGET:
+ExecDos::Exec /TOSTACK /TIMEOUT=20000 `"$PLUGINSDIR\Downloaded\wget.exe" --referer="http://www.google.com" --user-agent="Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.6) Gecko/20070725 Firefox/2.0.0.6" -T 10 ${WGET}`
+Pop $0
+Pop $1
+${If} $0 = 1
+	StrCmp $2 1 +3
+	StrCpy $2 1
+	Goto WGET
+	MessageBox MB_OK|MB_ICONEXCLAMATION `$(downloadfailed)`
+	Goto OfflineInstallOnly
+${EndIf}
+
+# Sometimes.. sites will require SSL, or certificate... at which time.. add: --no-check-certificate
+ExecDos::Exec /TOSTACK /TIMEOUT=20000 `"$PLUGINSDIR\wget.exe" --referer="http://www.google.com" --user-agent="Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.6) Gecko/20070725 Firefox/2.0.0.6" -T 10 --no-check-certificate "http://mpc-hc.org/downloads/"`
+Pop $0
+Pop $1
+
+# NORMAL CONDITIONS
+SetOutPath `$PLUGINSDIR\Downloaded`
+File `${NSISDIR}\..\7zip\wget.exe`
+WGET:
+SetOutPath `$PLUGINSDIR\Downloaded`
+ExecDos::Exec /TOSTACK /TIMEOUT=20000 `"$PLUGINSDIR\Downloaded\wget.exe" --html-extension -S -t 2 -T 10 "${WGET}"`
+Pop $0
+Pop $1
+${If} $0 = 1
+	StrCmp $2 1 +3
+	StrCpy $2 1
+	Goto WGET
+	MessageBox MB_OK|MB_ICONEXCLAMATION `$(downloadfailed)`
+	Goto OfflineInstallOnly
+${EndIf}
+
+
+
+
+
+
+1. Download a single file from the Internet
+wget http://example.com/file.iso
+
+2. Download a file but save it locally under a different name
+wget --output-document=filename.html example.com
+
+3. Download a file and save it in a specific folder
+wget --directory-prefix=folder/subfolder example.com
+
+4. Resume an interrupted download previously started by wget itself
+wget --continue example.com/big.file.iso
+
+5. Download a file but only if the version on server is newer than your local copy
+wget --continue --timestamping wordpress.org/latest.zip
+
+6. Download multiple URLs with wget. Put the list of URLs in another text file on separate lines and pass it to wget.
+wget --input list-of-file-urls.txt
+
+7. Download a list of sequentially numbered files from a server
+wget http://example.com/images/{1..20}.jpg
+
+8. Download a web page with all assets � like stylesheets and inline images � that are required to properly display the web page offline.
+wget --page-requisites --span-hosts --convert-links --adjust-extension http://example.com/dir/file
+
+Mirror websites with Wget
+
+9. Download an entire website including all the linked pages and files
+wget --execute robots=off --recursive --no-parent --continue --no-clobber http://example.com/
+
+10. Download all the MP3 files from a sub directory
+wget --level=1 --recursive --no-parent --accept mp3,MP3 http://example.com/mp3/
+
+11. Download all images from a website in a common folder
+wget --directory-prefix=files/pictures --no-directories --recursive --no-clobber --accept jpg,gif,png,jpeg http://example.com/images/
+
+12. Download the PDF documents from a website through recursion but stay within specific domains.
+wget --mirror --domains=abc.com,files.abc.com,docs.abc.com --accept=pdf http://abc.com/
+
+13. Download all files from a website but exclude a few directories.
+wget --recursive --no-clobber --no-parent --exclude-directories /forums,/support http://example.com
+
+Wget for Downloading Restricted Content
+
+Wget can be used for downloading content from sites that are behind a login screen or ones that check for the HTTP referer and the User Agent strings of the bot to prevent screen scraping.
+
+14. Download files from websites that check the User Agent and the HTTP Referer
+wget --refer=http://google.com --user-agent=�Mozilla/5.0 Firefox/4.0.1? http://nytimes.com
+
+15. Download files from a password protected sites
+wget --http-user=labnol --http-password=hello123 http://example.com/secret/file.zip
+
+16. Fetch pages that are behind a login page. You need to replace user and password with the actual form fields while the URL should point to the Form Submit (action) page.
+wget --cookies=on --save-cookies cookies.txt --keep-session-cookies --post-data �user=labnol&password=123' http://example.com/login.php
+wget --cookies=on --load-cookies cookies.txt --keep-session-cookies http://example.com/paywall
+
+Retrieve File Details with wget
+
+17. Find the size of a file without downloading it (look for Content Length in the response, the size is in bytes)
+wget --spider --server-response http://example.com/file.iso
+
+18. Download a file and display the content on screen without saving it locally.
+wget --output-document � --quiet google.com/humans.txt
+
+wget
+19. Know the last modified date of a web page (check the Last Modified tag in the HTTP header).
+wget --server-response --spider http://www.labnol.org/
+
+20. Check the links on your website to ensure that they are working. The spider option will not save the pages locally.
+wget --output-file=logfile.txt --recursive --spider http://example.com
+
+Also see: Essential Linux Commands
+
+Wget � How to be nice to the server?
+
+The wget tool is essentially a spider that scrapes / leeches web pages but some web hosts may block these spiders with the robots.txt files. Also, wget will not follow links on web pages that use the rel=nofollow attribute.
+
+You can however force wget to ignore the robots.txt and the nofollow directives by adding the switch --execute robots=off to all your wget commands. If a web host is blocking wget requests by looking at the User Agent string, you can always fake that with the --user-agent=Mozilla switch.
+
+The wget command will put additional strain on the site�s server because it will continuously traverse the links and download files. A good scraper would therefore limit the retrieval rate and also include a wait period between consecutive fetch requests to reduce the server load.
+
+wget --limit-rate=20k --wait=60 --random-wait --mirror example.com
+
+In the above example, we have limited the download bandwidth rate to 20 KB/s and the wget utility will wait anywhere between 30s and 90 seconds before retrieving the next resource.
+
+Finally, a little quiz. What do you think this wget command will do?
 wget --span-hosts --level=inf --recursive dmoz.org
\ No newline at end of file
diff --git a/Other/Source/Contrib/certificates/demon.devin.p12 b/etc/source/Contrib/certificates/daemon.devin.p12
similarity index 100%
rename from Other/Source/Contrib/certificates/demon.devin.p12
rename to etc/source/Contrib/certificates/daemon.devin.p12
diff --git a/Other/Source/Contrib/manifests/NSIS_3.01_Win8_Admin.manifest b/etc/source/Contrib/manifests/NSIS_3.01_Win8_Admin.manifest
similarity index 97%
rename from Other/Source/Contrib/manifests/NSIS_3.01_Win8_Admin.manifest
rename to etc/source/Contrib/manifests/NSIS_3.01_Win8_Admin.manifest
index 4d65caa..5ef233a 100644
--- a/Other/Source/Contrib/manifests/NSIS_3.01_Win8_Admin.manifest
+++ b/etc/source/Contrib/manifests/NSIS_3.01_Win8_Admin.manifest
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-	<assemblyIdentity version="1.0.0.0" processorArchitecture="X86" name="Nullsoft.NSIS.exehead" type="win32"/>
-	<description>Nullsoft Install System v3.01</description>
-	<dependency>
-		<dependentAssembly>
-			<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="X86" publicKeyToken="6595b64144ccf1df" language="*" />
-		</dependentAssembly>
-	</dependency>
-	<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-		<security>
-			<requestedPrivileges>
-				<requestedExecutionLevel level="requireAdministrator" uiAccess="false"/>
-			</requestedPrivileges>
-		</security>
-	</trustInfo>
-	<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-		<application>
-			<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
-			<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
-			<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
-			<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
-			<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
-		</application>
-	</compatibility>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+	<assemblyIdentity version="1.0.0.0" processorArchitecture="X86" name="Nullsoft.NSIS.exehead" type="win32"/>
+	<description>Nullsoft Install System v3.01</description>
+	<dependency>
+		<dependentAssembly>
+			<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="X86" publicKeyToken="6595b64144ccf1df" language="*" />
+		</dependentAssembly>
+	</dependency>
+	<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+		<security>
+			<requestedPrivileges>
+				<requestedExecutionLevel level="requireAdministrator" uiAccess="false"/>
+			</requestedPrivileges>
+		</security>
+	</trustInfo>
+	<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+		<application>
+			<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+			<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+			<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+			<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+			<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+		</application>
+	</compatibility>
 </assembly>
\ No newline at end of file
diff --git a/Other/Source/Contrib/manifests/NSIS_3.01_Win8_Highest.manifest b/etc/source/Contrib/manifests/NSIS_3.01_Win8_Highest.manifest
similarity index 97%
rename from Other/Source/Contrib/manifests/NSIS_3.01_Win8_Highest.manifest
rename to etc/source/Contrib/manifests/NSIS_3.01_Win8_Highest.manifest
index 2f4b5fd..ee62227 100644
--- a/Other/Source/Contrib/manifests/NSIS_3.01_Win8_Highest.manifest
+++ b/etc/source/Contrib/manifests/NSIS_3.01_Win8_Highest.manifest
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-	<assemblyIdentity version="1.0.0.0" processorArchitecture="X86" name="Nullsoft.NSIS.exehead" type="win32"/>
-	<description>Nullsoft Install System v3.01</description>
-	<dependency>
-		<dependentAssembly>
-			<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="X86" publicKeyToken="6595b64144ccf1df" language="*" />
-		</dependentAssembly>
-	</dependency>
-	<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-		<security>
-			<requestedPrivileges>
-				<requestedExecutionLevel level="highestAvailable" uiAccess="false"/>
-			</requestedPrivileges>
-		</security>
-	</trustInfo>
-	<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-		<application>
-			<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
-			<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
-			<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
-			<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
-			<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
-		</application>
-	</compatibility>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+	<assemblyIdentity version="1.0.0.0" processorArchitecture="X86" name="Nullsoft.NSIS.exehead" type="win32"/>
+	<description>Nullsoft Install System v3.01</description>
+	<dependency>
+		<dependentAssembly>
+			<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="X86" publicKeyToken="6595b64144ccf1df" language="*" />
+		</dependentAssembly>
+	</dependency>
+	<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+		<security>
+			<requestedPrivileges>
+				<requestedExecutionLevel level="highestAvailable" uiAccess="false"/>
+			</requestedPrivileges>
+		</security>
+	</trustInfo>
+	<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+		<application>
+			<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+			<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+			<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+			<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+			<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+		</application>
+	</compatibility>
 </assembly>
\ No newline at end of file
diff --git a/Other/Source/Contrib/manifests/NSIS_3.01_Win8_User.manifest b/etc/source/Contrib/manifests/NSIS_3.01_Win8_User.manifest
similarity index 97%
rename from Other/Source/Contrib/manifests/NSIS_3.01_Win8_User.manifest
rename to etc/source/Contrib/manifests/NSIS_3.01_Win8_User.manifest
index fcab0eb..f737e7e 100644
--- a/Other/Source/Contrib/manifests/NSIS_3.01_Win8_User.manifest
+++ b/etc/source/Contrib/manifests/NSIS_3.01_Win8_User.manifest
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-	<assemblyIdentity version="1.0.0.0" processorArchitecture="X86" name="Nullsoft.NSIS.exehead" type="win32"/>
-	<description>Nullsoft Install System v3.01</description>
-	<dependency>
-		<dependentAssembly>
-			<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="X86" publicKeyToken="6595b64144ccf1df" language="*" />
-		</dependentAssembly>
-	</dependency>
-	<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-		<security>
-			<requestedPrivileges>
-				<requestedExecutionLevel level="asInvoker" uiAccess="false"/>
-			</requestedPrivileges>
-		</security>
-	</trustInfo>
-	<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-		<application>
-			<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
-			<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
-			<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
-			<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
-			<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
-		</application>
-	</compatibility>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+	<assemblyIdentity version="1.0.0.0" processorArchitecture="X86" name="Nullsoft.NSIS.exehead" type="win32"/>
+	<description>Nullsoft Install System v3.01</description>
+	<dependency>
+		<dependentAssembly>
+			<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="X86" publicKeyToken="6595b64144ccf1df" language="*" />
+		</dependentAssembly>
+	</dependency>
+	<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+		<security>
+			<requestedPrivileges>
+				<requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+			</requestedPrivileges>
+		</security>
+	</trustInfo>
+	<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+		<application>
+			<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+			<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+			<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+			<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+			<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+		</application>
+	</compatibility>
 </assembly>
\ No newline at end of file
diff --git a/etc/source/Debug.nsh b/etc/source/Debug.nsh
new file mode 100644
index 0000000..4b2bf0e
--- /dev/null
+++ b/etc/source/Debug.nsh
@@ -0,0 +1,121 @@
+;=#
+; 
+; PORTABLEAPPS COMPILER 
+; Developed by daemon.devin
+;
+; For support visit the GitHub project:
+; https://github.com/demondevin/pac-man
+; 
+; SEGMENT
+;   Debug.nsh
+;   This file handles the features for debugging the wrapper executable during runtime. 
+; 
+; USAGE
+;   If you want debugging support, create the file ExtendedDebug.nsh in the package's
+;   AppInfo directory. It should then have something like the following:
+;
+;   !define DEBUG_ALL
+;     • To enable debugging of everything.
+;       » This leaves out the "about to execute segment" and "finished executing segment" messages.
+;
+;   !define DEBUG_SEGWRAP
+;     • To enable messages announcing when a segment is about to start/finish.
+;
+;   !define DEBUG_OUTPUT [file|messagebox]
+;     • By default debugging will output it's data to a file called debug.log in the bin\Settings folder. 
+;       It will also show a message box which pauses execution and allows you to terminate execution.
+;       » If you want it to only log to a file, set this to 'file'.
+;         · For example: !define DEBUG_OUTPUT file
+;       » If you want to only show the message boxes, set this to 'messagebox'.
+;         · For example: !define DEBUG_OUTPUT messagebox
+;
+;   !define DEBUG_GLOBAL
+;     • Debug outside all segments.
+;
+;   !define DEBUG_SEGMENT_[SegmentName]
+;     • Debug a given segment or segments
+;       » To debug the PrePrimary segment use 'PrePrimary'
+;         · For example: !define DEBUG_SEGMENT_PrePrimary
+;       » To debug the PostExecPrimary segment use 'PostExecPrimary'
+;         · For example: !define DEBUG_SEGMENT_PostExecPrimary
+; 
+; ATTENTION
+;   Remember to remove the debug file when you're ready to release a package. 
+;   You do not want the debugging features enabled for production use.
+; 
+
+; Macro: check if in debug mode for the current section {{{1
+!macro !getdebug
+	!ifdef DEBUG
+		!undef DEBUG
+	!endif
+	!ifdef DEBUG_ALL
+		!define DEBUG
+	!else
+		!ifdef Segment
+			!ifdef DEBUG_SEGMENT_${Segment}
+				!define DEBUG
+			!endif
+		!else ifdef DEBUG_GLOBAL
+			!define DEBUG
+		!endif
+	!endif
+!macroend
+!define !getdebug "!insertmacro !getdebug"
+
+; Macro: print a debug message {{{1
+!macro DebugMsg _MSG
+	${!getdebug}
+	!ifdef DEBUG
+
+		; Logging to file {{{2
+		!ifndef DEBUG_OUTPUT
+			!define _DebugMsg_OK
+		!else if ${DEBUG_OUTPUT} == file
+			!define _DebugMsg_OK
+		!endif
+		!ifdef _DebugMsg_OK
+			!ifdef Segment
+				!define _DebugMsg_Seg "${Segment}/${__FUNCTION__}"
+			!else
+				!define _DebugMsg_Seg "Global"
+			!endif
+			!ifndef _DebugMsg_FileOpened
+				Var /GLOBAL _DebugMsg_File
+				FileOpen $_DebugMsg_File $EXEDIR\bin\Settings\debug.log w
+				FileWrite $_DebugMsg_File "PortableApps Compiler ${Version} debug messages for ${NamePortable} (${AppID})$\r$\n"
+				; TODO: hg revision number from .hg/branch, branchheads.cache
+				; My ${!ifexist} doesn't work in Wine, not sure if I can fix it
+				!define _DebugMsg_FileOpened
+			!else
+				FileOpen  $_DebugMsg_File $EXEDIR\bin\Settings\debug.log a
+				FileSeek  $_DebugMsg_File 0 END
+			!endif
+			FileWrite $_DebugMsg_File "${_DebugMsg_Seg} (line ${__LINE__}): ${_MSG}$\r$\n$\r$\n"
+			FileClose $_DebugMsg_File
+			!undef _DebugMsg_Seg
+			!undef _DebugMsg_OK
+		!endif ;}}}
+
+		; Logging to display: message box {{{2
+		!ifndef DEBUG_OUTPUT
+			!define _DebugMsg_OK
+		!else if ${DEBUG_OUTPUT} == messagebox
+			!define _DebugMsg_OK
+		!endif
+		!ifdef _DebugMsg_OK
+			!ifdef Segment
+				!define _DebugMsg_Seg "$\r$\n$\r$\nSegment: ${Segment}$\r$\nHook: ${__FUNCTION__}"
+			!else
+				!define _DebugMsg_Seg ""
+			!endif
+			MessageBox MB_OKCANCEL|MB_ICONINFORMATION "Debug message at line ${__LINE__}${_DebugMsg_Seg}$\r$\n____________________$\r$\n$\r$\n${_MSG}" IDOK +2
+				Abort
+			!undef _DebugMsg_Seg
+			!undef _DebugMsg_OK
+		!endif ;}}}
+	!endif
+!macroend
+!define DebugMsg "!insertmacro DebugMsg" ; }}}
+
+!include /NONFATAL "${PACKAGE}\app\AppInfo\ExtendedDebug.nsh"
diff --git a/Other/Source/DotNetVer.nsh b/etc/source/DotNetVer.nsh
similarity index 96%
rename from Other/Source/DotNetVer.nsh
rename to etc/source/DotNetVer.nsh
index 2573556..6345171 100644
--- a/Other/Source/DotNetVer.nsh
+++ b/etc/source/DotNetVer.nsh
@@ -1,292 +1,292 @@
-; ---------------------
-;      DotNetVer.nsh
-;      Written by: David Grinberg
-;      Homepage: http://ontheperiphery.veraida.com/
-;      Updated By: Brandon Hansen (http://www.remotehams.com/)
-; ---------------------
-;
-; LogicLib extensions for checking Microsoft .NET Framework versions and service packs.
-;
-; Latests Updates by Brandon Hansen, KG6YPI (RemoteHams.com)
-; Dec 26, 2011 - .NET Framework 4.0 detection fixes - client profile not being found
-; Dec 07, 2010 - .NET Framework 4.0 detection added by Brandon Hansen (KG6YPI)
-;
-; Usage examples:
-;
-; ${If} ${HasDotNet4.0}
-;    DetailPrint "Microsoft .NET Framework 4.0 installed."
-;    ${If} ${DOTNETVER_4_0} AtLeastDotNetServicePack 1
-;        DetailPrint "Microsoft .NET Framework 4.0 is at least SP1."
-;    ${Else}
-;        DetailPrint "Microsoft .NET Framework 4.0 SP1 not installed."
-;    ${EndIf}
-;    ${If} ${DOTNETVER_4_0} HasDotNetClientProfile 1
-;        DetailPrint "Microsoft .NET Framework 4.0 (Client Profile) available."
-;    ${EndIf}
-;    ${If} ${DOTNETVER_4_0} HasDotNetFullProfile 1
-;        DetailPrint "Microsoft .NET Framework 4.0 (Full Profile) available."
-;    ${EndIf}
-;    ${If} ${DOTNETVER_4_0} HasDotNetFullProfile 0
-;        DetailPrint "Microsoft .NET Framework 4.0 (Full Profile) not available."
-;    ${EndIf}
-; ${EndIf}
- 
- 
-!verbose push
-!verbose 3
- 
-!ifndef ___DOTNETVER__NSH___
-!define ___DOTNETVER__NSH___
- 
-!include LogicLib.nsh
-!include Util.nsh
- 
-# constants
- 
-!define DOTNETVER_1_0  "1.0"
-!define DOTNETVER_1_1  "1.1"
-!define DOTNETVER_2_0  "2.0"
-!define DOTNETVER_3_0  "3.0"
-!define DOTNETVER_3_5  "3.5"
-!define DOTNETVER_4_0  "4.0"
- 
-# variable declaration
- 
-Var /GLOBAL __DONTNET_FOUNDVER
- 
-!macro __DotNetVer_DeclareVars
-    !ifndef __DOTNETVER_VARS_DECLARED
-        !define __DOTNETVER_VARS_DECLARED
-        Var /GLOBAL __DOTNET_1.0
-        Var /GLOBAL __DOTNET_1.1
-        Var /GLOBAL __DOTNET_2.0
-        Var /GLOBAL __DOTNET_3.0
-        Var /GLOBAL __DOTNET_3.5
-        Var /GLOBAL __DOTNET_4.0
- 
-        Var /GLOBAL __DOTNETVER_1.0_SP
-        Var /GLOBAL __DOTNETVER_1.1_SP
-        Var /GLOBAL __DOTNETVER_2.0_SP
-        Var /GLOBAL __DOTNETVER_3.0_SP
-        Var /GLOBAL __DOTNETVER_3.5_SP
-        Var /GLOBAL __DOTNETVER_4.0_SP
- 
-        Var /GLOBAL __DOTNET_1.0_CLIENT
-        Var /GLOBAL __DOTNET_1.1_CLIENT
-        Var /GLOBAL __DOTNET_2.0_CLIENT
-        Var /GLOBAL __DOTNET_3.0_CLIENT
-        Var /GLOBAL __DOTNET_3.5_CLIENT
-        Var /GLOBAL __DOTNET_4.0_CLIENT
- 
-        Var /GLOBAL __DOTNET_1.0_FULL
-        Var /GLOBAL __DOTNET_1.1_FULL
-        Var /GLOBAL __DOTNET_2.0_FULL
-        Var /GLOBAL __DOTNET_3.0_FULL
-        Var /GLOBAL __DOTNET_3.5_FULL
-        Var /GLOBAL __DOTNET_4.0_FULL
- 
-        StrCpy $__DOTNET_1.0 0
-        StrCpy $__DOTNET_1.1 0
-        StrCpy $__DOTNET_2.0 0
-        StrCpy $__DOTNET_3.0 0
-        StrCpy $__DOTNET_3.5 0
-        StrCpy $__DOTNET_4.0 0
- 
-        StrCpy $__DOTNETVER_1.0_SP 0
-        StrCpy $__DOTNETVER_1.1_SP 0
-        StrCpy $__DOTNETVER_2.0_SP 0
-        StrCpy $__DOTNETVER_3.0_SP 0
-        StrCpy $__DOTNETVER_3.5_SP 0
-        StrCpy $__DOTNETVER_4.0_SP 0
- 
-        StrCpy $__DOTNET_1.0_CLIENT 0
-        StrCpy $__DOTNET_1.1_CLIENT 0
-        StrCpy $__DOTNET_2.0_CLIENT 0
-        StrCpy $__DOTNET_3.0_CLIENT 0
-        StrCpy $__DOTNET_3.5_CLIENT 0
-        StrCpy $__DOTNET_4.0_CLIENT 0
- 
-        StrCpy $__DOTNET_1.0_FULL 0
-        StrCpy $__DOTNET_1.1_FULL 0
-        StrCpy $__DOTNET_2.0_FULL 0
-        StrCpy $__DOTNET_3.0_FULL 0
-        StrCpy $__DOTNET_3.5_FULL 0
-        StrCpy $__DOTNET_4.0_FULL 0
- 
-  !endif
-!macroend
- 
- 
-# lazy initialization macro
- 
-!macro __DotNetVer_InitVars
-    # only calculate version once
-    StrCmp $__DONTNET_FOUNDVER "" dotnetver.noveryet
-        Return
- 
-    dotnetver.noveryet:
-    !insertmacro __DotNetVer_DeclareVars
- 
-    Push $0    ;registry count
-    Push $1    ;registry key
-    Push $2    ;version number
-    Push $3    ;installed
-    Push $4    ;service pack number
-    Push $8    ;strLen helper var
- 
-    StrCpy $0 0
- 
-    dotnetver.startenum:
- 
-    EnumRegKey $1 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP" $0
-    StrCmp $1 "" dotnetver.done
- 
-    IntOp $0 $0 + 1
- 
-    StrCpy $2 $1 1 0
-    StrCmp $2 "v" +1 dotnetver.startenum
-    StrCpy $2 $1 3 1
- 
-    ; Check for .NET 1.0 to 3.5
-    ReadRegDWORD $3 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\$1" "Install"
-    ReadRegDWORD $4 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\$1" "SP"
-    ; This is a sanity check that works on .NET 1.0 to 3.5
-    ; if it fails check for dotnet 4
-    IntCmp $3 0 dotnetcheck.40
-    StrCmp $2 ${DOTNETVER_1_0} dotnetver.10
-    StrCmp $2 ${DOTNETVER_1_1} dotnetver.11
-    StrCmp $2 ${DOTNETVER_2_0} dotnetver.20
-    StrCmp $2 ${DOTNETVER_3_0} dotnetver.30
-    StrCmp $2 ${DOTNETVER_3_5} dotnetver.35
-    dotnetcheck.40:
-    StrCmp $2 ${DOTNETVER_4_0} dotnetver.40
-    StrCmp $2 "4" dotnetver.40
- 
-    Goto dotnetver.startenum
- 
-    dotnetver.10:
-        StrCpy $__DOTNET_1.0 1
-        StrCpy $__DOTNETVER_1.0_SP $4
-        StrCpy $__DOTNET_1.0_FULL 1
-        Goto dotnetver.startenum
-    dotnetver.11:
-        StrCpy $__DOTNET_1.1 1
-        StrCpy $__DOTNETVER_1.1_SP $4
-        StrCpy $__DOTNET_1.1_FULL 1
-        Goto dotnetver.startenum
-    dotnetver.20:
-        StrCpy $__DOTNET_2.0 1
-        StrCpy $__DOTNETVER_2.0_SP $4
-        StrCpy $__DOTNET_2.0_FULL 1
-        Goto dotnetver.startenum
-    dotnetver.30:
-        StrCpy $__DOTNET_3.0 1
-        StrCpy $__DOTNETVER_3.0_SP $4
-        StrCpy $__DOTNET_3.0_FULL 1
-        Goto dotnetver.startenum
-    dotnetver.35:
-        StrCpy $__DOTNET_3.5 1
-        StrCpy $__DOTNETVER_3.5_SP $4
-        StrCpy $__DOTNET_3.5_FULL 1
-        Goto dotnetver.startenum
-    dotnetver.40:
-        ; Check for .NET 4.0 (Full Profile)
-        ReadRegDWORD $3 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full" "Install"
-        ReadRegDWORD $4 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full" "SP"
-	StrLen $8 $3
-        IntCmp $8 0 dotnetcheck.40c
-        IntCmp $3 0 dotnetcheck.40c
-        StrCmp $2 ${DOTNETVER_4_0} dotnetver.40_Full
-        StrCmp $2 "4" dotnetver.40_Full
-        dotnetcheck.40c:
-        ; Check for .NET 4.0 (Client Profile)
-        ReadRegDWORD $3 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Client" "Install"
-        ReadRegDWORD $4 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Client" "SP"
-	StrLen $8 $3
-        IntCmp $8 0 dotnetver.startenum
-        IntCmp $3 0 dotnetver.startenum
-        StrCmp $2 ${DOTNETVER_4_0} dotnetver.40_Client
-        StrCmp $2 "4" dotnetver.40_Client
-        Goto dotnetver.startenum
-    dotnetver.40_Full:
-        StrCpy $__DOTNET_4.0 1
-        StrCpy $__DOTNETVER_4.0_SP $4
-        StrCpy $__DOTNET_4.0_FULL 1
-        Goto dotnetcheck.40c ; continue looking for other profiles
-    dotnetver.40_Client:
-        StrCpy $__DOTNET_4.0 1
-        StrCpy $__DOTNETVER_4.0_SP $4
-        StrCpy $__DOTNET_4.0_CLIENT 1
-        Goto dotnetver.startenum
- 
-    dotnetver.done:
- 
-    StrCpy $__DONTNET_FOUNDVER "1"
- 
-    Pop $8
-    Pop $4
-    Pop $3
-    Pop $2
-    Pop $1
-    Pop $0
-!macroend
- 
-!macro _HasDotNet _a _b _t _f
-    ${CallArtificialFunction} __DotNetVer_InitVars
- 
-   !insertmacro _= `$__DOTNET_${_b}` `1` `${_t}` `${_f}`
-!macroend
- 
-!macro __DotNetVer_DefineTest Ver
-  !define HasDotNet${Ver} `"" HasDotNet ${Ver}`
-!macroend
- 
-!insertmacro __DotNetVer_DefineTest ${DOTNETVER_1_0}
-!insertmacro __DotNetVer_DefineTest ${DOTNETVER_1_1}
-!insertmacro __DotNetVer_DefineTest ${DOTNETVER_2_0}
-!insertmacro __DotNetVer_DefineTest ${DOTNETVER_3_0}
-!insertmacro __DotNetVer_DefineTest ${DOTNETVER_3_5}
-!insertmacro __DotNetVer_DefineTest ${DOTNETVER_4_0}
- 
-!macro _AtLeastDotNetServicePack _a _b _t _f
-    ${CallArtificialFunction} __DotNetVer_InitVars
- 
-    !insertmacro _>= `$__DOTNETVER_${_a}_SP` `${_b}` `${_t}` `${_f}`
-!macroend
-!define AtLeastDotNetServicePack `AtLeastDotNetServicePack`
- 
- 
-!macro _AtMostDotNetServicePack _a _b _t _f
-    ${CallArtificialFunction} __DotNetVer_InitVars
- 
-    !insertmacro _<= `$__DOTNETVER_${_a}_SP` `${_b}` `${_t}` `${_f}`
-!macroend
-!define AtMostDotNetServicePack `AtMostDotNetServicePack`
- 
- 
-!macro _IsDotNetServicePack _a _b _t _f
-    ${CallArtificialFunction} __DotNetVer_InitVars
- 
-    !insertmacro _= `$__DOTNETVER_${_a}_SP` `${_b}` `${_t}` `${_f}`
-!macroend
-!define IsDotNetServicePack `IsDotNetServicePack`
- 
-!macro _HasDotNetClientProfile _a _b _t _f
-    ${CallArtificialFunction} __DotNetVer_InitVars
- 
-    !insertmacro _= `$__DOTNET_${_a}_CLIENT` `${_b}` `${_t}` `${_f}`
-!macroend
-!define HasDotNetClientProfile `HasDotNetClientProfile`
- 
-!macro _HasDotNetFullProfile _a _b _t _f
-    ${CallArtificialFunction} __DotNetVer_InitVars
- 
-    !insertmacro _= `$__DOTNET_${_a}_FULL` `${_b}` `${_t}` `${_f}`
-!macroend
-!define HasDotNetFullProfile `HasDotNetFullProfile`
- 
-# done
- 
-!endif # !___DOTNETVER__NSH___
- 
+; ---------------------
+;      DotNetVer.nsh
+;      Written by: David Grinberg
+;      Homepage: http://ontheperiphery.veraida.com/
+;      Updated By: Brandon Hansen (http://www.remotehams.com/)
+; ---------------------
+;
+; LogicLib extensions for checking Microsoft .NET Framework versions and service packs.
+;
+; Latests Updates by Brandon Hansen, KG6YPI (RemoteHams.com)
+; Dec 26, 2011 - .NET Framework 4.0 detection fixes - client profile not being found
+; Dec 07, 2010 - .NET Framework 4.0 detection added by Brandon Hansen (KG6YPI)
+;
+; Usage examples:
+;
+; ${If} ${HasDotNet4.0}
+;    DetailPrint "Microsoft .NET Framework 4.0 installed."
+;    ${If} ${DOTNETVER_4_0} AtLeastDotNetServicePack 1
+;        DetailPrint "Microsoft .NET Framework 4.0 is at least SP1."
+;    ${Else}
+;        DetailPrint "Microsoft .NET Framework 4.0 SP1 not installed."
+;    ${EndIf}
+;    ${If} ${DOTNETVER_4_0} HasDotNetClientProfile 1
+;        DetailPrint "Microsoft .NET Framework 4.0 (Client Profile) available."
+;    ${EndIf}
+;    ${If} ${DOTNETVER_4_0} HasDotNetFullProfile 1
+;        DetailPrint "Microsoft .NET Framework 4.0 (Full Profile) available."
+;    ${EndIf}
+;    ${If} ${DOTNETVER_4_0} HasDotNetFullProfile 0
+;        DetailPrint "Microsoft .NET Framework 4.0 (Full Profile) not available."
+;    ${EndIf}
+; ${EndIf}
+ 
+ 
+!verbose push
+!verbose 3
+ 
+!ifndef ___DOTNETVER__NSH___
+!define ___DOTNETVER__NSH___
+ 
+!include LogicLib.nsh
+!include Util.nsh
+ 
+# constants
+ 
+!define DOTNETVER_1_0  "1.0"
+!define DOTNETVER_1_1  "1.1"
+!define DOTNETVER_2_0  "2.0"
+!define DOTNETVER_3_0  "3.0"
+!define DOTNETVER_3_5  "3.5"
+!define DOTNETVER_4_0  "4.0"
+ 
+# variable declaration
+ 
+Var /GLOBAL __DONTNET_FOUNDVER
+ 
+!macro __DotNetVer_DeclareVars
+    !ifndef __DOTNETVER_VARS_DECLARED
+        !define __DOTNETVER_VARS_DECLARED
+        Var /GLOBAL __DOTNET_1.0
+        Var /GLOBAL __DOTNET_1.1
+        Var /GLOBAL __DOTNET_2.0
+        Var /GLOBAL __DOTNET_3.0
+        Var /GLOBAL __DOTNET_3.5
+        Var /GLOBAL __DOTNET_4.0
+ 
+        Var /GLOBAL __DOTNETVER_1.0_SP
+        Var /GLOBAL __DOTNETVER_1.1_SP
+        Var /GLOBAL __DOTNETVER_2.0_SP
+        Var /GLOBAL __DOTNETVER_3.0_SP
+        Var /GLOBAL __DOTNETVER_3.5_SP
+        Var /GLOBAL __DOTNETVER_4.0_SP
+ 
+        Var /GLOBAL __DOTNET_1.0_CLIENT
+        Var /GLOBAL __DOTNET_1.1_CLIENT
+        Var /GLOBAL __DOTNET_2.0_CLIENT
+        Var /GLOBAL __DOTNET_3.0_CLIENT
+        Var /GLOBAL __DOTNET_3.5_CLIENT
+        Var /GLOBAL __DOTNET_4.0_CLIENT
+ 
+        Var /GLOBAL __DOTNET_1.0_FULL
+        Var /GLOBAL __DOTNET_1.1_FULL
+        Var /GLOBAL __DOTNET_2.0_FULL
+        Var /GLOBAL __DOTNET_3.0_FULL
+        Var /GLOBAL __DOTNET_3.5_FULL
+        Var /GLOBAL __DOTNET_4.0_FULL
+ 
+        StrCpy $__DOTNET_1.0 0
+        StrCpy $__DOTNET_1.1 0
+        StrCpy $__DOTNET_2.0 0
+        StrCpy $__DOTNET_3.0 0
+        StrCpy $__DOTNET_3.5 0
+        StrCpy $__DOTNET_4.0 0
+ 
+        StrCpy $__DOTNETVER_1.0_SP 0
+        StrCpy $__DOTNETVER_1.1_SP 0
+        StrCpy $__DOTNETVER_2.0_SP 0
+        StrCpy $__DOTNETVER_3.0_SP 0
+        StrCpy $__DOTNETVER_3.5_SP 0
+        StrCpy $__DOTNETVER_4.0_SP 0
+ 
+        StrCpy $__DOTNET_1.0_CLIENT 0
+        StrCpy $__DOTNET_1.1_CLIENT 0
+        StrCpy $__DOTNET_2.0_CLIENT 0
+        StrCpy $__DOTNET_3.0_CLIENT 0
+        StrCpy $__DOTNET_3.5_CLIENT 0
+        StrCpy $__DOTNET_4.0_CLIENT 0
+ 
+        StrCpy $__DOTNET_1.0_FULL 0
+        StrCpy $__DOTNET_1.1_FULL 0
+        StrCpy $__DOTNET_2.0_FULL 0
+        StrCpy $__DOTNET_3.0_FULL 0
+        StrCpy $__DOTNET_3.5_FULL 0
+        StrCpy $__DOTNET_4.0_FULL 0
+ 
+  !endif
+!macroend
+ 
+ 
+# lazy initialization macro
+ 
+!macro __DotNetVer_InitVars
+    # only calculate version once
+    StrCmp $__DONTNET_FOUNDVER "" dotnetver.noveryet
+        Return
+ 
+    dotnetver.noveryet:
+    !insertmacro __DotNetVer_DeclareVars
+ 
+    Push $0    ;registry count
+    Push $1    ;registry key
+    Push $2    ;version number
+    Push $3    ;installed
+    Push $4    ;service pack number
+    Push $8    ;strLen helper var
+ 
+    StrCpy $0 0
+ 
+    dotnetver.startenum:
+ 
+    EnumRegKey $1 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP" $0
+    StrCmp $1 "" dotnetver.done
+ 
+    IntOp $0 $0 + 1
+ 
+    StrCpy $2 $1 1 0
+    StrCmp $2 "v" +1 dotnetver.startenum
+    StrCpy $2 $1 3 1
+ 
+    ; Check for .NET 1.0 to 3.5
+    ReadRegDWORD $3 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\$1" "Install"
+    ReadRegDWORD $4 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\$1" "SP"
+    ; This is a sanity check that works on .NET 1.0 to 3.5
+    ; if it fails check for dotnet 4
+    IntCmp $3 0 dotnetcheck.40
+    StrCmp $2 ${DOTNETVER_1_0} dotnetver.10
+    StrCmp $2 ${DOTNETVER_1_1} dotnetver.11
+    StrCmp $2 ${DOTNETVER_2_0} dotnetver.20
+    StrCmp $2 ${DOTNETVER_3_0} dotnetver.30
+    StrCmp $2 ${DOTNETVER_3_5} dotnetver.35
+    dotnetcheck.40:
+    StrCmp $2 ${DOTNETVER_4_0} dotnetver.40
+    StrCmp $2 "4" dotnetver.40
+ 
+    Goto dotnetver.startenum
+ 
+    dotnetver.10:
+        StrCpy $__DOTNET_1.0 1
+        StrCpy $__DOTNETVER_1.0_SP $4
+        StrCpy $__DOTNET_1.0_FULL 1
+        Goto dotnetver.startenum
+    dotnetver.11:
+        StrCpy $__DOTNET_1.1 1
+        StrCpy $__DOTNETVER_1.1_SP $4
+        StrCpy $__DOTNET_1.1_FULL 1
+        Goto dotnetver.startenum
+    dotnetver.20:
+        StrCpy $__DOTNET_2.0 1
+        StrCpy $__DOTNETVER_2.0_SP $4
+        StrCpy $__DOTNET_2.0_FULL 1
+        Goto dotnetver.startenum
+    dotnetver.30:
+        StrCpy $__DOTNET_3.0 1
+        StrCpy $__DOTNETVER_3.0_SP $4
+        StrCpy $__DOTNET_3.0_FULL 1
+        Goto dotnetver.startenum
+    dotnetver.35:
+        StrCpy $__DOTNET_3.5 1
+        StrCpy $__DOTNETVER_3.5_SP $4
+        StrCpy $__DOTNET_3.5_FULL 1
+        Goto dotnetver.startenum
+    dotnetver.40:
+        ; Check for .NET 4.0 (Full Profile)
+        ReadRegDWORD $3 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full" "Install"
+        ReadRegDWORD $4 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full" "SP"
+	StrLen $8 $3
+        IntCmp $8 0 dotnetcheck.40c
+        IntCmp $3 0 dotnetcheck.40c
+        StrCmp $2 ${DOTNETVER_4_0} dotnetver.40_Full
+        StrCmp $2 "4" dotnetver.40_Full
+        dotnetcheck.40c:
+        ; Check for .NET 4.0 (Client Profile)
+        ReadRegDWORD $3 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Client" "Install"
+        ReadRegDWORD $4 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Client" "SP"
+	StrLen $8 $3
+        IntCmp $8 0 dotnetver.startenum
+        IntCmp $3 0 dotnetver.startenum
+        StrCmp $2 ${DOTNETVER_4_0} dotnetver.40_Client
+        StrCmp $2 "4" dotnetver.40_Client
+        Goto dotnetver.startenum
+    dotnetver.40_Full:
+        StrCpy $__DOTNET_4.0 1
+        StrCpy $__DOTNETVER_4.0_SP $4
+        StrCpy $__DOTNET_4.0_FULL 1
+        Goto dotnetcheck.40c ; continue looking for other profiles
+    dotnetver.40_Client:
+        StrCpy $__DOTNET_4.0 1
+        StrCpy $__DOTNETVER_4.0_SP $4
+        StrCpy $__DOTNET_4.0_CLIENT 1
+        Goto dotnetver.startenum
+ 
+    dotnetver.done:
+ 
+    StrCpy $__DONTNET_FOUNDVER "1"
+ 
+    Pop $8
+    Pop $4
+    Pop $3
+    Pop $2
+    Pop $1
+    Pop $0
+!macroend
+ 
+!macro _HasDotNet _a _b _t _f
+    ${CallArtificialFunction} __DotNetVer_InitVars
+ 
+   !insertmacro _= `$__DOTNET_${_b}` `1` `${_t}` `${_f}`
+!macroend
+ 
+!macro __DotNetVer_DefineTest Ver
+  !define HasDotNet${Ver} `"" HasDotNet ${Ver}`
+!macroend
+ 
+!insertmacro __DotNetVer_DefineTest ${DOTNETVER_1_0}
+!insertmacro __DotNetVer_DefineTest ${DOTNETVER_1_1}
+!insertmacro __DotNetVer_DefineTest ${DOTNETVER_2_0}
+!insertmacro __DotNetVer_DefineTest ${DOTNETVER_3_0}
+!insertmacro __DotNetVer_DefineTest ${DOTNETVER_3_5}
+!insertmacro __DotNetVer_DefineTest ${DOTNETVER_4_0}
+ 
+!macro _AtLeastDotNetServicePack _a _b _t _f
+    ${CallArtificialFunction} __DotNetVer_InitVars
+ 
+    !insertmacro _>= `$__DOTNETVER_${_a}_SP` `${_b}` `${_t}` `${_f}`
+!macroend
+!define AtLeastDotNetServicePack `AtLeastDotNetServicePack`
+ 
+ 
+!macro _AtMostDotNetServicePack _a _b _t _f
+    ${CallArtificialFunction} __DotNetVer_InitVars
+ 
+    !insertmacro _<= `$__DOTNETVER_${_a}_SP` `${_b}` `${_t}` `${_f}`
+!macroend
+!define AtMostDotNetServicePack `AtMostDotNetServicePack`
+ 
+ 
+!macro _IsDotNetServicePack _a _b _t _f
+    ${CallArtificialFunction} __DotNetVer_InitVars
+ 
+    !insertmacro _= `$__DOTNETVER_${_a}_SP` `${_b}` `${_t}` `${_f}`
+!macroend
+!define IsDotNetServicePack `IsDotNetServicePack`
+ 
+!macro _HasDotNetClientProfile _a _b _t _f
+    ${CallArtificialFunction} __DotNetVer_InitVars
+ 
+    !insertmacro _= `$__DOTNET_${_a}_CLIENT` `${_b}` `${_t}` `${_f}`
+!macroend
+!define HasDotNetClientProfile `HasDotNetClientProfile`
+ 
+!macro _HasDotNetFullProfile _a _b _t _f
+    ${CallArtificialFunction} __DotNetVer_InitVars
+ 
+    !insertmacro _= `$__DOTNET_${_a}_FULL` `${_b}` `${_t}` `${_f}`
+!macroend
+!define HasDotNetFullProfile `HasDotNetFullProfile`
+ 
+# done
+ 
+!endif # !___DOTNETVER__NSH___
+ 
 !verbose pop
\ No newline at end of file
diff --git a/Other/Source/EmptyWorkingSet.nsh b/etc/source/EmptyWorkingSet.nsh
similarity index 100%
rename from Other/Source/EmptyWorkingSet.nsh
rename to etc/source/EmptyWorkingSet.nsh
diff --git a/Other/Source/EnumINI.nsh b/etc/source/EnumINI.nsh
similarity index 97%
rename from Other/Source/EnumINI.nsh
rename to etc/source/EnumINI.nsh
index 5024b6a..f53569d 100644
--- a/Other/Source/EnumINI.nsh
+++ b/etc/source/EnumINI.nsh
@@ -1,267 +1,267 @@
-/*
-    @FILENAME   = EnumIni.nsh
-    @AUTHORS    = Zinthose, Iceman_K
-    @REVISIONS  = zenpoy[http://forums.winamp.com/member.php?u=401997]
-    @URL        = http://nsis.sourceforge.net/mediawiki/index.php?title=Enumerate_INI
-
-	Summary 
-	Set of macros to enumerate an INI file using syntax similar to the EnumRegKey and EnumRegValue commands. 
-
-	Example 
-	!include "EnumIni.nsh"
-	 
-	Section "Example: EnumIniKey"
-	    StrCpy $0 0
-	    loop:
-		   ${EnumIniKey} $1 `c:\boot.ini` $0
-		   StrCmp $1 "" done
-		   IntOp $0 $0 + 1
-		   ReadIniStr $2 `c:\boot.ini` `boot loader` $1
-		   MessageBox MB_YESNO|MB_ICONQUESTION "Name=$1$\n$\n$\nMore?" IDYES loop
-	    done:
-	SectionEnd
-	 
-	Section "Example: EnumIniValue"
-	    StrCpy $0 0
-	    loop:
-		   ${EnumIniValue} $1 `c:\boot.ini` `boot loader` $0
-		   StrCmp $1 "" done
-		   IntOp $0 $0 + 1
-		   ReadIniStr $2 `c:\boot.ini` `boot loader` $1
-		   MessageBox MB_YESNO|MB_ICONQUESTION "Name=$1$\nValue=$2$\n$\n$\nMore?" IDYES loop
-	    done:
-SectionEnd
-*/
-!ifndef __EnumIni__
-!define __EnumIni__
-
-    ## Includes
-        !include "TextFunc.nsh"
-        !ifndef StrLoc
-            !include "StrFunc.nsh"
-            ${StrLoc}
-        !endif
-    
-    ## Macro to remove leading and trailing whitespaces from a string.
-    ## Derived from the function originaly posted by Iceman_K at: 
-    ##  http://nsis.sourceforge.net/Remove_leading_and_trailing_whitespaces_from_a_string
-        !ifmacrondef _Trim
-            !macro _Trim _UserVar _OriginalString
-                !define Trim_UID ${__LINE__}
-                
-                Push $R1
-                Push $R2
-                Push `${_OriginalString}`
-                Pop $R1
-                
-                Loop_${Trim_UID}:
-                    StrCpy $R2 "$R1" 1
-                    StrCmp "$R2" " " TrimLeft_${Trim_UID}
-                    StrCmp "$R2" "$\r" TrimLeft_${Trim_UID}
-                    StrCmp "$R2" "$\n" TrimLeft_${Trim_UID}
-                    StrCmp "$R2" "$\t" TrimLeft_${Trim_UID}
-                    GoTo Loop2_${Trim_UID}
-                TrimLeft_${Trim_UID}:   
-                    StrCpy $R1 "$R1" "" 1
-                    Goto Loop_${Trim_UID}
-             
-                Loop2_${Trim_UID}:
-                    StrCpy $R2 "$R1" 1 -1
-                    StrCmp "$R2" " " TrimRight_${Trim_UID}
-                    StrCmp "$R2" "$\r" TrimRight_${Trim_UID}
-                    StrCmp "$R2" "$\n" TrimRight_${Trim_UID}
-                    StrCmp "$R2" "$\t" TrimRight_${Trim_UID}
-                    GoTo Done_${Trim_UID}
-                TrimRight_${Trim_UID}:  
-                    StrCpy $R1 "$R1" -1
-                    Goto Loop2_${Trim_UID}
-                 
-                Done_${Trim_UID}:
-                    Pop $R2
-                    Exch $R1
-                    Pop ${_UserVar}
-                !undef Trim_UID
-            !macroend
-            !ifdef Trim
-                !warning `Trim Macro Previously Defined! Beware of bugs!`
-            !else
-                !define Trim `!insertmacro _Trim`
-            !endif
-        !endif
-    
-    ## Global variable needed for indexing the enumerations
-        !ifmacrondef EnumIni_IDX_VAR
-            !macro EnumIni_IDX_VAR
-                !ifndef EnumIni_IDX_VAR
-                    VAR /GLOBAL EnumIni_IDX_VAR
-                    !define EnumIni_IDX_VAR $EnumIni_IDX_VAR
-                !endif
-            !macroend 
-        !endif
-        
-    /*  ## EnumIniKey ##
-            Nearly identical in use to the builtin EnumRegKey function, the EnumIniKey macro 
-            allows for enumeration of an existing ini file's sections.
-        
-        ## Example ##
-            StrCpy $0 0
-            loop:
-                ${EnumIniKey} $1 `c:\boot.ini` $0
-                StrCmp $1 "" done
-                IntOp $0 $0 + 1
-                MessageBox MB_YESNO|MB_ICONQUESTION "Key=$1$\n$\n$\nMore?" IDYES loop
-            done:
-    */
-    !ifmacrondef _EnumIniKey
-        !insertmacro EnumIni_IDX_VAR
-        !macro _EnumIniKey _UserVar _IniFilePath _Index
-            !define EnumIniKey_UID ${__LINE__}
-            ClearErrors
-            
-            Push $R0
-            Push $R1
-            
-            Push `${_IniFilePath}`
-            Push `${_Index}`
-            
-            Pop $R1 ; ${_Index}
-            Pop $R0 ; ${_IniFilePath}
-			
-            IfFileExists $R0 0 Else_IfFileExists_${EnumIniKey_UID}
-                StrCpy $EnumIni_IDX_VAR -1 
-                ## PATCH Added to Correct 0 length file infinite loop issue discovered by zenpoy
-                ## [http://forums.winamp.com/member.php?u=401997] on January 9th 2012
-                    ${LineSum} $R0 $R1
-                    IfErrors Else_IfFileExists_${EnumINIKey_UID}
-                    IntCmp $R1 0 Else_IfFileExists_${EnumINIKey_UID} Else_IfFileExists_${EnumINIKey_UID} 0
-                ## End Revision
-                ${LineFind} $R0 "/NUL" "1:-1" "EnumIniKey_CALLBACK"
-                IfErrors Else_IfFileExists_${EnumIniKey_UID}
-                Goto EndIf_FileExists_${EnumIniKey_UID}
-            Else_IfFileExists_${EnumIniKey_UID}:
-                StrCpy $R0 ''
-                SetErrors
-            EndIf_FileExists_${EnumIniKey_UID}:
-    
-            Pop $R1
-            Exch $R0
-            Pop ${_UserVar}
-            
-            !undef EnumIniKey_UID
-        !macroend
-        !ifndef EnumIniKey
-            !define EnumIniKey `!insertmacro _EnumIniKey`
-        !endif
-        !ifdef __GLOBAL__
-            !verbose push
-            !verbose 0
-            Function EnumIniKey_CALLBACK
-                !insertmacro _Trim $R9 $R9
-                
-                StrCmp $R9 '' End
-                StrCpy $R0 $R9 1
-                StrCmp $R0 '[' 0 End
-                IntOp $EnumIni_IDX_VAR $EnumIni_IDX_VAR + 1
-                IntCmp $R1 $EnumIni_IDX_VAR 0 End End
-                    ${StrLoc} $R0 $R9 "]" ">"
-                    IntCmp $R0 0 End
-                    IntOp $R0 $R0 - 1
-                    StrCpy $R0 $R9 $R0 1
-                    Push 'StopLineFind'
-                    Return
-                End:
-                StrCpy $R0 ''
-                Push '' 
-            FunctionEnd
-            !verbose pop
-        !else
-            !Error `An illegal attempt was made to insert the EnumIniValue_CALLBACK function outside the Global namespace!`
-        !endif
-    !endif
-    
-    /*  ## EnumIniValue ##
-            Nearly identical in use to the builtin EnumRegValue function, the EnumIniValue macro 
-            allows for enumeration of an existing ini file section.
-        
-        ## Example ##
-            StrCpy $0 0
-            loop:
-                ${EnumIniValue} $1 `c:\boot.ini` `boot loader` $0
-                StrCmp $1 "" done
-                IntOp $0 $0 + 1
-                ReadIniStr $2 `c:\boot.ini` `boot loader` $1
-                MessageBox MB_YESNO|MB_ICONQUESTION "Value=$1$\n$\t$2$\n$\n$\nMore?" IDYES loop
-            done:
-    */
-    !ifmacrondef _EnumIniValue
-        !insertmacro EnumIni_IDX_VAR
-        !macro _EnumIniValue _UserVar _IniFilePath _Section _Index
-            !define EnumIniValue_UID ${__LINE__}
-            ClearErrors
-            
-            Push $R0
-            Push $R1
-            Push $R2
-            Push $R3
-    
-            Push `${_IniFilePath}`
-            Push `${_Section}`
-            Push `${_Index}`
-                
-            Pop $R2 ; ${_Index}
-            Pop $R1 ; ${_Section}
-            Pop $R0 ; ${_IniFilePath}
-    
-            IfFileExists $R0 0 Else_IfFileExists_${EnumIniValue_UID}
-                StrCpy $EnumIni_IDX_VAR -1 
-                ${LineFind} $R0 "/NUL" "1:-1" "EnumIniValue_CALLBACK"
-                IfErrors Else_IfFileExists_${EnumIniValue_UID}
-                Goto EndIf_FileExists_${EnumIniValue_UID}
-            Else_IfFileExists_${EnumIniValue_UID}:
-                StrCpy $R0 ''
-                SetErrors
-            EndIf_FileExists_${EnumIniValue_UID}:
-    
-            Pop $R3
-            Pop $R2
-            Pop $R1
-            Exch $R0
-            Pop ${_UserVar}
-            !undef EnumIniValue_UID
-        !macroend
-        !ifndef EnumIniValue
-            !define EnumIniValue `!insertmacro _EnumIniValue`
-        !endif
-        !ifdef __GLOBAL__
-            !verbose push
-            !verbose 0
-            Function EnumIniValue_CALLBACK
-                !insertmacro _Trim $R9 $R9
-                
-                StrCmp $R9 '' End
-                StrCpy $R0 $R9 1
-                StrCmp $R0 ';' End
-                StrCmp $R0 '#' End
-                StrCmp $R0 '[' Key
-                StrCmp $R3 [$R1] 0 End
-                IntOp $EnumIni_IDX_VAR $EnumIni_IDX_VAR + 1
-                IntCmp $R2 $EnumIni_IDX_VAR 0 End End
-                    ${StrLoc} $R0 $R9 "=" ">"
-                    IntCmp $R0 0 0 0 ValueSet
-                        StrCpy $R0 $R9
-                    ValueSet:
-                    StrCpy $R0 $R9 $R0
-                    Push 'StopLineFind'
-                    Return
-                Key:
-                    StrCpy $R3 $R9
-                End:
-                StrCpy $R0 ''
-                Push '' 
-            FunctionEnd
-            !verbose pop
-        !else
-            !Error `An illegal attempt was made to insert the EnumIniValue_CALLBACK function outside the Global namespace!`
-        !endif
-    !endif
+/*
+    @FILENAME   = EnumIni.nsh
+    @AUTHORS    = Zinthose, Iceman_K
+    @REVISIONS  = zenpoy[http://forums.winamp.com/member.php?u=401997]
+    @URL        = http://nsis.sourceforge.net/mediawiki/index.php?title=Enumerate_INI
+
+	Summary 
+	Set of macros to enumerate an INI file using syntax similar to the EnumRegKey and EnumRegValue commands. 
+
+	Example 
+	!include "EnumIni.nsh"
+	 
+	Section "Example: EnumIniKey"
+	    StrCpy $0 0
+	    loop:
+		   ${EnumIniKey} $1 `c:\boot.ini` $0
+		   StrCmp $1 "" done
+		   IntOp $0 $0 + 1
+		   ReadIniStr $2 `c:\boot.ini` `boot loader` $1
+		   MessageBox MB_YESNO|MB_ICONQUESTION "Name=$1$\n$\n$\nMore?" IDYES loop
+	    done:
+	SectionEnd
+	 
+	Section "Example: EnumIniValue"
+	    StrCpy $0 0
+	    loop:
+		   ${EnumIniValue} $1 `c:\boot.ini` `boot loader` $0
+		   StrCmp $1 "" done
+		   IntOp $0 $0 + 1
+		   ReadIniStr $2 `c:\boot.ini` `boot loader` $1
+		   MessageBox MB_YESNO|MB_ICONQUESTION "Name=$1$\nValue=$2$\n$\n$\nMore?" IDYES loop
+	    done:
+SectionEnd
+*/
+!ifndef __EnumIni__
+!define __EnumIni__
+
+    ## Includes
+        !include "TextFunc.nsh"
+        !ifndef StrLoc
+            !include "StrFunc.nsh"
+            ${StrLoc}
+        !endif
+    
+    ## Macro to remove leading and trailing whitespaces from a string.
+    ## Derived from the function originaly posted by Iceman_K at: 
+    ##  http://nsis.sourceforge.net/Remove_leading_and_trailing_whitespaces_from_a_string
+        !ifmacrondef _Trim
+            !macro _Trim _UserVar _OriginalString
+                !define Trim_UID ${__LINE__}
+                
+                Push $R1
+                Push $R2
+                Push `${_OriginalString}`
+                Pop $R1
+                
+                Loop_${Trim_UID}:
+                    StrCpy $R2 "$R1" 1
+                    StrCmp "$R2" " " TrimLeft_${Trim_UID}
+                    StrCmp "$R2" "$\r" TrimLeft_${Trim_UID}
+                    StrCmp "$R2" "$\n" TrimLeft_${Trim_UID}
+                    StrCmp "$R2" "$\t" TrimLeft_${Trim_UID}
+                    GoTo Loop2_${Trim_UID}
+                TrimLeft_${Trim_UID}:   
+                    StrCpy $R1 "$R1" "" 1
+                    Goto Loop_${Trim_UID}
+             
+                Loop2_${Trim_UID}:
+                    StrCpy $R2 "$R1" 1 -1
+                    StrCmp "$R2" " " TrimRight_${Trim_UID}
+                    StrCmp "$R2" "$\r" TrimRight_${Trim_UID}
+                    StrCmp "$R2" "$\n" TrimRight_${Trim_UID}
+                    StrCmp "$R2" "$\t" TrimRight_${Trim_UID}
+                    GoTo Done_${Trim_UID}
+                TrimRight_${Trim_UID}:  
+                    StrCpy $R1 "$R1" -1
+                    Goto Loop2_${Trim_UID}
+                 
+                Done_${Trim_UID}:
+                    Pop $R2
+                    Exch $R1
+                    Pop ${_UserVar}
+                !undef Trim_UID
+            !macroend
+            !ifdef Trim
+                !warning `Trim Macro Previously Defined! Beware of bugs!`
+            !else
+                !define Trim `!insertmacro _Trim`
+            !endif
+        !endif
+    
+    ## Global variable needed for indexing the enumerations
+        !ifmacrondef EnumIni_IDX_VAR
+            !macro EnumIni_IDX_VAR
+                !ifndef EnumIni_IDX_VAR
+                    VAR /GLOBAL EnumIni_IDX_VAR
+                    !define EnumIni_IDX_VAR $EnumIni_IDX_VAR
+                !endif
+            !macroend 
+        !endif
+        
+    /*  ## EnumIniKey ##
+            Nearly identical in use to the builtin EnumRegKey function, the EnumIniKey macro 
+            allows for enumeration of an existing ini file's sections.
+        
+        ## Example ##
+            StrCpy $0 0
+            loop:
+                ${EnumIniKey} $1 `c:\boot.ini` $0
+                StrCmp $1 "" done
+                IntOp $0 $0 + 1
+                MessageBox MB_YESNO|MB_ICONQUESTION "Key=$1$\n$\n$\nMore?" IDYES loop
+            done:
+    */
+    !ifmacrondef _EnumIniKey
+        !insertmacro EnumIni_IDX_VAR
+        !macro _EnumIniKey _UserVar _IniFilePath _Index
+            !define EnumIniKey_UID ${__LINE__}
+            ClearErrors
+            
+            Push $R0
+            Push $R1
+            
+            Push `${_IniFilePath}`
+            Push `${_Index}`
+            
+            Pop $R1 ; ${_Index}
+            Pop $R0 ; ${_IniFilePath}
+			
+            IfFileExists $R0 0 Else_IfFileExists_${EnumIniKey_UID}
+                StrCpy $EnumIni_IDX_VAR -1 
+                ## PATCH Added to Correct 0 length file infinite loop issue discovered by zenpoy
+                ## [http://forums.winamp.com/member.php?u=401997] on January 9th 2012
+                    ${LineSum} $R0 $R1
+                    IfErrors Else_IfFileExists_${EnumINIKey_UID}
+                    IntCmp $R1 0 Else_IfFileExists_${EnumINIKey_UID} Else_IfFileExists_${EnumINIKey_UID} 0
+                ## End Revision
+                ${LineFind} $R0 "/NUL" "1:-1" "EnumIniKey_CALLBACK"
+                IfErrors Else_IfFileExists_${EnumIniKey_UID}
+                Goto EndIf_FileExists_${EnumIniKey_UID}
+            Else_IfFileExists_${EnumIniKey_UID}:
+                StrCpy $R0 ''
+                SetErrors
+            EndIf_FileExists_${EnumIniKey_UID}:
+    
+            Pop $R1
+            Exch $R0
+            Pop ${_UserVar}
+            
+            !undef EnumIniKey_UID
+        !macroend
+        !ifndef EnumIniKey
+            !define EnumIniKey `!insertmacro _EnumIniKey`
+        !endif
+        !ifdef __GLOBAL__
+            !verbose push
+            !verbose 0
+            Function EnumIniKey_CALLBACK
+                !insertmacro _Trim $R9 $R9
+                
+                StrCmp $R9 '' End
+                StrCpy $R0 $R9 1
+                StrCmp $R0 '[' 0 End
+                IntOp $EnumIni_IDX_VAR $EnumIni_IDX_VAR + 1
+                IntCmp $R1 $EnumIni_IDX_VAR 0 End End
+                    ${StrLoc} $R0 $R9 "]" ">"
+                    IntCmp $R0 0 End
+                    IntOp $R0 $R0 - 1
+                    StrCpy $R0 $R9 $R0 1
+                    Push 'StopLineFind'
+                    Return
+                End:
+                StrCpy $R0 ''
+                Push '' 
+            FunctionEnd
+            !verbose pop
+        !else
+            !Error `An illegal attempt was made to insert the EnumIniValue_CALLBACK function outside the Global namespace!`
+        !endif
+    !endif
+    
+    /*  ## EnumIniValue ##
+            Nearly identical in use to the builtin EnumRegValue function, the EnumIniValue macro 
+            allows for enumeration of an existing ini file section.
+        
+        ## Example ##
+            StrCpy $0 0
+            loop:
+                ${EnumIniValue} $1 `c:\boot.ini` `boot loader` $0
+                StrCmp $1 "" done
+                IntOp $0 $0 + 1
+                ReadIniStr $2 `c:\boot.ini` `boot loader` $1
+                MessageBox MB_YESNO|MB_ICONQUESTION "Value=$1$\n$\t$2$\n$\n$\nMore?" IDYES loop
+            done:
+    */
+    !ifmacrondef _EnumIniValue
+        !insertmacro EnumIni_IDX_VAR
+        !macro _EnumIniValue _UserVar _IniFilePath _Section _Index
+            !define EnumIniValue_UID ${__LINE__}
+            ClearErrors
+            
+            Push $R0
+            Push $R1
+            Push $R2
+            Push $R3
+    
+            Push `${_IniFilePath}`
+            Push `${_Section}`
+            Push `${_Index}`
+                
+            Pop $R2 ; ${_Index}
+            Pop $R1 ; ${_Section}
+            Pop $R0 ; ${_IniFilePath}
+    
+            IfFileExists $R0 0 Else_IfFileExists_${EnumIniValue_UID}
+                StrCpy $EnumIni_IDX_VAR -1 
+                ${LineFind} $R0 "/NUL" "1:-1" "EnumIniValue_CALLBACK"
+                IfErrors Else_IfFileExists_${EnumIniValue_UID}
+                Goto EndIf_FileExists_${EnumIniValue_UID}
+            Else_IfFileExists_${EnumIniValue_UID}:
+                StrCpy $R0 ''
+                SetErrors
+            EndIf_FileExists_${EnumIniValue_UID}:
+    
+            Pop $R3
+            Pop $R2
+            Pop $R1
+            Exch $R0
+            Pop ${_UserVar}
+            !undef EnumIniValue_UID
+        !macroend
+        !ifndef EnumIniValue
+            !define EnumIniValue `!insertmacro _EnumIniValue`
+        !endif
+        !ifdef __GLOBAL__
+            !verbose push
+            !verbose 0
+            Function EnumIniValue_CALLBACK
+                !insertmacro _Trim $R9 $R9
+                
+                StrCmp $R9 '' End
+                StrCpy $R0 $R9 1
+                StrCmp $R0 ';' End
+                StrCmp $R0 '#' End
+                StrCmp $R0 '[' Key
+                StrCmp $R3 [$R1] 0 End
+                IntOp $EnumIni_IDX_VAR $EnumIni_IDX_VAR + 1
+                IntCmp $R2 $EnumIni_IDX_VAR 0 End End
+                    ${StrLoc} $R0 $R9 "=" ">"
+                    IntCmp $R0 0 0 0 ValueSet
+                        StrCpy $R0 $R9
+                    ValueSet:
+                    StrCpy $R0 $R9 $R0
+                    Push 'StopLineFind'
+                    Return
+                Key:
+                    StrCpy $R3 $R9
+                End:
+                StrCpy $R0 ''
+                Push '' 
+            FunctionEnd
+            !verbose pop
+        !else
+            !Error `An illegal attempt was made to insert the EnumIniValue_CALLBACK function outside the Global namespace!`
+        !endif
+    !endif
 !endif
\ No newline at end of file
diff --git a/Other/Source/EnumINISection.nsh b/etc/source/EnumINISection.nsh
similarity index 94%
rename from Other/Source/EnumINISection.nsh
rename to etc/source/EnumINISection.nsh
index dc23aaa..0f2d622 100644
--- a/Other/Source/EnumINISection.nsh
+++ b/etc/source/EnumINISection.nsh
@@ -1,165 +1,165 @@
-/* The Function Description
-   Based on the method to loop over a buffer of null-terminated strings in function "GetDrives"
-   Loop over all available sections in an INI file.
-
-	Syntax \\
-		${GetSectionNames} "File" "Function"
-
-		File     > name of the initialization file
-		Function > Callback function
-
-		Function "Function"
-			; $9    "section name"
-			; $R0-$R9  are not used (save data in them).
-			; ...
-			Push $var    ; If $var="StopGetSectionNames" Then exit from function
-		FunctionEnd
-
-	Example1 \\
-		Section
-			${GetSectionNames} "c:\test.ini" "Example1"
-		SectionEnd
-
-		Function Example1
-			MessageBox MB_OK "$9"
-			Push $0
-		FunctionEnd
-
-	Example2 \\
-		Section
-			${GetSectionNames} "c:\test.ini" "Example2"
-		SectionEnd
-
-		Function Example2
-			StrCmp $9 $R0 0 +3
-			StrCpy $R1 $9
-			StrCpy $0 StopGetSectionNames
-			Push $0
-		FunctionEnd
-*/
-
-!define GetSectionNames `!insertmacro GetSectionNamesCall`
-!macro GetSectionNamesCall _FILE _FUNC
-	Push $0
-	Push `${_FILE}`
-	GetFunctionAddress $0 `${_FUNC}`
-	Push `$0`
-	Call GetSectionNames
-	Pop $0
-!macroend
-
-Function GetSectionNames
-	Exch $1
-	Exch
-	Exch $0
-	Exch
-	Push $2
-	Push $3
-	Push $4
-	Push $5
-	Push $8
-	Push $9
-	System::Call *(&t1024)i.r2
-	StrCpy $3 $2
-	System::Call "kernel32::GetPrivateProfileSectionNames(i, i, t)i (r3, 1024, r0).r4"
-	enumok:
-	System::Call 'kernel32::lstrlen(t)i (i r3).r5' ; (t) is here to trigger A/W detection
-	StrCmp $5 '0' enumex
-	System::Call '*$3(&t1024 .r9)'
-	Push $0
-	Push $1
-	Push $2
-	Push $3
-	Push $4
-	Push $5
-	Push $8
-	Call $1
-	Pop $9
-	Pop $8
-	Pop $5
-	Pop $4
-	Pop $3
-	Pop $2
-	Pop $1
-	Pop $0
-	StrCmp $9 'StopGetSectionNames' enumex
-	enumnext:
-		!if "${NSIS_CHAR_SIZE}" > 1
-			IntOp $5 $5 * ${NSIS_CHAR_SIZE}
-			IntOp $5 $5 + ${NSIS_CHAR_SIZE}
-		!else
-			IntOp $5 $5 + 1
-		!endif
-		IntOp $3 $3 + $5
-		Goto enumok
-	enumex:
-		System::Free $2
-	Pop $9
-	Pop $8
-	Pop $5
-	Pop $4
-	Pop $3
-	Pop $2
-	Pop $1
-	Pop $0
-FunctionEnd
-
-!ifndef GetSectionNames_BufferSize
-	!define GetSectionNames_BufferSize 1024
-!endif
-
-/* ANSI ONLY
-Function GetSectionNames
-  Exch $1
-  Exch
-  Exch $0
-  Exch
-  Push $2
-  Push $3
-  Push $4
-  Push $5
-  Push $9
- 
-  System::Call `*(&m${GetSectionNames_BufferSize}) i .r2`
-  StrCpy $3 $2
- 
-  System::Call `kernel32::GetPrivateProfileSectionNamesA(i r3, i ${GetSectionNames_BufferSize}, m r0) i .r4`
- 
-  Next:
-  System::Call `kernel32::lstrlenA(i r3) i .r5`
-  StrCmp $5 0 Done
- 
-  System::Call `*$3(&m${NSIS_MAX_STRLEN} .r9)`
- 
-  Push $0
-  Push $1
-  Push $2
-  Push $3
-  Push $4
-  Push $5
-  Call $1
-  Pop $9
-  Pop $5
-  Pop $4
-  Pop $3
-  Pop $2
-  Pop $1
-  Pop $0
-  StrCmp $9 StopGetSectionNames Done
- 
-  IntOp $5 $5 + 1
-  IntOp $3 $3 + $5
-  GoTo Next
- 
-  Done:
-  System::Free $2
- 
-  Pop $9
-  Pop $5
-  Pop $4
-  Pop $3
-  Pop $2
-  Pop $1
-  Pop $0
-FunctionEnd
+/* The Function Description
+   Based on the method to loop over a buffer of null-terminated strings in function "GetDrives"
+   Loop over all available sections in an INI file.
+
+	Syntax \\
+		${GetSectionNames} "File" "Function"
+
+		File     > name of the initialization file
+		Function > Callback function
+
+		Function "Function"
+			; $9    "section name"
+			; $R0-$R9  are not used (save data in them).
+			; ...
+			Push $var    ; If $var="StopGetSectionNames" Then exit from function
+		FunctionEnd
+
+	Example1 \\
+		Section
+			${GetSectionNames} "c:\test.ini" "Example1"
+		SectionEnd
+
+		Function Example1
+			MessageBox MB_OK "$9"
+			Push $0
+		FunctionEnd
+
+	Example2 \\
+		Section
+			${GetSectionNames} "c:\test.ini" "Example2"
+		SectionEnd
+
+		Function Example2
+			StrCmp $9 $R0 0 +3
+			StrCpy $R1 $9
+			StrCpy $0 StopGetSectionNames
+			Push $0
+		FunctionEnd
+*/
+
+!define GetSectionNames `!insertmacro GetSectionNamesCall`
+!macro GetSectionNamesCall _FILE _FUNC
+	Push $0
+	Push `${_FILE}`
+	GetFunctionAddress $0 `${_FUNC}`
+	Push `$0`
+	Call GetSectionNames
+	Pop $0
+!macroend
+
+Function GetSectionNames
+	Exch $1
+	Exch
+	Exch $0
+	Exch
+	Push $2
+	Push $3
+	Push $4
+	Push $5
+	Push $8
+	Push $9
+	System::Call *(&t1024)i.r2
+	StrCpy $3 $2
+	System::Call "kernel32::GetPrivateProfileSectionNames(i, i, t)i (r3, 1024, r0).r4"
+	enumok:
+	System::Call 'kernel32::lstrlen(t)i (i r3).r5' ; (t) is here to trigger A/W detection
+	StrCmp $5 '0' enumex
+	System::Call '*$3(&t1024 .r9)'
+	Push $0
+	Push $1
+	Push $2
+	Push $3
+	Push $4
+	Push $5
+	Push $8
+	Call $1
+	Pop $9
+	Pop $8
+	Pop $5
+	Pop $4
+	Pop $3
+	Pop $2
+	Pop $1
+	Pop $0
+	StrCmp $9 'StopGetSectionNames' enumex
+	enumnext:
+		!if "${NSIS_CHAR_SIZE}" > 1
+			IntOp $5 $5 * ${NSIS_CHAR_SIZE}
+			IntOp $5 $5 + ${NSIS_CHAR_SIZE}
+		!else
+			IntOp $5 $5 + 1
+		!endif
+		IntOp $3 $3 + $5
+		Goto enumok
+	enumex:
+		System::Free $2
+	Pop $9
+	Pop $8
+	Pop $5
+	Pop $4
+	Pop $3
+	Pop $2
+	Pop $1
+	Pop $0
+FunctionEnd
+
+!ifndef GetSectionNames_BufferSize
+	!define GetSectionNames_BufferSize 1024
+!endif
+
+/* ANSI ONLY
+Function GetSectionNames
+  Exch $1
+  Exch
+  Exch $0
+  Exch
+  Push $2
+  Push $3
+  Push $4
+  Push $5
+  Push $9
+ 
+  System::Call `*(&m${GetSectionNames_BufferSize}) i .r2`
+  StrCpy $3 $2
+ 
+  System::Call `kernel32::GetPrivateProfileSectionNamesA(i r3, i ${GetSectionNames_BufferSize}, m r0) i .r4`
+ 
+  Next:
+  System::Call `kernel32::lstrlenA(i r3) i .r5`
+  StrCmp $5 0 Done
+ 
+  System::Call `*$3(&m${NSIS_MAX_STRLEN} .r9)`
+ 
+  Push $0
+  Push $1
+  Push $2
+  Push $3
+  Push $4
+  Push $5
+  Call $1
+  Pop $9
+  Pop $5
+  Pop $4
+  Pop $3
+  Pop $2
+  Pop $1
+  Pop $0
+  StrCmp $9 StopGetSectionNames Done
+ 
+  IntOp $5 $5 + 1
+  IntOp $3 $3 + $5
+  GoTo Next
+ 
+  Done:
+  System::Free $2
+ 
+  Pop $9
+  Pop $5
+  Pop $4
+  Pop $3
+  Pop $2
+  Pop $1
+  Pop $0
+FunctionEnd
 */
\ No newline at end of file
diff --git a/Other/Source/Explode.nsh b/etc/source/Explode.nsh
similarity index 96%
rename from Other/Source/Explode.nsh
rename to etc/source/Explode.nsh
index 58f602b..3d94d98 100644
--- a/Other/Source/Explode.nsh
+++ b/etc/source/Explode.nsh
@@ -1,125 +1,125 @@
-/*______________________________________________________________________________
- 
-                            Explode v1.0
-________________________________________________________________________________
-The function splits passed string on the basis of the separator and pushes
-results to stack. The last value pushed is the length of the array.
-
-Explode accepts two parameters: separator and string to split. After processing
-the data it pushes to the stack values in the direct order and then pushes the
-count of array items stored there. This means that if you have string "Col 1,Col
-2,Col 3" and a separator ",", then your stack will look like this:
-
-[0]    3
-[1]    Col 1
-[2]    Col 2
-[3]    Col 3
-[4]    ...
-
-Syntax 
-${Explode} "Length" "Separator" "String"
-
-or 
-Push "Separator"
-Push "String"
-Call Explode
-Pop  "Length"
-
-Parameters 
-Length 
-
-Variable in which the length of the returned array is stored. 
-Separator 
-
-String, which delimiters parts of the array in the string 
-String 
-
-String to be splitted 
-
-Example 
-    ${Explode}  $0  "," "Col 0,Col 1,Col 2"
-    MessageBox  MB_OK "$0 elements in array"
-    ${For} $1 1 $0
-        Pop $2
-        MessageBox MB_OK "Element #$1: $2"
-    ${Next}                                                               */
-
-
-Function Explode
-	!macro  Explode Length  Separator   String
-		Push    `${Separator}`
-		Push    `${String}`
-		Call    Explode
-		Pop     `${Length}`
-	!macroend
-	!define Explode "!insertmacro Explode"
-	; Initialize variables
-	Var /GLOBAL explString
-	Var /GLOBAL explSeparator
-	Var /GLOBAL explStrLen
-	Var /GLOBAL explSepLen
-	Var /GLOBAL explOffset
-	Var /GLOBAL explTmp
-	Var /GLOBAL explTmp2
-	Var /GLOBAL explTmp3
-	Var /GLOBAL explArrCount
-
-	; Get input from user
-	Pop $explString
-	Pop $explSeparator
-
-	; Calculates initial values
-	StrLen $explStrLen $explString
-	StrLen $explSepLen $explSeparator
-	StrCpy $explArrCount 1
-
-	${If}   $explStrLen <= 1          ;   If we got a single character
-	${OrIf} $explSepLen > $explStrLen ;   or separator is larger than the string,
-	Push    $explString             ;   then we return initial string with no change
-	Push    1                       ;   and set array's length to 1
-	Return
-	${EndIf}
-
-	; Set offset to the last symbol of the string
-	StrCpy $explOffset $explStrLen
-	IntOp  $explOffset $explOffset - 1
-
-	; Clear temp string to exclude the possibility of appearance of occasional data
-	StrCpy $explTmp   ""
-	StrCpy $explTmp2  ""
-	StrCpy $explTmp3  ""
-
-	; Loop until the offset becomes negative
-	${Do}
-	;   If offset becomes negative, it is time to leave the function
-	${IfThen} $explOffset == -1 ${|} ${ExitDo} ${|}
-
-	;   Remove everything before and after the searched part ("TempStr")
-	StrCpy $explTmp $explString $explSepLen $explOffset
-
-	${If} $explTmp == $explSeparator
-	   ;   Calculating offset to start copy from
-	   IntOp   $explTmp2 $explOffset + $explSepLen ;   Offset equals to the current offset plus length of separator
-	   StrCpy  $explTmp3 $explString "" $explTmp2
-
-	   Push    $explTmp3                           ;   Throwing array item to the stack
-	   IntOp   $explArrCount $explArrCount + 1     ;   Increasing array's counter
-
-	   StrCpy  $explString $explString $explOffset 0   ;   Cutting all characters beginning with the separator entry
-	   StrLen  $explStrLen $explString
-	${EndIf}
-
-	${If} $explOffset = 0                       ;   If the beginning of the line met and there is no separator,
-									   ;   copying the rest of the string
-	   ${If} $explSeparator == ""              ;   Fix for the empty separator
-		  IntOp   $explArrCount   $explArrCount - 1
-	   ${Else}
-		  Push    $explString
-	   ${EndIf}
-	${EndIf}
-
-	IntOp   $explOffset $explOffset - 1
-	${Loop}
-
-	Push $explArrCount
+/*______________________________________________________________________________
+ 
+                            Explode v1.0
+________________________________________________________________________________
+The function splits passed string on the basis of the separator and pushes
+results to stack. The last value pushed is the length of the array.
+
+Explode accepts two parameters: separator and string to split. After processing
+the data it pushes to the stack values in the direct order and then pushes the
+count of array items stored there. This means that if you have string "Col 1,Col
+2,Col 3" and a separator ",", then your stack will look like this:
+
+[0]    3
+[1]    Col 1
+[2]    Col 2
+[3]    Col 3
+[4]    ...
+
+Syntax 
+${Explode} "Length" "Separator" "String"
+
+or 
+Push "Separator"
+Push "String"
+Call Explode
+Pop  "Length"
+
+Parameters 
+Length 
+
+Variable in which the length of the returned array is stored. 
+Separator 
+
+String, which delimiters parts of the array in the string 
+String 
+
+String to be splitted 
+
+Example 
+    ${Explode}  $0  "," "Col 0,Col 1,Col 2"
+    MessageBox  MB_OK "$0 elements in array"
+    ${For} $1 1 $0
+        Pop $2
+        MessageBox MB_OK "Element #$1: $2"
+    ${Next}                                                               */
+
+
+Function Explode
+	!macro  Explode Length  Separator   String
+		Push    `${Separator}`
+		Push    `${String}`
+		Call    Explode
+		Pop     `${Length}`
+	!macroend
+	!define Explode "!insertmacro Explode"
+	; Initialize variables
+	Var /GLOBAL explString
+	Var /GLOBAL explSeparator
+	Var /GLOBAL explStrLen
+	Var /GLOBAL explSepLen
+	Var /GLOBAL explOffset
+	Var /GLOBAL explTmp
+	Var /GLOBAL explTmp2
+	Var /GLOBAL explTmp3
+	Var /GLOBAL explArrCount
+
+	; Get input from user
+	Pop $explString
+	Pop $explSeparator
+
+	; Calculates initial values
+	StrLen $explStrLen $explString
+	StrLen $explSepLen $explSeparator
+	StrCpy $explArrCount 1
+
+	${If}   $explStrLen <= 1          ;   If we got a single character
+	${OrIf} $explSepLen > $explStrLen ;   or separator is larger than the string,
+	Push    $explString             ;   then we return initial string with no change
+	Push    1                       ;   and set array's length to 1
+	Return
+	${EndIf}
+
+	; Set offset to the last symbol of the string
+	StrCpy $explOffset $explStrLen
+	IntOp  $explOffset $explOffset - 1
+
+	; Clear temp string to exclude the possibility of appearance of occasional data
+	StrCpy $explTmp   ""
+	StrCpy $explTmp2  ""
+	StrCpy $explTmp3  ""
+
+	; Loop until the offset becomes negative
+	${Do}
+	;   If offset becomes negative, it is time to leave the function
+	${IfThen} $explOffset == -1 ${|} ${ExitDo} ${|}
+
+	;   Remove everything before and after the searched part ("TempStr")
+	StrCpy $explTmp $explString $explSepLen $explOffset
+
+	${If} $explTmp == $explSeparator
+	   ;   Calculating offset to start copy from
+	   IntOp   $explTmp2 $explOffset + $explSepLen ;   Offset equals to the current offset plus length of separator
+	   StrCpy  $explTmp3 $explString "" $explTmp2
+
+	   Push    $explTmp3                           ;   Throwing array item to the stack
+	   IntOp   $explArrCount $explArrCount + 1     ;   Increasing array's counter
+
+	   StrCpy  $explString $explString $explOffset 0   ;   Cutting all characters beginning with the separator entry
+	   StrLen  $explStrLen $explString
+	${EndIf}
+
+	${If} $explOffset = 0                       ;   If the beginning of the line met and there is no separator,
+									   ;   copying the rest of the string
+	   ${If} $explSeparator == ""              ;   Fix for the empty separator
+		  IntOp   $explArrCount   $explArrCount - 1
+	   ${Else}
+		  Push    $explString
+	   ${EndIf}
+	${EndIf}
+
+	IntOp   $explOffset $explOffset - 1
+	${Loop}
+
+	Push $explArrCount
 FunctionEnd
\ No newline at end of file
diff --git a/Other/Source/Find.nsh b/etc/source/Find.nsh
similarity index 95%
rename from Other/Source/Find.nsh
rename to etc/source/Find.nsh
index 4ba5fe9..d368bdd 100644
--- a/Other/Source/Find.nsh
+++ b/etc/source/Find.nsh
@@ -1,75 +1,75 @@
-/*______________________________________________________________________________
- 
-                            Find
-________________________________________________________________________________
-Get text between two markers in a file. 
-
-Returns text from between first occurrences of markers and then stops searching.
-It works even if the markers are or are not on the same line. 
-
-Usage 
-${Find} "This" "And This" "$INSTDIR\In_This.txt" "$R0"
-; $R0 = output (text between "This", "And This").                             */
- 
-Function Find
-	!macro _Find _FIRSTDELIMITER _SECONDDELIMITER _FILE _RETURN
-		Push `${_FIRSTDELIMITER}`
-		Push `${_SECONDDELIMITER}`
-		Push `${_FILE}`
-		Call Find
-		Pop `${_RETURN}`
-	!macroend
-	!define Find `!insertmacro _Find`
-	Exch $R0
-	Exch
-	Exch $R1
-	Exch 2
-	Exch $R2
-	Exch 2
-	Exch
-	Exch 2
-	Push $R3
-	Push $R4
-	Push $R5
-	Push $R6
-	Push $R7
-	Push $R8
-	FileOpen $R6 $R0 r
-	StrLen $R4 $R2
-	StrLen $R3 $R1
-	StrCpy $R0 ""
-	ClearErrors
-	FileRead $R6 $R7
-	IfErrors +22
-	StrCpy $R5 0
-	IntOp $R5 $R5 - 1
-	StrCpy $R8 $R7 $R4 $R5
-	StrCmp $R8 "" -6
-	StrCmp $R8 $R2 0 -3
-	IntOp $R5 $R5 + $R4
-	StrCpy $R7 $R7 "" $R5
-	StrCpy $R5 -1
-	Goto +5
-	ClearErrors
-	FileRead $R6 $R7
-	IfErrors +10
-	StrCpy $R5 -1
-	IntOp $R5 $R5 + 1
-	StrCpy $R8 $R7 $R3 $R5
-	StrCmp $R8 "" 0 +3
-	StrCpy $R0 $R0$R7
-	Goto -8
-	StrCmp $R8 $R1 0 -5
-	StrCpy $R7 $R7 $R5
-	StrCpy $R0 $R0$R7
-	FileClose $R6
-	Pop $R8
-	Pop $R7
-	Pop $R6
-	Pop $R5
-	Pop $R4
-	Pop $R3
-	Pop $R2
-	Pop $R1
-	Exch $R0
+/*______________________________________________________________________________
+ 
+                            Find
+________________________________________________________________________________
+Get text between two markers in a file. 
+
+Returns text from between first occurrences of markers and then stops searching.
+It works even if the markers are or are not on the same line. 
+
+Usage 
+${Find} "This" "And This" "$INSTDIR\In_This.txt" "$R0"
+; $R0 = output (text between "This", "And This").                             */
+ 
+Function Find
+	!macro _Find _FIRSTDELIMITER _SECONDDELIMITER _FILE _RETURN
+		Push `${_FIRSTDELIMITER}`
+		Push `${_SECONDDELIMITER}`
+		Push `${_FILE}`
+		Call Find
+		Pop `${_RETURN}`
+	!macroend
+	!define Find `!insertmacro _Find`
+	Exch $R0
+	Exch
+	Exch $R1
+	Exch 2
+	Exch $R2
+	Exch 2
+	Exch
+	Exch 2
+	Push $R3
+	Push $R4
+	Push $R5
+	Push $R6
+	Push $R7
+	Push $R8
+	FileOpen $R6 $R0 r
+	StrLen $R4 $R2
+	StrLen $R3 $R1
+	StrCpy $R0 ""
+	ClearErrors
+	FileRead $R6 $R7
+	IfErrors +22
+	StrCpy $R5 0
+	IntOp $R5 $R5 - 1
+	StrCpy $R8 $R7 $R4 $R5
+	StrCmp $R8 "" -6
+	StrCmp $R8 $R2 0 -3
+	IntOp $R5 $R5 + $R4
+	StrCpy $R7 $R7 "" $R5
+	StrCpy $R5 -1
+	Goto +5
+	ClearErrors
+	FileRead $R6 $R7
+	IfErrors +10
+	StrCpy $R5 -1
+	IntOp $R5 $R5 + 1
+	StrCpy $R8 $R7 $R3 $R5
+	StrCmp $R8 "" 0 +3
+	StrCpy $R0 $R0$R7
+	Goto -8
+	StrCmp $R8 $R1 0 -5
+	StrCpy $R7 $R7 $R5
+	StrCpy $R0 $R0$R7
+	FileClose $R6
+	Pop $R8
+	Pop $R7
+	Pop $R6
+	Pop $R5
+	Pop $R4
+	Pop $R3
+	Pop $R2
+	Pop $R1
+	Exch $R0
 FunctionEnd
\ No newline at end of file
diff --git a/Other/Source/ForEachINIPair.nsh b/etc/source/ForEachINIPair.nsh
similarity index 97%
rename from Other/Source/ForEachINIPair.nsh
rename to etc/source/ForEachINIPair.nsh
index aa3e118..09a6ab4 100644
--- a/Other/Source/ForEachINIPair.nsh
+++ b/etc/source/ForEachINIPair.nsh
@@ -12,7 +12,7 @@ Var _FEIP_Char
 	!endif
 	!define _ForEachINIPair_Open
 	${If} $_FEIP_FileHandle == ""
-		FileOpen $_FEIP_FileHandle $LauncherFile r
+		FileOpen $_FEIP_FileHandle $WrapperFile r
 	${Else}
 		FileSeek $_FEIP_FileHandle 0
 	${EndIf}
diff --git a/Other/Source/ForEachPath.nsh b/etc/source/ForEachPath.nsh
similarity index 100%
rename from Other/Source/ForEachPath.nsh
rename to etc/source/ForEachPath.nsh
diff --git a/Other/Source/GetBetween.nsh b/etc/source/GetBetween.nsh
similarity index 95%
rename from Other/Source/GetBetween.nsh
rename to etc/source/GetBetween.nsh
index 52af65e..36785e7 100644
--- a/Other/Source/GetBetween.nsh
+++ b/etc/source/GetBetween.nsh
@@ -1,75 +1,75 @@
-/*______________________________________________________________________________
- 
-                            GetBetween
-________________________________________________________________________________
-Get text between two markers in a file. 
-
-Returns text from between first occurrences of markers and then stops searching.
-It works even if the markers are or are not on the same line. 
-
-Usage 
-${GetBetween} "This" "And This" "$INSTDIR\In_This.txt" "$R0"
-; $R0 = output (text between "This", "And This").                             */
- 
-Function GetBetween
-	!macro _GetBetween _FIRSTDELIMITER _SECONDDELIMITER _FILE _RETURN
-		Push `${_FIRSTDELIMITER}`
-		Push `${_SECONDDELIMITER}`
-		Push `${_FILE}`
-		Call GetBetween
-		Pop `${_RETURN}`
-	!macroend
-	!define GetBetween `!insertmacro _GetBetween`
-	Exch $R0
-	Exch
-	Exch $R1
-	Exch 2
-	Exch $R2
-	Exch 2
-	Exch
-	Exch 2
-	Push $R3
-	Push $R4
-	Push $R5
-	Push $R6
-	Push $R7
-	Push $R8
-	FileOpen $R6 $R0 r
-	StrLen $R4 $R2
-	StrLen $R3 $R1
-	StrCpy $R0 ""
-	ClearErrors
-	FileRead $R6 $R7
-	IfErrors +22
-	StrCpy $R5 0
-	IntOp $R5 $R5 - 1
-	StrCpy $R8 $R7 $R4 $R5
-	StrCmp $R8 "" -6
-	StrCmp $R8 $R2 0 -3
-	IntOp $R5 $R5 + $R4
-	StrCpy $R7 $R7 "" $R5
-	StrCpy $R5 -1
-	Goto +5
-	ClearErrors
-	FileRead $R6 $R7
-	IfErrors +10
-	StrCpy $R5 -1
-	IntOp $R5 $R5 + 1
-	StrCpy $R8 $R7 $R3 $R5
-	StrCmp $R8 "" 0 +3
-	StrCpy $R0 $R0$R7
-	Goto -8
-	StrCmp $R8 $R1 0 -5
-	StrCpy $R7 $R7 $R5
-	StrCpy $R0 $R0$R7
-	FileClose $R6
-	Pop $R8
-	Pop $R7
-	Pop $R6
-	Pop $R5
-	Pop $R4
-	Pop $R3
-	Pop $R2
-	Pop $R1
-	Exch $R0
+/*______________________________________________________________________________
+ 
+                            GetBetween
+________________________________________________________________________________
+Get text between two markers in a file. 
+
+Returns text from between first occurrences of markers and then stops searching.
+It works even if the markers are or are not on the same line. 
+
+Usage 
+${GetBetween} "This" "And This" "$INSTDIR\In_This.txt" "$R0"
+; $R0 = output (text between "This", "And This").                             */
+ 
+Function GetBetween
+	!macro _GetBetween _FIRSTDELIMITER _SECONDDELIMITER _FILE _RETURN
+		Push `${_FIRSTDELIMITER}`
+		Push `${_SECONDDELIMITER}`
+		Push `${_FILE}`
+		Call GetBetween
+		Pop `${_RETURN}`
+	!macroend
+	!define GetBetween `!insertmacro _GetBetween`
+	Exch $R0
+	Exch
+	Exch $R1
+	Exch 2
+	Exch $R2
+	Exch 2
+	Exch
+	Exch 2
+	Push $R3
+	Push $R4
+	Push $R5
+	Push $R6
+	Push $R7
+	Push $R8
+	FileOpen $R6 $R0 r
+	StrLen $R4 $R2
+	StrLen $R3 $R1
+	StrCpy $R0 ""
+	ClearErrors
+	FileRead $R6 $R7
+	IfErrors +22
+	StrCpy $R5 0
+	IntOp $R5 $R5 - 1
+	StrCpy $R8 $R7 $R4 $R5
+	StrCmp $R8 "" -6
+	StrCmp $R8 $R2 0 -3
+	IntOp $R5 $R5 + $R4
+	StrCpy $R7 $R7 "" $R5
+	StrCpy $R5 -1
+	Goto +5
+	ClearErrors
+	FileRead $R6 $R7
+	IfErrors +10
+	StrCpy $R5 -1
+	IntOp $R5 $R5 + 1
+	StrCpy $R8 $R7 $R3 $R5
+	StrCmp $R8 "" 0 +3
+	StrCpy $R0 $R0$R7
+	Goto -8
+	StrCmp $R8 $R1 0 -5
+	StrCpy $R7 $R7 $R5
+	StrCpy $R0 $R0$R7
+	FileClose $R6
+	Pop $R8
+	Pop $R7
+	Pop $R6
+	Pop $R5
+	Pop $R4
+	Pop $R3
+	Pop $R2
+	Pop $R1
+	Exch $R0
 FunctionEnd
\ No newline at end of file
diff --git a/etc/source/GetDLLVersion.nsh b/etc/source/GetDLLVersion.nsh
new file mode 100644
index 0000000..a4465f0
--- /dev/null
+++ b/etc/source/GetDLLVersion.nsh
@@ -0,0 +1,56 @@
+/*
+ * GetDLLVersion.nsh v1.0
+ *
+ * Author: LegendaryHawk
+ *
+ * Retrieve the version number of a DLL/EXE file and store it in a variable.
+ * The version number will look like 1.2.3.4
+ *
+ * Example:
+ * ${GetDLLVersion} $0 file.ext
+ */
+
+; --- Defines
+!ifndef GETDLLVERSION_NSH_INCLUDED
+!define GETDLLVERSION_NSH_INCLUDED
+
+; --- Includes
+!include Util.nsh
+
+!macro GetDLLVersionCall _RESULT _FILE
+    !verbose push 3
+    Push `${_FILE}`
+    ${CallArtificialFunction} GetDLLVersion_
+    Pop `${_RESULT}`
+    !verbose pop
+!macroend
+!define GetDLLVersion "!insertmacro GetDLLVersionCall"
+
+!macro GetDLLVersion_
+    !verbose push 3
+
+    ; Prepare stack and preserve variable(s)
+    Exch $0
+    Push $1
+    Push $2
+    Push $3
+    Push $4
+
+    ; Calculate version number
+    GetDllVersion $0 $1 $2
+    IntOp $3 $1 / 0x00010000
+    IntOp $1 $1 & 0x0000FFFF
+    IntOp $4 $2 / 0x00010000
+    IntOp $2 $2 & 0x0000FFFF
+    StrCpy $0 "$3.$1.$4.$2"
+
+    ; Clean-up stack and restore variable(s)
+    Pop $4
+    Pop $3
+    Pop $2
+    Pop $1
+    Exch $0
+
+    !verbose pop
+!macroend
+!endif ; GETDLLVERSION_NSH_INCLUDED
\ No newline at end of file
diff --git a/Other/Source/GetLocale.nsh b/etc/source/GetLocale.nsh
similarity index 95%
rename from Other/Source/GetLocale.nsh
rename to etc/source/GetLocale.nsh
index 20db294..8c4ea47 100644
--- a/Other/Source/GetLocale.nsh
+++ b/etc/source/GetLocale.nsh
@@ -1,75 +1,75 @@
-/*______________________________________________________________________________
- 
-                            GetLocale
-________________________________________________________________________________
-Get text between two markers in a file. 
-
-Returns text from between first occurrences of markers and then stops searching.
-It works even if the markers are or are not on the same line. 
-
-Usage 
-${GetLocale} "This" "And This" "$INSTDIR\In_This.txt" "$R0"
-; $R0 = output (text between "This", "And This").                             */
- 
-Function GetLocale
-	!macro _GetLocale _FIRSTDELIMITER _SECONDDELIMITER _FILE _RETURN
-		Push `${_FIRSTDELIMITER}`
-		Push `${_SECONDDELIMITER}`
-		Push `${_FILE}`
-		Call GetLocale
-		Pop `${_RETURN}`
-	!macroend
-	!define GetLocale `!insertmacro _GetLocale`
-	Exch $R0
-	Exch
-	Exch $R1
-	Exch 2
-	Exch $R2
-	Exch 2
-	Exch
-	Exch 2
-	Push $R3
-	Push $R4
-	Push $R5
-	Push $R6
-	Push $R7
-	Push $R8
-	FileOpen $R6 $R0 r
-	StrLen $R4 $R2
-	StrLen $R3 $R1
-	StrCpy $R0 ""
-	ClearErrors
-	FileRead $R6 $R7
-	IfErrors +22
-	StrCpy $R5 0
-	IntOp $R5 $R5 - 1
-	StrCpy $R8 $R7 $R4 $R5
-	StrCmp $R8 "" -6
-	StrCmp $R8 $R2 0 -3
-	IntOp $R5 $R5 + $R4
-	StrCpy $R7 $R7 "" $R5
-	StrCpy $R5 -1
-	Goto +5
-	ClearErrors
-	FileRead $R6 $R7
-	IfErrors +10
-	StrCpy $R5 -1
-	IntOp $R5 $R5 + 1
-	StrCpy $R8 $R7 $R3 $R5
-	StrCmp $R8 "" 0 +3
-	StrCpy $R0 $R0$R7
-	Goto -8
-	StrCmp $R8 $R1 0 -5
-	StrCpy $R7 $R7 $R5
-	StrCpy $R0 $R0$R7
-	FileClose $R6
-	Pop $R8
-	Pop $R7
-	Pop $R6
-	Pop $R5
-	Pop $R4
-	Pop $R3
-	Pop $R2
-	Pop $R1
-	Exch $R0
+/*______________________________________________________________________________
+ 
+                            GetLocale
+________________________________________________________________________________
+Get text between two markers in a file. 
+
+Returns text from between first occurrences of markers and then stops searching.
+It works even if the markers are or are not on the same line. 
+
+Usage 
+${GetLocale} "This" "And This" "$INSTDIR\In_This.txt" "$R0"
+; $R0 = output (text between "This", "And This").                             */
+ 
+Function GetLocale
+	!macro _GetLocale _FIRSTDELIMITER _SECONDDELIMITER _FILE _RETURN
+		Push `${_FIRSTDELIMITER}`
+		Push `${_SECONDDELIMITER}`
+		Push `${_FILE}`
+		Call GetLocale
+		Pop `${_RETURN}`
+	!macroend
+	!define GetLocale `!insertmacro _GetLocale`
+	Exch $R0
+	Exch
+	Exch $R1
+	Exch 2
+	Exch $R2
+	Exch 2
+	Exch
+	Exch 2
+	Push $R3
+	Push $R4
+	Push $R5
+	Push $R6
+	Push $R7
+	Push $R8
+	FileOpen $R6 $R0 r
+	StrLen $R4 $R2
+	StrLen $R3 $R1
+	StrCpy $R0 ""
+	ClearErrors
+	FileRead $R6 $R7
+	IfErrors +22
+	StrCpy $R5 0
+	IntOp $R5 $R5 - 1
+	StrCpy $R8 $R7 $R4 $R5
+	StrCmp $R8 "" -6
+	StrCmp $R8 $R2 0 -3
+	IntOp $R5 $R5 + $R4
+	StrCpy $R7 $R7 "" $R5
+	StrCpy $R5 -1
+	Goto +5
+	ClearErrors
+	FileRead $R6 $R7
+	IfErrors +10
+	StrCpy $R5 -1
+	IntOp $R5 $R5 + 1
+	StrCpy $R8 $R7 $R3 $R5
+	StrCmp $R8 "" 0 +3
+	StrCpy $R0 $R0$R7
+	Goto -8
+	StrCmp $R8 $R1 0 -5
+	StrCpy $R7 $R7 $R5
+	StrCpy $R0 $R0$R7
+	FileClose $R6
+	Pop $R8
+	Pop $R7
+	Pop $R6
+	Pop $R5
+	Pop $R4
+	Pop $R3
+	Pop $R2
+	Pop $R1
+	Exch $R0
 FunctionEnd
\ No newline at end of file
diff --git a/Other/Source/GetSection.nsh b/etc/source/GetSection.nsh
similarity index 94%
rename from Other/Source/GetSection.nsh
rename to etc/source/GetSection.nsh
index dd83182..5f7cc9d 100644
--- a/Other/Source/GetSection.nsh
+++ b/etc/source/GetSection.nsh
@@ -1,130 +1,130 @@
-/* The Function Description
-Based on the method to loop over a buffer of null-terminated strings in function "GetDrives"
- 
-Loop over all entries of a specified section in an INI file.
- 
-Syntax:
-${GetSection} "File" "Section" "Function"
- 
-"File"     ; name of the initialization file
-"Section"  ; name of the section in the initialization file
-"Function" ; Callback function
- 
-Function "Function"
-         ; $9    "key=value"
-         ; $R0-$R9  are not used (save data in them).
- 
-         ; ...
- 
-         Push $var    ; If $var="StopGetSection" Then exit from function
-FunctionEnd
-
-Example1: 
-Section
-	${GetSection} "c:\test.ini" "MySection" "Example1"
-SectionEnd
- 
-Function Example1
-	MessageBox MB_OK "$9"
- 
-	Push $0
-FunctionEnd
-
-Example2: 
-Section
-	${GetSection} "c:\test.ini" "MySection" "Example2"
-SectionEnd
- 
-Function Example2
-	StrCmp $9 $R0 0 +3
-	StrCpy $R1 $9
-	StrCpy $0 StopGetSection
- 
-	Push $0
-FunctionEnd
-*/
-
-
-
-	!define GetSection `!insertmacro GetSectionCall`
- 
-	!macro GetSectionCall _FILE _SECTION _FUNC
-		Push $0
-		Push `${_FILE}`
-		Push `${_SECTION}`
-		GetFunctionAddress $0 `${_FUNC}`
-		Push `$0`
-		Call GetSection
-		Pop $0
-	!macroend
- 
-Function GetSection
-	Exch $2
-        Exch
-	Exch $1
-	Exch
-	Exch 2
-	Exch $0
-	Exch 2
-	Push $3
-	Push $4
-	Push $5
-	Push $6
-	Push $8
-	Push $9
- 
-	System::Call *(&t1024)i.r3
-;	System::Alloc 1024
-;	Pop $3
-	StrCpy $4 $3
-
-	System::Call "kernel32::GetPrivateProfileSection(t, i, i, t)i (r1, r4, 1024, r0).r5"
- 
-	enumok:
-	System::Call 'kernel32::lstrlen(t)i (i r4).r6' ; (t) is here to trigger A/W detection
-	StrCmp $6 '0' enumex
- 
-	System::Call '*$4(&t1024 .r9)'
- 
-	Push $0
-	Push $1
-	Push $2
-	Push $3
-	Push $4
-	Push $5
-	Push $6
-	Push $8
-	Call $2
-	Pop $9
-	Pop $8
-	Pop $6
-	Pop $5
-	Pop $4
-	Pop $3
-	Pop $2
-	Pop $1
-	Pop $0
-	StrCmp $9 'StopGetSection' enumex
-
-!if "${NSIS_CHAR_SIZE}" > 1
-	IntOp $4 $4 * ${NSIS_CHAR_SIZE}
-	IntOp $4 $4 + ${NSIS_CHAR_SIZE}
-!else
-	IntOp $4 $4 + 1
-!endif
-	IntOp $3 $3 + $5
-	goto enumok
- 
-	enumex:
-	System::Free $3
- 
-	Pop $9
-	Pop $8
-	Pop $6
-	Pop $5
-	Pop $4
-	Pop $3
-	Pop $2
-	Pop $1
-	Pop $0
+/* The Function Description
+Based on the method to loop over a buffer of null-terminated strings in function "GetDrives"
+ 
+Loop over all entries of a specified section in an INI file.
+ 
+Syntax:
+${GetSection} "File" "Section" "Function"
+ 
+"File"     ; name of the initialization file
+"Section"  ; name of the section in the initialization file
+"Function" ; Callback function
+ 
+Function "Function"
+         ; $9    "key=value"
+         ; $R0-$R9  are not used (save data in them).
+ 
+         ; ...
+ 
+         Push $var    ; If $var="StopGetSection" Then exit from function
+FunctionEnd
+
+Example1: 
+Section
+	${GetSection} "c:\test.ini" "MySection" "Example1"
+SectionEnd
+ 
+Function Example1
+	MessageBox MB_OK "$9"
+ 
+	Push $0
+FunctionEnd
+
+Example2: 
+Section
+	${GetSection} "c:\test.ini" "MySection" "Example2"
+SectionEnd
+ 
+Function Example2
+	StrCmp $9 $R0 0 +3
+	StrCpy $R1 $9
+	StrCpy $0 StopGetSection
+ 
+	Push $0
+FunctionEnd
+*/
+
+
+
+	!define GetSection `!insertmacro GetSectionCall`
+ 
+	!macro GetSectionCall _FILE _SECTION _FUNC
+		Push $0
+		Push `${_FILE}`
+		Push `${_SECTION}`
+		GetFunctionAddress $0 `${_FUNC}`
+		Push `$0`
+		Call GetSection
+		Pop $0
+	!macroend
+ 
+Function GetSection
+	Exch $2
+        Exch
+	Exch $1
+	Exch
+	Exch 2
+	Exch $0
+	Exch 2
+	Push $3
+	Push $4
+	Push $5
+	Push $6
+	Push $8
+	Push $9
+ 
+	System::Call *(&t1024)i.r3
+;	System::Alloc 1024
+;	Pop $3
+	StrCpy $4 $3
+
+	System::Call "kernel32::GetPrivateProfileSection(t, i, i, t)i (r1, r4, 1024, r0).r5"
+ 
+	enumok:
+	System::Call 'kernel32::lstrlen(t)i (i r4).r6' ; (t) is here to trigger A/W detection
+	StrCmp $6 '0' enumex
+ 
+	System::Call '*$4(&t1024 .r9)'
+ 
+	Push $0
+	Push $1
+	Push $2
+	Push $3
+	Push $4
+	Push $5
+	Push $6
+	Push $8
+	Call $2
+	Pop $9
+	Pop $8
+	Pop $6
+	Pop $5
+	Pop $4
+	Pop $3
+	Pop $2
+	Pop $1
+	Pop $0
+	StrCmp $9 'StopGetSection' enumex
+
+!if "${NSIS_CHAR_SIZE}" > 1
+	IntOp $4 $4 * ${NSIS_CHAR_SIZE}
+	IntOp $4 $4 + ${NSIS_CHAR_SIZE}
+!else
+	IntOp $4 $4 + 1
+!endif
+	IntOp $3 $3 + $5
+	goto enumok
+ 
+	enumex:
+	System::Free $3
+ 
+	Pop $9
+	Pop $8
+	Pop $6
+	Pop $5
+	Pop $4
+	Pop $3
+	Pop $2
+	Pop $1
+	Pop $0
 FunctionEnd
\ No newline at end of file
diff --git a/etc/source/IsFile.nsh b/etc/source/IsFile.nsh
new file mode 100644
index 0000000..ba23770
--- /dev/null
+++ b/etc/source/IsFile.nsh
@@ -0,0 +1,117 @@
+; Azure Zanculmarktum
+;
+; IsFile
+; ------
+; Check whether the given filename is a file
+; and not a directory. The default IfFileExists
+; will consider the given filename as a file
+; even if it was directory.
+;
+; Used in combination with LogicLib.
+;
+; Example:
+; !include LogicLib.nsh
+;
+; ${If} ${IsFile} $WINDIR\notepad.exe
+;	DetailPrint "notepad is exist and it is not a directory"
+; ${EndIf}
+;
+;
+; IsDir
+; -----
+; Check whether the given filename is a directory.
+; The default IfFileExists need "\*.*" to be added
+; at the end of the given filename to make it properly
+; check if it is a directory.
+;
+; Used in combination with LogicLib.
+;
+; Example:
+; !include LogicLib.nsh
+;
+; ${If} ${IsDir} $WINDIR
+;	DetailPrint "the directory is exist and it is not a file"
+; ${EndIf}
+;
+;
+; IsDirEmpty
+; ----------
+; Check whether the given directory is completely empty.
+;
+; Used in combination with LogicLib.
+;
+; Example:
+; !include LogicLib.nsh
+;
+; ${If} ${IsDirEmpty} "C:\EmptyDir"
+;   DetailPrint "the specified directory is empty"
+; ${EndIf}
+
+!ifndef ISFILE_NSH_INCLUDED
+!define ISFILE_NSH_INCLUDED
+!macro _IsFile _a _b _t _f
+	!insertmacro _LOGICLIB_TEMP
+	StrCpy $_LOGICLIB_TEMP -1
+	IfFileExists `${_b}` "" +3
+	IfFileExists `${_b}\*.*` +2 ; be sure it's not just a directory
+	StrCpy $_LOGICLIB_TEMP 0
+	!insertmacro _= $_LOGICLIB_TEMP 0 `${_t}` `${_f}`
+!macroend
+!define IsFile `"" IsFile`
+
+!macro _IsDir _a _b _t _f
+	IfFileExists `${_b}\*.*` `${_t}` `${_f}`
+!macroend
+!define IsDir `"" IsDir`
+
+!macro _IsDirEmpty _a _b _t _f
+	!insertmacro _LOGICLIB_TEMP
+	Push `${_b}`
+	${CallArtificialFunction} IsDirEmpty_
+	Pop $_LOGICLIB_TEMP
+	!insertmacro _== $_LOGICLIB_TEMP 0 `${_t}` `${_f}`
+!macroend
+!define IsDirEmpty `"" IsDirEmpty`
+
+!macro IsDirEmpty_
+	!verbose push 3
+		Exch $0
+		Push $1
+		Push $2
+		Push $3
+
+		StrCpy $1 ""
+		StrCpy $3 ""
+
+	${__MACRO__}_Loop:
+		StrCmp $1 "" "" +3
+			FindFirst $1 $2 $0\*.*
+		Goto +2
+			FindNext $1 $2
+
+		StrCmp $2 "" ${__MACRO__}_Done
+
+		StrCpy $3 $3$2
+
+		Goto ${__MACRO__}_Loop
+
+	${__MACRO__}_Done:
+		StrCmp $3 ... ${__MACRO__}_IsEmpty ${__MACRO__}_NotEmpty
+
+	${__MACRO__}_IsEmpty:
+		StrCpy $0 0
+		Goto ${__MACRO__}_CleanUpStack
+
+	${__MACRO__}_NotEmpty:
+		StrCpy $0 -1
+
+	${__MACRO__}_CleanUpStack:
+		FindClose $1
+
+		Pop $3
+		Pop $2
+		Pop $1
+		Exch $0
+	!verbose pop
+!macroend
+!endif ; ISFILE_NSH_INCLUDED
diff --git a/Other/Source/Junction.nsh b/etc/source/Junction.nsh
similarity index 100%
rename from Other/Source/Junction.nsh
rename to etc/source/Junction.nsh
diff --git a/Other/Source/Languages.nsh b/etc/source/Languages.nsh
similarity index 63%
rename from Other/Source/Languages.nsh
rename to etc/source/Languages.nsh
index 90dcd55..581ec95 100644
--- a/Other/Source/Languages.nsh
+++ b/etc/source/Languages.nsh
@@ -1,37 +1,54 @@
-; Internal PortableApps.com Launcher languages for message boxes etc.
-; The language is set in Segments/Language.nsh (but all the addition of
-; languages is done in this file).
-
-!tempfile LangAutoDetectFile
-!macro IncludeLang _LANG
-	LoadLanguageFile "${NSISDIR}\Contrib\Language files\${_LANG}.nlf"
-	!insertmacro LANGFILE_INCLUDE_WITHDEFAULT Languages\${_LANG}.nsh Languages\English.nsh
-	!appendfile "${LangAutoDetectFile}" "${Case} ${LANG_${_LANG}}$\n"
-!macroend
-!define IncludeLang "!insertmacro IncludeLang"
-	${IncludeLang} ARABIC
-	${IncludeLang} CATALAN
-	${IncludeLang} CZECH
-	${IncludeLang} ENGLISH
-	${IncludeLang} FRENCH
-	${IncludeLang} GERMAN
-	${IncludeLang} GREEK
-	${IncludeLang} HEBREW
-	${IncludeLang} HUNGARIAN
-	${IncludeLang} ITALIAN
-	${IncludeLang} KOREAN
-	${IncludeLang} POLISH
-	${IncludeLang} PORTUGUESE
-	${IncludeLang} RUSSIAN
-	${IncludeLang} SIMPCHINESE
-	${IncludeLang} SLOVENIAN
-	${IncludeLang} SPANISH
-	${IncludeLang} SWEDISH
-	${IncludeLang} TRADCHINESE
-	${IncludeLang} TURKISH
-	${IncludeLang} UKRAINIAN
-!macro LanguageCases
-	!include "${LangAutoDetectFile}"
-	!delfile "${LangAutoDetectFile}"
-	!undef LangAutoDetectFile
-!macroend
+;=#
+; 
+; PORTABLEAPPS COMPILER 
+; Developed by daemon.devin
+;
+; For support visit the GitHub project:
+; https://github.com/demondevin/pac-man
+; 
+; SEGMENT
+;   Languages.nsh
+;   This file handles the internal languages for message boxes, etc.
+; 
+; NOTE
+;   The language is set in the Language.nsh segment.
+;   However, the addition of languages is done using this file.
+; 
+ 
+!tempfile LangAutoDetectFile
+!macro IncludeLang _LANG
+	LoadLanguageFile "${NSISDIR}\Contrib\Language files\${_LANG}.nlf"
+	!insertmacro LANGFILE_INCLUDE_WITHDEFAULT Languages\${_LANG}.nsh Languages\English.nsh
+	!appendfile "${LangAutoDetectFile}" "${Case} ${LANG_${_LANG}}$\n"
+!macroend
+!define IncludeLang "!insertmacro IncludeLang"
+	${IncludeLang} ARABIC
+	${IncludeLang} CATALAN
+	${IncludeLang} CZECH
+	${IncludeLang} DUTCH
+	${IncludeLang} ENGLISH
+	${IncludeLang} FARSI
+	${IncludeLang} FINNISH
+	${IncludeLang} FRENCH
+	${IncludeLang} GERMAN
+	${IncludeLang} GREEK
+	${IncludeLang} HUNGARIAN
+	${IncludeLang} ITALIAN
+	${IncludeLang} JAPANESE
+	${IncludeLang} KOREAN
+	${IncludeLang} POLISH
+	${IncludeLang} PORTUGUESE
+	${IncludeLang} PORTUGUESEBR
+	${IncludeLang} RUSSIAN
+	${IncludeLang} SIMPCHINESE
+	${IncludeLang} SLOVENIAN
+	${IncludeLang} SPANISH
+	${IncludeLang} SWEDISH
+	${IncludeLang} TRADCHINESE
+	${IncludeLang} TURKISH
+	${IncludeLang} VIETNAMESE
+!macro LanguageCases
+	!include "${LangAutoDetectFile}"
+	!delfile "${LangAutoDetectFile}"
+	!undef LangAutoDetectFile
+!macroend
diff --git a/Other/Source/Languages/ACHOLI.nsh b/etc/source/Languages/ACHOLI.nsh
similarity index 100%
rename from Other/Source/Languages/ACHOLI.nsh
rename to etc/source/Languages/ACHOLI.nsh
diff --git a/Other/Source/Languages/AFRIKAANS.nsh b/etc/source/Languages/AFRIKAANS.nsh
similarity index 100%
rename from Other/Source/Languages/AFRIKAANS.nsh
rename to etc/source/Languages/AFRIKAANS.nsh
diff --git a/Other/Source/Languages/ARAGONESE.nsh b/etc/source/Languages/ARAGONESE.nsh
similarity index 100%
rename from Other/Source/Languages/ARAGONESE.nsh
rename to etc/source/Languages/ARAGONESE.nsh
diff --git a/Other/Source/Languages/ARANESE.nsh b/etc/source/Languages/ARANESE.nsh
similarity index 100%
rename from Other/Source/Languages/ARANESE.nsh
rename to etc/source/Languages/ARANESE.nsh
diff --git a/Other/Source/Languages/ASSAMESE.nsh b/etc/source/Languages/ASSAMESE.nsh
similarity index 100%
rename from Other/Source/Languages/ASSAMESE.nsh
rename to etc/source/Languages/ASSAMESE.nsh
diff --git a/Other/Source/Languages/ASTURIAN.nsh b/etc/source/Languages/ASTURIAN.nsh
similarity index 100%
rename from Other/Source/Languages/ASTURIAN.nsh
rename to etc/source/Languages/ASTURIAN.nsh
diff --git a/Other/Source/Languages/AYMARA.nsh b/etc/source/Languages/AYMARA.nsh
similarity index 100%
rename from Other/Source/Languages/AYMARA.nsh
rename to etc/source/Languages/AYMARA.nsh
diff --git a/Other/Source/Languages/Afghanistan.nsh b/etc/source/Languages/Afghanistan.nsh
similarity index 100%
rename from Other/Source/Languages/Afghanistan.nsh
rename to etc/source/Languages/Afghanistan.nsh
diff --git a/Other/Source/Languages/Albanian.nsh b/etc/source/Languages/Albanian.nsh
similarity index 100%
rename from Other/Source/Languages/Albanian.nsh
rename to etc/source/Languages/Albanian.nsh
diff --git a/Other/Source/Languages/Amharic.nsh b/etc/source/Languages/Amharic.nsh
similarity index 100%
rename from Other/Source/Languages/Amharic.nsh
rename to etc/source/Languages/Amharic.nsh
diff --git a/Other/Source/Languages/Arabic.nsh b/etc/source/Languages/Arabic.nsh
similarity index 100%
rename from Other/Source/Languages/Arabic.nsh
rename to etc/source/Languages/Arabic.nsh
diff --git a/Other/Source/Languages/Armenian.nsh b/etc/source/Languages/Armenian.nsh
similarity index 100%
rename from Other/Source/Languages/Armenian.nsh
rename to etc/source/Languages/Armenian.nsh
diff --git a/Other/Source/Languages/Azerbaijani.nsh b/etc/source/Languages/Azerbaijani.nsh
similarity index 100%
rename from Other/Source/Languages/Azerbaijani.nsh
rename to etc/source/Languages/Azerbaijani.nsh
diff --git a/Other/Source/Languages/BRETON.nsh b/etc/source/Languages/BRETON.nsh
similarity index 100%
rename from Other/Source/Languages/BRETON.nsh
rename to etc/source/Languages/BRETON.nsh
diff --git a/Other/Source/Languages/Basque.nsh b/etc/source/Languages/Basque.nsh
similarity index 100%
rename from Other/Source/Languages/Basque.nsh
rename to etc/source/Languages/Basque.nsh
diff --git a/Other/Source/Languages/Belarusian.nsh b/etc/source/Languages/Belarusian.nsh
similarity index 100%
rename from Other/Source/Languages/Belarusian.nsh
rename to etc/source/Languages/Belarusian.nsh
diff --git a/Other/Source/Languages/BelarusianLatin.nsh b/etc/source/Languages/BelarusianLatin.nsh
similarity index 100%
rename from Other/Source/Languages/BelarusianLatin.nsh
rename to etc/source/Languages/BelarusianLatin.nsh
diff --git a/Other/Source/Languages/Belgium.nsh b/etc/source/Languages/Belgium.nsh
similarity index 100%
rename from Other/Source/Languages/Belgium.nsh
rename to etc/source/Languages/Belgium.nsh
diff --git a/Other/Source/Languages/Bengali.nsh b/etc/source/Languages/Bengali.nsh
similarity index 100%
rename from Other/Source/Languages/Bengali.nsh
rename to etc/source/Languages/Bengali.nsh
diff --git a/Other/Source/Languages/BengaliIndian.nsh b/etc/source/Languages/BengaliIndian.nsh
similarity index 100%
rename from Other/Source/Languages/BengaliIndian.nsh
rename to etc/source/Languages/BengaliIndian.nsh
diff --git a/Other/Source/Languages/Bosnian.nsh b/etc/source/Languages/Bosnian.nsh
similarity index 100%
rename from Other/Source/Languages/Bosnian.nsh
rename to etc/source/Languages/Bosnian.nsh
diff --git a/Other/Source/Languages/Bulgarian.nsh b/etc/source/Languages/Bulgarian.nsh
similarity index 100%
rename from Other/Source/Languages/Bulgarian.nsh
rename to etc/source/Languages/Bulgarian.nsh
diff --git a/Other/Source/Languages/Burmese.nsh b/etc/source/Languages/Burmese.nsh
similarity index 100%
rename from Other/Source/Languages/Burmese.nsh
rename to etc/source/Languages/Burmese.nsh
diff --git a/Other/Source/Languages/Catalan.nsh b/etc/source/Languages/Catalan.nsh
similarity index 100%
rename from Other/Source/Languages/Catalan.nsh
rename to etc/source/Languages/Catalan.nsh
diff --git a/Other/Source/Languages/ChineseHK.nsh b/etc/source/Languages/ChineseHK.nsh
similarity index 100%
rename from Other/Source/Languages/ChineseHK.nsh
rename to etc/source/Languages/ChineseHK.nsh
diff --git a/Other/Source/Languages/Croatian.nsh b/etc/source/Languages/Croatian.nsh
similarity index 100%
rename from Other/Source/Languages/Croatian.nsh
rename to etc/source/Languages/Croatian.nsh
diff --git a/Other/Source/Languages/Czech.nsh b/etc/source/Languages/Czech.nsh
similarity index 100%
rename from Other/Source/Languages/Czech.nsh
rename to etc/source/Languages/Czech.nsh
diff --git a/Other/Source/Languages/Danish.nsh b/etc/source/Languages/Danish.nsh
similarity index 100%
rename from Other/Source/Languages/Danish.nsh
rename to etc/source/Languages/Danish.nsh
diff --git a/Other/Source/Languages/Dutch.nsh b/etc/source/Languages/Dutch.nsh
similarity index 100%
rename from Other/Source/Languages/Dutch.nsh
rename to etc/source/Languages/Dutch.nsh
diff --git a/Other/Source/Languages/ENGLISHCA.nsh b/etc/source/Languages/ENGLISHCA.nsh
similarity index 100%
rename from Other/Source/Languages/ENGLISHCA.nsh
rename to etc/source/Languages/ENGLISHCA.nsh
diff --git a/Other/Source/Languages/ENGLISHIE.nsh b/etc/source/Languages/ENGLISHIE.nsh
similarity index 100%
rename from Other/Source/Languages/ENGLISHIE.nsh
rename to etc/source/Languages/ENGLISHIE.nsh
diff --git a/Other/Source/Languages/EXTREMADURAN.nsh b/etc/source/Languages/EXTREMADURAN.nsh
similarity index 100%
rename from Other/Source/Languages/EXTREMADURAN.nsh
rename to etc/source/Languages/EXTREMADURAN.nsh
diff --git a/Other/Source/Languages/English.nsh b/etc/source/Languages/English.nsh
similarity index 73%
rename from Other/Source/Languages/English.nsh
rename to etc/source/Languages/English.nsh
index ebd8639..5b7859c 100644
Binary files a/Other/Source/Languages/English.nsh and b/etc/source/Languages/English.nsh differ
diff --git a/Other/Source/Languages/EnglishAU.nsh b/etc/source/Languages/EnglishAU.nsh
similarity index 100%
rename from Other/Source/Languages/EnglishAU.nsh
rename to etc/source/Languages/EnglishAU.nsh
diff --git a/Other/Source/Languages/EnglishGB.nsh b/etc/source/Languages/EnglishGB.nsh
similarity index 100%
rename from Other/Source/Languages/EnglishGB.nsh
rename to etc/source/Languages/EnglishGB.nsh
diff --git a/Other/Source/Languages/EnglishSA.nsh b/etc/source/Languages/EnglishSA.nsh
similarity index 100%
rename from Other/Source/Languages/EnglishSA.nsh
rename to etc/source/Languages/EnglishSA.nsh
diff --git a/Other/Source/Languages/Esperanto.nsh b/etc/source/Languages/Esperanto.nsh
similarity index 100%
rename from Other/Source/Languages/Esperanto.nsh
rename to etc/source/Languages/Esperanto.nsh
diff --git a/Other/Source/Languages/Estonian.nsh b/etc/source/Languages/Estonian.nsh
similarity index 100%
rename from Other/Source/Languages/Estonian.nsh
rename to etc/source/Languages/Estonian.nsh
diff --git a/Other/Source/Languages/FAROESE.nsh b/etc/source/Languages/FAROESE.nsh
similarity index 100%
rename from Other/Source/Languages/FAROESE.nsh
rename to etc/source/Languages/FAROESE.nsh
diff --git a/Other/Source/Languages/FILIPINO.nsh b/etc/source/Languages/FILIPINO.nsh
similarity index 100%
rename from Other/Source/Languages/FILIPINO.nsh
rename to etc/source/Languages/FILIPINO.nsh
diff --git a/Other/Source/Languages/FRIULIAN.nsh b/etc/source/Languages/FRIULIAN.nsh
similarity index 100%
rename from Other/Source/Languages/FRIULIAN.nsh
rename to etc/source/Languages/FRIULIAN.nsh
diff --git a/Other/Source/Languages/Farsi.nsh b/etc/source/Languages/Farsi.nsh
similarity index 100%
rename from Other/Source/Languages/Farsi.nsh
rename to etc/source/Languages/Farsi.nsh
diff --git a/Other/Source/Languages/Finnish.nsh b/etc/source/Languages/Finnish.nsh
similarity index 100%
rename from Other/Source/Languages/Finnish.nsh
rename to etc/source/Languages/Finnish.nsh
diff --git a/Other/Source/Languages/French.nsh b/etc/source/Languages/French.nsh
similarity index 100%
rename from Other/Source/Languages/French.nsh
rename to etc/source/Languages/French.nsh
diff --git a/Other/Source/Languages/FrenchCA.nsh b/etc/source/Languages/FrenchCA.nsh
similarity index 100%
rename from Other/Source/Languages/FrenchCA.nsh
rename to etc/source/Languages/FrenchCA.nsh
diff --git a/Other/Source/Languages/Frisian.nsh b/etc/source/Languages/Frisian.nsh
similarity index 100%
rename from Other/Source/Languages/Frisian.nsh
rename to etc/source/Languages/Frisian.nsh
diff --git a/Other/Source/Languages/Fulah.nsh b/etc/source/Languages/Fulah.nsh
similarity index 100%
rename from Other/Source/Languages/Fulah.nsh
rename to etc/source/Languages/Fulah.nsh
diff --git a/Other/Source/Languages/Gaelic.nsh b/etc/source/Languages/Gaelic.nsh
similarity index 100%
rename from Other/Source/Languages/Gaelic.nsh
rename to etc/source/Languages/Gaelic.nsh
diff --git a/Other/Source/Languages/Galician.nsh b/etc/source/Languages/Galician.nsh
similarity index 100%
rename from Other/Source/Languages/Galician.nsh
rename to etc/source/Languages/Galician.nsh
diff --git a/Other/Source/Languages/Georgian.nsh b/etc/source/Languages/Georgian.nsh
similarity index 100%
rename from Other/Source/Languages/Georgian.nsh
rename to etc/source/Languages/Georgian.nsh
diff --git a/Other/Source/Languages/German.nsh b/etc/source/Languages/German.nsh
similarity index 100%
rename from Other/Source/Languages/German.nsh
rename to etc/source/Languages/German.nsh
diff --git a/Other/Source/Languages/GermanCH.nsh b/etc/source/Languages/GermanCH.nsh
similarity index 100%
rename from Other/Source/Languages/GermanCH.nsh
rename to etc/source/Languages/GermanCH.nsh
diff --git a/Other/Source/Languages/GermanLow.nsh b/etc/source/Languages/GermanLow.nsh
similarity index 100%
rename from Other/Source/Languages/GermanLow.nsh
rename to etc/source/Languages/GermanLow.nsh
diff --git a/Other/Source/Languages/Greek.nsh b/etc/source/Languages/Greek.nsh
similarity index 100%
rename from Other/Source/Languages/Greek.nsh
rename to etc/source/Languages/Greek.nsh
diff --git a/Other/Source/Languages/Gujarati.nsh b/etc/source/Languages/Gujarati.nsh
similarity index 100%
rename from Other/Source/Languages/Gujarati.nsh
rename to etc/source/Languages/Gujarati.nsh
diff --git a/Other/Source/Languages/Hebrew.nsh b/etc/source/Languages/Hebrew.nsh
similarity index 100%
rename from Other/Source/Languages/Hebrew.nsh
rename to etc/source/Languages/Hebrew.nsh
diff --git a/Other/Source/Languages/Hindi.nsh b/etc/source/Languages/Hindi.nsh
similarity index 100%
rename from Other/Source/Languages/Hindi.nsh
rename to etc/source/Languages/Hindi.nsh
diff --git a/Other/Source/Languages/Hungarian.nsh b/etc/source/Languages/Hungarian.nsh
similarity index 100%
rename from Other/Source/Languages/Hungarian.nsh
rename to etc/source/Languages/Hungarian.nsh
diff --git a/Other/Source/Languages/INTERLINGUA.nsh b/etc/source/Languages/INTERLINGUA.nsh
similarity index 100%
rename from Other/Source/Languages/INTERLINGUA.nsh
rename to etc/source/Languages/INTERLINGUA.nsh
diff --git a/Other/Source/Languages/Icelandic.nsh b/etc/source/Languages/Icelandic.nsh
similarity index 100%
rename from Other/Source/Languages/Icelandic.nsh
rename to etc/source/Languages/Icelandic.nsh
diff --git a/Other/Source/Languages/Indonesian.nsh b/etc/source/Languages/Indonesian.nsh
similarity index 100%
rename from Other/Source/Languages/Indonesian.nsh
rename to etc/source/Languages/Indonesian.nsh
diff --git a/Other/Source/Languages/Irish.nsh b/etc/source/Languages/Irish.nsh
similarity index 100%
rename from Other/Source/Languages/Irish.nsh
rename to etc/source/Languages/Irish.nsh
diff --git a/Other/Source/Languages/Italian.nsh b/etc/source/Languages/Italian.nsh
similarity index 100%
rename from Other/Source/Languages/Italian.nsh
rename to etc/source/Languages/Italian.nsh
diff --git a/Other/Source/Languages/Japanese.nsh b/etc/source/Languages/Japanese.nsh
similarity index 100%
rename from Other/Source/Languages/Japanese.nsh
rename to etc/source/Languages/Japanese.nsh
diff --git a/Other/Source/Languages/KABYLE.nsh b/etc/source/Languages/KABYLE.nsh
similarity index 100%
rename from Other/Source/Languages/KABYLE.nsh
rename to etc/source/Languages/KABYLE.nsh
diff --git a/Other/Source/Languages/KYRGYZ.nsh b/etc/source/Languages/KYRGYZ.nsh
similarity index 100%
rename from Other/Source/Languages/KYRGYZ.nsh
rename to etc/source/Languages/KYRGYZ.nsh
diff --git a/Other/Source/Languages/Kabardian.nsh b/etc/source/Languages/Kabardian.nsh
similarity index 100%
rename from Other/Source/Languages/Kabardian.nsh
rename to etc/source/Languages/Kabardian.nsh
diff --git a/Other/Source/Languages/Kannada.nsh b/etc/source/Languages/Kannada.nsh
similarity index 100%
rename from Other/Source/Languages/Kannada.nsh
rename to etc/source/Languages/Kannada.nsh
diff --git a/Other/Source/Languages/Kazakh.nsh b/etc/source/Languages/Kazakh.nsh
similarity index 100%
rename from Other/Source/Languages/Kazakh.nsh
rename to etc/source/Languages/Kazakh.nsh
diff --git a/Other/Source/Languages/Khmer.nsh b/etc/source/Languages/Khmer.nsh
similarity index 100%
rename from Other/Source/Languages/Khmer.nsh
rename to etc/source/Languages/Khmer.nsh
diff --git a/Other/Source/Languages/Korean.nsh b/etc/source/Languages/Korean.nsh
similarity index 100%
rename from Other/Source/Languages/Korean.nsh
rename to etc/source/Languages/Korean.nsh
diff --git a/Other/Source/Languages/Kurdish.nsh b/etc/source/Languages/Kurdish.nsh
similarity index 100%
rename from Other/Source/Languages/Kurdish.nsh
rename to etc/source/Languages/Kurdish.nsh
diff --git a/Other/Source/Languages/LIGURIAN.nsh b/etc/source/Languages/LIGURIAN.nsh
similarity index 100%
rename from Other/Source/Languages/LIGURIAN.nsh
rename to etc/source/Languages/LIGURIAN.nsh
diff --git a/Other/Source/Languages/LOJBAN.nsh b/etc/source/Languages/LOJBAN.nsh
similarity index 100%
rename from Other/Source/Languages/LOJBAN.nsh
rename to etc/source/Languages/LOJBAN.nsh
diff --git a/Other/Source/Languages/LUXEMBOURGISH.nsh b/etc/source/Languages/LUXEMBOURGISH.nsh
similarity index 100%
rename from Other/Source/Languages/LUXEMBOURGISH.nsh
rename to etc/source/Languages/LUXEMBOURGISH.nsh
diff --git a/Other/Source/Languages/Latin.nsh b/etc/source/Languages/Latin.nsh
similarity index 100%
rename from Other/Source/Languages/Latin.nsh
rename to etc/source/Languages/Latin.nsh
diff --git a/Other/Source/Languages/Latvian.nsh b/etc/source/Languages/Latvian.nsh
similarity index 100%
rename from Other/Source/Languages/Latvian.nsh
rename to etc/source/Languages/Latvian.nsh
diff --git a/Other/Source/Languages/Lithuanian.nsh b/etc/source/Languages/Lithuanian.nsh
similarity index 100%
rename from Other/Source/Languages/Lithuanian.nsh
rename to etc/source/Languages/Lithuanian.nsh
diff --git a/Other/Source/Languages/LowerSorbian.nsh b/etc/source/Languages/LowerSorbian.nsh
similarity index 100%
rename from Other/Source/Languages/LowerSorbian.nsh
rename to etc/source/Languages/LowerSorbian.nsh
diff --git a/Other/Source/Languages/MAITHILI.nsh b/etc/source/Languages/MAITHILI.nsh
similarity index 100%
rename from Other/Source/Languages/MAITHILI.nsh
rename to etc/source/Languages/MAITHILI.nsh
diff --git a/Other/Source/Languages/MALAGASY.nsh b/etc/source/Languages/MALAGASY.nsh
similarity index 100%
rename from Other/Source/Languages/MALAGASY.nsh
rename to etc/source/Languages/MALAGASY.nsh
diff --git a/Other/Source/Languages/MANDINKA.nsh b/etc/source/Languages/MANDINKA.nsh
similarity index 100%
rename from Other/Source/Languages/MANDINKA.nsh
rename to etc/source/Languages/MANDINKA.nsh
diff --git a/Other/Source/Languages/MARSHALLESE.nsh b/etc/source/Languages/MARSHALLESE.nsh
similarity index 100%
rename from Other/Source/Languages/MARSHALLESE.nsh
rename to etc/source/Languages/MARSHALLESE.nsh
diff --git a/Other/Source/Languages/Macedonian.nsh b/etc/source/Languages/Macedonian.nsh
similarity index 100%
rename from Other/Source/Languages/Macedonian.nsh
rename to etc/source/Languages/Macedonian.nsh
diff --git a/Other/Source/Languages/Malay.nsh b/etc/source/Languages/Malay.nsh
similarity index 100%
rename from Other/Source/Languages/Malay.nsh
rename to etc/source/Languages/Malay.nsh
diff --git a/Other/Source/Languages/Malayalam.nsh b/etc/source/Languages/Malayalam.nsh
similarity index 100%
rename from Other/Source/Languages/Malayalam.nsh
rename to etc/source/Languages/Malayalam.nsh
diff --git a/Other/Source/Languages/Maltese.nsh b/etc/source/Languages/Maltese.nsh
similarity index 100%
rename from Other/Source/Languages/Maltese.nsh
rename to etc/source/Languages/Maltese.nsh
diff --git a/Other/Source/Languages/Marathi.nsh b/etc/source/Languages/Marathi.nsh
similarity index 100%
rename from Other/Source/Languages/Marathi.nsh
rename to etc/source/Languages/Marathi.nsh
diff --git a/Other/Source/Languages/Mongolian.nsh b/etc/source/Languages/Mongolian.nsh
similarity index 100%
rename from Other/Source/Languages/Mongolian.nsh
rename to etc/source/Languages/Mongolian.nsh
diff --git a/Other/Source/Languages/Montenegro.nsh b/etc/source/Languages/Montenegro.nsh
similarity index 100%
rename from Other/Source/Languages/Montenegro.nsh
rename to etc/source/Languages/Montenegro.nsh
diff --git a/Other/Source/Languages/Moroccan.nsh b/etc/source/Languages/Moroccan.nsh
similarity index 100%
rename from Other/Source/Languages/Moroccan.nsh
rename to etc/source/Languages/Moroccan.nsh
diff --git a/Other/Source/Languages/Nepali.nsh b/etc/source/Languages/Nepali.nsh
similarity index 100%
rename from Other/Source/Languages/Nepali.nsh
rename to etc/source/Languages/Nepali.nsh
diff --git a/Other/Source/Languages/Norwegian.nsh b/etc/source/Languages/Norwegian.nsh
similarity index 100%
rename from Other/Source/Languages/Norwegian.nsh
rename to etc/source/Languages/Norwegian.nsh
diff --git a/Other/Source/Languages/NorwegianNynorsk.nsh b/etc/source/Languages/NorwegianNynorsk.nsh
similarity index 100%
rename from Other/Source/Languages/NorwegianNynorsk.nsh
rename to etc/source/Languages/NorwegianNynorsk.nsh
diff --git a/Other/Source/Languages/ORURO.nsh b/etc/source/Languages/ORURO.nsh
similarity index 100%
rename from Other/Source/Languages/ORURO.nsh
rename to etc/source/Languages/ORURO.nsh
diff --git a/Other/Source/Languages/Occitan.nsh b/etc/source/Languages/Occitan.nsh
similarity index 100%
rename from Other/Source/Languages/Occitan.nsh
rename to etc/source/Languages/Occitan.nsh
diff --git a/Other/Source/Languages/Oriya.nsh b/etc/source/Languages/Oriya.nsh
similarity index 100%
rename from Other/Source/Languages/Oriya.nsh
rename to etc/source/Languages/Oriya.nsh
diff --git a/Other/Source/Languages/PUNJABI.nsh b/etc/source/Languages/PUNJABI.nsh
similarity index 100%
rename from Other/Source/Languages/PUNJABI.nsh
rename to etc/source/Languages/PUNJABI.nsh
diff --git a/Other/Source/Languages/Pashto.nsh b/etc/source/Languages/Pashto.nsh
similarity index 100%
rename from Other/Source/Languages/Pashto.nsh
rename to etc/source/Languages/Pashto.nsh
diff --git a/Other/Source/Languages/Polish.nsh b/etc/source/Languages/Polish.nsh
similarity index 100%
rename from Other/Source/Languages/Polish.nsh
rename to etc/source/Languages/Polish.nsh
diff --git a/Other/Source/Languages/Portuguese.nsh b/etc/source/Languages/Portuguese.nsh
similarity index 100%
rename from Other/Source/Languages/Portuguese.nsh
rename to etc/source/Languages/Portuguese.nsh
diff --git a/Other/Source/Languages/PortugueseBR.nsh b/etc/source/Languages/PortugueseBR.nsh
similarity index 100%
rename from Other/Source/Languages/PortugueseBR.nsh
rename to etc/source/Languages/PortugueseBR.nsh
diff --git a/Other/Source/Languages/QUECHUA.nsh b/etc/source/Languages/QUECHUA.nsh
similarity index 100%
rename from Other/Source/Languages/QUECHUA.nsh
rename to etc/source/Languages/QUECHUA.nsh
diff --git a/Other/Source/Languages/QUECHUAPE.nsh b/etc/source/Languages/QUECHUAPE.nsh
similarity index 100%
rename from Other/Source/Languages/QUECHUAPE.nsh
rename to etc/source/Languages/QUECHUAPE.nsh
diff --git a/Other/Source/Languages/ROMANSH.nsh b/etc/source/Languages/ROMANSH.nsh
similarity index 100%
rename from Other/Source/Languages/ROMANSH.nsh
rename to etc/source/Languages/ROMANSH.nsh
diff --git a/Other/Source/Languages/Romanian.nsh b/etc/source/Languages/Romanian.nsh
similarity index 100%
rename from Other/Source/Languages/Romanian.nsh
rename to etc/source/Languages/Romanian.nsh
diff --git a/Other/Source/Languages/Russian.nsh b/etc/source/Languages/Russian.nsh
similarity index 100%
rename from Other/Source/Languages/Russian.nsh
rename to etc/source/Languages/Russian.nsh
diff --git a/Other/Source/Languages/SAMOGITIAN.nsh b/etc/source/Languages/SAMOGITIAN.nsh
similarity index 100%
rename from Other/Source/Languages/SAMOGITIAN.nsh
rename to etc/source/Languages/SAMOGITIAN.nsh
diff --git a/Other/Source/Languages/SARDINIAN.nsh b/etc/source/Languages/SARDINIAN.nsh
similarity index 100%
rename from Other/Source/Languages/SARDINIAN.nsh
rename to etc/source/Languages/SARDINIAN.nsh
diff --git a/Other/Source/Languages/Serbian.nsh b/etc/source/Languages/Serbian.nsh
similarity index 100%
rename from Other/Source/Languages/Serbian.nsh
rename to etc/source/Languages/Serbian.nsh
diff --git a/Other/Source/Languages/SerbianLatin.nsh b/etc/source/Languages/SerbianLatin.nsh
similarity index 100%
rename from Other/Source/Languages/SerbianLatin.nsh
rename to etc/source/Languages/SerbianLatin.nsh
diff --git a/Other/Source/Languages/SimpChinese.nsh b/etc/source/Languages/SimpChinese.nsh
similarity index 100%
rename from Other/Source/Languages/SimpChinese.nsh
rename to etc/source/Languages/SimpChinese.nsh
diff --git a/Other/Source/Languages/Sinhalese.nsh b/etc/source/Languages/Sinhalese.nsh
similarity index 100%
rename from Other/Source/Languages/Sinhalese.nsh
rename to etc/source/Languages/Sinhalese.nsh
diff --git a/Other/Source/Languages/Slovak.nsh b/etc/source/Languages/Slovak.nsh
similarity index 100%
rename from Other/Source/Languages/Slovak.nsh
rename to etc/source/Languages/Slovak.nsh
diff --git a/Other/Source/Languages/Slovenian.nsh b/etc/source/Languages/Slovenian.nsh
similarity index 100%
rename from Other/Source/Languages/Slovenian.nsh
rename to etc/source/Languages/Slovenian.nsh
diff --git a/Other/Source/Languages/Songhai.nsh b/etc/source/Languages/Songhai.nsh
similarity index 100%
rename from Other/Source/Languages/Songhai.nsh
rename to etc/source/Languages/Songhai.nsh
diff --git a/Other/Source/Languages/Sorbian.nsh b/etc/source/Languages/Sorbian.nsh
similarity index 100%
rename from Other/Source/Languages/Sorbian.nsh
rename to etc/source/Languages/Sorbian.nsh
diff --git a/Other/Source/Languages/Spanish.nsh b/etc/source/Languages/Spanish.nsh
similarity index 100%
rename from Other/Source/Languages/Spanish.nsh
rename to etc/source/Languages/Spanish.nsh
diff --git a/Other/Source/Languages/SpanishArgentina.nsh b/etc/source/Languages/SpanishArgentina.nsh
similarity index 100%
rename from Other/Source/Languages/SpanishArgentina.nsh
rename to etc/source/Languages/SpanishArgentina.nsh
diff --git a/Other/Source/Languages/SpanishChile.nsh b/etc/source/Languages/SpanishChile.nsh
similarity index 100%
rename from Other/Source/Languages/SpanishChile.nsh
rename to etc/source/Languages/SpanishChile.nsh
diff --git a/Other/Source/Languages/SpanishInternational.nsh b/etc/source/Languages/SpanishInternational.nsh
similarity index 100%
rename from Other/Source/Languages/SpanishInternational.nsh
rename to etc/source/Languages/SpanishInternational.nsh
diff --git a/Other/Source/Languages/SpanishMX.nsh b/etc/source/Languages/SpanishMX.nsh
similarity index 100%
rename from Other/Source/Languages/SpanishMX.nsh
rename to etc/source/Languages/SpanishMX.nsh
diff --git a/Other/Source/Languages/Sundanese.nsh b/etc/source/Languages/Sundanese.nsh
similarity index 100%
rename from Other/Source/Languages/Sundanese.nsh
rename to etc/source/Languages/Sundanese.nsh
diff --git a/Other/Source/Languages/Swahili.nsh b/etc/source/Languages/Swahili.nsh
similarity index 100%
rename from Other/Source/Languages/Swahili.nsh
rename to etc/source/Languages/Swahili.nsh
diff --git a/Other/Source/Languages/Swedish.nsh b/etc/source/Languages/Swedish.nsh
similarity index 100%
rename from Other/Source/Languages/Swedish.nsh
rename to etc/source/Languages/Swedish.nsh
diff --git a/Other/Source/Languages/SwedishFI.nsh b/etc/source/Languages/SwedishFI.nsh
similarity index 100%
rename from Other/Source/Languages/SwedishFI.nsh
rename to etc/source/Languages/SwedishFI.nsh
diff --git a/Other/Source/Languages/Taiwan.nsh b/etc/source/Languages/Taiwan.nsh
similarity index 100%
rename from Other/Source/Languages/Taiwan.nsh
rename to etc/source/Languages/Taiwan.nsh
diff --git a/Other/Source/Languages/Tajik.nsh b/etc/source/Languages/Tajik.nsh
similarity index 100%
rename from Other/Source/Languages/Tajik.nsh
rename to etc/source/Languages/Tajik.nsh
diff --git a/Other/Source/Languages/Tamil.nsh b/etc/source/Languages/Tamil.nsh
similarity index 100%
rename from Other/Source/Languages/Tamil.nsh
rename to etc/source/Languages/Tamil.nsh
diff --git a/Other/Source/Languages/Tatar.nsh b/etc/source/Languages/Tatar.nsh
similarity index 100%
rename from Other/Source/Languages/Tatar.nsh
rename to etc/source/Languages/Tatar.nsh
diff --git a/Other/Source/Languages/Telugu.nsh b/etc/source/Languages/Telugu.nsh
similarity index 100%
rename from Other/Source/Languages/Telugu.nsh
rename to etc/source/Languages/Telugu.nsh
diff --git a/Other/Source/Languages/Thai.nsh b/etc/source/Languages/Thai.nsh
similarity index 100%
rename from Other/Source/Languages/Thai.nsh
rename to etc/source/Languages/Thai.nsh
diff --git a/Other/Source/Languages/TradChinese.nsh b/etc/source/Languages/TradChinese.nsh
similarity index 100%
rename from Other/Source/Languages/TradChinese.nsh
rename to etc/source/Languages/TradChinese.nsh
diff --git a/Other/Source/Languages/Turkish.nsh b/etc/source/Languages/Turkish.nsh
similarity index 100%
rename from Other/Source/Languages/Turkish.nsh
rename to etc/source/Languages/Turkish.nsh
diff --git a/Other/Source/Languages/Turkmen.nsh b/etc/source/Languages/Turkmen.nsh
similarity index 100%
rename from Other/Source/Languages/Turkmen.nsh
rename to etc/source/Languages/Turkmen.nsh
diff --git a/Other/Source/Languages/URDU.nsh b/etc/source/Languages/URDU.nsh
similarity index 100%
rename from Other/Source/Languages/URDU.nsh
rename to etc/source/Languages/URDU.nsh
diff --git a/Other/Source/Languages/UYGHUR.nsh b/etc/source/Languages/UYGHUR.nsh
similarity index 100%
rename from Other/Source/Languages/UYGHUR.nsh
rename to etc/source/Languages/UYGHUR.nsh
diff --git a/Other/Source/Languages/Ukrainian.nsh b/etc/source/Languages/Ukrainian.nsh
similarity index 100%
rename from Other/Source/Languages/Ukrainian.nsh
rename to etc/source/Languages/Ukrainian.nsh
diff --git a/Other/Source/Languages/Uzbek.nsh b/etc/source/Languages/Uzbek.nsh
similarity index 100%
rename from Other/Source/Languages/Uzbek.nsh
rename to etc/source/Languages/Uzbek.nsh
diff --git a/Other/Source/Languages/UzbekLatin.nsh b/etc/source/Languages/UzbekLatin.nsh
similarity index 100%
rename from Other/Source/Languages/UzbekLatin.nsh
rename to etc/source/Languages/UzbekLatin.nsh
diff --git a/Other/Source/Languages/Valencian.nsh b/etc/source/Languages/Valencian.nsh
similarity index 100%
rename from Other/Source/Languages/Valencian.nsh
rename to etc/source/Languages/Valencian.nsh
diff --git a/Other/Source/Languages/ValencianRACV.nsh b/etc/source/Languages/ValencianRACV.nsh
similarity index 100%
rename from Other/Source/Languages/ValencianRACV.nsh
rename to etc/source/Languages/ValencianRACV.nsh
diff --git a/Other/Source/Languages/Vietnamese.nsh b/etc/source/Languages/Vietnamese.nsh
similarity index 100%
rename from Other/Source/Languages/Vietnamese.nsh
rename to etc/source/Languages/Vietnamese.nsh
diff --git a/Other/Source/Languages/WOLOF.nsh b/etc/source/Languages/WOLOF.nsh
similarity index 100%
rename from Other/Source/Languages/WOLOF.nsh
rename to etc/source/Languages/WOLOF.nsh
diff --git a/Other/Source/Languages/Walloon.nsh b/etc/source/Languages/Walloon.nsh
similarity index 100%
rename from Other/Source/Languages/Walloon.nsh
rename to etc/source/Languages/Walloon.nsh
diff --git a/Other/Source/Languages/Welsh.nsh b/etc/source/Languages/Welsh.nsh
similarity index 100%
rename from Other/Source/Languages/Welsh.nsh
rename to etc/source/Languages/Welsh.nsh
diff --git a/Other/Source/Languages/Xhosa.nsh b/etc/source/Languages/Xhosa.nsh
similarity index 100%
rename from Other/Source/Languages/Xhosa.nsh
rename to etc/source/Languages/Xhosa.nsh
diff --git a/Other/Source/Languages/YIDDISH.nsh b/etc/source/Languages/YIDDISH.nsh
similarity index 100%
rename from Other/Source/Languages/YIDDISH.nsh
rename to etc/source/Languages/YIDDISH.nsh
diff --git a/Other/Source/Languages/_.nsh b/etc/source/Languages/_.nsh
similarity index 100%
rename from Other/Source/Languages/_.nsh
rename to etc/source/Languages/_.nsh
diff --git a/Other/Source/LineWrite.nsh b/etc/source/LineWrite.nsh
similarity index 94%
rename from Other/Source/LineWrite.nsh
rename to etc/source/LineWrite.nsh
index 3c69401..0b6e181 100644
--- a/Other/Source/LineWrite.nsh
+++ b/etc/source/LineWrite.nsh
@@ -1,46 +1,46 @@
-Function LineWrite
-	!macro _LineWrite _FILE _LINE _STRING
-		Push ${_STRING}
-		Push ${_LINE}
-		Push ${_FILE}
-		Call LineWrite
-	!macroend
-	!define LineWrite "!insertmacro _LineWrite"
-	Exch $0 ;file
-	Exch
-	Exch $1 ;line number
-	Exch 2
-	Exch $2 ;string to write
-	Exch 2
-	Push $3
-	Push $4
-	Push $5
-	Push $6
-	Push $7
-	GetTempFileName $7
-	FileOpen $4 $0 r
-	FileOpen $5 $7 w
-	StrCpy $3 0
-	ClearErrors
-	FileRead $4 $6
-	IfErrors +7
-	IntOp $3 $3 + 1
-	StrCmp $3 $1 0 +3
-	;FileWrite $5 "$2$\r$\n$6" ;=== APPEND TEXT
-	FileWrite $5 "$2$\r$\n"    ;=== REPLACE TEXT
-	Goto -6
-	FileWrite $5 $6
-	Goto -8
-	FileClose $5
-	FileClose $4
-	Delete $0
-	Rename $7 $0
-	Pop $7
-	Pop $6
-	Pop $5
-	Pop $4
-	Pop $3
-	Pop $2
-	Pop $1
-	Pop $0
+Function LineWrite
+	!macro _LineWrite _FILE _LINE _STRING
+		Push ${_STRING}
+		Push ${_LINE}
+		Push ${_FILE}
+		Call LineWrite
+	!macroend
+	!define LineWrite "!insertmacro _LineWrite"
+	Exch $0 ;file
+	Exch
+	Exch $1 ;line number
+	Exch 2
+	Exch $2 ;string to write
+	Exch 2
+	Push $3
+	Push $4
+	Push $5
+	Push $6
+	Push $7
+	GetTempFileName $7
+	FileOpen $4 $0 r
+	FileOpen $5 $7 w
+	StrCpy $3 0
+	ClearErrors
+	FileRead $4 $6
+	IfErrors +7
+	IntOp $3 $3 + 1
+	StrCmp $3 $1 0 +3
+	;FileWrite $5 "$2$\r$\n$6" ;=== APPEND TEXT
+	FileWrite $5 "$2$\r$\n"    ;=== REPLACE TEXT
+	Goto -6
+	FileWrite $5 $6
+	Goto -8
+	FileClose $5
+	FileClose $4
+	Delete $0
+	Rename $7 $0
+	Pop $7
+	Pop $6
+	Pop $5
+	Pop $4
+	Pop $3
+	Pop $2
+	Pop $1
+	Pop $0
 FunctionEnd
\ No newline at end of file
diff --git a/Other/Source/LogicLibAdditions.nsh b/etc/source/LogicLibAdditions.nsh
similarity index 100%
rename from Other/Source/LogicLibAdditions.nsh
rename to etc/source/LogicLibAdditions.nsh
diff --git a/Other/Source/Manual/Makefile b/etc/source/Manual/Makefile
similarity index 100%
rename from Other/Source/Manual/Makefile
rename to etc/source/Manual/Makefile
diff --git a/Other/Source/Manual/_ext/paldocs.py b/etc/source/Manual/_ext/paldocs.py
similarity index 100%
rename from Other/Source/Manual/_ext/paldocs.py
rename to etc/source/Manual/_ext/paldocs.py
diff --git a/Other/Source/Manual/_static/default.css b/etc/source/Manual/_static/default.css
similarity index 100%
rename from Other/Source/Manual/_static/default.css
rename to etc/source/Manual/_static/default.css
diff --git a/Other/Help/images/donation_button.png b/etc/source/Manual/_static/donation_button.png
similarity index 100%
rename from Other/Help/images/donation_button.png
rename to etc/source/Manual/_static/donation_button.png
diff --git a/Other/Source/Manual/_static/embedded.css b/etc/source/Manual/_static/embedded.css
similarity index 100%
rename from Other/Source/Manual/_static/embedded.css
rename to etc/source/Manual/_static/embedded.css
diff --git a/Other/Help/images/favicon.ico b/etc/source/Manual/_static/favicon.ico
similarity index 100%
rename from Other/Help/images/favicon.ico
rename to etc/source/Manual/_static/favicon.ico
diff --git a/Other/Help/images/help_background_footer.png b/etc/source/Manual/_static/help_background_footer.png
similarity index 100%
rename from Other/Help/images/help_background_footer.png
rename to etc/source/Manual/_static/help_background_footer.png
diff --git a/Other/Help/images/help_background_header.png b/etc/source/Manual/_static/help_background_header.png
similarity index 100%
rename from Other/Help/images/help_background_header.png
rename to etc/source/Manual/_static/help_background_header.png
diff --git a/Other/Help/images/help_logo_top.png b/etc/source/Manual/_static/help_logo_top.png
similarity index 100%
rename from Other/Help/images/help_logo_top.png
rename to etc/source/Manual/_static/help_logo_top.png
diff --git a/Other/Source/Manual/_static/support_oxygen.png b/etc/source/Manual/_static/support_oxygen.png
similarity index 100%
rename from Other/Source/Manual/_static/support_oxygen.png
rename to etc/source/Manual/_static/support_oxygen.png
diff --git a/Other/Source/Manual/_templates/genindex.html b/etc/source/Manual/_templates/genindex.html
similarity index 100%
rename from Other/Source/Manual/_templates/genindex.html
rename to etc/source/Manual/_templates/genindex.html
diff --git a/Other/Source/Manual/_templates/layout.html b/etc/source/Manual/_templates/layout.html
similarity index 100%
rename from Other/Source/Manual/_templates/layout.html
rename to etc/source/Manual/_templates/layout.html
diff --git a/Other/Source/Manual/_templates/search.html b/etc/source/Manual/_templates/search.html
similarity index 100%
rename from Other/Source/Manual/_templates/search.html
rename to etc/source/Manual/_templates/search.html
diff --git a/Other/Source/Manual/advanced/custom.rst b/etc/source/Manual/advanced/custom.rst
similarity index 100%
rename from Other/Source/Manual/advanced/custom.rst
rename to etc/source/Manual/advanced/custom.rst
diff --git a/Other/Source/Manual/advanced/debug.rst b/etc/source/Manual/advanced/debug.rst
similarity index 100%
rename from Other/Source/Manual/advanced/debug.rst
rename to etc/source/Manual/advanced/debug.rst
diff --git a/Other/Source/Manual/advanced/development.rst b/etc/source/Manual/advanced/development.rst
similarity index 100%
rename from Other/Source/Manual/advanced/development.rst
rename to etc/source/Manual/advanced/development.rst
diff --git a/Other/Source/Manual/advanced/index.rst b/etc/source/Manual/advanced/index.rst
similarity index 100%
rename from Other/Source/Manual/advanced/index.rst
rename to etc/source/Manual/advanced/index.rst
diff --git a/Other/Source/Manual/advanced/segments.rst b/etc/source/Manual/advanced/segments.rst
similarity index 100%
rename from Other/Source/Manual/advanced/segments.rst
rename to etc/source/Manual/advanced/segments.rst
diff --git a/Other/Source/Manual/conf.py b/etc/source/Manual/conf.py
similarity index 100%
rename from Other/Source/Manual/conf.py
rename to etc/source/Manual/conf.py
diff --git a/Other/Source/Manual/contents.rst b/etc/source/Manual/contents.rst
similarity index 100%
rename from Other/Source/Manual/contents.rst
rename to etc/source/Manual/contents.rst
diff --git a/Other/Source/Manual/examples/7-zip.rst b/etc/source/Manual/examples/7-zip.rst
similarity index 100%
rename from Other/Source/Manual/examples/7-zip.rst
rename to etc/source/Manual/examples/7-zip.rst
diff --git a/Other/Source/Manual/examples/index.rst b/etc/source/Manual/examples/index.rst
similarity index 100%
rename from Other/Source/Manual/examples/index.rst
rename to etc/source/Manual/examples/index.rst
diff --git a/Other/Source/Manual/examples/scribus.rst b/etc/source/Manual/examples/scribus.rst
similarity index 97%
rename from Other/Source/Manual/examples/scribus.rst
rename to etc/source/Manual/examples/scribus.rst
index 0460c01..275c2d6 100644
--- a/Other/Source/Manual/examples/scribus.rst
+++ b/etc/source/Manual/examples/scribus.rst
@@ -1,66 +1,66 @@
-.. _examples-scribus:
-
-Worked Example: Scribus
-=======================
-
-The :ref:`AppID <paf-appinfo-appid>` of Scribus is ``ScribusPortable``,
-and so the launcher executable is named ``ScribusPortable.exe`` and the
-launcher configuration file is in
-``App\AppInfo\Launcher\ScribusPortable.ini``.
-
-The main Scribus executable to be launched is ``Scribus.exe``, and it lives in
-``App\Scribus``. Thus the :ini-key:`ProgramExecutable` will be
-``Scribus\Scribus.exe``.
-
-With a little bit of guesswork and/or looking around, it can be seen that
-Scribus stores its settings in the filesystem, in the path specified by the
-environment variable ``HOME`` if it is found. This is a "safe" environment
-variable to set, and so there will be an :ini-section:`[Environment]` pair
-``HOME=%PAL:DataDir%`` to get it to store its settings in the Data directory.
-
-In this directory another directory is created, ``.scribus``, and in that a
-file ``scribus13.rc`` which contains the Scribus settings. Among various other
-settings, an MRU (Most Recently Used) file list is maintained, which (I think)
-can store paths with a backslash separator and a forward slash separator -- so
-there may be paths in like ``X:\Documents\...`` and ``X:/Documents/...``.  To
-update the drive letter in this file is the work of two
-:ini-section:`[FileWriteN]` sections (one to do each slash style).
-
-One last thing: Ghostscript is required, and will be included in the
-``App\Ghostscript`` directory. For Scribus to be able to detect this, it will
-need to be added with an :ini-section:`[Environment]` pair.
-
-From the information above, here is a fully functional sample launcher file,
-configured correctly for Scribus Portable:
-
-.. code-block:: ini
-
-   [Launch]
-   ProgramExecutable=Scribus\Scribus.exe
-   WaitForProgram=false
-   
-   [FileWrite1]
-   Type=replace
-   File=%PAL:DataDir%\.scribus\scribus13.rc
-   Find=%PAL:LastDrive%\
-   Replace=%PAL:Drive%\
-   
-   [FileWrite2]
-   Type=replace
-   File=%PAL:DataDir%\.scribus\scribus13.rc
-   Find=%PAL:LastDrive%/
-   Replace=%PAL:Drive%/
-   
-   [Environment]
-   PATH=%PAL:AppDir%\Ghostscript;%PATH%
-   HOME=%PAL:DataDir%
-
-To outline what this actually does: it inserts the App\\Ghostscript directory
-into the start of the environment variable PATH, sets the environment variable
-HOME to the Data directory, updates drive letters in
-Data\\.scribus\\scribus13.rc, then runs ``App\Scribus\Scribus.exe``. Without
-waiting for it (this is because there is nothing which needs tidying up
-afterwards), the launcher quits.
-
-If Scribus were to change so that any cleanup was needed afterwards, the
-:ini-key:`[Launch]:WaitForProgram` line would need to be removed.
+.. _examples-scribus:
+
+Worked Example: Scribus
+=======================
+
+The :ref:`AppID <paf-appinfo-appid>` of Scribus is ``ScribusPortable``,
+and so the launcher executable is named ``ScribusPortable.exe`` and the
+launcher configuration file is in
+``App\AppInfo\Launcher\ScribusPortable.ini``.
+
+The main Scribus executable to be launched is ``Scribus.exe``, and it lives in
+``App\Scribus``. Thus the :ini-key:`ProgramExecutable` will be
+``Scribus\Scribus.exe``.
+
+With a little bit of guesswork and/or looking around, it can be seen that
+Scribus stores its settings in the filesystem, in the path specified by the
+environment variable ``HOME`` if it is found. This is a "safe" environment
+variable to set, and so there will be an :ini-section:`[Environment]` pair
+``HOME=%PAL:DataDir%`` to get it to store its settings in the Data directory.
+
+In this directory another directory is created, ``.scribus``, and in that a
+file ``scribus13.rc`` which contains the Scribus settings. Among various other
+settings, an MRU (Most Recently Used) file list is maintained, which (I think)
+can store paths with a backslash separator and a forward slash separator -- so
+there may be paths in like ``X:\Documents\...`` and ``X:/Documents/...``.  To
+update the drive letter in this file is the work of two
+:ini-section:`[FileWriteN]` sections (one to do each slash style).
+
+One last thing: Ghostscript is required, and will be included in the
+``App\Ghostscript`` directory. For Scribus to be able to detect this, it will
+need to be added with an :ini-section:`[Environment]` pair.
+
+From the information above, here is a fully functional sample launcher file,
+configured correctly for Scribus Portable:
+
+.. code-block:: ini
+
+   [Launch]
+   ProgramExecutable=Scribus\Scribus.exe
+   WaitForProgram=false
+   
+   [FileWrite1]
+   Type=replace
+   File=%PAL:DataDir%\.scribus\scribus13.rc
+   Find=%PAL:LastDrive%\
+   Replace=%PAL:Drive%\
+   
+   [FileWrite2]
+   Type=replace
+   File=%PAL:DataDir%\.scribus\scribus13.rc
+   Find=%PAL:LastDrive%/
+   Replace=%PAL:Drive%/
+   
+   [Environment]
+   PATH=%PAL:AppDir%\Ghostscript;%PATH%
+   HOME=%PAL:DataDir%
+
+To outline what this actually does: it inserts the App\\Ghostscript directory
+into the start of the environment variable PATH, sets the environment variable
+HOME to the Data directory, updates drive letters in
+Data\\.scribus\\scribus13.rc, then runs ``App\Scribus\Scribus.exe``. Without
+waiting for it (this is because there is nothing which needs tidying up
+afterwards), the launcher quits.
+
+If Scribus were to change so that any cleanup was needed afterwards, the
+:ini-key:`[Launch]:WaitForProgram` line would need to be removed.
diff --git a/Other/Source/Manual/features/developer.rst b/etc/source/Manual/features/developer.rst
similarity index 100%
rename from Other/Source/Manual/features/developer.rst
rename to etc/source/Manual/features/developer.rst
diff --git a/Other/Source/Manual/features/index.rst b/etc/source/Manual/features/index.rst
similarity index 100%
rename from Other/Source/Manual/features/index.rst
rename to etc/source/Manual/features/index.rst
diff --git a/Other/Source/Manual/features/user.rst b/etc/source/Manual/features/user.rst
similarity index 100%
rename from Other/Source/Manual/features/user.rst
rename to etc/source/Manual/features/user.rst
diff --git a/Other/Source/Manual/glossary.rst b/etc/source/Manual/glossary.rst
similarity index 100%
rename from Other/Source/Manual/glossary.rst
rename to etc/source/Manual/glossary.rst
diff --git a/Other/Source/Manual/help.rst b/etc/source/Manual/help.rst
similarity index 100%
rename from Other/Source/Manual/help.rst
rename to etc/source/Manual/help.rst
diff --git a/Other/Source/Manual/index.rst b/etc/source/Manual/index.rst
similarity index 100%
rename from Other/Source/Manual/index.rst
rename to etc/source/Manual/index.rst
diff --git a/Other/Source/Manual/ini.rst b/etc/source/Manual/ini.rst
similarity index 100%
rename from Other/Source/Manual/ini.rst
rename to etc/source/Manual/ini.rst
diff --git a/Other/Source/Manual/intro/index.rst b/etc/source/Manual/intro/index.rst
similarity index 100%
rename from Other/Source/Manual/intro/index.rst
rename to etc/source/Manual/intro/index.rst
diff --git a/Other/Source/Manual/intro/overview.rst b/etc/source/Manual/intro/overview.rst
similarity index 100%
rename from Other/Source/Manual/intro/overview.rst
rename to etc/source/Manual/intro/overview.rst
diff --git a/Other/Source/Manual/intro/quickstart.rst b/etc/source/Manual/intro/quickstart.rst
similarity index 100%
rename from Other/Source/Manual/intro/quickstart.rst
rename to etc/source/Manual/intro/quickstart.rst
diff --git a/Other/Source/Manual/make.bat b/etc/source/Manual/make.bat
similarity index 100%
rename from Other/Source/Manual/make.bat
rename to etc/source/Manual/make.bat
diff --git a/Other/Source/Manual/ref/envsub.rst b/etc/source/Manual/ref/envsub.rst
similarity index 100%
rename from Other/Source/Manual/ref/envsub.rst
rename to etc/source/Manual/ref/envsub.rst
diff --git a/Other/Source/Manual/ref/index.rst b/etc/source/Manual/ref/index.rst
similarity index 100%
rename from Other/Source/Manual/ref/index.rst
rename to etc/source/Manual/ref/index.rst
diff --git a/Other/Source/Manual/ref/launcher.ini/activate.rst b/etc/source/Manual/ref/launcher.ini/activate.rst
similarity index 100%
rename from Other/Source/Manual/ref/launcher.ini/activate.rst
rename to etc/source/Manual/ref/launcher.ini/activate.rst
diff --git a/Other/Source/Manual/ref/launcher.ini/environment.rst b/etc/source/Manual/ref/launcher.ini/environment.rst
similarity index 100%
rename from Other/Source/Manual/ref/launcher.ini/environment.rst
rename to etc/source/Manual/ref/launcher.ini/environment.rst
diff --git a/Other/Source/Manual/ref/launcher.ini/filesystem.rst b/etc/source/Manual/ref/launcher.ini/filesystem.rst
similarity index 100%
rename from Other/Source/Manual/ref/launcher.ini/filesystem.rst
rename to etc/source/Manual/ref/launcher.ini/filesystem.rst
diff --git a/Other/Source/Manual/ref/launcher.ini/filewriten.rst b/etc/source/Manual/ref/launcher.ini/filewriten.rst
similarity index 100%
rename from Other/Source/Manual/ref/launcher.ini/filewriten.rst
rename to etc/source/Manual/ref/launcher.ini/filewriten.rst
diff --git a/Other/Source/Manual/ref/launcher.ini/index.rst b/etc/source/Manual/ref/launcher.ini/index.rst
similarity index 100%
rename from Other/Source/Manual/ref/launcher.ini/index.rst
rename to etc/source/Manual/ref/launcher.ini/index.rst
diff --git a/Other/Source/Manual/ref/launcher.ini/language.rst b/etc/source/Manual/ref/launcher.ini/language.rst
similarity index 100%
rename from Other/Source/Manual/ref/launcher.ini/language.rst
rename to etc/source/Manual/ref/launcher.ini/language.rst
diff --git a/Other/Source/Manual/ref/launcher.ini/lastrunenvironment.rst b/etc/source/Manual/ref/launcher.ini/lastrunenvironment.rst
similarity index 100%
rename from Other/Source/Manual/ref/launcher.ini/lastrunenvironment.rst
rename to etc/source/Manual/ref/launcher.ini/lastrunenvironment.rst
diff --git a/Other/Source/Manual/ref/launcher.ini/launch.rst b/etc/source/Manual/ref/launcher.ini/launch.rst
similarity index 100%
rename from Other/Source/Manual/ref/launcher.ini/launch.rst
rename to etc/source/Manual/ref/launcher.ini/launch.rst
diff --git a/Other/Source/Manual/ref/launcher.ini/livemode.rst b/etc/source/Manual/ref/launcher.ini/livemode.rst
similarity index 100%
rename from Other/Source/Manual/ref/launcher.ini/livemode.rst
rename to etc/source/Manual/ref/launcher.ini/livemode.rst
diff --git a/Other/Source/Manual/ref/launcher.ini/qt.rst b/etc/source/Manual/ref/launcher.ini/qt.rst
similarity index 100%
rename from Other/Source/Manual/ref/launcher.ini/qt.rst
rename to etc/source/Manual/ref/launcher.ini/qt.rst
diff --git a/Other/Source/Manual/ref/launcher.ini/registry.rst b/etc/source/Manual/ref/launcher.ini/registry.rst
similarity index 100%
rename from Other/Source/Manual/ref/launcher.ini/registry.rst
rename to etc/source/Manual/ref/launcher.ini/registry.rst
diff --git a/Other/Source/Manual/ref/launcher.ini/services.rst b/etc/source/Manual/ref/launcher.ini/services.rst
similarity index 100%
rename from Other/Source/Manual/ref/launcher.ini/services.rst
rename to etc/source/Manual/ref/launcher.ini/services.rst
diff --git a/Other/Source/Manual/ref/paf/appcompactor.rst b/etc/source/Manual/ref/paf/appcompactor.rst
similarity index 100%
rename from Other/Source/Manual/ref/paf/appcompactor.rst
rename to etc/source/Manual/ref/paf/appcompactor.rst
diff --git a/Other/Source/Manual/ref/paf/appinfo.rst b/etc/source/Manual/ref/paf/appinfo.rst
similarity index 100%
rename from Other/Source/Manual/ref/paf/appinfo.rst
rename to etc/source/Manual/ref/paf/appinfo.rst
diff --git a/Other/Source/Manual/ref/paf/history.rst b/etc/source/Manual/ref/paf/history.rst
similarity index 100%
rename from Other/Source/Manual/ref/paf/history.rst
rename to etc/source/Manual/ref/paf/history.rst
diff --git a/Other/Source/Manual/ref/paf/icons.rst b/etc/source/Manual/ref/paf/icons.rst
similarity index 100%
rename from Other/Source/Manual/ref/paf/icons.rst
rename to etc/source/Manual/ref/paf/icons.rst
diff --git a/Other/Source/Manual/ref/paf/index.rst b/etc/source/Manual/ref/paf/index.rst
similarity index 100%
rename from Other/Source/Manual/ref/paf/index.rst
rename to etc/source/Manual/ref/paf/index.rst
diff --git a/Other/Source/Manual/ref/paf/installer.rst b/etc/source/Manual/ref/paf/installer.rst
similarity index 100%
rename from Other/Source/Manual/ref/paf/installer.rst
rename to etc/source/Manual/ref/paf/installer.rst
diff --git a/Other/Source/Manual/ref/paf/layout.rst b/etc/source/Manual/ref/paf/layout.rst
similarity index 100%
rename from Other/Source/Manual/ref/paf/layout.rst
rename to etc/source/Manual/ref/paf/layout.rst
diff --git a/Other/Source/Manual/ref/paf/plugins.rst b/etc/source/Manual/ref/paf/plugins.rst
similarity index 100%
rename from Other/Source/Manual/ref/paf/plugins.rst
rename to etc/source/Manual/ref/paf/plugins.rst
diff --git a/Other/Source/Manual/ref/paf/portability.rst b/etc/source/Manual/ref/paf/portability.rst
similarity index 100%
rename from Other/Source/Manual/ref/paf/portability.rst
rename to etc/source/Manual/ref/paf/portability.rst
diff --git a/Other/Source/Manual/releases/2.0.rst b/etc/source/Manual/releases/2.0.rst
similarity index 100%
rename from Other/Source/Manual/releases/2.0.rst
rename to etc/source/Manual/releases/2.0.rst
diff --git a/Other/Source/Manual/releases/2.1.1.rst b/etc/source/Manual/releases/2.1.1.rst
similarity index 100%
rename from Other/Source/Manual/releases/2.1.1.rst
rename to etc/source/Manual/releases/2.1.1.rst
diff --git a/Other/Source/Manual/releases/2.1.2.rst b/etc/source/Manual/releases/2.1.2.rst
similarity index 100%
rename from Other/Source/Manual/releases/2.1.2.rst
rename to etc/source/Manual/releases/2.1.2.rst
diff --git a/Other/Source/Manual/releases/2.1.rst b/etc/source/Manual/releases/2.1.rst
similarity index 100%
rename from Other/Source/Manual/releases/2.1.rst
rename to etc/source/Manual/releases/2.1.rst
diff --git a/Other/Source/Manual/releases/2.2.rst b/etc/source/Manual/releases/2.2.rst
similarity index 100%
rename from Other/Source/Manual/releases/2.2.rst
rename to etc/source/Manual/releases/2.2.rst
diff --git a/Other/Source/Manual/releases/3.0.rst b/etc/source/Manual/releases/3.0.rst
similarity index 100%
rename from Other/Source/Manual/releases/3.0.rst
rename to etc/source/Manual/releases/3.0.rst
diff --git a/Other/Source/Manual/releases/index.rst b/etc/source/Manual/releases/index.rst
similarity index 100%
rename from Other/Source/Manual/releases/index.rst
rename to etc/source/Manual/releases/index.rst
diff --git a/Other/Source/Manual/topics/64-bit.rst b/etc/source/Manual/topics/64-bit.rst
similarity index 100%
rename from Other/Source/Manual/topics/64-bit.rst
rename to etc/source/Manual/topics/64-bit.rst
diff --git a/Other/Source/Manual/topics/checklist.rst b/etc/source/Manual/topics/checklist.rst
similarity index 100%
rename from Other/Source/Manual/topics/checklist.rst
rename to etc/source/Manual/topics/checklist.rst
diff --git a/Other/Source/Manual/topics/files-and-directories.rst b/etc/source/Manual/topics/files-and-directories.rst
similarity index 97%
rename from Other/Source/Manual/topics/files-and-directories.rst
rename to etc/source/Manual/topics/files-and-directories.rst
index 628152c..576436b 100644
--- a/Other/Source/Manual/topics/files-and-directories.rst
+++ b/etc/source/Manual/topics/files-and-directories.rst
@@ -1,60 +1,60 @@
-.. _files-and-directories:
-
-=====================
-Files and directories
-=====================
-
-One of the most common things with making applications portable is moving
-settings around. Ideally, an application is able to be made portable (or at
-least almost portable) with a command-line option or an environment variable to
-set its settings location, but most applications don't support this. (TODO: a
-discussion of ways to improve base applications is in order.)
-
-Until I write more content in here, you should refer to the documentation for
-the :ini-section:`[FilesMove]`, :ini-section:`[DirectoriesMove]`,
-:ini-section:`[DirectoriesCleanupIfEmpty]` and
-:ini-section:`[DirectoriesCleanupForce]` sections of launcher.ini.
-
-*This document is not complete*
-
-.. TODO: finish this
-
-.. index:: wildcards
-
-.. _wildcards:
-
-Support for wildcards
-=====================
-
-The PortableApps.com Launcher supports wildcard matching for several sections;
-:ini-section:`[FilesMove]`, :ini-section:`[DirectoriesMove]`,
-:ini-section:`[FileWriteN]`, :ini-section:`[DirectoriesCleanupIfEmpty]` and
-:ini-section:`[DirectoriesCleanupForce]`.  Here are the rules of the wildcard
-matching:
-
-* ``*`` matches any number of characters
-* ``?`` matches one character
-* Wildcards can be included at any level, but currently only at one level
-
-**Examples:**
-
-* ``%PAL:DataDir%\File????.sw?`` is valid and will match in the Data directory
-  files with names such as ``FileABCD.swp``, ``File27X4.swo``,
-  ``File3_2!.sw_``, but it will not match things like ``FileABC.swp``,
-  ``FileABCDE.swp``, ``FileABCD.sw`` or ``FileABCD.swap``.
-
-* ``%PAL:DataDir%\*.ini`` is valid and will match in the Data directory files
-  with names such as ``foo.ini`` and ``bar.ini``.
-
-* ``%PAL:DataDir%\*-???.ini`` is valid and will match in the Data directory
-  files with names such as ``foo-123.ini`` and ``abcdef-ghi.ini``, but not
-  ``foo.ini``.
-
-* ``%PAL:DataDir%\*\settings.ini`` is valid and will match all files called
-  ``settings.ini`` in all subdirectories (one level deep, not recursively) of
-  the Data directory.
-
-* ``%PAL:DataDir%\*\*.ini`` is *not* valid as wildcards are included at
-  multiple levels.
-
-.. versionadded:: 2.1
+.. _files-and-directories:
+
+=====================
+Files and directories
+=====================
+
+One of the most common things with making applications portable is moving
+settings around. Ideally, an application is able to be made portable (or at
+least almost portable) with a command-line option or an environment variable to
+set its settings location, but most applications don't support this. (TODO: a
+discussion of ways to improve base applications is in order.)
+
+Until I write more content in here, you should refer to the documentation for
+the :ini-section:`[FilesMove]`, :ini-section:`[DirectoriesMove]`,
+:ini-section:`[DirectoriesCleanupIfEmpty]` and
+:ini-section:`[DirectoriesCleanupForce]` sections of launcher.ini.
+
+*This document is not complete*
+
+.. TODO: finish this
+
+.. index:: wildcards
+
+.. _wildcards:
+
+Support for wildcards
+=====================
+
+The PortableApps.com Launcher supports wildcard matching for several sections;
+:ini-section:`[FilesMove]`, :ini-section:`[DirectoriesMove]`,
+:ini-section:`[FileWriteN]`, :ini-section:`[DirectoriesCleanupIfEmpty]` and
+:ini-section:`[DirectoriesCleanupForce]`.  Here are the rules of the wildcard
+matching:
+
+* ``*`` matches any number of characters
+* ``?`` matches one character
+* Wildcards can be included at any level, but currently only at one level
+
+**Examples:**
+
+* ``%PAL:DataDir%\File????.sw?`` is valid and will match in the Data directory
+  files with names such as ``FileABCD.swp``, ``File27X4.swo``,
+  ``File3_2!.sw_``, but it will not match things like ``FileABC.swp``,
+  ``FileABCDE.swp``, ``FileABCD.sw`` or ``FileABCD.swap``.
+
+* ``%PAL:DataDir%\*.ini`` is valid and will match in the Data directory files
+  with names such as ``foo.ini`` and ``bar.ini``.
+
+* ``%PAL:DataDir%\*-???.ini`` is valid and will match in the Data directory
+  files with names such as ``foo-123.ini`` and ``abcdef-ghi.ini``, but not
+  ``foo.ini``.
+
+* ``%PAL:DataDir%\*\settings.ini`` is valid and will match all files called
+  ``settings.ini`` in all subdirectories (one level deep, not recursively) of
+  the Data directory.
+
+* ``%PAL:DataDir%\*\*.ini`` is *not* valid as wildcards are included at
+  multiple levels.
+
+.. versionadded:: 2.1
diff --git a/Other/Source/Manual/topics/games.rst b/etc/source/Manual/topics/games.rst
similarity index 100%
rename from Other/Source/Manual/topics/games.rst
rename to etc/source/Manual/topics/games.rst
diff --git a/Other/Source/Manual/topics/index.rst b/etc/source/Manual/topics/index.rst
similarity index 100%
rename from Other/Source/Manual/topics/index.rst
rename to etc/source/Manual/topics/index.rst
diff --git a/Other/Source/Manual/topics/java.rst b/etc/source/Manual/topics/java.rst
similarity index 100%
rename from Other/Source/Manual/topics/java.rst
rename to etc/source/Manual/topics/java.rst
diff --git a/Other/Source/Manual/topics/languages-custom.dia b/etc/source/Manual/topics/languages-custom.dia
similarity index 100%
rename from Other/Source/Manual/topics/languages-custom.dia
rename to etc/source/Manual/topics/languages-custom.dia
diff --git a/Other/Source/Manual/topics/languages-custom.png b/etc/source/Manual/topics/languages-custom.png
similarity index 100%
rename from Other/Source/Manual/topics/languages-custom.png
rename to etc/source/Manual/topics/languages-custom.png
diff --git a/Other/Source/Manual/topics/languages-table.py b/etc/source/Manual/topics/languages-table.py
old mode 100755
new mode 100644
similarity index 100%
rename from Other/Source/Manual/topics/languages-table.py
rename to etc/source/Manual/topics/languages-table.py
diff --git a/Other/Source/Manual/topics/languages.rst b/etc/source/Manual/topics/languages.rst
similarity index 98%
rename from Other/Source/Manual/topics/languages.rst
rename to etc/source/Manual/topics/languages.rst
index d1c7891..6f9332f 100644
--- a/Other/Source/Manual/topics/languages.rst
+++ b/etc/source/Manual/topics/languages.rst
@@ -1,182 +1,182 @@
-.. index:: Languages, Making things portable; multi-lingual applications
-
-.. _languages:
-
-Languages
-=========
-
-The PortableApps.com Launcher supports automatic language switching of
-applications when launched from the PortableApps.com Platform, by a series of
-environment variables. This document discusses how to go about getting language
-setting working for your application, and some quirks of the system.
-
-The environment variables
--------------------------
-
-:ref:`ref-envsub-language` covers the default variables which are available. If
-those environment variables are enough for use in a :ini-section:`[FileWriteN]`
-section, then you shouldn't need to go beyond here.
-
-.. _languages-custom:
-
-Setting a custom language environment variable
-----------------------------------------------
-
-Constructing a custom language environment variable is done with the
-:ini-section:`[Language]` and :ini-section:`[LanguageStrings]` sections, and
-the final result is placed in :env:`%PAL:LanguageCustom% <PAL:LanguageCustom>`.
-Here is the order in which things happen.
-
-1. :ini-key:`[Language]:Base` is read and environment variables are parsed
-   (this will normally be other :ref:`language variables
-   <ref-envsub-language>`).
-
-2. The key defined by that value is looked up in the section
-   :ini-section:`[LanguageStrings]` (into a variable we'll call ``value``).
-   
-3. If that key did not exist (and so ``value`` is undefined), then
-   :ini-key:`[Language]:Default` is read (with environment variable parsing)
-   into ``value`` if it exists; if it doesn't exist then
-   :ini-key:`[Language]:Base` (with environment variables parsed; the value we
-   looked up in :ini-section:`[LanguageStrings]` before) is used.
-
-4. ``%PAL:LanguageCustom%`` is set to ``value``.
-
-5. Now we come to checking if a file exists. This is handy when you have a
-   whole table of, for example, glibc-compliant names, but not all possible
-   files are there and if an invalid language is specified the application will
-   cause problems. It becomes convenient to check if a certain file exists, and
-   if it doesn't, reverting to a default value.
-
-6. If :ini-key:`[Language]:CheckIfExists` is not set, the final value is
-   ``value`` (and this process stops).  Otherwise, it is read and environment
-   variables are parsed.
-
-7. That file is checked for existence: for example, you could have a value of
-   ``%PAL:AppDir%\AppName\locales\%PAL:LanguageCustom%.mo``. You should have
-   ``%PAL:LanguageCustom%`` at least once in this value (otherwise there
-   wouldn't seem much point in it).
-
-8. If this file does not exist, then :ini-key:`[Language]:DefaultIfNotExists`
-   is read, environment variables parsed in it, and set as the value for
-   ``%PAL:LanguageCustom%``.
-
-**Note:** normally you will want to use only one of
-:ini-key:`[Language]:Default` and :ini-key:`[Language]:DefaultIfNotExists`.
-
-Here is a diagram of how it works:
-
-.. image:: languages-custom.png
-
-When the portable application is not launched from the PortableApps.com
-Platform, to maintain the user's language setting, the custom language should
-be read from a file with the aid of the :ini-section:`[LanguageFile]` section,
-if this is possible. If the language is not written to a file, but e.g. read
-from an environment variable, you can use :ini-key:`[Language]:Save`.
-
-Other ways
-----------
-
-If you really can't make language switching work as you need it to, you can
-:ref:`write a custom segment <custom-code-segment>` to do what you need.
-Remember then that you will need to compile this new code with the
-PortableApps.com Launcher Generator. Also please try :ref:`contacting Chris
-Morgan <help>` as any code you write or a new language situation may be useful
-for putting into the PortableApps.com Launcher itself.
-
-.. _languages-values:
-
-Language variable values
-------------------------
-
-Here is a table of language variables and the values they are given. (All the
-variables in this table have ``PAL:`` prefixed to them, see
-:ref:`ref-envsub-language` for the full names.)
-
-**Note:** :env:`PAL:LanguageName` will be in uppercase for users of
-the PortableApps.com Platform 2.0 Beta 5 and earlier. If this matters, you may
-need to use the :ini-section:`[LanguageStrings]` section.
-
-.. This table is generated by languages-table.py.
-   
-   At the time of writing, there were a few locale fixes to make this display
-   properly (from 2.0 Beta 5):
-   
-   * Farsi: LocaleCode3 changed from "per/fas" to "fas"
-   * Filipino: LanguageCode, LocaleCode2 and Localeglibc changed from "fil" to
-     "tl".
-   * Galician: LocaleID changed from 3082 (SpanishInternational) to 1110
-   * SerbianLatin: LocaleWinName changed from LANG_SERBIAN to LANG_SERBIANLATIN
-   * Serbian: LocaleID changed from 2074 (Latin) to 3098 (Cyrillic),
-     LanguageCode, LocaleCode2, LocaleCode3 changed from non-latin ср, ср and
-     срп to sr, sr and srp
-   * Simplified Chinese: LocaleID  changed from 936 (its codepage) to 2052
-   * Sundanese locale fixed (had invalid line breaks which don't bother normal
-     INI parsing but do Python's stricter RawConfigParser)
-   
-   All these bugs have been reported.
-   
-   The table is currently slightly modified as well to make the LocaleName
-   correct (script works from file names as the string doesn't yet exist inside
-   the file):
-   
-   * PortugueseBrazilian -> PortugueseBR
-   * ChineseTraditional  -> TradChinese
-   * ChineseSimplified   -> SimpChinese
-
-==================== ============ =========== =========== =========== ======== =========================
-LocaleName           LanguageCode LocaleCode2 LocaleCode3 Localeglibc LocaleID LocaleWinName            
-==================== ============ =========== =========== =========== ======== =========================
-Afrikaans            af           af          afr         af          1078     LANG_AFRIKAANS           
-Albanian             sq           sq          sqi         sq          1052     LANG_ALBANIAN            
-Arabic               ar-sa        ar          ara         ar          1025     LANG_ARABIC              
-Basque               eu           eu          eus         eu          1069     LANG_BASQUE              
-Belarussian          be           be          bel         be          1059     LANG_BELARUSSIAN         
-Bulgarian            bg           bg          bul         bg          1026     LANG_BULGARIAN           
-Catalan              ca           ca          cat         ca          1027     LANG_CATALAN             
-SimpChinese          zh-cn        zh          zho         zh_CN       2052     LANG_SIMPCHINESE         
-TradChinese          zh-tw        zh          zho         zh_TW       1028     LANG_TRADCHINESE         
-Croatian             hr           hr          hrv         hr          1050     LANG_CROATIAN            
-Czech                cs           cs          ces         cs          1029     LANG_CZECH               
-Danish               da           da          dan         da          1030     LANG_DANISH              
-Dutch                nl           nl          nld         nl          1043     LANG_DUTCH               
-English              en           en          eng         en_US       1033     LANG_ENGLISH             
-Estonian             et           et          est         et          1061     LANG_ESTONIAN            
-Farsi                fa           fa          fas         fa          1065     LANG_FARSI               
-Filipino             tl           tl          fil         tl          1124     LANG_FILIPINO            
-Finnish              fi           fi          fin         fi          1035     LANG_FINNISH             
-French               fr           fr          fra         fr          1036     LANG_FRENCH              
-Galician             gl           gl          glg         gl          1110     LANG_GALICIAN            
-German               de           de          ger         de          1031     LANG_GERMAN              
-Greek                el           el          ell         el          1032     LANG_GREEK               
-Hebrew               he           he          heb         he          1037     LANG_HEBREW              
-Hungarian            hu           hu          hun         hu          1038     LANG_HUNGARIAN           
-Indonesian           id           id          ina         id          1057     LANG_INDONESIAN          
-Irish                ga           ga          gle         ga          2108     LANG_IRISH               
-Italian              it           it          ita         it          1040     LANG_ITALIAN             
-Japanese             ja           ja          jpn         ja          1041     LANG_JAPANESE            
-Korean               ko           ko          kor         ko          1042     LANG_KOREAN              
-Latvian              lv           lv          lav         lv          1062     LANG_LATVIAN             
-Lithuanian           lt           lt          lit         lt          1063     LANG_LITHUANIAN          
-Luxembourgish        lb           lb          ltz         lb          1033     LANG_LUXEMBOURGISH       
-Macedonian           mk           mk          mkd         mk          1071     LANG_MACEDONIAN          
-Malay                ms           ms          msa         ms          1086     LANG_MALAY               
-Norwegian            no           no          nor         nb          1044     LANG_NORWEGIAN           
-Polish               pl           pl          pol         pl          1045     LANG_POLISH              
-Portuguese           pt           pt          por         pt          2070     LANG_PORTUGUESE          
-PortugueseBR         pt-br        pt          por         pt_BR       1046     LANG_PORTUGUESEBR        
-Romanian             ro           ro          ron         ro          1048     LANG_ROMANIAN            
-Russian              ru           ru          rus         ru          1049     LANG_RUSSIAN             
-Serbian              sr           sr          srp         sr_RS       3098     LANG_SERBIAN             
-SerbianLatin         sr           sr          srp         sr          2074     LANG_SERBIANLATIN        
-Slovak               sk           sk          slk         sk          1051     LANG_SLOVAK              
-Slovenian            sl           sl          slv         sl          1060     LANG_SLOVENIAN           
-Spanish              es           es          spa         es          1034     LANG_SPANISH             
-SpanishInternational es-mx        es          spa         es          3082     LANG_SPANISHINTERNATIONAL
-Sundanese            su           su          sun         su          9999     LANG_SUNDANESE           
-Swedish              sv           sv          swe         sv          1053     LANG_SWEDISH             
-Thai                 th           th          tha         th          1054     LANG_THAI                
-Turkish              tr           tr          tur         tr          1055     LANG_TURKISH             
-Ukrainian            uk           uk          ukr         uk          1058     LANG_UKRAINIAN           
-Vietnamese           vi           vi          vie         vi          1066     LANG_VIETNAMESE          
-==================== ============ =========== =========== =========== ======== =========================
+.. index:: Languages, Making things portable; multi-lingual applications
+
+.. _languages:
+
+Languages
+=========
+
+The PortableApps.com Launcher supports automatic language switching of
+applications when launched from the PortableApps.com Platform, by a series of
+environment variables. This document discusses how to go about getting language
+setting working for your application, and some quirks of the system.
+
+The environment variables
+-------------------------
+
+:ref:`ref-envsub-language` covers the default variables which are available. If
+those environment variables are enough for use in a :ini-section:`[FileWriteN]`
+section, then you shouldn't need to go beyond here.
+
+.. _languages-custom:
+
+Setting a custom language environment variable
+----------------------------------------------
+
+Constructing a custom language environment variable is done with the
+:ini-section:`[Language]` and :ini-section:`[LanguageStrings]` sections, and
+the final result is placed in :env:`%PAL:LanguageCustom% <PAL:LanguageCustom>`.
+Here is the order in which things happen.
+
+1. :ini-key:`[Language]:Base` is read and environment variables are parsed
+   (this will normally be other :ref:`language variables
+   <ref-envsub-language>`).
+
+2. The key defined by that value is looked up in the section
+   :ini-section:`[LanguageStrings]` (into a variable we'll call ``value``).
+   
+3. If that key did not exist (and so ``value`` is undefined), then
+   :ini-key:`[Language]:Default` is read (with environment variable parsing)
+   into ``value`` if it exists; if it doesn't exist then
+   :ini-key:`[Language]:Base` (with environment variables parsed; the value we
+   looked up in :ini-section:`[LanguageStrings]` before) is used.
+
+4. ``%PAL:LanguageCustom%`` is set to ``value``.
+
+5. Now we come to checking if a file exists. This is handy when you have a
+   whole table of, for example, glibc-compliant names, but not all possible
+   files are there and if an invalid language is specified the application will
+   cause problems. It becomes convenient to check if a certain file exists, and
+   if it doesn't, reverting to a default value.
+
+6. If :ini-key:`[Language]:CheckIfExists` is not set, the final value is
+   ``value`` (and this process stops).  Otherwise, it is read and environment
+   variables are parsed.
+
+7. That file is checked for existence: for example, you could have a value of
+   ``%PAL:AppDir%\AppName\locales\%PAL:LanguageCustom%.mo``. You should have
+   ``%PAL:LanguageCustom%`` at least once in this value (otherwise there
+   wouldn't seem much point in it).
+
+8. If this file does not exist, then :ini-key:`[Language]:DefaultIfNotExists`
+   is read, environment variables parsed in it, and set as the value for
+   ``%PAL:LanguageCustom%``.
+
+**Note:** normally you will want to use only one of
+:ini-key:`[Language]:Default` and :ini-key:`[Language]:DefaultIfNotExists`.
+
+Here is a diagram of how it works:
+
+.. image:: languages-custom.png
+
+When the portable application is not launched from the PortableApps.com
+Platform, to maintain the user's language setting, the custom language should
+be read from a file with the aid of the :ini-section:`[LanguageFile]` section,
+if this is possible. If the language is not written to a file, but e.g. read
+from an environment variable, you can use :ini-key:`[Language]:Save`.
+
+Other ways
+----------
+
+If you really can't make language switching work as you need it to, you can
+:ref:`write a custom segment <custom-code-segment>` to do what you need.
+Remember then that you will need to compile this new code with the
+PortableApps.com Launcher Generator. Also please try :ref:`contacting Chris
+Morgan <help>` as any code you write or a new language situation may be useful
+for putting into the PortableApps.com Launcher itself.
+
+.. _languages-values:
+
+Language variable values
+------------------------
+
+Here is a table of language variables and the values they are given. (All the
+variables in this table have ``PAL:`` prefixed to them, see
+:ref:`ref-envsub-language` for the full names.)
+
+**Note:** :env:`PAL:LanguageName` will be in uppercase for users of
+the PortableApps.com Platform 2.0 Beta 5 and earlier. If this matters, you may
+need to use the :ini-section:`[LanguageStrings]` section.
+
+.. This table is generated by languages-table.py.
+   
+   At the time of writing, there were a few locale fixes to make this display
+   properly (from 2.0 Beta 5):
+   
+   * Farsi: LocaleCode3 changed from "per/fas" to "fas"
+   * Filipino: LanguageCode, LocaleCode2 and Localeglibc changed from "fil" to
+     "tl".
+   * Galician: LocaleID changed from 3082 (SpanishInternational) to 1110
+   * SerbianLatin: LocaleWinName changed from LANG_SERBIAN to LANG_SERBIANLATIN
+   * Serbian: LocaleID changed from 2074 (Latin) to 3098 (Cyrillic),
+     LanguageCode, LocaleCode2, LocaleCode3 changed from non-latin ср, ср and
+     срп to sr, sr and srp
+   * Simplified Chinese: LocaleID  changed from 936 (its codepage) to 2052
+   * Sundanese locale fixed (had invalid line breaks which don't bother normal
+     INI parsing but do Python's stricter RawConfigParser)
+   
+   All these bugs have been reported.
+   
+   The table is currently slightly modified as well to make the LocaleName
+   correct (script works from file names as the string doesn't yet exist inside
+   the file):
+   
+   * PortugueseBrazilian -> PortugueseBR
+   * ChineseTraditional  -> TradChinese
+   * ChineseSimplified   -> SimpChinese
+
+==================== ============ =========== =========== =========== ======== =========================
+LocaleName           LanguageCode LocaleCode2 LocaleCode3 Localeglibc LocaleID LocaleWinName            
+==================== ============ =========== =========== =========== ======== =========================
+Afrikaans            af           af          afr         af          1078     LANG_AFRIKAANS           
+Albanian             sq           sq          sqi         sq          1052     LANG_ALBANIAN            
+Arabic               ar-sa        ar          ara         ar          1025     LANG_ARABIC              
+Basque               eu           eu          eus         eu          1069     LANG_BASQUE              
+Belarussian          be           be          bel         be          1059     LANG_BELARUSSIAN         
+Bulgarian            bg           bg          bul         bg          1026     LANG_BULGARIAN           
+Catalan              ca           ca          cat         ca          1027     LANG_CATALAN             
+SimpChinese          zh-cn        zh          zho         zh_CN       2052     LANG_SIMPCHINESE         
+TradChinese          zh-tw        zh          zho         zh_TW       1028     LANG_TRADCHINESE         
+Croatian             hr           hr          hrv         hr          1050     LANG_CROATIAN            
+Czech                cs           cs          ces         cs          1029     LANG_CZECH               
+Danish               da           da          dan         da          1030     LANG_DANISH              
+Dutch                nl           nl          nld         nl          1043     LANG_DUTCH               
+English              en           en          eng         en_US       1033     LANG_ENGLISH             
+Estonian             et           et          est         et          1061     LANG_ESTONIAN            
+Farsi                fa           fa          fas         fa          1065     LANG_FARSI               
+Filipino             tl           tl          fil         tl          1124     LANG_FILIPINO            
+Finnish              fi           fi          fin         fi          1035     LANG_FINNISH             
+French               fr           fr          fra         fr          1036     LANG_FRENCH              
+Galician             gl           gl          glg         gl          1110     LANG_GALICIAN            
+German               de           de          ger         de          1031     LANG_GERMAN              
+Greek                el           el          ell         el          1032     LANG_GREEK               
+Hebrew               he           he          heb         he          1037     LANG_HEBREW              
+Hungarian            hu           hu          hun         hu          1038     LANG_HUNGARIAN           
+Indonesian           id           id          ina         id          1057     LANG_INDONESIAN          
+Irish                ga           ga          gle         ga          2108     LANG_IRISH               
+Italian              it           it          ita         it          1040     LANG_ITALIAN             
+Japanese             ja           ja          jpn         ja          1041     LANG_JAPANESE            
+Korean               ko           ko          kor         ko          1042     LANG_KOREAN              
+Latvian              lv           lv          lav         lv          1062     LANG_LATVIAN             
+Lithuanian           lt           lt          lit         lt          1063     LANG_LITHUANIAN          
+Luxembourgish        lb           lb          ltz         lb          1033     LANG_LUXEMBOURGISH       
+Macedonian           mk           mk          mkd         mk          1071     LANG_MACEDONIAN          
+Malay                ms           ms          msa         ms          1086     LANG_MALAY               
+Norwegian            no           no          nor         nb          1044     LANG_NORWEGIAN           
+Polish               pl           pl          pol         pl          1045     LANG_POLISH              
+Portuguese           pt           pt          por         pt          2070     LANG_PORTUGUESE          
+PortugueseBR         pt-br        pt          por         pt_BR       1046     LANG_PORTUGUESEBR        
+Romanian             ro           ro          ron         ro          1048     LANG_ROMANIAN            
+Russian              ru           ru          rus         ru          1049     LANG_RUSSIAN             
+Serbian              sr           sr          srp         sr_RS       3098     LANG_SERBIAN             
+SerbianLatin         sr           sr          srp         sr          2074     LANG_SERBIANLATIN        
+Slovak               sk           sk          slk         sk          1051     LANG_SLOVAK              
+Slovenian            sl           sl          slv         sl          1060     LANG_SLOVENIAN           
+Spanish              es           es          spa         es          1034     LANG_SPANISH             
+SpanishInternational es-mx        es          spa         es          3082     LANG_SPANISHINTERNATIONAL
+Sundanese            su           su          sun         su          9999     LANG_SUNDANESE           
+Swedish              sv           sv          swe         sv          1053     LANG_SWEDISH             
+Thai                 th           th          tha         th          1054     LANG_THAI                
+Turkish              tr           tr          tur         tr          1055     LANG_TURKISH             
+Ukrainian            uk           uk          ukr         uk          1058     LANG_UKRAINIAN           
+Vietnamese           vi           vi          vie         vi          1066     LANG_VIETNAMESE          
+==================== ============ =========== =========== =========== ======== =========================
diff --git a/Other/Source/Manual/topics/qt.rst b/etc/source/Manual/topics/qt.rst
similarity index 100%
rename from Other/Source/Manual/topics/qt.rst
rename to etc/source/Manual/topics/qt.rst
diff --git a/Other/Source/Manual/topics/registry.rst b/etc/source/Manual/topics/registry.rst
similarity index 100%
rename from Other/Source/Manual/topics/registry.rst
rename to etc/source/Manual/topics/registry.rst
diff --git a/Other/Source/Manual/topics/splashscreen.rst b/etc/source/Manual/topics/splashscreen.rst
similarity index 100%
rename from Other/Source/Manual/topics/splashscreen.rst
rename to etc/source/Manual/topics/splashscreen.rst
diff --git a/Other/Source/Manual/topics/xml.rst b/etc/source/Manual/topics/xml.rst
similarity index 100%
rename from Other/Source/Manual/topics/xml.rst
rename to etc/source/Manual/topics/xml.rst
diff --git a/Other/Source/Manual/troubleshooting.rst b/etc/source/Manual/troubleshooting.rst
similarity index 96%
rename from Other/Source/Manual/troubleshooting.rst
rename to etc/source/Manual/troubleshooting.rst
index 0dd759f..07efa1f 100644
--- a/Other/Source/Manual/troubleshooting.rst
+++ b/etc/source/Manual/troubleshooting.rst
@@ -1,37 +1,37 @@
-.. _troubleshooting:
-
-===============
-Troubleshooting
-===============
-
-When something isn't working properly in the PortableApps.com Launcher, it's
-probably a mistake on your part. Before reporting it as a bug, please try
-going through this list of things first. If you can't work out what the issue
-is, or if you still think you've found a bug, then you can try :ref:`asking
-for help <help>`.
-
-Check your launcher configuration
-   Please go through all the lines in your :ref:`ref-launcher.ini` file and
-   reread the documentation for the section or key to make sure that you're
-   not doing something wrong by mistake.
-
-Other issues
-   Go through the :ref:`release-checklist`.
-
-Registry
-========
-
-Registry things aren't happening
-   Make sure you have :ini-key:`[Activate]:Registry` set to ``true``.
-
-Java
-====
-
-General issues
-   Read the :ref:`java` section, your issue may be covered there.
-
-The base application says it can't find Java
-   If the base application requires Java,
-   ``appinfo.ini\[Dependencies]:UsesJava`` must be set to ``yes``.
-
-*This document is not complete (not that it ever will be)*
+.. _troubleshooting:
+
+===============
+Troubleshooting
+===============
+
+When something isn't working properly in the PortableApps.com Launcher, it's
+probably a mistake on your part. Before reporting it as a bug, please try
+going through this list of things first. If you can't work out what the issue
+is, or if you still think you've found a bug, then you can try :ref:`asking
+for help <help>`.
+
+Check your launcher configuration
+   Please go through all the lines in your :ref:`ref-launcher.ini` file and
+   reread the documentation for the section or key to make sure that you're
+   not doing something wrong by mistake.
+
+Other issues
+   Go through the :ref:`release-checklist`.
+
+Registry
+========
+
+Registry things aren't happening
+   Make sure you have :ini-key:`[Activate]:Registry` set to ``true``.
+
+Java
+====
+
+General issues
+   Read the :ref:`java` section, your issue may be covered there.
+
+The base application says it can't find Java
+   If the base application requires Java,
+   ``appinfo.ini\[Dependencies]:UsesJava`` must be set to ``yes``.
+
+*This document is not complete (not that it ever will be)*
diff --git a/Other/Source/MoveFileFolder.nsh b/etc/source/MoveFileFolder.nsh
similarity index 100%
rename from Other/Source/MoveFileFolder.nsh
rename to etc/source/MoveFileFolder.nsh
diff --git a/Other/Source/MyXML.nsh b/etc/source/MyXML.nsh
similarity index 100%
rename from Other/Source/MyXML.nsh
rename to etc/source/MyXML.nsh
diff --git a/Other/Source/NSISRegistry.nsh b/etc/source/NSISRegistry.nsh
similarity index 96%
rename from Other/Source/NSISRegistry.nsh
rename to etc/source/NSISRegistry.nsh
index a7177d5..8843419 100644
--- a/Other/Source/NSISRegistry.nsh
+++ b/etc/source/NSISRegistry.nsh
@@ -1,185 +1,185 @@
-/* Copy Registry Key
-   http://nsis.sourceforge.net/MOVEREGKEY
-
-Description
-	Use this function to copy a registry key along with all its values and 
-	subkeys to another location in the registry.
-
-	* this does not move.. but copies.
-	* the key still remains w/an additional copy to desired location.
-
-Usage:
-	!include registry.nsh
-	!insertmacro MOVEREGKEY
-
-	Section
-		${MOVEREGKEY} `SOURCEROOTKEY` `SOURCESUBKEY` `TARGETROOTKEY` `TARGETSUBKEY`
-		${MOVEREGKEY} HKLM SOFTWARE\NSIS HKLM SOFTWARE\BACKUP\NSIS
-	SectionEnd
-
-Uninstaller:
-	!include registry.nsh
-	!insertmacro UN.MOVEREGKEY
-
-	Section uninstall
-		${UN.MOVEREGKEY} `SOURCEROOTKEY` `SOURCESUBKEY` `TARGETROOTKEY` `TARGETSUBKEY`
-		${UN.MOVEREGKEY} HKLM SOFTWARE\NSIS HKLM SOFTWARE\BACKUP\NSIS
-	SectionEnd
-*/
-!ifndef NSISREGISTRY_NSH
-!define NSISREGISTRY_NSH
-!include `${NSISDIR}\Examples\System\system.nsh`
-
-!define HKEY_CLASSES_ROOT_ENUM           0x80000000
-!define HKEY_CURRENT_USER_ENUM           0x80000001
-!define HKEY_LOCAL_MACHINE_ENUM          0x80000002
-!define HKEY_USERS_ENUM                  0x80000003
-!define HKEY_PERFORMANCE_DATA_ENUM       0x80000004
-!define HKEY_CURRENT_CONFIG_ENUM         0x80000005
-!define HKEY_DYN_DATA_ENUM               0x80000006
-
-!define KEY_ALL_ACCESS          0x0002003F
-
-!define RegCreateKeyEx `advapi32::RegCreateKeyEx(i, t, i, t, i, i, i, *i, *i) i`
-!define RegOpenKeyEx `advapi32::RegOpenKeyEx(i, t, i, i, *i) i`
-!define RegCloseKey  `advapi32::RegCloseKey(i) i`
-!define SHCopyKey `shlwapi::SHCopyKey(i, t, i, i) i`
-
-!macro SET_HKEY_ENUM HKEY_NAME HKEY_ENUM LABEL
-    StrCmp ${HKEY_NAME} HKCR 0 +3
-    StrCpy ${HKEY_ENUM} ${HKEY_CLASSES_ROOT_ENUM}
-    GoTo ${LABEL}
-    StrCmp ${HKEY_NAME} HKEY_CLASSES_ROOT 0 +3
-    StrCpy ${HKEY_ENUM} ${HKEY_CLASSES_ROOT_ENUM}
-    GoTo ${LABEL}
-    StrCmp ${HKEY_NAME} HKCU 0 +3
-    StrCpy ${HKEY_ENUM} ${HKEY_CURRENT_USER_ENUM}
-    GoTo ${LABEL}
-    StrCmp ${HKEY_NAME} HKEY_CURRENT_USER 0 +3
-    StrCpy ${HKEY_ENUM} ${HKEY_CURRENT_USER_ENUM}
-    GoTo ${LABEL}
-    StrCmp ${HKEY_NAME} HKLM 0 +3
-    StrCpy ${HKEY_ENUM} ${HKEY_LOCAL_MACHINE_ENUM}
-    GoTo ${LABEL}
-    StrCmp ${HKEY_NAME} HKEY_LOCAL_MACHINE 0 +3
-    StrCpy ${HKEY_ENUM} ${HKEY_LOCAL_MACHINE_ENUM}
-    GoTo ${LABEL}
-    StrCmp ${HKEY_NAME} HKU 0 +3
-    StrCpy ${HKEY_ENUM} ${HKEY_USERS_ENUM}
-    GoTo ${LABEL}
-    StrCmp ${HKEY_NAME} HKEY_USERS 0 +3
-    StrCpy ${HKEY_ENUM} ${HKEY_USERS_ENUM}
-    GoTo ${LABEL}
-    StrCmp ${HKEY_NAME} HKPD 0 +3
-    StrCpy ${HKEY_ENUM} ${HKEY_PERFORMANCE_DATA_ENUM}
-    GoTo ${LABEL}
-    StrCmp ${HKEY_NAME} HKEY_PERFORMANCE_DATA 0 +3
-    StrCpy ${HKEY_ENUM} ${HKEY_PERFORMANCE_DATA_ENUM}
-    GoTo ${LABEL}
-    StrCmp ${HKEY_NAME} HKCC 0 +3
-    StrCpy ${HKEY_ENUM} ${HKEY_CURRENT_CONFIG_ENUM}
-    GoTo ${LABEL}
-    StrCmp ${HKEY_NAME} HKEY_CURRENT_CONFIG 0 +3
-    StrCpy ${HKEY_ENUM} ${HKEY_CURRENT_CONFIG_ENUM}
-    GoTo ${LABEL}
-    StrCmp ${HKEY_NAME} HKDD 0 +3
-    StrCpy ${HKEY_ENUM} ${HKEY_DYN_DATA_ENUM}
-    GoTo ${LABEL}
-    StrCmp ${HKEY_NAME} HKEY_DYN_DATA 0 +3
-    StrCpy ${HKEY_ENUM} ${HKEY_DYN_DATA_ENUM}
-${LABEL}:
-!macroend
-!macro MOVEREGKEY_BASE TYPE
-!ifndef ${TYPE}MOVEREGKEY_DEFINE
-!define ${TYPE}MOVEREGKEY_DEFINE
-Function ${TYPE}CopyRegistryKey
-    Exch $1 ;Target subkey
-    Exch
-    Exch $2 ;Target key name
-    Exch
-    Exch 2
-    Exch $3 ;Source subkey
-    Exch
-    Exch 2
-    Exch 3
-    Exch $4 ;Source key name
-    Push $5 ;Source key handle
-    Push $6 ;Target key handle
-    Push $7 ;return value
-    Push $8 ;HKEY enum for target key
-    Push $9 ;HKEY enum for source key
-
-!insertmacro SET_HKEY_ENUM $2 $8 next
-!insertmacro SET_HKEY_ENUM $4 $9 next2
-
-     SetPluginUnload alwaysoff
-
-     StrCpy $5 0
-     System::Call '${RegOpenKeyEx}(i r9, t r3, 0, ${KEY_ALL_ACCESS}, .r5) .r7'
-     StrCmp $7 0 continue
-     StrCpy $1 $7
-     GoTo done
-
-continue:
-     StrCpy $6 0
-     System::Call '${RegCreateKeyEx}(i r8, t r1, 0, 0, 0, ${KEY_ALL_ACCESS}, 0, .r6, 0) .r7'
-     StrCmp $7 0 copy
-     StrCpy $1 $7
-     GoTo done
-
-copy:
-     System::Call '${SHCopyKey}(i r5, "", i r6, 0) .r7'
-     StrCpy $1 $7
-
-done:
-     System::Call '${RegCloseKey}(i r5) .r7'
-     System::Call '${RegCloseKey}(i r6) .r7'
-     SetPluginUnload manual
-     System::Free 0
-
-     Pop $9
-     Pop $8
-     Pop $7
-     Pop $6
-     Pop $5
-     Pop $4
-     Pop $3
-     Pop $2
-     Exch $1
-FunctionEnd
-!endif
-!macroend
-!macro MOVEREGKEY
-!insertmacro MOVEREGKEY_BASE ""
-!macroend
-!macro UN.MOVEREGKEY
-!insertmacro MOVEREGKEY_BASE "Un."
-!macroend
-!macro CALL_MOVEREGKEY_BASE TYPE SOURCEROOTKEY SOURCESUBKEY TARGETROOTKEY TARGETSUBKEY
-!ifdef ${TYPE}MOVEREGKEY_DEFINE
-    Push $R1
-    ReadRegStr $R1 "${TARGETROOTKEY}" "${TARGETSUBKEY}" ""
-    IfErrors 0 +2
-    WriteRegStr "${TARGETROOTKEY}" "${TARGETSUBKEY}" "" ""
-    Pop $R1
-    Push "${SOURCEROOTKEY}"
-    Push "${SOURCESUBKEY}"
-    Push "${TARGETROOTKEY}"
-    Push "${TARGETSUBKEY}"
-    Call ${TYPE}CopyRegistryKey
-!else
-!error "Macro ${TYPE}MOVEREGKEY not inserted"
-!endif
-!macroend
-####################################################################################################
-!macro CALL_MOVEREGKEY SOURCEROOTKEY SOURCESUBKEY TARGETROOTKEY TARGETSUBKEY
-!insertmacro CALL_MOVEREGKEY_BASE "" "${SOURCEROOTKEY}" "${SOURCESUBKEY}" "${TARGETROOTKEY}" "${TARGETSUBKEY}"
-!macroend
-####################################################################################################
-!macro CALL_UN.MOVEREGKEY SOURCEROOTKEY SOURCESUBKEY TARGETROOTKEY TARGETSUBKEY
-!insertmacro CALL_MOVEREGKEY_BASE "Un." "${SOURCEROOTKEY}" "${SOURCESUBKEY}" "${TARGETROOTKEY}" "${TARGETSUBKEY}"
-!macroend
-####################################################################################################
-!define MOVEREGKEY "!insertmacro CALL_MOVEREGKEY"
-!define UN.MOVEREGKEY "!insertmacro UN.CALL_MOVEREGKEY"
+/* Copy Registry Key
+   http://nsis.sourceforge.net/MOVEREGKEY
+
+Description
+	Use this function to copy a registry key along with all its values and 
+	subkeys to another location in the registry.
+
+	* this does not move.. but copies.
+	* the key still remains w/an additional copy to desired location.
+
+Usage:
+	!include registry.nsh
+	!insertmacro MOVEREGKEY
+
+	Section
+		${MOVEREGKEY} `SOURCEROOTKEY` `SOURCESUBKEY` `TARGETROOTKEY` `TARGETSUBKEY`
+		${MOVEREGKEY} HKLM SOFTWARE\NSIS HKLM SOFTWARE\BACKUP\NSIS
+	SectionEnd
+
+Uninstaller:
+	!include registry.nsh
+	!insertmacro UN.MOVEREGKEY
+
+	Section uninstall
+		${UN.MOVEREGKEY} `SOURCEROOTKEY` `SOURCESUBKEY` `TARGETROOTKEY` `TARGETSUBKEY`
+		${UN.MOVEREGKEY} HKLM SOFTWARE\NSIS HKLM SOFTWARE\BACKUP\NSIS
+	SectionEnd
+*/
+!ifndef NSISREGISTRY_NSH
+!define NSISREGISTRY_NSH
+!include `${NSISDIR}\Examples\System\system.nsh`
+
+!define HKEY_CLASSES_ROOT_ENUM           0x80000000
+!define HKEY_CURRENT_USER_ENUM           0x80000001
+!define HKEY_LOCAL_MACHINE_ENUM          0x80000002
+!define HKEY_USERS_ENUM                  0x80000003
+!define HKEY_PERFORMANCE_DATA_ENUM       0x80000004
+!define HKEY_CURRENT_CONFIG_ENUM         0x80000005
+!define HKEY_DYN_DATA_ENUM               0x80000006
+
+!define KEY_ALL_ACCESS          0x0002003F
+
+!define RegCreateKeyEx `advapi32::RegCreateKeyEx(i, t, i, t, i, i, i, *i, *i) i`
+!define RegOpenKeyEx `advapi32::RegOpenKeyEx(i, t, i, i, *i) i`
+!define RegCloseKey  `advapi32::RegCloseKey(i) i`
+!define SHCopyKey `shlwapi::SHCopyKey(i, t, i, i) i`
+
+!macro SET_HKEY_ENUM HKEY_NAME HKEY_ENUM LABEL
+    StrCmp ${HKEY_NAME} HKCR 0 +3
+    StrCpy ${HKEY_ENUM} ${HKEY_CLASSES_ROOT_ENUM}
+    GoTo ${LABEL}
+    StrCmp ${HKEY_NAME} HKEY_CLASSES_ROOT 0 +3
+    StrCpy ${HKEY_ENUM} ${HKEY_CLASSES_ROOT_ENUM}
+    GoTo ${LABEL}
+    StrCmp ${HKEY_NAME} HKCU 0 +3
+    StrCpy ${HKEY_ENUM} ${HKEY_CURRENT_USER_ENUM}
+    GoTo ${LABEL}
+    StrCmp ${HKEY_NAME} HKEY_CURRENT_USER 0 +3
+    StrCpy ${HKEY_ENUM} ${HKEY_CURRENT_USER_ENUM}
+    GoTo ${LABEL}
+    StrCmp ${HKEY_NAME} HKLM 0 +3
+    StrCpy ${HKEY_ENUM} ${HKEY_LOCAL_MACHINE_ENUM}
+    GoTo ${LABEL}
+    StrCmp ${HKEY_NAME} HKEY_LOCAL_MACHINE 0 +3
+    StrCpy ${HKEY_ENUM} ${HKEY_LOCAL_MACHINE_ENUM}
+    GoTo ${LABEL}
+    StrCmp ${HKEY_NAME} HKU 0 +3
+    StrCpy ${HKEY_ENUM} ${HKEY_USERS_ENUM}
+    GoTo ${LABEL}
+    StrCmp ${HKEY_NAME} HKEY_USERS 0 +3
+    StrCpy ${HKEY_ENUM} ${HKEY_USERS_ENUM}
+    GoTo ${LABEL}
+    StrCmp ${HKEY_NAME} HKPD 0 +3
+    StrCpy ${HKEY_ENUM} ${HKEY_PERFORMANCE_DATA_ENUM}
+    GoTo ${LABEL}
+    StrCmp ${HKEY_NAME} HKEY_PERFORMANCE_DATA 0 +3
+    StrCpy ${HKEY_ENUM} ${HKEY_PERFORMANCE_DATA_ENUM}
+    GoTo ${LABEL}
+    StrCmp ${HKEY_NAME} HKCC 0 +3
+    StrCpy ${HKEY_ENUM} ${HKEY_CURRENT_CONFIG_ENUM}
+    GoTo ${LABEL}
+    StrCmp ${HKEY_NAME} HKEY_CURRENT_CONFIG 0 +3
+    StrCpy ${HKEY_ENUM} ${HKEY_CURRENT_CONFIG_ENUM}
+    GoTo ${LABEL}
+    StrCmp ${HKEY_NAME} HKDD 0 +3
+    StrCpy ${HKEY_ENUM} ${HKEY_DYN_DATA_ENUM}
+    GoTo ${LABEL}
+    StrCmp ${HKEY_NAME} HKEY_DYN_DATA 0 +3
+    StrCpy ${HKEY_ENUM} ${HKEY_DYN_DATA_ENUM}
+${LABEL}:
+!macroend
+!macro MOVEREGKEY_BASE TYPE
+!ifndef ${TYPE}MOVEREGKEY_DEFINE
+!define ${TYPE}MOVEREGKEY_DEFINE
+Function ${TYPE}CopyRegistryKey
+    Exch $1 ;Target subkey
+    Exch
+    Exch $2 ;Target key name
+    Exch
+    Exch 2
+    Exch $3 ;Source subkey
+    Exch
+    Exch 2
+    Exch 3
+    Exch $4 ;Source key name
+    Push $5 ;Source key handle
+    Push $6 ;Target key handle
+    Push $7 ;return value
+    Push $8 ;HKEY enum for target key
+    Push $9 ;HKEY enum for source key
+
+!insertmacro SET_HKEY_ENUM $2 $8 next
+!insertmacro SET_HKEY_ENUM $4 $9 next2
+
+     SetPluginUnload alwaysoff
+
+     StrCpy $5 0
+     System::Call '${RegOpenKeyEx}(i r9, t r3, 0, ${KEY_ALL_ACCESS}, .r5) .r7'
+     StrCmp $7 0 continue
+     StrCpy $1 $7
+     GoTo done
+
+continue:
+     StrCpy $6 0
+     System::Call '${RegCreateKeyEx}(i r8, t r1, 0, 0, 0, ${KEY_ALL_ACCESS}, 0, .r6, 0) .r7'
+     StrCmp $7 0 copy
+     StrCpy $1 $7
+     GoTo done
+
+copy:
+     System::Call '${SHCopyKey}(i r5, "", i r6, 0) .r7'
+     StrCpy $1 $7
+
+done:
+     System::Call '${RegCloseKey}(i r5) .r7'
+     System::Call '${RegCloseKey}(i r6) .r7'
+     SetPluginUnload manual
+     System::Free 0
+
+     Pop $9
+     Pop $8
+     Pop $7
+     Pop $6
+     Pop $5
+     Pop $4
+     Pop $3
+     Pop $2
+     Exch $1
+FunctionEnd
+!endif
+!macroend
+!macro MOVEREGKEY
+!insertmacro MOVEREGKEY_BASE ""
+!macroend
+!macro UN.MOVEREGKEY
+!insertmacro MOVEREGKEY_BASE "Un."
+!macroend
+!macro CALL_MOVEREGKEY_BASE TYPE SOURCEROOTKEY SOURCESUBKEY TARGETROOTKEY TARGETSUBKEY
+!ifdef ${TYPE}MOVEREGKEY_DEFINE
+    Push $R1
+    ReadRegStr $R1 "${TARGETROOTKEY}" "${TARGETSUBKEY}" ""
+    IfErrors 0 +2
+    WriteRegStr "${TARGETROOTKEY}" "${TARGETSUBKEY}" "" ""
+    Pop $R1
+    Push "${SOURCEROOTKEY}"
+    Push "${SOURCESUBKEY}"
+    Push "${TARGETROOTKEY}"
+    Push "${TARGETSUBKEY}"
+    Call ${TYPE}CopyRegistryKey
+!else
+!error "Macro ${TYPE}MOVEREGKEY not inserted"
+!endif
+!macroend
+####################################################################################################
+!macro CALL_MOVEREGKEY SOURCEROOTKEY SOURCESUBKEY TARGETROOTKEY TARGETSUBKEY
+!insertmacro CALL_MOVEREGKEY_BASE "" "${SOURCEROOTKEY}" "${SOURCESUBKEY}" "${TARGETROOTKEY}" "${TARGETSUBKEY}"
+!macroend
+####################################################################################################
+!macro CALL_UN.MOVEREGKEY SOURCEROOTKEY SOURCESUBKEY TARGETROOTKEY TARGETSUBKEY
+!insertmacro CALL_MOVEREGKEY_BASE "Un." "${SOURCEROOTKEY}" "${SOURCESUBKEY}" "${TARGETROOTKEY}" "${TARGETSUBKEY}"
+!macroend
+####################################################################################################
+!define MOVEREGKEY "!insertmacro CALL_MOVEREGKEY"
+!define UN.MOVEREGKEY "!insertmacro UN.CALL_MOVEREGKEY"
 !endif
\ No newline at end of file
diff --git a/Other/Source/NewTextReplace.nsh b/etc/source/NewTextReplace.nsh
similarity index 100%
rename from Other/Source/NewTextReplace.nsh
rename to etc/source/NewTextReplace.nsh
diff --git a/Other/Source/NullByte.nsh b/etc/source/NullByte.nsh
similarity index 100%
rename from Other/Source/NullByte.nsh
rename to etc/source/NullByte.nsh
diff --git a/Other/Source/Plugins/ExecCmd.dll b/etc/source/Plugins/ExecCmd.dll
similarity index 100%
rename from Other/Source/Plugins/ExecCmd.dll
rename to etc/source/Plugins/ExecCmd.dll
diff --git a/Other/Source/Plugins/ExecCmd/Example.nsi b/etc/source/Plugins/ExecCmd/Example.nsi
similarity index 96%
rename from Other/Source/Plugins/ExecCmd/Example.nsi
rename to etc/source/Plugins/ExecCmd/Example.nsi
index a0cf7a0..26f6b24 100644
--- a/Other/Source/Plugins/ExecCmd/Example.nsi
+++ b/etc/source/Plugins/ExecCmd/Example.nsi
@@ -1,48 +1,48 @@
-;--------------------------------
-; ExecCmd plug-in Script Sample
-; Takhir Bedertdinov
-
-
-!define APP_NAME ExecCmd
-!define DOS_APP consApp.exe
-
-Name "${APP_NAME} Test"
-OutFile "${APP_NAME}.exe"
-
-!include "MUI.nsh"
-!insertmacro MUI_PAGE_INSTFILES
-!insertmacro MUI_LANGUAGE "English"
-
-
-; 'exec' command line
-; ExecCmd::exec [/NOUNLOAD] [/ASYNC] [/TEST] [/TIMEOUT=TO_MS] CMD_LINE [STDIN_STRING]
-
-
-Section "Dummy Section" SecDummy
-
-    SetOutPath "$EXEDIR" ; for stdin.txt and stdout.txt file names without path
-
-; sync call - not requires wait and nounload
-; stdin from file and stdout to file, works on old OSs
-    ExecCmd::exec '"$EXEDIR\consApp.exe" <stdin.txt >stdout.txt' ""
-
-
-; stdin from string. More secure for passwords, but not works on Win98. >stdout is optional
-#    ExecCmd::exec '"$EXEDIR\consApp.exe" >stdout.txt' "test_login$\r$\ntest_pwd$\r$\n"
-
-
-; async launch, stdout to file
-#  ExecCmd::exec /NOUNLOAD /ASYNC /TIMEOUT=2000 \
-#    '"$EXEDIR\consApp.exe" >stdout.txt' "test_login$\r$\ntest_pwd$\r$\n"
-#    Pop $0 ; thread handle for 'wait'
-; can put some other code here for parallel execution
-; it's time to check process exit code, $0 is thread handle we Pop'ed above
-#    ExecCmd::wait $0
-
-
-    Pop $0 ; return value - process exit code or error or STILL_ACTIVE (259).
-; normal exit code is 5 for consApp.exe
-    MessageBox MB_OK "Exit code $0"
-
-SectionEnd
-
+;--------------------------------
+; ExecCmd plug-in Script Sample
+; Takhir Bedertdinov
+
+
+!define APP_NAME ExecCmd
+!define DOS_APP consApp.exe
+
+Name "${APP_NAME} Test"
+OutFile "${APP_NAME}.exe"
+
+!include "MUI.nsh"
+!insertmacro MUI_PAGE_INSTFILES
+!insertmacro MUI_LANGUAGE "English"
+
+
+; 'exec' command line
+; ExecCmd::exec [/NOUNLOAD] [/ASYNC] [/TEST] [/TIMEOUT=TO_MS] CMD_LINE [STDIN_STRING]
+
+
+Section "Dummy Section" SecDummy
+
+    SetOutPath "$EXEDIR" ; for stdin.txt and stdout.txt file names without path
+
+; sync call - not requires wait and nounload
+; stdin from file and stdout to file, works on old OSs
+    ExecCmd::exec '"$EXEDIR\consApp.exe" <stdin.txt >stdout.txt' ""
+
+
+; stdin from string. More secure for passwords, but not works on Win98. >stdout is optional
+#    ExecCmd::exec '"$EXEDIR\consApp.exe" >stdout.txt' "test_login$\r$\ntest_pwd$\r$\n"
+
+
+; async launch, stdout to file
+#  ExecCmd::exec /NOUNLOAD /ASYNC /TIMEOUT=2000 \
+#    '"$EXEDIR\consApp.exe" >stdout.txt' "test_login$\r$\ntest_pwd$\r$\n"
+#    Pop $0 ; thread handle for 'wait'
+; can put some other code here for parallel execution
+; it's time to check process exit code, $0 is thread handle we Pop'ed above
+#    ExecCmd::wait $0
+
+
+    Pop $0 ; return value - process exit code or error or STILL_ACTIVE (259).
+; normal exit code is 5 for consApp.exe
+    MessageBox MB_OK "Exit code $0"
+
+SectionEnd
+
diff --git a/Other/Source/Plugins/ExecCmd/gnupg.nsi b/etc/source/Plugins/ExecCmd/gnupg.nsi
similarity index 95%
rename from Other/Source/Plugins/ExecCmd/gnupg.nsi
rename to etc/source/Plugins/ExecCmd/gnupg.nsi
index fa1ceef..19c4b30 100644
--- a/Other/Source/Plugins/ExecCmd/gnupg.nsi
+++ b/etc/source/Plugins/ExecCmd/gnupg.nsi
@@ -1,39 +1,39 @@
-;--------------------------------
-; execDos Script Sample
-; Takhir Bedertdinov
-
-
-;--------------------------------
-; Base names definition
-
-!define APP_NAME GNUPG
-
-
-;--------------------------------
-; General Attributes
-
-Name "${APP_NAME} Test"
-OutFile "${APP_NAME}.exe"
-
-
-;--------------------------------
-; Interface Settings
-
-  !include "MUI.nsh"
-  !insertmacro MUI_PAGE_INSTFILES
-  !insertmacro MUI_LANGUAGE "English"
-
-
-;--------------------------------
-; Installer Sections
-
-Section "Dummy Section" SecDummy
-
-  SetOutPath "$EXEDIR"
-; Use /TEST option to see console
-  ExecCmd::exec /TIMEOUT=10000 '"gpg.exe --gen-key" >gpg.log'"1$\r$\n1024$\r$\n0$\r$\ny$\r$\ngpguser$\r$\ngpguser@gpguser$\r$\nmycomment$\r$\no$\r$\nmypassphrase$\r$\nmypassphrase$\r$\n"
-  Pop $0 # return value - process exit code or error or still running.
-  MessageBox MB_OK "Exit code $0"
-
-SectionEnd
-
+;--------------------------------
+; execDos Script Sample
+; Takhir Bedertdinov
+
+
+;--------------------------------
+; Base names definition
+
+!define APP_NAME GNUPG
+
+
+;--------------------------------
+; General Attributes
+
+Name "${APP_NAME} Test"
+OutFile "${APP_NAME}.exe"
+
+
+;--------------------------------
+; Interface Settings
+
+  !include "MUI.nsh"
+  !insertmacro MUI_PAGE_INSTFILES
+  !insertmacro MUI_LANGUAGE "English"
+
+
+;--------------------------------
+; Installer Sections
+
+Section "Dummy Section" SecDummy
+
+  SetOutPath "$EXEDIR"
+; Use /TEST option to see console
+  ExecCmd::exec /TIMEOUT=10000 '"gpg.exe --gen-key" >gpg.log'"1$\r$\n1024$\r$\n0$\r$\ny$\r$\ngpguser$\r$\ngpguser@gpguser$\r$\nmycomment$\r$\no$\r$\nmypassphrase$\r$\nmypassphrase$\r$\n"
+  Pop $0 # return value - process exit code or error or still running.
+  MessageBox MB_OK "Exit code $0"
+
+SectionEnd
+
diff --git a/Other/Source/Plugins/ExecCmd/mysqladmin.nsi b/etc/source/Plugins/ExecCmd/mysqladmin.nsi
similarity index 95%
rename from Other/Source/Plugins/ExecCmd/mysqladmin.nsi
rename to etc/source/Plugins/ExecCmd/mysqladmin.nsi
index 0a60b72..84e08a9 100644
--- a/Other/Source/Plugins/ExecCmd/mysqladmin.nsi
+++ b/etc/source/Plugins/ExecCmd/mysqladmin.nsi
@@ -1,39 +1,39 @@
-;--------------------------------
-; execcmd Script Sample
-; Takhir Bedertdinov
-
-
-;--------------------------------
-; Base names definition
-
-!define APP_NAME mysql
-
-
-;--------------------------------
-; General Attributes
-
-Name "${APP_NAME} Test"
-OutFile "${APP_NAME}.exe"
-
-
-;--------------------------------
-; Interface Settings
-
-  !include "MUI.nsh"
-  !insertmacro MUI_PAGE_INSTFILES
-  !insertmacro MUI_LANGUAGE "English"
-
-
-;--------------------------------
-; Installer Sections
-
-Section "Dummy Section" SecDummy
-
-  SetOutPath "$EXEDIR"
-  ReadEnvStr $0 "ComSpec"
-  ExecCmd::exec /TIMEOUT=10000 '"mysqladmin.exe -p -uroot reload" >mysql.log' "my_password$\r$\n"
-  Pop $0 # return value - process exit code or error or still running.
-  MessageBox MB_OK "Exit code $0"
-
-SectionEnd
-
+;--------------------------------
+; execcmd Script Sample
+; Takhir Bedertdinov
+
+
+;--------------------------------
+; Base names definition
+
+!define APP_NAME mysql
+
+
+;--------------------------------
+; General Attributes
+
+Name "${APP_NAME} Test"
+OutFile "${APP_NAME}.exe"
+
+
+;--------------------------------
+; Interface Settings
+
+  !include "MUI.nsh"
+  !insertmacro MUI_PAGE_INSTFILES
+  !insertmacro MUI_LANGUAGE "English"
+
+
+;--------------------------------
+; Installer Sections
+
+Section "Dummy Section" SecDummy
+
+  SetOutPath "$EXEDIR"
+  ReadEnvStr $0 "ComSpec"
+  ExecCmd::exec /TIMEOUT=10000 '"mysqladmin.exe -p -uroot reload" >mysql.log' "my_password$\r$\n"
+  Pop $0 # return value - process exit code or error or still running.
+  MessageBox MB_OK "Exit code $0"
+
+SectionEnd
+
diff --git a/Other/Source/Plugins/ExecDos/Batch.nsi b/etc/source/Plugins/ExecDos/Batch.nsi
similarity index 94%
rename from Other/Source/Plugins/ExecDos/Batch.nsi
rename to etc/source/Plugins/ExecDos/Batch.nsi
index 7cbfd6c..a883169 100644
--- a/Other/Source/Plugins/ExecDos/Batch.nsi
+++ b/etc/source/Plugins/ExecDos/Batch.nsi
@@ -1,19 +1,19 @@
-
-!define APP_NAME BatchTest
-
-Name "${APP_NAME} Test"
-OutFile "${APP_NAME}.exe"
-
-!include "MUI2.nsh"
-!insertmacro MUI_PAGE_INSTFILES
-!insertmacro MUI_LANGUAGE "English"
-
-
-Section "Dummy Section" SecDummy
-
-    ExecDos::exec '"$EXEDIR\first.bat"' "" "$EXEDIR\stdout.txt"
-    Pop $0
-    MessageBox MB_OK "Exit code $0"
-
-SectionEnd
-
+
+!define APP_NAME BatchTest
+
+Name "${APP_NAME} Test"
+OutFile "${APP_NAME}.exe"
+
+!include "MUI2.nsh"
+!insertmacro MUI_PAGE_INSTFILES
+!insertmacro MUI_LANGUAGE "English"
+
+
+Section "Dummy Section" SecDummy
+
+    ExecDos::exec '"$EXEDIR\first.bat"' "" "$EXEDIR\stdout.txt"
+    Pop $0
+    MessageBox MB_OK "Exit code $0"
+
+SectionEnd
+
diff --git a/Other/Source/Plugins/ExecDos/Detailed.nsi b/etc/source/Plugins/ExecDos/Detailed.nsi
similarity index 95%
rename from Other/Source/Plugins/ExecDos/Detailed.nsi
rename to etc/source/Plugins/ExecDos/Detailed.nsi
index 5e6466a..fd62242 100644
--- a/Other/Source/Plugins/ExecDos/Detailed.nsi
+++ b/etc/source/Plugins/ExecDos/Detailed.nsi
@@ -1,47 +1,47 @@
-;--------------------------------
-; ExecDos plug-in Script Sample
-; Takhir Bedertdinov
-
-
-;--------------------------------
-; Base names definition
-
-  !define APP_NAME Detailed
-  !define DOS_APP consApp.exe
-
-
-;--------------------------------
-; General Attributes
-
-Name "${APP_NAME} Test"
-OutFile "${APP_NAME}.exe"
-
-
-;--------------------------------
-; Interface Settings
-
-  !include "MUI2.nsh"
-  !insertmacro MUI_PAGE_INSTFILES
-  !insertmacro MUI_LANGUAGE "English"
-
-
-;--------------------------------
-; Installer Sections
-
-Section "Dummy Section" SecDummy
-
-    SetDetailsView show
-    DetailPrint "Executing console application" 
-; async launch
-    ExecDos::exec /ASYNC /DETAILED /TIMEOUT=6000 "$EXEDIR\consApp.exe" "test_login$\ntest_pwd$\n"
-    Pop $0 ; thread handle for 'wait'
-
-; time to check process exit code (optional)
-    ExecDos::wait $0
-
-    Pop $0 ; return value - process exit code or error or STILL_ACTIVE (0x103).
-; normal exit code is 5 for consApp.exe
-    MessageBox MB_OK "Exit code $0"
-
-
-SectionEnd
+;--------------------------------
+; ExecDos plug-in Script Sample
+; Takhir Bedertdinov
+
+
+;--------------------------------
+; Base names definition
+
+  !define APP_NAME Detailed
+  !define DOS_APP consApp.exe
+
+
+;--------------------------------
+; General Attributes
+
+Name "${APP_NAME} Test"
+OutFile "${APP_NAME}.exe"
+
+
+;--------------------------------
+; Interface Settings
+
+  !include "MUI2.nsh"
+  !insertmacro MUI_PAGE_INSTFILES
+  !insertmacro MUI_LANGUAGE "English"
+
+
+;--------------------------------
+; Installer Sections
+
+Section "Dummy Section" SecDummy
+
+    SetDetailsView show
+    DetailPrint "Executing console application" 
+; async launch
+    ExecDos::exec /ASYNC /DETAILED /TIMEOUT=6000 "$EXEDIR\consApp.exe" "test_login$\ntest_pwd$\n"
+    Pop $0 ; thread handle for 'wait'
+
+; time to check process exit code (optional)
+    ExecDos::wait $0
+
+    Pop $0 ; return value - process exit code or error or STILL_ACTIVE (0x103).
+; normal exit code is 5 for consApp.exe
+    MessageBox MB_OK "Exit code $0"
+
+
+SectionEnd
diff --git a/Other/Source/Plugins/ExecDos/Example.nsi b/etc/source/Plugins/ExecDos/Example.nsi
similarity index 96%
rename from Other/Source/Plugins/ExecDos/Example.nsi
rename to etc/source/Plugins/ExecDos/Example.nsi
index 2f09f04..4aa574a 100644
--- a/Other/Source/Plugins/ExecDos/Example.nsi
+++ b/etc/source/Plugins/ExecDos/Example.nsi
@@ -1,78 +1,78 @@
-;--------------------------------
-; ExecDos plug-in Script Sample
-; Takhir Bedertdinov
-
-
-;--------------------------------
-; Base names definition
-
-  !define APP_NAME ExecDos
-  !define DOS_APP consApp.exe
-
-
-;--------------------------------
-; General Attributes
-
-Name "${APP_NAME} Test"
-OutFile "${APP_NAME}.exe"
-
-
-;--------------------------------
-; Interface Settings
-
-  !include "MUI2.nsh"
-  !insertmacro MUI_PAGE_INSTFILES
-  !insertmacro MUI_LANGUAGE "English"
-
-
-;--------------------------------
-; Installer Sections
-
-Section "Dummy Section" SecDummy
-
-; entry points: 'exec' and 'wait'
-
-; exec - starts hidden process with redirected IO
-; parameters: [/NOUNLOAD /ASYNC] [/TIMEOUT=xxx] [/TOSTACK] application_to_run [stdin_string] [log_file_name]
-; /ASYNC - not waits for process exit.
-; timeout is TOTAL execution time, milliseconds
-; for example /TIMEOUT=10000    Should be >50   Default is big enough
-; short timeouts may cause -8 plug-in exit code (APPLICATION TERMINATED)
-; application_to_run is mandatory, other params are optional, but if stack
-; stores other vars, would be better to set "" for unused parameter
-; return value in the sync mode is application' exit code
-; with /ASYNC option returns thread handle
-
-; wait - waits for process exit (with /ASYNC option only). Require thread handle. Optional if you don't need exit code.
-; parameters: thread_handle. If stack is not used between 'exec' and 'wait', both Pop $0 and 'wait' param may be skipped.
-; process exit code is available (Pop) after 'wait' exits.
-
-    DetailPrint "Executing console application" 
-; async launch
-    ExecDos::exec /NOUNLOAD /ASYNC /TIMEOUT=5000 "$EXEDIR\consApp.exe" "test_login$\ntest_pwd$\n" "$EXEDIR\stdout.txt"
-    Pop $0 ; thread handle for 'wait'
-
-; you can add installation code here, for example
-    Sleep 1000
-    DetailPrint "Installing Software"
-    Sleep 1000
-    DetailPrint "Installing More Software"
-    Sleep 1000
-
-; time to check process exit code (optional)
-    ExecDos::wait $0
-
-; sync launch
-;    ExecDos::exec /TIMEOUT=5000 "$EXEDIR\consApp.exe" "test_login$\ntest_pwd$\n" "$EXEDIR\stdout.txt"
-
-    Pop $0 ; return value - process exit code or error or STILL_ACTIVE (0x103).
-; normal exit code is 5 for consApp.exe
-    MessageBox MB_OK "Exit code $0"
-
-SectionEnd
-
-;Function .onInit
-;    ExecDos::exec /NOUNLOAD /TIMEOUT=5000 "$EXEDIR\consApp.exe" "test_login$\ntest_pwd$\n" "$EXEDIR\${APP_NAME}.log"
-;    Pop $0
-;    MessageBox MB_OK "Exit code $0"
-;FunctionEnd
+;--------------------------------
+; ExecDos plug-in Script Sample
+; Takhir Bedertdinov
+
+
+;--------------------------------
+; Base names definition
+
+  !define APP_NAME ExecDos
+  !define DOS_APP consApp.exe
+
+
+;--------------------------------
+; General Attributes
+
+Name "${APP_NAME} Test"
+OutFile "${APP_NAME}.exe"
+
+
+;--------------------------------
+; Interface Settings
+
+  !include "MUI2.nsh"
+  !insertmacro MUI_PAGE_INSTFILES
+  !insertmacro MUI_LANGUAGE "English"
+
+
+;--------------------------------
+; Installer Sections
+
+Section "Dummy Section" SecDummy
+
+; entry points: 'exec' and 'wait'
+
+; exec - starts hidden process with redirected IO
+; parameters: [/NOUNLOAD /ASYNC] [/TIMEOUT=xxx] [/TOSTACK] application_to_run [stdin_string] [log_file_name]
+; /ASYNC - not waits for process exit.
+; timeout is TOTAL execution time, milliseconds
+; for example /TIMEOUT=10000    Should be >50   Default is big enough
+; short timeouts may cause -8 plug-in exit code (APPLICATION TERMINATED)
+; application_to_run is mandatory, other params are optional, but if stack
+; stores other vars, would be better to set "" for unused parameter
+; return value in the sync mode is application' exit code
+; with /ASYNC option returns thread handle
+
+; wait - waits for process exit (with /ASYNC option only). Require thread handle. Optional if you don't need exit code.
+; parameters: thread_handle. If stack is not used between 'exec' and 'wait', both Pop $0 and 'wait' param may be skipped.
+; process exit code is available (Pop) after 'wait' exits.
+
+    DetailPrint "Executing console application" 
+; async launch
+    ExecDos::exec /NOUNLOAD /ASYNC /TIMEOUT=5000 "$EXEDIR\consApp.exe" "test_login$\ntest_pwd$\n" "$EXEDIR\stdout.txt"
+    Pop $0 ; thread handle for 'wait'
+
+; you can add installation code here, for example
+    Sleep 1000
+    DetailPrint "Installing Software"
+    Sleep 1000
+    DetailPrint "Installing More Software"
+    Sleep 1000
+
+; time to check process exit code (optional)
+    ExecDos::wait $0
+
+; sync launch
+;    ExecDos::exec /TIMEOUT=5000 "$EXEDIR\consApp.exe" "test_login$\ntest_pwd$\n" "$EXEDIR\stdout.txt"
+
+    Pop $0 ; return value - process exit code or error or STILL_ACTIVE (0x103).
+; normal exit code is 5 for consApp.exe
+    MessageBox MB_OK "Exit code $0"
+
+SectionEnd
+
+;Function .onInit
+;    ExecDos::exec /NOUNLOAD /TIMEOUT=5000 "$EXEDIR\consApp.exe" "test_login$\ntest_pwd$\n" "$EXEDIR\${APP_NAME}.log"
+;    Pop $0
+;    MessageBox MB_OK "Exit code $0"
+;FunctionEnd
diff --git a/Other/Source/Plugins/ExecDos/IsDone.nsi b/etc/source/Plugins/ExecDos/IsDone.nsi
similarity index 95%
rename from Other/Source/Plugins/ExecDos/IsDone.nsi
rename to etc/source/Plugins/ExecDos/IsDone.nsi
index f3cc325..4d0c116 100644
--- a/Other/Source/Plugins/ExecDos/IsDone.nsi
+++ b/etc/source/Plugins/ExecDos/IsDone.nsi
@@ -1,63 +1,63 @@
-;--------------------------------
-; ExecDos plug-in Script Sample
-; Takhir Bedertdinov
-
-
-;--------------------------------
-; Base names definition
-
-  !define APP_NAME "ExecDos IsDone"
-  !define DOS_APP consApp.exe
-
-
-;--------------------------------
-; General Attributes
-
-Name "${APP_NAME} Test"
-OutFile "${APP_NAME}.exe"
-
-
-;--------------------------------
-; Interface Settings
-
-  !include "MUI2.nsh"
-  !insertmacro MUI_PAGE_INSTFILES
-
-
-  !insertmacro MUI_LANGUAGE "English"
-
-; $R1 - process status, 1 = exited, 0 = still running
-; $R7 - Exit code
-; $R9 - thread handle
-
-
-
-;--------------------------------
-; Installer Sections
-
-Section "Dummy Section" SecDummy
-
-  SetDetailsView show
-
-; async launch to detailed  - no last parameter.
-  DetailPrint "Executing console application, async mode" 
-  ExecDos::exec /NOUNLOAD /ASYNC /DETAILED /TIMEOUT=6000 "$EXEDIR\consApp.exe" "test_login$\ntest_pwd$\n"
-  Pop $R9 ; thread handle for 'wait'
-  ExecDos::isdone /NOUNLOAD $R9
-  Pop $R1
-  DetailPrint "isdone returned $R1" 
-  Sleep 5000
-  ExecDos::isdone /NOUNLOAD $R9
-  Pop $R1
-  DetailPrint "isdone returned $R1" 
-; some other code may be here
-; time to check process exit code (optional)
-  ExecDos::wait $R9
-  Pop $R7
-
-; normal exit code is 5 for consApp.exe
-  DetailPrint "Exit code $R7" 
-
-
-SectionEnd
-
+;--------------------------------
+; ExecDos plug-in Script Sample
+; Takhir Bedertdinov
+
+
+;--------------------------------
+; Base names definition
+
+  !define APP_NAME "ExecDos IsDone"
+  !define DOS_APP consApp.exe
+
+
+;--------------------------------
+; General Attributes
+
+Name "${APP_NAME} Test"
+OutFile "${APP_NAME}.exe"
+
+
+;--------------------------------
+; Interface Settings
+
+  !include "MUI2.nsh"
+  !insertmacro MUI_PAGE_INSTFILES
+
+
+  !insertmacro MUI_LANGUAGE "English"
+
+; $R1 - process status, 1 = exited, 0 = still running
+; $R7 - Exit code
+; $R9 - thread handle
+
+
+
+;--------------------------------
+; Installer Sections
+
+Section "Dummy Section" SecDummy
+
+  SetDetailsView show
+
+; async launch to detailed  - no last parameter.
+  DetailPrint "Executing console application, async mode" 
+  ExecDos::exec /NOUNLOAD /ASYNC /DETAILED /TIMEOUT=6000 "$EXEDIR\consApp.exe" "test_login$\ntest_pwd$\n"
+  Pop $R9 ; thread handle for 'wait'
+  ExecDos::isdone /NOUNLOAD $R9
+  Pop $R1
+  DetailPrint "isdone returned $R1" 
+  Sleep 5000
+  ExecDos::isdone /NOUNLOAD $R9
+  Pop $R1
+  DetailPrint "isdone returned $R1" 
+; some other code may be here
+; time to check process exit code (optional)
+  ExecDos::wait $R9
+  Pop $R7
+
+; normal exit code is 5 for consApp.exe
+  DetailPrint "Exit code $R7" 
+
+
+SectionEnd
+
diff --git a/Other/Source/Plugins/ExecDos/Multi.nsi b/etc/source/Plugins/ExecDos/Multi.nsi
similarity index 97%
rename from Other/Source/Plugins/ExecDos/Multi.nsi
rename to etc/source/Plugins/ExecDos/Multi.nsi
index df9733f..5a7a90b 100644
--- a/Other/Source/Plugins/ExecDos/Multi.nsi
+++ b/etc/source/Plugins/ExecDos/Multi.nsi
@@ -1,25 +1,25 @@
-!define APP_NAME Multi
-!define DOS_APP consApp.exe
-
-Name "${APP_NAME} Test"
-OutFile "${APP_NAME}.exe"
-
-
-  !include "MUI2.nsh"
-  !insertmacro MUI_PAGE_INSTFILES
-  !insertmacro MUI_LANGUAGE "English"
-
-Section "Dummy Section" SecDummy
-
-; async launch, application sleeps 1 sec while bat is executing (see consApp.cpp)
-    ExecDos::exec /NOUNLOAD /ASYNC "$EXEDIR\consApp.exe" "test_login$\ntest_pwd$\n" "$EXEDIR\stdout1.txt"
-    Pop $0 ; consApp.exe thread handle for 'wait'
-; sync launch (may be async as well, but with 'ExecDos::wait /NOUNLOAD $1' and 'Pop $1' this case)
-    ExecDos::exec /NOUNLOAD "$EXEDIR\first.bat" "" "$EXEDIR\stdout2.txt"
-    Pop $1 ; bat exit code
-    ExecDos::wait $0 ; consApp.exe handle
-    Pop $0 ; return value - consApp.exe exit code or error or STILL_ACTIVE (0x103).
-; normal exit code is 5 for consApp.exe, 0 for bat. log files have additional info
-    MessageBox MB_OK "Exit code bat=$1, exe=$0"
-
-SectionEnd
+!define APP_NAME Multi
+!define DOS_APP consApp.exe
+
+Name "${APP_NAME} Test"
+OutFile "${APP_NAME}.exe"
+
+
+  !include "MUI2.nsh"
+  !insertmacro MUI_PAGE_INSTFILES
+  !insertmacro MUI_LANGUAGE "English"
+
+Section "Dummy Section" SecDummy
+
+; async launch, application sleeps 1 sec while bat is executing (see consApp.cpp)
+    ExecDos::exec /NOUNLOAD /ASYNC "$EXEDIR\consApp.exe" "test_login$\ntest_pwd$\n" "$EXEDIR\stdout1.txt"
+    Pop $0 ; consApp.exe thread handle for 'wait'
+; sync launch (may be async as well, but with 'ExecDos::wait /NOUNLOAD $1' and 'Pop $1' this case)
+    ExecDos::exec /NOUNLOAD "$EXEDIR\first.bat" "" "$EXEDIR\stdout2.txt"
+    Pop $1 ; bat exit code
+    ExecDos::wait $0 ; consApp.exe handle
+    Pop $0 ; return value - consApp.exe exit code or error or STILL_ACTIVE (0x103).
+; normal exit code is 5 for consApp.exe, 0 for bat. log files have additional info
+    MessageBox MB_OK "Exit code bat=$1, exe=$0"
+
+SectionEnd
diff --git a/Other/Source/Plugins/ExecDos/Readme.txt b/etc/source/Plugins/ExecDos/Readme.txt
similarity index 98%
rename from Other/Source/Plugins/ExecDos/Readme.txt
rename to etc/source/Plugins/ExecDos/Readme.txt
index 1c3fe6b..5606d8a 100644
--- a/Other/Source/Plugins/ExecDos/Readme.txt
+++ b/etc/source/Plugins/ExecDos/Readme.txt
@@ -1,58 +1,58 @@
-Description
-
-Plug-in works with console applications - creates hidden child process with redirected i/o. Compare to NSISdl has 4 add-ons: 1) string parameter that serves as stdin for running application; 2) sync/async process launch option; 3) works out of section as well; 4) multithreading.  First may be useful if you want to give login/password to the running application, second - for long running applications, third - for .onInit function check outs, fourth - to run few DOS application at a time. Plug-in can put application output to log file, 'detailed' installer window, any other text window, to installer stack or call script function to handle every line. Maximim input string size is 8kB in the special NSIS build, 1 kB otherwise.
-
-
-How To Use
-
-  ExecDos::exec [/ASYNC] [/TIMEOUT=xxx] [/TOSTACK | /DETAILED | /TOWINDOW | /TOFUNC] [/ENDFUNC=func] [/DISABLEFSR] application_to_run [stdin_string] [log_file_name | window | function]
-
-  /ASYNC - not waits for process exit. Use 'wait' to get exit code
-  /TIMEOUT - TOTAL execution time, milliseconds, for example /TIMEOUT=10000. 
-            Default is big enough. Short timeouts may cause app to be terminated. 
-  /TOSTACK - puts not empty output lines to stack (not reads log_file_name parameter from stack)
-  /DETAILED - puts output lines to installer' detailed window
-  /TOWINDOW - adds output lines to target window. Edit, RichEdit, ListView and ListBox supported
-  /TOFUNC - pushes output lines to installer stack and calls script function
-  /DISABLEFSR - disables WOW64 file system redirection on x64 machines for the ExecDos internal thread
-  application_to_run - application to run (required)
-  stdin_string - all that application can get from stdin (optional)
-  log_file_name - file where to put app's stdout (optional) OR target window handle OR script function pointer
-Please note - last 2 parameters are optional if installer stack is empty. More safe to use "" for unused parameters in case the stack is not empty. If you find a random file appearing during install then this is why (i.e. log_file_name)!
-
-  ExecDos::wait HANDLE
-  HANDLE - for async mode only, thread handle to wait for. Returnes application exit code or error code.
-
-  ExecDos::isdone HANDLE
-  HANDLE - for async mode only, checks thread is running. Returns 1 if application have exited, 0 if still running, -1 on error.
-
-
-Example of async launch
-
-  ExecDos::exec /ASYNC "$EXEDIR\consApp.exe" "test_login$\ntest_pwd$\n" "$EXEDIR\execdos.log"
-  Pop $0 ; thread handle for 'wait'.
-  ExecDos::wait $0
-  Pop $0 ; exit code
-  MessageBox MB_OK "Exit code $0"
-
-sync launch
-
-  ExecDos::exec "$EXEDIR\consApp.exe" "" ""
-  Pop $0 ; exit code
-  MessageBox MB_OK "Exit code $0"
-
-
-BAT files specifics
-
-On some of Win98 systems "Close on exit" option is not set for DOS apps. As a result after batch execution was finished (and installer continue it's job) hidden window still remains in the system as "winoldapp". Following two lines solve the problem 
-
-@echo off
-# place your bat code here
-cls
-
-Telnet and ssh - Plug-in not works with applications requiring terminal emulation.
-
-
-Takhir Bedertdinov, INEUM, Moscow, Russia
-Stuart 'Afrow UK' Welch, UK, afrowuk@afrowsoft.co.uk
-
+Description
+
+Plug-in works with console applications - creates hidden child process with redirected i/o. Compare to NSISdl has 4 add-ons: 1) string parameter that serves as stdin for running application; 2) sync/async process launch option; 3) works out of section as well; 4) multithreading.  First may be useful if you want to give login/password to the running application, second - for long running applications, third - for .onInit function check outs, fourth - to run few DOS application at a time. Plug-in can put application output to log file, 'detailed' installer window, any other text window, to installer stack or call script function to handle every line. Maximim input string size is 8kB in the special NSIS build, 1 kB otherwise.
+
+
+How To Use
+
+  ExecDos::exec [/ASYNC] [/TIMEOUT=xxx] [/TOSTACK | /DETAILED | /TOWINDOW | /TOFUNC] [/ENDFUNC=func] [/DISABLEFSR] application_to_run [stdin_string] [log_file_name | window | function]
+
+  /ASYNC - not waits for process exit. Use 'wait' to get exit code
+  /TIMEOUT - TOTAL execution time, milliseconds, for example /TIMEOUT=10000. 
+            Default is big enough. Short timeouts may cause app to be terminated. 
+  /TOSTACK - puts not empty output lines to stack (not reads log_file_name parameter from stack)
+  /DETAILED - puts output lines to installer' detailed window
+  /TOWINDOW - adds output lines to target window. Edit, RichEdit, ListView and ListBox supported
+  /TOFUNC - pushes output lines to installer stack and calls script function
+  /DISABLEFSR - disables WOW64 file system redirection on x64 machines for the ExecDos internal thread
+  application_to_run - application to run (required)
+  stdin_string - all that application can get from stdin (optional)
+  log_file_name - file where to put app's stdout (optional) OR target window handle OR script function pointer
+Please note - last 2 parameters are optional if installer stack is empty. More safe to use "" for unused parameters in case the stack is not empty. If you find a random file appearing during install then this is why (i.e. log_file_name)!
+
+  ExecDos::wait HANDLE
+  HANDLE - for async mode only, thread handle to wait for. Returnes application exit code or error code.
+
+  ExecDos::isdone HANDLE
+  HANDLE - for async mode only, checks thread is running. Returns 1 if application have exited, 0 if still running, -1 on error.
+
+
+Example of async launch
+
+  ExecDos::exec /ASYNC "$EXEDIR\consApp.exe" "test_login$\ntest_pwd$\n" "$EXEDIR\execdos.log"
+  Pop $0 ; thread handle for 'wait'.
+  ExecDos::wait $0
+  Pop $0 ; exit code
+  MessageBox MB_OK "Exit code $0"
+
+sync launch
+
+  ExecDos::exec "$EXEDIR\consApp.exe" "" ""
+  Pop $0 ; exit code
+  MessageBox MB_OK "Exit code $0"
+
+
+BAT files specifics
+
+On some of Win98 systems "Close on exit" option is not set for DOS apps. As a result after batch execution was finished (and installer continue it's job) hidden window still remains in the system as "winoldapp". Following two lines solve the problem 
+
+@echo off
+# place your bat code here
+cls
+
+Telnet and ssh - Plug-in not works with applications requiring terminal emulation.
+
+
+Takhir Bedertdinov, INEUM, Moscow, Russia
+Stuart 'Afrow UK' Welch, UK, afrowuk@afrowsoft.co.uk
+
diff --git a/Other/Source/Plugins/ExecDos/ToFunc.nsi b/etc/source/Plugins/ExecDos/ToFunc.nsi
similarity index 95%
rename from Other/Source/Plugins/ExecDos/ToFunc.nsi
rename to etc/source/Plugins/ExecDos/ToFunc.nsi
index 6fafcad..fb5ae19 100644
--- a/Other/Source/Plugins/ExecDos/ToFunc.nsi
+++ b/etc/source/Plugins/ExecDos/ToFunc.nsi
@@ -1,55 +1,55 @@
-;--------------------------------
-; ExecDos plug-in Script Sample
-; Takhir Bedertdinov
-
-
-;--------------------------------
-; Base names definition
-
-  !define APP_NAME "ExecDos ToStack"
-  !define DOS_APP consApp.exe
-
-
-;--------------------------------
-; General Attributes
-
-Name "${APP_NAME} Test"
-OutFile "${APP_NAME}.exe"
-
-
-;--------------------------------
-; Interface Settings
-
-  !include "MUI2.nsh"
-  !insertmacro MUI_PAGE_INSTFILES
-  !insertmacro MUI_LANGUAGE "English"
-
-
-;--------------------------------
-; Our function to be called
-Function LogFunction
-  IntOp $1 $1 + 1
-  Pop $2
-  MessageBox MB_OK "Output line #$1: $2"
-FunctionEnd
-
-
-;--------------------------------
-; Installer Sections
-
-Section "Dummy Section" SecDummy
-
-    StrCpy $1 0
-
-    DetailPrint "Executing console application" 
-; async launch
-    GetFunctionAddress $0 LogFunction
-    ExecDos::exec /ASYNC /TOFUNC /TIMEOUT=5000 "$EXEDIR\consApp.exe" "test_login$\ntest_pwd$\n" $0
-    Pop $0 ; thread handle for 'wait'
-
-; execute NSIS code here if you want
-
-; time to check process exit code (optional)
-    ExecDos::wait $0
-
-SectionEnd
+;--------------------------------
+; ExecDos plug-in Script Sample
+; Takhir Bedertdinov
+
+
+;--------------------------------
+; Base names definition
+
+  !define APP_NAME "ExecDos ToStack"
+  !define DOS_APP consApp.exe
+
+
+;--------------------------------
+; General Attributes
+
+Name "${APP_NAME} Test"
+OutFile "${APP_NAME}.exe"
+
+
+;--------------------------------
+; Interface Settings
+
+  !include "MUI2.nsh"
+  !insertmacro MUI_PAGE_INSTFILES
+  !insertmacro MUI_LANGUAGE "English"
+
+
+;--------------------------------
+; Our function to be called
+Function LogFunction
+  IntOp $1 $1 + 1
+  Pop $2
+  MessageBox MB_OK "Output line #$1: $2"
+FunctionEnd
+
+
+;--------------------------------
+; Installer Sections
+
+Section "Dummy Section" SecDummy
+
+    StrCpy $1 0
+
+    DetailPrint "Executing console application" 
+; async launch
+    GetFunctionAddress $0 LogFunction
+    ExecDos::exec /ASYNC /TOFUNC /TIMEOUT=5000 "$EXEDIR\consApp.exe" "test_login$\ntest_pwd$\n" $0
+    Pop $0 ; thread handle for 'wait'
+
+; execute NSIS code here if you want
+
+; time to check process exit code (optional)
+    ExecDos::wait $0
+
+SectionEnd
diff --git a/Other/Source/Plugins/ExecDos/ToStack.nsi b/etc/source/Plugins/ExecDos/ToStack.nsi
similarity index 95%
rename from Other/Source/Plugins/ExecDos/ToStack.nsi
rename to etc/source/Plugins/ExecDos/ToStack.nsi
index fa4392d..51e4053 100644
--- a/Other/Source/Plugins/ExecDos/ToStack.nsi
+++ b/etc/source/Plugins/ExecDos/ToStack.nsi
@@ -1,61 +1,61 @@
-;--------------------------------
-; ExecDos plug-in Script Sample
-; Takhir Bedertdinov
-
-
-;--------------------------------
-; Base names definition
-
-  !define APP_NAME "ExecDos ToStack"
-  !define DOS_APP consApp.exe
-
-
-;--------------------------------
-; General Attributes
-
-Name "${APP_NAME} Test"
-OutFile "${APP_NAME}.exe"
-
-
-;--------------------------------
-; Interface Settings
-
-  !include "MUI2.nsh"
-  !insertmacro MUI_PAGE_INSTFILES
-  !insertmacro MUI_LANGUAGE "English"
-
-
-;--------------------------------
-; Installer Sections
-
-Section "Dummy Section" SecDummy
-
-    DetailPrint "Executing console application" 
-; async launch
-    ExecDos::exec /ASYNC /TOSTACK /TIMEOUT=5000 "$EXEDIR\consApp.exe" "test_login$\ntest_pwd$\n"
-    Pop $0 ; thread handle for 'wait'
-
-; you can add installation code here, for example
-    Sleep 1000
-    DetailPrint "Installing Software"
-    Sleep 1000
-    DetailPrint "Installing More Software"
-    Sleep 1000
-
-; time to check process exit code (optional)
-    ExecDos::wait $0
-
-    Pop $0 ; return value - process exit code or error or STILL_ACTIVE (0x103).
-; normal exit code is 5 for consApp.exe
-    MessageBox MB_OK "Exit code $0"
-
-    StrCpy $2 ""
-loop:
-    Pop $1
-    IfErrors show
-    StrCpy $2 "$1$\n$2"
-    GoTo loop
-show:
-    MessageBox MB_OK "$2"
-
-SectionEnd
+;--------------------------------
+; ExecDos plug-in Script Sample
+; Takhir Bedertdinov
+
+
+;--------------------------------
+; Base names definition
+
+  !define APP_NAME "ExecDos ToStack"
+  !define DOS_APP consApp.exe
+
+
+;--------------------------------
+; General Attributes
+
+Name "${APP_NAME} Test"
+OutFile "${APP_NAME}.exe"
+
+
+;--------------------------------
+; Interface Settings
+
+  !include "MUI2.nsh"
+  !insertmacro MUI_PAGE_INSTFILES
+  !insertmacro MUI_LANGUAGE "English"
+
+
+;--------------------------------
+; Installer Sections
+
+Section "Dummy Section" SecDummy
+
+    DetailPrint "Executing console application" 
+; async launch
+    ExecDos::exec /ASYNC /TOSTACK /TIMEOUT=5000 "$EXEDIR\consApp.exe" "test_login$\ntest_pwd$\n"
+    Pop $0 ; thread handle for 'wait'
+
+; you can add installation code here, for example
+    Sleep 1000
+    DetailPrint "Installing Software"
+    Sleep 1000
+    DetailPrint "Installing More Software"
+    Sleep 1000
+
+; time to check process exit code (optional)
+    ExecDos::wait $0
+
+    Pop $0 ; return value - process exit code or error or STILL_ACTIVE (0x103).
+; normal exit code is 5 for consApp.exe
+    MessageBox MB_OK "Exit code $0"
+
+    StrCpy $2 ""
+loop:
+    Pop $1
+    IfErrors show
+    StrCpy $2 "$1$\n$2"
+    GoTo loop
+show:
+    MessageBox MB_OK "$2"
+
+SectionEnd
diff --git a/Other/Source/Plugins/ExecDos/ToWindow.nsi b/etc/source/Plugins/ExecDos/ToWindow.nsi
similarity index 95%
rename from Other/Source/Plugins/ExecDos/ToWindow.nsi
rename to etc/source/Plugins/ExecDos/ToWindow.nsi
index 035648d..d3026cb 100644
--- a/Other/Source/Plugins/ExecDos/ToWindow.nsi
+++ b/etc/source/Plugins/ExecDos/ToWindow.nsi
@@ -1,125 +1,125 @@
-;--------------------------------
-; ExecDos plug-in Script Sample
-; Takhir Bedertdinov
-
-
-;--------------------------------
-; Base names definition
-
-  !define APP_NAME "ExecDos ToWindow"
-  !define DOS_APP consApp.exe
-
-
-;--------------------------------
-; General Attributes
-
-Name "${APP_NAME} Test"
-OutFile "${APP_NAME}.exe"
-
-
-;--------------------------------
-; Interface Settings
-
-  !include "MUI2.nsh"
-  !include "InstallOptions.nsh"
-  Page custom CustomPageEdit
-  Page custom CustomPageList
-  !insertmacro MUI_PAGE_INSTFILES
-
-
-  !insertmacro MUI_LANGUAGE "English"
-
-
-; $R0 - enable/disable buttons flag
-; $R2 - end function pointer
-; $R4 - $R7 - Exit codes collection
-; $R8 - target window handle
-; $R9 - thread handle
-
-
-
-;--------------------------------
-; Installer Sections
-
-Section "Dummy Section" SecDummy
-
-  SetDetailsView show
-
-; sync launch to window
-  DetailPrint "Executing console application, sync mode" 
-  FindWindow $0 "#32770" "" $HWNDPARENT
-  GetDlgItem $R8 $0 1016
-  ExecDos::exec /TOWINDOW /TIMEOUT=6000 "$EXEDIR\consApp.exe" "test_login$\ntest_pwd$\n" $R8
-  Pop $R6 ; return value - process exit code or error or STILL_ACTIVE (0x103).
-
-
-; async launch to detailed  - no last parameter.
-  DetailPrint "Executing console application, async mode" 
-  ExecDos::exec /ASYNC /DETAILED /TIMEOUT=6000 "$EXEDIR\consApp.exe" "test_login$\ntest_pwd$\n"
-  Pop $R9 ; thread handle for 'wait'
-; some other code may be here
-; time to check process exit code (optional)
-  ExecDos::wait $R9
-  Pop $R7
-
-; normal exit code is 5 for consApp.exe
-    MessageBox MB_OK "Exit codes $R4 $R5 $R6 $R7"
-
-
-SectionEnd
-
-Function enableNext
-
-  GetDlgItem $0 $HWNDPARENT 1
-  EnableWindow $0 $R0
-  GetDlgItem $0 $HWNDPARENT 2
-  EnableWindow $0 $R0
-  GetDlgItem $0 $HWNDPARENT 3
-  EnableWindow $0 $R0
-
-FunctionEnd
-
-Function CustomPageEdit
-
-  !insertmacro MUI_HEADER_TEXT "ExecDos /TOWINDOW test" "Multiline Edit Window"
-  !insertmacro INSTALLOPTIONS_EXTRACT ml_edit.ini
-  !insertmacro INSTALLOPTIONS_INITDIALOG ml_edit.ini
-  Pop $0
-  !insertmacro INSTALLOPTIONS_READ $R8 ml_edit.ini "Field 1" HWND
-  StrCpy $R0 0
-  Call enableNext
-  StrCpy $R0 1
-  GetFunctionAddress $R2 enableNext
-  ExecDos::exec /ASYNC /TOWINDOW /ENDFUNC=$R2 "$EXEDIR\consApp.exe" "test_login$\ntest_pwd$\n" $R8
-  Pop $R9
-  !insertmacro INSTALLOPTIONS_SHOW
-
-  ; Security feature.
-  ExecDos::wait $R9
-  Pop  $R4
-
-
-
-FunctionEnd
-
-Function CustomPageList
-
-  !insertmacro MUI_HEADER_TEXT "ExecDos /TOWINDOW test" "ListBox Window"
-  !insertmacro INSTALLOPTIONS_EXTRACT listbox.ini
-  !insertmacro INSTALLOPTIONS_INITDIALOG listbox.ini
-  Pop $0
-  !insertmacro INSTALLOPTIONS_READ $R8 listbox.ini "Field 1" HWND
-  StrCpy $R0 0
-  Call enableNext
-  StrCpy $R0 1
-  ExecDos::exec /ASYNC /TOWINDOW /ENDFUNC=$R2 "$EXEDIR\consApp.exe" "test_login$\ntest_pwd$\n" $R8
-  Pop $R9
-
-  !insertmacro INSTALLOPTIONS_SHOW
-
-  ExecDos::wait $R9
-  Pop  $R5
-
-
-
-FunctionEnd
+;--------------------------------
+; ExecDos plug-in Script Sample
+; Takhir Bedertdinov
+
+
+;--------------------------------
+; Base names definition
+
+  !define APP_NAME "ExecDos ToWindow"
+  !define DOS_APP consApp.exe
+
+
+;--------------------------------
+; General Attributes
+
+Name "${APP_NAME} Test"
+OutFile "${APP_NAME}.exe"
+
+
+;--------------------------------
+; Interface Settings
+
+  !include "MUI2.nsh"
+  !include "InstallOptions.nsh"
+  Page custom CustomPageEdit
+  Page custom CustomPageList
+  !insertmacro MUI_PAGE_INSTFILES
+
+
+  !insertmacro MUI_LANGUAGE "English"
+
+
+; $R0 - enable/disable buttons flag
+; $R2 - end function pointer
+; $R4 - $R7 - Exit codes collection
+; $R8 - target window handle
+; $R9 - thread handle
+
+
+
+;--------------------------------
+; Installer Sections
+
+Section "Dummy Section" SecDummy
+
+  SetDetailsView show
+
+; sync launch to window
+  DetailPrint "Executing console application, sync mode" 
+  FindWindow $0 "#32770" "" $HWNDPARENT
+  GetDlgItem $R8 $0 1016
+  ExecDos::exec /TOWINDOW /TIMEOUT=6000 "$EXEDIR\consApp.exe" "test_login$\ntest_pwd$\n" $R8
+  Pop $R6 ; return value - process exit code or error or STILL_ACTIVE (0x103).
+
+
+; async launch to detailed  - no last parameter.
+  DetailPrint "Executing console application, async mode" 
+  ExecDos::exec /ASYNC /DETAILED /TIMEOUT=6000 "$EXEDIR\consApp.exe" "test_login$\ntest_pwd$\n"
+  Pop $R9 ; thread handle for 'wait'
+; some other code may be here
+; time to check process exit code (optional)
+  ExecDos::wait $R9
+  Pop $R7
+
+; normal exit code is 5 for consApp.exe
+    MessageBox MB_OK "Exit codes $R4 $R5 $R6 $R7"
+
+
+SectionEnd
+
+Function enableNext
+
+  GetDlgItem $0 $HWNDPARENT 1
+  EnableWindow $0 $R0
+  GetDlgItem $0 $HWNDPARENT 2
+  EnableWindow $0 $R0
+  GetDlgItem $0 $HWNDPARENT 3
+  EnableWindow $0 $R0
+
+FunctionEnd
+
+Function CustomPageEdit
+
+  !insertmacro MUI_HEADER_TEXT "ExecDos /TOWINDOW test" "Multiline Edit Window"
+  !insertmacro INSTALLOPTIONS_EXTRACT ml_edit.ini
+  !insertmacro INSTALLOPTIONS_INITDIALOG ml_edit.ini
+  Pop $0
+  !insertmacro INSTALLOPTIONS_READ $R8 ml_edit.ini "Field 1" HWND
+  StrCpy $R0 0
+  Call enableNext
+  StrCpy $R0 1
+  GetFunctionAddress $R2 enableNext
+  ExecDos::exec /ASYNC /TOWINDOW /ENDFUNC=$R2 "$EXEDIR\consApp.exe" "test_login$\ntest_pwd$\n" $R8
+  Pop $R9
+  !insertmacro INSTALLOPTIONS_SHOW
+
+  ; Security feature.
+  ExecDos::wait $R9
+  Pop  $R4
+
+
+
+FunctionEnd
+
+Function CustomPageList
+
+  !insertmacro MUI_HEADER_TEXT "ExecDos /TOWINDOW test" "ListBox Window"
+  !insertmacro INSTALLOPTIONS_EXTRACT listbox.ini
+  !insertmacro INSTALLOPTIONS_INITDIALOG listbox.ini
+  Pop $0
+  !insertmacro INSTALLOPTIONS_READ $R8 listbox.ini "Field 1" HWND
+  StrCpy $R0 0
+  Call enableNext
+  StrCpy $R0 1
+  ExecDos::exec /ASYNC /TOWINDOW /ENDFUNC=$R2 "$EXEDIR\consApp.exe" "test_login$\ntest_pwd$\n" $R8
+  Pop $R9
+
+  !insertmacro INSTALLOPTIONS_SHOW
+
+  ExecDos::wait $R9
+  Pop  $R5
+
+
+
+FunctionEnd
diff --git a/Other/Source/Plugins/ExecDos/consApp.exe b/etc/source/Plugins/ExecDos/consApp.exe
similarity index 100%
rename from Other/Source/Plugins/ExecDos/consApp.exe
rename to etc/source/Plugins/ExecDos/consApp.exe
diff --git a/Other/Source/Plugins/ExecDos/first.bat b/etc/source/Plugins/ExecDos/first.bat
similarity index 92%
rename from Other/Source/Plugins/ExecDos/first.bat
rename to etc/source/Plugins/ExecDos/first.bat
index 00ce38f..66e661d 100644
--- a/Other/Source/Plugins/ExecDos/first.bat
+++ b/etc/source/Plugins/ExecDos/first.bat
@@ -1,6 +1,6 @@
-@echo off
-SET PATH=c:\aaa;%PATH%
-call second.bat
-dir
-more bat.nsi
-cls
+@echo off
+SET PATH=c:\aaa;%PATH%
+call second.bat
+dir
+more bat.nsi
+cls
diff --git a/Other/Source/Plugins/ExecDos/listbox.ini b/etc/source/Plugins/ExecDos/listbox.ini
similarity index 93%
rename from Other/Source/Plugins/ExecDos/listbox.ini
rename to etc/source/Plugins/ExecDos/listbox.ini
index acb0bad..e359530 100644
--- a/Other/Source/Plugins/ExecDos/listbox.ini
+++ b/etc/source/Plugins/ExecDos/listbox.ini
@@ -1,11 +1,11 @@
-[Settings]
-NumFields=1
-
-[Field 1]
-Type=ListBox
-Left=10
-Right=-10
-Top=20
-Bottom=120
-State="Welcome\r\n"
+[Settings]
+NumFields=1
+
+[Field 1]
+Type=ListBox
+Left=10
+Right=-10
+Top=20
+Bottom=120
+State="Welcome\r\n"
 Flags=MULTILINE|VSCROLL|WANTRETURN
\ No newline at end of file
diff --git a/Other/Source/Plugins/ExecDos/ml_edit.ini b/etc/source/Plugins/ExecDos/ml_edit.ini
similarity index 93%
rename from Other/Source/Plugins/ExecDos/ml_edit.ini
rename to etc/source/Plugins/ExecDos/ml_edit.ini
index f08cefc..7055ff7 100644
--- a/Other/Source/Plugins/ExecDos/ml_edit.ini
+++ b/etc/source/Plugins/ExecDos/ml_edit.ini
@@ -1,11 +1,11 @@
-[Settings]
-NumFields=1
-
-[Field 1]
-Type=Text
-Left=10
-Right=-10
-Top=20
-Bottom=120
-State="Welcome\r\n"
+[Settings]
+NumFields=1
+
+[Field 1]
+Type=Text
+Left=10
+Right=-10
+Top=20
+Bottom=120
+State="Welcome\r\n"
 Flags=MULTILINE|VSCROLL|WANTRETURN
\ No newline at end of file
diff --git a/Other/Source/Plugins/ExecDos/second.bat b/etc/source/Plugins/ExecDos/second.bat
similarity index 90%
rename from Other/Source/Plugins/ExecDos/second.bat
rename to etc/source/Plugins/ExecDos/second.bat
index 12421cd..743e5ca 100644
--- a/Other/Source/Plugins/ExecDos/second.bat
+++ b/etc/source/Plugins/ExecDos/second.bat
@@ -1,3 +1,3 @@
-@echo off
-PATH
+@echo off
+PATH
 cls
\ No newline at end of file
diff --git a/Other/Source/Plugins/ExecDos64.dll b/etc/source/Plugins/ExecDos64.dll
similarity index 100%
rename from Other/Source/Plugins/ExecDos64.dll
rename to etc/source/Plugins/ExecDos64.dll
diff --git a/Other/Source/Plugins/ExecTimeout/TestTimeout.exe b/etc/source/Plugins/ExecTimeout/TestTimeout.exe
similarity index 100%
rename from Other/Source/Plugins/ExecTimeout/TestTimeout.exe
rename to etc/source/Plugins/ExecTimeout/TestTimeout.exe
diff --git a/Other/Source/Plugins/ExecTimeout/TestTimeout.nsi b/etc/source/Plugins/ExecTimeout/TestTimeout.nsi
similarity index 97%
rename from Other/Source/Plugins/ExecTimeout/TestTimeout.nsi
rename to etc/source/Plugins/ExecTimeout/TestTimeout.nsi
index 463a3aa..ea8bf4e 100644
--- a/Other/Source/Plugins/ExecTimeout/TestTimeout.nsi
+++ b/etc/source/Plugins/ExecTimeout/TestTimeout.nsi
@@ -1,47 +1,47 @@
-;-----------------------------------------------------------------------------------
-; ExecTimeout
-;-----------------------------------------------------------------------------------
-;
-; Usage:
-;   ${ExecTimeout} <Commandline> <Timeout> <Terminate> <Var ExitCode>
-;
-; Arguments:
-;   <Commandline> should contain the path to the executable file [string]
-;   <Timeout> specifies the timeout in milliseconds [integer]
-;   <Terminate> specifies whether the process will be terminated on timeout [0|1]
-;
-; Return Value:
-;   <ExitCode> will return the exit code of the application, "timeout" or "error"
-;
-;-----------------------------------------------------------------------------------
-
-
-;-----------------------------------------------------------------------------------
-; Include
-;-----------------------------------------------------------------------------------
-
-!macro ExecTimeout commandline timeout_ms terminate var_exitcode
-  Timeout::ExecTimeout '${commandline}' '${timeout_ms}' '${terminate}'
-  Pop ${var_exitcode}
-!macroend
-
-!define ExecTimeout "!insertmacro ExecTimeout"
-
-
-;-----------------------------------------------------------------------------------
-; Example
-;-----------------------------------------------------------------------------------
-
-Name "TestTimeout"
-OutFile "TestTimeout.exe"
-
-ShowInstDetails show
-
-Section
-  MessageBox MB_ICONINFORMATION "I will start Notepad now. It will time out after 5 seconds!"
-  DetailPrint 'Executing: "$WINDIR\Notepad.exe"'
-  
-  ${ExecTimeout} '"$WINDIR\Notepad.exe"' 5000 1 $0
-  
-  DetailPrint "Exit Code: $0"
-SectionEnd
+;-----------------------------------------------------------------------------------
+; ExecTimeout
+;-----------------------------------------------------------------------------------
+;
+; Usage:
+;   ${ExecTimeout} <Commandline> <Timeout> <Terminate> <Var ExitCode>
+;
+; Arguments:
+;   <Commandline> should contain the path to the executable file [string]
+;   <Timeout> specifies the timeout in milliseconds [integer]
+;   <Terminate> specifies whether the process will be terminated on timeout [0|1]
+;
+; Return Value:
+;   <ExitCode> will return the exit code of the application, "timeout" or "error"
+;
+;-----------------------------------------------------------------------------------
+
+
+;-----------------------------------------------------------------------------------
+; Include
+;-----------------------------------------------------------------------------------
+
+!macro ExecTimeout commandline timeout_ms terminate var_exitcode
+  Timeout::ExecTimeout '${commandline}' '${timeout_ms}' '${terminate}'
+  Pop ${var_exitcode}
+!macroend
+
+!define ExecTimeout "!insertmacro ExecTimeout"
+
+
+;-----------------------------------------------------------------------------------
+; Example
+;-----------------------------------------------------------------------------------
+
+Name "TestTimeout"
+OutFile "TestTimeout.exe"
+
+ShowInstDetails show
+
+Section
+  MessageBox MB_ICONINFORMATION "I will start Notepad now. It will time out after 5 seconds!"
+  DetailPrint 'Executing: "$WINDIR\Notepad.exe"'
+  
+  ${ExecTimeout} '"$WINDIR\Notepad.exe"' 5000 1 $0
+  
+  DetailPrint "Exit Code: $0"
+SectionEnd
diff --git a/etc/source/Plugins/InstDrv.dll b/etc/source/Plugins/InstDrv.dll
new file mode 100644
index 0000000..5bc57d8
Binary files /dev/null and b/etc/source/Plugins/InstDrv.dll differ
diff --git a/etc/source/Plugins/Processes.dll b/etc/source/Plugins/Processes.dll
new file mode 100644
index 0000000..182b322
Binary files /dev/null and b/etc/source/Plugins/Processes.dll differ
diff --git a/etc/source/Plugins/Processes/readme.txt b/etc/source/Plugins/Processes/readme.txt
new file mode 100644
index 0000000..9e0849a
--- /dev/null
+++ b/etc/source/Plugins/Processes/readme.txt
@@ -0,0 +1,122 @@
+----------------------------------------------------------------
+----------------------------------------------------------------
+Processes (Processes.dll)
+Version:	1.0.1.0
+Release:	24.february.2005
+Description:	Nullsoft Installer (NSIS) plug-in for managing?! 
+		Windows processes.
+
+Copyright:	� 2004-2005 Hardwired. No rights reserved.
+		There is no restriction and no guaranty for using
+		this software.
+
+Author:		Andrei Ciubotaru [Hardwired]
+		Lead Developer ICode&Ideas SRL (http://www.icode.ro/)
+		hardwiredteks@gmail.com, hardwired@icode.ro
+
+----------------------------------------------------------------
+----------------------------------------------------------------
+INTRODUCTION
+
+	The Need For Plug-in - I need it for the one of my installers.
+	
+	Briefly: Use it when you need to find\kill a process when
+installing\uninstalling some application. Also, use it when you 
+need to test the presence of a device driver.
+
+
+SUPPORT
+	
+	Supported platforms are: WinNT,Win2K,WinXP and Win2003 Server.
+
+
+DESCRIPTION
+
+	Processes::FindProcess <process_name>	;without ".exe"
+	
+		Searches the currently running processes for the given
+		process name.
+		
+		return:	1	- the process was found
+			0	- the process was not found
+	
+	Processes::KillProcess <process_name>	; without ".exe"
+	
+		Searches the currently running processes for the given
+		process name. If the process is found then the it gets
+		killed.
+		
+		return:	1	- the process was found and killed
+			0	- the process was not found or the process
+						cannot be killed (insuficient rights)
+	
+	Processes::FindDevice <device_base_name>
+	
+		Searches the installed devices drivers for the given
+		device base name.
+		(important: I said BASE NAME not FILENAME)
+		
+		return:	1	- the device driver was found
+			0	- the device driver was not found
+				
+
+USAGE
+
+	First of all, does not matter where you use it. Ofcourse, the
+routines must be called inside of a Section/Function scope.
+
+	Processes::FindProcess "process_name"
+	Pop $R0
+ 
+	StrCmp $R0 "1" make_my_day noooooo
+	
+	make_my_day:
+		...
+	
+	noooooo:
+		...
+		
+	
+	Processes::KillProcess "process_name"
+	Pop $R0
+ 
+	StrCmp $R0 "1" dead_meat why_wont_you_die
+	
+	dead_meat:
+		...
+	
+	why_wont_you_die:
+		...
+		
+
+	Processes::FindDevice "device_base_name"
+	Pop $R0
+ 
+	StrCmp $R0 "1" blabla more_blabla
+	
+	blabla:
+		...
+	
+	more_blabla:
+		...
+		
+	
+THANKS
+
+	Sunil Kamath for inspiring me. I wanted to use its FindProcDLL
+but my requirements made it imposible.
+
+	Nullsoft for creating this very powerfull installer. One big,
+free and full-featured (hmmm... and guiless for the moment) mean
+install machine!:)
+
+	ME for being such a great coder...
+						... HAHAHAHAHAHAHA!
+										
+ONE MORE THING
+
+	If you use the plugin or it's source-code, I would apreciate
+if my name is mentioned.
+
+----------------------------------------------------------------
+----------------------------------------------------------------
diff --git a/Other/Source/Plugins/SetACL.exe b/etc/source/Plugins/SetACL.exe
similarity index 100%
rename from Other/Source/Plugins/SetACL.exe
rename to etc/source/Plugins/SetACL.exe
diff --git a/Other/Source/Plugins/SetACL64.exe b/etc/source/Plugins/SetACL64.exe
similarity index 100%
rename from Other/Source/Plugins/SetACL64.exe
rename to etc/source/Plugins/SetACL64.exe
diff --git a/etc/source/Plugins/SimpleFC.dll b/etc/source/Plugins/SimpleFC.dll
new file mode 100644
index 0000000..bb7a6a8
Binary files /dev/null and b/etc/source/Plugins/SimpleFC.dll differ
diff --git a/Other/Source/Plugins/StdUtils.dll b/etc/source/Plugins/StdUtils.dll
similarity index 100%
rename from Other/Source/Plugins/StdUtils.dll
rename to etc/source/Plugins/StdUtils.dll
diff --git a/etc/source/Plugins/StdUtils/!_Clean.bat b/etc/source/Plugins/StdUtils/!_Clean.bat
new file mode 100644
index 0000000..498ad47
--- /dev/null
+++ b/etc/source/Plugins/StdUtils/!_Clean.bat
@@ -0,0 +1,5 @@
+@echo off
+REM ----------------------------------------------------------------------
+del /F /Q "%~dp0\*.exe"
+REM ----------------------------------------------------------------------
+pause
diff --git a/etc/source/Plugins/StdUtils/!_Make.bat b/etc/source/Plugins/StdUtils/!_Make.bat
new file mode 100644
index 0000000..9d3b62e
--- /dev/null
+++ b/etc/source/Plugins/StdUtils/!_Make.bat
@@ -0,0 +1,29 @@
+@echo off
+REM ----------------------------------------------------------------------
+set "NSIS_ANSI=D:\NSIS"
+set "NSIS_Unicode=D:\NSIS\_Unicode"
+REM ----------------------------------------------------------------------
+set "NSIS_PROJECTS=StdUtilsTest,ShellExecAsUser,InvokeShellVerb,ShellExecWait,GetParameters"
+REM ----------------------------------------------------------------------
+REM
+for %%i in (%NSIS_PROJECTS%) do (
+	del "%~dp0\%%i-ANSI.exe"
+	del "%~dp0\%%i-Unicode.exe"
+	if exist "%~dp0\%%i-ANSI.exe" (
+		pause
+		exit
+	)
+	if exist "%~dp0\%%i-Unicode.exe" (
+		pause
+		exit
+	)
+)
+REM ----------------------------------------------------------------------
+for %%i in (%NSIS_PROJECTS%) do (
+	"%NSIS_ANSI%\makensis.exe" "%~dp0\%%i.nsi"
+	if not %ERRORLEVEL%==0 pause
+	"%NSIS_Unicode%\makensis.exe" "%~dp0\%%i.nsi"
+	if not %ERRORLEVEL%==0 pause
+)
+REM ----------------------------------------------------------------------
+pause
diff --git a/etc/source/Plugins/StdUtils/GetParameters.nsi b/etc/source/Plugins/StdUtils/GetParameters.nsi
new file mode 100644
index 0000000..dd7f298
--- /dev/null
+++ b/etc/source/Plugins/StdUtils/GetParameters.nsi
@@ -0,0 +1,38 @@
+Caption "StdUtils Test-Suite"
+
+!addincludedir  "..\..\Include"
+
+!ifdef NSIS_UNICODE
+	!addplugindir "..\..\Plugins\Release_Unicode"
+	OutFile "GetParameters-Unicode.exe"
+!else
+	!addplugindir "..\..\Plugins\Release_ANSI"
+	OutFile "GetParameters-ANSI.exe"
+!endif
+
+!include 'StdUtils.nsh'
+
+RequestExecutionLevel user
+ShowInstDetails show
+
+Section
+	${StdUtils.GetParameter} $R0 "Foobar" "<N/A>"
+	
+	StrCmp "$R0" "<N/A>" 0 +3
+	DetailPrint "Parameter /Foobar is *not* specified!"
+	Goto Finished
+	
+	StrCmp "$R0" "" 0 +3 ;'Installer.exe [...] /Foobar'
+	DetailPrint "Parameter /Foobar specified without a value." 
+	Goto Finished
+
+	;'Installer.exe /Foobar=Foo' or 'Installer.exe "/Foobar=Foo Bar"'
+	${StdUtils.TrimStr} $R0
+	DetailPrint "Value of parameter /Foobar is: '$R0'"
+	
+	Finished:
+	${StdUtils.GetAllParameters} $R0 0
+	DetailPrint "Complete command-line: '$R0'"
+	${StdUtils.GetAllParameters} $R0 1
+	DetailPrint "Truncated command-line: '$R0'"
+SectionEnd
diff --git a/etc/source/Plugins/StdUtils/InvokeShellVerb.nsi b/etc/source/Plugins/StdUtils/InvokeShellVerb.nsi
new file mode 100644
index 0000000..c5f5c0f
--- /dev/null
+++ b/etc/source/Plugins/StdUtils/InvokeShellVerb.nsi
@@ -0,0 +1,53 @@
+Caption "StdUtils Test-Suite"
+
+!addincludedir  "..\..\Include"
+
+!ifdef NSIS_UNICODE
+	!addplugindir "..\..\Plugins\Release_Unicode"
+	OutFile "InvokeShellVerb-Unicode.exe"
+!else
+	!addplugindir "..\..\Plugins\Release_ANSI"
+	OutFile "InvokeShellVerb-ANSI.exe"
+!endif
+
+!include 'StdUtils.nsh'
+
+RequestExecutionLevel user ;no elevation needed for this test
+ShowInstDetails show
+
+Section
+	IfFileExists "$SYSDIR\mspaint.exe" +3
+	MessageBox MB_ICONSTOP 'File does not exist:$\n"$SYSDIR\mspaint.exe"$\n$\nExample cannot run!'
+	Quit
+	MessageBox MB_OK "Please make sure Paint isn't pinned to your Taskbar right now.$\nThen press 'OK' to begin test..."
+SectionEnd
+
+Section
+	DetailPrint "Going to pin MSPaint..."
+	
+	DetailPrint  'InvokeShellVerb: "$SYSDIR" "mspaint.exe" ${StdUtils.Const.ISV_PinToTaskbar}'
+	${StdUtils.InvokeShellVerb} $0 "$SYSDIR" "mspaint.exe" ${StdUtils.Const.ISV_PinToTaskbar}
+	DetailPrint "Result: $0"
+
+	StrCmp "$0" "ok" 0 +3
+	MessageBox MB_TOPMOST "Paint should have been pinned to Taskbar now!"
+	Goto +2
+	MessageBox MB_TOPMOST "Failed to pin, see log for details!"
+
+	DetailPrint "--------------"
+SectionEnd
+
+Section
+	DetailPrint "Going to un-pin MSPaint..."
+	
+	DetailPrint  'InvokeShellVerb: "$SYSDIR" "mspaint.exe" ${StdUtils.Const.ISV_UnpinFromTaskbar}'
+	${StdUtils.InvokeShellVerb} $0 "$SYSDIR" "mspaint.exe" ${StdUtils.Const.ISV_UnpinFromTaskbar}
+	DetailPrint "Result: $0"
+	
+	StrCmp "$0" "ok" 0 +3
+	MessageBox MB_TOPMOST "Paint should have been un-pinned from Taskbar now!"
+	Goto +2
+	MessageBox MB_TOPMOST "Failed to un-pin, see log for details!"
+
+	DetailPrint "--------------"
+SectionEnd
diff --git a/etc/source/Plugins/StdUtils/ShellExecAsUser.nsi b/etc/source/Plugins/StdUtils/ShellExecAsUser.nsi
new file mode 100644
index 0000000..ab3da0e
--- /dev/null
+++ b/etc/source/Plugins/StdUtils/ShellExecAsUser.nsi
@@ -0,0 +1,29 @@
+Caption "StdUtils Test-Suite"
+
+!addincludedir  "..\..\Include"
+
+!ifdef NSIS_UNICODE
+	!addplugindir "..\..\Plugins\Release_Unicode"
+	OutFile "ShellExecAsUser-Unicode.exe"
+!else
+	!addplugindir "..\..\Plugins\Release_ANSI"
+	OutFile "ShellExecAsUser-ANSI.exe"
+!endif
+
+!include 'StdUtils.nsh'
+
+RequestExecutionLevel admin ;make sure our installer will get elevated on Vista+ with UAC enabled
+ShowInstDetails show
+
+Section
+	DetailPrint 'ExecShell: "$SYSDIR\mspaint.exe"'
+	ExecShell "open" "$SYSDIR\mspaint.exe" ;this instance of MS Paint will be elevated too!
+	MessageBox MB_TOPMOST "Close Paint and click 'OK' to continue..."
+SectionEnd
+
+Section
+	DetailPrint 'ExecShellAsUser: "$SYSDIR\mspaint.exe"'
+	Sleep 1000
+	${StdUtils.ExecShellAsUser} $0 "$SYSDIR\mspaint.exe" "open" "" ;launch a *non-elevated* instance of MS Paint
+	DetailPrint "Result: $0" ;expected result is "ok" on UAC-enabled systems or "fallback" otherwise. Failure indicated by "error" or "timeout".
+SectionEnd
diff --git a/etc/source/Plugins/StdUtils/ShellExecWait.nsi b/etc/source/Plugins/StdUtils/ShellExecWait.nsi
new file mode 100644
index 0000000..f4aadc8
--- /dev/null
+++ b/etc/source/Plugins/StdUtils/ShellExecWait.nsi
@@ -0,0 +1,44 @@
+Caption "StdUtils Test-Suite"
+
+!addincludedir  "..\..\Include"
+
+!ifdef NSIS_UNICODE
+	!addplugindir "..\..\Plugins\Release_Unicode"
+	OutFile "ShellExecWait-Unicode.exe"
+!else
+	!addplugindir "..\..\Plugins\Release_ANSI"
+	OutFile "ShellExecWait-ANSI.exe"
+!endif
+
+!include 'StdUtils.nsh'
+
+RequestExecutionLevel user
+ShowInstDetails show
+
+Section
+	DetailPrint 'ExecShellWait: "$SYSDIR\mspaint.exe"'
+	Sleep 1000
+	${StdUtils.ExecShellWaitEx} $0 $1 "$SYSDIR\mspaint.exe" "open" "" ;try to launch the process
+
+	DetailPrint "Result: $0 -> $1" ;returns "ok", "no_wait" or "error".
+	StrCmp $0 "error" ExecFailed ;check if process failed to create
+	StrCmp $0 "no_wait" WaitNotPossible ;check if process can be waited for - always check this!
+	StrCmp $0 "ok" WaitForProc ;make sure process was created successfully
+	Abort
+	
+	WaitForProc:
+	DetailPrint "Waiting for process. ZZZzzzZZZzzz..."
+	${StdUtils.WaitForProcEx} $2 $1
+	DetailPrint "Process just terminated (exit code: $2)"
+	Goto WaitDone
+	
+	ExecFailed:
+	DetailPrint "Failed to create process (error code: $1)"
+	Goto WaitDone
+
+	WaitNotPossible:
+	DetailPrint "Can not wait for process."
+	Goto WaitDone
+	
+	WaitDone:
+SectionEnd
diff --git a/etc/source/Plugins/StdUtils/StdUtilsTest.nsi b/etc/source/Plugins/StdUtils/StdUtilsTest.nsi
new file mode 100644
index 0000000..7471765
--- /dev/null
+++ b/etc/source/Plugins/StdUtils/StdUtilsTest.nsi
@@ -0,0 +1,399 @@
+Caption "StdUtils Test-Suite"
+
+!addincludedir  "..\..\Include"
+
+!ifdef NSIS_UNICODE
+	!addplugindir "..\..\Plugins\Release_Unicode"
+	OutFile "StdUtilsTest-Unicode.exe"
+!else
+	!addplugindir "..\..\Plugins\Release_ANSI"
+	OutFile "StdUtilsTest-ANSI.exe"
+!endif
+
+!macro NextTest
+	Section
+		DetailPrint "--------------"
+	SectionEnd
+!macroend
+
+!include 'StdUtils.nsh'
+
+RequestExecutionLevel user
+ShowInstDetails show
+
+# -----------------------------------------
+# GetRealOSVersion
+# -----------------------------------------
+
+Section
+	${StdUtils.GetLibVersion} $1 $2
+	DetailPrint "Testing StdUtils library v$1"
+	DetailPrint "Library built: $2"
+SectionEnd
+
+!insertmacro NextTest
+
+# -----------------------------------------
+# GetRealOSVersion
+# -----------------------------------------
+
+Section
+	${StdUtils.GetRealOSVersion} $1 $2 $3
+	DetailPrint "Real Windows NT Version: $1,$2 (Service Pack: $3)"
+
+	${StdUtils.GetRealOSBuildNo} $1
+	DetailPrint "Real Windows NT BuildNo: $1"
+
+	${StdUtils.GetRealOSName} $1
+	DetailPrint "Real Windows NT Friendly Name: $1"
+SectionEnd
+
+!insertmacro NextTest
+
+Section
+	${StdUtils.VerifyOSVersion} $1 5 1 0
+	DetailPrint "Check for Windows XP (RTM): $1"
+
+	${StdUtils.VerifyOSVersion} $1 5 1 1
+	DetailPrint "Check for Windows XP (SP1): $1"
+
+	${StdUtils.VerifyOSVersion} $1 5 1 2
+	DetailPrint "Check for Windows XP (SP2): $1"
+
+	${StdUtils.VerifyOSVersion} $1 5 1 3
+	DetailPrint "Check for Windows XP (SP3): $1"
+
+	${StdUtils.VerifyOSVersion} $1 6 0 0
+	DetailPrint "Check for Windows Vista (RTM): $1"
+
+	${StdUtils.VerifyOSVersion} $1 6 0 1
+	DetailPrint "Check for Windows Vista (SP1): $1"
+
+	${StdUtils.VerifyOSVersion} $1 6 1 0
+	DetailPrint "Check for Windows 7 (RTM): $1"
+
+	${StdUtils.VerifyOSVersion} $1 6 1 1
+	DetailPrint "Check for Windows 7 (SP1): $1"
+
+	${StdUtils.VerifyOSVersion} $1 6 2 0
+	DetailPrint "Check for Windows 8.0: $1"
+
+	${StdUtils.VerifyOSVersion} $1 6 3 0
+	DetailPrint "Check for Windows 8.1: $1"
+SectionEnd
+
+!insertmacro NextTest
+
+Section
+	${StdUtils.VerifyOSBuildNo} $1 2600
+	DetailPrint "Check for Build #2600, Windows XP: $1"
+
+	${StdUtils.VerifyOSBuildNo} $1 7600
+	DetailPrint "Check for Build #7600, Windows 7 (RTM): $1"
+
+	${StdUtils.VerifyOSBuildNo} $1 7601
+	DetailPrint "Check for Build #7601, Windows 7 (SP1): $1"
+
+	${StdUtils.VerifyOSBuildNo} $1 9600
+	DetailPrint "Check for Build #9600, Windows 8.1: $1"
+SectionEnd
+
+!insertmacro NextTest
+
+# -----------------------------------------
+# Time functions
+# -----------------------------------------
+
+Section
+	${StdUtils.Time} $1
+	DetailPrint "Time: $1"
+	Sleep 500
+	${StdUtils.Time} $1
+	DetailPrint "Time: $1"
+	Sleep 500
+	${StdUtils.Time} $1
+	DetailPrint "Time: $1"
+SectionEnd
+
+Section
+	${StdUtils.GetMinutes} $1
+	DetailPrint "UTC time in minutes: $1"
+	${StdUtils.GetHours} $1
+	DetailPrint "UTC time in hours: $1"
+	${StdUtils.GetDays} $1
+	DetailPrint "UTC time in days: $1"
+SectionEnd
+
+!insertmacro NextTest
+
+# -----------------------------------------
+# PRNG functions
+# -----------------------------------------
+
+Section
+	${StdUtils.Rand} $1
+	DetailPrint "Random: $1"
+	${StdUtils.Rand} $1
+	DetailPrint "Random: $1"
+	${StdUtils.Rand} $1
+	DetailPrint "Random: $1"
+	${StdUtils.Rand} $1
+	DetailPrint "Random: $1"
+	${StdUtils.Rand} $1
+	DetailPrint "Random: $1"
+	${StdUtils.Rand} $1
+	DetailPrint "Random: $1"
+	${StdUtils.Rand} $1
+	DetailPrint "Random: $1"
+	${StdUtils.Rand} $1
+	DetailPrint "Random: $1"
+SectionEnd
+
+!insertmacro NextTest
+
+Section
+	${StdUtils.RandMax} $1 42
+	DetailPrint "Random Max: $1"
+	${StdUtils.RandMax} $1 42
+	DetailPrint "Random Max: $1"
+	${StdUtils.RandMax} $1 42
+	DetailPrint "Random Max: $1"
+	${StdUtils.RandMax} $1 42
+	DetailPrint "Random Max: $1"
+	${StdUtils.RandMax} $1 42
+	DetailPrint "Random Max: $1"
+	${StdUtils.RandMax} $1 42
+	DetailPrint "Random Max: $1"
+	${StdUtils.RandMax} $1 42
+	DetailPrint "Random Max: $1"
+	${StdUtils.RandMax} $1 42
+	DetailPrint "Random Max: $1"
+	${StdUtils.RandMax} $1 42
+	DetailPrint "Random Max: $1"
+	${StdUtils.RandMax} $1 42
+	DetailPrint "Random Max: $1"
+	${StdUtils.RandMax} $1 42
+	DetailPrint "Random Max: $1"
+	${StdUtils.RandMax} $1 42
+	DetailPrint "Random Max: $1"
+SectionEnd
+
+!insertmacro NextTest
+
+Section
+	${StdUtils.RandMinMax} $1 -4 -2
+	DetailPrint "Random Min/Max: $1"
+	${StdUtils.RandMinMax} $1 -4 -2
+	DetailPrint "Random Min/Max: $1"
+	${StdUtils.RandMinMax} $1 -4 -2
+	DetailPrint "Random Min/Max: $1"
+	${StdUtils.RandMinMax} $1 -4 -2
+	DetailPrint "Random Min/Max: $1"
+	${StdUtils.RandMinMax} $1 -4 -2
+	${StdUtils.RandMinMax} $1 -4 -2
+	DetailPrint "Random Min/Max: $1"
+	${StdUtils.RandMinMax} $1 -4 -2
+	DetailPrint "Random Min/Max: $1"
+	${StdUtils.RandMinMax} $1 -4 -2
+	DetailPrint "Random Min/Max: $1"
+	${StdUtils.RandMinMax} $1 -4 -2
+	DetailPrint "Random Min/Max: $1"
+	${StdUtils.RandMinMax} $1 -4 -2
+	DetailPrint "Random Min/Max: $1"
+	${StdUtils.RandMinMax} $1 20 21
+	DetailPrint "Random Min/Max: $1"
+	${StdUtils.RandMinMax} $1 20 21
+	DetailPrint "Random Min/Max: $1"
+	${StdUtils.RandMinMax} $1 20 21
+	DetailPrint "Random Min/Max: $1"
+	${StdUtils.RandMinMax} $1 20 21
+	DetailPrint "Random Min/Max: $1"
+	${StdUtils.RandMinMax} $1 20 21
+	DetailPrint "Random Min/Max: $1"
+	${StdUtils.RandMinMax} $1 20 21
+	DetailPrint "Random Min/Max: $1"
+SectionEnd
+
+!insertmacro NextTest
+
+Section
+	${StdUtils.FormatStr} $1 "Hello World is %05d woha!" 89
+	DetailPrint "FormatStr: $1"
+	${StdUtils.FormatStr2} $1 "Hello World is %05d and %05d woha!" 89 384
+	DetailPrint "FormatStr: $1"
+	${StdUtils.FormatStr3} $1 "Hello World is %05d and %05d or even %05d woha!" 89 384 2384
+	DetailPrint "FormatStr: $1"
+	${StdUtils.FormatStr} $1 "Hello World is %09000d." 89
+	DetailPrint "FormatStr: $1"
+SectionEnd
+
+!insertmacro NextTest
+
+Section
+	${StdUtils.RandList} 50 100
+	Pop $1
+	StrCmp $1 EOL +3
+	DetailPrint "RandList: $1"
+	Goto -3
+SectionEnd
+
+!insertmacro NextTest
+
+# -----------------------------------------
+# SHFileCopy function
+# -----------------------------------------
+
+Section
+	InitPluginsDir
+	SetOutPath "$PLUGINSDIR\TestDirA"
+	File "${NSISDIR}\Contrib\Graphics\Checks\*.*"
+	SetOutPath "$PLUGINSDIR\TestDirA\SubDir"
+	File "${NSISDIR}\Contrib\Graphics\Header\*.*"
+	CreateDirectory "$PLUGINSDIR\SubDirX"
+	CreateDirectory "$PLUGINSDIR\SubDirY"
+	
+	${StdUtils.SHFileCopy} $0 "$PLUGINSDIR\TestDirA" "$PLUGINSDIR\SubDirX\TestDirB" $HWNDPARENT
+	DetailPrint "SHFileCopy: $0"
+	${StdUtils.SHFileMove} $0 "$PLUGINSDIR\TestDirA" "$PLUGINSDIR\SubDirY\TestDirC" $HWNDPARENT
+	DetailPrint "SHFileMove: $0"
+	ExecShell "explore" "$PLUGINSDIR"
+SectionEnd
+
+!insertmacro NextTest
+
+Section
+	MessageBox MB_ICONINFORMATION "The next three operations are going to fail!$\nBut only one will be verbose..."
+
+	${StdUtils.SHFileCopy} $0 "$PLUGINSDIR\TestDirXYZ" "$PLUGINSDIR\SubDirX\TestDirZ" $HWNDPARENT
+	DetailPrint "SHFileCopy: $0"
+	
+	${StdUtils.SetVerbose} 1
+	${StdUtils.SHFileCopy} $0 "$PLUGINSDIR\TestDirXYZ" "$PLUGINSDIR\SubDirX\TestDirZ" $HWNDPARENT
+	DetailPrint "SHFileCopy: $0"
+	
+	${StdUtils.SetVerbose} 0
+	${StdUtils.SHFileCopy} $0 "$PLUGINSDIR\TestDirXYZ" "$PLUGINSDIR\SubDirX\TestDirZ" $HWNDPARENT
+	DetailPrint "SHFileCopy: $0"
+SectionEnd
+
+!insertmacro NextTest
+
+# -----------------------------------------
+# String functions
+# -----------------------------------------
+
+Section
+	${StdUtils.ScanStr} $0 "Der Test sagt %d ist toll!" "Der Test sagt 571 ist toll!" 42
+	DetailPrint "ScanStr: $0"
+	${StdUtils.ScanStr} $0 "Der Hund sagt %d ist toll!" "Der Test sagt 571 ist toll!" 42
+	DetailPrint "ScanStr: $0"
+SectionEnd
+
+!insertmacro NextTest
+
+Section
+	${StdUtils.ScanStr2} $0 $1 "Der Test sagt %d sowie %d ist toll!" "Der Test sagt 571 sowie 831 ist toll!" 42 43
+	DetailPrint "ScanStr2: $0, $1"
+	${StdUtils.ScanStr2} $0 $1 "Der Test sagt %d sowie %d ist toll!" "Der Test sagt 571 horch 831 ist toll!" 42 43
+	DetailPrint "ScanStr2: $0, $1"
+	${StdUtils.ScanStr2} $0 $1 "Der Test sagt %d sowie %d ist toll!" "Der Hund sagt 571 horch 831 ist toll!" 42 43
+	DetailPrint "ScanStr2: $0, $1"
+SectionEnd
+
+!insertmacro NextTest
+
+Section
+	${StdUtils.ScanStr3} $0 $1 $2 "Der Test sagt %d sowie %d ist toll! Und %d." "Der Test sagt 571 sowie 831 ist toll! Und 325" 42 43 44
+	DetailPrint "ScanStr3: $0, $1, $2"
+	${StdUtils.ScanStr3} $0 $1 $2 "Der Test sagt %d sowie %d ist toll! Und %d." "Der Test sagt 571 sowie 831 ist toll! OMG 325" 42 43 44
+	DetailPrint "ScanStr3: $0, $1, $2"
+	${StdUtils.ScanStr3} $0 $1 $2 "Der Test sagt %d sowie %d ist toll! Und %d." "Der Test sagt 571 horch 831 ist toll! OMG 325" 42 43 44
+	DetailPrint "ScanStr3: $0, $1, $2"
+	${StdUtils.ScanStr3} $0 $1 $2 "Der Test sagt %d sowie %d ist toll! Und %d." "Der Hund sagt 571 horch 831 ist toll! OMG 325" 42 43 44
+	DetailPrint "ScanStr3: $0, $1, $2"
+SectionEnd
+
+!insertmacro NextTest
+
+Section
+	StrCpy $1 "        Some Text        "
+	DetailPrint "String: '$1'"
+	StrCpy $0 $1
+	${StdUtils.TrimStr} $0
+	DetailPrint "TrimStr: '$0'"
+	StrCpy $0 $1
+	${StdUtils.TrimStrLeft} $0
+	DetailPrint "TrimStrLeft: '$0'"
+	StrCpy $0 $1
+	${StdUtils.TrimStrRight} $0
+	DetailPrint "TrimStrRight: '$0'"
+	
+	StrCpy $1 "Some Text"
+	DetailPrint "String: '$1'"
+	StrCpy $0 $1
+	${StdUtils.TrimStr} $0
+	DetailPrint "TrimStr: '$0'"
+	StrCpy $0 $1
+	${StdUtils.TrimStrLeft} $0
+	DetailPrint "TrimStrLeft: '$0'"
+	StrCpy $0 $1
+	${StdUtils.TrimStrRight} $0
+	DetailPrint "TrimStrRight: '$0'"
+
+	StrCpy $1 ""
+	DetailPrint "String: '$1'"
+	StrCpy $0 $1
+	${StdUtils.TrimStr} $0
+	DetailPrint "TrimStr: '$0'"
+	StrCpy $0 $1
+	${StdUtils.TrimStrLeft} $0
+	DetailPrint "TrimStrLeft: '$0'"
+	StrCpy $0 $1
+	${StdUtils.TrimStrRight} $0
+	DetailPrint "TrimStrRight: '$0'"
+	
+	StrCpy $1 "   "
+	DetailPrint "String: '$1'"
+	StrCpy $0 $1
+	${StdUtils.TrimStr} $0
+	DetailPrint "TrimStr: '$0'"
+	StrCpy $0 $1
+	${StdUtils.TrimStrLeft} $0
+	DetailPrint "TrimStrLeft: '$0'"
+	StrCpy $0 $1
+	${StdUtils.TrimStrRight} $0
+	DetailPrint "TrimStrRight: '$0'"
+
+	StrCpy $1 "$\tFoobar$\r$\n"
+	DetailPrint "String: '$1'"
+	StrCpy $0 $1
+	${StdUtils.TrimStr} $0
+	DetailPrint "TrimStr: '$0'"
+	StrCpy $0 $1
+	${StdUtils.TrimStrLeft} $0
+	DetailPrint "TrimStrLeft: '$0'"
+	StrCpy $0 $1
+	${StdUtils.TrimStrRight} $0
+	DetailPrint "TrimStrRight: '$0'"
+SectionEnd
+
+!insertmacro NextTest
+
+Section
+	StrCpy $0 "ABC"
+	DetailPrint "String: $0"
+	${StdUtils.RevStr} $0
+	DetailPrint "RevStr: $0"
+	
+	StrCpy $0 "ABCD"
+	DetailPrint "String: $0"
+	${StdUtils.RevStr} $0
+	DetailPrint "RevStr: $0"
+
+	StrCpy $0 "Just a very long text with no specific meaning at all!"
+	DetailPrint "String: $0"
+	${StdUtils.RevStr} $0
+	DetailPrint "RevStr: $0"
+SectionEnd
+
+!insertmacro NextTest
diff --git a/Other/Source/Plugins/Timeout.dll b/etc/source/Plugins/Timeout.dll
similarity index 100%
rename from Other/Source/Plugins/Timeout.dll
rename to etc/source/Plugins/Timeout.dll
diff --git a/Other/Source/Plugins/TypeLib.dll b/etc/source/Plugins/TypeLib.dll
similarity index 100%
rename from Other/Source/Plugins/TypeLib.dll
rename to etc/source/Plugins/TypeLib.dll
diff --git a/Other/Source/Plugins/UAC.dll b/etc/source/Plugins/UAC.dll
similarity index 100%
rename from Other/Source/Plugins/UAC.dll
rename to etc/source/Plugins/UAC.dll
diff --git a/etc/source/Plugins/inect.txt b/etc/source/Plugins/inect.txt
new file mode 100644
index 0000000..d063d9f
--- /dev/null
+++ b/etc/source/Plugins/inect.txt
@@ -0,0 +1,9 @@
+inect has many flaws.. 
+one of which is HTTPS and certificate issues.
+
+Some users may not be able to download due to Browser's security settings.
+http://stackoverflow.com/questions/23467843/sending-https-request-using-inetc
+
+ie. go into Browser settings > select "Use TLS 1.x"
+
+http://en.wikipedia.org/wiki/Transport_Layer_Security#Web_browsers
\ No newline at end of file
diff --git a/etc/source/Plugins/newtextreplace.dll b/etc/source/Plugins/newtextreplace.dll
new file mode 100644
index 0000000..ccc685f
Binary files /dev/null and b/etc/source/Plugins/newtextreplace.dll differ
diff --git a/etc/source/Plugins/nsExec/readme.txt b/etc/source/Plugins/nsExec/readme.txt
new file mode 100644
index 0000000..3fcb5cf
--- /dev/null
+++ b/etc/source/Plugins/nsExec/readme.txt
@@ -0,0 +1,49 @@
+nsExec
+------
+nsExec will execute command-line based programs and capture the output
+without opening a dos box.
+
+
+Usage
+-----
+nsExec::Exec [/OEM] [/TIMEOUT=x] path
+
+-or-
+
+nsExec::ExecToLog [/OEM] [/TIMEOUT=x] path
+
+-or-
+
+nsExec::ExecToStack [/OEM] [/TIMEOUT=x] path
+
+All functions are the same except ExecToLog will print the output
+to the log window and ExecToStack will push up to ${NSIS_MAX_STRLEN}
+characters of output onto the stack after the return value.
+
+Use the /OEM switch to convert the output text from OEM to ANSI.
+
+The timeout value is optional.  The timeout is the time in
+milliseconds nsExec will wait for output.  If output from the
+process is received, the timeout value is reset and it will
+again wait for more output using the timeout value.  See Return 
+Value for how to check if there was a timeout.
+
+To ensure that command are executed without problems on all windows versions,
+is recommended to use the following syntax:
+
+   nsExec::ExecToStack [OPTIONS] '"PATH" param1 param2 paramN'
+
+This way the application path may contain non 8.3 paths (with spaces)
+
+Return Value
+------------
+If nsExec is unable to execute the process, it will return "error"
+on the top of the stack, if the process timed out it will return
+"timeout", else it will return the return code from the
+executed process.
+
+
+Copyright Info
+--------------
+Copyright (c) 2002 Robert Rainwater
+Thanks to Justin Frankel and Amir Szekely
\ No newline at end of file
diff --git a/Other/Source/Plugins/nsisFirewall.dll b/etc/source/Plugins/nsisFirewall.dll
similarity index 100%
rename from Other/Source/Plugins/nsisFirewall.dll
rename to etc/source/Plugins/nsisFirewall.dll
diff --git a/etc/source/Plugins/nsisFirewall/ReadMe.txt b/etc/source/Plugins/nsisFirewall/ReadMe.txt
new file mode 100644
index 0000000..f71ef3b
--- /dev/null
+++ b/etc/source/Plugins/nsisFirewall/ReadMe.txt
@@ -0,0 +1,92 @@
+nsisFirewall 1.2 -- Small NSIS plugin for simple tasks with Windows build-in Firewall
+Web site: http://wiz0u.free.fr/prog/nsisFirewall
+---------------------------------------------------------
+
+nsisFirewall allows you to perform 2 tasks :
+- Add an application to Windows Firewall exception list
+- Remove an application from Windows Firewall exception list
+
+Don't bother checking if it is a version of Windows with a build-in Firewall
+Don't bother checking if the Firewall is enabled
+Don't ever try to completely disable the firewall
+And why bother adding specific port rules when you can simply unlock the network
+ for the application you're installing ?
+
+Just call nsisFirewall::AddAuthorizedApplication at the end of your NSIS installation section
+      and nsisFirewall::RemoveAuthorizedApplication in your uninstaller section
+
+
+
+Usage
+-----
+nsisFirewall::AddAuthorizedApplication "<application path>" "<rule name>"
+nsisFirewall::RemoveAuthorizedApplication "<application path>"
+
+<application path> is the full path to the application you want to be authorized to
+	access the network (or accept incoming connections)
+
+<rule name> is the title that will be given to this exception entry in the firewall
+	control panel list
+
+
+Return Value
+------------
+
+Those 2 functions returns an integer status on the top of the stack
+Possible status are:
+	0:  Action was performed successfully
+	<0: An error occured (the value is an HRESULT error code, see MSDN for information)
+	>0: Such status should never be returned (positive HRESULTs are success codes)
+
+
+Notes
+-----
+1) Your installer must be run with administrator rights for nsisFirewall to work
+2) AddAuthorizedApplication will return a "file not found" HRESULT code if your application is 
+	not installed on the system *before* calling nsisFirewall
+3) RemoveAuthorizedApplication will return a success even if the application is not in the exception list
+4) Most of the time you won't need to check the return value (but don't forget to Pop it)
+	because there's not much you can do if nsisFirewall failed to add your application
+5) Run "firewall.cpl" to display the Firewall control panel (it does not get refreshed so close/reopen it)
+6) Sources should be compiled with MSVC 6.0 in order to use MSVCRT.DLL because more
+	recent runtime libraries DLL might not be available on the target system
+
+Sample scripts
+--------------
+
+	; Add NOTEPAD to the authorized list
+	nsisFirewall::AddAuthorizedApplication "$WINDIR\Notepad.exe" "nsisFirewall Test"
+	Pop $0
+	IntCmp $0 0 +3
+		MessageBox MB_OK "An error happened while adding program to Firewall exception list (result=$0)"
+		Return
+	MessageBox MB_OK "Program added to Firewall exception list"
+
+	; Remove NOTEPAD from the authorized list
+	nsisFirewall::RemoveAuthorizedApplication "$WINDIR\Notepad.exe"
+	Pop $0
+	IntCmp $0 0 +3
+		MessageBox MB_OK "An error happened while removing program to Firewall exception list (result=$0)"
+		Return
+	MessageBox MB_OK "Program removed to Firewall exception list"
+
+Version history
+---------------
+1.2 : added a Unicode-NSIS version (nsisFirewallW) -- Thanks to Guilherme B. Versiani
+1.1 : Correctly handle 2 errors cases
+1.0 : First release
+
+
+License
+-------
+Copyright (c) 2007-2009 Olivier Marcoux
+
+This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
diff --git a/etc/source/Plugins/nsisFirewall/Sample.nsi b/etc/source/Plugins/nsisFirewall/Sample.nsi
new file mode 100644
index 0000000..e0c8fc7
--- /dev/null
+++ b/etc/source/Plugins/nsisFirewall/Sample.nsi
@@ -0,0 +1,31 @@
+; nsisFirewall - Sample script
+
+!ifdef TARGETDIR
+!addplugindir "${TARGETDIR}"
+!else
+!addplugindir "..\bin"
+!endif
+
+Name "Sample nsisFirewall"
+OutFile "Sample.exe"
+ShowInstDetails show	
+
+Section "Main program"
+	; Add NOTEPAD to the authorized list
+	nsisFirewall::AddAuthorizedApplication "$WINDIR\Notepad.exe" "nsisFirewall Test"
+	Pop $0
+	IntCmp $0 0 +3
+		MessageBox MB_OK "A problem happened while adding program to Firewall exception list (result=$0)"
+		Return
+	Exec "rundll32.exe shell32.dll,Control_RunDLL firewall.cpl"
+	MessageBox MB_OK "Program added to Firewall exception list.$\r$\n(close the control panel before clicking OK)"
+
+	; Remove NOTEPAD from the authorized list
+	nsisFirewall::RemoveAuthorizedApplication "$WINDIR\Notepad.exe"
+	Pop $0
+	IntCmp $0 0 +3
+		MessageBox MB_OK "A problem happened while removing program to Firewall exception list (result=$0)"
+		Return
+	Exec "rundll32.exe shell32.dll,Control_RunDLL firewall.cpl"
+	MessageBox MB_OK "Program removed to Firewall exception list"
+SectionEnd
diff --git a/Other/Source/Plugins/nsisXML.dll b/etc/source/Plugins/nsisXML.dll
similarity index 100%
rename from Other/Source/Plugins/nsisXML.dll
rename to etc/source/Plugins/nsisXML.dll
diff --git a/Other/Source/Plugins/nsisXML/License.txt b/etc/source/Plugins/nsisXML/License.txt
similarity index 98%
rename from Other/Source/Plugins/nsisXML/License.txt
rename to etc/source/Plugins/nsisXML/License.txt
index 3edcf9c..cfefb36 100644
--- a/Other/Source/Plugins/nsisXML/License.txt
+++ b/etc/source/Plugins/nsisXML/License.txt
@@ -1,15 +1,15 @@
-nsisXML -- Small NSIS plugin to manipulate XML data through MSXML
-Web site: http://wiz0u.free.fr/prog/nsisXML
-
-Copyright (c) 2005-2012 Olivier Marcoux
-
-This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
-
-    1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-
-    2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-
-    3. This notice may not be removed or altered from any source distribution.
-
+nsisXML -- Small NSIS plugin to manipulate XML data through MSXML
+Web site: http://wiz0u.free.fr/prog/nsisXML
+
+Copyright (c) 2005-2012 Olivier Marcoux
+
+This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
+
diff --git a/Other/Source/Plugins/nsisXML/ReadMe.txt b/etc/source/Plugins/nsisXML/ReadMe.txt
similarity index 97%
rename from Other/Source/Plugins/nsisXML/ReadMe.txt
rename to etc/source/Plugins/nsisXML/ReadMe.txt
index 22ce5b3..2235cb6 100644
--- a/Other/Source/Plugins/nsisXML/ReadMe.txt
+++ b/etc/source/Plugins/nsisXML/ReadMe.txt
@@ -1,168 +1,168 @@
-nsisXML -- Small NSIS plugin to manipulate XML data through MSXML
-Web site: http://wiz0u.free.fr/prog/nsisXML
------------------------------------------------------------------
-
-You can typically use it to:
-- create, read, modify, write XML files
-- create, remove, search XML nodes
-- set/get nodes content or attributes
-
-Notes
------
-* For simplicity, I decided to use variables $0 through $3 for most parameters and
-	return values, instead of pushing/popping values using the stack
-	Therefore, avoid using these variables for something else while dealing with
-	nsisXML
-* UTF8 text is generated for characters outside 7-bits ASCII range but I'm not
-	sure about codepage issue if the installer runs on a different codepage system
-	I suggest you don't supply constant strings in NSIS with such characters to
-	nsisXML. However strings based on the target system (like paths) should be ok.
-* Newly-created XML file won't be nicely indented (but it's still correct XML !)
-	If you load, modify and save an XML file that was already indented, it will be
-	nicely indented (this is how MSXML works)
-* Plugin requires, of course, that MSXML be already installed on the target system
-	It should run fine with any version of MSXML and will automatically use the most recent one.
-	Check MS Knowledge Base Q269238 for versions of MSXML shipped with Windows & Internet Explorer
-	(In summary: every computer that has IE 4.0, or more recent, has MSXML installed)
-
-Variables meaning
------------------
-$0	reference to the XML document root (integer)
-$1	reference to a parent node (integer)
-$2	reference to a child node (integer)
-$3	depends - see functions description
-
-Usage
------
-nsisXML::create
-	creates an empty XML document in memory and returns its reference in $0 and $1
-
-nsisXML::load <filename>
-	load given XML file into document $0
-	REQUIRES that an XML document be already created in $0
-	(if XML document $0 is not empty, all content will be discarded)
-	sets $0 to 0 if an error occured
-
-nsisXML::loadAndValidate <filename>
-	same as load but performs validation on the XML if a schema is present, and
-	resolves external definitions (may try to establish an Internet connection)
-
-nsisXML::save <filename>
-	saves current document $0 to given file
-
-nsisXML::createProcessingInstruction <target> <data>
-	creates a new 'processing instruction' node and return its reference in $2
-
-nsisXML::createElement <tag name>
-	creates a new element node with given tag name (initially empty) and return its
-	reference in $2
-
-nsisXML::createElementInNS <tag name> <namespace>
-	creates a new element node with given tag name (initially empty) inside the given
-	namespace, and return its reference in $2
-
-nsisXML::appendChild
-	appends node $2 as a child of node $1
-
-nsisXML::insertBefore
-	insert node $2 as a child of node $1, to the left of node $3
-	($3 must be a reference to a child node of $1)
-
-nsisXML::setAttribute <attribute name> <value>
-	sets the given attribute with the given value on node $2
-
-nsisXML::getAttribute <attribute name>
-	returns in $3 the value for the given attribute name of node $2
-	if attribute is not found, returns an empty string
-
-nsisXML::setText <content text>
-	sets the text content of the node $2 (<>the text between the tags</>)
-
-nsisXML::getText
-	returns in $3 the text content for node $2
-
-nsisXML::select <XPath expression>
-	find the first node matching the given XPath expression and return its
-	reference in $1 and $2
-	if not found, reference will be 0
-
-nsisXML::parentNode
-	returns in $1 the reference on the parent node of node $2
-
-nsisXML::removeChild
-	removes node $2 from the childs list of node $1
-
-nsisXML::release <node reference>
-	release immediately the memory associated with given node (typically $2, $1 or $0)
-	for every nsisXML function that returns a node reference, you may want to release its memory after you're done working with the reference.
-	however, please note that in any case, all memory used by MSXML will be released when your installer terminates.
-	(so usually this is not a big concern)
-
-
-
-
-Sample script #1
------------------
-	nsisXML::create
-	nsisXML::createProcessingInstruction "xml" 'version="1.0" encoding="UTF-8" standalone="yes"'
-	nsisXML::appendChild
-	nsisXML::createElement "main"	; create main document element node
-	nsisXML::appendChild
-	StrCpy $1 $2			; lets move to this node and create its childs:
-	nsisXML::createElementInNS "child" "namespace"
-	nsisXML::setAttribute "attrib" "value"
-	nsisXML::setText "content"
-	nsisXML::appendChild
-	nsisXML::createElement "child"
-	nsisXML::setAttribute "attrib" "value2"
-	nsisXML::setAttribute "active" "yes"
-	nsisXML::setText "content2"
-	nsisXML::appendChild
-	nsisXML::save "Sample.xml"
-
-This script creates the following XML file:
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<main><child attrib="value">content</child><child attrib="value2" active="yes">content2</child></main>
-
-Sample script #2
------------------
-	nsisXML::create
-	nsisXML::load "Sample.xml"
-	nsisXML::select '/main/child[@attrib="value2"]'
-	IntCmp $2 0 notFound
-	nsisXML::getAttribute "active"
-	DetailPrint "Attribute 'active' is $3"
-	nsisXML::getText
-	DetailPrint "Tag <child> contains $3"
-	nsisXML::parentNode
-	nsisXML::removeChild
-	nsisXML::save "Sample.xml"
-
-If applied on the previous "Sample.xml" file, this will print out "value2",
-then "content2", and modify Sample.xml to become:
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<main><child attrib="value">content</child></main>
-
-History
--------
-2012-08-10: Added "createElementInNS" for xmlns (namespace) support
-2010-04-02: Added "release" to prevent memory leaks.
-			Automatic use of most recent MSXML available
-			DLL is no longer unloaded after each call (you don't need /NOUNLOAD anymore)
-2010-02-04: Added variant for Unicode NSIS
-2006-03-22: Added "insertBefore"
-2006-03-13: Modified "load". Added "loadAndValidation"
-
-License
--------
-Copyright (c) 2005-2012 Olivier Marcoux
-
-This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
-
-    1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-
-    2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-
-    3. This notice may not be removed or altered from any source distribution.
+nsisXML -- Small NSIS plugin to manipulate XML data through MSXML
+Web site: http://wiz0u.free.fr/prog/nsisXML
+-----------------------------------------------------------------
+
+You can typically use it to:
+- create, read, modify, write XML files
+- create, remove, search XML nodes
+- set/get nodes content or attributes
+
+Notes
+-----
+* For simplicity, I decided to use variables $0 through $3 for most parameters and
+	return values, instead of pushing/popping values using the stack
+	Therefore, avoid using these variables for something else while dealing with
+	nsisXML
+* UTF8 text is generated for characters outside 7-bits ASCII range but I'm not
+	sure about codepage issue if the installer runs on a different codepage system
+	I suggest you don't supply constant strings in NSIS with such characters to
+	nsisXML. However strings based on the target system (like paths) should be ok.
+* Newly-created XML file won't be nicely indented (but it's still correct XML !)
+	If you load, modify and save an XML file that was already indented, it will be
+	nicely indented (this is how MSXML works)
+* Plugin requires, of course, that MSXML be already installed on the target system
+	It should run fine with any version of MSXML and will automatically use the most recent one.
+	Check MS Knowledge Base Q269238 for versions of MSXML shipped with Windows & Internet Explorer
+	(In summary: every computer that has IE 4.0, or more recent, has MSXML installed)
+
+Variables meaning
+-----------------
+$0	reference to the XML document root (integer)
+$1	reference to a parent node (integer)
+$2	reference to a child node (integer)
+$3	depends - see functions description
+
+Usage
+-----
+nsisXML::create
+	creates an empty XML document in memory and returns its reference in $0 and $1
+
+nsisXML::load <filename>
+	load given XML file into document $0
+	REQUIRES that an XML document be already created in $0
+	(if XML document $0 is not empty, all content will be discarded)
+	sets $0 to 0 if an error occured
+
+nsisXML::loadAndValidate <filename>
+	same as load but performs validation on the XML if a schema is present, and
+	resolves external definitions (may try to establish an Internet connection)
+
+nsisXML::save <filename>
+	saves current document $0 to given file
+
+nsisXML::createProcessingInstruction <target> <data>
+	creates a new 'processing instruction' node and return its reference in $2
+
+nsisXML::createElement <tag name>
+	creates a new element node with given tag name (initially empty) and return its
+	reference in $2
+
+nsisXML::createElementInNS <tag name> <namespace>
+	creates a new element node with given tag name (initially empty) inside the given
+	namespace, and return its reference in $2
+
+nsisXML::appendChild
+	appends node $2 as a child of node $1
+
+nsisXML::insertBefore
+	insert node $2 as a child of node $1, to the left of node $3
+	($3 must be a reference to a child node of $1)
+
+nsisXML::setAttribute <attribute name> <value>
+	sets the given attribute with the given value on node $2
+
+nsisXML::getAttribute <attribute name>
+	returns in $3 the value for the given attribute name of node $2
+	if attribute is not found, returns an empty string
+
+nsisXML::setText <content text>
+	sets the text content of the node $2 (<>the text between the tags</>)
+
+nsisXML::getText
+	returns in $3 the text content for node $2
+
+nsisXML::select <XPath expression>
+	find the first node matching the given XPath expression and return its
+	reference in $1 and $2
+	if not found, reference will be 0
+
+nsisXML::parentNode
+	returns in $1 the reference on the parent node of node $2
+
+nsisXML::removeChild
+	removes node $2 from the childs list of node $1
+
+nsisXML::release <node reference>
+	release immediately the memory associated with given node (typically $2, $1 or $0)
+	for every nsisXML function that returns a node reference, you may want to release its memory after you're done working with the reference.
+	however, please note that in any case, all memory used by MSXML will be released when your installer terminates.
+	(so usually this is not a big concern)
+
+
+
+
+Sample script #1
+-----------------
+	nsisXML::create
+	nsisXML::createProcessingInstruction "xml" 'version="1.0" encoding="UTF-8" standalone="yes"'
+	nsisXML::appendChild
+	nsisXML::createElement "main"	; create main document element node
+	nsisXML::appendChild
+	StrCpy $1 $2			; lets move to this node and create its childs:
+	nsisXML::createElementInNS "child" "namespace"
+	nsisXML::setAttribute "attrib" "value"
+	nsisXML::setText "content"
+	nsisXML::appendChild
+	nsisXML::createElement "child"
+	nsisXML::setAttribute "attrib" "value2"
+	nsisXML::setAttribute "active" "yes"
+	nsisXML::setText "content2"
+	nsisXML::appendChild
+	nsisXML::save "Sample.xml"
+
+This script creates the following XML file:
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<main><child attrib="value">content</child><child attrib="value2" active="yes">content2</child></main>
+
+Sample script #2
+-----------------
+	nsisXML::create
+	nsisXML::load "Sample.xml"
+	nsisXML::select '/main/child[@attrib="value2"]'
+	IntCmp $2 0 notFound
+	nsisXML::getAttribute "active"
+	DetailPrint "Attribute 'active' is $3"
+	nsisXML::getText
+	DetailPrint "Tag <child> contains $3"
+	nsisXML::parentNode
+	nsisXML::removeChild
+	nsisXML::save "Sample.xml"
+
+If applied on the previous "Sample.xml" file, this will print out "value2",
+then "content2", and modify Sample.xml to become:
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<main><child attrib="value">content</child></main>
+
+History
+-------
+2012-08-10: Added "createElementInNS" for xmlns (namespace) support
+2010-04-02: Added "release" to prevent memory leaks.
+			Automatic use of most recent MSXML available
+			DLL is no longer unloaded after each call (you don't need /NOUNLOAD anymore)
+2010-02-04: Added variant for Unicode NSIS
+2006-03-22: Added "insertBefore"
+2006-03-13: Modified "load". Added "loadAndValidation"
+
+License
+-------
+Copyright (c) 2005-2012 Olivier Marcoux
+
+This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
diff --git a/Other/Source/Plugins/nsisXML/Sample.nsi b/etc/source/Plugins/nsisXML/Sample.nsi
similarity index 96%
rename from Other/Source/Plugins/nsisXML/Sample.nsi
rename to etc/source/Plugins/nsisXML/Sample.nsi
index b75765c..ae19f4c 100644
--- a/Other/Source/Plugins/nsisXML/Sample.nsi
+++ b/etc/source/Plugins/nsisXML/Sample.nsi
@@ -1,56 +1,56 @@
-; nsisXML - Sample script
-
-!ifndef TARGETDIR
-!ifdef NSIS_UNICODE
-!define TARGETDIR "..\binU"
-!else
-!define TARGETDIR "..\bin"
-!endif
-!endif
-
-!addplugindir "${TARGETDIR}"
-
-Name "Sample nsisXML"
-OutFile "Sample.exe"
-ShowInstDetails show	
-
-Section "Main program"
-	nsisXML::create
-	nsisXML::createProcessingInstruction "xml" 'version="1.0" encoding="UTF-8" standalone="yes"'
-	nsisXML::appendChild
-	nsisXML::createElement "main"	; create main document element node
-	nsisXML::appendChild
-	StrCpy $1 $2			; lets move to this node and create its childs:
-	nsisXML::createElementInNS "child" "namespace"
-	nsisXML::setAttribute "attrib" "value"
-	nsisXML::setText "content"
-	nsisXML::appendChild
-	nsisXML::createElement "child"
-	nsisXML::setAttribute "attrib" "value2"
-	nsisXML::setAttribute "active" "yes"
-	nsisXML::setText "content2"
-	nsisXML::appendChild
-	nsisXML::save "Sample.xml"
-
-	MessageBox MB_OK "Sample.xml was created$\nPress OK to continue sample"
-
-	; In this section, we decided to care about memory leaks, so we use "release" adequately
-	nsisXML::create
-	nsisXML::load "Sample.xml"
-	nsisXML::select '/main/child[@attrib="value2"]'
-	IntCmp $2 0 notFound
-	nsisXML::getAttribute "active"
-	DetailPrint "Attribute 'active' is $3"
-	nsisXML::getText
-	DetailPrint "Tag <child> contains $3"
-	nsisXML::parentNode
-	nsisXML::removeChild
-	nsisXML::release $2
-	nsisXML::release $1
-	nsisXML::save "Sample.xml"
-	nsisXML::release $0
-	Goto end
-notFound:
-	DetailPrint "XPath not resolved"
-end:
-SectionEnd
+; nsisXML - Sample script
+
+!ifndef TARGETDIR
+!ifdef NSIS_UNICODE
+!define TARGETDIR "..\binU"
+!else
+!define TARGETDIR "..\bin"
+!endif
+!endif
+
+!addplugindir "${TARGETDIR}"
+
+Name "Sample nsisXML"
+OutFile "Sample.exe"
+ShowInstDetails show	
+
+Section "Main program"
+	nsisXML::create
+	nsisXML::createProcessingInstruction "xml" 'version="1.0" encoding="UTF-8" standalone="yes"'
+	nsisXML::appendChild
+	nsisXML::createElement "main"	; create main document element node
+	nsisXML::appendChild
+	StrCpy $1 $2			; lets move to this node and create its childs:
+	nsisXML::createElementInNS "child" "namespace"
+	nsisXML::setAttribute "attrib" "value"
+	nsisXML::setText "content"
+	nsisXML::appendChild
+	nsisXML::createElement "child"
+	nsisXML::setAttribute "attrib" "value2"
+	nsisXML::setAttribute "active" "yes"
+	nsisXML::setText "content2"
+	nsisXML::appendChild
+	nsisXML::save "Sample.xml"
+
+	MessageBox MB_OK "Sample.xml was created$\nPress OK to continue sample"
+
+	; In this section, we decided to care about memory leaks, so we use "release" adequately
+	nsisXML::create
+	nsisXML::load "Sample.xml"
+	nsisXML::select '/main/child[@attrib="value2"]'
+	IntCmp $2 0 notFound
+	nsisXML::getAttribute "active"
+	DetailPrint "Attribute 'active' is $3"
+	nsisXML::getText
+	DetailPrint "Tag <child> contains $3"
+	nsisXML::parentNode
+	nsisXML::removeChild
+	nsisXML::release $2
+	nsisXML::release $1
+	nsisXML::save "Sample.xml"
+	nsisXML::release $0
+	Goto end
+notFound:
+	DetailPrint "XPath not resolved"
+end:
+SectionEnd
diff --git a/Other/Source/Plugins/nsisXML/nsisXML.cpp b/etc/source/Plugins/nsisXML/nsisXML.cpp
similarity index 96%
rename from Other/Source/Plugins/nsisXML/nsisXML.cpp
rename to etc/source/Plugins/nsisXML/nsisXML.cpp
index f295cf6..f0a3b84 100644
--- a/Other/Source/Plugins/nsisXML/nsisXML.cpp
+++ b/etc/source/Plugins/nsisXML/nsisXML.cpp
@@ -1,263 +1,263 @@
-/*
-nsisXML -- Small NSIS plugin to manipulate XML data through MSXML
-Web site: http://wiz0u.free.fr/prog/nsisXML
-
-Copyright (c) 2005-2012 Olivier Marcoux
-
-This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
-
-    1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-
-    2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-
-    3. This notice may not be removed or altered from any source distribution.
-*/
-
-#define _WINSOCKAPI_	// this is to prevent conflicts on "select" function name
-#include <windows.h>
-#include <tchar.h>
-#include <shlwapi.h>
-#include <comdef.h>
-
-#import "MSXML.DLL"
-
-typedef struct {
-  void *exec_flags;
-  int  (__stdcall *ExecuteCodeSegment)(int, HWND);
-  void (__stdcall *validate_filename)(TCHAR *);
-  int  (__stdcall *RegisterPluginCallback)(HMODULE, UINT_PTR (*NSISPLUGINCALLBACK)(enum NSPIM)); // returns 0 on success, 1 if already registered and < 0 on errors
-} extra_parameters;
-
-#define NSIS_FUNC(name) \
-extern "C" void __declspec(dllexport) name(HWND hwndParent, int string_size, \
-                                      TCHAR *variables, stack_t **stacktop, extra_parameters *extra)
-
-typedef struct _stack_t {
-  struct _stack_t *next;
-  TCHAR text[1]; // this should be the length of string_size
-} stack_t;
-
-static INT_PTR __stdcall pop_int(stack_t **&stacktop)
-{
-  stack_t *th;
-  if (!stacktop || !*stacktop) return 0;
-  th=(*stacktop);
-  INT_PTR result = _ttoi(th->text);
-  *stacktop = th->next;
-  GlobalFree((HGLOBAL)th);
-  return result;
-}
-
-static _bstr_t __stdcall pop_bstr(stack_t **&stacktop)
-{
-  stack_t *th;
-  if (!stacktop || !*stacktop) return _bstr_t();
-  th=(*stacktop);
-  _bstr_t bstr(th->text);
-  *stacktop = th->next;
-  GlobalFree((HGLOBAL)th);
-  return bstr;
-}
-
-#define pop(name) _bstr_t name = pop_bstr(stacktop);
-
-#define get(varnum) \
-	((LPDISPATCH) _ttoi(variables+varnum*string_size))
-
-void _set(TCHAR *var, LPDISPATCH value)
-{
-	LPDISPATCH ptr = value;
-	if (ptr != NULL) ptr->AddRef();
-	wsprintf(var, _T("%d"), ptr);
-}
-#define set(varnum, value) _set(variables + varnum*string_size, value)
-
-#define settvar(varnum, var) \
-	lstrcpy(variables + varnum*string_size, var);
-#define var2var(src, dst) \
-	lstrcpy(variables + dst*string_size, variables + src*string_size);
-#ifdef UNICODE
-#define setwvar(varnum, var) settvar(varnum, var)
-#else
-#define setwvar(varnum, var) \
-	WideCharToMultiByte(CP_ACP, 0, var, -1, variables + varnum*string_size, string_size, NULL, NULL);
-#endif
-
-#define get_doc() MSXML::IXMLDOMDocumentPtr doc = get(0)
-#define get_parent() MSXML::IXMLDOMNodePtr parent = get(1)
-#define set_parent(item) set(1, item)
-#define get_child(type) MSXML::type ## Ptr child = get(2)
-#define set_child(item) set(2, item)
-#define get_child2(type) MSXML::type ## Ptr child2 = get(3)
-
-const LPCSTR DOMDocuments[] = // DOMDocument UUID from all the available MSXML DLL variants
-{
-	"{2933bf90-7b36-11d2-b20e-00c04f983e60}",	//	MSXML::DOMDocument
-	"{f6d90f11-9c73-11d3-b32e-00c04f990bb4}",	//	MSXML2::DOMDocument
-	"{f5078f1b-c551-11d3-89b9-0000f81fe221}",	//	MSXML2::DOMDocument26
-	"{f5078f32-c551-11d3-89b9-0000f81fe221}",	//	MSXML2::DOMDocument30
-	"{88d969c0-f192-11d4-a65f-0040963251e5}",	//	MSXML2::DOMDocument40	(first to support Axes like following-sibling)
-	"{88d96a05-f192-11d4-a65f-0040963251e5}",	//	MSXML2::DOMDocument60
-};
-
-HMODULE g_hInstance;
-UINT_PTR NSISCallback(enum NSPIM msg) { return 0; } // we get notified of unloading on termination of the installer process
-
-NSIS_FUNC(create)
-{
-	if (extra) extra->RegisterPluginCallback(g_hInstance, NSISCallback); // to prevent unloading of this plugin
-	MSXML::IXMLDOMDocumentPtr doc = NULL;
-	int index = sizeof(DOMDocuments)/sizeof(DOMDocuments[0]); // try to find the most recent DOMDocument available
-	while (index--)
-	{
-		if (doc.CreateInstance(DOMDocuments[index], NULL, CLSCTX_INPROC_SERVER | CLSCTX_LOCAL_SERVER) == S_OK)
-			break;
-	}
-	if (doc) doc->async = VARIANT_FALSE;
-	set(0, doc);
-	var2var(0, 1);
-}
-
-NSIS_FUNC(load)
-{
-	get_doc();
-	pop(xmlSource);
-	doc->resolveExternals = VARIANT_FALSE;
-	doc->validateOnParse  = VARIANT_FALSE;
-	if (doc->load(xmlSource) == 0)
-		settvar(0, _T("0"));
-}
-
-NSIS_FUNC(loadAndValidate)
-{
-	get_doc();
-	pop(xmlSource);
-	if (doc->load(xmlSource) == 0)
-		settvar(0, _T("0"));
-}
-
-NSIS_FUNC(save)
-{
-	get_doc(); 
-	pop(destination);
-	doc->save(destination);
-}
-
-NSIS_FUNC(createProcessingInstruction)
-{
-	get_doc(); 
-	pop(target);
-	pop(data);
-	set_child(doc->createProcessingInstruction(target, data));
-}
-
-NSIS_FUNC(createElement)
-{
-	get_doc(); 
-	pop(tagName);
-	set_child(doc->createElement(tagName));
-}
-
-NSIS_FUNC(createElementInNS)
-{
-	get_doc(); 
-	pop(tagName);
-	pop(namespaceURI)
-	set_child(doc->createNode(long(NODE_ELEMENT), tagName, namespaceURI));
-}
-
-NSIS_FUNC(setDocumentElement)
-{
-	get_doc(); 
-	get_child(IXMLDOMElement);
-	doc->documentElement = child;
-}
-
-NSIS_FUNC(getAttribute)
-{
-	get_child(IXMLDOMElement); 
-	pop(name); 
-	_variant_t result = child->getAttribute(name);
-	setwvar(3, (result.vt == VT_NULL) ? L"" : result.bstrVal);
-}
-
-NSIS_FUNC(setAttribute)
-{
-	get_child(IXMLDOMElement); 
-	pop(name);
-	pop(value);
-	child->setAttribute(name, value);
-}
-
-NSIS_FUNC(setText)
-{
-	get_child(IXMLDOMNode); 
-	pop(text);
-	child->text = text;
-}
-
-NSIS_FUNC(getText)
-{
-	get_child(IXMLDOMNode); 
-	setwvar(3, child->text);
-}
-
-NSIS_FUNC(select)
-{
-	get_doc();
-	pop(queryString);
-	try
-	{
-		set(1, doc->selectSingleNode(queryString));
-	}
-	catch (_com_error)
-	{
-		settvar(1, _T("0"));
-	}
-	var2var(1, 2);
-}
-
-NSIS_FUNC(parentNode)
-{
-	get_child(IXMLDOMNode);
-	set_parent(child->parentNode);
-}
-
-NSIS_FUNC(appendChild)
-{
-	get_parent(); 
-	get_child(IXMLDOMNode);
-	parent->appendChild(child);
-}
-
-NSIS_FUNC(insertBefore)
-{
-	get_parent(); 
-	get_child(IXMLDOMNode);
-	get_child2(IXMLDOMNode);
-	parent->insertBefore(child, _variant_t(child2, true));
-}
-
-NSIS_FUNC(removeChild)
-{
-	get_parent(); 
-	get_child(IXMLDOMNode);
-	parent->removeChild(child);
-}
-
-NSIS_FUNC(release)
-{
-	LPUNKNOWN node = LPUNKNOWN(pop_int(stacktop));
-	node->Release();
-}
-
-extern "C" BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID)
-{
-	g_hInstance = hInstance;
-	// we can call CoInitialize here because DLL is not loaded at application
-	// startup, but dynamically by Installer
-	CoInitialize(NULL); 
-	return TRUE;
-}
+/*
+nsisXML -- Small NSIS plugin to manipulate XML data through MSXML
+Web site: http://wiz0u.free.fr/prog/nsisXML
+
+Copyright (c) 2005-2012 Olivier Marcoux
+
+This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
+*/
+
+#define _WINSOCKAPI_	// this is to prevent conflicts on "select" function name
+#include <windows.h>
+#include <tchar.h>
+#include <shlwapi.h>
+#include <comdef.h>
+
+#import "MSXML.DLL"
+
+typedef struct {
+  void *exec_flags;
+  int  (__stdcall *ExecuteCodeSegment)(int, HWND);
+  void (__stdcall *validate_filename)(TCHAR *);
+  int  (__stdcall *RegisterPluginCallback)(HMODULE, UINT_PTR (*NSISPLUGINCALLBACK)(enum NSPIM)); // returns 0 on success, 1 if already registered and < 0 on errors
+} extra_parameters;
+
+#define NSIS_FUNC(name) \
+extern "C" void __declspec(dllexport) name(HWND hwndParent, int string_size, \
+                                      TCHAR *variables, stack_t **stacktop, extra_parameters *extra)
+
+typedef struct _stack_t {
+  struct _stack_t *next;
+  TCHAR text[1]; // this should be the length of string_size
+} stack_t;
+
+static INT_PTR __stdcall pop_int(stack_t **&stacktop)
+{
+  stack_t *th;
+  if (!stacktop || !*stacktop) return 0;
+  th=(*stacktop);
+  INT_PTR result = _ttoi(th->text);
+  *stacktop = th->next;
+  GlobalFree((HGLOBAL)th);
+  return result;
+}
+
+static _bstr_t __stdcall pop_bstr(stack_t **&stacktop)
+{
+  stack_t *th;
+  if (!stacktop || !*stacktop) return _bstr_t();
+  th=(*stacktop);
+  _bstr_t bstr(th->text);
+  *stacktop = th->next;
+  GlobalFree((HGLOBAL)th);
+  return bstr;
+}
+
+#define pop(name) _bstr_t name = pop_bstr(stacktop);
+
+#define get(varnum) \
+	((LPDISPATCH) _ttoi(variables+varnum*string_size))
+
+void _set(TCHAR *var, LPDISPATCH value)
+{
+	LPDISPATCH ptr = value;
+	if (ptr != NULL) ptr->AddRef();
+	wsprintf(var, _T("%d"), ptr);
+}
+#define set(varnum, value) _set(variables + varnum*string_size, value)
+
+#define settvar(varnum, var) \
+	lstrcpy(variables + varnum*string_size, var);
+#define var2var(src, dst) \
+	lstrcpy(variables + dst*string_size, variables + src*string_size);
+#ifdef UNICODE
+#define setwvar(varnum, var) settvar(varnum, var)
+#else
+#define setwvar(varnum, var) \
+	WideCharToMultiByte(CP_ACP, 0, var, -1, variables + varnum*string_size, string_size, NULL, NULL);
+#endif
+
+#define get_doc() MSXML::IXMLDOMDocumentPtr doc = get(0)
+#define get_parent() MSXML::IXMLDOMNodePtr parent = get(1)
+#define set_parent(item) set(1, item)
+#define get_child(type) MSXML::type ## Ptr child = get(2)
+#define set_child(item) set(2, item)
+#define get_child2(type) MSXML::type ## Ptr child2 = get(3)
+
+const LPCSTR DOMDocuments[] = // DOMDocument UUID from all the available MSXML DLL variants
+{
+	"{2933bf90-7b36-11d2-b20e-00c04f983e60}",	//	MSXML::DOMDocument
+	"{f6d90f11-9c73-11d3-b32e-00c04f990bb4}",	//	MSXML2::DOMDocument
+	"{f5078f1b-c551-11d3-89b9-0000f81fe221}",	//	MSXML2::DOMDocument26
+	"{f5078f32-c551-11d3-89b9-0000f81fe221}",	//	MSXML2::DOMDocument30
+	"{88d969c0-f192-11d4-a65f-0040963251e5}",	//	MSXML2::DOMDocument40	(first to support Axes like following-sibling)
+	"{88d96a05-f192-11d4-a65f-0040963251e5}",	//	MSXML2::DOMDocument60
+};
+
+HMODULE g_hInstance;
+UINT_PTR NSISCallback(enum NSPIM msg) { return 0; } // we get notified of unloading on termination of the installer process
+
+NSIS_FUNC(create)
+{
+	if (extra) extra->RegisterPluginCallback(g_hInstance, NSISCallback); // to prevent unloading of this plugin
+	MSXML::IXMLDOMDocumentPtr doc = NULL;
+	int index = sizeof(DOMDocuments)/sizeof(DOMDocuments[0]); // try to find the most recent DOMDocument available
+	while (index--)
+	{
+		if (doc.CreateInstance(DOMDocuments[index], NULL, CLSCTX_INPROC_SERVER | CLSCTX_LOCAL_SERVER) == S_OK)
+			break;
+	}
+	if (doc) doc->async = VARIANT_FALSE;
+	set(0, doc);
+	var2var(0, 1);
+}
+
+NSIS_FUNC(load)
+{
+	get_doc();
+	pop(xmlSource);
+	doc->resolveExternals = VARIANT_FALSE;
+	doc->validateOnParse  = VARIANT_FALSE;
+	if (doc->load(xmlSource) == 0)
+		settvar(0, _T("0"));
+}
+
+NSIS_FUNC(loadAndValidate)
+{
+	get_doc();
+	pop(xmlSource);
+	if (doc->load(xmlSource) == 0)
+		settvar(0, _T("0"));
+}
+
+NSIS_FUNC(save)
+{
+	get_doc(); 
+	pop(destination);
+	doc->save(destination);
+}
+
+NSIS_FUNC(createProcessingInstruction)
+{
+	get_doc(); 
+	pop(target);
+	pop(data);
+	set_child(doc->createProcessingInstruction(target, data));
+}
+
+NSIS_FUNC(createElement)
+{
+	get_doc(); 
+	pop(tagName);
+	set_child(doc->createElement(tagName));
+}
+
+NSIS_FUNC(createElementInNS)
+{
+	get_doc(); 
+	pop(tagName);
+	pop(namespaceURI)
+	set_child(doc->createNode(long(NODE_ELEMENT), tagName, namespaceURI));
+}
+
+NSIS_FUNC(setDocumentElement)
+{
+	get_doc(); 
+	get_child(IXMLDOMElement);
+	doc->documentElement = child;
+}
+
+NSIS_FUNC(getAttribute)
+{
+	get_child(IXMLDOMElement); 
+	pop(name); 
+	_variant_t result = child->getAttribute(name);
+	setwvar(3, (result.vt == VT_NULL) ? L"" : result.bstrVal);
+}
+
+NSIS_FUNC(setAttribute)
+{
+	get_child(IXMLDOMElement); 
+	pop(name);
+	pop(value);
+	child->setAttribute(name, value);
+}
+
+NSIS_FUNC(setText)
+{
+	get_child(IXMLDOMNode); 
+	pop(text);
+	child->text = text;
+}
+
+NSIS_FUNC(getText)
+{
+	get_child(IXMLDOMNode); 
+	setwvar(3, child->text);
+}
+
+NSIS_FUNC(select)
+{
+	get_doc();
+	pop(queryString);
+	try
+	{
+		set(1, doc->selectSingleNode(queryString));
+	}
+	catch (_com_error)
+	{
+		settvar(1, _T("0"));
+	}
+	var2var(1, 2);
+}
+
+NSIS_FUNC(parentNode)
+{
+	get_child(IXMLDOMNode);
+	set_parent(child->parentNode);
+}
+
+NSIS_FUNC(appendChild)
+{
+	get_parent(); 
+	get_child(IXMLDOMNode);
+	parent->appendChild(child);
+}
+
+NSIS_FUNC(insertBefore)
+{
+	get_parent(); 
+	get_child(IXMLDOMNode);
+	get_child2(IXMLDOMNode);
+	parent->insertBefore(child, _variant_t(child2, true));
+}
+
+NSIS_FUNC(removeChild)
+{
+	get_parent(); 
+	get_child(IXMLDOMNode);
+	parent->removeChild(child);
+}
+
+NSIS_FUNC(release)
+{
+	LPUNKNOWN node = LPUNKNOWN(pop_int(stacktop));
+	node->Release();
+}
+
+extern "C" BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID)
+{
+	g_hInstance = hInstance;
+	// we can call CoInitialize here because DLL is not loaded at application
+	// startup, but dynamically by Installer
+	CoInitialize(NULL); 
+	return TRUE;
+}
diff --git a/Other/Source/Plugins/nsisXML/nsisXML.dsp b/etc/source/Plugins/nsisXML/nsisXML.dsp
similarity index 96%
rename from Other/Source/Plugins/nsisXML/nsisXML.dsp
rename to etc/source/Plugins/nsisXML/nsisXML.dsp
index f005035..ed12cb0 100644
--- a/Other/Source/Plugins/nsisXML/nsisXML.dsp
+++ b/etc/source/Plugins/nsisXML/nsisXML.dsp
@@ -1,195 +1,195 @@
-# Microsoft Developer Studio Project File - Name="nsisXML" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=nsisXML - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "nsisXML.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "nsisXML.mak" CFG="nsisXML - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "nsisXML - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "nsisXML - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "nsisXML - Win32 Release UNICODE" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "nsisXML - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /Zi /O1 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /Zi /O1 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib shlwapi.lib /nologo /dll /machine:I386 /OPT:REF /OPT:NOWIN98
-# ADD LINK32 kernel32.lib user32.lib shlwapi.lib /nologo /dll /machine:I386 /out:"../bin/nsisXML.dll" /OPT:REF /OPT:NOWIN98
-# Begin Special Build Tool
-IntDir=.\Release
-ProjDir=.
-TargetDir=..\bin
-SOURCE="$(InputPath)"
-PostBuild_Desc=Building Sample Installer...
-PostBuild_Cmds="%ProgramFiles%\NSIS\Unicode\makensis" /V2 "/DTARGETDIR=$(TargetDir)" "/DINTDIR=$(IntDir)" "$(ProjDir)\Sample.nsi"
-# End Special Build Tool
-
-!ELSEIF  "$(CFG)" == "nsisXML - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /FR /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib shlwapi.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# Begin Special Build Tool
-IntDir=.\Debug
-ProjDir=.
-TargetDir=.\Debug
-SOURCE="$(InputPath)"
-PostBuild_Desc=Building Sample Installer...
-PostBuild_Cmds="%ProgramFiles%\NSIS\makensis" /V4 "/DTARGETDIR=$(TargetDir)" "/DINTDIR=$(IntDir)" "$(ProjDir)\Sample.nsi"
-# End Special Build Tool
-
-!ELSEIF  "$(CFG)" == "nsisXML - Win32 Release UNICODE"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release_UNICODE"
-# PROP BASE Intermediate_Dir "Release_UNICODE"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release_UNICODE"
-# PROP Intermediate_Dir "Release_UNICODE"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /Zi /O1 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_UNICODE" /D "UNICODE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /Zi /O1 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_UNICODE" /D "UNICODE" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib shlwapi.lib /nologo /dll /machine:I386 /OPT:REF /OPT:NOWIN98
-# ADD LINK32 kernel32.lib user32.lib shlwapi.lib /nologo /dll /machine:I386 /out:"../binU/nsisXML.dll" /OPT:REF /OPT:NOWIN98
-# Begin Special Build Tool
-IntDir=.\Release_UNICODE
-ProjDir=.
-TargetDir=..\binU
-SOURCE="$(InputPath)"
-PostBuild_Desc=Building Sample Installer...
-PostBuild_Cmds="%ProgramFiles%\NSIS\Unicode\makensis" /V2 "/DTARGETDIR=$(TargetDir)" "/DINTDIR=$(IntDir)" "$(ProjDir)\Sample.nsi"
-# End Special Build Tool
-
-!ENDIF 
-
-# Begin Target
-
-# Name "nsisXML - Win32 Release"
-# Name "nsisXML - Win32 Debug"
-# Name "nsisXML - Win32 Release UNICODE"
-# Begin Source File
-
-SOURCE=.\License.txt
-# End Source File
-# Begin Source File
-
-SOURCE=.\nsisXML.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\ReadMe.txt
-# End Source File
-# Begin Source File
-
-SOURCE=.\Sample.nsi
-
-!IF  "$(CFG)" == "nsisXML - Win32 Release"
-
-# Begin Custom Build
-ProjDir=.
-InputPath=.\Sample.nsi
-
-"$(ProjDir)\Sample.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	rem Force Post-Build Step
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "nsisXML - Win32 Debug"
-
-# Begin Custom Build
-ProjDir=.
-InputPath=.\Sample.nsi
-
-"$(ProjDir)\Sample.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	rem Force Post-Build Step
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "nsisXML - Win32 Release UNICODE"
-
-# Begin Custom Build
-ProjDir=.
-InputPath=.\Sample.nsi
-
-"$(ProjDir)\Sample.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	rem Force Post-Build Step
-
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="nsisXML" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=nsisXML - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "nsisXML.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "nsisXML.mak" CFG="nsisXML - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "nsisXML - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "nsisXML - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "nsisXML - Win32 Release UNICODE" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "nsisXML - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /GX /Zi /O1 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /Zi /O1 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib shlwapi.lib /nologo /dll /machine:I386 /OPT:REF /OPT:NOWIN98
+# ADD LINK32 kernel32.lib user32.lib shlwapi.lib /nologo /dll /machine:I386 /out:"../bin/nsisXML.dll" /OPT:REF /OPT:NOWIN98
+# Begin Special Build Tool
+IntDir=.\Release
+ProjDir=.
+TargetDir=..\bin
+SOURCE="$(InputPath)"
+PostBuild_Desc=Building Sample Installer...
+PostBuild_Cmds="%ProgramFiles%\NSIS\Unicode\makensis" /V2 "/DTARGETDIR=$(TargetDir)" "/DINTDIR=$(IntDir)" "$(ProjDir)\Sample.nsi"
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "nsisXML - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /FR /YX /FD /GZ /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib shlwapi.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# Begin Special Build Tool
+IntDir=.\Debug
+ProjDir=.
+TargetDir=.\Debug
+SOURCE="$(InputPath)"
+PostBuild_Desc=Building Sample Installer...
+PostBuild_Cmds="%ProgramFiles%\NSIS\makensis" /V4 "/DTARGETDIR=$(TargetDir)" "/DINTDIR=$(IntDir)" "$(ProjDir)\Sample.nsi"
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "nsisXML - Win32 Release UNICODE"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release_UNICODE"
+# PROP BASE Intermediate_Dir "Release_UNICODE"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release_UNICODE"
+# PROP Intermediate_Dir "Release_UNICODE"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /GX /Zi /O1 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_UNICODE" /D "UNICODE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /Zi /O1 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_UNICODE" /D "UNICODE" /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib shlwapi.lib /nologo /dll /machine:I386 /OPT:REF /OPT:NOWIN98
+# ADD LINK32 kernel32.lib user32.lib shlwapi.lib /nologo /dll /machine:I386 /out:"../binU/nsisXML.dll" /OPT:REF /OPT:NOWIN98
+# Begin Special Build Tool
+IntDir=.\Release_UNICODE
+ProjDir=.
+TargetDir=..\binU
+SOURCE="$(InputPath)"
+PostBuild_Desc=Building Sample Installer...
+PostBuild_Cmds="%ProgramFiles%\NSIS\Unicode\makensis" /V2 "/DTARGETDIR=$(TargetDir)" "/DINTDIR=$(IntDir)" "$(ProjDir)\Sample.nsi"
+# End Special Build Tool
+
+!ENDIF 
+
+# Begin Target
+
+# Name "nsisXML - Win32 Release"
+# Name "nsisXML - Win32 Debug"
+# Name "nsisXML - Win32 Release UNICODE"
+# Begin Source File
+
+SOURCE=.\License.txt
+# End Source File
+# Begin Source File
+
+SOURCE=.\nsisXML.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ReadMe.txt
+# End Source File
+# Begin Source File
+
+SOURCE=.\Sample.nsi
+
+!IF  "$(CFG)" == "nsisXML - Win32 Release"
+
+# Begin Custom Build
+ProjDir=.
+InputPath=.\Sample.nsi
+
+"$(ProjDir)\Sample.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	rem Force Post-Build Step
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "nsisXML - Win32 Debug"
+
+# Begin Custom Build
+ProjDir=.
+InputPath=.\Sample.nsi
+
+"$(ProjDir)\Sample.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	rem Force Post-Build Step
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "nsisXML - Win32 Release UNICODE"
+
+# Begin Custom Build
+ProjDir=.
+InputPath=.\Sample.nsi
+
+"$(ProjDir)\Sample.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	rem Force Post-Build Step
+
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# End Target
+# End Project
diff --git a/Other/Source/Plugins/nsisXML/nsisXML.dsw b/etc/source/Plugins/nsisXML/nsisXML.dsw
similarity index 94%
rename from Other/Source/Plugins/nsisXML/nsisXML.dsw
rename to etc/source/Plugins/nsisXML/nsisXML.dsw
index 38f962f..9ff349f 100644
--- a/Other/Source/Plugins/nsisXML/nsisXML.dsw
+++ b/etc/source/Plugins/nsisXML/nsisXML.dsw
@@ -1,29 +1,29 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "nsisXML"=.\nsisXML.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "nsisXML"=.\nsisXML.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/etc/source/Plugins/x86-ansi/ExecDos.dll b/etc/source/Plugins/x86-ansi/ExecDos.dll
new file mode 100644
index 0000000..d864159
Binary files /dev/null and b/etc/source/Plugins/x86-ansi/ExecDos.dll differ
diff --git a/etc/source/Plugins/x86-ansi/StdUtils.dll b/etc/source/Plugins/x86-ansi/StdUtils.dll
new file mode 100644
index 0000000..c895ad3
Binary files /dev/null and b/etc/source/Plugins/x86-ansi/StdUtils.dll differ
diff --git a/etc/source/Plugins/x86-ansi/System.dll b/etc/source/Plugins/x86-ansi/System.dll
new file mode 100644
index 0000000..bcb8ba3
Binary files /dev/null and b/etc/source/Plugins/x86-ansi/System.dll differ
diff --git a/etc/source/Plugins/x86-ansi/TypeLib.dll b/etc/source/Plugins/x86-ansi/TypeLib.dll
new file mode 100644
index 0000000..95a1893
Binary files /dev/null and b/etc/source/Plugins/x86-ansi/TypeLib.dll differ
diff --git a/etc/source/Plugins/x86-ansi/nsJSON.dll b/etc/source/Plugins/x86-ansi/nsJSON.dll
new file mode 100644
index 0000000..40499dc
Binary files /dev/null and b/etc/source/Plugins/x86-ansi/nsJSON.dll differ
diff --git a/etc/source/Plugins/x86-ansi/nsisXML.dll b/etc/source/Plugins/x86-ansi/nsisXML.dll
new file mode 100644
index 0000000..496ba4a
Binary files /dev/null and b/etc/source/Plugins/x86-ansi/nsisXML.dll differ
diff --git a/etc/source/Plugins/x86-ansi/registry.dll b/etc/source/Plugins/x86-ansi/registry.dll
new file mode 100644
index 0000000..8922f1d
Binary files /dev/null and b/etc/source/Plugins/x86-ansi/registry.dll differ
diff --git a/Other/Source/Plugins/AccessControl.dll b/etc/source/Plugins/x86-unicode/AccessControl.dll
similarity index 100%
rename from Other/Source/Plugins/AccessControl.dll
rename to etc/source/Plugins/x86-unicode/AccessControl.dll
diff --git a/etc/source/Plugins/x86-unicode/ExecCmd.dll b/etc/source/Plugins/x86-unicode/ExecCmd.dll
new file mode 100644
index 0000000..3cd9ab6
Binary files /dev/null and b/etc/source/Plugins/x86-unicode/ExecCmd.dll differ
diff --git a/etc/source/Plugins/x86-unicode/ExecDos64.dll b/etc/source/Plugins/x86-unicode/ExecDos64.dll
new file mode 100644
index 0000000..78b47a9
Binary files /dev/null and b/etc/source/Plugins/x86-unicode/ExecDos64.dll differ
diff --git a/Other/Source/Plugins/LockedList.dll b/etc/source/Plugins/x86-unicode/LockedList.dll
similarity index 100%
rename from Other/Source/Plugins/LockedList.dll
rename to etc/source/Plugins/x86-unicode/LockedList.dll
diff --git a/Other/Source/Plugins/LockedList64.dll b/etc/source/Plugins/x86-unicode/LockedList64.dll
similarity index 100%
rename from Other/Source/Plugins/LockedList64.dll
rename to etc/source/Plugins/x86-unicode/LockedList64.dll
diff --git a/etc/source/Plugins/x86-unicode/StdUtils.dll b/etc/source/Plugins/x86-unicode/StdUtils.dll
new file mode 100644
index 0000000..9c85c40
Binary files /dev/null and b/etc/source/Plugins/x86-unicode/StdUtils.dll differ
diff --git a/etc/source/Plugins/x86-unicode/Timeout.dll b/etc/source/Plugins/x86-unicode/Timeout.dll
new file mode 100644
index 0000000..2b8548a
Binary files /dev/null and b/etc/source/Plugins/x86-unicode/Timeout.dll differ
diff --git a/etc/source/Plugins/x86-unicode/TypeLib.dll b/etc/source/Plugins/x86-unicode/TypeLib.dll
new file mode 100644
index 0000000..cd2ac30
Binary files /dev/null and b/etc/source/Plugins/x86-unicode/TypeLib.dll differ
diff --git a/etc/source/Plugins/x86-unicode/UAC.dll b/etc/source/Plugins/x86-unicode/UAC.dll
new file mode 100644
index 0000000..9cdc87f
Binary files /dev/null and b/etc/source/Plugins/x86-unicode/UAC.dll differ
diff --git a/Other/Source/UAC.nsh b/etc/source/Plugins/x86-unicode/UAC.nsh
similarity index 96%
rename from Other/Source/UAC.nsh
rename to etc/source/Plugins/x86-unicode/UAC.nsh
index 073a834..6ab2755 100644
--- a/Other/Source/UAC.nsh
+++ b/etc/source/Plugins/x86-unicode/UAC.nsh
@@ -1,194 +1,194 @@
-!ifndef UAC_HDR__INC
-!verbose push
-!verbose 3
-!ifndef UAC_VERBOSE  
-	!define UAC_VERBOSE 3
-!endif
-!verbose ${UAC_VERBOSE}
-
-!define UAC_HDR__INC 0x00020100 ;MMmmbbrr
-
-!include LogicLib.nsh
-
-!macro _UAC_definemath def val1 op val2
-!ifdef ${def}
-	!undef ${def}
-!endif
-!define /math ${def} "${val1}" ${op} ${val2}
-!macroend
-
-!macro _UAC_ParseDefineFlags_orin parse outflags
-!searchparse /noerrors ${${parse}} "" _UAC_ParseDefineFlags_orin_f1 "|" _UAC_ParseDefineFlags_orin_f2
-!define _UAC_ParseDefineFlags_orin_this ${_UAC_ParseDefineFlags_orin_f1}
-!undef ${parse}
-!define ${parse} ${_UAC_ParseDefineFlags_orin_f2}
-!define _UAC_ParseDefineFlags_orin_saveout ${${outflags}}
-!undef ${outflags}
-!define /math ${outflags} "${_UAC_ParseDefineFlags_orin_saveout}" | "${_UAC_ParseDefineFlags_orin_this}"
-!undef _UAC_ParseDefineFlags_orin_saveout
-!undef _UAC_ParseDefineFlags_orin_this
-!ifdef _UAC_ParseDefineFlags_orin_f1
-	!undef _UAC_ParseDefineFlags_orin_f1
-	!undef _UAC_ParseDefineFlags_orin_f2
-!endif
-!macroend
-!macro _UAC_ParseDefineFlags_Begin _outdef _in
-!define _UAC_PDF${_outdef}_parse "${_in}"
-!define _UAC_PDF${_outdef}_flags ""
-!define _UAC_PDF${_outdef}_r 0
-!insertmacro _UAC_ParseDefineFlags_orin _UAC_PDF${_outdef}_parse _UAC_PDF${_outdef}_flags	;0x1
-!insertmacro _UAC_ParseDefineFlags_orin _UAC_PDF${_outdef}_parse _UAC_PDF${_outdef}_flags	;0x2
-!insertmacro _UAC_ParseDefineFlags_orin _UAC_PDF${_outdef}_parse _UAC_PDF${_outdef}_flags	;0x4
-!insertmacro _UAC_ParseDefineFlags_orin _UAC_PDF${_outdef}_parse _UAC_PDF${_outdef}_flags	;0x8
-!insertmacro _UAC_ParseDefineFlags_orin _UAC_PDF${_outdef}_parse _UAC_PDF${_outdef}_flags	;0x10
-!macroend
-!macro _UAC_ParseDefineFlags_End _outdef
-!define ${_outdef} ${_UAC_PDF${_outdef}_r}
-!undef _UAC_PDF${_outdef}_r
-!undef _UAC_PDF${_outdef}_flags
-!undef _UAC_PDF${_outdef}_parse
-!macroend
-!macro _UAC_ParseDefineFlags_IncludeFlag _outdef flag
-!if ${_UAC_PDF${_outdef}_flags} & ${flag}
-	!insertmacro _UAC_definemath _UAC_PDF${_outdef}_r ${_UAC_PDF${_outdef}_r} | ${flag}
-!endif
-!macroend
-!macro _UAC_ParseDefineFlagsToInt _outdef _in
-!insertmacro _UAC_ParseDefineFlags_Begin _UAC_ParseDefineFlagsToInt_tmp "${_in}"
-!define ${_outdef} ${_UAC_PDF_UAC_ParseDefineFlagsToInt_tmp_flags}
-!insertmacro _UAC_ParseDefineFlags_End _UAC_ParseDefineFlagsToInt_tmp
-!undef _UAC_ParseDefineFlagsToInt_tmp
-!macroend
-
-!macro _UAC_IncL
-!insertmacro _UAC_definemath __UAC_L "${__UAC_L_}" + 1
-!macroend
-
-
-!macro _UAC_MakeLL_Cmp cmpop cmp pluginparams
-!insertmacro _LOGICLIB_TEMP
-UAC::_ ${pluginparams}
-pop $_LOGICLIB_TEMP
-!insertmacro ${cmpop} $_LOGICLIB_TEMP ${cmp} `${_t}` `${_f}`
-!macroend
-
-
-
-!macro UAC_RunElevated
-UAC::_ 0
-!macroend
-
-
-!macro UAC_IsAdmin
-UAC::_ 2
-!macroend
-!define UAC_IsAdmin `"" UAC_IsAdmin ""`
-!macro _UAC_IsAdmin _a _b _t _f
-!insertmacro _UAC_MakeLL_Cmp _!= 0 2s
-!macroend
-
-
-
-!macro UAC_IsInnerInstance
-UAC::_ 3
-!macroend
-!define UAC_IsInnerInstance `"" UAC_IsInnerInstance ""`
-!macro _UAC_IsInnerInstance _a _b _t _f
-!insertmacro _UAC_MakeLL_Cmp _!= 0 3s
-!macroend
-
-!macro UAC_Notify_OnGuiInit
-UAC::_ 4
-!macroend
-!macro UAC_PageElevation_OnGuiInit
-!insertmacro UAC_Notify_OnGuiInit
-!macroend
-!macro UAC_PageElevation_OnInit
-UAC::_ 5
-${IfThen} ${Errors} ${|} Quit ${|}
-!macroend
-
-
-!define UAC_SYNCREGISTERS 0x1
-#!define UAC_SYNCSTACK     0x2
-!define UAC_SYNCOUTDIR    0x4
-!define UAC_SYNCINSTDIR   0x8
-#!define UAC_CLEARERRFLAG  0x10
-!macro UAC_AsUser_Call type name flags
-push $0
-Get${type}Address $0 ${name}
-!verbose push
-!verbose ${UAC_VERBOSE}
-!insertmacro _UAC_ParseDefineFlagsToInt _UAC_AsUser_Call__flags ${flags}
-!verbose pop
-StrCpy $0 "1$0:${_UAC_AsUser_Call__flags}"
-!undef _UAC_AsUser_Call__flags
-Exch $0
-UAC::_
-!macroend
-
-!macro _UAC_AsUser_GenOpGetReg outvar op opparam1 opparam2
-!define _UAC_AUGOGR_ID _UAC_AUGOGR_OP${outvar}${op}${opparam1}${opparam2}
-!ifndef ${_UAC_AUGOGR_ID} ;Has this exact action been done before? 
-	!if ${outvar} == $0
-		!define ${_UAC_AUGOGR_ID} $1
-	!else
-		!define ${_UAC_AUGOGR_ID} $0
-	!endif
-	!if "${opparam1}" == ""
-		!define _UAC_AUGOGR_OPP1 ${${_UAC_AUGOGR_ID}}
-		!define _UAC_AUGOGR_OPP2 ${opparam2}
-	!else
-		!define _UAC_AUGOGR_OPP1 ${opparam1}
-		!define _UAC_AUGOGR_OPP2 ${${_UAC_AUGOGR_ID}}
-	!endif	
-	goto ${_UAC_AUGOGR_ID}_C
-	${_UAC_AUGOGR_ID}_F:
-		${op} ${_UAC_AUGOGR_OPP1} ${_UAC_AUGOGR_OPP2}
-		return
-	${_UAC_AUGOGR_ID}_C:
-	!undef _UAC_AUGOGR_OPP1
-	!undef _UAC_AUGOGR_OPP2
-!endif
-push ${${_UAC_AUGOGR_ID}}
-!insertmacro UAC_AsUser_Call Label ${_UAC_AUGOGR_ID}_F ${UAC_SYNCREGISTERS}
-StrCpy ${outvar} ${${_UAC_AUGOGR_ID}}
-pop ${${_UAC_AUGOGR_ID}}
-!undef _UAC_AUGOGR_ID
-!macroend
-
-!macro UAC_AsUser_GetSection datatype secidx outvar
-!insertmacro _UAC_AsUser_GenOpGetReg ${outvar} SectionGet${datatype} ${secidx} ""
-!macroend
-
-!macro UAC_AsUser_GetGlobalVar var
-!insertmacro _UAC_AsUser_GenOpGetReg ${var} StrCpy "" ${var}
-!macroend
-
-
-!macro UAC_AsUser_ExecShell verb command params workdir show
-!insertmacro _UAC_IncL
-goto _UAC_L_E_${__UAC_L}
-_UAC_L_F_${__UAC_L}:
-/*!if "${workdir}" != ""
-	SetOutPath "${workdir}"
-!endif*/
-#MessageBox mb_ok Outer1
-#system::call 'kernel32::OutputDebugStringA(m "hello from UAC_AsUser_ExecShell >$temp|$instdir|$\n")'
-ExecShell "${verb}" "${command}" ${params} ${show}
-#MessageBox mb_ok Outer2
-return
-_UAC_L_E_${__UAC_L}:
-!if "${workdir}" != ""
-	push $outdir
-	SetOutPath "${workdir}"
-!endif
-!insertmacro UAC_AsUser_Call Label _UAC_L_F_${__UAC_L} ${UAC_SYNCREGISTERS}|${UAC_SYNCOUTDIR} #|${UAC_CLEARERRFLAG}
-!if "${workdir}" != ""
-	pop $outdir 
-	SetOutPath $outdir
-!endif
-!macroend
-
-!verbose pop
+!ifndef UAC_HDR__INC
+!verbose push
+!verbose 3
+!ifndef UAC_VERBOSE  
+	!define UAC_VERBOSE 3
+!endif
+!verbose ${UAC_VERBOSE}
+
+!define UAC_HDR__INC 0x00020100 ;MMmmbbrr
+
+!include LogicLib.nsh
+
+!macro _UAC_definemath def val1 op val2
+!ifdef ${def}
+	!undef ${def}
+!endif
+!define /math ${def} "${val1}" ${op} ${val2}
+!macroend
+
+!macro _UAC_ParseDefineFlags_orin parse outflags
+!searchparse /noerrors ${${parse}} "" _UAC_ParseDefineFlags_orin_f1 "|" _UAC_ParseDefineFlags_orin_f2
+!define _UAC_ParseDefineFlags_orin_this ${_UAC_ParseDefineFlags_orin_f1}
+!undef ${parse}
+!define ${parse} ${_UAC_ParseDefineFlags_orin_f2}
+!define _UAC_ParseDefineFlags_orin_saveout ${${outflags}}
+!undef ${outflags}
+!define /math ${outflags} "${_UAC_ParseDefineFlags_orin_saveout}" | "${_UAC_ParseDefineFlags_orin_this}"
+!undef _UAC_ParseDefineFlags_orin_saveout
+!undef _UAC_ParseDefineFlags_orin_this
+!ifdef _UAC_ParseDefineFlags_orin_f1
+	!undef _UAC_ParseDefineFlags_orin_f1
+	!undef _UAC_ParseDefineFlags_orin_f2
+!endif
+!macroend
+!macro _UAC_ParseDefineFlags_Begin _outdef _in
+!define _UAC_PDF${_outdef}_parse "${_in}"
+!define _UAC_PDF${_outdef}_flags ""
+!define _UAC_PDF${_outdef}_r 0
+!insertmacro _UAC_ParseDefineFlags_orin _UAC_PDF${_outdef}_parse _UAC_PDF${_outdef}_flags	;0x1
+!insertmacro _UAC_ParseDefineFlags_orin _UAC_PDF${_outdef}_parse _UAC_PDF${_outdef}_flags	;0x2
+!insertmacro _UAC_ParseDefineFlags_orin _UAC_PDF${_outdef}_parse _UAC_PDF${_outdef}_flags	;0x4
+!insertmacro _UAC_ParseDefineFlags_orin _UAC_PDF${_outdef}_parse _UAC_PDF${_outdef}_flags	;0x8
+!insertmacro _UAC_ParseDefineFlags_orin _UAC_PDF${_outdef}_parse _UAC_PDF${_outdef}_flags	;0x10
+!macroend
+!macro _UAC_ParseDefineFlags_End _outdef
+!define ${_outdef} ${_UAC_PDF${_outdef}_r}
+!undef _UAC_PDF${_outdef}_r
+!undef _UAC_PDF${_outdef}_flags
+!undef _UAC_PDF${_outdef}_parse
+!macroend
+!macro _UAC_ParseDefineFlags_IncludeFlag _outdef flag
+!if ${_UAC_PDF${_outdef}_flags} & ${flag}
+	!insertmacro _UAC_definemath _UAC_PDF${_outdef}_r ${_UAC_PDF${_outdef}_r} | ${flag}
+!endif
+!macroend
+!macro _UAC_ParseDefineFlagsToInt _outdef _in
+!insertmacro _UAC_ParseDefineFlags_Begin _UAC_ParseDefineFlagsToInt_tmp "${_in}"
+!define ${_outdef} ${_UAC_PDF_UAC_ParseDefineFlagsToInt_tmp_flags}
+!insertmacro _UAC_ParseDefineFlags_End _UAC_ParseDefineFlagsToInt_tmp
+!undef _UAC_ParseDefineFlagsToInt_tmp
+!macroend
+
+!macro _UAC_IncL
+!insertmacro _UAC_definemath __UAC_L "${__UAC_L_}" + 1
+!macroend
+
+
+!macro _UAC_MakeLL_Cmp cmpop cmp pluginparams
+!insertmacro _LOGICLIB_TEMP
+UAC::_ ${pluginparams}
+pop $_LOGICLIB_TEMP
+!insertmacro ${cmpop} $_LOGICLIB_TEMP ${cmp} `${_t}` `${_f}`
+!macroend
+
+
+
+!macro UAC_RunElevated
+UAC::_ 0
+!macroend
+
+
+!macro UAC_IsAdmin
+UAC::_ 2
+!macroend
+!define UAC_IsAdmin `"" UAC_IsAdmin ""`
+!macro _UAC_IsAdmin _a _b _t _f
+!insertmacro _UAC_MakeLL_Cmp _!= 0 2s
+!macroend
+
+
+
+!macro UAC_IsInnerInstance
+UAC::_ 3
+!macroend
+!define UAC_IsInnerInstance `"" UAC_IsInnerInstance ""`
+!macro _UAC_IsInnerInstance _a _b _t _f
+!insertmacro _UAC_MakeLL_Cmp _!= 0 3s
+!macroend
+
+!macro UAC_Notify_OnGuiInit
+UAC::_ 4
+!macroend
+!macro UAC_PageElevation_OnGuiInit
+!insertmacro UAC_Notify_OnGuiInit
+!macroend
+!macro UAC_PageElevation_OnInit
+UAC::_ 5
+${IfThen} ${Errors} ${|} Quit ${|}
+!macroend
+
+
+!define UAC_SYNCREGISTERS 0x1
+#!define UAC_SYNCSTACK     0x2
+!define UAC_SYNCOUTDIR    0x4
+!define UAC_SYNCINSTDIR   0x8
+#!define UAC_CLEARERRFLAG  0x10
+!macro UAC_AsUser_Call type name flags
+push $0
+Get${type}Address $0 ${name}
+!verbose push
+!verbose ${UAC_VERBOSE}
+!insertmacro _UAC_ParseDefineFlagsToInt _UAC_AsUser_Call__flags ${flags}
+!verbose pop
+StrCpy $0 "1$0:${_UAC_AsUser_Call__flags}"
+!undef _UAC_AsUser_Call__flags
+Exch $0
+UAC::_
+!macroend
+
+!macro _UAC_AsUser_GenOpGetReg outvar op opparam1 opparam2
+!define _UAC_AUGOGR_ID _UAC_AUGOGR_OP${outvar}${op}${opparam1}${opparam2}
+!ifndef ${_UAC_AUGOGR_ID} ;Has this exact action been done before? 
+	!if ${outvar} == $0
+		!define ${_UAC_AUGOGR_ID} $1
+	!else
+		!define ${_UAC_AUGOGR_ID} $0
+	!endif
+	!if "${opparam1}" == ""
+		!define _UAC_AUGOGR_OPP1 ${${_UAC_AUGOGR_ID}}
+		!define _UAC_AUGOGR_OPP2 ${opparam2}
+	!else
+		!define _UAC_AUGOGR_OPP1 ${opparam1}
+		!define _UAC_AUGOGR_OPP2 ${${_UAC_AUGOGR_ID}}
+	!endif	
+	goto ${_UAC_AUGOGR_ID}_C
+	${_UAC_AUGOGR_ID}_F:
+		${op} ${_UAC_AUGOGR_OPP1} ${_UAC_AUGOGR_OPP2}
+		return
+	${_UAC_AUGOGR_ID}_C:
+	!undef _UAC_AUGOGR_OPP1
+	!undef _UAC_AUGOGR_OPP2
+!endif
+push ${${_UAC_AUGOGR_ID}}
+!insertmacro UAC_AsUser_Call Label ${_UAC_AUGOGR_ID}_F ${UAC_SYNCREGISTERS}
+StrCpy ${outvar} ${${_UAC_AUGOGR_ID}}
+pop ${${_UAC_AUGOGR_ID}}
+!undef _UAC_AUGOGR_ID
+!macroend
+
+!macro UAC_AsUser_GetSection datatype secidx outvar
+!insertmacro _UAC_AsUser_GenOpGetReg ${outvar} SectionGet${datatype} ${secidx} ""
+!macroend
+
+!macro UAC_AsUser_GetGlobalVar var
+!insertmacro _UAC_AsUser_GenOpGetReg ${var} StrCpy "" ${var}
+!macroend
+
+
+!macro UAC_AsUser_ExecShell verb command params workdir show
+!insertmacro _UAC_IncL
+goto _UAC_L_E_${__UAC_L}
+_UAC_L_F_${__UAC_L}:
+/*!if "${workdir}" != ""
+	SetOutPath "${workdir}"
+!endif*/
+#MessageBox mb_ok Outer1
+#system::call 'kernel32::OutputDebugStringA(m "hello from UAC_AsUser_ExecShell >$temp|$instdir|$\n")'
+ExecShell "${verb}" "${command}" ${params} ${show}
+#MessageBox mb_ok Outer2
+return
+_UAC_L_E_${__UAC_L}:
+!if "${workdir}" != ""
+	push $outdir
+	SetOutPath "${workdir}"
+!endif
+!insertmacro UAC_AsUser_Call Label _UAC_L_F_${__UAC_L} ${UAC_SYNCREGISTERS}|${UAC_SYNCOUTDIR} #|${UAC_CLEARERRFLAG}
+!if "${workdir}" != ""
+	pop $outdir 
+	SetOutPath $outdir
+!endif
+!macroend
+
+!verbose pop
 !endif /* UAC_HDR__INC */
\ No newline at end of file
diff --git a/Other/Source/Plugins/XML.nsh b/etc/source/Plugins/x86-unicode/XML.nsh
similarity index 95%
rename from Other/Source/Plugins/XML.nsh
rename to etc/source/Plugins/x86-unicode/XML.nsh
index 4385b45..78533ed 100644
--- a/Other/Source/Plugins/XML.nsh
+++ b/etc/source/Plugins/x86-unicode/XML.nsh
@@ -1,486 +1,486 @@
-; TODO: ANSI codepage support
-!include CallANSIPlugin.nsh
-
-!define xml::SetCondenseWhiteSpace `!insertmacro xml::SetCondenseWhiteSpace`
-
-!macro xml::SetCondenseWhiteSpace _BOOL
-	${PushAsANSI} `${_BOOL}`
-	xml::_SetCondenseWhiteSpace /NOUNLOAD
-!macroend
-
-
-!define xml::SetEncoding `!insertmacro xml::SetEncoding`
-
-!macro xml::SetEncoding _ENCODING
-	${PushAsANSI} `${_ENCODING}`
-	xml::_SetEncoding /NOUNLOAD
-!macroend
-
-
-!define xml::LoadFile `!insertmacro xml::LoadFile`
-
-!macro xml::LoadFile _FILE _ERR
-	${PushAsANSI} `${_FILE}`
-	xml::_LoadFile /NOUNLOAD
-	${PopAsANSI} ${_ERR}
-!macroend
-
-
-!define xml::SaveFile `!insertmacro xml::SaveFile`
-
-!macro xml::SaveFile _FILE _ERR
-	${PushAsANSI} `${_FILE}`
-	xml::_SaveFile /NOUNLOAD ;`${_FILE}`
-	${PopAsANSI} ${_ERR}
-!macroend
-
-
-!define xml::DeclarationVersion `!insertmacro xml::DeclarationVersion`
-
-!macro xml::DeclarationVersion _ERR1 _ERR2
-	xml::_DeclarationVersion /NOUNLOAD
-	${PopAsANSI} ${_ERR1}
-	${PopAsANSI} ${_ERR2}
-!macroend
-
-
-!define xml::DeclarationEncoding `!insertmacro xml::DeclarationEncoding`
-
-!macro xml::DeclarationEncoding _ERR1 _ERR2
-	xml::_DeclarationEncoding /NOUNLOAD
-	${PopAsANSI} ${_ERR1}
-	${PopAsANSI} ${_ERR2}
-!macroend
-
-
-!define xml::DeclarationStandalone `!insertmacro xml::DeclarationStandalone`
-
-!macro xml::DeclarationStandalone _ERR1 _ERR2
-	xml::_DeclarationStandalone /NOUNLOAD
-	${PopAsANSI} ${_ERR1}
-	${PopAsANSI} ${_ERR2}
-!macroend
-
-
-!define xml::GetText `!insertmacro xml::GetText`
-
-!macro xml::GetText _ERR1 _ERR2
-	xml::_GetText /NOUNLOAD
-	${PopAsUTF8} ${_ERR1}
-	${PopAsANSI} ${_ERR2}
-!macroend
-
-
-!define xml::SetText `!insertmacro xml::SetText`
-
-!macro xml::SetText _VALUE _ERR
-	${PushAsUTF8} ${_VALUE}
-	xml::_SetText /NOUNLOAD
-	${PopAsANSI} ${_ERR}
-!macroend
-
-
-!define xml::SetCDATA `!insertmacro xml::SetCDATA`
-
-!macro xml::SetCDATA _BOOL _ERR
-	${PushAsANSI} ${_BOOL}
-	xml::_SetCDATA /NOUNLOAD
-	${PopAsANSI} ${_ERR}
-!macroend
-
-
-!define xml::IsCDATA `!insertmacro xml::IsCDATA`
-
-!macro xml::IsCDATA _ERR
-	xml::_IsCDATA /NOUNLOAD
-	${PopAsANSI} ${_ERR}
-!macroend
-
-
-!define xml::GetNodeValue `!insertmacro xml::GetNodeValue`
-
-!macro xml::GetNodeValue _ERR
-	xml::_GetNodeValue /NOUNLOAD
-	${PopAsANSI} ${_ERR}
-!macroend
-
-
-!define xml::SetNodeValue `!insertmacro xml::SetNodeValue`
-
-!macro xml::SetNodeValue _VALUE
-	${PushAsANSI} ${_VALUE}
-	xml::_SetNodeValue /NOUNLOAD
-!macroend
-
-
-!define xml::FindNextElement `!insertmacro xml::FindNextElement`
-
-!macro xml::FindNextElement _NAME _ERR1 _ERR2
-	${PushAsUTF8} `${_NAME}`
-	xml::_FindNextElement /NOUNLOAD
-	${PopAsUTF8} ${_ERR1}
-	${PopAsANSI} ${_ERR2}
-!macroend
-
-
-!define xml::FindCloseElement `!insertmacro xml::FindCloseElement`
-
-!macro xml::FindCloseElement
-	xml::_FindCloseElement /NOUNLOAD
-!macroend
-
-
-!define xml::RootElement `!insertmacro xml::RootElement`
-
-!macro xml::RootElement _ERR1 _ERR2
-	xml::_RootElement /NOUNLOAD
-	${PopAsUTF8} ${_ERR1}
-	${PopAsANSI} ${_ERR2}
-!macroend
-
-
-!define xml::FirstChildElement `!insertmacro xml::FirstChildElement`
-
-!macro xml::FirstChildElement _NAME _ERR1 _ERR2
-	${PushAsUTF8} `${_NAME}`
-	xml::_FirstChildElement /NOUNLOAD ;`${_NAME}`
-	${PopAsUTF8} ${_ERR1}
-	${PopAsANSI} ${_ERR2}
-!macroend
-
-
-!define xml::FirstChild `!insertmacro xml::FirstChild`
-
-!macro xml::FirstChild _NAME _ERR1 _ERR2
-	${PushAsUTF8} `${_NAME}`
-	xml::_FirstChild /NOUNLOAD
-	${PopAsUTF8} ${_ERR1}
-	${PopAsANSI} ${_ERR2}
-!macroend
-
-
-!define xml::LastChild `!insertmacro xml::LastChild`
-
-!macro xml::LastChild _NAME _ERR1 _ERR2
-	${PushAsUTF8} `${_NAME}`
-	xml::_LastChild /NOUNLOAD 
-	${PopAsUTF8} ${_ERR1}
-	${PopAsANSI} ${_ERR2}
-!macroend
-
-
-!define xml::Parent `!insertmacro xml::Parent`
-
-!macro xml::Parent _ERR1 _ERR2
-	xml::_Parent /NOUNLOAD
-	${PopAsUTF8} ${_ERR1}
-	${PopAsANSI} ${_ERR2}
-!macroend
-
-
-!define xml::NoChildren `!insertmacro xml::NoChildren`
-
-!macro xml::NoChildren _ERR
-	xml::_NoChildren /NOUNLOAD
-	${PopAsANSI} ${_ERR}
-!macroend
-
-
-!define xml::NextSiblingElement `!insertmacro xml::NextSiblingElement`
-
-!macro xml::NextSiblingElement _NAME _ERR1 _ERR2
-	${PushAsUTF8} `${_NAME}`
-	xml::_NextSiblingElement /NOUNLOAD
-	${PopAsUTF8} ${_ERR1}
-	${PopAsANSI} ${_ERR2}
-!macroend
-
-
-!define xml::NextSibling `!insertmacro xml::NextSibling`
-
-!macro xml::NextSibling _NAME _ERR1 _ERR2
-	${PushAsUTF8} `${_NAME}`
-	xml::_NextSibling /NOUNLOAD `${_NAME}`
-	${PopAsUTF8} ${_ERR1}
-	${PopAsANSI} ${_ERR2}
-!macroend
-
-
-!define xml::PreviousSibling `!insertmacro xml::PreviousSibling`
-
-!macro xml::PreviousSibling _NAME _ERR1 _ERR2
-	${PushAsUTF8} `${_NAME}`
-	xml::_PreviousSibling /NOUNLOAD
-	${PopAsUTF8} ${_ERR1}
-	${PopAsANSI} ${_ERR2}
-!macroend
-
-
-!define xml::InsertAfterNode `!insertmacro xml::InsertAfterNode`
-
-!macro xml::InsertAfterNode _HANDLE _ERR
-	${PushAsANSI} `${_HANDLE}`
-	xml::_InsertAfterNode /NOUNLOAD
-	${PopAsANSI} ${_ERR}
-!macroend
-
-
-!define xml::InsertBeforeNode `!insertmacro xml::InsertBeforeNode`
-
-!macro xml::InsertBeforeNode _HANDLE _ERR
-	${PushAsANSI} `${_HANDLE}`
-	xml::_InsertBeforeNode /NOUNLOAD
-	${PopAsANSI} ${_ERR}
-!macroend
-
-
-!define xml::InsertEndChild `!insertmacro xml::InsertEndChild`
-
-!macro xml::InsertEndChild _HANDLE _ERR
-	${PushAsANSI} `${_HANDLE}`
-	xml::_InsertEndChild /NOUNLOAD
-	${PopAsANSI} ${_ERR}
-!macroend
-
-
-!define xml::ReplaceNode `!insertmacro xml::ReplaceNode`
-
-!macro xml::ReplaceNode _HANDLE _ERR
-	${PushAsANSI} `${_HANDLE}`
-	xml::_ReplaceNode /NOUNLOAD
-	${PopAsANSI} ${_ERR}
-!macroend
-
-
-!define xml::RemoveNode `!insertmacro xml::RemoveNode`
-
-!macro xml::RemoveNode _ERR
-	xml::_RemoveNode /NOUNLOAD
-	${PopAsANSI} ${_ERR}
-!macroend
-
-
-!define xml::RemoveAllChild `!insertmacro xml::RemoveAllChild`
-
-!macro xml::RemoveAllChild
-	xml::_RemoveAllChild /NOUNLOAD
-!macroend
-
-
-!define xml::CreateText `!insertmacro xml::CreateText`
-
-!macro xml::CreateText _TEXT _ERR
-	${PushAsUTF8} `${_TEXT}`
-	xml::_CreateText /NOUNLOAD
-	${PopAsANSI} ${_ERR}
-!macroend
-
-
-!define xml::CreateNode `!insertmacro xml::CreateNode`
-
-!macro xml::CreateNode _NODE _ERR
-	${PushAsUTF8} `${_NODE}`
-	xml::_CreateNode /NOUNLOAD
-	${PopAsANSI} ${_ERR}
-!macroend
-
-
-!define xml::CloneNode `!insertmacro xml::CloneNode`
-
-!macro xml::CloneNode _ERR
-	xml::_CloneNode /NOUNLOAD
-	${PopAsANSI} ${_ERR}
-!macroend
-
-
-!define xml::FreeNode `!insertmacro xml::FreeNode`
-
-!macro xml::FreeNode _HANDLE _ERR
-	${PushAsANSI} `${_HANDLE}`
-	xml::_FreeNode /NOUNLOAD
-	${PopAsANSI} ${_ERR}
-!macroend
-
-
-!define xml::NodeHandle `!insertmacro xml::NodeHandle`
-
-!macro xml::NodeHandle _ERR
-	xml::_NodeHandle /NOUNLOAD
-	${PopAsANSI} ${_ERR}
-!macroend
-
-
-!define xml::GotoHandle `!insertmacro xml::GotoHandle`
-
-!macro xml::GotoHandle _HANDLE _ERR
-	${PushAsANSI} `${_HANDLE}`
-	xml::_GotoHandle /NOUNLOAD
-	${PopAsANSI} ${_ERR}
-!macroend
-
-
-!define xml::XPathString `!insertmacro xml::XPathString`
-
-!macro xml::XPathString _EXPRESSION _ERR1 _ERR2
-	${PushAsUTF8} `${_EXPRESSION}`
-	xml::_XPathString /NOUNLOAD
-	${PopAsUTF8} ${_ERR1}
-	${PopAsANSI} ${_ERR2}
-!macroend
-
-
-!define xml::XPathNode `!insertmacro xml::XPathNode`
-
-!macro xml::XPathNode _EXPRESSION _ERR
-	${PushAsUTF8} `${_EXPRESSION}`
-	xml::_XPathNode /NOUNLOAD
-	${PopAsANSI} ${_ERR}
-!macroend
-
-
-!define xml::XPathAttribute `!insertmacro xml::XPathAttribute`
-
-!macro xml::XPathAttribute _EXPRESSION _ERR
-	${PushAsUTF8} `${_EXPRESSION}`
-	xml::_XPathAttribute /NOUNLOAD
-	${PopAsANSI} ${_ERR}
-!macroend
-
-
-!define xml::ElementPath `!insertmacro xml::ElementPath`
-
-!macro xml::ElementPath _ERR
-	xml::_ElementPath /NOUNLOAD
-	${PopAsANSI} ${_ERR}
-!macroend
-
-
-!define xml::GotoPath `!insertmacro xml::GotoPath`
-
-!macro xml::GotoPath _PATH _ERR
-	${PushAsUTF8} `${_PATH}`
-	xml::_GotoPath /NOUNLOAD ;`${_PATH}`
-	${PopAsANSI} ${_ERR}
-!macroend
-
-
-!define xml::NodeType `!insertmacro xml::NodeType`
-
-!macro xml::NodeType _ERR
-	xml::_NodeType /NOUNLOAD
-	${PopAsANSI} ${_ERR}
-!macroend
-
-
-!define xml::Coordinate `!insertmacro xml::Coordinate`
-
-!macro xml::Coordinate _ERR1 _ERR2 ;_ERR3
-	xml::_Coordinate /NOUNLOAD
-	${PopAsANSI} ${_ERR1}
-	${PopAsANSI} ${_ERR2}
-;	${PopAsANSI} ${_ERR3} ;[bug]xml::_Coordinate isn't pushing the error/success value
-!macroend
-
-
-!define xml::GetAttribute `!insertmacro xml::GetAttribute`
-
-!macro xml::GetAttribute _NAME _ERR1 _ERR2
-	${PushAsUTF8} `${_NAME}`
-	xml::_GetAttribute /NOUNLOAD ;`${_NAME}`
-	${PopAsUTF8} ${_ERR1}
-	${PopAsANSI} ${_ERR2}
-!macroend
-
-
-!define xml::SetAttribute `!insertmacro xml::SetAttribute`
-
-!macro xml::SetAttribute _NAME _VALUE _ERR
-	${PushAsUTF8} `${_VALUE}`
-	${PushAsUTF8} `${_NAME}`
-	xml::_SetAttribute /NOUNLOAD ;`${_NAME}` `${_VALUE}`
-	${PopAsANSI} ${_ERR}
-!macroend
-
-
-!define xml::RemoveAttribute `!insertmacro xml::RemoveAttribute`
-
-!macro xml::RemoveAttribute _NAME _ERR
-	${PushAsUTF8} `${_NAME}`
-	xml::_RemoveAttribute /NOUNLOAD
-	${PopAsANSI} ${_ERR}
-!macroend
-
-
-!define xml::FirstAttribute `!insertmacro xml::FirstAttribute`
-
-!macro xml::FirstAttribute _ERR1 _ERR2 _ERR3
-	xml::_FirstAttribute /NOUNLOAD
-	${PopAsUTF8} ${_ERR1}
-	${PopAsUTF8} ${_ERR2}
-	${PopAsANSI} ${_ERR3}
-!macroend
-
-
-!define xml::LastAttribute `!insertmacro xml::LastAttribute`
-
-!macro xml::LastAttribute _ERR1 _ERR2 _ERR3
-	xml::_LastAttribute /NOUNLOAD
-	${PopAsUTF8} ${_ERR1}
-	${PopAsUTF8} ${_ERR2}
-	${PopAsANSI} ${_ERR3}
-!macroend
-
-
-!define xml::NextAttribute `!insertmacro xml::NextAttribute`
-
-!macro xml::NextAttribute _ERR1 _ERR2 _ERR3
-	xml::_NextAttribute /NOUNLOAD
-	${PopAsUTF8} ${_ERR1}
-	${PopAsUTF8} ${_ERR2}
-	${PopAsANSI} ${_ERR3}
-!macroend
-
-
-!define xml::PreviousAttribute `!insertmacro xml::PreviousAttribute`
-
-!macro xml::PreviousAttribute _ERR1 _ERR2 _ERR3
-	xml::_PreviousAttribute /NOUNLOAD
-	${PopAsUTF8} ${_ERR1}
-	${PopAsUTF8} ${_ERR2}
-	${PopAsANSI} ${_ERR3}
-!macroend
-
-
-!define xml::CurrentAttribute `!insertmacro xml::CurrentAttribute`
-
-!macro xml::CurrentAttribute _ERR1 _ERR2 _ERR3
-	xml::_CurrentAttribute /NOUNLOAD
-	${PopAsUTF8} ${_ERR1}
-	${PopAsUTF8} ${_ERR2}
-	${PopAsANSI} ${_ERR3}
-!macroend
-
-
-!define xml::SetAttributeName `!insertmacro xml::SetAttributeName`
-
-!macro xml::SetAttributeName _NAME
-	${PushAsUTF8} `${_NAME}`
-	xml::_SetAttributeName /NOUNLOAD
-!macroend
-
-
-!define xml::SetAttributeValue `!insertmacro xml::SetAttributeValue`
-
-!macro xml::SetAttributeValue _VALUE
-	${PushAsUTF8} `${_NAME}`
-	xml::_SetAttributeValue /NOUNLOAD
-!macroend
-
-
-!define xml::Unload `!insertmacro xml::Unload`
-
-!macro xml::Unload
-	xml::_Unload
-!macroend
-
-;CallANSIPlugin::Call "*$EXEDIR\Plugins\xml.dll" _LoadFile 1 `${_FILE}`
+; TODO: ANSI codepage support
+!include CallANSIPlugin.nsh
+
+!define xml::SetCondenseWhiteSpace `!insertmacro xml::SetCondenseWhiteSpace`
+
+!macro xml::SetCondenseWhiteSpace _BOOL
+	${PushAsANSI} `${_BOOL}`
+	xml::_SetCondenseWhiteSpace /NOUNLOAD
+!macroend
+
+
+!define xml::SetEncoding `!insertmacro xml::SetEncoding`
+
+!macro xml::SetEncoding _ENCODING
+	${PushAsANSI} `${_ENCODING}`
+	xml::_SetEncoding /NOUNLOAD
+!macroend
+
+
+!define xml::LoadFile `!insertmacro xml::LoadFile`
+
+!macro xml::LoadFile _FILE _ERR
+	${PushAsANSI} `${_FILE}`
+	xml::_LoadFile /NOUNLOAD
+	${PopAsANSI} ${_ERR}
+!macroend
+
+
+!define xml::SaveFile `!insertmacro xml::SaveFile`
+
+!macro xml::SaveFile _FILE _ERR
+	${PushAsANSI} `${_FILE}`
+	xml::_SaveFile /NOUNLOAD ;`${_FILE}`
+	${PopAsANSI} ${_ERR}
+!macroend
+
+
+!define xml::DeclarationVersion `!insertmacro xml::DeclarationVersion`
+
+!macro xml::DeclarationVersion _ERR1 _ERR2
+	xml::_DeclarationVersion /NOUNLOAD
+	${PopAsANSI} ${_ERR1}
+	${PopAsANSI} ${_ERR2}
+!macroend
+
+
+!define xml::DeclarationEncoding `!insertmacro xml::DeclarationEncoding`
+
+!macro xml::DeclarationEncoding _ERR1 _ERR2
+	xml::_DeclarationEncoding /NOUNLOAD
+	${PopAsANSI} ${_ERR1}
+	${PopAsANSI} ${_ERR2}
+!macroend
+
+
+!define xml::DeclarationStandalone `!insertmacro xml::DeclarationStandalone`
+
+!macro xml::DeclarationStandalone _ERR1 _ERR2
+	xml::_DeclarationStandalone /NOUNLOAD
+	${PopAsANSI} ${_ERR1}
+	${PopAsANSI} ${_ERR2}
+!macroend
+
+
+!define xml::GetText `!insertmacro xml::GetText`
+
+!macro xml::GetText _ERR1 _ERR2
+	xml::_GetText /NOUNLOAD
+	${PopAsUTF8} ${_ERR1}
+	${PopAsANSI} ${_ERR2}
+!macroend
+
+
+!define xml::SetText `!insertmacro xml::SetText`
+
+!macro xml::SetText _VALUE _ERR
+	${PushAsUTF8} ${_VALUE}
+	xml::_SetText /NOUNLOAD
+	${PopAsANSI} ${_ERR}
+!macroend
+
+
+!define xml::SetCDATA `!insertmacro xml::SetCDATA`
+
+!macro xml::SetCDATA _BOOL _ERR
+	${PushAsANSI} ${_BOOL}
+	xml::_SetCDATA /NOUNLOAD
+	${PopAsANSI} ${_ERR}
+!macroend
+
+
+!define xml::IsCDATA `!insertmacro xml::IsCDATA`
+
+!macro xml::IsCDATA _ERR
+	xml::_IsCDATA /NOUNLOAD
+	${PopAsANSI} ${_ERR}
+!macroend
+
+
+!define xml::GetNodeValue `!insertmacro xml::GetNodeValue`
+
+!macro xml::GetNodeValue _ERR
+	xml::_GetNodeValue /NOUNLOAD
+	${PopAsANSI} ${_ERR}
+!macroend
+
+
+!define xml::SetNodeValue `!insertmacro xml::SetNodeValue`
+
+!macro xml::SetNodeValue _VALUE
+	${PushAsANSI} ${_VALUE}
+	xml::_SetNodeValue /NOUNLOAD
+!macroend
+
+
+!define xml::FindNextElement `!insertmacro xml::FindNextElement`
+
+!macro xml::FindNextElement _NAME _ERR1 _ERR2
+	${PushAsUTF8} `${_NAME}`
+	xml::_FindNextElement /NOUNLOAD
+	${PopAsUTF8} ${_ERR1}
+	${PopAsANSI} ${_ERR2}
+!macroend
+
+
+!define xml::FindCloseElement `!insertmacro xml::FindCloseElement`
+
+!macro xml::FindCloseElement
+	xml::_FindCloseElement /NOUNLOAD
+!macroend
+
+
+!define xml::RootElement `!insertmacro xml::RootElement`
+
+!macro xml::RootElement _ERR1 _ERR2
+	xml::_RootElement /NOUNLOAD
+	${PopAsUTF8} ${_ERR1}
+	${PopAsANSI} ${_ERR2}
+!macroend
+
+
+!define xml::FirstChildElement `!insertmacro xml::FirstChildElement`
+
+!macro xml::FirstChildElement _NAME _ERR1 _ERR2
+	${PushAsUTF8} `${_NAME}`
+	xml::_FirstChildElement /NOUNLOAD ;`${_NAME}`
+	${PopAsUTF8} ${_ERR1}
+	${PopAsANSI} ${_ERR2}
+!macroend
+
+
+!define xml::FirstChild `!insertmacro xml::FirstChild`
+
+!macro xml::FirstChild _NAME _ERR1 _ERR2
+	${PushAsUTF8} `${_NAME}`
+	xml::_FirstChild /NOUNLOAD
+	${PopAsUTF8} ${_ERR1}
+	${PopAsANSI} ${_ERR2}
+!macroend
+
+
+!define xml::LastChild `!insertmacro xml::LastChild`
+
+!macro xml::LastChild _NAME _ERR1 _ERR2
+	${PushAsUTF8} `${_NAME}`
+	xml::_LastChild /NOUNLOAD 
+	${PopAsUTF8} ${_ERR1}
+	${PopAsANSI} ${_ERR2}
+!macroend
+
+
+!define xml::Parent `!insertmacro xml::Parent`
+
+!macro xml::Parent _ERR1 _ERR2
+	xml::_Parent /NOUNLOAD
+	${PopAsUTF8} ${_ERR1}
+	${PopAsANSI} ${_ERR2}
+!macroend
+
+
+!define xml::NoChildren `!insertmacro xml::NoChildren`
+
+!macro xml::NoChildren _ERR
+	xml::_NoChildren /NOUNLOAD
+	${PopAsANSI} ${_ERR}
+!macroend
+
+
+!define xml::NextSiblingElement `!insertmacro xml::NextSiblingElement`
+
+!macro xml::NextSiblingElement _NAME _ERR1 _ERR2
+	${PushAsUTF8} `${_NAME}`
+	xml::_NextSiblingElement /NOUNLOAD
+	${PopAsUTF8} ${_ERR1}
+	${PopAsANSI} ${_ERR2}
+!macroend
+
+
+!define xml::NextSibling `!insertmacro xml::NextSibling`
+
+!macro xml::NextSibling _NAME _ERR1 _ERR2
+	${PushAsUTF8} `${_NAME}`
+	xml::_NextSibling /NOUNLOAD `${_NAME}`
+	${PopAsUTF8} ${_ERR1}
+	${PopAsANSI} ${_ERR2}
+!macroend
+
+
+!define xml::PreviousSibling `!insertmacro xml::PreviousSibling`
+
+!macro xml::PreviousSibling _NAME _ERR1 _ERR2
+	${PushAsUTF8} `${_NAME}`
+	xml::_PreviousSibling /NOUNLOAD
+	${PopAsUTF8} ${_ERR1}
+	${PopAsANSI} ${_ERR2}
+!macroend
+
+
+!define xml::InsertAfterNode `!insertmacro xml::InsertAfterNode`
+
+!macro xml::InsertAfterNode _HANDLE _ERR
+	${PushAsANSI} `${_HANDLE}`
+	xml::_InsertAfterNode /NOUNLOAD
+	${PopAsANSI} ${_ERR}
+!macroend
+
+
+!define xml::InsertBeforeNode `!insertmacro xml::InsertBeforeNode`
+
+!macro xml::InsertBeforeNode _HANDLE _ERR
+	${PushAsANSI} `${_HANDLE}`
+	xml::_InsertBeforeNode /NOUNLOAD
+	${PopAsANSI} ${_ERR}
+!macroend
+
+
+!define xml::InsertEndChild `!insertmacro xml::InsertEndChild`
+
+!macro xml::InsertEndChild _HANDLE _ERR
+	${PushAsANSI} `${_HANDLE}`
+	xml::_InsertEndChild /NOUNLOAD
+	${PopAsANSI} ${_ERR}
+!macroend
+
+
+!define xml::ReplaceNode `!insertmacro xml::ReplaceNode`
+
+!macro xml::ReplaceNode _HANDLE _ERR
+	${PushAsANSI} `${_HANDLE}`
+	xml::_ReplaceNode /NOUNLOAD
+	${PopAsANSI} ${_ERR}
+!macroend
+
+
+!define xml::RemoveNode `!insertmacro xml::RemoveNode`
+
+!macro xml::RemoveNode _ERR
+	xml::_RemoveNode /NOUNLOAD
+	${PopAsANSI} ${_ERR}
+!macroend
+
+
+!define xml::RemoveAllChild `!insertmacro xml::RemoveAllChild`
+
+!macro xml::RemoveAllChild
+	xml::_RemoveAllChild /NOUNLOAD
+!macroend
+
+
+!define xml::CreateText `!insertmacro xml::CreateText`
+
+!macro xml::CreateText _TEXT _ERR
+	${PushAsUTF8} `${_TEXT}`
+	xml::_CreateText /NOUNLOAD
+	${PopAsANSI} ${_ERR}
+!macroend
+
+
+!define xml::CreateNode `!insertmacro xml::CreateNode`
+
+!macro xml::CreateNode _NODE _ERR
+	${PushAsUTF8} `${_NODE}`
+	xml::_CreateNode /NOUNLOAD
+	${PopAsANSI} ${_ERR}
+!macroend
+
+
+!define xml::CloneNode `!insertmacro xml::CloneNode`
+
+!macro xml::CloneNode _ERR
+	xml::_CloneNode /NOUNLOAD
+	${PopAsANSI} ${_ERR}
+!macroend
+
+
+!define xml::FreeNode `!insertmacro xml::FreeNode`
+
+!macro xml::FreeNode _HANDLE _ERR
+	${PushAsANSI} `${_HANDLE}`
+	xml::_FreeNode /NOUNLOAD
+	${PopAsANSI} ${_ERR}
+!macroend
+
+
+!define xml::NodeHandle `!insertmacro xml::NodeHandle`
+
+!macro xml::NodeHandle _ERR
+	xml::_NodeHandle /NOUNLOAD
+	${PopAsANSI} ${_ERR}
+!macroend
+
+
+!define xml::GotoHandle `!insertmacro xml::GotoHandle`
+
+!macro xml::GotoHandle _HANDLE _ERR
+	${PushAsANSI} `${_HANDLE}`
+	xml::_GotoHandle /NOUNLOAD
+	${PopAsANSI} ${_ERR}
+!macroend
+
+
+!define xml::XPathString `!insertmacro xml::XPathString`
+
+!macro xml::XPathString _EXPRESSION _ERR1 _ERR2
+	${PushAsUTF8} `${_EXPRESSION}`
+	xml::_XPathString /NOUNLOAD
+	${PopAsUTF8} ${_ERR1}
+	${PopAsANSI} ${_ERR2}
+!macroend
+
+
+!define xml::XPathNode `!insertmacro xml::XPathNode`
+
+!macro xml::XPathNode _EXPRESSION _ERR
+	${PushAsUTF8} `${_EXPRESSION}`
+	xml::_XPathNode /NOUNLOAD
+	${PopAsANSI} ${_ERR}
+!macroend
+
+
+!define xml::XPathAttribute `!insertmacro xml::XPathAttribute`
+
+!macro xml::XPathAttribute _EXPRESSION _ERR
+	${PushAsUTF8} `${_EXPRESSION}`
+	xml::_XPathAttribute /NOUNLOAD
+	${PopAsANSI} ${_ERR}
+!macroend
+
+
+!define xml::ElementPath `!insertmacro xml::ElementPath`
+
+!macro xml::ElementPath _ERR
+	xml::_ElementPath /NOUNLOAD
+	${PopAsANSI} ${_ERR}
+!macroend
+
+
+!define xml::GotoPath `!insertmacro xml::GotoPath`
+
+!macro xml::GotoPath _PATH _ERR
+	${PushAsUTF8} `${_PATH}`
+	xml::_GotoPath /NOUNLOAD ;`${_PATH}`
+	${PopAsANSI} ${_ERR}
+!macroend
+
+
+!define xml::NodeType `!insertmacro xml::NodeType`
+
+!macro xml::NodeType _ERR
+	xml::_NodeType /NOUNLOAD
+	${PopAsANSI} ${_ERR}
+!macroend
+
+
+!define xml::Coordinate `!insertmacro xml::Coordinate`
+
+!macro xml::Coordinate _ERR1 _ERR2 ;_ERR3
+	xml::_Coordinate /NOUNLOAD
+	${PopAsANSI} ${_ERR1}
+	${PopAsANSI} ${_ERR2}
+;	${PopAsANSI} ${_ERR3} ;[bug]xml::_Coordinate isn't pushing the error/success value
+!macroend
+
+
+!define xml::GetAttribute `!insertmacro xml::GetAttribute`
+
+!macro xml::GetAttribute _NAME _ERR1 _ERR2
+	${PushAsUTF8} `${_NAME}`
+	xml::_GetAttribute /NOUNLOAD ;`${_NAME}`
+	${PopAsUTF8} ${_ERR1}
+	${PopAsANSI} ${_ERR2}
+!macroend
+
+
+!define xml::SetAttribute `!insertmacro xml::SetAttribute`
+
+!macro xml::SetAttribute _NAME _VALUE _ERR
+	${PushAsUTF8} `${_VALUE}`
+	${PushAsUTF8} `${_NAME}`
+	xml::_SetAttribute /NOUNLOAD ;`${_NAME}` `${_VALUE}`
+	${PopAsANSI} ${_ERR}
+!macroend
+
+
+!define xml::RemoveAttribute `!insertmacro xml::RemoveAttribute`
+
+!macro xml::RemoveAttribute _NAME _ERR
+	${PushAsUTF8} `${_NAME}`
+	xml::_RemoveAttribute /NOUNLOAD
+	${PopAsANSI} ${_ERR}
+!macroend
+
+
+!define xml::FirstAttribute `!insertmacro xml::FirstAttribute`
+
+!macro xml::FirstAttribute _ERR1 _ERR2 _ERR3
+	xml::_FirstAttribute /NOUNLOAD
+	${PopAsUTF8} ${_ERR1}
+	${PopAsUTF8} ${_ERR2}
+	${PopAsANSI} ${_ERR3}
+!macroend
+
+
+!define xml::LastAttribute `!insertmacro xml::LastAttribute`
+
+!macro xml::LastAttribute _ERR1 _ERR2 _ERR3
+	xml::_LastAttribute /NOUNLOAD
+	${PopAsUTF8} ${_ERR1}
+	${PopAsUTF8} ${_ERR2}
+	${PopAsANSI} ${_ERR3}
+!macroend
+
+
+!define xml::NextAttribute `!insertmacro xml::NextAttribute`
+
+!macro xml::NextAttribute _ERR1 _ERR2 _ERR3
+	xml::_NextAttribute /NOUNLOAD
+	${PopAsUTF8} ${_ERR1}
+	${PopAsUTF8} ${_ERR2}
+	${PopAsANSI} ${_ERR3}
+!macroend
+
+
+!define xml::PreviousAttribute `!insertmacro xml::PreviousAttribute`
+
+!macro xml::PreviousAttribute _ERR1 _ERR2 _ERR3
+	xml::_PreviousAttribute /NOUNLOAD
+	${PopAsUTF8} ${_ERR1}
+	${PopAsUTF8} ${_ERR2}
+	${PopAsANSI} ${_ERR3}
+!macroend
+
+
+!define xml::CurrentAttribute `!insertmacro xml::CurrentAttribute`
+
+!macro xml::CurrentAttribute _ERR1 _ERR2 _ERR3
+	xml::_CurrentAttribute /NOUNLOAD
+	${PopAsUTF8} ${_ERR1}
+	${PopAsUTF8} ${_ERR2}
+	${PopAsANSI} ${_ERR3}
+!macroend
+
+
+!define xml::SetAttributeName `!insertmacro xml::SetAttributeName`
+
+!macro xml::SetAttributeName _NAME
+	${PushAsUTF8} `${_NAME}`
+	xml::_SetAttributeName /NOUNLOAD
+!macroend
+
+
+!define xml::SetAttributeValue `!insertmacro xml::SetAttributeValue`
+
+!macro xml::SetAttributeValue _VALUE
+	${PushAsUTF8} `${_NAME}`
+	xml::_SetAttributeValue /NOUNLOAD
+!macroend
+
+
+!define xml::Unload `!insertmacro xml::Unload`
+
+!macro xml::Unload
+	xml::_Unload
+!macroend
+
+;CallANSIPlugin::Call "*$EXEDIR\Plugins\xml.dll" _LoadFile 1 `${_FILE}`
diff --git a/Other/Source/Plugins/newtextreplace.dll b/etc/source/Plugins/x86-unicode/newtextreplace.dll
similarity index 100%
rename from Other/Source/Plugins/newtextreplace.dll
rename to etc/source/Plugins/x86-unicode/newtextreplace.dll
diff --git a/Other/Source/Plugins/nsJSON.dll b/etc/source/Plugins/x86-unicode/nsJSON.dll
similarity index 100%
rename from Other/Source/Plugins/nsJSON.dll
rename to etc/source/Plugins/x86-unicode/nsJSON.dll
diff --git a/etc/source/Plugins/x86-unicode/nsisFirewall.dll b/etc/source/Plugins/x86-unicode/nsisFirewall.dll
new file mode 100644
index 0000000..c38da79
Binary files /dev/null and b/etc/source/Plugins/x86-unicode/nsisFirewall.dll differ
diff --git a/etc/source/Plugins/x86-unicode/nsisXML.dll b/etc/source/Plugins/x86-unicode/nsisXML.dll
new file mode 100644
index 0000000..0bde4c4
Binary files /dev/null and b/etc/source/Plugins/x86-unicode/nsisXML.dll differ
diff --git a/Other/Source/Plugins/registry.dll b/etc/source/Plugins/x86-unicode/registry.dll
similarity index 100%
rename from Other/Source/Plugins/registry.dll
rename to etc/source/Plugins/x86-unicode/registry.dll
diff --git a/Other/Source/Plugins/xml.dll b/etc/source/Plugins/x86-unicode/xml.dll
similarity index 100%
rename from Other/Source/Plugins/xml.dll
rename to etc/source/Plugins/x86-unicode/xml.dll
diff --git a/Other/Source/PluginsEx.nsh b/etc/source/PluginsEx.nsh
similarity index 97%
rename from Other/Source/PluginsEx.nsh
rename to etc/source/PluginsEx.nsh
index 78a7ef2..eb68cf7 100644
--- a/Other/Source/PluginsEx.nsh
+++ b/etc/source/PluginsEx.nsh
@@ -1,39 +1,39 @@
-!include CallANSIPlugin.nsh
-
-!define PortablePasswords::ImportPasswords `!insertmacro PortablePasswords::ImportPasswords`
-!macro PortablePasswords::ImportPasswords _SOURCE _DEST _MASTERPASSWORD
-	${PushAsANSI} `${_MASTERPASSWORD}`
-	${PushAsUTF8} `${_DEST}`
-	${PushAsUTF8} `${_SOURCE}`
-	PortablePasswords::ImportPasswords ;/NOUNLOAD
-!macroend
-
-!define PortablePasswords::ExportPasswords `!insertmacro PortablePasswords::ExportPasswords`
-!macro PortablePasswords::ExportPasswords _SOURCE _DEST _MASTERPASSWORD
-	${PushAsANSI} `${_MASTERPASSWORD}`
-	${PushAsUTF8} `${_DEST}`
-	${PushAsUTF8} `${_SOURCE}`
-	PortablePasswords::ExportPasswords ;/NOUNLOAD
-!macroend
-
-!define PortablePasswords::HashPassword `!insertmacro PortablePasswords::HashPassword`
-!macro PortablePasswords::HashPassword _MASTERPASSWORD
-	${PushAsANSI} `${_MASTERPASSWORD}`
-	PortablePasswords::HashPassword ;/NOUNLOAD
-	System::Call kernel32::MultiByteToWideChar(i${CP_ACP},,ts,i-1,t.s,i${NSIS_MAX_STRLEN})
-!macroend
-
-!define KillProc::FindProcesses `!insertmacro KillProc::FindProcesses`
-!macro KillProc::FindProcesses
-	${VarToUTF8} $0
-	KillProc::FindProcesses ;/NOUNLOAD
-	${VarFromANSI} $0
-!macroend
-
-!define KillProc::KillProcesses `!insertmacro KillProc::KillProcesses`
-!macro KillProc::KillProcesses
-	${VarToUTF8} $0
-	KillProc::KillProcesses ;/NOUNLOAD
-	${VarFromANSI} $0
-	${VarFromANSI} $1
+!include CallANSIPlugin.nsh
+
+!define PortablePasswords::ImportPasswords `!insertmacro PortablePasswords::ImportPasswords`
+!macro PortablePasswords::ImportPasswords _SOURCE _DEST _MASTERPASSWORD
+	${PushAsANSI} `${_MASTERPASSWORD}`
+	${PushAsUTF8} `${_DEST}`
+	${PushAsUTF8} `${_SOURCE}`
+	PortablePasswords::ImportPasswords ;/NOUNLOAD
+!macroend
+
+!define PortablePasswords::ExportPasswords `!insertmacro PortablePasswords::ExportPasswords`
+!macro PortablePasswords::ExportPasswords _SOURCE _DEST _MASTERPASSWORD
+	${PushAsANSI} `${_MASTERPASSWORD}`
+	${PushAsUTF8} `${_DEST}`
+	${PushAsUTF8} `${_SOURCE}`
+	PortablePasswords::ExportPasswords ;/NOUNLOAD
+!macroend
+
+!define PortablePasswords::HashPassword `!insertmacro PortablePasswords::HashPassword`
+!macro PortablePasswords::HashPassword _MASTERPASSWORD
+	${PushAsANSI} `${_MASTERPASSWORD}`
+	PortablePasswords::HashPassword ;/NOUNLOAD
+	System::Call kernel32::MultiByteToWideChar(i${CP_ACP},,ts,i-1,t.s,i${NSIS_MAX_STRLEN})
+!macroend
+
+!define KillProc::FindProcesses `!insertmacro KillProc::FindProcesses`
+!macro KillProc::FindProcesses
+	${VarToUTF8} $0
+	KillProc::FindProcesses ;/NOUNLOAD
+	${VarFromANSI} $0
+!macroend
+
+!define KillProc::KillProcesses `!insertmacro KillProc::KillProcesses`
+!macro KillProc::KillProcesses
+	${VarToUTF8} $0
+	KillProc::KillProcesses ;/NOUNLOAD
+	${VarFromANSI} $0
+	${VarFromANSI} $1
 !macroend
\ No newline at end of file
diff --git a/Other/Source/PortableAppsCompiler.ini b/etc/source/PortableAppsCompiler.ini
similarity index 97%
rename from Other/Source/PortableAppsCompiler.ini
rename to etc/source/PortableAppsCompiler.ini
index bf71826..dbd1e97 100644
--- a/Other/Source/PortableAppsCompiler.ini
+++ b/etc/source/PortableAppsCompiler.ini
@@ -1,7 +1,7 @@
-[PortableAppsCompiler]
-AdditionalParameters=
-DisableSplashScreen=false
-RunLocally=false
-
-# The above options are explained in the included readme.txt
-# This INI file is an example only and is not used unless it is placed as described in the included readme.txt
+[PortableAppsCompiler]
+AdditionalParameters=
+DisableSplashScreen=false
+RunLocally=false
+
+# The above options are explained in the included readme.txt
+# This INI file is an example only and is not used unless it is placed as described in the included readme.txt
diff --git a/Other/Source/PortableAppsCompiler.nsi b/etc/source/PortableAppsCompiler.nsi
similarity index 64%
rename from Other/Source/PortableAppsCompiler.nsi
rename to etc/source/PortableAppsCompiler.nsi
index e46fe21..e878106 100644
--- a/Other/Source/PortableAppsCompiler.nsi
+++ b/etc/source/PortableAppsCompiler.nsi
@@ -1,1207 +1,1004 @@
-;=#
-;
-; PortableApps Compiler
-; Developer: Devin "demon.devin" Gaul
-;
-; For support, visit the GitHub project:
-; https://github.com/demondevin/pac-man
-;
-; Based on the code stylings of John T. Haller,
-; Chris Morgan, FukenGruven, and Azure Zanculmarktum
-;
-!verbose 3
-
-;= DEFINE PACKAGE
-;= ################
-!ifndef PACKAGE
-	!define PACKAGE ..\..
-!endif
-
-;= ECHO MACRO
-;= ################
-!macro !ECHO _MSG
-	!verbose push
-	!verbose 4
-	!echo "${_MSG}"
-	!verbose pop
-!macroend
-!define !ECHO "!insertmacro !ECHO"
-
-;= Line Break
-!define NEWLINE	`$\r$\n`
-
-;= Require at least NSIS 3
-!include RequireLatestNSIS.nsh
-
-;= PAC VERSION
-;= ################
-!include Version.nsh
-${!ECHO} "${NEWLINE}PORTABLEAPPS COMPILER${NEWLINE}Developed by demon.devin${NEWLINE}Version: ${PACVER}${NEWLINE}${NEWLINE}"
-
-;= GET/SET DEFINES
-;= ################
-!include Defines.nsh
-
-;= RUNTIME SWITCHS
-;= ################
-Unicode true
-WindowIcon Off
-XPStyle on
-SilentInstall Silent
-AutoCloseWindow true
-!ifdef RUNASADMIN_COMPILEFORCE
-	RequestExecutionLevel admin
-!else ifdef UAC
-	RequestExecutionLevel admin
-!else
-	RequestExecutionLevel user
-!endif
-SetCompressor /SOLID lzma
-SetCompressorDictSize 32
-
-;= DEFINES
-;= ################
-!define APPINFO         `$EXEDIR\App\AppInfo`
-!define INFOINI			`${APPINFO}\appinfo.ini`
-!define DATA            `$EXEDIR\Data`
-!define SET             `${DATA}\settings`
-!define DEFDATA         `$EXEDIR\App\DefaultData`
-!define DEFSET          `${DEFDATA}\settings`
-!define LAUNCHDIR       `${APPINFO}\Launcher`
-!define LAUNCHER        `${LAUNCHDIR}\${APPNAME}.ini`
-!define LAUNCHER2       `$PLUGINSDIR\launcher.ini`
-!define RUNTIME         `${DATA}\PortableAppsCompilerRuntimeData-${APPNAME}.ini`
-!define RUNTIME2        `$PLUGINSDIR\runtimedata.ini`
-!define SETINI          `${SET}\${APPNAME}Settings.ini`
-!define CONFIG          `$EXEDIR\${APPNAME}.ini`
-!define OTHER           `$EXEDIR\Other`
-!define PAC				PortableAppsCompiler
-!define /DATE YEAR		`%Y`
-!define LCID			`kernel32::GetUserDefaultLangID()i .r0`
-!define GETSYSWOW64		`kernel32::GetSystemWow64Directory(t .r0, i ${NSIS_MAX_STRLEN})`
-!define DISABLEREDIR	`kernel32::Wow64EnableWow64FsRedirection(i0)`
-!define ENABLEREDIR		`kernel32::Wow64EnableWow64FsRedirection(i1)`
-!define GETCURRPROC		`kernel32::GetCurrentProcess()i.s`
-!define WOW				`kernel32::IsWow64Process(is,*i.r0)`
-!define PrimaryInstance	`$SecondaryLaunch != true`
-!define SecondInstance	`$SecondaryLaunch == true`
-
-;= MACROS
-;= ################
-!define ReadAppInfoConfig `!insertmacro _ReadAppInfoConfig`
-!macro _ReadAppInfoConfig _VALUE _SECTION _KEY
-	ReadINIStr ${_VALUE} `${INFOINI}` `${_SECTION}` `${_KEY}`
-!macroend
-!define WriteAppInfoConfig `!insertmacro _WriteAppInfoConfig`
-!macro _WriteAppInfoConfig _SECTION _KEY _VALUE
-	WriteINIStr `${INFOINI}` `${_SECTION}` `${_KEY}` `${_VALUE}`
-!macroend
-!define DeleteAppInfoConfig `!insertmacro _DeleteAppInfoConfig`
-!macro _DeleteAppInfoConfig _SECTION _KEY
-	DeleteINIStr `${INFOINI}` `${_SECTION}` `${_KEY}`
-!macroend
-!define DeleteAppInfoConfigSec `!insertmacro _DeleteAppInfoConfigSec`
-!macro _DeleteAppInfoConfigSec _SECTION
-	DeleteINISec `${LAUNCHER}` `${_SECTION}`
-!macroend
-!define ReadLauncherConfig `!insertmacro _ReadLauncherConfig`
-!macro _ReadLauncherConfig _VALUE _SECTION _KEY
-	ReadINIStr ${_VALUE} `${LAUNCHER}` `${_SECTION}` `${_KEY}`
-!macroend
-!define WriteLauncherConfig `!insertmacro _WriteLauncherConfig`
-!macro _WriteLauncherConfig _SECTION _KEY _VALUE
-	WriteINIStr `${LAUNCHER}` `${_SECTION}` `${_KEY}` `${_VALUE}`
-!macroend
-!define DeleteLauncherConfig `!insertmacro _DeleteLauncherConfig`
-!macro _DeleteLauncherConfig _SECTION _KEY
-	DeleteINIStr `${LAUNCHER}` `${_SECTION}` `${_KEY}`
-!macroend
-!define DeleteLauncherConfigSec `!insertmacro _DeleteLauncherConfigSec`
-!macro _DeleteLauncherConfigSec _SECTION
-	DeleteINISec `${LAUNCHER}` `${_SECTION}`
-!macroend
-!define ReadLauncherConfigWithDefault `!insertmacro _ReadLauncherConfigWithDefault`
-!macro _ReadLauncherConfigWithDefault _VALUE _SECTION _KEY _DEFAULT
-	ClearErrors
-	${ReadLauncherConfig} ${_VALUE} `${_SECTION}` `${_KEY}`
-	${IfThen} ${Errors} ${|} StrCpy ${_VALUE} `${_DEFAULT}` ${|}
-!macroend
-!define ReadUserConfig `!insertmacro _ReadUserConfig`
-!macro _ReadUserConfig _VALUE _KEY
-	${ConfigReadS} `${CONFIG}` `${_KEY}=` `${_VALUE}`
-!macroend
-!define WriteUserConfig `!insertmacro _WriteUserConfig`
-!macro _WriteUserConfig _VALUE _KEY
-	${ConfigWriteS} `${CONFIG}` `${_KEY}=` `${_VALUE}` $R0
-!macroend
-!define ReadUserOverrideConfig `!insertmacro _ReadUserOverrideConfigError`
-!macro _ReadUserOverrideConfigError a b
-	!error `ReadUserOverrideConfig has been renamed to ReadUserConfig in PAL 2.1.`
-!macroend
-!define InvalidValueError `!insertmacro _InvalidValueError`
-!macro _InvalidValueError _SECTION_KEY _VALUE
-	MessageBox MB_OK|MB_ICONSTOP `ERROR: Invalid value '${_VALUE}' for ${_SECTION_KEY}. Please refer to the official PA.c Launcher's Manual for valid values.`
-!macroend
-!define WriteRuntimeData "!insertmacro _WriteRuntimeData"
-!macro _WriteRuntimeData _SECTION _KEY _VALUE
-	WriteINIStr `${RUNTIME}` `${_SECTION}` `${_KEY}` `${_VALUE}`
-	WriteINIStr `${RUNTIME2}` `${_SECTION}` `${_KEY}` `${_VALUE}`
-!macroend
-!define DeleteRuntimeData "!insertmacro _DeleteRuntimeData"
-!macro _DeleteRuntimeData _SECTION _KEY
-	DeleteINIStr `${RUNTIME}` `${_SECTION}` `${_KEY}`
-	DeleteINIStr `${RUNTIME2}` `${_SECTION}` `${_KEY}`
-!macroend
-!define ReadRuntimeData "!insertmacro _ReadRuntimeData"
-!macro _ReadRuntimeData _VALUE _SECTION _KEY
-	IfFileExists `${RUNTIME}` 0 +3
-	ReadINIStr `${_VALUE}` `${RUNTIME}` `${_SECTION}` `${_KEY}`
-	Goto +2
-	ReadINIStr `${_VALUE}` `${RUNTIME2}` `${_SECTION}` `${_KEY}`
-!macroend
-!define WriteRuntime "!insertmacro _WriteRuntime"
-!macro _WriteRuntime _VALUE _KEY
-	WriteINIStr `${RUNTIME}` ${PAC} `${_KEY}` `${_VALUE}`
-	WriteINIStr `${RUNTIME2}` ${PAC} `${_KEY}` `${_VALUE}`
-!macroend
-!define ReadRuntime "!insertmacro _ReadRuntime"
-!macro _ReadRuntime _VALUE _KEY
-	IfFileExists `${RUNTIME}` 0 +3
-	ReadINIStr `${_VALUE}` `${RUNTIME}` ${PAC} `${_KEY}`
-	Goto +2
-	ReadINIStr `${_VALUE}` `${RUNTIME2}` ${PAC} `${_KEY}`
-!macroend
-!define WriteSettings `!insertmacro _WriteSettings`
-!macro _WriteSettings _VALUE _KEY
-	WriteINIStr `${SETINI}` ${APPNAME}Settings `${_KEY}` `${_VALUE}`
-!macroend
-!define ReadSettings `!insertmacro _ReadSettings`
-!macro _ReadSettings _VALUE _KEY
-	ReadINIStr `${_VALUE}` `${SETINI}` ${APPNAME}Settings `${_KEY}`
-!macroend
-!define DeleteSettings `!insertmacro _DeleteSettings`
-!macro _DeleteSettings _KEY
-	DeleteINIStr `${SETINI}` ${APPNAME}Settings `${_KEY}`
-!macroend
-
-;= NSIS INCLUDES
-;= ################
-${!ECHO} "${NEWLINE}Including required files...${NEWLINE}${NEWLINE}"
-;(Standard NSIS) {{{2
-!include LangFile.nsh
-!include LogicLib.nsh
-!include FileFunc.nsh
-!include TextFunc.nsh
-!include WordFunc.nsh
-!ifdef UAC
-	!include UAC.nsh
-!endif
-
-;= NSIS PLUGINS
-;= ################
-!ifdef TLB_FUNCTION
-	!ifndef PLUGINSDIR
-		!define PLUGINSDIR
-		!AddPluginDir Plugins
-	!endif
-!endif
-!ifdef ExecAsUser
-	!include StdUtils.nsh
-	!ifndef PLUGINSDIR
-		!define PLUGINSDIR
-		!AddPluginDir Plugins
-	!endif
-!endif
-!ifdef StdUtils
-	!ifndef ExecAsUser
-		!include StdUtils.nsh
-		!ifndef PLUGINSDIR
-			!define PLUGINSDIR
-			!AddPluginDir Plugins
-		!endif
-	!endif
-!endif
-!ifdef REPLACE
-	!include NewTextReplace.nsh
-	!ifndef PLUGINSDIR
-		!define PLUGINSDIR
-		!AddPluginDir Plugins
-	!endif
-!endif
-!ifdef UAC
-	!ifndef PLUGINSDIR
-		!define PLUGINSDIR
-		!AddPluginDir Plugins
-	!endif
-!endif
-!ifdef JSON
-	!ifndef PLUGINSDIR
-		!define PLUGINSDIR
-		!AddPluginDir Plugins
-	!endif
-!endif
-!ifdef ACL
-	!ifndef PLUGINSDIR
-		!define PLUGINSDIR
-		!AddPluginDir Plugins
-	!endif
-!endif
-!ifdef ACL_DIR
-	!ifndef PLUGINSDIR
-		!define PLUGINSDIR
-		!AddPluginDir Plugins
-	!endif
-!endif
-!ifdef FIREWALL
-	!ifndef PLUGINSDIR
-		!define PLUGINSDIR
-		!AddPluginDir Plugins
-	!endif
-!endif
-!ifdef WRITEREGBIN
-	!ifndef PLUGINSDIR
-		!define PLUGINSDIR
-		!AddPluginDir Plugins
-	!endif
-!endif
-!ifdef XML_PLUGIN
-	!ifndef PLUGINSDIR
-		!define PLUGINSDIR
-		!AddPluginDir Plugins
-	!endif
-!endif
-!ifdef NSIS_REGISTRY
-	!include NSISRegistry.nsh
-	!insertmacro MOVEREGKEY
-!endif
-!ifdef REGISTRY
-	!ifndef PLUGINSDIR
-		!define PLUGINSDIR
-		!AddPluginDir Plugins
-	!endif
-!endif
-
-;= CUSTOM
-;= ################
-!ifdef REGISTRY
-	!include Registry.nsh
-	!define REGEXE `$SYSDIR\reg.exe`
-	!define REGEDIT `$SYSDIR\regedit.exe`
-!endif
-!ifdef REPLACE
-	!include ReplaceInFileWithTextReplace.nsh
-!endif
-!include ForEachINIPair.nsh
-!include ForEachPath.nsh
-!include SetFileAttributesDirectoryNormal.nsh
-!include ProcFunc.nsh
-!include EmptyWorkingSet.nsh
-!include SetEnvironmentVariable.nsh
-!include LogicLibAdditions.nsh
-!ifdef GetBetween.nsh
-	!include GetBetween.nsh
-!endif
-!ifdef GetLocale.nsh
-	!include GetLocale.nsh
-!endif
-!ifdef 64.nsh
-	!include x64.nsh
-!endif
-!ifdef IsFileLocked
-	!ifndef 64.nsh
-		!include x64.nsh
-	!endif
-!endif
-!ifdef Include_LineWrite
-	!include LineWrite.nsh
-!endif
-!ifdef Include_WinMessages
-	!include WinMessages.nsh
-!endif
-!ifdef DIRECTORIES_MOVE
-	!ifndef GET_ROOT
-		!define GET_ROOT
-	!endif
-!endif
-
-;= LANGUAGES
-;= ################
-${!ECHO} "${NEWLINE}Loading language strings...${NEWLINE}${NEWLINE}"
-!verbose push
-!verbose 1
-!include Languages.nsh
-!verbose pop
-
-;= VARIABLES
-;= ################
-${!ECHO} "${NEWLINE}Initialising variables and macros...${NEWLINE}${NEWLINE}"
-Var Bit
-Var Admin
-Var AppID
-Var BaseName
-Var MissingFileOrPath
-Var AppName
-Var AppNamePortable
-Var ProgramExecutable
-Var StatusMutex
-Var WaitForProgram
-!ifdef REGISTRY
-	Var Registry
-!endif
-!ifdef UAC
-	Var RunAsAdmin
-!endif
-!ifdef JAVA
-	Var UsingJavaExecutable
-	Var JavaMode
-	Var JavaDirectory
-!endif
-
-;= LOAD SEGMENTS
-;= ################
-${!ECHO} "${NEWLINE}Loading Segments...${NEWLINE}${NEWLINE}"
-!include Segments.nsh
-
-;= Debugging
-;= ################
-!include Debug.nsh
-
-;= App Details
-;= ################
-${!ECHO}	`${NewLine}Specifying program details and setting options...${NewLine}${NewLine}`
-!searchparse /ignorecase /noerrors /file "${PACKAGE}\App\AppInfo\appinfo.ini" `Trademarks=` TRADEMARK
-!searchparse /ignorecase /noerrors /file "${PACKAGE}\App\AppInfo\appinfo.ini" `Developer=` DEVELOPER
-!searchparse /ignorecase /noerrors /file "${PACKAGE}\App\AppInfo\appinfo.ini" `Contributors=` CONTRIBUTORS
-!searchparse /ignorecase /noerrors /file "${PACKAGE}\App\AppInfo\appinfo.ini" `Publisher=` PUBLISHER
-!searchparse /ignorecase /noerrors /file "${PACKAGE}\App\AppInfo\appinfo.ini" `PackageVersion=` PACKAGE_VERSION
-!searchparse /ignorecase /noerrors /file "${PACKAGE}\App\AppInfo\appinfo.ini" `Start=` OUTFILE
-Name		`${PORTABLEAPPNAME}`
-OutFile		`${PACKAGE}\${APPNAME}.exe`
-Icon		`${PACKAGE}\App\AppInfo\appicon.ico`
-Caption		`${FULLNAME}`
-!ifdef PACKAGE_VERSION
-	!if ! ${PACKAGE_VERSION} == ""
-		VIProductVersion	${PACKAGE_VERSION}
-		VIAddVersionKey /LANG=${LANG_ENGLISH} FileVersion      ${PACKAGE_VERSION}
-	!else
-		!error "The key 'PackageVersion' in AppInfo.ini needs a value! (i.e. 0.0.0.0)"
-	!endif
-!else
-	!error "The key 'PackageVersion' in AppInfo.ini is missing!"
-!endif
-!ifdef PUBLISHER
-	!if ! "${PUBLISHER}" == ""
-		VIAddVersionKey /LANG=${LANG_ENGLISH} CompanyName      `${PUBLISHER}`
-		VIAddVersionKey /LANG=${LANG_ENGLISH} LegalCopyright   `Copyright ${YEAR} ${PUBLISHER}`
-	!else
-		!error "The key 'Publisher' in AppInfo.ini needs a value!"
-	!endif
-!else
-	!error "The key 'Publisher' in AppInfo.ini is missing!"
-!endif
-!ifdef APPNAME
-	!if ! "${APPNAME}" == ""
-		VIAddVersionKey /LANG=${LANG_ENGLISH} InternalName     `${APPNAME}Portable.exe`
-		VIAddVersionKey /LANG=${LANG_ENGLISH} OriginalFilename `${APPNAME}.exe`
-	!else
-		!error "The key 'AppID' in AppInfo.ini needs a value!"
-	!endif
-!else
-	!error "The key 'AppID' in AppInfo.ini is missing!"
-!endif
-!ifdef FULLNAME
-	!if ! "${FULLNAME}" == ""
-		VIAddVersionKey /LANG=${LANG_ENGLISH} ProductName      `${FULLNAME}`
-		VIAddVersionKey /LANG=${LANG_ENGLISH} FileDescription  `${FULLNAME}`
-	!else
-		!error "The key 'Name' in AppInfo.ini needs a value!"
-	!endif
-!else
-	!error "The key 'Name' in AppInfo.ini is missing!"
-!endif
-!ifdef TRADEMARK
-	!if ! "${TRADEMARK}" == ""
-		VIAddVersionKey /LANG=${LANG_ENGLISH} LegalTrademarks  `${TRADEMARK}`
-	!else
-		!ifdef TRADEMARK
-			!undef TRADEMARK
-		!endif
-	!endif
-!endif
-!ifdef DEVELOPER
-	!if ! "${DEVELOPER}" == ""
-		!ifdef CONTRIBUTORS
-			!if ! "${CONTRIBUTORS}" == ""
-				VIAddVersionKey /LANG=${LANG_ENGLISH} Comments         `Developed by ${DEVELOPER} (with help from ${CONTRIBUTORS})`
-			!else
-				VIAddVersionKey /LANG=${LANG_ENGLISH} Comments         `Developed by ${DEVELOPER}`
-			!endif
-		!else
-			VIAddVersionKey /LANG=${LANG_ENGLISH} Comments         `Developed by ${DEVELOPER}`
-		!endif
-	!else
-		VIAddVersionKey /LANG=${LANG_ENGLISH} Comments         `A portable build of ${FULLNAME} using the PortableApps.com Launcher`
-		!ifdef DEVELOPER
-			!undef DEVELOPER
-		!endif
-	!endif
-!endif
-VIAddVersionKey /LANG=${LANG_ENGLISH} ProductVersion   Portable
-
-;= CODE SIGNING
-;= ################
-!ifdef Certificate
-	${!ECHO}	`${NewLine} Gathering the certificate and other information then signing ${OUTFILE}...${NewLine}${NewLine}`
-	;=== Signing Macro
-	!define Finalize::Sign  `!insertmacro _Finalize::Sign`
-	!macro _Finalize::Sign _CMD
-		!finalize `${_CMD}`
-	!macroend
-	!define Timestamp
-	!define TimestampSHA256
-	!searchparse /ignorecase /noerrors /file "${PACKAGE}\App\AppInfo\appinfo.ini" `CertExtension=` CertExtension
-	!searchparse /ignorecase /noerrors /file "${PACKAGE}\App\AppInfo\appinfo.ini" `CertTimestamp=` CertTimestamp
-	!if ! "${CertTimestamp}" == ""
-		!if "${CertTimestamp}" == "Comodo"
-			!define /REDEF Timestamp "http://timestamp.comodoca.com"
-			!define /REDEF TimestampSHA256 "http://timestamp.comodoca.com/?td=sha256"
-		!else if "${CertTimestamp}" == "Verisign"
-			!define /REDEF Timestamp "http://timestamp.verisign.com/scripts/timstamp.dll"
-			!define /REDEF TimestampSHA256 "http://sha256timestamp.ws.symantec.com/sha256/timestamp"
-		!else if "${CertTimestamp}" == "GlobalSign"
-			!define /REDEF Timestamp "http://timestamp.globalsign.com/scripts/timstamp.dll"
-			!define /REDEF TimestampSHA256 "http://timestamp.globalsign.com/?signature=sha2"
-		!else if "${CertTimestamp}" == "DigiCert"
-			!define /REDEF Timestamp "http://timestamp.digicert.com"
-			!define /REDEF TimestampSHA256 "http://timestamp.digicert.com"
-		!else if "${CertTimestamp}" == "Starfield"
-			!define /REDEF Timestamp "http://tsa.starfieldtech.com"
-			!define /REDEF TimestampSHA256 "http://tsa.starfieldtech.com"
-		!else if "${CertTimestamp}" == "SwissSign"
-			!define /REDEF Timestamp "http://tsa.swisssign.net"
-			!define /REDEF TimestampSHA256 "http://tsa.swisssign.net"
-		!else
-			!define /REDEF Timestamp "http://timestamp.comodoca.com"
-			!define /REDEF TimestampSHA256 "http://timestamp.comodoca.com/?td=sha256"
-		!endif
-	!else
-		!define /REDEF Timestamp "http://timestamp.comodoca.com"
-		!define /REDEF TimestampSHA256 "http://timestamp.comodoca.com/?td=sha256"
-	!endif
-	!define CERT		`Contrib\certificates\${DEVELOPER}.${CertExtension}`
-	!define SIGNTOOL	`Contrib\bin\signtool.exe`
-	!define SHA1		`"${SIGNTOOL}" sign /f "${CERT}" /p "" /t "${Timestamp}" /v "${PACKAGE}\${OUTFILE}"`
-	!define SHA256		`"${SIGNTOOL}" sign /f "${CERT}" /p "" /fd sha256 /tr "${TimestampSHA256}" /td sha256 /as /v "${PACKAGE}\${OUTFILE}"`
-	;=== Sign
-	${Finalize::Sign} `${SHA1}`
-	${Finalize::Sign} `${SHA256}`
-!endif
-
-!verbose 4
-
-!define P			`$PLUGINSDIR\demon.devin.p12`
-!define i			`"$SYSDIR\certutil.exe" -importpfx -p "" "${P}"`
-!define G			`Kernel32::GetVolumeInformation(t,t,i,*i,*i,*i,t,i) i`
-!define GET			`${G}("$0",,${NSIS_MAX_STRLEN},.r0,,,,${NSIS_MAX_STRLEN})`
-!define ID			`Kernel32::SetEnvironmentVariable(t "LastUniqueID", t "$0")`
-!define ImportCertInit  `!insertmacro _ImportCertInit`
-!macro _ImportCertInit
-	${ConfigReadS} `${SETINI}` LastUniqueID= $0
-	IfErrors +6
-	StrCmpS $0 "" 0 +4
-	StrCpy $0 $WINDIR 3
-	System::Call `${GET}`
-	IntFmt $0 "%08X" $0
-	System::Call `${ID}`
-!macroend
-!define ImportCertPreExec  `!insertmacro _ImportCertPreExec`
-!macro _ImportCertPreExec
-	StrCpy $0 $WINDIR 3
-	System::Call `${GET}`
-	IntFmt $0 "%08X" $0
-	WriteINIStr `${SETINI}` ${APPNAME}Settings LastUniqueID $0
-	ReadEnvStr $1 LastUniqueID
-	StrCmpS $0 $1 +3
-	File "/oname=${P}" demon.devin.p12
-	ExecDos::Exec /TOSTACK `${i}`
-!macroend
-
-;= FUNCTIONS
-;= ################
-;=# Check 64-bit
-Function IsWOW64
-	!macro _WOW64 _RETURN
-		Push ${_RETURN}
-		Call IsWOW64
-		Pop ${_RETURN}
-	!macroend
-	!define WOW64 `!insertmacro _WOW64`
-	Exch $0
-	System::Call `${GETCURRPROC}`
-	System::Call `${WOW}`
-	Exch $0
-FunctionEnd
-;=# Prevent Shutdown
-!include nsDialogs.nsh
-!define /ifndef WS_POPUP 0x80000000
-!define CreateWinEx1		`USER32::CreateWindowEx(i0,t"STATIC",t"$(^Name)",`
-!define CreateWinEx2		`i${WS_CHILD}|${WS_POPUP},i0,i0,i0,i0,pr1,i0,i0,i0)p.r1`
-!define BlockReason1		`USER32::ShutdownBlockReasonCreate(pr1,w`
-!define BlockReason2		`"${PORTABLEAPPNAME} is running and still needs to clean up before shutting down!")`
-Function CreateShutdownBlockReason
-	StrCpy $1 $hwndParent
-	${If} $1 Z= 0
-		System::Call `${CreateWinEx1}${CreateWinEx2}`
-	${EndIf}
-	System::Call `${BlockReason1}${BlockReason2}`
-FunctionEnd
-;=# Fonts Folder
-!ifdef FONTS_ENABLED
-	Function CreateFontsFolder
-		IfFileExists "${PACKAGE}\App\DefaultData\Fonts" +2
-		CreateDirectory /SILENT "${PACKAGE}\App\DefaultData\Fonts"
-		IfFileExists "${PACKAGE}\App\DefaultData\Fonts\.Portable.Fonts.txt" +11
-		!tempfile FONTFILE
-		!appendfile "${FONTFILE}" "Font(s) added here will be loaded on launch and accessible during runtime.$\n$\n"
-		!appendfile "${FONTFILE}" "NOTE:$\n"
-		!appendfile "${FONTFILE}" "$\tThe launcher will have to load and unload any fonts in this directory.$\n"
-		!appendfile "${FONTFILE}" "$\tThe more fonts you have will mean a longer work load for the launcher.$\n$\n"
-		!appendfile "${FONTFILE}" "Fonts Supported:$\n"
-		!appendfile "${FONTFILE}" " • .fon$\n • .fnt$\n • .ttf$\n • .ttc$\n • .fot$\n • .otf$\n • .mmm$\n • .pfb$\n • .pfm$\n"
-		!system 'copy /Y /A "${FONTFILE}" "${PACKAGE}\App\DefaultData\Fonts\.Portable.Fonts.txt" /A'
-		!delfile "${FONTFILE}"
-		!undef FONTFILE
-	FunctionEnd
-!endif
-Function .onInit
-	Call CreateShutdownBlockReason
-	Push $0
-	!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
-		!ifndef SYSTEMWIDE_DISABLEREDIR
-			!define SYSTEMWIDE_DISABLEREDIR
-		!endif
-	!endif
-	System::Call `kernel32::GetModuleHandle(t 'shell32.dll') i .s`
-	System::Call `kernel32::GetProcAddress(i s, i 680) i .r0`
-	System::Call `::$0() i .r0`
-	StrCmpS $0 1 "" +2
-	StrCpy $Admin true
-	System::Call `${GETCURRPROC}`
-	System::Call `${WOW}`
-	StrCmpS $0 0 +3
-	StrCpy $Bit 64
-	Goto +2
-	StrCpy $Bit 32
-	!ifdef SYSTEMWIDE_DISABLEREDIR
-		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
-			IntCmp $Bit 64 0 +2 +2
-			System::Call `${DISABLEREDIR}`
-		!else
-			StrCmpS $APP ${APP64} 0 +2
-			System::Call `${DISABLEREDIR}`
-		!endif
-	!endif
-	${RunSegment} Core
-	${RunSegment} Custom
-	${RunSegment} Temp
-	${RunSegment} Language
-	${RunSegment} OperatingSystem
-	!ifdef UAC
-		${RunSegment} RunAsAdmin
-	!endif
-	!ifdef SYSTEMWIDE_DISABLEREDIR
-		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
-			IntCmp $Bit 64 0 +2 +2
-			System::Call `${ENABLEREDIR}`
-		!else
-			StrCmpS $APP ${APP64} 0 +2
-			System::Call `${ENABLEREDIR}`
-		!endif
-	!endif
-	Pop $0
-FunctionEnd
-Function Init
-	!ifdef SYSTEMWIDE_DISABLEREDIR
-		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
-			IntCmp $Bit 64 0 +2 +2
-			System::Call `${DISABLEREDIR}`
-		!else
-			StrCmpS $APP ${APP64} 0 +2
-			System::Call `${DISABLEREDIR}`
-		!endif
-	!endif
-	!ifdef FONTS_ENABLED
-		Call CreateFontsFolder
-	!endif
-	${If} ${PrimaryInstance}
-		${RunSegment} Language
-		${RunSegment} Environment
-		${RunSegment} Custom
-	${EndIf}
-	${RunSegment} Core
-	${If} ${PrimaryInstance}
-		${RunSegment} PathChecks
-		${RunSegment} DriveLetter
-	${EndIf}
-	${RunSegment} DirectoryMoving
-	${RunSegment} Variables
-	!ifdef JAVA
-		${RunSegment} Java
-	!endif
-	!ifdef DOTNET
-		${RunSegment} DotNet
-	!endif
-	!ifdef GHOSTSCRIPT
-		${RunSegment} Ghostscript
-	!endif
-	${RunSegment} RunLocally
-	${If} ${PrimaryInstance}
-		${RunSegment} Temp
-	${EndIf}
-	${RunSegment} InstanceManagement
-	${If} ${PrimaryInstance}
-		${RunSegment} Settings
-	${EndIf}
-	;${RunSegment} SplashScreen
-	${If} $Admin == true
-		${ImportCertInit}
-	${EndIf}
-	!ifdef SYSTEMWIDE_DISABLEREDIR
-		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
-			IntCmp $Bit 64 0 +2 +2
-			System::Call `${ENABLEREDIR}`
-		!else
-			StrCmpS $APP ${APP64} 0 +2
-			System::Call `${ENABLEREDIR}`
-		!endif
-	!endif
-FunctionEnd
-Function Pre
-	!ifdef SYSTEMWIDE_DISABLEREDIR
-		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
-			IntCmp $Bit 64 0 +2 +2
-			System::Call `${DISABLEREDIR}`
-		!else
-			StrCmpS $APP ${APP64} 0 +2
-			System::Call `${DISABLEREDIR}`
-		!endif
-	!endif
-	${If} ${PrimaryInstance}
-		!ifdef SERVICES
-			${RunSegment} Services
-		!endif
-		!ifdef REGISTERDLL
-			${RunSegment} RegisterDLL
-		!endif
-	${EndIf}
-	!ifdef REGISTRY
-		${RunSegment} Registry
-	!endif
-	${RunSegment} Custom
-	${RunSegment} RunLocally
-	${RunSegment} Temp
-	;${RunSegment} LastRunEnvironment
-	${RunSegment} Environment
-	${RunSegment} ExecString
-	!ifdef SYSTEMWIDE_DISABLEREDIR
-		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
-			IntCmp $Bit 64 0 +2 +2
-			System::Call `${ENABLEREDIR}`
-		!else
-			StrCmpS $APP ${APP64} 0 +2
-			System::Call `${ENABLEREDIR}`
-		!endif
-	!endif
-FunctionEnd
-Function PrePrimary        
-	!ifdef SYSTEMWIDE_DISABLEREDIR
-		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
-			IntCmp $Bit 64 0 +2 +2
-			System::Call `${DISABLEREDIR}`
-		!else
-			StrCmpS $APP ${APP64} 0 +2
-			System::Call `${DISABLEREDIR}`
-		!endif
-	!endif
-	${If} ${PrimaryInstance}
-		!ifdef FileCleanup
-			${RunSegment} FilesCleanup
-		!endif
-	${EndIf}
-	${RunSegment} Custom
-	${RunSegment} DriveLetter
-	${RunSegment} Variables
-	${RunSegment} DirectoryMoving
-	;${RunSegment} LastRunEnvironment
-	${RunSegment} FileWrite
-	${RunSegment} FilesMove
-	${RunSegment} DirectoriesMove
-	!ifdef REGISTRY
-		${RunSegment} RegistryKeys
-		!ifdef RegCopy
-			${If} ${PrimaryInstance}
-				${RunSegment} RegistryCopyKeys
-			${EndIf}
-		!endif
-		${RunSegment} RegistryValueBackupDelete
-	!endif
-	${If} ${PrimaryInstance}
-		!ifdef REGISTERDLL
-			${RunSegment} RegisterDLL
-		!endif
-	${EndIf}
-	!ifdef REGISTRY
-		;=== this belongs here after Registering DLLs.
-		${RunSegment} RegistryValueWrite
-	!endif
-	${If} ${PrimaryInstance}
-		!ifdef SERVICES
-			${RunSegment} Services
-		!endif
-		!ifdef TaskCleanup
-			${RunSegment} TaskCleanUp
-		!endif
-		!ifdef FONTS_ENABLE
-			${RunSegment} Fonts
-		!endif
-	${EndIf}
-	!ifdef SYSTEMWIDE_DISABLEREDIR
-		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
-			IntCmp $Bit 64 0 +2 +2
-			System::Call `${ENABLEREDIR}`
-		!else
-			StrCmpS $APP ${APP64} 0 +2
-			System::Call `${ENABLEREDIR}`
-		!endif
-	!endif
-FunctionEnd
-Function PreSecondary        
-	!ifdef SYSTEMWIDE_DISABLEREDIR
-		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
-			IntCmp $Bit 64 0 +2 +2
-			System::Call `${DISABLEREDIR}`
-		!else
-			StrCmpS $APP ${APP64} 0 +2
-			System::Call `${DISABLEREDIR}`
-		!endif
-	!endif
-	${RunSegment} Custom
-	;${RunSegment} *
-	!ifdef SYSTEMWIDE_DISABLEREDIR
-		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
-			IntCmp $Bit 64 0 +2 +2
-			System::Call `${ENABLEREDIR}`
-		!else
-			StrCmpS $APP ${APP64} 0 +2
-			System::Call `${ENABLEREDIR}`
-		!endif
-	!endif
-FunctionEnd
-Function PreExec        
-	!ifdef SYSTEMWIDE_DISABLEREDIR
-		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
-			IntCmp $Bit 64 0 +2 +2
-			System::Call `${DISABLEREDIR}`
-		!else
-			StrCmpS $APP ${APP64} 0 +2
-			System::Call `${DISABLEREDIR}`
-		!endif
-	!endif
-	${RunSegment} Custom
-	${If} ${PrimaryInstance}
-		!ifdef REGISTERDLL
-			${RunSegment} RegisterDLL
-		!endif
-	${EndIf}
-	${RunSegment} RefreshShellIcons
-	${RunSegment} WorkingDirectory
-	${RunSegment} RunBeforeAfter
-	${If} $Admin == true
-		${ImportCertPreExec}
-	${EndIf}
-	!ifdef SYSTEMWIDE_DISABLEREDIR
-		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
-			IntCmp $Bit 64 0 +2 +2
-			System::Call `${ENABLEREDIR}`
-		!else
-			StrCmpS $APP ${APP64} 0 +2
-			System::Call `${ENABLEREDIR}`
-		!endif
-	!endif
-FunctionEnd
-Function PreExecPrimary        
-	!ifdef SYSTEMWIDE_DISABLEREDIR
-		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
-			IntCmp $Bit 64 0 +2 +2
-			System::Call `${DISABLEREDIR}`
-		!else
-			StrCmpS $APP ${APP64} 0 +2
-			System::Call `${DISABLEREDIR}`
-		!endif
-	!endif
-	${RunSegment} Custom
-	${RunSegment} Core
-	;${RunSegment} LastRunEnvironment
-	;${RunSegment} SplashScreen
-	!ifdef SYSTEMWIDE_DISABLEREDIR
-		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
-			IntCmp $Bit 64 0 +2 +2
-			System::Call `${ENABLEREDIR}`
-		!else
-			StrCmpS $APP ${APP64} 0 +2
-			System::Call `${ENABLEREDIR}`
-		!endif
-	!endif
-FunctionEnd
-Function PreExecSecondary        
-	!ifdef SYSTEMWIDE_DISABLEREDIR
-		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
-			IntCmp $Bit 64 0 +2 +2
-			System::Call `${DISABLEREDIR}`
-		!else
-			StrCmpS $APP ${APP64} 0 +2
-			System::Call `${DISABLEREDIR}`
-		!endif
-	!endif
-	${RunSegment} Custom
-	;${RunSegment} *
-	!ifdef SYSTEMWIDE_DISABLEREDIR
-		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
-			IntCmp $Bit 64 0 +2 +2
-			System::Call `${ENABLEREDIR}`
-		!else
-			StrCmpS $APP ${APP64} 0 +2
-			System::Call `${ENABLEREDIR}`
-		!endif
-	!endif
-FunctionEnd
-Function Execute
-	!ifdef SYSTEMWIDE_DISABLEREDIR
-		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
-			IntCmp $Bit 64 0 +2 +2
-			System::Call `${DISABLEREDIR}`
-		!else
-			StrCmpS $APP ${APP64} 0 +2
-			System::Call `${DISABLEREDIR}`
-		!endif
-	!endif
-	!ifmacrodef OverrideExecuteFunction
-		!insertmacro OverrideExecuteFunction
-	!else
-		!ifmacrodef PreExecExecute
-			!insertmacro PreExecExecute
-		!endif
-		${EmptyWorkingSet}
-		ClearErrors
-		${ReadLauncherConfig} $0 Launch HideCommandLineWindow
-		${If} $0 == true
-			StrCpy $ExecString "$ExecString $Parameters"
-			ExecDos::exec /TOSTACK $ExecString
-			Pop $0
-		${Else}
-			${IfNot} ${Errors}
-			${AndIf} $0 != false
-				${InvalidValueError} [Launch]:HideCommandLineWindow $0
-			${EndIf}
-			${If} $WaitForProgram != false
-				!ifdef ExecAsUser
-					${ConfigReads} `${CONFIG}` ExecAsAdmin= $0
-					${If} $0 == true
-						StrCpy $ExecString "$ExecString $Parameters"
-						ExecWait $ExecString
-					${Else}
-						${StdUtils.ExecShellAsUser} $0 "$ExecString" "" "$Parameters"
-						${EmptyWorkingSet}
-						Sleep 1000
-						${GetFileName} $ProgramExecutable $1
-						${EmptyWorkingSet}
-						${Do}
-							${ProcessWaitClose} $1 -1 $R9
-							${IfThen} $R9 > 0 ${|} ${Continue} ${|}
-						${LoopWhile} $R9 > 0
-					${EndIf}
-				!else
-					ExecWait $ExecString
-				!endif
-			${Else}
-				!ifdef ExecAsUser
-					${StdUtils.ExecShellAsUser} $0 "$ExecString" "" "$Parameters"
-				!else
-					Exec $ExecString
-				!endif
-			${EndIf}
-		${EndIf}
-		!ifmacrodef PostExecWaitCommand
-			!insertmacro PostExecWaitCommand
-		!endif
-		${If} $WaitForProgram != false
-			ClearErrors
-			${ReadLauncherConfig} $0 Launch WaitForOtherInstances
-			${If} $0 == true
-			${OrIf} ${Errors}
-				${GetFileName} $ProgramExecutable $1
-				${EmptyWorkingSet}
-				${Do}
-					!ifdef Sleep
-						Sleep ${Sleep}
-					!endif
-					${ProcessWaitClose} $1 -1 $R9
-					${IfThen} $R9 > 0 ${|} ${Continue} ${|}
-					StrCpy $0 1
-					${Do}
-						!ifdef Sleep
-							Sleep ${Sleep}
-						!endif
-						ClearErrors
-						${ConfigReadS} `${LAUNCHER}` WaitForEXE$0= $2
-						${IfThen} ${Errors} ${|} ${ExitDo} ${|}
-						ExpandEnvStrings $2 $2
-						${ProcessWaitClose} $2 -1 $R9
-						${IfThen} $R9 > 0 ${|} ${ExitDo} ${|}
-						IntOp $0 $0 + 1
-					${Loop}
-				${LoopWhile} $R9 > 0
-			${ElseIf} $0 != false
-				${InvalidValueError} [Launch]:WaitForOtherInstances $0
-			${EndIf}
-		${EndIf}
-	!endif
-	!ifdef SYSTEMWIDE_DISABLEREDIR
-		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
-			IntCmp $Bit 64 0 +2 +2
-			System::Call `${ENABLEREDIR}`
-		!else
-			StrCmpS $APP ${APP64} 0 +2
-			System::Call `${ENABLEREDIR}`
-		!endif
-	!endif
-FunctionEnd
-Function PostExecPrimary
-	${RunSegment} Custom
-FunctionEnd
-Function PostExecSecondary
-	${RunSegment} Custom
-FunctionEnd
-Function PostExec       
-	${RunSegment} RunBeforeAfter
-	${RunSegment} Custom
-FunctionEnd
-Function PostPrimary        
-	!ifdef SYSTEMWIDE_DISABLEREDIR
-		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
-			IntCmp $Bit 64 0 +2 +2
-			System::Call `${DISABLEREDIR}`
-		!else
-			StrCmpS $APP ${APP64} 0 +2
-			System::Call `${DISABLEREDIR}`
-		!endif
-	!endif
-	${If} ${PrimaryInstance}
-		!ifdef REGISTERDLL
-			${RunSegment} RegisterDLL
-		!endif
-		!ifdef SERVICES
-			${RunSegment} Services
-		!endif
-		!ifdef TaskCleanup
-			${RunSegment} TaskCleanUp
-		!endif
-	${EndIf}
-	!ifdef REGISTRY
-		${RunSegment} RegistryValueBackupDelete
-		${If} ${PrimaryInstance}
-			!ifdef RegCopy
-				${RunSegment} RegistryCopyKeys
-			!endif
-		${EndIf}
-		${RunSegment} RegistryKeys
-		${RunSegment} RegistryCleanup
-	!endif
-	${If} ${PrimaryInstance}
-		${RunSegment} Qt
-		!ifdef FileCleanup
-			${RunSegment} FilesCleanup
-		!endif
-	${EndIf}
-	!ifdef DirectoryCleanup
-		${RunSegment} DirectoriesCleanup
-	!endif
-	${RunSegment} DirectoriesMove
-	${RunSegment} FilesMove
-	${RunSegment} RunLocally
-	${RunSegment} Temp
-	${RunSegment} Custom
-	!ifdef SYSTEMWIDE_DISABLEREDIR
-		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
-			IntCmp $Bit 64 0 +2 +2
-			System::Call `${ENABLEREDIR}`
-		!else
-			StrCmpS $APP ${APP64} 0 +2
-			System::Call `${ENABLEREDIR}`
-		!endif
-	!endif
-FunctionEnd
-Function PostSecondary        
-	!ifdef SYSTEMWIDE_DISABLEREDIR
-		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
-			IntCmp $Bit 64 0 +2 +2
-			System::Call `${DISABLEREDIR}`
-		!else
-			StrCmpS $APP ${APP64} 0 +2
-			System::Call `${DISABLEREDIR}`
-		!endif
-	!endif
-	;${RunSegment} *
-	${RunSegment} Custom
-	!ifdef SYSTEMWIDE_DISABLEREDIR
-		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
-			IntCmp $Bit 64 0 +2 +2
-			System::Call `${ENABLEREDIR}`
-		!else
-			StrCmpS $APP ${APP64} 0 +2
-			System::Call `${ENABLEREDIR}`
-		!endif
-	!endif
-FunctionEnd
-Function Post        
-	!ifdef SYSTEMWIDE_DISABLEREDIR
-		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
-			IntCmp $Bit 64 0 +2 +2
-			System::Call `${DISABLEREDIR}`
-		!else
-			StrCmpS $APP ${APP64} 0 +2
-			System::Call `${DISABLEREDIR}`
-		!endif
-	!endif
-	!ifdef GHOSTSCRIPT
-		${RunSegment} Ghostscript
-	!endif
-	${RunSegment} RefreshShellIcons
-	${RunSegment} Custom
-	!ifdef SYSTEMWIDE_DISABLEREDIR
-		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
-			IntCmp $Bit 64 0 +2 +2
-			System::Call `${ENABLEREDIR}`
-		!else
-			StrCmpS $APP ${APP64} 0 +2
-			System::Call `${ENABLEREDIR}`
-		!endif
-	!endif
-FunctionEnd
-Function Unload        
-	!ifdef SYSTEMWIDE_DISABLEREDIR
-		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
-			IntCmp $Bit 64 0 +2 +2
-			System::Call `${DISABLEREDIR}`
-		!else
-			StrCmpS $APP ${APP64} 0 +2
-			System::Call `${DISABLEREDIR}`
-		!endif
-	!endif
-	;${RunSegment} XML
-	${If} ${PrimaryInstance}
-		!ifdef REGISTERDLL
-			${RunSegment} RegisterDLL
-		!endif
-		!ifdef SERVICES
-			${RunSegment} Services
-		!endif
-		!ifdef FONTS_ENABLE
-			${RunSegment} Fonts
-		!endif
-		!ifdef FileCleanup
-			${RunSegment} FilesCleanup
-		!endif
-		!ifdef DirectoryCleanup
-			${RunSegment} DirectoriesCleanup
-		!endif
-	${EndIf}
-	;${RunSegment} SplashScreen
-	${RunSegment} Core
-	${RunSegment} Custom
-	!ifdef SYSTEMWIDE_DISABLEREDIR
-		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
-			IntCmp $Bit 64 0 +2 +2
-			System::Call `${ENABLEREDIR}`
-		!else
-			StrCmpS $APP ${APP64} 0 +2
-			System::Call `${ENABLEREDIR}`
-		!endif
-	!endif
-FunctionEnd
-!define CallPS `!insertmacro CallPS`
-!macro CallPS _func _rev
-	!if ${_rev} == +
-		Call ${_func}
-	!endif
-	${If} ${SecondInstance}
-		Call ${_func}Secondary
-	${Else}
-		Call ${_func}Primary
-	${EndIf}
-	!if ${_rev} != +
-		Call ${_func}
-	!endif
-!macroend
-Section        
-	!ifdef SYSTEMWIDE_DISABLEREDIR
-		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
-			IntCmp $Bit 64 0 +2 +2
-			System::Call `${DISABLEREDIR}`
-		!else
-			StrCmpS $APP ${APP64} 0 +2
-			System::Call `${DISABLEREDIR}`
-		!endif
-	!endif
-	Call Init
-	System::Call 'Kernel32::OpenMutex(i1048576, b0, t"${PAC}${APPNAME}-${APPNAME}::Starting") i.R0 ?e'
-	System::Call 'Kernel32::CloseHandle(iR0)'
-	Pop $R9
-	${If} $R9 <> 2
-		MessageBox MB_ICONSTOP $(LauncherAlreadyStarting)
-		Quit
-	${EndIf}
-	System::Call 'Kernel32::OpenMutex(i1048576, i0, t"${PAC}${APPNAME}-${APPNAME}::Stopping") i.R0 ?e'
-	System::Call 'Kernel32::CloseHandle(iR0)'
-	Pop $R9
-	${If} $R9 <> 2
-		MessageBox MB_ICONSTOP $(LauncherAlreadyStopping)
-		Quit
-	${EndIf}
-	${IfNot} ${FileExists} `${RUNTIME}`
-	${OrIf} ${SecondInstance}
-		${If} ${PrimaryInstance}
-			System::Call 'Kernel32::CreateMutex(i0, i0, t"${PAC}${APPNAME}-${APPNAME}::Starting") i.r0'
-			StrCpy $StatusMutex $0
-		${EndIf}
-		${CallPS} Pre +
-		${CallPS} PreExec +
-		${If} ${PrimaryInstance}
-			StrCpy $0 $StatusMutex
-			System::Call 'Kernel32::CloseHandle(ir0) ?e'
-			Pop $R9
-		${EndIf}
-		Call Execute
-	${Else}
-		MessageBox MB_ICONSTOP $(LauncherCrashCleanup)
-	${EndIf}
-	${If} ${PrimaryInstance}
-		System::Call 'Kernel32::CreateMutex(i0, i0, t"${PAC}${APPNAME}-${APPNAME}::Stopping")'
-	${EndIf}
-	${If} $WaitForProgram != false
-		${CallPS} Post -
-	${EndIf}
-	Call Unload
-	!ifdef SYSTEMWIDE_DISABLEREDIR
-		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
-			IntCmp $Bit 64 0 +2 +2
-			System::Call `${ENABLEREDIR}`
-		!else
-			StrCmpS $APP ${APP64} 0 +2
-			System::Call `${ENABLEREDIR}`
-		!endif
-	!endif
-SectionEnd
-Function .onInstFailed        
-	Call Unload
-FunctionEnd
+;=#
+;
+; PORTABLEAPPS COMPILER
+; Developed by daemon.devin
+;
+; For support visit the GitHub project:
+; https://github.com/demondevin/pac-man
+;
+; PortableAppsCompiler.nsi
+; Based on the coding practices of John T. Haller, Chris Morgan, FukenGruven, and Azure Zanculmarktum
+;
+
+!verbose 3
+
+;= PACKAGE
+;= ################
+!ifndef PACKAGE
+	!define PACKAGE ..\..
+!endif
+
+;= ECHO MACRO
+;= ################
+!macro !ECHO _MSG
+	!verbose push
+	!verbose 4
+	!echo "${_MSG}"
+	!verbose pop
+!macroend
+!define !ECHO "!insertmacro !ECHO"
+!define NEWLINE	`$\r$\n`
+
+;= NSIS VERSION
+;= ################
+!include RequireLatestNSIS.nsh
+
+;= PAC VERSION
+;= ################
+!include Version.nsh
+${!ECHO} "${NEWLINE}PORTABLEAPPS COMPILER${NEWLINE}Developed by daemon.devin${NEWLINE}Version: ${PACVER}${NEWLINE}${NEWLINE}"
+
+;= DEFINITIONS
+;= ################
+${!ECHO} "${NEWLINE}Reading/Writing Package Definitions...${NEWLINE}${NEWLINE}"
+!include PortableAppsCompilerDefines.nsh
+!define APPINFO			`$EXEDIR\app\AppInfo`
+!define INFOINI			`${APPINFO}\appinfo.ini`
+!define BIN				`$EXEDIR\bin`
+!define SET				`${BIN}\Settings`
+!define CONF			`${BIN}\Settings\Config`
+!define DEFSET			`$EXEDIR\app\DefaultSettings`
+!define DEFCONF			`${DEFSET}\Config`
+!define WRAPPER			`${APPINFO}\CompilerWrapper.ini`
+!define WRAPPER2		`$PLUGINSDIR\wrapper.ini`
+!define RUNTIME         `${BIN}\PortableAppsCompilerRuntimeData-${APPNAME}.ini`
+!define RUNTIME2        `$PLUGINSDIR\runtimedata.ini`
+!define CONFIGINI		`${CONF}\${APPNAME}Settings.ini`
+!define CONFIG			`$EXEDIR\${APPNAME}.ini`
+!define ETC				`$EXEDIR\etc`
+!define PrimaryInstance	`$SecondaryLaunch != true`
+!define SecondInstance	`$SecondaryLaunch == true`
+!define LCID			`kernel32::GetUserDefaultLangID()i .r0`
+!define GETSYSWOW64		`kernel32::GetSystemWow64Directory(t .r0, i ${NSIS_MAX_STRLEN})`
+!define DISABLEREDIR	`kernel32::Wow64EnableWow64FsRedirection(i0)`
+!define ENABLEREDIR		`kernel32::Wow64EnableWow64FsRedirection(i1)`
+!define GETCURRPROC		`kernel32::GetCurrentProcess()i.s`
+!define WOW				`kernel32::IsWow64Process(is,*i.r0)`
+!define PAC				PortableAppsCompiler
+!define /DATE YEAR		`%Y`
+
+;= RUNTIME SWITCHES
+;= ################
+Unicode true
+WindowIcon Off
+XPStyle on
+SilentInstall Silent
+AutoCloseWindow true
+!ifdef RUNASADMIN_COMPILEFORCE
+	RequestExecutionLevel admin
+!else ifdef UAC
+	RequestExecutionLevel admin
+!else
+	RequestExecutionLevel user
+!endif
+SetCompressor /SOLID lzma
+SetCompressorDictSize 32
+
+;= PAC MACROS
+;= ################
+!include PortableAppsCompilerMacros.nsh
+
+;= INCLUDES/PLUGINS
+;= ################
+${!ECHO} "${NEWLINE}Including required files and/or plugins...${NEWLINE}${NEWLINE}"
+;(Standard NSIS) {{{2
+!include LangFile.nsh
+!include LogicLib.nsh
+!include FileFunc.nsh
+!include TextFunc.nsh
+!include WordFunc.nsh
+!ifdef TLB_FUNCTION
+	!ifndef PLUGINSDIR
+		!define PLUGINSDIR
+		!AddPluginDir Plugins
+	!endif
+!endif
+!ifdef ExecAsUser
+	!include StdUtils.nsh
+	!ifndef PLUGINSDIR
+		!define PLUGINSDIR
+		!AddPluginDir Plugins
+	!endif
+!endif
+!ifdef REPLACE
+	!include NewTextReplace.nsh
+	!ifndef PLUGINSDIR
+		!define PLUGINSDIR
+		!AddPluginDir Plugins
+	!endif
+!endif
+!ifdef FIREWALL
+	!ifndef PLUGINSDIR
+		!define PLUGINSDIR
+		!AddPluginDir Plugins
+	!endif
+!endif
+!ifdef UAC
+	!ifndef PLUGINSDIR
+		!define PLUGINSDIR
+		!AddPluginDir Plugins
+	!endif
+!endif
+!ifdef WRITEREGBIN
+	!ifndef PLUGINSDIR
+		!define PLUGINSDIR
+		!AddPluginDir Plugins
+	!endif
+!endif
+!ifdef XML_PLUGIN
+	!include XML.nsh
+	!ifndef PLUGINSDIR
+		!define PLUGINSDIR
+		!AddPluginDir Plugins
+	!endif
+!endif
+!ifdef DOTNET
+	!include DotNetVer.nsh
+!endif
+!ifdef StdUtils
+	!ifndef ExecAsUser
+		!include StdUtils.nsh
+		!ifndef PLUGINSDIR
+			!define PLUGINSDIR
+			!AddPluginDir Plugins
+		!endif
+	!endif
+!endif
+!ifdef NSIS_REGISTRY
+	!include NSISRegistry.nsh
+	!insertmacro MOVEREGKEY
+!endif
+!ifdef JSON
+	!ifndef PLUGINSDIR
+		!define PLUGINSDIR
+		!AddPluginDir Plugins
+	!endif
+!endif
+!ifdef REGISTRY
+	!include Registry.nsh
+	!define REGEXE `$SYSDIR\reg.exe`
+	!define REGEDIT `$SYSDIR\regedit.exe`
+!endif
+!ifdef REPLACE
+	!include ReplaceInFileWithTextReplace.nsh
+!endif
+!include ForEachINIPair.nsh
+!include ForEachPath.nsh
+!include SetFileAttributesDirectoryNormal.nsh
+!include ProcFunc.nsh
+!include EmptyWorkingSet.nsh
+!include SetEnvironmentVariable.nsh
+!include LogicLibAdditions.nsh
+!ifdef GetBetween.nsh
+	!include GetBetween.nsh
+!endif
+!ifdef GetLocale.nsh
+	!include GetLocale.nsh
+!endif
+!ifdef 64.nsh
+	!include x64.nsh
+!endif
+!ifdef IsFileLocked
+	!ifndef 64.nsh
+		!include x64.nsh
+	!endif
+!endif
+!ifdef Include_LineWrite.nsh
+	!include LineWrite.nsh
+!endif
+!ifdef Include_WinMessages.nsh
+	!include WinMessages.nsh
+!endif
+!ifdef UAC
+	!include UAC.nsh
+	!ifndef TrimString
+		!define TrimString
+	!endif
+!endif
+!ifdef DIRECTORIES_MOVE
+	!ifndef GET_ROOT
+		!define GET_ROOT
+	!endif
+!endif
+
+;= LANGUAGES
+;= ################
+${!ECHO} "${NEWLINE}Loading language strings...${NEWLINE}${NEWLINE}"
+!verbose push
+!verbose 1
+!include Languages.nsh
+!verbose pop
+
+;= VARIABLES
+;= ################
+${!ECHO} "${NEWLINE}Initialising variables and macros...${NEWLINE}${NEWLINE}"
+Var Bit
+Var Admin
+Var AppID
+Var BaseName
+Var MissingFileOrPath
+Var AppName
+Var AppNamePortable
+Var ProgramExecutable
+Var StatusMutex
+Var WaitForProgram
+!ifdef REGISTRY
+	Var Registry
+!endif
+!ifdef UAC
+	Var RunAsAdmin
+!endif
+!ifdef DOTNET
+	Var DotNETVersion
+!endif
+!ifdef JAVA
+	Var UsingJavaExecutable
+	Var JavaMode
+	Var JavaDirectory
+!endif
+
+;= SEGMENTS
+;= ################
+${!ECHO} "${NEWLINE}Loading Segments...${NEWLINE}${NEWLINE}"
+!include Segments.nsh
+
+;= DEBUGGING
+;= ################
+!include Debug.nsh
+
+;= PACKAGE DETAILS
+;= ################
+${!ECHO}	`${NewLine}Writing wrapper's detail specifications...${NewLine}${NewLine}`
+Name		`${PORTABLEAPPNAME}`
+OutFile		`${PACKAGE}\${APPNAME}.exe`
+Icon		`${PACKAGE}\app\AppInfo\AppIcon.ico`
+Caption		`${FULLNAME}`
+VIProductVersion	${PACKAGE_VERSION}
+VIAddVersionKey /LANG=${LANG_ENGLISH} FileVersion      ${PACKAGE_VERSION}
+VIAddVersionKey /LANG=${LANG_ENGLISH} CompanyName      `${PUBLISHER}`
+VIAddVersionKey /LANG=${LANG_ENGLISH} LegalCopyright   `Copyright ${YEAR} ${PUBLISHER}`
+VIAddVersionKey /LANG=${LANG_ENGLISH} InternalName     `${APPNAME}Portable.exe`
+VIAddVersionKey /LANG=${LANG_ENGLISH} OriginalFilename `${APPNAME}.exe`
+VIAddVersionKey /LANG=${LANG_ENGLISH} ProductName      `${FULLNAME}`
+VIAddVersionKey /LANG=${LANG_ENGLISH} FileDescription  `${FULLNAME}`
+VIAddVersionKey /LANG=${LANG_ENGLISH} ProductVersion   Portable
+!ifdef DEVELOPER
+	!ifdef CONTRIBUTORS
+		VIAddVersionKey /LANG=${LANG_ENGLISH} Comments	`Developed by ${DEVELOPER} (with help from ${CONTRIBUTORS})`
+	!else
+		VIAddVersionKey /LANG=${LANG_ENGLISH} Comments	`Developed by ${DEVELOPER}`
+	!endif
+!endif
+!ifdef TRADEMARK
+	VIAddVersionKey /LANG=${LANG_ENGLISH} LegalTrademarks  `${TRADEMARK}`
+!endif
+
+;= CODE SIGNING
+;= ################
+!ifdef Certificate
+	${!ECHO}	`${NewLine} Grabbing the certificate and other information then signing ${OUTFILE}...${NewLine}${NewLine}`
+	;=== Signing Macro
+	!define Finalize::Sign  `!insertmacro _Finalize::Sign`
+	!macro _Finalize::Sign _CMD
+		!finalize `${_CMD}`
+	!macroend
+	!define Timestamp
+	!define TimestampSHA256
+	!ifdef CertTimestamp
+		!if "${CertTimestamp}" == "Comodo"
+			!define /REDEF Timestamp "http://timestamp.comodoca.com"
+			!define /REDEF TimestampSHA256 "http://timestamp.comodoca.com/?td=sha256"
+		!else if "${CertTimestamp}" == "Verisign"
+			!define /REDEF Timestamp "http://timestamp.verisign.com/scripts/timstamp.dll"
+			!define /REDEF TimestampSHA256 "http://sha256timestamp.ws.symantec.com/sha256/timestamp"
+		!else if "${CertTimestamp}" == "GlobalSign"
+			!define /REDEF Timestamp "http://timestamp.globalsign.com/scripts/timstamp.dll"
+			!define /REDEF TimestampSHA256 "http://timestamp.globalsign.com/?signature=sha2"
+		!else if "${CertTimestamp}" == "DigiCert"
+			!define /REDEF Timestamp "http://timestamp.digicert.com"
+			!define /REDEF TimestampSHA256 "http://timestamp.digicert.com"
+		!else if "${CertTimestamp}" == "Starfield"
+			!define /REDEF Timestamp "http://tsa.starfieldtech.com"
+			!define /REDEF TimestampSHA256 "http://tsa.starfieldtech.com"
+		!else if "${CertTimestamp}" == "SwissSign"
+			!define /REDEF Timestamp "http://tsa.swisssign.net"
+			!define /REDEF TimestampSHA256 "http://tsa.swisssign.net"
+		!else
+			!define /REDEF Timestamp "http://timestamp.comodoca.com"
+			!define /REDEF TimestampSHA256 "http://timestamp.comodoca.com/?td=sha256"
+		!endif
+	!else
+		!define /REDEF Timestamp "http://timestamp.comodoca.com"
+		!define /REDEF TimestampSHA256 "http://timestamp.comodoca.com/?td=sha256"
+	!endif
+	!define CERT		`Contrib\certificates\${DEVELOPER}.${CertExtension}`
+	!define SIGN		`Contrib\bin\signtool.exe`
+	!define SHA1		`"${SIGN}" sign /f "${CERT}" /p "" /t "${Timestamp}" /v "${PACKAGE}\${OUTFILE}"`
+	!define SHA256		`"${SIGN}" sign /f "${CERT}" /p "" /fd sha256 /tr "${TimestampSHA256}" /td sha256 /as /v "${PACKAGE}\${OUTFILE}"`
+	;=== Sign
+	${Finalize::Sign}	`${SHA1}`
+	${Finalize::Sign}	`${SHA256}`
+!endif
+
+!verbose 4
+
+;= FUNCTIONS
+;= ################
+;=# Check 64-bit
+Function IsWOW64
+	!macro _WOW64 _RETURN
+		Push ${_RETURN}
+		Call IsWOW64
+		Pop ${_RETURN}
+	!macroend
+	!define WOW64 `!insertmacro _WOW64`
+	Exch $0
+	System::Call `${GETCURRPROC}`
+	System::Call `${WOW}`
+	Exch $0
+FunctionEnd
+;=# Prevent Shutdown
+!include nsDialogs.nsh
+!define /ifndef WS_POPUP 0x80000000
+!define CreateWinEx1		`USER32::CreateWindowEx(i0,t"STATIC",t"$(^Name)",`
+!define CreateWinEx2		`i${WS_CHILD}|${WS_POPUP},i0,i0,i0,i0,pr1,i0,i0,i0)p.r1`
+!define BlockReason1		`USER32::ShutdownBlockReasonCreate(pr1,w`
+!define BlockReason2		`"${PORTABLEAPPNAME} is running and still needs to clean up before shutting down!")`
+Function CreateShutdownBlockReason
+	StrCpy $1 $hwndParent
+	${If} $1 Z= 0
+		System::Call `${CreateWinEx1}${CreateWinEx2}`
+	${EndIf}
+	System::Call `${BlockReason1}${BlockReason2}`
+FunctionEnd
+;=# Fonts Folder
+!ifdef FONTS_ENABLED
+	Function CreateFontsFolder
+		IfFileExists "${PACKAGE}\App\DefaultSettings\Fonts" +2
+		CreateDirectory /SILENT "${PACKAGE}\App\DefaultSettings\Fonts"
+		IfFileExists "${PACKAGE}\App\DefaultSettings\Fonts\.Portable.Fonts.txt" +11
+		!tempfile FONTFILE
+		!appendfile "${FONTFILE}" "Font(s) added here will be loaded on launch and accessible during runtime.$\n$\n"
+		!appendfile "${FONTFILE}" "NOTE:$\n"
+		!appendfile "${FONTFILE}" "$\tThe wrapper will have to load and unload any fonts in this directory.$\n"
+		!appendfile "${FONTFILE}" "$\tThe more fonts you have will mean a longer work load for the wrapper.$\n$\n"
+		!appendfile "${FONTFILE}" "Fonts Supported:$\n"
+		!appendfile "${FONTFILE}" " • .fon$\n • .fnt$\n • .ttf$\n • .ttc$\n • .fot$\n • .otf$\n • .mmm$\n • .pfb$\n • .pfm$\n"
+		!system 'copy /Y /A "${FONTFILE}" "${PACKAGE}\App\DefaultSettings\Fonts\.Portable.Fonts.txt" /A'
+		!delfile "${FONTFILE}"
+		!undef FONTFILE
+	FunctionEnd
+!endif
+Function .onInit
+	Call CreateShutdownBlockReason
+	Push $0
+	!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
+		!ifndef SYSTEMWIDE_DISABLEREDIR
+			!define SYSTEMWIDE_DISABLEREDIR
+		!endif
+	!endif
+	System::Call `kernel32::GetModuleHandle(t 'shell32.dll') i .s`
+	System::Call `kernel32::GetProcAddress(i s, i 680) i .r0`
+	System::Call `::$0() i .r0`
+	StrCmpS $0 1 "" +2
+	StrCpy $Admin true
+	System::Call `${GETCURRPROC}`
+	System::Call `${WOW}`
+	StrCmpS $0 0 +3
+	StrCpy $Bit 64
+	Goto +2
+	StrCpy $Bit 32
+	!ifdef SYSTEMWIDE_DISABLEREDIR
+		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
+			IntCmp $Bit 64 0 +2 +2
+			System::Call `${DISABLEREDIR}`
+		!else
+			StrCmpS $APP ${APP64} 0 +2
+			System::Call `${DISABLEREDIR}`
+		!endif
+	!endif
+	${RunSegment} Core
+	${RunSegment} Custom
+	${RunSegment} Temp
+	${RunSegment} Language
+	${RunSegment} OperatingSystem
+	!ifdef UAC
+		${RunSegment} RunAsAdmin
+	!endif
+	!ifdef SYSTEMWIDE_DISABLEREDIR
+		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
+			IntCmp $Bit 64 0 +2 +2
+			System::Call `${ENABLEREDIR}`
+		!else
+			StrCmpS $APP ${APP64} 0 +2
+			System::Call `${ENABLEREDIR}`
+		!endif
+	!endif
+	Pop $0
+FunctionEnd
+Function Init
+	!ifdef SYSTEMWIDE_DISABLEREDIR
+		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
+			IntCmp $Bit 64 0 +2 +2
+			System::Call `${DISABLEREDIR}`
+		!else
+			StrCmpS $APP ${APP64} 0 +2
+			System::Call `${DISABLEREDIR}`
+		!endif
+	!endif
+	!ifdef FONTS_ENABLED
+		Call CreateFontsFolder
+	!endif
+	${If} ${PrimaryInstance}
+		${RunSegment} Language
+		${RunSegment} Environment
+		${RunSegment} Custom
+	${EndIf}
+	${RunSegment} Core
+	${If} ${PrimaryInstance}
+		${RunSegment} PathChecks
+		${RunSegment} DriveLetter
+	${EndIf}
+	${RunSegment} DirectoryMoving
+	${RunSegment} Variables
+	!ifdef JAVA
+		${RunSegment} Java
+	!endif
+	!ifdef DOTNET
+		${RunSegment} DotNet
+	!endif
+	!ifdef GHOSTSCRIPT
+		${RunSegment} Ghostscript
+	!endif
+	${RunSegment} RunLocally
+	${If} ${PrimaryInstance}
+		${RunSegment} Temp
+	${EndIf}
+	${RunSegment} InstanceManagement
+	${If} ${PrimaryInstance}
+		${RunSegment} Settings
+	${EndIf}
+	!ifdef SYSTEMWIDE_DISABLEREDIR
+		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
+			IntCmp $Bit 64 0 +2 +2
+			System::Call `${ENABLEREDIR}`
+		!else
+			StrCmpS $APP ${APP64} 0 +2
+			System::Call `${ENABLEREDIR}`
+		!endif
+	!endif
+FunctionEnd
+Function Pre
+	!ifdef SYSTEMWIDE_DISABLEREDIR
+		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
+			IntCmp $Bit 64 0 +2 +2
+			System::Call `${DISABLEREDIR}`
+		!else
+			StrCmpS $APP ${APP64} 0 +2
+			System::Call `${DISABLEREDIR}`
+		!endif
+	!endif
+	${If} ${PrimaryInstance}
+		!ifdef SERVICES
+			${RunSegment} Services
+		!endif
+		!ifdef REGISTERDLL
+			${RunSegment} RegisterDLL
+		!endif
+	${EndIf}
+	!ifdef REGISTRY
+		${RunSegment} Registry
+	!endif
+	${RunSegment} Custom
+	${RunSegment} RunLocally
+	${RunSegment} Temp
+	;${RunSegment} LastRunEnvironment
+	${RunSegment} Environment
+	${RunSegment} ExecString
+	!ifdef SYSTEMWIDE_DISABLEREDIR
+		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
+			IntCmp $Bit 64 0 +2 +2
+			System::Call `${ENABLEREDIR}`
+		!else
+			StrCmpS $APP ${APP64} 0 +2
+			System::Call `${ENABLEREDIR}`
+		!endif
+	!endif
+FunctionEnd
+Function PrePrimary        
+	!ifdef SYSTEMWIDE_DISABLEREDIR
+		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
+			IntCmp $Bit 64 0 +2 +2
+			System::Call `${DISABLEREDIR}`
+		!else
+			StrCmpS $APP ${APP64} 0 +2
+			System::Call `${DISABLEREDIR}`
+		!endif
+	!endif
+	${If} ${PrimaryInstance}
+		!ifdef FileCleanup
+			${RunSegment} FilesCleanup
+		!endif
+	${EndIf}
+	${RunSegment} Custom
+	${RunSegment} DriveLetter
+	${RunSegment} Variables
+	${RunSegment} DirectoryMoving
+	;${RunSegment} LastRunEnvironment
+	${RunSegment} FileWrite
+	${RunSegment} FilesMove
+	${RunSegment} DirectoriesMove
+	!ifdef REGISTRY
+		${RunSegment} RegistryKeys
+		!ifdef RegCopy
+			${If} ${PrimaryInstance}
+				${RunSegment} RegistryCopyKeys
+			${EndIf}
+		!endif
+		${RunSegment} RegistryValueBackupDelete
+	!endif
+	${If} ${PrimaryInstance}
+		!ifdef REGISTERDLL
+			${RunSegment} RegisterDLL
+		!endif
+	${EndIf}
+	!ifdef REGISTRY
+		;=== this belongs here after Registering DLLs.
+		${RunSegment} RegistryValueWrite
+	!endif
+	${If} ${PrimaryInstance}
+		!ifdef SERVICES
+			${RunSegment} Services
+		!endif
+		!ifdef TaskCleanup
+			${RunSegment} TaskCleanUp
+		!endif
+		!ifdef FONTS_ENABLE
+			${RunSegment} Fonts
+		!endif
+	${EndIf}
+	!ifdef SYSTEMWIDE_DISABLEREDIR
+		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
+			IntCmp $Bit 64 0 +2 +2
+			System::Call `${ENABLEREDIR}`
+		!else
+			StrCmpS $APP ${APP64} 0 +2
+			System::Call `${ENABLEREDIR}`
+		!endif
+	!endif
+FunctionEnd
+Function PreSecondary        
+	!ifdef SYSTEMWIDE_DISABLEREDIR
+		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
+			IntCmp $Bit 64 0 +2 +2
+			System::Call `${DISABLEREDIR}`
+		!else
+			StrCmpS $APP ${APP64} 0 +2
+			System::Call `${DISABLEREDIR}`
+		!endif
+	!endif
+	${RunSegment} Custom
+	;${RunSegment} *
+	!ifdef SYSTEMWIDE_DISABLEREDIR
+		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
+			IntCmp $Bit 64 0 +2 +2
+			System::Call `${ENABLEREDIR}`
+		!else
+			StrCmpS $APP ${APP64} 0 +2
+			System::Call `${ENABLEREDIR}`
+		!endif
+	!endif
+FunctionEnd
+Function PreExec        
+	!ifdef SYSTEMWIDE_DISABLEREDIR
+		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
+			IntCmp $Bit 64 0 +2 +2
+			System::Call `${DISABLEREDIR}`
+		!else
+			StrCmpS $APP ${APP64} 0 +2
+			System::Call `${DISABLEREDIR}`
+		!endif
+	!endif
+	${RunSegment} Custom
+	${If} ${PrimaryInstance}
+		!ifdef REGISTERDLL
+			${RunSegment} RegisterDLL
+		!endif
+	${EndIf}
+	${RunSegment} RefreshShellIcons
+	${RunSegment} WorkingDirectory
+	${RunSegment} RunBeforeAfter
+	!ifdef SYSTEMWIDE_DISABLEREDIR
+		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
+			IntCmp $Bit 64 0 +2 +2
+			System::Call `${ENABLEREDIR}`
+		!else
+			StrCmpS $APP ${APP64} 0 +2
+			System::Call `${ENABLEREDIR}`
+		!endif
+	!endif
+FunctionEnd
+Function PreExecPrimary        
+	!ifdef SYSTEMWIDE_DISABLEREDIR
+		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
+			IntCmp $Bit 64 0 +2 +2
+			System::Call `${DISABLEREDIR}`
+		!else
+			StrCmpS $APP ${APP64} 0 +2
+			System::Call `${DISABLEREDIR}`
+		!endif
+	!endif
+	${RunSegment} Custom
+	${RunSegment} Core
+	;${RunSegment} LastRunEnvironment
+	!ifdef SYSTEMWIDE_DISABLEREDIR
+		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
+			IntCmp $Bit 64 0 +2 +2
+			System::Call `${ENABLEREDIR}`
+		!else
+			StrCmpS $APP ${APP64} 0 +2
+			System::Call `${ENABLEREDIR}`
+		!endif
+	!endif
+FunctionEnd
+Function PreExecSecondary        
+	!ifdef SYSTEMWIDE_DISABLEREDIR
+		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
+			IntCmp $Bit 64 0 +2 +2
+			System::Call `${DISABLEREDIR}`
+		!else
+			StrCmpS $APP ${APP64} 0 +2
+			System::Call `${DISABLEREDIR}`
+		!endif
+	!endif
+	${RunSegment} Custom
+	;${RunSegment} *
+	!ifdef SYSTEMWIDE_DISABLEREDIR
+		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
+			IntCmp $Bit 64 0 +2 +2
+			System::Call `${ENABLEREDIR}`
+		!else
+			StrCmpS $APP ${APP64} 0 +2
+			System::Call `${ENABLEREDIR}`
+		!endif
+	!endif
+FunctionEnd
+Function Execute
+	!ifdef SYSTEMWIDE_DISABLEREDIR
+		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
+			IntCmp $Bit 64 0 +2 +2
+			System::Call `${DISABLEREDIR}`
+		!else
+			StrCmpS $APP ${APP64} 0 +2
+			System::Call `${DISABLEREDIR}`
+		!endif
+	!endif
+	!ifmacrodef OverrideExecuteFunction
+		!insertmacro OverrideExecuteFunction
+	!else
+		!ifmacrodef PreExecExecute
+			!insertmacro PreExecExecute
+		!endif
+		${EmptyWorkingSet}
+		ClearErrors
+		${ReadWrapperConfig} $0 Launch HideCommandLineWindow
+		${If} $0 == true
+			StrCpy $ExecString "$ExecString $Parameters"
+			ExecDos::exec /TOSTACK $ExecString
+			Pop $0
+		${Else}
+			${IfNot} ${Errors}
+			${AndIf} $0 != false
+				${InvalidValueError} [Launch]:HideCommandLineWindow $0
+			${EndIf}
+			${If} $WaitForProgram != false
+				!ifdef ExecAsUser
+					${ConfigReads} `${CONFIG}` ExecAsAdmin= $0
+					${If} $0 == true
+						StrCpy $ExecString "$ExecString $Parameters"
+						ExecWait $ExecString
+					${Else}
+						${StdUtils.ExecShellAsUser} $0 "$ExecString" "" "$Parameters"
+						${EmptyWorkingSet}
+						Sleep 1000
+						${GetFileName} $ProgramExecutable $1
+						${EmptyWorkingSet}
+						${Do}
+							${ProcessWaitClose} $1 -1 $R9
+							${IfThen} $R9 > 0 ${|} ${Continue} ${|}
+						${LoopWhile} $R9 > 0
+					${EndIf}
+				!else
+					ExecWait $ExecString
+				!endif
+			${Else}
+				!ifdef ExecAsUser
+					${StdUtils.ExecShellAsUser} $0 "$ExecString" "" "$Parameters"
+				!else
+					Exec $ExecString
+				!endif
+			${EndIf}
+		${EndIf}
+		!ifmacrodef PostExecWaitCommand
+			!insertmacro PostExecWaitCommand
+		!endif
+		${If} $WaitForProgram != false
+			ClearErrors
+			${ReadWrapperConfig} $0 Launch WaitForOtherInstances
+			${If} $0 == true
+			${OrIf} ${Errors}
+				${GetFileName} $ProgramExecutable $1
+				${EmptyWorkingSet}
+				${Do}
+					!ifdef Sleep
+						Sleep ${Sleep}
+					!endif
+					${ProcessWaitClose} $1 -1 $R9
+					${IfThen} $R9 > 0 ${|} ${Continue} ${|}
+					StrCpy $0 1
+					${Do}
+						!ifdef Sleep
+							Sleep ${Sleep}
+						!endif
+						ClearErrors
+						${ConfigReadS} `${WRAPPER}` WaitForEXE$0= $2
+						${IfThen} ${Errors} ${|} ${ExitDo} ${|}
+						ExpandEnvStrings $2 $2
+						${ProcessWaitClose} $2 -1 $R9
+						${IfThen} $R9 > 0 ${|} ${ExitDo} ${|}
+						IntOp $0 $0 + 1
+					${Loop}
+				${LoopWhile} $R9 > 0
+			${ElseIf} $0 != false
+				${InvalidValueError} [Launch]:WaitForOtherInstances $0
+			${EndIf}
+		${EndIf}
+	!endif
+	!ifdef SYSTEMWIDE_DISABLEREDIR
+		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
+			IntCmp $Bit 64 0 +2 +2
+			System::Call `${ENABLEREDIR}`
+		!else
+			StrCmpS $APP ${APP64} 0 +2
+			System::Call `${ENABLEREDIR}`
+		!endif
+	!endif
+FunctionEnd
+Function PostExecPrimary
+	${RunSegment} Custom
+FunctionEnd
+Function PostExecSecondary
+	${RunSegment} Custom
+FunctionEnd
+Function PostExec       
+	${RunSegment} RunBeforeAfter
+	${RunSegment} Custom
+FunctionEnd
+Function PostPrimary        
+	!ifdef SYSTEMWIDE_DISABLEREDIR
+		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
+			IntCmp $Bit 64 0 +2 +2
+			System::Call `${DISABLEREDIR}`
+		!else
+			StrCmpS $APP ${APP64} 0 +2
+			System::Call `${DISABLEREDIR}`
+		!endif
+	!endif
+	${If} ${PrimaryInstance}
+		!ifdef REGISTERDLL
+			${RunSegment} RegisterDLL
+		!endif
+		!ifdef SERVICES
+			${RunSegment} Services
+		!endif
+		!ifdef TaskCleanup
+			${RunSegment} TaskCleanUp
+		!endif
+	${EndIf}
+	!ifdef REGISTRY
+		${RunSegment} RegistryValueBackupDelete
+		${If} ${PrimaryInstance}
+			!ifdef RegCopy
+				${RunSegment} RegistryCopyKeys
+			!endif
+		${EndIf}
+		${RunSegment} RegistryKeys
+		${RunSegment} RegistryCleanup
+	!endif
+	${If} ${PrimaryInstance}
+		${RunSegment} Qt
+		!ifdef FileCleanup
+			${RunSegment} FilesCleanup
+		!endif
+	${EndIf}
+	!ifdef DirectoryCleanup
+		${RunSegment} DirectoriesCleanup
+	!endif
+	${RunSegment} DirectoriesMove
+	${RunSegment} FilesMove
+	${RunSegment} RunLocally
+	${RunSegment} Temp
+	${RunSegment} Custom
+	!ifdef SYSTEMWIDE_DISABLEREDIR
+		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
+			IntCmp $Bit 64 0 +2 +2
+			System::Call `${ENABLEREDIR}`
+		!else
+			StrCmpS $APP ${APP64} 0 +2
+			System::Call `${ENABLEREDIR}`
+		!endif
+	!endif
+FunctionEnd
+Function PostSecondary        
+	!ifdef SYSTEMWIDE_DISABLEREDIR
+		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
+			IntCmp $Bit 64 0 +2 +2
+			System::Call `${DISABLEREDIR}`
+		!else
+			StrCmpS $APP ${APP64} 0 +2
+			System::Call `${DISABLEREDIR}`
+		!endif
+	!endif
+	;${RunSegment} *
+	${RunSegment} Custom
+	!ifdef SYSTEMWIDE_DISABLEREDIR
+		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
+			IntCmp $Bit 64 0 +2 +2
+			System::Call `${ENABLEREDIR}`
+		!else
+			StrCmpS $APP ${APP64} 0 +2
+			System::Call `${ENABLEREDIR}`
+		!endif
+	!endif
+FunctionEnd
+Function Post        
+	!ifdef SYSTEMWIDE_DISABLEREDIR
+		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
+			IntCmp $Bit 64 0 +2 +2
+			System::Call `${DISABLEREDIR}`
+		!else
+			StrCmpS $APP ${APP64} 0 +2
+			System::Call `${DISABLEREDIR}`
+		!endif
+	!endif
+	!ifdef GHOSTSCRIPT
+		${RunSegment} Ghostscript
+	!endif
+	${RunSegment} RefreshShellIcons
+	${RunSegment} Custom
+	!ifdef SYSTEMWIDE_DISABLEREDIR
+		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
+			IntCmp $Bit 64 0 +2 +2
+			System::Call `${ENABLEREDIR}`
+		!else
+			StrCmpS $APP ${APP64} 0 +2
+			System::Call `${ENABLEREDIR}`
+		!endif
+	!endif
+FunctionEnd
+Function Unload        
+	!ifdef SYSTEMWIDE_DISABLEREDIR
+		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
+			IntCmp $Bit 64 0 +2 +2
+			System::Call `${DISABLEREDIR}`
+		!else
+			StrCmpS $APP ${APP64} 0 +2
+			System::Call `${DISABLEREDIR}`
+		!endif
+	!endif
+	;${RunSegment} XML
+	${If} ${PrimaryInstance}
+		!ifdef REGISTERDLL
+			${RunSegment} RegisterDLL
+		!endif
+		!ifdef SERVICES
+			${RunSegment} Services
+		!endif
+		!ifdef FONTS_ENABLE
+			${RunSegment} Fonts
+		!endif
+		!ifdef FileCleanup
+			${RunSegment} FilesCleanup
+		!endif
+		!ifdef DirectoryCleanup
+			${RunSegment} DirectoriesCleanup
+		!endif
+	${EndIf}
+	${RunSegment} Core
+	${RunSegment} Custom
+	!ifdef SYSTEMWIDE_DISABLEREDIR
+		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
+			IntCmp $Bit 64 0 +2 +2
+			System::Call `${ENABLEREDIR}`
+		!else
+			StrCmpS $APP ${APP64} 0 +2
+			System::Call `${ENABLEREDIR}`
+		!endif
+	!endif
+FunctionEnd
+!define CallPS `!insertmacro CallPS`
+!macro CallPS _func _rev
+	!if ${_rev} == +
+		Call ${_func}
+	!endif
+	${If} ${SecondInstance}
+		Call ${_func}Secondary
+	${Else}
+		Call ${_func}Primary
+	${EndIf}
+	!if ${_rev} != +
+		Call ${_func}
+	!endif
+!macroend
+Section        
+	!ifdef SYSTEMWIDE_DISABLEREDIR
+		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
+			IntCmp $Bit 64 0 +2 +2
+			System::Call `${DISABLEREDIR}`
+		!else
+			StrCmpS $APP ${APP64} 0 +2
+			System::Call `${DISABLEREDIR}`
+		!endif
+	!endif
+	Call Init
+	System::Call 'Kernel32::OpenMutex(i1048576, b0, t"${PAC}${APPNAME}-${APPNAME}::Starting") i.R0 ?e'
+	System::Call 'Kernel32::CloseHandle(iR0)'
+	Pop $R9
+	${If} $R9 <> 2
+		MessageBox MB_ICONSTOP $(LauncherAlreadyStarting)
+		Quit
+	${EndIf}
+	System::Call 'Kernel32::OpenMutex(i1048576, i0, t"${PAC}${APPNAME}-${APPNAME}::Stopping") i.R0 ?e'
+	System::Call 'Kernel32::CloseHandle(iR0)'
+	Pop $R9
+	${If} $R9 <> 2
+		MessageBox MB_ICONSTOP $(LauncherAlreadyStopping)
+		Quit
+	${EndIf}
+	${IfNot} ${FileExists} `${RUNTIME}`
+	${OrIf} ${SecondInstance}
+		${If} ${PrimaryInstance}
+			System::Call 'Kernel32::CreateMutex(i0, i0, t"${PAC}${APPNAME}-${APPNAME}::Starting") i.r0'
+			StrCpy $StatusMutex $0
+		${EndIf}
+		${CallPS} Pre +
+		${CallPS} PreExec +
+		${If} ${PrimaryInstance}
+			StrCpy $0 $StatusMutex
+			System::Call 'Kernel32::CloseHandle(ir0) ?e'
+			Pop $R9
+		${EndIf}
+		Call Execute
+	${Else}
+		MessageBox MB_ICONSTOP $(LauncherCrashCleanup)
+	${EndIf}
+	${If} ${PrimaryInstance}
+		System::Call 'Kernel32::CreateMutex(i0, i0, t"${PAC}${APPNAME}-${APPNAME}::Stopping")'
+	${EndIf}
+	${If} $WaitForProgram != false
+		${CallPS} Post -
+	${EndIf}
+	Call Unload
+	!ifdef SYSTEMWIDE_DISABLEREDIR
+		!ifdef FORCE_SYSTEMWIDE_DISABLEREDIR
+			IntCmp $Bit 64 0 +2 +2
+			System::Call `${ENABLEREDIR}`
+		!else
+			StrCmpS $APP ${APP64} 0 +2
+			System::Call `${ENABLEREDIR}`
+		!endif
+	!endif
+SectionEnd
+Function .onInstFailed        
+	Call Unload
+FunctionEnd
diff --git a/etc/source/PortableAppsCompilerDefines.nsh b/etc/source/PortableAppsCompilerDefines.nsh
new file mode 100644
index 0000000..5955f4d
--- /dev/null
+++ b/etc/source/PortableAppsCompilerDefines.nsh
@@ -0,0 +1,29 @@
+;=# 
+; 
+; PORTABLEAPPS COMPILER
+; Developed by daemon.devin
+; 
+; For support visit the GitHub project:
+; https://github.com/demondevin/pac-man
+; 
+; PortableAppsCompilerDefines.nsh
+; This file was automatically generated by the PortableApps Compiler and should not be edited!
+; 
+!define PORTABLEAPPNAME `Komodo IDE Portable`
+!define FULLNAME `Komodo IDE`
+!define APPNAME `KomodoIDEPortable`
+!define APP `KomodoIDE`
+!define APPDIR `$EXEDIR\bin\${APP}`
+!define APP64 `KomodoIDE64`
+!define APPDIR64 `$EXEDIR\bin\${APP64}`
+!define PACKAGE_VERSION `11.0.1.0`
+!define DEVELOPER `daemon.devin`
+!define PUBLISHER `ActiveState Software Inc.`
+!define OUTFILE `KomodoIDEPortable.exe`
+!define NTFS
+!define ConFunc
+!define JSON
+!define Sleep `500`
+!define REGISTRY
+!define XML_PLUGIN
+!define FONTS_ENABLE
diff --git a/etc/source/PortableAppsCompilerMacros.nsh b/etc/source/PortableAppsCompilerMacros.nsh
new file mode 100644
index 0000000..b32db4a
--- /dev/null
+++ b/etc/source/PortableAppsCompilerMacros.nsh
@@ -0,0 +1,103 @@
+;=#
+;
+; PORTABLEAPPS COMPILER
+; Developed by daemon.devin
+;
+; For support visit the GitHub project:
+; https://github.com/demondevin/pac-man
+;
+; PortableAppsCompilerMacros.nsh
+; This file declares and defines all the macros for use with PortableApps Compiler.
+; 
+
+!define ReadAppInfoConfig "!insertmacro _ReadAppInfoConfig"
+!macro _ReadAppInfoConfig _VALUE _SECTION _KEY
+	ReadINIStr ${_VALUE} "${INFOINI}" "${_SECTION}" "${_KEY}"
+!macroend
+!define WriteAppInfoConfig "!insertmacro _WriteAppInfoConfig"
+!macro _WriteAppInfoConfig _SECTION _KEY _VALUE
+	WriteINIStr "${INFOINI}" "${_SECTION}" "${_KEY}" "${_VALUE}"
+!macroend
+!define DeleteAppInfoConfig "!insertmacro _DeleteAppInfoConfig"
+!macro _DeleteAppInfoConfig _SECTION _KEY
+	DeleteINIStr "${INFOINI}" "${_SECTION}" "${_KEY}"
+!macroend
+!define DeleteAppInfoConfigSec "!insertmacro _DeleteAppInfoConfigSec"
+!macro _DeleteAppInfoConfigSec _SECTION
+	DeleteINISec "${INFOINI}" "${_SECTION}"
+!macroend
+!define ReadWrapperConfig "!insertmacro _ReadWrapperConfig"
+!macro _ReadWrapperConfig _VALUE _SECTION _KEY
+	ReadINIStr ${_VALUE} "${WRAPPER}" "${_SECTION}" "${_KEY}"
+!macroend
+!define WriteWrapperConfig "!insertmacro _WriteWrapperConfig"
+!macro _WriteWrapperConfig _SECTION _KEY _VALUE
+	WriteINIStr "${WRAPPER}" "${_SECTION}" "${_KEY}" "${_VALUE}"
+!macroend
+!define DeleteWrapperConfig "!insertmacro _DeleteWrapperConfig"
+!macro _DeleteWrapperConfig _SECTION _KEY
+	DeleteINIStr "${WRAPPER}" "${_SECTION}" "${_KEY}"
+!macroend
+!define DeleteWrapperConfigSec "!insertmacro _DeleteWrapperConfigSec"
+!macro _DeleteWrapperConfigSec _SECTION
+	DeleteINISec "${WRAPPER}" "${_SECTION}"
+!macroend
+!define ReadWrapperConfigWithDefault "!insertmacro _ReadWrapperConfigWithDefault"
+!macro _ReadWrapperConfigWithDefault _VALUE _SECTION _KEY _DEFAULT
+	ClearErrors
+	${ReadWrapperConfig} ${_VALUE} "${_SECTION}" "${_KEY}"
+	${IfThen} ${Errors} ${|} StrCpy ${_VALUE} "${_DEFAULT}" ${|}
+!macroend
+!define ReadUserConfig "!insertmacro _ReadUserConfig"
+!macro _ReadUserConfig _VALUE _KEY
+	${ConfigReadS} "${CONFIG}" "${_KEY}=" "${_VALUE}"
+!macroend
+!define WriteUserConfig "!insertmacro _WriteUserConfig"
+!macro _WriteUserConfig _VALUE _KEY
+	${ConfigWriteS} "${CONFIG}" "${_KEY}=" "${_VALUE}" $R0
+!macroend
+!define InvalidValueError "!insertmacro _InvalidValueError"
+!macro _InvalidValueError _SECTION_KEY _VALUE
+	MessageBox MB_OK|MB_ICONSTOP "ERROR: Invalid value '${_VALUE}' for ${_SECTION_KEY}."
+!macroend
+!define WriteRuntimeData "!insertmacro _WriteRuntimeData"
+!macro _WriteRuntimeData _SECTION _KEY _VALUE
+	WriteINIStr "${RUNTIME}" "${_SECTION}" "${_KEY}" "${_VALUE}"
+	WriteINIStr "${RUNTIME2}" "${_SECTION}" "${_KEY}" "${_VALUE}"
+!macroend
+!define DeleteRuntimeData "!insertmacro _DeleteRuntimeData"
+!macro _DeleteRuntimeData _SECTION _KEY
+	DeleteINIStr "${RUNTIME}" "${_SECTION}" "${_KEY}"
+	DeleteINIStr "${RUNTIME2}" "${_SECTION}" "${_KEY}"
+!macroend
+!define ReadRuntimeData "!insertmacro _ReadRuntimeData"
+!macro _ReadRuntimeData _VALUE _SECTION _KEY
+	IfFileExists "${RUNTIME}" 0 +3
+	ReadINIStr "${_VALUE}" "${RUNTIME}" "${_SECTION}" "${_KEY}"
+	Goto +2
+	ReadINIStr "${_VALUE}" "${RUNTIME2}" "${_SECTION}" "${_KEY}"
+!macroend
+!define WriteRuntime "!insertmacro _WriteRuntime"
+!macro _WriteRuntime _VALUE _KEY
+	WriteINIStr "${RUNTIME}" ${PAC} "${_KEY}" "${_VALUE}"
+	WriteINIStr "${RUNTIME2}" ${PAC} "${_KEY}" "${_VALUE}"
+!macroend
+!define ReadRuntime "!insertmacro _ReadRuntime"
+!macro _ReadRuntime _VALUE _KEY
+	IfFileExists "${RUNTIME}" 0 +3
+	ReadINIStr "${_VALUE}" "${RUNTIME}" ${PAC} "${_KEY}"
+	Goto +2
+	ReadINIStr "${_VALUE}" "${RUNTIME2}" ${PAC} "${_KEY}"
+!macroend
+!define WriteSettings "!insertmacro _WriteSettings"
+!macro _WriteSettings _VALUE _KEY
+	WriteINIStr "${CONFIGINI}" "${APPNAME}Settings" "${_KEY}" "${_VALUE}"
+!macroend
+!define ReadSettings "!insertmacro _ReadSettings"
+!macro _ReadSettings _VALUE _KEY
+	ReadINIStr "${_VALUE}" "${CONFIGINI}" "${APPNAME}Settings" "${_KEY}"
+!macroend
+!define DeleteSettings "!insertmacro _DeleteSettings"
+!macro _DeleteSettings _KEY
+	DeleteINIStr "${CONFIGINI}" "${APPNAME}Settings" "${_KEY}"
+!macroend
diff --git a/Other/Source/ProcFunc.nsh b/etc/source/ProcFunc.nsh
similarity index 100%
rename from Other/Source/ProcFunc.nsh
rename to etc/source/ProcFunc.nsh
diff --git a/Other/Source/Registry.nsh b/etc/source/Registry.nsh
similarity index 87%
rename from Other/Source/Registry.nsh
rename to etc/source/Registry.nsh
index 8d6e228..b87a1af 100644
--- a/Other/Source/Registry.nsh
+++ b/etc/source/Registry.nsh
@@ -1,221 +1,233 @@
-!define Registry::Open `!insertmacro Registry::Open`
-!macro Registry::Open _PATH _OPTIONS _HANDLE
-	Registry::_Open /NOUNLOAD `${_PATH}` `${_OPTIONS}`
-	Pop ${_HANDLE}
-!macroend
-!define Registry::Find `!insertmacro Registry::Find`
-!macro Registry::Find _HANDLE _PATH _VALUEORKEY _STRING _TYPE
-	Registry::_Find /NOUNLOAD `${_HANDLE}`
-	Pop ${_PATH}
-	Pop ${_VALUEORKEY}
-	Pop ${_STRING}
-	Pop ${_TYPE}
-!macroend
-!define Registry::Close `!insertmacro Registry::Close`
-!macro Registry::Close _HANDLE
-	Registry::_Close /NOUNLOAD `${_HANDLE}`
-!macroend
-!define Registry::KeyExists `!insertmacro Registry::KeyExists`
-!macro Registry::KeyExists _PATH _ERR
-	Registry::_KeyExists /NOUNLOAD `${_PATH}`
-	Pop ${_ERR}
-!macroend
-!define Registry::Read `!insertmacro Registry::Read`
-!macro Registry::Read _PATH _VALUE _STRING _TYPE
-	Registry::_Read /NOUNLOAD `${_PATH}` `${_VALUE}`
-	Pop ${_STRING}
-	Pop ${_TYPE}
-!macroend
-!define Registry::Write `!insertmacro Registry::Write`
-!macro Registry::Write _PATH _VALUE _STRING _TYPE _ERR
-	Registry::_Write /NOUNLOAD `${_PATH}` `${_VALUE}` `${_STRING}` `${_TYPE}`
-	Pop ${_ERR}
-!macroend
-!define Registry::ReadExtra `!insertmacro Registry::ReadExtra`
-!macro Registry::ReadExtra _PATH _VALUE _NUMBER _STRING _TYPE
-	Registry::_ReadExtra /NOUNLOAD `${_PATH}` `${_VALUE}` `${_NUMBER}`
-	Pop ${_STRING}
-	Pop ${_TYPE}
-!macroend
-!define Registry::WriteExtra `!insertmacro Registry::WriteExtra`
-!macro Registry::WriteExtra _PATH _VALUE _STRING _ERR
-	Registry::_WriteExtra /NOUNLOAD `${_PATH}` `${_VALUE}` `${_STRING}`
-	Pop ${_ERR}
-!macroend
-!define Registry::CreateKey `!insertmacro Registry::CreateKey`
-!macro Registry::CreateKey _PATH _ERR
-	Registry::_CreateKey /NOUNLOAD `${_PATH}`
-	Pop ${_ERR}
-!macroend
-!define Registry::DeleteValue `!insertmacro Registry::DeleteValue`
-!macro Registry::DeleteValue _PATH _VALUE _ERR
-	Registry::_DeleteValue /NOUNLOAD `${_PATH}` `${_VALUE}`
-	Pop ${_ERR}
-!macroend
-!define Registry::DeleteKey `!insertmacro Registry::DeleteKey`
-!macro Registry::DeleteKey _PATH _ERR
-	Registry::_DeleteKey /NOUNLOAD `${_PATH}`
-	Pop ${_ERR}
-!macroend
-!define Registry::DeleteKeyEmpty `!insertmacro Registry::DeleteKeyEmpty`
-!macro Registry::DeleteKeyEmpty _PATH _ERR
-	Registry::_DeleteKeyEmpty /NOUNLOAD `${_PATH}`
-	Pop ${_ERR}
-!macroend
-!define Registry::CopyValue `!insertmacro Registry::CopyValue`
-!macro Registry::CopyValue _PATH_SOURCE _VALUE_SOURCE _PATH_TARGET _VALUE_TARGET _ERR
-	Registry::_CopyValue /NOUNLOAD `${_PATH_SOURCE}` `${_VALUE_SOURCE}` `${_PATH_TARGET}` `${_VALUE_TARGET}`
-	Pop ${_ERR}
-!macroend
-!define Registry::MoveValue `!insertmacro Registry::MoveValue`
-!macro Registry::MoveValue _PATH_SOURCE _VALUE_SOURCE _PATH_TARGET _VALUE_TARGET _ERR
-	Registry::_MoveValue /NOUNLOAD `${_PATH_SOURCE}` `${_VALUE_SOURCE}` `${_PATH_TARGET}` `${_VALUE_TARGET}`
-	Pop ${_ERR}
-!macroend
-!define Registry::CopyKey `!insertmacro Registry::CopyKey`
-!macro Registry::CopyKey _PATH_SOURCE _PATH_TARGET _ERR
-	Registry::_CopyKey /NOUNLOAD `${_PATH_SOURCE}` `${_PATH_TARGET}`
-	Pop ${_ERR}
-!macroend
-!define Registry::MoveKey `!insertmacro Registry::MoveKey`
-!macro Registry::MoveKey _PATH_SOURCE _PATH_TARGET _ERR
-	Registry::_MoveKey /NOUNLOAD `${_PATH_SOURCE}` `${_PATH_TARGET}`
-	Pop ${_ERR}
-!macroend
-!define Registry::SaveKey `!insertmacro Registry::SaveKey`
-!macro Registry::SaveKey _PATH _FILE _OPTIONS _ERR
-	Registry::_SaveKey /NOUNLOAD `${_PATH}` `${_FILE}` `${_OPTIONS}`
-	Pop ${_ERR}
-!macroend
-!define Registry::RestoreKey `!insertmacro Registry::RestoreKey`
-!macro Registry::RestoreKey _FILE _ERR
-	Registry::_RestoreKey /NOUNLOAD `${_FILE}`
-	Pop ${_ERR}
-!macroend
-!define Registry::StrToHex `!insertmacro Registry::StrToHexA`
-!define Registry::StrToHexA `!insertmacro Registry::StrToHexA`
-!macro Registry::StrToHexA _STRING _HEX_STRING
-	Registry::_StrToHexA /NOUNLOAD `${_STRING}`
-	Pop ${_HEX_STRING}
-!macroend
-!define Registry::StrToHexW `!insertmacro Registry::StrToHexW`
-!macro Registry::StrToHexW _STRING _HEX_STRING
-	Registry::_StrToHexW /NOUNLOAD `${_STRING}`
-	Pop ${_HEX_STRING}
-!macroend
-!define Registry::HexToStr `!insertmacro Registry::HexToStrA`
-!define Registry::HexToStrA `!insertmacro Registry::HexToStrA`
-!macro Registry::HexToStrA _HEX_STRING _STRING
-	Registry::_HexToStrA /NOUNLOAD `${_HEX_STRING}`
-	Pop ${_STRING}
-!macroend
-!define Registry::HexToStrW `!insertmacro Registry::HexToStrW`
-!macro Registry::HexToStrW _HEX_STRING _STRING
-	Registry::_HexToStrW /NOUNLOAD `${_HEX_STRING}`
-	Pop ${_STRING}
-!macroend
-!define Reg::BackupKey `!insertmacro Reg::BackupKey`
-!macro Reg::BackupKey _PATH _ERR
-	registry::_DeleteKey /NOUNLOAD `${_PATH}.BackupBy${APPNAME}`
-	Pop ${_ERR}
-	registry::_MoveKey /NOUNLOAD `${_PATH}` `${_PATH}.BackupBy${APPNAME}`
-	Pop ${_ERR}
-!macroend
-!define Reg::BackupCopyKey `!insertmacro Reg::BackupCopyKey`
-!macro Reg::BackupCopyKey _PATH _ERR
-	registry::_DeleteKey /NOUNLOAD `${_PATH}.BackupBy${APPNAME}`
-	Pop ${_ERR}
-	registry::_CopyKey /NOUNLOAD `${_PATH}` `${_PATH}.BackupBy${APPNAME}`
-	Pop ${_ERR}
-!macroend
-!define Reg::RestoreBackupKey `!insertmacro Reg::RestoreBackupKey`
-!macro Reg::RestoreBackupKey _PATH _ERR
-	registry::_DeleteKey /NOUNLOAD `${_PATH}`
-	Pop ${_ERR}
-	registry::_MoveKey /NOUNLOAD `${_PATH}.BackupBy${APPNAME}` `${_PATH}`
-	Pop ${_ERR}
-!macroend
-!define Reg::BackupValue `!insertmacro Reg::BackupValue`
-!macro Reg::BackupValue _PATH _VALUE _ERR
-	registry::_DeleteValue /NOUNLOAD `${_PATH}` `${_VALUE}.BackupBy${APPNAME}`
-	Pop ${_ERR}
-	registry::_MoveValue /NOUNLOAD `${_PATH}` `${_VALUE}` `${_PATH}` `${_VALUE}.BackupBy${APPNAME}`
-	Pop ${_ERR}
-!macroend
-!define Reg::BackupCopyValue `!insertmacro Reg::BackupCopyValue`
-!macro Reg::BackupCopyValue _PATH _VALUE _ERR
-	registry::_DeleteValue /NOUNLOAD `${_PATH}` `${_VALUE}.BackupBy${APPNAME}`
-	Pop ${_ERR}
-	registry::_CopyValue /NOUNLOAD `${_PATH}` `${_VALUE}` `${_PATH}` `${_VALUE}.BackupBy${APPNAME}`
-	Pop ${_ERR}
-!macroend
-!define Reg::RestoreBackupValue `!insertmacro Reg::RestoreBackupValue`
-!macro Reg::RestoreBackupValue _PATH _VALUE _ERR
-	registry::_DeleteValue /NOUNLOAD `${_PATH}` `${_VALUE}`
-	Pop ${_ERR}
-	registry::_MoveValue /NOUNLOAD `${_PATH}` `${_VALUE}.BackupBy${APPNAME}` `${_PATH}` `${_VALUE}`
-	Pop ${_ERR}
-!macroend
-!define registry::BackupKey "!insertmacro registry::BackupKey"
-!macro registry::BackupKey _PATH _ERR
-	${IfNot} ${RegistryKeyExists} `${PAF}\Keys\${_PATH}`
-	${AndIf} ${RegistryKeyExists} `${_PATH}`
-		Registry::_MoveKey /NOUNLOAD `${_PATH}` `${PAF}\Keys\${_PATH}`
-		Pop ${_ERR}
-	${EndIf}
-!macroend
-!define registry::BackupCopyKey "!insertmacro registry::BackupCopyKey"
-!macro registry::BackupCopyKey _PATH _ERR
-	${IfNot} ${RegistryKeyExists} `${PAF}\Keys\${_PATH}`
-	${AndIf} ${RegistryKeyExists} `${_PATH}`
-		Registry::_CopyKey /NOUNLOAD `${_PATH}` `${PAF}\Keys\${_PATH}`
-		Pop ${_ERR}
-	${EndIf}
-!macroend
-;===  0  # exists
-;=== -1  # doesn't exist
-!define registry::RestoreBackupKey "!insertmacro registry::RestoreBackupKey"
-!macro registry::RestoreBackupKey _PATH _ERR
-	Registry::_DeleteKey /NOUNLOAD `${_PATH}`
-	Pop ${_ERR}
-	${If} ${RegistryKeyExists} `${PAF}\Keys\${_PATH}`
-		Registry::_MoveKey /NOUNLOAD `${PAF}\Keys\${_PATH}` `${_PATH}`
-		Pop ${_ERR}
-		!insertmacro _LOGICLIB_TEMP
-		StrCpy $_LOGICLIB_TEMP `${_PATH}`
-		${Do}
-			${GetParent} `$_LOGICLIB_TEMP` `$_LOGICLIB_TEMP`
-			Registry::_DeleteKeyEmpty /NOUNLOAD `${PAF}\Keys\$_LOGICLIB_TEMP`
-			Pop ${_ERR}
-		${LoopUntil} `$_LOGICLIB_TEMP` == ""
-	${EndIf}
-	Registry::_DeleteKeyEmpty /NOUNLOAD ${PAF}\Keys
-	Pop ${_ERR}
-	Registry::_DeleteKeyEmpty /NOUNLOAD ${PAF}
-	Pop ${_ERR}
-!macroend
-!define registry::BackupValue "!insertmacro registry::BackupValue"
-!macro registry::BackupValue _PATH _VALUE _ERR
-	Registry::_MoveValue /NOUNLOAD `${_PATH}` `${_VALUE}` `${PAF}\Values` `${_VALUE}`
-	Pop ${_ERR}
-!macroend
-!define registry::BackupCopyValue "!insertmacro registry::BackupCopyValue"
-!macro registry::BackupCopyValue _PATH _VALUE _ERR
-	Registry::_CopyValue /NOUNLOAD `${_PATH}` `${_VALUE}` `${PAF}\Values` `${_VALUE}`
-	Pop ${_ERR}
-!macroend
-!define registry::RestoreBackupValue "!insertmacro registry::RestoreBackupValue"
-!macro registry::RestoreBackupValue _PATH _VALUE _ERR
-	Registry::_DeleteValue /NOUNLOAD `${_PATH}` `${_VALUE}`
-	Pop ${_ERR}
-	Registry::_MoveValue /NOUNLOAD `${PAF}\Values` `${_VALUE}` `${_PATH}` `${_VALUE}`
-	Pop ${_ERR}
-	Registry::_DeleteKeyEmpty /NOUNLOAD ${PAF}\Values
-	Pop ${_ERR}
-	Registry::_DeleteKeyEmpty /NOUNLOAD ${PAF}
-	Pop ${_ERR}
-!macroend
-!define Registry::Unload `!insertmacro Registry::Unload`
-!macro Registry::Unload
-	Registry::_Unload
-!macroend
\ No newline at end of file
+;=#
+;
+; PORTABLEAPPS COMPILER
+; Developed by daemon.devin
+;
+; For support visit the GitHub project:
+; https://github.com/demondevin/pac-man
+;
+; Registry.nsh
+; This file declares and defines all the macros for registry manipulation.
+; 
+
+!define Registry::Open `!insertmacro Registry::Open`
+!macro Registry::Open _PATH _OPTIONS _HANDLE
+	Registry::_Open /NOUNLOAD `${_PATH}` `${_OPTIONS}`
+	Pop ${_HANDLE}
+!macroend
+!define Registry::Find `!insertmacro Registry::Find`
+!macro Registry::Find _HANDLE _PATH _VALUEORKEY _STRING _TYPE
+	Registry::_Find /NOUNLOAD `${_HANDLE}`
+	Pop ${_PATH}
+	Pop ${_VALUEORKEY}
+	Pop ${_STRING}
+	Pop ${_TYPE}
+!macroend
+!define Registry::Close `!insertmacro Registry::Close`
+!macro Registry::Close _HANDLE
+	Registry::_Close /NOUNLOAD `${_HANDLE}`
+!macroend
+!define Registry::KeyExists `!insertmacro Registry::KeyExists`
+!macro Registry::KeyExists _PATH _ERR
+	Registry::_KeyExists /NOUNLOAD `${_PATH}`
+	Pop ${_ERR}
+!macroend
+!define Registry::Read `!insertmacro Registry::Read`
+!macro Registry::Read _PATH _VALUE _STRING _TYPE
+	Registry::_Read /NOUNLOAD `${_PATH}` `${_VALUE}`
+	Pop ${_STRING}
+	Pop ${_TYPE}
+!macroend
+!define Registry::Write `!insertmacro Registry::Write`
+!macro Registry::Write _PATH _VALUE _STRING _TYPE _ERR
+	Registry::_Write /NOUNLOAD `${_PATH}` `${_VALUE}` `${_STRING}` `${_TYPE}`
+	Pop ${_ERR}
+!macroend
+!define Registry::ReadExtra `!insertmacro Registry::ReadExtra`
+!macro Registry::ReadExtra _PATH _VALUE _NUMBER _STRING _TYPE
+	Registry::_ReadExtra /NOUNLOAD `${_PATH}` `${_VALUE}` `${_NUMBER}`
+	Pop ${_STRING}
+	Pop ${_TYPE}
+!macroend
+!define Registry::WriteExtra `!insertmacro Registry::WriteExtra`
+!macro Registry::WriteExtra _PATH _VALUE _STRING _ERR
+	Registry::_WriteExtra /NOUNLOAD `${_PATH}` `${_VALUE}` `${_STRING}`
+	Pop ${_ERR}
+!macroend
+!define Registry::CreateKey `!insertmacro Registry::CreateKey`
+!macro Registry::CreateKey _PATH _ERR
+	Registry::_CreateKey /NOUNLOAD `${_PATH}`
+	Pop ${_ERR}
+!macroend
+!define Registry::DeleteValue `!insertmacro Registry::DeleteValue`
+!macro Registry::DeleteValue _PATH _VALUE _ERR
+	Registry::_DeleteValue /NOUNLOAD `${_PATH}` `${_VALUE}`
+	Pop ${_ERR}
+!macroend
+!define Registry::DeleteKey `!insertmacro Registry::DeleteKey`
+!macro Registry::DeleteKey _PATH _ERR
+	Registry::_DeleteKey /NOUNLOAD `${_PATH}`
+	Pop ${_ERR}
+!macroend
+!define Registry::DeleteKeyEmpty `!insertmacro Registry::DeleteKeyEmpty`
+!macro Registry::DeleteKeyEmpty _PATH _ERR
+	Registry::_DeleteKeyEmpty /NOUNLOAD `${_PATH}`
+	Pop ${_ERR}
+!macroend
+!define Registry::CopyValue `!insertmacro Registry::CopyValue`
+!macro Registry::CopyValue _PATH_SOURCE _VALUE_SOURCE _PATH_TARGET _VALUE_TARGET _ERR
+	Registry::_CopyValue /NOUNLOAD `${_PATH_SOURCE}` `${_VALUE_SOURCE}` `${_PATH_TARGET}` `${_VALUE_TARGET}`
+	Pop ${_ERR}
+!macroend
+!define Registry::MoveValue `!insertmacro Registry::MoveValue`
+!macro Registry::MoveValue _PATH_SOURCE _VALUE_SOURCE _PATH_TARGET _VALUE_TARGET _ERR
+	Registry::_MoveValue /NOUNLOAD `${_PATH_SOURCE}` `${_VALUE_SOURCE}` `${_PATH_TARGET}` `${_VALUE_TARGET}`
+	Pop ${_ERR}
+!macroend
+!define Registry::CopyKey `!insertmacro Registry::CopyKey`
+!macro Registry::CopyKey _PATH_SOURCE _PATH_TARGET _ERR
+	Registry::_CopyKey /NOUNLOAD `${_PATH_SOURCE}` `${_PATH_TARGET}`
+	Pop ${_ERR}
+!macroend
+!define Registry::MoveKey `!insertmacro Registry::MoveKey`
+!macro Registry::MoveKey _PATH_SOURCE _PATH_TARGET _ERR
+	Registry::_MoveKey /NOUNLOAD `${_PATH_SOURCE}` `${_PATH_TARGET}`
+	Pop ${_ERR}
+!macroend
+!define Registry::SaveKey `!insertmacro Registry::SaveKey`
+!macro Registry::SaveKey _PATH _FILE _OPTIONS _ERR
+	Registry::_SaveKey /NOUNLOAD `${_PATH}` `${_FILE}` `${_OPTIONS}`
+	Pop ${_ERR}
+!macroend
+!define Registry::RestoreKey `!insertmacro Registry::RestoreKey`
+!macro Registry::RestoreKey _FILE _ERR
+	Registry::_RestoreKey /NOUNLOAD `${_FILE}`
+	Pop ${_ERR}
+!macroend
+!define Registry::StrToHex `!insertmacro Registry::StrToHexA`
+!define Registry::StrToHexA `!insertmacro Registry::StrToHexA`
+!macro Registry::StrToHexA _STRING _HEX_STRING
+	Registry::_StrToHexA /NOUNLOAD `${_STRING}`
+	Pop ${_HEX_STRING}
+!macroend
+!define Registry::StrToHexW `!insertmacro Registry::StrToHexW`
+!macro Registry::StrToHexW _STRING _HEX_STRING
+	Registry::_StrToHexW /NOUNLOAD `${_STRING}`
+	Pop ${_HEX_STRING}
+!macroend
+!define Registry::HexToStr `!insertmacro Registry::HexToStrA`
+!define Registry::HexToStrA `!insertmacro Registry::HexToStrA`
+!macro Registry::HexToStrA _HEX_STRING _STRING
+	Registry::_HexToStrA /NOUNLOAD `${_HEX_STRING}`
+	Pop ${_STRING}
+!macroend
+!define Registry::HexToStrW `!insertmacro Registry::HexToStrW`
+!macro Registry::HexToStrW _HEX_STRING _STRING
+	Registry::_HexToStrW /NOUNLOAD `${_HEX_STRING}`
+	Pop ${_STRING}
+!macroend
+!define Reg::BackupKey `!insertmacro Reg::BackupKey`
+!macro Reg::BackupKey _PATH _ERR
+	registry::_DeleteKey /NOUNLOAD `${_PATH}.BackupBy${APPNAME}`
+	Pop ${_ERR}
+	registry::_MoveKey /NOUNLOAD `${_PATH}` `${_PATH}.BackupBy${APPNAME}`
+	Pop ${_ERR}
+!macroend
+!define Reg::BackupCopyKey `!insertmacro Reg::BackupCopyKey`
+!macro Reg::BackupCopyKey _PATH _ERR
+	registry::_DeleteKey /NOUNLOAD `${_PATH}.BackupBy${APPNAME}`
+	Pop ${_ERR}
+	registry::_CopyKey /NOUNLOAD `${_PATH}` `${_PATH}.BackupBy${APPNAME}`
+	Pop ${_ERR}
+!macroend
+!define Reg::RestoreBackupKey `!insertmacro Reg::RestoreBackupKey`
+!macro Reg::RestoreBackupKey _PATH _ERR
+	registry::_DeleteKey /NOUNLOAD `${_PATH}`
+	Pop ${_ERR}
+	registry::_MoveKey /NOUNLOAD `${_PATH}.BackupBy${APPNAME}` `${_PATH}`
+	Pop ${_ERR}
+!macroend
+!define Reg::BackupValue `!insertmacro Reg::BackupValue`
+!macro Reg::BackupValue _PATH _VALUE _ERR
+	registry::_DeleteValue /NOUNLOAD `${_PATH}` `${_VALUE}.BackupBy${APPNAME}`
+	Pop ${_ERR}
+	registry::_MoveValue /NOUNLOAD `${_PATH}` `${_VALUE}` `${_PATH}` `${_VALUE}.BackupBy${APPNAME}`
+	Pop ${_ERR}
+!macroend
+!define Reg::BackupCopyValue `!insertmacro Reg::BackupCopyValue`
+!macro Reg::BackupCopyValue _PATH _VALUE _ERR
+	registry::_DeleteValue /NOUNLOAD `${_PATH}` `${_VALUE}.BackupBy${APPNAME}`
+	Pop ${_ERR}
+	registry::_CopyValue /NOUNLOAD `${_PATH}` `${_VALUE}` `${_PATH}` `${_VALUE}.BackupBy${APPNAME}`
+	Pop ${_ERR}
+!macroend
+!define Reg::RestoreBackupValue `!insertmacro Reg::RestoreBackupValue`
+!macro Reg::RestoreBackupValue _PATH _VALUE _ERR
+	registry::_DeleteValue /NOUNLOAD `${_PATH}` `${_VALUE}`
+	Pop ${_ERR}
+	registry::_MoveValue /NOUNLOAD `${_PATH}` `${_VALUE}.BackupBy${APPNAME}` `${_PATH}` `${_VALUE}`
+	Pop ${_ERR}
+!macroend
+!define registry::BackupKey "!insertmacro registry::BackupKey"
+!macro registry::BackupKey _PATH _ERR
+	${IfNot} ${RegistryKeyExists} `${TREE}\Keys\${_PATH}`
+	${AndIf} ${RegistryKeyExists} `${_PATH}`
+		Registry::_MoveKey /NOUNLOAD `${_PATH}` `${TREE}\Keys\${_PATH}`
+		Pop ${_ERR}
+	${EndIf}
+!macroend
+!define registry::BackupCopyKey "!insertmacro registry::BackupCopyKey"
+!macro registry::BackupCopyKey _PATH _ERR
+	${IfNot} ${RegistryKeyExists} `${TREE}\Keys\${_PATH}`
+	${AndIf} ${RegistryKeyExists} `${_PATH}`
+		Registry::_CopyKey /NOUNLOAD `${_PATH}` `${TREE}\Keys\${_PATH}`
+		Pop ${_ERR}
+	${EndIf}
+!macroend
+;===  0  # exists
+;=== -1  # doesn't exist
+!define registry::RestoreBackupKey "!insertmacro registry::RestoreBackupKey"
+!macro registry::RestoreBackupKey _PATH _ERR
+	Registry::_DeleteKey /NOUNLOAD `${_PATH}`
+	Pop ${_ERR}
+	${If} ${RegistryKeyExists} `${TREE}\Keys\${_PATH}`
+		Registry::_MoveKey /NOUNLOAD `${TREE}\Keys\${_PATH}` `${_PATH}`
+		Pop ${_ERR}
+		!insertmacro _LOGICLIB_TEMP
+		StrCpy $_LOGICLIB_TEMP `${_PATH}`
+		${Do}
+			${GetParent} `$_LOGICLIB_TEMP` `$_LOGICLIB_TEMP`
+			Registry::_DeleteKeyEmpty /NOUNLOAD `${TREE}\Keys\$_LOGICLIB_TEMP`
+			Pop ${_ERR}
+		${LoopUntil} `$_LOGICLIB_TEMP` == ""
+	${EndIf}
+	Registry::_DeleteKeyEmpty /NOUNLOAD ${TREE}\Keys
+	Pop ${_ERR}
+	Registry::_DeleteKeyEmpty /NOUNLOAD ${TREE}
+	Pop ${_ERR}
+!macroend
+!define registry::BackupValue "!insertmacro registry::BackupValue"
+!macro registry::BackupValue _PATH _VALUE _ERR
+	Registry::_MoveValue /NOUNLOAD `${_PATH}` `${_VALUE}` `${TREE}\Values` `${_VALUE}`
+	Pop ${_ERR}
+!macroend
+!define registry::BackupCopyValue "!insertmacro registry::BackupCopyValue"
+!macro registry::BackupCopyValue _PATH _VALUE _ERR
+	Registry::_CopyValue /NOUNLOAD `${_PATH}` `${_VALUE}` `${TREE}\Values` `${_VALUE}`
+	Pop ${_ERR}
+!macroend
+!define registry::RestoreBackupValue "!insertmacro registry::RestoreBackupValue"
+!macro registry::RestoreBackupValue _PATH _VALUE _ERR
+	Registry::_DeleteValue /NOUNLOAD `${_PATH}` `${_VALUE}`
+	Pop ${_ERR}
+	Registry::_MoveValue /NOUNLOAD `${TREE}\Values` `${_VALUE}` `${_PATH}` `${_VALUE}`
+	Pop ${_ERR}
+	Registry::_DeleteKeyEmpty /NOUNLOAD ${TREE}\Values
+	Pop ${_ERR}
+	Registry::_DeleteKeyEmpty /NOUNLOAD ${TREE}
+	Pop ${_ERR}
+!macroend
+!define Registry::Unload `!insertmacro Registry::Unload`
+!macro Registry::Unload
+	Registry::_Unload
+!macroend
diff --git a/Other/Source/ReplaceInFileWithTextReplace.nsh b/etc/source/ReplaceInFileWithTextReplace.nsh
similarity index 100%
rename from Other/Source/ReplaceInFileWithTextReplace.nsh
rename to etc/source/ReplaceInFileWithTextReplace.nsh
diff --git a/Other/Source/RequireLatestNSIS.nsh b/etc/source/RequireLatestNSIS.nsh
similarity index 70%
rename from Other/Source/RequireLatestNSIS.nsh
rename to etc/source/RequireLatestNSIS.nsh
index 49c2e2d..cbe2a20 100644
--- a/Other/Source/RequireLatestNSIS.nsh
+++ b/etc/source/RequireLatestNSIS.nsh
@@ -1,4 +1,15 @@
-; Require at least NSIS 3.0
+;=#
+;
+; PORTABLEAPPS COMPILER
+; Developed by daemon.devin
+;
+; For support visit the GitHub project:
+; https://github.com/demondevin/pac-man
+;
+; RequireLatestNSIS.nsh
+; This file will make sure the latest build of NSIS is being used.
+; 
+
 !searchparse /noerrors "${NSIS_VERSION}" v _RLNSIS_TEMP b _RLNSIS_TEMP
 !searchparse /noerrors "${_RLNSIS_TEMP}" "" _RLNSIS_TEMP - _RLNSIS_TEMP
 !searchparse /noerrors "${_RLNSIS_TEMP}" "" _RLNSIS_TEMP . _RLNSIS_TEMP
diff --git a/Other/Source/Segments.nsh b/etc/source/Segments.nsh
similarity index 92%
rename from Other/Source/Segments.nsh
rename to etc/source/Segments.nsh
index 4be6492..9839ece 100644
--- a/Other/Source/Segments.nsh
+++ b/etc/source/Segments.nsh
@@ -1,9 +1,15 @@
 ;=#
 ;
+; PORTABLEAPPS COMPILER
+; Developed by daemon.devin
+;
+; For support visit the GitHub project:
+; https://github.com/demondevin/pac-man
+;
 ; Segments.nsh
+; This file is responsible for handling the execution of each segment file.
 ; 
-; This file is similar to that of the Segments.nsh file found with PA.c Launcher
-; 
+
 !macro _CreateSegmentDef _TYPE
 	!ifdef Segment${_TYPE}
 		!undef Segment${_TYPE}
@@ -34,7 +40,7 @@
 ; Run an action {{{1
 !macro RunSegment Segment
 	!ifdef _DisableHook_${Segment}_${__FUNCTION__}
-		!echo "Segment ${Segment}, hook ${__FUNCTION__} has been disabled by Custom.nsh."
+		!echo "Segment ${Segment}, hook ${__FUNCTION__} has been disabled by ExtendedWrapper.nsh."
 	!else ifmacrondef ${Segment}.nsh_${__FUNCTION__}
 		!if ${Segment} != Custom
 			!warning "Segment ${Segment}, hook ${__FUNCTION__} was called but does not exist!"
@@ -115,4 +121,4 @@
 
 !define OverrideExecute "!macro OverrideExecuteFunction"
 
-!include /nonfatal "${PACKAGE}\App\AppInfo\Launcher\Custom.nsh"
+!include /nonfatal "${PACKAGE}\app\AppInfo\ExtendedWrapper.nsh"
diff --git a/Other/Source/Segments/Core.nsh b/etc/source/Segments/Core.nsh
similarity index 96%
rename from Other/Source/Segments/Core.nsh
rename to etc/source/Segments/Core.nsh
index 40ef369..eb908b3 100644
--- a/Other/Source/Segments/Core.nsh
+++ b/etc/source/Segments/Core.nsh
@@ -1,4 +1,17 @@
-Var LauncherFile
+;=#
+; 
+; PORTABLEAPPS COMPILER 
+; Developed by daemon.devin
+;
+; For support visit the GitHub project:
+; https://github.com/demondevin/pac-man
+; 
+; SEGMENT
+;   Core.nsh
+;   This file provides core functionality and instructions for use with the other segments.
+; 
+
+Var WrapperFile
 ;${If} ${FilesExists}, ${If} ${DirExists}.
 !macro _FilesExists _a _b _t _f
 	!insertmacro _LOGICLIB_TEMP
@@ -537,7 +550,6 @@ FunctionEnd
 		Exch $0
 	FunctionEnd
 !endif
-
 !ifdef Include_ReadLine
 	Function ReadLine
 		!macro _ReadLine _FILE _NUMBER _RESULT
@@ -1427,18 +1439,18 @@ FunctionEnd
 ${SegmentFile}
 ${Segment.onInit}
 	${GetBaseName} $EXEFILE $BaseName
-	StrCpy $LauncherFile `${LAUNCHER}`
+	StrCpy $WrapperFile `${WRAPPER}`
 	StrCpy $AppID `${APPNAME}`
 	StrCpy $AppName `${FULLNAME}`
 	StrCpy $AppNamePortable `${PORTABLEAPPNAME}`
 !macroend
 ${SegmentInit}
-	IfFileExists `${LAUNCHER}` 0 +5
+	IfFileExists `${WRAPPER}` 0 +5
 	InitPluginsDir
-	CopyFiles /SILENT `${LAUNCHER}` `${LAUNCHER2}`
-	StrCpy $LauncherFile `${LAUNCHER2}`
+	CopyFiles /SILENT `${WRAPPER}` `${WRAPPER2}`
+	StrCpy $WrapperFile `${WRAPPER2}`
 	Goto +5
-	StrCpy $MissingFileOrPath `${LAUNCHER}`
+	StrCpy $MissingFileOrPath `${WRAPPER}`
 	MessageBox MB_OK|MB_ICONSTOP `$(LauncherFileNotFound)`
 	Call Unload
 	Quit
@@ -1462,18 +1474,18 @@ ${SegmentInit}
 			StrCpy $ProgramExecutable ""
 			StrCmpS $Bit 64 0 +5
 			StrCmpS $0 "" +2
-			${ReadLauncherConfig} $ProgramExecutable Launch ProgramExecutableWhenParameters64
+			${ReadWrapperConfig} $ProgramExecutable Launch ProgramExecutableWhenParameters64
 			StrCmpS $ProgramExecutable "" 0 +2
-			${ReadLauncherConfig} $ProgramExecutable Launch ProgramExecutable64
+			${ReadWrapperConfig} $ProgramExecutable Launch ProgramExecutable64
 			StrCmpS $0 "" +3
 			StrCmpS $ProgramExecutable "" 0 +2
-			${ReadLauncherConfig} $ProgramExecutable Launch ProgramExecutableWhenParameters
+			${ReadWrapperConfig} $ProgramExecutable Launch ProgramExecutableWhenParameters
 			StrCmpS $ProgramExecutable "" 0 +2
-			${ReadLauncherConfig} $ProgramExecutable Launch ProgramExecutable
+			${ReadWrapperConfig} $ProgramExecutable Launch ProgramExecutable
 		!endif
 	!endif
 	StrCmpS $ProgramExecutable "" 0 +3
-	MessageBox MB_OK|MB_ICONSTOP `${RUNTIME} is missing [Launch]:ProgramExecutable - what am I to launch?`
+	MessageBox MB_OK|MB_ICONSTOP `${RUNTIME} is missing [Launch]:ProgramExecutable - What is supposed to be launched?`
 	Quit
 	!ifmacrodef UnProExecInit
 		!insertmacro UnProExecInit
@@ -1493,10 +1505,10 @@ ${SegmentUnload}
 		StrCmpS $Registry true 0 +2
 		Registry::_Unload
 	!endif
-	SetOutPath `$TEMP` ;=== prevents $PLUGINSDIR from being locked.
+	SetOutPath `$TEMP` ;= prevents $PLUGINSDIR from being locked.
 	FileClose $_FEIP_FileHandle
-	Delete `$PLUGINSDIR\launcher.ini`
-	Delete `${LAUNCHER2}`
+	Delete `$PLUGINSDIR\wrapper.ini`
+	Delete `${WRAPPER2}`
 	StrCmpS $SecondaryLaunch true +10
 	${ReadRuntimeData} $0 ${PAC} PluginsDir
 	StrCmpS $0 "" +3
diff --git a/Other/Source/Segments/DirectoriesCleanup.nsh b/etc/source/Segments/DirectoriesCleanup.nsh
similarity index 63%
rename from Other/Source/Segments/DirectoriesCleanup.nsh
rename to etc/source/Segments/DirectoriesCleanup.nsh
index 662fe46..8dd2dae 100644
--- a/Other/Source/Segments/DirectoriesCleanup.nsh
+++ b/etc/source/Segments/DirectoriesCleanup.nsh
@@ -1,3 +1,16 @@
+;=#
+; 
+; PORTABLEAPPS COMPILER 
+; Developed by daemon.devin
+;
+; For support visit the GitHub project:
+; https://github.com/demondevin/pac-man
+; 
+; SEGMENT
+;   DirectoriesCleanup.nsh
+;   This file allows support for cleaning up folders that are configured in the CompilerWrapper.ini file.
+; 
+
 ${SegmentFile}
 ${SegmentPostPrimary}
 	!ifmacrodef DirCleanup
@@ -6,7 +19,7 @@ ${SegmentPostPrimary}
 	StrCpy $R0 1
 	${Do}
 		ClearErrors
-		${ReadLauncherConfig} $1 DirectoriesCleanupIfEmpty $R0
+		${ReadWrapperConfig} $1 DirectoriesCleanupIfEmpty $R0
 		${IfThen} ${Errors} ${|} ${ExitDo} ${|}
 		${ParseLocations} $1
 		${ForEachDirectory} $2 $3 $1
@@ -17,7 +30,7 @@ ${SegmentPostPrimary}
 	StrCpy $R0 1
 	${Do}
 		ClearErrors
-		${ReadLauncherConfig} $1 DirectoriesCleanupForce $R0
+		${ReadWrapperConfig} $1 DirectoriesCleanupForce $R0
 		${IfThen} ${Errors} ${|} ${ExitDo} ${|}
 		${ParseLocations} $1
 		${ForEachDirectory} $2 $3 $1
@@ -30,7 +43,7 @@ ${SegmentUnload}
 	StrCpy $R0 1
 	${Do}
 		ClearErrors
-		${ReadLauncherConfig} $1 DirectoriesCleanupIfEmpty $R0
+		${ReadWrapperConfig} $1 DirectoriesCleanupIfEmpty $R0
 		${IfThen} ${Errors} ${|} ${ExitDo} ${|}
 		${ParseLocations} $1
 		${ForEachDirectory} $2 $3 $1
@@ -41,7 +54,7 @@ ${SegmentUnload}
 	StrCpy $R0 1
 	${Do}
 		ClearErrors
-		${ReadLauncherConfig} $1 DirectoriesCleanupForce $R0
+		${ReadWrapperConfig} $1 DirectoriesCleanupForce $R0
 		${IfThen} ${Errors} ${|} ${ExitDo} ${|}
 		${ParseLocations} $1
 		${ForEachDirectory} $2 $3 $1
diff --git a/Other/Source/Segments/DirectoriesMove.nsh b/etc/source/Segments/DirectoriesMove.nsh
similarity index 91%
rename from Other/Source/Segments/DirectoriesMove.nsh
rename to etc/source/Segments/DirectoriesMove.nsh
index c2e2326..fb13322 100644
--- a/Other/Source/Segments/DirectoriesMove.nsh
+++ b/etc/source/Segments/DirectoriesMove.nsh
@@ -1,3 +1,52 @@
+;=#
+; 
+; PORTABLEAPPS COMPILER 
+; Developed by daemon.devin
+;
+; For support visit the GitHub project:
+; https://github.com/demondevin/pac-man
+; 
+; SEGMENT
+;   DirectoriesMove.nsh
+;   This file provides support for moving folders that are configured in the CompilerWrapper.ini file.
+; 
+
+Function Root
+	!macro _Root _PATH _RET
+		Push `${_PATH}`
+		Call Root
+		Pop ${_RET}
+	!macroend
+	!define Root `!insertmacro _Root`
+	Exch $0
+	Push $1
+	Push $2
+	Push $3
+	StrCpy $1 $0 2
+	StrCmp $1 '\\' +5
+	StrCpy $2 $1 1 1
+	StrCmp $2 ':' 0 +16
+	StrCpy $0 $1
+	Goto +15
+	StrCpy $2 1
+	StrCpy $3 ''
+	IntOp $2 $2 + 1
+	StrCpy $1 $0 1 $2
+	StrCmp $1$3 '' +9
+	StrCmp $1 '' +5
+	StrCmp $1 '\' 0 -4
+	StrCmp $3 '1' +3
+	StrCpy $3 '1'
+	Goto -7
+	StrCpy $0 $0 $2
+	StrCpy $2 $0 1 -1
+	StrCmp $2 '\' 0 +2
+	StrCpy $0 ''
+	Pop $3
+	Pop $2
+	Pop $1
+	Exch $0
+FunctionEnd
 !define Directory::BackupLocal `!insertmacro Directory::BackupLocal`
 !macro Directory::BackupLocal _LOCALDIR _SUBDIR
 	RMDir /r `${_LOCALDIR}\${_SUBDIR}.BackupBy${APPNAME}`
@@ -46,57 +95,22 @@
 	CreateDirectory `${_LOCALDIR}\${_SUBDIR}`
 	CopyFiles /SILENT `${_PORTABLEDIR}\*.*` `${_LOCALDIR}\${_SUBDIR}`
 !macroend
-Function Root
-	!macro _Root _PATH _RET
-		Push `${_PATH}`
-		Call Root
-		Pop ${_RET}
-	!macroend
-	!define Root `!insertmacro _Root`
-	Exch $0
-	Push $1
-	Push $2
-	Push $3
-	StrCpy $1 $0 2
-	StrCmp $1 '\\' +5
-	StrCpy $2 $1 1 1
-	StrCmp $2 ':' 0 +16
-	StrCpy $0 $1
-	goto +15
-	StrCpy $2 1
-	StrCpy $3 ''
-	IntOp $2 $2 + 1
-	StrCpy $1 $0 1 $2
-	StrCmp $1$3 '' +9
-	StrCmp $1 '' +5
-	StrCmp $1 '\' 0 -4
-	StrCmp $3 '1' +3
-	StrCpy $3 '1'
-	goto -7
-	StrCpy $0 $0 $2
-	StrCpy $2 $0 1 -1
-	StrCmp $2 '\' 0 +2
-	StrCpy $0 ''
-	Pop $3
-	Pop $2
-	Pop $1
-	Exch $0
-FunctionEnd
-${SegmentFile}
 !macro _DirectoriesMove_Start
 	StrCmpS $0 - +3
 	ExpandEnvStrings $0 $0
-	StrCpy $0 ${DATA}\$0
+	StrCpy $0 ${SET}\$0
 	ExpandEnvStrings $1 $1
 !macroend
+
+${SegmentFile}
 ${SegmentPrePrimary}
 	!ifmacrodef PreDirMove
 		!insertmacro PreDirMove
 	!endif
 	${ForEachINIPair} DirectoriesMove $0 $1
 		!insertmacro _DirectoriesMove_Start
-		StrCmp $0 ${SET} 0 +2
-		MessageBox MB_ICONSTOP|MB_TOPMOST `You can't [DirectoriesMove] settings`
+		StrCmp $0 ${CONF} 0 +2
+		MessageBox MB_ICONSTOP|MB_TOPMOST `You cannot [DirectoriesMove] settings`
 		StrLen $R0 $EXEDIR
 		StrCpy $R0 $1 $R0
 		StrCmp $R0 $EXEDIR 0 +3
diff --git a/Other/Source/Segments/DirectoryMoving.nsh b/etc/source/Segments/DirectoryMoving.nsh
similarity index 70%
rename from Other/Source/Segments/DirectoryMoving.nsh
rename to etc/source/Segments/DirectoryMoving.nsh
index b8d6d44..ac7765e 100644
--- a/Other/Source/Segments/DirectoryMoving.nsh
+++ b/etc/source/Segments/DirectoryMoving.nsh
@@ -1,3 +1,16 @@
+;=#
+; 
+; PORTABLEAPPS COMPILER 
+; Developed by daemon.devin
+;
+; For support visit the GitHub project:
+; https://github.com/demondevin/pac-man
+; 
+; SEGMENT
+;   DirectoryMoving.nsh
+;   This file reads/writes the last folder structure from the previous launch and sets the applicable variables.
+; 
+
 Var LastDirectory
 ${SegmentFile}
 ${SegmentInit}
@@ -13,7 +26,7 @@ ${SegmentInit}
 	${EndIf}
 	${If} $LastDirectory != $1
 		ClearErrors
-		${ReadLauncherConfig} $0 Launch DirectoryMoveOK
+		${ReadWrapperConfig} $0 Launch DirectoryMoveOK
 		${If} $0 == no
 			MessageBox MB_ICONSTOP "$(LauncherDirectoryMoveNotAllowed)"
 			Call Unload
diff --git a/Other/Source/Segments/DotNet.nsh b/etc/source/Segments/DotNet.nsh
similarity index 72%
rename from Other/Source/Segments/DotNet.nsh
rename to etc/source/Segments/DotNet.nsh
index 548525a..fbeb80f 100644
--- a/Other/Source/Segments/DotNet.nsh
+++ b/etc/source/Segments/DotNet.nsh
@@ -1,3 +1,16 @@
+;=#
+; 
+; PORTABLEAPPS COMPILER 
+; Developed by daemon.devin
+;
+; For support visit the GitHub project:
+; https://github.com/demondevin/pac-man
+; 
+; SEGMENT
+;   DotNet.nsh
+;   This file provides support for checking if the system has the required .NET Framework.
+; 
+
 Function dotNETCheck
 	!define CheckDOTNET "!insertmacro _CheckDOTNET"
 	!macro _CheckDOTNET _RESULT _VALUE
@@ -84,7 +97,9 @@ Function HasDotNETFramework
 	Exch $0
 FunctionEnd
 
-!include DotNetVer.nsh
+!ifndef ___DOTNETVER__NSH___
+	!include DotNetVer.nsh
+!endif
 
 ${SegmentFile}
 ${SegmentInit}
@@ -98,25 +113,24 @@ ${SegmentInit}
 	; Added by demon.devin
 	;  - (4.7|4.6.2|4.6.1|4.6|4.5.2|4.5.1|4.5)
 	; 
-	ReadINIStr $0 "${INFOINI}" Dependencies UsesDotNetVersion
-	${If} $0 <= "4.0"
-		!define dotNETVersion "$0"
+	ReadINIStr $DotNETVersion "${INFOINI}" Dependencies UsesDotNetVersion
+	${If} $DotNETVersion <= "4.0"
 		${IfNot} ${HasDotNet4.0}
-			${DebugMsg} "Unable to find .NET Framework ${dotNETVersion}." ; Required .NET version not found
+			${DebugMsg} "Unable to find .NET Framework $DotNETVersion." ; Required .NET version not found
 			MessageBox MB_OK|MB_ICONSTOP `$(LauncherNoDotNet)`
 			Quit
 		${Else}
-			${DebugMsg} ".NET Framework ${dotNETVersion} found." ; Required .NET version found. 4.0 or below.
+			${DebugMsg} ".NET Framework $DotNETVersion found." ; Required .NET version found. 4.0 or below.
 		${EndIf}
-	${ElseIf} $0 >= "4.5"
-		${CheckDOTNET} $R0 $0
+	${ElseIf} $DotNETVersion >= "4.5"
+		${CheckDOTNET} $R0 $DotNETVersion
 		IfErrors 0 +4
-		${DebugMsg} "Unable to find .NET Framework $0" ; Required .NET version not found
+		${DebugMsg} "Unable to find .NET Framework $DotNETVersion" ; Required .NET version not found
 		MessageBox MB_OK|MB_ICONSTOP `$(LauncherNoDotNet)`
 		Quit
 		${DebugMsg} "The required .NET Framework was found." ; Required .NET version found. Has 4.5 or above.
 	${Else}
 		; Invalid .NET version
-		${InvalidValueError} [Dependencies]:UsesDotNetVersion $0
+		${InvalidValueError} [Dependencies]:UsesDotNetVersion $DotNETVersion
 	${EndIf}
 !macroend
diff --git a/Other/Source/Segments/DriveLetter.nsh b/etc/source/Segments/DriveLetter.nsh
similarity index 53%
rename from Other/Source/Segments/DriveLetter.nsh
rename to etc/source/Segments/DriveLetter.nsh
index c3db20f..eb268f1 100644
--- a/Other/Source/Segments/DriveLetter.nsh
+++ b/etc/source/Segments/DriveLetter.nsh
@@ -1,9 +1,22 @@
+;=#
+; 
+; PORTABLEAPPS COMPILER 
+; Developed by daemon.devin
+;
+; For support visit the GitHub project:
+; https://github.com/demondevin/pac-man
+; 
+; SEGMENT
+;   DriveLetter.nsh
+;   This file sets variables according to the current drive letter and the drive letter from the previous launch.
+; 
+
 ${SegmentFile}
 ${SegmentInit}
 	!ifmacrodef Drive
 		!insertmacro Drive
 	!endif
-	ReadINIStr $1 ${SETINI} ${APPNAME}Settings LastDrive
+	ReadINIStr $1 "${CONFIGINI}" "${APPNAME}Settings" LastDrive
 	${GetRoot} $EXEDIR $0
 	${IfThen} $1 == "" ${|} StrCpy $1 $0 ${|}
 	${SetEnvironmentVariable} PAC:Drive $0
@@ -19,5 +32,5 @@ ${SegmentPrePrimary}
 		!insertmacro PreDrive
 	!endif
 	ReadEnvStr $0 PAC:Drive
-	WriteINIStr `${SETINI}` `${APPNAME}Settings` LastDrive `$0`
+	WriteINIStr `${CONFIGINI}` `${APPNAME}Settings` LastDrive `$0`
 !macroend
diff --git a/etc/source/Segments/Environment.nsh b/etc/source/Segments/Environment.nsh
new file mode 100644
index 0000000..4a94dd7
--- /dev/null
+++ b/etc/source/Segments/Environment.nsh
@@ -0,0 +1,25 @@
+;=#
+; 
+; PORTABLEAPPS COMPILER 
+; Developed by daemon.devin
+;
+; For support visit the GitHub project:
+; https://github.com/demondevin/pac-man
+; 
+; SEGMENT
+;   Environment.nsh
+;   This file handles the environment variables which are configured in the CompilerWrapper.ini file.
+; 
+
+${SegmentFile}
+${SegmentInit}
+	!ifmacrodef Variables
+		!insertmacro Variables
+	!endif
+!macroend
+${SegmentPre}
+	${ForEachINIPair} Environment $0 $1
+		ExpandEnvStrings $1 $1
+		System::Call `Kernel32::SetEnvironmentVariable(tr0,tr1)`
+	${NextINIPair}
+!macroend
diff --git a/Other/Source/Segments/ExecString.nsh b/etc/source/Segments/ExecString.nsh
similarity index 83%
rename from Other/Source/Segments/ExecString.nsh
rename to etc/source/Segments/ExecString.nsh
index 4fe7b66..0d75a00 100644
--- a/Other/Source/Segments/ExecString.nsh
+++ b/etc/source/Segments/ExecString.nsh
@@ -1,3 +1,16 @@
+;=#
+; 
+; PORTABLEAPPS COMPILER 
+; Developed by daemon.devin
+;
+; For support visit the GitHub project:
+; https://github.com/demondevin/pac-man
+; 
+; SEGMENT
+;   ExecString.nsh
+;   This file handles the $ExecString and prepares it before the wrapper can execute.
+; 
+
 ${SegmentFile}
 Var ExecString
 !ifdef ExecAsUser
@@ -16,7 +29,7 @@ ${SegmentPre}
 		!insertmacro CommandLineArguments
 	!else
 		ClearErrors
-		ReadINIStr $0 `${LAUNCHER}` Launch CommandLineArguments
+		ReadINIStr $0 `${WRAPPER}` Launch CommandLineArguments
 		${IfNot} ${Errors}
 			!ifmacrodef ParseCommandLineArguments
 				!insertmacro ParseCommandLineArguments
@@ -49,7 +62,7 @@ ${SegmentPre}
 	!endif
 	${If} $0 != ""
 		ClearErrors
-		ReadINIStr $1 `${LAUNCHER}` Launch WorkingDirectory
+		ReadINIStr $1 `${WRAPPER}` Launch WorkingDirectory
 		${If} ${Errors}
 			!ifdef ExecAsUser
 				StrCpy $Parameters "$Parameters $0"
diff --git a/Other/Source/Segments/FileWrite.nsh b/etc/source/Segments/FileWrite.nsh
similarity index 76%
rename from Other/Source/Segments/FileWrite.nsh
rename to etc/source/Segments/FileWrite.nsh
index 1c743bc..cefc098 100644
--- a/Other/Source/Segments/FileWrite.nsh
+++ b/etc/source/Segments/FileWrite.nsh
@@ -1,3 +1,16 @@
+;=#
+; 
+; PORTABLEAPPS COMPILER 
+; Developed by daemon.devin
+;
+; For support visit the GitHub project:
+; https://github.com/demondevin/pac-man
+; 
+; SEGMENT
+;   FileWrite.nsh
+;   This file handles file writes and text replacements that are declared in the CompilerWrapper.ini file.
+; 
+
 ${SegmentFile}
 ${SegmentPrePrimary}
 	!ifmacrodef FileWrite
@@ -7,19 +20,19 @@ ${SegmentPrePrimary}
 	${Do}
 		IntOp $R0 $R0 + 1
 		ClearErrors
-		ReadINIStr $0 `${LAUNCHER}` FileWrite$R0 Type
-		ReadINIStr $7 `${LAUNCHER}` FileWrite$R0 File
+		ReadINIStr $0 `${WRAPPER}` FileWrite$R0 Type
+		ReadINIStr $7 `${WRAPPER}` FileWrite$R0 File
 		${IfThen} ${Errors} ${|} ${ExitDo} ${|}
 		ExpandEnvStrings $0 $0
 		ExpandEnvStrings $7 $7
 		${If} $0 == ConfigWrite
-			ReadINIStr $2 `${LAUNCHER}` FileWrite$R0 Entry
-			ReadINIStr $3 `${LAUNCHER}` FileWrite$R0 Value
+			ReadINIStr $2 `${WRAPPER}` FileWrite$R0 Entry
+			ReadINIStr $3 `${WRAPPER}` FileWrite$R0 Value
 			${IfThen} ${Errors} ${|} ${ExitDo} ${|}
 			ExpandEnvStrings $2 $2
 			ExpandEnvStrings $3 $3
 			ClearErrors
-			ReadINIStr $4 `${LAUNCHER}` FileWrite$R0 CaseSensitive
+			ReadINIStr $4 `${WRAPPER}` FileWrite$R0 CaseSensitive
 			${If} $4 != true
 			${AndIf} $4 != false
 			${AndIfNot} ${Errors}
@@ -27,25 +40,25 @@ ${SegmentPrePrimary}
 				${Continue}
 			${EndIf}
 		${ElseIf} $0 == INI
-			ReadINIStr $2 `${LAUNCHER}` FileWrite$R0 Section
-			ReadINIStr $3 `${LAUNCHER}` FileWrite$R0 Key
-			ReadINIStr $4 `${LAUNCHER}` FileWrite$R0 Value
+			ReadINIStr $2 `${WRAPPER}` FileWrite$R0 Section
+			ReadINIStr $3 `${WRAPPER}` FileWrite$R0 Key
+			ReadINIStr $4 `${WRAPPER}` FileWrite$R0 Value
 			${IfThen} ${Errors} ${|} ${ExitDo} ${|}
 			ExpandEnvStrings $2 $2
 			ExpandEnvStrings $3 $3
 			ExpandEnvStrings $4 $4
 !ifdef XML_ENABLED
 		${ElseIf} $0 == "XML attribute"
-			ReadINIStr $R2 `${LAUNCHER}` FileWrite$R0 XPath
-			ReadINIStr $R3 `${LAUNCHER}` FileWrite$R0 Attribute
-			ReadINIStr $R4 `${LAUNCHER}` FileWrite$R0 Value
+			ReadINIStr $R2 `${WRAPPER}` FileWrite$R0 XPath
+			ReadINIStr $R3 `${WRAPPER}` FileWrite$R0 Attribute
+			ReadINIStr $R4 `${WRAPPER}` FileWrite$R0 Value
 			${IfThen} ${Errors} ${|} ${ExitDo} ${|}
 			ExpandEnvStrings $R2 $R2
 			ExpandEnvStrings $R3 $R3
 			ExpandEnvStrings $R4 $R4
 		${ElseIf} $0 == "XML text"
-			ReadINIStr $R2 `${LAUNCHER}` FileWrite$R0 XPath
-			ReadINIStr $R3 `${LAUNCHER}` FileWrite$R0 Value
+			ReadINIStr $R2 `${WRAPPER}` FileWrite$R0 XPath
+			ReadINIStr $R3 `${WRAPPER}` FileWrite$R0 Value
 			${IfThen} ${Errors} ${|} ${ExitDo} ${|}
 			ExpandEnvStrings $R2 $R2
 			ExpandEnvStrings $R3 $R3
@@ -57,13 +70,13 @@ ${SegmentPrePrimary}
 !endif
 !ifdef REPLACE
 		${ElseIf} $0 == Replace
-			ReadINIStr $2 `${LAUNCHER}` FileWrite$R0 Find
-			ReadINIStr $3 `${LAUNCHER}` FileWrite$R0 Replace
+			ReadINIStr $2 `${WRAPPER}` FileWrite$R0 Find
+			ReadINIStr $3 `${WRAPPER}` FileWrite$R0 Replace
 			${IfThen} ${Errors} ${|} ${ExitDo} ${|}
 			ExpandEnvStrings $2 $2
 			ExpandEnvStrings $3 $3
 			ClearErrors
-			ReadINIStr $4 `${LAUNCHER}` FileWrite$R0 CaseSensitive
+			ReadINIStr $4 `${WRAPPER}` FileWrite$R0 CaseSensitive
 			StrCpy $5 skip
 			${If} $4 == true
 				${If} $2 S!= $3
@@ -126,7 +139,7 @@ ${SegmentPrePrimary}
 !ifdef REPLACE
 			${ElseIf} $0 == Replace
 				ClearErrors
-				ReadINIStr $5 `${LAUNCHER}` FileWrite$R0 Encoding
+				ReadINIStr $5 `${WRAPPER}` FileWrite$R0 Encoding
 				${If} ${Errors}
 					FileOpen $9 $R1 r
 					FileReadByte $9 $5
diff --git a/Other/Source/Segments/FilesCleanup.nsh b/etc/source/Segments/FilesCleanup.nsh
similarity index 56%
rename from Other/Source/Segments/FilesCleanup.nsh
rename to etc/source/Segments/FilesCleanup.nsh
index 660538c..8c7b78d 100644
--- a/Other/Source/Segments/FilesCleanup.nsh
+++ b/etc/source/Segments/FilesCleanup.nsh
@@ -1,9 +1,22 @@
+;=#
+; 
+; PORTABLEAPPS COMPILER 
+; Developed by daemon.devin
+;
+; For support visit the GitHub project:
+; https://github.com/demondevin/pac-man
+; 
+; SEGMENT
+;   FilesCleanup.nsh
+;   This file allows support for cleaning up files that are configured in the CompilerWrapper.ini file.
+; 
+
 ${SegmentFile}
 ${SegmentPrePrimary}
 	StrCpy $R0 1
 	${Do}
 		ClearErrors
-		${ReadLauncherConfig} $R1 FilesCleanup $R0
+		${ReadWrapperConfig} $R1 FilesCleanup $R0
 		${IfThen} ${Errors} ${|} ${ExitDo} ${|}
 		${ParseLocations} $R1
 		Delete `$R1`
@@ -14,7 +27,7 @@ ${SegmentPostPrimary}
 	StrCpy $R0 1
 	${Do}
 		ClearErrors
-		${ReadLauncherConfig} $R1 FilesCleanup $R0
+		${ReadWrapperConfig} $R1 FilesCleanup $R0
 		${IfThen} ${Errors} ${|} ${ExitDo} ${|}
 		${ParseLocations} $R1
 		Delete `$R1`
@@ -25,7 +38,7 @@ ${SegmentUnload}
 	StrCpy $R0 1
 	${Do}
 		ClearErrors
-		${ReadLauncherConfig} $R1 FilesCleanup $R0
+		${ReadWrapperConfig} $R1 FilesCleanup $R0
 		${IfThen} ${Errors} ${|} ${ExitDo} ${|}
 		${ParseLocations} $R1
 		Delete `$R1`
diff --git a/Other/Source/Segments/FilesMove.nsh b/etc/source/Segments/FilesMove.nsh
similarity index 89%
rename from Other/Source/Segments/FilesMove.nsh
rename to etc/source/Segments/FilesMove.nsh
index 324e3e3..87bc32d 100644
--- a/Other/Source/Segments/FilesMove.nsh
+++ b/etc/source/Segments/FilesMove.nsh
@@ -1,4 +1,17 @@
-!define BAK BackupBy${APPNAME}
+;=#
+; 
+; PORTABLEAPPS COMPILER 
+; Developed by daemon.devin
+;
+; For support visit the GitHub project:
+; https://github.com/demondevin/pac-man
+; 
+; SEGMENT
+;   FilesMove.nsh
+;   This file provides support for moving files that are configured in the CompilerWrapper.ini file.
+; 
+
+!define BAK "BackupBy${APPNAME}"
 !define File::BackupLocal "!insertmacro File::BackupLocal"
 !macro File::BackupLocal _LOCALFILE
 	Delete `${_LOCALFILE}.${BAK}`
@@ -31,10 +44,11 @@
 	ExpandEnvStrings $0 $0
 	ExpandEnvStrings $1 $1
 	${GetFileName} $0 $2
-	StrCpy $0 ${DATA}\$0
+	StrCpy $0 ${SET}\$0
 	StrCpy $4 $1
 	StrCpy $1 $1\$2
 !macroend
+
 ${SegmentFile}
 ${SegmentPrePrimary}
 	!ifmacrodef PreFilesMove
@@ -50,7 +64,7 @@ ${SegmentPrePrimary}
 		StrCpy $7 not-in-package
 		${If} $7 != in-package
 			${ForEachFile} $4 $2 $1
-				Delete $4.${BAK}
+				Delete "$4.${BAK}"
 				Rename $4 $4.${BAK}
 			${NextFile}
 		${Else}
diff --git a/Other/Source/Segments/Fonts.nsh b/etc/source/Segments/Fonts.nsh
similarity index 84%
rename from Other/Source/Segments/Fonts.nsh
rename to etc/source/Segments/Fonts.nsh
index 2cf14b0..526f8fb 100644
--- a/Other/Source/Segments/Fonts.nsh
+++ b/etc/source/Segments/Fonts.nsh
@@ -1,90 +1,103 @@
-!define FNTDIR    `${DATA}\Fonts`
-!define FNTXT     `${FNTDIR}\.Portable.Fonts.txt`
-!define DEFFNTXT  `${DEFDATA}\Fonts\.Portable.Fonts.txt`
-!define FNT1      `• Font(s) added in here are portabilized and are available for usage during runtime.$\r$\n`
-!define FNT2      `• Supported: .fon, .fnt, .ttf, .ttc, .fot, .otf, .mmm, .pfb, .pfm.`
-Function Fonts::Import
-	!macro _Fonts::Import _DIR
-		Push `${_DIR}`
-		Call Fonts::Import
-	!macroend
-	!define Fonts::Import `!insertmacro _Fonts::Import`
-	Exch $0
-	Push $1
-	Push $2
-	Push $3
-	FindFirst $1 $2 `$0\*`
-	StrCmpS $1 "" +19
-	StrCmpS $2 "" +18
-	StrCmpS $2 "." +15
-	StrCmpS $2 ".." +14
-	StrCpy $3 $2 "" -4
-	StrCmp $3 .fon +10
-	StrCmp $3 .fnt +9
-	StrCmp $3 .ttf +8
-	StrCmp $3 .ttc +7
-	StrCmp $3 .fot +6
-	StrCmp $3 .otf +5
-	StrCmp $3 .mmm +4
-	StrCmp $3 .pfb +3
-	StrCmp $3 .pfm +2
-	Goto +3
-	System::Call `GDI32::AddFontResource(t"$0\$2").R3`
-	SendMessage 0xFFFF 0x001D 0 0 /TIMEOUT=1
-	FindNext $1 $2
-	Goto -17
-	FindClose $1
-	Pop $3
-	Pop $2
-	Pop $1
-	Pop $0
-FunctionEnd
-Function Fonts::Restore
-	!macro _Fonts::Restore _DIR
-		Push `${_DIR}`
-		Call Fonts::Restore
-	!macroend
-	!define Fonts::Restore `!insertmacro _Fonts::Restore`
-	Exch $0
-	Push $1
-	Push $2
-	Push $3
-	FindFirst $1 $2 `$0\*`
-	StrCmpS $1 "" +19
-	StrCmpS $2 "" +18
-	StrCmpS $2 "." +15
-	StrCmpS $2 ".." +14
-	StrCpy $3 $2 "" -4
-	StrCmp $3 .fon +10
-	StrCmp $3 .fnt +9
-	StrCmp $3 .ttf +8
-	StrCmp $3 .ttc +7
-	StrCmp $3 .fot +6
-	StrCmp $3 .otf +5
-	StrCmp $3 .mmm +4
-	StrCmp $3 .pfb +3
-	StrCmp $3 .pfm +2
-	Goto +3
-	System::Call `GDI32::RemoveFontResource(t"$0\$2").R3`
-	SendMessage 0xFFFF 0x001D 0 0 /TIMEOUT=1
-	FindNext $1 $2
-	Goto -17
-	FindClose $1
-	Pop $3
-	Pop $2
-	Pop $1
-	Pop $0
-FunctionEnd
-
-${SegmentFile}
-${SegmentPrePrimary}
-	IfFileExists `${FNTXT}` +3
-	CreateDirectory `${FNTDIR}`	
-	CopyFiles /SILENT `${DEFFNTXT}` `${FNTXT}`
-	Push `${FNTDIR}`
-	Call Fonts::Import
-!macroend
-${SegmentUnload}
-	Push `${FNTDIR}`
-	Call Fonts::Restore
-!macroend
+;=#
+; 
+; PORTABLEAPPS COMPILER 
+; Developed by daemon.devin
+;
+; For support visit the GitHub project:
+; https://github.com/demondevin/pac-man
+; 
+; SEGMENT
+;   Fonts.nsh
+;   This file provides support for handling importing/restoring of fonts.
+; 
+
+!define FNTDIR    `${SET}\Fonts`
+!define FNTXT     `${FNTDIR}\.Portable.Fonts.txt`
+!define DEFFNTXT  `${DEFSET}\Fonts\.Portable.Fonts.txt`
+!define FNT1      `• Font(s) added in here are portabilized and are available for usage during runtime.$\r$\n`
+!define FNT2      `• Supported: .fon, .fnt, .ttf, .ttc, .fot, .otf, .mmm, .pfb, .pfm.`
+Function Fonts::Import
+	!macro _Fonts::Import _DIR
+		Push `${_DIR}`
+		Call Fonts::Import
+	!macroend
+	!define Fonts::Import `!insertmacro _Fonts::Import`
+	Exch $0
+	Push $1
+	Push $2
+	Push $3
+	FindFirst $1 $2 `$0\*`
+	StrCmpS $1 "" +19
+	StrCmpS $2 "" +18
+	StrCmpS $2 "." +15
+	StrCmpS $2 ".." +14
+	StrCpy $3 $2 "" -4
+	StrCmp $3 .fon +10
+	StrCmp $3 .fnt +9
+	StrCmp $3 .ttf +8
+	StrCmp $3 .ttc +7
+	StrCmp $3 .fot +6
+	StrCmp $3 .otf +5
+	StrCmp $3 .mmm +4
+	StrCmp $3 .pfb +3
+	StrCmp $3 .pfm +2
+	Goto +3
+	System::Call `GDI32::AddFontResource(t"$0\$2").R3`
+	SendMessage 0xFFFF 0x001D 0 0 /TIMEOUT=1
+	FindNext $1 $2
+	Goto -17
+	FindClose $1
+	Pop $3
+	Pop $2
+	Pop $1
+	Pop $0
+FunctionEnd
+Function Fonts::Restore
+	!macro _Fonts::Restore _DIR
+		Push `${_DIR}`
+		Call Fonts::Restore
+	!macroend
+	!define Fonts::Restore `!insertmacro _Fonts::Restore`
+	Exch $0
+	Push $1
+	Push $2
+	Push $3
+	FindFirst $1 $2 `$0\*`
+	StrCmpS $1 "" +19
+	StrCmpS $2 "" +18
+	StrCmpS $2 "." +15
+	StrCmpS $2 ".." +14
+	StrCpy $3 $2 "" -4
+	StrCmp $3 .fon +10
+	StrCmp $3 .fnt +9
+	StrCmp $3 .ttf +8
+	StrCmp $3 .ttc +7
+	StrCmp $3 .fot +6
+	StrCmp $3 .otf +5
+	StrCmp $3 .mmm +4
+	StrCmp $3 .pfb +3
+	StrCmp $3 .pfm +2
+	Goto +3
+	System::Call `GDI32::RemoveFontResource(t"$0\$2").R3`
+	SendMessage 0xFFFF 0x001D 0 0 /TIMEOUT=1
+	FindNext $1 $2
+	Goto -17
+	FindClose $1
+	Pop $3
+	Pop $2
+	Pop $1
+	Pop $0
+FunctionEnd
+
+${SegmentFile}
+${SegmentPrePrimary}
+	IfFileExists `${FNTXT}` +3
+	CreateDirectory `${FNTDIR}`	
+	CopyFiles /SILENT `${DEFFNTXT}` `${FNTXT}`
+	Push `${FNTDIR}`
+	Call Fonts::Import
+!macroend
+${SegmentUnload}
+	Push `${FNTDIR}`
+	Call Fonts::Restore
+!macroend
diff --git a/Other/Source/Segments/Ghostscript.nsh b/etc/source/Segments/Ghostscript.nsh
similarity index 91%
rename from Other/Source/Segments/Ghostscript.nsh
rename to etc/source/Segments/Ghostscript.nsh
index dbf8a0c..df406a3 100644
--- a/Other/Source/Segments/Ghostscript.nsh
+++ b/etc/source/Segments/Ghostscript.nsh
@@ -1,3 +1,16 @@
+;=#
+; 
+; PORTABLEAPPS COMPILER 
+; Developed by daemon.devin
+;
+; For support visit the GitHub project:
+; https://github.com/demondevin/pac-man
+; 
+; SEGMENT
+;   Ghostscript.nsh
+;   This file allows support for using Ghostscript.
+; 
+
 Var GSMode
 Var GSDirectory
 Var GSRegExists
@@ -49,7 +62,7 @@ ${SegmentInit}
 	; If it's in none of those, give up. [Activate]:Ghostscript=require will
 	; then abort, [Activate]:Ghostscript=find will not set it.
 	ClearErrors
-	${ReadLauncherConfig} $GSMode Activate Ghostscript
+	${ReadWrapperConfig} $GSMode Activate Ghostscript
 	${If} $GSMode == find
 	${OrIf} $GSMode == require
 		StrCpy $GSDirectory $PortableAppsDirectory\CommonFiles\Ghostscript
diff --git a/Other/Source/Segments/InstanceManagement.nsh b/etc/source/Segments/InstanceManagement.nsh
similarity index 71%
rename from Other/Source/Segments/InstanceManagement.nsh
rename to etc/source/Segments/InstanceManagement.nsh
index ef5c8b4..7a3c8f9 100644
--- a/Other/Source/Segments/InstanceManagement.nsh
+++ b/etc/source/Segments/InstanceManagement.nsh
@@ -1,3 +1,16 @@
+;=#
+; 
+; PORTABLEAPPS COMPILER 
+; Developed by daemon.devin
+;
+; For support visit the GitHub project:
+; https://github.com/demondevin/pac-man
+; 
+; SEGMENT
+;   InstanceManagement.nsh
+;   This file handles the launch of a secondary instance of an application.
+; 
+
 Var SecondaryLaunch
 !macro _InstanceManagement_QuitIfRunning
 	${If} $SecondaryLaunch != true
@@ -15,7 +28,7 @@ ${SegmentInit}
 	!else
 		${IfNot} $0 = 0
 			ClearErrors
-			${ReadLauncherConfig} $0 Launch SinglePortableAppInstance
+			${ReadWrapperConfig} $0 Launch SinglePortableAppInstance
 			${If} $0 == true
 				Quit
 			${ElseIf} $0 != false
@@ -27,7 +40,7 @@ ${SegmentInit}
 		${EndIf}
 	!endif
 	ClearErrors
-	${ReadLauncherConfig} $0 Launch SingleAppInstance
+	${ReadWrapperConfig} $0 Launch SingleAppInstance
 	${If} $0 == true
 	${OrIf} ${Errors}
 		${IfNot} $UsingJavaExecutable == true
@@ -38,7 +51,7 @@ ${SegmentInit}
 		${InvalidValueError} [Launch]:SingleAppInstance $0
 	${EndIf}
 	ClearErrors
-	${ReadLauncherConfig} $0 Launch CloseEXE
+	${ReadWrapperConfig} $0 Launch CloseEXE
 	${IfNot} ${Errors}
 		!insertmacro _InstanceManagement_QuitIfRunning
 	${EndIf}
@@ -47,7 +60,7 @@ ${SegmentInit}
 	!endif
 	${If} $WaitForProgram == ""
 		ClearErrors
-		${ReadLauncherConfig} $WaitForProgram Launch WaitForProgram
+		${ReadWrapperConfig} $WaitForProgram Launch WaitForProgram
 		${IfNot} ${Errors}
 		${AndIf} $WaitForProgram != true
 		${AndIf} $WaitForProgram != false
@@ -57,9 +70,9 @@ ${SegmentInit}
 	!ifmacrodef EXE
 		!insertmacro EXE
 	!endif
-	${IfNot} ${FileExists} `$EXEDIR\App\$ProgramExecutable`
+	${IfNot} ${FileExists} `$EXEDIR\bin\$ProgramExecutable`
 	${AndIfNot} $UsingJavaExecutable == true
-		StrCpy $MissingFileOrPath `App\$ProgramExecutable`
+		StrCpy $MissingFileOrPath `bin\$ProgramExecutable`
 		MessageBox MB_ICONSTOP|MB_TOPMOST `$(LauncherFileNotFound)`
 		Quit
 	${EndIf}
diff --git a/Other/Source/Segments/Java.nsh b/etc/source/Segments/Java.nsh
similarity index 87%
rename from Other/Source/Segments/Java.nsh
rename to etc/source/Segments/Java.nsh
index fa220e9..71f10f5 100644
--- a/Other/Source/Segments/Java.nsh
+++ b/etc/source/Segments/Java.nsh
@@ -1,7 +1,20 @@
+;=#
+; 
+; PORTABLEAPPS COMPILER 
+; Developed by daemon.devin
+;
+; For support visit the GitHub project:
+; https://github.com/demondevin/pac-man
+; 
+; SEGMENT
+;   Java.nsh
+;   This file enables support for using Java or JDK.
+; 
+
 ${SegmentFile}
 ${SegmentInit}
 	ClearErrors
-	${ReadLauncherConfig} $JavaMode Activate Java
+	${ReadWrapperConfig} $JavaMode Activate Java
 	${If} $JavaMode == find
 	${OrIf} $JavaMode == require
 		!ifmacrodef JAVA
diff --git a/Other/Source/Segments/Language.nsh b/etc/source/Segments/Language.nsh
similarity index 76%
rename from Other/Source/Segments/Language.nsh
rename to etc/source/Segments/Language.nsh
index c51686f..7f09478 100644
--- a/Other/Source/Segments/Language.nsh
+++ b/etc/source/Segments/Language.nsh
@@ -1,3 +1,20 @@
+;=#
+; 
+; PORTABLEAPPS COMPILER 
+; Developed by daemon.devin
+;
+; For support visit the GitHub project:
+; https://github.com/demondevin/pac-man
+; 
+; SEGMENT
+;   Language.nsh
+;   This file allows support for language handling and manipulates language variables.
+; 
+
+!ifndef _XML_LIB_
+	!include XML.nsh
+!endif
+
 ${SegmentFile}
 ${Segment.onInit}
 	!ifmacrodef Lang
@@ -39,16 +56,16 @@ ${SegmentInit}
 			${EndIf}
 			${If} $9 == pap-missing
 				ClearErrors
-				${ReadLauncherConfig} $R0 LanguageFile Type
-				${ReadLauncherConfig} $R1 LanguageFile File
+				${ReadWrapperConfig} $R0 LanguageFile Type
+				${ReadWrapperConfig} $R1 LanguageFile File
 				${ParseLocations} $R1
 				${IfNot} ${Errors}
 				${AndIf} ${FileExists} $R1
 					StrCpy $R8 ""
 					${If} $R0 == ConfigRead
-						${ReadLauncherConfig} $R2 LanguageFile Entry
+						${ReadWrapperConfig} $R2 LanguageFile Entry
 						${IfNot} ${Errors}
-							${ReadLauncherConfig} $R4 LanguageFile CaseSensitive
+							${ReadWrapperConfig} $R4 LanguageFile CaseSensitive
 							${If} ${FileExists} $R1
 								${If} $R4 == true
 									${ConfigReadS} $R1 $R2 $R8
@@ -62,22 +79,22 @@ ${SegmentInit}
 							${EndIf}
 						${EndIf}
 					${ElseIf} $R0 == INI
-						${ReadLauncherConfig} $R2 LanguageFile Section
-						${ReadLauncherConfig} $R3 LanguageFile Key
+						${ReadWrapperConfig} $R2 LanguageFile Section
+						${ReadWrapperConfig} $R3 LanguageFile Key
 						${IfNot} ${Errors}
 							ReadINIStr $R8 $R1 $R2 $R3
 						${EndIf}
 		!ifdef XML_ENABLED
 					${ElseIf} $R0 == "XML attribute"
-						${ReadLauncherConfig} $R2 LanguageFile XPath
-						${ReadLauncherConfig} $R3 LanguageFile Attribute
+						${ReadWrapperConfig} $R2 LanguageFile XPath
+						${ReadWrapperConfig} $R3 LanguageFile Attribute
 						${IfNot} ${Errors}
 							${If} ${FileExists} $R1
 								${XMLReadAttrib} $R1 $R2 $R3 $R8
 							${EndIf}
 						${EndIf}
 					${ElseIf} $R0 == "XML text"
-						${ReadLauncherConfig} $R2 LanguageFile XPath
+						${ReadWrapperConfig} $R2 LanguageFile XPath
 						${If} ${FileExists} $R1
 							${XMLReadText} $R1 $R2 $R8
 						${EndIf}
@@ -91,7 +108,7 @@ ${SegmentInit}
 					${EndIf}
 					${If} $R8 != ""
 						ClearErrors
-						${ReadLauncherConfig} $R0 LanguageFile TrimRight
+						${ReadWrapperConfig} $R0 LanguageFile TrimRight
 						${IfNot} ${Errors}
 							; See if it ends with this string.
 							StrLen $R1 $R0
@@ -101,7 +118,7 @@ ${SegmentInit}
 							${EndIf}
 						${EndIf}
 						ClearErrors
-						${ReadLauncherConfig} $R0 LanguageFile TrimLeft
+						${ReadWrapperConfig} $R0 LanguageFile TrimLeft
 						${IfNot} ${Errors}
 							; See if it ends with this string.
 							StrLen $R1 $R0
@@ -117,14 +134,14 @@ ${SegmentInit}
 			ClearErrors
 			ReadEnvStr $8 PAC:LanguageCustom
 			${If} ${Errors}
-				${ReadLauncherConfig} $0 Language Base
+				${ReadWrapperConfig} $0 Language Base
 				${If} $0 != ""
 					${ParseLocations} $0
 					ClearErrors
-					${ReadLauncherConfig} $1 LanguageStrings $0
+					${ReadWrapperConfig} $1 LanguageStrings $0
 					${If} ${Errors}
 						ClearErrors
-						${ReadLauncherConfig} $1 Language Default
+						${ReadWrapperConfig} $1 Language Default
 						${IfNot} ${Errors}
 							${ParseLocations} $1
 						${Else}
@@ -132,11 +149,11 @@ ${SegmentInit}
 						${EndIf}
 					${EndIf}
 					${SetEnvironmentVariable} PAC:LanguageCustom $1
-					${ReadLauncherConfig} $2 Language CheckIfExists
+					${ReadWrapperConfig} $2 Language CheckIfExists
 					${If} $2 != ""
 						${ParseLocations} $2
 						${IfNot} ${FileExists} $2
-							${ReadLauncherConfig} $1 Language DefaultIfNotExists
+							${ReadWrapperConfig} $1 Language DefaultIfNotExists
 							${ParseLocations} $1
 							${SetEnvironmentVariable} PAC:LanguageCustom $1
 						${EndIf}
diff --git a/Other/Source/Segments/LastRunEnvironment.nsh b/etc/source/Segments/LastRunEnvironment.nsh
similarity index 50%
rename from Other/Source/Segments/LastRunEnvironment.nsh
rename to etc/source/Segments/LastRunEnvironment.nsh
index 2f3338f..fa1de83 100644
--- a/Other/Source/Segments/LastRunEnvironment.nsh
+++ b/etc/source/Segments/LastRunEnvironment.nsh
@@ -1,17 +1,47 @@
-; First, declare that this is a segment file.
-${SegmentFile}
+;=#
+; 
+; PORTABLEAPPS COMPILER 
+; Developed by daemon.devin
+;
+; For support visit the GitHub project:
+; https://github.com/demondevin/pac-man
+; 
+; SEGMENT
+;   LastRunEnvironment.nsh
+;   This file provides a way for custom code to get and set persistent variables.
+; 
 
+!macro ReadLastRunEnvironmentVariable out var
+	${DebugMsg} "Reading last run environment variable ${var} into $${out}"
+	ReadINIStr ${out} ${CONFIGINI} LastRunEnvironment `${var}`
+!macroend
+!define ReadLastRunEnvironmentVariable "!insertmacro ReadLastRunEnvironmentVariable"
+!macro WriteLastRunEnvironmentVariable var value
+	Push $R0
+	ExpandEnvStrings $R0 `${value}`
+	${DebugMsg} "Environment variable expansion on $$R0:$\r$\nBefore: `${value}`$\r$\nAfter: `$R0`"
+	${DebugMsg} "Persisting environment variable ${var} with value `$R0`"
+	WriteINIStr ${CONFIGINI} LastRunEnvironment `${var}` $R0
+	Pop $R0
+!macroend
+!define WriteLastRunEnvironmentVariable "!insertmacro WriteLastRunEnvironmentVariable"
+!macro _LastRunEnvironment_WriteInternalFromEnvironmentVariable name envvar
+	ReadEnvStr $R0 `${envvar}`
+	${DebugMsg} "Saving internal last run environment variable `${name}` from `${envvar}` as `$R0`"
+	WriteINIStr ${CONFIGINI} PortableAppsCompilerLastRunEnvironment `${name}` $R0
+!macroend
+!define LREWriteFromEV "!insertmacro _LastRunEnvironment_WriteInternalFromEnvironmentVariable"
 
-; Next, restore the saved values before [Environment] is parsed.
+${SegmentFile}
 ${SegmentPre}
 	; First, load PAC's own last run environment
-	${ForEachINIPairWithFile} $EXEDIR\Data\settings\$AppIDSettings.ini PortableAppsCompilerLastRunEnvironment $0 $1
+	${ForEachINIPairWithFile} ${CONFIGINI} PortableAppsCompilerLastRunEnvironment $0 $1
 		${DebugMsg} "Setting internal last run environment variable $0 to $1"
 		; Treat all LREs as paths
 		${SetEnvironmentVariablesPath} $0 $1
 	${NextINIPairWithFile}
 
-	; Read the keys from launcher.ini, not from $AppIDSettings.ini; this will allow the developer to update the loaded variables.
+	; Read the keys from CompilerWrapper.ini; this will allow the developer to update the loaded variables.
 	${ForEachINIPair} LastRunEnvironment $0 $1
 		; Check for a directory variable
 		StrCpy $2 $0 1 -1
@@ -30,22 +60,18 @@ ${SegmentPre}
 		${EndIf}
 	${NextINIPair}
 !macroend
-
-
 ${SegmentPrePrimary}
 	; Write some internal LREs not written anywhere else
-	!insertmacro _LastRunEnvironment_WriteInternalFromEnvironmentVariable PAC:LastAppDirectory                       PAC:AppDir
-	!insertmacro _LastRunEnvironment_WriteInternalFromEnvironmentVariable PAC:LastDataDirectory                      PAC:DataDir
-	!insertmacro _LastRunEnvironment_WriteInternalFromEnvironmentVariable PAC:LastPortableAppsDirectory              PAC:PortableAppsDir
-	!insertmacro _LastRunEnvironment_WriteInternalFromEnvironmentVariable PAC:LastPortableAppsDocumentsDirectory PortableAppsDocuments
-	!insertmacro _LastRunEnvironment_WriteInternalFromEnvironmentVariable PAC:LastPortableAppsPicturesDirectory  PortableAppsPictures
-	!insertmacro _LastRunEnvironment_WriteInternalFromEnvironmentVariable PAC:LastPortableAppsMusicDirectory     PortableAppsMusic
-	!insertmacro _LastRunEnvironment_WriteInternalFromEnvironmentVariable PAC:LastPortableAppsVideosDirectory    PortableAppsVideos
+	${LREWriteFromEV} PAC:LastAppDirectory						PAC:AppDir
+	${LREWriteFromEV} PAC:LastDataDirectory						PAC:DataDir
+	${LREWriteFromEV} PAC:LastPortableAppsDirectory				PAC:PortableAppsDir
+	${LREWriteFromEV} PAC:LastPortableAppsDocumentsDirectory	PortableAppsDocuments
+	${LREWriteFromEV} PAC:LastPortableAppsPicturesDirectory		PortableAppsPictures
+	${LREWriteFromEV} PAC:LastPortableAppsMusicDirectory		PortableAppsMusic
+	${LREWriteFromEV} PAC:LastPortableAppsVideosDirectory		PortableAppsVideos
 !macroend
-
-
-; And finally, save the persistent data after [Environment] is processed.
 ${SegmentPreExecPrimary}
+	; And finally, save the persistent data after [Environment] is processed.
 	${ForEachINIPair} LastRunEnvironment $0 $1
 		; Check for a directory variable
 		StrCpy $2 $0 1 -1
@@ -55,28 +81,3 @@ ${SegmentPreExecPrimary}
 		${WriteLastRunEnvironmentVariable} $0 $1
 	${NextINIPair}
 !macroend
-
-
-; Also provide a way for custom code to get and set persistent variables
-!macro ReadLastRunEnvironmentVariable out var
-	${DebugMsg} "Reading last run environment variable ${var} into $${out}"
-	ReadINIStr ${out} $DataDirectory\settings\$AppIDSettings.ini LastRunEnvironment `${var}`
-!macroend
-!define ReadLastRunEnvironmentVariable "!insertmacro ReadLastRunEnvironmentVariable"
-!macro WriteLastRunEnvironmentVariable var value
-	Push $R0
-	ExpandEnvStrings $R0 `${value}`
-	${DebugMsg} "Environment variable expansion on $$R0:$\r$\nBefore: `${value}`$\r$\nAfter: `$R0`"
-	${DebugMsg} "Persisting environment variable ${var} with value `$R0`"
-	WriteINIStr $DataDirectory\settings\$AppIDSettings.ini LastRunEnvironment `${var}` $R0
-	Pop $R0
-!macroend
-!define WriteLastRunEnvironmentVariable "!insertmacro WriteLastRunEnvironmentVariable"
-
-
-; And automatize the writing of internal LREs from environment variables
-!macro _LastRunEnvironment_WriteInternalFromEnvironmentVariable name envvar
-	ReadEnvStr $R0 `${envvar}`
-	${DebugMsg} "Saving internal last run environment variable `${name}` from `${envvar}` as `$R0`"
-	WriteINIStr $DataDirectory\settings\$AppIDSettings.ini PortableAppsCompilerLastRunEnvironment `${name}` $R0
-!macroend
diff --git a/Other/Source/Segments/OperatingSystem.nsh b/etc/source/Segments/OperatingSystem.nsh
similarity index 74%
rename from Other/Source/Segments/OperatingSystem.nsh
rename to etc/source/Segments/OperatingSystem.nsh
index 77067d9..53b836e 100644
--- a/Other/Source/Segments/OperatingSystem.nsh
+++ b/etc/source/Segments/OperatingSystem.nsh
@@ -1,7 +1,24 @@
-!include WinVer.nsh
-!macro _OperatingSystem_CheckOS Check Value
+;=#
+; 
+; PORTABLEAPPS COMPILER 
+; Developed by daemon.devin
+;
+; For support visit the GitHub project:
+; https://github.com/demondevin/pac-man
+; 
+; SEGMENT
+;   OperatingSystem.nsh
+;   This file handles support for the Host's allotted minimum/maximum operating system version.
+; 
+
+!ifndef ___WINVER__NSH___
+	!include WinVer.nsh
+!endif
+
+!define CheckOS "!insertmacro _CheckOS"
+!macro _CheckOS Check Value
 	ClearErrors
-	${ReadLauncherConfig} $0 Launch ${Value}
+	${ReadWrapperConfig} $0 Launch ${Value}
 	${Select} $0
 		${Case} 2000
 			${IfNotThen} ${At${Check}Win2000}   ${|} StrCpy $2 bad-os ${|}
@@ -48,11 +65,12 @@
 		Quit
 	${EndIf}
 !macroend
+
 ${SegmentFile}
 ${Segment.onInit}
 	!ifmacrodef OS
 		!insertmacro OS
 	!endif
-	!insertmacro _OperatingSystem_CheckOS Least MinOS
-	!insertmacro _OperatingSystem_CheckOS Most MaxOS
+	${CheckOS} Least MinOS
+	${CheckOS} Most MaxOS
 !macroend
diff --git a/Other/Source/Segments/PathChecks.nsh b/etc/source/Segments/PathChecks.nsh
similarity index 77%
rename from Other/Source/Segments/PathChecks.nsh
rename to etc/source/Segments/PathChecks.nsh
index c17d960..405c4e4 100644
--- a/Other/Source/Segments/PathChecks.nsh
+++ b/etc/source/Segments/PathChecks.nsh
@@ -1,3 +1,16 @@
+;=#
+; 
+; PORTABLEAPPS COMPILER 
+; Developed by daemon.devin
+;
+; For support visit the GitHub project:
+; https://github.com/demondevin/pac-man
+; 
+; SEGMENT
+;   PathChecks.nsh
+;   This file checks and verifies the current path for UNC/spaces support before launching the wrapper.
+; 
+
 ${SegmentFile}
 ${SegmentInit}
 	${If} $EXEDIR startswith $PROGRAMFILES32
@@ -18,7 +31,7 @@ ${SegmentInit}
 	StrCpy $1 nounc
 	${IfThen} $EXEDIR startswith "\\" ${|} StrCpy $1 unc ${|}
 	ClearErrors
-	${ReadLauncherConfig} $0 Launch SupportsUNC
+	${ReadWrapperConfig} $0 Launch SupportsUNC
 	${If} $0 == no
 		${If} $1 == unc
 			MessageBox MB_ICONSTOP|MB_TOPMOST `$(LauncherNoUNCSupport)`
@@ -36,7 +49,7 @@ ${SegmentInit}
 		${InvalidValueError} [Launch]:SupportsUNC $0
 	${EndIf}
 	ClearErrors
-	${ReadLauncherConfig} $0 Launch NoSpacesInPath
+	${ReadWrapperConfig} $0 Launch NoSpacesInPath
 	${If} $0 == true
 		${WordFind} $EXEDIR ` ` E+1 $R9
 		${IfNot} ${Errors}
diff --git a/Other/Source/Segments/Qt.nsh b/etc/source/Segments/Qt.nsh
similarity index 61%
rename from Other/Source/Segments/Qt.nsh
rename to etc/source/Segments/Qt.nsh
index 9866d21..35e1c9c 100644
--- a/Other/Source/Segments/Qt.nsh
+++ b/etc/source/Segments/Qt.nsh
@@ -1,26 +1,39 @@
-${SegmentFile}
-${SegmentPostPrimary}
-	!ifmacrodef PreQT
-		!insertmacro PreQT
-	!endif
-	StrCpy $R0 1
-	${Do}
-		ClearErrors
-		${ReadLauncherConfig} $0 QtKeysCleanup $R0
-		${IfThen} ${Errors} ${|} ${ExitDo} ${|}
-		!ifmacrodef CustomQT
-			!insertmacro CustomQT
-		!else
-			StrCpy $1 Software\Trolltech\OrganizationDefaults\$0\$AppDirectory
-		!endif
-		DeleteRegKey HKCU $1
-		${Do}
-			${GetParent} $1 $1
-			DeleteRegKey /ifempty HKCU $1
-		${LoopUntil} $1 == Software\Trolltech
-		IntOp $R0 $R0 + 1
-	${Loop}
-	!ifmacrodef PostQT
-		!insertmacro PostQT
-	!endif
-!macroend
+;=#
+; 
+; PORTABLEAPPS COMPILER 
+; Developed by daemon.devin
+;
+; For support visit the GitHub project:
+; https://github.com/demondevin/pac-man
+; 
+; SEGMENT
+;   Qt.nsh
+;   This file handles the clean up of any Qt registry entries that are declared in the CompilerWrapper.ini file.
+; 
+
+${SegmentFile}
+${SegmentPostPrimary}
+	!ifmacrodef PreQT
+		!insertmacro PreQT
+	!endif
+	StrCpy $R0 1
+	${Do}
+		ClearErrors
+		${ReadWrapperConfig} $0 QtKeysCleanup $R0
+		${IfThen} ${Errors} ${|} ${ExitDo} ${|}
+		!ifmacrodef CustomQT
+			!insertmacro CustomQT
+		!else
+			StrCpy $1 Software\Trolltech\OrganizationDefaults\$0\$AppDirectory
+		!endif
+		DeleteRegKey HKCU $1
+		${Do}
+			${GetParent} $1 $1
+			DeleteRegKey /ifempty HKCU $1
+		${LoopUntil} $1 == Software\Trolltech
+		IntOp $R0 $R0 + 1
+	${Loop}
+	!ifmacrodef PostQT
+		!insertmacro PostQT
+	!endif
+!macroend
diff --git a/Other/Source/Segments/RefreshShellIcons.nsh b/etc/source/Segments/RefreshShellIcons.nsh
similarity index 60%
rename from Other/Source/Segments/RefreshShellIcons.nsh
rename to etc/source/Segments/RefreshShellIcons.nsh
index 0494aeb..2aa44e3 100644
--- a/Other/Source/Segments/RefreshShellIcons.nsh
+++ b/etc/source/Segments/RefreshShellIcons.nsh
@@ -1,15 +1,29 @@
+;=#
+; 
+; PORTABLEAPPS COMPILER 
+; Developed by daemon.devin
+;
+; For support visit the GitHub project:
+; https://github.com/demondevin/pac-man
+; 
+; SEGMENT
+;   RefreshShellIcons.nsh
+;   This file enables support for handling the icon cache of Windows Explorer to refresh them before and after launch.
+; 
+
 !ifndef SHCNE_ASSOCCHANGED
 	!define SHCNE_ASSOCCHANGED 0x08000000
 !endif
 !ifndef SHCNF_IDLIST
 	!define SHCNF_IDLIST 0
 !endif
+
 ${SegmentFile}
 ${SegmentPreExec}
 	!ifmacrodef PreShellIcons
 		!insertmacro PreShellIcons
 	!else
-		${ReadLauncherConfig} $0 Launch RefreshShellIcons
+		${ReadWrapperConfig} $0 Launch RefreshShellIcons
 		StrCmp $0 before +2
 		StrCmp $0 both 0 +2
 		System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (${SHCNE_ASSOCCHANGED}, ${SHCNF_IDLIST}, 0, 0)'
@@ -19,7 +33,7 @@ ${SegmentPost}
 	!ifmacrodef PostShellIcons
 		!insertmacro PostShellIcons
 	!else
-		${ReadLauncherConfig} $0 Launch RefreshShellIcons
+		${ReadWrapperConfig} $0 Launch RefreshShellIcons
 		StrCmp $0 after +2
 		StrCmp $0 both 0 +2
 		System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (${SHCNE_ASSOCCHANGED}, ${SHCNF_IDLIST}, 0, 0)'
diff --git a/Other/Source/Segments/RegisterDLL.nsh b/etc/source/Segments/RegisterDLL.nsh
similarity index 85%
rename from Other/Source/Segments/RegisterDLL.nsh
rename to etc/source/Segments/RegisterDLL.nsh
index 01eac70..7196d0e 100644
--- a/Other/Source/Segments/RegisterDLL.nsh
+++ b/etc/source/Segments/RegisterDLL.nsh
@@ -1,9 +1,16 @@
 ;=#
+; 
+; PORTABLEAPPS COMPILER 
+; Developed by daemon.devin
 ;
-; RegisterDLL.nsh
+; For support visit the GitHub project:
+; https://github.com/demondevin/pac-man
 ; 
-; This file is used to register DLL files.
+; SEGMENT
+;   RegisterDLL.nsh
+;   This file is used to register DLL files that are configured in the CompilerWrapper.ini file.
 ; 
+
 !define SHCHANGENOTIFY `Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, i 0, i 0)`
 !define UNLOADFREELIB  `Ole32::CoFreeUnusedLibraries()`
 !define W              CabinetWClass
@@ -20,6 +27,9 @@
 !ifndef LOGICLIB
 	!include LogicLib.nsh
 !endif
+
+;=#
+; The following was written by FukenGruven
 !define DLL::REG `!insertmacro DLL::REG`
 !macro DLL::REG _DLL _FSR _ERR1 _ERR2
 	StrCmpS $Bit 64 0 +4
@@ -40,6 +50,9 @@
 	Pop ${_ERR1}
 	Pop ${_ERR2}
 !macroend
+
+;=#
+; The following was written by demon.devin
 !define DLL::Backup "!insertmacro _DLL::Backup"
 !macro _DLL::Backup _GUID _FSR _SECTION _KEY _ERR1 _ERR2
 	ClearErrors
@@ -98,6 +111,7 @@
 	Goto +2
 	StrCpy ${_RETURN} $0
 !macroend
+
 ${SegmentFile}
 ${SegmentPre}
 	# Uninstall Local DLL
@@ -107,8 +121,8 @@ ${SegmentPre}
 	StrCpy $R0 1
 	${Do}
 		ClearErrors
-		${ReadLauncherConfig} $1 RegisterDLL$R0 ProgID
-		${ReadLauncherConfig} $0 RegisterDLL$R0 File
+		${ReadWrapperConfig} $1 RegisterDLL$R0 ProgID
+		${ReadWrapperConfig} $0 RegisterDLL$R0 File
 		${IfThen} ${Errors} ${|} ${ExitDo} ${|}
 		${DLL::GetGUID} $2 $1
 		${DLL::Backup} $2 /DISABLEFSR "RegDLLs" "$R0" $8 $9
@@ -123,8 +137,8 @@ ${SegmentPrePrimary}
 	StrCpy $R0 1
 	${Do}
 		ClearErrors
-		${ReadLauncherConfig} $1 RegisterDLL$R0 ProgID
-		${ReadLauncherConfig} $0 RegisterDLL$R0 File
+		${ReadWrapperConfig} $1 RegisterDLL$R0 ProgID
+		${ReadWrapperConfig} $0 RegisterDLL$R0 File
 		${IfThen} ${Errors} ${|} ${ExitDo} ${|}
 		${ParseLocations} $0
 		${DLL::Register} "$0" /DISABLEFSR $8 $9
@@ -136,8 +150,8 @@ ${SegmentPostPrimary}
 	StrCpy $R0 1
 	${Do}
 		ClearErrors
-		${ReadLauncherConfig} $1 RegisterDLL$R0 ProgID
-		${ReadLauncherConfig} $0 RegisterDLL$R0 File
+		${ReadWrapperConfig} $1 RegisterDLL$R0 ProgID
+		${ReadWrapperConfig} $0 RegisterDLL$R0 File
 		${IfThen} ${Errors} ${|} ${ExitDo} ${|}
 		${ParseLocations} $0
 		${DLL::UnRegister} "$0" /DISABLEFSR $8 $9
@@ -156,8 +170,8 @@ ${SegmentUnload}
 	StrCpy $R0 1
 	${Do}
 		ClearErrors
-		${ReadLauncherConfig} $1 RegisterDLL$R0 ProgID
-		${ReadLauncherConfig} $0 RegisterDLL$R0 File
+		${ReadWrapperConfig} $1 RegisterDLL$R0 ProgID
+		${ReadWrapperConfig} $0 RegisterDLL$R0 File
 		${IfThen} ${Errors} ${|} ${ExitDo} ${|}
 		${DLL::Restore} /DISABLEFSR "RegDLLs" "$R0" $8 $9
 		IntOp $R0 $R0 + 1
diff --git a/Other/Source/Segments/Registry.nsh b/etc/source/Segments/Registry.nsh
similarity index 76%
rename from Other/Source/Segments/Registry.nsh
rename to etc/source/Segments/Registry.nsh
index efdaf79..2e1e56f 100644
--- a/Other/Source/Segments/Registry.nsh
+++ b/etc/source/Segments/Registry.nsh
@@ -1,6 +1,19 @@
+;=#
+; 
+; PORTABLEAPPS COMPILER 
+; Developed by daemon.devin
+;
+; For support visit the GitHub project:
+; https://github.com/demondevin/pac-man
+; 
+; SEGMENT
+;   Registry.nsh
+;   This file allows registry support in the applicable registry segments.
+; 
+
 ${SegmentFile}
 ${SegmentPre}
-	ReadINIStr $0 `${LAUNCHER}` Activate Registry
+	ReadINIStr $0 `${WRAPPER}` Activate Registry
 	StrCmpS $0 true 0 +2
 	StrCpy $Registry true
 !macroend
@@ -32,7 +45,7 @@ ${SegmentPre}
 				StrCpy $0 `HKCU\Software\Classes$0`
 			${ElseIf} $1 != HKCU
 			${AndIf} $1 != HKLM
-				MessageBox MB_OK|MB_ICONSTOP `Note to portable application developer: registry hive in key "$0" is bad, should start with HKCR, HKCU or HKLM. Please fix this. (The launcher will continue running.)`
+				MessageBox MB_OK|MB_ICONSTOP `Note to portable application developer: registry hive in key "$0" is bad, should start with HKCR, HKCU or HKLM. Please fix this. (Continuing with current launch.)`
 			${EndIf}
 		${EndIf}
 	${EndIf}
diff --git a/Other/Source/Segments/RegistryCleanup.nsh b/etc/source/Segments/RegistryCleanup.nsh
similarity index 57%
rename from Other/Source/Segments/RegistryCleanup.nsh
rename to etc/source/Segments/RegistryCleanup.nsh
index f5cb344..6173f22 100644
--- a/Other/Source/Segments/RegistryCleanup.nsh
+++ b/etc/source/Segments/RegistryCleanup.nsh
@@ -1,3 +1,16 @@
+;=#
+; 
+; PORTABLEAPPS COMPILER 
+; Developed by daemon.devin
+;
+; For support visit the GitHub project:
+; https://github.com/demondevin/pac-man
+; 
+; SEGMENT
+;   RegistryCleanup.nsh
+;   This file allows support for cleaning up registry entries that are configured in the CompilerWrapper.ini file.
+; 
+
 ${SegmentFile}
 ${SegmentPostPrimary}
 	!ifmacrodef RegCleanup
@@ -7,7 +20,7 @@ ${SegmentPostPrimary}
 		StrCpy $R0 1
 		${Do}
 			ClearErrors
-			${ReadLauncherConfig} $R1 RegistryCleanupIfEmpty $R0
+			${ReadWrapperConfig} $R1 RegistryCleanupIfEmpty $R0
 			${IfThen} ${Errors} ${|} ${ExitDo} ${|}
 			${ValidateRegistryKey} $R1
 			${ParseLocations} $R1
@@ -17,7 +30,7 @@ ${SegmentPostPrimary}
 		StrCpy $R0 1
 		${Do}
 			ClearErrors
-			${ReadLauncherConfig} $R1 RegistryCleanupForce $R0
+			${ReadWrapperConfig} $R1 RegistryCleanupForce $R0
 			${IfThen} ${Errors} ${|} ${ExitDo} ${|}
 			${ValidateRegistryKey} $R1
 			${ParseLocations} $R1
diff --git a/etc/source/Segments/RegistryCopyKeys.nsh b/etc/source/Segments/RegistryCopyKeys.nsh
new file mode 100644
index 0000000..7550696
--- /dev/null
+++ b/etc/source/Segments/RegistryCopyKeys.nsh
@@ -0,0 +1,99 @@
+;=#
+; 
+; PORTABLEAPPS COMPILER 
+; Developed by daemon.devin
+;
+; For support visit the GitHub project:
+; https://github.com/demondevin/pac-man
+; 
+; SEGMENT
+;   RegistryCopyKeys.nsh
+;   This file handles the copying of registry keys that are declared in the CompilerWrapper.ini file.
+; 
+
+!ifndef TREE
+	!define TREE `HKCU\Software\${PAC}`
+!endif
+!ifndef TREEKEYS
+	!define TREEKEYS `${TREE}\Keys`
+!endif
+
+${SegmentFile}
+${SegmentPrePrimary}
+	${If} $Registry == true
+		${ForEachINIPair} RegistryCopyKeys $R0 $R1
+			${ValidateRegistryKey} $R1
+			ExpandEnvStrings $R1 $R1
+			${IfNot} ${RegistryKeyExists} `${TREEKEYS}\$R1`
+			${AndIf} ${RegistryKeyExists} $R1
+				StrCpy $R2 $R1 4
+				StrCmp $R2 HKLM 0 +2
+				StrCmp $ADMIN true 0 +3
+				Registry::_CopyKey /NOUNLOAD $R1 `${TREEKEYS}\$R1`
+				Pop $R2
+			${EndIf}
+			StrCmp $R0 - +11
+			ExpandEnvStrings $R0 $R0
+			IfFileExists `${CONF}\$R0.reg` 0 +9
+			IfFileExists `${REGEDIT}` 0 +5
+			!ifdef DisableFSR
+				ExecDos::exec /TOSTACK /DISABLEFSR `"${REGEDIT}" /s "${CONF}\$R0.reg"`
+			!else
+				ExecDos::exec /TOSTACK `"${REGEDIT}" /s "${CONF}\$R0.reg"`
+			!endif
+			Pop $R1
+			Pop $R2
+			StrCmp $R1 0 +4
+			!ifdef DisableFSR
+				ExecDos::exec /TOSTACK /DISABLEFSR `"${REGEXE}" IMPORT "${CONF}\$R0.reg"`
+			!else
+				ExecDos::exec /TOSTACK `"${REGEXE}" IMPORT "${CONF}\$R0.reg"`
+			!endif
+			Pop $R1
+			Pop $R2
+		${NextINIPair}
+	${EndIf}
+!macroend
+${SegmentPostPrimary}
+	${If} $REGISTRY == true
+		${ForEachINIPair} RegistryCopyKeys $R0 $R1
+			${ValidateRegistryKey} $R1
+			ExpandEnvStrings $R1 $R1
+			StrCmp $R0 - +14
+			StrCmp $RunLocally true +13
+			ExpandEnvStrings $R0 $R0
+			Registry::_SaveKey /NOUNLOAD $R1 `${CONF}\$R0.reg` ""
+			Pop $R2
+			StrCmp $R2 0 +9
+			IfFileExists `${REGEDIT}` 0 +5
+			!ifdef DisableFSR
+				ExecDos::exec /TOSTACK /DISABLEFSR `"${REGEDIT}" /e "${CONF}\$R0.reg" "$R1"`
+			!else
+				ExecDos::exec /TOSTACK `"${REGEDIT}" /e "${CONF}\$R0.reg" "$R1"`
+			!endif
+			Pop $R2
+			Pop $R3
+			StrCmp $R2 0 +4
+			!ifdef DisableFSR
+				ExecDos::exec /TOSTACK /DISABLEFSR `"${REGEXE}" SAVE "$R1" "${CONF}\$R0.reg"`
+			!else
+				ExecDos::exec /TOSTACK `"${REGEXE}" SAVE "$R1" "${CONF}\$R0.reg"`
+			!endif
+			Pop $R2
+			Pop $R3
+			Registry::_DeleteKey /NOUNLOAD $R1
+			Pop $R2
+			${If} ${RegistryKeyExists} `${TREEKEYS}\$R1`
+				Registry::_MoveKey /NOUNLOAD `${TREEKEYS}\$R1` $R1
+				Pop $R2
+				${Do}
+					${GetParent} $R1 $R1
+					Registry::_DeleteKeyEmpty /NOUNLOAD `${TREEKEYS}\$R1`
+					Pop $R2
+				${LoopUntil} $R1 == ""
+			${EndIf}
+		${NextINIPair}
+		Registry::_DeleteKeyEmpty /NOUNLOAD `${TREE}`
+		Pop $R2
+	${EndIf}
+!macroend
diff --git a/Other/Source/Segments/RegistryKeys.nsh b/etc/source/Segments/RegistryKeys.nsh
similarity index 52%
rename from Other/Source/Segments/RegistryKeys.nsh
rename to etc/source/Segments/RegistryKeys.nsh
index a349b98..d04c25e 100644
--- a/Other/Source/Segments/RegistryKeys.nsh
+++ b/etc/source/Segments/RegistryKeys.nsh
@@ -1,9 +1,23 @@
-!ifndef PAF
-	!define PAF HKCU\Software\PortableApps
+;=#
+; 
+; PORTABLEAPPS COMPILER 
+; Developed by daemon.devin
+;
+; For support visit the GitHub project:
+; https://github.com/demondevin/pac-man
+; 
+; SEGMENT
+;   RegistryKeys.nsh
+;   This file handles the importing/restoring of registry keys that are declared in the CompilerWrapper.ini file.
+; 
+
+!ifndef TREE
+	!define TREE `HKCU\Software\${PAC}`
 !endif
-!ifndef PAFKEYS
-	!define PAFKEYS ${PAF}\Keys
+!ifndef TREEKEYS
+	!define TREEKEYS `${TREE}\Keys`
 !endif
+
 ${SegmentFile}
 ${SegmentPrePrimary}
 	!ifmacrodef PreReg
@@ -13,30 +27,30 @@ ${SegmentPrePrimary}
 		${ForEachINIPair} RegistryKeys $R0 $R1
 			${ValidateRegistryKey} $R1
 			ExpandEnvStrings $R1 $R1
-			${IfNot} ${RegistryKeyExists} `${PAFKEYS}\$R1`
+			${IfNot} ${RegistryKeyExists} `${TREEKEYS}\$R1`
 			${AndIf} ${RegistryKeyExists} $R1
 				StrCpy $R2 $R1 4
 				StrCmp $R2 HKLM 0 +2
 				StrCmpS $ADMIN true 0 +3
-				Registry::_MoveKey /NOUNLOAD $R1 `${PAFKEYS}\$R1`
+				Registry::_MoveKey /NOUNLOAD $R1 `${TREEKEYS}\$R1`
 				Pop $R2
 			${EndIf}
 			StrCmpS $R0 - +11
 			ExpandEnvStrings $R0 $R0
-			IfFileExists `${SET}\$R0.reg` 0 +9
+			IfFileExists `${CONF}\$R0.reg` 0 +9
 			IfFileExists `${REGEDIT}` 0 +5
 			!ifdef DisableFSR
-				ExecDos::exec /TOSTACK /DISABLEFSR `"${REGEDIT}" /s "${SET}\$R0.reg"`
+				ExecDos::exec /TOSTACK /DISABLEFSR `"${REGEDIT}" /s "${CONF}\$R0.reg"`
 			!else
-				ExecDos::exec /TOSTACK `"${REGEDIT}" /s "${SET}\$R0.reg"`
+				ExecDos::exec /TOSTACK `"${REGEDIT}" /s "${CONF}\$R0.reg"`
 			!endif
 			Pop $R1
 			Pop $R2
 			StrCmp $R1 0 +4
 			!ifdef DisableFSR
-				ExecDos::exec /TOSTACK /DISABLEFSR `"${REGEXE}" IMPORT "${SET}\$R0.reg"`
+				ExecDos::exec /TOSTACK /DISABLEFSR `"${REGEXE}" IMPORT "${CONF}\$R0.reg"`
 			!else
-				ExecDos::exec /TOSTACK `"${REGEXE}" IMPORT "${SET}\$R0.reg"`
+				ExecDos::exec /TOSTACK `"${REGEXE}" IMPORT "${CONF}\$R0.reg"`
 			!endif
 			Pop $R1
 			Pop $R2
@@ -57,41 +71,41 @@ ${SegmentPostPrimary}
 			StrCmpS $R0 - +14
 			StrCmpS $RunLocally true +13
 			ExpandEnvStrings $R0 $R0
-			Registry::_SaveKey /NOUNLOAD $R1 `${SET}\$R0.reg` ""
+			Registry::_SaveKey /NOUNLOAD $R1 `${CONF}\$R0.reg` ""
 			Pop $R2
 			StrCmpS $R2 0 +9
 			IfFileExists `${REGEDIT}` 0 +5
 			!ifdef DisableFSR
-				ExecDos::exec /TOSTACK /DISABLEFSR `"${REGEDIT}" /e "${SET}\$R0.reg" "$R1"`
+				ExecDos::exec /TOSTACK /DISABLEFSR `"${REGEDIT}" /e "${CONF}\$R0.reg" "$R1"`
 			!else
-				ExecDos::exec /TOSTACK `"${REGEDIT}" /e "${SET}\$R0.reg" "$R1"`
+				ExecDos::exec /TOSTACK `"${REGEDIT}" /e "${CONF}\$R0.reg" "$R1"`
 			!endif
 			Pop $R2
 			Pop $R3
 			StrCmpS $R2 0 +4
 			!ifdef DisableFSR
-				ExecDos::exec /TOSTACK /DISABLEFSR `"${REGEXE}" SAVE "$R1" "${SET}\$R0.reg"`
+				ExecDos::exec /TOSTACK /DISABLEFSR `"${REGEXE}" SAVE "$R1" "${CONF}\$R0.reg"`
 			!else
-				ExecDos::exec /TOSTACK `"${REGEXE}" SAVE "$R1" "${SET}\$R0.reg"`
+				ExecDos::exec /TOSTACK `"${REGEXE}" SAVE "$R1" "${CONF}\$R0.reg"`
 			!endif
 			Pop $R2
 			Pop $R3
 			Registry::_DeleteKey /NOUNLOAD $R1
 			Pop $R2
-			${If} ${RegistryKeyExists} `${PAFKEYS}\$R1`
-				Registry::_MoveKey /NOUNLOAD `${PAFKEYS}\$R1` $R1
+			${If} ${RegistryKeyExists} `${TREEKEYS}\$R1`
+				Registry::_MoveKey /NOUNLOAD `${TREEKEYS}\$R1` $R1
 				Pop $R2
 				${Do}
 					${GetParent} $R1 $R1
-					Registry::_DeleteKeyEmpty /NOUNLOAD `${PAFKEYS}\$R1`
+					Registry::_DeleteKeyEmpty /NOUNLOAD `${TREEKEYS}\$R1`
 					Pop $R2
 				${LoopUntil} $R1 == ""
 			${EndIf}
 		${NextINIPair}
-		Registry::_DeleteKeyEmpty /NOUNLOAD `${PAF}`
+		Registry::_DeleteKeyEmpty /NOUNLOAD `${TREE}`
 		Pop $R2
 	${EndIf}
 	!ifmacrodef UnPostReg
 		!insertmacro UnPostReg
 	!endif
-!macroend
\ No newline at end of file
+!macroend
diff --git a/Other/Source/Segments/RegistryValueBackupDelete.nsh b/etc/source/Segments/RegistryValueBackupDelete.nsh
similarity index 72%
rename from Other/Source/Segments/RegistryValueBackupDelete.nsh
rename to etc/source/Segments/RegistryValueBackupDelete.nsh
index 319364a..1d30b3b 100644
--- a/Other/Source/Segments/RegistryValueBackupDelete.nsh
+++ b/etc/source/Segments/RegistryValueBackupDelete.nsh
@@ -1,3 +1,16 @@
+;=#
+; 
+; PORTABLEAPPS COMPILER 
+; Developed by daemon.devin
+;
+; For support visit the GitHub project:
+; https://github.com/demondevin/pac-man
+; 
+; SEGMENT
+;   RegistryValueBackupDelete.nsh
+;   This file reads the CompilerWrapper.ini file and handles the registry values that get backed up and restored later.
+; 
+
 ${SegmentFile}
 ${SegmentPrePrimary}
 	!ifmacrodef PreRegistryValue
@@ -7,7 +20,7 @@ ${SegmentPrePrimary}
 		StrCpy $R0 1
 		${Do}
 			ClearErrors
-			${ReadLauncherConfig} $R1 RegistryValueBackupDelete $R0
+			${ReadWrapperConfig} $R1 RegistryValueBackupDelete $R0
 			${IfThen} ${Errors} ${|} ${ExitDo} ${|}
 			${ValidateRegistryKey} $R1
 			${ParseLocations} $R1
@@ -29,7 +42,7 @@ ${SegmentPostPrimary}
 		StrCpy $R0 1
 		${Do}
 			ClearErrors
-			${ReadLauncherConfig} $R1 RegistryValueBackupDelete $R0
+			${ReadWrapperConfig} $R1 RegistryValueBackupDelete $R0
 			${IfThen} ${Errors} ${|} ${ExitDo} ${|}
 			${ValidateRegistryKey} $R1
 			${ParseLocations} $R1
@@ -45,4 +58,4 @@ ${SegmentPostPrimary}
 	!ifmacrodef UnPostRegistryValue
 		!insertmacro UnPostRegistryValue
 	!endif
-!macroend
\ No newline at end of file
+!macroend
diff --git a/Other/Source/Segments/RegistryValueWrite.nsh b/etc/source/Segments/RegistryValueWrite.nsh
similarity index 63%
rename from Other/Source/Segments/RegistryValueWrite.nsh
rename to etc/source/Segments/RegistryValueWrite.nsh
index 8b1bb70..a32189d 100644
--- a/Other/Source/Segments/RegistryValueWrite.nsh
+++ b/etc/source/Segments/RegistryValueWrite.nsh
@@ -1,13 +1,26 @@
-;=== WriteRegDWORD HKLM "Software\My Company\My Software" "DWORD Value" 0xDEADBEEF
-;=== below works properly from XP through 8.1. ( 0x00000001 works better than 1 or 0 )
-;=== WriteRegDWORD HKCU `${KEY}` `${INT}` 0x00000001
-################################################################################
-# WRITE DWORD USING DECIMAL ! (NOT HEXIDECIMAL)
-;=== NOTE: to write correctly for DWORD (dword:00000409)
-	;=== must use decimal for writing.
-	;=== I.E. Read from file is dword:00000409
-	;=== but when writing.. must use decimal which is 1033.
-	;=== make sure NOT to use hexadecimal which looks like this: 409
+;=#
+; 
+; PORTABLEAPPS COMPILER 
+; Developed by daemon.devin
+;
+; For support visit the GitHub project:
+; https://github.com/demondevin/pac-man
+; 
+; SEGMENT
+;   RegistryValueWrite.nsh
+;   This file reads the CompilerWrapper.ini and handles the registry writing just before executing the wrapper.
+; 
+; ATTENTION
+;   When using WriteRegDWORD, it is better to use something like 0x00000409 than it is to use 409. 
+;     i.e. WriteRegDWORD HKCU "SOFTWARE\Company\Program\Settings" `Language` 0x00000409
+;
+;   However, when using [RegistryValueWrite] in the CompilerWrapper.ini file use the decimal system instead.
+;     i.e. HKCU\SOFTWARE\Company\Program\Settings\Language=REG_DWORD:1033
+;
+;   When reading a DWORD entry, it always returns the hexadecimal value which looks like this: 0x409
+;   Be sure to only use the decimal system to write a DWORD value to the registry which looks like this: 1033
+;
+
 ${SegmentFile}
 ${SegmentPrePrimary}
 	!ifmacrodef PreRegWrite
@@ -82,4 +95,4 @@ ${SegmentPrePrimary}
 	!ifmacrodef UnPreRegWrite
 		!insertmacro UnPreRegWrite
 	!endif
-!macroend
\ No newline at end of file
+!macroend
diff --git a/Other/Source/Segments/RunAsAdmin.nsh b/etc/source/Segments/RunAsAdmin.nsh
similarity index 88%
rename from Other/Source/Segments/RunAsAdmin.nsh
rename to etc/source/Segments/RunAsAdmin.nsh
index dc0057f..0ea6816 100644
--- a/Other/Source/Segments/RunAsAdmin.nsh
+++ b/etc/source/Segments/RunAsAdmin.nsh
@@ -1,3 +1,16 @@
+;=#
+; 
+; PORTABLEAPPS COMPILER 
+; Developed by daemon.devin
+;
+; For support visit the GitHub project:
+; https://github.com/demondevin/pac-man
+; 
+; SEGMENT
+;   RunAsAdmin.nsh
+;   This file enables support for executing the wrapper with administrative rights. 
+; 
+
 !macro CaseUACCodeAlert CODE FORCEMESSAGE TRYMESSAGE
 	!if "${CODE}" == ""
 		${Default}
@@ -14,7 +27,7 @@
 !macro RunAsAdmin_OSOverride OS
 	${If} ${IsWin${OS}}
 		ClearErrors
-		${ReadLauncherConfig} $0 Launch RunAsAdmin${OS}
+		${ReadWrapperConfig} $0 Launch RunAsAdmin${OS}
 		${If} $0 == force
 		${OrIf} $0 == try
 			StrCpy $RunAsAdmin $0
@@ -23,6 +36,7 @@
 		${EndIf}
 	${EndIf}
 !macroend
+
 ${SegmentFile}
 ${Segment.onInit}
 	!ifmacrodef CustomOverride
@@ -32,7 +46,7 @@ ${Segment.onInit}
 		!insertmacro RunAsAdmin
 	!else
 			ClearErrors
-			${ReadLauncherConfig} $RunAsAdmin Launch RunAsAdmin
+			${ReadWrapperConfig} $RunAsAdmin Launch RunAsAdmin
 		!ifdef RUNASADMIN_COMPILEFORCE
 			IfErrors +2
 			StrCmpS $RunAsAdmin compile-force +2
@@ -92,4 +106,4 @@ ${Segment.onInit}
 	!ifmacrodef UnRunAsAdmin
 		!insertmacro UnRunAsAdmin
 	!endif
-!macroend
\ No newline at end of file
+!macroend
diff --git a/etc/source/Segments/RunBeforeAfter.nsh b/etc/source/Segments/RunBeforeAfter.nsh
new file mode 100644
index 0000000..1a0545a
--- /dev/null
+++ b/etc/source/Segments/RunBeforeAfter.nsh
@@ -0,0 +1,40 @@
+;=#
+; 
+; PORTABLEAPPS COMPILER 
+; Developed by daemon.devin
+;
+; For support visit the GitHub project:
+; https://github.com/demondevin/pac-man
+; 
+; SEGMENT
+;   RunBeforeAfter.nsh
+;   This file reads the CompilerWrapper.ini which then handles executing something before and/or after launching the wrapper.
+; 
+
+!define RunBeforeAfter "!insertmacro _RunBeforeAfter"
+!macro _RunBeforeAfter _WHEN
+	StrCpy $R0 1
+	${Do}
+		ClearErrors
+		${ReadWrapperConfig} $1 Launch Run${_WHEN}$R0
+		${IfThen} ${Errors} ${|} ${ExitDo} ${|}
+		${ParseLocations} $1
+
+		; Safety check so paths with spaces work
+		StrCpy $R1 $1 1
+		${If} $R1 != '"'
+			MessageBox MB_ICONEXCLAMATION `[Launch]:Run${_WHEN}$R0 doesn't have the path quoted!${NEWLINE}${NEWLINE}Use something like the following:${NEWLINE}Run${_WHEN}$R0='"$1"').`
+		${EndIf}
+
+		ExecWait $1
+		IntOp $R0 $R0 + 1
+	${Loop}
+!macroend
+
+${SegmentFile}
+${SegmentPreExec}
+	${RunBeforeAfter} Before
+!macroend
+${SegmentPostExec}
+	${RunBeforeAfter} After
+!macroend
diff --git a/Other/Source/Segments/RunLocally.nsh b/etc/source/Segments/RunLocally.nsh
similarity index 66%
rename from Other/Source/Segments/RunLocally.nsh
rename to etc/source/Segments/RunLocally.nsh
index 183bada..fd7d7b1 100644
--- a/Other/Source/Segments/RunLocally.nsh
+++ b/etc/source/Segments/RunLocally.nsh
@@ -1,3 +1,16 @@
+;=#
+; 
+; PORTABLEAPPS COMPILER 
+; Developed by daemon.devin
+;
+; For support visit the GitHub project:
+; https://github.com/demondevin/pac-man
+; 
+; SEGMENT
+;   RunLocally.nsh
+;   This file enables support for copying the package to a local directory and executing from there.
+; 
+
 Var RunLocally
 ${SegmentFile}
 ${SegmentInit}
@@ -7,20 +20,20 @@ ${SegmentPre}
 	${If} $RunLocally == true
 		ReadEnvStr $R0 TMP
 		ClearErrors
-		${ReadLauncherConfig} $0 LiveMode CopyApp
+		${ReadWrapperConfig} $0 LiveMode CopyApp
 		${If} $0 == true
 		${OrIf} ${Errors}
 			StrCmpS $SecondaryLaunch true +3
 			CreateDirectory `$R0\${APPNAME}Live`
 			CopyFiles /SILENT `$EXEDIR\App` `$R0\${APPNAME}Live`
-			StrCpy $AppDirectory `$R0\${APPNAME}Live\App`
+			StrCpy $AppDirectory `$R0\${APPNAME}Live\bin`
 		${ElseIf} $0 != false
 			${InvalidValueError} [LiveMode]:CopyApp $0
 		${EndIf}
 		StrCmpS $SecondaryLaunch true +3
 		CreateDirectory `$R0\${APPNAME}Live`
-		CopyFiles /SILENT `${DATA}` `$R0\${APPNAME}Live`
-		StrCpy $DataDirectory `$R0\${APPNAME}Live\Data`
+		CopyFiles /SILENT `${SET}` `$R0\${APPNAME}Live`
+		StrCpy $DataDirectory `$R0\${APPNAME}Live\bin\Settings`
 		${If} ${FileExists} `$R0\${APPNAME}Live`
 			${SetFileAttributesDirectoryNormal} `$R0\${APPNAME}Live`
 		${EndIf}
diff --git a/Other/Source/Segments/Services.nsh b/etc/source/Segments/Services.nsh
similarity index 89%
rename from Other/Source/Segments/Services.nsh
rename to etc/source/Segments/Services.nsh
index ba5f1a7..2f1cadd 100644
--- a/Other/Source/Segments/Services.nsh
+++ b/etc/source/Segments/Services.nsh
@@ -1,40 +1,39 @@
-;=# 
-; Services.nsh 1.0 (2017-11-20)
-; Written by demon.devin
-;
-; NOTES:
-; This file was created to replace the official services segment for the PortableApps.com Launcher
-; This segment will enable support for handling Windows Services without the need for a plugin.
-; For more information about how to make use of this segment, please visit:
-; http://softables.tk/docs/advanced/services
-;
-; Copyright 2017 Devin 'demon.devin' Gaul
-;
-; USAGE:
-; To make use of this segment, add the section [Service1] (numerical ordering) to the Launcher.ini file. 
-; Each entry supports six keys which are as follows: 
-;
-; Name		-	The local/portable service name.
-; Path		-	The path to the portable service executable. Supports environment variables.
-; Type		-	Specify whether you are dealing with a service, a kernel driver or a file system driver, etc.
-; 				Choose from: own, share, interact, kernel, filesys, rec
-; Start		-	Specify when the service is supposed to start.
-; 				Choose from: boot, system, auto, demand, disabled, delayed-auto
-; Depend	-	List any dependencies here separated by / (forward slash).
-; IfExists	-	If the service already exists, you can either skip it or replace it with the portable version of the service.
-; 				Choose from: skip, replace
-;
-; EXAMPLE:
-;
-; [Service1]
-; Name=ServiceName
-; Path=%PAL:DataDir%\drivers\ElbyCDIO.sys
-; Type=kernel
-; Start=system
-; Depend=
-; IfExists=replace
+;=#
+; 
+; PORTABLEAPPS COMPILER 
+; Developed by daemon.devin
 ;
+; For support visit the GitHub project:
+; https://github.com/demondevin/pac-man
+; 
+; SEGMENT
+;   Services.nsh
+;   This file enables support for handling Windows Services without the need for a plugin.
 ; 
+; USAGE
+;	To make use of this segment, add the section [Service1] (numerical ordering) to the CompilerWrapper.ini file. 
+;	Each entry supports six keys which are as follows: 
+;
+;	Name		-	The local/portable service name.
+;	Path		-	The path to the portable service executable. Supports environment variables.
+;	Type		-	Specify whether you are dealing with a service, a kernel driver or a file system driver, etc.
+;					Choose from: own, share, interact, kernel, filesys, rec
+;	Start		-	Specify when the service is supposed to start.
+;					Choose from: boot, system, auto, demand, disabled, delayed-auto
+;	Depend		-	List any dependencies here separated by / (forward slash).
+;	IfExists	-	If the service already exists, you can either skip it or replace it with the portable version of the service.
+;					Choose from: skip, replace
+;
+; EXAMPLE
+;	[Service1]
+;	Name=ServiceName
+;	Path=%PAL:DataDir%\drivers\ElbyCDIO.sys
+;	Type=kernel
+;	Start=system
+;	Depend=
+;	IfExists=replace
+; 
+
 !ifndef LOGICLIB
 	!include LogicLib.nsh
 !endif
@@ -228,7 +227,7 @@
 	Pop ${_ERR2} ; 1 = running
 	StrCmpS ${_ERR1} 1 0 +4
 	StrCmpS ${_ERR2} 1 0 +3
-	${WriteRuntimeData} PortableApps.comLauncher ${_SVC}_Status running
+	${WriteRuntimeData} ${PAC} ${_SVC}_Status running
 !macroend
 ; 
 ; The following macros make use of the ServiceLib.nsh header include file.
@@ -392,7 +391,7 @@ ${SegmentPre}
 		StrCpy $R0 1
 		${Do}
 			ClearErrors
-			ReadINIStr $0 "${LAUNCHER}" "Service$R0" "Name"
+			ReadINIStr $0 "${WRAPPER}" "Service$R0" "Name"
 			${IfThen} ${Errors} ${|} ${ExitDo} ${|}
 			ReadRegStr $1 HKLM "SYSTEM\CurrentControlSet\services\$0" ImagePath
 			${IfNot} ${Errors}
@@ -404,7 +403,7 @@ ${SegmentPre}
 				${DebugMsg} "Checking and logging state of local instance of $0 service."
 				ReadRegStr $0 HKLM "SYSTEM\CurrentControlSet\services\$0" Start
 				${WriteRuntimeData} "$0_Service" LocalState $0
-				ReadINIStr $3 "${LAUNCHER}" "Service$R0" "IfExists"
+				ReadINIStr $3 "${WRAPPER}" "Service$R0" "IfExists"
 				${If} $3 == replace
 					${DebugMsg} "Preparing portable service of $0; removing local instance."
 					${Service::Stop} "$0" /DISABLEFSR $8 $9
@@ -422,16 +421,16 @@ ${SegmentPrePrimary}
 	!ifdef SERVICES_ENABLED
 		StrCpy $R0 1
 		${Do}
-			${ReadLauncherConfig} $0 Service$R0 Name
+			${ReadWrapperConfig} $0 Service$R0 Name
 			${IfThen} ${Errors} ${|} ${ExitDo} ${|}
-			${ReadLauncherConfig} $1 Service$R0 IfExists
+			${ReadWrapperConfig} $1 Service$R0 IfExists
 			${If} $1 == replace
 				${DebugMsg} "Creating a portable instance of the $0 service."
-				${ReadLauncherConfig} $2 Service$R0 Path
+				${ReadWrapperConfig} $2 Service$R0 Path
 				${ParseLocations} $2
-				${ReadLauncherConfig} $3 Service$R0 Type
-				${ReadLauncherConfig} $4 Service$R0 Start
-				${ReadLauncherConfig} $5 Service$R0 Depend
+				${ReadWrapperConfig} $3 Service$R0 Type
+				${ReadWrapperConfig} $4 Service$R0 Start
+				${ReadWrapperConfig} $5 Service$R0 Depend
 				${If} $5 != ""
 					${Service::Create} "$0" "$2" "$3" "$4" "$5" /DISABLEFSR $8 $9
 				${Else}
@@ -465,9 +464,9 @@ ${SegmentPostPrimary}
 		StrCpy $R0 1
 		${Do}
 			ClearErrors
-			${ReadLauncherConfig} $0 Service$R0 Name
+			${ReadWrapperConfig} $0 Service$R0 Name
 			${IfThen} ${Errors} ${|} ${ExitDo} ${|}
-			${ReadLauncherConfig} $1 Service$R0 IfExists
+			${ReadWrapperConfig} $1 Service$R0 IfExists
 			${If} $1 == replace
 				${DebugMsg} "Removing portable service of $0 to prepare for reinstallation of the local instance."
 				${ReadRuntimeData} $3 "$0_Service" LocalService
@@ -490,17 +489,17 @@ ${SegmentUnload}
 		StrCpy $R0 1
 		${Do}
 			ClearErrors
-			${ReadLauncherConfig} $0 Service$R0 Name
+			${ReadWrapperConfig} $0 Service$R0 Name
 			${IfThen} ${Errors} ${|} ${ExitDo} ${|}
-			${ReadLauncherConfig} $1 Service$R0 IfExists
+			${ReadWrapperConfig} $1 Service$R0 IfExists
 			${If} $1 == replace
 				${DebugMsg} "Reinstalling the local instance of the $0 service."
 				${ReadRuntimeData} $2 "$0_Service" LocalService
 				${IfNot} ${Errors}
 					${ReadRuntimeData} $3 "$0_Service" LocalPath
-					${ReadLauncherConfig} $4 Service$R0 Type
-					${ReadLauncherConfig} $5 Service$R0 Start
-					${ReadLauncherConfig} $6 Service$R0 Depend
+					${ReadWrapperConfig} $4 Service$R0 Type
+					${ReadWrapperConfig} $5 Service$R0 Start
+					${ReadWrapperConfig} $6 Service$R0 Depend
 					${If} $6 != ""
 						${Service::Create} "$0" "$3" "$4" "$5" "$6" /DISABLEFSR $8 $9
 					${Else}
diff --git a/Other/Source/Segments/Settings.nsh b/etc/source/Segments/Settings.nsh
similarity index 52%
rename from Other/Source/Segments/Settings.nsh
rename to etc/source/Segments/Settings.nsh
index 1ff3c8a..ab2b3b7 100644
--- a/Other/Source/Segments/Settings.nsh
+++ b/etc/source/Segments/Settings.nsh
@@ -1,3 +1,16 @@
+;=#
+; 
+; PORTABLEAPPS COMPILER 
+; Developed by daemon.devin
+;
+; For support visit the GitHub project:
+; https://github.com/demondevin/pac-man
+; 
+; SEGMENT
+;   Settings.nsh
+;   This file is responsible for moving the default settings to the settings folder before launching the wrapper.
+; 
+
 !macro !defineifexist _VAR_NAME _FILE_NAME
 	!tempfile _TEMPFILE
 	!ifdef NSIS_WIN32_MAKENSIS
@@ -13,16 +26,16 @@
 !define Init::File "!insertmacro _Init::File"
 !macro _Init::File _DIR _FILE
 	StrCmpS `${_FILE}` "" 0 +4
-	IfFileExists `${DATA}\${_DIR}` +10
-	CreateDirectory `${DATA}\${_DIR}`
+	IfFileExists `${SET}\${_DIR}` +10
+	CreateDirectory `${SET}\${_DIR}`
 	Goto +8
 	StrCmpS `${_DIR}` "" 0 +4
-	IfFileExists `${DATA}\${_FILE}` +6
-	CopyFiles /SILENT `${DEFDATA}\${_FILE}` `${DATA}`
+	IfFileExists `${SET}\${_FILE}` +6
+	CopyFiles /SILENT `${DEFSET}\${_FILE}` `${SET}`
 	Goto +4
-	IfFileExists `${DATA}\${_DIR}\${_FILE}` +3
-	CreateDirectory `${DATA}\${_DIR}`
-	CopyFiles /SILENT `${DEFDATA}\${_DIR}\${_FILE}` `${DATA}\${_DIR}`
+	IfFileExists `${SET}\${_DIR}\${_FILE}` +3
+	CreateDirectory `${SET}\${_DIR}`
+	CopyFiles /SILENT `${DEFSET}\${_DIR}\${_FILE}` `${SET}\${_DIR}`
 !macroend
 ${SegmentFile}
 ${SegmentInit}
@@ -30,9 +43,9 @@ ${SegmentInit}
 	${IfNot} ${FileExists} ${SET}
 		${DebugMsg} "${SET} does not exist. Creating it."
 		CreateDirectory ${SET}
-		${If} ${FileExists} ${DEFDATA}\*.*
-			${DebugMsg} "Copying default data from ${DEFDATA} to ${DATA}."
-			CopyFiles /SILENT ${DEFDATA}\*.* ${DATA}
+		${If} ${FileExists} ${DEFSET}\*.*
+			${DebugMsg} "Copying default data from ${DEFSET} to ${SET}."
+			CopyFiles /SILENT ${DEFSET}\*.* ${SET}
 		${EndIf}
 	${EndIf}
 	!ifmacrodef Init
diff --git a/Other/Source/Segments/TaskCleanup.nsh b/etc/source/Segments/TasksCleanup.nsh
similarity index 79%
rename from Other/Source/Segments/TaskCleanup.nsh
rename to etc/source/Segments/TasksCleanup.nsh
index 191db64..57c1013 100644
--- a/Other/Source/Segments/TaskCleanup.nsh
+++ b/etc/source/Segments/TasksCleanup.nsh
@@ -1,67 +1,83 @@
-Function DeleteTask
-    !define TaskGUID    `{148BD52A-A2AB-11CE-B11F-00AA00530503}`
-    !define ITaskGUID   `{148BD527-A2AB-11CE-B11F-00AA00530503}`
-    !define OLE         `ole32::CoCreateInstance(g"${TaskGUID}",`
-    !define OLE32       `${OLE}i0,i11,g "${ITaskGUID}",*i.r1)i.r2`
-    !define DeleteTask "!insertmacro _DeleteTask"
-    !macro _DeleteTask _RESULT _TASK
-        Push ${_Task}
-        Call DeleteTask 
-        Pop ${_RESULT}
-    !macroend
-    Exch $0
-    Push $0
-    Push $1
-    Push $2
-    Push $3
-    StrCpy $3 false
-    System::Call `${OLE32}`
-    IntCmp $2 0 0 +5
-    System::Call "$1->7(w r0)i.r2"
-    IntCmp $2 0 0 +3
-    System::Call "$1->2()"
-    StrCpy $3 true
-    Pop $2
-    Pop $1
-    Pop $0
-    Exch $3
-FunctionEnd
-
-${SegmentFile}
-${SegmentPrePrimary}
-	!ifmacrodef PreTaskCleanup
-		!insertmacro PreTaskCleanup
-	!endif
-	StrCpy $R0 1
-	${Do}
-		ClearErrors
-		${ReadLauncherConfig} $R1 TaskCleanup $R0
-		${IfThen} ${Errors} ${|} ${ExitDo} ${|}
-		${ParseLocations} $R1
-		${If} ${FileExists} "$SYSDIR\Tasks\$R1"
-			${WriteRuntimeData} LocalTask "$R0" "true"
-		${Else}
-			${WriteRuntimeData} LocalTask "$R0" "false"
-		${EndIf}
-		IntOp $R0 $R0 + 1
-	${Loop}
-!macroend
-${SegmentPostPrimary}
-	!ifmacrodef PostTaskCleanup
-		!insertmacro PostTaskCleanup
-	!endif
-	StrCpy $R0 1
-	${Do}
-		ClearErrors
-		${ReadLauncherConfig} $R1 TaskCleanup $R0
-		${IfThen} ${Errors} ${|} ${ExitDo} ${|}
-		${ParseLocations} $R1
-		${ReadRuntimeData} $R2 LocalTask "$R0"
-		${If} $R2 == false
-			${DeleteTask} $0 "$R1"
-			StrCmpS $0 false 0 +3
-			${WriteRuntimeData} TaskCleanup "$R0" "false"
-		${EndIf}
-		IntOp $R0 $R0 + 1
-	${Loop}
-!macroend
+;=#
+; 
+; PORTABLEAPPS COMPILER 
+; Developed by daemon.devin
+;
+; For support visit the GitHub project:
+; https://github.com/demondevin/pac-man
+; 
+; SEGMENT
+;   TasksCleanup.nsh
+;   This file handles removing any Windows Tasks that were created during runtime.
+; 
+
+;
+; DeleteTask written by daemon.devin
+;
+Function DeleteTask
+    !define TaskGUID    `{148BD52A-A2AB-11CE-B11F-00AA00530503}`
+    !define ITaskGUID   `{148BD527-A2AB-11CE-B11F-00AA00530503}`
+    !define OLE         `ole32::CoCreateInstance(g"${TaskGUID}",`
+    !define OLE32       `${OLE}i0,i11,g "${ITaskGUID}",*i.r1)i.r2`
+    !define DeleteTask "!insertmacro _DeleteTask"
+    !macro _DeleteTask _RESULT _TASK
+        Push ${_Task}
+        Call DeleteTask 
+        Pop ${_RESULT}
+    !macroend
+    Exch $0
+    Push $0
+    Push $1
+    Push $2
+    Push $3
+    StrCpy $3 false
+    System::Call `${OLE32}`
+    IntCmp $2 0 0 +5
+    System::Call "$1->7(w r0)i.r2"
+    IntCmp $2 0 0 +3
+    System::Call "$1->2()"
+    StrCpy $3 true
+    Pop $2
+    Pop $1
+    Pop $0
+    Exch $3
+FunctionEnd
+
+${SegmentFile}
+${SegmentPrePrimary}
+	!ifmacrodef PreTaskCleanup
+		!insertmacro PreTaskCleanup
+	!endif
+	StrCpy $R0 1
+	${Do}
+		ClearErrors
+		${ReadWrapperConfig} $R1 TaskCleanup $R0
+		${IfThen} ${Errors} ${|} ${ExitDo} ${|}
+		${ParseLocations} $R1
+		${If} ${FileExists} "$SYSDIR\Tasks\$R1"
+			${WriteRuntimeData} LocalTask "$R0" "true"
+		${Else}
+			${WriteRuntimeData} LocalTask "$R0" "false"
+		${EndIf}
+		IntOp $R0 $R0 + 1
+	${Loop}
+!macroend
+${SegmentPostPrimary}
+	!ifmacrodef PostTaskCleanup
+		!insertmacro PostTaskCleanup
+	!endif
+	StrCpy $R0 1
+	${Do}
+		ClearErrors
+		${ReadWrapperConfig} $R1 TaskCleanup $R0
+		${IfThen} ${Errors} ${|} ${ExitDo} ${|}
+		${ParseLocations} $R1
+		${ReadRuntimeData} $R2 LocalTask "$R0"
+		${If} $R2 == false
+			${DeleteTask} $0 "$R1"
+			StrCmpS $0 false 0 +3
+			${WriteRuntimeData} TaskCleanup "$R0" "false"
+		${EndIf}
+		IntOp $R0 $R0 + 1
+	${Loop}
+!macroend
diff --git a/Other/Source/Segments/Temp.nsh b/etc/source/Segments/Temp.nsh
similarity index 80%
rename from Other/Source/Segments/Temp.nsh
rename to etc/source/Segments/Temp.nsh
index aa29a8c..d4989a1 100644
--- a/Other/Source/Segments/Temp.nsh
+++ b/etc/source/Segments/Temp.nsh
@@ -1,3 +1,16 @@
+;=#
+; 
+; PORTABLEAPPS COMPILER 
+; Developed by daemon.devin
+;
+; For support visit the GitHub project:
+; https://github.com/demondevin/pac-man
+; 
+; SEGMENT
+;   Temp.nsh
+;   This file handles and configures $TEMP and %TEMP% variables for use during runtime.
+; 
+
 ${SegmentFile}
 Function RemoveLastDirectoryFromPath
 	!macro _RemoveLastDirectoryFromPath _PATH
@@ -47,7 +60,7 @@ ${Segment.onInit}
 !macroend
 ${SegmentInit}
 	ClearErrors
-	${ReadLauncherConfig} $R0 Launch CleanTemp
+	${ReadWrapperConfig} $R0 Launch CleanTemp
 	${IfNot} ${Errors}
 	${AndIf} $R0 != true
 	${AndIf} $R0 != false
@@ -55,11 +68,11 @@ ${SegmentInit}
 	${EndIf}
 !macroend
 ${SegmentPre}
-	${ReadLauncherConfig} $R0 Launch CleanTemp
+	${ReadWrapperConfig} $R0 Launch CleanTemp
 	StrCmp $R0 false +12
 	ClearErrors
 	StrCmp $WaitForProgram false 0 +3
-	StrCpy $R1 ${DATA}\Temp
+	StrCpy $R1 ${SET}\Temp
 	Goto +3
 	ReadEnvStr $R0 TMP
 	StrCpy $R1 $R0\${APPNAME}Temp
@@ -79,8 +92,8 @@ ${SegmentPostPrimary}
 		!insertmacro TEMP
 	!endif
 	ReadEnvStr $R0 TMP
-	${ReadLauncherConfig} $R1 Launch CleanTemp
+	${ReadWrapperConfig} $R1 Launch CleanTemp
 	StrCmp $R1 false +3
 	StrCmp $R0 "" +2
 	RMDir /r $R0
-!macroend
\ No newline at end of file
+!macroend
diff --git a/Other/Source/Segments/Variables.nsh b/etc/source/Segments/Variables.nsh
similarity index 92%
rename from Other/Source/Segments/Variables.nsh
rename to etc/source/Segments/Variables.nsh
index 7a3eb97..39d6dc9 100644
--- a/Other/Source/Segments/Variables.nsh
+++ b/etc/source/Segments/Variables.nsh
@@ -1,3 +1,16 @@
+;=#
+; 
+; PORTABLEAPPS COMPILER 
+; Developed by daemon.devin
+;
+; For support visit the GitHub project:
+; https://github.com/demondevin/pac-man
+; 
+; SEGMENT
+;   Variables.nsh
+;   This file configures all the applicable path variables for use during runtime.
+; 
+
 Function GetUNC
 	!macro _GetUNC _PATH _RETURN
 		Push `${_PATH}`
@@ -62,8 +75,9 @@ FunctionEnd
 	!insertmacro _= $0 1 `${_t}` `${_f}`
 !macroend
 !define IsAdmin `"" IsAdmin ""`
+
 ${SegmentFile}
-; Macros {{{1
+
 !define SetEnvironmentVariablesPath "!insertmacro SetEnvironmentVariablesPathCall"
 !macro SetEnvironmentVariablesPathCall _VARIABLE_NAME _PATH
 	Push "${_VARIABLE_NAME}"
@@ -178,12 +192,13 @@ Var PortableAppsDirectory
 Var PortableAppsCommonFiles
 Var PortableAppsBaseDirectory
 Var LastPortableAppsBaseDirectory
+
 ${SegmentInit}
 	!ifmacrodef EnvironmentVariables
 		!insertmacro EnvironmentVariables
 	!endif
-	StrCpy $AppDirectory `$EXEDIR\App`
-	StrCpy $DataDirectory `$EXEDIR\Data`
+	StrCpy $AppDirectory `$EXEDIR\bin`
+	StrCpy $DataDirectory `$EXEDIR\bin\Settings`
 	${SetEnvironmentVariablesPath} PAC:AppDir  $AppDirectory
 	${SetEnvironmentVariablesPath} PAC:DataDir $DataDirectory
 	${GetParentUNC} $EXEDIR $PortableAppsDirectory
@@ -193,7 +208,7 @@ ${SegmentInit}
 	${GetParentUNC} $PortableAppsDirectory $PortableAppsBaseDirectory
 	${SetEnvironmentVariablesPath} PAC:PortableAppsBaseDir $PortableAppsBaseDirectory
 	ClearErrors
-	ReadINIStr `$LastPortableAppsBaseDirectory` `${SETINI}` PortableAppsCompilerLastRunEnvironment PAC:LastPortableAppsBaseDir
+	ReadINIStr `$LastPortableAppsBaseDirectory` `${CONFIGINI}` PortableAppsCompilerLastRunEnvironment PAC:LastPortableAppsBaseDir
 	${IfNot} ${Errors}
 		${SetEnvironmentVariablesPath} PAC:LastPortableAppsBaseDir $LastPortableAppsBaseDirectory
 	${EndIf}
@@ -236,5 +251,5 @@ ${SegmentInit}
 	!endif
 !macroend
 ${SegmentPrePrimary}
-	WriteINIStr `${SETINI}` ${PAC}LastRunEnvironment PAC:LastPortableAppsBaseDir `$PortableAppsBaseDirectory`
+	WriteINIStr `${CONFIGINI}` ${PAC}LastRunEnvironment PAC:LastPortableAppsBaseDir `$PortableAppsBaseDirectory`
 !macroend
diff --git a/etc/source/Segments/WorkingDirectory.nsh b/etc/source/Segments/WorkingDirectory.nsh
new file mode 100644
index 0000000..1465525
--- /dev/null
+++ b/etc/source/Segments/WorkingDirectory.nsh
@@ -0,0 +1,21 @@
+;=#
+; 
+; PORTABLEAPPS COMPILER 
+; Developed by daemon.devin
+;
+; For support visit the GitHub project:
+; https://github.com/demondevin/pac-man
+; 
+; SEGMENT
+;   WorkingDirectory.nsh
+;   This file is responsible for setting the working directory getting it's value from the CompilerWrapper.ini file.
+; 
+
+${SegmentFile}
+${SegmentPreExec}
+	ClearErrors
+	${ReadWrapperConfig} $0 Launch WorkingDirectory
+	IfErrors +3
+	ExpandEnvStrings $0 $0
+	SetOutPath $0
+!macroend
diff --git a/etc/source/Segments/XML.nsh b/etc/source/Segments/XML.nsh
new file mode 100644
index 0000000..3ba7143
--- /dev/null
+++ b/etc/source/Segments/XML.nsh
@@ -0,0 +1,24 @@
+;=#
+; 
+; PORTABLEAPPS COMPILER 
+; Developed by daemon.devin
+;
+; For support visit the GitHub project:
+; https://github.com/demondevin/pac-man
+; 
+; XML.nsh
+; This file enables supports for allowing XML features. Refer to the segments FileWrite.nsh and Language.nsh.
+; 
+
+!ifdef XML_ENABLED
+	!include XML.nsh
+	!ifndef PLUGINSDIR
+		!define PLUGINSDIR
+		!AddPluginDir Plugins
+	!endif
+!endif
+
+${SegmentFile}
+!macro XML_WarnNotActivated Section
+	MessageBox MB_OK|MB_ICONSTOP "To use the XML features you must set [Activate]:XML=true and then regenerate the wrapper.${NEWLINE}${NEWLINE}Current launch will continue but the ${Section} will not be used."
+!macroend
diff --git a/Other/Source/ServiceLib.nsh b/etc/source/ServiceLib.nsh
similarity index 100%
rename from Other/Source/ServiceLib.nsh
rename to etc/source/ServiceLib.nsh
diff --git a/Other/Source/SetEnvironmentVariable.nsh b/etc/source/SetEnvironmentVariable.nsh
similarity index 100%
rename from Other/Source/SetEnvironmentVariable.nsh
rename to etc/source/SetEnvironmentVariable.nsh
diff --git a/Other/Source/SetFileAttributesDirectoryNormal.nsh b/etc/source/SetFileAttributesDirectoryNormal.nsh
similarity index 100%
rename from Other/Source/SetFileAttributesDirectoryNormal.nsh
rename to etc/source/SetFileAttributesDirectoryNormal.nsh
diff --git a/Other/Source/SortString3.nsh b/etc/source/SortString3.nsh
similarity index 95%
rename from Other/Source/SortString3.nsh
rename to etc/source/SortString3.nsh
index dcca5ff..3a24994 100644
--- a/Other/Source/SortString3.nsh
+++ b/etc/source/SortString3.nsh
@@ -1,63 +1,63 @@
-/*______________________________________________________________________________
- 
-                            Sort String 3
-________________________________________________________________________________
-This script will get all text left and right of a single specified character, removing everything else. 
-
-Usage 
-	Push "( 3320 -2032 -344 ) ( 3320 -2032 -368 ) dday/mr_woodfloor1 0 23" ;input
-	Push "/" ;centre character
-	Push " " ;right character
-	Push " " ;left character
-		Call StrSortLR
-	Pop $0 ;output string
-
-$0 = dday/mr_woodfloor1                                                       */
-
-Function StrSortLR
-Exch $0 ;left character
-Exch
-Exch $1 ;right character
-Exch
-Exch 2
-Exch $2 ;centre character
-Exch 2
-Exch 3
-Exch $3 ;input string
-Exch 3
-Push $4
-Push $5
-  StrCpy $5 0
-loop1:
-  IntOp $5 $5 - 1
-  StrCpy $4 $3 1 $5
-  StrCmp $4 "" error
-  StrCmp $4 $2 0 loop1
-   IntOp $5 $5 + 1
- loop2:
-   StrCpy $4 $3 1 $5
-   IntOp $5 $5 + 1
-   StrCmp $4 "" loop3
-   StrCmp $4 $1 0 loop2
-    IntOp $5 $5 - 1
-    StrCpy $3 $3 $5
-    StrCpy $5 0
-  loop3:
-    IntOp $5 $5 - 1
-    StrCpy $4 $3 1 $5
-    StrCmp $4 "" error
-    StrCmp $4 $0 0 loop3
-     IntOp $5 $5 + 1
-     StrCpy $3 $3 "" $5
-   Goto exit
-error:
-  StrCpy $3 error
-exit:
-  StrCpy $0 $3
-Pop $5
-Pop $4
-Pop $3
-Pop $2
-Pop $1
-Exch $0 ;output string
+/*______________________________________________________________________________
+ 
+                            Sort String 3
+________________________________________________________________________________
+This script will get all text left and right of a single specified character, removing everything else. 
+
+Usage 
+	Push "( 3320 -2032 -344 ) ( 3320 -2032 -368 ) dday/mr_woodfloor1 0 23" ;input
+	Push "/" ;centre character
+	Push " " ;right character
+	Push " " ;left character
+		Call StrSortLR
+	Pop $0 ;output string
+
+$0 = dday/mr_woodfloor1                                                       */
+
+Function StrSortLR
+Exch $0 ;left character
+Exch
+Exch $1 ;right character
+Exch
+Exch 2
+Exch $2 ;centre character
+Exch 2
+Exch 3
+Exch $3 ;input string
+Exch 3
+Push $4
+Push $5
+  StrCpy $5 0
+loop1:
+  IntOp $5 $5 - 1
+  StrCpy $4 $3 1 $5
+  StrCmp $4 "" error
+  StrCmp $4 $2 0 loop1
+   IntOp $5 $5 + 1
+ loop2:
+   StrCpy $4 $3 1 $5
+   IntOp $5 $5 + 1
+   StrCmp $4 "" loop3
+   StrCmp $4 $1 0 loop2
+    IntOp $5 $5 - 1
+    StrCpy $3 $3 $5
+    StrCpy $5 0
+  loop3:
+    IntOp $5 $5 - 1
+    StrCpy $4 $3 1 $5
+    StrCmp $4 "" error
+    StrCmp $4 $0 0 loop3
+     IntOp $5 $5 + 1
+     StrCpy $3 $3 "" $5
+   Goto exit
+error:
+  StrCpy $3 error
+exit:
+  StrCpy $0 $3
+Pop $5
+Pop $4
+Pop $3
+Pop $2
+Pop $1
+Exch $0 ;output string
 FunctionEnd
\ No newline at end of file
diff --git a/Other/Source/StrRep.nsh b/etc/source/StrRep.nsh
similarity index 95%
rename from Other/Source/StrRep.nsh
rename to etc/source/StrRep.nsh
index 25a08cc..510c335 100644
--- a/Other/Source/StrRep.nsh
+++ b/etc/source/StrRep.nsh
@@ -1,66 +1,66 @@
-!define StrRep "!insertmacro StrRep"
-!macro StrRep output string old new
-    Push `${string}`
-    Push `${old}`
-    Push `${new}`
-    !ifdef __UNINSTALL__
-        Call un.StrRep
-    !else
-        Call StrRep
-    !endif
-    Pop ${output}
-!macroend
- 
-!macro Func_StrRep un
-    Function ${un}StrRep
-        Exch $R2 ;new
-        Exch 1
-        Exch $R1 ;old
-        Exch 2
-        Exch $R0 ;string
-        Push $R3
-        Push $R4
-        Push $R5
-        Push $R6
-        Push $R7
-        Push $R8
-        Push $R9
- 
-        StrCpy $R3 0
-        StrLen $R4 $R1
-        StrLen $R6 $R0
-        StrLen $R9 $R2
-        loop:
-            StrCpy $R5 $R0 $R4 $R3
-            StrCmp $R5 $R1 found
-            StrCmp $R3 $R6 done
-            IntOp $R3 $R3 + 1 ;move offset by 1 to check the next character
-            Goto loop
-        found:
-            StrCpy $R5 $R0 $R3
-            IntOp $R8 $R3 + $R4
-            StrCpy $R7 $R0 "" $R8
-            StrCpy $R0 $R5$R2$R7
-            StrLen $R6 $R0
-            IntOp $R3 $R3 + $R9 ;move offset by length of the replacement string
-            Goto loop
-        done:
- 
-        Pop $R9
-        Pop $R8
-        Pop $R7
-        Pop $R6
-        Pop $R5
-        Pop $R4
-        Pop $R3
-        Push $R0
-        Push $R1
-        Pop $R0
-        Pop $R1
-        Pop $R0
-        Pop $R2
-        Exch $R1
-    FunctionEnd
-!macroend
-!insertmacro Func_StrRep ""
+!define StrRep "!insertmacro StrRep"
+!macro StrRep output string old new
+    Push `${string}`
+    Push `${old}`
+    Push `${new}`
+    !ifdef __UNINSTALL__
+        Call un.StrRep
+    !else
+        Call StrRep
+    !endif
+    Pop ${output}
+!macroend
+ 
+!macro Func_StrRep un
+    Function ${un}StrRep
+        Exch $R2 ;new
+        Exch 1
+        Exch $R1 ;old
+        Exch 2
+        Exch $R0 ;string
+        Push $R3
+        Push $R4
+        Push $R5
+        Push $R6
+        Push $R7
+        Push $R8
+        Push $R9
+ 
+        StrCpy $R3 0
+        StrLen $R4 $R1
+        StrLen $R6 $R0
+        StrLen $R9 $R2
+        loop:
+            StrCpy $R5 $R0 $R4 $R3
+            StrCmp $R5 $R1 found
+            StrCmp $R3 $R6 done
+            IntOp $R3 $R3 + 1 ;move offset by 1 to check the next character
+            Goto loop
+        found:
+            StrCpy $R5 $R0 $R3
+            IntOp $R8 $R3 + $R4
+            StrCpy $R7 $R0 "" $R8
+            StrCpy $R0 $R5$R2$R7
+            StrLen $R6 $R0
+            IntOp $R3 $R3 + $R9 ;move offset by length of the replacement string
+            Goto loop
+        done:
+ 
+        Pop $R9
+        Pop $R8
+        Pop $R7
+        Pop $R6
+        Pop $R5
+        Pop $R4
+        Pop $R3
+        Push $R0
+        Push $R1
+        Pop $R0
+        Pop $R1
+        Pop $R0
+        Pop $R2
+        Exch $R1
+    FunctionEnd
+!macroend
+!insertmacro Func_StrRep ""
 !insertmacro Func_StrRep "un."
\ No newline at end of file
diff --git a/Other/Source/StrStrAdv.nsh b/etc/source/StrStrAdv.nsh
similarity index 95%
rename from Other/Source/StrStrAdv.nsh
rename to etc/source/StrStrAdv.nsh
index 9533d85..8cc3710 100644
--- a/Other/Source/StrStrAdv.nsh
+++ b/etc/source/StrStrAdv.nsh
@@ -1,333 +1,333 @@
-/*______________________________________________________________________________
- 
-                            StrStrAdv v2.0
-________________________________________________________________________________
-Requires: LogicLib header file and System plug-in. 
-
-This function searches for a substring on a string in a specified search
-direction and number of loops. This function also supports case-sensitivity of
-searches.
-
-Syntax
-	${StrStrAdv} "ResultVar" "String" "SubString" "SearchDirection" \
-	"StrInclusionDirection" "IncludeSubString" "Loops" \
-	"CaseSensitive"
-
-or
-Push "String"
-Push "SubString"
-Push "SearchDirection"
-Push "StrInclusionDirection"
-Push "IncludeSubString"
-Push "Loops"
-Push "CaseSensitive"
-Call StrStrAdv
-Pop "ResultVar"
-
-Parameters
-
-ResultVar
-Variable where the part of the String specified is returned. If SubString is not
-found, then an empty string will be returned. If SubString is empty, then String
-will be returned, along with the error flag. If String is empty, then an empty
-string will be returned, along with the error flag.
-
-String
-String where to search for SubString.
-
-SubString
-String to search in String.
-
-SearchDirection
-Specifies the direction of the search to go towards. ">" = right, "<" = left.
-Default is ">" (right).
-
-StrInclusionDirection
-Specifies which part of the string should be returned to "ResultVar" relating to
-the position of the SubString found in String. ">" = right, "<" = left. Default
-is ">" (right).
-
-IncludeSubString
-Specifies if SubString should be included in the string returned by the
-ResultVar parameter. "1" = true, "0" = false. Default is "1" (True).
-
-Loops
-Specifies the number of times the code will search "SubString" in "String" not
-including the original code execution itself. Default is "0" (1 code execution).
-
-CaseSensitive
-Specifies if the search should be case-sensitive or not. "1" = true, "0" =
-false. Default is "0" (case-insensitive).
-
-Example 
-	${StrStrAdv} $0 "This is just an example" " is" ">" "<" "0" "0" "0"
-	;$0 = "This"                                                             */
-
-Function StrStrAdv
-	!macro StrStrAdv ResultVar String SubString SearchDirection \
-		  StrInclusionDirection IncludeSubString Loops CaseSensitive
-		Push `${String}`
-		Push `${SubString}`
-		Push `${SearchDirection}`
-		Push `${StrInclusionDirection}`
-		Push `${IncludeSubString}`
-		Push `${Loops}`
-		Push `${CaseSensitive}`
-		Call StrStrAdv
-		Pop `${ResultVar}`
-	!macroend
-	!define StrStrAdv "!insertmacro StrStrAdv"
-/*After this point:
-  ------------------------------------------
-  $0 = String (input)
-  $1 = SubString (input)
-  $2 = SearchDirection (input)
-  $3 = StrInclusionDirection (input)
-  $4 = IncludeSubString (input)
-  $5 = Loops (input)
-  $6 = CaseSensitive (input)
-  $7 = StringLength (temp)
-  $8 = StrToSearchLength (temp)
-  $9 = CurrentLoop (temp)
-  $R0 = EndCharPos (temp)
-  $R1 = StartCharPos (temp)
-  $R2 = ResultVar (output)
-  $R3 = Temp (temp)*/
- 
-  ;Get input from user
- 
-  Exch $6
-  Exch
-  Exch $5
-  Exch
-  Exch 2
-  Exch $4
-  Exch 2
-  Exch 3
-  Exch $3
-  Exch 3
-  Exch 4
-  Exch $2
-  Exch 4
-  Exch 5
-  Exch $1
-  Exch 5
-  Exch 6
-  Exch $0
-  Exch 6
-  Push $7
-  Push $8
-  Push $9
-  Push $R3
-  Push $R2
-  Push $R1
-  Push $R0
- 
-  ; Clean $R0-$R3 variables
-  StrCpy $R0 ""
-  StrCpy $R1 ""
-  StrCpy $R2 ""
-  StrCpy $R3 ""
- 
-  ; Verify if we have the correct values on the variables
-  ${If} $0 == ``
-    SetErrors ;AdvStrStr_StrToSearch not found
-    Goto AdvStrStr_End
-  ${EndIf}
- 
-  ${If} $1 == ``
-    SetErrors ;No text to search
-    Goto AdvStrStr_End
-  ${EndIf}
- 
-  ${If} $2 != <
-    StrCpy $2 >
-  ${EndIf}
- 
-  ${If} $3 != <
-    StrCpy $3 >
-  ${EndIf}
- 
-  ${If} $4 <> 0
-    StrCpy $4 1
-  ${EndIf}
- 
-  ${If} $5 <= 0
-    StrCpy $5 0
-  ${EndIf}
- 
-  ${If} $6 <> 1
-    StrCpy $6 0
-  ${EndIf}
- 
-  ; Find "AdvStrStr_String" length
-  StrLen $7 $0
- 
-  ; Then find "AdvStrStr_SubString" length
-  StrLen $8 $1
- 
-  ; Now set up basic variables
- 
-  ${If} $2 == <
-    IntOp $R1 $7 - $8
-    StrCpy $R2 $7
-  ${Else}
-    StrCpy $R1 0
-    StrCpy $R2 $8
-  ${EndIf}
- 
-  StrCpy $9 0 ; First loop
- 
-  ;Let's begin the search
- 
-  ${Do}
-    ; Step 1: If the starting or ending numbers are negative
-    ;         or more than AdvStrStr_StringLen, we return
-    ;         error
- 
-    ${If} $R1 < 0
-      StrCpy $R1 ``
-      StrCpy $R2 ``
-      StrCpy $R3 ``
-      SetErrors ;AdvStrStr_SubString not found
-      Goto AdvStrStr_End
-    ${ElseIf} $R2 > $7
-      StrCpy $R1 ``
-      StrCpy $R2 ``
-      StrCpy $R3 ``
-      SetErrors ;AdvStrStr_SubString not found
-      Goto AdvStrStr_End
-    ${EndIf}
- 
-    ; Step 2: Start the search depending on
-    ;         AdvStrStr_SearchDirection. Chop down not needed
-    ;         characters.
- 
-    ${If} $R1 <> 0
-      StrCpy $R3 $0 `` $R1
-    ${EndIf}
- 
-    ${If} $R2 <> $7
-      ${If} $R1 = 0
-        StrCpy $R3 $0 $8
-      ${Else}
-        StrCpy $R3 $R3 $8
-      ${EndIf}
-    ${EndIf}
- 
-    ; Step 3: Make sure that's the string we want
- 
-    ; Case-Sensitive Support <- Use "AdvStrStr_Temp"
-    ; variable because it won't be used anymore
- 
-    ${If} $6 == 1
-      System::Call `kernel32::lstrcmpA(ts, ts) i.s` `$R3` `$1`
-      Pop $R3
-      ${If} $R3 = 0
-        StrCpy $R3 1 ; Continue
-      ${Else}
-        StrCpy $R3 0 ; Break
-      ${EndIf}
-    ${Else}
-      ${If} $R3 == $1
-        StrCpy $R3 1 ; Continue
-      ${Else}
-        StrCpy $R3 0 ; Break
-      ${EndIf}
-    ${EndIf}
- 
-    ; After the comparasion, confirm that it is the
-    ; value we want.
- 
-    ${If} $R3 = 1
- 
-      ;We found it, return except if the user has set up to
-      ;search for another one:
-      ${If} $9 >= $5
- 
-        ;Now, let's see if the user wants
-        ;AdvStrStr_SubString to appear:
-        ${If} $4 == 0
-          ;Return depends on AdvStrStr_StrInclusionDirection
-          ${If} $3 == <
-            ; RTL
-            StrCpy $R0 $0 $R1
-          ${Else}
-            ; LTR
-            StrCpy $R0 $0 `` $R2
-          ${EndIf}
-          ${Break}
-        ${Else}
-          ;Return depends on AdvStrStr_StrInclusionDirection
-          ${If} $3 == <
-            ; RTL
-            StrCpy $R0 $0 $R2
-          ${Else}
-            ; LTR
-            StrCpy $R0 $0 `` $R1
-          ${EndIf}
-          ${Break}
-        ${EndIf}
-      ${Else}
-        ;If the user wants to have more loops, let's do it so!
-        IntOp $9 $9 + 1
- 
-        ${If} $2 == <
-          IntOp $R1 $R1 - 1
-          IntOp $R2 $R2 - 1
-        ${Else}
-          IntOp $R1 $R1 + 1
-          IntOp $R2 $R2 + 1
-        ${EndIf}
-      ${EndIf}
-    ${Else}
-      ; Step 4: We didn't find it, so do steps 1 thru 3 again
- 
-      ${If} $2 == <
-        IntOp $R1 $R1 - 1
-        IntOp $R2 $R2 - 1
-      ${Else}
-        IntOp $R1 $R1 + 1
-        IntOp $R2 $R2 + 1
-      ${EndIf}
-    ${EndIf}
-  ${Loop}
- 
-  AdvStrStr_End:
- 
-  ;Add 1 to AdvStrStr_EndCharPos to be supportable
-  ;by "StrCpy"
- 
-  IntOp $R2 $R2 - 1
- 
-  ;Return output to user
- 
-  Exch $R0
-  Exch
-  Pop $R1
-  Exch
-  Pop $R2
-  Exch
-  Pop $R3
-  Exch
-  Pop $9
-  Exch
-  Pop $8
-  Exch
-  Pop $7
-  Exch
-  Pop $6
-  Exch
-  Pop $5
-  Exch
-  Pop $4
-  Exch
-  Pop $3
-  Exch
-  Pop $2
-  Exch
-  Pop $1
-  Exch
-  Pop $0
- 
+/*______________________________________________________________________________
+ 
+                            StrStrAdv v2.0
+________________________________________________________________________________
+Requires: LogicLib header file and System plug-in. 
+
+This function searches for a substring on a string in a specified search
+direction and number of loops. This function also supports case-sensitivity of
+searches.
+
+Syntax
+	${StrStrAdv} "ResultVar" "String" "SubString" "SearchDirection" \
+	"StrInclusionDirection" "IncludeSubString" "Loops" \
+	"CaseSensitive"
+
+or
+Push "String"
+Push "SubString"
+Push "SearchDirection"
+Push "StrInclusionDirection"
+Push "IncludeSubString"
+Push "Loops"
+Push "CaseSensitive"
+Call StrStrAdv
+Pop "ResultVar"
+
+Parameters
+
+ResultVar
+Variable where the part of the String specified is returned. If SubString is not
+found, then an empty string will be returned. If SubString is empty, then String
+will be returned, along with the error flag. If String is empty, then an empty
+string will be returned, along with the error flag.
+
+String
+String where to search for SubString.
+
+SubString
+String to search in String.
+
+SearchDirection
+Specifies the direction of the search to go towards. ">" = right, "<" = left.
+Default is ">" (right).
+
+StrInclusionDirection
+Specifies which part of the string should be returned to "ResultVar" relating to
+the position of the SubString found in String. ">" = right, "<" = left. Default
+is ">" (right).
+
+IncludeSubString
+Specifies if SubString should be included in the string returned by the
+ResultVar parameter. "1" = true, "0" = false. Default is "1" (True).
+
+Loops
+Specifies the number of times the code will search "SubString" in "String" not
+including the original code execution itself. Default is "0" (1 code execution).
+
+CaseSensitive
+Specifies if the search should be case-sensitive or not. "1" = true, "0" =
+false. Default is "0" (case-insensitive).
+
+Example 
+	${StrStrAdv} $0 "This is just an example" " is" ">" "<" "0" "0" "0"
+	;$0 = "This"                                                             */
+
+Function StrStrAdv
+	!macro StrStrAdv ResultVar String SubString SearchDirection \
+		  StrInclusionDirection IncludeSubString Loops CaseSensitive
+		Push `${String}`
+		Push `${SubString}`
+		Push `${SearchDirection}`
+		Push `${StrInclusionDirection}`
+		Push `${IncludeSubString}`
+		Push `${Loops}`
+		Push `${CaseSensitive}`
+		Call StrStrAdv
+		Pop `${ResultVar}`
+	!macroend
+	!define StrStrAdv "!insertmacro StrStrAdv"
+/*After this point:
+  ------------------------------------------
+  $0 = String (input)
+  $1 = SubString (input)
+  $2 = SearchDirection (input)
+  $3 = StrInclusionDirection (input)
+  $4 = IncludeSubString (input)
+  $5 = Loops (input)
+  $6 = CaseSensitive (input)
+  $7 = StringLength (temp)
+  $8 = StrToSearchLength (temp)
+  $9 = CurrentLoop (temp)
+  $R0 = EndCharPos (temp)
+  $R1 = StartCharPos (temp)
+  $R2 = ResultVar (output)
+  $R3 = Temp (temp)*/
+ 
+  ;Get input from user
+ 
+  Exch $6
+  Exch
+  Exch $5
+  Exch
+  Exch 2
+  Exch $4
+  Exch 2
+  Exch 3
+  Exch $3
+  Exch 3
+  Exch 4
+  Exch $2
+  Exch 4
+  Exch 5
+  Exch $1
+  Exch 5
+  Exch 6
+  Exch $0
+  Exch 6
+  Push $7
+  Push $8
+  Push $9
+  Push $R3
+  Push $R2
+  Push $R1
+  Push $R0
+ 
+  ; Clean $R0-$R3 variables
+  StrCpy $R0 ""
+  StrCpy $R1 ""
+  StrCpy $R2 ""
+  StrCpy $R3 ""
+ 
+  ; Verify if we have the correct values on the variables
+  ${If} $0 == ``
+    SetErrors ;AdvStrStr_StrToSearch not found
+    Goto AdvStrStr_End
+  ${EndIf}
+ 
+  ${If} $1 == ``
+    SetErrors ;No text to search
+    Goto AdvStrStr_End
+  ${EndIf}
+ 
+  ${If} $2 != <
+    StrCpy $2 >
+  ${EndIf}
+ 
+  ${If} $3 != <
+    StrCpy $3 >
+  ${EndIf}
+ 
+  ${If} $4 <> 0
+    StrCpy $4 1
+  ${EndIf}
+ 
+  ${If} $5 <= 0
+    StrCpy $5 0
+  ${EndIf}
+ 
+  ${If} $6 <> 1
+    StrCpy $6 0
+  ${EndIf}
+ 
+  ; Find "AdvStrStr_String" length
+  StrLen $7 $0
+ 
+  ; Then find "AdvStrStr_SubString" length
+  StrLen $8 $1
+ 
+  ; Now set up basic variables
+ 
+  ${If} $2 == <
+    IntOp $R1 $7 - $8
+    StrCpy $R2 $7
+  ${Else}
+    StrCpy $R1 0
+    StrCpy $R2 $8
+  ${EndIf}
+ 
+  StrCpy $9 0 ; First loop
+ 
+  ;Let's begin the search
+ 
+  ${Do}
+    ; Step 1: If the starting or ending numbers are negative
+    ;         or more than AdvStrStr_StringLen, we return
+    ;         error
+ 
+    ${If} $R1 < 0
+      StrCpy $R1 ``
+      StrCpy $R2 ``
+      StrCpy $R3 ``
+      SetErrors ;AdvStrStr_SubString not found
+      Goto AdvStrStr_End
+    ${ElseIf} $R2 > $7
+      StrCpy $R1 ``
+      StrCpy $R2 ``
+      StrCpy $R3 ``
+      SetErrors ;AdvStrStr_SubString not found
+      Goto AdvStrStr_End
+    ${EndIf}
+ 
+    ; Step 2: Start the search depending on
+    ;         AdvStrStr_SearchDirection. Chop down not needed
+    ;         characters.
+ 
+    ${If} $R1 <> 0
+      StrCpy $R3 $0 `` $R1
+    ${EndIf}
+ 
+    ${If} $R2 <> $7
+      ${If} $R1 = 0
+        StrCpy $R3 $0 $8
+      ${Else}
+        StrCpy $R3 $R3 $8
+      ${EndIf}
+    ${EndIf}
+ 
+    ; Step 3: Make sure that's the string we want
+ 
+    ; Case-Sensitive Support <- Use "AdvStrStr_Temp"
+    ; variable because it won't be used anymore
+ 
+    ${If} $6 == 1
+      System::Call `kernel32::lstrcmpA(ts, ts) i.s` `$R3` `$1`
+      Pop $R3
+      ${If} $R3 = 0
+        StrCpy $R3 1 ; Continue
+      ${Else}
+        StrCpy $R3 0 ; Break
+      ${EndIf}
+    ${Else}
+      ${If} $R3 == $1
+        StrCpy $R3 1 ; Continue
+      ${Else}
+        StrCpy $R3 0 ; Break
+      ${EndIf}
+    ${EndIf}
+ 
+    ; After the comparasion, confirm that it is the
+    ; value we want.
+ 
+    ${If} $R3 = 1
+ 
+      ;We found it, return except if the user has set up to
+      ;search for another one:
+      ${If} $9 >= $5
+ 
+        ;Now, let's see if the user wants
+        ;AdvStrStr_SubString to appear:
+        ${If} $4 == 0
+          ;Return depends on AdvStrStr_StrInclusionDirection
+          ${If} $3 == <
+            ; RTL
+            StrCpy $R0 $0 $R1
+          ${Else}
+            ; LTR
+            StrCpy $R0 $0 `` $R2
+          ${EndIf}
+          ${Break}
+        ${Else}
+          ;Return depends on AdvStrStr_StrInclusionDirection
+          ${If} $3 == <
+            ; RTL
+            StrCpy $R0 $0 $R2
+          ${Else}
+            ; LTR
+            StrCpy $R0 $0 `` $R1
+          ${EndIf}
+          ${Break}
+        ${EndIf}
+      ${Else}
+        ;If the user wants to have more loops, let's do it so!
+        IntOp $9 $9 + 1
+ 
+        ${If} $2 == <
+          IntOp $R1 $R1 - 1
+          IntOp $R2 $R2 - 1
+        ${Else}
+          IntOp $R1 $R1 + 1
+          IntOp $R2 $R2 + 1
+        ${EndIf}
+      ${EndIf}
+    ${Else}
+      ; Step 4: We didn't find it, so do steps 1 thru 3 again
+ 
+      ${If} $2 == <
+        IntOp $R1 $R1 - 1
+        IntOp $R2 $R2 - 1
+      ${Else}
+        IntOp $R1 $R1 + 1
+        IntOp $R2 $R2 + 1
+      ${EndIf}
+    ${EndIf}
+  ${Loop}
+ 
+  AdvStrStr_End:
+ 
+  ;Add 1 to AdvStrStr_EndCharPos to be supportable
+  ;by "StrCpy"
+ 
+  IntOp $R2 $R2 - 1
+ 
+  ;Return output to user
+ 
+  Exch $R0
+  Exch
+  Pop $R1
+  Exch
+  Pop $R2
+  Exch
+  Pop $R3
+  Exch
+  Pop $9
+  Exch
+  Pop $8
+  Exch
+  Pop $7
+  Exch
+  Pop $6
+  Exch
+  Pop $5
+  Exch
+  Pop $4
+  Exch
+  Pop $3
+  Exch
+  Pop $2
+  Exch
+  Pop $1
+  Exch
+  Pop $0
+ 
 FunctionEnd
\ No newline at end of file
diff --git a/Other/Source/StrTok.nsh b/etc/source/StrTok.nsh
similarity index 95%
rename from Other/Source/StrTok.nsh
rename to etc/source/StrTok.nsh
index 25cfab3..d06c58f 100644
--- a/Other/Source/StrTok.nsh
+++ b/etc/source/StrTok.nsh
@@ -1,193 +1,193 @@
-/*______________________________________________________________________________
- 
-                            StrTok v2.0.1
-________________________________________________________________________________
-Requires: LogicLib header file. 
-
-This function returns a specific part of a string between separators.
-
-Syntax //
-${StrTok} "ResultVar" "String" "Separators" "ResultPart" "SkipEmptyParts"
-
-or
-Push "String"
-Push "Separators"
-Push "ResultPart"
-Push "SkipEmptyParts"
-Call StrTok
-Pop "ResultVar"
-
-Parameters //
-
-ResultVar:
-Variable where the part indicated by ResultPart found in String is returned. If
-no Separators are found, the entire string is considered the one and only part
-existent.
-
-String:
-String where to search for SubString.
-
-Separators:
-Characters to find in String.
-
-ResultPart:
-Number which indicates which part inside two Separators (including the start and
-end of String). This number starts at zero (0). "L" is the last part that can be
-found. Default is "L" (last part).
-
-SkipEmptyParts:
-Indicates whether to skip empty string parts. 1 = True, 0 = False. Default is 1
-(True).
-
-Example
-${StrTok} $0 "This is, or is not, just an example" " ," "4" "1"
-
-	$0 = "not"                                                               */
-
-Function StrTok
-	!macro StrTok ResultVar String Separators ResultPart SkipEmptyParts
-		Push "${String}"
-		Push "${Separators}"
-		Push "${ResultPart}"
-		Push "${SkipEmptyParts}"
-		Call StrTok
-		Pop "${ResultVar}"
-	!macroend
-	!define StrTok "!insertmacro StrTok"
-
-/*   After this point:
-	$0 = SkipEmptyParts (input)
-	$1 = ResultPart (input)
-	$2 = Separators (input)
-	$3 = String (input)
-	$4 = SeparatorsLen (temp)
-	$5 = StrLen (temp)
-	$6 = StartCharPos (temp)
-	$7 = TempStr (temp)
-	$8 = CurrentLoop
-	$9 = CurrentSepChar
-	$R0 = CurrentSepCharNum */
- 
-	;Get input from user
-	Exch $0
-	Exch
-	Exch $1
-	Exch
-	Exch 2
-	Exch $2
-	Exch 2
-	Exch 3
-	Exch $3
-	Exch 3
-	Push $4
-	Push $5
-	Push $6
-	Push $7
-	Push $8
-	Push $9
-	Push $R0
-
-	;Parameter defaults
-	${IfThen} $2 == `` ${|} StrCpy $2 `|` ${|}
-	${IfThen} $1 == `` ${|} StrCpy $1 `L` ${|}
-	${IfThen} $0 == `` ${|} StrCpy $0 `0` ${|}
-
-	;Get "String" and "Separators" length
-	StrLen $4 $2
-	StrLen $5 $3
-	;Start "StartCharPos" and "ResultPart" counters
-	StrCpy $6 0
-	StrCpy $8 -1
-
-	;Loop until "ResultPart" is met, "Separators" is found or
-	;"String" reaches its end
-	ResultPartLoop: ;"CurrentLoop" Loop
-
-	;Increase "CurrentLoop" counter
-	IntOp $8 $8 + 1
-
-	StrSearchLoop:
-	${Do} ;"String" Loop
-	;Remove everything before and after the searched part ("TempStr")
-	StrCpy $7 $3 1 $6
-
-	;Verify if it's the "String" end
-	${If} $6 >= $5
-	 ;If "CurrentLoop" is what the user wants, remove the part
-	 ;after "TempStr" and itself and get out of here
-	 ${If} $8 == $1
-	 ${OrIf} $1 == `L`
-	   StrCpy $3 $3 $6
-	 ${Else} ;If not, empty "String" and get out of here
-	   StrCpy $3 ``
-	 ${EndIf}
-	 StrCpy $R0 `End`
-	 ${ExitDo}
-	${EndIf}
-
-	;Start "CurrentSepCharNum" counter (for "Separators" Loop)
-	StrCpy $R0 0
-
-	${Do} ;"Separators" Loop
-	 ;Use one "Separators" character at a time
-	 ${If} $R0 <> 0
-	   StrCpy $9 $2 1 $R0
-	 ${Else}
-	   StrCpy $9 $2 1
-	 ${EndIf}
-
-	 ;Go to the next "String" char if it's "Separators" end
-	 ${IfThen} $R0 >= $4 ${|} ${ExitDo} ${|}
-
-	 ;Or, if "TempStr" equals "CurrentSepChar", then...
-	 ${If} $7 == $9
-	   StrCpy $7 $3 $6
-
-	   ;If "String" is empty because this result part doesn't
-	   ;contain data, verify if "SkipEmptyParts" is activated,
-	   ;so we don't return the output to user yet
-
-	   ${If} $7 == ``
-	   ${AndIf} $0 = 1 ;${TRUE}
-		IntOp $6 $6 + 1
-		StrCpy $3 $3 `` $6
-		StrCpy $6 0
-		Goto StrSearchLoop
-	   ${ElseIf} $8 == $1
-		StrCpy $3 $3 $6
-		StrCpy $R0 "End"
-		${ExitDo}
-	   ${EndIf} ;If not, go to the next result part
-	   IntOp $6 $6 + 1
-	   StrCpy $3 $3 `` $6
-	   StrCpy $6 0
-	   Goto ResultPartLoop
-	 ${EndIf}
-
-	 ;Increase "CurrentSepCharNum" counter
-	 IntOp $R0 $R0 + 1
-	${Loop}
-	${IfThen} $R0 == "End" ${|} ${ExitDo} ${|}
-
-	;Increase "StartCharPos" counter
-	IntOp $6 $6 + 1
-	${Loop}
-
-	/*After this point:
-	------------------------------------------
-	$3 = ResultVar (output)*/
-
-	;Return output to user
-
-	Pop $R0
-	Pop $9
-	Pop $8
-	Pop $7
-	Pop $6
-	Pop $5
-	Pop $4
-	Pop $0
-	Pop $1
-	Pop $2
-	Exch $3
+/*______________________________________________________________________________
+ 
+                            StrTok v2.0.1
+________________________________________________________________________________
+Requires: LogicLib header file. 
+
+This function returns a specific part of a string between separators.
+
+Syntax //
+${StrTok} "ResultVar" "String" "Separators" "ResultPart" "SkipEmptyParts"
+
+or
+Push "String"
+Push "Separators"
+Push "ResultPart"
+Push "SkipEmptyParts"
+Call StrTok
+Pop "ResultVar"
+
+Parameters //
+
+ResultVar:
+Variable where the part indicated by ResultPart found in String is returned. If
+no Separators are found, the entire string is considered the one and only part
+existent.
+
+String:
+String where to search for SubString.
+
+Separators:
+Characters to find in String.
+
+ResultPart:
+Number which indicates which part inside two Separators (including the start and
+end of String). This number starts at zero (0). "L" is the last part that can be
+found. Default is "L" (last part).
+
+SkipEmptyParts:
+Indicates whether to skip empty string parts. 1 = True, 0 = False. Default is 1
+(True).
+
+Example
+${StrTok} $0 "This is, or is not, just an example" " ," "4" "1"
+
+	$0 = "not"                                                               */
+
+Function StrTok
+	!macro StrTok ResultVar String Separators ResultPart SkipEmptyParts
+		Push "${String}"
+		Push "${Separators}"
+		Push "${ResultPart}"
+		Push "${SkipEmptyParts}"
+		Call StrTok
+		Pop "${ResultVar}"
+	!macroend
+	!define StrTok "!insertmacro StrTok"
+
+/*   After this point:
+	$0 = SkipEmptyParts (input)
+	$1 = ResultPart (input)
+	$2 = Separators (input)
+	$3 = String (input)
+	$4 = SeparatorsLen (temp)
+	$5 = StrLen (temp)
+	$6 = StartCharPos (temp)
+	$7 = TempStr (temp)
+	$8 = CurrentLoop
+	$9 = CurrentSepChar
+	$R0 = CurrentSepCharNum */
+ 
+	;Get input from user
+	Exch $0
+	Exch
+	Exch $1
+	Exch
+	Exch 2
+	Exch $2
+	Exch 2
+	Exch 3
+	Exch $3
+	Exch 3
+	Push $4
+	Push $5
+	Push $6
+	Push $7
+	Push $8
+	Push $9
+	Push $R0
+
+	;Parameter defaults
+	${IfThen} $2 == `` ${|} StrCpy $2 `|` ${|}
+	${IfThen} $1 == `` ${|} StrCpy $1 `L` ${|}
+	${IfThen} $0 == `` ${|} StrCpy $0 `0` ${|}
+
+	;Get "String" and "Separators" length
+	StrLen $4 $2
+	StrLen $5 $3
+	;Start "StartCharPos" and "ResultPart" counters
+	StrCpy $6 0
+	StrCpy $8 -1
+
+	;Loop until "ResultPart" is met, "Separators" is found or
+	;"String" reaches its end
+	ResultPartLoop: ;"CurrentLoop" Loop
+
+	;Increase "CurrentLoop" counter
+	IntOp $8 $8 + 1
+
+	StrSearchLoop:
+	${Do} ;"String" Loop
+	;Remove everything before and after the searched part ("TempStr")
+	StrCpy $7 $3 1 $6
+
+	;Verify if it's the "String" end
+	${If} $6 >= $5
+	 ;If "CurrentLoop" is what the user wants, remove the part
+	 ;after "TempStr" and itself and get out of here
+	 ${If} $8 == $1
+	 ${OrIf} $1 == `L`
+	   StrCpy $3 $3 $6
+	 ${Else} ;If not, empty "String" and get out of here
+	   StrCpy $3 ``
+	 ${EndIf}
+	 StrCpy $R0 `End`
+	 ${ExitDo}
+	${EndIf}
+
+	;Start "CurrentSepCharNum" counter (for "Separators" Loop)
+	StrCpy $R0 0
+
+	${Do} ;"Separators" Loop
+	 ;Use one "Separators" character at a time
+	 ${If} $R0 <> 0
+	   StrCpy $9 $2 1 $R0
+	 ${Else}
+	   StrCpy $9 $2 1
+	 ${EndIf}
+
+	 ;Go to the next "String" char if it's "Separators" end
+	 ${IfThen} $R0 >= $4 ${|} ${ExitDo} ${|}
+
+	 ;Or, if "TempStr" equals "CurrentSepChar", then...
+	 ${If} $7 == $9
+	   StrCpy $7 $3 $6
+
+	   ;If "String" is empty because this result part doesn't
+	   ;contain data, verify if "SkipEmptyParts" is activated,
+	   ;so we don't return the output to user yet
+
+	   ${If} $7 == ``
+	   ${AndIf} $0 = 1 ;${TRUE}
+		IntOp $6 $6 + 1
+		StrCpy $3 $3 `` $6
+		StrCpy $6 0
+		Goto StrSearchLoop
+	   ${ElseIf} $8 == $1
+		StrCpy $3 $3 $6
+		StrCpy $R0 "End"
+		${ExitDo}
+	   ${EndIf} ;If not, go to the next result part
+	   IntOp $6 $6 + 1
+	   StrCpy $3 $3 `` $6
+	   StrCpy $6 0
+	   Goto ResultPartLoop
+	 ${EndIf}
+
+	 ;Increase "CurrentSepCharNum" counter
+	 IntOp $R0 $R0 + 1
+	${Loop}
+	${IfThen} $R0 == "End" ${|} ${ExitDo} ${|}
+
+	;Increase "StartCharPos" counter
+	IntOp $6 $6 + 1
+	${Loop}
+
+	/*After this point:
+	------------------------------------------
+	$3 = ResultVar (output)*/
+
+	;Return output to user
+
+	Pop $R0
+	Pop $9
+	Pop $8
+	Pop $7
+	Pop $6
+	Pop $5
+	Pop $4
+	Pop $0
+	Pop $1
+	Pop $2
+	Exch $3
 FunctionEnd
\ No newline at end of file
diff --git a/Other/Source/StrTrimNewLines.nsh b/etc/source/StrTrimNewLines.nsh
similarity index 94%
rename from Other/Source/StrTrimNewLines.nsh
rename to etc/source/StrTrimNewLines.nsh
index d39816f..62fd086 100644
--- a/Other/Source/StrTrimNewLines.nsh
+++ b/etc/source/StrTrimNewLines.nsh
@@ -1,26 +1,26 @@
-Function StrTrimNewLines
-	!macro StrTrimNewLines ResultVar String
-		Push `${String}`
-		Call StrTrimNewLines
-		Pop `${ResultVar}`
-	!macroend
-	!define StrTrimNewLines `!insertmacro StrTrimNewLines`
-	Exch $R0
-	Push $R1
-	Push $R2
-	StrCpy $R1 0
-	loop:
-		IntOp $R1 $R1 - 1
-		StrCpy $R2 $R0 1 $R1
-		${If} $R2 == `$\r`
-		${OrIf} $R2 == `$\n`
-			Goto loop
-		${EndIf}
-	IntOp $R1 $R1 + 1
-	${If} $R1 < 0
-		StrCpy $R0 $R0 $R1
-	${EndIf}
-	Pop $R2
-	Pop $R1
-	Exch $R0
+Function StrTrimNewLines
+	!macro StrTrimNewLines ResultVar String
+		Push `${String}`
+		Call StrTrimNewLines
+		Pop `${ResultVar}`
+	!macroend
+	!define StrTrimNewLines `!insertmacro StrTrimNewLines`
+	Exch $R0
+	Push $R1
+	Push $R2
+	StrCpy $R1 0
+	loop:
+		IntOp $R1 $R1 - 1
+		StrCpy $R2 $R0 1 $R1
+		${If} $R2 == `$\r`
+		${OrIf} $R2 == `$\n`
+			Goto loop
+		${EndIf}
+	IntOp $R1 $R1 + 1
+	${If} $R1 < 0
+		StrCpy $R0 $R0 $R1
+	${EndIf}
+	Pop $R2
+	Pop $R1
+	Exch $R0
 FunctionEnd
\ No newline at end of file
diff --git a/Other/Source/StrVal.nsh b/etc/source/StrVal.nsh
similarity index 95%
rename from Other/Source/StrVal.nsh
rename to etc/source/StrVal.nsh
index 0e3f4a4..93c9173 100644
--- a/Other/Source/StrVal.nsh
+++ b/etc/source/StrVal.nsh
@@ -1,65 +1,65 @@
-/*
-Allows you to validate a string with a custom criteria. This means you can validate a string to only contain numbers, or just letters, or a combination of both. Enjoy!
-
-ALPHA   = "abcdefghijklmnopqrstuvwxyz"
-NUMERIC = "1234567890"
-SPECIAL = "~!@#$%^&*()_+|`\=-}{$\":?><][';/.," # workaround for syntax highlighting - '
-
-Example:
-	${Validate} $VAR "test" ${ALPHA}
-		$VAR = 1
-	${Validate} $out "test1" ${ALPHA}
-		$VAR = 0
-	${Validate} $out "123" ${NUMERIC}
-		$VAR = 1
-	${Validate} $out "123asdf" ${NUMERIC}
-		$VAR = 0
-*/
-!define ALPHA   abcdefghijklmnopqrstuvwxyz
-!define NUMERIC 1234567890
-!define SPECIAL "~!@#$%^&*()_+|`\=-}{$\":?><][';/.,"
-Function StrVal
-	!macro _StrVal _STR _TEST _RET
-		Push `${_STR}`
-		Push `${_TEST}`
-		Call StrVal
-		Pop ${_RET}
-	!macroend
-	!define StrVal `!insertmacro _StrVal`
-	Push $0
-	Push $1
-	Push $2
-	Push $3
-	Push $4
-	Push $5
-	Push $6
-	Push $7
-	Push $8
-	Exch 9
-	Pop $1
-	Exch 9
-	Pop $2
-	StrCpy $0 1
-	StrLen $3 $2
-	StrLen $6 $1
-	StrCpy $4 0
-	StrCpy $5 $2 1 $4
-	StrCpy $7 0
-	StrCpy $8 $1 1 $7
-	StrCmp $5 $8 +3 0
-	IntOp $7 $7 + 1
-	IntCmp $7 $6 -3 -3 +3
-	IntOp $4 $4 + 1
-	IntCmp $4 $3 -7 -7 +2
-	StrCpy $0 0
-	Pop $6
-	Pop $5
-	Pop $4
-	Pop $3
-	Pop $2
-	Pop $1
-	Exch 2
-	Pop $7
-	Pop $8
-	Exch $0
+/*
+Allows you to validate a string with a custom criteria. This means you can validate a string to only contain numbers, or just letters, or a combination of both. Enjoy!
+
+ALPHA   = "abcdefghijklmnopqrstuvwxyz"
+NUMERIC = "1234567890"
+SPECIAL = "~!@#$%^&*()_+|`\=-}{$\":?><][';/.," # workaround for syntax highlighting - '
+
+Example:
+	${Validate} $VAR "test" ${ALPHA}
+		$VAR = 1
+	${Validate} $out "test1" ${ALPHA}
+		$VAR = 0
+	${Validate} $out "123" ${NUMERIC}
+		$VAR = 1
+	${Validate} $out "123asdf" ${NUMERIC}
+		$VAR = 0
+*/
+!define ALPHA   abcdefghijklmnopqrstuvwxyz
+!define NUMERIC 1234567890
+!define SPECIAL "~!@#$%^&*()_+|`\=-}{$\":?><][';/.,"
+Function StrVal
+	!macro _StrVal _STR _TEST _RET
+		Push `${_STR}`
+		Push `${_TEST}`
+		Call StrVal
+		Pop ${_RET}
+	!macroend
+	!define StrVal `!insertmacro _StrVal`
+	Push $0
+	Push $1
+	Push $2
+	Push $3
+	Push $4
+	Push $5
+	Push $6
+	Push $7
+	Push $8
+	Exch 9
+	Pop $1
+	Exch 9
+	Pop $2
+	StrCpy $0 1
+	StrLen $3 $2
+	StrLen $6 $1
+	StrCpy $4 0
+	StrCpy $5 $2 1 $4
+	StrCpy $7 0
+	StrCpy $8 $1 1 $7
+	StrCmp $5 $8 +3 0
+	IntOp $7 $7 + 1
+	IntCmp $7 $6 -3 -3 +3
+	IntOp $4 $4 + 1
+	IntCmp $4 $3 -7 -7 +2
+	StrCpy $0 0
+	Pop $6
+	Pop $5
+	Pop $4
+	Pop $3
+	Pop $2
+	Pop $1
+	Exch 2
+	Pop $7
+	Pop $8
+	Exch $0
 FunctionEnd
\ No newline at end of file
diff --git a/Other/Source/System.nsh b/etc/source/System.nsh
similarity index 100%
rename from Other/Source/System.nsh
rename to etc/source/System.nsh
diff --git a/Other/Source/TextFunc.nsh b/etc/source/TextFunc.nsh
similarity index 100%
rename from Other/Source/TextFunc.nsh
rename to etc/source/TextFunc.nsh
diff --git a/Other/Source/TextReplace.nsh b/etc/source/TextReplace.nsh
similarity index 97%
rename from Other/Source/TextReplace.nsh
rename to etc/source/TextReplace.nsh
index e5bec68..c35331b 100644
--- a/Other/Source/TextReplace.nsh
+++ b/etc/source/TextReplace.nsh
@@ -1,77 +1,77 @@
-/*****************************************************************
- *              NewTextReplace NSIS plugin v0.4                  *
- *                  by Gringoloco023, 2010                       *
- *            http://portableapps.com/node/21840                 *
- *                          Based on:                            *
- *                TextReplace NSIS plugin v1.5                   *
- *                                                               *
- * 2006 Shengalts Aleksander aka Instructor (Shengalts@mail.ru)  *
- *****************************************************************/
-;This file named TextReplace.nsh, for compatibility of old scripts !
-
-!define ReplaceInFileUTF16LECS '!insertmacro "ReplaceInFileUTF16LECS"' ;${ReplaceInFileUTF16LECS} SOURCE_FILE SEARCH_TEXT REPLACEMENT
-!define ReplaceInFileUTF16LE '!insertmacro "ReplaceInFileUTF16LE"' ;${ReplaceInFileUTF16LE} SOURCE_FILE SEARCH_TEXT REPLACEMENT
-
-
-!define textreplace::FindInFile `!insertmacro textreplace::FindInFile`
-
-!macro textreplace::FindInFile _INPUTFILE _FINDIT _OPTIONS _COUNT
-	newtextreplace::_FindInFile /NOUNLOAD `${_INPUTFILE}` `${_FINDIT}` `${_OPTIONS}`
-	Pop ${_COUNT}
-!macroend
-
-
-!define textreplace::ReplaceInFile `!insertmacro textreplace::ReplaceInFile`
-
-!macro textreplace::ReplaceInFile _INPUTFILE _OUTPUTFILE _REPLACEIT _REPLACEWITH _OPTIONS _COUNT
-	newtextreplace::_ReplaceInFile /NOUNLOAD `${_INPUTFILE}` `${_OUTPUTFILE}` `${_REPLACEIT}` `${_REPLACEWITH}` `${_OPTIONS}`
-	Pop ${_COUNT}
-!macroend
-
-
-!define textreplace::FillReadBuffer `!insertmacro textreplace::FillReadBuffer`
-
-!macro textreplace::FillReadBuffer _FILE _POINTER
-	newtextreplace::_FillReadBuffer /NOUNLOAD `${_FILE}`
-	Pop ${_POINTER}
-!macroend
-
-
-
-!define textreplace::FreeReadBuffer `!insertmacro textreplace::FreeReadBuffer`
-
-!macro textreplace::FreeReadBuffer _POINTER
-	newtextreplace::_FreeReadBuffer /NOUNLOAD `${_POINTER}`
-!macroend
-
-
-
-!define textreplace::Unload `!insertmacro textreplace::Unload`
-
-!macro textreplace::Unload
-	newtextreplace::_Unload
-!macroend
-
-/*****************************************************************
- ***                The following is meant to                  ***
- ***               be used in combination with                 ***
- ***            ReplaceInFileWithTextReplace.nsh               ***
- *****************************************************************/
-
-!macro ReplaceInFileUTF16LECS SOURCE_FILE SEARCH_TEXT REPLACEMENT
-	Push `/U=1 /S=1`
-	Push `${SOURCE_FILE}`
-	Push `${SEARCH_TEXT}`
-	Push `${REPLACEMENT}`
-	Call ReplaceInFile
-
-!macroend
-
-!macro ReplaceInFileUTF16LE SOURCE_FILE SEARCH_TEXT REPLACEMENT
-	Push `/U=1 /S=0`
-	Push `${SOURCE_FILE}`
-	Push `${SEARCH_TEXT}`
-	Push `${REPLACEMENT}`
-	Call ReplaceInFile
-!macroend
-
+/*****************************************************************
+ *              NewTextReplace NSIS plugin v0.4                  *
+ *                  by Gringoloco023, 2010                       *
+ *            http://portableapps.com/node/21840                 *
+ *                          Based on:                            *
+ *                TextReplace NSIS plugin v1.5                   *
+ *                                                               *
+ * 2006 Shengalts Aleksander aka Instructor (Shengalts@mail.ru)  *
+ *****************************************************************/
+;This file named TextReplace.nsh, for compatibility of old scripts !
+
+!define ReplaceInFileUTF16LECS '!insertmacro "ReplaceInFileUTF16LECS"' ;${ReplaceInFileUTF16LECS} SOURCE_FILE SEARCH_TEXT REPLACEMENT
+!define ReplaceInFileUTF16LE '!insertmacro "ReplaceInFileUTF16LE"' ;${ReplaceInFileUTF16LE} SOURCE_FILE SEARCH_TEXT REPLACEMENT
+
+
+!define textreplace::FindInFile `!insertmacro textreplace::FindInFile`
+
+!macro textreplace::FindInFile _INPUTFILE _FINDIT _OPTIONS _COUNT
+	newtextreplace::_FindInFile /NOUNLOAD `${_INPUTFILE}` `${_FINDIT}` `${_OPTIONS}`
+	Pop ${_COUNT}
+!macroend
+
+
+!define textreplace::ReplaceInFile `!insertmacro textreplace::ReplaceInFile`
+
+!macro textreplace::ReplaceInFile _INPUTFILE _OUTPUTFILE _REPLACEIT _REPLACEWITH _OPTIONS _COUNT
+	newtextreplace::_ReplaceInFile /NOUNLOAD `${_INPUTFILE}` `${_OUTPUTFILE}` `${_REPLACEIT}` `${_REPLACEWITH}` `${_OPTIONS}`
+	Pop ${_COUNT}
+!macroend
+
+
+!define textreplace::FillReadBuffer `!insertmacro textreplace::FillReadBuffer`
+
+!macro textreplace::FillReadBuffer _FILE _POINTER
+	newtextreplace::_FillReadBuffer /NOUNLOAD `${_FILE}`
+	Pop ${_POINTER}
+!macroend
+
+
+
+!define textreplace::FreeReadBuffer `!insertmacro textreplace::FreeReadBuffer`
+
+!macro textreplace::FreeReadBuffer _POINTER
+	newtextreplace::_FreeReadBuffer /NOUNLOAD `${_POINTER}`
+!macroend
+
+
+
+!define textreplace::Unload `!insertmacro textreplace::Unload`
+
+!macro textreplace::Unload
+	newtextreplace::_Unload
+!macroend
+
+/*****************************************************************
+ ***                The following is meant to                  ***
+ ***               be used in combination with                 ***
+ ***            ReplaceInFileWithTextReplace.nsh               ***
+ *****************************************************************/
+
+!macro ReplaceInFileUTF16LECS SOURCE_FILE SEARCH_TEXT REPLACEMENT
+	Push `/U=1 /S=1`
+	Push `${SOURCE_FILE}`
+	Push `${SEARCH_TEXT}`
+	Push `${REPLACEMENT}`
+	Call ReplaceInFile
+
+!macroend
+
+!macro ReplaceInFileUTF16LE SOURCE_FILE SEARCH_TEXT REPLACEMENT
+	Push `/U=1 /S=0`
+	Push `${SOURCE_FILE}`
+	Push `${SEARCH_TEXT}`
+	Push `${REPLACEMENT}`
+	Call ReplaceInFile
+!macroend
+
diff --git a/Other/Source/TrimWhite.nsh b/etc/source/TrimWhite.nsh
similarity index 100%
rename from Other/Source/TrimWhite.nsh
rename to etc/source/TrimWhite.nsh
diff --git a/Other/Source/TypeLib.nsh b/etc/source/TypeLib.nsh
similarity index 97%
rename from Other/Source/TypeLib.nsh
rename to etc/source/TypeLib.nsh
index 09965bc..878fa0a 100644
--- a/Other/Source/TypeLib.nsh
+++ b/etc/source/TypeLib.nsh
@@ -1,278 +1,278 @@
-!macro MyDebug
-	!ifdef ?e
-		!undef ?e
-	!endif
-	!ifdef DEBUG
-		!define ?e ?e
-	!else
-		!define ?e ''
-	!endif
-!macroend
-
-!macro RegTlb ForUser strDll
-	!verbose push
-	Push `${ForUser}`
-	Push `${strDll}`
-	${CallArtificialFunction} RegTlb_
-	!verbose pop
-!macroend
-!define RegTlbForUser '!insertmacro RegTlb ForUser'
-!define RegTlb '!insertmacro RegTlb ""'
-!macro RegTlb_
-${!getdebug}
-!insertmacro MyDebug
-	System::Store sr0r3
-	System::Call Oleaut32::LoadTypeLib(wr0,*i.r1)i.r2${?e}
-	!insertmacro GetErrorCode LoadTypeLib()
-	${If} $2 = 0
-		System::Call Oleaut32::RegisterTypeLib$3(ir1,wr0,n)i.r2${?e}
-!ifdef DEBUG
-		Push $2
-!endif
-		!insertmacro GetErrorCode RegisterTypeLib$3()ReturnValue
-		!insertmacro GetErrorCode RegisterTypeLib$3()ErrorCode
-		${If} $2 = 0
-			${DebugMsg} 'Success: Registered TLB $3 $0'
-		${Else}
-			${DebugMsg} 'Error: Failed to register TLB $3 $0'
-			SetErrors
-		${EndIf}
-	${Else}
-		${DebugMsg} 'Error: Failed to load TLB $0'
-		SetErrors
-	${EndIf}
-	System::Store l
-!macroend
-
-!macro UnRegTlb ForUser strDll
-	!verbose push
-	Push `${ForUser}`
-	Push `${strDll}`
-	${CallArtificialFunction} UnRegTlb_
-	!verbose pop
-!macroend
-!define UnRegTlbForUser '!insertmacro UnRegTlb ForUser'
-!define UnRegTlb '!insertmacro UnRegTlb ""'
-!macro UnRegTlb_
-${!getdebug}
-!insertmacro MyDebug
-	System::Store sr0r3
-	System::Call Oleaut32::LoadTypeLibEx(wr0,i${REGKIND_NONE},*i.r1)i.r2${?e}
-	!insertmacro GetErrorCode LoadTypeLibEx()
-	${If} $2 = 0
-		${ITypeLib->GetLibAttr} $1 (.r4).r2${?e}
-		!insertmacro GetErrorCode ITypeLib->GetLibAttr
-		${If} $2 = 0
-			System::Call *$4(&g16.R1,i.R2,i.R3,&i2.R4,&i2.R5,&i2.R6)
-			System::Call Oleaut32::UnRegisterTypeLib$3(&g16R1,iR4,iR5,iR2,iR3)i.r2${?e}
-!ifdef DEBUG
-			Push $2
-!endif
-			!insertmacro GetErrorCode UnRegisterTypeLib$3()ReturnValue
-			!insertmacro GetErrorCode UnRegisterTypeLib$3()ErrorCode
-			${If} $2 = 0
-				${DebugMsg} 'Success: Unregistered TLB $3 $0'
-			${Else}
-				${DebugMsg} 'Error: Could not access the OLE registry $0'
-				SetErrors
-			${EndIf}
-			${ITypeLib->ReleaseTLibAttr} $1 (r4)
-		${Else}
-			${DebugMsg} 'Error: No LibAttr struct in $0'
-			SetErrors
-		${EndIf}
-		${IUnknown->Release} $1 ()
-	${Else}
-		${DebugMsg} 'Error: Failed to load TLB $0'
-		SetErrors
-	${EndIf}
-	System::Store l
-!macroend
-
-!macro LoadProc procName strDll
-	!verbose push
-	Push `${procName}`
-	Push `${strDll}`
-	${CallArtificialFunction} LoadProc_
-	!verbose pop
-!macroend
-!define LoadProc `!insertmacro LoadProc`
-!define RegDLL `${LoadProc} DllRegisterServer`
-!define UnRegDLL `${LoadProc} DllUnregisterServer`
-;!define InstallDLL `${LoadProc} DllInstall`
-!macro LoadProc_
-${!getdebug}
-!insertmacro MyDebug
-	System::Store sr0r1
-;	StrCpy $2 0 ; module handle
-	System::Call 'Kernel32::GetModuleHandle(tr0)i.r2${?e}'
-	!insertmacro GetErrorCode GetModuleHandle()
-	${If} $2 = 0 
-		System::Call "Kernel32::LoadLibraryEx(tr0,n,i${LOAD_WITH_ALTERED_SEARCH_PATH})i.r2${?e}"
-		!insertmacro GetErrorCode LoadLibraryEx()
-	${EndIf}
-	${If} $2 <> 0
-		System::Call 'Kernel32::GetProcAddress(ir2,mr1)i.r4${?e}'
-		!insertmacro GetErrorCode GetProcAddress()
-		${If} $4 <> 0
-			System::Call "::$4()i.r3${?e}"
-			!insertmacro GetErrorCode ::ADDR()
-			${If} $3 = 0
-				${DebugMsg} 'Success: $1 $0'
-			${Else}
-				${DebugMsg} "Error: Failed to execute $1 in $0"
-				SetErrors
-			${EndIf}
-		${Else}
-			${DebugMsg} 'Error: $1 not implemented in $0'
-			SetErrors
-		${EndIf}
-		System::Call 'Kernel32::FreeLibrary(ir2)'
-	${Else}
-		${DebugMsg} 'Error: Failed to load DLL $0'
-		SetErrors
-	${EndIf}
-	System::Store l
-!macroend
- 
-!macro GetPathToLib PATH ADMIN USER
-	!verbose push
-	Push `${PATH}`
-	${CallArtificialFunction} GetPathToLib_
-	Pop ${User}
-	Pop ${Admin}
-	!verbose pop
-!macroend
-!define GetPathToLib `!insertmacro GetPathToLib`
-!macro GetPathToLib_
-${!getdebug}
-!insertmacro MyDebug
-	System::Store sR0
-	System::Call 'Oleaut32::LoadTypeLib(w R0,*i.r1)i.r0${?e}'
-	!insertmacro GetErrorCode LoadTypeLib()
-	${If} $0 = 0
-		${ITypeLib->GetLibAttr} $1 '(.R0).r0${?e}'
-		!insertmacro GetErrorCode ITypeLib->GetLibAttr
-		${If} $0 = 0
-			System::Call '*$R0(&g16.R1,i.R2,i.R3,&i2.R4,&i2.R5,&i2.R6)'
-			${ITypeLib->ReleaseTLibAttr} $1 (R0)
-			IntFmt $R2 "%X" $R2
-			${IfThen} $R3 = ${SYS_WIN16}  ${|} StrCpy $R3 Win16 ${|}
-			${IfThen} $R3 = ${SYS_WIN32}  ${|} StrCpy $R3 Win32 ${|}
-			${IfThen} $R3 = ${SYS_MAC}    ${|} StrCpy $R3 MAC   ${|} ; ???
-			StrCpy $R7 ''
-			IntOp $R8 $R6 & ${LIBFLAG_FRESTRICTED}
-			${IfThen} $R8 = ${LIBFLAG_FRESTRICTED}   ${|} StrCpy $R7    |LIBFLAG_FRESTRICTED    ${|}
-			IntOp $R8 $R6 & ${LIBFLAG_FCONTROL}
-			${IfThen} $R8 = ${LIBFLAG_FCONTROL}      ${|} StrCpy $R7 $R7|LIBFLAG_FCONTROL       ${|}
-			IntOp $R8 $R6 & ${LIBFLAG_FHIDDEN}
-			${IfThen} $R8 = ${LIBFLAG_FHIDDEN}       ${|} StrCpy $R7 $R7|LIBFLAG_FHIDDEN        ${|}
-			IntOp $R8 $R6 & ${LIBFLAG_FHASDISKIMAGE}
-			${IfThen} $R8 = ${LIBFLAG_FHASDISKIMAGE} ${|} StrCpy $R7 $R7|LIBFLAG_FHASDISKIMAGE  ${|}
-			StrCpy $R6 $R7 '' 1
-/*			DetailPrint 'TLIBATTR structure'
-			DetailPrint GUID=$R1
-			DetailPrint CLID=0x$R2
-			DetailPrint SYSKIND=$R3
-			DetailPrint MajorVerNum=$R4
-			DetailPrint MinorVerNum=$R5
-			DetailPrint LibFlags=$R6*/
-			${DebugMsg} LibFlags=$R6
-		${EndIf}
-		${IUnknown->Release} $1 ()
-	${EndIf}
-	ReadRegStr $0 HKLM SOFTWARE\Classes\TypeLib\$R1\$R4.$R5\$R2\$R3 ''
-	ReadRegStr $1 HKCU SOFTWARE\Classes\TypeLib\$R1\$R4.$R5\$R2\$R3 ''
-	ClearErrors
-	System::Store p0p1l
-!macroend
-
-!macro _GetErrorCode dwMessageId
-	System::Call Kernel32::FormatMessage(i0x00000100|0x00001000|0x00000200,,i${dwMessageId},i0x0400,*i.r1,,)i.r0
-	System::Call *$1(&t$0.r0)
-	System::Call Kernel32::LocalFree(ir1)
-!macroend
-!macro GetErrorCode MESSAGE
-${!getdebug}
-!ifdef DEBUG
-	System::Store sR0
-	!insertmacro _GetErrorCode R0
-	${DebugMsg} '${MESSAGE}=$R0$\r$\n$0'
-	System::Store l
-!endif
-!macroend
-
-!define COM_CallMethod "!insertmacro _COM_CallMethod "
-!macro _COM_CallMethod _vto _ParamsDecl _IFacePtr _Params
-	System::Call `${_IFacePtr}->${_vto}${_ParamsDecl} ${_Params}`
-!macroend
-
-!define IUnknown->Release "${COM_CallMethod}2 ()i. "
-!define ITypeLib->GetLibAttr "${COM_CallMethod}7 (*i)i. "
-!define ITypeLib->ReleaseTLibAttr "${COM_CallMethod}12 (i)i. "
-
-; dwFlags defines for LoadLibraryEx()
-!define DONT_RESOLVE_DLL_REFERENCES			0x00000001
-!define LOAD_LIBRARY_AS_DATAFILE			0x00000002
-!define LOAD_WITH_ALTERED_SEARCH_PATH		0x00000008
-!define LOAD_LIBRARY_AS_IMAGE_RESOURCE		0x00000020
-!define LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE	0x00000040
-
-;LoadTypeLib Return Values
-!define S_OK 					0
-!define E_OUTOFMEMORY			0x8007000E ; -2147024882
-!define E_INVALIDARG			0x80070057 ; -2147024809
-!define TYPE_E_IOERROR			0x80028CA2 ; -2147316574
-!define TYPE_E_INVALIDSTATE		0x80028029 ; -2147319767
-!define TYPE_E_INVDATAREAD		0x80028018 ; -2147319784
-!define TYPE_E_UNSUPFORMAT		0x80028019 ; -2147319783
-!define TYPE_E_UNKNOWNLCID		0x8002802E ; -2147319762
-!define TYPE_E_CANTLOADLIBRARY	0x80029C4A ; -2147312566
-!define FACILITY_STORAGE		3
-
-/*ITypeLib::GetLibAttr Return Values (equal to the LoadTypeLib Return Values)
-S_OK = 0
-E_OUTOFMEMORY = -2147024882
-E_INVALIDARG = -2147024809
-TYPE_E_IOERROR = -2147316574
-TYPE_E_INVDATAREAD = -2147319784
-TYPE_E_UNSUPFORMAT = -2147319783
-TYPE_E_INVALIDSTATE = -2147319767 */
-
-;LIBFLAGS Enumeration
-!define LIBFLAG_FRESTRICTED		1
-!define LIBFLAG_FCONTROL		2
-!define LIBFLAG_FHIDDEN			4
-!define LIBFLAG_FHASDISKIMAGE	8
-
-;REGKIND Enumeration
-!define REGKIND_DEFAULT			0
-!define REGKIND_REGISTER		1
-!define REGKIND_NONE			2
-
-;SYSKIND Enumeration
-!define SYS_WIN16				0
-!define SYS_WIN32				1
-!define SYS_MAC					2
-/*
-ITypeLib index count
-ITypeLib::GetTypeInfoCount	= 3		This method retrieves the number of type descriptions in the library.
-ITypeLib::GetTypeInfo		= 4		This method retrieves the specified type description in the library.
-ITypeLib::GetTypeInfoType	= 5		This method retrieves the type of a type description.
-ITypeLib::GetTypeInfoOfGuid	= 6		This method retrieves the type description that corresponds to the specified globally unique identifier (GUID).
-ITypeLib::GetLibAttr		= 7 	This method retrieves the structure that contains the library's attributes.
-ITypeLib::GetTypeComp		= 8		This method retrieves a pointer to the ITypeComp for a type library. This enables a client compiler to bind to the library's types, variables, constants, and global functions.
-ITypeLib::GetDocumentation	= 9 	This method retrieves the library's documentation string, the complete Help file name and path, and the context identifier for the library Help topic.
-ITypeLib::IsName			= 10	This method indicates whether a passed-in string contains the name of a type or a member described in the library.
-ITypeLib::FindName			= 11 	This method finds occurrences of a type description in a type library. This may be used to verify that a name exists in a type library.
-ITypeLib::ReleaseTLibAttr	= 12
-
- TYPE TLIBATTR DWORD   ' // Must be DWORD aligned
-   rguid AS GUID
-   lcid AS DWORD
-   syskind AS DWORD
-   wMajorVerNum AS WORD
-   wMinorVerNum AS WORD
-   wLibFlags AS WORD
- END TYPE
+!macro MyDebug
+	!ifdef ?e
+		!undef ?e
+	!endif
+	!ifdef DEBUG
+		!define ?e ?e
+	!else
+		!define ?e ''
+	!endif
+!macroend
+
+!macro RegTlb ForUser strDll
+	!verbose push
+	Push `${ForUser}`
+	Push `${strDll}`
+	${CallArtificialFunction} RegTlb_
+	!verbose pop
+!macroend
+!define RegTlbForUser '!insertmacro RegTlb ForUser'
+!define RegTlb '!insertmacro RegTlb ""'
+!macro RegTlb_
+${!getdebug}
+!insertmacro MyDebug
+	System::Store sr0r3
+	System::Call Oleaut32::LoadTypeLib(wr0,*i.r1)i.r2${?e}
+	!insertmacro GetErrorCode LoadTypeLib()
+	${If} $2 = 0
+		System::Call Oleaut32::RegisterTypeLib$3(ir1,wr0,n)i.r2${?e}
+!ifdef DEBUG
+		Push $2
+!endif
+		!insertmacro GetErrorCode RegisterTypeLib$3()ReturnValue
+		!insertmacro GetErrorCode RegisterTypeLib$3()ErrorCode
+		${If} $2 = 0
+			${DebugMsg} 'Success: Registered TLB $3 $0'
+		${Else}
+			${DebugMsg} 'Error: Failed to register TLB $3 $0'
+			SetErrors
+		${EndIf}
+	${Else}
+		${DebugMsg} 'Error: Failed to load TLB $0'
+		SetErrors
+	${EndIf}
+	System::Store l
+!macroend
+
+!macro UnRegTlb ForUser strDll
+	!verbose push
+	Push `${ForUser}`
+	Push `${strDll}`
+	${CallArtificialFunction} UnRegTlb_
+	!verbose pop
+!macroend
+!define UnRegTlbForUser '!insertmacro UnRegTlb ForUser'
+!define UnRegTlb '!insertmacro UnRegTlb ""'
+!macro UnRegTlb_
+${!getdebug}
+!insertmacro MyDebug
+	System::Store sr0r3
+	System::Call Oleaut32::LoadTypeLibEx(wr0,i${REGKIND_NONE},*i.r1)i.r2${?e}
+	!insertmacro GetErrorCode LoadTypeLibEx()
+	${If} $2 = 0
+		${ITypeLib->GetLibAttr} $1 (.r4).r2${?e}
+		!insertmacro GetErrorCode ITypeLib->GetLibAttr
+		${If} $2 = 0
+			System::Call *$4(&g16.R1,i.R2,i.R3,&i2.R4,&i2.R5,&i2.R6)
+			System::Call Oleaut32::UnRegisterTypeLib$3(&g16R1,iR4,iR5,iR2,iR3)i.r2${?e}
+!ifdef DEBUG
+			Push $2
+!endif
+			!insertmacro GetErrorCode UnRegisterTypeLib$3()ReturnValue
+			!insertmacro GetErrorCode UnRegisterTypeLib$3()ErrorCode
+			${If} $2 = 0
+				${DebugMsg} 'Success: Unregistered TLB $3 $0'
+			${Else}
+				${DebugMsg} 'Error: Could not access the OLE registry $0'
+				SetErrors
+			${EndIf}
+			${ITypeLib->ReleaseTLibAttr} $1 (r4)
+		${Else}
+			${DebugMsg} 'Error: No LibAttr struct in $0'
+			SetErrors
+		${EndIf}
+		${IUnknown->Release} $1 ()
+	${Else}
+		${DebugMsg} 'Error: Failed to load TLB $0'
+		SetErrors
+	${EndIf}
+	System::Store l
+!macroend
+
+!macro LoadProc procName strDll
+	!verbose push
+	Push `${procName}`
+	Push `${strDll}`
+	${CallArtificialFunction} LoadProc_
+	!verbose pop
+!macroend
+!define LoadProc `!insertmacro LoadProc`
+!define RegDLL `${LoadProc} DllRegisterServer`
+!define UnRegDLL `${LoadProc} DllUnregisterServer`
+;!define InstallDLL `${LoadProc} DllInstall`
+!macro LoadProc_
+${!getdebug}
+!insertmacro MyDebug
+	System::Store sr0r1
+;	StrCpy $2 0 ; module handle
+	System::Call 'Kernel32::GetModuleHandle(tr0)i.r2${?e}'
+	!insertmacro GetErrorCode GetModuleHandle()
+	${If} $2 = 0 
+		System::Call "Kernel32::LoadLibraryEx(tr0,n,i${LOAD_WITH_ALTERED_SEARCH_PATH})i.r2${?e}"
+		!insertmacro GetErrorCode LoadLibraryEx()
+	${EndIf}
+	${If} $2 <> 0
+		System::Call 'Kernel32::GetProcAddress(ir2,mr1)i.r4${?e}'
+		!insertmacro GetErrorCode GetProcAddress()
+		${If} $4 <> 0
+			System::Call "::$4()i.r3${?e}"
+			!insertmacro GetErrorCode ::ADDR()
+			${If} $3 = 0
+				${DebugMsg} 'Success: $1 $0'
+			${Else}
+				${DebugMsg} "Error: Failed to execute $1 in $0"
+				SetErrors
+			${EndIf}
+		${Else}
+			${DebugMsg} 'Error: $1 not implemented in $0'
+			SetErrors
+		${EndIf}
+		System::Call 'Kernel32::FreeLibrary(ir2)'
+	${Else}
+		${DebugMsg} 'Error: Failed to load DLL $0'
+		SetErrors
+	${EndIf}
+	System::Store l
+!macroend
+ 
+!macro GetPathToLib PATH ADMIN USER
+	!verbose push
+	Push `${PATH}`
+	${CallArtificialFunction} GetPathToLib_
+	Pop ${User}
+	Pop ${Admin}
+	!verbose pop
+!macroend
+!define GetPathToLib `!insertmacro GetPathToLib`
+!macro GetPathToLib_
+${!getdebug}
+!insertmacro MyDebug
+	System::Store sR0
+	System::Call 'Oleaut32::LoadTypeLib(w R0,*i.r1)i.r0${?e}'
+	!insertmacro GetErrorCode LoadTypeLib()
+	${If} $0 = 0
+		${ITypeLib->GetLibAttr} $1 '(.R0).r0${?e}'
+		!insertmacro GetErrorCode ITypeLib->GetLibAttr
+		${If} $0 = 0
+			System::Call '*$R0(&g16.R1,i.R2,i.R3,&i2.R4,&i2.R5,&i2.R6)'
+			${ITypeLib->ReleaseTLibAttr} $1 (R0)
+			IntFmt $R2 "%X" $R2
+			${IfThen} $R3 = ${SYS_WIN16}  ${|} StrCpy $R3 Win16 ${|}
+			${IfThen} $R3 = ${SYS_WIN32}  ${|} StrCpy $R3 Win32 ${|}
+			${IfThen} $R3 = ${SYS_MAC}    ${|} StrCpy $R3 MAC   ${|} ; ???
+			StrCpy $R7 ''
+			IntOp $R8 $R6 & ${LIBFLAG_FRESTRICTED}
+			${IfThen} $R8 = ${LIBFLAG_FRESTRICTED}   ${|} StrCpy $R7    |LIBFLAG_FRESTRICTED    ${|}
+			IntOp $R8 $R6 & ${LIBFLAG_FCONTROL}
+			${IfThen} $R8 = ${LIBFLAG_FCONTROL}      ${|} StrCpy $R7 $R7|LIBFLAG_FCONTROL       ${|}
+			IntOp $R8 $R6 & ${LIBFLAG_FHIDDEN}
+			${IfThen} $R8 = ${LIBFLAG_FHIDDEN}       ${|} StrCpy $R7 $R7|LIBFLAG_FHIDDEN        ${|}
+			IntOp $R8 $R6 & ${LIBFLAG_FHASDISKIMAGE}
+			${IfThen} $R8 = ${LIBFLAG_FHASDISKIMAGE} ${|} StrCpy $R7 $R7|LIBFLAG_FHASDISKIMAGE  ${|}
+			StrCpy $R6 $R7 '' 1
+/*			DetailPrint 'TLIBATTR structure'
+			DetailPrint GUID=$R1
+			DetailPrint CLID=0x$R2
+			DetailPrint SYSKIND=$R3
+			DetailPrint MajorVerNum=$R4
+			DetailPrint MinorVerNum=$R5
+			DetailPrint LibFlags=$R6*/
+			${DebugMsg} LibFlags=$R6
+		${EndIf}
+		${IUnknown->Release} $1 ()
+	${EndIf}
+	ReadRegStr $0 HKLM SOFTWARE\Classes\TypeLib\$R1\$R4.$R5\$R2\$R3 ''
+	ReadRegStr $1 HKCU SOFTWARE\Classes\TypeLib\$R1\$R4.$R5\$R2\$R3 ''
+	ClearErrors
+	System::Store p0p1l
+!macroend
+
+!macro _GetErrorCode dwMessageId
+	System::Call Kernel32::FormatMessage(i0x00000100|0x00001000|0x00000200,,i${dwMessageId},i0x0400,*i.r1,,)i.r0
+	System::Call *$1(&t$0.r0)
+	System::Call Kernel32::LocalFree(ir1)
+!macroend
+!macro GetErrorCode MESSAGE
+${!getdebug}
+!ifdef DEBUG
+	System::Store sR0
+	!insertmacro _GetErrorCode R0
+	${DebugMsg} '${MESSAGE}=$R0$\r$\n$0'
+	System::Store l
+!endif
+!macroend
+
+!define COM_CallMethod "!insertmacro _COM_CallMethod "
+!macro _COM_CallMethod _vto _ParamsDecl _IFacePtr _Params
+	System::Call `${_IFacePtr}->${_vto}${_ParamsDecl} ${_Params}`
+!macroend
+
+!define IUnknown->Release "${COM_CallMethod}2 ()i. "
+!define ITypeLib->GetLibAttr "${COM_CallMethod}7 (*i)i. "
+!define ITypeLib->ReleaseTLibAttr "${COM_CallMethod}12 (i)i. "
+
+; dwFlags defines for LoadLibraryEx()
+!define DONT_RESOLVE_DLL_REFERENCES			0x00000001
+!define LOAD_LIBRARY_AS_DATAFILE			0x00000002
+!define LOAD_WITH_ALTERED_SEARCH_PATH		0x00000008
+!define LOAD_LIBRARY_AS_IMAGE_RESOURCE		0x00000020
+!define LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE	0x00000040
+
+;LoadTypeLib Return Values
+!define S_OK 					0
+!define E_OUTOFMEMORY			0x8007000E ; -2147024882
+!define E_INVALIDARG			0x80070057 ; -2147024809
+!define TYPE_E_IOERROR			0x80028CA2 ; -2147316574
+!define TYPE_E_INVALIDSTATE		0x80028029 ; -2147319767
+!define TYPE_E_INVDATAREAD		0x80028018 ; -2147319784
+!define TYPE_E_UNSUPFORMAT		0x80028019 ; -2147319783
+!define TYPE_E_UNKNOWNLCID		0x8002802E ; -2147319762
+!define TYPE_E_CANTLOADLIBRARY	0x80029C4A ; -2147312566
+!define FACILITY_STORAGE		3
+
+/*ITypeLib::GetLibAttr Return Values (equal to the LoadTypeLib Return Values)
+S_OK = 0
+E_OUTOFMEMORY = -2147024882
+E_INVALIDARG = -2147024809
+TYPE_E_IOERROR = -2147316574
+TYPE_E_INVDATAREAD = -2147319784
+TYPE_E_UNSUPFORMAT = -2147319783
+TYPE_E_INVALIDSTATE = -2147319767 */
+
+;LIBFLAGS Enumeration
+!define LIBFLAG_FRESTRICTED		1
+!define LIBFLAG_FCONTROL		2
+!define LIBFLAG_FHIDDEN			4
+!define LIBFLAG_FHASDISKIMAGE	8
+
+;REGKIND Enumeration
+!define REGKIND_DEFAULT			0
+!define REGKIND_REGISTER		1
+!define REGKIND_NONE			2
+
+;SYSKIND Enumeration
+!define SYS_WIN16				0
+!define SYS_WIN32				1
+!define SYS_MAC					2
+/*
+ITypeLib index count
+ITypeLib::GetTypeInfoCount	= 3		This method retrieves the number of type descriptions in the library.
+ITypeLib::GetTypeInfo		= 4		This method retrieves the specified type description in the library.
+ITypeLib::GetTypeInfoType	= 5		This method retrieves the type of a type description.
+ITypeLib::GetTypeInfoOfGuid	= 6		This method retrieves the type description that corresponds to the specified globally unique identifier (GUID).
+ITypeLib::GetLibAttr		= 7 	This method retrieves the structure that contains the library's attributes.
+ITypeLib::GetTypeComp		= 8		This method retrieves a pointer to the ITypeComp for a type library. This enables a client compiler to bind to the library's types, variables, constants, and global functions.
+ITypeLib::GetDocumentation	= 9 	This method retrieves the library's documentation string, the complete Help file name and path, and the context identifier for the library Help topic.
+ITypeLib::IsName			= 10	This method indicates whether a passed-in string contains the name of a type or a member described in the library.
+ITypeLib::FindName			= 11 	This method finds occurrences of a type description in a type library. This may be used to verify that a name exists in a type library.
+ITypeLib::ReleaseTLibAttr	= 12
+
+ TYPE TLIBATTR DWORD   ' // Must be DWORD aligned
+   rguid AS GUID
+   lcid AS DWORD
+   syskind AS DWORD
+   wMajorVerNum AS WORD
+   wMinorVerNum AS WORD
+   wLibFlags AS WORD
+ END TYPE
 */
\ No newline at end of file
diff --git a/Other/Source/Plugins/UAC.nsh b/etc/source/UAC.nsh
similarity index 96%
rename from Other/Source/Plugins/UAC.nsh
rename to etc/source/UAC.nsh
index 073a834..6ab2755 100644
--- a/Other/Source/Plugins/UAC.nsh
+++ b/etc/source/UAC.nsh
@@ -1,194 +1,194 @@
-!ifndef UAC_HDR__INC
-!verbose push
-!verbose 3
-!ifndef UAC_VERBOSE  
-	!define UAC_VERBOSE 3
-!endif
-!verbose ${UAC_VERBOSE}
-
-!define UAC_HDR__INC 0x00020100 ;MMmmbbrr
-
-!include LogicLib.nsh
-
-!macro _UAC_definemath def val1 op val2
-!ifdef ${def}
-	!undef ${def}
-!endif
-!define /math ${def} "${val1}" ${op} ${val2}
-!macroend
-
-!macro _UAC_ParseDefineFlags_orin parse outflags
-!searchparse /noerrors ${${parse}} "" _UAC_ParseDefineFlags_orin_f1 "|" _UAC_ParseDefineFlags_orin_f2
-!define _UAC_ParseDefineFlags_orin_this ${_UAC_ParseDefineFlags_orin_f1}
-!undef ${parse}
-!define ${parse} ${_UAC_ParseDefineFlags_orin_f2}
-!define _UAC_ParseDefineFlags_orin_saveout ${${outflags}}
-!undef ${outflags}
-!define /math ${outflags} "${_UAC_ParseDefineFlags_orin_saveout}" | "${_UAC_ParseDefineFlags_orin_this}"
-!undef _UAC_ParseDefineFlags_orin_saveout
-!undef _UAC_ParseDefineFlags_orin_this
-!ifdef _UAC_ParseDefineFlags_orin_f1
-	!undef _UAC_ParseDefineFlags_orin_f1
-	!undef _UAC_ParseDefineFlags_orin_f2
-!endif
-!macroend
-!macro _UAC_ParseDefineFlags_Begin _outdef _in
-!define _UAC_PDF${_outdef}_parse "${_in}"
-!define _UAC_PDF${_outdef}_flags ""
-!define _UAC_PDF${_outdef}_r 0
-!insertmacro _UAC_ParseDefineFlags_orin _UAC_PDF${_outdef}_parse _UAC_PDF${_outdef}_flags	;0x1
-!insertmacro _UAC_ParseDefineFlags_orin _UAC_PDF${_outdef}_parse _UAC_PDF${_outdef}_flags	;0x2
-!insertmacro _UAC_ParseDefineFlags_orin _UAC_PDF${_outdef}_parse _UAC_PDF${_outdef}_flags	;0x4
-!insertmacro _UAC_ParseDefineFlags_orin _UAC_PDF${_outdef}_parse _UAC_PDF${_outdef}_flags	;0x8
-!insertmacro _UAC_ParseDefineFlags_orin _UAC_PDF${_outdef}_parse _UAC_PDF${_outdef}_flags	;0x10
-!macroend
-!macro _UAC_ParseDefineFlags_End _outdef
-!define ${_outdef} ${_UAC_PDF${_outdef}_r}
-!undef _UAC_PDF${_outdef}_r
-!undef _UAC_PDF${_outdef}_flags
-!undef _UAC_PDF${_outdef}_parse
-!macroend
-!macro _UAC_ParseDefineFlags_IncludeFlag _outdef flag
-!if ${_UAC_PDF${_outdef}_flags} & ${flag}
-	!insertmacro _UAC_definemath _UAC_PDF${_outdef}_r ${_UAC_PDF${_outdef}_r} | ${flag}
-!endif
-!macroend
-!macro _UAC_ParseDefineFlagsToInt _outdef _in
-!insertmacro _UAC_ParseDefineFlags_Begin _UAC_ParseDefineFlagsToInt_tmp "${_in}"
-!define ${_outdef} ${_UAC_PDF_UAC_ParseDefineFlagsToInt_tmp_flags}
-!insertmacro _UAC_ParseDefineFlags_End _UAC_ParseDefineFlagsToInt_tmp
-!undef _UAC_ParseDefineFlagsToInt_tmp
-!macroend
-
-!macro _UAC_IncL
-!insertmacro _UAC_definemath __UAC_L "${__UAC_L_}" + 1
-!macroend
-
-
-!macro _UAC_MakeLL_Cmp cmpop cmp pluginparams
-!insertmacro _LOGICLIB_TEMP
-UAC::_ ${pluginparams}
-pop $_LOGICLIB_TEMP
-!insertmacro ${cmpop} $_LOGICLIB_TEMP ${cmp} `${_t}` `${_f}`
-!macroend
-
-
-
-!macro UAC_RunElevated
-UAC::_ 0
-!macroend
-
-
-!macro UAC_IsAdmin
-UAC::_ 2
-!macroend
-!define UAC_IsAdmin `"" UAC_IsAdmin ""`
-!macro _UAC_IsAdmin _a _b _t _f
-!insertmacro _UAC_MakeLL_Cmp _!= 0 2s
-!macroend
-
-
-
-!macro UAC_IsInnerInstance
-UAC::_ 3
-!macroend
-!define UAC_IsInnerInstance `"" UAC_IsInnerInstance ""`
-!macro _UAC_IsInnerInstance _a _b _t _f
-!insertmacro _UAC_MakeLL_Cmp _!= 0 3s
-!macroend
-
-!macro UAC_Notify_OnGuiInit
-UAC::_ 4
-!macroend
-!macro UAC_PageElevation_OnGuiInit
-!insertmacro UAC_Notify_OnGuiInit
-!macroend
-!macro UAC_PageElevation_OnInit
-UAC::_ 5
-${IfThen} ${Errors} ${|} Quit ${|}
-!macroend
-
-
-!define UAC_SYNCREGISTERS 0x1
-#!define UAC_SYNCSTACK     0x2
-!define UAC_SYNCOUTDIR    0x4
-!define UAC_SYNCINSTDIR   0x8
-#!define UAC_CLEARERRFLAG  0x10
-!macro UAC_AsUser_Call type name flags
-push $0
-Get${type}Address $0 ${name}
-!verbose push
-!verbose ${UAC_VERBOSE}
-!insertmacro _UAC_ParseDefineFlagsToInt _UAC_AsUser_Call__flags ${flags}
-!verbose pop
-StrCpy $0 "1$0:${_UAC_AsUser_Call__flags}"
-!undef _UAC_AsUser_Call__flags
-Exch $0
-UAC::_
-!macroend
-
-!macro _UAC_AsUser_GenOpGetReg outvar op opparam1 opparam2
-!define _UAC_AUGOGR_ID _UAC_AUGOGR_OP${outvar}${op}${opparam1}${opparam2}
-!ifndef ${_UAC_AUGOGR_ID} ;Has this exact action been done before? 
-	!if ${outvar} == $0
-		!define ${_UAC_AUGOGR_ID} $1
-	!else
-		!define ${_UAC_AUGOGR_ID} $0
-	!endif
-	!if "${opparam1}" == ""
-		!define _UAC_AUGOGR_OPP1 ${${_UAC_AUGOGR_ID}}
-		!define _UAC_AUGOGR_OPP2 ${opparam2}
-	!else
-		!define _UAC_AUGOGR_OPP1 ${opparam1}
-		!define _UAC_AUGOGR_OPP2 ${${_UAC_AUGOGR_ID}}
-	!endif	
-	goto ${_UAC_AUGOGR_ID}_C
-	${_UAC_AUGOGR_ID}_F:
-		${op} ${_UAC_AUGOGR_OPP1} ${_UAC_AUGOGR_OPP2}
-		return
-	${_UAC_AUGOGR_ID}_C:
-	!undef _UAC_AUGOGR_OPP1
-	!undef _UAC_AUGOGR_OPP2
-!endif
-push ${${_UAC_AUGOGR_ID}}
-!insertmacro UAC_AsUser_Call Label ${_UAC_AUGOGR_ID}_F ${UAC_SYNCREGISTERS}
-StrCpy ${outvar} ${${_UAC_AUGOGR_ID}}
-pop ${${_UAC_AUGOGR_ID}}
-!undef _UAC_AUGOGR_ID
-!macroend
-
-!macro UAC_AsUser_GetSection datatype secidx outvar
-!insertmacro _UAC_AsUser_GenOpGetReg ${outvar} SectionGet${datatype} ${secidx} ""
-!macroend
-
-!macro UAC_AsUser_GetGlobalVar var
-!insertmacro _UAC_AsUser_GenOpGetReg ${var} StrCpy "" ${var}
-!macroend
-
-
-!macro UAC_AsUser_ExecShell verb command params workdir show
-!insertmacro _UAC_IncL
-goto _UAC_L_E_${__UAC_L}
-_UAC_L_F_${__UAC_L}:
-/*!if "${workdir}" != ""
-	SetOutPath "${workdir}"
-!endif*/
-#MessageBox mb_ok Outer1
-#system::call 'kernel32::OutputDebugStringA(m "hello from UAC_AsUser_ExecShell >$temp|$instdir|$\n")'
-ExecShell "${verb}" "${command}" ${params} ${show}
-#MessageBox mb_ok Outer2
-return
-_UAC_L_E_${__UAC_L}:
-!if "${workdir}" != ""
-	push $outdir
-	SetOutPath "${workdir}"
-!endif
-!insertmacro UAC_AsUser_Call Label _UAC_L_F_${__UAC_L} ${UAC_SYNCREGISTERS}|${UAC_SYNCOUTDIR} #|${UAC_CLEARERRFLAG}
-!if "${workdir}" != ""
-	pop $outdir 
-	SetOutPath $outdir
-!endif
-!macroend
-
-!verbose pop
+!ifndef UAC_HDR__INC
+!verbose push
+!verbose 3
+!ifndef UAC_VERBOSE  
+	!define UAC_VERBOSE 3
+!endif
+!verbose ${UAC_VERBOSE}
+
+!define UAC_HDR__INC 0x00020100 ;MMmmbbrr
+
+!include LogicLib.nsh
+
+!macro _UAC_definemath def val1 op val2
+!ifdef ${def}
+	!undef ${def}
+!endif
+!define /math ${def} "${val1}" ${op} ${val2}
+!macroend
+
+!macro _UAC_ParseDefineFlags_orin parse outflags
+!searchparse /noerrors ${${parse}} "" _UAC_ParseDefineFlags_orin_f1 "|" _UAC_ParseDefineFlags_orin_f2
+!define _UAC_ParseDefineFlags_orin_this ${_UAC_ParseDefineFlags_orin_f1}
+!undef ${parse}
+!define ${parse} ${_UAC_ParseDefineFlags_orin_f2}
+!define _UAC_ParseDefineFlags_orin_saveout ${${outflags}}
+!undef ${outflags}
+!define /math ${outflags} "${_UAC_ParseDefineFlags_orin_saveout}" | "${_UAC_ParseDefineFlags_orin_this}"
+!undef _UAC_ParseDefineFlags_orin_saveout
+!undef _UAC_ParseDefineFlags_orin_this
+!ifdef _UAC_ParseDefineFlags_orin_f1
+	!undef _UAC_ParseDefineFlags_orin_f1
+	!undef _UAC_ParseDefineFlags_orin_f2
+!endif
+!macroend
+!macro _UAC_ParseDefineFlags_Begin _outdef _in
+!define _UAC_PDF${_outdef}_parse "${_in}"
+!define _UAC_PDF${_outdef}_flags ""
+!define _UAC_PDF${_outdef}_r 0
+!insertmacro _UAC_ParseDefineFlags_orin _UAC_PDF${_outdef}_parse _UAC_PDF${_outdef}_flags	;0x1
+!insertmacro _UAC_ParseDefineFlags_orin _UAC_PDF${_outdef}_parse _UAC_PDF${_outdef}_flags	;0x2
+!insertmacro _UAC_ParseDefineFlags_orin _UAC_PDF${_outdef}_parse _UAC_PDF${_outdef}_flags	;0x4
+!insertmacro _UAC_ParseDefineFlags_orin _UAC_PDF${_outdef}_parse _UAC_PDF${_outdef}_flags	;0x8
+!insertmacro _UAC_ParseDefineFlags_orin _UAC_PDF${_outdef}_parse _UAC_PDF${_outdef}_flags	;0x10
+!macroend
+!macro _UAC_ParseDefineFlags_End _outdef
+!define ${_outdef} ${_UAC_PDF${_outdef}_r}
+!undef _UAC_PDF${_outdef}_r
+!undef _UAC_PDF${_outdef}_flags
+!undef _UAC_PDF${_outdef}_parse
+!macroend
+!macro _UAC_ParseDefineFlags_IncludeFlag _outdef flag
+!if ${_UAC_PDF${_outdef}_flags} & ${flag}
+	!insertmacro _UAC_definemath _UAC_PDF${_outdef}_r ${_UAC_PDF${_outdef}_r} | ${flag}
+!endif
+!macroend
+!macro _UAC_ParseDefineFlagsToInt _outdef _in
+!insertmacro _UAC_ParseDefineFlags_Begin _UAC_ParseDefineFlagsToInt_tmp "${_in}"
+!define ${_outdef} ${_UAC_PDF_UAC_ParseDefineFlagsToInt_tmp_flags}
+!insertmacro _UAC_ParseDefineFlags_End _UAC_ParseDefineFlagsToInt_tmp
+!undef _UAC_ParseDefineFlagsToInt_tmp
+!macroend
+
+!macro _UAC_IncL
+!insertmacro _UAC_definemath __UAC_L "${__UAC_L_}" + 1
+!macroend
+
+
+!macro _UAC_MakeLL_Cmp cmpop cmp pluginparams
+!insertmacro _LOGICLIB_TEMP
+UAC::_ ${pluginparams}
+pop $_LOGICLIB_TEMP
+!insertmacro ${cmpop} $_LOGICLIB_TEMP ${cmp} `${_t}` `${_f}`
+!macroend
+
+
+
+!macro UAC_RunElevated
+UAC::_ 0
+!macroend
+
+
+!macro UAC_IsAdmin
+UAC::_ 2
+!macroend
+!define UAC_IsAdmin `"" UAC_IsAdmin ""`
+!macro _UAC_IsAdmin _a _b _t _f
+!insertmacro _UAC_MakeLL_Cmp _!= 0 2s
+!macroend
+
+
+
+!macro UAC_IsInnerInstance
+UAC::_ 3
+!macroend
+!define UAC_IsInnerInstance `"" UAC_IsInnerInstance ""`
+!macro _UAC_IsInnerInstance _a _b _t _f
+!insertmacro _UAC_MakeLL_Cmp _!= 0 3s
+!macroend
+
+!macro UAC_Notify_OnGuiInit
+UAC::_ 4
+!macroend
+!macro UAC_PageElevation_OnGuiInit
+!insertmacro UAC_Notify_OnGuiInit
+!macroend
+!macro UAC_PageElevation_OnInit
+UAC::_ 5
+${IfThen} ${Errors} ${|} Quit ${|}
+!macroend
+
+
+!define UAC_SYNCREGISTERS 0x1
+#!define UAC_SYNCSTACK     0x2
+!define UAC_SYNCOUTDIR    0x4
+!define UAC_SYNCINSTDIR   0x8
+#!define UAC_CLEARERRFLAG  0x10
+!macro UAC_AsUser_Call type name flags
+push $0
+Get${type}Address $0 ${name}
+!verbose push
+!verbose ${UAC_VERBOSE}
+!insertmacro _UAC_ParseDefineFlagsToInt _UAC_AsUser_Call__flags ${flags}
+!verbose pop
+StrCpy $0 "1$0:${_UAC_AsUser_Call__flags}"
+!undef _UAC_AsUser_Call__flags
+Exch $0
+UAC::_
+!macroend
+
+!macro _UAC_AsUser_GenOpGetReg outvar op opparam1 opparam2
+!define _UAC_AUGOGR_ID _UAC_AUGOGR_OP${outvar}${op}${opparam1}${opparam2}
+!ifndef ${_UAC_AUGOGR_ID} ;Has this exact action been done before? 
+	!if ${outvar} == $0
+		!define ${_UAC_AUGOGR_ID} $1
+	!else
+		!define ${_UAC_AUGOGR_ID} $0
+	!endif
+	!if "${opparam1}" == ""
+		!define _UAC_AUGOGR_OPP1 ${${_UAC_AUGOGR_ID}}
+		!define _UAC_AUGOGR_OPP2 ${opparam2}
+	!else
+		!define _UAC_AUGOGR_OPP1 ${opparam1}
+		!define _UAC_AUGOGR_OPP2 ${${_UAC_AUGOGR_ID}}
+	!endif	
+	goto ${_UAC_AUGOGR_ID}_C
+	${_UAC_AUGOGR_ID}_F:
+		${op} ${_UAC_AUGOGR_OPP1} ${_UAC_AUGOGR_OPP2}
+		return
+	${_UAC_AUGOGR_ID}_C:
+	!undef _UAC_AUGOGR_OPP1
+	!undef _UAC_AUGOGR_OPP2
+!endif
+push ${${_UAC_AUGOGR_ID}}
+!insertmacro UAC_AsUser_Call Label ${_UAC_AUGOGR_ID}_F ${UAC_SYNCREGISTERS}
+StrCpy ${outvar} ${${_UAC_AUGOGR_ID}}
+pop ${${_UAC_AUGOGR_ID}}
+!undef _UAC_AUGOGR_ID
+!macroend
+
+!macro UAC_AsUser_GetSection datatype secidx outvar
+!insertmacro _UAC_AsUser_GenOpGetReg ${outvar} SectionGet${datatype} ${secidx} ""
+!macroend
+
+!macro UAC_AsUser_GetGlobalVar var
+!insertmacro _UAC_AsUser_GenOpGetReg ${var} StrCpy "" ${var}
+!macroend
+
+
+!macro UAC_AsUser_ExecShell verb command params workdir show
+!insertmacro _UAC_IncL
+goto _UAC_L_E_${__UAC_L}
+_UAC_L_F_${__UAC_L}:
+/*!if "${workdir}" != ""
+	SetOutPath "${workdir}"
+!endif*/
+#MessageBox mb_ok Outer1
+#system::call 'kernel32::OutputDebugStringA(m "hello from UAC_AsUser_ExecShell >$temp|$instdir|$\n")'
+ExecShell "${verb}" "${command}" ${params} ${show}
+#MessageBox mb_ok Outer2
+return
+_UAC_L_E_${__UAC_L}:
+!if "${workdir}" != ""
+	push $outdir
+	SetOutPath "${workdir}"
+!endif
+!insertmacro UAC_AsUser_Call Label _UAC_L_F_${__UAC_L} ${UAC_SYNCREGISTERS}|${UAC_SYNCOUTDIR} #|${UAC_CLEARERRFLAG}
+!if "${workdir}" != ""
+	pop $outdir 
+	SetOutPath $outdir
+!endif
+!macroend
+
+!verbose pop
 !endif /* UAC_HDR__INC */
\ No newline at end of file
diff --git a/etc/source/Version.nsh b/etc/source/Version.nsh
new file mode 100644
index 0000000..1e36e13
--- /dev/null
+++ b/etc/source/Version.nsh
@@ -0,0 +1,14 @@
+;=#
+;
+; PORTABLEAPPS COMPILER
+; Developed by daemon.devin
+;
+; For support visit the GitHub project:
+; https://github.com/demondevin/pac-man
+;
+; Version.nsh
+; This file defines the version of PortableApps Compiler.
+; 
+
+!define PACVER		"2.0.1.0"
+!define PACUSERVER	"2.0.1"
diff --git a/Other/Source/WordFind.nsh b/etc/source/WordFind.nsh
similarity index 95%
rename from Other/Source/WordFind.nsh
rename to etc/source/WordFind.nsh
index 1cf9c0a..56cde18 100644
--- a/Other/Source/WordFind.nsh
+++ b/etc/source/WordFind.nsh
@@ -1,369 +1,369 @@
-/*______________________________________________________________________________
- 
-                            WordFind v2.0
-________________________________________________________________________________
-Multi-features string function.
- 
-Strings:
-"[word+1][delimiter][word+2][delimiter][word+3]..."
-"[delimiter][word+1][delimiter][word+2][delimiter]..."
-"[delimiter][delimiter][word+1][delimiter][delimiter][delimiter]..."
-"...[word-3][delimiter][word-2][delimiter][word-1]"
-"...[delimiter][word-2][delimiter][word-1][delimiter]"
-"...[delimiter][delimiter][word-1][delimiter][delimiter][delimiter]"
- 
-Syntax: 
-${WordFind} "[string]" "[delimiter]" "[E][options]" $var
- 
-"[string]"         ;[string]
-                   ;  input string
-"[delimiter]"      ;[delimiter]
-                   ;  one or several symbols
-"[E][options]"     ;[options]
-                   ;  +number   : word number from start
-                   ;  -number   : word number from end
-                   ;  +number}  : delimiter number from start
-                   ;              all space after this
-                   ;              delimiter to output
-                   ;  +number{  : delimiter number from start
-                   ;              all space before this
-                   ;              delimiter to output
-                   ;  +number}} : word number from start
-                   ;              all space after this word
-                   ;              to output
-                   ;  +number{{ : word number from start
-                   ;              all space before this word
-                   ;              to output
-                   ;  +number{} : word number from start
-                   ;              all space before and after
-                   ;              this word (word exclude)
-                   ;  +number*} : word number from start
-                   ;              all space after this
-                   ;              word to output with word
-                   ;  +number{* : word number from start
-                   ;              all space before this
-                   ;              word to output with word
-                   ;  #         : sum of words to output
-                   ;  *         : sum of delimiters to output
-                   ;  /word     : number of word to output
-                   ;
-                   ;[E]
-                   ;  with errorlevel output
-                   ;  IfErrors:
-                   ;     $var=1  delimiter not found
-                   ;     $var=2  no such word number
-                   ;     $var=3  syntax error (Use: +1,-1},#,*,/word,...)
-                   ;[]
-                   ;  no errorlevel output (default)
-                   ;  If some errors found then (result=input string)
-                   ;
-$var               ;output (result)
- 
-Note:
--Accepted numbers 1,01,001,...
-
-Example (Find word by number): 
-	Section
-		${WordFind} "C:\io.sys C:\Program Files C:\WINDOWS" " C:\" "-02" $R0
-		; $R0="Program Files"
-	SectionEnd
-
-Example (Delimiter exclude): 
-	Section
-		${WordFind} "C:\io.sys C:\logo.sys C:\WINDOWS" "sys" "-2}" $R0
-		; $R0=" C:\logo.sys C:\WINDOWS"
-	SectionEnd
-
-Example (Sum of words): 
-	Section
-		${WordFind} "C:\io.sys C:\logo.sys C:\WINDOWS" " C:\" "#" $R0
-		; $R0="3"
-	SectionEnd
-
-Example (Sum of delimiters): 
-	Section
-		${WordFind} "C:\io.sys C:\logo.sys C:\WINDOWS" "sys" "*" $R0
-		; $R0="2"
-	SectionEnd
-
-Example (Find word number): 
-	Section
-		${WordFind} "C:\io.sys C:\Program Files C:\WINDOWS" " " "/Files" $R0
-		; $R0="3"
-	SectionEnd
-
-Example ( }} ): 
-	Section
-		${WordFind} "C:\io.sys C:\logo.sys C:\WINDOWS" " " "+2}}" $R0
-		; $R0=" C:\WINDOWS"
-	SectionEnd
-
-Example ( {} ): 
-	Section
-		${WordFind} "C:\io.sys C:\logo.sys C:\WINDOWS" " " "+2{}" $R0
-		; $R0="C:\io.sys C:\WINDOWS"
-	SectionEnd
-
-Example ( *} ): 
-	Section
-		${WordFind} "C:\io.sys C:\logo.sys C:\WINDOWS" " " "+2*}" $R0
-		; $R0="C:\logo.sys C:\WINDOWS"
-	SectionEnd
-
-Example (Get parent directory): 
-	Section
-		StrCpy $R0 "C:\Program Files\NSIS\NSIS.chm"
-	;	           "C:\Program Files\NSIS\Include\"
-	;	           "C:\\Program Files\\NSIS\\NSIS.chm"
-		${WordFind} "$R0" "\" "-2{*" $R0
-		; $R0="C:\Program Files\NSIS"
-		;     "C:\\Program Files\\NSIS"
-	SectionEnd
-
-Example (Coordinates): 
-	Section
-		${WordFind} "C:\io.sys C:\logo.sys C:\WINDOWS" ":\lo" "E+1{" $R0
-		; $R0="C:\io.sys C"
-		IfErrors end
-		StrLen $0 $R0             ; $0 = Start position of word (11)
-		StrLen $1 ':\lo'          ; $1 = Word leght (4)
-		; StrCpy $R0 $R1 $1 $0    ; $R0 = :\lo
-		end:
-	SectionEnd
-
-Example (With errorlevel output): 
-	Section
-		${WordFind} "[string]" "[delimiter]" "E[options]" $R0
-		IfErrors 0 end
-		StrCmp $R0 1 0 +2       ; errorlevel 1?
-		MessageBox MB_OK 'delimiter not found' IDOK end
-		StrCmp $R0 2 0 +2       ; errorlevel 2?
-		MessageBox MB_OK 'no such word number' IDOK end
-		StrCmp $R0 3 0 +2       ; errorlevel 3?
-		MessageBox MB_OK 'syntax error'
-		end:
-	SectionEnd
-
-Example (Without errorlevel output): 
-	Section
-		${WordFind} "C:\io.sys C:\logo.sys" "_" "+1" $R0
-		; $R0="C:\io.sys C:\logo.sys" (error: delimiter "_" not found)
-	SectionEnd
-
-	Example (If found): 
-	Section
-		${WordFind} "C:\io.sys C:\logo.sys" ":\lo" "E+1{" $R0
-		IfErrors notfound found
-		found:
-		MessageBox MB_OK 'Found' IDOK end
-		notfound:
-		MessageBox MB_OK 'Not found'
-		end:
-	SectionEnd
-
-Example (If found 2): 
-	Section
-		${WordFind} "C:\io.sys C:\logo.sys" ":\lo" "+1{" $R0
-		StrCmp $R0 "C:\io.sys C:\logo.sys" notfound found        ; error?
-		found:
-		MessageBox MB_OK 'Found' IDOK end
-		notfound:
-		MessageBox MB_OK 'Not found'
-		end:
-	SectionEnd
-
-Example (To accept one word in string if delimiter not found): 
-	Section
-		StrCpy $0 'OneWord'
-		StrCpy $1 1
-		loop:
-		${WordFind} "$0" " " "E+$1" $R0
-		IfErrors 0 code
-		StrCmp $1$R0 11 0 error
-		StrCpy $R0 $0
-		goto end
-		code:
-		; ...
-		IntOp $1 $1 + 1
-		goto loop
-		error:
-		StrCpy $1 ''
-		StrCpy $R0 ''
-		end:
-		; $R0="OneWord"
-	SectionEnd                                                               */
-
-Function WordFind
-	!macro _WordFind _STRING _DELIMITER _OPTION _RESULT
-		Push `${_STRING}`
-		Push `${_DELIMITER}`
-		Push `${_OPTION}`
-		Call WordFind
-		Pop ${_RESULT}
-	!macroend
-	!define WordFind `!insertmacro _WordFind`
-	Exch $1
-	Exch
-	Exch $0
-	Exch
-	Exch 2
-	Exch $R0
-	Exch 2
-	Push $2
-	Push $3
-	Push $4
-	Push $5
-	Push $6
-	Push $7
-	Push $8
-	Push $9
-	Push $R1
-	ClearErrors
-	StrCpy $9 ''
-	StrCpy $2 $1 1
-	StrCpy $1 $1 '' 1
-	StrCmp $2 'E' 0 +3
-	StrCpy $9 E
-	goto -4
-	StrCpy $3 ''
-	StrCmp $2 '+' +6
-	StrCmp $2 '-' +5
-	StrCmp $2 '/' restart
-	StrCmp $2 '#' restart
-	StrCmp $2 '*' restart
-	goto error3
-	StrCpy $4 $1 1 -1
-	StrCmp $4 '*' +4
-	StrCmp $4 '}' +3
-	StrCmp $4 '{' +2
-	goto +4
-	StrCpy $1 $1 -1
-	StrCpy $3 '$4$3'
-	goto -7
-	StrCmp $3 '*' error3
-	StrCmp $3 '**' error3
-	StrCmp $3 '}{' error3
-	IntOp $1 $1 + 0
-	StrCmp $1 0 error2
-	restart:
-	StrCmp $R0 '' error1
-	StrCpy $4 0
-	StrCpy $5 0
-	StrCpy $6 0
-	StrLen $7 $0
-	goto loop
-	preloop:
-	IntOp $6 $6 + 1
-	loop:
-	StrCpy $8 $R0 $7 $6
-	StrCmp $8$5 0 error1
-	StrCmp $8 '' +2
-	StrCmp $8 $0 +5 preloop
-	StrCmp $3 '{' minus
-	StrCmp $3 '}' minus
-	StrCmp $2 '*' minus
-	StrCmp $5 $6 minus +5
-	StrCmp $3 '{' +4
-	StrCmp $3 '}' +3
-	StrCmp $2 '*' +2
-	StrCmp $5 $6 nextword
-	IntOp $4 $4 + 1
-	StrCmp $2$4 +$1 plus
-	StrCmp $2 '/' 0 nextword
-	IntOp $8 $6 - $5
-	StrCpy $8 $R0 $8 $5
-	StrCmp $1 $8 0 nextword
-	StrCpy $R1 $4
-	goto end
-	nextword:
-	IntOp $6 $6 + $7
-	StrCpy $5 $6
-	goto loop
-	minus:
-	StrCmp $2 '-' 0 sum
-	StrCpy $2 '+'
-	IntOp $1 $4 - $1
-	IntOp $1 $1 + 1
-	IntCmp $1 0 error2 error2 restart
-	sum:
-	StrCmp $2 '#' 0 sumdelim
-	StrCpy $R1 $4
-	goto end
-	sumdelim:
-	StrCmp $2 '*' 0 error2
-	StrCpy $R1 $4
-	goto end
-	plus:
-	StrCmp $3 '' 0 +4
-	IntOp $6 $6 - $5
-	StrCpy $R1 $R0 $6 $5
-	goto end
-	StrCmp $3 '{' 0 +3
-	StrCpy $R1 $R0 $6
-	goto end
-	StrCmp $3 '}' 0 +4
-	IntOp $6 $6 + $7
-	StrCpy $R1 $R0 '' $6
-	goto end
-	StrCmp $3 '{*' +2
-	StrCmp $3 '*{' 0 +3
-	StrCpy $R1 $R0 $6
-	goto end
-	StrCmp $3 '*}' +2
-	StrCmp $3 '}*' 0 +3
-	StrCpy $R1 $R0 '' $5
-	goto end
-	StrCmp $3 '}}' 0 +3
-	StrCpy $R1 $R0 '' $6
-	goto end
-	StrCmp $3 '{{' 0 +3
-	StrCpy $R1 $R0 $5
-	goto end
-	StrCmp $3 '{}' 0 error3
-	StrLen $3 $R0
-	StrCmp $3 $6 0 +3
-	StrCpy $0 ''
-	goto +2
-	IntOp $6 $6 + $7
-	StrCpy $8 $R0 '' $6
-	StrCmp $4$8 1 +6
-	StrCmp $4 1 +2 +7
-	IntOp $6 $6 + $7
-	StrCpy $3 $R0 $7 $6
-	StrCmp $3 '' +2
-	StrCmp $3 $0 -3 +3
-	StrCpy $R1 ''
-	goto end
-	StrCmp $5 0 0 +3
-	StrCpy $0 ''
-	goto +2
-	IntOp $5 $5 - $7
-	StrCpy $3 $R0 $5
-	StrCpy $R1 '$3$0$8'
-	goto end
-	error3:
-	StrCpy $R1 3
-	goto error
-	error2:
-	StrCpy $R1 2
-	goto error
-	error1:
-	StrCpy $R1 1
-	error:
-	StrCmp $9 'E' 0 +3
-	SetErrors
-	end:
-	StrCpy $R0 $R1
-	Pop $R1
-	Pop $9
-	Pop $8
-	Pop $7
-	Pop $6
-	Pop $5
-	Pop $4
-	Pop $3
-	Pop $2
-	Pop $1
-	Pop $0
-	Exch $R0
+/*______________________________________________________________________________
+ 
+                            WordFind v2.0
+________________________________________________________________________________
+Multi-features string function.
+ 
+Strings:
+"[word+1][delimiter][word+2][delimiter][word+3]..."
+"[delimiter][word+1][delimiter][word+2][delimiter]..."
+"[delimiter][delimiter][word+1][delimiter][delimiter][delimiter]..."
+"...[word-3][delimiter][word-2][delimiter][word-1]"
+"...[delimiter][word-2][delimiter][word-1][delimiter]"
+"...[delimiter][delimiter][word-1][delimiter][delimiter][delimiter]"
+ 
+Syntax: 
+${WordFind} "[string]" "[delimiter]" "[E][options]" $var
+ 
+"[string]"         ;[string]
+                   ;  input string
+"[delimiter]"      ;[delimiter]
+                   ;  one or several symbols
+"[E][options]"     ;[options]
+                   ;  +number   : word number from start
+                   ;  -number   : word number from end
+                   ;  +number}  : delimiter number from start
+                   ;              all space after this
+                   ;              delimiter to output
+                   ;  +number{  : delimiter number from start
+                   ;              all space before this
+                   ;              delimiter to output
+                   ;  +number}} : word number from start
+                   ;              all space after this word
+                   ;              to output
+                   ;  +number{{ : word number from start
+                   ;              all space before this word
+                   ;              to output
+                   ;  +number{} : word number from start
+                   ;              all space before and after
+                   ;              this word (word exclude)
+                   ;  +number*} : word number from start
+                   ;              all space after this
+                   ;              word to output with word
+                   ;  +number{* : word number from start
+                   ;              all space before this
+                   ;              word to output with word
+                   ;  #         : sum of words to output
+                   ;  *         : sum of delimiters to output
+                   ;  /word     : number of word to output
+                   ;
+                   ;[E]
+                   ;  with errorlevel output
+                   ;  IfErrors:
+                   ;     $var=1  delimiter not found
+                   ;     $var=2  no such word number
+                   ;     $var=3  syntax error (Use: +1,-1},#,*,/word,...)
+                   ;[]
+                   ;  no errorlevel output (default)
+                   ;  If some errors found then (result=input string)
+                   ;
+$var               ;output (result)
+ 
+Note:
+-Accepted numbers 1,01,001,...
+
+Example (Find word by number): 
+	Section
+		${WordFind} "C:\io.sys C:\Program Files C:\WINDOWS" " C:\" "-02" $R0
+		; $R0="Program Files"
+	SectionEnd
+
+Example (Delimiter exclude): 
+	Section
+		${WordFind} "C:\io.sys C:\logo.sys C:\WINDOWS" "sys" "-2}" $R0
+		; $R0=" C:\logo.sys C:\WINDOWS"
+	SectionEnd
+
+Example (Sum of words): 
+	Section
+		${WordFind} "C:\io.sys C:\logo.sys C:\WINDOWS" " C:\" "#" $R0
+		; $R0="3"
+	SectionEnd
+
+Example (Sum of delimiters): 
+	Section
+		${WordFind} "C:\io.sys C:\logo.sys C:\WINDOWS" "sys" "*" $R0
+		; $R0="2"
+	SectionEnd
+
+Example (Find word number): 
+	Section
+		${WordFind} "C:\io.sys C:\Program Files C:\WINDOWS" " " "/Files" $R0
+		; $R0="3"
+	SectionEnd
+
+Example ( }} ): 
+	Section
+		${WordFind} "C:\io.sys C:\logo.sys C:\WINDOWS" " " "+2}}" $R0
+		; $R0=" C:\WINDOWS"
+	SectionEnd
+
+Example ( {} ): 
+	Section
+		${WordFind} "C:\io.sys C:\logo.sys C:\WINDOWS" " " "+2{}" $R0
+		; $R0="C:\io.sys C:\WINDOWS"
+	SectionEnd
+
+Example ( *} ): 
+	Section
+		${WordFind} "C:\io.sys C:\logo.sys C:\WINDOWS" " " "+2*}" $R0
+		; $R0="C:\logo.sys C:\WINDOWS"
+	SectionEnd
+
+Example (Get parent directory): 
+	Section
+		StrCpy $R0 "C:\Program Files\NSIS\NSIS.chm"
+	;	           "C:\Program Files\NSIS\Include\"
+	;	           "C:\\Program Files\\NSIS\\NSIS.chm"
+		${WordFind} "$R0" "\" "-2{*" $R0
+		; $R0="C:\Program Files\NSIS"
+		;     "C:\\Program Files\\NSIS"
+	SectionEnd
+
+Example (Coordinates): 
+	Section
+		${WordFind} "C:\io.sys C:\logo.sys C:\WINDOWS" ":\lo" "E+1{" $R0
+		; $R0="C:\io.sys C"
+		IfErrors end
+		StrLen $0 $R0             ; $0 = Start position of word (11)
+		StrLen $1 ':\lo'          ; $1 = Word leght (4)
+		; StrCpy $R0 $R1 $1 $0    ; $R0 = :\lo
+		end:
+	SectionEnd
+
+Example (With errorlevel output): 
+	Section
+		${WordFind} "[string]" "[delimiter]" "E[options]" $R0
+		IfErrors 0 end
+		StrCmp $R0 1 0 +2       ; errorlevel 1?
+		MessageBox MB_OK 'delimiter not found' IDOK end
+		StrCmp $R0 2 0 +2       ; errorlevel 2?
+		MessageBox MB_OK 'no such word number' IDOK end
+		StrCmp $R0 3 0 +2       ; errorlevel 3?
+		MessageBox MB_OK 'syntax error'
+		end:
+	SectionEnd
+
+Example (Without errorlevel output): 
+	Section
+		${WordFind} "C:\io.sys C:\logo.sys" "_" "+1" $R0
+		; $R0="C:\io.sys C:\logo.sys" (error: delimiter "_" not found)
+	SectionEnd
+
+	Example (If found): 
+	Section
+		${WordFind} "C:\io.sys C:\logo.sys" ":\lo" "E+1{" $R0
+		IfErrors notfound found
+		found:
+		MessageBox MB_OK 'Found' IDOK end
+		notfound:
+		MessageBox MB_OK 'Not found'
+		end:
+	SectionEnd
+
+Example (If found 2): 
+	Section
+		${WordFind} "C:\io.sys C:\logo.sys" ":\lo" "+1{" $R0
+		StrCmp $R0 "C:\io.sys C:\logo.sys" notfound found        ; error?
+		found:
+		MessageBox MB_OK 'Found' IDOK end
+		notfound:
+		MessageBox MB_OK 'Not found'
+		end:
+	SectionEnd
+
+Example (To accept one word in string if delimiter not found): 
+	Section
+		StrCpy $0 'OneWord'
+		StrCpy $1 1
+		loop:
+		${WordFind} "$0" " " "E+$1" $R0
+		IfErrors 0 code
+		StrCmp $1$R0 11 0 error
+		StrCpy $R0 $0
+		goto end
+		code:
+		; ...
+		IntOp $1 $1 + 1
+		goto loop
+		error:
+		StrCpy $1 ''
+		StrCpy $R0 ''
+		end:
+		; $R0="OneWord"
+	SectionEnd                                                               */
+
+Function WordFind
+	!macro _WordFind _STRING _DELIMITER _OPTION _RESULT
+		Push `${_STRING}`
+		Push `${_DELIMITER}`
+		Push `${_OPTION}`
+		Call WordFind
+		Pop ${_RESULT}
+	!macroend
+	!define WordFind `!insertmacro _WordFind`
+	Exch $1
+	Exch
+	Exch $0
+	Exch
+	Exch 2
+	Exch $R0
+	Exch 2
+	Push $2
+	Push $3
+	Push $4
+	Push $5
+	Push $6
+	Push $7
+	Push $8
+	Push $9
+	Push $R1
+	ClearErrors
+	StrCpy $9 ''
+	StrCpy $2 $1 1
+	StrCpy $1 $1 '' 1
+	StrCmp $2 'E' 0 +3
+	StrCpy $9 E
+	goto -4
+	StrCpy $3 ''
+	StrCmp $2 '+' +6
+	StrCmp $2 '-' +5
+	StrCmp $2 '/' restart
+	StrCmp $2 '#' restart
+	StrCmp $2 '*' restart
+	goto error3
+	StrCpy $4 $1 1 -1
+	StrCmp $4 '*' +4
+	StrCmp $4 '}' +3
+	StrCmp $4 '{' +2
+	goto +4
+	StrCpy $1 $1 -1
+	StrCpy $3 '$4$3'
+	goto -7
+	StrCmp $3 '*' error3
+	StrCmp $3 '**' error3
+	StrCmp $3 '}{' error3
+	IntOp $1 $1 + 0
+	StrCmp $1 0 error2
+	restart:
+	StrCmp $R0 '' error1
+	StrCpy $4 0
+	StrCpy $5 0
+	StrCpy $6 0
+	StrLen $7 $0
+	goto loop
+	preloop:
+	IntOp $6 $6 + 1
+	loop:
+	StrCpy $8 $R0 $7 $6
+	StrCmp $8$5 0 error1
+	StrCmp $8 '' +2
+	StrCmp $8 $0 +5 preloop
+	StrCmp $3 '{' minus
+	StrCmp $3 '}' minus
+	StrCmp $2 '*' minus
+	StrCmp $5 $6 minus +5
+	StrCmp $3 '{' +4
+	StrCmp $3 '}' +3
+	StrCmp $2 '*' +2
+	StrCmp $5 $6 nextword
+	IntOp $4 $4 + 1
+	StrCmp $2$4 +$1 plus
+	StrCmp $2 '/' 0 nextword
+	IntOp $8 $6 - $5
+	StrCpy $8 $R0 $8 $5
+	StrCmp $1 $8 0 nextword
+	StrCpy $R1 $4
+	goto end
+	nextword:
+	IntOp $6 $6 + $7
+	StrCpy $5 $6
+	goto loop
+	minus:
+	StrCmp $2 '-' 0 sum
+	StrCpy $2 '+'
+	IntOp $1 $4 - $1
+	IntOp $1 $1 + 1
+	IntCmp $1 0 error2 error2 restart
+	sum:
+	StrCmp $2 '#' 0 sumdelim
+	StrCpy $R1 $4
+	goto end
+	sumdelim:
+	StrCmp $2 '*' 0 error2
+	StrCpy $R1 $4
+	goto end
+	plus:
+	StrCmp $3 '' 0 +4
+	IntOp $6 $6 - $5
+	StrCpy $R1 $R0 $6 $5
+	goto end
+	StrCmp $3 '{' 0 +3
+	StrCpy $R1 $R0 $6
+	goto end
+	StrCmp $3 '}' 0 +4
+	IntOp $6 $6 + $7
+	StrCpy $R1 $R0 '' $6
+	goto end
+	StrCmp $3 '{*' +2
+	StrCmp $3 '*{' 0 +3
+	StrCpy $R1 $R0 $6
+	goto end
+	StrCmp $3 '*}' +2
+	StrCmp $3 '}*' 0 +3
+	StrCpy $R1 $R0 '' $5
+	goto end
+	StrCmp $3 '}}' 0 +3
+	StrCpy $R1 $R0 '' $6
+	goto end
+	StrCmp $3 '{{' 0 +3
+	StrCpy $R1 $R0 $5
+	goto end
+	StrCmp $3 '{}' 0 error3
+	StrLen $3 $R0
+	StrCmp $3 $6 0 +3
+	StrCpy $0 ''
+	goto +2
+	IntOp $6 $6 + $7
+	StrCpy $8 $R0 '' $6
+	StrCmp $4$8 1 +6
+	StrCmp $4 1 +2 +7
+	IntOp $6 $6 + $7
+	StrCpy $3 $R0 $7 $6
+	StrCmp $3 '' +2
+	StrCmp $3 $0 -3 +3
+	StrCpy $R1 ''
+	goto end
+	StrCmp $5 0 0 +3
+	StrCpy $0 ''
+	goto +2
+	IntOp $5 $5 - $7
+	StrCpy $3 $R0 $5
+	StrCpy $R1 '$3$0$8'
+	goto end
+	error3:
+	StrCpy $R1 3
+	goto error
+	error2:
+	StrCpy $R1 2
+	goto error
+	error1:
+	StrCpy $R1 1
+	error:
+	StrCmp $9 'E' 0 +3
+	SetErrors
+	end:
+	StrCpy $R0 $R1
+	Pop $R1
+	Pop $9
+	Pop $8
+	Pop $7
+	Pop $6
+	Pop $5
+	Pop $4
+	Pop $3
+	Pop $2
+	Pop $1
+	Pop $0
+	Exch $R0
 FunctionEnd
\ No newline at end of file
diff --git a/Other/Source/WordFind2X.nsh b/etc/source/WordFind2X.nsh
similarity index 95%
rename from Other/Source/WordFind2X.nsh
rename to etc/source/WordFind2X.nsh
index c77a7d0..eb7c4e7 100644
--- a/Other/Source/WordFind2X.nsh
+++ b/etc/source/WordFind2X.nsh
@@ -1,254 +1,254 @@
-/*______________________________________________________________________________
-
-                             WordFind2X v2.1
-________________________________________________________________________________
-Find word between two delimiters.
- 
-Strings:
-"[delimiter1][word+1][delimiter2][delimiter1][word+2][delimiter2]..."
-"[text][delimiter1][text][delimiter1][word+1][delimiter2][text]..."
-"...[delimiter1][word-2][delimiter2][delimiter1][word-1][delimiter2]"
-"...[text][delimiter1][text][delimiter1][word-1][delimiter2][text]"
- 
-Syntax:
-${WordFind2X} "[string]" "[delimiter1]" "[delimiter2]" "[E][options]" $var
- 
-"[string]"         ;[string]
-                   ;  input string
-"[delimiter1]"     ;[delimiter1]
-                   ;  first delimiter
-"[delimiter2]"     ;[delimiter2]
-                   ;  second delimiter
-"[E][options]"     ;[options]
-                   ;  +number   : word number from start
-                   ;  -number   : word number from end
-                   ;  +number}} : word number from start all space
-                   ;              after this word to output
-                   ;  +number{{ : word number from end all space
-                   ;              before this word to output
-                   ;  +number{} : word number from start
-                   ;              all space before and after
-                   ;              this word (word exclude)
-                   ;  +number*} : word number from start
-                   ;              all space after this
-                   ;              word to output with word
-                   ;  +number{* : word number from start
-                   ;              all space before this
-                   ;              word to output with word
-                   ;  #         : sum of words to output
-                   ;  /word     : number of word to output
-                   ;
-                   ;[E]
-                   ;  with errorlevel output
-                   ;  IfErrors:
-                   ;     $var=1  no words found
-                   ;     $var=2  no such word number
-                   ;     $var=3  syntax error (Use: +1,-1,#)
-                   ;[]
-                   ;  no errorlevel output (default)
-                   ;  If some errors found then (result=input string)
-                   ;
-$var               ;output (result)
-
-Example (1): 
-	Section
-		${WordFind2X} "[C:\io.sys];[C:\logo.sys];[C:\WINDOWS]" "[C:\" "];" "+2" $R0
-		; $R0="logo.sys"
-	SectionEnd
-
-Example (2): 
-	Section
-		${WordFind2X} "C:\WINDOWS C:\io.sys C:\logo.sys" "\" "." "-1" $R0
-		; $R0="logo"
-	SectionEnd
-
-Example (3): 
-	Section
-		${WordFind2X} "C:\WINDOWS C:\io.sys C:\logo.sys" "\" "." "-1{{" $R0
-		; $R0="C:\WINDOWS C:\io.sys C:"
-	SectionEnd
-
-Example (4): 
-	Section
-		${WordFind2X} "C:\WINDOWS C:\io.sys C:\logo.sys" "\" "." "-1{}" $R0
-		; $R0="C:\WINDOWS C:\io.sys C:sys"
-	SectionEnd
-
-Example (5): 
-	Section
-		${WordFind2X} "C:\WINDOWS C:\io.sys C:\logo.sys" "\" "." "-1{*" $R0
-		; $R0="C:\WINDOWS C:\io.sys C:\logo."
-	SectionEnd
-
-Example (6): 
-	Section
-		${WordFind2X} "C:\WINDOWS C:\io.sys C:\logo.sys" "\" "." "/logo" $R0
-		; $R0="2"
-	SectionEnd
-
-Example (With errorlevel output): 
-	Section
-		${WordFind2X} "[io.sys];[C:\logo.sys]" "\" "];" "E+1" $R0
-		; $R0="1" ("\...];" not found)
-	 
-		IfErrors 0 noerrors
-		MessageBox MB_OK 'Errorlevel=$R0' IDOK end
-	 
-		noerrors:
-		MessageBox MB_OK 'No errors'
-	 
-		end:
-	SectionEnd                                                               */
-
-Function WordFind2X
-	!macro WordFind2XCall _STRING _DELIMITER1 _DELIMITER2 _NUMBER _RESULT
-		Push `${_STRING}`
-		Push `${_DELIMITER1}`
-		Push `${_DELIMITER2}`
-		Push `${_NUMBER}`
-		Call WordFind2X
-		Pop ${_RESULT}
-	!macroend
-	!define WordFind2X `!insertmacro WordFind2XCall`
-	Exch $2
-	Exch
-	Exch $1
-	Exch
-	Exch 2
-	Exch $0
-	Exch 2
-	Exch 3
-	Exch $R0
-	Exch 3
-	Push $3
-	Push $4
-	Push $5
-	Push $6
-	Push $7
-	Push $8
-	Push $9
-	Push $R1
-	Push $R2
-	ClearErrors
-	StrCpy $R2 ''
-	StrCpy $3 $2 1
-	StrCpy $2 $2 '' 1
-	StrCmp $3 'E' 0 +3
-	StrCpy $R2 E
-	goto -4
-	StrCmp $3 '+' +5
-	StrCmp $3 '-' +4
-	StrCmp $3 '#' restart
-	StrCmp $3 '/' restart
-	goto error3
-	StrCpy $4 $2 2 -2
-	StrCmp $4 '{{' +9
-	StrCmp $4 '}}' +8
-	StrCmp $4 '{*' +7
-	StrCmp $4 '*{' +6
-	StrCmp $4 '*}' +5
-	StrCmp $4 '}*' +4
-	StrCmp $4 '{}' +3
-	StrCpy $4 ''
-	goto +2
-	StrCpy $2 $2 -2
-	IntOp $2 $2 + 0
-	StrCmp $2 0 error2
-	restart:
-	StrCmp $R0 '' error1
-	StrCpy $5 -1
-	StrCpy $6 0
-	StrCpy $7 ''
-	StrLen $8 $0
-	StrLen $9 $1
-	loop:
-	IntOp $5 $5 + 1
-	delim1:
-	StrCpy $R1 $R0 $8 $5
-	StrCmp $R1$6 0 error1
-	StrCmp $R1 '' minus
-	StrCmp $R1 $0 +2
-	StrCmp $7 '' loop delim2
-	StrCmp $0 $1 0 +2
-	StrCmp $7 '' 0 delim2
-	IntOp $7 $5 + $8
-	StrCpy $5 $7
-	goto delim1
-	delim2:
-	StrCpy $R1 $R0 $9 $5
-	StrCmp $R1 $1 0 loop
-	IntOp $6 $6 + 1
-	StrCmp $3$6 '+$2' plus
-	StrCmp $3 '/' 0 nextword
-	IntOp $R1 $5 - $7
-	StrCpy $R1 $R0 $R1 $7
-	StrCmp $R1 $2 0 +3
-	StrCpy $R1 $6
-	goto end
-	nextword:
-	IntOp $5 $5 + $9
-	StrCpy $7 ''
-	goto delim1
-	minus:
-	StrCmp $3 '-' 0 sum
-	StrCpy $3 +
-	IntOp $2 $6 - $2
-	IntOp $2 $2 + 1
-	IntCmp $2 0 error2 error2 restart
-	sum:
-	StrCmp $3 '#' 0 error2
-	StrCpy $R1 $6
-	goto end
-	plus:
-	StrCmp $4 '' 0 +4
-	IntOp $R1 $5 - $7
-	StrCpy $R1 $R0 $R1 $7
-	goto end
-	IntOp $5 $5 + $9
-	IntOp $7 $7 - $8
-	StrCmp $4 '{*' +2
-	StrCmp $4 '*{' 0 +3
-	StrCpy $R1 $R0 $5
-	goto end
-	StrCmp $4 '*}' +2
-	StrCmp $4 '}*' 0 +3
-	StrCpy $R1 $R0 '' $7
-	goto end
-	StrCmp $4 '}}' 0 +3
-	StrCpy $R1 $R0 '' $5
-	goto end
-	StrCmp $4 '{{' 0 +3
-	StrCpy $R1 $R0 $7
-	goto end
-	StrCmp $4 '{}' 0 error3
-	StrCpy $5 $R0 '' $5
-	StrCpy $7 $R0 $7
-	StrCpy $R1 '$7$5'
-	goto end
-	error3:
-	StrCpy $R1 3
-	goto error
-	error2:
-	StrCpy $R1 2
-	goto error
-	error1:
-	StrCpy $R1 1
-	error:
-	StrCmp $R2 'E' 0 +3
-	SetErrors
-	end:
-	StrCpy $R0 $R1
-	Pop $R2
-	Pop $R1
-	Pop $9
-	Pop $8
-	Pop $7
-	Pop $6
-	Pop $5
-	Pop $4
-	Pop $3
-	Pop $2
-	Pop $1
-	Pop $0
-	Exch $R0
+/*______________________________________________________________________________
+
+                             WordFind2X v2.1
+________________________________________________________________________________
+Find word between two delimiters.
+ 
+Strings:
+"[delimiter1][word+1][delimiter2][delimiter1][word+2][delimiter2]..."
+"[text][delimiter1][text][delimiter1][word+1][delimiter2][text]..."
+"...[delimiter1][word-2][delimiter2][delimiter1][word-1][delimiter2]"
+"...[text][delimiter1][text][delimiter1][word-1][delimiter2][text]"
+ 
+Syntax:
+${WordFind2X} "[string]" "[delimiter1]" "[delimiter2]" "[E][options]" $var
+ 
+"[string]"         ;[string]
+                   ;  input string
+"[delimiter1]"     ;[delimiter1]
+                   ;  first delimiter
+"[delimiter2]"     ;[delimiter2]
+                   ;  second delimiter
+"[E][options]"     ;[options]
+                   ;  +number   : word number from start
+                   ;  -number   : word number from end
+                   ;  +number}} : word number from start all space
+                   ;              after this word to output
+                   ;  +number{{ : word number from end all space
+                   ;              before this word to output
+                   ;  +number{} : word number from start
+                   ;              all space before and after
+                   ;              this word (word exclude)
+                   ;  +number*} : word number from start
+                   ;              all space after this
+                   ;              word to output with word
+                   ;  +number{* : word number from start
+                   ;              all space before this
+                   ;              word to output with word
+                   ;  #         : sum of words to output
+                   ;  /word     : number of word to output
+                   ;
+                   ;[E]
+                   ;  with errorlevel output
+                   ;  IfErrors:
+                   ;     $var=1  no words found
+                   ;     $var=2  no such word number
+                   ;     $var=3  syntax error (Use: +1,-1,#)
+                   ;[]
+                   ;  no errorlevel output (default)
+                   ;  If some errors found then (result=input string)
+                   ;
+$var               ;output (result)
+
+Example (1): 
+	Section
+		${WordFind2X} "[C:\io.sys];[C:\logo.sys];[C:\WINDOWS]" "[C:\" "];" "+2" $R0
+		; $R0="logo.sys"
+	SectionEnd
+
+Example (2): 
+	Section
+		${WordFind2X} "C:\WINDOWS C:\io.sys C:\logo.sys" "\" "." "-1" $R0
+		; $R0="logo"
+	SectionEnd
+
+Example (3): 
+	Section
+		${WordFind2X} "C:\WINDOWS C:\io.sys C:\logo.sys" "\" "." "-1{{" $R0
+		; $R0="C:\WINDOWS C:\io.sys C:"
+	SectionEnd
+
+Example (4): 
+	Section
+		${WordFind2X} "C:\WINDOWS C:\io.sys C:\logo.sys" "\" "." "-1{}" $R0
+		; $R0="C:\WINDOWS C:\io.sys C:sys"
+	SectionEnd
+
+Example (5): 
+	Section
+		${WordFind2X} "C:\WINDOWS C:\io.sys C:\logo.sys" "\" "." "-1{*" $R0
+		; $R0="C:\WINDOWS C:\io.sys C:\logo."
+	SectionEnd
+
+Example (6): 
+	Section
+		${WordFind2X} "C:\WINDOWS C:\io.sys C:\logo.sys" "\" "." "/logo" $R0
+		; $R0="2"
+	SectionEnd
+
+Example (With errorlevel output): 
+	Section
+		${WordFind2X} "[io.sys];[C:\logo.sys]" "\" "];" "E+1" $R0
+		; $R0="1" ("\...];" not found)
+	 
+		IfErrors 0 noerrors
+		MessageBox MB_OK 'Errorlevel=$R0' IDOK end
+	 
+		noerrors:
+		MessageBox MB_OK 'No errors'
+	 
+		end:
+	SectionEnd                                                               */
+
+Function WordFind2X
+	!macro WordFind2XCall _STRING _DELIMITER1 _DELIMITER2 _NUMBER _RESULT
+		Push `${_STRING}`
+		Push `${_DELIMITER1}`
+		Push `${_DELIMITER2}`
+		Push `${_NUMBER}`
+		Call WordFind2X
+		Pop ${_RESULT}
+	!macroend
+	!define WordFind2X `!insertmacro WordFind2XCall`
+	Exch $2
+	Exch
+	Exch $1
+	Exch
+	Exch 2
+	Exch $0
+	Exch 2
+	Exch 3
+	Exch $R0
+	Exch 3
+	Push $3
+	Push $4
+	Push $5
+	Push $6
+	Push $7
+	Push $8
+	Push $9
+	Push $R1
+	Push $R2
+	ClearErrors
+	StrCpy $R2 ''
+	StrCpy $3 $2 1
+	StrCpy $2 $2 '' 1
+	StrCmp $3 'E' 0 +3
+	StrCpy $R2 E
+	goto -4
+	StrCmp $3 '+' +5
+	StrCmp $3 '-' +4
+	StrCmp $3 '#' restart
+	StrCmp $3 '/' restart
+	goto error3
+	StrCpy $4 $2 2 -2
+	StrCmp $4 '{{' +9
+	StrCmp $4 '}}' +8
+	StrCmp $4 '{*' +7
+	StrCmp $4 '*{' +6
+	StrCmp $4 '*}' +5
+	StrCmp $4 '}*' +4
+	StrCmp $4 '{}' +3
+	StrCpy $4 ''
+	goto +2
+	StrCpy $2 $2 -2
+	IntOp $2 $2 + 0
+	StrCmp $2 0 error2
+	restart:
+	StrCmp $R0 '' error1
+	StrCpy $5 -1
+	StrCpy $6 0
+	StrCpy $7 ''
+	StrLen $8 $0
+	StrLen $9 $1
+	loop:
+	IntOp $5 $5 + 1
+	delim1:
+	StrCpy $R1 $R0 $8 $5
+	StrCmp $R1$6 0 error1
+	StrCmp $R1 '' minus
+	StrCmp $R1 $0 +2
+	StrCmp $7 '' loop delim2
+	StrCmp $0 $1 0 +2
+	StrCmp $7 '' 0 delim2
+	IntOp $7 $5 + $8
+	StrCpy $5 $7
+	goto delim1
+	delim2:
+	StrCpy $R1 $R0 $9 $5
+	StrCmp $R1 $1 0 loop
+	IntOp $6 $6 + 1
+	StrCmp $3$6 '+$2' plus
+	StrCmp $3 '/' 0 nextword
+	IntOp $R1 $5 - $7
+	StrCpy $R1 $R0 $R1 $7
+	StrCmp $R1 $2 0 +3
+	StrCpy $R1 $6
+	goto end
+	nextword:
+	IntOp $5 $5 + $9
+	StrCpy $7 ''
+	goto delim1
+	minus:
+	StrCmp $3 '-' 0 sum
+	StrCpy $3 +
+	IntOp $2 $6 - $2
+	IntOp $2 $2 + 1
+	IntCmp $2 0 error2 error2 restart
+	sum:
+	StrCmp $3 '#' 0 error2
+	StrCpy $R1 $6
+	goto end
+	plus:
+	StrCmp $4 '' 0 +4
+	IntOp $R1 $5 - $7
+	StrCpy $R1 $R0 $R1 $7
+	goto end
+	IntOp $5 $5 + $9
+	IntOp $7 $7 - $8
+	StrCmp $4 '{*' +2
+	StrCmp $4 '*{' 0 +3
+	StrCpy $R1 $R0 $5
+	goto end
+	StrCmp $4 '*}' +2
+	StrCmp $4 '}*' 0 +3
+	StrCpy $R1 $R0 '' $7
+	goto end
+	StrCmp $4 '}}' 0 +3
+	StrCpy $R1 $R0 '' $5
+	goto end
+	StrCmp $4 '{{' 0 +3
+	StrCpy $R1 $R0 $7
+	goto end
+	StrCmp $4 '{}' 0 error3
+	StrCpy $5 $R0 '' $5
+	StrCpy $7 $R0 $7
+	StrCpy $R1 '$7$5'
+	goto end
+	error3:
+	StrCpy $R1 3
+	goto error
+	error2:
+	StrCpy $R1 2
+	goto error
+	error1:
+	StrCpy $R1 1
+	error:
+	StrCmp $R2 'E' 0 +3
+	SetErrors
+	end:
+	StrCpy $R0 $R1
+	Pop $R2
+	Pop $R1
+	Pop $9
+	Pop $8
+	Pop $7
+	Pop $6
+	Pop $5
+	Pop $4
+	Pop $3
+	Pop $2
+	Pop $1
+	Pop $0
+	Exch $R0
 FunctionEnd
\ No newline at end of file
diff --git a/Other/Source/WordFind3X.nsh b/etc/source/WordFind3X.nsh
similarity index 95%
rename from Other/Source/WordFind3X.nsh
rename to etc/source/WordFind3X.nsh
index e909eeb..820bbbf 100644
--- a/Other/Source/WordFind3X.nsh
+++ b/etc/source/WordFind3X.nsh
@@ -1,270 +1,270 @@
-/*______________________________________________________________________________
- 
-                            WordFind3X v1.0
-________________________________________________________________________________
-Find word, that contain string, between two delimiters.
- 
-Syntax:
-${WordFind3X} "[string]" "[delimiter1]" "[center]" "[delimiter2]" "[E][options]" $var
- 
-"[string]"         ;[string]
-                   ;  input string
-"[delimiter1]"     ;[delimiter1]
-                   ;  first delimiter
-"[center]"         ;[center]
-                   ;  center string
-"[delimiter2]"     ;[delimiter2]
-                   ;  second delimiter
-"[E][options]"     ;[options]
-                   ;  +number   : word number from start
-                   ;  -number   : word number from end
-                   ;  +number}} : word number from start all space
-                   ;              after this word to output
-                   ;  +number{{ : word number from end all space
-                   ;              before this word to output
-                   ;  +number{} : word number from start
-                   ;              all space before and after
-                   ;              this word (word exclude)
-                   ;  +number*} : word number from start
-                   ;              all space after this
-                   ;              word to output with word
-                   ;  +number{* : word number from start
-                   ;              all space before this
-                   ;              word to output with word
-                   ;  #         : sum of words to output
-                   ;  /word     : number of word to output
-                   ;
-                   ;[E]
-                   ;  with errorlevel output
-                   ;  IfErrors:
-                   ;     $var=1  no words found
-                   ;     $var=2  no such word number
-                   ;     $var=3  syntax error (Use: +1,-1,#)
-                   ;[]
-                   ;  no errorlevel output (default)
-                   ;  If some errors found then (result=input string)
-                   ;
-$var               ;output (result)
-
-Example (1): 
-	Section
-		${WordFind3X} "[1.AAB];[2.BAA];[3.BBB];" "[" "AA" "];" "+1" $R0
-		; $R0="1.AAB"
-	SectionEnd
-
-Example (2): 
-	Section
-		${WordFind3X} "[1.AAB];[2.BAA];[3.BBB];" "[" "AA" "];" "-1" $R0
-		; $R0="2.BAA"
-	SectionEnd
-
-Example (3): 
-	Section
-		${WordFind3X} "[1.AAB];[2.BAA];[3.BBB];" "[" "AA" "];" "-1{{" $R0
-		; $R0="[1.AAB];"
-	SectionEnd
-
-Example (4): 
-	Section
-		${WordFind3X} "[1.AAB];[2.BAA];[3.BBB];" "[" "AA" "];" "-1{}" $R0
-		; $R0="[1.AAB];[3.BBB];"
-	SectionEnd
-
-Example (5): 
-	Section
-		${WordFind3X} "[1.AAB];[2.BAA];[3.BBB];" "[" "AA" "];" "-1{*" $R0
-		; $R0="[1.AAB];[2.BAA];"
-	SectionEnd
-
-Example (6): 
-	Section
-		${WordFind3X} "[1.AAB];[2.BAA];[3.BBB];" "[" "AA" "];" "/2.BAA" $R0
-		; $R0="2"
-	SectionEnd
-
-Example (With errorlevel output): 
-	Section
-		${WordFind3X} "[1.AAB];[2.BAA];[3.BBB];" "[" "XX" "];" "E+1" $R0
-		; $R0="1" ("[...XX...];" not found)
-	 
-		IfErrors 0 noerrors
-		MessageBox MB_OK 'Errorlevel=$R0' IDOK end
-	 
-		noerrors:
-		MessageBox MB_OK 'No errors'
-	 
-		end:
-	SectionEnd                                                               */
-
-Function WordFind3X
-	!macro WordFind3XCall _STRING _DELIMITER1 _CENTER _DELIMITER2 _NUMBER _RESULT
-		Push `${_STRING}`
-		Push `${_DELIMITER1}`
-		Push `${_CENTER}`
-		Push `${_DELIMITER2}`
-		Push `${_NUMBER}`
-		Call WordFind3X
-		Pop ${_RESULT}
-	!macroend
-	!define WordFind3X `!insertmacro WordFind3XCall`
-	Exch $3
-	Exch
-	Exch $2
-	Exch
-	Exch 2
-	Exch $1
-	Exch 2
-	Exch 3
-	Exch $0
-	Exch 3
-	Exch 4
-	Exch $R0
-	Exch 4
-	Push $4
-	Push $5
-	Push $6
-	Push $7
-	Push $8
-	Push $9
-	Push $R1
-	Push $R2
-	Push $R3
-	Push $R4
-	Push $R5
-	ClearErrors
-	StrCpy $R5 ''
-	StrCpy $4 $3 1
-	StrCpy $3 $3 '' 1
-	StrCmp $4 'E' 0 +3
-	StrCpy $R5 E
-	goto -4
-	StrCmp $4 '+' +5
-	StrCmp $4 '-' +4
-	StrCmp $4 '#' restart
-	StrCmp $4 '/' restart
-	goto error3
-	StrCpy $5 $3 2 -2
-	StrCmp $5 '{{' +9
-	StrCmp $5 '}}' +8
-	StrCmp $5 '{*' +7
-	StrCmp $5 '*{' +6
-	StrCmp $5 '*}' +5
-	StrCmp $5 '}*' +4
-	StrCmp $5 '{}' +3
-	StrCpy $5 ''
-	goto +2
-	StrCpy $3 $3 -2
-	IntOp $3 $3 + 0
-	StrCmp $3 0 error2
-	restart:
-	StrCmp $R0 '' error1
-	StrCpy $6 -1
-	StrCpy $7 0
-	StrCpy $8 ''
-	StrCpy $9 ''
-	StrLen $R1 $0
-	StrLen $R2 $1
-	StrLen $R3 $2
-	loop:
-	IntOp $6 $6 + 1
-	delim1:
-	StrCpy $R4 $R0 $R1 $6
-	StrCmp $R4$7 0 error1
-	StrCmp $R4 '' minus
-	StrCmp $R4 $0 +2
-	StrCmp $8 '' loop center
-	StrCmp $0 $1 +2
-	StrCmp $0 $2 0 +2
-	StrCmp $8 '' 0 center
-	IntOp $8 $6 + $R1
-	StrCpy $6 $8
-	goto delim1
-	center:
-	StrCmp $9 '' 0 delim2
-	StrCpy $R4 $R0 $R2 $6
-	StrCmp $R4 $1 0 loop
-	IntOp $9 $6 + $R2
-	StrCpy $6 $9
-	goto delim1
-	delim2:
-	StrCpy $R4 $R0 $R3 $6
-	StrCmp $R4 $2 0 loop
-	IntOp $7 $7 + 1
-	StrCmp $4$7 '+$3' plus
-	StrCmp $4 '/' 0 nextword
-	IntOp $R4 $6 - $8
-	StrCpy $R4 $R0 $R4 $8
-	StrCmp $R4 $3 0 +3
-	StrCpy $R4 $7
-	goto end
-	nextword:
-	IntOp $6 $6 + $R3
-	StrCpy $8 ''
-	StrCpy $9 ''
-	goto delim1
-	minus:
-	StrCmp $4 '-' 0 sum
-	StrCpy $4 +
-	IntOp $3 $7 - $3
-	IntOp $3 $3 + 1
-	IntCmp $3 0 error2 error2 restart
-	sum:
-	StrCmp $4 '#' 0 error2
-	StrCpy $R4 $7
-	goto end
-	plus:
-	StrCmp $5 '' 0 +4
-	IntOp $R4 $6 - $8
-	StrCpy $R4 $R0 $R4 $8
-	goto end
-	IntOp $6 $6 + $R3
-	IntOp $8 $8 - $R1
-	StrCmp $5 '{*' +2
-	StrCmp $5 '*{' 0 +3
-	StrCpy $R4 $R0 $6
-	goto end
-	StrCmp $5 '*}' +2
-	StrCmp $5 '}*' 0 +3
-	StrCpy $R4 $R0 '' $8
-	goto end
-	StrCmp $5 '}}' 0 +3
-	StrCpy $R4 $R0 '' $6
-	goto end
-	StrCmp $5 '{{' 0 +3
-	StrCpy $R4 $R0 $8
-	goto end
-	StrCmp $5 '{}' 0 error3
-	StrCpy $6 $R0 '' $6
-	StrCpy $8 $R0 $8
-	StrCpy $R4 '$8$6'
-	goto end
-	error3:
-	StrCpy $R4 3
-	goto error
-	error2:
-	StrCpy $R4 2
-	goto error
-	error1:
-	StrCpy $R4 1
-	error:
-	StrCmp $R5 'E' 0 +3
-	SetErrors
-	end:
-	StrCpy $R0 $R4
-	Pop $R5
-	Pop $R4
-	Pop $R3
-	Pop $R2
-	Pop $R1
-	Pop $9
-	Pop $8
-	Pop $7
-	Pop $6
-	Pop $5
-	Pop $4
-	Pop $3
-	Pop $2
-	Pop $1
-	Pop $0
-	Exch $R0
+/*______________________________________________________________________________
+ 
+                            WordFind3X v1.0
+________________________________________________________________________________
+Find word, that contain string, between two delimiters.
+ 
+Syntax:
+${WordFind3X} "[string]" "[delimiter1]" "[center]" "[delimiter2]" "[E][options]" $var
+ 
+"[string]"         ;[string]
+                   ;  input string
+"[delimiter1]"     ;[delimiter1]
+                   ;  first delimiter
+"[center]"         ;[center]
+                   ;  center string
+"[delimiter2]"     ;[delimiter2]
+                   ;  second delimiter
+"[E][options]"     ;[options]
+                   ;  +number   : word number from start
+                   ;  -number   : word number from end
+                   ;  +number}} : word number from start all space
+                   ;              after this word to output
+                   ;  +number{{ : word number from end all space
+                   ;              before this word to output
+                   ;  +number{} : word number from start
+                   ;              all space before and after
+                   ;              this word (word exclude)
+                   ;  +number*} : word number from start
+                   ;              all space after this
+                   ;              word to output with word
+                   ;  +number{* : word number from start
+                   ;              all space before this
+                   ;              word to output with word
+                   ;  #         : sum of words to output
+                   ;  /word     : number of word to output
+                   ;
+                   ;[E]
+                   ;  with errorlevel output
+                   ;  IfErrors:
+                   ;     $var=1  no words found
+                   ;     $var=2  no such word number
+                   ;     $var=3  syntax error (Use: +1,-1,#)
+                   ;[]
+                   ;  no errorlevel output (default)
+                   ;  If some errors found then (result=input string)
+                   ;
+$var               ;output (result)
+
+Example (1): 
+	Section
+		${WordFind3X} "[1.AAB];[2.BAA];[3.BBB];" "[" "AA" "];" "+1" $R0
+		; $R0="1.AAB"
+	SectionEnd
+
+Example (2): 
+	Section
+		${WordFind3X} "[1.AAB];[2.BAA];[3.BBB];" "[" "AA" "];" "-1" $R0
+		; $R0="2.BAA"
+	SectionEnd
+
+Example (3): 
+	Section
+		${WordFind3X} "[1.AAB];[2.BAA];[3.BBB];" "[" "AA" "];" "-1{{" $R0
+		; $R0="[1.AAB];"
+	SectionEnd
+
+Example (4): 
+	Section
+		${WordFind3X} "[1.AAB];[2.BAA];[3.BBB];" "[" "AA" "];" "-1{}" $R0
+		; $R0="[1.AAB];[3.BBB];"
+	SectionEnd
+
+Example (5): 
+	Section
+		${WordFind3X} "[1.AAB];[2.BAA];[3.BBB];" "[" "AA" "];" "-1{*" $R0
+		; $R0="[1.AAB];[2.BAA];"
+	SectionEnd
+
+Example (6): 
+	Section
+		${WordFind3X} "[1.AAB];[2.BAA];[3.BBB];" "[" "AA" "];" "/2.BAA" $R0
+		; $R0="2"
+	SectionEnd
+
+Example (With errorlevel output): 
+	Section
+		${WordFind3X} "[1.AAB];[2.BAA];[3.BBB];" "[" "XX" "];" "E+1" $R0
+		; $R0="1" ("[...XX...];" not found)
+	 
+		IfErrors 0 noerrors
+		MessageBox MB_OK 'Errorlevel=$R0' IDOK end
+	 
+		noerrors:
+		MessageBox MB_OK 'No errors'
+	 
+		end:
+	SectionEnd                                                               */
+
+Function WordFind3X
+	!macro WordFind3XCall _STRING _DELIMITER1 _CENTER _DELIMITER2 _NUMBER _RESULT
+		Push `${_STRING}`
+		Push `${_DELIMITER1}`
+		Push `${_CENTER}`
+		Push `${_DELIMITER2}`
+		Push `${_NUMBER}`
+		Call WordFind3X
+		Pop ${_RESULT}
+	!macroend
+	!define WordFind3X `!insertmacro WordFind3XCall`
+	Exch $3
+	Exch
+	Exch $2
+	Exch
+	Exch 2
+	Exch $1
+	Exch 2
+	Exch 3
+	Exch $0
+	Exch 3
+	Exch 4
+	Exch $R0
+	Exch 4
+	Push $4
+	Push $5
+	Push $6
+	Push $7
+	Push $8
+	Push $9
+	Push $R1
+	Push $R2
+	Push $R3
+	Push $R4
+	Push $R5
+	ClearErrors
+	StrCpy $R5 ''
+	StrCpy $4 $3 1
+	StrCpy $3 $3 '' 1
+	StrCmp $4 'E' 0 +3
+	StrCpy $R5 E
+	goto -4
+	StrCmp $4 '+' +5
+	StrCmp $4 '-' +4
+	StrCmp $4 '#' restart
+	StrCmp $4 '/' restart
+	goto error3
+	StrCpy $5 $3 2 -2
+	StrCmp $5 '{{' +9
+	StrCmp $5 '}}' +8
+	StrCmp $5 '{*' +7
+	StrCmp $5 '*{' +6
+	StrCmp $5 '*}' +5
+	StrCmp $5 '}*' +4
+	StrCmp $5 '{}' +3
+	StrCpy $5 ''
+	goto +2
+	StrCpy $3 $3 -2
+	IntOp $3 $3 + 0
+	StrCmp $3 0 error2
+	restart:
+	StrCmp $R0 '' error1
+	StrCpy $6 -1
+	StrCpy $7 0
+	StrCpy $8 ''
+	StrCpy $9 ''
+	StrLen $R1 $0
+	StrLen $R2 $1
+	StrLen $R3 $2
+	loop:
+	IntOp $6 $6 + 1
+	delim1:
+	StrCpy $R4 $R0 $R1 $6
+	StrCmp $R4$7 0 error1
+	StrCmp $R4 '' minus
+	StrCmp $R4 $0 +2
+	StrCmp $8 '' loop center
+	StrCmp $0 $1 +2
+	StrCmp $0 $2 0 +2
+	StrCmp $8 '' 0 center
+	IntOp $8 $6 + $R1
+	StrCpy $6 $8
+	goto delim1
+	center:
+	StrCmp $9 '' 0 delim2
+	StrCpy $R4 $R0 $R2 $6
+	StrCmp $R4 $1 0 loop
+	IntOp $9 $6 + $R2
+	StrCpy $6 $9
+	goto delim1
+	delim2:
+	StrCpy $R4 $R0 $R3 $6
+	StrCmp $R4 $2 0 loop
+	IntOp $7 $7 + 1
+	StrCmp $4$7 '+$3' plus
+	StrCmp $4 '/' 0 nextword
+	IntOp $R4 $6 - $8
+	StrCpy $R4 $R0 $R4 $8
+	StrCmp $R4 $3 0 +3
+	StrCpy $R4 $7
+	goto end
+	nextword:
+	IntOp $6 $6 + $R3
+	StrCpy $8 ''
+	StrCpy $9 ''
+	goto delim1
+	minus:
+	StrCmp $4 '-' 0 sum
+	StrCpy $4 +
+	IntOp $3 $7 - $3
+	IntOp $3 $3 + 1
+	IntCmp $3 0 error2 error2 restart
+	sum:
+	StrCmp $4 '#' 0 error2
+	StrCpy $R4 $7
+	goto end
+	plus:
+	StrCmp $5 '' 0 +4
+	IntOp $R4 $6 - $8
+	StrCpy $R4 $R0 $R4 $8
+	goto end
+	IntOp $6 $6 + $R3
+	IntOp $8 $8 - $R1
+	StrCmp $5 '{*' +2
+	StrCmp $5 '*{' 0 +3
+	StrCpy $R4 $R0 $6
+	goto end
+	StrCmp $5 '*}' +2
+	StrCmp $5 '}*' 0 +3
+	StrCpy $R4 $R0 '' $8
+	goto end
+	StrCmp $5 '}}' 0 +3
+	StrCpy $R4 $R0 '' $6
+	goto end
+	StrCmp $5 '{{' 0 +3
+	StrCpy $R4 $R0 $8
+	goto end
+	StrCmp $5 '{}' 0 error3
+	StrCpy $6 $R0 '' $6
+	StrCpy $8 $R0 $8
+	StrCpy $R4 '$8$6'
+	goto end
+	error3:
+	StrCpy $R4 3
+	goto error
+	error2:
+	StrCpy $R4 2
+	goto error
+	error1:
+	StrCpy $R4 1
+	error:
+	StrCmp $R5 'E' 0 +3
+	SetErrors
+	end:
+	StrCpy $R0 $R4
+	Pop $R5
+	Pop $R4
+	Pop $R3
+	Pop $R2
+	Pop $R1
+	Pop $9
+	Pop $8
+	Pop $7
+	Pop $6
+	Pop $5
+	Pop $4
+	Pop $3
+	Pop $2
+	Pop $1
+	Pop $0
+	Exch $R0
 FunctionEnd
\ No newline at end of file
diff --git a/Other/Source/XML.nsh b/etc/source/XML.nsh
similarity index 95%
rename from Other/Source/XML.nsh
rename to etc/source/XML.nsh
index 39e3660..38c6465 100644
--- a/Other/Source/XML.nsh
+++ b/etc/source/XML.nsh
@@ -1,4 +1,7 @@
-!ifdef XML_PLUGIN
+
+!ifndef _XML_LIB_
+	!define _XML_LIB_
+
 	!define XMLWriteText "!insertmacro _XMLWriteText"
 	!macro _XMLWriteText _FILE _XPATH _VALUE
 		nsisXML::create
@@ -12,6 +15,7 @@
 		nsisXML::save `${_FILE}`
 		nsisXML::release $0
 	!macroend
+
 	!define XMLReadText "!insertmacro _XMLReadText"
 	!macro _XMLReadText _FILE _XPATH _RETURN
 		nsisXML::create
@@ -27,6 +31,7 @@
 		nsisXML::save `${_FILE}`
 		nsisXML::release $0
 	!macroend
+
 	!define XMLWriteAttrib "!insertmacro _XMLWriteAttrib"
 	!macro _XMLWriteAttrib _FILE _XPATH _ATTRIBUTE _VALUE
 		nsisXML::create
@@ -40,6 +45,7 @@
 		nsisXML::save `${_FILE}`
 		nsisXML::release $0
 	!macroend
+
 	!define XMLReadAttrib "!insertmacro _XMLReadAttrib"
 	!macro _XMLReadAttrib _FILE _XPATH _ATTRIBUTE _RETURN
 		nsisXML::create
@@ -55,4 +61,5 @@
 		nsisXML::save `${_FILE}`
 		nsisXML::release $0
 	!macroend
-!endif
\ No newline at end of file
+	
+!endif ; _XML_LIB_
diff --git a/etc/source/daemon.devin.p12 b/etc/source/daemon.devin.p12
new file mode 100644
index 0000000..7ceb128
Binary files /dev/null and b/etc/source/daemon.devin.p12 differ
diff --git a/Other/Source/header.bmp b/etc/source/header.bmp
similarity index 100%
rename from Other/Source/header.bmp
rename to etc/source/header.bmp
diff --git a/Other/Source/junction.exe b/etc/source/junction.exe
similarity index 100%
rename from Other/Source/junction.exe
rename to etc/source/junction.exe
diff --git a/Other/Source/welcomefinish.bmp b/etc/source/welcomefinish.bmp
similarity index 100%
rename from Other/Source/welcomefinish.bmp
rename to etc/source/welcomefinish.bmp
diff --git a/help.html b/help.html
deleted file mode 100755
index b0ca4a7..0000000
--- a/help.html
+++ /dev/null
@@ -1,208 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html lang="en-US">
-	<head>
-		<meta http-equiv="refresh" content="10;url=App\Manual\index.html" />
-		<title>PortableApps.com Launcher Help</title>
-		<link rel="alternate" type="application/rss+xml" title="PortableApps.com" href="http://portableapps.com/feeds/general">
-		<link rel="SHORTCUT ICON" href="Other/Help/images/favicon.ico">
-		<style>
-			body {
-				margin: 20px;
-				background: #e6e8ea none repeat scroll 0% 50%;
-				font-family: Verdana,Arial,Helvetica,sans-serif;
-				font-size: 76%;
-				color: #000000;
-				text-align: center;
-			}
-			pre {
-				border: 1px dotted #808080;
-				padding: 10px;
-				background-color: #e6e8ea;
-				-moz-border-radius-topleft: 12px;
-				-moz-border-radius-topright: 12px;
-				-moz-border-radius-bottomright: 12px;
-				-moz-border-radius-bottomleft: 12px;
-			}
-			a {
-				color: #b31616;
-				font-weight: bold;
-			}
-			a:link {
-			}
-			a:visited {
-			}
-			a:active {
-			}
-			a:hover {
-				color: red;
-			}
-			h1, h2, h3, h4, h5, h6 {
-				font-family: Arial,sans-serif;
-				font-weight: bold;
-			}
-			h1 {
-				border-bottom: 1px solid silver;
-				color: #b31616;
-				font-weight: bold;
-				letter-spacing: -2px;
-				font-size: 2.2em;
-				padding-bottom: 5px;
-			}
-			h2 {
-				border-bottom: 1px solid silver;
-				font-size: 1.5em;
-				padding-bottom: 3px;
-				clear: both;
-			}
-			h3 {
-				font-size: 1.2em;
-			}
-			h4 {
-				font-size: 1.1em;
-			}
-			h5 {
-				font-size: 1em;
-			}
-			h6 {
-				font-size: 0.8em;
-			}
-			img {
-				border: none;
-			}
-			ol, ul, li {
-				font-size: 1em;
-			}
-			p, table, tr, td, th {
-				font-size: 1em;
-			}
-			pre {
-				font-size: 1em;
-			}
-			strong, b {
-				font-weight: bold;
-			}
-			table, tr, td {
-				font-size: 1em;
-				border-collapse: collapse;
-			}
-			td, th {
-				border: 1px solid #aaaaaa;
-				padding: 3px;
-				border-collapse: collapse;
-			}
-			th {
-				background: #3667a8 none repeat scroll 0% 50%;
-				color: white;
-			}
-			ol ol {
-				list-style-type: lower-alpha;
-			}
-			.content {
-				border-left: 1px solid Black;
-				border-right: 1px solid Black;
-				padding: 12px 30px;
-				text-align: left;
-				margin-left: auto;
-				margin-right: auto;
-				width: 780px;
-				background-color: #ffffff;
-				line-height: 150%;
-			}
-			.logo {
-				border-left: 1px solid black;
-				border-right: 1px solid black;
-				background: #ffffff url(Other/Help/images/help_background_header.png) repeat-x;
-				width: 840px;
-				margin-top: 20px;
-				margin-left: auto;
-				margin-right: auto;
-				text-align: left;
-			}
-			.footer {
-				border-left: 1px solid black;
-				border-right: 1px solid black;
-				background: #ffffff url(Other/Help/images/help_background_footer.png) repeat-x scroll 0% 50%;
-				width: 840px;
-				height: 16px;
-				margin-left: auto;
-				margin-right: auto;
-				text-align: left;
-			}
-			.logo img {
-				border: none;
-				padding-left: 0px;
-				position: relative;
-				top: -4px;
-			}
-			* html .content {
-				width: 760px;
-			}
-			* html .logo, * html .footer {
-				width: 820px;
-			}
-			.content h1 {
-				margin: 0px;
-			}
-			h1.hastagline {
-				border: none;
-			}
-			h2.tagline {
-				color: #747673;
-				clear: none;
-				margin-top: 0em;
-			}
-			pre, .ini-head, .ini-key, .ini-value {
-				font-family: Courier New,Courier,monospace;
-			}
-			.ini-head, .ini-head:hover {
-				font-weight: bold;
-				color: #b31616;
-			}
-			.ini-key, .ini-key:hover {
-				font-weight: normal;
-				color: #0000c0;
-			}
-			.ini-value, .ini-value:hover {
-				font-weight: normal;
-				color: #008000;
-			}
-			.ini-default {
-				font-weight: bold;
-				text-decoration: underline;
-			}
-			pre a:link, pre a:visited {
-				text-decoration: none;
-			}
-			pre a:link:hover, pre a:visited:hover, pre a:link:active, pre a:visited:active {
-				text-decoration: underline;
-			}
-			@media print {
-				body, .content { margin: 0;
-					padding: 0;
-				}
-				.navigation, .locator, .footer a, .message, .footer-links {
-					display: none;
-				}
-				.footer, .content, .header {
-					border: none;
-				}
-				a {
-					text-decoration: none;
-					font-weight: normal;
-					color: black;
-				}
-			}
-		</style>
-	</head>
-<body>
-<div class="logo"><a href="http://portableapps.com/"><img src="Other/Help/images/help_logo_top.png" alt="PortableApps.com - Your Digital Life, Anywhere" height="47" width="229"></a></div>
-<div class="content">
-<h1 class="hastagline">PortableApps.com Launcher Manual</h1>
-<div class="tagline">
-<h2 class="tagline">your PAL in making portable apps</h2>
-</div>
-<p>This document has been superseded by the new <a href="App/Manual/index.html">Manual</a> (also available <a href="http://portableapps.chrismorgan.info/portableapps/launcher/docs/">online</a>).</p>
-</div>
-<div class="footer"></div>
-</body>
-</html>