diff --git a/WAPT/control b/WAPT/control
index ceeabc4..1b99ee6 100644
--- a/WAPT/control
+++ b/WAPT/control
@@ -1,11 +1,11 @@
 package           : fws-thunderbird-sogo-addons
-version           : 1
+version           : 2
 architecture      : all
 section           : base
 priority          : optional
 maintainer        : Daniel Berteaud <daniel@firewall-services.com>
 description       : SOGo addons for Thunderbird
-depends           : fws-thunderbird,fws-7zip
+depends           : fws-thunderbird,fws-7zip,fws-thunderbird-config
 conflicts         : 
 maturity          : DEV
 locale            : 
@@ -15,18 +15,18 @@ max_os_version    :
 min_wapt_version  : 
 sources           : 
 installed_size    : 
-impacted_process  : 
-description_fr    : 
+impacted_process  : thunderbird.exe
+description_fr    : Plugins SOGo pour le client Mozilla Thunderbird
 description_pl    : 
 description_de    : 
 description_es    : 
 audit_schedule    : 2d
-editor            : 
-keywords          : 
+editor            : Inverse
+keywords          : caldav,carddav,sogo
 licence           : 
-homepage          : 
+homepage          : https://sogo.nu
 package_uuid      : 
-signer            : 
+signer            : Daniel Berteaud
 signer_fingerprint: 
 signature_date    : 
 signed_attributes : 
\ No newline at end of file
diff --git a/setup.py b/setup.py
index fe4fd44..28ecc01 100644
--- a/setup.py
+++ b/setup.py
@@ -17,50 +17,47 @@ if isfile(makepath(programfiles32,'wapt','private','symetric.txt')) and isfile(m
     f = Fernet(open(makepath(programfiles32,'wapt','private','symetric.txt'),'r').read())
     variables.update(json.loads(f.decrypt(open(makepath(programfiles32,'wapt','private','variables.txt'),'r').read())))
 
-install_dir = programfiles
-if iswin64():
-    install_dir = programfiles32
-connector_version = '60.0.0'
-integrator_version = '60.0.0'
+connector_version = control.version.split('-',1)[0]
+integrator_version = connector_version
 
 def install():
     for extension in ['connector','integrator']:
-        if isdir(makepath(install_dir,'Mozilla Thunderbird','distribution','extensions','sogo-%s@inverse.ca' % extension)):
-            remove_tree(makepath(install_dir,'Mozilla Thunderbird','distribution','extensions','sogo-%s@inverse.ca' % extension))
-        mkdirs(makepath(install_dir,'Mozilla Thunderbird','distribution','extensions','sogo-%s@inverse.ca' % extension))
+        if isdir(makepath(programfiles,'Mozilla Thunderbird','distribution','extensions','sogo-%s@inverse.ca' % extension)):
+            remove_tree(makepath(programfiles,'Mozilla Thunderbird','distribution','extensions','sogo-%s@inverse.ca' % extension))
+        mkdirs(makepath(programfiles,'Mozilla Thunderbird','distribution','extensions','sogo-%s@inverse.ca' % extension))
 
     # connector can be extracted as is
-    run('"%s" x -y -o"%s" sogo-connector-%s.xpi' % (makepath(programfiles,'7-Zip','7z.exe'), makepath(install_dir,'Mozilla Thunderbird','distribution','extensions','sogo-connector@inverse.ca'), connector_version))
+    run('"%s" x -y -o"%s" sogo-connector-%s.xpi' % (makepath(programfiles,'7-Zip','7z.exe'), makepath(programfiles,'Mozilla Thunderbird','distribution','extensions','sogo-connector@inverse.ca'), connector_version))
 
     # Integrator must be customized, so first extract it
-    run('"%s" x -y -o"%s" sogo-integrator-%s-sogo-demo.xpi' % (makepath(programfiles,'7-Zip','7z.exe'), makepath(install_dir,'Mozilla Thunderbird','distribution','extensions','sogo-integrator@inverse.ca'), integrator_version))
+    run('"%s" x -y -o"%s" sogo-integrator-%s-sogo-demo.xpi' % (makepath(programfiles,'7-Zip','7z.exe'), makepath(programfiles,'Mozilla Thunderbird','distribution','extensions','sogo-integrator@inverse.ca'), integrator_version))
     # And replace the extensions.rdf content
     jinja2 = Environment(
         loader=FileSystemLoader(os.path.dirname(os.path.abspath(__file__))),
         trim_blocks=True
     )
-    open(makepath(install_dir,'Mozilla Thunderbird','distribution','extensions','sogo-integrator@inverse.ca','chrome','content','extensions.rdf'),'w').write(
+    open(makepath(programfiles,'Mozilla Thunderbird','distribution','extensions','sogo-integrator@inverse.ca','chrome','content','extensions.rdf'),'w').write(
         jinja2.get_template('extensions.rdf.j2').render(
             sogo_server = variables['sogo_server']
         )
     )
     # Also remove custom settings
-    os.unlink(makepath(install_dir,'Mozilla Thunderbird','distribution','extensions','sogo-integrator@inverse.ca','defaults','preferences','site.js'))
+    os.unlink(makepath(programfiles,'Mozilla Thunderbird','distribution','extensions','sogo-integrator@inverse.ca','defaults','preferences','site.js'))
 
 
 def uninstall():
     print('Removing SOGo extensions for Thunderbird')
     for extension in ['connector','integrator']:
-        remove_tree(makepath(install_dir,'Mozilla Thunderbird','distribution','extensions','sogo-%s@inverse.ca' % extension))
+        remove_tree(makepath(programfiles,'Mozilla Thunderbird','distribution','extensions','sogo-%s@inverse.ca' % extension))
 
 def audit():
     try:
-        run('type "%s" | find /I "em:version=" | find "%s"' % (makepath(install_dir,'Mozilla Thunderbird','distribution','extensions','sogo-connector@inverse.ca','install.rdf'), connector_version))
+        run('type "%s" | find /I "em:version=" | find "%s"' % (makepath(programfiles,'Mozilla Thunderbird','distribution','extensions','sogo-connector@inverse.ca','install.rdf'), connector_version))
     except:
         print('SOGO connector version check failed')
         return "ERROR"
     try:
-        run('type "%s" | find /I "em:version=" | find "%s"' % (makepath(install_dir,'Mozilla Thunderbird','distribution','extensions','sogo-integrator@inverse.ca','install.rdf'), integrator_version))
+        run('type "%s" | find /I "em:version=" | find "%s"' % (makepath(programfiles,'Mozilla Thunderbird','distribution','extensions','sogo-integrator@inverse.ca','install.rdf'), integrator_version))
     except:
         print('SOGO integrator version check failed')
         return "ERROR"