diff --git a/system/htmly.php b/system/htmly.php
index cffeb26..05a3030 100644
--- a/system/htmly.php
+++ b/system/htmly.php
@@ -43,14 +43,6 @@ get('/index', function () {
         
         $front = get_frontpage();
         
-        $tl = strip_tags(blog_tagline());
-
-        if ($tl) {
-            $tagline = ' - ' . $tl;
-        } else {
-            $tagline = '';
-        }
-        
         $pv = $vroot . '/static--front.html.php'; 
         if (file_exists($pv)) {
             $pview = 'static--front';
@@ -59,9 +51,10 @@ get('/index', function () {
         }
             
         render($pview, array(
-            'title' => blog_title() . $tagline,
-            'description' => strip_tags(blog_description()),
+            'title' => generate_title('is_front', null),
+            'description' => safe_html(strip_tags(blog_description())),
             'canonical' => site_url(),
+            'metatags' => generate_meta(null, null),
             'bodyclass' => 'in-front',
             'breadcrumb' => '',
             'p' => $front,
@@ -80,14 +73,6 @@ get('/index', function () {
         $posts = get_posts(null, $page, $perpage);
 
         $total = '';
-
-        $tl = strip_tags(blog_tagline());
-
-        if ($tl) {
-            $tagline = ' - ' . $tl;
-        } else {
-            $tagline = '';
-        }
         
         $pv = $vroot . '/main--front.html.php'; 
         if (file_exists($pv)) {
@@ -100,9 +85,10 @@ get('/index', function () {
 
             // a non-existing page
             render('no-posts', array(
-                'title' => blog_title() . $tagline,
-                'description' => strip_tags(blog_description()),
+                'title' => generate_title('is_front', null),
+                'description' => safe_html(strip_tags(blog_description())),
                 'canonical' => site_url(),
+                'metatags' => generate_meta(null, null),
                 'breadcrumb' => '',
                 'bodyclass' => 'no-posts',
                 'type' => 'is_frontpage',
@@ -113,9 +99,10 @@ get('/index', function () {
         }
 
         render($pview, array(
-            'title' => blog_title() . $tagline,
-            'description' => strip_tags(blog_description()),
+            'title' => generate_title('is_front', null),
+            'description' => safe_html(strip_tags(blog_description())),
             'canonical' => site_url(),
+            'metatags' => generate_meta(null, null),
             'page' => $page,
             'posts' => $posts,
             'bodyclass' => 'in-front',
@@ -146,9 +133,10 @@ post('/login', function () {
             config('views.root', 'system/admin/views');
 
             render('login', array(
-                'title' => i18n('Login') . ' - ' . blog_title(),
+                'title' => generate_title('is_default', i18n('Login')),
                 'description' => i18n('Login') . ' ' . blog_title(),
                 'canonical' => site_url(),
+                'metatags' => generate_meta(null, null),
                 'error' => '<ul>' . $log . '</ul>',
                 'type' => 'is_login',
                 'is_login' => true,
@@ -174,9 +162,10 @@ post('/login', function () {
         config('views.root', 'system/admin/views');
 
         render('login', array(
-            'title' => i18n('Login') . ' - ' . blog_title(),
+            'title' => generate_title('is_default', i18n('Login')),
             'description' => i18n('Login') . ' ' . blog_title(),
             'canonical' => site_url(),
+            'metatags' => generate_meta(null, null),
             'error' => '<ul>' . $message['error'] . '</ul>',
             'username' => $user,
             'password' => $pass,
@@ -242,9 +231,10 @@ get('/author/:name', function ($name) {
 
     if (empty($posts) || $page < 1) {
         render($pview, array(
-            'title' => i18n('Profile_for') . ' ' . $author->name . ' - ' . blog_title(),
+            'title' => generate_title('is_profile', $author),
             'description' => $author->description,
             'canonical' => $author->url,
+            'metatags' => generate_meta('is_profile', $author),
             'page' => $page,
             'posts' => null,
             'about' => $author->about,
@@ -260,9 +250,10 @@ get('/author/:name', function ($name) {
     }
 
     render($pview, array(
-        'title' => i18n('Profile_for') . ' ' . $author->name . ' - ' . blog_title(),
+        'title' => generate_title('is_profile', $author),
         'description' => $author->description,
         'canonical' => $author->url,
+        'metatags' => generate_meta('is_profile', $author),
         'page' => $page,
         'posts' => $posts,
         'about' => $author->about,
@@ -302,9 +293,10 @@ get('/edit/profile', function () {
 
         config('views.root', 'system/admin/views');
         render('edit-page', array(
-            'title' => i18n('Edit_profile') . ' - ' . blog_title(),
-            'description' => strip_tags(blog_description()),
+            'title' => generate_title('is_default', i18n('Edit_profile')),
+            'description' => safe_html(strip_tags(blog_description())),
             'canonical' => site_url(),
+            'metatags' => generate_meta(null, null),
             'type' => 'is_profile',
             'is_admin' => true,
             'bodyclass' => 'edit-profile',
@@ -340,9 +332,10 @@ post('/edit/profile', function () {
         config('views.root', 'system/admin/views');
 
         render('edit-page', array(
-            'title' => 'Edit profile - ' . blog_title(),
-            'description' => strip_tags(blog_description()),
+            'title' => generate_title('is_default', 'Edit profile'),
+            'description' => safe_html(strip_tags(blog_description())),
             'canonical' => site_url(),
+            'metatags' => generate_meta(null, null),
             'error' => '<ul>' . $message['error'] . '</ul>',
             'postTitle' => $title,
             'postContent' => $content,
@@ -361,9 +354,10 @@ get('/edit/frontpage', function () {
 
         config('views.root', 'system/admin/views');
         render('edit-page', array(
-            'title' => 'Edit frontpage - ' . blog_title(),
-            'description' => strip_tags(blog_description()),
+            'title' => generate_title('is_default', 'Edit frontpage'),
+            'description' => safe_html(strip_tags(blog_description())),
             'canonical' => site_url(),
+            'metatags' => generate_meta(null, null),
             'type' => 'is_frontpage',
             'is_admin' => true,
             'bodyclass' => 'edit-frontpage',
@@ -399,9 +393,10 @@ post('/edit/frontpage', function () {
         config('views.root', 'system/admin/views');
 
         render('edit-page', array(
-            'title' => 'Edit frontpage - ' . blog_title(),
-            'description' => strip_tags(blog_description()),
+            'title' => generate_title('is_default', 'Edit frontpage'),
+            'description' => safe_html(strip_tags(blog_description())),
             'canonical' => site_url(),
+            'metatags' => generate_meta(null, null),
             'error' => '<ul>' . $message['error'] . '</ul>',
             'postTitle' => $title,
             'postContent' => $content,
@@ -441,9 +436,10 @@ get('/add/content', function () {
         config('views.root', 'system/admin/views');
 
         render('add-content', array(
-            'title' => i18n('Add_new_post') . ' - ' . blog_title(),
-            'description' => strip_tags(blog_description()),
+            'title' => generate_title('is_default', i18n('Add_new_post')),
+            'description' => safe_html(strip_tags(blog_description())),
             'canonical' => site_url(),
+            'metatags' => generate_meta(null, null),
             'type' => $type,
             'is_admin' => true,
             'bodyclass' => 'add-content',
@@ -588,9 +584,10 @@ post('/add/content', function () {
         
         config('views.root', 'system/admin/views');
         render('add-content', array(
-            'title' => i18n('Add_content') . ' - ' . blog_title(),
-            'description' => strip_tags(blog_description()),
+            'title' => generate_title('is_default', i18n('Add_content')),
+            'description' => safe_html(strip_tags(blog_description())),
             'canonical' => site_url(),
+            'metatags' => generate_meta(null, null),
             'error' => '<ul>' . $message['error'] . '</ul>',
             'postTitle' => $title,
             'postImage' => $image,
@@ -618,9 +615,10 @@ get('/add/page', function () {
         config('views.root', 'system/admin/views');
 
         render('add-page', array(
-            'title' => i18n('Add_new_page') . ' - ' . blog_title(),
-            'description' => strip_tags(blog_description()),
+            'title' => generate_title('is_default', i18n('Add_new_page')),
+            'description' => safe_html(strip_tags(blog_description())),
             'canonical' => site_url(),
+            'metatags' => generate_meta(null, null),
             'type' => 'is_page',
             'is_admin' => true,
             'bodyclass' => 'add-page',
@@ -662,9 +660,10 @@ post('/add/page', function () {
         }
         config('views.root', 'system/admin/views');
         render('add-page', array(
-            'title' => i18n('Add_new_page') . ' - ' . blog_title(),
-            'description' => strip_tags(blog_description()),
+            'title' => generate_title('is_default', i18n('Add_new_page')),
+            'description' => safe_html(strip_tags(blog_description())),
             'canonical' => site_url(),
+            'metatags' => generate_meta(null, null),
             'error' => '<ul>' . $message['error'] . '</ul>',
             'postTitle' => $title,
             'postUrl' => $url,
@@ -685,9 +684,10 @@ get('/add/category', function () {
         config('views.root', 'system/admin/views');
 
         render('add-page', array(
-            'title' =>i18n('Add_category') . ' - ' . blog_title(),
-            'description' => strip_tags(blog_description()),
+            'title' => generate_title('is_default', i18n('Add_category')),
+            'description' => safe_html(strip_tags(blog_description())),
             'canonical' => site_url(),
+            'metatags' => generate_meta(null, null),
             'type' => 'is_category',
             'is_admin' => true,
             'bodyclass' => 'add-category',
@@ -728,9 +728,10 @@ post('/add/category', function () {
         }
         config('views.root', 'system/admin/views');
         render('add-page', array(
-            'title' => i18n('Add_category') . ' - ' . blog_title(),
-            'description' => strip_tags(blog_description()),
+            'title' => generate_title('is_default', i18n('Add_category')),
+            'description' => safe_html(strip_tags(blog_description())),
             'canonical' => site_url(),
+            'metatags' => generate_meta(null, null),
             'error' => '<ul>' . $message['error'] . '</ul>',
             'postTitle' => $title,
             'postUrl' => $url,
@@ -766,9 +767,10 @@ get('/admin/posts', function () {
 
                 // a non-existing page
                 render('no-posts', array(
-                    'title' => i18n('All_blog_posts') . ' - ' . blog_title(),
-                    'description' => strip_tags(blog_description()),
+                    'title' => generate_title('is_default', i18n('All_blog_posts')),
+                    'description' => safe_html(strip_tags(blog_description())),
                     'canonical' => site_url(),
+                    'metatags' => generate_meta(null, null),
                     'bodyclass' => 'no-posts',
                     'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; ' . i18n('All_blog_posts')
                 ));
@@ -776,18 +778,11 @@ get('/admin/posts', function () {
                 die;
             }
 
-            $tl = strip_tags(blog_tagline());
-
-            if ($tl) {
-                $tagline = ' - ' . $tl;
-            } else {
-                $tagline = '';
-            }
-
             render('posts-list', array(
-                'title' => i18n('All_blog_posts') . ' - ' . blog_title(),
-                'description' => strip_tags(blog_description()),
+                'title' => generate_title('is_default', i18n('All_blog_posts')),
+                'description' => safe_html(strip_tags(blog_description())),
                 'canonical' => site_url(),
+                'metatags' => generate_meta(null, null),
                 'heading' => i18n('All_blog_posts'),
                 'page' => $page,
                 'posts' => $posts,
@@ -799,9 +794,10 @@ get('/admin/posts', function () {
             ));
         } else {
             render('denied', array(
-                'title' => i18n('All_blog_posts') . ' - ' . blog_title(),
-                'description' => strip_tags(blog_description()),
+                'title' => generate_title('is_default', i18n('All_blog_posts')),
+                'description' => safe_html(strip_tags(blog_description())),
                 'canonical' => site_url(),
+                'metatags' => generate_meta(null, null),
                 'type' => 'is_admin-posts',
                 'is_admin' => true,
                 'bodyclass' => 'denied',
@@ -836,9 +832,10 @@ get('/admin/popular', function () {
 
                 // a non-existing page
                 render('no-posts', array(
-                    'title' => i18n('Popular_posts') . ' - ' . blog_title(),
-                    'description' => strip_tags(blog_description()),
+                    'title' => generate_title('is_default', i18n('Popular_posts')),
+                    'description' => safe_html(strip_tags(blog_description())),
                     'canonical' => site_url(),
+                    'metatags' => generate_meta(null, null),
                     'is_admin' => true,
                     'bodyclass' => 'admin-popular',
                     'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; ' . i18n('Popular_posts')
@@ -847,18 +844,11 @@ get('/admin/popular', function () {
                 die;
             }
 
-            $tl = strip_tags(blog_tagline());
-
-            if ($tl) {
-                $tagline = ' - ' . $tl;
-            } else {
-                $tagline = '';
-            }
-
             render('popular-posts', array(
-                'title' => i18n('Popular_posts') .  ' - ' . blog_title(),
-                'description' => strip_tags(blog_description()),
+                'title' => generate_title('is_default', i18n('Popular_posts')),
+                'description' => safe_html(strip_tags(blog_description())),
                 'canonical' => site_url(),
+                'metatags' => generate_meta(null, null),
                 'heading' => i18n('Popular_posts'),
                 'page' => $page,
                 'posts' => $posts,
@@ -869,9 +859,10 @@ get('/admin/popular', function () {
             ));
         } else {
             render('denied', array(
-                'title' => i18n('Popular_posts') . ' - ' . blog_title(),
-                'description' => strip_tags(blog_description()),
+                'title' => generate_title('is_default', i18n('Popular_posts')),
+                'description' => safe_html(strip_tags(blog_description())),
                 'canonical' => site_url(),
+                'metatags' => generate_meta(null, null),
                 'is_admin' => true,
                 'bodyclass' => 'denied',
                 'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; ' . i18n('Popular_posts')
@@ -910,9 +901,10 @@ get('/admin/mine', function () {
 
         if (empty($posts) || $page < 1) {
             render('user-posts', array(
-                'title' => i18n('My_posts') . ' - ' . blog_title(),
-                'description' => strip_tags(blog_description()),
+                'title' => generate_title('is_default', i18n('My_posts')),
+                'description' => safe_html(strip_tags(blog_description())),
                 'canonical' => site_url(),
+                'metatags' => generate_meta(null, null),
                 'page' => $page,
                 'heading' => i18n('My_posts'),
                 'posts' => null,
@@ -928,9 +920,10 @@ get('/admin/mine', function () {
         }
 
         render('user-posts', array(
-            'title' => i18n('My_posts') . ' - ' . blog_title(),
-            'description' => strip_tags(blog_description()),
+            'title' => generate_title('is_default', i18n('My_posts')),
+            'description' => safe_html(strip_tags(blog_description())),
             'canonical' => site_url(),
+            'metatags' => generate_meta(null, null),
             'heading' => i18n('My_posts'),
             'page' => $page,
             'posts' => $posts,
@@ -979,9 +972,10 @@ get('/admin/draft', function () {
 
         if (empty($posts) || $page < 1) {
             render('user-draft', array(
-                'title' => i18n('My_draft') . ' - ' . blog_title(),
-                'description' => strip_tags(blog_description()),
+                'title' => generate_title('is_default', i18n('My_draft')),
+                'description' => safe_html(strip_tags(blog_description())),
                 'canonical' => site_url(),
+                'metatags' => generate_meta(null, null),
                 'page' => $page,
                 'heading' => i18n('My_draft'),
                 'posts' => null,
@@ -999,9 +993,10 @@ get('/admin/draft', function () {
         }
         
         render('user-draft', array(
-            'title' => i18n('My_draft') . ' - ' . blog_title(),
-            'description' => strip_tags(blog_description()),
+            'title' => generate_title('is_default', i18n('My_draft')),
+            'description' => safe_html(strip_tags(blog_description())),
             'canonical' => site_url(),
+            'metatags' => generate_meta(null, null),
             'heading' => i18n('My_draft'),
             'page' => $page,
             'posts' => $posts,
@@ -1048,9 +1043,10 @@ get('/admin/scheduled', function () {
 
         if (empty($posts) || $page < 1) {
             render('scheduled', array(
-                'title' => i18n('Scheduled_posts') . ' - ' . blog_title(),
-                'description' => strip_tags(blog_description()),
+                'title' => generate_title('is_default', i18n('Scheduled_posts')),
+                'description' => safe_html(strip_tags(blog_description())),
                 'canonical' => site_url(),
+                'metatags' => generate_meta(null, null),
                 'page' => $page,
                 'heading' => i18n('Scheduled_posts'),
                 'posts' => null,
@@ -1066,9 +1062,10 @@ get('/admin/scheduled', function () {
         }
 
         render('scheduled', array(
-            'title' => i18n('Scheduled_posts') . ' - ' . blog_title(),
-            'description' => strip_tags(blog_description()),
+            'title' => generate_title('is_default', i18n('Scheduled_posts')),
+            'description' => safe_html(strip_tags(blog_description())),
             'canonical' => site_url(),
+            'metatags' => generate_meta(null, null),
             'heading' => i18n('Scheduled_posts'),
             'page' => $page,
             'posts' => $posts,
@@ -1091,9 +1088,10 @@ get('/admin/content', function () {
     if (login()) {
         config('views.root', 'system/admin/views');
         render('content-type', array(
-            'title' => i18n('Add_content') . ' - ' . blog_title(),
-            'description' => strip_tags(blog_description()),
+            'title' => generate_title('is_default', i18n('Add_content')),
+            'description' => safe_html(strip_tags(blog_description())),
             'canonical' => site_url(),
+            'metatags' => generate_meta(null, null),
             'type' => 'is_admin-content',
             'is_admin' => true,
             'bodyclass' => 'admin-content',
@@ -1111,9 +1109,10 @@ get('/admin/pages', function () {
     if (login()) {
         config('views.root', 'system/admin/views');
         render('static-pages', array(
-            'title' => i18n('Static_pages') . ' - ' . blog_title(),
-            'description' => strip_tags(blog_description()),
+            'title' => generate_title('is_default', i18n('Static_pages')),
+            'description' => safe_html(strip_tags(blog_description())),
             'canonical' => site_url(),
+            'metatags' => generate_meta(null, null),
             'type' => 'is_admin-pages',
             'is_admin' => true,
             'bodyclass' => 'admin-pages',
@@ -1168,9 +1167,10 @@ get('/admin/pages/:static', function ($static)
             $post = $post['current'];
             
             render('static-subpages', array(
-                'title' => $post->title . ' - ' . blog_title(),
+                'title' => generate_title('is_default', $post->title),
                 'description' => $post->description,
                 'canonical' => $post->url,
+                'metatags' => generate_meta(null, null),
                 'bodyclass' => 'in-page ' . strtolower($static),
                 'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; ' . '<a href="'. site_url() .'admin/pages">' .i18n('pages').'</a> &#187; ' . $post->title,
                 'p' => $post,
@@ -1182,9 +1182,10 @@ get('/admin/pages/:static', function ($static)
             ));
         } else {
             render('denied', array(
-                'title' => 'Pages - ' . blog_title(),
-                'description' => strip_tags(blog_description()),
+                'title' => generate_title('is_default', 'Pages'),
+                'description' => safe_html(strip_tags(blog_description())),
                 'canonical' => site_url(),
+                'metatags' => generate_meta(null, null),
                 'type' => 'is_admin-pages',
                 'is_admin' => true,
                 'bodyclass' => 'denied',
@@ -1212,9 +1213,10 @@ get('/admin/import', function () {
     if (login()) {
         config('views.root', 'system/admin/views');
         render('import', array(
-            'title' => i18n('Import_Feed') . ' - ' . blog_title(),
-            'description' => strip_tags(blog_description()),
+            'title' => generate_title('is_default', i18n('Import_Feed')),
+            'description' => safe_html(strip_tags(blog_description())),
             'canonical' => site_url(),
+            'metatags' => generate_meta(null, null),
             'type' => 'is_admin-import',
             'is_admin' => true,
             'bodyclass' => 'admin-import',
@@ -1244,9 +1246,10 @@ post('/admin/import', function () {
             config('views.root', 'system/admin/views');
 
             render('import', array(
-                'title' => i18n('Import_Feed') . ' - ' . blog_title(),
-                'description' => strip_tags(blog_description()),
+                'title' => generate_title('is_default', i18n('Import_Feed')),
+                'description' => safe_html(strip_tags(blog_description())),
                 'canonical' => site_url(),
+                'metatags' => generate_meta(null, null),
                 'error' => '<ul>' . $log . '</ul>',
                 'type' => 'is_admin-import',
                 'is_admin' => true,
@@ -1266,9 +1269,10 @@ post('/admin/import', function () {
         config('views.root', 'system/admin/views');
 
         render('import', array(
-            'title' => i18n('Import_Feed') . ' - ' . blog_title(),
-            'description' => strip_tags(blog_description()),
+            'title' => generate_title('is_default', i18n('Import_Feed')),
+            'description' => safe_html(strip_tags(blog_description())),
             'canonical' => site_url(),
+            'metatags' => generate_meta(null, null),
             'error' => '<ul>' . $message['error'] . '</ul>',
             'url' => $url,
             'type' => 'is_admin-import',
@@ -1289,9 +1293,10 @@ get('/admin/config', function () {
         config('views.root', 'system/admin/views');
         if ($role === 'admin') {
             render('config', array(
-                'title' => i18n('Config') . ' - ' . blog_title(),
-                'description' => strip_tags(blog_description()),
+                'title' => generate_title('is_default', i18n('Config')),
+                'description' => safe_html(strip_tags(blog_description())),
                 'canonical' => site_url(),
+                'metatags' => generate_meta(null, null),
                 'type' => 'is_admin-config',
                 'is_admin' => true,
                 'bodyclass' => 'admin-config',
@@ -1299,9 +1304,10 @@ get('/admin/config', function () {
             ));
         } else {
             render('denied', array(
-                'title' => i18n('Config') . ' - ' . blog_title(),
-                'description' => strip_tags(blog_description()),
+                'title' => generate_title('is_default', i18n('Config')),
+                'description' => safe_html(strip_tags(blog_description())),
                 'canonical' => site_url(),
+                'metatags' => generate_meta(null, null),
                 'type' => 'is_admin-config',
                 'is_admin' => true,
                 'bodyclass' => 'denied',
@@ -1358,9 +1364,10 @@ get('/admin/config/custom', function () {
         config('views.root', 'system/admin/views');
         if ($role === 'admin') {
             render('config-custom', array(
-                'title' => i18n('Config') . ' - ' . blog_title(),
-                'description' => strip_tags(blog_description()),
+                'title' => generate_title('is_default', i18n('Config')),
+                'description' => safe_html(strip_tags(blog_description())),
                 'canonical' => site_url(),
+                'metatags' => generate_meta(null, null),
                 'type' => 'is_admin-config',
                 'is_admin' => true,
                 'bodyclass' => 'admin-config',
@@ -1368,9 +1375,10 @@ get('/admin/config/custom', function () {
             ));
         } else {
             render('denied', array(
-                'title' => i18n('Config') . ' - ' . blog_title(),
-                'description' => strip_tags(blog_description()),
+                'title' => generate_title('is_default', i18n('Config')),
+                'description' => safe_html(strip_tags(blog_description())),
                 'canonical' => site_url(),
+                'metatags' => generate_meta(null, null),
                 'type' => 'is_admin-config',
                 'is_admin' => true,
                 'bodyclass' => 'denied',
@@ -1426,9 +1434,10 @@ get('/admin/config/reading', function () {
         config('views.root', 'system/admin/views');
         if ($role === 'admin') {
             render('config-reading', array(
-                'title' => i18n('Config') . ' - ' . blog_title(),
-                'description' => strip_tags(blog_description()),
+                'title' => generate_title('is_default', i18n('Config')),
+                'description' => safe_html(strip_tags(blog_description())),
                 'canonical' => site_url(),
+                'metatags' => generate_meta(null, null),
                 'type' => 'is_admin-config',
                 'is_admin' => true,
                 'bodyclass' => 'admin-config',
@@ -1436,9 +1445,10 @@ get('/admin/config/reading', function () {
             ));
         } else {
             render('denied', array(
-                'title' => i18n('Config') . '- ' . blog_title(),
-                'description' => strip_tags(blog_description()),
+                'title' => generate_title('is_default', i18n('Config')),
+                'description' => safe_html(strip_tags(blog_description())),
                 'canonical' => site_url(),
+                'metatags' => generate_meta(null, null),
                 'type' => 'is_admin-config',
                 'is_admin' => true,
                 'bodyclass' => 'denied',
@@ -1493,9 +1503,10 @@ get('/admin/config/widget', function () {
         config('views.root', 'system/admin/views');
         if ($role === 'admin') {
             render('config-widget', array(
-                'title' => i18n('Config') . '- ' . blog_title(),
-                'description' => strip_tags(blog_description()),
+                'title' => generate_title('is_default', i18n('Config')),
+                'description' => safe_html(strip_tags(blog_description())),
                 'canonical' => site_url(),
+                'metatags' => generate_meta(null, null),
                 'type' => 'is_admin-config',
                 'is_admin' => true,
                 'bodyclass' => 'admin-config',
@@ -1503,9 +1514,10 @@ get('/admin/config/widget', function () {
             ));
         } else {
             render('denied', array(
-                'title' => i18n('Config') . ' - ' . blog_title(),
-                'description' => strip_tags(blog_description()),
+                'title' => generate_title('is_default', i18n('Config')),
+                'description' => safe_html(strip_tags(blog_description())),
                 'canonical' => site_url(),
+                'metatags' => generate_meta(null, null),
                 'type' => 'is_admin-config',
                 'is_admin' => true,
                 'bodyclass' => 'denied',
@@ -1563,9 +1575,10 @@ get('/admin/config/metatags', function () {
         config('views.root', 'system/admin/views');
         if ($role === 'admin') {
             render('config-metatags', array(
-                'title' => i18n('Config') . ' - ' . blog_title(),
-                'description' => strip_tags(blog_description()),
+                'title' => generate_title('is_default', i18n('Config')),
+                'description' => safe_html(strip_tags(blog_description())),
                 'canonical' => site_url(),
+                'metatags' => generate_meta(null, null),
                 'type' => 'is_admin-config',
                 'is_admin' => true,
                 'bodyclass' => 'admin-config',
@@ -1573,9 +1586,10 @@ get('/admin/config/metatags', function () {
             ));
         } else {
             render('denied', array(
-                'title' => i18n('Config') . '- ' . blog_title(),
-                'description' => strip_tags(blog_description()),
+                'title' => generate_title('is_default', i18n('Config')),
+                'description' => safe_html(strip_tags(blog_description())),
                 'canonical' => site_url(),
+                'metatags' => generate_meta(null, null),
                 'type' => 'is_admin-config',
                 'is_admin' => true,
                 'bodyclass' => 'denied',
@@ -1630,9 +1644,10 @@ get('/admin/config/performance', function () {
         config('views.root', 'system/admin/views');
         if ($role === 'admin') {
             render('config-performance', array(
-                'title' => i18n('Config') . ' - ' . blog_title(),
-                'description' => strip_tags(blog_description()),
+                'title' => generate_title('is_default', i18n('Config')),
+                'description' => safe_html(strip_tags(blog_description())),
                 'canonical' => site_url(),
+                'metatags' => generate_meta(null, null),
                 'type' => 'is_admin-config',
                 'is_admin' => true,
                 'bodyclass' => 'admin-config',
@@ -1640,9 +1655,10 @@ get('/admin/config/performance', function () {
             ));
         } else {
             render('denied', array(
-                'title' => i18n('Config') . ' - ' . blog_title(),
-                'description' => strip_tags(blog_description()),
+                'title' => generate_title('is_default', i18n('Config')),
+                'description' => safe_html(strip_tags(blog_description())),
                 'canonical' => site_url(),
+                'metatags' => generate_meta(null, null),
                 'type' => 'is_admin-config',
                 'is_admin' => true,
                 'bodyclass' => 'denied',
@@ -1692,9 +1708,10 @@ get('/admin/backup', function () {
     if (login()) {
         config('views.root', 'system/admin/views');
         render('backup', array(
-            'title' => i18n('Backup') . ' - ' . blog_title(),
-            'description' => strip_tags(blog_description()),
+            'title' => generate_title('is_default', i18n('Backup')),
+            'description' => safe_html(strip_tags(blog_description())),
             'canonical' => site_url(),
+            'metatags' => generate_meta(null, null),
             'type' => 'is_admin-backup',
             'is_admin' => true,
             'bodyclass' => 'admin-backup',
@@ -1712,9 +1729,10 @@ get('/admin/backup-start', function () {
     if (login()) {
         config('views.root', 'system/admin/views');
         render('backup-start', array(
-            'title' => i18n('Create_backup') . ' - ' . blog_title(),
-            'description' => strip_tags(blog_description()),
+            'title' => generate_title('is_default', i18n('Create_backup')),
+            'description' => safe_html(strip_tags(blog_description())),
             'canonical' => site_url(),
+            'metatags' => generate_meta(null, null),
             'type' => 'is_admin-backup-start',
             'is_admin' => true,
             'bodyclass' => 'admin-backup-start',
@@ -1732,9 +1750,10 @@ get('/admin/clear-cache', function () {
     if (login()) {
         config('views.root', 'system/admin/views');
         render('clear-cache', array(
-            'title' => i18n('Clear_cache') . ' - ' . blog_title(),
-            'description' => strip_tags(blog_description()),
+            'title' => generate_title('is_default', i18n('Clear_cache')),
+            'description' => safe_html(strip_tags(blog_description())),
             'canonical' => site_url(),
+            'metatags' => generate_meta(null, null),
             'type' => 'is_admin-clear-cache',
             'is_admin' => true,
             'bodyclass' => 'admin-clear-cache',
@@ -1752,9 +1771,10 @@ get('/admin/update', function () {
     if (login()) {
         config('views.root', 'system/admin/views');
         render('update', array(
-            'title' => i18n('Check_update') . ' - ' . blog_title(),
-            'description' => strip_tags(blog_description()),
+            'title' => generate_title('is_default', i18n('Check_update')),
+            'description' => safe_html(strip_tags(blog_description())),
             'canonical' => site_url(),
+            'metatags' => generate_meta(null, null),
             'type' => 'is_admin-update',
             'is_admin' => true,
             'bodyclass' => 'admin-update',
@@ -1778,9 +1798,10 @@ get('/admin/update/now/:csrf', function ($CSRF) {
         $updater->update();
         config('views.root', 'system/admin/views');
         render('updated-to', array(
-            'title' => i18n('Update') . ' - ' . blog_title(),
-            'description' => strip_tags(blog_description()),
+            'title' => generate_title('is_default', i18n('Update')),
+            'description' => safe_html(strip_tags(blog_description())),
             'canonical' => site_url(),
+            'metatags' => generate_meta(null, null),
             'info' => $updater->getCurrentInfo(),
             'type' => 'is_admin-update',
             'is_admin' => true,
@@ -1798,9 +1819,10 @@ get('/admin/menu', function () {
     if (login()) {
         config('views.root', 'system/admin/views');
         render('menu', array(
-            'title' => i18n('Menus') . ' - ' . blog_title(),
-            'description' => strip_tags(blog_description()),
+            'title' => generate_title('is_default', i18n('Menus')),
+            'description' => safe_html(strip_tags(blog_description())),
             'canonical' => site_url(),
+            'metatags' => generate_meta(null, null),
             'type' => 'is_admin-menu',
             'is_admin' => true,
             'bodyclass' => 'admin-menu',
@@ -1838,9 +1860,10 @@ get('/admin/categories', function () {
     if (login()) {
         config('views.root', 'system/admin/views');
         render('categories', array(
-            'title' => i18n('Categories') . ' - ' . blog_title(),
-            'description' => strip_tags(blog_description()),
+            'title' => generate_title('is_default', i18n('Categories')),
+            'description' => safe_html(strip_tags(blog_description())),
             'canonical' => site_url(),
+            'metatags' => generate_meta(null, null),
             'type' => 'is_admin-categories',
             'is_admin' => true,
             'bodyclass' => 'admin-categories',
@@ -1887,9 +1910,10 @@ get('/admin/categories/:category', function ($category) {
             $total = $desc->count;
             
             render('category-list', array(
-                'title' => $desc->title . ' - ' . blog_title(),
+                'title' => generate_title('is_default', $desc->title),
                 'description' => $desc->description,
                 'canonical' => $desc->url,
+                'metatags' => generate_meta(null, null),
                 'page' => $page,
                 'posts' => $posts,
                 'category' => $desc,
@@ -1900,9 +1924,10 @@ get('/admin/categories/:category', function ($category) {
             ));
         } else {
             render('denied', array(
-                'title' => 'Categories - ' . blog_title(),
-                'description' => strip_tags(blog_description()),
+                'title' => generate_title('is_default', 'Categories'),
+                'description' => safe_html(strip_tags(blog_description())),
                 'canonical' => site_url(),
+                'metatags' => generate_meta(null, null),
                 'type' => 'is_admin-categories',
                 'is_admin' => true,
                 'bodyclass' => 'denied',
@@ -1974,9 +1999,10 @@ get('/category/:category', function ($category) {
     }
     
     render($pview, array(
-        'title' => $desc->title . ' - ' . blog_title(),
+        'title' => generate_title('is_category', $desc),
         'description' => $desc->description,
         'canonical' => $desc->url,
+        'metatags' => generate_meta('is_category', $desc),
         'page' => $page,
         'posts' => $posts,
         'category' => $desc,
@@ -2020,9 +2046,10 @@ get('/category/:category/edit', function ($category) {
         $post = $post[0];
 
         render('edit-page', array(
-            'title' => i18n('Edit_category') . ' - ' . blog_title(),
-            'description' => strip_tags(blog_description()),
+            'title' => generate_title('is_default', i18n('Edit_category')),
+            'description' => safe_html(strip_tags(blog_description())),
             'canonical' => site_url(),
+            'metatags' => generate_meta(null, null),
             'type' => 'is_category',
             'is_admin' => true,
             'bodyclass' => 'edit-category',
@@ -2073,9 +2100,10 @@ post('/category/:category/edit', function () {
         config('views.root', 'system/admin/views');
 
         render('edit-page', array(
-            'title' => i18n('Edit_category') . ' - ' . blog_title(),
-            'description' => strip_tags(blog_description()),
+            'title' => generate_title('is_default', i18n('Edit_category')),
+            'description' => safe_html(strip_tags(blog_description())),
             'canonical' => site_url(),
+            'metatags' => generate_meta(null, null),
             'error' => '<ul>' . $message['error'] . '</ul>',
             'oldfile' => $oldfile,
             'postTitle' => $title,
@@ -2104,9 +2132,10 @@ get('/category/:category/delete', function ($category) {
         $post = $post[0];
 
         render('delete-category', array(
-            'title' => i18n('Delete') . ' ' . i18n('Category') . ' - ' . blog_title(),
-            'description' => strip_tags(blog_description()),
+            'title' => generate_title('is_default', i18n('Delete') . ' ' . i18n('Category')),
+            'description' => safe_html(strip_tags(blog_description())),
             'canonical' => site_url(),
+            'metatags' => generate_meta(null, null),
             'type' => 'is_category',
             'is_admin' => true,
             'bodyclass' => 'delete-category',
@@ -2161,6 +2190,7 @@ get('/type/:type', function ($type) {
     $ttype->url = site_url() . 'type/' . strtolower($type);
     $ttype->count = $total;
     $ttype->description = i18n('Posts_with_type') . ' ' . ucfirst($type) . ' ' . i18n('by') . ' ' . blog_title();
+    $ttype->body = $ttype->description;
 
     if (empty($posts) || $page < 1) {
         // a non-existing page
@@ -2190,9 +2220,10 @@ get('/type/:type', function ($type) {
     }
     
     render($pview, array(
-        'title' => i18n('Posts_with_type') . ' ' . ucfirst($type) . ' - ' . blog_title(),
-        'description' => i18n('Posts_with_type') . ' ' . ucfirst($type) . ' ' . i18n('by') . ' ' . blog_title(),
-        'canonical' => site_url() . 'type/' . strtolower($type),
+        'title' => generate_title('is_type', $ttype),
+        'description' => $ttype->description,
+        'canonical' => $ttype->url,
+        'metatags' => generate_meta('is_type', $ttype),
         'page' => $page,
         'posts' => $posts,
         'type' => $ttype,
@@ -2244,6 +2275,7 @@ get('/tag/:tag', function ($tag) {
     $ttag->url = site_url() . 'tag/' . strtolower($tag);
     $ttag->count = $total;
     $ttag->description = i18n('All_posts_tagged') . ' ' . tag_i18n($tag) . ' ' . i18n('by') . ' ' . blog_title();
+    $ttag->body = $ttag->description;
 
     if (empty($posts) || $page < 1) {
         // a non-existing page
@@ -2273,9 +2305,10 @@ get('/tag/:tag', function ($tag) {
     }
     
     render($pview, array(
-        'title' => i18n('Posts_tagged') . ' ' . tag_i18n($tag) . ' - ' . blog_title(),
-        'description' => i18n('All_posts_tagged') . ' ' . tag_i18n($tag) . ' ' . i18n('by') . ' ' . blog_title(),
-        'canonical' => site_url() . 'tag/' . strtolower($tag),
+        'title' => generate_title('is_tag', $ttag),
+        'description' => $ttag->description,
+        'canonical' => $ttag->url,
+        'metatags' => generate_meta('is_tag', $ttag),
         'page' => $page,
         'posts' => $posts,
         'tag' => $ttag,
@@ -2343,7 +2376,8 @@ get('/archive/:req', function ($req) {
     $tarchive->url = site_url() . 'archive/' . $req;
     $tarchive->count = $total;
     $tarchive->description = i18n('Archive_page_for') . ' ' . $timestamp . ' ' . i18n('by') . ' ' . blog_title();
- 
+    $tarchive->body = $tarchive->description;
+
     if (!$date) {
         // a non-existing page
         not_found();
@@ -2366,9 +2400,10 @@ get('/archive/:req', function ($req) {
     }
 
     render($pview, array(
-        'title' => i18n('Archive_for') . ' ' . $timestamp . ' - ' . blog_title(),
-        'description' => i18n('Archive_page_for') . ' ' . $timestamp . ' ' . i18n('by') . ' ' . blog_title(),
-        'canonical' => site_url() . 'archive/' . $req,
+        'title' => generate_title('is_archive', $tarchive),
+        'description' => $tarchive->description,
+        'canonical' => $tarchive->url,
+        'metatags' => generate_meta('is_archive', $tarchive),
         'page' => $page,
         'posts' => $posts,
         'archive' => $tarchive,
@@ -2431,7 +2466,8 @@ get('/search/:keyword', function ($keyword) {
     $tsearch->url = site_url() . 'search/' . strtolower($keyword);
     $tsearch->count = $total;
     $tsearch->description = i18n('Search_results_for') . ' ' . $keyword . ' ' . i18n('by') . ' ' . blog_title();
-    
+    $tsearch->body = $tsearch->description;
+
     $vroot = rtrim(config('views.root'), '/');
     
     $lt = $vroot . '/layout--search.html.php'; 
@@ -2446,6 +2482,8 @@ get('/search/:keyword', function ($keyword) {
         render('404-search', array(
             'title' => i18n('Search_results_not_found') . ' - ' . blog_title(),
             'description' => i18n('Search_results_not_found'),
+            'canonical' => site_url(),
+            'metatags' => generate_meta(null, null),
             'search' => $tsearch,
             'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; ' . i18n('No_search_results'),
             'canonical' => site_url(),
@@ -2463,9 +2501,10 @@ get('/search/:keyword', function ($keyword) {
     }
 
     render($pview, array(
-        'title' => i18n('Search_results_for') . ' ' . $keyword . ' - ' . blog_title(),
-        'description' => i18n('Search_results_for') . ' ' . $keyword . ' ' . i18n('by') . ' ' . blog_title(),
-        'canonical' => site_url() . 'search/' . strtolower($keyword),
+        'title' => generate_title('is_search', $tsearch),
+        'description' => $tsearch->description,
+        'canonical' => $tsearch->url,
+        'metatags' => generate_meta('is_search', $tsearch),
         'page' => $page,
         'posts' => $posts,
         'search' => $tsearch,
@@ -2624,9 +2663,10 @@ get('/post/:name', function ($name) {
     }
 
     render($pview, array(
-        'title' => $current->title . ' - ' . blog_title(),
+        'title' => generate_title('is_post', $current),
         'description' => $current->description,
         'canonical' => $current->url,
+        'metatags' => generate_meta('is_post', $current),
         'p' => $current,
         'post' => $current,
         'author' => $author,
@@ -2680,9 +2720,10 @@ get('/post/:name/edit', function ($name) {
         
         if ($user === $current->author || $role === 'admin') {
             render('edit-content', array(
-                'title' => $current->title .' - '. blog_title(),
-                'description' => strip_tags(blog_description()),
+                'title' => generate_title('is_default', $current->title),
+                'description' => safe_html(strip_tags(blog_description())),
                 'canonical' => site_url(),
+                'metatags' => generate_meta(null, null),
                 'p' => $current,
                 'post' => $current,
                 'type' => $type,
@@ -2692,9 +2733,10 @@ get('/post/:name/edit', function ($name) {
             ));
         } else {
             render('denied', array(
-                'title' => $current->title .' - '. blog_title(),
-                'description' => strip_tags(blog_description()),
+                'title' => generate_title('is_default', $current->title),
+                'description' => safe_html(strip_tags(blog_description())),
                 'canonical' => site_url(),
+                'metatags' => generate_meta(null, null),
                 'p' => $current,
                 'post' => $current,
                 'bodyclass' => 'denied',
@@ -2831,9 +2873,10 @@ post('/post/:name/edit', function () {
         config('views.root', 'system/admin/views');
 
         render('edit-content', array(
-            'title' => $title . ' - ' .  blog_title(),
-            'description' => strip_tags(blog_description()),
+            'title' => generate_title('is_default', $title),
+            'description' => safe_html(strip_tags(blog_description())),
             'canonical' => site_url(),
+            'metatags' => generate_meta(null, null),
             'error' => '<ul>' . $message['error'] . '</ul>',
             'oldfile' => $oldfile,
             'postTitle' => $title,
@@ -2885,9 +2928,10 @@ get('/post/:name/delete', function ($name) {
 
         if ($user === $current->author || $role === 'admin') {
             render('delete-post', array(
-                'title' => i18n('Delete') . ' - ' . blog_title(),
-                'description' => strip_tags(blog_description()),
+                'title' => generate_title('is_default', i18n('Delete')),
+                'description' => safe_html(strip_tags(blog_description())),
                 'canonical' => site_url(),
+                'metatags' => generate_meta(null, null),
                 'p' => $current,
                 'post' => $current,
                 'is_admin' => true,
@@ -2896,9 +2940,10 @@ get('/post/:name/delete', function ($name) {
             ));
         } else {
             render('denied', array(
-                'title' => 'Delete post - ' . blog_title(),
-                'description' => strip_tags(blog_description()),
+                'title' => generate_title('is_default', 'Delete post'),
+                'description' => safe_html(strip_tags(blog_description())),
                 'canonical' => site_url(),
+                'metatags' => generate_meta(null, null),
                 'p' => $current,
                 'post' => $current,
                 'is_admin' => true,
@@ -2945,9 +2990,10 @@ get('/:static', function ($static) {
         if (login()) {
             config('views.root', 'system/admin/views');
             render('main', array(
-                'title' => i18n('Admin') . ' - ' . blog_title(),
-                'description' => strip_tags(blog_description()),
+                'title' => generate_title('is_default', i18n('Admin')),
+                'description' => safe_html(strip_tags(blog_description())),
                 'canonical' => site_url(),
+                'metatags' => generate_meta(null, null),
                 'bodyclass' => 'admin-front',
                 'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; ' . i18n('Admin')
             ));
@@ -2960,9 +3006,10 @@ get('/:static', function ($static) {
         if (session_status() == PHP_SESSION_NONE) session_start();
         config('views.root', 'system/admin/views');
         render('login', array(
-            'title' => i18n('Login').  ' - ' . blog_title(),
+            'title' => generate_title('is_default', i18n('Login')),
             'description' => 'Login page from ' . blog_title() . '.',
             'canonical' => site_url() . '/login',
+            'metatags' => generate_meta(null, null),
             'bodyclass' => 'in-login',
             'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; ' . i18n('Login')
         ));
@@ -2971,9 +3018,10 @@ get('/:static', function ($static) {
         if (login()) {
             config('views.root', 'system/admin/views');
             render('logout', array(
-                'title' => i18n('Logout') . ' - ' . blog_title(),
-                'description' => strip_tags(blog_description()),
+                'title' => generate_title('is_default', i18n('Logout')),
+                'description' => safe_html(strip_tags(blog_description())),
                 'canonical' => site_url(),
+                'metatags' => generate_meta(null, null),
                 'bodyclass' => 'in-logout',
                 'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; ' . i18n('Logout')
             ));
@@ -2997,14 +3045,6 @@ get('/:static', function ($static) {
         $posts = get_posts(null, $page, $perpage);
 
         $total = '';
-
-        $tl = strip_tags(blog_tagline());
-
-        if ($tl) {
-            $tagline = ' - ' . $tl;
-        } else {
-            $tagline = '';
-        }
         
         $vroot = rtrim(config('views.root'), '/');
         
@@ -3026,9 +3066,10 @@ get('/:static', function ($static) {
 
             // a non-existing page
             render('no-posts', array(
-                'title' => 'Blog - ' . blog_title(),
+                'title' => generate_title('is_blog', null),
                 'description' => blog_title() . ' Blog',
                 'canonical' => site_url(),
+                'metatags' => generate_meta('is_blog', null),
                 'bodyclass' => 'no-posts',
                 'is_front' => true,
             ), $layout);
@@ -3037,9 +3078,10 @@ get('/:static', function ($static) {
         }
 
         render($pview, array(
-            'title' => 'Blog - ' . blog_title(),
+            'title' => generate_title('is_blog', null),
             'description' => blog_title() . ' Blog',
             'canonical' => site_url() . 'blog',
+            'metatags' => generate_meta('is_blog', null),
             'page' => $page,
             'posts' => $posts,
             'bodyclass' => 'in-blog',
@@ -3105,9 +3147,10 @@ get('/:static', function ($static) {
         }
 
         render($pview, array(
-            'title' => $post->title . ' - ' . blog_title(),
+            'title' => generate_title('is_page', $post),
             'description' => $post->description,
             'canonical' => $post->url,
+            'metatags' => generate_meta('is_page', $post),
             'bodyclass' => 'in-page ' . strtolower($static),
             'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; ' . $post->title,
             'p' => $post,
@@ -3136,9 +3179,10 @@ get('/:static/add', function ($static) {
         $post = $post['current'];
 
         render('add-page', array(
-            'title' => i18n('Add_new_page') . ' - ' . blog_title(),
-            'description' => strip_tags(blog_description()),
+            'title' => generate_title('is_default', i18n('Add_new_page')),
+            'description' => safe_html(strip_tags(blog_description())),
             'canonical' => site_url(),
+            'metatags' => generate_meta(null, null),
             'type' => 'is_page',
             'is_admin' => true,
             'bodyclass' => 'add-page',
@@ -3180,9 +3224,10 @@ post('/:static/add', function ($static) {
         }
         config('views.root', 'system/admin/views');
         render('add-page', array(
-            'title' => i18n('Add_new_page') . ' - ' . blog_title(),
-            'description' => strip_tags(blog_description()),
+            'title' => generate_title('is_default', i18n('Add_new_page')),
+            'description' => safe_html(strip_tags(blog_description())),
             'canonical' => site_url(),
+            'metatags' => generate_meta(null, null),
             'error' => '<ul>' . $message['error'] . '</ul>',
             'postTitle' => $title,
             'postUrl' => $url,
@@ -3215,9 +3260,10 @@ get('/:static/edit', function ($static) {
         }
 
         render('edit-page', array(
-            'title' => i18n('Edit') .  ': ' . $post->title . ' - ' . blog_title(),
-            'description' => strip_tags(blog_description()),
+            'title' => generate_title('is_default', i18n('Edit') .  ': ' . $post->title),
+            'description' => safe_html(strip_tags(blog_description())),
             'canonical' => site_url(),
+            'metatags' => generate_meta(null, null),
             'bodyclass' => 'edit-page',
             'is_admin' => true,
             'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; <a href="'. site_url() .'admin/pages">' .i18n('pages').'</a> &#187; ' . $post->title,
@@ -3269,9 +3315,10 @@ post('/:static/edit', function () {
         config('views.root', 'system/admin/views');
 
         render('edit-page', array(
-            'title' => i18n('Edit') .  ': ' . $post->title . ' - ' . blog_title(),
-            'description' => strip_tags(blog_description()),
+            'title' => generate_title('is_default', i18n('Edit') .  ': ' . $post->title),
+            'description' => safe_html(strip_tags(blog_description())),
             'canonical' => site_url(),
+            'metatags' => generate_meta(null, null),
             'error' => '<ul>' . $message['error'] . '</ul>',
             'oldfile' => $oldfile,
             'postTitle' => $title,
@@ -3304,9 +3351,10 @@ get('/:static/delete', function ($static) {
         }
 
         render('delete-page', array(
-            'title' => i18n('Delete') . ': ' . $post->title . ' - ' . blog_title(),
-            'description' => strip_tags(blog_description()),
+            'title' => generate_title('is_default', i18n('Delete') . ': ' . $post->title),
+            'description' => safe_html(strip_tags(blog_description())),
             'canonical' => site_url(),
+            'metatags' => generate_meta(null, null),
             'bodyclass' => 'delete-page',
             'is_admin' => true,
             'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; ' . i18n('Delete') . ': ' . $post->title,
@@ -3406,9 +3454,10 @@ get('/:static/:sub', function ($static, $sub) {
     }
 
     render($pview, array(
-        'title' => $post->title . ' - ' . blog_title(),
+        'title' => generate_title('is_subpage', $post),
         'description' => $post->description,
         'canonical' => $post->url,
+        'metatags' => generate_meta('is_subpage', $post),
         'bodyclass' => 'in-page ' . strtolower($static) . ' ' . strtolower($sub) ,
         'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; <a href="' . $parent_post['current']->url . '">' . $parent_post['current']->title . '</a> &#187; ' . $post->title,
         'p' => $post,
@@ -3449,9 +3498,10 @@ get('/:static/:sub/edit', function ($static, $sub) {
         }
 
         render('edit-page', array(
-            'title' => i18n('Edit') . ': ' . $page->title . ' - ' . blog_title(),
-            'description' => strip_tags(blog_description()),
+            'title' => generate_title('is_default', i18n('Edit') . ': ' . $page->title),
+            'description' => safe_html(strip_tags(blog_description())),
             'canonical' => site_url(),
+            'metatags' => generate_meta(null, null),
             'bodyclass' => 'edit-page',
             'is_admin' => true,
             'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; <a href="' . site_url() . 'admin/pages/' . $post->slug . '">' . $post->title . '</a> &#187; ' . $page->title,
@@ -3506,9 +3556,10 @@ post('/:static/:sub/edit', function ($static, $sub) {
         config('views.root', 'system/admin/views');
 
         render('edit-page', array(
-            'title' => i18n('Edit') . ': ' . $page->title . ' - ' . blog_title(),
-            'description' => strip_tags(blog_description()),
+            'title' => generate_title('is_default', i18n('Edit') . ': ' . $page->title),
+            'description' => safe_html(strip_tags(blog_description())),
             'canonical' => site_url(),
+            'metatags' => generate_meta(null, null),
             'error' => '<ul>' . $message['error'] . '</ul>',
             'oldfile' => $oldfile,
             'postTitle' => $title,
@@ -3551,9 +3602,10 @@ get('/:static/:sub/delete', function ($static, $sub) {
         }
 
         render('delete-page', array(
-            'title' => i18n('Delete') . ': ' . $page->title . ' - ' . blog_title(),
-            'description' => strip_tags(blog_description()),
+            'title' => generate_title('is_default', i18n('Delete') . ': ' . $page->title),
+            'description' => safe_html(strip_tags(blog_description())),
             'canonical' => site_url(),
+            'metatags' => generate_meta(null, null),
             'bodyclass' => 'delete-page',
             'is_admin' => true,
             'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; <a href="' . site_url() . 'admin/pages/' . $post->slug . '">' . $post->title . '</a> &#187; ' . $page->title,
@@ -3674,9 +3726,10 @@ get('/:year/:month/:name', function ($year, $month, $name) {
     }
     
     render($pview, array(
-        'title' => $current->title . ' - ' . blog_title(),
+        'title' => generate_title('is_post', $current),
         'description' => $current->description,
         'canonical' => $current->url,
+        'metatags' => generate_meta('is_post', $current),
         'p' => $current,
         'post' => $current,
         'author' => $author,
@@ -3730,9 +3783,10 @@ get('/:year/:month/:name/edit', function ($year, $month, $name) {
         
         if ($user === $current->author || $role === 'admin') {
             render('edit-content', array(
-                'title' => $current->title .' - '. blog_title(),
-                'description' => strip_tags(blog_description()),
+                'title' => generate_title('is_default', $current->title),
+                'description' => safe_html(strip_tags(blog_description())),
                 'canonical' => site_url(),
+                'metatags' => generate_meta(null, null),
                 'p' => $current,
                 'post' => $current,
                 'type' => $type,
@@ -3742,9 +3796,10 @@ get('/:year/:month/:name/edit', function ($year, $month, $name) {
             ));
         } else {
             render('denied', array(
-                'title' => $current->title .' - '. blog_title(),
-                'description' => strip_tags(blog_description()),
+                'title' => generate_title('is_default', $current->title),
+                'description' => safe_html(strip_tags(blog_description())),
                 'canonical' => site_url(),
+                'metatags' => generate_meta(null, null),
                 'p' => $current,
                 'post' => $current,
                 'bodyclass' => 'denied',
@@ -3881,9 +3936,10 @@ post('/:year/:month/:name/edit', function () {
         config('views.root', 'system/admin/views');
 
         render('edit-content', array(
-            'title' => $title . ' - ' .  blog_title(),
-            'description' => strip_tags(blog_description()),
+            'title' => generate_title('is_default', $title),
+            'description' => safe_html(strip_tags(blog_description())),
             'canonical' => site_url(),
+            'metatags' => generate_meta(null, null),
             'error' => '<ul>' . $message['error'] . '</ul>',
             'oldfile' => $oldfile,
             'postTitle' => $title,
@@ -3929,9 +3985,10 @@ get('/:year/:month/:name/delete', function ($year, $month, $name) {
 
         if ($user === $current->author || $role === 'admin') {
             render('delete-post', array(
-                'title' => i18n('Delete') . ' - ' . blog_title(),
-                'description' => strip_tags(blog_description()),
+                'title' => generate_title('is_default', i18n('Delete')),
+                'description' => safe_html(strip_tags(blog_description())),
                 'canonical' => site_url(),
+                'metatags' => generate_meta(null, null),
                 'p' => $current,
                 'post' => $current,
                 'bodyclass' => 'delete-post',
@@ -3940,9 +3997,10 @@ get('/:year/:month/:name/delete', function ($year, $month, $name) {
             ));
         } else {
             render('denied', array(
-                'title' => i18n('Delete') . ' - ' . blog_title(),
-                'description' => strip_tags(blog_description()),
+                'title' => generate_title('is_default', i18n('Delete')),
+                'description' => safe_html(strip_tags(blog_description())),
                 'canonical' => site_url(),
+                'metatags' => generate_meta(null, null),
                 'p' => $current,
                 'post' => $current,
                 'bodyclass' => 'delete-post',
diff --git a/system/includes/functions.php b/system/includes/functions.php
index 8750c40..f538494 100644
--- a/system/includes/functions.php
+++ b/system/includes/functions.php
@@ -569,7 +569,7 @@ function get_pages($pages, $page = 1, $perpage = 0)
     }
 
     $tmp = array();
-	
+    
     $auto = config('toc.automatic');
     $counter = config('views.counter');
     
@@ -648,7 +648,7 @@ function get_subpages($sub_pages, $page = 1, $perpage = 0)
     }
 
     $tmp = array();
-	
+    
     $auto = config('toc.automatic');
     $counter = config('views.counter');
     
@@ -3409,20 +3409,17 @@ function head_contents()
     $wmt_id = config('google.wmt.id');
     $version = 'HTMLy ' . constant('HTMLY_VERSION');
 
-    $favicon = '<link rel="icon" type="image/x-icon" href="' . site_url() . 'favicon.ico" />';
-    $charset = '<meta charset="utf-8" />';
-    $generator = '<meta name="generator" content="' . $version . '" />';
-    $xua = '<meta http-equiv="X-UA-Compatible" content="IE=edge" />';
-    $viewport = '<meta name="viewport" content="width=device-width, initial-scale=1" />';
-    $sitemap = '<link rel="sitemap" href="' . site_url() . 'sitemap.xml" />';
-    $feed = '<link rel="alternate" type="application/rss+xml" title="' . blog_title() . ' Feed" href="' . site_url() . 'feed/rss" />';
-    $webmasterTools = '';
+    $output .= '<meta charset="utf-8" />' . "\n";
+    $output .= '<meta http-equiv="X-UA-Compatible" content="IE=edge" />' . "\n";
+    $output .= '<meta name="viewport" content="width=device-width, initial-scale=1" />' . "\n";
+    $output .= '<meta name="generator" content="' . $version . '" />' . "\n";
+    $output .= '<link rel="icon" type="image/x-icon" href="' . site_url() . 'favicon.ico" />' . "\n";
+    $output .= '<link rel="sitemap" href="' . site_url() . 'sitemap.xml" />' . "\n";
+    $output .= '<link rel="alternate" type="application/rss+xml" title="' . blog_title() . ' Feed" href="' . site_url() . 'feed/rss" />' . "\n";
     if (!empty($wmt_id)) {
-        $webmasterTools = '<meta name="google-site-verification" content="' . $wmt_id . '" />';
+        $output .=  '<meta name="google-site-verification" content="' . $wmt_id . '" />' . "\n";
     }
 
-    $output .= $charset . "\n" . $xua . "\n" . $viewport . "\n" . $generator . "\n" . $favicon . "\n" . $sitemap . "\n" . $feed . "\n" . $webmasterTools . "\n";
-
     return $output;
 }
 
@@ -3712,3 +3709,129 @@ function automatic_toc($content, $id)
     $content = implode('</p>', $exp);
     return $content;
 }
+
+function generate_title($type = null, $object = null) 
+{
+    if ($type == 'is_front') {
+        $format = '%blog_title% - %blog_tagline%';
+        $var_map = array('%blog_title%' => blog_title(), '%blog_tagline%' => blog_tagline(), '%blog_description%' => blog_description());
+        $var = strtr($format, $var_map);
+        return strip_tags($var);
+    } elseif ($type == 'is_post') {
+        $format = '%post_title% - %blog_title%';
+        $var_map = array('%blog_title%' => blog_title(), '%blog_tagline%' => blog_tagline(), '%blog_description%' => blog_description(), '%post_title%' => $object->title, '%post_description%' => $object->description, '%post_category%' => $object->categoryTitle, '%post_tag%' => $object->tag, '%post_author%' => $object->authorName, '%post_type%' => ucfirst($object->type));
+        $var = strtr($format, $var_map);
+        return strip_tags($var);
+    } elseif ($type == 'is_page' || $type == 'is_subpage') {
+        $format = '%page_title% - %blog_title%';
+        $var_map = array('%blog_title%' => blog_title(), '%blog_tagline%' => blog_tagline(), '%blog_description%' => blog_description(), '%page_title%' => $object->title, '%page_description%' => $object->description);
+        $var = strtr($format, $var_map);
+        return strip_tags($var);
+    } elseif ($type == 'is_profile') {
+        $format = '%author_name% - %blog_title%';
+        $var_map = array('%blog_title%' => blog_title(), '%blog_tagline%' => blog_tagline(), '%blog_description%' => blog_description(), '%author_name%' => $object->title, '%author_description%' => $object->description);
+        $var = strtr($format, $var_map);
+        return strip_tags($var);
+    } elseif ($type == 'is_category') {
+        $format = '%category_title% - %blog_title%';
+        $var_map = array('%blog_title%' => blog_title(), '%blog_tagline%' => blog_tagline(), '%blog_description%' => blog_description(), '%category_title%' => $object->title, '%category_description%' => $object->description);
+        $var = strtr($format, $var_map);
+        return strip_tags($var);
+    } elseif ($type == 'is_tag') {
+        $format = '%tag_title% - %blog_title%';
+        $var_map = array('%blog_title%' => blog_title(), '%blog_tagline%' => blog_tagline(), '%blog_description%' => blog_description(), '%tag_title%' => $object->title, '%tag_description%' => $object->description);
+        $var = strtr($format, $var_map);
+        return strip_tags($var);
+    } elseif ($type == 'is_archive') {
+        $format = '%archive_title% - %blog_title%';
+        $var_map = array('%blog_title%' => blog_title(), '%blog_tagline%' => blog_tagline(), '%blog_description%' => blog_description(), '%archive_title%' => $object->title, '%archive_description%' => $object->description);
+        $var = strtr($format, $var_map);
+        return strip_tags($var);
+    } elseif ($type == 'is_search') {
+        $format = '%search_title% - %blog_title%';
+        $var_map = array('%blog_title%' => blog_title(), '%blog_tagline%' => blog_tagline(), '%blog_description%' => blog_description(), '%search_title%' => $object->title, '%search_description%' => $object->description);
+        $var = strtr($format, $var_map);
+        return strip_tags($var);
+    } elseif ($type == 'is_type') {
+        $format = '%type_title% - %blog_title%';
+        $var_map = array('%blog_title%' => blog_title(), '%blog_tagline%' => blog_tagline(), '%blog_description%' => blog_description(), '%type_title%' => $object->title, '%type_description%' => $object->description);
+        $var = strtr($format, $var_map);
+        return strip_tags($var);
+    } elseif ($type == 'is_blog') {
+        $format = 'Blog - %blog_title%';
+        $var_map = array('%blog_title%' => blog_title(), '%blog_tagline%' => blog_tagline(), '%blog_description%' => blog_description());
+        $var = strtr($format, $var_map);
+        return strip_tags($var);
+    } elseif ($type == 'is_default') {
+        $format = '%page_title% - %blog_title%';
+        $var_map = array('%blog_title%' => blog_title(), '%blog_tagline%' => blog_tagline(), '%blog_description%' => blog_description(), '%page_title%' => $object);
+        $var = strtr($format, $var_map);
+        return strip_tags($var);
+    }
+}
+
+function generate_meta($type = null, $object = null) 
+{
+    $tags = '';
+    $defaultImg = config('default.image');
+    if (empty($defaultImg)) {
+        $defaultImg = site_url() . 'system/resources/images/logo-big.png';
+    }
+    $facebook = config('social.facebook');
+    $twitter = config('social.twitter');
+    if (is_null($object)) {
+        $tags .= '<meta property="og:locale" content="'. config('language') .'" />' . "\n";
+        $tags .= '<meta property="og:type" content="website" />' . "\n";
+        $tags .= '<meta property="og:site_name" content="'. blog_title() . '" />' . "\n";
+        if ($type == 'is_blog') {
+            $tags .= '<meta property="og:title" content="'. generate_title('is_blog', null) . '" />' . "\n";
+        } else {
+            $tags .= '<meta property="og:title" content="'. generate_title('is_front', null) . '" />' . "\n";
+        }
+        $tags .= '<meta property="og:url" content="'. site_url() .'" />' . "\n";
+        $tags .= '<meta property="og:description" content="'. blog_description() .'" />' . "\n";
+        $tags .= '<meta property="og:image" content="'. $defaultImg .'" />' . "\n";
+        $tags .= '<meta name="twitter:card" content="summary_large_image" />' . "\n";
+        if(!empty($twitter)) {
+            $twitter = parse_url($twitter);
+            $tags .= '<meta name="twitter:site" content="'. str_replace('/', '@', $twitter['path']) .'" />' . "\n";
+        }
+    } else {
+        if(!empty($object->image)) {
+            $image = $object->image;
+        } else {
+            $image = get_image($object->body);
+            if(empty($image)) {
+                $image = $defaultImg;
+            }
+        }
+        $tags .= '<meta property="og:locale" content="'. config('language') .'" />' . "\n";
+        $tags .= '<meta property="og:site_name" content="'. blog_title() . '" />' . "\n";
+        $tags .= '<meta property="og:type" content="article" />' . "\n";
+        $tags .= '<meta property="og:title" content="'. $object->title .'" />' . "\n";
+        if ($type == 'is_post') {
+            $tags .= '<meta name="author" content="'. $object->authorName .'" />' . "\n";
+            $tags .= '<meta name="article:published_time" content="'. date('c', $object->date) .'" />' . "\n";
+            $tags .= '<meta name="article:modified_time" content="'. date('c', $object->lastMod) .'" />' . "\n";
+            $tags .= '<meta name="article:section" content="'. $object->categoryTitle .'" />' . "\n";
+            $tags .= '<meta name="article:section_url" content="'. $object->categoryUrl .'" />' . "\n";    
+        }
+        if ($type == 'is_page' || $type == 'is_subpage') {
+            $tags .= '<meta name="article:modified_time" content="'. date('c', $object->lastMod) .'" />' . "\n";
+        }
+        if(!empty($facebook)) {
+            $tags .= '    <meta property="article:publisher" content="'. $facebook .'" />' . "\n";
+        }
+        if(!empty($twitter)) {
+            $twitter = parse_url($twitter);
+            $tags .= '<meta name="twitter:creator" content="'. str_replace('/', '@', $twitter['path']) .'" />' . "\n";
+            $tags .= '<meta name="twitter:site" content="'. str_replace('/', '@', $twitter['path']) .'" />' . "\n";
+        }
+        $tags .= '<meta property="og:url" content="'. $object->url .'" />' . "\n";
+        $tags .= '<meta property="og:description" content="'. $object->description .'" />' . "\n";
+        $tags .= '<meta name="twitter:card" content="summary_large_image" />' . "\n";
+        $tags .= '<meta property="og:image" content="'. $image .'" />' . "\n";
+    }
+    
+    return $tags;
+}
diff --git a/themes/blog/layout.html.php b/themes/blog/layout.html.php
index 5668d82..5344117 100644
--- a/themes/blog/layout.html.php
+++ b/themes/blog/layout.html.php
@@ -6,6 +6,7 @@
     <title><?php echo $title;?></title>
     <meta name="description" content="<?php echo $description; ?>"/>
     <link rel="canonical" href="<?php echo $canonical; ?>" />
+    <?php echo $metatags;?>
     <link href="//fonts.googleapis.com/css?family=Lato:300,400,300italic,400italic" rel="stylesheet" type="text/css">
     <link href="//fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">
     <link href="//fonts.googleapis.com/css?family=Crimson+Text:400,400italic" rel="stylesheet" type="text/css">     
diff --git a/themes/clean/layout.html.php b/themes/clean/layout.html.php
index c5dbc88..fc69499 100644
--- a/themes/clean/layout.html.php
+++ b/themes/clean/layout.html.php
@@ -6,6 +6,7 @@
     <title><?php echo $title;?></title>
     <meta name="description" content="<?php echo $description; ?>"/>
     <link rel="canonical" href="<?php echo $canonical; ?>" />
+    <?php echo $metatags;?>
     <link href="<?php echo theme_path() ?>css/style.css" rel="stylesheet"/>
     <link href="//fonts.googleapis.com/css?family=Open+Sans+Condensed:700&subset=latin,cyrillic-ext" rel="stylesheet"/>
     <!--[if lt IE 9]>
diff --git a/themes/doks/layout--static.html.php b/themes/doks/layout--static.html.php
index 8b7b4ed..acea13f 100644
--- a/themes/doks/layout--static.html.php
+++ b/themes/doks/layout--static.html.php
@@ -6,6 +6,7 @@
     <title><?php echo $title;?></title>
     <meta name="description" content="<?php echo $description; ?>"/>
     <link rel="canonical" href="<?php echo $canonical; ?>" />
+    <?php echo $metatags;?>
     <link rel="preload" as="font" href="<?php echo theme_path();?>fonts/jost/jost-v4-latin-regular.woff2" type="font/woff2" crossorigin>
     <link rel="preload" as="font" href="<?php echo theme_path();?>fonts/jost/jost-v4-latin-700.woff2" type="font/woff2" crossorigin>
     <link rel="stylesheet" href="<?php echo theme_path();?>css/style.css">
diff --git a/themes/doks/layout.html.php b/themes/doks/layout.html.php
index 4d97538..3c85209 100644
--- a/themes/doks/layout.html.php
+++ b/themes/doks/layout.html.php
@@ -6,6 +6,7 @@
     <title><?php echo $title;?></title>
     <meta name="description" content="<?php echo $description; ?>"/>
     <link rel="canonical" href="<?php echo $canonical; ?>" />
+    <?php echo $metatags;?>
     <link rel="preload" as="font" href="<?php echo theme_path();?>fonts/jost/jost-v4-latin-regular.woff2" type="font/woff2" crossorigin>
     <link rel="preload" as="font" href="<?php echo theme_path();?>fonts/jost/jost-v4-latin-700.woff2" type="font/woff2" crossorigin>
     <link rel="stylesheet" href="<?php echo theme_path();?>css/style.css">
diff --git a/themes/logs/layout.html.php b/themes/logs/layout.html.php
index c42f4a7..8a73c6a 100644
--- a/themes/logs/layout.html.php
+++ b/themes/logs/layout.html.php
@@ -6,6 +6,7 @@
     <title><?php echo $title;?></title>
     <meta name="description" content="<?php echo $description; ?>"/>
     <link rel="canonical" href="<?php echo $canonical; ?>" />
+    <?php echo $metatags;?>
     <link href="<?php echo theme_path() ?>css/style.css" rel="stylesheet"/>
     <link href="//fonts.googleapis.com/css?family=Open+Sans:400,700" rel="stylesheet" type="text/css">
     <!--[if lt IE 9]>
diff --git a/themes/readable/layout.html.php b/themes/readable/layout.html.php
index 59f2590..01e2794 100644
--- a/themes/readable/layout.html.php
+++ b/themes/readable/layout.html.php
@@ -6,6 +6,7 @@
     <title><?php echo $title;?></title>
     <meta name="description" content="<?php echo $description; ?>"/>
     <link rel="canonical" href="<?php echo $canonical; ?>" />
+    <?php echo $metatags;?>
     <link href="<?php echo theme_path() ?>css/style.css" rel="stylesheet"/>
     <link href="//fonts.googleapis.com/css?family=Open+Sans:400,700" rel="stylesheet" type="text/css">
     <!--[if lt IE 9]>
diff --git a/themes/twentyfifteen/layout.html.php b/themes/twentyfifteen/layout.html.php
index 01f8a3f..c0603b3 100644
--- a/themes/twentyfifteen/layout.html.php
+++ b/themes/twentyfifteen/layout.html.php
@@ -6,6 +6,7 @@
     <title><?php echo $title;?></title>
     <meta name="description" content="<?php echo $description; ?>"/>
     <link rel="canonical" href="<?php echo $canonical; ?>" />
+    <?php echo $metatags;?>
     <link rel="stylesheet" id="twentyfifteen-fonts-css" href="<?php echo theme_path();?>css/font.css" type="text/css" media="all">
     <link rel="stylesheet" id="genericons-css" href="<?php echo theme_path();?>genericons/genericons.css" type="text/css" media="all"> 
     <link rel="stylesheet" id="twentyfifteen-style-css" href="<?php echo theme_path();?>css/style_v2.css" type="text/css" media="all">
diff --git a/themes/twentysixteen/layout.html.php b/themes/twentysixteen/layout.html.php
index 949023e..5a69c1e 100644
--- a/themes/twentysixteen/layout.html.php
+++ b/themes/twentysixteen/layout.html.php
@@ -6,6 +6,7 @@
     <title><?php echo $title;?></title>
     <meta name="description" content="<?php echo $description; ?>"/>
     <link rel="canonical" href="<?php echo $canonical; ?>" />
+    <?php echo $metatags;?>
     <link rel="stylesheet" id="twentysixteen-fonts-css" href="https://fonts.googleapis.com/css?family=Merriweather%3A400%2C700%2C900%2C400italic%2C700italic%2C900italic%7CMontserrat%3A400%2C700%7CInconsolata%3A400&#038;subset=latin%2Clatin-ext" type="text/css" media="all" />
     <link rel="stylesheet" id="genericons-css"  href="<?php echo theme_path();?>genericons/genericons.css" type="text/css" media="all" />
     <link rel="stylesheet" id="twentysixteen-style-css"  href="<?php echo theme_path();?>css/style.css" type="text/css" media="all" />