diff --git a/.github/codecov.yml b/.github/codecov.yml
index ddf2c04..6e40e6e 100644
--- a/.github/codecov.yml
+++ b/.github/codecov.yml
@@ -1,2 +1,2 @@
 fixes:
-    - "/phpBB3/phpBB/ext/vse/lightbox/::"
+    - "/phpBB3/phpBB/ext/phpbb/lightbox/::"
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 642a6d4..b30137e 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -7,7 +7,7 @@ jobs:
         name: Extension tests
         uses: phpbb-extensions/test-framework/.github/workflows/tests.yml@master
         with:
-            EXTNAME: vse/lightbox # Your extension vendor/package name
+            EXTNAME: phpbb/lightbox # Your extension vendor/package name
             CODECOV: 1           # Run code coverage via codecov? 1 or 0
         secrets:
             CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} # Do not change this
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ec0f57..6e4c8c4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,12 @@
-## Changelog
+# Changelog
+
+## phpBB 4.x Releases (phpbb/lightbox)
+
+### 3.0.0-dev
+
+- Fork of vse/lightbox rebranded as an official phpBB extension for phpBB 4
+
+## phpBB 3.x Releases (vse/lightbox)
 
 ### 2.0.4 - 2022-06-16
 
diff --git a/README.md b/README.md
index 2622206..fa77a7f 100644
--- a/README.md
+++ b/README.md
@@ -1,32 +1,18 @@
-# Lightbox extension for phpBB
+# phpBB Image Lightbox for phpBB 4
 
 This extension adds the [Lightbox 2](http://lokeshdhakar.com/projects/lightbox2/) jQuery plugin to phpBB. It will resize posted images to a maximum set width and/or height and display them full-screen in a Lightbox overlay effect.
 
-[![Build Status](https://github.com/iMattPro/lightbox/actions/workflows/tests.yml/badge.svg)](https://github.com/iMattPro/lightbox/actions)
-[![codecov](https://codecov.io/gh/iMattPro/lightbox/branch/master/graph/badge.svg?token=YnBuha7JFN)](https://codecov.io/gh/iMattPro/lightbox)
-[![Latest Stable Version](https://poser.pugx.org/vse/lightbox/v/stable)](https://www.phpbb.com/customise/db/extension/lightbox/)
+[![Build Status](https://github.com/phpbb-extensions/lightbox/actions/workflows/tests.yml/badge.svg)](https://github.com/phpbb-extensions/lightbox/actions)
+[![codecov](https://codecov.io/gh/phpbb-extensions/lightbox/branch/master/graph/badge.svg?token=YnBuha7JFN)](https://codecov.io/gh/phpbb-extensions/lightbox)
 
 ## Minimum Requirements
-* phpBB 3.2.0
-* PHP 5.4
-
-## Install
-1. [Download the latest release](https://www.phpbb.com/customise/db/extension/lightbox/) and unzip it.
-2. Unzip the downloaded release and copy it to the `ext` directory of your phpBB board.
-3. Navigate in the ACP to `Customise -> Manage extensions`.
-4. Look for `Lightbox` under the Disabled Extensions list and click its `Enable` link.
+* phpBB 4.0.0
+* PHP 8.1
 
 ## Usage
 1. Navigate in the ACP to `Post settings -> Lightbox image resizing`.
 2. Set the `Maximum image width in pixel` to your desired resize width.
 3. Click `Submit`.
 
-## Uninstall
-1. Navigate in the ACP to `Customise -> Manage extensions`.
-2. Click the `Disable` link for Lightbox.
-3. To permanently uninstall, click `Delete Data`, then delete the `lightbox` folder from `phpBB/ext/vse/`.
-
 ## License
 [GNU General Public License v2](https://opensource.org/licenses/GPL-2.0)
-
-© 2014 - Matt Friedman
diff --git a/build.xml b/build.xml
index 2b355cc..3683f76 100644
--- a/build.xml
+++ b/build.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="Lightbox" description="Builds an extension.zip from a git repository" default="all">
-	<property name="vendor-name" value="vse" />
+<project name="phpBB Image Lightbox" description="Builds an extension.zip from a git repository" default="all">
+	<property name="vendor-name" value="phpbb" />
 	<property name="extension-name" value="lightbox" />
 	<!--
 	Only set this to "true" if you have dependencies in the composer.json,
diff --git a/composer.json b/composer.json
index 0350c9f..ab0fba7 100644
--- a/composer.json
+++ b/composer.json
@@ -1,9 +1,9 @@
 {
-	"name": "vse/lightbox",
+	"name": "phpbb/lightbox",
 	"type": "phpbb-extension",
 	"description": "Lightbox for phpBB can resize posted images to a maximum set height/width and display them full-screen in an elegant Lightbox overlay effect.",
-	"homepage": "https://github.com/iMattPro/lightbox",
-	"version": "2.1.0-dev",
+	"homepage": "https://www.phpbb.com/",
+	"version": "3.0.0-dev",
 	"keywords": ["phpbb", "extension", "lightbox", "image", "resizer"],
 	"license": "GPL-2.0-only",
 	"authors": [
@@ -18,16 +18,10 @@
 		"composer/installers": "^1.0 || ^2.0"
 	},
 	"extra": {
-		"display-name": "Lightbox",
+		"display-name": "phpBB Image Lightbox",
 		"soft-require": {
 			"phpbb/phpbb": ">=4.0.0@dev"
 		},
-		"version-check": {
-			"host": "www.phpbb.com",
-			"directory": "/customise/db/extension/lightbox",
-			"filename": "version_check",
-			"ssl": true
-		},
 		"branch-alias": {
 			"dev-dev/4.0": "2.1.x-dev"
 		}
diff --git a/config/services.yml b/config/services.yml
index f1cf82a..d252ce4 100644
--- a/config/services.yml
+++ b/config/services.yml
@@ -1,6 +1,6 @@
 services:
-    vse.lightbox.listener:
-        class: vse\lightbox\event\listener
+    phpbb.lightbox.listener:
+        class: phpbb\lightbox\event\listener
         arguments:
             - '@config'
             - '@language'
diff --git a/event/listener.php b/event/listener.php
index 292e079..ac8a39a 100644
--- a/event/listener.php
+++ b/event/listener.php
@@ -3,12 +3,12 @@
  *
  * Lightbox extension for the phpBB Forum Software package.
  *
- * @copyright (c) 2014 Matt Friedman
+ * @copyright (c) 2014 Matt Friedman, phpBB Limited <https://www.phpbb.com>
  * @license GNU General Public License, version 2 (GPL-2.0)
  *
  */
 
-namespace vse\lightbox\event;
+namespace phpbb\lightbox\event;
 
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
@@ -69,7 +69,7 @@ public static function getSubscribedEvents()
 	 */
 	public function set_lightbox_tpl_data()
 	{
-		$this->language->add_lang('common', 'vse/lightbox');
+		$this->language->add_lang('common', 'phpbb/lightbox');
 		$this->template->assign_vars([
 			'LIGHTBOX_RESIZE_WIDTH'	 => (int) $this->config['lightbox_max_width'],
 			'LIGHTBOX_RESIZE_HEIGHT' => (int) $this->config['lightbox_max_height'],
@@ -92,7 +92,7 @@ public function add_lightbox_acp_config($event)
 	{
 		if ($event['mode'] === 'post' && array_key_exists('legend3', $event['display_vars']['vars']))
 		{
-			$this->language->add_lang('lightbox', 'vse/lightbox');
+			$this->language->add_lang('lightbox', 'phpbb/lightbox');
 
 			$max_width = $this->min_not_null($this->config['img_max_width'], (!empty($this->config['img_create_thumbnail']) ? $this->config['img_max_thumb_width'] : 0));
 			$l_append = $max_width ? $this->language->lang('LIGHTBOX_MAX_WIDTH_APPEND', $max_width) : '';
diff --git a/ext.php b/ext.php
index f0a5f92..748435e 100644
--- a/ext.php
+++ b/ext.php
@@ -3,12 +3,12 @@
  *
  * Lightbox extension for the phpBB Forum Software package.
  *
- * @copyright (c) 2018 Matt Friedman
+ * @copyright (c) 2025 Matt Friedman, phpBB Limited <https://www.phpbb.com>
  * @license GNU General Public License, version 2 (GPL-2.0)
  *
  */
 
-namespace vse\lightbox;
+namespace phpbb\lightbox;
 
 /**
  * Extension class for custom enable/disable/purge actions
@@ -23,6 +23,30 @@ class ext extends \phpbb\extension\base
 	 */
 	public function is_enableable()
 	{
-		return phpbb_version_compare(PHPBB_VERSION, self::PHPBB_MIN_VERSION, '>=');
+		$errors = [];
+
+		if (phpbb_version_compare(PHPBB_VERSION, self::PHPBB_MIN_VERSION, '<'))
+		{
+			$errors[] = 'PHPBB_VERSION_ERROR';
+		}
+
+		if ($this->container->get('ext.manager')->is_enabled('vse/lightbox'))
+		{
+			$errors[] = 'VSE_LIGHTBOX_ERROR';
+		}
+
+		if (empty($errors))
+		{
+			return true;
+		}
+
+		if (phpbb_version_compare(PHPBB_VERSION, '3.3.0-b1', '>='))
+		{
+			$language = $this->container->get('language');
+			$language->add_lang('install', 'phpbb/lightbox');
+			return array_map([$language, 'lang'], $errors);
+		}
+
+		return false;
 	}
 }
diff --git a/language/ar/common.php b/language/ar/common.php
index 9a9377b..b2cc0e3 100644
--- a/language/ar/common.php
+++ b/language/ar/common.php
@@ -4,7 +4,7 @@
  * Lightbox extension for the phpBB Forum Software package.
  * [Arabic] Translated By : Bassel Taha Alhitary <https://www.alhitary.net>
  *
- * @copyright (c) 2015 Matt Friedman
+ * @copyright (c) 2015 Matt Friedman, phpBB Limited <https://www.phpbb.com>
  * @license GNU General Public License, version 2 (GPL-2.0)
  *
  */
diff --git a/language/ar/lightbox.php b/language/ar/lightbox.php
index e808712..f9026a3 100644
--- a/language/ar/lightbox.php
+++ b/language/ar/lightbox.php
@@ -4,7 +4,7 @@
  * Lightbox extension for the phpBB Forum Software package.
  * [Arabic] Translated By : Bassel Taha Alhitary <https://www.alhitary.net>
  *
- * @copyright (c) 2015 Matt Friedman
+ * @copyright (c) 2015 Matt Friedman, phpBB Limited <https://www.phpbb.com>
  * @license GNU General Public License, version 2 (GPL-2.0)
  *
  */
diff --git a/language/cs/common.php b/language/cs/common.php
index fe06c5a..f44b7f7 100644
--- a/language/cs/common.php
+++ b/language/cs/common.php
@@ -4,7 +4,7 @@
  * Lightbox extension for the phpBB Forum Software package.
  * [Czech]
  *
- * @copyright (c) 2015 Matt Friedman
+ * @copyright (c) 2015 Matt Friedman, phpBB Limited <https://www.phpbb.com>
  * @license GNU General Public License, version 2 (GPL-2.0)
  *
  */
diff --git a/language/cs/lightbox.php b/language/cs/lightbox.php
index be8ca03..edd3e00 100644
--- a/language/cs/lightbox.php
+++ b/language/cs/lightbox.php
@@ -4,7 +4,7 @@
  * Lightbox extension for the phpBB Forum Software package.
  * [Czech]
  *
- * @copyright (c) 2015 Matt Friedman
+ * @copyright (c) 2015 Matt Friedman, phpBB Limited <https://www.phpbb.com>
  * @license GNU General Public License, version 2 (GPL-2.0)
  *
  */
diff --git a/language/de/common.php b/language/de/common.php
index 472507a..1defe1b 100644
--- a/language/de/common.php
+++ b/language/de/common.php
@@ -4,7 +4,7 @@
  * Lightbox extension for the phpBB Forum Software package.
  * [Gernman]
  *
- * @copyright (c) 2015 Matt Friedman
+ * @copyright (c) 2015 Matt Friedman, phpBB Limited <https://www.phpbb.com>
  * @license GNU General Public License, version 2 (GPL-2.0)
  *
  */
diff --git a/language/de/lightbox.php b/language/de/lightbox.php
index 1b87c53..b5c3c7b 100644
--- a/language/de/lightbox.php
+++ b/language/de/lightbox.php
@@ -4,7 +4,7 @@
  * Lightbox extension for the phpBB Forum Software package.
  * [Gernman]
  *
- * @copyright (c) 2015 Matt Friedman
+ * @copyright (c) 2015 Matt Friedman, phpBB Limited <https://www.phpbb.com>
  * @license GNU General Public License, version 2 (GPL-2.0)
  *
  */
diff --git a/language/en/common.php b/language/en/common.php
index f93326a..1d2a8a2 100644
--- a/language/en/common.php
+++ b/language/en/common.php
@@ -4,7 +4,7 @@
  * Lightbox extension for the phpBB Forum Software package.
  * [English]
  *
- * @copyright (c) 2015 Matt Friedman
+ * @copyright (c) 2015 Matt Friedman, phpBB Limited <https://www.phpbb.com>
  * @license GNU General Public License, version 2 (GPL-2.0)
  *
  */
diff --git a/language/en/install.php b/language/en/install.php
new file mode 100644
index 0000000..4fe755c
--- /dev/null
+++ b/language/en/install.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ *
+ * Lightbox extension for the phpBB Forum Software package.
+ *
+ * @copyright (c) 2025 Matt Friedman, phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ */
+
+/**
+ * DO NOT CHANGE
+ */
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = [];
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+//
+// Some characters you may want to copy&paste:
+// ’ » “ ” …
+//
+
+$lang = array_merge($lang, [
+	'PHPBB_VERSION_ERROR'	=> 'Your board appears to be using an older version of phpBB. phpBB ' . \phpbb\lightbox\ext::PHPBB_MIN_VERSION . ' or newer is required to use this extension.',
+	'VSE_LIGHTBOX_ERROR'	=> 'We detected the vse/lightbox extension. phpBB’s official Lightbox extension can not be installed until you disable, purge and delete all files related to the vse/lightbox extension.',
+]);
diff --git a/language/en/lightbox.php b/language/en/lightbox.php
index 7b2920b..296bd62 100644
--- a/language/en/lightbox.php
+++ b/language/en/lightbox.php
@@ -4,7 +4,7 @@
  * Lightbox extension for the phpBB Forum Software package.
  * [English]
  *
- * @copyright (c) 2015 Matt Friedman
+ * @copyright (c) 2015 Matt Friedman, phpBB Limited <https://www.phpbb.com>
  * @license GNU General Public License, version 2 (GPL-2.0)
  *
  */
diff --git a/language/es/common.php b/language/es/common.php
index 9476bba..7dc5efd 100644
--- a/language/es/common.php
+++ b/language/es/common.php
@@ -4,7 +4,7 @@
  * Lightbox extension for the phpBB Forum Software package.
  * [Spanish] Translation by phpbb-es
  *
- * @copyright (c) 2015 Matt Friedman
+ * @copyright (c) 2015 Matt Friedman, phpBB Limited <https://www.phpbb.com>
  * @license GNU General Public License, version 2 (GPL-2.0)
  *
  */
diff --git a/language/es/lightbox.php b/language/es/lightbox.php
index 01bf517..da8a303 100644
--- a/language/es/lightbox.php
+++ b/language/es/lightbox.php
@@ -4,7 +4,7 @@
  * Lightbox extension for the phpBB Forum Software package.
  * [Spanish] Translation by phpbb-es
  *
- * @copyright (c) 2015 Matt Friedman
+ * @copyright (c) 2015 Matt Friedman, phpBB Limited <https://www.phpbb.com>
  * @license GNU General Public License, version 2 (GPL-2.0)
  *
  */
diff --git a/language/fr/common.php b/language/fr/common.php
index 3682db1..80b9771 100644
--- a/language/fr/common.php
+++ b/language/fr/common.php
@@ -4,7 +4,7 @@
  * Lightbox extension for the phpBB Forum Software package.
  * [French] translation by Galixte (http://www.galixte.com)
  *
- * @copyright (c) 2015 Matt Friedman
+ * @copyright (c) 2015 Matt Friedman, phpBB Limited <https://www.phpbb.com>
  * @license GNU General Public License, version 2 (GPL-2.0)
  *
  */
diff --git a/language/fr/lightbox.php b/language/fr/lightbox.php
index 9e144df..815e28e 100644
--- a/language/fr/lightbox.php
+++ b/language/fr/lightbox.php
@@ -4,7 +4,7 @@
  * Lightbox extension for the phpBB Forum Software package.
  * [French] translation by Galixte (http://www.galixte.com)
  *
- * @copyright (c) 2015 Matt Friedman
+ * @copyright (c) 2015 Matt Friedman, phpBB Limited <https://www.phpbb.com>
  * @license GNU General Public License, version 2 (GPL-2.0)
  *
  */
diff --git a/language/it/common.php b/language/it/common.php
index 9e56b95..37ab546 100644
--- a/language/it/common.php
+++ b/language/it/common.php
@@ -4,7 +4,7 @@
  * Lightbox extension for the phpBB Forum Software package.
  * [Italian] Translation by Mauron and alex75 https://phpbb-store.it
  *
- * @copyright (c) 2015 Matt Friedman
+ * @copyright (c) 2015 Matt Friedman, phpBB Limited <https://www.phpbb.com>
  * @license GNU General Public License, version 2 (GPL-2.0)
  *
  */
diff --git a/language/it/lightbox.php b/language/it/lightbox.php
index 2e310d8..6e90f33 100644
--- a/language/it/lightbox.php
+++ b/language/it/lightbox.php
@@ -4,7 +4,7 @@
  * Lightbox extension for the phpBB Forum Software package.
  * [Italian] Translation by Mauron and alex75 https://phpbb-store.it
  *
- * @copyright (c) 2015 Matt Friedman
+ * @copyright (c) 2015 Matt Friedman, phpBB Limited <https://www.phpbb.com>
  * @license GNU General Public License, version 2 (GPL-2.0)
  *
  */
diff --git a/language/ja/common.php b/language/ja/common.php
index a4e4857..0201a08 100644
--- a/language/ja/common.php
+++ b/language/ja/common.php
@@ -4,7 +4,7 @@
  * Lightbox extension for the phpBB Forum Software package.
  * [Japanese] Translation by momo-i.
  *
- * @copyright (c) 2015 Matt Friedman
+ * @copyright (c) 2015 Matt Friedman, phpBB Limited <https://www.phpbb.com>
  * @license GNU General Public License, version 2 (GPL-2.0)
  *
  */
diff --git a/language/ja/lightbox.php b/language/ja/lightbox.php
index 19bf479..7c90538 100644
--- a/language/ja/lightbox.php
+++ b/language/ja/lightbox.php
@@ -4,7 +4,7 @@
  * Lightbox extension for the phpBB Forum Software package.
  * [Japanese] Translation by momo-i.
  *
- * @copyright (c) 2015 Matt Friedman
+ * @copyright (c) 2015 Matt Friedman, phpBB Limited <https://www.phpbb.com>
  * @license GNU General Public License, version 2 (GPL-2.0)
  *
  */
diff --git a/language/nl/common.php b/language/nl/common.php
index d562ffa..f4b13c3 100644
--- a/language/nl/common.php
+++ b/language/nl/common.php
@@ -4,7 +4,7 @@
  * Lightbox extension for the phpBB Forum Software package.
  * [Dutch] Translation by Derky <http://www.derky.nl>
  *
- * @copyright (c) 2015 Matt Friedman
+ * @copyright (c) 2015 Matt Friedman, phpBB Limited <https://www.phpbb.com>
  * @license GNU General Public License, version 2 (GPL-2.0)
  *
  */
diff --git a/language/nl/lightbox.php b/language/nl/lightbox.php
index 78c05f4..5232464 100644
--- a/language/nl/lightbox.php
+++ b/language/nl/lightbox.php
@@ -4,7 +4,7 @@
  * Lightbox extension for the phpBB Forum Software package.
  * [Dutch] translated by Dutch Translators (https://github.com/dutch-translators)
  *
- * @copyright (c) 2015 Matt Friedman
+ * @copyright (c) 2015 Matt Friedman, phpBB Limited <https://www.phpbb.com>
  * @license GNU General Public License, version 2 (GPL-2.0)
  *
  */
diff --git a/language/pl/common.php b/language/pl/common.php
index 6d00992..3c02d3d 100644
--- a/language/pl/common.php
+++ b/language/pl/common.php
@@ -4,7 +4,7 @@
  * Lightbox extension for the phpBB Forum Software package.
  * [Polish] translation by HPK.
  *
- * @copyright (c) 2015 Matt Friedman
+ * @copyright (c) 2015 Matt Friedman, phpBB Limited <https://www.phpbb.com>
  * @license GNU General Public License, version 2 (GPL-2.0)
  *
  */
diff --git a/language/pl/lightbox.php b/language/pl/lightbox.php
index 0db577e..bdccb04 100644
--- a/language/pl/lightbox.php
+++ b/language/pl/lightbox.php
@@ -4,7 +4,7 @@
  * Lightbox extension for the phpBB Forum Software package.
  * [Polish] translation by HPK.
  *
- * @copyright (c) 2015 Matt Friedman
+ * @copyright (c) 2015 Matt Friedman, phpBB Limited <https://www.phpbb.com>
  * @license GNU General Public License, version 2 (GPL-2.0)
  *
  */
diff --git a/language/pt_br/common.php b/language/pt_br/common.php
index a035200..7e800bb 100644
--- a/language/pt_br/common.php
+++ b/language/pt_br/common.php
@@ -4,7 +4,7 @@
  * Lightbox extension for the phpBB Forum Software package.
  * [Brazilian Portuguese]
  *
- * @copyright (c) 2015 Matt Friedman
+ * @copyright (c) 2015 Matt Friedman, phpBB Limited <https://www.phpbb.com>
  * @license GNU General Public License, version 2 (GPL-2.0)
  *
  */
diff --git a/language/pt_br/lightbox.php b/language/pt_br/lightbox.php
index 446fdd6..7273fd6 100644
--- a/language/pt_br/lightbox.php
+++ b/language/pt_br/lightbox.php
@@ -4,7 +4,7 @@
  * Lightbox extension for the phpBB Forum Software package.
  * [Brazilian Portuguese]
  *
- * @copyright (c) 2015 Matt Friedman
+ * @copyright (c) 2015 Matt Friedman, phpBB Limited <https://www.phpbb.com>
  * @license GNU General Public License, version 2 (GPL-2.0)
  *
  */
diff --git a/language/ru/common.php b/language/ru/common.php
index b60c4af..28bc847 100644
--- a/language/ru/common.php
+++ b/language/ru/common.php
@@ -7,7 +7,7 @@
  * You can found actual versions of phpBB extensions translation here:
  * http://hooleegan.ru/viewforum.php?f=25
  *
- * @copyright (c) 2015 Matt Friedman
+ * @copyright (c) 2015 Matt Friedman, phpBB Limited <https://www.phpbb.com>
  * @license GNU General Public License, version 2 (GPL-2.0)
  *
  */
diff --git a/language/ru/lightbox.php b/language/ru/lightbox.php
index cd9a5d9..ba9b2e6 100644
--- a/language/ru/lightbox.php
+++ b/language/ru/lightbox.php
@@ -7,7 +7,7 @@
  * You can found actual versions of phpBB extensions translation here:
  * http://hooleegan.ru/viewforum.php?f=25
  *
- * @copyright (c) 2015 Matt Friedman
+ * @copyright (c) 2015 Matt Friedman, phpBB Limited <https://www.phpbb.com>
  * @license GNU General Public License, version 2 (GPL-2.0)
  *
  */
diff --git a/language/sk/common.php b/language/sk/common.php
index d20feb3..fe69caf 100644
--- a/language/sk/common.php
+++ b/language/sk/common.php
@@ -4,7 +4,7 @@
  * Lightbox extension for the phpBB Forum Software package.
  * [Slovak]
  *
- * @copyright (c) 2015 Matt Friedman
+ * @copyright (c) 2015 Matt Friedman, phpBB Limited <https://www.phpbb.com>
  * @license GNU General Public License, version 2 (GPL-2.0)
  *
  */
diff --git a/language/sk/lightbox.php b/language/sk/lightbox.php
index 61f58cb..93698a7 100644
--- a/language/sk/lightbox.php
+++ b/language/sk/lightbox.php
@@ -4,7 +4,7 @@
  * Lightbox extension for the phpBB Forum Software package.
  * [Slovak]
  *
- * @copyright (c) 2015 Matt Friedman
+ * @copyright (c) 2015 Matt Friedman, phpBB Limited <https://www.phpbb.com>
  * @license GNU General Public License, version 2 (GPL-2.0)
  *
  */
diff --git a/language/sl/common.php b/language/sl/common.php
index 0d7ccc6..51513ee 100644
--- a/language/sl/common.php
+++ b/language/sl/common.php
@@ -4,7 +4,7 @@
  * Lightbox extension for the phpBB Forum Software package.
  * [Slovenian]
  *
- * @copyright (c) 2015 Matt Friedman
+ * @copyright (c) 2015 Matt Friedman, phpBB Limited <https://www.phpbb.com>
  * @license GNU General Public License, version 2 (GPL-2.0)
  *
  */
diff --git a/language/sl/lightbox.php b/language/sl/lightbox.php
index 007cfe2..38dd44e 100644
--- a/language/sl/lightbox.php
+++ b/language/sl/lightbox.php
@@ -4,7 +4,7 @@
  * Lightbox extension for the phpBB Forum Software package.
  * [Slovenian]
  *
- * @copyright (c) 2015 Matt Friedman
+ * @copyright (c) 2015 Matt Friedman, phpBB Limited <https://www.phpbb.com>
  * @license GNU General Public License, version 2 (GPL-2.0)
  *
  */
diff --git a/language/sv/common.php b/language/sv/common.php
index 9dceb49..faff9df 100644
--- a/language/sv/common.php
+++ b/language/sv/common.php
@@ -4,7 +4,7 @@
  * Lightbox extension for the phpBB Forum Software package.
  * [Swedish] translation by Holger (www.maskinisten.net)
  *
- * @copyright (c) 2015 Matt Friedman
+ * @copyright (c) 2015 Matt Friedman, phpBB Limited <https://www.phpbb.com>
  * @license GNU General Public License, version 2 (GPL-2.0)
  *
  */
diff --git a/language/sv/lightbox.php b/language/sv/lightbox.php
index 7c41e57..336db89 100644
--- a/language/sv/lightbox.php
+++ b/language/sv/lightbox.php
@@ -4,7 +4,7 @@
  * Lightbox extension for the phpBB Forum Software package.
  * [Swedish] translation by Holger (www.maskinisten.net)
  *
- * @copyright (c) 2015 Matt Friedman
+ * @copyright (c) 2015 Matt Friedman, phpBB Limited <https://www.phpbb.com>
  * @license GNU General Public License, version 2 (GPL-2.0)
  *
  */
diff --git a/language/tr/common.php b/language/tr/common.php
index e2883a5..59d9852 100644
--- a/language/tr/common.php
+++ b/language/tr/common.php
@@ -4,7 +4,7 @@
  * Lightbox extension for the phpBB Forum Software package.
  * [Turkish] translation by ESQARE (http://www.phpbbturkey.com) and pikachuturkey
  *
- * @copyright (c) 2015 Matt Friedman
+ * @copyright (c) 2015 Matt Friedman, phpBB Limited <https://www.phpbb.com>
  * @license GNU General Public License, version 2 (GPL-2.0)
  *
  */
diff --git a/language/tr/lightbox.php b/language/tr/lightbox.php
index ec68b97..534c826 100644
--- a/language/tr/lightbox.php
+++ b/language/tr/lightbox.php
@@ -4,7 +4,7 @@
  * Lightbox extension for the phpBB Forum Software package.
  * [Turkish] translation by ESQARE (http://www.phpbbturkey.com) and pikachuturkey
  *
- * @copyright (c) 2015 Matt Friedman
+ * @copyright (c) 2015 Matt Friedman, phpBB Limited <https://www.phpbb.com>
  * @license GNU General Public License, version 2 (GPL-2.0)
  *
  */
diff --git a/language/vi/common.php b/language/vi/common.php
index ea736e0..1e94e0b 100644
--- a/language/vi/common.php
+++ b/language/vi/common.php
@@ -4,7 +4,7 @@
  * Lightbox extension for the phpBB Forum Software package.
  * [Vietnamese] language pack <giaminhteam@gmail.com>
  *
- * @copyright (c) 2015 Matt Friedman
+ * @copyright (c) 2015 Matt Friedman, phpBB Limited <https://www.phpbb.com>
  * @license GNU General Public License, version 2 (GPL-2.0)
  *
  */
diff --git a/language/vi/lightbox.php b/language/vi/lightbox.php
index 7724975..bbf4cd4 100644
--- a/language/vi/lightbox.php
+++ b/language/vi/lightbox.php
@@ -4,7 +4,7 @@
  * Lightbox extension for the phpBB Forum Software package.
  * [Vietnamese] language pack <giaminhteam@gmail.com>
  *
- * @copyright (c) 2015 Matt Friedman
+ * @copyright (c) 2015 Matt Friedman, phpBB Limited <https://www.phpbb.com>
  * @license GNU General Public License, version 2 (GPL-2.0)
  *
  */
diff --git a/migrations/m1_add_configs.php b/migrations/m1_add_configs.php
index bd13738..3b188bc 100644
--- a/migrations/m1_add_configs.php
+++ b/migrations/m1_add_configs.php
@@ -3,12 +3,12 @@
  *
  * Lightbox extension for the phpBB Forum Software package.
  *
- * @copyright (c) 2015 Matt Friedman
+ * @copyright (c) 2015 Matt Friedman, phpBB Limited <https://www.phpbb.com>
  * @license GNU General Public License, version 2 (GPL-2.0)
  *
  */
 
-namespace vse\lightbox\migrations;
+namespace phpbb\lightbox\migrations;
 
 class m1_add_configs extends \phpbb\db\migration\migration
 {
diff --git a/migrations/m2_image_titles.php b/migrations/m2_image_titles.php
index 7f860ec..6ec3795 100644
--- a/migrations/m2_image_titles.php
+++ b/migrations/m2_image_titles.php
@@ -3,12 +3,12 @@
  *
  * Lightbox extension for the phpBB Forum Software package.
  *
- * @copyright (c) 2015 Matt Friedman
+ * @copyright (c) 2015 Matt Friedman, phpBB Limited <https://www.phpbb.com>
  * @license GNU General Public License, version 2 (GPL-2.0)
  *
  */
 
-namespace vse\lightbox\migrations;
+namespace phpbb\lightbox\migrations;
 
 class m2_image_titles extends \phpbb\db\migration\migration
 {
@@ -19,7 +19,7 @@ public function effectively_installed()
 
 	public static function depends_on()
 	{
-		return array('\vse\lightbox\migrations\m1_add_configs');
+		return array('\phpbb\lightbox\migrations\m1_add_configs');
 	}
 
 	public function update_data()
diff --git a/migrations/m3_add_configs.php b/migrations/m3_add_configs.php
index 5a69937..5fab750 100644
--- a/migrations/m3_add_configs.php
+++ b/migrations/m3_add_configs.php
@@ -3,12 +3,12 @@
  *
  * Lightbox extension for the phpBB Forum Software package.
  *
- * @copyright (c) 2018 Matt Friedman
+ * @copyright (c) 2018 Matt Friedman, phpBB Limited <https://www.phpbb.com>
  * @license GNU General Public License, version 2 (GPL-2.0)
  *
  */
 
-namespace vse\lightbox\migrations;
+namespace phpbb\lightbox\migrations;
 
 class m3_add_configs extends \phpbb\db\migration\migration
 {
@@ -19,7 +19,7 @@ public function effectively_installed()
 
 	public static function depends_on()
 	{
-		return array('\vse\lightbox\migrations\m1_add_configs');
+		return array('\phpbb\lightbox\migrations\m1_add_configs');
 	}
 
 	public function update_data()
diff --git a/package-lock.json b/package-lock.json
index 4f0f335..efcdb92 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -102,9 +102,9 @@
 			"dev": true
 		},
 		"node_modules/brace-expansion": {
-			"version": "1.1.11",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+			"version": "1.1.12",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+			"integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
 			"dev": true,
 			"dependencies": {
 				"balanced-match": "^1.0.0",
@@ -351,36 +351,36 @@
 			"dev": true
 		},
 		"node_modules/error-ex": {
-			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-			"integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+			"version": "1.3.4",
+			"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.4.tgz",
+			"integrity": "sha512-sqQamAnR14VgCr1A618A3sGrygcpK+HEbenA/HiEAkkUwcZIIB/tgWqHFxWgOyDh4nB4JCRimh79dR5Ywc9MDQ==",
 			"dev": true,
 			"dependencies": {
 				"is-arrayish": "^0.2.1"
 			}
 		},
 		"node_modules/es-abstract": {
-			"version": "1.23.9",
-			"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.9.tgz",
-			"integrity": "sha512-py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA==",
+			"version": "1.24.0",
+			"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.24.0.tgz",
+			"integrity": "sha512-WSzPgsdLtTcQwm4CROfS5ju2Wa1QQcVeT37jFjYzdFz1r9ahadC8B8/a4qxJxM+09F18iumCdRmlr96ZYkQvEg==",
 			"dev": true,
 			"dependencies": {
 				"array-buffer-byte-length": "^1.0.2",
 				"arraybuffer.prototype.slice": "^1.0.4",
 				"available-typed-arrays": "^1.0.7",
 				"call-bind": "^1.0.8",
-				"call-bound": "^1.0.3",
+				"call-bound": "^1.0.4",
 				"data-view-buffer": "^1.0.2",
 				"data-view-byte-length": "^1.0.2",
 				"data-view-byte-offset": "^1.0.1",
 				"es-define-property": "^1.0.1",
 				"es-errors": "^1.3.0",
-				"es-object-atoms": "^1.0.0",
+				"es-object-atoms": "^1.1.1",
 				"es-set-tostringtag": "^2.1.0",
 				"es-to-primitive": "^1.3.0",
 				"function.prototype.name": "^1.1.8",
-				"get-intrinsic": "^1.2.7",
-				"get-proto": "^1.0.0",
+				"get-intrinsic": "^1.3.0",
+				"get-proto": "^1.0.1",
 				"get-symbol-description": "^1.1.0",
 				"globalthis": "^1.0.4",
 				"gopd": "^1.2.0",
@@ -392,21 +392,24 @@
 				"is-array-buffer": "^3.0.5",
 				"is-callable": "^1.2.7",
 				"is-data-view": "^1.0.2",
+				"is-negative-zero": "^2.0.3",
 				"is-regex": "^1.2.1",
+				"is-set": "^2.0.3",
 				"is-shared-array-buffer": "^1.0.4",
 				"is-string": "^1.1.1",
 				"is-typed-array": "^1.1.15",
-				"is-weakref": "^1.1.0",
+				"is-weakref": "^1.1.1",
 				"math-intrinsics": "^1.1.0",
-				"object-inspect": "^1.13.3",
+				"object-inspect": "^1.13.4",
 				"object-keys": "^1.1.1",
 				"object.assign": "^4.1.7",
 				"own-keys": "^1.0.1",
-				"regexp.prototype.flags": "^1.5.3",
+				"regexp.prototype.flags": "^1.5.4",
 				"safe-array-concat": "^1.1.3",
 				"safe-push-apply": "^1.0.0",
 				"safe-regex-test": "^1.1.0",
 				"set-proto": "^1.0.0",
+				"stop-iteration-iterator": "^1.1.0",
 				"string.prototype.trim": "^1.2.10",
 				"string.prototype.trimend": "^1.0.9",
 				"string.prototype.trimstart": "^1.0.8",
@@ -415,7 +418,7 @@
 				"typed-array-byte-offset": "^1.0.4",
 				"typed-array-length": "^1.0.7",
 				"unbox-primitive": "^1.1.0",
-				"which-typed-array": "^1.1.18"
+				"which-typed-array": "^1.1.19"
 			},
 			"engines": {
 				"node": ">= 0.4"
@@ -992,6 +995,18 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
+		"node_modules/is-negative-zero": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz",
+			"integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
 		"node_modules/is-number-object": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.1.1.tgz",
@@ -1673,9 +1688,9 @@
 			}
 		},
 		"node_modules/shell-quote": {
-			"version": "1.8.2",
-			"resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.2.tgz",
-			"integrity": "sha512-AzqKpGKjrj7EM6rKVQEPpB288oCfnrEIuyoT9cyF4nmGa7V8Zk6f7RRqYisX8X9m+Q7bd632aZW4ky7EhbQztA==",
+			"version": "1.8.3",
+			"resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.3.tgz",
+			"integrity": "sha512-ObmnIF4hXNg1BqhnHmgbDETF8dLPCggZWBjkQfhZpbszZnYur5DUljTcCHii5LC3J5E0yeO/1LIMyH+UvHQgyw==",
 			"dev": true,
 			"engines": {
 				"node": ">= 0.4"
@@ -1783,11 +1798,24 @@
 			}
 		},
 		"node_modules/spdx-license-ids": {
-			"version": "3.0.21",
-			"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.21.tgz",
-			"integrity": "sha512-Bvg/8F5XephndSK3JffaRqdT+gyhfqIPwDHpX80tJrF8QQRYMo8sNMeaZ2Dp5+jhwKnUmIOyFFQfHRkjJm5nXg==",
+			"version": "3.0.22",
+			"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.22.tgz",
+			"integrity": "sha512-4PRT4nh1EImPbt2jASOKHX7PB7I+e4IWNLvkKFDxNhJlfjbYlleYQh285Z/3mPTHSAK/AvdMmw5BNNuYH8ShgQ==",
 			"dev": true
 		},
+		"node_modules/stop-iteration-iterator": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.1.0.tgz",
+			"integrity": "sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==",
+			"dev": true,
+			"dependencies": {
+				"es-errors": "^1.3.0",
+				"internal-slot": "^1.1.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
 		"node_modules/string_decoder": {
 			"version": "0.10.31",
 			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
diff --git a/package.json b/package.json
index 9dac11e..a030f92 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-	"author": "Matt Friedman",
+	"author": "phpBB Limited",
 	"license": "GPL-2.0",
 	"dependencies": {
 		"lightbox2": "^2.11.3"
diff --git a/styles/all/template/event/overall_footer_after.html b/styles/all/template/event/overall_footer_after.html
index 008650c..36f9756 100644
--- a/styles/all/template/event/overall_footer_after.html
+++ b/styles/all/template/event/overall_footer_after.html
@@ -1,19 +1,19 @@
 {% if S_LIGHTBOX_ALL_IMAGES or LIGHTBOX_RESIZE_WIDTH or LIGHTBOX_RESIZE_HEIGHT %}
-	{% INCLUDEJS '@vse_lightbox/js/resizer.js' %}
+	{% INCLUDEJS '@phpbb_lightbox/js/resizer.js' %}
 	{# Test $INCLUDED_LIGHTBOXJS is not defined #}
 	{% if not definition.INCLUDED_LIGHTBOXJS %}
-		{% INCLUDECSS '@vse_lightbox/lightbox/css/lightbox.min.css' %}
-		{% INCLUDEJS '@vse_lightbox/lightbox/js/lightbox.min.js' %}
+		{% INCLUDECSS '@phpbb_lightbox/lightbox/css/lightbox.min.css' %}
+		{% INCLUDEJS '@phpbb_lightbox/lightbox/js/lightbox.min.js' %}
 		{% DEFINE INCLUDED_LIGHTBOXJS = true %}
 	{% endif %}
 	<script>
-		var vseLightbox = {};
-		vseLightbox.resizeHeight = {{ LIGHTBOX_RESIZE_HEIGHT }};
-		vseLightbox.resizeWidth = {{ LIGHTBOX_RESIZE_WIDTH }};
-		vseLightbox.lightboxGal = {{ S_LIGHTBOX_GALLERY }};
-		vseLightbox.lightboxSig = {{ S_LIGHTBOX_SIGNATURES }};
-		vseLightbox.imageTitles = {{ S_LIGHTBOX_IMG_TITLES }};
-		vseLightbox.lightboxAll = {{ S_LIGHTBOX_ALL_IMAGES }};
-		vseLightbox.downloadFile = 'download/file.{{ PHP_EXTENSION|escape("js") }}';
+		var phpbbLightbox = {};
+		phpbbLightbox.resizeHeight = {{ LIGHTBOX_RESIZE_HEIGHT }};
+		phpbbLightbox.resizeWidth = {{ LIGHTBOX_RESIZE_WIDTH }};
+		phpbbLightbox.lightboxGal = {{ S_LIGHTBOX_GALLERY }};
+		phpbbLightbox.lightboxSig = {{ S_LIGHTBOX_SIGNATURES }};
+		phpbbLightbox.imageTitles = {{ S_LIGHTBOX_IMG_TITLES }};
+		phpbbLightbox.lightboxAll = {{ S_LIGHTBOX_ALL_IMAGES }};
+		phpbbLightbox.downloadFile = 'download/file.{{ PHP_EXTENSION|escape("js") }}';
 	</script>
 {% endif %}
diff --git a/styles/all/template/js/resizer.js b/styles/all/template/js/resizer.js
index e4753ae..5929c2c 100644
--- a/styles/all/template/js/resizer.js
+++ b/styles/all/template/js/resizer.js
@@ -1,4 +1,4 @@
-/*global vseLightbox, mChat*/
+/*global phpbbLightbox, mChat*/
 (function($) { // Avoid conflicts with other libraries
 
 	'use strict';
@@ -21,11 +21,11 @@
 	});
 
 	function resizeWideImages() {
-		return (vseLightbox.resizeWidth > 0);
+		return (phpbbLightbox.resizeWidth > 0);
 	}
 
 	function resizeTallImages() {
-		return (vseLightbox.resizeHeight > 0);
+		return (phpbbLightbox.resizeHeight > 0);
 	}
 
 	function isMobile() {
@@ -42,16 +42,16 @@
 	}
 
 	function isOversized(img) {
-		return (resizeWideImages() && img.width >= vseLightbox.resizeWidth) || (resizeTallImages() && img.height >= vseLightbox.resizeHeight);
+		return (resizeWideImages() && img.width >= phpbbLightbox.resizeWidth) || (resizeTallImages() && img.height >= phpbbLightbox.resizeHeight);
 	}
 
 	function lightboxResizer(elements) {
-		if (isMobile() || (!resizeWideImages() && !resizeTallImages() && !vseLightbox.lightboxAll)) {
+		if (isMobile() || (!resizeWideImages() && !resizeTallImages() && !phpbbLightbox.lightboxAll)) {
 			return;
 		}
 		var $targetImage = elements.find('.postimage'),
 			galleryName = 'post-gallery';
-		if (!vseLightbox.lightboxSig) {
+		if (!phpbbLightbox.lightboxSig) {
 			$targetImage = $targetImage.not(function() {
 				return $(this).closest('.signature').length > 0;
 			});
@@ -68,7 +68,7 @@
 					width: $(this).outerWidth(),
 					height: $(this).outerHeight()
 				};
-				switch (vseLightbox.lightboxGal)
+				switch (phpbbLightbox.lightboxGal)
 				{
 					case 0:
 						img.index = $targetImage.index(this);
@@ -79,21 +79,21 @@
 				}
 				// attached images
 				if ($(this).parent('a').length > 0) {
-					if (vseLightbox.lightboxAll || isOversized(img)) {
+					if (phpbbLightbox.lightboxAll || isOversized(img)) {
 						$(this).parent('a').attr({
 							'data-lightbox': galleryName + img.index,
-							'data-title': (vseLightbox.imageTitles) ? $(this).attr('alt') : ''
+							'data-title': (phpbbLightbox.imageTitles) ? $(this).attr('alt') : ''
 						}).end().borderHover();
 					}
 				}
 				// regular images
-				else if (vseLightbox.lightboxAll || isOversized(img)) {
+				else if (phpbbLightbox.lightboxAll || isOversized(img)) {
 					$(this).wrap(function() {
 						var url = $(this).attr('src');
 						return $('<a/>').attr({
 							href: url,
-							'data-lightbox': (vseLightbox.lightboxSig && $(this).closest('.signature').length > 0) ? $targetImage.index(this) : galleryName + img.index,
-							'data-title': (vseLightbox.imageTitles) ? ((url.indexOf(vseLightbox.downloadFile) !== -1) ? $(this).attr('alt') : url.split('/').pop()) : ''
+							'data-lightbox': (phpbbLightbox.lightboxSig && $(this).closest('.signature').length > 0) ? $targetImage.index(this) : galleryName + img.index,
+							'data-title': (phpbbLightbox.imageTitles) ? ((url.indexOf(phpbbLightbox.downloadFile) !== -1) ? $(this).attr('alt') : url.split('/').pop()) : ''
 						});
 					}).borderHover();
 				}
diff --git a/tests/event/listener_test.php b/tests/event/listener_test.php
index 2ecee02..87774fe 100644
--- a/tests/event/listener_test.php
+++ b/tests/event/listener_test.php
@@ -1,20 +1,20 @@
 <?php
 /**
-*
-* Lightbox extension for the phpBB Forum Software package.
-*
-* @copyright (c) 2014 Matt Friedman
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-*/
+ *
+ * Lightbox extension for the phpBB Forum Software package.
+ *
+ * @copyright (c) 2014 Matt Friedman, phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ */
 
-namespace vse\lightbox\tests\event;
+namespace phpbb\lightbox\tests\event;
 
 require_once __DIR__ . '/../../../../../includes/functions_acp.php';
 
 class listener_test extends \phpbb_test_case
 {
-	/** @var \vse\lightbox\event\listener */
+	/** @var \phpbb\lightbox\event\listener */
 	protected $listener;
 
 	/** @var \phpbb\config\config */
@@ -46,7 +46,7 @@ protected function setUp(): void
 
 	protected function set_listener()
 	{
-		$this->listener = new \vse\lightbox\event\listener(
+		$this->listener = new \phpbb\lightbox\event\listener(
 			$this->config,
 			$this->language,
 			$this->template,
@@ -65,7 +65,7 @@ public function test_getSubscribedEvents()
 		self::assertEquals(array(
 			'core.page_header',
 			'core.acp_board_config_edit_add',
-		), array_keys(\vse\lightbox\event\listener::getSubscribedEvents()));
+		), array_keys(\phpbb\lightbox\event\listener::getSubscribedEvents()));
 	}
 
 	/**
diff --git a/tests/ext_test.php b/tests/ext_test.php
index 0c34d63..67939f5 100644
--- a/tests/ext_test.php
+++ b/tests/ext_test.php
@@ -1,51 +1,97 @@
 <?php
 /**
+ *
  *
  * Lightbox extension for the phpBB Forum Software package.
  *
- * @copyright (c) 2014, 2022 Matt Friedman
+ * @copyright (c) 2025 Matt Friedman, phpBB Limited <https://www.phpbb.com>
  * @license GNU General Public License, version 2 (GPL-2.0)
  *
  */
 
-namespace vse\lightbox\tests;
+namespace phpbb\lightbox\tests;
+
+use phpbb\language\language;
+use phpbb\language\language_file_loader;
 
 class ext_test extends \phpbb_test_case
 {
-	/** @var \PHPUnit\Framework\MockObject\MockObject|\Symfony\Component\DependencyInjection\ContainerInterface */
+	/** @var \PHPUnit\Framework\MockObject\MockObject|\Symfony\Component\DependencyInjection\ContainerInterface $container */
 	protected $container;
 
-	/** @var \PHPUnit\Framework\MockObject\MockObject|\phpbb\finder\finder */
+	/** @var \PHPUnit\Framework\MockObject\MockObject|\phpbb\extension\manager $extension_manager */
+	protected $extension_manager;
+
+	/** @var \PHPUnit\Framework\MockObject\MockObject|\phpbb\finder\finder $extension_finder */
 	protected $extension_finder;
 
-	/** @var \PHPUnit\Framework\MockObject\MockObject|\phpbb\db\migrator */
+	/** @var \PHPUnit\Framework\MockObject\MockObject|\phpbb\db\migrator $migrator */
 	protected $migrator;
 
-	/**
-	 * @inheritdoc
-	 */
 	protected function setUp(): void
 	{
 		parent::setUp();
 
-		// Stub the container
-		$this->container = $this->createMock('\Symfony\Component\DependencyInjection\ContainerInterface');
+		global $phpbb_root_path, $phpEx;
+
+		$this->container = $this->getMockBuilder('\Symfony\Component\DependencyInjection\ContainerInterface')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$this->extension_manager = $this->getMockBuilder('\phpbb\extension\manager')
+			->disableOriginalConstructor()
+			->getMock();
 
-		// Stub the ext finder and disable its constructor
-		$this->extension_finder = $this->createMock('\phpbb\finder\finder');
+		$this->extension_finder = $this->getMockBuilder('\phpbb\finder\finder')
+			->disableOriginalConstructor()
+			->getMock();
 
-		// Stub the migrator and disable its constructor
-		$this->migrator = $this->createMock('\phpbb\db\migrator');
+		$this->migrator = $this->getMockBuilder('\phpbb\db\migrator')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$services = ['ext.manager', 'language'];
+		$returns = [$this->extension_manager, new language(new language_file_loader($phpbb_root_path, $phpEx))];
+		$callCount = 0;
+		$this->container->method('get')
+			->willReturnCallback(function($service) use ($services, $returns, &$callCount) {
+				$this->assertEquals($services[$callCount], $service);
+				return $returns[$callCount++];
+			});
+	}
+
+	protected function get_ext()
+	{
+		return new \phpbb\lightbox\ext(
+			$this->container,
+			$this->extension_finder,
+			$this->migrator,
+			'phpbb/lightbox',
+			''
+		);
+	}
+
+	public static function ext_test_data()
+	{
+		return [
+			[false, true],
+			[true, ['VSE_LIGHTBOX_ERROR']],
+		];
 	}
 
 	/**
-	 * Test the extension can only be enabled when the minimum
-	 * phpBB version requirement is satisfied.
+	 * @dataProvider ext_test_data
+	 * @param $old_present
+	 * @param $expected
+	 * @return void
 	 */
-	public function test_ext()
+	public function test_ext($old_present, $expected)
 	{
-		$ext = new \vse\lightbox\ext($this->container, $this->extension_finder, $this->migrator, 'vse/lightbox', '');
+		$this->extension_manager->expects(self::once())
+			->method('is_enabled')
+			->with('vse/lightbox')
+			->willReturn($old_present);
 
-		self::assertTrue($ext->is_enableable());
+		self::assertSame($expected, $this->get_ext()->is_enableable());
 	}
 }
diff --git a/tests/functional/acp_test.php b/tests/functional/acp_test.php
index 79b3e48..a012449 100644
--- a/tests/functional/acp_test.php
+++ b/tests/functional/acp_test.php
@@ -3,12 +3,12 @@
  *
  * Lightbox extension for the phpBB Forum Software package.
  *
- * @copyright (c) 2014,2025 Matt Friedman
+ * @copyright (c) 2014 Matt Friedman, phpBB Limited <https://www.phpbb.com>
  * @license GNU General Public License, version 2 (GPL-2.0)
  *
  */
 
-namespace vse\lightbox\tests\functional;
+namespace phpbb\lightbox\tests\functional;
 
 /**
  * @group functional
@@ -17,7 +17,7 @@ class acp_test extends \phpbb_functional_test_case
 {
 	protected static function setup_extensions()
 	{
-		return ['vse/lightbox'];
+		return ['phpbb/lightbox'];
 	}
 
 	public function test_acp_settings()
@@ -26,7 +26,7 @@ public function test_acp_settings()
 		$this->admin_login();
 
 		$this->add_lang('acp/board');
-		$this->add_lang_ext('vse/lightbox', 'lightbox');
+		$this->add_lang_ext('phpbb/lightbox', 'lightbox');
 
 		$found = false;