diff --git a/apps.toml b/apps.toml
index a0f92e0e..a5578728 100644
--- a/apps.toml
+++ b/apps.toml
@@ -35,7 +35,7 @@ url = "https://github.com/YunoHost-Apps/abantecart_ynh"
 category = "social_media"
 level = 6
 state = "working"
-subtags = [ "microblogging", "pictures", "forum" ]
+subtags = [ "microblogging", "pictures" ]
 url = "https://github.com/YunoHost-Apps/acropolis_ynh"
 
 [actual]
@@ -124,7 +124,6 @@ url = "https://github.com/YunoHost-Apps/anarchism_ynh"
 category = "small_utilities"
 level = 8
 state = "working"
-subtags = [ "archiving" ]
 url = "https://github.com/YunoHost-Apps/archivebox_ynh"
 
 [archivist]
@@ -139,7 +138,6 @@ antifeatures = [ "alpha-software" ]
 category = "small_utilities"
 level = 7
 state = "working"
-subtags = [ "remoteStorage", "unhosted" ]
 url = "https://github.com/YunoHost-Apps/armadietto_ynh"
 
 [audiobookshelf]
@@ -186,7 +184,6 @@ url = "https://github.com/YunoHost-Apps/bazarr_ynh"
 category = "iot"
 level = 8
 state = "working"
-subtags = [ "automation" ]
 url = "https://github.com/YunoHost-Apps/beehive_ynh"
 
 [biboumi]
@@ -308,7 +305,6 @@ category = "multimedia"
 level = 8
 potential_alternative_to = [ "Anchor", "Deezer", "SoundCloud", "Spotify", "Audible", "Apple Podcasts" ]
 state = "working"
-subtags = [ "podcasts" ]
 url = "https://github.com/YunoHost-Apps/castopod_ynh"
 
 [cesium]
@@ -851,7 +847,7 @@ url = "https://github.com/Yunohost-Apps/endi_ynh"
 category = "social_media"
 level = 8
 state = "working"
-subtags = [ "blog" ]
+subtags = [ "microblogging" ]
 url = "https://github.com/YunoHost-Apps/epicyon_ynh"
 
 [ergo]
@@ -916,7 +912,7 @@ url = "https://github.com/YunoHost-Apps/facilmap_ynh"
 category = "publishing"
 level = 7
 state = "working"
-subtags = [ "website", "api" ]
+subtags = [ "website" ]
 url = "https://github.com/YunoHost-Apps/fastapi_ynh"
 
 [ffsync]
@@ -927,10 +923,10 @@ state = "working"
 url = "https://github.com/YunoHost-Apps/ffsync_ynh"
 
 [fider]
-category = "communication"
+category = "productivity_and_management"
+subtags = [ "poll" ]
 level = 3
 state = "working"
-subtags = [ "other" ]
 url = "https://github.com/YunoHost-Apps/fider_ynh"
 
 [filebrowser]
@@ -970,11 +966,10 @@ subtags = [ "accounting" ]
 url = "https://github.com/YunoHost-Apps/firefly-iii-di_ynh"
 
 [fittrackee]
-category = "social_media"
+category = "small_utilities"
 level = 8
 potential_alternative_to = [ "Strava" ]
 state = "working"
-subtags = [ "sport" ]
 url = "https://github.com/Yunohost-Apps/fittrackee_ynh"
 
 [flarum]
@@ -1244,7 +1239,7 @@ category = "office"
 level = 7
 potential_alternative_to = [ "Airtable" ]
 state = "working"
-subtags = [ "db", "spreadsheet" ]
+subtags = [ "spreadsheet" ]
 url = "https://github.com/YunoHost-Apps/grist_ynh"
 
 [grocy]
@@ -1677,7 +1672,6 @@ category = "social_media"
 level = 8
 potential_alternative_to = [ "Hacker News", "Lobste.rs", "Reddit" ]
 state = "working"
-subtags = [ "website" ]
 url = "https://github.com/YunoHost-Apps/lemmy_ynh"
 
 [librarian]
@@ -2140,7 +2134,6 @@ url = "https://github.com/YunoHost-Apps/my-mind_ynh"
 category = "publishing"
 level = 6
 state = "working"
-subtags = [ "gemini" ]
 url = "https://github.com/YunoHost-Apps/my_capsule_ynh"
 
 [my_webapp]
@@ -2267,7 +2260,6 @@ url = "https://github.com/YunoHost-Apps/nullboard_ynh"
 category = "iot"
 level = 0
 state = "notworking"
-subtags = [ "fablab" ]
 url = "https://github.com/YunoHost-Apps/octoprint_ynh"
 
 [ofbiz]
@@ -2491,7 +2483,7 @@ category = "reading"
 level = 8
 potential_alternative_to = [ "Netvibes" ]
 state = "working"
-subtags = [ "others" ]
+subtags = [ "rssreader" ]
 url = "https://github.com/YunoHost-Apps/petrolette_ynh"
 
 [pgadmin]
@@ -3196,7 +3188,6 @@ url = "https://github.com/YunoHost-Apps/squid3_ynh"
 category = "communication"
 level = 7
 state = "working"
-subtags = [ "scuttlebutt" ]
 url = "https://github.com/YunoHost-Apps/ssbroom_ynh"
 
 [ssh_chroot_dir]
diff --git a/categories.toml b/categories.toml
index f6b4f5f9..e8b4c8db 100644
--- a/categories.toml
+++ b/categories.toml
@@ -49,25 +49,25 @@ description.it = "Siti web, blog, wiki, CMS…"
     title.es = "Paginas web"
     title.fr = "Site web"
     title.it = "Siti web"
-    
+
     [publishing.subtags.blog]
     title.en = "Blog"
     title.es = "blog"
     title.fr = "Blog"
     title.it = "Blog"
-    
+
     [publishing.subtags.wiki]
     title.en = "Wiki"
     title.es = "Wiki"
     title.fr = "Wiki"
     title.it = "Wiki"
-    
+
     [publishing.subtags.ecommerce]
     title.en = "E-commerce"
     title.es = "Comercio eletronico"
     title.fr = "Vente en ligne"
     title.it = "Vendite online"
-    
+
     [publishing.subtags.analytics]
     title.en = "Analytics"
     title.es = "Estadisticas"
@@ -90,19 +90,19 @@ description.it = "Messaggistica, posta elettronica, forum, riunioni…"
     title.es = "Mensajeria Instantanea"
     title.fr = "Messagerie instantannée"
     title.it = "Messaggistica istantanea"
-    
+
     [communication.subtags.forum]
     title.en = "Forum"
     title.es = "Foro"
     title.fr = "Forum"
     title.it = "Forum"
-    
+
     [communication.subtags.email]
     title.en = "Email"
     title.es = "Email"
     title.fr = "Email"
     title.it = "Posta elettronica"
-    
+
     [communication.subtags.meeting]
     title.en = "Meetings"
     title.es = "Reuniones"
@@ -250,6 +250,11 @@ description.it = "Librerie musicali, gallerie d’immagini, P2P, serie TV…"
     title.fr = "Images"
     title.it = "Immagini"
 
+    [multimedia.subtags.videos]
+    title.en = "Videos"
+    title.fr = "Vidéos"
+    title.it = "Video"
+
 [social_media]
 icon = "users"
 title.en = "Social media"