diff --git a/epub_content/epub_edu.opds b/epub_content/epub_edu.opds
index f12dec028..80895814b 100644
--- a/epub_content/epub_edu.opds
+++ b/epub_content/epub_edu.opds
@@ -37,7 +37,6 @@
 <link type="application/epub" href="https://cdn.rawgit.com/IDPF/edupub/master/samples/structure-sample-01" rel="http://opds-spec.org/acquisition"/>
 <link type="image/jpg" href="https://cdn.rawgit.com/IDPF/edupub/master/samples/structure-sample-01/EPUB/package.opf/../images/cover.jpg" rel="http://opds-spec.org/image/thumbnail"/>
 </entry>
-</feed>
 <entry>
 <title>World Cultures and Geography</title>
 <author>
diff --git a/epub_content/epub_widgets.opds b/epub_content/epub_widgets.opds
index 2cf45bf9c..b2d94fd88 100644
--- a/epub_content/epub_widgets.opds
+++ b/epub_content/epub_widgets.opds
@@ -7,7 +7,6 @@
 <link type="application/epub" href="https://cdn.rawgit.com/IDPF/scriptable-components/master/Samples/1-basic_component/embedded/basic_template" rel="http://opds-spec.org/acquisition"/>
 <link type="image/jpg" href="https://cdn.rawgit.com/IDPF/scriptable-components/master/Samples/1-basic_component/embedded/basic_template/EPUB/package.opf/../img/cover.jpg" rel="http://opds-spec.org/image/thumbnail"/>
 </entry>
-</feed>
 <entry>
 <title>component_name</title>
 <author>
diff --git a/package.json b/package.json
index 4e8c34ecf..8e815771f 100644
--- a/package.json
+++ b/package.json
@@ -123,8 +123,8 @@
     "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/",
     "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 && 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 edupub master /samples && 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_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 edupub 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",
diff --git a/package/package_scripts_epubs.cson b/package/package_scripts_epubs.cson
index 13b86b622..834fda609 100644
--- a/package/package_scripts_epubs.cson
+++ b/package/package_scripts_epubs.cson
@@ -23,6 +23,7 @@
             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
@@ -86,6 +87,7 @@
         node ./readium-js/readium-shared-js/readium-cfi-js/readium-build-tools/genOPDS.js
             epub_content/epub_edu.opds
             IDPF edupub master /samples
+            FIRST
         &&
         node ./readium-js/readium-shared-js/readium-cfi-js/readium-build-tools/genOPDS.js
             epub_content/epub_edu.opds
diff --git a/readium-js b/readium-js
index a8679c3a3..bb9fe60bd 160000
--- a/readium-js
+++ b/readium-js
@@ -1 +1 @@
-Subproject commit a8679c3a32c02a59a2ab77fa61f4d6ced0086a78
+Subproject commit bb9fe60bd16fd89bccd929b395e8b937c4b25a3b