diff --git a/content/_index.md b/content/_index.md
index b2bebbea..6175a50a 100644
--- a/content/_index.md
+++ b/content/_index.md
@@ -7,9 +7,7 @@ extra:
menu_title: Home
---
-**Organic Maps** is a free Android & iOS offline maps app for travelers, tourists, hikers, and cyclists based on top of crowd-sourced
-**[OpenStreetMap](https://www.openstreetmap.org)** data.
-It is a privacy-focused, open-source [fork](https://en.wikipedia.org/wiki/Fork_(software_development)) of **Maps.me** app (previously known as [**MapsWithMe**](https://en.wikipedia.org/wiki/Maps.me)), maintained by the same people who created **MapsWithMe** in 2011.
+**Organic Maps** is a free Android & iOS offline maps app for travelers, tourists, hikers, and cyclists based on top of crowd-sourced **[OpenStreetMap][openstreetmap]** data. It is a privacy-focused, open-source [fork][fork] of **Maps.me** app (previously known as [**MapsWithMe**][mapswithme], maintained by the same people who created **MapsWithMe** in 2011.
**Organic Maps** is one of a few applications nowadays that supports 100% of features without an active Internet connection. Install Organic Maps, download maps, throw away your SIM card (by the way, your operator constantly tracks you), and go for a weekly trip on a single battery charge without any byte sent to the network.
@@ -24,12 +22,12 @@ It is a privacy-focused, open-source [fork](https://en.wikipedia.org/wiki/Fork_(
Organic Maps is the ultimate companion app for travelers, tourists, hikers, and cyclists:
-- Detailed offline maps with places that don't exist on other maps, thanks to [OpenStreetMap](https://osm.org)
+- Detailed offline maps with places that don't exist on other maps, thanks to [OpenStreetMap][openstreetmap]
- Cycling routes, hiking trails, and walking paths
- Contour lines, elevation profiles, peaks, and slopes
- Turn-by-turn walking, cycling, and car navigation with voice guidance
- Fast offline search on the map
-- Bookmarks export and import in KML/KMZ formats (GPX is [planned](https://github.com/organicmaps/organicmaps/issues/624))
+- Bookmarks export and import in KML/KMZ formats (GPX is [planned][gpx_issue])
- Dark Mode to protect your eyes
- Countries and regions don't take a lot of space
- Free and open-source
@@ -55,14 +53,13 @@ Organic Maps app is free from trackers and other bad stuff:
- No crapware
- ~~No pesticides~~ Purely organic!
-The application is verified by Exodus Privacy Project:
-
-
+The application is verified by [Exodus Privacy Project][exodus]:
+
+{{ exodus_screenshot(lang='en') }}
Organic Maps doesn't request excessive permissions to spy on you:
-
-
+{{ privacy_screenshots(lang='en') }}
At Organic Maps, we believe that privacy is a fundamental human right:
@@ -72,12 +69,11 @@ At Organic Maps, we believe that privacy is a fundamental human right:
Reject surveillance - embrace your freedom.
-
-Give Organic Maps a try!
+**[Give Organic Maps a try!](#install)**
## Who is paying for the free app?
-The app is free for everyone. Please [donate](@/donate/index.md) to support us!
+The app is free for everyone. Please [donate][donate] to support us!
### There are different ways to donate:
@@ -85,34 +81,76 @@ The app is free for everyone. Please [donate](@/donate/index.md) to support us!
### Our sponsors:
-[Mythic Beasts](https://www.mythic-beasts.com/) ISP [provides us](https://www.mythic-beasts.com/blog/2021/10/06/improving-the-world-bit-by-expensive-bit/)
-two virtual servers with 400 TB/month of free bandwidth to help our users with
-maps downloads and updates.
+[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](@/support-us/index.md).
+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)](https://testflight.apple.com/join/lrKCl08I)
-- [Android Beta (Firebase)](https://appdistribution.firebase.dev/i/9ec3bca5e2b47373)
-- [Linux Desktop Beta (Flatpak)](https://flathub.org/apps/details/app.organicmaps.desktop)
-- [Linux Desktop Beta (packages)](https://repology.org/project/organicmaps/versions)
+- [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](https://github.com/organicmaps/organicmaps)
-licensed under the Apache License 2.0.
+Organic Maps is an [open-source software][github] licensed under the Apache License 2.0.
-- Report bugs or issues to [the issue tracker](https://github.com/organicmaps/organicmaps/issues) or [email us](mailto:hello@organicmaps.app).
-- [Discuss](https://github.com/organicmaps/organicmaps/discussions/categories/ideas) ideas or propose feature requests.
-- Subscribe to our [Telegram Channel](https://t.me/OrganicMapsApp) or to the [[matrix] space](https://matrix.to/#/#organicmaps:matrix.org) for updates.
-- Join our [Telegram Group](https://t.me/OrganicMaps) to discuss with other users.
-- Присоединяйтесь к нашей [русскоязычной группе в Telegram](https://t.me/OrganicMapsRu) для обратной связи и помощи.
-- Diğer kullanıcılarla tartışmak için [Telegram Grubumuza](https://t.me/OrganicMapsTR) katılın.
-- Visit our [GitHub page](https://github.com/organicmaps/organicmaps).
-- Follow our updates in Mastodon, [Facebook](https://facebook.com/OrganicMaps), [Twitter](https://twitter.com/OrganicMapsApp),
-[Instagram](https://instagram.com/organicmaps.app/).
+- 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.
+- Join our [Telegram Group][telegram_chat] to discuss with other users.
+- Visit our [GitHub page][github].
+- Follow our updates in [Mastodon][mastodon], [Facebook][facebook], [Twitter][twitter], [Instagram][instagram].
+
+[fork]: https://en.wikipedia.org/wiki/Fork_(software_development)
+
+[mapswithme]: https://en.wikipedia.org/wiki/Maps.me
+
+[openstreetmap]: https://www.openstreetmap.org/about
+
+[exodus]: https://reports.exodus-privacy.eu.org/en/reports/app.organicmaps/latest/
+
+[gpx_issue]: https://github.com/organicmaps/organicmaps/issues/624
+
+[twitter]: https://twitter.com/OrganicMapsApp
+
+[instagram]: https://instagram.com/organicmaps.app/
+
+[facebook]: https://facebook.com/OrganicMaps
+
+[mastodon]: https://fosstodon.org/@organicmaps
+
+[github]: https://github.com/organicmaps/organicmaps
+
+[telegram]: https://t.me/OrganicMapsApp
+
+[telegram_chat]: https://t.me/OrganicMaps
+
+[matrix]: https://matrix.to/#/#organicmaps:matrix.org
+
+[ideas]: https://github.com/organicmaps/organicmaps/discussions/categories/ideas
+
+[issues]: https://github.com/organicmaps/organicmaps/issues
+
+[email]: mailto:hello@organicmaps.app
+
+[donate]: @/donate/index.md
+
+[contribute]: @/support-us/index.md
+
+[testflight]: https://testflight.apple.com/join/lrKCl08I
+
+[firebase]: https://appdistribution.firebase.dev/i/9ec3bca5e2b47373
+
+[flatpak]: https://flathub.org/apps/details/app.organicmaps.desktop
+
+[repology]: https://repology.org/project/organicmaps/versions
+
+[mythic_beasts]: https://www.mythic-beasts.com/
+
+[mythic_beasts_donation]: https://www.mythic-beasts.com/blog/2021/10/06/improving-the-world-bit-by-expensive-bit/
diff --git a/content/privacy/index.md b/content/privacy/index.md
index dd420c44..4872cf0b 100644
--- a/content/privacy/index.md
+++ b/content/privacy/index.md
@@ -14,7 +14,6 @@ Reject surveillance - embrace your freedom.
Stay away from Big Tech's prying eyes!
-If you have any questions or suggestions, please contact us at
-[legal@organicmaps.app](mailto:legal@organicmaps.app).
+If you have any questions or suggestions, please contact us at [legal@organicmaps.app](mailto:legal@organicmaps.app).
This policy is effective as of 2021-04-24.
diff --git a/content/support-us/index.md b/content/support-us/index.md
index 6d46b632..012a23b2 100644
--- a/content/support-us/index.md
+++ b/content/support-us/index.md
@@ -7,33 +7,60 @@ extra:
preview_image: support-us/support-us.jpg
---
-Organic Maps is a free, open-source app. It is free from ads, it does not collect your personal information,
-and it is developed by enthusiasts with the help of the community.
+Organic Maps is a free, open-source app. It is free from ads, it does not collect your personal information, and it is developed by a few enthusiasts with the help of the community.
There are different ways to support the development:
-- [Donate](@/donate/index.md)! Every dollar or euro counts and helps us to pay for servers and scale.
-- Report bugs and share ideas on our [GitHub](https://github.com/organicmaps/organicmaps/issues)
- or via [email](mailto:support@organicmaps.app).
-- Help us to [fix bugs](https://github.com/organicmaps/organicmaps/blob/master/docs/CONTRIBUTING.md)
- and do code reviews if you are a developer. Every fixed small issue makes someone happier.
-- [Translate](https://github.com/organicmaps/organicmaps/blob/master/docs/CONTRIBUTING.md#translations)
- missing strings in the app's interface.
-- Translate [App Store](https://github.com/organicmaps/organicmaps/tree/master/iphone/metadata/en-US)
- and [Android](https://github.com/organicmaps/organicmaps/tree/master/android/src/google/play/listings/en-US)
- descriptions into your language.
-- [Translate](https://github.com/organicmaps/organicmaps.github.io) our web site into your language.
-- Join the [OpenStreetMap](https://www.openstreetmap.org/about) community and contribute to the maps data.
-- Fix red cities found by our [public transport validator](https://cdn.organicmaps.app/subway/), for subways and light rails to work in the app.
-- Support other users on [GitHub](https://github.com/organicmaps/organicmaps/issues),
- [Telegram](https://t.me/OrganicMaps) ([на русском](https://t.me/OrganicMapsRu)),
- [[matrix]](https://matrix.to/#/#organicmaps:matrix.org),
- [Twitter](https://twitter.com/OrganicMapsApp), [Facebook](https://facebook.com/OrganicMaps),
- [Instagram](https://instagram.com/OrganicMaps.app).
+- [Donate][donate]! Every dollar or euro counts and helps us to pay for servers and scale.
+- Report bugs and share ideas on our [GitHub][github] or via [email][email].
+- Help us to [fix bugs][contributing] and do code reviews if you are a developer. Every fixed small issue makes someone happier.
+- [Translate][translations] missing strings in the app's interface.
+- Translate [App Store][translations_appstore] and [Android][translations_googleplay descriptions into your language.
+- [Translate][translations_website] our web site into your language.
+- Join the [OpenStreetMap][openstreemap] community and contribute to the maps data.
+- Fix red cities found by our [public transport validator][public_transport_validator], for subways and light rails to work in the app.
+- Support other users on [GitHub][issues], [Telegram][telegram_chat], [matrix][matrix], [Twitter][twitter], [Facebook][facebook], [Instagram][instagram].
- Tell everyone about Organic Maps. A bigger community is a stronger community.
-- Rate us in [Google Play](market://details?id=app.organicmaps),
- [Apple Store](https://itunes.apple.com/app/id1567437057?action=write-review),
- [Huawei Appgallery](appmarket://details?id=app.organicmaps).
+- Rate us in [Google Play][googleplay], [Apple Store][appstore], [Huawei Appgallery][appgallery].
- Any help is welcome!
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
diff --git a/content/terms/index.md b/content/terms/index.md
index 0e632dc8..0ac98205 100644
--- a/content/terms/index.md
+++ b/content/terms/index.md
@@ -6,25 +6,25 @@ extra:
menu_title: Terms
---
-This app is licensed under the Apache License, Version 2.0 (the "License");
-you may not use this application except in compliance with the License.
+This app is licensed under the Apache License, Version 2.0 (the "License"); you may not use this application except in compliance with the License.
-You may obtain a copy of the License at [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
+You may obtain a copy of the License at [http://www.apache.org/licenses/LICENSE-2.0][license]
-Unless required by applicable law or agreed to in writing, software distributed
-under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied. See the License for the
-specific language governing permissions and limitations under the License.
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
-Most libraries in the following directories on [GitHub](https://github.com/organicmaps/organicmaps)
-made by other people and organizations and licensed in different ways:
+Most libraries in the following directories on [GitHub][github] made by other people and organizations and licensed in different ways:
- 3party
- tools
-Please refer to their LICENCE, COPYING or NOTICE files for terms of use.
+Please refer to their LICENSE, COPYING or NOTICE files for terms of use.
-See also [data/copyright.html](https://github.com/organicmaps/organicmaps/blob/master/data/copyright.html)
-file for a full list of copyright notices for Organic Maps application.
+See also [data/copyright.html][copyright] file for a full list of copyright notices for Organic Maps application.
If you have any questions or suggestions, please contact us at [legal@organicmaps.app](mailto:legal@organicmaps.app).
+
+[github]: https://github.com/organicmaps/organicmaps
+
+[license]: http://www.apache.org/licenses/LICENSE-2.0
+
+[copyright]: https://github.com/organicmaps/organicmaps/blob/master/data/copyright.html
diff --git a/templates/shortcodes/exodus_screenshot.html b/templates/shortcodes/exodus_screenshot.html
new file mode 100644
index 00000000..99b1089f
--- /dev/null
+++ b/templates/shortcodes/exodus_screenshot.html
@@ -0,0 +1 @@
+
diff --git a/templates/shortcodes/privacy_screenshots.html b/templates/shortcodes/privacy_screenshots.html
new file mode 100644
index 00000000..50192c4b
--- /dev/null
+++ b/templates/shortcodes/privacy_screenshots.html
@@ -0,0 +1,2 @@
+
+