diff --git a/Using-Mastodon/Apps.md b/Using-Mastodon/Apps.md
index e41761e3..ec6feb1a 100644
--- a/Using-Mastodon/Apps.md
+++ b/Using-Mastodon/Apps.md
@@ -1,12 +1,30 @@
List of apps
============
-Some people have started working on apps for the Mastodon API. Here is a list of them:
-
+
+
+**Table of contents**
+
+* [Mobile clients](#mobile-clients)
+ * [Android - open source](#android---open-source)
+ * [Android - proprietary](#android---proprietary)
+ * [iOS - open source](#ios---open-source)
+ * [iOS - proprietary](#ios---proprietary)
+ * [Sailfish OS](#sailfish-os)
+* [Desktop clients](#desktop-clients)
+ * [Linux](#linux)
+ * [Mac](#mac)
+ * [Windows](#windows)
+* [Alternative web clients](#alternative-web-clients)
+* [Browser add-ons/extensions](#browser-add-onsextensions)
+* [Bridges from/to other platforms](#bridges-fromto-other-platforms)
+* [Command line tools](#command-line-tools)
+* [Web tools](#web-tools)
+* [Other tools](#other-tools)
## Mobile clients
-### Android
+### Android - open source
|App|Source code|Developer(s)|
|---|-----------|------------|
@@ -19,17 +37,22 @@ Some people have started working on apps for the Mastodon API. Here is a list of
|[Mastobone](https://github.com/deguchi/mastobone/blob/master/README.md)
([Play Store](https://play.google.com/store/apps/details?id=com.mastobone)) *(alpha)*||[@deguchi@bookn.me](https://bookn.me/@deguchi)|
|[MouseApp](https://github.com/cerisara/mousetodon/blob/master/README.md)
([F‑Droid](https://f-droid.org/packages/fr.xtof54.mousetodon/)) *(beta)*||[@cerisara@mastodon.etalab.gouv.fr](https://mastodon.etalab.gouv.fr/@cerisara)
|[TootyFruity](https://github.com/eggplantPrince/tootyFruity/blob/master/README.md)
([Play Store](https://play.google.com/store/apps/details?id=ch.kevinegli.tootyfruity221258)) *(beta)*||[@eggplant@mastodon.social](https://mastodon.social/users/eggplant)|
-|dndkodon
([Play Store](https://play.google.com/store/apps/details?id=jp.coe.dndkodon))|N/A|Tsuyoshi Hyuga|
-|Cosian
([Play Store](https://play.google.com/store/apps/details?id=com.yatsuhashi.crims0n))|N/A|083|
-|MastoPane
([Play Store](https://play.google.com/store/apps/details?id=com.mastopane))|N/A|Panecraft|
-|mastty
([Play Store](https://play.google.com/store/apps/details?id=com.sasaneko.mastodon))|N/A|White Cat Factory|
-|[Pawoo](https://pawoo.net/about)
([Play Store](https://play.google.com/store/apps/details?id=jp.pxv.pawoo))|N/A|[@pixiv@pawoo.net](https://pawoo.net/users/pixiv)|
-|Stegodon
([Play Store](https://play.google.com/store/apps/details?id=com.gilawhost.stegolophodon))|N/A|[@GilaW@mastodon.cloud](https://mastodon.cloud/@Gilaw)|
-|Tootaloo
([Play Store](https://play.google.com/store/apps/details?id=net.liverworks.tootalooa))|N/A|[liverworks.net](http://liverworks.net/)|
-|Tootdon
([Play Store](https://play.google.com/store/apps/details?id=club.tootdon.app))|N/A/|[@tootdon@mstdn.jp](https://mstdn.jp/@tootdon)|
-|Troutoss
([Play Store](https://play.google.com/store/apps/details?id=jp.gr.java_conf.miwax.troutoss))|N/A|[@tomoya0x00@mstdn.jp](https://mstdn.jp/@tomoya0x00)|
-### iOS
+### Android - proprietary
+
+|App|Developer(s)|
+|---|------------|
+|dndkodon
([Play Store](https://play.google.com/store/apps/details?id=jp.coe.dndkodon))|Tsuyoshi Hyuga|
+|Cosian
([Play Store](https://play.google.com/store/apps/details?id=com.yatsuhashi.crims0n))|083|
+|MastoPane
([Play Store](https://play.google.com/store/apps/details?id=com.mastopane))|Panecraft|
+|mastty
([Play Store](https://play.google.com/store/apps/details?id=com.sasaneko.mastodon))|White Cat Factory|
+|[Pawoo](https://pawoo.net/about)
([Play Store](https://play.google.com/store/apps/details?id=jp.pxv.pawoo))|[@pixiv@pawoo.net](https://pawoo.net/users/pixiv)|
+|Stegodon
([Play Store](https://play.google.com/store/apps/details?id=com.gilawhost.stegolophodon))|[@GilaW@mastodon.cloud](https://mastodon.cloud/@Gilaw)|
+|Tootaloo
([Play Store](https://play.google.com/store/apps/details?id=net.liverworks.tootalooa))|[liverworks.net](http://liverworks.net/)|
+|Tootdon
([Play Store](https://play.google.com/store/apps/details?id=club.tootdon.app))|[@tootdon@mstdn.jp](https://mstdn.jp/@tootdon)|
+|Troutoss
([Play Store](https://play.google.com/store/apps/details?id=jp.gr.java_conf.miwax.troutoss))|[@tomoya0x00@mstdn.jp](https://mstdn.jp/@tomoya0x00)|
+
+### iOS - open source
|App|Source code|Developer(s)|
|---|-----------|------------|
@@ -37,17 +60,22 @@ Some people have started working on apps for the Mastodon API. Here is a list of
|**[Amaroq](https://github.com/ReticentJohn/Amaroq/blob/master/README.md)**
([iTunes](https://itunes.apple.com/us/app/amarok-for-mastodon/id1214116200?ls=1&mt=8))||[@eurasierboy@mastodon.social](https://mastodon.social/users/eurasierboy)|
|**[iMast](https://cinderella-project.github.io/iMast/)**
([iTunes](https://itunes.apple.com/jp/app/imast/id1229461703))||[@imast_ios@imastodon.net](https://imastodon.net/@imast_ios)|
|[TootyFruity](https://github.com/eggplantPrince/tootyFruity/blob/master/README.md)
([iTunes](https://docs.google.com/forms/d/e/1FAIpQLScW2lvZaKrOm4AKJH5HLI_Ul0Yr3CsXulf5bcTJQ1xaN5jiPg/viewform?c=0&w=1)) *(beta)*||[@eggplant@mastodon.social](https://mastodon.social/users/eggplant)|
-|Mustor
([iTunes](https://itunes.apple.com/us/app/mustor/id1229531204?l=zh&ls=1&mt=8))|N/A|[@darkcl@mastodon.cloud](https://mastodon.cloud/@darkcl)|
-|[Pawoo](https://pawoo.net/about)
([iTunes](https://itunes.apple.com/us/app/pawoo/id1229070679))|N/A|[@pixiv@pawoo.net](https://pawoo.net/users/pixiv)|
-|friends.nico
([iTunes](https://itunes.apple.com/us/app/friends-nico/id1230158182))|N/A|[@friends_nico@friends.nico](https://friends.nico/@friends_nico)|
-|Tootdon
([iTunes](https://itunes.apple.com/us/app/tootdon-for-mastodon/id1282283934))|N/A/|[@tootdon@mstdn.jp](https://mstdn.jp/@tootdon)|
-|Tootter
([iTunes](https://itunes.apple.com/us/app/id1229555793))|N/A|[@Tootter_for_Mastodon@mstdn.jp](https://mstdn.jp/@Tootter_for_Mastodon)|
-## Alternative web apps
+### iOS - proprietary
+
+|App|Developer(s)|
+|---|------------|
+|Mustor
([iTunes](https://itunes.apple.com/us/app/mustor/id1229531204?l=zh&ls=1&mt=8))|[@darkcl@mastodon.cloud](https://mastodon.cloud/@darkcl)|
+|[Pawoo](https://pawoo.net/about)
([iTunes](https://itunes.apple.com/us/app/pawoo/id1229070679))|[@pixiv@pawoo.net](https://pawoo.net/users/pixiv)|
+|friends.nico
([iTunes](https://itunes.apple.com/us/app/friends-nico/id1230158182))|[@friends_nico@friends.nico](https://friends.nico/@friends_nico)|
+|Tootdon
([iTunes](https://itunes.apple.com/us/app/tootdon-for-mastodon/id1282283934))|[@tootdon@mstdn.jp](https://mstdn.jp/@tootdon)|
+|Tootter
([iTunes](https://itunes.apple.com/us/app/id1229555793))|[@Tootter_for_Mastodon@mstdn.jp](https://mstdn.jp/@Tootter_for_Mastodon)|
+
+### Sailfish OS
+
|App|Source code|Developer(s)|
|---|-----------|------------|
-|**[Halcyon](https://halcyon.social)**||[@halcyon@mastodon.social](https://mastodon.social/@halcyon)|
-|[Naumanni](https://naumanni.com/) *(alpha)*||[@shi3z@mstdn.onosendai.jp](https://mstdn.onosendai.jp/@shi3z)/[@shn@oppai.tokyo](https://oppai.tokyo/@shn)|
+|**[Tooter](https://openrepos.net/content/dysko/tooter)**||[@disko@mastodon.social](https://mastodon.social/@dysko)|
## Desktop clients
### Linux
@@ -74,20 +102,13 @@ Some people have started working on apps for the Mastodon API. Here is a list of
|**[WinMasto](https://github.com/drasticactions/WinMasto/blob/master/README.md)**|10||[@drasticactions@mastodon.network](https://mastodon.network/users/drasticactions)|
|[Mastodon UWP](https://rink.hockeyapp.net/apps/5199eba8bc914c4ab416aa8513d62826) *(beta)*|10||[@my123@mastodon.social](https://mastodon.social/users/my123)|
|[TheDesk](https://github.com/cutls/TheDesk/blob/master/README.md) |7~ ||[@Cutls@kirishima.cloud](https://kirishima.cloud/@Cutls) |
-## Other clients
-|App|Platform|Source code|Developer(s)|
-|---|--------|-----------|------------|
-|**[bitlbee-mastodon](https://github.com/kensanata/bitlbee-mastodon#mastodon-plugin-for-bitlbee)**|IRC||[Alex Schroeder](https://alexschroeder.ch/wiki/Contact)|
-|**[madonctl](https://github.com/McKael/madonctl/blob/master/README.md)**|CLI||[@McKael@mamot.fr](https://mamot.fr/@McKael)|
-|**[mastodon.el](https://github.com/jdenen/mastodon.el/blob/master/README.org)**|Emacs||[@johnson@mastodon.social](https://mastodon.social/users/johnson)|
-|**[Mstdn (Mastodon CLI)](https://github.com/mattn/go-mastodon/blob/master/README.md)**|CLI||[@mattn@mstdn.jp](https://mstdn.jp/@mattn)|
-|**[toot](https://github.com/ihabunek/toot/blob/master/README.rst)**|CLI||[@ihabunek@mastodon.social](https://mastodon.social/users/ihabunek)|
-|**[tootstream](https://github.com/magicalraccoon/tootstream/blob/develop/README.md)**|CLI||[@Raccoon@mastodon.social](https://mastodon.social/users/Raccoon)|
-|**[soCLIal](https://gitlab.com/IvanSanchez/soclial/blob/master/README.md)**|CLI||[@IvanSanchez@mastodon.social](https://mastodon.social/@IvanSanchez)|
-|**[Tooter](https://openrepos.net/content/dysko/tooter)**|SailfishOS||[@disko@mastodon.social](https://mastodon.social/@dysko)|
-|**[pynitel/ulla](https://github.com/cquest/pynitel)**|Minitel||[@cquest@amicale.net](https://amicale.net/@cquest)|
-|**[vim-mastodon](https://github.com/mattn/vim-mastodon/blob/master/README.md)**|Vim||[@mattn@mstdn.jp](https://mstdn.jp/@mattn)|
+## Alternative web clients
+
+|App|Source code|Developer(s)|
+|---|-----------|------------|
+|**[Halcyon](https://halcyon.social)**||[@halcyon@mastodon.social](https://mastodon.social/@halcyon)|
+|[Naumanni](https://naumanni.com/) *(alpha)*||[@shi3z@mstdn.onosendai.jp](https://mstdn.onosendai.jp/@shi3z)/[@shn@oppai.tokyo](https://oppai.tokyo/@shn)|
## Browser add-ons/extensions
@@ -105,9 +126,10 @@ Some people have started working on apps for the Mastodon API. Here is a list of
|App|Platform|Source code|Developer(s)|
|---|--------|-----------|------------|
|**[Autopost to Mastodon](https://wordpress.org/plugins/autopost-to-mastodon/)**|Wordpress plugin||[L1am0](http://l1am0.eu/)|
+|**[bitlbee-mastodon](https://github.com/kensanata/bitlbee-mastodon#mastodon-plugin-for-bitlbee)**|IRC||[Alex Schroeder](https://alexschroeder.ch/wiki/Contact)|
|**[MastodonToTwitter](https://github.com/halcy/MastodonToTwitter/blob/master/README.md)**|CLI||[@halcy@mastodon.social](https://mastodon.social/@halcy)|
-|**[Retoot](https://gitlab.com/mojo42/retoot/blob/master/README.md)**|CLI||[@Mojo@apoil.org](https://apoil.org/users/mojo)|
|**[Mastodon Twitter Poster](https://crossposter.masto.donte.com.br)**|Service||[@renatolond@masto.donte.com.br](https://masto.donte.com.br/@renatolond)|
+|**[Retoot](https://gitlab.com/mojo42/retoot/blob/master/README.md)**|CLI||[@Mojo@apoil.org](https://apoil.org/users/mojo)|
|**[RSSTootalizer](https://github.com/blind-coder/rsstootalizer/blob/master/README.md)**|Web browser||[@blindcoder@toot.berlin](https://toot.berlin/users/blindcoder)|
|**[t2m – Twitter 2 Mastodon](https://github.com/Psycojoker/t2m/blob/master/README.md)**|CLI||Psycojoker|
|**[umrc](https://github.com/Ulrar/umrc/blob/master/README.md)**|IRC||[@lemonnierk@ulrar.net](https://mastodon.ulrar.net/users/lemonnierk)|
@@ -115,26 +137,40 @@ Some people have started working on apps for the Mastodon API. Here is a list of
|**[SPIP](https://contrib.spip.net/Mastodon)**|SPIP plugin||[@cerdic@mamot.fr](https://mamot.fr/@cerdic)|
|[ogp-share](http://mastodon.tools/ogp-share/) *(beta)*|Web browser||[@David@mastodon.xyz](https://mastodon.xyz/@David)|
-## Bots
+## Command line tools
+|App|Source code|Developer(s)|
+|---|-----------|------------|
+|**[Fluffy Broccoli](https://github.com/algernon/fluffy-broccoli/blob/master/README.md)**||[@algernon@trunk.mad-scientist.club](https://trunk.mad-scientist.club/@algernon)
+|**[HackerNewsBot](https://github.com/raymestalez/mastodon-hnbot/blob/master/README.md)**||[@rayalez@hackertribe.io](https://hackertribe.io/users/rayalez)|
+|**[madonctl](https://github.com/McKael/madonctl/blob/master/README.md)**||[@McKael@mamot.fr](https://mamot.fr/@McKael)|
+|**[Mastodon Image Bot](https://github.com/ZerataX/mastodon-img-bot/blob/master/README.MD)**||[@peterspark@pawoo.net](https://pawoo.net/@peterspark)|
+|**[Mstdn (Mastodon CLI)](https://github.com/mattn/go-mastodon/blob/master/README.md)**||[@mattn@mstdn.jp](https://mstdn.jp/@mattn)|
+|**[toot](https://github.com/ihabunek/toot/blob/master/README.rst)**||[@ihabunek@mastodon.social](https://mastodon.social/users/ihabunek)|
+|**[tootstream](https://github.com/magicalraccoon/tootstream/blob/develop/README.md)**||[@Raccoon@mastodon.social](https://mastodon.social/users/Raccoon)|
+|**[simpleMastodonBot](https://github.com/M-D-M/simpleMastodonBot/blob/master/README.md)**||[M-D-M](https://github.com/M-D-M)
+|**[soCLIal](https://gitlab.com/IvanSanchez/soclial/blob/master/README.md)**||[@IvanSanchez@mastodon.social](https://mastodon.social/@IvanSanchez)|
+|**[SupportBot](https://github.com/polymerwitch/SupportBot/blob/master/README.md)**||[@polymerwitch@toot.cat](https://toot.cat/@polymerwitch)|
+|[mastodon-archive](https://github.com/kensanata/mastodon-backup#mastodon-archive)||[Alex Schroeder](https://alexschroeder.ch/wiki/Contact)|
+|[mastodon-glossary-bot](https://github.com/michelbl/mastodon-glossary-bot/blob/master/README.md) *(experimental)* (also for Heroku)||[@Michel@mastodon.etalab.gouv.fr](https://mastodon.etalab.gouv.fr/@Michel)|
+
+## Web tools
+
+|App|Source code|Developer(s)|
+|---|-----------|------------|
+|**[Contest-draw](http://mastodon.tools/contest-draw/)**||[@David@mastodon.xyz](https://mastodon.xyz/@David)|
+|**[Mastoshare](https://github.com/koyuawsmbrtn/mastoshare/blob/master/README.md)**||[@koyuawsmbrtn@mastodon.social](https://mastodon.social/@koyuawsmbrtn)|
+|**[wall](http://mastodon.tools/wall/)**||[@David@mastodon.xyz](https://mastodon.xyz/@David)|
+|[Scheduler](http://mastodon.tools/scheduler/) *(beta)*||[@David@mastodon.xyz](https://mastodon.xyz/@David)|
+|**[Tootmap](https://tootmap.net/)**||[@wakin@biwakodon.com](https://biwakodon.com/@wakin)|
+|**[Mastodon User Matching](http://vinayaka.distsn.org/)**||[@hakabahitoyo@2.distsn.org](https://2.distsn.org/@hakabahitoyo)|
+
+## Other tools
+
|App|Platform|Source code|Developer(s)|
|---|--------|-----------|------------|
-|**[Fluffy Broccoli](https://github.com/algernon/fluffy-broccoli/blob/master/README.md)**|CLI||[@algernon@trunk.mad-scientist.club](https://trunk.mad-scientist.club/@algernon)
-|**[HackerNewsBot](https://github.com/raymestalez/mastodon-hnbot/blob/master/README.md)**|CLI||[@rayalez@hackertribe.io](https://hackertribe.io/users/rayalez)|
-|**[Mastodon Image Bot](https://github.com/ZerataX/mastodon-img-bot/blob/master/README.MD)**|CLI||[@peterspark@pawoo.net](https://pawoo.net/@peterspark)|
-|**[simpleMastodonBot](https://github.com/M-D-M/simpleMastodonBot/blob/master/README.md)**|CLI||[M-D-M](https://github.com/M-D-M)
-|**[SupportBot](https://github.com/polymerwitch/SupportBot/blob/master/README.md)**|CLI||[@polymerwitch@toot.cat](https://toot.cat/@polymerwitch)|
-|[mastodon-glossary-bot](https://github.com/michelbl/mastodon-glossary-bot/blob/master/README.md) *(experimental)*|CLI or Heroku||[@Michel@mastodon.etalab.gouv.fr](https://mastodon.etalab.gouv.fr/@Michel)|
-
-## Other tools
-|App|Platform|Source code|Developer(s)|
-|---|--------|-----------|------------|
-|**[Contest-draw](http://mastodon.tools/contest-draw/)**|Web browser||[@David@mastodon.xyz](https://mastodon.xyz/@David)|
-|**[Mastoshare](https://github.com/koyuawsmbrtn/mastoshare/blob/master/README.md)**|Web browser||[@koyuawsmbrtn@mastodon.social](https://mastodon.social/@koyuawsmbrtn)|
-|**[wall](http://mastodon.tools/wall/)**|Web browser||[@David@mastodon.xyz](https://mastodon.xyz/@David)|
-|[Scheduler](http://mastodon.tools/scheduler/) *(beta)*|Web browser||[@David@mastodon.xyz](https://mastodon.xyz/@David)|
-|**[Tootmap](https://tootmap.net/)**|Web browser||[@wakin@biwakodon.com](https://biwakodon.com/@wakin)|
-|**[Mastodon User Matching](http://vinayaka.distsn.org/)**|Web browser||[@hakabahitoyo@2.distsn.org](https://2.distsn.org/@hakabahitoyo)|
-|[mastodon-archive](https://github.com/kensanata/mastodon-backup#mastodon-archive)|CLI||[Alex Schroeder](https://alexschroeder.ch/wiki/Contact)|
+|**[mastodon.el](https://github.com/jdenen/mastodon.el/blob/master/README.org)**|Emacs||[@johnson@mastodon.social](https://mastodon.social/users/johnson)|
+|**[pynitel/ulla](https://github.com/cquest/pynitel)**|Minitel||[@cquest@amicale.net](https://amicale.net/@cquest)|
+|**[vim-mastodon](https://github.com/mattn/vim-mastodon/blob/master/README.md)**|Vim||[@mattn@mstdn.jp](https://mstdn.jp/@mattn)|
If you have a project like this, make a PR to add it to the list!