diff --git a/WAPT/wapt.psproj b/WAPT/wapt.psproj
index 42a4af8..31fd757 100644
--- a/WAPT/wapt.psproj
+++ b/WAPT/wapt.psproj
@@ -1,5 +1,5 @@
 [PyScripter]
-Version=3.4.2.0
+Version=3.6.4.0
 
 [Project]
 ClassName=TProjectRootNode
@@ -23,18 +23,34 @@ FileName=C:\Program Files (x86)\wapt\setuphelpers.py
 
 [Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node2]
 ClassName=TProjectFileNode
-FileName=C:\Program Files (x86)\wapt\wapt-get.py
+FileName=C:\Program Files (x86)\wapt\setuphelpers_linux.py
 
 [Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3]
 ClassName=TProjectFileNode
-FileName=C:\Program Files (x86)\wapt\wapt-get.ini
+FileName=C:\Program Files (x86)\wapt\setuphelpers_macos.py
 
 [Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node4]
 ClassName=TProjectFileNode
+FileName=C:\Program Files (x86)\wapt\setuphelpers_unix.py
+
+[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node5]
+ClassName=TProjectFileNode
+FileName=C:\Program Files (x86)\wapt\setuphelpers_windows.py
+
+[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node6]
+ClassName=TProjectFileNode
+FileName=C:\Program Files (x86)\wapt\wapt-get.ini
+
+[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node7]
+ClassName=TProjectFileNode
+FileName=C:\Program Files (x86)\wapt\wapt-get.py
+
+[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node8]
+ClassName=TProjectFileNode
 FileName=C:\Program Files (x86)\wapt\waptpackage.py
 
 [Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes]
-Count=5
+Count=9
 
 [Project\ChildNodes\Node0\ChildNodes\Node1]
 ClassName=TProjectFileNode
@@ -56,10 +72,11 @@ ClassName=TProjectRunConfiguationsNode
 
 [Project\ChildNodes\Node1\ChildNodes\Node0]
 ClassName=TProjectRunConfiguationNode
-Name=install
+Name=WAPT: install
 
 [Project\ChildNodes\Node1\ChildNodes\Node0\RunConfig]
 ScriptName=C:\Program Files (x86)\wapt\wapt-get.py
+Description=Launch package installation.
 EngineType=peRemote
 ReinitializeBeforeRun=TRUE
 Parameters=install "$[Project-Path].."
@@ -77,10 +94,11 @@ WorkingDirectory=$[ActiveScript-Dir]
 
 [Project\ChildNodes\Node1\ChildNodes\Node1]
 ClassName=TProjectRunConfiguationNode
-Name=remove
+Name=WAPT: remove
 
 [Project\ChildNodes\Node1\ChildNodes\Node1\RunConfig]
 ScriptName=C:\Program Files (x86)\wapt\wapt-get.py
+Description=Launch uninstallation (the uninstallation code found in local wapt database, remember to launch after an installation).
 EngineType=peRemote
 ReinitializeBeforeRun=TRUE
 Parameters=remove "$[Project-Path].."
@@ -98,13 +116,14 @@ WorkingDirectory=$[ActiveScript-Dir]
 
 [Project\ChildNodes\Node1\ChildNodes\Node2]
 ClassName=TProjectRunConfiguationNode
-Name=session-setup
+Name=WAPT: uninstall
 
 [Project\ChildNodes\Node1\ChildNodes\Node2\RunConfig]
 ScriptName=C:\Program Files (x86)\wapt\wapt-get.py
+Description=Launch uninstallation code (for debugging purpose, it only runs the code of uninstall function).
 EngineType=peRemote
 ReinitializeBeforeRun=TRUE
-Parameters=session-setup "$[Project-Path].."
+Parameters=uninstall "$[Project-Path].."
 WorkingDir=$[Project-Path]..
 WriteOutputToFile=FALSE
 OutputFileName=$[ActiveScript-NoExt].log
@@ -115,17 +134,18 @@ Caption=External Run
 Description=Run script using an external Python Interpreter
 ApplicationName=$[PythonExe-Short]
 Parameters=$[ActiveScript-Short]
-WorkingDirectory=$[ActiveScript-Dir]
+WorkingDirectory=$[Project-Path]..
 
 [Project\ChildNodes\Node1\ChildNodes\Node3]
 ClassName=TProjectRunConfiguationNode
-Name=update
+Name=WAPT: session-setup
 
 [Project\ChildNodes\Node1\ChildNodes\Node3\RunConfig]
 ScriptName=C:\Program Files (x86)\wapt\wapt-get.py
+Description=Launch session-setup (it runs directly as current user).
 EngineType=peRemote
 ReinitializeBeforeRun=TRUE
-Parameters=update
+Parameters=session-setup "$[Project-Path].."
 WorkingDir=$[Project-Path]..
 WriteOutputToFile=FALSE
 OutputFileName=$[ActiveScript-NoExt].log
@@ -140,14 +160,15 @@ WorkingDirectory=$[ActiveScript-Dir]
 
 [Project\ChildNodes\Node1\ChildNodes\Node4]
 ClassName=TProjectRunConfiguationNode
-Name=upgrade
+Name=WAPT: audit
 
 [Project\ChildNodes\Node1\ChildNodes\Node4\RunConfig]
 ScriptName=C:\Program Files (x86)\wapt\wapt-get.py
+Description=Launch package audit.
 EngineType=peRemote
 ReinitializeBeforeRun=TRUE
-Parameters=-f upgrade
-WorkingDir=$[ActiveScript-Dir]
+Parameters=audit -f "$[Project-Path].."
+WorkingDir=$[Project-Path]..
 WriteOutputToFile=FALSE
 OutputFileName=$[ActiveScript-NoExt].log
 AppendToFile=FALSE
@@ -161,13 +182,14 @@ WorkingDirectory=$[ActiveScript-Dir]
 
 [Project\ChildNodes\Node1\ChildNodes\Node5]
 ClassName=TProjectRunConfiguationNode
-Name=-i build-upload
+Name=WAPT: update-package
 
 [Project\ChildNodes\Node1\ChildNodes\Node5\RunConfig]
 ScriptName=C:\Program Files (x86)\wapt\wapt-get.py
+Description=Launch update_package (it usually serve to update binaries of the package).
 EngineType=peRemote
 ReinitializeBeforeRun=TRUE
-Parameters=-i build-upload "$[Project-Path].."
+Parameters=update-package-sources "$[Project-Path].."
 WorkingDir=$[Project-Path]..
 WriteOutputToFile=FALSE
 OutputFileName=$[ActiveScript-NoExt].log
@@ -182,13 +204,14 @@ WorkingDirectory=$[ActiveScript-Dir]
 
 [Project\ChildNodes\Node1\ChildNodes\Node6]
 ClassName=TProjectRunConfiguationNode
-Name=svn update
+Name=WAPT: -i build-upload
 
 [Project\ChildNodes\Node1\ChildNodes\Node6\RunConfig]
 ScriptName=C:\Program Files (x86)\wapt\wapt-get.py
+Description=Build and upload package to the waptserver.
 EngineType=peRemote
 ReinitializeBeforeRun=TRUE
-Parameters=sources "$[Project-Path].."
+Parameters=--use-gui -i build-upload "$[Project-Path].."
 WorkingDir=$[Project-Path]..
 WriteOutputToFile=FALSE
 OutputFileName=$[ActiveScript-NoExt].log
@@ -201,71 +224,8 @@ ApplicationName=$[PythonExe-Short]
 Parameters=$[ActiveScript-Short]
 WorkingDirectory=$[ActiveScript-Dir]
 
-[Project\ChildNodes\Node1\ChildNodes\Node7]
-ClassName=TProjectRunConfiguationNode
-Name=uninstall
-
-[Project\ChildNodes\Node1\ChildNodes\Node7\RunConfig]
-ScriptName=C:\Program Files (x86)\wapt\wapt-get.py
-EngineType=peRemote
-ReinitializeBeforeRun=TRUE
-Parameters=uninstall "$[Project-Path].."
-WorkingDir=$[Project-Path]..
-WriteOutputToFile=FALSE
-OutputFileName=$[ActiveScript-NoExt].log
-AppendToFile=FALSE
-
-[Project\ChildNodes\Node1\ChildNodes\Node7\RunConfig\ExternalRun]
-Caption=External Run
-Description=Run script using an external Python Interpreter
-ApplicationName=$[PythonExe-Short]
-Parameters=$[ActiveScript-Short]
-WorkingDirectory=$[Project-Path]..
-
-[Project\ChildNodes\Node1\ChildNodes\Node8]
-ClassName=TProjectRunConfiguationNode
-Name=update-package-sources
-
-[Project\ChildNodes\Node1\ChildNodes\Node8\RunConfig]
-ScriptName=C:\Program Files (x86)\wapt\wapt-get.py
-EngineType=peRemote
-ReinitializeBeforeRun=TRUE
-Parameters=update-package-sources "$[Project-Path].."
-WorkingDir=$[Project-Path]..
-WriteOutputToFile=FALSE
-OutputFileName=$[ActiveScript-NoExt].log
-AppendToFile=FALSE
-
-[Project\ChildNodes\Node1\ChildNodes\Node8\RunConfig\ExternalRun]
-Caption=External Run
-Description=Run script using an external Python Interpreter
-ApplicationName=$[PythonExe-Short]
-Parameters=$[ActiveScript-Short]
-WorkingDirectory=$[ActiveScript-Dir]
-
-[Project\ChildNodes\Node1\ChildNodes\Node9]
-ClassName=TProjectRunConfiguationNode
-Name=audit
-
-[Project\ChildNodes\Node1\ChildNodes\Node9\RunConfig]
-ScriptName=C:\Program Files (x86)\wapt\wapt-get.py
-EngineType=peRemote
-ReinitializeBeforeRun=TRUE
-Parameters=audit -f "$[Project-Path].."
-WorkingDir=$[Project-Path]..
-WriteOutputToFile=FALSE
-OutputFileName=$[ActiveScript-NoExt].log
-AppendToFile=FALSE
-
-[Project\ChildNodes\Node1\ChildNodes\Node9\RunConfig\ExternalRun]
-Caption=External Run
-Description=Run script using an external Python Interpreter
-ApplicationName=$[PythonExe-Short]
-Parameters=$[ActiveScript-Short]
-WorkingDirectory=$[ActiveScript-Dir]
-
 [Project\ChildNodes\Node1\ChildNodes]
-Count=10
+Count=7
 
 [Project\ChildNodes]
 Count=2
diff --git a/setup.py b/setup.py
index de8a5d8..d35b678 100644
--- a/setup.py
+++ b/setup.py
@@ -23,6 +23,7 @@ def install():
 def update_package():
     print('Updating Zulip Desktop package')
     import requests,json
+    from waptpackage import PackageEntry
 
     latest = json.loads(requests.get('https://api.github.com/repos/zulip/zulip-desktop/releases/latest').text.encode('utf-8'))
     version = latest['tag_name'][1:]