diff --git a/bl-kernel/admin/controllers/settings-advanced.php b/bl-kernel/admin/controllers/settings-advanced.php
index 5b614cbe..cd35d32f 100644
--- a/bl-kernel/admin/controllers/settings-advanced.php
+++ b/bl-kernel/admin/controllers/settings-advanced.php
@@ -88,5 +88,10 @@ $allPublishedPages = buildAllpages(true);
 // Homepage select options
 $homepageOptions = array();
 foreach($allPublishedPages as $key=>$page) {
-	$homepageOptions[$key] = $page->title();
+	$parentKey = $page->parentKey();
+	if ($parentKey) {
+		$homepageOptions[$key] = $pagesByParentByKey[PARENT][$parentKey]->title() .'->'. $page->title();
+	} else {
+		$homepageOptions[$key] = $page->title();
+	}
 }
\ No newline at end of file
diff --git a/bl-themes/docs/init.php b/bl-themes/docs/init.php
index f23b3afe..8d4879be 100644
--- a/bl-themes/docs/init.php
+++ b/bl-themes/docs/init.php
@@ -1,2 +1,7 @@
 <?php
-$GITHUB_BASE_URL = 'https://github.com/dignajar/bludit-documentation-english/tree/master/';
\ No newline at end of file
+$GITHUB_BASE_URL = 'https://github.com/dignajar/bludit-documentation-english/tree/master/';
+
+if (!$Site->homepage()) {
+        echo 'This theme need a home page defined, please select one page on <b>Admin panel->Settings->Advanced->Home page</b>';
+        exit;
+}
diff --git a/bl-themes/docs/languages/en_US.json b/bl-themes/docs/languages/en_US.json
index 61375692..ce60c082 100644
--- a/bl-themes/docs/languages/en_US.json
+++ b/bl-themes/docs/languages/en_US.json
@@ -2,11 +2,6 @@
 	"theme-data":
 	{
 		"name": "Docs",
-		"description": "Docs is based on the framework Pure.css. Website: http://purecss.io",
-		"author": "Bludit",
-		"email": "",
-		"website": "http://www.bludit.com",
-		"version": "0.1",
-		"releaseDate": "2015-08-02"
+		"description": "Ideal theme for a site for documentation, this theme use pages and subpages for the correct display and for SEO propose. The Bludit documentation is based on this theme."
 	}
 }
\ No newline at end of file
diff --git a/bl-themes/docs/metadata.json b/bl-themes/docs/metadata.json
index 36aa12a8..17b0d663 100644
--- a/bl-themes/docs/metadata.json
+++ b/bl-themes/docs/metadata.json
@@ -1,10 +1,10 @@
 {
 	"author": "Bludit",
 	"email": "",
-	"website": "https://github.com/dignajar/bludit-themes",
+	"website": "http://themes.bludit.com",
 	"version": "1.0",
-	"releaseDate": "2016-01-15",
+	"releaseDate": "2017-07-10",
 	"license": "MIT",
-	"compatible": "1.3,1.4,1.5beta",
+	"compatible": "2.0",
 	"notes": ""
 }
diff --git a/bl-themes/docs/php/page.php b/bl-themes/docs/php/page.php
index 2369dabd..715cf6be 100644
--- a/bl-themes/docs/php/page.php
+++ b/bl-themes/docs/php/page.php
@@ -1,8 +1,10 @@
 <h1 class="subhead">
 <?php
 	$parentKey = $page->parentKey();
-	echo $pagesByParentByKey[PARENT][$parentKey]->title();
-	echo ' -> ';
+	if ($parentKey) {
+		echo $pagesByParentByKey[PARENT][$parentKey]->title();
+		echo ' -> ';
+	}
 	echo $page->title();
 ?>
 </h1>