diff --git a/Cargo.toml b/Cargo.toml
index 33fb2250..8104d469 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,6 +14,7 @@ resolver = "2"
 
 [workspace.package]
 rust-version = "1.83"
+license-file = "README.md"
 
 [workspace.dependencies]
 uniffi = { git = "https://github.com/mozilla/uniffi-rs", rev = "789a9023b522562a95618443cee5a0d4f111c4c7" }
diff --git a/LICENSE-COMMERCIAL b/LICENSE-COMMERCIAL
new file mode 100644
index 00000000..13484859
--- /dev/null
+++ b/LICENSE-COMMERCIAL
@@ -0,0 +1,6 @@
+Licensees holding a valid commercial license with Element may use this
+software in accordance with the terms contained in a written agreement
+between you and Element.
+
+To purchase a commercial license please contact our sales team at
+licensing@element.io
\ No newline at end of file
diff --git a/README.md b/README.md
index b7c2c297..ac87a206 100644
--- a/README.md
+++ b/README.md
@@ -52,6 +52,14 @@ Rust bindings like those generated here, see
   - used while writing tests, to persuade the browser to select text in the
   same way as if it had been done manually.
 
-## License
+## Copyright & License
 
-[AGPL-3.0](https://www.gnu.org/licenses/agpl-3.0.txt)
+Copyright (c) 2022-2024 The Matrix.org Foundation C.I.C.
+
+Copyright (c) 2024-2025 New Vector Ltd
+
+This software is multi licensed by New Vector Ltd (Element). It can be used either:
+
+(1) for free 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); OR
+
+(2) under the terms of a paid-for Element Commercial License agreement between you and Element (the terms of which may vary depending on what you and Element have agreed to). Unless required by applicable law or agreed to in writing, software distributed under the Licenses is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the Licenses for the specific language governing permissions and limitations under the Licenses.
\ No newline at end of file
diff --git a/bindings/wysiwyg-ffi/Cargo.toml b/bindings/wysiwyg-ffi/Cargo.toml
index b4849936..33ebddfe 100644
--- a/bindings/wysiwyg-ffi/Cargo.toml
+++ b/bindings/wysiwyg-ffi/Cargo.toml
@@ -5,7 +5,7 @@ homepage = "https://gitlab.com/andybalaam/wysiwyg-rust"
 repository = "https://gitlab.com/andybalaam/wysiwyg-rust"
 description = "Swift and Kotlin bindings for wysiwyg-rust"
 keywords = ["matrix", "chat", "messaging", "composer", "wysiwyg"]
-license = "AGPL-3.0"
+license-file = { workspace = true }
 name = "uniffi-wysiwyg-composer"
 version = "2.38.0"
 rust-version = { workspace = true }
diff --git a/bindings/wysiwyg-ffi/src/ffi_action_state.rs b/bindings/wysiwyg-ffi/src/ffi_action_state.rs
index 03a577bb..8f927350 100644
--- a/bindings/wysiwyg-ffi/src/ffi_action_state.rs
+++ b/bindings/wysiwyg-ffi/src/ffi_action_state.rs
@@ -1,3 +1,8 @@
+// Copyright 2025 New Vector Ltd.
+//
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+// Please see LICENSE in the repository root for full details.
+
 #[derive(Debug, PartialEq, Eq, uniffi::Enum)]
 pub enum ActionState {
     Enabled,
diff --git a/bindings/wysiwyg-ffi/src/ffi_composer_action.rs b/bindings/wysiwyg-ffi/src/ffi_composer_action.rs
index ab9bfdaa..e352bebb 100644
--- a/bindings/wysiwyg-ffi/src/ffi_composer_action.rs
+++ b/bindings/wysiwyg-ffi/src/ffi_composer_action.rs
@@ -1,3 +1,8 @@
+// Copyright 2025 New Vector Ltd.
+//
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+// Please see LICENSE in the repository root for full details.
+
 #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq, uniffi::Enum)]
 pub enum ComposerAction {
     Bold,
diff --git a/bindings/wysiwyg-ffi/src/ffi_composer_model.rs b/bindings/wysiwyg-ffi/src/ffi_composer_model.rs
index b9b9e813..b4977d7e 100644
--- a/bindings/wysiwyg-ffi/src/ffi_composer_model.rs
+++ b/bindings/wysiwyg-ffi/src/ffi_composer_model.rs
@@ -1,3 +1,8 @@
+// Copyright 2025 New Vector Ltd.
+//
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+// Please see LICENSE in the repository root for full details.
+
 use std::collections::HashMap;
 use std::sync::{Arc, Mutex};
 use std::vec;
diff --git a/bindings/wysiwyg-ffi/src/ffi_composer_state.rs b/bindings/wysiwyg-ffi/src/ffi_composer_state.rs
index 6f2d109c..411df183 100644
--- a/bindings/wysiwyg-ffi/src/ffi_composer_state.rs
+++ b/bindings/wysiwyg-ffi/src/ffi_composer_state.rs
@@ -1,3 +1,8 @@
+// Copyright 2025 New Vector Ltd.
+//
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+// Please see LICENSE in the repository root for full details.
+
 use widestring::Utf16String;
 use wysiwyg::ToHtml;
 
diff --git a/bindings/wysiwyg-ffi/src/ffi_composer_update.rs b/bindings/wysiwyg-ffi/src/ffi_composer_update.rs
index 369e9832..1cbef504 100644
--- a/bindings/wysiwyg-ffi/src/ffi_composer_update.rs
+++ b/bindings/wysiwyg-ffi/src/ffi_composer_update.rs
@@ -1,3 +1,8 @@
+// Copyright 2025 New Vector Ltd.
+//
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+// Please see LICENSE in the repository root for full details.
+
 use widestring::Utf16String;
 
 use crate::ffi_link_actions::LinkActionUpdate;
diff --git a/bindings/wysiwyg-ffi/src/ffi_dom_creation_error.rs b/bindings/wysiwyg-ffi/src/ffi_dom_creation_error.rs
index 091cb25a..eb85f719 100644
--- a/bindings/wysiwyg-ffi/src/ffi_dom_creation_error.rs
+++ b/bindings/wysiwyg-ffi/src/ffi_dom_creation_error.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use std::{error::Error, fmt::Display};
diff --git a/bindings/wysiwyg-ffi/src/ffi_link_actions.rs b/bindings/wysiwyg-ffi/src/ffi_link_actions.rs
index 7beba019..756703f7 100644
--- a/bindings/wysiwyg-ffi/src/ffi_link_actions.rs
+++ b/bindings/wysiwyg-ffi/src/ffi_link_actions.rs
@@ -1,3 +1,8 @@
+// Copyright 2025 New Vector Ltd.
+//
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+// Please see LICENSE in the repository root for full details.
+
 use widestring::Utf16String;
 
 #[derive(uniffi::Enum)]
diff --git a/bindings/wysiwyg-ffi/src/ffi_mention_detector.rs b/bindings/wysiwyg-ffi/src/ffi_mention_detector.rs
index d132b145..74493cbc 100644
--- a/bindings/wysiwyg-ffi/src/ffi_mention_detector.rs
+++ b/bindings/wysiwyg-ffi/src/ffi_mention_detector.rs
@@ -1,3 +1,8 @@
+// Copyright 2025 New Vector Ltd.
+//
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+// Please see LICENSE in the repository root for full details.
+
 use std::sync::Arc;
 
 #[derive(Default, uniffi::Object)]
diff --git a/bindings/wysiwyg-ffi/src/ffi_mentions_state.rs b/bindings/wysiwyg-ffi/src/ffi_mentions_state.rs
index d15fdd57..e0360a54 100644
--- a/bindings/wysiwyg-ffi/src/ffi_mentions_state.rs
+++ b/bindings/wysiwyg-ffi/src/ffi_mentions_state.rs
@@ -1,3 +1,8 @@
+// Copyright 2025 New Vector Ltd.
+//
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+// Please see LICENSE in the repository root for full details.
+
 #[derive(uniffi::Record)]
 pub struct MentionsState {
     pub user_ids: Vec<String>,
diff --git a/bindings/wysiwyg-ffi/src/ffi_menu_action.rs b/bindings/wysiwyg-ffi/src/ffi_menu_action.rs
index 4c704ec6..7448325e 100644
--- a/bindings/wysiwyg-ffi/src/ffi_menu_action.rs
+++ b/bindings/wysiwyg-ffi/src/ffi_menu_action.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use crate::SuggestionPattern;
diff --git a/bindings/wysiwyg-ffi/src/ffi_menu_state.rs b/bindings/wysiwyg-ffi/src/ffi_menu_state.rs
index 42c68671..9cabd24f 100644
--- a/bindings/wysiwyg-ffi/src/ffi_menu_state.rs
+++ b/bindings/wysiwyg-ffi/src/ffi_menu_state.rs
@@ -1,3 +1,8 @@
+// Copyright 2025 New Vector Ltd.
+//
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+// Please see LICENSE in the repository root for full details.
+
 use std::collections::HashMap;
 
 use crate::into_ffi::IntoFfi;
diff --git a/bindings/wysiwyg-ffi/src/ffi_pattern_key.rs b/bindings/wysiwyg-ffi/src/ffi_pattern_key.rs
index f0d1a3b2..2ae2efb3 100644
--- a/bindings/wysiwyg-ffi/src/ffi_pattern_key.rs
+++ b/bindings/wysiwyg-ffi/src/ffi_pattern_key.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 #[derive(Debug, PartialEq, Eq, uniffi::Enum)]
diff --git a/bindings/wysiwyg-ffi/src/ffi_suggestion_pattern.rs b/bindings/wysiwyg-ffi/src/ffi_suggestion_pattern.rs
index c61b9896..df8bb4c9 100644
--- a/bindings/wysiwyg-ffi/src/ffi_suggestion_pattern.rs
+++ b/bindings/wysiwyg-ffi/src/ffi_suggestion_pattern.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use crate::PatternKey;
diff --git a/bindings/wysiwyg-ffi/src/ffi_text_update.rs b/bindings/wysiwyg-ffi/src/ffi_text_update.rs
index 2591cbe9..9458bcc4 100644
--- a/bindings/wysiwyg-ffi/src/ffi_text_update.rs
+++ b/bindings/wysiwyg-ffi/src/ffi_text_update.rs
@@ -1,3 +1,8 @@
+// Copyright 2025 New Vector Ltd.
+//
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+// Please see LICENSE in the repository root for full details.
+
 use widestring::Utf16String;
 
 #[derive(uniffi::Enum)]
diff --git a/bindings/wysiwyg-ffi/src/into_ffi.rs b/bindings/wysiwyg-ffi/src/into_ffi.rs
index c9af1861..b439c684 100644
--- a/bindings/wysiwyg-ffi/src/into_ffi.rs
+++ b/bindings/wysiwyg-ffi/src/into_ffi.rs
@@ -1,3 +1,8 @@
+// Copyright 2025 New Vector Ltd.
+//
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+// Please see LICENSE in the repository root for full details.
+
 use std::collections::HashMap;
 
 use crate::{ActionState, ComposerAction};
diff --git a/bindings/wysiwyg-ffi/src/lib.rs b/bindings/wysiwyg-ffi/src/lib.rs
index 60ab8644..27abba66 100644
--- a/bindings/wysiwyg-ffi/src/lib.rs
+++ b/bindings/wysiwyg-ffi/src/lib.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 uniffi_macros::include_scaffolding!("wysiwyg_composer");
diff --git a/bindings/wysiwyg-ffi/src/wysiwyg_composer.udl b/bindings/wysiwyg-ffi/src/wysiwyg_composer.udl
index ff4db1c6..7a4b7735 100644
--- a/bindings/wysiwyg-ffi/src/wysiwyg_composer.udl
+++ b/bindings/wysiwyg-ffi/src/wysiwyg_composer.udl
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/bindings/wysiwyg-wasm/Cargo.toml b/bindings/wysiwyg-wasm/Cargo.toml
index 17bda028..2e7ca689 100644
--- a/bindings/wysiwyg-wasm/Cargo.toml
+++ b/bindings/wysiwyg-wasm/Cargo.toml
@@ -5,7 +5,7 @@ homepage = "https://gitlab.com/andybalaam/wysiwyg-rust"
 repository = "https://gitlab.com/andybalaam/wysiwyg-rust"
 description = "WASM bindings for wysiwyg-rust"
 keywords = ["matrix", "chat", "messaging", "composer", "wysiwyg"]
-license = "AGPL-3.0"
+license-file = { workspace = true }
 name = "wysiwyg-wasm"
 version = "2.38.0"
 rust-version = { workspace = true }
diff --git a/bindings/wysiwyg-wasm/LICENSE b/bindings/wysiwyg-wasm/LICENSE
deleted file mode 100644
index be3f7b28..00000000
--- a/bindings/wysiwyg-wasm/LICENSE
+++ /dev/null
@@ -1,661 +0,0 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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 <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<https://www.gnu.org/licenses/>.
diff --git a/bindings/wysiwyg-wasm/index-wasm-esm.js b/bindings/wysiwyg-wasm/index-wasm-esm.js
index cc704ecd..d7d3aa89 100644
--- a/bindings/wysiwyg-wasm/index-wasm-esm.js
+++ b/bindings/wysiwyg-wasm/index-wasm-esm.js
@@ -1,7 +1,7 @@
 /*
 Copyright 2024 New Vector Ltd.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/bindings/wysiwyg-wasm/index.cjs b/bindings/wysiwyg-wasm/index.cjs
index 74e87c1b..36dca9c6 100644
--- a/bindings/wysiwyg-wasm/index.cjs
+++ b/bindings/wysiwyg-wasm/index.cjs
@@ -1,7 +1,7 @@
 /*
 Copyright 2024 New Vector Ltd.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/bindings/wysiwyg-wasm/index.d.ts b/bindings/wysiwyg-wasm/index.d.ts
index cc2b0739..1e3e61c8 100644
--- a/bindings/wysiwyg-wasm/index.d.ts
+++ b/bindings/wysiwyg-wasm/index.d.ts
@@ -1,7 +1,7 @@
 /*
 Copyright 2024 New Vector Ltd.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/bindings/wysiwyg-wasm/index.js b/bindings/wysiwyg-wasm/index.js
index 5b9f325f..33c3e31d 100644
--- a/bindings/wysiwyg-wasm/index.js
+++ b/bindings/wysiwyg-wasm/index.js
@@ -1,7 +1,7 @@
 /*
 Copyright 2024 New Vector Ltd.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/bindings/wysiwyg-wasm/node.cjs b/bindings/wysiwyg-wasm/node.cjs
index c6b11229..cded3e28 100644
--- a/bindings/wysiwyg-wasm/node.cjs
+++ b/bindings/wysiwyg-wasm/node.cjs
@@ -1,7 +1,7 @@
 /*
 Copyright 2024 New Vector Ltd.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/bindings/wysiwyg-wasm/node.js b/bindings/wysiwyg-wasm/node.js
index 64a65a2d..908b8bb1 100644
--- a/bindings/wysiwyg-wasm/node.js
+++ b/bindings/wysiwyg-wasm/node.js
@@ -1,7 +1,7 @@
 /*
 Copyright 2024 New Vector Ltd.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/bindings/wysiwyg-wasm/package.json b/bindings/wysiwyg-wasm/package.json
index d48276b9..77a1f079 100644
--- a/bindings/wysiwyg-wasm/package.json
+++ b/bindings/wysiwyg-wasm/package.json
@@ -3,7 +3,7 @@
   "version": "2.38.0",
   "homepage": "https://gitlab.com/andybalaam/wysiwyg-rust",
   "description": "WASM bindings for wysiwyg-rust",
-  "license": "AGPL-3.0",
+  "license": "SEE LICENSE IN README.md",
   "type": "module",
   "collaborators": [
     "Andy Balaam <andy.balaam@matrix.org>"
diff --git a/bindings/wysiwyg-wasm/src/lib.rs b/bindings/wysiwyg-wasm/src/lib.rs
index 40e7187b..9117c33d 100644
--- a/bindings/wysiwyg-wasm/src/lib.rs
+++ b/bindings/wysiwyg-wasm/src/lib.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use std::{
diff --git a/crates/matrix_mentions/Cargo.toml b/crates/matrix_mentions/Cargo.toml
index 3fb4b052..8159391b 100644
--- a/crates/matrix_mentions/Cargo.toml
+++ b/crates/matrix_mentions/Cargo.toml
@@ -4,7 +4,7 @@ homepage = "https://github.com/element-hq/matrix-rich-text-editor"
 repository = "https://github.com/element-hq/matrix-rich-text-editor"
 description = "Utilities for Matrix mentions"
 keywords = ["matrix", "chat", "messaging"]
-license = "AGPL-3.0"
+license-file = { workspace = true }
 name = "matrix_mentions"
 version = "0.1.0"
 edition = "2021"
diff --git a/crates/matrix_mentions/src/lib.rs b/crates/matrix_mentions/src/lib.rs
index 4b45582c..1b154790 100644
--- a/crates/matrix_mentions/src/lib.rs
+++ b/crates/matrix_mentions/src/lib.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 mod mention;
diff --git a/crates/matrix_mentions/src/mention.rs b/crates/matrix_mentions/src/mention.rs
index 82622db8..07557795 100644
--- a/crates/matrix_mentions/src/mention.rs
+++ b/crates/matrix_mentions/src/mention.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use ruma_common::{matrix_uri::MatrixId, IdParseError, MatrixToUri, MatrixUri};
diff --git a/crates/wysiwyg/Cargo.toml b/crates/wysiwyg/Cargo.toml
index a904674a..53c2d58d 100644
--- a/crates/wysiwyg/Cargo.toml
+++ b/crates/wysiwyg/Cargo.toml
@@ -5,7 +5,7 @@ homepage = "https://gitlab.com/andybalaam/wysiwyg-rust"
 repository = "https://gitlab.com/andybalaam/wysiwyg-rust"
 description = "Model code to power a rich text editor for Matrix"
 keywords = ["matrix", "chat", "messaging", "composer", "wysiwyg"]
-license = "AGPL-3.0"
+license-file = { workspace = true }
 name = "wysiwyg"
 version = "2.38.0"
 rust-version = { workspace = true }
diff --git a/crates/wysiwyg/src/action_state.rs b/crates/wysiwyg/src/action_state.rs
index 89c3e889..438aa39d 100644
--- a/crates/wysiwyg/src/action_state.rs
+++ b/crates/wysiwyg/src/action_state.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use strum_macros::AsRefStr;
diff --git a/crates/wysiwyg/src/char.rs b/crates/wysiwyg/src/char.rs
index f7d59a1c..5bb88f52 100644
--- a/crates/wysiwyg/src/char.rs
+++ b/crates/wysiwyg/src/char.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 pub trait CharExt: Sized {
diff --git a/crates/wysiwyg/src/composer_action.rs b/crates/wysiwyg/src/composer_action.rs
index 593fee6a..f6291b1c 100644
--- a/crates/wysiwyg/src/composer_action.rs
+++ b/crates/wysiwyg/src/composer_action.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use strum_macros::{AsRefStr, EnumIter};
diff --git a/crates/wysiwyg/src/composer_model.rs b/crates/wysiwyg/src/composer_model.rs
index 66745f79..e655a917 100644
--- a/crates/wysiwyg/src/composer_model.rs
+++ b/crates/wysiwyg/src/composer_model.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 pub mod base;
diff --git a/crates/wysiwyg/src/composer_model/base.rs b/crates/wysiwyg/src/composer_model/base.rs
index 24c0eea6..2181dfd0 100644
--- a/crates/wysiwyg/src/composer_model/base.rs
+++ b/crates/wysiwyg/src/composer_model/base.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use crate::action_state::ActionState;
diff --git a/crates/wysiwyg/src/composer_model/code_block.rs b/crates/wysiwyg/src/composer_model/code_block.rs
index 0c92895a..dc352fd3 100644
--- a/crates/wysiwyg/src/composer_model/code_block.rs
+++ b/crates/wysiwyg/src/composer_model/code_block.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use crate::dom::nodes::dom_node::DomNodeKind::*;
diff --git a/crates/wysiwyg/src/composer_model/delete_text.rs b/crates/wysiwyg/src/composer_model/delete_text.rs
index 5878a82b..585a52f2 100644
--- a/crates/wysiwyg/src/composer_model/delete_text.rs
+++ b/crates/wysiwyg/src/composer_model/delete_text.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use crate::dom::nodes::dom_node::DomNodeKind::{Link, ListItem};
diff --git a/crates/wysiwyg/src/composer_model/example_format.rs b/crates/wysiwyg/src/composer_model/example_format.rs
index f51c61e6..62c15f8d 100644
--- a/crates/wysiwyg/src/composer_model/example_format.rs
+++ b/crates/wysiwyg/src/composer_model/example_format.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use std::collections::HashMap;
diff --git a/crates/wysiwyg/src/composer_model/format.rs b/crates/wysiwyg/src/composer_model/format.rs
index 6510dd28..fd76be85 100644
--- a/crates/wysiwyg/src/composer_model/format.rs
+++ b/crates/wysiwyg/src/composer_model/format.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use std::collections::HashMap;
diff --git a/crates/wysiwyg/src/composer_model/format_inline_code.rs b/crates/wysiwyg/src/composer_model/format_inline_code.rs
index e8e3e99d..8bcc02f5 100644
--- a/crates/wysiwyg/src/composer_model/format_inline_code.rs
+++ b/crates/wysiwyg/src/composer_model/format_inline_code.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use crate::composer_model::menu_state::MenuStateComputeType;
diff --git a/crates/wysiwyg/src/composer_model/hyperlinks.rs b/crates/wysiwyg/src/composer_model/hyperlinks.rs
index 6a0af55a..e15c5f62 100644
--- a/crates/wysiwyg/src/composer_model/hyperlinks.rs
+++ b/crates/wysiwyg/src/composer_model/hyperlinks.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use std::cmp::{max, min};
diff --git a/crates/wysiwyg/src/composer_model/lists.rs b/crates/wysiwyg/src/composer_model/lists.rs
index eb4f8f6f..24b5eb71 100644
--- a/crates/wysiwyg/src/composer_model/lists.rs
+++ b/crates/wysiwyg/src/composer_model/lists.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use crate::dom::nodes::dom_node::DomNodeKind;
diff --git a/crates/wysiwyg/src/composer_model/mentions.rs b/crates/wysiwyg/src/composer_model/mentions.rs
index 2bc96883..e28e7ab8 100644
--- a/crates/wysiwyg/src/composer_model/mentions.rs
+++ b/crates/wysiwyg/src/composer_model/mentions.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use crate::{
diff --git a/crates/wysiwyg/src/composer_model/menu_action.rs b/crates/wysiwyg/src/composer_model/menu_action.rs
index 4729f175..cf0cdbc6 100644
--- a/crates/wysiwyg/src/composer_model/menu_action.rs
+++ b/crates/wysiwyg/src/composer_model/menu_action.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use std::collections::HashSet;
diff --git a/crates/wysiwyg/src/composer_model/menu_state.rs b/crates/wysiwyg/src/composer_model/menu_state.rs
index deda85f1..1c0e945a 100644
--- a/crates/wysiwyg/src/composer_model/menu_state.rs
+++ b/crates/wysiwyg/src/composer_model/menu_state.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use strum::IntoEnumIterator;
diff --git a/crates/wysiwyg/src/composer_model/new_lines.rs b/crates/wysiwyg/src/composer_model/new_lines.rs
index 5cdecf5c..da095ff3 100644
--- a/crates/wysiwyg/src/composer_model/new_lines.rs
+++ b/crates/wysiwyg/src/composer_model/new_lines.rs
@@ -1,3 +1,8 @@
+// Copyright 2025 New Vector Ltd.
+//
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+// Please see LICENSE in the repository root for full details.
+
 use crate::dom::nodes::dom_node::DomNodeKind;
 use crate::dom::nodes::dom_node::DomNodeKind::{
     Generic, Link, List, ListItem, Paragraph,
diff --git a/crates/wysiwyg/src/composer_model/quotes.rs b/crates/wysiwyg/src/composer_model/quotes.rs
index a6b164ba..739708ec 100644
--- a/crates/wysiwyg/src/composer_model/quotes.rs
+++ b/crates/wysiwyg/src/composer_model/quotes.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use crate::dom::nodes::dom_node::DomNodeKind::{Generic, ListItem, Quote};
diff --git a/crates/wysiwyg/src/composer_model/replace_text.rs b/crates/wysiwyg/src/composer_model/replace_text.rs
index 4da19da8..59e9829c 100644
--- a/crates/wysiwyg/src/composer_model/replace_text.rs
+++ b/crates/wysiwyg/src/composer_model/replace_text.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use crate::dom::nodes::dom_node::DomNodeKind;
diff --git a/crates/wysiwyg/src/composer_model/selection.rs b/crates/wysiwyg/src/composer_model/selection.rs
index 2f9bb309..e0d5b0b0 100644
--- a/crates/wysiwyg/src/composer_model/selection.rs
+++ b/crates/wysiwyg/src/composer_model/selection.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use crate::{ComposerModel, ComposerUpdate, Location, UnicodeString};
diff --git a/crates/wysiwyg/src/composer_model/undo_redo.rs b/crates/wysiwyg/src/composer_model/undo_redo.rs
index 14344797..87c7067e 100644
--- a/crates/wysiwyg/src/composer_model/undo_redo.rs
+++ b/crates/wysiwyg/src/composer_model/undo_redo.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use crate::{ComposerModel, ComposerUpdate, UnicodeString};
diff --git a/crates/wysiwyg/src/composer_state.rs b/crates/wysiwyg/src/composer_state.rs
index 7d89c8c3..394ba512 100644
--- a/crates/wysiwyg/src/composer_state.rs
+++ b/crates/wysiwyg/src/composer_state.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use crate::dom::{Dom, UnicodeString};
diff --git a/crates/wysiwyg/src/composer_update.rs b/crates/wysiwyg/src/composer_update.rs
index e96c4967..93738e95 100644
--- a/crates/wysiwyg/src/composer_update.rs
+++ b/crates/wysiwyg/src/composer_update.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use crate::dom::UnicodeString;
diff --git a/crates/wysiwyg/src/dom.rs b/crates/wysiwyg/src/dom.rs
index 22453895..d0ae3cb3 100644
--- a/crates/wysiwyg/src/dom.rs
+++ b/crates/wysiwyg/src/dom.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 pub mod action_list;
diff --git a/crates/wysiwyg/src/dom/action_list.rs b/crates/wysiwyg/src/dom/action_list.rs
index 0d441a3f..39ba0abf 100644
--- a/crates/wysiwyg/src/dom/action_list.rs
+++ b/crates/wysiwyg/src/dom/action_list.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use crate::{DomHandle, DomNode, UnicodeString};
diff --git a/crates/wysiwyg/src/dom/dom_block_nodes.rs b/crates/wysiwyg/src/dom/dom_block_nodes.rs
index 7e2ed8fa..7d420ef0 100644
--- a/crates/wysiwyg/src/dom/dom_block_nodes.rs
+++ b/crates/wysiwyg/src/dom/dom_block_nodes.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use crate::dom::nodes::dom_node::DomNodeKind;
diff --git a/crates/wysiwyg/src/dom/dom_creation_error.rs b/crates/wysiwyg/src/dom/dom_creation_error.rs
index 38758b34..17e0ddb6 100644
--- a/crates/wysiwyg/src/dom/dom_creation_error.rs
+++ b/crates/wysiwyg/src/dom/dom_creation_error.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use core::fmt;
diff --git a/crates/wysiwyg/src/dom/dom_handle.rs b/crates/wysiwyg/src/dom/dom_handle.rs
index 95bf7abb..e53b41bd 100644
--- a/crates/wysiwyg/src/dom/dom_handle.rs
+++ b/crates/wysiwyg/src/dom/dom_handle.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 #[derive(Clone, Debug, PartialEq, Hash, Eq, PartialOrd, Ord)]
diff --git a/crates/wysiwyg/src/dom/dom_invariants.rs b/crates/wysiwyg/src/dom/dom_invariants.rs
index 668d92a6..1e6b700e 100644
--- a/crates/wysiwyg/src/dom/dom_invariants.rs
+++ b/crates/wysiwyg/src/dom/dom_invariants.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 //! Assertions that guarantee the Dom is in a known state.
diff --git a/crates/wysiwyg/src/dom/dom_list_methods.rs b/crates/wysiwyg/src/dom/dom_list_methods.rs
index 1bf2966c..cf121d74 100644
--- a/crates/wysiwyg/src/dom/dom_list_methods.rs
+++ b/crates/wysiwyg/src/dom/dom_list_methods.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 //! Methods on Dom that modify its contents and are guaranteed to conform to
diff --git a/crates/wysiwyg/src/dom/dom_methods.rs b/crates/wysiwyg/src/dom/dom_methods.rs
index 40fa5703..c5eb653e 100644
--- a/crates/wysiwyg/src/dom/dom_methods.rs
+++ b/crates/wysiwyg/src/dom/dom_methods.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 //! Methods on Dom that modify its contents and are guaranteed to conform to
diff --git a/crates/wysiwyg/src/dom/dom_struct.rs b/crates/wysiwyg/src/dom/dom_struct.rs
index 29bca623..0ef76ea3 100644
--- a/crates/wysiwyg/src/dom/dom_struct.rs
+++ b/crates/wysiwyg/src/dom/dom_struct.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use std::fmt::Display;
diff --git a/crates/wysiwyg/src/dom/find_extended_range.rs b/crates/wysiwyg/src/dom/find_extended_range.rs
index fb7a928e..00f6ff15 100644
--- a/crates/wysiwyg/src/dom/find_extended_range.rs
+++ b/crates/wysiwyg/src/dom/find_extended_range.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use crate::{DomHandle, UnicodeString};
diff --git a/crates/wysiwyg/src/dom/find_range.rs b/crates/wysiwyg/src/dom/find_range.rs
index b94f2595..0726cc40 100644
--- a/crates/wysiwyg/src/dom/find_range.rs
+++ b/crates/wysiwyg/src/dom/find_range.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use crate::dom::nodes::dom_node::DomNodeKind;
diff --git a/crates/wysiwyg/src/dom/find_result.rs b/crates/wysiwyg/src/dom/find_result.rs
index fb101b6b..6f9514df 100644
--- a/crates/wysiwyg/src/dom/find_result.rs
+++ b/crates/wysiwyg/src/dom/find_result.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use crate::dom::range::DomLocation;
diff --git a/crates/wysiwyg/src/dom/insert_node_at_cursor.rs b/crates/wysiwyg/src/dom/insert_node_at_cursor.rs
index 36e4005b..2a892c42 100644
--- a/crates/wysiwyg/src/dom/insert_node_at_cursor.rs
+++ b/crates/wysiwyg/src/dom/insert_node_at_cursor.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use crate::{DomHandle, DomNode, UnicodeString};
diff --git a/crates/wysiwyg/src/dom/insert_parent.rs b/crates/wysiwyg/src/dom/insert_parent.rs
index 524d858c..5f47c70b 100644
--- a/crates/wysiwyg/src/dom/insert_parent.rs
+++ b/crates/wysiwyg/src/dom/insert_parent.rs
@@ -1,3 +1,8 @@
+// Copyright 2025 New Vector Ltd.
+//
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+// Please see LICENSE in the repository root for full details.
+
 use crate::{DomHandle, DomNode, UnicodeString};
 
 use super::{Dom, Range};
diff --git a/crates/wysiwyg/src/dom/iter.rs b/crates/wysiwyg/src/dom/iter.rs
index 73903796..51a16bbf 100644
--- a/crates/wysiwyg/src/dom/iter.rs
+++ b/crates/wysiwyg/src/dom/iter.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 //! Methods on Dom that modify its contents and are guaranteed to conform to
diff --git a/crates/wysiwyg/src/dom/join_nodes.rs b/crates/wysiwyg/src/dom/join_nodes.rs
index def8fde1..e62fb2fa 100644
--- a/crates/wysiwyg/src/dom/join_nodes.rs
+++ b/crates/wysiwyg/src/dom/join_nodes.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use crate::dom::action_list::{DomAction, DomActionList};
diff --git a/crates/wysiwyg/src/dom/nodes.rs b/crates/wysiwyg/src/dom/nodes.rs
index 94fa2d6c..22f75df3 100644
--- a/crates/wysiwyg/src/dom/nodes.rs
+++ b/crates/wysiwyg/src/dom/nodes.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 pub mod container_node;
diff --git a/crates/wysiwyg/src/dom/nodes/container_node.rs b/crates/wysiwyg/src/dom/nodes/container_node.rs
index 50412644..8d0f1bdd 100644
--- a/crates/wysiwyg/src/dom/nodes/container_node.rs
+++ b/crates/wysiwyg/src/dom/nodes/container_node.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use std::ops::ControlFlow;
diff --git a/crates/wysiwyg/src/dom/nodes/dom_node.rs b/crates/wysiwyg/src/dom/nodes/dom_node.rs
index 79ea5100..2887b430 100644
--- a/crates/wysiwyg/src/dom/nodes/dom_node.rs
+++ b/crates/wysiwyg/src/dom/nodes/dom_node.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use crate::composer_model::example_format::SelectionWriter;
diff --git a/crates/wysiwyg/src/dom/nodes/line_break_node.rs b/crates/wysiwyg/src/dom/nodes/line_break_node.rs
index 58407186..8249d5a9 100644
--- a/crates/wysiwyg/src/dom/nodes/line_break_node.rs
+++ b/crates/wysiwyg/src/dom/nodes/line_break_node.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use crate::composer_model::example_format::SelectionWriter;
diff --git a/crates/wysiwyg/src/dom/nodes/mention_node.rs b/crates/wysiwyg/src/dom/nodes/mention_node.rs
index ad6ed80c..24b10c80 100644
--- a/crates/wysiwyg/src/dom/nodes/mention_node.rs
+++ b/crates/wysiwyg/src/dom/nodes/mention_node.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 use matrix_mentions::{Mention, MentionKind};
 
diff --git a/crates/wysiwyg/src/dom/nodes/text_node.rs b/crates/wysiwyg/src/dom/nodes/text_node.rs
index f4b104cf..b0748000 100644
--- a/crates/wysiwyg/src/dom/nodes/text_node.rs
+++ b/crates/wysiwyg/src/dom/nodes/text_node.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use crate::composer_model::delete_text::Direction;
diff --git a/crates/wysiwyg/src/dom/parser.rs b/crates/wysiwyg/src/dom/parser.rs
index 59956554..e7c79b45 100644
--- a/crates/wysiwyg/src/dom/parser.rs
+++ b/crates/wysiwyg/src/dom/parser.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 //! Classes used for parsing HTML into a [super::Dom].
diff --git a/crates/wysiwyg/src/dom/parser/markdown.rs b/crates/wysiwyg/src/dom/parser/markdown.rs
index 401f3689..68ba0f6f 100644
--- a/crates/wysiwyg/src/dom/parser/markdown.rs
+++ b/crates/wysiwyg/src/dom/parser/markdown.rs
@@ -1,3 +1,8 @@
+// Copyright 2025 New Vector Ltd.
+//
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+// Please see LICENSE in the repository root for full details.
+
 pub mod markdown_html_parser;
 
 #[allow(unused_imports)]
diff --git a/crates/wysiwyg/src/dom/parser/markdown/markdown_html_parser.rs b/crates/wysiwyg/src/dom/parser/markdown/markdown_html_parser.rs
index d219e1bf..719fa18f 100644
--- a/crates/wysiwyg/src/dom/parser/markdown/markdown_html_parser.rs
+++ b/crates/wysiwyg/src/dom/parser/markdown/markdown_html_parser.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use md_parser::Event;
diff --git a/crates/wysiwyg/src/dom/parser/padom.rs b/crates/wysiwyg/src/dom/parser/padom.rs
index a6562ca0..3e9407d7 100644
--- a/crates/wysiwyg/src/dom/parser/padom.rs
+++ b/crates/wysiwyg/src/dom/parser/padom.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use std::fmt::Display;
diff --git a/crates/wysiwyg/src/dom/parser/padom_creation_error.rs b/crates/wysiwyg/src/dom/parser/padom_creation_error.rs
index adf18747..158cfd3e 100644
--- a/crates/wysiwyg/src/dom/parser/padom_creation_error.rs
+++ b/crates/wysiwyg/src/dom/parser/padom_creation_error.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use super::PaDom;
diff --git a/crates/wysiwyg/src/dom/parser/padom_creator.rs b/crates/wysiwyg/src/dom/parser/padom_creator.rs
index daf9d557..0f4aad84 100644
--- a/crates/wysiwyg/src/dom/parser/padom_creator.rs
+++ b/crates/wysiwyg/src/dom/parser/padom_creator.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use html5ever::tendril::{StrTendril, TendrilSink};
diff --git a/crates/wysiwyg/src/dom/parser/padom_handle.rs b/crates/wysiwyg/src/dom/parser/padom_handle.rs
index ad0773b8..0f0a0f4e 100644
--- a/crates/wysiwyg/src/dom/parser/padom_handle.rs
+++ b/crates/wysiwyg/src/dom/parser/padom_handle.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 #[derive(Clone, Debug, PartialEq, Eq)]
diff --git a/crates/wysiwyg/src/dom/parser/padom_node.rs b/crates/wysiwyg/src/dom/parser/padom_node.rs
index a6aea448..fc489724 100644
--- a/crates/wysiwyg/src/dom/parser/padom_node.rs
+++ b/crates/wysiwyg/src/dom/parser/padom_node.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use html5ever::QualName;
diff --git a/crates/wysiwyg/src/dom/parser/panode_container.rs b/crates/wysiwyg/src/dom/parser/panode_container.rs
index c2e72078..4d83e8f1 100644
--- a/crates/wysiwyg/src/dom/parser/panode_container.rs
+++ b/crates/wysiwyg/src/dom/parser/panode_container.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use html5ever::QualName;
diff --git a/crates/wysiwyg/src/dom/parser/panode_text.rs b/crates/wysiwyg/src/dom/parser/panode_text.rs
index 4269497d..0c89d4c8 100644
--- a/crates/wysiwyg/src/dom/parser/panode_text.rs
+++ b/crates/wysiwyg/src/dom/parser/panode_text.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 #[derive(Clone, Debug, PartialEq)]
diff --git a/crates/wysiwyg/src/dom/parser/paqual_name.rs b/crates/wysiwyg/src/dom/parser/paqual_name.rs
index 9574b178..bfe34240 100644
--- a/crates/wysiwyg/src/dom/parser/paqual_name.rs
+++ b/crates/wysiwyg/src/dom/parser/paqual_name.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use html5ever::{LocalName, Namespace, QualName};
diff --git a/crates/wysiwyg/src/dom/parser/parse.rs b/crates/wysiwyg/src/dom/parser/parse.rs
index e906c189..2665fa96 100644
--- a/crates/wysiwyg/src/dom/parser/parse.rs
+++ b/crates/wysiwyg/src/dom/parser/parse.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use regex::Regex;
diff --git a/crates/wysiwyg/src/dom/range.rs b/crates/wysiwyg/src/dom/range.rs
index 98d6144e..4ec6b9e5 100644
--- a/crates/wysiwyg/src/dom/range.rs
+++ b/crates/wysiwyg/src/dom/range.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use crate::dom::dom_handle::DomHandle;
diff --git a/crates/wysiwyg/src/dom/to_html.rs b/crates/wysiwyg/src/dom/to_html.rs
index 794663b7..68a46c4c 100644
--- a/crates/wysiwyg/src/dom/to_html.rs
+++ b/crates/wysiwyg/src/dom/to_html.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use crate::composer_model::example_format::SelectionWriter;
diff --git a/crates/wysiwyg/src/dom/to_markdown.rs b/crates/wysiwyg/src/dom/to_markdown.rs
index 23dc5864..edb3da57 100644
--- a/crates/wysiwyg/src/dom/to_markdown.rs
+++ b/crates/wysiwyg/src/dom/to_markdown.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use super::UnicodeString;
diff --git a/crates/wysiwyg/src/dom/to_plain_text.rs b/crates/wysiwyg/src/dom/to_plain_text.rs
index 242291c1..c12b3355 100644
--- a/crates/wysiwyg/src/dom/to_plain_text.rs
+++ b/crates/wysiwyg/src/dom/to_plain_text.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use super::UnicodeString;
diff --git a/crates/wysiwyg/src/dom/to_raw_text.rs b/crates/wysiwyg/src/dom/to_raw_text.rs
index 454e704c..6e8716d8 100644
--- a/crates/wysiwyg/src/dom/to_raw_text.rs
+++ b/crates/wysiwyg/src/dom/to_raw_text.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use super::UnicodeString;
diff --git a/crates/wysiwyg/src/dom/to_tree.rs b/crates/wysiwyg/src/dom/to_tree.rs
index 034980ca..3f7b2bf0 100644
--- a/crates/wysiwyg/src/dom/to_tree.rs
+++ b/crates/wysiwyg/src/dom/to_tree.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use super::unicode_string::UnicodeStringExt;
diff --git a/crates/wysiwyg/src/dom/unicode_string.rs b/crates/wysiwyg/src/dom/unicode_string.rs
index 13b906df..7d5db029 100644
--- a/crates/wysiwyg/src/dom/unicode_string.rs
+++ b/crates/wysiwyg/src/dom/unicode_string.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use std::fmt;
diff --git a/crates/wysiwyg/src/format_type.rs b/crates/wysiwyg/src/format_type.rs
index c3111b09..8ca33b8b 100644
--- a/crates/wysiwyg/src/format_type.rs
+++ b/crates/wysiwyg/src/format_type.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use crate::{ComposerAction, UnicodeString};
diff --git a/crates/wysiwyg/src/lib.rs b/crates/wysiwyg/src/lib.rs
index 9ce09130..79a4d33e 100644
--- a/crates/wysiwyg/src/lib.rs
+++ b/crates/wysiwyg/src/lib.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 mod action_state;
diff --git a/crates/wysiwyg/src/link_action.rs b/crates/wysiwyg/src/link_action.rs
index 31dabb45..be1ffff6 100644
--- a/crates/wysiwyg/src/link_action.rs
+++ b/crates/wysiwyg/src/link_action.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use crate::UnicodeString;
diff --git a/crates/wysiwyg/src/list_type.rs b/crates/wysiwyg/src/list_type.rs
index 8c623615..5249b2bc 100644
--- a/crates/wysiwyg/src/list_type.rs
+++ b/crates/wysiwyg/src/list_type.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use crate::UnicodeString;
diff --git a/crates/wysiwyg/src/location.rs b/crates/wysiwyg/src/location.rs
index 1d35f579..d2718102 100644
--- a/crates/wysiwyg/src/location.rs
+++ b/crates/wysiwyg/src/location.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use std::ops;
diff --git a/crates/wysiwyg/src/mentions_state.rs b/crates/wysiwyg/src/mentions_state.rs
index e40cbd92..63c6784b 100644
--- a/crates/wysiwyg/src/mentions_state.rs
+++ b/crates/wysiwyg/src/mentions_state.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use std::collections::HashSet;
diff --git a/crates/wysiwyg/src/menu_action.rs b/crates/wysiwyg/src/menu_action.rs
index 971dd679..4b39473b 100644
--- a/crates/wysiwyg/src/menu_action.rs
+++ b/crates/wysiwyg/src/menu_action.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use crate::SuggestionPattern;
diff --git a/crates/wysiwyg/src/menu_state.rs b/crates/wysiwyg/src/menu_state.rs
index 080869a2..902eeded 100644
--- a/crates/wysiwyg/src/menu_state.rs
+++ b/crates/wysiwyg/src/menu_state.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use crate::action_state::ActionState;
diff --git a/crates/wysiwyg/src/pattern_key.rs b/crates/wysiwyg/src/pattern_key.rs
index 636199c3..086e0064 100644
--- a/crates/wysiwyg/src/pattern_key.rs
+++ b/crates/wysiwyg/src/pattern_key.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use std::collections::HashSet;
diff --git a/crates/wysiwyg/src/suggestion_pattern.rs b/crates/wysiwyg/src/suggestion_pattern.rs
index 10b4b03e..2b29170b 100644
--- a/crates/wysiwyg/src/suggestion_pattern.rs
+++ b/crates/wysiwyg/src/suggestion_pattern.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use crate::PatternKey;
diff --git a/crates/wysiwyg/src/tests.rs b/crates/wysiwyg/src/tests.rs
index 202b2ea7..0bbbdb9f 100644
--- a/crates/wysiwyg/src/tests.rs
+++ b/crates/wysiwyg/src/tests.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 #![cfg(test)]
diff --git a/crates/wysiwyg/src/tests/test_characters.rs b/crates/wysiwyg/src/tests/test_characters.rs
index 030176a1..b5691429 100644
--- a/crates/wysiwyg/src/tests/test_characters.rs
+++ b/crates/wysiwyg/src/tests/test_characters.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use crate::{ComposerModel, Location};
diff --git a/crates/wysiwyg/src/tests/test_deleting.rs b/crates/wysiwyg/src/tests/test_deleting.rs
index 7c0ea77e..02d4ee39 100644
--- a/crates/wysiwyg/src/tests/test_deleting.rs
+++ b/crates/wysiwyg/src/tests/test_deleting.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use crate::{
diff --git a/crates/wysiwyg/src/tests/test_emoji_replacement.rs b/crates/wysiwyg/src/tests/test_emoji_replacement.rs
index 8ff7b555..031432c6 100644
--- a/crates/wysiwyg/src/tests/test_emoji_replacement.rs
+++ b/crates/wysiwyg/src/tests/test_emoji_replacement.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use widestring::Utf16String;
diff --git a/crates/wysiwyg/src/tests/test_formatting.rs b/crates/wysiwyg/src/tests/test_formatting.rs
index be0ba972..d3f6220e 100644
--- a/crates/wysiwyg/src/tests/test_formatting.rs
+++ b/crates/wysiwyg/src/tests/test_formatting.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use crate::tests::testutils_composer_model::{cm, tx};
diff --git a/crates/wysiwyg/src/tests/test_get_link_action.rs b/crates/wysiwyg/src/tests/test_get_link_action.rs
index 1bfd74c2..7dd86507 100644
--- a/crates/wysiwyg/src/tests/test_get_link_action.rs
+++ b/crates/wysiwyg/src/tests/test_get_link_action.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use indoc::indoc;
diff --git a/crates/wysiwyg/src/tests/test_links.rs b/crates/wysiwyg/src/tests/test_links.rs
index ce67af0c..78b5166f 100644
--- a/crates/wysiwyg/src/tests/test_links.rs
+++ b/crates/wysiwyg/src/tests/test_links.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use crate::tests::testutils_composer_model::{cm, tx};
diff --git a/crates/wysiwyg/src/tests/test_lists.rs b/crates/wysiwyg/src/tests/test_lists.rs
index 67212f73..47bf0c91 100644
--- a/crates/wysiwyg/src/tests/test_lists.rs
+++ b/crates/wysiwyg/src/tests/test_lists.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use widestring::Utf16String;
diff --git a/crates/wysiwyg/src/tests/test_lists_with_blocks.rs b/crates/wysiwyg/src/tests/test_lists_with_blocks.rs
index 70e378d5..215e68f0 100644
--- a/crates/wysiwyg/src/tests/test_lists_with_blocks.rs
+++ b/crates/wysiwyg/src/tests/test_lists_with_blocks.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use crate::tests::testutils_composer_model::{cm, tx};
diff --git a/crates/wysiwyg/src/tests/test_mentions.rs b/crates/wysiwyg/src/tests/test_mentions.rs
index 1898df1f..f43bd4d2 100644
--- a/crates/wysiwyg/src/tests/test_mentions.rs
+++ b/crates/wysiwyg/src/tests/test_mentions.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use widestring::Utf16String;
diff --git a/crates/wysiwyg/src/tests/test_menu_action.rs b/crates/wysiwyg/src/tests/test_menu_action.rs
index c9e1451f..31170021 100644
--- a/crates/wysiwyg/src/tests/test_menu_action.rs
+++ b/crates/wysiwyg/src/tests/test_menu_action.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use crate::PatternKey::{At, Hash, Slash};
diff --git a/crates/wysiwyg/src/tests/test_menu_state.rs b/crates/wysiwyg/src/tests/test_menu_state.rs
index 0dd6de22..754cd86b 100644
--- a/crates/wysiwyg/src/tests/test_menu_state.rs
+++ b/crates/wysiwyg/src/tests/test_menu_state.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use widestring::Utf16String;
diff --git a/crates/wysiwyg/src/tests/test_paragraphs.rs b/crates/wysiwyg/src/tests/test_paragraphs.rs
index 057dcae2..b8e76582 100644
--- a/crates/wysiwyg/src/tests/test_paragraphs.rs
+++ b/crates/wysiwyg/src/tests/test_paragraphs.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use widestring::Utf16String;
diff --git a/crates/wysiwyg/src/tests/test_remove_links.rs b/crates/wysiwyg/src/tests/test_remove_links.rs
index 8495e258..1684c41e 100644
--- a/crates/wysiwyg/src/tests/test_remove_links.rs
+++ b/crates/wysiwyg/src/tests/test_remove_links.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use crate::tests::testutils_composer_model::{cm, tx};
diff --git a/crates/wysiwyg/src/tests/test_selection.rs b/crates/wysiwyg/src/tests/test_selection.rs
index 89b61340..4d35c497 100644
--- a/crates/wysiwyg/src/tests/test_selection.rs
+++ b/crates/wysiwyg/src/tests/test_selection.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use crate::tests::testutils_composer_model::{cm, tx};
diff --git a/crates/wysiwyg/src/tests/test_set_content.rs b/crates/wysiwyg/src/tests/test_set_content.rs
index 9e4e7c53..42c515de 100644
--- a/crates/wysiwyg/src/tests/test_set_content.rs
+++ b/crates/wysiwyg/src/tests/test_set_content.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use indoc::indoc;
diff --git a/crates/wysiwyg/src/tests/test_suggestions.rs b/crates/wysiwyg/src/tests/test_suggestions.rs
index dbf29ad3..c7ee8781 100644
--- a/crates/wysiwyg/src/tests/test_suggestions.rs
+++ b/crates/wysiwyg/src/tests/test_suggestions.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use crate::MenuAction;
diff --git a/crates/wysiwyg/src/tests/test_to_markdown.rs b/crates/wysiwyg/src/tests/test_to_markdown.rs
index d8830c39..92449e8e 100644
--- a/crates/wysiwyg/src/tests/test_to_markdown.rs
+++ b/crates/wysiwyg/src/tests/test_to_markdown.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use crate::{
diff --git a/crates/wysiwyg/src/tests/test_to_message_html.rs b/crates/wysiwyg/src/tests/test_to_message_html.rs
index a63f124d..da56a35f 100644
--- a/crates/wysiwyg/src/tests/test_to_message_html.rs
+++ b/crates/wysiwyg/src/tests/test_to_message_html.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use crate::tests::testutils_composer_model::{cm, tx};
diff --git a/crates/wysiwyg/src/tests/test_to_plain_text.rs b/crates/wysiwyg/src/tests/test_to_plain_text.rs
index 71fe98c7..09ad1f12 100644
--- a/crates/wysiwyg/src/tests/test_to_plain_text.rs
+++ b/crates/wysiwyg/src/tests/test_to_plain_text.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use crate::{dom::to_plain_text::ToPlainText, ComposerModel};
diff --git a/crates/wysiwyg/src/tests/test_to_raw_text.rs b/crates/wysiwyg/src/tests/test_to_raw_text.rs
index 7d92f61b..aa88e022 100644
--- a/crates/wysiwyg/src/tests/test_to_raw_text.rs
+++ b/crates/wysiwyg/src/tests/test_to_raw_text.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use widestring::Utf16String;
diff --git a/crates/wysiwyg/src/tests/test_to_tree.rs b/crates/wysiwyg/src/tests/test_to_tree.rs
index 5b1b99d7..d8b70102 100644
--- a/crates/wysiwyg/src/tests/test_to_tree.rs
+++ b/crates/wysiwyg/src/tests/test_to_tree.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use crate::tests::testutils_composer_model::cm;
diff --git a/crates/wysiwyg/src/tests/test_undo_redo.rs b/crates/wysiwyg/src/tests/test_undo_redo.rs
index d1d008ee..a8c86028 100644
--- a/crates/wysiwyg/src/tests/test_undo_redo.rs
+++ b/crates/wysiwyg/src/tests/test_undo_redo.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use crate::tests::testutils_composer_model::{cm, tx};
diff --git a/crates/wysiwyg/src/tests/testutils_composer_model.rs b/crates/wysiwyg/src/tests/testutils_composer_model.rs
index 96dc45e5..42c0cee6 100644
--- a/crates/wysiwyg/src/tests/testutils_composer_model.rs
+++ b/crates/wysiwyg/src/tests/testutils_composer_model.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use widestring::Utf16String;
diff --git a/crates/wysiwyg/src/tests/testutils_conversion.rs b/crates/wysiwyg/src/tests/testutils_conversion.rs
index f720ed7c..6253bd32 100644
--- a/crates/wysiwyg/src/tests/testutils_conversion.rs
+++ b/crates/wysiwyg/src/tests/testutils_conversion.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use widestring::Utf16String;
diff --git a/crates/wysiwyg/src/tests/testutils_dom.rs b/crates/wysiwyg/src/tests/testutils_dom.rs
index ae9d48e4..580f4dc3 100644
--- a/crates/wysiwyg/src/tests/testutils_dom.rs
+++ b/crates/wysiwyg/src/tests/testutils_dom.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use widestring::Utf16String;
diff --git a/crates/wysiwyg/src/text_update.rs b/crates/wysiwyg/src/text_update.rs
index 92df6a59..4e56a09d 100644
--- a/crates/wysiwyg/src/text_update.rs
+++ b/crates/wysiwyg/src/text_update.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use crate::{dom::UnicodeString, Location};
diff --git a/crates/wysiwyg/tests/tests.rs b/crates/wysiwyg/tests/tests.rs
index 3c21c9a0..8de366a4 100644
--- a/crates/wysiwyg/tests/tests.rs
+++ b/crates/wysiwyg/tests/tests.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 
 use widestring::Utf16String;
diff --git a/platforms/android/example-compose/src/main/java/io/element/wysiwyg/compose/ComposeApplication.kt b/platforms/android/example-compose/src/main/java/io/element/wysiwyg/compose/ComposeApplication.kt
index 1e55172b..efbf6423 100644
--- a/platforms/android/example-compose/src/main/java/io/element/wysiwyg/compose/ComposeApplication.kt
+++ b/platforms/android/example-compose/src/main/java/io/element/wysiwyg/compose/ComposeApplication.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/example-compose/src/main/java/io/element/wysiwyg/compose/DefaultMentionDisplayHandler.kt b/platforms/android/example-compose/src/main/java/io/element/wysiwyg/compose/DefaultMentionDisplayHandler.kt
index ad40717e..2f4f52c3 100644
--- a/platforms/android/example-compose/src/main/java/io/element/wysiwyg/compose/DefaultMentionDisplayHandler.kt
+++ b/platforms/android/example-compose/src/main/java/io/element/wysiwyg/compose/DefaultMentionDisplayHandler.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/example-compose/src/main/java/io/element/wysiwyg/compose/LinkDialog.kt b/platforms/android/example-compose/src/main/java/io/element/wysiwyg/compose/LinkDialog.kt
index 140f4ede..c1ac7f2c 100644
--- a/platforms/android/example-compose/src/main/java/io/element/wysiwyg/compose/LinkDialog.kt
+++ b/platforms/android/example-compose/src/main/java/io/element/wysiwyg/compose/LinkDialog.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/example-compose/src/main/java/io/element/wysiwyg/compose/MainActivity.kt b/platforms/android/example-compose/src/main/java/io/element/wysiwyg/compose/MainActivity.kt
index 191fdc02..bcd57a51 100644
--- a/platforms/android/example-compose/src/main/java/io/element/wysiwyg/compose/MainActivity.kt
+++ b/platforms/android/example-compose/src/main/java/io/element/wysiwyg/compose/MainActivity.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/example-compose/src/main/java/io/element/wysiwyg/compose/SuggestionsView.kt b/platforms/android/example-compose/src/main/java/io/element/wysiwyg/compose/SuggestionsView.kt
index 2d8f16c3..deb67476 100644
--- a/platforms/android/example-compose/src/main/java/io/element/wysiwyg/compose/SuggestionsView.kt
+++ b/platforms/android/example-compose/src/main/java/io/element/wysiwyg/compose/SuggestionsView.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/example-compose/src/main/java/io/element/wysiwyg/compose/matrix/Mention.kt b/platforms/android/example-compose/src/main/java/io/element/wysiwyg/compose/matrix/Mention.kt
index 5244db5b..928de598 100644
--- a/platforms/android/example-compose/src/main/java/io/element/wysiwyg/compose/matrix/Mention.kt
+++ b/platforms/android/example-compose/src/main/java/io/element/wysiwyg/compose/matrix/Mention.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/example-compose/src/main/java/io/element/wysiwyg/compose/matrix/MentionType.kt b/platforms/android/example-compose/src/main/java/io/element/wysiwyg/compose/matrix/MentionType.kt
index 4abdd210..4d6a1ffa 100644
--- a/platforms/android/example-compose/src/main/java/io/element/wysiwyg/compose/matrix/MentionType.kt
+++ b/platforms/android/example-compose/src/main/java/io/element/wysiwyg/compose/matrix/MentionType.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/example-compose/src/main/java/io/element/wysiwyg/compose/ui/components/FormattingButtons.kt b/platforms/android/example-compose/src/main/java/io/element/wysiwyg/compose/ui/components/FormattingButtons.kt
index 0e042356..63dbdd41 100644
--- a/platforms/android/example-compose/src/main/java/io/element/wysiwyg/compose/ui/components/FormattingButtons.kt
+++ b/platforms/android/example-compose/src/main/java/io/element/wysiwyg/compose/ui/components/FormattingButtons.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/example-compose/src/main/java/io/element/wysiwyg/compose/ui/theme/Color.kt b/platforms/android/example-compose/src/main/java/io/element/wysiwyg/compose/ui/theme/Color.kt
index 5126116e..82fbe099 100644
--- a/platforms/android/example-compose/src/main/java/io/element/wysiwyg/compose/ui/theme/Color.kt
+++ b/platforms/android/example-compose/src/main/java/io/element/wysiwyg/compose/ui/theme/Color.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/example-compose/src/main/java/io/element/wysiwyg/compose/ui/theme/Theme.kt b/platforms/android/example-compose/src/main/java/io/element/wysiwyg/compose/ui/theme/Theme.kt
index f2b88ba5..523495c1 100644
--- a/platforms/android/example-compose/src/main/java/io/element/wysiwyg/compose/ui/theme/Theme.kt
+++ b/platforms/android/example-compose/src/main/java/io/element/wysiwyg/compose/ui/theme/Theme.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/example-view/src/main/java/io/element/android/wysiwyg/poc/ExampleApplication.kt b/platforms/android/example-view/src/main/java/io/element/android/wysiwyg/poc/ExampleApplication.kt
index 2e5228d3..288fa524 100644
--- a/platforms/android/example-view/src/main/java/io/element/android/wysiwyg/poc/ExampleApplication.kt
+++ b/platforms/android/example-view/src/main/java/io/element/android/wysiwyg/poc/ExampleApplication.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/example-view/src/main/java/io/element/android/wysiwyg/poc/MainActivity.kt b/platforms/android/example-view/src/main/java/io/element/android/wysiwyg/poc/MainActivity.kt
index 73c13201..bec32170 100644
--- a/platforms/android/example-view/src/main/java/io/element/android/wysiwyg/poc/MainActivity.kt
+++ b/platforms/android/example-view/src/main/java/io/element/android/wysiwyg/poc/MainActivity.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/example-view/src/main/java/io/element/android/wysiwyg/poc/RichTextEditor.kt b/platforms/android/example-view/src/main/java/io/element/android/wysiwyg/poc/RichTextEditor.kt
index a42a6c2e..43b767a2 100644
--- a/platforms/android/example-view/src/main/java/io/element/android/wysiwyg/poc/RichTextEditor.kt
+++ b/platforms/android/example-view/src/main/java/io/element/android/wysiwyg/poc/RichTextEditor.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/example-view/src/main/java/io/element/android/wysiwyg/poc/matrix/MatrixMentionMentionDisplayHandler.kt b/platforms/android/example-view/src/main/java/io/element/android/wysiwyg/poc/matrix/MatrixMentionMentionDisplayHandler.kt
index 77024c05..b7843d21 100644
--- a/platforms/android/example-view/src/main/java/io/element/android/wysiwyg/poc/matrix/MatrixMentionMentionDisplayHandler.kt
+++ b/platforms/android/example-view/src/main/java/io/element/android/wysiwyg/poc/matrix/MatrixMentionMentionDisplayHandler.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/example-view/src/main/java/io/element/android/wysiwyg/poc/matrix/Mention.kt b/platforms/android/example-view/src/main/java/io/element/android/wysiwyg/poc/matrix/Mention.kt
index 0ba832e1..d79974a4 100644
--- a/platforms/android/example-view/src/main/java/io/element/android/wysiwyg/poc/matrix/Mention.kt
+++ b/platforms/android/example-view/src/main/java/io/element/android/wysiwyg/poc/matrix/Mention.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/example-view/src/main/java/io/element/android/wysiwyg/poc/matrix/MentionType.kt b/platforms/android/example-view/src/main/java/io/element/android/wysiwyg/poc/matrix/MentionType.kt
index f91c0e0e..7a34e8a2 100644
--- a/platforms/android/example-view/src/main/java/io/element/android/wysiwyg/poc/matrix/MentionType.kt
+++ b/platforms/android/example-view/src/main/java/io/element/android/wysiwyg/poc/matrix/MentionType.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/gradle.properties b/platforms/android/gradle.properties
index 782409ae..e54ac8fa 100644
--- a/platforms/android/gradle.properties
+++ b/platforms/android/gradle.properties
@@ -22,27 +22,5 @@ android.enableBuildConfigAsBytecode=true
 # ===================
 # Maven publishing
 # ===================
-SONATYPE_HOST=S01
-RELEASE_SIGNING_ENABLED=true
-
-GROUP=io.element.android
-# POM_ARTIFACT_ID is configured in each module's gradle.properties
-VERSION_NAME=2.38.0
-
-POM_NAME=Matrix Rich Text Editor
-POM_DESCRIPTION=Cross-platform rich text editor that generates HTML output.
-POM_INCEPTION_YEAR=2022
-POM_URL=https://github.com/element-hq/matrix-rich-text-editor
-
-POM_LICENSE_NAME=GNU AFFERO GENERAL PUBLIC LICENSE
-POM_LICENSE_URL=https://www.gnu.org/licenses/agpl-3.0.txt
-POM_LICENSE_DIST=repo
-
-POM_SCM_URL=https://github.com/element-hq/matrix-rich-text-editor
-POM_SCM_CONNECTION=scm:git:git://github.com/element-hq/matrix-rich-text-editor.git
-POM_SCM_DEV_CONNECTION=scm:git:ssh://github.com/element-hq/matrix-rich-text-editor.git
-
-POM_DEVELOPER_ID=matrixdev
-POM_DEVELOPER_NAME=matrixdev
-POM_DEVELOPER_URL=https://github.com/element-hq/
-POM_DEVELOPER_EMAIL=android@element.io
+MAVEN_GROUP=io.element.android
+MAVEN_VERSION_NAME=2.38.0
diff --git a/platforms/android/library-compose/build.gradle b/platforms/android/library-compose/build.gradle
index dbed3c8e..4790da13 100644
--- a/platforms/android/library-compose/build.gradle
+++ b/platforms/android/library-compose/build.gradle
@@ -108,3 +108,41 @@ tasks.withType(Test) {
     jacoco.includeNoLocationClasses = true
     jacoco.excludes = ['jdk.internal.*']
 }
+
+mavenPublishing {
+    coordinates(property("MAVEN_GROUP"), property("POM_ARTIFACT_ID"), property("MAVEN_VERSION_NAME"))
+    if (!providers.gradleProperty("mavenCentralUsername")) {
+        println("No maven central provider")
+    }
+    pom {
+        name = "Matrix Rich Text Editor - Compose"
+        description.set("Cross-platform rich text editor that generates HTML output.")
+        inceptionYear.set("2022")
+        url.set("https://github.com/element-hq/matrix-rich-text-editor")
+        licenses {
+            license {
+                name.set("GNU Affero General Public License (AGPL) version 3.0")
+                url.set("https://www.gnu.org/licenses/agpl-3.0.txt")
+                distribution.set("https://www.gnu.org/licenses/agpl-3.0.txt")
+            }
+            license {
+                name.set("Element Commercial License")
+                url.set("https://raw.githubusercontent.com/element-hq/matrix-rich-text-editor/refs/heads/main/LICENSE-COMMERCIAL")
+                distribution.set("https://raw.githubusercontent.com/element-hq/matrix-rich-text-editor/refs/heads/main/LICENSE-COMMERCIAL")
+            }
+        }
+        developers {
+            developer {
+                id.set("matrixdev")
+                name.set("matrixdev")
+                url.set("https://github.com/element-hq/")
+                email.set("android@element.io")
+            }
+        }
+        scm {
+            url.set("https://github.com/element-hq/matrix-rich-text-editor/")
+            connection.set("scm:git:git://github.com/element-hq/matrix-rich-text-editor.git")
+            developerConnection.set("scm:git:ssh://git@github.com/element-hq/matrix-rich-text-editor.git")
+        }
+    }
+}
diff --git a/platforms/android/library-compose/src/androidTest/java/io/element/android/wysiwyg/compose/RichTextEditorActionsTest.kt b/platforms/android/library-compose/src/androidTest/java/io/element/android/wysiwyg/compose/RichTextEditorActionsTest.kt
index b263125f..2a6df9db 100644
--- a/platforms/android/library-compose/src/androidTest/java/io/element/android/wysiwyg/compose/RichTextEditorActionsTest.kt
+++ b/platforms/android/library-compose/src/androidTest/java/io/element/android/wysiwyg/compose/RichTextEditorActionsTest.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library-compose/src/androidTest/java/io/element/android/wysiwyg/compose/RichTextEditorStateTest.kt b/platforms/android/library-compose/src/androidTest/java/io/element/android/wysiwyg/compose/RichTextEditorStateTest.kt
index 29a6cc08..192bd4fc 100644
--- a/platforms/android/library-compose/src/androidTest/java/io/element/android/wysiwyg/compose/RichTextEditorStateTest.kt
+++ b/platforms/android/library-compose/src/androidTest/java/io/element/android/wysiwyg/compose/RichTextEditorStateTest.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library-compose/src/androidTest/java/io/element/android/wysiwyg/compose/RichTextEditorStyleTest.kt b/platforms/android/library-compose/src/androidTest/java/io/element/android/wysiwyg/compose/RichTextEditorStyleTest.kt
index 526e81fa..663e8904 100644
--- a/platforms/android/library-compose/src/androidTest/java/io/element/android/wysiwyg/compose/RichTextEditorStyleTest.kt
+++ b/platforms/android/library-compose/src/androidTest/java/io/element/android/wysiwyg/compose/RichTextEditorStyleTest.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library-compose/src/androidTest/java/io/element/android/wysiwyg/compose/RichTextEditorTest.kt b/platforms/android/library-compose/src/androidTest/java/io/element/android/wysiwyg/compose/RichTextEditorTest.kt
index b6b03a11..04352874 100644
--- a/platforms/android/library-compose/src/androidTest/java/io/element/android/wysiwyg/compose/RichTextEditorTest.kt
+++ b/platforms/android/library-compose/src/androidTest/java/io/element/android/wysiwyg/compose/RichTextEditorTest.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library-compose/src/androidTest/java/io/element/android/wysiwyg/compose/testutils/ComposeTestRuleExt.kt b/platforms/android/library-compose/src/androidTest/java/io/element/android/wysiwyg/compose/testutils/ComposeTestRuleExt.kt
index 7f788a29..adc45766 100644
--- a/platforms/android/library-compose/src/androidTest/java/io/element/android/wysiwyg/compose/testutils/ComposeTestRuleExt.kt
+++ b/platforms/android/library-compose/src/androidTest/java/io/element/android/wysiwyg/compose/testutils/ComposeTestRuleExt.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library-compose/src/androidTest/java/io/element/android/wysiwyg/compose/testutils/ComposerActions.kt b/platforms/android/library-compose/src/androidTest/java/io/element/android/wysiwyg/compose/testutils/ComposerActions.kt
index df82acd1..16a36d80 100644
--- a/platforms/android/library-compose/src/androidTest/java/io/element/android/wysiwyg/compose/testutils/ComposerActions.kt
+++ b/platforms/android/library-compose/src/androidTest/java/io/element/android/wysiwyg/compose/testutils/ComposerActions.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library-compose/src/androidTest/java/io/element/android/wysiwyg/compose/testutils/EditorActions.kt b/platforms/android/library-compose/src/androidTest/java/io/element/android/wysiwyg/compose/testutils/EditorActions.kt
index 8b68a95f..a9b0908d 100644
--- a/platforms/android/library-compose/src/androidTest/java/io/element/android/wysiwyg/compose/testutils/EditorActions.kt
+++ b/platforms/android/library-compose/src/androidTest/java/io/element/android/wysiwyg/compose/testutils/EditorActions.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library-compose/src/androidTest/java/io/element/android/wysiwyg/compose/testutils/StateFactory.kt b/platforms/android/library-compose/src/androidTest/java/io/element/android/wysiwyg/compose/testutils/StateFactory.kt
index 54ca361c..0e3313b2 100644
--- a/platforms/android/library-compose/src/androidTest/java/io/element/android/wysiwyg/compose/testutils/StateFactory.kt
+++ b/platforms/android/library-compose/src/androidTest/java/io/element/android/wysiwyg/compose/testutils/StateFactory.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library-compose/src/androidTest/java/io/element/android/wysiwyg/compose/testutils/ViewMatchers.kt b/platforms/android/library-compose/src/androidTest/java/io/element/android/wysiwyg/compose/testutils/ViewMatchers.kt
index 7cf19535..239c9aef 100644
--- a/platforms/android/library-compose/src/androidTest/java/io/element/android/wysiwyg/compose/testutils/ViewMatchers.kt
+++ b/platforms/android/library-compose/src/androidTest/java/io/element/android/wysiwyg/compose/testutils/ViewMatchers.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library-compose/src/main/java/io/element/android/wysiwyg/compose/EditorStyledText.kt b/platforms/android/library-compose/src/main/java/io/element/android/wysiwyg/compose/EditorStyledText.kt
index f9ef9ef5..12e678f0 100644
--- a/platforms/android/library-compose/src/main/java/io/element/android/wysiwyg/compose/EditorStyledText.kt
+++ b/platforms/android/library-compose/src/main/java/io/element/android/wysiwyg/compose/EditorStyledText.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library-compose/src/main/java/io/element/android/wysiwyg/compose/RichTextEditor.kt b/platforms/android/library-compose/src/main/java/io/element/android/wysiwyg/compose/RichTextEditor.kt
index 7628e1ea..837bf027 100644
--- a/platforms/android/library-compose/src/main/java/io/element/android/wysiwyg/compose/RichTextEditor.kt
+++ b/platforms/android/library-compose/src/main/java/io/element/android/wysiwyg/compose/RichTextEditor.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library-compose/src/main/java/io/element/android/wysiwyg/compose/RichTextEditorDefaults.kt b/platforms/android/library-compose/src/main/java/io/element/android/wysiwyg/compose/RichTextEditorDefaults.kt
index 05039eab..eeb2739b 100644
--- a/platforms/android/library-compose/src/main/java/io/element/android/wysiwyg/compose/RichTextEditorDefaults.kt
+++ b/platforms/android/library-compose/src/main/java/io/element/android/wysiwyg/compose/RichTextEditorDefaults.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library-compose/src/main/java/io/element/android/wysiwyg/compose/RichTextEditorState.kt b/platforms/android/library-compose/src/main/java/io/element/android/wysiwyg/compose/RichTextEditorState.kt
index 51244bd9..ba5161b3 100644
--- a/platforms/android/library-compose/src/main/java/io/element/android/wysiwyg/compose/RichTextEditorState.kt
+++ b/platforms/android/library-compose/src/main/java/io/element/android/wysiwyg/compose/RichTextEditorState.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library-compose/src/main/java/io/element/android/wysiwyg/compose/RichTextEditorStyle.kt b/platforms/android/library-compose/src/main/java/io/element/android/wysiwyg/compose/RichTextEditorStyle.kt
index 1321b38e..5d0da0f6 100644
--- a/platforms/android/library-compose/src/main/java/io/element/android/wysiwyg/compose/RichTextEditorStyle.kt
+++ b/platforms/android/library-compose/src/main/java/io/element/android/wysiwyg/compose/RichTextEditorStyle.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library-compose/src/main/java/io/element/android/wysiwyg/compose/StyledHtmlConverter.kt b/platforms/android/library-compose/src/main/java/io/element/android/wysiwyg/compose/StyledHtmlConverter.kt
index edbe09cd..34ca2082 100644
--- a/platforms/android/library-compose/src/main/java/io/element/android/wysiwyg/compose/StyledHtmlConverter.kt
+++ b/platforms/android/library-compose/src/main/java/io/element/android/wysiwyg/compose/StyledHtmlConverter.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library-compose/src/main/java/io/element/android/wysiwyg/compose/internal/FakeViewConnection.kt b/platforms/android/library-compose/src/main/java/io/element/android/wysiwyg/compose/internal/FakeViewConnection.kt
index 84fdf6ad..be3ea23c 100644
--- a/platforms/android/library-compose/src/main/java/io/element/android/wysiwyg/compose/internal/FakeViewConnection.kt
+++ b/platforms/android/library-compose/src/main/java/io/element/android/wysiwyg/compose/internal/FakeViewConnection.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library-compose/src/main/java/io/element/android/wysiwyg/compose/internal/RichTextEditorStyleExt.kt b/platforms/android/library-compose/src/main/java/io/element/android/wysiwyg/compose/internal/RichTextEditorStyleExt.kt
index 845fb24b..f3be8457 100644
--- a/platforms/android/library-compose/src/main/java/io/element/android/wysiwyg/compose/internal/RichTextEditorStyleExt.kt
+++ b/platforms/android/library-compose/src/main/java/io/element/android/wysiwyg/compose/internal/RichTextEditorStyleExt.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library-compose/src/main/java/io/element/android/wysiwyg/compose/internal/ViewAction.kt b/platforms/android/library-compose/src/main/java/io/element/android/wysiwyg/compose/internal/ViewAction.kt
index 1ca39b0b..d062601f 100644
--- a/platforms/android/library-compose/src/main/java/io/element/android/wysiwyg/compose/internal/ViewAction.kt
+++ b/platforms/android/library-compose/src/main/java/io/element/android/wysiwyg/compose/internal/ViewAction.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library-compose/src/test/java/io/element/android/wysiwyg/compose/FakeRichTextEditorStateTest.kt b/platforms/android/library-compose/src/test/java/io/element/android/wysiwyg/compose/FakeRichTextEditorStateTest.kt
index f028944c..ec6a353f 100644
--- a/platforms/android/library-compose/src/test/java/io/element/android/wysiwyg/compose/FakeRichTextEditorStateTest.kt
+++ b/platforms/android/library-compose/src/test/java/io/element/android/wysiwyg/compose/FakeRichTextEditorStateTest.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/build.gradle b/platforms/android/library/build.gradle
index 92020dd8..12b7c720 100644
--- a/platforms/android/library/build.gradle
+++ b/platforms/android/library/build.gradle
@@ -1,3 +1,5 @@
+import com.vanniktech.maven.publish.SonatypeHost
+
 plugins {
     // Rust
     id 'org.mozilla.rust-android-gradle.rust-android'
@@ -150,4 +152,45 @@ tasks.withType(Test) {
 def getNdkVersionAsWorkaround() {
     def ndkDirectory = new File(android.sdkDirectory, "ndk")
     return ndkDirectory.list().sort().last().split(PATH_SEPARATOR).last()
+}
+
+mavenPublishing {
+    publishToMavenCentral(SonatypeHost.S01)
+    signAllPublications()
+
+    coordinates(property("MAVEN_GROUP"), property("POM_ARTIFACT_ID"), property("MAVEN_VERSION_NAME"))
+    if (!providers.gradleProperty("mavenCentralUsername")) {
+        println("No maven central provider")
+    }
+    pom {
+        name = "Matrix Rich Text Editor"
+        description.set("Cross-platform rich text editor that generates HTML output.")
+        inceptionYear.set("2022")
+        url.set("https://github.com/element-hq/matrix-rich-text-editor")
+        licenses {
+            license {
+                name.set("GNU Affero General Public License (AGPL) version 3.0")
+                url.set("https://www.gnu.org/licenses/agpl-3.0.txt")
+                distribution.set("https://www.gnu.org/licenses/agpl-3.0.txt")
+            }
+            license {
+                name.set("Element Commercial License")
+                url.set("https://raw.githubusercontent.com/element-hq/matrix-rich-text-editor/refs/heads/main/LICENSE-COMMERCIAL")
+                distribution.set("https://raw.githubusercontent.com/element-hq/matrix-rich-text-editor/refs/heads/main/LICENSE-COMMERCIAL")
+            }
+        }
+        developers {
+            developer {
+                id.set("matrixdev")
+                name.set("matrixdev")
+                url.set("https://github.com/element-hq/")
+                email.set("android@element.io")
+            }
+        }
+        scm {
+            url.set("https://github.com/element-hq/matrix-rich-text-editor/")
+            connection.set("scm:git:git://github.com/element-hq/matrix-rich-text-editor.git")
+            developerConnection.set("scm:git:ssh://git@github.com/element-hq/matrix-rich-text-editor.git")
+        }
+    }
 }
\ No newline at end of file
diff --git a/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/EditorEditTextInputTests.kt b/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/EditorEditTextInputTests.kt
index e5c79a4a..73b90de3 100644
--- a/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/EditorEditTextInputTests.kt
+++ b/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/EditorEditTextInputTests.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/EditorStyledTextViewTest.kt b/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/EditorStyledTextViewTest.kt
index d9f2c201..7f6cd0a8 100644
--- a/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/EditorStyledTextViewTest.kt
+++ b/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/EditorStyledTextViewTest.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/fakes/FakeStyleConfig.kt b/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/fakes/FakeStyleConfig.kt
index 43f3054e..49a12205 100644
--- a/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/fakes/FakeStyleConfig.kt
+++ b/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/fakes/FakeStyleConfig.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/inputhandlers/InterceptInputConnectionIntegrationTest.kt b/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/inputhandlers/InterceptInputConnectionIntegrationTest.kt
index e12acd6d..f54f3dcf 100644
--- a/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/inputhandlers/InterceptInputConnectionIntegrationTest.kt
+++ b/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/inputhandlers/InterceptInputConnectionIntegrationTest.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/test/utils/AnyViewAction.kt b/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/test/utils/AnyViewAction.kt
index a54f79c9..3ccd3f5b 100644
--- a/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/test/utils/AnyViewAction.kt
+++ b/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/test/utils/AnyViewAction.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/test/utils/ClickActions.kt b/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/test/utils/ClickActions.kt
index 992486c7..d966ad51 100644
--- a/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/test/utils/ClickActions.kt
+++ b/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/test/utils/ClickActions.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/test/utils/EditorActions.kt b/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/test/utils/EditorActions.kt
index d8cdd29b..46f04344 100644
--- a/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/test/utils/EditorActions.kt
+++ b/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/test/utils/EditorActions.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/test/utils/FakeLinkClickedListener.kt b/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/test/utils/FakeLinkClickedListener.kt
index 7f650e99..85e88a51 100644
--- a/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/test/utils/FakeLinkClickedListener.kt
+++ b/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/test/utils/FakeLinkClickedListener.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/test/utils/ImeActions.kt b/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/test/utils/ImeActions.kt
index 47d021c5..67927f00 100644
--- a/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/test/utils/ImeActions.kt
+++ b/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/test/utils/ImeActions.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/test/utils/ScreenshotFailureHandler.kt b/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/test/utils/ScreenshotFailureHandler.kt
index d9c88775..3cd34ee7 100644
--- a/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/test/utils/ScreenshotFailureHandler.kt
+++ b/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/test/utils/ScreenshotFailureHandler.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/test/utils/SpanUtils.kt b/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/test/utils/SpanUtils.kt
index 6a1a5331..7375e922 100644
--- a/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/test/utils/SpanUtils.kt
+++ b/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/test/utils/SpanUtils.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/test/utils/TestActivity.kt b/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/test/utils/TestActivity.kt
index 01091dad..572dfbc4 100644
--- a/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/test/utils/TestActivity.kt
+++ b/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/test/utils/TestActivity.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/test/utils/TestMentionDisplayHandler.kt b/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/test/utils/TestMentionDisplayHandler.kt
index c800ec00..8ca24ea9 100644
--- a/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/test/utils/TestMentionDisplayHandler.kt
+++ b/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/test/utils/TestMentionDisplayHandler.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/test/utils/TextInputMatchers.kt b/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/test/utils/TextInputMatchers.kt
index 1f73fe70..f2186a25 100644
--- a/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/test/utils/TextInputMatchers.kt
+++ b/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/test/utils/TextInputMatchers.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/test/utils/TextViewActions.kt b/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/test/utils/TextViewActions.kt
index 15ad4fc0..cb786f35 100644
--- a/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/test/utils/TextViewActions.kt
+++ b/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/test/utils/TextViewActions.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/test/utils/UriContentListener.kt b/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/test/utils/UriContentListener.kt
index 20b3b36d..cb932ea3 100644
--- a/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/test/utils/UriContentListener.kt
+++ b/platforms/android/library/src/androidTest/java/io/element/android/wysiwyg/test/utils/UriContentListener.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/main/java/io/element/android/wysiwyg/EditorEditText.kt b/platforms/android/library/src/main/java/io/element/android/wysiwyg/EditorEditText.kt
index c5a74809..d77e70df 100644
--- a/platforms/android/library/src/main/java/io/element/android/wysiwyg/EditorEditText.kt
+++ b/platforms/android/library/src/main/java/io/element/android/wysiwyg/EditorEditText.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/main/java/io/element/android/wysiwyg/EditorStyledTextView.kt b/platforms/android/library/src/main/java/io/element/android/wysiwyg/EditorStyledTextView.kt
index b81d5a0e..b7a01c24 100644
--- a/platforms/android/library/src/main/java/io/element/android/wysiwyg/EditorStyledTextView.kt
+++ b/platforms/android/library/src/main/java/io/element/android/wysiwyg/EditorStyledTextView.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/main/java/io/element/android/wysiwyg/EditorTextWatcher.kt b/platforms/android/library/src/main/java/io/element/android/wysiwyg/EditorTextWatcher.kt
index 42dd8b5f..da587242 100644
--- a/platforms/android/library/src/main/java/io/element/android/wysiwyg/EditorTextWatcher.kt
+++ b/platforms/android/library/src/main/java/io/element/android/wysiwyg/EditorTextWatcher.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/main/java/io/element/android/wysiwyg/display/MentionDisplayHandler.kt b/platforms/android/library/src/main/java/io/element/android/wysiwyg/display/MentionDisplayHandler.kt
index 2a438a85..89562c8d 100644
--- a/platforms/android/library/src/main/java/io/element/android/wysiwyg/display/MentionDisplayHandler.kt
+++ b/platforms/android/library/src/main/java/io/element/android/wysiwyg/display/MentionDisplayHandler.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/main/java/io/element/android/wysiwyg/display/TextDisplay.kt b/platforms/android/library/src/main/java/io/element/android/wysiwyg/display/TextDisplay.kt
index 60fbbf7c..11169767 100644
--- a/platforms/android/library/src/main/java/io/element/android/wysiwyg/display/TextDisplay.kt
+++ b/platforms/android/library/src/main/java/io/element/android/wysiwyg/display/TextDisplay.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/main/java/io/element/android/wysiwyg/extensions/ComposerExtensions.kt b/platforms/android/library/src/main/java/io/element/android/wysiwyg/extensions/ComposerExtensions.kt
index cd705eeb..08f30fb1 100644
--- a/platforms/android/library/src/main/java/io/element/android/wysiwyg/extensions/ComposerExtensions.kt
+++ b/platforms/android/library/src/main/java/io/element/android/wysiwyg/extensions/ComposerExtensions.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/main/java/io/element/android/wysiwyg/extensions/RustExtensions.kt b/platforms/android/library/src/main/java/io/element/android/wysiwyg/extensions/RustExtensions.kt
index 2b25b41b..11e54b8d 100644
--- a/platforms/android/library/src/main/java/io/element/android/wysiwyg/extensions/RustExtensions.kt
+++ b/platforms/android/library/src/main/java/io/element/android/wysiwyg/extensions/RustExtensions.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/main/java/io/element/android/wysiwyg/inputhandlers/InterceptInputConnection.kt b/platforms/android/library/src/main/java/io/element/android/wysiwyg/inputhandlers/InterceptInputConnection.kt
index c1e45438..28661443 100644
--- a/platforms/android/library/src/main/java/io/element/android/wysiwyg/inputhandlers/InterceptInputConnection.kt
+++ b/platforms/android/library/src/main/java/io/element/android/wysiwyg/inputhandlers/InterceptInputConnection.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/main/java/io/element/android/wysiwyg/internal/display/MemoizedLinkDisplayHandler.kt b/platforms/android/library/src/main/java/io/element/android/wysiwyg/internal/display/MemoizedLinkDisplayHandler.kt
index d726b6e3..70cfc621 100644
--- a/platforms/android/library/src/main/java/io/element/android/wysiwyg/internal/display/MemoizedLinkDisplayHandler.kt
+++ b/platforms/android/library/src/main/java/io/element/android/wysiwyg/internal/display/MemoizedLinkDisplayHandler.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/main/java/io/element/android/wysiwyg/internal/utils/AndroidHtmlConverter.kt b/platforms/android/library/src/main/java/io/element/android/wysiwyg/internal/utils/AndroidHtmlConverter.kt
index 31016ec0..728eca28 100644
--- a/platforms/android/library/src/main/java/io/element/android/wysiwyg/internal/utils/AndroidHtmlConverter.kt
+++ b/platforms/android/library/src/main/java/io/element/android/wysiwyg/internal/utils/AndroidHtmlConverter.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/main/java/io/element/android/wysiwyg/internal/utils/TextRangeHelper.kt b/platforms/android/library/src/main/java/io/element/android/wysiwyg/internal/utils/TextRangeHelper.kt
index 42047f7e..934c236c 100644
--- a/platforms/android/library/src/main/java/io/element/android/wysiwyg/internal/utils/TextRangeHelper.kt
+++ b/platforms/android/library/src/main/java/io/element/android/wysiwyg/internal/utils/TextRangeHelper.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/main/java/io/element/android/wysiwyg/internal/utils/UriContentListener.kt b/platforms/android/library/src/main/java/io/element/android/wysiwyg/internal/utils/UriContentListener.kt
index fc0001b1..d44a6ef4 100644
--- a/platforms/android/library/src/main/java/io/element/android/wysiwyg/internal/utils/UriContentListener.kt
+++ b/platforms/android/library/src/main/java/io/element/android/wysiwyg/internal/utils/UriContentListener.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/main/java/io/element/android/wysiwyg/internal/view/EditorEditTextAttributeReader.kt b/platforms/android/library/src/main/java/io/element/android/wysiwyg/internal/view/EditorEditTextAttributeReader.kt
index 660d0698..dd9cb1b7 100644
--- a/platforms/android/library/src/main/java/io/element/android/wysiwyg/internal/view/EditorEditTextAttributeReader.kt
+++ b/platforms/android/library/src/main/java/io/element/android/wysiwyg/internal/view/EditorEditTextAttributeReader.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/main/java/io/element/android/wysiwyg/internal/view/EditorStyledTextViewAttributeReader.kt b/platforms/android/library/src/main/java/io/element/android/wysiwyg/internal/view/EditorStyledTextViewAttributeReader.kt
index 83fbde37..9dbc023f 100644
--- a/platforms/android/library/src/main/java/io/element/android/wysiwyg/internal/view/EditorStyledTextViewAttributeReader.kt
+++ b/platforms/android/library/src/main/java/io/element/android/wysiwyg/internal/view/EditorStyledTextViewAttributeReader.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/main/java/io/element/android/wysiwyg/internal/view/LayoutExtensions.kt b/platforms/android/library/src/main/java/io/element/android/wysiwyg/internal/view/LayoutExtensions.kt
index 74ec4985..147cb2c3 100644
--- a/platforms/android/library/src/main/java/io/element/android/wysiwyg/internal/view/LayoutExtensions.kt
+++ b/platforms/android/library/src/main/java/io/element/android/wysiwyg/internal/view/LayoutExtensions.kt
@@ -2,7 +2,7 @@
  * Copyright 2022-2024 New Vector Ltd.
  * Copyright 2018 The Android Open Source Project
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 package io.element.android.wysiwyg.internal.view
diff --git a/platforms/android/library/src/main/java/io/element/android/wysiwyg/internal/view/ViewLazyViewModelExtension.kt b/platforms/android/library/src/main/java/io/element/android/wysiwyg/internal/view/ViewLazyViewModelExtension.kt
index 94202f09..6481c510 100644
--- a/platforms/android/library/src/main/java/io/element/android/wysiwyg/internal/view/ViewLazyViewModelExtension.kt
+++ b/platforms/android/library/src/main/java/io/element/android/wysiwyg/internal/view/ViewLazyViewModelExtension.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/main/java/io/element/android/wysiwyg/internal/view/models/LinkActionExt.kt b/platforms/android/library/src/main/java/io/element/android/wysiwyg/internal/view/models/LinkActionExt.kt
index bda6fe95..45803c9e 100644
--- a/platforms/android/library/src/main/java/io/element/android/wysiwyg/internal/view/models/LinkActionExt.kt
+++ b/platforms/android/library/src/main/java/io/element/android/wysiwyg/internal/view/models/LinkActionExt.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/main/java/io/element/android/wysiwyg/internal/viewmodel/EditorInputAction.kt b/platforms/android/library/src/main/java/io/element/android/wysiwyg/internal/viewmodel/EditorInputAction.kt
index 5fb2523c..45f445b3 100644
--- a/platforms/android/library/src/main/java/io/element/android/wysiwyg/internal/viewmodel/EditorInputAction.kt
+++ b/platforms/android/library/src/main/java/io/element/android/wysiwyg/internal/viewmodel/EditorInputAction.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/main/java/io/element/android/wysiwyg/internal/viewmodel/EditorViewModel.kt b/platforms/android/library/src/main/java/io/element/android/wysiwyg/internal/viewmodel/EditorViewModel.kt
index 7158f3e0..0703738f 100644
--- a/platforms/android/library/src/main/java/io/element/android/wysiwyg/internal/viewmodel/EditorViewModel.kt
+++ b/platforms/android/library/src/main/java/io/element/android/wysiwyg/internal/viewmodel/EditorViewModel.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/main/java/io/element/android/wysiwyg/internal/viewmodel/ReplaceTextResult.kt b/platforms/android/library/src/main/java/io/element/android/wysiwyg/internal/viewmodel/ReplaceTextResult.kt
index cd0b104a..fe00c694 100644
--- a/platforms/android/library/src/main/java/io/element/android/wysiwyg/internal/viewmodel/ReplaceTextResult.kt
+++ b/platforms/android/library/src/main/java/io/element/android/wysiwyg/internal/viewmodel/ReplaceTextResult.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/main/java/io/element/android/wysiwyg/utils/CharContants.kt b/platforms/android/library/src/main/java/io/element/android/wysiwyg/utils/CharContants.kt
index ba535667..12e26e8d 100644
--- a/platforms/android/library/src/main/java/io/element/android/wysiwyg/utils/CharContants.kt
+++ b/platforms/android/library/src/main/java/io/element/android/wysiwyg/utils/CharContants.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/main/java/io/element/android/wysiwyg/utils/EditorIndexMapper.kt b/platforms/android/library/src/main/java/io/element/android/wysiwyg/utils/EditorIndexMapper.kt
index a72f2cfa..a9cfdd68 100644
--- a/platforms/android/library/src/main/java/io/element/android/wysiwyg/utils/EditorIndexMapper.kt
+++ b/platforms/android/library/src/main/java/io/element/android/wysiwyg/utils/EditorIndexMapper.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/main/java/io/element/android/wysiwyg/utils/HtmlConverter.kt b/platforms/android/library/src/main/java/io/element/android/wysiwyg/utils/HtmlConverter.kt
index c2f4101f..c6871d32 100644
--- a/platforms/android/library/src/main/java/io/element/android/wysiwyg/utils/HtmlConverter.kt
+++ b/platforms/android/library/src/main/java/io/element/android/wysiwyg/utils/HtmlConverter.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/main/java/io/element/android/wysiwyg/utils/HtmlToSpansParser.kt b/platforms/android/library/src/main/java/io/element/android/wysiwyg/utils/HtmlToSpansParser.kt
index c9171f3a..dd161572 100644
--- a/platforms/android/library/src/main/java/io/element/android/wysiwyg/utils/HtmlToSpansParser.kt
+++ b/platforms/android/library/src/main/java/io/element/android/wysiwyg/utils/HtmlToSpansParser.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/main/java/io/element/android/wysiwyg/utils/LoggingConfig.kt b/platforms/android/library/src/main/java/io/element/android/wysiwyg/utils/LoggingConfig.kt
index 1961f0f5..1d44ac13 100644
--- a/platforms/android/library/src/main/java/io/element/android/wysiwyg/utils/LoggingConfig.kt
+++ b/platforms/android/library/src/main/java/io/element/android/wysiwyg/utils/LoggingConfig.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/main/java/io/element/android/wysiwyg/utils/ResourcesHelper.kt b/platforms/android/library/src/main/java/io/element/android/wysiwyg/utils/ResourcesHelper.kt
index 21a19f2f..66d9e2b3 100644
--- a/platforms/android/library/src/main/java/io/element/android/wysiwyg/utils/ResourcesHelper.kt
+++ b/platforms/android/library/src/main/java/io/element/android/wysiwyg/utils/ResourcesHelper.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/main/java/io/element/android/wysiwyg/utils/RustCleanerTask.kt b/platforms/android/library/src/main/java/io/element/android/wysiwyg/utils/RustCleanerTask.kt
index b609e0b3..da612c79 100644
--- a/platforms/android/library/src/main/java/io/element/android/wysiwyg/utils/RustCleanerTask.kt
+++ b/platforms/android/library/src/main/java/io/element/android/wysiwyg/utils/RustCleanerTask.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/main/java/io/element/android/wysiwyg/utils/RustErrorCollector.kt b/platforms/android/library/src/main/java/io/element/android/wysiwyg/utils/RustErrorCollector.kt
index 9fcd47cf..90dcc423 100644
--- a/platforms/android/library/src/main/java/io/element/android/wysiwyg/utils/RustErrorCollector.kt
+++ b/platforms/android/library/src/main/java/io/element/android/wysiwyg/utils/RustErrorCollector.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/main/java/io/element/android/wysiwyg/utils/ThrowableExt.kt b/platforms/android/library/src/main/java/io/element/android/wysiwyg/utils/ThrowableExt.kt
index a5b3cc18..175e8b6e 100644
--- a/platforms/android/library/src/main/java/io/element/android/wysiwyg/utils/ThrowableExt.kt
+++ b/platforms/android/library/src/main/java/io/element/android/wysiwyg/utils/ThrowableExt.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/StyleConfig.kt b/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/StyleConfig.kt
index 938624d5..1837a6c7 100644
--- a/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/StyleConfig.kt
+++ b/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/StyleConfig.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/inlinebg/BlockRenderer.kt b/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/inlinebg/BlockRenderer.kt
index 89b01dd8..71b3fc54 100644
--- a/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/inlinebg/BlockRenderer.kt
+++ b/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/inlinebg/BlockRenderer.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/inlinebg/SpanBackgroundHelper.kt b/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/inlinebg/SpanBackgroundHelper.kt
index c3ec7ba6..9d6bc153 100644
--- a/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/inlinebg/SpanBackgroundHelper.kt
+++ b/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/inlinebg/SpanBackgroundHelper.kt
@@ -2,7 +2,7 @@
  * Copyright 2022-2024 New Vector Ltd.
  * Copyright 2018 The Android Open Source Project
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
 */
 package io.element.android.wysiwyg.view.inlinebg
diff --git a/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/inlinebg/SpanBackgroundHelperFactory.kt b/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/inlinebg/SpanBackgroundHelperFactory.kt
index 1ad77d4b..3cc21798 100644
--- a/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/inlinebg/SpanBackgroundHelperFactory.kt
+++ b/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/inlinebg/SpanBackgroundHelperFactory.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/inlinebg/SpanBackgroundRenderer.kt b/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/inlinebg/SpanBackgroundRenderer.kt
index a3324026..d547632e 100644
--- a/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/inlinebg/SpanBackgroundRenderer.kt
+++ b/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/inlinebg/SpanBackgroundRenderer.kt
@@ -2,7 +2,7 @@
  * Copyright 2022-2024 New Vector Ltd.
  * Copyright 2018 The Android Open Source Project
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
 */
 package io.element.android.wysiwyg.view.inlinebg
diff --git a/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/models/InlineFormat.kt b/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/models/InlineFormat.kt
index cb5dd1e5..6bb969a7 100644
--- a/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/models/InlineFormat.kt
+++ b/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/models/InlineFormat.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/models/LinkAction.kt b/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/models/LinkAction.kt
index 73127179..17ac6ac1 100644
--- a/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/models/LinkAction.kt
+++ b/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/models/LinkAction.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/spans/BlockSpan.kt b/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/spans/BlockSpan.kt
index 8b7b35e1..58bb1fc0 100644
--- a/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/spans/BlockSpan.kt
+++ b/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/spans/BlockSpan.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/spans/CodeBlockSpan.kt b/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/spans/CodeBlockSpan.kt
index 6b80709d..95d5c3c9 100644
--- a/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/spans/CodeBlockSpan.kt
+++ b/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/spans/CodeBlockSpan.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/spans/CodeSpanConstants.kt b/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/spans/CodeSpanConstants.kt
index 7a029149..adf43962 100644
--- a/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/spans/CodeSpanConstants.kt
+++ b/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/spans/CodeSpanConstants.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/spans/CustomMentionSpan.kt b/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/spans/CustomMentionSpan.kt
index 7c3bb9db..c5699acf 100644
--- a/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/spans/CustomMentionSpan.kt
+++ b/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/spans/CustomMentionSpan.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/spans/ExtraCharacterSpan.kt b/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/spans/ExtraCharacterSpan.kt
index dc8e73c1..a526cb70 100644
--- a/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/spans/ExtraCharacterSpan.kt
+++ b/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/spans/ExtraCharacterSpan.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/spans/InlineCodeSpan.kt b/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/spans/InlineCodeSpan.kt
index dd54b5be..390d284b 100644
--- a/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/spans/InlineCodeSpan.kt
+++ b/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/spans/InlineCodeSpan.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/spans/LinkSpan.kt b/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/spans/LinkSpan.kt
index b8890132..2908b827 100644
--- a/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/spans/LinkSpan.kt
+++ b/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/spans/LinkSpan.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/spans/OrderedListSpan.kt b/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/spans/OrderedListSpan.kt
index 45f8d663..6ff5013f 100644
--- a/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/spans/OrderedListSpan.kt
+++ b/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/spans/OrderedListSpan.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/spans/PillSpan.kt b/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/spans/PillSpan.kt
index a7893272..fc2e7d9b 100644
--- a/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/spans/PillSpan.kt
+++ b/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/spans/PillSpan.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/spans/PlainAtRoomMentionDisplaySpan.kt b/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/spans/PlainAtRoomMentionDisplaySpan.kt
index b01b24c1..e152dfef 100644
--- a/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/spans/PlainAtRoomMentionDisplaySpan.kt
+++ b/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/spans/PlainAtRoomMentionDisplaySpan.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/spans/QuoteSpan.kt b/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/spans/QuoteSpan.kt
index 361103d4..1d98739b 100644
--- a/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/spans/QuoteSpan.kt
+++ b/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/spans/QuoteSpan.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/spans/ReuseSourceSpannableFactory.kt b/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/spans/ReuseSourceSpannableFactory.kt
index e05589c3..f8da75fb 100644
--- a/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/spans/ReuseSourceSpannableFactory.kt
+++ b/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/spans/ReuseSourceSpannableFactory.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/spans/UnorderedListSpan.kt b/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/spans/UnorderedListSpan.kt
index a9eb9df5..1da417b3 100644
--- a/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/spans/UnorderedListSpan.kt
+++ b/platforms/android/library/src/main/java/io/element/android/wysiwyg/view/spans/UnorderedListSpan.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/test/kotlin/io/element/android/wysiwyg/internal/utils/TextRangeHelperTest.kt b/platforms/android/library/src/test/kotlin/io/element/android/wysiwyg/internal/utils/TextRangeHelperTest.kt
index 738c242a..2ffbf524 100644
--- a/platforms/android/library/src/test/kotlin/io/element/android/wysiwyg/internal/utils/TextRangeHelperTest.kt
+++ b/platforms/android/library/src/test/kotlin/io/element/android/wysiwyg/internal/utils/TextRangeHelperTest.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/test/kotlin/io/element/android/wysiwyg/mocks/MockComposer.kt b/platforms/android/library/src/test/kotlin/io/element/android/wysiwyg/mocks/MockComposer.kt
index c91210f9..fae068b3 100644
--- a/platforms/android/library/src/test/kotlin/io/element/android/wysiwyg/mocks/MockComposer.kt
+++ b/platforms/android/library/src/test/kotlin/io/element/android/wysiwyg/mocks/MockComposer.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/test/kotlin/io/element/android/wysiwyg/mocks/MockComposerUpdateFactory.kt b/platforms/android/library/src/test/kotlin/io/element/android/wysiwyg/mocks/MockComposerUpdateFactory.kt
index b8d3fae5..2b0d8f3b 100644
--- a/platforms/android/library/src/test/kotlin/io/element/android/wysiwyg/mocks/MockComposerUpdateFactory.kt
+++ b/platforms/android/library/src/test/kotlin/io/element/android/wysiwyg/mocks/MockComposerUpdateFactory.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/test/kotlin/io/element/android/wysiwyg/mocks/MockTextUpdateFactory.kt b/platforms/android/library/src/test/kotlin/io/element/android/wysiwyg/mocks/MockTextUpdateFactory.kt
index 1a8b5e60..65dab8f0 100644
--- a/platforms/android/library/src/test/kotlin/io/element/android/wysiwyg/mocks/MockTextUpdateFactory.kt
+++ b/platforms/android/library/src/test/kotlin/io/element/android/wysiwyg/mocks/MockTextUpdateFactory.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/test/kotlin/io/element/android/wysiwyg/test/fakes/FakeStyleConfig.kt b/platforms/android/library/src/test/kotlin/io/element/android/wysiwyg/test/fakes/FakeStyleConfig.kt
index 5b7a3029..f62727fe 100644
--- a/platforms/android/library/src/test/kotlin/io/element/android/wysiwyg/test/fakes/FakeStyleConfig.kt
+++ b/platforms/android/library/src/test/kotlin/io/element/android/wysiwyg/test/fakes/FakeStyleConfig.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/test/kotlin/io/element/android/wysiwyg/test/utils/SpanUtils.kt b/platforms/android/library/src/test/kotlin/io/element/android/wysiwyg/test/utils/SpanUtils.kt
index 6a1a5331..7375e922 100644
--- a/platforms/android/library/src/test/kotlin/io/element/android/wysiwyg/test/utils/SpanUtils.kt
+++ b/platforms/android/library/src/test/kotlin/io/element/android/wysiwyg/test/utils/SpanUtils.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/test/kotlin/io/element/android/wysiwyg/utils/AndroidHtmlConverterTest.kt b/platforms/android/library/src/test/kotlin/io/element/android/wysiwyg/utils/AndroidHtmlConverterTest.kt
index 7b9d3518..fc9ba531 100644
--- a/platforms/android/library/src/test/kotlin/io/element/android/wysiwyg/utils/AndroidHtmlConverterTest.kt
+++ b/platforms/android/library/src/test/kotlin/io/element/android/wysiwyg/utils/AndroidHtmlConverterTest.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/test/kotlin/io/element/android/wysiwyg/utils/BasicHtmlConverter.kt b/platforms/android/library/src/test/kotlin/io/element/android/wysiwyg/utils/BasicHtmlConverter.kt
index 29836db7..327eb1bf 100644
--- a/platforms/android/library/src/test/kotlin/io/element/android/wysiwyg/utils/BasicHtmlConverter.kt
+++ b/platforms/android/library/src/test/kotlin/io/element/android/wysiwyg/utils/BasicHtmlConverter.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/test/kotlin/io/element/android/wysiwyg/utils/EditorIndexMapperTests.kt b/platforms/android/library/src/test/kotlin/io/element/android/wysiwyg/utils/EditorIndexMapperTests.kt
index a6ebb0fa..418058c1 100644
--- a/platforms/android/library/src/test/kotlin/io/element/android/wysiwyg/utils/EditorIndexMapperTests.kt
+++ b/platforms/android/library/src/test/kotlin/io/element/android/wysiwyg/utils/EditorIndexMapperTests.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/test/kotlin/io/element/android/wysiwyg/utils/HtmlToSpansParserTest.kt b/platforms/android/library/src/test/kotlin/io/element/android/wysiwyg/utils/HtmlToSpansParserTest.kt
index a881c0bd..102f895c 100644
--- a/platforms/android/library/src/test/kotlin/io/element/android/wysiwyg/utils/HtmlToSpansParserTest.kt
+++ b/platforms/android/library/src/test/kotlin/io/element/android/wysiwyg/utils/HtmlToSpansParserTest.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/library/src/test/kotlin/io/element/android/wysiwyg/viewmodel/EditorViewModelTest.kt b/platforms/android/library/src/test/kotlin/io/element/android/wysiwyg/viewmodel/EditorViewModelTest.kt
index 816cb87e..61a9557e 100644
--- a/platforms/android/library/src/test/kotlin/io/element/android/wysiwyg/viewmodel/EditorViewModelTest.kt
+++ b/platforms/android/library/src/test/kotlin/io/element/android/wysiwyg/viewmodel/EditorViewModelTest.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/test/src/main/java/io/element/android/wysiwyg/test/rules/DismissAnrRule.kt b/platforms/android/test/src/main/java/io/element/android/wysiwyg/test/rules/DismissAnrRule.kt
index e694d3f7..e6923c44 100644
--- a/platforms/android/test/src/main/java/io/element/android/wysiwyg/test/rules/DismissAnrRule.kt
+++ b/platforms/android/test/src/main/java/io/element/android/wysiwyg/test/rules/DismissAnrRule.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/test/src/main/java/io/element/android/wysiwyg/test/rules/FlakyEmulatorRule.kt b/platforms/android/test/src/main/java/io/element/android/wysiwyg/test/rules/FlakyEmulatorRule.kt
index 8390b90d..d60a8337 100644
--- a/platforms/android/test/src/main/java/io/element/android/wysiwyg/test/rules/FlakyEmulatorRule.kt
+++ b/platforms/android/test/src/main/java/io/element/android/wysiwyg/test/rules/FlakyEmulatorRule.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/android/test/src/main/java/io/element/android/wysiwyg/test/rules/RetryOnFailureRule.kt b/platforms/android/test/src/main/java/io/element/android/wysiwyg/test/rules/RetryOnFailureRule.kt
index 9fc433da..37ec3918 100644
--- a/platforms/android/test/src/main/java/io/element/android/wysiwyg/test/rules/RetryOnFailureRule.kt
+++ b/platforms/android/test/src/main/java/io/element/android/wysiwyg/test/rules/RetryOnFailureRule.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 New Vector Ltd.
  * Copyright 2024 The Matrix.org Foundation C.I.C.
  *
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
  * Please see LICENSE in the repository root for full details.
  */
 
diff --git a/platforms/ios/example/Shared/View+Accessibility.swift b/platforms/ios/example/Shared/View+Accessibility.swift
index 8f9c25dd..13a5ae6a 100644
--- a/platforms/ios/example/Shared/View+Accessibility.swift
+++ b/platforms/ios/example/Shared/View+Accessibility.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/example/Shared/WysiwygSharedConstants.swift b/platforms/ios/example/Shared/WysiwygSharedConstants.swift
index 95a32e0e..04e8c5d5 100644
--- a/platforms/ios/example/Shared/WysiwygSharedConstants.swift
+++ b/platforms/ios/example/Shared/WysiwygSharedConstants.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/example/Wysiwyg.xcodeproj/project.xcworkspace/xcshareddata/IDETemplateMacros.plist b/platforms/ios/example/Wysiwyg.xcodeproj/project.xcworkspace/xcshareddata/IDETemplateMacros.plist
index e70b6ccb..5b520409 100644
--- a/platforms/ios/example/Wysiwyg.xcodeproj/project.xcworkspace/xcshareddata/IDETemplateMacros.plist
+++ b/platforms/ios/example/Wysiwyg.xcodeproj/project.xcworkspace/xcshareddata/IDETemplateMacros.plist
@@ -6,7 +6,7 @@
     <string>
 // Copyright ___YEAR___ New Vector Ltd.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //</string>
 </dict>
diff --git a/platforms/ios/example/Wysiwyg/AppDelegate.swift b/platforms/ios/example/Wysiwyg/AppDelegate.swift
index f86e18eb..89bd83d7 100644
--- a/platforms/ios/example/Wysiwyg/AppDelegate.swift
+++ b/platforms/ios/example/Wysiwyg/AppDelegate.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/example/Wysiwyg/Extensions/UIAlertController.swift b/platforms/ios/example/Wysiwyg/Extensions/UIAlertController.swift
index 50e0fab9..e1d6850c 100644
--- a/platforms/ios/example/Wysiwyg/Extensions/UIAlertController.swift
+++ b/platforms/ios/example/Wysiwyg/Extensions/UIAlertController.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/example/Wysiwyg/Extensions/View.swift b/platforms/ios/example/Wysiwyg/Extensions/View.swift
index e495657d..5be5a59d 100644
--- a/platforms/ios/example/Wysiwyg/Extensions/View.swift
+++ b/platforms/ios/example/Wysiwyg/Extensions/View.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/example/Wysiwyg/Extensions/WysiwygAction+Utils.swift b/platforms/ios/example/Wysiwyg/Extensions/WysiwygAction+Utils.swift
index 845b0067..8a712744 100644
--- a/platforms/ios/example/Wysiwyg/Extensions/WysiwygAction+Utils.swift
+++ b/platforms/ios/example/Wysiwyg/Extensions/WysiwygAction+Utils.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/example/Wysiwyg/Mocks/Commands.swift b/platforms/ios/example/Wysiwyg/Mocks/Commands.swift
index 98f06f37..6511f4c7 100644
--- a/platforms/ios/example/Wysiwyg/Mocks/Commands.swift
+++ b/platforms/ios/example/Wysiwyg/Mocks/Commands.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/example/Wysiwyg/Mocks/Rooms.swift b/platforms/ios/example/Wysiwyg/Mocks/Rooms.swift
index 8223d462..ba8788a9 100644
--- a/platforms/ios/example/Wysiwyg/Mocks/Rooms.swift
+++ b/platforms/ios/example/Wysiwyg/Mocks/Rooms.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/example/Wysiwyg/Mocks/Users.swift b/platforms/ios/example/Wysiwyg/Mocks/Users.swift
index 3bb56a1f..43010a62 100644
--- a/platforms/ios/example/Wysiwyg/Mocks/Users.swift
+++ b/platforms/ios/example/Wysiwyg/Mocks/Users.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/example/Wysiwyg/Pills/SerializationService.swift b/platforms/ios/example/Wysiwyg/Pills/SerializationService.swift
index 95b812db..afe85293 100644
--- a/platforms/ios/example/Wysiwyg/Pills/SerializationService.swift
+++ b/platforms/ios/example/Wysiwyg/Pills/SerializationService.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/example/Wysiwyg/Pills/WysiwygAttachmentView.swift b/platforms/ios/example/Wysiwyg/Pills/WysiwygAttachmentView.swift
index 0a44174f..5810d9be 100644
--- a/platforms/ios/example/Wysiwyg/Pills/WysiwygAttachmentView.swift
+++ b/platforms/ios/example/Wysiwyg/Pills/WysiwygAttachmentView.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/example/Wysiwyg/Pills/WysiwygAttachmentViewProvider.swift b/platforms/ios/example/Wysiwyg/Pills/WysiwygAttachmentViewProvider.swift
index 6c824f18..a0f222bc 100644
--- a/platforms/ios/example/Wysiwyg/Pills/WysiwygAttachmentViewProvider.swift
+++ b/platforms/ios/example/Wysiwyg/Pills/WysiwygAttachmentViewProvider.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/example/Wysiwyg/Pills/WysiwygMentionReplacer.swift b/platforms/ios/example/Wysiwyg/Pills/WysiwygMentionReplacer.swift
index d0d8fd10..ba15e0d5 100644
--- a/platforms/ios/example/Wysiwyg/Pills/WysiwygMentionReplacer.swift
+++ b/platforms/ios/example/Wysiwyg/Pills/WysiwygMentionReplacer.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/example/Wysiwyg/Pills/WysiwygTextAttachment.swift b/platforms/ios/example/Wysiwyg/Pills/WysiwygTextAttachment.swift
index 2efa89aa..ec54ca37 100644
--- a/platforms/ios/example/Wysiwyg/Pills/WysiwygTextAttachment.swift
+++ b/platforms/ios/example/Wysiwyg/Pills/WysiwygTextAttachment.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/example/Wysiwyg/Pills/WysiwygTextAttachmentData.swift b/platforms/ios/example/Wysiwyg/Pills/WysiwygTextAttachmentData.swift
index 1129ae5a..e6a53b8b 100644
--- a/platforms/ios/example/Wysiwyg/Pills/WysiwygTextAttachmentData.swift
+++ b/platforms/ios/example/Wysiwyg/Pills/WysiwygTextAttachmentData.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/example/Wysiwyg/Views/AlertHelper.swift b/platforms/ios/example/Wysiwyg/Views/AlertHelper.swift
index 984c13d8..89f97cb3 100644
--- a/platforms/ios/example/Wysiwyg/Views/AlertHelper.swift
+++ b/platforms/ios/example/Wysiwyg/Views/AlertHelper.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/example/Wysiwyg/Views/Composer.swift b/platforms/ios/example/Wysiwyg/Views/Composer.swift
index 83840278..8a368b74 100644
--- a/platforms/ios/example/Wysiwyg/Views/Composer.swift
+++ b/platforms/ios/example/Wysiwyg/Views/Composer.swift
@@ -1,7 +1,7 @@
 //
 // Copyright 2022-2024 New Vector Ltd.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/example/Wysiwyg/Views/ComposerActionToolbar.swift b/platforms/ios/example/Wysiwyg/Views/ComposerActionToolbar.swift
index 14922735..9f418af4 100644
--- a/platforms/ios/example/Wysiwyg/Views/ComposerActionToolbar.swift
+++ b/platforms/ios/example/Wysiwyg/Views/ComposerActionToolbar.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/example/Wysiwyg/Views/ContentView.swift b/platforms/ios/example/Wysiwyg/Views/ContentView.swift
index 1b5c72d9..ae875e6c 100644
--- a/platforms/ios/example/Wysiwyg/Views/ContentView.swift
+++ b/platforms/ios/example/Wysiwyg/Views/ContentView.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/example/Wysiwyg/Views/WysiwygSuggestionList.swift b/platforms/ios/example/Wysiwyg/Views/WysiwygSuggestionList.swift
index 52036878..125239a9 100644
--- a/platforms/ios/example/Wysiwyg/Views/WysiwygSuggestionList.swift
+++ b/platforms/ios/example/Wysiwyg/Views/WysiwygSuggestionList.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/example/Wysiwyg/WysiwygApp.swift b/platforms/ios/example/Wysiwyg/WysiwygApp.swift
index c8842f5d..c285140a 100644
--- a/platforms/ios/example/Wysiwyg/WysiwygApp.swift
+++ b/platforms/ios/example/Wysiwyg/WysiwygApp.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/example/WysiwygUITests/WysiwygUITests+Autocorrection.swift b/platforms/ios/example/WysiwygUITests/WysiwygUITests+Autocorrection.swift
index 0da1d9d2..6ba41191 100644
--- a/platforms/ios/example/WysiwygUITests/WysiwygUITests+Autocorrection.swift
+++ b/platforms/ios/example/WysiwygUITests/WysiwygUITests+Autocorrection.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/example/WysiwygUITests/WysiwygUITests+CodeBlocks.swift b/platforms/ios/example/WysiwygUITests/WysiwygUITests+CodeBlocks.swift
index 8755a2c6..74066e35 100644
--- a/platforms/ios/example/WysiwygUITests/WysiwygUITests+CodeBlocks.swift
+++ b/platforms/ios/example/WysiwygUITests/WysiwygUITests+CodeBlocks.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/example/WysiwygUITests/WysiwygUITests+Format.swift b/platforms/ios/example/WysiwygUITests/WysiwygUITests+Format.swift
index 0983e807..6b829d96 100644
--- a/platforms/ios/example/WysiwygUITests/WysiwygUITests+Format.swift
+++ b/platforms/ios/example/WysiwygUITests/WysiwygUITests+Format.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/example/WysiwygUITests/WysiwygUITests+Indent.swift b/platforms/ios/example/WysiwygUITests/WysiwygUITests+Indent.swift
index 93f0dcd8..85da21fd 100644
--- a/platforms/ios/example/WysiwygUITests/WysiwygUITests+Indent.swift
+++ b/platforms/ios/example/WysiwygUITests/WysiwygUITests+Indent.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/example/WysiwygUITests/WysiwygUITests+InlineCode.swift b/platforms/ios/example/WysiwygUITests/WysiwygUITests+InlineCode.swift
index dda6c801..0d98e3ab 100644
--- a/platforms/ios/example/WysiwygUITests/WysiwygUITests+InlineCode.swift
+++ b/platforms/ios/example/WysiwygUITests/WysiwygUITests+InlineCode.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/example/WysiwygUITests/WysiwygUITests+Keyboard.swift b/platforms/ios/example/WysiwygUITests/WysiwygUITests+Keyboard.swift
index b3708351..caef424b 100644
--- a/platforms/ios/example/WysiwygUITests/WysiwygUITests+Keyboard.swift
+++ b/platforms/ios/example/WysiwygUITests/WysiwygUITests+Keyboard.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2024 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/example/WysiwygUITests/WysiwygUITests+Links.swift b/platforms/ios/example/WysiwygUITests/WysiwygUITests+Links.swift
index 4c49649f..1704732d 100644
--- a/platforms/ios/example/WysiwygUITests/WysiwygUITests+Links.swift
+++ b/platforms/ios/example/WysiwygUITests/WysiwygUITests+Links.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/example/WysiwygUITests/WysiwygUITests+Lists.swift b/platforms/ios/example/WysiwygUITests/WysiwygUITests+Lists.swift
index 37ec6f1f..d54bebd3 100644
--- a/platforms/ios/example/WysiwygUITests/WysiwygUITests+Lists.swift
+++ b/platforms/ios/example/WysiwygUITests/WysiwygUITests+Lists.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/example/WysiwygUITests/WysiwygUITests+PlainTextMode.swift b/platforms/ios/example/WysiwygUITests/WysiwygUITests+PlainTextMode.swift
index 543df87d..759fbf15 100644
--- a/platforms/ios/example/WysiwygUITests/WysiwygUITests+PlainTextMode.swift
+++ b/platforms/ios/example/WysiwygUITests/WysiwygUITests+PlainTextMode.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/example/WysiwygUITests/WysiwygUITests+Quotes.swift b/platforms/ios/example/WysiwygUITests/WysiwygUITests+Quotes.swift
index 5c2708de..b72984b1 100644
--- a/platforms/ios/example/WysiwygUITests/WysiwygUITests+Quotes.swift
+++ b/platforms/ios/example/WysiwygUITests/WysiwygUITests+Quotes.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/example/WysiwygUITests/WysiwygUITests+Suggestions.swift b/platforms/ios/example/WysiwygUITests/WysiwygUITests+Suggestions.swift
index 9d1f47e4..7bc93b60 100644
--- a/platforms/ios/example/WysiwygUITests/WysiwygUITests+Suggestions.swift
+++ b/platforms/ios/example/WysiwygUITests/WysiwygUITests+Suggestions.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/example/WysiwygUITests/WysiwygUITests+Typing.swift b/platforms/ios/example/WysiwygUITests/WysiwygUITests+Typing.swift
index 0b6c8f08..eb8ee873 100644
--- a/platforms/ios/example/WysiwygUITests/WysiwygUITests+Typing.swift
+++ b/platforms/ios/example/WysiwygUITests/WysiwygUITests+Typing.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/example/WysiwygUITests/WysiwygUITests.swift b/platforms/ios/example/WysiwygUITests/WysiwygUITests.swift
index bfb67ed7..0e42f4e8 100644
--- a/platforms/ios/example/WysiwygUITests/WysiwygUITests.swift
+++ b/platforms/ios/example/WysiwygUITests/WysiwygUITests.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/.swiftpm/xcode/package.xcworkspace/xcshareddata/IDETemplateMacros.plist b/platforms/ios/lib/WysiwygComposer/.swiftpm/xcode/package.xcworkspace/xcshareddata/IDETemplateMacros.plist
index fc2f00f8..f5c79d05 100644
--- a/platforms/ios/lib/WysiwygComposer/.swiftpm/xcode/package.xcworkspace/xcshareddata/IDETemplateMacros.plist
+++ b/platforms/ios/lib/WysiwygComposer/.swiftpm/xcode/package.xcworkspace/xcshareddata/IDETemplateMacros.plist
@@ -6,7 +6,7 @@
     <string> 
 // Copyright ___YEAR___ New Vector Ltd.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //</string>
 </dict>
diff --git a/platforms/ios/lib/WysiwygComposer/Sources/DTCoreTextExtended/UIFont+AttributedStringBuilder.m b/platforms/ios/lib/WysiwygComposer/Sources/DTCoreTextExtended/UIFont+AttributedStringBuilder.m
index d1a0eea8..3d73f240 100644
--- a/platforms/ios/lib/WysiwygComposer/Sources/DTCoreTextExtended/UIFont+AttributedStringBuilder.m
+++ b/platforms/ios/lib/WysiwygComposer/Sources/DTCoreTextExtended/UIFont+AttributedStringBuilder.m
@@ -1,7 +1,7 @@
 //
 // Copyright 2022-2024 New Vector Ltd.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Sources/DTCoreTextExtended/include/UIFont+AttributedStringBuilder.h b/platforms/ios/lib/WysiwygComposer/Sources/DTCoreTextExtended/include/UIFont+AttributedStringBuilder.h
index a7cf093c..f082cd9c 100644
--- a/platforms/ios/lib/WysiwygComposer/Sources/DTCoreTextExtended/include/UIFont+AttributedStringBuilder.h
+++ b/platforms/ios/lib/WysiwygComposer/Sources/DTCoreTextExtended/include/UIFont+AttributedStringBuilder.h
@@ -1,7 +1,7 @@
 //
 // Copyright 2022-2024 New Vector Ltd.
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/BlockStyle.swift b/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/BlockStyle.swift
index a857cb09..7c535793 100644
--- a/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/BlockStyle.swift
+++ b/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/BlockStyle.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/BuildHTMLAttributedError.swift b/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/BuildHTMLAttributedError.swift
index 74657147..3c4b60c1 100644
--- a/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/BuildHTMLAttributedError.swift
+++ b/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/BuildHTMLAttributedError.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/Extensions/CGRect.swift b/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/Extensions/CGRect.swift
index 3dce38e0..55134f74 100644
--- a/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/Extensions/CGRect.swift
+++ b/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/Extensions/CGRect.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/Extensions/DTCoreText/DTHTMLElement.swift b/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/Extensions/DTCoreText/DTHTMLElement.swift
index b48a30c6..1fd9ae5b 100644
--- a/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/Extensions/DTCoreText/DTHTMLElement.swift
+++ b/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/Extensions/DTCoreText/DTHTMLElement.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/Extensions/DTCoreText/PlaceholderTextHTMLElement.swift b/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/Extensions/DTCoreText/PlaceholderTextHTMLElement.swift
index 97b7e943..5869f891 100644
--- a/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/Extensions/DTCoreText/PlaceholderTextHTMLElement.swift
+++ b/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/Extensions/DTCoreText/PlaceholderTextHTMLElement.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/Extensions/NSAttributedString+Attributes.swift b/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/Extensions/NSAttributedString+Attributes.swift
index bba4192f..e7b5017a 100644
--- a/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/Extensions/NSAttributedString+Attributes.swift
+++ b/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/Extensions/NSAttributedString+Attributes.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/Extensions/NSAttributedString+Range.swift b/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/Extensions/NSAttributedString+Range.swift
index eb9990fc..161a85e1 100644
--- a/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/Extensions/NSAttributedString+Range.swift
+++ b/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/Extensions/NSAttributedString+Range.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/Extensions/NSAttributedString.Key.swift b/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/Extensions/NSAttributedString.Key.swift
index 4c71f90c..2a68c21b 100644
--- a/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/Extensions/NSAttributedString.Key.swift
+++ b/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/Extensions/NSAttributedString.Key.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/Extensions/NSMutableAttributedString.swift b/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/Extensions/NSMutableAttributedString.swift
index 610426e3..35584dfd 100644
--- a/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/Extensions/NSMutableAttributedString.swift
+++ b/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/Extensions/NSMutableAttributedString.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/Extensions/NSParagraphStyle.swift b/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/Extensions/NSParagraphStyle.swift
index 270d3530..65830bbd 100644
--- a/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/Extensions/NSParagraphStyle.swift
+++ b/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/Extensions/NSParagraphStyle.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/Extensions/NSRange.swift b/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/Extensions/NSRange.swift
index dc12756a..0e511c07 100644
--- a/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/Extensions/NSRange.swift
+++ b/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/Extensions/NSRange.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/Extensions/String+Character.swift b/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/Extensions/String+Character.swift
index a6d6085e..5bee2062 100644
--- a/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/Extensions/String+Character.swift
+++ b/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/Extensions/String+Character.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/Extensions/UIColor.swift b/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/Extensions/UIColor.swift
index c981f0e2..8d62b9db 100644
--- a/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/Extensions/UIColor.swift
+++ b/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/Extensions/UIColor.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/Extensions/UITextView.swift b/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/Extensions/UITextView.swift
index b99de0b9..d544960f 100644
--- a/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/Extensions/UITextView.swift
+++ b/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/Extensions/UITextView.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/HTMLMentionReplacer.swift b/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/HTMLMentionReplacer.swift
index 5630b0bd..f6841f0b 100644
--- a/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/HTMLMentionReplacer.swift
+++ b/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/HTMLMentionReplacer.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/HTMLParser.swift b/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/HTMLParser.swift
index 656330a6..c344bac7 100644
--- a/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/HTMLParser.swift
+++ b/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/HTMLParser.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/HTMLParserHelpers.swift b/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/HTMLParserHelpers.swift
index 880aae4f..8274f0cf 100644
--- a/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/HTMLParserHelpers.swift
+++ b/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/HTMLParserHelpers.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/HTMLParserStyle.swift b/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/HTMLParserStyle.swift
index 5c3d38e7..85ed6062 100644
--- a/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/HTMLParserStyle.swift
+++ b/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/HTMLParserStyle.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/MentionContent.swift b/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/MentionContent.swift
index 834c6216..d4c8b5b2 100644
--- a/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/MentionContent.swift
+++ b/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/MentionContent.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/MentionReplacement.swift b/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/MentionReplacement.swift
index a436b16b..66b76302 100644
--- a/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/MentionReplacement.swift
+++ b/platforms/ios/lib/WysiwygComposer/Sources/HTMLParser/MentionReplacement.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Components/ComposerModelWrapper.swift b/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Components/ComposerModelWrapper.swift
index d534af65..12684c48 100644
--- a/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Components/ComposerModelWrapper.swift
+++ b/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Components/ComposerModelWrapper.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Components/WysiwygComposerView/WysiwygComposerContent.swift b/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Components/WysiwygComposerView/WysiwygComposerContent.swift
index 861091f6..399c2784 100644
--- a/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Components/WysiwygComposerView/WysiwygComposerContent.swift
+++ b/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Components/WysiwygComposerView/WysiwygComposerContent.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Components/WysiwygComposerView/WysiwygComposerView.swift b/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Components/WysiwygComposerView/WysiwygComposerView.swift
index c52fdaaa..94517eef 100644
--- a/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Components/WysiwygComposerView/WysiwygComposerView.swift
+++ b/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Components/WysiwygComposerView/WysiwygComposerView.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Components/WysiwygComposerView/WysiwygComposerViewModel.swift b/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Components/WysiwygComposerView/WysiwygComposerViewModel.swift
index b6daa429..271af293 100644
--- a/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Components/WysiwygComposerView/WysiwygComposerViewModel.swift
+++ b/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Components/WysiwygComposerView/WysiwygComposerViewModel.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Components/WysiwygComposerView/WysiwygComposerViewModelProtocol.swift b/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Components/WysiwygComposerView/WysiwygComposerViewModelProtocol.swift
index 290df144..c5a5fb3e 100644
--- a/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Components/WysiwygComposerView/WysiwygComposerViewModelProtocol.swift
+++ b/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Components/WysiwygComposerView/WysiwygComposerViewModelProtocol.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Components/WysiwygComposerView/WysiwygPillsFlusher.swift b/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Components/WysiwygComposerView/WysiwygPillsFlusher.swift
index 71f87284..442b539a 100644
--- a/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Components/WysiwygComposerView/WysiwygPillsFlusher.swift
+++ b/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Components/WysiwygComposerView/WysiwygPillsFlusher.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Components/WysiwygComposerView/WysiwygTextView.swift b/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Components/WysiwygComposerView/WysiwygTextView.swift
index ec80427d..e6c14c9d 100644
--- a/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Components/WysiwygComposerView/WysiwygTextView.swift
+++ b/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Components/WysiwygComposerView/WysiwygTextView.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Components/WysiwygKeyCommand.swift b/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Components/WysiwygKeyCommand.swift
index 2c6131ac..1594805f 100644
--- a/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Components/WysiwygKeyCommand.swift
+++ b/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Components/WysiwygKeyCommand.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Components/WysiwygLinkOperation.swift b/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Components/WysiwygLinkOperation.swift
index 8ce5c87b..0993945d 100644
--- a/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Components/WysiwygLinkOperation.swift
+++ b/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Components/WysiwygLinkOperation.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Components/WysiwygMentionType.swift b/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Components/WysiwygMentionType.swift
index dc454b44..0ec86deb 100644
--- a/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Components/WysiwygMentionType.swift
+++ b/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Components/WysiwygMentionType.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Extensions/CollectionDifference.swift b/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Extensions/CollectionDifference.swift
index 9acd351c..0d06e502 100644
--- a/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Extensions/CollectionDifference.swift
+++ b/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Extensions/CollectionDifference.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Extensions/ComposerAction.swift b/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Extensions/ComposerAction.swift
index e00abfb7..54f9055f 100644
--- a/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Extensions/ComposerAction.swift
+++ b/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Extensions/ComposerAction.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Extensions/ComposerModel.swift b/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Extensions/ComposerModel.swift
index 6db71b6e..324a488e 100644
--- a/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Extensions/ComposerModel.swift
+++ b/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Extensions/ComposerModel.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Extensions/Logger.swift b/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Extensions/Logger.swift
index d7a7e8fe..1a1ca603 100644
--- a/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Extensions/Logger.swift
+++ b/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Extensions/Logger.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Extensions/NSRange.swift b/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Extensions/NSRange.swift
index 342c295f..3ea00aa4 100644
--- a/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Extensions/NSRange.swift
+++ b/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Extensions/NSRange.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Extensions/PatternKey.swift b/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Extensions/PatternKey.swift
index ca86b27d..7b8fd1b4 100644
--- a/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Extensions/PatternKey.swift
+++ b/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Extensions/PatternKey.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Extensions/String.swift b/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Extensions/String.swift
index fc446f4a..e0c9600d 100644
--- a/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Extensions/String.swift
+++ b/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Extensions/String.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Extensions/UITextView.swift b/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Extensions/UITextView.swift
index 89e9b3bb..44d4344c 100644
--- a/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Extensions/UITextView.swift
+++ b/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Extensions/UITextView.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Tools/MentionReplacer.swift b/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Tools/MentionReplacer.swift
index 1f3e313e..9a432d5b 100644
--- a/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Tools/MentionReplacer.swift
+++ b/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Tools/MentionReplacer.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Tools/StringDiffer.swift b/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Tools/StringDiffer.swift
index a65e5198..ba9418e1 100644
--- a/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Tools/StringDiffer.swift
+++ b/platforms/ios/lib/WysiwygComposer/Sources/WysiwygComposer/Tools/StringDiffer.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Tests/HTMLParserTests/Extensions/NSAttributedStringAttributesTests.swift b/platforms/ios/lib/WysiwygComposer/Tests/HTMLParserTests/Extensions/NSAttributedStringAttributesTests.swift
index a4857706..144224be 100644
--- a/platforms/ios/lib/WysiwygComposer/Tests/HTMLParserTests/Extensions/NSAttributedStringAttributesTests.swift
+++ b/platforms/ios/lib/WysiwygComposer/Tests/HTMLParserTests/Extensions/NSAttributedStringAttributesTests.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Tests/HTMLParserTests/Extensions/NSAttributedStringRangeTests.swift b/platforms/ios/lib/WysiwygComposer/Tests/HTMLParserTests/Extensions/NSAttributedStringRangeTests.swift
index 4929ba50..5acfd2c8 100644
--- a/platforms/ios/lib/WysiwygComposer/Tests/HTMLParserTests/Extensions/NSAttributedStringRangeTests.swift
+++ b/platforms/ios/lib/WysiwygComposer/Tests/HTMLParserTests/Extensions/NSAttributedStringRangeTests.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Tests/HTMLParserTests/Extensions/UIColorExtensionsTests.swift b/platforms/ios/lib/WysiwygComposer/Tests/HTMLParserTests/Extensions/UIColorExtensionsTests.swift
index 6998558f..a2e16cc1 100644
--- a/platforms/ios/lib/WysiwygComposer/Tests/HTMLParserTests/Extensions/UIColorExtensionsTests.swift
+++ b/platforms/ios/lib/WysiwygComposer/Tests/HTMLParserTests/Extensions/UIColorExtensionsTests.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Tests/HTMLParserTests/HTMLParserTests+PermalinkReplacer.swift b/platforms/ios/lib/WysiwygComposer/Tests/HTMLParserTests/HTMLParserTests+PermalinkReplacer.swift
index a71a6de5..983d2a1c 100644
--- a/platforms/ios/lib/WysiwygComposer/Tests/HTMLParserTests/HTMLParserTests+PermalinkReplacer.swift
+++ b/platforms/ios/lib/WysiwygComposer/Tests/HTMLParserTests/HTMLParserTests+PermalinkReplacer.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Tests/HTMLParserTests/HTMLParserTests.swift b/platforms/ios/lib/WysiwygComposer/Tests/HTMLParserTests/HTMLParserTests.swift
index 81db5a54..c8e3cb04 100644
--- a/platforms/ios/lib/WysiwygComposer/Tests/HTMLParserTests/HTMLParserTests.swift
+++ b/platforms/ios/lib/WysiwygComposer/Tests/HTMLParserTests/HTMLParserTests.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerSnapshotTests/SnapshotTests+Blocks.swift b/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerSnapshotTests/SnapshotTests+Blocks.swift
index 57e8df63..d4fe8711 100644
--- a/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerSnapshotTests/SnapshotTests+Blocks.swift
+++ b/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerSnapshotTests/SnapshotTests+Blocks.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerSnapshotTests/SnapshotTests+Common.swift b/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerSnapshotTests/SnapshotTests+Common.swift
index e871fa85..0962b6d9 100644
--- a/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerSnapshotTests/SnapshotTests+Common.swift
+++ b/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerSnapshotTests/SnapshotTests+Common.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerSnapshotTests/SnapshotTests+Links.swift b/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerSnapshotTests/SnapshotTests+Links.swift
index 393681fd..73af7795 100644
--- a/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerSnapshotTests/SnapshotTests+Links.swift
+++ b/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerSnapshotTests/SnapshotTests+Links.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerSnapshotTests/SnapshotTests+Lists.swift b/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerSnapshotTests/SnapshotTests+Lists.swift
index b9273429..bf29e5e4 100644
--- a/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerSnapshotTests/SnapshotTests+Lists.swift
+++ b/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerSnapshotTests/SnapshotTests+Lists.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerSnapshotTests/SnapshotTests.swift b/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerSnapshotTests/SnapshotTests.swift
index 1af533cd..6c0abf35 100644
--- a/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerSnapshotTests/SnapshotTests.swift
+++ b/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerSnapshotTests/SnapshotTests.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/Components/WysiwygComposerView/WysiwygComposerViewModelTests+Autocorrection.swift b/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/Components/WysiwygComposerView/WysiwygComposerViewModelTests+Autocorrection.swift
index 9a00e7e3..d9acfb7e 100644
--- a/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/Components/WysiwygComposerView/WysiwygComposerViewModelTests+Autocorrection.swift
+++ b/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/Components/WysiwygComposerView/WysiwygComposerViewModelTests+Autocorrection.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/Components/WysiwygComposerView/WysiwygComposerViewModelTests+MentionsState.swift b/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/Components/WysiwygComposerView/WysiwygComposerViewModelTests+MentionsState.swift
index 555da6a1..6313bf69 100644
--- a/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/Components/WysiwygComposerView/WysiwygComposerViewModelTests+MentionsState.swift
+++ b/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/Components/WysiwygComposerView/WysiwygComposerViewModelTests+MentionsState.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/Components/WysiwygComposerView/WysiwygComposerViewModelTests+SetContent.swift b/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/Components/WysiwygComposerView/WysiwygComposerViewModelTests+SetContent.swift
index 250216dc..9b549723 100644
--- a/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/Components/WysiwygComposerView/WysiwygComposerViewModelTests+SetContent.swift
+++ b/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/Components/WysiwygComposerView/WysiwygComposerViewModelTests+SetContent.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/Components/WysiwygComposerView/WysiwygComposerViewModelTests+Suggestions.swift b/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/Components/WysiwygComposerView/WysiwygComposerViewModelTests+Suggestions.swift
index 291c58f5..44ce9192 100644
--- a/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/Components/WysiwygComposerView/WysiwygComposerViewModelTests+Suggestions.swift
+++ b/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/Components/WysiwygComposerView/WysiwygComposerViewModelTests+Suggestions.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/Components/WysiwygComposerView/WysiwygComposerViewModelTests.swift b/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/Components/WysiwygComposerView/WysiwygComposerViewModelTests.swift
index ab10ea92..d376fc12 100644
--- a/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/Components/WysiwygComposerView/WysiwygComposerViewModelTests.swift
+++ b/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/Components/WysiwygComposerView/WysiwygComposerViewModelTests.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/Extensions/CollectionDifferenceTests.swift b/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/Extensions/CollectionDifferenceTests.swift
index 193dec6a..c1781fe0 100644
--- a/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/Extensions/CollectionDifferenceTests.swift
+++ b/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/Extensions/CollectionDifferenceTests.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/Extensions/ComposerModel.swift b/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/Extensions/ComposerModel.swift
index 8d35642a..da72061a 100644
--- a/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/Extensions/ComposerModel.swift
+++ b/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/Extensions/ComposerModel.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/Extensions/String+LatinLangugesTests.swift b/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/Extensions/String+LatinLangugesTests.swift
index a593538f..75bb534a 100644
--- a/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/Extensions/String+LatinLangugesTests.swift
+++ b/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/Extensions/String+LatinLangugesTests.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2024 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/TestConstants.swift b/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/TestConstants.swift
index 48340a4c..9b07dc39 100644
--- a/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/TestConstants.swift
+++ b/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/TestConstants.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/Tools/StringDifferTests.swift b/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/Tools/StringDifferTests.swift
index a8214fa1..e6a9f43f 100644
--- a/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/Tools/StringDifferTests.swift
+++ b/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/Tools/StringDifferTests.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/UITextViewTests.swift b/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/UITextViewTests.swift
index 11b9ec39..3fc3fce5 100644
--- a/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/UITextViewTests.swift
+++ b/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/UITextViewTests.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/WysiwygComposerTests+CodeBlocks.swift b/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/WysiwygComposerTests+CodeBlocks.swift
index 3f3376f0..370498b9 100644
--- a/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/WysiwygComposerTests+CodeBlocks.swift
+++ b/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/WysiwygComposerTests+CodeBlocks.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/WysiwygComposerTests+Emoji.swift b/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/WysiwygComposerTests+Emoji.swift
index 5a6e2354..7ab41af5 100644
--- a/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/WysiwygComposerTests+Emoji.swift
+++ b/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/WysiwygComposerTests+Emoji.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/WysiwygComposerTests+Format.swift b/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/WysiwygComposerTests+Format.swift
index b037d3ba..d3067061 100644
--- a/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/WysiwygComposerTests+Format.swift
+++ b/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/WysiwygComposerTests+Format.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/WysiwygComposerTests+Indent.swift b/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/WysiwygComposerTests+Indent.swift
index 57c90ea6..1f45ae18 100644
--- a/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/WysiwygComposerTests+Indent.swift
+++ b/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/WysiwygComposerTests+Indent.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/WysiwygComposerTests+InlineCode.swift b/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/WysiwygComposerTests+InlineCode.swift
index f65e5503..46774193 100644
--- a/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/WysiwygComposerTests+InlineCode.swift
+++ b/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/WysiwygComposerTests+InlineCode.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/WysiwygComposerTests+Links.swift b/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/WysiwygComposerTests+Links.swift
index 4ae37dcb..217ea908 100644
--- a/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/WysiwygComposerTests+Links.swift
+++ b/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/WysiwygComposerTests+Links.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/WysiwygComposerTests+Lists.swift b/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/WysiwygComposerTests+Lists.swift
index fc0260f4..b1b66909 100644
--- a/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/WysiwygComposerTests+Lists.swift
+++ b/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/WysiwygComposerTests+Lists.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/WysiwygComposerTests+Quotes.swift b/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/WysiwygComposerTests+Quotes.swift
index 4093e239..e11ebace 100644
--- a/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/WysiwygComposerTests+Quotes.swift
+++ b/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/WysiwygComposerTests+Quotes.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/WysiwygComposerTests+Suggestions.swift b/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/WysiwygComposerTests+Suggestions.swift
index ac5fc00b..ba729f31 100644
--- a/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/WysiwygComposerTests+Suggestions.swift
+++ b/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/WysiwygComposerTests+Suggestions.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2023 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/WysiwygComposerTests.swift b/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/WysiwygComposerTests.swift
index 3bdeec18..0c86901e 100644
--- a/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/WysiwygComposerTests.swift
+++ b/platforms/ios/lib/WysiwygComposer/Tests/WysiwygComposerTests/WysiwygComposerTests.swift
@@ -2,7 +2,7 @@
 // Copyright 2024 New Vector Ltd.
 // Copyright 2022 The Matrix.org Foundation C.I.C
 //
-// SPDX-License-Identifier: AGPL-3.0-only
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 // Please see LICENSE in the repository root for full details.
 //
 
diff --git a/platforms/web/cypress.config.ts b/platforms/web/cypress.config.ts
index baaf42bd..e3618387 100644
--- a/platforms/web/cypress.config.ts
+++ b/platforms/web/cypress.config.ts
@@ -2,7 +2,7 @@
 Copyright 2024 New Vector Ltd.
 Copyright 2022 The Matrix.org Foundation C.I.C.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/platforms/web/cypress/e2e/clipboard/cut.spec.ts b/platforms/web/cypress/e2e/clipboard/cut.spec.ts
index 81fe041e..ea048afb 100644
--- a/platforms/web/cypress/e2e/clipboard/cut.spec.ts
+++ b/platforms/web/cypress/e2e/clipboard/cut.spec.ts
@@ -2,7 +2,7 @@
 Copyright 2024 New Vector Ltd.
 Copyright 2022 The Matrix.org Foundation C.I.C.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/platforms/web/cypress/e2e/clipboard/paste.spec.ts b/platforms/web/cypress/e2e/clipboard/paste.spec.ts
index e2e9233d..698b8ba1 100644
--- a/platforms/web/cypress/e2e/clipboard/paste.spec.ts
+++ b/platforms/web/cypress/e2e/clipboard/paste.spec.ts
@@ -2,7 +2,7 @@
 Copyright 2024 New Vector Ltd.
 Copyright 2022 The Matrix.org Foundation C.I.C.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/platforms/web/cypress/support/commands.ts b/platforms/web/cypress/support/commands.ts
index 625234a8..545d2f7a 100644
--- a/platforms/web/cypress/support/commands.ts
+++ b/platforms/web/cypress/support/commands.ts
@@ -2,7 +2,7 @@
 Copyright 2024 New Vector Ltd.
 Copyright 2022 The Matrix.org Foundation C.I.C.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/platforms/web/cypress/support/e2e.ts b/platforms/web/cypress/support/e2e.ts
index 970c536e..6fe88ae0 100644
--- a/platforms/web/cypress/support/e2e.ts
+++ b/platforms/web/cypress/support/e2e.ts
@@ -2,7 +2,7 @@
 Copyright 2024 New Vector Ltd.
 Copyright 2022 The Matrix.org Foundation C.I.C.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/platforms/web/example-wysiwyg/src/App.tsx b/platforms/web/example-wysiwyg/src/App.tsx
index 0f02ef05..23f40c20 100644
--- a/platforms/web/example-wysiwyg/src/App.tsx
+++ b/platforms/web/example-wysiwyg/src/App.tsx
@@ -2,7 +2,7 @@
 Copyright 2024 New Vector Ltd.
 Copyright 2022 The Matrix.org Foundation C.I.C.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/platforms/web/lib/composer.test.ts b/platforms/web/lib/composer.test.ts
index e420d99e..883d4660 100644
--- a/platforms/web/lib/composer.test.ts
+++ b/platforms/web/lib/composer.test.ts
@@ -2,7 +2,7 @@
 Copyright 2024 New Vector Ltd.
 Copyright 2022 The Matrix.org Foundation C.I.C.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/platforms/web/lib/composer.ts b/platforms/web/lib/composer.ts
index e4f5cf84..56ad75a1 100644
--- a/platforms/web/lib/composer.ts
+++ b/platforms/web/lib/composer.ts
@@ -2,7 +2,7 @@
 Copyright 2024 New Vector Ltd.
 Copyright 2022 The Matrix.org Foundation C.I.C.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/platforms/web/lib/constants.ts b/platforms/web/lib/constants.ts
index 235c7afe..a261c157 100644
--- a/platforms/web/lib/constants.ts
+++ b/platforms/web/lib/constants.ts
@@ -2,7 +2,7 @@
 Copyright 2024 New Vector Ltd.
 Copyright 2022 The Matrix.org Foundation C.I.C.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/platforms/web/lib/conversion.test.ts b/platforms/web/lib/conversion.test.ts
index 851faccc..f67da379 100644
--- a/platforms/web/lib/conversion.test.ts
+++ b/platforms/web/lib/conversion.test.ts
@@ -2,7 +2,7 @@
 Copyright 2024 New Vector Ltd.
 Copyright 2022 The Matrix.org Foundation C.I.C.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/platforms/web/lib/conversion.ts b/platforms/web/lib/conversion.ts
index e6eefd6e..0d943c75 100644
--- a/platforms/web/lib/conversion.ts
+++ b/platforms/web/lib/conversion.ts
@@ -2,7 +2,7 @@
 Copyright 2024 New Vector Ltd.
 Copyright 2022 The Matrix.org Foundation C.I.C.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/platforms/web/lib/dom.test.ts b/platforms/web/lib/dom.test.ts
index 80d0fc60..4e61490f 100644
--- a/platforms/web/lib/dom.test.ts
+++ b/platforms/web/lib/dom.test.ts
@@ -2,7 +2,7 @@
 Copyright 2024 New Vector Ltd.
 Copyright 2022 The Matrix.org Foundation C.I.C.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/platforms/web/lib/dom.ts b/platforms/web/lib/dom.ts
index e114fb50..be97167f 100644
--- a/platforms/web/lib/dom.ts
+++ b/platforms/web/lib/dom.ts
@@ -2,7 +2,7 @@
 Copyright 2024 New Vector Ltd.
 Copyright 2022 The Matrix.org Foundation C.I.C.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/platforms/web/lib/suggestion.test.tsx b/platforms/web/lib/suggestion.test.tsx
index fcd49a2d..0a4febb5 100644
--- a/platforms/web/lib/suggestion.test.tsx
+++ b/platforms/web/lib/suggestion.test.tsx
@@ -2,7 +2,7 @@
 Copyright 2024 New Vector Ltd.
 Copyright 2023 The Matrix.org Foundation C.I.C.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/platforms/web/lib/suggestion.ts b/platforms/web/lib/suggestion.ts
index 18a2427c..1c9a0281 100644
--- a/platforms/web/lib/suggestion.ts
+++ b/platforms/web/lib/suggestion.ts
@@ -2,7 +2,7 @@
 Copyright 2024 New Vector Ltd.
 Copyright 2023 The Matrix.org Foundation C.I.C.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/platforms/web/lib/testUtils/Editor.tsx b/platforms/web/lib/testUtils/Editor.tsx
index 52d6c006..c1a746d9 100644
--- a/platforms/web/lib/testUtils/Editor.tsx
+++ b/platforms/web/lib/testUtils/Editor.tsx
@@ -2,7 +2,7 @@
 Copyright 2024 New Vector Ltd.
 Copyright 2022 The Matrix.org Foundation C.I.C.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/platforms/web/lib/testUtils/selection.ts b/platforms/web/lib/testUtils/selection.ts
index 32d4bec5..2402145d 100644
--- a/platforms/web/lib/testUtils/selection.ts
+++ b/platforms/web/lib/testUtils/selection.ts
@@ -2,7 +2,7 @@
 Copyright 2024 New Vector Ltd.
 Copyright 2022 The Matrix.org Foundation C.I.C.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/platforms/web/lib/types.ts b/platforms/web/lib/types.ts
index 9b54cf7f..b0141dc1 100644
--- a/platforms/web/lib/types.ts
+++ b/platforms/web/lib/types.ts
@@ -2,7 +2,7 @@
 Copyright 2024 New Vector Ltd.
 Copyright 2022 The Matrix.org Foundation C.I.C.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/platforms/web/lib/useComposerModel.test.tsx b/platforms/web/lib/useComposerModel.test.tsx
index 4bb17e17..6db2fa51 100644
--- a/platforms/web/lib/useComposerModel.test.tsx
+++ b/platforms/web/lib/useComposerModel.test.tsx
@@ -2,7 +2,7 @@
 Copyright 2024 New Vector Ltd.
 Copyright 2023 The Matrix.org Foundation C.I.C.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/platforms/web/lib/useComposerModel.ts b/platforms/web/lib/useComposerModel.ts
index cda16234..23fd3d55 100644
--- a/platforms/web/lib/useComposerModel.ts
+++ b/platforms/web/lib/useComposerModel.ts
@@ -2,7 +2,7 @@
 Copyright 2024 New Vector Ltd.
 Copyright 2022 The Matrix.org Foundation C.I.C.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/platforms/web/lib/useFormattingFunctions.ts b/platforms/web/lib/useFormattingFunctions.ts
index 6e813814..ad54b764 100644
--- a/platforms/web/lib/useFormattingFunctions.ts
+++ b/platforms/web/lib/useFormattingFunctions.ts
@@ -2,7 +2,7 @@
 Copyright 2024 New Vector Ltd.
 Copyright 2022 The Matrix.org Foundation C.I.C.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/platforms/web/lib/useListeners/assert.ts b/platforms/web/lib/useListeners/assert.ts
index f07aa7af..1f30edae 100644
--- a/platforms/web/lib/useListeners/assert.ts
+++ b/platforms/web/lib/useListeners/assert.ts
@@ -2,7 +2,7 @@
 Copyright 2024 New Vector Ltd.
 Copyright 2022 The Matrix.org Foundation C.I.C.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/platforms/web/lib/useListeners/event.test.ts b/platforms/web/lib/useListeners/event.test.ts
index d69222b6..b805c075 100644
--- a/platforms/web/lib/useListeners/event.test.ts
+++ b/platforms/web/lib/useListeners/event.test.ts
@@ -2,7 +2,7 @@
 Copyright 2024 New Vector Ltd.
 Copyright 2022 The Matrix.org Foundation C.I.C.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/platforms/web/lib/useListeners/event.ts b/platforms/web/lib/useListeners/event.ts
index dd19e416..7adbd43d 100644
--- a/platforms/web/lib/useListeners/event.ts
+++ b/platforms/web/lib/useListeners/event.ts
@@ -2,7 +2,7 @@
 Copyright 2024 New Vector Ltd.
 Copyright 2022 The Matrix.org Foundation C.I.C.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/platforms/web/lib/useListeners/index.ts b/platforms/web/lib/useListeners/index.ts
index 9e7cc5ec..e79e71f0 100644
--- a/platforms/web/lib/useListeners/index.ts
+++ b/platforms/web/lib/useListeners/index.ts
@@ -2,7 +2,7 @@
 Copyright 2024 New Vector Ltd.
 Copyright 2022 The Matrix.org Foundation C.I.C.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/platforms/web/lib/useListeners/types.ts b/platforms/web/lib/useListeners/types.ts
index 8acdba84..73b3154b 100644
--- a/platforms/web/lib/useListeners/types.ts
+++ b/platforms/web/lib/useListeners/types.ts
@@ -2,7 +2,7 @@
 Copyright 2024 New Vector Ltd.
 Copyright 2022 The Matrix.org Foundation C.I.C.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/platforms/web/lib/useListeners/useListeners.ts b/platforms/web/lib/useListeners/useListeners.ts
index 2193d852..84742408 100644
--- a/platforms/web/lib/useListeners/useListeners.ts
+++ b/platforms/web/lib/useListeners/useListeners.ts
@@ -2,7 +2,7 @@
 Copyright 2024 New Vector Ltd.
 Copyright 2022 The Matrix.org Foundation C.I.C.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/platforms/web/lib/useListeners/utils.test.ts b/platforms/web/lib/useListeners/utils.test.ts
index 64e3c530..442625af 100644
--- a/platforms/web/lib/useListeners/utils.test.ts
+++ b/platforms/web/lib/useListeners/utils.test.ts
@@ -2,7 +2,7 @@
 Copyright 2024 New Vector Ltd.
 Copyright 2022 The Matrix.org Foundation C.I.C.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/platforms/web/lib/useListeners/utils.ts b/platforms/web/lib/useListeners/utils.ts
index 3f020023..9c370fd0 100644
--- a/platforms/web/lib/useListeners/utils.ts
+++ b/platforms/web/lib/useListeners/utils.ts
@@ -2,7 +2,7 @@
 Copyright 2024 New Vector Ltd.
 Copyright 2022 The Matrix.org Foundation C.I.C.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/platforms/web/lib/useTestCases/assert.ts b/platforms/web/lib/useTestCases/assert.ts
index 9bbed370..bae44e70 100644
--- a/platforms/web/lib/useTestCases/assert.ts
+++ b/platforms/web/lib/useTestCases/assert.ts
@@ -2,7 +2,7 @@
 Copyright 2024 New Vector Ltd.
 Copyright 2022 The Matrix.org Foundation C.I.C.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/platforms/web/lib/useTestCases/index.ts b/platforms/web/lib/useTestCases/index.ts
index 9985ee35..e4cf3be9 100644
--- a/platforms/web/lib/useTestCases/index.ts
+++ b/platforms/web/lib/useTestCases/index.ts
@@ -2,7 +2,7 @@
 Copyright 2024 New Vector Ltd.
 Copyright 2022 The Matrix.org Foundation C.I.C.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/platforms/web/lib/useTestCases/types.ts b/platforms/web/lib/useTestCases/types.ts
index 8392a138..cf586b99 100644
--- a/platforms/web/lib/useTestCases/types.ts
+++ b/platforms/web/lib/useTestCases/types.ts
@@ -2,7 +2,7 @@
 Copyright 2024 New Vector Ltd.
 Copyright 2022 The Matrix.org Foundation C.I.C.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/platforms/web/lib/useTestCases/useTestCases.ts b/platforms/web/lib/useTestCases/useTestCases.ts
index f4c515c3..c5dcf2f8 100644
--- a/platforms/web/lib/useTestCases/useTestCases.ts
+++ b/platforms/web/lib/useTestCases/useTestCases.ts
@@ -2,7 +2,7 @@
 Copyright 2024 New Vector Ltd.
 Copyright 2022 The Matrix.org Foundation C.I.C.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/platforms/web/lib/useTestCases/utils.test.ts b/platforms/web/lib/useTestCases/utils.test.ts
index 890786b1..d3d276c4 100644
--- a/platforms/web/lib/useTestCases/utils.test.ts
+++ b/platforms/web/lib/useTestCases/utils.test.ts
@@ -2,7 +2,7 @@
 Copyright 2024 New Vector Ltd.
 Copyright 2022 The Matrix.org Foundation C.I.C.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/platforms/web/lib/useTestCases/utils.ts b/platforms/web/lib/useTestCases/utils.ts
index a53214eb..14e405a5 100644
--- a/platforms/web/lib/useTestCases/utils.ts
+++ b/platforms/web/lib/useTestCases/utils.ts
@@ -2,7 +2,7 @@
 Copyright 2024 New Vector Ltd.
 Copyright 2022 The Matrix.org Foundation C.I.C.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/platforms/web/lib/useWysiwyg.delete.test.tsx b/platforms/web/lib/useWysiwyg.delete.test.tsx
index 96af6784..f84d6e29 100644
--- a/platforms/web/lib/useWysiwyg.delete.test.tsx
+++ b/platforms/web/lib/useWysiwyg.delete.test.tsx
@@ -2,7 +2,7 @@
 Copyright 2024 New Vector Ltd.
 Copyright 2022 The Matrix.org Foundation C.I.C.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/platforms/web/lib/useWysiwyg.formatting.test.tsx b/platforms/web/lib/useWysiwyg.formatting.test.tsx
index 9358e5ff..c59506c8 100644
--- a/platforms/web/lib/useWysiwyg.formatting.test.tsx
+++ b/platforms/web/lib/useWysiwyg.formatting.test.tsx
@@ -2,7 +2,7 @@
 Copyright 2024 New Vector Ltd.
 Copyright 2022 The Matrix.org Foundation C.I.C.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/platforms/web/lib/useWysiwyg.inputEventProcessor.test.tsx b/platforms/web/lib/useWysiwyg.inputEventProcessor.test.tsx
index fa896900..779d4136 100644
--- a/platforms/web/lib/useWysiwyg.inputEventProcessor.test.tsx
+++ b/platforms/web/lib/useWysiwyg.inputEventProcessor.test.tsx
@@ -2,7 +2,7 @@
 Copyright 2024 New Vector Ltd.
 Copyright 2022 The Matrix.org Foundation C.I.C.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/platforms/web/lib/useWysiwyg.test.tsx b/platforms/web/lib/useWysiwyg.test.tsx
index 7ec17dad..7373d7d8 100644
--- a/platforms/web/lib/useWysiwyg.test.tsx
+++ b/platforms/web/lib/useWysiwyg.test.tsx
@@ -2,7 +2,7 @@
 Copyright 2024 New Vector Ltd.
 Copyright 2022 The Matrix.org Foundation C.I.C.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/platforms/web/lib/useWysiwyg.ts b/platforms/web/lib/useWysiwyg.ts
index 005f1355..91fa8390 100644
--- a/platforms/web/lib/useWysiwyg.ts
+++ b/platforms/web/lib/useWysiwyg.ts
@@ -2,7 +2,7 @@
 Copyright 2024 New Vector Ltd.
 Copyright 2022 The Matrix.org Foundation C.I.C.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/platforms/web/lib/useWysiwyg.undo-redo.test.tsx b/platforms/web/lib/useWysiwyg.undo-redo.test.tsx
index cf187f2f..62f44af9 100644
--- a/platforms/web/lib/useWysiwyg.undo-redo.test.tsx
+++ b/platforms/web/lib/useWysiwyg.undo-redo.test.tsx
@@ -2,7 +2,7 @@
 Copyright 2024 New Vector Ltd.
 Copyright 2022 The Matrix.org Foundation C.I.C.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/platforms/web/lib/utils.test.ts b/platforms/web/lib/utils.test.ts
index 180c267b..60268a29 100644
--- a/platforms/web/lib/utils.test.ts
+++ b/platforms/web/lib/utils.test.ts
@@ -2,7 +2,7 @@
 Copyright 2024 New Vector Ltd.
 Copyright 2023 The Matrix.org Foundation C.I.C.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/platforms/web/lib/utils.ts b/platforms/web/lib/utils.ts
index 3fec2937..a37ca0ce 100644
--- a/platforms/web/lib/utils.ts
+++ b/platforms/web/lib/utils.ts
@@ -2,7 +2,7 @@
 Copyright 2024 New Vector Ltd.
 Copyright 2023 The Matrix.org Foundation C.I.C.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/platforms/web/package.json b/platforms/web/package.json
index f8a46f11..1b84d264 100644
--- a/platforms/web/package.json
+++ b/platforms/web/package.json
@@ -8,7 +8,7 @@
         "type": "git",
         "url": "https://github.com/element-hq/matrix-rich-text-editor"
     },
-    "license": "AGPL-3.0",
+    "license": "SEE LICENSE IN README.md",
     "exports": {
         ".": {
             "import": "./dist/matrix-wysiwyg.js",
diff --git a/platforms/web/src/App.tsx b/platforms/web/src/App.tsx
index 7ee3cf13..e76f215b 100644
--- a/platforms/web/src/App.tsx
+++ b/platforms/web/src/App.tsx
@@ -2,7 +2,7 @@
 Copyright 2024 New Vector Ltd.
 Copyright 2022 The Matrix.org Foundation C.I.C.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/platforms/web/src/main.tsx b/platforms/web/src/main.tsx
index 0d3bdb43..6138ad20 100644
--- a/platforms/web/src/main.tsx
+++ b/platforms/web/src/main.tsx
@@ -2,7 +2,7 @@
 Copyright 2024 New Vector Ltd.
 Copyright 2022 The Matrix.org Foundation C.I.C.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/platforms/web/test.setup.ts b/platforms/web/test.setup.ts
index 4f521947..5510c35d 100644
--- a/platforms/web/test.setup.ts
+++ b/platforms/web/test.setup.ts
@@ -2,7 +2,7 @@
 Copyright 2024 New Vector Ltd.
 Copyright 2022 The Matrix.org Foundation C.I.C.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/platforms/web/vite.config.ts b/platforms/web/vite.config.ts
index e0a3bf92..ea31bd69 100644
--- a/platforms/web/vite.config.ts
+++ b/platforms/web/vite.config.ts
@@ -2,7 +2,7 @@
 Copyright 2024 New Vector Ltd.
 Copyright 2022 The Matrix.org Foundation C.I.C.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/platforms/web/vite.demo.config.ts b/platforms/web/vite.demo.config.ts
index 31e4b522..42757c32 100644
--- a/platforms/web/vite.demo.config.ts
+++ b/platforms/web/vite.demo.config.ts
@@ -2,7 +2,7 @@
 Copyright 2024 New Vector Ltd.
 Copyright 2022 The Matrix.org Foundation C.I.C.
 
-SPDX-License-Identifier: AGPL-3.0-only
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
diff --git a/update_version.sh b/update_version.sh
index 1e90f13c..030cf994 100755
--- a/update_version.sh
+++ b/update_version.sh
@@ -20,7 +20,7 @@ SCRIPT_PATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
 VERSION=$1
 CARGO_REGEX="s/^version\s*=\s*\".*\"/version = \"$VERSION\"/g"
 PACKAGE_JSON_REGEX="s/\"version\":\s*\".*\"/\"version\": \"$VERSION\"/g"
-GRADLE_PROPERTIES_REGEX="s/^VERSION_NAME=.*$/VERSION_NAME=$VERSION/g"
+GRADLE_PROPERTIES_REGEX="s/^MAVEN_VERSION_NAME=.*$/MAVEN_VERSION_NAME=$VERSION/g"
 
 echo "Updating Rust"
 $SED_CMD "$CARGO_REGEX" $SCRIPT_PATH/bindings/wysiwyg-ffi/Cargo.toml