diff --git a/apps_packaging.md b/apps_packaging.md
index 125a46ce..ed24ce44 100644
--- a/apps_packaging.md
+++ b/apps_packaging.md
@@ -6,3 +6,9 @@ a repository must exist in the community repository <a href="https://github.com/
 The following list is a list of apps in the process of being packaged.
 
 [Edit this list](/write_documentation) to add the application you are packaging, or contribut to [package apps](/packaging_apps) yourself.
+
+- [Huginn](https://github.com/YunoHost-Apps/huginn_ynh)
+- [Redmine](https://github.com/YunoHost-Apps/redmine_ynh)
+- [Salut à Toi](https://github.com/YunoHost-Apps/sat_ynh)
+- [Streama](https://github.com/YunoHost-Apps/streama_ynh)
+- [Wisemapping](https://github.com/YunoHost-Apps/wisemapping_ynh)
diff --git a/apps_wishlist.md b/apps_wishlist.md
index 62aa4242..c2015953 100644
--- a/apps_wishlist.md
+++ b/apps_wishlist.md
@@ -15,11 +15,9 @@ The following list is a compiled wishlist of applications that would be nice-to-
 - [Ajenti](http://ajenti.org)
 - [Akaunting](https://akaunting.com) Everything you need to manage your finances. Keep track of all of your payments, invoices, expenses, etc.
 - [aMule](https://github.com/amule-project/amule)
-- [Anki](https://github.com/dsnopek/anki-sync-server) is a powerful Open Source flashcard application, which helps you quickly and easily memorize facts over the long term utilizing a spaced repetition algorithm.
 - [Auth0 SSO Dashboard](https://github.com/auth0-extensions/auth0-sso-dashboard-extension)
 - [Autoblog](https://github.com/mitsukarenai/Projet-Autoblog) (/!\ last update: Jan 27, 2015)
 - [Bitmessage](https://bitmessage.org/wiki/Compiling_instructions)
-- [Bitwarden](https://bitwarden.com/)
 - [Beehive](https://github.com/muesli/beehive)
 - [Bludit](https://www.bludit.com)
 - [Blynk](https://github.com/blynkkk/blynk-library)
@@ -53,12 +51,10 @@ The following list is a compiled wishlist of applications that would be nice-to-
 - [FEX](http://fex.rus.uni-stuttgart.de/)
 - [FileTea](https://filetea.me)
 - [FitTrackee](https://github.com/SamR1/FitTrackee)
-- [FlatPress](https://github.com/flatpressblog/flatpress)
-- [Flarum](https://flarum.org/)
 - [FoOlSlide](http://foolcode.github.io/FoOlSlide/) Open source comicbook/manga management software
 - [Fossil](http://www.fossil-scm.org)
 - [Framaslides](https://framagit.org/framasoft/framaslides/)
-- [Gateway](https://iot.mozilla.org/gateway/)
+- [WebThings Gateway](https://iot.mozilla.org/gateway/)
 - [Geneweb](https://geneweb.tuxfamily.org)
 - [GetSimple CMS](http://get-simple.info)
 - [Git-annex](http://git-annex.branchable.com)
@@ -74,7 +70,6 @@ The following list is a compiled wishlist of applications that would be nice-to-
 - [Helpy](https://github.com/helpyio/helpy)
 - [Hexo](https://hexo.io/)
 - [Hi Buddy](https://github.com/tOkeshu/hibuddy) (/!\ last update: 17 Feb 2015)
-- [Huginn](https://github.com/cantino/huginn)
 - [Hugo](http://gohugo.io)
 - [Icecast 2](http://www.icecast.org)
 - [ikiwiki](http://ikiwiki.info)
@@ -106,10 +101,8 @@ The following list is a compiled wishlist of applications that would be nice-to-
 - [LocomotiveCMS](https://github.com/locomotivecms/engine)
 - [Logstalgia](http://logstalgia.io)
 - [Loomio](https://www.loomio.org)
-- [MagicMirror²](https://github.com/MichMich/MagicMirror)
 - [MaidSafe](http://maidsafe.net)
 - [Mailpile](https://www.mailpile.is)
-- [Mailtrain](https://mailtrain.org/)
 - [Mautic](https://github.com/mautic/mautic)
 - [MediaCrush](https://github.com/MediaCrush/MediaCrush) (/!\ last update: Jan 23, 2015)
 - [microblog.pub](https://microblog.pub)
@@ -122,7 +115,6 @@ The following list is a compiled wishlist of applications that would be nice-to-
 - [Museek+](https://github.com/eLvErDe/museek-plus)
 - [Netrunner](https://github.com/mtgred/netrunner)
 - [Nibbleblog](http://www.nibbleblog.com)
-- [Nitter](https://github.com/zedeus/nitter) (Twitter front-end focused on privacy)
 - [Nuage](https://nuage.kerjean.me/login)
 - [Ombi](https://github.com/tidusjar/Ombi)
 - [OpenBazaar](https://openbazaar.org)
@@ -146,7 +138,6 @@ The following list is a compiled wishlist of applications that would be nice-to-
 - [Privoxy](http://www.privoxy.org)
 - [ProcessMaker](http://www.processmaker.com)
 - [ProtonMail’s WebClient](https://github.com/ProtonMail/WebClient)
-- [ProjeQtOr](https://www.projeqtor.org/en/product-en/downloads)
 - [PyLoad](https://github.com/pyload/pyload)
 - [Pulse](https://source.ind.ie/project/pulse-swift/tree/master)
 - [Pump.io](http://pump.io)
@@ -154,13 +145,11 @@ The following list is a compiled wishlist of applications that would be nice-to-
 - [racktables](http://racktables.org)
 - [Race for the Galaxy](https://github.com/bnordli/rftg)
 - [Radarr](https://github.com/Radarr/Radarr)
-- [Redmine](https://www.redmine.org)
 - [Request Tracker](https://bestpractical.com)
 - [Respawn 2.0](https://github.com/broncowdd/respawn) ( /!\ last update: 2015)
 - [Restya](http://restya.com)
 - [Retroshare](http://retroshare.net/downloads.html)
 - [SABnzbd](https://sabnzbd.org)
-- [Samourai Dojo, Bitcoin coinjoin node] (https://github.com/Samourai-Wallet/samourai-dojo)
 - [ScenariChain-server](https://download.scenari.software/SCENARIchain-server/)
 - [Scramble, Browser-based PGP web mail](https://github.com/dcposch/scramble)
 - [Scribbleton](https://scribbleton.com)
@@ -170,10 +159,8 @@ The following list is a compiled wishlist of applications that would be nice-to-
 - [Simone](https://github.com/Kloadut/Simone)
 - [SocialHome](https://github.com/jaywink/socialhome) (Socialhome is best described as a federated personal profile with social networking functionality) (https://socialhome.network)
 - [Sonarr](https://sonarr.tv)
-- [SpamGourmet](https://sourceforge.net/projects/spamgourmet/)
 - [Stackedit](https://stackedit.io)
-- [StandardNotes](https://standardnotes.org) (a clean, simple, E2E-encrypted notes app) -- specifically, the server-side [StandardFile](https://standardfile.org) portion.
-- [Streama](https://github.com/dularion/streama)
+- [StandardNotes](https://standardnotes.org) (a clean, simple, E2E-encrypted notes app) -- specifically, the server-side [StandardFile](https://standardfile.org) portion
 - [Streisand](https://github.com/jlund/streisand)
 - [Subspace](https://github.com/subspacecloud/subspace) (A simple WireGuard VPN server GUI)
 - [Syspass](http://www.syspass.org/)
@@ -194,9 +181,7 @@ The following list is a compiled wishlist of applications that would be nice-to-
 - [WebODF](http://webodf.org)
 - [webSync](http://furier.github.io/websync)
 - [WebTorrent](https://github.com/feross/webtorrent)
-- [Wisemapping](http://www.wisemapping.com)
 - [Wireguard](https://www.wireguard.com/)
-- [Xibo](https://github.com/xibosignage)
 - [Xonotic](http://xonotic.org)
 - [YesWiki](https://yeswiki.net)
 - [Zammad](https://github.com/zammad/zammad)