diff --git a/rionite/app.js b/rionite/app.js
index 0fdf7566..05be9904 100644
--- a/rionite/app.js
+++ b/rionite/app.js
@@ -2,25 +2,27 @@ var databases = new cellx.Cell();
 
 Rionite.Component.extend('db-table', {
   Static: {
-    template: '<table class="table table-striped latest-data"><tbody>\
-      <template is="rt-repeat" for="db of databases" track-by="dbname">\
-        <tr>\
-          <td class="dbname">{db.dbname}</td>\
-          <td class="query-count">\
-            <span class="{db.lastSample.countClassName}">{db.lastSample.nbQueries}</span>\
-          </td>\
-          <template is="rt-repeat" for="q of db.lastSample.topFiveQueries" track-by="$index">\
-            <td class="{q.elapsedClassName}">\
-              {q.formatElapsed}\
-              <div class="popover left">\
-                <div class="popover-content">{q.query}</div>\
-                <div class="arrow"></div>\
-              </div>\
-            </td>\
-          </template>\
-        </tr>\
-      </template>\
-    </tbody></table>'
+    template: `
+      table (class=table table-striped latest-data) { tbody {
+        @repeat (for=db of databases, track-by=dbname) {
+          tr {
+            td (class=dbname) { '{db.dbname}' }
+            td (class=query-count) {
+              span (class={db.lastSample.countClassName}) { '{db.lastSample.nbQueries}' }
+            }
+            @repeat (for=q of db.lastSample.topFiveQueries, track-by=$index) {
+              td (class={q.elapsedClassName}) {
+                '{q.formatElapsed}'
+                div (class=popover left) {
+                  div (class=popover-content) { '{q.query}' }
+                  div (class=arrow)
+                }
+              }
+            }
+          }
+        }
+      } }
+    `
   },
 
   initialize: function() {
diff --git a/rionite/index.html b/rionite/index.html
index 82cc5e56..116d599d 100644
--- a/rionite/index.html
+++ b/rionite/index.html
@@ -10,8 +10,8 @@
   <script src="../ENV.js"></script>
   <script src="../lib/memory-stats.js"></script>
   <script src="../lib/monitor.js"></script>
-  <script src="https://npmcdn.com/cellx@1.6.28/dist/cellx.min.js"></script>
-  <script src="https://npmcdn.com/rionite@0.11.29/dist/Rionite-with-polyfills.min.js"></script>
+  <script src="https://unpkg.com/cellx@1.7.7/dist/cellx.min.js"></script>
+  <script src="https://unpkg.com/rionite@0.24.1/dist/rionite.polyfills.min.js"></script>
   <script src="./app.js"></script>
   <script src="../ga.js"></script>
 </body>