Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -47,11 +47,11 @@
 tar:
 	$(PACK) -t $@ $(OPTS) $(DEPS) -p "$(NAME)-VERSION.bin.txz" st2.py
 exe:
 	$(PACK) -t $@ $(OPTS) $(DEPS) -p "$(NAME)-VERSION.exe" \
 	--exe-exec 'cmd /K c:\usr\share\streamtuner2\dev\install_python_gtk.bat' \
-	--exe-dest c:/ --version $(VERSION) help/help.chm dev/install_python_gtk.* st2.py
+	--exe-dest c:/ --version $(VERSION) help/help.chm dev/install_python_gtk.* dev/*ico st2.py
 arch:
 	$(PACK) -t $@ $(OPTS) $(DEPS_A) -p "$(NAME)-VERSION.arch.txz" st2.py
 pyz:
         #@BUG: relative package references leave a /tmp/doc/ folder
 	$(PACK) -u packfile -s src -t zip --zip-shebang "/usr/bin/env python"	\

Index: Packfile
==================================================================
--- Packfile
+++ Packfile
@@ -12,10 +12,11 @@
 	gzip -9c usr/share/doc/streamtuner2/NEWS > usr/share/doc/streamtuner2/changelog.gz
 zip:
 rpm:
 exe:
 	mv usr/share/streamtuner2/help/help.chm usr/share/doc/streamtuner2/help.chm
+	mv usr/share/streamtuner2/dev/streamtuner2.ico usr/share/pixmaps/streamtuner2.ico
 src:
 tar:
 
 arch:
 	sed -i '1 s/python/python2/' usr/bin/streamtuner2

Index: dev/install_python_gtk.bat
==================================================================
--- dev/install_python_gtk.bat
+++ dev/install_python_gtk.bat
@@ -1,5 +1,8 @@
+@setlocal enableextensions
+@cd /d "%~dp0"
 @echo off
 cls
 PowerShell Set-ExecutionPolicy -ExecutionPolicy ByPass -Scope CurrentUser
-PowerShell -File \usr\share\streamtuner2\dev\install_python_gtk.ps1
+PowerShell -File install_python_gtk.ps1
 PowerShell Set-ExecutionPolicy -ExecutionPolicy Undefined -Scope CurrentUser
+pause

Index: dev/install_python_gtk.ps1
==================================================================
--- dev/install_python_gtk.ps1
+++ dev/install_python_gtk.ps1
@@ -4,10 +4,11 @@
  #
  #  - downloads Python + Gtk
  #  - some python libraries
  #  - and runs their respective installers
  #  - crafts streamtuner2 desktop shortcut
+ #  - crafts streamtuner2 shortcuts in Start menu
  #
  #>
 
 [CmdletBinding()]            
 Param(            
@@ -20,76 +21,145 @@
     )
     [Security.Principal.WindowsPrincipal] $Identity = [Security.Principal.WindowsIdentity]::GetCurrent()
     $Identity.IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)
 }
 
+
+# prerequisites check
+function Check-Prerequisites {
+    [CmdletBinding()]
+    param(
+    )
+
+    ForEach ($task in $tasks) {
+       $title, $url, $cmd, $args, $regkey, $reghive = $task;
+        if ($regkey) { 
+            if (!(Get-Item -Path ($regHive + "\" + $regkey))) {     # avoid runtime error if not existent (not working in PS1)
+                Write-Host $title " not found"
+                return 0
+            }
+            else {
+                Write-Host (Get-ItemProperty -Path ($regHive + "\" + $regkey) -Name "DisplayName".DisplayName).DisplayName " found"
+            }
+        }
+        elseif ($title = "Python requests") {
+            if (!(Get-Item -Path "$PYTHON\Lib\site-packages\requests-2.12.1-py2.7.egg")) {
+                write-Host $title " not found"
+                return 0
+            }
+            else {
+                Write-Host $title " found"
+            }
+        }
+    
+        elseif ($title = "PyQuery 1.2.1") {
+            if (!(Get-Item -Path "$PYTHON\Lib\site-packages\pyquery-1.2.17.dist-info")) {
+                Write-Host $title " not found"
+                return 0
+            }
+            else {
+                Write-Host $title " found"
+            }
+        }
+    }
+    return 1
+}
 
 # default paths
 $TEMP = $env:TEMP
 $PYTHON = "C:\Python27"
 $OutputEncoding = [System.Text.Encoding]::UTF8
+
+#-- Get ST installation folder
+$ScriptPath = (Split-Path $MyInvocation.MyCommand.Path -Parent).Split("\") #PS1/2 compatibility"
+
+$UsrFolder=$ScriptPath[0]+"\"
+for ($i=1; $i -le $ScriptPath.Length - 4; $i++) {
+    $UsrFolder = $UsrFolder+$ScriptPath[$i]+"\"
+}
+
+if (!(Test-Path -Path("..\..\..\bin\streamtuner2"))) {
+    Write-Host -foregroundcolor Red "The Streamtuner2 start script could not be found. The installation cannot continue."
+    Write-Host -foregroundcolor Red "Please do not change the folder structure of the Streamtuner2 package!"
+    Write-Host -foregroundcolor Red "Press any key to exit ..."
+    $null = $host.UI.RawUI.ReadKey("NoEcho,IncludeKeyDown")
+    exit;
+}    
+
+
+# prepare registry lookup
+$regPathCU = "HKCU:\Software\Microsoft\Windows\CurrentVersion\Uninstall"
+$regPath = "HKLM:\Software\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall"
+if(!(Test-Path $regPath)) {
+    $regPath = "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall"
+}
+
 
 #-- what and how to install
-#   each row is a list of (title,url,cmd,msi args,regkey)
+#   each row is a list of (title,url,cmd,msi args,regkey,reghive)
 $tasks = @(
   @(
     "Python 2.7.12",                                                  # title
     "https://www.python.org/ftp/python/2.7.12/python-2.7.12.msi",     # url
     "",                                                               # custom cmd
-    "/qb",                                                            # msi args
-    "{9DA28CE5-0AA5-429E-86D8-686ED898C665}"                          # registry
+    "TARGETDIR=C:\Python27 /qb",                                      # msi args
+    "{9DA28CE5-0AA5-429E-86D8-686ED898C665}",                         # registry
+    "$regPath"                                                        # registry hive/path
   ),
   @(
     "PyGtk 2.24.2",
     "http://ftp.gnome.org/pub/GNOME/binaries/win32/pygtk/2.24/pygtk-all-in-one-2.24.2.win32-py2.7.msi",
     "",
     "TARGETDIR=C:\Python27 ADDLOCAL=ALL REMOVE=PythonExtensionModulePyGtkSourceview2,PythonExtensionModulePyGoocanvas,PythonExtensionModulePyRsvg,DevelopmentTools /qb",
-    "{09F82967-D26B-48AC-830E-33191EC177C8}"
+    "{09F82967-D26B-48AC-830E-33191EC177C8}",
+    "$regPath"                                                               
   ),
   @(
     "Python requests",
     "requests", # no download url, pip handles this
-    "pip",
+    "easy_install",
+    "",
     "",
     ""
   ),
   @(
     "LXML 2.3",
     "https://pypi.python.org/packages/3d/ee/affbc53073a951541b82a0ba2a70de266580c00f94dd768a60f125b04fca/lxml-2.3.win32-py2.7.exe",
-    "easy_install",
+    "",
     "",
-    ""
+    "lxml-py2.7",
+    "$regPathCU"
   ),
   @(
     "PyQuery 1.2.1",
     "https://pypi.python.org/packages/62/71/8ac1f5c0251e51714d20e4b102710d5eee1683c916616129552b0a025ba5/pyquery-1.2.17-py2.py3-none-any.whl",
-    "easy_install",
+    "pip",
+    "",
     "",
     ""
   ),
   @(
     "PIL 1.1.7",
     "http://effbot.org/downloads/PIL-1.1.7.win32-py2.7.exe",
-    "easy_install",
+    "",
     "",
-    ""
+    "PIL-py2.7",
+    "$regPathCU"
   )
 )
 
-# prepare registry lookup
-$regPath = "HKLM:\Software\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall"
-if(!(Test-Path $regPath)) {
-    $regPath = "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall"
-}
+
+
 
 #-- ask before running
 Write-Host ""
-Write-Host "Do you want to install Python 2.7 and Gtk dependencies now?"
-Write-Host "–––––––––––––––––––––––––––––––––––––––––––––––––––––––––––"
-Write-Host " → This will install 32-bit versions of Python and Gtk."
-Write-Host " → Downloads will remain in $TEMP"
+Write-Host -foregroundcolor Yellow "Do you want to install Python 2.7 and Gtk dependencies now?"
+Write-Host -foregroundcolor Yellow "–––––––––––––––––––––––––––––––––––––––––––––––––––––––––––"
+Write-Host -foregroundcolor Yellow " → This will install 32-bit versions of Python and Gtk."
+Write-Host -foregroundcolor Yellow " → Downloads will remain in $TEMP"
 if(!(Test-IsElevated)) {
+    Write-Host ""
     Write-Host -foregroundcolor red "┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓"
     Write-Host -foregroundcolor red "┃ ⚠ ⛔  If you run this script in non-elevated mode you will not be able to  ┃"
     Write-Host -foregroundcolor red "┃      uninstall Python and Gtk using the control panels´ software list.    ┃"
     Write-Host -foregroundcolor red "┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛"
 }
@@ -98,70 +168,128 @@
 if ($y -notmatch "y|Y|1") {
     exit;
 }
 Write-Host ""
 
-#-- process
-ForEach ($task in $tasks) {
-    $title, $url, $cmd, $args, $regkey = $task;
-
-    echo ""
-    echo "Installing $title"
-    echo "------------------------"
-    echo ""
-    chdir($TEMP);
-
-
-    # get "filename" part from url
-    $file = [regex]::match($url, "/([^/]+?)([\?\#]|$)").Groups[1].Value;
-
-    # download
-    if ($url -match "https?://.+") {
-        echo " → download( $url )"
-        $wget = New-Object System.Net.WebClient
-        $wget.DownloadFile($url, "$TEMP\$file");
-    }
-
-    # run shorthand or custom command
-    if ($cmd) {
-        chdir($PYTHON)
-        if ($cmd -eq "pip") {
-            $cmd = "$PYTHON\Scripts\pip.exe install $url"
-        }
-        elseif ($cmd -match "^(easy|easy_install|silent)$") {
-            $cmd = "$PYTHON\Scripts\easy_install.exe $TEMP\$file"
-        }
-        echo " → exec( $cmd )"
-        Invoke-Expression "& $cmd"
-    }
-    # msi
-    elseif ($file -match ".+.msi$") {
-        echo " → exec( msiexec /i $file $args )"
-        Start-Process -Wait msiexec -ArgumentList /i,"$TEMP\$file",$args
-        if ($regkey) { Try {
-           Set-ItemProperty -Path "$regPath\$regkey" -Name "WindowsInstaller"  -Value "0"
-        } Catch {} }
-    }
-    # exe
-    elseif ($file -match ".+.exe$") {
-        echo " → exec( $file $args )"
-        if ($args) {
-            Start-Process -Wait "$TEMP\$file" -ArgumentList $args
-        }
-        else {
-            Start-Process -Wait "$TEMP\$file"
-        }
-    }
-    # other files
-    else {
-        echo " → exec( $file )"
-        & "$TEMP\$file"
-    }
-}
-
-#-- make ST2 .lnk
-$WshShell = New-Object -ComObject WScript.Shell
-$Shortcut = $WshShell.CreateShortcut("$Home\Desktop\Streamtuner2.lnk")
-$Shortcut.TargetPath = "$PYTHON\pythonw.exe"
-$Shortcut.Arguments = "c:\usr\bin\streamtuner2"
-$Shortcut.Save()
-
+
+#-- check prereqs installation
+Write-Host ""
+Write-Host "Checking installation"
+Write-Host "------------------------"
+Write-Host ""
+
+
+$prereqs = (Check-Prerequisites)
+if ($prereqs -match 1) {
+    Write-Host ""
+    Write-Host -foregroundcolor Yellow "All required Python components are already installed."
+    Write-Host -foregroundcolor Yellow "Do you want to (R)einstall them or (S)kip the installation?"
+    $y = Read-Host "R/S"
+}
+if ($y -notmatch "s|S|2" -OR $prereqs -match 0) {
+    #-- process
+    ForEach ($task in $tasks) {
+        $title, $url, $cmd, $args, $regkey, $regpath = $task;
+
+        Write-Host ""
+        Write-Host "Installing $title"
+        Write-Host "------------------------"
+        Write-Host ""
+        chdir($TEMP);
+
+
+        # get "filename" part from url
+        $file = [regex]::match($url, "/([^/]+?)([\?\#]|$)").Groups[1].Value;
+
+        # download
+        if ($url -match "https?://.+") {
+            Write-Host -foregroundcolor DarkGreen  " → download( $url )"
+            $wget = New-Object System.Net.WebClient
+            $wget.DownloadFile($url, "$TEMP\$file");
+        }
+
+        # run shorthand or custom command
+        if ($cmd) {
+            chdir($PYTHON)
+            if ($cmd -eq "pip") {
+                $cmd = "$PYTHON\Scripts\pip.exe install $TEMP\$file"
+            }
+            elseif ($cmd -match "^(easy|easy_install|silent)$") {
+                 $cmd = "$PYTHON\Scripts\easy_install.exe $url"
+            }
+            Write-Host -foregroundcolor DarkYellow   " → exec( $cmd )"
+            Invoke-Expression "& $cmd"
+        }
+        # msi
+        elseif ($file -match ".+.msi$") {
+            write-host -foregroundcolor DarkYellow " → exec( msiexec /i $file $args )"
+            Start-Process -Wait msiexec -ArgumentList /i,"$TEMP\$file",$args
+            if ($regkey) { Try {
+                Set-ItemProperty -Path "$regPath\$regkey" -Name "WindowsInstaller"  -Value "0"
+            } Catch {} }
+        }
+        # exe
+        elseif ($file -match ".+.exe$") {
+            write-host -foregroundcolor DarkYellow " → exec( $file $args )"
+            if ($args) {
+                Start-Process -Wait "$TEMP\$file" -ArgumentList $args
+            }
+            else {
+                Start-Process -Wait "$TEMP\$file"
+            }
+        }
+        # other files
+        else {
+          echo " → exec( $file )"
+          & "$TEMP\$file"
+        }
+    }
+}
+
+
+#-- modify ST2 wrapper script
+Write-Host ""
+Write-Host "Configuring Streamtuner2 ..."
+$WrapperScript = Get-Content -Path $UsrFolder"\bin\streamtuner2"
+for ($i=0; $i -lt $WrapperScript.Length ; $i++) {
+    $WrapperScript[$i] = $WrapperScript[$i].Replace("sys.path.insert(0, " + """" + "/usr/","sys.path.insert(0, " + """" + $UsrFolder)
+    Out-File -FilePath $UsrFolder"\bin\streamtuner2.new" -Encoding ascii -Append -InputObject $WrapperScript[$i]
+}
+
+if (Test-Path -Path $UsrFolder"\bin\streamtuner2.bak") {
+    Remove-Item -Path $UsrFolder"\bin\streamtuner2.bak" -Force
+}
+Rename-Item -NewName "streamtuner2.bak" -Path $UsrFolder"\bin\streamtuner2" #save old script
+Rename-Item -NewName "streamtuner2" -Path $UsrFolder"\bin\streamtuner2.new"
+Set-Acl $UsrFolder"\bin\streamtuner2" (Get-Acl $UsrFolder"\bin\streamtuner2.bak") # set file permissions 
+
+
+Write-Host ""
+Write-Host "Creating Shortcuts ..."
+#-- create ST2.lnk on desktop
+$WshShell = New-Object -ComObject WScript.Shell
+$Shortcut = $WshShell.CreateShortcut("$Home\Desktop\Streamtuner2.lnk")
+$Shortcut.TargetPath = "$PYTHON\pythonw.exe"
+$Shortcut.Arguments = $UsrFolder + "bin\streamtuner2"
+$Shortcut.IconLocation = $UsrFolder + "share\pixmaps\streamtuner2.ico"
+$Shortcut.WorkingDirectory = $UsrFolder + "bin"
+$Shortcut.Save()
+
+#-- create ST2 links in start menu
+$StartMenuFolder = "$env:USERPROFILE\AppData\Roaming\Microsoft\Windows\Start Menu\Programs\Streamtuner2"
+if (!(Test-Path -Path $StartMenuFolder)) {
+    New-Item -Path $StartMenuFolder -ItemType directory
+}
+$WshShell = New-Object -ComObject WScript.Shell
+$Shortcut = $WshShell.CreateShortcut("$StartMenuFolder\Streamtuner2.lnk")
+$Shortcut.TargetPath = "$PYTHON\pythonw.exe"
+$Shortcut.Arguments = $UsrFolder + "bin\streamtuner2"
+$Shortcut.IconLocation = $UsrFolder + "share\pixmaps\streamtuner2.ico"
+$Shortcut.WorkingDirectory = $UsrFolder + "bin"
+$Shortcut.Save()
+
+$Shortcut = $WshShell.CreateShortcut("$StartMenuFolder\Help.lnk")
+$Shortcut.TargetPath = $UsrFolder + "share\doc\streamtuner2\help.chm"
+$Shortcut.Save()
+
+Write-Host ""
+Write-Host -ForegroundColor Yellow "Installation completed."