diff --git a/Greenshot/tools/PortableApps.comInstaller/App/7zip/7z.dll b/Greenshot/tools/PortableApps.comInstaller/App/7zip/7z.dll
new file mode 100644
index 000000000..48bd32f24
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/7zip/7z.dll differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/7zip/7z.exe b/Greenshot/tools/PortableApps.comInstaller/App/7zip/7z.exe
new file mode 100644
index 000000000..5ec90671e
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/7zip/7z.exe differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/AppInfo/appicon.ico b/Greenshot/tools/PortableApps.comInstaller/App/AppInfo/appicon.ico
new file mode 100644
index 000000000..d0981620d
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/AppInfo/appicon.ico differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/AppInfo/appicon_128.png b/Greenshot/tools/PortableApps.comInstaller/App/AppInfo/appicon_128.png
new file mode 100644
index 000000000..b7fcd1d8f
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/AppInfo/appicon_128.png differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/AppInfo/appicon_16.png b/Greenshot/tools/PortableApps.comInstaller/App/AppInfo/appicon_16.png
new file mode 100644
index 000000000..3a7151ffe
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/AppInfo/appicon_16.png differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/AppInfo/appicon_32.png b/Greenshot/tools/PortableApps.comInstaller/App/AppInfo/appicon_32.png
new file mode 100644
index 000000000..5830fd50a
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/AppInfo/appicon_32.png differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/AppInfo/appinfo.ini b/Greenshot/tools/PortableApps.comInstaller/App/AppInfo/appinfo.ini
new file mode 100644
index 000000000..ff6dbb680
--- /dev/null
+++ b/Greenshot/tools/PortableApps.comInstaller/App/AppInfo/appinfo.ini
@@ -0,0 +1,29 @@
+[Format]
+Type=PortableApps.comFormat
+Version=3.0
+
+[Details]
+Name=PortableApps.com Installer
+AppID=PortableApps.comInstaller
+Publisher=PortableApps.com
+Homepage=PortableApps.com/go/PortableApps.comInstaller
+Category=Development
+Description=Create PortableApps.com Format installers for portable apps
+Language=Multilingual
+
+[License]
+Shareable=true
+OpenSource=true
+Freeware=true
+CommercialUse=true
+
+[Version]
+PackageVersion=3.0.5.0
+DisplayVersion=3.0.5
+
+[Control]
+Icons=1
+Start=PortableApps.comInstaller.exe
+
+[Associations]
+SendTo=true
\ No newline at end of file
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstaller.bmp b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstaller.bmp
new file mode 100644
index 000000000..220f605c3
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstaller.bmp differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstaller.ico b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstaller.ico
new file mode 100644
index 000000000..d0981620d
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstaller.ico differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstaller.nsi b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstaller.nsi
new file mode 100644
index 000000000..2de8cff02
--- /dev/null
+++ b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstaller.nsi
@@ -0,0 +1,1347 @@
+;Copyright 2007-2012 John T. Haller of PortableApps.com
+;Website: http://PortableApps.com/
+
+;This software is OSI Certified Open Source Software.
+;OSI Certified is a certification mark of the Open Source Initiative.
+
+;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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+;EXCEPTION: The PortableApps.com Installer can be used with open source
+;applications licensed under OSI-approved licenses as well as freeware provided
+;it is unmodified and it adheres to the current PortableApps.com Format Specification
+;as published at PortableApps.com/development. It may also be used with commercial
+;software by contacting PortableApps.com.
+
+!define PORTABLEAPPSINSTALLERVERSION "3.0.5.0"
+!define PORTABLEAPPS.COMFORMATVERSION "3.0.5"
+
+!if ${__FILE__} == "PortableApps.comInstallerPlugin.nsi"
+	!include PortableApps.comInstallerPluginConfig.nsh
+	!define PLUGININSTALLER
+!else
+	!include PortableApps.comInstallerConfig.nsh
+!endif
+
+!define MAINSECTIONIDX 0
+!ifdef MAINSECTIONTITLE
+	!define OPTIONALSECTIONIDX 1
+!endif
+
+;=== Program Details
+Name "${PORTABLEAPPNAME}" "${PORTABLEAPPNAMEDOUBLEDAMPERSANDS}"
+OutFile "..\..\..\${FILENAME}.paf.exe"
+!ifdef COMMONFILESPLUGIN
+	InstallDir "\CommonFiles\${APPID}"
+!else
+	InstallDir "\${APPID}"
+!endif
+Caption "${PORTABLEAPPNAME} | PortableApps.com Installer"
+VIProductVersion "${VERSION}"
+VIAddVersionKey ProductName "${PORTABLEAPPNAME}"
+VIAddVersionKey Comments "${INSTALLERCOMMENTS}"
+VIAddVersionKey CompanyName "PortableApps.com"
+VIAddVersionKey LegalCopyright "PortableApps.com Installer Copyright 2007-2012 PortableApps.com."
+VIAddVersionKey FileDescription "${PORTABLEAPPNAME}"
+VIAddVersionKey FileVersion "${VERSION}"
+VIAddVersionKey ProductVersion "${VERSION}"
+VIAddVersionKey InternalName "${PORTABLEAPPNAME}"
+VIAddVersionKey LegalTrademarks "${INSTALLERADDITIONALTRADEMARKS}PortableApps.com is a registered trademark of Rare Ideas, LLC."
+VIAddVersionKey OriginalFilename "${FILENAME}.paf.exe"
+VIAddVersionKey PortableApps.comInstallerVersion "${PORTABLEAPPSINSTALLERVERSION}"
+VIAddVersionKey PortableApps.comFormatVersion "${PORTABLEAPPS.COMFORMATVERSION}"
+VIAddVersionKey PortableApps.comAppID "${APPID}"
+!ifdef DownloadURL ;advertise the needed bits to the PA.c Updater
+	VIAddVersionKey PortableApps.comDownloadURL "${DownloadURL}"
+	VIAddVersionKey PortableApps.comDownloadName "${DownloadName}"
+	VIAddVersionKey PortableApps.comDownloadFileName "${DownloadFileName}"
+	VIAddVersionKey PortableApps.comDownloadMD5 "${DownloadMD5}"
+!endif
+
+;=== Runtime Switches
+SetCompress Auto
+SetCompressor /SOLID lzma
+SetCompressorDictSize 32
+SetDatablockOptimize On
+CRCCheck on
+AutoCloseWindow True
+RequestExecutionLevel user
+AllowRootDirInstall true
+
+;=== Include
+!include MUI.nsh
+!include FileFunc.nsh
+!include LogicLib.nsh
+!ifdef PRESERVEFILE1
+	!include PortableApps.comInstallerMoveFiles.nsh
+!endif
+!ifdef COPYLOCALFILES
+	!include Registry.nsh
+!endif
+!include TextFunc.nsh
+!include WordFunc.nsh
+!include PortableApps.comInstallerDumpLogToFile.nsh
+!include PortableApps.comInstallerTBProgress.nsh
+
+;=== Program Icon
+Icon "PortableApps.comInstaller.ico"
+!define MUI_ICON "PortableApps.comInstaller.ico"
+!define MUI_UNICON "PortableApps.comInstaller.ico"
+!define MUI_HEADERIMAGE
+!define MUI_HEADERIMAGE_BITMAP "PortableApps.comInstallerHeader.bmp"
+!define MUI_HEADERIMAGE_BITMAP_RTL "PortableApps.comInstallerHeaderRTL.bmp"
+!define MUI_HEADERIMAGE_RIGHT
+
+;=== Icon & Stye ===
+BrandingText "PortableApps.com®"
+
+;=== Pages
+!ifdef COPYLOCALFILES
+	!define MUI_CUSTOMFUNCTION_ABORT CustomAbortFunction
+!endif
+!define MUI_LANGDLL_WINDOWTITLE "${PORTABLEAPPNAME}"
+!define MUI_LANGDLL_INFO "Please select a language for the installer."
+!define MUI_WELCOMEFINISHPAGE_BITMAP "PortableApps.comInstaller.bmp"
+!ifdef PLUGINNAME
+	!define MUI_WELCOMEPAGE_TITLE "${PORTABLEAPPNAMEDOUBLEDAMPERSANDS}"
+!else
+	!define MUI_WELCOMEPAGE_TITLE "${PORTABLEAPPNAMEDOUBLEDAMPERSANDS}"
+!endif
+!define MUI_WELCOMEPAGE_TEXT "$(welcome)"
+!define MUI_PAGE_CUSTOMFUNCTION_PRE PreWelcome
+!define MUI_COMPONENTSPAGE_SMALLDESC
+!insertmacro MUI_PAGE_WELCOME
+!ifdef LICENSEAGREEMENT
+	;!define MUI_LICENSEPAGE_CHECKBOX
+	!define MUI_PAGE_CUSTOMFUNCTION_PRE PreLicense
+	!define MUI_PAGE_CUSTOMFUNCTION_SHOW ShowLicense
+	!define MUI_PAGE_CUSTOMFUNCTION_LEAVE LeaveLicense
+	!insertmacro MUI_PAGE_LICENSE "..\..\App\AppInfo\${LICENSEAGREEMENT}"
+!endif
+!ifdef MAINSECTIONTITLE
+	!define MUI_PAGE_CUSTOMFUNCTION_PRE PreComponents
+	!insertmacro MUI_PAGE_COMPONENTS
+!endif
+!define MUI_DIRECTORYPAGE_VERIFYONLEAVE
+!define MUI_PAGE_CUSTOMFUNCTION_PRE PreDirectory
+!define MUI_PAGE_CUSTOMFUNCTION_LEAVE LeaveDirectory
+!insertmacro MUI_PAGE_DIRECTORY
+!define MUI_PAGE_CUSTOMFUNCTION_SHOW ShowInstFiles
+!insertmacro MUI_PAGE_INSTFILES
+!define MUI_FINISHPAGE_TEXT "$(finish)"
+!define MUI_PAGE_CUSTOMFUNCTION_PRE PreFinish
+!define MUI_FINISHPAGE_TITLE_3LINES
+!define MUI_FINISHPAGE_CANCEL_ENABLED
+!ifndef PLUGINNAME
+	!define MUI_FINISHPAGE_RUN_NOTCHECKED
+	!define MUI_FINISHPAGE_RUN "$INSTDIR\${FINISHPAGERUN}"
+!endif
+!insertmacro MUI_PAGE_FINISH
+
+;=== Languages
+!ifndef INSTALLERMULTILINGUAL
+	!insertmacro MUI_LANGUAGE "${INSTALLERLANGUAGE}"
+	!include PortableApps.comInstallerLanguages\${INSTALLERLANGUAGE}.nsh
+!else
+	!tempfile LangAutoDetectFile
+	!macro IncludeLang _LANG_NAME
+		; define and filename are all uppercase but both case insensitive
+		!ifdef USES_${_LANG_NAME}
+			!insertmacro MUI_LANGUAGE "${_LANG_NAME}"
+			!include PortableApps.comInstallerLanguages\${_LANG_NAME}.nsh
+			!appendfile "${LangAutoDetectFile}" "${Case} ${LANG_${_LANG_NAME}}$\n"
+		!endif
+	!macroend
+	!define IncludeLang "!insertmacro IncludeLang"
+
+	${IncludeLang} English
+	${IncludeLang} EnglishGB
+	${IncludeLang} Afrikaans
+	${IncludeLang} Albanian
+	${IncludeLang} Arabic
+	${IncludeLang} Armenian
+	${IncludeLang} Basque
+	${IncludeLang} Belarusian
+	${IncludeLang} Bosnian
+	${IncludeLang} Breton
+	${IncludeLang} Bulgarian
+	${IncludeLang} Catalan
+	${IncludeLang} Cibemba
+	${IncludeLang} Croatian
+	${IncludeLang} Czech
+	${IncludeLang} Danish
+	${IncludeLang} Dutch
+	${IncludeLang} Efik
+	${IncludeLang} Esperanto
+	${IncludeLang} Estonian
+	${IncludeLang} Farsi
+	${IncludeLang} Finnish
+	${IncludeLang} French
+	${IncludeLang} Galician
+	${IncludeLang} Georgian
+	${IncludeLang} German
+	${IncludeLang} Greek
+	${IncludeLang} Hebrew
+	${IncludeLang} Hungarian
+	${IncludeLang} Icelandic
+	${IncludeLang} Igbo
+	${IncludeLang} Indonesian
+	${IncludeLang} Irish
+	${IncludeLang} Italian
+	${IncludeLang} Japanese
+	${IncludeLang} Khmer
+	${IncludeLang} Korean
+	${IncludeLang} Kurdish
+	${IncludeLang} Latvian
+	${IncludeLang} Lithuanian
+	${IncludeLang} Luxembourgish
+	${IncludeLang} Macedonian
+	${IncludeLang} Malagasy
+	${IncludeLang} Malay
+	${IncludeLang} Mongolian
+	${IncludeLang} Norwegian
+	${IncludeLang} NorwegianNynorsk
+	${IncludeLang} Pashto
+	${IncludeLang} Polish
+	${IncludeLang} Portuguese
+	${IncludeLang} PortugueseBR
+	${IncludeLang} Romanian
+	${IncludeLang} Russian
+	${IncludeLang} Serbian
+	${IncludeLang} SerbianLatin
+	${IncludeLang} SimpChinese
+	${IncludeLang} Slovak
+	${IncludeLang} Slovenian
+	${IncludeLang} Spanish
+	${IncludeLang} SpanishInternational
+	${IncludeLang} Swahili
+	${IncludeLang} Swedish
+	${IncludeLang} Thai
+	${IncludeLang} TradChinese
+	${IncludeLang} Turkish
+	${IncludeLang} Ukrainian
+	${IncludeLang} Uzbek
+	${IncludeLang} Valencia
+	${IncludeLang} Vietnamese
+	${IncludeLang} Welsh
+	${IncludeLang} Yoruba
+
+	!insertmacro MUI_RESERVEFILE_LANGDLL
+!endif
+
+;=== Macros
+!macro !insertmacro1-10 _m
+!insertmacro ${_m} 1
+!insertmacro ${_m} 2
+!insertmacro ${_m} 3
+!insertmacro ${_m} 4
+!insertmacro ${_m} 5
+!insertmacro ${_m} 6
+!insertmacro ${_m} 7
+!insertmacro ${_m} 8
+!insertmacro ${_m} 9
+!insertmacro ${_m} 10
+!macroend
+!define !insertmacro1-10 "!insertmacro !insertmacro1-10"
+
+;=== Variables
+Var FOUNDPORTABLEAPPSPATH
+!ifdef MAINSECTIONTITLE
+	Var OPTIONAL1DONE
+!endif
+Var AUTOMATEDINSTALL
+Var AUTOCLOSE
+Var SILENTLANGUAGEMODE
+Var HIDEINSTALLER
+Var MINIMIZEINSTALLER
+!ifdef LICENSEAGREEMENT
+	Var EULAVERSIONMATCH
+!endif
+!ifdef COPYLOCALFILES
+	Var CopyLocalFilesFrom
+	Var CopyLocalFilesTo
+	Var MISSINGFILEORPATH
+!endif
+!ifdef DOWNLOADURL
+	Var MD5MISMATCH
+	Var DOWNLOADRESULT
+	Var DOWNLOADEDFILE
+	Var DOWNLOADALREADYEXISTED
+	Var SECONDDOWNLOADATTEMPT
+!endif
+Var INTERNALEULAVERSION
+Var InstallingStatusString
+Var bolAppUpgrade
+Var bolLogFile
+
+;=== Custom Code
+!ifdef USESCUSTOMCODE
+	!if ${__FILE__} == "PortableApps.comInstallerPlugin.nsi"
+		!include PortableApps.comInstallerPluginCustom.nsh
+	!else
+		!include PortableApps.comInstallerCustom.nsh
+	!endif
+!endif
+
+!ifdef INSTALLERMULTILINGUAL
+	!macro CaseLang _LANG_NAME _LANG_ID
+		!ifdef USES_${_LANG_NAME}
+			${Case} ${_LANG_ID}
+		!endif
+	!macroend
+	!define CaseLang "!insertmacro CaseLang"
+!endif
+
+Function .onInit
+	SetSilent normal
+
+	!ifdef DownloadURL
+	StrCpy $R0 $EXEFILE "" -15
+	${If} $R0 != "_online.paf.exe"
+	${AndIf} $R0 != "line.paf[1].exe" ;Handle IE's renaming of files when run directly from a download
+	${AndIf} $R0 != "line.paf[2].exe"
+	${AndIf} $R0 != "line.paf[3].exe"
+	${AndIf} $R0 != "line.paf[4].exe"
+	${AndIf} $R0 != "line.paf[5].exe"
+	${AndIf} $R0 != "line.paf[6].exe"
+	${AndIf} $R0 != "line.paf[7].exe"
+	${AndIf} $R0 != "line.paf[8].exe"
+	${AndIf} $R0 != "line.paf[9].exe"
+		MessageBox MB_OK|MB_ICONSTOP `PortableApps.com Installers that download files must end with "_online.paf.exe".  This is to ensure that users always know that an installer downloads files before it is run.  Please rename the file to end in _online.paf.exe before running.`
+		Abort
+	${EndIf}
+	!endif
+
+	InitPluginsDir
+
+	!ifdef INSTALLERMULTILINGUAL
+		ReadEnvStr $0 "PortableApps.comLocaleID"
+		${Switch} $0
+			; Use the Case statements formed earlier.
+			!include "${LangAutoDetectFile}"
+			!delfile "${LangAutoDetectFile}"
+			!undef LangAutoDetectFile
+				StrCpy $LANGUAGE $0
+				${Break}
+			${Default}
+				!insertmacro MUI_LANGDLL_DISPLAY
+		${EndSwitch}
+	!endif
+
+	;=== Check for logging mode
+	${GetOptions} $CMDLINE "/LOG=" $0
+	
+	${IfNot} ${Errors}
+	${AndIf} $0 == "true"
+		StrCpy $bolLogFile true
+	${Else}
+		ClearErrors
+	${EndIf}
+	
+	;=== Check for a specified installation directory
+	${GetOptions} $CMDLINE "/DESTINATION=" $0
+
+	${IfNot} ${Errors}
+		!ifdef COMMONFILESPLUGIN
+			StrCpy $INSTDIR "$0CommonFiles\${APPID}"
+		!else
+			${GetOptions} $CMDLINE "/COPYNUMBER=" $1
+			${IfNot} ${Errors}
+				StrCpy $INSTDIR "$0${APPID}_Copy_$1"
+			${Else}
+				StrCpy $INSTDIR "$0${APPID}"
+			${EndIf}
+		!endif
+
+		!ifdef LICENSEAGREEMENT
+			!ifndef EULAVERSION
+				StrCpy $INTERNALEULAVERSION "1"
+			!else
+				StrCpy $INTERNALEULAVERSION ${EULAVERSION}
+			!endif
+			${If} ${FileExists} "$INSTDIR\Data\PortableApps.comInstaller\license.ini"
+				ReadINIStr $0 "$INSTDIR\Data\PortableApps.comInstaller\license.ini" "PortableApps.comInstaller" "EULAVersion"
+				ClearErrors
+				${If} $0 == $INTERNALEULAVERSION
+					StrCpy $EULAVERSIONMATCH "true"
+				${EndIf}
+			${EndIf}
+		!endif
+
+		;=== Check for PortableApps.com Platform
+		${GetParent} $INSTDIR $0
+		!ifdef COMMONFILESPLUGIN
+			${GetParent} $0 $0
+		!endif
+
+		;=== Check that it exists at the right location
+		DetailPrint '$(checkforplatform)'
+
+		${If} ${FileExists} `$0\PortableApps.com\PortableAppsPlatform.exe`
+			;=== Check that it's the real deal
+			MoreInfo::GetProductName `$0\PortableApps.com\PortableAppsPlatform.exe`
+			Pop $1
+			${If} $1 == "PortableApps.com Platform"
+				MoreInfo::GetCompanyName `$0\PortableApps.com\PortableAppsPlatform.exe`
+				Pop $1
+				${If} $1 == "PortableApps.com"
+					;=== Check that it's running
+					FindProcDLL::FindProc "PortableAppsPlatform.exe"
+					${If} $R0 == 1
+						;=== Do a partially automated install
+						StrCpy $AUTOMATEDINSTALL "true"
+
+						ClearErrors
+						${GetOptions} $CMDLINE "/AUTOCLOSE=" $R0
+						${IfNot} ${Errors}
+						${AndIf} $R0 == "true"
+							StrCpy $AUTOCLOSE "true"
+						${EndIf}
+
+						ClearErrors
+						${GetOptions} $CMDLINE "/HIDEINSTALLER=" $R0
+						${IfNot} ${Errors}
+						${AndIf} $R0 == "true"
+							StrCpy $HIDEINSTALLER "true"
+						${EndIf}
+
+						ClearErrors
+						${GetOptions} $CMDLINE "/MINIMIZEINSTALLER=" $R0
+						${IfNot} ${Errors}
+						${AndIf} $R0 == "true"
+							StrCpy $MINIMIZEINSTALLER "true"
+						${EndIf}
+
+						ClearErrors
+						${GetOptions} $CMDLINE "/SILENT=" $R0
+						${IfNot} ${Errors}
+						${AndIf} $R0 == "true"
+							;Duplicate of the size calculation code, to be functionalized later
+							SectionGetSize ${MAINSECTIONIDX} $1 ;=== Space Required for App
+							!ifdef MAINSECTIONTITLE
+								SectionGetFlags ${OPTIONALSECTIONIDX} $9
+								IntOp $9 $9 & ${SF_SELECTED}
+								${If} $9 >= ${SF_SELECTED}
+									SectionGetSize ${OPTIONALSECTIONIDX} $2 ;=== Space Required for App
+									IntOp $1 $1 + $2
+								${EndIf}
+							!endif
+							${GetRoot} $INSTDIR $2
+							${DriveSpace} `$2\` "/D=F /S=M" $3 ;=== Space Free on Device
+							
+							IntOp $1 $1 / 1024
+
+							${If} $3 <= $1
+								IntOp $1 $1 * 1024
+								IntOp $3 $3 * 1024
+								!ifndef PLUGININSTALLER ;=== If not a plugin installer, add the current install size to free space
+									${If} ${FileExists} $INSTDIR
+										${GetSize} `$INSTDIR` "/M=*.* /S=0K /G=0" $4 $5 $6 ;=== Current installation size
+										IntOp $3 $3 + $4 ;=== Space Free + Current Root Install Size
+										${GetSize} `$INSTDIR\App` "/M=*.* /S=0K /G=1" $4 $5 $6 ;=== Current installation size
+										IntOp $3 $3 + $4 ;=== Space Free + Current App Install Size
+										${GetSize} `$INSTDIR\Other` "/M=*.* /S=0K /G=1" $4 $5 $6 ;=== Current installation size
+										IntOp $3 $3 + $4 ;=== Space Free + Current Other Install Size
+
+										${If} `${ADDONSDIRECTORYPRESERVE}` != "NONE"
+										${AndIf} ${FileExists} `$INSTDIR\${ADDONSDIRECTORYPRESERVE}`
+												${GetSize} `$INSTDIR\${ADDONSDIRECTORYPRESERVE}` "/M=*.* /S=0K /G=1" $4 $5 $6 ;=== Size of Data directory
+												IntOp $3 $3 - $4 ;=== Remove the plugins directory from the free space calculation
+										${EndIf}
+									${EndIf}
+								!else
+									!ifdef COMMONFILESPLUGIN ;Duplicate code for now, to do above for CommonFiles as well
+										${If} ${FileExists} $INSTDIR
+											${GetSize} `$INSTDIR` "/M=*.* /S=0K /G=1" $4 $5 $6 ;=== Current installation size
+											IntOp $3 $3 + $4 ;=== Space Free + Current Install Size
+										${EndIf}
+									!endif
+								!endif
+								${If} $3 <= $1
+									MessageBox MB_OK|MB_ICONEXCLAMATION $(notenoughspace)
+									Abort
+							${EndIf}
+							${EndIf}
+
+							!ifdef LICENSEAGREEMENT
+								${If} $EULAVERSIONMATCH == "true"
+									SetSilent silent
+								${EndIf}
+							!else
+								SetSilent silent
+							!endif
+						${EndIf}
+
+						ClearErrors
+						${GetOptions} $CMDLINE "/SILENTLANGUAGEMODE=" $R0
+						${IfNot} ${Errors}
+							${If} $R0 == "auto"
+							${OrIf} $R0 == "never"
+							${OrIf} $R0 == "always"
+								StrCpy $SILENTLANGUAGEMODE $R0
+							${Else}
+								StrCpy $SILENTLANGUAGEMODE "auto"
+							${EndIf}
+						${Else}
+							StrCpy $SILENTLANGUAGEMODE "auto"
+						${EndIf}
+
+					${EndIf}
+				${EndIf}
+			${EndIf}
+		${EndIf}
+	${Else}
+		ClearErrors
+		;=== Check legacy location
+		${GetOptions} $CMDLINE "-o" $R0
+		${IfNot} ${Errors}
+			!ifdef COMMONFILESPLUGIN
+				StrCpy $INSTDIR "$R0CommonFiles\${APPID}"
+			!else
+				StrCpy $INSTDIR "$R0${APPID}"
+			!endif
+		${Else}
+			;=== No installation directory found
+			ClearErrors
+			${If} ${FileExists}	"$PROFILE\PortableApps\*.*"
+				StrCpy $FOUNDPORTABLEAPPSPATH "$Profile\PortableApps"
+			${Else}
+				${GetDrives} "HDD+FDD" GetDrivesCallBack
+			${EndIf}
+			${If} $FOUNDPORTABLEAPPSPATH != ""
+				!ifdef COMMONFILESPLUGIN
+					StrCpy $INSTDIR "$FOUNDPORTABLEAPPSPATH\CommonFiles\${APPID}"
+				!else
+					StrCpy $INSTDIR "$FOUNDPORTABLEAPPSPATH\${APPID}"
+				!endif
+			${Else}
+				!ifdef COMMONFILESPLUGIN
+					StrCpy $INSTDIR "$EXEDIR\CommonFiles\${APPID}"
+				!else
+					StrCpy $INSTDIR "$EXEDIR\${APPID}"
+				!endif
+			${EndIf}
+		${EndIf}
+	${EndIf}
+
+	!ifdef MAINSECTIONTITLE
+		!ifdef OPTIONALSECTIONPRESELECTEDIFNONENGLISHINSTALL
+			;=== If it's not English, select the optional component (languages) by default
+			${IfThen} $LANGUAGE != 1033 ${|} SectionSetFlags 1 ${OPTIONALSECTIONIDX} ${|}
+		!endif
+		${If} ${Silent}
+			${If} "${OPTIONALSECTIONINSTALLEDWHENSILENT}" == "true"
+				SectionSetFlags 1 ${OPTIONALSECTIONIDX}
+			${ElseIf} "${OptionalSectionSelectedInstallType}" == "Multilingual"
+				${If} $SILENTLANGUAGEMODE != "never"
+					${If} $SILENTLANGUAGEMODE == "always"
+						SectionSetFlags 1 ${OPTIONALSECTIONIDX}
+					${Else}
+						${IfThen} $LANGUAGE != 1033 ${|} SectionSetFlags 1 ${OPTIONALSECTIONIDX} ${|}
+					${EndIf}
+				${EndIf}
+			${EndIf}
+		${EndIf}
+
+	!endif
+
+	!ifdef COPYLOCALFILES
+		StrCpy $CopyLocalFilesFrom ""
+
+		${If} "${CopyFromRegPath}" != ""
+			${registry::Read} "${CopyFromRegPath}" "${CopyFromRegKey}" $R0 $R1
+			${If} $R0 != ""
+				;Strip trailing slash if there
+				StrCpy $1 $R0 "" -1
+				${If} $1 == "\"
+					StrCpy $R0 $R0 -1
+				${EndIf}
+
+				;Go up directories if needed
+				${If} "${CopyFromRegRemoveDirectories}" != ""
+					StrCpy $1 1
+					${Do}
+						${GetParent} $R0 $R0
+						IntOp $1 $1 + 1
+					${LoopUntil} $1 > "${CopyFromRegRemoveDirectories}"
+				${EndIf}
+
+				;Check for existence
+				${If} ${FileExists} "$R0\*.*"
+					StrCpy $CopyLocalFilesFrom $R0
+				${EndIf}
+			${EndIf}
+		${EndIf}
+
+		;Fallback to direct entry
+		${If} $CopyLocalFilesFrom == ""
+		${AndIf} "${CopyFromDirectory}" != ""
+			StrCpy $CopyLocalFilesFrom "${CopyFromDirectory}"
+			${WordReplace} $CopyLocalFilesFrom "%PROGRAMFILES%" $PROGRAMFILES + $CopyLocalFilesFrom
+			${WordReplace} $CopyLocalFilesFrom "%PROGRAMFILES32%" $PROGRAMFILES32 + $CopyLocalFilesFrom
+			${WordReplace} $CopyLocalFilesFrom "%PROGRAMFILES64%" $PROGRAMFILES64 + $CopyLocalFilesFrom
+			${WordReplace} $CopyLocalFilesFrom "%COMMONFILES%" $COMMONFILES + $CopyLocalFilesFrom
+			${WordReplace} $CopyLocalFilesFrom "%COMMONFILES32%" $COMMONFILES32 + $CopyLocalFilesFrom
+			${WordReplace} $CopyLocalFilesFrom "%COMMONFILES64%" $COMMONFILES64 + $CopyLocalFilesFrom
+			${WordReplace} $CopyLocalFilesFrom "%DESKTOP%" $DESKTOP + $CopyLocalFilesFrom
+			${WordReplace} $CopyLocalFilesFrom "%WINDIR%" $WINDIR + $CopyLocalFilesFrom
+			${WordReplace} $CopyLocalFilesFrom "%SYSDIR%" $SYSDIR + $CopyLocalFilesFrom
+			${WordReplace} $CopyLocalFilesFrom "%APPDATA%" $APPDATA + $CopyLocalFilesFrom
+			${WordReplace} $CopyLocalFilesFrom "%LOCALAPPDATA%" $LOCALAPPDATA + $CopyLocalFilesFrom
+			${WordReplace} $CopyLocalFilesFrom "%TEMP%" $TEMP + $CopyLocalFilesFrom
+		${EndIf}
+		${If} ${FileExists} "$CopyLocalFilesFrom\*.*"
+			SectionGetSize ${MAINSECTIONIDX} $0
+			${GetSize} $CopyLocalFilesFrom "/M=*.* /S=0K /G=1" $1 $2 $3
+			IntOp $0 $0 + $1
+			SectionSetSize ${MAINSECTIONIDX} $0
+		${EndIf}
+	!endif
+	!ifdef AdditionalInstallSize
+		SectionGetSize ${MAINSECTIONIDX} $0
+		IntOp $0 $0 + ${AdditionalInstallSize}
+		SectionSetSize ${MAINSECTIONIDX} $0
+	!endif
+
+	${If} "${CHECKRUNNING}" != "NONE"
+		;=== Check if app is running?
+		RunningTryAgain:
+		FindProcDLL::FindProc "${CHECKRUNNING}"
+		${If} $R0 == 1
+			MessageBox MB_OKCANCEL|MB_ICONINFORMATION $(runwarning) IDOK RunningTryAgain IDCANCEL RunningCancel
+			
+			RunningCancel:
+				Abort
+		${EndIf}
+	${EndIf}
+FunctionEnd
+
+Function PreWelcome
+	${IfThen} $AUTOMATEDINSTALL == "true" ${|} Abort ${|}
+FunctionEnd
+
+!ifdef LICENSEAGREEMENT
+Function PreLicense
+	${If} $AUTOMATEDINSTALL == "true"
+	${AndIf} $EULAVERSIONMATCH == "true"
+		Abort
+	${EndIf}
+
+	!ifndef EULAVERSION
+		StrCpy $INTERNALEULAVERSION "1"
+	!else
+		StrCpy $INTERNALEULAVERSION "${EULAVERSION}"
+	!endif
+	${If} ${FileExists} "$INSTDIR\Data\PortableApps.comInstaller\license.ini"
+		ReadINIStr $0 "$INSTDIR\Data\PortableApps.comInstaller\license.ini" "PortableApps.comInstaller" "EULAVersion"
+		ClearErrors
+		${If} $0 == $INTERNALEULAVERSION
+		${AndIf} $AUTOMATEDINSTALL == "true"
+			Abort
+		${EndIf}
+	${EndIf}
+FunctionEnd
+Function ShowLicense
+	${If} $AUTOMATEDINSTALL == "true"
+		${TBProgress} 20
+		${TBProgress_State} Paused
+	${EndIf}
+FunctionEnd
+Function LeaveLicense
+	${If} $AUTOMATEDINSTALL == "true"
+		${TBProgress_State} NoProgress
+	${EndIf}
+FunctionEnd
+!endif
+
+Function ShowInstFiles
+	w7tbp::Start
+FunctionEnd
+
+!ifdef MAINSECTIONTITLE
+	Function PreComponents
+		${If} $AUTOCLOSE != "true"
+		${OrIfNot} ${FileExists} "$INSTDIR\App\AppInfo\appinfo.ini"
+			Return
+		${EndIf}
+
+		ReadINIStr $0 "$INSTDIR\App\AppInfo\appinfo.ini" "Details" "InstallType"
+		ClearErrors
+		${If} $0 == "${OPTIONALSECTIONSELECTEDINSTALLTYPE}"
+			SectionSetFlags 1 ${OPTIONALSECTIONIDX}
+			Abort
+		${EndIf}
+
+		;=== Check not selected
+		${If} $0 == "${OPTIONALSECTIONNOTSELECTEDINSTALLTYPE}"
+			SectionSetFlags 0 ${OPTIONALSECTIONIDX}
+			Abort
+		${EndIf}
+	FunctionEnd
+!endif
+
+Function PreDirectory
+	${IfThen} $AUTOMATEDINSTALL != "true" ${|} Return ${|}
+
+	SectionGetSize ${MAINSECTIONIDX} $1 ;=== Space Required for App
+	!ifdef MAINSECTIONTITLE
+		SectionGetFlags ${OPTIONALSECTIONIDX} $9
+		IntOp $9 $9 & ${SF_SELECTED}
+		${If} $9 >= ${SF_SELECTED}
+			SectionGetSize ${OPTIONALSECTIONIDX} $2 ;=== Space Required for App
+			IntOp $1 $1 + $2
+		${EndIf}
+	!endif
+	${GetRoot} $INSTDIR $2
+	${DriveSpace} `$2\` "/D=F /S=M" $3 ;=== Space Free on Device
+							
+	IntOp $1 $1 / 1024
+
+	${If} $3 <= $1
+		IntOp $1 $1 * 1024
+		IntOp $3 $3 * 1024
+
+		!ifndef PLUGININSTALLER ;=== If not a plugin installer, add the current install size to free space
+			${If} ${FileExists} $INSTDIR
+				${GetSize} $INSTDIR "/M=*.* /S=0K /G=1" $4 $5 $6 ;=== Current installation size
+				IntOp $3 $3 + $4 ;=== Space Free + Current Install Size
+
+				${If} ${FileExists} `$INSTDIR\Data`
+					${GetSize} `$INSTDIR\Data` "/M=*.* /S=0K /G=1" $4 $5 $6 ;=== Size of Data directory
+					IntOp $3 $3 - $4 ;=== Remove the data directory from the free space calculation
+				${EndIf}
+
+				${If} `${ADDONSDIRECTORYPRESERVE}` != "NONE"
+				${AndIf} ${FileExists} `$INSTDIR\${ADDONSDIRECTORYPRESERVE}`
+						${GetSize} `$INSTDIR\${ADDONSDIRECTORYPRESERVE}` "/M=*.* /S=0K /G=1" $4 $5 $6 ;=== Size of Data directory
+						IntOp $3 $3 - $4 ;=== Remove the plugins directory from the free space calculation
+				${EndIf}
+			${EndIf}
+		!else
+			!ifdef COMMONFILESPLUGIN ;Duplicate code for now, to do above for CommonFiles as well
+				${If} ${FileExists} $INSTDIR
+					${GetSize} `$INSTDIR` "/M=*.* /S=0K /G=1" $4 $5 $6 ;=== Current installation size
+					IntOp $3 $3 + $4 ;=== Space Free + Current Install Size
+				${EndIf}
+			!endif
+		!endif
+
+		${If} $3 <= $1
+			MessageBox MB_OK|MB_ICONEXCLAMATION "$(notenoughspace)"
+			Return
+		${EndIf}
+	${EndIf}
+
+	;=== Check if app is running?
+	${IfThen} "${CHECKRUNNING}" == "NONE" ${|} Abort ${|}
+	FindProcDLL::FindProc "${CHECKRUNNING}"
+	${IfThen} $R0 != "1" ${|} Abort ${|}
+	MessageBox MB_OK|MB_ICONINFORMATION $(runwarning)
+FunctionEnd
+
+Function LeaveDirectory
+	GetInstDirError $0
+
+	;=== Does it already exist? (upgrade)
+	${If} ${FileExists} $INSTDIR
+	${AndIf} "${CHECKRUNNING}" != "NONE"
+		;=== Check if app is running?
+		FindProcDLL::FindProc "${CHECKRUNNING}"
+		${If} $R0 = 1
+			MessageBox MB_OK|MB_ICONINFORMATION $(runwarning)
+			Abort
+		${EndIf}
+	${EndIf}
+
+	; 0 is valid, enough space, all fine
+	${Select} $0
+		${Case} 1
+			MessageBox MB_OK|MB_ICONINFORMATION $(invaliddirectory)
+			Abort
+
+		${Case} 2
+			${IfNot} ${FileExists} $INSTDIR ;=== Is upgrade
+				MessageBox MB_OK|MB_ICONEXCLAMATION $(notenoughspace)
+				Abort
+			${EndIf}
+
+			SectionGetSize ${MAINSECTIONIDX} $1 ;=== Space Required for App
+			!ifdef MAINSECTIONTITLE
+					SectionGetFlags ${OPTIONALSECTIONIDX} $9
+					IntOp $9 $9 & ${SF_SELECTED}
+					${If} $9 >= ${SF_SELECTED}
+						SectionGetSize ${OPTIONALSECTIONIDX} $2 ;=== Space Required for App
+						IntOp $1 $1 + $2
+					${EndIf}
+			!endif
+			${GetRoot} $INSTDIR $2
+			${DriveSpace} `$2\` "/D=F /S=K" $3 ;=== Space Free on Device
+
+			
+			!ifndef PLUGININSTALLER ;=== If not a plugin installer, add the current install size to free space
+				${GetSize} `$INSTDIR` "/M=*.* /S=0K /G=0" $4 $5 $6 ;=== Current installation size
+				IntOp $3 $3 + $4 ;=== Space Free + Current Root Install Size
+				${GetSize} `$INSTDIR\App` "/M=*.* /S=0K /G=1" $4 $5 $6 ;=== Current installation size
+				IntOp $3 $3 + $4 ;=== Space Free + Current App Install Size
+				${GetSize} `$INSTDIR\Other` "/M=*.* /S=0K /G=1" $4 $5 $6 ;=== Current installation size
+				IntOp $3 $3 + $4 ;=== Space Free + Current Other Install Size
+
+				${If} `${ADDONSDIRECTORYPRESERVE}` != "NONE"
+				${AndIf} ${FileExists} `$INSTDIR\${ADDONSDIRECTORYPRESERVE}`
+						${GetSize} `$INSTDIR\${ADDONSDIRECTORYPRESERVE}` "/M=*.* /S=0K /G=1" $4 $5 $6 ;=== Size of Data directory
+						IntOp $3 $3 - $4 ;=== Remove the plugins directory from the free space calculation
+				${EndIf}
+			!else
+				!ifdef COMMONFILESPLUGIN ;Duplicate code for now, to do above for CommonFiles as well
+					${GetSize} `$INSTDIR` "/M=*.* /S=0K /G=1" $4 $5 $6 ;=== Current installation size
+					IntOp $3 $3 + $4 ;=== Space Free + Current Install Size
+				!endif
+			!endif
+
+			${If} $3 <= $1
+				MessageBox MB_OK|MB_ICONEXCLAMATION "$(notenoughspace)"
+				Abort
+			${EndIf}
+	${EndSelect}
+	
+	;Check for Program Files
+	ReadEnvStr $0 IPromiseNotToComplainWhenPortableAppsDontWorkRightInProgramFiles
+	${If} $0 != "I understand that this may not work and that I can not ask for help with any of my apps when operating in this fashion."
+		${WordFind} "$INSTDIR\" "$PROGRAMFILES\" "*" $R0
+		${If} $R0 > 0
+			MessageBox MB_OK|MB_ICONINFORMATION "$(invaliddirectory) [$PROGRAMFILES or sub-directories]"
+			Abort
+		${EndIf}
+		${WordFind} "$INSTDIR\" "$PROGRAMFILES64\" "*" $R0
+		${If} $R0 > 0
+			MessageBox MB_OK|MB_ICONINFORMATION "$(invaliddirectory) [$PROGRAMFILES64 or sub-directories]"
+			Abort
+		${EndIf}
+	${EndIf}
+FunctionEnd
+
+Function PreFinish
+	${IfThen} $AUTOCLOSE == "true" ${|} Abort ${|}
+FunctionEnd
+
+Function GetDrivesCallBack
+	;=== Skip usual floppy letters
+	${If} $8 == "FDD"
+		${If} $9 == "A:\"
+		${OrIf} $9 == "B:\"
+			Push $0
+			Return
+		${EndIf}
+	${EndIf}
+
+	${If} ${FileExists} $9PortableApps
+		StrCpy $FOUNDPORTABLEAPPSPATH $9PortableApps
+	${EndIf}
+
+	Push $0
+FunctionEnd
+
+!ifdef MAINSECTIONTITLE
+	Section "${MAINSECTIONTITLE}"
+!else
+	Section "App Portable (required)"
+!endif
+
+	${If} $MINIMIZEINSTALLER == "true"
+		ShowWindow $HWNDPARENT ${SW_MINIMIZE}
+	${EndIf}
+	${If} $HIDEINSTALLER == "true"
+		ShowWindow $HWNDPARENT ${SW_HIDE}
+	${EndIf}
+
+	${If} ${FileExists} "$INSTDIR\*.*"
+		StrCpy $bolAppUpgrade true
+	${EndIf}
+
+	${If} $(installingstatus) != ""
+		StrCpy $InstallingStatusString "$(installingstatus)"
+	${Else}
+		StrCpy $InstallingStatusString "$(MUI_TEXT_INSTALLING_TITLE)"
+	${EndIf}
+
+	SectionIn RO
+	SetOutPath $INSTDIR
+
+	${If} $bolAppUpgrade == true
+		${If} $(prepareupgrade) == ""
+			DetailPrint $InstallingStatusString
+		${Else}
+			DetailPrint $(prepareupgrade)
+		${EndIf}
+	${Else}
+		DetailPrint $InstallingStatusString
+	${EndIf}
+	SetDetailsPrint ListOnly
+	
+	;=== Download Files
+!ifdef DownloadURL
+	${If} ${FileExists} `$EXEDIR\${DownloadFileName}`
+		!ifdef DownloadMD5
+			md5dll::GetMD5File "$EXEDIR\${DownloadFileName}"
+			Pop $R0
+			${If} $R0 == ${DownloadMD5}
+				StrCpy $DOWNLOADALREADYEXISTED "true"
+				StrCpy $DOWNLOADRESULT "OK"
+			${EndIf}
+		!else
+			StrCpy $DOWNLOADALREADYEXISTED "true"
+			StrCpy $DOWNLOADRESULT "OK"
+		!endif
+	${EndIf}
+	
+	${If} $DOWNLOADALREADYEXISTED == "true"
+		StrCpy $DOWNLOADEDFILE "$EXEDIR\${DownloadFileName}"
+	${Else}
+		DownloadTheFile:
+		CreateDirectory `$PLUGINSDIR\Downloaded`
+		SetDetailsPrint both
+		${If} $(downloading) != ""
+			DetailPrint $(downloading)
+		${Else}
+			DetailPrint "Downloading ${DownloadName}..."
+		${EndIf}
+
+		SetDetailsPrint none
+		Delete "$PLUGINSDIR\Downloaded\${DownloadName}"
+		Delete "$PLUGINSDIR\Downloaded\${DownloadFilename}"
+		
+		${If} $(downloading) != ""
+			inetc::get /CONNECTTIMEOUT 30 /NOCOOKIES /TRANSLATE $(downloading) $(downloadconnecting) $(downloadsecond) $(downloadminute) $(downloadhour) $(downloadplural) "%dkB (%d%%) of %dkB @ %d.%01dkB/s" " (%d %s%s $(downloadremaining))" "${DownloadURL}" "$PLUGINSDIR\Downloaded\${DownloadName}" /END
+		${Else}
+			inetc::get /CONNECTTIMEOUT 30 /NOCOOKIES /TRANSLATE "Downloading %s..." "Connecting..." second minute hour s "%dkB (%d%%) of %dkB @ %d.%01dkB/s" " (%d %s%s remaining)" "${DownloadURL}" "$PLUGINSDIR\Downloaded\${DownloadName}" /END
+		${EndIf}
+		SetDetailsPrint both
+		DetailPrint $InstallingStatusString
+		SetDetailsPrint ListOnly
+		Pop $DOWNLOADRESULT
+		${If} $DOWNLOADRESULT == "OK"
+			Rename "$PLUGINSDIR\Downloaded\${DownloadName}" "$PLUGINSDIR\Downloaded\${DownloadFilename}"
+			StrCpy $DOWNLOADEDFILE "$PLUGINSDIR\Downloaded\${DownloadFilename}"
+			!ifdef DownloadMD5
+				md5dll::GetMD5File "$DOWNLOADEDFILE"
+				Pop $R0
+				${If} $R0 != ${DownloadMD5}
+					${If} $SECONDDOWNLOADATTEMPT != true
+						StrCpy $SECONDDOWNLOADATTEMPT true
+						Goto DownloadTheFile
+					${EndIf}
+					StrCpy $MD5MISMATCH "true"
+
+					Delete "$INTERNET_CACHE\${DownloadFileName}"
+					Delete "$PLUGINSDIR\Downloaded\${DownloadFilename}"
+					SetDetailsPrint textonly
+					DetailPrint ""
+					SetDetailsPrint listonly
+					${TBProgress_State} Error
+					${If} $(downloadfilemismatch) != ""
+						MessageBox MB_OK|MB_ICONEXCLAMATION $(downloadfilemismatch)
+						DetailPrint $(downloadfilemismatch)
+					${Else}
+						MessageBox MB_OK|MB_ICONEXCLAMATION `The downloaded copy of ${DownloadName} is not valid and can not be installed.  Please try installing again.`
+						DetailPrint `The downloaded copy of ${DownloadName} is not valid and can not be installed.  Please try installing again.`
+					${EndIf}
+					${TBProgress_State} NoProgress
+					Abort
+				${EndIf}
+			!endif
+		${Else}
+			${If} $SECONDDOWNLOADATTEMPT != true
+			${AndIf} $DOWNLOADRESULT != "Cancelled"
+				StrCpy $SECONDDOWNLOADATTEMPT true
+				Goto DownloadTheFile
+			${EndIf}
+			Delete "$INTERNET_CACHE\${DownloadFileName}"
+			Delete "$PLUGINSDIR\Downloaded\${DownloadFilename}"
+			SetDetailsPrint textonly
+				DetailPrint ""
+			SetDetailsPrint listonly
+			${TBProgress_State} Error
+			${If} $(downloadfailed) != ""
+				MessageBox MB_OK|MB_ICONEXCLAMATION $(downloadfailed)
+				DetailPrint $(downloadfailed)
+			${Else}
+				MessageBox MB_OK|MB_ICONEXCLAMATION `The installer was unable to download ${DownloadName}.  The installation of the portable app will be incomplete without it. Please try installing again. (ERROR: $DOWNLOADRESULT)`
+				DetailPrint `The installer was unable to download ${DownloadName}.  The installation of the portable app will be incomplete without it. Please try installing again. (ERROR: $DOWNLOADRESULT)`
+			${EndIf}
+			${TBProgress_State} NoProgress
+			Abort
+		${EndIf}
+	${EndIf}
+!endif
+
+!ifdef MAINSECTIONTITLE
+	SectionGetFlags 1 $0
+	IntOp $0 $0 & ${SF_SELECTED}
+	${If} $0 != ${SF_SELECTED}
+		;=== BEGIN: OPTIONAL NOT SELECTED CLEANUP CODE ===
+		;This will be executed before install if the optional section (additional languages, etc) is not selected
+		!ifmacrodef CustomCodeOptionalCleanup
+			!insertmacro CustomCodeOptionalCleanup
+		!endif
+		;=== END: OPTIONAL NOT SELECTED CLEANUP CODE ===
+	${EndIf}
+!endif
+
+	;=== BEGIN: PRE-INSTALL CODE ===
+	;This will be executed before the app is installed.  Useful for cleaning up files no longer used.
+	!ifmacrodef CustomCodePreInstall
+		!insertmacro CustomCodePreInstall
+	!endif
+	;=== END: PRE-INSTALL CODE ===
+
+	;=== Remove specific files
+	!macro RemoveFile _n
+		!ifdef REMOVEFILE${_n}
+			Delete `$INSTDIR\${REMOVEFILE${_n}}`
+		!endif
+	!macroend
+	${!insertmacro1-10} RemoveFile
+
+	;=== Rename the preserved files so they're not deleted in the next part
+	!macro PreserveFilePre _n
+		!ifdef PRESERVEFILE${_n}
+			${GetFileName} `$INSTDIR\${PRESERVEFILE${_n}}` $1
+			${GetParent} `$INSTDIR\${PRESERVEFILE${_n}}` $2
+			CreateDirectory `$INSTDIR\~PRESERVEFILE${_n}`
+			${MoveFiles} DOS $1 $2 `$INSTDIR\~PRESERVEFILE${_n}`
+		!endif
+	!macroend
+	${!insertmacro1-10} PreserveFilePre
+
+	;=== Remove specific directories
+	!macro RemoveDirectory _n
+		!ifdef REMOVEDIRECTORY${_n}
+			RMDir /r `$INSTDIR\${REMOVEDIRECTORY${_n}}`
+		!endif
+	!macroend
+	${!insertmacro1-10} RemoveDirectory
+
+	;=== Rename the preserved directories so they're not deleted in the next part
+	!macro PreserveDirectoryPre _n
+		!ifdef PRESERVEDIRECTORY${_n}
+			Rename `$INSTDIR\${PRESERVEDIRECTORY${_n}}\` `$INSTDIR\~PRESERVEDIRECTORY${_n}\`
+		!endif
+	!macroend
+	${!insertmacro1-10} PreserveDirectoryPre
+
+	;=== Remove main directories if necessary
+	!ifdef REMOVEAPPDIRECTORY
+		!ifdef COMMONFILESPLUGIN
+			${GetParent} $INSTDIR $0
+			${For} $1 1 10
+				Rename `$INSTDIR\~PRESERVEFILE$1\` `$0\~PRESERVEFILE$1\`
+				Rename `$INSTDIR\~PRESERVEDIRECTORY$1\` `$0\~PRESERVEDIRECTORY$1\`
+			${Next}
+			RMDir /r $INSTDIR
+			CreateDirectory $INSTDIR
+			${For} $1 1 10
+				Rename `$0\~PRESERVEFILE$1\` `$INSTDIR\~PRESERVEFILE$1\`
+				Rename `$0\~PRESERVEDIRECTORY$1\` `$INSTDIR\~PRESERVEDIRECTORY$1\`
+			${Next}
+		!else
+			RMDir /r `$INSTDIR\App`
+		!endif
+	!endif
+	!ifdef REMOVEDATADIRECTORY
+		RMDir /r `$INSTDIR\Data`
+	!endif
+	!ifdef REMOVEOTHERDIRECTORY
+		RMDir /r `$INSTDIR\Other`
+	!endif
+
+	;=== Rename the preserved directories back to their proper names
+	!macro PreserveDirectoryPost _n
+		!ifdef PRESERVEDIRECTORY${_n}
+			${GetParent} `$INSTDIR\${PRESERVEDIRECTORY${_n}}\` $R0
+			CreateDirectory $R0
+			Rename `$INSTDIR\~PRESERVEDIRECTORY${_n}\` `$INSTDIR\${PRESERVEDIRECTORY${_n}}\`
+		!endif
+	!macroend
+	${!insertmacro1-10} PreserveDirectoryPost
+
+	;=== Rename the preserved files back to their proper names
+	!macro PreserveFilePost _n
+		!ifdef PRESERVEFILE${_n}
+			${GetFileName} `$INSTDIR\${PRESERVEFILE${_n}}` $1
+			${GetParent} `$INSTDIR\${PRESERVEFILE${_n}}` $2
+			CreateDirectory $2
+			${MoveFiles} DOS $1 `$INSTDIR\~PRESERVEFILE${_n}` $2
+			RMDir `$INSTDIR\~PRESERVEFILE${_n}`
+		!endif
+	!macroend
+	${!insertmacro1-10} PreserveFilePost
+
+	${If} $bolAppUpgrade == true
+		SetDetailsPrint both
+		DetailPrint $InstallingStatusString
+		SetDetailsPrint ListOnly
+	${EndIf}
+
+	!ifndef PLUGININSTALLER
+		File /x thumbs.db "..\..\*.exe"
+		File /x thumbs.db "..\..\*.html"
+		SetOutPath $INSTDIR\App
+		File /r /x thumbs.db "..\..\App\*.*"
+	!else ifdef COMMONFILESPLUGIN
+		SetOutPath $INSTDIR
+		File /r /x thumbs.db /x PortableApps.comInstaller*.* "..\..\*.*"
+	!else ; non-CommonFiles plugin installer
+		SetOutPath $INSTDIR\Data
+		File /nonfatal /r /x thumbs.db "..\..\Data\*.*"
+		SetOutPath $INSTDIR\App
+		File /nonfatal /r /x thumbs.db "..\..\App\*.*"
+	!endif
+
+	SetOutPath $INSTDIR\Other
+	File /nonfatal /r /x thumbs.db /x PortableApps.comInstaller*.* "..\..\Other\*.*"
+
+	SetOutPath $INSTDIR\Other\Source
+	!ifdef USESCUSTOMCODE
+		!if ${__FILE__} == "PortableApps.comInstallerPlugin.nsi"
+			File "..\..\Other\Source\PortableApps.comInstallerPluginCustom.nsh"
+		!else
+			File "..\..\Other\Source\PortableApps.comInstallerCustom.nsh"
+		!endif
+	!endif
+	!ifndef PLUGININSTALLER
+		CreateDirectory "$INSTDIR\Data"
+	!endif
+
+	!ifdef INCLUDEINSTALLERSOURCE
+		File /r /x PortableApps.comInstallerCustom.nsh /x PortableApps.comInstallerPluginCustom.nsh "..\..\Other\Source\PortableApps.comInstaller*.*"
+	!endif
+
+	;=== Extract Download Files
+	!ifdef DownloadURL
+		!ifdef DownloadTo
+			;Just copy the file
+			CopyFiles /SILENT "$DOWNLOADEDFILE" "$INSTDIR\${DownloadTo}"
+		!else
+		;Process the file
+			!ifdef Extract1To
+				;Standard extract
+
+				!macro ExtractTo _n
+					!ifdef Extract${_n}To
+						CreateDirectory "$INSTDIR\${Extract${_n}To}"
+						nsisunz::UnzipToLog /file "${Extract${_n}File}" "$DOWNLOADEDFILE" "$INSTDIR\${Extract${_n}To}"
+						Pop $R0
+						${If} $R0 <> "OK"
+							DetailPrint "ERROR: $R0 (${DownloadFilename} - ${Extract${_n}File})"
+							Abort
+						${EndIf}
+					!endif
+				!macroend
+				${!insertmacro1-10} ExtractTo
+			!endif
+			!ifdef AdvancedExtract1To
+				;Advanced extract with 7zip
+				CreateDirectory "$INSTDIR\7zTemp"
+				SetOutPath "$INSTDIR\7zTemp"
+				File "${NSISDIR}\..\7zip\7z.exe"
+				File "${NSISDIR}\..\7zip\7z.dll"
+				SetOutPath $INSTDIR
+
+				; The original code didn't have a !ifdef for 1, but we
+				; know it will be defined, and it doesn't matter if we
+				; check if it is because it will be.
+				!macro AdvancedExtractFilter _n
+					!ifdef AdvancedExtract${_n}To
+						CreateDirectory "$INSTDIR\${AdvancedExtract${_n}To}"
+						${If} "${AdvancedExtract${_n}Filter}" == "**"
+							ExecDOS::exec `"$INSTDIR\7zTemp\7z.exe" x -r "$DOWNLOADEDFILE" -o"$INSTDIR\${AdvancedExtract${_n}To}" * -aoa -y` "" ""
+						${Else}
+							ExecDOS::exec `"$INSTDIR\7zTemp\7z.exe" x "$DOWNLOADEDFILE" -o"$INSTDIR\${AdvancedExtract${_n}To}" "${AdvancedExtract${_n}Filter}" -aoa -y` "" ""
+						${EndIf}
+						Pop $R0
+						${If} $R0 <> 0
+							DetailPrint "ERROR: (${DownloadFilename} > ${AdvancedExtract${_n}To})"
+							Abort
+						${EndIf}
+					!endif
+				!macroend
+				${!insertmacro1-10} AdvancedExtractFilter
+
+				Delete "$INSTDIR\7zTemp\7z.dll"
+				Delete "$INSTDIR\7zTemp\7z.exe"
+				RMDir "$INSTDIR\7zTemp"
+			!endif
+			!ifdef DoubleExtractFilename
+				;Double extract using 7zip
+				CreateDirectory "$INSTDIR\7zTemp"
+				SetOutPath "$INSTDIR\7zTemp"
+				File "${NSISDIR}\..\7zip\7z.exe"
+				File "${NSISDIR}\..\7zip\7z.dll"
+				SetOutPath $INSTDIR
+
+				CreateDirectory "$PLUGINSDIR\Downloaded2"
+				ExecDOS::exec `"$INSTDIR\7zTemp\7z.exe" x "$DOWNLOADEDFILE" -o"$PLUGINSDIR\Downloaded2" "${DoubleExtractFilename}" -aoa -y` "" ""
+				Pop $R0
+				${If} $R0 <> 0
+					DetailPrint "ERROR: (${DownloadFilename} > ${DoubleExtractFilename})"
+					Abort
+				${EndIf}
+
+				; The original code didn't have a !ifdef for 1, but we
+				; know it will be defined, and it doesn't matter if we
+				; check if it is because it will be.
+				!macro DoubleExtractTo _n
+					!ifdef DoubleExtract${_n}To
+						CreateDirectory "$INSTDIR\${DoubleExtract${_n}To}"
+						${If} "${DoubleExtract${_n}Filter}" == "**"
+							ExecDOS::exec `"$INSTDIR\7zTemp\7z.exe" x -r "$PLUGINSDIR\Downloaded2\${DoubleExtractFilename}" -o"$INSTDIR\${DoubleExtract${_n}To}" * -aoa -y` "" ""
+						${Else}
+							ExecDOS::exec `"$INSTDIR\7zTemp\7z.exe" x "$PLUGINSDIR\Downloaded2\${DoubleExtractFilename}" -o"$INSTDIR\${DoubleExtract${_n}To}" "${DoubleExtract${_n}Filter}" -aoa -y` "" ""
+						${EndIf}
+						Pop $R0
+						${If} $R0 <> 0
+							DetailPrint "ERROR: (${DoubleExtractFilename} > ${DoubleExtract${_n}To})"
+							Abort
+						${EndIf}
+					!endif
+				!macroend
+				${!insertmacro1-10} DoubleExtractTo
+
+				Delete "$INSTDIR\7zTemp\7z.exe"
+				Delete "$INSTDIR\7zTemp\7z.dll"
+				RMDir "$INSTDIR\7zTemp"
+			!endif
+		!endif
+	!endif
+
+	;=== Copy Local Files
+	!ifdef COPYLOCALFILES
+		${If} ${FileExists} "$CopyLocalFilesFrom\*.*"
+			CreateDirectory "$INSTDIR\${CopyToDirectory}"
+			CopyFiles /SILENT "$CopyLocalFilesFrom\*.*" "$INSTDIR\${CopyToDirectory}"
+		${Else}
+			StrCpy $MISSINGFILEORPATH $CopyLocalFilesFrom
+			${If} $(copylocalfilesnotfound) != ""
+				MessageBox MB_OK|MB_ICONINFORMATION $(copylocalfilesnotfound)
+			${Else}
+				MessageBox MB_OK|MB_ICONINFORMATION `This installer copies a local version of the application and makes it portable.  Unfortunately, a local copy of the application was not found.  You may reinstall or copy the files yourself to complete the installation at a later time.  (ERROR: $MISSINGFILEORPATH could not be found.)`
+			${EndIf}
+		${EndIf}
+	!endif
+
+	;=== BEGIN: POST-INSTALL CODE ===
+	;This will be executed after the app is installed.  Useful for updating configuration files.
+	!ifmacrodef CustomCodePostInstall
+		!insertmacro CustomCodePostInstall
+	!endif
+	;=== END: POST-INSTALL CODE ===
+
+	!ifndef PLUGININSTALLER
+		;=== Refresh PortableApps.com Menu (not final version)
+		${GetParent} $INSTDIR $0
+		;=== Check that it exists at the right location
+		SetDetailsPrint both
+		DetailPrint '$(checkforplatform)'
+		${If} ${FileExists} `$0\PortableApps.com\PortableAppsPlatform.exe`
+			;=== Check that it's the real deal so we aren't hanging with no response
+			MoreInfo::GetProductName `$0\PortableApps.com\PortableAppsPlatform.exe`
+			Pop $1
+			${If} $1 == "PortableApps.com Platform"
+				MoreInfo::GetCompanyName `$0\PortableApps.com\PortableAppsPlatform.exe`
+				Pop $1
+				${If} $1 == "PortableApps.com"
+
+					;=== Check that it's running
+					FindProcDLL::FindProc "PortableAppsPlatform.exe"
+					${If} $R0 == "1"
+
+						;=== Send message for the Menu to refresh
+						CreateDirectory "$0\PortableApps.com\Data"
+						WriteINIStr "$0\PortableApps.com\Data\NewApp.ini" "NewApp" "AppID" "${APPID}"
+
+						DetailPrint '$(refreshmenu)'
+						${IfNot} ${FileExists} `$0\PortableApps.com\App\PortableAppsPlatform.exe`
+							StrCpy $2 'PortableApps.comPlatformWindowMessageToRefresh$0\PortableApps.com\PortableAppsPlatform.exe'
+							System::Call "user32::RegisterWindowMessage(t r2) i .r3"
+							SendMessage 65535 $3 0 0 /TIMEOUT=1
+						${Else} ; old message
+							StrCpy $2 'PortableApps.comPlatformWindowMessageToRefresh$0\PortableApps.com\App\PortableAppsPlatform.exe'
+							System::Call "user32::RegisterWindowMessage(t r2) i .r3"
+							SendMessage 65535 $3 0 0 /TIMEOUT=1
+						${EndIf}
+					${EndIf}
+				${EndIf}
+			${EndIf}
+		${EndIf}
+	!endif
+		DetailPrint $InstallingStatusString
+		SetDetailsPrint listonly
+		Delete "$INSTDIR\7zTemp\7z.exe"
+		Delete "$INSTDIR\7zTemp\7z.dll"
+		RMDir "$INSTDIR\7zTemp"
+
+!ifdef LICENSEAGREEMENT
+	CreateDirectory "$INSTDIR\Data\PortableApps.comInstaller"
+	WriteINIStr "$INSTDIR\Data\PortableApps.comInstaller\license.ini" "PortableApps.comInstaller" "EULAVersion" $INTERNALEULAVERSION
+	ClearErrors
+!endif
+
+!ifdef DownloadURL
+	Delete "$INTERNET_CACHE\${DownloadFileName}"
+!endif
+	${If} $bolLogFile == true
+		${DumpLogToFile} "$EXEDIR\$EXEFILE.log"
+	${EndIf}
+	SetOutPath $INSTDIR
+SectionEnd
+
+!ifdef MAINSECTIONTITLE
+	Section /o "${OPTIONALSECTIONTITLE}"
+		SetOutPath $INSTDIR
+		File /r "..\..\Optional1\*.*"
+		StrCpy $OPTIONAL1DONE "true"
+	SectionEnd
+
+	Section "-UpdateAppInfo" SecUpdateAppInfo
+	!ifndef PLUGININSTALLER
+		${If} $OPTIONAL1DONE != "true"
+		${AndIf} "${OPTIONALSECTIONNOTSELECTEDINSTALLTYPE}" != ""
+			WriteINIStr "$INSTDIR\App\AppInfo\appinfo.ini" "Details" "InstallType" "${OPTIONALSECTIONNOTSELECTEDINSTALLTYPE}"
+		${ElseIf} "${OPTIONALSECTIONSELECTEDINSTALLTYPE}" != ""
+			WriteINIStr "$INSTDIR\App\AppInfo\appinfo.ini" "Details" "InstallType" "${OPTIONALSECTIONSELECTEDINSTALLTYPE}"
+		${EndIf}
+	!endif
+	SectionEnd
+
+	!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+		!insertmacro MUI_DESCRIPTION_TEXT ${MAINSECTIONIDX} "${MAINSECTIONDESCRIPTION}"
+		!insertmacro MUI_DESCRIPTION_TEXT ${OPTIONALSECTIONIDX} "${OPTIONALSECTIONDESCRIPTION}"
+	!insertmacro MUI_FUNCTION_DESCRIPTION_END
+!endif
+
+Function .onInstFailed
+	!ifdef COPYLOCALFILES
+		${registry::Unload}
+	!endif
+	RMDir $INSTDIR ;remove directory if empty
+FunctionEnd
+
+!ifdef COPYLOCALFILES
+	Function .onInstSuccess
+		${registry::Unload}
+	FunctionEnd
+	Function CustomAbortFunction
+		${registry::Unload}
+	FunctionEnd
+!endif
\ No newline at end of file
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerConfig.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerConfig.nsh
new file mode 100644
index 000000000..bbf1e31c7
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerConfig.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerDumpLogToFile.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerDumpLogToFile.nsh
new file mode 100644
index 000000000..180cd81a8
--- /dev/null
+++ b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerDumpLogToFile.nsh
@@ -0,0 +1,62 @@
+;http://nsis.sourceforge.net/Docs/AppendixD.html#D.4
+;Define added by John T. Haller of PortableApps.com
+
+;NOTE - Not yet used.  Added for future reference.
+
+!ifndef DumpLogToFile
+
+!define DumpLogToFile "!insertmacro DumpLogToFile"
+!macro DumpLogToFile logfilename
+	Delete `${logfilename}`
+	push `${logfilename}`
+	call DumpLog
+!macroend
+
+!define LVM_GETITEMCOUNT 0x1004
+!define LVM_GETITEMTEXT 0x1073
+
+Function DumpLog
+  Exch $5
+  Push $0
+  Push $1
+  Push $2
+  Push $3
+  Push $4
+  Push $6
+
+  FindWindow $0 "#32770" "" $HWNDPARENT
+  GetDlgItem $0 $0 1016
+  StrCmp $0 0 error
+  FileOpen $5 $5 "w"
+  FileWriteWord $5 0xfeff ; Write the BOM
+  StrCmp $5 0 error
+    SendMessage $0 ${LVM_GETITEMCOUNT} 0 0 $6
+    System::StrAlloc ${NSIS_MAX_STRLEN}
+    Pop $3
+    StrCpy $2 0
+    System::Call "*(i, i, i, i, i, i, i, i, i) i \
+      (0, 0, 0, 0, 0, r3, ${NSIS_MAX_STRLEN}) .r1"
+    loop: StrCmp $2 $6 done
+      System::Call "User32::SendMessageW(i, i, i, i) i \
+        ($0, ${LVM_GETITEMTEXT}, $2, r1)"
+      System::Call "*$3(&t${NSIS_MAX_STRLEN} .r4)"
+      FileWriteUTF16LE $5 "$4$\r$\n"
+      IntOp $2 $2 + 1
+      Goto loop
+    done:
+      FileClose $5
+      System::Free $1
+      System::Free $3
+      Goto exit
+  error:
+    ;MessageBox MB_OK error
+  exit:
+    Pop $6
+    Pop $4
+    Pop $3
+    Pop $2
+    Pop $1
+    Pop $0
+    Exch $5
+FunctionEnd
+!endif
\ No newline at end of file
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Afrikaans.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Afrikaans.nsh
new file mode 100644
index 000000000..1ab502355
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Afrikaans.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Albanian.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Albanian.nsh
new file mode 100644
index 000000000..e08e0c985
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Albanian.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Arabic.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Arabic.nsh
new file mode 100644
index 000000000..961c7ec12
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Arabic.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Armenian.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Armenian.nsh
new file mode 100644
index 000000000..be22d1312
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Armenian.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Basque.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Basque.nsh
new file mode 100644
index 000000000..549999952
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Basque.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Belarusian.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Belarusian.nsh
new file mode 100644
index 000000000..5c453841c
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Belarusian.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Bosnian.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Bosnian.nsh
new file mode 100644
index 000000000..60e537169
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Bosnian.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Breton.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Breton.nsh
new file mode 100644
index 000000000..ceda00b58
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Breton.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Bulgarian.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Bulgarian.nsh
new file mode 100644
index 000000000..29f08efaa
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Bulgarian.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Catalan.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Catalan.nsh
new file mode 100644
index 000000000..e648e87f8
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Catalan.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Cibemba.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Cibemba.nsh
new file mode 100644
index 000000000..27414b458
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Cibemba.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Croatian.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Croatian.nsh
new file mode 100644
index 000000000..a05268fad
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Croatian.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Czech.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Czech.nsh
new file mode 100644
index 000000000..e59f3cfdb
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Czech.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Danish.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Danish.nsh
new file mode 100644
index 000000000..2806d4835
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Danish.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Dutch.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Dutch.nsh
new file mode 100644
index 000000000..31ceeba6c
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Dutch.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Efik.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Efik.nsh
new file mode 100644
index 000000000..08f2d22e8
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Efik.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/English.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/English.nsh
new file mode 100644
index 000000000..f78c3ee50
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/English.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/EnglishGB.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/EnglishGB.nsh
new file mode 100644
index 000000000..ea4278e08
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/EnglishGB.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Esperanto.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Esperanto.nsh
new file mode 100644
index 000000000..5bcff5e2f
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Esperanto.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Estonian.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Estonian.nsh
new file mode 100644
index 000000000..fd68a3416
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Estonian.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Farsi.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Farsi.nsh
new file mode 100644
index 000000000..9ccedd431
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Farsi.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Finnish.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Finnish.nsh
new file mode 100644
index 000000000..1229b5be8
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Finnish.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/French.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/French.nsh
new file mode 100644
index 000000000..c1bff71ff
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/French.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Galician.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Galician.nsh
new file mode 100644
index 000000000..35162c3f3
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Galician.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Georgian.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Georgian.nsh
new file mode 100644
index 000000000..8980079b4
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Georgian.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/German.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/German.nsh
new file mode 100644
index 000000000..c36e18416
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/German.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Greek.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Greek.nsh
new file mode 100644
index 000000000..e999dc67d
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Greek.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Hebrew.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Hebrew.nsh
new file mode 100644
index 000000000..dcbbea08a
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Hebrew.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Hungarian.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Hungarian.nsh
new file mode 100644
index 000000000..be2ce378b
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Hungarian.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Icelandic.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Icelandic.nsh
new file mode 100644
index 000000000..894c08b3b
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Icelandic.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Igbo.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Igbo.nsh
new file mode 100644
index 000000000..f98f7476e
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Igbo.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Indonesian.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Indonesian.nsh
new file mode 100644
index 000000000..ee41db8c0
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Indonesian.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Irish.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Irish.nsh
new file mode 100644
index 000000000..a50c78bd1
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Irish.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Italian.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Italian.nsh
new file mode 100644
index 000000000..1e2f2d1b2
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Italian.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Japanese.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Japanese.nsh
new file mode 100644
index 000000000..43274e06d
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Japanese.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Khmer.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Khmer.nsh
new file mode 100644
index 000000000..4397ebb1b
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Khmer.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Korean.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Korean.nsh
new file mode 100644
index 000000000..b88ef5510
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Korean.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Kurdish.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Kurdish.nsh
new file mode 100644
index 000000000..0deedd644
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Kurdish.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Latvian.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Latvian.nsh
new file mode 100644
index 000000000..ee02c8429
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Latvian.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Lithuanian.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Lithuanian.nsh
new file mode 100644
index 000000000..eeff7057d
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Lithuanian.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Luxembourgish.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Luxembourgish.nsh
new file mode 100644
index 000000000..a674cf2d2
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Luxembourgish.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Macedonian.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Macedonian.nsh
new file mode 100644
index 000000000..43363ebc0
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Macedonian.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Malagasy.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Malagasy.nsh
new file mode 100644
index 000000000..498b87dcf
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Malagasy.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Malay.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Malay.nsh
new file mode 100644
index 000000000..d128c19fc
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Malay.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Mongolian.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Mongolian.nsh
new file mode 100644
index 000000000..8155e94a4
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Mongolian.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Norwegian.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Norwegian.nsh
new file mode 100644
index 000000000..98fffbd43
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Norwegian.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/NorwegianNynorsk.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/NorwegianNynorsk.nsh
new file mode 100644
index 000000000..12aed3819
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/NorwegianNynorsk.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Pashto.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Pashto.nsh
new file mode 100644
index 000000000..732b06e37
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Pashto.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Polish.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Polish.nsh
new file mode 100644
index 000000000..04a98f24d
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Polish.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Portuguese.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Portuguese.nsh
new file mode 100644
index 000000000..9fadcd98f
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Portuguese.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/PortugueseBR.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/PortugueseBR.nsh
new file mode 100644
index 000000000..3e96593a6
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/PortugueseBR.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Romanian.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Romanian.nsh
new file mode 100644
index 000000000..fa6bfea23
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Romanian.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Russian.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Russian.nsh
new file mode 100644
index 000000000..772cc4ff6
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Russian.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Serbian.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Serbian.nsh
new file mode 100644
index 000000000..36db0a76a
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Serbian.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/SerbianLatin.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/SerbianLatin.nsh
new file mode 100644
index 000000000..0042eada3
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/SerbianLatin.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/SimpChinese.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/SimpChinese.nsh
new file mode 100644
index 000000000..373016efa
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/SimpChinese.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Slovak.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Slovak.nsh
new file mode 100644
index 000000000..338bb0dc4
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Slovak.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Slovenian.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Slovenian.nsh
new file mode 100644
index 000000000..6ac04ea3d
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Slovenian.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Spanish.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Spanish.nsh
new file mode 100644
index 000000000..962549440
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Spanish.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/SpanishInternational.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/SpanishInternational.nsh
new file mode 100644
index 000000000..be9738f74
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/SpanishInternational.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Swahili.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Swahili.nsh
new file mode 100644
index 000000000..9659d04e5
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Swahili.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Swedish.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Swedish.nsh
new file mode 100644
index 000000000..4519c17d7
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Swedish.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Thai.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Thai.nsh
new file mode 100644
index 000000000..d0578b00f
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Thai.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/TradChinese.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/TradChinese.nsh
new file mode 100644
index 000000000..914c4ce64
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/TradChinese.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Turkish.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Turkish.nsh
new file mode 100644
index 000000000..eb3ece757
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Turkish.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Ukrainian.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Ukrainian.nsh
new file mode 100644
index 000000000..6ad7c263e
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Ukrainian.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Uzbek.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Uzbek.nsh
new file mode 100644
index 000000000..297e6a3bd
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Uzbek.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Valencian.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Valencian.nsh
new file mode 100644
index 000000000..05e1e1366
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Valencian.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Vietnamese.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Vietnamese.nsh
new file mode 100644
index 000000000..59afdcdef
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Vietnamese.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Welsh.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Welsh.nsh
new file mode 100644
index 000000000..f00460a44
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Welsh.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Yoruba.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Yoruba.nsh
new file mode 100644
index 000000000..be845c758
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerLanguages/Yoruba.nsh differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerMoveFiles.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerMoveFiles.nsh
new file mode 100644
index 000000000..451ab65ee
--- /dev/null
+++ b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerMoveFiles.nsh
@@ -0,0 +1,104 @@
+; Copyright (c) 2008, Harold E Austin Jr
+; All rights reserved.
+;
+; Redistribution and use in source and binary forms, with or without
+; modification, are permitted provided that the following conditions are met:
+;     * Redistributions of source code must retain the above copyright
+;       notice, this list of conditions and the following disclaimer.
+;     * Redistributions in binary form must reproduce the above copyright
+;       notice, this list of conditions and the following disclaimer in the
+;       documentation and/or other materials provided with the distribution.
+;     * Neither the name of the organization nor the
+;       names of its contributors may be used to endorse or promote products
+;       derived from this software without specific prior written permission.
+;
+; THIS SOFTWARE IS PROVIDED BY Harold E Austin Jr ``AS IS'' AND ANY
+; EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+; WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+; DISCLAIMED. IN NO EVENT SHALL Harold E Austin Jr BE LIABLE FOR ANY
+; DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+; (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+; ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+/*
+	MoveFiles.nsh -- version 1.0  (May 5, 2008)
+		move files matching "filespec" from "source-directory" to "destination-directory"
+
+	usage: 
+		!include MoveFiles.nsh
+		
+		${MoveFiles} mode "filespec" "source-directory" "destination-directory"
+
+	where:
+		mode can be DOS, DIR, FORCE or DIR+FORCE (anything else = DOS):
+			DOS		means act like the DOS MOVE command (move only files)
+			DIR		means move files AND directories
+			FORCE 	means overwrite destination files (like MOVE/Y)
+
+	example:
+		CreateDirectory "C:\NEW\DIR"
+		DetailPrint "Moving files and directories..."
+		${MoveFiles} DIR+FORCE "*" "C:\OLD\DIR" "C:\NEW\DIR"
+		DetailPrint `"Processing"...`
+		Sleep 2000
+		DetailPrint "Moving only the files back..."
+		${MoveFiles} DOS "*" "C:\NEW\DIR" "C:\OLD\DIR"
+		DetailPrint "Moving the directories back..."
+		${MoveFiles} DIR "*" "C:\NEW\DIR" "C:\OLD\DIR"
+*/
+!ifndef MoveFiles
+!define MoveFiles "!insertmacro MoveFiles"
+!macro MoveFiles mode filespec sourcedir destdir
+	push `${destdir}`
+	push `${sourcedir}`
+	push `${filespec}`
+	push `${mode}`
+	call MoveFiles
+!macroend
+
+Function MoveFiles ; mode filespec sourcedir destdir
+	Exch $0					; mode, directory mode
+	Exch 
+	Exch $1					; filespec, force mode
+	Exch 2
+	Exch $2					; source directory
+	Exch 3
+	Exch $3					; destination directory
+	Push $4					; FindFirst/FindNext search handle
+	Push $5					; current filename matching filespec in sourcedir
+    FindFirst $4 $5 "$2\$1"
+	StrCpy $1 ""			; FORCE mode disabled by default
+	StrCmp $0 FORCE 0 +2
+		StrCpy $1 FORCE
+	StrCmp $0 DIR+FORCE 0 +3
+		StrCpy $0 DIR
+		StrCpy $1 FORCE
+	loop:                    
+		StrCmp $5 "" done	; $5 == "", if no more matching files
+		StrCmp $5 . next
+		StrCmp $5 .. next
+		StrCmp $0 DIR +2
+			; DIR mode disabled: ignore directories that match ${filespec}
+			IfFileExists "$2\$5\*.*" next
+		StrCmp $1 FORCE 0 +4
+			; FORCE mode: make sure destination doesn't exist
+			Delete "$3\$5"
+			StrCmp $0 DIR 0 +2
+				RMDir /R "$3\$5"
+		Rename "$2\$5" "$3\$5"
+	next:
+		FindNext $4 $5
+		Goto loop
+	done:
+		FindClose $4        ; finished with this search; close handle
+		Pop $5
+		Pop $4
+		Pop $3
+		Pop $0
+		Pop $1
+		Pop $2
+FunctionEnd
+!endif
diff --git a/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerTBProgress.nsh b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerTBProgress.nsh
new file mode 100644
index 000000000..7fa976961
--- /dev/null
+++ b/Greenshot/tools/PortableApps.comInstaller/App/installer/PortableApps.comInstallerTBProgress.nsh
@@ -0,0 +1,59 @@
+!include "LogicLib.nsh"
+ 
+!ifndef CLSCTX_INPROC_SERVER
+    !define CLSCTX_INPROC_SERVER  1
+!endif
+ 
+!define CLSID_ITaskbarList    {56fdf344-fd6d-11d0-958a-006097c9a090}
+ 
+!define IID_ITaskbarList3     {ea1afb91-9e28-4b86-90e9-9e9f8a5eefaf}
+!define ITaskbarList3->SetProgressState      $ITaskbarList3->10
+!define ITaskbarList3->SetProgressValue      $ITaskbarList3->9
+ 
+!define TBPF_NOPROGRESS       0x00000000 ; Normal state / no progress bar
+!define TBPF_INDETERMINATE    0x00000001 ; Marquee style progress bar
+!define TBPF_NORMAL           0x00000002 ; Standard progress bar
+!define TBPF_ERROR            0x00000004 ; Red taskbar button to indicate an error occurred
+!define TBPF_PAUSED           0x00000008 ; Yellow taskbar button to indicate user attention
+                                         ; (input) is required to resume progress
+ 
+Var ITaskbarList3
+ 
+!macro TBProgress_Init
+  !ifndef TBProgressInitialized
+    !define TBProgressInitialized
+    ${Unless} ${Silent}
+      System::Call "ole32::CoCreateInstance( \
+        g '${CLSID_ITaskbarList}', \
+        i 0, \
+        i ${CLSCTX_INPROC_SERVER}, \
+        g '${IID_ITaskbarList3}', \
+        *i .s)"
+      Pop $ITaskbarList3
+    ${Else}
+      StrCpy $ITaskbarList3 0
+    ${EndIf}
+  !endif
+!macroend
+!define TBProgress_Init `!insertmacro TBProgress_Init`
+ 
+!macro TBProgress_Progress Val Max
+  ${TBProgress_Init}
+  ${If} $ITaskbarList3 <> 0
+      System::Call "${ITaskbarList3->SetProgressValue}(i$HWNDPARENT, l${Val}, l${Max})"
+  ${EndIf}
+!macroend
+!define TBProgress_Progress `!insertmacro TBProgress_Progress`
+ 
+!macro TBProgress Val
+  ${TBProgress_Progress} ${Val} 100
+!macroend
+!define TBProgress `!insertmacro TBProgress`
+ 
+!macro TBProgress_State State
+  ${TBProgress_Init}
+  ${If} $ITaskbarList3 <> 0
+      System::Call "${ITaskbarList3->SetProgressState}(i$HWNDPARENT, i${TBPF_${State}})"
+  ${EndIf}
+!macroend
+!define TBProgress_State `!insertmacro TBProgress_State`
\ No newline at end of file
diff --git a/Greenshot/tools/PortableApps.comInstaller/Other/Help/images/donation_button.png b/Greenshot/tools/PortableApps.comInstaller/Other/Help/images/donation_button.png
new file mode 100644
index 000000000..f19dea7a1
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/Other/Help/images/donation_button.png differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/Other/Help/images/favicon.ico b/Greenshot/tools/PortableApps.comInstaller/Other/Help/images/favicon.ico
new file mode 100644
index 000000000..ed849b2de
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/Other/Help/images/favicon.ico differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/Other/Help/images/help_background_footer.png b/Greenshot/tools/PortableApps.comInstaller/Other/Help/images/help_background_footer.png
new file mode 100644
index 000000000..5ebdc028c
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/Other/Help/images/help_background_footer.png differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/Other/Help/images/help_background_header.png b/Greenshot/tools/PortableApps.comInstaller/Other/Help/images/help_background_header.png
new file mode 100644
index 000000000..cf1ebf762
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/Other/Help/images/help_background_header.png differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/Other/Help/images/help_logo_top.png b/Greenshot/tools/PortableApps.comInstaller/Other/Help/images/help_logo_top.png
new file mode 100644
index 000000000..1a705050e
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/Other/Help/images/help_logo_top.png differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/Other/Source/InstallerWizard.nsi b/Greenshot/tools/PortableApps.comInstaller/Other/Source/InstallerWizard.nsi
new file mode 100644
index 000000000..aef2f70a5
--- /dev/null
+++ b/Greenshot/tools/PortableApps.comInstaller/Other/Source/InstallerWizard.nsi
@@ -0,0 +1,1141 @@
+;Copyright (C) 2006-2012 John T. Haller
+
+;Website: http://PortableApps.com/Installer
+
+;This software is OSI Certified Open Source Software.
+;OSI Certified is a certification mark of the Open Source Initiative.
+
+;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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+!define APPNAME "PortableApps.com Installer"
+!define VER "3.0.5.0"
+!define WEBSITE "PortableApps.com/Installer"
+!define FRIENDLYVER "3.0.5"
+!define PORTABLEAPPS.COMFORMATVERSION "3.0"
+
+;=== Program Details
+Name "${APPNAME}"
+OutFile "..\..\PortableApps.comInstaller.exe"
+Caption "${APPNAME}"
+VIProductVersion "${VER}"
+VIAddVersionKey ProductName "${APPNAME}"
+VIAddVersionKey Comments "For additional details, visit ${WEBSITE}"
+VIAddVersionKey CompanyName "PortableApps.com"
+VIAddVersionKey LegalCopyright "John T. Haller"
+VIAddVersionKey FileDescription "${APPNAME}"
+VIAddVersionKey FileVersion "${VER}"
+VIAddVersionKey ProductVersion "${VER}"
+VIAddVersionKey InternalName "${APPNAME}"
+VIAddVersionKey LegalTrademarks "PortableApps.com is a trademark of Rare Ideas, LLC."
+VIAddVersionKey OriginalFilename "PortableApps.comInstaller.exe"
+
+;=== Runtime Switches
+CRCCheck On
+RequestExecutionLevel user
+
+; Best Compression
+SetCompress Auto
+SetCompressor /SOLID lzma
+SetCompressorDictSize 32
+SetDatablockOptimize On
+
+;=== Include
+;(Standard)
+!include WordFunc.nsh
+!insertmacro WordReplace
+!include FileFunc.nsh
+!insertmacro GetFileName
+!insertmacro GetParameters
+!insertmacro GetParent
+!insertmacro GetSize
+!include LogicLib.nsh
+!include MUI.nsh
+
+;(Addons)
+!include dialogs.nsh
+
+;(Custom)
+!include MoveFiles.nsh
+!include ReadINIStrWithDefault.nsh
+!include TBProgress.nsh
+
+;=== Icon & Stye ===
+!define MUI_ICON "..\..\App\AppInfo\appicon.ico"
+!define MUI_HEADERIMAGE
+!define MUI_HEADERIMAGE_RIGHT
+!define MUI_HEADERIMAGE_BITMAP header.bmp
+!define MUI_HEADERIMAGE_BITMAP_RTL header_rtl.bmp
+
+BrandingText "PortableApps.com®"
+InstallButtonText "Go >"
+ShowInstDetails show
+SubCaption 3 " | Processing Files"
+
+;=== Variables
+Var FINISHTEXT
+Var FINISHTITLE
+Var INSTALLAPPDIRECTORY
+Var SKIPWELCOMEPAGE
+Var AUTOMATICCOMPILE
+
+Var INCLUDESOURCE
+Var PORTABLEAPPNAME
+Var PORTABLEAPPNAMEDOUBLEDAMPERSANDS
+Var PLUGINNAME
+Var APPID
+Var SHORTNAME
+Var APPLANGUAGE
+Var ALLLANGUAGES
+Var INSTALLERFILENAME
+Var OPTIONALCOMPONENTS
+Var DISPLAYVERSION
+Var COMMONFILESPLUGIN
+Var USEEXTRACTEDICON
+Var INTERACTIVEMODE
+Var EULAVERSION
+
+Var ERROROCCURED
+
+Var AppInfoINIFile
+Var InstallerINIFile
+Var PluginInstaller
+Var OptionalSectionSelectedInstallType
+
+;=== Pages
+!define MUI_WELCOMEFINISHPAGE_BITMAP welcomefinish.bmp
+!define MUI_WELCOMEPAGE_TITLE "PortableApps.com Installer ${FRIENDLYVER}"
+!define MUI_WELCOMEPAGE_TEXT "Welcome to the PortableApps.com Installer.\r\n\r\nThis utility allows you to create a PortableApps.com Installer package for an app in PortableApps.com Format.  Just click next and select the application to package.\r\n\r\nLICENSE: The PortableApps.com Installer can be used with open source and freeware apps provided the installer is unmodified and the app adheres to the current PortableApps.com Format Specification as published at PortableApps.com/development. It may also be used with commercial software by contacting PortableApps.com."
+!define MUI_PAGE_CUSTOMFUNCTION_PRE ShowWelcomeWindow
+!insertmacro MUI_PAGE_WELCOME
+Page custom ShowOptionsWindow LeaveOptionsWindow " | Portable App Folder Selection"
+!insertmacro MUI_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 Installer"
+!define MUI_FINISHPAGE_RUN_FUNCTION "RunOnFinish"
+!define MUI_FINISHPAGE_SHOWREADME "$EXEDIR\Data\PortableApps.comInstallerLog.txt"
+!define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
+!define MUI_FINISHPAGE_SHOWREADME_TEXT "View log file"
+!define MUI_FINISHPAGE_CANCEL_ENABLED
+!insertmacro MUI_PAGE_FINISH
+
+;=== Languages
+!insertmacro MUI_LANGUAGE "English"
+
+Function .onInit
+	!insertmacro MUI_INSTALLOPTIONS_EXTRACT "InstallerWizardForm.ini"
+
+	;=== Check for settings.ini
+	${IfNot} ${FileExists} $EXEDIR\Data\settings.ini
+		CreateDirectory $EXEDIR\Data
+		CopyFiles /SILENT $EXEDIR\App\DefaultData\settings.ini $EXEDIR\Data
+	${EndIf}
+
+	; Get settings
+	ReadINIStr $SKIPWELCOMEPAGE "$EXEDIR\Data\settings.ini" "InstallerWizard" "SkipWelcomePage"
+	ReadINIStr $INSTALLAPPDIRECTORY "$EXEDIR\Data\settings.ini" "InstallerWizard" "INSTALLAPPDIRECTORY"
+
+	${GetParameters} $R0
+	${If} $R0 != ""
+		StrCpy $INSTALLAPPDIRECTORY $R0
+		StrCpy $SKIPWELCOMEPAGE "true"
+		StrCpy $AUTOMATICCOMPILE "true"
+		;Strip quotes from $INSTALLAPPDIRECTORY
+		StrCpy $R0 $INSTALLAPPDIRECTORY 1
+		${If} $R0 == `"`
+			StrCpy $INSTALLAPPDIRECTORY $INSTALLAPPDIRECTORY "" 1
+			StrCpy $INSTALLAPPDIRECTORY $INSTALLAPPDIRECTORY -1
+		${EndIf}
+	${EndIf}
+
+	;=== Pre-Fill Path with Directory
+	WriteINIStr $PLUGINSDIR\InstallerWizardForm.ini "Field 2" "State" "$INSTALLAPPDIRECTORY"
+FunctionEnd
+
+Function ShowWelcomeWindow
+	${If} $SKIPWELCOMEPAGE == "true"
+		Abort
+	${EndIf}
+FunctionEnd
+
+Function ShowOptionsWindow
+	!insertmacro MUI_HEADER_TEXT "PortableApps.com Installer ${FRIENDLYVER}" "the open portable software standard"
+	${If} $AUTOMATICCOMPILE == "true"
+		${If} ${FileExists} "$INSTALLAPPDIRECTORY\App\AppInfo\appinfo.ini"
+			StrCpy $AppInfoINIFile "$INSTALLAPPDIRECTORY\App\AppInfo\appinfo.ini"
+			StrCpy $InstallerINIFile "$INSTALLAPPDIRECTORY\App\AppInfo\installer.ini"
+			StrCpy $PluginInstaller "false"
+			Abort
+		${ElseIf} ${FileExists} "$INSTALLAPPDIRECTORY\App\AppInfo\plugininstaller.ini"
+			StrCpy $AppInfoINIFile "$INSTALLAPPDIRECTORY\App\AppInfo\plugininstaller.ini"
+			StrCpy $InstallerINIFile "$INSTALLAPPDIRECTORY\App\AppInfo\plugininstaller.ini"
+			StrCpy $PluginInstaller "true"
+			Abort
+		${ElseIf} ${FileExists} "$INSTALLAPPDIRECTORY\Other\Source\plugininstaller.ini"
+			CreateDirectory "$INSTALLAPPDIRECTORY\App"
+			CreateDirectory "$INSTALLAPPDIRECTORY\App\AppInfo"
+			Rename "$INSTALLAPPDIRECTORY\Other\Source\plugininstaller.ini" "$INSTALLAPPDIRECTORY\App\AppInfo\plugininstaller.ini"
+			StrCpy $AppInfoINIFile "$INSTALLAPPDIRECTORY\App\AppInfo\plugininstaller.ini"
+			StrCpy $InstallerINIFile "$INSTALLAPPDIRECTORY\App\AppInfo\plugininstaller.ini"
+			StrCpy $PluginInstaller "true"
+			Abort
+		${EndIf}
+	${EndIf}
+	${ReadINIStrWithDefault} $INTERACTIVEMODE "$EXEDIR\Data\settings.ini" "InstallerWizard" "InteractiveMode" "1"
+	WriteINIStr "$PLUGINSDIR\InstallerWizardForm.ini" "Field 3" "State" "$INTERACTIVEMODE"
+	InstallOptions::InitDialog /NOUNLOAD "$PLUGINSDIR\InstallerWizardForm.ini"
+    Pop $0
+    InstallOptions::Show
+FunctionEnd
+
+Function LeaveOptionsWindow
+	;=== Blank
+	ReadINIStr $INSTALLAPPDIRECTORY $PLUGINSDIR\InstallerWizardForm.ini "Field 2" "State"
+	ReadINIStr $INTERACTIVEMODE "$PLUGINSDIR\InstallerWizardForm.ini" "Field 3" "State"
+
+	StrCmp $INSTALLAPPDIRECTORY "" NoInstallAppDirectoryError
+	${If} ${FileExists} "$INSTALLAPPDIRECTORY\App\AppInfo\appinfo.ini"
+		StrCpy $AppInfoINIFile "$INSTALLAPPDIRECTORY\App\AppInfo\appinfo.ini"
+		StrCpy $InstallerINIFile "$INSTALLAPPDIRECTORY\App\AppInfo\installer.ini"
+		StrCpy $PluginInstaller "false"
+	${ElseIf} ${FileExists} "$INSTALLAPPDIRECTORY\App\AppInfo\plugininstaller.ini"
+		StrCpy $AppInfoINIFile "$INSTALLAPPDIRECTORY\App\AppInfo\plugininstaller.ini"
+		StrCpy $InstallerINIFile "$INSTALLAPPDIRECTORY\App\AppInfo\plugininstaller.ini"
+		StrCpy $PluginInstaller "true"
+	${ElseIf} ${FileExists} "$INSTALLAPPDIRECTORY\Other\Source\plugininstaller.ini"
+		CreateDirectory "$INSTALLAPPDIRECTORY\App"
+		CreateDirectory "$INSTALLAPPDIRECTORY\App\AppInfo"
+		Rename "$INSTALLAPPDIRECTORY\Other\Source\plugininstaller.ini" "$INSTALLAPPDIRECTORY\App\AppInfo\plugininstaller.ini"
+		StrCpy $AppInfoINIFile "$INSTALLAPPDIRECTORY\App\AppInfo\plugininstaller.ini"
+		StrCpy $InstallerINIFile "$INSTALLAPPDIRECTORY\App\AppInfo\plugininstaller.ini"
+		StrCpy $PluginInstaller "true"
+	${ElseIf} $INTERACTIVEMODE = 1
+		; No AppInfo found
+		${IfNot} ${FileExists} "$INSTALLAPPDIRECTORY\*.exe"
+		${AndIf} $PluginInstaller != "true"
+			Goto NoInstallAppDirectoryError
+		${EndIf}
+
+		MessageBox MB_ICONQUESTION|MB_YESNO "The app does not appear to have the necessary files within the App\AppInfo directory required by PortableApps.com Format.  Would you like to create the settings interactively and use a set of default icons for now for testing?" IDNO NoInstallAppDirectoryError
+
+			;Find EXE file
+			FindFirst $2 $3 "$INSTALLAPPDIRECTORY\*.exe"
+			StrCpy $4 0
+
+			${DoWhile} $3 != ""
+				StrCpy $5 $3
+				IntOp $4 $4 + 1
+				FindNext $2 $3
+			${Loop}
+			FindClose $2
+
+			${If} $4 > 1
+				MessageBox MB_OK|MB_ICONEXCLAMATION `Multiple EXEs were found in the directory you selected.  The PortableApps.com Installer can only generate default information for applications with a single EXE.  Please review the information at PortableApps.com/development for details on creating the configuration files.`
+				Abort
+			${EndIf}
+
+			CreateDirectory "$INSTALLAPPDIRECTORY\App\AppInfo"
+			CopyFiles /SILENT "$EXEDIR\App\default_bits\appicon_16.png" "$INSTALLAPPDIRECTORY\App\AppInfo"
+			CopyFiles /SILENT "$EXEDIR\App\default_bits\appicon_32.png" "$INSTALLAPPDIRECTORY\App\AppInfo"
+			CopyFiles /SILENT "$EXEDIR\App\default_bits\appicon.ico" "$INSTALLAPPDIRECTORY\App\AppInfo"
+			CopyFiles /SILENT "$EXEDIR\App\default_bits\appinfo.ini" "$INSTALLAPPDIRECTORY\App\AppInfo"
+			WriteINIStr "$INSTALLAPPDIRECTORY\App\AppInfo\appinfo.ini" "Format" "Version" "${PORTABLEAPPS.COMFORMATVERSION}"
+			WriteINIStr "$INSTALLAPPDIRECTORY\App\AppInfo\appinfo.ini" "Control" "Start" "$5"
+
+			MessageBox MB_ICONINFORMATION "Before releasing this application, please be sure to create a set of proper icons in App\AppInfo."
+	${Else}
+		Goto NoInstallAppDirectoryError
+	${EndIf}
+
+	; Store settings
+	WriteINIStr "$EXEDIR\Data\settings.ini" "InstallerWizard" "INSTALLAPPDIRECTORY" $INSTALLAPPDIRECTORY
+	WriteINIStr "$EXEDIR\Data\settings.ini" "InstallerWizard" "InteractiveMode" $INTERACTIVEMODE
+	Goto EndLeaveOptionsWindow
+
+	NoInstallAppDirectoryError:
+		MessageBox MB_OK|MB_ICONEXCLAMATION `Please select a valid portable app's base directory to create an installer for.`
+		Abort
+
+	EndLeaveOptionsWindow:
+FunctionEnd
+
+!define SetIndividualLanguage "!insertmacro SetIndividualLanguage"
+
+!define WriteConfig "!insertmacro WriteConfig"
+
+!macro WriteConfig Variable Value
+	FileWriteUTF16LE $0 `!define ${Variable} "${Value}"$\r$\n`
+!macroend
+
+!macro SetIndividualLanguage IndividualLanguage
+	StrCpy $2 "${IndividualLanguage}"
+	${ReadINIStrWithDefault} $1 $InstallerINIFile "Languages" "$2" "false"
+	${If} $1 == "true"
+	${OrIf} $ALLLANGUAGES == "true"
+		${WriteConfig} USES_$2 "true"
+	${EndIf}
+!macroend
+
+!define WriteErrorToLog "!insertmacro WriteErrorToLog"
+
+!macro WriteErrorToLog ErrorToWrite
+	FileOpen $9 "$EXEDIR\Data\PortableApps.comInstallerLog.txt" a
+	FileSeek $9 0 END
+	FileWriteUTF16LE $9 `ERROR: ${ErrorToWrite}$\r$\n`
+	FileClose $9
+	StrCpy $ERROROCCURED "true"
+!macroend
+
+!define TransferInstallerINIToConfig "!insertmacro TransferInstallerINIToConfig"
+
+!macro TransferInstallerINIToConfig Section Key Required
+	${ReadINIStrWithDefault} $1 $InstallerINIFile ${Section} ${Key} ""
+	${If} $1 != ""
+		${WriteConfig} ${Key} "$1"
+	!if ${Required} == required
+	${Else}
+		${WriteErrorToLog} "Installer.ini - ${Section} - ${Key} is missing."
+	!endif
+	${EndIf}
+!macroend
+
+Section Main
+	!insertmacro MUI_HEADER_TEXT "PortableApps.com Installer ${FRIENDLYVER}" "the open portable software standard"
+	${TBProgress} 33
+	SetDetailsPrint ListOnly
+	DetailPrint "App: $INSTALLAPPDIRECTORY"
+	DetailPrint " "
+	;FindWindow $0 "#32770" "" $HWNDPARENT
+	;FindWindow $1 "msctls_progress32" "" $0
+	
+	;DetailPrint "Hanlde: $1"
+	RealProgress::SetProgress /NOUNLOAD 1
+	RealProgress::GradualProgress /NOUNLOAD 2 1 90 "Processing complete."
+	DetailPrint "Generating installer code..."
+	SetDetailsPrint none
+
+	;Ensure the source directory exists
+	CreateDirectory "$INSTALLAPPDIRECTORY\Other\Source"
+
+	;Remove any existing installer files (leaving custom intact)
+	RMDir /r "$INSTALLAPPDIRECTORY\Other\Source\PortableApps.comInstallerLanguages"
+	Delete "$INSTALLAPPDIRECTORY\Other\Source\PortableApps.comInstaller.bmp"
+	Delete "$INSTALLAPPDIRECTORY\Other\Source\PortableApps.comInstaller.ico"
+	Delete "$INSTALLAPPDIRECTORY\Other\Source\PortableApps.comInstaller.nsi"
+	Delete "$INSTALLAPPDIRECTORY\Other\Source\PortableApps.comInstallerConfig-EXAMPLE.nsh"
+	Delete "$INSTALLAPPDIRECTORY\Other\Source\PortableApps.comInstallerConfig.nsh"
+	Delete "$INSTALLAPPDIRECTORY\Other\Source\PortableApps.comInstallerDumpLogToFile.nsh"
+	Delete "$INSTALLAPPDIRECTORY\Other\Source\PortableApps.comInstallerHeader.bmp"
+	Delete "$INSTALLAPPDIRECTORY\Other\Source\PortableApps.comInstallerMoveFiles.nsh"
+	Delete "$INSTALLAPPDIRECTORY\Other\Source\PortableApps.comInstallerStrRep.nsh"
+	Delete "$INSTALLAPPDIRECTORY\Other\Source\PortableApps.comInstallerHeaderRTL.bmp"
+	Delete "$INSTALLAPPDIRECTORY\Other\Source\PortableApps.comInstallerPlugin.nsi"
+	Delete "$INSTALLAPPDIRECTORY\Other\Source\PortableApps.comInstallerPluginConfig.nsh"
+	Delete "$INSTALLAPPDIRECTORY\Other\Source\PortableApps.comInstallerTBProgress.nsh"
+
+	;Copy the current PortableApps.com Installer in
+	CopyFiles /SILENT "$EXEDIR\App\installer\*.*" "$INSTALLAPPDIRECTORY\Other\Source"
+	${If} $PluginInstaller == "true"
+		Rename "$INSTALLAPPDIRECTORY\Other\Source\PortableApps.comInstaller.nsi" "$INSTALLAPPDIRECTORY\Other\Source\PortableApps.comInstallerPlugin.nsi"
+		Rename "$INSTALLAPPDIRECTORY\Other\Source\PortableApps.comInstallerConfig.nsh" "$INSTALLAPPDIRECTORY\Other\Source\PortableApps.comInstallerPluginConfig.nsh"
+	${EndIf}
+
+	;Generate the configuration file
+	Delete "$EXEDIR\Data\PortableApps.comInstallerLog.txt"
+
+	;Determine icon type
+	${ReadINIStrWithDefault} $1 $AppInfoINIFile "Control" "ExtractIcon" ""
+	${If} $1 != ""
+		StrCpy $USEEXTRACTEDICON "true"
+	${EndIf}
+
+	;Check for content
+	${IfNot} ${FileExists} "$INSTALLAPPDIRECTORY\*.exe"
+	${AndIf} $PluginInstaller != "true"
+		${WriteErrorToLog} "No EXE in $INSTALLAPPDIRECTORY."
+	${EndIf}
+
+	${IfNot} ${FileExists} "$INSTALLAPPDIRECTORY\help.html"
+	${AndIf} $PluginInstaller != "true"
+		${WriteErrorToLog} "No help.html in $INSTALLAPPDIRECTORY."
+	${EndIf}
+
+	!macro AppInfoFileMissingAskInsertDefault FileName FileDescription
+	${IfNot} ${FileExists} "$INSTALLAPPDIRECTORY\App\AppInfo\${FileName}"
+	${AndIf} $PluginInstaller != "true"
+		${If} $USEEXTRACTEDICON == "true"
+			!if ${FileName} == appicon.ico
+			;Copy the default icon in (appicon_*.png don't get included)
+			CopyFiles /SILENT "$EXEDIR\App\default_bits\${FileName}" "$INSTALLAPPDIRECTORY\App\AppInfo"
+			!endif
+		${ElseIf} $INTERACTIVEMODE = 1
+		${AndIf} ${Cmd} ${|} MessageBox MB_ICONQUESTION|MB_YESNO "The app does not have ${FileDescription} (${FileName}) in the App\AppInfo directory.  Would you like to use a default icon for test purposes for now?" IDYES ${|}
+			CopyFiles /SILENT "$EXEDIR\App\default_bits\${FileName}" "$INSTALLAPPDIRECTORY\App\AppInfo"
+			MessageBox MB_ICONINFORMATION "Before releasing this application, please be sure to create a proper ${FileName} app icon in App\AppInfo."
+		${Else}
+			${WriteErrorToLog} "No ${FileName} in $INSTALLAPPDIRECTORY\App\AppInfo."
+		${EndIf}
+	${EndIf}
+	!macroend
+
+	!insertmacro AppInfoFileMissingAskInsertDefault appicon_16.png "a 16x16 PNG icon"
+	!insertmacro AppInfoFileMissingAskInsertDefault appicon_32.png "a 32x32 PNG icon"
+	!insertmacro AppInfoFileMissingAskInsertDefault appicon.ico    "an icon"
+
+	${If} $PluginInstaller == "true"
+		FileOpen $0 "$INSTALLAPPDIRECTORY\Other\Source\PortableApps.comInstallerPluginConfig.nsh" a
+	${Else}
+		FileOpen $0 "$INSTALLAPPDIRECTORY\Other\Source\PortableApps.comInstallerConfig.nsh" a
+	${EndIf}
+	FileSeek $0 0 END
+	FileWriteUTF16LE $0 `;Code generated by PortableApps.com Installer ${FRIENDLYVER}.  DO NOT EDIT.$\r$\n$\r$\n`
+
+	;PortableApps.comFormat Version
+	${ReadINIStrWithDefault} $1 $AppInfoINIFile "Format" "Version" ""
+	${If} $1 == "0.9.8"
+		;Preserve old installer config in case it's needed
+		Rename "$INSTALLAPPDIRECTORY\Other\Source\PortableApps.comInstallerConfig.nsh" "$INSTALLAPPDIRECTORY\Other\Source\PortableApps.comInstallerConfigOld.nsh"
+
+		;Autogenerate App ID is handled normally when interactive
+
+		;Language selection is handled normally when in interactive
+
+		;This brings it up to 0.90
+		StrCpy $1 "0.90"
+	${EndIf}
+	${If} $1 == "0.90"
+		;0.90 to 0.91 needs no changes, so it brings it to 0.91
+		StrCpy $1 "0.91"
+	${EndIf}
+	${If} $1 == "0.91"
+		;0.91 to 1.0 needs no changes, so it brings it to 1.0
+		StrCpy $1 "1.0"
+	${EndIf}
+	${If} $1 == "1.0"
+	${OrIf} $1 == "2.0"
+		;1.0 to 2.0 needs no changes, so it brings it to 2.0
+		WriteINIStr $AppInfoINIFile "Format" "Version" "${PORTABLEAPPS.COMFORMATVERSION}"
+	${EndIf}
+
+	!macro GetValueFromAppInfo Section Key Prompt DefaultValue Variable Required
+		ReadINIStr ${Variable} $AppInfoINIFile ${Section} ${Key}
+		${If} ${Variable} == ""
+			${If} $INTERACTIVEMODE = 1
+				${InputTextBox} "${APPNAME}" "${Prompt}" "${DefaultValue}" "255" "OK" "Cancel" 9
+				${If} $9 != ""
+					StrCpy ${Variable} $9
+					WriteINIStr $AppInfoINIFile ${Section} ${Key} $9
+				!if ${Required} == required
+				${Else}
+					${WriteErrorToLog} "AppInfo.ini - ${Section} - ${Key} is missing."
+				!endif
+				${EndIf}
+			!if ${Required} == required
+			${Else}
+				${WriteErrorToLog} "AppInfo.ini - ${Section} - ${Key} is missing."
+			!endif
+			${EndIf}
+		${EndIf}
+	!macroend
+
+	;App Name
+	!insertmacro GetValueFromAppInfo \
+		Details \
+		Name \
+		"Enter the portable app's name (e.g. FileZilla Portable):" \
+		"AppName Portable" \
+		$PORTABLEAPPNAME \
+		required
+
+	${If} $PluginInstaller != "true"
+		${WriteConfig} PORTABLEAPPNAME "$PORTABLEAPPNAME"
+		${WordReplace} $PORTABLEAPPNAME "&" "~~~@@@~~~" + $PORTABLEAPPNAMEDOUBLEDAMPERSANDS
+		${WordReplace} $PORTABLEAPPNAMEDOUBLEDAMPERSANDS "~~~@@@~~~" "&&" + $PORTABLEAPPNAMEDOUBLEDAMPERSANDS
+		${WriteConfig} PORTABLEAPPNAMEDOUBLEDAMPERSANDS "$PORTABLEAPPNAMEDOUBLEDAMPERSANDS"
+	${EndIf}
+
+	;Plugin Name
+	${If} $PluginInstaller == "true"
+		!insertmacro GetValueFromAppInfo \
+			Details \
+			PluginName \
+			"Enter the plugin's name (e.g. Acme Plugin):" \
+			"Plugin" \
+			$PLUGINNAME \
+			required
+
+		${WriteConfig} PLUGINNAME "$PLUGINNAME"
+		${WriteConfig} PORTABLEAPPNAME "$PLUGINNAME"
+		${WordReplace} $PLUGINNAME "&" "~~~@@@~~~" + $PORTABLEAPPNAMEDOUBLEDAMPERSANDS
+		${WordReplace} $PORTABLEAPPNAMEDOUBLEDAMPERSANDS "~~~@@@~~~" "&&" + $PORTABLEAPPNAMEDOUBLEDAMPERSANDS
+		${WriteConfig} PORTABLEAPPNAMEDOUBLEDAMPERSANDS "$PORTABLEAPPNAMEDOUBLEDAMPERSANDS"
+		${ReadINIStrWithDefault} $1 $AppInfoINIFile "Details" "PluginType" "App"
+		${If} $1 == "CommonFiles"
+			StrCpy $COMMONFILESPLUGIN "true"
+			${WriteConfig} COMMONFILESPLUGIN "true"
+		${EndIf}
+	${EndIf}
+
+
+	;App ID
+	${WordReplace} $PORTABLEAPPNAME " "   ""  + $8
+	${WordReplace} $8               " "   "_" + $8
+	${WordReplace} $8               "("   ""  + $8
+	${WordReplace} $8               ")"   ""  + $8
+	${WordReplace} $8               "["   ""  + $8
+	${WordReplace} $8               "]"   ""  + $8
+	${WordReplace} $8               "~"   "-" + $8
+	${WordReplace} $8               "&"   "+" + $8
+	${WordReplace} $8               "#"   "+" + $8
+	${WordReplace} $8               "$\"" "-" + $8
+	${WordReplace} $8               "*"   "+" + $8
+	${WordReplace} $8               "/"   "_" + $8
+	${WordReplace} $8               "\"   "_" + $8
+	${WordReplace} $8               ":"   "." + $8
+	${WordReplace} $8               "<"   "-" + $8
+	${WordReplace} $8               ">"   "-" + $8
+	${WordReplace} $8               "?"   ""  + $8
+	${WordReplace} $8               "|"   "-" + $8
+	${WordReplace} $8               "="   "-" + $8
+	${WordReplace} $8               ","   "." + $8
+	${WordReplace} $8               ";"   "." + $8
+	!insertmacro GetValueFromAppInfo \
+		Details \
+		AppID \
+		"Enter the portable app's App ID (usually the name with no spaces or symbols):" \
+		$8 \
+		$APPID \
+		required
+
+	${WriteConfig} APPID "$APPID"
+	StrCpy $SHORTNAME $APPID
+
+	;Publisher
+	!insertmacro GetValueFromAppInfo \
+		Details \
+		Publisher \
+		"Enter the publisher ('App Developer && PortableApps.com' for our apps):" \
+		"No Publisher Specified" \
+		$1 \
+		optional
+
+	;Homepage
+	!insertmacro GetValueFromAppInfo \
+		Details \
+		Homepage \
+		"Enter the app's homepage (e.g. portableapps.com):" \
+		"example.com" \
+		$1 \
+		optional
+
+	;Category
+	!insertmacro GetValueFromAppInfo \
+		Details \
+		Category \
+		"Enter the app's category *exactly* (Accessibility, Development, Education, Games, Graphics && Pictures, Internet, Music && Video, Office, Operating Systems, Utilities):" \
+		"" \
+		$1 \
+		optional
+
+	;Description
+	!insertmacro GetValueFromAppInfo \
+		Details \
+		Description \
+		"Enter the app's description (e.g. Simple FTP program.):" \
+		"" \
+		$1 \
+		optional
+
+	;Language
+	!insertmacro GetValueFromAppInfo \
+		Details \
+		Language \
+		"Enter the portable app's language as expected by NSIS (e.g. English or Multilingual):" \
+		"English" \
+		$APPLANGUAGE \
+		optional
+	${If} $APPLANGUAGE == ""
+		StrCpy $APPLANGUAGE "English"
+	${EndIf}
+
+	!macro GetLicenseValueFromAppInfo Key Prompt
+		ReadINIStr $1 $AppInfoINIFile License ${Key}
+		${If} $1 == ""
+			${If} $INTERACTIVEMODE = 1
+				${If} ${Cmd} ${|} MessageBox MB_ICONQUESTION|MB_YESNO "License Question: ${Prompt}" IDYES ${|}
+					StrCpy $1 "true"
+				${Else}
+					StrCpy $1 "false"
+				${EndIf}
+				WriteINIStr $AppInfoINIFile License ${Key} $1
+			${EndIf}
+		${EndIf}
+	!macroend
+
+	;License
+	!insertmacro GetLicenseValueFromAppInfo Shareable     "Can this application be legally shared from one user to another?"
+	!insertmacro GetLicenseValueFromAppInfo OpenSource    "Is this application 100% open source under an OSI-approved license?"
+	!insertmacro GetLicenseValueFromAppInfo Freeware      "Is this application freeware (it can be used without payment)?"
+	!insertmacro GetLicenseValueFromAppInfo CommercialUse "Can this app be used in a commercial environment?"
+
+	;EULA Version
+	${ReadINIStrWithDefault} $EULAVERSION $AppInfoINIFile "License" "EULAVersion" ""
+
+	;Display Version
+	!insertmacro GetValueFromAppInfo \
+		Version \
+		DisplayVersion \
+		"Enter the portable app's display version (e.g. 1.0 or 2.2 Beta 1):" \
+		"0.1" \
+		$DISPLAYVERSION \
+		required
+
+	;Package Version
+	!insertmacro GetValueFromAppInfo \
+		Version \
+		PackageVersion \
+		"Enter the portable app's package version as all numbers in the form X.X.X.X (e.g. 1.0.0.0 or 2.2.0.1):" \
+		"0.1.0.0" \
+		$1 \
+		required
+
+	${WriteConfig} VERSION "$1"
+
+	;Filename should only be alpha, numbers as well as:  + . - _
+	${If} $PluginInstaller == "true"
+		StrCpy $INSTALLERFILENAME "$PLUGINNAME_$DISPLAYVERSION"
+	${Else}
+		StrCpy $INSTALLERFILENAME "$APPID_$DISPLAYVERSION"
+	${EndIf}
+
+	${If} $APPLANGUAGE != "Multilingual"
+		StrCpy $INSTALLERFILENAME "$INSTALLERFILENAME_$APPLANGUAGE"
+	${EndIf}
+
+	${WordReplace} $INSTALLERFILENAME " "   "_"    + $INSTALLERFILENAME
+	${WordReplace} $INSTALLERFILENAME "("   ""     + $INSTALLERFILENAME
+	${WordReplace} $INSTALLERFILENAME ")"   ""     + $INSTALLERFILENAME
+	${WordReplace} $INSTALLERFILENAME "["   ""     + $INSTALLERFILENAME
+	${WordReplace} $INSTALLERFILENAME "]"   ""     + $INSTALLERFILENAME
+	${WordReplace} $INSTALLERFILENAME "~"   "-"    + $INSTALLERFILENAME
+	${WordReplace} $INSTALLERFILENAME "&"   "-"    + $INSTALLERFILENAME
+	${WordReplace} $INSTALLERFILENAME "#"   "-"    + $INSTALLERFILENAME
+	${WordReplace} $INSTALLERFILENAME "$\"" "-"    + $INSTALLERFILENAME
+	${WordReplace} $INSTALLERFILENAME "*"   "-"    + $INSTALLERFILENAME
+	${WordReplace} $INSTALLERFILENAME "/"   "_"    + $INSTALLERFILENAME
+	${WordReplace} $INSTALLERFILENAME "\"   "_"    + $INSTALLERFILENAME
+	${WordReplace} $INSTALLERFILENAME ":"   "."    + $INSTALLERFILENAME
+	${WordReplace} $INSTALLERFILENAME "<"   "-"    + $INSTALLERFILENAME
+	${WordReplace} $INSTALLERFILENAME ">"   "-"    + $INSTALLERFILENAME
+	${WordReplace} $INSTALLERFILENAME "?"   ""     + $INSTALLERFILENAME
+	${WordReplace} $INSTALLERFILENAME "|"   "-"    + $INSTALLERFILENAME
+	${WordReplace} $INSTALLERFILENAME "="   "-"    + $INSTALLERFILENAME
+	${WordReplace} $INSTALLERFILENAME ","   "."    + $INSTALLERFILENAME
+	${WordReplace} $INSTALLERFILENAME ";"   "."    + $INSTALLERFILENAME
+	${WordReplace} $INSTALLERFILENAME "+"   "Plus" + $INSTALLERFILENAME
+
+	${ReadINIStrWithDefault} $1 $InstallerINIFile "DownloadFiles" "DownloadURL" ""
+	${If} $1 != ""
+		StrCpy $INSTALLERFILENAME "$INSTALLERFILENAME_online"
+	${EndIf}
+
+	${WriteConfig} FILENAME "$INSTALLERFILENAME"
+
+	
+	${ReadINIStrWithDefault} $1 $AppInfoINIFile "Control" "Start" ""
+		${If} $1 == ""
+		${WriteErrorToLog} "AppInfo.ini - Control - Start is missing."
+	${Else}
+		${WriteConfig} FINISHPAGERUN "$1"
+	${EndIf}
+	${IfNot} ${FileExists} "$INSTALLAPPDIRECTORY\$1"
+	${AndIf} $PluginInstaller != "true"
+		${WriteErrorToLog} "AppInfo.ini - Control - Start=$1, file is missing."
+	${EndIf}
+
+	${ReadINIStrWithDefault} $2 $InstallerINIFile "CheckRunning" "CloseEXE" "$1"
+	${WriteConfig} CHECKRUNNING "$2"
+	${ReadINIStrWithDefault} $1 $InstallerINIFile "CheckRunning" "CloseName" "$PORTABLEAPPNAME"
+	${WriteConfig} CLOSENAME "$1"
+	${ReadINIStrWithDefault} $1 $AppInfoINIFile "SpecialPaths" "Plugins" "NONE"
+	${WriteConfig} ADDONSDIRECTORYPRESERVE "$1"
+	${WriteConfig} INSTALLERCOMMENTS "For additional details, visit PortableApps.com"
+	${ReadINIStrWithDefault} $1 $AppInfoINIFile "Details" "Trademarks" ""
+	${If} $1 != ""
+		StrCpy $1 "$1. "
+	${EndIf}
+	${WriteConfig} INSTALLERADDITIONALTRADEMARKS "$1"
+
+	;Source Code
+	${ReadINIStrWithDefault} $INCLUDESOURCE $InstallerINIFile "Source" "IncludeInstallerSource" "false"
+	${If} $INCLUDESOURCE == "true"
+		${WriteConfig} INCLUDEINSTALLERSOURCE "true"
+	${EndIf}
+
+	;Languages
+	${If} $APPLANGUAGE != "Multilingual"
+		${WriteConfig} INSTALLERLANGUAGE "$APPLANGUAGE"
+	${Else}
+		${WriteConfig} INSTALLERMULTILINGUAL "true"
+
+		${ReadINIStrWithDefault} $1 $InstallerINIFile "Languages" "English" ""
+		${If} $1 == ""
+			StrCpy $ALLLANGUAGES "true"
+		${EndIf}
+
+		${SetIndividualLanguage} "ENGLISH"
+		${SetIndividualLanguage} "ENGLISHGB"
+		${SetIndividualLanguage} "AFRIKAANS"
+		${SetIndividualLanguage} "ALBANIAN"
+		${SetIndividualLanguage} "ARABIC"
+		${SetIndividualLanguage} "ARMENIAN"
+		${SetIndividualLanguage} "BASQUE"
+		${SetIndividualLanguage} "BELARUSIAN"
+		${SetIndividualLanguage} "BOSNIAN"
+		${SetIndividualLanguage} "BRETON"
+		${SetIndividualLanguage} "BULGARIAN"
+		${SetIndividualLanguage} "CATALAN"
+		${SetIndividualLanguage} "CROATIAN"
+		${SetIndividualLanguage} "CZECH"
+		${SetIndividualLanguage} "DANISH"
+		${SetIndividualLanguage} "DUTCH"
+		${SetIndividualLanguage} "ESPERANTO"
+		${SetIndividualLanguage} "ESTONIAN"
+		${SetIndividualLanguage} "FARSI"
+		${SetIndividualLanguage} "FINNISH"
+		${SetIndividualLanguage} "FRENCH"
+		${SetIndividualLanguage} "GALICIAN"
+		${SetIndividualLanguage} "GERMAN"
+		${SetIndividualLanguage} "GREEK"
+		${SetIndividualLanguage} "HEBREW"
+		${SetIndividualLanguage} "HUNGARIAN"
+		${SetIndividualLanguage} "ICELANDIC"
+		${SetIndividualLanguage} "INDONESIAN"
+		${SetIndividualLanguage} "IRISH"
+		${SetIndividualLanguage} "ITALIAN"
+		${SetIndividualLanguage} "JAPANESE"
+		${SetIndividualLanguage} "KOREAN"
+		${SetIndividualLanguage} "KURDISH"
+		${SetIndividualLanguage} "LATVIAN"
+		${SetIndividualLanguage} "LITHUANIAN"
+		${SetIndividualLanguage} "LUXEMBOURGISH"
+		${SetIndividualLanguage} "MACEDONIAN"
+		${SetIndividualLanguage} "MALAY"
+		${SetIndividualLanguage} "MONGOLIAN"
+		${SetIndividualLanguage} "NORWEGIAN"
+		${SetIndividualLanguage} "NORWEGIANNYNORSK"
+		${SetIndividualLanguage} "POLISH"
+		${SetIndividualLanguage} "PORTUGUESE"
+		${SetIndividualLanguage} "PORTUGUESEBR"
+		${SetIndividualLanguage} "ROMANIAN"
+		${SetIndividualLanguage} "RUSSIAN"
+		${SetIndividualLanguage} "SERBIAN"
+		${SetIndividualLanguage} "SERBIANLATIN"
+		${SetIndividualLanguage} "SIMPCHINESE"
+		${SetIndividualLanguage} "SLOVAK"
+		${SetIndividualLanguage} "SLOVENIAN"
+		${SetIndividualLanguage} "SPANISH"
+		${SetIndividualLanguage} "SPANISHINTERNATIONAL"
+		${SetIndividualLanguage} "SWEDISH"
+		${SetIndividualLanguage} "THAI"
+		${SetIndividualLanguage} "TRADCHINESE"
+		${SetIndividualLanguage} "TURKISH"
+		${SetIndividualLanguage} "UKRAINIAN"
+		${SetIndividualLanguage} "UZBEK"
+		${SetIndividualLanguage} "WELSH"
+	${EndIf}
+
+	;EULA
+	${If} $PluginInstaller == "true"
+		${If} ${FileExists} "$INSTALLAPPDIRECTORY\App\AppInfo\PluginEULA.txt"
+			${WriteConfig} LICENSEAGREEMENT "PluginEULA.txt"
+		${ElseIf} ${FileExists} "$INSTALLAPPDIRECTORY\Other\Source\PluginEULA.txt"
+			Rename "$INSTALLAPPDIRECTORY\Other\Source\PluginEULA.txt" "$INSTALLAPPDIRECTORY\App\AppInfo\PluginEULA.txt"
+			${WriteConfig} LICENSEAGREEMENT "PluginEULA.txt"
+		${ElseIf} ${FileExists} "$INSTALLAPPDIRECTORY\Other\Source\PluginEULA.rtf"
+			${WriteErrorToLog} "EULA - Other\Source\PluginEULA.rtf is no longer supported.  Use App\AppInfo\PluginEULA.txt instead."
+		${ElseIf} ${FileExists} "$INSTALLAPPDIRECTORY\App\AppInfo\PluginEULA.rtf"
+			${WriteErrorToLog} "EULA - App\AppInfo\PluginEULA.rtf is not supported.  Use App\AppInfo\PluginEULA.txt instead."
+		${EndIf}
+	${Else}
+		${If} ${FileExists} "$INSTALLAPPDIRECTORY\App\AppInfo\EULA.txt"
+			${WriteConfig} LICENSEAGREEMENT "eula.txt"
+		${ElseIf} ${FileExists} "$INSTALLAPPDIRECTORY\Other\Source\EULA.txt"
+			Rename "$INSTALLAPPDIRECTORY\Other\Source\EULA.txt" "$INSTALLAPPDIRECTORY\App\AppInfo\EULA.txt"
+			${WriteConfig} LICENSEAGREEMENT "eula.txt"
+		${ElseIf} ${FileExists} "$INSTALLAPPDIRECTORY\Other\Source\EULA.rtf"
+			${WriteErrorToLog} "EULA - Other\Source\EULA.rtf is no longer supported.  Use App\AppInfo\EULA.txt instead."
+		${ElseIf} ${FileExists} "$INSTALLAPPDIRECTORY\App\AppInfo\EULA.rtf"
+			${WriteErrorToLog} "EULA - App\AppInfo\EULA.rtf is not supported.  Use App\AppInfo\EULA.txt instead."
+		${EndIf}
+	${EndIf}
+
+	${If} $EULAVERSION != ""
+		${WriteConfig} EULAVERSION "$EULAVERSION"
+	${EndIf}
+
+	;OptionalComponents
+	${ReadINIStrWithDefault} $OPTIONALCOMPONENTS $InstallerINIFile "OptionalComponents" "OptionalComponents" "false"
+	${If} $OPTIONALCOMPONENTS == "true"
+		${ReadINIStrWithDefault} $1 $InstallerINIFile "OptionalComponents" "MainSectionTitle" "$PORTABLEAPPNAME (English) [Required]"
+		${WriteConfig} MAINSECTIONTITLE "$1"
+		${ReadINIStrWithDefault} $1 $InstallerINIFile "OptionalComponents" "MainSectionDescription" "Install the portable app"
+		${WriteConfig} MAINSECTIONDESCRIPTION "$1"
+		${ReadINIStrWithDefault} $1 $InstallerINIFile "OptionalComponents" "OptionalSectionTitle" "Additional Languages"
+		${WriteConfig} OPTIONALSECTIONTITLE "$1"
+		${ReadINIStrWithDefault} $1 $InstallerINIFile "OptionalComponents" "OptionalSectionDescription" "Add multilingual support for this app"
+		${WriteConfig} OPTIONALSECTIONDESCRIPTION "$1"
+		${ReadINIStrWithDefault} $OptionalSectionSelectedInstallType $InstallerINIFile "OptionalComponents" "OptionalSectionSelectedInstallType" "Multilingual"
+		${WriteConfig} OPTIONALSECTIONSELECTEDINSTALLTYPE "$OptionalSectionSelectedInstallType"
+		${ReadINIStrWithDefault} $1 $InstallerINIFile "OptionalComponents" "OptionalSectionNotSelectedInstallType" "English"
+		${WriteConfig} OPTIONALSECTIONNOTSELECTEDINSTALLTYPE "$1"
+		${ReadINIStrWithDefault} $1 $InstallerINIFile "OptionalComponents" "OptionalSectionPreSelectedIfNonEnglishInstall" "true"
+		${If} $1 == "true"
+			${WriteConfig} OPTIONALSECTIONPRESELECTEDIFNONENGLISHINSTALL "$1"
+		${EndIf}
+
+		${If} $OptionalSectionSelectedInstallType == "Multilingual"
+			${ReadINIStrWithDefault} $1 $InstallerINIFile "OptionalComponents" "OptionalSectionInstalledWhenSilent" "false"
+		${Else}
+			${ReadINIStrWithDefault} $1 $InstallerINIFile "OptionalComponents" "OptionalSectionInstalledWhenSilent" "true"
+		${EndIf}
+
+		${If} $1 == "true"
+			${WriteConfig} OPTIONALSECTIONINSTALLEDWHENSILENT "$1"
+		${EndIf}
+	${EndIf}
+
+	;Main directories
+	${If} $PluginInstaller == "true"
+	${AndIf} $COMMONFILESPLUGIN != "true"
+		${ReadINIStrWithDefault} $1 $InstallerINIFile "MainDirectories" "RemoveAppDirectory" "false"
+	${Else}
+		${ReadINIStrWithDefault} $1 $InstallerINIFile "MainDirectories" "RemoveAppDirectory" "true"
+	${EndIf}
+	${If} $1 == "true"
+		${WriteConfig} REMOVEAPPDIRECTORY "true"
+	${EndIf}
+	${ReadINIStrWithDefault} $1 $InstallerINIFile "MainDirectories" "RemoveDataDirectory" "false"
+	${If} $1 == "true"
+		${WriteConfig} REMOVEDATADIRECTORY "true"
+	${EndIf}
+	${If} $PluginInstaller == "true"
+		${ReadINIStrWithDefault} $1 $InstallerINIFile "MainDirectories" "RemoveOtherDirectory" "false"
+	${Else}
+		${ReadINIStrWithDefault} $1 $InstallerINIFile "MainDirectories" "RemoveOtherDirectory" "true"
+	${EndIf}
+	${If} $1 == "true"
+		${WriteConfig} REMOVEOTHERDIRECTORY "true"
+	${EndIf}
+
+	;Preserve directories
+	StrCpy $R1 1
+	${Do}
+		${ReadINIStrWithDefault} $1 $InstallerINIFile "DirectoriesToPreserve" "PreserveDirectory$R1" ""
+		${If} $1 != ""
+			${WriteConfig} PRESERVEDIRECTORY$R1 "$1"
+		${EndIf}
+		IntOp $R1 $R1 + 1
+	${LoopUntil} $R1 > 10
+
+	;Remove directories
+	StrCpy $R1 1
+	${Do}
+		${ReadINIStrWithDefault} $1 $InstallerINIFile "DirectoriesToRemove" "RemoveDirectory$R1" ""
+		${If} $1 != ""
+			${WriteConfig} REMOVEDIRECTORY$R1 "$1"
+		${EndIf}
+		IntOp $R1 $R1 + 1
+	${LoopUntil} $R1 > 10
+
+	;Preserve files
+	StrCpy $R1 1
+	${Do}
+		${ReadINIStrWithDefault} $1 $InstallerINIFile "FilesToPreserve" "PreserveFile$R1" ""
+		${If} $1 != ""
+			${WriteConfig} PRESERVEFILE$R1 "$1"
+		${EndIf}
+		IntOp $R1 $R1 + 1
+	${LoopUntil} $R1 > 10
+
+	;Remove files
+	StrCpy $R1 1
+	${Do}
+		${ReadINIStrWithDefault} $1 $InstallerINIFile "FilesToRemove" "RemoveFile$R1" ""
+		${If} $1 != ""
+			${WriteConfig} REMOVEFILE$R1 "$1"
+		${EndIf}
+		IntOp $R1 $R1 + 1
+	${LoopUntil} $R1 > 10
+
+	;Custom code
+	${If} $PluginInstaller == "true"
+		StrCpy $9 "$INSTALLAPPDIRECTORY\Other\Source\PortableApps.comInstallerPluginCustom.nsh"
+	${Else}
+		StrCpy $9 "$INSTALLAPPDIRECTORY\Other\Source\PortableApps.comInstallerCustom.nsh"
+	${EndIf}
+	${If} ${FileExists} $9
+		${WriteConfig} USESCUSTOMCODE "true"
+	${EndIf}
+
+	;Local Files
+	${ReadINIStrWithDefault} $1 $InstallerINIFile "CopyLocalFiles" "CopyLocalFiles" "false"
+	${If} $1 == "true"
+		${WriteConfig} COPYLOCALFILES "true"
+
+		!insertmacro TransferInstallerINIToConfig CopyLocalFiles CopyFromRegPath -
+		!insertmacro TransferInstallerINIToConfig CopyLocalFiles CopyFromRegKey -
+		!insertmacro TransferInstallerINIToConfig CopyLocalFiles CopyFromRegRemoveDirectories -
+		!insertmacro TransferInstallerINIToConfig CopyLocalFiles CopyFromDirectory -
+		!insertmacro TransferInstallerINIToConfig CopyLocalFiles CopyToDirectory -
+	${EndIf}
+
+	;Download files
+	${ReadINIStrWithDefault} $1 $InstallerINIFile "DownloadFiles" "DownloadURL" ""
+	${If} $1 != ""
+		StrCpy $2 $1 7
+
+		${If} $2 == "http://"
+			${WriteConfig} DownloadURL "$1"
+
+			!insertmacro TransferInstallerINIToConfig DownloadFiles DownloadName          required
+			!insertmacro TransferInstallerINIToConfig DownloadFiles DownloadFilename      required
+			!insertmacro TransferInstallerINIToConfig DownloadFiles DownloadMD5           -
+			!insertmacro TransferInstallerINIToConfig DownloadFiles DownloadTo            -
+			!insertmacro TransferInstallerINIToConfig DownloadFiles AdditionalInstallSize required
+
+			${For} $R1 1 10
+				${ReadINIStrWithDefault} $1 $InstallerINIFile "DownloadFiles" "Extract$R1To" ""
+				${If} $1 != ""
+					${If} $1 == "<ROOT>"
+						StrCpy $1 ""
+					${EndIf}
+					${WriteConfig} Extract$R1To "$1"
+				${EndIf}
+			${Next}
+
+			${For} $R1 1 10
+				${ReadINIStrWithDefault} $1 $InstallerINIFile "DownloadFiles" "Extract$R1File" ""
+				${If} $1 != ""
+					${WriteConfig} Extract$R1File "$1"
+				${EndIf}
+			${Next}
+
+			${For} $R1 1 10
+				${ReadINIStrWithDefault} $1 $InstallerINIFile "DownloadFiles" "AdvancedExtract$R1To" ""
+				${If} $1 != ""
+					${If} $1 == "<ROOT>"
+						StrCpy $1 ""
+					${EndIf}
+					${WriteConfig} AdvancedExtract$R1To "$1"
+				${EndIf}
+			${Next}
+
+			${For} $R1 1 10
+				${ReadINIStrWithDefault} $1 $InstallerINIFile "DownloadFiles" "AdvancedExtract$R1Filter" ""
+				${If} $1 != ""
+					${WriteConfig} AdvancedExtract$R1Filter "$1"
+				${EndIf}
+			${Next}
+
+			${ReadINIStrWithDefault} $1 $InstallerINIFile "DownloadFiles" "DoubleExtractFilename" ""
+			${If} $1 != ""
+				${WriteConfig} DoubleExtractFilename "$1"
+
+				${For} $R1 1 10
+					${ReadINIStrWithDefault} $1 $InstallerINIFile "DownloadFiles" "DoubleExtract$R1To" ""
+					${If} $1 != ""
+						${If} $1 == "<ROOT>"
+							StrCpy $1 ""
+						${EndIf}
+						${WriteConfig} DoubleExtract$R1To "$1"
+					${EndIf}
+				${Next}
+
+				${For} $R1 1 10
+					${ReadINIStrWithDefault} $1 $InstallerINIFile "DownloadFiles" "DoubleExtract$R1Filter" ""
+					${If} $1 != ""
+						${WriteConfig} DoubleExtract$R1Filter "$1"
+					${EndIf}
+				${Next}
+
+			${EndIf}
+		${Else}
+			${WriteErrorToLog} "Installer.ini - DownloadFiles - DownloadURL must begin with http://"
+		${EndIf}
+	${EndIf}
+
+	FileClose $0
+
+	; If errors have occurred, there's no point in going on to the actual generation of it.
+	${If} $ERROROCCURED != "true"
+		;Make the installer header
+		${If} $USEEXTRACTEDICON == "true"
+		${OrIf} $PluginInstaller == "true"
+			CopyFiles /SILENT "$EXEDIR\App\default_bits\PortableApps.comInstallerHeader.bmp" "$INSTALLAPPDIRECTORY\Other\Source"
+			CopyFiles /SILENT "$EXEDIR\App\default_bits\PortableApps.comInstallerHeaderRTL.bmp" "$INSTALLAPPDIRECTORY\Other\Source"
+		${Else}
+			ExecWait `"$EXEDIR\App\bin\MakeHeader.exe" "$INSTALLAPPDIRECTORY"`
+		${EndIf}
+
+		;Move optional component files
+		${If} $OPTIONALCOMPONENTS == "true"
+			CreateDirectory "$INSTALLAPPDIRECTORY\Optional1"
+
+			;Move directories
+			StrCpy $R1 1
+			${Do}
+				${ReadINIStrWithDefault} $1 $InstallerINIFile "OptionalComponents" "OptionalDirectory$R1" "\COMPLETED\"
+				${If} $1 != ""
+				${AndIf} $1 != "\COMPLETED\"
+					${GetParent} "$INSTALLAPPDIRECTORY\Optional1\$1" $2
+					CreateDirectory $2
+					Rename "$INSTALLAPPDIRECTORY\$1" "$INSTALLAPPDIRECTORY\Optional1\$1"
+				${EndIf}
+				IntOp $R1 $R1 + 1
+			${LoopUntil} $1 == "\COMPLETED\"
+
+			;Move files
+			StrCpy $R1 1
+			${Do}
+				${ReadINIStrWithDefault} $1 $InstallerINIFile "OptionalComponents" "OptionalFile$R1" "\COMPLETED\"
+				${If} $1 != ""
+				${AndIf} $1 != "\COMPLETED\"
+					${GetParent} "$INSTALLAPPDIRECTORY\Optional1\$1" $2
+					CreateDirectory $2
+					${GetParent} "$INSTALLAPPDIRECTORY\$1" $3
+					${GetFileName} "$INSTALLAPPDIRECTORY\Optional1\$1" $4
+					${MoveFiles} DOS "$4" "$3" "$2"
+				${EndIf}
+				IntOp $R1 $R1 + 1
+			${LoopUntil} $1 == "\COMPLETED\"
+
+		${EndIf}
+
+		;Compile the installer
+		SetDetailsPrint ListOnly
+		${If} $PluginInstaller == "true"
+			DetailPrint "Creating $PLUGINNAME installer..."
+		${Else}
+			DetailPrint "Creating $PORTABLEAPPNAME installer..."
+		${EndIf}
+		SetDetailsPrint none
+		${TBProgress} 66
+
+		;Delete existing installer if there is one
+		${GetParent} $INSTALLAPPDIRECTORY $0
+		Delete "$0\$INSTALLERFILENAME.paf.exe"
+		${If} ${FileExists} "$0\$INSTALLERFILENAME.paf.exe"
+			MessageBox MB_OK|MB_ICONEXCLAMATION "Unable to delete file: $0\$INSTALLERFILENAME.paf.exe.  Please be sure the file is not in use"
+			${WriteErrorToLog} "Unable to delete file: $0\$INSTALLERFILENAME.paf.exe.  Please be sure the file is not in use."
+		${Else}
+			SetOutPath "$EXEDIR\App\nsis"
+			${If} $PluginInstaller == "true"
+				ExecDos::exec `"$EXEDIR\App\nsis\makensis.exe" /O"$EXEDIR\Data\PortableApps.comInstallerLog.txt" "$INSTALLAPPDIRECTORY\Other\Source\PortableApps.comInstallerPlugin.nsi"` "" ""
+			${Else}
+				ExecDos::exec `"$EXEDIR\App\nsis\makensis.exe" /O"$EXEDIR\Data\PortableApps.comInstallerLog.txt" "$INSTALLAPPDIRECTORY\Other\Source\PortableApps.comInstaller.nsi"` "" ""
+			${EndIf}
+		${EndIf}
+
+		;Move optional component files back
+		${If} $OPTIONALCOMPONENTS == "true"
+			;Move directories
+			StrCpy $R1 1
+			${Do}
+				${ReadINIStrWithDefault} $1 $InstallerINIFile "OptionalComponents" "OptionalDirectory$R1" "\COMPLETED\"
+				${If} $1 != ""
+				${AndIf} $1 != "\COMPLETED\"
+					Rename "$INSTALLAPPDIRECTORY\Optional1\$1" "$INSTALLAPPDIRECTORY\$1"
+				${EndIf}
+				IntOp $R1 $R1 + 1
+			${LoopUntil} $1 == "\COMPLETED\"
+
+			;Move files
+			StrCpy $R1 1
+			${Do}
+				${ReadINIStrWithDefault} $1 $InstallerINIFile "OptionalComponents" "OptionalFile$R1" "\COMPLETED\"
+				${If} $1 != ""
+				${AndIf} $1 != "\COMPLETED\"
+					${GetParent} "$INSTALLAPPDIRECTORY\Optional1\$1" $2
+					${GetParent} "$INSTALLAPPDIRECTORY\$1" $3
+					${GetFileName} "$INSTALLAPPDIRECTORY\Optional1\$1" $4
+					${MoveFiles} DOS "$4" "$2" "$3"
+				${EndIf}
+				IntOp $R1 $R1 + 1
+			${LoopUntil} $1 == "\COMPLETED\"
+
+			RMDir /r "$INSTALLAPPDIRECTORY\Optional1"
+		${EndIf}
+	${EndIf}
+
+	; Done
+	SetDetailsPrint ListOnly
+	DetailPrint " "
+	DetailPrint "Processing complete."
+
+	${If} ${FileExists} "$0\$INSTALLERFILENAME.paf.exe"
+	${AndIf} $ERROROCCURED != "true"
+		StrCpy $FINISHTITLE "Installer Created"
+		StrCpy $FINISHTEXT "The installer has been created. Installer location:\r\n$0\r\n\r\nInstaller name:\r\n$INSTALLERFILENAME.paf.exe"
+	${Else}
+		StrCpy $FINISHTITLE "An Error Occured"
+		StrCpy $FINISHTEXT "The installer was not created.  You can view the log file for more information."
+		StrCpy $ERROROCCURED "true"
+	${EndIf}
+
+	SetDetailsPrint none
+	;Remove the installer files if not included
+	${If} $INCLUDESOURCE != "true"
+	${AndIf} $ERROROCCURED != "true"
+		RMDir /r "$INSTALLAPPDIRECTORY\Other\Source\PortableApps.comInstallerLanguages\"
+		Delete "$INSTALLAPPDIRECTORY\Other\Source\PortableApps.comInstaller.bmp"
+		Delete "$INSTALLAPPDIRECTORY\Other\Source\PortableApps.comInstaller.ico"
+		Delete "$INSTALLAPPDIRECTORY\Other\Source\PortableApps.comInstaller.nsi"
+		Delete "$INSTALLAPPDIRECTORY\Other\Source\PortableApps.comInstallerConfig.nsh"
+		Delete "$INSTALLAPPDIRECTORY\Other\Source\PortableApps.comInstallerDumpLogToFile.nsh"
+		Delete "$INSTALLAPPDIRECTORY\Other\Source\PortableApps.comInstallerHeader.bmp"
+		Delete "$INSTALLAPPDIRECTORY\Other\Source\PortableApps.comInstallerHeaderRTL.bmp"
+		Delete "$INSTALLAPPDIRECTORY\Other\Source\PortableApps.comInstallerMoveFiles.nsh"
+		Delete "$INSTALLAPPDIRECTORY\Other\Source\PortableApps.comInstallerPlugin.nsi"
+		Delete "$INSTALLAPPDIRECTORY\Other\Source\PortableApps.comInstallerPluginConfig.nsh"
+		Delete "$INSTALLAPPDIRECTORY\Other\Source\PortableApps.comInstallerTBProgress.nsh"
+	${EndIf}
+
+	;Remove the Source and Other directories if empty
+	RMDir "$INSTALLAPPDIRECTORY\Other\Source"
+	RMDir "$INSTALLAPPDIRECTORY\Other"
+	${TBProgress_State} NoProgress 
+SectionEnd
+
+Function ShowFinishPage
+	${If} $AUTOMATICCOMPILE == "true"
+	${AndIf} $ERROROCCURED != "true"
+		Abort
+	${ElseIf} $ERROROCCURED == "true"
+		!insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Flags" "DISABLED"
+		!insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 5" "State" "1"
+	${EndIf}
+FunctionEnd
+
+Function RunOnFinish
+	Exec `"$0\$INSTALLERFILENAME.paf.exe"`
+FunctionEnd
+
+Function .onGUIEnd
+	RealProgress::Unload
+FunctionEnd
\ No newline at end of file
diff --git a/Greenshot/tools/PortableApps.comInstaller/Other/Source/InstallerWizardForm.ini b/Greenshot/tools/PortableApps.comInstaller/Other/Source/InstallerWizardForm.ini
new file mode 100644
index 000000000..3f3bc0b01
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/Other/Source/InstallerWizardForm.ini differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/Other/Source/License.txt b/Greenshot/tools/PortableApps.comInstaller/Other/Source/License.txt
new file mode 100644
index 000000000..d6a3987f4
--- /dev/null
+++ b/Greenshot/tools/PortableApps.comInstaller/Other/Source/License.txt
@@ -0,0 +1,344 @@
+		    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/Greenshot/tools/PortableApps.comInstaller/Other/Source/MoveFiles.nsh b/Greenshot/tools/PortableApps.comInstaller/Other/Source/MoveFiles.nsh
new file mode 100644
index 000000000..451ab65ee
--- /dev/null
+++ b/Greenshot/tools/PortableApps.comInstaller/Other/Source/MoveFiles.nsh
@@ -0,0 +1,104 @@
+; Copyright (c) 2008, Harold E Austin Jr
+; All rights reserved.
+;
+; Redistribution and use in source and binary forms, with or without
+; modification, are permitted provided that the following conditions are met:
+;     * Redistributions of source code must retain the above copyright
+;       notice, this list of conditions and the following disclaimer.
+;     * Redistributions in binary form must reproduce the above copyright
+;       notice, this list of conditions and the following disclaimer in the
+;       documentation and/or other materials provided with the distribution.
+;     * Neither the name of the organization nor the
+;       names of its contributors may be used to endorse or promote products
+;       derived from this software without specific prior written permission.
+;
+; THIS SOFTWARE IS PROVIDED BY Harold E Austin Jr ``AS IS'' AND ANY
+; EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+; WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+; DISCLAIMED. IN NO EVENT SHALL Harold E Austin Jr BE LIABLE FOR ANY
+; DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+; (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+; ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+/*
+	MoveFiles.nsh -- version 1.0  (May 5, 2008)
+		move files matching "filespec" from "source-directory" to "destination-directory"
+
+	usage: 
+		!include MoveFiles.nsh
+		
+		${MoveFiles} mode "filespec" "source-directory" "destination-directory"
+
+	where:
+		mode can be DOS, DIR, FORCE or DIR+FORCE (anything else = DOS):
+			DOS		means act like the DOS MOVE command (move only files)
+			DIR		means move files AND directories
+			FORCE 	means overwrite destination files (like MOVE/Y)
+
+	example:
+		CreateDirectory "C:\NEW\DIR"
+		DetailPrint "Moving files and directories..."
+		${MoveFiles} DIR+FORCE "*" "C:\OLD\DIR" "C:\NEW\DIR"
+		DetailPrint `"Processing"...`
+		Sleep 2000
+		DetailPrint "Moving only the files back..."
+		${MoveFiles} DOS "*" "C:\NEW\DIR" "C:\OLD\DIR"
+		DetailPrint "Moving the directories back..."
+		${MoveFiles} DIR "*" "C:\NEW\DIR" "C:\OLD\DIR"
+*/
+!ifndef MoveFiles
+!define MoveFiles "!insertmacro MoveFiles"
+!macro MoveFiles mode filespec sourcedir destdir
+	push `${destdir}`
+	push `${sourcedir}`
+	push `${filespec}`
+	push `${mode}`
+	call MoveFiles
+!macroend
+
+Function MoveFiles ; mode filespec sourcedir destdir
+	Exch $0					; mode, directory mode
+	Exch 
+	Exch $1					; filespec, force mode
+	Exch 2
+	Exch $2					; source directory
+	Exch 3
+	Exch $3					; destination directory
+	Push $4					; FindFirst/FindNext search handle
+	Push $5					; current filename matching filespec in sourcedir
+    FindFirst $4 $5 "$2\$1"
+	StrCpy $1 ""			; FORCE mode disabled by default
+	StrCmp $0 FORCE 0 +2
+		StrCpy $1 FORCE
+	StrCmp $0 DIR+FORCE 0 +3
+		StrCpy $0 DIR
+		StrCpy $1 FORCE
+	loop:                    
+		StrCmp $5 "" done	; $5 == "", if no more matching files
+		StrCmp $5 . next
+		StrCmp $5 .. next
+		StrCmp $0 DIR +2
+			; DIR mode disabled: ignore directories that match ${filespec}
+			IfFileExists "$2\$5\*.*" next
+		StrCmp $1 FORCE 0 +4
+			; FORCE mode: make sure destination doesn't exist
+			Delete "$3\$5"
+			StrCmp $0 DIR 0 +2
+				RMDir /R "$3\$5"
+		Rename "$2\$5" "$3\$5"
+	next:
+		FindNext $4 $5
+		Goto loop
+	done:
+		FindClose $4        ; finished with this search; close handle
+		Pop $5
+		Pop $4
+		Pop $3
+		Pop $0
+		Pop $1
+		Pop $2
+FunctionEnd
+!endif
diff --git a/Greenshot/tools/PortableApps.comInstaller/Other/Source/ReadINIStrWithDefault.nsh b/Greenshot/tools/PortableApps.comInstaller/Other/Source/ReadINIStrWithDefault.nsh
new file mode 100644
index 000000000..2d3b3a10b
--- /dev/null
+++ b/Greenshot/tools/PortableApps.comInstaller/Other/Source/ReadINIStrWithDefault.nsh
@@ -0,0 +1,55 @@
+; ReadINIStrWithDefault 1.1 (2009-05-12)
+;
+; Substitutes a default value if the INI is undefined
+; Copyright 2008-2009 John T. Haller of PortableApps.com
+; Released under the BSD
+;
+; Usage: ${ReadINIStrWithDefault} OUTPUT_VALUE INI_FILENAME SECTION_NAME ENTRY_NAME DEFAULT_VALUE
+;
+; History:
+; 1.1 (2009-05-12): Fixed error with $0 and $2 being swapped
+
+Function ReadINIStrWithDefault
+	;Start with a clean slate
+	ClearErrors
+	
+	;Get our parameters
+	Exch $0 ;DEFAULT_VALUE
+	Exch
+	Exch $1 ;ENTRY_NAME
+	Exch 2
+	Exch $2 ;SECTION_NAME
+	Exch  3
+	Exch $3 ;INI_FILENAME
+	Push $4 ;OUTPUT_VALUE
+	
+	;Read from the INI
+	ReadINIStr $4 $3 $2 $1
+	IfErrors 0 +3
+		StrCpy $4 $0
+		ClearErrors
+
+	;Keep the variable for last
+	StrCpy $0 $4
+	
+	;Clear the stack
+	Pop $4
+	Pop $3
+	Exch 2
+	Pop $2
+	Pop $1
+	
+	;Reset the last variable and leave our result on the stack
+	Exch $0
+FunctionEnd
+
+!macro ReadINIStrWithDefault OUTPUT_VALUE INI_FILENAME SECTION_NAME ENTRY_NAME DEFAULT_VALUE
+  Push `${INI_FILENAME}`
+  Push `${SECTION_NAME}`
+  Push `${ENTRY_NAME}`
+  Push `${DEFAULT_VALUE}`
+  Call ReadINIStrWithDefault
+  Pop `${OUTPUT_VALUE}`
+!macroend
+
+!define ReadINIStrWithDefault '!insertmacro "ReadINIStrWithDefault"'
diff --git a/Greenshot/tools/PortableApps.comInstaller/Other/Source/Readme.txt b/Greenshot/tools/PortableApps.comInstaller/Other/Source/Readme.txt
new file mode 100644
index 000000000..c725c6ea3
--- /dev/null
+++ b/Greenshot/tools/PortableApps.comInstaller/Other/Source/Readme.txt
@@ -0,0 +1,41 @@
+PortableApps.com Installer
+==========================
+Copyright 2006-2009 John T. Haller
+
+Website: http://PortableApps.com/Installer
+
+This software is OSI Certified Open Source Software.
+OSI Certified is a certification mark of the Open Source Initiative.
+
+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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+
+About PortableApps.com Installer
+================================
+PortableApps.com Installer allows you to easily package apps in PortableApps.com
+Format as a PortableApps.com Installer.
+
+
+LICENSE
+=======
+This code is released under the GPL.  Within the Other\Source directory
+you will find the code as well as the full GPL license (License.txt).  If you use the
+code in your own product, please give proper and prominent attribution.
+
+
+PortableApps.com Installer CONFIGURATION
+========================================
+Configuration options are included in the appropriate appinfo.ini and installer.ini
+files in the app's AppInfo directory as detailed at PortableApps.com/development
\ No newline at end of file
diff --git a/Greenshot/tools/PortableApps.comInstaller/Other/Source/TBProgress.nsh b/Greenshot/tools/PortableApps.comInstaller/Other/Source/TBProgress.nsh
new file mode 100644
index 000000000..7fa976961
--- /dev/null
+++ b/Greenshot/tools/PortableApps.comInstaller/Other/Source/TBProgress.nsh
@@ -0,0 +1,59 @@
+!include "LogicLib.nsh"
+ 
+!ifndef CLSCTX_INPROC_SERVER
+    !define CLSCTX_INPROC_SERVER  1
+!endif
+ 
+!define CLSID_ITaskbarList    {56fdf344-fd6d-11d0-958a-006097c9a090}
+ 
+!define IID_ITaskbarList3     {ea1afb91-9e28-4b86-90e9-9e9f8a5eefaf}
+!define ITaskbarList3->SetProgressState      $ITaskbarList3->10
+!define ITaskbarList3->SetProgressValue      $ITaskbarList3->9
+ 
+!define TBPF_NOPROGRESS       0x00000000 ; Normal state / no progress bar
+!define TBPF_INDETERMINATE    0x00000001 ; Marquee style progress bar
+!define TBPF_NORMAL           0x00000002 ; Standard progress bar
+!define TBPF_ERROR            0x00000004 ; Red taskbar button to indicate an error occurred
+!define TBPF_PAUSED           0x00000008 ; Yellow taskbar button to indicate user attention
+                                         ; (input) is required to resume progress
+ 
+Var ITaskbarList3
+ 
+!macro TBProgress_Init
+  !ifndef TBProgressInitialized
+    !define TBProgressInitialized
+    ${Unless} ${Silent}
+      System::Call "ole32::CoCreateInstance( \
+        g '${CLSID_ITaskbarList}', \
+        i 0, \
+        i ${CLSCTX_INPROC_SERVER}, \
+        g '${IID_ITaskbarList3}', \
+        *i .s)"
+      Pop $ITaskbarList3
+    ${Else}
+      StrCpy $ITaskbarList3 0
+    ${EndIf}
+  !endif
+!macroend
+!define TBProgress_Init `!insertmacro TBProgress_Init`
+ 
+!macro TBProgress_Progress Val Max
+  ${TBProgress_Init}
+  ${If} $ITaskbarList3 <> 0
+      System::Call "${ITaskbarList3->SetProgressValue}(i$HWNDPARENT, l${Val}, l${Max})"
+  ${EndIf}
+!macroend
+!define TBProgress_Progress `!insertmacro TBProgress_Progress`
+ 
+!macro TBProgress Val
+  ${TBProgress_Progress} ${Val} 100
+!macroend
+!define TBProgress `!insertmacro TBProgress`
+ 
+!macro TBProgress_State State
+  ${TBProgress_Init}
+  ${If} $ITaskbarList3 <> 0
+      System::Call "${ITaskbarList3->SetProgressState}(i$HWNDPARENT, i${TBPF_${State}})"
+  ${EndIf}
+!macroend
+!define TBProgress_State `!insertmacro TBProgress_State`
\ No newline at end of file
diff --git a/Greenshot/tools/PortableApps.comInstaller/Other/Source/header.bmp b/Greenshot/tools/PortableApps.comInstaller/Other/Source/header.bmp
new file mode 100644
index 000000000..46414e810
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/Other/Source/header.bmp differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/Other/Source/header_rtl.bmp b/Greenshot/tools/PortableApps.comInstaller/Other/Source/header_rtl.bmp
new file mode 100644
index 000000000..25b91490b
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/Other/Source/header_rtl.bmp differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/Other/Source/welcomefinish.bmp b/Greenshot/tools/PortableApps.comInstaller/Other/Source/welcomefinish.bmp
new file mode 100644
index 000000000..220f605c3
Binary files /dev/null and b/Greenshot/tools/PortableApps.comInstaller/Other/Source/welcomefinish.bmp differ
diff --git a/Greenshot/tools/PortableApps.comInstaller/help.html b/Greenshot/tools/PortableApps.comInstaller/help.html
new file mode 100644
index 000000000..d4fe83fe2
--- /dev/null
+++ b/Greenshot/tools/PortableApps.comInstaller/help.html
@@ -0,0 +1,175 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en-US"><head><title>PortableApps.com Installer 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 {
+	font-family: Verdana,Arial,Helvetica,sans-serif;
+	font-size: 76%;
+	color: #000;
+	margin: 20px;
+	background: #E6E8EA;
+	text-align: center;
+}
+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: normal;
+}
+h1 {
+	color: #B31616;
+	font-weight: bold;
+	letter-spacing: -2px;
+	font-size: 2.2em;
+	border-bottom: 1px solid silver;
+	padding-bottom: 5px;
+	}
+h2 {
+	font-size: 1.5em;
+	border-bottom: 1px solid silver;
+	padding-bottom: 3px;
+	clear: both;
+	}
+h3 {
+	font-size: 1.2em;
+	}
+h4 {
+	font-size: 1.1em;
+	}
+h5 {
+	font-size: 1.0em;
+	}
+h6 {
+	font-size: 0.8em;
+	}
+img {
+	border: 0;
+	}
+ol, ul, li {
+	font-size: 1.0em;
+	}
+p, table, tr, td, th {
+	font-size: 1.0em;
+	}
+pre {
+	font-family: Courier New,Courier,monospace;
+	font-size: 1.0em;
+	}
+strong, b {
+	font-weight: bold;
+	}
+table, tr, td {
+	font-size: 1.0em;
+	border-collapse: collapse;
+}
+td, th {
+	border: 1px solid #aaaaaa;
+	border-collapse: collapse;
+	padding: 3px;
+}
+th {
+	background: #3667A8;
+	color: white;
+}
+ol ol {
+	list-style-type: lower-alpha;
+}
+.content {
+	text-align: left;
+	margin-left: auto;
+	margin-right: auto;
+	width: 780px;
+	background-color: #FFFFFF;
+	border-left: 1px solid Black;
+	border-right: 1px solid Black;
+	padding: 12px 30px;
+	line-height: 150%;
+}
+.logo {
+	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;
+	border-right: 1px solid black;
+	border-left: 1px solid black;
+}
+.footer {
+	background: #ffffff url("Other/Help/images/help_background_footer.png") repeat-x;
+	width: 840px;
+	height: 16px;
+	margin-left: auto;
+	margin-right: auto;
+	text-align: left;
+	border-right: 1px solid black;
+	border-left: 1px solid black;
+}
+.logo img {
+	padding-left: 0px;
+	border: none;
+	position: relative;
+	top: -4px;
+}
+* html .content {
+	width: 760px;
+}
+* html .logo, * html .footer {
+	width: 820px;
+}
+.content h1 {
+	margin: 0px;
+}
+h1.hastagline {
+	border: 0;
+}
+h2.tagline {
+	color: #747673;
+	clear: none;
+	margin-top: 0em;
+}
+/*printer styles*/ 
+@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" width="229" height="47" alt="PortableApps.com - Your Digital Life, Anywhere"></a></div>
+<div class="content">
+<h1 class="hastagline">PortableApps.com Installer Help</h1>
+<h2 class="tagline">package your portable apps right</h2>
+<p>PortableApps.com Installer compiles PortableApps.com Format apps into easy-to-use installers.  They're small, easy to use, automatically work with the PortableApps.com Platform and require no coding or compiling.
+<a href="http://portableapps.com/go/PortableApps.comInstaller">Learn more about the PortableApps.com Installer...</a></p>
+
+<a href="http://portableapps.com/donate"><img src="Other/Help/images/donation_button.png" width="110" height="23" border="0" align="top" alt="Make a Donation"></a> - Support PortableApps.com's Hosting and Development
+
+<p><a href="http://portableapps.com/go/PortableApps.comInstaller">Go to the PortableApps.com Installer Homepage &gt;&gt;</a></p>
+
+<p><a href="http://PortableApps.com/">Get more portable apps at PortableApps.com</a></p>
+
+<p>This software is OSI Certified Open Source Software. OSI Certified is a certification mark of the Open Source Initiative.</p>
+
+<h2>PortableApps.com Installer-Specific Issues</h2>
+<a href="https://sourceforge.net/projects/portableapps/"><img width="88" height="31" border="0" align="right" src="http://sourceforge.net/sflogo.php?group_id=151265" alt="SourceForge.net" /></a>
+<p>For support questions, see the <a href="http://PortableApps.com/Installer">PortableApps.com Installer Homepage</a></p>
+
+
+</div>
+<div class="footer"></div>
+</body>
+</html>
\ No newline at end of file