diff --git a/README.md b/README.md
index 5f64d2b0e..1a9bdba46 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ See [license.txt](./license.txt).
 
 * `git clone --recursive -b BRANCH_NAME https://github.com/readium/readium-js-viewer.git readium-js-viewer` (replace "BRANCH_NAME" with e.g. "develop")
 * `cd readium-js-viewer`
-* `git submodule update --init --recursive` to ensure that the readium-js-viewer chain of dependencies is initialised (readium-js, readium-shared-js and readium-cfi-js)
+* `git submodule update --init --recursive` to ensure that the readium-js-viewer chain of dependencies is initialised (readium-js, readium-shared-js)
 * `git checkout BRANCH_NAME && git submodule foreach --recursive "git checkout BRANCH_NAME"` (or simply `cd` inside each repository / submodule, and manually enter the desired branch name: `git checkout BRANCH_NAME`) Git should automatically track the corresponding branch in the 'origin' remote.
 
 
@@ -96,7 +96,7 @@ Remark: logs of HTTP requests are preserved in two separate files `http_app.log`
 
 ### Forking
 
-Assuming a fork of `https://github.com/readium/readium-js-viewer` is made under `USER` at `https://github.com/USER/readium-js-viewer`, the `.gitmodules` file ( https://github.com/readium/readium-js-viewer/blob/develop/.gitmodules ) will still point to the original submodule URL (at `readium`, instead of `USER`). Thankfully, one can simply modify the `.gitmodules` file by replacing `https://github.com/readium/` with `https://github.com/USER/`, and do this for every submodule (`readium-js-viewer` > `readium-js` > `readium-shared-js` > `readium-cfi-js`). Then the Git command `git submodule sync` can be invoked, for each submodule.
+Assuming a fork of `https://github.com/readium/readium-js-viewer` is made under `USER` at `https://github.com/USER/readium-js-viewer`, the `.gitmodules` file ( https://github.com/readium/readium-js-viewer/blob/develop/.gitmodules ) will still point to the original submodule URL (at `readium`, instead of `USER`). Thankfully, one can simply modify the `.gitmodules` file by replacing `https://github.com/readium/` with `https://github.com/USER/`, and do this for every submodule (`readium-js-viewer` > `readium-js` > `readium-shared-js`). Then the Git command `git submodule sync` can be invoked, for each submodule.
 
 
 ### Plugins integration
@@ -261,12 +261,6 @@ Usage is demonstrated by the HTML file in the `dev` folder (trimmed for brevity)
 <script type="text/javascript" src="../build-output/_multiple-bundles/RequireJS.js"> </script>
 
 
-
-<!-- individual bundles: -->
-
-<!-- readium CFI library -->
-<script type="text/javascript" src="../build-output/_multiple-bundles/readium-cfi-js.js"> </script>
-
 <!-- external libraries -->
 <script type="text/javascript" src="../build-output/_multiple-bundles/readium-external-libs.js"> </script>
 
diff --git a/build-config/RequireJS_config_multiple-bundles.js b/build-config/RequireJS_config_multiple-bundles.js
index b99ae290e..40368702d 100644
--- a/build-config/RequireJS_config_multiple-bundles.js
+++ b/build-config/RequireJS_config_multiple-bundles.js
@@ -24,7 +24,7 @@ require.config({
             name: "readium-js-viewer",
             create: true,
             include: ["readium_js_viewer/ReadiumViewer"],
-            exclude: ["readium-js", "readium-external-libs", "readium-shared-js", "readium-cfi-js"],
+            exclude: ["readium-js", "readium-external-libs", "readium-shared-js"],
             insertRequire: [
                 "readium_js_viewer/ReadiumViewer"
             ]
@@ -34,7 +34,7 @@ require.config({
             name: "readium-js-viewer_LITE",
             create: true,
             include: ["readium_js_viewer/ReadiumViewerLite"],
-            exclude: ["readium-js", "readium-external-libs", "readium-shared-js", "readium-cfi-js"],
+            exclude: ["readium-js", "readium-external-libs", "readium-shared-js"],
             insertRequire: [
                 "readium_js_viewer/ReadiumViewerLite"
             ]
diff --git a/build-config/RequireJS_config_multiple-bundles_external-libs.js b/build-config/RequireJS_config_multiple-bundles_external-libs.js
index e51698695..88250913a 100644
--- a/build-config/RequireJS_config_multiple-bundles_external-libs.js
+++ b/build-config/RequireJS_config_multiple-bundles_external-libs.js
@@ -25,7 +25,7 @@ require.config({
             create: true,
             include: ["jath", "bootstrap", "bootstrapA11y", "hammerjs", "hogan", "jquery_hammer", "keymaster", "screenfull", "spin",
             "mime-types", "zip", "zip-ext", "zip-fs", "cryptoJs/sha1", "cryptoJs/core",
-            'jquery',
+            'jquery', 'readium_cfi_js',
             'underscore', 'URIjs', 'punycode', 'SecondLevelDomains', 'IPv6',
             'jquerySizes', 'domReady', 'eventEmitter', 'console_shim',
             'rangy', 'rangy-core', 'rangy-textrange', 'rangy-highlighter', 'rangy-cssclassapplier', 'rangy-position']
diff --git a/build-config/RequireJS_config_single-bundle.js b/build-config/RequireJS_config_single-bundle.js
index eafffbc69..9aa5a960e 100644
--- a/build-config/RequireJS_config_single-bundle.js
+++ b/build-config/RequireJS_config_single-bundle.js
@@ -37,6 +37,6 @@ require.config({
             process._RJS_rootDir(2) + '/build-output/version',
 
         "readium-js-viewer_all":
-            process._RJS_rootDir(2) + '/readium-js/readium-shared-js/readium-cfi-js/node_modules/almond/almond'
+            process._RJS_rootDir(2) + '/readium-js/readium-shared-js/node_modules/almond/almond'
     }
 });
diff --git a/build-config/RequireJS_config_single-bundle_CHROMEAPP-WORKER.js b/build-config/RequireJS_config_single-bundle_CHROMEAPP-WORKER.js
index d9271f722..b0a9e2b8c 100644
--- a/build-config/RequireJS_config_single-bundle_CHROMEAPP-WORKER.js
+++ b/build-config/RequireJS_config_single-bundle_CHROMEAPP-WORKER.js
@@ -34,7 +34,7 @@ require.config({
     paths:
     {
         "readium-js-viewer_CHROMEAPP-WORKER":
-            process._RJS_rootDir(2) + '/readium-js/readium-shared-js/readium-cfi-js/node_modules/almond/almond',
+            process._RJS_rootDir(2) + '/readium-js/readium-shared-js/node_modules/almond/almond',
 
         "readium_js_viewer_RJS-CONFIG":
                 process._RJS_rootDir(2) + '/src/chrome-app/requirejs-config',
diff --git a/build-config/RequireJS_config_single-bundle_CHROMEAPP.js b/build-config/RequireJS_config_single-bundle_CHROMEAPP.js
index fbfd93df3..c5a078c27 100644
--- a/build-config/RequireJS_config_single-bundle_CHROMEAPP.js
+++ b/build-config/RequireJS_config_single-bundle_CHROMEAPP.js
@@ -37,7 +37,7 @@ require.config({
             process._RJS_rootDir(2) + '/build-output/version',
 
         "readium-js-viewer_all_CHROMEAPP":
-            process._RJS_rootDir(2) + '/readium-js/readium-shared-js/readium-cfi-js/node_modules/almond/almond',
+            process._RJS_rootDir(2) + '/readium-js/readium-shared-js/node_modules/almond/almond',
 
         "readium_js_viewer_RJS-CONFIG":
             process._RJS_rootDir(2) + '/src/chrome-app/requirejs-config',
diff --git a/build-config/RequireJS_config_single-bundle_LITE.js b/build-config/RequireJS_config_single-bundle_LITE.js
index 60329881b..c01457745 100644
--- a/build-config/RequireJS_config_single-bundle_LITE.js
+++ b/build-config/RequireJS_config_single-bundle_LITE.js
@@ -37,6 +37,6 @@ require.config({
             process._RJS_rootDir(2) + '/build-output/version',
 
         "readium-js-viewer_all_LITE":
-            process._RJS_rootDir(2) + '/readium-js/readium-shared-js/readium-cfi-js/node_modules/almond/almond'
+            process._RJS_rootDir(2) + '/readium-js/readium-shared-js/node_modules/almond/almond'
     }
 });
diff --git a/build-config/versioning.js b/build-config/versioning.js
index 08a60bac6..435ca9d33 100644
--- a/build-config/versioning.js
+++ b/build-config/versioning.js
@@ -4,16 +4,14 @@ var path = require('path');
 var path_readiumJSViewer = process.cwd();
 var path_readiumJS = path.join(path_readiumJSViewer, '/readium-js');
 var path_readiumSharedJS = path.join(path_readiumJS, '/readium-shared-js');
-var path_readiumCfiJS = path.join(path_readiumSharedJS, '/readium-cfi-js');
 
 var repoNamePaths = {
     "readiumJsViewer": path_readiumJSViewer,
     "readiumJs": path_readiumJS,
-    "readiumSharedJs": path_readiumSharedJS,
-    "readiumCfiJs": path_readiumCfiJS
+    "readiumSharedJs": path_readiumSharedJS
 };
 
-var filePath = path.join(process.cwd(), 'readium-js', 'readium-shared-js', 'readium-cfi-js', 'readium-build-tools', 'versionsMaker.js')
+var filePath = path.join(process.cwd(), 'readium-js', 'readium-shared-js', 'readium-build-tools', 'versionsMaker.js')
 
 var fs = require("fs");
 fs.readFile(
diff --git a/dev/index_RequireJS_multiple-bundles.html b/dev/index_RequireJS_multiple-bundles.html
index 0b0e00467..f5ad88912 100644
--- a/dev/index_RequireJS_multiple-bundles.html
+++ b/dev/index_RequireJS_multiple-bundles.html
@@ -51,8 +51,6 @@
 
 <script type="text/javascript" src="../build-output/_multiple-bundles/readium-external-libs.js.bundles.js"> </script>
 
-<script type="text/javascript" src="../build-output/_multiple-bundles/readium-cfi-js.js.bundles.js"> </script>
-
 <script type="text/javascript" src="../build-output/_multiple-bundles/readium-shared-js.js.bundles.js"> </script>
 
 <script type="text/javascript" src="../build-output/_multiple-bundles/readium-plugin-example.js.bundles.js"> </script>
@@ -69,8 +67,6 @@
 
 <script type="text/javascript" src="../build-output/_multiple-bundles/readium-external-libs.js"> </script>
 
-<script type="text/javascript" src="../build-output/_multiple-bundles/readium-cfi-js.js"> </script>
-
 <script type="text/javascript" src="../build-output/_multiple-bundles/readium-shared-js.js"> </script>
 
 <script type="text/javascript" src="../build-output/_multiple-bundles/readium-plugin-example.js"> </script>
@@ -92,7 +88,7 @@
 
 <script type="text/javascript">
 window.process = undefined;
-require(["readium_cfi_js/cfi_API", "readium_shared_js/globalsSetup"], function(){
+require(["readium_shared_js/globalsSetup"], function(){
 require(["jquery"], function(){
 require(["readium_js_viewer/ReadiumViewer"], function(){});
 });
diff --git a/dev/index_RequireJS_multiple-bundles_LITE.html b/dev/index_RequireJS_multiple-bundles_LITE.html
index 836cc36f4..4b0f21ce7 100644
--- a/dev/index_RequireJS_multiple-bundles_LITE.html
+++ b/dev/index_RequireJS_multiple-bundles_LITE.html
@@ -40,8 +40,6 @@
 
 <script type="text/javascript" src="../build-output/_multiple-bundles/readium-external-libs.js.bundles.js"> </script>
 
-<script type="text/javascript" src="../build-output/_multiple-bundles/readium-cfi-js.js.bundles.js"> </script>
-
 <script type="text/javascript" src="../build-output/_multiple-bundles/readium-shared-js.js.bundles.js"> </script>
 
 <script type="text/javascript" src="../build-output/_multiple-bundles/readium-plugin-example.js.bundles.js"> </script>
@@ -58,8 +56,6 @@
 
 <script type="text/javascript" src="../build-output/_multiple-bundles/readium-external-libs.js"> </script>
 
-<script type="text/javascript" src="../build-output/_multiple-bundles/readium-cfi-js.js"> </script>
-
 <script type="text/javascript" src="../build-output/_multiple-bundles/readium-shared-js.js"> </script>
 
 <script type="text/javascript" src="../build-output/_multiple-bundles/readium-plugin-example.js"> </script>
@@ -81,7 +77,7 @@
 
 <script type="text/javascript">
 window.process = undefined;
-require(["readium_cfi_js/cfi_API", "readium_shared_js/globalsSetup"], function(){
+require(["readium_shared_js/globalsSetup"], function(){
 require(["jquery"], function(){
 require(["readium_js_viewer/ReadiumViewerLite"], function(){});
 });
diff --git a/dev/index_RequireJS_no-optimize.html b/dev/index_RequireJS_no-optimize.html
index f69fe56c4..61a76afef 100644
--- a/dev/index_RequireJS_no-optimize.html
+++ b/dev/index_RequireJS_no-optimize.html
@@ -37,12 +37,11 @@
 
 
 
-<script type="text/javascript" src="../readium-js/readium-shared-js/readium-cfi-js/node_modules/requirejs/require.js"> </script>
+<script type="text/javascript" src="../readium-js/readium-shared-js/node_modules/requirejs/require.js"> </script>
 
 <script type="text/javascript" src="../build-config/RequireJS_config_browser.js"> </script>
 <script type="text/javascript" src="../readium-js/build-config/RequireJS_config_common.js"> </script>
 <script type="text/javascript" src="../readium-js/readium-shared-js/build-config/RequireJS_config_common.js"> </script>
-<script type="text/javascript" src="../readium-js/readium-shared-js/readium-cfi-js/build-config/RequireJS_config_common.js"> </script>
 <script type="text/javascript" src="../build-config/RequireJS_config_common.js"> </script>
 
 <script type="text/javascript" src="../readium-js/readium-shared-js/build-config/RequireJS_config_plugins.js"> </script>
@@ -55,7 +54,7 @@
 
 <script type="text/javascript">
 window.process = undefined;
-require(["readium_cfi_js/cfi_API", "readium_shared_js/globalsSetup"], function(){
+require(["readium_shared_js/globalsSetup"], function(){
 require(["jquery"], function(){
 require(["readium_js_viewer/ReadiumViewer"], function(){});
 });
diff --git a/dev/index_RequireJS_no-optimize_LITE.html b/dev/index_RequireJS_no-optimize_LITE.html
index 97f081e1f..ddece1371 100644
--- a/dev/index_RequireJS_no-optimize_LITE.html
+++ b/dev/index_RequireJS_no-optimize_LITE.html
@@ -24,12 +24,11 @@
     <!-- link rel="stylesheet" type="text/css" href="../src/css/library.css" -->
 
 
-    <script type="text/javascript" src="../readium-js/readium-shared-js/readium-cfi-js/node_modules/requirejs/require.js"> </script>
+    <script type="text/javascript" src="../readium-js/readium-shared-js/node_modules/requirejs/require.js"> </script>
 
     <script type="text/javascript" src="../build-config/RequireJS_config_browser.js"> </script>
     <script type="text/javascript" src="../readium-js/build-config/RequireJS_config_common.js"> </script>
     <script type="text/javascript" src="../readium-js/readium-shared-js/build-config/RequireJS_config_common.js"> </script>
-    <script type="text/javascript" src="../readium-js/readium-shared-js/readium-cfi-js/build-config/RequireJS_config_common.js"> </script>
     <script type="text/javascript" src="../build-config/RequireJS_config_common.js"> </script>
 
     <script type="text/javascript" src="../readium-js/readium-shared-js/build-config/RequireJS_config_plugins.js"> </script>
@@ -42,7 +41,7 @@
 
 <script type="text/javascript">
 window.process = undefined;
-require(["readium_cfi_js/cfi_API", "readium_shared_js/globalsSetup"], function(){
+require(["readium_shared_js/globalsSetup"], function(){
 require(["jquery"], function(){
 require(["readium_js_viewer/ReadiumViewerLite"], function(){});
 });
diff --git a/dev/version.json b/dev/version.json
index ce012ac0c..6c1e7ef09 100644
--- a/dev/version.json
+++ b/dev/version.json
@@ -12,10 +12,6 @@
     {
       "name": "readiumSharedJs",
       "path": "../readium-js/readium-shared-js"
-    },
-    {
-      "name": "readiumCfiJs",
-      "path": "../readium-js/readium-shared-js/readium-cfi-js"
     }
   ]
 }
diff --git a/package.json b/package.json
index af55aac49..dcf0dd7f6 100644
--- a/package.json
+++ b/package.json
@@ -82,77 +82,77 @@
     "decompress-zip": "^0.3.0"
   },
   "scripts": {
-    "cson2json": "node ./readium-js/readium-shared-js/readium-cfi-js/readium-build-tools/concat.js \"package/*.cson\" package.cson && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/cson/bin/cson2json package.cson > package.json && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/rimraf/bin.js package.cson && node readium-js/readium-shared-js/readium-cfi-js/readium-build-tools/optimizePackageJsonScripts.js",
+    "cson2json": "node ./readium-js/readium-shared-js/readium-build-tools/concat.js \"package/*.cson\" package.cson && node ./readium-js/readium-shared-js/node_modules/cson/bin/cson2json package.cson > package.json && node ./readium-js/readium-shared-js/node_modules/rimraf/bin.js package.cson && node readium-js/readium-shared-js/readium-build-tools/optimizePackageJsonScripts.js",
     "prepare:all": "npm run prepare:submodule && npm run prepare:local",
     "prepare:local": "(npm outdated || echo outdated) && npm install --only=prod && npm install --only=dev && npm run prepare:local:common",
     "prepare:yarn:all": "yarn run prepare:yarn:submodule && yarn run prepare:yarn:local",
     "prepare:yarn:local": "(yarn outdated || echo outdated) && yarn install && yarn run prepare:local:common",
-    "prepare:local:common": "node readium-js/readium-shared-js/readium-cfi-js/readium-build-tools/gitHubForksUpdater.js",
+    "prepare:local:common": "node readium-js/readium-shared-js/readium-build-tools/gitHubForksUpdater.js",
     "prepare:submodule": "cd readium-js && npm run prepare:all && cd .. && ls",
     "prepare:yarn:submodule": "cd readium-js && yarn run prepare:yarn:all && cd .. && ls",
-    "clean": "(yarn --version || echo noyarn) && node --version && npm --version && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/rimraf/bin.js build-output && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/rimraf/bin.js api-docs/* && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/rimraf/bin.js dist",
-    "apidocs": "node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/yuidocjs/lib/cli.js -N -C -c yuidocs.json",
+    "clean": "(yarn --version || echo noyarn) && node --version && npm --version && node ./readium-js/readium-shared-js/node_modules/rimraf/bin.js build-output && node ./readium-js/readium-shared-js/node_modules/rimraf/bin.js api-docs/* && node ./readium-js/readium-shared-js/node_modules/rimraf/bin.js dist",
+    "apidocs": "node ./readium-js/readium-shared-js/node_modules/yuidocjs/lib/cli.js -N -C -c yuidocs.json",
     "prebuild": "npm run clean",
     "build": "npm run build:scripts",
-    "lint": "node ./readium-js/readium-shared-js/readium-cfi-js/readium-build-tools/jshint_glob.js \"src/js/**.js\"",
-    "preversioning": "node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/mkdirp/bin/cmd.js build-output",
+    "lint": "node ./readium-js/readium-shared-js/readium-build-tools/jshint_glob.js \"src/js/**.js\"",
+    "preversioning": "node ./readium-js/readium-shared-js/node_modules/mkdirp/bin/cmd.js build-output",
     "versioning": "node build-config/versioning.js build-output/version.json",
-    "genPluginsConfig": "cd readium-js/readium-shared-js/ && node readium-cfi-js/readium-build-tools/pluginsConfigMaker.js && cd ../..",
+    "genPluginsConfig": "cd readium-js/readium-shared-js/ && node readium-build-tools/pluginsConfigMaker.js && cd ../..",
     "prebuild:scripts": "npm run genPluginsConfig",
     "build:scripts": "npm run versioning && npm run build:scripts:multiple && npm run build:scripts:single && npm run build:scripts:single:LITE && npm run build:scripts:single:CHROMEAPP --readium-js-viewer:RJS_UGLY=no && npm run build:scripts:single:CHROMEAPPWORKER --readium-js-viewer:RJS_UGLY=no",
-    "build:scripts:single": "node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/requirejs/bin/r.js -o ./readium-js/readium-shared-js/readium-cfi-js/readium-build-tools/RequireJS_config.js --rjs_bundle=single",
-    "build:scripts:single:LITE": "node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/requirejs/bin/r.js -o ./readium-js/readium-shared-js/readium-cfi-js/readium-build-tools/RequireJS_config.js --rjs_bundle=single --rjs_configCustomTarget=_LITE",
-    "build:scripts:single:CHROMEAPP": "node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/requirejs/bin/r.js -o ./readium-js/readium-shared-js/readium-cfi-js/readium-build-tools/RequireJS_config.js --rjs_bundle=single --rjs_configCustomTarget=_CHROMEAPP",
-    "build:scripts:single:CHROMEAPPWORKER": "node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/requirejs/bin/r.js -o ./readium-js/readium-shared-js/readium-cfi-js/readium-build-tools/RequireJS_config.js --rjs_bundle=single --rjs_configOverrideTarget=_CHROMEAPP-WORKER",
-    "prebuild:scripts:multiple": "node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/mkdirp/bin/cmd.js build-output/XXX && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/ncp/bin/ncp src/templates/ build-output/XXX/templates/ && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/ncp/bin/ncp src/i18n/ build-output/XXX/i18n/ && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/cpy-cli/cli.js build-output/version.json build-output/XXX/",
-    "build:scripts:multiple": "node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/requirejs/bin/r.js -o ./readium-js/readium-shared-js/readium-cfi-js/readium-build-tools/RequireJS_config.js --rjs_bundle=multiple",
-    "postbuild:scripts:multiple": "node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/rimraf/bin.js build-output/XXX && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/rimraf/bin.js build-output/_multiple-bundles/version.json && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/rimraf/bin.js build-output/_multiple-bundles/templates && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/rimraf/bin.js build-output/_multiple-bundles/i18n && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/rimraf/bin.js build-output/_multiple-bundles/migration && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/rimraf/bin.js build-output/_multiple-bundles/storage && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/rimraf/bin.js build-output/_multiple-bundles/versioning && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/rimraf/bin.js build-output/_multiple-bundles/workers && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/rimraf/bin.js build-output/_multiple-bundles/mathjax && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/cpy-cli/cli.js build-output/_multiple-bundles/z-worker.js build-output/ && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/cpy-cli/cli.js build-output/_multiple-bundles/deflate.js build-output/ && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/cpy-cli/cli.js build-output/_multiple-bundles/inflate.js build-output/ && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/rimraf/bin.js build-output/_multiple-bundles/z-worker.js && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/rimraf/bin.js build-output/_multiple-bundles/deflate.js && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/rimraf/bin.js build-output/_multiple-bundles/inflate.js && ( node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/cpy-cli/cli.js build-output/_multiple-bundles/z-worker.js.map build-output/ && ( node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/cpy-cli/cli.js build-output/_multiple-bundles/deflate.js.map build-output/ && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/cpy-cli/cli.js build-output/_multiple-bundles/inflate.js.map build-output/ && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/rimraf/bin.js build-output/_multiple-bundles/z-worker.js.map && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/rimraf/bin.js build-output/_multiple-bundles/deflate.js.map && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/rimraf/bin.js build-output/_multiple-bundles/inflate.js.map ) || echo \"=== SUCCESS [ignore previous error]: no sourcemaps were generated for zip web-worker, deflate, inflate (no uglification).\" ) && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/rimraf/bin.js build-output/_multiple-bundles/RequireJS.js.src.js && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/rimraf/bin.js build-output/_multiple-bundles/inflate.js.src.js && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/rimraf/bin.js build-output/_multiple-bundles/deflate.js.src.js && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/rimraf/bin.js build-output/_multiple-bundles/z-worker.js.src.js",
+    "build:scripts:single": "node ./readium-js/readium-shared-js/node_modules/requirejs/bin/r.js -o ./readium-js/readium-shared-js/readium-build-tools/RequireJS_config.js --rjs_bundle=single",
+    "build:scripts:single:LITE": "node ./readium-js/readium-shared-js/node_modules/requirejs/bin/r.js -o ./readium-js/readium-shared-js/readium-build-tools/RequireJS_config.js --rjs_bundle=single --rjs_configCustomTarget=_LITE",
+    "build:scripts:single:CHROMEAPP": "node ./readium-js/readium-shared-js/node_modules/requirejs/bin/r.js -o ./readium-js/readium-shared-js/readium-build-tools/RequireJS_config.js --rjs_bundle=single --rjs_configCustomTarget=_CHROMEAPP",
+    "build:scripts:single:CHROMEAPPWORKER": "node ./readium-js/readium-shared-js/node_modules/requirejs/bin/r.js -o ./readium-js/readium-shared-js/readium-build-tools/RequireJS_config.js --rjs_bundle=single --rjs_configOverrideTarget=_CHROMEAPP-WORKER",
+    "prebuild:scripts:multiple": "node ./readium-js/readium-shared-js/node_modules/mkdirp/bin/cmd.js build-output/XXX && node ./readium-js/readium-shared-js/node_modules/ncp/bin/ncp src/templates/ build-output/XXX/templates/ && node ./readium-js/readium-shared-js/node_modules/ncp/bin/ncp src/i18n/ build-output/XXX/i18n/ && node ./readium-js/readium-shared-js/node_modules/cpy-cli/cli.js build-output/version.json build-output/XXX/",
+    "build:scripts:multiple": "node ./readium-js/readium-shared-js/node_modules/requirejs/bin/r.js -o ./readium-js/readium-shared-js/readium-build-tools/RequireJS_config.js --rjs_bundle=multiple",
+    "postbuild:scripts:multiple": "node ./readium-js/readium-shared-js/node_modules/rimraf/bin.js build-output/XXX && node ./readium-js/readium-shared-js/node_modules/rimraf/bin.js build-output/_multiple-bundles/version.json && node ./readium-js/readium-shared-js/node_modules/rimraf/bin.js build-output/_multiple-bundles/templates && node ./readium-js/readium-shared-js/node_modules/rimraf/bin.js build-output/_multiple-bundles/i18n && node ./readium-js/readium-shared-js/node_modules/rimraf/bin.js build-output/_multiple-bundles/migration && node ./readium-js/readium-shared-js/node_modules/rimraf/bin.js build-output/_multiple-bundles/storage && node ./readium-js/readium-shared-js/node_modules/rimraf/bin.js build-output/_multiple-bundles/versioning && node ./readium-js/readium-shared-js/node_modules/rimraf/bin.js build-output/_multiple-bundles/workers && node ./readium-js/readium-shared-js/node_modules/rimraf/bin.js build-output/_multiple-bundles/mathjax && node ./readium-js/readium-shared-js/node_modules/cpy-cli/cli.js build-output/_multiple-bundles/z-worker.js build-output/ && node ./readium-js/readium-shared-js/node_modules/cpy-cli/cli.js build-output/_multiple-bundles/deflate.js build-output/ && node ./readium-js/readium-shared-js/node_modules/cpy-cli/cli.js build-output/_multiple-bundles/inflate.js build-output/ && node ./readium-js/readium-shared-js/node_modules/rimraf/bin.js build-output/_multiple-bundles/z-worker.js && node ./readium-js/readium-shared-js/node_modules/rimraf/bin.js build-output/_multiple-bundles/deflate.js && node ./readium-js/readium-shared-js/node_modules/rimraf/bin.js build-output/_multiple-bundles/inflate.js && ( node ./readium-js/readium-shared-js/node_modules/cpy-cli/cli.js build-output/_multiple-bundles/z-worker.js.map build-output/ && ( node ./readium-js/readium-shared-js/node_modules/cpy-cli/cli.js build-output/_multiple-bundles/deflate.js.map build-output/ && node ./readium-js/readium-shared-js/node_modules/cpy-cli/cli.js build-output/_multiple-bundles/inflate.js.map build-output/ && node ./readium-js/readium-shared-js/node_modules/rimraf/bin.js build-output/_multiple-bundles/z-worker.js.map && node ./readium-js/readium-shared-js/node_modules/rimraf/bin.js build-output/_multiple-bundles/deflate.js.map && node ./readium-js/readium-shared-js/node_modules/rimraf/bin.js build-output/_multiple-bundles/inflate.js.map ) || echo \"=== SUCCESS [ignore previous error]: no sourcemaps were generated for zip web-worker, deflate, inflate (no uglification).\" ) && node ./readium-js/readium-shared-js/node_modules/rimraf/bin.js build-output/_multiple-bundles/RequireJS.js.src.js && node ./readium-js/readium-shared-js/node_modules/rimraf/bin.js build-output/_multiple-bundles/inflate.js.src.js && node ./readium-js/readium-shared-js/node_modules/rimraf/bin.js build-output/_multiple-bundles/deflate.js.src.js && node ./readium-js/readium-shared-js/node_modules/rimraf/bin.js build-output/_multiple-bundles/z-worker.js.src.js",
     "dist:cssoptimize": "node node_modules/clean-css-cli/bin/cleancss --skip-rebase --skip-advanced --level 0 \"node_modules/bootstrap/dist/css/bootstrap.css\" \"node_modules/bootstrap-accessibility-plugin/plugins/css/bootstrap-accessibility.css\" \"src/css/sourcesanspro.css\" \"src/css/readium_js.css\" \"src/css/viewer.css\" \"src/css/viewer_audio.css\" \"src/css/settings.css\"",
-    "predist": "npm run build && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/mkdirp/bin/cmd.js dist",
+    "predist": "npm run build && node ./readium-js/readium-shared-js/node_modules/mkdirp/bin/cmd.js dist",
     "dist": "npm run dist:copy && npm run dist:cloudReaderLite && npm run dist:cloudReader && npm run dist:chromeApp",
     "dist+sourcemap": "npm run dist && npm run deploy:cloudReader:copy:sourcemap && npm run deploy:cloudReaderLite:copy:sourcemap && npm run deploy:chromeApp:copy:sourcemap",
-    "dist:copy": "node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/mkdirp/bin/cmd.js dist/zip_sourcemap && ( node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/cpy-cli/cli.js build-output/z-worker.js.map dist/zip_sourcemap && ( node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/cpy-cli/cli.js build-output/deflate.js.map dist/zip_sourcemap && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/cpy-cli/cli.js build-output/inflate.js.map dist/zip_sourcemap ) || ( echo \"=== SUCCESS [ignore previous error]: no sourcemaps were generated for zip web-worker, deflate, inflate (no uglification).\" && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/rimraf/bin.js dist/zip_sourcemap ) )",
-    "chromeApp": "npm run clean && npm run versioning && npm run genPluginsConfig && npm run build:scripts:single:CHROMEAPP --readium-js-viewer:RJS_UGLY=no && npm run build:scripts:single:CHROMEAPPWORKER --readium-js-viewer:RJS_UGLY=no && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/mkdirp/bin/cmd.js dist && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/mkdirp/bin/cmd.js dist/cloud-reader/css && npm run dist:cssoptimize -- \"src/css/library.css\" \"-o\" \"dist/cloud-reader/css/readium-all.css\" && npm run dist:chromeApp && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/rimraf/bin.js dist/cloud-reader && npm run deploy:chromeApp:copy:sourcemap && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/rimraf/bin.js dist/chrome-app_sourcemap",
-    "predist:chromeApp": "node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/rimraf/bin.js dist/chrome-app && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/rimraf/bin.js dist/chrome-app_sourcemap",
+    "dist:copy": "node ./readium-js/readium-shared-js/node_modules/mkdirp/bin/cmd.js dist/zip_sourcemap && ( node ./readium-js/readium-shared-js/node_modules/cpy-cli/cli.js build-output/z-worker.js.map dist/zip_sourcemap && ( node ./readium-js/readium-shared-js/node_modules/cpy-cli/cli.js build-output/deflate.js.map dist/zip_sourcemap && node ./readium-js/readium-shared-js/node_modules/cpy-cli/cli.js build-output/inflate.js.map dist/zip_sourcemap ) || ( echo \"=== SUCCESS [ignore previous error]: no sourcemaps were generated for zip web-worker, deflate, inflate (no uglification).\" && node ./readium-js/readium-shared-js/node_modules/rimraf/bin.js dist/zip_sourcemap ) )",
+    "chromeApp": "npm run clean && npm run versioning && npm run genPluginsConfig && npm run build:scripts:single:CHROMEAPP --readium-js-viewer:RJS_UGLY=no && npm run build:scripts:single:CHROMEAPPWORKER --readium-js-viewer:RJS_UGLY=no && node ./readium-js/readium-shared-js/node_modules/mkdirp/bin/cmd.js dist && node ./readium-js/readium-shared-js/node_modules/mkdirp/bin/cmd.js dist/cloud-reader/css && npm run dist:cssoptimize -- \"src/css/library.css\" \"-o\" \"dist/cloud-reader/css/readium-all.css\" && npm run dist:chromeApp && node ./readium-js/readium-shared-js/node_modules/rimraf/bin.js dist/cloud-reader && npm run deploy:chromeApp:copy:sourcemap && node ./readium-js/readium-shared-js/node_modules/rimraf/bin.js dist/chrome-app_sourcemap",
+    "predist:chromeApp": "node ./readium-js/readium-shared-js/node_modules/rimraf/bin.js dist/chrome-app && node ./readium-js/readium-shared-js/node_modules/rimraf/bin.js dist/chrome-app_sourcemap",
     "dist:chromeApp": "npm run dist:chromeApp:copy && npm run dist:chromeApp:copy:fonts && node build-config/updateChromeManifest.js && npm run dist:chromeApp:css && npm run dist:chromeApp:js",
-    "dist:chromeApp:copy": "node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/mkdirp/bin/cmd.js dist/chrome-app/scripts/zip && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/mkdirp/bin/cmd.js dist/chrome-app/scripts/mathjax && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/cpy-cli/cli.js src/chrome-app/index.html dist/chrome-app/ && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/cpy-cli/cli.js readium-js/node_modules/zip-js/WebContent/z-worker.js dist/chrome-app/scripts/zip && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/cpy-cli/cli.js readium-js/node_modules/zip-js/WebContent/deflate.js dist/chrome-app/scripts/zip && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/cpy-cli/cli.js readium-js/node_modules/zip-js/WebContent/inflate.js dist/chrome-app/scripts/zip && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/ncp/bin/ncp src/images/ dist/chrome-app/images/ && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/cpy-cli/cli.js node_modules/mathjax-single-file/dist/readium/MathJax.js dist/chrome-app/scripts/mathjax && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/ncp/bin/ncp node_modules/bootstrap/fonts/ dist/chrome-app/fonts/ && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/cpy-cli/cli.js src/css/annotations.css dist/chrome-app/css/ && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/cpy-cli/cli.js src/chrome-app/epubReadingSystem.js dist/chrome-app/scripts/ && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/cpy-cli/cli.js src/chrome-app/background.js dist/chrome-app/scripts/ && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/ncp/bin/ncp src/chrome-app/icons/ dist/chrome-app/icons/ && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/ncp/bin/ncp src/i18n/_locales/ dist/chrome-app/_locales/ && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/cpy-cli/cli.js src/chrome-app/manifest.json dist/chrome-app/",
-    "dist:chromeApp:copy:fonts": "node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/ncp/bin/ncp src/fonts/ dist/chrome-app/font-faces/",
-    "dist:chromeApp:css": "node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/cpy-cli/cli.js dist/cloud-reader/css/readium-all.css dist/chrome-app/css/",
-    "dist:chromeApp:js": "node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/mkdirp/bin/cmd.js dist/chrome-app_sourcemap && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/cpy-cli/cli.js build-output/_single-bundle/readium-js-viewer_all_CHROMEAPP.js dist/chrome-app/scripts/ && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/cpy-cli/cli.js build-output/_single-bundle/readium-js-viewer_all_CHROMEAPP.js.map dist/chrome-app_sourcemap/ && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/cpy-cli/cli.js build-output/_single-bundle/readium-js-viewer_CHROMEAPP-WORKER.js dist/chrome-app/scripts/ && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/cpy-cli/cli.js build-output/_single-bundle/readium-js-viewer_CHROMEAPP-WORKER.js.map dist/chrome-app_sourcemap/",
+    "dist:chromeApp:copy": "node ./readium-js/readium-shared-js/node_modules/mkdirp/bin/cmd.js dist/chrome-app/scripts/zip && node ./readium-js/readium-shared-js/node_modules/mkdirp/bin/cmd.js dist/chrome-app/scripts/mathjax && node ./readium-js/readium-shared-js/node_modules/cpy-cli/cli.js src/chrome-app/index.html dist/chrome-app/ && node ./readium-js/readium-shared-js/node_modules/cpy-cli/cli.js readium-js/node_modules/zip-js/WebContent/z-worker.js dist/chrome-app/scripts/zip && node ./readium-js/readium-shared-js/node_modules/cpy-cli/cli.js readium-js/node_modules/zip-js/WebContent/deflate.js dist/chrome-app/scripts/zip && node ./readium-js/readium-shared-js/node_modules/cpy-cli/cli.js readium-js/node_modules/zip-js/WebContent/inflate.js dist/chrome-app/scripts/zip && node ./readium-js/readium-shared-js/node_modules/ncp/bin/ncp src/images/ dist/chrome-app/images/ && node ./readium-js/readium-shared-js/node_modules/cpy-cli/cli.js node_modules/mathjax-single-file/dist/readium/MathJax.js dist/chrome-app/scripts/mathjax && node ./readium-js/readium-shared-js/node_modules/ncp/bin/ncp node_modules/bootstrap/fonts/ dist/chrome-app/fonts/ && node ./readium-js/readium-shared-js/node_modules/cpy-cli/cli.js src/css/annotations.css dist/chrome-app/css/ && node ./readium-js/readium-shared-js/node_modules/cpy-cli/cli.js src/chrome-app/epubReadingSystem.js dist/chrome-app/scripts/ && node ./readium-js/readium-shared-js/node_modules/cpy-cli/cli.js src/chrome-app/background.js dist/chrome-app/scripts/ && node ./readium-js/readium-shared-js/node_modules/ncp/bin/ncp src/chrome-app/icons/ dist/chrome-app/icons/ && node ./readium-js/readium-shared-js/node_modules/ncp/bin/ncp src/i18n/_locales/ dist/chrome-app/_locales/ && node ./readium-js/readium-shared-js/node_modules/cpy-cli/cli.js src/chrome-app/manifest.json dist/chrome-app/",
+    "dist:chromeApp:copy:fonts": "node ./readium-js/readium-shared-js/node_modules/ncp/bin/ncp src/fonts/ dist/chrome-app/font-faces/",
+    "dist:chromeApp:css": "node ./readium-js/readium-shared-js/node_modules/cpy-cli/cli.js dist/cloud-reader/css/readium-all.css dist/chrome-app/css/",
+    "dist:chromeApp:js": "node ./readium-js/readium-shared-js/node_modules/mkdirp/bin/cmd.js dist/chrome-app_sourcemap && node ./readium-js/readium-shared-js/node_modules/cpy-cli/cli.js build-output/_single-bundle/readium-js-viewer_all_CHROMEAPP.js dist/chrome-app/scripts/ && node ./readium-js/readium-shared-js/node_modules/cpy-cli/cli.js build-output/_single-bundle/readium-js-viewer_all_CHROMEAPP.js.map dist/chrome-app_sourcemap/ && node ./readium-js/readium-shared-js/node_modules/cpy-cli/cli.js build-output/_single-bundle/readium-js-viewer_CHROMEAPP-WORKER.js dist/chrome-app/scripts/ && node ./readium-js/readium-shared-js/node_modules/cpy-cli/cli.js build-output/_single-bundle/readium-js-viewer_CHROMEAPP-WORKER.js.map dist/chrome-app_sourcemap/",
     "crx": "node node_modules/crx/bin/crx pack dist/chrome-app/ --output dist/Readium.crx --private-key tests/test.pem",
-    "predist:cloudReader": "node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/rimraf/bin.js dist/cloud-reader && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/rimraf/bin.js dist/cloud-reader_sourcemap",
+    "predist:cloudReader": "node ./readium-js/readium-shared-js/node_modules/rimraf/bin.js dist/cloud-reader && node ./readium-js/readium-shared-js/node_modules/rimraf/bin.js dist/cloud-reader_sourcemap",
     "dist:cloudReader": "npm run dist:cloudReader:copy && npm run dist:cloudReader:copy:fonts && npm run dist:cloudReader:css && npm run dist:cloudReader:js",
-    "dist:cloudReader:copy": "node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/mkdirp/bin/cmd.js dist/cloud-reader/scripts/zip && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/mkdirp/bin/cmd.js dist/cloud-reader/scripts/mathjax && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/cpy-cli/cli.js src/cloud-reader/index.html dist/cloud-reader/ && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/cpy-cli/cli.js build-output/z-worker.js dist/cloud-reader/scripts/zip && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/cpy-cli/cli.js build-output/deflate.js dist/cloud-reader/scripts/zip && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/cpy-cli/cli.js build-output/inflate.js dist/cloud-reader/scripts/zip && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/ncp/bin/ncp src/images/ dist/cloud-reader/images/ && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/cpy-cli/cli.js node_modules/mathjax-single-file/dist/readium/MathJax.js dist/cloud-reader/scripts/mathjax && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/ncp/bin/ncp node_modules/bootstrap/fonts/ dist/cloud-reader/fonts/ && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/cpy-cli/cli.js src/css/annotations.css dist/cloud-reader/css/",
-    "dist:cloudReader:copy:fonts": "node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/ncp/bin/ncp src/fonts/ dist/cloud-reader/font-faces/",
-    "dist:cloudReader:css": "node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/mkdirp/bin/cmd.js dist/cloud-reader/css && npm run dist:cssoptimize -- \"src/css/library.css\" \"-o\" \"dist/cloud-reader/css/readium-all.css\"",
-    "dist:cloudReader:js": "node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/mkdirp/bin/cmd.js dist/cloud-reader_sourcemap && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/cpy-cli/cli.js build-output/_single-bundle/readium-js-viewer_all.js dist/cloud-reader/scripts/ && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/cpy-cli/cli.js build-output/_single-bundle/readium-js-viewer_all.js.map dist/cloud-reader_sourcemap/",
-    "predist:cloudReaderLite": "node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/rimraf/bin.js dist/cloud-reader-lite && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/rimraf/bin.js dist/cloud-reader-lite_sourcemap",
+    "dist:cloudReader:copy": "node ./readium-js/readium-shared-js/node_modules/mkdirp/bin/cmd.js dist/cloud-reader/scripts/zip && node ./readium-js/readium-shared-js/node_modules/mkdirp/bin/cmd.js dist/cloud-reader/scripts/mathjax && node ./readium-js/readium-shared-js/node_modules/cpy-cli/cli.js src/cloud-reader/index.html dist/cloud-reader/ && node ./readium-js/readium-shared-js/node_modules/cpy-cli/cli.js build-output/z-worker.js dist/cloud-reader/scripts/zip && node ./readium-js/readium-shared-js/node_modules/cpy-cli/cli.js build-output/deflate.js dist/cloud-reader/scripts/zip && node ./readium-js/readium-shared-js/node_modules/cpy-cli/cli.js build-output/inflate.js dist/cloud-reader/scripts/zip && node ./readium-js/readium-shared-js/node_modules/ncp/bin/ncp src/images/ dist/cloud-reader/images/ && node ./readium-js/readium-shared-js/node_modules/cpy-cli/cli.js node_modules/mathjax-single-file/dist/readium/MathJax.js dist/cloud-reader/scripts/mathjax && node ./readium-js/readium-shared-js/node_modules/ncp/bin/ncp node_modules/bootstrap/fonts/ dist/cloud-reader/fonts/ && node ./readium-js/readium-shared-js/node_modules/cpy-cli/cli.js src/css/annotations.css dist/cloud-reader/css/",
+    "dist:cloudReader:copy:fonts": "node ./readium-js/readium-shared-js/node_modules/ncp/bin/ncp src/fonts/ dist/cloud-reader/font-faces/",
+    "dist:cloudReader:css": "node ./readium-js/readium-shared-js/node_modules/mkdirp/bin/cmd.js dist/cloud-reader/css && npm run dist:cssoptimize -- \"src/css/library.css\" \"-o\" \"dist/cloud-reader/css/readium-all.css\"",
+    "dist:cloudReader:js": "node ./readium-js/readium-shared-js/node_modules/mkdirp/bin/cmd.js dist/cloud-reader_sourcemap && node ./readium-js/readium-shared-js/node_modules/cpy-cli/cli.js build-output/_single-bundle/readium-js-viewer_all.js dist/cloud-reader/scripts/ && node ./readium-js/readium-shared-js/node_modules/cpy-cli/cli.js build-output/_single-bundle/readium-js-viewer_all.js.map dist/cloud-reader_sourcemap/",
+    "predist:cloudReaderLite": "node ./readium-js/readium-shared-js/node_modules/rimraf/bin.js dist/cloud-reader-lite && node ./readium-js/readium-shared-js/node_modules/rimraf/bin.js dist/cloud-reader-lite_sourcemap",
     "dist:cloudReaderLite": "npm run dist:cloudReaderLite:copy && npm run dist:cloudReaderLite:copy:fonts && npm run dist:cloudReaderLite:css && npm run dist:cloudReaderLite:js",
-    "dist:cloudReaderLite:copy": "node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/mkdirp/bin/cmd.js dist/cloud-reader-lite/scripts/zip && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/mkdirp/bin/cmd.js dist/cloud-reader-lite/scripts/mathjax && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/cpy-cli/cli.js src/cloud-reader-lite/index.html dist/cloud-reader-lite/ && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/cpy-cli/cli.js build-output/z-worker.js dist/cloud-reader-lite/scripts/zip && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/cpy-cli/cli.js build-output/deflate.js dist/cloud-reader-lite/scripts/zip && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/cpy-cli/cli.js build-output/inflate.js dist/cloud-reader-lite/scripts/zip && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/ncp/bin/ncp src/images/ dist/cloud-reader-lite/images/ && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/cpy-cli/cli.js node_modules/mathjax-single-file/dist/readium/MathJax.js dist/cloud-reader-lite/scripts/mathjax && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/ncp/bin/ncp node_modules/bootstrap/fonts/ dist/cloud-reader-lite/fonts/ && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/cpy-cli/cli.js src/css/annotations.css dist/cloud-reader-lite/css/",
-    "dist:cloudReaderLite:copy:fonts": "node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/ncp/bin/ncp src/fonts/ dist/cloud-reader-lite/font-faces/",
-    "dist:cloudReaderLite:css": "node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/mkdirp/bin/cmd.js dist/cloud-reader-lite/css && npm run dist:cssoptimize -- \"-o\" \"dist/cloud-reader-lite/css/readium-all.css\"",
-    "dist:cloudReaderLite:js": "node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/mkdirp/bin/cmd.js dist/cloud-reader-lite_sourcemap && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/cpy-cli/cli.js build-output/_single-bundle/readium-js-viewer_all_LITE.js dist/cloud-reader-lite/scripts/ && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/cpy-cli/cli.js build-output/_single-bundle/readium-js-viewer_all_LITE.js.map dist/cloud-reader-lite_sourcemap/",
+    "dist:cloudReaderLite:copy": "node ./readium-js/readium-shared-js/node_modules/mkdirp/bin/cmd.js dist/cloud-reader-lite/scripts/zip && node ./readium-js/readium-shared-js/node_modules/mkdirp/bin/cmd.js dist/cloud-reader-lite/scripts/mathjax && node ./readium-js/readium-shared-js/node_modules/cpy-cli/cli.js src/cloud-reader-lite/index.html dist/cloud-reader-lite/ && node ./readium-js/readium-shared-js/node_modules/cpy-cli/cli.js build-output/z-worker.js dist/cloud-reader-lite/scripts/zip && node ./readium-js/readium-shared-js/node_modules/cpy-cli/cli.js build-output/deflate.js dist/cloud-reader-lite/scripts/zip && node ./readium-js/readium-shared-js/node_modules/cpy-cli/cli.js build-output/inflate.js dist/cloud-reader-lite/scripts/zip && node ./readium-js/readium-shared-js/node_modules/ncp/bin/ncp src/images/ dist/cloud-reader-lite/images/ && node ./readium-js/readium-shared-js/node_modules/cpy-cli/cli.js node_modules/mathjax-single-file/dist/readium/MathJax.js dist/cloud-reader-lite/scripts/mathjax && node ./readium-js/readium-shared-js/node_modules/ncp/bin/ncp node_modules/bootstrap/fonts/ dist/cloud-reader-lite/fonts/ && node ./readium-js/readium-shared-js/node_modules/cpy-cli/cli.js src/css/annotations.css dist/cloud-reader-lite/css/",
+    "dist:cloudReaderLite:copy:fonts": "node ./readium-js/readium-shared-js/node_modules/ncp/bin/ncp src/fonts/ dist/cloud-reader-lite/font-faces/",
+    "dist:cloudReaderLite:css": "node ./readium-js/readium-shared-js/node_modules/mkdirp/bin/cmd.js dist/cloud-reader-lite/css && npm run dist:cssoptimize -- \"-o\" \"dist/cloud-reader-lite/css/readium-all.css\"",
+    "dist:cloudReaderLite:js": "node ./readium-js/readium-shared-js/node_modules/mkdirp/bin/cmd.js dist/cloud-reader-lite_sourcemap && node ./readium-js/readium-shared-js/node_modules/cpy-cli/cli.js build-output/_single-bundle/readium-js-viewer_all_LITE.js dist/cloud-reader-lite/scripts/ && node ./readium-js/readium-shared-js/node_modules/cpy-cli/cli.js build-output/_single-bundle/readium-js-viewer_all_LITE.js.map dist/cloud-reader-lite_sourcemap/",
     "genOPDS": "npm run genOPDS_IDPF_tests && npm run genOPDS_DAISY_tests && npm run genOPDS_IDPF_samples && npm run genOPDS_IDPF_widgets && npm run genOPDS_IDPF_edupub",
-    "genOPDS_IDPF_widgets": "node ./readium-js/readium-shared-js/readium-cfi-js/readium-build-tools/genOPDS.js epub_content/epub_widgets.opds IDPF scriptable-components master /Samples/1-basic_component/embedded FIRST && node ./readium-js/readium-shared-js/readium-cfi-js/readium-build-tools/genOPDS.js epub_content/epub_widgets.opds IDPF scriptable-components master /Samples/1-basic_component/packaged APPEND && node ./readium-js/readium-shared-js/readium-cfi-js/readium-build-tools/genOPDS.js epub_content/epub_widgets.opds IDPF scriptable-components feature/logger-widget /Samples/readium/tempwave-demo/embedded APPEND && node ./readium-js/readium-shared-js/readium-cfi-js/readium-build-tools/genOPDS.js epub_content/epub_widgets.opds IDPF scriptable-components feature/logger-widget /Samples/readium/tempwave-demo/packaged APPEND && node ./readium-js/readium-shared-js/readium-cfi-js/readium-build-tools/genOPDS.js epub_content/epub_widgets.opds IDPF scriptable-components feature/logger-widget /Samples/readium/logger-demo/packaged APPEND && node ./readium-js/readium-shared-js/readium-cfi-js/readium-build-tools/genOPDS.js epub_content/epub_widgets.opds IDPF scriptable-components feature/logger-widget /Samples/readium/logger-demo/embedded APPEND && node ./readium-js/readium-shared-js/readium-cfi-js/readium-build-tools/genOPDS.js epub_content/epub_widgets.opds IDPF scriptable-components feature/logger-widget /Samples/readium APPEND && node ./readium-js/readium-shared-js/readium-cfi-js/readium-build-tools/genOPDS.js epub_content/epub_widgets.opds IDPF scriptable-components PubCoder /Samples/3-messaging_component/embedded/PubCoder APPEND && node ./readium-js/readium-shared-js/readium-cfi-js/readium-build-tools/genOPDS.js epub_content/epub_widgets.opds IDPF scriptable-components PubCoder /Samples/1-basic_component/embedded/PubCoder APPEND && node ./readium-js/readium-shared-js/readium-cfi-js/readium-build-tools/genOPDS.js epub_content/epub_widgets.opds IDPF scriptable-components PubCoder /Samples/1-basic_component/packaged/PubCoder LAST",
-    "genOPDS_IDPF_edupub": "node ./readium-js/readium-shared-js/readium-cfi-js/readium-build-tools/genOPDS.js epub_content/epub_edu.opds IDPF education master /samples FIRST && node ./readium-js/readium-shared-js/readium-cfi-js/readium-build-tools/genOPDS.js epub_content/epub_edu.opds snaekobbi braille-rendition-epub samples /edupub/samples LAST",
-    "genOPDS_IDPF_tests": "node ./readium-js/readium-shared-js/readium-cfi-js/readium-build-tools/genOPDS.js epub_content/epub_testsuite.opds IDPF epub-testsuite master /content/30",
-    "genOPDS_DAISY_tests": "node ./readium-js/readium-shared-js/readium-cfi-js/readium-build-tools/genOPDS.js epub_content/epub_tests_a11y.opds daisy epub-accessibility-tests master /content",
-    "genOPDS_IDPF_samples": "node ./readium-js/readium-shared-js/readium-cfi-js/readium-build-tools/genOPDS.js epub_content/epub_samples.opds IDPF epub3-samples master /30",
+    "genOPDS_IDPF_widgets": "node ./readium-js/readium-shared-js/readium-build-tools/genOPDS.js epub_content/epub_widgets.opds IDPF scriptable-components master /Samples/1-basic_component/embedded FIRST && node ./readium-js/readium-shared-js/readium-build-tools/genOPDS.js epub_content/epub_widgets.opds IDPF scriptable-components master /Samples/1-basic_component/packaged APPEND && node ./readium-js/readium-shared-js/readium-build-tools/genOPDS.js epub_content/epub_widgets.opds IDPF scriptable-components feature/logger-widget /Samples/readium/tempwave-demo/embedded APPEND && node ./readium-js/readium-shared-js/readium-build-tools/genOPDS.js epub_content/epub_widgets.opds IDPF scriptable-components feature/logger-widget /Samples/readium/tempwave-demo/packaged APPEND && node ./readium-js/readium-shared-js/readium-build-tools/genOPDS.js epub_content/epub_widgets.opds IDPF scriptable-components feature/logger-widget /Samples/readium/logger-demo/packaged APPEND && node ./readium-js/readium-shared-js/readium-build-tools/genOPDS.js epub_content/epub_widgets.opds IDPF scriptable-components feature/logger-widget /Samples/readium/logger-demo/embedded APPEND && node ./readium-js/readium-shared-js/readium-build-tools/genOPDS.js epub_content/epub_widgets.opds IDPF scriptable-components feature/logger-widget /Samples/readium APPEND && node ./readium-js/readium-shared-js/readium-build-tools/genOPDS.js epub_content/epub_widgets.opds IDPF scriptable-components PubCoder /Samples/3-messaging_component/embedded/PubCoder APPEND && node ./readium-js/readium-shared-js/readium-build-tools/genOPDS.js epub_content/epub_widgets.opds IDPF scriptable-components PubCoder /Samples/1-basic_component/embedded/PubCoder APPEND && node ./readium-js/readium-shared-js/readium-build-tools/genOPDS.js epub_content/epub_widgets.opds IDPF scriptable-components PubCoder /Samples/1-basic_component/packaged/PubCoder LAST",
+    "genOPDS_IDPF_edupub": "node ./readium-js/readium-shared-js/readium-build-tools/genOPDS.js epub_content/epub_edu.opds IDPF education master /samples FIRST && node ./readium-js/readium-shared-js/readium-build-tools/genOPDS.js epub_content/epub_edu.opds snaekobbi braille-rendition-epub samples /edupub/samples LAST",
+    "genOPDS_IDPF_tests": "node ./readium-js/readium-shared-js/readium-build-tools/genOPDS.js epub_content/epub_testsuite.opds IDPF epub-testsuite master /content/30",
+    "genOPDS_DAISY_tests": "node ./readium-js/readium-shared-js/readium-build-tools/genOPDS.js epub_content/epub_tests_a11y.opds daisy epub-accessibility-tests master /content",
+    "genOPDS_IDPF_samples": "node ./readium-js/readium-shared-js/readium-build-tools/genOPDS.js epub_content/epub_samples.opds IDPF epub3-samples master /30",
     "http:watch": "echo > open_webbrowser.js && run-p \"dowatch\" \"http:app_ebooks\"",
     "http": "echo > open_webbrowser.js && run-p \"dowatch:plugins\" \"http:app_ebooks\"",
     "http:nowatch": "npm run http:app_ebooks",
     "http2:watch": "echo > open_webbrowser.js && run-p \"dowatch\" \"http:ebooks\" \"http:app\"",
     "http2": "echo > open_webbrowser.js && run-p \"dowatch:plugins\" \"http:ebooks\" \"http:app\"",
     "http2:nowatch": "run-p \"http:ebooks\" \"http:app\"",
-    "dowatch:plugins": "node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/watch/cli.js \"npm run genPluginsConfig && node readium-js/readium-shared-js/readium-cfi-js/readium-build-tools/webbrowser.js && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/rimraf/bin.js open_webbrowser.js\" readium-js/readium-shared-js/plugins/",
-    "dowatch": "node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/watch/cli.js \"npm run build && node readium-js/readium-shared-js/readium-cfi-js/readium-build-tools/webbrowser.js && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/rimraf/bin.js open_webbrowser.js\" dev/ src/ readium-js/js/ readium-js/readium-shared-js/js/ readium-js/readium-shared-js/plugins/ readium-js/readium-shared-js/readium-cfi-js/js/",
-    "http:app": "node readium-js/readium-shared-js/readium-cfi-js/readium-build-tools/http-server.js -LOGFILE http_app.log -OPEN /dev/index_RequireJS_no-optimize.html -p 9090 -c-1 ./",
-    "http:ebooks": "node readium-js/readium-shared-js/readium-cfi-js/readium-build-tools/http-server.js -LOGFILE http_ebooks.log -a 127.0.0.1 -p 8080 -c-1 --cors ./epub_content",
-    "http:app_ebooks": "node readium-js/readium-shared-js/readium-cfi-js/readium-build-tools/http-server.js -LOGFILE http_app-ebooks.log -OPEN /dev/index_RequireJS_no-optimize.html -a 127.0.0.1 -p 8080 -c-1 .",
-    "http:cloudReaderDist": "node readium-js/readium-shared-js/readium-cfi-js/readium-build-tools/http-server.js -LOGFILE http_app-ebooks.log -OPEN /dist/cloud-reader/?epubs=http://127.0.0.1:8080/epub_content/epub_library.opds -a 127.0.0.1 -p 8080 -c-1 .",
+    "dowatch:plugins": "node ./readium-js/readium-shared-js/node_modules/watch/cli.js \"npm run genPluginsConfig && node readium-js/readium-shared-js/readium-build-tools/webbrowser.js && node ./readium-js/readium-shared-js/node_modules/rimraf/bin.js open_webbrowser.js\" readium-js/readium-shared-js/plugins/",
+    "dowatch": "node ./readium-js/readium-shared-js/node_modules/watch/cli.js \"npm run build && node readium-js/readium-shared-js/readium-build-tools/webbrowser.js && node ./readium-js/readium-shared-js/node_modules/rimraf/bin.js open_webbrowser.js\" dev/ src/ readium-js/js/ readium-js/readium-shared-js/js/ readium-js/readium-shared-js/plugins/",
+    "http:app": "node readium-js/readium-shared-js/readium-build-tools/http-server.js -LOGFILE http_app.log -OPEN /dev/index_RequireJS_no-optimize.html -p 9090 -c-1 ./",
+    "http:ebooks": "node readium-js/readium-shared-js/readium-build-tools/http-server.js -LOGFILE http_ebooks.log -a 127.0.0.1 -p 8080 -c-1 --cors ./epub_content",
+    "http:app_ebooks": "node readium-js/readium-shared-js/readium-build-tools/http-server.js -LOGFILE http_app-ebooks.log -OPEN /dev/index_RequireJS_no-optimize.html -a 127.0.0.1 -p 8080 -c-1 .",
+    "http:cloudReaderDist": "node readium-js/readium-shared-js/readium-build-tools/http-server.js -LOGFILE http_app-ebooks.log -OPEN /dist/cloud-reader/?epubs=http://127.0.0.1:8080/epub_content/epub_library.opds -a 127.0.0.1 -p 8080 -c-1 .",
     "http:travis": "node node_modules/http-server/bin/http-server -a 127.0.0.1 -p 8080 -c-1 ./dist/cloud-reader/",
     "mocha": "node node_modules/mocha/bin/mocha --timeout 180000 --ui bdd tests/tests.js",
-    "clean:tests": "node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/rimraf/bin.js dist/Readium.crx && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/rimraf/bin.js dist/cloud-reader/epub_content/ && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/rimraf/bin.js dist/testbooks.zip && node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/rimraf/bin.js dist/testlibrary/",
+    "clean:tests": "node ./readium-js/readium-shared-js/node_modules/rimraf/bin.js dist/Readium.crx && node ./readium-js/readium-shared-js/node_modules/rimraf/bin.js dist/cloud-reader/epub_content/ && node ./readium-js/readium-shared-js/node_modules/rimraf/bin.js dist/testbooks.zip && node ./readium-js/readium-shared-js/node_modules/rimraf/bin.js dist/testlibrary/",
     "test": "npm run test:chromeApp && npm run test:firefox && npm run test:chrome",
     "pretest:chromeApp": "npm run crx",
     "test:chromeApp": "concurrently --raw --kill-others \"node build-config/selenium_webdriver.js -a 127.0.0.1 -p 8080 -c-1 ./dist/chrome-app\" \"npm run mocha --readium-js-viewer:MODE=chromeApp\"",
@@ -167,9 +167,9 @@
     "test:sauce:chrome": "npm run mocha --readium-js-viewer:USE_SAUCE=true --readium-js-viewer:MODE=chrome",
     "pretest:travis": "npm run dist && npm run crx && npm run deploy:cloudReader:copy:sourcemap && cd dist/cloud-reader && zip -r ../Readium_cloud-reader.zip . -x epub_content* && cd ../.. && npm run deploy:cloudReaderLite:copy:sourcemap && cd dist/cloud-reader-lite && zip -r ../Readium_cloud-reader-lite.zip . && cd ../.. && npm run deploy:cloudReader:copy:epub_content",
     "test:travis": "run-p \"http:travis\" \"mocha\"",
-    "deploy:cloudReader:copy:epub_content": "node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/ncp/bin/ncp epub_content/ dist/cloud-reader/epub_content/",
-    "deploy:cloudReader:copy:sourcemap": "node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/ncp/bin/ncp dist/cloud-reader_sourcemap/ dist/cloud-reader/scripts/ && ( node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/ncp/bin/ncp dist/zip_sourcemap/ dist/cloud-reader/scripts/zip/ || echo \"=== SUCCESS [ignore previous error]: no sourcemaps were generated for zip web-worker, deflate, inflate (no uglification).\" )",
-    "deploy:cloudReaderLite:copy:sourcemap": "node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/ncp/bin/ncp dist/cloud-reader-lite_sourcemap/ dist/cloud-reader-lite/scripts/ && ( node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/ncp/bin/ncp dist/zip_sourcemap/ dist/cloud-reader-lite/scripts/zip/ || echo \"=== SUCCESS [ignore previous error]: no sourcemaps were generated for zip web-worker, deflate, inflate (no uglification).\" )",
-    "deploy:chromeApp:copy:sourcemap": "node ./readium-js/readium-shared-js/readium-cfi-js/node_modules/ncp/bin/ncp dist/chrome-app_sourcemap/ dist/chrome-app/scripts/"
+    "deploy:cloudReader:copy:epub_content": "node ./readium-js/readium-shared-js/node_modules/ncp/bin/ncp epub_content/ dist/cloud-reader/epub_content/",
+    "deploy:cloudReader:copy:sourcemap": "node ./readium-js/readium-shared-js/node_modules/ncp/bin/ncp dist/cloud-reader_sourcemap/ dist/cloud-reader/scripts/ && ( node ./readium-js/readium-shared-js/node_modules/ncp/bin/ncp dist/zip_sourcemap/ dist/cloud-reader/scripts/zip/ || echo \"=== SUCCESS [ignore previous error]: no sourcemaps were generated for zip web-worker, deflate, inflate (no uglification).\" )",
+    "deploy:cloudReaderLite:copy:sourcemap": "node ./readium-js/readium-shared-js/node_modules/ncp/bin/ncp dist/cloud-reader-lite_sourcemap/ dist/cloud-reader-lite/scripts/ && ( node ./readium-js/readium-shared-js/node_modules/ncp/bin/ncp dist/zip_sourcemap/ dist/cloud-reader-lite/scripts/zip/ || echo \"=== SUCCESS [ignore previous error]: no sourcemaps were generated for zip web-worker, deflate, inflate (no uglification).\" )",
+    "deploy:chromeApp:copy:sourcemap": "node ./readium-js/readium-shared-js/node_modules/ncp/bin/ncp dist/chrome-app_sourcemap/ dist/chrome-app/scripts/"
   }
-}
+}
\ No newline at end of file
diff --git a/readium-js b/readium-js
index 59697898f..a43fc3812 160000
--- a/readium-js
+++ b/readium-js
@@ -1 +1 @@
-Subproject commit 59697898f08e7d1ba5070c46967b03a28ab810f6
+Subproject commit a43fc38129d49b68e21b29ce899562a21df99343
diff --git a/src/js/EpubReader.js b/src/js/EpubReader.js
index dbcd80244..9575c1671 100644
--- a/src/js/EpubReader.js
+++ b/src/js/EpubReader.js
@@ -1430,18 +1430,6 @@ BookmarkData){
                 repo3.url = "https://github.com/readium/" + repo3.name + "/tree/" + repo3.sha;
                 window.navigator.epubReadingSystem.readium.buildInfo.gitRepositories.push(repo3);
 
-                var repo4 = {};
-                repo4.name = "readium-cfi-js";
-                repo4.sha = version.readiumCfiJs.sha;
-                repo4.tag = version.readiumCfiJs.tag;
-                repo4.version = version.readiumCfiJs.version;
-                repo4.clean = version.readiumCfiJs.clean;
-                repo4.branch = version.readiumCfiJs.branch;
-                repo4.release = version.readiumCfiJs.release;
-                repo4.timestamp = version.readiumCfiJs.timestamp;
-                repo4.url = "https://github.com/readium/" + repo4.name + "/tree/" + repo4.sha;
-                window.navigator.epubReadingSystem.readium.buildInfo.gitRepositories.push(repo4);
-
                 // Debug check:
                 //console.debug(JSON.stringify(window.navigator.epubReadingSystem, undefined, 2));
 
diff --git a/src/templates/about-dialog.html b/src/templates/about-dialog.html
index b5209a1db..0d49d0e7b 100644
--- a/src/templates/about-dialog.html
+++ b/src/templates/about-dialog.html
@@ -22,8 +22,7 @@ <h4 style="color:#111155">{{{strings.gethelp}}}</h4>
           <div><a target="_blank" href="https://github.com/readium/readium-js/tree/{{readiumJs.sha}}">readium-js@{{readiumJs.sha}}</a>{{^readiumJs.clean}}<span class="local-changes-alert"> ({{{strings.gitHasLocalChanges}}})</span>{{/readiumJs.clean}}</div>
           
           <div><a target="_blank" href="https://github.com/readium/readium-shared-js/tree/{{sharedJs.sha}}">readium-shared-js@{{sharedJs.sha}}</a>{{^sharedJs.clean}}<span class="local-changes-alert"> ({{{strings.gitHasLocalChanges}}})</span>{{/sharedJs.clean}}</div>
-          
-          <div><a target="_blank" href="https://github.com/readium/readium-cfi-js/tree/{{cfiJs.sha}}">readium-cfi-js@{{cfiJs.sha}}</a>{{^cfiJs.clean}}<span class="local-changes-alert"> ({{{strings.gitHasLocalChanges}}})</span>{{/cfiJs.clean}}</div>
+
         </div>
       </div>
     </div><!-- /.modal-content -->