diff --git a/cypress/e2e/direct.spec.js b/cypress/e2e/direct.spec.js
index 2ddcd5a3a4..8254ccd01d 100644
--- a/cypress/e2e/direct.spec.js
+++ b/cypress/e2e/direct.spec.js
@@ -85,6 +85,7 @@ describe('Direct editing (legacy)', function() {
 				cy.nextcloudTestingAppConfigSet('richdocuments', 'uiDefaults-UIMode', 'classic')
 				cy.logout()
 				cy.visit(token)
+				cy.screenshot('direct')
 				cy.waitForCollabora(false)
 				cy.screenshot('direct')
 			})
diff --git a/cypress/e2e/open.spec.js b/cypress/e2e/open.spec.js
index 8c27845451..b9bd591cd1 100644
--- a/cypress/e2e/open.spec.js
+++ b/cypress/e2e/open.spec.js
@@ -55,8 +55,8 @@ describe('Open existing office files', function() {
 
 			// Share action
 			cy.get('@loleafletframe').within(() => {
-				cy.get('#main-menu #menu-file > a').click()
-				cy.get('#main-menu #menu-shareas > a').click()
+				cy.get('#main-menu li#menu-file > a').click()
+				cy.get('#main-menu li#menu-shareas > a').click()
 			})
 
 			cy.get('#app-sidebar-vue')
diff --git a/cypress/e2e/settings.spec.js b/cypress/e2e/settings.spec.js
index 3df9538b88..6315a40e5d 100644
--- a/cypress/e2e/settings.spec.js
+++ b/cypress/e2e/settings.spec.js
@@ -20,7 +20,7 @@
 import { User } from '@nextcloud/cypress'
 
 const usesHttps = Cypress.env('baseUrl').substr(0, 5) === 'https'
-const collaboraUrl = Cypress.env('collaboraUrl')
+const collaboraUrl = Cypress.config('collaboraUrl')
 const defaultFonts = ['AmaticSC-Regular.ttf']
 
 describe('Office admin settings', function() {
diff --git a/cypress/e2e/share-link.js b/cypress/e2e/share-link.js
index c6a6255d65..8fc7697846 100644
--- a/cypress/e2e/share-link.js
+++ b/cypress/e2e/share-link.js
@@ -51,7 +51,7 @@ describe('Public sharing of office documents', function() {
 							cy.spy(win, 'postMessage').as('postMessage')
 						},
 					})
-					cy.waitForCollabora(true)
+					cy.waitForCollabora()
 					cy.get('@loleafletframe').within(() => {
 						cy.get('#closebutton').click()
 					})
diff --git a/lib/AppConfig.php b/lib/AppConfig.php
index b2db4068ef..d70e735a09 100644
--- a/lib/AppConfig.php
+++ b/lib/AppConfig.php
@@ -61,7 +61,7 @@ public function __construct(
 	) {
 	}
 
-	public function getAppNamespace($key) {
+	public function getAppNamespace(string $key) {
 		if (str_starts_with($key, 'watermark_')) {
 			return self::WATERMARK_APP_NAMESPACE;
 		}
@@ -85,7 +85,7 @@ public function getAppValue($key, $defaultValue = null) {
 	 * @param $key
 	 * @return list<string>|string
 	 */
-	public function getAppValueArray($key) {
+	public function getAppValueArray(string $key) {
 		$value = $this->config->getAppValue($this->getAppNamespace($key), $key, []);
 		if (array_key_exists($key, self::APP_SETTING_TYPES) && self::APP_SETTING_TYPES[$key] === 'array') {
 			$value = $value !== '' ? explode(',', $value) : [];
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 084edf8bf2..59a4141b65 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -33,6 +33,7 @@
 use OCA\Richdocuments\Listener\BeforeFetchPreviewListener;
 use OCA\Richdocuments\Listener\BeforeTemplateRenderedListener;
 use OCA\Richdocuments\Listener\FileCreatedFromTemplateListener;
+use OCA\Richdocuments\Listener\LoadPublicViewerListener;
 use OCA\Richdocuments\Listener\LoadViewerListener;
 use OCA\Richdocuments\Listener\ReferenceListener;
 use OCA\Richdocuments\Listener\ShareLinkListener;
@@ -81,6 +82,7 @@ public function register(IRegistrationContext $context): void {
 		$context->registerEventListener(FileCreatedFromTemplateEvent::class, FileCreatedFromTemplateListener::class);
 		$context->registerEventListener(AddContentSecurityPolicyEvent::class, AddContentSecurityPolicyListener::class);
 		$context->registerEventListener(AddFeaturePolicyEvent::class, AddFeaturePolicyListener::class);
+		$context->registerEventListener(BeforeTemplateRenderedEvent::class, LoadPublicViewerListener::class);
 		$context->registerEventListener(LoadViewer::class, LoadViewerListener::class);
 		$context->registerEventListener(ShareLinkAccessedEvent::class, ShareLinkListener::class);
 		$context->registerEventListener(BeforePreviewFetchedEvent::class, BeforeFetchPreviewListener::class);
diff --git a/lib/Controller/DirectViewController.php b/lib/Controller/DirectViewController.php
index 02097675ad..f08ea2d0dc 100644
--- a/lib/Controller/DirectViewController.php
+++ b/lib/Controller/DirectViewController.php
@@ -189,7 +189,10 @@ public function showPublicShare(Direct $direct) {
 		return new TemplateResponse('core', '403', [], 'guest');
 	}
 
-	private function renderErrorPage($message) {
+	/**
+	 * @psalm-param 'Failed to open the requested file.' $message
+	 */
+	private function renderErrorPage(string $message) {
 		$params = [
 			'errors' => [['error' => $message]]
 		];
diff --git a/lib/Controller/OCSController.php b/lib/Controller/OCSController.php
index 50504f1527..8a1b60ae19 100644
--- a/lib/Controller/OCSController.php
+++ b/lib/Controller/OCSController.php
@@ -345,7 +345,7 @@ public function createFromTemplate($path, $template) {
 		}
 	}
 
-	private function mb_pathinfo($filepath) {
+	private function mb_pathinfo(string $filepath) {
 		$result = [];
 		preg_match('%^(.*?)[\\\\/]*(([^/\\\\]*?)(\.([^\.\\\\/]+?)|))[\\\\/\.]*$%im', ltrim('/' . $filepath), $matches);
 		if ($matches[1]) {
diff --git a/lib/Controller/TemplatesController.php b/lib/Controller/TemplatesController.php
index fa63567840..70aa4c0961 100644
--- a/lib/Controller/TemplatesController.php
+++ b/lib/Controller/TemplatesController.php
@@ -82,7 +82,9 @@ public function __construct($appName,
 
 	/**
 	 * @NoAdminRequired
+	 *
 	 * @NoCSRFRequired
+	 *
 	 * @PublicPage
 	 *
 	 * Get preview for a specific template
@@ -93,15 +95,17 @@ public function __construct($appName,
 	 * @param bool $a
 	 * @param bool $forceIcon
 	 * @param string $mode
-	 * @return DataResponse
+	 *
 	 * @throws NotFoundResponse
+	 *
+	 * @psalm-return DataResponse<400|404, array<never, never>, array<never, never>>|DataResponse<int, array|null|object|scalar, array<string, mixed>>|FileDisplayResponse<int, array<string, mixed>>
 	 */
 	public function getPreview($fileId,
 		$x = 150,
 		$y = 150,
 		$a = false,
 		$forceIcon = true,
-		$mode = 'fill') {
+		$mode = 'fill'): DataResponse|FileDisplayResponse {
 		if ($fileId === '' || $x === 0 || $y === 0) {
 			return new DataResponse([], Http::STATUS_BAD_REQUEST);
 		}
diff --git a/lib/Db/AssetMapper.php b/lib/Db/AssetMapper.php
index 67c0b0824d..bc261d2fe3 100644
--- a/lib/Db/AssetMapper.php
+++ b/lib/Db/AssetMapper.php
@@ -45,11 +45,12 @@ public function __construct(IDBConnection $db, ISecureRandom $random, ITimeFacto
 	}
 
 	/**
-	 * @param $uid
+	 * @param null|string $uid
 	 * @param $fileid
+	 *
 	 * @return Asset
 	 */
-	public function newAsset($uid, $fileid) {
+	public function newAsset(string|null $uid, int $fileid) {
 		$asset = new Asset();
 		$asset->setUid($uid);
 		$asset->setFileid($fileid);
diff --git a/lib/Db/DirectMapper.php b/lib/Db/DirectMapper.php
index 31f451c193..575ac2dc69 100644
--- a/lib/Db/DirectMapper.php
+++ b/lib/Db/DirectMapper.php
@@ -50,9 +50,13 @@ public function __construct(IDBConnection $db,
 	 * @param string|null $uid
 	 * @param int $fileid
 	 * @param int $destination
+	 * @param null|string $share
+	 * @param null|string $initiatorHost
+	 * @param null|string $initiatorToken
+	 *
 	 * @return Direct
 	 */
-	public function newDirect($uid, $fileid, $destination = null, $share = null, $initiatorHost = null, $initiatorToken = null) {
+	public function newDirect($uid, $fileid, $destination = null, string|null $share = null, string|null $initiatorHost = null, string|null $initiatorToken = null) {
 		$direct = new Direct();
 		$direct->setUid($uid);
 		$direct->setFileid($fileid);
diff --git a/lib/Db/WopiMapper.php b/lib/Db/WopiMapper.php
index 65e58b3768..2f27921087 100644
--- a/lib/Db/WopiMapper.php
+++ b/lib/Db/WopiMapper.php
@@ -98,7 +98,7 @@ public function generateFileToken($fileId, $owner, $editor, $version, $updatable
 		return $wopi;
 	}
 
-	public function generateInitiatorToken($uid, $remoteServer) {
+	public function generateInitiatorToken(string $uid, string $remoteServer) {
 		$token = $this->random->generate(32, ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_DIGITS);
 
 		$wopi = Wopi::fromParams([
diff --git a/lib/Listener/LoadPublicViewerListener.php b/lib/Listener/LoadPublicViewerListener.php
new file mode 100644
index 0000000000..bba1bb4ccb
--- /dev/null
+++ b/lib/Listener/LoadPublicViewerListener.php
@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright Copyright (c) 2024 Elizabeth Danzberger <lizzy7128@tutanota.de>
+ *
+ * @author Elizabeth Danzberger <lizzy7128@tutanota.de>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+
+namespace OCA\Richdocuments\Listener;
+
+use OCA\Richdocuments\AppInfo\Application;
+use OCP\AppFramework\Http\Events\BeforeTemplateRenderedEvent;
+use OCP\AppFramework\Http\TemplateResponse;
+use OCP\EventDispatcher\Event;
+use OCP\EventDispatcher\IEventListener;
+use OCP\Util;
+
+class LoadPublicViewerListener implements IEventListener {
+	public function handle(Event $event): void {
+		if (!$event instanceof BeforeTemplateRenderedEvent) {
+			return;
+		}
+
+		if ($event->getResponse()->getRenderAs() !== TemplateResponse::RENDER_AS_PUBLIC) {
+			return;
+		}
+
+		Util::addScript(Application::APPNAME, 'richdocuments-public');
+	}
+}
diff --git a/lib/Preview/Office.php b/lib/Preview/Office.php
index daaa30328d..351e2b008d 100644
--- a/lib/Preview/Office.php
+++ b/lib/Preview/Office.php
@@ -25,7 +25,6 @@
 use OCA\Richdocuments\Capabilities;
 use OCP\Files\File;
 use OCP\Http\Client\IClientService;
-use OCP\IImage;
 use OCP\Image;
 use OCP\Preview\IProviderV2;
 use Psr\Log\LoggerInterface;
@@ -47,7 +46,7 @@ public function isAvailable(\OCP\Files\FileInfo $file): bool {
 	/**
 	 * {@inheritDoc}
 	 */
-	public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
+	public function getThumbnail(File $file, int $maxX, int $maxY): Image|null {
 		if ($file->getSize() === 0) {
 			return null;
 		}
diff --git a/lib/Service/CapabilitiesService.php b/lib/Service/CapabilitiesService.php
index 6edf8aa6c9..e6bfb25618 100644
--- a/lib/Service/CapabilitiesService.php
+++ b/lib/Service/CapabilitiesService.php
@@ -148,7 +148,7 @@ public function getCapabilitiesEndpoint(): ?string {
 		return rtrim($remoteHost, '/') . '/hosting/capabilities';
 	}
 
-	public function fetchFromRemote($throw = false): void {
+	public function fetchFromRemote(bool $throw = false): void {
 		if (!$this->getCapabilitiesEndpoint()) {
 			return;
 		}
diff --git a/lib/Service/DemoService.php b/lib/Service/DemoService.php
index 01f9512cba..721189b6b2 100644
--- a/lib/Service/DemoService.php
+++ b/lib/Service/DemoService.php
@@ -41,7 +41,7 @@ public function __construct(ICache $cache, IClientService $clientService) {
 		$this->clientService = $clientService;
 	}
 
-	public function fetchDemoServers($refresh = false) {
+	public function fetchDemoServers(bool $refresh = false) {
 		$servers = $this->cache->get('richdocuments-demo');
 		if (!$refresh) {
 			return json_decode($servers, true);
diff --git a/lib/Service/FederationService.php b/lib/Service/FederationService.php
index ca3caae5cc..0e95b5e91d 100644
--- a/lib/Service/FederationService.php
+++ b/lib/Service/FederationService.php
@@ -95,7 +95,7 @@ public function getTrustedServers(): array {
 	 * @return string
 	 * @throws \Exception
 	 */
-	public function getRemoteCollaboraURL($remote) {
+	public function getRemoteCollaboraURL(string $remote) {
 		// If no protocol is provided we default to https
 		if (strpos($remote, 'http://') !== 0 && strpos($remote, 'https://') !== 0) {
 			$remote = 'https://' . $remote;
@@ -122,7 +122,7 @@ public function getRemoteCollaboraURL($remote) {
 		return '';
 	}
 
-	public function isTrustedRemote($domainWithPort) {
+	public function isTrustedRemote(string $domainWithPort) {
 		if (strpos($domainWithPort, 'http://') === 0 || strpos($domainWithPort, 'https://') === 0) {
 			$port = parse_url($domainWithPort, PHP_URL_PORT);
 			$domainWithPort = parse_url($domainWithPort, PHP_URL_HOST) . ($port ? ':' . $port : '');
diff --git a/lib/Service/FileTargetService.php b/lib/Service/FileTargetService.php
index 14a9b4fb3b..789fb66c6a 100644
--- a/lib/Service/FileTargetService.php
+++ b/lib/Service/FileTargetService.php
@@ -78,7 +78,7 @@ public function getFileTargets(File $file): array {
 		return $categories;
 	}
 
-	public function getTargetPreview($file, $target) {
+	public function getTargetPreview(File $file, string $target) {
 		return $this->remoteService->fetchTargetThumbnail($file, $target);
 	}
 
diff --git a/lib/Service/FontService.php b/lib/Service/FontService.php
index 99b8ea7d3a..3d818ba63a 100644
--- a/lib/Service/FontService.php
+++ b/lib/Service/FontService.php
@@ -149,8 +149,10 @@ static function (ISimpleFile $f) use ($url) {
 
 	/**
 	 * @param string $fileName
-	 * @param $newFileResource
+	 * @param resource $newFileResource
+	 *
 	 * @return array
+	 *
 	 * @throws \OCP\Files\NotPermittedException
 	 */
 	public function uploadFontFile(string $fileName, $newFileResource): array {
diff --git a/lib/Service/RemoteService.php b/lib/Service/RemoteService.php
index fff74edb6f..4385a24964 100644
--- a/lib/Service/RemoteService.php
+++ b/lib/Service/RemoteService.php
@@ -20,7 +20,7 @@ public function __construct(
 	) {
 	}
 
-	public function fetchTargets($file): array {
+	public function fetchTargets(File $file): array {
 		$client = $this->clientService->newClient();
 		try {
 			$response = $client->put(
diff --git a/lib/Template/CollaboraTemplateProvider.php b/lib/Template/CollaboraTemplateProvider.php
index 07e9906007..3c0666cc87 100644
--- a/lib/Template/CollaboraTemplateProvider.php
+++ b/lib/Template/CollaboraTemplateProvider.php
@@ -52,6 +52,11 @@ public function getTemplateType(): string {
 		return CollaboraTemplateProvider::class;
 	}
 
+	/**
+	 * @return Template[]
+	 *
+	 * @psalm-return array<Template>
+	 */
 	public function getCustomTemplates(string $mimetype): array {
 		if (in_array($mimetype, TemplateManager::MIMES_DOCUMENTS)) {
 			$type = 'document';
diff --git a/lib/TemplateManager.php b/lib/TemplateManager.php
index 823c41ceb0..091414f4f6 100644
--- a/lib/TemplateManager.php
+++ b/lib/TemplateManager.php
@@ -189,9 +189,11 @@ public function get(int $fileId) {
 
 	/**
 	 * @param File[] $templates
+	 * @param null|string $type
+	 *
 	 * @return File[]
 	 */
-	private function filterTemplates($templates, $type = null) {
+	private function filterTemplates($templates, string|null $type = null) {
 		return array_filter($templates, function (Node $templateFile) use ($type) {
 			if (!($templateFile instanceof File)) {
 				return false;
@@ -219,7 +221,10 @@ public function getTemplateTypeForExtension(string $extension): ?string {
 		return null;
 	}
 
-	public function getEmpty($type = null) {
+	/**
+	 * @param null|string $type
+	 */
+	public function getEmpty(string|null $type = null) {
 		$folder = $this->getEmptyTemplateDir();
 
 		$templateFiles = $folder->getDirectoryListing();
@@ -261,8 +266,10 @@ public function updateEmptyTemplates() {
 	 * Get all global templates
 	 *
 	 * @return File[]
+	 *
+	 * @param null|string $type
 	 */
-	public function getSystem($type = null) {
+	public function getSystem(string|null $type = null) {
 		if ($this->userId === null && $this->config->getAppValue(Application::APPNAME, 'template_public', 'yes') !== 'yes') {
 			return [];
 		}
@@ -274,8 +281,10 @@ public function getSystem($type = null) {
 
 	/**
 	 * @return array
+	 *
+	 * @param null|string $type
 	 */
-	public function getSystemFormatted($type = null) {
+	public function getSystemFormatted(string|null $type = null) {
 		$empty = $this->getEmpty($type);
 		$system = $this->getSystem($type);
 
@@ -294,8 +303,10 @@ public function getSystemFormatted($type = null) {
 	 * Get all user templates
 	 *
 	 * @return File[]
+	 *
+	 * @param null|string $type
 	 */
-	public function getUser($type = null) {
+	public function getUser(string|null $type = null) {
 		if ($this->userId === null) {
 			return [];
 		}
@@ -313,7 +324,7 @@ public function getUser($type = null) {
 	/**
 	 * @return array
 	 */
-	public function getUserFormatted($type) {
+	public function getUserFormatted(string $type) {
 		if ($this->userId === null) {
 			return [];
 		}
@@ -330,7 +341,7 @@ public function getUserFormatted($type) {
 	 *
 	 * @return File[]
 	 */
-	public function getAll($type = 'document') {
+	public function getAll(string $type = 'document') {
 		if (!array_key_exists($type, self::$tplTypes)) {
 			return [];
 		}
@@ -348,7 +359,7 @@ public function getAll($type = 'document') {
 		}));
 	}
 
-	public function getAllFormatted($type) {
+	public function getAllFormatted(string $type) {
 		if (!array_key_exists($type, self::$tplTypes)) {
 			return [];
 		}
@@ -482,7 +493,7 @@ public function formatNodeReturn(File $template) {
 		];
 	}
 
-	public function isTemplate($fileId) {
+	public function isTemplate(int $fileId) {
 		$empty = $this->getEmpty();
 		$system = $this->getSystem();
 		$user = $this->getUser();
@@ -509,7 +520,10 @@ public function formatEmpty(File $template) {
 		];
 	}
 
-	public function isValidTemplateMime($mime, $type = null) {
+	/**
+	 * @param null|string $type
+	 */
+	public function isValidTemplateMime(string $mime, string|null $type = null) {
 		if ($type === null) {
 			$allMimes = array_merge(self::$tplTypes['document'], self::$tplTypes['spreadsheet'], self::$tplTypes['presentation'], self::$tplTypes['drawing']);
 			if (!in_array($mime, $allMimes)) {
@@ -564,7 +578,12 @@ public function setTemplateSource(int $fileId, int $templateId): void {
 		}
 	}
 
-	public function getTemplateSource(int $fileId): ?File {
+	/**
+	 * @return File|Node[]|null
+	 *
+	 * @psalm-return File|array<Node>|null
+	 */
+	public function getTemplateSource(int $fileId): array|File|null {
 		$templateId = 0;
 		try {
 			$query = $this->db->getQueryBuilder();
diff --git a/lib/TokenManager.php b/lib/TokenManager.php
index f026bbb977..6a3fd37f71 100644
--- a/lib/TokenManager.php
+++ b/lib/TokenManager.php
@@ -259,7 +259,11 @@ public function generateWopiTokenForTemplate(File $templateFile, ?string $userId
 			false, $direct, $templateFile->getId());
 	}
 
-	public function newInitiatorToken($sourceServer, ?Node $node = null, $shareToken = null, bool $direct = false, $userId = null): Wopi {
+	/**
+	 * @param null|string $shareToken
+	 * @param null|string $userId
+	 */
+	public function newInitiatorToken(string $sourceServer, ?Node $node = null, string|null $shareToken = null, bool $direct = false, string|null $userId = null): Wopi {
 		if ($node !== null) {
 			$wopi = $this->generateWopiToken((string)$node->getId(), $shareToken, $userId, $direct);
 			$wopi->setServerHost($sourceServer);
diff --git a/src/document.js b/src/document.js
index f5e68db3bb..dd43977ab6 100644
--- a/src/document.js
+++ b/src/document.js
@@ -175,11 +175,11 @@ const documentsMain = {
 	UI: {
 		/* Editor wrapper HTML */
 		container: '<div id="mainContainer" class="claro">'
-					+ '</div>',
+            + '</div>',
 
 		viewContainer: '<div id="revViewerContainer" class="claro">'
-						+ '<div id="revViewer"></div>'
-						+ '</div>',
+            + '<div id="revViewer"></div>'
+            + '</div>',
 
 		showViewer(fileId, title) {
 			// remove previous viewer, if open, and set a new one
@@ -196,14 +196,14 @@ const documentsMain = {
 
 			// form to post the access token for WOPISrc
 			const form = '<form id="loleafletform_viewer" name="loleafletform_viewer" target="loleafletframe_viewer" action="' + urlsrc + '" method="post">'
-				+ '<input name="access_token" value="' + accessToken + '" type="hidden"/>'
-				+ '<input name="access_token_ttl" value="' + accessTokenTtl + '" type="hidden"/>'
-				+ '<input name="ui_defaults" value="' + getUIDefaults() + '" type="hidden"/>'
-				+ '<input name="css_variables" value="' + generateCSSVarTokens() + '" type="hidden"/>'
-				+ '<input name="theme" value="' + getCollaboraTheme() + '" type="hidden"/>'
-				// buy product for new customer users
-				+ '<input name="buy_product" value="https://nextcloud.com/pricing" type="hidden"/>'
-				+ '</form>'
+                + '<input name="access_token" value="' + accessToken + '" type="hidden"/>'
+                + '<input name="access_token_ttl" value="' + accessTokenTtl + '" type="hidden"/>'
+                + '<input name="ui_defaults" value="' + getUIDefaults() + '" type="hidden"/>'
+                + '<input name="css_variables" value="' + generateCSSVarTokens() + '" type="hidden"/>'
+                + '<input name="theme" value="' + getCollaboraTheme() + '" type="hidden"/>'
+                // buy product for new customer users
+                + '<input name="buy_product" value="https://nextcloud.com/pricing" type="hidden"/>'
+                + '</form>'
 
 			// iframe that contains the Collabora Online Viewer
 			const frame = '<iframe data-cy="coolframe" id="loleafletframe" name="loleafletframe_viewer" allowfullscreen allow="clipboard-read *; clipboard-write *" nonce="' + btoa(getRequestToken()) + '" style="width:100%;height:100%;position:absolute;"/>'
@@ -256,14 +256,14 @@ const documentsMain = {
 
 			// form to post the access token for WOPISrc
 			const form = '<form id="loleafletform" name="loleafletform" target="loleafletframe" action="' + urlsrc + '" method="post">'
-				+ '<input name="access_token" value="' + accessToken + '" type="hidden"/>'
-				+ '<input name="access_token_ttl" value="' + accessTokenTtl + '" type="hidden"/>'
-				+ '<input name="ui_defaults" value="' + getUIDefaults() + '" type="hidden"/>'
-				+ '<input name="css_variables" value="' + generateCSSVarTokens() + '" type="hidden"/>'
-				+ '<input name="theme" value="' + getCollaboraTheme() + '" type="hidden"/>'
-				// buy product for new customer users
-				+ '<input name="buy_product" value="https://nextcloud.com/pricing" type="hidden"/>'
-				+ '</form>'
+                + '<input name="access_token" value="' + accessToken + '" type="hidden"/>'
+                + '<input name="access_token_ttl" value="' + accessTokenTtl + '" type="hidden"/>'
+                + '<input name="ui_defaults" value="' + getUIDefaults() + '" type="hidden"/>'
+                + '<input name="css_variables" value="' + generateCSSVarTokens() + '" type="hidden"/>'
+                + '<input name="theme" value="' + getCollaboraTheme() + '" type="hidden"/>'
+                // buy product for new customer users
+                + '<input name="buy_product" value="https://nextcloud.com/pricing" type="hidden"/>'
+                + '</form>'
 
 			// iframe that contains the Collabora Online
 			const frame = '<iframe data-cy="coolframe" id="loleafletframe" name="loleafletframe" nonce="' + btoa(getRequestToken()) + '" scrolling="no" allowfullscreen allow="clipboard-read *; clipboard-write *" style="width:100%;height:100%;position:absolute;" />'
diff --git a/src/files.js b/src/files.js
index c3b3dc2dea..5546bddcf1 100644
--- a/src/files.js
+++ b/src/files.js
@@ -260,8 +260,6 @@ addEventListener('DOMContentLoaded', () => {
 		return
 	}
 
-	odfViewer.onEdit(document.getElementById('filename').value)
-
 	PostMessages.registerPostMessageHandler(({ parsed }) => {
 		console.debug('[viewer] Received post message', parsed)
 		const { msgId, args, deprecated } = parsed
diff --git a/src/helpers/isDocument.js b/src/helpers/isDocument.js
new file mode 100644
index 0000000000..a9814bbe18
--- /dev/null
+++ b/src/helpers/isDocument.js
@@ -0,0 +1,17 @@
+import { getCapabilities } from '@nextcloud/capabilities'
+
+/** @type Array.<String> */
+const mimetypes = getCapabilities().richdocuments.mimetypes
+
+/**
+ * Determines if the mimetype of the resource is supported by richdocuments
+ * @return {boolean}
+ */
+function isDocument() {
+	/** @type HTMLInputElement */
+	const mimetypeElement = document.getElementById('mimetype')
+
+	return Boolean(mimetypeElement) && mimetypes.includes(mimetypeElement.value)
+}
+
+export default isDocument
diff --git a/src/helpers/isPublicPage.js b/src/helpers/isPublicPage.js
new file mode 100644
index 0000000000..1aead4ba7d
--- /dev/null
+++ b/src/helpers/isPublicPage.js
@@ -0,0 +1,12 @@
+/**
+ * Determines if the resource is a public share
+ * @return {boolean}
+ */
+function isPublic() {
+	/** @type HTMLInputElement */
+	const publicElement = document.getElementById('isPublic')
+
+	return Boolean(publicElement) && publicElement.value === '1'
+}
+
+export default isPublic
diff --git a/src/public.js b/src/public.js
new file mode 100644
index 0000000000..8ef79b679e
--- /dev/null
+++ b/src/public.js
@@ -0,0 +1,17 @@
+import isPublic from './helpers/isPublicPage.js'
+import isDocument from './helpers/isDocument.js'
+
+document.addEventListener('DOMContentLoaded', () => {
+
+	// Public share, but not a supported mimetype - do nothing
+	if (isPublic() && !isDocument()) {
+		return
+	}
+
+	// Public share, and is a supported mimetype - open viewer
+	if (isPublic() && isDocument()) {
+		if (OCA.Viewer) {
+			OCA.Viewer.open({ path: '/' })
+		}
+	}
+})
diff --git a/src/view/Office.vue b/src/view/Office.vue
index 94dad8ad76..d6e5386300 100644
--- a/src/view/Office.vue
+++ b/src/view/Office.vue
@@ -235,6 +235,7 @@ export default {
 		this.postMessage = new PostMessageService({
 			FRAME_DOCUMENT: () => document.getElementById(this.iframeId).contentWindow,
 		})
+
 		try {
 			await checkCollaboraConfiguration()
 			await checkProxyStatus()
@@ -261,7 +262,7 @@ export default {
 		}
 		this.postMessage.registerPostMessageHandler(this.postMessageHandler)
 
-		this.load()
+		await this.load()
 	},
 	beforeDestroy() {
 		this.postMessage.unregisterPostMessageHandler(this.postMessageHandler)
@@ -277,6 +278,7 @@ export default {
 			const { data } = await axios.post(generateUrl('/apps/richdocuments/token'), {
 				fileId: fileid, shareToken: this.shareToken, version,
 			})
+
 			Config.update('urlsrc', data.urlSrc)
 			Config.update('wopi_callback_url', loadState('richdocuments', 'wopi_callback_url', ''))
 
diff --git a/templates/documents.php b/templates/documents.php
index 11a7312c73..c78ce67fd5 100644
--- a/templates/documents.php
+++ b/templates/documents.php
@@ -1,5 +1,5 @@
 <?php
-script('richdocuments', 'richdocuments-document');
+script('richdocuments', 'richdocuments-document')
 ?>
 <div id="loadingContainer"></div>
 <div id="proxyLoadingContainer">
diff --git a/webpack.js b/webpack.js
index efbf132d0d..dd5a0102e6 100644
--- a/webpack.js
+++ b/webpack.js
@@ -11,6 +11,7 @@ webpackConfig.entry = {
 	admin: path.join(__dirname, 'src', 'admin.js'),
 	personal: path.join(__dirname, 'src', 'personal.js'),
 	reference: path.join(__dirname, 'src', 'reference.js'),
+	public: path.join(__dirname, 'src', 'public.js'),
 }
 
 webpackRules.RULE_JS.test = /\.m?js$/