--- a/index.html	Mon Mar 28 15:49:49 2016 +0800
+++ b/index.html	Mon Mar 28 15:52:22 2016 +0800
@@ -117,17 +117,21 @@
     </script>
     <script type="text/template" id="avatar-template">
       <img class="avatar" rv-if="model:d/avatar" rv-src="model:d/avatar">
-      <div class="avatar" rv-unless="model:d/avatar" rv-text="model:d/handle | first-letter" rv-style="model:bjid | dumb-hash | fn view.getColors"></div>
+      <div class="avatar" rv-unless="model:d/avatar" rv-style="model:bjid | dumb-hash | fn view.getColors">
+        { model:d/handle | first-letter }
+      </div>
     </script>
     <script type="text/template" id="message-template">
       <div class="splitter" rv-if="model:d/split"></div>
       <div class="column avatar-column" rv-class-uk-invisible="model:d/fold"></div>
       <div class="column uk-width-1-1">
         <div style="padding-top: 4px;" rv-hide="model:d/fold">
-          <strong rv-text="view.getHandle < model:contact:d/handle model:from"></strong>
-          <time class="stamp uk-text-muted" rv-datetime="model:d/mstamp | iso-date" rv-title="model:d/mstamp | format-date 'HH:mm:ss'" rv-text="model:d/mstamp | from-now"></time>
+          <strong>{ view.getHandle < model:contact:d/handle model:from }</strong>
+          <time class="stamp uk-text-muted" rv-datetime="model:d/mstamp | iso-date" rv-title="model:d/mstamp | format-date 'HH:mm:ss'">
+            { model:d/mstamp | from-now }
+          </time>
         </div>
-        <div rv-data-id="model:id" rv-class="model:cls" rv-text="model:text"></div>
+        <div rv-data-id="model:id" rv-class="model:cls">{ model:text }</div>
       </div>
     </script>
     <script type="text/template" id="contact-template">
@@ -135,10 +139,10 @@
         <div class="status-pip" rv-title="model:show" rv-style="model:show | fn view.getPipColor"></div>
       </div>
       <div class="column uk-width-1-1">
-        <div class="uk-text-bold" rv-text="model:d/handle"></div>
+        <div class="uk-text-bold">{ model:d/handle }</div>
         <div class="uk-text-nowrap">
-          <span rv-text="model:status"></span>
-          <span rv-hide="model:type | eq 'self'" rv-text="model:chatstate | only 'composing'"></span>
+          <span>{ model:status }</span>
+          <span rv-hide="model:type | eq 'self'">{ model:chatstate | only 'composing' }</span>
         </div>
       </div>
       <div class="column uk-text-nowrap">