diff --git a/material/daily.html b/material/daily.html
index 5d87272..1eaadcc 100644
--- a/material/daily.html
+++ b/material/daily.html
@@ -37,12 +37,12 @@
                         {if="$link.tags"}
                             <div class="dailyEntryTags">
                                 {loop="link.taglist"}
-                                    {$value|htmlspecialchars} -
+                                    {$value} -
                                 {/loop}
                             </div>
                         {/if}
                         <div class="dailyEntryTitle">
-                            <a href="{$link.url}">{$link.title|htmlspecialchars}</a>
+                            <a href="{$link.url}">{$link.title}</a>
                         </div>
                         {if="$link.thumbnail"}
                             <div class="dailyEntryThumbnail">{$link.thumbnail}</div>
diff --git a/material/dailyrss.html b/material/dailyrss.html
index 6abb549..4ec5891 100644
--- a/material/dailyrss.html
+++ b/material/dailyrss.html
@@ -1,8 +1,8 @@
 {$dateFormat=isset($GLOBALS['config']['MATERIAL_PHP_DATE_PATTERN'])?$GLOBALS['config']['MATERIAL_PHP_DATE_PATTERN']:'%c'}
 {loop="links"}
-	<h3><a href="{$value.url}">{$value.title|htmlspecialchars}</a></h3>
-	<small>{if="!$GLOBALS['config']['HIDE_TIMESTAMPS']"}{function="strftime($dateFormat, $value.timestamp)"} - {/if}{if="$value.tags"}{$value.tags|htmlspecialchars}{/if}<br>
-	{$value.url|htmlspecialchars}</small><br>
+	<h3><a href="{$value.url}">{$value.title}</a></h3>
+	<small>{if="!$GLOBALS['config']['HIDE_TIMESTAMPS']"}{function="strftime($dateFormat, $value.timestamp)"} - {/if}{if="$value.tags"}{$value.tags}{/if}<br>
+	{$value.url}</small><br>
 	{if="$value.thumbnail"}{$value.thumbnail}{/if}<br>
 	{if="$value.description"}{$value.formatedDescription}{/if}
 	<br><br><hr>
diff --git a/material/editlink.html b/material/editlink.html
index 75d303c..d3abf18 100644
--- a/material/editlink.html
+++ b/material/editlink.html
@@ -17,25 +17,25 @@
             <form method="POST" name="linkform" class="card">
                 <input type="hidden" name="lf_linkdate" value="{$link.linkdate}">
                 <input type="hidden" name="token" value="{$token}">
-                {if="$http_referer"}<input type="hidden" name="returnurl" value="{$http_referer|htmlspecialchars}">{/if}
+                {if="$http_referer"}<input type="hidden" name="returnurl" value="{$http_referer}">{/if}
 
                 <div class="card-title">{if="!$link_is_new"}Edit a link{else}Add a new link{/if}</div>
                 <div class="card-body">
                     <div class="form-entry">
                         <label for="lf_url">URL</label><br/>
-                        <input type="text" name="lf_url" id="lf_url" value="{$link.url|htmlspecialchars}" placeholder="Type a url...">
+                        <input type="text" name="lf_url" id="lf_url" value="{$link.url}" placeholder="Type a url...">
                     </div>
                     <div class="form-entry">
                         <label for="lf_title">Title</label><br/>
-                        <input type="text" name="lf_title" id="lf_title" value="{$link.title|htmlspecialchars}" placeholder="Title...">
+                        <input type="text" name="lf_title" id="lf_title" value="{$link.title}" placeholder="Title...">
                     </div>
                     <div class="form-entry">
                         <label for="lf_description">Description</label><br/>
-                        <textarea name="lf_description" id="lf_description" placeholder="Describe the link..." rows="4">{$link.description|htmlspecialchars}</textarea>
+                        <textarea name="lf_description" id="lf_description" placeholder="Describe the link..." rows="4">{$link.description}</textarea>
                     </div>
                     <div class="form-entry">
                         <label for="lf_tags">Tags</label><br/>
-                        <input type="text" id="lf_tags" name="lf_tags" id="lf_tags" value="{$link.tags|htmlspecialchars}" class="lf_input"
+                        <input type="text" id="lf_tags" name="lf_tags" id="lf_tags" value="{$link.tags}" class="lf_input"
                             data-list="{loop="$tags"}{$key}, {/loop}" data-multiple autocomplete="off" />
                     </div>
                     <div class="form-entry">
diff --git a/material/import.html b/material/import.html
index f2a4da0..3aed393 100644
--- a/material/import.html
+++ b/material/import.html
@@ -8,14 +8,14 @@
 		<div class="col-md-6 col-md-offset-3">
 			<form method="POST" action="?do=upload" enctype="multipart/form-data" name="uploadform" id="uploadform" class="card">
 				<input type="hidden" name="token" value="{$token}">
-				<input type="hidden" name="MAX_FILE_SIZE" value="{$maxfilesize|htmlspecialchars}">
+				<input type="hidden" name="MAX_FILE_SIZE" value="{$maxfilesize}">
 				<div class="card-title">Import links</div>
 				<div class="card-body">
 					<p>Import Netscape HTML bookmarks (as exported from Firefox/Chrome/Opera/Delicious/Diigo...).</p>
 					<div class="form-entry">
 						<label for="filetoupload">File to upload</label>
 						<input type="file" id="filetoupload" name="filetoupload"/>
-						<div class="sublabel">(Max: {$maxfilesize|htmlspecialchars} bytes)</div>
+						<div class="sublabel">(Max: {$maxfilesize} bytes)</div>
 					</div>
 					<div class="form-entry">
 						<label for="private"><input type="checkbox" name="private" id="private">Import all links as private</label>
diff --git a/material/includes.html b/material/includes.html
index 27ae683..3a6616f 100644
--- a/material/includes.html
+++ b/material/includes.html
@@ -77,6 +77,13 @@
     div.awesomplete > ul > li[aria-selected=true]{
         background-color: {$GLOBALS['config']['MATERIAL_COLOR']};
     }
+    div.awesomplete > ul > li[aria-selected=true]:hover{
+        {if="isset($GLOBALS['config']['MATERIAL_COLOR_FOCUS'])"}
+        background-color: {$GLOBALS['config']['MATERIAL_COLOR_FOCUS']};
+        {else}
+        background-color: {$GLOBALS['config']['MATERIAL_COLOR']};
+        {/if}
+    }
 </style>
 {/if}
 {if="is_file('src/user.css')"}<link type="text/css" rel="stylesheet" href="src/user.css" />{/if}
diff --git a/material/linklist.html b/material/linklist.html
index 2906d30..602dd80 100644
--- a/material/linklist.html
+++ b/material/linklist.html
@@ -12,7 +12,7 @@
         <div class="text-center">
             <img src="images/sad_star.png" alt="Nothing found" />
         </div>
-        <div class="nothing-found">Sorry... We found nothing{if="$search_type=='fulltext'"} for <strong>{$search_crits}</strong>{elseif="$search_type=='tags'"} for<strong>{loop="search_crits"} {$value|htmlspecialchars}{/loop}</strong>{else}{/if}.</div>
+        <div class="nothing-found">Sorry... We found nothing{if="$search_type=='fulltext'"} for <strong>{$search_crits}</strong>{elseif="$search_type=='tags'"} for<strong>{loop="search_crits"} {$value}{/loop}</strong>{else}{/if}.</div>
     {else}
         {if="$search_type=='fulltext'"}
             <div id="searchcriteria">{$result_count} results for <strong>{$search_crits}</strong></div>
@@ -21,7 +21,7 @@
             <div id="searchcriteria">{$result_count} results for tags <i>
             {loop="search_crits"}
                 <span class="link-tag-filter" title="Remove tag">
-                    <a href="?removetag={$value|htmlspecialchars}">{$value|htmlspecialchars}&nbsp;
+                    <a href="?removetag={$value}">{$value}&nbsp;
                         <span class="remove">&#x2715;</span>
                     </a>
                 </span>
@@ -36,7 +36,7 @@
                     <div class="link-header">
                         <div class="row">
                             <div class="col-sm-8">
-                                <a class="link-title" href="{$redirector}{$value.url|htmlspecialchars}">{$value.title|htmlspecialchars}</a>
+                                <a class="link-title" href="{$redirector}{$value.url}">{$value.title}</a>
                             </div>
                             <div class="col-sm-4">
                                 <div class="link-date">
@@ -46,7 +46,7 @@
                                         <span title="Short link here"><a href="?{$value.linkdate|smallHash}">Permalink</a></span>
                                     {/if}
                                     {if="$GLOBALS['config']['ARCHIVE_ORG']"}
-                                    <span class="link-archive"><span> - </span><a href="https://web.archive.org/web/{$value.url|htmlspecialchars}">archive</a></span>
+                                    <span class="link-archive"><span> - </span><a href="https://web.archive.org/web/{$value.url}">archive</a></span>
                                     {/if}
                                 </div>
                             </div>
@@ -68,7 +68,7 @@
                                 {if="$value.tags"}
                                     <div class="link-tag-list">
                                     {loop="value.taglist"}
-                                        <span class="link-tag" title="Add tag"><a href="?addtag={$value|urlencode}">{$value|htmlspecialchars}</a></span> 
+                                        <span class="link-tag" title="Add tag"><a href="?addtag={$value|urlencode}">{$value}</a></span> 
                                     {/loop}
                                     </div>
                                 {/if}
@@ -78,7 +78,7 @@
                             {else}
                             <div class="col-sm-5 link-url-container">
                             {/if}
-                                <a href="{$value.url|htmlspecialchars}" class="link-url"><span title="Short link">{$value.url|htmlspecialchars}</span></a>
+                                <a href="{$value.url}" class="link-url"><span title="Short link">{$value.url}</span></a>
                             </div>
                             {if="isLoggedIn()"}
                             <div class="col-sm-2 link-actions">
diff --git a/material/loginform.html b/material/loginform.html
index fd67187..a0f0a4a 100644
--- a/material/loginform.html
+++ b/material/loginform.html
@@ -31,7 +31,7 @@
                     <div class="card-footer">
                         <input type="submit" value="Login" class="button-raised button-primary pull-right" tabindex="4">
                         <input type="hidden" name="token" value="{$token}">
-                        {if="$returnurl"}<input type="hidden" name="returnurl" value="{$returnurl|htmlspecialchars}">{/if}
+                        {if="$returnurl"}<input type="hidden" name="returnurl" value="{$returnurl}">{/if}
                         <div class="clearfix"></div>
                     </div>
                 </form>
diff --git a/material/page.footer.html b/material/page.footer.html
index bc87b81..d6dc85e 100644
--- a/material/page.footer.html
+++ b/material/page.footer.html
@@ -3,6 +3,6 @@
         <b><a href="https://github.com/shaarli/Shaarli">Shaarli</a></b> - The personal, minimalist, super-fast, no-database delicious clone by the <a href="https://github.com/shaarli/Shaarli">Shaarli</a> community - <a href="doc/index.html">Help</a> - Theme by <a href="https://github.com/kalvn">kalvn</a>
     </div>
     {if="$newversion"}
-        <div id="newversion"><span id="version_id">&#x25CF;</span> Shaarli {$newversion|htmlspecialchars} is <a href="https://github.com/shaarli/Shaarli/releases">available</a>.</div>
+        <div id="newversion"><span id="version_id">&#x25CF;</span> Shaarli {$newversion} is <a href="https://github.com/shaarli/Shaarli/releases">available</a>.</div>
     {/if}
 </div>
\ No newline at end of file
diff --git a/material/page.header.html b/material/page.header.html
index 120c381..9d5e9da 100644
--- a/material/page.header.html
+++ b/material/page.header.html
@@ -4,7 +4,7 @@
     <div class="header-main container-fluid">
         <div class="row">
             <div class="col-lg-2">
-                <a href="?" class="header-brand">{$shaarlititle|htmlspecialchars}</a>
+                <a href="?" class="header-brand">{$shaarlititle}</a>
                 <a href="#" class="icon-rss icon-unfold pull-right hidden-lg" title="Show/hide menu"></a>
             </div>
             <form method="GET" method="searchform" class="col-lg-8 header-middle">
@@ -25,7 +25,7 @@
                     
                     
                     <div class="col-sm-3">
-                        <input type="search" id="searchform_value" name="searchterm" value="{if="isset($search_type)"}{if="$search_type=='fulltext'"}{$search_crits}{elseif="$search_type=='tags'"}{loop="search_crits"}{$value|htmlspecialchars} {/loop}{else}{/if}{/if}" placeholder="Search something here..." />
+                        <input type="search" id="searchform_value" name="searchterm" value="{if="isset($search_type)"}{if="$search_type=='fulltext'"}{$search_crits}{elseif="$search_type=='tags'"}{loop="search_crits"}{$value} {/loop}{else}{/if}{/if}" placeholder="Search something here..." />
                     </div>
                     <div class="col-sm-4">
                         <div class="row">
diff --git a/material/picwall.html b/material/picwall.html
index 2037f36..461fa59 100644
--- a/material/picwall.html
+++ b/material/picwall.html
@@ -8,7 +8,7 @@
 <div id="picwall_container text-center">
     {loop="linksToDisplay"}
     <div class="picwall-pictureframe">
-	    {$value.thumbnail}<a class="picwall-link" href="{$value.url}"><span class="info">{$value.title|htmlspecialchars}</span></a>
+	    {$value.thumbnail}<a class="picwall-link" href="{$value.url}"><span class="info">{$value.title}</span></a>
     </div>
     {/loop}
 </div>
diff --git a/material/tagcloud.html b/material/tagcloud.html
index a9c4c88..4b5e80f 100644
--- a/material/tagcloud.html
+++ b/material/tagcloud.html
@@ -6,7 +6,7 @@
 <div class="center container">
     <div id="cloudtag">
         {loop="tags"}
-        <span class="count">{$value.count}</span><a href="?searchtags={$key|urlencode}" style="font-size:{$value.size}pt;">{$key|htmlspecialchars}</a>
+        <span class="count">{$value.count}</span><a href="?searchtags={$key|urlencode}" style="font-size:{$value.size}pt;">{$key}</a>
         {/loop}
     </div>
 </div>