diff --git a/Contrib/System/SysFunc.nsh b/Contrib/System/SysFunc.nsh
index c34ffa2e..2c967376 100644
--- a/Contrib/System/SysFunc.nsh
+++ b/Contrib/System/SysFunc.nsh
@@ -190,7 +190,6 @@ Function _systemSplashWndCB
    goto default
 
 m_Create:
-
    ; Create structures
    System::Call "*${stRECT} (_) .R8"
    System::Call "*${stBITMAP} (_, &l0 .R7) .R9"
@@ -242,7 +241,6 @@ m_Create:
    goto exit
 
 m_Paint:
-
    ; Create structures
    System::Call "*${stRECT} (_) .R8"
    System::Call "*${stPAINTSTRUCT} (_) .R9"
diff --git a/Contrib/System/System.nsi b/Contrib/System/System.nsi
index 52c4834a..834908df 100644
--- a/Contrib/System/System.nsi
+++ b/Contrib/System/System.nsi
@@ -115,9 +115,10 @@ enumex: ; End of drives or user cancel
 
      ; Logo
      File /oname=spltmp.bmp "${NSISDIR}\Contrib\Makensisw\logo.bmp"
+;     File /oname=spltmp.wav "${WINDIR}\media\Windows XP Startup.wav"
 
      ; I. systemSplash variant
-     !insertmacro smSystemSplash 2000 "$TEMP\spltmp"
+     !insertmacro smSystemSplash 500 "$TEMP\spltmp"
 
      ; II. Splash Plugin variant
 ;    splash::show 2000 $TEMP\spltmp
@@ -125,14 +126,17 @@ enumex: ; End of drives or user cancel
 
      ; remove logo
      Delete $TEMP\spltmp.bmp
+;     Delete $TEMP\spltmp.wav
 
      ; Display splash result
+     pop $0
      MessageBox MB_OK "Splash (callbacks) demo result $R0"
 
      ; last plugin call must not have /NOUNLOAD so NSIS will be able to delete the temporary DLL
      SetPluginUnload manual
      ; do nothing
      System::Free 0
+
 SectionEnd 
 
 ; eof
diff --git a/Plugins/System.dll b/Plugins/System.dll
index ea89bf5b..c99d780c 100644
Binary files a/Plugins/System.dll and b/Plugins/System.dll differ