diff --git a/en/customization/fedora-template.md b/en/customization/fedora-minimal-template-customization.md
similarity index 98%
rename from en/customization/fedora-template.md
rename to en/customization/fedora-minimal-template-customization.md
index b6c7046d..9cf62fee 100644
--- a/en/customization/fedora-template.md
+++ b/en/customization/fedora-minimal-template-customization.md
@@ -1,3 +1,9 @@
+---
+layout: doc
+title: Fedora Minimal Template Customization
+permalink: /en/doc/fedora-minimal-template-customization/
+---
+
 FEDORA Packages Recommendations
 ======================
 
diff --git a/en/customization/windows-template.md b/en/customization/windows-template-customization.md
similarity index 98%
rename from en/customization/windows-template.md
rename to en/customization/windows-template-customization.md
index c9501664..fa5e4606 100644
--- a/en/customization/windows-template.md
+++ b/en/customization/windows-template-customization.md
@@ -1,3 +1,9 @@
+---
+layout: doc
+title: Windows Template Customization
+permalink: /en/doc/windows-template-customization/
+---
+
 Disable/Uninstall unecessary features/services
 =============================
 
@@ -157,4 +163,4 @@ Manual tasks that can/should be started in the template
         5. remove the file
         6. unmount the partition
         7. make a copy of root.img in sparse mode.
-	
\ No newline at end of file
+	
diff --git a/en/doc.md b/en/doc.md
index dbdc58b2..1bd6811f 100644
--- a/en/doc.md
+++ b/en/doc.md
@@ -114,8 +114,8 @@ Customization Guides
 --------------------
  *  [DispVM Customization](/en/doc/dispvm-customization/)
  *  [XFCE Installation in dom0](/en/doc/xfce/)
- *  [Customizing Fedora minimal templates](https://groups.google.com/d/topic/qubes-users/LkGNj-mCVHI/discussion)
- *  [Customizing Windows 7 templates](https://groups.google.com/d/topic/qubes-users/7pUubSz6Lxs/discussion)
+ *  [Customizing Fedora minimal templates](/en/doc/fedora-minimal-template-customization)
+ *  [Customizing Windows 7 templates](/en/doc/windows-template-customization)
  *  [Customizing the GUI experience with KDE](https://groups.google.com/d/topic/qubes-users/KhfzF19NG1s/discussion)
  *  [Language Localization](/en/doc/language-localization/)