-{% include photoswipe_image.html url='/img/vr/slime-skeleton-0.png' width='327' height='544' thumb_width='300' alt='An image of Amber wearing SlimeVR trackers, side view' %}
-{% include photoswipe_image.html url='/img/vr/slime-skeleton-0-1.png' width='327' height='544' thumb_width='300' alt='An image of Amber wearing SlimeVR trackers, angled view' %}
+
+{{ ps.image(url='/img/vr/slime-skeleton-0.png', width='327', height='544', thumb_width='300', alt='An image of Amber wearing SlimeVR trackers, side view') }}
+{{ ps.image(url='/img/vr/slime-skeleton-0-1.png', width='327', height='544', thumb_width='300', alt='An image of Amber wearing SlimeVR trackers, angled view') }}
-### SlimeVR server internal skeleton {#slimevr-server-internal-skeleton}
+### SlimeVR server internal skeleton
The images below illustrate the internal skeleton of SlimeVR calculated from the rotational data from the two SlimeVR trackers and a resulting SteamVR waist tracker attached to the bottom of the skeleton's hip bone. The rotation of the chest tracker is used for the top bone of the spine and the rotation of the hip tracker is used for the bottom bone of the spine.
_Note: The illustrated skeleton does not accurately represent the skeleton used for SlimeVR, it is an artistic approximation._
-_Click on an image to view it larger_
-
-{% include photoswipe_image.html url='/img/vr/slime-skeleton-1.png' width='327' height='544' thumb_width='300' alt='An image of a SlimeVR skeleton with SlimeVR trackers and a SteamVR tracker on the waist, side view' %}
-{% include photoswipe_image.html url='/img/vr/slime-skeleton-1-1.png' width='327' height='544' thumb_width='300' alt='An image of a SlimeVR skeleton with SlimeVR trackers and a SteamVR tracker on the waist, angled view' %}
+
+{{ ps.image(url='/img/vr/slime-skeleton-1.png', width='327', height='544', thumb_width='300', alt='An image of a SlimeVR skeleton with SlimeVR trackers and a SteamVR tracker on the waist, side view') }}
+{{ ps.image(url='/img/vr/slime-skeleton-1-1.png', width='327', height='544', thumb_width='300', alt='An image of a SlimeVR skeleton with SlimeVR trackers and a SteamVR tracker on the waist, angled view') }}
-### SteamVR output {#steamvr-output}
+### SteamVR output
The images below illustrate the resulting SteamVR waist tracker. This tracker is the output data from SlimeVR and is what is seen in SteamVR and games.
_Note: The output does not include the skeleton, the outline is purely for illustrative purposes._
-_Click on an image to view it larger_
-
-{% include photoswipe_image.html url='/img/vr/slime-skeleton-2.png' width='327' height='544' thumb_width='300' alt='An image of a SteamVR tracker, side view' %}
-{% include photoswipe_image.html url='/img/vr/slime-skeleton-2-1.png' width='327' height='544' thumb_width='300' alt='An image of a SteamVR tracker, angled view' %}
+
+{{ ps.image(url='/img/vr/slime-skeleton-2.png', width='327', height='544', thumb_width='300', alt='An image of a SteamVR tracker, side view') }}
+{{ ps.image(url='/img/vr/slime-skeleton-2-1.png', width='327', height='544', thumb_width='300', alt='An image of a SteamVR tracker, angled view') }}
-## Credit {#credit}
+## Credit
The cases used for the illustration of SlimeVR trackers are the [Hyperion cases (https://github.com/Smeltie/Hyperion)](https://github.com/Smeltie/Hyperion "Hyperion case GitHub page") by Smeltie and contributors as listed on the GitHub page.
diff --git a/src/vr/vr.md b/src/vr/vr.md
new file mode 100644
index 0000000..dbe39a4
--- /dev/null
+++ b/src/vr/vr.md
@@ -0,0 +1,17 @@
+---
+layout: layouts/page.njk
+title: VR
+
+eleventyNavigation:
+ key: VR
+ order: 2
+
+image: /img/avatar.png
+description: "Stuff about VR"
+---
+
+# {{ title }}
+
+This section covers various VR topics.
+
+{{ collections.all | eleventyNavigation("VR") | eleventyNavigationToMarkdown | safe }}
diff --git a/web-safety/mfa.md b/src/web-safety/mfa.md
similarity index 78%
rename from web-safety/mfa.md
rename to src/web-safety/mfa.md
index 59529c9..f64da2c 100644
--- a/web-safety/mfa.md
+++ b/src/web-safety/mfa.md
@@ -1,59 +1,58 @@
---
-layout: page
+layout: layouts/page.njk
title: Multi-Factor Authentication (MFA)
-parent: Web Safety
+eleventyNavigation:
+ key: Multi-Factor Authentication (MFA)
+ parent: Web Safety
+ order: 0
-has_children: false
-has_toc: false
-
-nav_order: 0
image: /img/lock_icon.png
description: "A guide to setting up multi-factor authentication (MFA)"
---
-# Multi-Factor Authentication (MFA) {#multi-factor-authentication-mfa}
+# {{ title }}
-## Multi-factor authentication (MFA) introduction {#introduction}
+## Multi-factor authentication (MFA) introduction
Multi-factor authentication (MFA) is a method of securing your accounts with a short temporary pin alongside your password. By using a temporary pin generated by a secure device, it's much harder for hackers to steal your account.
-## Options {#options}
+## Options
-### Duo Mobile {#duo-mobile}
+### Duo Mobile
[Mobile](https://duo.com/product/multi-factor-authentication-mfa/duo-mobile-app)
- [Android](https://play.google.com/store/apps/details?id=com.duosecurity.duomobile)
- [iOS](https://apps.apple.com/us/app/duo-mobile/id422663827)
-### Authy {#authy}
+### Authy
[Mobile / Desktop](https://authy.com/download/)
- [Android](https://play.google.com/store/apps/details?id=com.authy.authy)
- [iOS](https://apps.apple.com/us/app/authy/id494168017)
-### Enpass {#enpass}
+### Enpass
[Mobile / Desktop / Browser](https://www.enpass.io/downloads/)
(You can find all download links on their [website](https://www.enpass.io/downloads/))
-### Bitwarden {#bitwarden}
+### Bitwarden
[Mobile / Desktop / Browser](https://bitwarden.com/download/)
(You can find all download links on their [website](https://bitwarden.com/download/))
-### Microsoft Authenticator {#microsoft-authenticator}
+### Microsoft Authenticator
[Mobile](https://www.microsoft.com/en-us/security/mobile-authenticator-app)
- [Android](https://play.google.com/store/apps/details?id=com.azure.authenticator)
- [iOS](https://apps.apple.com/us/app/microsoft-authenticator/id983156458)
-### LastPass Authenticator {#lastpass-authenticator}
+### LastPass Authenticator
[Mobile / Desktop](https://lastpass.com/auth/)
@@ -61,6 +60,6 @@ Multi-factor authentication (MFA) is a method of securing your accounts with a s
- [iOS](https://apps.apple.com/us/app/lastpass-authenticator/id1079110004)
- [Windows](https://www.microsoft.com/en-us/p/lastpass-authenticator/9nblggh5l9d7)
-## See Also {#see-also}
+## See Also
-
diff --git a/web-safety/safety.md b/src/web-safety/safety.md
similarity index 88%
rename from web-safety/safety.md
rename to src/web-safety/safety.md
index a1cd607..aaa0b60 100644
--- a/web-safety/safety.md
+++ b/src/web-safety/safety.md
@@ -1,48 +1,48 @@
---
-layout: page
+layout: layouts/page.njk
title: Web Safety
-has_children: true
-has_toc: false
+eleventyNavigation:
+ key: Web Safety
+ order: 1
-nav_order: 3
image: /img/lock_icon.png
description: "A guide to being safer with your passwords and accounts"
---
-# Web Safety {#web-safety}
+# {{ title }}
-## Introduction {#introduction}
+## Introduction
For basic web safety, it's important to use a password manager to keep your passwords safe. This guide will show you how to use a password manager easily, just like your browser's password storage.
-### Don't store passwords with a browser {#dont-store-passwords-with-a-browser}
+### Don't store passwords with a browser
Browsers often have a feature that allows you to store your passwords for easy access. However, this is not a very safe way to store your passwords. If your browser doesn't require a password or biometrics to access your stored passwords, any program on your computer can access and steal your passwords within seconds.
A password manager is a better option because it provides additional security in case of a data breach. It works just as easily as your browser's password storage, but it uses a different method to keep your passwords safe.
-#### Why not use my browser? {#why-not-use-my-browser}
+#### Why not use my browser?
When you store your passwords in your browser, they are encrypted using something called the ["Data Protection API," or DPAPI](https://en.wikipedia.org/wiki/Data_Protection_API). This sounds secure, but it's actually easy for attackers to access. The passwords are encrypted using a key that is stored in a well-known location on your computer. This means that any program can easily read and use the key to access your passwords. In other words, your passwords are not very safe when you store them in your browser.
-### So why use a password manager instead? {#why-use-a-password-manager-instead}
+### So why use a password manager instead?
A password manager is an app or program that stores and creates passwords outside of your browser. It uses a master password that you create to encrypt your passwords, so you only need to remember **_one_** strong password to log in to all your accounts. The password manager can also create strong, unique passwords for each account, so no account ever has the same password as another one. This means that if one account is compromised, it can't affect any other site or service. Because the password manager requires a password to access all your information, one that only you know, it can't be read by any other program.
If you're hesitant to use a password manager because you don't want to copy and paste all the information into your browser, most password managers have a browser extension that can paste the username and password for you, just like your browser would.
-## What are my options? {#what-are-my-options}
+## What are my options?
In the [options section](#options), we provide a list of password managers with a brief description of each one. You can decide which one you want to use based on your own preferences, but it's important to consider all your options and their pros and cons.
-## What more can I do? {#what-more-can-i-do}
+## What more can I do?
For extra protection, you can use [Multi-Factor Authentication (MFA)](mfa.md), also known as Two-Factor Authentication (or 2FA). This is a method that uses an app to generate a random passcode every 30 seconds. This makes it very difficult for someone to log into your account without having physical access to your phone.
-## Options {#options}
+## Options
-### Bitwarden {#bitwarden}
+### Bitwarden
Bitwarden is by far my favourite. It's free (with an _optional_ subscription for a very low price), open source, and it's fairly easy to use.
@@ -52,17 +52,17 @@ Bitwarden is by far my favourite. It's free (with an _optional_ subscription for
[Bitwarden Help Center](https://bitwarden.com/help/)
-#### See Also {#bitwarden-see-also}
+#### See Also
[Securing Bitwarden](securing-bitwarden.md)
-### Enpass {#enpass}
+### Enpass
Enpass is free and lets you store your passwords on your own computer instead of on the cloud, this allows you to choose who and what you trust with your data.
-### 1Password {#onepassword}
+### 1Password
1Password requires a subscription to use but it's worth what you pay for it. They appear to have fairly good security that is maintained over time.
@@ -70,7 +70,7 @@ Enpass is free and lets you store your passwords on your own computer instead of
[Beginners Guide](https://mshelton.medium.com/introduction-to-password-managers-5e15baa8b26e)
-### LastPass {#lastpass}
+### LastPass
LastPass is only _partially_ free. You are restricted to using only one device "type" with the free plan, either PC or mobile. If you wish to use this service, you should consider that LastPass has many issues in the company itself, you can look at the top of the beginners guide for more information.
@@ -83,6 +83,6 @@ Additionally, LastPass experienced a significant security incident where their v
[Beginners Guide](https://mshelton.medium.com/lastpass-for-beginners-e921f35d4114)
-## See Also {#see-also}
+## See Also
-
diff --git a/web-safety/securing-bitwarden.md b/src/web-safety/securing-bitwarden.md
similarity index 53%
rename from web-safety/securing-bitwarden.md
rename to src/web-safety/securing-bitwarden.md
index b95dfad..017285e 100644
--- a/web-safety/securing-bitwarden.md
+++ b/src/web-safety/securing-bitwarden.md
@@ -1,44 +1,44 @@
---
-layout: page
+layout: layouts/page.njk
title: How to make Bitwarden more secure
-parent: Web Safety
+eleventyNavigation:
+ key: How to make Bitwarden more secure
+ parent: Web Safety
+ order: 1
-has_children: false
-has_toc: false
-
-nav_order: 1
image: /img/lock_icon.png
description: "A guide to making Bitwarden more secure"
---
+{% include "photoswipe.njk" %}
+{% import "photoswipe.njk" as ps %}
-# How to make Bitwarden more secure {#how-to-make-bitwarden-more-secure}
+# {{ title }}
-## Introduction {#introduction}
+## Introduction
In light of the [recent security incident involving LastPass](https://blog.lastpass.com/2022/12/notice-of-recent-security-incident/), the importance of ensuring the security of password managers has come to the forefront. As a result, some vulnerabilities have been identified in Bitwarden. This guide will provide steps to enhance the security of your Bitwarden vault in accordance with the latest recommendations.
-## Increasing the number of PBKDF2 iterations {#increasing-the-number-of-pbkdf2-iterations}
+## Increasing the number of PBKDF2 iterations
[Reference Bitwarden documentation](https://bitwarden.com/help/what-encryption-is-used/#changing-kdf-iterations)
-### Why should I change it? {#why-should-i-change-it}
+### Why should I change it?
In order to align with the guidelines outlined in the [OWASP Password Storage Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Password_Storage_Cheat_Sheet.html#pbkdf2), it is recommended to increase the number of PBKDF2 iterations to a minimum of 600,000. While Bitwarden has recently increased the default iterations for new accounts, this change does not apply retroactively. It is possible that your account may still have the previous default of 100,000 iterations or lower set if you created it before they implemented these changes. To ensure the security of your account, it is important to review and update the PBKDF2 iterations accordingly.
-### How do I change it? {#how-do-i-change-it}
+### How do I change it?
To enhance the security of your account by increasing the PBKDF2 iterations, navigate to the encryption key settings page under **Account Settings → Security → Keys** on the [Bitwarden Web Vault](https://vault.bitwarden.com/). Here, you can adjust the "**KDF iterations**" value to either the recommended minimum value of 600,000 or your desired setting.
-*Click on an image to view it larger*
-
-{% include photoswipe_image.html url='/img/web-safety/PBKDF2-iter-settings-0.png' width='1024' height='855' thumb_width='300' alt='An image illustrating where the settings page is for security keys' %}
-{% include photoswipe_image.html url='/img/web-safety/PBKDF2-iter-settings-0-1.png' width='1024' height='855' thumb_width='300' alt='An image illustrating where to set the number of PBKDF2 iterations' %}
+
+{{ ps.image(url='/img/web-safety/PBKDF2-iter-settings-0.png', width='1024', height='855', thumb_width='500', alt='An image illustrating where the settings page is for security keys') }}
+{{ ps.image(url='/img/web-safety/PBKDF2-iter-settings-0-1.png', width='1024', height='855', thumb_width='500', alt='An image illustrating where to set the number of PBKDF2 iterations') }}
-## Automatically clearing the clipboard {#automatically-clearing-the-clipboard}
+## Automatically clearing the clipboard
-### Why should I enable it? {#why-should-i-enable-it}
+### Why should I enable it?
Enabling the automatic clipboard clearing feature of a password manager is an important security measure.
@@ -46,7 +46,7 @@ This feature automatically clears the clipboard after a certain period of time t
Additionally, it can also prevent others from viewing sensitive information on your device if it is lost, stolen, or shared. Enabling this feature can help to keep your passwords and other sensitive information secure and protect you from potential security breaches.
-### How do I enable it? {#how-do-i-enable-it}
+### How do I enable it?
To activate the automatic clipboard clearing feature for the various Bitwarden apps, please refer to the instructions provided for each below:
@@ -55,31 +55,28 @@ To activate the automatic clipboard clearing feature for the various Bitwarden a
- [Bitwarden Desktop App (Windows)](#desktop-app-windows)
- [Bitwarden Mobile App (Android)](#mobile-app-android)
-### Browser Extension {#browser-extension}
+### Browser Extension
-*Click on an image to view it larger*
-
-{% include photoswipe_image.html url='/img/web-safety/clipboard-settings-0.png' width='389' height='614' thumb_width='300' alt='An image illustrating where the settings page is for automatically clearing the clipboard on the Bitwarden browser extension' %}
-{% include photoswipe_image.html url='/img/web-safety/clipboard-settings-0-1.png' width='389' height='614' thumb_width='300' alt='An image illustrating where to change the setting for automatically clearing the clipboard on the Bitwarden browser extension' %}
+
+{{ ps.image(url='/img/web-safety/clipboard-settings-0.png', width='389', height='614', thumb_width='300', alt='An image illustrating where the settings page is for automatically clearing the clipboard on the Bitwarden browser extension') }}
+{{ ps.image(url='/img/web-safety/clipboard-settings-0-1.png', width='389', height='614', thumb_width='300', alt='An image illustrating where to change the setting for automatically clearing the clipboard on the Bitwarden browser extension') }}
-### Desktop App (Windows) {#desktop-app-windows}
+### Desktop App (Windows)
-*Click on an image to view it larger*
-
-{% include photoswipe_image.html url='/img/web-safety/clipboard-settings-1.png' width='897' height='614' thumb_width='300' alt='An image illustrating where the settings page is for automatically clearing the clipboard on the Bitwarden desktop app' %}
-{% include photoswipe_image.html url='/img/web-safety/clipboard-settings-1-1.png' width='897' height='614' thumb_width='300' alt='An image illustrating where to change the setting for automatically clearing the clipboard on the Bitwarden desktop app' %}
+
+{{ ps.image(url='/img/web-safety/clipboard-settings-1.png', width='897', height='614', thumb_width='500', alt='An image illustrating where the settings page is for automatically clearing the clipboard on the Bitwarden desktop app') }}
+{{ ps.image(url='/img/web-safety/clipboard-settings-1-1.png', width='897', height='614', thumb_width='500', alt='An image illustrating where to change the setting for automatically clearing the clipboard on the Bitwarden desktop app') }}
-### Mobile App (Android) {#mobile-app-android}
+### Mobile App (Android)
-*Click on an image to view it larger*
-
-{% include photoswipe_image.html url='/img/web-safety/clipboard-settings-2.png' width='1080' height='2340' thumb_width='300' alt='An image illustrating where the settings page is for automatically clearing the clipboard on the Bitwarden mobile app' %}
-{% include photoswipe_image.html url='/img/web-safety/clipboard-settings-2-1.png' width='1080' height='2340' thumb_width='300' alt='An image illustrating where to change the setting for automatically clearing the clipboard on the Bitwarden mobile app' %}
+
+{{ ps.image(url='/img/web-safety/clipboard-settings-2.png', width='1080', height='2340', thumb_width='250', alt='An image illustrating where the settings page is for automatically clearing the clipboard on the Bitwarden mobile app') }}
+{{ ps.image(url='/img/web-safety/clipboard-settings-2-1.png', width='1080', height='2340', thumb_width='250', alt='An image illustrating where to change the setting for automatically clearing the clipboard on the Bitwarden mobile app') }}
-## See Also {#see-also}
+## See Also
-
-
diff --git a/vr/slimevr-on-linux.md b/vr/slimevr-on-linux.md
deleted file mode 100644
index ee0616b..0000000
--- a/vr/slimevr-on-linux.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-layout: page
-title: SlimeVR on Linux
-
-parent: VR
-
-has_children: false
-has_toc: false
-
-nav_order: 2
-image: /img/avatar.png
-description: "A short guide on how to run SlimeVR on Linux"
-
-redirect_to: https://docs.slimevr.dev/tools/linux-installation.html
----
diff --git a/vr/vr.md b/vr/vr.md
deleted file mode 100644
index d74103f..0000000
--- a/vr/vr.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-layout: page
-title: VR
-
-has_children: true
-has_toc: true
-
-nav_order: 4
-image: /img/avatar.png
-description: "Stuff about VR"
-
-redirect_from: /steamvr
----