diff --git a/site/themes/default/index.php b/site/themes/default/index.php
index 1e1573f8..84956f72 100755
--- a/site/themes/default/index.php
+++ b/site/themes/default/index.php
@@ -1,10 +1,3 @@
 <?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 echo $page['content']; ?>
 <?php Rawilum\Templates::display('partials/footer'); ?>
diff --git a/site/themes/default/partials/footer.php b/site/themes/default/partials/footer.php
index 5df375fb..1200db78 100755
--- a/site/themes/default/partials/footer.php
+++ b/site/themes/default/partials/footer.php
@@ -1,5 +1,5 @@
 
-    <?php $this->rawilum['themes']->getTemplate('partials/tail'); ?>
+    <?php Rawilum\Templates::display('partials/tail'); ?>
 
     <div class="powered">
       Powered by <a href="http://rawilum.org">Rawilum</a>
diff --git a/site/themes/default/partials/head.php b/site/themes/default/partials/head.php
index 4af7dd99..e406bdfa 100755
--- a/site/themes/default/partials/head.php
+++ b/site/themes/default/partials/head.php
@@ -6,7 +6,7 @@
     <meta name="description" content="">
     <meta name="author" content="">
 
-	<?php Rawilum\Events::dispatch('theme_meta'); ?>
+	<?php Rawilum\Events::dispatch('onThemeMeta'); ?>
 
 	<link rel="shortcut icon" href="<?php echo Url::getBase(); ?>/favicon.ico">
 
@@ -19,7 +19,7 @@
 
     <!-- Custom styles for this template -->
 	<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'); ?>
+	<?php Rawilum\Events::dispatch('onThemeHeader'); ?>
   </head>
   <body>
   <?php Rawilum\Templates::display('partials/navigation'); ?>
diff --git a/site/themes/default/partials/tail.php b/site/themes/default/partials/tail.php
index e736a412..8d003c4c 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 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'); ?>
+<?php Rawilum\Events::dispatch('onThemeFooter'); ?>
