diff --git a/README.md b/README.md
index 5bfd413..7d0c92e 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
 If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.*
 
 ## Overview
-Quick description of this app.
+Yellow is a CMS designed to make the creation of a website ultra-simple and easy to use. Yellow CMS does not require a database.
 
 **Shipped version:** 0.8.16
 
@@ -53,7 +53,7 @@ How to configure this app: From an admin panel, a plain file with SSH, or any ot
 ## Links
 
  * Report a bug: https://github.com/YunoHost-Apps/yellowcms_ynh/issues
- * App website: https://datenstrom.se/yellow/
+ * App website: https://datenstrom.se/
  * Upstream app repository: https://github.com/datenstrom/yellow/
  * YunoHost website: https://yunohost.org/
 
diff --git a/conf/nginx.conf b/conf/nginx.conf
index f48e794..156c52c 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -1,35 +1,35 @@
-    location __PATH__/cache {
+location __PATH__/cache {
         rewrite ^(.*)$ /error break;
     }
 
-    location __PATH__/content {
+location __PATH__/content {
         rewrite ^(.*)$ /error break;
     }
 
-    location __PATH__/system {
+location __PATH__/system {
         rewrite ^(.*)$ /error break;
     }
 
 #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
 location __PATH__/ {
+
     alias __FINALPATH__/ ;
 
+    # Force usage of https
+    if ($scheme = http) {
+        rewrite ^ https://$server_name$request_uri? permanent;
+    }
+
     index index.html yellow.php;
 
 
-    #location __PATH__/ {
-    #    if (!-e $request_filename) {
-    #        rewrite ^/(.*)$ /yellow.php last;
-    #        break;
-    #    }
-    #}
-
-if (!-e $request_filename) {
-    rewrite ^(.*)$ /yellow.php last;
-    break;
+    if (!-e $request_filename) {
+        rewrite ^(.*)$ /yellow.php last;
+        break;
     }
 
-    try_files $uri $uri/ index.php;
+    try_files $uri $uri/ yellow.php;
+
     location ~ [^/]\.php(/|$) {
         fastcgi_split_path_info ^(.+?\.php)(/.*)$;
         fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock;
diff --git a/scripts/install b/scripts/install
index 71bef0b..9bb02fe 100644
--- a/scripts/install
+++ b/scripts/install
@@ -88,7 +88,7 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 #=================================================
 
 # Set permissions to app files
-chown -R www-data:www-data $final_path
+chown -R $app: $final_path
 chmod -R a+rw $final_path
 
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index 51d30f3..6bfd55a 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -66,7 +66,7 @@ ynh_system_user_create --username=$app
 #=================================================
 
 # Restore permissions on app files
-chown -R www-data:www-data $final_path
+chown -R $app: $final_path
 chmod -R a+rw $final_path
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index f6dc094..1ccbea0 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -104,7 +104,7 @@ ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependenc
 #=================================================
 
 # Set permissions on app files
-chown -R www-data:www-data $final_path
+chown -R $app: $final_path
 chmod -R a+rw $final_path
 
 #=================================================