diff --git a/README.md b/README.md
index 3885b1d..d975232 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,8 @@
 # Micro theme for Bludit
 
 ## Compatible
-- Bludit v2.0.x
+- Bludit v3.x
+- Bludit v2.x
 
 ## Author
 - Diego
diff --git a/index.php b/index.php
index 8d08176..10e4697 100755
--- a/index.php
+++ b/index.php
@@ -33,14 +33,14 @@
 			<div class="row">
 				<div class="col-md-10 col-md-offset-1 text-center">
 					<p>
-						<?php echo $Site->footer() ?>
+						<?php echo $site->footer() ?>
 						<br>
 						Powered by <a href="https://www.bludit.com" target="_blank">BLUDIT</a>
 						<?php
-							if (pluginEnabled('RSS')) {
+							if (pluginActivated('pluginRSS')) {
 								echo ' - <a href="'.Theme::rssUrl().'" target="_blank">RSS</a>';
 							}
-							if (pluginEnabled('Sitemap')) {
+							if (pluginActivated('pluginSitemap')) {
 								echo ' - <a href="'.Theme::sitemapUrl().'" target="_blank">Sitemap</a>';
 							}
 						?>
diff --git a/metadata.json b/metadata.json
index 4979202..667a8b3 100644
--- a/metadata.json
+++ b/metadata.json
@@ -2,9 +2,9 @@
 	"author": "Bludit",
 	"email": "",
 	"website": "https://themes.bludit.com",
-	"version": "1.1",
-	"releaseDate": "2017-12-27",
+	"version": "2.0",
+	"releaseDate": "2018-09-08",
 	"license": "MIT",
-	"compatible": "2.0, 2.1",
+	"compatible": "3.0",
 	"notes": ""
 }
\ No newline at end of file
diff --git a/php/head.php b/php/head.php
index 7f70acf..581cd7c 100644
--- a/php/head.php
+++ b/php/head.php
@@ -1,24 +1,30 @@
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<link href="//fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet">
+<meta name="author" content="Bludit CMS">
+
+<!-- Dynamic title tag -->
+<?php echo Theme::metaTags('title'); ?>
+
+<!-- Dynamic description tag -->
+<?php echo Theme::metaTags('description'); ?>
+
+<!-- Include Favicon -->
+<?php echo Theme::favicon('img/favicon.png'); ?>
+
+<!-- Include Bootstrap CSS file bootstrap.css -->
+<?php echo Theme::cssBootstrap(); ?>
+
+<!-- Include CSS Styles from this theme -->
+<?php echo Theme::css('css/style.css'); ?>
+<?php echo Theme::css('css/bludit.css'); ?>
+
 <?php
-	echo Theme::charset('utf-8');
-	echo Theme::viewport('width=device-width, initial-scale=1');
-
-	echo '<meta http-equiv="X-UA-Compatible" content="IE=edge">';
-	echo '<link href="//fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet">';
-
-	echo Theme::headTitle();
-	echo Theme::headDescription();
-
-	echo Theme::favicon('img/favicon.png');
-
-	echo Theme::fontAwesome();
-
-        echo Theme::css('css/style.css');
-	echo Theme::css('css/bludit.css');
-
 	echo '<!--[if lt IE 9]>';
 	echo Theme::js('js/respond.min.js');
 	echo '<![endif]-->';
+?>
 
-        // Load plugins with the hook siteHead
-        Theme::plugins('siteHead');
-?>
\ No newline at end of file
+<!-- Load Bludit Plugins: Site head -->
+<?php Theme::plugins('siteHead'); ?>
diff --git a/php/home.php b/php/home.php
index 8b12765..e07ca68 100644
--- a/php/home.php
+++ b/php/home.php
@@ -1,16 +1,16 @@
 <!-- Section -->
 <section class="content">
-        <?php foreach ($pages as $page): ?>
+        <?php foreach ($content as $page): ?>
                 <article class="page">
-                        <?php if( $page->title() ) { ?>
+                        <?php if($page->title()): ?>
                         <header>
                                 <h2><?php echo $page->title() ?></h2>
                         </header>
-                        <?php } ?>
+                        <?php endif ?>
 
-                        <?php if( $page->coverImage() ) { ?>
-                                <img src="<?php echo $page->coverImage() ?>" alt="<?php echo $page->slug() ?>">
-                        <?php } ?>
+                        <?php if ($page->coverImage()): ?>
+                        <img src="<?php echo $page->coverImage() ?>" alt="<?php echo $page->slug() ?>">
+                        <?php endif ?>
 
                         <?php echo $page->content() ?>
 
diff --git a/php/page.php b/php/page.php
index 5a4e849..3a72773 100644
--- a/php/page.php
+++ b/php/page.php
@@ -6,13 +6,13 @@
                                         <h2><?php echo $page->title() ?></h2>
                                 </a>
 
-                                <?php if( $page->coverImage() ) { ?>
-                                        <img src="<?php echo $page->coverImage() ?>" alt="<?php echo $page->slug() ?>">
-                                <?php } ?>
+                                <?php if($page->coverImage()): ?>
+                                <img src="<?php echo $page->coverImage() ?>" alt="<?php echo $page->slug() ?>">
+                                <?php endif ?>
                         </header>
                         <?php echo $page->content() ?>
                         <footer>
-                                <div class="date"><i class="fa fa-clock-o"></i> <?php echo $page->date() ?></div>
+                                <div class="date"><?php echo $page->date() ?></div>
                         </footer>
                 </article>
 </section>
\ No newline at end of file
diff --git a/php/sidebar.php b/php/sidebar.php
index f9452df..8184918 100644
--- a/php/sidebar.php
+++ b/php/sidebar.php
@@ -1,14 +1,12 @@
 <h1 class="site-title">
-        <a href="<?php echo $Site->url() ?>">
-        <?php echo $Site->title() ?>
+        <a href="<?php echo $site->url() ?>">
+        <?php echo $site->title() ?>
         </a>
 </h1>
 
 <ul class="static-pages">
 	<?php
-		$staticPages = $dbPages->getStaticDB();
-		foreach ($staticPages as $pageKey) {
-			$staticPage = buildPage($pageKey);
+		foreach ($staticContent as $staticPage) {
 			echo '<li>';
 			echo '<a href="'.$staticPage->permalink().'">';
 			echo $staticPage->title();