diff --git a/.htaccess b/.htaccess
index 47d9c54..5c38fd8 100644
--- a/.htaccess
+++ b/.htaccess
@@ -14,6 +14,7 @@ Redirect 301 /carla                http://kxstudio.sourceforge.net/Applications:
 Redirect 301 /carla-control        http://kxstudio.sourceforge.net/Applications:Carla-Control
 
 RedirectMatch 301 ^/KXStudio:(.*)$ /$1
+RedirectMatch 301 ^/Documentation:Ubuntu:(.*)$ /Documentation:Repository:$1
 
 RewriteEngine On
 RewriteCond %{REQUEST_FILENAME} !-f
diff --git a/Documentation.php b/Documentation.php
index a8b3ee6..775ca11 100644
--- a/Documentation.php
+++ b/Documentation.php
@@ -21,8 +21,8 @@ include_once("includes/header.php");
     Please note that documentation for KXStudio is a work in progress, if you need some information not available here, you can try:
 </p>
 <ul>
-    <li><a href="http://www.wiki.linuxmusicians.com/doku.php" class="external text" rel="nofollow">LinuxMusicians Wiki</a></li>
-    <li><a href="https://help.ubuntu.com/community/UbuntuStudio/HowTos" class="external text" rel="nofollow">UbuntuStudio Community Documentation</a></li>
+    <li><a href="http://wiki.linuxaudio.org/wiki/start" class="external text" rel="nofollow" target="_blank">LinuxAudio Wiki</a></li>
+    <li><a href="https://help.ubuntu.com/community/UbuntuStudio/HowTos" class="external text" rel="nofollow" target="_blank">UbuntuStudio Community Documentation</a></li>
 </ul>
 
 <!-- TOPICS -->
@@ -36,6 +36,7 @@ include_once("includes/header.php");
     <b>KXStudio 12.04.3 Release</b>
 </p>
 <ul>
+<!--     <li><a href="<?php echo $ROOT; ?>/Documentation:KXStudio12043:About">About</a></li> -->
     <li><a href="<?php echo $ROOT; ?>/Documentation:KXStudio12043:ReleaseNotes">Release Notes</a></li>
 </ul>
 
@@ -45,9 +46,9 @@ include_once("includes/header.php");
     <b>KXStudio Distribution &amp; Repositories</b>
 </p>
 <ul>
-    <li><a href="<?php echo $ROOT; ?>/Documentation:Ubuntu:Meta-Packages">Available Meta-Packages</a></li>
-    <li><a href="<?php echo $ROOT; ?>/Documentation:Ubuntu:RegisterCommercial">Register/Activate your purchased software</a></li>
-    <li><a href="<?php echo $ROOT; ?>/Documentation:Ubuntu:Upgrade">Upgrade from an existing Ubuntu installation</a></li>
+    <li><a href="<?php echo $ROOT; ?>/Documentation:Repository:Meta-Packages">Available Meta-Packages</a></li>
+    <li><a href="<?php echo $ROOT; ?>/Documentation:Repository:RegisterCommercial">Register/Activate your purchased software</a></li>
+    <li><a href="<?php echo $ROOT; ?>/Documentation:Repository:Upgrade">Upgrade from an existing Debian/Ubuntu installation</a></li>
 </ul>
 
 <!-- KXSTUDIO MANUAL -->
diff --git a/Documentation:Ubuntu:Meta-Packages.php b/Documentation:Repository:Meta-Packages.php
similarity index 94%
rename from Documentation:Ubuntu:Meta-Packages.php
rename to Documentation:Repository:Meta-Packages.php
index f9a830c..a2f757b 100755
--- a/Documentation:Ubuntu:Meta-Packages.php
+++ b/Documentation:Repository:Meta-Packages.php
@@ -1,8 +1,8 @@
 <?php
-$PAGE_TITLE    = "KXStudio Documentation";
+$PAGE_TITLE    = "KXStudio : Documentation";
 $PAGE_TYPE     = "NONKXSTUDIO";
-$PAGE_SOURCE_1 = ARRAY("/Documentation", "/Documentation", "/Documentation:Ubuntu:Meta-Packages");
-$PAGE_SOURCE_2 = ARRAY("Documentation", "Ubuntu", "Meta-Packages");
+$PAGE_SOURCE_1 = ARRAY("/Documentation", "/Documentation", "/Documentation:Repository:Meta-Packages");
+$PAGE_SOURCE_2 = ARRAY("Documentation", "Repository", "Meta-Packages");
 include_once("includes/header.php");
 ?>
 
diff --git a/Documentation:Ubuntu:RegisterCommercial.php b/Documentation:Repository:RegisterCommercial.php
similarity index 88%
rename from Documentation:Ubuntu:RegisterCommercial.php
rename to Documentation:Repository:RegisterCommercial.php
index 46dd0ff..059aec2 100755
--- a/Documentation:Ubuntu:RegisterCommercial.php
+++ b/Documentation:Repository:RegisterCommercial.php
@@ -1,8 +1,8 @@
 <?php
-$PAGE_TITLE    = "KXStudio Documentation";
+$PAGE_TITLE    = "KXStudio : Documentation";
 $PAGE_TYPE     = "NONKXSTUDIO";
-$PAGE_SOURCE_1 = ARRAY("/Documentation", "/Documentation", "/Documentation:Ubuntu:RegisterCommercial");
-$PAGE_SOURCE_2 = ARRAY("Documentation", "Ubuntu", "RegisterCommercial");
+$PAGE_SOURCE_1 = ARRAY("/Documentation", "/Documentation", "/Documentation:Repository:RegisterCommercial");
+$PAGE_SOURCE_2 = ARRAY("Documentation", "Repository", "RegisterCommercial");
 include_once("includes/header.php");
 ?>
 
diff --git a/Documentation:Ubuntu:Upgrade.php b/Documentation:Repository:Upgrade.php
similarity index 97%
rename from Documentation:Ubuntu:Upgrade.php
rename to Documentation:Repository:Upgrade.php
index 82c845c..4f22707 100755
--- a/Documentation:Ubuntu:Upgrade.php
+++ b/Documentation:Repository:Upgrade.php
@@ -1,8 +1,8 @@
 <?php
-$PAGE_TITLE    = "KXStudio Documentation";
+$PAGE_TITLE    = "KXStudio : Documentation";
 $PAGE_TYPE     = "NONKXSTUDIO";
-$PAGE_SOURCE_1 = ARRAY("/Documentation", "/Documentation", "/Documentation:Ubuntu:Upgrade");
-$PAGE_SOURCE_2 = ARRAY("Documentation", "Ubuntu", "Upgrade");
+$PAGE_SOURCE_1 = ARRAY("/Documentation", "/Documentation", "/Documentation:Repository:Upgrade");
+$PAGE_SOURCE_2 = ARRAY("Documentation", "Repository", "Upgrade");
 include_once("includes/header.php");
 ?>