diff --git a/apps_wishlist.md b/apps_wishlist.md
index ca38d89e..e4ddd122 100644
--- a/apps_wishlist.md
+++ b/apps_wishlist.md
@@ -11,199 +11,126 @@ The following list is a compiled wishlist of applications that would be nice-to-
 - [List of awesome Node.js projects](https://github.com/sqreen/awesome-nodejs-projects)
 - [List of SIP softwares/applications](https://en.wikipedia.org/wiki/List_of_SIP_software#Free_and_open-source_license)
 - [10er10](https://github.com/dready92/10er10)
-- [Airtime](https://www.sourcefabric.org/en/airtime/)
-- [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.
+- [Ajenti](http://ajenti.org) / [github](https://github.com/ajenti/ajenti/)
+- [Akaunting](https://akaunting.com) Everything you need to manage your finances. Keep track of all of your payments, invoices, expenses, etc. / [github](https://github.com/akaunting/akaunting)
 - [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/)
+- [Bitmessage](https://bitmessage.org/wiki/Compiling_instructions) / [github](https://github.com/Bitmessage/PyBitmessage)
 - [Beehive](https://github.com/muesli/beehive)
-- [Bludit](https://www.bludit.com)
+- [Bludit](https://www.bludit.com) / [github](https://github.com/bludit/bludit)
 - [Blynk](https://github.com/blynkkk/blynk-library)
-- [Bookstack](https://www.bookstackapp.com/)
-- [Browsepass](http://techualization.blogspot.de/2013/09/introducing-browsepass-keepass-on-web.html)
+- [Bookstack](https://www.bookstackapp.com/) / [github](https://github.com/BookStackApp/BookStack)
 - [btcpayserver](https://github.com/btcpayserver/btcpayserver)
-- [Caisse Bliss](https://framagit.org/tykayn/caisse-bliss)
-- [Candy](https://candy-chat.github.io/candy)
-- [CardDavMate](https://www.inf-it.com/open-source/clients/carddavmate)
 - [cgit](http://git.zx2c4.com/cgit/about)
-- [CheckUp](https://sourcegraph.github.io/checkup)
-- [Cloud torrent](https://github.com/jpillora/cloud-torrent)
+- [CheckUp](https://sourcegraph.github.io/checkup) / [github](https://github.com/sourcegraph/checkup)
 - [Cockpit](http://cockpit-project.org/)
 - [Commafeed](https://github.com/Athou/commafeed)
-- [Converse.js](https://conversejs.org)
+- [Converse.js](https://conversejs.org) / [github](https://github.com/jcbrand/converse.js)
 - [Cozy](https://github.com/cozy)
-- [Cronkeep](https://github.com/cronkeep/cronkeep)
 - [Croodle](https://github.com/jelhan/croodle) Schedule a date or to do a poll on a general topics, with client-side encryption.
-- [CumulusClips](http://cumulusclips.org)
-- [Cyclos](https://www.cyclos.org)
 - [Darkwire.io](https://github.com/seripap/darkwire.io)
-- [Deluge](http://deluge-torrent.org) (with WebUI)
 - [DirectoryLister](https://github.com/DirectoryLister/DirectoryLister)
-- [DNSchain](https://github.com/okTurtles/dnschain)
-- [eLabFTW](https://www.elabftw.net/) electronic lab notebook
+- [eLabFTW](https://www.elabftw.net/) electronic lab notebook / [github](https://github.com/elabftw/elabftw)
 - [Emoncms](https://github.com/emoncms/emoncms)
-- [ERPnext](https://erpnext.com/download)
-- [EteSync](https://www.etesync.com/)
-- [Ethersheet](https://github.com/ethersheet-collective/EtherSheet)
-- [Fail2web](https://github.com/Sean-Der/fail2web)
-- [Ferment](https://github.com/mmckegg/ferment)
+- [ERPnext](https://erpnext.com/download) / [github](https://github.com/frappe/erpnext)
+- [EteSync](https://www.etesync.com/) / [github](https://github.com/etesync)
 - [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/)
-- [Geneweb](https://geneweb.tuxfamily.org)
-- [GetSimple CMS](http://get-simple.info)
-- [Git-annex](http://git-annex.branchable.com)
-- [Gitit](https://github.com/jgm/gitit)
-- [Goaccess](https://goaccess.io) Web log analyser (replaces piwik without js tracking scripts)
+- [WebThings Gateway](https://iot.mozilla.org/gateway/) [github](https://github.com/mozilla-iot/)
+- [Geneweb](https://geneweb.tuxfamily.org) / [github](https://github.com/geneweb/geneweb)
+- [GetSimple CMS](http://get-simple.info) / [github](https://github.com/GetSimpleCMS/GetSimpleCMS)
+- [Goaccess](https://goaccess.io) Web log analyser (replaces piwik without js tracking scripts) / [github](https://github.com/allinurl/goaccess)
 - [Gollum](https://github.com/gollum/gollum)
 - [Goploader](https://github.com/Depado/goploader)
 - [Granary](https://github.com/snarfed/granary)
 - [Guacamole](http://guac-dev.org)
-- [Habitica](https://habitica.com/)
+- [Habitica](https://habitica.com/) / [github](https://github.com/HabitRPG/habitica)
 - [HackMD CE](https://github.com/hackmdio/hackmd)
-- [Hackpad](https://github.com/dropbox/hackpad)
 - [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)
+- [Hexo](https://hexo.io/) / [github](https://github.com/hexojs/hexo)
+- [Icecast 2](http://www.icecast.org) / [gitlab](https://gitlab.xiph.org/xiph/icecast-server/)
 - [ikiwiki](http://ikiwiki.info)
-- [img.bi](https://github.com/imgbi/img.bi)
-- [InfCloud](https://www.inf-it.com/open-source/clients/infcloud)
 - [Invidious](https://github.com/omarroth/invidious)
-- [Invoice Ninja](https://www.invoiceninja.com)
-- [InvoicePlane](https://invoiceplane.com)
-- [IPFS](https://ipfs.io)
-- [Joplin](http://joplin.cozic.net/)
+- [Invoice Ninja](https://www.invoiceninja.com) / [github](https://github.com/invoiceninja/invoiceninja)
+- [InvoicePlane](https://invoiceplane.com) / [github](https://github.com/InvoicePlane/InvoicePlane)
+- [IPFS](https://ipfs.io) / [github](https://github.com/ipfs/ipfs)
+- [Joplin](http://joplin.cozic.net/) / [github](https://github.com/laurent22/joplin)
 - [Jellyfin](https://github.com/jellyfin)
-- [JS Bin](http://jsbin.com/help/2-second-setup)
-- [Kaiwa](http://getkaiwa.com)
-- [Kin calendar](https://github.com/KinToday)
-- [Kinto](https://github.com/Kinto/formbuilder)
-- [Kiwix](http://www.kiwix.org/) Offline wikipedia
-- [Known](https://withknown.com)
-- [Koel](http://koel.phanan.net)
-- [Kontalk](https://kontalk.org)
-- [Koozip](http://koozic.net)
-- [KrISS feed](https://github.com/tontof/kriss_feed)
-- [Koken](http://koken.me)
-- [Kune](https://en.wikipedia.org/wiki/Kune_%28software%29)
+- [JS Bin](http://jsbin.com/help/2-second-setup) / [github](https://github.com/jsbin/)
+- [Kiwix](http://www.kiwix.org/) Offline wikipedia / [github](https://github.com/kiwix/)
+- [Known](https://withknown.com) / [github](https://github.com/idno/known)
+- [Koel](http://koel.phanan.net) / [github](https://github.com/phanan/koel)
+- [Kontalk](https://kontalk.org) / [github](https://github.com/kontalk)
+- [Koozip](http://koozic.net) / [github](https://github.com/DocMarty84/koozic)
 - [L'atelier](https://github.com/jbl2024/latelier)
-- [Lessy](https://lessy.io)
-- [LibreNews-Server](https://librenews.io)
+- [Lessy](https://lessy.io) / [github](https://github.com/lessy-community/lessy)
 - [LibreOffice Online](https://wiki.documentfoundation.org/ReleaseNotes/5.3/fr#LibreOffice_Online)
-- [LiquidSoap](http://savonet.sourceforge.net/)
+- [LiquidSoap](http://savonet.sourceforge.net/) / [github](https://github.com/savonet/liquidsoap)
 - [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/)
+- [Loomio](https://www.loomio.org) / [github](https://github.com/loomio/loomio/)
+- [MaidSafe](http://maidsafe.net) / [github](https://github.com/maidsafe)
+- [Mailpile](https://www.mailpile.is) / [github](https://github.com/mailpile/Mailpile)
+- [Mailtrain](https://mailtrain.org/) / [github](https://github.com/Mailtrain-org/mailtrain)
 - [Mautic](https://github.com/mautic/mautic)
-- [MediaCrush](https://github.com/MediaCrush/MediaCrush) (/!\ last update: Jan 23, 2015)
-- [microblog.pub](https://microblog.pub)
-- [MinigalNano](https://github.com/sebsauvage/MinigalNano) (/!\ last update: Jun 24, 2016)
-- [Mirakel](http://mirakel.azapps.de/taskwarrior.html) (/!\ SSL-Warning)
-- [Modoboa](http://modoboa.org)
+- [microblog.pub](https://microblog.pub) / [github](https://github.com/tsileo/microblog.pub)
+- [Mirakel](http://mirakel.azapps.de/taskwarrior.html) / [github](https://github.com/GothenburgBitFactory/taskwarrior) (/!\ SSL-Warning)
+- [Modoboa](http://modoboa.org) / [github](https://github.com/modoboa/)
 - [MotionEye](https://github.com/ccrisan/motioneye)
 - [MPD](http://www.musicpd.org)
-- [MyBB](https://mybb.com/)
+- [MyBB](https://mybb.com/) / [github](https://github.com/mybb)
 - [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)
+- [Nibbleblog](http://www.nibbleblog.com)/ [github](https://github.com/dignajar/nibbleblog)
+- [Nuage](https://nuage.kerjean.me/login) / [github](https://github.com/mickael-kerjean/filestash)
 - [Ombi](https://github.com/tidusjar/Ombi)
-- [OpenBazaar](https://openbazaar.org)
-- [openHAB](https://www.openhab.org/) - Smart home platform.
-- [OpenJabNab](https://github.com/OpenJabNab/OpenJabNab) (/!\ last update: Apr 30, 2016)
+- [OpenBazaar](https://openbazaar.org) / [github](https://github.com/openbazaar)
+- [openHAB](https://www.openhab.org/) - Smart home platform. / [github](https://github.com/openhab)
 - [OpenProject](https://github.com/opf/openproject)
 - [OpenSourceBilling](https://github.com/vteams/open-source-billing)
-- [OX Open-Xchange](https://www.open-xchange.com) Linux groupware solution
+- [OX Open-Xchange](https://www.open-xchange.com) Linux groupware solution / [github](https://github.com/open-xchange/)
 - [Paperless](https://github.com/danielquinn/paperless)
 - [Paperwork](http://paperwork.rocks)
-- [Passbolt](https://www.passbolt.com) Passwords manager
-- [pdfy](https://github.com/joepie91/pdfy) (/!\ last update: Aug 5, 2014)
-- [Pelias](https://github.com/pelias/pelias)
-- [Peps](https://github.com/MLstate/PEPS)
-- [PHPList](http://www.phplist.com)
-- [PHProxy](http://sourceforge.net/projects/poxy)
-- [Phraseanet](https://docs.phraseanet.com/3.8/fr/index.html#)
-- [Pico](http://picocms.org)
-- [Pix](http://pix.toile-libre.org)
+- [Passbolt](https://www.passbolt.com) Passwords manager / [github](https://github.com/passbolt)
+- [Pelias](https://github.com/pelias/pelias))
+- [PHPList](http://www.phplist.com) / [github](https://github.com/phpList)
+- [Phraseanet](https://docs.phraseanet.com/3.8/fr/index.html#) / [github](https://github.com/alchemy-fr/Phraseanet-Docs)
+- [Pico](http://picocms.org) / [github](https://github.com/picocms/Pico)
 - [Playmaker](https://github.com/NoMore201/playmaker)
 - [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)
+- [Pump.io](http://pump.io) / [github](https://github.com/pump-io/pump.io)
 - [qBittorrent](https://github.com/qbittorrent/qBittorrent)
-- [racktables](http://racktables.org)
-- [Race for the Galaxy](https://github.com/bnordli/rftg)
+- [racktables](http://racktables.org) / [github](https://github.com/RackTables/racktables)
 - [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)
+- [Request Tracker](https://bestpractical.com) / [github](https://github.com/bestpractical/rt)
+- [Restya](http://restya.com) / [github](https://github.com/RestyaPlatform/board/)
+- [Retroshare](https://retroshare.cc/) / [github](https://github.com/RetroShare/RetroShare)
 - [ScenariChain-server](https://download.scenari.software/SCENARIchain-server/)
-- [Scramble, Browser-based PGP web mail](https://github.com/dcposch/scramble)
-- [Scribbleton](https://scribbleton.com)
 - [Scuttlebutt Pub](https://www.scuttlebutt.nz/contributing)
-- [ShareLatex](https://www.sharelatex.com)
-- [Shleuder](http://schleuder2.nadir.org)
-- [Simone](https://github.com/Kloadut/Simone)
+- [ShareLatex](https://www.sharelatex.com) / [github](https://github.com/overleaf/overleaf)
+- [Shleuder](https://schleuder.org/)
 - [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)
 - [smokeping](https://packages.debian.org/buster/smokeping)   / [github](https://github.com/oetiker/SmokePing)
-- [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)
+- [Sonarr](https://sonarr.tv) / [github](https://github.com/Sonarr/Sonarr)
+- [Stackedit](https://stackedit.io) / [github](https://github.com/benweet/stackedit)
+- [StandardNotes](https://standardnotes.org) (a clean, simple, E2E-encrypted notes app) -- specifically, the server-side [StandardFile](https://standardfile.org) portion / [github](https://github.com/standardnotes/web)
 - [Streisand](https://github.com/jlund/streisand)
 - [Subspace](https://github.com/subspacecloud/subspace) (A simple WireGuard VPN server GUI)
-- [Syspass](http://www.syspass.org/)
-- [Taiga](https://taiga.io)
-- [Tania](http://gettania.org/)
-- [Taskwarrior](https://taskwarrior.org)
-- [TMate](https://tmate.io/)
-- [TorChat](https://github.com/prof7bit/TorChat)
-- [Torrent Tunes](https://github.com/tchoulihan/torrenttunes-client)
-- [Total Respawn](https://github.com/broncowdd/TotalRespawn)
+- [Syspass](http://www.syspass.org/) / [github](https://github.com/nuxsmin/sysPass)
+- [Taiga](https://taiga.io) / [github](https://github.com/taigaio/)
+- [Taskwarrior](https://taskwarrior.org) / [github](https://github.com/GothenburgBitFactory/taskwarrior)
+- [TMate](https://tmate.io/) / [github](https://github.com/tmate-io/tmate)
 - [Tracim](https://github.com/tracim/tracim)
-- [Twister](http://twister.net.co)
-- [TwitRSS.me](http://twitrss.me/) ([Github](https://github.com/ciderpunx/twitrssme)) Scrapes Twitter to create RSS feeds.
-- [Unvis](https://unv.is/) ([Github](https://github.com/lodjuret/unvis.it))
-- [Vaultier](http://www.vaultier.org)
-- [Volumio](https://volumio.org)
-- [Webmpc](https://github.com/ushis/webmpc)
-- [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)
+- [Twister](http://twister.net.co) / [github](https://github.com/miguelfreitas/twister-core/)
+- [TwitRSS.me](http://twitrss.me/) / [Github](https://github.com/ciderpunx/twitrssme) Scrapes Twitter to create RSS feeds.
+- [Volumio](https://volumio.org) / [github](https://github.com/volumio)
+- [WebODF](http://webodf.org) / [github](https://github.com/webodf/WebODF)
+- [Wireguard](https://www.wireguard.com/) / [git](https://git.zx2c4.com/WireGuard/)
+- [Xonotic](http://xonotic.org) / [gitlab](https://gitlab.com/xonotic)
+- [YesWiki](https://yeswiki.net) / [github](https://github.com/YesWiki/yeswiki)
 - [Zammad](https://github.com/zammad/zammad)
 - [ZeroTier](https://github.com/zerotier/ZeroTierOne)
-- [ZNC](http://wiki.znc.in/ZNC)
-- [Zone-project](https://github.com/descl/ZONE)
 - [Zoneminder](https://github.com/ZoneMinder/zoneminder)
-- [Zulip](https://zulipchat.com/)
+- [Zulip](https://zulipchat.com/) / [github](https://github.com/zulip/zulip)