diff --git a/packages/tools/syslinux/files/create_installstick.exe b/packages/tools/syslinux/files/create_livestick.exe
similarity index 88%
rename from packages/tools/syslinux/files/create_installstick.exe
rename to packages/tools/syslinux/files/create_livestick.exe
index 3a53b43f35..77e647cf04 100644
Binary files a/packages/tools/syslinux/files/create_installstick.exe and b/packages/tools/syslinux/files/create_livestick.exe differ
diff --git a/tools/nsis-installer/oeinstaller.nsi b/tools/nsis-installer/oeinstaller.nsi
index 76451ad8bf..aa9ac6b893 100644
--- a/tools/nsis-installer/oeinstaller.nsi
+++ b/tools/nsis-installer/oeinstaller.nsi
@@ -14,7 +14,10 @@ VIAddVersionKey InternalName "OpenELEC USB Stick Creator"
 !define PRODUCT_WEB_SITE "http://openelec.tv"
 BrandingText " "
 
-Var "SLET"
+Var "DRIVE_LETTER"
+Var "STORAGE_SIZE"
+Var "BOOT_TIME"
+Var "SSH_PARAM"
 
 !include "MUI.nsh"
 !include LogicLib.nsh
@@ -56,103 +59,236 @@ Page Custom CustomCreate CustomLeave
 !define MUI_PAGE_HEADER_SUBTEXT "Please wait 45 seconds ..."
 !insertmacro MUI_PAGE_INSTFILES
 
+# http://nsis.sourceforge.net/Simple_write_text_to_file
+# This is a simple function to write a piece of text to a file. This will write to the end always.
+Function WriteToFile
+  Exch $0 ;file to write to
+  Exch
+  Exch $1 ;text to write
+
+  FileOpen $0 $0 a      #open file
+  FileSeek $0 0 END     #go to end
+  FileWrite $0 $1       #write to file
+  FileWrite $0 '$\r$\n' #write crlf
+  FileClose $0
+
+  Pop $1
+  Pop $0
+FunctionEnd
+
+!macro WriteToFile NewLine File String
+  !if `${NewLine}` == true
+  Push `${String}$\r$\n`
+  !else
+  Push `${String}`
+  !endif
+  Push `${File}`
+  Call WriteToFile
+!macroend
+!define WriteToFile `!insertmacro WriteToFile false`
+!define WriteLineToFile `!insertmacro WriteToFile true`
+
 Section "oeusbstart"
-         StrCpy $1 "$INSTDIR\"
-         ExpandEnvStrings $0 %COMSPEC%
-         DetailPrint "- Formatting USB Device ($SLET) ..."
-         nsExec::Exec `"$0" /c format $SLET /V:OPENELEC /Q /FS:FAT32 /X`
-         DetailPrint "- Mounting USB Device ..."
-         sleep 3000
-         DetailPrint "- Making Device Bootable ..."
-         nsExec::Exec `"3rdparty\syslinux\win32\syslinux.exe" -f -m -a $SLET`
-         DetailPrint "- Copying System Files ..."
-         nsExec::Exec `"$0" /c copy target\* $SLET`
-         DetailPrint "- Copying Configuration Files ..."
-         nsExec::Exec `"$0" /c copy Autorun.inf $SLET`
-         nsExec::Exec `"$0" /c copy CHANGELOG $SLET`
-         nsExec::Exec `"$0" /c copy INSTALL $SLET`
-         nsExec::Exec `"$0" /c copy README $SLET`
-         nsExec::Exec `"$0" /c copy RELEASE $SLET`
-         nsExec::Exec `"$0" /c copy openelec.ico $SLET`
-         nsExec::Exec `"$0" /c ECHO DEFAULT linux > $SLET\syslinux.cfg`
-         nsExec::Exec `"$0" /c ECHO PROMPT 0 >> $SLET\syslinux.cfg`
-         nsExec::Exec `"$0" /c ECHO. >> $SLET\syslinux.cfg`
-         nsExec::Exec `"$0" /c ECHO LABEL linux >> $SLET\syslinux.cfg`
-         nsExec::Exec `"$0" /c ECHO KERNEL /KERNEL >> $SLET\syslinux.cfg`
-         nsExec::Exec `"$0" /c ECHO APPEND boot=LABEL=OPENELEC installer quiet >> $SLET\syslinux.cfg`
-         DetailPrint ""
+  ExpandEnvStrings $0 %COMSPEC%
+
+  DetailPrint "- Formatting USB Device ($DRIVE_LETTER) ..."
+  nsExec::Exec `"$0" /c format $DRIVE_LETTER /V:OPENELEC /Q /FS:FAT32 /X`
+
+  DetailPrint "- Making Device Bootable ..."
+  nsExec::Exec `"3rdparty\syslinux\win32\syslinux.exe" -f -m -a $DRIVE_LETTER`
+
+  DetailPrint "- Copying System Files ..."
+  nsExec::Exec `"$0" /c copy target\* $DRIVE_LETTER`
+
+  DetailPrint "- Copying Configuration Files ..."
+  nsExec::Exec `"$0" /c copy Autorun.inf $DRIVE_LETTER`
+  nsExec::Exec `"$0" /c copy openelec.ico $DRIVE_LETTER`
+  nsExec::Exec `"$0" /c copy CHANGELOG $DRIVE_LETTER`
+  nsExec::Exec `"$0" /c copy INSTALL $DRIVE_LETTER`
+  nsExec::Exec `"$0" /c copy README.md $DRIVE_LETTER`
+  nsExec::Exec `"$0" /c copy RELEASE $DRIVE_LETTER`
+  nsExec::Exec `"$0" /c copy 3rdparty\syslinux\vesamenu.c32 $DRIVE_LETTER`
+  nsExec::Exec `"$0" /c copy splash.png $DRIVE_LETTER`
+
+  DetailPrint "- Creating Bootloader configuration ..."
+  Delete '$DRIVE_LETTER\syslinux.cfg'
+  ${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'UI vesamenu.c32'
+  ${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'PROMPT 0'
+  ${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU TITLE OpenELEC Boot Menu'
+  #${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU BACKGROUND splash.png'
+  ${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'TIMEOUT $BOOT_TIME'
+  ${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'DEFAULT installer'
+  ${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' ''
+  ${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU WIDTH 78'
+  ${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU MARGIN 4'
+  ${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU ROWS 5'
+  ${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU VSHIFT 10'
+  ${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU TIMEOUTROW 13'
+  ${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU TABMSGROW 11'
+  ${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU CMDLINEROW 11'
+  ${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU HELPMSGROW 16'
+  ${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU HELPMSGENDROW 29'
+  ${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' ''
+  ${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU COLOR border       30;44   #40ffffff #a0000000 std'
+  ${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU COLOR title        1;36;44 #9033ccff #a0000000 std'
+  ${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU COLOR sel          7;37;40 #e0ffffff #20ffffff all'
+  ${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU COLOR unsel        37;44   #50ffffff #a0000000 std'
+  ${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU COLOR help         37;40   #c0ffffff #a0000000 std'
+  ${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU COLOR timeout_msg  37;40   #80ffffff #00000000 std'
+  ${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU COLOR timeout      1;37;40 #c0ffffff #00000000 std'
+  ${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU COLOR msg07        37;40   #90ffffff #a0000000 std'
+  ${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU COLOR tabmsg       31;40   #30ffffff #00000000 std'
+  ${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' ''
+  ${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'LABEL installer'
+  ${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' '  MENU LABEL Run Installer'
+  ${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' '  KERNEL /KERNEL'
+  ${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' '  APPEND boot=LABEL=OPENELEC installer quiet'
+  ${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' ''
+  ${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'LABEL live'
+  ${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' '  MENU LABEL Run Live USB'
+  ${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' '  KERNEL /KERNEL'
+  ${If} $STORAGE_SIZE == "0"
+    ${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' '  APPEND boot=LABEL=OPENELEC disk=FILE=STORAGE quiet $SSH_PARAM'
+  ${Else}
+    ${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' '  APPEND boot=LABEL=OPENELEC disk=FILE=STORAGE,$STORAGE_SIZE quiet $SSH_PARAM'
+  ${EndIf}
+  ${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' ''
+  DetailPrint ""
 SectionEnd
 
 Function CustomCreate
 !insertmacro MUI_HEADER_TEXT "USB Stick Selection Screen" "Important: Make sure that the correct device is selected."
+  WriteIniStr '$PLUGINSDIR\custom.ini' 'Settings' 'NumFields' '7'
 
-         WriteIniStr '$PLUGINSDIR\custom.ini' 'Settings' 'NumFields' '2'
+  WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 1' 'Type' 'Label'
+  WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 1' 'Left' '5'
+  WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 1' 'Top' '5'
+  WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 1' 'Right' '-6'
+  WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 1' 'Bottom' '15'
+  WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 1' 'Text' \
+    'Select drive for Installation (*** ALL DATA WILL BE REMOVED ***):'
 
-         WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 1' 'Type' 'Label'
-         WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 1' 'Left' '5'
-         WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 1' 'Top' '5'
-         WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 1' 'Right' '-6'
-         WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 1' 'Bottom' '17'
-         WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 1' 'Text' \
-         'Select drive for Installation (*** ALL DATA WILL BE REMOVED ***):'
+  StrCpy $R2 0
+  StrCpy $R0 ''
+  ${GetDrives} "FDD" GetDrivesCallBack
 
-         StrCpy $R2 0
-         StrCpy $R0 ''
-         ${GetDrives} "FDD" GetDrivesCallBack
+  GetDlgItem $1 $HWNDPARENT 1
+  ${If} $R0 == ""
+    EnableWindow $1 0
+  ${Else}
+    EnableWindow $1 1
+  ${EndIf}
 
-         GetDlgItem $1 $HWNDPARENT 1
-         ${If} $R0 == ""
-             EnableWindow $1 0
-         ${Else}
-             EnableWindow $1 1
-         ${EndIf}
-         WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 2' 'Type' 'DropList'
-         WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 2' 'Left' '30'
-         WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 2' 'Top' '25'
-         WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 2' 'Right' '-31'
-         WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 2' 'Bottom' '105'
-         WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 2' 'State' '$R1'
-         WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 2' 'ListItems' '$R0'
-         
-         push $0
-         InstallOptions::Dialog '$PLUGINSDIR\custom.ini'
-         pop $0
-         pop $0
+  WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 2' 'Type' 'DropList'
+  WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 2' 'Left' '30'
+  WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 2' 'Top' '20'
+  WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 2' 'Right' '-31'
+  WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 2' 'Bottom' '30'
+  WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 2' 'State' '$R1'
+  WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 2' 'ListItems' '$R0'
+
+  WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 3' 'Type' 'Label'
+  WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 3' 'Left' '5'
+  WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 3' 'Top' '45'
+  WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 3' 'Right' '200'
+  WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 3' 'Bottom' '55'
+  WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 3' 'Text' \
+    'Storage file size for Live USB stick (0 = all free space in MB):'
+
+  WriteIniStr "$PLUGINSDIR\custom.ini" "Field 4" "Type" "Text"
+  WriteIniStr "$PLUGINSDIR\custom.ini" "Field 4" "Left" "200"
+  WriteIniStr "$PLUGINSDIR\custom.ini" "Field 4" "Top" "43"
+  WriteIniStr "$PLUGINSDIR\custom.ini" "Field 4" "Right" "240"
+  WriteIniStr "$PLUGINSDIR\custom.ini" "Field 4" "Bottom" "55"
+  WriteIniStr "$PLUGINSDIR\custom.ini" "Field 4" "Flags" "ONLY_NUMBERS"
+  WriteIniStr "$PLUGINSDIR\custom.ini" "Field 4" "State" "512"
+
+  WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 5' 'Type' 'Label'
+  WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 5' 'Left' '5'
+  WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 5' 'Top' '65'
+  WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 5' 'Right' '90'
+  WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 5' 'Bottom' '75'
+  WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 5' 'Text' \
+    'Boot menu timeout (sec):'
+
+  WriteIniStr "$PLUGINSDIR\custom.ini" "Field 6" "Type" "Text"
+  WriteIniStr "$PLUGINSDIR\custom.ini" "Field 6" "Left" "90"
+  WriteIniStr "$PLUGINSDIR\custom.ini" "Field 6" "Top" "64"
+  WriteIniStr "$PLUGINSDIR\custom.ini" "Field 6" "Right" "110"
+  WriteIniStr "$PLUGINSDIR\custom.ini" "Field 6" "Bottom" "76"
+  WriteIniStr "$PLUGINSDIR\custom.ini" "Field 6" "Flags" "ONLY_NUMBERS"
+  WriteIniStr "$PLUGINSDIR\custom.ini" "Field 6" "State" "5"
+
+  WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 7' 'Type' 'Checkbox'
+  WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 7' 'Left' '30'
+  WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 7' 'Top' '85'
+  WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 7' 'Right' '200'
+  WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 7' 'Bottom' '95'
+  WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 7' 'Text' 'Enable SSH (only for debugging purposes)'
+  WriteIniStr '$PLUGINSDIR\custom.ini' 'Field 7' 'State' '0'
+
+  push $0
+  InstallOptions::Dialog '$PLUGINSDIR\custom.ini'
+  pop $0
+  pop $0
 FunctionEnd
 
 Function CustomLeave
-        ReadIniStr $0 '$PLUGINSDIR\custom.ini' 'Field 2' 'State'
-        StrCpy '$INSTDIR' '$0'
-        StrCpy '$SLET' '$INSTDIR'
+  ReadIniStr $0 '$PLUGINSDIR\custom.ini' 'Field 2' 'State'
+  StrCpy '$INSTDIR' '$0'
+  StrCpy '$DRIVE_LETTER' '$INSTDIR'
+
+  ReadIniStr $0 '$PLUGINSDIR\custom.ini' 'Field 4' 'State'
+  ${If} $0 == "0"
+    StrCpy '$STORAGE_SIZE' '0'
+  ${ElseIf} $0 < 512
+    StrCpy '$STORAGE_SIZE' '512'
+  ${Else}
+    StrCpy '$STORAGE_SIZE' '$0'
+  ${EndIf}
+
+  ReadIniStr $0 '$PLUGINSDIR\custom.ini' 'Field 6' 'State'
+  ${If} $0 == "0"
+    StrCpy '$BOOT_TIME' '50'
+  ${Else}
+    IntOp $0 $0 * 10
+    StrCpy '$BOOT_TIME' '$0'
+  ${EndIf}
+
+  ReadIniStr $0 '$PLUGINSDIR\custom.ini' 'Field 7' 'State'
+  ${If} $0 == "1"
+    StrCpy '$SSH_PARAM' 'ssh'
+  ${Else}
+    StrCpy '$SSH_PARAM' ''
+  ${EndIf}
 FunctionEnd
 
 Function GetDrivesCallBack
-         IntCmp $R2 '0' def next next
-      def:
-         StrCpy $R1 '$9'
-      next:
-         IntOp $R2 $R2 + 1
-         StrCpy $R0 '$R0$9|'
-	 Push $0
+  IntCmp $R2 '0' def next next
+  def:
+    StrCpy $R1 '$9'
+  next:
+    IntOp $R2 $R2 + 1
+    StrCpy $R0 '$R0$9|'
+  Push $0
 FunctionEnd
 
-
 !define MUI_FINISHPAGE_TITLE "OpenELEC USB Stick Successfully Created"
-!define MUI_FINISHPAGE_TEXT "An OpenELEC USB Installer Stick has been created on the device $SLET\n\nPlease boot your HTPC off this USB stick and follow the on-screen instructions."
+!define MUI_FINISHPAGE_TEXT "An OpenELEC USB Installer Stick has been created on the device $DRIVE_LETTER.\n\nPlease boot your HTPC off this USB stick and follow the on-screen instructions."
 !define MUI_FINISHPAGE_NOREBOOTSUPPORT
 !define MUI_PAGE_CUSTOMFUNCTION_SHOW "FinishShow"
 !insertmacro MUI_PAGE_FINISH
 !insertmacro MUI_LANGUAGE "English"
 
 Function FinishShow
-         GetDlgItem $0 $HWNDPARENT 3
-         ShowWindow $0 0
-         GetDlgItem $0 $HWNDPARENT 1
-         SendMessage $0 ${WM_SETTEXT} 0 "STR:Finish"
+  GetDlgItem $0 $HWNDPARENT 3
+  ShowWindow $0 0
+  GetDlgItem $0 $HWNDPARENT 1
+  SendMessage $0 ${WM_SETTEXT} 0 "STR:Finish"
 FunctionEnd
 
 Function .onInit
-         InitPluginsDir
-         GetTempFileName $0
-         Rename $0 '$PLUGINSDIR\custom.ini'
+  InitPluginsDir
+  GetTempFileName $0
+  Rename $0 '$PLUGINSDIR\custom.ini'
 FunctionEnd