diff --git a/scripts/mime.py b/scripts/mime.py
index 09e5bf7..478bd1f 100644
--- a/scripts/mime.py
+++ b/scripts/mime.py
@@ -18,7 +18,6 @@ major_mime = {
 
 pdf = (
     "application/pdf",
-    "application/x-cbz",
     "application/epub+zip",
     "application/vnd.ms-xpsdocument",
 )
diff --git a/src/ctx.h b/src/ctx.h
index 04ae8dd..1ddacd4 100644
--- a/src/ctx.h
+++ b/src/ctx.h
@@ -5,7 +5,7 @@
 #include "tpool.h"
 #include "libscan/scan.h"
 #include "libscan/arc/arc.h"
-#include "libscan/cbr/cbr.h"
+#include "libscan/comic/comic.h"
 #include "libscan/ebook/ebook.h"
 #include "libscan/font/font.h"
 #include "libscan/media/media.h"
@@ -40,7 +40,7 @@ typedef struct {
     int fast;
 
     scan_arc_ctx_t arc_ctx;
-    scan_cbr_ctx_t cbr_ctx;
+    scan_comic_ctx_t comic_ctx;
     scan_ebook_ctx_t ebook_ctx;
     scan_font_ctx_t font_ctx;
     scan_media_ctx_t media_ctx;
diff --git a/src/main.c b/src/main.c
index 114409f..b5c2821 100644
--- a/src/main.c
+++ b/src/main.c
@@ -21,7 +21,7 @@
 #define EPILOG "Made by simon987 <me@simon987.net>. Released under GPL-3.0"
 
 
-static const char *const Version = "2.6.1";
+static const char *const Version = "2.7.0";
 static const char *const usage[] = {
         "sist2 scan [OPTION]... PATH",
         "sist2 index [OPTION]... INDEX",
@@ -99,11 +99,14 @@ void initialize_scan_context(scan_args_t *args) {
     ScanCtx.arc_ctx.logf = _logf;
     ScanCtx.arc_ctx.parse = (parse_callback_t) parse;
 
-    // Cbr
-    ScanCtx.cbr_ctx.log = _log;
-    ScanCtx.cbr_ctx.logf = _logf;
-    ScanCtx.cbr_ctx.store = _store;
-    ScanCtx.cbr_ctx.cbr_mime = mime_get_mime_by_string(ScanCtx.mime_table, "application/x-cbr");
+    // Comic
+    ScanCtx.comic_ctx.log = _log;
+    ScanCtx.comic_ctx.logf = _logf;
+    ScanCtx.comic_ctx.store = _store;
+    ScanCtx.comic_ctx.tn_size = args->size;
+    ScanCtx.comic_ctx.tn_qscale = args->quality;
+    ScanCtx.comic_ctx.cbr_mime = mime_get_mime_by_string(ScanCtx.mime_table, "application/x-cbr");
+    ScanCtx.comic_ctx.cbz_mime = mime_get_mime_by_string(ScanCtx.mime_table, "application/x-cbz");
 
     // Ebook
     pthread_mutex_init(&ScanCtx.ebook_ctx.mupdf_mutex, NULL);
diff --git a/src/parsing/mime_generated.c b/src/parsing/mime_generated.c
index 3dd0596..7ecf544 100644
--- a/src/parsing/mime_generated.c
+++ b/src/parsing/mime_generated.c
@@ -108,7 +108,7 @@ enum mime {
     application_x_bzip=655460,
     application_x_bzip2=655461 | 0x08000000,
     application_x_cbr=655462,
-    application_x_cbz=655463 | 0x40000000,
+    application_x_cbz=655463,
     application_x_cdlink=655464,
     application_x_chat=655465,
     application_x_chrome_extension=655466,
diff --git a/src/parsing/parse.c b/src/parsing/parse.c
index 7ab1215..86738fe 100644
--- a/src/parsing/parse.c
+++ b/src/parsing/parse.c
@@ -147,9 +147,8 @@ void parse(void *arg) {
         parse_archive(&ScanCtx.arc_ctx, &job->vfile, &doc);
     } else if (ScanCtx.ooxml_ctx.content_size > 0 && IS_DOC(doc.mime)) {
         parse_ooxml(&ScanCtx.ooxml_ctx, &job->vfile, &doc);
-
-    } else if (is_cbr(&ScanCtx.cbr_ctx, doc.mime)) {
-        parse_cbr(&ScanCtx.cbr_ctx, &job->vfile, &doc);
+    } else if (is_cbr(&ScanCtx.comic_ctx, doc.mime) || is_cbz(&ScanCtx.comic_ctx, doc.mime)) {
+        parse_comic(&ScanCtx.comic_ctx, &job->vfile, &doc);
     } else if (IS_MOBI(doc.mime)) {
         parse_mobi(&ScanCtx.mobi_ctx, &job->vfile, &doc);
     }
diff --git a/src/static/search.html b/src/static/search.html
index 280c684..5afce71 100644
--- a/src/static/search.html
+++ b/src/static/search.html
@@ -11,7 +11,7 @@
 
 <nav class="navbar navbar-expand-lg">
     <a class="navbar-brand" href="/">sist2</a>
-    <span class="badge badge-pill version">2.6.1</span>
+    <span class="badge badge-pill version">2.7.0</span>
     <span class="tagline">Lightning-fast file system indexer and search tool </span>
     <a class="btn ml-auto" href="/stats">Stats</a>
     <button class="btn" type="button" data-toggle="modal" data-target="#settings" onclick="loadSettings()">Settings
diff --git a/src/static/stats.html b/src/static/stats.html
index 140538f..e7d1953 100644
--- a/src/static/stats.html
+++ b/src/static/stats.html
@@ -10,7 +10,7 @@
 
 <nav class="navbar navbar-expand-lg">
     <a class="navbar-brand" href="/">sist2</a>
-    <span class="badge badge-pill version">2.6.1</span>
+    <span class="badge badge-pill version">2.7.0</span>
     <span class="tagline">Lightning-fast file system indexer and search tool </span>
     <a style="margin-left: auto" class="btn" href="/">Back</a>
     <button class="btn" type="button" data-toggle="modal" data-target="#settings"
diff --git a/third-party/libscan b/third-party/libscan
index 7c1a832..982a2d3 160000
--- a/third-party/libscan
+++ b/third-party/libscan
@@ -1 +1 @@
-Subproject commit 7c1a8323602703f549c4f1183dd3f8486a083c2f
+Subproject commit 982a2d3f868ab1ac37277ff4251e7703755ee56e