diff --git a/.SRCINFO b/.SRCINFO
index 2de641da8715..d121b8d7b594 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = zotero
 	pkgdesc = A free, easy-to-use tool to help you collect, organize, cite, and share your research sources.
-	pkgver = 6.0.37
+	pkgver = 7.0.0
 	pkgrel = 1
 	url = https://github.com/zotero/zotero
 	arch = x86_64
@@ -8,6 +8,7 @@ pkgbase = zotero
 	license = AGPL3
 	makedepends = npm
 	makedepends = git
+	makedepends = git-lfs
 	makedepends = zip
 	makedepends = unzip
 	makedepends = perl
@@ -21,22 +22,20 @@ pkgbase = zotero
 	depends = nss
 	depends = libxt
 	source = zotero.desktop
-	source = zotero-client::git+https://github.com/zotero/zotero.git#tag=ab6e0a7d3436062c3787bf22fc212b002ce0fb04
-	source = zotero-build::git+https://github.com/zotero/zotero-build.git#tag=5cec38cd40361d939e32eb0b6e0fd18ac7b78a56
-	source = zotero-standalone-build::git+https://github.com/zotero/zotero-standalone-build.git#tag=6.0.37
+	source = zotero-client::git+https://github.com/zotero/zotero.git#tag=fd9a07ffe3f90c13140cd54e9ba0ea89cab2e2f8
 	source = zotero-translators::git+https://github.com/zotero/translators.git
 	source = zotero-styles::git+https://github.com/zotero/bundled-styles.git
 	source = zotero-pdf-worker::git+https://github.com/zotero/pdf-worker.git
 	source = zotero-note-editor::git+https://github.com/zotero/note-editor.git
-	source = zotero-pdf-reader::git+https://github.com/zotero/pdf-reader.git
+	source = zotero-reader::git+https://github.com/zotero/reader.git
 	source = zotero-schema::git+https://github.com/zotero/zotero-schema.git
 	source = zotero-SingleFile::git+https://github.com/gildas-lormeau/SingleFile.git
 	source = zotero-utilities::git+https://github.com/zotero/utilities.git
 	source = zotero-translate::git+https://github.com/zotero/translate.git
 	source = zotero-csl::git+https://github.com/citation-style-language/locales.git
-	source = zotero-transfw::git+https://github.com/egh/zotero-transfw.git
 	source = zotero-libreoffice-integration::git+https://github.com/zotero/zotero-libreoffice-integration.git
 	source = zotero-pdf-js::git+https://github.com/zotero/pdf.js.git
+	source = zotero-epub-js::git+https://github.com/zotero/epub.js.git
 	sha256sums = eab76db7a56a4d9aaa17baaf240b82fcf57944a4ddf8ef1b58cc64182426cedc
 	sha256sums = SKIP
 	sha256sums = SKIP
@@ -52,7 +51,5 @@ pkgbase = zotero
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
 
 pkgname = zotero
diff --git a/PKGBUILD b/PKGBUILD
index 781b72b3d65e..85ee814b1c09 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,30 @@
 # Maintainer: Aaron Keesing <agkphysics at gmail dot com>
 
 pkgname=zotero
-pkgver=6.0.37
+pkgver=7.0.0
 pkgrel=1
 pkgdesc="A free, easy-to-use tool to help you collect, organize, cite, and share your research sources."
 arch=('x86_64' 'i686')
 url="https://github.com/zotero/zotero"
 license=('AGPL3')
 depends=('dbus-glib' 'gtk3' 'nss' 'libxt')
-makedepends=('npm' 'git' 'zip' 'unzip' 'perl' 'python>=3' 'curl' 'wget' 'rsync' 'nodejs')
-_tag=ab6e0a7d3436062c3787bf22fc212b002ce0fb04  # git rev-parse $pkgver
+makedepends=('npm' 'git' 'git-lfs' 'zip' 'unzip' 'perl' 'python>=3' 'curl' 'wget' 'rsync' 'nodejs')
+_tag=fd9a07ffe3f90c13140cd54e9ba0ea89cab2e2f8  # git rev-parse $pkgver
 source=("zotero.desktop"
         "zotero-client::git+https://github.com/zotero/zotero.git#tag=${_tag}"
-        "zotero-build::git+https://github.com/zotero/zotero-build.git#tag=5cec38cd40361d939e32eb0b6e0fd18ac7b78a56"
-        "zotero-standalone-build::git+https://github.com/zotero/zotero-standalone-build.git#tag=6.0.37"
         "zotero-translators::git+https://github.com/zotero/translators.git"
         "zotero-styles::git+https://github.com/zotero/bundled-styles.git"
         "zotero-pdf-worker::git+https://github.com/zotero/pdf-worker.git"
         "zotero-note-editor::git+https://github.com/zotero/note-editor.git"
-        "zotero-pdf-reader::git+https://github.com/zotero/pdf-reader.git"
+        "zotero-reader::git+https://github.com/zotero/reader.git"
         "zotero-schema::git+https://github.com/zotero/zotero-schema.git"
         "zotero-SingleFile::git+https://github.com/gildas-lormeau/SingleFile.git"
         "zotero-utilities::git+https://github.com/zotero/utilities.git"
         "zotero-translate::git+https://github.com/zotero/translate.git"
         "zotero-csl::git+https://github.com/citation-style-language/locales.git"
-        "zotero-transfw::git+https://github.com/egh/zotero-transfw.git"
         "zotero-libreoffice-integration::git+https://github.com/zotero/zotero-libreoffice-integration.git"
-        "zotero-pdf-js::git+https://github.com/zotero/pdf.js.git")
+        "zotero-pdf-js::git+https://github.com/zotero/pdf.js.git"
+        "zotero-epub-js::git+https://github.com/zotero/epub.js.git")
 sha256sums=('eab76db7a56a4d9aaa17baaf240b82fcf57944a4ddf8ef1b58cc64182426cedc'
             'SKIP'
             'SKIP'
@@ -41,8 +39,6 @@ sha256sums=('eab76db7a56a4d9aaa17baaf240b82fcf57944a4ddf8ef1b58cc64182426cedc'
             'SKIP'
             'SKIP'
             'SKIP'
-            'SKIP'
-            'SKIP'
             'SKIP')
 
 pkgver() {
@@ -52,66 +48,63 @@ pkgver() {
 
 prepare() {
   cd "$srcdir/zotero-client"
+
+  git lfs install --local
+  git remote add network-origin https://github.com/zotero/zotero.git
+  git lfs pull -I app/linux/updater.tar.xz network-origin
+
   npm i --legacy-peer-deps
+
   git submodule init
   git config submodule.translators.url "$srcdir/zotero-translators"
   git config submodule.styles.url "$srcdir/zotero-styles"
   git config submodule.pdf-worker.url "$srcdir/zotero-pdf-worker"
   git config submodule.note-editor.url "$srcdir/zotero-note-editor"
-  git config submodule.pdf-reader.url "$srcdir/zotero-pdf-reader"
+  git config submodule.reader.url "$srcdir/zotero-reader"
   git config submodule.resource/schema/global.url "$srcdir/zotero-schema"
   git config submodule.resource/SingleFile.url "$srcdir/zotero-SingleFile"
   git config submodule.chrome/content/zotero/xpcom/utilities.url "$srcdir/zotero-utilities"
   git config submodule.chrome/content/zotero/xpcom/translate.url "$srcdir/zotero-translate"
   git config submodule.chrome/content/zotero/locale/csl.url "$srcdir/zotero-csl"
+  git config submodule.app/modules/zotero-libreoffice-integration.url "$srcdir/zotero-libreoffice-integration"
   git -c protocol.file.allow=always submodule update
 
-  cd "$srcdir/zotero-client/pdf-reader"
+  cd "$srcdir/zotero-client/chrome/content/zotero/xpcom/utilities"
+  git config submodule.resource/schema/global.url "$srcdir/zotero-schema"
+  git -c protocol.file.allow=always submodule update
+
+  cd "$srcdir/zotero-client/chrome/content/zotero/xpcom/translate/modules/utilities"
+  git config submodule.resource/schema/global.url "$srcdir/zotero-schema"
+  git -c protocol.file.allow=always submodule update
+
+  cd "$srcdir/zotero-client/reader"
   git submodule init
-  git config submodule.pdf.js.url "$srcdir/zotero-pdf-js"
+  git config submodule.pdfjs/pdf.js.url "$srcdir/zotero-pdf-js"
+  git config submodule.epubjs/epub.js.url "$srcdir/zotero-epub-js"
   git -c protocol.file.allow=always submodule update
 
   cd "$srcdir/zotero-client/pdf-worker"
   git submodule init
   git config submodule.pdf.js.url "$srcdir/zotero-pdf-js"
   git -c protocol.file.allow=always submodule update
-
-  cd "$srcdir/zotero-build"
-  git submodule init
-  git config submodule.xpi/zotero-transfw.url "$srcdir/zotero-transfw"
-  git -c protocol.file.allow=always submodule update
-
-  cd "$srcdir/zotero-standalone-build"
-  git submodule init
-  git config submodule.modules/zotero-libreoffice-integration.url "$srcdir/zotero-libreoffice-integration"
-  git -c protocol.file.allow=always submodule update
-
-  ./fetch_xulrunner.sh -p l
-  ./fetch_pdftools
 }
 
 build() {
   cd "$srcdir/zotero-client"
   NODE_OPTIONS=--openssl-legacy-provider npm run build
-
-  cd "$srcdir/zotero-standalone-build"
-  scripts/dir_build -p l
+  app/scripts/dir_build -q
 }
 
 package() {
   install -dDm755 "$pkgdir"/usr/{bin,lib/zotero}
-  mv "$srcdir/zotero-standalone-build/staging/Zotero_linux-$CARCH"/* "$pkgdir/usr/lib/zotero"
+  cp -r "$srcdir/zotero-client/app/staging/Zotero_linux-$CARCH"/* "$pkgdir/usr/lib/zotero"
   ln -s /usr/lib/zotero/zotero "$pkgdir/usr/bin/zotero"
   install -Dm644 "$srcdir/zotero.desktop" "$pkgdir/usr/share/applications/zotero.desktop"
 
   # Copy zotero icons to a standard location
-  install -Dm644 "$pkgdir/usr/lib/zotero/chrome/icons/default/default16.png" "$pkgdir/usr/share/icons/hicolor/16x16/apps/zotero.png"
-  install -Dm644 "$pkgdir/usr/lib/zotero/chrome/icons/default/default32.png" "$pkgdir/usr/share/icons/hicolor/32x32/apps/zotero.png"
-  install -Dm644 "$pkgdir/usr/lib/zotero/chrome/icons/default/default48.png" "$pkgdir/usr/share/icons/hicolor/48x48/apps/zotero.png"
-  install -Dm644 "$pkgdir/usr/lib/zotero/chrome/icons/default/default256.png" "$pkgdir/usr/share/icons/hicolor/256x256/apps/zotero.png"
-
-  # Disable automatic updates
-  sed -i '/pref("app.update.enabled", true);/c\pref("app.update.enabled", false);' "$pkgdir/usr/lib/zotero/defaults/preferences/prefs.js"
+  install -Dm644 "$pkgdir/usr/lib/zotero/icons/icon32.png" "$pkgdir/usr/share/icons/hicolor/32x32/apps/zotero.png"
+  install -Dm644 "$pkgdir/usr/lib/zotero/icons/icon64.png" "$pkgdir/usr/share/icons/hicolor/64x64/apps/zotero.png"
+  install -Dm644 "$pkgdir/usr/lib/zotero/icons/icon128.png" "$pkgdir/usr/share/icons/hicolor/128x128/apps/zotero.png"
 
   # Close shell when launching
   sed -i -r 's:^("\$CALLDIR/zotero-bin" -app "\$CALLDIR/application.ini" "\$@"):exec \1:' "$pkgdir/usr/lib/zotero/zotero"