diff --git a/conf/lstu.conf.template b/conf/lstu.conf.template
index 2a70fbd..4a598b1 100644
--- a/conf/lstu.conf.template
+++ b/conf/lstu.conf.template
@@ -29,11 +29,11 @@
     # secret hashed passphrase to access some admin features
     # Hash your password by issuing `echo -n s3cr3T | sha256sum` on your terminal
     # optional, but you won't have access to admin /stats if not set and if adminpwd is not set either
-    hashed_adminpwd => '__PASSWORD_HASHED__',
+    hashed_adminpwd => '__HASHED_PASSWORD__',
 
     # choose a theme. See the available themes in `themes` directory
     # optional, default is 'default'
-    theme         => '__SELECTED_THEME__', # default or milligram
+    theme         => '__THEME__', # default or milligram
 
     # number of URLs to be displayed per page in /stats
     # optional, default is 10
diff --git a/scripts/install b/scripts/install
index cdad896..3a2061f 100644
--- a/scripts/install
+++ b/scripts/install
@@ -130,8 +130,8 @@ ynh_replace_string --match_string="__PORT__" --replace_string="$port" --target_f
 ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$config"
 ynh_replace_string --match_string="__DB_USER__" --replace_string="$db_user" --target_file="$config"
 ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$config"
-ynh_replace_string --match_string="__SELECTED_THEME__" --replace_string="$theme" --target_file="$config"
-ynh_replace_string --match_string="__PASSWORD_HASHED__" --replace_string="$hashed_password" --target_file="$config"
+ynh_replace_string --match_string="__THEME__" --replace_string="$theme" --target_file="$config"
+ynh_replace_string --match_string="__HASHED_PASSWORD__" --replace_string="$hashed_password" --target_file="$config"
 ynh_replace_string --match_string="__SECRET__" --replace_string="$secret" --target_file="$config"
 
 if [ $is_public -eq 0 ];
diff --git a/scripts/restore b/scripts/restore
index ef7f32d..5267ba7 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -111,7 +111,7 @@ yunohost service add $app --log="/var/log/$app.log" --log="/var/www/$app/log/pro
 #=================================================
 ynh_script_progression --message="Starting a systemd service..."
 
-ynh_systemd_action --service_name=$app --action="start"  --log_path="systemd" --line_match="Server available at"
+ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Server available at"
 
 #=================================================
 # RESTORE THE LOGROTATE CONFIGURATION
diff --git a/scripts/upgrade b/scripts/upgrade
index ef57d02..a352e0c 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -174,8 +174,8 @@ ynh_install_app_dependencies $pkg_dependencies
 # ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name"  --target_file="$config"
 # ynh_replace_string --match_string="__DB_USER__" --replace_string="$db_user"  --target_file="$config"
 # ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$config"
-# ynh_replace_string --match_string="__SELECTED_THEME__" --replace_string="$theme" --target_file="$config"
-# ynh_replace_string --match_string="__PASSWORD_HASHED__" --replace_string="$hashed_password" --target_file="$config"
+# ynh_replace_string --match_string="__THEME__" --replace_string="$theme" --target_file="$config"
+# ynh_replace_string --match_string="__HASHED_PASSWORD__" --replace_string="$hashed_password" --target_file="$config"
 # ynh_replace_string --match_string="__SECRET__" --replace_string="$secret" --target_file="$config"
 
 # if [ $is_public -eq 0 ];