Fix templates for app data

_data/software/browsers/1_google-chrome.yml

@@ -2,3 +2,4 @@ title: Google Chrome
 type: "Anti-Recommendation"
 description: |
   Chrome is completely controlled by Google, and taps into your browsing history to track you across the web and serve you targeted advertisements. Because of Google's interest in increased ad revenues, Google Chrome offers [no privacy protections](https://www.washingtonpost.com/technology/2019/06/21/google-chrome-has-become-surveillance-software-its-time-switch/) out of the box compared to Firefox, and has taken anti-consumer steps to [block common extensions like adblockers](https://www.wired.com/story/google-chrome-ad-blockers-extensions-api/). <mark>It's best to avoid this browser at all costs.</mark>
+order: 1

_data/software/browsers/3_brave.yml

@@ -2,3 +2,4 @@ title: Brave Browser
 type: Anti-Recommendation
 description: |
   Despite being widely touted as a privacy-friendly Chromium browser, we have a number of concerns with Brave's business practices and future business model that prevents us from recommending them. The Brave team [has publicly stated](https://www.reddit.com/r/privacytoolsIO/comments/cs8foq/update_delisting_brave/) they do not want to be associated with privacy-focused groups like PrivacyTools ([PrivacyTools PR #657](https://github.com/privacytools/privacytools.io/pull/657)), which causes us to believe the Brave team does not wish to be under too much scrutiny from the privacy community as they continue to develop their product ([Reddit discussion](http://archive.today/2020.05.13-035943/https://www.removeddit.com/r/brave_browser/comments/csapsy/brave_browser_is_being_delisted_from/exf6i0f/)).
+order: 3

_data/software/browsers/firefox.yml

@@ -7,12 +7,27 @@ description: |
   Unlike Google Chrome, Firefox won’t track your data and send it to various companies. Firefox also allows you to simply install a number of add-ons that will improve your privacy online.
 website: 'https://firefox.com/'
 privacy_policy: 'https://www.mozilla.org/en-US/privacy/firefox/'
-platform_win: 'https://www.mozilla.org/firefox/windows/'
-platform_mac: 'https://www.mozilla.org/firefox/mac/'
-platform_linux: 'https://www.mozilla.org/firefox/linux/'
-platform_bsd: 'https://www.freshports.org/www/firefox'
-platform_android: 'https://play.google.com/store/apps/details?id=org.mozilla.firefox'
-platform_fdroid: 'https://f-droid.org/en/packages/org.mozilla.fennec_fdroid/'
-platform_ios: 'https://apps.apple.com/us/app/firefox-private-safe-browser/id989804926'
+downloads:
+  - name: Windows
+    icon: fab fa-windows
+    url: 'https://www.mozilla.org/firefox/windows/'
+  - name: macOS
+    icon: fab fa-apple
+    url: 'https://www.mozilla.org/firefox/mac/'
+  - name: Linux
+    icon: fab fa-linux
+    url: 'https://www.mozilla.org/firefox/linux/'
+  - name: FreeBSD
+    icon: fab fa-freebsd
+    url: 'https://www.freshports.org/www/firefox'
+  - name: Google Play
+    icon: fab fa-google-play
+    url: 'https://play.google.com/store/apps/details?id=org.mozilla.firefox'
+  - name: Android
+    icon: fab fa-android
+    url: 'https://f-droid.org/en/packages/org.mozilla.fennec_fdroid/'
+  - name: iOS
+    icon: fab fa-app-store-ios
+    url: 'https://apps.apple.com/us/app/firefox-private-safe-browser/id989804926'
 source: 'https://hg.mozilla.org/mozilla-central/'
 order: 1

_data/software/browsers/tor-browser.yml

@@ -7,10 +7,16 @@ description: |
 website: 'https://www.torproject.org/'
 website_tor: 'http://expyuzz4wqqyqhjn.onion/'
 privacy_policy: 'https://support.torproject.org/tbb/tbb-3/'
-platform_win: 'https://www.torproject.org/download/'
-platform_mac: 'https://www.torproject.org/download/'
-platform_linux: 'https://www.torproject.org/download/'
-platform_android: 'https://play.google.com/store/apps/details?id=org.torproject.torbrowser'
-platform_fdroid: 'https://guardianproject.info/fdroid/'
+downloads:
+  - icon: fab fa-windows
+    url: 'https://www.torproject.org/download/'
+  - icon: fab fa-apple
+    url: 'https://www.torproject.org/download/'
+  - icon: fab fa-linux
+    url: 'https://www.torproject.org/download/'
+  - icon: fab fa-android
+    url: 'https://play.google.com/store/apps/details?id=org.torproject.torbrowser'
+  - icon: fab fa-app-store-ios
+    url: 'https://guardianproject.info/fdroid/'
 source: 'https://trac.torproject.org/projects/tor'
 order: 2

_data/software/browsers/ungoogled-chromium.yml

@@ -2,3 +2,4 @@ title: Ungoogled Chromium
 type: Worth Mentioning
 description: |
   A desktop browser based on Chromium which removes all Google integrations, while adding features which seek to enhance your security, privacy, and control of your browser. However, <mark>we do not strongly recommend the use of Ungoogled Chromium for most users</mark> at this time, because of a lack of official builds and updates from the developer. We strongly believe that auto-updating apps are key for maintaining security, lest you browse the web with outdated builds of your browser which may be susceptible to any number of live exploits.
+order: 2