diff --git a/site/themes/default/index.php b/site/themes/default/index.php
index a2fca6f5..1e1573f8 100755
--- a/site/themes/default/index.php
+++ b/site/themes/default/index.php
@@ -1,3 +1,10 @@
-<?php $this->rawilum['themes']->getTemplate('partials/head'); ?>
-<?php echo $page['content']; ?>
-<?php $this->rawilum['themes']->getTemplate('partials/footer'); ?>
+<?php Rawilum\Templates::display('partials/head'); ?>
+<?php echo Rawilum\readingTime($page['content']); ?>
+<?php echo Rawilum\readingTime($page['content'], [
+    'minute'  => 'Minute!',
+    'minutes' => 'Minutes!',
+    'second'  => 'Second',
+    'seconds' => 'Seconds']);
+?>
+<?php //cho Rawilum\redirect(); ?>
+<?php Rawilum\Templates::display('partials/footer'); ?>
diff --git a/site/themes/default/partials/head.php b/site/themes/default/partials/head.php
index 8a540e0d..4af7dd99 100755
--- a/site/themes/default/partials/head.php
+++ b/site/themes/default/partials/head.php
@@ -6,21 +6,21 @@
     <meta name="description" content="">
     <meta name="author" content="">
 
-	<?php $this->rawilum['events']->dispatch('theme_meta'); ?>
+	<?php Rawilum\Events::dispatch('theme_meta'); ?>
 
 	<link rel="shortcut icon" href="<?php echo Url::getBase(); ?>/favicon.ico">
 
-	<title><?php echo $this->rawilum['config']->get('site.title'); ?> | <?php echo $page['title']; ?></title>
+	<title><?php echo Rawilum\Config::get('site.title'); ?> | <?php echo $page['title']; ?></title>
 
     <link href='https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,600,700' rel='stylesheet' type='text/css'>
 
     <!-- Bootstrap core CSS -->
-	<link href="<?php echo Url::getBase(); ?>/site/themes/<?php echo $this->rawilum['config']->get('site.theme'); ?>/node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
+	<link href="<?php echo Url::getBase(); ?>/site/themes/<?php echo Rawilum\Config::get('site.theme'); ?>/node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
 
     <!-- Custom styles for this template -->
-	<link href="<?php echo Url::getBase(); ?>/site/themes/<?php echo $this->rawilum['config']->get('site.theme'); ?>/assets/css/theme.css" rel="stylesheet">
-	<?php $this->rawilum['events']->dispatch('theme_header'); ?>
+	<link href="<?php echo Url::getBase(); ?>/site/themes/<?php echo Rawilum\Config::get('site.theme'); ?>/assets/css/theme.css" rel="stylesheet">
+	<?php Rawilum\Events::dispatch('theme_header'); ?>
   </head>
   <body>
-  <?php $this->rawilum['themes']->getTemplate('partials/navigation'); ?>
+  <?php Rawilum\Templates::display('partials/navigation'); ?>
   <main role="main" class="container content">
diff --git a/site/themes/default/partials/navigation.php b/site/themes/default/partials/navigation.php
index 9d96af8f..7dc3737d 100755
--- a/site/themes/default/partials/navigation.php
+++ b/site/themes/default/partials/navigation.php
@@ -1,6 +1,6 @@
 <nav class="navbar navbar-expand-lg navbar-light bg-white border-bottom box-shadow">
 <div class="container">
-  <a class="navbar-brand" href="<?php echo Url::getBase(); ?>"><?php echo $this->rawilum['config']->get('site.title'); ?></a>
+  <a class="navbar-brand" href="<?php echo Url::getBase(); ?>"><?php echo Rawilum\Config::get('site.title'); ?></a>
   <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
     <span class="navbar-toggler-icon"></span>
   </button>
diff --git a/site/themes/default/partials/tail.php b/site/themes/default/partials/tail.php
index 4dc154cd..e736a412 100755
--- a/site/themes/default/partials/tail.php
+++ b/site/themes/default/partials/tail.php
@@ -1,3 +1,3 @@
-<script src="<?php echo Url::getBase(); ?>/site/themes/<?php echo $this->rawilum['config']->get('site.theme'); ?>/node_modules/jquery/dist/jquery.slim.min.js"></script>
-<script src="<?php echo Url::getBase(); ?>/site/themes/<?php echo $this->rawilum['config']->get('site.theme'); ?>/node_modules/bootstrap/dist/js/bootstrap.min.js"></script>
-<?php $this->rawilum['events']->dispatch('theme_footer'); ?>
+<script src="<?php echo Url::getBase(); ?>/site/themes/<?php echo Rawilum\Config::get('site.theme'); ?>/node_modules/jquery/dist/jquery.slim.min.js"></script>
+<script src="<?php echo Url::getBase(); ?>/site/themes/<?php echo Rawilum\Config::get('site.theme'); ?>/node_modules/bootstrap/dist/js/bootstrap.min.js"></script>
+<?php Rawilum\Events::dispatch('theme_footer'); ?>
