diff --git a/system/admin/admin.php b/system/admin/admin.php
index 19c2ff2..295a22c 100644
--- a/system/admin/admin.php
+++ b/system/admin/admin.php
@@ -59,7 +59,7 @@ function remove_accent($str)
 }
 
 // Edit blog posts
-function edit_post($title, $tag, $url, $content, $oldfile, $destination = null, $description = null, $date = null)
+function edit_post($title, $tag, $url, $content, $oldfile, $destination = null, $description = null, $date = null, $fi, $vid)
 {
     $oldurl = explode('_', $oldfile);
     if ($date !== null) {
@@ -67,6 +67,8 @@ function edit_post($title, $tag, $url, $content, $oldfile, $destination = null,
     }
 
     $post_title = $title;
+    $post_fi = $fi;
+    $post_vid = $vid;
     $post_tag = preg_replace(array('/[^a-zA-Z0-9,.\-\p{L}]/u', '/[ -]+/', '/^-|-$/'), array('', '-', ''), remove_accent($tag));
     $post_url = strtolower(preg_replace(array('/[^a-zA-Z0-9 \-\p{L}]/u', '/[ -]+/', '/^-|-$/'), array('', '-', ''), remove_accent($url)));
     if ($description !== null) {
@@ -75,6 +77,7 @@ function edit_post($title, $tag, $url, $content, $oldfile, $destination = null,
         $post_description = "";
     }
     $post_content = '<!--t ' . $post_title . ' t-->' . $post_description . "\n\n" . $content;
+    $post_content = '<!--fi ' . $post_fi . ' fi-->' . "\n\n" . '<!--vid ' . $post_vid . ' vid-->' . "\n\n" . $post_content;
 
     if (!empty($post_title) && !empty($post_tag) && !empty($post_url) && !empty($post_content)) {
         if (get_magic_quotes_gpc()) {
@@ -152,11 +155,13 @@ function edit_page($title, $url, $content, $oldfile, $destination = null, $descr
 }
 
 // Add blog post
-function add_post($title, $tag, $url, $content, $user, $description = null)
+function add_post($title, $tag, $url, $content, $user, $description = null, $fi, $vid)
 {
-
+        
     $post_date = date('Y-m-d-H-i-s');
     $post_title = $title;
+    $post_fi = $fi;
+    $post_vid = $vid;
     $post_tag = preg_replace(array('/[^a-zA-Z0-9,.\-\p{L}]/u', '/[ -]+/', '/^-|-$/'), array('', '-', ''), remove_accent($tag));
     $post_url = strtolower(preg_replace(array('/[^a-zA-Z0-9 \-\p{L}]/u', '/[ -]+/', '/^-|-$/'), array('', '-', ''), remove_accent($url)));
     if ($description !== null) {
@@ -165,6 +170,7 @@ function add_post($title, $tag, $url, $content, $user, $description = null)
         $post_description = "";
     }
     $post_content = '<!--t ' . $post_title . ' t-->' . $post_description . "\n\n" . $content;
+    $post_content = '<!--fi ' . $post_fi . ' fi-->' . "\n\n" .  '<!--vid ' . $post_vid . ' vid-->' . "\n\n" . $post_content;
 
     if (!empty($post_title) && !empty($post_tag) && !empty($post_url) && !empty($post_content)) {
         if (get_magic_quotes_gpc()) {
diff --git a/system/admin/views/add-post.html.php b/system/admin/views/add-post.html.php
index 62a9b4a..ee686b5 100644
--- a/system/admin/views/add-post.html.php
+++ b/system/admin/views/add-post.html.php
@@ -13,6 +13,8 @@
 		<span class="help">If the url leave empty we will use the post title.</span><br><br>
 		Meta Description (optional)<br><textarea name="description" maxlength="200"><?php if (isset($p->description)) { echo $p->description;} ?></textarea>
 		<br><br>
+		Featured Image (optional)<br><input type="text" class="text" name="fi" value="<?php if (isset($postFi)) { echo $postFi;} ?>"/><br><br>
+		Embed Youtube Video (optional)<br><input type="text" class="text" name="vid" value="<?php if (isset($postVid)) { echo $postVid;} ?>"/><br><br>		
 		<div id="wmd-button-bar" class="wmd-button-bar"></div>
 		<textarea id="wmd-input" class="wmd-input <?php if (isset($postContent)) { if (empty($postContent)) { echo 'error';}} ?>" name="content" cols="20" rows="10"><?php if (isset($postContent)) { echo $postContent;} ?></textarea><br/>
 		<input type="hidden" name="csrf_token" value="<?php echo get_csrf()?>">
@@ -28,4 +30,4 @@
 	
 	editor.run();
 })();
-</script>
\ No newline at end of file
+</script>
diff --git a/system/admin/views/edit-post.html.php b/system/admin/views/edit-post.html.php
index da9b086..8fe7e76 100644
--- a/system/admin/views/edit-post.html.php
+++ b/system/admin/views/edit-post.html.php
@@ -8,6 +8,8 @@
 
 	$content = file_get_contents($url);
 	$oldtitle = get_content_tag('t',$content,'Untitled');
+	$oldfi = get_content_tag('fi',$content);
+	$oldvid = get_content_tag('vid',$content);
 	$oldcontent = remove_html_comments($content);
 	
 	$dir = substr($url, 0, strrpos($url, '/'));
@@ -52,6 +54,8 @@
 	Date Time<br><input type="date" name="date" class="text" value="<?php echo $timestamp; ?>"><br><input type="time" name="time" class="text" value="<?php echo $time->format('H:i'); ?>"><br><br>
 	Meta Description (optional)<br><textarea name="description" maxlength="200"><?php if (isset($p->description)) { echo $p->description;} ?></textarea>
 	<br><br>
+	Featured Image (optional)<br><input type="text" class="text" name="fi" value="<?php echo $oldfi?>"/><br><br>
+	Embed Youtube Video (optional)<br><input type="text" class="text" name="vid" value="<?php echo $oldvid?>"/><br><br>	
 	<div id="wmd-button-bar" class="wmd-button-bar"></div>
 	<textarea id="wmd-input" class="wmd-input <?php if (isset($postContent)) { if (empty($postContent)) { echo 'error';}} ?>" name="content" cols="20" rows="10"><?php echo $oldcontent ?></textarea><br>
 	<input type="hidden" name="oldfile" class="text" value="<?php echo $url ?>"/>
@@ -68,4 +72,4 @@
 	
 	editor.run();
 })();
-</script>
\ No newline at end of file
+</script>
diff --git a/system/htmly.php b/system/htmly.php
index 8241bfd..c05c01e 100644
--- a/system/htmly.php
+++ b/system/htmly.php
@@ -334,6 +334,8 @@ post('/:year/:month/:name/edit', function () {
     $proper = is_csrf_proper(from($_REQUEST, 'csrf_token'));
 
     $title = from($_REQUEST, 'title');
+    $fi = from($_REQUEST, 'fi');
+    $vid = from($_REQUEST, 'vid');
     $tag = from($_REQUEST, 'tag');
     $url = from($_REQUEST, 'url');
     $content = from($_REQUEST, 'content');
@@ -351,7 +353,7 @@ post('/:year/:month/:name/edit', function () {
         if(empty($url)) {
             $url = $title;
         }
-        edit_post($title, $tag, $url, $content, $oldfile, $destination, $description, $dateTime);
+        edit_post($title, $tag, $url, $content, $oldfile, $destination, $description, $dateTime, $fi, $vid);
     } else {
         $message['error'] = '';
         if (empty($title)) {
@@ -373,6 +375,8 @@ post('/:year/:month/:name/edit', function () {
             'error' => '<ul>' . $message['error'] . '</ul>',
             'oldfile' => $oldfile,
             'postTitle' => $title,
+            'postFi' => $fi,
+            'postVid' => $vid,
             'postTag' => $tag,
             'postUrl' => $url,
             'postContent' => $content,
@@ -875,6 +879,8 @@ post('/add/post', function () {
     $proper = is_csrf_proper(from($_REQUEST, 'csrf_token'));
 
     $title = from($_REQUEST, 'title');
+    $fi = from($_REQUEST, 'fi');
+    $vid = from($_REQUEST, 'vid');
     $tag = from($_REQUEST, 'tag');
     $url = from($_REQUEST, 'url');
     $content = from($_REQUEST, 'content');
@@ -882,10 +888,10 @@ post('/add/post', function () {
     $user = $_SESSION[config("site.url")]['user'];
     if ($proper && !empty($title) && !empty($tag) && !empty($content)) {
         if (!empty($url)) {
-            add_post($title, $tag, $url, $content, $user, $description);
+            add_post($title, $tag, $url, $content, $user, $description, $fi, $vid);
         } else {
             $url = $title;
-            add_post($title, $tag, $url, $content, $user, $description);
+            add_post($title, $tag, $url, $content, $user, $description, $fi, $vid);
         }
     } else {
         $message['error'] = '';
@@ -906,6 +912,8 @@ post('/add/post', function () {
             'head_contents' => head_contents('Add post - ' . blog_title(), blog_description(), site_url()),
             'error' => '<ul>' . $message['error'] . '</ul>',
             'postTitle' => $title,
+            'postFi' => $fi,
+            'postVid' => $vid,
             'postTag' => $tag,
             'postUrl' => $url,
             'postContent' => $content,
@@ -933,6 +941,24 @@ get('/add/page', function () {
     }
 });
 
+// Add the static page
+get('/add/page', function () {
+
+    if (login()) {
+
+        config('views.root', 'system/admin/views');
+
+        render('add-page', array(
+            'head_contents' => head_contents('Add page - ' . blog_title(), blog_description(), site_url()),
+            'bodyclass' => 'addpage',
+            'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; Add page'
+        ));
+    } else {
+        $login = site_url() . 'login';
+        header("location: $login");
+    }
+});
+
 // Get submitted static page data
 post('/add/page', function () {
 
diff --git a/system/includes/functions.php b/system/includes/functions.php
index 73b2390..c495e7a 100644
--- a/system/includes/functions.php
+++ b/system/includes/functions.php
@@ -243,6 +243,8 @@ function get_posts($posts, $page = 1, $perpage = 0)
 
         // Extract the title and body
         $post->title = get_content_tag('t', $content, 'Untitled: ' . date('l jS \of F Y', $post->date));
+        $post->feature = get_content_tag('fi', $content);
+        $post->video = get_content_tag('vid', $content);        
 
         // Get the contents and convert it to HTML
         $post->body = MarkdownExtra::defaultTransform(remove_html_comments($content));
diff --git a/themes/clean/main.html.php b/themes/clean/main.html.php
index 0af2134..aedbe0e 100644
--- a/themes/clean/main.html.php
+++ b/themes/clean/main.html.php
@@ -17,6 +17,16 @@
 		<div class="main">
 			<h2 class="title-index" itemprop="name"><a href="<?php echo $p->url?>"><?php echo $p->title ?></a></h2>
 			<div class="date">
+        <?php if (!empty($p->feature)){?>
+        <div class="featured-image">
+          <a href="<?php echo $p->url?>"><img src="<?php echo $p->feature; ?>" alt="<?php echo $p->title ?>"/></a>
+        </div>
+        <?php }?>
+        <?php if (!empty($p->video)){?>
+        <div class="featured-video">
+          <iframe src="https://www.youtube.com/embed/<?php echo $p->video; ?>" width="560" height="315" frameborder="0" allowfullscreen></iframe>
+        </div>
+        <?php }?>			
 				<span itemprop="datePublished"><?php echo date('d F Y', $p->date)?></span> - Posted in 
 				<span itemprop="articleSection"><?php echo $p->tag ?></span> by 
 				<span itemprop="author"><a href="<?php echo $p->authorurl ?>"><?php echo $p->author ?></a></span>
@@ -45,4 +55,4 @@
 <?php endif;?>
 <?php if (disqus_count()):?>
 	<?php echo disqus_count() ?>
-<?php endif;?>
\ No newline at end of file
+<?php endif;?>
diff --git a/themes/clean/post.html.php b/themes/clean/post.html.php
index 060d1cf..099ea99 100644
--- a/themes/clean/post.html.php
+++ b/themes/clean/post.html.php
@@ -5,6 +5,16 @@
 		<a name="more"></a>
 		<h1 class="title-post" itemprop="name"><?php echo $p->title ?></h1>
 		<div class="date">
+        <?php if (!empty($p->feature)){?>
+        <div class="featured-image">
+          <a href="<?php echo $p->url?>"><img src="<?php echo $p->feature; ?>" alt="<?php echo $p->title ?>"/></a>
+        </div>
+        <?php }?>
+        <?php if (!empty($p->video)){?>
+        <div class="featured-video">
+          <iframe src="https://www.youtube.com/embed/<?php echo $p->video; ?>" width="560" height="315" frameborder="0" allowfullscreen></iframe>
+        </div>
+        <?php }?>		
 			<span itemprop="datePublished"><a href="<?php echo $p->archive ?>" title="Show all posts made on this day"><?php echo date('d F Y', $p->date)?></a></span> - Posted in 
 			<span itemprop="articleSection"><?php echo $p->tag ?></span> by 
 			<span itemprop="author"><a href="<?php echo $p->authorurl ?>"><?php echo $p->author ?></a></span> - 
@@ -45,4 +55,4 @@
 	<?php if (disqus()):?>
 		<?php echo disqus($p->title, $p->url) ?>
 	<?php endif;?>
-</div>
\ No newline at end of file
+</div>
diff --git a/themes/default/main.html.php b/themes/default/main.html.php
index 0af2134..aedbe0e 100644
--- a/themes/default/main.html.php
+++ b/themes/default/main.html.php
@@ -17,6 +17,16 @@
 		<div class="main">
 			<h2 class="title-index" itemprop="name"><a href="<?php echo $p->url?>"><?php echo $p->title ?></a></h2>
 			<div class="date">
+        <?php if (!empty($p->feature)){?>
+        <div class="featured-image">
+          <a href="<?php echo $p->url?>"><img src="<?php echo $p->feature; ?>" alt="<?php echo $p->title ?>"/></a>
+        </div>
+        <?php }?>
+        <?php if (!empty($p->video)){?>
+        <div class="featured-video">
+          <iframe src="https://www.youtube.com/embed/<?php echo $p->video; ?>" width="560" height="315" frameborder="0" allowfullscreen></iframe>
+        </div>
+        <?php }?>			
 				<span itemprop="datePublished"><?php echo date('d F Y', $p->date)?></span> - Posted in 
 				<span itemprop="articleSection"><?php echo $p->tag ?></span> by 
 				<span itemprop="author"><a href="<?php echo $p->authorurl ?>"><?php echo $p->author ?></a></span>
@@ -45,4 +55,4 @@
 <?php endif;?>
 <?php if (disqus_count()):?>
 	<?php echo disqus_count() ?>
-<?php endif;?>
\ No newline at end of file
+<?php endif;?>
diff --git a/themes/default/post.html.php b/themes/default/post.html.php
index 060d1cf..099ea99 100644
--- a/themes/default/post.html.php
+++ b/themes/default/post.html.php
@@ -5,6 +5,16 @@
 		<a name="more"></a>
 		<h1 class="title-post" itemprop="name"><?php echo $p->title ?></h1>
 		<div class="date">
+        <?php if (!empty($p->feature)){?>
+        <div class="featured-image">
+          <a href="<?php echo $p->url?>"><img src="<?php echo $p->feature; ?>" alt="<?php echo $p->title ?>"/></a>
+        </div>
+        <?php }?>
+        <?php if (!empty($p->video)){?>
+        <div class="featured-video">
+          <iframe src="https://www.youtube.com/embed/<?php echo $p->video; ?>" width="560" height="315" frameborder="0" allowfullscreen></iframe>
+        </div>
+        <?php }?>		
 			<span itemprop="datePublished"><a href="<?php echo $p->archive ?>" title="Show all posts made on this day"><?php echo date('d F Y', $p->date)?></a></span> - Posted in 
 			<span itemprop="articleSection"><?php echo $p->tag ?></span> by 
 			<span itemprop="author"><a href="<?php echo $p->authorurl ?>"><?php echo $p->author ?></a></span> - 
@@ -45,4 +55,4 @@
 	<?php if (disqus()):?>
 		<?php echo disqus($p->title, $p->url) ?>
 	<?php endif;?>
-</div>
\ No newline at end of file
+</div>
diff --git a/themes/logs/main.html.php b/themes/logs/main.html.php
index c78f10a..3bf22d9 100644
--- a/themes/logs/main.html.php
+++ b/themes/logs/main.html.php
@@ -17,6 +17,16 @@
 		<div class="main">
 			<h2 class="title-index" itemprop="name"><a href="<?php echo $p->url?>"><?php echo $p->title ?></a></h2>
 			<div class="date">
+        <?php if (!empty($p->feature)){?>
+        <div class="featured-image">
+          <a href="<?php echo $p->url?>"><img src="<?php echo $p->feature; ?>" alt="<?php echo $p->title ?>"/></a>
+        </div>
+        <?php }?>
+        <?php if (!empty($p->video)){?>
+        <div class="featured-video">
+          <iframe src="https://www.youtube.com/embed/<?php echo $p->video; ?>" width="560" height="315" frameborder="0" allowfullscreen></iframe>
+        </div>
+        <?php }?>			
 				<span itemprop="datePublished"><?php echo date('d F Y', $p->date)?></span> - Posted in 
 				<span itemprop="articleSection"><?php echo $p->tag ?></span> by 
 				<span itemprop="author"><a href="<?php echo $p->authorurl ?>"><?php echo $p->author ?></a></span>
@@ -45,4 +55,4 @@
 <?php endif;?>
 <?php if (disqus_count()):?>
 	<?php echo disqus_count() ?>
-<?php endif;?>
\ No newline at end of file
+<?php endif;?>
diff --git a/themes/logs/post.html.php b/themes/logs/post.html.php
index 140782f..f6da39e 100644
--- a/themes/logs/post.html.php
+++ b/themes/logs/post.html.php
@@ -5,6 +5,16 @@
 		<a name="more"></a>
 		<h1 class="title-post" itemprop="name"><?php echo $p->title ?></h1>
 		<div class="date">
+        <?php if (!empty($p->feature)){?>
+        <div class="featured-image">
+          <a href="<?php echo $p->url?>"><img src="<?php echo $p->feature; ?>" alt="<?php echo $p->title ?>"/></a>
+        </div>
+        <?php }?>
+        <?php if (!empty($p->video)){?>
+        <div class="featured-video">
+          <iframe src="https://www.youtube.com/embed/<?php echo $p->video; ?>" width="560" height="315" frameborder="0" allowfullscreen></iframe>
+        </div>
+        <?php }?>		
 			<span itemprop="datePublished"><a href="<?php echo $p->archive ?>" title="Show all posts made on this day"><?php echo date('d F Y', $p->date)?></a></span> - Posted in 
 			<span itemprop="articleSection"><?php echo $p->tag ?></span> by 
 			<span itemprop="author"><a href="<?php echo $p->authorurl ?>"><?php echo $p->author ?></a></span> - 
@@ -45,4 +55,4 @@
 	<?php if (disqus()):?>
 		<?php echo disqus($p->title, $p->url) ?>
 	<?php endif;?>
-</div>
\ No newline at end of file
+</div>