From 2e7ce451126342a9e77c43e757cd1ffdac00d807 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sat, 4 Mar 2017 12:27:05 -0800
Subject: [PATCH] file reorg

---
 ext/bg/background.html                        |  24 +++++++++---------
 ext/bg/guide.html                             |  10 ++++----
 ext/bg/js/templates.js                        |   8 +++---
 ext/bg/legal.html                             |   6 ++---
 ext/bg/options.html                           |  22 ++++++++--------
 ext/bg/popup.html                             |  18 ++++++-------
 ext/bg/search.html                            |  16 ++++++------
 ext/fg/frame.html                             |  16 ++++++------
 ext/fg/img/spinner.gif                        | Bin 7358 -> 0 bytes
 ext/manifest.json                             |  24 +++++++++---------
 ext/{fg => mixed}/css/frame.css               |   4 +--
 ext/{fg => mixed}/img/add_kanji.png           | Bin
 ext/{fg => mixed}/img/add_term_kana.png       | Bin
 ext/{fg => mixed}/img/add_term_kanji.png      | Bin
 ext/{ => mixed}/img/icon128.png               | Bin
 ext/{ => mixed}/img/icon16.png                | Bin
 ext/{ => mixed}/img/icon19.png                | Bin
 ext/{ => mixed}/img/icon38.png                | Bin
 ext/{ => mixed}/img/icon48.png                | Bin
 ext/{ => mixed}/img/icon64.png                | Bin
 ext/{fg => mixed}/img/play_audio.png          | Bin
 ext/{bg => mixed}/img/spinner.gif             | Bin
 .../css/bootstrap-theme.css                   |   0
 .../css/bootstrap-theme.css.map               |   0
 .../css/bootstrap-theme.min.css               |   0
 .../css/bootstrap-theme.min.css.map           |   0
 .../bootstrap-3.3.7-dist/css/bootstrap.css    |   0
 .../css/bootstrap.css.map                     |   0
 .../css/bootstrap.min.css                     |   0
 .../css/bootstrap.min.css.map                 |   0
 .../fonts/glyphicons-halflings-regular.eot    | Bin
 .../fonts/glyphicons-halflings-regular.svg    |   0
 .../fonts/glyphicons-halflings-regular.ttf    | Bin
 .../fonts/glyphicons-halflings-regular.woff   | Bin
 .../fonts/glyphicons-halflings-regular.woff2  | Bin
 .../lib/bootstrap-3.3.7-dist/js/bootstrap.js  |   0
 .../bootstrap-3.3.7-dist/js/bootstrap.min.js  |   0
 .../lib/bootstrap-3.3.7-dist/js/npm.js        |   0
 .../bootstrap-toggle/bootstrap-toggle.min.css |   0
 .../bootstrap-toggle/bootstrap-toggle.min.js  |   0
 ext/{ => mixed}/lib/dexie.min.js              |   0
 ext/{ => mixed}/lib/handlebars.min.js         |   0
 ext/{ => mixed}/lib/jquery-3.1.1.min.js       |   0
 ext/{ => mixed}/lib/wanakana.min.js           |   0
 ext/{fg => mixed}/mp3/button.mp3              | Bin
 ext/{fg => mixed}/ttf/kanji-stroke-orders.ttf | Bin
 ext/{fg => mixed}/ttf/vl-gothic-regular.ttf   | Bin
 tmpl/kanji.html                               |   2 +-
 tmpl/terms.html                               |   6 ++---
 49 files changed, 78 insertions(+), 78 deletions(-)
 delete mode 100644 ext/fg/img/spinner.gif
 rename ext/{fg => mixed}/css/frame.css (95%)
 rename ext/{fg => mixed}/img/add_kanji.png (100%)
 rename ext/{fg => mixed}/img/add_term_kana.png (100%)
 rename ext/{fg => mixed}/img/add_term_kanji.png (100%)
 rename ext/{ => mixed}/img/icon128.png (100%)
 rename ext/{ => mixed}/img/icon16.png (100%)
 rename ext/{ => mixed}/img/icon19.png (100%)
 rename ext/{ => mixed}/img/icon38.png (100%)
 rename ext/{ => mixed}/img/icon48.png (100%)
 rename ext/{ => mixed}/img/icon64.png (100%)
 rename ext/{fg => mixed}/img/play_audio.png (100%)
 rename ext/{bg => mixed}/img/spinner.gif (100%)
 rename ext/{ => mixed}/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.css (100%)
 rename ext/{ => mixed}/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.css.map (100%)
 rename ext/{ => mixed}/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.min.css (100%)
 rename ext/{ => mixed}/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.min.css.map (100%)
 rename ext/{ => mixed}/lib/bootstrap-3.3.7-dist/css/bootstrap.css (100%)
 rename ext/{ => mixed}/lib/bootstrap-3.3.7-dist/css/bootstrap.css.map (100%)
 rename ext/{ => mixed}/lib/bootstrap-3.3.7-dist/css/bootstrap.min.css (100%)
 rename ext/{ => mixed}/lib/bootstrap-3.3.7-dist/css/bootstrap.min.css.map (100%)
 rename ext/{ => mixed}/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.eot (100%)
 rename ext/{ => mixed}/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.svg (100%)
 rename ext/{ => mixed}/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.ttf (100%)
 rename ext/{ => mixed}/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.woff (100%)
 rename ext/{ => mixed}/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.woff2 (100%)
 rename ext/{ => mixed}/lib/bootstrap-3.3.7-dist/js/bootstrap.js (100%)
 rename ext/{ => mixed}/lib/bootstrap-3.3.7-dist/js/bootstrap.min.js (100%)
 rename ext/{ => mixed}/lib/bootstrap-3.3.7-dist/js/npm.js (100%)
 rename ext/{ => mixed}/lib/bootstrap-toggle/bootstrap-toggle.min.css (100%)
 rename ext/{ => mixed}/lib/bootstrap-toggle/bootstrap-toggle.min.js (100%)
 rename ext/{ => mixed}/lib/dexie.min.js (100%)
 rename ext/{ => mixed}/lib/handlebars.min.js (100%)
 rename ext/{ => mixed}/lib/jquery-3.1.1.min.js (100%)
 rename ext/{ => mixed}/lib/wanakana.min.js (100%)
 rename ext/{fg => mixed}/mp3/button.mp3 (100%)
 rename ext/{fg => mixed}/ttf/kanji-stroke-orders.ttf (100%)
 rename ext/{fg => mixed}/ttf/vl-gothic-regular.ttf (100%)

diff --git a/ext/bg/background.html b/ext/bg/background.html
index eecadf1e..3c7b0dd9 100644
--- a/ext/bg/background.html
+++ b/ext/bg/background.html
@@ -1,17 +1,17 @@
 <!DOCTYPE html>
 <html lang="en">
     <body>
-        <script src="../lib/handlebars.min.js"></script>
-        <script src="../lib/dexie.min.js"></script>
-        <script src="../lib/wanakana.min.js"></script>
-        <script src="js/templates.js"></script>
-        <script src="js/gecko.js"></script>
-        <script src="js/util.js"></script>
-        <script src="js/anki-connect.js"></script>
-        <script src="js/anki-null.js"></script>
-        <script src="js/database.js"></script>
-        <script src="js/deinflector.js"></script>
-        <script src="js/translator.js"></script>
-        <script src="js/yomichan.js"></script>
+        <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="/bg/js/templates.js"></script>
+        <script src="/bg/js/gecko.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="/bg/js/database.js"></script>
+        <script src="/bg/js/deinflector.js"></script>
+        <script src="/bg/js/translator.js"></script>
+        <script src="/bg/js/yomichan.js"></script>
     </body>
 </html>
diff --git a/ext/bg/guide.html b/ext/bg/guide.html
index 521cec19..2d8c6536 100644
--- a/ext/bg/guide.html
+++ b/ext/bg/guide.html
@@ -3,11 +3,11 @@
     <head>
         <meta charset="UTF-8">
         <title>Welcome to Yomichan!</title>
-        <link rel="stylesheet" type="text/css" href="../lib/bootstrap-3.3.7-dist/css/bootstrap.min.css">
-        <link rel="stylesheet" type="text/css" href="../lib/bootstrap-3.3.7-dist/css/bootstrap-theme.min.css">
+        <link rel="stylesheet" type="text/css" href="/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap.min.css">
+        <link rel="stylesheet" type="text/css" href="/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.min.css">
     </head>
     <body>
-        <div class="container">
+        <div class="container-fluid">
             <div class="page-header">
                 <h1>Welcome to Yomichan!</h1>
             </div>
@@ -23,10 +23,10 @@
                 </p>
 
                 <ol>
-                    <li>Click on the <img src="../img/icon16.png" alt> icon in the browser toolbar to open the Yomichan options page.</li>
+                    <li>Click on the <img src="/mixed/img/icon16.png" alt> icon in the browser toolbar to open the Yomichan options page.</li>
                     <li>Import the dictionaries (bundled or custom) you wish to use for term and Kanji searches.</li>
                     <li>Hold down <kbd>Shift</kbd> (or the middle mouse button) as you hover over text to see term definitions.</li>
-                    <li>Click on the <img src="../fg/img/play_audio.png" alt> icon to hear the term pronounced by a native speaker (if audio is available).</li>
+                    <li>Click on the <img src="/mixed/fg/img/play_audio.png" alt> icon to hear the term pronounced by a native speaker (if audio is available).</li>
                     <li>Click on Kanji in the definition window to view additional information about that character.</li>
                 </ol>
             </div>
diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js
index f8306b1b..0fa41b36 100644
--- a/ext/bg/js/templates.js
+++ b/ext/bg/js/templates.js
@@ -302,7 +302,7 @@ templates['kanji.html'] = template({"1":function(container,depth0,helpers,partia
 
   return "            <a href=\"#\" title=\"Add Kanji\" class=\"action-add-note pending disabled\" data-mode=\"kanji\" data-index=\""
     + container.escapeExpression(((helper = (helper = helpers.index || (data && data.index)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},{"name":"index","hash":{},"data":data}) : helper)))
-    + "\"><img src=\"/fg/img/add_kanji.png\"></a>\n";
+    + "\"><img src=\"/mixed/img/add_kanji.png\"></a>\n";
 },"4":function(container,depth0,helpers,partials,data) {
     var stack1;
 
@@ -459,15 +459,15 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
 
   return "            <a href=\"#\" title=\"Add term as expression\" class=\"action-add-note pending disabled\" data-mode=\"term_kanji\" data-index=\""
     + alias4(((helper = (helper = helpers.index || (data && data.index)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"index","hash":{},"data":data}) : helper)))
-    + "\"><img src=\"/fg/img/add_term_kanji.png\"></a>\n            <a href=\"#\" title=\"Add term as reading\" class=\"action-add-note pending disabled\" data-mode=\"term_kana\" data-index=\""
+    + "\"><img src=\"/mixed/img/add_term_kanji.png\"></a>\n            <a href=\"#\" title=\"Add term as reading\" class=\"action-add-note pending disabled\" data-mode=\"term_kana\" data-index=\""
     + alias4(((helper = (helper = helpers.index || (data && data.index)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"index","hash":{},"data":data}) : helper)))
-    + "\"><img src=\"/fg/img/add_term_kana.png\"></a>\n";
+    + "\"><img src=\"/mixed/img/add_term_kana.png\"></a>\n";
 },"15":function(container,depth0,helpers,partials,data) {
     var helper;
 
   return "            <a href=\"#\" title=\"Play audio\" class=\"action-play-audio\" data-index=\""
     + container.escapeExpression(((helper = (helper = helpers.index || (data && data.index)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},{"name":"index","hash":{},"data":data}) : helper)))
-    + "\"><img src=\"/fg/img/play_audio.png\"></a>\n";
+    + "\"><img src=\"/mixed/img/play_audio.png\"></a>\n";
 },"17":function(container,depth0,helpers,partials,data) {
     var stack1, helper, options, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", buffer = 
   "        <div class=\"expression\"><ruby>";
diff --git a/ext/bg/legal.html b/ext/bg/legal.html
index 9be89f72..f3ca4e01 100644
--- a/ext/bg/legal.html
+++ b/ext/bg/legal.html
@@ -3,11 +3,11 @@
     <head>
         <meta charset="UTF-8">
         <title>Yomichan Legal</title>
-        <link rel="stylesheet" type="text/css" href="../lib/bootstrap-3.3.7-dist/css/bootstrap.min.css">
-        <link rel="stylesheet" type="text/css" href="../lib/bootstrap-3.3.7-dist/css/bootstrap-theme.min.css">
+        <link rel="stylesheet" type="text/css" href="/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap.min.css">
+        <link rel="stylesheet" type="text/css" href="/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.min.css">
     </head>
     <body>
-        <div class="container">
+        <div class="container-fluid">
             <h3>Yomichan License</h3>
 <pre>
 Copyright (C) 2016  Alex Yatskov
diff --git a/ext/bg/options.html b/ext/bg/options.html
index 7739c540..7d95860b 100644
--- a/ext/bg/options.html
+++ b/ext/bg/options.html
@@ -3,8 +3,8 @@
     <head>
         <meta charset="UTF-8">
         <title>Yomichan Options</title>
-        <link rel="stylesheet" type="text/css" href="../lib/bootstrap-3.3.7-dist/css/bootstrap.min.css">
-        <link rel="stylesheet" type="text/css" href="../lib/bootstrap-3.3.7-dist/css/bootstrap-theme.min.css">
+        <link rel="stylesheet" type="text/css" href="/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap.min.css">
+        <link rel="stylesheet" type="text/css" href="/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.min.css">
         <style>
             #anki-spinner, #anki-general, #anki-error,
             #dict-spinner, #dict-error, #dict-warning, #dict-purge-progress, #dict-import-progress,
@@ -75,7 +75,7 @@
 
             <div>
                 <div>
-                    <img src="img/spinner.gif" class="pull-right" id="dict-spinner" alt>
+                    <img src="/mixed/img/spinner.gif" class="pull-right" id="dict-spinner" alt>
                     <h3>Dictionaries</h3>
                 </div>
 
@@ -223,7 +223,7 @@
                         improve Yomichan!
                     </p>
                     <p>
-                        <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=4DBTN9A3CUAFN"><img src="img/paypal.gif" alt></a>
+                        <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=4DBTN9A3CUAFN"><img src="/bg/img/paypal.gif" alt></a>
                     </p>
                 </div>
             </div>
@@ -233,12 +233,12 @@
             </div>
         </div>
 
-        <script src="../lib/jquery-3.1.1.min.js"></script>
-        <script src="../lib/bootstrap-3.3.7-dist/js/bootstrap.min.js"></script>
-        <script src="../lib/handlebars.min.js"></script>
-        <script src="js/templates.js"></script>
-        <script src="js/gecko.js"></script>
-        <script src="js/util.js"></script>
-        <script src="js/options.js"></script>
+        <script src="/mixed/lib/jquery-3.1.1.min.js"></script>
+        <script src="/mixed/lib/bootstrap-3.3.7-dist/js/bootstrap.min.js"></script>
+        <script src="/mixed/lib/handlebars.min.js"></script>
+        <script src="/bg/js/templates.js"></script>
+        <script src="/bg/js/gecko.js"></script>
+        <script src="/bg/js/util.js"></script>
+        <script src="/bg/js/options.js"></script>
     </body>
 </html>
diff --git a/ext/bg/popup.html b/ext/bg/popup.html
index 35782b87..388cff9c 100644
--- a/ext/bg/popup.html
+++ b/ext/bg/popup.html
@@ -2,9 +2,9 @@
 <html lang="en">
     <head>
         <meta charset="UTF-8">
-        <link rel="stylesheet" type="text/css" href="../lib/bootstrap-3.3.7-dist/css/bootstrap.min.css">
-        <link rel="stylesheet" type="text/css" href="../lib/bootstrap-3.3.7-dist/css/bootstrap-theme.min.css">
-        <link rel="stylesheet" type="text/css" href="../lib/bootstrap-toggle/bootstrap-toggle.min.css">
+        <link rel="stylesheet" type="text/css" href="/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap.min.css">
+        <link rel="stylesheet" type="text/css" href="/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.min.css">
+        <link rel="stylesheet" type="text/css" href="/mixed/lib/bootstrap-toggle/bootstrap-toggle.min.css">
         <style type="text/css">
             body {
                 padding: 10px;
@@ -27,11 +27,11 @@
                 <button type="button" id="open-help" title="Help" class="btn btn-default btn-xs glyphicon glyphicon-question-sign"></button>
             </div>
         </p>
-        <script src="../lib/jquery-3.1.1.min.js"></script>
-        <script src="../lib/bootstrap-toggle/bootstrap-toggle.min.js"></script>
-        <script src="js/gecko.js"></script>
-        <script src="js/util.js"></script>
-        <script src="js/options.js"></script>
-        <script src="js/popup.js"></script>
+        <script src="/mixed/lib/jquery-3.1.1.min.js"></script>
+        <script src="/mixed/lib/bootstrap-toggle/bootstrap-toggle.min.js"></script>
+        <script src="/bg/js/gecko.js"></script>
+        <script src="/bg/js/util.js"></script>
+        <script src="/bg/js/options.js"></script>
+        <script src="/bg/js/popup.js"></script>
     </body>
 </html>
diff --git a/ext/bg/search.html b/ext/bg/search.html
index 0737f99c..7921501b 100644
--- a/ext/bg/search.html
+++ b/ext/bg/search.html
@@ -3,9 +3,9 @@
     <head>
         <meta charset="UTF-8">
         <title>Yomichan Search</title>
-        <link rel="stylesheet" type="text/css" href="../lib/bootstrap-3.3.7-dist/css/bootstrap.min.css">
-        <link rel="stylesheet" type="text/css" href="../lib/bootstrap-3.3.7-dist/css/bootstrap-theme.min.css">
-        <link rel="stylesheet" type="text/css" href="../fg/css/frame.css">
+        <link rel="stylesheet" type="text/css" href="/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap.min.css">
+        <link rel="stylesheet" type="text/css" href="/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.min.css">
+        <link rel="stylesheet" type="text/css" href="/mixed/css/frame.css">
     </head>
     <body>
         <div class="container-fluid">
@@ -19,14 +19,14 @@
             </p>
 
             <div id="spinner">
-                <img src="img/spinner.gif">
+                <img src="/mixed/img/spinner.gif">
             </div>
 
             <div id="content"></div>
         </div>
-        <script src="../lib/jquery-3.1.1.min.js"></script>
-        <script src="js/gecko.js"></script>
-        <script src="js/util.js"></script>
-        <script src="js/search.js"></script>
+        <script src="/mixed/lib/jquery-3.1.1.min.js"></script>
+        <script src="/bg/js/gecko.js"></script>
+        <script src="/bg/js/util.js"></script>
+        <script src="/bg/js/search.js"></script>
     </body>
 </html>
diff --git a/ext/fg/frame.html b/ext/fg/frame.html
index a5baee98..7fda6991 100644
--- a/ext/fg/frame.html
+++ b/ext/fg/frame.html
@@ -3,14 +3,14 @@
     <head>
         <meta charset="UTF-8">
         <title></title>
-        <link rel="stylesheet" href="../lib/bootstrap-3.3.7-dist/css/bootstrap.min.css">
-        <link rel="stylesheet" href="../lib/bootstrap-3.3.7-dist/css/bootstrap-theme.min.css">
-        <link rel="stylesheet" href="css/frame.css">
+        <link rel="stylesheet" href="/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap.min.css">
+        <link rel="stylesheet" href="/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.min.css">
+        <link rel="stylesheet" href="/mixed/css/frame.css">
     </head>
     <body>
         <div class="container-fluid">
             <div id="spinner">
-                <img src="img/spinner.gif">
+                <img src="/mixed/img/spinner.gif">
             </div>
 
             <div id="content"></div>
@@ -20,10 +20,10 @@
                 <p>The Yomichan extension has been updated to a new version! In order to continue viewing definitions on this page you must reload this tab or restart your browser.</p>
             </div>
 
-            <script src="../lib/jquery-3.1.1.min.js"></script>
-            <script src="../lib/wanakana.min.js"></script>
-            <script src="js/util.js"></script>
-            <script src="js/frame.js"></script>
+            <script src="/mixed/lib/jquery-3.1.1.min.js"></script>
+            <script src="/mixed/lib/wanakana.min.js"></script>
+            <script src="/fg/js/util.js"></script>
+            <script src="/fg/js/frame.js"></script>
         </div>
     </body>
 </html>
diff --git a/ext/fg/img/spinner.gif b/ext/fg/img/spinner.gif
deleted file mode 100644
index 8ed30cb6362966f7f8210cf5317a178707578ff1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7358
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
Pbju^cui5_rK{oeaxY@}K

diff --git a/ext/manifest.json b/ext/manifest.json
index f4fcccfa..48b15c9d 100644
--- a/ext/manifest.json
+++ b/ext/manifest.json
@@ -1,12 +1,12 @@
 {
     "manifest_version": 2,
     "name": "Yomichan",
-    "version": "1.0.17",
+    "version": "1.0.18",
 
     "description": "Japanese dictionary with Anki integration",
-    "icons": {"16": "img/icon16.png", "48": "img/icon48.png", "128": "img/icon128.png"},
+    "icons": {"16": "mixed/img/icon16.png", "48": "mixed/img/icon48.png", "128": "mixed/img/icon128.png"},
     "browser_action": {
-        "default_icon": {"19": "img/icon19.png", "38": "img/icon38.png"},
+        "default_icon": {"19": "mixed/img/icon19.png", "38": "mixed/img/icon38.png"},
         "default_popup": "bg/popup.html"
     },
 
@@ -33,17 +33,17 @@
         "storage"
     ],
     "web_accessible_resources": [
-        "fg/css/frame.css",
         "fg/frame.html",
-        "fg/img/add_kanji.png",
-        "fg/img/add_term_kana.png",
-        "fg/img/add_term_kanji.png",
-        "fg/img/play_audio.png",
-        "fg/img/spinner.gif",
         "fg/js/frame.js",
-        "fg/mp3/button.mp3",
-        "fg/ttf/kanji-stroke-orders.ttf",
-        "fg/ttf/vl-gothic-regular.ttf"
+        "mixed/css/frame.css",
+        "mixed/img/add_kanji.png",
+        "mixed/img/add_term_kana.png",
+        "mixed/img/add_term_kanji.png",
+        "mixed/img/play_audio.png",
+        "mixed/img/spinner.gif",
+        "mixed/mp3/button.mp3",
+        "mixed/ttf/kanji-stroke-orders.ttf",
+        "mixed/ttf/vl-gothic-regular.ttf"
     ],
     "applications": {
         "gecko": {
diff --git a/ext/fg/css/frame.css b/ext/mixed/css/frame.css
similarity index 95%
rename from ext/fg/css/frame.css
rename to ext/mixed/css/frame.css
index e2006328..7d772042 100644
--- a/ext/fg/css/frame.css
+++ b/ext/mixed/css/frame.css
@@ -23,12 +23,12 @@
 
 @font-face {
     font-family: kanji-stroke-orders;
-    src: url('../ttf/kanji-stroke-orders.ttf');
+    src: url('/mixed/ttf/kanji-stroke-orders.ttf');
 }
 
 @font-face {
     font-family: vl-gothic-regular;
-    src: url('../ttf/vl-gothic-regular.ttf');
+    src: url('/mixed/ttf/vl-gothic-regular.ttf');
 }
 
 
diff --git a/ext/fg/img/add_kanji.png b/ext/mixed/img/add_kanji.png
similarity index 100%
rename from ext/fg/img/add_kanji.png
rename to ext/mixed/img/add_kanji.png
diff --git a/ext/fg/img/add_term_kana.png b/ext/mixed/img/add_term_kana.png
similarity index 100%
rename from ext/fg/img/add_term_kana.png
rename to ext/mixed/img/add_term_kana.png
diff --git a/ext/fg/img/add_term_kanji.png b/ext/mixed/img/add_term_kanji.png
similarity index 100%
rename from ext/fg/img/add_term_kanji.png
rename to ext/mixed/img/add_term_kanji.png
diff --git a/ext/img/icon128.png b/ext/mixed/img/icon128.png
similarity index 100%
rename from ext/img/icon128.png
rename to ext/mixed/img/icon128.png
diff --git a/ext/img/icon16.png b/ext/mixed/img/icon16.png
similarity index 100%
rename from ext/img/icon16.png
rename to ext/mixed/img/icon16.png
diff --git a/ext/img/icon19.png b/ext/mixed/img/icon19.png
similarity index 100%
rename from ext/img/icon19.png
rename to ext/mixed/img/icon19.png
diff --git a/ext/img/icon38.png b/ext/mixed/img/icon38.png
similarity index 100%
rename from ext/img/icon38.png
rename to ext/mixed/img/icon38.png
diff --git a/ext/img/icon48.png b/ext/mixed/img/icon48.png
similarity index 100%
rename from ext/img/icon48.png
rename to ext/mixed/img/icon48.png
diff --git a/ext/img/icon64.png b/ext/mixed/img/icon64.png
similarity index 100%
rename from ext/img/icon64.png
rename to ext/mixed/img/icon64.png
diff --git a/ext/fg/img/play_audio.png b/ext/mixed/img/play_audio.png
similarity index 100%
rename from ext/fg/img/play_audio.png
rename to ext/mixed/img/play_audio.png
diff --git a/ext/bg/img/spinner.gif b/ext/mixed/img/spinner.gif
similarity index 100%
rename from ext/bg/img/spinner.gif
rename to ext/mixed/img/spinner.gif
diff --git a/ext/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.css b/ext/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.css
similarity index 100%
rename from ext/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.css
rename to ext/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.css
diff --git a/ext/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.css.map b/ext/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.css.map
similarity index 100%
rename from ext/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.css.map
rename to ext/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.css.map
diff --git a/ext/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.min.css b/ext/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.min.css
similarity index 100%
rename from ext/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.min.css
rename to ext/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.min.css
diff --git a/ext/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.min.css.map b/ext/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.min.css.map
similarity index 100%
rename from ext/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.min.css.map
rename to ext/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.min.css.map
diff --git a/ext/lib/bootstrap-3.3.7-dist/css/bootstrap.css b/ext/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap.css
similarity index 100%
rename from ext/lib/bootstrap-3.3.7-dist/css/bootstrap.css
rename to ext/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap.css
diff --git a/ext/lib/bootstrap-3.3.7-dist/css/bootstrap.css.map b/ext/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap.css.map
similarity index 100%
rename from ext/lib/bootstrap-3.3.7-dist/css/bootstrap.css.map
rename to ext/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap.css.map
diff --git a/ext/lib/bootstrap-3.3.7-dist/css/bootstrap.min.css b/ext/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap.min.css
similarity index 100%
rename from ext/lib/bootstrap-3.3.7-dist/css/bootstrap.min.css
rename to ext/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap.min.css
diff --git a/ext/lib/bootstrap-3.3.7-dist/css/bootstrap.min.css.map b/ext/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap.min.css.map
similarity index 100%
rename from ext/lib/bootstrap-3.3.7-dist/css/bootstrap.min.css.map
rename to ext/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap.min.css.map
diff --git a/ext/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.eot b/ext/mixed/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from ext/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.eot
rename to ext/mixed/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.eot
diff --git a/ext/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.svg b/ext/mixed/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.svg
similarity index 100%
rename from ext/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.svg
rename to ext/mixed/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.svg
diff --git a/ext/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.ttf b/ext/mixed/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.ttf
similarity index 100%
rename from ext/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.ttf
rename to ext/mixed/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.ttf
diff --git a/ext/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.woff b/ext/mixed/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from ext/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.woff
rename to ext/mixed/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.woff
diff --git a/ext/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.woff2 b/ext/mixed/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.woff2
similarity index 100%
rename from ext/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.woff2
rename to ext/mixed/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.woff2
diff --git a/ext/lib/bootstrap-3.3.7-dist/js/bootstrap.js b/ext/mixed/lib/bootstrap-3.3.7-dist/js/bootstrap.js
similarity index 100%
rename from ext/lib/bootstrap-3.3.7-dist/js/bootstrap.js
rename to ext/mixed/lib/bootstrap-3.3.7-dist/js/bootstrap.js
diff --git a/ext/lib/bootstrap-3.3.7-dist/js/bootstrap.min.js b/ext/mixed/lib/bootstrap-3.3.7-dist/js/bootstrap.min.js
similarity index 100%
rename from ext/lib/bootstrap-3.3.7-dist/js/bootstrap.min.js
rename to ext/mixed/lib/bootstrap-3.3.7-dist/js/bootstrap.min.js
diff --git a/ext/lib/bootstrap-3.3.7-dist/js/npm.js b/ext/mixed/lib/bootstrap-3.3.7-dist/js/npm.js
similarity index 100%
rename from ext/lib/bootstrap-3.3.7-dist/js/npm.js
rename to ext/mixed/lib/bootstrap-3.3.7-dist/js/npm.js
diff --git a/ext/lib/bootstrap-toggle/bootstrap-toggle.min.css b/ext/mixed/lib/bootstrap-toggle/bootstrap-toggle.min.css
similarity index 100%
rename from ext/lib/bootstrap-toggle/bootstrap-toggle.min.css
rename to ext/mixed/lib/bootstrap-toggle/bootstrap-toggle.min.css
diff --git a/ext/lib/bootstrap-toggle/bootstrap-toggle.min.js b/ext/mixed/lib/bootstrap-toggle/bootstrap-toggle.min.js
similarity index 100%
rename from ext/lib/bootstrap-toggle/bootstrap-toggle.min.js
rename to ext/mixed/lib/bootstrap-toggle/bootstrap-toggle.min.js
diff --git a/ext/lib/dexie.min.js b/ext/mixed/lib/dexie.min.js
similarity index 100%
rename from ext/lib/dexie.min.js
rename to ext/mixed/lib/dexie.min.js
diff --git a/ext/lib/handlebars.min.js b/ext/mixed/lib/handlebars.min.js
similarity index 100%
rename from ext/lib/handlebars.min.js
rename to ext/mixed/lib/handlebars.min.js
diff --git a/ext/lib/jquery-3.1.1.min.js b/ext/mixed/lib/jquery-3.1.1.min.js
similarity index 100%
rename from ext/lib/jquery-3.1.1.min.js
rename to ext/mixed/lib/jquery-3.1.1.min.js
diff --git a/ext/lib/wanakana.min.js b/ext/mixed/lib/wanakana.min.js
similarity index 100%
rename from ext/lib/wanakana.min.js
rename to ext/mixed/lib/wanakana.min.js
diff --git a/ext/fg/mp3/button.mp3 b/ext/mixed/mp3/button.mp3
similarity index 100%
rename from ext/fg/mp3/button.mp3
rename to ext/mixed/mp3/button.mp3
diff --git a/ext/fg/ttf/kanji-stroke-orders.ttf b/ext/mixed/ttf/kanji-stroke-orders.ttf
similarity index 100%
rename from ext/fg/ttf/kanji-stroke-orders.ttf
rename to ext/mixed/ttf/kanji-stroke-orders.ttf
diff --git a/ext/fg/ttf/vl-gothic-regular.ttf b/ext/mixed/ttf/vl-gothic-regular.ttf
similarity index 100%
rename from ext/fg/ttf/vl-gothic-regular.ttf
rename to ext/mixed/ttf/vl-gothic-regular.ttf
diff --git a/tmpl/kanji.html b/tmpl/kanji.html
index fefef9bb..c9e6959d 100644
--- a/tmpl/kanji.html
+++ b/tmpl/kanji.html
@@ -2,7 +2,7 @@
 <p>
     <div class="actions">
         {{#if addable}}
-            <a href="#" title="Add Kanji" class="action-add-note pending disabled" data-mode="kanji" data-index="{{@index}}"><img src="/fg/img/add_kanji.png"></a>
+            <a href="#" title="Add Kanji" class="action-add-note pending disabled" data-mode="kanji" data-index="{{@index}}"><img src="/mixed/img/add_kanji.png"></a>
         {{/if}}
     </div>
 
diff --git a/tmpl/terms.html b/tmpl/terms.html
index cb68c74f..923eb14f 100644
--- a/tmpl/terms.html
+++ b/tmpl/terms.html
@@ -21,11 +21,11 @@
 <p>
     <div class="actions">
         {{#if addable}}
-            <a href="#" title="Add term as expression" class="action-add-note pending disabled" data-mode="term_kanji" data-index="{{@index}}"><img src="/fg/img/add_term_kanji.png"></a>
-            <a href="#" title="Add term as reading" class="action-add-note pending disabled" data-mode="term_kana" data-index="{{@index}}"><img src="/fg/img/add_term_kana.png"></a>
+            <a href="#" title="Add term as expression" class="action-add-note pending disabled" data-mode="term_kanji" data-index="{{@index}}"><img src="/mixed/img/add_term_kanji.png"></a>
+            <a href="#" title="Add term as reading" class="action-add-note pending disabled" data-mode="term_kana" data-index="{{@index}}"><img src="/mixed/img/add_term_kana.png"></a>
         {{/if}}
         {{#if playback}}
-            <a href="#" title="Play audio" class="action-play-audio" data-index="{{@index}}"><img src="/fg/img/play_audio.png"></a>
+            <a href="#" title="Play audio" class="action-play-audio" data-index="{{@index}}"><img src="/mixed/img/play_audio.png"></a>
         {{/if}}
     </div>