diff --git a/bl-kernel/boot/variables.php b/bl-kernel/boot/variables.php
index 2c6eb747..26a31c1a 100644
--- a/bl-kernel/boot/variables.php
+++ b/bl-kernel/boot/variables.php
@@ -57,7 +57,7 @@ define('REMEMBER_COOKIE_TOKEN', 'BLUDITREMEMBERTOKEN');
 define('REMEMBER_COOKIE_EXPIRE_IN_DAYS', 30);
 
 // Filename
-define('FILENAME', 'index.txt');
+define('FILENAME', 'index.md');
 
 // Database date format
 define('DB_DATE_FORMAT', 'Y-m-d H:i:s');
diff --git a/bl-themes/docsx/.travis.yml b/bl-themes/docsx/.travis.yml
deleted file mode 100755
index 18f48b17..00000000
--- a/bl-themes/docsx/.travis.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-sudo:          false
-language:      node_js
-node_js:
-  - "node"
-install:       npm install
-script:
-  - npm test
-  - gulp
-cache:
-  directories:
-    - node_modules
diff --git a/bl-themes/docsx/css/style.css b/bl-themes/docsx/css/style.css
index ececb10a..28a9e93d 100755
--- a/bl-themes/docsx/css/style.css
+++ b/bl-themes/docsx/css/style.css
@@ -6,6 +6,8 @@ html {
 body {
 	/* Margin bottom for footer height */
 	margin-bottom: 60px;
+
+	font-size: .875rem;
 }
 
 /* Footer */
@@ -22,3 +24,29 @@ footer {
 	height: 22px;
 	padding-bottom: 5px;
 }
+
+/* Sidebar */
+.sidebar {
+	position: fixed;
+	top: 0;
+	bottom: 0;
+	left: 0;
+	z-index: 100;
+	padding: 0;
+	box-shadow: inset -1px 0 0 rgba(0, 0, 0, .1);
+}
+
+.sidebar .nav-link {
+	font-weight: 500;
+	color: #333;
+}
+
+.sidebar-sticky {
+	position: -webkit-sticky;
+	position: sticky;
+	top: 48px;
+	height: calc(100vh - 48px);
+	padding-top: .5rem;
+	overflow-x: hidden;
+	overflow-y: auto;
+    }
\ No newline at end of file
diff --git a/bl-themes/docsx/index.php b/bl-themes/docsx/index.php
index 73ab830d..2b378045 100755
--- a/bl-themes/docsx/index.php
+++ b/bl-themes/docsx/index.php
@@ -8,9 +8,6 @@
 	<!-- Load Bludit Plugins: Site Body Begin -->
 	<?php Theme::plugins('siteBodyBegin'); ?>
 
-	<!-- Navbar -->
-	<?php include(THEME_DIR_PHP.'navbar.php'); ?>
-
 	<!-- Content -->
 	<div class="container-fluid">
 		<div class="row">
diff --git a/bl-themes/docsx/php/init.php b/bl-themes/docsx/php/init.php
new file mode 100644
index 00000000..ba2e1f69
--- /dev/null
+++ b/bl-themes/docsx/php/init.php
@@ -0,0 +1,5 @@
+<?php
+
+
+
+?>
\ No newline at end of file
diff --git a/bl-themes/docsx/php/page.php b/bl-themes/docsx/php/page.php
index 08972c8a..47e70d86 100644
--- a/bl-themes/docsx/php/page.php
+++ b/bl-themes/docsx/php/page.php
@@ -1,24 +1,4 @@
-<!-- Post -->
-<div class="card my-5 border-0">
-
-	<!-- Cover image -->
-	<?php if ($page->coverImage()): ?>
-	<img class="card-img-top mb-3 rounded-0" alt="Cover Image" src="<?php echo $page->coverImage(); ?>"/>
-	<?php endif ?>
-
-	<div class="card-body p-0">
-		<!-- Title -->
-		<a class="text-dark" href="<?php echo $page->permalink(); ?>">
-			<h2><?php echo $page->title(); ?></h2>
-		</a>
-
-		<?php if (!$page->static()): ?>
-		<!-- Creation date -->
-		<h6 class="card-subtitle mb-2 text-muted"><?php echo $page->date(); ?></h6>
-		<?php endif ?>
-
-		<!-- Full content -->
-		<?php echo $page->content(); ?>
-	</div>
-
-</div>
\ No newline at end of file
+<main role="main" class="col-md-9 ml-sm-auto col-lg-10 pt-4 px-5">
+<h1><?php echo $page->title(); ?></h1>
+<?php echo $page->content(); ?>
+</main>
\ No newline at end of file
diff --git a/bl-themes/docsx/php/sidebar.php b/bl-themes/docsx/php/sidebar.php
index 409dc6d5..4b0eda7a 100644
--- a/bl-themes/docsx/php/sidebar.php
+++ b/bl-themes/docsx/php/sidebar.php
@@ -1,75 +1,32 @@
 <nav class="col-md-2 d-none d-md-block bg-light sidebar">
-<div class="sidebar-sticky">
-	<ul class="nav flex-column">
-	<li class="nav-item">
-	<a class="nav-link active" href="#">
-		<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-home"><path d="M3 9l9-7 9 7v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z"></path><polyline points="9 22 9 12 15 12 15 22"></polyline></svg>
-		Dashboard <span class="sr-only">(current)</span>
-	</a>
-	</li>
-	<li class="nav-item">
-	<a class="nav-link" href="#">
-		<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-file"><path d="M13 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V9z"></path><polyline points="13 2 13 9 20 9"></polyline></svg>
-		Orders
-	</a>
-	</li>
-	<li class="nav-item">
-	<a class="nav-link" href="#">
-		<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-shopping-cart"><circle cx="9" cy="21" r="1"></circle><circle cx="20" cy="21" r="1"></circle><path d="M1 1h4l2.68 13.39a2 2 0 0 0 2 1.61h9.72a2 2 0 0 0 2-1.61L23 6H6"></path></svg>
-		Products
-	</a>
-	</li>
-	<li class="nav-item">
-	<a class="nav-link" href="#">
-		<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-users"><path d="M17 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2"></path><circle cx="9" cy="7" r="4"></circle><path d="M23 21v-2a4 4 0 0 0-3-3.87"></path><path d="M16 3.13a4 4 0 0 1 0 7.75"></path></svg>
-		Customers
-	</a>
-	</li>
-	<li class="nav-item">
-	<a class="nav-link" href="#">
-		<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-bar-chart-2"><line x1="18" y1="20" x2="18" y2="10"></line><line x1="12" y1="20" x2="12" y2="4"></line><line x1="6" y1="20" x2="6" y2="14"></line></svg>
-		Reports
-	</a>
-	</li>
-	<li class="nav-item">
-	<a class="nav-link" href="#">
-		<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-layers"><polygon points="12 2 2 7 12 12 22 7 12 2"></polygon><polyline points="2 17 12 22 22 17"></polyline><polyline points="2 12 12 17 22 12"></polyline></svg>
-		Integrations
-	</a>
-	</li>
-	</ul>
+	<div class="sidebar-sticky">
+	<?php
+		// Get all pages published
+		$pagesKeys = $dbPages->getPublishedDB();
+		foreach ($pagesKeys as $pageKey) {
+			// Build the page
+			$page = buildPage($pageKey);
+			// If the page is not a child this means the page is main page or parent page
+			if (!$page->isChild()) {
+				echo '<h6>'.$page->title().'</h6>';
 
-	<h6 class="sidebar-heading d-flex justify-content-between align-items-center px-3 mt-4 mb-1 text-muted">
-	<span>Saved reports</span>
-	<a class="d-flex align-items-center text-muted" href="#">
-	<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-plus-circle"><circle cx="12" cy="12" r="10"></circle><line x1="12" y1="8" x2="12" y2="16"></line><line x1="8" y1="12" x2="16" y2="12"></line></svg>
-	</a>
-	</h6>
-	<ul class="nav flex-column mb-2">
-	<li class="nav-item">
-	<a class="nav-link" href="#">
-		<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-file-text"><path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"></path><polyline points="14 2 14 8 20 8"></polyline><line x1="16" y1="13" x2="8" y2="13"></line><line x1="16" y1="17" x2="8" y2="17"></line><polyline points="10 9 9 9 8 9"></polyline></svg>
-		Current month
-	</a>
-	</li>
-	<li class="nav-item">
-	<a class="nav-link" href="#">
-		<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-file-text"><path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"></path><polyline points="14 2 14 8 20 8"></polyline><line x1="16" y1="13" x2="8" y2="13"></line><line x1="16" y1="17" x2="8" y2="17"></line><polyline points="10 9 9 9 8 9"></polyline></svg>
-		Last quarter
-	</a>
-	</li>
-	<li class="nav-item">
-	<a class="nav-link" href="#">
-		<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-file-text"><path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"></path><polyline points="14 2 14 8 20 8"></polyline><line x1="16" y1="13" x2="8" y2="13"></line><line x1="16" y1="17" x2="8" y2="17"></line><polyline points="10 9 9 9 8 9"></polyline></svg>
-		Social engagement
-	</a>
-	</li>
-	<li class="nav-item">
-	<a class="nav-link" href="#">
-		<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-file-text"><path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"></path><polyline points="14 2 14 8 20 8"></polyline><line x1="16" y1="13" x2="8" y2="13"></line><line x1="16" y1="17" x2="8" y2="17"></line><polyline points="10 9 9 9 8 9"></polyline></svg>
-		Year-end sale
-	</a>
-	</li>
-	</ul>
+				// Get all children of the page
+				$childrenKeys = $page->children();
+				// Check if the page has children
+				if ($childrenKeys!==false) {
+					echo '<ul class="nav flex-column">';
+					// Foreach child
+					foreach ($childrenKeys as $childKey) {
+						// Build the child
+						$pageChild = buildPage($childKey);
+						echo '<li class="nav-item">';
+						echo '<a class="nav-link active" href="#">'.$pageChild->title().'</a>';
+						echo '</li>';
+					}
+					echo '</ul>';
+				}
+			}
+		}
+	?>
 	</div>
 </nav>
\ No newline at end of file