diff --git a/apps.toml b/apps.toml
index c4ce5879..051b0ab1 100644
--- a/apps.toml
+++ b/apps.toml
@@ -14,7 +14,7 @@ url = "https://github.com/YunoHost-Apps/20euros_ynh"
 
 [243-game]
 category = "games"
-level = 7
+level = 8
 state = "working"
 url = "https://github.com/YunoHost-Apps/243-game_ynh"
 
@@ -216,6 +216,12 @@ state = "working"
 subtags = [ "blog" ]
 url = "https://github.com/YunoHost-Apps/bludit_ynh"
 
+[bonfire]
+category = "social_media"
+potential_alternative_to = [ "Mastodon", "Pleroma", "Akkoma", "Misskey", "Calckey", "Iceshrimp" ]
+state = "inprogress"
+url = "https://github.com/YunoHost-Apps/bonfire_ynh"
+
 [bookstack]
 category = "publishing"
 level = 8
@@ -231,12 +237,6 @@ potential_alternative_to = [ "Goodreads" ]
 state = "working"
 url = "https://github.com/YunoHost-Apps/bookwyrm_ynh"
 
-[bonfire]
-category = "social_media"
-potential_alternative_to = [ "Mastodon", "Pleroma", "Akkoma", "Misskey", "Calckey", "Iceshrimp" ]
-state = "inprogress"
-url = "https://github.com/YunoHost-Apps/bonfire_ynh"
-
 [borg]
 category = "system_tools"
 level = 7
@@ -371,7 +371,7 @@ url = "https://github.com/YunoHost-Apps/cinny_ynh"
 
 [civicrm_drupal7]
 category = "productivity_and_management"
-level = 0
+level = 7
 state = "working"
 subtags = [ "business_and_ngos" ]
 url = "https://github.com/YunoHost-Apps/civicrm_drupal7_ynh"
@@ -479,7 +479,7 @@ url = "https://github.com/YunoHost-Apps/coturn_ynh"
 
 [couchdb]
 category = "system_tools"
-level = 8
+level = 6
 state = "working"
 subtags = [ "db" ]
 url = "https://github.com/YunoHost-Apps/couchdb_ynh"
@@ -589,7 +589,7 @@ url = "https://github.com/YunoHost-Apps/diagramsnet_ynh"
 
 [diaspora]
 category = "social_media"
-level = 8
+level = 6
 potential_alternative_to = [ "Ello", "Facebook", "Hubzilla", "Myspace", "X" ]
 state = "working"
 subtags = [ "microblogging" ]
@@ -603,7 +603,7 @@ url = "https://github.com/YunoHost-Apps/digiscreen_ynh"
 
 [digisteps]
 category = "publishing"
-level = 8
+level = 0
 state = "working"
 url = "https://github.com/YunoHost-Apps/digisteps_ynh"
 
@@ -633,7 +633,7 @@ url = "https://github.com/YunoHost-Apps/directorylister_ynh"
 
 [discourse]
 category = "communication"
-level = 8
+level = 6
 potential_alternative_to = [ "Invision Community", "vBulletin", "XenForo" ]
 state = "working"
 subtags = [ "forum" ]
@@ -768,7 +768,7 @@ url = "https://github.com/YunoHost-Apps/elabftw_ynh"
 [elasticsearch7]
 antifeatures = [ "not-totally-free" ]
 category = "dev"
-level = 8
+level = 6
 state = "working"
 subtags = [ "programming" ]
 url = "https://github.com/YunoHost-Apps/elasticsearch7_ynh"
@@ -900,7 +900,7 @@ url = "https://github.com/YunoHost-Apps/facette_ynh"
 
 [facilmap]
 category = "productivity_and_management"
-level = 6
+level = 8
 state = "working"
 url = "https://github.com/YunoHost-Apps/facilmap_ynh"
 
@@ -1531,7 +1531,7 @@ url = "https://github.com/YunoHost-Apps/jitsi_ynh"
 [joomla]
 antifeatures = [ "package-not-maintained" ]
 category = "publishing"
-level = 8
+level = 7
 state = "working"
 subtags = [ "website" ]
 url = "https://github.com/YunoHost-Apps/joomla_ynh"
@@ -1574,7 +1574,7 @@ url = "https://github.com/YunoHost-Apps/keeweb_ynh"
 
 [kimai2]
 category = "productivity_and_management"
-level = 7
+level = 6
 potential_alternative_to = [ "Toggl Track", "RescueTime", "Hamster" ]
 state = "working"
 subtags = [ "task" ]
@@ -1632,7 +1632,7 @@ url = "https://github.com/YunoHost-Apps/ladder_ynh"
 
 [languagetool]
 category = "office"
-level = 6
+level = 8
 state = "working"
 subtags = [ "text" ]
 url = "https://github.com/YunoHost-Apps/languagetool_ynh"
@@ -1857,7 +1857,7 @@ url = "https://github.com/YunoHost-Apps/mantis_ynh"
 
 [mastodon]
 category = "social_media"
-level = 8
+level = 6
 potential_alternative_to = [ "X" ]
 state = "working"
 subtags = [ "microblogging" ]
@@ -2080,7 +2080,7 @@ url = "https://github.com/YunoHost-Apps/motioneye_ynh"
 
 [movim]
 category = "social_media"
-level = 6
+level = 8
 potential_alternative_to = [ "Facebook", "Facebook Messenger", "MSN" ]
 state = "working"
 subtags = [ "microblogging" ]
@@ -2117,7 +2117,7 @@ url = "https://github.com/YunoHost-Apps/my-mind_ynh"
 
 [my_capsule]
 category = "publishing"
-level = 7
+level = 6
 state = "working"
 subtags = [ "gemini" ]
 url = "https://github.com/YunoHost-Apps/my_capsule_ynh"
@@ -2365,7 +2365,7 @@ url = "https://github.com/YunoHost-Apps/owncloud_ynh"
 
 [owntracks]
 category = "small_utilities"
-level = 6
+level = 8
 state = "working"
 url = "https://github.com/YunoHost-Apps/owntracks_ynh"
 
@@ -2560,9 +2560,10 @@ url = "https://github.com/YunoHost-Apps/pihole_ynh"
 [piped]
 antifeatures = [ "non-free-network" ]
 category = "social_media"
+level = 7
 potential_alternative_to = [ "YouTube" ]
-subtags = [ "videos" ]
 state = "working"
+subtags = [ "videos" ]
 url = "https://github.com/YunoHost-Apps/piped_ynh"
 
 [piwigo]
@@ -3388,7 +3389,7 @@ url = "https://github.com/YunoHost-Apps/turtl_ynh"
 
 [tvheadend]
 category = "multimedia"
-level = 8
+level = 6
 state = "working"
 url = "https://github.com/YunoHost-Apps/tvheadend_ynh"