diff --git a/README.md b/README.md
index d35a1295..c24b2e51 100644
--- a/README.md
+++ b/README.md
@@ -1,64 +1,60 @@
## Developing
1. Install the version of [Ruby](https://www.ruby-lang.org/en/downloads/) currently specified by [`.ruby-version`](.ruby-version)
- * With [rbenv](https://github.com/rbenv/rbenv) (**recommended!**): `rbenv install`
- * With [RVM](https://rvm.io): `rvm install "ruby-$(cat .ruby-version)"`
- * [Manually](https://www.ruby-lang.org/en/downloads/)
+ * With [rbenv](https://github.com/rbenv/rbenv) (**recommended!**): `rbenv install`
+ * With [RVM](https://rvm.io): `rvm install "ruby-$(cat .ruby-version)"`
+ * [Manually](https://www.ruby-lang.org/en/downloads/)
1. Install node.js and npm
1. Install [Bundler](https://bundler.io/) v2.2.5:
- * `gem install bundler:2.2.5`
+ * `gem install bundler:2.2.5`
1. Install the required dependencies:
- * `bundle install`
- * `npm install`
+ * `bundle install`
+ * `npm install`
1. Build the website (the output can be found in the `_site` directory):
- * `npm run build`
+ * `npm run build`
1. Serve the website locally with live reloading:
- * `npm run serve`
+ * `npm run serve`
diff --git a/collections/_evergreen/android.md b/collections/_evergreen/android.md
index 70a64db7..7e6cb41e 100644
--- a/collections/_evergreen/android.md
+++ b/collections/_evergreen/android.md
@@ -9,7 +9,6 @@ description: |
---
## AOSP Derivatives
-
{% for item_hash in site.data.operating-systems.android %}
{% assign item = item_hash[1] %}
@@ -20,13 +19,10 @@ description: |
{% endfor %}
## Android security and privacy features
-
### User Profiles
-
Multiple user profiles (Settings → System → Multiple users) are the simplest way to isolate in Android. With user profiles you can limit a user from making calls, SMS or installing apps on the device. Each profile is encrypted using its own encryption key and cannot access the data of any other profiles. Even the device owner cannot view the data of other profiles without knowing their password. Multiple user profiles is a more secure method of isolation.
### Work Profile
-
[Work Profiles](https://support.google.com/work/android/answer/6191949) are another way to isolate individual apps and may be more convenient than separate user profiles.
A **device controller** such as [Shelter](#recommended-apps) is required, unless you're using CalyxOS which includes one.
@@ -36,7 +32,6 @@ The work profile is dependent on a device controller to function. Features such
This method is generally less secure than a secondary user profile; however, it does allow you the convenience of running apps in both the work and personal profiles simultaneously.
### Verified Boot
-
[Verified boot](https://source.android.com/security/verifiedboot) is an important part of the Android security model. It provides protection against [Evil maid](https://en.wikipedia.org/wiki/Evil_maid_attack) attacks, malware persistence, and ensures security updates cannot be downgraded with [rollback protection](https://source.android.com/security/verifiedboot/verified-boot#rollback-protection).
Android 10 and above has moved away from full-disk encryption (FDE) to more flexible [file-based encryption](https://source.android.com/security/encryption/file-based).
@@ -46,15 +41,12 @@ Each user's data is encrypted using their own unique encryption key, and the ope
Unfortunately, original equipment manufacturers (OEMs) are only obliged to support verified boot on their stock Android distribution. Only a few OEMs such as Google support custom Android Verified Boot (AVB) key enrollment on their devices. Some AOSP derivatives such as LineageOS or /e/ OS do not support verified boot even on hardware with verified boot support for third party operating systems. We recommend that you check for support **before** purchasing a new device. AOSP derivatives which do not support verified boot are **not** recommended.
### VPN Killswitch
-
Android 7 and above supports a VPN killswitch and it is available without the need to install third party apps. This feature can prevent leaks if the VPN is disconnected. It can be found in ⚙️ Settings → Network & internet → VPN → ⚙️ → Block connections without VPN.
### Global Toggles
-
Modern Android devices have global toggles for disabling [Bluetooth](https://en.wikipedia.org/wiki/Bluetooth) and location services. Android 12 introduced toggles for the camera and microphone. When not in use, we recommend disabling these features. Apps cannot use disabled features (even if granted individual permission) until renabled.
## Recommended Apps
-
{% for item_hash in site.data.operating-systems.android-applications %}
{% assign item = item_hash[1] %}
@@ -65,9 +57,7 @@ Modern Android devices have global toggles for disabling [Bluetooth](https://en.
{% endfor %}
## General Recommendations
-
### Avoid Root
-
[Rooting](https://en.wikipedia.org/wiki/Rooting_(Android)) Android phones can decrease security significantly as it weakens the complete [Android security model](https://en.wikipedia.org/wiki/Android_(operating_system)#Security_and_privacy). This can decrease privacy should there be an exploit that is assisted by the decreased security. Common rooting methods involve directly tampering with the boot partition, making it impossible to perform successful [verified boot](https://source.android.com/security/verifiedboot). Apps that require root will also modify the system partition meaning that verified boot would have to remain disabled. Having root exposed directly in the user interface also increases the [attack surface](https://en.wikipedia.org/wiki/Attack_surface) of your device and may assist in [privilege escalation](https://en.wikipedia.org/wiki/Privilege_escalation) vulnerabilities and [SELinux](https://en.wikipedia.org/wiki/Security-Enhanced_Linux) policy bypasses.
Adblockers (AdAway) which modify the