3 files changed, 10 insertions, 9 deletions

diff --git a/tmpl/fields.html b/tmpl/fields.html
index 6d3756d6..ca2a5ee2 100644
--- a/tmpl/fields.html
+++ b/tmpl/fields.html
@@ -1,15 +1,16 @@
 {{#*inline "audio"}}{{/inline}}
 
 {{#*inline "character"}}
-character
+{{definition.character}}
 {{/inline}}
 
 {{#*inline "dictionary"}}
-dictionary
+{{definition.dictionary}}
 {{/inline}}
 
 {{#*inline "expression"}}
-expression
+{{#if modeTermKana}}{{#if definition.reading}}{{definition.reading}}{{else}}{{definition.expression}}{{/if}}{{/if}}
+{{#if modeTermKanji}}{{definition.expression}}{{/if}}
 {{/inline}}
 
 {{#*inline "furigana"}}
@@ -21,27 +22,27 @@ glossary
 {{/inline}}
 
 {{#*inline "kunyomi"}}
-kunyomi
+{{definition.kunyomi}}
 {{/inline}}
 
 {{#*inline "onyomi"}}
-onyomi
+{{definition.onyomi}}
 {{/inline}}
 
 {{#*inline "reading"}}
-reading
+{{definition.reading}}
 {{/inline}}
 
 {{#*inline "sentence"}}
-sentence
+{{definition.sentence}}
 {{/inline}}
 
 {{#*inline "tags"}}
-tags
+{{#each definition.tags}}{{name}}{{#unless @last}}, {{/unless}}{{/each}}
 {{/inline}}
 
 {{#*inline "url"}}
-url
+{{#if html}}<a href="{{definition.url}}">{{definition.url}}</a>{{else}}{{definition.url}}{{/if}}
 {{/inline}}
 
 {{> (lookup . 'marker') }}
diff --git a/tmpl/kanji-list.html b/tmpl/kanji.html
index 3f6d8084..3f6d8084 100644
--- a/tmpl/kanji-list.html
+++ b/tmpl/kanji.html
diff --git a/tmpl/term-list.html b/tmpl/terms.html
index aae365c7..aae365c7 100644
--- a/tmpl/term-list.html
+++ b/tmpl/terms.html