diff -r 8da49ff273e0 -r 4ae2247a59f4 src/templates/createAnnotationWidget.html
--- a/src/templates/createAnnotationWidget.html	Tue Apr 03 20:30:12 2012 +0200
+++ b/src/templates/createAnnotationWidget.html	Fri Apr 06 16:49:32 2012 +0200
@@ -23,19 +23,19 @@
                 <div class='Ldt-createAnnotation-profileArrow'></div>
             </div>
             <button class='Ldt-createAnnotation-submitButton Ldt-TraceMe'>{{l10n.submit}}</button>
-            {{#keywords.length}}
+            {{#tags.length}}
             <div class='Ldt-createAnnotation-btnblock Ldt-createAnnotation-keywords'>
                 <label>{{l10n.add_keywords}} :</label>
                 <ul class='Ldt-floatList'>
-                {{#keywords}}
-                    <li><button class='Ldt-createAnnotation-keyword-button Ldt-TraceMe'>{{.}}</button></li>
-                {{/keywords}}
+                {{#tags}}
+                    <li><button class='Ldt-createAnnotation-keyword-button Ldt-TraceMe' tag-id='{{id}}'>{{meta.description}}</button></li>
+                {{/tags}}
                 </ul>
             </div>
-            {{#random_keywords}}
-                <button class='Ldt-createAnnotation-moar-keywordz'>{{l10n.moar_tagz}}</button>
-            {{/random_keywords}}
-            {{/keywords.length}}
+            {{#random_tags}}
+                <button class='Ldt-createAnnotation-moar-keywordz'>{{l10n.more_tags}}</button>
+            {{/random_tags}}
+            {{/tags.length}}
             {{#polemic_mode}}
             {{#polemics.length}}
             <div class='Ldt-createAnnotation-btnblock Ldt-createAnnotation-polemics'>