diff --git a/.gitignore b/.gitignore
index 30087bfd..1c93e0ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+Installer/bin
mRemoteV1/bin
mRemoteV1/obj
mRemoteV1/publish
diff --git a/Installer/header.bmp b/Installer/header.bmp
new file mode 100644
index 00000000..ab582439
Binary files /dev/null and b/Installer/header.bmp differ
diff --git a/Installer/mRemote.nsi b/Installer/mRemote.nsi
index 4a2b0083..3fe13063 100644
--- a/Installer/mRemote.nsi
+++ b/Installer/mRemote.nsi
@@ -1,10 +1,10 @@
!include "MUI.nsh"
;Basic Config
-Name "mRemote"
-OutFile %PathAndFilenameForOutput%
-InstallDir $PROGRAMFILES\mRemote
-InstallDirRegKey HKCU "Software\mRemote" ""
+Name "mRemoteNG"
+OutFile bin\mRemoteNG-Installer.exe
+InstallDir $PROGRAMFILES\mRemoteNG
+InstallDirRegKey HKCU "Software\mRemoteNG" ""
;Design
!define MUI_HEADERIMAGE
@@ -13,72 +13,69 @@ InstallDirRegKey HKCU "Software\mRemote" ""
!define MUI_HEADERIMAGE_UNBITMAP "header.bmp" ; optional
!define MUI_HEADERIMAGE_UNBITMAP_NOSTRETCH
!define MUI_HEADER_TRANSPARENT_TEXT
-#!define MUI_BGCOLOR 000000
!define MUI_WELCOMEFINISHPAGE_BITMAP "welcomefinish.bmp"
+!define MUI_WELCOMEFINISHPAGE_BITMAP_NOSTRETCH
!define MUI_UNWELCOMEFINISHPAGE_BITMAP "welcomefinish.bmp"
-
+!define MUI_UNWELCOMEFINISHPAGE_BITMAP_NOSTRETCH
;Install Pages
-!insertmacro MUI_PAGE_LICENSE ..\%ReleasePath%\License.txt
+!insertmacro MUI_PAGE_LICENSE ..\mRemoteV1\bin\Release\License.txt
!insertmacro MUI_PAGE_DIRECTORY
!insertmacro MUI_PAGE_INSTFILES
!define MUI_FINISHPAGE_NOAUTOCLOSE
-# settings to start application
+;Finish Page
!define MUI_FINISHPAGE_RUN_NOTCHECKED
-!define MUI_FINISHPAGE_RUN_Text "Start mRemote"
-!define MUI_FINISHPAGE_RUN "$INSTDIR\mRemote.exe"
+!define MUI_FINISHPAGE_RUN_Text "Start mRemoteNG"
+!define MUI_FINISHPAGE_RUN "$INSTDIR\mRemoteNG.exe"
!insertmacro MUI_PAGE_FINISH
;Uninstall Pages
!insertmacro MUI_UNPAGE_CONFIRM
!insertmacro MUI_UNPAGE_INSTFILES
-
;Set Language
!insertmacro MUI_LANGUAGE "English"
-
Section ""
-SetOutPath $INSTDIR
+ SetOutPath $INSTDIR
-;AddFiles
-File /r /x *.lic ..\%ReleasePath%\*.*
+ ;AddFiles
+ File /r /x *.lic ..\mRemoteV1\bin\Release\*.*
-;Uninstaller
-WriteUninstaller "$INSTDIR\Uninstall.exe"
-;Register ActiveX components
-RegDLL "$INSTDIR\eolwtscom.dll"
-RegDLL "$INSTDIR\scvncctrl.dll"
+ ;Uninstaller
+ WriteUninstaller "$INSTDIR\Uninstall.exe"
+
+ ;Register ActiveX components
+ RegDLL "$INSTDIR\eolwtscom.dll"
+ RegDLL "$INSTDIR\scvncctrl.dll"
-;Start Menu
-CreateDirectory "$SMPROGRAMS\mRemote"
-CreateShortCut "$SMPROGRAMS\mRemote\mRemote.lnk" "$INSTDIR\mRemote.exe"
-CreateShortCut "$SMPROGRAMS\mRemote\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
-;Registry
-WriteRegStr HKCU "Software\mRemote" "" $INSTDIR
+ ;Start Menu
+ CreateDirectory "$SMPROGRAMS\mRemoteNG"
+ CreateShortCut "$SMPROGRAMS\mRemoteNG\mRemoteNG.lnk" "$INSTDIR\mRemoteNG.exe"
+ CreateShortCut "$SMPROGRAMS\mRemoteNG\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
-WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemote" DisplayName "mRemote"
-WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemote" UninstallString '"$INSTDIR\Uninstall.exe"'
-WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemote" DisplayIcon "$INSTDIR\mRemote.exe"
+ ;Registry
+ WriteRegStr HKCU "Software\mRemoteNG" "" $INSTDIR
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" DisplayName "mRemoteNG"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" UninstallString '"$INSTDIR\Uninstall.exe"'
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" DisplayIcon "$INSTDIR\mRemoteNG.exe"
SectionEnd
-
-
-
Section "un.Uninstall"
-;Unregister ActiveX components
-UnregDLL "$INSTDIR\eolwtscom.dll"
-UnregDLL "$INSTDIR\scvncctrl.dll"
+ ;Unregister ActiveX components
+ UnregDLL "$INSTDIR\eolwtscom.dll"
+ UnregDLL "$INSTDIR\scvncctrl.dll"
-;Delete Files
-RMDIR /r $INSTDIR
+ ;Delete Files
+ RMDIR /r $INSTDIR
-;Start Menu
-Delete "$SMPROGRAMS\mRemote\mRemote.lnk"
-Delete "$SMPROGRAMS\mRemote\Uninstall.lnk"
-RMDir "$SMPROGRAMS\mRemote"
-;Registry
-DeleteRegKey /ifempty HKCU "Software\mRemote"
-DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemote"
-SectionEnd
\ No newline at end of file
+ ;Start Menu
+ Delete "$SMPROGRAMS\mRemoteNG\mRemote.lnk"
+ Delete "$SMPROGRAMS\mRemoteNG\Uninstall.lnk"
+ RMDir "$SMPROGRAMS\mRemoteNG"
+
+ ;Registry
+ DeleteRegKey /ifempty HKCU "Software\mRemoteNG"
+ DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG"
+SectionEnd
diff --git a/Installer/welcomefinish.bmp b/Installer/welcomefinish.bmp
new file mode 100644
index 00000000..b1dea26e
Binary files /dev/null and b/Installer/welcomefinish.bmp differ
diff --git a/mRemoteV1/Resources/Banners/Banner_vRD09.png b/mRemoteV1/Resources/Banners/Banner_vRD09.png
deleted file mode 100644
index 8e86abf9..00000000
Binary files a/mRemoteV1/Resources/Banners/Banner_vRD09.png and /dev/null differ
diff --git a/mRemoteV1/Resources/Banners/Merger.jpg b/mRemoteV1/Resources/Banners/Merger.jpg
deleted file mode 100644
index 1faa624b..00000000
Binary files a/mRemoteV1/Resources/Banners/Merger.jpg and /dev/null differ
diff --git a/mRemoteV1/Resources/Banners/vRD08.jpg b/mRemoteV1/Resources/Banners/vRD08.jpg
deleted file mode 100644
index 151d0057..00000000
Binary files a/mRemoteV1/Resources/Banners/vRD08.jpg and /dev/null differ
diff --git a/mRemoteV1/mRemoteV1.vbproj b/mRemoteV1/mRemoteV1.vbproj
index add57df2..20f62d0b 100644
--- a/mRemoteV1/mRemoteV1.vbproj
+++ b/mRemoteV1/mRemoteV1.vbproj
@@ -717,7 +717,6 @@
-