Merge remote-tracking branch 'dignajar/master'

2016-02-27 22:43:35 +01:00 · 2016-02-27 22:43:35 +01:00 · 61079f1b57
parent 5c051ba131 31126cae54
commit 61079f1b57
80 changed files with 723 additions and 396 deletions
--- a/README.md
+++ b/README.md
@ -1,14 +1,14 @@
-[Bludit](http://www.bludit.com/)
+[Bludit](https://www.bludit.com/)
 ================================
 **Fast**, **simple**, **extensible** and **flat file** CMS.

 Bludit is a simple web application to make your own **blog** or **site** in seconds, it's completly **free and open source**. Bludit uses flat-files (text files in JSON format) to store the posts and pages, you don't need to install or configure a database.

- [Documentation](http://docs.bludit.com)
- [Help and Support](http://forum.bludit.com)
- [Plugins](https://github.com/dignajar/bludit-plugins)
+- [Documentation](https://docs.bludit.com)
+- [Help and Support](https://forum.bludit.com)
+- [Plugins](https://plugins.bludit.com)
 - [Themes](https://github.com/dignajar/bludit-themes)
- [More plugins and themes](http://forum.bludit.com/viewforum.php?f=14)
+- [More plugins and themes](https://forum.bludit.com/viewforum.php?f=14)

 Social networks
 ---------------
@ -36,7 +36,7 @@ You only need a web server with PHP support.
 Installation guide
 ------------------

-1. Download the latest version from http://www.bludit.com/bludit_latest.zip
+1. Download the latest version from https://s3.amazonaws.com/bludit-s3/bludit-builds/bludit_latest.zip
 2. Extract the zip file into a directory like `bludit`.
 3. Upload the directory `bludit` to your hosting server.
 4. Done!
--- a/bl-kernel/admin/themes/default/css/default.css
+++ b/bl-kernel/admin/themes/default/css/default.css
@ -118,6 +118,14 @@ li.bludit-logo {

 /* ----------- BLUDIT ----------- */

+body {
+	overflow-y: scroll;
+}
+
+.bludit-navbar {
+
+}
+
 #logo {
 	background: #f4f4f4;
 	padding:20px 0;
@ -150,6 +158,10 @@ button.delete-button:hover {
 	margin-bottom: 25px;
 }

+table.statistics tr:last-child td {
+	border-bottom: none !important;
+}
+
 /* ----------- ALERT ----------- */

 #alert {
@ -196,7 +208,7 @@ button.delete-button:hover {
 #jstagList span.select {
 	margin-top: 5px;
 	margin-right: 5px;
-	padding: 1px 15px;
+	padding: 2px 15px;
 	cursor: pointer;
 	display: inline-block;
 	border-radius: 3px;
--- a/bl-kernel/admin/themes/default/css/jquery.auto-complete.css
+++ b/bl-kernel/admin/themes/default/css/jquery.auto-complete.css
@ -1,9 +0,0 @@
-.autocomplete-suggestions {
-    text-align: left; cursor: default; border: 1px solid #ccc; border-top: 0; background: #fff; box-shadow: -1px 1px 3px rgba(0,0,0,.1);
-
-    /* core styles should not be changed */
-    position: absolute; display: none; z-index: 9999; max-height: 254px; overflow: hidden; overflow-y: auto; box-sizing: border-box;
-}
-.autocomplete-suggestion { position: relative; padding: 0 .6em; line-height: 23px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; font-size: 1.02em; color: #333; }
-.autocomplete-suggestion b { font-weight: normal; color: #1f8dd6; }
-.autocomplete-suggestion.selected { background: #f0f0f0; }
--- a/bl-kernel/admin/themes/default/index.php
+++ b/bl-kernel/admin/themes/default/index.php
@ -20,14 +20,12 @@

 	<link rel="stylesheet" type="text/css" href="./css/default.css?version=<?php echo BLUDIT_VERSION ?>">
 	<link rel="stylesheet" type="text/css" href="./css/jquery.datetimepicker.css?version=<?php echo BLUDIT_VERSION ?>">
-	<link rel="stylesheet" type="text/css" href="./css/jquery.auto-complete.css?version=<?php echo BLUDIT_VERSION ?>">

 	<!-- Javascript -->
 	<script charset="utf-8" src="./js/jquery.min.js?version=<?php echo BLUDIT_VERSION ?>"></script>
 	<script charset="utf-8" src="./js/uikit/uikit.min.js?version=<?php echo BLUDIT_VERSION ?>"></script>
 	<script charset="utf-8" src="./js/uikit/upload.min.js?version=<?php echo BLUDIT_VERSION ?>"></script>
 	<script charset="utf-8" src="./js/jquery.datetimepicker.js?version=<?php echo BLUDIT_VERSION ?>"></script>
-	<script charset="utf-8" src="./js/jquery.auto-complete.min.js?version=<?php echo BLUDIT_VERSION ?>"></script>

 	<!-- Plugins -->
 	<?php Theme::plugins('adminHead') ?>
@ -56,7 +54,7 @@ $(document).ready(function() {
 </div>

 <!-- Navbar -->
-<nav class="uk-navbar">
+<nav class="uk-navbar bludit-navbar">

 	<!-- Navbar for Desktop -->
 	<div class="uk-container uk-container-center uk-hidden-small">
--- a/bl-kernel/admin/themes/default/init.php
+++ b/bl-kernel/admin/themes/default/init.php
@ -27,7 +27,7 @@ class HTML {

 			// Prevent the form submit when press enter key.
 			$("form").keypress(function(e) {
-				if (e.which == 13) {
+				if( (e.which == 13) && (e.target.type !== "textarea") )  {
 					return false;
 				}
 			});
@ -87,7 +87,7 @@ class HTML {
 		$html .= '<div id="jstagList">';

 		foreach($args['allTags'] as $tag) {
-			$html .= '<span class="'.( in_array($tag, $args['selectedTags'])?'select':'unselect' ).'">'.$tag.'</span>';
+			$html .= '<span data-tag="'.$tag.'" class="'.( in_array($tag, $args['selectedTags'])?'select':'unselect' ).'">'.$tag.'</span>';
 		}

 		$html .= '</div>';
@ -195,7 +195,7 @@ class HTML {
 		$html .= '<div class="empty-images uk-block uk-text-center uk-block-muted" '.( !empty($thumbnailList)?'style="display:none"':'' ).'>'.$L->g('There are no images').'</div>';

 		$html .= '
-		<a data-uk-modal href="#bludit-images-v8" class="moreImages uk-button">'.$L->g('More images').'</a>
+		<a data-uk-modal href="#bludit-images-v8" class="moreImages uk-button"><i class="uk-icon-folder-o"></i> '.$L->g('More images').'</a>

 		</div>
 		';
--- a/bl-kernel/admin/themes/default/js/jquery.auto-complete.min.js
+++ b/bl-kernel/admin/themes/default/js/jquery.auto-complete.min.js
@ -1,3 +0,0 @@
-// jQuery autoComplete v1.0.7
-// https://github.com/Pixabay/jQuery-autoComplete
-!function(e){e.fn.autoComplete=function(t){var o=e.extend({},e.fn.autoComplete.defaults,t);return"string"==typeof t?(this.each(function(){var o=e(this);"destroy"==t&&(e(window).off("resize.autocomplete",o.updateSC),o.off("blur.autocomplete focus.autocomplete keydown.autocomplete keyup.autocomplete"),o.data("autocomplete")?o.attr("autocomplete",o.data("autocomplete")):o.removeAttr("autocomplete"),e(o.data("sc")).remove(),o.removeData("sc").removeData("autocomplete"))}),this):this.each(function(){function t(e){var t=s.val();if(s.cache[t]=e,e.length&&t.length>=o.minChars){for(var a="",c=0;c<e.length;c++)a+=o.renderItem(e[c],t);s.sc.html(a),s.updateSC(0)}else s.sc.hide()}var s=e(this);s.sc=e('<div class="autocomplete-suggestions '+o.menuClass+'"></div>'),s.data("sc",s.sc).data("autocomplete",s.attr("autocomplete")),s.attr("autocomplete","off"),s.cache={},s.last_val="",s.updateSC=function(t,o){if(s.sc.css({top:s.offset().top+s.outerHeight(),left:s.offset().left,width:s.outerWidth()}),!t&&(s.sc.show(),s.sc.maxHeight||(s.sc.maxHeight=parseInt(s.sc.css("max-height"))),s.sc.suggestionHeight||(s.sc.suggestionHeight=e(".autocomplete-suggestion",s.sc).first().outerHeight()),s.sc.suggestionHeight))if(o){var a=s.sc.scrollTop(),c=o.offset().top-s.sc.offset().top;c+s.sc.suggestionHeight-s.sc.maxHeight>0?s.sc.scrollTop(c+s.sc.suggestionHeight+a-s.sc.maxHeight):0>c&&s.sc.scrollTop(c+a)}else s.sc.scrollTop(0)},e(window).on("resize.autocomplete",s.updateSC),s.sc.appendTo("body"),s.sc.on("mouseleave",".autocomplete-suggestion",function(){e(".autocomplete-suggestion.selected").removeClass("selected")}),s.sc.on("mouseenter",".autocomplete-suggestion",function(){e(".autocomplete-suggestion.selected").removeClass("selected"),e(this).addClass("selected")}),s.sc.on("mousedown",".autocomplete-suggestion",function(t){var a=e(this),c=a.data("val");return(c||a.hasClass("autocomplete-suggestion"))&&(s.val(c),o.onSelect(t,c,a),s.sc.hide()),!1}),s.on("blur.autocomplete",function(){try{over_sb=e(".autocomplete-suggestions:hover").length}catch(t){over_sb=0}over_sb?s.is(":focus")||setTimeout(function(){s.focus()},20):(s.last_val=s.val(),s.sc.hide(),setTimeout(function(){s.sc.hide()},350))}),o.minChars||s.on("focus.autocomplete",function(){s.last_val="\n",s.trigger("keyup.autocomplete")}),s.on("keydown.autocomplete",function(t){if((40==t.which||38==t.which)&&s.sc.html()){var a,c=e(".autocomplete-suggestion.selected",s.sc);return c.length?(a=40==t.which?c.next(".autocomplete-suggestion"):c.prev(".autocomplete-suggestion"),a.length?(c.removeClass("selected"),s.val(a.addClass("selected").data("val"))):(c.removeClass("selected"),s.val(s.last_val),a=0)):(a=40==t.which?e(".autocomplete-suggestion",s.sc).first():e(".autocomplete-suggestion",s.sc).last(),s.val(a.addClass("selected").data("val"))),s.updateSC(0,a),!1}if(27==t.which)s.val(s.last_val).sc.hide();else if(13==t.which||9==t.which){var c=e(".autocomplete-suggestion.selected",s.sc);c.length&&s.sc.is(":visible")&&(o.onSelect(t,c.data("val"),c),setTimeout(function(){s.sc.hide()},20))}}),s.on("keyup.autocomplete",function(a){if(!~e.inArray(a.which,[13,27,35,36,37,38,39,40])){var c=s.val();if(c.length>=o.minChars){if(c!=s.last_val){if(s.last_val=c,clearTimeout(s.timer),o.cache){if(c in s.cache)return void t(s.cache[c]);for(var l=1;l<c.length-o.minChars;l++){var i=c.slice(0,c.length-l);if(i in s.cache&&!s.cache[i].length)return void t([])}}s.timer=setTimeout(function(){o.source(c,t)},o.delay)}}else s.last_val=c,s.sc.hide()}})})},e.fn.autoComplete.defaults={source:0,minChars:3,delay:150,cache:1,menuClass:"",renderItem:function(e,t){t=t.replace(/[-\/\\^$*+?.()|[\]{}]/g,"\\$&");var o=new RegExp("("+t.split(" ").join("|")+")","gi");return'<div class="autocomplete-suggestion" data-val="'+e+'">'+e.replace(o,"<b>$1</b>")+"</div>"},onSelect:function(e,t,o){}}}(jQuery);
--- a/bl-kernel/admin/themes/default/js/jquery.min.js
+++ b/bl-kernel/admin/themes/default/js/jquery.min.js
--- a/bl-kernel/admin/views/dashboard.php
+++ b/bl-kernel/admin/views/dashboard.php
@ -65,7 +65,7 @@

 		<div class="uk-panel uk-panel-box">
 		<h4><?php $L->p('Statistics') ?></h4>
-		<table class="uk-table">
+		<table class="uk-table statistics">
 			<tbody>
 			<tr>
 			<td><?php $Language->p('Posts') ?></td>
--- a/bl-kernel/admin/views/edit-user.php
+++ b/bl-kernel/admin/views/edit-user.php
@ -72,36 +72,36 @@ if($Login->role()==='admin') {
 		'tip'=>$L->g('email-will-not-be-publicly-displayed')
 	));

-	HTML::legend(array('value'=>$L->g('Social networks')));
+	HTML::legend(array('value'=>$L->g('Social networks links')));

 	HTML::formInputText(array(
-		'name'=>'twitterUsername',
-		'label'=>$L->g('Twitter username'),
-		'value'=>$_User->twitterUsername(),
+		'name'=>'twitter',
+		'label'=>'Twitter',
+		'value'=>$_User->twitter(),
 		'class'=>'uk-width-1-2 uk-form-medium',
 		'tip'=>''
 	));

 	HTML::formInputText(array(
-		'name'=>'facebookUsername',
-		'label'=>$L->g('Facebook username'),
-		'value'=>$_User->facebookUsername(),
+		'name'=>'facebook',
+		'label'=>'Facebook',
+		'value'=>$_User->facebook(),
 		'class'=>'uk-width-1-2 uk-form-medium',
 		'tip'=>''
 	));

 	HTML::formInputText(array(
-		'name'=>'googleUsername',
-		'label'=>$L->g('Google username'),
-		'value'=>$_User->googleUsername(),
+		'name'=>'googlePlus',
+		'label'=>'Google+',
+		'value'=>$_User->googlePlus(),
 		'class'=>'uk-width-1-2 uk-form-medium',
 		'tip'=>''
 	));

 	HTML::formInputText(array(
-		'name'=>'instagramUsername',
-		'label'=>$L->g('Instagram username'),
-		'value'=>$_User->instagramUsername(),
+		'name'=>'instagram',
+		'label'=>'Instagram',
+		'value'=>$_User->instagram(),
 		'class'=>'uk-width-1-2 uk-form-medium',
 		'tip'=>''
 	));
--- a/bl-kernel/admin/views/settings-general.php
+++ b/bl-kernel/admin/views/settings-general.php
@ -44,6 +44,53 @@ HTML::formOpen(array('class'=>'uk-form-horizontal'));
 		'tip'=>$L->g('you-can-add-a-small-text-on-the-bottom')
 	));

+	HTML::legend(array('value'=>$L->g('Social networks links')));
+
+	HTML::formInputText(array(
+		'name'=>'twitter',
+		'label'=>'Twitter',
+		'value'=>$Site->twitter(),
+		'class'=>'uk-width-1-2 uk-form-medium',
+		'placeholder'=>'https://twitter.com/USERNAME',
+		'tip'=>''
+	));
+
+	HTML::formInputText(array(
+		'name'=>'facebook',
+		'label'=>'Facebook',
+		'value'=>$Site->facebook(),
+		'class'=>'uk-width-1-2 uk-form-medium',
+		'placeholder'=>'https://www.facebook.com/USERNAME',
+		'tip'=>''
+	));
+
+	HTML::formInputText(array(
+		'name'=>'googlePlus',
+		'label'=>'Google+',
+		'value'=>$Site->googlePlus(),
+		'class'=>'uk-width-1-2 uk-form-medium',
+		'placeholder'=>'https://plus.google.com/+USERNAME',
+		'tip'=>''
+	));
+
+	HTML::formInputText(array(
+		'name'=>'instagram',
+		'label'=>'Instagram',
+		'value'=>$Site->googlePlus(),
+		'class'=>'uk-width-1-2 uk-form-medium',
+		'placeholder'=>'https://www.instagram.com/USERNAME',
+		'tip'=>''
+	));
+
+	HTML::formInputText(array(
+		'name'=>'github',
+		'label'=>'Github',
+		'value'=>$Site->github(),
+		'class'=>'uk-width-1-2 uk-form-medium',
+		'placeholder'=>'https://github.com/USERNAME',
+		'tip'=>''
+	));
+
 	echo '<div class="uk-form-row">
 		<div class="uk-form-controls">
 		<button type="submit" class="uk-button uk-button-primary">'.$L->g('Save').'</button>
--- a/bl-kernel/boot/init.php
+++ b/bl-kernel/boot/init.php
@ -1,10 +1,10 @@
 <?php defined('BLUDIT') or die('Bludit CMS.');

 // Bludit version
-define('BLUDIT_VERSION',	'githubVersion');
-define('BLUDIT_CODENAME',	'');
-define('BLUDIT_RELEASE_DATE',	'');
-define('BLUDIT_BUILD',		'20160201');
+define('BLUDIT_VERSION',	'1.1.2');
+define('BLUDIT_CODENAME',	'The Dig');
+define('BLUDIT_RELEASE_DATE',	'2016-02-26');
+define('BLUDIT_BUILD',		'20160226');

 // Debug mode
 define('DEBUG_MODE', TRUE);
@ -56,8 +56,8 @@ if(!defined('JSON_PRETTY_PRINT')) {
 	define('JSON_PRETTY_PRINT', 128);
 }

-// Alert status ok
-define('CHECK_SYMBOLIC_LINKS', FALSE);
+// Protecting against Symlink attacks.
+define('CHECK_SYMBOLIC_LINKS', TRUE);

 // Alert status ok
 define('ALERT_STATUS_OK', 0);
--- a/bl-kernel/dbposts.class.php
+++ b/bl-kernel/dbposts.class.php
@ -107,6 +107,7 @@ class dbPosts extends dbJSON
 		// The user is always who is loggued.
 		$args['username'] = Session::get('username');
 		if( Text::isEmpty($args['username']) ) {
+			Log::set(__METHOD__.LOG_SEP.'The session does not have the username.');
 			return false;
 		}

@ -271,6 +272,7 @@ class dbPosts extends dbJSON
 			return false;
 		}

+		Log::set(__METHOD__.LOG_SEP.'Posts from the user '.$username.' were delete.');
 		return true;
 	}

@ -293,6 +295,7 @@ class dbPosts extends dbJSON
 			return false;
 		}

+		Log::set(__METHOD__.LOG_SEP.'Posts linked to another user.');
 		return true;
 	}

@ -343,6 +346,7 @@ class dbPosts extends dbJSON
 				return false;
 			}

+			Log::set(__METHOD__.LOG_SEP.'New post published from scheduler.');
 			return true;
 		}

@ -443,6 +447,8 @@ class dbPosts extends dbJSON
 					{
 						$valueFromFile = $Post->getField($f);

+						Log::set(__METHOD__.LOG_SEP.'Field from file: '.$f);
+
 						if($f=='tags') {
 							// Generate tags array.
 							$this->db[$key]['tags'] = $this->generateTags($valueFromFile);
@ -480,6 +486,10 @@ class dbPosts extends dbJSON
 			return false;
 		}

+		if($this->db!=$db) {
+			Log::set(__METHOD__.LOG_SEP.'New posts added from Cli Mode');
+		}
+
 		return $this->db!=$db;
 	}

--- a/bl-kernel/dbsite.class.php
+++ b/bl-kernel/dbsite.class.php
@ -23,7 +23,12 @@ class dbSite extends dbJSON
 		'emailFrom'=>		array('inFile'=>false, 'value'=>''),
 		'dateFormat'=>		array('inFile'=>false, 'value'=>'F j, Y'),
 		'timeFormat'=>		array('inFile'=>false, 'value'=>'g:i a'),
-		'currentBuild'=>	array('inFile'=>false, 'value'=>0)
+		'currentBuild'=>	array('inFile'=>false, 'value'=>0),
+		'twitter'=>		array('inFile'=>false, 'value'=>''),
+		'facebook'=>		array('inFile'=>false, 'value'=>''),
+		'googlePlus'=>		array('inFile'=>false, 'value'=>''),
+		'instagram'=>		array('inFile'=>false, 'value'=>''),
+		'github'=>		array('inFile'=>false, 'value'=>'')
 	);

 	function __construct()
@ -101,6 +106,31 @@ class dbSite extends dbJSON
 		return $this->url().ltrim($filter, '/');
 	}

+	public function twitter()
+	{
+		return $this->getField('twitter');
+	}
+
+	public function facebook()
+	{
+		return $this->getField('facebook');
+	}
+
+	public function instagram()
+	{
+		return $this->getField('instagram');
+	}
+
+	public function github()
+	{
+		return $this->getField('github');
+	}
+
+	public function googlePlus()
+	{
+		return $this->getField('googlePlus');
+	}
+
 	// Returns the site title.
 	public function title()
 	{
--- a/bl-kernel/dbtags.class.php
+++ b/bl-kernel/dbtags.class.php
@ -25,6 +25,10 @@ class dbTags extends dbJSON
 		foreach($this->db['postsIndex'] as $tagSlug=>$tagInfo) {
 			$tmp[$tagSlug] = $tagInfo['name'];
 		}
+
+		// Sort low to high, by value.
+		natcasesort($tmp);
+
 		return $tmp;
 	}

--- a/bl-kernel/dbusers.class.php
+++ b/bl-kernel/dbusers.class.php
@ -13,10 +13,10 @@ class dbUsers extends dbJSON
 		'registered'=>		array('inFile'=>false, 'value'=>'1985-03-15 10:00'),
 		'tokenEmail'=>		array('inFile'=>false, 'value'=>''),
 		'tokenEmailTTL'=>	array('inFile'=>false, 'value'=>'2009-03-15 14:00'),
-		'twitterUsername'=>	array('inFile'=>false, 'value'=>''),
-		'facebookUsername'=>	array('inFile'=>false, 'value'=>''),
-		'googleUsername'=>	array('inFile'=>false, 'value'=>''),
-		'instagramUsername'=>	array('inFile'=>false, 'value'=>'')
+		'twitter'=>		array('inFile'=>false, 'value'=>''),
+		'facebook'=>		array('inFile'=>false, 'value'=>''),
+		'googlePlus'=>		array('inFile'=>false, 'value'=>''),
+		'instagram'=>		array('inFile'=>false, 'value'=>'')
 	);

 	function __construct()
--- a/bl-kernel/helpers/email.class.php
+++ b/bl-kernel/helpers/email.class.php
@ -5,10 +5,16 @@ class Email {
 	// Returns TRUE if the mail was successfully accepted for delivery, FALSE otherwise.
 	public static function send($args)
 	{
+		$now = time();
+
 		$headers   = array();
 		$headers[] = 'MIME-Version: 1.0';
 		$headers[] = 'Content-type: text/html; charset=utf-8';
+
 		$headers[] = 'From: '.$args['from'];
+		$headers[] = 'Reply-To: '.$args['from'];
+		$headers[] = 'Return-Path: '.$args['from'];
+		$headers[] = 'message-id: <'.$now.'webmaster@'.DOMAIN.'>';
 		$headers[] = 'X-Mailer: PHP/'.phpversion();

 		$message = '<html>
--- a/bl-kernel/helpers/log.class.php
+++ b/bl-kernel/helpers/log.class.php
@ -4,7 +4,7 @@ class Log {

 	public static function set($text, $type=0)
 	{
-		error_log($text, $type);
+		error_log('('.BLUDIT_VERSION.')'.$text, $type);
 	}

 }
--- a/bl-kernel/helpers/theme.class.php
+++ b/bl-kernel/helpers/theme.class.php
@ -2,11 +2,14 @@

 class Theme {

-	// NEW
-
-	public static function favicon($file='favicon.png', $path=HTML_PATH_THEME_IMG, $echo=true)
+	public static function favicon($file='favicon.png', $path=HTML_PATH_THEME_IMG, $typeIcon=true, $echo=true)
 	{
-		$tmp = '<link rel="shortcut icon" href="'.$path.$file.'" type="image/x-icon">'.PHP_EOL;
+		$type = 'image/png';
+		if($typeIcon) {
+			$type = 'image/x-icon';
+		}
+
+		$tmp = '<link rel="shortcut icon" href="'.$path.$file.'" type="'.$type.'">'.PHP_EOL;

 		if($echo) {
 			echo $tmp;
@ -51,9 +54,28 @@ class Theme {
 		return $tmp;
 	}

-	public static function title($title, $echo=true)
+	public static function title($title=false, $echo=true)
 	{
-		$tmp = '<title>'.$title.'</title>'.PHP_EOL;
+		global $Url;
+		global $Post, $Page;
+		global $Site;
+
+		$tmp = $title;
+
+		if(empty($title))
+		{
+			if( $Url->whereAmI()=='post' ) {
+				$tmp = $Post->title().' - '.$Site->title();
+			}
+			elseif( $Url->whereAmI()=='page' ) {
+				$tmp = $Page->title().' - '.$Site->title();
+			}
+			else {
+				$tmp = $Site->title();
+			}
+		}
+
+		$tmp = '<title>'.$tmp.'</title>'.PHP_EOL;

 		if($echo) {
 			echo $tmp;
@ -62,9 +84,28 @@ class Theme {
 		return $tmp;
 	}

-	public static function description($description, $echo=true)
+	public static function description($description=false, $echo=true)
 	{
-		$tmp = '<meta name="description" content="'.$description.'">'.PHP_EOL;
+		global $Url;
+		global $Post, $Page;
+		global $Site;
+
+		$tmp = $description;
+
+		if(empty($description))
+		{
+			if( $Url->whereAmI()=='post' ) {
+				$tmp = $Post->description();
+			}
+			elseif( $Url->whereAmI()=='page' ) {
+				$tmp = $Page->description();
+			}
+			else {
+				$tmp = $Site->description();
+			}
+		}
+
+		$tmp = '<meta name="description" content="'.$tmp.'">'.PHP_EOL;

 		if($echo) {
 			echo $tmp;
--- a/bl-kernel/js/bludit-menu-v8.js
+++ b/bl-kernel/js/bludit-menu-v8.js
@ -47,6 +47,17 @@ var menuV8 = new function() {

 }

+// This function is the default to add the image to the textarea.
+// Only call when the textarea doesn't have a HTML Editor enabled.
+function editorAddImageDefault(filename) {
+
+	var textarea = $("#jscontent");
+	var imgHTML = '<img src="'+filename+'" alt="">';
+
+	textarea.val(textarea.val() + imgHTML);
+
+}
+
 $(document).ready(function() {

 	// Click on document.
@ -87,8 +98,13 @@ $(document).ready(function() {
 	// Insert image
 	$("body").on("click", "#bludit-menuV8-insert", function(e) {

-		// This function is defined in each editor plugin.
-		editorAddImage( menuV8.getFilename() );
+		if(typeof editorAddImage == 'function') {
+			// This function is defined in each editor plugin.
+			editorAddImage( menuV8.getFilename() );
+		}
+		else {
+			editorAddImageDefault( menuV8.getFilename() );
+		}

 	});

--- a/bl-kernel/js/bludit-tags.js
+++ b/bl-kernel/js/bludit-tags.js
@ -8,7 +8,16 @@ function insertTag() {
 		return true;
 	}

-	$("#jstagList").append("<span class=\"select\">"+newTag+"</span>");
+	var findTag = $("span[data-tag]").filter(function() {
+		return $(this).attr('data-tag').toLowerCase() == newTag.toLowerCase();
+	});
+
+	if( findTag.length > 0 ) {
+		findTag.removeClass("unselect").addClass("select");
+	}
+	else {
+		$("#jstagList").append("<span data-tag=\""+newTag+"\" class=\"select\">"+newTag+"</span>");
+	}

 	// Clean the input.
 	$("#jstagInput").val("");
--- a/bl-kernel/user.class.php
+++ b/bl-kernel/user.class.php
@ -61,24 +61,24 @@ class User
 		return $this->getField('registered');
 	}

-	public function twitterUsername()
+	public function twitter()
 	{
-		return $this->getField('twitterUsername');
+		return $this->getField('twitter');
 	}

-	public function facebookUsername()
+	public function facebook()
 	{
-		return $this->getField('facebookUsername');
+		return $this->getField('facebook');
 	}

-	public function googleUsername()
+	public function googlePlus()
 	{
-		return $this->getField('googleUsername');
+		return $this->getField('googlePlus');
 	}

-	public function instagramUsername()
+	public function instagram()
 	{
-		return $this->getField('instagramUsername');
+		return $this->getField('instagram');
 	}

 	public function profilePicture($absolute=true)
--- a/bl-languages/bg_BG.json
+++ b/bl-languages/bg_BG.json
@ -7,7 +7,7 @@
 		"last-update": "2015-11-18",
 		"author": "Христо Дипчиков",
 		"email": "",
-		"website": "www.hristodipchikov.tk"
+		"website": "http://www.hristodipchikov.tk"
 	},

 	"username": "Потребителско име",
@ -113,7 +113,7 @@
 	"you-can-add-a-site-description-to-provide": "Можете да добавите кратко описание или биография на сайта.",
 	"you-can-add-a-small-text-on-the-bottom": "Можете да добавите кратък текст в долната част на всяка страница. Например: авторско право, собственик, дати и т.н..",
 	"number-of-posts-to-show-per-page": "Изберете желаният брой публикации на страница.",
-	"the-url-of-your-site": "Абсолютен адрес на вашия блог. Пример http://www.domain.com/directory/.",
+	"the-url-of-your-site": "Абсолютен адрес на вашия блог. Пример https://www.domain.com/directory/.",
 	"add-or-edit-description-tags-or": "Добавяне или редактиране на описание, eтикети или модифициране URL.",
 	"select-your-sites-language": "Изберете системен език.",
 	"select-a-timezone-for-a-correct": "Изберете часова зона за правилтото показване на дата / час.",
@ -141,8 +141,8 @@
 	"whats-next": "Какво следва?",
 	"manage-your-bludit-from-the-admin-panel": "Управлявайте вашият Bludit от [Администраторският панел](./admin/)",
 	"follow-bludit-on": "Последвайте Bludit в",
-	"visit-the-support-forum": "Посети [форум](http://forum.bludit.com) за подръжка",
-	"read-the-documentation-for-more-information": "Прочети  [документацията](http://docs.bludit.com) за повече информация",
+	"visit-the-support-forum": "Посети [форум](https://forum.bludit.com) за подръжка",
+	"read-the-documentation-for-more-information": "Прочети  [документацията](https://docs.bludit.com) за повече информация",
 	"share-with-your-friends-and-enjoy": "Споделете с приятелите си",
 	"the-page-has-not-been-found": "Страницата не е намерена.",
 	"error": "Грешна",
@ -231,7 +231,7 @@

 	"click-on-the-image-for-options": "Кликнете върху изображението за опции.",
 	"set-as-cover-image": "Задай като обложка ",
-	"delete-image": "Изтрий на изображенито",
+	"delete-image": "Изтрий изображенито",
 	"image-description": "Описание на изображението "
 }

--- a/bl-languages/de_CH.json
+++ b/bl-languages/de_CH.json
@ -3,10 +3,10 @@
 	{
 		"native": "Deutsch (Schweiz)",
 		"english-name": "German",
-		"last-update": "2016-01-23",
+		"last-update": "2016-02-15",
 		"author": "Clickwork",
 		"email": "egoetschel@clickwork.ch",
-		"website": "https://www.clickwork.ch"
+		"website": "http://www.clickwork.ch"
 	},

 	"username": "Benutzername",
@ -139,8 +139,8 @@
 	"congratulations-you-have-successfully-installed-your-bludit": "Gratulation, du hast **Bludit** erfolgreich installiert!",
 	"whats-next": "Und so geht es weiter:",
 	"follow-bludit-on": "Folge Bludit bei",
-	"visit-the-support-forum": "Besuche das [Forum](http://forum.bludit.com), um Hilfe zu erhalten.",
-	"read-the-documentation-for-more-information": "Lies die [Dokumentation](http://docs.bludit.com) und das [Bludit-Tutorial](https://bludit-tutorial.ch) für weitere Informationen.",
+	"visit-the-support-forum": "Besuche das [Forum](https://forum.bludit.com), um Hilfe zu erhalten.",
+	"read-the-documentation-for-more-information": "Lies die [Dokumentation](https://docs.bludit.com) und das [Bludit-Tutorial](https://bludit-tutorial.ch) für weitere Informationen.",
        "share-with-your-friends-and-enjoy": "Erzähle deinen Freunden von Bludit und habe Spass daran.",
 	"the-page-has-not-been-found": "Die Seite wurde nicht gefunden.",
 	"error": "Fehler",
@ -165,7 +165,7 @@
 	"plugin-label": "Titel auf der Website",
 	"enabled": "Aktiviert",
 	"disabled": "Deaktiviert",
-	"cli-mode": "CLI-Modus",
+	"cli-mode": "Kommandozeilen-Modus",
 	"command-line-mode": "Kommandozeilen-Modus",
 	"enable-the-command-line-mode-if-you-add-edit": "Verwende den Kommandozeilen-Modus, wenn du Beiträge und Seiten im Dateisystem hinzufügen, ändern oder löschen möchtest.",
        "configure": "Konfiguration",
@ -183,7 +183,7 @@
 	"emails-will-be-sent-from-this-address":"E-Mails werden mit dieser E-Mail-Adresse als Absender verschickt.",
 	"bludit-login-access-code": "BLUDIT - Zugangscode",
 	"check-your-inbox-for-your-login-access-code":"Der Zugangscode wurde dir geschickt.",
-	"there-was-a-problem-sending-the-email":"Es besteht ein Pronlem mit dem Verschicken dieser E-Mail.",
+	"there-was-a-problem-sending-the-email":"Es besteht ein Problem mit dem Verschicken dieser E-Mail.",
 	"back-to-login-form": "Zurück zum Login",
 	"send-me-a-login-access-code": "Zugangscode zuschicken",
 	"get-login-access-code": "Zugangscode schicken",
@ -205,7 +205,7 @@
 	"date-format": "Datumsformat",
 	"time-format": "Zeitformat",
 	"chat-with-developers-and-users-on-gitter":"Chatte mit Entwicklern und Benutzern bei [Gitter](https://gitter.im/dignajar/bludit)",
-	"this-is-a-brief-description-of-yourself-our-your-site":"Dies ist eine kurze Beschreibung, wer du bist, oder deiner Website. Um diesen Text zu ändern, gehe im Admin-Panel zu den Einstellungen und konfiguriere unter \"Plugins\" das Plugin \"Über\".",
+	"this-is-a-brief-description-of-yourself-our-your-site":"Dies ist eine kurze Beschreibung, wer du bist, oder deiner Website. Um diesen Text zu ändern, gehe im Admin-Panel zu den Einstellungen und bearbeite sie unter \"Plugins\" das Plugin \"Über\".",
 	"profile-picture": "Profil-Bild",
 	"the-about-page-is-very-important": "Die Seite \"Über\" ist wichtig und wirkungsvoll beispielsweise für zukünfige Kunden und Partner. Für alle, die wissen möchten, wer hinter der Website steht, ist die \"Über\"-Seite die erste Informationsquelle.",
 	"change-this-pages-content-on-the-admin-panel": "Der Inhalt dieser Seite kann im Admin-Panel unter \"Verwaltung\" > \"Seiten\" geändert werden.",
--- a/bl-languages/de_DE.json
+++ b/bl-languages/de_DE.json
@ -3,10 +3,10 @@
 	{
 		"native": "Deutsch (Deutschland)",
 		"english-name": "German",
-		"last-update": "2016-01-23",
+		"last-update": "2016-02-15",
 		"author": "Clickwork",
 		"email": "egoetschel@clickwork.ch",
-		"website": "https://www.clickwork.ch"
+		"website": "http://www.clickwork.ch"
 	},

 	"username": "Benutzername",
@ -139,8 +139,8 @@
 	"congratulations-you-have-successfully-installed-your-bludit": "Gratulation, du hast **Bludit** erfolgreich installiert!",
 	"whats-next": "Und so geht es weiter:",
 	"follow-bludit-on": "Folge Bludit bei",
-	"visit-the-support-forum": "Besuche das [Forum](http://forum.bludit.com), um Hilfe zu erhalten.",
-	"read-the-documentation-for-more-information": "Lies die [Dokumentation](http://docs.bludit.com) und das [Bludit-Tutorial](https://bludit-tutorial.ch) für weitere Informationen.",
+	"visit-the-support-forum": "Besuche das [Forum](https://forum.bludit.com), um Hilfe zu erhalten.",
+	"read-the-documentation-for-more-information": "Lies die [Dokumentation](https://docs.bludit.com) und das [Bludit-Tutorial](https://bludit-tutorial.ch) für weitere Informationen.",
        "share-with-your-friends-and-enjoy": "Erzähle deinen Freunden von Bludit und habe Spaß daran.",
 	"the-page-has-not-been-found": "Die Seite wurde nicht gefunden.",
 	"error": "Fehler",
@ -165,7 +165,7 @@
 	"plugin-label": "Titel auf der Website",
 	"enabled": "Aktiviert",
 	"disabled": "Deaktiviert",
-	"cli-mode": "CLI-Modus",
+	"cli-mode": "Kommandozeilen-Modus",
 	"command-line-mode": "Kommandozeilen-Modus",
 	"enable-the-command-line-mode-if-you-add-edit": "Verwende den Kommandozeilen-Modus, wenn du Beiträge und Seiten im Dateisystem hinzufügen, ändern oder löschen möchtest.",
        "configure": "Konfiguration",
@ -205,7 +205,7 @@
 	"date-format": "Datumsformat",
 	"time-format": "Zeitformat",
 	"chat-with-developers-and-users-on-gitter":"Chatte mit Entwicklern und Benutzern bei [Gitter](https://gitter.im/dignajar/bludit)",
-	"this-is-a-brief-description-of-yourself-our-your-site":"Dies ist eine kurze Beschreibung, wer du bist, oder deiner Website. Um diesen Text zu ändern, gehe im Admin-Panel zu den Einstellungen und konfiguriere unter \"Plugins\" das Plugin \"Über\".",
+	"this-is-a-brief-description-of-yourself-our-your-site":"Dies ist eine kurze Beschreibung, wer du bist, oder deiner Website. Um diesen Text zu ändern, gehe im Admin-Panel zu den Einstellungen und bearbeite sie unter \"Plugins\" das Plugin \"Über\".",
 	"profile-picture": "Profil-Bild",
 	"the-about-page-is-very-important": "Die Seite \"Über\" ist wichtig und wirkungsvoll beispielsweise für zukünfige Kunden und Partner. Für alle, die wissen möchten, wer hinter der Website steht, ist die \"Über\"-Seite die erste Informationsquelle.",
 	"change-this-pages-content-on-the-admin-panel": "Der Inhalt dieser Seite kann im Admin-Panel unter \"Verwaltung\" > \"Seiten\" geändert werden.",
--- a/bl-languages/en_US.json
+++ b/bl-languages/en_US.json
@ -140,8 +140,8 @@
 	"whats-next": "What's Next",

 	"follow-bludit-on": "Follow Bludit on",
-	"visit-the-support-forum": "Visit the [forum](http://forum.bludit.com) for support",
-	"read-the-documentation-for-more-information": "Read the [documentation](http://docs.bludit.com) for more information",
+	"visit-the-support-forum": "Visit the [forum](https://forum.bludit.com) for support",
+	"read-the-documentation-for-more-information": "Read the [documentation](https://docs.bludit.com) for more information",
 	"share-with-your-friends-and-enjoy": "Share with your friends and enjoy",
 	"the-page-has-not-been-found": "The page has not been found.",
 	"error": "Error",
@ -235,9 +235,5 @@
 	"delete-image": "Delete image",
 	"image-description": "Image description",

-	"social-networks": "Social networks",
-	"twitter-username": "Twitter username",
-	"facebook-username": "Facebook username",
-	"google-username": "Google username",
-	"instagram-username": "Instagram username"
+	"social-networks-links": "Social networks links"
 }
--- a/bl-languages/es_AR.json
+++ b/bl-languages/es_AR.json
@ -140,8 +140,8 @@
 	"whats-next": "Siguientes pasos",

 	"follow-bludit-on": "Siga Bludit en",
-	"visit-the-support-forum": "Visite el [foro](http://forum.bludit.com) para soporte",
-	"read-the-documentation-for-more-information": "Lea la [documentación](http://docs.bludit.com) para mas información",
+	"visit-the-support-forum": "Visite el [foro](https://forum.bludit.com) para soporte",
+	"read-the-documentation-for-more-information": "Lea la [documentación](https://docs.bludit.com) para mas información",
 	"share-with-your-friends-and-enjoy": "Compartí con tus amigos y a disfrutar",
 	"the-page-has-not-been-found": "La página no fue encontrada.",
 	"error": "Error",
@ -232,5 +232,7 @@
 	"click-on-the-image-for-options": "Clic en la imagen para las opciones.",
 	"set-as-cover-image": "Establecer como portada",
 	"delete-image": "Eliminar imagen",
-	"image-description": "Descripción de la imagen"
+	"image-description": "Descripción de la imagen",
+
+	"social-networks-links": "Redes sociales enlaces"
 }
--- a/bl-languages/fr_FR.json
+++ b/bl-languages/fr_FR.json
@ -140,8 +140,8 @@
 	"whats-next": "pour la prochaine étape",
 	"manage-your-bludit-from-the-admin-panel": "Gérez Bludit dans la [zone d’administration](./admin/)",
 	"follow-bludit-on": "Suivez Bludit sur",
-	"visit-the-support-forum": "Visitez le [forum](http://forum.bludit.com) de support",
-	"read-the-documentation-for-more-information": "Lisez la [documentation](http://docs.bludit.com) pour plus d’information",
+	"visit-the-support-forum": "Visitez le [forum](https://forum.bludit.com) de support",
+	"read-the-documentation-for-more-information": "Lisez la [documentation](https://docs.bludit.com) pour plus d’information",
 	"share-with-your-friends-and-enjoy": "Partagez avec vos amis et apprécier !",
 	"the-page-has-not-been-found": "La page n’a pas été trouvée.",
 	"error": "Erreur",
--- a/bl-languages/he_IL.json
+++ b/bl-languages/he_IL.json
@ -140,8 +140,8 @@
 	"whats-next": "מה הלאה?",
 	"manage-your-bludit-from-the-admin-panel": "נהל את Bludit מ[דף הניהול](./admin/)",
 	"follow-bludit-on": "עקוב אחר Bludit",
-	"visit-the-support-forum": "בקר ב[פורום](http://forum.bludit.com) לתמיכה",
-	"read-the-documentation-for-more-information": "קרא את ה[מסמכים](http://docs.bludit.com) למידע נוסף",
+	"visit-the-support-forum": "בקר ב[פורום](https://forum.bludit.com) לתמיכה",
+	"read-the-documentation-for-more-information": "קרא את ה[מסמכים](https://docs.bludit.com) למידע נוסף",
 	"share-with-your-friends-and-enjoy": "שתף עם חבריך",
 	"the-page-has-not-been-found": "הדף לא נמצא.",
 	"error": "שגיאה",
--- a/bl-languages/it_IT.json
+++ b/bl-languages/it_IT.json
@ -3,7 +3,7 @@
 	{
 		"native": "Italiano (Italia)",
 		"english-name": "Italian",
-		"last-update": "2016-01-22",
+		"last-update": "2016-02-20",
 		"author": "Daniele La Pira",
 		"email": "daniele.lapira@gmail.com",
 		"website": "https://github.com/danielelapira"
@ -119,6 +119,7 @@
 	"you-can-use-this-field-to-define-a-set-of": "Puoi utilizzare questo campo per definire un set di parametri riferiti alla lingua, alla nazione e preferenze speciali.",
 	"you-can-modify-the-url-which-identifies":"Puoi modificare l'indirizzo URL che identifica una pagina o un articolo utilizzando delle parole chiavi leggibili. Non più di 150 caratteri.",
 	"this-field-can-help-describe-the-content": "Quì puoi descrivere il contenuto in poche parole. Non più di 150 caratteri.",
+	
 	"delete-the-user-and-all-its-posts":"Elimina l'utente e tutti i suoi articoli",
 	"delete-the-user-and-associate-its-posts-to-admin-user": "Elimina l'utente e assegna i suoi articoli all'utente admin",
 	"read-more": "Leggi tutto",
@ -139,8 +140,8 @@
 	"whats-next": "Passi successivi",

 	"follow-bludit-on": "Segui Bludit su",
-	"visit-the-support-forum": "Visita il [forum](http://forum.bludit.com) per supporto",
-	"read-the-documentation-for-more-information": "Leggi la [documentazione](http://docs.bludit.com) per ulteriori informazioni",
+	"visit-the-support-forum": "Visita il [forum](https://forum.bludit.com) per supporto",
+	"read-the-documentation-for-more-information": "Leggi la [documentazione](https://docs.bludit.com) per ulteriori informazioni",
 	"share-with-your-friends-and-enjoy": "Condividi con i tuoi amici",
 	"the-page-has-not-been-found": "La pagina non è stata trovata.",
 	"error": "Errore",
@ -195,7 +196,7 @@
 	"edit-or-remove-your-blogs-posts": "Modifica o elimina articoli del blog.",
 	"general-settings": "Impostazioni generali",
 	"advanced-settings": "Impostazioni avanzate",
-	"manage-users": "Gestisci utenti",
+	"manage-users": "Amministra utenti",
 	"view-and-edit-your-profile": "Visualizza e modifica il tuo profilo.",

 	"password-must-be-at-least-6-characters-long": "La Password deve contenere almeno 6 caratteri",
@ -222,9 +223,17 @@
 	"cover-image": "Immagine di copertina",
 	"blog": "Blog",
 	"more-images": "Più immagini",
-	"double-click-on-the-image-to-add-it": "Clicca due volte sull'immagine da inserire.",
+
 	"click-here-to-cancel": "Clicca quì per annullare.",
 	"type-the-tag-and-press-enter": "Scrivi il tag e premi invio.",
-	"manage-your-bludit-from-the-admin-panel": "Gestisci Bludit dal [pannello di amministrazione]({{ADMIN_AREA_LINK}})",
-	"there-are-no-images":"Non ci sono immagini"
+	"add": "Aggiungi",
+	"manage-your-bludit-from-the-admin-panel": "Amministra Bludit dal [pannello di amministrazione]({{ADMIN_AREA_LINK}})",
+	"there-are-no-images":"Non ci sono immagini",
+
+	"click-on-the-image-for-options": "Clicca sull'immagine per le opzioni.",
+	"set-as-cover-image": "Set as cover image",
+	"delete-image": "Elimima immagine",
+	"image-description": "Descrizione dell'immagine",
+
+	"social-networks-links": "Social Networks"
 }
--- a/bl-languages/ja_JP.json
+++ b/bl-languages/ja_JP.json
@ -140,8 +140,8 @@
 	"whats-next": "この次は",

 	"follow-bludit-on": "Bluditをフォローする",
-	"visit-the-support-forum": "サポート[フォーラム](http:\/\/forum.bludit.com)(英語)に参加する",
-	"read-the-documentation-for-more-information": "詳細について[文書](http:\/\/docs.bludit.com)を読む",
+	"visit-the-support-forum": "サポート[フォーラム](https:\/\/forum.bludit.com)(英語)に参加する",
+	"read-the-documentation-for-more-information": "詳細について[文書](https:\/\/docs.bludit.com)を読む",
 	"share-with-your-friends-and-enjoy": "友人と共有して楽しむ",
 	"the-page-has-not-been-found": "ページが見つかりません。",
 	"error": "エラー",
--- a/bl-languages/ms_MY.json
+++ b/bl-languages/ms_MY.json
@ -141,8 +141,8 @@
 	"whats-next": "Apa yang anda boleh lakukan seterusnya?",

 	"follow-bludit-on": "Ikut Bludit di",
-	"visit-the-support-forum": "Lawat [forum](http://forum.bludit.com) untuk bantuan",
-	"read-the-documentation-for-more-information": "Baca [documentasi](http://docs.bludit.com) untuk maklumat lanjut",
+	"visit-the-support-forum": "Lawat [forum](https://forum.bludit.com) untuk bantuan",
+	"read-the-documentation-for-more-information": "Baca [documentasi](https://docs.bludit.com) untuk maklumat lanjut",
 	"share-with-your-friends-and-enjoy": "Share with your friends and enjoy",
 	"share-with-your-friends-and-enjoy": "Kongsi dengan rakan anda dan berseronoklah",
 	"the-page-has-not-been-found": "Halaman ini tidak dapat dijumpai.",
--- a/bl-languages/nl_NL.json
+++ b/bl-languages/nl_NL.json
@ -141,8 +141,8 @@
        "whats-next": "Wat nu",
        "manage-your-bludit-from-the-admin-panel": "Beheer Bludit vanuit [admin area](./admin/)",
        "follow-bludit-on": "Volg Bludit via",
-        "visit-the-support-forum": "Bezoek het [forum](http://forum.bludit.com) voor ondersteuning",
-        "read-the-documentation-for-more-information": "Lees de [documentatie](http://docs.bludit.com) voor meer informatie",
+        "visit-the-support-forum": "Bezoek het [forum](https://forum.bludit.com) voor ondersteuning",
+        "read-the-documentation-for-more-information": "Lees de [documentatie](https://docs.bludit.com) voor meer informatie",
        "share-with-your-friends-and-enjoy": "Deel met je vrienden en veel plezier",
        "the-page-has-not-been-found": "Pagina is niet gevonden.",
        "error": "Error",
--- a/bl-languages/pl_PL.json
+++ b/bl-languages/pl_PL.json
@ -1,22 +1,22 @@
 {
 	"language-data":
 	{
-		"native": "Polish - Polski",
+		"native": "Polski (Polska)",
 		"english-name": "Polish",
-		"last-update": "2015-12-03",
-		"author": "tom-asz",
-		"email": "",
-		"website": "tomektutoria.eu"
+		"last-update": "2016-02-14",
+		"author": "Dave",
+		"email": "dawid.stawicki@windowslive.com",
+		"website": "http://dave.de/"
 	},

 	"username": "Użytkownik",
 	"password": "Hasło",
-	"confirm-password": "Potwierdź hasło",
-	"editor": "Edytor",
-	"dashboard": "Pulpit nawigacyjny",
+	"confirm-password": "Potwierdzenie hasła",
+	"editor": "Redaktor",
+	"dashboard": "Kokpit",
 	"role": "Rola",
-	"post": "Post",
-	"posts": "Posty",
+	"post": "Wpis",
+	"posts": "Wpisy",
 	"users": "Użytkownicy",
 	"administrator": "Administrator",
 	"add": "Dodaj",
@ -25,55 +25,55 @@
 	"title": "Tytuł",
 	"no-parent": "Bez rodzica",
 	"edit-page": "Edytuj stronę",
-	"edit-post": "Edytuj post",
-	"add-a-new-user": "Dodaj nowego użytkownika",
+	"edit-post": "Edytuj wpis",
+	"add-a-new-user": "Nowy użytkownik",
 	"parent": "Rodzic",
-	"friendly-url": "Przyjazny URL",
+	"friendly-url": "Przyjazny odnośnik URL",
 	"description": "Opis",
-	"posted-by": "Napisane przez",
+	"posted-by": "Napisał(a)",
 	"tags": "Tagi",
 	"position": "Pozycja",
 	"save": "Zapisz",
-	"draft": "Projekt",
+	"draft": "Szkic",
 	"delete": "Usuń",
-	"registered": "Zarejestrowany",
+	"registered": "Data rejestracji",
 	"Notifications": "Powiadomienia",
 	"profile": "Profil",
 	"email": "Email",
 	"settings": "Ustawienia",
 	"general": "Ogólne",
 	"advanced": "Zaawansowane",
-	"regional": "Regionalne",
-	"about": "O nas",
+	"regional": "Region",
+	"about": "O mnie",
 	"login": "Zaloguj",
 	"logout": "Wyloguj",
-	"manage": "Zarządzaj",
+	"manage": "Zarządzanie",
 	"themes": "Motywy",
 	"prev-page": "Poprzednia strona",
 	"next-page": "Następna strona",
-	"configure-plugin": "Skonfiguruj plugin",
-	"confirm-delete-this-action-cannot-be-undone": "Potwierdź usunięcie, czynność ta nie może być cofnięta.",
+	"configure-plugin": "Konfiguracja wtyczki",
+	"confirm-delete-this-action-cannot-be-undone": "Potwierdzenie usunięcia. Ta operacja jest nieodwracalna.",
 	"site-title": "Nazwa strony",
 	"site-slogan": "Slogan strony",
 	"site-description": "Opis strony",
 	"footer-text": "Tekst w stopce",
-	"posts-per-page": "Posty na stronie:",
-	"site-url": "Adres strony",
-	"writting-settings": "Ustawienie pisania",
-	"url-filters": "Filtr URL",
+	"posts-per-page": "Liczba wpisów na stronę",
+	"site-url": "Adres URL strony",
+	"writting-settings": "Ustawienia pisania",
+	"url-filters": "Filtry URL",
 	"page": "Strona",
 	"pages": "Strony",
-	"home": "Home",
-	"welcome-back": "Witaj ponownie",
+	"home": "Strona główna",
+	"welcome-back": "Cześć, ",
 	"language": "Język",
-	"website": "Strona WWW",
+	"website": "Powrót do strony",
 	"timezone": "Strefa czasowa",
-	"locale": "Ustawienia regionalne",
-	"new-post": "Nowy post",
+	"locale": "Lokalizacja",
+	"new-post": "Nowy wpis",
 	"new-page": "Nowa strona",
-	"html-and-markdown-code-supported": "Kod HTML i Markdown obsługiwany",
-	"manage-posts": "Zarządzaj postami",
-	"published-date": "Data opublikowania",
+	"html-and-markdown-code-supported": "Znaczniki HTML i Markdown są wspierane",
+	"manage-posts": "Zarządzanie wpisami",
+	"published-date": "Data publikacji",
 	"modified-date": "Data modyfikacji",
 	"empty-title": "Brak tytułu",
 	"plugins": "Wtyczki",
@ -85,138 +85,154 @@
 	"first-name": "Imię",
 	"last-name": "Nazwisko",
 	"bludit-version": "Wersja Bludit",
-	"powered-by": "Silnik",
-	"recent-posts": "Najnowsze posty",
-	"manage-pages": "Zarządzaj stronami",
-	"advanced-options": "Zaawansowane opcje",
-	"user-deleted": "Użytkownik usunięty",
-	"page-added-successfully": "Strona dodany pomyślnie",
-	"post-added-successfully": "Post dodany pomyślnie",
-	"the-post-has-been-deleted-successfully": "Post został pomyślnie usunięty",
+	"powered-by": "Napędza",
+	"recent-posts": "Ostatnie wpisy",
+	"manage-pages": "Zarządzanie stronami",
+	"advanced-options": "Zaawansowane",
+	"user-deleted": "Użytkownik został usunięty",
+	"page-added-successfully": "Strona została pomyślnie dodana",
+	"post-added-successfully": "Wpis został pomyślnie dodany",
+	"the-post-has-been-deleted-successfully": "Wpis został pomyślnie usunięty",
 	"the-page-has-been-deleted-successfully": "Strona została pomyślnie usunięta",
-	"username-or-password-incorrect": "Nazwa użytkownika lub hasło nieprawidłowe",
-	"database-regenerated": "Baza danych regenerowana",
+	"username-or-password-incorrect": "Nazwa użytkownika lub hasło jest nieprawidłowe",
+	"database-regenerated": "Baza danych została naprawiona",
 	"the-changes-have-been-saved": "Zmiany zostały zapisane",
-	"enable-more-features-at": "Włącz więcej funkcji w",
+	"enable-more-features-at": "Włącz więcej możliwości w",
 	"username-already-exists": "Nazwa użytkownika już istnieje",
-	"username-field-is-empty": "Pole nazwa użytkownika jest puste",
-	"the-password-and-confirmation-password-do-not-match":"Hasło i potwierdzenie hasła nie pasują do siebie",
-	"user-has-been-added-successfully": "Użytkownik został dodany pomyślnie",
-	"you-do-not-have-sufficient-permissions": "Nie masz wystarczających uprawnień dostępu do tej strony, skontaktuj się z administratorem.",
+	"username-field-is-empty": "Nazwa użytkownika nie może być pusta",
+	"the-password-and-confirmation-password-do-not-match":"Wprowadzone hasła nie pasują do siebie",
+	"user-has-been-added-successfully": "Użytkownik został pomyślnie dodany",
+	"you-do-not-have-sufficient-permissions": "Nie masz dostępu do tego. Prosimy o kontakt z administratorem strony.",
 	"settings-advanced-writting-settings": "Ustawienia->Zaawansowane->Ustawienia pisania",
-	"new-posts-and-pages-synchronized": "Nowe posty i strony zsynchronizowane.",
-	"you-can-choose-the-users-privilege": "Możesz wybrać przywilej użytkownika. Edytor może tylko pisać strony i posty.",
-	"email-will-not-be-publicly-displayed": "E-mail nie będzie wyświetlany publicznie. Zalecany dla odzyskiwania hasła i powiadomień.",
-	"use-this-field-to-name-your-site": "Pole to służy do nazwy witryny, pojawi się na górze każdej stronie.",
-	"use-this-field-to-add-a-catchy-phrase": "Pole to służy do dodawania chwytliwego tytułu na swojej stronie.",
-	"you-can-add-a-site-description-to-provide": "Możesz dodać opis witryny, aby zapewnić krótki życiorys lub opis swojej strony.",
-	"you-can-add-a-small-text-on-the-bottom": "Możesz dodać mały tekst na dole każdej strony. np: prawo autorskie, właściciel, daty, itp",
-	"number-of-posts-to-show-per-page": "Wyświetlana iczba postów na stronie.",
-	"the-url-of-your-site": "Adres URL witryny.",
-	"add-or-edit-description-tags-or": "Dodać lub edytować opis, tagi lub zmodyfikować przyjazne URL.",
-	"select-your-sites-language": "Wybierz język witryny.",
-	"select-a-timezone-for-a-correct": "Wybierz strefę czasową, dla prawidłowego wyświetlania data / czas na swojej stronie.",
-	"you-can-use-this-field-to-define-a-set-of": "Możesz użyć tego pola, aby zdefiniować zestaw parametrów związanych z językiem, kraju i szczególnych preferencji.",
-	"you-can-modify-the-url-which-identifies":"Możesz zmienić adres URL, który identyfikuje stronę lub pisać przy użyciu słów kluczowych w postaci czytelnej dla człowieka. Nie więcej niż 150 znaków.",
-	"this-field-can-help-describe-the-content": "To pole może pomóc opisać zawartość w kilku słowach. Nie więcej niż 150 znaków.",
+	"new-posts-and-pages-synchronized": "Nowe wpisy i strony zostały zsynchronizowane.",
+	"you-can-choose-the-users-privilege": "Wybierz przywileje tego użytkownika. Rola redaktora zezwala wyłącznie na tworzenie nowych wpisów i stron.",
+	"email-will-not-be-publicly-displayed": "Adres email nie zostanie opublikowany, jednak zaleca się jego wprowadzenie w celu odzyskania utraconego hasła oraz powiadomień dostarczanych ze strony.",
+	"use-this-field-to-name-your-site": "Nazwa strony zostanie wyświetlona na każdej podstronie Twojej witryny.",
+	"use-this-field-to-add-a-catchy-phrase": "Krótki i chwytliwy slogan Twojej strony.",
+	"you-can-add-a-site-description-to-provide": "Wprowadź opis strony, aby wyjaśnić jej przeznaczenie.",
+	"you-can-add-a-small-text-on-the-bottom": "Krótka informacja wyświetlająca się na każdej podstronie. Dla przykładu: prawa autorskie, właściciel, data, etc.",
+	"number-of-posts-to-show-per-page": "Liczba wpisów wyświetlanych na jednej stronie.",
+	"the-url-of-your-site": "Adres URL Twojej strony.",
+	"add-or-edit-description-tags-or": "Dodaj lub edytuj opis, tagi oraz zmodyfikuj przyjazne adresy URL.",
+	"select-your-sites-language": "Wybierz język strony",
+	"select-a-timezone-for-a-correct": "Wybierz strefę czasową by prawidłowo wyświetlać datę/czas na Twojej stronie.",
+	"you-can-use-this-field-to-define-a-set-of": "Możesz użyć to pole, aby zdefiniować parametry związane z językiem, krajem i innymi ustawieniami.",
+	"you-can-modify-the-url-which-identifies":"Możesz zmieniń adres URL wpisu lub strony, aby wyglądał bardziej czytelnie dla człowieka. Nie więcej niż 150 znaków.",
+	"this-field-can-help-describe-the-content": "To pole pomoże krótko opisać Twój wpis w kilku słowach. Nie więcej niż 150 znaków.",

-	"delete-the-user-and-all-its-posts":"Usuń użytkownika i wszystkich jego posty",
-	"delete-the-user-and-associate-its-posts-to-admin-user": "Usuń użytkownika i powiązać jego posty do użytkownika administratora",
-	"read-more": "Więcej",
-	"show-blog": "Zobacz blog",
+	"delete-the-user-and-all-its-posts":"Usuń tego użytkownika i wszystkie jego wpisy",
+	"delete-the-user-and-associate-its-posts-to-admin-user": "Usuń tego użytkownika a wszystkie jego wpisy przypisz administratorowi",
+	"read-more": "Czytaj więcej",
+	"show-blog": "Blog z wpisami",
 	"default-home-page": "Domyślna strona główna",
 	"version": "Wersja",
-	"there-are-no-drafts": "Brak projektów.",
-	"create-a-new-article-for-your-blog":"Utwórz nowy artykuł na swoim blogu.",
-	"create-a-new-page-for-your-website":"Tworzenie nowej strony na swojej stronie internetowej.",
-	"invite-a-friend-to-collaborate-on-your-website":"Zaproś przyjaciół do współpracy na swojej stronie internetowej.",
-	"change-your-language-and-region-settings":"Zmień ustawienia języka i regionu.",
-	"language-and-timezone":"Język i strefa czasowa",
+	"there-are-no-drafts": "Brak szkiców.",
+	"create-a-new-article-for-your-blog":"Utwórz nowy wpis na Twoim blogu.",
+	"create-a-new-page-for-your-website":"Utwórz nową stronę na Twoim blogu.",
+	"invite-a-friend-to-collaborate-on-your-website":"Zaproś przyjaciela do współpracy",
+	"change-your-language-and-region-settings":"Zmień język i ustawienia regionu strony.",
+	"language-and-timezone":"Język i czas",
 	"author": "Autor",
-	"start-here": "Zacznij tutaj",
+	"start-here": "Start",
 	"install-theme": "Zainstaluj motyw",
-	"first-post": "Pierwszy post",
-	"congratulations-you-have-successfully-installed-your-bludit": "Gratulacje pomyślnie zainstalowano **Bludit**",
-	"whats-next": "Co dalej",
-	"manage-your-bludit-from-the-admin-panel": "Zarządzaj Bludit z [obszaru administracyjnego](./admin/)",
-	"follow-bludit-on": "Śledź Bludit na",
-	"visit-the-support-forum": "Odwiedź [forum](http://forum.bludit.com) wsparcia",
-	"read-the-documentation-for-more-information": "Przeczytaj [dokumentację](http://docs.bludit.com) po więcej informacji",
-	"share-with-your-friends-and-enjoy": "Podziel się z przyjaciółmi i ciesz się z Bludit",
+	"first-post": "Pierwszy wpis ",
+	"congratulations-you-have-successfully-installed-your-bludit": "Gratulację, Twój **Bludit** został zainstalowany pomyślnie.",
+	"whats-next": "Co teraz?",
+	"manage-your-bludit-from-the-admin-panel": "Zarządzaj blogiem z poziomu [kokpitu](./admin/)",
+	"follow-bludit-on": "Obserwuj Bludit w serwisach",
+	"visit-the-support-forum": "Zajrzyj na [forum wsparcia](http://forum.bludit.com) by otrzymać pomoc",
+	"read-the-documentation-for-more-information": "Przeczytaj [dokumentacje](http://docs.bludit.com) by dowiedzieć się więcej informacji",
+	"share-with-your-friends-and-enjoy": "udostępnij tę stronę swoim znajomym i baw się dobrze",
 	"the-page-has-not-been-found": "Strona nie została odnaleziona.",
 	"error": "Błąd",
-	"bludit-installer": "Bludit Instalator",
-	"welcome-to-the-bludit-installer": "Zapraszamy do instalatora Bludit",
-	"complete-the-form-choose-a-password-for-the-username-admin": "Wpisz hasło dla użytkownika « admin »",
-	"password-visible-field": "Hasło, widoczne pola!",
-	"install": "Instaluj",
-	"choose-your-language": "Wybierz język",
+	"bludit-installer": "Instalator Bludit",
+	"welcome-to-the-bludit-installer": "Witamy w instalatorze Bludit",
+	"complete-the-form-choose-a-password-for-the-username-admin": "Uzupełnij formularz, wybierz hasło dla użytkownika « admin »",
+	"password-visible-field": "Password, visible field!",
+	"install": "Zainstaluj",
+	"choose-your-language": "Wybierz swój język",
 	"next": "Dalej",
-	"the-password-field-is-empty": "Pole hasło jest puste",
-	"your-email-address-is-invalid":"Twój adres e-mail jest nieprawidłowy.",
-	"proceed-anyway": "Kontynuuj mimo to!",
-	"drafts":"Projekt",
+	"the-password-field-is-empty": "Proszę wprowadzić hasło",
+	"your-email-address-is-invalid":"Wprowadzony adres email jest nieprawidłowy.",
+	"proceed-anyway": "Kontynnuj mimo to!",
+	"drafts":"Szkice",
 	"ip-address-has-been-blocked": "Adres IP został zablokowany.",
 	"try-again-in-a-few-minutes": "Spróbuj ponownie za kilka minut.",
 	"date": "Data",

-	"scheduled": "Zaplanowane",
+	"scheduled": "Zaplanowany",
 	"publish": "Opublikuj",
-	"please-check-your-theme-configuration": "Proszę sprawdzić konfigurację szablonu.",
-	"plugin-label": "Etykieta pluginu",
+	"please-check-your-theme-configuration": "Proszę sprawdzić ustawienia motywu.",
+	"plugin-label": "Etykieta wtyczki",
 	"enabled": "Włączony",
 	"disabled": "Wyłączony",
 	"cli-mode": "Tryb Cli",
-	"command-line-mode": "Tryb wiersza poleceń",
-	"enable-the-command-line-mode-if-you-add-edit": "Włącz tryb linii poleceń, jeśli dodajesz, edytujesz lub usuwasz posty i strony z systemu plików",
+	"command-line-mode": "Wiersz poleceń",
+	"enable-the-command-line-mode-if-you-add-edit": "Włącz wiersz poleceń, kiedy dodajesz, edytujesz lub usuwasz wpisy oraz strony poprzez system plików.",

 	"configure": "Konfiguruj",
 	"uninstall": "Odinstaluj",
 	"change-password": "Zmień hasło",
-	"to-schedule-the-post-just-select-the-date-and-time": "Aby zaplanować post, po prostu wybierz date i czas.",
-	"write-the-tags-separated-by-commas": "Dodaj tagi oddzielając je przecinkami.",
+	"to-schedule-the-post-just-select-the-date-and-time": "Aby zaplanować wpis, po prostu wybierz datę i czas.",
+	"write-the-tags-separated-by-commas": "Wprowadź tagi oddzielone przecinkiem.",
 	"status": "Status",
-	"published": "Opublikowane",
-	"scheduled-posts": "Zaplanowane posty",
-	"statics": "Statyki",
+	"published": "Opublikowany",
+	"scheduled-posts": "Zaplanowane wpisy",
+	"statistics": "Statystyki",
 	"name": "Nazwa",
-	"email-account-settings":"Ustawienia konta e-mail",
-	"sender-email": "E-mail nadawcy",
-	"emails-will-be-sent-from-this-address":"Wiadomości e-mail będą wysyłane z tego adresu.",
-	"bludit-login-access-code": "BLUDIT - Logowanie do kodu dostępu",
-	"check-your-inbox-for-your-login-access-code":"Sprawdź swoją skrzynkę odbiorczą dla kodu dostępu do logowania",
-	"there-was-a-problem-sending-the-email":"Wystąpił problem podczas wysyłania wiadomości e-mail",
-	"back-to-login-form": "Powrót do formularza logowania",
-	"send-me-a-login-access-code": "Wyślij mi kod dostępu do logowania",
-	"get-login-access-code": "Pobierz kod dostępu do logowania",
-	"email-notification-login-access-code": "<p>To jest powiadomienie z twojej strony {{WEBSITE_NAME}}</p><p>Poprosiłeś o kod dostępu do logowania, należy do kliknąć w link:</p><p>{{LINK}}</p>",
-	"there-are-no-scheduled-posts": "Nie ma zaplanowanych postów.",
-	"show-password": "Pokaż Hasło",
-	"edit-or-remove-your=pages": "Edytuj lub usuń swoje strony.",
-	"edit-or-remove-your-blogs-posts": "Edytuj lub usuń posty bloga.",
-	"general-settings": "Ustawienia ogólne",
-	"advanced-settings": "Ustawienia zaawansowane",
-	"manage-users": "Zarządzaj użytkownikami",
-	"view-and-edit-your-profile": "Przeglądać i edytować swój profil.",
+	"email-account-settings":"Ustawienia konta email",
+	"sender-email": "Adres nadawcy",
+	"emails-will-be-sent-from-this-address":"Wszystkie wiadomości email będą wysyłane z tego adresu.",
+	"bludit-login-access-code": "BLUDIT - kod dostępu logowania",
+	"check-your-inbox-for-your-login-access-code":"Sprawdź swoją skrzynkę odbiorczą",
+	"there-was-a-problem-sending-the-email":"Wystąpił problem z wysłaniem wiadomości",
+	"back-to-login-form": "Powrót do logowania",
+	"send-me-a-login-access-code": "Wyślij kod dostępu do logowania",
+	"get-login-access-code": "Otrzymaj kod dostępu logowania",
+	"email-notification-login-access-code": "<p>Powiadomienie ze strony {{WEBSITE_NAME}}</p><p>Jeśli zarządałeś kodu dostępu do logowania, zajrzyj na stronę:</p><p>{{LINK}}</p>",
+	"there-are-no-scheduled-posts": "Brak zaplanowanych wpisów.",
+	"show-password": "Pokaż hasło",
+	"edit-or-remove-your=pages": "Edytuj lub usuń strony na Twoim blogu.",
+	"edit-or-remove-your-blogs-posts": "Edytuj lub usuń wpisy na Twoim blogu.",
+	"general-settings": "Ustawienia",
+	"advanced-settings": "Zaawansowane",
+	"manage-users": "Zarządzanie użytkownikami",
+	"view-and-edit-your-profile": "Zobacz i edytuj swój profil.",

-	"password-must-be-at-least-6-characters-long": "Hasło musi mieć co najmniej 6 znaków",
-	"images": "Obrazy",
-	"upload-image": "Wgraj obraz",
-	"drag-and-drop-or-click-here": "Przeciągnij i upuść lub kliknij tutaj",
-	"insert-image": "Wstaw obraz",
-	"supported-image-file-types": "Obsługiwane typy plików graficznych",
+	"password-must-be-at-least-6-characters-long": "Hasło musi zawierać przynajmniej 6 znaków",
+	"images": "Obrazki",
+	"upload-image": "Wyślij obrazek",
+	"drag-and-drop-or-click-here": "Przenieś i upuść lub kliknij tutaj",
+	"insert-image": "Wprowadź obrazek",
+	"supported-image-file-types": "Wspierane formaty graficzne",
 	"date-format": "Format daty",
 	"time-format": "Format czasu",
-	"chat-with-developers-and-users-on-gitter":"Czat z programistami i użytkownikami [Gitter](https://gitter.im/dignajar/bludit)",
-	"this-is-a-brief-description-of-yourself-our-your-site":"To jest krótki opis siebie lub swojej strony, by zmienić ten tekst przejdż do panelu administratora, ustawienia, wtyczki i skonfigurować wtyczkę O nas.",
+	"chat-with-developers-and-users-on-gitter":"Dołącz do dyskusji z twórcami i użytkownikami na [Gitter](https://gitter.im/dignajar/bludit)",
+	"this-is-a-brief-description-of-yourself-our-your-site":"To jest krótki opis strony lub Ciebie. Aby zmienić treść tej strony udaj się do kokpitu, a następnie przejdź w ustawienia, wtyczki i wybierz konfigurację na liście O mnie.",
 	"profile-picture": "Zdjęcie profilowe",
-	"the-about-page-is-very-important": "Strona O nas jest ważnym narzędziem dla potencjalnych klientów i partnerów. Dla tych, którzy się zastanawiają, kto jest na stronie internetowej, twoja informacja o stronie jest pierwszym źródłem informacji.",
-	"change-this-pages-content-on-the-admin-panel": "Zmień zawartość tej strony w panelu administratora, zarządzanie, strony i kliknij na stronę opisującą.",
-	"about-your-site-or-yourself": "Informacje o stronie lub o sobie",
+	"the-about-page-is-very-important": "Strona o mnie może okazać się ważnym narzędziem dla potencjalnych klientów i patrtnerów. Ci, którzy będą są zainteresowani sprawdzić, kto prowadzi stronę, najchętniej udadzą się właśnie przeczytać informacje o jej autorze.",
+	"change-this-pages-content-on-the-admin-panel": "Możesz zmienić treść tej strony przechodząc kolejno do kokpitu, zarządzanie, strony.",
+	"about-your-site-or-yourself": "O stronie lub o Tobie",
 	"welcome-to-bludit": "Witamy w Bludit",
 	
-	"site-information": "Informacje o witrynie",
+	"site-information": "Informacje o stronie",
 	"date-and-time-formats": "Format daty i czasu",
 	"activate": "Aktywuj",
-	"deactivate": "Dezaktywuj"
+	"deactivate": "Dezaktywuj",
+	
+	"cover-image": "Okładka wpisu",
+	"blog": "Blog",
+	"more-images": "Więcej obrazków",
+	"double-click-on-the-image-to-add-it": "Kliknij dwukrotnie w obrazek by go umieścić we wpisie.",
+	"click-here-to-cancel": "Anuluj.",
+	"type-the-tag-and-press-enter": "Wprowadź tag i wciśnij enter.",
+	"manage-your-bludit-from-the-admin-panel": "Zarządzaj stroną poprzez [kokpit]({{ADMIN_AREA_LINK}})",
+	"there-are-no-images":"Brak obrazków",
+	
+	"click-on-the-image-for-options": "Kliknij na obrazek, aby wyświetlić więcej opcji.",
+	"set-as-cover-image": "Ustaw jako okładkę wpisu",
+	"delete-image": "Usuń",
+	"image-description": "Opis obrazka",
+
+	"social-networks-links": "Odnośniki do serwisów społecznościowych"
 }
--- a/bl-languages/ru_RU.json
+++ b/bl-languages/ru_RU.json
@ -6,7 +6,7 @@
 		"last-update": "2015-11-17",
 		"author": "Сергей Ворон",
 		"email": "sergey@voron.pw",
-		"website": "voron.pw"
+		"website": "http://voron.pw"
 	},

 	"username": "Логин",
@ -140,8 +140,8 @@
 	"whats-next": "Что дальше",
 	"manage-your-bludit-from-the-admin-panel": "Управляйте Bludit из [панели управления](./admin/)",
 	"follow-bludit-on": "Следуйте за Bludit в",
-	"visit-the-support-forum": "Посетите [форум](http://forum.bludit.com) для получения поддержки",
-	"read-the-documentation-for-more-information": "Прочтите [документацию](http://docs.bludit.com) для получения большей информации",
+	"visit-the-support-forum": "Посетите [форум](https://forum.bludit.com) для получения поддержки",
+	"read-the-documentation-for-more-information": "Прочтите [документацию](https://docs.bludit.com) для получения большей информации",
 	"share-with-your-friends-and-enjoy": "Делитесь с друзьями и наслаждайтесь",
 	"the-page-has-not-been-found": "Страница не найдена.",
 	"error": "Ошибка",
@ -223,9 +223,21 @@
 	"cover-image": "Обложка",
 	"blog": "Блог",
 	"more-images": "Еще изображения",
-	"double-click-on-the-image-to-add-it": "Дважды щелкните по изображению, чтобы добавить его.",
+
 	"click-here-to-cancel": "Нажмите здесь, чтобы отменить.",
 	"type-the-tag-and-press-enter": "Введите тег и нажмите клавишу Enter.",
+	"add": "Добавить",
 	"manage-your-bludit-from-the-admin-panel": "Управляйте Bludit из [панели управления]({{ADMIN_AREA_LINK}})",
-	"there-are-no-images":"Изображений нет"
+	"there-are-no-images":"Изображений нет",
+
+	"click-on-the-image-for-options": "Нажмите на изображение для выбора опций.",
+	"set-as-cover-image": "Установить как обложку",
+	"delete-image": "Удалить изображение",
+	"image-description": "Описание изображения",
+
+	"social-networks": "Социальные сети",
+	"twitter-username": "Имя пользователя в Twitter",
+	"facebook-username": "Имя пользователя в Facebook",
+	"google-username": "Имя пользователя в Google",
+	"instagram-username": "Имя пользователя в Instagram"
 }
--- a/bl-languages/tr_TR.json
+++ b/bl-languages/tr_TR.json
@ -6,7 +6,7 @@
 		"last-update": "2015-12-02",
 		"author": "ffahri",
 		"email": "",
-		"website": "github.com/ffahri"
+		"website": "https://github.com/ffahri"
 	},

 	"username": "Kullanıcı Adı",
@ -140,8 +140,8 @@
 	"whats-next": "Sırada Ne Var",
 	"manage-your-bludit-from-the-admin-panel": "Bluditini buradan yönet [yönetici alanı](./admin/)",
 	"follow-bludit-on": "Follow Bludit on",
-	"visit-the-support-forum": "Destek için [forum](http://forum.bludit.com) forumu ziyaret edin",
-	"read-the-documentation-for-more-information": "Daha fazla bilgi için [documentation](http://docs.bludit.com) dökümanları okuyun",
+	"visit-the-support-forum": "Destek için [forum](https://forum.bludit.com) forumu ziyaret edin",
+	"read-the-documentation-for-more-information": "Daha fazla bilgi için [documentation](https://docs.bludit.com) dökümanları okuyun",
 	"share-with-your-friends-and-enjoy": "Arkadaşlarına paylaş ve eğlen",
 	"the-page-has-not-been-found": "Sayfa bulunamadı.",
 	"error": "Hata",
--- a/bl-languages/uk_UA.json
+++ b/bl-languages/uk_UA.json
@ -3,10 +3,10 @@
 	{
 		"native": "Українська (Україна)",
 		"english-name": "Ukrainian",
-		"last-update": "2016-01-23",
+		"last-update": "2016-02-20",
 		"author": "Allec Bernz",
 		"email": "admin@allec.info",
-		"website": "allec.info"
+		"website": "http://allec.info"
 	},

 	"username": "Ім'я користувача",
@ -37,7 +37,7 @@
 	"draft": "Чернетка",
 	"delete": "Видалити",
 	"registered": "Зареєстрований",
-	"Notifications": "Сповіщення",
+	"notifications": "Повідомлення",
 	"profile": "Профіль",
 	"email": "Email",
 	"settings": "Параметри",
@ -140,8 +140,8 @@
 	"whats-next": "Що далі",

 	"follow-bludit-on": "Слідуйте за Bludit на",
-	"visit-the-support-forum": "Відвідайте [форум](http://forum.bludit.com) для підтримки",
-	"read-the-documentation-for-more-information": "Читайте [документацію](http://docs.bludit.com) для отримання додаткової інформації",
+	"visit-the-support-forum": "Відвідайте [форум](https://forum.bludit.com) для підтримки",
+	"read-the-documentation-for-more-information": "Читайте [документацію](https://docs.bludit.com) для отримання додаткової інформації",
 	"share-with-your-friends-and-enjoy": "Поділіться з друзями та насолоджуйтеся",
 	"the-page-has-not-been-found": "Сторінку не знайдено.",
 	"error": "Помилка",
@ -223,9 +223,17 @@
 	"cover-image": "Зображення обкладинки",
 	"blog": "Блог",
 	"more-images": "Більше зображень",
-	"double-click-on-the-image-to-add-it": "Двічі клацніть на зображення, щоб додати його.",
+
 	"click-here-to-cancel": "Натисніть тут, щоб скасувати.",
 	"type-the-tag-and-press-enter": "Введіть тег і натисніть Enter.",
+	"add": "Додати",
 	"manage-your-bludit-from-the-admin-panel": "Керуйте вашим Bludit через [панель управління]({{ADMIN_AREA_LINK}})",
-	"there-are-no-images":"Немає зображень"
+	"there-are-no-images":"Немає зображень",
+
+	"click-on-the-image-for-options": "Натисніть на зображення, щоб переглянути параметри.",
+	"set-as-cover-image": "Встановити в якості обкладинки",
+	"delete-image": "Видалити зображення",
+	"image-description": "Опис зображення",
+
+	"social-networks-links": "Лінки на соціальні мережі"
 }
--- a/bl-languages/zh_TW.json
+++ b/bl-languages/zh_TW.json
@ -140,8 +140,8 @@
 	"whats-next": "接下來",
 	"manage-your-bludit-from-the-admin-panel": "透過[admin area](./admin/)管理您的Bludit",
 	"follow-bludit-on": "Follow Bludit on",
-	"visit-the-support-forum": "拜訪[forum](http://forum.bludit.com)來取得支援",
-	"read-the-documentation-for-more-information": "閱讀[documentation](http://docs.bludit.com)來獲得更多資訊",
+	"visit-the-support-forum": "拜訪[forum](https://forum.bludit.com)來取得支援",
+	"read-the-documentation-for-more-information": "閱讀[documentation](https://docs.bludit.com)來獲得更多資訊",
 	"share-with-your-friends-and-enjoy": "分享給您的朋友們",
 	"the-page-has-not-been-found": "此頁面不存在",
 	"error": "錯誤",
--- a/bl-plugins/about/languages/tr_TR.json
+++ b/bl-plugins/about/languages/tr_TR.json
@ -2,6 +2,6 @@
 	"plugin-data":
 	{
 		"name": "Hakkında",
-		"description": "Senin veya siten hakkında kısa bilgiler",
+		"description": "Senin veya siten hakkında kısa bilgiler"
 	}
 }
--- a/bl-plugins/disqus/languages/tr_TR.json
+++ b/bl-plugins/disqus/languages/tr_TR.json
@ -2,7 +2,7 @@
 	"plugin-data":
 	{
 		"name": "Disqus yorum sistemi",
-		"description": "Diqus siteler için yorum hostingi yapan bir hostingdir.Eklentiyi kullanmadan önce Disqus.com adresine kayıt olmanız gerekmektedir.",
+		"description": "Diqus siteler için yorum hostingi yapan bir hostingdir.Eklentiyi kullanmadan önce Disqus.com adresine kayıt olmanız gerekmektedir."
 	},
 	"disqus-shortname": "Disqus",
 	"enable-disqus-on-pages": "Sayfalar için Disqus'ı etkinleştir.",
--- a/bl-plugins/disqus/languages/uk_UA.json
+++ b/bl-plugins/disqus/languages/uk_UA.json
@ -0,0 +1,12 @@
+{
+	"plugin-data":
+	{
+		"name": "Система коментарів Disqus",
+		"description": "Disqus надає послуги хостингу коментарів для веб-сайтів. Необхідно зареєструватися на Disqus.com перед використанням цього плагіна."
+	},
+
+	"disqus-shortname": "Коротке ім'я в Disqus",
+	"enable-disqus-on-pages": "Включити Disqus на сторінках",
+	"enable-disqus-on-posts": "Включити Disqus у публікаціях",
+	"enable-disqus-on-default-home-page": "Включити Disqus на домашній сторінці"
+}
--- a/bl-plugins/googletools/languages/tr_TR.json
+++ b/bl-plugins/googletools/languages/tr_TR.json
@ -2,7 +2,7 @@
 	"plugin-data":
 	{
 		"name": "Google Araçları",
-		"description": "Bu eklenti Google Webmaster Araçlarını kullanabilmeniz ve sitenizin Google Analytics tarafından incelenebilmesi için geçerli bir meta tag ve Javascript kodu oluşturur.",
+		"description": "Bu eklenti Google Webmaster Araçlarını kullanabilmeniz ve sitenizin Google Analytics tarafından incelenebilmesi için geçerli bir meta tag ve Javascript kodu oluşturur."
 	},
 	"google-webmasters-tools": "Google Webmaster Araçları",
 	"google-analytics-tracking-id": "Google Analytics İzleme No",
--- a/bl-plugins/googletools/languages/uk_UA.json
+++ b/bl-plugins/googletools/languages/uk_UA.json
@ -0,0 +1,12 @@
+{
+	"plugin-data":
+	{
+		"name": "Інструменти Google",
+		"description": "Цей плагін генерує мета-тег для перевірки вашого сайту у Google Webmasters Tools і JavaScript-код для відстеження вашого сайту з Google Analytics."
+	},
+
+	"google-webmasters-tools": "Google Webmasters tools",
+	"google-analytics-tracking-id": "КОД відстеження Google Analytics",
+	"complete-this-field-with-the-google-site-verification": "Заповніть це поле для перевірки власника сайту.",
+	"complete-this-field-with-the-tracking-id": "Заповніть це поле для генерації Javascript-коду відстеження у Google Analytics."
+}
--- a/bl-plugins/latest_posts/languages/bg_BG.json
+++ b/bl-plugins/latest_posts/languages/bg_BG.json
@ -0,0 +1,10 @@
+{
+	"plugin-data":
+	{
+		"name": "Последни публикации",
+		"description": "Показва най-новите публикации."
+	},
+
+	"amount-of-posts": "Брой последни публикации",
+	"show-home-link": "Покажи връзка за начало"
+}
--- a/bl-plugins/latest_posts/languages/uk_UA.json
+++ b/bl-plugins/latest_posts/languages/uk_UA.json
@ -0,0 +1,10 @@
+{
+	"plugin-data":
+	{
+		"name": "Останні публікації",
+		"description": "Показує останні опубліковані публікації."
+	},
+
+	"amount-of-posts": "Кількість публікацій",
+	"show-home-link": "Показати лінк на домашню сторінку"
+}
--- a/bl-plugins/maintenancemode/languages/bg_BG.json
+++ b/bl-plugins/maintenancemode/languages/bg_BG.json
@ -5,6 +5,6 @@
 		"description": "Поставете вашия сайт на режим на поддръжка."
 	},

-	"enable-maintence-mode": "Активиране режим на поддръжка ",
+	"enable-maintenance-mode": "Активиране режим на поддръжка ",
 	"message": "Съобщение"
 }
--- a/bl-plugins/maintenancemode/languages/de_CH.json
+++ b/bl-plugins/maintenancemode/languages/de_CH.json
@ -5,6 +5,6 @@
 		"description": "Wartungsmodus für die Website mit Zugang zum Admin-Bereich."
 	},

-	"enable-maintence-mode": "Aktivierung des Wartungsmodus",
+	"enable-maintenance-mode": "Aktivierung des Wartungsmodus",
 	"message": "Auf der Website angezeigter Hinweis"
 }
--- a/bl-plugins/maintenancemode/languages/de_DE.json
+++ b/bl-plugins/maintenancemode/languages/de_DE.json
@ -5,6 +5,6 @@
 		"description": "Wartungsmodus für die Website mit Zugang zum Admin-Bereich."
 	},

-	"enable-maintence-mode": "Aktivierung des Wartungsmodus",
+	"enable-maintenance-mode": "Aktivierung des Wartungsmodus",
 	"message": "Auf der Website angezeigter Hinweis"
 }
--- a/bl-plugins/maintenancemode/languages/en_US.json
+++ b/bl-plugins/maintenancemode/languages/en_US.json
@ -5,6 +5,6 @@
 		"description": "Set your site on maintenance mode, you can access to admin area."
 	},

-	"enable-maintence-mode": "Enable maintence mode",
+	"enable-maintenance-mode": "Enable maintenance mode",
 	"message": "Message"
 }
--- a/bl-plugins/maintenancemode/languages/es_AR.json
+++ b/bl-plugins/maintenancemode/languages/es_AR.json
@ -5,6 +5,6 @@
 		"description": "Configura el sitio en modo mantenimiento, se puede acceder al panel de administración mientras tanto."
 	},

-	"enable-maintence-mode": "Habilitar modo mantenimiento",
+	"enable-maintenance-mode": "Habilitar modo mantenimiento",
 	"message": "Mensaje"
 }
--- a/bl-plugins/maintenancemode/languages/fr_FR.json
+++ b/bl-plugins/maintenancemode/languages/fr_FR.json
@ -5,6 +5,6 @@
 		"description": "Configurer votre site sur le mode de maintenance, vous pouvez accéder à la zone d'administration."
 	},

-	"enable-maintence-mode": "Activer le mode de maintence",
+	"enable-maintenance-mode": "Activer le mode de maintenance",
 	"message": "Message"
 }
--- a/bl-plugins/maintenancemode/languages/ja_JP.json
+++ b/bl-plugins/maintenancemode/languages/ja_JP.json
@ -5,6 +5,6 @@
 		"description": "メンテンナンス・モードに設定します。管理エリアにはアクセスできます。"
 	},

-	"enable-maintence-mode": "メンテンナンス・モードを有効にする",
+	"enable-maintenance-mode": "メンテンナンス・モードを有効にする",
 	"message": "メッセージ"
 }
--- a/bl-plugins/maintenancemode/languages/pl_PL.json
+++ b/bl-plugins/maintenancemode/languages/pl_PL.json
@ -5,6 +5,6 @@
 		"description": "Przełącz stronę w tryb konwersacji (wówczas działać będzie tylko kokpit)."
 	},

-	"enable-maintence-mode": "Włącz tryb konwersacji",
+	"enable-maintenance-mode": "Włącz tryb konwersacji",
 	"message": "Wiadomość"
 }
--- a/bl-plugins/maintenancemode/languages/ru_RU.json
+++ b/bl-plugins/maintenancemode/languages/ru_RU.json
@ -5,6 +5,6 @@
 		"description": "Установите ваш сайт в режим обслуживания, вы можете получить доступ к панели управления."
 	},

-	"enable-maintence-mode": "Включить режим обслуживания",
+	"enable-maintenance-mode": "Включить режим обслуживания",
 	"message": "Сообщение"
 }
--- a/bl-plugins/maintenancemode/languages/tr_TR.json
+++ b/bl-plugins/maintenancemode/languages/tr_TR.json
@ -2,9 +2,9 @@
 	"plugin-data":
 	{
 		"name": "Bakım Modu",
-		"description": "Sitenizi bakım moduna alın, admin paneline erişmeye devam edebilirsiniz.",
+		"description": "Sitenizi bakım moduna alın, admin paneline erişmeye devam edebilirsiniz."
 	},

-	"enable-maintence-mode": "Bakım modunu etkinleştir.",
+	"enable-maintenance-mode": "Bakım modunu etkinleştir.",
 	"message": "Mesaj"
 }
--- a/bl-plugins/maintenancemode/languages/uk_UA.json
+++ b/bl-plugins/maintenancemode/languages/uk_UA.json
@ -0,0 +1,10 @@
+{
+	"plugin-data":
+	{
+		"name": "Режим обслуговування",
+		"description": "Перемикає ваш сайт у режим обслуговування, але ви матимете доступ до адмінки."
+	},
+
+	"enable-maintenance-mode": "Включити режим обслуговування",
+	"message": "Message"
+}
--- a/bl-plugins/maintenancemode/languages/zh_TW.json
+++ b/bl-plugins/maintenancemode/languages/zh_TW.json
@ -5,6 +5,6 @@
 		"description": "設定您的網站為維護模式，但是您依然可以登入到管理介面"
 	},

-	"enable-maintence-mode": "啟用維護模式",
+	"enable-maintenance-mode": "啟用維護模式",
 	"message": "訊息"
 }
--- a/bl-plugins/maintenancemode/metadata.json
+++ b/bl-plugins/maintenancemode/metadata.json
@ -1,9 +1,9 @@
 {
 	"author": "Bludit",
 	"email": "",
-	"website": "https://github.com/dignajar/bludit-plugins",
+	"website": "https://plugins.bludit.com",
 	"version": "1.1",
-	"releaseDate": "2016-02-13",
+	"releaseDate": "2016-02-20",
 	"license": "MIT",
 	"requires": "Bludit v1.1",
 	"notes": ""
--- a/bl-plugins/maintenancemode/plugin.php
+++ b/bl-plugins/maintenancemode/plugin.php
@ -1,11 +1,11 @@
 <?php

-class pluginMaintanceMode extends Plugin {
+class pluginMaintenanceMode extends Plugin {

 	public function init()
 	{
 		$this->dbFields = array(
-			'enable'=>true,
+			'enable'=>false,
 			'message'=>'Temporarily down for maintenance.'
 		);
 	}
@ -16,7 +16,7 @@ class pluginMaintanceMode extends Plugin {

 		$html  = '<div>';
 		$html .= '<input name="enable" id="jsenable" type="checkbox" value="true" '.($this->getDbField('enable')?'checked':'').'>';
-		$html .= '<label class="forCheckbox" for="jsenable">'.$Language->get('Enable maintence mode').'</label>';
+		$html .= '<label class="forCheckbox" for="jsenable">'.$Language->get('Enable maintenance mode').'</label>';
 		$html .= '</div>';

 		$html .= '<div>';
--- a/bl-plugins/pages/languages/tr_TR.json
+++ b/bl-plugins/pages/languages/tr_TR.json
@ -2,7 +2,7 @@
 	"plugin-data":
 	{
 		"name": "Sayfa listesi",
-		"description": "Sayfaları listeler.",
+		"description": "Sayfaları listeler."
 	},

 	"home": "Anasayfa",
--- a/bl-plugins/rss/languages/uk_UA.json
+++ b/bl-plugins/rss/languages/uk_UA.json
@ -0,0 +1,7 @@
+{
+	"plugin-data":
+	{
+		"name": "RSS-канал",
+		"description": "Цей плагін генерувати RSS для вашого сайту."
+	}
+}
--- a/bl-plugins/simplemde/languages/tr_TR.json
+++ b/bl-plugins/simplemde/languages/tr_TR.json
@ -2,7 +2,7 @@
 	"plugin-data":
 	{
 		"name": "SimpleMDE",
-		"description": "Basit, güzel ve gömülü bir Javascript editörü ,@WesCossick tarafından yapılmıştır. Bludit için uyarlayan Diego Najar.",
+		"description": "Basit, güzel ve gömülü bir Javascript editörü ,@WesCossick tarafından yapılmıştır. Bludit için uyarlayan Diego Najar."
 	},
 	"toolbar": "Araçlar",
 	"tab-size": "Boşluk boyutu",
--- a/bl-plugins/sitemap/languages/uk_UA.json
+++ b/bl-plugins/sitemap/languages/uk_UA.json
@ -0,0 +1,7 @@
+{
+	"plugin-data":
+	{
+		"name": "Sitemap",
+		"description": "Цей плагін генерує файл sitemap.xml, де перераховані веб-сторінки вашого сайту, щоб повідомити пошуковим системам про зміст сайту."
+	}
+}
--- a/bl-plugins/tags/languages/tr_TR.json
+++ b/bl-plugins/tags/languages/tr_TR.json
@ -2,6 +2,6 @@
 	"plugin-data":
 	{
 		"name": "Tag listesi",
-		"description": "Bütün tagları gösterir.",
+		"description": "Bütün tagları gösterir."
 	}
 }
--- a/bl-themes/blogme/languages/uk_UA.json
+++ b/bl-themes/blogme/languages/uk_UA.json
@ -0,0 +1,8 @@
+{
+	"theme-data":
+	{
+		"name": "Blogme",
+		"description": "Мінімалістська та чиста тема, з підтримкою зображення обкладинки, на основі Future Imperfect."
+	},
+	"top": "Top"
+}
--- a/bl-themes/blogme/metadata.json
+++ b/bl-themes/blogme/metadata.json
@ -2,9 +2,9 @@
 	"author": "n33co & diego",
 	"email": "",
 	"website": "https://github.com/dignajar/bludit-themes",
-	"version": "1.0",
+	"version": "1.1",
 	"releaseDate": "2016-01-21",
 	"license": "CCA 3.0",
-	"requires": "Bludit v1.0",
+	"requires": "Bludit v1.1",
 	"notes": "This theme is based on Future Imperfect, all credits to the author n33co."
 }
--- a/bl-themes/blogme/php/head.php
+++ b/bl-themes/blogme/php/head.php
@ -1,19 +1,22 @@
-<title><?php echo $Site->title() ?></title>
-<meta charset="utf-8">
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<meta name="description" content="<?php echo $Site->description() ?>">
+<?php
+	Theme::charset('utf-8');
+	Theme::viewport('width=device-width, initial-scale=1');
+
+	Theme::title();
+	Theme::description();
+
+	Theme::favicon('favicon.png');
+?>

 <!--[if lte IE 8]><script src="<?php echo HTML_PATH_THEME ?>assets/js/ie/html5shiv.js"></script><![endif]-->
-
 <link rel="stylesheet" href="<?php echo HTML_PATH_THEME ?>assets/css/main.css">
 <!--[if lte IE 9]><link rel="stylesheet" href="<?php echo HTML_PATH_THEME ?>assets/css/ie9.css" /><![endif]-->
 <!--[if lte IE 8]><link rel="stylesheet" href="<?php echo HTML_PATH_THEME ?>assets/css/ie8.css" /><![endif]-->
 <link rel="stylesheet" href="<?php echo HTML_PATH_THEME ?>assets/css/bludit.css">

-<link rel="shortcut icon" href="<?php echo HTML_PATH_THEME ?>img/favicon.png" type="image/png">
-
 <?php

+// Add local Fonts Awesome
 Theme::fontAwesome();

 // Plugins for head
--- a/bl-themes/blogme/php/sidebar.php
+++ b/bl-themes/blogme/php/sidebar.php
@ -11,18 +11,31 @@
 <!-- Footer -->
 <section id="footer">
 	<ul class="icons">
-		<!-- <li><a href="#" class="fa-twitter"><span class="label">Twitter</span></a></li> -->
-		<!-- <li><a href="#" class="fa-facebook"><span class="label">Facebook</span></a></li>  -->
-		<!-- <li><a href="#" class="fa-instagram"><span class="label">Instagram</span></a></li>  -->
-		<?php
-			if( $plugins['all']['pluginRSS']->installed() ) {
-				echo '<li><a href="'.DOMAIN_BASE.'rss.xml'.'" class="fa-rss"><span class="label">RSS</span></a></li>';
-			}
+	<?php
+		if(trim($Site->twitter())) {
+			echo '<li><a href="'.$Site->twitter().'" class="fa-twitter"><span class="label">Twitter</span></a></li>';
+		}

-			if( $plugins['all']['pluginSitemap']->installed() ) {
-				echo '<li><a href="'.DOMAIN_BASE.'sitemap.xml'.'" class="fa-sitemap"><span class="label">Sitemap</span></a></li>';
-			}
-		?>
+		if($Site->facebook()) {
+			echo '<li><a href="'.$Site->facebook().'" class="fa-facebook"><span class="label">Facebook</span></a></li>';
+		}
+
+		if($Site->instagram()) {
+			echo '<li><a href="'.$Site->instagram().'" class="fa-instagram"><span class="label">Instagram</span></a></li>';
+		}
+
+		if($Site->github()) {
+			echo '<li><a href="'.$Site->github().'" class="fa-github"><span class="label">Github</span></a></li>';
+		}
+
+		if( $plugins['all']['pluginRSS']->installed() ) {
+			echo '<li><a href="'.DOMAIN_BASE.'rss.xml'.'" class="fa-rss"><span class="label">RSS</span></a></li>';
+		}
+
+		if( $plugins['all']['pluginSitemap']->installed() ) {
+			echo '<li><a href="'.DOMAIN_BASE.'sitemap.xml'.'" class="fa-sitemap"><span class="label">Sitemap</span></a></li>';
+		}
+	?>
 	</ul>
 	<p class="copyright"><?php echo $Site->footer() ?> | <a href="http://www.bludit.com">Bludit</a></p>
 </section>
--- a/bl-themes/future-imperfect/assets/css/bludit.css
+++ b/bl-themes/future-imperfect/assets/css/bludit.css
@ -17,5 +17,5 @@
 }

 img {
-	max-width: 100%;
+	width: 100%;
 }
--- a/bl-themes/future-imperfect/img/favicon.png
+++ b/bl-themes/future-imperfect/img/favicon.png
--- a/bl-themes/future-imperfect/images/logo.jpg
+++ b/bl-themes/future-imperfect/images/logo.jpg
--- a/bl-themes/future-imperfect/languages/uk_UA.json
+++ b/bl-themes/future-imperfect/languages/uk_UA.json
@ -0,0 +1,7 @@
+{
+	"theme-data":
+	{
+		"name": "Future Imperfect",
+		"description": "Чиста та дуже адаптивна тема від @n33co адаптована Diego Najar для Bludit."
+	}
+}
--- a/bl-themes/future-imperfect/metadata.json
+++ b/bl-themes/future-imperfect/metadata.json
@ -2,9 +2,9 @@
 	"author": "n33co",
 	"email": "",
 	"website": "http://html5up.net",
-	"version": "1.0",
-	"releaseDate": "2015-11-01",
+	"version": "1.1",
+	"releaseDate": "2015-11.11",
 	"license": "CCA 3.0",
-	"requires": "Bludit v1.0",
+	"requires": "Bludit v1.1",
 	"notes": ""
 }
--- a/bl-themes/future-imperfect/php/head.php
+++ b/bl-themes/future-imperfect/php/head.php
@ -1,10 +1,14 @@
-<title><?php echo $Site->title() ?></title>
-<meta charset="utf-8">
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<meta name="description" content="<?php echo $Site->description() ?>">
+<?php
+	Theme::charset('utf-8');
+	Theme::viewport('width=device-width, initial-scale=1');
+
+	Theme::title();
+	Theme::description();
+
+	Theme::favicon('favicon.png');
+?>

 <!--[if lte IE 8]><script src="<?php echo HTML_PATH_THEME ?>assets/js/ie/html5shiv.js"></script><![endif]-->
-
 <link rel="stylesheet" href="<?php echo HTML_PATH_THEME ?>assets/css/main.css">
 <!--[if lte IE 9]><link rel="stylesheet" href="<?php echo HTML_PATH_THEME ?>assets/css/ie9.css" /><![endif]-->
 <!--[if lte IE 8]><link rel="stylesheet" href="<?php echo HTML_PATH_THEME ?>assets/css/ie8.css" /><![endif]-->
@ -12,9 +16,10 @@

 <?php

+// Add local Fonts Awesome
+Theme::fontAwesome();
+
 // Plugins for head
 Theme::plugins('siteHead');

-Theme::fontAwesome();
-
 ?>
--- a/bl-themes/future-imperfect/php/sidebar.php
+++ b/bl-themes/future-imperfect/php/sidebar.php
@ -1,6 +1,6 @@
 <!-- Intro -->
 <section id="intro">
-	<a href="<?php echo $Site->url() ?>" class="logo"><img src="<?php echo HTML_PATH_THEME ?>images/logo.jpg" alt=""></a>
+	<a href="<?php echo $Site->url() ?>" class="logo"><img src="<?php echo HTML_PATH_THEME ?>img/logo.jpg" alt=""></a>
 	<header>
 		<h2><?php echo $Site->title() ?></h2>
 		<p><?php echo $Site->description() ?></p>
@ -11,5 +11,32 @@

 <!-- Footer -->
 <section id="footer">
+	<ul class="icons">
+	<?php
+		if($Site->twitter()) {
+			echo '<li><a href="'.$Site->twitter().'" class="fa-twitter"><span class="label">Twitter</span></a></li>';
+		}
+
+		if($Site->facebook()) {
+			echo '<li><a href="'.$Site->facebook().'" class="fa-facebook"><span class="label">Facebook</span></a></li>';
+		}
+
+		if($Site->instagram()) {
+			echo '<li><a href="'.$Site->instagram().'" class="fa-instagram"><span class="label">Instagram</span></a></li>';
+		}
+
+		if($Site->github()) {
+			echo '<li><a href="'.$Site->github().'" class="fa-github"><span class="label">Github</span></a></li>';
+		}
+
+		if( $plugins['all']['pluginRSS']->installed() ) {
+			echo '<li><a href="'.DOMAIN_BASE.'rss.xml'.'" class="fa-rss"><span class="label">RSS</span></a></li>';
+		}
+
+		if( $plugins['all']['pluginSitemap']->installed() ) {
+			echo '<li><a href="'.DOMAIN_BASE.'sitemap.xml'.'" class="fa-sitemap"><span class="label">Sitemap</span></a></li>';
+		}
+	?>
+	</ul>
 	<p class="copyright"><?php echo $Site->footer() ?> | Design: <a href="http://html5up.net">HTML5 UP</a></p>
 </section>
--- a/bl-themes/pure/index.php
+++ b/bl-themes/pure/index.php
@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE HTML>
 <html lang="<?php echo $Site->language() ?>">
 <head>

--- a/bl-themes/pure/metadata.json
+++ b/bl-themes/pure/metadata.json
@ -2,9 +2,9 @@
 	"author": "Bludit",
 	"email": "",
 	"website": "https://github.com/dignajar/bludit-themes",
-	"version": "1.0",
+	"version": "1.1",
 	"releaseDate": "2016-01-15",
 	"license": "MIT",
-	"requires": "Bludit v1.0",
+	"requires": "Bludit v1.1",
 	"notes": ""
 }
--- a/bl-themes/pure/php/head.php
+++ b/bl-themes/pure/php/head.php
@ -1,9 +1,11 @@
-<meta charset="utf-8">
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<title><?php echo $Site->title() ?></title>
-
 <?php
-	// CSS from theme/css/
+	Theme::charset('UTF-8');
+	Theme::viewport('width=device-width, initial-scale=1');
+
+	Theme::title();
+	Theme::description();
+
+	// CSS files
 	Theme::css(array(
 		'pure-min.css',
 		'grids-responsive-min.css',
@ -11,24 +13,11 @@
 		'rainbow.github.css'
 	));

-	// Javascript from theme/js/
+	// Javascript files
 	Theme::javascript('rainbow.min.js');

-	// Favicon from theme/img/
+	// Favicon
 	Theme::favicon('favicon.png');
-
-	// <meta name="keywords" content="HTML,CSS,XML,JavaScript">
-	if( $Url->whereAmI()=='post' ) {
-		Theme::keywords( $Post->tags() );
-		Theme::description( $Post->description() );
-	}
-	elseif( $Url->whereAmI()=='page' ) {
-		Theme::keywords( $Page->tags() );
-		Theme::description( $Page->description() );
-	}
-	else {
-		Theme::description( $Site->description() );
-	}
 ?>

 <!-- Custom Fonts -->
--- a/bl-themes/pure/php/home.php
+++ b/bl-themes/pure/php/home.php
@ -43,7 +43,7 @@
            }

            // Call the method with FALSE to get the first part of the post
-            echo $Post->content(false)
+            echo $Post->content(false);
        ?>
    </div>

--- a/bl-themes/pure/php/post.php
+++ b/bl-themes/pure/php/post.php
@ -41,7 +41,7 @@
            }

            // Call the method with FALSE to get the first part of the post
-            echo $Post->content(false)
+            echo $Post->content();
        ?>
    </div>

--- a/install.php
+++ b/install.php
@ -2,7 +2,7 @@

 /*
 * Bludit
- * http://www.bludit.com
+ * https://www.bludit.com
 * Author Diego Najar
 * Bludit is opensource software licensed under the MIT license.
 */
@ -36,6 +36,9 @@ define('PATH_UPLOADS_THUMBNAILS',PATH_UPLOADS.'thumbnails'.DS);
 define('PATH_HELPERS',		PATH_KERNEL.'helpers'.DS);
 define('PATH_ABSTRACT',		PATH_KERNEL.'abstract'.DS);

+// Protecting against Symlink attacks.
+define('CHECK_SYMBOLIC_LINKS', TRUE);
+
 // Domain and protocol
 define('DOMAIN', $_SERVER['HTTP_HOST']);

@ -243,7 +246,7 @@ function install($adminPassword, $email, $timezone)

 	$stdOut = array();

-	if( date_default_timezone_set($timezone) ) {
+	if( !date_default_timezone_set($timezone) ) {
 		date_default_timezone_set('UTC');
 	}