diff --git a/external/building-guides/building-archlinux-template.md b/external/building-guides/building-archlinux-template.md
index 4ab4811b..c3766df4 100644
--- a/external/building-guides/building-archlinux-template.md
+++ b/external/building-guides/building-archlinux-template.md
@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: Building Archlinux Template
-permalink: /doc/building-archlinux-template/
+redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/building/building-archlinux-template.md
 redirect_from:
+- /doc/building-archlinux-template/
 - /en/doc/building-archlinux-template/
 - /doc/BuildingArchlinuxTemplate/
 - /wiki/BuildingArchlinuxTemplate/
diff --git a/external/building-guides/building-non-fedora-template.md b/external/building-guides/building-non-fedora-template.md
index b8e409f0..14577e70 100644
--- a/external/building-guides/building-non-fedora-template.md
+++ b/external/building-guides/building-non-fedora-template.md
@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: Building Non-Fedora Template
-permalink: /doc/building-non-fedora-template/
+redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/building/building-non-fedora-template.md
 redirect_from:
+- /doc/building-non-fedora-template/
 - /en/doc/building-non-fedora-template/
 - /doc/BuildingNonFedoraTemplate/
 - /wiki/BuildingNonFedoraTemplate/
diff --git a/external/building-guides/building-whonix-template.md b/external/building-guides/building-whonix-template.md
index 423487b1..1e3160a6 100644
--- a/external/building-guides/building-whonix-template.md
+++ b/external/building-guides/building-whonix-template.md
@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: Building Whonix Templates
-permalink: /doc/building-whonix-template/
+redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/building/building-whonix-template.md
 redirect_from:
+- /doc/building-whonix-template/
 - /en/doc/building-whonix-template/
 ---
 
diff --git a/external/configuration-guides/change-time-zone.md b/external/configuration-guides/change-time-zone.md
index 48463178..8204c5d3 100644
--- a/external/configuration-guides/change-time-zone.md
+++ b/external/configuration-guides/change-time-zone.md
@@ -1,7 +1,9 @@
 ---
 layout: doc
 title: Changing your Time Zone
-permalink: /doc/change-time-zone/
+redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/configuration/change-time-zone.md
+redirect_from:
+- /doc/change-time-zone/
 ---
 
 # Changing your Time Zone #
diff --git a/external/configuration-guides/disk-trim.md b/external/configuration-guides/disk-trim.md
index e1fe2583..84329e36 100644
--- a/external/configuration-guides/disk-trim.md
+++ b/external/configuration-guides/disk-trim.md
@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: Disk TRIM
-permalink: /doc/disk-trim/
+redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/configuration/disk-trim.md
 redirect_from:
+- /doc/disk-trim/
 - /en/doc/disk-trim/
 - /doc/DiskTRIM/
 - /wiki/DiskTRIM/
diff --git a/external/configuration-guides/external-audio.md b/external/configuration-guides/external-audio.md
index b50c6a75..742ca3a9 100644
--- a/external/configuration-guides/external-audio.md
+++ b/external/configuration-guides/external-audio.md
@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: External Audio
-permalink: /doc/external-audio/
+redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/configuration/external-audio.md
 redirect_from:
+- /doc/external-audio/
 - /en/doc/external-audio/
 - /doc/ExternalAudio/
 - /wiki/ExternalAudio/
diff --git a/external/configuration-guides/fetchmail.md b/external/configuration-guides/fetchmail.md
index c3e11ae9..fd32ce3d 100644
--- a/external/configuration-guides/fetchmail.md
+++ b/external/configuration-guides/fetchmail.md
@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: Fetchmail
-permalink: /doc/fetchmail/
+redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/configuration/fetchmail.md
 redirect_from:
+- /doc/fetchmail/
 - /en/doc/fetchmail/
 - /doc/Fetchmail/
 - /wiki/Fetchmail/
diff --git a/external/configuration-guides/install-nvidia-driver.md b/external/configuration-guides/install-nvidia-driver.md
index d9b65ac4..dbb875b0 100644
--- a/external/configuration-guides/install-nvidia-driver.md
+++ b/external/configuration-guides/install-nvidia-driver.md
@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: How to Install an Nvidia Driver
-permalink: /doc/install-nvidia-driver/
+redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/configuration/install-nvidia-driver.md
 redirect_from:
+- /doc/install-nvidia-driver/
 - /en/doc/install-nvidia-driver/
 - /doc/InstallNvidiaDriver/
 - /wiki/InstallNvidiaDriver/
diff --git a/external/configuration-guides/multiboot.md b/external/configuration-guides/multiboot.md
index d85f3cfb..9a69e2b6 100644
--- a/external/configuration-guides/multiboot.md
+++ b/external/configuration-guides/multiboot.md
@@ -1,7 +1,9 @@
 ---
 layout: doc
 title: Multibooting
-permalink: /doc/multiboot/
+redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/configuration/multiboot.md
+redirect_from:
+- /doc/multiboot/
 ---
 
 Multibooting Qubes 
diff --git a/external/configuration-guides/multimedia.md b/external/configuration-guides/multimedia.md
index 43fdedca..0beac0a5 100644
--- a/external/configuration-guides/multimedia.md
+++ b/external/configuration-guides/multimedia.md
@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: How to Make a Multimedia TemplateVM
-permalink: /doc/multimedia/
+redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/configuration/multimedia.md
 redirect_from:
+- /doc/multimedia/
 - /en/doc/multimedia/
 - /doc/Multimedia/
 - /wiki/Multimedia/
diff --git a/external/configuration-guides/mutt.md b/external/configuration-guides/mutt.md
index c857258d..36e19e20 100644
--- a/external/configuration-guides/mutt.md
+++ b/external/configuration-guides/mutt.md
@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: Mutt
-permalink: /doc/mutt/
+redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/configuration/mutt.md
 redirect_from:
+- /doc/mutt/
 - /en/doc/mutt/
 - /doc/Mutt/
 - /wiki/Mutt/
diff --git a/external/configuration-guides/network-bridge-support.md b/external/configuration-guides/network-bridge-support.md
index 822d991f..2b1f0d35 100644
--- a/external/configuration-guides/network-bridge-support.md
+++ b/external/configuration-guides/network-bridge-support.md
@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: Network Bridge Support
-permalink: /doc/network-bridge-support/
+redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/configuration/network-bridge-support.md
 redirect_from:
+- /doc/network-bridge-support/
 - /en/doc/network-bridge-support/
 - /doc/NetworkBridgeSupport/
 - /wiki/NetworkBridgeSupport/
diff --git a/external/configuration-guides/network-printer.md b/external/configuration-guides/network-printer.md
index f5d7ef9f..66722a56 100644
--- a/external/configuration-guides/network-printer.md
+++ b/external/configuration-guides/network-printer.md
@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: Network Printer
-permalink: /doc/network-printer/
+redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/configuration/network-printer.md
 redirect_from:
+- /doc/network-printer/
 - /en/doc/network-printer/
 - /doc/NetworkPrinter/
 - /wiki/NetworkPrinter/
diff --git a/external/configuration-guides/postfix.md b/external/configuration-guides/postfix.md
index 7a142f37..a72bfa61 100644
--- a/external/configuration-guides/postfix.md
+++ b/external/configuration-guides/postfix.md
@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: Postfix
-permalink: /doc/postfix/
+redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/configuration/postfix.md
 redirect_from:
+- /doc/postfix/
 - /en/doc/postfix/
 - /doc/Postfix/
 - /wiki/Postfix/
diff --git a/external/configuration-guides/rxvt.md b/external/configuration-guides/rxvt.md
index aa0c0bbc..ad397140 100644
--- a/external/configuration-guides/rxvt.md
+++ b/external/configuration-guides/rxvt.md
@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: Rxvt
-permalink: /doc/rxvt/
+redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/configuration/rxvt.md
 redirect_from:
+- /doc/rxvt/
 - /en/doc/rxvt/
 - /doc/Rxvt/
 - /wiki/Rxvt/
diff --git a/external/configuration-guides/tips-and-tricks.md b/external/configuration-guides/tips-and-tricks.md
index f937b32d..386fd43b 100644
--- a/external/configuration-guides/tips-and-tricks.md
+++ b/external/configuration-guides/tips-and-tricks.md
@@ -1,7 +1,9 @@
 ---
 layout: doc
 title: Tips and Tricks
-permalink: /doc/tips-and-tricks/
+redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/configuration/tips-and-tricks.md
+redirect_from:
+- /doc/tips-and-tricks/
 ---
 
 Tips and Tricks
diff --git a/external/configuration-guides/vpn.md b/external/configuration-guides/vpn.md
index 81b5aa16..00a87637 100644
--- a/external/configuration-guides/vpn.md
+++ b/external/configuration-guides/vpn.md
@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: VPN
-permalink: /doc/vpn/
+redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/configuration/vpn.md
 redirect_from:
+- /doc/vpn/
 - /doc/privacy/vpn/
 - /en/doc/vpn/
 - /doc/VPN/
diff --git a/external/configuration-guides/w3m.md b/external/configuration-guides/w3m.md
index 5511adb3..b02f58bf 100644
--- a/external/configuration-guides/w3m.md
+++ b/external/configuration-guides/w3m.md
@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: Reducing the fingerprint of the text-based web browser w3m
-permalink: /doc/w3m/
+redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/configuration/w3m.md
 redirect_from:
+- /doc/w3m/
 - /en/doc/mutt/
 - /doc/W3m/
 - /wiki/W3m/
diff --git a/external/configuration-guides/zfs.md b/external/configuration-guides/zfs.md
index 931d459a..c9a6e862 100644
--- a/external/configuration-guides/zfs.md
+++ b/external/configuration-guides/zfs.md
@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: ZFS
-permalink: /doc/zfs/
+redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/configuration/zfs.md
 redirect_from:
+- /doc/zfs/
 - /en/doc/zfs/
 - /doc/ZFS/
 - /wiki/ZFS/
diff --git a/external/customization-guides/dark-theme.md b/external/customization-guides/dark-theme.md
index b469aeac..5a4dea63 100644
--- a/external/customization-guides/dark-theme.md
+++ b/external/customization-guides/dark-theme.md
@@ -1,7 +1,9 @@
 ---
 layout: doc
 title: Dark Theme in Dom0 and DomU
-permalink: /doc/dark-theme/
+redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/customization/dark-theme.md
+redirect_from:
+- /doc/dark-theme/
 ---
 
 Dark Theme in Dom0
diff --git a/external/customization-guides/fedora-minimal-template-customization.md b/external/customization-guides/fedora-minimal-template-customization.md
index d4280f24..2016d025 100644
--- a/external/customization-guides/fedora-minimal-template-customization.md
+++ b/external/customization-guides/fedora-minimal-template-customization.md
@@ -1,7 +1,9 @@
 ---
 layout: doc
 title: Fedora Minimal Template Customization
-permalink: /doc/fedora-minimal-template-customization/
+redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/customization/fedora-minimal-template-customization.md
+redirect_from:
+- /doc/fedora-minimal-template-customization/
 redirect_from: /en/doc/fedora-minimal-template-customization/
 ---
 
diff --git a/external/customization-guides/language-localization.md b/external/customization-guides/language-localization.md
index ac4f5d19..b466efa0 100644
--- a/external/customization-guides/language-localization.md
+++ b/external/customization-guides/language-localization.md
@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: Language Localization
-permalink: /doc/language-localization/
+redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/customization/language-localization.md
 redirect_from:
+- /doc/language-localization/
 - /en/doc/language-localization/
 - /doc/LanguageLocalization/
 - /wiki/LanguageLocalization/
diff --git a/external/customization-guides/removing-templatevm-packages.md b/external/customization-guides/removing-templatevm-packages.md
index 9739981a..c2a905a3 100644
--- a/external/customization-guides/removing-templatevm-packages.md
+++ b/external/customization-guides/removing-templatevm-packages.md
@@ -1,7 +1,9 @@
 ---
 layout: doc
 title: Removing TemplateVM Packages
-permalink: /doc/removing-templatevm-packages/
+redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/customization/removing-templatevm-packages.md
+redirect_from:
+- /doc/removing-templatevm-packages/
 ---
 
 # Removing TemplateVM Packages
diff --git a/external/customization-guides/windows-template-customization.md b/external/customization-guides/windows-template-customization.md
index ecaffa23..6e7a6915 100644
--- a/external/customization-guides/windows-template-customization.md
+++ b/external/customization-guides/windows-template-customization.md
@@ -1,7 +1,9 @@
 ---
 layout: doc
 title: Windows Template Customization
-permalink: /doc/windows-template-customization/
+redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/customization/windows-template-customization.md
+redirect_from:
+- /doc/windows-template-customization/
 redirect_from: /en/doc/windows-template-customization/
 ---
 
diff --git a/external/os-guides/centos.md b/external/os-guides/centos.md
index 61595909..bdd9a02f 100644
--- a/external/os-guides/centos.md
+++ b/external/os-guides/centos.md
@@ -1,7 +1,9 @@
 ---
 layout: doc
 title: CentOS Template
-permalink: /doc/templates/centos/
+redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/os/templates/centos.md
+redirect_from:
+- /doc/templates/centos/
 ---
 
 # CentOS Template
diff --git a/external/os-guides/gentoo.md b/external/os-guides/gentoo.md
index 219c205b..51ecf998 100644
--- a/external/os-guides/gentoo.md
+++ b/external/os-guides/gentoo.md
@@ -1,7 +1,9 @@
 ---
 layout: doc
 title: Gentoo Template
-permalink: /doc/templates/gentoo/
+redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/os/templates/gentoo.md
+redirect_from:
+- /doc/templates/gentoo/
 ---
 
 # Gentoo Template
diff --git a/external/os-guides/linux-hvm-tips.md b/external/os-guides/linux-hvm-tips.md
index 4bf5dde3..3b05a75f 100644
--- a/external/os-guides/linux-hvm-tips.md
+++ b/external/os-guides/linux-hvm-tips.md
@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: Linux HVM Tips
-permalink: /doc/linux-hvm-tips/
+redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/os/linux-hvm-tips.md
 redirect_from:
+- /doc/linux-hvm-tips/
 - /en/doc/linux-hvm-tips/
 - /doc/LinuxHVMTips/
 - /wiki/LinuxHVMTips/
diff --git a/external/os-guides/netbsd.md b/external/os-guides/netbsd.md
index 8b655ec2..e9ebcfd9 100644
--- a/external/os-guides/netbsd.md
+++ b/external/os-guides/netbsd.md
@@ -1,7 +1,9 @@
 ---
 layout: doc
 title: How to Create a NetBSD VM
-permalink: /doc/netbsd/
+redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/os/netbsd.md
+redirect_from:
+- /doc/netbsd/
 ---
 
 How to Create a NetBSD VM
diff --git a/external/os-guides/pentesting.md b/external/os-guides/pentesting.md
index 56d79260..cb46986e 100644
--- a/external/os-guides/pentesting.md
+++ b/external/os-guides/pentesting.md
@@ -1,7 +1,9 @@
 ---
 layout: doc
 title: Penetration Testing
-permalink: /doc/pentesting/
+redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/os/pentesting.md
+redirect_from:
+- /doc/pentesting/
 ---
 
 **Legal notice:**
diff --git a/external/os-guides/pentesting/blackarch.md b/external/os-guides/pentesting/blackarch.md
index b0f06be2..3d27ee14 100644
--- a/external/os-guides/pentesting/blackarch.md
+++ b/external/os-guides/pentesting/blackarch.md
@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: How to Create a BlackArch VM
-permalink: /doc/pentesting/blackarch/
+redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/os/pentesting/blackarch.md
 redirect_from:
+- /doc/pentesting/blackarch/
 - /doc/blackarch/
 ---
 
diff --git a/external/os-guides/pentesting/kali.md b/external/os-guides/pentesting/kali.md
index 9f401ea4..3b5f704f 100644
--- a/external/os-guides/pentesting/kali.md
+++ b/external/os-guides/pentesting/kali.md
@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: How to create a Kali Linux VM
-permalink: /doc/pentesting/kali/
+redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/os/pentesting/kali.md
 redirect_from:
+- /doc/pentesting/kali/
 - /doc/kali/
 ---
 
diff --git a/external/os-guides/pentesting/ptf.md b/external/os-guides/pentesting/ptf.md
index badc085b..50423f70 100644
--- a/external/os-guides/pentesting/ptf.md
+++ b/external/os-guides/pentesting/ptf.md
@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: How to create Penetration Testers Framework (PTF) VM
-permalink: /doc/pentesting/ptf/
+redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/os/pentesting/ptf.md
 redirect_from:
+- /doc/pentesting/ptf/
 - /doc/ptf/
 ---
 
diff --git a/external/os-guides/ubuntu.md b/external/os-guides/ubuntu.md
index 5bf691a5..7d433544 100644
--- a/external/os-guides/ubuntu.md
+++ b/external/os-guides/ubuntu.md
@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: Ubuntu Template
-permalink: /doc/templates/ubuntu/
+redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/os/templates/ubuntu.md
 redirect_from:
+- /doc/templates/ubuntu/
 - /doc/ubuntu/
 - /en/doc/templates/ubuntu/
 - /doc/Templates/Ubuntu/
diff --git a/external/os-guides/windows/windows-tools.md b/external/os-guides/windows/windows-tools.md
index 4a5ff7d0..ffd01651 100644
--- a/external/os-guides/windows/windows-tools.md
+++ b/external/os-guides/windows/windows-tools.md
@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: Qubes Windows Tools
-permalink: /doc/windows-tools/
+redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/os/windows-tools.md
 redirect_from:
+- /doc/windows-tools/
 - /doc/windows-appvms/
 - /en/doc/windows-appvms/
 - /doc/WindowsAppVms/
diff --git a/external/os-guides/windows/windows-vm.md b/external/os-guides/windows/windows-vm.md
index 5eeb7f67..e18c5269 100644
--- a/external/os-guides/windows/windows-vm.md
+++ b/external/os-guides/windows/windows-vm.md
@@ -1,7 +1,9 @@
 ---
 layout: doc
 title: Installing a Windows VM
-permalink: /doc/windows-vm/
+redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/os/windows-vm.md
+redirect_from:
+- /doc/windows-vm/
 ---
 
 
diff --git a/external/privacy-guides/anonymizing-your-mac-address.md b/external/privacy-guides/anonymizing-your-mac-address.md
index 448e2a64..33dfb3e2 100644
--- a/external/privacy-guides/anonymizing-your-mac-address.md
+++ b/external/privacy-guides/anonymizing-your-mac-address.md
@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: Anonymizing your MAC Address
-permalink: /doc/anonymizing-your-mac-address/
+redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/privacy/anonymizing-your-mac-address.md
 redirect_from:
+- /doc/anonymizing-your-mac-address/
 - /doc/randomizing-your-mac-address/
 ---
 
diff --git a/external/privacy-guides/signal.md b/external/privacy-guides/signal.md
index b6378855..154ea2c0 100644
--- a/external/privacy-guides/signal.md
+++ b/external/privacy-guides/signal.md
@@ -1,7 +1,9 @@
 ---
 layout: doc
 title: Signal
-permalink: /doc/signal/
+redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/privacy/signal.md
+redirect_from:
+- /doc/signal/
 ---
 
 Signal
diff --git a/external/privacy-guides/tails.md b/external/privacy-guides/tails.md
index a159df4a..fe23afc7 100644
--- a/external/privacy-guides/tails.md
+++ b/external/privacy-guides/tails.md
@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: Running Tails in Qubes
-permalink: /doc/tails/
+redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/privacy/tails.md
 redirect_from:
+- /doc/tails/
 - /doc/running-tails
 ---
 
diff --git a/external/privacy-guides/torvm.md b/external/privacy-guides/torvm.md
index d04de0f1..106651f9 100644
--- a/external/privacy-guides/torvm.md
+++ b/external/privacy-guides/torvm.md
@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: TorVM
-permalink: /doc/torvm/
+redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/privacy/torvm.md
 redirect_from:
+- /doc/torvm/
 - /doc/privacy/torvm/
 - /en/doc/torvm/
 - /doc/TorVM/
diff --git a/external/privacy-guides/whonix.md b/external/privacy-guides/whonix.md
index 7835d4c8..59a08400 100644
--- a/external/privacy-guides/whonix.md
+++ b/external/privacy-guides/whonix.md
@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: Whonix for Privacy & Anonymity
-permalink: /doc/whonix/
+redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/privacy/whonix.md
 redirect_from:
+- /doc/whonix/
 - /doc/privacy/whonix/
 - /doc/templates/whonix/
 - /en/doc/templates/whonix/
diff --git a/external/security-guides/multifactor-authentication.md b/external/security-guides/multifactor-authentication.md
index 9d074666..31839a0f 100644
--- a/external/security-guides/multifactor-authentication.md
+++ b/external/security-guides/multifactor-authentication.md
@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: Multifactor Authentication
-permalink: /doc/multifactor-authentication/
+redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/security/multifactor-authentication.md
 redirect_from:
+- /doc/multifactor-authentication/
 - /en/doc/multifactor-authentication/
 - /doc/Multi-factorAuthentication/
 ---
diff --git a/external/security-guides/security-guidelines.md b/external/security-guides/security-guidelines.md
index a9beaf25..44789981 100644
--- a/external/security-guides/security-guidelines.md
+++ b/external/security-guides/security-guidelines.md
@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: Security Guidelines
-permalink: /doc/security-guidelines/
+redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/security/security-guidelines.md
 redirect_from:
+- /doc/security-guidelines/
 - /en/doc/security-guidelines/
 - /doc/SecurityGuidelines/
 - /wiki/SecurityGuidelines/
diff --git a/external/security-guides/split-bitcoin.md b/external/security-guides/split-bitcoin.md
index 3665a7e7..6138bbfb 100644
--- a/external/security-guides/split-bitcoin.md
+++ b/external/security-guides/split-bitcoin.md
@@ -1,7 +1,9 @@
 ---
 layout: doc
 title: Split Bitcoin
-permalink: /doc/split-bitcoin/
+redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/security/split-bitcoin.md
+redirect_from:
+- /doc/split-bitcoin/
 ---
 
 How to Set Up a Split Bitcoin Wallet in Qubes
diff --git a/external/troubleshooting/application-troubleshooting.md b/external/troubleshooting/application-troubleshooting.md
index b8aa8d79..70969314 100644
--- a/external/troubleshooting/application-troubleshooting.md
+++ b/external/troubleshooting/application-troubleshooting.md
@@ -1,7 +1,9 @@
 ---
 layout: doc
 title: Application Troubleshooting
-permalink: /doc/application-troubleshooting/
+redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/troubleshooting/application-troubleshooting.md
+redirect_from:
+- /doc/application-troubleshooting/
 ---
 
 # Troubleshooting default applications on Qubes #
diff --git a/external/troubleshooting/intel-igfx-troubleshooting.md b/external/troubleshooting/intel-igfx-troubleshooting.md
index 75be156a..e2b39274 100644
--- a/external/troubleshooting/intel-igfx-troubleshooting.md
+++ b/external/troubleshooting/intel-igfx-troubleshooting.md
@@ -1,7 +1,9 @@
 ---
 layout: doc
 title: Intel Integrated Graphics Troubleshooting
-permalink: /doc/intel-igfx-troubleshooting/
+redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/troubleshooting/intel-igfx-troubleshooting.md
+redirect_from:
+- /doc/intel-igfx-troubleshooting/
 ---
 # Intel Integrated Graphics Troubleshooting #
 
diff --git a/external/troubleshooting/macbook-troubleshooting.md b/external/troubleshooting/macbook-troubleshooting.md
index 86854c1d..d013f91e 100644
--- a/external/troubleshooting/macbook-troubleshooting.md
+++ b/external/troubleshooting/macbook-troubleshooting.md
@@ -1,7 +1,9 @@
 ---
 layout: doc
 title: Apple MacBook Troubleshooting
-permalink: /doc/macbook-troubleshooting/
+redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/troubleshooting/macbook-troubleshooting.md
+redirect_from:
+- /doc/macbook-troubleshooting/
 ---
 
 # Apple MacBook Troubleshooting
diff --git a/external/troubleshooting/nvidia-troubleshooting.md b/external/troubleshooting/nvidia-troubleshooting.md
index ddd922f5..bcbb142e 100644
--- a/external/troubleshooting/nvidia-troubleshooting.md
+++ b/external/troubleshooting/nvidia-troubleshooting.md
@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: Nvidia Troubleshooting
-permalink: /doc/nvidia-troubleshooting/
+redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/troubleshooting/nvidia-troubleshooting.md
 redirect_from:
+- /doc/nvidia-troubleshooting/
 - /en/doc/nvidia-troubleshooting/
 - /doc/NvidiaTroubleshooting/
 - /wiki/NvidiaTroubleshooting/
diff --git a/external/troubleshooting/sony-vaio-tinkering.md b/external/troubleshooting/sony-vaio-tinkering.md
index 34e4552f..8d93d1f6 100644
--- a/external/troubleshooting/sony-vaio-tinkering.md
+++ b/external/troubleshooting/sony-vaio-tinkering.md
@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: Sony Vaio Tinkering
-permalink: /doc/sony-vaio-tinkering/
+redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/troubleshooting/sony-vaio-tinkering.md
 redirect_from:
+- /doc/sony-vaio-tinkering/
 - /en/doc/sony-vaio-tinkering/
 - /doc/SonyVaioTinkering/
 - /wiki/SonyVaioTinkering/
diff --git a/external/troubleshooting/tails-troubleshooting.md b/external/troubleshooting/tails-troubleshooting.md
index 2d5d855f..2a1ef89b 100644
--- a/external/troubleshooting/tails-troubleshooting.md
+++ b/external/troubleshooting/tails-troubleshooting.md
@@ -1,7 +1,9 @@
 ---
 layout: doc
 title: Tails Troubleshooting
-permalink: /doc/tails-troubleshooting/
+redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/troubleshooting/tails-troubleshooting.md
+redirect_from:
+- /doc/tails-troubleshooting/
 ---
 
 # Tails Troubleshooting Guide #
diff --git a/external/troubleshooting/thinkpad-troubleshooting.md b/external/troubleshooting/thinkpad-troubleshooting.md
index fe58324f..c2d196cc 100644
--- a/external/troubleshooting/thinkpad-troubleshooting.md
+++ b/external/troubleshooting/thinkpad-troubleshooting.md
@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: Lenovo ThinkPad Troubleshooting
-permalink: /doc/thinkpad-troubleshooting/
+redirect_to: https://github.com/Qubes-Community/Contents/blob/master/docs/troubleshooting/thinkpad-troubleshooting.md
 redirect_from:
+- /doc/thinkpad-troubleshooting/
 - /doc/thinkpad_x201/
 - /en/doc/thinkpad_x201/
 - /doc/Thinkpad_X201/