diff --git a/site/themes/default/views/partials/footer.php b/site/themes/default/views/partials/footer.php
index c2cf0fa7..5dc21ea8 100755
--- a/site/themes/default/views/partials/footer.php
+++ b/site/themes/default/views/partials/footer.php
@@ -1,4 +1,4 @@
-<?php namespace Flextype; ?>
+<?php namespace Flextype ?>
     <?php Themes::view('partials/tail')->display() ?>
     <div class="powered">
       Powered by <a href="http://flextype.org">Flextype</a>
diff --git a/site/themes/default/views/partials/head.php b/site/themes/default/views/partials/head.php
index c92bd571..5ba50910 100755
--- a/site/themes/default/views/partials/head.php
+++ b/site/themes/default/views/partials/head.php
@@ -1,28 +1,26 @@
-<?php
-    namespace Flextype;
-    use Flextype\Component\{Event\Event, Http\Http, Registry\Registry, Assets\Assets, Text\Text, Html\Html};
-?>
+<?php namespace Flextype ?>
+<?php use Flextype\Component\{Event\Event, Http\Http, Registry\Registry, Assets\Assets, Text\Text, Html\Html} ?>
 <!doctype html>
-<html lang="<?= Registry::get('settings.locale'); ?>">
+<html lang="<?= Registry::get('settings.locale') ?>">
   <head>
     <meta charset="<?= Text::lowercase(Registry::get('settings.charset')); ?>">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta name="description" content="<?= (isset($page['description']) ? Html::toText($page['description']) : Html::toText(Registry::get('settings.description'))); ?>">
-    <meta name="keywords" content="<?= (isset($page['keywords']) ? $page['keywords'] : Registry::get('settings.keywords')); ?>">
-    <meta name="robots" content="<?= (isset($page['robots']) ? $page['robots'] : Registry::get('settings.robots')); ?>">
-    <meta name="generator" content="Powered by Flextype <?= Flextype::VERSION; ?>" />
+    <meta name="description" content="<?= (isset($entry['description']) ? Html::toText($entry['description']) : Html::toText(Registry::get('settings.description'))) ?>">
+    <meta name="keywords" content="<?= (isset($entry['keywords']) ? $entry['keywords'] : Registry::get('settings.keywords')) ?>">
+    <meta name="robots" content="<?= (isset($entry['robots']) ? $entry['robots'] : Registry::get('settings.robots')) ?>">
+    <meta name="generator" content="Powered by Flextype <?= Flextype::VERSION ?>" />
 
 	<?php Event::dispatch('onThemeMeta'); ?>
 
-	<title><?= Html::toText($page['title']); ?> | <?= Html::toText(Registry::get('settings.title')); ?></title>
+	<title><?= Html::toText($entry['title']); ?> | <?= Html::toText(Registry::get('settings.title')); ?></title>
 
     <link href='https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,600,700' rel='stylesheet' type='text/css'>
 
-    <?php Assets::add('css', Http::getBaseUrl() . '/site/themes/' . Registry::get('settings.theme') . '/assets/dist/css/bootstrap.min.css', 'site', 1); ?>
-    <?php Assets::add('css', Http::getBaseUrl() . '/site/themes/' . Registry::get('settings.theme') . '/assets/dist/css/simple.min.css', 'site', 2); ?>
+    <?php Assets::add('css', Http::getBaseUrl() . '/site/themes/' . Registry::get('settings.theme') . '/assets/dist/css/bootstrap.min.css', 'site', 1) ?>
+    <?php Assets::add('css', Http::getBaseUrl() . '/site/themes/' . Registry::get('settings.theme') . '/assets/dist/css/simple.min.css', 'site', 2) ?>
     <?php foreach(Assets::get('css', 'site') as $assets_by_priorities): ?>
         <?php foreach($assets_by_priorities as $assets): ?>
-            <link href="<?= $assets['asset']; ?>" rel="stylesheet">
+            <link href="<?= $assets['asset'] ?>" rel="stylesheet">
         <?php endforeach ?>
     <?php endforeach ?>
 
diff --git a/site/themes/default/views/partials/navigation.php b/site/themes/default/views/partials/navigation.php
index 99f65f90..aab37a5c 100755
--- a/site/themes/default/views/partials/navigation.php
+++ b/site/themes/default/views/partials/navigation.php
@@ -1,17 +1,15 @@
-<?php
-    namespace Flextype;
-    use Flextype\Component\{Http\Http, Registry\Registry};
-?>
+<?php namespace Flextype ?>
+<?php use Flextype\Component\{Http\Http, Registry\Registry} ?>
 <nav class="navbar navbar-expand-lg navbar-light bg-white border-bottom box-shadow">
 <div class="container">
-  <a class="navbar-brand" href="<?= Http::getBaseUrl(); ?>"><?= Registry::get('settings.title'); ?></a>
+  <a class="navbar-brand" href="<?= Http::getBaseUrl() ?>"><?= Registry::get('settings.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(Http::getUriSegment(0) == 'home' || Http::getUriSegment(0) == ''): ?>active<?php endif ?>" href="<?= Http::getBaseUrl(); ?>">Home</a>
+        <a class="nav-link <?php if(Http::getUriSegment(0) == 'home' || Http::getUriSegment(0) == ''): ?>active<?php endif ?>" href="<?= Http::getBaseUrl() ?>">Home</a>
       </li>
     </ul>
   </div>
diff --git a/site/themes/default/views/partials/tail.php b/site/themes/default/views/partials/tail.php
index 140371ba..38f43bd4 100755
--- a/site/themes/default/views/partials/tail.php
+++ b/site/themes/default/views/partials/tail.php
@@ -1,11 +1,9 @@
-<?php
-    namespace Flextype;
-    use Flextype\Component\{Event\Event, Http\Http, Registry\Registry, Assets\Assets};
-?>
-<?php Assets::add('js', Http::getBaseUrl() . '/site/themes/' . Registry::get('settings.theme') . '/assets/dist/js/simple.min.js', 'site', 1); ?>
+<?php namespace Flextype ?>
+<?php use Flextype\Component\{Event\Event, Http\Http, Registry\Registry, Assets\Assets} ?>
+<?php Assets::add('js', Http::getBaseUrl() . '/site/themes/' . Registry::get('settings.theme') . '/assets/dist/js/simple.min.js', 'site', 1) ?>
 <?php foreach(Assets::get('js', 'site') as $assets_by_priorities): ?>
     <?php foreach($assets_by_priorities as $assets): ?>
-        <script src="<?= $assets['asset']; ?>"></script>
+        <script src="<?= $assets['asset'] ?>"></script>
     <?php endforeach ?>
 <?php endforeach ?>
 <?php Event::dispatch('onThemeFooter'); ?>
diff --git a/site/themes/default/views/templates/default.php b/site/themes/default/views/templates/default.php
index 01d2c062..ed9f4328 100644
--- a/site/themes/default/views/templates/default.php
+++ b/site/themes/default/views/templates/default.php
@@ -1,4 +1,4 @@
-<?php namespace Flextype; ?>
+<?php namespace Flextype ?>
 <?php Themes::view('partials/head')->display() ?>
-<?= $page['content'] ?>
+<?= $entry['content'] ?>
 <?php Themes::view('partials/footer')->display() ?>
