diff --git a/content/_index.md b/content/_index.md
index 2dd99424..e3a5aeef 100644
--- a/content/_index.md
+++ b/content/_index.md
@@ -16,8 +16,11 @@ extra:
 {{ badges(lang='en') }}
 
 {{ screenshot(src='/images/screenshots/hiking.jpg', alt='Hiking') }}
+
 {{ screenshot(src='/images/screenshots/prague.jpg', alt='Prague') }}
+
 {{ screenshot(src='/images/screenshots/search.jpg', alt='Offline Search') }}
+
 {{ screenshot(src='/images/screenshots/dark.jpg', alt='Navigation in dark mode') }}
 
 ## Features
@@ -85,23 +88,15 @@ The app is free for everyone. Please [donate][donate] to support us!
 
 [Mythic Beasts](https://www.mythic-beasts.com/) ISP [provides us][mythic_beasts_donation] two virtual servers with 400 TB/month of free bandwidth to help our users with maps downloads and updates.
 
-### Support us
-
-There are many ways to support us, listed [here][contribute].
-
-## Beta
-
-Please join our beta program, suggest your features, and report bugs:
-
-- [iOS Beta (TestFlight)][testflight]
-- [Android Beta (Firebase)][firebase]
-- [Linux Desktop Beta (Flatpak)][flatpak]
-- [Linux Desktop Beta (packages)][repology]
-
 ## Community
 
 Organic Maps is an [open-source software][github] licensed under the Apache License 2.0.
 
+- Please join our beta program, suggest your features, and report bugs:
+  * [iOS Beta (TestFlight)][testflight]
+  * [Android Beta (Firebase)][firebase]
+  * [Linux Desktop Beta (Flatpak)][flatpak]
+  * [Linux Desktop Beta (packages)][repology]
 - Report bugs or issues to [the issue tracker][issues] or [email us][email].
 - [Discuss][ideas] ideas or propose feature requests.
 - Subscribe to our [Telegram Channel][telegram] or to the [matrix space][matrix] for updates.
@@ -111,4 +106,6 @@ Organic Maps is an [open-source software][github] licensed under the Apache Lice
 
 [fork]: https://en.wikipedia.org/wiki/Fork_(software_development)
 
+[telegram_chat]: https://t.me/OrganicMaps
+
 {{ references(lang='en') }}
diff --git a/content/donate/index.md b/content/donate/index.md
index 66a8dd16..00aac169 100644
--- a/content/donate/index.md
+++ b/content/donate/index.md
@@ -46,8 +46,6 @@ Organic Maps app is _free for everyone_ thanks to your **[donations][stripe]**:
 
 ## How to donate?
 
-There are many ways to donate to the project:
-
 {{ donate_buttons(lang='en') }}
 
 Recurring donations are the best way to ensure a relatively stable income for
@@ -60,8 +58,7 @@ donate one time.
 
 ### Crypto
 
-Please consider donating annually to reduce total fees. Algorand, Tron,
-Litecoin and Monero networks offer low fees, but situation changes every day.
+Please consider donating annually to reduce total fees.
 
 {{ crypto_table(lang='en') }}
 
diff --git a/content/support-us/index.md b/content/support-us/index.md
index 0a2f1461..a263be10 100644
--- a/content/support-us/index.md
+++ b/content/support-us/index.md
@@ -26,41 +26,6 @@ There are different ways to support the development:
 
 Our small team is very grateful for your feedback and support. Organic Maps would not be possible without our users ❤️.
 
-
-[donate]: @/donate/index.md
-
-[github]: https://github.com/organicmaps/organicmaps/issues
-
-[email]: mailto:support@organicmaps.app
-
-[bugs]: https://github.com/organicmaps/organicmaps/blob/master/docs/CONTRIBUTING.md
-
-[translations]: https://github.com/organicmaps/organicmaps/blob/master/docs/CONTRIBUTING.md#translations
-
-[translations_appstore]: https://github.com/organicmaps/organicmaps/tree/master/iphone/metadata/en-US
-
-[translations_googleplay]: https://github.com/organicmaps/organicmaps/tree/master/android/src/google/play/listings/en-US
-
-[translations_website]: https://github.com/organicmaps/organicmaps.github.io
-
-[openstreetmap]: https://www.openstreetmap.org/about
-
-[public_transport_validator]: https://cdn.organicmaps.app/subway/
-
-[issues]: https://github.com/organicmaps/organicmaps/issues
-
 [telegram_chat]: https://t.me/OrganicMaps
 
-[matrix]: https://matrix.to/#/#organicmaps:matrix.org
-
-[twitter]: https://twitter.com/OrganicMapsApp
-
-[facebook]: https://facebook.com/OrganicMaps
-
-[instagram]: https://instagram.com/OrganicMaps.app
-
-[googleplay]: market://details?id=app.organicmaps
-
-[appstore]: https://itunes.apple.com/app/id1567437057?action=write-review
-
-[appgallery]: appmarket://details?id=app.organicmaps
+{{ references(lang='en') }}
diff --git a/templates/shortcodes/references.md b/templates/shortcodes/references.md
index 4a331620..f93c5c2e 100644
--- a/templates/shortcodes/references.md
+++ b/templates/shortcodes/references.md
@@ -22,6 +22,8 @@
 [openstreetmap]: https://www.openstreetmap.org/about "OpenStreetMap"
 [repology]: https://repology.org/project/organicmaps/versions
 [telegram]: https://t.me/OrganicMapsApp
-[telegram_chat]: https://t.me/OrganicMaps
 [testflight]: https://testflight.apple.com/join/lrKCl08I
 [twitter]: https://twitter.com/OrganicMapsApp
+[translations_appstore]: https://github.com/organicmaps/organicmaps/tree/master/iphone/metadata
+[translations_googleplay]: https://github.com/organicmaps/organicmaps/tree/master/android/src/google/play/listings
+[translations_website]: https://github.com/organicmaps/organicmaps.github.io