diff --git a/conf/amd64.src b/conf/amd64.src
deleted file mode 100644
index 55d8941..0000000
--- a/conf/amd64.src
+++ /dev/null
@@ -1,7 +0,0 @@
-SOURCE_URL=https://github.com/Kareadita/Kavita/releases/download/v0.7.1/kavita-linux-x64.tar.gz
-SOURCE_SUM=B67B91E97F490D0629AAD00E2B2E78752C57A2E7BDD00D3E1B1461EFEF5F22BA
-SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=tar.gz
-SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=
-SOURCE_EXTRACT=true
diff --git a/conf/arm64.src b/conf/arm64.src
deleted file mode 100644
index 8dec346..0000000
--- a/conf/arm64.src
+++ /dev/null
@@ -1,7 +0,0 @@
-SOURCE_URL=https://github.com/Kareadita/Kavita/releases/download/v0.7.1/kavita-linux-arm64.tar.gz
-SOURCE_SUM=DEA4160C72B024BEB47565526DBD71512E8EEB65360D22E76A7E695C0A4C55B7
-SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=tar.gz
-SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=
-SOURCE_EXTRACT=true
diff --git a/conf/armhf.src b/conf/armhf.src
deleted file mode 100644
index a76a26f..0000000
--- a/conf/armhf.src
+++ /dev/null
@@ -1,7 +0,0 @@
-SOURCE_URL=https://github.com/Kareadita/Kavita/releases/download/v0.7.1/kavita-linux-arm.tar.gz
-SOURCE_SUM=AD5CEC73D6B5B48386EAC5291CD9C4B40F0AF4FBB712E730518D3605E80F1D52
-SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=tar.gz
-SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=
-SOURCE_EXTRACT=true
diff --git a/conf/nginx.conf b/conf/nginx.conf
index 926f16a..66dc993 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -1,17 +1,16 @@
 #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
 location __PATH__/ {
 
-  # Host and X headers
+  proxy_pass http://127.0.0.1:__PORT__;
   proxy_set_header        Host $host;
   proxy_set_header        X-Real-IP $remote_addr;
   proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for; aio threads;
   proxy_set_header        X-Forwarded-Proto $scheme;
 
-  # Headers to proxy websocket connections
   proxy_http_version 1.1;
   proxy_set_header Upgrade $http_upgrade;
   proxy_set_header Connection "Upgrade";
 
-  # Proxy to Kavita running locally on port 5000 using ssl
-  proxy_pass http://127.0.0.1:__PORT__;
+  # Include SSOWAT user panel.
+  include conf.d/yunohost_panel.conf.inc;
 }
diff --git a/conf/systemd.service b/conf/systemd.service
index 618b594..b51547f 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=Kavita Server
+Description=Kavita: Media server for your comics
 After=network.target
 
 [Service]
diff --git a/manifest.toml b/manifest.toml
index d811515..7b86140 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -37,6 +37,17 @@ ram.runtime = "50M"
     default = "visitors"
 
 [resources]
+
+    [resources.sources]
+
+    [resources.sources.main]
+    amd64.url = "https://github.com/Kareadita/Kavita/releases/download/v0.7.1/kavita-linux-x64.tar.gz"
+    amd64.sha256 = "B67B91E97F490D0629AAD00E2B2E78752C57A2E7BDD00D3E1B1461EFEF5F22BA"
+    arm64.url = "https://github.com/Kareadita/Kavita/releases/download/v0.7.1/kavita-linux-arm64.tar.gz"
+    arm64.sha256 = "DEA4160C72B024BEB47565526DBD71512E8EEB65360D22E76A7E695C0A4C55B7"
+    armhf.url = "https://github.com/Kareadita/Kavita/releases/download/v0.7.1/kavita-linux-arm.tar.gz"
+    armhf.sha256 = "AD5CEC73D6B5B48386EAC5291CD9C4B40F0AF4FBB712E730518D3605E80F1D52"
+
     [resources.ports]
     main.default = 5000
     
diff --git a/scripts/install b/scripts/install
index e9546b7..70ad71d 100755
--- a/scripts/install
+++ b/scripts/install
@@ -15,9 +15,8 @@ source /usr/share/yunohost/helpers
 ynh_script_progression --message="Setting up source files..." --weight=1
 
 # Download, check integrity, uncompress and patch the source from app.src
-ynh_setup_source --dest_dir="$install_dir" --source_id=$YNH_ARCH
+ynh_setup_source --dest_dir="$install_dir"
 
-chmod 750 "$install_dir"
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
 chmod +x $install_dir/Kavita
diff --git a/scripts/remove b/scripts/remove
index e34efa1..4c29204 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -10,10 +10,11 @@ source _common.sh
 source /usr/share/yunohost/helpers
 
 #=================================================
-# STANDARD REMOVE
+# REMOVE SYSTEM CONFIGURATIONS
 #=================================================
-# REMOVE SERVICE INTEGRATION IN YUNOHOST
+# REMOVE SYSTEMD SERVICE 
 #=================================================
+ynh_script_progression --message="Removing system configurations related to $app..." --weight=1
 
 # Remove the service from the list of services known by YunoHost (added from `yunohost service add`)
 if ynh_exec_warn_less yunohost service status $app >/dev/null
@@ -22,13 +23,6 @@ then
 	yunohost service remove $app
 fi
 
-#=================================================
-# REMOVE SYSTEM CONFIGURATIONS
-#=================================================
-# REMOVE SYSTEMD SERVICE 
-#=================================================
-ynh_script_progression --message="Removing system configurations related to $app..." --weight=1
-
 # Remove the dedicated systemd config
 ynh_remove_systemd_config
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 9ee4448..e649072 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -33,10 +33,9 @@ then
 	ynh_script_progression --message="Upgrading source files..." --weight=1
 
 	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$install_dir" --source_id=$YNH_ARCH --keep="config"
+	ynh_setup_source --dest_dir="$install_dir" --keep="config"
 fi
 
-chmod 750 "$install_dir"
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
 chmod +x $install_dir/Kavita