diff --git a/package/gluon-web-admin/files/lib/gluon/web/view/admin/info.html b/package/gluon-web-admin/files/lib/gluon/web/view/admin/info.html
index 6f593378..889b0ca3 100644
--- a/package/gluon-web-admin/files/lib/gluon/web/view/admin/info.html
+++ b/package/gluon-web-admin/files/lib/gluon/web/view/admin/info.html
@@ -34,6 +34,6 @@
 <h2><%:Information%></h2>
 <% for _, v in ipairs(values) do %>
 <div class="gluon-value">
-	<div class="gluon-value-title"><%=v[1]%></div><div class="gluon-value-field-text"><%=pcdata(v[2] or 'n/a')%></div>
+	<div class="gluon-value-title"><%|v[1]%></div><div class="gluon-value-field-text"><%|v[2] or 'n/a'%></div>
 </div>
 <% end %>
diff --git a/package/gluon-web-admin/files/lib/gluon/web/view/admin/upgrade.html b/package/gluon-web-admin/files/lib/gluon/web/view/admin/upgrade.html
index ecafa33f..456b9e5c 100644
--- a/package/gluon-web-admin/files/lib/gluon/web/view/admin/upgrade.html
+++ b/package/gluon-web-admin/files/lib/gluon/web/view/admin/upgrade.html
@@ -13,7 +13,7 @@ $Id$
 -%>
 <h2><%:Upgrade firmware%></h2>
 
-<form method="post" enctype="multipart/form-data" action="<%=url(request)%>">
+<form method="post" enctype="multipart/form-data" action="<%|url(request)%>">
 	<p>
 		<%:You can manually upgrade your firmware here.%>
 	</p>
diff --git a/package/gluon-web-admin/files/lib/gluon/web/view/admin/upgrade_confirm.html b/package/gluon-web-admin/files/lib/gluon/web/view/admin/upgrade_confirm.html
index 6659d363..80ef7ac7 100644
--- a/package/gluon-web-admin/files/lib/gluon/web/view/admin/upgrade_confirm.html
+++ b/package/gluon-web-admin/files/lib/gluon/web/view/admin/upgrade_confirm.html
@@ -46,13 +46,13 @@ You may obtain a copy of the License at
   </ul>
 </p>
 <div class="gluon-page-actions">
-  <form method="post" enctype="multipart/form-data" action="<%=url(request)%>" style="display:inline">
+  <form method="post" enctype="multipart/form-data" action="<%|url(request)%>" style="display:inline">
     <input type="hidden" name="step" value="3" />
     <input type="hidden" name="keepcfg" value="<%=keepconfig and "1" or "0"%>" />
     <input type="hidden" name="token" value="<%=token%>" />
     <input class="gluon-button gluon-button-submit" type="submit" value="<%:Continue%>" />
   </form>
-  <form method="post" enctype="multipart/form-data" action="<%=url(request)%>" style="display:inline">
+  <form method="post" enctype="multipart/form-data" action="<%|url(request)%>" style="display:inline">
     <input type="hidden" name="step" value="1" />
     <input type="hidden" name="keepcfg" value="<%=keepconfig and "1" or "0"%>" />
     <input type="hidden" name="token" value="<%=token%>" />
diff --git a/package/gluon-web-mesh-vpn-fastd/files/lib/gluon/web/view/model/mesh-vpn-fastd.html b/package/gluon-web-mesh-vpn-fastd/files/lib/gluon/web/view/model/mesh-vpn-fastd.html
index 50eff069..ed527c8e 100644
--- a/package/gluon-web-mesh-vpn-fastd/files/lib/gluon/web/view/model/mesh-vpn-fastd.html
+++ b/package/gluon-web-mesh-vpn-fastd/files/lib/gluon/web/view/model/mesh-vpn-fastd.html
@@ -6,7 +6,7 @@
   <div class="gluon-value-field-long">
     <label<%= attr("for", id..'.1') %> class="gluon-value-title"><%:Security mode%></label>
     <br />
-    <%= translate(
+    <%| translate(
         'In security mode, the mesh VPN uses an encrypted tunnel to connect to the VPN servers. ' ..
         'The encryption ensures that it is impossible for your internet access provider to see what ' ..
         'data is exchanged over your node.'
@@ -24,7 +24,7 @@
   <div class="gluon-value-field-long">
     <label<%= attr("for", id..'.2') %> class="gluon-value-title"><%:Performance mode%></label>
     <br />
-    <%= translate(
+    <%| translate(
         'In performance mode, no encryption is used. This usually allows for higher throughput, but the data exchanged over your node is not ' ..
         'protected against eavesdropping.'
     ) %>
diff --git a/package/gluon-web-theme/files/lib/gluon/web/view/themes/gluon/layout.html b/package/gluon-web-theme/files/lib/gluon/web/view/themes/gluon/layout.html
index c1915f48..b7f60d09 100644
--- a/package/gluon-web-theme/files/lib/gluon/web/view/themes/gluon/layout.html
+++ b/package/gluon-web-theme/files/lib/gluon/web/view/themes/gluon/layout.html
@@ -52,7 +52,7 @@ You may obtain a copy of the License at
 					local active = (v == name)
 			%>
 			<li class="tabmenu-item-<%=v%><% if active then %> active<% end %>">
-				<a href="<%=url(append(prefix, v))%>"><%=pcdata(title(child))%></a>
+				<a href="<%|url(append(prefix, v))%>"><%|title(child)%></a>
 			</li>
 			<%
 				end
@@ -74,17 +74,17 @@ You may obtain a copy of the License at
 <html xmlns="http://www.w3.org/1999/xhtml" lang="" xml:lang="">
 	<head>
 		<meta charset="UTF-8" />
-		<link rel="stylesheet" type="text/css" media="screen" href="<%=media%>/cascade.css" />
-		<title><%=pcdata( hostname .. ((rnode and rnode.title) and ' - ' .. title(rnode) or '')) %></title>
+		<link rel="stylesheet" type="text/css" media="screen" href="<%|media%>/cascade.css" />
+		<title><%| hostname .. ((rnode and rnode.title) and ' - ' .. title(rnode) or '') %></title>
 	</head>
 	<body>
 
 	<div id="menubar">
 		<div class="hostinfo">
-			<a href="<%=url({})%>">
-				<%=pcdata(hostname)%>
+			<a href="<%|url({})%>">
+				<%|hostname%>
 				<% if release then %>
-				/ <%=pcdata(release)%>
+				/ <%|release%>
 				<% end %>
 			</a>
 		</div>
@@ -92,7 +92,7 @@ You may obtain a copy of the License at
 		<% if #categories > 1 and not hidenav then %>
 			<ul id="topmenu">
 				<% for i, r in ipairs(categories) do %>
-					<li><a class="topcat<% if request[1] == r then %> active<%end%>" href="<%=url({r})%>"><%=pcdata(title(root.nodes[r]))%></a></li>
+					<li><a class="topcat<% if request[1] == r then %> active<%end%>" href="<%|url({r})%>"><%|title(root.nodes[r])%></a></li>
 				<% end %>
 			</ul>
 		<% end %>
diff --git a/package/gluon-web/files/lib/gluon/web/view/error404.html b/package/gluon-web/files/lib/gluon/web/view/error404.html
index d1dce589..b2db7d0f 100644
--- a/package/gluon-web/files/lib/gluon/web/view/error404.html
+++ b/package/gluon-web/files/lib/gluon/web/view/error404.html
@@ -6,4 +6,4 @@
 
 <h2 name="content">404 <%:Not Found%></h2>
 <p><%:Sorry, the object you requested was not found.%></p>
-<tt><%=pcdata(message)%></tt>
+<tt><%|message%></tt>
diff --git a/package/gluon-web/files/lib/gluon/web/view/error500.html b/package/gluon-web/files/lib/gluon/web/view/error500.html
index 6c186286..8f1532be 100644
--- a/package/gluon-web/files/lib/gluon/web/view/error500.html
+++ b/package/gluon-web/files/lib/gluon/web/view/error500.html
@@ -6,4 +6,4 @@
 
 <h2 name="content">500 <%:Internal Server Error%></h2>
 <p><%:Sorry, the server encountered an unexpected error.%></p>
-<pre class="error500"><%=pcdata(message)%></pre>
+<pre class="error500"><%|message%></pre>
diff --git a/package/gluon-web/files/lib/gluon/web/view/model/dynlist.html b/package/gluon-web/files/lib/gluon/web/view/model/dynlist.html
index 56edefe1..512a194b 100644
--- a/package/gluon-web/files/lib/gluon/web/view/model/dynlist.html
+++ b/package/gluon-web/files/lib/gluon/web/view/model/dynlist.html
@@ -10,7 +10,7 @@
 <%
 	for i, val in ipairs(self:cfgvalue()) do
 %>
-	<input class="gluon-input-text" value="<%=pcdata(val)%>" data-update="change" type="text"<%=
+	<input class="gluon-input-text" value="<%|val%>" data-update="change" type="text"<%=
 		attr("id", id .. "." .. i) ..
 		attr("name", id) ..
 		attr("size", self.size) ..
diff --git a/package/gluon-web/files/lib/gluon/web/view/model/form.html b/package/gluon-web/files/lib/gluon/web/view/model/form.html
index 6fcb0d48..1b642b0d 100644
--- a/package/gluon-web/files/lib/gluon/web/view/model/form.html
+++ b/package/gluon-web/files/lib/gluon/web/view/model/form.html
@@ -1,27 +1,27 @@
-<form method="post" enctype="multipart/form-data" action="<%=url(request)%>">
+<form method="post" enctype="multipart/form-data" action="<%|url(request)%>">
 	<input type="hidden" name="token" value="<%=token%>" />
 	<input type="hidden" name="<%=id%>" value="1" />
 
 	<div class="gluon-map" id="gluon-<%=self.config%>">
-		<% if self.title and #self.title > 0 then %><h2 name="content"><%=self.title%></h2><% end %>
+		<% if self.title and #self.title > 0 then %><h2 name="content"><%|self.title%></h2><% end %>
 		<% if self.description and #self.description > 0 then %><div class="gluon-map-descr"><%=self.description%></div><% end %>
 		<% self:render_children(renderer) %>
 	</div>
 <%- if self.message then %>
-	<div><%=self.message%></div>
+	<div><%|self.message%></div>
 <%- end %>
 <%- if self.errmessage then %>
-	<div class="error"><%=self.errmessage%></div>
+	<div class="error"><%|self.errmessage%></div>
 <%- end %>
 	<div class="gluon-page-actions">
 	<%- if self.submit ~= false then %>
 		<input class="gluon-button gluon-button-submit" type="submit" value="
-			<%- if not self.submit then -%><%-:Save-%><%-else-%><%=pcdata(self.submit)%><%end-%>
+			<%- if not self.submit then -%><%-:Save-%><%-else-%><%|self.submit%><%end-%>
 		" />
 	<% end %>
 	<%- if self.reset ~= false then %>
 		<input class="gluon-button gluon-button-reset" type="reset" value="
-			<%- if not self.reset then -%><%-:Reset-%><%-else-%><%=pcdata(self.reset)%><%end-%>
+			<%- if not self.reset then -%><%-:Reset-%><%-else-%><%|self.reset%><%end-%>
 		" />
 	<% end %>
 	</div>
diff --git a/package/gluon-web/files/lib/gluon/web/view/model/lvalue.html b/package/gluon-web/files/lib/gluon/web/view/model/lvalue.html
index 85ce596a..47a2ffd1 100644
--- a/package/gluon-web/files/lib/gluon/web/view/model/lvalue.html
+++ b/package/gluon-web/files/lib/gluon/web/view/model/lvalue.html
@@ -18,7 +18,7 @@
 				attr("data-index", i) ..
 				attr("data-depends", self:deplist(entry.deps)) ..
 				attr("selected", (self:cfgvalue() == entry.key) and "selected")
-			%>><%=pcdata(entry.value)%></option>
+			%>><%|entry.value%></option>
 		<%- end %>
 	</select>
 <% elseif self.widget == "radio" then %>
@@ -35,7 +35,7 @@
 					attr("checked", (self:cfgvalue() == entry.key) and "checked")
 				%> />
 				<label<%= attr("for", id.."."..entry.key)%>></label>
-				<%=pcdata(entry.value)%>
+				<%|entry.value%>
 			</label>
 			<% if i ~= #entries then write(br) end %>
 		<% end %>
diff --git a/package/gluon-web/files/lib/gluon/web/view/model/section.html b/package/gluon-web/files/lib/gluon/web/view/model/section.html
index 45ee0272..de4d7a5c 100644
--- a/package/gluon-web/files/lib/gluon/web/view/model/section.html
+++ b/package/gluon-web/files/lib/gluon/web/view/model/section.html
@@ -1,6 +1,6 @@
 <fieldset class="gluon-section">
 	<% if self.title and #self.title > 0 then -%>
-		<legend><%=self.title%></legend>
+		<legend><%|self.title%></legend>
 	<%- end %>
 	<% if self.description and #self.description > 0 then -%>
 		<div class="gluon-section-descr"><%=self.description%></div>
@@ -18,7 +18,7 @@
 						<%- elseif e == "missing" then -%>
 							<%:One or more required fields have no value!%>
 						<%- else -%>
-							<%=pcdata(e)%>
+							<%|e%>
 						<%- end -%>
 					</li>
 				<%- end %></ul>
diff --git a/package/gluon-web/files/lib/gluon/web/view/model/tvalue.html b/package/gluon-web/files/lib/gluon/web/view/model/tvalue.html
index bac1d829..cfc5e4b0 100644
--- a/package/gluon-web/files/lib/gluon/web/view/model/tvalue.html
+++ b/package/gluon-web/files/lib/gluon/web/view/model/tvalue.html
@@ -1,3 +1,3 @@
 <textarea class="gluon-input-textarea" <% if not self.size then %> style="width: 100%"<% else %> cols="<%=self.size%>"<% end %> data-update="change"<%= attr("name", id) .. attr("id", id) .. attr("rows", self.rows) .. attr("wrap", self.wrap) %>>
-<%-=pcdata(self:cfgvalue())-%>
+<%-|self:cfgvalue()-%>
 </textarea>
diff --git a/package/gluon-web/files/lib/gluon/web/view/model/valuewrapper.html b/package/gluon-web/files/lib/gluon/web/view/model/valuewrapper.html
index 35926cae..1a1a63d1 100644
--- a/package/gluon-web/files/lib/gluon/web/view/model/valuewrapper.html
+++ b/package/gluon-web/files/lib/gluon/web/view/model/valuewrapper.html
@@ -1,7 +1,7 @@
 <div class="gluon-value<% if self.error then %> gluon-value-error<% end %>" id="value-<%=id%>" data-index="<%=self.index%>"<%= attr("data-depends", self:deplist()) %>>
 	<%- if self.title and #self.title > 0 then -%>
 		<label class="gluon-value-title"<%= attr("for", id) %>>
-			<%-=self.title-%>
+			<%-|self.title-%>
 		</label>
 		<div class="gluon-value-field">
 	<%- end -%>
diff --git a/package/gluon-web/files/lib/gluon/web/view/model/wrapper.html b/package/gluon-web/files/lib/gluon/web/view/model/wrapper.html
index 5b45aa7d..2d0cfdd5 100644
--- a/package/gluon-web/files/lib/gluon/web/view/model/wrapper.html
+++ b/package/gluon-web/files/lib/gluon/web/view/model/wrapper.html
@@ -3,4 +3,4 @@
 		map:render(renderer)
 	end
 %>
-<script type="text/javascript" src="<%=resource%>/gluon-web.js"></script>
+<script type="text/javascript" src="<%|resource%>/gluon-web.js"></script>