From 1ed4c6fd5e14ba5d2d200738209cee010e72bc91 Mon Sep 17 00:00:00 2001
From: James Mortemore <jamesmortemore@gmail.com>
Date: Sun, 12 Apr 2026 13:15:07 +0100
Subject: [PATCH] feat!: update for BanManager v8 compatibility

- Bump all BanManager dependencies from 7.11.0-SNAPSHOT to 8.0.0-SNAPSHOT
- Bump Java target from 1.8 to 17 across CommonConfig, LibsConfig, sponge-api7
- Migrate PinCommand from message.toString() to message.sendTo(sender)
- Update CommonPlayerDeniedListener to use getRawTemplate() and <pin> tag
- Update tests for MiniMessage template format
- Add null template test case for handlePin
---
 buildSrc/src/main/kotlin/CommonConfig.kt      |   6 +-
 buildSrc/src/main/kotlin/LibsConfig.kt        |   8 +-
 bukkit/build.gradle.kts                       |   2 +-
 bungee/build.gradle.kts                       |   2 +-
 common/build.gradle.kts                       |   4 +-
 .../common/commands/PinCommand.java           |   4 +-
 .../listeners/CommonPlayerDeniedListener.java |   4 +-
 common/src/main/resources/messages.yml        |   6 +-
 .../CommonPlayerDeniedListenerTest.java       |  22 +-
 .../banmanager-webenhancer/messages.yml       |   6 +-
 .../bukkit/configs/banmanager/messages.yml    | 537 +++++++++------
 .../banmanager-webenhancer/messages.yml       |   5 +-
 .../bungee/configs/banmanager/messages.yml    | 618 ++++++++++--------
 .../banmanager-webenhancer/messages.yml       |   6 +-
 .../fabric/configs/banmanager/messages.yml    | 462 +++++++------
 .../banmanager-webenhancer/messages.yml       |   6 +-
 .../sponge/configs/banmanager/messages.yml    | 537 +++++++++------
 .../banmanager-webenhancer/messages.yml       |   6 +-
 .../sponge7/configs/banmanager/messages.yml   | 537 +++++++++------
 .../banmanager-webenhancer/messages.yml       |   5 +-
 .../velocity/configs/banmanager/messages.yml  | 618 ++++++++++--------
 fabric/build.gradle.kts                       |   2 +-
 sponge-api7/build.gradle.kts                  |   4 +-
 sponge/build.gradle.kts                       |   4 +-
 velocity/build.gradle.kts                     |   2 +-
 25 files changed, 1962 insertions(+), 1451 deletions(-)

diff --git a/buildSrc/src/main/kotlin/CommonConfig.kt b/buildSrc/src/main/kotlin/CommonConfig.kt
index 897697a..43d7167 100644
--- a/buildSrc/src/main/kotlin/CommonConfig.kt
+++ b/buildSrc/src/main/kotlin/CommonConfig.kt
@@ -30,12 +30,12 @@ fun Project.applyCommonConfiguration() {
         }
     }
 
-    // Only set Java 1.8 for non-Fabric modules
+    // Only set Java 17 for non-Fabric modules
     // Fabric uses toolchain configuration in its build.gradle.kts
     plugins.withId("java") {
         if (!plugins.hasPlugin("fabric-loom")) {
-            the<JavaPluginExtension>().setSourceCompatibility("1.8")
-            the<JavaPluginExtension>().setTargetCompatibility("1.8")
+            the<JavaPluginExtension>().setSourceCompatibility("17")
+            the<JavaPluginExtension>().setTargetCompatibility("17")
         }
     }
 }
diff --git a/buildSrc/src/main/kotlin/LibsConfig.kt b/buildSrc/src/main/kotlin/LibsConfig.kt
index 8a306be..b19b260 100644
--- a/buildSrc/src/main/kotlin/LibsConfig.kt
+++ b/buildSrc/src/main/kotlin/LibsConfig.kt
@@ -35,8 +35,8 @@ fun Project.applyLibrariesConfiguration() {
     }
 
     plugins.withId("java") {
-        the<JavaPluginExtension>().setSourceCompatibility("1.8")
-        the<JavaPluginExtension>().setTargetCompatibility("1.8")
+        the<JavaPluginExtension>().setSourceCompatibility("17")
+        the<JavaPluginExtension>().setTargetCompatibility("17")
     }
 
     group = "${rootProject.group}.BanManagerWebEnhancerLibs"
@@ -89,7 +89,7 @@ fun Project.applyLibrariesConfiguration() {
             attribute(Category.CATEGORY_ATTRIBUTE, project.objects.named(Category.LIBRARY))
             attribute(Bundling.BUNDLING_ATTRIBUTE, project.objects.named(Bundling.SHADOWED))
             attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, project.objects.named(LibraryElements.JAR))
-            attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 8)
+            attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 17)
         }
         outgoing.artifact(tasks.named("jar"))
     }
@@ -104,7 +104,7 @@ fun Project.applyLibrariesConfiguration() {
             attribute(Category.CATEGORY_ATTRIBUTE, project.objects.named(Category.LIBRARY))
             attribute(Bundling.BUNDLING_ATTRIBUTE, project.objects.named(Bundling.SHADOWED))
             attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, project.objects.named(LibraryElements.JAR))
-            attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 8)
+            attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 17)
         }
         outgoing.artifact(tasks.named("jar"))
     }
diff --git a/bukkit/build.gradle.kts b/bukkit/build.gradle.kts
index 40b174c..9ed2cf5 100644
--- a/bukkit/build.gradle.kts
+++ b/bukkit/build.gradle.kts
@@ -26,7 +26,7 @@ dependencies {
     api(project(":BanManagerWebEnhancerCommon")) {
         isTransitive = true
     }
-    compileOnly("me.confuser.banmanager:BanManagerBukkit:7.11.0-SNAPSHOT")
+    compileOnly("me.confuser.banmanager:BanManagerBukkit:8.0.0-SNAPSHOT")
 
     compileOnly("org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT") {
         exclude("junit", "junit")
diff --git a/bungee/build.gradle.kts b/bungee/build.gradle.kts
index 41c678a..1b78531 100644
--- a/bungee/build.gradle.kts
+++ b/bungee/build.gradle.kts
@@ -26,7 +26,7 @@ dependencies {
     api(project(":BanManagerWebEnhancerCommon")) {
         isTransitive = true
     }
-    compileOnly("me.confuser.banmanager:BanManagerBungee:7.11.0-SNAPSHOT")
+    compileOnly("me.confuser.banmanager:BanManagerBungee:8.0.0-SNAPSHOT")
 
     compileOnly("net.md-5:bungeecord-api:1.21-R0.4")
     "shadeOnly"("org.bstats:bstats-bungeecord:2.2.1")
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
index ae9bf02..4d0ea62 100644
--- a/common/build.gradle.kts
+++ b/common/build.gradle.kts
@@ -8,8 +8,8 @@ applyPlatformAndCoreConfiguration()
 dependencies {
     api(project(":BanManagerWebEnhancerLibs"))
 
-    api("me.confuser.banmanager:BanManagerCommon:7.11.0-SNAPSHOT")
-    api("me.confuser.banmanager.BanManagerLibs:BanManagerLibs:7.11.0-SNAPSHOT")
+    api("me.confuser.banmanager:BanManagerCommon:8.0.0-SNAPSHOT")
+    api("me.confuser.banmanager.BanManagerLibs:BanManagerLibs:8.0.0-SNAPSHOT")
 
     // Test dependencies
     testImplementation("junit:junit:4.13")
diff --git a/common/src/main/java/me/confuser/banmanager/webenhancer/common/commands/PinCommand.java b/common/src/main/java/me/confuser/banmanager/webenhancer/common/commands/PinCommand.java
index 16944c7..42d3543 100644
--- a/common/src/main/java/me/confuser/banmanager/webenhancer/common/commands/PinCommand.java
+++ b/common/src/main/java/me/confuser/banmanager/webenhancer/common/commands/PinCommand.java
@@ -42,7 +42,7 @@ public boolean onCommand(CommonSender sender, CommandParser parser) {
       try {
         player = getPlugin().getPlayerStorage().queryForId(sender.getData().getId());
       } catch (SQLException e) {
-        sender.sendMessage(Message.get("sender.error.exception").toString());
+        Message.get("sender.error.exception").sendTo(sender);
         e.printStackTrace();
         return;
       }
@@ -50,7 +50,7 @@ public boolean onCommand(CommonSender sender, CommandParser parser) {
       PlayerPinData pin = plugin.getPlayerPinStorage().getValidPin(player);
 
       if (pin == null) {
-        sender.sendMessage(Message.get("sender.error.exception").toString());
+        Message.get("sender.error.exception").sendTo(sender);
         return;
       }
 
diff --git a/common/src/main/java/me/confuser/banmanager/webenhancer/common/listeners/CommonPlayerDeniedListener.java b/common/src/main/java/me/confuser/banmanager/webenhancer/common/listeners/CommonPlayerDeniedListener.java
index 5640166..cee7fa8 100644
--- a/common/src/main/java/me/confuser/banmanager/webenhancer/common/listeners/CommonPlayerDeniedListener.java
+++ b/common/src/main/java/me/confuser/banmanager/webenhancer/common/listeners/CommonPlayerDeniedListener.java
@@ -13,11 +13,11 @@ public CommonPlayerDeniedListener(WebEnhancerPlugin plugin) {
   }
 
   public void handlePin(PlayerData player, Message message) {
-    if (!message.toString().contains("[pin]")) return;
+    String template = message.getRawTemplate();
+    if (template == null || !template.contains("<pin>")) return;
 
     PlayerPinData pin = plugin.getPlayerPinStorage().getValidPin(player);
 
-
     if (pin != null) {
       message.set("pin", String.valueOf(pin.getGeneratedPin()));
     }
diff --git a/common/src/main/resources/messages.yml b/common/src/main/resources/messages.yml
index 023dec2..4ea98a0 100644
--- a/common/src/main/resources/messages.yml
+++ b/common/src/main/resources/messages.yml
@@ -1,5 +1,5 @@
 messages:
   pin:
-    notify: '&6Your pin expires in [expires]'
-    pin: '[pin]'
-    rateLimited: '&cPlease wait [seconds] seconds before generating a new pin'
+    notify: '<gold>Your pin expires in <expires>'
+    pin: '<pin>'
+    rateLimited: '<red>Please wait <seconds> seconds before generating a new pin'
diff --git a/common/src/test/java/me/confuser/banmanager/webenhancer/common/listeners/CommonPlayerDeniedListenerTest.java b/common/src/test/java/me/confuser/banmanager/webenhancer/common/listeners/CommonPlayerDeniedListenerTest.java
index 04aeaee..1f3840e 100644
--- a/common/src/test/java/me/confuser/banmanager/webenhancer/common/listeners/CommonPlayerDeniedListenerTest.java
+++ b/common/src/test/java/me/confuser/banmanager/webenhancer/common/listeners/CommonPlayerDeniedListenerTest.java
@@ -39,13 +39,11 @@ public void setUp() {
 
     @Test
     public void handlePin_replacesPlaceholderWithPin() {
-        // Setup
         when(playerPinStorage.getValidPin(player)).thenReturn(pinData);
         when(pinData.getGeneratedPin()).thenReturn(123456);
 
-        // Create a mocked message with [pin] placeholder
         Message message = mock(Message.class);
-        when(message.toString()).thenReturn("Your login pin is: [pin]");
+        when(message.getRawTemplate()).thenReturn("Your login pin is: <pin>");
 
         listener.handlePin(player, message);
 
@@ -54,9 +52,8 @@ public void handlePin_replacesPlaceholderWithPin() {
 
     @Test
     public void handlePin_ignoresMessagesWithoutPlaceholder() {
-        // Create a mocked message without [pin] placeholder
         Message message = mock(Message.class);
-        when(message.toString()).thenReturn("You have been banned!");
+        when(message.getRawTemplate()).thenReturn("You have been banned!");
 
         listener.handlePin(player, message);
 
@@ -66,15 +63,24 @@ public void handlePin_ignoresMessagesWithoutPlaceholder() {
 
     @Test
     public void handlePin_handlesNullPinGracefully() {
-        // Setup - getValidPin returns null
         when(playerPinStorage.getValidPin(player)).thenReturn(null);
 
-        // Create a mocked message with [pin] placeholder
         Message message = mock(Message.class);
-        when(message.toString()).thenReturn("Your login pin is: [pin]");
+        when(message.getRawTemplate()).thenReturn("Your login pin is: <pin>");
 
         listener.handlePin(player, message);
 
         verify(message, never()).set(anyString(), anyString());
     }
+
+    @Test
+    public void handlePin_handlesNullTemplateGracefully() {
+        Message message = mock(Message.class);
+        when(message.getRawTemplate()).thenReturn(null);
+
+        listener.handlePin(player, message);
+
+        verify(playerPinStorage, never()).getValidPin(any());
+        verify(message, never()).set(anyString(), anyString());
+    }
 }
diff --git a/e2e/platforms/bukkit/configs/banmanager-webenhancer/messages.yml b/e2e/platforms/bukkit/configs/banmanager-webenhancer/messages.yml
index 5738200..4ea98a0 100644
--- a/e2e/platforms/bukkit/configs/banmanager-webenhancer/messages.yml
+++ b/e2e/platforms/bukkit/configs/banmanager-webenhancer/messages.yml
@@ -1,5 +1,5 @@
 messages:
   pin:
-    notify: '&6Your pin expires in [expires]'
-    pin: '[pin]'
-
+    notify: '<gold>Your pin expires in <expires>'
+    pin: '<pin>'
+    rateLimited: '<red>Please wait <seconds> seconds before generating a new pin'
diff --git a/e2e/platforms/bukkit/configs/banmanager/messages.yml b/e2e/platforms/bukkit/configs/banmanager/messages.yml
index 459dab6..ec9a8a6 100644
--- a/e2e/platforms/bukkit/configs/banmanager/messages.yml
+++ b/e2e/platforms/bukkit/configs/banmanager/messages.yml
@@ -1,16 +1,22 @@
-# BanManager messages configuration for E2E testing
-# Modified to include [pin] placeholder for WebEnhancer testing
+# Message templates use MiniMessage formatting: https://docs.advntr.dev/minimessage/format.html
+# Placeholders use angle brackets, e.g. <reason>, <player>, <ip>, <actor>, <expires>
+
+tokens:
+  appealUrl: 'https://yourdomain.com/appeal'
+  serverName: 'My Server'
+  discordUrl: 'https://discord.gg/example'
+  rulesUrl: 'https://yourdomain.com/rules'
 
 messages:
-  duplicateIP: '&cWarning: [player] has the same IP as the following banned players:\n&6[players]'
-  duplicateIPAlts: '&cWarning: [player] has the same IP as the following players:\n&6[players]'
-  configReloaded: '&aConfiguration reloaded successfully!'
+  duplicateIP: '<red>Warning: <player> has the same IP as the following banned players:\n<gold><players>'
+  duplicateIPAlts: '<red>Warning: <player> has the same IP as the following players:\n<gold><players>'
+  configReloaded: '<green>Configuration reloaded successfully!'
   deniedNotify:
-    player: '&cWarning: [player] attempted to join the server but was denied due to &4[reason]'
-    ip: '&cWarning: [ip] attempted to join the server but was denied due to &4[reason]'
-  deniedMaxIp: '&cToo many players with your ip address online'
-  deniedMultiaccounts: '&cToo many players with your ip address logged in recently'
-  deniedCountry: '&cYou may not connect from your region'
+    player: '<red>Warning: <player> attempted to join the server but was denied due to <dark_red><reason>'
+    ip: '<red>Warning: <ip> attempted to join the server but was denied due to <dark_red><reason>'
+  deniedMaxIp: '<red>Too many players with your ip address online'
+  deniedMultiaccounts: '<red>Too many players with your ip address logged in recently'
+  deniedCountry: '<red>You may not connect from your region'
 
   time:
     now: 'now'
@@ -30,337 +36,442 @@ messages:
     seconds: 'seconds'
     never: 'never'
     error:
-      invalid: '&cYour time length is invalid'
-      limit: '&cYou cannot perform this action for that length of time'
+      invalid: '<red>Your time length is invalid'
+      limit: '<red>You cannot perform this action for that length of time'
 
   none: 'none'
+  # General command text
   sender:
     error:
-      notFound: '&c[player] not found, are you sure they exist?'
-      offline: '&c[player] is offline'
-      noSelf: '&cYou cannot perform that action on yourself!'
-      exception: '&cAn error occured whilst attempting to perform this command. Please check the console for further details.'
-      invalidIp: '&cInvalid IP address, expecting w.x.y.z format'
-      offlinePermission: '&cYou are not allowed to perform this action on an offline player'
-      exempt: '&c[player] is exempt from that action'
-      noPermission: '&cYou do not have permission to perform that action'
-      invalidReason: '&c[reason] is no valid reason.'
-
+      notFound: '<red><player> not found, are you sure they exist?'
+      offline: '<red><player> is offline'
+      noSelf: '<red>You cannot perform that action on yourself!'
+      exception: '<red>An error occured whilst attempting to perform this command. Please check the console for further details.'
+      invalidIp: '<red>Invalid IP address, expecting w.x.y.z format'
+      offlinePermission: '<red>You are not allowed to perform this action on an offline player'
+      ambiguousPlayer: '<red>Multiple players match "<player>". Please use their full name.'
+      exempt: '<red><player> is exempt from that action'
+      noPermission: '<red>You do not have permission to perform that action'
+      invalidReason: '<red><reason> is no valid reason.'
+  # Commands
   alts:
     header: 'Possible alts found:'
+    entry: '<click:run_command:"/bminfo <name>"><name></click>'
+    separator: '<gray>, '
+
+  names:
+    header: 'Known names for <player>:'
+    row: '<yellow><name> <gray>(first: <firstSeen>, last: <lastSeen>)'
+    interactive: '<hover:show_text:"<yellow><name> <gray>(first: <firstSeen>, last: <lastSeen>)"><click:run_command:"/bminfo <name>"><yellow><name></click></hover>'
+    separator: '<gray>, '
+    dateTimeFormat: 'dd-MM-yyyy'
+    none: '<gray>No name history found'
 
   export:
     error:
-      inProgress: '&cAn export is already in progress, please wait'
+      inProgress: '<red>An export is already in progress, please wait'
     player:
-      started: '&aPlayer ban export started'
-      finished: '&aPlayer ban export finished, file [file] created'
+      started: '<green>Player ban export started'
+      finished: '<green>Player ban export finished, file <file> created'
     ip:
-      started: '&aIP ban export started'
-      finished: '&aIP ban export finished, file [file] created'
+      started: '<green>IP ban export started'
+      finished: '<green>IP ban export finished, file <file> created'
 
   import:
     error:
-      inProgress: '&cAn import is already in progress, please wait'
+      inProgress: '<red>An import is already in progress, please wait'
     player:
-      started: '&aPlayer ban import started'
-      finished: '&aPlayer ban import finished'
+      started: '<green>Player ban import started'
+      finished: '<green>Player ban import finished'
     ip:
-      started: '&aIP ban import started'
-      finished: '&aIP ban import finished'
+      started: '<green>IP ban import started'
+      finished: '<green>IP ban import finished'
     advancedban:
-      started: '&aAdvancedBan import started'
-      finished: '&aAdvancedBan import finished'
+      started: '<green>AdvancedBan import started'
+      finished: '<green>AdvancedBan import finished'
     h2:
-      started: '&aH2 import started'
-      finished: '&aH2 import finished, please restart the server'
+      started: '<green>H2 import started'
+      finished: '<green>H2 import finished, please restart the server'
+    litebans:
+      started: '<green>LiteBans import started'
+      finished: '<green>LiteBans import finished'
 
   info:
     error:
-      invalidIndex: '&cInvalid player option used'
-      indexRequired: '&cMultiple players named [name] found, please select a player by providing an index between 1 and [size], e.g. /bminfo [name] 1'
-      index: '&7#[index] - &6[name] - &4[uuid]'
+      invalidIndex: '<red>Invalid player option used'
+      indexRequired: '<red>Multiple players named <name> found, please select a player by providing an index between 1 and <size>, e.g. /bminfo <name> 1'
+      index: '<gray>#<index> - <gold><name> - <dark_red><uuid>'
     stats:
-      player: '&6[player] has been banned [bans] times, muted [mutes] times, kicked [kicks] times and warned [warns] times ([warnPoints] Points), has [notes] notes and been reported [reports] times'
-      ip: '&6This ip has been banned [bans] times, muted [mutes] times and range banned [rangebans] times'
-    connection: '&6Their last connection was with [ip] on [lastSeen]'
-    geoip: 'Country: [country] City: [city]'
+      player: '<gold><player> has been banned <bans> times, muted <mutes> times, kicked <kicks> times and warned <warns>
+      times (<warnPoints> Points), has <notes> notes and been reported <reports> times'
+      ip: '<gold>This ip has been banned <bans> times, muted <mutes> times and range banned <rangebans> times'
+    connection: '<gold>Their last connection was with <ip> on <lastSeen>'
+    geoip: 'Country: <country> City: <city>'
     ban:
-      permanent: '&6Currently banned for &4[reason]&6 by [actor] at [created]'
-      temporary: '&6Currently banned for &4[reason]&6 by [actor] at [created] which expires in [expires]'
+      permanent: '<gold>Currently banned for <dark_red><reason><gold> by <actor> at <created>'
+      temporary: '<gold>Currently banned for <dark_red><reason><gold> by <actor> at <created> which expires in <expires>'
       dateTimeFormat: 'dd-MM-yyyy HH:mm:ss'
     ipban:
-      permanent: '&6Currently banned for &4[reason]&6 by [actor] at [created]'
-      temporary: '&6Currently banned for &4[reason]&6 by [actor] at [created] which expires in [expires]'
+      permanent: '<gold>Currently banned for <dark_red><reason><gold> by <actor> at <created>'
+      temporary: '<gold>Currently banned for <dark_red><reason><gold> by <actor> at <created> which expires in <expires>'
       dateTimeFormat: 'dd-MM-yyyy HH:mm:ss'
     iprangeban:
-      permanent: '&6[from] - [to] banned for &4[reason]&6 by [actor] at [created]'
-      temporary: '&6[from] - [to] banned for &4[reason]&6 by [actor] at [created] which expires in [expires]'
+      permanent: '<gold><from> - <to> banned for <dark_red><reason><gold> by <actor> at <created>'
+      temporary: '<gold><from> - <to> banned for <dark_red><reason><gold> by <actor> at <created> which expires in <expires>'
       dateTimeFormat: 'dd-MM-yyyy HH:mm:ss'
     ipmute:
-      permanent: '&6Currently muted for &4[reason]&6 by [actor] at [created]'
-      temporary: '&6Currently muted for &4[reason]&6 by [actor] at [created] which expires in [expires]'
+      permanent: '<gold>Currently muted for <dark_red><reason><gold> by <actor> at <created>'
+      temporary: '<gold>Currently muted for <dark_red><reason><gold> by <actor> at <created> which expires in <expires>'
       dateTimeFormat: 'dd-MM-yyyy HH:mm:ss'
     mute:
-      permanent: '&6Currently muted for &4[reason]&6 by [actor] at [created]'
-      temporary: '&6Currently muted for &4[reason]&6 by [actor] at [created] which expires in [expires]'
+      permanent: '<gold>Currently muted for <dark_red><reason><gold> by <actor> at <created>'
+      temporary: '<gold>Currently muted for <dark_red><reason><gold> by <actor> at <created> which expires in <expires>'
+      temporaryOnline: '<gold>Currently muted for <dark_red><reason><gold> by <actor> at <created> which expires in <expires> (online time)'
+      temporaryOnlinePaused: '<gold>Currently muted for <dark_red><reason><gold> by <actor> at <created> with <remaining> remaining (online time, paused)'
       dateTimeFormat: 'dd-MM-yyyy HH:mm:ss'
     website:
-      player: 'https://yourdomain.com/player/[uuid]'
-      ip: 'http://yourdomain.com/index.php?action=viewip&ip=[ip]&server=0'
+      player: 'https://yourdomain.com/player/<uuid>'
+      ip: 'http://yourdomain.com/index.php?action=viewip&ip=<ip>&server=0'
     history:
-      row: '&7#[id] &a[&f[type]&a] &6[actor]&f [meta] [reason] - &e[created]'
+      row: '<gray>#<id> <green>[<white><type><green>] <gold><actor><white> <meta> <reason> - <yellow><created>'
       dateTimeFormat: 'dd-MM-yyyy HH:mm:ss'
-      noResults: '&cNo results found'
+      noResults: '<red>No results found'
     ips:
-      row: '&e[ip] - &6[join] - [leave]'
+      row: '<yellow><ip> - <gold><join> - <leave>'
       dateTimeFormat: 'dd-MM-yyyy HH:mm:ss'
 
   kick:
     player:
-      noReason: '&6You have been kicked'
-      reason: '&6You have been kicked for &4[reason]'
+      noReason: '<gold>You have been kicked'
+      reason: '<gold>You have been kicked for <dark_red><reason>'
     notify:
-      noReason: '&6[player] has been kicked by [actor]'
-      reason: '&6[player] has been kicked by [actor] for &4[reason]'
+      noReason: '<gold><player> has been kicked by <actor>'
+      reason: '<gold><player> has been kicked by <actor> for <dark_red><reason>'
 
   kickall:
     player:
-      noReason: '&6You have been kicked'
-      reason: '&6You have been kicked for &4[reason]'
+      noReason: '<gold>You have been kicked'
+      reason: '<gold>You have been kicked for <dark_red><reason>'
     notify:
-      noReason: 'All players have been kicked by [actor]'
-      reason: 'All players have been kicked by [actor] for &4[reason]'
+      noReason: 'All players have been kicked by <actor>'
+      reason: 'All players have been kicked by <actor> for <dark_red><reason>'
 
-  # Modified for WebEnhancer E2E testing - includes [pin] placeholder
   ban:
     player:
-      disallowed: '&6You have been banned from this server for &4[reason]&6. Your appeal pin is [pin]'
-      kick: '&6You have been banned permanently for &4[reason]&6. Your appeal pin is [pin]'
+      disallowed: '<red><bold>You are banned from this server</bold></red>\n \n<gray>Reason: <white><reason>\n<gray>Banned by: <white><actor>\n<gray>Date: <white><created>\n \n<gold>Appeal at <appealUrl>'
+      kick: '<red><bold>You have been banned</bold></red>\n \n<gray>Reason: <white><reason>\n<gray>Banned by: <white><actor>'
       dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
-    notify: '&6[player] has been permanently banned by [actor] for &4[reason]'
+    notify: '<gold><player> has been permanently banned by <actor> for <dark_red><reason> <click:run_command:''/bminfo <player>''><hover:show_text:''<gray>View player info''><dark_aqua>[Info]</dark_aqua></hover></click> <click:run_command:''/unban <player>''><hover:show_text:''<gray>Unban player''><dark_aqua>[Unban]</dark_aqua></hover></click>'
     error:
-      exists: '&c[player] is already banned'
-      cooldown: '&cThis player was banned too recently, try again later'
+      exists: '<red><player> is already banned'
+      cooldown: '<red>This player was banned too recently, try again later'
 
   banall:
-    notify: '&6[player] will be permanently banned by [actor] for &4[reason]'
+    notify: '<gold><player> will be permanently banned by <actor> for <dark_red><reason>'
 
   tempban:
     player:
-      disallowed: '&6You have been temporarily banned from this server for &4[reason] \n&6It expires in [expires]. Your appeal pin is [pin]'
-      kick: '&6You have been temporarily banned for &4[reason]&6. Your appeal pin is [pin]'
+      disallowed: '<red><bold>You are temporarily banned from this server</bold></red>\n \n<gray>Reason: <white><reason>\n<gray>Banned by: <white><actor>\n<gray>Expires: <white><expires>\n<gray>Date: <white><created>\n \n<gold>Appeal at <appealUrl>'
+      kick: '<red><bold>You have been temporarily banned</bold></red>\n \n<gray>Reason: <white><reason>\n<gray>Banned by: <white><actor>\n<gray>Expires: <white><expires>'
       dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
-    notify: '&6[player] has been temporarily banned for [expires] by [actor] for &4[reason]'
+    notify: '<gold><player> has been temporarily banned for <expires> by <actor> for <dark_red><reason> <click:run_command:''/bminfo <player>''><hover:show_text:''<gray>View player info''><dark_aqua>[Info]</dark_aqua></hover></click> <click:run_command:''/unban <player>''><hover:show_text:''<gray>Unban player''><dark_aqua>[Unban]</dark_aqua></hover></click>'
 
   tempbanall:
-    notify: '&6[player] will be temporarily banned for [expires] by [actor] for &4[reason]'
+    notify: '<gold><player> will be temporarily banned for <expires> by <actor> for <dark_red><reason>'
 
   unban:
-    notify: '&6[player] has been unbanned by [actor]'
+    notify: '<gold><player> has been unbanned by <actor>'
     error:
-      noExists: '&c[player] is not banned'
-      notOwn: '&c[player] was not banned by you, unable to unban'
+      noExists: '<red><player> is not banned'
+      notOwn: '<red><player> was not banned by you, unable to unban'
 
   unbanall:
-    notify: '&6[player] will be unbanned by [actor]'
+    notify: '<gold><player> will be unbanned by <actor>'
 
   mute:
     player:
-      blocked: '&cYou may not use the [command] command whilst muted!'
-      disallowed: '&6You have been permanently muted for &4[reason] &6by [actor]'
-      broadcast: '&4[Muted] [player]&7 [message]'
-    notify: '&6[player] has been permanently muted by [actor] for &4[reason]'
+      blocked: '<red>You may not use the <command> command whilst muted!'
+      disallowed: '<gold>You have been permanently muted for <dark_red><reason> <gold>by <actor>'
+      broadcast: '<dark_red>[Muted] <player><gray> <message>'
+    notify: '<gold><player> has been permanently muted by <actor> for <dark_red><reason> <click:run_command:''/bminfo <player>''><hover:show_text:''<gray>View player info''><dark_aqua>[Info]</dark_aqua></hover></click> <click:run_command:''/unmute <player>''><hover:show_text:''<gray>Unmute player''><dark_aqua>[Unmute]</dark_aqua></hover></click>'
     error:
-      exists: '&c[player] is already muted'
-      cooldown: '&cThis player was muted too recently, try again later'
+      exists: '<red><player> is already muted'
+      cooldown: '<red>This player was muted too recently, try again later'
 
   muteip:
     ip:
-      disallowed: '&6You have been permanently muted for &4[reason] &6by [actor]'
-      broadcast: '&4[Muted] [player]&7 [message]'
-    notify: '&6[ip] ([players]) have been permanently muted by [actor] for &4[reason]'
+      disallowed: '<gold>You have been permanently muted for <dark_red><reason> <gold>by <actor>'
+      broadcast: '<dark_red>[Muted] <player><gray> <message>'
+    notify: '<gold><ip> (<players>) have been permanently muted by <actor> for <dark_red><reason>'
     error:
-      exists: '&c[ip] is already muted'
+      exists: '<red><ip> is already muted'
 
   muteall:
-    notify: '&6[player] will be permanently muted by [actor] for &4[reason]'
+    notify: '<gold><player> will be permanently muted by <actor> for <dark_red><reason>'
 
   tempmute:
     player:
-      disallowed: '&6You have been temporarily muted for &4[reason] &6by [actor] which expires in [expires]'
-    notify: '&6[player] has been temporarily muted for [expires] by [actor] for &4[reason]'
+      disallowed: '<gold>You have been temporarily muted for <dark_red><reason> <gold>by <actor> which expires in <expires>'
+      disallowedOnline: '<gold>You have been temporarily muted for <dark_red><reason> <gold>by <actor> which expires in <expires> (online time)'
+    notify: '<gold><player> has been temporarily muted for <expires> by <actor> for <dark_red><reason> <click:run_command:''/bminfo <player>''><hover:show_text:''<gray>View player info''><dark_aqua>[Info]</dark_aqua></hover></click> <click:run_command:''/unmute <player>''><hover:show_text:''<gray>Unmute player''><dark_aqua>[Unmute]</dark_aqua></hover></click>'
+    notifyOnline: '<gold><player> has been temporarily muted for <expires> (online time) by <actor> for <dark_red><reason>'
     error:
-      exists: '&c[player] is already muted'
+      exists: '<red><player> is already muted'
 
   tempmuteip:
     ip:
-      disallowed: '&6You have been temporarily muted for &4[reason] &6by [actor] which expires in [expires]'
-    notify: '&6[ip] ([players]) have been temporarily muted for [expires] by [actor] for &4[reason]'
+      disallowed: '<gold>You have been temporarily muted for <dark_red><reason> <gold>by <actor> which expires in <expires>'
+    notify: '<gold><ip> (<players>) have been temporarily muted for <expires> by <actor> for <dark_red><reason>'
     error:
-      exists: '&c[ip] is already muted'
+      exists: '<red><ip> is already muted'
 
   tempmuteall:
-    notify: '&6[player] will be temporarily muted for [expires] by [actor] for &4[reason]'
+    notify: '<gold><player> will be temporarily muted for <expires> by <actor> for <dark_red><reason>'
 
   unmute:
-    notify: '&6[player] has been unmuted by [actor]'
+    notify: '<gold><player> has been unmuted by <actor>'
+    player: '<gold>You have been unmuted by <actor>'
     error:
-      noExists: '&c[player] is not muted'
-      notOwn: '&c[player] was not muted by you, unable to unmute'
-
-  unmuteall:
-    notify: '&6[player] will be unmuted by [actor]'
+      noExists: '<red><player> is not muted'
+      notOwn: '<red><player> was not muted by you, unable to unmute'
 
   unmuteip:
-    notify: '&6[ip] ([players]) have been unmuted by [actor]'
+    notify: '<gold><ip> has been unmuted by <actor>'
     error:
-      noExists: '&c[ip] is not muted'
-      notOwn: '&c[ip] was not muted by you, unable to unmute'
+      noExists: '<red><ip> is not muted'
+      notOwn: '<red><ip> was not muted by you, unable to unmute'
 
-  warn:
-    player:
-      warned: '&cYou have been warned for &4[reason] &cby [actor]'
-    notify: '&6[player] has been warned by [actor] for &4[reason]'
-    error:
-      exists: '&c[player] has already been warned for that reason'
-      cooldown: '&cThis player was warned too recently, try again later'
+  unmuteall:
+    notify: '<gold><player> will be unmuted by <actor>'
 
-  tempwarn:
-    player:
-      warned: '&cYou have been warned for &4[reason] &cby [actor] which expires in [expires]'
-    notify: '&6[player] has been warned for [expires] by [actor] for &4[reason]'
+  banname:
+    name:
+      disallowed: '<gold>You have been banned from this server for <dark_red><reason>'
+      kick: '<gold>You have been banned permanently for <dark_red><reason>'
+      dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
+    notify: '<gold>Name <name> has been permanently banned by <actor> for <dark_red><reason>'
     error:
-      exists: '&c[player] has already been warned for that reason'
+      exists: '<red>Name <name> is already banned'
 
-  warnall:
-    notify: '&6[player] will be warned by [actor] for &4[reason]'
+  tempbanname:
+    name:
+      disallowed: '<gold>You have been banned from this server for <dark_red><reason> \n<gold>It expires in <expires>'
+      kick: '<gold>You have been temporarily banned for <dark_red><reason>'
+      dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
+    notify: '<gold>Name <name> has been temporarily banned for <expires> by <actor> for <dark_red><reason>'
 
-  addnote:
-    notify: '&6Note added for [player] by [actor]'
+  unbanname:
+    notify: '<gold>Name <name> has been unbanned by <actor>'
     error:
-      cooldown: '&cA note was added for this player too recently, try again later'
+      noExists: '<red>Name <name> is not banned'
 
-  notes:
+  banip:
+    ip:
+      disallowed: '<gold>You have been banned from this server for <dark_red><reason>'
+      kick: '<gold>You have been banned permanently for <dark_red><reason>'
+      dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
+    notify: '<gold><ip> (<players>) has been permanently banned by <actor> for <dark_red><reason>'
     error:
-      noResults: '&cNo notes for [player]'
-      noResults.uuid: '&cNo notes for player'
-    header: '&6Notes for [player]'
-    row: '&6[created] &f[message]'
-    dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
+      exists: '<red><ip> is already banned'
+      cooldown: '<red>This ip was banned too recently, try again later'
 
-  bmactivity:
+  baniprange:
     error:
-      noResults: '&cNo activity found'
-    header: '&6Activity for [player]'
-    row: '&7#[id] &a[&f[type]&a] &6[player]&f [meta] [reason] - &e[created]'
-    dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
+      invalid: '<red>Invalid range, please use cidr notation 192.168.0.1/16 or wildcard 192.168.*.*'
+      minMax: '<red>Range must be lowest to highest'
+      exists: '<red>A ban containing those ranges already exists'
+    ip:
+      disallowed: '<gold>You have been banned from this server for <dark_red><reason>'
+      kick: '<gold>You have been banned permanently for <dark_red><reason>'
+      dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
+    notify: '<gold><from> - <to> have been banned by <actor>'
 
-  banip:
+  tempbaniprange:
+    notify: '<gold><from> - <to> has been temporarily banned for <expires> by <actor>'
     ip:
-      disallowed: '&6You have been banned from this server for &4[reason]&6. Your appeal pin is [pin]'
-      kick: '&6You have been banned permanently for &4[reason]'
-    notify: '&6[ip] has been permanently banned by [actor] for &4[reason]'
-    error:
-      exists: '&c[ip] is already banned'
-      cooldown: '&cThis ip was banned too recently, try again later'
+      disallowed: '<gold>You have been banned from this server for <dark_red><reason> \n<gold>It expires in <expires>'
+      kick: '<gold>You have been temporarily banned for <expires> by <actor> for <dark_red><reason>'
+      dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
+
+  unbaniprange:
+    notify: '<gold><from> - <to> has been unbanned by <actor>'
+
+  banipall:
+    notify: '<gold><ip> will be permanently banned by <actor> for <dark_red><reason>'
 
   tempbanip:
     ip:
-      disallowed: '&6You have been temporarily banned from this server for &4[reason] \n&6It expires in [expires]. Your appeal pin is [pin]'
-      kick: '&6You have been temporarily banned for &4[reason]'
-    notify: '&6[ip] has been temporarily banned for [expires] by [actor] for &4[reason]'
+      disallowed: '<gold>You have been banned from this server for <dark_red><reason> \n<gold>It expires in <expires>'
+      kick: '<gold>You have been temporarily banned for <dark_red><reason>'
+      dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
+    notify: '<gold><ip> (<players>) has been temporarily banned for <expires> by <actor> for <dark_red><reason>'
+
+  tempbanipall:
+    notify: '<gold><ip> will be temporarily banned for <expires> by <actor> for <dark_red><reason>'
 
   unbanip:
-    notify: '&6[ip] has been unbanned by [actor]'
+    notify: '<gold><ip> has been unbanned by <actor>'
     error:
-      noExists: '&c[ip] is not banned'
-      notOwn: '&c[ip] was not banned by you, unable to unban'
+      noExists: '<red><ip> is not banned'
+      notOwn: '<red><ip> was not banned by you, unable to unban'
 
-  baniprange:
-    notify: '&6[from] - [to] has been permanently banned by [actor] for &4[reason]'
+  unbanipall:
+    notify: '<gold><ip> will be unbanned by <actor>'
+
+  warn:
+    player:
+      warned: '<gold>You have been warned by <actor> for <dark_red><reason>'
+      disallowed:
+        header: '<red>You may not speak until you have accepted your most recent warning. Please type the following:'
+        reason: '<gold><reason>'
+        removed: '<green>Thank you for your understanding, you may now speak again'
+    notify: '<gold><player> has been warned by <actor> for <dark_red><reason> <click:run_command:''/bminfo <player>''><hover:show_text:''<gray>View player info''><dark_aqua>[Info]</dark_aqua></hover></click>'
     error:
-      exists: '&c[from] - [to] is already banned'
-      cooldown: '&cThis ip range was banned too recently, try again later'
+      cooldown: '<red>This player was warned too recently, try again later'
 
-  tempbaniprange:
-    notify: '&6[from] - [to] has been temporarily banned for [expires] by [actor] for &4[reason]'
+  tempwarn:
+    player:
+      warned: '<gold>You have been warned for <expires> by <actor> for <dark_red><reason>'
+    notify: '<gold><player> has been warned for <expires> by <actor> for <dark_red><reason> <click:run_command:''/bminfo <player>''><hover:show_text:''<gray>View player info''><dark_aqua>[Info]</dark_aqua></hover></click>'
 
-  unbaniprange:
-    notify: '&6[from] - [to] has been unbanned by [actor]'
+  dwarn:
+    player:
+      notify: '<gold>Your most recent warning has been deleted by <dark_red><actor>'
+    notify: '<red>The most recent warning for <player> has been deleted'
     error:
-      noExists: '&c[from] - [to] is not banned'
-      notOwn: '&c[from] - [to] was not banned by you, unable to unban'
+      noWarnings: '<red><player> has no warnings to delete'
 
-  banname:
-    disallowed: '&6You may not use the name [name] on this server'
-    notify: '&6[name] has been permanently banned by [actor] for &4[reason]'
+  bmclear:
+    notify: '<red><player> has had their <type> cleared'
+    error:
+      invalid: '<red>Invalid type, please choose between banrecords, muterecords, kicks, notes or warnings'
+
+  bmutils:
+    missingplayers:
+      notify: '<red><amount> missing players added'
+      noneFound: '<green>0 missing players found'
+      found: '<red><amount> missing player data found. Fixing...'
+      error:
+        failedLookup: '<red>Failed to lookup player <uuid>, check server logs'
+      complete: '<green><amount> players resolved, please restart your server for failed punishments to take affect'
+    duplicates:
+      lookup:
+        notFound: '<green>No duplicate player names found'
+      error:
+        invalidName: '<red>Invalid name, must be 16 characters or less and contain only letters, numbers and an underscore'
+        nameExists: '<red>A player with that name already exists'
+      success: '<green>Player name set to <player> successfully'
+
+  bmrollback:
+    notify: '<red><player> has had their <type> actions undone'
     error:
-      exists: '&c[name] is already banned'
+      invalid: '<red>Invalid type <type>, please choose between [types]'
 
-  tempbanname:
-    notify: '&6[name] has been temporarily banned for [expires] by [actor] for &4[reason]'
+  sync:
+    player:
+      started: '<green>Starting force <type> synchronisation'
+      finished: '<green>Forced <type> synchronisation complete'
 
-  unbanname:
-    notify: '&6[name] has been unbanned by [actor]'
-    error:
-      noExists: '&c[name] is not banned'
-      notOwn: '&c[name] was not banned by you, unable to unban'
+  update:
+    notify: '<gold>[BanManager] <green>An update is available'
 
-  report:
+  notes:
+    header: '<gold><player> has the following notes:'
+    joinAmount: '<click:run_command:"/notes <player>"><gold><player> has <yellow><amount> <gold>notes, click to view them</click>'
+    note: '<gold>[<player>] <yellow><message> - <yellow><created>'
+    playerNote: '<green>[<player>] <gold>[<actor>] <yellow><message> - <yellow><created>'
+    dateTimeFormat: 'dd-MM-yyyy'
+    notify: '<player> has a new note attached by <actor>: <message>'
     error:
-      notOnline: '&cPlayer must be online to report'
-      cooldown: '&cToo many reports, please wait a while'
-    notify: '&6[player] has been reported by [actor] for &4[reason]'
-    success: '&a[player] has been reported'
-    created: '&6[actor] has reported [player] for &4[reason]'
+      noNotes: '<red><player> has no notes'
+      noOnlineNotes: '<red>No online players have notes'
 
-  reports:
+  report:
+    notify: '<gold><player> has been reported by <actor> for <dark_red><reason>'
     error:
-      noResults: '&cNo reports for [player]'
-    header: '&6Reports for [player]'
+      cooldown: '<red>This player was reported too recently, try again later'
+    assign:
+      player: '<green>Report <id> assigned to <player>'
+      notify: '<green>You have been assigned report <id> by <actor>'
+    unassign:
+      player: '<green>Report <id> unassigned'
+    close:
+      notify:
+        closed: '<green>Report <id> closed by <actor>'
+        command: '<green>Report <id> closed by <actor> with <command>'
+        comment: '<green>Report <id> closed by <actor> with <comment>'
+      dispatch: 'Executing command <command>'
     list:
-      row: '&e[id] [player] &6[reason] [created] &e[actor]'
+      noResults: '<red>No reports found'
+      error:
+        invalidState: '<red>Report state <state> not found'
+      row:
+        dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
+        header: '<yellow>-- Reports (<count>) -- Page (<page>/<maxPage>)'
+        all: '<click:run_command:"/reports info <id>"><hover:show_text:"<gray>Click to view details"><gray>#<id> <yellow>[<state>] <gold>- <created> - <player></hover></click>'
+    tp:
+      error:
+        notFound: '<red>Report not found'
+        worldNotFound: '<red>World <world> could not be found'
+        invalidId: '<red><id> is not a valid report id'
       dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
+      notify:
+        report: '<gray>#<id> <gold><actor> reported <player> for <dark_red><reason><gold> at <created>'
+        location: '<world> - <x>, <y>, <z>'
+    info:
+      error:
+        notFound: '<red>Report not found'
+        invalidId: '<red><id> is not a valid report id'
+      dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
+      notify:
+        report: '<gray>#<id> <gold><actor> reported <player> for <dark_red><reason><gold> at <created>'
+        location: '<world> - <x>, <y>, <z>'
 
-  deleterecord:
-    error:
-      noExists: '&c[id] does not exist'
-    deleted: '&a[id] has been deleted'
+  addnoteall:
+    notify: '<red><player> will have a new attached by <actor>: <message>'
 
-  clear:
-    header:
-      all: '&6Clearing [type] for [player]'
-      single: '&6Clearing [type]'
-    error:
-      noResults: '&cNothing found to delete'
-    notifyDelete: '&6Deleted [sum] [type] for [player]'
+  banlist:
+    header: '<gold>There are <bans> <type> bans:'
 
-  sync:
-    error:
-      inProgress: '&cA sync is already in progress, please wait'
-    started: '&aSync started'
-    finished: '&aSync finished'
+  bmactivity:
+    row:
+      all: '<green>[<white><type><green>] <gold><player><white> - <gold><actor><white> - <yellow><created>'
+      player: '<green>[<white><type><green>] <gold><player><white> - <yellow><created>'
+      dateTimeFormat: 'dd-MM-yyyy HH:mm:ss'
+    noResults: '<red>No results found'
 
-  external:
+  bmdelete:
+    notify: '<green><rows> rows deleted'
     error:
-      notAllowed: '&cExternally synced servers cannot perform this action'
+      invalid: '<red>Invalid type, please choose between banrecords, muterecords, kicks, notes or warnings'
+      invalidId: '<red><id> is not a valid number'
 
-  rollback:
-    error:
-      inProgress: '&cA rollback is already in progress, please wait'
-      noResults: '&cNo results found to rollback'
-    started: '&aRollback started'
-    finished: '&aRollback finished, [sum] rows affected'
+  denyalts:
+    player:
+      disallowed: '<red>The IP address you are joining from is linked to a banned player'
 
-  dwarn:
-    notOwn: '&c[id] was not created by you, unable to delete'
-    noExists: '&c[id] does not exist'
-    deleted: '&aWarning deleted'
+  reasons:
+    row: '<hashtag> = <reason>'
 
-  findAlts:
-    header: 'Possible alts found:'
-    noResults: 'No possible alts found'
+  confirmation:
+    prompt: '<gold>Are you sure you want to <action>? <click:run_command:''/bm confirm''><hover:show_text:''<gray>Click to confirm''><green>[Confirm]</green></hover></click> <click:run_command:''/bm cancel''><hover:show_text:''<gray>Click to cancel''><red>[Cancel]</red></hover></click>'
+    confirmed: '<green>Action confirmed.'
+    cancelled: '<red>Action cancelled.'
+    expired: '<red>No pending action found. It may have expired.'
 
-  update:
-    notify: 'A new version of BanManager is now available'
+  dashboard:
+    header: '<dark_gray><strikethrough>                    </strikethrough><reset> <gold><bold>Staff Dashboard</bold></gold> <dark_gray><strikethrough>                    </strikethrough>'
+    activeBans: '<gray>Active Bans: <white><count>'
+    activeMutes: '<gray>Active Mutes: <white><count>'
+    openReports: '<gray>Open Reports: <white><count> <click:run_command:''/reports 1''><hover:show_text:''<gray>View reports''><dark_aqua>[View]</dark_aqua></hover></click>'
+    recentActivity: '<gray>Recent Activity (24h): <white><count>'
+    footer: '<dark_gray><strikethrough>                                                        </strikethrough>'
+
+  report:
+    actions:
+      assign: '<click:run_command:''/report assign <id>''><hover:show_text:''<gray>Assign to yourself''><dark_aqua>[Assign]</dark_aqua></hover></click>'
+      close: '<click:run_command:''/report close <id>''><hover:show_text:''<gray>Close this report''><green>[Close]</green></hover></click>'
+      tp: '<click:run_command:''/report tp <id>''><hover:show_text:''<gray>Teleport to location''><aqua>[TP]</aqua></hover></click>'
+    feedback:
+      assigned: '<gold>Your report #<id> has been assigned to <actor>'
+      closed: '<gold>Your report #<id> has been closed by <actor>'
diff --git a/e2e/platforms/bungee/configs/banmanager-webenhancer/messages.yml b/e2e/platforms/bungee/configs/banmanager-webenhancer/messages.yml
index 59fdb26..4ea98a0 100644
--- a/e2e/platforms/bungee/configs/banmanager-webenhancer/messages.yml
+++ b/e2e/platforms/bungee/configs/banmanager-webenhancer/messages.yml
@@ -1,4 +1,5 @@
 messages:
   pin:
-    notify: '&6Your pin expires in [expires]'
-    pin: '[pin]'
+    notify: '<gold>Your pin expires in <expires>'
+    pin: '<pin>'
+    rateLimited: '<red>Please wait <seconds> seconds before generating a new pin'
diff --git a/e2e/platforms/bungee/configs/banmanager/messages.yml b/e2e/platforms/bungee/configs/banmanager/messages.yml
index 5bacf5c..ec9a8a6 100644
--- a/e2e/platforms/bungee/configs/banmanager/messages.yml
+++ b/e2e/platforms/bungee/configs/banmanager/messages.yml
@@ -1,413 +1,477 @@
-# Variables
-# [reason] = Ban/Mute reason
-# [player] = The name of the player
-# [ip] = The banned ip
-# [actor] = Who banned/muted
-# [expires] = How long until the ban/mute ends
+# Message templates use MiniMessage formatting: https://docs.advntr.dev/minimessage/format.html
+# Placeholders use angle brackets, e.g. <reason>, <player>, <ip>, <actor>, <expires>
+
+tokens:
+  appealUrl: 'https://yourdomain.com/appeal'
+  serverName: 'My Server'
+  discordUrl: 'https://discord.gg/example'
+  rulesUrl: 'https://yourdomain.com/rules'
 
 messages:
-  duplicateIP: '&cWarning: [player] has the same IP as the following banned players:\n&6[players]'
-  duplicateIPAlts: '&cWarning: [player] has the same IP as the following players:\n&6[players]'
-  configReloaded: '&aConfiguration reloaded successfully!'
+  duplicateIP: '<red>Warning: <player> has the same IP as the following banned players:\n<gold><players>'
+  duplicateIPAlts: '<red>Warning: <player> has the same IP as the following players:\n<gold><players>'
+  configReloaded: '<green>Configuration reloaded successfully!'
   deniedNotify:
-    player: '&cWarning: [player] attempted to join the server but was denied due to
-      &4[reason]'
-    ip: '&cWarning: [ip] attempted to join the server but was denied due to &4[reason]'
-  deniedMaxIp: '&cToo many players with your ip address online'
-  deniedMultiaccounts: '&cToo many players with your ip address logged in recently'
-  deniedCountry: '&cYou may not connect from your region'
+    player: '<red>Warning: <player> attempted to join the server but was denied due to <dark_red><reason>'
+    ip: '<red>Warning: <ip> attempted to join the server but was denied due to <dark_red><reason>'
+  deniedMaxIp: '<red>Too many players with your ip address online'
+  deniedMultiaccounts: '<red>Too many players with your ip address logged in recently'
+  deniedCountry: '<red>You may not connect from your region'
+
   time:
-    now: now
-    year: year
-    years: years
-    month: month
-    months: months
-    week: week
-    weeks: weeks
-    day: day
-    days: days
-    hour: hour
-    hours: hours
-    minute: minute
-    minutes: minutes
-    second: second
-    seconds: seconds
-    never: never
+    now: 'now'
+    year: 'year'
+    years: 'years'
+    month: 'month'
+    months: 'months'
+    week: 'week'
+    weeks: 'weeks'
+    day: 'day'
+    days: 'days'
+    hour: 'hour'
+    hours: 'hours'
+    minute: 'minute'
+    minutes: 'minutes'
+    second: 'second'
+    seconds: 'seconds'
+    never: 'never'
     error:
-      invalid: '&cYour time length is invalid'
-      limit: '&cYou cannot perform this action for that length of time'
-  none: none
+      invalid: '<red>Your time length is invalid'
+      limit: '<red>You cannot perform this action for that length of time'
+
+  none: 'none'
+  # General command text
   sender:
     error:
-      notFound: '&c[player] not found, are you sure they exist?'
-      offline: '&c[player] is offline'
-      noSelf: '&cYou cannot perform that action on yourself!'
-      exception: '&cAn error occured whilst attempting to perform this command. Please
-        check the console for further details.'
-      invalidIp: '&cInvalid IP address, expecting w.x.y.z format'
-      offlinePermission: '&cYou are not allowed to perform this action on an offline
-        player'
-      exempt: '&c[player] is exempt from that action'
-      noPermission: '&cYou do not have permission to perform that action'
-      invalidReason: '&c[reason] is no valid reason.'
+      notFound: '<red><player> not found, are you sure they exist?'
+      offline: '<red><player> is offline'
+      noSelf: '<red>You cannot perform that action on yourself!'
+      exception: '<red>An error occured whilst attempting to perform this command. Please check the console for further details.'
+      invalidIp: '<red>Invalid IP address, expecting w.x.y.z format'
+      offlinePermission: '<red>You are not allowed to perform this action on an offline player'
+      ambiguousPlayer: '<red>Multiple players match "<player>". Please use their full name.'
+      exempt: '<red><player> is exempt from that action'
+      noPermission: '<red>You do not have permission to perform that action'
+      invalidReason: '<red><reason> is no valid reason.'
+  # Commands
   alts:
     header: 'Possible alts found:'
+    entry: '<click:run_command:"/bminfo <name>"><name></click>'
+    separator: '<gray>, '
+
+  names:
+    header: 'Known names for <player>:'
+    row: '<yellow><name> <gray>(first: <firstSeen>, last: <lastSeen>)'
+    interactive: '<hover:show_text:"<yellow><name> <gray>(first: <firstSeen>, last: <lastSeen>)"><click:run_command:"/bminfo <name>"><yellow><name></click></hover>'
+    separator: '<gray>, '
+    dateTimeFormat: 'dd-MM-yyyy'
+    none: '<gray>No name history found'
+
   export:
     error:
-      inProgress: '&cAn export is already in progress, please wait'
+      inProgress: '<red>An export is already in progress, please wait'
     player:
-      started: '&aPlayer ban export started'
-      finished: '&aPlayer ban export finished, file [file] created'
+      started: '<green>Player ban export started'
+      finished: '<green>Player ban export finished, file <file> created'
     ip:
-      started: '&aIP ban export started'
-      finished: '&aIP ban export finished, file [file] created'
+      started: '<green>IP ban export started'
+      finished: '<green>IP ban export finished, file <file> created'
+
   import:
     error:
-      inProgress: '&cAn import is already in progress, please wait'
+      inProgress: '<red>An import is already in progress, please wait'
     player:
-      started: '&aPlayer ban import started'
-      finished: '&aPlayer ban import finished'
+      started: '<green>Player ban import started'
+      finished: '<green>Player ban import finished'
     ip:
-      started: '&aIP ban import started'
-      finished: '&aIP ban import finished'
+      started: '<green>IP ban import started'
+      finished: '<green>IP ban import finished'
     advancedban:
-      started: '&aAdvancedBan import started'
-      finished: '&aAdvancedBan import finished'
+      started: '<green>AdvancedBan import started'
+      finished: '<green>AdvancedBan import finished'
     h2:
-      started: '&aH2 import started'
-      finished: '&aH2 import finished, please restart the server'
+      started: '<green>H2 import started'
+      finished: '<green>H2 import finished, please restart the server'
+    litebans:
+      started: '<green>LiteBans import started'
+      finished: '<green>LiteBans import finished'
+
   info:
     error:
-      invalidIndex: '&cInvalid player option used'
-      indexRequired: '&cMultiple players named [name] found, please select a player
-        by providing an index between 1 and [size], e.g. /bminfo [name] 1'
-      index: '&7#[index] - &6[name] - &4[uuid]'
+      invalidIndex: '<red>Invalid player option used'
+      indexRequired: '<red>Multiple players named <name> found, please select a player by providing an index between 1 and <size>, e.g. /bminfo <name> 1'
+      index: '<gray>#<index> - <gold><name> - <dark_red><uuid>'
     stats:
-      player: '&6[player] has been banned [bans] times, muted [mutes] times, kicked
-        [kicks] times and warned [warns] times ([warnPoints] Points), has [notes]
-        notes and been reported [reports] times'
-      ip: '&6This ip has been banned [bans] times, muted [mutes] times and range banned
-        [rangebans] times'
-    connection: '&6Their last connection was with [ip] on [lastSeen]'
-    geoip: 'Country: [country] City: [city]'
+      player: '<gold><player> has been banned <bans> times, muted <mutes> times, kicked <kicks> times and warned <warns>
+      times (<warnPoints> Points), has <notes> notes and been reported <reports> times'
+      ip: '<gold>This ip has been banned <bans> times, muted <mutes> times and range banned <rangebans> times'
+    connection: '<gold>Their last connection was with <ip> on <lastSeen>'
+    geoip: 'Country: <country> City: <city>'
     ban:
-      permanent: '&6Currently banned for &4[reason]&6 by [actor] at [created]'
-      temporary: '&6Currently banned for &4[reason]&6 by [actor] at [created] which
-        expires in [expires]'
-      dateTimeFormat: dd-MM-yyyy HH:mm:ss
+      permanent: '<gold>Currently banned for <dark_red><reason><gold> by <actor> at <created>'
+      temporary: '<gold>Currently banned for <dark_red><reason><gold> by <actor> at <created> which expires in <expires>'
+      dateTimeFormat: 'dd-MM-yyyy HH:mm:ss'
     ipban:
-      permanent: '&6Currently banned for &4[reason]&6 by [actor] at [created]'
-      temporary: '&6Currently banned for &4[reason]&6 by [actor] at [created] which
-        expires in [expires]'
-      dateTimeFormat: dd-MM-yyyy HH:mm:ss
+      permanent: '<gold>Currently banned for <dark_red><reason><gold> by <actor> at <created>'
+      temporary: '<gold>Currently banned for <dark_red><reason><gold> by <actor> at <created> which expires in <expires>'
+      dateTimeFormat: 'dd-MM-yyyy HH:mm:ss'
     iprangeban:
-      permanent: '&6[from] - [to] banned for &4[reason]&6 by [actor] at [created]'
-      temporary: '&6[from] - [to] banned for &4[reason]&6 by [actor] at [created]
-        which expires in [expires]'
-      dateTimeFormat: dd-MM-yyyy HH:mm:ss
+      permanent: '<gold><from> - <to> banned for <dark_red><reason><gold> by <actor> at <created>'
+      temporary: '<gold><from> - <to> banned for <dark_red><reason><gold> by <actor> at <created> which expires in <expires>'
+      dateTimeFormat: 'dd-MM-yyyy HH:mm:ss'
     ipmute:
-      permanent: '&6Currently muted for &4[reason]&6 by [actor] at [created]'
-      temporary: '&6Currently muted for &4[reason]&6 by [actor] at [created] which
-        expires in [expires]'
-      dateTimeFormat: dd-MM-yyyy HH:mm:ss
+      permanent: '<gold>Currently muted for <dark_red><reason><gold> by <actor> at <created>'
+      temporary: '<gold>Currently muted for <dark_red><reason><gold> by <actor> at <created> which expires in <expires>'
+      dateTimeFormat: 'dd-MM-yyyy HH:mm:ss'
     mute:
-      permanent: '&6Currently muted for &4[reason]&6 by [actor] at [created]'
-      temporary: '&6Currently muted for &4[reason]&6 by [actor] at [created] which
-        expires in [expires]'
-      dateTimeFormat: dd-MM-yyyy HH:mm:ss
+      permanent: '<gold>Currently muted for <dark_red><reason><gold> by <actor> at <created>'
+      temporary: '<gold>Currently muted for <dark_red><reason><gold> by <actor> at <created> which expires in <expires>'
+      temporaryOnline: '<gold>Currently muted for <dark_red><reason><gold> by <actor> at <created> which expires in <expires> (online time)'
+      temporaryOnlinePaused: '<gold>Currently muted for <dark_red><reason><gold> by <actor> at <created> with <remaining> remaining (online time, paused)'
+      dateTimeFormat: 'dd-MM-yyyy HH:mm:ss'
     website:
-      player: https://yourdomain.com/player/[uuid]
-      ip: http://yourdomain.com/index.php?action=viewip&ip=[ip]&server=0
+      player: 'https://yourdomain.com/player/<uuid>'
+      ip: 'http://yourdomain.com/index.php?action=viewip&ip=<ip>&server=0'
     history:
-      row: '&7#[id] &a[&f[type]&a] &6[actor]&f [meta] [reason] - &e[created]'
-      dateTimeFormat: dd-MM-yyyy HH:mm:ss
-      noResults: '&cNo results found'
+      row: '<gray>#<id> <green>[<white><type><green>] <gold><actor><white> <meta> <reason> - <yellow><created>'
+      dateTimeFormat: 'dd-MM-yyyy HH:mm:ss'
+      noResults: '<red>No results found'
     ips:
-      row: '&e[ip] - &6[join] - [leave]'
-      dateTimeFormat: dd-MM-yyyy HH:mm:ss
+      row: '<yellow><ip> - <gold><join> - <leave>'
+      dateTimeFormat: 'dd-MM-yyyy HH:mm:ss'
+
   kick:
     player:
-      noReason: '&6You have been kicked'
-      reason: '&6You have been kicked for &4[reason]'
+      noReason: '<gold>You have been kicked'
+      reason: '<gold>You have been kicked for <dark_red><reason>'
     notify:
-      noReason: '&6[player] has been kicked by [actor]'
-      reason: '&6[player] has been kicked by [actor] for &4[reason]'
+      noReason: '<gold><player> has been kicked by <actor>'
+      reason: '<gold><player> has been kicked by <actor> for <dark_red><reason>'
+
   kickall:
     player:
-      noReason: '&6You have been kicked'
-      reason: '&6You have been kicked for &4[reason]'
+      noReason: '<gold>You have been kicked'
+      reason: '<gold>You have been kicked for <dark_red><reason>'
     notify:
-      noReason: All players have been kicked by [actor]
-      reason: All players have been kicked by [actor] for &4[reason]
+      noReason: 'All players have been kicked by <actor>'
+      reason: 'All players have been kicked by <actor> for <dark_red><reason>'
+
   ban:
     player:
-      disallowed: '&6You have been banned from this server for &4[reason]&6. Your
-        appeal pin is [pin]'
-      kick: '&6You have been banned permanently for &4[reason]&6. Your appeal pin is [pin]'
-      dateTimeFormat: yyyy-MM-dd HH:mm:ss
-    notify: '&6[player] has been permanently banned by [actor] for &4[reason]'
+      disallowed: '<red><bold>You are banned from this server</bold></red>\n \n<gray>Reason: <white><reason>\n<gray>Banned by: <white><actor>\n<gray>Date: <white><created>\n \n<gold>Appeal at <appealUrl>'
+      kick: '<red><bold>You have been banned</bold></red>\n \n<gray>Reason: <white><reason>\n<gray>Banned by: <white><actor>'
+      dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
+    notify: '<gold><player> has been permanently banned by <actor> for <dark_red><reason> <click:run_command:''/bminfo <player>''><hover:show_text:''<gray>View player info''><dark_aqua>[Info]</dark_aqua></hover></click> <click:run_command:''/unban <player>''><hover:show_text:''<gray>Unban player''><dark_aqua>[Unban]</dark_aqua></hover></click>'
     error:
-      exists: '&c[player] is already banned'
-      cooldown: '&cThis player was banned too recently, try again later'
+      exists: '<red><player> is already banned'
+      cooldown: '<red>This player was banned too recently, try again later'
+
   banall:
-    notify: '&6[player] will be permanently banned by [actor] for &4[reason]'
+    notify: '<gold><player> will be permanently banned by <actor> for <dark_red><reason>'
+
   tempban:
     player:
-      disallowed: '&6You have been temporarily banned from this server for &4[reason]
-        \n&6It expires in [expires]. Your appeal pin is [pin]'
-      kick: '&6You have been temporarily banned for &4[reason]&6. Your appeal pin is [pin]'
-      dateTimeFormat: yyyy-MM-dd HH:mm:ss
-    notify: '&6[player] has been temporarily banned for [expires] by [actor] for &4[reason]'
+      disallowed: '<red><bold>You are temporarily banned from this server</bold></red>\n \n<gray>Reason: <white><reason>\n<gray>Banned by: <white><actor>\n<gray>Expires: <white><expires>\n<gray>Date: <white><created>\n \n<gold>Appeal at <appealUrl>'
+      kick: '<red><bold>You have been temporarily banned</bold></red>\n \n<gray>Reason: <white><reason>\n<gray>Banned by: <white><actor>\n<gray>Expires: <white><expires>'
+      dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
+    notify: '<gold><player> has been temporarily banned for <expires> by <actor> for <dark_red><reason> <click:run_command:''/bminfo <player>''><hover:show_text:''<gray>View player info''><dark_aqua>[Info]</dark_aqua></hover></click> <click:run_command:''/unban <player>''><hover:show_text:''<gray>Unban player''><dark_aqua>[Unban]</dark_aqua></hover></click>'
+
   tempbanall:
-    notify: '&6[player] will be temporarily banned for [expires] by [actor] for &4[reason]'
+    notify: '<gold><player> will be temporarily banned for <expires> by <actor> for <dark_red><reason>'
+
   unban:
-    notify: '&6[player] has been unbanned by [actor]'
+    notify: '<gold><player> has been unbanned by <actor>'
     error:
-      noExists: '&c[player] is not banned'
-      notOwn: '&c[player] was not banned by you, unable to unban'
+      noExists: '<red><player> is not banned'
+      notOwn: '<red><player> was not banned by you, unable to unban'
+
   unbanall:
-    notify: '&6[player] will be unbanned by [actor]'
+    notify: '<gold><player> will be unbanned by <actor>'
+
   mute:
     player:
-      blocked: '&cYou may not use the [command] command whilst muted!'
-      disallowed: '&6You have been permanently muted for &4[reason] &6by [actor]'
-      broadcast: '&4[Muted] [player]&7 [message]'
-    notify: '&6[player] has been permanently muted by [actor] for &4[reason]'
+      blocked: '<red>You may not use the <command> command whilst muted!'
+      disallowed: '<gold>You have been permanently muted for <dark_red><reason> <gold>by <actor>'
+      broadcast: '<dark_red>[Muted] <player><gray> <message>'
+    notify: '<gold><player> has been permanently muted by <actor> for <dark_red><reason> <click:run_command:''/bminfo <player>''><hover:show_text:''<gray>View player info''><dark_aqua>[Info]</dark_aqua></hover></click> <click:run_command:''/unmute <player>''><hover:show_text:''<gray>Unmute player''><dark_aqua>[Unmute]</dark_aqua></hover></click>'
     error:
-      exists: '&c[player] is already muted'
-      cooldown: '&cThis player was muted too recently, try again later'
+      exists: '<red><player> is already muted'
+      cooldown: '<red>This player was muted too recently, try again later'
+
   muteip:
     ip:
-      disallowed: '&6You have been permanently muted for &4[reason] &6by [actor]'
-      broadcast: '&4[Muted] [player]&7 [message]'
-    notify: '&6[ip] ([players]) have been permanently muted by [actor] for &4[reason]'
+      disallowed: '<gold>You have been permanently muted for <dark_red><reason> <gold>by <actor>'
+      broadcast: '<dark_red>[Muted] <player><gray> <message>'
+    notify: '<gold><ip> (<players>) have been permanently muted by <actor> for <dark_red><reason>'
     error:
-      exists: '&c[ip] is already muted'
+      exists: '<red><ip> is already muted'
+
   muteall:
-    notify: '&6[player] will be permanently muted by [actor] for &4[reason]'
+    notify: '<gold><player> will be permanently muted by <actor> for <dark_red><reason>'
+
   tempmute:
     player:
-      disallowed: '&6You have been temporarily muted for &4[reason] &6by [actor] which
-        expires in [expires]'
-    notify: '&6[player] has been temporarily muted for [expires] by [actor] for &4[reason]'
+      disallowed: '<gold>You have been temporarily muted for <dark_red><reason> <gold>by <actor> which expires in <expires>'
+      disallowedOnline: '<gold>You have been temporarily muted for <dark_red><reason> <gold>by <actor> which expires in <expires> (online time)'
+    notify: '<gold><player> has been temporarily muted for <expires> by <actor> for <dark_red><reason> <click:run_command:''/bminfo <player>''><hover:show_text:''<gray>View player info''><dark_aqua>[Info]</dark_aqua></hover></click> <click:run_command:''/unmute <player>''><hover:show_text:''<gray>Unmute player''><dark_aqua>[Unmute]</dark_aqua></hover></click>'
+    notifyOnline: '<gold><player> has been temporarily muted for <expires> (online time) by <actor> for <dark_red><reason>'
     error:
-      exists: '&c[player] is already muted'
+      exists: '<red><player> is already muted'
+
   tempmuteip:
     ip:
-      disallowed: '&6You have been temporarily muted for &4[reason] &6by [actor] which
-        expires in [expires]'
-    notify: '&6[ip] ([players]) have been temporarily muted for [expires] by [actor]
-      for &4[reason]'
+      disallowed: '<gold>You have been temporarily muted for <dark_red><reason> <gold>by <actor> which expires in <expires>'
+    notify: '<gold><ip> (<players>) have been temporarily muted for <expires> by <actor> for <dark_red><reason>'
     error:
-      exists: '&c[ip] is already muted'
+      exists: '<red><ip> is already muted'
+
   tempmuteall:
-    notify: '&6[player] will be temporarily muted for [expires] by [actor] for &4[reason]'
+    notify: '<gold><player> will be temporarily muted for <expires> by <actor> for <dark_red><reason>'
+
   unmute:
-    notify: '&6[player] has been unmuted by [actor]'
-    player: '&6You have been unmuted by [actor]'
+    notify: '<gold><player> has been unmuted by <actor>'
+    player: '<gold>You have been unmuted by <actor>'
     error:
-      noExists: '&c[player] is not muted'
-      notOwn: '&c[player] was not muted by you, unable to unmute'
+      noExists: '<red><player> is not muted'
+      notOwn: '<red><player> was not muted by you, unable to unmute'
+
   unmuteip:
-    notify: '&6[ip] has been unmuted by [actor]'
+    notify: '<gold><ip> has been unmuted by <actor>'
     error:
-      noExists: '&c[ip] is not muted'
-      notOwn: '&c[ip] was not muted by you, unable to unmute'
+      noExists: '<red><ip> is not muted'
+      notOwn: '<red><ip> was not muted by you, unable to unmute'
+
   unmuteall:
-    notify: '&6[player] will be unmuted by [actor]'
+    notify: '<gold><player> will be unmuted by <actor>'
+
   banname:
     name:
-      disallowed: '&6You have been banned from this server for &4[reason]'
-      kick: '&6You have been banned permanently for &4[reason]'
-      dateTimeFormat: yyyy-MM-dd HH:mm:ss
-    notify: '&6Name [name] has been permanently banned by [actor] for &4[reason]'
+      disallowed: '<gold>You have been banned from this server for <dark_red><reason>'
+      kick: '<gold>You have been banned permanently for <dark_red><reason>'
+      dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
+    notify: '<gold>Name <name> has been permanently banned by <actor> for <dark_red><reason>'
     error:
-      exists: '&cName [name] is already banned'
+      exists: '<red>Name <name> is already banned'
+
   tempbanname:
     name:
-      disallowed: '&6You have been banned from this server for &4[reason] \n&6It expires
-        in [expires]'
-      kick: '&6You have been temporarily banned for &4[reason]'
-      dateTimeFormat: yyyy-MM-dd HH:mm:ss
-    notify: '&6Name [name] has been temporarily banned for [expires] by [actor] for
-      &4[reason]'
+      disallowed: '<gold>You have been banned from this server for <dark_red><reason> \n<gold>It expires in <expires>'
+      kick: '<gold>You have been temporarily banned for <dark_red><reason>'
+      dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
+    notify: '<gold>Name <name> has been temporarily banned for <expires> by <actor> for <dark_red><reason>'
+
   unbanname:
-    notify: '&6Name [name] has been unbanned by [actor]'
+    notify: '<gold>Name <name> has been unbanned by <actor>'
     error:
-      noExists: '&cName [name] is not banned'
+      noExists: '<red>Name <name> is not banned'
+
   banip:
     ip:
-      disallowed: '&6You have been banned from this server for &4[reason]&6. Your
-        appeal pin is [pin]'
-      kick: '&6You have been banned permanently for &4[reason]'
-      dateTimeFormat: yyyy-MM-dd HH:mm:ss
-    notify: '&6[ip] has been permanently banned by [actor] for &4[reason]'
+      disallowed: '<gold>You have been banned from this server for <dark_red><reason>'
+      kick: '<gold>You have been banned permanently for <dark_red><reason>'
+      dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
+    notify: '<gold><ip> (<players>) has been permanently banned by <actor> for <dark_red><reason>'
     error:
-      exists: '&c[ip] is already banned'
-      cooldown: '&cThis ip was banned too recently, try again later'
+      exists: '<red><ip> is already banned'
+      cooldown: '<red>This ip was banned too recently, try again later'
+
   baniprange:
     error:
-      invalid: '&cInvalid range, please use cidr notation 192.168.0.1/16 or wildcard
-        192.168.*.*'
-      minMax: '&cRange must be lowest to highest'
-      exists: '&cA ban containing those ranges already exists'
+      invalid: '<red>Invalid range, please use cidr notation 192.168.0.1/16 or wildcard 192.168.*.*'
+      minMax: '<red>Range must be lowest to highest'
+      exists: '<red>A ban containing those ranges already exists'
     ip:
-      disallowed: '&6You have been banned from this server for &4[reason]'
-      kick: '&6You have been banned permanently for &4[reason]'
-      dateTimeFormat: yyyy-MM-dd HH:mm:ss
-    notify: '&6[from] - [to] have been banned by [actor]'
+      disallowed: '<gold>You have been banned from this server for <dark_red><reason>'
+      kick: '<gold>You have been banned permanently for <dark_red><reason>'
+      dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
+    notify: '<gold><from> - <to> have been banned by <actor>'
+
   tempbaniprange:
-    notify: '&6[from] - [to] has been temporarily banned for [expires] by [actor]'
+    notify: '<gold><from> - <to> has been temporarily banned for <expires> by <actor>'
     ip:
-      disallowed: '&6You have been banned from this server for &4[reason] \n&6It expires
-        in [expires]'
-      kick: '&6You have been temporarily banned for [expires] by [actor] for &4[reason]'
-      dateTimeFormat: yyyy-MM-dd HH:mm:ss
+      disallowed: '<gold>You have been banned from this server for <dark_red><reason> \n<gold>It expires in <expires>'
+      kick: '<gold>You have been temporarily banned for <expires> by <actor> for <dark_red><reason>'
+      dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
+
   unbaniprange:
-    notify: '&6[from] - [to] has been unbanned by [actor]'
+    notify: '<gold><from> - <to> has been unbanned by <actor>'
+
   banipall:
-    notify: '&6[ip] will be permanently banned by [actor] for &4[reason]'
+    notify: '<gold><ip> will be permanently banned by <actor> for <dark_red><reason>'
+
   tempbanip:
     ip:
-      disallowed: '&6You have been temporarily banned from this server for &4[reason]
-        \n&6It expires in [expires]. Your appeal pin is [pin]'
-      kick: '&6You have been temporarily banned for &4[reason]'
-      dateTimeFormat: yyyy-MM-dd HH:mm:ss
-    notify: '&6[ip] has been temporarily banned for [expires] by [actor] for &4[reason]'
+      disallowed: '<gold>You have been banned from this server for <dark_red><reason> \n<gold>It expires in <expires>'
+      kick: '<gold>You have been temporarily banned for <dark_red><reason>'
+      dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
+    notify: '<gold><ip> (<players>) has been temporarily banned for <expires> by <actor> for <dark_red><reason>'
+
   tempbanipall:
-    notify: '&6[ip] will be temporarily banned for [expires] by [actor] for &4[reason]'
+    notify: '<gold><ip> will be temporarily banned for <expires> by <actor> for <dark_red><reason>'
+
   unbanip:
-    notify: '&6[ip] has been unbanned by [actor]'
+    notify: '<gold><ip> has been unbanned by <actor>'
     error:
-      noExists: '&c[ip] is not banned'
-      notOwn: '&c[ip] was not banned by you, unable to unban'
+      noExists: '<red><ip> is not banned'
+      notOwn: '<red><ip> was not banned by you, unable to unban'
+
   unbanipall:
-    notify: '&6[ip] will be unbanned by [actor]'
+    notify: '<gold><ip> will be unbanned by <actor>'
+
   warn:
     player:
-      warned: '&cYou have been warned for &4[reason] &cby [actor]'
+      warned: '<gold>You have been warned by <actor> for <dark_red><reason>'
       disallowed:
-        header: '&cYou may not speak until you have accepted your most recent warning.
-          Please type the following:'
-        reason: '&6[reason]'
-        removed: '&aThank you for your understanding, you may now speak again'
-    notify: '&6[player] has been warned by [actor] for &4[reason]'
+        header: '<red>You may not speak until you have accepted your most recent warning. Please type the following:'
+        reason: '<gold><reason>'
+        removed: '<green>Thank you for your understanding, you may now speak again'
+    notify: '<gold><player> has been warned by <actor> for <dark_red><reason> <click:run_command:''/bminfo <player>''><hover:show_text:''<gray>View player info''><dark_aqua>[Info]</dark_aqua></hover></click>'
     error:
-      cooldown: '&cThis player was warned too recently, try again later'
-      exists: '&c[player] has already been warned for that reason'
+      cooldown: '<red>This player was warned too recently, try again later'
+
   tempwarn:
     player:
-      warned: '&6You have been warned for [expires] by [actor] for &4[reason]'
-    notify: '&6[player] has been warned for [expires] by [actor] for &4[reason]'
+      warned: '<gold>You have been warned for <expires> by <actor> for <dark_red><reason>'
+    notify: '<gold><player> has been warned for <expires> by <actor> for <dark_red><reason> <click:run_command:''/bminfo <player>''><hover:show_text:''<gray>View player info''><dark_aqua>[Info]</dark_aqua></hover></click>'
+
   dwarn:
     player:
-      notify: '&6Your most recent warning has been deleted by &4[actor]'
-    notify: '&cThe most recent warning for [player] has been deleted'
+      notify: '<gold>Your most recent warning has been deleted by <dark_red><actor>'
+    notify: '<red>The most recent warning for <player> has been deleted'
     error:
-      noWarnings: '&c[player] has no warnings to delete'
+      noWarnings: '<red><player> has no warnings to delete'
+
   bmclear:
-    notify: '&c[player] has had their [type] cleared'
+    notify: '<red><player> has had their <type> cleared'
     error:
-      invalid: '&cInvalid type, please choose between banrecords, muterecords, kicks,
-        notes or warnings'
+      invalid: '<red>Invalid type, please choose between banrecords, muterecords, kicks, notes or warnings'
+
   bmutils:
     missingplayers:
-      notify: '&c[amount] missing players added'
-      noneFound: '&a0 missing players found'
-      found: '&c[amount] missing player data found. Fixing...'
+      notify: '<red><amount> missing players added'
+      noneFound: '<green>0 missing players found'
+      found: '<red><amount> missing player data found. Fixing...'
       error:
-        failedLookup: '&cFailed to lookup player [uuid], check server logs'
-      complete: '&a[amount] players resolved, please restart your server for failed
-        punishments to take affect'
+        failedLookup: '<red>Failed to lookup player <uuid>, check server logs'
+      complete: '<green><amount> players resolved, please restart your server for failed punishments to take affect'
     duplicates:
       lookup:
-        notFound: '&aNo duplicate player names found'
+        notFound: '<green>No duplicate player names found'
       error:
-        invalidName: '&cInvalid name, must be 16 characters or less and contain only
-          letters, numbers and an underscore'
-        nameExists: '&cA player with that name already exists'
-      success: '&aPlayer name set to [player] successfully'
+        invalidName: '<red>Invalid name, must be 16 characters or less and contain only letters, numbers and an underscore'
+        nameExists: '<red>A player with that name already exists'
+      success: '<green>Player name set to <player> successfully'
+
   bmrollback:
-    notify: '&c[player] has had their [type] actions undone'
+    notify: '<red><player> has had their <type> actions undone'
     error:
-      invalid: '&cInvalid type [type], please choose between [types]'
+      invalid: '<red>Invalid type <type>, please choose between [types]'
+
   sync:
     player:
-      started: '&aStarting force [type] synchronisation'
-      finished: '&aForced [type] synchronisation complete'
+      started: '<green>Starting force <type> synchronisation'
+      finished: '<green>Forced <type> synchronisation complete'
+
   update:
-    notify: '&6[BanManager] &aAn update is available'
+    notify: '<gold>[BanManager] <green>An update is available'
+
   notes:
-    header: '&6[player] has the following notes:'
-    joinAmount: '&6[player] has &e[amount] &6notes, click to view them'
-    note: '&6[[player]] &e[message] - &e[created]'
-    playerNote: '&a[[player]] &6[[actor]] &e[message] - &e[created]'
-    dateTimeFormat: dd-MM-yyyy
-    notify: '[player] has a new note attached by [actor]: [message]'
+    header: '<gold><player> has the following notes:'
+    joinAmount: '<click:run_command:"/notes <player>"><gold><player> has <yellow><amount> <gold>notes, click to view them</click>'
+    note: '<gold>[<player>] <yellow><message> - <yellow><created>'
+    playerNote: '<green>[<player>] <gold>[<actor>] <yellow><message> - <yellow><created>'
+    dateTimeFormat: 'dd-MM-yyyy'
+    notify: '<player> has a new note attached by <actor>: <message>'
     error:
-      noNotes: '&c[player] has no notes'
-      noOnlineNotes: '&cNo online players have notes'
+      noNotes: '<red><player> has no notes'
+      noOnlineNotes: '<red>No online players have notes'
+
   report:
-    notify: '&6[player] has been reported by [actor] for &4[reason]'
+    notify: '<gold><player> has been reported by <actor> for <dark_red><reason>'
     error:
-      cooldown: '&cToo many reports, please wait a while'
-      notOnline: '&cPlayer must be online to report'
+      cooldown: '<red>This player was reported too recently, try again later'
     assign:
-      player: '&aReport [id] assigned to [player]'
-      notify: '&aYou have been assigned report [id] by [actor]'
+      player: '<green>Report <id> assigned to <player>'
+      notify: '<green>You have been assigned report <id> by <actor>'
     unassign:
-      player: '&aReport [id] unassigned'
+      player: '<green>Report <id> unassigned'
     close:
       notify:
-        closed: '&aReport [id] closed by [actor]'
-        command: '&aReport [id] closed by [actor] with [command]'
-        comment: '&aReport [id] closed by [actor] with [comment]'
-      dispatch: Executing command [command]
+        closed: '<green>Report <id> closed by <actor>'
+        command: '<green>Report <id> closed by <actor> with <command>'
+        comment: '<green>Report <id> closed by <actor> with <comment>'
+      dispatch: 'Executing command <command>'
     list:
-      noResults: '&cNo reports found'
+      noResults: '<red>No reports found'
       error:
-        invalidState: '&cReport state [state] not found'
+        invalidState: '<red>Report state <state> not found'
       row:
-        dateTimeFormat: yyyy-MM-dd HH:mm:ss
-        header: '&e-- Reports ([count]) -- Page ([page]/[maxPage])'
-        all: '&7#[id] &e[[state]] &6- [created] - [player]'
+        dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
+        header: '<yellow>-- Reports (<count>) -- Page (<page>/<maxPage>)'
+        all: '<click:run_command:"/reports info <id>"><hover:show_text:"<gray>Click to view details"><gray>#<id> <yellow>[<state>] <gold>- <created> - <player></hover></click>'
     tp:
       error:
-        notFound: '&cReport not found'
-        worldNotFound: '&cWorld [world] could not be found'
-        invalidId: '&c[id] is not a valid report id'
-      dateTimeFormat: yyyy-MM-dd HH:mm:ss
+        notFound: '<red>Report not found'
+        worldNotFound: '<red>World <world> could not be found'
+        invalidId: '<red><id> is not a valid report id'
+      dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
       notify:
-        report: '&7#[id] &6[actor] reported [player] for &4[reason]&6 at [created]'
-        location: '[world] - [x], [y], [z]'
+        report: '<gray>#<id> <gold><actor> reported <player> for <dark_red><reason><gold> at <created>'
+        location: '<world> - <x>, <y>, <z>'
     info:
       error:
-        notFound: '&cReport not found'
-        invalidId: '&c[id] is not a valid report id'
-      dateTimeFormat: yyyy-MM-dd HH:mm:ss
+        notFound: '<red>Report not found'
+        invalidId: '<red><id> is not a valid report id'
+      dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
       notify:
-        report: '&7#[id] &6[actor] reported [player] for &4[reason]&6 at [created]'
-        location: '[world] - [x], [y], [z]'
-    success: '&a[player] has been reported'
-    created: '&6[actor] has reported [player] for &4[reason]'
+        report: '<gray>#<id> <gold><actor> reported <player> for <dark_red><reason><gold> at <created>'
+        location: '<world> - <x>, <y>, <z>'
+
   addnoteall:
-    notify: '&c[player] will have a new attached by [actor]: [message]'
+    notify: '<red><player> will have a new attached by <actor>: <message>'
+
   banlist:
-    header: '&6There are [bans] [type] bans:'
+    header: '<gold>There are <bans> <type> bans:'
+
   bmactivity:
     row:
-      all: '&a[&f[type]&a] &6[player]&f - &6[actor]&f - &e[created]'
-      player: '&a[&f[type]&a] &6[player]&f - &e[created]'
-      dateTimeFormat: dd-MM-yyyy HH:mm:ss
-    noResults: '&cNo results found'
+      all: '<green>[<white><type><green>] <gold><player><white> - <gold><actor><white> - <yellow><created>'
+      player: '<green>[<white><type><green>] <gold><player><white> - <yellow><created>'
+      dateTimeFormat: 'dd-MM-yyyy HH:mm:ss'
+    noResults: '<red>No results found'
+
   bmdelete:
-    notify: '&a[rows] rows deleted'
+    notify: '<green><rows> rows deleted'
     error:
-      invalid: '&cInvalid type, please choose between banrecords, muterecords, kicks,
-        notes or warnings'
-      invalidId: '&c[id] is not a valid number'
+      invalid: '<red>Invalid type, please choose between banrecords, muterecords, kicks, notes or warnings'
+      invalidId: '<red><id> is not a valid number'
+
   denyalts:
     player:
-      disallowed: '&cThe IP address you are joining from is linked to a banned player'
+      disallowed: '<red>The IP address you are joining from is linked to a banned player'
+
   reasons:
-    row: '[hashtag] = [reason]'
+    row: '<hashtag> = <reason>'
+
+  confirmation:
+    prompt: '<gold>Are you sure you want to <action>? <click:run_command:''/bm confirm''><hover:show_text:''<gray>Click to confirm''><green>[Confirm]</green></hover></click> <click:run_command:''/bm cancel''><hover:show_text:''<gray>Click to cancel''><red>[Cancel]</red></hover></click>'
+    confirmed: '<green>Action confirmed.'
+    cancelled: '<red>Action cancelled.'
+    expired: '<red>No pending action found. It may have expired.'
+
+  dashboard:
+    header: '<dark_gray><strikethrough>                    </strikethrough><reset> <gold><bold>Staff Dashboard</bold></gold> <dark_gray><strikethrough>                    </strikethrough>'
+    activeBans: '<gray>Active Bans: <white><count>'
+    activeMutes: '<gray>Active Mutes: <white><count>'
+    openReports: '<gray>Open Reports: <white><count> <click:run_command:''/reports 1''><hover:show_text:''<gray>View reports''><dark_aqua>[View]</dark_aqua></hover></click>'
+    recentActivity: '<gray>Recent Activity (24h): <white><count>'
+    footer: '<dark_gray><strikethrough>                                                        </strikethrough>'
+
+  report:
+    actions:
+      assign: '<click:run_command:''/report assign <id>''><hover:show_text:''<gray>Assign to yourself''><dark_aqua>[Assign]</dark_aqua></hover></click>'
+      close: '<click:run_command:''/report close <id>''><hover:show_text:''<gray>Close this report''><green>[Close]</green></hover></click>'
+      tp: '<click:run_command:''/report tp <id>''><hover:show_text:''<gray>Teleport to location''><aqua>[TP]</aqua></hover></click>'
+    feedback:
+      assigned: '<gold>Your report #<id> has been assigned to <actor>'
+      closed: '<gold>Your report #<id> has been closed by <actor>'
diff --git a/e2e/platforms/fabric/configs/banmanager-webenhancer/messages.yml b/e2e/platforms/fabric/configs/banmanager-webenhancer/messages.yml
index 5738200..4ea98a0 100644
--- a/e2e/platforms/fabric/configs/banmanager-webenhancer/messages.yml
+++ b/e2e/platforms/fabric/configs/banmanager-webenhancer/messages.yml
@@ -1,5 +1,5 @@
 messages:
   pin:
-    notify: '&6Your pin expires in [expires]'
-    pin: '[pin]'
-
+    notify: '<gold>Your pin expires in <expires>'
+    pin: '<pin>'
+    rateLimited: '<red>Please wait <seconds> seconds before generating a new pin'
diff --git a/e2e/platforms/fabric/configs/banmanager/messages.yml b/e2e/platforms/fabric/configs/banmanager/messages.yml
index 8a833ce..ec9a8a6 100644
--- a/e2e/platforms/fabric/configs/banmanager/messages.yml
+++ b/e2e/platforms/fabric/configs/banmanager/messages.yml
@@ -1,20 +1,22 @@
-# Variables
-# [reason] = Ban/Mute reason
-# [player] = The name of the player
-# [ip] = The banned ip
-# [actor] = Who banned/muted
-# [expires] = How long until the ban/mute ends
+# Message templates use MiniMessage formatting: https://docs.advntr.dev/minimessage/format.html
+# Placeholders use angle brackets, e.g. <reason>, <player>, <ip>, <actor>, <expires>
+
+tokens:
+  appealUrl: 'https://yourdomain.com/appeal'
+  serverName: 'My Server'
+  discordUrl: 'https://discord.gg/example'
+  rulesUrl: 'https://yourdomain.com/rules'
 
 messages:
-  duplicateIP: '&cWarning: [player] has the same IP as the following banned players:\n&6[players]'
-  duplicateIPAlts: '&cWarning: [player] has the same IP as the following players:\n&6[players]'
-  configReloaded: '&aConfiguration reloaded successfully!'
+  duplicateIP: '<red>Warning: <player> has the same IP as the following banned players:\n<gold><players>'
+  duplicateIPAlts: '<red>Warning: <player> has the same IP as the following players:\n<gold><players>'
+  configReloaded: '<green>Configuration reloaded successfully!'
   deniedNotify:
-    player: '&cWarning: [player] attempted to join the server but was denied due to &4[reason]'
-    ip: '&cWarning: [ip] attempted to join the server but was denied due to &4[reason]'
-  deniedMaxIp: '&cToo many players with your ip address online'
-  deniedMultiaccounts: '&cToo many players with your ip address logged in recently'
-  deniedCountry: '&cYou may not connect from your region'
+    player: '<red>Warning: <player> attempted to join the server but was denied due to <dark_red><reason>'
+    ip: '<red>Warning: <ip> attempted to join the server but was denied due to <dark_red><reason>'
+  deniedMaxIp: '<red>Too many players with your ip address online'
+  deniedMultiaccounts: '<red>Too many players with your ip address logged in recently'
+  deniedCountry: '<red>You may not connect from your region'
 
   time:
     now: 'now'
@@ -34,402 +36,442 @@ messages:
     seconds: 'seconds'
     never: 'never'
     error:
-      invalid: '&cYour time length is invalid'
-      limit: '&cYou cannot perform this action for that length of time'
+      invalid: '<red>Your time length is invalid'
+      limit: '<red>You cannot perform this action for that length of time'
 
   none: 'none'
   # General command text
   sender:
     error:
-      notFound: '&c[player] not found, are you sure they exist?'
-      offline: '&c[player] is offline'
-      noSelf: '&cYou cannot perform that action on yourself!'
-      exception: '&cAn error occured whilst attempting to perform this command. Please check the console for further details.'
-      invalidIp: '&cInvalid IP address, expecting w.x.y.z format'
-      offlinePermission: '&cYou are not allowed to perform this action on an offline player'
-      exempt: '&c[player] is exempt from that action'
-      noPermission: '&cYou do not have permission to perform that action'
-      invalidReason: '&c[reason] is no valid reason.'
+      notFound: '<red><player> not found, are you sure they exist?'
+      offline: '<red><player> is offline'
+      noSelf: '<red>You cannot perform that action on yourself!'
+      exception: '<red>An error occured whilst attempting to perform this command. Please check the console for further details.'
+      invalidIp: '<red>Invalid IP address, expecting w.x.y.z format'
+      offlinePermission: '<red>You are not allowed to perform this action on an offline player'
+      ambiguousPlayer: '<red>Multiple players match "<player>". Please use their full name.'
+      exempt: '<red><player> is exempt from that action'
+      noPermission: '<red>You do not have permission to perform that action'
+      invalidReason: '<red><reason> is no valid reason.'
   # Commands
   alts:
     header: 'Possible alts found:'
+    entry: '<click:run_command:"/bminfo <name>"><name></click>'
+    separator: '<gray>, '
+
+  names:
+    header: 'Known names for <player>:'
+    row: '<yellow><name> <gray>(first: <firstSeen>, last: <lastSeen>)'
+    interactive: '<hover:show_text:"<yellow><name> <gray>(first: <firstSeen>, last: <lastSeen>)"><click:run_command:"/bminfo <name>"><yellow><name></click></hover>'
+    separator: '<gray>, '
+    dateTimeFormat: 'dd-MM-yyyy'
+    none: '<gray>No name history found'
 
   export:
     error:
-      inProgress: '&cAn export is already in progress, please wait'
+      inProgress: '<red>An export is already in progress, please wait'
     player:
-      started: '&aPlayer ban export started'
-      finished: '&aPlayer ban export finished, file [file] created'
+      started: '<green>Player ban export started'
+      finished: '<green>Player ban export finished, file <file> created'
     ip:
-      started: '&aIP ban export started'
-      finished: '&aIP ban export finished, file [file] created'
+      started: '<green>IP ban export started'
+      finished: '<green>IP ban export finished, file <file> created'
 
   import:
     error:
-      inProgress: '&cAn import is already in progress, please wait'
+      inProgress: '<red>An import is already in progress, please wait'
     player:
-      started: '&aPlayer ban import started'
-      finished: '&aPlayer ban import finished'
+      started: '<green>Player ban import started'
+      finished: '<green>Player ban import finished'
     ip:
-      started: '&aIP ban import started'
-      finished: '&aIP ban import finished'
+      started: '<green>IP ban import started'
+      finished: '<green>IP ban import finished'
     advancedban:
-      started: '&aAdvancedBan import started'
-      finished: '&aAdvancedBan import finished'
+      started: '<green>AdvancedBan import started'
+      finished: '<green>AdvancedBan import finished'
     h2:
-      started: '&aH2 import started'
-      finished: '&aH2 import finished, please restart the server'
+      started: '<green>H2 import started'
+      finished: '<green>H2 import finished, please restart the server'
+    litebans:
+      started: '<green>LiteBans import started'
+      finished: '<green>LiteBans import finished'
 
   info:
     error:
-      invalidIndex: '&cInvalid player option used'
-      indexRequired: '&cMultiple players named [name] found, please select a player by providing an index between 1 and [size], e.g. /bminfo [name] 1'
-      index: '&7#[index] - &6[name] - &4[uuid]'
+      invalidIndex: '<red>Invalid player option used'
+      indexRequired: '<red>Multiple players named <name> found, please select a player by providing an index between 1 and <size>, e.g. /bminfo <name> 1'
+      index: '<gray>#<index> - <gold><name> - <dark_red><uuid>'
     stats:
-      player: '&6[player] has been banned [bans] times, muted [mutes] times, kicked [kicks] times and warned [warns]
-      times ([warnPoints] Points), has [notes] notes and been reported [reports] times'
-      ip: '&6This ip has been banned [bans] times, muted [mutes] times and range banned [rangebans] times'
-    connection: '&6Their last connection was with [ip] on [lastSeen]'
-    geoip: 'Country: [country] City: [city]'
+      player: '<gold><player> has been banned <bans> times, muted <mutes> times, kicked <kicks> times and warned <warns>
+      times (<warnPoints> Points), has <notes> notes and been reported <reports> times'
+      ip: '<gold>This ip has been banned <bans> times, muted <mutes> times and range banned <rangebans> times'
+    connection: '<gold>Their last connection was with <ip> on <lastSeen>'
+    geoip: 'Country: <country> City: <city>'
     ban:
-      permanent: '&6Currently banned for &4[reason]&6 by [actor] at [created]'
-      temporary: '&6Currently banned for &4[reason]&6 by [actor] at [created] which expires in [expires]'
+      permanent: '<gold>Currently banned for <dark_red><reason><gold> by <actor> at <created>'
+      temporary: '<gold>Currently banned for <dark_red><reason><gold> by <actor> at <created> which expires in <expires>'
       dateTimeFormat: 'dd-MM-yyyy HH:mm:ss'
     ipban:
-      permanent: '&6Currently banned for &4[reason]&6 by [actor] at [created]'
-      temporary: '&6Currently banned for &4[reason]&6 by [actor] at [created] which expires in [expires]'
+      permanent: '<gold>Currently banned for <dark_red><reason><gold> by <actor> at <created>'
+      temporary: '<gold>Currently banned for <dark_red><reason><gold> by <actor> at <created> which expires in <expires>'
       dateTimeFormat: 'dd-MM-yyyy HH:mm:ss'
     iprangeban:
-      permanent: '&6[from] - [to] banned for &4[reason]&6 by [actor] at [created]'
-      temporary: '&6[from] - [to] banned for &4[reason]&6 by [actor] at [created] which expires in [expires]'
+      permanent: '<gold><from> - <to> banned for <dark_red><reason><gold> by <actor> at <created>'
+      temporary: '<gold><from> - <to> banned for <dark_red><reason><gold> by <actor> at <created> which expires in <expires>'
       dateTimeFormat: 'dd-MM-yyyy HH:mm:ss'
     ipmute:
-      permanent: '&6Currently muted for &4[reason]&6 by [actor] at [created]'
-      temporary: '&6Currently muted for &4[reason]&6 by [actor] at [created] which expires in [expires]'
+      permanent: '<gold>Currently muted for <dark_red><reason><gold> by <actor> at <created>'
+      temporary: '<gold>Currently muted for <dark_red><reason><gold> by <actor> at <created> which expires in <expires>'
       dateTimeFormat: 'dd-MM-yyyy HH:mm:ss'
     mute:
-      permanent: '&6Currently muted for &4[reason]&6 by [actor] at [created]'
-      temporary: '&6Currently muted for &4[reason]&6 by [actor] at [created] which expires in [expires]'
+      permanent: '<gold>Currently muted for <dark_red><reason><gold> by <actor> at <created>'
+      temporary: '<gold>Currently muted for <dark_red><reason><gold> by <actor> at <created> which expires in <expires>'
+      temporaryOnline: '<gold>Currently muted for <dark_red><reason><gold> by <actor> at <created> which expires in <expires> (online time)'
+      temporaryOnlinePaused: '<gold>Currently muted for <dark_red><reason><gold> by <actor> at <created> with <remaining> remaining (online time, paused)'
       dateTimeFormat: 'dd-MM-yyyy HH:mm:ss'
     website:
-      player: 'https://yourdomain.com/player/[uuid]'
-      ip: 'http://yourdomain.com/index.php?action=viewip&ip=[ip]&server=0'
+      player: 'https://yourdomain.com/player/<uuid>'
+      ip: 'http://yourdomain.com/index.php?action=viewip&ip=<ip>&server=0'
     history:
-      row: '&7#[id] &a[&f[type]&a] &6[actor]&f [meta] [reason] - &e[created]'
+      row: '<gray>#<id> <green>[<white><type><green>] <gold><actor><white> <meta> <reason> - <yellow><created>'
       dateTimeFormat: 'dd-MM-yyyy HH:mm:ss'
-      noResults: '&cNo results found'
+      noResults: '<red>No results found'
     ips:
-      row: '&e[ip] - &6[join] - [leave]'
+      row: '<yellow><ip> - <gold><join> - <leave>'
       dateTimeFormat: 'dd-MM-yyyy HH:mm:ss'
 
   kick:
     player:
-      noReason: '&6You have been kicked'
-      reason: '&6You have been kicked for &4[reason]'
+      noReason: '<gold>You have been kicked'
+      reason: '<gold>You have been kicked for <dark_red><reason>'
     notify:
-      noReason: '&6[player] has been kicked by [actor]'
-      reason: '&6[player] has been kicked by [actor] for &4[reason]'
+      noReason: '<gold><player> has been kicked by <actor>'
+      reason: '<gold><player> has been kicked by <actor> for <dark_red><reason>'
 
   kickall:
     player:
-      noReason: '&6You have been kicked'
-      reason: '&6You have been kicked for &4[reason]'
+      noReason: '<gold>You have been kicked'
+      reason: '<gold>You have been kicked for <dark_red><reason>'
     notify:
-      noReason: 'All players have been kicked by [actor]'
-      reason: 'All players have been kicked by [actor] for &4[reason]'
+      noReason: 'All players have been kicked by <actor>'
+      reason: 'All players have been kicked by <actor> for <dark_red><reason>'
 
-  # Modified for WebEnhancer E2E testing - includes [pin] placeholder
   ban:
     player:
-      disallowed: '&6You have been banned from this server for &4[reason]&6. Your appeal pin is [pin]'
-      kick: '&6You have been banned permanently for &4[reason]&6. Your appeal pin is [pin]'
+      disallowed: '<red><bold>You are banned from this server</bold></red>\n \n<gray>Reason: <white><reason>\n<gray>Banned by: <white><actor>\n<gray>Date: <white><created>\n \n<gold>Appeal at <appealUrl>'
+      kick: '<red><bold>You have been banned</bold></red>\n \n<gray>Reason: <white><reason>\n<gray>Banned by: <white><actor>'
       dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
-    notify: '&6[player] has been permanently banned by [actor] for &4[reason]'
+    notify: '<gold><player> has been permanently banned by <actor> for <dark_red><reason> <click:run_command:''/bminfo <player>''><hover:show_text:''<gray>View player info''><dark_aqua>[Info]</dark_aqua></hover></click> <click:run_command:''/unban <player>''><hover:show_text:''<gray>Unban player''><dark_aqua>[Unban]</dark_aqua></hover></click>'
     error:
-      exists: '&c[player] is already banned'
-      cooldown: '&cThis player was banned too recently, try again later'
+      exists: '<red><player> is already banned'
+      cooldown: '<red>This player was banned too recently, try again later'
 
   banall:
-    notify: '&6[player] will be permanently banned by [actor] for &4[reason]'
+    notify: '<gold><player> will be permanently banned by <actor> for <dark_red><reason>'
 
   tempban:
     player:
-      disallowed: '&6You have been temporarily banned from this server for &4[reason] \n&6It expires in [expires]. Your appeal pin is [pin]'
-      kick: '&6You have been temporarily banned for &4[reason]&6. Your appeal pin is [pin]'
+      disallowed: '<red><bold>You are temporarily banned from this server</bold></red>\n \n<gray>Reason: <white><reason>\n<gray>Banned by: <white><actor>\n<gray>Expires: <white><expires>\n<gray>Date: <white><created>\n \n<gold>Appeal at <appealUrl>'
+      kick: '<red><bold>You have been temporarily banned</bold></red>\n \n<gray>Reason: <white><reason>\n<gray>Banned by: <white><actor>\n<gray>Expires: <white><expires>'
       dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
-    notify: '&6[player] has been temporarily banned for [expires] by [actor] for &4[reason]'
+    notify: '<gold><player> has been temporarily banned for <expires> by <actor> for <dark_red><reason> <click:run_command:''/bminfo <player>''><hover:show_text:''<gray>View player info''><dark_aqua>[Info]</dark_aqua></hover></click> <click:run_command:''/unban <player>''><hover:show_text:''<gray>Unban player''><dark_aqua>[Unban]</dark_aqua></hover></click>'
 
   tempbanall:
-    notify: '&6[player] will be temporarily banned for [expires] by [actor] for &4[reason]'
+    notify: '<gold><player> will be temporarily banned for <expires> by <actor> for <dark_red><reason>'
 
   unban:
-    notify: '&6[player] has been unbanned by [actor]'
+    notify: '<gold><player> has been unbanned by <actor>'
     error:
-      noExists: '&c[player] is not banned'
-      notOwn: '&c[player] was not banned by you, unable to unban'
+      noExists: '<red><player> is not banned'
+      notOwn: '<red><player> was not banned by you, unable to unban'
 
   unbanall:
-    notify: '&6[player] will be unbanned by [actor]'
+    notify: '<gold><player> will be unbanned by <actor>'
 
   mute:
     player:
-      blocked: '&cYou may not use the [command] command whilst muted!'
-      disallowed: '&6You have been permanently muted for &4[reason] &6by [actor]'
-      broadcast: '&4[Muted] [player]&7 [message]'
-    notify: '&6[player] has been permanently muted by [actor] for &4[reason]'
+      blocked: '<red>You may not use the <command> command whilst muted!'
+      disallowed: '<gold>You have been permanently muted for <dark_red><reason> <gold>by <actor>'
+      broadcast: '<dark_red>[Muted] <player><gray> <message>'
+    notify: '<gold><player> has been permanently muted by <actor> for <dark_red><reason> <click:run_command:''/bminfo <player>''><hover:show_text:''<gray>View player info''><dark_aqua>[Info]</dark_aqua></hover></click> <click:run_command:''/unmute <player>''><hover:show_text:''<gray>Unmute player''><dark_aqua>[Unmute]</dark_aqua></hover></click>'
     error:
-      exists: '&c[player] is already muted'
-      cooldown: '&cThis player was muted too recently, try again later'
+      exists: '<red><player> is already muted'
+      cooldown: '<red>This player was muted too recently, try again later'
 
   muteip:
     ip:
-      disallowed: '&6You have been permanently muted for &4[reason] &6by [actor]'
-      broadcast: '&4[Muted] [player]&7 [message]'
-    notify: '&6[ip] ([players]) have been permanently muted by [actor] for &4[reason]'
+      disallowed: '<gold>You have been permanently muted for <dark_red><reason> <gold>by <actor>'
+      broadcast: '<dark_red>[Muted] <player><gray> <message>'
+    notify: '<gold><ip> (<players>) have been permanently muted by <actor> for <dark_red><reason>'
     error:
-      exists: '&c[ip] is already muted'
+      exists: '<red><ip> is already muted'
 
   muteall:
-    notify: '&6[player] will be permanently muted by [actor] for &4[reason]'
+    notify: '<gold><player> will be permanently muted by <actor> for <dark_red><reason>'
 
   tempmute:
     player:
-      disallowed: '&6You have been temporarily muted for &4[reason] &6by [actor] which expires in [expires]'
-    notify: '&6[player] has been temporarily muted for [expires] by [actor] for &4[reason]'
+      disallowed: '<gold>You have been temporarily muted for <dark_red><reason> <gold>by <actor> which expires in <expires>'
+      disallowedOnline: '<gold>You have been temporarily muted for <dark_red><reason> <gold>by <actor> which expires in <expires> (online time)'
+    notify: '<gold><player> has been temporarily muted for <expires> by <actor> for <dark_red><reason> <click:run_command:''/bminfo <player>''><hover:show_text:''<gray>View player info''><dark_aqua>[Info]</dark_aqua></hover></click> <click:run_command:''/unmute <player>''><hover:show_text:''<gray>Unmute player''><dark_aqua>[Unmute]</dark_aqua></hover></click>'
+    notifyOnline: '<gold><player> has been temporarily muted for <expires> (online time) by <actor> for <dark_red><reason>'
     error:
-      exists: '&c[player] is already muted'
+      exists: '<red><player> is already muted'
 
   tempmuteip:
     ip:
-      disallowed: '&6You have been temporarily muted for &4[reason] &6by [actor] which expires in [expires]'
-    notify: '&6[ip] ([players]) have been temporarily muted for [expires] by [actor] for &4[reason]'
+      disallowed: '<gold>You have been temporarily muted for <dark_red><reason> <gold>by <actor> which expires in <expires>'
+    notify: '<gold><ip> (<players>) have been temporarily muted for <expires> by <actor> for <dark_red><reason>'
     error:
-      exists: '&c[ip] is already muted'
+      exists: '<red><ip> is already muted'
 
   tempmuteall:
-    notify: '&6[player] will be temporarily muted for [expires] by [actor] for &4[reason]'
+    notify: '<gold><player> will be temporarily muted for <expires> by <actor> for <dark_red><reason>'
 
   unmute:
-    notify: '&6[player] has been unmuted by [actor]'
-    player: '&6You have been unmuted by [actor]'
+    notify: '<gold><player> has been unmuted by <actor>'
+    player: '<gold>You have been unmuted by <actor>'
     error:
-      noExists: '&c[player] is not muted'
-      notOwn: '&c[player] was not muted by you, unable to unmute'
+      noExists: '<red><player> is not muted'
+      notOwn: '<red><player> was not muted by you, unable to unmute'
 
   unmuteip:
-    notify: '&6[ip] has been unmuted by [actor]'
+    notify: '<gold><ip> has been unmuted by <actor>'
     error:
-      noExists: '&c[ip] is not muted'
-      notOwn: '&c[ip] was not muted by you, unable to unmute'
+      noExists: '<red><ip> is not muted'
+      notOwn: '<red><ip> was not muted by you, unable to unmute'
 
   unmuteall:
-    notify: '&6[player] will be unmuted by [actor]'
+    notify: '<gold><player> will be unmuted by <actor>'
 
   banname:
     name:
-      disallowed: '&6You have been banned from this server for &4[reason]'
-      kick: '&6You have been banned permanently for &4[reason]'
+      disallowed: '<gold>You have been banned from this server for <dark_red><reason>'
+      kick: '<gold>You have been banned permanently for <dark_red><reason>'
       dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
-    notify: '&6Name [name] has been permanently banned by [actor] for &4[reason]'
+    notify: '<gold>Name <name> has been permanently banned by <actor> for <dark_red><reason>'
     error:
-      exists: '&cName [name] is already banned'
+      exists: '<red>Name <name> is already banned'
 
   tempbanname:
     name:
-      disallowed: '&6You have been banned from this server for &4[reason] \n&6It expires in [expires]'
-      kick: '&6You have been temporarily banned for &4[reason]'
+      disallowed: '<gold>You have been banned from this server for <dark_red><reason> \n<gold>It expires in <expires>'
+      kick: '<gold>You have been temporarily banned for <dark_red><reason>'
       dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
-    notify: '&6Name [name] has been temporarily banned for [expires] by [actor] for &4[reason]'
+    notify: '<gold>Name <name> has been temporarily banned for <expires> by <actor> for <dark_red><reason>'
 
   unbanname:
-    notify: '&6Name [name] has been unbanned by [actor]'
+    notify: '<gold>Name <name> has been unbanned by <actor>'
     error:
-      noExists: '&cName [name] is not banned'
+      noExists: '<red>Name <name> is not banned'
 
   banip:
     ip:
-      disallowed: '&6You have been banned from this server for &4[reason]&6. Your appeal pin is [pin]'
-      kick: '&6You have been banned permanently for &4[reason]'
+      disallowed: '<gold>You have been banned from this server for <dark_red><reason>'
+      kick: '<gold>You have been banned permanently for <dark_red><reason>'
       dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
-    notify: '&6[ip] ([players]) has been permanently banned by [actor] for &4[reason]'
+    notify: '<gold><ip> (<players>) has been permanently banned by <actor> for <dark_red><reason>'
     error:
-      exists: '&c[ip] is already banned'
-      cooldown: '&cThis ip was banned too recently, try again later'
+      exists: '<red><ip> is already banned'
+      cooldown: '<red>This ip was banned too recently, try again later'
 
   baniprange:
     error:
-      invalid: '&cInvalid range, please use cidr notation 192.168.0.1/16 or wildcard 192.168.*.*'
-      minMax: '&cRange must be lowest to highest'
-      exists: '&cA ban containing those ranges already exists'
+      invalid: '<red>Invalid range, please use cidr notation 192.168.0.1/16 or wildcard 192.168.*.*'
+      minMax: '<red>Range must be lowest to highest'
+      exists: '<red>A ban containing those ranges already exists'
     ip:
-      disallowed: '&6You have been banned from this server for &4[reason]'
-      kick: '&6You have been banned permanently for &4[reason]'
+      disallowed: '<gold>You have been banned from this server for <dark_red><reason>'
+      kick: '<gold>You have been banned permanently for <dark_red><reason>'
       dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
-    notify: '&6[from] - [to] have been banned by [actor]'
+    notify: '<gold><from> - <to> have been banned by <actor>'
 
   tempbaniprange:
-    notify: '&6[from] - [to] has been temporarily banned for [expires] by [actor]'
+    notify: '<gold><from> - <to> has been temporarily banned for <expires> by <actor>'
     ip:
-      disallowed: '&6You have been banned from this server for &4[reason] \n&6It expires in [expires]'
-      kick: '&6You have been temporarily banned for [expires] by [actor] for &4[reason]'
+      disallowed: '<gold>You have been banned from this server for <dark_red><reason> \n<gold>It expires in <expires>'
+      kick: '<gold>You have been temporarily banned for <expires> by <actor> for <dark_red><reason>'
       dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
 
   unbaniprange:
-    notify: '&6[from] - [to] has been unbanned by [actor]'
+    notify: '<gold><from> - <to> has been unbanned by <actor>'
 
   banipall:
-    notify: '&6[ip] will be permanently banned by [actor] for &4[reason]'
+    notify: '<gold><ip> will be permanently banned by <actor> for <dark_red><reason>'
 
   tempbanip:
     ip:
-      disallowed: '&6You have been banned from this server for &4[reason] \n&6It expires in [expires]. Your appeal pin is [pin]'
-      kick: '&6You have been temporarily banned for &4[reason]'
+      disallowed: '<gold>You have been banned from this server for <dark_red><reason> \n<gold>It expires in <expires>'
+      kick: '<gold>You have been temporarily banned for <dark_red><reason>'
       dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
-    notify: '&6[ip] ([players]) has been temporarily banned for [expires] by [actor] for &4[reason]'
+    notify: '<gold><ip> (<players>) has been temporarily banned for <expires> by <actor> for <dark_red><reason>'
 
   tempbanipall:
-    notify: '&6[ip] will be temporarily banned for [expires] by [actor] for &4[reason]'
+    notify: '<gold><ip> will be temporarily banned for <expires> by <actor> for <dark_red><reason>'
 
   unbanip:
-    notify: '&6[ip] has been unbanned by [actor]'
+    notify: '<gold><ip> has been unbanned by <actor>'
     error:
-      noExists: '&c[ip] is not banned'
-      notOwn: '&c[ip] was not banned by you, unable to unban'
+      noExists: '<red><ip> is not banned'
+      notOwn: '<red><ip> was not banned by you, unable to unban'
 
   unbanipall:
-    notify: '&6[ip] will be unbanned by [actor]'
+    notify: '<gold><ip> will be unbanned by <actor>'
 
   warn:
     player:
-      warned: '&6You have been warned by [actor] for &4[reason]'
+      warned: '<gold>You have been warned by <actor> for <dark_red><reason>'
       disallowed:
-        header: '&cYou may not speak until you have accepted your most recent warning. Please type the following:'
-        reason: '&6[reason]'
-        removed: '&aThank you for your understanding, you may now speak again'
-    notify: '&6[player] has been warned by [actor] for &4[reason]'
+        header: '<red>You may not speak until you have accepted your most recent warning. Please type the following:'
+        reason: '<gold><reason>'
+        removed: '<green>Thank you for your understanding, you may now speak again'
+    notify: '<gold><player> has been warned by <actor> for <dark_red><reason> <click:run_command:''/bminfo <player>''><hover:show_text:''<gray>View player info''><dark_aqua>[Info]</dark_aqua></hover></click>'
     error:
-      cooldown: '&cThis player was warned too recently, try again later'
+      cooldown: '<red>This player was warned too recently, try again later'
 
   tempwarn:
     player:
-      warned: '&6You have been warned for [expires] by [actor] for &4[reason]'
-    notify: '&6[player] has been warned for [expires] by [actor] for &4[reason]'
+      warned: '<gold>You have been warned for <expires> by <actor> for <dark_red><reason>'
+    notify: '<gold><player> has been warned for <expires> by <actor> for <dark_red><reason> <click:run_command:''/bminfo <player>''><hover:show_text:''<gray>View player info''><dark_aqua>[Info]</dark_aqua></hover></click>'
 
   dwarn:
     player:
-      notify: '&6Your most recent warning has been deleted by &4[actor]'
-    notify: '&cThe most recent warning for [player] has been deleted'
+      notify: '<gold>Your most recent warning has been deleted by <dark_red><actor>'
+    notify: '<red>The most recent warning for <player> has been deleted'
     error:
-      noWarnings: '&c[player] has no warnings to delete'
+      noWarnings: '<red><player> has no warnings to delete'
 
   bmclear:
-    notify: '&c[player] has had their [type] cleared'
+    notify: '<red><player> has had their <type> cleared'
     error:
-      invalid: '&cInvalid type, please choose between banrecords, muterecords, kicks, notes or warnings'
+      invalid: '<red>Invalid type, please choose between banrecords, muterecords, kicks, notes or warnings'
 
   bmutils:
     missingplayers:
-      notify: '&c[amount] missing players added'
-      noneFound: '&a0 missing players found'
-      found: '&c[amount] missing player data found. Fixing...'
+      notify: '<red><amount> missing players added'
+      noneFound: '<green>0 missing players found'
+      found: '<red><amount> missing player data found. Fixing...'
       error:
-        failedLookup: '&cFailed to lookup player [uuid], check server logs'
-      complete: '&a[amount] players resolved, please restart your server for failed punishments to take affect'
+        failedLookup: '<red>Failed to lookup player <uuid>, check server logs'
+      complete: '<green><amount> players resolved, please restart your server for failed punishments to take affect'
     duplicates:
       lookup:
-        notFound: '&aNo duplicate player names found'
+        notFound: '<green>No duplicate player names found'
       error:
-        invalidName: '&cInvalid name, must be 16 characters or less and contain only letters, numbers and an underscore'
-        nameExists: '&cA player with that name already exists'
-      success: '&aPlayer name set to [player] successfully'
+        invalidName: '<red>Invalid name, must be 16 characters or less and contain only letters, numbers and an underscore'
+        nameExists: '<red>A player with that name already exists'
+      success: '<green>Player name set to <player> successfully'
 
   bmrollback:
-    notify: '&c[player] has had their [type] actions undone'
+    notify: '<red><player> has had their <type> actions undone'
     error:
-      invalid: '&cInvalid type [type], please choose between [types]'
+      invalid: '<red>Invalid type <type>, please choose between [types]'
 
   sync:
     player:
-      started: '&aStarting force [type] synchronisation'
-      finished: '&aForced [type] synchronisation complete'
+      started: '<green>Starting force <type> synchronisation'
+      finished: '<green>Forced <type> synchronisation complete'
 
   update:
-    notify: '&6[BanManager] &aAn update is available'
+    notify: '<gold>[BanManager] <green>An update is available'
 
   notes:
-    header: '&6[player] has the following notes:'
-    joinAmount: '&6[player] has &e[amount] &6notes, click to view them'
-    note: '&6[[player]] &e[message] - &e[created]'
-    playerNote: '&a[[player]] &6[[actor]] &e[message] - &e[created]'
+    header: '<gold><player> has the following notes:'
+    joinAmount: '<click:run_command:"/notes <player>"><gold><player> has <yellow><amount> <gold>notes, click to view them</click>'
+    note: '<gold>[<player>] <yellow><message> - <yellow><created>'
+    playerNote: '<green>[<player>] <gold>[<actor>] <yellow><message> - <yellow><created>'
     dateTimeFormat: 'dd-MM-yyyy'
-    notify: '[player] has a new note attached by [actor]: [message]'
+    notify: '<player> has a new note attached by <actor>: <message>'
     error:
-      noNotes: '&c[player] has no notes'
-      noOnlineNotes: '&cNo online players have notes'
+      noNotes: '<red><player> has no notes'
+      noOnlineNotes: '<red>No online players have notes'
 
   report:
-    notify: '&6[player] has been reported by [actor] for &4[reason]'
+    notify: '<gold><player> has been reported by <actor> for <dark_red><reason>'
     error:
-      cooldown: '&cThis player was reported too recently, try again later'
+      cooldown: '<red>This player was reported too recently, try again later'
     assign:
-      player: '&aReport [id] assigned to [player]'
-      notify: '&aYou have been assigned report [id] by [actor]'
+      player: '<green>Report <id> assigned to <player>'
+      notify: '<green>You have been assigned report <id> by <actor>'
     unassign:
-      player: '&aReport [id] unassigned'
+      player: '<green>Report <id> unassigned'
     close:
       notify:
-        closed: '&aReport [id] closed by [actor]'
-        command: '&aReport [id] closed by [actor] with [command]'
-        comment: '&aReport [id] closed by [actor] with [comment]'
-      dispatch: 'Executing command [command]'
+        closed: '<green>Report <id> closed by <actor>'
+        command: '<green>Report <id> closed by <actor> with <command>'
+        comment: '<green>Report <id> closed by <actor> with <comment>'
+      dispatch: 'Executing command <command>'
     list:
-      noResults: '&cNo reports found'
+      noResults: '<red>No reports found'
       error:
-        invalidState: '&cReport state [state] not found'
+        invalidState: '<red>Report state <state> not found'
       row:
         dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
-        header: '&e-- Reports ([count]) -- Page ([page]/[maxPage])'
-        all: '&7#[id] &e[[state]] &6- [created] - [player]'
+        header: '<yellow>-- Reports (<count>) -- Page (<page>/<maxPage>)'
+        all: '<click:run_command:"/reports info <id>"><hover:show_text:"<gray>Click to view details"><gray>#<id> <yellow>[<state>] <gold>- <created> - <player></hover></click>'
     tp:
       error:
-        notFound: '&cReport not found'
-        worldNotFound: '&cWorld [world] could not be found'
-        invalidId: '&c[id] is not a valid report id'
+        notFound: '<red>Report not found'
+        worldNotFound: '<red>World <world> could not be found'
+        invalidId: '<red><id> is not a valid report id'
       dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
       notify:
-        report: '&7#[id] &6[actor] reported [player] for &4[reason]&6 at [created]'
-        location: '[world] - [x], [y], [z]'
+        report: '<gray>#<id> <gold><actor> reported <player> for <dark_red><reason><gold> at <created>'
+        location: '<world> - <x>, <y>, <z>'
     info:
       error:
-        notFound: '&cReport not found'
-        invalidId: '&c[id] is not a valid report id'
+        notFound: '<red>Report not found'
+        invalidId: '<red><id> is not a valid report id'
       dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
       notify:
-        report: '&7#[id] &6[actor] reported [player] for &4[reason]&6 at [created]'
-        location: '[world] - [x], [y], [z]'
+        report: '<gray>#<id> <gold><actor> reported <player> for <dark_red><reason><gold> at <created>'
+        location: '<world> - <x>, <y>, <z>'
 
   addnoteall:
-    notify: '&c[player] will have a new attached by [actor]: [message]'
+    notify: '<red><player> will have a new attached by <actor>: <message>'
 
   banlist:
-    header: '&6There are [bans] [type] bans:'
+    header: '<gold>There are <bans> <type> bans:'
 
   bmactivity:
     row:
-      all: '&a[&f[type]&a] &6[player]&f - &6[actor]&f - &e[created]'
-      player: '&a[&f[type]&a] &6[player]&f - &e[created]'
+      all: '<green>[<white><type><green>] <gold><player><white> - <gold><actor><white> - <yellow><created>'
+      player: '<green>[<white><type><green>] <gold><player><white> - <yellow><created>'
       dateTimeFormat: 'dd-MM-yyyy HH:mm:ss'
-    noResults: '&cNo results found'
+    noResults: '<red>No results found'
 
   bmdelete:
-    notify: '&a[rows] rows deleted'
+    notify: '<green><rows> rows deleted'
     error:
-      invalid: '&cInvalid type, please choose between banrecords, muterecords, kicks, notes or warnings'
-      invalidId: '&c[id] is not a valid number'
+      invalid: '<red>Invalid type, please choose between banrecords, muterecords, kicks, notes or warnings'
+      invalidId: '<red><id> is not a valid number'
 
   denyalts:
     player:
-      disallowed: '&cThe IP address you are joining from is linked to a banned player'
+      disallowed: '<red>The IP address you are joining from is linked to a banned player'
 
   reasons:
-    row: '[hashtag] = [reason]'
+    row: '<hashtag> = <reason>'
+
+  confirmation:
+    prompt: '<gold>Are you sure you want to <action>? <click:run_command:''/bm confirm''><hover:show_text:''<gray>Click to confirm''><green>[Confirm]</green></hover></click> <click:run_command:''/bm cancel''><hover:show_text:''<gray>Click to cancel''><red>[Cancel]</red></hover></click>'
+    confirmed: '<green>Action confirmed.'
+    cancelled: '<red>Action cancelled.'
+    expired: '<red>No pending action found. It may have expired.'
+
+  dashboard:
+    header: '<dark_gray><strikethrough>                    </strikethrough><reset> <gold><bold>Staff Dashboard</bold></gold> <dark_gray><strikethrough>                    </strikethrough>'
+    activeBans: '<gray>Active Bans: <white><count>'
+    activeMutes: '<gray>Active Mutes: <white><count>'
+    openReports: '<gray>Open Reports: <white><count> <click:run_command:''/reports 1''><hover:show_text:''<gray>View reports''><dark_aqua>[View]</dark_aqua></hover></click>'
+    recentActivity: '<gray>Recent Activity (24h): <white><count>'
+    footer: '<dark_gray><strikethrough>                                                        </strikethrough>'
+
+  report:
+    actions:
+      assign: '<click:run_command:''/report assign <id>''><hover:show_text:''<gray>Assign to yourself''><dark_aqua>[Assign]</dark_aqua></hover></click>'
+      close: '<click:run_command:''/report close <id>''><hover:show_text:''<gray>Close this report''><green>[Close]</green></hover></click>'
+      tp: '<click:run_command:''/report tp <id>''><hover:show_text:''<gray>Teleport to location''><aqua>[TP]</aqua></hover></click>'
+    feedback:
+      assigned: '<gold>Your report #<id> has been assigned to <actor>'
+      closed: '<gold>Your report #<id> has been closed by <actor>'
diff --git a/e2e/platforms/sponge/configs/banmanager-webenhancer/messages.yml b/e2e/platforms/sponge/configs/banmanager-webenhancer/messages.yml
index 5738200..4ea98a0 100644
--- a/e2e/platforms/sponge/configs/banmanager-webenhancer/messages.yml
+++ b/e2e/platforms/sponge/configs/banmanager-webenhancer/messages.yml
@@ -1,5 +1,5 @@
 messages:
   pin:
-    notify: '&6Your pin expires in [expires]'
-    pin: '[pin]'
-
+    notify: '<gold>Your pin expires in <expires>'
+    pin: '<pin>'
+    rateLimited: '<red>Please wait <seconds> seconds before generating a new pin'
diff --git a/e2e/platforms/sponge/configs/banmanager/messages.yml b/e2e/platforms/sponge/configs/banmanager/messages.yml
index 459dab6..ec9a8a6 100644
--- a/e2e/platforms/sponge/configs/banmanager/messages.yml
+++ b/e2e/platforms/sponge/configs/banmanager/messages.yml
@@ -1,16 +1,22 @@
-# BanManager messages configuration for E2E testing
-# Modified to include [pin] placeholder for WebEnhancer testing
+# Message templates use MiniMessage formatting: https://docs.advntr.dev/minimessage/format.html
+# Placeholders use angle brackets, e.g. <reason>, <player>, <ip>, <actor>, <expires>
+
+tokens:
+  appealUrl: 'https://yourdomain.com/appeal'
+  serverName: 'My Server'
+  discordUrl: 'https://discord.gg/example'
+  rulesUrl: 'https://yourdomain.com/rules'
 
 messages:
-  duplicateIP: '&cWarning: [player] has the same IP as the following banned players:\n&6[players]'
-  duplicateIPAlts: '&cWarning: [player] has the same IP as the following players:\n&6[players]'
-  configReloaded: '&aConfiguration reloaded successfully!'
+  duplicateIP: '<red>Warning: <player> has the same IP as the following banned players:\n<gold><players>'
+  duplicateIPAlts: '<red>Warning: <player> has the same IP as the following players:\n<gold><players>'
+  configReloaded: '<green>Configuration reloaded successfully!'
   deniedNotify:
-    player: '&cWarning: [player] attempted to join the server but was denied due to &4[reason]'
-    ip: '&cWarning: [ip] attempted to join the server but was denied due to &4[reason]'
-  deniedMaxIp: '&cToo many players with your ip address online'
-  deniedMultiaccounts: '&cToo many players with your ip address logged in recently'
-  deniedCountry: '&cYou may not connect from your region'
+    player: '<red>Warning: <player> attempted to join the server but was denied due to <dark_red><reason>'
+    ip: '<red>Warning: <ip> attempted to join the server but was denied due to <dark_red><reason>'
+  deniedMaxIp: '<red>Too many players with your ip address online'
+  deniedMultiaccounts: '<red>Too many players with your ip address logged in recently'
+  deniedCountry: '<red>You may not connect from your region'
 
   time:
     now: 'now'
@@ -30,337 +36,442 @@ messages:
     seconds: 'seconds'
     never: 'never'
     error:
-      invalid: '&cYour time length is invalid'
-      limit: '&cYou cannot perform this action for that length of time'
+      invalid: '<red>Your time length is invalid'
+      limit: '<red>You cannot perform this action for that length of time'
 
   none: 'none'
+  # General command text
   sender:
     error:
-      notFound: '&c[player] not found, are you sure they exist?'
-      offline: '&c[player] is offline'
-      noSelf: '&cYou cannot perform that action on yourself!'
-      exception: '&cAn error occured whilst attempting to perform this command. Please check the console for further details.'
-      invalidIp: '&cInvalid IP address, expecting w.x.y.z format'
-      offlinePermission: '&cYou are not allowed to perform this action on an offline player'
-      exempt: '&c[player] is exempt from that action'
-      noPermission: '&cYou do not have permission to perform that action'
-      invalidReason: '&c[reason] is no valid reason.'
-
+      notFound: '<red><player> not found, are you sure they exist?'
+      offline: '<red><player> is offline'
+      noSelf: '<red>You cannot perform that action on yourself!'
+      exception: '<red>An error occured whilst attempting to perform this command. Please check the console for further details.'
+      invalidIp: '<red>Invalid IP address, expecting w.x.y.z format'
+      offlinePermission: '<red>You are not allowed to perform this action on an offline player'
+      ambiguousPlayer: '<red>Multiple players match "<player>". Please use their full name.'
+      exempt: '<red><player> is exempt from that action'
+      noPermission: '<red>You do not have permission to perform that action'
+      invalidReason: '<red><reason> is no valid reason.'
+  # Commands
   alts:
     header: 'Possible alts found:'
+    entry: '<click:run_command:"/bminfo <name>"><name></click>'
+    separator: '<gray>, '
+
+  names:
+    header: 'Known names for <player>:'
+    row: '<yellow><name> <gray>(first: <firstSeen>, last: <lastSeen>)'
+    interactive: '<hover:show_text:"<yellow><name> <gray>(first: <firstSeen>, last: <lastSeen>)"><click:run_command:"/bminfo <name>"><yellow><name></click></hover>'
+    separator: '<gray>, '
+    dateTimeFormat: 'dd-MM-yyyy'
+    none: '<gray>No name history found'
 
   export:
     error:
-      inProgress: '&cAn export is already in progress, please wait'
+      inProgress: '<red>An export is already in progress, please wait'
     player:
-      started: '&aPlayer ban export started'
-      finished: '&aPlayer ban export finished, file [file] created'
+      started: '<green>Player ban export started'
+      finished: '<green>Player ban export finished, file <file> created'
     ip:
-      started: '&aIP ban export started'
-      finished: '&aIP ban export finished, file [file] created'
+      started: '<green>IP ban export started'
+      finished: '<green>IP ban export finished, file <file> created'
 
   import:
     error:
-      inProgress: '&cAn import is already in progress, please wait'
+      inProgress: '<red>An import is already in progress, please wait'
     player:
-      started: '&aPlayer ban import started'
-      finished: '&aPlayer ban import finished'
+      started: '<green>Player ban import started'
+      finished: '<green>Player ban import finished'
     ip:
-      started: '&aIP ban import started'
-      finished: '&aIP ban import finished'
+      started: '<green>IP ban import started'
+      finished: '<green>IP ban import finished'
     advancedban:
-      started: '&aAdvancedBan import started'
-      finished: '&aAdvancedBan import finished'
+      started: '<green>AdvancedBan import started'
+      finished: '<green>AdvancedBan import finished'
     h2:
-      started: '&aH2 import started'
-      finished: '&aH2 import finished, please restart the server'
+      started: '<green>H2 import started'
+      finished: '<green>H2 import finished, please restart the server'
+    litebans:
+      started: '<green>LiteBans import started'
+      finished: '<green>LiteBans import finished'
 
   info:
     error:
-      invalidIndex: '&cInvalid player option used'
-      indexRequired: '&cMultiple players named [name] found, please select a player by providing an index between 1 and [size], e.g. /bminfo [name] 1'
-      index: '&7#[index] - &6[name] - &4[uuid]'
+      invalidIndex: '<red>Invalid player option used'
+      indexRequired: '<red>Multiple players named <name> found, please select a player by providing an index between 1 and <size>, e.g. /bminfo <name> 1'
+      index: '<gray>#<index> - <gold><name> - <dark_red><uuid>'
     stats:
-      player: '&6[player] has been banned [bans] times, muted [mutes] times, kicked [kicks] times and warned [warns] times ([warnPoints] Points), has [notes] notes and been reported [reports] times'
-      ip: '&6This ip has been banned [bans] times, muted [mutes] times and range banned [rangebans] times'
-    connection: '&6Their last connection was with [ip] on [lastSeen]'
-    geoip: 'Country: [country] City: [city]'
+      player: '<gold><player> has been banned <bans> times, muted <mutes> times, kicked <kicks> times and warned <warns>
+      times (<warnPoints> Points), has <notes> notes and been reported <reports> times'
+      ip: '<gold>This ip has been banned <bans> times, muted <mutes> times and range banned <rangebans> times'
+    connection: '<gold>Their last connection was with <ip> on <lastSeen>'
+    geoip: 'Country: <country> City: <city>'
     ban:
-      permanent: '&6Currently banned for &4[reason]&6 by [actor] at [created]'
-      temporary: '&6Currently banned for &4[reason]&6 by [actor] at [created] which expires in [expires]'
+      permanent: '<gold>Currently banned for <dark_red><reason><gold> by <actor> at <created>'
+      temporary: '<gold>Currently banned for <dark_red><reason><gold> by <actor> at <created> which expires in <expires>'
       dateTimeFormat: 'dd-MM-yyyy HH:mm:ss'
     ipban:
-      permanent: '&6Currently banned for &4[reason]&6 by [actor] at [created]'
-      temporary: '&6Currently banned for &4[reason]&6 by [actor] at [created] which expires in [expires]'
+      permanent: '<gold>Currently banned for <dark_red><reason><gold> by <actor> at <created>'
+      temporary: '<gold>Currently banned for <dark_red><reason><gold> by <actor> at <created> which expires in <expires>'
       dateTimeFormat: 'dd-MM-yyyy HH:mm:ss'
     iprangeban:
-      permanent: '&6[from] - [to] banned for &4[reason]&6 by [actor] at [created]'
-      temporary: '&6[from] - [to] banned for &4[reason]&6 by [actor] at [created] which expires in [expires]'
+      permanent: '<gold><from> - <to> banned for <dark_red><reason><gold> by <actor> at <created>'
+      temporary: '<gold><from> - <to> banned for <dark_red><reason><gold> by <actor> at <created> which expires in <expires>'
       dateTimeFormat: 'dd-MM-yyyy HH:mm:ss'
     ipmute:
-      permanent: '&6Currently muted for &4[reason]&6 by [actor] at [created]'
-      temporary: '&6Currently muted for &4[reason]&6 by [actor] at [created] which expires in [expires]'
+      permanent: '<gold>Currently muted for <dark_red><reason><gold> by <actor> at <created>'
+      temporary: '<gold>Currently muted for <dark_red><reason><gold> by <actor> at <created> which expires in <expires>'
       dateTimeFormat: 'dd-MM-yyyy HH:mm:ss'
     mute:
-      permanent: '&6Currently muted for &4[reason]&6 by [actor] at [created]'
-      temporary: '&6Currently muted for &4[reason]&6 by [actor] at [created] which expires in [expires]'
+      permanent: '<gold>Currently muted for <dark_red><reason><gold> by <actor> at <created>'
+      temporary: '<gold>Currently muted for <dark_red><reason><gold> by <actor> at <created> which expires in <expires>'
+      temporaryOnline: '<gold>Currently muted for <dark_red><reason><gold> by <actor> at <created> which expires in <expires> (online time)'
+      temporaryOnlinePaused: '<gold>Currently muted for <dark_red><reason><gold> by <actor> at <created> with <remaining> remaining (online time, paused)'
       dateTimeFormat: 'dd-MM-yyyy HH:mm:ss'
     website:
-      player: 'https://yourdomain.com/player/[uuid]'
-      ip: 'http://yourdomain.com/index.php?action=viewip&ip=[ip]&server=0'
+      player: 'https://yourdomain.com/player/<uuid>'
+      ip: 'http://yourdomain.com/index.php?action=viewip&ip=<ip>&server=0'
     history:
-      row: '&7#[id] &a[&f[type]&a] &6[actor]&f [meta] [reason] - &e[created]'
+      row: '<gray>#<id> <green>[<white><type><green>] <gold><actor><white> <meta> <reason> - <yellow><created>'
       dateTimeFormat: 'dd-MM-yyyy HH:mm:ss'
-      noResults: '&cNo results found'
+      noResults: '<red>No results found'
     ips:
-      row: '&e[ip] - &6[join] - [leave]'
+      row: '<yellow><ip> - <gold><join> - <leave>'
       dateTimeFormat: 'dd-MM-yyyy HH:mm:ss'
 
   kick:
     player:
-      noReason: '&6You have been kicked'
-      reason: '&6You have been kicked for &4[reason]'
+      noReason: '<gold>You have been kicked'
+      reason: '<gold>You have been kicked for <dark_red><reason>'
     notify:
-      noReason: '&6[player] has been kicked by [actor]'
-      reason: '&6[player] has been kicked by [actor] for &4[reason]'
+      noReason: '<gold><player> has been kicked by <actor>'
+      reason: '<gold><player> has been kicked by <actor> for <dark_red><reason>'
 
   kickall:
     player:
-      noReason: '&6You have been kicked'
-      reason: '&6You have been kicked for &4[reason]'
+      noReason: '<gold>You have been kicked'
+      reason: '<gold>You have been kicked for <dark_red><reason>'
     notify:
-      noReason: 'All players have been kicked by [actor]'
-      reason: 'All players have been kicked by [actor] for &4[reason]'
+      noReason: 'All players have been kicked by <actor>'
+      reason: 'All players have been kicked by <actor> for <dark_red><reason>'
 
-  # Modified for WebEnhancer E2E testing - includes [pin] placeholder
   ban:
     player:
-      disallowed: '&6You have been banned from this server for &4[reason]&6. Your appeal pin is [pin]'
-      kick: '&6You have been banned permanently for &4[reason]&6. Your appeal pin is [pin]'
+      disallowed: '<red><bold>You are banned from this server</bold></red>\n \n<gray>Reason: <white><reason>\n<gray>Banned by: <white><actor>\n<gray>Date: <white><created>\n \n<gold>Appeal at <appealUrl>'
+      kick: '<red><bold>You have been banned</bold></red>\n \n<gray>Reason: <white><reason>\n<gray>Banned by: <white><actor>'
       dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
-    notify: '&6[player] has been permanently banned by [actor] for &4[reason]'
+    notify: '<gold><player> has been permanently banned by <actor> for <dark_red><reason> <click:run_command:''/bminfo <player>''><hover:show_text:''<gray>View player info''><dark_aqua>[Info]</dark_aqua></hover></click> <click:run_command:''/unban <player>''><hover:show_text:''<gray>Unban player''><dark_aqua>[Unban]</dark_aqua></hover></click>'
     error:
-      exists: '&c[player] is already banned'
-      cooldown: '&cThis player was banned too recently, try again later'
+      exists: '<red><player> is already banned'
+      cooldown: '<red>This player was banned too recently, try again later'
 
   banall:
-    notify: '&6[player] will be permanently banned by [actor] for &4[reason]'
+    notify: '<gold><player> will be permanently banned by <actor> for <dark_red><reason>'
 
   tempban:
     player:
-      disallowed: '&6You have been temporarily banned from this server for &4[reason] \n&6It expires in [expires]. Your appeal pin is [pin]'
-      kick: '&6You have been temporarily banned for &4[reason]&6. Your appeal pin is [pin]'
+      disallowed: '<red><bold>You are temporarily banned from this server</bold></red>\n \n<gray>Reason: <white><reason>\n<gray>Banned by: <white><actor>\n<gray>Expires: <white><expires>\n<gray>Date: <white><created>\n \n<gold>Appeal at <appealUrl>'
+      kick: '<red><bold>You have been temporarily banned</bold></red>\n \n<gray>Reason: <white><reason>\n<gray>Banned by: <white><actor>\n<gray>Expires: <white><expires>'
       dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
-    notify: '&6[player] has been temporarily banned for [expires] by [actor] for &4[reason]'
+    notify: '<gold><player> has been temporarily banned for <expires> by <actor> for <dark_red><reason> <click:run_command:''/bminfo <player>''><hover:show_text:''<gray>View player info''><dark_aqua>[Info]</dark_aqua></hover></click> <click:run_command:''/unban <player>''><hover:show_text:''<gray>Unban player''><dark_aqua>[Unban]</dark_aqua></hover></click>'
 
   tempbanall:
-    notify: '&6[player] will be temporarily banned for [expires] by [actor] for &4[reason]'
+    notify: '<gold><player> will be temporarily banned for <expires> by <actor> for <dark_red><reason>'
 
   unban:
-    notify: '&6[player] has been unbanned by [actor]'
+    notify: '<gold><player> has been unbanned by <actor>'
     error:
-      noExists: '&c[player] is not banned'
-      notOwn: '&c[player] was not banned by you, unable to unban'
+      noExists: '<red><player> is not banned'
+      notOwn: '<red><player> was not banned by you, unable to unban'
 
   unbanall:
-    notify: '&6[player] will be unbanned by [actor]'
+    notify: '<gold><player> will be unbanned by <actor>'
 
   mute:
     player:
-      blocked: '&cYou may not use the [command] command whilst muted!'
-      disallowed: '&6You have been permanently muted for &4[reason] &6by [actor]'
-      broadcast: '&4[Muted] [player]&7 [message]'
-    notify: '&6[player] has been permanently muted by [actor] for &4[reason]'
+      blocked: '<red>You may not use the <command> command whilst muted!'
+      disallowed: '<gold>You have been permanently muted for <dark_red><reason> <gold>by <actor>'
+      broadcast: '<dark_red>[Muted] <player><gray> <message>'
+    notify: '<gold><player> has been permanently muted by <actor> for <dark_red><reason> <click:run_command:''/bminfo <player>''><hover:show_text:''<gray>View player info''><dark_aqua>[Info]</dark_aqua></hover></click> <click:run_command:''/unmute <player>''><hover:show_text:''<gray>Unmute player''><dark_aqua>[Unmute]</dark_aqua></hover></click>'
     error:
-      exists: '&c[player] is already muted'
-      cooldown: '&cThis player was muted too recently, try again later'
+      exists: '<red><player> is already muted'
+      cooldown: '<red>This player was muted too recently, try again later'
 
   muteip:
     ip:
-      disallowed: '&6You have been permanently muted for &4[reason] &6by [actor]'
-      broadcast: '&4[Muted] [player]&7 [message]'
-    notify: '&6[ip] ([players]) have been permanently muted by [actor] for &4[reason]'
+      disallowed: '<gold>You have been permanently muted for <dark_red><reason> <gold>by <actor>'
+      broadcast: '<dark_red>[Muted] <player><gray> <message>'
+    notify: '<gold><ip> (<players>) have been permanently muted by <actor> for <dark_red><reason>'
     error:
-      exists: '&c[ip] is already muted'
+      exists: '<red><ip> is already muted'
 
   muteall:
-    notify: '&6[player] will be permanently muted by [actor] for &4[reason]'
+    notify: '<gold><player> will be permanently muted by <actor> for <dark_red><reason>'
 
   tempmute:
     player:
-      disallowed: '&6You have been temporarily muted for &4[reason] &6by [actor] which expires in [expires]'
-    notify: '&6[player] has been temporarily muted for [expires] by [actor] for &4[reason]'
+      disallowed: '<gold>You have been temporarily muted for <dark_red><reason> <gold>by <actor> which expires in <expires>'
+      disallowedOnline: '<gold>You have been temporarily muted for <dark_red><reason> <gold>by <actor> which expires in <expires> (online time)'
+    notify: '<gold><player> has been temporarily muted for <expires> by <actor> for <dark_red><reason> <click:run_command:''/bminfo <player>''><hover:show_text:''<gray>View player info''><dark_aqua>[Info]</dark_aqua></hover></click> <click:run_command:''/unmute <player>''><hover:show_text:''<gray>Unmute player''><dark_aqua>[Unmute]</dark_aqua></hover></click>'
+    notifyOnline: '<gold><player> has been temporarily muted for <expires> (online time) by <actor> for <dark_red><reason>'
     error:
-      exists: '&c[player] is already muted'
+      exists: '<red><player> is already muted'
 
   tempmuteip:
     ip:
-      disallowed: '&6You have been temporarily muted for &4[reason] &6by [actor] which expires in [expires]'
-    notify: '&6[ip] ([players]) have been temporarily muted for [expires] by [actor] for &4[reason]'
+      disallowed: '<gold>You have been temporarily muted for <dark_red><reason> <gold>by <actor> which expires in <expires>'
+    notify: '<gold><ip> (<players>) have been temporarily muted for <expires> by <actor> for <dark_red><reason>'
     error:
-      exists: '&c[ip] is already muted'
+      exists: '<red><ip> is already muted'
 
   tempmuteall:
-    notify: '&6[player] will be temporarily muted for [expires] by [actor] for &4[reason]'
+    notify: '<gold><player> will be temporarily muted for <expires> by <actor> for <dark_red><reason>'
 
   unmute:
-    notify: '&6[player] has been unmuted by [actor]'
+    notify: '<gold><player> has been unmuted by <actor>'
+    player: '<gold>You have been unmuted by <actor>'
     error:
-      noExists: '&c[player] is not muted'
-      notOwn: '&c[player] was not muted by you, unable to unmute'
-
-  unmuteall:
-    notify: '&6[player] will be unmuted by [actor]'
+      noExists: '<red><player> is not muted'
+      notOwn: '<red><player> was not muted by you, unable to unmute'
 
   unmuteip:
-    notify: '&6[ip] ([players]) have been unmuted by [actor]'
+    notify: '<gold><ip> has been unmuted by <actor>'
     error:
-      noExists: '&c[ip] is not muted'
-      notOwn: '&c[ip] was not muted by you, unable to unmute'
+      noExists: '<red><ip> is not muted'
+      notOwn: '<red><ip> was not muted by you, unable to unmute'
 
-  warn:
-    player:
-      warned: '&cYou have been warned for &4[reason] &cby [actor]'
-    notify: '&6[player] has been warned by [actor] for &4[reason]'
-    error:
-      exists: '&c[player] has already been warned for that reason'
-      cooldown: '&cThis player was warned too recently, try again later'
+  unmuteall:
+    notify: '<gold><player> will be unmuted by <actor>'
 
-  tempwarn:
-    player:
-      warned: '&cYou have been warned for &4[reason] &cby [actor] which expires in [expires]'
-    notify: '&6[player] has been warned for [expires] by [actor] for &4[reason]'
+  banname:
+    name:
+      disallowed: '<gold>You have been banned from this server for <dark_red><reason>'
+      kick: '<gold>You have been banned permanently for <dark_red><reason>'
+      dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
+    notify: '<gold>Name <name> has been permanently banned by <actor> for <dark_red><reason>'
     error:
-      exists: '&c[player] has already been warned for that reason'
+      exists: '<red>Name <name> is already banned'
 
-  warnall:
-    notify: '&6[player] will be warned by [actor] for &4[reason]'
+  tempbanname:
+    name:
+      disallowed: '<gold>You have been banned from this server for <dark_red><reason> \n<gold>It expires in <expires>'
+      kick: '<gold>You have been temporarily banned for <dark_red><reason>'
+      dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
+    notify: '<gold>Name <name> has been temporarily banned for <expires> by <actor> for <dark_red><reason>'
 
-  addnote:
-    notify: '&6Note added for [player] by [actor]'
+  unbanname:
+    notify: '<gold>Name <name> has been unbanned by <actor>'
     error:
-      cooldown: '&cA note was added for this player too recently, try again later'
+      noExists: '<red>Name <name> is not banned'
 
-  notes:
+  banip:
+    ip:
+      disallowed: '<gold>You have been banned from this server for <dark_red><reason>'
+      kick: '<gold>You have been banned permanently for <dark_red><reason>'
+      dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
+    notify: '<gold><ip> (<players>) has been permanently banned by <actor> for <dark_red><reason>'
     error:
-      noResults: '&cNo notes for [player]'
-      noResults.uuid: '&cNo notes for player'
-    header: '&6Notes for [player]'
-    row: '&6[created] &f[message]'
-    dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
+      exists: '<red><ip> is already banned'
+      cooldown: '<red>This ip was banned too recently, try again later'
 
-  bmactivity:
+  baniprange:
     error:
-      noResults: '&cNo activity found'
-    header: '&6Activity for [player]'
-    row: '&7#[id] &a[&f[type]&a] &6[player]&f [meta] [reason] - &e[created]'
-    dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
+      invalid: '<red>Invalid range, please use cidr notation 192.168.0.1/16 or wildcard 192.168.*.*'
+      minMax: '<red>Range must be lowest to highest'
+      exists: '<red>A ban containing those ranges already exists'
+    ip:
+      disallowed: '<gold>You have been banned from this server for <dark_red><reason>'
+      kick: '<gold>You have been banned permanently for <dark_red><reason>'
+      dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
+    notify: '<gold><from> - <to> have been banned by <actor>'
 
-  banip:
+  tempbaniprange:
+    notify: '<gold><from> - <to> has been temporarily banned for <expires> by <actor>'
     ip:
-      disallowed: '&6You have been banned from this server for &4[reason]&6. Your appeal pin is [pin]'
-      kick: '&6You have been banned permanently for &4[reason]'
-    notify: '&6[ip] has been permanently banned by [actor] for &4[reason]'
-    error:
-      exists: '&c[ip] is already banned'
-      cooldown: '&cThis ip was banned too recently, try again later'
+      disallowed: '<gold>You have been banned from this server for <dark_red><reason> \n<gold>It expires in <expires>'
+      kick: '<gold>You have been temporarily banned for <expires> by <actor> for <dark_red><reason>'
+      dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
+
+  unbaniprange:
+    notify: '<gold><from> - <to> has been unbanned by <actor>'
+
+  banipall:
+    notify: '<gold><ip> will be permanently banned by <actor> for <dark_red><reason>'
 
   tempbanip:
     ip:
-      disallowed: '&6You have been temporarily banned from this server for &4[reason] \n&6It expires in [expires]. Your appeal pin is [pin]'
-      kick: '&6You have been temporarily banned for &4[reason]'
-    notify: '&6[ip] has been temporarily banned for [expires] by [actor] for &4[reason]'
+      disallowed: '<gold>You have been banned from this server for <dark_red><reason> \n<gold>It expires in <expires>'
+      kick: '<gold>You have been temporarily banned for <dark_red><reason>'
+      dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
+    notify: '<gold><ip> (<players>) has been temporarily banned for <expires> by <actor> for <dark_red><reason>'
+
+  tempbanipall:
+    notify: '<gold><ip> will be temporarily banned for <expires> by <actor> for <dark_red><reason>'
 
   unbanip:
-    notify: '&6[ip] has been unbanned by [actor]'
+    notify: '<gold><ip> has been unbanned by <actor>'
     error:
-      noExists: '&c[ip] is not banned'
-      notOwn: '&c[ip] was not banned by you, unable to unban'
+      noExists: '<red><ip> is not banned'
+      notOwn: '<red><ip> was not banned by you, unable to unban'
 
-  baniprange:
-    notify: '&6[from] - [to] has been permanently banned by [actor] for &4[reason]'
+  unbanipall:
+    notify: '<gold><ip> will be unbanned by <actor>'
+
+  warn:
+    player:
+      warned: '<gold>You have been warned by <actor> for <dark_red><reason>'
+      disallowed:
+        header: '<red>You may not speak until you have accepted your most recent warning. Please type the following:'
+        reason: '<gold><reason>'
+        removed: '<green>Thank you for your understanding, you may now speak again'
+    notify: '<gold><player> has been warned by <actor> for <dark_red><reason> <click:run_command:''/bminfo <player>''><hover:show_text:''<gray>View player info''><dark_aqua>[Info]</dark_aqua></hover></click>'
     error:
-      exists: '&c[from] - [to] is already banned'
-      cooldown: '&cThis ip range was banned too recently, try again later'
+      cooldown: '<red>This player was warned too recently, try again later'
 
-  tempbaniprange:
-    notify: '&6[from] - [to] has been temporarily banned for [expires] by [actor] for &4[reason]'
+  tempwarn:
+    player:
+      warned: '<gold>You have been warned for <expires> by <actor> for <dark_red><reason>'
+    notify: '<gold><player> has been warned for <expires> by <actor> for <dark_red><reason> <click:run_command:''/bminfo <player>''><hover:show_text:''<gray>View player info''><dark_aqua>[Info]</dark_aqua></hover></click>'
 
-  unbaniprange:
-    notify: '&6[from] - [to] has been unbanned by [actor]'
+  dwarn:
+    player:
+      notify: '<gold>Your most recent warning has been deleted by <dark_red><actor>'
+    notify: '<red>The most recent warning for <player> has been deleted'
     error:
-      noExists: '&c[from] - [to] is not banned'
-      notOwn: '&c[from] - [to] was not banned by you, unable to unban'
+      noWarnings: '<red><player> has no warnings to delete'
 
-  banname:
-    disallowed: '&6You may not use the name [name] on this server'
-    notify: '&6[name] has been permanently banned by [actor] for &4[reason]'
+  bmclear:
+    notify: '<red><player> has had their <type> cleared'
+    error:
+      invalid: '<red>Invalid type, please choose between banrecords, muterecords, kicks, notes or warnings'
+
+  bmutils:
+    missingplayers:
+      notify: '<red><amount> missing players added'
+      noneFound: '<green>0 missing players found'
+      found: '<red><amount> missing player data found. Fixing...'
+      error:
+        failedLookup: '<red>Failed to lookup player <uuid>, check server logs'
+      complete: '<green><amount> players resolved, please restart your server for failed punishments to take affect'
+    duplicates:
+      lookup:
+        notFound: '<green>No duplicate player names found'
+      error:
+        invalidName: '<red>Invalid name, must be 16 characters or less and contain only letters, numbers and an underscore'
+        nameExists: '<red>A player with that name already exists'
+      success: '<green>Player name set to <player> successfully'
+
+  bmrollback:
+    notify: '<red><player> has had their <type> actions undone'
     error:
-      exists: '&c[name] is already banned'
+      invalid: '<red>Invalid type <type>, please choose between [types]'
 
-  tempbanname:
-    notify: '&6[name] has been temporarily banned for [expires] by [actor] for &4[reason]'
+  sync:
+    player:
+      started: '<green>Starting force <type> synchronisation'
+      finished: '<green>Forced <type> synchronisation complete'
 
-  unbanname:
-    notify: '&6[name] has been unbanned by [actor]'
-    error:
-      noExists: '&c[name] is not banned'
-      notOwn: '&c[name] was not banned by you, unable to unban'
+  update:
+    notify: '<gold>[BanManager] <green>An update is available'
 
-  report:
+  notes:
+    header: '<gold><player> has the following notes:'
+    joinAmount: '<click:run_command:"/notes <player>"><gold><player> has <yellow><amount> <gold>notes, click to view them</click>'
+    note: '<gold>[<player>] <yellow><message> - <yellow><created>'
+    playerNote: '<green>[<player>] <gold>[<actor>] <yellow><message> - <yellow><created>'
+    dateTimeFormat: 'dd-MM-yyyy'
+    notify: '<player> has a new note attached by <actor>: <message>'
     error:
-      notOnline: '&cPlayer must be online to report'
-      cooldown: '&cToo many reports, please wait a while'
-    notify: '&6[player] has been reported by [actor] for &4[reason]'
-    success: '&a[player] has been reported'
-    created: '&6[actor] has reported [player] for &4[reason]'
+      noNotes: '<red><player> has no notes'
+      noOnlineNotes: '<red>No online players have notes'
 
-  reports:
+  report:
+    notify: '<gold><player> has been reported by <actor> for <dark_red><reason>'
     error:
-      noResults: '&cNo reports for [player]'
-    header: '&6Reports for [player]'
+      cooldown: '<red>This player was reported too recently, try again later'
+    assign:
+      player: '<green>Report <id> assigned to <player>'
+      notify: '<green>You have been assigned report <id> by <actor>'
+    unassign:
+      player: '<green>Report <id> unassigned'
+    close:
+      notify:
+        closed: '<green>Report <id> closed by <actor>'
+        command: '<green>Report <id> closed by <actor> with <command>'
+        comment: '<green>Report <id> closed by <actor> with <comment>'
+      dispatch: 'Executing command <command>'
     list:
-      row: '&e[id] [player] &6[reason] [created] &e[actor]'
+      noResults: '<red>No reports found'
+      error:
+        invalidState: '<red>Report state <state> not found'
+      row:
+        dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
+        header: '<yellow>-- Reports (<count>) -- Page (<page>/<maxPage>)'
+        all: '<click:run_command:"/reports info <id>"><hover:show_text:"<gray>Click to view details"><gray>#<id> <yellow>[<state>] <gold>- <created> - <player></hover></click>'
+    tp:
+      error:
+        notFound: '<red>Report not found'
+        worldNotFound: '<red>World <world> could not be found'
+        invalidId: '<red><id> is not a valid report id'
       dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
+      notify:
+        report: '<gray>#<id> <gold><actor> reported <player> for <dark_red><reason><gold> at <created>'
+        location: '<world> - <x>, <y>, <z>'
+    info:
+      error:
+        notFound: '<red>Report not found'
+        invalidId: '<red><id> is not a valid report id'
+      dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
+      notify:
+        report: '<gray>#<id> <gold><actor> reported <player> for <dark_red><reason><gold> at <created>'
+        location: '<world> - <x>, <y>, <z>'
 
-  deleterecord:
-    error:
-      noExists: '&c[id] does not exist'
-    deleted: '&a[id] has been deleted'
+  addnoteall:
+    notify: '<red><player> will have a new attached by <actor>: <message>'
 
-  clear:
-    header:
-      all: '&6Clearing [type] for [player]'
-      single: '&6Clearing [type]'
-    error:
-      noResults: '&cNothing found to delete'
-    notifyDelete: '&6Deleted [sum] [type] for [player]'
+  banlist:
+    header: '<gold>There are <bans> <type> bans:'
 
-  sync:
-    error:
-      inProgress: '&cA sync is already in progress, please wait'
-    started: '&aSync started'
-    finished: '&aSync finished'
+  bmactivity:
+    row:
+      all: '<green>[<white><type><green>] <gold><player><white> - <gold><actor><white> - <yellow><created>'
+      player: '<green>[<white><type><green>] <gold><player><white> - <yellow><created>'
+      dateTimeFormat: 'dd-MM-yyyy HH:mm:ss'
+    noResults: '<red>No results found'
 
-  external:
+  bmdelete:
+    notify: '<green><rows> rows deleted'
     error:
-      notAllowed: '&cExternally synced servers cannot perform this action'
+      invalid: '<red>Invalid type, please choose between banrecords, muterecords, kicks, notes or warnings'
+      invalidId: '<red><id> is not a valid number'
 
-  rollback:
-    error:
-      inProgress: '&cA rollback is already in progress, please wait'
-      noResults: '&cNo results found to rollback'
-    started: '&aRollback started'
-    finished: '&aRollback finished, [sum] rows affected'
+  denyalts:
+    player:
+      disallowed: '<red>The IP address you are joining from is linked to a banned player'
 
-  dwarn:
-    notOwn: '&c[id] was not created by you, unable to delete'
-    noExists: '&c[id] does not exist'
-    deleted: '&aWarning deleted'
+  reasons:
+    row: '<hashtag> = <reason>'
 
-  findAlts:
-    header: 'Possible alts found:'
-    noResults: 'No possible alts found'
+  confirmation:
+    prompt: '<gold>Are you sure you want to <action>? <click:run_command:''/bm confirm''><hover:show_text:''<gray>Click to confirm''><green>[Confirm]</green></hover></click> <click:run_command:''/bm cancel''><hover:show_text:''<gray>Click to cancel''><red>[Cancel]</red></hover></click>'
+    confirmed: '<green>Action confirmed.'
+    cancelled: '<red>Action cancelled.'
+    expired: '<red>No pending action found. It may have expired.'
 
-  update:
-    notify: 'A new version of BanManager is now available'
+  dashboard:
+    header: '<dark_gray><strikethrough>                    </strikethrough><reset> <gold><bold>Staff Dashboard</bold></gold> <dark_gray><strikethrough>                    </strikethrough>'
+    activeBans: '<gray>Active Bans: <white><count>'
+    activeMutes: '<gray>Active Mutes: <white><count>'
+    openReports: '<gray>Open Reports: <white><count> <click:run_command:''/reports 1''><hover:show_text:''<gray>View reports''><dark_aqua>[View]</dark_aqua></hover></click>'
+    recentActivity: '<gray>Recent Activity (24h): <white><count>'
+    footer: '<dark_gray><strikethrough>                                                        </strikethrough>'
+
+  report:
+    actions:
+      assign: '<click:run_command:''/report assign <id>''><hover:show_text:''<gray>Assign to yourself''><dark_aqua>[Assign]</dark_aqua></hover></click>'
+      close: '<click:run_command:''/report close <id>''><hover:show_text:''<gray>Close this report''><green>[Close]</green></hover></click>'
+      tp: '<click:run_command:''/report tp <id>''><hover:show_text:''<gray>Teleport to location''><aqua>[TP]</aqua></hover></click>'
+    feedback:
+      assigned: '<gold>Your report #<id> has been assigned to <actor>'
+      closed: '<gold>Your report #<id> has been closed by <actor>'
diff --git a/e2e/platforms/sponge7/configs/banmanager-webenhancer/messages.yml b/e2e/platforms/sponge7/configs/banmanager-webenhancer/messages.yml
index 5738200..4ea98a0 100644
--- a/e2e/platforms/sponge7/configs/banmanager-webenhancer/messages.yml
+++ b/e2e/platforms/sponge7/configs/banmanager-webenhancer/messages.yml
@@ -1,5 +1,5 @@
 messages:
   pin:
-    notify: '&6Your pin expires in [expires]'
-    pin: '[pin]'
-
+    notify: '<gold>Your pin expires in <expires>'
+    pin: '<pin>'
+    rateLimited: '<red>Please wait <seconds> seconds before generating a new pin'
diff --git a/e2e/platforms/sponge7/configs/banmanager/messages.yml b/e2e/platforms/sponge7/configs/banmanager/messages.yml
index 459dab6..ec9a8a6 100644
--- a/e2e/platforms/sponge7/configs/banmanager/messages.yml
+++ b/e2e/platforms/sponge7/configs/banmanager/messages.yml
@@ -1,16 +1,22 @@
-# BanManager messages configuration for E2E testing
-# Modified to include [pin] placeholder for WebEnhancer testing
+# Message templates use MiniMessage formatting: https://docs.advntr.dev/minimessage/format.html
+# Placeholders use angle brackets, e.g. <reason>, <player>, <ip>, <actor>, <expires>
+
+tokens:
+  appealUrl: 'https://yourdomain.com/appeal'
+  serverName: 'My Server'
+  discordUrl: 'https://discord.gg/example'
+  rulesUrl: 'https://yourdomain.com/rules'
 
 messages:
-  duplicateIP: '&cWarning: [player] has the same IP as the following banned players:\n&6[players]'
-  duplicateIPAlts: '&cWarning: [player] has the same IP as the following players:\n&6[players]'
-  configReloaded: '&aConfiguration reloaded successfully!'
+  duplicateIP: '<red>Warning: <player> has the same IP as the following banned players:\n<gold><players>'
+  duplicateIPAlts: '<red>Warning: <player> has the same IP as the following players:\n<gold><players>'
+  configReloaded: '<green>Configuration reloaded successfully!'
   deniedNotify:
-    player: '&cWarning: [player] attempted to join the server but was denied due to &4[reason]'
-    ip: '&cWarning: [ip] attempted to join the server but was denied due to &4[reason]'
-  deniedMaxIp: '&cToo many players with your ip address online'
-  deniedMultiaccounts: '&cToo many players with your ip address logged in recently'
-  deniedCountry: '&cYou may not connect from your region'
+    player: '<red>Warning: <player> attempted to join the server but was denied due to <dark_red><reason>'
+    ip: '<red>Warning: <ip> attempted to join the server but was denied due to <dark_red><reason>'
+  deniedMaxIp: '<red>Too many players with your ip address online'
+  deniedMultiaccounts: '<red>Too many players with your ip address logged in recently'
+  deniedCountry: '<red>You may not connect from your region'
 
   time:
     now: 'now'
@@ -30,337 +36,442 @@ messages:
     seconds: 'seconds'
     never: 'never'
     error:
-      invalid: '&cYour time length is invalid'
-      limit: '&cYou cannot perform this action for that length of time'
+      invalid: '<red>Your time length is invalid'
+      limit: '<red>You cannot perform this action for that length of time'
 
   none: 'none'
+  # General command text
   sender:
     error:
-      notFound: '&c[player] not found, are you sure they exist?'
-      offline: '&c[player] is offline'
-      noSelf: '&cYou cannot perform that action on yourself!'
-      exception: '&cAn error occured whilst attempting to perform this command. Please check the console for further details.'
-      invalidIp: '&cInvalid IP address, expecting w.x.y.z format'
-      offlinePermission: '&cYou are not allowed to perform this action on an offline player'
-      exempt: '&c[player] is exempt from that action'
-      noPermission: '&cYou do not have permission to perform that action'
-      invalidReason: '&c[reason] is no valid reason.'
-
+      notFound: '<red><player> not found, are you sure they exist?'
+      offline: '<red><player> is offline'
+      noSelf: '<red>You cannot perform that action on yourself!'
+      exception: '<red>An error occured whilst attempting to perform this command. Please check the console for further details.'
+      invalidIp: '<red>Invalid IP address, expecting w.x.y.z format'
+      offlinePermission: '<red>You are not allowed to perform this action on an offline player'
+      ambiguousPlayer: '<red>Multiple players match "<player>". Please use their full name.'
+      exempt: '<red><player> is exempt from that action'
+      noPermission: '<red>You do not have permission to perform that action'
+      invalidReason: '<red><reason> is no valid reason.'
+  # Commands
   alts:
     header: 'Possible alts found:'
+    entry: '<click:run_command:"/bminfo <name>"><name></click>'
+    separator: '<gray>, '
+
+  names:
+    header: 'Known names for <player>:'
+    row: '<yellow><name> <gray>(first: <firstSeen>, last: <lastSeen>)'
+    interactive: '<hover:show_text:"<yellow><name> <gray>(first: <firstSeen>, last: <lastSeen>)"><click:run_command:"/bminfo <name>"><yellow><name></click></hover>'
+    separator: '<gray>, '
+    dateTimeFormat: 'dd-MM-yyyy'
+    none: '<gray>No name history found'
 
   export:
     error:
-      inProgress: '&cAn export is already in progress, please wait'
+      inProgress: '<red>An export is already in progress, please wait'
     player:
-      started: '&aPlayer ban export started'
-      finished: '&aPlayer ban export finished, file [file] created'
+      started: '<green>Player ban export started'
+      finished: '<green>Player ban export finished, file <file> created'
     ip:
-      started: '&aIP ban export started'
-      finished: '&aIP ban export finished, file [file] created'
+      started: '<green>IP ban export started'
+      finished: '<green>IP ban export finished, file <file> created'
 
   import:
     error:
-      inProgress: '&cAn import is already in progress, please wait'
+      inProgress: '<red>An import is already in progress, please wait'
     player:
-      started: '&aPlayer ban import started'
-      finished: '&aPlayer ban import finished'
+      started: '<green>Player ban import started'
+      finished: '<green>Player ban import finished'
     ip:
-      started: '&aIP ban import started'
-      finished: '&aIP ban import finished'
+      started: '<green>IP ban import started'
+      finished: '<green>IP ban import finished'
     advancedban:
-      started: '&aAdvancedBan import started'
-      finished: '&aAdvancedBan import finished'
+      started: '<green>AdvancedBan import started'
+      finished: '<green>AdvancedBan import finished'
     h2:
-      started: '&aH2 import started'
-      finished: '&aH2 import finished, please restart the server'
+      started: '<green>H2 import started'
+      finished: '<green>H2 import finished, please restart the server'
+    litebans:
+      started: '<green>LiteBans import started'
+      finished: '<green>LiteBans import finished'
 
   info:
     error:
-      invalidIndex: '&cInvalid player option used'
-      indexRequired: '&cMultiple players named [name] found, please select a player by providing an index between 1 and [size], e.g. /bminfo [name] 1'
-      index: '&7#[index] - &6[name] - &4[uuid]'
+      invalidIndex: '<red>Invalid player option used'
+      indexRequired: '<red>Multiple players named <name> found, please select a player by providing an index between 1 and <size>, e.g. /bminfo <name> 1'
+      index: '<gray>#<index> - <gold><name> - <dark_red><uuid>'
     stats:
-      player: '&6[player] has been banned [bans] times, muted [mutes] times, kicked [kicks] times and warned [warns] times ([warnPoints] Points), has [notes] notes and been reported [reports] times'
-      ip: '&6This ip has been banned [bans] times, muted [mutes] times and range banned [rangebans] times'
-    connection: '&6Their last connection was with [ip] on [lastSeen]'
-    geoip: 'Country: [country] City: [city]'
+      player: '<gold><player> has been banned <bans> times, muted <mutes> times, kicked <kicks> times and warned <warns>
+      times (<warnPoints> Points), has <notes> notes and been reported <reports> times'
+      ip: '<gold>This ip has been banned <bans> times, muted <mutes> times and range banned <rangebans> times'
+    connection: '<gold>Their last connection was with <ip> on <lastSeen>'
+    geoip: 'Country: <country> City: <city>'
     ban:
-      permanent: '&6Currently banned for &4[reason]&6 by [actor] at [created]'
-      temporary: '&6Currently banned for &4[reason]&6 by [actor] at [created] which expires in [expires]'
+      permanent: '<gold>Currently banned for <dark_red><reason><gold> by <actor> at <created>'
+      temporary: '<gold>Currently banned for <dark_red><reason><gold> by <actor> at <created> which expires in <expires>'
       dateTimeFormat: 'dd-MM-yyyy HH:mm:ss'
     ipban:
-      permanent: '&6Currently banned for &4[reason]&6 by [actor] at [created]'
-      temporary: '&6Currently banned for &4[reason]&6 by [actor] at [created] which expires in [expires]'
+      permanent: '<gold>Currently banned for <dark_red><reason><gold> by <actor> at <created>'
+      temporary: '<gold>Currently banned for <dark_red><reason><gold> by <actor> at <created> which expires in <expires>'
       dateTimeFormat: 'dd-MM-yyyy HH:mm:ss'
     iprangeban:
-      permanent: '&6[from] - [to] banned for &4[reason]&6 by [actor] at [created]'
-      temporary: '&6[from] - [to] banned for &4[reason]&6 by [actor] at [created] which expires in [expires]'
+      permanent: '<gold><from> - <to> banned for <dark_red><reason><gold> by <actor> at <created>'
+      temporary: '<gold><from> - <to> banned for <dark_red><reason><gold> by <actor> at <created> which expires in <expires>'
       dateTimeFormat: 'dd-MM-yyyy HH:mm:ss'
     ipmute:
-      permanent: '&6Currently muted for &4[reason]&6 by [actor] at [created]'
-      temporary: '&6Currently muted for &4[reason]&6 by [actor] at [created] which expires in [expires]'
+      permanent: '<gold>Currently muted for <dark_red><reason><gold> by <actor> at <created>'
+      temporary: '<gold>Currently muted for <dark_red><reason><gold> by <actor> at <created> which expires in <expires>'
       dateTimeFormat: 'dd-MM-yyyy HH:mm:ss'
     mute:
-      permanent: '&6Currently muted for &4[reason]&6 by [actor] at [created]'
-      temporary: '&6Currently muted for &4[reason]&6 by [actor] at [created] which expires in [expires]'
+      permanent: '<gold>Currently muted for <dark_red><reason><gold> by <actor> at <created>'
+      temporary: '<gold>Currently muted for <dark_red><reason><gold> by <actor> at <created> which expires in <expires>'
+      temporaryOnline: '<gold>Currently muted for <dark_red><reason><gold> by <actor> at <created> which expires in <expires> (online time)'
+      temporaryOnlinePaused: '<gold>Currently muted for <dark_red><reason><gold> by <actor> at <created> with <remaining> remaining (online time, paused)'
       dateTimeFormat: 'dd-MM-yyyy HH:mm:ss'
     website:
-      player: 'https://yourdomain.com/player/[uuid]'
-      ip: 'http://yourdomain.com/index.php?action=viewip&ip=[ip]&server=0'
+      player: 'https://yourdomain.com/player/<uuid>'
+      ip: 'http://yourdomain.com/index.php?action=viewip&ip=<ip>&server=0'
     history:
-      row: '&7#[id] &a[&f[type]&a] &6[actor]&f [meta] [reason] - &e[created]'
+      row: '<gray>#<id> <green>[<white><type><green>] <gold><actor><white> <meta> <reason> - <yellow><created>'
       dateTimeFormat: 'dd-MM-yyyy HH:mm:ss'
-      noResults: '&cNo results found'
+      noResults: '<red>No results found'
     ips:
-      row: '&e[ip] - &6[join] - [leave]'
+      row: '<yellow><ip> - <gold><join> - <leave>'
       dateTimeFormat: 'dd-MM-yyyy HH:mm:ss'
 
   kick:
     player:
-      noReason: '&6You have been kicked'
-      reason: '&6You have been kicked for &4[reason]'
+      noReason: '<gold>You have been kicked'
+      reason: '<gold>You have been kicked for <dark_red><reason>'
     notify:
-      noReason: '&6[player] has been kicked by [actor]'
-      reason: '&6[player] has been kicked by [actor] for &4[reason]'
+      noReason: '<gold><player> has been kicked by <actor>'
+      reason: '<gold><player> has been kicked by <actor> for <dark_red><reason>'
 
   kickall:
     player:
-      noReason: '&6You have been kicked'
-      reason: '&6You have been kicked for &4[reason]'
+      noReason: '<gold>You have been kicked'
+      reason: '<gold>You have been kicked for <dark_red><reason>'
     notify:
-      noReason: 'All players have been kicked by [actor]'
-      reason: 'All players have been kicked by [actor] for &4[reason]'
+      noReason: 'All players have been kicked by <actor>'
+      reason: 'All players have been kicked by <actor> for <dark_red><reason>'
 
-  # Modified for WebEnhancer E2E testing - includes [pin] placeholder
   ban:
     player:
-      disallowed: '&6You have been banned from this server for &4[reason]&6. Your appeal pin is [pin]'
-      kick: '&6You have been banned permanently for &4[reason]&6. Your appeal pin is [pin]'
+      disallowed: '<red><bold>You are banned from this server</bold></red>\n \n<gray>Reason: <white><reason>\n<gray>Banned by: <white><actor>\n<gray>Date: <white><created>\n \n<gold>Appeal at <appealUrl>'
+      kick: '<red><bold>You have been banned</bold></red>\n \n<gray>Reason: <white><reason>\n<gray>Banned by: <white><actor>'
       dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
-    notify: '&6[player] has been permanently banned by [actor] for &4[reason]'
+    notify: '<gold><player> has been permanently banned by <actor> for <dark_red><reason> <click:run_command:''/bminfo <player>''><hover:show_text:''<gray>View player info''><dark_aqua>[Info]</dark_aqua></hover></click> <click:run_command:''/unban <player>''><hover:show_text:''<gray>Unban player''><dark_aqua>[Unban]</dark_aqua></hover></click>'
     error:
-      exists: '&c[player] is already banned'
-      cooldown: '&cThis player was banned too recently, try again later'
+      exists: '<red><player> is already banned'
+      cooldown: '<red>This player was banned too recently, try again later'
 
   banall:
-    notify: '&6[player] will be permanently banned by [actor] for &4[reason]'
+    notify: '<gold><player> will be permanently banned by <actor> for <dark_red><reason>'
 
   tempban:
     player:
-      disallowed: '&6You have been temporarily banned from this server for &4[reason] \n&6It expires in [expires]. Your appeal pin is [pin]'
-      kick: '&6You have been temporarily banned for &4[reason]&6. Your appeal pin is [pin]'
+      disallowed: '<red><bold>You are temporarily banned from this server</bold></red>\n \n<gray>Reason: <white><reason>\n<gray>Banned by: <white><actor>\n<gray>Expires: <white><expires>\n<gray>Date: <white><created>\n \n<gold>Appeal at <appealUrl>'
+      kick: '<red><bold>You have been temporarily banned</bold></red>\n \n<gray>Reason: <white><reason>\n<gray>Banned by: <white><actor>\n<gray>Expires: <white><expires>'
       dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
-    notify: '&6[player] has been temporarily banned for [expires] by [actor] for &4[reason]'
+    notify: '<gold><player> has been temporarily banned for <expires> by <actor> for <dark_red><reason> <click:run_command:''/bminfo <player>''><hover:show_text:''<gray>View player info''><dark_aqua>[Info]</dark_aqua></hover></click> <click:run_command:''/unban <player>''><hover:show_text:''<gray>Unban player''><dark_aqua>[Unban]</dark_aqua></hover></click>'
 
   tempbanall:
-    notify: '&6[player] will be temporarily banned for [expires] by [actor] for &4[reason]'
+    notify: '<gold><player> will be temporarily banned for <expires> by <actor> for <dark_red><reason>'
 
   unban:
-    notify: '&6[player] has been unbanned by [actor]'
+    notify: '<gold><player> has been unbanned by <actor>'
     error:
-      noExists: '&c[player] is not banned'
-      notOwn: '&c[player] was not banned by you, unable to unban'
+      noExists: '<red><player> is not banned'
+      notOwn: '<red><player> was not banned by you, unable to unban'
 
   unbanall:
-    notify: '&6[player] will be unbanned by [actor]'
+    notify: '<gold><player> will be unbanned by <actor>'
 
   mute:
     player:
-      blocked: '&cYou may not use the [command] command whilst muted!'
-      disallowed: '&6You have been permanently muted for &4[reason] &6by [actor]'
-      broadcast: '&4[Muted] [player]&7 [message]'
-    notify: '&6[player] has been permanently muted by [actor] for &4[reason]'
+      blocked: '<red>You may not use the <command> command whilst muted!'
+      disallowed: '<gold>You have been permanently muted for <dark_red><reason> <gold>by <actor>'
+      broadcast: '<dark_red>[Muted] <player><gray> <message>'
+    notify: '<gold><player> has been permanently muted by <actor> for <dark_red><reason> <click:run_command:''/bminfo <player>''><hover:show_text:''<gray>View player info''><dark_aqua>[Info]</dark_aqua></hover></click> <click:run_command:''/unmute <player>''><hover:show_text:''<gray>Unmute player''><dark_aqua>[Unmute]</dark_aqua></hover></click>'
     error:
-      exists: '&c[player] is already muted'
-      cooldown: '&cThis player was muted too recently, try again later'
+      exists: '<red><player> is already muted'
+      cooldown: '<red>This player was muted too recently, try again later'
 
   muteip:
     ip:
-      disallowed: '&6You have been permanently muted for &4[reason] &6by [actor]'
-      broadcast: '&4[Muted] [player]&7 [message]'
-    notify: '&6[ip] ([players]) have been permanently muted by [actor] for &4[reason]'
+      disallowed: '<gold>You have been permanently muted for <dark_red><reason> <gold>by <actor>'
+      broadcast: '<dark_red>[Muted] <player><gray> <message>'
+    notify: '<gold><ip> (<players>) have been permanently muted by <actor> for <dark_red><reason>'
     error:
-      exists: '&c[ip] is already muted'
+      exists: '<red><ip> is already muted'
 
   muteall:
-    notify: '&6[player] will be permanently muted by [actor] for &4[reason]'
+    notify: '<gold><player> will be permanently muted by <actor> for <dark_red><reason>'
 
   tempmute:
     player:
-      disallowed: '&6You have been temporarily muted for &4[reason] &6by [actor] which expires in [expires]'
-    notify: '&6[player] has been temporarily muted for [expires] by [actor] for &4[reason]'
+      disallowed: '<gold>You have been temporarily muted for <dark_red><reason> <gold>by <actor> which expires in <expires>'
+      disallowedOnline: '<gold>You have been temporarily muted for <dark_red><reason> <gold>by <actor> which expires in <expires> (online time)'
+    notify: '<gold><player> has been temporarily muted for <expires> by <actor> for <dark_red><reason> <click:run_command:''/bminfo <player>''><hover:show_text:''<gray>View player info''><dark_aqua>[Info]</dark_aqua></hover></click> <click:run_command:''/unmute <player>''><hover:show_text:''<gray>Unmute player''><dark_aqua>[Unmute]</dark_aqua></hover></click>'
+    notifyOnline: '<gold><player> has been temporarily muted for <expires> (online time) by <actor> for <dark_red><reason>'
     error:
-      exists: '&c[player] is already muted'
+      exists: '<red><player> is already muted'
 
   tempmuteip:
     ip:
-      disallowed: '&6You have been temporarily muted for &4[reason] &6by [actor] which expires in [expires]'
-    notify: '&6[ip] ([players]) have been temporarily muted for [expires] by [actor] for &4[reason]'
+      disallowed: '<gold>You have been temporarily muted for <dark_red><reason> <gold>by <actor> which expires in <expires>'
+    notify: '<gold><ip> (<players>) have been temporarily muted for <expires> by <actor> for <dark_red><reason>'
     error:
-      exists: '&c[ip] is already muted'
+      exists: '<red><ip> is already muted'
 
   tempmuteall:
-    notify: '&6[player] will be temporarily muted for [expires] by [actor] for &4[reason]'
+    notify: '<gold><player> will be temporarily muted for <expires> by <actor> for <dark_red><reason>'
 
   unmute:
-    notify: '&6[player] has been unmuted by [actor]'
+    notify: '<gold><player> has been unmuted by <actor>'
+    player: '<gold>You have been unmuted by <actor>'
     error:
-      noExists: '&c[player] is not muted'
-      notOwn: '&c[player] was not muted by you, unable to unmute'
-
-  unmuteall:
-    notify: '&6[player] will be unmuted by [actor]'
+      noExists: '<red><player> is not muted'
+      notOwn: '<red><player> was not muted by you, unable to unmute'
 
   unmuteip:
-    notify: '&6[ip] ([players]) have been unmuted by [actor]'
+    notify: '<gold><ip> has been unmuted by <actor>'
     error:
-      noExists: '&c[ip] is not muted'
-      notOwn: '&c[ip] was not muted by you, unable to unmute'
+      noExists: '<red><ip> is not muted'
+      notOwn: '<red><ip> was not muted by you, unable to unmute'
 
-  warn:
-    player:
-      warned: '&cYou have been warned for &4[reason] &cby [actor]'
-    notify: '&6[player] has been warned by [actor] for &4[reason]'
-    error:
-      exists: '&c[player] has already been warned for that reason'
-      cooldown: '&cThis player was warned too recently, try again later'
+  unmuteall:
+    notify: '<gold><player> will be unmuted by <actor>'
 
-  tempwarn:
-    player:
-      warned: '&cYou have been warned for &4[reason] &cby [actor] which expires in [expires]'
-    notify: '&6[player] has been warned for [expires] by [actor] for &4[reason]'
+  banname:
+    name:
+      disallowed: '<gold>You have been banned from this server for <dark_red><reason>'
+      kick: '<gold>You have been banned permanently for <dark_red><reason>'
+      dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
+    notify: '<gold>Name <name> has been permanently banned by <actor> for <dark_red><reason>'
     error:
-      exists: '&c[player] has already been warned for that reason'
+      exists: '<red>Name <name> is already banned'
 
-  warnall:
-    notify: '&6[player] will be warned by [actor] for &4[reason]'
+  tempbanname:
+    name:
+      disallowed: '<gold>You have been banned from this server for <dark_red><reason> \n<gold>It expires in <expires>'
+      kick: '<gold>You have been temporarily banned for <dark_red><reason>'
+      dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
+    notify: '<gold>Name <name> has been temporarily banned for <expires> by <actor> for <dark_red><reason>'
 
-  addnote:
-    notify: '&6Note added for [player] by [actor]'
+  unbanname:
+    notify: '<gold>Name <name> has been unbanned by <actor>'
     error:
-      cooldown: '&cA note was added for this player too recently, try again later'
+      noExists: '<red>Name <name> is not banned'
 
-  notes:
+  banip:
+    ip:
+      disallowed: '<gold>You have been banned from this server for <dark_red><reason>'
+      kick: '<gold>You have been banned permanently for <dark_red><reason>'
+      dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
+    notify: '<gold><ip> (<players>) has been permanently banned by <actor> for <dark_red><reason>'
     error:
-      noResults: '&cNo notes for [player]'
-      noResults.uuid: '&cNo notes for player'
-    header: '&6Notes for [player]'
-    row: '&6[created] &f[message]'
-    dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
+      exists: '<red><ip> is already banned'
+      cooldown: '<red>This ip was banned too recently, try again later'
 
-  bmactivity:
+  baniprange:
     error:
-      noResults: '&cNo activity found'
-    header: '&6Activity for [player]'
-    row: '&7#[id] &a[&f[type]&a] &6[player]&f [meta] [reason] - &e[created]'
-    dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
+      invalid: '<red>Invalid range, please use cidr notation 192.168.0.1/16 or wildcard 192.168.*.*'
+      minMax: '<red>Range must be lowest to highest'
+      exists: '<red>A ban containing those ranges already exists'
+    ip:
+      disallowed: '<gold>You have been banned from this server for <dark_red><reason>'
+      kick: '<gold>You have been banned permanently for <dark_red><reason>'
+      dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
+    notify: '<gold><from> - <to> have been banned by <actor>'
 
-  banip:
+  tempbaniprange:
+    notify: '<gold><from> - <to> has been temporarily banned for <expires> by <actor>'
     ip:
-      disallowed: '&6You have been banned from this server for &4[reason]&6. Your appeal pin is [pin]'
-      kick: '&6You have been banned permanently for &4[reason]'
-    notify: '&6[ip] has been permanently banned by [actor] for &4[reason]'
-    error:
-      exists: '&c[ip] is already banned'
-      cooldown: '&cThis ip was banned too recently, try again later'
+      disallowed: '<gold>You have been banned from this server for <dark_red><reason> \n<gold>It expires in <expires>'
+      kick: '<gold>You have been temporarily banned for <expires> by <actor> for <dark_red><reason>'
+      dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
+
+  unbaniprange:
+    notify: '<gold><from> - <to> has been unbanned by <actor>'
+
+  banipall:
+    notify: '<gold><ip> will be permanently banned by <actor> for <dark_red><reason>'
 
   tempbanip:
     ip:
-      disallowed: '&6You have been temporarily banned from this server for &4[reason] \n&6It expires in [expires]. Your appeal pin is [pin]'
-      kick: '&6You have been temporarily banned for &4[reason]'
-    notify: '&6[ip] has been temporarily banned for [expires] by [actor] for &4[reason]'
+      disallowed: '<gold>You have been banned from this server for <dark_red><reason> \n<gold>It expires in <expires>'
+      kick: '<gold>You have been temporarily banned for <dark_red><reason>'
+      dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
+    notify: '<gold><ip> (<players>) has been temporarily banned for <expires> by <actor> for <dark_red><reason>'
+
+  tempbanipall:
+    notify: '<gold><ip> will be temporarily banned for <expires> by <actor> for <dark_red><reason>'
 
   unbanip:
-    notify: '&6[ip] has been unbanned by [actor]'
+    notify: '<gold><ip> has been unbanned by <actor>'
     error:
-      noExists: '&c[ip] is not banned'
-      notOwn: '&c[ip] was not banned by you, unable to unban'
+      noExists: '<red><ip> is not banned'
+      notOwn: '<red><ip> was not banned by you, unable to unban'
 
-  baniprange:
-    notify: '&6[from] - [to] has been permanently banned by [actor] for &4[reason]'
+  unbanipall:
+    notify: '<gold><ip> will be unbanned by <actor>'
+
+  warn:
+    player:
+      warned: '<gold>You have been warned by <actor> for <dark_red><reason>'
+      disallowed:
+        header: '<red>You may not speak until you have accepted your most recent warning. Please type the following:'
+        reason: '<gold><reason>'
+        removed: '<green>Thank you for your understanding, you may now speak again'
+    notify: '<gold><player> has been warned by <actor> for <dark_red><reason> <click:run_command:''/bminfo <player>''><hover:show_text:''<gray>View player info''><dark_aqua>[Info]</dark_aqua></hover></click>'
     error:
-      exists: '&c[from] - [to] is already banned'
-      cooldown: '&cThis ip range was banned too recently, try again later'
+      cooldown: '<red>This player was warned too recently, try again later'
 
-  tempbaniprange:
-    notify: '&6[from] - [to] has been temporarily banned for [expires] by [actor] for &4[reason]'
+  tempwarn:
+    player:
+      warned: '<gold>You have been warned for <expires> by <actor> for <dark_red><reason>'
+    notify: '<gold><player> has been warned for <expires> by <actor> for <dark_red><reason> <click:run_command:''/bminfo <player>''><hover:show_text:''<gray>View player info''><dark_aqua>[Info]</dark_aqua></hover></click>'
 
-  unbaniprange:
-    notify: '&6[from] - [to] has been unbanned by [actor]'
+  dwarn:
+    player:
+      notify: '<gold>Your most recent warning has been deleted by <dark_red><actor>'
+    notify: '<red>The most recent warning for <player> has been deleted'
     error:
-      noExists: '&c[from] - [to] is not banned'
-      notOwn: '&c[from] - [to] was not banned by you, unable to unban'
+      noWarnings: '<red><player> has no warnings to delete'
 
-  banname:
-    disallowed: '&6You may not use the name [name] on this server'
-    notify: '&6[name] has been permanently banned by [actor] for &4[reason]'
+  bmclear:
+    notify: '<red><player> has had their <type> cleared'
+    error:
+      invalid: '<red>Invalid type, please choose between banrecords, muterecords, kicks, notes or warnings'
+
+  bmutils:
+    missingplayers:
+      notify: '<red><amount> missing players added'
+      noneFound: '<green>0 missing players found'
+      found: '<red><amount> missing player data found. Fixing...'
+      error:
+        failedLookup: '<red>Failed to lookup player <uuid>, check server logs'
+      complete: '<green><amount> players resolved, please restart your server for failed punishments to take affect'
+    duplicates:
+      lookup:
+        notFound: '<green>No duplicate player names found'
+      error:
+        invalidName: '<red>Invalid name, must be 16 characters or less and contain only letters, numbers and an underscore'
+        nameExists: '<red>A player with that name already exists'
+      success: '<green>Player name set to <player> successfully'
+
+  bmrollback:
+    notify: '<red><player> has had their <type> actions undone'
     error:
-      exists: '&c[name] is already banned'
+      invalid: '<red>Invalid type <type>, please choose between [types]'
 
-  tempbanname:
-    notify: '&6[name] has been temporarily banned for [expires] by [actor] for &4[reason]'
+  sync:
+    player:
+      started: '<green>Starting force <type> synchronisation'
+      finished: '<green>Forced <type> synchronisation complete'
 
-  unbanname:
-    notify: '&6[name] has been unbanned by [actor]'
-    error:
-      noExists: '&c[name] is not banned'
-      notOwn: '&c[name] was not banned by you, unable to unban'
+  update:
+    notify: '<gold>[BanManager] <green>An update is available'
 
-  report:
+  notes:
+    header: '<gold><player> has the following notes:'
+    joinAmount: '<click:run_command:"/notes <player>"><gold><player> has <yellow><amount> <gold>notes, click to view them</click>'
+    note: '<gold>[<player>] <yellow><message> - <yellow><created>'
+    playerNote: '<green>[<player>] <gold>[<actor>] <yellow><message> - <yellow><created>'
+    dateTimeFormat: 'dd-MM-yyyy'
+    notify: '<player> has a new note attached by <actor>: <message>'
     error:
-      notOnline: '&cPlayer must be online to report'
-      cooldown: '&cToo many reports, please wait a while'
-    notify: '&6[player] has been reported by [actor] for &4[reason]'
-    success: '&a[player] has been reported'
-    created: '&6[actor] has reported [player] for &4[reason]'
+      noNotes: '<red><player> has no notes'
+      noOnlineNotes: '<red>No online players have notes'
 
-  reports:
+  report:
+    notify: '<gold><player> has been reported by <actor> for <dark_red><reason>'
     error:
-      noResults: '&cNo reports for [player]'
-    header: '&6Reports for [player]'
+      cooldown: '<red>This player was reported too recently, try again later'
+    assign:
+      player: '<green>Report <id> assigned to <player>'
+      notify: '<green>You have been assigned report <id> by <actor>'
+    unassign:
+      player: '<green>Report <id> unassigned'
+    close:
+      notify:
+        closed: '<green>Report <id> closed by <actor>'
+        command: '<green>Report <id> closed by <actor> with <command>'
+        comment: '<green>Report <id> closed by <actor> with <comment>'
+      dispatch: 'Executing command <command>'
     list:
-      row: '&e[id] [player] &6[reason] [created] &e[actor]'
+      noResults: '<red>No reports found'
+      error:
+        invalidState: '<red>Report state <state> not found'
+      row:
+        dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
+        header: '<yellow>-- Reports (<count>) -- Page (<page>/<maxPage>)'
+        all: '<click:run_command:"/reports info <id>"><hover:show_text:"<gray>Click to view details"><gray>#<id> <yellow>[<state>] <gold>- <created> - <player></hover></click>'
+    tp:
+      error:
+        notFound: '<red>Report not found'
+        worldNotFound: '<red>World <world> could not be found'
+        invalidId: '<red><id> is not a valid report id'
       dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
+      notify:
+        report: '<gray>#<id> <gold><actor> reported <player> for <dark_red><reason><gold> at <created>'
+        location: '<world> - <x>, <y>, <z>'
+    info:
+      error:
+        notFound: '<red>Report not found'
+        invalidId: '<red><id> is not a valid report id'
+      dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
+      notify:
+        report: '<gray>#<id> <gold><actor> reported <player> for <dark_red><reason><gold> at <created>'
+        location: '<world> - <x>, <y>, <z>'
 
-  deleterecord:
-    error:
-      noExists: '&c[id] does not exist'
-    deleted: '&a[id] has been deleted'
+  addnoteall:
+    notify: '<red><player> will have a new attached by <actor>: <message>'
 
-  clear:
-    header:
-      all: '&6Clearing [type] for [player]'
-      single: '&6Clearing [type]'
-    error:
-      noResults: '&cNothing found to delete'
-    notifyDelete: '&6Deleted [sum] [type] for [player]'
+  banlist:
+    header: '<gold>There are <bans> <type> bans:'
 
-  sync:
-    error:
-      inProgress: '&cA sync is already in progress, please wait'
-    started: '&aSync started'
-    finished: '&aSync finished'
+  bmactivity:
+    row:
+      all: '<green>[<white><type><green>] <gold><player><white> - <gold><actor><white> - <yellow><created>'
+      player: '<green>[<white><type><green>] <gold><player><white> - <yellow><created>'
+      dateTimeFormat: 'dd-MM-yyyy HH:mm:ss'
+    noResults: '<red>No results found'
 
-  external:
+  bmdelete:
+    notify: '<green><rows> rows deleted'
     error:
-      notAllowed: '&cExternally synced servers cannot perform this action'
+      invalid: '<red>Invalid type, please choose between banrecords, muterecords, kicks, notes or warnings'
+      invalidId: '<red><id> is not a valid number'
 
-  rollback:
-    error:
-      inProgress: '&cA rollback is already in progress, please wait'
-      noResults: '&cNo results found to rollback'
-    started: '&aRollback started'
-    finished: '&aRollback finished, [sum] rows affected'
+  denyalts:
+    player:
+      disallowed: '<red>The IP address you are joining from is linked to a banned player'
 
-  dwarn:
-    notOwn: '&c[id] was not created by you, unable to delete'
-    noExists: '&c[id] does not exist'
-    deleted: '&aWarning deleted'
+  reasons:
+    row: '<hashtag> = <reason>'
 
-  findAlts:
-    header: 'Possible alts found:'
-    noResults: 'No possible alts found'
+  confirmation:
+    prompt: '<gold>Are you sure you want to <action>? <click:run_command:''/bm confirm''><hover:show_text:''<gray>Click to confirm''><green>[Confirm]</green></hover></click> <click:run_command:''/bm cancel''><hover:show_text:''<gray>Click to cancel''><red>[Cancel]</red></hover></click>'
+    confirmed: '<green>Action confirmed.'
+    cancelled: '<red>Action cancelled.'
+    expired: '<red>No pending action found. It may have expired.'
 
-  update:
-    notify: 'A new version of BanManager is now available'
+  dashboard:
+    header: '<dark_gray><strikethrough>                    </strikethrough><reset> <gold><bold>Staff Dashboard</bold></gold> <dark_gray><strikethrough>                    </strikethrough>'
+    activeBans: '<gray>Active Bans: <white><count>'
+    activeMutes: '<gray>Active Mutes: <white><count>'
+    openReports: '<gray>Open Reports: <white><count> <click:run_command:''/reports 1''><hover:show_text:''<gray>View reports''><dark_aqua>[View]</dark_aqua></hover></click>'
+    recentActivity: '<gray>Recent Activity (24h): <white><count>'
+    footer: '<dark_gray><strikethrough>                                                        </strikethrough>'
+
+  report:
+    actions:
+      assign: '<click:run_command:''/report assign <id>''><hover:show_text:''<gray>Assign to yourself''><dark_aqua>[Assign]</dark_aqua></hover></click>'
+      close: '<click:run_command:''/report close <id>''><hover:show_text:''<gray>Close this report''><green>[Close]</green></hover></click>'
+      tp: '<click:run_command:''/report tp <id>''><hover:show_text:''<gray>Teleport to location''><aqua>[TP]</aqua></hover></click>'
+    feedback:
+      assigned: '<gold>Your report #<id> has been assigned to <actor>'
+      closed: '<gold>Your report #<id> has been closed by <actor>'
diff --git a/e2e/platforms/velocity/configs/banmanager-webenhancer/messages.yml b/e2e/platforms/velocity/configs/banmanager-webenhancer/messages.yml
index 59fdb26..4ea98a0 100644
--- a/e2e/platforms/velocity/configs/banmanager-webenhancer/messages.yml
+++ b/e2e/platforms/velocity/configs/banmanager-webenhancer/messages.yml
@@ -1,4 +1,5 @@
 messages:
   pin:
-    notify: '&6Your pin expires in [expires]'
-    pin: '[pin]'
+    notify: '<gold>Your pin expires in <expires>'
+    pin: '<pin>'
+    rateLimited: '<red>Please wait <seconds> seconds before generating a new pin'
diff --git a/e2e/platforms/velocity/configs/banmanager/messages.yml b/e2e/platforms/velocity/configs/banmanager/messages.yml
index 5bacf5c..ec9a8a6 100644
--- a/e2e/platforms/velocity/configs/banmanager/messages.yml
+++ b/e2e/platforms/velocity/configs/banmanager/messages.yml
@@ -1,413 +1,477 @@
-# Variables
-# [reason] = Ban/Mute reason
-# [player] = The name of the player
-# [ip] = The banned ip
-# [actor] = Who banned/muted
-# [expires] = How long until the ban/mute ends
+# Message templates use MiniMessage formatting: https://docs.advntr.dev/minimessage/format.html
+# Placeholders use angle brackets, e.g. <reason>, <player>, <ip>, <actor>, <expires>
+
+tokens:
+  appealUrl: 'https://yourdomain.com/appeal'
+  serverName: 'My Server'
+  discordUrl: 'https://discord.gg/example'
+  rulesUrl: 'https://yourdomain.com/rules'
 
 messages:
-  duplicateIP: '&cWarning: [player] has the same IP as the following banned players:\n&6[players]'
-  duplicateIPAlts: '&cWarning: [player] has the same IP as the following players:\n&6[players]'
-  configReloaded: '&aConfiguration reloaded successfully!'
+  duplicateIP: '<red>Warning: <player> has the same IP as the following banned players:\n<gold><players>'
+  duplicateIPAlts: '<red>Warning: <player> has the same IP as the following players:\n<gold><players>'
+  configReloaded: '<green>Configuration reloaded successfully!'
   deniedNotify:
-    player: '&cWarning: [player] attempted to join the server but was denied due to
-      &4[reason]'
-    ip: '&cWarning: [ip] attempted to join the server but was denied due to &4[reason]'
-  deniedMaxIp: '&cToo many players with your ip address online'
-  deniedMultiaccounts: '&cToo many players with your ip address logged in recently'
-  deniedCountry: '&cYou may not connect from your region'
+    player: '<red>Warning: <player> attempted to join the server but was denied due to <dark_red><reason>'
+    ip: '<red>Warning: <ip> attempted to join the server but was denied due to <dark_red><reason>'
+  deniedMaxIp: '<red>Too many players with your ip address online'
+  deniedMultiaccounts: '<red>Too many players with your ip address logged in recently'
+  deniedCountry: '<red>You may not connect from your region'
+
   time:
-    now: now
-    year: year
-    years: years
-    month: month
-    months: months
-    week: week
-    weeks: weeks
-    day: day
-    days: days
-    hour: hour
-    hours: hours
-    minute: minute
-    minutes: minutes
-    second: second
-    seconds: seconds
-    never: never
+    now: 'now'
+    year: 'year'
+    years: 'years'
+    month: 'month'
+    months: 'months'
+    week: 'week'
+    weeks: 'weeks'
+    day: 'day'
+    days: 'days'
+    hour: 'hour'
+    hours: 'hours'
+    minute: 'minute'
+    minutes: 'minutes'
+    second: 'second'
+    seconds: 'seconds'
+    never: 'never'
     error:
-      invalid: '&cYour time length is invalid'
-      limit: '&cYou cannot perform this action for that length of time'
-  none: none
+      invalid: '<red>Your time length is invalid'
+      limit: '<red>You cannot perform this action for that length of time'
+
+  none: 'none'
+  # General command text
   sender:
     error:
-      notFound: '&c[player] not found, are you sure they exist?'
-      offline: '&c[player] is offline'
-      noSelf: '&cYou cannot perform that action on yourself!'
-      exception: '&cAn error occured whilst attempting to perform this command. Please
-        check the console for further details.'
-      invalidIp: '&cInvalid IP address, expecting w.x.y.z format'
-      offlinePermission: '&cYou are not allowed to perform this action on an offline
-        player'
-      exempt: '&c[player] is exempt from that action'
-      noPermission: '&cYou do not have permission to perform that action'
-      invalidReason: '&c[reason] is no valid reason.'
+      notFound: '<red><player> not found, are you sure they exist?'
+      offline: '<red><player> is offline'
+      noSelf: '<red>You cannot perform that action on yourself!'
+      exception: '<red>An error occured whilst attempting to perform this command. Please check the console for further details.'
+      invalidIp: '<red>Invalid IP address, expecting w.x.y.z format'
+      offlinePermission: '<red>You are not allowed to perform this action on an offline player'
+      ambiguousPlayer: '<red>Multiple players match "<player>". Please use their full name.'
+      exempt: '<red><player> is exempt from that action'
+      noPermission: '<red>You do not have permission to perform that action'
+      invalidReason: '<red><reason> is no valid reason.'
+  # Commands
   alts:
     header: 'Possible alts found:'
+    entry: '<click:run_command:"/bminfo <name>"><name></click>'
+    separator: '<gray>, '
+
+  names:
+    header: 'Known names for <player>:'
+    row: '<yellow><name> <gray>(first: <firstSeen>, last: <lastSeen>)'
+    interactive: '<hover:show_text:"<yellow><name> <gray>(first: <firstSeen>, last: <lastSeen>)"><click:run_command:"/bminfo <name>"><yellow><name></click></hover>'
+    separator: '<gray>, '
+    dateTimeFormat: 'dd-MM-yyyy'
+    none: '<gray>No name history found'
+
   export:
     error:
-      inProgress: '&cAn export is already in progress, please wait'
+      inProgress: '<red>An export is already in progress, please wait'
     player:
-      started: '&aPlayer ban export started'
-      finished: '&aPlayer ban export finished, file [file] created'
+      started: '<green>Player ban export started'
+      finished: '<green>Player ban export finished, file <file> created'
     ip:
-      started: '&aIP ban export started'
-      finished: '&aIP ban export finished, file [file] created'
+      started: '<green>IP ban export started'
+      finished: '<green>IP ban export finished, file <file> created'
+
   import:
     error:
-      inProgress: '&cAn import is already in progress, please wait'
+      inProgress: '<red>An import is already in progress, please wait'
     player:
-      started: '&aPlayer ban import started'
-      finished: '&aPlayer ban import finished'
+      started: '<green>Player ban import started'
+      finished: '<green>Player ban import finished'
     ip:
-      started: '&aIP ban import started'
-      finished: '&aIP ban import finished'
+      started: '<green>IP ban import started'
+      finished: '<green>IP ban import finished'
     advancedban:
-      started: '&aAdvancedBan import started'
-      finished: '&aAdvancedBan import finished'
+      started: '<green>AdvancedBan import started'
+      finished: '<green>AdvancedBan import finished'
     h2:
-      started: '&aH2 import started'
-      finished: '&aH2 import finished, please restart the server'
+      started: '<green>H2 import started'
+      finished: '<green>H2 import finished, please restart the server'
+    litebans:
+      started: '<green>LiteBans import started'
+      finished: '<green>LiteBans import finished'
+
   info:
     error:
-      invalidIndex: '&cInvalid player option used'
-      indexRequired: '&cMultiple players named [name] found, please select a player
-        by providing an index between 1 and [size], e.g. /bminfo [name] 1'
-      index: '&7#[index] - &6[name] - &4[uuid]'
+      invalidIndex: '<red>Invalid player option used'
+      indexRequired: '<red>Multiple players named <name> found, please select a player by providing an index between 1 and <size>, e.g. /bminfo <name> 1'
+      index: '<gray>#<index> - <gold><name> - <dark_red><uuid>'
     stats:
-      player: '&6[player] has been banned [bans] times, muted [mutes] times, kicked
-        [kicks] times and warned [warns] times ([warnPoints] Points), has [notes]
-        notes and been reported [reports] times'
-      ip: '&6This ip has been banned [bans] times, muted [mutes] times and range banned
-        [rangebans] times'
-    connection: '&6Their last connection was with [ip] on [lastSeen]'
-    geoip: 'Country: [country] City: [city]'
+      player: '<gold><player> has been banned <bans> times, muted <mutes> times, kicked <kicks> times and warned <warns>
+      times (<warnPoints> Points), has <notes> notes and been reported <reports> times'
+      ip: '<gold>This ip has been banned <bans> times, muted <mutes> times and range banned <rangebans> times'
+    connection: '<gold>Their last connection was with <ip> on <lastSeen>'
+    geoip: 'Country: <country> City: <city>'
     ban:
-      permanent: '&6Currently banned for &4[reason]&6 by [actor] at [created]'
-      temporary: '&6Currently banned for &4[reason]&6 by [actor] at [created] which
-        expires in [expires]'
-      dateTimeFormat: dd-MM-yyyy HH:mm:ss
+      permanent: '<gold>Currently banned for <dark_red><reason><gold> by <actor> at <created>'
+      temporary: '<gold>Currently banned for <dark_red><reason><gold> by <actor> at <created> which expires in <expires>'
+      dateTimeFormat: 'dd-MM-yyyy HH:mm:ss'
     ipban:
-      permanent: '&6Currently banned for &4[reason]&6 by [actor] at [created]'
-      temporary: '&6Currently banned for &4[reason]&6 by [actor] at [created] which
-        expires in [expires]'
-      dateTimeFormat: dd-MM-yyyy HH:mm:ss
+      permanent: '<gold>Currently banned for <dark_red><reason><gold> by <actor> at <created>'
+      temporary: '<gold>Currently banned for <dark_red><reason><gold> by <actor> at <created> which expires in <expires>'
+      dateTimeFormat: 'dd-MM-yyyy HH:mm:ss'
     iprangeban:
-      permanent: '&6[from] - [to] banned for &4[reason]&6 by [actor] at [created]'
-      temporary: '&6[from] - [to] banned for &4[reason]&6 by [actor] at [created]
-        which expires in [expires]'
-      dateTimeFormat: dd-MM-yyyy HH:mm:ss
+      permanent: '<gold><from> - <to> banned for <dark_red><reason><gold> by <actor> at <created>'
+      temporary: '<gold><from> - <to> banned for <dark_red><reason><gold> by <actor> at <created> which expires in <expires>'
+      dateTimeFormat: 'dd-MM-yyyy HH:mm:ss'
     ipmute:
-      permanent: '&6Currently muted for &4[reason]&6 by [actor] at [created]'
-      temporary: '&6Currently muted for &4[reason]&6 by [actor] at [created] which
-        expires in [expires]'
-      dateTimeFormat: dd-MM-yyyy HH:mm:ss
+      permanent: '<gold>Currently muted for <dark_red><reason><gold> by <actor> at <created>'
+      temporary: '<gold>Currently muted for <dark_red><reason><gold> by <actor> at <created> which expires in <expires>'
+      dateTimeFormat: 'dd-MM-yyyy HH:mm:ss'
     mute:
-      permanent: '&6Currently muted for &4[reason]&6 by [actor] at [created]'
-      temporary: '&6Currently muted for &4[reason]&6 by [actor] at [created] which
-        expires in [expires]'
-      dateTimeFormat: dd-MM-yyyy HH:mm:ss
+      permanent: '<gold>Currently muted for <dark_red><reason><gold> by <actor> at <created>'
+      temporary: '<gold>Currently muted for <dark_red><reason><gold> by <actor> at <created> which expires in <expires>'
+      temporaryOnline: '<gold>Currently muted for <dark_red><reason><gold> by <actor> at <created> which expires in <expires> (online time)'
+      temporaryOnlinePaused: '<gold>Currently muted for <dark_red><reason><gold> by <actor> at <created> with <remaining> remaining (online time, paused)'
+      dateTimeFormat: 'dd-MM-yyyy HH:mm:ss'
     website:
-      player: https://yourdomain.com/player/[uuid]
-      ip: http://yourdomain.com/index.php?action=viewip&ip=[ip]&server=0
+      player: 'https://yourdomain.com/player/<uuid>'
+      ip: 'http://yourdomain.com/index.php?action=viewip&ip=<ip>&server=0'
     history:
-      row: '&7#[id] &a[&f[type]&a] &6[actor]&f [meta] [reason] - &e[created]'
-      dateTimeFormat: dd-MM-yyyy HH:mm:ss
-      noResults: '&cNo results found'
+      row: '<gray>#<id> <green>[<white><type><green>] <gold><actor><white> <meta> <reason> - <yellow><created>'
+      dateTimeFormat: 'dd-MM-yyyy HH:mm:ss'
+      noResults: '<red>No results found'
     ips:
-      row: '&e[ip] - &6[join] - [leave]'
-      dateTimeFormat: dd-MM-yyyy HH:mm:ss
+      row: '<yellow><ip> - <gold><join> - <leave>'
+      dateTimeFormat: 'dd-MM-yyyy HH:mm:ss'
+
   kick:
     player:
-      noReason: '&6You have been kicked'
-      reason: '&6You have been kicked for &4[reason]'
+      noReason: '<gold>You have been kicked'
+      reason: '<gold>You have been kicked for <dark_red><reason>'
     notify:
-      noReason: '&6[player] has been kicked by [actor]'
-      reason: '&6[player] has been kicked by [actor] for &4[reason]'
+      noReason: '<gold><player> has been kicked by <actor>'
+      reason: '<gold><player> has been kicked by <actor> for <dark_red><reason>'
+
   kickall:
     player:
-      noReason: '&6You have been kicked'
-      reason: '&6You have been kicked for &4[reason]'
+      noReason: '<gold>You have been kicked'
+      reason: '<gold>You have been kicked for <dark_red><reason>'
     notify:
-      noReason: All players have been kicked by [actor]
-      reason: All players have been kicked by [actor] for &4[reason]
+      noReason: 'All players have been kicked by <actor>'
+      reason: 'All players have been kicked by <actor> for <dark_red><reason>'
+
   ban:
     player:
-      disallowed: '&6You have been banned from this server for &4[reason]&6. Your
-        appeal pin is [pin]'
-      kick: '&6You have been banned permanently for &4[reason]&6. Your appeal pin is [pin]'
-      dateTimeFormat: yyyy-MM-dd HH:mm:ss
-    notify: '&6[player] has been permanently banned by [actor] for &4[reason]'
+      disallowed: '<red><bold>You are banned from this server</bold></red>\n \n<gray>Reason: <white><reason>\n<gray>Banned by: <white><actor>\n<gray>Date: <white><created>\n \n<gold>Appeal at <appealUrl>'
+      kick: '<red><bold>You have been banned</bold></red>\n \n<gray>Reason: <white><reason>\n<gray>Banned by: <white><actor>'
+      dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
+    notify: '<gold><player> has been permanently banned by <actor> for <dark_red><reason> <click:run_command:''/bminfo <player>''><hover:show_text:''<gray>View player info''><dark_aqua>[Info]</dark_aqua></hover></click> <click:run_command:''/unban <player>''><hover:show_text:''<gray>Unban player''><dark_aqua>[Unban]</dark_aqua></hover></click>'
     error:
-      exists: '&c[player] is already banned'
-      cooldown: '&cThis player was banned too recently, try again later'
+      exists: '<red><player> is already banned'
+      cooldown: '<red>This player was banned too recently, try again later'
+
   banall:
-    notify: '&6[player] will be permanently banned by [actor] for &4[reason]'
+    notify: '<gold><player> will be permanently banned by <actor> for <dark_red><reason>'
+
   tempban:
     player:
-      disallowed: '&6You have been temporarily banned from this server for &4[reason]
-        \n&6It expires in [expires]. Your appeal pin is [pin]'
-      kick: '&6You have been temporarily banned for &4[reason]&6. Your appeal pin is [pin]'
-      dateTimeFormat: yyyy-MM-dd HH:mm:ss
-    notify: '&6[player] has been temporarily banned for [expires] by [actor] for &4[reason]'
+      disallowed: '<red><bold>You are temporarily banned from this server</bold></red>\n \n<gray>Reason: <white><reason>\n<gray>Banned by: <white><actor>\n<gray>Expires: <white><expires>\n<gray>Date: <white><created>\n \n<gold>Appeal at <appealUrl>'
+      kick: '<red><bold>You have been temporarily banned</bold></red>\n \n<gray>Reason: <white><reason>\n<gray>Banned by: <white><actor>\n<gray>Expires: <white><expires>'
+      dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
+    notify: '<gold><player> has been temporarily banned for <expires> by <actor> for <dark_red><reason> <click:run_command:''/bminfo <player>''><hover:show_text:''<gray>View player info''><dark_aqua>[Info]</dark_aqua></hover></click> <click:run_command:''/unban <player>''><hover:show_text:''<gray>Unban player''><dark_aqua>[Unban]</dark_aqua></hover></click>'
+
   tempbanall:
-    notify: '&6[player] will be temporarily banned for [expires] by [actor] for &4[reason]'
+    notify: '<gold><player> will be temporarily banned for <expires> by <actor> for <dark_red><reason>'
+
   unban:
-    notify: '&6[player] has been unbanned by [actor]'
+    notify: '<gold><player> has been unbanned by <actor>'
     error:
-      noExists: '&c[player] is not banned'
-      notOwn: '&c[player] was not banned by you, unable to unban'
+      noExists: '<red><player> is not banned'
+      notOwn: '<red><player> was not banned by you, unable to unban'
+
   unbanall:
-    notify: '&6[player] will be unbanned by [actor]'
+    notify: '<gold><player> will be unbanned by <actor>'
+
   mute:
     player:
-      blocked: '&cYou may not use the [command] command whilst muted!'
-      disallowed: '&6You have been permanently muted for &4[reason] &6by [actor]'
-      broadcast: '&4[Muted] [player]&7 [message]'
-    notify: '&6[player] has been permanently muted by [actor] for &4[reason]'
+      blocked: '<red>You may not use the <command> command whilst muted!'
+      disallowed: '<gold>You have been permanently muted for <dark_red><reason> <gold>by <actor>'
+      broadcast: '<dark_red>[Muted] <player><gray> <message>'
+    notify: '<gold><player> has been permanently muted by <actor> for <dark_red><reason> <click:run_command:''/bminfo <player>''><hover:show_text:''<gray>View player info''><dark_aqua>[Info]</dark_aqua></hover></click> <click:run_command:''/unmute <player>''><hover:show_text:''<gray>Unmute player''><dark_aqua>[Unmute]</dark_aqua></hover></click>'
     error:
-      exists: '&c[player] is already muted'
-      cooldown: '&cThis player was muted too recently, try again later'
+      exists: '<red><player> is already muted'
+      cooldown: '<red>This player was muted too recently, try again later'
+
   muteip:
     ip:
-      disallowed: '&6You have been permanently muted for &4[reason] &6by [actor]'
-      broadcast: '&4[Muted] [player]&7 [message]'
-    notify: '&6[ip] ([players]) have been permanently muted by [actor] for &4[reason]'
+      disallowed: '<gold>You have been permanently muted for <dark_red><reason> <gold>by <actor>'
+      broadcast: '<dark_red>[Muted] <player><gray> <message>'
+    notify: '<gold><ip> (<players>) have been permanently muted by <actor> for <dark_red><reason>'
     error:
-      exists: '&c[ip] is already muted'
+      exists: '<red><ip> is already muted'
+
   muteall:
-    notify: '&6[player] will be permanently muted by [actor] for &4[reason]'
+    notify: '<gold><player> will be permanently muted by <actor> for <dark_red><reason>'
+
   tempmute:
     player:
-      disallowed: '&6You have been temporarily muted for &4[reason] &6by [actor] which
-        expires in [expires]'
-    notify: '&6[player] has been temporarily muted for [expires] by [actor] for &4[reason]'
+      disallowed: '<gold>You have been temporarily muted for <dark_red><reason> <gold>by <actor> which expires in <expires>'
+      disallowedOnline: '<gold>You have been temporarily muted for <dark_red><reason> <gold>by <actor> which expires in <expires> (online time)'
+    notify: '<gold><player> has been temporarily muted for <expires> by <actor> for <dark_red><reason> <click:run_command:''/bminfo <player>''><hover:show_text:''<gray>View player info''><dark_aqua>[Info]</dark_aqua></hover></click> <click:run_command:''/unmute <player>''><hover:show_text:''<gray>Unmute player''><dark_aqua>[Unmute]</dark_aqua></hover></click>'
+    notifyOnline: '<gold><player> has been temporarily muted for <expires> (online time) by <actor> for <dark_red><reason>'
     error:
-      exists: '&c[player] is already muted'
+      exists: '<red><player> is already muted'
+
   tempmuteip:
     ip:
-      disallowed: '&6You have been temporarily muted for &4[reason] &6by [actor] which
-        expires in [expires]'
-    notify: '&6[ip] ([players]) have been temporarily muted for [expires] by [actor]
-      for &4[reason]'
+      disallowed: '<gold>You have been temporarily muted for <dark_red><reason> <gold>by <actor> which expires in <expires>'
+    notify: '<gold><ip> (<players>) have been temporarily muted for <expires> by <actor> for <dark_red><reason>'
     error:
-      exists: '&c[ip] is already muted'
+      exists: '<red><ip> is already muted'
+
   tempmuteall:
-    notify: '&6[player] will be temporarily muted for [expires] by [actor] for &4[reason]'
+    notify: '<gold><player> will be temporarily muted for <expires> by <actor> for <dark_red><reason>'
+
   unmute:
-    notify: '&6[player] has been unmuted by [actor]'
-    player: '&6You have been unmuted by [actor]'
+    notify: '<gold><player> has been unmuted by <actor>'
+    player: '<gold>You have been unmuted by <actor>'
     error:
-      noExists: '&c[player] is not muted'
-      notOwn: '&c[player] was not muted by you, unable to unmute'
+      noExists: '<red><player> is not muted'
+      notOwn: '<red><player> was not muted by you, unable to unmute'
+
   unmuteip:
-    notify: '&6[ip] has been unmuted by [actor]'
+    notify: '<gold><ip> has been unmuted by <actor>'
     error:
-      noExists: '&c[ip] is not muted'
-      notOwn: '&c[ip] was not muted by you, unable to unmute'
+      noExists: '<red><ip> is not muted'
+      notOwn: '<red><ip> was not muted by you, unable to unmute'
+
   unmuteall:
-    notify: '&6[player] will be unmuted by [actor]'
+    notify: '<gold><player> will be unmuted by <actor>'
+
   banname:
     name:
-      disallowed: '&6You have been banned from this server for &4[reason]'
-      kick: '&6You have been banned permanently for &4[reason]'
-      dateTimeFormat: yyyy-MM-dd HH:mm:ss
-    notify: '&6Name [name] has been permanently banned by [actor] for &4[reason]'
+      disallowed: '<gold>You have been banned from this server for <dark_red><reason>'
+      kick: '<gold>You have been banned permanently for <dark_red><reason>'
+      dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
+    notify: '<gold>Name <name> has been permanently banned by <actor> for <dark_red><reason>'
     error:
-      exists: '&cName [name] is already banned'
+      exists: '<red>Name <name> is already banned'
+
   tempbanname:
     name:
-      disallowed: '&6You have been banned from this server for &4[reason] \n&6It expires
-        in [expires]'
-      kick: '&6You have been temporarily banned for &4[reason]'
-      dateTimeFormat: yyyy-MM-dd HH:mm:ss
-    notify: '&6Name [name] has been temporarily banned for [expires] by [actor] for
-      &4[reason]'
+      disallowed: '<gold>You have been banned from this server for <dark_red><reason> \n<gold>It expires in <expires>'
+      kick: '<gold>You have been temporarily banned for <dark_red><reason>'
+      dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
+    notify: '<gold>Name <name> has been temporarily banned for <expires> by <actor> for <dark_red><reason>'
+
   unbanname:
-    notify: '&6Name [name] has been unbanned by [actor]'
+    notify: '<gold>Name <name> has been unbanned by <actor>'
     error:
-      noExists: '&cName [name] is not banned'
+      noExists: '<red>Name <name> is not banned'
+
   banip:
     ip:
-      disallowed: '&6You have been banned from this server for &4[reason]&6. Your
-        appeal pin is [pin]'
-      kick: '&6You have been banned permanently for &4[reason]'
-      dateTimeFormat: yyyy-MM-dd HH:mm:ss
-    notify: '&6[ip] has been permanently banned by [actor] for &4[reason]'
+      disallowed: '<gold>You have been banned from this server for <dark_red><reason>'
+      kick: '<gold>You have been banned permanently for <dark_red><reason>'
+      dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
+    notify: '<gold><ip> (<players>) has been permanently banned by <actor> for <dark_red><reason>'
     error:
-      exists: '&c[ip] is already banned'
-      cooldown: '&cThis ip was banned too recently, try again later'
+      exists: '<red><ip> is already banned'
+      cooldown: '<red>This ip was banned too recently, try again later'
+
   baniprange:
     error:
-      invalid: '&cInvalid range, please use cidr notation 192.168.0.1/16 or wildcard
-        192.168.*.*'
-      minMax: '&cRange must be lowest to highest'
-      exists: '&cA ban containing those ranges already exists'
+      invalid: '<red>Invalid range, please use cidr notation 192.168.0.1/16 or wildcard 192.168.*.*'
+      minMax: '<red>Range must be lowest to highest'
+      exists: '<red>A ban containing those ranges already exists'
     ip:
-      disallowed: '&6You have been banned from this server for &4[reason]'
-      kick: '&6You have been banned permanently for &4[reason]'
-      dateTimeFormat: yyyy-MM-dd HH:mm:ss
-    notify: '&6[from] - [to] have been banned by [actor]'
+      disallowed: '<gold>You have been banned from this server for <dark_red><reason>'
+      kick: '<gold>You have been banned permanently for <dark_red><reason>'
+      dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
+    notify: '<gold><from> - <to> have been banned by <actor>'
+
   tempbaniprange:
-    notify: '&6[from] - [to] has been temporarily banned for [expires] by [actor]'
+    notify: '<gold><from> - <to> has been temporarily banned for <expires> by <actor>'
     ip:
-      disallowed: '&6You have been banned from this server for &4[reason] \n&6It expires
-        in [expires]'
-      kick: '&6You have been temporarily banned for [expires] by [actor] for &4[reason]'
-      dateTimeFormat: yyyy-MM-dd HH:mm:ss
+      disallowed: '<gold>You have been banned from this server for <dark_red><reason> \n<gold>It expires in <expires>'
+      kick: '<gold>You have been temporarily banned for <expires> by <actor> for <dark_red><reason>'
+      dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
+
   unbaniprange:
-    notify: '&6[from] - [to] has been unbanned by [actor]'
+    notify: '<gold><from> - <to> has been unbanned by <actor>'
+
   banipall:
-    notify: '&6[ip] will be permanently banned by [actor] for &4[reason]'
+    notify: '<gold><ip> will be permanently banned by <actor> for <dark_red><reason>'
+
   tempbanip:
     ip:
-      disallowed: '&6You have been temporarily banned from this server for &4[reason]
-        \n&6It expires in [expires]. Your appeal pin is [pin]'
-      kick: '&6You have been temporarily banned for &4[reason]'
-      dateTimeFormat: yyyy-MM-dd HH:mm:ss
-    notify: '&6[ip] has been temporarily banned for [expires] by [actor] for &4[reason]'
+      disallowed: '<gold>You have been banned from this server for <dark_red><reason> \n<gold>It expires in <expires>'
+      kick: '<gold>You have been temporarily banned for <dark_red><reason>'
+      dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
+    notify: '<gold><ip> (<players>) has been temporarily banned for <expires> by <actor> for <dark_red><reason>'
+
   tempbanipall:
-    notify: '&6[ip] will be temporarily banned for [expires] by [actor] for &4[reason]'
+    notify: '<gold><ip> will be temporarily banned for <expires> by <actor> for <dark_red><reason>'
+
   unbanip:
-    notify: '&6[ip] has been unbanned by [actor]'
+    notify: '<gold><ip> has been unbanned by <actor>'
     error:
-      noExists: '&c[ip] is not banned'
-      notOwn: '&c[ip] was not banned by you, unable to unban'
+      noExists: '<red><ip> is not banned'
+      notOwn: '<red><ip> was not banned by you, unable to unban'
+
   unbanipall:
-    notify: '&6[ip] will be unbanned by [actor]'
+    notify: '<gold><ip> will be unbanned by <actor>'
+
   warn:
     player:
-      warned: '&cYou have been warned for &4[reason] &cby [actor]'
+      warned: '<gold>You have been warned by <actor> for <dark_red><reason>'
       disallowed:
-        header: '&cYou may not speak until you have accepted your most recent warning.
-          Please type the following:'
-        reason: '&6[reason]'
-        removed: '&aThank you for your understanding, you may now speak again'
-    notify: '&6[player] has been warned by [actor] for &4[reason]'
+        header: '<red>You may not speak until you have accepted your most recent warning. Please type the following:'
+        reason: '<gold><reason>'
+        removed: '<green>Thank you for your understanding, you may now speak again'
+    notify: '<gold><player> has been warned by <actor> for <dark_red><reason> <click:run_command:''/bminfo <player>''><hover:show_text:''<gray>View player info''><dark_aqua>[Info]</dark_aqua></hover></click>'
     error:
-      cooldown: '&cThis player was warned too recently, try again later'
-      exists: '&c[player] has already been warned for that reason'
+      cooldown: '<red>This player was warned too recently, try again later'
+
   tempwarn:
     player:
-      warned: '&6You have been warned for [expires] by [actor] for &4[reason]'
-    notify: '&6[player] has been warned for [expires] by [actor] for &4[reason]'
+      warned: '<gold>You have been warned for <expires> by <actor> for <dark_red><reason>'
+    notify: '<gold><player> has been warned for <expires> by <actor> for <dark_red><reason> <click:run_command:''/bminfo <player>''><hover:show_text:''<gray>View player info''><dark_aqua>[Info]</dark_aqua></hover></click>'
+
   dwarn:
     player:
-      notify: '&6Your most recent warning has been deleted by &4[actor]'
-    notify: '&cThe most recent warning for [player] has been deleted'
+      notify: '<gold>Your most recent warning has been deleted by <dark_red><actor>'
+    notify: '<red>The most recent warning for <player> has been deleted'
     error:
-      noWarnings: '&c[player] has no warnings to delete'
+      noWarnings: '<red><player> has no warnings to delete'
+
   bmclear:
-    notify: '&c[player] has had their [type] cleared'
+    notify: '<red><player> has had their <type> cleared'
     error:
-      invalid: '&cInvalid type, please choose between banrecords, muterecords, kicks,
-        notes or warnings'
+      invalid: '<red>Invalid type, please choose between banrecords, muterecords, kicks, notes or warnings'
+
   bmutils:
     missingplayers:
-      notify: '&c[amount] missing players added'
-      noneFound: '&a0 missing players found'
-      found: '&c[amount] missing player data found. Fixing...'
+      notify: '<red><amount> missing players added'
+      noneFound: '<green>0 missing players found'
+      found: '<red><amount> missing player data found. Fixing...'
       error:
-        failedLookup: '&cFailed to lookup player [uuid], check server logs'
-      complete: '&a[amount] players resolved, please restart your server for failed
-        punishments to take affect'
+        failedLookup: '<red>Failed to lookup player <uuid>, check server logs'
+      complete: '<green><amount> players resolved, please restart your server for failed punishments to take affect'
     duplicates:
       lookup:
-        notFound: '&aNo duplicate player names found'
+        notFound: '<green>No duplicate player names found'
       error:
-        invalidName: '&cInvalid name, must be 16 characters or less and contain only
-          letters, numbers and an underscore'
-        nameExists: '&cA player with that name already exists'
-      success: '&aPlayer name set to [player] successfully'
+        invalidName: '<red>Invalid name, must be 16 characters or less and contain only letters, numbers and an underscore'
+        nameExists: '<red>A player with that name already exists'
+      success: '<green>Player name set to <player> successfully'
+
   bmrollback:
-    notify: '&c[player] has had their [type] actions undone'
+    notify: '<red><player> has had their <type> actions undone'
     error:
-      invalid: '&cInvalid type [type], please choose between [types]'
+      invalid: '<red>Invalid type <type>, please choose between [types]'
+
   sync:
     player:
-      started: '&aStarting force [type] synchronisation'
-      finished: '&aForced [type] synchronisation complete'
+      started: '<green>Starting force <type> synchronisation'
+      finished: '<green>Forced <type> synchronisation complete'
+
   update:
-    notify: '&6[BanManager] &aAn update is available'
+    notify: '<gold>[BanManager] <green>An update is available'
+
   notes:
-    header: '&6[player] has the following notes:'
-    joinAmount: '&6[player] has &e[amount] &6notes, click to view them'
-    note: '&6[[player]] &e[message] - &e[created]'
-    playerNote: '&a[[player]] &6[[actor]] &e[message] - &e[created]'
-    dateTimeFormat: dd-MM-yyyy
-    notify: '[player] has a new note attached by [actor]: [message]'
+    header: '<gold><player> has the following notes:'
+    joinAmount: '<click:run_command:"/notes <player>"><gold><player> has <yellow><amount> <gold>notes, click to view them</click>'
+    note: '<gold>[<player>] <yellow><message> - <yellow><created>'
+    playerNote: '<green>[<player>] <gold>[<actor>] <yellow><message> - <yellow><created>'
+    dateTimeFormat: 'dd-MM-yyyy'
+    notify: '<player> has a new note attached by <actor>: <message>'
     error:
-      noNotes: '&c[player] has no notes'
-      noOnlineNotes: '&cNo online players have notes'
+      noNotes: '<red><player> has no notes'
+      noOnlineNotes: '<red>No online players have notes'
+
   report:
-    notify: '&6[player] has been reported by [actor] for &4[reason]'
+    notify: '<gold><player> has been reported by <actor> for <dark_red><reason>'
     error:
-      cooldown: '&cToo many reports, please wait a while'
-      notOnline: '&cPlayer must be online to report'
+      cooldown: '<red>This player was reported too recently, try again later'
     assign:
-      player: '&aReport [id] assigned to [player]'
-      notify: '&aYou have been assigned report [id] by [actor]'
+      player: '<green>Report <id> assigned to <player>'
+      notify: '<green>You have been assigned report <id> by <actor>'
     unassign:
-      player: '&aReport [id] unassigned'
+      player: '<green>Report <id> unassigned'
     close:
       notify:
-        closed: '&aReport [id] closed by [actor]'
-        command: '&aReport [id] closed by [actor] with [command]'
-        comment: '&aReport [id] closed by [actor] with [comment]'
-      dispatch: Executing command [command]
+        closed: '<green>Report <id> closed by <actor>'
+        command: '<green>Report <id> closed by <actor> with <command>'
+        comment: '<green>Report <id> closed by <actor> with <comment>'
+      dispatch: 'Executing command <command>'
     list:
-      noResults: '&cNo reports found'
+      noResults: '<red>No reports found'
       error:
-        invalidState: '&cReport state [state] not found'
+        invalidState: '<red>Report state <state> not found'
       row:
-        dateTimeFormat: yyyy-MM-dd HH:mm:ss
-        header: '&e-- Reports ([count]) -- Page ([page]/[maxPage])'
-        all: '&7#[id] &e[[state]] &6- [created] - [player]'
+        dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
+        header: '<yellow>-- Reports (<count>) -- Page (<page>/<maxPage>)'
+        all: '<click:run_command:"/reports info <id>"><hover:show_text:"<gray>Click to view details"><gray>#<id> <yellow>[<state>] <gold>- <created> - <player></hover></click>'
     tp:
       error:
-        notFound: '&cReport not found'
-        worldNotFound: '&cWorld [world] could not be found'
-        invalidId: '&c[id] is not a valid report id'
-      dateTimeFormat: yyyy-MM-dd HH:mm:ss
+        notFound: '<red>Report not found'
+        worldNotFound: '<red>World <world> could not be found'
+        invalidId: '<red><id> is not a valid report id'
+      dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
       notify:
-        report: '&7#[id] &6[actor] reported [player] for &4[reason]&6 at [created]'
-        location: '[world] - [x], [y], [z]'
+        report: '<gray>#<id> <gold><actor> reported <player> for <dark_red><reason><gold> at <created>'
+        location: '<world> - <x>, <y>, <z>'
     info:
       error:
-        notFound: '&cReport not found'
-        invalidId: '&c[id] is not a valid report id'
-      dateTimeFormat: yyyy-MM-dd HH:mm:ss
+        notFound: '<red>Report not found'
+        invalidId: '<red><id> is not a valid report id'
+      dateTimeFormat: 'yyyy-MM-dd HH:mm:ss'
       notify:
-        report: '&7#[id] &6[actor] reported [player] for &4[reason]&6 at [created]'
-        location: '[world] - [x], [y], [z]'
-    success: '&a[player] has been reported'
-    created: '&6[actor] has reported [player] for &4[reason]'
+        report: '<gray>#<id> <gold><actor> reported <player> for <dark_red><reason><gold> at <created>'
+        location: '<world> - <x>, <y>, <z>'
+
   addnoteall:
-    notify: '&c[player] will have a new attached by [actor]: [message]'
+    notify: '<red><player> will have a new attached by <actor>: <message>'
+
   banlist:
-    header: '&6There are [bans] [type] bans:'
+    header: '<gold>There are <bans> <type> bans:'
+
   bmactivity:
     row:
-      all: '&a[&f[type]&a] &6[player]&f - &6[actor]&f - &e[created]'
-      player: '&a[&f[type]&a] &6[player]&f - &e[created]'
-      dateTimeFormat: dd-MM-yyyy HH:mm:ss
-    noResults: '&cNo results found'
+      all: '<green>[<white><type><green>] <gold><player><white> - <gold><actor><white> - <yellow><created>'
+      player: '<green>[<white><type><green>] <gold><player><white> - <yellow><created>'
+      dateTimeFormat: 'dd-MM-yyyy HH:mm:ss'
+    noResults: '<red>No results found'
+
   bmdelete:
-    notify: '&a[rows] rows deleted'
+    notify: '<green><rows> rows deleted'
     error:
-      invalid: '&cInvalid type, please choose between banrecords, muterecords, kicks,
-        notes or warnings'
-      invalidId: '&c[id] is not a valid number'
+      invalid: '<red>Invalid type, please choose between banrecords, muterecords, kicks, notes or warnings'
+      invalidId: '<red><id> is not a valid number'
+
   denyalts:
     player:
-      disallowed: '&cThe IP address you are joining from is linked to a banned player'
+      disallowed: '<red>The IP address you are joining from is linked to a banned player'
+
   reasons:
-    row: '[hashtag] = [reason]'
+    row: '<hashtag> = <reason>'
+
+  confirmation:
+    prompt: '<gold>Are you sure you want to <action>? <click:run_command:''/bm confirm''><hover:show_text:''<gray>Click to confirm''><green>[Confirm]</green></hover></click> <click:run_command:''/bm cancel''><hover:show_text:''<gray>Click to cancel''><red>[Cancel]</red></hover></click>'
+    confirmed: '<green>Action confirmed.'
+    cancelled: '<red>Action cancelled.'
+    expired: '<red>No pending action found. It may have expired.'
+
+  dashboard:
+    header: '<dark_gray><strikethrough>                    </strikethrough><reset> <gold><bold>Staff Dashboard</bold></gold> <dark_gray><strikethrough>                    </strikethrough>'
+    activeBans: '<gray>Active Bans: <white><count>'
+    activeMutes: '<gray>Active Mutes: <white><count>'
+    openReports: '<gray>Open Reports: <white><count> <click:run_command:''/reports 1''><hover:show_text:''<gray>View reports''><dark_aqua>[View]</dark_aqua></hover></click>'
+    recentActivity: '<gray>Recent Activity (24h): <white><count>'
+    footer: '<dark_gray><strikethrough>                                                        </strikethrough>'
+
+  report:
+    actions:
+      assign: '<click:run_command:''/report assign <id>''><hover:show_text:''<gray>Assign to yourself''><dark_aqua>[Assign]</dark_aqua></hover></click>'
+      close: '<click:run_command:''/report close <id>''><hover:show_text:''<gray>Close this report''><green>[Close]</green></hover></click>'
+      tp: '<click:run_command:''/report tp <id>''><hover:show_text:''<gray>Teleport to location''><aqua>[TP]</aqua></hover></click>'
+    feedback:
+      assigned: '<gold>Your report #<id> has been assigned to <actor>'
+      closed: '<gold>Your report #<id> has been closed by <actor>'
diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts
index d59e518..c559681 100644
--- a/fabric/build.gradle.kts
+++ b/fabric/build.gradle.kts
@@ -79,7 +79,7 @@ dependencies {
     // 1.21.11 runtime support exists in BanManager, but public artifacts may lag behind;
     // compile against 1.21.4 API-compatible classes until 1.21.11 artifacts are published.
     val banManagerCompileMcVersion = if (minecraftVersion == "1.21.11") "1.21.4" else minecraftVersion
-    modCompileOnly("me.confuser.banmanager:BanManagerFabric-mc$banManagerCompileMcVersion:7.11.0-SNAPSHOT")
+    modCompileOnly("me.confuser.banmanager:BanManagerFabric-mc$banManagerCompileMcVersion:8.0.0-SNAPSHOT")
 }
 
 tasks.named<Copy>("processResources") {
diff --git a/sponge-api7/build.gradle.kts b/sponge-api7/build.gradle.kts
index f8f7116..2da3afa 100644
--- a/sponge-api7/build.gradle.kts
+++ b/sponge-api7/build.gradle.kts
@@ -69,7 +69,7 @@ configurations {
 
 dependencies {
     compileOnly("org.spongepowered:spongeapi:7.2.0")
-    compileOnly("me.confuser.banmanager:BanManagerSponge7:7.11.0-SNAPSHOT")
+    compileOnly("me.confuser.banmanager:BanManagerSponge7:8.0.0-SNAPSHOT")
     compileOnly("org.apache.logging.log4j:log4j-core:2.17.0")
 
     api(project(":BanManagerWebEnhancerCommon")) {
@@ -79,7 +79,7 @@ dependencies {
     "shadeOnly"("org.bstats:bstats-sponge:2.2.1")
 }
 
-val javaTarget = 8 // Sponge targets a minimum of Java 8
+val javaTarget = 17
 java {
     sourceCompatibility = JavaVersion.toVersion(javaTarget)
     targetCompatibility = JavaVersion.toVersion(javaTarget)
diff --git a/sponge/build.gradle.kts b/sponge/build.gradle.kts
index 60a445d..7d979d4 100644
--- a/sponge/build.gradle.kts
+++ b/sponge/build.gradle.kts
@@ -36,7 +36,7 @@ sponge {
         dependency("banmanager") {
             loadOrder(org.spongepowered.plugin.metadata.model.PluginDependency.LoadOrder.AFTER)
             optional(false)
-            version("7.11.0-SNAPSHOT")
+            version("8.0.0-SNAPSHOT")
         }
     }
 }
@@ -54,7 +54,7 @@ configurations {
 
 dependencies {
     compileOnly("org.spongepowered:spongeapi:11.0.0")
-    compileOnly("me.confuser.banmanager:BanManagerSponge:7.11.0-SNAPSHOT")
+    compileOnly("me.confuser.banmanager:BanManagerSponge:8.0.0-SNAPSHOT")
 
     api(project(":BanManagerWebEnhancerCommon")) {
         isTransitive = true
diff --git a/velocity/build.gradle.kts b/velocity/build.gradle.kts
index 9b9e6de..3cf12b7 100644
--- a/velocity/build.gradle.kts
+++ b/velocity/build.gradle.kts
@@ -36,7 +36,7 @@ dependencies {
     api(project(":BanManagerWebEnhancerCommon")) {
         isTransitive = true
     }
-    compileOnly("me.confuser.banmanager:BanManagerVelocity:7.11.0-SNAPSHOT")
+    compileOnly("me.confuser.banmanager:BanManagerVelocity:8.0.0-SNAPSHOT")
 
     compileOnly("com.velocitypowered:velocity-api:3.1.0")
     annotationProcessor("com.velocitypowered:velocity-api:3.1.0")