diff --git a/README.md b/README.md
index 8217beb..384265c 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,9 @@
+# This repository is read-only and kept only for documentation purposes. The development of the epubreader app is done in this repository: https://github.com/e-alfred/epubreader
+
 owncloud-apps
 =============
 
-This repo contains a few apps I made for Nextcloud and Owncloud, mostly related to reading/publishing books and other digital publications.
+This repo contains a few apps made for Nextcloud and Owncloud, mostly related to reading/publishing books and other digital publications.
 
 Install
 -------
diff --git a/dist/files_opds-1.2.3-patched-4-NC.tar.gz b/dist/files_opds-1.2.3-patched-4-NC.tar.gz
new file mode 100644
index 0000000..a8d47e0
Binary files /dev/null and b/dist/files_opds-1.2.3-patched-4-NC.tar.gz differ
diff --git a/dist/files_opds-1.2.3-patched-4-OC.tar.gz b/dist/files_opds-1.2.3-patched-4-OC.tar.gz
new file mode 100644
index 0000000..46f0d90
Binary files /dev/null and b/dist/files_opds-1.2.3-patched-4-OC.tar.gz differ
diff --git a/dist/files_opds-1.2.3-patched-5-NC.tar.gz b/dist/files_opds-1.2.3-patched-5-NC.tar.gz
new file mode 100644
index 0000000..5dcb1c2
Binary files /dev/null and b/dist/files_opds-1.2.3-patched-5-NC.tar.gz differ
diff --git a/dist/files_opds-1.2.3-patched-5-OC.tar.gz b/dist/files_opds-1.2.3-patched-5-OC.tar.gz
new file mode 100644
index 0000000..53af0fd
Binary files /dev/null and b/dist/files_opds-1.2.3-patched-5-OC.tar.gz differ
diff --git a/dist/files_reader-1.2.3-patched-4-NC.tar.gz b/dist/files_reader-1.2.3-patched-4-NC.tar.gz
new file mode 100644
index 0000000..8565712
Binary files /dev/null and b/dist/files_reader-1.2.3-patched-4-NC.tar.gz differ
diff --git a/dist/files_reader-1.2.3-patched-4-OC.tar.gz b/dist/files_reader-1.2.3-patched-4-OC.tar.gz
new file mode 100644
index 0000000..b5829bc
Binary files /dev/null and b/dist/files_reader-1.2.3-patched-4-OC.tar.gz differ
diff --git a/dist/files_reader-1.2.3-patched-5-NC.tar.gz b/dist/files_reader-1.2.3-patched-5-NC.tar.gz
new file mode 100644
index 0000000..5c331e2
Binary files /dev/null and b/dist/files_reader-1.2.3-patched-5-NC.tar.gz differ
diff --git a/dist/files_reader-1.2.3-patched-5-OC.tar.gz b/dist/files_reader-1.2.3-patched-5-OC.tar.gz
new file mode 100644
index 0000000..46a302f
Binary files /dev/null and b/dist/files_reader-1.2.3-patched-5-OC.tar.gz differ
diff --git a/dist/files_reader-1.2.3-patched-NC.tar.gz b/dist/files_reader-1.2.3-patched-NC.tar.gz
new file mode 100644
index 0000000..cb66054
Binary files /dev/null and b/dist/files_reader-1.2.3-patched-NC.tar.gz differ
diff --git a/files_opds/ajax/admin.php b/files_opds/ajax/admin.php
index 75f99d7..7a48fa7 100644
--- a/files_opds/ajax/admin.php
+++ b/files_opds/ajax/admin.php
@@ -12,8 +12,8 @@
 
 namespace OCA\Files_Opds;
 
-\OCP\JSON::callCheck();
-\OCP\JSON::checkLoggedIn();
+\OC_JSON::callCheck();
+\OC_JSON::checkLoggedIn();
 $defaults = new \OC_Defaults();
 
 $l = \OC::$server->getL10N('files_opds');
@@ -53,11 +53,10 @@
 	Config::setPreview('OC\Preview\MSOffice2007',$opdsPreviewMsOffice);
 }
 
-\OCP\JSON::success(
+\OC_JSON::success(
 array(
 	'data' => array('message'=> $l->t('Settings updated successfully.'))
 	)
 );
 
 exit();
-
diff --git a/files_opds/ajax/clear_bookshelf.php b/files_opds/ajax/clear_bookshelf.php
index 0ba1604..727a76a 100644
--- a/files_opds/ajax/clear_bookshelf.php
+++ b/files_opds/ajax/clear_bookshelf.php
@@ -14,8 +14,8 @@
 
 $l = \OC::$server->getL10N('files_opds');
 
-\OCP\JSON::checkLoggedIn();
-\OCP\JSON::callCheck();
+\OC_JSON::checkLoggedIn();
+\OC_JSON::callCheck();
 
 Bookshelf::clear();
-\OCP\JSON::success(array( "data" => array( "message" => $l->t("Bookshelf cleared")))); 
+\OC_JSON::success(array( "data" => array( "message" => $l->t("Bookshelf cleared")))); 
diff --git a/files_opds/ajax/personal.php b/files_opds/ajax/personal.php
index 2d019b8..6d86ea7 100644
--- a/files_opds/ajax/personal.php
+++ b/files_opds/ajax/personal.php
@@ -12,8 +12,8 @@
 
 namespace OCA\Files_Opds;
 
-\OCP\JSON::callCheck();
-\OCP\JSON::checkLoggedIn();
+\OC_JSON::callCheck();
+\OC_JSON::checkLoggedIn();
 
 $l = \OC::$server->getL10N('files_opds');
 
@@ -21,25 +21,27 @@
 $rootPath = isset($_POST['rootPath']) ? $_POST['rootPath'] : '/Library';
 $fileTypes = isset($_POST['fileTypes']) ? $_POST['fileTypes'] : '';
 $skipList = isset($_POST['skipList']) ? $_POST['skipList'] : 'metadata.opf,cover.jpg';
-$feedTitle = isset($_POST['feedTitle']) ? $_POST['feedTitle'] : $l->t("%s's Library", \OCP\User::getDisplayName());
+$feedTitle = isset($_POST['feedTitle']) ? $_POST['feedTitle'] : $l->t("%s's Library", \OC_User::getDisplayName());
+$opdsoldMime = isset($_POST['opdsoldMime']) ? $_POST['opdsoldMime'] : '';
 
 if (!strlen($rootPath) ||
-    \OC\Files\Filesystem::isValidPath($rootPath) === false || 
+    \OC\Files\Filesystem::isValidPath($rootPath) === false ||
     \OC\Files\Filesystem::file_exists($rootPath) === false ) {
-	\OCP\JSON::error(
+	\OC_JSON::error(
 		array(
 			'data' => array('message'=> $l->t('Directory does not exist!'))
 		)
 	);
 } else {
 	Config::set('root_path', $rootPath);
-        Config::set('enable', $opdsEnable);
-        Config::set('file_types', $fileTypes);
-        Config::set('skip_list', $skipList);
-        Config::set('feed_title', $feedTitle);
+	Config::set('enable', $opdsEnable);
+	Config::set('file_types', $fileTypes);
+	Config::set('skip_list', $skipList);
+	Config::set('feed_title', $feedTitle);
+	Config::set('old_mime', $opdsoldMime);
 	Config::set('id', Util::genUuid());
 
-       	\OCP\JSON::success(
+       	\OC_JSON::success(
 	array(
 		'data' => array('message'=> $l->t('Settings updated successfully.'))
 		)
@@ -47,4 +49,3 @@
 }
 
 exit();
-
diff --git a/files_opds/ajax/schedule_rescan.php b/files_opds/ajax/schedule_rescan.php
index 0f266c3..5d91c3e 100644
--- a/files_opds/ajax/schedule_rescan.php
+++ b/files_opds/ajax/schedule_rescan.php
@@ -14,8 +14,8 @@
 
 $l = \OC::$server->getL10N('files_opds');
 
-\OCP\JSON::checkLoggedIn();
-\OCP\JSON::callCheck();
+\OC_JSON::checkLoggedIn();
+\OC_JSON::callCheck();
 
 Meta::rescan();
-\OCP\JSON::success(array( "data" => array( "message" => $l->t("Rescan scheduled")))); 
+\OC_JSON::success(array( "data" => array( "message" => $l->t("Rescan scheduled")))); 
diff --git a/files_opds/appinfo/info.xml b/files_opds/appinfo/info.xml
index 699df24..fab8809 100644
--- a/files_opds/appinfo/info.xml
+++ b/files_opds/appinfo/info.xml
@@ -19,7 +19,7 @@ See [README] for more information on (mis)features of this app.
     ]]>
     </description>
     <licence>AGPL</licence>
-	<version>0.8.8</version>
+	<version>0.9</version>
     <author>Frank de Lange</author>
 	<category>tools</category>
 	<category>files</category>
@@ -32,16 +32,9 @@ See [README] for more information on (mis)features of this app.
 	</documentation>
 	<screenshot>https://raw.githubusercontent.com/Yetangitu/owncloud-apps/master/screenshots/files_opds-1.png</screenshot>
         <dependencies>
-            <php min-version="5.4" />
-            <database>pgsql</database>
-            <database>sqlite</database>
-            <database>mysql</database>
-            <owncloud min-version="8.2" max-version="10.0" />
-            <nextcloud min-version="8.1" max-version="13.0" />
+            <nextcloud min-version="14" max-version="17" />
         </dependencies>
 	<settings>
 		<admin>OCA\Files_Opds\Settings\Admin</admin>
 	</settings>
-	<ocsid>168132</ocsid>
 </info>
-
diff --git a/files_opds/js/personal.js b/files_opds/js/personal.js
index 73c0992..db68273 100644
--- a/files_opds/js/personal.js
+++ b/files_opds/js/personal.js
@@ -39,8 +39,10 @@ $(document).ready(function(){
         var opdsSettings = {
                 save : function() {
 			var opdsEnable = document.getElementById('opds-enable').checked ? 'true' : 'false';
+			var opdsoldMime = document.getElementById('opds-oldmime').checked ? 'true' : 'false';
                         var data = {
                                 opdsEnable : opdsEnable,
+                                opdsoldMime : opdsoldMime,
                                 rootPath : $('#opds-root-path').val(),
                                 fileTypes : $('#opds-file-types').val(),
                                 skipList : $('#opds-skip-list').val(),
@@ -61,5 +63,6 @@ $(document).ready(function(){
                                                 }
         });
         $('#opds-enable').on("change", opdsSettings.save);
+        $('#opds-oldmime').on("change", opdsSettings.save);
 });
 
diff --git a/files_opds/lib/config.php b/files_opds/lib/config.php
index 6e84a54..a468767 100644
--- a/files_opds/lib/config.php
+++ b/files_opds/lib/config.php
@@ -25,7 +25,7 @@ class Config
 	 * @return string retrieved value or default
 	 */
 	public static function get($key, $default) {
-		return \OCP\Config::getUserValue(\OCP\User::getUser(), 'files_opds', $key, $default);
+		return \OC::$server->getConfig()->getUserValue(\OC::$server->getUserSession()->getUser()->getUID(), 'files_opds', $key, $default);
 	}
 
 	/**
@@ -36,7 +36,7 @@ public static function get($key, $default) {
 	 * @return bool success
 	 */
 	public static function set($key, $value) {
-		return \OCP\Config::setUserValue(\OCP\User::getUser(), 'files_opds', $key, $value);
+		return \OC::$server->getConfig()->setUserValue(\OC::$server->getUserSession()->getUser()->getUID(), 'files_opds', $key, $value);
 	}
 
 	/**
@@ -47,7 +47,7 @@ public static function set($key, $value) {
 	 * @return string retrieved value or default
 	 */
 	public static function getApp($key, $default) {
-		return \OCP\Config::getAppValue('files_opds', $key, $default);
+		return \OC::$server->getConfig()->getAppValue('files_opds', $key, $default);
 	}
 
 	/**
@@ -58,17 +58,17 @@ public static function getApp($key, $default) {
 	 * @return bool success
 	 */
 	public static function setApp($key, $value) {
-		return \OCP\Config::setAppValue('files_opds', $key, $value);
+		return \OC::$server->getConfig()->setAppValue('files_opds', $key, $value);
 	}
-	
+
 	/**
 	 * @brief get preview status
-	 * 
+	 *
 	 * @param string format
 	 * @return bool (true = enabled, false = disabled)
 	 */
 	public static function getPreview($format) {
-		$enablePreviewProviders = \OCP\Config::getSystemValue('enabledPreviewProviders', null);
+		$enablePreviewProviders = \OC::$server->getConfig()->getSystemValue('enabledPreviewProviders', null);
 		if (!($enablePreviewProviders === null)) {
 			return in_array($format, $enablePreviewProviders);
 		}
@@ -83,7 +83,7 @@ public static function getPreview($format) {
 	 * @return bool
 	 */
 	public static function setPreview($format, $enable = 'false') {
-		$enablePreviewProviders = \OCP\Config::getSystemValue('enabledPreviewProviders', null);
+		$enablePreviewProviders = \OC::$server->getConfig()->getSystemValue('enabledPreviewProviders', null);
 		if ($enable == 'true') {
 			if ($enablePreviewProviders === null) {
 				// set up default providers
@@ -103,7 +103,7 @@ public static function setPreview($format, $enable = 'false') {
 			}
 		}
 
-		if (!(\OCP\Config::setSystemValue('enabledPreviewProviders', $enablePreviewProviders))) {
+		if (!(\OC::$server->getConfig()->setSystemValue('enabledPreviewProviders', $enablePreviewProviders))) {
 			logWarn("Failed to enable " . $format . " preview provider (config.php readonly?)");
 			return true;
 		}
diff --git a/files_opds/lib/feed.php b/files_opds/lib/feed.php
index 493764c..3cf127a 100644
--- a/files_opds/lib/feed.php
+++ b/files_opds/lib/feed.php
@@ -24,7 +24,7 @@ class Feed
          * @return string feed id
          */
         public static function getFeedId() {
-                return Config::get('id', '');
+		return Config::get('id', '');
         }
 
         /**
@@ -66,8 +66,8 @@ public static function serveFeed($dir, $id, $type) {
                 $tmpl->assign('id', $id);
                 $tmpl->assign('type', $type);
                 $tmpl->assign('dir', $dir);
-                $tmpl->assign('user', \OCP\User::getDisplayName());
-                $tmpl->assign('feed_title', Config::get('feed_title',\OCP\User::getDisplayName() . "'s Library"));
+                $tmpl->assign('user', \OC_User::getDisplayName());
+                $tmpl->assign('feed_title', Config::get('feed_title',\OC_User::getDisplayName() . "'s Library"));
                 $tmpl->assign('feed_subtitle', Config::getApp('feed_subtitle', $defaults->getName() . " OPDS catalog"));
                 $tmpl->assign('feed_updated', time());
                 $tmpl->printPage();
diff --git a/files_opds/lib/meta.php b/files_opds/lib/meta.php
index a3c12cb..bb4aaa6 100644
--- a/files_opds/lib/meta.php
+++ b/files_opds/lib/meta.php
@@ -64,7 +64,7 @@ public static function isValid($meta) {
 	protected static function load($id) {
                 $sql = 'SELECT * FROM `*PREFIX*opds_metadata` WHERE id = ?';
                 $args = array($id);
-                $query = \OCP\DB::prepare($sql);
+                $query = \OC_DB::prepare($sql);
                 $result = $query->execute($args);
 
 		return ($row = $result->fetchRow()) ? $row : false;
@@ -79,7 +79,7 @@ protected static function load($id) {
 	protected static function save($meta) {
 		$sql = "SELECT `id` FROM *PREFIX*opds_metadata WHERE `id`=?";
 		$args = array($meta['id']);
-		$query = \OCP\DB::prepare($sql);
+		$query = \OC_DB::prepare($sql);
 		$result = $query->execute($args);
 		$data = $result->fetchRow();
 		if (isset($data['id'])) {
@@ -118,7 +118,7 @@ protected static function save($meta) {
 				$meta['rescan']
 				);
 		}
-		$query = \OCP\DB::prepare($sql);
+		$query = \OC_DB::prepare($sql);
 
 		return $query->execute($args);
 	}
@@ -150,7 +150,7 @@ public static function get($id) {
 	public static function remove($id) {
 		$sql = "DELETE FROM *PREFIX*opds_metadata WHERE `id`=?";
 		$args = array($id);
-		$query = \OCP\DB::prepare($sql);
+		$query = \OC_DB::prepare($sql);
 
 		return $query->execute($args);
 	}
@@ -162,7 +162,7 @@ public static function remove($id) {
 	public static function rescan() {
                 $sql = "UPDATE *PREFIX*opds_metadata SET `rescan`=?";
                 $args = array(date("Y-m-d H:i:s"));
-                $query = \OCP\DB::prepare($sql);
+                $query = \OC_DB::prepare($sql);
                 $result = $query->execute($args);
 	}
 
diff --git a/files_opds/lib/util.php b/files_opds/lib/util.php
index b33cafe..c771c1a 100644
--- a/files_opds/lib/util.php
+++ b/files_opds/lib/util.php
@@ -113,7 +113,7 @@ public static function changeHttpStatus($statusCode) {
 	 */
 	public static function genUuid() {
 		$defaults = new \OC_Defaults();
-		$hash = md5(\OCP\User::getDisplayName() . $defaults->getBaseUrl());
+		$hash = md5(\OC_User::getDisplayName() . $defaults->getBaseUrl());
 		$hash = substr($hash, 0, 8 ) .'-'.
 			substr($hash, 8, 4) .'-3'.
 			substr($hash, 13, 3) .'-9'.
diff --git a/files_opds/personal.php b/files_opds/personal.php
index 5fac311..5a36565 100644
--- a/files_opds/personal.php
+++ b/files_opds/personal.php
@@ -18,14 +18,17 @@
 
 $tmpl = new \OCP\Template('files_opds', 'personal');
 $opdsEnable = Config::get('enable', false);
+$opdsoldMime = Config::get('old_mime', false);
 $tmpl->assign('opdsEnable-checked', ($opdsEnable === 'true') ? 'checked="checked"' : '');
 $tmpl->assign('opdsEnable-value', ($opdsEnable === 'true') ? '1' : '0');
 $tmpl->assign('rootPath', Config::get('root_path', '/Library'));
 $tmpl->assign('fileTypes', Config::get('file_types', ''));
 $tmpl->assign('skipList', Config::get('skip_list', 'metadata.opf,cover.jpg'));
-$tmpl->assign('feedTitle', Config::get('feed_title', $l->t("%s's Library", \OCP\User::getDisplayName())));
+$tmpl->assign('feedTitle', Config::get('feed_title', $l->t("%s's Library", \OC_User::getDisplayName())));
 $tmpl->assign('bookshelf-count', Bookshelf::count());
 $tmpl->assign('feedUrl', Util::linkToAbsolute('','index.php') . '/apps/files_opds/');
+$tmpl->assign('opdsoldMime-checked', ($opdsoldMime === 'true') ? 'checked="checked"' : '');
+$tmpl->assign('opdsoldMime-value', ($opdsoldMime === 'true') ? '1' : '0');
 
 return $tmpl->fetchPage();
 
diff --git a/files_opds/templates/feed.php b/files_opds/templates/feed.php
index 1704d39..3eaf941 100644
--- a/files_opds/templates/feed.php
+++ b/files_opds/templates/feed.php
@@ -48,7 +48,9 @@ function formatMetadata($humansize,$mimetype,$name) {
 
 	case 'bookshelf':
 		foreach ($_['bookshelf'] as $file) {
-			print_unescaped($this->inc('part.feed.acquisition', [ 'file' => $file ]));
+                        foreach( $file as $key => $value ) 
+                                $newfile["file_".$key] = $value;
+			print_unescaped($this->inc('part.feed.acquisition', $newfile ));
 		}
         break;
 
@@ -60,10 +62,13 @@ function formatMetadata($humansize,$mimetype,$name) {
 	case 'directory':
 	default:
 		foreach ($_['files'] as $file) {
+			foreach( $file as $key => $value )
+				$newfile["file_".$key] = $value;
+
 			if ($file['type'] == 'dir') {
-				print_unescaped($this->inc('part.feed.navigation', [ 'file' => $file ]));
+				print_unescaped($this->inc('part.feed.navigation', $newfile ));
 			} else {
-				print_unescaped($this->inc('part.feed.acquisition', [ 'file' => $file ]));
+				print_unescaped($this->inc('part.feed.acquisition', $newfile ));
 			}
 		}
 		break;
diff --git a/files_opds/templates/part.feed.acquisition.php b/files_opds/templates/part.feed.acquisition.php
index ab7aae0..23f82dc 100644
--- a/files_opds/templates/part.feed.acquisition.php
+++ b/files_opds/templates/part.feed.acquisition.php
@@ -1,38 +1,47 @@
-  <entry>
-    <title><?php p($_['file']['meta']['title']); ?></title>
-    <updated><?php p(date("Y-m-d\TH:i:sP",strtotime($_['file']['meta']['updated']))); ?></updated>
-    <id>id:<?php p($_['file']['id']); ?></id>
-    <dcterms:extent><?php p($_['file']['humansize']); ?></dcterms:extent>
-    <?php $authors = json_decode($_['file']['meta']['author'],true); if(is_array($authors)): foreach ($authors as $author): ?>
+<?php
+namespace OCA\Files_Opds;
+
+if ( Config::get('old_mime', 'false') !== 'false' && strpos($_['file_mimetype'],'comicbook') !== false){
+	$mime = 'application/x-cbr';
+} else {
+	$mime = $_['file_mimetype'];
+}
+?>
+<entry>
+    <title><?php p($_['file_meta']['title']); ?></title>
+    <updated><?php p(date("Y-m-d\TH:i:sP",strtotime($_['file_meta']['updated']))); ?></updated>
+    <id>id:<?php p($_['file_id']); ?></id>
+    <dcterms:extent><?php p($_['file_humansize']); ?></dcterms:extent>
+    <?php $authors = json_decode($_['file_meta']['author'],true); if(is_array($authors)): foreach ($authors as $author): ?>
     <author>
       <name><?php p($author); ?></name>
     </author>
     <?php endforeach; endif; ?>
-    <?php if($_['file']['meta']['isbn']): ?>
-    <dc:identifier>urn:isbn:<?php p($_['file']['meta']['isbn']); ?></dc:identifier>
+    <?php if($_['file_meta']['isbn']): ?>
+    <dc:identifier>urn:isbn:<?php p($_['file_meta']['isbn']); ?></dc:identifier>
     <?php endif; ?>
-    <?php if($_['file']['meta']['publisher']): ?>
-    <dc:publisher><?php p($_['file']['meta']['publisher']); ?></dc:publisher>
+    <?php if($_['file_meta']['publisher']): ?>
+    <dc:publisher><?php p($_['file_meta']['publisher']); ?></dc:publisher>
     <?php endif; ?>
-    <?php if($_['file']['meta']['language']): ?>
-    <dc:language><?php p($_['file']['meta']['language']); ?></dc:language>
+    <?php if($_['file_meta']['language']): ?>
+    <dc:language><?php p($_['file_meta']['language']); ?></dc:language>
     <?php endif; ?>
-    <dc:issued><?php p(date("Y-m-d\TH:i:sP",strtotime($_['file']['meta']['date']))); ?></dc:issued>
-    <link type="<?php p($_['file']['mimetype']); ?>"
+    <dc:issued><?php p(date("Y-m-d\TH:i:sP",strtotime($_['file_meta']['date']))); ?></dc:issued>
+    <link type="<?php p($mime); ?>"
         rel="alternate"
-        href="?id=<?php p($_['file']['id']); ?>"/>
-    <link type="<?php p($_['file']['mimetype']); ?>"
+        href="?id=<?php p($_['file_id']); ?>"/>
+    <link type="<?php p($mime); ?>"
         rel="http://opds-spec.org/acquisition/open-access"
-        href="?id=<?php p($_['file']['id']); ?>"/>
-    <link href="?pid=<?php p($_['file']['id']); ?>"
+        href="?id=<?php p($_['file_id']); ?>"/>
+    <link href="?pid=<?php p($_['file_id']); ?>"
         rel="http://opds-spec.org/image"
         type="image/jpeg" />
-    <link href="?tid=<?php p($_['file']['id']); ?>"
+    <link href="?tid=<?php p($_['file_id']); ?>"
         rel="http://opds-spec.org/image/thumbnail"
         type="image/jpeg" />
-    <?php if ($_['file']['meta']['description']): ?>
-    <content type="text"><?php p($_['file']['meta']['description']); p("\n\n"); ?><?php p(formatMetadata($_['file']['humansize'],$_['file']['mimetype'],$_['file']['name'])); ?></content>
+    <?php if ($_['file_meta']['description']): ?>
+    <content type="text"><?php p($_['file_meta']['description']); p("\n\n"); ?><?php p(formatMetadata($_['file_humansize'],$mime,$_['file_name'])); ?></content>
     <?php else: ?>
-    <summary type="text"><?php p(formatMetadata($_['file']['humansize'],$_['file']['mimetype'],$_['file']['name'])); ?></summary>
+    <summary type="text"><?php p(formatMetadata($_['file_humansize'],$mime,$_['file_name'])); ?></summary>
     <?php endif; ?>
   </entry>
diff --git a/files_opds/templates/part.feed.navigation.php b/files_opds/templates/part.feed.navigation.php
index 70568b2..09cd880 100644
--- a/files_opds/templates/part.feed.navigation.php
+++ b/files_opds/templates/part.feed.navigation.php
@@ -1,12 +1,12 @@
 <entry>
-    <title><?php p($_['file']['name']); ?></title>
-    <updated><?php p(date("Y-m-d\TH:i:sP", $_['file']['mtime'])); ?></updated>
-    <id>id:<?php p($_['file']['id']); ?></id>
+    <title><?php p($_['file_name']); ?></title>
+    <updated><?php p(date("Y-m-d\TH:i:sP", $_['file_mtime'])); ?></updated>
+    <id>id:<?php p($_['file_id']); ?></id>
     <link type="application/atom+xml;profile=opds-catalog;kind=navigation"
         rel="alternate"
-        href="?id=<?php p($_['file']['id']); ?>"/>
+        href="?id=<?php p($_['file_id']); ?>"/>
     <link type="application/atom+xml;profile=opds-catalog;kind=navigation"
         rel="subsection"
-        href="?id=<?php p($_['file']['id']); ?>"/>
+        href="?id=<?php p($_['file_id']); ?>"/>
     <content type="text"></content>
 </entry>
diff --git a/files_opds/templates/personal.php b/files_opds/templates/personal.php
index ac1823d..f3f705a 100644
--- a/files_opds/templates/personal.php
+++ b/files_opds/templates/personal.php
@@ -23,7 +23,8 @@
         </table>
         <div>
 		<input id="opds-enable" name="opds-enable" value="<?php p($_['opdsEnable-value']) ?>" <?php p($_['opdsEnable-checked']) ?> type="checkbox" class="checkbox">
-                <label for="opds-enable"><?php p($l->t('enable OPDS catalog')) ?></label>
+		<label for="opds-enable"><?php p($l->t('enable OPDS catalog')) ?></label>
+
 	</div>
 	<br>
 	<table>
@@ -43,6 +44,10 @@
                 <td><label for="opds-skip-list"><?php p($l->t('Skip these filenames:')) ?></label></td>
                 <td><input type="text" id="opds-skip-list" title="<?php p($l->t("Enter list of comma-separated file names which should be skipped. Leave blank to use the default skip list.")); ?>" value="<?php p($_['skipList']) ?>" /></td>
         </tr>
+        <tr>
+                <td><label for="opds-oldmime"><?php p($l->t('Use alternative Mimetypes for Comicbook:')) ?></label></td>
+		<td><input id="opds-oldmime" name="opds-oldmime" value="<?php p($_['opdsoldMime-value']) ?>" <?php p($_['opdsoldMime-checked']) ?> type="checkbox" title="For example use application/x-cbr instead of application/comicbook+rar"/></td>
+	</tr>
 	</table>
 	<br>
 	<div>
diff --git a/files_reader/ajax/personal.php b/files_reader/ajax/personal.php
index e18e2df..c3a3602 100644
--- a/files_reader/ajax/personal.php
+++ b/files_reader/ajax/personal.php
@@ -12,8 +12,8 @@
 
 namespace OCA\Files_Reader;
 
-\OCP\JSON::callCheck();
-\OCP\JSON::checkLoggedIn();
+\OC_JSON::callCheck();
+\OC_JSON::checkLoggedIn();
 
 $l = \OC::$server->getL10N('files_reader');
 
@@ -25,7 +25,7 @@
 Config::set('pdf_enable', $PdfEnable);
 Config::set('cbx_enable', $CbxEnable);
 
-\OCP\JSON::success(
+\OC_JSON::success(
     array(
 		'data' => array('message'=> $l->t('Settings updated successfully.'))
     )
diff --git a/files_reader/appinfo/info.xml b/files_reader/appinfo/info.xml
index 8319339..d0477c0 100644
--- a/files_reader/appinfo/info.xml
+++ b/files_reader/appinfo/info.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <info>
-    <id>files_reader</id>
+    <id>epubreader</id>
     <name>Reader (ebook reader)</name>
-    <namespace>Files_Reader</namespace>
     <summary>A multi-format browser-based ebook reader, supports EPUB and CBR/CBZ</summary>
     <description>
     <![CDATA[
@@ -30,32 +29,23 @@ See [README] for more exhaustive information on features and potential misfeatur
    [README]: https://github.com/Yetangitu/owncloud-apps/blob/master/files_reader/README.md
 	]]>
     </description>
-    <version>1.2.3</version>
+    <version>1.4.0</version>
     <licence>AGPL</licence>
     <author>Frank de Lange</author>
-    <documentation>
-        <user>https://github.com/Yetangitu/owncloud-apps/blob/master/files_reader/README.md</user>
-    </documentation>
-    <bugs>https://github.com/Yetangitu/owncloud-apps/issues</bugs>
-    <website>https://github.com/Yetangitu/owncloud-apps/tree/master/files_reader</website>
-    <screenshot>https://raw.githubusercontent.com/Yetangitu/owncloud-apps/master/screenshots/files_reader-1.png</screenshot>
-    <screenshot>https://raw.githubusercontent.com/Yetangitu/owncloud-apps/master/screenshots/files_reader-3.png</screenshot>
-    <screenshot>https://raw.githubusercontent.com/Yetangitu/owncloud-apps/master/screenshots/files_reader_PDF_005.png</screenshot>
-    <screenshot>https://raw.githubusercontent.com/Yetangitu/owncloud-apps/master/screenshots/files_reader_PDF_006.png</screenshot>
-	<screenshot>https://raw.githubusercontent.com/Yetangitu/owncloud-apps/master/screenshots/photo_2017-03-15_17-22-00.jpg</screenshot>
-    <screenshot>https://raw.githubusercontent.com/Yetangitu/owncloud-apps/master/screenshots/photo_2017-03-15_17-22-02.jpg</screenshot>
+    <author>e-alfred</author>
+    <documentation>https://github.com/e-alfred/owncloud-apps</documentation>
+    <bugs>https://github.com/e-alfred/owncloud-apps</bugs>
+    <website>https://github.com/e-alfred/owncloud-apps</website>
+    <screenshot>https://raw.githubusercontent.com/e-alfred/owncloud-apps/master/screenshots/files_reader-1.png</screenshot>
+    <screenshot>https://raw.githubusercontent.com/e-alfred/owncloud-apps/master/screenshots/files_reader-3.png</screenshot>
+    <screenshot>https://raw.githubusercontent.com/e-alfred/owncloud-apps/master/screenshots/files_reader_PDF_005.png</screenshot>
+    <screenshot>https://raw.githubusercontent.com/e-alfred/owncloud-apps/master/screenshots/files_reader_PDF_006.png</screenshot>
+	<screenshot>https://raw.githubusercontent.com/e-alfred/owncloud-apps/master/screenshots/photo_2017-03-15_17-22-00.jpg</screenshot>
+    <screenshot>https://raw.githubusercontent.com/e-alfred/owncloud-apps/master/screenshots/photo_2017-03-15_17-22-02.jpg</screenshot>
     <category>files</category>
     <category>multimedia</category>
     <category>office</category>
-    <types>
-        <filesystem/>
-    </types>
     <dependencies>
-        <owncloud min-version="8.2" max-version="10.0" />
-        <nextcloud min-version="8.1" max-version="13.0"/>
-		<database>pgsql</database>
-		<database>sqlite</database>
-		<database>mysql</database>
+        <nextcloud min-version="15" max-version="19"/>
     </dependencies>
-    <ocsid>167127</ocsid>
 </info>
diff --git a/files_reader/appinfo/signature.json b/files_reader/appinfo/signature.json
deleted file mode 100644
index cf1467c..0000000
--- a/files_reader/appinfo/signature.json
+++ /dev/null
@@ -1,137 +0,0 @@
-{
-    "hashes": {
-        "CHANGELOG.md": "9f76fce63c1d183462127b3bb2795d070f9f514e0d981233f8ecdcb98712e5fb0974cd807b8cdeed49918e0e9535f70e0c6797bc595eb88184a3b758d66fa940",
-        "README.md": "27742b78bac23d2dd5fde269b9e3070c2042c44d6b120017a7d701c59cfa10433e79bea47cbf2af1edee0ac311d8fbfec4d27849c46ba79e2427090013e9a224",
-        "TODO": "2e96d92edf624625cb0fa84032e772aa674cd0b5b8270389acb64e5d8071d958a23489b90eaa3d4243cacd1f2a5934af7064dec66ffa5146f59945a9d797ab9a",
-        "ajax\/personal.php": "fbd21da9f8c4ea90dd549e82479aea877214b3b0ac102e4c4abc8c4e5914d77253bd1b82c36093ad7e21e7b85c78433006927a607a853b37c664f4f28236cbdf",
-        "appinfo\/app.php": "347e7c861afcd5c4ad54af36a0d393c6108abd1cbc50524bede213c3cddcd7701a484ed14d9fe64ed9c6cf9e7fc37618b7ba4e8fc74b775c9c43112860ca6543",
-        "appinfo\/database.xml": "111a18a81749237ad4e23c94f0b0986e08964c8b1ae5495b0dfe082f4801dc8951eb7c862f96edc8493eba1c4808c2227cde1ab48572d806b026c37abab07a85",
-        "appinfo\/info.xml": "8c2e6d2c42df2d9e17eee978cc49f1abf7a284d6fe7ec2515e917961ccee3a648f455a9d127d6df1231adf35b1118a004d27788658b6bf90c3f7a861c619d854",
-        "appinfo\/routes.php": "64eaeaba5915721487dddef721dd4d747b070a658653e3c74287607faa7f3553bba907761779227a0c08870cc86420bdd97a4764887e4137f960d5bcb1e8006c",
-        "css\/settings.css": "4c6d3bd224ad754e5396eeea719fb16ad975a2bd7f9dc363b4c7faf3a1e8c16c317b2b4092845280456e922048afb2155e43dcca108ac1ba535c83755ac27e59",
-        "img\/app.svg": "88bc2059bd09013de866eaf61be0207bb96f4b84cfa3df0164e5b65aaa99db5f616e340a6da8e3c01fd5a07c8e4c727019f74760ca581552074e9f1a0237d35e",
-        "img\/book.png": "9804b463779b32d1b8d9ced85a11f7e3201d9aef9a48b55b1381ae6addf19a78f5a3990c7201ce5702e798fd6bfad36c7a8e11e699f851351adf9b5b85cb3e68",
-        "img\/loading.gif": "4ce13c9402690a9beee76c8f6aa21ab48211377ef679e1b5d0ceca26f231a7ceecb2f00c0ad4facafa922e292e4afbde64cd85360e3a06d45ee1a71ca0e1a4c8",
-        "js\/lib\/Blob.js": "b0c7760f8b8365d39baf3a6320c2259660cadc5a4a877f35ef212ccfaee645a48ac6b754536d716539841c62a96f2b5036fe1087a0cb3c4b4c6b6fa34d406021",
-        "js\/lib\/blob.js": "c04ed3426cd6688e970818a6494bcb9be02ac69f72ad0ca9121af8e20092b602d9595f8061fab5f69e538e4b0606ea6eb9a142cb40ce36adb34163c917004832",
-        "js\/lib\/typedarray.js": "e8fee5f0cbd4e5282083182ee7ec2cc6c6f86d6d1f0c259853612983b1ef5cd1187061546baadb1eb0f8629dbaaa3bb4520a4d161f5acf932503ce7e52a3a6c0",
-        "js\/lib\/typedarray.min.js": "c78aa9dc295212548ac927783c62f1a5a5ff56c05164999f09d0ac5ea6a98afbe71aaa4e45eca469e379d920cc73beccbdebdd25f9797335f5b361fc4d87d09c",
-        "js\/lib\/wgxpath.install.js": "afbb4af1de778f5d135ef4be4d4eea98d27a323a139463d06b3f0b2c4cea00730e45d8414a0e74eace952c634f87e383a925c132bae043216312f9425a1b246d",
-        "js\/personal.js": "60e099c1e1136ad21216709562f3227031a46e359a8a86841dbd23770de3e1b039f36b19ccfb710b5d22bb1316113f5fd59f7861c37aade0f644839f0c6bf2b3",
-        "js\/plugin.js": "e7f1993c663e2bcf2bc51b42bccf6c873d6e2387fa02121e8ad5b64274198d52d54eb7d1b574dd68c762e8129abdc5a43ce210506f08b83a8e98c48166086d25",
-        "js\/ready.js": "a3fd42592fa94fa2d573b867238f5e35780681e218dc1aa23ce8a8afe66614ea0d8fa94abda4c7b7ab595727cd724c75d452a97bb0819b2d35fe2e145c985f00",
-        "js\/settings.js": "a627c42dd7ed708b0e3cf25494d402afa546b489cb0d53c7d15786ee3e333211c4a283c1eec6b6964d30a4b7c018f51f780aac6ad1b574d380b1c8514c48fabb",
-        "lib\/Controller\/BookmarkController.php": "1e1d680f5bcbf5edc49df09a696d011920d8695e305bebcc1c87cc9283a73a5ec8770a264312b8ec80c72f45855ea0baeb2753a7d7df05befb0c29db50ed692a",
-        "lib\/Controller\/MetadataController.php": "23e23b95c8c15d0ba5be797b26babb315703430251967fb536e267f3cd64af7047d1953e3299940db8acfecc2a87f5339220d37c0241b254fbf524c938a55053",
-        "lib\/Controller\/PageController.php": "0b6520136983eee131d0369fd6958dd19bb7cb0486f5a8ca0147eacfda120cf339f4dd2c61f3ff74eb87795063325a465d1036c002fb5d307315066160ee10f5",
-        "lib\/Controller\/PreferenceController.php": "3f3ced2dc68698f25dc0f4732d1d4dfdf5064a75102a0774acb5e6823b15b54651eecc7157214adb8de1ab9b18bd961085a8eb79edc6304576ed5bb8fbc18e94",
-        "lib\/Db\/Bookmark.php": "0eeea4cba7b182896acb9b630f0c5f076ee808468bda6a1c75dc8d2b369ace2e7942602a4151a43b40351e6f12b18bb34484eac0ed3d7f0a9d85769588da7674",
-        "lib\/Db\/BookmarkMapper.php": "eed3576c947e0506c7769a73ab27b3651efa4596eab297dd26fe2caa32eb9c57d95bda3915f7105c60c560196d6e14cac3c764aefda2a35111172e04b604e367",
-        "lib\/Db\/Preference.php": "e4edb4df45318e434a3d575473e8de64425d212b1bafbfaf90344616a17e4a7be7a69f3657e1179c1cc2e28e20573698a7449d70fbfdfe7a4097298800415975",
-        "lib\/Db\/PreferenceMapper.php": "4697ffe43030475d9091c3ce56936a7435533186f1ced6bebe3f07bbb47e8a59fa00758f77d2d27b8c13ed766d647450d7709e7b174c4da6e7bb0115e5c44988",
-        "lib\/Db\/ReaderEntity.php": "cb76626c5c4f2d177756093ef7f836c5365724c4ff8906a57056bbc85563ddc91118faf5efa0cb295a9e533680d38bf51cdf78ec2dc25bd7a4f0737457e0cfdd",
-        "lib\/Db\/ReaderMapper.php": "c8d44cefe4c1b3de1e55e71367c7d7e07630adbfd29027d29e06a4f04559c7ea869ccc28c862af439dd35042f8bbf7019cb5cab9bbd47c616ea99e28d222326d",
-        "lib\/Hooks.php": "5d894611556a0da57bb33cd889c8998ccf182241d38f770a97cf52bb8ffbd6a00f91ad317e4ab0397810d4c7a92aa36a9e971d53c5c2ebff016dd4cda6457541",
-        "lib\/Service\/BookmarkService.php": "7df012686e8d1e9a4668738d82edc51ca0da8e584767737091053bb48bcb896f11b03262f5e20dcd030a65af9c524d24003b3405679fbc23f60d0bb5d84eba15",
-        "lib\/Service\/MetadataService.php": "7bc4ab9cdd16ced31f46ba137fa1efb4d6ef4784f947886e8affe667bf7b51c532bdc079e9033e774db4ea30a8da1000df958fc6e15e518bd920995dccc729cf",
-        "lib\/Service\/PreferenceService.php": "2b52a28a074eba355154cbdad80358aaac394635ca91698ec3d7876eee0dc7e154064d8fbbe5465e7bbc783e618fbbf9ea1f07acd3cc4ce5b84116f7d8aed81c",
-        "lib\/Service\/Service.php": "cdf97b612fde0bec7846c0005280f1492d63e705b753c4aeb1df2c2ad2612a122d49eb15b6e7dfbe7fd7320762171a6ac6324181511dc28ec0e1e27092872eae",
-        "lib\/Utility\/Time.php": "58f760099eaf647718b491a7c21012398906bbe3ac7363aeceffff1a98d952f9a76697ddff2c00abe25e6c8db1cdf4d5994c1ab7d9474a05afb76b444ab9fed6",
-        "lib\/config.php": "f9f15e0cddfea124ce2f094034dba422b4a6c45395ea23512dfa0949d4fac94c2adff6e7fbeacab15fa978522f2f2c903b0c80fd3fa5d0301f130908290c1574",
-        "personal.php": "9150fcce3c8215a76e1ef83e4092fb068e7ab663abc1aab0038c54e6cb480fffb458c82122292050f6bffdf2f0a7ac6706ed35449979b86d5425db22372f9ad9",
-        "templates\/cbreader.php": "7ab62f3620c7e389aba6912b0729bbd0cb630aba1e5cbff4887497be3d51f9d8f35eeb748bb69684b65a8658a608a3f72353aa2212a92ad09664e9a87e2369ea",
-        "templates\/epubreader.php": "dea28a9329414876f2660bff99d8f694c78967498991600e88054c1f11b285e8c1235cc472b5fbe1ea95c80a142cbc2373a10102776124d19361beff1ed4431b",
-        "templates\/pdfreader.php": "16726d4eba75d85839e1c09a8842fba07869d1666a33d95511ed718727aed38de11004b017b878b0bbc5a9481e01454121bb24ddf4b1497022939fc575aa1af4",
-        "templates\/settings-personal.php": "f51394ed8fb4fda3bc75d10381f7ed7d04aa05a0555a82a80fd10a7d3b8264290e5a678a4d689fafc09e5aeacc29ebd19aec46544d3912bfa0680fa8c1b02152",
-        "vendor\/bartaz\/jquery.highlight.js": "2071d929cf62d8ef6cb85df2bef1d556d21c06fd23233e4938e8ba43df794ebb167b7ef75a50c10f01c9c59af76ae4278f5d254d1b0dcfca1a7201c35cfe2e33",
-        "vendor\/bgrins\/spectrum.css": "0d51df46221e84245609bf96f64fcf3aafdb9d2588a14e94382e78e605763bca1fd652adbfdacfce2324ea2d264baa3f1922a628e8c6ff55d4cc221ddbe05c15",
-        "vendor\/bgrins\/spectrum.js": "a7e0d8302e03348effecea4cad9cb59ed861d5268552d4829af68b4d77f2022ddb46817b5a419e57f17c19e8eae48d43ae6ba858258c71f9bd658930b4484b21",
-        "vendor\/bitjs\/archive\/archive.js": "e1d47d6129c54faea42c572e37502bd44f4af70710e9897c0dd6f1e064edcaac9e6bb77d9eb6b93e659769d87c52381875ee4e00b9f1e4e66c8ddd976951a1d6",
-        "vendor\/bitjs\/archive\/rarvm.js": "7257ecafd56b2cae8e2ed4abdad429ad133c3ddd9271505750248a9008915a619d996c583e832b722c5757f6f3ca8b8dd20043af076a9ddc93e043917d685f69",
-        "vendor\/bitjs\/archive\/unrar.js": "35fa0539f64141c6812a440f829e0a2c99ec9470a462cd561addb3eb8ab61df1681881a2c6d87ab2046e6b656fedba28bd21975bf38d1769aa5bf85da90232a3",
-        "vendor\/bitjs\/archive\/untar.js": "c76b6d7bf6e9ebb0c0837a083adb059c88f4054521e6d0e00e6e6b83119f194127b76473e7f61c507ad7c0802cf94089f07971c0ad61450ae2b5f1745758a691",
-        "vendor\/bitjs\/archive\/unzip.js": "6e96afc92d455895f4172a932cec5829e67b9366d01cb57992a844ed494c98b550b4ca61b2ffaca0b7b9094cf2da9ba6054e939b55732e040be87685e7760cdd",
-        "vendor\/bitjs\/io\/bitstream.js": "526d7463d45bbe9d05461becfbbd6d8d397b46262400196714fe7a93110b36766ad224ee55de8a8c1952e337336ba735a36530877c06de85aa3e691a3370ff67",
-        "vendor\/bitjs\/io\/bytebuffer.js": "1415e0730090cbf4472cb9933eabf15bdd4788029a18315b9f4f04b0cbcc59623b109f0d8561700c8341735e5a102c915a27b2fdf961aea8ca5958dd4ac2b0c6",
-        "vendor\/bitjs\/io\/bytestream.js": "7f2114a7baae81bba59ac90982a54e715aab736624f313148449b8f0aa3cafce1a83d154f395327a0fbbc74b756f820068c08fcb782789195477d87664678e97",
-        "vendor\/cbrjs\/cbr.js": "170fa1f23c9bf4fda864f70e90b7c54ff093672901ef8fc0f26b126fd955ddddb172f25dfdac4129e7fbd9f05489143c0fe9f418474546668b8c41d38e2df7d9",
-        "vendor\/cbrjs\/css\/cbr.css": "4fc0b73984b16568b8207b8c5fe35a15f5eae7d7fe336034870f4fa384be5f0489c02ee639857d18452fdc4a14ce2a8f6151fd2ebda9bd97e5152afc0bc81587",
-        "vendor\/cbrjs\/css\/idevice.css": "475870d07554bf15bfae371f7c91e5ac555aaba20eb29079471e4856f1f43d0d2dffde756420bde094e3fdda43b6f12379bf694b64ea1cb862bcff4042a94af6",
-        "vendor\/cbrjs\/img\/loading.gif": "83773895f43e75bd31209664494da8c89f1d3869cba24930d71a3e7090b4b38dcc0a31c9e1b764d763f586534c64996e72eda2fe035a7b485a28c33b206c96f1",
-        "vendor\/epubjs\/css\/annotations.css": "9600da17ca67c7372bae1bd951cc933de1d8ccf8c4c43f2a7b6bea71117141dc355935f693f8e3be9d3f87c027b3221d54085c6125a24d0edc65ffe985855780",
-        "vendor\/epubjs\/css\/font\/fontello.eot": "06dd0ad0f1367f0811db348865be15f6dc153cd1bed819bf0abcd1ba1d19f9910047bee178f12c7d2334620734f6a1f9e8001eb28bb53959f536a765729901a3",
-        "vendor\/epubjs\/css\/font\/fontello.svg": "183e8846244045b8891458572bf3b8a51b6a019aa6a374ca30481fc403df7d0225aaf648e8dc7ecfdb0c7abfe3d5d8a5d5d91d5dcd7d8b456e776d38c05e652e",
-        "vendor\/epubjs\/css\/font\/fontello.ttf": "122beb1963a58e2a6d30945f37e5c7e7f12d382965d4352f94230adef47a446393d5b10148d445f42c201a72901f955806dafc0b4e3a569cbcf9504008118a8e",
-        "vendor\/epubjs\/css\/font\/fontello.woff": "45723570e0dd5b60bf2b9508f46e28b015a2b7f27bce3528410affa77a6704817e4f4885fdce968987b5bf27092237903d8da2ae20c2d6bb13482e210dd64a72",
-        "vendor\/epubjs\/css\/idevice.css": "57f16116dac978222fc6ecc989b1bd97e5b21b783824d8b5108761a8e2ed3e7cd31fdb587f947bb86037af0a7b258b74458eae04f13508cf61b59bddc40e4c83",
-        "vendor\/epubjs\/css\/main.css": "5b646c47a8729740334e8212810d6a7329550164e8b26d55b654f7ec136d2bc98bac7aee3fa83de0cc81bbd0a1060a3e4032c216b6d50fd4cdc19610ec3bd310",
-        "vendor\/epubjs\/css\/normalize.css": "2640cf3ac3153b95939d2c6d1b6903d24a906d7737d48f79cda4e0e6bb41098c18b0d345deb1ce41d5d27f734d92b558c8f857e9909eec23bf8147abbd4a0fd7",
-        "vendor\/epubjs\/css\/popup.css": "d44a1a4647f2216ca0698300d9e462b6e5a57b19a68c93642a46bdc7681caad89888c1adbbf4e5322a6789d81dc00ab102001fcd761187f87ff330d5fde428fa",
-        "vendor\/epubjs\/css\/sidebar.css": "1d7835670fdee603aba9af5c715be34c327ccf963f6c8de4b9c6892c876301dc643d1d2203e1f5f263e83978cf5702e80bbb945cee138951db22e53457355781",
-        "vendor\/epubjs\/epub.main.css": "8f11961b3353679ea1ffe3ce2744421ed005c4d50b160e3378163f2cbea739fa5ab4eb5f8b727f5aebfdd0cdd996bf6a9de9fc762aa36327d47e92bf1a1ce8c6",
-        "vendor\/epubjs\/epub.min.js": "fe300613fe1f868c5c5c79e4f35b40c1155113ff540d8d68a1b04b642354a691eea6a9e2826fb9636e34505939fc69a60dba985674fd75b6b2a66b634f80651e",
-        "vendor\/epubjs\/epub.min.map": "8876e8186958c5425d0aa61f3b421119b52df007d4e1c460213d14e5f10c9950e11fff0579800e02ee8b44ce7bc71fbe72e45c1f216bff4b228a149d5283ad73",
-        "vendor\/epubjs\/hooks.min.js": "85852cb5097c502e4f681f8e0e0d9e77ef085ce607379541475c8a11d22d9e6593095a104c29a94565e41dbce853a9388c3a65454832bd768d1187dc6756fe85",
-        "vendor\/epubjs\/hooks.min.map": "2cc2bdd48db5909337225209b489345e7c545594ac1037c09981dcfd3215dc2c87c91084442c83f2b1daf881e5013c41d861c38bc18199771072dc853be3313c",
-        "vendor\/epubjs\/hooks\/default\/smartimages.js": "d3fbe0efe4cc9b6c8efc23a9d2ac729d92a1ef5fdba12be988be5979381c2d8de7385e1ddf5575fe1ed9863f15be82489a36436dd68ee70c2eace92d22ff8fe5",
-        "vendor\/epubjs\/hooks\/extensions\/highlight.js": "2acf2004de04837dd2bf678af8d6c960023c0228cae734d90df98996a7d02be788db20e9ad7c1fd757aa09366e6ee491e2eaafb9917cd4a95a129d583521516b",
-        "vendor\/epubjs\/libs\/jquery.min.js": "0d40bccaa59fedecf7243d63b33c42592541d0330fefc78ec81a4c6b9689922d5b211011ca4be23ae22621cce4c658f52a1552c92d7ac3615241eb640f8514db",
-        "vendor\/epubjs\/libs\/screenfull.min.js": "a09c4e0b145c226881398ec523cbd560ebbfdfeada44d41e2c1df27d0ac9de9839875cbbdcabd61febab37145e58e76fdd49f98062f05c48416244326ca7a117",
-        "vendor\/epubjs\/libs\/zip.min.js": "6ff9a48ad45127627e59e63a11d533663c608c73147d3a372774132cfc7f3b743268d3fb65cf177cbd56cd7fd105e9dfd948c463d1407fb4b0623df1d3397474",
-        "vendor\/epubjs\/reader.min.js": "0b6a37155d319141ddf06245bf1166640bad54d51f62abadbbb2a2ef03abfb1b2055810e29629060193ca5a80ef23c593cbc661d1806529c9debfe22cd505a12",
-        "vendor\/epubjs\/reader.min.map": "0374d1db0db30c48a25f4f40c206aeeaf5e323b528a1794cace3aa6de85499ba58577b8d85d1c2004f554154ffe2f1abd4adf42c7b28c6c0f64cc3eceb07a06c",
-        "vendor\/icomoon\/fonts\/icomoon.eot": "1296c03ecf92f70094c6e0cd4568e71604c956aa3f748fc45fd08b509e2b3680e9c83356116cea2f7ae2d60252eee106dff80d1a07550befa61b87f3ca6e2b71",
-        "vendor\/icomoon\/fonts\/icomoon.svg": "2cea5dc6e31ce32598f7543274443689a6940ae2d6ecd2fd7dbf25d3d967a804725afddc5446540a98ae11d92df85e4e8703aa4116d6d9c71b8bef4dd387207b",
-        "vendor\/icomoon\/fonts\/icomoon.ttf": "3355c12d54207f9a4e5f23728c43383d1191481a77cf102383bd5e036b59ca029a7265c36ae96ca6d1991df8446bc6891f01d81675473628e5bc26dc2e177d6d",
-        "vendor\/icomoon\/fonts\/icomoon.woff": "44a9098f464bf9e80000b2cf89096f2b07ee046127ce5c11005a31ebbfafd7475e56de7eebe96ad9cee7cba4da96df0a7fa6c816b17310bbde38f07fd40034d6",
-        "vendor\/icomoon\/style.css": "e949b8af266b96651ff40bed393a8f61f4d037b56ab9751a40845dc05f59103d58cffbe444038e8dcdf726e7da007e55c28b196fcab36148388e756174b71bad",
-        "vendor\/jquery\/put-delete.js": "2447c4937da33d0d8d567405db3e3bb43faca00576622edb65ddb592c4545a4bbc3259ea2e0f5f71ff425db4a33e0359250ee13718a6e80f3da97bdae7960afb",
-        "vendor\/pdfjs\/controllers\/annotationlayer_controller.js": "8cecf74b113e7738e1168000bc27dc30ad707b7768bb668b4dd3a0ff754e823681472894ba79a6438135e2ff49e31aca35e86a848065023313622df6ac7f1fbb",
-        "vendor\/pdfjs\/controllers\/bookmarks_controller.js": "cfb16b41285c6346eb5d76995060e505b035f5b8d50412f0dc7feb6f2f1c598144e98a5c14e451ed1515a45880ac8a75c5faf5437d8f4bd6699234e56b392d8a",
-        "vendor\/pdfjs\/controllers\/controls_controller.js": "b4925b842f4ab451cba7e43fb823aa1caa294913dfa6edd4a480753929d61d7165102978ef47fd6f05b4d8a011858b354f0c0a993b982a396824904145124905",
-        "vendor\/pdfjs\/controllers\/meta_controller.js": "fdf4620f401e0ad27da9e3d91aa18e91d7666623cbe598bc1c92127e2fff0c25f9c089767e0ad5ca1ece5a621b8916a61a60b10e0a2bef76a4bf013343bc0dc6",
-        "vendor\/pdfjs\/controllers\/notes_controller.js": "ba7793f50953857ecc4fb10a7848134c0e23922cc3783360c9af87834dc34729ba04c6c6af4a69417261d31c345ab1add2c99afb6d4fbd61e6e8c91427404d46",
-        "vendor\/pdfjs\/controllers\/outline_controller.js": "c69fe71b155920cbf4825834cc7c7f6c91fbcbcabae4c892cf0b2d4a636db8faf9c25e54d58029544a12bfb631d1f4c74d9d7e1ed35cf10cd862a495efc1d891",
-        "vendor\/pdfjs\/controllers\/progress_controller.js": "9894b73c39a3b500fc057472a7ec01e876bdd6e6d8d87dce12a46698a9847aaad576294e05fb9a33d649659a00549b67921d66c04216101c61d1c75db0f8e828",
-        "vendor\/pdfjs\/controllers\/reader_controller.js": "d485fa07171bf2d84771008d5cd8c6284d3d870e7e3d72bb7a01e817db31bd6a96b5223bc314416cfd78d62b92039f92d22e03073c12ee7a8f0ba442df6f03c3",
-        "vendor\/pdfjs\/controllers\/search_controller.js": "d44a327561e9fb67e535be4fcc307d309f4aea0ee16be23057ed0f41692de01a1cf69d3f7bc2b30b26a7bdf776df5d56ff9ee26cce94f37b5cd27d4e14d5a93d",
-        "vendor\/pdfjs\/controllers\/settings_controller.js": "07f8288df9071afbb2f8ff6f4f505a254bd9383d6f9a57f1e06d00da98aadd321cf4563f421c0b7e214a4dda26865f0376ace14b3ad88d34aa8aaef93eceb735",
-        "vendor\/pdfjs\/controllers\/sidebar_controller.js": "3071f59c01d6088c21f92ef36f7c6b15024ba3dea7bc005dc1921b14c9c1c6320f7eecd158e974f9b8592dacc488ef79fc38d4925978557b09fc12815a5b86b0",
-        "vendor\/pdfjs\/controllers\/styles_controller.js": "9abaec5302ca07fe45eb99f8cf23a4b6e820f9153a66763e49a1d83a092ddb719e2899c888c38d9152ecc50eeade045041ec16d9d9ee991a37eba8a2f23c4303",
-        "vendor\/pdfjs\/controllers\/textlayer_controller.js": "ca23b356a61328cc1400fdad6b8fd52c04347187c385737f650680b326326d60816d921dd191a04e09abdf00669bd6ac2ca2140ab803986079c4e8d74df51c0f",
-        "vendor\/pdfjs\/controllers\/textlayer_controller.js.simple": "05f346ebf5ba57f8de6f47a5e13da6defdd0774b4e546101f4b5be1ee7b2e7848bd5b8d6c08e4ed1c7e5d3f4dfa36ec4682b7e9062adfba3ca4cfe9ded51643c",
-        "vendor\/pdfjs\/controllers\/toc_controller.js": "acabaf107bd8058089225b9b3f53907d96666f726cde73bd912790ef6997b13dc35f7fa2695f67923ce2279fa9e931f23eb5f684573131a3d4da4a2ca137db5f",
-        "vendor\/pdfjs\/css\/annotation_layer_builder.css": "b01d778e71769bfbd9f494e3e992f9b4d1762851e10b0977b5f50285dfda011ac27ace43b10c32431997432859f8458dc04aeda1cb08429fd16141157681708c",
-        "vendor\/pdfjs\/css\/annotations.css": "9600da17ca67c7372bae1bd951cc933de1d8ccf8c4c43f2a7b6bea71117141dc355935f693f8e3be9d3f87c027b3221d54085c6125a24d0edc65ffe985855780",
-        "vendor\/pdfjs\/css\/idevice.css": "57f16116dac978222fc6ecc989b1bd97e5b21b783824d8b5108761a8e2ed3e7cd31fdb587f947bb86037af0a7b258b74458eae04f13508cf61b59bddc40e4c83",
-        "vendor\/pdfjs\/css\/images\/annotation-check.svg": "7442036525e2d5c0ca86c3e6e343bf79f39c9d39ea4815bcbea3056f157465821fa19ef559c7079ea60c7cf99ab4a01ad47af7f46e02f8ff2822893b947b14a9",
-        "vendor\/pdfjs\/css\/images\/annotation-comment.svg": "3b0e0c6fa42084f28edabbaabca1052afd76c3c41576f23ebee598960da96556ab088e8730206d816c6d1434bcb03b0ba36d50abce074dad00cbce99fdff841e",
-        "vendor\/pdfjs\/css\/images\/annotation-help.svg": "735e99c561fe8a509bb5375f77cff79c601f9fe82c3af9254a657bc2b6274a77ccde0014855ba1e925ea2beb207e0b0c6b138f3f78f41a7e9df71f5e58f2c8c4",
-        "vendor\/pdfjs\/css\/images\/annotation-insert.svg": "f8caef572ed87fb5dd3c421665cdd1f5e4f414a65148d3d9990bbec21d9adad86810c58610c800b7649f719d88a53fc924f0dda88b1cb7883e74b709774061c6",
-        "vendor\/pdfjs\/css\/images\/annotation-key.svg": "e9e8b365bd41ae612560f438c6aeb0d1aa2e55f223812b26bf6cabf44b39bf2e1a42b41980fe60187199cea0f2adf1f31c7a0860be10edbc595832542bb1d7e5",
-        "vendor\/pdfjs\/css\/images\/annotation-newparagraph.svg": "ae5816a3ba95cbff2bdf876f4f2f4a0bd7e347bdbaacc09a2e65d46d0edc256c7f0b896536ee5470a2d17cd903d3bae52bd506c12d77504ac0aefb25265eebb9",
-        "vendor\/pdfjs\/css\/images\/annotation-noicon.svg": "b74f7a79dc719acab1f351ac70f00455654dda140d2bc24eac6d48c804bf24ef5938c7d85073004e20b0b3c52f1c38f598f811e068e5b9092e11085d468af0ed",
-        "vendor\/pdfjs\/css\/images\/annotation-note.svg": "566be95c1dda2d5a52ffe0a6899f5058c547f91fcdc60dbe26a79b39fe427a79802d6d52eacb711acfee368318f7b0d54dc9067d88962306d4b0d4ed65d651e4",
-        "vendor\/pdfjs\/css\/images\/annotation-paragraph.svg": "f016ff103e8de8e6cf19aee5e7b627ccce075844e41395cfa20342a0b42a13dce82106e4b06bbb1d7e7c135b0dfb8fba0ab3b0703f40afb9625048076ea3558e",
-        "vendor\/pdfjs\/css\/main.css": "1da78c281eddc61935ca89f905f5ba6f2943722e11ce9dd09a7a3005a0f733a8cd643f30669507cf5d830cda217b14de3a9201e4e246c70973fc916a2a2a3c35",
-        "vendor\/pdfjs\/css\/normalize.css": "2640cf3ac3153b95939d2c6d1b6903d24a906d7737d48f79cda4e0e6bb41098c18b0d345deb1ce41d5d27f734d92b558c8f857e9909eec23bf8147abbd4a0fd7",
-        "vendor\/pdfjs\/css\/popup.css": "d44a1a4647f2216ca0698300d9e462b6e5a57b19a68c93642a46bdc7681caad89888c1adbbf4e5322a6789d81dc00ab102001fcd761187f87ff330d5fde428fa",
-        "vendor\/pdfjs\/css\/sidebar.css": "aa4aa85bcc4e4ec3c40fccf59c671802ce1fa3eb49bb0c048d9a20361d56f0d0b24602ce17fb6cce4433b982147a565ef7b2922a7a88e8edbc636a47ed8d492f",
-        "vendor\/pdfjs\/css\/text_layer_builder.css": "1a723bcffea2832acc35cda3e90b0f7b241da62e2904309cdb61ec4fef9203ca198ad187abe24c007dca4a932a052f9f7f4e718fd86d915f1bb58f6c50227dc1",
-        "vendor\/pdfjs\/lib\/pdf.js": "2d7241061e30e69963a78c64345ecbb889b831ec72cdccdb07d0e684c9cf907bcf45e3781b91e51c1ca4258e796eed0a69d83e8945ccd98ace75cd57ca57d5a0",
-        "vendor\/pdfjs\/lib\/pdf.worker.js": "03cd966b7b23dabebbc1652e19f2511c41237d8cafcc8fef655b6424c1b5884e48fa3ea052d1ebafe3c6be096c0c6aec1c9cbad45115912a4a75eb886c591534",
-        "vendor\/pdfjs\/lib\/text_layer_builder.js": "f56f1d3b1a61a2b5ba4945a60057604d95a3595f2dec4e5c99b79db10f3b00a0e6be30169383fccda3a64aadda3f607f650ac261c47bbea7f0f6a3196b645f28",
-        "vendor\/pdfjs\/pdf.reader.js": "4c3cc3bc3f5b796ff3f9691a505fd051f768e359e4d2a9dea7725e7cede15e529c8a99760c9d1b9bdd199bc215d3db6861253ca50df75fcebf5437dce064df65",
-        "vendor\/pdfjs\/services\/eventbus_service.js": "851b741ec0eb06a7298664d626e648613f86d3958f4c7045cadaafb5c146088952ce584d5a4079ea51b54f07fc0cb2e9a9ddfefe52a70b2162c083b10b6293bc",
-        "vendor\/pdfjs\/services\/link_service.js": "b227d4163e2fcb3db4ed0ee2dd9f0af59dd263bc05153139d9588dd536071ca6d6430be214795f440061bcce6c6685986b5b002e4c9af7d0e2268ed83fe43424",
-        "vendor\/pdfjs\/services\/simple_link_service.js": "ffaa00f383100c5c689da1f8bfbe3baa06fc42147acfa781356eb67958cc6fbf2c34d8f448afa7f5bb14a5132c43fb78b3ad6a469f2af32ac0e29c93aa7f7ac3",
-        "vendor\/pixastic\/pixastic.effects.js": "85bd5facd47936aa75e5e18bcbec62641448c909a97a3714d3741e1880cfaca31fa60d85940ae6f27257d895bc278e00c87867cb742fa0c6eeb85bdd5ce9b36d",
-        "vendor\/pixastic\/pixastic.js": "f090060b5977941be122cf285b279e9d28fb54f1cfe9f373c0866157aa7e124296745638d3ac92356b727f719220da95f968d830eed688908498c6d8c892c226",
-        "vendor\/pixastic\/pixastic.worker.control.js": "c913b34aaea57f6ef76075ab6c0e169431947611789766cda6914ade93e98c877ac75cf092f2db1ca0876a6b8cc28d2fd13d22398d08101b787548ce4d2603c1",
-        "vendor\/pixastic\/pixastic.worker.js": "f59136a3bdbbf33fa3f81ba0cefd33b81269bbc230e7900232c725139674e53dc070f8445081b32350bcaba70ab713d6426902d66986554709c1a48952396283",
-        "vendor\/pixastic\/pixastic_combined.js": "a69bff7c76e6cdce7de3184184114e10f2ddcb369a2de03b1986c9a74d71f67f038d452d60df4a638e12420314bdc5c052a791a98d22ae5347a5f43bffd8b2f2",
-        "vendor\/sindresorhus\/screenfull.js": "29d23b28b76827f037265ce60ef5cf76c0d560c7aece03593021feae9f6220c3170abf5a8b5f380885fe15e9204425fb5446fef61c3b0ca83d6f332eb1bd1571"
-    },
-    "signature": "Rhl7J96FALdH2LF1bnEe4VF64bAskJb0eWY9skIa1FnBsUnNMYJDERwIPse5EoNfrlB5puy88TjeKbq4DZNTC4yj4tHhX26B8wdPmZ9vw6+mXdoa90W6iRBSrpnwA0kWEH588no3RPOhsIBqzHpkuIXxSCvOEyVw6tE\/LMTRWSZBZSLpzoaTUZJEyu8Wg9keAoVv+KdyNZnDm23CMOy0JhEPfNVB+\/Bvv6x4oJFy4Rz015\/K+kkGL7r7N7BP1H93zSLEbMO4oc8OzRWWnjqd3N5Dmzkx335C3vn4DdW+XzQwxpw1kCkpR+DFNkWNB7EhykaGoFOhcwY1Hkddf8J8S\/iAC1qgGg7ZbpZV+rcSedhL5sYPrAyyP+WRx21eLqtBU\/kQyaqLycbXSxhJ0m8LrNbAZtbyhPlmDGXIGWj2+B6qcjHRBEnD+XIPt2ObRLMwolbg5Ema5dv2bs1w5gvBMmsQthyJCH9AVzfB9lFBIYIcRoWAo14Og4HMOf7gld0rjd0qPFuXDop+\/JBo4d74r5W688xnh0AYmIS8WgQoGADWFDE5NNQtp+QOLi7q7YD\/5g3rte0ElbgvfTRQO75uORqdZoymfnwtt7j1OewBm19cWzWttNmu7BtmKcUe3Qipdu+fF+s402oPvmCkb3k5M4rgh82Wl3ASj6JebtbLikw=",
-    "certificate": "-----BEGIN CERTIFICATE-----\r\nMIIE+TCCAuECAhBPMA0GCSqGSIb3DQEBCwUAMG0xCzAJBgNVBAYTAlVTMQ8wDQYD\r\nVQQIDAZCb3N0b24xFjAUBgNVBAoMDW93bkNsb3VkIEluYy4xNTAzBgNVBAMMLG93\r\nbkNsb3VkIENvZGUgU2lnbmluZyBJbnRlcm1lZGlhdGUgQXV0aG9yaXR5MB4XDTE4\r\nMDExODIxMzMyNFoXDTI4MDExNjIxMzMyNFowFzEVMBMGA1UEAwwMZmlsZXNfcmVh\r\nZGVyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA2Dro3KQnJEnKeJVG\r\nnhKvrQSzLNyphcF5UNj4j3Km6wLcb86RkWtq6uX5eR6g0HI9NFZF3qxBLUGN8bpM\r\ngGyalTLwj5IsDYO\/naSZe\/wXNCBl82vZq+jjnDCYll7r2yNjTFVzRtH+o9AIQlmM\r\npt8+PCcw8n8QqlXUIq9A3kb8wggczEZnw6bCudDLQWXHYKD5\/tn7n06h9fA4VxfB\r\nQMyuv8hIjKEQqun3Qqvi3DfaR52sbeDvv9bGACxWqjiE3P6sZvL7MlDqJ5KeqWoM\r\n4qPGkgDusTtXuO7h3ro2H4NMydWXcrbUAPTXcAPo2jzTfhV8m9xQDc+45VlONjIp\r\nTFwV1oF53hnu81TlNniz1RTbDYMkExvPYtobNjNIR+VsOQs8Gq9iEDEIxyqCm2it\r\ncuMjeFhYr1rjyeS21i6cNtD\/kMxSFwKnluQPrb49pK6g2Nq5Go1iP8WgT12hAQhr\r\ni7wwH32bLe11xnD53ko6pAzhqmciaSHLxkZCm+eyTNwJzQa0uQ+gAD8gJ7bVQUxg\r\nPSjm1amfhMAzsHIraMFqzlz7IWjWA7vJGkR9DcweYBXsyt6ZloLekPsNxEKnuh3F\r\ngjBHEoy7iPLmDxGvTfPW76r6vBwBF9JgIrhJzRMtTHTsYX9olblQr957SLyiZaqJ\r\n\/kKCQZ3cKPhWBh1KydMjPlXbGFUCAwEAATANBgkqhkiG9w0BAQsFAAOCAgEAcYdp\r\ntoKFBZV7rswQ9yL6Y8F\/\/VUM1J1jincG3soCz5\/n5rL0TDekS0FI8eNWX0tay0ne\r\n3\/FZ93\/fb+gkQf7KutU\/9EWZwnc90XNq+Q3\/3DWz+nIm3EFttz6GioVYz7XEAx3A\r\nSMWeWY05ei9V7SVSnqglhouhLENrKKI8ilzGI\/pEtCs3RUv3xi7GPBdCDnvqqeXy\r\nRHrP7ZFe3v1go84v1MwQOt4\/OtaYk\/4HU51oxzUI8yDMNtLNmZm7gqLbT9bRsWCz\r\n5gqFa15K4X7sVL\/ECI72zEDZsF0RtmTCp9fJLoYXIPPQ1CACi0K0hB\/ssE6BC9Zl\r\naUXcbZ2BLwvQiZmEUhyyr0WYK4D\/dE4LbYqYpDDGRhXpf4cRhQahsYL8aMzZtZfl\r\nNDE4PN\/4sV6id6MnwrtDmsW3frMlkhzrsm8ftzwkbIyJD1Io5OAOJn6oxN2sjlWD\r\ngof0tuweAlTGuAI7\/CUA2yMZb45MFkLWDExzZsiVy9UtU641cDzOxAbg7UIeTBRZ\r\nYUdl5ci1f8299Yridc4n70yQg2GHwa8YJ6p42f93sTOo0E1UAX1+eBmuAmc\/eBq0\r\nFjjmMyPZy7EhElAUa2sqw5QS2\/AK34P0rccCaJerRJ0mU54neL5qSEuuPQnVcn\/\/\r\n3LGndYF8t5kHI3iXV3TJ2vyagUkWeDl6z9pyW0Y=\r\n-----END CERTIFICATE-----"
-}
\ No newline at end of file
diff --git a/files_reader/js/plugin.js b/files_reader/js/plugin.js
index 4187bd5..2df289e 100644
--- a/files_reader/js/plugin.js
+++ b/files_reader/js/plugin.js
@@ -65,6 +65,8 @@
 				$('.directDownload').show();
 			}
 			$('iframe').remove();
+			$('body').off('focus.filesreader');
+			$(window).off('popstate.filesreader');
 		},
 
 		/**
@@ -73,31 +75,10 @@
 		 */
 		show: function(downloadUrl, mimeType, isFileList) {
 			var self = this;
-			var $iframe;
-            		var viewer = OC.generateUrl('/apps/files_reader/?file={file}&type={type}', {file: downloadUrl, type: mimeType});
-			// launch in new window on mobile and touch devices...
-			if (isMobile || hasTouch) {
-				window.open(viewer, downloadUrl);
-            		} else {
-				$iframe = '<iframe style="width:100%;height:100%;display:block;position:absolute;top:0;" src="' + viewer + '" allowfullscreen="true" webkitallowfullscreen="true" mozallowfullscreen="true"  sandbox="allow-scripts allow-same-origin"/>';
-				if (isFileList === true) {
-					FileList.setViewerMode(true);
-				}
-				if ($('#isPublic').val()) {
-					// force the preview to adjust its height
-					$('#preview').append($iframe).css({ height: '100%' });
-					$('body').css({ height: '100%' });
-					$('footer').addClass('hidden');
-					$('#imgframe').addClass('hidden');
-					$('.directLink').addClass('hidden');
-					$('.directDownload').addClass('hidden');
-					$('#controls').addClass('hidden');
-				} else {
-					$('#app-content').append($iframe);
-					self.hideControls();
-				}
-			}
-		},
+      var viewer = OC.generateUrl('/apps/files_reader/?file={file}&type={type}', {file: downloadUrl, type: mimeType});
+			// launch in new window on all devices
+			window.open(viewer, downloadUrl);
+    },
 
 		/**
 		 * @param fileActions
@@ -105,6 +86,16 @@
 		 */
 		_extendFileActions: function(fileActions) {
 			var self = this;
+			var cbxMime = [
+				'application/x-cbr',
+				'application/comicbook+7z',
+				'application/comicbook+ace',
+				'application/comicbook+rar',
+				'application/comicbook+tar',
+				'application/comicbook+truecrypt',
+				'application/comicbook+zip'
+			];
+
 			fileActions.registerAction({
 				name: 'view-epub',
 				displayName: 'View',
@@ -114,15 +105,22 @@
 					return actionHandler(fileName, 'application/epub+zip', context);
 				}
 			});
-			fileActions.registerAction({
-				name: 'view-cbr',
-				displayName: 'View',
-				mime: 'application/x-cbr',
-				permissions: OC.PERMISSION_READ,
-				actionHandler: function(fileName, context) {
-					return actionHandler(fileName, 'application/x-cbr', context);
-				}
+
+			cbxMime.forEach(function(mime, i){
+				fileActions.registerAction({
+					name: 'view-cbr-' + i,
+					displayName: 'View',
+					mime: mime,
+					permissions: OC.PERMISSION_READ,
+					actionHandler: function (fileName, context) {
+						return actionHandler(fileName, 'application/x-cbr', context);
+					}
+				});
+
+				if (oc_appconfig.filesReader.enableCbx === 'true')
+					fileActions.setDefault(mime, 'view-cbr-' + i);
 			});
+
 			fileActions.registerAction({
 				name: 'view-pdf',
 				displayName: 'View',
@@ -135,8 +133,6 @@
 
             if (oc_appconfig.filesReader.enableEpub === 'true')
                 fileActions.setDefault('application/epub+zip', 'view-epub');
-            if (oc_appconfig.filesReader.enableCbx === 'true')
-                fileActions.setDefault('application/x-cbr', 'view-cbr');
             if (oc_appconfig.filesReader.enablePdf === 'true')
                 fileActions.setDefault('application/pdf', 'view-pdf');
 		}
diff --git a/files_reader/lib/config.php b/files_reader/lib/config.php
index 56e5427..210bed5 100644
--- a/files_reader/lib/config.php
+++ b/files_reader/lib/config.php
@@ -25,7 +25,7 @@ class Config
 	 * @return string retrieved value or default
 	 */
 	public static function get($key, $default) {
-		return \OCP\Config::getUserValue(\OCP\User::getUser(), 'files_reader', $key, $default);
+		return \OC::$server->getConfig()->getUserValue(\OCP\User::getUser(), 'files_reader', $key, $default);
 	}
 
 	/**
@@ -36,7 +36,7 @@ public static function get($key, $default) {
 	 * @return bool success
 	 */
 	public static function set($key, $value) {
-		return \OCP\Config::setUserValue(\OCP\User::getUser(), 'files_reader', $key, $value);
+		return \OC::$server->getConfig()->setUserValue(\OCP\User::getUser(), 'files_reader', $key, $value);
 	}
 
 	/**
@@ -47,7 +47,7 @@ public static function set($key, $value) {
 	 * @return string retrieved value or default
 	 */
 	public static function getApp($key, $default) {
-		return \OCP\Config::getAppValue('files_reader', $key, $default);
+		return \OC::$server->getConfig()->getAppValue('files_reader', $key, $default);
 	}
 
 	/**
@@ -58,6 +58,6 @@ public static function getApp($key, $default) {
 	 * @return bool success
 	 */
 	public static function setApp($key, $value) {
-		return \OCP\Config::setAppValue('files_reader', $key, $value);
+		return \OC::$server->getConfig()->setAppValue('files_reader', $key, $value);
 	}
 }
diff --git a/files_reader/templates/cbreader.php b/files_reader/templates/cbreader.php
index 24bac88..6e47a48 100644
--- a/files_reader/templates/cbreader.php
+++ b/files_reader/templates/cbreader.php
@@ -36,9 +36,9 @@
         <title>
             <?php p($title);?>
         </title>
-        <link rel="shortcut icon" href="img/book.png">
-        <link rel="stylesheet" href="vendor/icomoon/style.css?v=<?php p($version) ?>">
-        <link rel="stylesheet" href="vendor/cbrjs/css/cbr.css?v=<?php p($version) ?>">
+        <link rel="shortcut icon" href="<?php p($urlGenerator->linkTo('files_reader', 'img/book.png')) ?>">
+        <link rel="stylesheet" href="<?php p($urlGenerator->linkTo('files_reader', 'vendor/icomoon/style.css')) ?>?v=<?php p($version) ?>">
+        <link rel="stylesheet" href="<?php p($urlGenerator->linkTo('files_reader', 'vendor/cbrjs/css/cbr.css')) ?>?v=<?php p($version) ?>">
         <script type="text/javascript" nonce="<?php p($nonce) ?>" src="<?php p($urlGenerator->linkTo('files_reader', 'js/lib/Blob.js')) ?>?v=<?php p($version) ?>"> </script>
         <script type="text/javascript" nonce="<?php p($nonce) ?>" src="<?php p($urlGenerator->linkTo('files_reader', 'vendor/epubjs/libs/jquery.min.js')) ?>?v=<?php p($version) ?>"> </script>
         <script type="text/javascript" nonce="<?php p($nonce) ?>" src="<?php p($urlGenerator->linkTo('files_reader', 'vendor/sindresorhus/screenfull.js')) ?>?v=<?php p($version) ?>"> </script>
@@ -109,7 +109,9 @@
         <!-- /toolbar -->
 
         <!-- loading overlay -->
-        <div id="cbr-loading-overlay" class="cbr-control control overlay" name="loadingOverlay" style="display:none"></div>
+        <div id="cbr-loading-overlay" class="cbr-control control overlay" name="loadingOverlay" style="display:none">
+            <img src="<?php p($urlGenerator->linkTo('files_reader', 'img/loading.gif')) ?>">
+        </div>
         <!-- /loading overlay -->
 
         <!-- busy overlay -->
diff --git a/files_reader/templates/epubreader.php b/files_reader/templates/epubreader.php
index 8f2a9dc..da6ca87 100644
--- a/files_reader/templates/epubreader.php
+++ b/files_reader/templates/epubreader.php
@@ -36,7 +36,7 @@
         <title>
             <?php p($title);?>
         </title>
-        <link rel="shortcut icon" href="img/book.png">
+        <link rel="shortcut icon" href="<?php p($urlGenerator->linkTo('files_reader', 'img/book.png')) ?>">
         <link rel="stylesheet" href="<?php p($urlGenerator->linkTo('files_reader', 'vendor/icomoon/style.css')) ?>?v=<?php p($version) ?>">
         <link rel="stylesheet" href="<?php p($urlGenerator->linkTo('files_reader', 'vendor/epubjs/css/main.css')) ?>?v=<?php p($version) ?>">
 		<link rel="stylesheet" href="<?php p($urlGenerator->linkTo('files_reader', 'vendor/epubjs/css/sidebar.css')) ?>?v=<?php p($version) ?>">
@@ -155,7 +155,7 @@
                                 <div class="control-group">
                                     <input type="checkbox" id="use_custom_colors" name="use_custom_colors">
                                     <label for="use_custom_colors">
-                                        Use custom colors 
+                                        Use custom colors
                                     </label>
                                     <div class="center-box">
                                     <input type="color" id="day_color" value="#0a0a0a">
@@ -209,7 +209,7 @@
                             <div class="control-group">
                                 <input type="checkbox" id="touch_nav" name="touch_nav">
                                 <label for="touch_nav">
-                                    disable extra-wide page turn areas 
+                                    disable extra-wide page turn areas
                                 </label>
                             </div>
                             <div class="control-group">
@@ -283,7 +283,7 @@
                     </div>
                 </div>
                 <div id="loader">
-                    <img src="img/loading.gif">
+                    <img src="<?php p($urlGenerator->linkTo('files_reader', 'img/loading.gif')) ?>">
                 </div>
 
                 <!-- /navigation + viewer -->
diff --git a/files_reader/templates/pdfreader.php b/files_reader/templates/pdfreader.php
index 7513ce4..a47410e 100644
--- a/files_reader/templates/pdfreader.php
+++ b/files_reader/templates/pdfreader.php
@@ -36,7 +36,7 @@
         <title>
             <?php p($title);?>
         </title>
-        <link rel="shortcut icon" href="img/book.png">
+        <link rel="shortcut icon" href="<?php p($urlGenerator->linkTo('files_reader', 'img/book.png')) ?>">
         <link rel="stylesheet" href="<?php p($urlGenerator->linkTo('files_reader', 'vendor/icomoon/style.css')) ?>?v=<?php p($version) ?>">
         <link rel="stylesheet" href="<?php p($urlGenerator->linkTo('files_reader', 'vendor/pdfjs/css/main.css')) ?>?v=<?php p($version) ?>">
 		<link rel="stylesheet" href="<?php p($urlGenerator->linkTo('files_reader', 'vendor/pdfjs/css/sidebar.css')) ?>?v=<?php p($version) ?>">
@@ -113,7 +113,7 @@
                         <ul id="outline" class="outline">
                         </ul>
                     </div>
-                    
+
                     <!-- currently not used
                     <div id="notesView" class="notes-view view">
                         <div>
@@ -183,7 +183,7 @@
                             <div class="control-group">
                                 <input type="checkbox" id="touch_nav" name="touch_nav">
                                 <label for="touch_nav">
-                                    disable extra-wide page turn areas 
+                                    disable extra-wide page turn areas
                                 </label>
                             </div>
                             <div class="control-group">
@@ -310,7 +310,7 @@
                     </div>
                 </div>
                 <div id="loader">
-                    <img src="img/loading.gif">
+                    <img src="<?php p($urlGenerator->linkTo('files_reader', 'img/loading.gif')) ?>">
                 </div>
 
                 <!-- /navigation + viewer -->
diff --git a/files_reader/vendor/cbrjs/cbr.js b/files_reader/vendor/cbrjs/cbr.js
index 503f2fa..077369c 100644
--- a/files_reader/vendor/cbrjs/cbr.js
+++ b/files_reader/vendor/cbrjs/cbr.js
@@ -50,7 +50,7 @@ CBRJS.Reader = function(bookPath, _options) {
 		}
 
 		xhr.open('GET',url, true);
-         
+
 		options.start(filename);
 
 		xhr.responseType = "arraybuffer";
@@ -70,10 +70,10 @@ CBRJS.Reader = function(bookPath, _options) {
             reader.options.session.size = e.total;
 		};
 
-		xhr.onload = function () { 
+		xhr.onload = function () {
 			if ((this.status === 200) && this.response) {
 				var done = false;
-				var ua = new bitjs.archive[archive_class](this.response, 'vendor/bitjs/');
+				var ua = new bitjs.archive[archive_class](this.response, document.head.dataset.basepath + 'vendor/bitjs/');
 
 				ua.addEventListener(bitjs.archive.UnarchiveEvent.Type.START, function (e) {
 					$progressbar.css('width', '0%');
@@ -120,9 +120,9 @@ CBRJS.Reader = function(bookPath, _options) {
 					$('.icon-unarchive').removeClass('active');
 					$('.icon-unarchive').addClass('error');
 					$('#message').text('Failed to extract images from archive, file corrupted?');
-					
+
 				});
-			} 
+			}
 
 			ua.start();
 		};
@@ -261,7 +261,7 @@ ComicBook = (function ($) {
             thumbnails: true, // true / false (use thumbnails in index)
             thumbnailWidth: 200, // width of thumbnail
             sidebarWide: false, // use wide sidbar
-            currentPage: 0, // current page 
+            currentPage: 0, // current page
             keyboard: {
                 32: 'next', // space
                 34: 'next', // page-down
@@ -276,7 +276,7 @@ ComicBook = (function ($) {
                 70: 'toggleFullscreen', // f
                 27: 'closeSidebar' // esc
             },
-            vendorPath: 'vendor/',
+            vendorPath: document.head.dataset.basepath + 'vendor/',
             forward_buffer: 3,
             session: {
                 getCursor: function() {},
@@ -442,7 +442,7 @@ ComicBook = (function ($) {
                             break;
                         default:
                             console.log("unknown enhancement: " + JSON.stringify(prop));
-                    } 
+                    }
                 }
             };
 
@@ -570,7 +570,7 @@ ComicBook = (function ($) {
         };
 
         /**
-         * Insert thumbnail into TOC 
+         * Insert thumbnail into TOC
          */
         ComicBook.prototype.tocInsert = function (image, page, replace) {
             var placeholder = toc.children[page].firstChild;
@@ -578,7 +578,7 @@ ComicBook = (function ($) {
                 placeholder.parentNode.replaceChild(
                     self.getThumb(image),
                     placeholder
-                ); 
+                );
             }
 
             toc.children[page].addEventListener('click', function (e) {
@@ -1407,7 +1407,7 @@ ComicBook = (function ($) {
                 page = options.currentPage;
             }
 
-            document.getElementById('toc').parentNode.scrollTop = 
+            document.getElementById('toc').parentNode.scrollTop =
                 document.getElementById('page-' + String(page + 1)).offsetTop
                 - Math.floor($('.panels').height() * 1.5);
         };
@@ -1474,5 +1474,3 @@ ComicBook = (function ($) {
         }
 
 })(window, jQuery);
-
-
diff --git a/files_reader/vendor/cbrjs/css/cbr.css b/files_reader/vendor/cbrjs/css/cbr.css
index ffdbfd1..00d3164 100644
--- a/files_reader/vendor/cbrjs/css/cbr.css
+++ b/files_reader/vendor/cbrjs/css/cbr.css
@@ -116,7 +116,13 @@ body:not(.mobile) .navigate:hover {
 
 #cbr-loading-overlay {
 	z-index: 100;
-	background: #000 url("img/loading.gif") no-repeat center;
+	padding: 0;
+	width: 20px;
+	height: 20px;
+}
+
+#cbr-loading-overlay > img {
+	width: 100%;
 }
 
 .overlay {