diff --git a/Using-Mastodon/Apps.md b/Using-Mastodon/Apps.md
index d193a0e1..9a4a76e6 100644
--- a/Using-Mastodon/Apps.md
+++ b/Using-Mastodon/Apps.md
@@ -16,9 +16,9 @@ Some people have started working on apps for the Mastodon API. Here is a list of
|**[Subway Tooter](https://github.com/tateisu/SubwayTooter/blob/master/README.md)**
([Play](https://play.google.com/store/apps/details?id=jp.juggler.subwaytooter))||[@tateisu@mastodon.juggler.jp](https://mastodon.juggler.jp/@tateisu)|
|**[Tusky](https://github.com/Vavassor/Tusky/blob/master/README.md)**
([Play](https://play.google.com/store/apps/details?id=com.keylesspalace.tusky&hl=nl)/[F‑Droid](https://f-droid.org/repository/browse/?fdcategory=Internet&fdid=com.keylesspalace.tusky&fdpage=3&fdstyle=grid))||[@ConnyDuck@mastodon.social](https://mastodon.social/users/ConnyDuck)|
|**[Twidere](https://github.com/TwidereProject/Twidere-Android/blob/master/README.md)**
([Play](https://play.google.com/store/apps/details?id=org.mariotaku.twidere)/[F‑Droid](https://f-droid.org/packages/org.mariotaku.twidere/))||[@mariotaku@pawoo.net](https://pawoo.net/@mariotaku)|
-|Mastobone
([Play](https://play.google.com/store/apps/details?id=com.mastobone)) *(alpha)*||[@deguchi@bookn.me](https://bookn.me/@deguchi)|
-|MouseApp
([F‑Droid](https://f-droid.org/packages/fr.xtof54.mousetodon/)) *(beta)*||[@cerisara@mastodon.etalab.gouv.fr](https://mastodon.etalab.gouv.fr/@cerisara)
-|TootyFruity
([Play](https://play.google.com/store/apps/details?id=ch.kevinegli.tootyfruity221258)) *(beta)*||[@eggplant@mastodon.social](https://mastodon.social/users/eggplant)|
+|[Mastobone](https://github.com/deguchi/mastobone/blob/master/README.md)
([Play](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](https://play.google.com/store/apps/details?id=ch.kevinegli.tootyfruity221258)) *(beta)*||[@eggplant@mastodon.social](https://mastodon.social/users/eggplant)|
|dndkodon
([Play](https://play.google.com/store/apps/details?id=jp.coe.dndkodon))|N/A|Tsuyoshi Hyuga|
|Cosian
([Play](https://play.google.com/store/apps/details?id=com.yatsuhashi.crims0n))|N/A|083|
|MastoPane
([Play](https://play.google.com/store/apps/details?id=com.mastopane))|N/A|Panecraft|
@@ -33,10 +33,10 @@ Some people have started working on apps for the Mastodon API. Here is a list of
|App|Source code|Developer(s)|
|---|-----------|------------|
-|**11t**
([iTunes](https://itunes.apple.com/nl/app/11t-for-mastodon/id1180628189))||[@jeroensmeets@mastodon.social](https://mastodon.social/users/jeroensmeets)|
-|**Amaroq**
([iTunes](https://itunes.apple.com/us/app/amarok-for-mastodon/id1214116200?ls=1&mt=8))||[@eurasierboy@mastodon.social](https://mastodon.social/users/eurasierboy)|
-|**iMast**
([iTunes](https://itunes.apple.com/jp/app/imast/id1229461703))||[@imast_ios@imastodon.net](https://imastodon.net/@imast_ios)|
-|TootyFruity
([iTunes](https://docs.google.com/forms/d/e/1FAIpQLScW2lvZaKrOm4AKJH5HLI_Ul0Yr3CsXulf5bcTJQ1xaN5jiPg/viewform?c=0&w=1)) *(beta)*||[@eggplant@mastodon.social](https://mastodon.social/users/eggplant)|
+|**[11t](https://github.com/jeroensmeets/mastodon-app/blob/master/README.md)**
([iTunes](https://itunes.apple.com/nl/app/11t-for-mastodon/id1180628189))||[@jeroensmeets@mastodon.social](https://mastodon.social/users/jeroensmeets)|
+|**[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)|
@@ -53,13 +53,13 @@ Some people have started working on apps for the Mastodon API. Here is a list of
|App|Source code|Developer(s)|
|---|-----------|------------|
-|**[Mstdn](https://github.com/rhysd/Mstdn)** | |[@Linda_pp@mstdn.jp](https://mstdn.jp/@Linda_pp)/[@inudog@mastodon.social](https://mastodon.social/@inudog) |
+|**[Mstdn](https://github.com/rhysd/Mstdn/blob/master/README.md)** | |[@Linda_pp@mstdn.jp](https://mstdn.jp/@Linda_pp)/[@inudog@mastodon.social](https://mastodon.social/@inudog) |
### Mac ###
|App|Source code|Developer(s)|
|---|-----------|------------|
-|**[Mstdn](https://github.com/rhysd/Mstdn)** | |[@Linda_pp@mstdn.jp](https://mstdn.jp/@Linda_pp)/[@inudog@mastodon.social](https://mastodon.social/@inudog) |
+|**[Mstdn](https://github.com/rhysd/Mstdn/blob/master/README.md)** | |[@Linda_pp@mstdn.jp](https://mstdn.jp/@Linda_pp)/[@inudog@mastodon.social](https://mastodon.social/@inudog) |
### Windows
@@ -67,45 +67,45 @@ Some people have started working on apps for the Mastodon API. Here is a list of
|---|-------|-----------|------------|
|**[Capella](https://coolstar.org/capella)** | 7, 8.1, 10 | | [@coolstar@mastodon.social](https://mastodon.social/users/coolstar)|
|**[Flantter](https://www.microsoft.com/store/apps/9wzdncrcrpmn)**|10||[@cucmberium@mstdn.maud.io](https://mstdn.maud.io/@cucmberium)|
-|**[Mstdn](https://github.com/rhysd/Mstdn)** | 8.1 (confirmed) ||[@Linda_pp@mstdn.jp](https://mstdn.jp/@Linda_pp)/[@inudog@mastodon.social](https://mastodon.social/@inudog) |
+|**[Mstdn](https://github.com/rhysd/Mstdn/blob/master/README.md)** | 8.1 (confirmed) ||[@Linda_pp@mstdn.jp](https://mstdn.jp/@Linda_pp)/[@inudog@mastodon.social](https://mastodon.social/@inudog) |
|**[Tuuto](https://www.microsoft.com/store/apps/9nh0493n4tsb)**|10||[@Tlaster@mstdn.jp](https://mstdn.jp/@Tlaster)|
-|**[WinMasto](https://github.com/drasticactions/WinMasto)**|10||[@drasticactions@mastodon.network](https://mastodon.network/users/drasticactions)|
-|[Mastodon UWP](https://github.com/woachk/mastodon/releases) *(beta)*|10||[@my123@mastodon.social](https://mastodon.social/users/my123)|
+|**[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)|
## Other clients
|App|Platform|Source code|Developer(s)|
|---|--------|-----------|------------|
-|**[madonctl](https://github.com/McKael/madonctl)**|CLI||[@McKael@mamot.fr](https://mamot.fr/@McKael)|
-|**[mastodon.el](https://github.com/jdenen/mastodon.el)**|Emacs||[@johnson@mastodon.social](https://mastodon.social/users/johnson)|
-|**[Mstdn (Mastodon CLI)](https://github.com/mattn/go-mastodon)**|CLI||[@mattn@mstdn.jp](https://mstdn.jp/@mattn)|
-|**[toot](https://github.com/ihabunek/toot)**|CLI||[@ihabunek@mastodon.social](https://mastodon.social/users/ihabunek)|
-|**[tootstream](https://github.com/magicalraccoon/tootstream)**|CLI||[@Raccoon@mastodon.social](https://mastodon.social/users/Raccoon)|
-|**[soCLIal](https://gitlab.com/IvanSanchez/soclial)**|CLI||[@IvanSanchez@mastodon.social](https://mastodon.social/@IvanSanchez)|
+|**[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)|
-|**[vim-mastodon](https://github.com/mattn/vim-mastodon)**|Vim||[@mattn@mstdn.jp](https://mstdn.jp/@mattn)|
+|**[vim-mastodon](https://github.com/mattn/vim-mastodon/blob/master/README.md)**|Vim||[@mattn@mstdn.jp](https://mstdn.jp/@mattn)|
## Browser add-ons/extensions
|App|Browser|Source code|Developer(s)|
|---|--------|----|------------|
-|**Fastoot**|[Chrome(ium)](https://chrome.google.com/webstore/detail/fastoot/hnmnnhfeigiogjagmmpnhelpnhnchaoj)||[@noraworld@mastodon.noraworld.jp](https://mastodon.noraworld.jp/users/noraworld)|
-|**Mastodon Lang Remover**|[Chrome(ium)/Firefox](https://github.com/arthurlacoste/mastodon-lang-remover#install)||[@arthak@mastodon.social](https://mastodon.social/users/arthak)|
-|**Mastodon Share**|[Firefox](https://addons.mozilla.org/nl/firefox/addon/mastodon-share/)||[@Hellexis@framapiaf.org](https://framapiaf.org/@Hellexis)
-|**oxpecker**|Chrome(ium)/Firefox||[@t_trace@ostatus.taiyolab.com](https://ostatus.taiyolab.com/@t_trace)
-|**Tooter**|[Chrome(ium)](https://chrome.google.com/webstore/detail/tooter/okmlpjijminjkikninbkcnfmhkofgnnk)/[Firefox](https://addons.mozilla.org/nl/firefox/addon/tooter/)||[@effy@mastodon.social](https://mastodon.social/users/effy)|
+|**[Fastoot](https://github.com/noraworld/fastoot/blob/master/README.md)**|[Chrome(ium)](https://chrome.google.com/webstore/detail/fastoot/hnmnnhfeigiogjagmmpnhelpnhnchaoj)||[@noraworld@mastodon.noraworld.jp](https://mastodon.noraworld.jp/users/noraworld)|
+|**[Mastodon Lang Remover](https://github.com/arthurlacoste/mastodon-lang-remover/blob/master/README.md)**|[Chrome(ium)/Firefox](https://github.com/arthurlacoste/mastodon-lang-remover#install)||[@arthak@mastodon.social](https://mastodon.social/users/arthak)|
+|**[Mastodon Share](https://github.com/kernox/Mastodon-Share/blob/master/README.md)**|[Firefox](https://addons.mozilla.org/nl/firefox/addon/mastodon-share/)||[@Hellexis@framapiaf.org](https://framapiaf.org/@Hellexis)
+|**[oxpecker](https://github.com/ttrace/oxpecker/blob/master/README.md)**|Chrome(ium)/Firefox||[@t_trace@ostatus.taiyolab.com](https://ostatus.taiyolab.com/@t_trace)
+|**[Tooter](https://github.com/ineffyble/tooter/blob/master/README.md)**|[Chrome(ium)](https://chrome.google.com/webstore/detail/tooter/okmlpjijminjkikninbkcnfmhkofgnnk)/[Firefox](https://addons.mozilla.org/nl/firefox/addon/tooter/)||[@effy@mastodon.social](https://mastodon.social/users/effy)|
## Bridges from/to other platforms
|App|Platform|Source code|Developer(s)|
|---|--------|-----------|------------|
|**[Autopost to Mastodon](https://wordpress.org/plugins/autopost-to-mastodon/)**|Wordpress plugin||[L1am0](http://l1am0.eu/)|
-|**MastodonToTwitter**|CLI||[@halcy@mastodon.social](https://mastodon.social/@halcy)|
-|**Retoot**|CLI||[@Mojo@apoil.org](https://apoil.org/users/mojo)|
+|**[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://mastodon-twitter-poster.herokuapp.com)**|Service||[@renatolond@masto.donte.com.br](https://masto.donte.com.br/@renatolond)|
-|**RSSTootalizer**|Web browser||[@blindcoder@toot.berlin](https://toot.berlin/users/blindcoder)|
-|**t2m – Twitter 2 Mastodon**|CLI||Psycojoker|
-|**umrc**|IRC||[@lemonnierk@ulrar.net](https://mastodon.ulrar.net/users/lemonnierk)|
+|**[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)|
|**[WordPress](http://mastodon.tools/wordpress/)**|WordPress plugin||[@David@mastodon.xyz](https://mastodon.xyz/@David)|
|[ogp-share](http://mastodon.tools/ogp-share/) *(beta)*|Web browser||[@David@mastodon.xyz](https://mastodon.xyz/@David)|
@@ -113,18 +113,18 @@ Some people have started working on apps for the Mastodon API. Here is a list of
|App|Platform|Source code|Developer(s)|
|---|--------|-----------|------------|
-|**Fluffy Broccoli**|CLI||[@algernon@trunk.mad-scientist.club](https://trunk.mad-scientist.club/@algernon)
-|**HackerNewsBot**|CLI||[@rayalez@hackertribe.io](https://hackertribe.io/users/rayalez)|
-|**Mastodon Image Bot**|CLI||[@peterspark@pawoo.net](https://pawoo.net/@peterspark)|
-|**simpleMastodonBot**|CLI||[M-D-M](https://github.com/M-D-M)
-|**SupportBot**|CLI||[@polymerwitch@toot.cat](https://toot.cat/@polymerwitch)|
-|mastodon-glossary-bot *(experimental)*|CLI or Heroku||[@Michel@mastodon.etalab.gouv.fr](https://mastodon.etalab.gouv.fr/@Michel)|
+|**[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)**|Web browser||[@koyuawsmbrtn@mastodon.social](https://mastodon.social/@koyuawsmbrtn)|
+|**[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)|