diff --git a/_data/software/browsers/brave.md b/_data/software/browsers/brave.yml
similarity index 95%
rename from _data/software/browsers/brave.md
rename to _data/software/browsers/brave.yml
index 8e18bb00..991edec1 100644
--- a/_data/software/browsers/brave.md
+++ b/_data/software/browsers/brave.yml
@@ -1,6 +1,4 @@
----
 title: Brave Browser
-type: "Anti-Recommendation"
+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/)).
----
diff --git a/_data/software/browsers/bromite.md b/_data/software/browsers/bromite.yml
similarity index 93%
rename from _data/software/browsers/bromite.md
rename to _data/software/browsers/bromite.yml
index 571b1573..0e31b0cf 100644
--- a/_data/software/browsers/bromite.md
+++ b/_data/software/browsers/bromite.yml
@@ -1,7 +1,5 @@
----
 title: Bromite
-type: "Worth Mentioning"
+type: Worth Mentioning
 description: |
   A Chromium-based browser with security and privacy enhancements built in, such as an adblocker and DNS-over-HTTPS support. It includes patches from Ungoogled Chromium and other security/privacy focused Chromium projects. However, <mark>Bromite is only available on Android at this time,</mark> making it a poor choice for users of multiple devices, especially if you need to sync between a desktop and mobile device.
 website: 'https://www.bromite.org/'
----
diff --git a/_data/software/browsers/chromium.md b/_data/software/browsers/chromium.yml
similarity index 93%
rename from _data/software/browsers/chromium.md
rename to _data/software/browsers/chromium.yml
index c555cd18..54ff3778 100644
--- a/_data/software/browsers/chromium.md
+++ b/_data/software/browsers/chromium.yml
@@ -1,6 +1,4 @@
----
 title: Chromium
-type: "Anti-Recommendation"
+type: Anti-Recommendation
 description: |
   Without signing into a Google Account, the open-source builds of Chromium do relatively well in terms of security and privacy. However, Chromium still does have a number of integrations with Google hardcoded into the source, and because it is designed to be as user-friendly as possible, it operates in a way that compromises transparency and user-control. And, Chromium is still directly developed by Google, who have attempted to introduce anti-consumer measures in the past as mentioned in the Google Chrome section.
----
diff --git a/_data/software/browsers/firefox.html b/_data/software/browsers/firefox.yml
similarity index 71%
rename from _data/software/browsers/firefox.html
rename to _data/software/browsers/firefox.yml
index 7931f6d7..9814da5d 100644
--- a/_data/software/browsers/firefox.html
+++ b/_data/software/browsers/firefox.yml
@@ -1,4 +1,3 @@
----
 title: Firefox
 type: Recommendation
 logo: /assets/img/browsers/firefox-logo.svg
@@ -17,17 +16,3 @@ 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'
 source: 'https://hg.mozilla.org/mozilla-central/'
 order: 1
----
-
-<h2 class="pt-3">Source Code</h2>
-
-<p>Mozilla publishes the source code for the Firefox browser at <a href="{{ page.source }}">{{ page.source }}</a>.</p>
-
-<h2 class="pt-3">Related Content</h2>
-
-{% assign blog1 = site.posts | where:"title","Firefox Privacy: Tips and Tricks for Better Browsing" %}
-{% for post in blog1 %}
-<div class="row">
-  {% include blog-card.html %}
-</div>
-{% endfor %}
diff --git a/_data/software/browsers/google-chrome.md b/_data/software/browsers/google-chrome.yml
similarity index 98%
rename from _data/software/browsers/google-chrome.md
rename to _data/software/browsers/google-chrome.yml
index 6aac6752..086af334 100644
--- a/_data/software/browsers/google-chrome.md
+++ b/_data/software/browsers/google-chrome.yml
@@ -1,7 +1,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>
-
----
diff --git a/_data/software/browsers/safari.md b/_data/software/browsers/safari.yml
similarity index 98%
rename from _data/software/browsers/safari.md
rename to _data/software/browsers/safari.yml
index c9104074..df7b8758 100644
--- a/_data/software/browsers/safari.md
+++ b/_data/software/browsers/safari.yml
@@ -1,6 +1,4 @@
----
 title: Safari
 type: Worth Mentioning
 description: |
   A browser option on macOS and iOS with a strong focus on security and [privacy](https://www.apple.com/safari/docs/Safari_White_Paper_Nov_2019.pdf). <mark>We believe Safari is an acceptable choice for Apple users,</mark> despite Safari being a proprietary browser, because Apple users are already trusting a proprietary operating system to run their programs on. We do not recommend using iCloud Sync, which saves your bookmarks and history in a way which allows Apple to view them. Additionally, [WebKit](https://webkit.org), the browser engine powering Safari *is* open source.
----
diff --git a/_data/software/browsers/tor-browser.md b/_data/software/browsers/tor-browser.yml
similarity index 99%
rename from _data/software/browsers/tor-browser.md
rename to _data/software/browsers/tor-browser.yml
index a8f718c7..fd65815c 100644
--- a/_data/software/browsers/tor-browser.md
+++ b/_data/software/browsers/tor-browser.yml
@@ -1,4 +1,3 @@
----
 title: Tor Browser
 type: Recommendation
 info: Provides Anonymity
@@ -15,4 +14,3 @@ platform_android: 'https://play.google.com/store/apps/details?id=org.torproject.
 platform_fdroid: 'https://guardianproject.info/fdroid/'
 source: 'https://trac.torproject.org/projects/tor'
 order: 2
----
diff --git a/_data/software/browsers/ungoogled-chromium.md b/_data/software/browsers/ungoogled-chromium.yml
similarity index 98%
rename from _data/software/browsers/ungoogled-chromium.md
rename to _data/software/browsers/ungoogled-chromium.yml
index 576d1584..af81966e 100644
--- a/_data/software/browsers/ungoogled-chromium.md
+++ b/_data/software/browsers/ungoogled-chromium.yml
@@ -1,6 +1,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.
----