diff --git a/site/themes/default/partials/footer.php b/site/themes/default/partials/footer.php
index 7587c81d..5df375fb 100755
--- a/site/themes/default/partials/footer.php
+++ b/site/themes/default/partials/footer.php
@@ -1,3 +1,9 @@
-    <?php Theme::getTemplate('partials/tail'); ?>
+
+    <?php $this->rawilum['themes']->getTemplate('partials/tail'); ?>
+
+    <div class="powered">
+      Powered by <a href="http://rawilum.org">Rawilum</a>
+    </div>
+    </main>
   </body>
 </html>
diff --git a/site/themes/default/partials/head.php b/site/themes/default/partials/head.php
index c46c7ebb..b48e2e6b 100755
--- a/site/themes/default/partials/head.php
+++ b/site/themes/default/partials/head.php
@@ -6,18 +6,19 @@
     <meta name="description" content="">
     <meta name="author" content="">
 
-		<?php Action::run('theme_meta'); ?>
+	<?php $this->rawilum['events']->dispatch('theme_meta'); ?>
 
-		<link rel="shortcut icon" href="<?php echo Url::getBase(); ?>/favicon.ico">
+	<link rel="shortcut icon" href="<?php echo Url::getBase(); ?>/favicon.ico">
 
-		<title><?php echo Config::get('site.title'); ?> | <?php echo Pages::getCurrentPage()['title']; ?></title>
+	<title><?php echo $this->rawilum['config']->get('site.title'); ?> | <?php echo $page['title']; ?></title>
 
     <!-- Bootstrap core CSS -->
-		<link href="<?php echo Url::getBase(); ?>/site/themes/<?php echo Config::get('site.theme'); ?>/node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
+	<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">
 
     <!-- Custom styles for this template -->
-		<link href="<?php echo Url::getBase(); ?>/site/themes/<?php echo Config::get('site.theme'); ?>/assets/css/theme.css" rel="stylesheet">
-		<?php Action::run('theme_header'); ?>
+	<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'); ?>
   </head>
   <body>
-  <?php Theme::getTemplate('partials/navigation'); ?>
+  <?php $this->rawilum['themes']->getTemplate('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 b9be98a3..80adea4e 100755
--- a/site/themes/default/partials/navigation.php
+++ b/site/themes/default/partials/navigation.php
@@ -1 +1,15 @@
-navigation here
+<nav class="navbar navbar-expand-lg navbar-light">
+<div class="container">
+  <a class="navbar-brand" href="#"><?php echo $this->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>
+  <div class="collapse navbar-collapse justify-content-end" id="navbarNav">
+    <ul class="navbar-nav">
+      <li class="nav-item">
+        <a class="nav-link <?php if (Url::getUriSegment(0) == 'home' || Url::getUriSegment(0) == '') echo 'active'; ?>" href="<?php echo Url::getBase(); ?>">Home</a>
+      </li>
+    </ul>
+  </div>
+</div>
+</nav>
diff --git a/site/themes/default/partials/tail.php b/site/themes/default/partials/tail.php
index 64d4c852..4dc154cd 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-katerinasitnikova/themes/<?php echo Config::get('site.theme'); ?>/node_modules/jquery/dist/jquery.slim.min.js"></script>
-<script src="<?php echo Url::getBase(); ?>/site-katerinasitnikova/themes/<?php echo Config::get('site.theme'); ?>/node_modules/bootstrap/dist/js/bootstrap.min.js"></script>
-<?php Action::run('theme_footer'); ?>
+<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'); ?>
