--- a/client/js/list-bin.js	Fri Apr 24 11:12:23 2015 +0200
+++ b/client/js/list-bin.js	Fri Apr 24 11:13:16 2015 +0200
@@ -2,14 +2,7 @@
 
 Rkns.ResourceList.Bin = Rkns.Utils.inherit(Rkns._BaseBin);
 
-Rkns.ResourceList.Bin.prototype.resultTemplate = Rkns._.template(
-    '<li class="Rk-Bin-Item Rk-ResourceList-Item" draggable="true" data-uri="<%-url%>" ' +
-    'data-title="<%-title%>" data-description="<%-description%>" ' +
-    '<% if (image) { %>data-image="<%- Rkns.Utils.getFullURL(image) %>"<% } else { %>data-image=""<% } %> >' +
-    '<% if (image) { %><img class="Rk-ResourceList-Image" src="<%-image%>"/><% } %><h4 class="Rk-ResourceList-Title">' +
-    '<% if (url) { %><a href="<%-url%>" target="_blank"><% } %><%=htitle%><% if (url) { %></a><% } %></h4>' +
-    '<% if (description) { %><p class="Rk-ResourceList-Description"><%=hdescription%></p><% } %><% if (image) { %><div style="clear: both;"></div><% } %></li>'
-);
+Rkns.ResourceList.Bin.prototype.resultTemplate = renkanJST['templates/list-bin.html'];
 
 Rkns.ResourceList.Bin.prototype._init = function(_renkan, _opts) {
     this.renkan = _renkan;

--- a/client/js/main.js	Fri Apr 24 11:12:23 2015 +0200
+++ b/client/js/main.js	Fri Apr 24 11:13:16 2015 +0200
@@ -98,6 +98,7 @@
     Rkns.__renkans.push(this);
 
     this.options = _.defaults(_opts, Rkns.defaults, {templates: renkanJST});
+    this.template = renkanJST['templates/main.html'];
 
     _(this.options.property_files).each(function(f) {
         Rkns.$.getJSON(f, function(data) {
@@ -287,17 +288,6 @@
 
 };
 
-Renkan.prototype.template = _.template(
-    '<% if (options.show_bins) { %><div class="Rk-Bins"><div class="Rk-Bins-Head"><h2 class="Rk-Bins-Title"><%- translate("Select contents:")%></h2>' +
-    '<form class="Rk-Web-Search-Form Rk-Search-Form"><input class="Rk-Web-Search-Input Rk-Search-Input" type="search" placeholder="<%- translate("Search the Web") %>" />' +
-    '<div class="Rk-Search-Select"><div class="Rk-Search-Current"></div><ul class="Rk-Search-List"></ul></div>' +
-    '<input type="submit" value="" class="Rk-Web-Search-Submit Rk-Search-Submit" title="<%- translate("Search the Web") %>" /></form>' +
-    '<form class="Rk-Bins-Search-Form Rk-Search-Form"><input class="Rk-Bins-Search-Input Rk-Search-Input" type="search" placeholder="<%- translate("Search in Bins") %>" />' +
-    '<input type="submit" value="" class="Rk-Bins-Search-Submit Rk-Search-Submit" title="<%- translate("Search in Bins") %>" /></form></div>' +
-    '<ul class="Rk-Bin-List"></ul></div><% } %>' +
-    '<% if (options.show_editor) { %><div class="Rk-Render Rk-Render-<% if (options.show_bins) { %>Panel<% } else { %>Full<% } %>"></div><% } %>'
-);
-
 Renkan.prototype.translate = function(_text) {
     if (Rkns.i18n[this.options.language] && Rkns.i18n[this.options.language][_text]) {
         return Rkns.i18n[this.options.language][_text];

--- a/client/js/wikipedia-bin.js	Fri Apr 24 11:12:23 2015 +0200
+++ b/client/js/wikipedia-bin.js	Fri Apr 24 11:13:16 2015 +0200
@@ -34,12 +34,7 @@
 
 Rkns.Wikipedia.Bin = Rkns.Utils.inherit(Rkns._BaseBin);
 
-Rkns.Wikipedia.Bin.prototype.resultTemplate = Rkns._.template(
-    '<li class="Rk-Wikipedia-Result Rk-Bin-Item" draggable="true" data-uri="<%-url%>" ' +
-    'data-title="Wikipedia: <%-title%>" data-description="<%-description%>" data-image="<%- Rkns.Utils.getFullURL( static_url + \'img/wikipedia.png\' ) %>">' +
-    '<img class="Rk-Wikipedia-Icon" src="<%-static_url%>img/wikipedia.png"></div><h4 class="Rk-Wikipedia-Title"><a href="<%-url%>" target="_blank"><%=htitle%></a></h4>' +
-    '<p class="Rk-Wikipedia-Snippet"><%=hdescription%></p></li>'
-);
+Rkns.Wikipedia.Bin.prototype.resultTemplate = renkanJST['templates/wikipedia-bin/resulttemplate.html'];
 
 Rkns.Wikipedia.Bin.prototype._init = function(_renkan, _opts) {
     this.renkan = _renkan;

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/templates/list-bin.html	Fri Apr 24 11:13:16 2015 +0200
@@ -0,0 +1,25 @@
+<li class="Rk-Bin-Item Rk-ResourceList-Item" draggable="true"
+	data-uri="<%-url%>" data-title="<%-title%>"
+	data-description="<%-description%>"
+	<% if (image) { %>
+		data-image="<%- Rkns.Utils.getFullURL(image) %>"
+	<% } else { %>
+		data-image=""
+	<% } %>
+><% if (image) { %>
+	<img class="Rk-ResourceList-Image" src="<%-image%>" />
+<% } %>
+<h4 class="Rk-ResourceList-Title">
+	<% if (url) { %>
+		<a href="<%-url%>" target="_blank">
+	<% } %>
+	<%=htitle%>
+	<% if (url) { %></a><% } %>
+	</h4> 
+	<% if (description) { %>
+		<p class="Rk-ResourceList-Description"><%=hdescription%></p>
+	<% } %>
+	<% if (image) { %>
+		<div style="clear: both;"></div>
+	<% } %>
+</li>
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/templates/main.html	Fri Apr 24 11:13:16 2015 +0200
@@ -0,0 +1,27 @@
+<% if (options.show_bins) { %>
+	<div class="Rk-Bins">
+		<div class="Rk-Bins-Head">
+			<h2 class="Rk-Bins-Title"><%- translate("Select contents:")%></h2>
+			<form class="Rk-Web-Search-Form Rk-Search-Form">
+				<input class="Rk-Web-Search-Input Rk-Search-Input" type="search"
+					placeholder="<%- translate('Search theWeb') %>" />
+				<div class="Rk-Search-Select">
+					<div class="Rk-Search-Current"></div>
+					<ul class="Rk-Search-List"></ul>
+				</div>
+				<input type="submit" value=""
+					class="Rk-Web-Search-Submit Rk-Search-Submit" title="<%- translate('Search theWeb') %>" />
+			</form>
+			<form class="Rk-Bins-Search-Form Rk-Search-Form">
+				<input class="Rk-Bins-Search-Input Rk-Search-Input" type="search"
+					placeholder="<%- translate('Search inBins') %>" /> <input
+					type="submit" value=""
+					class="Rk-Bins-Search-Submit Rk-Search-Submit"
+					title="<%- translate('Search inBins') %>" />
+			</form>
+		</div>
+		<ul class="Rk-Bin-List"></ul>
+	</div>
+<% } %> <% if (options.show_editor) { %>
+	<div class="Rk-Render Rk-Render-<% if (options.show_bins) { %>Panel<% } else { %>Full<% } %>"></div>
+<% } %>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/templates/wikipedia-bin/resulttemplate.html	Fri Apr 24 11:13:16 2015 +0200
@@ -0,0 +1,11 @@
+<li class="Rk-Wikipedia-Result Rk-Bin-Item" draggable="true"
+	data-uri="<%-url%>" data-title="Wikipedia: <%-title%>"
+	data-description="<%-description%>"
+	data-image="<%- Rkns.Utils.getFullURL( static_url + 'img/wikipedia.png' ) %>">
+	
+	<img class="Rk-Wikipedia-Icon" src="<%-static_url%>img/wikipedia.png">
+	<h4 class="Rk-Wikipedia-Title">
+		<a href="<%-url%>" target="_blank"><%=htitle%></a>
+	</h4>
+	<p class="Rk-Wikipedia-Snippet"><%=hdescription%></p>
+</li>
\ No newline at end of file