Merge branch 'dev'

author: Alex Yatskov <alex@foosoft.net> 2017-08-17 19:19:34 -0700
committer: Alex Yatskov <alex@foosoft.net> 2017-08-17 19:19:34 -0700
commit: 7586572fbaab7de698ec13f8712cc95e24ab6273 (patch)
tree: 665417b73c928694b96c00a98dd882c618e1fd1d
parent: 3475150b2d1424d43f5be6fcfbdbb719a576866f (diff)
parent: 191336522c220b0a3cfe41515ed23946b3462217 (diff)
43 files changed, 2637 insertions, 2414 deletions
diff --git a/ext/bg/background.html b/ext/bg/background.html
index 4410c249..97b20f46 100644
--- a/ext/bg/background.html
+++ b/ext/bg/background.html
@@ -4,18 +4,25 @@
         <meta charset="UTF-8">
     </head>
     <body>
-        <script src="/mixed/lib/handlebars.min.js"></script>
         <script src="/mixed/lib/dexie.min.js"></script>
-        <script src="/mixed/lib/wanakana.min.js"></script>
+        <script src="/mixed/lib/handlebars.min.js"></script>
         <script src="/mixed/lib/jszip.min.js"></script>
-        <script src="/mixed/js/util.js"></script>
-        <script src="/bg/js/templates.js"></script>
-        <script src="/bg/js/util.js"></script>
-        <script src="/bg/js/anki-connect.js"></script>
-        <script src="/bg/js/anki-null.js"></script>
+        <script src="/mixed/lib/wanakana.min.js"></script>
+
+        <script src="/bg/js/anki.js"></script>
+        <script src="/bg/js/api.js"></script>
+        <script src="/bg/js/audio.js"></script>
         <script src="/bg/js/database.js"></script>
         <script src="/bg/js/deinflector.js"></script>
+        <script src="/bg/js/dictionary.js"></script>
+        <script src="/bg/js/handlebars.js"></script>
+        <script src="/bg/js/options.js"></script>
+        <script src="/bg/js/request.js"></script>
+        <script src="/bg/js/templates.js"></script>
         <script src="/bg/js/translator.js"></script>
-        <script src="/bg/js/yomichan.js"></script>
+        <script src="/bg/js/util.js"></script>
+        <script src="/mixed/js/japanese.js"></script>
+
+        <script src="/bg/js/backend.js"></script>
     </body>
 </html>
diff --git a/ext/bg/popup.html b/ext/bg/context.html
index dec52795..8a72acc7 100644
--- a/ext/bg/popup.html
+++ b/ext/bg/context.html
@@ -27,10 +27,14 @@
                 <button type="button" id="open-help" title="Help" class="btn btn-default btn-xs glyphicon glyphicon-question-sign"></button>
             </div>
         </p>
+
         <script src="/mixed/lib/jquery.min.js"></script>
         <script src="/mixed/lib/bootstrap-toggle/bootstrap-toggle.min.js"></script>
-        <script src="/mixed/lib/handlebars.min.js"></script>
+
+        <script src="/bg/js/api.js"></script>
+        <script src="/bg/js/options.js"></script>
         <script src="/bg/js/util.js"></script>
-        <script src="/bg/js/popup.js"></script>
+
+        <script src="/bg/js/context.js"></script>
     </body>
 </html>
diff --git a/ext/bg/js/anki-connect.js b/ext/bg/js/anki-connect.js
deleted file mode 100644
index 9759c8f5..00000000
--- a/ext/bg/js/anki-connect.js
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (C) 2016  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-class AnkiConnect {
-    constructor(server) {
-        this.server = server;
-        this.asyncPools = {};
-        this.localVersion = 2;
-        this.remoteVersion = null;
-    }
-
-    addNote(note) {
-        return this.checkVersion().then(() => this.ankiInvoke('addNote', {note}, null));
-    }
-
-    canAddNotes(notes) {
-        return this.checkVersion().then(() => this.ankiInvoke('canAddNotes', {notes}, 'notes'));
-    }
-
-    getDeckNames() {
-        return this.checkVersion().then(() => this.ankiInvoke('deckNames', {}, null));
-    }
-
-    getModelNames() {
-        return this.checkVersion().then(() => this.ankiInvoke('modelNames', {}, null));
-    }
-
-    getModelFieldNames(modelName) {
-        return this.checkVersion().then(() => this.ankiInvoke('modelFieldNames', {modelName}, null));
-    }
-
-    checkVersion() {
-        if (this.localVersion === this.remoteVersion) {
-            return Promise.resolve(true);
-        }
-
-        return this.ankiInvoke('version', {}, null).then(version => {
-            this.remoteVersion = version;
-            if (this.remoteVersion < this.localVersion) {
-                return Promise.reject('extension and plugin versions incompatible');
-            }
-        });
-    }
-
-    ankiInvoke(action, params, pool) {
-        return new Promise((resolve, reject) => {
-            if (pool !== null && this.asyncPools.hasOwnProperty(pool)) {
-                this.asyncPools[pool].abort();
-            }
-
-            const xhr = new XMLHttpRequest();
-            xhr.addEventListener('loadend', () => {
-                if (pool !== null) {
-                    delete this.asyncPools[pool];
-                }
-
-                if (xhr.responseText) {
-                    resolve(JSON.parse(xhr.responseText));
-                } else {
-                    reject('unable to connect to plugin');
-                }
-            });
-
-            xhr.open('POST', this.server);
-            xhr.send(JSON.stringify({action, params}));
-        });
-    }
-}
diff --git a/ext/bg/js/anki.js b/ext/bg/js/anki.js
new file mode 100644
index 00000000..c327969f
--- /dev/null
+++ b/ext/bg/js/anki.js
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2016  Alex Yatskov <alex@foosoft.net>
+ * Author: Alex Yatskov <alex@foosoft.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+/*
+ * AnkiConnect
+ */
+
+class AnkiConnect {
+    constructor(server) {
+        this.server = server;
+        this.localVersion = 2;
+        this.remoteVersion = 0;
+    }
+
+    async addNote(note) {
+        await this.checkVersion();
+        return await this.ankiInvoke('addNote', {note});
+    }
+
+    async canAddNotes(notes) {
+        await this.checkVersion();
+        return await this.ankiInvoke('canAddNotes', {notes});
+    }
+
+    async getDeckNames() {
+        await this.checkVersion();
+        return await this.ankiInvoke('deckNames');
+    }
+
+    async getModelNames() {
+        await this.checkVersion();
+        return await this.ankiInvoke('modelNames');
+    }
+
+    async getModelFieldNames(modelName) {
+        await this.checkVersion();
+        return await this.ankiInvoke('modelFieldNames', {modelName});
+    }
+
+    async guiBrowse(query) {
+        await this.checkVersion();
+        return await this.ankiInvoke('guiBrowse', {query});
+    }
+
+    async checkVersion() {
+        if (this.remoteVersion < this.localVersion) {
+            this.remoteVersion = await this.ankiInvoke('version');
+            if (this.remoteVersion < this.localVersion) {
+                throw 'extension and plugin versions incompatible';
+            }
+        }
+    }
+
+    ankiInvoke(action, params) {
+        return requestJson(this.server, 'POST', {action, params, version: this.localVersion});
+    }
+}
+
+
+/*
+ * AnkiNull
+ */
+
+class AnkiNull {
+    async addNote(note) {
+        return null;
+    }
+
+    async canAddNotes(notes) {
+        return [];
+    }
+
+    async getDeckNames() {
+        return [];
+    }
+
+    async getModelNames() {
+        return [];
+    }
+
+    async getModelFieldNames(modelName) {
+        return [];
+    }
+
+    async guiBrowse(query) {
+        return [];
+    }
+}
diff --git a/ext/bg/js/api.js b/ext/bg/js/api.js
new file mode 100644
index 00000000..2afe82a0
--- /dev/null
+++ b/ext/bg/js/api.js
@@ -0,0 +1,128 @@
+/*
+ * Copyright (C) 2016-2017  Alex Yatskov <alex@foosoft.net>
+ * Author: Alex Yatskov <alex@foosoft.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+async function apiOptionsSet(options) {
+    utilBackend().onOptionsUpdated(options);
+}
+
+async function apiOptionsGet() {
+    return utilBackend().options;
+}
+
+async function apiTermsFind(text) {
+    const options = utilBackend().options;
+    const translator = utilBackend().translator;
+
+    const searcher = options.general.groupResults ?
+        translator.findTermsGrouped.bind(translator) :
+        translator.findTerms.bind(translator);
+
+    const {definitions, length} = await searcher(
+        text,
+        dictEnabledSet(options),
+        options.scanning.alphanumeric
+    );
+
+    return {
+        length,
+        definitions: definitions.slice(0, options.general.maxResults)
+    };
+}
+
+async function apiKanjiFind(text) {
+    const options = utilBackend().options;
+    const definitions = await utilBackend().translator.findKanji(text, dictEnabledSet(options));
+    return definitions.slice(0, options.general.maxResults);
+}
+
+async function apiDefinitionAdd(definition, mode) {
+    const options = utilBackend().options;
+
+    if (mode !== 'kanji') {
+        await audioInject(
+            definition,
+            options.anki.terms.fields,
+            options.general.audioSource
+        );
+    }
+
+    return utilBackend().anki.addNote(dictNoteFormat(definition, mode, options));
+}
+
+async function apiDefinitionsAddable(definitions, modes) {
+    const notes = [];
+    for (const definition of definitions) {
+        for (const mode of modes) {
+            notes.push(dictNoteFormat(definition, mode, utilBackend().options));
+        }
+    }
+
+    const results = await utilBackend().anki.canAddNotes(notes);
+    const states = [];
+    for (let resultBase = 0; resultBase < results.length; resultBase += modes.length) {
+        const state = {};
+        for (let modeOffset = 0; modeOffset < modes.length; ++modeOffset) {
+            state[modes[modeOffset]] = results[resultBase + modeOffset];
+        }
+
+        states.push(state);
+    }
+
+    return states;
+}
+
+async function apiNoteView(noteId) {
+    return utilBackend().anki.guiBrowse(`nid:${noteId}`);
+}
+
+async function apiTemplateRender(template, data) {
+    return handlebarsRender(template, data);
+}
+
+async function apiCommandExec(command) {
+    const handlers = {
+        search: () => {
+            chrome.tabs.create({url: chrome.extension.getURL('/bg/search.html')});
+        },
+
+        help: () => {
+            chrome.tabs.create({url: 'https://foosoft.net/projects/yomichan/'});
+        },
+
+        options: () => {
+            chrome.runtime.openOptionsPage();
+        },
+
+        toggle: async () => {
+            const options = utilBackend().options;
+            options.general.enable = !options.general.enable;
+            await optionsSave(options);
+            await apiOptionsSet(options);
+        }
+    };
+
+    const handler = handlers[command];
+    if (handler) {
+        handler();
+    }
+}
+
+async function apiAudioGetUrl(definition, source) {
+    return audioBuildUrl(definition, source);
+}
diff --git a/ext/mixed/js/util.js b/ext/bg/js/audio.js
index 5cf62000..0952887e 100644
--- a/ext/mixed/js/util.js
+++ b/ext/bg/js/audio.js
@@ -17,30 +17,7 @@
  */
 
 
-/*
- * Cloze
- */
-
-function clozeBuild(sentence, source) {
-    const result = {
-        sentence: sentence.text.trim()
-    };
-
-    if (source) {
-        result.prefix = sentence.text.substring(0, sentence.offset).trim();
-        result.body = source.trim();
-        result.suffix = sentence.text.substring(sentence.offset + source.length).trim();
-    }
-
-    return result;
-}
-
-
-/*
- * Audio
- */
-
-function audioBuildUrl(definition, mode, cache={}) {
+async function audioBuildUrl(definition, mode, cache={}) {
     if (mode === 'jpod101') {
         let kana = definition.reading;
         let kanji = definition.expression;
@@ -102,8 +79,36 @@ function audioBuildUrl(definition, mode, cache={}) {
                 }
             }
         });
-    } else {
-        return Promise.reject('unsupported audio source');
+    } else if (mode === 'jisho') {
+        return new Promise((resolve, reject) => {
+            const response = cache[definition.expression];
+            if (response) {
+                resolve(response);
+            } else {
+                const xhr = new XMLHttpRequest();
+                xhr.open('GET', `http://jisho.org/search/${definition.expression}`);
+                xhr.addEventListener('error', () => reject('failed to scrape audio data'));
+                xhr.addEventListener('load', () => {
+                    cache[definition.expression] = xhr.responseText;
+                    resolve(xhr.responseText);
+                });
+
+                xhr.send();
+            }
+        }).then(response => {
+            try {
+                const dom = new DOMParser().parseFromString(response, 'text/html');
+                const audio = dom.getElementById(`audio_${definition.expression}:${definition.reading}`);
+                if (audio) {
+                    return audio.getElementsByTagName('source').item(0).getAttribute('src');
+                }
+            } catch (e) {
+                // NOP
+            }
+        });
+    }
+    else {
+        return Promise.resolve();
     }
 }
 
@@ -121,16 +126,7 @@ function audioBuildFilename(definition) {
     }
 }
 
-function audioInject(definition, fields, mode) {
-    if (mode === 'disabled') {
-        return Promise.resolve(true);
-    }
-
-    const filename = audioBuildFilename(definition);
-    if (!filename) {
-        return Promise.resolve(true);
-    }
-
+async function audioInject(definition, fields, mode) {
     let usesAudio = false;
     for (const name in fields) {
         if (fields[name].includes('{audio}')) {
@@ -140,11 +136,19 @@ function audioInject(definition, fields, mode) {
     }
 
     if (!usesAudio) {
-        return Promise.resolve(true);
+        return true;
     }
 
-    return audioBuildUrl(definition, mode).then(url => {
-        definition.audio = {url, filename};
+    try {
+        const url = await audioBuildUrl(definition, mode);
+        const filename = audioBuildFilename(definition);
+
+        if (url && filename) {
+            definition.audio = {url, filename};
+        }
+
         return true;
-    }).catch(() => false);
+    } catch (e) {
+        return false;
+    }
 }
diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
new file mode 100644
index 00000000..6b3acaa9
--- /dev/null
+++ b/ext/bg/js/backend.js
@@ -0,0 +1,131 @@
+/*
+ * Copyright (C) 2016-2017  Alex Yatskov <alex@foosoft.net>
+ * Author: Alex Yatskov <alex@foosoft.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+class Backend {
+    constructor() {
+        this.translator = new Translator();
+        this.anki = new AnkiNull();
+        this.options = null;
+    }
+
+    async prepare() {
+        await this.translator.prepare();
+        await apiOptionsSet(await optionsLoad());
+
+        chrome.commands.onCommand.addListener(this.onCommand.bind(this));
+        chrome.runtime.onMessage.addListener(this.onMessage.bind(this));
+
+        if (this.options.general.showGuide) {
+            chrome.tabs.create({url: chrome.extension.getURL('/bg/guide.html')});
+        }
+    }
+
+    onOptionsUpdated(options) {
+        this.options = utilIsolate(options);
+
+        if (!options.general.enable) {
+            chrome.browserAction.setBadgeBackgroundColor({color: '#555555'});
+            chrome.browserAction.setBadgeText({text: 'off'});
+        } else if (!dictConfigured(options)) {
+            chrome.browserAction.setBadgeBackgroundColor({color: '#f0ad4e'});
+            chrome.browserAction.setBadgeText({text: '!'});
+        } else {
+            chrome.browserAction.setBadgeText({text: ''});
+        }
+
+        if (options.anki.enable) {
+            this.anki = new AnkiConnect(options.anki.server);
+        } else {
+            this.anki = new AnkiNull();
+        }
+
+        chrome.tabs.query({}, tabs => {
+            for (const tab of tabs) {
+                chrome.tabs.sendMessage(tab.id, {action: 'optionsSet', params: options}, () => null);
+            }
+        });
+    }
+
+    onCommand(command) {
+        apiCommandExec(command);
+    }
+
+    onMessage({action, params}, sender, callback) {
+        const forward = (promise, callback) => {
+            return promise.then(result => {
+                callback({result});
+            }).catch(error => {
+                callback({error});
+            });
+        };
+
+        const handlers = {
+            optionsGet: ({callback}) => {
+                forward(apiOptionsGet(), callback);
+            },
+
+            optionsSet: ({options, callback}) => {
+                forward(apiOptionsSet(options), callback);
+            },
+
+            kanjiFind: ({text, callback}) => {
+                forward(apiKanjiFind(text), callback);
+            },
+
+            termsFind: ({text, callback}) => {
+                forward(apiTermsFind(text), callback);
+            },
+
+            definitionAdd: ({definition, mode, callback}) => {
+                forward(apiDefinitionAdd(definition, mode), callback);
+            },
+
+            definitionsAddable: ({definitions, modes, callback}) => {
+                forward(apiDefinitionsAddable(definitions, modes), callback);
+            },
+
+            noteView: ({noteId}) => {
+                forward(apiNoteView(noteId), callback);
+            },
+
+            templateRender: ({template, data, callback}) => {
+                forward(apiTemplateRender(template, data), callback);
+            },
+
+            commandExec: ({command, callback}) => {
+                forward(apiCommandExec(command), callback);
+            },
+
+            audioGetUrl: ({definition, source, callback}) => {
+                forward(apiAudioGetUrl(definition, source), callback);
+            }
+        };
+
+        const handler = handlers[action];
+        if (handler) {
+            params.callback = callback;
+            handler(params);
+        }
+
+        return true;
+    }
+}
+
+window.yomichan_backend = new Backend();
+window.yomichan_backend.prepare();
diff --git a/ext/bg/js/popup.js b/ext/bg/js/context.js
index 8577dd96..689d6863 100644
--- a/ext/bg/js/popup.js
+++ b/ext/bg/js/context.js
@@ -17,15 +17,15 @@
  */
 
 
-$(document).ready(() => {
-    $('#open-search').click(() => commandExec('search'));
-    $('#open-options').click(() => commandExec('options'));
-    $('#open-help').click(() => commandExec('help'));
+$(document).ready(utilAsync(() => {
+    $('#open-search').click(() => apiCommandExec('search'));
+    $('#open-options').click(() => apiCommandExec('options'));
+    $('#open-help').click(() => apiCommandExec('help'));
 
     optionsLoad().then(options => {
         const toggle = $('#enable-search');
         toggle.prop('checked', options.general.enable).change();
         toggle.bootstrapToggle();
-        toggle.change(() => commandExec('toggle'));
+        toggle.change(() => apiCommandExec('toggle'));
     });
-});
+}));
diff --git a/ext/bg/js/database.js b/ext/bg/js/database.js
index 4829356c..e00cb7a3 100644
--- a/ext/bg/js/database.js
+++ b/ext/bg/js/database.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016  Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2016-2017  Alex Yatskov <alex@foosoft.net>
  * Author: Alex Yatskov <alex@foosoft.net>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -20,59 +20,62 @@
 class Database {
     constructor() {
         this.db = null;
-        this.dbVersion = 2;
-        this.tagMetaCache = {};
+        this.version = 2;
+        this.tagCache = {};
     }
 
-    sanitize() {
-        const db = new Dexie('dict');
-        return db.open().then(() => {
+    async sanitize() {
+        try {
+            const db = new Dexie('dict');
+            await db.open();
             db.close();
-            if (db.verno !== this.dbVersion) {
-                return db.delete();
+            if (db.verno !== this.version) {
+                await db.delete();
             }
-        }).catch(() => {});
+        } catch(e) {
+            // NOP
+        }
     }
 
-    prepare() {
-        if (this.db !== null) {
-            return Promise.reject('database already initialized');
+    async prepare() {
+        if (this.db) {
+            throw 'database already initialized';
         }
 
-        return this.sanitize().then(() => {
-            this.db = new Dexie('dict');
-            this.db.version(this.dbVersion).stores({
-                terms: '++id,dictionary,expression,reading',
-                kanji: '++,dictionary,character',
-                tagMeta: '++,dictionary',
-                dictionaries: '++,title,version'
-            });
+        await this.sanitize();
 
-            return this.db.open();
+        this.db = new Dexie('dict');
+        this.db.version(this.version).stores({
+            terms: '++id,dictionary,expression,reading',
+            kanji: '++,dictionary,character',
+            tagMeta: '++,dictionary',
+            dictionaries: '++,title,version'
         });
+
+        await this.db.open();
     }
 
-    purge() {
-        if (this.db === null) {
-            return Promise.reject('database not initialized');
+    async purge() {
+        if (!this.db) {
+            throw 'database not initialized';
         }
 
         this.db.close();
-        return this.db.delete().then(() => {
-            this.db = null;
-            this.tagMetaCache = {};
-            return this.prepare();
-        });
+        await this.db.delete();
+        this.db = null;
+        this.tagCache = {};
+
+        await this.prepare();
     }
 
-    findTerms(term, dictionaries) {
-        if (this.db === null) {
-            return Promise.reject('database not initialized');
+    async findTerms(term, titles) {
+        if (!this.db) {
+            throw 'database not initialized';
         }
 
         const results = [];
-        return this.db.terms.where('expression').equals(term).or('reading').equals(term).each(row => {
-            if (dictionaries.includes(row.dictionary)) {
+        await this.db.terms.where('expression').equals(term).or('reading').equals(term).each(row => {
+            if (titles.includes(row.dictionary)) {
                 results.push({
                     expression: row.expression,
                     reading: row.reading,
@@ -84,25 +87,24 @@ class Database {
                     id: row.id
                 });
             }
-        }).then(() => {
-            return this.cacheTagMeta(dictionaries);
-        }).then(() => {
-            for (const result of results) {
-                result.tagMeta = this.tagMetaCache[result.dictionary] || {};
-            }
-
-            return results;
         });
+
+        await this.cacheTagMeta(titles);
+        for (const result of results) {
+            result.tagMeta = this.tagCache[result.dictionary] || {};
+        }
+
+        return results;
     }
 
-    findKanji(kanji, dictionaries) {
-        if (this.db === null) {
+    async findKanji(kanji, titles) {
+        if (!this.db) {
             return Promise.reject('database not initialized');
         }
 
         const results = [];
-        return this.db.kanji.where('character').equals(kanji).each(row => {
-            if (dictionaries.includes(row.dictionary)) {
+        await this.db.kanji.where('character').equals(kanji).each(row => {
+            if (titles.includes(row.dictionary)) {
                 results.push({
                     character: row.character,
                     onyomi: dictFieldSplit(row.onyomi),
@@ -112,103 +114,100 @@ class Database {
                     dictionary: row.dictionary
                 });
             }
-        }).then(() => {
-            return this.cacheTagMeta(dictionaries);
-        }).then(() => {
-            for (const result of results) {
-                result.tagMeta = this.tagMetaCache[result.dictionary] || {};
-            }
-
-            return results;
         });
-    }
 
-    cacheTagMeta(dictionaries) {
-        if (this.db === null) {
-            return Promise.reject('database not initialized');
+        await this.cacheTagMeta(titles);
+        for (const result of results) {
+            result.tagMeta = this.tagCache[result.dictionary] || {};
         }
 
-        const promises = [];
-        for (const dictionary of dictionaries) {
-            if (this.tagMetaCache[dictionary]) {
-                continue;
-            }
+        return results;
+    }
 
-            const tagMeta = {};
-            promises.push(
-                this.db.tagMeta.where('dictionary').equals(dictionary).each(row => {
-                    tagMeta[row.name] = {category: row.category, notes: row.notes, order: row.order};
-                }).then(() => {
-                    this.tagMetaCache[dictionary] = tagMeta;
-                })
-            );
+    async cacheTagMeta(titles) {
+        if (!this.db) {
+            throw 'database not initialized';
         }
 
-        return Promise.all(promises);
-    }
+        for (const title of titles) {
+            if (!this.tagCache[title]) {
+                const tagMeta = {};
+                await this.db.tagMeta.where('dictionary').equals(title).each(row => {
+                    tagMeta[row.name] = {category: row.category, notes: row.notes, order: row.order};
+                });
 
-    getDictionaries() {
-        if (this.db === null) {
-            return Promise.reject('database not initialized');
+                this.tagCache[title] = tagMeta;
+            }
         }
+    }
 
-        return this.db.dictionaries.toArray();
+    async getDictionaries() {
+        if (this.db) {
+            return this.db.dictionaries.toArray();
+        } else {
+            throw 'database not initialized';
+        }
     }
 
-    importDictionary(archive, callback) {
-        if (this.db === null) {
+    async importDictionary(archive, callback) {
+        if (!this.db) {
             return Promise.reject('database not initialized');
         }
 
         let summary = null;
-        const indexLoaded = (title, version, revision, tagMeta, hasTerms, hasKanji) => {
+        const indexLoaded = async (title, version, revision, tagMeta, hasTerms, hasKanji) => {
             summary = {title, version, revision, hasTerms, hasKanji};
-            return this.db.dictionaries.where('title').equals(title).count().then(count => {
-                if (count > 0) {
-                    return Promise.reject(`dictionary "${title}" is already imported`);
-                }
-
-                return this.db.dictionaries.add({title, version, revision, hasTerms, hasKanji}).then(() => {
-                    const rows = [];
-                    for (const tag in tagMeta || {}) {
-                        const meta = tagMeta[tag];
-                        const row = dictTagSanitize({
-                            name: tag,
-                            category: meta.category,
-                            notes: meta.notes,
-                            order: meta.order,
-                            dictionary: title
-                        });
-
-                        rows.push(row);
-                    }
-
-                    return this.db.tagMeta.bulkAdd(rows);
+
+            const count = await this.db.dictionaries.where('title').equals(title).count();
+            if (count > 0) {
+                throw `dictionary "${title}" is already imported`;
+            }
+
+            await this.db.dictionaries.add({title, version, revision, hasTerms, hasKanji});
+
+            const rows = [];
+            for (const tag in tagMeta || {}) {
+                const meta = tagMeta[tag];
+                const row = dictTagSanitize({
+                    name: tag,
+                    category: meta.category,
+                    notes: meta.notes,
+                    order: meta.order,
+                    dictionary: title
                 });
-            });
+
+                rows.push(row);
+            }
+
+            await this.db.tagMeta.bulkAdd(rows);
         };
 
-        const termsLoaded = (title, entries, total, current) => {
-            return this.db.transaction('rw', this.db.terms, function() {
-                for (const [expression, reading, tags, rules, score, ...glossary] of entries) {
-                    this.db.terms.add({
-                        expression,
-                        reading,
-                        tags,
-                        rules,
-                        score,
-                        glossary,
-                        dictionary: title
-                    });
-                }
-            }).then(() => {
-                if (callback) {
-                    callback(total, current);
-                }
-            });
+        const termsLoaded = async (title, entries, total, current) => {
+            if (callback) {
+                callback(total, current);
+            }
+
+            const rows = [];
+            for (const [expression, reading, tags, rules, score, ...glossary] of entries) {
+                rows.push({
+                    expression,
+                    reading,
+                    tags,
+                    rules,
+                    score,
+                    glossary,
+                    dictionary: title
+                });
+            }
+
+            await this.db.terms.bulkAdd(rows);
         };
 
-        const kanjiLoaded = (title, entries, total, current)  => {
+        const kanjiLoaded = async (title, entries, total, current)  => {
+            if (callback) {
+                callback(total, current);
+            }
+
             const rows = [];
             for (const [character, onyomi, kunyomi, tags, ...meanings] of entries) {
                 rows.push({
@@ -221,13 +220,56 @@ class Database {
                 });
             }
 
-            return this.db.kanji.bulkAdd(rows).then(() => {
-                if (callback) {
-                    callback(total, current);
-                }
-            });
+            await this.db.kanji.bulkAdd(rows);
         };
 
-        return zipLoadDb(archive, indexLoaded, termsLoaded, kanjiLoaded).then(() => summary);
+        await Database.importDictionaryZip(archive, indexLoaded, termsLoaded, kanjiLoaded);
+        return summary;
+    }
+
+    static async importDictionaryZip(archive, indexLoaded, termsLoaded, kanjiLoaded) {
+        const files = (await JSZip.loadAsync(archive)).files;
+
+        const indexFile = files['index.json'];
+        if (!indexFile) {
+            throw 'no dictionary index found in archive';
+        }
+
+        const index = JSON.parse(await indexFile.async('string'));
+        if (!index.title || !index.version || !index.revision) {
+            throw 'unrecognized dictionary format';
+        }
+
+        await indexLoaded(
+            index.title,
+            index.version,
+            index.revision,
+            index.tagMeta || {},
+            index.termBanks > 0,
+            index.kanjiBanks > 0
+        );
+
+        const banksTotal = index.termBanks + index.kanjiBanks;
+        let banksLoaded = 0;
+
+        for (let i = 1; i <= index.termBanks; ++i) {
+            const bankFile = files[`term_bank_${i}.json`];
+            if (bankFile) {
+                const bank = JSON.parse(await bankFile.async('string'));
+                await termsLoaded(index.title, bank, banksTotal, banksLoaded++);
+            } else {
+                throw 'missing term bank file';
+            }
+        }
+
+        for (let i = 1; i <= index.kanjiBanks; ++i) {
+            const bankFile = files[`kanji_bank_${i}.json`];
+            if (bankFile) {
+                const bank = JSON.parse(await bankFile.async('string'));
+                await kanjiLoaded(index.title, bank, banksTotal, banksLoaded++);
+            } else {
+                throw 'missing kanji bank file';
+            }
+        }
     }
 }
diff --git a/ext/bg/js/deinflector.js b/ext/bg/js/deinflector.js
index 6484f953..0abde99d 100644
--- a/ext/bg/js/deinflector.js
+++ b/ext/bg/js/deinflector.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016  Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2016-2017  Alex Yatskov <alex@foosoft.net>
  * Author: Alex Yatskov <alex@foosoft.net>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -26,26 +26,7 @@ class Deinflection {
         this.children = [];
     }
 
-    deinflect(definer, reasons) {
-        const define = () => {
-            return definer(this.term).then(definitions => {
-                if (this.rules.length === 0) {
-                    this.definitions = definitions;
-                } else {
-                    for (const rule of this.rules) {
-                        for (const definition of definitions) {
-                            if (definition.rules.includes(rule)) {
-                                this.definitions.push(definition);
-                            }
-                        }
-                    }
-                }
-
-                return this.definitions.length > 0;
-            });
-        };
-
-        const promises = [];
+    async deinflect(definer, reasons) {
         for (const reason in reasons) {
             for (const variant of reasons[reason]) {
                 let accept = this.rules.length === 0;
@@ -68,20 +49,31 @@ class Deinflection {
                 }
 
                 const child = new Deinflection(term, {reason, rules: variant.rulesOut});
-                promises.push(
-                    child.deinflect(definer, reasons).then(valid => valid && this.children.push(child))
-                );
+                if (await child.deinflect(definer, reasons)) {
+                    this.children.push(child);
+                }
             }
         }
 
-        return Promise.all(promises).then(define).then(valid => {
-            if (valid && this.children.length > 0) {
-                const child = new Deinflection(this.term, {rules: this.rules, definitions: this.definitions});
-                this.children.push(child);
+        const definitions = await definer(this.term);
+        if (this.rules.length === 0) {
+            this.definitions = definitions;
+        } else {
+            for (const rule of this.rules) {
+                for (const definition of definitions) {
+                    if (definition.rules.includes(rule)) {
+                        this.definitions.push(definition);
+                    }
+                }
             }
+        }
+
+        if (this.definitions.length > 0 && this.children.length > 0) {
+            const child = new Deinflection(this.term, {rules: this.rules, definitions: this.definitions});
+            this.children.push(child);
+        }
 
-            return valid || this.children.length > 0;
-        });
+        return this.definitions.length > 0 || this.children.length > 0;
     }
 
     gather() {
@@ -112,16 +104,16 @@ class Deinflection {
 
 
 class Deinflector {
-    constructor() {
-        this.reasons = {};
-    }
-
-    setReasons(reasons) {
+    constructor(reasons) {
         this.reasons = reasons;
     }
 
-    deinflect(term, definer) {
+    async deinflect(term, definer) {
         const node = new Deinflection(term);
-        return node.deinflect(definer, this.reasons).then(success => success ? node.gather() : []);
+        if (await node.deinflect(definer, this.reasons)) {
+            return node.gather();
+        } else {
+            return [];
+        }
     }
 }
diff --git a/ext/bg/js/dictionary.js b/ext/bg/js/dictionary.js
new file mode 100644
index 00000000..c8d431b9
--- /dev/null
+++ b/ext/bg/js/dictionary.js
@@ -0,0 +1,273 @@
+/*
+ * Copyright (C) 2016-2017  Alex Yatskov <alex@foosoft.net>
+ * Author: Alex Yatskov <alex@foosoft.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+function dictEnabledSet(options) {
+    const dictionaries = {};
+    for (const title in options.dictionaries) {
+        const dictionary = options.dictionaries[title];
+        if (dictionary.enabled) {
+            dictionaries[title] = dictionary;
+        }
+    }
+
+    return dictionaries;
+}
+
+function dictConfigured(options) {
+    for (const title in options.dictionaries) {
+        if (options.dictionaries[title].enabled) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+function dictRowsSort(rows, options) {
+    return rows.sort((ra, rb) => {
+        const pa = (options.dictionaries[ra.title] || {}).priority || 0;
+        const pb = (options.dictionaries[rb.title] || {}).priority || 0;
+        if (pa > pb) {
+            return -1;
+        } else if (pa < pb) {
+            return 1;
+        } else {
+            return 0;
+        }
+    });
+}
+
+function dictTermsSort(definitions, dictionaries=null) {
+    return definitions.sort((v1, v2) => {
+        const sl1 = v1.source.length;
+        const sl2 = v2.source.length;
+        if (sl1 > sl2) {
+            return -1;
+        } else if (sl1 < sl2) {
+            return 1;
+        }
+
+        if (dictionaries !== null) {
+            const p1 = (dictionaries[v1.dictionary] || {}).priority || 0;
+            const p2 = (dictionaries[v2.dictionary] || {}).priority || 0;
+            if (p1 > p2) {
+                return -1;
+            } else if (p1 < p2) {
+                return 1;
+            }
+        }
+
+        const s1 = v1.score;
+        const s2 = v2.score;
+        if (s1 > s2) {
+            return -1;
+        } else if (s1 < s2) {
+            return 1;
+        }
+
+        const rl1 = v1.reasons.length;
+        const rl2 = v2.reasons.length;
+        if (rl1 < rl2) {
+            return -1;
+        } else if (rl1 > rl2) {
+            return 1;
+        }
+
+        return v2.expression.localeCompare(v1.expression);
+    });
+}
+
+function dictTermsUndupe(definitions) {
+    const definitionGroups = {};
+    for (const definition of definitions) {
+        const definitionExisting = definitionGroups[definition.id];
+        if (!definitionGroups.hasOwnProperty(definition.id) || definition.expression.length > definitionExisting.expression.length) {
+            definitionGroups[definition.id] = definition;
+        }
+    }
+
+    const definitionsUnique = [];
+    for (const key in definitionGroups) {
+        definitionsUnique.push(definitionGroups[key]);
+    }
+
+    return definitionsUnique;
+}
+
+function dictTermsGroup(definitions, dictionaries) {
+    const groups = {};
+    for (const definition of definitions) {
+        const key = [definition.source, definition.expression].concat(definition.reasons);
+        if (definition.reading) {
+            key.push(definition.reading);
+        }
+
+        const group = groups[key];
+        if (group) {
+            group.push(definition);
+        } else {
+            groups[key] = [definition];
+        }
+    }
+
+    const results = [];
+    for (const key in groups) {
+        const groupDefs = groups[key];
+        const firstDef = groupDefs[0];
+        dictTermsSort(groupDefs, dictionaries);
+        results.push({
+            definitions: groupDefs,
+            expression: firstDef.expression,
+            reading: firstDef.reading,
+            reasons: firstDef.reasons,
+            score: groupDefs.reduce((p, v) => v.score > p ? v.score : p, Number.MIN_SAFE_INTEGER),
+            source: firstDef.source
+        });
+    }
+
+    return dictTermsSort(results);
+}
+
+function dictTagBuildSource(name) {
+    return dictTagSanitize({name, category: 'dictionary', order: 100});
+}
+
+function dictTagBuild(name, meta) {
+    const tag = {name};
+    const symbol = name.split(':')[0];
+    for (const prop in meta[symbol] || {}) {
+        tag[prop] = meta[symbol][prop];
+    }
+
+    return dictTagSanitize(tag);
+}
+
+function dictTagSanitize(tag) {
+    tag.name = tag.name || 'untitled';
+    tag.category = tag.category || 'default';
+    tag.notes = tag.notes || '';
+    tag.order = tag.order || 0;
+    return tag;
+}
+
+function dictTagsSort(tags) {
+    return tags.sort((v1, v2) => {
+        const order1 = v1.order;
+        const order2 = v2.order;
+        if (order1 < order2) {
+            return -1;
+        } else if (order1 > order2) {
+            return 1;
+        }
+
+        const name1 = v1.name;
+        const name2 = v2.name;
+        if (name1 < name2) {
+            return -1;
+        } else if (name1 > name2) {
+            return 1;
+        }
+
+        return 0;
+    });
+}
+
+function dictFieldSplit(field) {
+    return field.length === 0 ? [] : field.split(' ');
+}
+
+function dictFieldFormat(field, definition, mode, options) {
+    const markers = [
+        'audio',
+        'character',
+        'cloze-body',
+        'cloze-prefix',
+        'cloze-suffix',
+        'dictionary',
+        'expression',
+        'furigana',
+        'glossary',
+        'glossary-brief',
+        'kunyomi',
+        'onyomi',
+        'reading',
+        'sentence',
+        'tags',
+        'url'
+    ];
+
+    for (const marker of markers) {
+        const data = {
+            marker,
+            definition,
+            group: options.general.groupResults,
+            html: options.anki.htmlCards,
+            modeTermKanji: mode === 'term-kanji',
+            modeTermKana: mode === 'term-kana',
+            modeKanji: mode === 'kanji'
+        };
+
+        field = field.replace(
+            `{${marker}}`,
+            handlebarsRender('fields.html', data)
+        );
+    }
+
+    return field;
+}
+
+function dictNoteFormat(definition, mode, options) {
+    const note = {fields: {}, tags: options.anki.tags};
+    let fields = [];
+
+    if (mode === 'kanji') {
+        fields = options.anki.kanji.fields;
+        note.deckName = options.anki.kanji.deck;
+        note.modelName = options.anki.kanji.model;
+    } else {
+        fields = options.anki.terms.fields;
+        note.deckName = options.anki.terms.deck;
+        note.modelName = options.anki.terms.model;
+
+        if (definition.audio) {
+            const audio = {
+                url: definition.audio.url,
+                filename: definition.audio.filename,
+                skipHash: '7e2c2f954ef6051373ba916f000168dc',
+                fields: []
+            };
+
+            for (const name in fields) {
+                if (fields[name].includes('{audio}')) {
+                    audio.fields.push(name);
+                }
+            }
+
+            if (audio.fields.length > 0) {
+                note.audio = audio;
+            }
+        }
+    }
+
+    for (const name in fields) {
+        note.fields[name] = dictFieldFormat(fields[name], definition, mode, options);
+    }
+
+    return note;
+}
diff --git a/ext/bg/js/display-window.js b/ext/bg/js/display-window.js
deleted file mode 100644
index ae97cd36..00000000
--- a/ext/bg/js/display-window.js
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 2016  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-window.displayWindow = new class extends Display {
-    constructor() {
-        super($('#spinner'), $('#content'));
-
-        const search = $('#search');
-        search.click(this.onSearch.bind(this));
-
-        const query = $('#query');
-        query.on('input', () => search.prop('disabled', query.val().length === 0));
-        window.wanakana.bind(query.get(0));
-    }
-
-    definitionAdd(definition, mode) {
-        return instYomi().definitionAdd(definition, mode);
-    }
-
-    definitionsAddable(definitions, modes) {
-        return instYomi().definitionsAddable(definitions, modes).catch(() => []);
-    }
-
-    templateRender(template, data) {
-        return instYomi().templateRender(template, data);
-    }
-
-    kanjiFind(character) {
-        return instYomi().kanjiFind(character);
-    }
-
-    handleError(error) {
-        window.alert(`Error: ${error}`);
-    }
-
-    clearSearch() {
-        $('#query').focus().select();
-    }
-
-    onSearch(e) {
-        e.preventDefault();
-        $('#intro').slideUp();
-        instYomi().termsFind($('#query').val()).then(({length, definitions}) => {
-            super.showTermDefs(definitions, instYomi().options);
-        }).catch(this.handleError.bind(this));
-    }
-};
diff --git a/ext/bg/js/handlebars.js b/ext/bg/js/handlebars.js
new file mode 100644
index 00000000..debb0690
--- /dev/null
+++ b/ext/bg/js/handlebars.js
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2016-2017  Alex Yatskov <alex@foosoft.net>
+ * Author: Alex Yatskov <alex@foosoft.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+function handlebarsEscape(text) {
+    return Handlebars.Utils.escapeExpression(text);
+}
+
+function handlebarsDumpObject(options) {
+    const dump = JSON.stringify(options.fn(this), null, 4);
+    return handlebarsEscape(dump);
+}
+
+function handlebarsKanjiLinks(options) {
+    let result = '';
+    for (const c of options.fn(this)) {
+        if (jpIsKanji(c)) {
+            result += `<a href="#" class="kanji-link">${c}</a>`;
+        } else {
+            result += c;
+        }
+    }
+
+    return result;
+}
+
+function handlebarsMultiLine(options) {
+    return options.fn(this).split('\n').join('<br>');
+}
+
+function handlebarsRender(template, data) {
+    if (Handlebars.partials !== Handlebars.templates) {
+        Handlebars.partials = Handlebars.templates;
+        Handlebars.registerHelper('dumpObject', handlebarsDumpObject);
+        Handlebars.registerHelper('kanjiLinks', handlebarsKanjiLinks);
+        Handlebars.registerHelper('multiLine', handlebarsMultiLine);
+    }
+
+    return Handlebars.templates[template](data);
+}
diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js
index 5aa18366..ea52d337 100644
--- a/ext/bg/js/options.js
+++ b/ext/bg/js/options.js
@@ -17,388 +17,115 @@
  */
 
 
-/*
- * General
- */
-
-function formRead() {
-    return optionsLoad().then(optionsOld => {
-        const optionsNew = $.extend(true, {}, optionsOld);
-
-        optionsNew.general.showGuide = $('#show-usage-guide').prop('checked');
-        optionsNew.general.audioSource = $('#audio-playback-source').val();
-        optionsNew.general.audioVolume = parseFloat($('#audio-playback-volume').val());
-        optionsNew.general.groupResults = $('#group-terms-results').prop('checked');
-        optionsNew.general.debugInfo = $('#show-debug-info').prop('checked');
-        optionsNew.general.showAdvanced = $('#show-advanced-options').prop('checked');
-        optionsNew.general.maxResults = parseInt($('#max-displayed-results').val(), 10);
-        optionsNew.general.popupWidth = parseInt($('#popup-width').val(), 10);
-        optionsNew.general.popupHeight = parseInt($('#popup-height').val(), 10);
-        optionsNew.general.popupOffset = parseInt($('#popup-offset').val(), 10);
-
-        optionsNew.scanning.middleMouse = $('#middle-mouse-button-scan').prop('checked');
-        optionsNew.scanning.selectText = $('#select-matched-text').prop('checked');
-        optionsNew.scanning.alphanumeric = $('#search-alphanumeric').prop('checked');
-        optionsNew.scanning.delay = parseInt($('#scan-delay').val(), 10);
-        optionsNew.scanning.length = parseInt($('#scan-length').val(), 10);
-        optionsNew.scanning.modifier = $('#scan-modifier-key').val();
-
-        optionsNew.anki.enable = $('#anki-enable').prop('checked');
-        optionsNew.anki.tags = $('#card-tags').val().split(/[,; ]+/);
-        optionsNew.anki.htmlCards = $('#generate-html-cards').prop('checked');
-        optionsNew.anki.sentenceExt = parseInt($('#sentence-detection-extent').val(), 10);
-        optionsNew.anki.server = $('#interface-server').val();
-
-        if (optionsOld.anki.enable && !$('#anki-error').is(':visible')) {
-            optionsNew.anki.terms.deck = $('#anki-terms-deck').val();
-            optionsNew.anki.terms.model = $('#anki-terms-model').val();
-            optionsNew.anki.terms.fields = ankiFieldsToDict($('#terms .anki-field-value'));
-            optionsNew.anki.kanji.deck = $('#anki-kanji-deck').val();
-            optionsNew.anki.kanji.model = $('#anki-kanji-model').val();
-            optionsNew.anki.kanji.fields = ankiFieldsToDict($('#kanji .anki-field-value'));
+function optionsSetDefaults(options) {
+    const defaults = {
+        general: {
+            enable: true,
+            audioSource: 'jpod101',
+            audioVolume: 100,
+            groupResults: true,
+            debugInfo: false,
+            maxResults: 32,
+            showAdvanced: false,
+            popupWidth: 400,
+            popupHeight: 250,
+            popupOffset: 10,
+            showGuide: true
+        },
+
+        scanning: {
+            middleMouse: true,
+            selectText: true,
+            alphanumeric: true,
+            delay: 15,
+            length: 10,
+            modifier: 'shift'
+        },
+
+        dictionaries: {},
+
+        anki: {
+            enable: false,
+            server: 'http://127.0.0.1:8765',
+            tags: ['yomichan'],
+            htmlCards: true,
+            sentenceExt: 200,
+            terms: {deck: '', model: '', fields: {}},
+            kanji: {deck: '', model: '', fields: {}}
         }
+    };
 
-        $('.dict-group').each((index, element) => {
-            const dictionary = $(element);
-            const title = dictionary.data('title');
-            const priority = parseInt(dictionary.find('.dict-priority').val(), 10);
-            const enabled = dictionary.find('.dict-enabled').prop('checked');
-            optionsNew.dictionaries[title] = {priority, enabled};
-        });
-
-        return {optionsNew, optionsOld};
-    });
-}
-
-function updateVisibility(options) {
-    const general = $('#anki-general');
-    if (options.anki.enable) {
-        general.show();
-    } else {
-        general.hide();
-    }
-
-    const advanced = $('.options-advanced');
-    if (options.general.showAdvanced) {
-        advanced.show();
-    } else {
-        advanced.hide();
-    }
-
-    const debug = $('#debug');
-    if (options.general.debugInfo) {
-        const text = JSON.stringify(options, null, 4);
-        debug.html(handlebarsEscape(text));
-        debug.show();
-    } else {
-        debug.hide();
-    }
-}
-
-function onOptionsChanged(e) {
-    if (!e.originalEvent && !e.isTrigger) {
-        return;
-    }
-
-    formRead().then(({optionsNew, optionsOld}) => {
-        return optionsSave(optionsNew).then(() => {
-            updateVisibility(optionsNew);
-
-            const ankiUpdated =
-                optionsNew.anki.enable !== optionsOld.anki.enable ||
-                optionsNew.anki.server !== optionsOld.anki.server;
-
-            if (ankiUpdated) {
-                ankiErrorShow(null);
-                ankiSpinnerShow(true);
-                return ankiDeckAndModelPopulate(optionsNew);
+    const combine = (target, source) => {
+        for (const key in source) {
+            if (!target.hasOwnProperty(key)) {
+                target[key] = source[key];
             }
-        });
-    }).catch(ankiErrorShow).then(() => ankiSpinnerShow(false));
-}
-
-$(document).ready(() => {
-    handlebarsRegister();
-
-    optionsLoad().then(options => {
-        $('#show-usage-guide').prop('checked', options.general.showGuide);
-        $('#audio-playback-source').val(options.general.audioSource);
-        $('#audio-playback-volume').val(options.general.audioVolume);
-        $('#group-terms-results').prop('checked', options.general.groupResults);
-        $('#show-debug-info').prop('checked', options.general.debugInfo);
-        $('#show-advanced-options').prop('checked', options.general.showAdvanced);
-        $('#max-displayed-results').val(options.general.maxResults);
-        $('#popup-width').val(options.general.popupWidth);
-        $('#popup-height').val(options.general.popupHeight);
-        $('#popup-offset').val(options.general.popupOffset);
-
-        $('#middle-mouse-button-scan').prop('checked', options.scanning.middleMouse);
-        $('#select-matched-text').prop('checked', options.scanning.selectText);
-        $('#search-alphanumeric').prop('checked', options.scanning.alphanumeric);
-        $('#scan-delay').val(options.scanning.delay);
-        $('#scan-length').val(options.scanning.length);
-        $('#scan-modifier-key').val(options.scanning.modifier);
-
-        $('#dict-purge').click(onDictionaryPurge);
-        $('#dict-file').change(onDictionaryImport);
-
-        $('#anki-enable').prop('checked', options.anki.enable);
-        $('#card-tags').val(options.anki.tags.join(' '));
-        $('#generate-html-cards').prop('checked', options.anki.htmlCards);
-        $('#sentence-detection-extent').val(options.anki.sentenceExt);
-        $('#interface-server').val(options.anki.server);
-        $('input, select').not('.anki-model').change(onOptionsChanged);
-        $('.anki-model').change(onAnkiModelChanged);
-
-        dictionaryGroupsPopulate(options);
-        ankiDeckAndModelPopulate(options);
-        updateVisibility(options);
-    });
-});
-
-
-/*
- * Dictionary
- */
-
-function dictionaryErrorShow(error) {
-    const dialog = $('#dict-error');
-    if (error) {
-        dialog.show().find('span').text(error);
-    } else {
-        dialog.hide();
-    }
-}
-
-function dictionarySpinnerShow(show) {
-    const spinner = $('#dict-spinner');
-    if (show) {
-        spinner.show();
-    } else {
-        spinner.hide();
-    }
-}
-
-function dictionaryGroupsSort() {
-    const dictGroups = $('#dict-groups');
-    const dictGroupChildren = dictGroups.children('.dict-group').sort((ca, cb) => {
-        const pa = parseInt($(ca).find('.dict-priority').val(), 10);
-        const pb = parseInt($(cb).find('.dict-priority').val(), 10);
-        if (pa < pb) {
-            return 1;
-        } else if (pa > pb) {
-            return -1;
-        } else {
-            return 0;
         }
-    });
-
-    dictGroups.append(dictGroupChildren);
-}
-
-function dictionaryGroupsPopulate(options) {
-    dictionaryErrorShow(null);
-    dictionarySpinnerShow(true);
+    };
 
-    const dictGroups = $('#dict-groups').empty();
-    const dictWarning = $('#dict-warning').hide();
+    combine(options, defaults);
+    combine(options.general, defaults.general);
+    combine(options.scanning, defaults.scanning);
+    combine(options.anki, defaults.anki);
+    combine(options.anki.terms, defaults.anki.terms);
+    combine(options.anki.kanji, defaults.anki.kanji);
 
-    return instDb().getDictionaries().then(rows => {
-        if (rows.length === 0) {
-            dictWarning.show();
-        }
-
-        for (const row of dictRowsSort(rows, options)) {
-            const dictOptions = options.dictionaries[row.title] || {enabled: false, priority: 0};
-            const dictHtml = handlebarsRender('dictionary.html', {
-                title: row.title,
-                version: row.version,
-                revision: row.revision,
-                priority: dictOptions.priority,
-                enabled: dictOptions.enabled
-            });
-
-            dictGroups.append($(dictHtml));
-        }
-
-        updateVisibility(options);
-
-        $('.dict-enabled, .dict-priority').change(e => {
-            dictionaryGroupsSort();
-            onOptionsChanged(e);
-        });
-    }).catch(dictionaryErrorShow).then(() => dictionarySpinnerShow(false));
-}
-
-function onDictionaryPurge(e) {
-    e.preventDefault();
-
-    dictionaryErrorShow(null);
-    dictionarySpinnerShow(true);
-
-    const dictControls = $('#dict-importer, #dict-groups').hide();
-    const dictProgress = $('#dict-purge-progress').show();
-
-    instDb().purge().catch(dictionaryErrorShow).then(() => {
-        dictionarySpinnerShow(false);
-        dictControls.show();
-        dictProgress.hide();
-        return optionsLoad();
-    }).then(options => {
-        options.dictionaries = {};
-        optionsSave(options).then(() => dictionaryGroupsPopulate(options));
-    });
+    return options;
 }
 
-function onDictionaryImport(e) {
-    dictionaryErrorShow(null);
-    dictionarySpinnerShow(true);
-
-    const dictFile = $('#dict-file');
-    const dictImporter = $('#dict-importer').hide();
-    const dictProgress = $('#dict-import-progress').show();
-    const setProgress = percent => dictProgress.find('.progress-bar').css('width', `${percent}%`);
-    const updateProgress = (total, current) => setProgress(current / total * 100.0);
-
-    setProgress(0.0);
-
-    optionsLoad().then(options => {
-        return instDb().importDictionary(e.target.files[0], updateProgress).then(summary => {
-            options.dictionaries[summary.title] = {enabled: true, priority: 0};
-            return optionsSave(options);
-        }).then(() => dictionaryGroupsPopulate(options));
-    }).catch(dictionaryErrorShow).then(() => {
-        dictFile.val('');
-        dictionarySpinnerShow(false);
-        dictProgress.hide();
-        dictImporter.show();
-    });
-}
-
-/*
- * Anki
- */
+function optionsVersion(options) {
+    const fixups = [
+        () => {},
+        () => {},
+        () => {},
+        () => {},
+        () => {
+            if (options.general.audioPlayback) {
+                options.general.audioSource = 'jpod101';
+            } else {
+                options.general.audioSource = 'disabled';
+            }
+        },
+        () => {
+            options.general.showGuide = false;
+        },
+        () => {
+            if (options.scanning.requireShift) {
+                options.scanning.modifier = 'shift';
+            } else {
+                options.scanning.modifier = 'none';
+            }
+        }
+    ];
 
-function ankiSpinnerShow(show) {
-    const spinner = $('#anki-spinner');
-    if (show) {
-        spinner.show();
-    } else {
-        spinner.hide();
+    optionsSetDefaults(options);
+    if (!options.hasOwnProperty('version')) {
+        options.version = fixups.length;
     }
-}
 
-function ankiErrorShow(error) {
-    const dialog = $('#anki-error');
-    if (error) {
-        dialog.show().find('span').text(error);
+    while (options.version < fixups.length) {
+        fixups[options.version++]();
     }
-    else {
-        dialog.hide();
-    }
-}
-
-function ankiFieldsToDict(selection) {
-    const result = {};
-    selection.each((index, element) => {
-        result[$(element).data('field')] = $(element).val();
-    });
-
-    return result;
-}
-
-function ankiDeckAndModelPopulate(options) {
-    ankiErrorShow(null);
-    ankiSpinnerShow(true);
-
-    const ankiFormat = $('#anki-format').hide();
-    return Promise.all([instAnki().getDeckNames(), instAnki().getModelNames()]).then(([deckNames, modelNames]) => {
-        const ankiDeck = $('.anki-deck');
-        ankiDeck.find('option').remove();
-        deckNames.sort().forEach(name => ankiDeck.append($('<option/>', {value: name, text: name})));
 
-        $('#anki-terms-deck').val(options.anki.terms.deck);
-        $('#anki-kanji-deck').val(options.anki.kanji.deck);
-
-        const ankiModel = $('.anki-model');
-        ankiModel.find('option').remove();
-        modelNames.sort().forEach(name => ankiModel.append($('<option/>', {value: name, text: name})));
-
-        return Promise.all([
-            ankiFieldsPopulate($('#anki-terms-model').val(options.anki.terms.model), options),
-            ankiFieldsPopulate($('#anki-kanji-model').val(options.anki.kanji.model), options)
-        ]);
-    }).then(() => ankiFormat.show()).catch(ankiErrorShow).then(() => ankiSpinnerShow(false));
+    return options;
 }
 
-function ankiFieldsPopulate(element, options) {
-    const tab = element.closest('.tab-pane');
-    const tabId = tab.attr('id');
-    const container = tab.find('tbody').empty();
-
-    const modelName = element.val();
-    if (modelName === null) {
-        return Promise.resolve();
-    }
-
-    const markers = {
-        'terms': [
-            'audio',
-            'cloze-body',
-            'cloze-prefix',
-            'cloze-suffix',
-            'dictionary',
-            'expression',
-            'furigana',
-            'glossary',
-            'reading',
-            'sentence',
-            'tags',
-            'url'
-        ],
-        'kanji': [
-            'character',
-            'dictionary',
-            'glossary',
-            'kunyomi',
-            'onyomi',
-            'sentence',
-            'tags',
-            'url'
-        ]
-    }[tabId] || {};
-
-    return instAnki().getModelFieldNames(modelName).then(names => {
-        names.forEach(name => {
-            const value = options.anki[tabId].fields[name] || '';
-            const html = Handlebars.templates['model.html']({name, markers, value});
-            container.append($(html));
-        });
-
-        tab.find('.anki-field-value').change(onOptionsChanged);
-        tab.find('.marker-link').click(e => {
-            e.preventDefault();
-            const link = e.target;
-            $(link).closest('.input-group').find('.anki-field-value').val(`{${link.text}}`).trigger('change');
-        });
+function optionsLoad() {
+    return new Promise((resolve, reject) => {
+        chrome.storage.local.get(null, store => resolve(store.options));
+    }).then(optionsStr => {
+        return optionsStr ? JSON.parse(optionsStr) : {};
+    }).catch(error => {
+        return {};
+    }).then(options => {
+        return optionsVersion(options);
     });
 }
 
-function onAnkiModelChanged(e) {
-    if (!e.originalEvent) {
-        return;
-    }
-
-    ankiErrorShow(null);
-    ankiSpinnerShow(true);
-
-    const element = $(this);
-    formRead().then(({optionsNew, optionsOld}) => {
-        const tab = element.closest('.tab-pane');
-        const tabId = tab.attr('id');
-        optionsNew.anki[tabId].fields = {};
-        ankiFieldsPopulate(element, optionsNew).then(() => {
-            optionsSave(optionsNew);
-        }).catch(ankiErrorShow).then(() => ankiSpinnerShow(false));
+function optionsSave(options) {
+    return new Promise((resolve, reject) => {
+        chrome.storage.local.set({options: JSON.stringify(options)}, resolve);
+    }).then(() => {
+        apiOptionsSet(options);
     });
 }
diff --git a/ext/bg/js/request.js b/ext/bg/js/request.js
new file mode 100644
index 00000000..94fd135a
--- /dev/null
+++ b/ext/bg/js/request.js
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2017  Alex Yatskov <alex@foosoft.net>
+ * Author: Alex Yatskov <alex@foosoft.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+function requestJson(url, action, params) {
+    return new Promise((resolve, reject) => {
+        const xhr = new XMLHttpRequest();
+        xhr.overrideMimeType('application/json');
+        xhr.addEventListener('load', () => resolve(xhr.responseText));
+        xhr.addEventListener('error', () => reject('failed to execute network request'));
+        xhr.open(action, url);
+        if (params) {
+            xhr.send(JSON.stringify(params));
+        } else {
+            xhr.send();
+        }
+    }).then(responseText => {
+        try {
+            return JSON.parse(responseText);
+        }
+        catch (e) {
+            return Promise.reject('invalid JSON response');
+        }
+    });
+}
diff --git a/ext/bg/js/search.js b/ext/bg/js/search.js
new file mode 100644
index 00000000..54cda8ec
--- /dev/null
+++ b/ext/bg/js/search.js
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2016-2017  Alex Yatskov <alex@foosoft.net>
+ * Author: Alex Yatskov <alex@foosoft.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+class DisplaySearch extends Display {
+    constructor() {
+        super($('#spinner'), $('#content'));
+
+        this.search = $('#search').click(this.onSearch.bind(this));
+        this.query = $('#query').on('input', this.onSearchInput.bind(this));
+        this.intro = $('#intro');
+
+        window.wanakana.bind(this.query.get(0));
+    }
+
+    onError(error) {
+        window.alert(`Error: ${error}`);
+    }
+
+    onSearchClear() {
+        this.query.focus().select();
+    }
+
+    onSearchInput() {
+        this.search.prop('disabled', this.query.val().length === 0);
+    }
+
+    async onSearch(e) {
+        try {
+            e.preventDefault();
+            this.intro.slideUp();
+            const {length, definitions} = await apiTermsFind(this.query.val());
+            super.termsShow(definitions, await apiOptionsGet());
+        } catch (e) {
+            this.onError(e);
+        }
+    }
+}
+
+window.yomichan_search = new DisplaySearch();
diff --git a/ext/bg/js/settings.js b/ext/bg/js/settings.js
new file mode 100644
index 00000000..7bdd9f84
--- /dev/null
+++ b/ext/bg/js/settings.js
@@ -0,0 +1,432 @@
+/*
+ * Copyright (C) 2016-2017  Alex Yatskov <alex@foosoft.net>
+ * Author: Alex Yatskov <alex@foosoft.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+async function formRead() {
+    const optionsOld = await optionsLoad();
+    const optionsNew = $.extend(true, {}, optionsOld);
+
+    optionsNew.general.showGuide = $('#show-usage-guide').prop('checked');
+    optionsNew.general.audioSource = $('#audio-playback-source').val();
+    optionsNew.general.audioVolume = parseFloat($('#audio-playback-volume').val());
+    optionsNew.general.groupResults = $('#group-terms-results').prop('checked');
+    optionsNew.general.debugInfo = $('#show-debug-info').prop('checked');
+    optionsNew.general.showAdvanced = $('#show-advanced-options').prop('checked');
+    optionsNew.general.maxResults = parseInt($('#max-displayed-results').val(), 10);
+    optionsNew.general.popupWidth = parseInt($('#popup-width').val(), 10);
+    optionsNew.general.popupHeight = parseInt($('#popup-height').val(), 10);
+    optionsNew.general.popupOffset = parseInt($('#popup-offset').val(), 10);
+
+    optionsNew.scanning.middleMouse = $('#middle-mouse-button-scan').prop('checked');
+    optionsNew.scanning.selectText = $('#select-matched-text').prop('checked');
+    optionsNew.scanning.alphanumeric = $('#search-alphanumeric').prop('checked');
+    optionsNew.scanning.delay = parseInt($('#scan-delay').val(), 10);
+    optionsNew.scanning.length = parseInt($('#scan-length').val(), 10);
+    optionsNew.scanning.modifier = $('#scan-modifier-key').val();
+
+    optionsNew.anki.enable = $('#anki-enable').prop('checked');
+    optionsNew.anki.tags = $('#card-tags').val().split(/[,; ]+/);
+    optionsNew.anki.htmlCards = $('#generate-html-cards').prop('checked');
+    optionsNew.anki.sentenceExt = parseInt($('#sentence-detection-extent').val(), 10);
+    optionsNew.anki.server = $('#interface-server').val();
+
+    if (optionsOld.anki.enable && !ankiErrorShown()) {
+        optionsNew.anki.terms.deck = $('#anki-terms-deck').val();
+        optionsNew.anki.terms.model = $('#anki-terms-model').val();
+        optionsNew.anki.terms.fields = ankiFieldsToDict($('#terms .anki-field-value'));
+        optionsNew.anki.kanji.deck = $('#anki-kanji-deck').val();
+        optionsNew.anki.kanji.model = $('#anki-kanji-model').val();
+        optionsNew.anki.kanji.fields = ankiFieldsToDict($('#kanji .anki-field-value'));
+    }
+
+    $('.dict-group').each((index, element) => {
+        const dictionary = $(element);
+        const title = dictionary.data('title');
+        const priority = parseInt(dictionary.find('.dict-priority').val(), 10);
+        const enabled = dictionary.find('.dict-enabled').prop('checked');
+        optionsNew.dictionaries[title] = {priority, enabled};
+    });
+
+    return {optionsNew, optionsOld};
+}
+
+function formUpdateVisibility(options) {
+    const general = $('#anki-general');
+    if (options.anki.enable) {
+        general.show();
+    } else {
+        general.hide();
+    }
+
+    const advanced = $('.options-advanced');
+    if (options.general.showAdvanced) {
+        advanced.show();
+    } else {
+        advanced.hide();
+    }
+
+    const debug = $('#debug');
+    if (options.general.debugInfo) {
+        const text = JSON.stringify(options, null, 4);
+        debug.html(handlebarsEscape(text));
+        debug.show();
+    } else {
+        debug.hide();
+    }
+}
+
+async function onFormOptionsChanged(e) {
+    try {
+        if (!e.originalEvent && !e.isTrigger) {
+            return;
+        }
+
+        const {optionsNew, optionsOld} = await formRead();
+        await optionsSave(optionsNew);
+
+        formUpdateVisibility(optionsNew);
+
+        const ankiUpdated =
+            optionsNew.anki.enable !== optionsOld.anki.enable ||
+            optionsNew.anki.server !== optionsOld.anki.server;
+
+        if (ankiUpdated) {
+            ankiSpinnerShow(true);
+            await ankiDeckAndModelPopulate(optionsNew);
+            ankiErrorShow();
+        }
+    } catch (e) {
+        ankiErrorShow(e);
+    } finally {
+        ankiSpinnerShow(false);
+    }
+}
+
+async function onReady() {
+    const options = await optionsLoad();
+
+    $('#show-usage-guide').prop('checked', options.general.showGuide);
+    $('#audio-playback-source').val(options.general.audioSource);
+    $('#audio-playback-volume').val(options.general.audioVolume);
+    $('#group-terms-results').prop('checked', options.general.groupResults);
+    $('#show-debug-info').prop('checked', options.general.debugInfo);
+    $('#show-advanced-options').prop('checked', options.general.showAdvanced);
+    $('#max-displayed-results').val(options.general.maxResults);
+    $('#popup-width').val(options.general.popupWidth);
+    $('#popup-height').val(options.general.popupHeight);
+    $('#popup-offset').val(options.general.popupOffset);
+
+    $('#middle-mouse-button-scan').prop('checked', options.scanning.middleMouse);
+    $('#select-matched-text').prop('checked', options.scanning.selectText);
+    $('#search-alphanumeric').prop('checked', options.scanning.alphanumeric);
+    $('#scan-delay').val(options.scanning.delay);
+    $('#scan-length').val(options.scanning.length);
+    $('#scan-modifier-key').val(options.scanning.modifier);
+
+    $('#dict-purge').click(utilAsync(onDictionaryPurge));
+    $('#dict-file').change(utilAsync(onDictionaryImport));
+
+    $('#anki-enable').prop('checked', options.anki.enable);
+    $('#card-tags').val(options.anki.tags.join(' '));
+    $('#generate-html-cards').prop('checked', options.anki.htmlCards);
+    $('#sentence-detection-extent').val(options.anki.sentenceExt);
+    $('#interface-server').val(options.anki.server);
+    $('input, select').not('.anki-model').change(utilAsync(onFormOptionsChanged));
+    $('.anki-model').change(utilAsync(onAnkiModelChanged));
+
+    try {
+        await dictionaryGroupsPopulate(options);
+    } catch (e) {
+        dictionaryErrorShow(e);
+    }
+
+    try {
+        await ankiDeckAndModelPopulate(options);
+    } catch (e) {
+        ankiErrorShow(e);
+    }
+
+    formUpdateVisibility(options);
+}
+
+$(document).ready(utilAsync(onReady));
+
+
+/*
+ * Dictionary
+ */
+
+function dictionaryErrorShow(error) {
+    const dialog = $('#dict-error');
+    if (error) {
+        dialog.show().find('span').text(error);
+    } else {
+        dialog.hide();
+    }
+}
+
+function dictionarySpinnerShow(show) {
+    const spinner = $('#dict-spinner');
+    if (show) {
+        spinner.show();
+    } else {
+        spinner.hide();
+    }
+}
+
+function dictionaryGroupsSort() {
+    const dictGroups = $('#dict-groups');
+    const dictGroupChildren = dictGroups.children('.dict-group').sort((ca, cb) => {
+        const pa = parseInt($(ca).find('.dict-priority').val(), 10);
+        const pb = parseInt($(cb).find('.dict-priority').val(), 10);
+        if (pa < pb) {
+            return 1;
+        } else if (pa > pb) {
+            return -1;
+        } else {
+            return 0;
+        }
+    });
+
+    dictGroups.append(dictGroupChildren);
+}
+
+async function dictionaryGroupsPopulate(options) {
+    const dictGroups = $('#dict-groups').empty();
+    const dictWarning = $('#dict-warning').hide();
+
+    const dictRows = await utilDatabaseGetDictionaries();
+    if (dictRows.length === 0) {
+        dictWarning.show();
+    }
+
+    for (const dictRow of dictRowsSort(dictRows, options)) {
+        const dictOptions = options.dictionaries[dictRow.title] || {enabled: false, priority: 0};
+        const dictHtml = handlebarsRender('dictionary.html', {
+            title: dictRow.title,
+            version: dictRow.version,
+            revision: dictRow.revision,
+            priority: dictOptions.priority,
+            enabled: dictOptions.enabled
+        });
+
+        dictGroups.append($(dictHtml));
+    }
+
+    formUpdateVisibility(options);
+
+    $('.dict-enabled, .dict-priority').change(e => {
+        dictionaryGroupsSort();
+        onFormOptionsChanged(e);
+    });
+}
+
+async function onDictionaryPurge(e) {
+    e.preventDefault();
+
+    const dictControls = $('#dict-importer, #dict-groups').hide();
+    const dictProgress = $('#dict-purge-progress').show();
+
+    try {
+        dictionaryErrorShow();
+        dictionarySpinnerShow(true);
+
+        await utilDatabasePurge();
+        const options = await optionsLoad();
+        options.dictionaries = {};
+        await optionsSave(options);
+
+        await dictionaryGroupsPopulate(options);
+    } catch (e) {
+        dictionaryErrorShow(e);
+    } finally {
+        dictionarySpinnerShow(false);
+
+        dictControls.show();
+        dictProgress.hide();
+    }
+}
+
+async function onDictionaryImport(e) {
+    const dictFile = $('#dict-file');
+    const dictControls = $('#dict-importer').hide();
+    const dictProgress = $('#dict-import-progress').show();
+
+    try {
+        dictionaryErrorShow();
+        dictionarySpinnerShow(true);
+
+        const setProgress = percent => dictProgress.find('.progress-bar').css('width', `${percent}%`);
+        const updateProgress = (total, current) => setProgress(current / total * 100.0);
+        setProgress(0.0);
+
+        const options = await optionsLoad();
+        const summary = await utilDatabaseImport(e.target.files[0], updateProgress);
+        options.dictionaries[summary.title] = {enabled: true, priority: 0};
+        await optionsSave(options);
+
+        await dictionaryGroupsPopulate(options);
+    } catch (e) {
+        dictionaryErrorShow(e);
+    } finally {
+        dictionarySpinnerShow(false);
+
+        dictFile.val('');
+        dictControls.show();
+        dictProgress.hide();
+    }
+}
+
+
+/*
+ * Anki
+ */
+
+function ankiSpinnerShow(show) {
+    const spinner = $('#anki-spinner');
+    if (show) {
+        spinner.show();
+    } else {
+        spinner.hide();
+    }
+}
+
+function ankiErrorShow(error) {
+    const dialog = $('#anki-error');
+    if (error) {
+        dialog.show().find('span').text(error);
+    }
+    else {
+        dialog.hide();
+    }
+}
+
+function ankiErrorShown() {
+    return $('#anki-error').is(':visible');
+}
+
+function ankiFieldsToDict(selection) {
+    const result = {};
+    selection.each((index, element) => {
+        result[$(element).data('field')] = $(element).val();
+    });
+
+    return result;
+}
+
+async function ankiDeckAndModelPopulate(options) {
+    const ankiFormat = $('#anki-format').hide();
+    const ankiTermsModel = $('#anki-terms-model').val(options.anki.terms.model);
+    const ankiKanjiModel = $('#anki-kanji-model').val(options.anki.kanji.model);
+
+    $('#anki-terms-deck').val(options.anki.terms.deck);
+    $('#anki-kanji-deck').val(options.anki.kanji.deck);
+
+    const deckNames = await utilAnkiGetDeckNames();
+    const ankiDeck = $('.anki-deck');
+    ankiDeck.find('option').remove();
+    deckNames.sort().forEach(name => ankiDeck.append($('<option/>', {value: name, text: name})));
+
+    const modelNames = await utilAnkiGetModelNames();
+    const ankiModel = $('.anki-model');
+    ankiModel.find('option').remove();
+    modelNames.sort().forEach(name => ankiModel.append($('<option/>', {value: name, text: name})));
+
+    await ankiFieldsPopulate(ankiTermsModel, options);
+    await ankiFieldsPopulate(ankiKanjiModel, options);
+
+    ankiFormat.show();
+}
+
+async function ankiFieldsPopulate(element, options) {
+    const modelName = element.val();
+    if (!modelName) {
+        return;
+    }
+
+    const tab = element.closest('.tab-pane');
+    const tabId = tab.attr('id');
+    const container = tab.find('tbody').empty();
+
+    const markers = {
+        'terms': [
+            'audio',
+            'cloze-body',
+            'cloze-prefix',
+            'cloze-suffix',
+            'dictionary',
+            'expression',
+            'furigana',
+            'glossary',
+            'glossary-brief',
+            'reading',
+            'sentence',
+            'tags',
+            'url'
+        ],
+        'kanji': [
+            'character',
+            'dictionary',
+            'glossary',
+            'kunyomi',
+            'onyomi',
+            'sentence',
+            'tags',
+            'url'
+        ]
+    }[tabId] || {};
+
+    for (const name of await utilAnkiGetModelFieldNames(modelName)) {
+        const value = options.anki[tabId].fields[name] || '';
+        const html = Handlebars.templates['model.html']({name, markers, value});
+        container.append($(html));
+    }
+
+    tab.find('.anki-field-value').change(utilAsync(onFormOptionsChanged));
+    tab.find('.marker-link').click(onAnkiMarkerClicked);
+}
+
+function onAnkiMarkerClicked(e) {
+    e.preventDefault();
+    const link = e.target;
+    $(link).closest('.input-group').find('.anki-field-value').val(`{${link.text}}`).trigger('change');
+}
+
+async function onAnkiModelChanged(e) {
+    try {
+        if (!e.originalEvent) {
+            return;
+        }
+
+        const element = $(this);
+        const tab = element.closest('.tab-pane');
+        const tabId = tab.attr('id');
+
+        const {optionsNew, optionsOld} = await formRead();
+        optionsNew.anki[tabId].fields = {};
+        await optionsSave(optionsNew);
+
+        ankiSpinnerShow(true);
+        await ankiFieldsPopulate(element, optionsNew);
+        ankiErrorShow();
+    } catch (e) {
+        ankiErrorShow(e);
+    } finally {
+        ankiSpinnerShow(false);
+    }
+}
diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js
index f10134ee..7e05015a 100644
--- a/ext/bg/js/templates.js
+++ b/ext/bg/js/templates.js
@@ -3,7 +3,7 @@
 templates['dictionary.html'] = template({"1":function(container,depth0,helpers,partials,data) {
     return "checked";
 },"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
-    var stack1, helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
+    var stack1, helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
 
   return "<div class=\"dict-group well well-sm\" data-title=\""
     + alias4(((helper = (helper = helpers.title || (depth0 != null ? depth0.title : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"title","hash":{},"data":data}) : helper)))
@@ -24,106 +24,114 @@ templates['dictionary.html'] = template({"1":function(container,depth0,helpers,p
 templates['fields.html'] = template({"1":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(2, data, 0),"inverse":container.program(14, data, 0),"data":data})) != null ? stack1 : "");
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(2, data, 0),"inverse":container.program(15, data, 0),"data":data})) != null ? stack1 : "");
 },"2":function(container,depth0,helpers,partials,data) {
-    var stack1, alias1=depth0 != null ? depth0 : {};
+    var stack1, alias1=depth0 != null ? depth0 : (container.nullContext || {});
 
-  return ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.tags : depth0),{"name":"if","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + ((stack1 = helpers["if"].call(alias1,((stack1 = (depth0 != null ? depth0.glossary : depth0)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(7, data, 0),"inverse":container.program(11, data, 0),"data":data})) != null ? stack1 : "");
+  return ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.brief : depth0),{"name":"unless","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers["if"].call(alias1,((stack1 = (depth0 != null ? depth0.glossary : depth0)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(8, data, 0),"inverse":container.program(12, data, 0),"data":data})) != null ? stack1 : "");
 },"3":function(container,depth0,helpers,partials,data) {
     var stack1;
 
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.tags : depth0),{"name":"if","hash":{},"fn":container.program(4, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"4":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
   return "<i>("
-    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.tags : depth0),{"name":"each","hash":{},"fn":container.program(4, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.tags : depth0),{"name":"each","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + ")</i> ";
-},"4":function(container,depth0,helpers,partials,data) {
-    var stack1, helper, alias1=depth0 != null ? depth0 : {};
+},"5":function(container,depth0,helpers,partials,data) {
+    var stack1, helper, alias1=depth0 != null ? depth0 : (container.nullContext || {});
 
   return container.escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(alias1,{"name":"name","hash":{},"data":data}) : helper)))
-    + ((stack1 = helpers.unless.call(alias1,(data && data.last),{"name":"unless","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
-},"5":function(container,depth0,helpers,partials,data) {
+    + ((stack1 = helpers.unless.call(alias1,(data && data.last),{"name":"unless","hash":{},"fn":container.program(6, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"6":function(container,depth0,helpers,partials,data) {
     return ", ";
-},"7":function(container,depth0,helpers,partials,data) {
+},"8":function(container,depth0,helpers,partials,data) {
     var stack1;
 
   return "<ul>"
-    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(8, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(9, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "</ul>";
-},"8":function(container,depth0,helpers,partials,data) {
+},"9":function(container,depth0,helpers,partials,data) {
     var stack1, helper, options, buffer = 
   "<li>";
-  stack1 = ((helper = (helper = helpers.multiLine || (depth0 != null ? depth0.multiLine : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"multiLine","hash":{},"fn":container.program(9, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},options) : helper));
+  stack1 = ((helper = (helper = helpers.multiLine || (depth0 != null ? depth0.multiLine : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"multiLine","hash":{},"fn":container.program(10, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),options) : helper));
   if (!helpers.multiLine) { stack1 = helpers.blockHelperMissing.call(depth0,stack1,options)}
   if (stack1 != null) { buffer += stack1; }
   return buffer + "</li>";
-},"9":function(container,depth0,helpers,partials,data) {
+},"10":function(container,depth0,helpers,partials,data) {
     return container.escapeExpression(container.lambda(depth0, depth0));
-},"11":function(container,depth0,helpers,partials,data) {
+},"12":function(container,depth0,helpers,partials,data) {
     var stack1, helper, options, buffer = "";
 
-  stack1 = ((helper = (helper = helpers.multiLine || (depth0 != null ? depth0.multiLine : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"multiLine","hash":{},"fn":container.program(12, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},options) : helper));
+  stack1 = ((helper = (helper = helpers.multiLine || (depth0 != null ? depth0.multiLine : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"multiLine","hash":{},"fn":container.program(13, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),options) : helper));
   if (!helpers.multiLine) { stack1 = helpers.blockHelperMissing.call(depth0,stack1,options)}
   if (stack1 != null) { buffer += stack1; }
   return buffer;
-},"12":function(container,depth0,helpers,partials,data) {
+},"13":function(container,depth0,helpers,partials,data) {
     var stack1;
 
   return container.escapeExpression(container.lambda(((stack1 = (depth0 != null ? depth0.glossary : depth0)) != null ? stack1["0"] : stack1), depth0));
-},"14":function(container,depth0,helpers,partials,data) {
-    var stack1, alias1=depth0 != null ? depth0 : {};
-
-  return ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.tags : depth0),{"name":"if","hash":{},"fn":container.program(15, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + ((stack1 = helpers["if"].call(alias1,((stack1 = (depth0 != null ? depth0.glossary : depth0)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(17, data, 0),"inverse":container.program(12, data, 0),"data":data})) != null ? stack1 : "");
 },"15":function(container,depth0,helpers,partials,data) {
+    var stack1, alias1=depth0 != null ? depth0 : (container.nullContext || {});
+
+  return ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.brief : depth0),{"name":"unless","hash":{},"fn":container.program(16, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers["if"].call(alias1,((stack1 = (depth0 != null ? depth0.glossary : depth0)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(19, data, 0),"inverse":container.program(13, data, 0),"data":data})) != null ? stack1 : "");
+},"16":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.tags : depth0),{"name":"if","hash":{},"fn":container.program(17, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"17":function(container,depth0,helpers,partials,data) {
     var stack1;
 
   return "("
-    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.tags : depth0),{"name":"each","hash":{},"fn":container.program(4, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.tags : depth0),{"name":"each","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + ") ";
-},"17":function(container,depth0,helpers,partials,data) {
+},"19":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(18, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
-},"18":function(container,depth0,helpers,partials,data) {
+  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(20, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"20":function(container,depth0,helpers,partials,data) {
     var stack1;
 
   return container.escapeExpression(container.lambda(depth0, depth0))
-    + ((stack1 = helpers.unless.call(depth0 != null ? depth0 : {},(data && data.last),{"name":"unless","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
-},"20":function(container,depth0,helpers,partials,data) {
-    return "";
+    + ((stack1 = helpers.unless.call(depth0 != null ? depth0 : (container.nullContext || {}),(data && data.last),{"name":"unless","hash":{},"fn":container.program(6, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
 },"22":function(container,depth0,helpers,partials,data) {
+    return "";
+},"24":function(container,depth0,helpers,partials,data) {
     var stack1;
 
   return container.escapeExpression(container.lambda(((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.character : stack1), depth0));
-},"24":function(container,depth0,helpers,partials,data) {
+},"26":function(container,depth0,helpers,partials,data) {
     var stack1;
 
   return container.escapeExpression(container.lambda(((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.dictionary : stack1), depth0));
-},"26":function(container,depth0,helpers,partials,data) {
+},"28":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.modeTermKana : depth0),{"name":"if","hash":{},"fn":container.program(27, data, 0),"inverse":container.program(30, data, 0),"data":data})) != null ? stack1 : "");
-},"27":function(container,depth0,helpers,partials,data) {
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.modeTermKana : depth0),{"name":"if","hash":{},"fn":container.program(29, data, 0),"inverse":container.program(32, data, 0),"data":data})) != null ? stack1 : "");
+},"29":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.reading : stack1),{"name":"if","hash":{},"fn":container.program(28, data, 0),"inverse":container.program(30, data, 0),"data":data})) != null ? stack1 : "");
-},"28":function(container,depth0,helpers,partials,data) {
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.reading : stack1),{"name":"if","hash":{},"fn":container.program(30, data, 0),"inverse":container.program(32, data, 0),"data":data})) != null ? stack1 : "");
+},"30":function(container,depth0,helpers,partials,data) {
     var stack1;
 
   return container.escapeExpression(container.lambda(((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.reading : stack1), depth0));
-},"30":function(container,depth0,helpers,partials,data) {
+},"32":function(container,depth0,helpers,partials,data) {
     var stack1;
 
   return container.escapeExpression(container.lambda(((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.expression : stack1), depth0));
-},"32":function(container,depth0,helpers,partials,data) {
+},"34":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(33, data, 0),"inverse":container.program(36, data, 0),"data":data})) != null ? stack1 : "");
-},"33":function(container,depth0,helpers,partials,data) {
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(35, data, 0),"inverse":container.program(38, data, 0),"data":data})) != null ? stack1 : "");
+},"35":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.reading : stack1),{"name":"if","hash":{},"fn":container.program(34, data, 0),"inverse":container.program(30, data, 0),"data":data})) != null ? stack1 : "");
-},"34":function(container,depth0,helpers,partials,data) {
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.reading : stack1),{"name":"if","hash":{},"fn":container.program(36, data, 0),"inverse":container.program(32, data, 0),"data":data})) != null ? stack1 : "");
+},"36":function(container,depth0,helpers,partials,data) {
     var stack1, alias1=container.lambda, alias2=container.escapeExpression;
 
   return "<ruby>"
@@ -131,147 +139,151 @@ templates['fields.html'] = template({"1":function(container,depth0,helpers,parti
     + "<rt>"
     + alias2(alias1(((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.reading : stack1), depth0))
     + "</rt></ruby>";
-},"36":function(container,depth0,helpers,partials,data) {
+},"38":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.reading : stack1),{"name":"if","hash":{},"fn":container.program(37, data, 0),"inverse":container.program(30, data, 0),"data":data})) != null ? stack1 : "");
-},"37":function(container,depth0,helpers,partials,data) {
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.reading : stack1),{"name":"if","hash":{},"fn":container.program(39, data, 0),"inverse":container.program(32, data, 0),"data":data})) != null ? stack1 : "");
+},"39":function(container,depth0,helpers,partials,data) {
     var stack1, alias1=container.lambda, alias2=container.escapeExpression;
 
   return alias2(alias1(((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.expression : stack1), depth0))
     + " ["
     + alias2(alias1(((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.reading : stack1), depth0))
     + "]";
-},"39":function(container,depth0,helpers,partials,data,blockParams,depths) {
-    var stack1, alias1=depth0 != null ? depth0 : {};
+},"41":function(container,depth0,helpers,partials,data,blockParams,depths) {
+    var stack1, alias1=depth0 != null ? depth0 : (container.nullContext || {});
 
-  return ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(40, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.modeKanji : depth0),{"name":"if","hash":{},"fn":container.program(42, data, 0, blockParams, depths),"inverse":container.program(51, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "")
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(64, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "");
-},"40":function(container,depth0,helpers,partials,data) {
-    return "<div style=\"text-align: left;\">";
+  return ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(42, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.modeKanji : depth0),{"name":"if","hash":{},"fn":container.program(44, data, 0, blockParams, depths),"inverse":container.program(53, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(66, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "");
 },"42":function(container,depth0,helpers,partials,data) {
+    return "<div style=\"text-align: left;\">";
+},"44":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = ((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.glossary : stack1)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(43, data, 0),"inverse":container.program(49, data, 0),"data":data})) != null ? stack1 : "");
-},"43":function(container,depth0,helpers,partials,data) {
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),((stack1 = ((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.glossary : stack1)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(45, data, 0),"inverse":container.program(51, data, 0),"data":data})) != null ? stack1 : "");
+},"45":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(44, data, 0),"inverse":container.program(47, data, 0),"data":data})) != null ? stack1 : "");
-},"44":function(container,depth0,helpers,partials,data) {
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(46, data, 0),"inverse":container.program(49, data, 0),"data":data})) != null ? stack1 : "");
+},"46":function(container,depth0,helpers,partials,data) {
     var stack1;
 
   return "<ol>"
-    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.glossary : stack1),{"name":"each","hash":{},"fn":container.program(45, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.glossary : stack1),{"name":"each","hash":{},"fn":container.program(47, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "</ol>";
-},"45":function(container,depth0,helpers,partials,data) {
+},"47":function(container,depth0,helpers,partials,data) {
     return "<li>"
     + container.escapeExpression(container.lambda(depth0, depth0))
     + "</li>";
-},"47":function(container,depth0,helpers,partials,data) {
+},"49":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.glossary : stack1),{"name":"each","hash":{},"fn":container.program(18, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
-},"49":function(container,depth0,helpers,partials,data) {
+  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.glossary : stack1),{"name":"each","hash":{},"fn":container.program(20, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"51":function(container,depth0,helpers,partials,data) {
     var stack1;
 
   return container.escapeExpression(container.lambda(((stack1 = ((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.glossary : stack1)) != null ? stack1["0"] : stack1), depth0));
-},"51":function(container,depth0,helpers,partials,data,blockParams,depths) {
+},"53":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.group : depth0),{"name":"if","hash":{},"fn":container.program(52, data, 0, blockParams, depths),"inverse":container.program(62, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "");
-},"52":function(container,depth0,helpers,partials,data,blockParams,depths) {
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.group : depth0),{"name":"if","hash":{},"fn":container.program(54, data, 0, blockParams, depths),"inverse":container.program(64, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "");
+},"54":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = ((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.definitions : stack1)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(53, data, 0, blockParams, depths),"inverse":container.program(60, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "");
-},"53":function(container,depth0,helpers,partials,data,blockParams,depths) {
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),((stack1 = ((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.definitions : stack1)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(55, data, 0, blockParams, depths),"inverse":container.program(62, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "");
+},"55":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(54, data, 0, blockParams, depths),"inverse":container.program(57, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "");
-},"54":function(container,depth0,helpers,partials,data,blockParams,depths) {
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(56, data, 0, blockParams, depths),"inverse":container.program(59, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "");
+},"56":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1;
 
   return "<ol>"
-    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.definitions : stack1),{"name":"each","hash":{},"fn":container.program(55, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.definitions : stack1),{"name":"each","hash":{},"fn":container.program(57, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "</ol>";
-},"55":function(container,depth0,helpers,partials,data,blockParams,depths) {
+},"57":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1;
 
   return "<li>"
-    + ((stack1 = container.invokePartial(partials["glossary-single"],depth0,{"name":"glossary-single","hash":{"html":(depths[1] != null ? depths[1].html : depths[1])},"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "")
+    + ((stack1 = container.invokePartial(partials["glossary-single"],depth0,{"name":"glossary-single","hash":{"brief":(depths[1] != null ? depths[1].brief : depths[1]),"html":(depths[1] != null ? depths[1].html : depths[1])},"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "")
     + "</li>";
-},"57":function(container,depth0,helpers,partials,data,blockParams,depths) {
+},"59":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1;
 
-  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.definitions : stack1),{"name":"each","hash":{},"fn":container.program(58, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "");
-},"58":function(container,depth0,helpers,partials,data,blockParams,depths) {
+  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.definitions : stack1),{"name":"each","hash":{},"fn":container.program(60, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"60":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1;
 
   return " * "
-    + ((stack1 = container.invokePartial(partials["glossary-single"],depth0,{"name":"glossary-single","hash":{"html":(depths[1] != null ? depths[1].html : depths[1])},"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
-},"60":function(container,depth0,helpers,partials,data) {
-    var stack1;
-
-  return ((stack1 = container.invokePartial(partials["glossary-single"],((stack1 = ((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.definitions : stack1)) != null ? stack1["0"] : stack1),{"name":"glossary-single","hash":{"html":(depth0 != null ? depth0.html : depth0)},"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
+    + ((stack1 = container.invokePartial(partials["glossary-single"],depth0,{"name":"glossary-single","hash":{"brief":(depths[1] != null ? depths[1].brief : depths[1]),"html":(depths[1] != null ? depths[1].html : depths[1])},"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
 },"62":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = container.invokePartial(partials["glossary-single"],(depth0 != null ? depth0.definition : depth0),{"name":"glossary-single","hash":{"html":(depth0 != null ? depth0.html : depth0)},"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
+  return ((stack1 = container.invokePartial(partials["glossary-single"],((stack1 = ((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.definitions : stack1)) != null ? stack1["0"] : stack1),{"name":"glossary-single","hash":{"brief":(depth0 != null ? depth0.brief : depth0),"html":(depth0 != null ? depth0.html : depth0)},"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
 },"64":function(container,depth0,helpers,partials,data) {
-    return "</div>";
-},"66":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.kunyomi : stack1),{"name":"each","hash":{},"fn":container.program(18, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+  return ((stack1 = container.invokePartial(partials["glossary-single"],(depth0 != null ? depth0.definition : depth0),{"name":"glossary-single","hash":{"brief":(depth0 != null ? depth0.brief : depth0),"html":(depth0 != null ? depth0.html : depth0)},"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
+},"66":function(container,depth0,helpers,partials,data) {
+    return "</div>";
 },"68":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.onyomi : stack1),{"name":"each","hash":{},"fn":container.program(18, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+  return ((stack1 = container.invokePartial(partials.glossary,depth0,{"name":"glossary","hash":{"brief":true},"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
 },"70":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers.unless.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.modeTermKana : depth0),{"name":"unless","hash":{},"fn":container.program(28, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.kunyomi : stack1),{"name":"each","hash":{},"fn":container.program(20, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
 },"72":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.cloze : stack1),{"name":"if","hash":{},"fn":container.program(73, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
-},"73":function(container,depth0,helpers,partials,data) {
+  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.onyomi : stack1),{"name":"each","hash":{},"fn":container.program(20, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"74":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return ((stack1 = helpers.unless.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.modeTermKana : depth0),{"name":"unless","hash":{},"fn":container.program(30, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"76":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.cloze : stack1),{"name":"if","hash":{},"fn":container.program(77, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"77":function(container,depth0,helpers,partials,data) {
     var stack1;
 
   return container.escapeExpression(container.lambda(((stack1 = ((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.cloze : stack1)) != null ? stack1.sentence : stack1), depth0));
-},"75":function(container,depth0,helpers,partials,data) {
+},"79":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.cloze : stack1),{"name":"if","hash":{},"fn":container.program(76, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
-},"76":function(container,depth0,helpers,partials,data) {
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.cloze : stack1),{"name":"if","hash":{},"fn":container.program(80, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"80":function(container,depth0,helpers,partials,data) {
     var stack1;
 
   return container.escapeExpression(container.lambda(((stack1 = ((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.cloze : stack1)) != null ? stack1.prefix : stack1), depth0));
-},"78":function(container,depth0,helpers,partials,data) {
+},"82":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.cloze : stack1),{"name":"if","hash":{},"fn":container.program(79, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
-},"79":function(container,depth0,helpers,partials,data) {
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.cloze : stack1),{"name":"if","hash":{},"fn":container.program(83, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"83":function(container,depth0,helpers,partials,data) {
     var stack1;
 
   return container.escapeExpression(container.lambda(((stack1 = ((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.cloze : stack1)) != null ? stack1.body : stack1), depth0));
-},"81":function(container,depth0,helpers,partials,data) {
+},"85":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.cloze : stack1),{"name":"if","hash":{},"fn":container.program(82, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
-},"82":function(container,depth0,helpers,partials,data) {
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.cloze : stack1),{"name":"if","hash":{},"fn":container.program(86, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"86":function(container,depth0,helpers,partials,data) {
     var stack1;
 
   return container.escapeExpression(container.lambda(((stack1 = ((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.cloze : stack1)) != null ? stack1.suffix : stack1), depth0));
-},"84":function(container,depth0,helpers,partials,data) {
+},"88":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.tags : stack1),{"name":"each","hash":{},"fn":container.program(4, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
-},"86":function(container,depth0,helpers,partials,data) {
+  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.tags : stack1),{"name":"each","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"90":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(87, data, 0),"inverse":container.program(89, data, 0),"data":data})) != null ? stack1 : "");
-},"87":function(container,depth0,helpers,partials,data) {
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(91, data, 0),"inverse":container.program(93, data, 0),"data":data})) != null ? stack1 : "");
+},"91":function(container,depth0,helpers,partials,data) {
     var stack1, alias1=container.lambda, alias2=container.escapeExpression;
 
   return "<a href=\""
@@ -279,46 +291,47 @@ templates['fields.html'] = template({"1":function(container,depth0,helpers,parti
     + "\">"
     + alias2(alias1(((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.url : stack1), depth0))
     + "</a>";
-},"89":function(container,depth0,helpers,partials,data) {
+},"93":function(container,depth0,helpers,partials,data) {
     var stack1;
 
   return container.escapeExpression(container.lambda(((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.url : stack1), depth0));
 },"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1;
 
-  return "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
-    + ((stack1 = container.invokePartial(helpers.lookup.call(depth0 != null ? depth0 : {},depth0,"marker",{"name":"lookup","hash":{},"data":data}),depth0,{"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
+  return "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
+    + ((stack1 = container.invokePartial(helpers.lookup.call(depth0 != null ? depth0 : (container.nullContext || {}),depth0,"marker",{"name":"lookup","hash":{},"data":data}),depth0,{"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
 },"main_d":  function(fn, props, container, depth0, data, blockParams, depths) {
 
   var decorators = container.decorators;
 
   fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(1, data, 0, blockParams, depths),"inverse":container.noop,"args":["glossary-single"],"data":data}) || fn;
-  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(20, data, 0, blockParams, depths),"inverse":container.noop,"args":["audio"],"data":data}) || fn;
-  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(22, data, 0, blockParams, depths),"inverse":container.noop,"args":["character"],"data":data}) || fn;
-  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(24, data, 0, blockParams, depths),"inverse":container.noop,"args":["dictionary"],"data":data}) || fn;
-  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(26, data, 0, blockParams, depths),"inverse":container.noop,"args":["expression"],"data":data}) || fn;
-  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(32, data, 0, blockParams, depths),"inverse":container.noop,"args":["furigana"],"data":data}) || fn;
-  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(39, data, 0, blockParams, depths),"inverse":container.noop,"args":["glossary"],"data":data}) || fn;
-  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(66, data, 0, blockParams, depths),"inverse":container.noop,"args":["kunyomi"],"data":data}) || fn;
-  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(68, data, 0, blockParams, depths),"inverse":container.noop,"args":["onyomi"],"data":data}) || fn;
-  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(70, data, 0, blockParams, depths),"inverse":container.noop,"args":["reading"],"data":data}) || fn;
-  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(72, data, 0, blockParams, depths),"inverse":container.noop,"args":["sentence"],"data":data}) || fn;
-  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(75, data, 0, blockParams, depths),"inverse":container.noop,"args":["cloze-prefix"],"data":data}) || fn;
-  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(78, data, 0, blockParams, depths),"inverse":container.noop,"args":["cloze-body"],"data":data}) || fn;
-  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(81, data, 0, blockParams, depths),"inverse":container.noop,"args":["cloze-suffix"],"data":data}) || fn;
-  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(84, data, 0, blockParams, depths),"inverse":container.noop,"args":["tags"],"data":data}) || fn;
-  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(86, data, 0, blockParams, depths),"inverse":container.noop,"args":["url"],"data":data}) || fn;
+  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(22, data, 0, blockParams, depths),"inverse":container.noop,"args":["audio"],"data":data}) || fn;
+  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(24, data, 0, blockParams, depths),"inverse":container.noop,"args":["character"],"data":data}) || fn;
+  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(26, data, 0, blockParams, depths),"inverse":container.noop,"args":["dictionary"],"data":data}) || fn;
+  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(28, data, 0, blockParams, depths),"inverse":container.noop,"args":["expression"],"data":data}) || fn;
+  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(34, data, 0, blockParams, depths),"inverse":container.noop,"args":["furigana"],"data":data}) || fn;
+  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(41, data, 0, blockParams, depths),"inverse":container.noop,"args":["glossary"],"data":data}) || fn;
+  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(68, data, 0, blockParams, depths),"inverse":container.noop,"args":["glossary-brief"],"data":data}) || fn;
+  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(70, data, 0, blockParams, depths),"inverse":container.noop,"args":["kunyomi"],"data":data}) || fn;
+  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(72, data, 0, blockParams, depths),"inverse":container.noop,"args":["onyomi"],"data":data}) || fn;
+  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(74, data, 0, blockParams, depths),"inverse":container.noop,"args":["reading"],"data":data}) || fn;
+  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(76, data, 0, blockParams, depths),"inverse":container.noop,"args":["sentence"],"data":data}) || fn;
+  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(79, data, 0, blockParams, depths),"inverse":container.noop,"args":["cloze-prefix"],"data":data}) || fn;
+  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(82, data, 0, blockParams, depths),"inverse":container.noop,"args":["cloze-body"],"data":data}) || fn;
+  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(85, data, 0, blockParams, depths),"inverse":container.noop,"args":["cloze-suffix"],"data":data}) || fn;
+  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(88, data, 0, blockParams, depths),"inverse":container.noop,"args":["tags"],"data":data}) || fn;
+  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(90, data, 0, blockParams, depths),"inverse":container.noop,"args":["url"],"data":data}) || fn;
   return fn;
   }
 
 ,"useDecorators":true,"usePartial":true,"useData":true,"useDepths":true});
 templates['kanji.html'] = template({"1":function(container,depth0,helpers,partials,data) {
-    var stack1, helper, alias1=depth0 != null ? depth0 : {};
+    var stack1, helper, alias1=depth0 != null ? depth0 : (container.nullContext || {});
 
-  return "<div class=\"entry\" data-type=\"kanji\">\n    <div class=\"actions\">\n        <img src=\"/mixed/img/entry-current.png\" class=\"current\" title=\"Current entry (Alt + Up/Down/Home/End/PgUp/PgDn)\" alt>\n"
+  return "<div class=\"entry\" data-type=\"kanji\">\n    <div class=\"actions\">\n"
     + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.addable : depth0),{"name":"if","hash":{},"fn":container.program(2, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.source : depth0),{"name":"if","hash":{},"fn":container.program(4, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "    </div>\n\n    <div class=\"glyph\">"
+    + "        <img src=\"/mixed/img/entry-current.png\" class=\"current\" title=\"Current entry (Alt + Up/Down/Home/End/PgUp/PgDn)\" alt>\n    </div>\n\n    <div class=\"glyph\">"
     + container.escapeExpression(((helper = (helper = helpers.character || (depth0 != null ? depth0.character : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(alias1,{"name":"character","hash":{},"data":data}) : helper)))
     + "</div>\n\n    <div class=\"reading\">\n        <table>\n            <tr>\n                <th>Kunyomi:</th>\n                <td>\n"
     + ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.kunyomi : depth0),{"name":"each","hash":{},"fn":container.program(6, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
@@ -332,7 +345,7 @@ templates['kanji.html'] = template({"1":function(container,depth0,helpers,partia
     + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.debug : depth0),{"name":"if","hash":{},"fn":container.program(18, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "</div>\n";
 },"2":function(container,depth0,helpers,partials,data) {
-    return "        <a href=\"#\" class=\"action-add-note pending disabled\" data-mode=\"kanji\"><img src=\"/mixed/img/add-kanji.png\" title=\"Add Kanji (Alt + K)\" alt></a>\n";
+    return "        <a href=\"#\" class=\"action-view-note pending disabled\"><img src=\"/mixed/img/view-note.png\" title=\"View added note (Alt + V)\" alt></a>\n        <a href=\"#\" class=\"action-add-note pending disabled\" data-mode=\"kanji\"><img src=\"/mixed/img/add-kanji.png\" title=\"Add Kanji (Alt + K)\" alt></a>\n";
 },"4":function(container,depth0,helpers,partials,data) {
     return "        <a href=\"#\" class=\"source-term\"><img src=\"/mixed/img/source-term.png\" title=\"Source term (Alt + B)\" alt></a>\n";
 },"6":function(container,depth0,helpers,partials,data) {
@@ -340,12 +353,12 @@ templates['kanji.html'] = template({"1":function(container,depth0,helpers,partia
 
   return "                    "
     + container.escapeExpression(container.lambda(depth0, depth0))
-    + ((stack1 = helpers.unless.call(depth0 != null ? depth0 : {},(data && data.last),{"name":"unless","hash":{},"fn":container.program(7, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers.unless.call(depth0 != null ? depth0 : (container.nullContext || {}),(data && data.last),{"name":"unless","hash":{},"fn":container.program(7, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "\n";
 },"7":function(container,depth0,helpers,partials,data) {
     return ", ";
 },"9":function(container,depth0,helpers,partials,data) {
-    var helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
+    var helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
 
   return "        <span class=\"label label-default tag-"
     + alias4(((helper = (helper = helpers.category || (depth0 != null ? depth0.category : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"category","hash":{},"data":data}) : helper)))
@@ -358,12 +371,12 @@ templates['kanji.html'] = template({"1":function(container,depth0,helpers,partia
     var stack1;
 
   return "        <ol>\n"
-    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(12, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(12, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "        </ol>\n";
 },"12":function(container,depth0,helpers,partials,data) {
     var stack1, helper, options, buffer = 
   "            <li><span class=\"glossary-item\">";
-  stack1 = ((helper = (helper = helpers.multiLine || (depth0 != null ? depth0.multiLine : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"multiLine","hash":{},"fn":container.program(13, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},options) : helper));
+  stack1 = ((helper = (helper = helpers.multiLine || (depth0 != null ? depth0.multiLine : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"multiLine","hash":{},"fn":container.program(13, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),options) : helper));
   if (!helpers.multiLine) { stack1 = helpers.blockHelperMissing.call(depth0,stack1,options)}
   if (stack1 != null) { buffer += stack1; }
   return buffer + "</span></li>\n";
@@ -372,7 +385,7 @@ templates['kanji.html'] = template({"1":function(container,depth0,helpers,partia
 },"15":function(container,depth0,helpers,partials,data) {
     var stack1, helper, options, buffer = 
   "        <div class=\"glossary-item\">";
-  stack1 = ((helper = (helper = helpers.multiLine || (depth0 != null ? depth0.multiLine : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"multiLine","hash":{},"fn":container.program(16, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},options) : helper));
+  stack1 = ((helper = (helper = helpers.multiLine || (depth0 != null ? depth0.multiLine : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"multiLine","hash":{},"fn":container.program(16, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),options) : helper));
   if (!helpers.multiLine) { stack1 = helpers.blockHelperMissing.call(depth0,stack1,options)}
   if (stack1 != null) { buffer += stack1; }
   return buffer + "</div>\n";
@@ -383,7 +396,7 @@ templates['kanji.html'] = template({"1":function(container,depth0,helpers,partia
 },"18":function(container,depth0,helpers,partials,data) {
     var stack1, helper, options, buffer = 
   "    <pre>";
-  stack1 = ((helper = (helper = helpers.dumpObject || (depth0 != null ? depth0.dumpObject : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"dumpObject","hash":{},"fn":container.program(19, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},options) : helper));
+  stack1 = ((helper = (helper = helpers.dumpObject || (depth0 != null ? depth0.dumpObject : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"dumpObject","hash":{},"fn":container.program(19, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),options) : helper));
   if (!helpers.dumpObject) { stack1 = helpers.blockHelperMissing.call(depth0,stack1,options)}
   if (stack1 != null) { buffer += stack1; }
   return buffer + "</pre>\n";
@@ -394,11 +407,11 @@ templates['kanji.html'] = template({"1":function(container,depth0,helpers,partia
 },"21":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1;
 
-  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.definitions : depth0),{"name":"each","hash":{},"fn":container.program(22, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.definitions : depth0),{"name":"each","hash":{},"fn":container.program(22, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "");
 },"22":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1;
 
-  return ((stack1 = helpers.unless.call(depth0 != null ? depth0 : {},(data && data.first),{"name":"unless","hash":{},"fn":container.program(23, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+  return ((stack1 = helpers.unless.call(depth0 != null ? depth0 : (container.nullContext || {}),(data && data.first),{"name":"unless","hash":{},"fn":container.program(23, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "\n"
     + ((stack1 = container.invokePartial(partials.kanji,depth0,{"name":"kanji","hash":{"root":(depths[1] != null ? depths[1].root : depths[1]),"source":(depths[1] != null ? depths[1].source : depths[1]),"addable":(depths[1] != null ? depths[1].addable : depths[1]),"debug":(depths[1] != null ? depths[1].debug : depths[1])},"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
 },"23":function(container,depth0,helpers,partials,data) {
@@ -409,7 +422,7 @@ templates['kanji.html'] = template({"1":function(container,depth0,helpers,partia
     var stack1;
 
   return "\n"
-    + ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.definitions : depth0),{"name":"if","hash":{},"fn":container.program(21, data, 0, blockParams, depths),"inverse":container.program(25, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "");
+    + ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.definitions : depth0),{"name":"if","hash":{},"fn":container.program(21, data, 0, blockParams, depths),"inverse":container.program(25, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "");
 },"main_d":  function(fn, props, container, depth0, data, blockParams, depths) {
 
   var decorators = container.decorators;
@@ -424,7 +437,7 @@ templates['model.html'] = template({"1":function(container,depth0,helpers,partia
     + container.escapeExpression(container.lambda(depth0, depth0))
     + "</a></li>\n";
 },"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
-    var stack1, helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
+    var stack1, helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
 
   return "<tr>\n    <td class=\"col-sm-2\">"
     + alias4(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"name","hash":{},"data":data}) : helper)))
@@ -437,7 +450,7 @@ templates['model.html'] = template({"1":function(container,depth0,helpers,partia
     + "                </ul>\n            </div>\n        </div>\n    </td>\n</tr>\n";
 },"useData":true});
 templates['terms.html'] = template({"1":function(container,depth0,helpers,partials,data) {
-    var stack1, alias1=depth0 != null ? depth0 : {};
+    var stack1, alias1=depth0 != null ? depth0 : (container.nullContext || {});
 
   return ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.tags : depth0),{"name":"if","hash":{},"fn":container.program(2, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + ((stack1 = helpers["if"].call(alias1,((stack1 = (depth0 != null ? depth0.glossary : depth0)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(5, data, 0),"inverse":container.program(9, data, 0),"data":data})) != null ? stack1 : "");
@@ -445,10 +458,10 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
     var stack1;
 
   return "<div>\n"
-    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.tags : depth0),{"name":"each","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.tags : depth0),{"name":"each","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "</div>\n";
 },"3":function(container,depth0,helpers,partials,data) {
-    var helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
+    var helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
 
   return "    <span class=\"label label-default tag-"
     + alias4(((helper = (helper = helpers.category || (depth0 != null ? depth0.category : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"category","hash":{},"data":data}) : helper)))
@@ -461,12 +474,12 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
     var stack1;
 
   return "<ul>\n"
-    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(6, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(6, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "</ul>\n";
 },"6":function(container,depth0,helpers,partials,data) {
     var stack1, helper, options, buffer = 
   "    <li><span class=\"glossary-item\">";
-  stack1 = ((helper = (helper = helpers.multiLine || (depth0 != null ? depth0.multiLine : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"multiLine","hash":{},"fn":container.program(7, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},options) : helper));
+  stack1 = ((helper = (helper = helpers.multiLine || (depth0 != null ? depth0.multiLine : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"multiLine","hash":{},"fn":container.program(7, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),options) : helper));
   if (!helpers.multiLine) { stack1 = helpers.blockHelperMissing.call(depth0,stack1,options)}
   if (stack1 != null) { buffer += stack1; }
   return buffer + "</span></li>\n";
@@ -475,7 +488,7 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
 },"9":function(container,depth0,helpers,partials,data) {
     var stack1, helper, options, buffer = 
   "<div class=\"glossary-item\">";
-  stack1 = ((helper = (helper = helpers.multiLine || (depth0 != null ? depth0.multiLine : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"multiLine","hash":{},"fn":container.program(10, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},options) : helper));
+  stack1 = ((helper = (helper = helpers.multiLine || (depth0 != null ? depth0.multiLine : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"multiLine","hash":{},"fn":container.program(10, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),options) : helper));
   if (!helpers.multiLine) { stack1 = helpers.blockHelperMissing.call(depth0,stack1,options)}
   if (stack1 != null) { buffer += stack1; }
   return buffer + "</div>\n";
@@ -484,12 +497,12 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
 
   return container.escapeExpression(container.lambda(((stack1 = (depth0 != null ? depth0.glossary : depth0)) != null ? stack1["0"] : stack1), depth0));
 },"12":function(container,depth0,helpers,partials,data) {
-    var stack1, alias1=depth0 != null ? depth0 : {};
+    var stack1, alias1=depth0 != null ? depth0 : (container.nullContext || {});
 
-  return "<div class=\"entry\" data-type=\"term\">\n    <div class=\"actions\">\n        <img src=\"/mixed/img/entry-current.png\" class=\"current\" title=\"Current entry (Alt + Up/Down/Home/End/PgUp/PgDn)\" alt>\n"
+  return "<div class=\"entry\" data-type=\"term\">\n    <div class=\"actions\">\n"
     + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.addable : depth0),{"name":"if","hash":{},"fn":container.program(13, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.playback : depth0),{"name":"if","hash":{},"fn":container.program(15, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "    </div>\n\n"
+    + "        <img src=\"/mixed/img/entry-current.png\" class=\"current\" title=\"Current entry (Alt + Up/Down/Home/End/PgUp/PgDn)\" alt>\n    </div>\n\n"
     + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.reading : depth0),{"name":"if","hash":{},"fn":container.program(17, data, 0),"inverse":container.program(20, data, 0),"data":data})) != null ? stack1 : "")
     + "\n"
     + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.reasons : depth0),{"name":"if","hash":{},"fn":container.program(22, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
@@ -499,11 +512,11 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
     + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.debug : depth0),{"name":"if","hash":{},"fn":container.program(34, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "</div>\n";
 },"13":function(container,depth0,helpers,partials,data) {
-    return "        <a href=\"#\" class=\"action-add-note pending disabled\" data-mode=\"term-kanji\"><img src=\"/mixed/img/add-term-kanji.png\" title=\"Add expression (Alt + E)\" alt></a>\n        <a href=\"#\" class=\"action-add-note pending disabled\" data-mode=\"term-kana\"><img src=\"/mixed/img/add-term-kana.png\" title=\"Add reading (Alt + R)\" alt></a>\n";
+    return "        <a href=\"#\" class=\"action-view-note pending disabled\"><img src=\"/mixed/img/view-note.png\" title=\"View added note (Alt + V)\" alt></a>\n        <a href=\"#\" class=\"action-add-note pending disabled\" data-mode=\"term-kanji\"><img src=\"/mixed/img/add-term-kanji.png\" title=\"Add expression (Alt + E)\" alt></a>\n        <a href=\"#\" class=\"action-add-note pending disabled\" data-mode=\"term-kana\"><img src=\"/mixed/img/add-term-kana.png\" title=\"Add reading (Alt + R)\" alt></a>\n";
 },"15":function(container,depth0,helpers,partials,data) {
     return "        <a href=\"#\" class=\"action-play-audio\"><img src=\"/mixed/img/play-audio.png\" title=\"Play audio (Alt + P)\" alt></a>\n";
 },"17":function(container,depth0,helpers,partials,data) {
-    var stack1, helper, options, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", buffer = 
+    var stack1, helper, options, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", buffer = 
   "    <div class=\"expression\"><ruby>";
   stack1 = ((helper = (helper = helpers.kanjiLinks || (depth0 != null ? depth0.kanjiLinks : depth0)) != null ? helper : alias2),(options={"name":"kanjiLinks","hash":{},"fn":container.program(18, data, 0),"inverse":container.noop,"data":data}),(typeof helper === alias3 ? helper.call(alias1,options) : helper));
   if (!helpers.kanjiLinks) { stack1 = helpers.blockHelperMissing.call(depth0,stack1,options)}
@@ -514,11 +527,11 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
 },"18":function(container,depth0,helpers,partials,data) {
     var helper;
 
-  return container.escapeExpression(((helper = (helper = helpers.expression || (depth0 != null ? depth0.expression : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},{"name":"expression","hash":{},"data":data}) : helper)));
+  return container.escapeExpression(((helper = (helper = helpers.expression || (depth0 != null ? depth0.expression : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),{"name":"expression","hash":{},"data":data}) : helper)));
 },"20":function(container,depth0,helpers,partials,data) {
     var stack1, helper, options, buffer = 
   "    <div class=\"expression\">";
-  stack1 = ((helper = (helper = helpers.kanjiLinks || (depth0 != null ? depth0.kanjiLinks : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"kanjiLinks","hash":{},"fn":container.program(18, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},options) : helper));
+  stack1 = ((helper = (helper = helpers.kanjiLinks || (depth0 != null ? depth0.kanjiLinks : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"kanjiLinks","hash":{},"fn":container.program(18, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),options) : helper));
   if (!helpers.kanjiLinks) { stack1 = helpers.blockHelperMissing.call(depth0,stack1,options)}
   if (stack1 != null) { buffer += stack1; }
   return buffer + "</div>\n";
@@ -526,7 +539,7 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
     var stack1;
 
   return "    <div class=\"reasons\">\n"
-    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.reasons : depth0),{"name":"each","hash":{},"fn":container.program(23, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.reasons : depth0),{"name":"each","hash":{},"fn":container.program(23, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "    </div>\n";
 },"23":function(container,depth0,helpers,partials,data) {
     var stack1;
@@ -534,19 +547,19 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
   return "        <span class=\"reasons\">"
     + container.escapeExpression(container.lambda(depth0, depth0))
     + "</span> "
-    + ((stack1 = helpers.unless.call(depth0 != null ? depth0 : {},(data && data.last),{"name":"unless","hash":{},"fn":container.program(24, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers.unless.call(depth0 != null ? depth0 : (container.nullContext || {}),(data && data.last),{"name":"unless","hash":{},"fn":container.program(24, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "\n";
 },"24":function(container,depth0,helpers,partials,data) {
     return "&laquo;";
 },"26":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definitions : depth0)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(27, data, 0),"inverse":container.program(30, data, 0),"data":data})) != null ? stack1 : "");
+  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),((stack1 = (depth0 != null ? depth0.definitions : depth0)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(27, data, 0),"inverse":container.program(30, data, 0),"data":data})) != null ? stack1 : "");
 },"27":function(container,depth0,helpers,partials,data) {
     var stack1;
 
   return "        <ol>\n"
-    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.definitions : depth0),{"name":"each","hash":{},"fn":container.program(28, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.definitions : depth0),{"name":"each","hash":{},"fn":container.program(28, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "        </ol>\n";
 },"28":function(container,depth0,helpers,partials,data) {
     var stack1;
@@ -565,7 +578,7 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
 },"34":function(container,depth0,helpers,partials,data) {
     var stack1, helper, options, buffer = 
   "    <pre>";
-  stack1 = ((helper = (helper = helpers.dumpObject || (depth0 != null ? depth0.dumpObject : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"dumpObject","hash":{},"fn":container.program(35, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},options) : helper));
+  stack1 = ((helper = (helper = helpers.dumpObject || (depth0 != null ? depth0.dumpObject : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"dumpObject","hash":{},"fn":container.program(35, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),options) : helper));
   if (!helpers.dumpObject) { stack1 = helpers.blockHelperMissing.call(depth0,stack1,options)}
   if (stack1 != null) { buffer += stack1; }
   return buffer + "</pre>\n";
@@ -576,11 +589,11 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
 },"37":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1;
 
-  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.definitions : depth0),{"name":"each","hash":{},"fn":container.program(38, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.definitions : depth0),{"name":"each","hash":{},"fn":container.program(38, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "");
 },"38":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1;
 
-  return ((stack1 = helpers.unless.call(depth0 != null ? depth0 : {},(data && data.first),{"name":"unless","hash":{},"fn":container.program(39, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+  return ((stack1 = helpers.unless.call(depth0 != null ? depth0 : (container.nullContext || {}),(data && data.first),{"name":"unless","hash":{},"fn":container.program(39, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "\n"
     + ((stack1 = container.invokePartial(partials.term,depth0,{"name":"term","hash":{"playback":(depths[1] != null ? depths[1].playback : depths[1]),"addable":(depths[1] != null ? depths[1].addable : depths[1]),"grouped":(depths[1] != null ? depths[1].grouped : depths[1]),"debug":(depths[1] != null ? depths[1].debug : depths[1])},"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
 },"39":function(container,depth0,helpers,partials,data) {
@@ -591,7 +604,7 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
     var stack1;
 
   return "\n\n"
-    + ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.definitions : depth0),{"name":"if","hash":{},"fn":container.program(37, data, 0, blockParams, depths),"inverse":container.program(41, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "");
+    + ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.definitions : depth0),{"name":"if","hash":{},"fn":container.program(37, data, 0, blockParams, depths),"inverse":container.program(41, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "");
 },"main_d":  function(fn, props, container, depth0, data, blockParams, depths) {
 
   var decorators = container.decorators;
diff --git a/ext/bg/js/translator.js b/ext/bg/js/translator.js
index 8d65a0cd..1be485c7 100644
--- a/ext/bg/js/translator.js
+++ b/ext/bg/js/translator.js
@@ -19,135 +19,106 @@
 
 class Translator {
     constructor() {
-        this.loaded = false;
-        this.ruleMeta = null;
-        this.database = new Database();
-        this.deinflector = new Deinflector();
+        this.database = null;
+        this.deinflector = null;
     }
 
-    prepare() {
-        if (this.loaded) {
-            return Promise.resolve();
+    async prepare() {
+        if (!this.database) {
+            this.database = new Database();
+            await this.database.prepare();
         }
 
-        const promises = [
-            jsonLoadInt('/bg/lang/deinflect.json'),
-            this.database.prepare()
-        ];
-
-        return Promise.all(promises).then(([reasons]) => {
-            this.deinflector.setReasons(reasons);
-            this.loaded = true;
-        });
+        if (!this.deinflector) {
+            const url = chrome.extension.getURL('/bg/lang/deinflect.json');
+            const reasons = await requestJson(url, 'GET');
+            this.deinflector = new Deinflector(reasons);
+        }
     }
 
-    findTerms(text, dictionaries, alphanumeric) {
-        const titles = Object.keys(dictionaries);
-        const cache = {};
+    async findTermsGrouped(text, dictionaries, alphanumeric) {
+        const {length, definitions} = await this.findTerms(text, dictionaries, alphanumeric);
+        return {length, definitions: dictTermsGroup(definitions, dictionaries)};
+    }
 
+    async findTerms(text, dictionaries, alphanumeric) {
         if (!alphanumeric && text.length > 0) {
             const c = text[0];
             if (!jpIsKana(c) && !jpIsKanji(c)) {
-                return Promise.resolve({length: 0, definitions: []});
+                return {length: 0, definitions: []};
             }
         }
 
-        return this.findTermsDeinflected(text, titles, cache).then(deinfLiteral => {
-            const textHiragana = wanakana._katakanaToHiragana(text);
-            if (text === textHiragana) {
-                return deinfLiteral;
-            } else {
-                return this.findTermsDeinflected(textHiragana, titles, cache).then(deinfHiragana => deinfLiteral.concat(deinfHiragana));
-            }
-        }).then(deinflections => {
-            let definitions = [];
-            for (const deinflection of deinflections) {
-                for (const definition of deinflection.definitions) {
-                    const tags = definition.tags.map(tag => dictTagBuild(tag, definition.tagMeta));
-                    tags.push(dictTagBuildSource(definition.dictionary));
-                    definitions.push({
-                        source: deinflection.source,
-                        reasons: deinflection.reasons,
-                        score: definition.score,
-                        id: definition.id,
-                        dictionary: definition.dictionary,
-                        expression: definition.expression,
-                        reading: definition.reading,
-                        glossary: definition.glossary,
-                        tags: dictTagsSort(tags)
-                    });
-                }
-            }
-
-            definitions = dictTermsUndupe(definitions);
-            definitions = dictTermsSort(definitions, dictionaries);
-
-            let length = 0;
-            for (const definition of definitions) {
-                length = Math.max(length, definition.source.length);
-            }
-
-            return {length, definitions};
-        });
-    }
-
-    findTermsGrouped(text, dictionaries, alphanumeric) {
-        return this.findTerms(text, dictionaries, alphanumeric).then(({length, definitions}) => {
-            return {length, definitions: dictTermsGroup(definitions, dictionaries)};
-        });
-    }
-
-    findKanji(text, dictionaries) {
+        const cache = {};
         const titles = Object.keys(dictionaries);
-        const processed = {};
-        const promises = [];
-
-        for (const c of text) {
-            if (!processed[c]) {
-                promises.push(this.database.findKanji(c, titles));
-                processed[c] = true;
-            }
+        let deinflections = await this.findTermsDeinflected(text, titles, cache);
+        const textHiragana = jpKatakanaToHiragana(text);
+        if (text !== textHiragana) {
+            deinflections = deinflections.concat(await this.findTermsDeinflected(textHiragana, titles, cache));
         }
 
-        return Promise.all(promises).then(defSets => {
-            const definitions = defSets.reduce((a, b) => a.concat(b), []);
-            for (const definition of definitions) {
+        let definitions = [];
+        for (const deinflection of deinflections) {
+            for (const definition of deinflection.definitions) {
                 const tags = definition.tags.map(tag => dictTagBuild(tag, definition.tagMeta));
                 tags.push(dictTagBuildSource(definition.dictionary));
-                definition.tags = dictTagsSort(tags);
+                definitions.push({
+                    source: deinflection.source,
+                    reasons: deinflection.reasons,
+                    score: definition.score,
+                    id: definition.id,
+                    dictionary: definition.dictionary,
+                    expression: definition.expression,
+                    reading: definition.reading,
+                    glossary: definition.glossary,
+                    tags: dictTagsSort(tags)
+                });
             }
+        }
+
+        definitions = dictTermsUndupe(definitions);
+        definitions = dictTermsSort(definitions, dictionaries);
 
-            return definitions;
-        });
+        let length = 0;
+        for (const definition of definitions) {
+            length = Math.max(length, definition.source.length);
+        }
+
+        return {length, definitions};
     }
 
-    findTermsDeinflected(text, dictionaries, cache) {
-        const definer = term => {
+    async findTermsDeinflected(text, titles, cache) {
+        const definer = async term => {
             if (cache.hasOwnProperty(term)) {
-                return Promise.resolve(cache[term]);
+                return cache[term];
+            } else {
+                return cache[term] = await this.database.findTerms(term, titles);
             }
-
-            return this.database.findTerms(term, dictionaries).then(definitions => cache[term] = definitions);
         };
 
-        const promises = [];
+        let deinflections = [];
         for (let i = text.length; i > 0; --i) {
-            promises.push(this.deinflector.deinflect(text.slice(0, i), definer));
+            const textSlice = text.slice(0, i);
+            deinflections = deinflections.concat(await this.deinflector.deinflect(textSlice, definer));
         }
 
-        return Promise.all(promises).then(results => {
-            let deinflections = [];
-            for (const result of results) {
-                deinflections = deinflections.concat(result);
-            }
-
-            return deinflections;
-        });
+        return deinflections;
     }
 
-    processKanji(definitions) {
+    async findKanji(text, dictionaries) {
+        let definitions = [];
+        const processed = {};
+        const titles = Object.keys(dictionaries);
+        for (const c of text) {
+            if (!processed[c]) {
+                definitions = definitions.concat(await this.database.findKanji(c, titles));
+                processed[c] = true;
+            }
+        }
+
         for (const definition of definitions) {
             const tags = definition.tags.map(tag => dictTagBuild(tag, definition.tagMeta));
+            tags.push(dictTagBuildSource(definition.dictionary));
             definition.tags = dictTagsSort(tags);
         }
 
diff --git a/ext/bg/js/util.js b/ext/bg/js/util.js
index cdd5ec31..a92fd0bc 100644
--- a/ext/bg/js/util.js
+++ b/ext/bg/js/util.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016  Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2016-2017  Alex Yatskov <alex@foosoft.net>
  * Author: Alex Yatskov <alex@foosoft.net>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -16,542 +16,40 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
-/*
- * Promise
- */
-
-function promiseCallback(promise, callback) {
-    return promise.then(result => {
-        callback({result});
-    }).catch(error => {
-        callback({error});
-    });
-}
-
-
-/*
- * Japanese
- */
-
-function jpIsKanji(c) {
-    const code = c.charCodeAt(0);
-    return code >= 0x4e00 && code < 0x9fb0 || code >= 0x3400 && code < 0x4dc0;
-}
-
-function jpIsKana(c) {
-    return wanakana.isKana(c);
-}
-
-
-/*
- * Commands
- */
-
-function commandExec(command) {
-    instYomi().onCommand(command);
-}
-
-
-/*
- * Instance
- */
-
-function instYomi() {
-    return chrome.extension.getBackgroundPage().yomichan;
-}
-
-function instDb() {
-    return instYomi().translator.database;
-}
-
-function instAnki() {
-    return instYomi().anki;
-}
-
-
-/*
- * Foreground
- */
-
-function fgBroadcast(action, params) {
-    chrome.tabs.query({}, tabs => {
-        for (const tab of tabs) {
-            chrome.tabs.sendMessage(tab.id, {action, params}, () => null);
-        }
-    });
-}
-
-function fgOptionsSet(options) {
-    fgBroadcast('optionsSet', options);
-}
-
-
-/*
- * Options
- */
-
-function optionsSetDefaults(options) {
-    const defaults = {
-        general: {
-            enable: true,
-            audioSource: 'jpod101',
-            audioVolume: 100,
-            groupResults: true,
-            debugInfo: false,
-            maxResults: 32,
-            showAdvanced: false,
-            popupWidth: 400,
-            popupHeight: 250,
-            popupOffset: 10,
-            showGuide: true
-        },
-
-        scanning: {
-            middleMouse: true,
-            selectText: true,
-            alphanumeric: true,
-            delay: 15,
-            length: 10,
-            modifier: 'shift'
-        },
-
-        dictionaries: {},
-
-        anki: {
-            enable: false,
-            server: 'http://127.0.0.1:8765',
-            tags: ['yomichan'],
-            htmlCards: true,
-            sentenceExt: 200,
-            terms: {deck: '', model: '', fields: {}},
-            kanji: {deck: '', model: '', fields: {}}
-        }
-    };
-
-    const combine = (target, source) => {
-        for (const key in source) {
-            if (!target.hasOwnProperty(key)) {
-                target[key] = source[key];
-            }
-        }
+function utilAsync(func) {
+    return function(...args) {
+        func.apply(this, args);
     };
-
-    combine(options, defaults);
-    combine(options.general, defaults.general);
-    combine(options.scanning, defaults.scanning);
-    combine(options.anki, defaults.anki);
-    combine(options.anki.terms, defaults.anki.terms);
-    combine(options.anki.kanji, defaults.anki.kanji);
-
-    return options;
-}
-
-function optionsVersion(options) {
-    const fixups = [
-        () => {},
-        () => {},
-        () => {},
-        () => {},
-        () => {
-            if (options.general.audioPlayback) {
-                options.general.audioSource = 'jpod101';
-            } else {
-                options.general.audioSource = 'disabled';
-            }
-        },
-        () => {
-            options.general.showGuide = false;
-        },
-        () => {
-            if (options.scanning.requireShift) {
-                options.scanning.modifier = 'shift';
-            } else {
-                options.scanning.modifier = 'none';
-            }
-        }
-    ];
-
-    optionsSetDefaults(options);
-    if (!options.hasOwnProperty('version')) {
-        options.version = fixups.length;
-    }
-
-    while (options.version < fixups.length) {
-        fixups[options.version++]();
-    }
-
-    return options;
-}
-
-function optionsLoad() {
-    return new Promise((resolve, reject) => {
-        chrome.storage.local.get(null, store => resolve(store.options));
-    }).then(optionsStr => {
-        return optionsStr ? JSON.parse(optionsStr) : {};
-    }).catch(error => {
-        return {};
-    }).then(options => {
-        return optionsVersion(options);
-    });
-}
-
-function optionsSave(options) {
-    return new Promise((resolve, reject) => {
-        chrome.storage.local.set({options: JSON.stringify(options)}, resolve);
-    }).then(() => {
-        instYomi().optionsSet(options);
-        fgOptionsSet(options);
-    });
-}
-
-
-/*
- * Dictionary
- */
-
-function dictEnabledSet(options) {
-    const dictionaries = {};
-    for (const title in options.dictionaries) {
-        const dictionary = options.dictionaries[title];
-        if (dictionary.enabled) {
-            dictionaries[title] = dictionary;
-        }
-    }
-
-    return dictionaries;
-}
-
-function dictConfigured(options) {
-    for (const title in options.dictionaries) {
-        if (options.dictionaries[title].enabled) {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-function dictRowsSort(rows, options) {
-    return rows.sort((ra, rb) => {
-        const pa = (options.dictionaries[ra.title] || {}).priority || 0;
-        const pb = (options.dictionaries[rb.title] || {}).priority || 0;
-        if (pa > pb) {
-            return -1;
-        } else if (pa < pb) {
-            return 1;
-        } else {
-            return 0;
-        }
-    });
-}
-
-function dictTermsSort(definitions, dictionaries=null) {
-    return definitions.sort((v1, v2) => {
-        const sl1 = v1.source.length;
-        const sl2 = v2.source.length;
-        if (sl1 > sl2) {
-            return -1;
-        } else if (sl1 < sl2) {
-            return 1;
-        }
-
-        if (dictionaries !== null) {
-            const p1 = (dictionaries[v1.dictionary] || {}).priority || 0;
-            const p2 = (dictionaries[v2.dictionary] || {}).priority || 0;
-            if (p1 > p2) {
-                return -1;
-            } else if (p1 < p2) {
-                return 1;
-            }
-        }
-
-        const s1 = v1.score;
-        const s2 = v2.score;
-        if (s1 > s2) {
-            return -1;
-        } else if (s1 < s2) {
-            return 1;
-        }
-
-        const rl1 = v1.reasons.length;
-        const rl2 = v2.reasons.length;
-        if (rl1 < rl2) {
-            return -1;
-        } else if (rl1 > rl2) {
-            return 1;
-        }
-
-        return v2.expression.localeCompare(v1.expression);
-    });
-}
-
-function dictTermsUndupe(definitions) {
-    const definitionGroups = {};
-    for (const definition of definitions) {
-        const definitionExisting = definitionGroups[definition.id];
-        if (!definitionGroups.hasOwnProperty(definition.id) || definition.expression.length > definitionExisting.expression.length) {
-            definitionGroups[definition.id] = definition;
-        }
-    }
-
-    const definitionsUnique = [];
-    for (const key in definitionGroups) {
-        definitionsUnique.push(definitionGroups[key]);
-    }
-
-    return definitionsUnique;
-}
-
-function dictTermsGroup(definitions, dictionaries) {
-    const groups = {};
-    for (const definition of definitions) {
-        const key = [definition.source, definition.expression].concat(definition.reasons);
-        if (definition.reading) {
-            key.push(definition.reading);
-        }
-
-        const group = groups[key];
-        if (group) {
-            group.push(definition);
-        } else {
-            groups[key] = [definition];
-        }
-    }
-
-    const results = [];
-    for (const key in groups) {
-        const groupDefs = groups[key];
-        const firstDef = groupDefs[0];
-        dictTermsSort(groupDefs, dictionaries);
-        results.push({
-            definitions: groupDefs,
-            expression: firstDef.expression,
-            reading: firstDef.reading,
-            reasons: firstDef.reasons,
-            score: groupDefs.reduce((p, v) => v.score > p ? v.score : p, Number.MIN_SAFE_INTEGER),
-            source: firstDef.source
-        });
-    }
-
-    return dictTermsSort(results);
-}
-
-function dictTagBuildSource(name) {
-    return dictTagSanitize({name, category: 'dictionary', order: 100});
-}
-
-function dictTagBuild(name, meta) {
-    const tag = {name};
-    const symbol = name.split(':')[0];
-    for (const prop in meta[symbol] || {}) {
-        tag[prop] = meta[symbol][prop];
-    }
-
-    return dictTagSanitize(tag);
-}
-
-function dictTagSanitize(tag) {
-    tag.name = tag.name || 'untitled';
-    tag.category = tag.category || 'default';
-    tag.notes = tag.notes || '';
-    tag.order = tag.order || 0;
-    return tag;
-}
-
-function dictTagsSort(tags) {
-    return tags.sort((v1, v2) => {
-        const order1 = v1.order;
-        const order2 = v2.order;
-        if (order1 < order2) {
-            return -1;
-        } else if (order1 > order2) {
-            return 1;
-        }
-
-        const name1 = v1.name;
-        const name2 = v2.name;
-        if (name1 < name2) {
-            return -1;
-        } else if (name1 > name2) {
-            return 1;
-        }
-
-        return 0;
-    });
 }
 
-function dictFieldSplit(field) {
-    return field.length === 0 ? [] : field.split(' ');
+function utilIsolate(data) {
+    return JSON.parse(JSON.stringify(data));
 }
 
-function dictFieldFormat(field, definition, mode, options) {
-    const markers = [
-        'audio',
-        'character',
-        'cloze-body',
-        'cloze-prefix',
-        'cloze-suffix',
-        'dictionary',
-        'expression',
-        'furigana',
-        'glossary',
-        'kunyomi',
-        'onyomi',
-        'reading',
-        'sentence',
-        'tags',
-        'url'
-    ];
-
-    for (const marker of markers) {
-        const data = {
-            marker,
-            definition,
-            group: options.general.groupResults,
-            html: options.anki.htmlCards,
-            modeTermKanji: mode === 'term-kanji',
-            modeTermKana: mode === 'term-kana',
-            modeKanji: mode === 'kanji'
-        };
-
-        field = field.replace(
-            `{${marker}}`,
-            Handlebars.templates['fields.html'](data).trim()
-        );
-    }
-
-    return field;
+function utilBackend() {
+    return chrome.extension.getBackgroundPage().yomichan_backend;
 }
 
-
-/*
- * Json
- */
-
-function jsonLoad(url) {
-    return new Promise((resolve, reject) => {
-        const xhr = new XMLHttpRequest();
-        xhr.overrideMimeType('application/json');
-        xhr.addEventListener('load', () => resolve(xhr.responseText));
-        xhr.addEventListener('error', () => reject('failed to execute network request'));
-        xhr.open('GET', url);
-        xhr.send();
-    }).then(responseText => {
-        try {
-            return JSON.parse(responseText);
-        }
-        catch (e) {
-            return Promise.reject('invalid JSON response');
-        }
-    });
+function utilAnkiGetModelNames() {
+    return utilBackend().anki.getModelNames();
 }
 
-function jsonLoadInt(url) {
-    return jsonLoad(chrome.extension.getURL(url));
+function utilAnkiGetDeckNames() {
+    return utilBackend().anki.getDeckNames();
 }
 
-/*
- * Zip
- */
-
-function zipLoadDb(archive, indexLoaded, termsLoaded, kanjiLoaded) {
-    return JSZip.loadAsync(archive).then(files => files.files).then(files => {
-        const indexFile = files['index.json'];
-        if (!indexFile) {
-            return Promise.reject('no dictionary index found in archive');
-        }
-
-        return indexFile.async('string').then(indexJson => {
-            const index = JSON.parse(indexJson);
-            if (!index.title || !index.version || !index.revision) {
-                return Promise.reject('unrecognized dictionary format');
-            }
-
-            return indexLoaded(
-                index.title,
-                index.version,
-                index.revision,
-                index.tagMeta || {},
-                index.termBanks > 0,
-                index.kanjiBanks > 0
-            ).then(() => index);
-        }).then(index => {
-            const loaders = [];
-            const banksTotal = index.termBanks + index.kanjiBanks;
-            let banksLoaded = 0;
-
-            for (let i = 1; i <= index.termBanks; ++i) {
-                const bankFile = files[`term_bank_${i}.json`];
-                if (!bankFile) {
-                    return Promise.reject('missing term bank file');
-                }
-
-                loaders.push(() => bankFile.async('string').then(bankJson => {
-                    const bank = JSON.parse(bankJson);
-                    return termsLoaded(index.title, bank, banksTotal, banksLoaded++);
-                }));
-            }
-
-            for (let i = 1; i <= index.kanjiBanks; ++i) {
-                const bankFile = files[`kanji_bank_${i}.json`];
-                if (!bankFile) {
-                    return Promise.reject('missing kanji bank file');
-                }
-
-                loaders.push(() => bankFile.async('string').then(bankJson => {
-                    const bank = JSON.parse(bankJson);
-                    return kanjiLoaded(index.title, bank, banksTotal, banksLoaded++);
-                }));
-            }
-
-            let chain = Promise.resolve();
-            for (const loader of loaders) {
-                chain = chain.then(loader);
-            }
-
-            return chain;
-        });
-    });
-}
-
-/*
- * Helpers
- */
-
-function handlebarsEscape(text) {
-    return Handlebars.Utils.escapeExpression(text);
-}
-
-function handlebarsDumpObject(options) {
-    const dump = JSON.stringify(options.fn(this), null, 4);
-    return handlebarsEscape(dump);
-}
-
-function handlebarsKanjiLinks(options) {
-    let result = '';
-    for (const c of options.fn(this)) {
-        if (jpIsKanji(c)) {
-            result += `<a href="#" class="kanji-link">${c}</a>`;
-        } else {
-            result += c;
-        }
-    }
-
-    return result;
+function utilAnkiGetModelFieldNames(modelName) {
+    return utilBackend().anki.getModelFieldNames(modelName);
 }
 
-function handlebarsMultiLine(options) {
-    return options.fn(this).split('\n').join('<br>');
+function utilDatabaseGetDictionaries() {
+    return utilBackend().translator.database.getDictionaries();
 }
 
-function handlebarsRegister() {
-    Handlebars.partials = Handlebars.templates;
-    Handlebars.registerHelper('dumpObject', handlebarsDumpObject);
-    Handlebars.registerHelper('kanjiLinks', handlebarsKanjiLinks);
-    Handlebars.registerHelper('multiLine', handlebarsMultiLine);
+function utilDatabasePurge() {
+    return utilBackend().translator.database.purge();
 }
 
-function handlebarsRender(template, data) {
-    return Handlebars.templates[template](data);
+function utilDatabaseImport(data, progress) {
+    return utilBackend().translator.database.importDictionary(data, progress);
 }
diff --git a/ext/bg/js/yomichan.js b/ext/bg/js/yomichan.js
deleted file mode 100644
index b4beb179..00000000
--- a/ext/bg/js/yomichan.js
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * Copyright (C) 2016  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-window.yomichan = new class {
-    constructor() {
-        handlebarsRegister();
-
-        this.translator = new Translator();
-        this.anki = new AnkiNull();
-        this.options = null;
-
-        this.translator.prepare().then(optionsLoad).then(this.optionsSet.bind(this)).then(() => {
-            chrome.commands.onCommand.addListener(this.onCommand.bind(this));
-            chrome.runtime.onMessage.addListener(this.onMessage.bind(this));
-            if (this.options.general.showGuide) {
-                chrome.tabs.create({url: chrome.extension.getURL('/bg/guide.html')});
-            }
-        });
-    }
-
-    optionsSet(options) {
-        // In Firefox, setting options from the options UI somehow carries references
-        // to the DOM across to the background page, causing the options object to
-        // become a "DeadObject" after the options page is closed. The workaround used
-        // here is to create a deep copy of the options object.
-        this.options = JSON.parse(JSON.stringify(options));
-
-        if (!this.options.general.enable) {
-            chrome.browserAction.setBadgeBackgroundColor({color: '#d9534f'});
-            chrome.browserAction.setBadgeText({text: 'off'});
-        } else if (!dictConfigured(this.options)) {
-            chrome.browserAction.setBadgeBackgroundColor({color: '#f0ad4e'});
-            chrome.browserAction.setBadgeText({text: '!'});
-        } else {
-            chrome.browserAction.setBadgeText({text: ''});
-        }
-
-        if (this.options.anki.enable) {
-            this.anki = new AnkiConnect(this.options.anki.server);
-        } else {
-            this.anki = new AnkiNull();
-        }
-    }
-
-    noteFormat(definition, mode) {
-        const note = {
-            fields: {},
-            tags: this.options.anki.tags
-        };
-
-        let fields = [];
-        if (mode === 'kanji') {
-            fields = this.options.anki.kanji.fields;
-            note.deckName = this.options.anki.kanji.deck;
-            note.modelName = this.options.anki.kanji.model;
-        } else {
-            fields = this.options.anki.terms.fields;
-            note.deckName = this.options.anki.terms.deck;
-            note.modelName = this.options.anki.terms.model;
-
-            if (definition.audio) {
-                const audio = {
-                    url: definition.audio.url,
-                    filename: definition.audio.filename,
-                    skipHash: '7e2c2f954ef6051373ba916f000168dc',
-                    fields: []
-                };
-
-                for (const name in fields) {
-                    if (fields[name].includes('{audio}')) {
-                        audio.fields.push(name);
-                    }
-                }
-
-                if (audio.fields.length > 0) {
-                    note.audio = audio;
-                }
-            }
-        }
-
-        for (const name in fields) {
-            note.fields[name] = dictFieldFormat(
-                fields[name],
-                definition,
-                mode,
-                this.options
-            );
-        }
-
-        return note;
-    }
-
-    termsFind(text) {
-        const searcher = this.options.general.groupResults ?
-            this.translator.findTermsGrouped.bind(this.translator) :
-            this.translator.findTerms.bind(this.translator);
-
-        return searcher(text, dictEnabledSet(this.options), this.options.scanning.alphanumeric).then(({definitions, length}) => {
-            return {length, definitions: definitions.slice(0, this.options.general.maxResults)};
-        });
-    }
-
-    kanjiFind(text) {
-        return this.translator.findKanji(text, dictEnabledSet(this.options)).then(definitions => {
-            return definitions.slice(0, this.options.general.maxResults);
-        });
-    }
-
-    definitionAdd(definition, mode) {
-        let promise = Promise.resolve();
-        if (mode !== 'kanji') {
-            promise = audioInject(definition, this.options.anki.terms.fields, this.options.general.audioSource);
-        }
-
-        return promise.then(() => {
-            const note = this.noteFormat(definition, mode);
-            return this.anki.addNote(note);
-        });
-    }
-
-    definitionsAddable(definitions, modes) {
-        const notes = [];
-        for (const definition of definitions) {
-            for (const mode of modes) {
-                notes.push(this.noteFormat(definition, mode));
-            }
-        }
-
-        return this.anki.canAddNotes(notes).then(raw => {
-            const states = [];
-            for (let resultBase = 0; resultBase < raw.length; resultBase += modes.length) {
-                const state = {};
-                for (let modeOffset = 0; modeOffset < modes.length; ++modeOffset) {
-                    state[modes[modeOffset]] = raw[resultBase + modeOffset];
-                }
-
-                states.push(state);
-            }
-
-            return states;
-        });
-    }
-
-    templateRender(template, data) {
-        return Promise.resolve(handlebarsRender(template, data));
-    }
-
-    onCommand(command) {
-        const handlers = {
-            search: () => {
-                chrome.tabs.create({url: chrome.extension.getURL('/bg/search.html')});
-            },
-
-            help: () => {
-                chrome.tabs.create({url: 'https://foosoft.net/projects/yomichan/'});
-            },
-
-            options: () => {
-                chrome.runtime.openOptionsPage();
-            },
-
-            toggle: () => {
-                this.options.general.enable = !this.options.general.enable;
-                optionsSave(this.options).then(() => this.optionsSet(this.options));
-            }
-        };
-
-        const handler = handlers[command];
-        if (handler) {
-            handler();
-        }
-    }
-
-    onMessage({action, params}, sender, callback) {
-        const handlers = {
-            optionsGet: ({callback}) => {
-                promiseCallback(optionsLoad(), callback);
-            },
-
-            kanjiFind: ({text, callback}) => {
-                promiseCallback(this.kanjiFind(text), callback);
-            },
-
-            termsFind: ({text, callback}) => {
-                promiseCallback(this.termsFind(text), callback);
-            },
-
-            templateRender: ({template, data, callback}) => {
-                promiseCallback(this.templateRender(template, data), callback);
-            },
-
-            definitionAdd: ({definition, mode, callback}) => {
-                promiseCallback(this.definitionAdd(definition, mode), callback);
-            },
-
-            definitionsAddable: ({definitions, modes, callback}) => {
-                promiseCallback(this.definitionsAddable(definitions, modes), callback);
-            }
-        };
-
-        const handler = handlers[action];
-        if (handler) {
-            params.callback = callback;
-            handler(params);
-        }
-
-        return true;
-    }
-};
diff --git a/ext/bg/legal.html b/ext/bg/legal.html
index fe9a007c..a289281d 100644
--- a/ext/bg/legal.html
+++ b/ext/bg/legal.html
@@ -10,7 +10,7 @@
         <div class="container-fluid">
             <h3>Yomichan License</h3>
 <pre>
-Copyright (C) 2016  Alex Yatskov
+Copyright (C) 2016-2017  Alex Yatskov
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/ext/bg/search.html b/ext/bg/search.html
index 4c07ee61..5fbd467a 100644
--- a/ext/bg/search.html
+++ b/ext/bg/search.html
@@ -5,7 +5,7 @@
         <title>Yomichan Search</title>
         <link rel="stylesheet" type="text/css" href="/mixed/lib/bootstrap/css/bootstrap.min.css">
         <link rel="stylesheet" type="text/css" href="/mixed/lib/bootstrap/css/bootstrap-theme.min.css">
-        <link rel="stylesheet" type="text/css" href="/mixed/css/frame.css">
+        <link rel="stylesheet" type="text/css" href="/mixed/css/display.css">
     </head>
     <body>
         <div class="container-fluid">
@@ -32,11 +32,19 @@
             <div id="content"></div>
         </div>
 
+        <script src="/mixed/lib/handlebars.min.js"></script>
         <script src="/mixed/lib/jquery.min.js"></script>
+        <script src="/mixed/lib/wanakana.min.js"></script>
+
+        <script src="/bg/js/api.js"></script>
+        <script src="/bg/js/audio.js"></script>
+        <script src="/bg/js/dictionary.js"></script>
+        <script src="/bg/js/handlebars.js"></script>
+        <script src="/bg/js/templates.js"></script>
         <script src="/bg/js/util.js"></script>
-        <script src="/mixed/js/util.js"></script>
         <script src="/mixed/js/display.js"></script>
-        <script src="/mixed/lib/wanakana.min.js"></script>
-        <script src="/bg/js/display-window.js"></script>
+        <script src="/mixed/js/japanese.js"></script>
+
+        <script src="/bg/js/search.js"></script>
     </body>
 </html>
diff --git a/ext/bg/options.html b/ext/bg/settings.html
index 34728d90..8798aeb1 100644
--- a/ext/bg/options.html
+++ b/ext/bg/settings.html
@@ -48,6 +48,7 @@
                         <option value="disabled">Disabled</option>
                         <option value="jpod101">JapanesePod101</option>
                         <option value="jpod101-alternate">JapanesePod101 (alternate)</option>
+                        <option value="jisho">Jisho.org</option>
                     </select>
                 </div>
 
@@ -275,8 +276,15 @@
         <script src="/mixed/lib/jquery.min.js"></script>
         <script src="/mixed/lib/bootstrap/js/bootstrap.min.js"></script>
         <script src="/mixed/lib/handlebars.min.js"></script>
+
+        <script src="/bg/js/anki.js"></script>
+        <script src="/bg/js/api.js"></script>
+        <script src="/bg/js/dictionary.js"></script>
+        <script src="/bg/js/handlebars.js"></script>
+        <script src="/bg/js/options.js"></script>
         <script src="/bg/js/templates.js"></script>
         <script src="/bg/js/util.js"></script>
-        <script src="/bg/js/options.js"></script>
+
+        <script src="/bg/js/settings.js"></script>
     </body>
 </html>
diff --git a/ext/fg/css/client.css b/ext/fg/css/client.css
index 9f566480..b5b1f6bd 100644
--- a/ext/fg/css/client.css
+++ b/ext/fg/css/client.css
@@ -17,7 +17,7 @@
  */
 
 
-iframe#yomichan-popup {
+iframe#yomichan-float {
     all: initial;
     background-color: #fff;
     border: 1px solid #999;
diff --git a/ext/fg/frame.html b/ext/fg/float.html
index c20745af..89872cce 100644
--- a/ext/fg/frame.html
+++ b/ext/fg/float.html
@@ -5,7 +5,7 @@
         <title></title>
         <link rel="stylesheet" href="/mixed/lib/bootstrap/css/bootstrap.min.css">
         <link rel="stylesheet" href="/mixed/lib/bootstrap/css/bootstrap-theme.min.css">
-        <link rel="stylesheet" href="/mixed/css/frame.css">
+        <link rel="stylesheet" href="/mixed/css/display.css">
         <style type="text/css">
             .entry, .note {
                 padding-left: 10px;
@@ -18,9 +18,9 @@
             <img src="/mixed/img/spinner.gif">
         </div>
 
-        <div id="content"></div>
+        <div id="definitions"></div>
 
-        <div id="orphan">
+        <div id="error-orphaned">
             <div class="container-fluid">
                 <h1>Yomichan Updated!</h1>
                 <p>
@@ -32,9 +32,11 @@
 
         <script src="/mixed/lib/jquery.min.js"></script>
         <script src="/mixed/lib/wanakana.min.js"></script>
+
+        <script src="/fg/js/api.js"></script>
         <script src="/fg/js/util.js"></script>
-        <script src="/mixed/js/util.js"></script>
         <script src="/mixed/js/display.js"></script>
-        <script src="/fg/js/display-frame.js"></script>
+
+        <script src="/fg/js/float.js"></script>
     </body>
 </html>
diff --git a/ext/fg/js/api.js b/ext/fg/js/api.js
new file mode 100644
index 00000000..151882eb
--- /dev/null
+++ b/ext/fg/js/api.js
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2016-2017  Alex Yatskov <alex@foosoft.net>
+ * Author: Alex Yatskov <alex@foosoft.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+function apiOptionsSet(options) {
+    return utilInvoke('optionsSet', {options});
+}
+
+function apiOptionsGet() {
+    return utilInvoke('optionsGet');
+}
+
+function apiTermsFind(text) {
+    return utilInvoke('termsFind', {text});
+}
+
+function apiKanjiFind(text) {
+    return utilInvoke('kanjiFind', {text});
+}
+
+function apiDefinitionAdd(definition, mode) {
+    return utilInvoke('definitionAdd', {definition, mode});
+}
+
+function apiDefinitionsAddable(definitions, modes) {
+    return utilInvoke('definitionsAddable', {definitions, modes}).catch(() => null);
+}
+
+function apiNoteView(noteId) {
+    return utilInvoke('noteView', {noteId});
+}
+
+function apiTemplateRender(template, data) {
+    return utilInvoke('templateRender', {data, template});
+}
+
+function apiCommandExec(command) {
+    return utilInvoke('commandExec', {command});
+}
+
+function apiAudioGetUrl(definition, source) {
+    return utilInvoke('audioGetUrl', {definition, source});
+}
diff --git a/ext/fg/js/document.js b/ext/fg/js/document.js
new file mode 100644
index 00000000..26c85b40
--- /dev/null
+++ b/ext/fg/js/document.js
@@ -0,0 +1,163 @@
+/*
+ * Copyright (C) 2016-2017  Alex Yatskov <alex@foosoft.net>
+ * Author: Alex Yatskov <alex@foosoft.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+function docOffsetCalc(element) {
+    const scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop;
+    const scrollLeft = window.pageXOffset || document.documentElement.scrollLeft || document.body.scrollLeft;
+
+    const clientTop = document.documentElement.clientTop || document.body.clientTop || 0;
+    const clientLeft = document.documentElement.clientLeft || document.body.clientLeft || 0;
+
+    const rect = element.getBoundingClientRect();
+    const top  = Math.round(rect.top +  scrollTop - clientTop);
+    const left = Math.round(rect.left + scrollLeft - clientLeft);
+
+    return {top, left};
+}
+
+function docImposterCreate(element) {
+    const styleProps = window.getComputedStyle(element);
+    const stylePairs = [];
+    for (const key of styleProps) {
+        stylePairs.push(`${key}: ${styleProps[key]};`);
+    }
+
+    const offset = docOffsetCalc(element);
+    const imposter = document.createElement('div');
+    imposter.className = 'yomichan-imposter';
+    imposter.innerText = element.value;
+    imposter.style.cssText = stylePairs.join('\n');
+    imposter.style.position = 'absolute';
+    imposter.style.top = `${offset.top}px`;
+    imposter.style.left = `${offset.left}px`;
+    imposter.style.opacity = 0;
+    imposter.style.zIndex = 2147483646;
+    if (element.nodeName === 'TEXTAREA' && styleProps.overflow === 'visible') {
+        imposter.style.overflow = 'auto';
+    }
+
+    document.body.appendChild(imposter);
+    imposter.scrollTop = element.scrollTop;
+    imposter.scrollLeft = element.scrollLeft;
+}
+
+function docImposterDestroy() {
+    for (const element of document.getElementsByClassName('yomichan-imposter')) {
+        element.parentNode.removeChild(element);
+    }
+}
+
+function docRangeFromPoint(point) {
+    const element = document.elementFromPoint(point.x, point.y);
+    if (element) {
+        if (element.nodeName === 'IMG' || element.nodeName === 'BUTTON') {
+            return new TextSourceElement(element);
+        } else if (element.nodeName === 'INPUT' || element.nodeName === 'TEXTAREA') {
+            docImposterCreate(element);
+        }
+    }
+
+    if (!document.caretRangeFromPoint) {
+        document.caretRangeFromPoint = (x, y) => {
+            const position = document.caretPositionFromPoint(x,y);
+            if (position) {
+                const range = document.createRange();
+                range.setStart(position.offsetNode, position.offset);
+                range.setEnd(position.offsetNode, position.offset);
+                return range;
+            }
+        };
+    }
+
+    const range = document.caretRangeFromPoint(point.x, point.y);
+    if (range) {
+        return new TextSourceRange(range);
+    }
+}
+
+function docSentenceExtract(source, extent) {
+    const quotesFwd = {'「': '」', '『': '』', "'": "'", '"': '"'};
+    const quotesBwd = {'」': '「', '』': '『', "'": "'", '"': '"'};
+    const terminators = '…。．.？?！!';
+
+    const sourceLocal = source.clone();
+    const position = sourceLocal.setStartOffset(extent);
+    sourceLocal.setEndOffset(position + extent);
+    const content = sourceLocal.text();
+
+    let quoteStack = [];
+
+    let startPos = 0;
+    for (let i = position; i >= startPos; --i) {
+        const c = content[i];
+
+        if (c === '\n') {
+            startPos = i + 1;
+            break;
+        }
+
+        if (quoteStack.length === 0 && (terminators.includes(c) || c in quotesFwd)) {
+            startPos = i + 1;
+            break;
+        }
+
+        if (quoteStack.length > 0 && c === quoteStack[0]) {
+            quoteStack.pop();
+        } else if (c in quotesBwd) {
+            quoteStack = [quotesBwd[c]].concat(quoteStack);
+        }
+    }
+
+    quoteStack = [];
+
+    let endPos = content.length;
+    for (let i = position; i <= endPos; ++i) {
+        const c = content[i];
+
+        if (c === '\n') {
+            endPos = i + 1;
+            break;
+        }
+
+        if (quoteStack.length === 0) {
+            if (terminators.includes(c)) {
+                endPos = i + 1;
+                break;
+            }
+            else if (c in quotesBwd) {
+                endPos = i;
+                break;
+            }
+        }
+
+        if (quoteStack.length > 0 && c === quoteStack[0]) {
+            quoteStack.pop();
+        } else if (c in quotesFwd) {
+            quoteStack = [quotesFwd[c]].concat(quoteStack);
+        }
+    }
+
+    const text = content.substring(startPos, endPos);
+    const padding = text.length - text.replace(/^\s+/, '').length;
+
+    return {
+        text: text.trim(),
+        offset: position - startPos - padding
+    };
+}
diff --git a/ext/fg/js/display-frame.js b/ext/fg/js/float.js
index 9fd09e74..22374f8b 100644
--- a/ext/fg/js/display-frame.js
+++ b/ext/fg/js/float.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016  Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2016-2017  Alex Yatskov <alex@foosoft.net>
  * Author: Alex Yatskov <alex@foosoft.net>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -17,61 +17,45 @@
  */
 
 
-window.displayFrame = new class extends Display {
+class DisplayFloat extends Display {
     constructor() {
-        super($('#spinner'), $('#content'));
-        $(window).on('message', this.onMessage.bind(this));
+        super($('#spinner'), $('#definitions'));
+        $(window).on('message', utilAsync(this.onMessage.bind(this)));
     }
 
-    definitionAdd(definition, mode) {
-        return bgDefinitionAdd(definition, mode);
-    }
-
-    definitionsAddable(definitions, modes) {
-        return bgDefinitionsAddable(definitions, modes);
-    }
-
-    templateRender(template, data) {
-        return bgTemplateRender(template, data);
-    }
-
-    kanjiFind(character) {
-        return bgKanjiFind(character);
-    }
-
-    handleError(error) {
-        if (window.orphaned) {
-            this.showOrphaned();
+    onError(error) {
+        if (window.yomichan_orphaned) {
+            this.onOrphaned();
         } else {
             window.alert(`Error: ${error}`);
         }
     }
 
-    clearSearch() {
-        window.parent.postMessage('popupClose', '*');
+    onOrphaned() {
+        $('#definitions').hide();
+        $('#error-orphaned').show();
     }
 
-    selectionCopy() {
-        window.parent.postMessage('selectionCopy', '*');
+    onSearchClear() {
+        window.parent.postMessage('popupClose', '*');
     }
 
-    showOrphaned() {
-        $('#content').hide();
-        $('#orphan').show();
+    onSelectionCopy() {
+        window.parent.postMessage('selectionCopy', '*');
     }
 
     onMessage(e) {
         const handlers = {
-            showTermDefs: ({definitions, options, context}) => {
-                this.showTermDefs(definitions, options, context);
+            termsShow: ({definitions, options, context}) => {
+                this.termsShow(definitions, options, context);
             },
 
-            showKanjiDefs: ({definitions, options, context}) => {
-                this.showKanjiDefs(definitions, options, context);
+            kanjiShow: ({definitions, options, context}) => {
+                this.kanjiShow(definitions, options, context);
             },
 
-            showOrphaned: () => {
-                this.showOrphaned();
+            orphaned: () => {
+                this.onOrphaned();
             }
         };
 
@@ -85,8 +69,8 @@ window.displayFrame = new class extends Display {
     onKeyDown(e) {
         const handlers = {
             67: /* c */ () => {
-                if (e.ctrlKey && window.getSelection().toString() === '') {
-                    this.selectionCopy();
+                if (e.ctrlKey && !window.getSelection().toString()) {
+                    this.onSelectionCopy();
                     return true;
                 }
             }
@@ -99,4 +83,6 @@ window.displayFrame = new class extends Display {
             super.onKeyDown(e);
         }
     }
-};
+}
+
+window.yomichan_display = new DisplayFloat();
diff --git a/ext/fg/js/driver.js b/ext/fg/js/frontend.js
index b0cc4613..41c93f00 100644
--- a/ext/fg/js/driver.js
+++ b/ext/fg/js/frontend.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016  Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2016-2017  Alex Yatskov <alex@foosoft.net>
  * Author: Alex Yatskov <alex@foosoft.net>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -17,38 +17,31 @@
  */
 
 
-window.driver = new class {
+class Frontend {
     constructor() {
         this.popup = new Popup();
         this.popupTimer = null;
-        this.lastMousePos = null;
         this.mouseDownLeft = false;
         this.mouseDownMiddle = false;
-        this.lastTextSource = null;
+        this.textSourceLast = null;
         this.pendingLookup = false;
         this.options = null;
+    }
 
-        bgOptionsGet().then(options => {
-            this.options = options;
-            window.addEventListener('mouseover', this.onMouseOver.bind(this));
+    async prepare() {
+        try {
+            this.options = await apiOptionsGet();
+
+            window.addEventListener('message', this.onFrameMessage.bind(this));
             window.addEventListener('mousedown', this.onMouseDown.bind(this));
-            window.addEventListener('mouseup', this.onMouseUp.bind(this));
             window.addEventListener('mousemove', this.onMouseMove.bind(this));
-            window.addEventListener('resize', e => this.searchClear());
-            window.addEventListener('message', this.onFrameMessage.bind(this));
-            chrome.runtime.onMessage.addListener(this.onBgMessage.bind(this));
-        }).catch(this.handleError.bind(this));
-    }
-
-    popupTimerSet(callback) {
-        this.popupTimerClear();
-        this.popupTimer = window.setTimeout(callback, this.options.scanning.delay);
-    }
+            window.addEventListener('mouseover', this.onMouseOver.bind(this));
+            window.addEventListener('mouseup', this.onMouseUp.bind(this));
+            window.addEventListener('resize', this.onResize.bind(this));
 
-    popupTimerClear() {
-        if (this.popupTimer) {
-            window.clearTimeout(this.popupTimer);
-            this.popupTimer = null;
+            chrome.runtime.onMessage.addListener(this.onBgMessage.bind(this));
+        } catch (e) {
+            this.onError(e);
         }
     }
 
@@ -59,7 +52,6 @@ window.driver = new class {
     }
 
     onMouseMove(e) {
-        this.lastMousePos = {x: e.clientX, y: e.clientY};
         this.popupTimerClear();
 
         if (!this.options.general.enable) {
@@ -70,6 +62,10 @@ window.driver = new class {
             return;
         }
 
+        if (this.pendingLookup) {
+            return;
+        }
+
         const mouseScan = this.mouseDownMiddle && this.options.scanning.middleMouse;
         const keyScan =
             this.options.scanning.modifier === 'alt' && e.altKey ||
@@ -81,16 +77,24 @@ window.driver = new class {
             return;
         }
 
-        const searchFunc = () => this.searchAt(this.lastMousePos);
+        const search = async () => {
+            try {
+                await this.searchAt({x: e.clientX, y: e.clientY});
+                this.pendingLookup = false;
+            } catch (e) {
+                this.onError(e);
+            }
+        };
+
         if (this.options.scanning.modifier === 'none') {
-            this.popupTimerSet(searchFunc);
+            this.popupTimerSet(search);
         } else {
-            searchFunc();
+            search();
         }
     }
 
     onMouseDown(e) {
-        this.lastMousePos = {x: e.clientX, y: e.clientY};
+        this.mousePosLast = {x: e.clientX, y: e.clientY};
         this.popupTimerClear();
         this.searchClear();
 
@@ -126,6 +130,10 @@ window.driver = new class {
         }
     }
 
+    onResize() {
+        this.searchClear();
+    }
+
     onBgMessage({action, params}, sender, callback) {
         const handlers = {
             optionsSet: options => {
@@ -144,106 +152,122 @@ window.driver = new class {
         callback();
     }
 
-    searchAt(point) {
-        if (this.pendingLookup) {
-            return;
-        }
+    onError(error) {
+        window.alert(`Error: ${error}`);
+    }
 
-        const textSource = docRangeFromPoint(point);
-        if (!textSource || !textSource.containsPoint(point)) {
-            docImposterDestroy();
-            return;
-        }
+    popupTimerSet(callback) {
+        this.popupTimerClear();
+        this.popupTimer = window.setTimeout(callback, this.options.scanning.delay);
+    }
 
-        if (this.lastTextSource && this.lastTextSource.equals(textSource)) {
-            return;
+    popupTimerClear() {
+        if (this.popupTimer) {
+            window.clearTimeout(this.popupTimer);
+            this.popupTimer = null;
         }
+    }
 
-        this.pendingLookup = true;
-        this.searchTerms(textSource).then(found => {
-            if (!found) {
-                return this.searchKanji(textSource);
+    async searchAt(point) {
+        let textSource = null;
+
+        try {
+            if (this.pendingLookup) {
+                return;
+            }
+
+            textSource = docRangeFromPoint(point);
+            if (!textSource || !textSource.containsPoint(point)) {
+                docImposterDestroy();
+                return;
+            }
+
+            if (this.textSourceLast && this.textSourceLast.equals(textSource)) {
+                return;
+            }
+
+            this.pendingLookup = true;
+
+            if (!await this.searchTerms(textSource)) {
+                await this.searchKanji(textSource);
+            }
+        } catch (e) {
+            if (window.yomichan_orphaned) {
+                if (textSource && this.options.scanning.modifier !== 'none') {
+                    this.popup.showOrphaned(textSource.getRect(), this.options);
+                }
+            } else {
+                this.onError(e);
             }
-        }).catch(error => {
-            this.handleError(error, textSource);
-        }).then(() => {
+        } finally {
             docImposterDestroy();
             this.pendingLookup = false;
-        });
+        }
     }
 
-    searchTerms(textSource) {
+    async searchTerms(textSource) {
         textSource.setEndOffset(this.options.scanning.length);
 
-        return bgTermsFind(textSource.text()).then(({definitions, length}) => {
-            if (definitions.length === 0) {
-                return false;
-            } else {
-                textSource.setEndOffset(length);
-
-                const sentence = docSentenceExtract(textSource, this.options.anki.sentenceExt);
-                const url = window.location.href;
-                this.popup.showTermDefs(
-                    textSource.getRect(),
-                    definitions,
-                    this.options,
-                    {sentence, url}
-                );
-
-                this.lastTextSource = textSource;
-                if (this.options.scanning.selectText) {
-                    textSource.select();
-                }
+        const {definitions, length} = await apiTermsFind(textSource.text());
+        if (definitions.length === 0) {
+            return false;
+        }
 
-                return true;
-            }
-        });
+        textSource.setEndOffset(length);
+
+        const sentence = docSentenceExtract(textSource, this.options.anki.sentenceExt);
+        const url = window.location.href;
+        this.popup.termsShow(
+            textSource.getRect(),
+            definitions,
+            this.options,
+            {sentence, url}
+        );
+
+        this.textSourceLast = textSource;
+        if (this.options.scanning.selectText) {
+            textSource.select();
+        }
+
+        return true;
     }
 
-    searchKanji(textSource) {
+    async searchKanji(textSource) {
         textSource.setEndOffset(1);
 
-        return bgKanjiFind(textSource.text()).then(definitions => {
-            if (definitions.length === 0) {
-                return false;
-            } else {
-                const sentence = docSentenceExtract(textSource, this.options.anki.sentenceExt);
-                const url = window.location.href;
-                this.popup.showKanjiDefs(
-                    textSource.getRect(),
-                    definitions,
-                    this.options,
-                    {sentence, url}
-                );
-
-                this.lastTextSource = textSource;
-                if (this.options.scanning.selectText) {
-                    textSource.select();
-                }
+        const definitions = await apiKanjiFind(textSource.text());
+        if (definitions.length === 0) {
+            return false;
+        }
 
-                return true;
-            }
-        });
+        const sentence = docSentenceExtract(textSource, this.options.anki.sentenceExt);
+        const url = window.location.href;
+        this.popup.kanjiShow(
+            textSource.getRect(),
+            definitions,
+            this.options,
+            {sentence, url}
+        );
+
+        this.textSourceLast = textSource;
+        if (this.options.scanning.selectText) {
+            textSource.select();
+        }
+
+        return true;
     }
 
     searchClear() {
         docImposterDestroy();
         this.popup.hide();
 
-        if (this.options.scanning.selectText && this.lastTextSource) {
-            this.lastTextSource.deselect();
+        if (this.options.scanning.selectText && this.textSourceLast) {
+            this.textSourceLast.deselect();
         }
 
-        this.lastTextSource = null;
+        this.textSourceLast = null;
     }
+}
 
-    handleError(error, textSource) {
-        if (window.orphaned) {
-            if (textSource && this.options.scanning.modifier !== 'none') {
-                this.popup.showOrphaned(textSource.getRect(), this.options);
-            }
-        } else {
-            window.alert(`Error: ${error}`);
-        }
-    }
-};
+window.yomichan_frontend = new Frontend();
+window.yomichan_frontend.prepare();
diff --git a/ext/fg/js/popup.js b/ext/fg/js/popup.js
index cd7e846a..03958832 100644
--- a/ext/fg/js/popup.js
+++ b/ext/fg/js/popup.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016  Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2016-2017  Alex Yatskov <alex@foosoft.net>
  * Author: Alex Yatskov <alex@foosoft.net>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -20,10 +20,10 @@
 class Popup {
     constructor() {
         this.container = document.createElement('iframe');
-        this.container.id = 'yomichan-popup';
+        this.container.id = 'yomichan-float';
         this.container.addEventListener('mousedown', e => e.stopPropagation());
         this.container.addEventListener('scroll', e => e.stopPropagation());
-        this.container.setAttribute('src', chrome.extension.getURL('/fg/frame.html'));
+        this.container.setAttribute('src', chrome.extension.getURL('/fg/float.html'));
         this.container.style.width = '0px';
         this.container.style.height = '0px';
         this.injected = null;
@@ -40,51 +40,56 @@ class Popup {
         return this.injected;
     }
 
-    show(elementRect, options) {
-        return this.inject().then(() => {
-            const containerStyle = window.getComputedStyle(this.container);
-            const containerHeight = parseInt(containerStyle.height);
-            const containerWidth = parseInt(containerStyle.width);
-
-            const limitX = document.body.clientWidth;
-            const limitY = window.innerHeight;
-
-            let x = elementRect.left;
-            let width = Math.max(containerWidth, options.general.popupWidth);
-            const overflowX = Math.max(x + width - limitX, 0);
-            if (overflowX > 0) {
-                if (x >= overflowX) {
-                    x -= overflowX;
-                } else {
-                    width = limitX;
-                    x = 0;
-                }
-            }
+    async show(elementRect, options) {
+        await this.inject();
+
+        const containerStyle = window.getComputedStyle(this.container);
+        const containerHeight = parseInt(containerStyle.height);
+        const containerWidth = parseInt(containerStyle.width);
+
+        const limitX = document.body.clientWidth;
+        const limitY = window.innerHeight;
 
-            let y = 0;
-            let height = Math.max(containerHeight, options.general.popupHeight);
-            const yBelow = elementRect.bottom + options.general.popupOffset;
-            const yAbove = elementRect.top - options.general.popupOffset;
-            const overflowBelow = Math.max(yBelow + height - limitY, 0);
-            const overflowAbove = Math.max(height - yAbove, 0);
-            if (overflowBelow > 0 || overflowAbove > 0) {
-                if (overflowBelow < overflowAbove) {
-                    height = Math.max(height - overflowBelow, 0);
-                    y = yBelow;
-                } else {
-                    height = Math.max(height - overflowAbove, 0);
-                    y = Math.max(yAbove - height, 0);
-                }
+        let x = elementRect.left;
+        let width = Math.max(containerWidth, options.general.popupWidth);
+        const overflowX = Math.max(x + width - limitX, 0);
+        if (overflowX > 0) {
+            if (x >= overflowX) {
+                x -= overflowX;
             } else {
+                width = limitX;
+                x = 0;
+            }
+        }
+
+        let y = 0;
+        let height = Math.max(containerHeight, options.general.popupHeight);
+        const yBelow = elementRect.bottom + options.general.popupOffset;
+        const yAbove = elementRect.top - options.general.popupOffset;
+        const overflowBelow = Math.max(yBelow + height - limitY, 0);
+        const overflowAbove = Math.max(height - yAbove, 0);
+        if (overflowBelow > 0 || overflowAbove > 0) {
+            if (overflowBelow < overflowAbove) {
+                height = Math.max(height - overflowBelow, 0);
                 y = yBelow;
+            } else {
+                height = Math.max(height - overflowAbove, 0);
+                y = Math.max(yAbove - height, 0);
             }
+        } else {
+            y = yBelow;
+        }
+
+        this.container.style.left = `${x}px`;
+        this.container.style.top = `${y}px`;
+        this.container.style.width = `${width}px`;
+        this.container.style.height = `${height}px`;
+        this.container.style.visibility = 'visible';
+    }
 
-            this.container.style.left = `${x}px`;
-            this.container.style.top = `${y}px`;
-            this.container.style.width = `${width}px`;
-            this.container.style.height = `${height}px`;
-            this.container.style.visibility = 'visible';
-        });
+    async showOrphaned(elementRect, options) {
+        await this.show(elementRect, options);
+        this.invokeApi('orphaned');
     }
 
     hide() {
@@ -95,22 +100,14 @@ class Popup {
         return this.injected && this.container.style.visibility !== 'hidden';
     }
 
-    showTermDefs(elementRect, definitions, options, context) {
-        this.show(elementRect, options).then(() => {
-            this.invokeApi('showTermDefs', {definitions, options, context});
-        });
-    }
-
-    showKanjiDefs(elementRect, definitions, options, context) {
-        this.show(elementRect, options).then(() => {
-            this.invokeApi('showKanjiDefs', {definitions, options, context});
-        });
+    async termsShow(elementRect, definitions, options, context) {
+        await this.show(elementRect, options);
+        this.invokeApi('termsShow', {definitions, options, context});
     }
 
-    showOrphaned(elementRect, options) {
-        this.show(elementRect, options).then(() => {
-            this.invokeApi('showOrphaned');
-        });
+    async kanjiShow(elementRect, definitions, options, context) {
+        await this.show(elementRect, options);
+        this.invokeApi('kanjiShow', {definitions, options, context});
     }
 
     invokeApi(action, params={}) {
diff --git a/ext/fg/js/source-element.js b/ext/fg/js/source-element.js
deleted file mode 100644
index a8101382..00000000
--- a/ext/fg/js/source-element.js
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 2016  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-class TextSourceElement {
-    constructor(element, content='') {
-        this.element = element;
-        this.content = content;
-    }
-
-    clone() {
-        return new TextSourceElement(this.element, this.content);
-    }
-
-    text() {
-        return this.content;
-    }
-
-    setEndOffset(length) {
-        switch (this.element.nodeName) {
-            case 'BUTTON':
-                this.content = this.element.innerHTML;
-                break;
-            case 'IMG':
-                this.content = this.element.getAttribute('alt');
-                break;
-            default:
-                this.content = this.element.value;
-                break;
-        }
-
-        this.content = this.content || '';
-        this.content = this.content.substring(0, length);
-
-        return this.content.length;
-    }
-
-    setStartOffset(length) {
-        return 0;
-    }
-
-    containsPoint(point) {
-        const rect = this.getRect();
-        return point.x >= rect.left && point.x <= rect.right;
-    }
-
-    getRect() {
-        return this.element.getBoundingClientRect();
-    }
-
-    select() {
-        // NOP
-    }
-
-    deselect() {
-        // NOP
-    }
-
-    equals(other) {
-        return other.element === this.element && other.content === this.content;
-    }
-}
diff --git a/ext/fg/js/source-range.js b/ext/fg/js/source.js
index fa73b0a4..3b6ecb2a 100644
--- a/ext/fg/js/source-range.js
+++ b/ext/fg/js/source.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016  Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2016-2017  Alex Yatskov <alex@foosoft.net>
  * Author: Alex Yatskov <alex@foosoft.net>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -17,6 +17,10 @@
  */
 
 
+/*
+ * TextSourceRange
+ */
+
 class TextSourceRange {
     constructor(range, content='') {
         this.range = range;
@@ -174,3 +178,67 @@ class TextSourceRange {
         return state.remainder > 0;
     }
 }
+
+
+/*
+ * TextSourceElement
+ */
+
+class TextSourceElement {
+    constructor(element, content='') {
+        this.element = element;
+        this.content = content;
+    }
+
+    clone() {
+        return new TextSourceElement(this.element, this.content);
+    }
+
+    text() {
+        return this.content;
+    }
+
+    setEndOffset(length) {
+        switch (this.element.nodeName) {
+            case 'BUTTON':
+                this.content = this.element.innerHTML;
+                break;
+            case 'IMG':
+                this.content = this.element.getAttribute('alt');
+                break;
+            default:
+                this.content = this.element.value;
+                break;
+        }
+
+        this.content = this.content || '';
+        this.content = this.content.substring(0, length);
+
+        return this.content.length;
+    }
+
+    setStartOffset(length) {
+        return 0;
+    }
+
+    containsPoint(point) {
+        const rect = this.getRect();
+        return point.x >= rect.left && point.x <= rect.right;
+    }
+
+    getRect() {
+        return this.element.getBoundingClientRect();
+    }
+
+    select() {
+        // NOP
+    }
+
+    deselect() {
+        // NOP
+    }
+
+    equals(other) {
+        return other.element === this.element && other.content === this.content;
+    }
+}
diff --git a/ext/fg/js/util.js b/ext/fg/js/util.js
index c6270ce6..5eff4018 100644
--- a/ext/fg/js/util.js
+++ b/ext/fg/js/util.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016  Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2016-2017  Alex Yatskov <alex@foosoft.net>
  * Author: Alex Yatskov <alex@foosoft.net>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -17,11 +17,13 @@
  */
 
 
-/*
- * Background
- */
+function utilAsync(func) {
+    return function(...args) {
+        func.apply(this, args);
+    };
+}
 
-function bgInvoke(action, params) {
+function utilInvoke(action, params={}) {
     return new Promise((resolve, reject) => {
         try {
             chrome.runtime.sendMessage({action, params}, ({result, error}) => {
@@ -32,185 +34,8 @@ function bgInvoke(action, params) {
                 }
             });
         } catch (e) {
-            window.orphaned = true;
+            window.yomichan_orphaned = true;
             reject(e.message);
         }
     });
 }
-
-function bgOptionsGet() {
-    return bgInvoke('optionsGet', {});
-}
-
-function bgTermsFind(text) {
-    return bgInvoke('termsFind', {text});
-}
-
-function bgKanjiFind(text) {
-    return bgInvoke('kanjiFind', {text});
-}
-
-function bgTemplateRender(template, data) {
-    return bgInvoke('templateRender', {data, template});
-}
-
-function bgDefinitionsAddable(definitions, modes) {
-    return bgInvoke('definitionsAddable', {definitions, modes}).catch(() => null);
-}
-
-function bgDefinitionAdd(definition, mode) {
-    return bgInvoke('definitionAdd', {definition, mode});
-}
-
-
-/*
- * Document
- */
-
-function docOffsetCalc(element) {
-    const scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop;
-    const scrollLeft = window.pageXOffset || document.documentElement.scrollLeft || document.body.scrollLeft;
-
-    const clientTop = document.documentElement.clientTop || document.body.clientTop || 0;
-    const clientLeft = document.documentElement.clientLeft || document.body.clientLeft || 0;
-
-    const rect = element.getBoundingClientRect();
-    const top  = Math.round(rect.top +  scrollTop - clientTop);
-    const left = Math.round(rect.left + scrollLeft - clientLeft);
-
-    return {top, left};
-}
-
-function docImposterCreate(element) {
-    const styleProps = window.getComputedStyle(element);
-    const stylePairs = [];
-    for (const key of styleProps) {
-        stylePairs.push(`${key}: ${styleProps[key]};`);
-    }
-
-    const offset = docOffsetCalc(element);
-    const imposter = document.createElement('div');
-    imposter.className = 'yomichan-imposter';
-    imposter.innerText = element.value;
-    imposter.style.cssText = stylePairs.join('\n');
-    imposter.style.position = 'absolute';
-    imposter.style.top = `${offset.top}px`;
-    imposter.style.left = `${offset.left}px`;
-    imposter.style.zIndex = 2147483646;
-    if (element.nodeName === 'TEXTAREA' && styleProps.overflow === 'visible') {
-        imposter.style.overflow = 'auto';
-    }
-
-    document.body.appendChild(imposter);
-    imposter.scrollTop = element.scrollTop;
-    imposter.scrollLeft = element.scrollLeft;
-}
-
-function docImposterDestroy() {
-    for (const element of document.getElementsByClassName('yomichan-imposter')) {
-        element.parentNode.removeChild(element);
-    }
-}
-
-function docRangeFromPoint(point) {
-    const element = document.elementFromPoint(point.x, point.y);
-    if (element !== null) {
-        if (element.nodeName === 'IMG' || element.nodeName === 'BUTTON') {
-            return new TextSourceElement(element);
-        } else if (element.nodeName === 'INPUT' || element.nodeName === 'TEXTAREA') {
-            docImposterCreate(element);
-        }
-    }
-
-    if (!document.caretRangeFromPoint) {
-        document.caretRangeFromPoint = (x, y) => {
-            const position = document.caretPositionFromPoint(x,y);
-            if (position === null) {
-                return null;
-            }
-
-            const range = document.createRange();
-            range.setStart(position.offsetNode, position.offset);
-            range.setEnd(position.offsetNode, position.offset);
-            return range;
-        };
-    }
-
-    const range = document.caretRangeFromPoint(point.x, point.y);
-    if (range !== null) {
-        return new TextSourceRange(range);
-    }
-
-    return null;
-}
-
-function docSentenceExtract(source, extent) {
-    const quotesFwd = {'「': '」', '『': '』', "'": "'", '"': '"'};
-    const quotesBwd = {'」': '「', '』': '『', "'": "'", '"': '"'};
-    const terminators = '…。．.？?！!';
-
-    const sourceLocal = source.clone();
-    const position = sourceLocal.setStartOffset(extent);
-    sourceLocal.setEndOffset(position + extent);
-    const content = sourceLocal.text();
-
-    let quoteStack = [];
-
-    let startPos = 0;
-    for (let i = position; i >= startPos; --i) {
-        const c = content[i];
-
-        if (c === '\n') {
-            startPos = i + 1;
-            break;
-        }
-
-        if (quoteStack.length === 0 && (terminators.includes(c) || c in quotesFwd)) {
-            startPos = i + 1;
-            break;
-        }
-
-        if (quoteStack.length > 0 && c === quoteStack[0]) {
-            quoteStack.pop();
-        } else if (c in quotesBwd) {
-            quoteStack = [quotesBwd[c]].concat(quoteStack);
-        }
-    }
-
-    quoteStack = [];
-
-    let endPos = content.length;
-    for (let i = position; i <= endPos; ++i) {
-        const c = content[i];
-
-        if (c === '\n') {
-            endPos = i + 1;
-            break;
-        }
-
-        if (quoteStack.length === 0) {
-            if (terminators.includes(c)) {
-                endPos = i + 1;
-                break;
-            }
-            else if (c in quotesBwd) {
-                endPos = i;
-                break;
-            }
-        }
-
-        if (quoteStack.length > 0 && c === quoteStack[0]) {
-            quoteStack.pop();
-        } else if (c in quotesFwd) {
-            quoteStack = [quotesFwd[c]].concat(quoteStack);
-        }
-    }
-
-    const text = content.substring(startPos, endPos);
-    const padding = text.length - text.replace(/^\s+/, '').length;
-
-    return {
-        text: text.trim(),
-        offset: position - startPos - padding
-    };
-}
diff --git a/ext/manifest.json b/ext/manifest.json
index ef0be459..f0c67020 100644
--- a/ext/manifest.json
+++ b/ext/manifest.json
@@ -1,13 +1,13 @@
 {
     "manifest_version": 2,
     "name": "Yomichan",
-    "version": "1.2.0",
+    "version": "1.3.0",
 
     "description": "Japanese dictionary with Anki integration",
     "icons": {"16": "mixed/img/icon16.png", "48": "mixed/img/icon48.png", "128": "mixed/img/icon128.png"},
     "browser_action": {
         "default_icon": {"19": "mixed/img/icon19.png", "38": "mixed/img/icon38.png"},
-        "default_popup": "bg/popup.html"
+        "default_popup": "bg/context.html"
     },
 
     "author": "Alex Yatskov",
@@ -15,17 +15,18 @@
     "content_scripts": [{
         "matches": ["http://*/*", "https://*/*", "file://*/*"],
         "js": [
-            "fg/js/util.js",
-            "fg/js/source-range.js",
-            "fg/js/source-element.js",
+            "fg/js/api.js",
+            "fg/js/document.js",
             "fg/js/popup.js",
-            "fg/js/driver.js"
+            "fg/js/source.js",
+            "fg/js/util.js",
+            "fg/js/frontend.js"
         ],
         "css": ["fg/css/client.css"]
     }],
-    "minimum_chrome_version": "45.0.0.0",
+    "minimum_chrome_version": "57.0.0.0",
     "options_ui": {
-        "page": "bg/options.html"
+        "page": "bg/settings.html"
     },
     "permissions": [
         "<all_urls>",
@@ -46,11 +47,11 @@
             "description": "Open search window"
         }
     },
-    "web_accessible_resources": ["fg/frame.html"],
+    "web_accessible_resources": ["fg/float.html"],
     "applications": {
         "gecko": {
             "id": "yomichan-live@foosoft.net",
-            "strict_min_version": "51.0",
+            "strict_min_version": "52.0",
             "update_url": "https://foosoft.net/projects/yomichan/dl/updates.json"
         }
     }
diff --git a/ext/mixed/css/frame.css b/ext/mixed/css/display.css
index a0b45fa4..8b1819bd 100644
--- a/ext/mixed/css/frame.css
+++ b/ext/mixed/css/display.css
@@ -42,7 +42,7 @@ hr {
     right: 5px;
 }
 
-#orphan {
+#error-orphaned {
     display: none;
 }
 
diff --git a/ext/mixed/img/view-note.png b/ext/mixed/img/view-note.png
new file mode 100644
index 00000000..7d863f94
--- /dev/null
+++ b/ext/mixed/img/view-note.png
diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js
index 7982c69f..47efd195 100644
--- a/ext/mixed/js/display.js
+++ b/ext/mixed/js/display.js
@@ -27,190 +27,67 @@ class Display {
         this.sequence = 0;
         this.index = 0;
         this.audioCache = {};
-        this.responseCache = {};
 
         $(document).keydown(this.onKeyDown.bind(this));
     }
 
-    definitionAdd(definition, mode) {
+    onError(error) {
         throw 'override me';
     }
 
-    definitionsAddable(definitions, modes) {
+    onSearchClear() {
         throw 'override me';
     }
 
-    templateRender(template, data) {
-        throw 'override me';
-    }
-
-    kanjiFind(character) {
-        throw 'override me';
-    }
-
-    handleError(error) {
-        throw 'override me';
-    }
-
-    clearSearch() {
-        throw 'override me';
-    }
-
-    showTermDefs(definitions, options, context) {
-        window.focus();
-
-        this.spinner.hide();
-        this.definitions = definitions;
-        this.options = options;
-        this.context = context;
-
-        const sequence = ++this.sequence;
-        const params = {
-            definitions,
-            addable: options.anki.enable,
-            grouped: options.general.groupResults,
-            playback: options.general.audioSource !== 'disabled',
-            debug: options.general.debugInfo
-        };
-
-        if (context) {
-            for (const definition of definitions) {
-                if (context.sentence) {
-                    definition.cloze = clozeBuild(context.sentence, definition.source);
-                }
-
-                definition.url = context.url;
-            }
-        }
-
-        this.templateRender('terms.html', params).then(content => {
-            this.container.html(content);
-            this.entryScroll(context && context.index || 0);
-
-            $('.action-add-note').click(this.onAddNote.bind(this));
-            $('.action-play-audio').click(this.onPlayAudio.bind(this));
-            $('.kanji-link').click(this.onKanjiLookup.bind(this));
-
-            return this.adderButtonsUpdate(['term-kanji', 'term-kana'], sequence);
-        }).catch(this.handleError.bind(this));
-    }
-
-    showKanjiDefs(definitions, options, context) {
-        window.focus();
-
-        this.spinner.hide();
-        this.definitions = definitions;
-        this.options = options;
-        this.context = context;
-
-        const sequence = ++this.sequence;
-        const params = {
-            definitions,
-            source: context && context.source,
-            addable: options.anki.enable,
-            debug: options.general.debugInfo
-        };
-
-        if (context) {
-            for (const definition of definitions) {
-                if (context.sentence) {
-                    definition.cloze = clozeBuild(context.sentence);
-                }
-
-                definition.url = context.url;
-            }
-        }
-
-        this.templateRender('kanji.html', params).then(content => {
-            this.container.html(content);
-            this.entryScroll(context && context.index || 0);
-
-            $('.action-add-note').click(this.onAddNote.bind(this));
-            $('.source-term').click(this.onSourceTerm.bind(this));
-
-            return this.adderButtonsUpdate(['kanji'], sequence);
-        }).catch(this.handleError.bind(this));
+    onSourceTermView(e) {
+        e.preventDefault();
+        this.sourceTermView();
     }
 
-    adderButtonsUpdate(modes, sequence) {
-        return this.definitionsAddable(this.definitions, modes).then(states => {
-            if (states === null || sequence !== this.sequence) {
-                return;
-            }
-
-            states.forEach((state, index) => {
-                for (const mode in state) {
-                    const button = Display.adderButtonFind(index, mode);
-                    if (state[mode]) {
-                        button.removeClass('disabled');
-                    } else {
-                        button.addClass('disabled');
-                    }
+    async onKanjiLookup(e) {
+        try {
+            e.preventDefault();
 
-                    button.removeClass('pending');
+            const link = $(e.target);
+            const context = {
+                source: {
+                    definitions: this.definitions,
+                    index: Display.entryIndexFind(link)
                 }
-            });
-        });
-    }
-
-    entryScroll(index, smooth) {
-        index = Math.min(index, this.definitions.length - 1);
-        index = Math.max(index, 0);
-
-        $('.current').hide().eq(index).show();
-
-        const container = $('html,body').stop();
-        const entry = $('.entry').eq(index);
-        const target = index === 0 ? 0 : entry.offset().top;
-
-        if (smooth) {
-            container.animate({scrollTop: target}, 200);
-        } else {
-            container.scrollTop(target);
-        }
-
-        this.index = index;
-    }
-
-    onSourceTerm(e) {
-        e.preventDefault();
-        this.sourceBack();
-    }
-
-    onKanjiLookup(e) {
-        e.preventDefault();
+            };
 
-        const link = $(e.target);
-        const context = {
-            source: {
-                definitions: this.definitions,
-                index: Display.entryIndexFind(link)
+            if (this.context) {
+                context.sentence = this.context.sentence;
+                context.url = this.context.url;
             }
-        };
 
-        if (this.context) {
-            context.sentence = this.context.sentence;
-            context.url = this.context.url;
+            const kanjiDefs = await apiKanjiFind(link.text());
+            this.kanjiShow(kanjiDefs, this.options, context);
+        } catch (e) {
+            this.onError(e);
         }
-
-        this.kanjiFind(link.text()).then(kanjiDefs => {
-            this.showKanjiDefs(kanjiDefs, this.options, context);
-        }).catch(this.handleError.bind(this));
     }
 
-    onPlayAudio(e) {
+    onAudioPlay(e) {
         e.preventDefault();
         const index = Display.entryIndexFind($(e.currentTarget));
         this.audioPlay(this.definitions[index]);
     }
 
-    onAddNote(e) {
+    onNoteAdd(e) {
         e.preventDefault();
         const link = $(e.currentTarget);
         const index = Display.entryIndexFind(link);
         this.noteAdd(this.definitions[index], link.data('mode'));
     }
 
+    onNoteView(e) {
+        e.preventDefault();
+        const link = $(e.currentTarget);
+        const index = Display.entryIndexFind(link);
+        apiNoteView(link.data('noteId'));
+    }
+
     onKeyDown(e) {
         const noteTryAdd = mode => {
             const button = Display.adderButtonFind(this.index, mode);
@@ -219,57 +96,64 @@ class Display {
             }
         };
 
+        const noteTryView = mode => {
+            const button = Display.viewerButtonFind(this.index);
+            if (button.length !== 0 && !button.hasClass('disabled')) {
+                apiNoteView(button.data('noteId'));
+            }
+        };
+
         const handlers = {
             27: /* escape */ () => {
-                this.clearSearch();
+                this.onSearchClear();
                 return true;
             },
 
             33: /* page up */ () => {
                 if (e.altKey) {
-                    this.entryScroll(this.index - 3, true);
+                    this.entryScrollIntoView(this.index - 3, true);
                     return true;
                 }
             },
 
             34: /* page down */ () => {
                 if (e.altKey) {
-                    this.entryScroll(this.index + 3, true);
+                    this.entryScrollIntoView(this.index + 3, true);
                     return true;
                 }
             },
 
             35: /* end */ () => {
                 if (e.altKey) {
-                    this.entryScroll(this.definitions.length - 1, true);
+                    this.entryScrollIntoView(this.definitions.length - 1, true);
                     return true;
                 }
             },
 
             36: /* home */ () => {
                 if (e.altKey) {
-                    this.entryScroll(0, true);
+                    this.entryScrollIntoView(0, true);
                     return true;
                 }
             },
 
             38: /* up */ () => {
                 if (e.altKey) {
-                    this.entryScroll(this.index - 1, true);
+                    this.entryScrollIntoView(this.index - 1, true);
                     return true;
                 }
             },
 
             40: /* down */ () => {
                 if (e.altKey) {
-                    this.entryScroll(this.index + 1, true);
+                    this.entryScrollIntoView(this.index + 1, true);
                     return true;
                 }
             },
 
             66: /* b */ () => {
                 if (e.altKey) {
-                    this.sourceBack();
+                    this.sourceTermView();
                     return true;
                 }
             },
@@ -303,6 +187,12 @@ class Display {
 
                     return true;
                 }
+            },
+
+            86: /* v */ () => {
+                if (e.altKey) {
+                    noteTryView();
+                }
             }
         };
 
@@ -312,7 +202,133 @@ class Display {
         }
     }
 
-    sourceBack() {
+    async termsShow(definitions, options, context) {
+        try {
+            window.focus();
+
+            this.definitions = definitions;
+            this.options = options;
+            this.context = context;
+
+            const sequence = ++this.sequence;
+            const params = {
+                definitions,
+                addable: options.anki.enable,
+                grouped: options.general.groupResults,
+                playback: options.general.audioSource !== 'disabled',
+                debug: options.general.debugInfo
+            };
+
+            if (context) {
+                for (const definition of definitions) {
+                    if (context.sentence) {
+                        definition.cloze = Display.clozeBuild(context.sentence, definition.source);
+                    }
+
+                    definition.url = context.url;
+                }
+            }
+
+            const content = await apiTemplateRender('terms.html', params);
+            this.container.html(content);
+            this.entryScrollIntoView(context && context.index || 0);
+
+            $('.action-add-note').click(this.onNoteAdd.bind(this));
+            $('.action-view-note').click(this.onNoteView.bind(this));
+            $('.action-play-audio').click(this.onAudioPlay.bind(this));
+            $('.kanji-link').click(this.onKanjiLookup.bind(this));
+
+            await this.adderButtonUpdate(['term-kanji', 'term-kana'], sequence);
+        } catch (e) {
+            this.onError(e);
+        }
+    }
+
+    async kanjiShow(definitions, options, context) {
+        try {
+            window.focus();
+
+            this.definitions = definitions;
+            this.options = options;
+            this.context = context;
+
+            const sequence = ++this.sequence;
+            const params = {
+                definitions,
+                source: context && context.source,
+                addable: options.anki.enable,
+                debug: options.general.debugInfo
+            };
+
+            if (context) {
+                for (const definition of definitions) {
+                    if (context.sentence) {
+                        definition.cloze = Display.clozeBuild(context.sentence);
+                    }
+
+                    definition.url = context.url;
+                }
+            }
+
+            const content = await apiTemplateRender('kanji.html', params);
+            this.container.html(content);
+            this.entryScrollIntoView(context && context.index || 0);
+
+            $('.action-add-note').click(this.onNoteAdd.bind(this));
+            $('.action-view-note').click(this.onNoteView.bind(this));
+            $('.source-term').click(this.onSourceTermView.bind(this));
+
+            await this.adderButtonUpdate(['kanji'], sequence);
+        } catch (e) {
+            this.onError(e);
+        }
+    }
+
+    async adderButtonUpdate(modes, sequence) {
+        try {
+            const states = await apiDefinitionsAddable(this.definitions, modes);
+            if (!states || sequence !== this.sequence) {
+                return;
+            }
+
+            for (let i = 0; i < states.length; ++i) {
+                const state = states[i];
+                for (const mode in state) {
+                    const button = Display.adderButtonFind(i, mode);
+                    if (state[mode]) {
+                        button.removeClass('disabled');
+                    } else {
+                        button.addClass('disabled');
+                    }
+
+                    button.removeClass('pending');
+                }
+            }
+        } catch (e) {
+            this.onError(e);
+        }
+    }
+
+    entryScrollIntoView(index, smooth) {
+        index = Math.min(index, this.definitions.length - 1);
+        index = Math.max(index, 0);
+
+        $('.current').hide().eq(index).show();
+
+        const container = $('html,body').stop();
+        const entry = $('.entry').eq(index);
+        const target = index === 0 ? 0 : entry.offset().top;
+
+        if (smooth) {
+            container.animate({scrollTop: target}, 200);
+        } else {
+            container.scrollTop(target);
+        }
+
+        this.index = index;
+    }
+
+    sourceTermView() {
         if (this.context && this.context.source) {
             const context = {
                 url: this.context.source.url,
@@ -320,34 +336,42 @@ class Display {
                 index: this.context.source.index
             };
 
-            this.showTermDefs(this.context.source.definitions, this.options, context);
+            this.termsShow(this.context.source.definitions, this.options, context);
         }
     }
 
-    noteAdd(definition, mode) {
-        this.spinner.show();
-        return this.definitionAdd(definition, mode).then(success => {
-            if (success) {
+    async noteAdd(definition, mode) {
+        try {
+            this.spinner.show();
+
+            const noteId = await apiDefinitionAdd(definition, mode);
+            if (noteId) {
                 const index = this.definitions.indexOf(definition);
                 Display.adderButtonFind(index, mode).addClass('disabled');
+                Display.viewerButtonFind(index).removeClass('pending disabled').data('noteId', noteId);
             } else {
-                this.handleError('note could not be added');
+                throw 'note could note be added';
             }
-        }).catch(this.handleError.bind(this)).then(() => this.spinner.hide());
+        } catch (e) {
+            this.onError(e);
+        } finally {
+            this.spinner.hide();
+        }
     }
 
-    audioPlay(definition) {
-        this.spinner.show();
+    async audioPlay(definition) {
+        try {
+            this.spinner.show();
 
-        for (const key in this.audioCache) {
-            this.audioCache[key].pause();
-        }
-
-        audioBuildUrl(definition, this.options.general.audioSource, this.responseCache).then(url => {
+            let url = await apiAudioGetUrl(definition, this.options.general.audioSource);
             if (!url) {
                 url = '/mixed/mp3/button.mp3';
             }
 
+            for (const key in this.audioCache) {
+                this.audioCache[key].pause();
+            }
+
             let audio = this.audioCache[url];
             if (audio) {
                 audio.currentTime = 0;
@@ -365,7 +389,25 @@ class Display {
                     audio.play();
                 };
             }
-        }).catch(this.handleError.bind(this)).then(() => this.spinner.hide());
+        } catch (e) {
+            this.onError(e);
+        } finally {
+            this.spinner.hide();
+        }
+    }
+
+    static clozeBuild(sentence, source) {
+        const result = {
+            sentence: sentence.text.trim()
+        };
+
+        if (source) {
+            result.prefix = sentence.text.substring(0, sentence.offset).trim();
+            result.body = source.trim();
+            result.suffix = sentence.text.substring(sentence.offset + source.length).trim();
+        }
+
+        return result;
     }
 
     static entryIndexFind(element) {
@@ -375,4 +417,8 @@ class Display {
     static adderButtonFind(index, mode) {
         return $('.entry').eq(index).find(`.action-add-note[data-mode="${mode}"]`);
     }
+
+    static viewerButtonFind(index) {
+        return $('.entry').eq(index).find('.action-view-note');
+    }
 }
diff --git a/ext/bg/js/anki-null.js b/ext/mixed/js/japanese.js
index 99dc2f30..c11e955b 100644
--- a/ext/bg/js/anki-null.js
+++ b/ext/mixed/js/japanese.js
@@ -17,24 +17,24 @@
  */
 
 
-class AnkiNull {
-    addNote(note) {
-        return Promise.reject('unsupported action');
-    }
-
-    canAddNotes(notes) {
-        return Promise.resolve([]);
-    }
+function jpIsKanji(c) {
+    const code = c.charCodeAt(0);
+    return code >= 0x4e00 && code < 0x9fb0 || code >= 0x3400 && code < 0x4dc0;
+}
 
-    getDeckNames() {
-        return Promise.resolve([]);
-    }
+function jpIsKana(c) {
+    return wanakana.isKana(c);
+}
 
-    getModelNames() {
-        return Promise.resolve([]);
+function jpKatakanaToHiragana(text) {
+    let result = '';
+    for (const c of text) {
+        if (wanakana.isKatakana(c)) {
+            result += wanakana.toHiragana(c);
+        } else {
+            result += c;
+        }
     }
 
-    getModelFieldNames(modelName) {
-        return Promise.resolve([]);
-    }
+    return result;
 }
diff --git a/ext/mixed/lib/wanakana.min.js b/ext/mixed/lib/wanakana.min.js
index 6c954785..bfc36d56 100644
--- a/ext/mixed/lib/wanakana.min.js
+++ b/ext/mixed/lib/wanakana.min.js
@@ -1 +1 @@
-var wanakana,__indexOf=[].indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(b in this&&this[b]===a)return b;return-1};wanakana=wanakana||{},wanakana.version="1.3.9","function"==typeof define&&define.amd&&define("wanakana",[],function(){return wanakana}),wanakana.LOWERCASE_START=97,wanakana.LOWERCASE_END=122,wanakana.UPPERCASE_START=65,wanakana.UPPERCASE_END=90,wanakana.HIRAGANA_START=12353,wanakana.HIRAGANA_END=12438,wanakana.KATAKANA_START=12449,wanakana.KATAKANA_END=12538,wanakana.LOWERCASE_FULLWIDTH_START=65345,wanakana.LOWERCASE_FULLWIDTH_END=65370,wanakana.UPPERCASE_FULLWIDTH_START=65313,wanakana.UPPERCASE_FULLWIDTH_END=65338,wanakana.defaultOptions={useObseleteKana:!1,IMEMode:!1,convertKatakanaToUppercase:!1},wanakana.bind=function(a){return a.addEventListener("input",wanakana._onInput)},wanakana.unbind=function(a){return a.removeEventListener("input",wanakana._onInput)},wanakana._onInput=function(a){var b,c,d,e,f,g;if(b=a.target,f=b.selectionStart,g=b.value.length,d=wanakana._convertFullwidthCharsToASCII(b.value),c=wanakana.toKana(d,{IMEMode:!0}),d!==c){if(b.value=c,"number"==typeof b.selectionStart)return b.selectionStart=b.selectionEnd=b.value.length;if("undefined"!=typeof b.createTextRange)return b.focus(),e=b.createTextRange(),e.collapse(!1),e.select()}},wanakana._extend=function(a,b){var c;if(null==a)return b;for(c in b)null==a[c]&&null!=b[c]&&(a[c]=b[c]);return a},wanakana._isCharInRange=function(a,b,c){var d;return d=a.charCodeAt(0),d>=b&&c>=d},wanakana._isCharVowel=function(a,b){var c;return null==b&&(b=!0),c=b?/[aeiouy]/:/[aeiou]/,-1!==a.toLowerCase().charAt(0).search(c)},wanakana._isCharConsonant=function(a,b){var c;return null==b&&(b=!0),c=b?/[bcdfghjklmnpqrstvwxyz]/:/[bcdfghjklmnpqrstvwxz]/,-1!==a.toLowerCase().charAt(0).search(c)},wanakana._isCharKatakana=function(a){return wanakana._isCharInRange(a,wanakana.KATAKANA_START,wanakana.KATAKANA_END)},wanakana._isCharHiragana=function(a){return wanakana._isCharInRange(a,wanakana.HIRAGANA_START,wanakana.HIRAGANA_END)},wanakana._isCharKana=function(a){return wanakana._isCharHiragana(a)||wanakana._isCharKatakana(a)},wanakana._isCharNotKana=function(a){return!wanakana._isCharHiragana(a)&&!wanakana._isCharKatakana(a)},wanakana._convertFullwidthCharsToASCII=function(a){var b,c,d,e,f,g;for(c=a.split(""),e=f=0,g=c.length;g>f;e=++f)b=c[e],d=b.charCodeAt(0),wanakana._isCharInRange(b,wanakana.LOWERCASE_FULLWIDTH_START,wanakana.LOWERCASE_FULLWIDTH_END)&&(c[e]=String.fromCharCode(d-wanakana.LOWERCASE_FULLWIDTH_START+wanakana.LOWERCASE_START)),wanakana._isCharInRange(b,wanakana.UPPERCASE_FULLWIDTH_START,wanakana.UPPERCASE_FULLWIDTH_END)&&c[e](String.fromCharCode(d-wanakana.UPPERCASE_FULLWIDTH_START+wanakana.UPPERCASE_START));return c.join("")},wanakana._katakanaToHiragana=function(a){var b,c,d,e,f,g,h;for(c=[],h=a.split(""),f=0,g=h.length;g>f;f++)e=h[f],wanakana._isCharKatakana(e)?(b=e.charCodeAt(0),b+=wanakana.HIRAGANA_START-wanakana.KATAKANA_START,d=String.fromCharCode(b),c.push(d)):c.push(e);return c.join("")},wanakana._hiraganaToKatakana=function(a){var b,c,d,e,f,g,h;for(d=[],h=a.split(""),f=0,g=h.length;g>f;f++)c=h[f],wanakana._isCharHiragana(c)?(b=c.charCodeAt(0),b+=wanakana.KATAKANA_START-wanakana.HIRAGANA_START,e=String.fromCharCode(b),d.push(e)):d.push(c);return d.join("")},wanakana._hiraganaToRomaji=function(a,b){var c,d,e,f,g,h,i,j,k,l,m;for(b=wanakana._extend(b,wanakana.defaultOptions),h=a.length,l=[],f=0,d=0,i=2,g=function(){return a.substr(f,d)},k=function(){return d=Math.min(i,h-f)};h>f;){for(e=!1,k();d>0;){if(c=g(),wanakana.isKatakana(c)&&(e=b.convertKatakanaToUppercase,c=wanakana._katakanaToHiragana(c)),"っ"===c.charAt(0)&&1===d&&h-1>f){j=!0,m="";break}if(m=wanakana.J_to_R[c],null!=m&&j&&(m=m.charAt(0).concat(m),j=!1),null!=m)break;d--}null==m&&(m=c),e&&(m=m.toUpperCase()),l.push(m),f+=d||1}return l.join("")},wanakana._romajiToHiragana=function(a,b){return wanakana._romajiToKana(a,b,!0)},wanakana._romajiToKana=function(a,b,c){var d,e,f,g,h,i,j,k,l,m;for(null==c&&(c=!1),b=wanakana._extend(b,wanakana.defaultOptions),l=a.length,j=[],g=0,m=3,h=function(){return a.substr(g,f)},i=function(a){return wanakana._isCharInRange(a,wanakana.UPPERCASE_START,wanakana.UPPERCASE_END)};l>g;){for(f=Math.min(m,l-g);f>0;){if(d=h(),e=d.toLowerCase(),__indexOf.call(wanakana.FOUR_CHARACTER_EDGE_CASES,e)>=0&&l-g>=4)f++,d=h(),e=d.toLowerCase();else{if("n"===e.charAt(0)){if(2===f){if(!b.IMEMode&&" "===e.charAt(1)){k="ん ";break}if(b.IMEMode&&"'"===e.charAt(1)){k="ん";break}}wanakana._isCharConsonant(e.charAt(1),!1)&&wanakana._isCharVowel(e.charAt(2))&&(f=1,d=h(),e=d.toLowerCase())}"n"!==e.charAt(0)&&wanakana._isCharConsonant(e.charAt(0))&&d.charAt(0)===d.charAt(1)&&(f=1,e=d=wanakana._isCharInRange(d.charAt(0),wanakana.UPPERCASE_START,wanakana.UPPERCASE_END)?"ッ":"っ")}if(k=wanakana.R_to_J[e],null!=k)break;4===f?f-=2:f--}null==k&&(d=wanakana._convertPunctuation(d),k=d),(null!=b?b.useObseleteKana:void 0)&&("wi"===e&&(k="ゐ"),"we"===e&&(k="ゑ")),b.IMEMode&&"n"===e.charAt(0)&&("y"===a.charAt(g+1).toLowerCase()&&wanakana._isCharVowel(a.charAt(g+2))===!1||g===l-1||wanakana.isKana(a.charAt(g+1)))&&(k=d.charAt(0)),c||i(d.charAt(0))&&(k=wanakana._hiraganaToKatakana(k)),j.push(k),g+=f||1}return j.join("")},wanakana._convertPunctuation=function(a,b){return"　"===a?" ":"-"===a?"ー":a},wanakana.isHiragana=function(a){var b;return b=a.split(""),b.every(wanakana._isCharHiragana)},wanakana.isKatakana=function(a){var b;return b=a.split(""),b.every(wanakana._isCharKatakana)},wanakana.isKana=function(a){var b;return b=a.split(""),b.every(function(a){return wanakana.isHiragana(a)||wanakana.isKatakana(a)})},wanakana.isRomaji=function(a){var b;return b=a.split(""),b.every(function(a){return!wanakana.isHiragana(a)&&!wanakana.isKatakana(a)})},wanakana.toHiragana=function(a,b){return wanakana.isRomaji(a)?a=wanakana._romajiToHiragana(a,b):wanakana.isKatakana(a)?a=wanakana._katakanaToHiragana(a,b):a},wanakana.toKatakana=function(a,b){return wanakana.isHiragana(a)?a=wanakana._hiraganaToKatakana(a,b):wanakana.isRomaji(a)?(a=wanakana._romajiToHiragana(a,b),a=wanakana._hiraganaToKatakana(a,b)):a},wanakana.toKana=function(a,b){return a=wanakana._romajiToKana(a,b)},wanakana.toRomaji=function(a,b){return a=wanakana._hiraganaToRomaji(a,b)},wanakana.R_to_J={a:"あ",i:"い",u:"う",e:"え",o:"お",yi:"い",wu:"う",whu:"う",xa:"ぁ",xi:"ぃ",xu:"ぅ",xe:"ぇ",xo:"ぉ",xyi:"ぃ",xye:"ぇ",ye:"いぇ",wha:"うぁ",whi:"うぃ",whe:"うぇ",who:"うぉ",wi:"うぃ",we:"うぇ",va:"ゔぁ",vi:"ゔぃ",vu:"ゔ",ve:"ゔぇ",vo:"ゔぉ",vya:"ゔゃ",vyi:"ゔぃ",vyu:"ゔゅ",vye:"ゔぇ",vyo:"ゔょ",ka:"か",ki:"き",ku:"く",ke:"け",ko:"こ",lka:"ヵ",lke:"ヶ",xka:"ヵ",xke:"ヶ",kya:"きゃ",kyi:"きぃ",kyu:"きゅ",kye:"きぇ",kyo:"きょ",ca:"か",ci:"き",cu:"く",ce:"け",co:"こ",lca:"ヵ",lce:"ヶ",xca:"ヵ",xce:"ヶ",qya:"くゃ",qyu:"くゅ",qyo:"くょ",qwa:"くぁ",qwi:"くぃ",qwu:"くぅ",qwe:"くぇ",qwo:"くぉ",qa:"くぁ",qi:"くぃ",qe:"くぇ",qo:"くぉ",kwa:"くぁ",qyi:"くぃ",qye:"くぇ",ga:"が",gi:"ぎ",gu:"ぐ",ge:"げ",go:"ご",gya:"ぎゃ",gyi:"ぎぃ",gyu:"ぎゅ",gye:"ぎぇ",gyo:"ぎょ",gwa:"ぐぁ",gwi:"ぐぃ",gwu:"ぐぅ",gwe:"ぐぇ",gwo:"ぐぉ",sa:"さ",si:"し",shi:"し",su:"す",se:"せ",so:"そ",za:"ざ",zi:"じ",zu:"ず",ze:"ぜ",zo:"ぞ",ji:"じ",sya:"しゃ",syi:"しぃ",syu:"しゅ",sye:"しぇ",syo:"しょ",sha:"しゃ",shu:"しゅ",she:"しぇ",sho:"しょ",shya:"しゃ",shyu:"しゅ",shye:"しぇ",shyo:"しょ",swa:"すぁ",swi:"すぃ",swu:"すぅ",swe:"すぇ",swo:"すぉ",zya:"じゃ",zyi:"じぃ",zyu:"じゅ",zye:"じぇ",zyo:"じょ",ja:"じゃ",ju:"じゅ",je:"じぇ",jo:"じょ",jya:"じゃ",jyi:"じぃ",jyu:"じゅ",jye:"じぇ",jyo:"じょ",ta:"た",ti:"ち",tu:"つ",te:"て",to:"と",chi:"ち",tsu:"つ",ltu:"っ",xtu:"っ",tya:"ちゃ",tyi:"ちぃ",tyu:"ちゅ",tye:"ちぇ",tyo:"ちょ",cha:"ちゃ",chu:"ちゅ",che:"ちぇ",cho:"ちょ",cya:"ちゃ",cyi:"ちぃ",cyu:"ちゅ",cye:"ちぇ",cyo:"ちょ",chya:"ちゃ",chyu:"ちゅ",chye:"ちぇ",chyo:"ちょ",tsa:"つぁ",tsi:"つぃ",tse:"つぇ",tso:"つぉ",tha:"てゃ",thi:"てぃ",thu:"てゅ",the:"てぇ",tho:"てょ",twa:"とぁ",twi:"とぃ",twu:"とぅ",twe:"とぇ",two:"とぉ",da:"だ",di:"ぢ",du:"づ",de:"で","do":"ど",dya:"ぢゃ",dyi:"ぢぃ",dyu:"ぢゅ",dye:"ぢぇ",dyo:"ぢょ",dha:"でゃ",dhi:"でぃ",dhu:"でゅ",dhe:"でぇ",dho:"でょ",dwa:"どぁ",dwi:"どぃ",dwu:"どぅ",dwe:"どぇ",dwo:"どぉ",na:"な",ni:"に",nu:"ぬ",ne:"ね",no:"の",nya:"にゃ",nyi:"にぃ",nyu:"にゅ",nye:"にぇ",nyo:"にょ",ha:"は",hi:"ひ",hu:"ふ",he:"へ",ho:"ほ",fu:"ふ",hya:"ひゃ",hyi:"ひぃ",hyu:"ひゅ",hye:"ひぇ",hyo:"ひょ",fya:"ふゃ",fyu:"ふゅ",fyo:"ふょ",fwa:"ふぁ",fwi:"ふぃ",fwu:"ふぅ",fwe:"ふぇ",fwo:"ふぉ",fa:"ふぁ",fi:"ふぃ",fe:"ふぇ",fo:"ふぉ",fyi:"ふぃ",fye:"ふぇ",ba:"ば",bi:"び",bu:"ぶ",be:"べ",bo:"ぼ",bya:"びゃ",byi:"びぃ",byu:"びゅ",bye:"びぇ",byo:"びょ",pa:"ぱ",pi:"ぴ",pu:"ぷ",pe:"ぺ",po:"ぽ",pya:"ぴゃ",pyi:"ぴぃ",pyu:"ぴゅ",pye:"ぴぇ",pyo:"ぴょ",ma:"ま",mi:"み",mu:"む",me:"め",mo:"も",mya:"みゃ",myi:"みぃ",myu:"みゅ",mye:"みぇ",myo:"みょ",ya:"や",yu:"ゆ",yo:"よ",xya:"ゃ",xyu:"ゅ",xyo:"ょ",ra:"ら",ri:"り",ru:"る",re:"れ",ro:"ろ",rya:"りゃ",ryi:"りぃ",ryu:"りゅ",rye:"りぇ",ryo:"りょ",la:"ら",li:"り",lu:"る",le:"れ",lo:"ろ",lya:"りゃ",lyi:"りぃ",lyu:"りゅ",lye:"りぇ",lyo:"りょ",wa:"わ",wo:"を",lwe:"ゎ",xwa:"ゎ",n:"ん",nn:"ん","n ":"ん",xn:"ん",ltsu:"っ"},wanakana.FOUR_CHARACTER_EDGE_CASES=["lts","chy","shy"],wanakana.J_to_R={"あ":"a","い":"i","う":"u","え":"e","お":"o","ゔぁ":"va","ゔぃ":"vi","ゔ":"vu","ゔぇ":"ve","ゔぉ":"vo","か":"ka","き":"ki","きゃ":"kya","きぃ":"kyi","きゅ":"kyu","く":"ku","け":"ke","こ":"ko","が":"ga","ぎ":"gi","ぐ":"gu","げ":"ge","ご":"go","ぎゃ":"gya","ぎぃ":"gyi","ぎゅ":"gyu","ぎぇ":"gye","ぎょ":"gyo","さ":"sa","す":"su","せ":"se","そ":"so","ざ":"za","ず":"zu","ぜ":"ze","ぞ":"zo","し":"shi","しゃ":"sha","しゅ":"shu","しょ":"sho","じ":"ji","じゃ":"ja","じゅ":"ju","じょ":"jo","た":"ta","ち":"chi","ちゃ":"cha","ちゅ":"chu","ちょ":"cho","つ":"tsu","て":"te","と":"to","だ":"da","ぢ":"di","づ":"du","で":"de","ど":"do","な":"na","に":"ni","にゃ":"nya","にゅ":"nyu","にょ":"nyo","ぬ":"nu","ね":"ne","の":"no","は":"ha","ひ":"hi","ふ":"fu","へ":"he","ほ":"ho","ひゃ":"hya","ひゅ":"hyu","ひょ":"hyo","ふぁ":"fa","ふぃ":"fi","ふぇ":"fe","ふぉ":"fo","ば":"ba","び":"bi","ぶ":"bu","べ":"be","ぼ":"bo","びゃ":"bya","びゅ":"byu","びょ":"byo","ぱ":"pa","ぴ":"pi","ぷ":"pu","ぺ":"pe","ぽ":"po","ぴゃ":"pya","ぴゅ":"pyu","ぴょ":"pyo","ま":"ma","み":"mi","む":"mu","め":"me","も":"mo","みゃ":"mya","みゅ":"myu","みょ":"myo","や":"ya","ゆ":"yu","よ":"yo","ら":"ra","り":"ri","る":"ru","れ":"re","ろ":"ro","りゃ":"rya","りゅ":"ryu","りょ":"ryo","わ":"wa","を":"wo","ん":"n","ゐ":"wi","ゑ":"we","きぇ":"kye","きょ":"kyo","じぃ":"jyi","じぇ":"jye","ちぃ":"cyi","ちぇ":"che","ひぃ":"hyi","ひぇ":"hye","びぃ":"byi","びぇ":"bye","ぴぃ":"pyi","ぴぇ":"pye","みぇ":"mye","みぃ":"myi","りぃ":"ryi","りぇ":"rye","にぃ":"nyi","にぇ":"nye","しぃ":"syi","しぇ":"she","いぇ":"ye","うぁ":"wha","うぉ":"who","うぃ":"wi","うぇ":"we","ゔゃ":"vya","ゔゅ":"vyu","ゔょ":"vyo","すぁ":"swa","すぃ":"swi","すぅ":"swu","すぇ":"swe","すぉ":"swo","くゃ":"qya","くゅ":"qyu","くょ":"qyo","くぁ":"qwa","くぃ":"qwi","くぅ":"qwu","くぇ":"qwe","くぉ":"qwo","ぐぁ":"gwa","ぐぃ":"gwi","ぐぅ":"gwu","ぐぇ":"gwe","ぐぉ":"gwo","つぁ":"tsa","つぃ":"tsi","つぇ":"tse","つぉ":"tso","てゃ":"tha","てぃ":"thi","てゅ":"thu","てぇ":"the","てょ":"tho","とぁ":"twa","とぃ":"twi","とぅ":"twu","とぇ":"twe","とぉ":"two","ぢゃ":"dya","ぢぃ":"dyi","ぢゅ":"dyu","ぢぇ":"dye","ぢょ":"dyo","でゃ":"dha","でぃ":"dhi","でゅ":"dhu","でぇ":"dhe","でょ":"dho","どぁ":"dwa","どぃ":"dwi","どぅ":"dwu","どぇ":"dwe","どぉ":"dwo","ふぅ":"fwu","ふゃ":"fya","ふゅ":"fyu","ふょ":"fyo","ぁ":"a","ぃ":"i","ぇ":"e","ぅ":"u","ぉ":"o","ゃ":"ya","ゅ":"yu","ょ":"yo","っ":"","ゕ":"ka","ゖ":"ka","ゎ":"wa","　":" ","んあ":"n'a","んい":"n'i","んう":"n'u","んえ":"n'e","んお":"n'o","んや":"n'ya","んゆ":"n'yu","んよ":"n'yo"};
-\ No newline at end of file
+!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?n(exports):"function"==typeof define&&define.amd?define(["exports"],n):n(e.wanakana=e.wanakana||{})}(this,function(e){"use strict";function n(e){return"string"!=typeof e||!e.length}function t(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"",t=arguments[1],a=arguments[2];if(n(e))return!1;var r=e.charCodeAt(0);return r>=t&&a>=r}function a(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"";return[].concat(le(e)).map(function(e,n){var a=e.charCodeAt(0),r=t(e,re,oe),o=t(e,ie,ue);return r?String.fromCharCode(a-re+V):o?String.fromCharCode(a-ie+W):e}).join("")}function r(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"",t=1>=arguments.length||void 0===arguments[1]||arguments[1];if(n(e))return!1;var a=t?/[bcdfghjklmnpqrstvwxyz]/:/[bcdfghjklmnpqrstvwxz]/;return-1!==e.toLowerCase().charAt(0).search(a)}function o(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"";return!n(e)&&t(e,W,Y)}function i(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:0,n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0;return Math.min(e,n)}function u(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"",n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0,t=arguments[2];return e.slice(n,t)}function y(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"",t=1>=arguments.length||void 0===arguments[1]||arguments[1];if(n(e))return!1;var a=t?/[aeiouy]/:/[aeiou]/;return-1!==e.toLowerCase().charAt(0).search(a)}function c(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"";return!n(e)&&e.charCodeAt(0)===ye}function h(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"";return!n(e)&&e.charCodeAt(0)===ce}function s(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"";return!n(e)&&(!!c(e)||t(e,Z,$))}function f(){var e=[];return(arguments.length>0&&void 0!==arguments[0]?arguments[0]:"").split("").forEach(function(n){if(c(n)||h(n))e.push(n);else if(s(n)){var t=n.charCodeAt(0)+(ee-Z),a=String.fromCharCode(t);e.push(a)}else e.push(n)}),e.join("")}function d(){return t(arguments.length>0&&void 0!==arguments[0]?arguments[0]:"",ee,ne)}function v(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"";return!n(e)&&(s(e)||d(e))}function l(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"";return!n(e)&&[].concat(le(e)).every(v)}function g(){for(var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"",n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},a=arguments.length>2&&void 0!==arguments[2]&&arguments[2],c=Object.assign({},X,n),h=[],s=0,d=e.length,v=3,g="",w="";d>s;){var p=null;for(v=i(3,d-s);v>0;){if(g=u(e,s,s+v),w=g.toLowerCase(),se.includes(w)&&d-s>=4)w=(g=u(e,s,s+(v+=1))).toLowerCase();else{if("n"===w.charAt(0)){if(2===v){if(!c.IMEMode&&" "===w.charAt(1)){p="ん ";break}if(c.IMEMode&&"n'"===w){p="ん";break}}r(w.charAt(1),!1)&&y(w.charAt(2))&&(w=(g=u(e,s,s+(v=1))).toLowerCase())}"n"!==w.charAt(0)&&r(w.charAt(0))&&g.charAt(0)===g.charAt(1)&&(v=1,t(g.charAt(0),W,Y)?(w="ッ",g="ッ"):(w="っ",g="っ"))}if(null!=(p=fe[w]))break;v-=4===v?2:1}null==p&&(p=g),c.useObsoleteKana&&("wi"===w&&(p="ゐ"),"we"===w&&(p="ゑ")),c.IMEMode&&"n"===w.charAt(0)&&("y"===e.charAt(s+1).toLowerCase()&&!1===y(e.charAt(s+2))||s===d-1||l(e.charAt(s+1)))&&(p=g.charAt(0)),a||o(g.charAt(0))&&(p=f(p)),h.push(p),s+=v||1}return h.join("")}function w(e){var n=m(arguments.length>1&&void 0!==arguments[1]?arguments[1]:{});if(e instanceof Element&&ge.includes(e.nodeName)){var t=be();e.setAttribute("data-wanakana-id",t),e.autocapitalize="none",e.addEventListener("compositionupdate",b),e.addEventListener("input",n),we=k(n,t)}else console.warn("Input provided to wanakana.bind was not a valid input field.")}function p(e){var n=j(e);null!=n?(e.removeAttribute("data-wanakana-id"),e.removeEventListener("compositionupdate",b),e.removeEventListener("input",n.handler),we=A(n)):console.warn("Input had no listener registered.")}function m(e){var n=Object.assign({},X,e);return function(e){var t=e.target;if(me)me=!1;else{var r=a(t.value),o=g(x(r,n.IMEMode),Object.assign({},n,{IMEMode:!0}));if(r!==o){if(t.value=o,null!=t.setSelectionRange&&"number"==typeof t.selectionStart)return void t.setSelectionRange(t.value.length,t.value.length);if(null!=t.createTextRange){t.focus();var i=t.createTextRange();i.collapse(!1),i.select()}}}}}function b(e){var n=e.data||e.detail&&e.detail.data,t=n&&n.slice(-2).split("")||[],o="n"===t[0],i=t.every(function(e){return r(a(e))});me=!o&&i}function k(e,n){return we.concat({id:n,handler:e})}function j(e){return e&&we.find(function(n){return n.id===e.getAttribute("data-wanakana-id")})}function A(e){var n=e.id;return we.filter(function(e){return e.id!==n})}function x(e,n){switch(!0){case"toHiragana"===n:return e.toLowerCase();case"toKatakana"===n:return e.toUpperCase();default:return e}}function q(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"";return!n(e)&&F.test(e)}function C(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"";return!n(e)&&[].concat(le(e)).every(function(e){return q(e)})}function z(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"";return!n(e)&&[].concat(le(e)).every(function(e){return B.test(e)})}function E(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"";return!n(e)&&[].concat(le(e)).every(s)}function M(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"";return!n(e)&&[].concat(le(e)).every(d)}function K(){return t(arguments.length>0&&void 0!==arguments[0]?arguments[0]:"",te,ae)}function L(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"";return!n(e)&&[].concat(le(e)).every(K)}function O(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"",n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{passKanji:!0},t=[].concat(le(e)),a=!1;return n.passKanji||(a=t.some(L)),(t.some(E)||t.some(M))&&t.some(C)&&!a}function I(){for(var e=[],n="",t=(arguments.length>0&&void 0!==arguments[0]?arguments[0]:"").split(""),a=0;t.length>a;a+=1){var r=t[a],o=[h(r),c(r)],i=o[0],u=o[1];if(i||u&&1>a)e.push(r);else if(u&&a>0){var y=de[n].slice(-1);e.push(he[y])}else if(d(r)){var s=r.charCodeAt(0)+(Z-ee),f=String.fromCharCode(s);e.push(f),n=f}else e.push(r),n=""}return e.join("")}function R(){for(var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"",n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},t=Object.assign({},X,n),a=e.length,r=[],o=0,y=2,c="",h="",s=void 0;a>o;){y=i(2,a-o);for(var f=!1;y>0;){if(c=u(e,o,o+y),M(c)&&(f=t.upcaseKatakana,c=I(c)),"っ"===c.charAt(0)&&1===y&&a-1>o){s=!0,h="";break}if(null!=(h=de[c])&&s&&(h=h.charAt(0).concat(h),s=!1),null!=h)break;y-=1}null==h&&(h=c),f&&(h=h.toUpperCase()),r.push(h),o+=y||1}return r.join("")}function S(){return g(arguments.length>0&&void 0!==arguments[0]?arguments[0]:"",arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},!0)}function T(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"",n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},t=Object.assign({},X,n);return t.passRomaji?I(e):C(e)?S(e,t):O(e,{passKanji:!0})?S(I(e),t):I(e)}function H(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"",n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},t=Object.assign({},X,n);return f(t.passRomaji?e:C(e)||O(e)?S(e,t):e)}function P(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"";return!n(e)&&G.some(function(n){var a=ve(n,2);return t(e,a[0],a[1])})}function U(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"";return Q.some(function(n){var a=ve(n,2);return t(e,a[0],a[1])})}function D(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"";return!n(e)&&(P(e)||U(e))}function N(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"",t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{all:!1};if(n(e)||!z(e)||l(e))return e;var a=[].concat(le(e));if(t.all)return a.filter(function(e){return!v(e)}).join("");for(var r=a.reverse(),o=0,i=r.length;i>o;o+=1){var u=r[o];if(!D(u)){if(L(u))break;r[o]=""}}return r.reverse().join("")}function _(e){switch(!0){case U(e):return"japanesePunctuation";case K(e):return"kanji";case s(e):return"hiragana";case d(e):return"katakana";default:return"romaji"}}function J(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"";if(n(e))return[""];var t=[].concat(le(e)),a=t.shift(),r=_(a);return t.reduce(function(e,n){var t=_(n)===r;if(r=_(n),t){var a=e.pop();return e.concat(a.concat(n))}return e.concat(n)},[a])}var X={useObsoleteKana:!1,passRomaji:!1,upcaseKatakana:!1,IMEMode:!1},B=/[\u3000-\u303f\u3040-\u309f\u30a0-\u30ff\uff01-\uff0f\u4e00-\u9faf\u3400-\u4dbf]/,F=/[\u0000-\u007f\u0100-\u0101\u0112-\u0113\u012a-\u012b\u014c-\u014d\u016a-\u016b\u2018-\u2019\u201C-\u201D]/,G=[[33,47],[58,63],[91,96],[123,126],[8216,8217],[8220,8221]],Q=[[12289,12350],[12539,12540],[65281,65295],[65306,65311],[65339,65343],[65371,65376]],V=97,W=65,Y=90,Z=12353,$=12438,ee=12449,ne=12540,te=19968,ae=40879,re=65345,oe=65370,ie=65313,ue=65338,ye=12540,ce=12539,he={a:"あ",i:"い",u:"う",e:"え",o:"う"},se=["lts","chy","shy"],fe={".":"。",",":"、",":":"：","/":"・","!":"！","?":"？","~":"〜","-":"ー","‘":"「","’":"」","“":"『","”":"』","[":"［","]":"］","(":"（",")":"）","{":"｛","}":"｝",a:"あ",i:"い",u:"う",e:"え",o:"お",yi:"い",wu:"う",whu:"う",xa:"ぁ",xi:"ぃ",xu:"ぅ",xe:"ぇ",xo:"ぉ",xyi:"ぃ",xye:"ぇ",ye:"いぇ",wha:"うぁ",whi:"うぃ",whe:"うぇ",who:"うぉ",wi:"うぃ",we:"うぇ",va:"ゔぁ",vi:"ゔぃ",vu:"ゔ",ve:"ゔぇ",vo:"ゔぉ",vya:"ゔゃ",vyi:"ゔぃ",vyu:"ゔゅ",vye:"ゔぇ",vyo:"ゔょ",ka:"か",ki:"き",ku:"く",ke:"け",ko:"こ",lka:"ヵ",lke:"ヶ",xka:"ヵ",xke:"ヶ",kya:"きゃ",kyi:"きぃ",kyu:"きゅ",kye:"きぇ",kyo:"きょ",ca:"か",ci:"き",cu:"く",ce:"け",co:"こ",lca:"ヵ",lce:"ヶ",xca:"ヵ",xce:"ヶ",qya:"くゃ",qyu:"くゅ",qyo:"くょ",qwa:"くぁ",qwi:"くぃ",qwu:"くぅ",qwe:"くぇ",qwo:"くぉ",qa:"くぁ",qi:"くぃ",qe:"くぇ",qo:"くぉ",kwa:"くぁ",qyi:"くぃ",qye:"くぇ",ga:"が",gi:"ぎ",gu:"ぐ",ge:"げ",go:"ご",gya:"ぎゃ",gyi:"ぎぃ",gyu:"ぎゅ",gye:"ぎぇ",gyo:"ぎょ",gwa:"ぐぁ",gwi:"ぐぃ",gwu:"ぐぅ",gwe:"ぐぇ",gwo:"ぐぉ",sa:"さ",si:"し",shi:"し",su:"す",se:"せ",so:"そ",za:"ざ",zi:"じ",zu:"ず",ze:"ぜ",zo:"ぞ",ji:"じ",sya:"しゃ",syi:"しぃ",syu:"しゅ",sye:"しぇ",syo:"しょ",sha:"しゃ",shu:"しゅ",she:"しぇ",sho:"しょ",shya:"しゃ",shyu:"しゅ",shye:"しぇ",shyo:"しょ",swa:"すぁ",swi:"すぃ",swu:"すぅ",swe:"すぇ",swo:"すぉ",zya:"じゃ",zyi:"じぃ",zyu:"じゅ",zye:"じぇ",zyo:"じょ",ja:"じゃ",ju:"じゅ",je:"じぇ",jo:"じょ",jya:"じゃ",jyi:"じぃ",jyu:"じゅ",jye:"じぇ",jyo:"じょ",ta:"た",ti:"ち",tu:"つ",te:"て",to:"と",chi:"ち",tsu:"つ",ltu:"っ",xtu:"っ",tya:"ちゃ",tyi:"ちぃ",tyu:"ちゅ",tye:"ちぇ",tyo:"ちょ",cha:"ちゃ",chu:"ちゅ",che:"ちぇ",cho:"ちょ",cya:"ちゃ",cyi:"ちぃ",cyu:"ちゅ",cye:"ちぇ",cyo:"ちょ",chya:"ちゃ",chyu:"ちゅ",chye:"ちぇ",chyo:"ちょ",tsa:"つぁ",tsi:"つぃ",tse:"つぇ",tso:"つぉ",tha:"てゃ",thi:"てぃ",thu:"てゅ",the:"てぇ",tho:"てょ",twa:"とぁ",twi:"とぃ",twu:"とぅ",twe:"とぇ",two:"とぉ",da:"だ",di:"ぢ",du:"づ",de:"で",do:"ど",dya:"ぢゃ",dyi:"ぢぃ",dyu:"ぢゅ",dye:"ぢぇ",dyo:"ぢょ",dha:"でゃ",dhi:"でぃ",dhu:"でゅ",dhe:"でぇ",dho:"でょ",dwa:"どぁ",dwi:"どぃ",dwu:"どぅ",dwe:"どぇ",dwo:"どぉ",na:"な",ni:"に",nu:"ぬ",ne:"ね",no:"の",nya:"にゃ",nyi:"にぃ",nyu:"にゅ",nye:"にぇ",nyo:"にょ",ha:"は",hi:"ひ",hu:"ふ",he:"へ",ho:"ほ",fu:"ふ",hya:"ひゃ",hyi:"ひぃ",hyu:"ひゅ",hye:"ひぇ",hyo:"ひょ",fya:"ふゃ",fyu:"ふゅ",fyo:"ふょ",fwa:"ふぁ",fwi:"ふぃ",fwu:"ふぅ",fwe:"ふぇ",fwo:"ふぉ",fa:"ふぁ",fi:"ふぃ",fe:"ふぇ",fo:"ふぉ",fyi:"ふぃ",fye:"ふぇ",ba:"ば",bi:"び",bu:"ぶ",be:"べ",bo:"ぼ",bya:"びゃ",byi:"びぃ",byu:"びゅ",bye:"びぇ",byo:"びょ",pa:"ぱ",pi:"ぴ",pu:"ぷ",pe:"ぺ",po:"ぽ",pya:"ぴゃ",pyi:"ぴぃ",pyu:"ぴゅ",pye:"ぴぇ",pyo:"ぴょ",ma:"ま",mi:"み",mu:"む",me:"め",mo:"も",mya:"みゃ",myi:"みぃ",myu:"みゅ",mye:"みぇ",myo:"みょ",ya:"や",yu:"ゆ",yo:"よ",xya:"ゃ",xyu:"ゅ",xyo:"ょ",ra:"ら",ri:"り",ru:"る",re:"れ",ro:"ろ",rya:"りゃ",ryi:"りぃ",ryu:"りゅ",rye:"りぇ",ryo:"りょ",la:"ら",li:"り",lu:"る",le:"れ",lo:"ろ",lya:"りゃ",lyi:"りぃ",lyu:"りゅ",lye:"りぇ",lyo:"りょ",wa:"わ",wo:"を",lwe:"ゎ",xwa:"ゎ",n:"ん",nn:"ん","n'":"ん","n ":"ん",xn:"ん",ltsu:"っ"},de={"　":" ","！":"!","？":"?","。":".","：":":","・":"/","、":",","〜":"~","ー":"-","「":"‘","」":"’","『":"“","』":"”","［":"[","］":"]","（":"(","）":")","｛":"{","｝":"}","あ":"a","い":"i","う":"u","え":"e","お":"o","ゔぁ":"va","ゔぃ":"vi","ゔ":"vu","ゔぇ":"ve","ゔぉ":"vo","か":"ka","き":"ki","きゃ":"kya","きぃ":"kyi","きゅ":"kyu","く":"ku","け":"ke","こ":"ko","が":"ga","ぎ":"gi","ぐ":"gu","げ":"ge","ご":"go","ぎゃ":"gya","ぎぃ":"gyi","ぎゅ":"gyu","ぎぇ":"gye","ぎょ":"gyo","さ":"sa","す":"su","せ":"se","そ":"so","ざ":"za","ず":"zu","ぜ":"ze","ぞ":"zo","し":"shi","しゃ":"sha","しゅ":"shu","しょ":"sho","じ":"ji","じゃ":"ja","じゅ":"ju","じょ":"jo","た":"ta","ち":"chi","ちゃ":"cha","ちゅ":"chu","ちょ":"cho","つ":"tsu","て":"te","と":"to","だ":"da","ぢ":"di","づ":"du","で":"de","ど":"do","な":"na","に":"ni","にゃ":"nya","にゅ":"nyu","にょ":"nyo","ぬ":"nu","ね":"ne","の":"no","は":"ha","ひ":"hi","ふ":"fu","へ":"he","ほ":"ho","ひゃ":"hya","ひゅ":"hyu","ひょ":"hyo","ふぁ":"fa","ふぃ":"fi","ふぇ":"fe","ふぉ":"fo","ば":"ba","び":"bi","ぶ":"bu","べ":"be","ぼ":"bo","びゃ":"bya","びゅ":"byu","びょ":"byo","ぱ":"pa","ぴ":"pi","ぷ":"pu","ぺ":"pe","ぽ":"po","ぴゃ":"pya","ぴゅ":"pyu","ぴょ":"pyo","ま":"ma","み":"mi","む":"mu","め":"me","も":"mo","みゃ":"mya","みゅ":"myu","みょ":"myo","や":"ya","ゆ":"yu","よ":"yo","ら":"ra","り":"ri","る":"ru","れ":"re","ろ":"ro","りゃ":"rya","りゅ":"ryu","りょ":"ryo","わ":"wa","を":"wo","ん":"n","ゐ":"wi","ゑ":"we","きぇ":"kye","きょ":"kyo","じぃ":"jyi","じぇ":"jye","ちぃ":"cyi","ちぇ":"che","ひぃ":"hyi","ひぇ":"hye","びぃ":"byi","びぇ":"bye","ぴぃ":"pyi","ぴぇ":"pye","みぇ":"mye","みぃ":"myi","りぃ":"ryi","りぇ":"rye","にぃ":"nyi","にぇ":"nye","しぃ":"syi","しぇ":"she","いぇ":"ye","うぁ":"wha","うぉ":"who","うぃ":"wi","うぇ":"we","ゔゃ":"vya","ゔゅ":"vyu","ゔょ":"vyo","すぁ":"swa","すぃ":"swi","すぅ":"swu","すぇ":"swe","すぉ":"swo","くゃ":"qya","くゅ":"qyu","くょ":"qyo","くぁ":"qwa","くぃ":"qwi","くぅ":"qwu","くぇ":"qwe","くぉ":"qwo","ぐぁ":"gwa","ぐぃ":"gwi","ぐぅ":"gwu","ぐぇ":"gwe","ぐぉ":"gwo","つぁ":"tsa","つぃ":"tsi","つぇ":"tse","つぉ":"tso","てゃ":"tha","てぃ":"thi","てゅ":"thu","てぇ":"the","てょ":"tho","とぁ":"twa","とぃ":"twi","とぅ":"twu","とぇ":"twe","とぉ":"two","ぢゃ":"dya","ぢぃ":"dyi","ぢゅ":"dyu","ぢぇ":"dye","ぢょ":"dyo","でゃ":"dha","でぃ":"dhi","でゅ":"dhu","でぇ":"dhe","でょ":"dho","どぁ":"dwa","どぃ":"dwi","どぅ":"dwu","どぇ":"dwe","どぉ":"dwo","ふぅ":"fwu","ふゃ":"fya","ふゅ":"fyu","ふょ":"fyo","ぁ":"a","ぃ":"i","ぇ":"e","ぅ":"u","ぉ":"o","ゃ":"ya","ゅ":"yu","ょ":"yo","っ":"","ゕ":"ka","ゖ":"ka","ゎ":"wa","んあ":"n'a","んい":"n'i","んう":"n'u","んえ":"n'e","んお":"n'o","んや":"n'ya","んゆ":"n'yu","んよ":"n'yo"},ve=function(){function e(e,n){var t=[],a=!0,r=!1,o=void 0;try{for(var i,u=e[Symbol.iterator]();!(a=(i=u.next()).done)&&(t.push(i.value),!n||t.length!==n);a=!0);}catch(e){r=!0,o=e}finally{try{!a&&u.return&&u.return()}finally{if(r)throw o}}return t}return function(n,t){if(Array.isArray(n))return n;if(Symbol.iterator in Object(n))return e(n,t);throw new TypeError("Invalid attempt to destructure non-iterable instance")}}(),le=function(e){if(Array.isArray(e)){for(var n=0,t=Array(e.length);e.length>n;n++)t[n]=e[n];return t}return Array.from(e)},ge=["TEXTAREA","INPUT"],we=[],pe=0,me=!1,be=function(){return pe+=1,""+Date.now()+pe};e.bind=w,e.unbind=p,e.isRomaji=C,e.isJapanese=z,e.isKana=l,e.isHiragana=E,e.isKatakana=M,e.isMixed=O,e.isKanji=L,e.toRomaji=R,e.toKana=g,e.toHiragana=T,e.toKatakana=H,e.stripOkurigana=N,e.tokenize=J,Object.defineProperty(e,"__esModule",{value:!0})});
diff --git a/tmpl/fields.html b/tmpl/fields.html
index ab1a9722..944a43e6 100644
--- a/tmpl/fields.html
+++ b/tmpl/fields.html
@@ -1,13 +1,17 @@
 {{#*inline "glossary-single"}}
     {{~#if html~}}
-        {{~#if tags~}}<i>({{#each tags}}{{name}}{{#unless @last}}, {{/unless}}{{/each}})</i> {{/if~}}
+        {{~#unless brief~}}
+            {{~#if tags~}}<i>({{#each tags}}{{name}}{{#unless @last}}, {{/unless}}{{/each}})</i> {{/if~}}
+        {{~/unless~}}
         {{~#if glossary.[1]~}}
             <ul>{{#each glossary}}<li>{{#multiLine}}{{.}}{{/multiLine}}</li>{{/each}}</ul>
         {{~else~}}
             {{~#multiLine}}{{glossary.[0]}}{{/multiLine~}}
         {{~/if~}}
     {{~else~}}
-        {{~#if tags~}}({{#each tags}}{{name}}{{#unless @last}}, {{/unless}}{{/each}}) {{/if~}}
+        {{~#unless brief~}}
+            {{~#if tags~}}({{#each tags}}{{name}}{{#unless @last}}, {{/unless}}{{/each}}) {{/if~}}
+        {{~/unless~}}
         {{~#if glossary.[1]~}}
             {{#each glossary}}{{.}}{{#unless @last}}, {{/unless}}{{/each}}
         {{~else~}}
@@ -58,18 +62,22 @@
     {{~else~}}
         {{~#if group~}}
             {{~#if definition.definitions.[1]~}}
-                {{~#if html}}<ol>{{#each definition.definitions}}<li>{{> glossary-single html=../html}}</li>{{/each}}</ol>
-                {{~else}}{{#each definition.definitions}} * {{> glossary-single html=../html}}{{/each}}{{/if~}}
+                {{~#if html}}<ol>{{#each definition.definitions}}<li>{{> glossary-single html=../html brief=../brief}}</li>{{/each}}</ol>
+                {{~else}}{{#each definition.definitions}} * {{> glossary-single html=../html brief=../brief}}{{/each}}{{/if~}}
             {{~else~}}
-                {{~> glossary-single definition.definitions.[0] html=html~}}
+                {{~> glossary-single definition.definitions.[0] html=html brief=brief~}}
             {{~/if~}}
         {{~else~}}
-            {{~> glossary-single definition html=html~}}
+            {{~> glossary-single definition html=html brief=brief~}}
         {{~/if~}}
     {{~/if~}}
     {{~#if html}}</div>{{/if~}}
 {{/inline}}
 
+{{#*inline "glossary-brief"}}
+    {{~> glossary brief=true ~}}
+{{/inline}}
+
 {{#*inline "kunyomi"}}
     {{~#each definition.kunyomi}}{{.}}{{#unless @last}}, {{/unless}}{{/each~}}
 {{/inline}}
diff --git a/tmpl/kanji.html b/tmpl/kanji.html
index 28e4b8a4..bb62f488 100644
--- a/tmpl/kanji.html
+++ b/tmpl/kanji.html
@@ -1,13 +1,14 @@
 {{#*inline "kanji"}}
 <div class="entry" data-type="kanji">
     <div class="actions">
-        <img src="/mixed/img/entry-current.png" class="current" title="Current entry (Alt + Up/Down/Home/End/PgUp/PgDn)" alt>
         {{#if addable}}
+        <a href="#" class="action-view-note pending disabled"><img src="/mixed/img/view-note.png" title="View added note (Alt + V)" alt></a>
         <a href="#" class="action-add-note pending disabled" data-mode="kanji"><img src="/mixed/img/add-kanji.png" title="Add Kanji (Alt + K)" alt></a>
         {{/if}}
         {{#if source}}
         <a href="#" class="source-term"><img src="/mixed/img/source-term.png" title="Source term (Alt + B)" alt></a>
         {{/if}}
+        <img src="/mixed/img/entry-current.png" class="current" title="Current entry (Alt + Up/Down/Home/End/PgUp/PgDn)" alt>
     </div>
 
     <div class="glyph">{{character}}</div>
diff --git a/tmpl/terms.html b/tmpl/terms.html
index bf656cfb..db36e5cc 100644
--- a/tmpl/terms.html
+++ b/tmpl/terms.html
@@ -20,14 +20,15 @@
 {{#*inline "term"}}
 <div class="entry" data-type="term">
     <div class="actions">
-        <img src="/mixed/img/entry-current.png" class="current" title="Current entry (Alt + Up/Down/Home/End/PgUp/PgDn)" alt>
         {{#if addable}}
+        <a href="#" class="action-view-note pending disabled"><img src="/mixed/img/view-note.png" title="View added note (Alt + V)" alt></a>
         <a href="#" class="action-add-note pending disabled" data-mode="term-kanji"><img src="/mixed/img/add-term-kanji.png" title="Add expression (Alt + E)" alt></a>
         <a href="#" class="action-add-note pending disabled" data-mode="term-kana"><img src="/mixed/img/add-term-kana.png" title="Add reading (Alt + R)" alt></a>
         {{/if}}
         {{#if playback}}
         <a href="#" class="action-play-audio"><img src="/mixed/img/play-audio.png" title="Play audio (Alt + P)" alt></a>
         {{/if}}
+        <img src="/mixed/img/entry-current.png" class="current" title="Current entry (Alt + Up/Down/Home/End/PgUp/PgDn)" alt>
     </div>
 
     {{#if reading}}
author	Alex Yatskov <alex@foosoft.net>	2017-08-17 19:19:34 -0700
committer	Alex Yatskov <alex@foosoft.net>	2017-08-17 19:19:34 -0700
commit	7586572fbaab7de698ec13f8712cc95e24ab6273 (patch)
tree	665417b73c928694b96c00a98dd882c618e1fd1d
parent	3475150b2d1424d43f5be6fcfbdbb719a576866f (diff)
parent	191336522c220b0a3cfe41515ed23946b3462217 (diff)