diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9536f80..f3ac7ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@ todo
 - Added passworded links
 - fix deprecated external service
 
-2021.08.28
+2021.08.28 | ready for next release
 - add dashboard icon
 - clean PSR-2 codding style and short array
 - fix php 7.3+ and php 8.0.x compatibility
@@ -12,6 +12,7 @@ todo
 - merge index file sub parts
 - remove custom js
 - fix widgets rendering
+- fix public template now based on dotty
 
 2011.04.01
 - Changed version numbering
diff --git a/default-templates/kutrl.html b/default-templates/kutrl.html
index 0827236..7afc39f 100644
--- a/default-templates/kutrl.html
+++ b/default-templates/kutrl.html
@@ -1,87 +1,50 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{{tpl:BlogLanguage}}" lang="{{tpl:BlogLanguage}}">
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <meta name="MSSmartTagsPreventParsing" content="TRUE" />
-  <meta name="ROBOTS" content="{{tpl:BlogMetaRobots}}" />
-  
-  <title>{{tpl:BlogName encode_html="1"}}<tpl:PaginationIf start="0"> - {{tpl:lang page}} {{tpl:PaginationCurrent}}</tpl:PaginationIf></title>
-  <meta name="description" lang="{{tpl:BlogLanguage}}" content="{{tpl:BlogDescription cut_string="180" encode_html="1"}}" />
-  <meta name="copyright" content="{{tpl:BlogCopyrightNotice encode_html="1"}}" />
-  <meta name="author" content="{{tpl:BlogEditor encode_html="1"}}" />
-  <meta name="date" scheme="W3CDTF" content="{{tpl:BlogUpdateDate iso8601="1"}}" />
-  
-  <link rel="schema.dc" href="http://purl.org/dc/elements/1.1/" />
-  <meta name="dc.title" lang="{{tpl:BlogLanguage}}" content="{{tpl:BlogName encode_html="1"}}<tpl:PaginationIf start="0"> - {{tpl:lang page}} {{tpl:PaginationCurrent}}</tpl:PaginationIf>" />
-  <meta name="dc.description" lang="{{tpl:BlogLanguage}}" content="{{tpl:BlogDescription encode_html="1"}}" />
-  <meta name="dc.language" content="{{tpl:BlogLanguage}}" />
-  <meta name="dc.publisher" content="{{tpl:BlogEditor encode_html="1"}}" />
-  <meta name="dc.rights" content="{{tpl:BlogCopyrightNotice encode_html="1"}}" />
-  <meta name="dc.date" scheme="W3CDTF" content="{{tpl:BlogUpdateDate iso8601="1"}}" />
-  <meta name="dc.type" content="text" />
-  <meta name="dc.format" content="text/html" />
-  
-  <link rel="contents" title="{{tpl:lang Archives}}" href="{{tpl:BlogArchiveURL}}" />
-  <tpl:Categories>
-  <link rel="section" href="{{tpl:CategoryURL}}" title="{{tpl:CategoryTitle encode_html="1"}}" />
-  </tpl:Categories>
-  
-  <link rel="alternate" type="application/atom+xml" title="Atom 1.0" href="{{tpl:BlogFeedURL type="atom"}}" />
-  <link rel="EditURI" type="application/rsd+xml" title="RSD" href="{{tpl:BlogRSDURL}}" />
-  <link rel="meta" type="application/xbel+xml" title="Blogroll" href="{{tpl:BlogrollXbelLink}}" />
-  
-  {{tpl:include src="_head.html"}}
-</head>
+{{tpl:extends parent="__layout.html"}}
+<tpl:Block name="head-title">
+  <title>{{tpl:lang Links shortener}}} - {{tpl:BlogName encode_html="1"}}</title>
+</tpl:Block>
+<tpl:Block name="html-head">
+  {{tpl:parent}}
+</tpl:Block>
 
-<body class="dc-kutrl">
-<div id="page">
+<tpl:Block name="body-tag">
+  <body class="dc-kutrl">
+</tpl:Block>
 
-{{tpl:include src="_top.html"}}
-
-<div id="wrapper">
-
-<div id="main">
-  <div id="content">
-  
-  <div id="p0" class="post">
-    <h2 class="post-title">{{tpl:lang Links shortener}}</h2>
-	<tpl:kutrlMsgIf has_message"1">
-	 <p><strong>{{tpl:kutrlMsg}}</strong></p>
-	</tpl:kutrlMsgIf>
- 
-	<tpl:kutrlPageIf is_active="1">
-	 <form name="dokutrl" method="post" action="{{tpl:kutrlPageURL}}">
-	 <p><label>{{tpl:lang Long link:}}<br />
-	  <input type="text" size="60" name="longurl" id="longurl" maxlength="255" value="" />
-	 </label></p>
-	 <p><label>{{tpl:kutrlHumanField}}<br />
-	  <input type="text" size="60" name="hmf" id="hmf" maxlength="255" value="" />
-	 </label></p>
-	 <p>
-	  <input class="submit" type="submit" name="submiturl" value="{{tpl:lang Create}}" />
-	  {{tpl:kutrlHumanFieldProtect}}
-	 </p>
-	 </form>
-	</tpl:kutrlPageIf>
-  </div>
-  
-  </div>
-</div> <!-- End #main -->
-
-<div id="sidebar">
-  <div id="blognav">
-    {{tpl:Widgets type="nav"}}
-  </div> <!-- End #blognav -->
-  
-  <div id="blogextra">
-    {{tpl:Widgets type="extra"}}
-  </div> <!-- End #blogextra -->
-</div>
-
-</div> <!-- End #wrapper -->
-
-{{tpl:include src="_footer.html"}}
-</div> <!-- End #page -->
-</body>
-</html>
\ No newline at end of file
+<tpl:Block name="main-content">
+  <tpl:Block name="main-content-before"></tpl:Block>
+  <tpl:Block name="content-info-header">
+    <header id="content-info">
+      <tpl:Block name="content-info-header-title">
+        <h2>{{tpl:lang Links shortener}}</h2>
+      </tpl:Block>
+      <tpl:Block name="content-info-header-content">
+        <tpl:kutrlMsgIf has_message="1">
+          <p>{{tpl:kutrlMsg}}</p>
+        </tpl:kutrlMsgIf>
+      </tpl:Block>
+    </header>
+  </tpl:Block>
+  <tpl:Block name="content-inner">
+    <tpl:Block name="content-inner-before"></tpl:Block>
+    <div class="content-inner">
+      <tpl:Block name="content-inner-content">
+        <tpl:kutrlPageIf is_active="1">
+         <form name="dokutrl" method="post" action="{{tpl:kutrlPageURL}}">
+           <p><label>{{tpl:lang Long link:}}<br />
+            <input type="text" size="60" name="longurl" id="longurl" maxlength="255" value="" />
+           </label></p>
+           <p><label>{{tpl:kutrlHumanField}}<br />
+            <input type="text" size="60" name="hmf" id="hmf" maxlength="255" value="" />
+           </label></p>
+           <p>
+            <input class="submit" type="submit" name="submiturl" value="{{tpl:lang Create}}" />
+            {{tpl:kutrlHumanFieldProtect}}
+           </p>
+         </form>
+        </tpl:kutrlPageIf>
+      </tpl:Block>
+    </div> <!-- # End #content-inner -->
+    <tpl:Block name="content-inner-after"></tpl:Block>
+  </tpl:Block>
+  <tpl:Block name="main-content-after"></tpl:Block>
+</tpl:Block>
\ No newline at end of file
diff --git a/default-templates/kutrl404.html b/default-templates/kutrl404.html
index 74adc9c..06b46d5 100644
--- a/default-templates/kutrl404.html
+++ b/default-templates/kutrl404.html
@@ -4,64 +4,44 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
   <meta name="MSSmartTagsPreventParsing" content="TRUE" />
-  <meta name="ROBOTS" content="{{tpl:BlogMetaRobots robots="NOINDEX,NOARCHIVE"}}" />
-  
-  <title>{{tpl:lang Document not found}} - {{tpl:BlogName encode_html="1"}}</title>
-  <meta name="copyright" content="{{tpl:BlogCopyrightNotice encode_html="1"}}" />
-  <meta name="author" content="{{tpl:BlogEditor encode_html="1"}}" />
-  
-  <link rel="schema.dc" href="http://purl.org/dc/elements/1.1/" />
-  <meta name="dc.title" lang="{{tpl:BlogLanguage}}" content="{{tpl:lang URL not found}} - {{tpl:BlogName encode_html="1"}}" />
-  <meta name="dc.language" content="{{tpl:BlogLanguage}}" />
-  <meta name="dc.publisher" content="{{tpl:BlogEditor encode_html="1"}}" />
-  <meta name="dc.rights" content="{{tpl:BlogCopyrightNotice encode_html="1"}}" />
-  <meta name="dc.type" content="text" />
-  <meta name="dc.format" content="text/html" />
-  
-  <link rel="top" href="{{tpl:BlogURL}}" title="{{tpl:lang Home}}" />
-  <link rel="contents" title="{{tpl:lang Archives}}" href="{{tpl:BlogArchiveURL}}" />
-  <link rel="alternate" type="application/atom+xml" title="Atom 1.0" href="{{tpl:BlogFeedURL type="atom"}}" />
-  
-  {{tpl:include src="_head.html"}}
-</head>
+  {{tpl:extends parent="__layout.html"}}
+<tpl:Block name="head-title">
+  <title>{{tpl:lang Links shortener}}} - {{tpl:BlogName encode_html="1"}}</title>
+</tpl:Block>
+<tpl:Block name="html-head">
+  {{tpl:parent}}
+</tpl:Block>
 
-<body class="dc-404 kutrl-404">
-<div id="page">
-{{tpl:include src="_top.html"}}
+<tpl:Block name="body-tag">
+  <body class="dc-kutrl">
+</tpl:Block>
 
-<div id="wrapper">
-
-<div id="main">
-  <div id="content">
-  
-  <div id="content-info">
-    <h2>{{tpl:lang URL not found}}</h2>
-  </div>
-  
-  <div class="content-inner">
-    <p>{{tpl:lang The URL you are looking for does not exist.}}</p>
-	<p><img src="{{tpl:BlogQmarkURL}}pf=kUtRL/default-templates/img/broken-link.png" alt="broken link" /></p>
-	<tpl:kutrlPageIf is_active="1">
-	<p><a href="{{tpl:kutrlPageURL}}" title="kutrl">{{tpl:lang Create your own short URL}}</a></p>
-	</tpl:kutrlPageIf>
-  </div>
-  
-  </div>
-</div>
-
-<div id="sidebar">
-  <div id="blognav">
-    {{tpl:Widgets type="nav"}}
-  </div> <!-- End #blognav -->
-  
-  <div id="blogextra">
-    {{tpl:Widgets type="extra"}}
-  </div> <!-- End #blogextra -->
-</div>
-
-</div> <!-- End #wrapper -->
-
-{{tpl:include src="_footer.html"}}
-</div> <!-- End #page -->
-</body>
-</html>
\ No newline at end of file
+<tpl:Block name="main-content">
+  <tpl:Block name="main-content-before"></tpl:Block>
+  <tpl:Block name="content-info-header">
+    <header id="content-info">
+      <tpl:Block name="content-info-header-title">
+        <h2>{{tpl:lang URL not found}}</h2>
+      </tpl:Block>
+      <tpl:Block name="content-info-header-content">
+        <tpl:kutrlMsgIf has_message="1">
+          <p>{{tpl:kutrlMsg}}</p>
+        </tpl:kutrlMsgIf>
+      </tpl:Block>
+    </header>
+  </tpl:Block>
+  <tpl:Block name="content-inner">
+    <tpl:Block name="content-inner-before"></tpl:Block>
+    <div class="content-inner">
+      <tpl:Block name="content-inner-content">
+        <p>{{tpl:lang The URL you are looking for does not exist.}}</p>
+        <p><img src="{{tpl:BlogQmarkURL}}pf=kUtRL/default-templates/img/broken-link.png" alt="broken link" /></p>
+        <tpl:kutrlPageIf is_active="1">
+          <p><a href="{{tpl:kutrlPageURL}}" title="kutrl">{{tpl:lang Create your own short URL}}</a></p>
+        </tpl:kutrlPageIf>
+      </tpl:Block>
+    </div> <!-- # End #content-inner -->
+    <tpl:Block name="content-inner-after"></tpl:Block>
+  </tpl:Block>
+  <tpl:Block name="main-content-after"></tpl:Block>
+</tpl:Block>
\ No newline at end of file
diff --git a/default-templates/kutrl404_old.html b/default-templates/kutrl404_old.html
new file mode 100644
index 0000000..74adc9c
--- /dev/null
+++ b/default-templates/kutrl404_old.html
@@ -0,0 +1,67 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{{tpl:BlogLanguage}}" lang="{{tpl:BlogLanguage}}">
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+  <meta name="MSSmartTagsPreventParsing" content="TRUE" />
+  <meta name="ROBOTS" content="{{tpl:BlogMetaRobots robots="NOINDEX,NOARCHIVE"}}" />
+  
+  <title>{{tpl:lang Document not found}} - {{tpl:BlogName encode_html="1"}}</title>
+  <meta name="copyright" content="{{tpl:BlogCopyrightNotice encode_html="1"}}" />
+  <meta name="author" content="{{tpl:BlogEditor encode_html="1"}}" />
+  
+  <link rel="schema.dc" href="http://purl.org/dc/elements/1.1/" />
+  <meta name="dc.title" lang="{{tpl:BlogLanguage}}" content="{{tpl:lang URL not found}} - {{tpl:BlogName encode_html="1"}}" />
+  <meta name="dc.language" content="{{tpl:BlogLanguage}}" />
+  <meta name="dc.publisher" content="{{tpl:BlogEditor encode_html="1"}}" />
+  <meta name="dc.rights" content="{{tpl:BlogCopyrightNotice encode_html="1"}}" />
+  <meta name="dc.type" content="text" />
+  <meta name="dc.format" content="text/html" />
+  
+  <link rel="top" href="{{tpl:BlogURL}}" title="{{tpl:lang Home}}" />
+  <link rel="contents" title="{{tpl:lang Archives}}" href="{{tpl:BlogArchiveURL}}" />
+  <link rel="alternate" type="application/atom+xml" title="Atom 1.0" href="{{tpl:BlogFeedURL type="atom"}}" />
+  
+  {{tpl:include src="_head.html"}}
+</head>
+
+<body class="dc-404 kutrl-404">
+<div id="page">
+{{tpl:include src="_top.html"}}
+
+<div id="wrapper">
+
+<div id="main">
+  <div id="content">
+  
+  <div id="content-info">
+    <h2>{{tpl:lang URL not found}}</h2>
+  </div>
+  
+  <div class="content-inner">
+    <p>{{tpl:lang The URL you are looking for does not exist.}}</p>
+	<p><img src="{{tpl:BlogQmarkURL}}pf=kUtRL/default-templates/img/broken-link.png" alt="broken link" /></p>
+	<tpl:kutrlPageIf is_active="1">
+	<p><a href="{{tpl:kutrlPageURL}}" title="kutrl">{{tpl:lang Create your own short URL}}</a></p>
+	</tpl:kutrlPageIf>
+  </div>
+  
+  </div>
+</div>
+
+<div id="sidebar">
+  <div id="blognav">
+    {{tpl:Widgets type="nav"}}
+  </div> <!-- End #blognav -->
+  
+  <div id="blogextra">
+    {{tpl:Widgets type="extra"}}
+  </div> <!-- End #blogextra -->
+</div>
+
+</div> <!-- End #wrapper -->
+
+{{tpl:include src="_footer.html"}}
+</div> <!-- End #page -->
+</body>
+</html>
\ No newline at end of file
diff --git a/default-templates/kutrl_old.html b/default-templates/kutrl_old.html
new file mode 100644
index 0000000..0827236
--- /dev/null
+++ b/default-templates/kutrl_old.html
@@ -0,0 +1,87 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{{tpl:BlogLanguage}}" lang="{{tpl:BlogLanguage}}">
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+  <meta name="MSSmartTagsPreventParsing" content="TRUE" />
+  <meta name="ROBOTS" content="{{tpl:BlogMetaRobots}}" />
+  
+  <title>{{tpl:BlogName encode_html="1"}}<tpl:PaginationIf start="0"> - {{tpl:lang page}} {{tpl:PaginationCurrent}}</tpl:PaginationIf></title>
+  <meta name="description" lang="{{tpl:BlogLanguage}}" content="{{tpl:BlogDescription cut_string="180" encode_html="1"}}" />
+  <meta name="copyright" content="{{tpl:BlogCopyrightNotice encode_html="1"}}" />
+  <meta name="author" content="{{tpl:BlogEditor encode_html="1"}}" />
+  <meta name="date" scheme="W3CDTF" content="{{tpl:BlogUpdateDate iso8601="1"}}" />
+  
+  <link rel="schema.dc" href="http://purl.org/dc/elements/1.1/" />
+  <meta name="dc.title" lang="{{tpl:BlogLanguage}}" content="{{tpl:BlogName encode_html="1"}}<tpl:PaginationIf start="0"> - {{tpl:lang page}} {{tpl:PaginationCurrent}}</tpl:PaginationIf>" />
+  <meta name="dc.description" lang="{{tpl:BlogLanguage}}" content="{{tpl:BlogDescription encode_html="1"}}" />
+  <meta name="dc.language" content="{{tpl:BlogLanguage}}" />
+  <meta name="dc.publisher" content="{{tpl:BlogEditor encode_html="1"}}" />
+  <meta name="dc.rights" content="{{tpl:BlogCopyrightNotice encode_html="1"}}" />
+  <meta name="dc.date" scheme="W3CDTF" content="{{tpl:BlogUpdateDate iso8601="1"}}" />
+  <meta name="dc.type" content="text" />
+  <meta name="dc.format" content="text/html" />
+  
+  <link rel="contents" title="{{tpl:lang Archives}}" href="{{tpl:BlogArchiveURL}}" />
+  <tpl:Categories>
+  <link rel="section" href="{{tpl:CategoryURL}}" title="{{tpl:CategoryTitle encode_html="1"}}" />
+  </tpl:Categories>
+  
+  <link rel="alternate" type="application/atom+xml" title="Atom 1.0" href="{{tpl:BlogFeedURL type="atom"}}" />
+  <link rel="EditURI" type="application/rsd+xml" title="RSD" href="{{tpl:BlogRSDURL}}" />
+  <link rel="meta" type="application/xbel+xml" title="Blogroll" href="{{tpl:BlogrollXbelLink}}" />
+  
+  {{tpl:include src="_head.html"}}
+</head>
+
+<body class="dc-kutrl">
+<div id="page">
+
+{{tpl:include src="_top.html"}}
+
+<div id="wrapper">
+
+<div id="main">
+  <div id="content">
+  
+  <div id="p0" class="post">
+    <h2 class="post-title">{{tpl:lang Links shortener}}</h2>
+	<tpl:kutrlMsgIf has_message"1">
+	 <p><strong>{{tpl:kutrlMsg}}</strong></p>
+	</tpl:kutrlMsgIf>
+ 
+	<tpl:kutrlPageIf is_active="1">
+	 <form name="dokutrl" method="post" action="{{tpl:kutrlPageURL}}">
+	 <p><label>{{tpl:lang Long link:}}<br />
+	  <input type="text" size="60" name="longurl" id="longurl" maxlength="255" value="" />
+	 </label></p>
+	 <p><label>{{tpl:kutrlHumanField}}<br />
+	  <input type="text" size="60" name="hmf" id="hmf" maxlength="255" value="" />
+	 </label></p>
+	 <p>
+	  <input class="submit" type="submit" name="submiturl" value="{{tpl:lang Create}}" />
+	  {{tpl:kutrlHumanFieldProtect}}
+	 </p>
+	 </form>
+	</tpl:kutrlPageIf>
+  </div>
+  
+  </div>
+</div> <!-- End #main -->
+
+<div id="sidebar">
+  <div id="blognav">
+    {{tpl:Widgets type="nav"}}
+  </div> <!-- End #blognav -->
+  
+  <div id="blogextra">
+    {{tpl:Widgets type="extra"}}
+  </div> <!-- End #blogextra -->
+</div>
+
+</div> <!-- End #wrapper -->
+
+{{tpl:include src="_footer.html"}}
+</div> <!-- End #page -->
+</body>
+</html>
\ No newline at end of file
