diff --git a/conf/poller-cron b/conf/poller-cron
index 0e284be..8367ccd 100644
--- a/conf/poller-cron
+++ b/conf/poller-cron
@@ -1,2 +1,2 @@
-# Run poller periodically to update Hubzilla
-*/10 * * * * cd YNH_WWW_PATH; /usr/bin/php bin/worker.php
+# Run poller periodically to update Friendica
+*/10 * * * * __USER__ cd __YNH_WWW_PATH__; /usr/bin/php bin/worker.php
diff --git a/manifest.json b/manifest.json
index 9315e95..39742f6 100644
--- a/manifest.json
+++ b/manifest.json
@@ -20,7 +20,7 @@
         "name": "aymhce",
         "email": "aymhce@gmail.com"
         },
-    "multi_instance": "true",
+    "multi_instance": true,
     "services": [
         "nginx",
         "php5-fpm",
diff --git a/scripts/install b/scripts/install
index 699c52d..e1c40b9 100644
--- a/scripts/install
+++ b/scripts/install
@@ -70,11 +70,8 @@ ynh_app_setting_set $app database $database
 #=================================================
 # INSTALL DEPENDENCIES
 #=================================================
-pkg_dependencies="php5-cli php5-imagick php5-gd php5-mcrypt" 
-if [ "$(lsb_release --codename --short)" != "jessie" ]; then
-	pkg_dependencies="$pkg_dependencies php-xml"
-fi
-ynh_install_app_dependencies $pkg_dependencies
+ynh_install_app_dependencies php5-cli 'php5-imagick|php-imagick' php5-gd php5-mcrypt 'php-xml|base-files(<<9.0)'
+
 
 #=================================================
 # CREATE A MYSQL DATABASE
@@ -107,7 +104,8 @@ ynh_add_nginx_config
 
 
 # configure friendica
-sudo cp "/var/www/$app/htconfig.php" "/var/www/$app/.htconfig.php"
+
+sudo cp "$final_path/htconfig.php" "$final_path/.htconfig.php"
 ynh_replace_string "your.mysqlhost.com" "localhost" "$final_path/.htconfig.php"
 ynh_replace_string "mysqlusername" "$db_name" "$final_path/.htconfig.php"
 ynh_replace_string "mysqldatabasename" "$db_name" "$final_path/.htconfig.php"
@@ -146,7 +144,8 @@ sudo chmod -R 777 $final_path/view/smarty3
 chown -R $app: $final_path
 
 # Set up poller
-sed -i "s@YNH_WWW_PATH@$final_path@g" ../conf/poller-cron
+ynh_replace_string "__YNH_WWW_PATH__" "$final_path" ../conf/poller-cron
+ynh_replace_string "__USER__" "$app" ../conf/poller-cron
 sudo cp ../conf/poller-cron /etc/cron.d/$app
 
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index 0310723..41bf54d 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -80,11 +80,8 @@ ynh_restore_file "/etc/php5/fpm/conf.d/20-$app.ini"
 # REINSTALL DEPENDENCIES
 #=================================================
 
-pkg_dependencies="php5-cli php5-imagick php5-gd php5-mcrypt"
-if [ "$(lsb_release --codename --short)" != "jessie" ]; then
-	pkg_dependencies="$pkg_dependencies php-xml"
-fi
-ynh_install_app_dependencies $pkg_dependencies
+ynh_install_app_dependencies php5-cli 'php5-imagick|php-imagick' php5-gd php5-mcrypt 'php-xml|base-files(<<9.0)'
+
 
 # set permission
 sudo chmod -R 777 $final_path/view/smarty3
diff --git a/scripts/upgrade b/scripts/upgrade
index 807ab96..005f5ac 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -33,11 +33,8 @@ ynh_clean_setup () {
 ynh_abort_if_errors
 
 # Add Dependencies
-pkg_dependencies="php5-cli php5-imagick php5-gd php5-mcrypt"
-if [ "$(lsb_release --codename --short)" != "jessie" ]; then
-	pkg_dependencies="$pkg_dependencies php-xml"
-fi
-ynh_install_app_dependencies $pkg_dependencies
+ynh_install_app_dependencies php5-cli 'php5-imagick|php-imagick' php5-gd php5-mcrypt 'php-xml|base-files(<<9.0)'
+
 
 # Create a temporary directory
 tmpdir="$(mktemp -d)"
@@ -100,7 +97,8 @@ ynh_backup_if_checksum_is_different "$final_path/.htconfig.php"
 ynh_store_file_checksum "$final_path/.htconfig.php"
 
 # Set up poller
-sed -i "s@YNH_WWW_PATH@$final_path@g" ../conf/poller-cron
+ynh_replace_string "__YNH_WWW_PATH__" "$final_path" ../conf/poller-cron
+ynh_replace_string "__USER__" "$app" ../conf/poller-cron
 sudo cp ../conf/poller-cron /etc/cron.d/$app
 
 # Run composer