diff --git a/.gitignore b/.gitignore
index 52035ca55..4149ca77f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -186,3 +186,4 @@ BlogEngine/.vs/
 
 # Default extensions data
 BlogEngine/BlogEngine.NET/App_Data/datastore/extensions/*.xml
+/BlogEngine/BlogEngine.NET/imagecache
diff --git a/BlogEngine/BlogEngine.Core/BlogEngine.Core.csproj b/BlogEngine/BlogEngine.Core/BlogEngine.Core.csproj
index 47d8bb39b..21e51c08f 100644
--- a/BlogEngine/BlogEngine.Core/BlogEngine.Core.csproj
+++ b/BlogEngine/BlogEngine.Core/BlogEngine.Core.csproj
@@ -271,6 +271,7 @@
     <Compile Include="Providers\XmlProvider\PingServices.cs" />
     <Compile Include="Helpers\SavedEventArgs.cs" />
     <Compile Include="Services\Search\Search.cs" />
+    <Compile Include="Services\Syndication\RssHelp\Rfc822DateTime.cs" />
     <Compile Include="Services\Syndication\SyndicationFormat.cs" />
     <Compile Include="Web\BlogCulture.cs" />
     <Compile Include="Web\Controls\ExtensionAttribute.cs" />
diff --git a/BlogEngine/BlogEngine.Core/Helpers/Utils.cs b/BlogEngine/BlogEngine.Core/Helpers/Utils.cs
index d790bd134..25f03d2bf 100644
--- a/BlogEngine/BlogEngine.Core/Helpers/Utils.cs
+++ b/BlogEngine/BlogEngine.Core/Helpers/Utils.cs
@@ -1148,6 +1148,7 @@ public static string SendMailMessage(MailMessage message, string smtpServer = ""
                 OnEmailFailed(message);
 
                 errorMsg.Append("Error sending email in SendMailMessage: ");
+                
                 Exception current = ex;
 
                 while (current != null)
diff --git a/BlogEngine/BlogEngine.Core/Services/Syndication/RssHelp/Rfc822DateTime.cs b/BlogEngine/BlogEngine.Core/Services/Syndication/RssHelp/Rfc822DateTime.cs
new file mode 100644
index 000000000..b553482dc
--- /dev/null
+++ b/BlogEngine/BlogEngine.Core/Services/Syndication/RssHelp/Rfc822DateTime.cs
@@ -0,0 +1,326 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlogEngine.Core.Services.Syndication.RssHelp
+{
+    /// <summary>
+    /// Provides methods for converting <see cref="DateTime"/> structures 
+    /// to and from the equivalent <a href="http://www.w3.org/Protocols/rfc822/#z28">RFC 822</a> 
+    /// string representation.
+    /// </summary>
+    public class Rfc822DateTime
+    {
+        //============================================================
+        //  Private members
+        //============================================================
+        #region Private Members
+        /// <summary>
+        /// Private member to hold array of formats that RFC 822 date-time representations conform to.
+        /// </summary>
+        private static string[] formats = new string[0];
+        /// <summary>
+        /// Private member to hold the DateTime format string for representing a DateTime in the RFC 822 format.
+        /// </summary>
+        private const string format = "ddd, dd MMM yyyy HH:mm:ss K";
+        #endregion
+
+        //============================================================
+        //  Public Properties
+        //============================================================
+        #region Rfc822DateTimeFormat
+        /// <summary>
+        /// Gets the custom format specifier that may be used to represent a <see cref="DateTime"/> in the RFC 822 format.
+        /// </summary>
+        /// <value>A <i>DateTime format string</i> that may be used to represent a <see cref="DateTime"/> in the RFC 822 format.</value>
+        /// <remarks>
+        /// <para>
+        /// This method returns a string representation of a <see cref="DateTime"/> that utilizes the time zone 
+        /// offset (local differential) to represent the offset from Greenwich mean time in hours and minutes. 
+        /// The <see cref="Rfc822DateTimeFormat"/> is a valid date-time format string for use 
+        /// in the <see cref="DateTime.ToString(String, IFormatProvider)"/> method.
+        /// </para>
+        /// <para>
+        /// The <a href="http://www.w3.org/Protocols/rfc822/#z28">RFC 822</a> Date and Time specification 
+        /// specifies that the year will be represented as a two-digit value, but the 
+        /// <a href="http://www.rssboard.org/rss-profile#data-types-datetime">RSS Profile</a> recommends that 
+        /// all date-time values should use a four-digit year. The <see cref="Rfc822DateTime"/> class 
+        /// follows the RSS Profile recommendation when converting a <see cref="DateTime"/> to the equivalent 
+        /// RFC 822 string representation.
+        /// </para>
+        /// </remarks>
+        public static string Rfc822DateTimeFormat
+        {
+            get
+            {
+                return format;
+            }
+        }
+        #endregion
+
+        #region Rfc822DateTimePatterns
+        /// <summary>
+        /// Gets an array of the expected formats for RFC 822 date-time string representations.
+        /// </summary>
+        /// <value>
+        /// An array of the expected formats for RFC 822 date-time string representations 
+        /// that may used in the <see cref="DateTime.TryParseExact(String, string[], IFormatProvider, DateTimeStyles, out DateTime)"/> method.
+        /// </value>
+        /// <remarks>
+        /// The array of the expected formats that is returned assumes that the RFC 822 time zone 
+        /// is represented as or converted to a local differential representation.
+        /// </remarks>
+        /// <seealso cref="ConvertZoneToLocalDifferential(String)"/>
+        public static string[] Rfc822DateTimePatterns
+        {
+            get
+            {
+                if (formats.Length > 0)
+                {
+                    return formats;
+                }
+                else
+                {
+                    formats = new string[35];
+
+                    // two-digit day, four-digit year patterns
+                    formats[0] = "ddd',' dd MMM yyyy HH':'mm':'ss'.'fffffff zzzz";
+                    formats[1] = "ddd',' dd MMM yyyy HH':'mm':'ss'.'ffffff zzzz";
+                    formats[2] = "ddd',' dd MMM yyyy HH':'mm':'ss'.'fffff zzzz";
+                    formats[3] = "ddd',' dd MMM yyyy HH':'mm':'ss'.'ffff zzzz";
+                    formats[4] = "ddd',' dd MMM yyyy HH':'mm':'ss'.'fff zzzz";
+                    formats[5] = "ddd',' dd MMM yyyy HH':'mm':'ss'.'ff zzzz";
+                    formats[6] = "ddd',' dd MMM yyyy HH':'mm':'ss'.'f zzzz";
+                    formats[7] = "ddd',' dd MMM yyyy HH':'mm':'ss zzzz";
+
+                    // two-digit day, two-digit year patterns
+                    formats[8] = "ddd',' dd MMM yy HH':'mm':'ss'.'fffffff zzzz";
+                    formats[9] = "ddd',' dd MMM yy HH':'mm':'ss'.'ffffff zzzz";
+                    formats[10] = "ddd',' dd MMM yy HH':'mm':'ss'.'fffff zzzz";
+                    formats[11] = "ddd',' dd MMM yy HH':'mm':'ss'.'ffff zzzz";
+                    formats[12] = "ddd',' dd MMM yy HH':'mm':'ss'.'fff zzzz";
+                    formats[13] = "ddd',' dd MMM yy HH':'mm':'ss'.'ff zzzz";
+                    formats[14] = "ddd',' dd MMM yy HH':'mm':'ss'.'f zzzz";
+                    formats[15] = "ddd',' dd MMM yy HH':'mm':'ss zzzz";
+
+                    // one-digit day, four-digit year patterns
+                    formats[16] = "ddd',' d MMM yyyy HH':'mm':'ss'.'fffffff zzzz";
+                    formats[17] = "ddd',' d MMM yyyy HH':'mm':'ss'.'ffffff zzzz";
+                    formats[18] = "ddd',' d MMM yyyy HH':'mm':'ss'.'fffff zzzz";
+                    formats[19] = "ddd',' d MMM yyyy HH':'mm':'ss'.'ffff zzzz";
+                    formats[20] = "ddd',' d MMM yyyy HH':'mm':'ss'.'fff zzzz";
+                    formats[21] = "ddd',' d MMM yyyy HH':'mm':'ss'.'ff zzzz";
+                    formats[22] = "ddd',' d MMM yyyy HH':'mm':'ss'.'f zzzz";
+                    formats[23] = "ddd',' d MMM yyyy HH':'mm':'ss zzzz";
+
+                    // two-digit day, two-digit year patterns
+                    formats[24] = "ddd',' d MMM yy HH':'mm':'ss'.'fffffff zzzz";
+                    formats[25] = "ddd',' d MMM yy HH':'mm':'ss'.'ffffff zzzz";
+                    formats[26] = "ddd',' d MMM yy HH':'mm':'ss'.'fffff zzzz";
+                    formats[27] = "ddd',' d MMM yy HH':'mm':'ss'.'ffff zzzz";
+                    formats[28] = "ddd',' d MMM yy HH':'mm':'ss'.'fff zzzz";
+                    formats[29] = "ddd',' d MMM yy HH':'mm':'ss'.'ff zzzz";
+                    formats[30] = "ddd',' d MMM yy HH':'mm':'ss'.'f zzzz";
+                    formats[31] = "ddd',' d MMM yy HH':'mm':'ss zzzz";
+
+                    // Fall back patterns
+                    formats[32] = "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffffK"; // RoundtripDateTimePattern
+                    formats[33] = DateTimeFormatInfo.InvariantInfo.UniversalSortableDateTimePattern;
+                    formats[34] = DateTimeFormatInfo.InvariantInfo.SortableDateTimePattern;
+
+                    return formats;
+                }
+            }
+        }
+        #endregion
+
+        //============================================================
+        //  Public Methods
+        //============================================================
+        #region Parse(string s)
+        /// <summary>
+        /// Converts the specified string representation of a date and time to its <see cref="DateTime"/> equivalent.
+        /// </summary>
+        /// <param name="s">A string containing a date and time to convert.</param>
+        /// <returns>
+        /// A <see cref="DateTime"/> equivalent to the date and time contained in <paramref name="s"/>, 
+        /// expressed as <i>Coordinated Universal Time (UTC)</i>.
+        /// </returns>
+        /// <remarks>
+        /// The string <paramref name="s"/> is parsed using formatting information in the <see cref="DateTimeFormatInfo.InvariantInfo"/> object.
+        /// </remarks>
+        /// <exception cref="ArgumentNullException"><paramref name="s"/> is a <b>null</b> reference (Nothing in Visual Basic).</exception>
+        /// <exception cref="ArgumentNullException"><paramref name="s"/> is an empty string.</exception>
+        /// <exception cref="FormatException"><paramref name="s"/> does not contain a valid RFC 822 string representation of a date and time.</exception>
+        public static DateTime Parse(string s)
+        {
+            //------------------------------------------------------------
+            //  Validate parameter
+            //------------------------------------------------------------
+            if (String.IsNullOrEmpty(s))
+            {
+                throw new ArgumentNullException("s");
+            }
+
+            DateTime result;
+            if (Rfc822DateTime.TryParse(s, out result))
+            {
+                return result;
+            }
+            else
+            {
+                throw new FormatException(String.Format(null, "{0} is not a valid RFC 822 string representation of a date and time.", s));
+            }
+        }
+        #endregion
+
+        #region ConvertZoneToLocalDifferential(string s)
+        /// <summary>
+        /// Converts the time zone component of an RFC 822 date and time string representation to its local differential (time zone offset).
+        /// </summary>
+        /// <param name="s">A string containing an RFC 822 date and time to convert.</param>
+        /// <returns>A date and time string that uses local differential to describe the time zone equivalent to the date and time contained in <paramref name="s"/>.</returns>
+        /// <exception cref="ArgumentNullException"><paramref name="s"/> is a <b>null</b> reference (Nothing in Visual Basic).</exception>
+        /// <exception cref="ArgumentNullException"><paramref name="s"/> is an empty string.</exception>
+        public static string ConvertZoneToLocalDifferential(string s)
+        {
+            string zoneRepresentedAsLocalDifferential = String.Empty;
+
+            //------------------------------------------------------------
+            //  Validate parameter
+            //------------------------------------------------------------
+            if (String.IsNullOrEmpty(s))
+            {
+                throw new ArgumentNullException("s");
+            }
+
+            if (s.EndsWith(" UT", StringComparison.OrdinalIgnoreCase))
+            {
+                zoneRepresentedAsLocalDifferential = String.Concat(s.Substring(0, (s.LastIndexOf(" UT") + 1)), "+00:00");
+            }
+            else if (s.EndsWith(" GMT", StringComparison.OrdinalIgnoreCase))
+            {
+                zoneRepresentedAsLocalDifferential = String.Concat(s.Substring(0, (s.LastIndexOf(" GMT") + 1)), "+00:00");
+            }
+            else if (s.EndsWith(" EST", StringComparison.OrdinalIgnoreCase))
+            {
+                zoneRepresentedAsLocalDifferential = String.Concat(s.Substring(0, (s.LastIndexOf(" EST") + 1)), "-05:00");
+            }
+            else if (s.EndsWith(" EDT", StringComparison.OrdinalIgnoreCase))
+            {
+                zoneRepresentedAsLocalDifferential = String.Concat(s.Substring(0, (s.LastIndexOf(" EDT") + 1)), "-04:00");
+            }
+            else if (s.EndsWith(" CST", StringComparison.OrdinalIgnoreCase))
+            {
+                zoneRepresentedAsLocalDifferential = String.Concat(s.Substring(0, (s.LastIndexOf(" CST") + 1)), "-06:00");
+            }
+            else if (s.EndsWith(" CDT", StringComparison.OrdinalIgnoreCase))
+            {
+                zoneRepresentedAsLocalDifferential = String.Concat(s.Substring(0, (s.LastIndexOf(" CDT") + 1)), "-05:00");
+            }
+            else if (s.EndsWith(" MST", StringComparison.OrdinalIgnoreCase))
+            {
+                zoneRepresentedAsLocalDifferential = String.Concat(s.Substring(0, (s.LastIndexOf(" MST") + 1)), "-07:00");
+            }
+            else if (s.EndsWith(" MDT", StringComparison.OrdinalIgnoreCase))
+            {
+                zoneRepresentedAsLocalDifferential = String.Concat(s.Substring(0, (s.LastIndexOf(" MDT") + 1)), "-06:00");
+            }
+            else if (s.EndsWith(" PST", StringComparison.OrdinalIgnoreCase))
+            {
+                zoneRepresentedAsLocalDifferential = String.Concat(s.Substring(0, (s.LastIndexOf(" PST") + 1)), "-08:00");
+            }
+            else if (s.EndsWith(" PDT", StringComparison.OrdinalIgnoreCase))
+            {
+                zoneRepresentedAsLocalDifferential = String.Concat(s.Substring(0, (s.LastIndexOf(" PDT") + 1)), "-07:00");
+            }
+            else if (s.EndsWith(" Z", StringComparison.OrdinalIgnoreCase))
+            {
+                zoneRepresentedAsLocalDifferential = String.Concat(s.Substring(0, (s.LastIndexOf(" Z") + 1)), "+00:00");
+            }
+            else if (s.EndsWith(" A", StringComparison.OrdinalIgnoreCase))
+            {
+                zoneRepresentedAsLocalDifferential = String.Concat(s.Substring(0, (s.LastIndexOf(" A") + 1)), "-01:00");
+            }
+            else if (s.EndsWith(" M", StringComparison.OrdinalIgnoreCase))
+            {
+                zoneRepresentedAsLocalDifferential = String.Concat(s.Substring(0, (s.LastIndexOf(" M") + 1)), "-12:00");
+            }
+            else if (s.EndsWith(" N", StringComparison.OrdinalIgnoreCase))
+            {
+                zoneRepresentedAsLocalDifferential = String.Concat(s.Substring(0, (s.LastIndexOf(" N") + 1)), "+01:00");
+            }
+            else if (s.EndsWith(" Y", StringComparison.OrdinalIgnoreCase))
+            {
+                zoneRepresentedAsLocalDifferential = String.Concat(s.Substring(0, (s.LastIndexOf(" Y") + 1)), "+12:00");
+            }
+            else
+            {
+                zoneRepresentedAsLocalDifferential = s;
+            }
+
+            return zoneRepresentedAsLocalDifferential;
+        }
+        #endregion
+
+        #region ToString(DateTime utcDateTime)
+        /// <summary>
+        /// Converts the value of the specified <see cref="DateTime"/> object to its equivalent string representation.
+        /// </summary>
+        /// <param name="utcDateTime">The Coordinated Universal Time (UTC) <see cref="DateTime"/> to convert.</param>
+        /// <returns>A RFC 822 string representation of the value of the <paramref name="utcDateTime"/>.</returns>
+        /// <exception cref="ArgumentException">The specified <paramref name="utcDateTime"/> object does not represent a <see cref="DateTimeKind.Utc">Coordinated Universal Time (UTC)</see> value.</exception>
+        public static string ToString(DateTime utcDateTime)
+        {
+            if (utcDateTime.Kind != DateTimeKind.Utc)
+            {
+                throw new ArgumentException("utcDateTime");
+            }
+
+            return utcDateTime.ToString(Rfc822DateTime.Rfc822DateTimeFormat, DateTimeFormatInfo.InvariantInfo);
+        }
+        #endregion
+
+        #region TryParse(string s, out DateTime result)
+        /// <summary>
+        /// Converts the specified string representation of a date and time to its <see cref="DateTime"/> equivalent.
+        /// </summary>
+        /// <param name="s">A string containing a date and time to convert.</param>
+        /// <param name="result">
+        /// When this method returns, contains the <see cref="DateTime"/> value equivalent to the date and time 
+        /// contained in <paramref name="s"/>, expressed as <i>Coordinated Universal Time (UTC)</i>, 
+        /// if the conversion succeeded, or <see cref="DateTime.MinValue">MinValue</see> if the conversion failed. 
+        /// The conversion fails if the s parameter is a <b>null</b> reference (Nothing in Visual Basic), 
+        /// or does not contain a valid string representation of a date and time. 
+        /// This parameter is passed uninitialized.
+        /// </param>
+        /// <returns><b>true</b> if the <paramref name="s"/> parameter was converted successfully; otherwise, <b>false</b>.</returns>
+        /// <remarks>
+        /// The string <paramref name="s"/> is parsed using formatting information in the <see cref="DateTimeFormatInfo.InvariantInfo"/> object. 
+        /// </remarks>
+        public static bool TryParse(string s, out DateTime result)
+        {
+            //------------------------------------------------------------
+            //  Attempt to convert string representation
+            //------------------------------------------------------------
+            bool wasConverted = false;
+            result = DateTime.MinValue;
+
+            if (!String.IsNullOrEmpty(s))
+            {
+                DateTime parseResult;
+                if (DateTime.TryParseExact(Rfc822DateTime.ConvertZoneToLocalDifferential(s), Rfc822DateTime.Rfc822DateTimePatterns, DateTimeFormatInfo.InvariantInfo, DateTimeStyles.AdjustToUniversal, out parseResult))
+                {
+                    result = DateTime.SpecifyKind(parseResult, DateTimeKind.Utc);
+                    wasConverted = true;
+                }
+            }
+
+            return wasConverted;
+        }
+        #endregion
+    }
+}
diff --git a/BlogEngine/BlogEngine.Core/Services/Syndication/SyndicationGenerator.cs b/BlogEngine/BlogEngine.Core/Services/Syndication/SyndicationGenerator.cs
index 4770a833a..6efd07c32 100644
--- a/BlogEngine/BlogEngine.Core/Services/Syndication/SyndicationGenerator.cs
+++ b/BlogEngine/BlogEngine.Core/Services/Syndication/SyndicationGenerator.cs
@@ -7,6 +7,9 @@ Date        Author      Description
 02/12/2008  rtur.net
 14/03/2011  CreepinJesus    Updated comment links for use with Disqus
 ****************************************************************************/
+
+using BlogEngine.Core.Services.Syndication.RssHelp;
+
 namespace BlogEngine.Core
 {
     using BlogEngine.Core.Data.Services;
@@ -215,13 +218,13 @@ public static string ToRfc822DateTime(DateTime dateTime)
 
         static string RssDateString(DateTime pubDate)
         {
-            pubDate = BlogSettings.Instance.FromUtc(pubDate);
-
+            pubDate = BlogSettings.Instance.ToUtc(pubDate);
+            return Rfc822DateTime.ToString(pubDate);
             // get a timezone from local time (won't work with UTC)
-            var zone = DateTime.Now.ToString("zzzz").Replace(":", "");
-
-            var value = pubDate.ToString("ddd',' d MMM yyyy HH':'mm':'ss") + " " + zone;
-            return value;
+            //var zone = DateTime.Now.ToString("zzzz").Replace(":", "");
+            //
+            //var value = pubDate.ToString("ddd',' d MMM yyyy HH':'mm':'ss") + " " + zone;
+            //return value;
         }
 
         /// <summary>
diff --git a/BlogEngine/BlogEngine.NET/App_Data/customfields.xml b/BlogEngine/BlogEngine.NET/App_Data/customfields.xml
index 0dca53881..0b07ae1e5 100644
--- a/BlogEngine/BlogEngine.NET/App_Data/customfields.xml
+++ b/BlogEngine/BlogEngine.NET/App_Data/customfields.xml
@@ -10,17 +10,27 @@
     <item customtype="THEME" objectid="Standard-2015" blogid="96d5b379-7e1d-4dac-a6ba-1e50db561b04" key="Soundcloud Account" value="" attribute="" />
     <item customtype="THEME" objectid="Standard-2015" blogid="96d5b379-7e1d-4dac-a6ba-1e50db561b04" key="Youtube Account" value="" attribute="" />
     <item customtype="THEME" objectid="Standard-2015" blogid="96d5b379-7e1d-4dac-a6ba-1e50db561b04" key="Github Account" value="" attribute="" />
+    <item customtype="THEME" objectid="DarkStar" blogid="96d5b379-7e1d-4dac-a6ba-1e50db561b04" key="Facebook Account" value="" attribute="" />
+    <item customtype="THEME" objectid="DarkStar" blogid="96d5b379-7e1d-4dac-a6ba-1e50db561b04" key="Twitter Account" value="" attribute="" />
+    <item customtype="THEME" objectid="DarkStar" blogid="96d5b379-7e1d-4dac-a6ba-1e50db561b04" key="Google Plus Account" value="" attribute="" />
+    <item customtype="THEME" objectid="DarkStar" blogid="96d5b379-7e1d-4dac-a6ba-1e50db561b04" key="Linkedin Account" value="" attribute="" />
+    <item customtype="THEME" objectid="DarkStar" blogid="96d5b379-7e1d-4dac-a6ba-1e50db561b04" key="RSS Link" value="/syndication.axd" attribute="" />
+    <item customtype="THEME" objectid="DarkStar" blogid="96d5b379-7e1d-4dac-a6ba-1e50db561b04" key="Instagramm Account" value="" attribute="" />
+    <item customtype="THEME" objectid="DarkStar" blogid="96d5b379-7e1d-4dac-a6ba-1e50db561b04" key="Pinterest Account" value="" attribute="" />
+    <item customtype="THEME" objectid="DarkStar" blogid="96d5b379-7e1d-4dac-a6ba-1e50db561b04" key="Soundcloud Account" value="" attribute="" />
+    <item customtype="THEME" objectid="DarkStar" blogid="96d5b379-7e1d-4dac-a6ba-1e50db561b04" key="Youtube Account" value="" attribute="" />
+    <item customtype="THEME" objectid="DarkStar" blogid="96d5b379-7e1d-4dac-a6ba-1e50db561b04" key="Github Account" value="" attribute="" />
     <item customtype="THEME" objectid="Standard" blogid="96d5b379-7e1d-4dac-a6ba-1e50db561b04" key="background color left" value="#232526" attribute="" />
     <item customtype="THEME" objectid="Standard" blogid="96d5b379-7e1d-4dac-a6ba-1e50db561b04" key="background color right" value="#414345" attribute="" />
-    <item customtype="THEME" objectid="Standard" blogid="96d5b379-7e1d-4dac-a6ba-1e50db561b04" key="Logo" value="Custom/Themes/Standard/src/img/logo.png" attribute="" />
-    <item customtype="THEME" objectid="Standard" blogid="96d5b379-7e1d-4dac-a6ba-1e50db561b04" key="About Author" value="" attribute="" />
+    <item customtype="THEME" objectid="Standard" blogid="96d5b379-7e1d-4dac-a6ba-1e50db561b04" key="Logo" value="Content/images/speedydev-01.png?h=128" attribute="" />
+    <item customtype="THEME" objectid="Standard" blogid="96d5b379-7e1d-4dac-a6ba-1e50db561b04" key="About Author" value="&lt;center&gt;Delevoperka w biegu&lt;/center&gt;" attribute="" />
     <item customtype="THEME" objectid="Standard" blogid="96d5b379-7e1d-4dac-a6ba-1e50db561b04" key="Facebook Account" value="" attribute="" />
-    <item customtype="THEME" objectid="Standard" blogid="96d5b379-7e1d-4dac-a6ba-1e50db561b04" key="Twitter Account" value="" attribute="" />
+    <item customtype="THEME" objectid="Standard" blogid="96d5b379-7e1d-4dac-a6ba-1e50db561b04" key="Twitter Account" value="https://twitter.com/_sakrut" attribute="" />
     <item customtype="THEME" objectid="Standard" blogid="96d5b379-7e1d-4dac-a6ba-1e50db561b04" key="Google Plus Account" value="" attribute="" />
     <item customtype="THEME" objectid="Standard" blogid="96d5b379-7e1d-4dac-a6ba-1e50db561b04" key="Linkedin Account" value="" attribute="" />
     <item customtype="THEME" objectid="Standard" blogid="96d5b379-7e1d-4dac-a6ba-1e50db561b04" key="Instagramm Account" value="" attribute="" />
-    <item customtype="THEME" objectid="Standard" blogid="96d5b379-7e1d-4dac-a6ba-1e50db561b04" key="Youtube Account" value="" attribute="" />
-    <item customtype="THEME" objectid="Standard" blogid="96d5b379-7e1d-4dac-a6ba-1e50db561b04" key="Github Account" value="" attribute="" />
+    <item customtype="THEME" objectid="Standard" blogid="96d5b379-7e1d-4dac-a6ba-1e50db561b04" key="Youtube Account" value="https://www.youtube.com/channel/UC-mjPydPViuRt5lSiYqydWA" attribute="" />
+    <item customtype="THEME" objectid="Standard" blogid="96d5b379-7e1d-4dac-a6ba-1e50db561b04" key="Github Account" value="https://github.com/sakrut/" attribute="" />
     <item customtype="THEME" objectid="Standard" blogid="96d5b379-7e1d-4dac-a6ba-1e50db561b04" key="Pinterest Account" value="" attribute="" />
     <item customtype="THEME" objectid="Standard" blogid="96d5b379-7e1d-4dac-a6ba-1e50db561b04" key="Home Alert Box (true or false?)" value="true" attribute="" />
 </CustomFields>
\ No newline at end of file
diff --git a/BlogEngine/BlogEngine.NET/App_Data/datastore/widgets/21108331-e283-4807-a4f6-f1db31163608.xml b/BlogEngine/BlogEngine.NET/App_Data/datastore/widgets/21108331-e283-4807-a4f6-f1db31163608.xml
new file mode 100644
index 000000000..a0f8c6cd5
--- /dev/null
+++ b/BlogEngine/BlogEngine.NET/App_Data/datastore/widgets/21108331-e283-4807-a4f6-f1db31163608.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<SerializableStringDictionary>
+  <SerializableStringDictionary>
+    <DictionaryEntry Key="showrssicon" Value="true" />
+    <DictionaryEntry Key="showpostcount" Value="true" />
+  </SerializableStringDictionary>
+</SerializableStringDictionary>
\ No newline at end of file
diff --git a/BlogEngine/BlogEngine.NET/App_Data/datastore/widgets/219.xml b/BlogEngine/BlogEngine.NET/App_Data/datastore/widgets/219.xml
new file mode 100644
index 000000000..21c00ae2d
--- /dev/null
+++ b/BlogEngine/BlogEngine.NET/App_Data/datastore/widgets/219.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<SerializableStringDictionary>
+  <SerializableStringDictionary>
+    <DictionaryEntry Key="tagcloudsize" Value="-1" />
+    <DictionaryEntry Key="minimumposts" Value="1" />
+  </SerializableStringDictionary>
+</SerializableStringDictionary>
\ No newline at end of file
diff --git a/BlogEngine/BlogEngine.NET/App_Data/datastore/widgets/5bf32012-4aa3-4031-8346-4d36f0fda6d9.xml b/BlogEngine/BlogEngine.NET/App_Data/datastore/widgets/5bf32012-4aa3-4031-8346-4d36f0fda6d9.xml
new file mode 100644
index 000000000..d0dbf505e
--- /dev/null
+++ b/BlogEngine/BlogEngine.NET/App_Data/datastore/widgets/5bf32012-4aa3-4031-8346-4d36f0fda6d9.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<SerializableStringDictionary>
+  <SerializableStringDictionary>
+    <DictionaryEntry Key="author" Value="All" />
+    <DictionaryEntry Key="showdesc" Value="false" />
+    <DictionaryEntry Key="numberofposts" Value="10" />
+    <DictionaryEntry Key="showdate" Value="false" />
+    <DictionaryEntry Key="showimg" Value="false" />
+    <DictionaryEntry Key="sortorder" Value="Published" />
+    <DictionaryEntry Key="cutegory" Value="All" />
+  </SerializableStringDictionary>
+</SerializableStringDictionary>
\ No newline at end of file
diff --git a/BlogEngine/BlogEngine.NET/App_Data/datastore/widgets/922.xml b/BlogEngine/BlogEngine.NET/App_Data/datastore/widgets/922.xml
new file mode 100644
index 000000000..72563251b
--- /dev/null
+++ b/BlogEngine/BlogEngine.NET/App_Data/datastore/widgets/922.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<SerializableStringDictionary>
+  <SerializableStringDictionary>
+    <DictionaryEntry Key="twitid" Value="_sakrut" />
+    <DictionaryEntry Key="appid" Value="717752735521636352" />
+  </SerializableStringDictionary>
+</SerializableStringDictionary>
\ No newline at end of file
diff --git a/BlogEngine/BlogEngine.NET/App_Data/files/dsp/Przechwytywanie.PNG b/BlogEngine/BlogEngine.NET/App_Data/files/dsp/Przechwytywanie.PNG
new file mode 100644
index 000000000..fb3e8b9be
Binary files /dev/null and b/BlogEngine/BlogEngine.NET/App_Data/files/dsp/Przechwytywanie.PNG differ
diff --git a/BlogEngine/BlogEngine.NET/App_Data/files/dsp/dsp2017_fb_cover-1024x379.jpg b/BlogEngine/BlogEngine.NET/App_Data/files/dsp/dsp2017_fb_cover-1024x379.jpg
new file mode 100644
index 000000000..07877d6de
Binary files /dev/null and b/BlogEngine/BlogEngine.NET/App_Data/files/dsp/dsp2017_fb_cover-1024x379.jpg differ
diff --git a/BlogEngine/BlogEngine.NET/App_Data/logger.txt b/BlogEngine/BlogEngine.NET/App_Data/logger.txt
new file mode 100644
index 000000000..031cea9e0
--- /dev/null
+++ b/BlogEngine/BlogEngine.NET/App_Data/logger.txt
@@ -0,0 +1,48 @@
+*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
+Data: 2017-02-22 18:35:47
+Package Installer: replacing in D:\home\site\wwwroot\Custom\Themes\DarkStar\site.master from /themes to /Custom/Themes
+*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
+Data: 2017-02-22 18:35:48
+Installed package DarkStar by admin
+*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
+Data: 2017-02-22 19:27:55
+Installed package TwitterTimeline by admin
+*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
+Data: 2017-02-26 11:21:23
+Error sending email in SendMailMessage:  The operation has timed out.
+*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
+Data: 2017-02-26 11:21:26
+Error sending email in SendMailMessage:  The operation has timed out.
+*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
+Data: 2017-02-26 11:24:41
+Error sending email in SendMailMessage:  The operation has timed out.
+*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
+Data: 2017-02-26 11:24:42
+Error sending email in SendMailMessage:  The operation has timed out.
+*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
+Data: 2017-02-26 11:24:43
+Error sending email in SendMailMessage:  The operation has timed out.
+*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
+Data: 2017-02-26 11:26:33
+Error sending email in SendMailMessage:  The operation has timed out.
+*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
+Data: 2017-02-26 11:33:25
+Error sending email in SendMailMessage:  The operation has timed out.
+*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
+Data: 2017-02-26 11:33:32
+Error sending email in SendMailMessage:  The operation has timed out.
+*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
+Data: 2017-02-26 11:34:57
+Error sending email in SendMailMessage:  The operation has timed out.
+*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
+Data: 2017-02-26 11:35:45
+Error sending email in SendMailMessage:  The operation has timed out.
+*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
+Data: 2017-02-26 11:35:48
+Error sending email in SendMailMessage:  The operation has timed out.
+*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
+Data: 26.02.2017 13:36:50
+Error sending email in SendMailMessage:  Upłynął limit czasu operacji.
+*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
+Data: 26.02.2017 13:37:17
+Error sending email in SendMailMessage:  Upłynął limit czasu operacji.
diff --git a/BlogEngine/BlogEngine.NET/App_Data/posts/109567bb-ff20-41bf-8b1d-6a22ee37755d.xml b/BlogEngine/BlogEngine.NET/App_Data/posts/109567bb-ff20-41bf-8b1d-6a22ee37755d.xml
new file mode 100644
index 000000000..43ed6eba3
--- /dev/null
+++ b/BlogEngine/BlogEngine.NET/App_Data/posts/109567bb-ff20-41bf-8b1d-6a22ee37755d.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<post>
+  <author>Admin</author>
+  <title>Daj się poznać 2017</title>
+  <description>Oto i cały inicjator prowadzenia bloga.
+No nic założenia są proste.Pomysł na Opena to coś, co pomoże</description>
+  <content>&lt;p&gt;&lt;img src="/image.axd?picture=/dsp/dsp2017_fb_cover-1024x379.jpg" alt="" /&gt;&lt;/p&gt;
+&lt;p&gt;&lt;a href="http://dajsiepoznac.pl"&gt;dajsiepoznac.pl&lt;/a&gt;&lt;/p&gt;
+&lt;p&gt;Oto i cały inicjator prowadzenia bloga.&lt;/p&gt;
+&lt;p&gt;No nic założenia są proste.&lt;br /&gt;Pomysł na Opena to coś, co pomoże złączyć .Neta z Grafami na tyle aby można było wykorzystać to do rozwiązywania problemu komiwojażera.&lt;/p&gt;
+&lt;p&gt;UUU student ktoś powie. Nic podobnego. Wiem ze w czasach wyznaczania trasy przez Google czy Janosika takie problemy są 300* rzędne, lecz w świecie jakim żyje m&amp;oacute;j produkt problem ten nadal istnieje i nie znalazłem** narzędzi do jego rozwiązania.&lt;/p&gt;
+&lt;p&gt;Nie mam ustalonego planu projektu czy też technologi jakich ostatecznie otrzymam. Wiem tylko że będę chciał to w końcowej fazie doprowadzić otrzymać w WinFORMAS. TAAAAA :D - A czemu nie.&lt;/p&gt;
+&lt;p&gt;&amp;nbsp;&lt;/p&gt;
+&lt;p&gt;Mam nadzieje że przynajmniej moje pr&amp;oacute;by wypocenia się zostaną odebrane pozytywnie.&lt;/p&gt;
+&lt;p&gt;&amp;nbsp;&lt;/p&gt;
+&lt;p&gt;ps. *Nie lekceważ 300 :D &amp;nbsp;&lt;br /&gt;&amp;nbsp; &amp;nbsp; &amp;nbsp;** No sory czasami Ctrl-F i google zawodzi.&lt;/p&gt;
+&lt;p&gt;&amp;nbsp;&lt;/p&gt;
+&lt;p&gt;&amp;nbsp;&lt;/p&gt;
+&lt;p&gt;:&lt;img src="/image.axd?picture=/dsp/Przechwytywanie.PNG" alt="" /&gt;&lt;/p&gt;</content>
+  <ispublished>True</ispublished>
+  <isdeleted>False</isdeleted>
+  <iscommentsenabled>True</iscommentsenabled>
+  <pubDate>2017-02-25 21:52:00</pubDate>
+  <lastModified>2017-02-25 21:04:51</lastModified>
+  <raters>0</raters>
+  <rating>0</rating>
+  <slug>daj-sie-poznac-2017</slug>
+  <tags />
+  <comments />
+  <categories>
+    <category>c4f414ea-f19b-4040-8c9f-34ec0a35cbbf</category>
+  </categories>
+  <notifications />
+</post>
\ No newline at end of file
diff --git a/BlogEngine/BlogEngine.NET/App_Data/posts/5868ed38-d5f2-4d10-ba64-808839f6a3df.xml b/BlogEngine/BlogEngine.NET/App_Data/posts/5868ed38-d5f2-4d10-ba64-808839f6a3df.xml
new file mode 100644
index 000000000..a5d2b16e7
--- /dev/null
+++ b/BlogEngine/BlogEngine.NET/App_Data/posts/5868ed38-d5f2-4d10-ba64-808839f6a3df.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<post>
+  <author>Admin</author>
+  <title>No to lecimy 4.3.2.1 Start</title>
+  <description>Uff. Start.Uff ? na starcie? Teraz wzdycham bo potem pewnie jak zawsze braknie czasu na wzdychanie.
+</description>
+  <content>&lt;p&gt;Uff. Start. Jak to dobrze ze default theme jest Zaje!&lt;br /&gt;Uff ? na starcie? Teraz wzdycham bo potem pewnie jak zawsze braknie czasu na wzdychanie.&lt;/p&gt;
+&lt;p&gt;Czas zacząć pisać, eeee nie. Szkoda pisać przecież kodujemy/piszemy cały dzień. Czas coś pewnie nagrać.&amp;nbsp;&lt;/p&gt;
+&lt;p&gt;Tak więc zapraszam do oglądania i konstruktywnej krytyki.&amp;nbsp;&lt;/p&gt;
+&lt;p&gt;A przedstawić się jeszcze zdążę :)&amp;nbsp;&lt;/p&gt;</content>
+  <ispublished>True</ispublished>
+  <isdeleted>True</isdeleted>
+  <iscommentsenabled>True</iscommentsenabled>
+  <pubDate>2017-02-22 18:49:00</pubDate>
+  <lastModified>2017-02-22 18:33:14</lastModified>
+  <raters>0</raters>
+  <rating>0</rating>
+  <slug>no-to-lecimy-4-3-2-1-start</slug>
+  <tags>
+    <tag>DSP2017</tag>
+  </tags>
+  <comments />
+  <categories />
+  <notifications />
+</post>
\ No newline at end of file
diff --git a/BlogEngine/BlogEngine.NET/App_Data/posts/8d99ec6c-145a-4ff2-ab9d-5d5f4fd466a7.xml b/BlogEngine/BlogEngine.NET/App_Data/posts/8d99ec6c-145a-4ff2-ab9d-5d5f4fd466a7.xml
new file mode 100644
index 000000000..760b6bfef
--- /dev/null
+++ b/BlogEngine/BlogEngine.NET/App_Data/posts/8d99ec6c-145a-4ff2-ab9d-5d5f4fd466a7.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<post>
+  <author>Admin</author>
+  <title>No to lecimy 4.3.2.1 Start</title>
+  <description>Uff. Start. Jak to dobrze ze default theme jest Zaje!Uff ? na starcie? Teraz wzdycham bo potem pewni</description>
+  <content>&lt;p&gt;Uff. Start. Jak to dobrze ze default theme jest Zaje!&lt;br /&gt;Uff ? na starcie? Teraz wzdycham bo potem pewnie jak zawsze braknie czasu na wzdychanie.&lt;/p&gt;
+&lt;p&gt;Czas zacząć pisać, eeee nie. Szkoda pisać przecież kodujemy/piszemy cały dzień. Czas coś pewnie nagrać.&amp;nbsp;&lt;/p&gt;
+&lt;p&gt;Tak więc zapraszam do oglądania i konstruktywnej krytyki.&amp;nbsp;&lt;/p&gt;
+&lt;p&gt;A przedstawić się jeszcze zdążę :)&amp;nbsp;&lt;/p&gt;</content>
+  <ispublished>True</ispublished>
+  <isdeleted>False</isdeleted>
+  <iscommentsenabled>True</iscommentsenabled>
+  <pubDate>2017-02-22 20:45:00</pubDate>
+  <lastModified>2017-02-25 20:46:32</lastModified>
+  <raters>0</raters>
+  <rating>0</rating>
+  <slug>no-to-lecimy-4-3-2-1-start</slug>
+  <tags />
+  <comments />
+  <categories>
+    <category>1e30a198-2c3e-4096-bc79-b643bc008e13</category>
+  </categories>
+  <notifications />
+</post>
\ No newline at end of file
diff --git a/BlogEngine/BlogEngine.NET/BlogEngine.NET.csproj b/BlogEngine/BlogEngine.NET/BlogEngine.NET.csproj
index e04bab7d7..0d4661645 100644
--- a/BlogEngine/BlogEngine.NET/BlogEngine.NET.csproj
+++ b/BlogEngine/BlogEngine.NET/BlogEngine.NET.csproj
@@ -21,7 +21,7 @@
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
     <UseGlobalApplicationHostFile />
-    <TypeScriptToolsVersion>1.6</TypeScriptToolsVersion>
+    <TypeScriptToolsVersion>1.8</TypeScriptToolsVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -44,6 +44,18 @@
     <Reference Include="ICSharpCode.SharpZipLib">
       <HintPath>..\..\lib\ICSharpCode.SharpZipLib.dll</HintPath>
     </Reference>
+    <Reference Include="ImageResizer, Version=3.4.3.103, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ImageResizer.3.4.3\lib\ImageResizer.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="ImageResizer.Plugins.DiskCache, Version=3.4.3.103, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ImageResizer.Plugins.DiskCache.3.4.3\lib\ImageResizer.Plugins.DiskCache.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="ImageResizer.Plugins.PrettyGifs, Version=3.4.3.103, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ImageResizer.Plugins.PrettyGifs.3.4.3\lib\ImageResizer.Plugins.PrettyGifs.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -611,7 +623,9 @@
     <Content Include="fonts\fontawesome-webfont.svg" />
     <Content Include="fonts\glyphicons-halflings-regular.svg" />
     <Content Include="FrontPageExample.aspx" />
-    <Content Include="packages.config" />
+    <Content Include="packages.config">
+      <SubType>Designer</SubType>
+    </Content>
     <Content Include="Content\images\blog\ext.png" />
     <Content Include="Content\images\blog\pkg.png" />
     <Content Include="Scripts\angular-animate.js" />
@@ -792,6 +806,13 @@
     <Content Include="Custom\Themes\Standard\src\fonts\fontawesome-webfont.woff" />
     <Content Include="Custom\Themes\Standard\src\fonts\fontawesome-webfont.woff2" />
     <Content Include="Custom\Themes\Standard\src\fonts\FontAwesome.otf" />
+    <None Include="Properties\PublishProfiles\speedDev.pubxml" />
+    <None Include="Properties\PublishProfiles\SpeedyDev - FTP %282%29.pubxml" />
+    <None Include="Properties\PublishProfiles\SpeedyDev - FTP.pubxml" />
+    <None Include="Properties\PublishProfiles\SpeedyDev - Web Deploy %282%29.pubxml" />
+    <None Include="Properties\PublishProfiles\SpeedyDev - Web Deploy.pubxml">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="Scripts\jquery-2.1.4.intellisense.js" />
     <Content Include="Scripts\i18n\angular-locale_aa-dj.js" />
     <Content Include="Scripts\i18n\angular-locale_aa-er.js" />
@@ -1561,6 +1582,7 @@
     <Content Include="Scripts\syntaxhighlighter\scripts\shBrushRuby.js" />
     <Content Include="Scripts\syntaxhighlighter\scripts\shBrushSass.js" />
     <Content Include="Scripts\syntaxhighlighter\scripts\shBrushScala.js" />
+    <Content Include="Scripts\syntaxhighlighter\scripts\shBrushCypher.js" />
     <Content Include="Scripts\syntaxhighlighter\scripts\shBrushSql.js" />
     <Content Include="Scripts\syntaxhighlighter\scripts\shBrushVb.js" />
     <Content Include="Scripts\syntaxhighlighter\scripts\shBrushXml.js" />
diff --git a/BlogEngine/BlogEngine.NET/Content/images/blog/blogengine.ico b/BlogEngine/BlogEngine.NET/Content/images/blog/blogengine.ico
index f7c1013c1..e038ded1c 100644
Binary files a/BlogEngine/BlogEngine.NET/Content/images/blog/blogengine.ico and b/BlogEngine/BlogEngine.NET/Content/images/blog/blogengine.ico differ
diff --git a/BlogEngine/BlogEngine.NET/Custom/Themes/Standard/newsletter.html b/BlogEngine/BlogEngine.NET/Custom/Themes/Standard/newsletter.html
index 4d044e437..e3f8a8b88 100644
--- a/BlogEngine/BlogEngine.NET/Custom/Themes/Standard/newsletter.html
+++ b/BlogEngine/BlogEngine.NET/Custom/Themes/Standard/newsletter.html
@@ -1,10 +1,255 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html lang="pl">
 <head>
-    <title>[TITLE]</title>
+    <base href="https://raw.githubusercontent.com/TedGoas/Cerberus/master/cerberus-fluid.html" />
+    <meta charset="utf-8" /> <!-- utf-8 works for most cases -->
+    <meta name="viewport" content="width=device-width" /> <!-- Forcing initial-scale shouldn't be necessary -->
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" /> <!-- Use the latest (edge) version of IE rendering engine -->
+    <meta name="x-apple-disable-message-reformatting" />  <!-- Disable auto-scale in iOS 10 Mail entirely -->
+    <title></title> <!-- The title tag shows in email notifications, like Android 4.4. -->
+    <!-- Web Font / @font-face : BEGIN -->
+    <!-- NOTE: If web fonts are not required, lines 10 - 27 can be safely removed. -->
+    <!-- Desktop Outlook chokes on web font references and defaults to Times New Roman, so we force a safe fallback font. -->
+    <!--[if mso]>
+        <style>
+            * {
+                font-family: sans-serif !important;
+            }
+        </style>
+    <![endif]-->
+    <!-- All other clients get the webfont reference; some will render the font and others will silently fail to the fallbacks. More on that here: http://stylecampaign.com/blog/2015/02/webfont-support-in-email/ -->
+    <!--[if !mso]><!-->
+    <!-- insert web font reference, eg: <link href='https://fonts.googleapis.com/css?family=Roboto:400,700' rel='stylesheet' type='text/css'> -->
+    <!--<![endif]-->
+    <!-- Web Font / @font-face : END -->
+    <!-- CSS Reset -->
+    <style>
+        /* What it does: Remove spaces around the email design added by some email clients. */
+        /* Beware: It can remove the padding / margin and add a background color to the compose a reply window. */
+        html,
+        body {
+            margin: 0 auto !important;
+            padding: 0 !important;
+            height: 100% !important;
+            width: 100% !important;
+        }
+
+        /* What it does: Stops email clients resizing small text. */
+        * {
+            -ms-text-size-adjust: 100%;
+            -webkit-text-size-adjust: 100%;
+        }
+
+        /* What it does: Centers email on Android 4.4 */
+        div[style*="margin: 16px 0"] {
+            margin: 0 !important;
+        }
+
+        /* What it does: Stops Outlook from adding extra spacing to tables. */
+        table,
+        td {
+            mso-table-lspace: 0pt !important;
+            mso-table-rspace: 0pt !important;
+        }
+
+        /* What it does: Fixes webkit padding issue. Fix for Yahoo mail table alignment bug. Applies table-layout to the first 2 tables then removes for anything nested deeper. */
+        table {
+            border-spacing: 0 !important;
+            border-collapse: collapse !important;
+            table-layout: fixed !important;
+            margin: 0 auto !important;
+        }
+
+            table table table {
+                table-layout: auto;
+            }
+
+        /* What it does: Uses a better rendering method when resizing images in IE. */
+        img {
+            -ms-interpolation-mode: bicubic;
+        }
+
+        /* What it does: A work-around for iOS meddling in triggered links. */
+        *[x-apple-data-detectors] {
+            color: inherit !important;
+            text-decoration: none !important;
+        }
+
+        /* What it does: A work-around for Gmail meddling in triggered links. */
+        .x-gmail-data-detectors,
+        .x-gmail-data-detectors *,
+        .aBn {
+            border-bottom: 0 !important;
+            cursor: default !important;
+        }
+
+        /* What it does: Prevents Gmail from displaying an download button on large, non-linked images. */
+        .a6S {
+            display: none !important;
+            opacity: 0.01 !important;
+        }
+        /* If the above doesn't work, add a .g-img class to any image in question. */
+        img.g-img + div {
+            display: none !important;
+        }
+
+        /* What it does: Prevents underlining the button text in Windows 10 */
+        .button-link {
+            text-decoration: none !important;
+        }
+
+        /* What it does: Removes right gutter in Gmail iOS app: https://github.com/TedGoas/Cerberus/issues/89  */
+        /* Create one of these media queries for each additional viewport size you'd like to fix */
+        /* Thanks to Eric Lepetit (@ericlepetitsf) for help troubleshooting */
+        @media only screen and (min-device-width: 375px) and (max-device-width: 413px) { /* iPhone 6 and 6+ */
+            .email-container {
+                min-width: 375px !important;
+            }
+        }
+    </style>
+
+    <!-- What it does: Makes background images in 72ppi Outlook render at correct size. -->
+    <!--[if gte mso 9]>
+    <xml>
+        <o:OfficeDocumentSettings>
+            <o:AllowPNG/>
+            <o:PixelsPerInch>96</o:PixelsPerInch>
+        </o:OfficeDocumentSettings>
+    </xml>
+    <![endif]-->
+    <!-- Progressive Enhancements -->
+    <style>
+        /* What it does: Hover styles for buttons */
+        .button-td,
+        .button-a {
+            transition: all 100ms ease-in;
+        }
+
+            .button-td:hover,
+            .button-a:hover {
+                background: #555555 !important;
+                border-color: #555555 !important;
+            }
+
+        /* Media Queries */
+        @media screen and (max-width: 600px) {
+
+            /* What it does: Adjust typography on small screens to improve readability */
+            .email-container p {
+                font-size: 17px !important;
+                line-height: 22px !important;
+            }
+        }
+    </style>
+
 </head>
-<body>
-    New post:
-    <h3><a href="[LINK]">[TITLE]</a></h3>
+<body width="100%" bgcolor="#222222" style="margin: 0; mso-line-height-rule: exactly;">
+    <center style="width: 100%; background: #222222; text-align: left;">
+
+        <!-- Visually Hidden Preheader Text : BEGIN -->
+        <div style="display:none;font-size:1px;line-height:1px;max-height:0px;max-width:0px;opacity:0;overflow:hidden;mso-hide:all;font-family: sans-serif;">
+            (Optional) This text will appear in the inbox preview, but not the email body.
+        </div>
+        <!-- Visually Hidden Preheader Text : END -->
+        <!--
+            Set the email width. Defined in two places:
+            1. max-width for all clients except Desktop Windows Outlook, allowing the email to squish on narrow but never go wider than 600px.
+            2. MSO tags for Desktop Windows Outlook enforce a 600px width.
+        -->
+        <div style="max-width: 600px; margin: auto;" class="email-container">
+            <!--[if mso]>
+            <table role="presentation" aria-hidden="true" cellspacing="0" cellpadding="0" border="0" width="600" align="center">
+            <tr>
+            <td>
+            <![endif]-->
+            <!-- Email Header : BEGIN -->
+            <table role="presentation" aria-hidden="true" cellspacing="0" cellpadding="0" border="0" align="center" width="100%" style="max-width: 600px;">
+                <tbody>
+                    <tr>
+                        <td style="padding: 20px 0; text-align: center">
+                            <a href="[WebRoot]"><img src="http://speedydev.pl/Content/images/speedydev-01.png?h=128" aria-hidden="true" width="200" height="50" alt="alt_text" border="0" style="height: auto;/* background: #dddddd; */font-family: sans-serif;font-size: 15px;line-height: 20px;color: #555555;" /></a>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+            <!-- Email Header : END -->
+            <!-- Email Body : BEGIN -->
+            <table role="presentation" aria-hidden="true" cellspacing="0" cellpadding="0" border="0" align="center" width="100%" style="max-width: 600px;">
+
+                <!-- Hero Image, Flush : BEGIN -->
+                <tbody>
+                    <!-- Hero Image, Flush : END -->
+                    <!-- 1 Column Text + Button : BEGIN -->
+                    <tr>
+                        <td bgcolor="#ffffff">
+                            <table role="presentation" aria-hidden="true" cellspacing="0" cellpadding="0" border="0" width="100%" style="
+                                   =">
+                                <tbody>
+                                    <tr>
+                                        <td style="padding: 40px 40px 20px 40px;font-family: sans-serif;font-size: 15px;line-height: 20px;color: #555555;">
+                                            <h1 style="margin: 0 0 10px 0; font-family: sans-serif; font-size: 24px; line-height: 27px; color: #333333; font-weight: normal;">[TITLE]</h1>
+                                            <p style="margin: 0;">[LINK_DESCRIPTION]</p>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td style="padding: 20px 40px;font-family: sans-serif;font-size: 15px;line-height: 20px;color: #555555;">
+                                            <!-- Button : BEGIN -->
+                                            <table role="presentation" aria-hidden="true" cellspacing="0" cellpadding="0" border="0" align="center" style="margin: auto;">
+                                                <tbody>
+                                                    <tr>
+                                                        <td style="border-radius: 3px; background: #222222; text-align: center;" class="button-td">
+                                                            <a href="[LINK]" style="background: #222222; border: 15px solid #222222; font-family: sans-serif; font-size: 13px; line-height: 1.1; text-align: center; text-decoration: none; display: block; border-radius: 3px; font-weight: bold;" class="button-a">
+                                                                <span style="color:#ffffff;" class="button-link">&nbsp;&nbsp;&nbsp;&nbsp;Czytaj!&nbsp;&nbsp;&nbsp;&nbsp;</span>
+                                                            </a>
+                                                        </td>
+                                                    </tr>
+                                                </tbody>
+                                            </table>
+                                            <!-- Button : END -->
+                                        </td>
+                                    </tr>
+
+                                </tbody>
+                            </table>
+                        </td>
+                    </tr>
+                    <!-- 1 Column Text + Button : END -->
+                    <!-- 2 Even Columns : BEGIN -->
+                    <!-- Two Even Columns : END -->
+                    <!-- Clear Spacer : BEGIN -->
+                    <tr>
+                        <td height="40" style="font-size: 0; line-height: 0;">
+                            &nbsp;
+                        </td>
+                    </tr>
+                    <!-- Clear Spacer : END -->
+                    <!-- 1 Column Text : BEGIN -->
+                    <!-- 1 Column Text : END -->
+
+                </tbody>
+            </table>
+            <!-- Email Body : END -->
+            <!-- Email Footer : BEGIN -->
+            <table role="presentation" aria-hidden="true" cellspacing="0" cellpadding="0" border="0" align="center" width="100%" style="max-width: 680px;">
+                <tbody>
+                    <tr>
+                        <td style="padding: 40px 10px;width: 100%;font-size: 12px; font-family: sans-serif; line-height:18px; text-align: center; color: #888888;" class="x-gmail-data-detectors">
+                            <a href="[WebRoot]"><webversion style="color:#cccccc; text-decoration:underline; font-weight: bold;">Speedydev.pl</webversion></a>
+                            <br /><br />
+
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+            <!-- Email Footer : END -->
+            <!--[if mso]>
+            </td>
+            </tr>
+            </table>
+            <![endif]-->
+        </div>
+    </center>
+    <script src="//htmlpreview.github.io/htmlpreview.min.js"></script>
+    <script>HTMLPreview.replaceAssets();</script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/BlogEngine/BlogEngine.NET/Custom/Themes/Standard/src/img/logo.png b/BlogEngine/BlogEngine.NET/Custom/Themes/Standard/src/img/logo.png
index 269eab83a..56450510d 100644
Binary files a/BlogEngine/BlogEngine.NET/Custom/Themes/Standard/src/img/logo.png and b/BlogEngine/BlogEngine.NET/Custom/Themes/Standard/src/img/logo.png differ
diff --git a/BlogEngine/BlogEngine.NET/Scripts/syntaxhighlighter/scripts/shBrushCypher.js b/BlogEngine/BlogEngine.NET/Scripts/syntaxhighlighter/scripts/shBrushCypher.js
new file mode 100644
index 000000000..6dda06ffb
--- /dev/null
+++ b/BlogEngine/BlogEngine.NET/Scripts/syntaxhighlighter/scripts/shBrushCypher.js
@@ -0,0 +1,43 @@
+;(function()
+{
+	// CommonJS
+	SyntaxHighlighter = SyntaxHighlighter || (typeof require !== 'undefined'? require('shCore').SyntaxHighlighter : null);
+
+	function Brush()
+	{
+	    var funcs = 'abs acos all allShortestPaths any asin atan atan2 avg ceil coalesce collect cos ' +
+	        'cot count degrees e endNode exists exp extract filter floor has haversin head id keys ' +
+	        'labels last left length log log10 lower ltrim max min node nodes none percentileCont percentileDisc ' +
+	        'pi radians rand range reduce rel relationship relationships replace reverse right round rtrim shortestPath ' +
+	        'sign sin single size split sqrt startNode stdev stdevp str substring sum tail tan timestamp toFloat ' +
+	        'toInt trim type upper';
+
+		var keywords = 'AND AS ASC ASCENDING ASSERT BY CASE COMMIT CONSTRAINT CONTAINS CREATE ' +
+		    'CSV CYPHER DELETE DESC DESCENDING DETACH DISTINCT DROP ELSE END ENDS EXPLAIN FALSE ' +
+		    'FIELDTERMINATOR FOREACH FROM HEADERS IN INDEX IS LIMIT LOAD MATCH MERGE NOT NULL ON ' +
+		    'OPTIONAL OR ORDER PERIODIC PROFILE REMOVE RETURN SCAN SET SKIP START STARTS THEN TRUE ' +
+		    'UNION UNIQUE UNWIND USING WHEN WHERE WITH XOR';
+
+		var operators = '\\( \\) \\, \\= \\: \\+ \\- \\* \\/ \\% \\^ &lt;&gt; &lt; &gt; &lt;= &gt;= =~';
+
+		this.regexList = [
+			{ regex: /--(.*)$/gm,                                               css: 'comments' },   // 
+			{ regex: /\/\*([^\*][\s\S]*?)?\*\//gm,                              css: 'comments' },   // 
+            { regex: /:(\w+)(?!\w)/gm, css: 'value' },   // Type
+			{ regex: SyntaxHighlighter.regexLib.multiLineDoubleQuotedString,    css: 'string' },     // 
+			{ regex: SyntaxHighlighter.regexLib.multiLineSingleQuotedString,    css: 'string' },     // 
+			{ regex: new RegExp(this.getKeywords(funcs), 'gmi'),                css: 'color2' },     // 
+			{ regex: new RegExp(this.getKeywords(operators), 'gmi'),            css: 'color1' },     // 
+			{ regex: new RegExp(this.getKeywords(keywords), 'gmi'),             css: 'keyword' }     // 
+			];
+	};
+
+	Brush.prototype	= new SyntaxHighlighter.Highlighter();
+	Brush.aliases	= ['cypher'];
+
+	SyntaxHighlighter.brushes.Cypher = Brush;
+
+	// CommonJS
+	typeof(exports) != 'undefined' ? exports.Brush = Brush : null;
+})();
+
diff --git a/BlogEngine/BlogEngine.NET/Scripts/syntaxhighlighter/shActivator.js b/BlogEngine/BlogEngine.NET/Scripts/syntaxhighlighter/shActivator.js
index 7e6c4a144..0fb653055 100644
--- a/BlogEngine/BlogEngine.NET/Scripts/syntaxhighlighter/shActivator.js
+++ b/BlogEngine/BlogEngine.NET/Scripts/syntaxhighlighter/shActivator.js
@@ -1,32 +1,33 @@
-$(document).ready(function () {
-    var root = BlogEngineRes.applicationWebRoot + 'scripts/syntaxhighlighter/scripts/';
-    SyntaxHighlighter.autoloader(
-        'applescript            ' + root + 'shBrushAppleScript.js',
-        'actionscript3 as3      ' + root + 'shBrushAS3.js',
-        'bash shell             ' + root + 'shBrushBash.js',
-        'coldfusion cf          ' + root + 'shBrushColdFusion.js',
-        'cpp c                  ' + root + 'shBrushCpp.js',
-        'c# c-sharp csharp      ' + root + 'shBrushCSharp.js',
-        'css                    ' + root + 'shBrushCss.js',
-        'delphi pascal          ' + root + 'shBrushDelphi.js',
-        'diff patch pas         ' + root + 'shBrushDiff.js',
-        'erl erlang             ' + root + 'shBrushErlang.js',
-        'groovy                 ' + root + 'shBrushGroovy.js',
-        'haxe                   ' + root + 'shBrushHaxe.js',
-        'java                   ' + root + 'shBrushJava.js',
-        'jfx javafx             ' + root + 'shBrushJavaFX.js',
-        'js jscript javascript  ' + root + 'shBrushJScript.js',
-        'perl pl                ' + root + 'shBrushPerl.js',
-        'php                    ' + root + 'shBrushPhp.js',
-        'text plain             ' + root + 'shBrushPlain.js',
-        'ps powershell          ' + root + 'shBrushPowerShell.js',
-        'py python              ' + root + 'shBrushPython.js',
-        'ruby rails ror rb      ' + root + 'shBrushRuby.js',
-        'sass scss              ' + root + 'shBrushSass.js',
-        'scala                  ' + root + 'shBrushScala.js',
-        'sql                    ' + root + 'shBrushSql.js',
-        'vb vbnet               ' + root + 'shBrushVb.js',
-        'xml xhtml xslt html    ' + root + 'shBrushXml.js'
-    );
-    SyntaxHighlighter.all();
+$(document).ready(function () {
+    var root = BlogEngineRes.applicationWebRoot + 'scripts/syntaxhighlighter/scripts/';
+    SyntaxHighlighter.autoloader(
+        'applescript            ' + root + 'shBrushAppleScript.js',
+        'cypher                    ' + root + 'shBrushCypher.js', 
+        'actionscript3 as3      ' + root + 'shBrushAS3.js',
+        'bash shell             ' + root + 'shBrushBash.js',
+        'coldfusion cf          ' + root + 'shBrushColdFusion.js',
+        'cpp c                  ' + root + 'shBrushCpp.js',
+        'c# c-sharp csharp      ' + root + 'shBrushCSharp.js',
+        'css                    ' + root + 'shBrushCss.js',
+        'delphi pascal          ' + root + 'shBrushDelphi.js',
+        'diff patch pas         ' + root + 'shBrushDiff.js',
+        'erl erlang             ' + root + 'shBrushErlang.js',
+        'groovy                 ' + root + 'shBrushGroovy.js',
+        'haxe                   ' + root + 'shBrushHaxe.js',
+        'java                   ' + root + 'shBrushJava.js',
+        'jfx javafx             ' + root + 'shBrushJavaFX.js',
+        'js jscript javascript  ' + root + 'shBrushJScript.js',
+        'perl pl                ' + root + 'shBrushPerl.js',
+        'php                    ' + root + 'shBrushPhp.js',
+        'text plain             ' + root + 'shBrushPlain.js',
+        'ps powershell          ' + root + 'shBrushPowerShell.js',
+        'py python              ' + root + 'shBrushPython.js',
+        'ruby rails ror rb      ' + root + 'shBrushRuby.js',
+        'sass scss              ' + root + 'shBrushSass.js',
+        'scala                  ' + root + 'shBrushScala.js',
+        'sql                    ' + root + 'shBrushSql.js',
+        'vb vbnet               ' + root + 'shBrushVb.js',
+        'xml xhtml xslt html    ' + root + 'shBrushXml.js'
+    );
+    SyntaxHighlighter.all();
 });
\ No newline at end of file
diff --git a/BlogEngine/BlogEngine.NET/Scripts/syntaxhighlighter/syntaxhighlighter.htm b/BlogEngine/BlogEngine.NET/Scripts/syntaxhighlighter/syntaxhighlighter.htm
index 53d990d5f..9b0fd0a35 100644
--- a/BlogEngine/BlogEngine.NET/Scripts/syntaxhighlighter/syntaxhighlighter.htm
+++ b/BlogEngine/BlogEngine.NET/Scripts/syntaxhighlighter/syntaxhighlighter.htm
@@ -1,114 +1,115 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<title>{#syntaxhighlighter.syntaxhighlighter_title}</title>
-		
-		<meta content="en" http-equiv="Content-Language">
-		<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
-		
-		<link rel="stylesheet" type="text/css" href="styles/syntaxhighlighter.css" />
-		
-		<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
-		<script type="text/javascript" src="../../utils/mctabs.js"></script>
-		<script type="text/javascript" src="../../utils/form_utils.js"></script>
-		<script type="text/javascript" src="../../utils/editable_selects.js"></script>
-		<script type="text/javascript" src="scripts/syntaxhighlighter.js"></script>
-
-		<base target="_self" />
-	</head>
-	<body>
-		<div class="container">
-			{#syntaxhighlighter.syntaxhighlighter_languagepicker}:
-			<select id="programminglanguages">
-				<option value="as3">Actionscript</option>
-				<option value="bash">Bash/shell</option>
-				<option value="cf">Coldfusion</option>
-				<option selected="selected" value="c-sharp">C#</option>
-				<option value="c++">C++</option>
-				<option value="css">CSS</option>
-				<option value="delphi">Delphi</option>
-				<option value="diff">Diff</option>
-				<option value="erl">Erlang</option>
-				<option value="groovy">Groovy</option>
-				<option value="js">Javascript</option>
-				<option value="java">Java</option>
-				<option value="jfx">JavaFX</option>
-				<option value="perl">Perl</option>
-				<option value="php">PHP</option>
-				<option value="plain">Plain text</option>
-				<option value="ps">Powershell</option>
-				<option value="py">Python</option>
-				<option value="ruby">Ruby</option>
-				<option value="scala">Scala</option>
-				<option value="sql">SQL</option>
-				<option value="vb">Visual Basic</option>
-				<option value="xml">XML</option>
-			</select>
-			<br /><br />
-			{#syntaxhighlighter.syntaxhighlighter_pagecode}:
-			<br />
-			<textarea id="codearea" class="codearea"></textarea>
-			<br />
-			<div class="options">
-				<table>
-					<tbody>
-						<tr>
-							<th>{#syntaxhighlighter.syntaxhighlighter_autolinks}</th>
-							<td><input id="autolinks" type="checkbox" checked /></td>
-							<td><em>{#syntaxhighlighter.syntaxhighlighter_autolinks_description}</em></td>
-						</tr>
-						<tr>
-							<th>{#syntaxhighlighter.syntaxhighlighter_classname}</th>
-							<td><input id="classname" type="text" value="" /></td>
-							<td><em>{#syntaxhighlighter.syntaxhighlighter_classname_description}</em></td>
-						</tr>
-						<tr>
-							<th>{#syntaxhighlighter.syntaxhighlighter_collapse}</th>
-							<td><input id="collapse" type="checkbox" /></td>
-							<td><em>{#syntaxhighlighter.syntaxhighlighter_collapse_description}</em></td>
-						</tr>
-						<tr>
-							<th>{#syntaxhighlighter.syntaxhighlighter_firstline}</th>
-							<td><input id="firstline" type="text" value="1" /></td>
-							<td><em>{#syntaxhighlighter.syntaxhighlighter_firstline_description}</em></td>
-						</tr>
-						<tr>
-							<th>{#syntaxhighlighter.syntaxhighlighter_gutter}</th>
-							<td><input id="gutter" type="checkbox" checked /></td>
-							<td><em>{#syntaxhighlighter.syntaxhighlighter_gutter_description}</em></td>
-						</tr>
-						<tr>
-							<th>{#syntaxhighlighter.syntaxhighlighter_highlight}</th>
-							<td><input id="highlight" type="text" value="" /></td>
-							<td><em>{#syntaxhighlighter.syntaxhighlighter_highlight_description}</em></td>
-						</tr>
-						<tr>
-							<th>{#syntaxhighlighter.syntaxhighlighter_htmlscript}</th>
-							<td><input id="htmlscript" type="checkbox" /></td>
-							<td><em>{#syntaxhighlighter.syntaxhighlighter_htmlscript_description}</em></td>
-						</tr>
-						<tr>
-							<th>{#syntaxhighlighter.syntaxhighlighter_smarttabs}</th>
-							<td><input id="smarttabs" type="checkbox" checked /></td>
-							<td><em>{#syntaxhighlighter.syntaxhighlighter_smarttabs_description}</em></td>
-						</tr>
-						<tr>
-							<th>{#syntaxhighlighter.syntaxhighlighter_tabsize}</th>
-							<td><input id="tabsize" type="text" value="4" /></td>
-							<td><em>{#syntaxhighlighter.syntaxhighlighter_tabsize_description}</em></td>
-						</tr>
-						<tr>
-							<th>{#syntaxhighlighter.syntaxhighlighter_toolbar}</th>
-							<td><input id="toolbar" type="checkbox" /></td>
-							<td><em>{#syntaxhighlighter.syntaxhighlighter_toolbar_description}</em></td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-			<p class="actions">
-				<input id="insert" type="button" value="{#insert}" onclick="return Save_Button_onclick()" />
-				<input id="cancel" type="button" value="{#cancel}" onclick="return Cancel_Button_onclick()" />
-			</p>
-		</div>
-	</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title>{#syntaxhighlighter.syntaxhighlighter_title}</title>
+		
+		<meta content="en" http-equiv="Content-Language">
+		<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
+		
+		<link rel="stylesheet" type="text/css" href="styles/syntaxhighlighter.css" />
+		
+		<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+		<script type="text/javascript" src="../../utils/mctabs.js"></script>
+		<script type="text/javascript" src="../../utils/form_utils.js"></script>
+		<script type="text/javascript" src="../../utils/editable_selects.js"></script>
+		<script type="text/javascript" src="scripts/syntaxhighlighter.js"></script>
+
+		<base target="_self" />
+	</head>
+	<body>
+		<div class="container">
+			{#syntaxhighlighter.syntaxhighlighter_languagepicker}:
+			<select id="programminglanguages">
+			    <option value="as3">Actionscript</option>
+                <option value="cypher">Cypher</option>
+				<option value="bash">Bash/shell</option>
+				<option value="cf">Coldfusion</option>
+				<option selected="selected" value="c-sharp">C#</option>
+				<option value="c++">C++</option>
+				<option value="css">CSS</option>
+				<option value="delphi">Delphi</option>
+				<option value="diff">Diff</option>
+				<option value="erl">Erlang</option>
+				<option value="groovy">Groovy</option>
+				<option value="js">Javascript</option>
+				<option value="java">Java</option>
+				<option value="jfx">JavaFX</option>
+				<option value="perl">Perl</option>
+				<option value="php">PHP</option>
+				<option value="plain">Plain text</option>
+				<option value="ps">Powershell</option>
+				<option value="py">Python</option>
+				<option value="ruby">Ruby</option>
+				<option value="scala">Scala</option>
+				<option value="sql">SQL</option>
+				<option value="vb">Visual Basic</option>
+				<option value="xml">XML</option>
+			</select>
+			<br /><br />
+			{#syntaxhighlighter.syntaxhighlighter_pagecode}:
+			<br />
+			<textarea id="codearea" class="codearea"></textarea>
+			<br />
+			<div class="options">
+				<table>
+					<tbody>
+						<tr>
+							<th>{#syntaxhighlighter.syntaxhighlighter_autolinks}</th>
+							<td><input id="autolinks" type="checkbox" checked /></td>
+							<td><em>{#syntaxhighlighter.syntaxhighlighter_autolinks_description}</em></td>
+						</tr>
+						<tr>
+							<th>{#syntaxhighlighter.syntaxhighlighter_classname}</th>
+							<td><input id="classname" type="text" value="" /></td>
+							<td><em>{#syntaxhighlighter.syntaxhighlighter_classname_description}</em></td>
+						</tr>
+						<tr>
+							<th>{#syntaxhighlighter.syntaxhighlighter_collapse}</th>
+							<td><input id="collapse" type="checkbox" /></td>
+							<td><em>{#syntaxhighlighter.syntaxhighlighter_collapse_description}</em></td>
+						</tr>
+						<tr>
+							<th>{#syntaxhighlighter.syntaxhighlighter_firstline}</th>
+							<td><input id="firstline" type="text" value="1" /></td>
+							<td><em>{#syntaxhighlighter.syntaxhighlighter_firstline_description}</em></td>
+						</tr>
+						<tr>
+							<th>{#syntaxhighlighter.syntaxhighlighter_gutter}</th>
+							<td><input id="gutter" type="checkbox" checked /></td>
+							<td><em>{#syntaxhighlighter.syntaxhighlighter_gutter_description}</em></td>
+						</tr>
+						<tr>
+							<th>{#syntaxhighlighter.syntaxhighlighter_highlight}</th>
+							<td><input id="highlight" type="text" value="" /></td>
+							<td><em>{#syntaxhighlighter.syntaxhighlighter_highlight_description}</em></td>
+						</tr>
+						<tr>
+							<th>{#syntaxhighlighter.syntaxhighlighter_htmlscript}</th>
+							<td><input id="htmlscript" type="checkbox" /></td>
+							<td><em>{#syntaxhighlighter.syntaxhighlighter_htmlscript_description}</em></td>
+						</tr>
+						<tr>
+							<th>{#syntaxhighlighter.syntaxhighlighter_smarttabs}</th>
+							<td><input id="smarttabs" type="checkbox" checked /></td>
+							<td><em>{#syntaxhighlighter.syntaxhighlighter_smarttabs_description}</em></td>
+						</tr>
+						<tr>
+							<th>{#syntaxhighlighter.syntaxhighlighter_tabsize}</th>
+							<td><input id="tabsize" type="text" value="4" /></td>
+							<td><em>{#syntaxhighlighter.syntaxhighlighter_tabsize_description}</em></td>
+						</tr>
+						<tr>
+							<th>{#syntaxhighlighter.syntaxhighlighter_toolbar}</th>
+							<td><input id="toolbar" type="checkbox" /></td>
+							<td><em>{#syntaxhighlighter.syntaxhighlighter_toolbar_description}</em></td>
+						</tr>
+					</tbody>
+				</table>
+			</div>
+			<p class="actions">
+				<input id="insert" type="button" value="{#insert}" onclick="return Save_Button_onclick()" />
+				<input id="cancel" type="button" value="{#cancel}" onclick="return Cancel_Button_onclick()" />
+			</p>
+		</div>
+	</body>
+</html>
diff --git a/BlogEngine/BlogEngine.NET/Web.Config b/BlogEngine/BlogEngine.NET/Web.Config
index e698ac4f5..4df0c4d17 100644
--- a/BlogEngine/BlogEngine.NET/Web.Config
+++ b/BlogEngine/BlogEngine.NET/Web.Config
@@ -5,7 +5,7 @@
       <section name="blogProvider" requirePermission="false" type="BlogEngine.Core.Providers.BlogProviderSection, BlogEngine.Core" allowDefinition="MachineToApplication" restartOnExternalChanges="true" />
       <section name="blogFileSystemProvider" requirePermission="false" type="BlogEngine.Core.Providers.BlogFileSystemProviderSection, BlogEngine.Core" allowDefinition="MachineToApplication" restartOnExternalChanges="true" />
     </sectionGroup>
-  </configSections>
+  <section name="resizer" type="ImageResizer.ResizerSection" requirePermission="false" /></configSections>
   <BlogEngine>
     <blogProvider defaultProvider="XmlBlogProvider" fileStoreProvider="XmlBlogProvider">
       <providers>
@@ -133,7 +133,7 @@
       <remove name="PassportAuthentication" />
       <remove name="Profile" />
       <remove name="AnonymousIdentification" />
-    </httpModules>
+    <add name="ImageResizingModule" type="ImageResizer.InterceptModule" /></httpModules>
     <httpHandlers>
       <add verb="*" path="file.axd" type="BlogEngine.Core.Web.HttpHandlers.FileHandler, BlogEngine.Core" validate="false" />
       <add verb="*" path="image.axd" type="BlogEngine.Core.Web.HttpHandlers.ImageHandler, BlogEngine.Core" validate="false" />
@@ -156,7 +156,7 @@
     </httpHandlers>
   </system.web>
   <system.webServer>
-    <validation validateIntegratedModeConfiguration="false" />   
+       
     <!-- 
         Uncomment below to configure custom 404 error; if blog in subfolder, 
         like "/blog", make sure path includes subfolder
@@ -182,7 +182,7 @@
       <add name="ReferrerModule" type="BlogEngine.Core.Web.HttpModules.ReferrerModule, BlogEngine.Core" />
       <add name="SecurityModule" type="BlogEngine.Core.Security, BlogEngine.Core" />
       <add name="RightModule" type="BlogEngine.Core.Right, BlogEngine.Core" />
-    </modules>
+    <add name="ImageResizingModule" type="ImageResizer.InterceptModule" /></modules>
     <handlers accessPolicy="Read, Write, Script, Execute">
       <add name="FileHandler" verb="*" path="file.axd" type="BlogEngine.Core.Web.HttpHandlers.FileHandler, BlogEngine.Core" resourceType="Unspecified" requireAccess="Script" preCondition="integratedMode" />
       <add name="ImageHandler" verb="*" path="image.axd" type="BlogEngine.Core.Web.HttpHandlers.ImageHandler, BlogEngine.Core" resourceType="Unspecified" requireAccess="Script" preCondition="integratedMode" />
@@ -234,7 +234,7 @@
       <remove fileExtension=".svg" />
       <mimeMap fileExtension=".svg" mimeType="image/svg+xml" />
     </staticContent>
-  </system.webServer>
+  <validation validateIntegratedModeConfiguration="false" /></system.webServer>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
@@ -267,4 +267,8 @@
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
\ No newline at end of file
+<resizer>
+	<plugins>
+	<add name="DiskCache" />
+	<add name="PrettyGifs" /></plugins>
+	</resizer></configuration>
\ No newline at end of file
diff --git a/BlogEngine/BlogEngine.NET/admin/editors/tinymce/plugins/sh4tinymce/plugin.js b/BlogEngine/BlogEngine.NET/admin/editors/tinymce/plugins/sh4tinymce/plugin.js
index 8e0124013..87b5468e1 100644
--- a/BlogEngine/BlogEngine.NET/admin/editors/tinymce/plugins/sh4tinymce/plugin.js
+++ b/BlogEngine/BlogEngine.NET/admin/editors/tinymce/plugins/sh4tinymce/plugin.js
@@ -1,199 +1,200 @@
-/*
-* syntaxhighlighter TinyMCE plugin
-* Released under LGPL License.
-* 
-* by Robin Calmejane
-* http://nomadonweb.com
-* 
-* Plugin page :
-* http://lab.nomadonweb/sh4tinymce
-* 
-*/
-tinymce.PluginManager.requireLangPack('sh4tinymce');
-tinymce.PluginManager.add('sh4tinymce', function(editor,url) {
-	function showDialog() {
-		/* Var declaration */
-		var win, dom = editor.dom, selection = editor.selection, data = {}, Elmt;
-		var shDefault = {}, defaultLanguage = 'html', selected = false, selectedCode, selectionNode = selection.getNode(), settings;
-		
-		/* Set default settings for SH and plugin */
-		/***** DON'T CHANGE DEFAULTS *****/
-		/* shDefault : Default SyntaxHighlighter settings */
-		shDefault.autolinks		= true;
-		shDefault.collapse		= false;
-		shDefault.firstline		= '1';
-		shDefault.gutter		= true;
-		shDefault.highlight		= '';
-		shDefault.htmlscript	= false;
-		shDefault.tabsize		= '4';
-		shDefault.toolbar		= true;
-		
-		/* data : plugin settings */
-		data.language 		= '';
-		data.autolinks		= shDefault.autolinks;
-		data.collapse		= shDefault.collapse;
-		data.firstline		= shDefault.firstline;
-		data.gutter			= shDefault.gutter;
-		data.highlight		= shDefault.highlight;
-		data.htmlscript		= shDefault.htmlscript;
-		data.tabsize		= shDefault.tabsize;
-		data.toolbar		= shDefault.toolbar;
-		/* End default settings */
-		
-		// List languages
-		var languageItems = [
-				{text: 'Language',		value: ''},
-				{text: 'ActionScript3',	value: 'as3'},
-				{text: 'Bash/shell',	value: 'bash'},
-				{text: 'ColdFusion',	value: 'cf'},
-				{text: 'C#',			value: 'csharp'},
-				{text: 'C++',			value: 'cpp'},
-				{text: 'CSS',			value: 'css'},
-				{text: 'Delphi',		value: 'delphi'},
-				{text: 'Diff',			value: 'diff'},
-				{text: 'Erlang',		value: 'erl'},
-				{text: 'Groovy',		value: 'groovy'},
-				{text: 'HTML',			value: 'html'},
-				{text: 'Java',			value: 'java'},
-				{text: 'JavaFX',		value: 'jfx'},
-				{text: 'JavaScript',	value: 'js'},
-				{text: 'Perl',			value: 'perl'},
-				{text: 'PHP',			value: 'php'},
-				{text: 'PowerShell',	value: 'ps'},
-				{text: 'Python',		value: 'py'},
-				{text: 'Ruby',			value: 'ruby'},
-				{text: 'Scala',			value: 'scala'},
-				{text: 'SQL',			value: 'sql'},
-				{text: 'Text',			value: 'plain'},
-				{text: 'Visual Basic',	value: 'vb'},
-				{text: 'XML',			value: 'xml'}
-		];
-		
-		// Get settings of SH existing code
-		function getSHSettings(settings) {
-			var s = settings.split(';');
-			var settingsObj= {};
-			for(var i=0; i<s.length; i++)
-			{
-				var o = s[i].split(':');
-				settingsObj[o[0].replace(/\-/g,'')] = o[1];
-			}
-			tinymce.each(settingsObj, function(value, setting) {
-				if (setting == 'brush') {
-					if (data.language != value)
-						data.language = value;
-				} else {
-					value = value == 'true' ? true : (value == 'false' ? false : value);
-					if(setting=='highlight')value=value.replace(/\[/g,"").replace(/\]/g,"");
-					data[setting] = value;
-				}
-			});
-		}
-		
-		// Check code/text selection in tinyMCE editor
-		if(selectionNode.nodeName.toLowerCase() == 'pre'
-			&& selectionNode.className.indexOf('brush:') != -1) {
-			// This is an SH code
-			selected = true;
-			selectedCode = $(selectionNode).html();
-			selectedCode = selectedCode.replace(/\&lt\;/gi,"<").replace(/\&gt\;/gi,">");
-			/* We have to get SH settings from classname */
-			settings = selectionNode.className;
-			settings = settings.replace(/ /g,'');
-			getSHSettings(settings);
-		}else{
-			// This is a simple selection
-			selectedCode = selection.getContent({format : 'text'});
-			data.autolinks = false;
-			data.toolbar = false;
-		}
-		
-		// Select language item list
-		for(var i=0; i<languageItems.length; i++){
-			if(languageItems[i].value == data.language){
-				languageItems[i].selected = true;
-			}
-		}
-		
-		data.code = selectedCode;
-		if (data.code == '&nbsp;')
-			data.code = '';
-		
-		function onSubmitFunction(e) {
-			var code = e.data.code;
-			code = code.replace(/\</g,"&lt;").replace(/\>/g,"&gt;");
-			/* Convert settings into strings for classname */
-			var language	= e.data.language ? e.data.language : defaultLanguage;
-			var collapse	= e.data.collapse != shDefault.collapse ? ';collapse:' + e.data.collapse : '';
-			var autolinks	= e.data.autolinks != shDefault.autolinks ? ';auto-links:' + e.data.autolinks : '';
-			var gutter		= e.data.gutter != shDefault.gutter ? ';gutter:' + e.data.gutter : '';
-			var htmlscript	= e.data.htmlscript != shDefault.htmlscript ? ';html-script:' + e.data.htmlscript : '';
-			var toolbar		= e.data.toolbar != shDefault.toolbar ? ';toolbar:' + e.data.toolbar : '';
-			var firstline	= e.data.firstline != shDefault.firstline ? ';first-line:' + e.data.firstline : '';
-			var hlstart=e.data.highlight.indexOf(",")!=-1?"[":"",
-				hlend=e.data.highlight.indexOf(",")!=-1?"]":"";
-			var highlight	= e.data.highlight.replace(/ /g,"").replace(/\[/g,"").replace(/\]/g,"") != shDefault.highlight ? ';highlight:' + hlstart + e.data.highlight.replace(/ /g,"").replace(/\[/g,"").replace(/\]/g,"").replace(/,$/g,"") + hlend : '';
-			var tabsize		= e.data.tabsize != shDefault.tabsize ? ';tab-size:' + e.data.tabsize : '';
-			
-			// Create SH element with string settings
-			Elmt = editor.dom.create('pre',
-						{class: 'brush:' + language + collapse + autolinks + gutter + htmlscript + toolbar + firstline + highlight + tabsize,
-						 contenteditable: 'false'},
-						 code);
-			
-			if(selected)
-				editor.dom.replace(Elmt, selectionNode);
-			else
-				editor.insertContent(editor.dom.getOuterHTML(Elmt)+'<br>');
-		}
-		
-		win = editor.windowManager.open({
-			title: 'SH4TinyMCE - Code Editor',
-			data: data,
-			minWidth: 450,
-			body: [
-					{name: 'language',	type: 'listbox',	values: languageItems},
-					{name: 'code',		type: 'textbox',	minHeight: 200,		multiline: true},
-					{
-						type: 'container',
-						layout: 'flex',
-						direction: 'row',
-						align: 'center',
-						spacing: 7,
-						items: [
-								{name: 'collapse',		type: 'checkbox',	text: 'Collapse',	checked: data.collapse},
-								{name: 'autolinks',		type: 'checkbox',	text: 'Autolinks',		checked: data.autolinks},
-								{name: 'gutter',		type: 'checkbox',	text: 'Gutter',			checked: data.gutter},
-								{name: 'htmlscript',	type: 'checkbox',	text: 'Html script',	checked: data.htmlscript},
-								{name: 'toolbar',		type: 'checkbox',	text: 'Toolbar',		checked: data.toolbar}
-						]
-					},
-					{
-						type: 'form',
-						padding: 0,
-						labelGap: 5,
-						spacing: 5,
-						direction: 'row',
-						items: [
-								{name: 'firstline',		type: 'textbox',	label: 'First Line', 	size: 3,	value: data.firstline},
-								{name: 'highlight',		type: 'textbox',	label: 'Highlight', 	size: 10,	value: data.highlight},
-								{name: 'tabsize',		type: 'textbox',	label: 'Tab size',		size: 3,	value: data.tabsize},
-						]
-					}
-			],
-			onsubmit: onSubmitFunction
-		});
-	}
-	tinymce.DOM.loadCSS(url+'/style/style.css');
-	editor.addButton('sh4tinymce', {
-		icon: 'sh4tinymce',
-		tooltip: 'Insert/Edit Code',
-		onclick: showDialog
-	});
-    editor.addMenuItem('sh4tinymce', {
-        text: 'SH4TinyMCE',
-		icon: 'sh4tinymce',
-        context: 'insert',
-        onclick: showDialog
-    });
+/*
+* syntaxhighlighter TinyMCE plugin
+* Released under LGPL License.
+* 
+* by Robin Calmejane
+* http://nomadonweb.com
+* 
+* Plugin page :
+* http://lab.nomadonweb/sh4tinymce
+* 
+*/
+tinymce.PluginManager.requireLangPack('sh4tinymce');
+tinymce.PluginManager.add('sh4tinymce', function(editor,url) {
+	function showDialog() {
+		/* Var declaration */
+		var win, dom = editor.dom, selection = editor.selection, data = {}, Elmt;
+		var shDefault = {}, defaultLanguage = 'html', selected = false, selectedCode, selectionNode = selection.getNode(), settings;
+		
+		/* Set default settings for SH and plugin */
+		/***** DON'T CHANGE DEFAULTS *****/
+		/* shDefault : Default SyntaxHighlighter settings */
+		shDefault.autolinks		= true;
+		shDefault.collapse		= false;
+		shDefault.firstline		= '1';
+		shDefault.gutter		= true;
+		shDefault.highlight		= '';
+		shDefault.htmlscript	= false;
+		shDefault.tabsize		= '4';
+		shDefault.toolbar		= true;
+		
+		/* data : plugin settings */
+		data.language 		= '';
+		data.autolinks		= shDefault.autolinks;
+		data.collapse		= shDefault.collapse;
+		data.firstline		= shDefault.firstline;
+		data.gutter			= shDefault.gutter;
+		data.highlight		= shDefault.highlight;
+		data.htmlscript		= shDefault.htmlscript;
+		data.tabsize		= shDefault.tabsize;
+		data.toolbar		= shDefault.toolbar;
+		/* End default settings */
+		
+		// List languages
+		var languageItems = [
+				{ text: 'Language', value: '' },
+                {text: 'Cypher',        value: 'cypher' },
+				{text: 'ActionScript3',	value: 'as3'},
+				{text: 'Bash/shell',	value: 'bash'},
+				{text: 'ColdFusion',	value: 'cf'},
+				{text: 'C#',			value: 'csharp'},
+				{text: 'C++',			value: 'cpp'},
+				{text: 'CSS',			value: 'css'},
+				{text: 'Delphi',		value: 'delphi'},
+				{text: 'Diff',			value: 'diff'},
+				{text: 'Erlang',		value: 'erl'},
+				{text: 'Groovy',		value: 'groovy'},
+				{text: 'HTML',			value: 'html'},
+				{text: 'Java',			value: 'java'},
+				{text: 'JavaFX',		value: 'jfx'},
+				{text: 'JavaScript',	value: 'js'},
+				{text: 'Perl',			value: 'perl'},
+				{text: 'PHP',			value: 'php'},
+				{text: 'PowerShell',	value: 'ps'},
+				{text: 'Python',		value: 'py'},
+				{text: 'Ruby',			value: 'ruby'},
+				{text: 'Scala',			value: 'scala'},
+				{text: 'SQL',			value: 'sql'},
+				{text: 'Text',			value: 'plain'},
+				{text: 'Visual Basic',	value: 'vb'},
+				{text: 'XML',			value: 'xml'}
+		];
+		
+		// Get settings of SH existing code
+		function getSHSettings(settings) {
+			var s = settings.split(';');
+			var settingsObj= {};
+			for(var i=0; i<s.length; i++)
+			{
+				var o = s[i].split(':');
+				settingsObj[o[0].replace(/\-/g,'')] = o[1];
+			}
+			tinymce.each(settingsObj, function(value, setting) {
+				if (setting == 'brush') {
+					if (data.language != value)
+						data.language = value;
+				} else {
+					value = value == 'true' ? true : (value == 'false' ? false : value);
+					if(setting=='highlight')value=value.replace(/\[/g,"").replace(/\]/g,"");
+					data[setting] = value;
+				}
+			});
+		}
+		
+		// Check code/text selection in tinyMCE editor
+		if(selectionNode.nodeName.toLowerCase() == 'pre'
+			&& selectionNode.className.indexOf('brush:') != -1) {
+			// This is an SH code
+			selected = true;
+			selectedCode = $(selectionNode).html();
+			selectedCode = selectedCode.replace(/\&lt\;/gi,"<").replace(/\&gt\;/gi,">");
+			/* We have to get SH settings from classname */
+			settings = selectionNode.className;
+			settings = settings.replace(/ /g,'');
+			getSHSettings(settings);
+		}else{
+			// This is a simple selection
+			selectedCode = selection.getContent({format : 'text'});
+			data.autolinks = false;
+			data.toolbar = false;
+		}
+		
+		// Select language item list
+		for(var i=0; i<languageItems.length; i++){
+			if(languageItems[i].value == data.language){
+				languageItems[i].selected = true;
+			}
+		}
+		
+		data.code = selectedCode;
+		if (data.code == '&nbsp;')
+			data.code = '';
+		
+		function onSubmitFunction(e) {
+			var code = e.data.code;
+			code = code.replace(/\</g,"&lt;").replace(/\>/g,"&gt;");
+			/* Convert settings into strings for classname */
+			var language	= e.data.language ? e.data.language : defaultLanguage;
+			var collapse	= e.data.collapse != shDefault.collapse ? ';collapse:' + e.data.collapse : '';
+			var autolinks	= e.data.autolinks != shDefault.autolinks ? ';auto-links:' + e.data.autolinks : '';
+			var gutter		= e.data.gutter != shDefault.gutter ? ';gutter:' + e.data.gutter : '';
+			var htmlscript	= e.data.htmlscript != shDefault.htmlscript ? ';html-script:' + e.data.htmlscript : '';
+			var toolbar		= e.data.toolbar != shDefault.toolbar ? ';toolbar:' + e.data.toolbar : '';
+			var firstline	= e.data.firstline != shDefault.firstline ? ';first-line:' + e.data.firstline : '';
+			var hlstart=e.data.highlight.indexOf(",")!=-1?"[":"",
+				hlend=e.data.highlight.indexOf(",")!=-1?"]":"";
+			var highlight	= e.data.highlight.replace(/ /g,"").replace(/\[/g,"").replace(/\]/g,"") != shDefault.highlight ? ';highlight:' + hlstart + e.data.highlight.replace(/ /g,"").replace(/\[/g,"").replace(/\]/g,"").replace(/,$/g,"") + hlend : '';
+			var tabsize		= e.data.tabsize != shDefault.tabsize ? ';tab-size:' + e.data.tabsize : '';
+			
+			// Create SH element with string settings
+			Elmt = editor.dom.create('pre',
+						{class: 'brush:' + language + collapse + autolinks + gutter + htmlscript + toolbar + firstline + highlight + tabsize,
+						 contenteditable: 'false'},
+						 code);
+			
+			if(selected)
+				editor.dom.replace(Elmt, selectionNode);
+			else
+				editor.insertContent(editor.dom.getOuterHTML(Elmt)+'<br>');
+		}
+		
+		win = editor.windowManager.open({
+			title: 'SH4TinyMCE - Code Editor',
+			data: data,
+			minWidth: 450,
+			body: [
+					{name: 'language',	type: 'listbox',	values: languageItems},
+					{name: 'code',		type: 'textbox',	minHeight: 200,		multiline: true},
+					{
+						type: 'container',
+						layout: 'flex',
+						direction: 'row',
+						align: 'center',
+						spacing: 7,
+						items: [
+								{name: 'collapse',		type: 'checkbox',	text: 'Collapse',	checked: data.collapse},
+								{name: 'autolinks',		type: 'checkbox',	text: 'Autolinks',		checked: data.autolinks},
+								{name: 'gutter',		type: 'checkbox',	text: 'Gutter',			checked: data.gutter},
+								{name: 'htmlscript',	type: 'checkbox',	text: 'Html script',	checked: data.htmlscript},
+								{name: 'toolbar',		type: 'checkbox',	text: 'Toolbar',		checked: data.toolbar}
+						]
+					},
+					{
+						type: 'form',
+						padding: 0,
+						labelGap: 5,
+						spacing: 5,
+						direction: 'row',
+						items: [
+								{name: 'firstline',		type: 'textbox',	label: 'First Line', 	size: 3,	value: data.firstline},
+								{name: 'highlight',		type: 'textbox',	label: 'Highlight', 	size: 10,	value: data.highlight},
+								{name: 'tabsize',		type: 'textbox',	label: 'Tab size',		size: 3,	value: data.tabsize},
+						]
+					}
+			],
+			onsubmit: onSubmitFunction
+		});
+	}
+	tinymce.DOM.loadCSS(url+'/style/style.css');
+	editor.addButton('sh4tinymce', {
+		icon: 'sh4tinymce',
+		tooltip: 'Insert/Edit Code',
+		onclick: showDialog
+	});
+    editor.addMenuItem('sh4tinymce', {
+        text: 'SH4TinyMCE',
+		icon: 'sh4tinymce',
+        context: 'insert',
+        onclick: showDialog
+    });
 });
\ No newline at end of file
diff --git a/BlogEngine/BlogEngine.NET/admin/editors/tinymce/plugins/sh4tinymce/plugin.min.js b/BlogEngine/BlogEngine.NET/admin/editors/tinymce/plugins/sh4tinymce/plugin.min.js
index c9adb36ac..4ba8d6276 100644
--- a/BlogEngine/BlogEngine.NET/admin/editors/tinymce/plugins/sh4tinymce/plugin.min.js
+++ b/BlogEngine/BlogEngine.NET/admin/editors/tinymce/plugins/sh4tinymce/plugin.min.js
@@ -1 +1 @@
-tinymce.PluginManager.requireLangPack("sh4tinymce");tinymce.PluginManager.add("sh4tinymce",function(e,url){function t(){function p(e){var t=e.split(";");var n={};for(var r=0;r<t.length;r++){var s=t[r].split(":");n[s[0].replace(/\-/g,"")]=s[1]}tinymce.each(n,function(e,t){if(t=="brush"){if(i.language!=e)i.language=e}else{e=e=="true"?true:e=="false"?false:e;if(t=='highlight')e=e.replace(/\[/g,"").replace(/\]/g,"");i[t]=e}})}function v(t){var n=t.data.code;n=n.replace(/\</g,"&lt;").replace(/\>/g,"&gt;");var r=t.data.language?t.data.language:u;var i=t.data.collapse!=o.collapse?";collapse:"+t.data.collapse:"";var f=t.data.autolinks!=o.autolinks?";auto-links:"+t.data.autolinks:"";var c=t.data.gutter!=o.gutter?";gutter:"+t.data.gutter:"";var h=t.data.htmlscript!=o.htmlscript?";html-script:"+t.data.htmlscript:"";var p=t.data.toolbar!=o.toolbar?";toolbar:"+t.data.toolbar:"";var d=t.data.firstline!=o.firstline?";first-line:"+t.data.firstline:"";var hls=t.data.highlight.indexOf(",")!=-1?"[":"",hle=t.data.highlight.indexOf(",")!=-1?"]":"";var v=t.data.highlight.replace(/ /g,"").replace(/\[/g,"").replace(/\]/g,"")!=o.highlight?";highlight:"+hls+t.data.highlight.replace(/ /g,"").replace(/\[/g,"").replace(/\]/g,"").replace(/,$/g,"")+hle:"";var m=t.data.tabsize!=o.tabsize?";tab-size:"+t.data.tabsize:"";s=e.dom.create("pre",{"class":"brush:"+r+i+f+c+h+p+d+v+m,contenteditable:"false"},n);if(a)e.dom.replace(s,l);else e.insertContent(e.dom.getOuterHTML(s)+"<br>")}var t,n=e.dom,r=e.selection,i={},s;var o={},u="html",a=false,f,l=r.getNode(),c;o.autolinks=true;o.collapse=false;o.firstline="1";o.gutter=true;o.highlight="";o.htmlscript=false;o.tabsize="4";o.toolbar=true;i.language="";i.autolinks=o.autolinks;i.collapse=o.collapse;i.firstline=o.firstline;i.gutter=o.gutter;i.highlight=o.highlight;i.htmlscript=o.htmlscript;i.tabsize=o.tabsize;i.toolbar=o.toolbar;var h=[{text:"Language",value:""},{text:"ActionScript3",value:"as3"},{text:"Bash/shell",value:"bash"},{text:"ColdFusion",value:"cf"},{text:"C#",value:"csharp"},{text:"C++",value:"cpp"},{text:"CSS",value:"css"},{text:"Delphi",value:"delphi"},{text:"Diff",value:"diff"},{text:"Erlang",value:"erl"},{text:"Groovy",value:"groovy"},{text:"HTML",value:"html"},{text:"Java",value:"java"},{text:"JavaFX",value:"jfx"},{text:"JavaScript",value:"js"},{text:"Perl",value:"perl"},{text:"PHP",value:"php"},{text:"PowerShell",value:"ps"},{text:"Python",value:"py"},{text:"Ruby",value:"ruby"},{text:"Scala",value:"scala"},{text:"SQL",value:"sql"},{text:"Text",value:"plain"},{text:"Visual Basic",value:"vb"},{text:"XML",value:"xml"}];if(l.nodeName.toLowerCase()=="pre"&&l.className.indexOf("brush:")!=-1){a=true;f=$(l).html();f=f.replace(/\&lt\;/gi,"<").replace(/\&gt\;/gi,">");c=l.className;c=c.replace(/ /g,"");p(c)}else{f=r.getContent({format:"text"});i.autolinks=false;i.toolbar=false}for(var d=0;d<h.length;d++){if(h[d].value==i.language){h[d].selected=true}}i.code=f;if(i.code=="&nbsp;")i.code="";t=e.windowManager.open({title:"SH4TinyMCE - Code Editor",data:i,minWidth:450,body:[{name:"language",type:"listbox",values:h},{name:"code",type:"textbox",minHeight:200,multiline:true},{type:"container",layout:"flex",direction:"row",align:"center",spacing:7,items:[{name:"collapse",type:"checkbox",text:"Collapse",checked:i.collapse},{name:"autolinks",type:"checkbox",text:"Autolinks",checked:i.autolinks},{name:"gutter",type:"checkbox",text:"Gutter",checked:i.gutter},{name:"htmlscript",type:"checkbox",text:"Html script",checked:i.htmlscript},{name:"toolbar",type:"checkbox",text:"Toolbar",checked:i.toolbar}]},{type:"form",padding:0,labelGap:5,spacing:5,direction:"row",items:[{name:"firstline",type:"textbox",label:"First Line",size:3,value:i.firstline},{name:"highlight",type:"textbox",label:"Highlight",size:10,value:i.highlight},{name:"tabsize",type:"textbox",label:"Tab size",size:3,value:i.tabsize}]}],onsubmit:v})}tinymce.DOM.loadCSS(url+'/style/style.css');e.addButton("sh4tinymce",{icon:"sh4tinymce",tooltip:"Insert/Edit Code",onclick:t});e.addMenuItem("sh4tinymce",{text:"SH4TinyMCE",icon:"sh4tinymce",context:"insert",onclick:t})})
\ No newline at end of file
+tinymce.PluginManager.requireLangPack("sh4tinymce"); tinymce.PluginManager.add("sh4tinymce", function (e, url) { function t() { function p(e) { var t = e.split(";"); var n = {}; for (var r = 0; r < t.length; r++) { var s = t[r].split(":"); n[s[0].replace(/\-/g, "")] = s[1] } tinymce.each(n, function (e, t) { if (t == "brush") { if (i.language != e) i.language = e } else { e = e == "true" ? true : e == "false" ? false : e; if (t == 'highlight') e = e.replace(/\[/g, "").replace(/\]/g, ""); i[t] = e } }) } function v(t) { var n = t.data.code; n = n.replace(/\</g, "&lt;").replace(/\>/g, "&gt;"); var r = t.data.language ? t.data.language : u; var i = t.data.collapse != o.collapse ? ";collapse:" + t.data.collapse : ""; var f = t.data.autolinks != o.autolinks ? ";auto-links:" + t.data.autolinks : ""; var c = t.data.gutter != o.gutter ? ";gutter:" + t.data.gutter : ""; var h = t.data.htmlscript != o.htmlscript ? ";html-script:" + t.data.htmlscript : ""; var p = t.data.toolbar != o.toolbar ? ";toolbar:" + t.data.toolbar : ""; var d = t.data.firstline != o.firstline ? ";first-line:" + t.data.firstline : ""; var hls = t.data.highlight.indexOf(",") != -1 ? "[" : "", hle = t.data.highlight.indexOf(",") != -1 ? "]" : ""; var v = t.data.highlight.replace(/ /g, "").replace(/\[/g, "").replace(/\]/g, "") != o.highlight ? ";highlight:" + hls + t.data.highlight.replace(/ /g, "").replace(/\[/g, "").replace(/\]/g, "").replace(/,$/g, "") + hle : ""; var m = t.data.tabsize != o.tabsize ? ";tab-size:" + t.data.tabsize : ""; s = e.dom.create("pre", { "class": "brush:" + r + i + f + c + h + p + d + v + m, contenteditable: "false" }, n); if (a) e.dom.replace(s, l); else e.insertContent(e.dom.getOuterHTML(s) + "<br>") } var t, n = e.dom, r = e.selection, i = {}, s; var o = {}, u = "html", a = false, f, l = r.getNode(), c; o.autolinks = true; o.collapse = false; o.firstline = "1"; o.gutter = true; o.highlight = ""; o.htmlscript = false; o.tabsize = "4"; o.toolbar = true; i.language = ""; i.autolinks = o.autolinks; i.collapse = o.collapse; i.firstline = o.firstline; i.gutter = o.gutter; i.highlight = o.highlight; i.htmlscript = o.htmlscript; i.tabsize = o.tabsize; i.toolbar = o.toolbar; var h = [{ text: "Language", value: "" }, { text: 'Cypher', value: 'cypher' }, { text: "ActionScript3", value: "as3" }, { text: "Bash/shell", value: "bash" }, { text: "ColdFusion", value: "cf" }, { text: "C#", value: "csharp" }, { text: "C++", value: "cpp" }, { text: "CSS", value: "css" }, { text: "Delphi", value: "delphi" }, { text: "Diff", value: "diff" }, { text: "Erlang", value: "erl" }, { text: "Groovy", value: "groovy" }, { text: 'Cypher', value: 'cypher' }, { text: "HTML", value: "html" }, { text: "Java", value: "java" }, { text: "JavaFX", value: "jfx" }, { text: "JavaScript", value: "js" }, { text: "Perl", value: "perl" }, { text: "PHP", value: "php" }, { text: "PowerShell", value: "ps" }, { text: "Python", value: "py" }, { text: "Ruby", value: "ruby" }, { text: "Scala", value: "scala" }, { text: "SQL", value: "sql" }, { text: "Text", value: "plain" }, { text: "Visual Basic", value: "vb" }, { text: "XML", value: "xml" }]; if (l.nodeName.toLowerCase() == "pre" && l.className.indexOf("brush:") != -1) { a = true; f = $(l).html(); f = f.replace(/\&lt\;/gi, "<").replace(/\&gt\;/gi, ">"); c = l.className; c = c.replace(/ /g, ""); p(c) } else { f = r.getContent({ format: "text" }); i.autolinks = false; i.toolbar = false } for (var d = 0; d < h.length; d++) { if (h[d].value == i.language) { h[d].selected = true } } i.code = f; if (i.code == "&nbsp;") i.code = ""; t = e.windowManager.open({ title: "SH4TinyMCE - Code Editor", data: i, minWidth: 450, body: [{ name: "language", type: "listbox", values: h }, { name: "code", type: "textbox", minHeight: 200, multiline: true }, { type: "container", layout: "flex", direction: "row", align: "center", spacing: 7, items: [{ name: "collapse", type: "checkbox", text: "Collapse", checked: i.collapse }, { name: "autolinks", type: "checkbox", text: "Autolinks", checked: i.autolinks }, { name: "gutter", type: "checkbox", text: "Gutter", checked: i.gutter }, { name: "htmlscript", type: "checkbox", text: "Html script", checked: i.htmlscript }, { name: "toolbar", type: "checkbox", text: "Toolbar", checked: i.toolbar }] }, { type: "form", padding: 0, labelGap: 5, spacing: 5, direction: "row", items: [{ name: "firstline", type: "textbox", label: "First Line", size: 3, value: i.firstline }, { name: "highlight", type: "textbox", label: "Highlight", size: 10, value: i.highlight }, { name: "tabsize", type: "textbox", label: "Tab size", size: 3, value: i.tabsize }] }], onsubmit: v }) } tinymce.DOM.loadCSS(url + '/style/style.css'); e.addButton("sh4tinymce", { icon: "sh4tinymce", tooltip: "Insert/Edit Code", onclick: t }); e.addMenuItem("sh4tinymce", { text: "SH4TinyMCE", icon: "sh4tinymce", context: "insert", onclick: t }) })
\ No newline at end of file
diff --git a/BlogEngine/BlogEngine.NET/packages.config b/BlogEngine/BlogEngine.NET/packages.config
index 95dfcb289..e3fb3c89e 100644
--- a/BlogEngine/BlogEngine.NET/packages.config
+++ b/BlogEngine/BlogEngine.NET/packages.config
@@ -5,6 +5,10 @@
   <package id="bootstrap" version="3.3.5" targetFramework="net45" />
   <package id="DynamicQuery" version="1.0" targetFramework="net45" />
   <package id="FontAwesome" version="4.4.0" targetFramework="net45" />
+  <package id="ImageResizer" version="3.4.3" targetFramework="net45" />
+  <package id="ImageResizer.Plugins.DiskCache" version="3.4.3" targetFramework="net45" />
+  <package id="ImageResizer.Plugins.PrettyGifs" version="3.4.3" targetFramework="net45" />
+  <package id="ImageResizer.WebConfig" version="3.4.3" targetFramework="net45" />
   <package id="jQuery" version="2.1.4" targetFramework="net45" />
   <package id="jQuery.Cookie" version="1.4.0" targetFramework="net45" />
   <package id="jQuery.Validation" version="1.14.0" targetFramework="net45" />