diff --git a/application/src/main/java/org/togetherjava/tjbot/Application.java b/application/src/main/java/org/togetherjava/tjbot/Application.java
index 2d9490bf64..b6efebddd0 100644
--- a/application/src/main/java/org/togetherjava/tjbot/Application.java
+++ b/application/src/main/java/org/togetherjava/tjbot/Application.java
@@ -7,6 +7,7 @@
 import net.dv8tion.jda.api.requests.GatewayIntent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.Features;
 import org.togetherjava.tjbot.commands.SlashCommandAdapter;
 import org.togetherjava.tjbot.commands.system.BotCore;
diff --git a/application/src/main/java/org/togetherjava/tjbot/CommandReloading.java b/application/src/main/java/org/togetherjava/tjbot/CommandReloading.java
index 54108595ae..36ce0388d7 100644
--- a/application/src/main/java/org/togetherjava/tjbot/CommandReloading.java
+++ b/application/src/main/java/org/togetherjava/tjbot/CommandReloading.java
@@ -7,6 +7,7 @@
 import org.jetbrains.annotations.Contract;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.BotCommand;
 import org.togetherjava.tjbot.commands.CommandVisibility;
 import org.togetherjava.tjbot.commands.system.CommandProvider;
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/BotCommand.java b/application/src/main/java/org/togetherjava/tjbot/commands/BotCommand.java
index cc923af08f..0bd53a32b7 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/BotCommand.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/BotCommand.java
@@ -2,7 +2,6 @@
 
 import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.component.SelectMenuInteractionEvent;
-import net.dv8tion.jda.api.interactions.commands.Command;
 import net.dv8tion.jda.api.interactions.commands.build.CommandData;
 
 import java.util.List;
@@ -25,16 +24,6 @@
  * Some example commands are available in {@link org.togetherjava.tjbot.commands.basic}.
  */
 public interface BotCommand extends UserInteractor {
-
-    /**
-     * Gets the type of this command.
-     * <p>
-     * After registration of the command, the type must not change anymore.
-     *
-     * @return the type of the command
-     */
-    Command.Type getType();
-
     /**
      * Gets the visibility of this command.
      * <p>
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/BotCommandAdapter.java b/application/src/main/java/org/togetherjava/tjbot/commands/BotCommandAdapter.java
index 3a5e5af1f3..c9c4a52dbb 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/BotCommandAdapter.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/BotCommandAdapter.java
@@ -6,11 +6,11 @@
 import net.dv8tion.jda.api.interactions.commands.Command;
 import net.dv8tion.jda.api.interactions.commands.build.CommandData;
 import org.jetbrains.annotations.Contract;
-import org.togetherjava.tjbot.commands.componentids.ComponentId;
+
 import org.togetherjava.tjbot.commands.componentids.ComponentIdGenerator;
+import org.togetherjava.tjbot.commands.componentids.ComponentIdInteractor;
 import org.togetherjava.tjbot.commands.componentids.Lifespan;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 
@@ -23,26 +23,23 @@
  * {@link #onSelectionMenu(SelectMenuInteractionEvent, List)} can be overridden if desired. The
  * default implementation is empty, the adapter will not react to such events.
  * <p>
- * <p>
  * The adapter manages some getters for you, you've to create the {@link CommandData} yourself. See
  * {@link #BotCommandAdapter(CommandData, CommandVisibility)}} for more info on that. Minimal
  * modifications can be done on the {@link CommandData} returned by {@link #getData()}.
  * <p>
- * <p>
  * If implementations want to add buttons or selection menus, it is highly advised to use component
  * IDs generated by {@link #generateComponentId(String...)}, which will automatically create IDs
  * that are valid per {@link SlashCommand#onSlashCommand(SlashCommandInteractionEvent)}.
  * <p>
- * <p>
  * Some example commands are available in {@link org.togetherjava.tjbot.commands.basic}.
  * Registration of commands can be done in {@link Features}.
  */
 public abstract class BotCommandAdapter implements BotCommand {
     private final String name;
-    private final Command.Type type;
+    private final UserInteractionType interactionType;
     private final CommandVisibility visibility;
     private final CommandData data;
-    private ComponentIdGenerator componentIdGenerator;
+    private final ComponentIdInteractor componentIdInteractor;
 
     /**
      * Creates a new adapter with the given data.
@@ -54,8 +51,19 @@ protected BotCommandAdapter(CommandData data, CommandVisibility visibility) {
         this.data = data.setGuildOnly(visibility == CommandVisibility.GUILD);
         this.visibility = Objects.requireNonNull(visibility, "The visibility shouldn't be null");
 
-        this.name = data.getName();
-        this.type = data.getType();
+        name = data.getName();
+        interactionType = commandTypeToInteractionType(data.getType());
+        componentIdInteractor = new ComponentIdInteractor(interactionType, name);
+    }
+
+    private static UserInteractionType commandTypeToInteractionType(Command.Type type) {
+        return switch (type) {
+            case SLASH -> UserInteractionType.SLASH_COMMAND;
+            case USER -> UserInteractionType.USER_CONTEXT_COMMAND;
+            case MESSAGE -> UserInteractionType.MESSAGE_CONTEXT_COMMAND;
+            case UNKNOWN -> throw new IllegalArgumentException(
+                    "Can not infer the type of user interaction for this command, it is unknown.");
+        };
     }
 
     @Override
@@ -64,8 +72,8 @@ public final String getName() {
     }
 
     @Override
-    public Command.Type getType() {
-        return type;
+    public final UserInteractionType getInteractionType() {
+        return interactionType;
     }
 
     @Override
@@ -81,8 +89,7 @@ public CommandData getData() {
     @Override
     @Contract(mutates = "this")
     public final void acceptComponentIdGenerator(ComponentIdGenerator generator) {
-        componentIdGenerator =
-                Objects.requireNonNull(generator, "The given generator cannot be null");
+        componentIdInteractor.acceptComponentIdGenerator(generator);
     }
 
     @SuppressWarnings("NoopMethodInAbstractClass")
@@ -113,7 +120,7 @@ public void onSelectionMenu(SelectMenuInteractionEvent event, List<String> args)
      */
     @SuppressWarnings("OverloadedVarargsMethod")
     protected final String generateComponentId(String... args) {
-        return generateComponentId(Lifespan.REGULAR, args);
+        return componentIdInteractor.generateComponentId(args);
     }
 
     /**
@@ -130,8 +137,6 @@ protected final String generateComponentId(String... args) {
      */
     @SuppressWarnings({"OverloadedVarargsMethod", "WeakerAccess"})
     protected final String generateComponentId(Lifespan lifespan, String... args) {
-        return componentIdGenerator
-            .generate(new ComponentId(UserInteractorPrefix.getPrefixedNameFromInstance(this),
-                    Arrays.asList(args)), lifespan);
+        return componentIdInteractor.generateComponentId(lifespan, args);
     }
 }
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/Features.java b/application/src/main/java/org/togetherjava/tjbot/commands/Features.java
index f05b626572..581296a77d 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/Features.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/Features.java
@@ -1,6 +1,7 @@
 package org.togetherjava.tjbot.commands;
 
 import net.dv8tion.jda.api.JDA;
+
 import org.togetherjava.tjbot.commands.basic.PingCommand;
 import org.togetherjava.tjbot.commands.basic.RoleSelectCommand;
 import org.togetherjava.tjbot.commands.basic.SuggestionsUpDownVoter;
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/MessageContextCommand.java b/application/src/main/java/org/togetherjava/tjbot/commands/MessageContextCommand.java
index 912f264450..3983535f1d 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/MessageContextCommand.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/MessageContextCommand.java
@@ -6,6 +6,7 @@
 import net.dv8tion.jda.api.interactions.commands.build.CommandData;
 import net.dv8tion.jda.api.interactions.components.ComponentInteraction;
 import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle;
+
 import org.togetherjava.tjbot.commands.componentids.ComponentIdGenerator;
 
 import java.util.List;
@@ -21,7 +22,6 @@
  * {@link BotCommandAdapter} available that implemented most methods already. A new command can then
  * be registered by adding it to {@link Features}.
  * <p>
- * <p>
  * Context commands can either be visible globally in Discord or just to specific guilds. Minor
  * adjustments can be made via {@link CommandData}, which is then to be returned by
  * {@link #getData()} where the system will then pick it up from.
@@ -31,11 +31,9 @@
  * ({@link #onButtonClick(ButtonInteractionEvent, List)}) or menus
  * ({@link #onSelectionMenu(SelectMenuInteractionEvent, List)}) have been triggered.
  * <p>
- * <p>
  * Some example commands are available in {@link org.togetherjava.tjbot.commands.basic}.
  */
 public interface MessageContextCommand extends BotCommand {
-
     /**
      * Triggered by the core system when a message context-command corresponding to this
      * implementation (based on {@link #getData()}) has been triggered.
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/SlashCommand.java b/application/src/main/java/org/togetherjava/tjbot/commands/SlashCommand.java
index ba72609bc2..af7c17fa28 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/SlashCommand.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/SlashCommand.java
@@ -10,6 +10,7 @@
 import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData;
 import net.dv8tion.jda.api.interactions.components.ComponentInteraction;
 import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle;
+
 import org.togetherjava.tjbot.commands.componentids.ComponentIdGenerator;
 
 import java.util.List;
@@ -39,7 +40,6 @@
  * Some example commands are available in {@link org.togetherjava.tjbot.commands.basic}.
  */
 public interface SlashCommand extends BotCommand {
-
     /**
      * Gets the description of the command.
      * <p>
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/UserContextCommand.java b/application/src/main/java/org/togetherjava/tjbot/commands/UserContextCommand.java
index cb1cab4127..4d25446f15 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/UserContextCommand.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/UserContextCommand.java
@@ -6,6 +6,7 @@
 import net.dv8tion.jda.api.interactions.commands.build.CommandData;
 import net.dv8tion.jda.api.interactions.components.ComponentInteraction;
 import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle;
+
 import org.togetherjava.tjbot.commands.componentids.ComponentIdGenerator;
 
 import java.util.List;
@@ -22,7 +23,6 @@
  * {@link BotCommandAdapter} available that implemented most methods already. A new command can then
  * be registered by adding it to {@link Features}.
  * <p>
- * <p>
  * Context commands can either be visible globally in Discord or just to specific guilds. Minor
  * adjustments can be made via {@link CommandData}, which is then to be returned by
  * {@link #getData()} where the system will then pick it up from.
@@ -32,11 +32,9 @@
  * ({@link #onButtonClick(ButtonInteractionEvent, List)}) or menus
  * ({@link #onSelectionMenu(SelectMenuInteractionEvent, List)}) have been triggered.
  * <p>
- * <p>
  * Some example commands are available in {@link org.togetherjava.tjbot.commands.basic}.
  */
 public interface UserContextCommand extends BotCommand {
-
     /**
      * Triggered by the core system when a user context-command corresponding to this implementation
      * (based on {@link #getData()}) has been triggered.
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/UserInteractionType.java b/application/src/main/java/org/togetherjava/tjbot/commands/UserInteractionType.java
new file mode 100644
index 0000000000..799852d7b2
--- /dev/null
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/UserInteractionType.java
@@ -0,0 +1,61 @@
+package org.togetherjava.tjbot.commands;
+
+/**
+ * Different types of user interactions.
+ * <p>
+ * Also allows user interactors of different type to have the same name.
+ */
+public enum UserInteractionType {
+    /**
+     * User types a command leaded by a slash, such as {@code /ping}.
+     */
+    SLASH_COMMAND(SlashCommand.class, "s-"),
+    /**
+     * User right-clicks a message and selects a command.
+     */
+    MESSAGE_CONTEXT_COMMAND(MessageContextCommand.class, "mc-"),
+    /**
+     * User right-clicks a user and selects a command.
+     */
+    USER_CONTEXT_COMMAND(UserContextCommand.class, "uc-"),
+    /**
+     * Other types of interactions, for example a routine that offers buttons to click on.
+     */
+    OTHER(UserInteractor.class, "");
+
+    private final Class<? extends UserInteractor> classType;
+    private final String prefix;
+
+    UserInteractionType(Class<? extends UserInteractor> classType, final String prefix) {
+        this.classType = classType;
+        this.prefix = prefix;
+    }
+
+    /**
+     * The prefix for the command
+     *
+     * @return the command's prefix
+     */
+    public String getPrefix() {
+        return prefix;
+    }
+
+    /**
+     * Returns the name, attached with the prefix in front of it.
+     *
+     * @param name the name
+     * @return the name, with the prefix in front of it.
+     */
+    public String getPrefixedName(String name) {
+        return prefix + name;
+    }
+
+    /**
+     * The class type that should receive the prefix
+     *
+     * @return a {@link Class} instance of the type
+     */
+    public Class<? extends UserInteractor> getClassType() {
+        return classType;
+    }
+}
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/UserInteractor.java b/application/src/main/java/org/togetherjava/tjbot/commands/UserInteractor.java
index 65311be4bc..714a944afd 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/UserInteractor.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/UserInteractor.java
@@ -3,6 +3,7 @@
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.component.SelectMenuInteractionEvent;
+
 import org.togetherjava.tjbot.commands.componentids.ComponentId;
 import org.togetherjava.tjbot.commands.componentids.ComponentIdGenerator;
 import org.togetherjava.tjbot.commands.componentids.Lifespan;
@@ -15,14 +16,14 @@
  * <p>
  * An interactor can react to button clicks and selection menu actions. This is done based on the
  * given {@link #getName()}, because of this names have to be unique. But, names can be complicated
- * if their type is different, all the types can be seen in {@link UserInteractorPrefix}
+ * if their type is different, all the types can be seen in {@link UserInteractionType}
  */
 public interface UserInteractor extends Feature {
 
     /**
      * Gets the name of the interactor.
      * <p>
-     * You cannot start the name with any of the prefixes found in {@link UserInteractorPrefix}
+     * You cannot start the name with any of the prefixes found in {@link UserInteractionType}
      * <p>
      * After registration of the interactor, the name must not change anymore.
      *
@@ -30,6 +31,16 @@ public interface UserInteractor extends Feature {
      */
     String getName();
 
+
+    /**
+     * Gets the type of interactors this interactor allows.
+     * <p>
+     * After registration of the interactor, the type must not change anymore.
+     *
+     * @return the type of the interaction allowed by this interactor
+     */
+    UserInteractionType getInteractionType();
+
     /**
      * Triggered by the core system when a button corresponding to this implementation (based on
      * {@link #getName()}) has been clicked.
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/UserInteractorPrefix.java b/application/src/main/java/org/togetherjava/tjbot/commands/UserInteractorPrefix.java
deleted file mode 100644
index 53c76a3b5c..0000000000
--- a/application/src/main/java/org/togetherjava/tjbot/commands/UserInteractorPrefix.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package org.togetherjava.tjbot.commands;
-
-import org.jetbrains.annotations.Contract;
-
-/**
- * Contains the prefixes for the UserInteractor's.
- * <p>
- * This is used for separate interactors with the same name, by command type (and possibly more in
- * the future). Our system doesn't allow multiple interactors with the same name, while having a
- * slash-command, and a message-context-command with the same name can be useful.
- */
-public enum UserInteractorPrefix {
-    // Implementations that are none of the following have no dedicated prefix.
-
-    /**
-     * Prefix for slash commands.
-     */
-    SLASH_COMMAND(SlashCommand.class, "s-"),
-    /**
-     * Prefix for message context commands.
-     */
-    MESSAGE_CONTEXT_COMMAND(MessageContextCommand.class, "mc-"),
-    /**
-     * Prefix for user context commands.
-     */
-    USER_CONTEXT_COMMAND(UserContextCommand.class, "uc-");
-
-    private final Class<? extends UserInteractor> classType;
-    private final String prefix;
-
-    UserInteractorPrefix(Class<? extends UserInteractor> classType, final String prefix) {
-        this.classType = classType;
-        this.prefix = prefix;
-    }
-
-    /**
-     * The prefix for the command
-     *
-     * @return the command's prefix
-     */
-    public String getPrefix() {
-        return prefix;
-    }
-
-    /**
-     * Returns the name, attached with the prefix in front of it.
-     *
-     * @param name the name
-     * @return the name, with the prefix in front of it.
-     */
-    public String getPrefixedName(String name) {
-        return prefix + name;
-    }
-
-    /**
-     * The class type that should receive the prefix
-     *
-     * @return a {@link Class} instance of the type
-     */
-    public Class<? extends UserInteractor> getClassType() {
-        return classType;
-    }
-
-    /**
-     * Checks what enum value the given instance collaborates to.
-     * <p>
-     * This returns the name of the interactor, and adds the designated prefix to the name. As
-     * example, a slash-command with the name "help" becomes "s-help".
-     *
-     * @param instance an instance to type check for a prefix
-     * @param <T> the type of the instance
-     * @return the interactor's name, with its prefix
-     */
-    public static <T extends UserInteractor> String getPrefixedNameFromInstance(final T instance) {
-        String name = instance.getName();
-
-        for (UserInteractorPrefix value : values()) {
-            Class<? extends UserInteractor> valueClassType = value.getClassType();
-
-            if (valueClassType.isInstance(instance)) {
-                return value.getPrefix() + name;
-            }
-        }
-
-        return name;
-    }
-
-    /**
-     * Checks what enum value the given instance collaborates to.
-     * <p>
-     * This combines the given name, with the interactor's prefix. As example, a slash-command with
-     * the name "help" becomes "s-help".
-     *
-     * @param clazz the class to get the prefix from
-     * @param name the name of the instance
-     * @param <T> the type of the instance
-     * @return the prefixed {@link String}
-     */
-    public static <T extends UserInteractor> String getPrefixedNameFromClass(final Class<T> clazz,
-            final String name) {
-
-        for (UserInteractorPrefix value : values()) {
-            Class<? extends UserInteractor> valueClassType = value.getClassType();
-
-            if (valueClassType.isAssignableFrom(clazz)) {
-                return value.getPrefix() + name;
-            }
-        }
-
-        return name;
-    }
-
-    @Override
-    @Contract(pure = true)
-    public String toString() {
-        return "UserInteractorPrefix{" + "prefix='" + prefix + '\'' + '}';
-    }
-}
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/basic/PingCommand.java b/application/src/main/java/org/togetherjava/tjbot/commands/basic/PingCommand.java
index fd5afa121a..0b287c151c 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/basic/PingCommand.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/basic/PingCommand.java
@@ -1,6 +1,7 @@
 package org.togetherjava.tjbot.commands.basic;
 
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
+
 import org.togetherjava.tjbot.commands.CommandVisibility;
 import org.togetherjava.tjbot.commands.SlashCommandAdapter;
 
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/basic/RoleSelectCommand.java b/application/src/main/java/org/togetherjava/tjbot/commands/basic/RoleSelectCommand.java
index 05a372eca1..d8e6970132 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/basic/RoleSelectCommand.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/basic/RoleSelectCommand.java
@@ -16,13 +16,14 @@
 import org.jetbrains.annotations.Contract;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.CommandVisibility;
 import org.togetherjava.tjbot.commands.SlashCommandAdapter;
 import org.togetherjava.tjbot.commands.componentids.Lifespan;
 
 import java.awt.*;
-import java.util.List;
 import java.util.*;
+import java.util.List;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/basic/SuggestionsUpDownVoter.java b/application/src/main/java/org/togetherjava/tjbot/commands/basic/SuggestionsUpDownVoter.java
index 3ca76e4ae3..d2eccaef77 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/basic/SuggestionsUpDownVoter.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/basic/SuggestionsUpDownVoter.java
@@ -9,6 +9,7 @@
 import net.dv8tion.jda.api.requests.ErrorResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.MessageReceiverAdapter;
 import org.togetherjava.tjbot.config.Config;
 import org.togetherjava.tjbot.config.SuggestionsConfig;
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/basic/VcActivityCommand.java b/application/src/main/java/org/togetherjava/tjbot/commands/basic/VcActivityCommand.java
index 033616ab34..f66cb77d68 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/basic/VcActivityCommand.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/basic/VcActivityCommand.java
@@ -15,10 +15,12 @@
 import org.jetbrains.annotations.Contract;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.CommandVisibility;
 import org.togetherjava.tjbot.commands.SlashCommandAdapter;
 
 import javax.annotation.Nullable;
+
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/componentids/ComponentIdGenerator.java b/application/src/main/java/org/togetherjava/tjbot/commands/componentids/ComponentIdGenerator.java
index 0a746965d8..372e6ed54f 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/componentids/ComponentIdGenerator.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/componentids/ComponentIdGenerator.java
@@ -4,6 +4,7 @@
 import net.dv8tion.jda.api.interactions.components.ComponentInteraction;
 import net.dv8tion.jda.api.interactions.components.buttons.Button;
 import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle;
+
 import org.togetherjava.tjbot.commands.SlashCommand;
 
 /**
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/componentids/ComponentIdInteractor.java b/application/src/main/java/org/togetherjava/tjbot/commands/componentids/ComponentIdInteractor.java
new file mode 100644
index 0000000000..77792aafad
--- /dev/null
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/componentids/ComponentIdInteractor.java
@@ -0,0 +1,91 @@
+package org.togetherjava.tjbot.commands.componentids;
+
+import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
+
+import org.togetherjava.tjbot.commands.SlashCommand;
+import org.togetherjava.tjbot.commands.UserInteractionType;
+
+import java.util.Arrays;
+import java.util.Objects;
+
+/**
+ * Delegate class for interacting with component IDs. Provides methods to easily generate valid
+ * component IDs as accepted by the system.
+ * <p>
+ * The method {@link #acceptComponentIdGenerator(ComponentIdGenerator)} must be used before
+ * attempting to generate IDs.
+ * <p>
+ * Mostly used by classes implementing {@link org.togetherjava.tjbot.commands.UserInteractor}, to
+ * simplify handling with the IDs.
+ */
+public final class ComponentIdInteractor {
+    private final String name;
+    private final UserInteractionType userInteractionType;
+    private ComponentIdGenerator generator;
+
+    /**
+     * Creates a new instance.
+     *
+     * @param userInteractionType The type of interaction component IDs are used by
+     * @param name The unique name of the interactor. Requirements for this are documented in
+     *        {@link net.dv8tion.jda.api.interactions.commands.build.Commands#slash(String, String)}.
+     *        After registration of the interactor, the name must not change anymore.
+     */
+    public ComponentIdInteractor(UserInteractionType userInteractionType, String name) {
+        this.name = Objects.requireNonNull(name);
+        this.userInteractionType = Objects.requireNonNull(userInteractionType);
+    }
+
+    /**
+     * Must be used before generating component IDs with {@link #generateComponentId(String...)} and
+     * similar.
+     * <p>
+     * It will provide the interactor a component ID generator through this method, which can be
+     * used to generate component IDs, as used for button or selection menus. See
+     * {@link org.togetherjava.tjbot.commands.UserInteractor#acceptComponentIdGenerator(ComponentIdGenerator)}
+     * for details on how to use this.
+     *
+     * @param generator the provided component ID generator
+     */
+    public void acceptComponentIdGenerator(ComponentIdGenerator generator) {
+        this.generator = Objects.requireNonNull(generator);
+    }
+
+    /**
+     * Generates component IDs that are considered valid per
+     * {@link SlashCommand#onSlashCommand(SlashCommandInteractionEvent)}.
+     * <p>
+     * They can be used to create buttons or selection menus and transport additional data
+     * throughout the event (e.g., the user ID who created the button dialog).
+     * <p>
+     * IDs generated by this method have a regular lifespan, meaning they might get evicted and
+     * expire after not being used for a long time. Use
+     * {@link #generateComponentId(Lifespan, String...)} to set other lifespans, if desired.
+     *
+     * @param args the extra arguments that should be part of the ID
+     * @return the generated component ID
+     */
+    @SuppressWarnings("OverloadedVarargsMethod")
+    public String generateComponentId(String... args) {
+        return generateComponentId(Lifespan.REGULAR, args);
+    }
+
+    /**
+     * Generates component IDs that are considered valid per
+     * {@link SlashCommand#onSlashCommand(SlashCommandInteractionEvent)}.
+     * <p>
+     * They can be used to create buttons or selection menus and transport additional data
+     * throughout the event (e.g., the user ID who created the button dialog).
+     *
+     * @param lifespan the lifespan of the component ID, controls when an ID that was not used for a
+     *        long time might be evicted and expire
+     * @param args the extra arguments that should be part of the ID
+     * @return the generated component ID
+     */
+    @SuppressWarnings("OverloadedVarargsMethod")
+    public String generateComponentId(Lifespan lifespan, String... args) {
+        return generator.generate(
+                new ComponentId(userInteractionType.getPrefixedName(name), Arrays.asList(args)),
+                lifespan);
+    }
+}
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/componentids/ComponentIdStore.java b/application/src/main/java/org/togetherjava/tjbot/commands/componentids/ComponentIdStore.java
index 7883c280ae..223593526c 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/componentids/ComponentIdStore.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/componentids/ComponentIdStore.java
@@ -8,6 +8,7 @@
 import org.jooq.Result;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.SlashCommand;
 import org.togetherjava.tjbot.db.Database;
 import org.togetherjava.tjbot.db.generated.tables.ComponentIds;
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/filesharing/FileSharingMessageListener.java b/application/src/main/java/org/togetherjava/tjbot/commands/filesharing/FileSharingMessageListener.java
index 9e145b6b2e..f4c0316ac5 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/filesharing/FileSharingMessageListener.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/filesharing/FileSharingMessageListener.java
@@ -10,6 +10,7 @@
 import net.dv8tion.jda.api.interactions.components.buttons.Button;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.MessageReceiverAdapter;
 import org.togetherjava.tjbot.config.Config;
 
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/help/AskCommand.java b/application/src/main/java/org/togetherjava/tjbot/commands/help/AskCommand.java
index 59ce0f3fff..2b0c253e09 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/help/AskCommand.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/help/AskCommand.java
@@ -16,6 +16,7 @@
 import net.dv8tion.jda.api.requests.RestAction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.CommandVisibility;
 import org.togetherjava.tjbot.commands.SlashCommandAdapter;
 import org.togetherjava.tjbot.config.Config;
@@ -47,7 +48,7 @@
  */
 public final class AskCommand extends SlashCommandAdapter {
     private static final Logger logger = LoggerFactory.getLogger(AskCommand.class);
-
+    public static final String COMMAND_NAME = "ask";
     private static final String TITLE_OPTION = "title";
     private static final String CATEGORY_OPTION = "category";
     private final HelpSystemHelper helper;
@@ -126,6 +127,7 @@ private RestAction<Message> handleEvent(InteractionHook eventHook, ThreadChannel
             Member author, String title, String category, Guild guild) {
         helper.writeHelpThreadToDatabase(author, threadChannel);
         return sendInitialMessage(guild, threadChannel, author, title, category)
+            .flatMap(Message::pin)
             .flatMap(any -> notifyUser(eventHook, threadChannel))
             .flatMap(any -> helper.sendExplanationMessage(threadChannel));
     }
@@ -136,10 +138,11 @@ private RestAction<Message> sendInitialMessage(Guild guild, ThreadChannel thread
             .map(role -> " (%s)".formatted(role.getAsMention()))
             .orElse("");
 
-        String contentPattern = "%s has a question about '**%s**'%%s and will send the details now."
-            .formatted(author.getAsMention(), title);
-        String contentWithoutRole = contentPattern.formatted("");
-        String contentWithRole = contentPattern.formatted(roleMentionDescription);
+        String contentPrefix =
+                "%s has a question about '**%s**'".formatted(author.getAsMention(), title);
+        String contentSuffix = " and will send the details now.";
+        String contentWithoutRole = contentPrefix + contentSuffix;
+        String contentWithRole = contentPrefix + roleMentionDescription + contentSuffix;
 
         // We want to invite all members of a role, but without hard-pinging them. However,
         // manually inviting them is cumbersome and can hit rate limits.
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/help/AutoPruneHelperRoutine.java b/application/src/main/java/org/togetherjava/tjbot/commands/help/AutoPruneHelperRoutine.java
index 5d20b179e1..926595c270 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/help/AutoPruneHelperRoutine.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/help/AutoPruneHelperRoutine.java
@@ -7,6 +7,7 @@
 import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.Routine;
 import org.togetherjava.tjbot.config.Config;
 import org.togetherjava.tjbot.db.Database;
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/help/BotMessageCleanup.java b/application/src/main/java/org/togetherjava/tjbot/commands/help/BotMessageCleanup.java
index 768341fad0..514f2ebbbf 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/help/BotMessageCleanup.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/help/BotMessageCleanup.java
@@ -9,6 +9,7 @@
 import net.dv8tion.jda.internal.requests.CompletedRestAction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.Routine;
 import org.togetherjava.tjbot.config.Config;
 import org.togetherjava.tjbot.config.HelpSystemConfig;
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/help/HelpSystemHelper.java b/application/src/main/java/org/togetherjava/tjbot/commands/help/HelpSystemHelper.java
index 2831d23400..4dce9512e0 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/help/HelpSystemHelper.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/help/HelpSystemHelper.java
@@ -7,6 +7,7 @@
 import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel;
 import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel;
+import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
 import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
 import net.dv8tion.jda.api.requests.RestAction;
 import net.dv8tion.jda.api.requests.restaction.MessageCreateAction;
@@ -16,6 +17,8 @@
 import net.dv8tion.jda.internal.requests.CompletedRestAction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
+import org.togetherjava.tjbot.commands.utils.MessageUtils;
 import org.togetherjava.tjbot.config.Config;
 import org.togetherjava.tjbot.config.HelpSystemConfig;
 import org.togetherjava.tjbot.db.Database;
@@ -23,6 +26,7 @@
 import org.togetherjava.tjbot.db.generated.tables.records.HelpThreadsRecord;
 
 import javax.annotation.Nullable;
+
 import java.awt.Color;
 import java.io.InputStream;
 import java.util.List;
@@ -90,7 +94,16 @@ public HelpSystemHelper(JDA jda, Config config, Database database) {
         categoryRoleSuffix = helpConfig.getCategoryRoleSuffix();
     }
 
-    RestAction<Message> sendExplanationMessage(MessageChannel threadChannel) {
+    RestAction<Message> sendExplanationMessage(GuildMessageChannel threadChannel) {
+        return MessageUtils
+            .mentionSlashCommand(threadChannel.getGuild(), HelpThreadCommand.COMMAND_NAME,
+                    HelpThreadCommand.Subcommand.CLOSE.getCommandName())
+            .flatMap(closeCommandMention -> sendExplanationMessage(threadChannel,
+                    closeCommandMention));
+    }
+
+    private RestAction<Message> sendExplanationMessage(GuildMessageChannel threadChannel,
+            String closeCommandMention) {
         boolean useCodeSyntaxExampleImage = true;
         InputStream codeSyntaxExampleData =
                 AskCommand.class.getResourceAsStream("/" + CODE_SYNTAX_EXAMPLE_PATH);
@@ -115,7 +128,8 @@ RestAction<Message> sendExplanationMessage(MessageChannel threadChannel) {
                                     **provide details**, context, more code, examples and maybe some screenshots. \
                                     With enough info, someone knows the answer for sure."""),
                 HelpSystemHelper.embedWith(
-                        "Don't forget to close your thread using the command **/help-thread close** when your question has been answered, thanks."));
+                        "Don't forget to close your thread using the command %s when your question has been answered, thanks."
+                            .formatted(closeCommandMention)));
 
         MessageCreateAction action = threadChannel.sendMessage(message);
         if (useCodeSyntaxExampleImage) {
@@ -298,16 +312,24 @@ private void executeUncategorizedAdviceCheck(long threadChannelId, long authorId
             }
 
             // Still no category, send advice
-            MessageEmbed embed = HelpSystemHelper.embedWith(
-                    """
-                            Hey there 👋 You have to select a category for your help thread, otherwise nobody can see your question.
-                            Please use the `/help-thread change category` slash-command and pick what fits best, thanks 🙂
-                            """);
-            MessageCreateData message = new MessageCreateBuilder().setContent(author.getAsMention())
-                .setEmbeds(embed)
-                .build();
-
-            return threadChannel.sendMessage(message);
+            return MessageUtils
+                .mentionSlashCommand(threadChannel.getGuild(), HelpThreadCommand.COMMAND_NAME,
+                        HelpThreadCommand.CHANGE_SUBCOMMAND_GROUP,
+                        HelpThreadCommand.Subcommand.CHANGE_CATEGORY.getCommandName())
+                .flatMap(command -> {
+                    MessageEmbed embed = HelpSystemHelper.embedWith(
+                            """
+                                    Hey there 👋 You have to select a category for your help thread, otherwise nobody can see your question.
+                                    Please use the %s slash-command and pick what fits best, thanks 🙂
+                                    """
+                                .formatted(command));
+                    MessageCreateData message =
+                            new MessageCreateBuilder().setContent(author.getAsMention())
+                                .setEmbeds(embed)
+                                .build();
+
+                    return threadChannel.sendMessage(message);
+                });
         }).queue();
     }
 
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/help/HelpThreadActivityUpdater.java b/application/src/main/java/org/togetherjava/tjbot/commands/help/HelpThreadActivityUpdater.java
index 75db5e8f1a..4f46f68e5d 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/help/HelpThreadActivityUpdater.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/help/HelpThreadActivityUpdater.java
@@ -10,6 +10,7 @@
 import net.dv8tion.jda.api.requests.RestAction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.Routine;
 
 import java.util.List;
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/help/HelpThreadAutoArchiver.java b/application/src/main/java/org/togetherjava/tjbot/commands/help/HelpThreadAutoArchiver.java
index ef98c5f523..e60341cbbc 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/help/HelpThreadAutoArchiver.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/help/HelpThreadAutoArchiver.java
@@ -10,6 +10,7 @@
 import net.dv8tion.jda.api.utils.TimeUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.Routine;
 
 import java.time.Duration;
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/help/HelpThreadCommand.java b/application/src/main/java/org/togetherjava/tjbot/commands/help/HelpThreadCommand.java
index b37c503537..b4e52339f6 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/help/HelpThreadCommand.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/help/HelpThreadCommand.java
@@ -16,6 +16,7 @@
 import net.dv8tion.jda.api.interactions.commands.build.SubcommandGroupData;
 import net.dv8tion.jda.api.requests.RestAction;
 import net.dv8tion.jda.api.requests.restaction.WebhookMessageEditAction;
+
 import org.togetherjava.tjbot.commands.CommandVisibility;
 import org.togetherjava.tjbot.commands.SlashCommandAdapter;
 import org.togetherjava.tjbot.config.Config;
@@ -44,6 +45,8 @@ public final class HelpThreadCommand extends SlashCommandAdapter {
     private static final String CHANGE_CATEGORY_OPTION = "category";
     private static final String CHANGE_TITLE_OPTION = "title";
     private static final String CHANGE_TITLE_SUBCOMMAND = "title";
+    public static final String CHANGE_SUBCOMMAND_GROUP = "change";
+    public static final String COMMAND_NAME = "help-thread";
 
     private final HelpSystemHelper helper;
     private final Map<String, Subcommand> nameToSubcommand;
@@ -57,7 +60,7 @@ public final class HelpThreadCommand extends SlashCommandAdapter {
      * @param helper the helper to use
      */
     public HelpThreadCommand(Config config, HelpSystemHelper helper) {
-        super("help-thread", "Help thread specific commands", CommandVisibility.GUILD);
+        super(COMMAND_NAME, "Help thread specific commands", CommandVisibility.GUILD);
 
         OptionData categoryChoices =
                 new OptionData(OptionType.STRING, CHANGE_CATEGORY_OPTION, "new category", true);
@@ -71,9 +74,9 @@ public HelpThreadCommand(Config config, HelpSystemHelper helper) {
         SubcommandData changeTitle = Subcommand.CHANGE_TITLE.toSubcommandData()
             .addOption(OptionType.STRING, CHANGE_TITLE_OPTION, "new title", true);
 
-        SubcommandGroupData changeCommands =
-                new SubcommandGroupData("change", "Change the details of this help thread")
-                    .addSubcommands(changeCategory, changeTitle);
+        SubcommandGroupData changeCommands = new SubcommandGroupData(CHANGE_SUBCOMMAND_GROUP,
+                "Change the details of this help thread").addSubcommands(changeCategory,
+                        changeTitle);
         getData().addSubcommandGroups(changeCommands);
 
         getData().addSubcommands(Subcommand.CLOSE.toSubcommandData());
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/help/HelpThreadMetadataPurger.java b/application/src/main/java/org/togetherjava/tjbot/commands/help/HelpThreadMetadataPurger.java
index 929b5c5b6d..34c6d3c644 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/help/HelpThreadMetadataPurger.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/help/HelpThreadMetadataPurger.java
@@ -3,6 +3,7 @@
 import net.dv8tion.jda.api.JDA;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.Routine;
 import org.togetherjava.tjbot.db.Database;
 import org.togetherjava.tjbot.db.generated.tables.HelpThreads;
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/help/HelpThreadOverviewUpdater.java b/application/src/main/java/org/togetherjava/tjbot/commands/help/HelpThreadOverviewUpdater.java
index 3337e18f6e..85e0a59fc2 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/help/HelpThreadOverviewUpdater.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/help/HelpThreadOverviewUpdater.java
@@ -1,5 +1,6 @@
 package org.togetherjava.tjbot.commands.help;
 
+import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Message;
@@ -15,11 +16,13 @@
 import net.dv8tion.jda.internal.requests.CompletedRestAction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.MessageReceiverAdapter;
 import org.togetherjava.tjbot.commands.Routine;
 import org.togetherjava.tjbot.config.Config;
 
 import javax.annotation.Nullable;
+
 import java.util.*;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
@@ -39,7 +42,7 @@
 public final class HelpThreadOverviewUpdater extends MessageReceiverAdapter implements Routine {
     private static final Logger logger = LoggerFactory.getLogger(HelpThreadOverviewUpdater.class);
 
-    private static final String STATUS_TITLE = "## __**Active questions**__ ##";
+    private static final String STATUS_TITLE = "## Active questions ##";
     private static final int OVERVIEW_QUESTION_LIMIT = 150;
     private static final AtomicInteger FIND_STATUS_MESSAGE_CONSECUTIVE_FAILURES =
             new AtomicInteger(0);
@@ -120,7 +123,9 @@ private void updateOverview(TextChannel overviewChannel) {
         logger.debug("Found {} active questions", activeThreads.size());
 
         MessageEditData message = new MessageEditBuilder()
-            .setContent(STATUS_TITLE + "\n\n" + createDescription(activeThreads))
+            .setEmbeds(new EmbedBuilder().setTitle(STATUS_TITLE)
+                .setDescription(createDescription(activeThreads))
+                .build())
             .build();
 
         getStatusMessage(overviewChannel)
@@ -163,12 +168,13 @@ private static RestAction<Optional<Message>> getStatusMessage(MessageChannel cha
     }
 
     private static boolean isStatusMessage(Message message) {
-        if (!message.getAuthor().equals(message.getJDA().getSelfUser())) {
+        if (message.getEmbeds().isEmpty()
+                || !message.getAuthor().equals(message.getJDA().getSelfUser())) {
             return false;
         }
 
-        String content = message.getContentRaw();
-        return content.startsWith(STATUS_TITLE);
+        String messageEmbedTitle = message.getEmbeds().get(0).getTitle();
+        return STATUS_TITLE.equals(messageEmbedTitle);
     }
 
     private RestAction<Message> sendUpdatedOverview(@Nullable Message statusMessage,
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/help/ImplicitAskListener.java b/application/src/main/java/org/togetherjava/tjbot/commands/help/ImplicitAskListener.java
index 38289df454..3b550cb0b0 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/help/ImplicitAskListener.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/help/ImplicitAskListener.java
@@ -10,12 +10,13 @@
 import net.dv8tion.jda.api.exceptions.ErrorResponseException;
 import net.dv8tion.jda.api.requests.ErrorResponse;
 import net.dv8tion.jda.api.requests.RestAction;
-import net.dv8tion.jda.api.requests.restaction.MessageCreateAction;
 import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder;
 import net.dv8tion.jda.api.utils.messages.MessageCreateData;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.MessageReceiverAdapter;
+import org.togetherjava.tjbot.commands.utils.MessageUtils;
 import org.togetherjava.tjbot.config.Config;
 
 import java.time.Instant;
@@ -117,13 +118,15 @@ private boolean handleIsNotOnCooldown(Message message) {
         String threadDescription = lastHelpThread == null ? "your previously created help thread"
                 : lastHelpThread.getAsMention();
 
-        message.getChannel()
-            .sendMessage("""
-                    %s Please use %s to follow up on your question, \
-                    or use `/ask` to ask a new questions, thanks."""
-                .formatted(author.getAsMention(), threadDescription))
-            .flatMap(any -> message.delete())
+        MessageUtils.mentionSlashCommand(message.getGuild(), AskCommand.COMMAND_NAME)
+            .flatMap(command -> message.getChannel()
+                .sendMessage("""
+                        %s Please use %s to follow up on your question, \
+                        or use %s to ask a new questions, thanks."""
+                    .formatted(author.getAsMention(), threadDescription, command))
+                .flatMap(any -> message.delete()))
             .queue();
+
         return false;
     }
 
@@ -170,7 +173,7 @@ private RestAction<?> handleEvent(ThreadChannel threadChannel, Message message,
                     author.getIdLong()));
     }
 
-    private static MessageCreateAction sendInitialMessage(ThreadChannel threadChannel,
+    private static RestAction<Message> sendInitialMessage(ThreadChannel threadChannel,
             Message originalMessage, String title) {
         String content = originalMessage.getContentRaw();
         Member author = originalMessage.getMember();
@@ -181,27 +184,34 @@ private static MessageCreateAction sendInitialMessage(ThreadChannel threadChanne
             .setColor(HelpSystemHelper.AMBIENT_COLOR)
             .build();
 
-        MessageCreateData threadMessage = new MessageCreateBuilder()
-            .setContent(
-                    """
+        return MessageUtils
+            .mentionSlashCommand(originalMessage.getGuild(), HelpThreadCommand.COMMAND_NAME,
+                    HelpThreadCommand.CHANGE_SUBCOMMAND_GROUP,
+                    HelpThreadCommand.Subcommand.CHANGE_CATEGORY.getCommandName())
+            .flatMap(command -> {
+                MessageCreateData threadMessage = new MessageCreateBuilder()
+                    .setContent("""
                             %s has a question about '**%s**' and will send the details now.
 
-                            Please use `/help-thread change category` to greatly increase the visibility of the question."""
-                        .formatted(author, title))
-            .setEmbeds(embed)
-            .build();
+                            Please use %s to greatly increase the visibility of the question."""
+                        .formatted(author, title, command))
+                    .setEmbeds(embed)
+                    .build();
+
+                return threadChannel.sendMessage(threadMessage);
+            });
 
-        return threadChannel.sendMessage(threadMessage);
     }
 
-    private static MessageCreateAction notifyUser(IMentionable threadChannel, Message message) {
-        return message.getChannel()
-            .sendMessage(
-                    """
-                            %s Please use `/ask` to ask questions. Don't worry though, I created %s for you. \
-                            Please continue there, thanks."""
-                        .formatted(message.getAuthor().getAsMention(),
-                                threadChannel.getAsMention()));
+    private static RestAction<Message> notifyUser(IMentionable threadChannel, Message message) {
+        return MessageUtils.mentionSlashCommand(message.getGuild(), AskCommand.COMMAND_NAME)
+            .flatMap(command -> message.getChannel()
+                .sendMessage(
+                        """
+                                %s Please use %s to ask questions. Don't worry though, I created %s for you. \
+                                Please continue there, thanks."""
+                            .formatted(message.getAuthor().getAsMention(), command,
+                                    threadChannel.getAsMention())));
     }
 
     private static void handleFailure(Throwable exception) {
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/help/OnGuildLeaveCloseThreadListener.java b/application/src/main/java/org/togetherjava/tjbot/commands/help/OnGuildLeaveCloseThreadListener.java
index 0d68901753..19eb37b3d6 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/help/OnGuildLeaveCloseThreadListener.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/help/OnGuildLeaveCloseThreadListener.java
@@ -1,23 +1,27 @@
 package org.togetherjava.tjbot.commands.help;
 
 import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.MessageEmbed;
 import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel;
 import net.dv8tion.jda.api.events.guild.member.GuildMemberRemoveEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.EventReceiver;
 import org.togetherjava.tjbot.db.Database;
-import org.togetherjava.tjbot.db.generated.tables.HelpThreads;
 
 import java.util.HashSet;
 import java.util.Set;
 
+import static org.togetherjava.tjbot.db.generated.tables.HelpThreads.HELP_THREADS;
+
 /**
  * Remove all thread channels associated to a user when they leave the guild.
  */
-public class OnGuildLeaveCloseThreadListener extends ListenerAdapter implements EventReceiver {
+public final class OnGuildLeaveCloseThreadListener extends ListenerAdapter
+        implements EventReceiver {
     private static final Logger logger =
             LoggerFactory.getLogger(OnGuildLeaveCloseThreadListener.class);
     private final Database database;
@@ -33,28 +37,35 @@ public OnGuildLeaveCloseThreadListener(Database database) {
 
     @Override
     public void onGuildMemberRemove(GuildMemberRemoveEvent leaveEvent) {
-        Set<Long> channelIds = getThreadsCreatedByLeaver(leaveEvent.getUser().getIdLong());
+        Set<Long> channelIds = fetchThreadsByLeaver(leaveEvent.getUser().getIdLong());
         for (long channelId : channelIds) {
-            closeThread(channelId, leaveEvent);
+            closeThread(channelId, leaveEvent.getGuild());
         }
     }
 
-    private Set<Long> getThreadsCreatedByLeaver(long leaverId) {
-        return new HashSet<>(database
-            .readTransaction(context -> context.select(HelpThreads.HELP_THREADS.CHANNEL_ID))
-            .from(HelpThreads.HELP_THREADS)
-            .where(HelpThreads.HELP_THREADS.AUTHOR_ID.eq(leaverId))
-            .fetch(databaseMapper -> databaseMapper.getValue(HelpThreads.HELP_THREADS.CHANNEL_ID)));
+    private Set<Long> fetchThreadsByLeaver(long leaverId) {
+        return new HashSet<>(
+                database.readTransaction(context -> context.select(HELP_THREADS.CHANNEL_ID))
+                    .from(HELP_THREADS)
+                    .where(HELP_THREADS.AUTHOR_ID.eq(leaverId))
+                    .fetch(databaseMapper -> databaseMapper.getValue(HELP_THREADS.CHANNEL_ID)));
     }
 
-    private void closeThread(long channelId, GuildMemberRemoveEvent leaveEvent) {
-        ThreadChannel threadChannel = leaveEvent.getGuild().getThreadChannelById(channelId);
+    private void closeThread(long channelId, Guild guild) {
+        ThreadChannel threadChannel = guild.getThreadChannelById(channelId);
         if (threadChannel == null) {
             logger.warn(
                     "Attempted to archive thread id: '{}' but could not find thread in guild: '{}'.",
-                    channelId, leaveEvent.getGuild().getName());
+                    channelId, guild.getName());
             return;
         }
+        if (threadChannel.isArchived()) {
+            logger.debug(
+                    "Attempted to archive thread id: '{}' in guild: '{}' but thread is already closed.",
+                    channelId, guild.getName());
+            return;
+        }
+
         MessageEmbed embed = new EmbedBuilder().setTitle("OP left")
             .setDescription("Closing thread...")
             .setColor(HelpSystemHelper.AMBIENT_COLOR)
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/mathcommands/TeXCommand.java b/application/src/main/java/org/togetherjava/tjbot/commands/mathcommands/TeXCommand.java
index ead51436f8..4bfd4ec0d2 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/mathcommands/TeXCommand.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/mathcommands/TeXCommand.java
@@ -12,10 +12,12 @@
 import org.scilab.forge.jlatexmath.TeXFormula;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.CommandVisibility;
 import org.togetherjava.tjbot.commands.SlashCommandAdapter;
 
 import javax.imageio.ImageIO;
+
 import java.awt.Color;
 import java.awt.Image;
 import java.awt.image.BufferedImage;
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/mathcommands/wolframalpha/WolframAlphaCommand.java b/application/src/main/java/org/togetherjava/tjbot/commands/mathcommands/wolframalpha/WolframAlphaCommand.java
index fb549df9ce..bd0884cf55 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/mathcommands/wolframalpha/WolframAlphaCommand.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/mathcommands/wolframalpha/WolframAlphaCommand.java
@@ -4,8 +4,9 @@
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.interactions.callbacks.IDeferrableCallback;
 import net.dv8tion.jda.api.interactions.commands.OptionType;
-import org.togetherjava.tjbot.commands.CommandVisibility;
 import net.dv8tion.jda.api.utils.FileUpload;
+
+import org.togetherjava.tjbot.commands.CommandVisibility;
 import org.togetherjava.tjbot.commands.SlashCommandAdapter;
 import org.togetherjava.tjbot.config.Config;
 
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/mathcommands/wolframalpha/WolframAlphaHandler.java b/application/src/main/java/org/togetherjava/tjbot/commands/mathcommands/wolframalpha/WolframAlphaHandler.java
index 749ddee1fe..82a375ecc2 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/mathcommands/wolframalpha/WolframAlphaHandler.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/mathcommands/wolframalpha/WolframAlphaHandler.java
@@ -7,8 +7,9 @@
 import net.dv8tion.jda.api.entities.MessageEmbed;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.togetherjava.tjbot.commands.mathcommands.wolframalpha.api.Error;
+
 import org.togetherjava.tjbot.commands.mathcommands.wolframalpha.api.*;
+import org.togetherjava.tjbot.commands.mathcommands.wolframalpha.api.Error;
 
 import java.awt.Color;
 import java.awt.image.BufferedImage;
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/mathcommands/wolframalpha/WolframAlphaImages.java b/application/src/main/java/org/togetherjava/tjbot/commands/mathcommands/wolframalpha/WolframAlphaImages.java
index b1287e2b2d..25cff2c349 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/mathcommands/wolframalpha/WolframAlphaImages.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/mathcommands/wolframalpha/WolframAlphaImages.java
@@ -4,6 +4,7 @@
 import org.togetherjava.tjbot.commands.mathcommands.wolframalpha.api.WolframAlphaImage;
 
 import javax.imageio.ImageIO;
+
 import java.awt.Color;
 import java.awt.Font;
 import java.awt.Graphics;
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/mathcommands/wolframalpha/api/RelatedExamples.java b/application/src/main/java/org/togetherjava/tjbot/commands/mathcommands/wolframalpha/api/RelatedExamples.java
index f016a9f6b5..b7a3253573 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/mathcommands/wolframalpha/api/RelatedExamples.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/mathcommands/wolframalpha/api/RelatedExamples.java
@@ -6,9 +6,9 @@
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 
-import java.util.List;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.List;
 
 /**
  * See the Wolfram Alpha API.
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/mediaonly/MediaOnlyChannelListener.java b/application/src/main/java/org/togetherjava/tjbot/commands/mediaonly/MediaOnlyChannelListener.java
index af29d1013f..e9fc277b5c 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/mediaonly/MediaOnlyChannelListener.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/mediaonly/MediaOnlyChannelListener.java
@@ -8,6 +8,7 @@
 import net.dv8tion.jda.api.requests.RestAction;
 import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder;
 import net.dv8tion.jda.api.utils.messages.MessageCreateData;
+
 import org.togetherjava.tjbot.commands.MessageReceiverAdapter;
 import org.togetherjava.tjbot.config.Config;
 
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/moderation/ActionRecord.java b/application/src/main/java/org/togetherjava/tjbot/commands/moderation/ActionRecord.java
index cf4c1075ba..080db80c14 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/moderation/ActionRecord.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/moderation/ActionRecord.java
@@ -3,6 +3,7 @@
 import org.togetherjava.tjbot.db.generated.tables.records.ModerationActionsRecord;
 
 import javax.annotation.Nullable;
+
 import java.time.Instant;
 
 /**
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/moderation/AuditCommand.java b/application/src/main/java/org/togetherjava/tjbot/commands/moderation/AuditCommand.java
index f8e9f560bc..0a173c63ed 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/moderation/AuditCommand.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/moderation/AuditCommand.java
@@ -18,10 +18,12 @@
 import net.dv8tion.jda.api.utils.messages.MessageEditBuilder;
 import net.dv8tion.jda.api.utils.messages.MessageRequest;
 import net.dv8tion.jda.internal.requests.CompletedRestAction;
+
 import org.togetherjava.tjbot.commands.CommandVisibility;
 import org.togetherjava.tjbot.commands.SlashCommandAdapter;
 
 import javax.annotation.Nullable;
+
 import java.time.Instant;
 import java.time.ZoneOffset;
 import java.util.*;
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/moderation/BanCommand.java b/application/src/main/java/org/togetherjava/tjbot/commands/moderation/BanCommand.java
index 01596d37a1..751c15679e 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/moderation/BanCommand.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/moderation/BanCommand.java
@@ -16,11 +16,13 @@
 import net.dv8tion.jda.api.utils.Result;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.CommandVisibility;
 import org.togetherjava.tjbot.commands.SlashCommandAdapter;
 import org.togetherjava.tjbot.logging.LogMarkers;
 
 import javax.annotation.Nullable;
+
 import java.time.Instant;
 import java.util.List;
 import java.util.Objects;
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/moderation/KickCommand.java b/application/src/main/java/org/togetherjava/tjbot/commands/moderation/KickCommand.java
index dc88789e44..696476a3e6 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/moderation/KickCommand.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/moderation/KickCommand.java
@@ -14,11 +14,13 @@
 import net.dv8tion.jda.api.utils.Result;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.CommandVisibility;
 import org.togetherjava.tjbot.commands.SlashCommandAdapter;
 import org.togetherjava.tjbot.logging.LogMarkers;
 
 import javax.annotation.Nullable;
+
 import java.util.Objects;
 
 /**
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/moderation/ModerationActionsStore.java b/application/src/main/java/org/togetherjava/tjbot/commands/moderation/ModerationActionsStore.java
index 6d6e79f456..06248d51c5 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/moderation/ModerationActionsStore.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/moderation/ModerationActionsStore.java
@@ -1,11 +1,13 @@
 package org.togetherjava.tjbot.commands.moderation;
 
 import org.jooq.Condition;
+
 import org.togetherjava.tjbot.db.Database;
 import org.togetherjava.tjbot.db.generated.tables.ModerationActions;
 import org.togetherjava.tjbot.db.generated.tables.records.ModerationActionsRecord;
 
 import javax.annotation.Nullable;
+
 import java.time.Instant;
 import java.util.List;
 import java.util.Objects;
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/moderation/ModerationUtils.java b/application/src/main/java/org/togetherjava/tjbot/commands/moderation/ModerationUtils.java
index b46f339767..58a2e232ce 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/moderation/ModerationUtils.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/moderation/ModerationUtils.java
@@ -4,11 +4,14 @@
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.*;
 import net.dv8tion.jda.api.interactions.callbacks.IReplyCallback;
+import net.dv8tion.jda.api.requests.restaction.AuditableRestAction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.config.Config;
 
 import javax.annotation.Nullable;
+
 import java.awt.Color;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
@@ -28,7 +31,7 @@ private ModerationUtils() {
     private static final Logger logger = LoggerFactory.getLogger(ModerationUtils.class);
     /**
      * The maximal character limit for the reason of an auditable action, see for example
-     * {@link Guild#ban(User, int, String)}.
+     * {@link AuditableRestAction#reason(String)}.
      */
     private static final int REASON_MAX_LENGTH = 512;
     /**
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/moderation/MuteCommand.java b/application/src/main/java/org/togetherjava/tjbot/commands/moderation/MuteCommand.java
index 8102a2e646..c925496ad1 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/moderation/MuteCommand.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/moderation/MuteCommand.java
@@ -11,12 +11,14 @@
 import net.dv8tion.jda.api.utils.Result;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.CommandVisibility;
 import org.togetherjava.tjbot.commands.SlashCommandAdapter;
 import org.togetherjava.tjbot.config.Config;
 import org.togetherjava.tjbot.logging.LogMarkers;
 
 import javax.annotation.Nullable;
+
 import java.time.Instant;
 import java.util.List;
 import java.util.Objects;
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/moderation/NoteCommand.java b/application/src/main/java/org/togetherjava/tjbot/commands/moderation/NoteCommand.java
index 803a664302..12287abe45 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/moderation/NoteCommand.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/moderation/NoteCommand.java
@@ -7,11 +7,13 @@
 import net.dv8tion.jda.api.interactions.commands.OptionType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.CommandVisibility;
 import org.togetherjava.tjbot.commands.SlashCommandAdapter;
 import org.togetherjava.tjbot.logging.LogMarkers;
 
 import javax.annotation.Nullable;
+
 import java.util.Objects;
 
 /**
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/moderation/QuarantineCommand.java b/application/src/main/java/org/togetherjava/tjbot/commands/moderation/QuarantineCommand.java
index 9599db922c..7dd2efdb5d 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/moderation/QuarantineCommand.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/moderation/QuarantineCommand.java
@@ -10,12 +10,14 @@
 import net.dv8tion.jda.api.utils.Result;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.CommandVisibility;
 import org.togetherjava.tjbot.commands.SlashCommandAdapter;
 import org.togetherjava.tjbot.config.Config;
 import org.togetherjava.tjbot.logging.LogMarkers;
 
 import javax.annotation.Nullable;
+
 import java.util.Objects;
 
 /**
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/moderation/RejoinModerationRoleListener.java b/application/src/main/java/org/togetherjava/tjbot/commands/moderation/RejoinModerationRoleListener.java
index cec8f35260..9ef3d59e75 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/moderation/RejoinModerationRoleListener.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/moderation/RejoinModerationRoleListener.java
@@ -8,6 +8,7 @@
 import net.dv8tion.jda.api.events.guild.member.GuildMemberJoinEvent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.EventReceiver;
 import org.togetherjava.tjbot.config.Config;
 import org.togetherjava.tjbot.logging.LogMarkers;
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/moderation/UnbanCommand.java b/application/src/main/java/org/togetherjava/tjbot/commands/moderation/UnbanCommand.java
index 0bc6d5746b..f4fdc0239e 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/moderation/UnbanCommand.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/moderation/UnbanCommand.java
@@ -9,6 +9,7 @@
 import net.dv8tion.jda.api.requests.ErrorResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.CommandVisibility;
 import org.togetherjava.tjbot.commands.SlashCommandAdapter;
 import org.togetherjava.tjbot.logging.LogMarkers;
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/moderation/UnmuteCommand.java b/application/src/main/java/org/togetherjava/tjbot/commands/moderation/UnmuteCommand.java
index dfd77ac67e..0e388a2911 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/moderation/UnmuteCommand.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/moderation/UnmuteCommand.java
@@ -10,12 +10,14 @@
 import net.dv8tion.jda.api.utils.Result;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.CommandVisibility;
 import org.togetherjava.tjbot.commands.SlashCommandAdapter;
 import org.togetherjava.tjbot.config.Config;
 import org.togetherjava.tjbot.logging.LogMarkers;
 
 import javax.annotation.Nullable;
+
 import java.util.Objects;
 
 /**
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/moderation/UnquarantineCommand.java b/application/src/main/java/org/togetherjava/tjbot/commands/moderation/UnquarantineCommand.java
index 6619c7ce12..2839d77b2f 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/moderation/UnquarantineCommand.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/moderation/UnquarantineCommand.java
@@ -10,12 +10,14 @@
 import net.dv8tion.jda.api.utils.Result;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.CommandVisibility;
 import org.togetherjava.tjbot.commands.SlashCommandAdapter;
 import org.togetherjava.tjbot.config.Config;
 import org.togetherjava.tjbot.logging.LogMarkers;
 
 import javax.annotation.Nullable;
+
 import java.util.Objects;
 
 /**
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/moderation/WarnCommand.java b/application/src/main/java/org/togetherjava/tjbot/commands/moderation/WarnCommand.java
index ef7073dea3..0e52fea049 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/moderation/WarnCommand.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/moderation/WarnCommand.java
@@ -9,11 +9,13 @@
 import net.dv8tion.jda.api.utils.Result;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.CommandVisibility;
 import org.togetherjava.tjbot.commands.SlashCommandAdapter;
 import org.togetherjava.tjbot.logging.LogMarkers;
 
 import javax.annotation.Nullable;
+
 import java.util.Objects;
 
 /**
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/moderation/WhoIsCommand.java b/application/src/main/java/org/togetherjava/tjbot/commands/moderation/WhoIsCommand.java
index fe7bfaad8e..e039343544 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/moderation/WhoIsCommand.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/moderation/WhoIsCommand.java
@@ -8,11 +8,13 @@
 import net.dv8tion.jda.api.interactions.commands.OptionMapping;
 import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.requests.restaction.interactions.ReplyCallbackAction;
+
 import org.togetherjava.tjbot.commands.CommandVisibility;
 import org.togetherjava.tjbot.commands.SlashCommandAdapter;
 import org.togetherjava.tjbot.commands.utils.DiscordClientAction;
 
 import javax.annotation.CheckReturnValue;
+
 import java.awt.*;
 import java.time.Instant;
 import java.time.OffsetDateTime;
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/moderation/attachment/BlacklistedAttachmentListener.java b/application/src/main/java/org/togetherjava/tjbot/commands/moderation/attachment/BlacklistedAttachmentListener.java
index 130cdbf2eb..cd42cc2d82 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/moderation/attachment/BlacklistedAttachmentListener.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/moderation/attachment/BlacklistedAttachmentListener.java
@@ -7,6 +7,7 @@
 import net.dv8tion.jda.api.requests.RestAction;
 import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder;
 import net.dv8tion.jda.api.utils.messages.MessageCreateData;
+
 import org.togetherjava.tjbot.commands.MessageReceiverAdapter;
 import org.togetherjava.tjbot.config.Config;
 import org.togetherjava.tjbot.moderation.ModAuditLogWriter;
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/moderation/scam/ScamBlocker.java b/application/src/main/java/org/togetherjava/tjbot/commands/moderation/scam/ScamBlocker.java
index f12e547944..de54d7e19a 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/moderation/scam/ScamBlocker.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/moderation/scam/ScamBlocker.java
@@ -15,11 +15,12 @@
 import net.dv8tion.jda.api.utils.messages.MessageCreateData;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.MessageReceiverAdapter;
+import org.togetherjava.tjbot.commands.UserInteractionType;
 import org.togetherjava.tjbot.commands.UserInteractor;
-import org.togetherjava.tjbot.commands.componentids.ComponentId;
 import org.togetherjava.tjbot.commands.componentids.ComponentIdGenerator;
-import org.togetherjava.tjbot.commands.componentids.Lifespan;
+import org.togetherjava.tjbot.commands.componentids.ComponentIdInteractor;
 import org.togetherjava.tjbot.commands.moderation.ModerationAction;
 import org.togetherjava.tjbot.commands.moderation.ModerationActionsStore;
 import org.togetherjava.tjbot.commands.moderation.ModerationUtils;
@@ -57,7 +58,7 @@ public final class ScamBlocker extends MessageReceiverAdapter implements UserInt
     private final ScamHistoryStore scamHistoryStore;
     private final Predicate<String> hasRequiredRole;
 
-    private ComponentIdGenerator componentIdGenerator;
+    private final ComponentIdInteractor componentIdInteractor;
 
     /**
      * Creates a new listener to receive all message sent in any channel.
@@ -81,6 +82,8 @@ public ScamBlocker(ModerationActionsStore actionsStore, ScamHistoryStore scamHis
                 Pattern.compile(reportChannelPattern).asMatchPredicate();
         isReportChannel = channel -> isReportChannelName.test(channel.getName());
         hasRequiredRole = Pattern.compile(config.getSoftModerationRolePattern()).asMatchPredicate();
+
+        componentIdInteractor = new ComponentIdInteractor(getInteractionType(), getName());
     }
 
     @Override
@@ -88,6 +91,11 @@ public String getName() {
         return "scam-blocker";
     }
 
+    @Override
+    public UserInteractionType getInteractionType() {
+        return UserInteractionType.OTHER;
+    }
+
     @Override
     public void onSelectionMenu(SelectMenuInteractionEvent event, List<String> args) {
         throw new UnsupportedOperationException("Not used");
@@ -95,7 +103,7 @@ public void onSelectionMenu(SelectMenuInteractionEvent event, List<String> args)
 
     @Override
     public void acceptComponentIdGenerator(ComponentIdGenerator generator) {
-        componentIdGenerator = generator;
+        componentIdInteractor.acceptComponentIdGenerator(generator);
     }
 
     @Override
@@ -265,8 +273,7 @@ private List<Button> createConfirmDialog(MessageReceivedEvent event) {
     }
 
     private String generateComponentId(ComponentIdArguments args) {
-        return Objects.requireNonNull(componentIdGenerator)
-            .generate(new ComponentId(getName(), args.toList()), Lifespan.REGULAR);
+        return componentIdInteractor.generateComponentId(args.toArray());
     }
 
     @Override
@@ -345,9 +352,9 @@ static ComponentIdArguments fromList(List<String> args) {
                     contentHash);
         }
 
-        List<String> toList() {
-            return List.of(mode.name(), Long.toString(guildId), Long.toString(channelId),
-                    Long.toString(messageId), Long.toString(authorId), contentHash);
+        String[] toArray() {
+            return new String[] {mode.name(), Long.toString(guildId), Long.toString(channelId),
+                    Long.toString(messageId), Long.toString(authorId), contentHash};
         }
     }
 }
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/moderation/scam/ScamHistoryPurgeRoutine.java b/application/src/main/java/org/togetherjava/tjbot/commands/moderation/scam/ScamHistoryPurgeRoutine.java
index e776aa4293..848c65ad52 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/moderation/scam/ScamHistoryPurgeRoutine.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/moderation/scam/ScamHistoryPurgeRoutine.java
@@ -1,6 +1,7 @@
 package org.togetherjava.tjbot.commands.moderation.scam;
 
 import net.dv8tion.jda.api.JDA;
+
 import org.togetherjava.tjbot.commands.Routine;
 
 import java.time.Instant;
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/moderation/scam/ScamHistoryStore.java b/application/src/main/java/org/togetherjava/tjbot/commands/moderation/scam/ScamHistoryStore.java
index 3047bd177c..1c1fcf8b4d 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/moderation/scam/ScamHistoryStore.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/moderation/scam/ScamHistoryStore.java
@@ -2,6 +2,7 @@
 
 import net.dv8tion.jda.api.entities.Message;
 import org.jooq.Result;
+
 import org.togetherjava.tjbot.commands.utils.Hashing;
 import org.togetherjava.tjbot.db.Database;
 import org.togetherjava.tjbot.db.generated.tables.records.ScamHistoryRecord;
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/moderation/temp/RevocableModerationAction.java b/application/src/main/java/org/togetherjava/tjbot/commands/moderation/temp/RevocableModerationAction.java
index 69c52870da..8564289f7b 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/moderation/temp/RevocableModerationAction.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/moderation/temp/RevocableModerationAction.java
@@ -3,6 +3,7 @@
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.requests.RestAction;
+
 import org.togetherjava.tjbot.commands.moderation.ModerationAction;
 
 /**
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/moderation/temp/RevocableRoleBasedAction.java b/application/src/main/java/org/togetherjava/tjbot/commands/moderation/temp/RevocableRoleBasedAction.java
index ed60da7694..645b4e1c48 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/moderation/temp/RevocableRoleBasedAction.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/moderation/temp/RevocableRoleBasedAction.java
@@ -3,6 +3,7 @@
 import net.dv8tion.jda.api.exceptions.ErrorResponseException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.logging.LogMarkers;
 
 /**
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/moderation/temp/TemporaryBanAction.java b/application/src/main/java/org/togetherjava/tjbot/commands/moderation/temp/TemporaryBanAction.java
index bedb8374dc..70b97aa856 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/moderation/temp/TemporaryBanAction.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/moderation/temp/TemporaryBanAction.java
@@ -7,6 +7,7 @@
 import net.dv8tion.jda.api.requests.RestAction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.moderation.ModerationAction;
 import org.togetherjava.tjbot.logging.LogMarkers;
 
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/moderation/temp/TemporaryModerationRoutine.java b/application/src/main/java/org/togetherjava/tjbot/commands/moderation/temp/TemporaryModerationRoutine.java
index d989bc6895..a8efc75bed 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/moderation/temp/TemporaryModerationRoutine.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/moderation/temp/TemporaryModerationRoutine.java
@@ -6,6 +6,7 @@
 import net.dv8tion.jda.api.requests.RestAction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.Routine;
 import org.togetherjava.tjbot.commands.moderation.ActionRecord;
 import org.togetherjava.tjbot.commands.moderation.ModerationAction;
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/moderation/temp/TemporaryMuteAction.java b/application/src/main/java/org/togetherjava/tjbot/commands/moderation/temp/TemporaryMuteAction.java
index 6b140773c6..120ede80a7 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/moderation/temp/TemporaryMuteAction.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/moderation/temp/TemporaryMuteAction.java
@@ -3,6 +3,7 @@
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.requests.RestAction;
+
 import org.togetherjava.tjbot.commands.moderation.ModerationAction;
 import org.togetherjava.tjbot.commands.moderation.ModerationUtils;
 import org.togetherjava.tjbot.config.Config;
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/moderation/temp/TemporaryQuarantineAction.java b/application/src/main/java/org/togetherjava/tjbot/commands/moderation/temp/TemporaryQuarantineAction.java
index 4d372f259c..cceee38592 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/moderation/temp/TemporaryQuarantineAction.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/moderation/temp/TemporaryQuarantineAction.java
@@ -3,6 +3,7 @@
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.requests.RestAction;
+
 import org.togetherjava.tjbot.commands.moderation.ModerationAction;
 import org.togetherjava.tjbot.commands.moderation.ModerationUtils;
 import org.togetherjava.tjbot.config.Config;
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/reminder/RemindCommand.java b/application/src/main/java/org/togetherjava/tjbot/commands/reminder/RemindCommand.java
index 6e2a4795ec..97ab7d02cd 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/reminder/RemindCommand.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/reminder/RemindCommand.java
@@ -7,6 +7,7 @@
 import net.dv8tion.jda.api.interactions.callbacks.IReplyCallback;
 import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.OptionData;
+
 import org.togetherjava.tjbot.commands.CommandVisibility;
 import org.togetherjava.tjbot.commands.SlashCommandAdapter;
 import org.togetherjava.tjbot.db.Database;
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/reminder/RemindRoutine.java b/application/src/main/java/org/togetherjava/tjbot/commands/reminder/RemindRoutine.java
index d71f5e5d5a..db09fe8ea4 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/reminder/RemindRoutine.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/reminder/RemindRoutine.java
@@ -10,10 +10,12 @@
 import net.dv8tion.jda.api.requests.restaction.MessageCreateAction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.Routine;
 import org.togetherjava.tjbot.db.Database;
 
 import javax.annotation.Nullable;
+
 import java.awt.Color;
 import java.time.Instant;
 import java.time.temporal.TemporalAccessor;
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/system/BotCore.java b/application/src/main/java/org/togetherjava/tjbot/commands/system/BotCore.java
index 771d0f9216..14ece90c2f 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/system/BotCore.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/system/BotCore.java
@@ -15,6 +15,7 @@
 import org.jetbrains.annotations.Unmodifiable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.*;
 import org.togetherjava.tjbot.commands.componentids.ComponentId;
 import org.togetherjava.tjbot.commands.componentids.ComponentIdParser;
@@ -89,12 +90,16 @@ public BotCore(JDA jda, Database database, Config config) {
             .toList();
 
         // User Interactors (e.g. slash commands)
-        prefixedNameToInteractor = features.stream()
-            .filter(UserInteractor.class::isInstance)
-            .map(UserInteractor.class::cast)
-            .filter(validateInteractorPredicate())
-            .collect(Collectors.toMap(UserInteractorPrefix::getPrefixedNameFromInstance,
-                    Function.identity()));
+        prefixedNameToInteractor =
+                features.stream()
+                    .filter(UserInteractor.class::isInstance)
+                    .map(UserInteractor.class::cast)
+                    .filter(validateInteractorPredicate())
+                    .collect(
+                            Collectors.toMap(
+                                    userInteractor -> userInteractor.getInteractionType()
+                                        .getPrefixedName(userInteractor.getName()),
+                                    Function.identity()));
 
 
         // Component Id Store
@@ -124,12 +129,16 @@ private static Predicate<UserInteractor> validateInteractorPredicate() {
         return interactor -> {
             String name = Objects.requireNonNull(interactor.getName());
 
-            for (UserInteractorPrefix value : UserInteractorPrefix.values()) {
-                String prefix = value.getPrefix();
+            for (UserInteractionType interactionType : UserInteractionType.values()) {
+                if (interactionType == UserInteractionType.OTHER) {
+                    continue;
+                }
+
+                String prefix = interactionType.getPrefix();
 
                 if (name.startsWith(prefix)) {
                     throw new IllegalArgumentException(
-                            "The interactor's name cannot start with any of the reserved prefixes. ("
+                            "The interactor's name must not start with any of the reserved prefixes. ("
                                     + prefix + ")");
                 }
             }
@@ -144,35 +153,17 @@ public Collection<UserInteractor> getInteractors() {
         return prefixedNameToInteractor.values();
     }
 
-    @Override
-    public Optional<UserInteractor> getInteractor(final String prefixedName) {
-
+    /**
+     * Gets the interactor registered under the given name, if any.
+     *
+     * @param prefixedName the name of the command (including its prefix, see
+     *        {@link UserInteractionType UserInteractionType}
+     * @return the interactor registered under this name, if any
+     */
+    private Optional<UserInteractor> getInteractor(final String prefixedName) {
         return Optional.ofNullable(prefixedNameToInteractor.get(prefixedName));
     }
 
-    @Override
-    public <T extends UserInteractor> Optional<T> getInteractor(final String name,
-            final Class<? extends T> type) {
-        Objects.requireNonNull(type, "The given type cannot be null");
-
-        String prefixedName = UserInteractorPrefix.getPrefixedNameFromClass(type, name);
-        return Optional.ofNullable(prefixedNameToInteractor.get(prefixedName))
-            .filter(type::isInstance)
-            .map(type::cast);
-    }
-
-    @Override
-    public List<UserInteractor> getInteractorsWithName(final String name) {
-        List<UserInteractor> localInteractors = new ArrayList<>(4);
-
-        for (UserInteractorPrefix value : UserInteractorPrefix.values()) {
-            getInteractor(name, value.getClassType()).ifPresent(localInteractors::add);
-        }
-
-        return localInteractors;
-    }
-
-
     /**
      * Schedules the registered routines.
      * <p>
@@ -236,9 +227,9 @@ public void onSlashCommandInteraction(SlashCommandInteractionEvent event) {
 
         logger.debug("Received slash command '{}' (#{}) on guild '{}'", name, event.getId(),
                 event.getGuild());
-        COMMAND_SERVICE.execute(() -> requireUserInteractor(
-                UserInteractorPrefix.SLASH_COMMAND.getPrefixedName(name), SlashCommand.class)
-                    .onSlashCommand(event));
+        COMMAND_SERVICE.execute(
+                () -> requireUserInteractor(UserInteractionType.SLASH_COMMAND.getPrefixedName(name),
+                        SlashCommand.class).onSlashCommand(event));
     }
 
     @Override
@@ -247,9 +238,9 @@ public void onCommandAutoCompleteInteraction(final CommandAutoCompleteInteractio
 
         logger.debug("Received auto completion from command '{}' (#{}) on guild '{}'",
                 event.getCommandPath(), event.getId(), event.getGuild());
-        COMMAND_SERVICE.execute(() -> requireUserInteractor(
-                UserInteractorPrefix.SLASH_COMMAND.getPrefixedName(name), SlashCommand.class)
-                    .onAutoComplete(event));
+        COMMAND_SERVICE.execute(
+                () -> requireUserInteractor(UserInteractionType.SLASH_COMMAND.getPrefixedName(name),
+                        SlashCommand.class).onAutoComplete(event));
     }
 
     @Override
@@ -275,7 +266,7 @@ public void onMessageContextInteraction(final MessageContextInteractionEvent eve
         logger.debug("Received message context command '{}' (#{}) on guild '{}'", name,
                 event.getId(), event.getGuild());
         COMMAND_SERVICE.execute(() -> requireUserInteractor(
-                UserInteractorPrefix.MESSAGE_CONTEXT_COMMAND.getPrefixedName(name),
+                UserInteractionType.MESSAGE_CONTEXT_COMMAND.getPrefixedName(name),
                 MessageContextCommand.class).onMessageContext(event));
     }
 
@@ -286,7 +277,7 @@ public void onUserContextInteraction(final UserContextInteractionEvent event) {
         logger.debug("Received user context command '{}' (#{}) on guild '{}'", name, event.getId(),
                 event.getGuild());
         COMMAND_SERVICE.execute(() -> requireUserInteractor(
-                UserInteractorPrefix.USER_CONTEXT_COMMAND.getPrefixedName(name),
+                UserInteractionType.USER_CONTEXT_COMMAND.getPrefixedName(name),
                 UserContextCommand.class).onUserContext(event));
     }
 
@@ -341,21 +332,22 @@ private <T extends ComponentInteraction> void forwardComponentCommand(T event,
     /**
      * Gets the given user interactor by its full name, requires it exists and is of the given type.
      *
-     * @param fullName the full name of the interactor, including the prefix
+     * @param prefixedName the prefixed name of the interactor
      * @param typeToken a token of the type to expect
      * @return the user interactor with the given name
      * @param <T> the type to expect the user interactor to be of
      */
-    private <T extends UserInteractor> T requireUserInteractor(String fullName,
+    private <T extends UserInteractor> T requireUserInteractor(String prefixedName,
             Class<T> typeToken) {
-        UserInteractor userInteractor = getInteractor(fullName).orElseThrow(
-                () -> new IllegalArgumentException("There is no interactor with name " + fullName));
+        UserInteractor userInteractor =
+                getInteractor(prefixedName).orElseThrow(() -> new IllegalArgumentException(
+                        "There is no interactor with name " + prefixedName));
 
         if (!typeToken.isInstance(userInteractor)) {
             throw new IllegalArgumentException(
                     "The interactor %s is not of the expected type %s, but instead %s".formatted(
-                            fullName, typeToken.getSimpleName(),
-                            fullName.getClass().getSimpleName()));
+                            prefixedName, typeToken.getSimpleName(),
+                            prefixedName.getClass().getSimpleName()));
         }
 
         return typeToken.cast(userInteractor);
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/system/CommandProvider.java b/application/src/main/java/org/togetherjava/tjbot/commands/system/CommandProvider.java
index 639b7dbf6d..7446d335fa 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/system/CommandProvider.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/system/CommandProvider.java
@@ -4,8 +4,6 @@
 import org.togetherjava.tjbot.commands.UserInteractor;
 
 import java.util.Collection;
-import java.util.List;
-import java.util.Optional;
 
 /**
  * Provides all registered commands.
@@ -29,42 +27,4 @@ default Collection<BotCommand> getCommands() {
             .map(BotCommand.class::cast)
             .toList();
     }
-
-    /**
-     * Gets the interactor registered under the given name, if any.
-     * <p>
-     * This command expects the name to include the prefix already, if you prefer using a
-     * {@link Class} instance of the command/type instead, use {@link #getInteractor(String, Class)}
-     * instead.
-     *
-     * @param prefixedName the name of the command (including its prefix, see
-     *        {@link org.togetherjava.tjbot.commands.UserInteractorPrefix UserInteractorPrefix}
-     * @return the interactor registered under this name, if any
-     */
-    Optional<UserInteractor> getInteractor(String prefixedName);
-
-    /**
-     * Gets the interactor registered under the given name, if any.
-     * <p>
-     * Unlike {@link #getInteractor(String)}, this command expects the name, without the prefix (see
-     * {@link org.togetherjava.tjbot.commands.UserInteractorPrefix UserInteractorPrefix}). Instead,
-     * this command expects a {@link Class} instance of the commands class. This can be
-     * {@link org.togetherjava.tjbot.commands.SlashCommand SlashCommand}, or even as specific as
-     * {@link org.togetherjava.tjbot.commands.basic.PingCommand PingCommand}.
-     *
-     * @param name the name of the command without prefix
-     * @param type the type of the command
-     * @return the interactor registered under this name, if any
-     */
-    <T extends UserInteractor> Optional<T> getInteractor(String name, Class<? extends T> type);
-
-    /**
-     * Gets any interactors with the given name. The name you give should be without prefix, these
-     * methods checks all prefixes themselves. If your name is with prefix, use
-     * {@link #getInteractor(String)}
-     *
-     * @param name the name of the command
-     * @return a list of commands with that name, can be empty if none match
-     */
-    List<UserInteractor> getInteractorsWithName(final String name);
 }
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/system/LogLevelCommand.java b/application/src/main/java/org/togetherjava/tjbot/commands/system/LogLevelCommand.java
index 3e11f2f367..b4ff600a1d 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/system/LogLevelCommand.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/system/LogLevelCommand.java
@@ -6,6 +6,7 @@
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.core.config.Configurator;
+
 import org.togetherjava.tjbot.commands.CommandVisibility;
 import org.togetherjava.tjbot.commands.SlashCommandAdapter;
 
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/tags/TagCommand.java b/application/src/main/java/org/togetherjava/tjbot/commands/tags/TagCommand.java
index 2e00048a18..5818a34afb 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/tags/TagCommand.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/tags/TagCommand.java
@@ -1,15 +1,21 @@
 package org.togetherjava.tjbot.commands.tags;
 
 import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
+import net.dv8tion.jda.api.interactions.AutoCompleteQuery;
+import net.dv8tion.jda.api.interactions.commands.Command;
 import net.dv8tion.jda.api.interactions.commands.OptionMapping;
 import net.dv8tion.jda.api.interactions.commands.OptionType;
+import net.dv8tion.jda.api.interactions.commands.build.OptionData;
 import net.dv8tion.jda.api.requests.restaction.interactions.ReplyCallbackAction;
+
 import org.togetherjava.tjbot.commands.CommandVisibility;
 import org.togetherjava.tjbot.commands.SlashCommandAdapter;
+import org.togetherjava.tjbot.commands.utils.StringDistances;
 
 import java.time.Instant;
-import java.util.Objects;
+import java.util.Collection;
 
 /**
  * Implements the {@code /tag} command which lets the bot respond content of a tag that has been
@@ -20,7 +26,7 @@
  */
 public final class TagCommand extends SlashCommandAdapter {
     private final TagSystem tagSystem;
-
+    private static final int MAX_SUGGESTIONS = 5;
     static final String ID_OPTION = "id";
     static final String REPLY_TO_USER_OPTION = "reply-to";
 
@@ -34,16 +40,16 @@ public TagCommand(TagSystem tagSystem) {
 
         this.tagSystem = tagSystem;
 
-        // TODO Think about adding an ephemeral selection menu with pagination support
-        // if the user calls this without id or similar
-        getData().addOption(OptionType.STRING, ID_OPTION, "The id of the tag to display", true)
-            .addOption(OptionType.USER, REPLY_TO_USER_OPTION,
-                    "Optionally, the user who you want to reply to", false);
+        getData().addOptions(
+                new OptionData(OptionType.STRING, ID_OPTION, "The id of the tag to display", true,
+                        true),
+                new OptionData(OptionType.USER, REPLY_TO_USER_OPTION,
+                        "Optionally, the user who you want to reply to", false));
     }
 
     @Override
     public void onSlashCommand(SlashCommandInteractionEvent event) {
-        String id = Objects.requireNonNull(event.getOption(ID_OPTION)).getAsString();
+        String id = event.getOption(ID_OPTION).getAsString();
         OptionMapping replyToUserOption = event.getOption(REPLY_TO_USER_OPTION);
 
         if (tagSystem.handleIsUnknownTag(id, event)) {
@@ -62,4 +68,22 @@ public void onSlashCommand(SlashCommandInteractionEvent event) {
         }
         message.queue();
     }
+
+    @Override
+    public void onAutoComplete(CommandAutoCompleteInteractionEvent event) {
+        AutoCompleteQuery focusedOption = event.getFocusedOption();
+
+        if (!focusedOption.getName().equals(ID_OPTION)) {
+            throw new IllegalArgumentException(
+                    "Unexpected option, was: " + focusedOption.getName());
+        }
+
+        Collection<Command.Choice> choices = StringDistances
+            .closeMatches(focusedOption.getValue(), tagSystem.getAllIds(), MAX_SUGGESTIONS)
+            .stream()
+            .map(id -> new Command.Choice(id, id))
+            .toList();
+
+        event.replyChoices(choices).queue();
+    }
 }
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/tags/TagManageCommand.java b/application/src/main/java/org/togetherjava/tjbot/commands/tags/TagManageCommand.java
index d72a4e1b14..385d60b990 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/tags/TagManageCommand.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/tags/TagManageCommand.java
@@ -13,11 +13,13 @@
 import net.dv8tion.jda.api.utils.FileUpload;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.CommandVisibility;
 import org.togetherjava.tjbot.commands.SlashCommandAdapter;
 import org.togetherjava.tjbot.moderation.ModAuditLogWriter;
 
 import javax.annotation.Nullable;
+
 import java.nio.charset.StandardCharsets;
 import java.time.Instant;
 import java.time.temporal.TemporalAccessor;
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/tags/TagSystem.java b/application/src/main/java/org/togetherjava/tjbot/commands/tags/TagSystem.java
index 5d7d0cce41..96c70a8d61 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/tags/TagSystem.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/tags/TagSystem.java
@@ -4,6 +4,7 @@
 import net.dv8tion.jda.api.interactions.callbacks.IReplyCallback;
 import net.dv8tion.jda.api.interactions.components.buttons.Button;
 import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle;
+
 import org.togetherjava.tjbot.commands.utils.StringDistances;
 import org.togetherjava.tjbot.db.Database;
 import org.togetherjava.tjbot.db.generated.tables.Tags;
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/tags/TagsCommand.java b/application/src/main/java/org/togetherjava/tjbot/commands/tags/TagsCommand.java
index 1d1bffd7b6..1a425eab2d 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/tags/TagsCommand.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/tags/TagsCommand.java
@@ -6,6 +6,7 @@
 import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.CommandVisibility;
 import org.togetherjava.tjbot.commands.SlashCommandAdapter;
 
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/tophelper/TopHelpersCommand.java b/application/src/main/java/org/togetherjava/tjbot/commands/tophelper/TopHelpersCommand.java
index 1ce9b20b80..27dc57ee6d 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/tophelper/TopHelpersCommand.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/tophelper/TopHelpersCommand.java
@@ -14,11 +14,14 @@
 import org.jooq.impl.DSL;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.CommandVisibility;
 import org.togetherjava.tjbot.commands.SlashCommandAdapter;
+import org.togetherjava.tjbot.commands.utils.MessageUtils;
 import org.togetherjava.tjbot.db.Database;
 
 import javax.annotation.Nullable;
+
 import java.math.BigDecimal;
 import java.time.*;
 import java.time.format.TextStyle;
@@ -40,7 +43,9 @@ public final class TopHelpersCommand extends SlashCommandAdapter {
     private static final Logger logger = LoggerFactory.getLogger(TopHelpersCommand.class);
     private static final String COMMAND_NAME = "top-helpers";
     private static final String MONTH_OPTION = "at-month";
-    private static final int TOP_HELPER_LIMIT = 20;
+    private static final int TOP_HELPER_LIMIT = 18;
+
+    private static final int MAX_USER_NAME_LIMIT = 15;
 
     private final Database database;
 
@@ -141,8 +146,11 @@ private static void handleTopHelpers(Collection<TopHelperResult> topHelpers,
                     userIdToMember.get(topHelper.authorId())))
             .toList();
 
-        String message =
-                "```java%n%s%n```".formatted(dataTableToString(topHelpersDataTable, timeRange));
+        String message = """
+                ```java
+                // for %s
+                %s
+                ```""".formatted(timeRange.description(), dataTableToString(topHelpersDataTable));
 
         event.getHook().editOriginal(message).queue();
     }
@@ -150,20 +158,18 @@ private static void handleTopHelpers(Collection<TopHelperResult> topHelpers,
     private static List<String> topHelperToDataRow(TopHelperResult topHelper,
             @Nullable Member member) {
         String id = Long.toString(topHelper.authorId());
-        String name = member == null ? "UNKNOWN_USER" : member.getEffectiveName();
+        String name = MessageUtils.abbreviate(
+                member == null ? "UNKNOWN_USER" : member.getEffectiveName(), MAX_USER_NAME_LIMIT);
         String messageLengths = Long.toString(topHelper.messageLengths().longValue());
 
         return List.of(id, name, messageLengths);
     }
 
-    private static String dataTableToString(Collection<List<String>> dataTable,
-            TimeRange timeRange) {
+    private static String dataTableToString(Collection<List<String>> dataTable) {
         return dataTableToAsciiTable(dataTable,
                 List.of(new ColumnSetting("Id", HorizontalAlign.RIGHT),
                         new ColumnSetting("Name", HorizontalAlign.RIGHT),
-                        new ColumnSetting(
-                                "Message lengths (for %s)".formatted(timeRange.description()),
-                                HorizontalAlign.RIGHT)));
+                        new ColumnSetting("Message lengths", HorizontalAlign.RIGHT)));
     }
 
     private static String dataTableToAsciiTable(Collection<List<String>> dataTable,
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/tophelper/TopHelpersMessageListener.java b/application/src/main/java/org/togetherjava/tjbot/commands/tophelper/TopHelpersMessageListener.java
index 488b17a64f..58603474cd 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/tophelper/TopHelpersMessageListener.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/tophelper/TopHelpersMessageListener.java
@@ -3,6 +3,7 @@
 import net.dv8tion.jda.api.entities.channel.ChannelType;
 import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
+
 import org.togetherjava.tjbot.commands.MessageReceiverAdapter;
 import org.togetherjava.tjbot.config.Config;
 import org.togetherjava.tjbot.db.Database;
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/tophelper/TopHelpersPurgeMessagesRoutine.java b/application/src/main/java/org/togetherjava/tjbot/commands/tophelper/TopHelpersPurgeMessagesRoutine.java
index 49d2e55d41..d99924ddce 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/tophelper/TopHelpersPurgeMessagesRoutine.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/tophelper/TopHelpersPurgeMessagesRoutine.java
@@ -3,6 +3,7 @@
 import net.dv8tion.jda.api.JDA;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.Routine;
 import org.togetherjava.tjbot.db.Database;
 
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/utils/DiscordClientAction.java b/application/src/main/java/org/togetherjava/tjbot/commands/utils/DiscordClientAction.java
index 7a60dd9604..a1dba61977 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/utils/DiscordClientAction.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/utils/DiscordClientAction.java
@@ -7,7 +7,7 @@
 import java.util.regex.Pattern;
 
 /**
- * Class which contains all actions a Discord client accepts.
+ * Class, which contains all actions a Discord client accepts.
  * <p>
  * This allows you to open DM's {@link Channels#DM_CHANNEL}, specific settings
  * {@link Settings.App#VOICE} and much more.
@@ -23,25 +23,25 @@
  * Example:
  *
  * <pre>
- * <code>
+ * {@code
  * event.reply("Open Discord's secret home page!")
  *      .addActionRow(DiscordClientAction.Guild.GUILD_HOME_CHANNEL.asLinkButton("Open home page!", event.getGuild().getId())
- * </code>
+ * }
  * </pre>
  *
  * To improve readability, one might want to use a static import like:
  *
  * <pre>
- * <code>
+ * {@code
  * event.reply(whoIsCommandOutput)
  *      .addActionRow(USER.asLinkButton("Open home page!", target.getId())
- * </code>
+ * }
  * </pre>
  */
 public final class DiscordClientAction {
 
     /**
-     * Contains some of the more general actions
+     * Contains some of the more general actions.
      */
     public enum General {
         ;
@@ -65,7 +65,7 @@ public enum General {
     }
 
     /**
-     * Contains guild specific actions
+     * Contains actions related to guilds.
      */
     public enum Guild {
         ;
@@ -94,7 +94,7 @@ public enum Guild {
     }
 
     /**
-     * Contains actions related to channels
+     * Contains actions related to channels.
      */
     public enum Channels {
         ;
@@ -110,7 +110,7 @@ public enum Channels {
     }
 
     /**
-     * Contains actions related to the settings menu
+     * Contains actions related to the settings menu.
      */
     /*
      * The warning is about this inner class being too long, and that it should be external This
@@ -122,7 +122,7 @@ public enum Settings {
         ;
 
         /**
-         * Contains all user settings
+         * Contains all user settings.
          */
         public enum User {
             ;
@@ -140,7 +140,7 @@ public enum User {
         }
 
         /**
-         * Contains all payment settings
+         * Contains all payment settings.
          */
         public enum Payment {
             ;
@@ -156,7 +156,7 @@ public enum Payment {
         }
 
         /**
-         * Contains all app settings
+         * Contains all app settings.
          */
         public enum App {
             ;
@@ -195,7 +195,7 @@ public enum App {
         }
 
         /**
-         * Contains some of the more general settings
+         * Contains some of the more general settings.
          */
         public enum General {
             ;
@@ -211,6 +211,9 @@ public enum General {
         }
     }
 
+    /**
+     * Contains actions related to game libraries.
+     */
     public enum Library {
         ;
 
@@ -227,15 +230,15 @@ public enum Library {
     }
 
     /**
-     * Pattern for the arguments, finds everything within brackets
+     * Pattern for the arguments, finds everything within brackets.
      */
     public static final Pattern argumentPattern = Pattern.compile("\\{[^}]*}");
 
-    private final String url;
+    private final String rawUrl;
 
     @Contract(pure = true)
     private DiscordClientAction(final String url) {
-        this.url = url;
+        rawUrl = url;
     }
 
     /**
@@ -249,7 +252,7 @@ private DiscordClientAction(final String url) {
      * @see #formatUrl(String...)
      */
     public String getRawUrl() {
-        return url;
+        return rawUrl;
     }
 
     /**
@@ -260,7 +263,7 @@ public String getRawUrl() {
      * @throws IllegalArgumentException When missing arguments
      */
     public String formatUrl(final String... arguments) {
-        String localUrl = url;
+        String localUrl = rawUrl;
 
         for (final String argument : arguments) {
             localUrl = argumentPattern.matcher(localUrl).replaceFirst(argument);
@@ -288,6 +291,6 @@ public Button asLinkButton(final String label, final String... arguments) {
 
     @Override
     public String toString() {
-        return "DiscordClientAction{" + "url='" + url + '\'' + '}';
+        return "DiscordClientAction{" + "url='" + rawUrl + '\'' + '}';
     }
 }
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/utils/MessageUtils.java b/application/src/main/java/org/togetherjava/tjbot/commands/utils/MessageUtils.java
index 10e8436763..4768006d75 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/utils/MessageUtils.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/utils/MessageUtils.java
@@ -1,8 +1,11 @@
 package org.togetherjava.tjbot.commands.utils;
 
+import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.interactions.commands.Command;
 import net.dv8tion.jda.api.interactions.components.ActionRow;
 import net.dv8tion.jda.api.interactions.components.buttons.Button;
+import net.dv8tion.jda.api.requests.RestAction;
 import net.dv8tion.jda.api.utils.MarkdownSanitizer;
 
 import java.util.List;
@@ -14,6 +17,8 @@
  * other commands to avoid similar methods appearing everywhere.
  */
 public class MessageUtils {
+    private static final String ABBREVIATION = "...";
+
     private MessageUtils() {
         throw new UnsupportedOperationException("Utility class, construction not supported");
     }
@@ -40,7 +45,7 @@ public static void disableButtons(Message message) {
 
     /**
      * Escapes every markdown content in the given string.
-     *
+     * <p>
      * If the escaped message is sent to Discord, it will display the original message.
      * 
      * @param text the text to escape
@@ -56,4 +61,52 @@ public static String escapeMarkdown(String text) {
         return afterEscape.replace("\\```", "\\`\\`\\`");
     }
 
+    /**
+     * Converts a slash command text to a mentioned slash command, which you can directly click on
+     * in Discord.
+     *
+     * @param guild the {@link Guild} that contains the command
+     * @param commandName the command's name
+     * @param subCommands optional subcommand group & subcommand, depending on the base command used
+     * @return Formatted string for the mentioned slash command
+     * @throws IllegalArgumentException when the command isn't found in the guild
+     */
+    public static RestAction<String> mentionSlashCommand(Guild guild, String commandName,
+            String... subCommands) {
+        return guild.retrieveCommands().map(guildCommands -> {
+            Command guildCommand = guildCommands.stream()
+                .filter(c -> c.getName().equalsIgnoreCase(commandName))
+                .findAny()
+                .orElseThrow(
+                        () -> new IllegalArgumentException("Command '%s' does not exist in guild %s"
+                            .formatted(commandName, guild.getId())));
+            String commandPath = commandName;
+            if (subCommands.length > 0) {
+                commandPath += " " + String.join(" ", subCommands);
+            }
+            return String.format("</%s:%s>", String.join(" ", commandPath), guildCommand.getId());
+        });
+    }
+
+    /**
+     * Abbreviates the given text if it is too long.
+     * <p>
+     * Abbreviation is done by adding {@value ABBREVIATION}.
+     *
+     * @param text the text to abbreviate
+     * @param maxLength the maximal length of the abbreviated text
+     * @return the abbreviated text, guaranteed to be smaller than the given length
+     */
+    public static String abbreviate(String text, int maxLength) {
+        if (text.length() <= maxLength) {
+            return text;
+        }
+
+        if (maxLength < ABBREVIATION.length()) {
+            return text.substring(0, maxLength);
+        }
+
+        return text.substring(0, maxLength - ABBREVIATION.length()) + ABBREVIATION;
+    }
+
 }
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/utils/StringDistances.java b/application/src/main/java/org/togetherjava/tjbot/commands/utils/StringDistances.java
index c839a46681..b3f522bb22 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/utils/StringDistances.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/utils/StringDistances.java
@@ -1,15 +1,19 @@
 package org.togetherjava.tjbot.commands.utils;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.IntStream;
+import java.util.stream.Stream;
 
 /**
  * Utility class for computing string distances, for example the edit distance between two words.
  */
 public class StringDistances {
+    /**
+     * Matches that are further off than this are not considered as match anymore. The value is
+     * between 0.0 (full match) and 1.0 (completely different).
+     */
+    private static final double OFF_BY_PERCENTAGE_THRESHOLD = 0.5;
+
     private StringDistances() {
         throw new UnsupportedOperationException("Utility class, construction not supported");
     }
@@ -51,6 +55,42 @@ public static <S extends CharSequence> Optional<S> autocomplete(CharSequence pre
             .min(Comparator.comparingInt(candidate -> prefixEditDistance(prefix, candidate)));
     }
 
+    /**
+     * Gives sorted suggestion to autocomplete a prefix string from the given options.
+     *
+     * @param prefix the prefix to give matches for
+     * @param candidates all the possible matches
+     * @param limit number of matches to generate at max
+     * @return the matches closest to the given prefix, limited to the given limit
+     */
+    public static Collection<String> closeMatches(CharSequence prefix,
+            Collection<String> candidates, int limit) {
+        if (candidates.isEmpty()) {
+            return List.of();
+        }
+
+        Collection<MatchScore> scoredMatches = candidates.stream()
+            .map(candidate -> new MatchScore(candidate, prefixEditDistance(prefix, candidate)))
+            .toList();
+
+        Queue<MatchScore> bestMatches = new PriorityQueue<>();
+        bestMatches.addAll(scoredMatches);
+
+        return Stream.generate(bestMatches::poll)
+            .limit(limit)
+            .takeWhile(matchScore -> isCloseEnough(matchScore, prefix))
+            .map(MatchScore::candidate)
+            .toList();
+    }
+
+    private static boolean isCloseEnough(MatchScore matchScore, CharSequence prefix) {
+        if (prefix.isEmpty()) {
+            return true;
+        }
+
+        return matchScore.score / prefix.length() <= OFF_BY_PERCENTAGE_THRESHOLD;
+    }
+
     /**
      * Distance to receive {@code destination} from {@code source} by editing.
      * <p>
@@ -141,4 +181,17 @@ private static int[][] computeLevenshteinDistanceTable(CharSequence source,
 
         return table;
     }
+
+    private record MatchScore(String candidate, double score) implements Comparable<MatchScore> {
+        @Override
+        public int compareTo(MatchScore otherMatchScore) {
+            int compareResult = Double.compare(this.score, otherMatchScore.score);
+
+            if (compareResult == 0) {
+                return this.candidate.compareTo(otherMatchScore.candidate);
+            }
+
+            return compareResult;
+        }
+    }
 }
diff --git a/application/src/main/java/org/togetherjava/tjbot/logging/FlaggedFilter.java b/application/src/main/java/org/togetherjava/tjbot/logging/FlaggedFilter.java
deleted file mode 100644
index 844c90a24f..0000000000
--- a/application/src/main/java/org/togetherjava/tjbot/logging/FlaggedFilter.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.togetherjava.tjbot.logging;
-
-import org.apache.logging.log4j.core.Core;
-import org.apache.logging.log4j.core.Filter;
-import org.apache.logging.log4j.core.LogEvent;
-import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
-import org.apache.logging.log4j.core.config.plugins.PluginFactory;
-import org.apache.logging.log4j.core.filter.AbstractFilter;
-
-/**
- * A custom Filter for Log4j2, which only lets an event pass through if a Logging Flag is set in the
- * environment. Intended to be used for local development for devs do not want to also run the
- * logviewer project. No errors in console or Log should appear, if the Flag is not set and the
- * logviewer is not running.
- */
-@Plugin(name = "FlaggedFilter", category = Core.CATEGORY_NAME, elementType = Filter.ELEMENT_TYPE)
-public class FlaggedFilter extends AbstractFilter {
-
-    /**
-     * The environment Variable that needs to bet set in order for this Filter to let events through
-     */
-    public static final String LOGGING_FLAG = "TJ_APPENDER";
-
-    /**
-     * Create a FlaggedFilter.
-     *
-     * @param onMatch The action to take on a match.
-     * @param onMismatch The action to take on a mismatch.
-     */
-    public FlaggedFilter(Result onMatch, Result onMismatch) {
-        super(onMatch, onMismatch);
-    }
-
-    /**
-     * The actual filtering occurs here. If the Flag {@link #LOGGING_FLAG} is not set returns
-     * {@link Result#DENY} so nothing goes through. If the Flag is set it returns
-     * {@link Result#NEUTRAL} so other configured Filter still work.
-     *
-     * @param event The Event to log.
-     * @return {@link Result#DENY} if the Flag is not set, else {@link Result#NEUTRAL}
-     */
-    @Override
-    public Result filter(LogEvent event) {
-        return isLoggingEnabled() ? Result.NEUTRAL : Result.DENY;
-    }
-
-    boolean isLoggingEnabled() {
-        return System.getenv().containsKey(LOGGING_FLAG);
-    }
-
-    /**
-     * Required by the Log4j2 - Plugin framework in order to create an instance of this Filter.
-     *
-     * @param onMatch The action to take on a match.
-     * @param onMismatch The action to take on a mismatch.
-     * @return The created FlaggedFilter.
-     */
-    @PluginFactory
-    public static FlaggedFilter createFilter(
-            @PluginAttribute(value = "onMatch", defaultString = "NEUTRAL") Result onMatch,
-
-            @PluginAttribute(value = "onMismatch", defaultString = "DENY") Result onMismatch) {
-        return new FlaggedFilter(onMatch, onMismatch);
-    }
-}
diff --git a/application/src/main/java/org/togetherjava/tjbot/logging/discord/DiscordLogForwarder.java b/application/src/main/java/org/togetherjava/tjbot/logging/discord/DiscordLogForwarder.java
index 92b087d073..ac13027b4e 100644
--- a/application/src/main/java/org/togetherjava/tjbot/logging/discord/DiscordLogForwarder.java
+++ b/application/src/main/java/org/togetherjava/tjbot/logging/discord/DiscordLogForwarder.java
@@ -9,8 +9,12 @@
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
+import org.togetherjava.tjbot.commands.utils.MessageUtils;
 import org.togetherjava.tjbot.logging.LogMarkers;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.net.URI;
 import java.time.Instant;
 import java.util.*;
@@ -35,14 +39,32 @@ final class DiscordLogForwarder {
     private static final Logger logger = LoggerFactory.getLogger(DiscordLogForwarder.class);
 
     private static final int MAX_PENDING_LOGS = 10_000;
-    private static final int MAX_BATCH_SIZE = WebhookMessage.MAX_EMBEDS;
+    private static final int MAX_PENDING_LOGS_WARNING_THRESHOLD = 8_000;
+
     private static final ScheduledExecutorService SERVICE =
             Executors.newSingleThreadScheduledExecutor();
+
+    private static final int MAX_BATCH_SIZE = WebhookMessage.MAX_EMBEDS;
+    /**
+     * The max total length of all descriptions contained in a batch of embeds sent to Discord.
+     */
+    private static final int MAX_BATCH_DESCRIPTION_TOTAL = 6_000;
     /**
-     * Has to be small enough for fitting all {@value MAX_BATCH_SIZE} embeds contained in a batch
-     * into the total character length of ~6000.
+     * Has to be small enough for fitting most {@value MAX_BATCH_SIZE} embeds contained in a batch
+     * into the total character length of {@value MAX_BATCH_DESCRIPTION_TOTAL}.
+     * <p>
+     * This limit is preferred to {@link #MAX_EMBED_DESCRIPTION_SHORT}, as usually only a few
+     * messages are too large and need to be limited.
      */
     private static final int MAX_EMBED_DESCRIPTION = 1_000;
+    /**
+     * Small enough for fitting all {@value MAX_BATCH_SIZE} embeds contained in a batch into the
+     * total character length of {@value MAX_BATCH_DESCRIPTION_TOTAL}.
+     * <p>
+     * Used when {@link #MAX_EMBED_DESCRIPTION} lead to exceeding the limit.
+     */
+    private static final int MAX_EMBED_DESCRIPTION_SHORT = 400;
+
     private static final Map<Level, Integer> LEVEL_TO_AMBIENT_COLOR =
             Map.of(Level.TRACE, 0x00B362, Level.DEBUG, 0x00A5CE, Level.INFO, 0xAC59FF, Level.WARN,
                     0xDFDF00, Level.ERROR, 0xBF2200, Level.FATAL, 0xFF8484);
@@ -80,6 +102,13 @@ void forwardLogEvent(LogEvent event) {
                             Logs are forwarded to Discord slower than they pile up. Discarding the latest log...""");
             return;
         }
+        if (pendingLogs.size() >= MAX_PENDING_LOGS_WARNING_THRESHOLD) {
+            logger.warn("""
+                    Nearing the max amount of logs that can be buffered. \
+                    Logs are forwarded to Discord slower than they pile up. \
+                    Look into the issue, logs will soon be discarded otherwise...
+                    """);
+        }
 
         LogMessage log = LogMessage.ofEvent(event);
 
@@ -95,6 +124,7 @@ private void processPendingLogs() {
             if (logsToProcess.isEmpty()) {
                 return;
             }
+            logsToProcess = validateBatch(logsToProcess);
 
             List<WebhookEmbed> logBatch = logsToProcess.stream().map(LogMessage::embed).toList();
 
@@ -112,6 +142,21 @@ private List<LogMessage> pollLogsToProcessBatch() {
         }
     }
 
+    private List<LogMessage> validateBatch(List<LogMessage> logBatch) {
+        int totalDescriptionLength = logBatch.stream()
+            .map(LogMessage::embed)
+            .map(WebhookEmbed::getDescription)
+            .mapToInt(description -> description == null ? 0 : description.length())
+            .sum();
+
+        if (totalDescriptionLength >= MAX_BATCH_DESCRIPTION_TOTAL) {
+            // Shorten logs further to go below limit
+            return logBatch.stream().map(LogMessage::shortened).toList();
+        }
+
+        return new ArrayList<>(logBatch);
+    }
+
     private record LogMessage(WebhookEmbed embed,
             Instant timestamp) implements Comparable<LogMessage> {
 
@@ -120,7 +165,7 @@ private static LogMessage ofEvent(LogEvent event) {
             String title = event.getLevel().name();
             int colorDecimal = Objects.requireNonNull(LEVEL_TO_AMBIENT_COLOR.get(event.getLevel()));
             String description =
-                    abbreviate(event.getMessage().getFormattedMessage(), MAX_EMBED_DESCRIPTION);
+                    MessageUtils.abbreviate(describeLogEvent(event), MAX_EMBED_DESCRIPTION);
             Instant timestamp = Instant.ofEpochMilli(event.getInstant().getEpochMillisecond());
 
             WebhookEmbed embed = new WebhookEmbedBuilder()
@@ -134,16 +179,27 @@ private static LogMessage ofEvent(LogEvent event) {
             return new LogMessage(embed, timestamp);
         }
 
-        private static String abbreviate(String text, int maxLength) {
-            if (text.length() < maxLength) {
-                return text;
-            }
+        private static String describeLogEvent(LogEvent event) {
+            String logMessage = event.getMessage().getFormattedMessage();
 
-            if (maxLength < 3) {
-                return text.substring(0, maxLength);
+            Throwable exception = event.getThrown();
+            if (exception == null) {
+                return logMessage;
             }
 
-            return text.substring(0, maxLength - 3) + "...";
+            StringWriter exceptionWriter = new StringWriter();
+            exception.printStackTrace(new PrintWriter(exceptionWriter));
+
+            return logMessage + "\n" + exceptionWriter.toString().replace("\t", "> ");
+        }
+
+        private LogMessage shortened() {
+            String shortDescription = MessageUtils.abbreviate(
+                    Objects.requireNonNull(embed.getDescription()), MAX_EMBED_DESCRIPTION_SHORT);
+            WebhookEmbed shortEmbed =
+                    new WebhookEmbedBuilder(embed).setDescription(shortDescription).build();
+
+            return new LogMessage(shortEmbed, timestamp);
         }
 
         @Override
diff --git a/application/src/main/java/org/togetherjava/tjbot/logging/discord/DiscordLogging.java b/application/src/main/java/org/togetherjava/tjbot/logging/discord/DiscordLogging.java
index da823cc501..da53282cf7 100644
--- a/application/src/main/java/org/togetherjava/tjbot/logging/discord/DiscordLogging.java
+++ b/application/src/main/java/org/togetherjava/tjbot/logging/discord/DiscordLogging.java
@@ -11,6 +11,7 @@
 import org.apache.logging.log4j.core.filter.MarkerFilter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.config.Config;
 import org.togetherjava.tjbot.logging.LogMarkers;
 
diff --git a/application/src/main/java/org/togetherjava/tjbot/moderation/ModAuditLogWriter.java b/application/src/main/java/org/togetherjava/tjbot/moderation/ModAuditLogWriter.java
index 0d080527c3..6a4ea569e9 100644
--- a/application/src/main/java/org/togetherjava/tjbot/moderation/ModAuditLogWriter.java
+++ b/application/src/main/java/org/togetherjava/tjbot/moderation/ModAuditLogWriter.java
@@ -8,9 +8,11 @@
 import net.dv8tion.jda.api.utils.FileUpload;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.config.Config;
 
 import javax.annotation.Nullable;
+
 import java.awt.Color;
 import java.nio.charset.StandardCharsets;
 import java.time.temporal.TemporalAccessor;
diff --git a/application/src/main/java/org/togetherjava/tjbot/routines/ModAuditLogRoutine.java b/application/src/main/java/org/togetherjava/tjbot/routines/ModAuditLogRoutine.java
index 2170f27a8b..852cc1841d 100644
--- a/application/src/main/java/org/togetherjava/tjbot/routines/ModAuditLogRoutine.java
+++ b/application/src/main/java/org/togetherjava/tjbot/routines/ModAuditLogRoutine.java
@@ -18,6 +18,7 @@
 import net.dv8tion.jda.api.utils.TimeUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.togetherjava.tjbot.commands.Routine;
 import org.togetherjava.tjbot.commands.moderation.ModerationUtils;
 import org.togetherjava.tjbot.config.Config;
@@ -26,6 +27,7 @@
 import org.togetherjava.tjbot.moderation.ModAuditLogWriter;
 
 import javax.annotation.Nullable;
+
 import java.awt.Color;
 import java.time.*;
 import java.time.temporal.ChronoUnit;
diff --git a/application/src/main/resources/log4j2.xml b/application/src/main/resources/log4j2.xml
index 4f68a45e5f..3de21e9d65 100644
--- a/application/src/main/resources/log4j2.xml
+++ b/application/src/main/resources/log4j2.xml
@@ -13,13 +13,6 @@
                 <SizeBasedTriggeringPolicy size="10 MB"/>
             </Policies>
         </RollingFile>
-        <Http name="Http" url="http://${env:TJ_LOG_TARGET:-localhost}:5050/rest/api/logs">
-            <JsonLayout/>
-        </Http>
-        <Async name="AsyncHttp">
-            <FlaggedFilter/>
-            <AppenderRef ref="Http"/>
-        </Async>
     </Appenders>
     <Loggers>
         <!-- Change this level to see more of our logs -->
@@ -29,7 +22,6 @@
         <Root level="info">
             <AppenderRef ref="Console"/>
             <AppenderRef ref="File"/>
-            <AppenderRef ref="AsyncHttp"/>
         </Root>
     </Loggers>
 </Configuration>
diff --git a/application/src/test/java/org/togetherjava/tjbot/commands/SlashCommandAdapterTest.java b/application/src/test/java/org/togetherjava/tjbot/commands/SlashCommandAdapterTest.java
index 7a0bf4f3da..7af10a1861 100644
--- a/application/src/test/java/org/togetherjava/tjbot/commands/SlashCommandAdapterTest.java
+++ b/application/src/test/java/org/togetherjava/tjbot/commands/SlashCommandAdapterTest.java
@@ -3,6 +3,7 @@
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData;
 import org.junit.jupiter.api.Test;
+
 import org.togetherjava.tjbot.commands.componentids.Lifespan;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -11,7 +12,7 @@
 final class SlashCommandAdapterTest {
     private static final String NAME = "foo";
     private static final String PREFIXED_NAME =
-            UserInteractorPrefix.SLASH_COMMAND.getPrefix() + NAME;
+            UserInteractionType.SLASH_COMMAND.getPrefix() + NAME;
     private static final String DESCRIPTION = "Foo command";
     private static final CommandVisibility VISIBILITY = CommandVisibility.GUILD;
     private static final int UNIQUE_ID_ITERATIONS = 20;
diff --git a/application/src/test/java/org/togetherjava/tjbot/commands/basic/PingCommandTest.java b/application/src/test/java/org/togetherjava/tjbot/commands/basic/PingCommandTest.java
index 495995a8e7..a2f4d14a01 100644
--- a/application/src/test/java/org/togetherjava/tjbot/commands/basic/PingCommandTest.java
+++ b/application/src/test/java/org/togetherjava/tjbot/commands/basic/PingCommandTest.java
@@ -4,6 +4,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
+
 import org.togetherjava.tjbot.commands.SlashCommand;
 import org.togetherjava.tjbot.jda.JdaTester;
 
diff --git a/application/src/test/java/org/togetherjava/tjbot/commands/mathcommands/TeXCommandTest.java b/application/src/test/java/org/togetherjava/tjbot/commands/mathcommands/TeXCommandTest.java
index 33fefdf308..2e591d256f 100644
--- a/application/src/test/java/org/togetherjava/tjbot/commands/mathcommands/TeXCommandTest.java
+++ b/application/src/test/java/org/togetherjava/tjbot/commands/mathcommands/TeXCommandTest.java
@@ -7,6 +7,7 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.ArgumentMatcher;
+
 import org.togetherjava.tjbot.commands.SlashCommand;
 import org.togetherjava.tjbot.jda.JdaTester;
 
diff --git a/application/src/test/java/org/togetherjava/tjbot/commands/mediaonly/MediaOnlyChannelListenerTest.java b/application/src/test/java/org/togetherjava/tjbot/commands/mediaonly/MediaOnlyChannelListenerTest.java
index f7f7123c34..63f6ef9520 100644
--- a/application/src/test/java/org/togetherjava/tjbot/commands/mediaonly/MediaOnlyChannelListenerTest.java
+++ b/application/src/test/java/org/togetherjava/tjbot/commands/mediaonly/MediaOnlyChannelListenerTest.java
@@ -8,6 +8,7 @@
 import net.dv8tion.jda.api.utils.messages.MessageCreateData;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+
 import org.togetherjava.tjbot.config.Config;
 import org.togetherjava.tjbot.jda.JdaTester;
 
diff --git a/application/src/test/java/org/togetherjava/tjbot/commands/moderation/scam/ScamDetectorTest.java b/application/src/test/java/org/togetherjava/tjbot/commands/moderation/scam/ScamDetectorTest.java
index b2de1d67a0..8aaf8e08e8 100644
--- a/application/src/test/java/org/togetherjava/tjbot/commands/moderation/scam/ScamDetectorTest.java
+++ b/application/src/test/java/org/togetherjava/tjbot/commands/moderation/scam/ScamDetectorTest.java
@@ -5,6 +5,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
+
 import org.togetherjava.tjbot.config.Config;
 import org.togetherjava.tjbot.config.ScamBlockerConfig;
 
diff --git a/application/src/test/java/org/togetherjava/tjbot/commands/reminder/RawReminderTestHelper.java b/application/src/test/java/org/togetherjava/tjbot/commands/reminder/RawReminderTestHelper.java
index 3d7968b35b..68e9657cfb 100644
--- a/application/src/test/java/org/togetherjava/tjbot/commands/reminder/RawReminderTestHelper.java
+++ b/application/src/test/java/org/togetherjava/tjbot/commands/reminder/RawReminderTestHelper.java
@@ -2,6 +2,7 @@
 
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
+
 import org.togetherjava.tjbot.db.Database;
 import org.togetherjava.tjbot.db.generated.Tables;
 import org.togetherjava.tjbot.db.generated.tables.records.PendingRemindersRecord;
diff --git a/application/src/test/java/org/togetherjava/tjbot/commands/reminder/RemindCommandTest.java b/application/src/test/java/org/togetherjava/tjbot/commands/reminder/RemindCommandTest.java
index 857b98a278..9867efb6b0 100644
--- a/application/src/test/java/org/togetherjava/tjbot/commands/reminder/RemindCommandTest.java
+++ b/application/src/test/java/org/togetherjava/tjbot/commands/reminder/RemindCommandTest.java
@@ -7,6 +7,7 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.function.Executable;
+
 import org.togetherjava.tjbot.commands.SlashCommand;
 import org.togetherjava.tjbot.db.Database;
 import org.togetherjava.tjbot.jda.JdaTester;
diff --git a/application/src/test/java/org/togetherjava/tjbot/commands/reminder/RemindRoutineTest.java b/application/src/test/java/org/togetherjava/tjbot/commands/reminder/RemindRoutineTest.java
index 2b6910eb6a..55d0a00f7f 100644
--- a/application/src/test/java/org/togetherjava/tjbot/commands/reminder/RemindRoutineTest.java
+++ b/application/src/test/java/org/togetherjava/tjbot/commands/reminder/RemindRoutineTest.java
@@ -13,6 +13,7 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.ArgumentMatchers;
+
 import org.togetherjava.tjbot.commands.Routine;
 import org.togetherjava.tjbot.db.Database;
 import org.togetherjava.tjbot.jda.JdaTester;
diff --git a/application/src/test/java/org/togetherjava/tjbot/commands/system/ComponentIdTest.java b/application/src/test/java/org/togetherjava/tjbot/commands/system/ComponentIdTest.java
index e1a70de0a1..19f3aa7cf5 100644
--- a/application/src/test/java/org/togetherjava/tjbot/commands/system/ComponentIdTest.java
+++ b/application/src/test/java/org/togetherjava/tjbot/commands/system/ComponentIdTest.java
@@ -1,6 +1,7 @@
 package org.togetherjava.tjbot.commands.system;
 
 import org.junit.jupiter.api.Test;
+
 import org.togetherjava.tjbot.commands.componentids.ComponentId;
 
 import java.util.List;
diff --git a/application/src/test/java/org/togetherjava/tjbot/commands/tags/TagCommandTest.java b/application/src/test/java/org/togetherjava/tjbot/commands/tags/TagCommandTest.java
index eced581e77..d0bf5f99e9 100644
--- a/application/src/test/java/org/togetherjava/tjbot/commands/tags/TagCommandTest.java
+++ b/application/src/test/java/org/togetherjava/tjbot/commands/tags/TagCommandTest.java
@@ -6,6 +6,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
+
 import org.togetherjava.tjbot.commands.SlashCommand;
 import org.togetherjava.tjbot.db.Database;
 import org.togetherjava.tjbot.db.generated.tables.Tags;
diff --git a/application/src/test/java/org/togetherjava/tjbot/commands/tags/TagManageCommandTest.java b/application/src/test/java/org/togetherjava/tjbot/commands/tags/TagManageCommandTest.java
index ce02d1a873..fca926c906 100644
--- a/application/src/test/java/org/togetherjava/tjbot/commands/tags/TagManageCommandTest.java
+++ b/application/src/test/java/org/togetherjava/tjbot/commands/tags/TagManageCommandTest.java
@@ -12,6 +12,7 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
+
 import org.togetherjava.tjbot.commands.SlashCommand;
 import org.togetherjava.tjbot.config.Config;
 import org.togetherjava.tjbot.db.Database;
diff --git a/application/src/test/java/org/togetherjava/tjbot/commands/tags/TagSystemTest.java b/application/src/test/java/org/togetherjava/tjbot/commands/tags/TagSystemTest.java
index 9c441b023d..fde2316892 100644
--- a/application/src/test/java/org/togetherjava/tjbot/commands/tags/TagSystemTest.java
+++ b/application/src/test/java/org/togetherjava/tjbot/commands/tags/TagSystemTest.java
@@ -3,6 +3,7 @@
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+
 import org.togetherjava.tjbot.db.Database;
 import org.togetherjava.tjbot.db.generated.tables.Tags;
 import org.togetherjava.tjbot.jda.JdaTester;
diff --git a/application/src/test/java/org/togetherjava/tjbot/commands/tags/TagsCommandTest.java b/application/src/test/java/org/togetherjava/tjbot/commands/tags/TagsCommandTest.java
index 3029377c63..39de684ec8 100644
--- a/application/src/test/java/org/togetherjava/tjbot/commands/tags/TagsCommandTest.java
+++ b/application/src/test/java/org/togetherjava/tjbot/commands/tags/TagsCommandTest.java
@@ -9,12 +9,14 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
+
 import org.togetherjava.tjbot.commands.SlashCommand;
 import org.togetherjava.tjbot.db.Database;
 import org.togetherjava.tjbot.db.generated.tables.Tags;
 import org.togetherjava.tjbot.jda.JdaTester;
 
 import javax.annotation.Nullable;
+
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/application/src/test/java/org/togetherjava/tjbot/commands/utils/MessageUtilsTest.java b/application/src/test/java/org/togetherjava/tjbot/commands/utils/MessageUtilsTest.java
index 79327494e4..c97a948387 100644
--- a/application/src/test/java/org/togetherjava/tjbot/commands/utils/MessageUtilsTest.java
+++ b/application/src/test/java/org/togetherjava/tjbot/commands/utils/MessageUtilsTest.java
@@ -10,11 +10,11 @@ final class MessageUtilsTest {
 
     @Test
     void escapeMarkdown() {
-        List<TestCase> tests = List.of(new TestCase("empty", "", ""),
-                new TestCase("no markdown", "hello world", "hello world"),
-                new TestCase(
+        List<TestCaseEscape> tests = List.of(new TestCaseEscape("empty", "", ""),
+                new TestCaseEscape("no markdown", "hello world", "hello world"),
+                new TestCaseEscape(
                         "basic markdown", "\\*\\*hello\\*\\* \\_world\\_", "**hello** _world_"),
-                new TestCase("code block", """
+                new TestCaseEscape("code block", """
                         \\`\\`\\`java
                         int x = 5;
                         \\`\\`\\`
@@ -23,9 +23,9 @@ void escapeMarkdown() {
                         int x = 5;
                         ```
                         """),
-                new TestCase("escape simple", "hello\\\\\\\\world\\\\\\\\test",
+                new TestCaseEscape("escape simple", "hello\\\\\\\\world\\\\\\\\test",
                         "hello\\\\world\\\\test"),
-                new TestCase("escape complex", """
+                new TestCaseEscape("escape complex", """
                         Hello\\\\\\\\world
                         \\`\\`\\`java
                         Hello\\\\\\\\
@@ -46,7 +46,7 @@ void escapeMarkdown() {
                         "Hello \\" World\\\\\\"" haha
                         ```
                         """),
-                new TestCase("escape real example",
+                new TestCaseEscape("escape real example",
                         """
                                 Graph traversal can be accomplished easily using \\*\\*BFS\\*\\* or \\*\\*DFS\\*\\*. The algorithms only differ in the order in which nodes are visited: https://i.imgur.com/n9WrkQG.png
 
@@ -158,12 +158,34 @@ void escapeMarkdown() {
                                 ```
                                 """));
 
-        for (TestCase test : tests) {
+        for (TestCaseEscape test : tests) {
             assertEquals(test.escapedMessage(), MessageUtils.escapeMarkdown(test.originalMessage()),
                     "Test failed: " + test.testName());
         }
     }
 
-    private record TestCase(String testName, String escapedMessage, String originalMessage) {
+    private record TestCaseEscape(String testName, String escapedMessage, String originalMessage) {
+    }
+
+    @Test
+    void abbreviate() {
+        List<TestCaseAbbreviate> tests =
+                List.of(new TestCaseAbbreviate("base case", "hello...", "hello world", 8),
+                        new TestCaseAbbreviate("long enough", "hello world", "hello world", 15),
+                        new TestCaseAbbreviate("exact size", "hello world", "hello world", 11),
+                        new TestCaseAbbreviate("very small limit", "he", "hello world", 2),
+                        new TestCaseAbbreviate("empty input", "", "", 0),
+                        new TestCaseAbbreviate("zero limit", "", "hello world", 0),
+                        new TestCaseAbbreviate("small limit", "h...", "hello world", 4));
+
+        for (TestCaseAbbreviate test : tests) {
+            assertEquals(test.abbreviatedMessage(),
+                    MessageUtils.abbreviate(test.originalMessage(), test.limit()),
+                    "Test failed: " + test.testName());
+        }
+    }
+
+    private record TestCaseAbbreviate(String testName, String abbreviatedMessage,
+            String originalMessage, int limit) {
     }
 }
diff --git a/application/src/test/java/org/togetherjava/tjbot/commands/utils/StringDistancesTest.java b/application/src/test/java/org/togetherjava/tjbot/commands/utils/StringDistancesTest.java
index 2b83957bed..4a439e1f7a 100644
--- a/application/src/test/java/org/togetherjava/tjbot/commands/utils/StringDistancesTest.java
+++ b/application/src/test/java/org/togetherjava/tjbot/commands/utils/StringDistancesTest.java
@@ -2,12 +2,40 @@
 
 import org.junit.jupiter.api.Test;
 
+import java.util.Collection;
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 final class StringDistancesTest {
 
+    @Test
+    void closeMatches() {
+        record TestCase(String name, Collection<String> expectedSuggestions, String prefix,
+                Collection<String> candidates, int limit) {
+        }
+
+        List<String> candidates = List.of("c", "c#", "c++", "emacs", "foo", "hello", "java", "js",
+                "key", "nvim", "py", "tag", "taz", "vi", "vim");
+        final int MAX_MATCHES = 5;
+
+        List<TestCase> tests = List.of(
+                new TestCase("no_tags", List.of(), "foo", List.of(), MAX_MATCHES),
+                new TestCase("no_prefix", List.of("c", "c#", "c++", "emacs", "foo"), "", candidates,
+                        MAX_MATCHES),
+                new TestCase("both_empty", List.of(), "", List.of(), MAX_MATCHES),
+                new TestCase("withPrefix0", List.of("vi", "vim"), "v", candidates, MAX_MATCHES),
+                new TestCase("withPrefix1", List.of("java", "js"), "j", candidates, MAX_MATCHES),
+                new TestCase("withPrefix2", List.of("c", "c#", "c++"), "c", candidates,
+                        MAX_MATCHES));
+
+        for (TestCase test : tests) {
+            assertEquals(test.expectedSuggestions,
+                    StringDistances.closeMatches(test.prefix, test.candidates, test.limit),
+                    "Test '%s' failed".formatted(test.name));
+        }
+    }
+
     @Test
     void editDistance() {
         record TestCase(String name, int expectedDistance, String source, String destination) {
diff --git a/application/src/test/java/org/togetherjava/tjbot/jda/ButtonClickEventBuilder.java b/application/src/test/java/org/togetherjava/tjbot/jda/ButtonClickEventBuilder.java
index dacd689b13..75b1c4c435 100644
--- a/application/src/test/java/org/togetherjava/tjbot/jda/ButtonClickEventBuilder.java
+++ b/application/src/test/java/org/togetherjava/tjbot/jda/ButtonClickEventBuilder.java
@@ -9,9 +9,11 @@
 import net.dv8tion.jda.api.interactions.components.ItemComponent;
 import net.dv8tion.jda.api.interactions.components.buttons.Button;
 import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder;
+
 import org.togetherjava.tjbot.commands.SlashCommand;
 
 import javax.annotation.Nullable;
+
 import java.util.List;
 import java.util.function.Supplier;
 import java.util.function.UnaryOperator;
diff --git a/application/src/test/java/org/togetherjava/tjbot/jda/JdaTester.java b/application/src/test/java/org/togetherjava/tjbot/jda/JdaTester.java
index 7194e189de..3ab89df2f2 100644
--- a/application/src/test/java/org/togetherjava/tjbot/jda/JdaTester.java
+++ b/application/src/test/java/org/togetherjava/tjbot/jda/JdaTester.java
@@ -42,10 +42,12 @@
 import org.mockito.ArgumentMatchers;
 import org.mockito.MockingDetails;
 import org.mockito.stubbing.Answer;
+
 import org.togetherjava.tjbot.commands.SlashCommand;
 import org.togetherjava.tjbot.commands.componentids.ComponentIdGenerator;
 
 import javax.annotation.Nullable;
+
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.*;
diff --git a/application/src/test/java/org/togetherjava/tjbot/jda/SlashCommandInteractionEventBuilder.java b/application/src/test/java/org/togetherjava/tjbot/jda/SlashCommandInteractionEventBuilder.java
index 8b789fa4eb..b97c9a480f 100644
--- a/application/src/test/java/org/togetherjava/tjbot/jda/SlashCommandInteractionEventBuilder.java
+++ b/application/src/test/java/org/togetherjava/tjbot/jda/SlashCommandInteractionEventBuilder.java
@@ -11,12 +11,14 @@
 import net.dv8tion.jda.api.utils.data.DataObject;
 import net.dv8tion.jda.internal.JDAImpl;
 import net.dv8tion.jda.internal.interactions.command.SlashCommandInteractionImpl;
+
 import org.togetherjava.tjbot.commands.SlashCommand;
 import org.togetherjava.tjbot.jda.payloads.PayloadMember;
 import org.togetherjava.tjbot.jda.payloads.PayloadUser;
 import org.togetherjava.tjbot.jda.payloads.slashcommand.*;
 
 import javax.annotation.Nullable;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
diff --git a/application/src/test/java/org/togetherjava/tjbot/jda/payloads/PayloadMember.java b/application/src/test/java/org/togetherjava/tjbot/jda/payloads/PayloadMember.java
index adf97fd4db..80af7c23aa 100644
--- a/application/src/test/java/org/togetherjava/tjbot/jda/payloads/PayloadMember.java
+++ b/application/src/test/java/org/togetherjava/tjbot/jda/payloads/PayloadMember.java
@@ -6,6 +6,7 @@
 import net.dv8tion.jda.api.entities.Role;
 
 import javax.annotation.Nullable;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
diff --git a/application/src/test/java/org/togetherjava/tjbot/jda/payloads/slashcommand/PayloadSlashCommand.java b/application/src/test/java/org/togetherjava/tjbot/jda/payloads/slashcommand/PayloadSlashCommand.java
index eb3a438a70..6d64e967ec 100644
--- a/application/src/test/java/org/togetherjava/tjbot/jda/payloads/slashcommand/PayloadSlashCommand.java
+++ b/application/src/test/java/org/togetherjava/tjbot/jda/payloads/slashcommand/PayloadSlashCommand.java
@@ -1,6 +1,7 @@
 package org.togetherjava.tjbot.jda.payloads.slashcommand;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import org.togetherjava.tjbot.jda.payloads.PayloadMember;
 
 public final class PayloadSlashCommand {
diff --git a/application/src/test/java/org/togetherjava/tjbot/jda/payloads/slashcommand/PayloadSlashCommandData.java b/application/src/test/java/org/togetherjava/tjbot/jda/payloads/slashcommand/PayloadSlashCommandData.java
index 55b795476c..66fc751ee7 100644
--- a/application/src/test/java/org/togetherjava/tjbot/jda/payloads/slashcommand/PayloadSlashCommandData.java
+++ b/application/src/test/java/org/togetherjava/tjbot/jda/payloads/slashcommand/PayloadSlashCommandData.java
@@ -3,6 +3,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 import javax.annotation.Nullable;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
diff --git a/application/src/test/java/org/togetherjava/tjbot/jda/payloads/slashcommand/PayloadSlashCommandMembers.java b/application/src/test/java/org/togetherjava/tjbot/jda/payloads/slashcommand/PayloadSlashCommandMembers.java
index 9ba88edf3b..5cc9ca5590 100644
--- a/application/src/test/java/org/togetherjava/tjbot/jda/payloads/slashcommand/PayloadSlashCommandMembers.java
+++ b/application/src/test/java/org/togetherjava/tjbot/jda/payloads/slashcommand/PayloadSlashCommandMembers.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
+
 import org.togetherjava.tjbot.jda.payloads.PayloadMember;
 
 import java.util.Collections;
diff --git a/application/src/test/java/org/togetherjava/tjbot/jda/payloads/slashcommand/PayloadSlashCommandOption.java b/application/src/test/java/org/togetherjava/tjbot/jda/payloads/slashcommand/PayloadSlashCommandOption.java
index 7ac21658c9..9d41ad26b6 100644
--- a/application/src/test/java/org/togetherjava/tjbot/jda/payloads/slashcommand/PayloadSlashCommandOption.java
+++ b/application/src/test/java/org/togetherjava/tjbot/jda/payloads/slashcommand/PayloadSlashCommandOption.java
@@ -3,6 +3,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 import javax.annotation.Nullable;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
diff --git a/application/src/test/java/org/togetherjava/tjbot/jda/payloads/slashcommand/PayloadSlashCommandResolved.java b/application/src/test/java/org/togetherjava/tjbot/jda/payloads/slashcommand/PayloadSlashCommandResolved.java
index 4207b0197b..862b782169 100644
--- a/application/src/test/java/org/togetherjava/tjbot/jda/payloads/slashcommand/PayloadSlashCommandResolved.java
+++ b/application/src/test/java/org/togetherjava/tjbot/jda/payloads/slashcommand/PayloadSlashCommandResolved.java
@@ -1,6 +1,7 @@
 package org.togetherjava.tjbot.jda.payloads.slashcommand;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+
 import javax.annotation.Nullable;
 
 public final class PayloadSlashCommandResolved {
diff --git a/application/src/test/java/org/togetherjava/tjbot/jda/payloads/slashcommand/PayloadSlashCommandUsers.java b/application/src/test/java/org/togetherjava/tjbot/jda/payloads/slashcommand/PayloadSlashCommandUsers.java
index b4236ab5a5..b5515b3e57 100644
--- a/application/src/test/java/org/togetherjava/tjbot/jda/payloads/slashcommand/PayloadSlashCommandUsers.java
+++ b/application/src/test/java/org/togetherjava/tjbot/jda/payloads/slashcommand/PayloadSlashCommandUsers.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
+
 import org.togetherjava.tjbot.jda.payloads.PayloadUser;
 
 import java.util.Collections;
diff --git a/application/src/test/java/org/togetherjava/tjbot/logging/FilterTest.java b/application/src/test/java/org/togetherjava/tjbot/logging/FilterTest.java
deleted file mode 100644
index cda30d60fa..0000000000
--- a/application/src/test/java/org/togetherjava/tjbot/logging/FilterTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.togetherjava.tjbot.logging;
-
-import org.apache.logging.log4j.core.Filter;
-import org.apache.logging.log4j.core.LogEvent;
-import org.apache.logging.log4j.core.impl.Log4jLogEvent;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
-
-final class FilterTest {
-
-    private FlaggedFilter filter;
-    private LogEvent event;
-
-    @BeforeEach
-    void setUp() {
-        this.filter = FlaggedFilter.createFilter(Filter.Result.NEUTRAL, Filter.Result.DENY);
-        this.event = Log4jLogEvent.newBuilder().build();
-    }
-
-    @Test
-    void shouldPassFilter() {
-        FlaggedFilter spy = Mockito.spy(this.filter);
-        Mockito.when(spy.isLoggingEnabled()).thenReturn(true);
-        Assertions.assertEquals(Filter.Result.NEUTRAL, spy.filter(this.event));
-    }
-
-    @Test
-    void shouldNotPassFilter() {
-        FlaggedFilter spy = Mockito.spy(this.filter);
-        Mockito.when(spy.isLoggingEnabled()).thenReturn(false);
-        Assertions.assertEquals(Filter.Result.DENY, spy.filter(this.event));
-    }
-}
diff --git a/build.gradle b/build.gradle
index 9f4a7cb273..e04ada7d0d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -74,6 +74,13 @@ subprojects {
         java {
             // Excludes build folder since it contains generated java classes.
             targetExclude("build/**")
+            endWithNewline()
+            removeUnusedImports()
+            // empty string '' covers all imports that aren't explicitly specified,
+            // we use it as catch-all for external dependencies like JDA
+            // '\\#` is prefix for static imports
+            importOrder('','org.togetherjava', 'javax', 'java', '\\#')
+            // TODO Use latest eclipse jdt formatter, issue tracking this: https://github.com/Together-Java/TJ-Bot/issues/605
             eclipse('4.19.0').configFile("${rootProject.rootDir}/meta/formatting/google-style-eclipse.xml")
         }
     }
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 68007940e1..dbfc204b7a 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -7,6 +7,6 @@ repositories {
 }
 
 dependencies {
-    implementation "gradle.plugin.org.flywaydb:gradle-plugin-publishing:7.15.0"
-    implementation 'nu.studer:gradle-jooq-plugin:6.0.1'
+    implementation "gradle.plugin.org.flywaydb:gradle-plugin-publishing:9.4.0"
+    implementation 'nu.studer:gradle-jooq-plugin:7.1.1'
 }
diff --git a/database/src/main/java/org/togetherjava/tjbot/db/Database.java b/database/src/main/java/org/togetherjava/tjbot/db/Database.java
index 2986571170..fc256f9b3a 100644
--- a/database/src/main/java/org/togetherjava/tjbot/db/Database.java
+++ b/database/src/main/java/org/togetherjava/tjbot/db/Database.java
@@ -8,6 +8,7 @@
 import org.jooq.impl.DSL;
 import org.sqlite.SQLiteConfig;
 import org.sqlite.SQLiteDataSource;
+
 import org.togetherjava.tjbot.db.util.CheckedConsumer;
 import org.togetherjava.tjbot.db.util.CheckedFunction;
 
@@ -25,6 +26,11 @@
  */
 public final class Database {
 
+    static {
+        System.setProperty("org.jooq.no-logo", "true");
+        System.setProperty("org.jooq.no-tips", "true");
+    }
+
     private final DSLContext dslContext;
     /**
      * Lock used to implement thread-safety across this class. Any database modifying method must
@@ -230,4 +236,3 @@ private static class ResultHolder<T> {
         private T result;
     }
 }
-
diff --git a/database/src/main/java/org/togetherjava/tjbot/db/util/CheckedConsumer.java b/database/src/main/java/org/togetherjava/tjbot/db/util/CheckedConsumer.java
index 96d4ee210d..a5bc6747ed 100644
--- a/database/src/main/java/org/togetherjava/tjbot/db/util/CheckedConsumer.java
+++ b/database/src/main/java/org/togetherjava/tjbot/db/util/CheckedConsumer.java
@@ -21,4 +21,3 @@ public interface CheckedConsumer<T, E extends Throwable> {
     void accept(T input) throws E;
 
 }
-
diff --git a/database/src/main/java/org/togetherjava/tjbot/db/util/CheckedFunction.java b/database/src/main/java/org/togetherjava/tjbot/db/util/CheckedFunction.java
index 9567c3085e..5af0fdad15 100644
--- a/database/src/main/java/org/togetherjava/tjbot/db/util/CheckedFunction.java
+++ b/database/src/main/java/org/togetherjava/tjbot/db/util/CheckedFunction.java
@@ -23,4 +23,3 @@ public interface CheckedFunction<T, R, E extends Throwable> {
     R accept(T input) throws E;
 
 }
-
diff --git a/docker-compose.yml.example b/docker-compose.yml.example
index 74465edf74..362b1aa334 100644
--- a/docker-compose.yml.example
+++ b/docker-compose.yml.example
@@ -1,20 +1,27 @@
 version: "3.9"
 services:
-  bot:
-    image: togetherjava/tjbot:latest
+  tjbot-develop:
+    image: "togetherjava.duckdns.org:5001/togetherjava/tjbot:develop"
+    command: ["/home/bot/config/config.json"]
     volumes:
-      - "./application/config.json:/config.json"
-      - "./application/logs/:/logs"
-    links:
-      - logs
-    environment:
-      - TJ_LOG_TARGET=logs
-  logs:
-    image: togetherjava/tjlogs:latest
+      - database:/home/bot/database
+      - ./config:/home/bot/config
+    restart: always
+    networks:
+      - develop-bot
+
+  tj-develop-website:
+    image: "togetherjava.duckdns.org:5001/togetherjava/website:develop"
     ports:
-      - "5050:5050"
-    volumes:
-      - "./logviewer/config.json:/logviewer/config.json"
-      - "./application/logs:/application/logs"
-      - "./logviewer/logs:/logviewer/logs"
-      - "./logviewer/db:/logviewer/db"
+      - "127.0.0.1:5051:5051"
+    networks:
+      - develop-bot
+    restart: always
+
+volumes:
+  database:
+    name: "tj-bot-develop-database"
+
+networks:
+  develop-bot:
+    name: "develop-bot"
diff --git a/formatter/build.gradle b/formatter/build.gradle
index 1b77b211f5..9cfe849017 100644
--- a/formatter/build.gradle
+++ b/formatter/build.gradle
@@ -3,6 +3,9 @@ plugins {
 }
 
 dependencies {
+    implementation 'com.google.code.findbugs:jsr305:3.0.2'
+    implementation project(':utils')
+
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.0'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.0'
 }
diff --git a/formatter/src/main/java/org/togetherjava/tjbot/formatter/package-info.java b/formatter/src/main/java/org/togetherjava/tjbot/formatter/package-info.java
new file mode 100644
index 0000000000..fb784918f9
--- /dev/null
+++ b/formatter/src/main/java/org/togetherjava/tjbot/formatter/package-info.java
@@ -0,0 +1,11 @@
+/**
+ * Core package for the formatter project, which is able to format code snippets. See
+ * {@link org.togetherjava.tjbot.formatter.Formatter} as entry point.
+ */
+@MethodsReturnNonnullByDefault
+@ParametersAreNonnullByDefault
+package org.togetherjava.tjbot.formatter;
+
+import org.togetherjava.tjbot.annotations.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/formatter/src/main/java/org/togetherjava/tjbot/formatter/tokenizer/package-info.java b/formatter/src/main/java/org/togetherjava/tjbot/formatter/tokenizer/package-info.java
new file mode 100644
index 0000000000..79f4e4dca5
--- /dev/null
+++ b/formatter/src/main/java/org/togetherjava/tjbot/formatter/tokenizer/package-info.java
@@ -0,0 +1,11 @@
+/**
+ * Deals with tokenizing code snippets. See {@link org.togetherjava.tjbot.formatter.tokenizer.Lexer}
+ * as entry point.
+ */
+@MethodsReturnNonnullByDefault
+@ParametersAreNonnullByDefault
+package org.togetherjava.tjbot.formatter.tokenizer;
+
+import org.togetherjava.tjbot.annotations.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/formatter/src/main/java/org/togetherjava/tjbot/formatter/util/package-info.java b/formatter/src/main/java/org/togetherjava/tjbot/formatter/util/package-info.java
new file mode 100644
index 0000000000..25fb52e1d0
--- /dev/null
+++ b/formatter/src/main/java/org/togetherjava/tjbot/formatter/util/package-info.java
@@ -0,0 +1,10 @@
+/**
+ * Contains utility used by the formatter.
+ */
+@MethodsReturnNonnullByDefault
+@ParametersAreNonnullByDefault
+package org.togetherjava.tjbot.formatter.util;
+
+import org.togetherjava.tjbot.annotations.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/formatter/src/test/java/org/togetherjava/tjbot/formatter/FormatterTest.java b/formatter/src/test/java/org/togetherjava/tjbot/formatter/FormatterTest.java
index e94e45915d..3d0f7893b2 100644
--- a/formatter/src/test/java/org/togetherjava/tjbot/formatter/FormatterTest.java
+++ b/formatter/src/test/java/org/togetherjava/tjbot/formatter/FormatterTest.java
@@ -1,13 +1,14 @@
 package org.togetherjava.tjbot.formatter;
 
-import static org.junit.jupiter.api.Assertions.*;
-
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
+
 import org.togetherjava.tjbot.formatter.tokenizer.Lexer;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 class FormatterTest {
     Lexer lexer;
diff --git a/formatter/src/test/java/org/togetherjava/tjbot/formatter/tokenizer/LexerTest.java b/formatter/src/test/java/org/togetherjava/tjbot/formatter/tokenizer/LexerTest.java
index 05890cbd28..c306827e7b 100644
--- a/formatter/src/test/java/org/togetherjava/tjbot/formatter/tokenizer/LexerTest.java
+++ b/formatter/src/test/java/org/togetherjava/tjbot/formatter/tokenizer/LexerTest.java
@@ -1,7 +1,5 @@
 package org.togetherjava.tjbot.formatter.tokenizer;
 
-import static org.junit.jupiter.api.Assertions.*;
-
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -10,6 +8,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 class LexerTest {
     Lexer lexer;
diff --git a/logviewer/build.gradle b/logviewer/build.gradle
deleted file mode 100644
index 2086804732..0000000000
--- a/logviewer/build.gradle
+++ /dev/null
@@ -1,103 +0,0 @@
-plugins {
-    id "com.google.cloud.tools.jib" version "3.1.4"
-    id "org.springframework.boot" version "2.6.1"
-    id "io.spring.dependency-management" version "1.0.11.RELEASE"
-    id "com.vaadin" version "21.0.2"
-    id 'java'
-    id 'database-settings'
-}
-
-defaultTasks("clean", "bootRun")
-
-repositories {
-    mavenCentral()
-    maven {
-        url = uri("https://maven.vaadin.com/vaadin-addons")
-    }
-}
-
-configurations {
-    developmentOnly
-    runtimeClasspath.extendsFrom(developmentOnly)
-}
-
-jooq {
-    configurations {
-        main {
-            generationTool {
-                generator {
-                    target {
-                        packageName = 'org.togetherjava.tjbot.db.generated'
-                    }
-                }
-            }
-        }
-    }
-}
-
-dependencies {
-    implementation('org.apache.logging.log4j:log4j-api') {
-        version {
-            require '2.16.0'
-        }
-        because 'Log4Shell happened'
-    }
-    runtimeOnly('org.apache.logging.log4j:log4j-core') {
-        version {
-            require '2.16.0'
-        }
-        because 'Log4Shell happened'
-    }
-
-    runtimeOnly 'org.apache.logging.log4j:log4j-jul:2.16.0'
-    runtimeOnly 'org.apache.logging.log4j:log4j-slf4j-impl:2.16.0'
-
-
-    implementation(project(":database"))
-    implementation 'org.jooq:jooq:3.15.3'
-
-    implementation 'com.vaadin:vaadin-core:21.0.2'
-    implementation('com.vaadin:vaadin-spring:18.0.0')
-    implementation 'org.vaadin.artur:a-vaadin-helper:1.7.2'
-    implementation 'org.vaadin.crudui:crudui:4.6.0'
-    implementation 'com.vaadin.componentfactory:enhanced-dialog:21.0.0'
-
-
-    implementation('org.springframework.boot:spring-boot-starter-web:2.6.1') {
-        exclude group: 'org.springframework.boot', module: 'spring-boot-starter-logging'
-    }
-    implementation('org.springframework.boot:spring-boot-starter-security:2.6.1') {
-        exclude group: 'org.springframework.boot', module: 'spring-boot-starter-logging'
-    }
-    implementation('org.springframework.boot:spring-boot-starter-oauth2-client:2.6.1') {
-        exclude group: 'org.springframework.boot', module: 'spring-boot-starter-logging'
-    }
-
-    developmentOnly('org.springframework.boot:spring-boot-starter-actuator:2.6.1') {
-        exclude group: 'org.springframework.boot', module: 'spring-boot-starter-logging'
-    }
-    developmentOnly('org.springframework.boot:spring-boot-devtools:2.6.1') {
-        exclude group: 'org.springframework.boot', module: 'spring-boot-starter-logging'
-    }
-}
-
-tasks.jib.dependsOn(tasks.vaadinBuildFrontend)
-jib {
-    from.image = 'eclipse-temurin:17'
-    to {
-        image = 'togetherjava.duckdns.org:5001/togetherjava/tjlogs:' + System.getenv('BRANCH_NAME') ?: 'latest'
-        auth {
-            username = System.getenv('REGISTRY_USER') ?: ''
-            password = System.getenv('REGISTRY_PASSWORD') ?: ''
-        }
-    }
-    container {
-        setPorts(["5050"].asList())
-        setCreationTime(Instant.now().toString())
-    }
-}
-
-vaadin {
-    pnpmEnable = true
-    productionMode = true
-}
diff --git a/logviewer/frontend/index.html b/logviewer/frontend/index.html
deleted file mode 100644
index 627308e8d4..0000000000
--- a/logviewer/frontend/index.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE html>
-<!--
-This file is auto-generated by Vaadin.
-If you want to customize the index.html, you can copy this file or create your
-own `index.html` in your frontend directory.
-By default, the `index.html` file should be in `./frontend/` folder.
-
-NOTE: you need to restart the dev-server after adding the new `index.html` file.
-After that, all modifications to `index.html` are recompiled automatically.
--->
-
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1" />
-  <style>
-    body, #outlet {
-      height: 100vh;
-      width: 100%;
-      margin: 0;
-    }
-  </style>
-  <!-- index.ts is included here automatically (either by the dev server or during the build) -->
-</head>
-<body>
-  <!-- vaadin-router in index.ts needs an outlet for displaying the views -->
-  <div id="outlet"></div>
-</body>
-</html>
diff --git a/logviewer/frontend/themes/logviewer/main-layout.css b/logviewer/frontend/themes/logviewer/main-layout.css
deleted file mode 100644
index 3477da5822..0000000000
--- a/logviewer/frontend/themes/logviewer/main-layout.css
+++ /dev/null
@@ -1,36 +0,0 @@
-[slot='drawer'] {
-    background-image: linear-gradient(0deg, var(--lumo-shade-5pct), var(--lumo-shade-5pct));
-}
-
-[slot='drawer'] nav a {
-    text-decoration: none;
-    transition: color 140ms;
-}
-
-[slot='drawer'] nav a .la {
-    margin-top: calc(var(--lumo-space-xs) * 0.5);
-}
-
-[slot='drawer'] nav a::before {
-    border-radius: var(--lumo-border-radius);
-    bottom: calc(var(--lumo-space-xs) * 0.5);
-    content: '';
-    left: 0;
-    position: absolute;
-    right: 0;
-    top: calc(var(--lumo-space-xs) * 0.5);
-    transition: background-color 140ms;
-}
-
-[slot='drawer'] nav a[highlight] {
-    color: var(--lumo-primary-text-color);
-}
-
-[slot='drawer'] nav a[highlight]::before {
-    background-color: var(--lumo-primary-color-10pct);
-}
-
-[slot='drawer'] footer vaadin-context-menu {
-    align-items: center;
-    display: flex;
-}
diff --git a/logviewer/frontend/themes/logviewer/styles.css b/logviewer/frontend/themes/logviewer/styles.css
deleted file mode 100644
index f7dfadb7ed..0000000000
--- a/logviewer/frontend/themes/logviewer/styles.css
+++ /dev/null
@@ -1,4 +0,0 @@
-/* Import your application global css files here or add the styles directly to this file */
-@import url('./main-layout.css');
-@import url('./views/logs-view.css');
-@import url('line-awesome/dist/line-awesome/css/line-awesome.min.css');
diff --git a/logviewer/frontend/themes/logviewer/theme.json b/logviewer/frontend/themes/logviewer/theme.json
deleted file mode 100644
index 7ccf9d1c46..0000000000
--- a/logviewer/frontend/themes/logviewer/theme.json
+++ /dev/null
@@ -1 +0,0 @@
-{"lumoImports":["typography","color","spacing","badge","utility"]}
diff --git a/logviewer/frontend/themes/logviewer/views/logs-view.css b/logviewer/frontend/themes/logviewer/views/logs-view.css
deleted file mode 100644
index aa8f478e95..0000000000
--- a/logviewer/frontend/themes/logviewer/views/logs-view.css
+++ /dev/null
@@ -1,39 +0,0 @@
-.logs-view {
-    display: block;
-    padding: 1em;
-}
-
-:root {
-    --color-info: rgba(120, 107, 213, 0.5);
-    --color-warn: rgba(170, 187, 97, 0.5);
-    --color-error: rgba(255, 75, 75, 0.5);
-    --color-debug: rgba(127, 255, 212, 0.5);
-    --color-trace: rgba(58, 118, 58, 0.5);
-}
-
-p {
-
-    line-height: normal;
-    margin-top: 0.1em;
-    margin-bottom: 0.1em;
-}
-
-.error {
-    background-color: var(--color-error);
-}
-
-.warn {
-    background-color: var(--color-warn);
-}
-
-.info {
-    background-color: var(--color-info);
-}
-
-.debug {
-    background-color: var(--color-debug);
-}
-
-.trace {
-    background-color: var(--color-trace);
-}
diff --git a/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/Application.java b/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/Application.java
deleted file mode 100644
index b8661bd91d..0000000000
--- a/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/Application.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.togetherjava.tjbot.logwatcher;
-
-import com.vaadin.flow.component.dependency.NpmPackage;
-import com.vaadin.flow.component.page.AppShellConfigurator;
-import com.vaadin.flow.component.page.Push;
-import com.vaadin.flow.server.PWA;
-import com.vaadin.flow.theme.Theme;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.r2dbc.R2dbcAutoConfiguration;
-import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
-import org.togetherjava.tjbot.logwatcher.config.Config;
-import org.togetherjava.tjbot.logwatcher.logs.LogREST;
-import org.togetherjava.tjbot.logwatcher.oauth.OAuth2LoginConfig;
-import org.vaadin.artur.helpers.LaunchUtil;
-
-/**
- * This is a small Spring-Vaadin Webserver, which main purpose is to show Log-Event's generated from
- * the Bot.
- * <p>
- * You can see the Views you can see in your Browser at {@link org.togetherjava.logwatcher.views}
- * <p>
- * Log-Event's are captured by the REST-API at {@link LogREST}
- * <p>
- * Security/OAuth2 Config at {@link OAuth2LoginConfig}
- * <p>
- * And the initial Config at {@link Config}
- */
-@SpringBootApplication(exclude = {R2dbcAutoConfiguration.class})
-@Theme(value = "logviewer")
-@PWA(name = "LogViewer", shortName = "Logs", offlineResources = {"images/logo.png"})
-@NpmPackage(value = "line-awesome", version = "1.3.0")
-@Push
-public class Application extends SpringBootServletInitializer implements AppShellConfigurator {
-
-    private static final Logger applicationLogger = LoggerFactory.getLogger(Application.class);
-
-    public static void main(String[] args) {
-        if (args.length > 1) {
-            applicationLogger
-                .error("Usage: Provide a single Argument, containing the Path to the Config-File");
-            System.exit(1);
-        }
-
-        Config.init(args.length == 1 ? args[0] : "./logviewer/config.json");
-        LaunchUtil.launchBrowserInDevelopmentMode(SpringApplication.run(Application.class, args));
-    }
-
-}
diff --git a/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/DatabaseProvider.java b/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/DatabaseProvider.java
deleted file mode 100644
index 914687850d..0000000000
--- a/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/DatabaseProvider.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.togetherjava.tjbot.logwatcher;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.FatalBeanException;
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Scope;
-import org.togetherjava.tjbot.logwatcher.config.Config;
-import org.togetherjava.tjbot.db.Database;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.sql.SQLException;
-
-@Configuration
-@Scope(BeanDefinition.SCOPE_SINGLETON)
-public class DatabaseProvider {
-
-    private final Database db;
-    private final Config config;
-
-    private static final Logger logger = LoggerFactory.getLogger(DatabaseProvider.class);
-
-    public DatabaseProvider(final Config config) {
-        this.config = config;
-        this.db = createDB();
-    }
-
-    @SuppressWarnings({"java:S2139"}) // At this point there is nothing we can do about a
-    // SQLException
-    private Database createDB() {
-        final Path dbPath = getDBPath();
-
-        try {
-            return new Database("jdbc:sqlite:%s".formatted(dbPath.toAbsolutePath()));
-        } catch (final SQLException e) {
-            logger.error("Exception while creating Database.", e);
-            throw new FatalBeanException("Could not create Database.", e);
-        }
-    }
-
-    private Path getDBPath() {
-        final Path dbPath = Path.of(this.config.getDatabasePath());
-
-        try {
-            Files.createDirectories(dbPath.getParent());
-        } catch (final IOException e) {
-            logger.error("Exception while creating Database-Path.", e);
-        }
-
-        return dbPath;
-    }
-
-
-    @Bean
-    public Database getDb() {
-        return this.db;
-    }
-
-
-}
diff --git a/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/accesscontrol/AllowedRoles.java b/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/accesscontrol/AllowedRoles.java
deleted file mode 100644
index 4b3ce22ece..0000000000
--- a/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/accesscontrol/AllowedRoles.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.togetherjava.tjbot.logwatcher.accesscontrol;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-
-/**
- * Annotation for handling Access Control on Views
- */
-@Retention(RUNTIME)
-@Target({TYPE})
-public @interface AllowedRoles {
-
-
-    /**
-     * Roles to permit access to the View {@link Role}
-     */
-    Role[] roles();
-}
diff --git a/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/accesscontrol/Role.java b/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/accesscontrol/Role.java
deleted file mode 100644
index 364474fbf3..0000000000
--- a/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/accesscontrol/Role.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.togetherjava.tjbot.logwatcher.accesscontrol;
-
-import java.util.Arrays;
-import java.util.EnumSet;
-import java.util.Set;
-
-/**
- * Basic Roles for Access Control on Views
- */
-public enum Role {
-    /**
-     * Role for when Stuff goes wrong
-     */
-    UNKNOWN(0, "unknown"),
-
-    /**
-     * Base Role
-     */
-    USER(1, "user"),
-
-    /**
-     * Role for Views that should require more permissions
-     */
-    ADMIN(2, "admin");
-
-    private final int id;
-    private final String roleName;
-
-    Role(int id, String roleName) {
-        this.id = id;
-        this.roleName = roleName;
-    }
-
-    public int getId() {
-        return id;
-    }
-
-    public String getRoleName() {
-        return roleName;
-    }
-
-    public static Role forID(final int id) {
-        return Arrays.stream(values())
-            .filter(r -> r.id == id)
-            .findAny()
-            .orElseThrow(() -> new IllegalArgumentException("Unknown RoleID: %d".formatted(id)));
-    }
-
-    public static Set<Role> getDisplayableRoles() {
-        return EnumSet.of(USER, ADMIN);
-    }
-
-}
diff --git a/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/config/Config.java b/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/config/Config.java
deleted file mode 100644
index f19cad897e..0000000000
--- a/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/config/Config.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package org.togetherjava.tjbot.logwatcher.config;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.springframework.context.annotation.Configuration;
-
-import java.io.IOException;
-import java.io.UncheckedIOException;
-import java.nio.file.Path;
-import java.util.Objects;
-import java.util.concurrent.atomic.AtomicReference;
-
-/**
- * Basic Class for accumulating Information which is required to start this application
- */
-@Configuration
-public class Config {
-
-    private static final AtomicReference<String> CONFIG_PATH = new AtomicReference<>();
-
-    public static void init(final String pathToConfig) {
-        if (!CONFIG_PATH.compareAndSet(null, pathToConfig)) {
-            throw new IllegalStateException(
-                    "Config Path already set to %s".formatted(CONFIG_PATH.get()));
-        }
-    }
-
-
-    /**
-     * Client-Name of the OAuth2-Application
-     */
-    private final String clientName;
-
-    /**
-     * Client-ID of the OAuth2-Application
-     */
-    private final String clientId;
-
-    /**
-     * Client-Secret of the OAuth2-Application
-     */
-    private final String clientSecret;
-
-    /**
-     * Discord-Username of the User to add as 1. User
-     */
-    private final String rootUserName;
-
-    /**
-     * Discord-ID of the User to add as 1. User
-     */
-    private final String rootDiscordID;
-
-    /**
-     * Path of the Log directory
-     */
-    private final String logPath;
-
-    /**
-     * Redirect Path for OAuth2
-     */
-    private final String redirectPath;
-
-    /**
-     * Path for this Database
-     */
-    private final String databasePath;
-
-    public Config(final ObjectMapper mapper) {
-        final JsonNode jsonNode = getJsonNode(mapper);
-
-        this.clientName = jsonNode.get("clientName").asText();
-        this.clientId = jsonNode.get("clientId").asText();
-        this.clientSecret = jsonNode.get("clientSecret").asText();
-        this.rootUserName = jsonNode.get("rootUserName").asText();
-        this.rootDiscordID = jsonNode.get("rootDiscordID").asText();
-        this.logPath = jsonNode.get("logPath").asText();
-        this.redirectPath = jsonNode.get("redirectPath").asText();
-        this.databasePath = jsonNode.get("databasePath").asText();
-    }
-
-    private JsonNode getJsonNode(final ObjectMapper mapper) {
-        final String pathToConfig = Objects.requireNonNull(CONFIG_PATH.get(), "Path not Set");
-        try {
-            return mapper.readTree(Path.of(pathToConfig).toFile());
-        } catch (IOException e) {
-            throw new UncheckedIOException(e);
-        }
-    }
-
-    public String getRedirectPath() {
-        return redirectPath;
-    }
-
-    public String getLogPath() {
-        return logPath;
-    }
-
-    public String getRootUserName() {
-        return rootUserName;
-    }
-
-    public String getRootDiscordID() {
-        return rootDiscordID;
-    }
-
-    public String getClientName() {
-        return clientName;
-    }
-
-    public String getClientId() {
-        return clientId;
-    }
-
-    public String getClientSecret() {
-        return clientSecret;
-    }
-
-    public String getDatabasePath() {
-        return this.databasePath;
-    }
-}
diff --git a/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/constants/LogEventsConstants.java b/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/constants/LogEventsConstants.java
deleted file mode 100644
index 45e46e4730..0000000000
--- a/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/constants/LogEventsConstants.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.togetherjava.tjbot.logwatcher.constants;
-
-/**
- * Constant Class for Logevents
- */
-public final class LogEventsConstants {
-
-    public static final String FIELD_INSTANT = "time";
-    public static final String FIELD_END_OF_BATCH = "endOfbatch";
-    public static final String FIELD_LOGGER_NAME = "loggername";
-    public static final String FIELD_LOGGER_LEVEL = "level";
-    public static final String FIELD_LOGGER_FQCN = "loggerfqcn";
-    public static final String FIELD_MESSAGE = "message";
-    public static final String FIELD_THREAD = "thread";
-    public static final String FIELD_THREAD_ID = "threadid";
-    public static final String FIELD_THREAD_PRIORITY = "threadpriority";
-
-
-
-    /**
-     * Contestants class, nothing to instantiate
-     */
-    private LogEventsConstants() {}
-}
diff --git a/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/constants/UserConstants.java b/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/constants/UserConstants.java
deleted file mode 100644
index 0532c11229..0000000000
--- a/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/constants/UserConstants.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.togetherjava.tjbot.logwatcher.constants;
-
-/**
- * Gathers all static Values regarding Users
- */
-public final class UserConstants {
-
-    public static final String FIELD_USERNAME = "username";
-    public static final String FIELD_DISCORD_ID = "discordid";
-
-
-    private UserConstants() {}
-}
diff --git a/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/entities/InstantWrapper.java b/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/entities/InstantWrapper.java
deleted file mode 100644
index 4754ad9b32..0000000000
--- a/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/entities/InstantWrapper.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.togetherjava.tjbot.logwatcher.entities;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.text.SimpleDateFormat;
-import java.time.Instant;
-import java.util.Date;
-
-public class InstantWrapper {
-
-    private long epochSecond;
-    private long nanoOfSecond;
-
-    /**
-     * @param epochSecond
-     * @param nanoOfSecond
-     */
-    @JsonCreator
-    public InstantWrapper(@JsonProperty("epochSecond") long epochSecond,
-            @JsonProperty("nanoOfSecond") long nanoOfSecond) {
-        super();
-        this.epochSecond = epochSecond;
-        this.nanoOfSecond = nanoOfSecond;
-    }
-
-    public long getEpochSecond() {
-        return epochSecond;
-    }
-
-    public void setEpochSecond(long epochSecond) {
-        this.epochSecond = epochSecond;
-    }
-
-    public long getNanoOfSecond() {
-        return nanoOfSecond;
-    }
-
-    public void setNanoOfSecond(long nanoOfSecond) {
-        this.nanoOfSecond = nanoOfSecond;
-    }
-
-    @Override
-    public String toString() {
-        final var instant = toInstant();
-
-        return new SimpleDateFormat("yyy-MM-dd HH:mm:ss.SSS").format(Date.from(instant));
-    }
-
-    public Instant toInstant() {
-        return Instant.ofEpochSecond(this.epochSecond, this.nanoOfSecond);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (!(o instanceof InstantWrapper other)) {
-            return false;
-        }
-
-        return epochSecond == other.epochSecond && nanoOfSecond != other.nanoOfSecond;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = (int) (epochSecond ^ (epochSecond >>> 32));
-        result = 31 * result + (int) (nanoOfSecond ^ (nanoOfSecond >>> 32));
-        return result;
-    }
-}
diff --git a/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/entities/LogEvent.java b/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/entities/LogEvent.java
deleted file mode 100644
index fcf80c671d..0000000000
--- a/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/entities/LogEvent.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package org.togetherjava.tjbot.logwatcher.entities;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.time.Instant;
-
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class LogEvent {
-
-    private Instant instant;
-
-    private String thread;
-
-    private String level;
-
-    private String loggerName;
-
-    private String message;
-
-    private Boolean endOfBatch;
-
-    private String loggerFqcn;
-
-    private Integer threadId;
-
-    private Integer threadPriority;
-
-    @JsonCreator
-    public LogEvent(@JsonProperty("instant") InstantWrapper wrapper,
-            @JsonProperty("thread") String thread, @JsonProperty("level") String level,
-            @JsonProperty("loggerName") String loggerName, @JsonProperty("message") String message,
-            @JsonProperty("endOfBatch") Boolean endOfBatch,
-            @JsonProperty("loggerFqcn") String loggerFqcn,
-            @JsonProperty("threadId") Integer threadId,
-            @JsonProperty("threadPriority") Integer threadPriority) {
-        this.instant = wrapper.toInstant();
-        this.thread = thread;
-        this.level = level;
-        this.loggerName = loggerName;
-        this.message = message;
-        this.endOfBatch = endOfBatch;
-        this.loggerFqcn = loggerFqcn;
-        this.threadId = threadId;
-        this.threadPriority = threadPriority;
-    }
-
-
-    public Instant getInstant() {
-        return instant;
-    }
-
-    public void setInstant(Instant instant) {
-        this.instant = instant;
-    }
-
-    public String getThread() {
-        return thread;
-    }
-
-    public void setThread(String thread) {
-        this.thread = thread;
-    }
-
-    public String getLevel() {
-        return level;
-    }
-
-    public void setLevel(String level) {
-        this.level = level;
-    }
-
-    public String getLoggerName() {
-        return loggerName;
-    }
-
-    public void setLoggerName(String loggerName) {
-        this.loggerName = loggerName;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    public Boolean getEndOfBatch() {
-        return endOfBatch;
-    }
-
-    public void setEndOfBatch(Boolean endOfBatch) {
-        this.endOfBatch = endOfBatch;
-    }
-
-    public String getLoggerFqcn() {
-        return loggerFqcn;
-    }
-
-    public void setLoggerFqcn(String loggerFqcn) {
-        this.loggerFqcn = loggerFqcn;
-    }
-
-    public Integer getThreadId() {
-        return threadId;
-    }
-
-    public void setThreadId(Integer threadId) {
-        this.threadId = threadId;
-    }
-
-    public Integer getThreadPriority() {
-        return threadPriority;
-    }
-
-    public void setThreadPriority(Integer threadPriority) {
-        this.threadPriority = threadPriority;
-    }
-
-    @Override
-    public String toString() {
-        return "LogDTO{" + "instant=" + instant + ", thread='" + thread + '\'' + ", level='" + level
-                + '\'' + ", loggerName='" + loggerName + '\'' + ", message='" + message + '\''
-                + ", endOfBatch=" + endOfBatch + ", loggerFqcn='" + loggerFqcn + '\''
-                + ", threadId=" + threadId + ", threadPriority=" + threadPriority + '}';
-    }
-
-}
diff --git a/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/entities/UserWrapper.java b/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/entities/UserWrapper.java
deleted file mode 100644
index 8bd55eefda..0000000000
--- a/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/entities/UserWrapper.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.togetherjava.tjbot.logwatcher.entities;
-
-import org.togetherjava.tjbot.logwatcher.accesscontrol.Role;
-
-import java.io.Serial;
-import java.io.Serializable;
-import java.util.Collections;
-import java.util.Objects;
-import java.util.Set;
-
-public final class UserWrapper implements Serializable {
-    @Serial
-    private static final long serialVersionUID = -3701246411434315431L;
-
-    private long discordID;
-    private String userName;
-    private Set<Role> roles = Collections.emptySet();
-
-    public UserWrapper() {}
-
-    public UserWrapper(long discordID, String userName, Set<Role> roles) {
-        this.discordID = discordID;
-        this.userName = userName;
-        this.roles = roles;
-    }
-
-    public void setDiscordID(long discordID) {
-        this.discordID = discordID;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-    public void setRoles(Set<Role> roles) {
-        this.roles = roles;
-    }
-
-    public long getDiscordID() {
-        return discordID;
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public Set<Role> getRoles() {
-        return roles;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (!(obj instanceof UserWrapper other)) {
-            return true;
-        }
-        return this.discordID == other.discordID && Objects.equals(this.userName, other.userName)
-                && Objects.equals(this.roles, other.roles);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(discordID, userName, roles);
-    }
-
-    @Override
-    public String toString() {
-        return "UserDTO[" + "discordID=" + discordID + ", " + "userName=" + userName + ", "
-                + "roles=" + roles + ']';
-    }
-
-
-}
diff --git a/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/logs/LogREST.java b/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/logs/LogREST.java
deleted file mode 100644
index c1d2103a6f..0000000000
--- a/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/logs/LogREST.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.togetherjava.tjbot.logwatcher.logs;
-
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
-import org.togetherjava.tjbot.logwatcher.entities.LogEvent;
-import org.togetherjava.tjbot.logwatcher.watcher.StreamWatcher;
-import org.togetherjava.tjbot.db.generated.tables.pojos.Logevents;
-
-@RestController
-public class LogREST {
-
-    private final LogRepository logs;
-
-    public LogREST(final LogRepository logs) {
-        this.logs = logs;
-    }
-
-    @PostMapping(path = "/rest/api/logs", consumes = "application/json")
-    public ResponseEntity<Void> logEvent(@RequestBody final LogEvent body) {
-        this.logs.save(mapToLogevents(body));
-        StreamWatcher.notifyOfEvent();
-        return ResponseEntity.ok().build();
-    }
-
-    private Logevents mapToLogevents(final LogEvent body) {
-        return new Logevents(Integer.MIN_VALUE, body.getInstant(), body.getThread(),
-                body.getLevel(), body.getLoggerName(), body.getMessage(), body.getEndOfBatch(),
-                body.getLoggerFqcn(), body.getThreadId(), body.getThreadPriority());
-    }
-}
diff --git a/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/logs/LogRepository.java b/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/logs/LogRepository.java
deleted file mode 100644
index be2ae85de5..0000000000
--- a/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/logs/LogRepository.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.togetherjava.tjbot.logwatcher.logs;
-
-import org.togetherjava.tjbot.db.generated.tables.pojos.Logevents;
-
-import java.util.Collection;
-import java.util.List;
-
-public interface LogRepository {
-
-    /**
-     * Saves the given event to the DB, does not update or merge
-     *
-     * @param event Event to Insert
-     */
-    void save(Logevents event);
-
-    /**
-     * Fetches all Events from the DB
-     *
-     * @return List of LogEvents
-     */
-    List<Logevents> findAll();
-
-    /**
-     * Fetches all Events, which LogLevel matches the given Collection, from the DB
-     *
-     * @return List of LogEvents
-     */
-    List<Logevents> findWithLevelMatching(Collection<String> logLevels);
-
-}
diff --git a/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/logs/LogRepositoryImpl.java b/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/logs/LogRepositoryImpl.java
deleted file mode 100644
index 865b3efd72..0000000000
--- a/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/logs/LogRepositoryImpl.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.togetherjava.tjbot.logwatcher.logs;
-
-import org.springframework.stereotype.Repository;
-import org.togetherjava.tjbot.db.Database;
-import org.togetherjava.tjbot.db.generated.tables.pojos.Logevents;
-import org.togetherjava.tjbot.db.generated.tables.records.LogeventsRecord;
-
-import java.util.Collection;
-import java.util.List;
-
-import static org.togetherjava.tjbot.db.generated.tables.Logevents.LOGEVENTS;
-
-@Repository
-public class LogRepositoryImpl implements LogRepository {
-
-    private final Database db;
-
-    public LogRepositoryImpl(final Database db) {
-        this.db = db;
-    }
-
-
-    @Override
-    public void save(Logevents event) {
-        this.db.writeTransaction(ctx -> {
-            LogeventsRecord toInsert = ctx.newRecord(LOGEVENTS)
-                .setEndofbatch(event.getEndofbatch())
-                .setLevel(event.getLevel())
-                .setLoggername(event.getLoggername())
-                .setLoggerfqcn(event.getLoggerfqcn())
-                .setMessage(event.getMessage())
-                .setTime(event.getTime())
-                .setThread(event.getThread())
-                .setThreadid(event.getThreadid())
-                .setThreadpriority(event.getThreadpriority());
-
-            if (event.getId() != Integer.MIN_VALUE) {
-                toInsert.setId(event.getId());
-            }
-
-            // No merge or Update here, Logs are not supposed to be updated
-            toInsert.insert();
-        });
-    }
-
-    @Override
-    public List<Logevents> findAll() {
-        return this.db.read(ctx -> ctx.selectFrom(LOGEVENTS).fetch(this::recordToPojo));
-    }
-
-
-    @Override
-    public List<Logevents> findWithLevelMatching(Collection<String> logLevels) {
-        return this.db.read(ctx -> ctx.selectFrom(LOGEVENTS)
-            .where(LOGEVENTS.LEVEL.in(logLevels))
-            .fetch(this::recordToPojo));
-    }
-
-    private Logevents recordToPojo(final LogeventsRecord logRecord) {
-        return new Logevents(logRecord.getId(), logRecord.getTime(), logRecord.getThread(),
-                logRecord.getLevel(), logRecord.getLoggername(), logRecord.getMessage(),
-                logRecord.getEndofbatch(), logRecord.getLoggerfqcn(), logRecord.getThreadid(),
-                logRecord.getThreadpriority());
-    }
-
-
-}
diff --git a/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/oauth/OAuth2LoginConfig.java b/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/oauth/OAuth2LoginConfig.java
deleted file mode 100644
index eb9bfc92a7..0000000000
--- a/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/oauth/OAuth2LoginConfig.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package org.togetherjava.tjbot.logwatcher.oauth;
-
-import com.vaadin.flow.spring.security.VaadinWebSecurityConfigurerAdapter;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.builders.WebSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.oauth2.client.InMemoryOAuth2AuthorizedClientService;
-import org.springframework.security.oauth2.client.OAuth2AuthorizedClientService;
-import org.springframework.security.oauth2.client.registration.ClientRegistration;
-import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
-import org.springframework.security.oauth2.client.registration.InMemoryClientRegistrationRepository;
-import org.springframework.security.oauth2.client.web.AuthenticatedPrincipalOAuth2AuthorizedClientRepository;
-import org.springframework.security.oauth2.client.web.OAuth2AuthorizedClientRepository;
-import org.springframework.security.oauth2.core.AuthorizationGrantType;
-import org.springframework.security.oauth2.core.ClientAuthenticationMethod;
-import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
-import org.togetherjava.tjbot.logwatcher.config.Config;
-
-/**
- * Configures Spring Security so that we use Discord-OAuth2 as the identity provider
- */
-@Configuration
-public class OAuth2LoginConfig {
-
-    @Bean
-    public ClientRegistrationRepository clientRegistrationRepository(Config config) {
-        return new InMemoryClientRegistrationRepository(googleClientRegistration(config));
-    }
-
-    @Bean
-    public OAuth2AuthorizedClientService authorizedClientService(
-            ClientRegistrationRepository clientRegistrationRepository) {
-        return new InMemoryOAuth2AuthorizedClientService(clientRegistrationRepository);
-    }
-
-    @Bean
-    public OAuth2AuthorizedClientRepository authorizedClientRepository(
-            OAuth2AuthorizedClientService authorizedClientService) {
-        return new AuthenticatedPrincipalOAuth2AuthorizedClientRepository(authorizedClientService);
-    }
-
-    /**
-     * This is where we actually configure the Security-API to talk to Discord
-     *
-     * @return The ClientRegistration for Discord
-     */
-    private ClientRegistration googleClientRegistration(Config config) {
-        return ClientRegistration.withRegistrationId("Discord")
-            .clientName(config.getClientName())
-            .clientId(config.getClientId())
-            .clientSecret(config.getClientSecret())
-            .clientAuthenticationMethod(ClientAuthenticationMethod.CLIENT_SECRET_POST)
-            .authorizationGrantType(AuthorizationGrantType.AUTHORIZATION_CODE)
-            .scope("identify")
-            .authorizationUri("https://discord.com/api/oauth2/authorize")
-            .userInfoUri("https://discordapp.com/api/users/@me")
-            .userNameAttributeName("username")
-            .tokenUri("https://discordapp.com/api/oauth2/token")
-            .redirectUri(config.getRedirectPath())
-            .build();
-    }
-
-    /**
-     * Configures the Security-API which path's should be protected and generally what to do
-     */
-    @EnableWebSecurity
-    public static class OAuth2LoginSecurityConfig extends VaadinWebSecurityConfigurerAdapter {
-
-        @Override
-        public void configure(WebSecurity web) throws Exception {
-            super.configure(web);
-            web.ignoring().antMatchers("/rest/api/**");
-        }
-
-        @Override
-        protected void configure(HttpSecurity http) throws Exception {
-            http.authorizeRequests().antMatchers("/rest/api/**").anonymous();
-            http.oauth2Login();
-            http.logout()
-                .logoutRequestMatcher(new AntPathRequestMatcher("/logout"))
-                .deleteCookies("JSESSIONID")
-                .invalidateHttpSession(true)
-                .clearAuthentication(true);
-
-            // Enables Vaadin to load Server Resources
-            super.configure(http);
-        }
-    }
-}
diff --git a/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/users/AuthenticatedUser.java b/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/users/AuthenticatedUser.java
deleted file mode 100644
index eaf128785d..0000000000
--- a/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/users/AuthenticatedUser.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package org.togetherjava.tjbot.logwatcher.users;
-
-import com.vaadin.flow.component.UI;
-import com.vaadin.flow.server.VaadinServletRequest;
-import org.springframework.security.core.context.SecurityContext;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.oauth2.core.user.OAuth2User;
-import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler;
-import org.springframework.stereotype.Component;
-import org.togetherjava.tjbot.logwatcher.accesscontrol.Role;
-import org.togetherjava.tjbot.db.generated.tables.pojos.Users;
-
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-
-/**
- * Wrapper for accessing the current User
- */
-@Component
-public class AuthenticatedUser {
-
-    private final UserRepository userRepository;
-
-    public AuthenticatedUser(UserRepository userRepository) {
-        this.userRepository = userRepository;
-    }
-
-    /**
-     * Check's if you could register the current User
-     *
-     * @return true, if the Current user is Authenticated
-     */
-    public boolean canRegister() {
-        return getAuthenticatedUser().isPresent();
-    }
-
-    /**
-     * Check's if the current User is already registered
-     *
-     * @return true, if the User is already in the repository
-     */
-    public boolean isRegistered() {
-        if (!canRegister()) {
-            return false;
-        }
-
-        return getAuthenticatedUser().map(this::extractID)
-            .map(userRepository::findByDiscordID)
-            .isPresent();
-    }
-
-    /**
-     * Attempts to register the current User, if he is not yet registered
-     */
-    public void register() {
-        if (!canRegister() || isRegistered()) {
-            throw new IllegalStateException("Can not register an already registered User");
-        }
-
-        getAuthenticatedUser().map(this::toUser).ifPresent(userRepository::save);
-    }
-
-    /**
-     * Get's the current User Object from the repository
-     *
-     * @return The Optional User, should in most cases not be empty
-     */
-    public Users get() {
-        return getAuthenticatedUser().map(this::extractID)
-            .map(userRepository::findByDiscordID)
-            .orElseThrow(() -> new IllegalArgumentException("No authenticated User present."));
-    }
-
-    public Set<Role> getRoles() {
-        return this.userRepository.fetchRolesForUser(get());
-    }
-
-    /**
-     * Performs a logout on the current User
-     */
-    public void logout() {
-        UI.getCurrent().getPage().setLocation("/");
-        SecurityContextLogoutHandler logoutHandler = new SecurityContextLogoutHandler();
-        logoutHandler.logout(VaadinServletRequest.getCurrent().getHttpServletRequest(), null, null);
-    }
-
-    /**
-     * Extracts the principal from the current SessionContext of the user
-     *
-     * @return The Optional Principal of the current User
-     */
-    private Optional<OAuth2User> getAuthenticatedUser() {
-        SecurityContext context = SecurityContextHolder.getContext();
-        Object principal = context.getAuthentication().getPrincipal();
-
-        return principal instanceof OAuth2User ? Optional.of(principal).map(OAuth2User.class::cast)
-                : Optional.empty();
-    }
-
-    /**
-     * Maps the principal to the User object
-     *
-     * @param oAuth2User Principal to map
-     * @return User-Object derived from the Principal
-     */
-    private Users toUser(OAuth2User oAuth2User) {
-        return new Users(extractID(oAuth2User), oAuth2User.getName());
-    }
-
-    /**
-     * Extracts the discord-ID from the Principal
-     *
-     * @param oAuth2User Principal with the ID
-     * @return Discord-ID from the given Principal
-     */
-    private long extractID(OAuth2User oAuth2User) {
-        final String id = oAuth2User.getAttribute("id");
-        return Long.parseLong(
-                Objects.requireNonNull(id, "ID from OAuth-User is null, this should never happen"));
-    }
-
-}
diff --git a/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/users/UserDetailsServiceImpl.java b/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/users/UserDetailsServiceImpl.java
deleted file mode 100644
index ad8a7e6b8d..0000000000
--- a/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/users/UserDetailsServiceImpl.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package org.togetherjava.tjbot.logwatcher.users;
-
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
-import org.springframework.stereotype.Service;
-import org.togetherjava.tjbot.logwatcher.accesscontrol.Role;
-import org.togetherjava.tjbot.logwatcher.config.Config;
-import org.togetherjava.tjbot.db.generated.tables.pojos.Users;
-
-import java.util.List;
-import java.util.Set;
-
-/**
- * Service to load a spring UserDetail-Object from the userRepository, currently only used for
- * db-initialisation
- */
-@Service
-public class UserDetailsServiceImpl implements UserDetailsService {
-
-    private final UserRepository userRepository;
-
-    public UserDetailsServiceImpl(UserRepository userRepository, Config config) {
-        this.userRepository = userRepository;
-
-        if (this.userRepository.count() == 0) {
-            final Users defaultUser =
-                    new Users(Long.parseLong(config.getRootDiscordID()), config.getRootUserName());
-
-            this.userRepository.save(defaultUser);
-            this.userRepository.saveRolesForUser(defaultUser, Set.of(Role.ADMIN, Role.USER));
-        }
-    }
-
-    private List<GrantedAuthority> getAuthorities(Users user) {
-        return this.userRepository.fetchRolesForUser(user)
-            .stream()
-            .map(Role::getRoleName)
-            .map(name -> "ROLE_" + name)
-            .map(SimpleGrantedAuthority::new)
-            .map(GrantedAuthority.class::cast)
-            .toList();
-
-    }
-
-    /**
-     * Loads the user from the userRepository and maps it to the Spring-Object UserDetails
-     *
-     * @param username Username of the User to Load
-     * @return The UserDetail-Object that is associated with the discordID, or else throws an
-     *         {@link UsernameNotFoundException}
-     */
-    @Override
-    public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
-        Users user = userRepository.findByUsername(username);
-        if (user == null) {
-            throw new UsernameNotFoundException("No user present with username: " + username);
-        } else {
-            return new org.springframework.security.core.userdetails.User(user.getUsername(), null,
-                    getAuthorities(user));
-        }
-    }
-}
diff --git a/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/users/UserRepository.java b/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/users/UserRepository.java
deleted file mode 100644
index de78e71d8a..0000000000
--- a/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/users/UserRepository.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.togetherjava.tjbot.logwatcher.users;
-
-import org.togetherjava.tjbot.logwatcher.accesscontrol.Role;
-import org.togetherjava.tjbot.db.generated.tables.pojos.Users;
-
-import java.util.List;
-import java.util.Set;
-
-/**
- * Basic JPA-Repository for loading Users from the DB
- */
-public interface UserRepository {
-
-    /**
-     * Load's the User from the DB, that matches the discordID
-     *
-     * @param discordID Discord-ID of the User
-     * @return User-Object of the user where the discordID matches, else null
-     */
-    Users findByDiscordID(long discordID);
-
-    /**
-     * Load's the User from the DB, that matches the username
-     *
-     * @param username Username of the User to load
-     * @return User-Object of the user where the username matches, else null
-     */
-    Users findByUsername(final String username);
-
-    /**
-     * Fetches all saved User
-     *
-     * @return List of Users from the DB, never null
-     */
-    List<Users> findAll();
-
-    /**
-     * Counts the amount of Users saved in the DB
-     *
-     * @return Count of Users in the db >=0
-     */
-    int count();
-
-    /**
-     * Merges the given user in the DB
-     *
-     * @param user User to Save in the DB
-     */
-    void save(Users user);
-
-    /**
-     * Removes this User and all referencing Entities
-     */
-    void delete(Users user);
-
-    /**
-     * Fetches the Roles the User has, see {@link Role}
-     *
-     * @param user User to fetch the Roles for
-     * @return Set of Roles, never null
-     */
-    Set<Role> fetchRolesForUser(Users user);
-
-    /**
-     * Updates/Saves the Roles for the User
-     *
-     * @param user User to update the Role's
-     * @param roles All Roles the User should have
-     */
-    void saveRolesForUser(Users user, Set<Role> roles);
-}
diff --git a/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/users/UserRepositoryImpl.java b/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/users/UserRepositoryImpl.java
deleted file mode 100644
index 792a4c9984..0000000000
--- a/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/users/UserRepositoryImpl.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package org.togetherjava.tjbot.logwatcher.users;
-
-import org.springframework.stereotype.Component;
-import org.togetherjava.tjbot.logwatcher.accesscontrol.Role;
-import org.togetherjava.tjbot.db.Database;
-import org.togetherjava.tjbot.db.generated.tables.Userroles;
-import org.togetherjava.tjbot.db.generated.tables.pojos.Users;
-import org.togetherjava.tjbot.db.generated.tables.records.UserrolesRecord;
-import org.togetherjava.tjbot.db.generated.tables.records.UsersRecord;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import static org.togetherjava.tjbot.db.generated.tables.Users.USERS;
-
-@Component
-public class UserRepositoryImpl implements UserRepository {
-
-    private final Database db;
-
-    public UserRepositoryImpl(Database db) {
-        this.db = db;
-    }
-
-    @Override
-    public Users findByDiscordID(long discordID) {
-        return this.db.readTransaction(ctx -> ctx.selectFrom(USERS)
-            .where(USERS.DISCORDID.eq(discordID))
-            .fetchOne(this::recordToRole));
-    }
-
-    @Override
-    public Users findByUsername(String username) {
-        return this.db.readTransaction(ctx -> ctx.selectFrom(USERS)
-            .where(USERS.USERNAME.eq(username))
-            .fetchOne(this::recordToRole));
-    }
-
-    @Override
-    public List<Users> findAll() {
-        return this.db.readTransaction(ctx -> ctx.selectFrom(USERS).fetch(this::recordToRole));
-    }
-
-    @Override
-    public int count() {
-        return this.db.readTransaction(ctx -> ctx.fetchCount(USERS));
-    }
-
-    @Override
-    public void save(Users user) {
-        this.db.writeTransaction(ctx -> ctx.newRecord(USERS)
-            .setDiscordid(user.getDiscordid())
-            .setUsername(user.getUsername())
-            .merge());
-    }
-
-    @Override
-    public void delete(Users user) {
-        this.db.writeTransaction(ctx -> ctx.deleteFrom(USERS)
-            .where(USERS.DISCORDID.eq(user.getDiscordid()))
-            .execute());
-    }
-
-    @Override
-    public Set<Role> fetchRolesForUser(Users user) {
-        return new HashSet<>(this.db.readTransaction(ctx -> ctx.selectFrom(Userroles.USERROLES)
-            .where(Userroles.USERROLES.USERID.eq(user.getDiscordid()))
-            .fetch(this::recordToRole)));
-    }
-
-    @Override
-    public void saveRolesForUser(Users user, Set<Role> roles) {
-        this.db.writeTransaction(ctx -> {
-            ctx.deleteFrom(Userroles.USERROLES)
-                .where(Userroles.USERROLES.USERID.eq(user.getDiscordid()))
-                .execute();
-
-            for (final Role role : roles) {
-                ctx.newRecord(Userroles.USERROLES)
-                    .setRoleid(role.getId())
-                    .setUserid(user.getDiscordid())
-                    .insert();
-            }
-        });
-    }
-
-    private Users recordToRole(UsersRecord usersRecord) {
-        return new Users(usersRecord.getDiscordid(), usersRecord.getUsername());
-    }
-
-    private Role recordToRole(UserrolesRecord rolesRecord) {
-        return Role.forID(rolesRecord.getRoleid());
-    }
-}
diff --git a/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/util/LogReader.java b/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/util/LogReader.java
deleted file mode 100644
index 9aadc236af..0000000000
--- a/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/util/LogReader.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.togetherjava.tjbot.logwatcher.util;
-
-import org.springframework.stereotype.Component;
-import org.togetherjava.tjbot.logwatcher.config.Config;
-
-import java.io.IOException;
-import java.io.UncheckedIOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.stream.Stream;
-
-@Component
-public final class LogReader {
-
-    private final Path logPath;
-
-    public LogReader(Config config) {
-        this.logPath = Path.of(config.getLogPath());
-    }
-
-    /**
-     * Returns all log Files in the configured Path {@link Config#logPath}
-     *
-     * @return Names of the Logfiles
-     */
-    public List<Path> getLogs() {
-        try (final Stream<Path> stream = Files.list(this.logPath)) {
-            return stream.filter(Files::isRegularFile)
-                .filter(s -> s.toString().endsWith(".log") || s.toString().endsWith(".log.gz"))
-                .toList();
-        } catch (final IOException e) {
-            throw new UncheckedIOException(e);
-        }
-    }
-
-    /**
-     * Read's the content of the given Logfile in the configured Logging path
-     *
-     * @param log Name of the Logfile
-     * @return The Content of the Log
-     */
-    public List<String> readLog(final Path log) {
-        try {
-            return Files.readAllLines(log);
-        } catch (final IOException e) {
-            throw new UncheckedIOException(e);
-        }
-    }
-
-}
diff --git a/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/util/LogUtils.java b/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/util/LogUtils.java
deleted file mode 100644
index 719fb20223..0000000000
--- a/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/util/LogUtils.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.togetherjava.tjbot.logwatcher.util;
-
-import org.togetherjava.tjbot.db.generated.tables.pojos.Logevents;
-
-import java.util.Arrays;
-import java.util.EnumSet;
-import java.util.Locale;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-public final class LogUtils {
-
-    /**
-     * Loglevel of all Configurable Levels in the logger
-     */
-    public enum LogLevel {
-        INFO,
-        WARN,
-        ERROR,
-        DEBUG,
-        TRACE;
-
-        /**
-         * Collects all LogLevel in a Set
-         * 
-         * @return A Set containing every Loglevel
-         */
-        public static Set<LogLevel> getAll() {
-            return EnumSet.allOf(LogLevel.class);
-        }
-
-        /**
-         * Maps the LogLevel to their name and collects it in a Set
-         *
-         * @return A Set containing every LogLevel as String
-         */
-        public static Set<String> getAllNames() {
-            return Arrays.stream(values()).map(Enum::name).collect(Collectors.toUnmodifiableSet());
-        }
-    }
-
-    /**
-     * Maps a Logevent to the color-coded css-Class (css class has i.e. red as background-color for
-     * ERROR events)
-     *
-     * @param event Logevent from the DB with a specific Logevent
-     * @return The name of the CSS class to use with this Logevent.
-     */
-    public static String logLevelToCssClass(final Logevents event) {
-        return event.getLevel().toLowerCase(Locale.ENGLISH);
-    }
-
-
-
-    private LogUtils() {}
-}
diff --git a/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/util/NotificationUtils.java b/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/util/NotificationUtils.java
deleted file mode 100644
index e2968b1165..0000000000
--- a/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/util/NotificationUtils.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.togetherjava.tjbot.logwatcher.util;
-
-import com.vaadin.flow.component.notification.Notification;
-import com.vaadin.flow.component.notification.NotificationVariant;
-
-import java.util.concurrent.TimeUnit;
-
-/**
- * Util class for handy Methods regarding Notifications for the Client
- */
-public final class NotificationUtils {
-
-
-    private NotificationUtils() {}
-
-    /**
-     * Prepares a little Notification to display an Errormessage, in case anything goes wrong
-     *
-     * @param e Exception that occurred
-     * @return Notification for the user
-     */
-    public static Notification getNotificationForError(final Exception e) {
-        final Notification not = new Notification();
-        not.setDuration((int) TimeUnit.SECONDS.toMillis(6));
-        not.setPosition(Notification.Position.MIDDLE);
-        not.setText("Exception occurred while saving. %s".formatted(e.getMessage()));
-        not.addThemeVariants(NotificationVariant.LUMO_ERROR);
-        return not;
-    }
-}
diff --git a/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/views/MainLayout.java b/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/views/MainLayout.java
deleted file mode 100644
index d3f60008d7..0000000000
--- a/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/views/MainLayout.java
+++ /dev/null
@@ -1,173 +0,0 @@
-package org.togetherjava.tjbot.logwatcher.views;
-
-import com.google.common.collect.Sets;
-import com.vaadin.flow.component.Component;
-import com.vaadin.flow.component.applayout.AppLayout;
-import com.vaadin.flow.component.applayout.DrawerToggle;
-import com.vaadin.flow.component.avatar.Avatar;
-import com.vaadin.flow.component.button.ButtonVariant;
-import com.vaadin.flow.component.contextmenu.ContextMenu;
-import com.vaadin.flow.component.html.*;
-import com.vaadin.flow.router.PageTitle;
-import com.vaadin.flow.router.RouterLink;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.togetherjava.tjbot.logwatcher.accesscontrol.AllowedRoles;
-import org.togetherjava.tjbot.logwatcher.accesscontrol.Role;
-import org.togetherjava.tjbot.logwatcher.users.AuthenticatedUser;
-import org.togetherjava.tjbot.logwatcher.views.logs.LogsView;
-import org.togetherjava.tjbot.logwatcher.views.logs.StreamedView;
-import org.togetherjava.tjbot.logwatcher.views.usermanagement.UserManagement;
-import org.togetherjava.tjbot.db.generated.tables.pojos.Users;
-
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Stream;
-
-/**
- * The main view is a top-level placeholder for other views.
- */
-@PageTitle("Main")
-@SuppressWarnings({"java:S1192"})
-// Those are css names, and those don't need an extra Constants Class
-public class MainLayout extends AppLayout {
-
-    private final transient AuthenticatedUser authenticatedUser;
-    private H1 viewTitle;
-    private static final Logger logger = LoggerFactory.getLogger(MainLayout.class);
-
-    public MainLayout(AuthenticatedUser authUser) {
-        this.authenticatedUser = authUser;
-        setPrimarySection(Section.DRAWER);
-        addToNavbar(true, createHeaderContent());
-        addToDrawer(createDrawerContent());
-
-        if (authUser.canRegister() && !authUser.isRegistered()) {
-            authUser.register();
-        }
-
-
-        if (this.authenticatedUser.getRoles().isEmpty()) {
-            authUser.logout();
-        }
-
-    }
-
-    private static RouterLink createLink(MenuItemInfo menuItemInfo) {
-        RouterLink link = new RouterLink();
-        link.addClassNames("flex", "mx-s", "p-s", "relative", "text-secondary");
-        link.setRoute(menuItemInfo.view());
-
-        Span icon = new Span();
-        icon.addClassNames("me-s", "text-l");
-        if (!menuItemInfo.iconClass().isEmpty()) {
-            icon.addClassNames(menuItemInfo.iconClass());
-        }
-
-        Span text = new Span(menuItemInfo.text());
-        text.addClassNames("font-medium", "text-s");
-
-        link.add(icon, text);
-        return link;
-    }
-
-    private Component createHeaderContent() {
-        DrawerToggle toggle = new DrawerToggle();
-        toggle.addClassName("text-secondary");
-        toggle.addThemeVariants(ButtonVariant.LUMO_CONTRAST);
-        toggle.getElement().setAttribute("aria-label", "Menu toggle");
-
-        viewTitle = new H1();
-        viewTitle.addClassNames("m-0", "text-l");
-
-        Header header = new Header(toggle, viewTitle);
-        header.addClassNames("bg-base", "border-b", "border-contrast-10", "box-border", "flex",
-                "h-xl", "items-center", "w-full");
-        return header;
-    }
-
-    private Component createDrawerContent() {
-        H2 appName = new H2("Logviewer");
-        appName.addClassNames("flex", "items-center", "h-xl", "m-0", "px-m", "text-m");
-
-        com.vaadin.flow.component.html.Section section = new com.vaadin.flow.component.html.Section(
-                appName, createNavigation(), createFooter());
-        section.addClassNames("flex", "flex-col", "items-stretch", "max-h-full", "min-h-full");
-        return section;
-    }
-
-    private Nav createNavigation() {
-        Nav nav = new Nav();
-        nav.addClassNames("border-b", "border-contrast-10", "flex-grow", "overflow-auto");
-        nav.getElement().setAttribute("aria-labelledby", "views");
-
-        H3 views = new H3("Views");
-        views.addClassNames("flex", "h-m", "items-center", "mx-m", "my-0", "text-s",
-                "text-tertiary");
-        views.setId("views");
-
-        createLinks().forEach(nav::add);
-
-        return nav;
-    }
-
-    private List<RouterLink> createLinks() {
-        return Stream
-            .of(new MenuItemInfo("Logs", "la la-globe", LogsView.class),
-                    new MenuItemInfo("Streamed", "la la-globe", StreamedView.class),
-                    new MenuItemInfo("User Management", "la la-file", UserManagement.class))
-            .filter(this::checkAccess)
-            .map(MainLayout::createLink)
-            .toList();
-    }
-
-    private boolean checkAccess(MenuItemInfo menuItemInfo) {
-        final Class<? extends Component> view = menuItemInfo.view;
-        final AllowedRoles annotation = view.getAnnotation(AllowedRoles.class);
-
-        if (annotation == null) {
-            logger.warn("Class {} not properly secured with Annotation", view);
-            return false;
-        }
-
-        final Set<Role> roles = Set.of(annotation.roles());
-
-        return !Sets.intersection(this.authenticatedUser.getRoles(), roles).isEmpty();
-    }
-
-    private Footer createFooter() {
-        Footer layout = new Footer();
-        layout.addClassNames("flex", "items-center", "my-s", "px-m", "py-xs");
-
-        Users user = this.authenticatedUser.get();
-
-        Avatar avatar = new Avatar(user.getUsername());
-        avatar.addClassNames("me-xs");
-
-        ContextMenu userMenu = new ContextMenu(avatar);
-        userMenu.setOpenOnClick(true);
-        userMenu.addItem("Logout", e -> authenticatedUser.logout());
-
-        Span name = new Span(user.getUsername());
-        name.addClassNames("font-medium", "text-s", "text-secondary");
-
-        layout.add(avatar, name);
-
-        return layout;
-    }
-
-    @Override
-    protected void afterNavigation() {
-        super.afterNavigation();
-        viewTitle.setText(getCurrentPageTitle());
-    }
-
-    private String getCurrentPageTitle() {
-        PageTitle title = getContent().getClass().getAnnotation(PageTitle.class);
-        return title == null ? "" : title.value();
-    }
-
-
-    private record MenuItemInfo(String text, String iconClass, Class<? extends Component> view) {
-    }
-}
diff --git a/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/views/logs/LogsView.java b/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/views/logs/LogsView.java
deleted file mode 100644
index 97e23e70e5..0000000000
--- a/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/views/logs/LogsView.java
+++ /dev/null
@@ -1,183 +0,0 @@
-package org.togetherjava.tjbot.logwatcher.views.logs;
-
-import com.vaadin.flow.component.AbstractField;
-import com.vaadin.flow.component.HasValue;
-import com.vaadin.flow.component.checkbox.Checkbox;
-import com.vaadin.flow.component.combobox.ComboBox;
-import com.vaadin.flow.component.html.Paragraph;
-import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
-import com.vaadin.flow.component.orderedlayout.Scroller;
-import com.vaadin.flow.component.orderedlayout.VerticalLayout;
-import com.vaadin.flow.data.provider.DataProvider;
-import com.vaadin.flow.data.renderer.TextRenderer;
-import com.vaadin.flow.router.PageTitle;
-import com.vaadin.flow.router.Route;
-import com.vaadin.flow.router.RouteAlias;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.togetherjava.tjbot.logwatcher.accesscontrol.AllowedRoles;
-import org.togetherjava.tjbot.logwatcher.accesscontrol.Role;
-import org.togetherjava.tjbot.logwatcher.util.LogReader;
-import org.togetherjava.tjbot.logwatcher.util.LogUtils;
-import org.togetherjava.tjbot.logwatcher.util.NotificationUtils;
-import org.togetherjava.tjbot.logwatcher.views.MainLayout;
-
-import javax.annotation.security.PermitAll;
-import java.io.UncheckedIOException;
-import java.nio.file.Path;
-import java.util.Collections;
-import java.util.List;
-import java.util.Locale;
-import java.util.Objects;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-
-/**
- * The Logs View in the Browser
- */
-
-@PageTitle("Logs")
-@Route(value = "logs", layout = MainLayout.class)
-@RouteAlias(value = "", layout = MainLayout.class)
-@AllowedRoles(roles = {Role.USER})
-@PermitAll
-public class LogsView extends VerticalLayout {
-
-    private static final Logger logger = LoggerFactory.getLogger(LogsView.class);
-
-    private static final Pattern LOGLEVEL_MATCHER =
-            Pattern.compile("(%s)".formatted(String.join("|", LogUtils.LogLevel.getAllNames())));
-
-    /**
-     * Field where the events are displayed
-     */
-    private final VerticalLayout events = new VerticalLayout();
-
-    private final transient LogReader watcher;
-
-    public LogsView(LogReader watcher) {
-        this.watcher = watcher;
-        this.events.setWidthFull();
-
-        addClassName("logs-view");
-
-        HorizontalLayout options = new HorizontalLayout();
-        options.setAlignItems(Alignment.START);
-
-        for (final String level : LogUtils.LogLevel.getAllNames()) {
-            final Checkbox ch = new Checkbox(level);
-            ch.setValue(true);
-            ch.addValueChangeListener(this::onLogLevelCheckbox);
-            options.add(ch);
-        }
-
-        ComboBox<Path> logs = createComboBox();
-        logs.getOptionalValue().ifPresent(this::fillTextField);
-
-        add(logs, options, new Scroller(this.events, Scroller.ScrollDirection.VERTICAL));
-    }
-
-    private void onLogLevelCheckbox(
-            AbstractField.ComponentValueChangeEvent<Checkbox, Boolean> event) {
-        if (!event.isFromClient()) {
-            return;
-        }
-
-        final String level = event.getSource().getLabel().toLowerCase(Locale.ENGLISH);
-
-        this.events.getChildren()
-            .filter(Paragraph.class::isInstance)
-            .map(Paragraph.class::cast)
-            .filter(c -> c.getClassName().equals(level))
-            .forEach(c -> c.setVisible(event.getValue()));
-    }
-
-    /**
-     * Creates the Combobox of Logfile-Names where the User can choose what File to view
-     *
-     * @return The created Combobox
-     */
-    private ComboBox<Path> createComboBox() {
-        final ComboBox<Path> logs = new ComboBox<>("Log-Files");
-        logs.setAllowCustomValue(false);
-        logs.setRenderer(new TextRenderer<>(p -> p.getFileName().toString()));
-
-        final List<Path> logFiles = getLogFiles();
-        logs.setItems(DataProvider.ofCollection(logFiles));
-        logFiles.stream().findFirst().ifPresent(logs::setValue);
-
-        logs.addValueChangeListener(this::onLogFileCombobox);
-
-        return logs;
-    }
-
-    /**
-     * When User chooses another Logfile, reload the Log and set it in the textField
-     *
-     * @param event Generated Event, containing old and new Value
-     */
-    private void onLogFileCombobox(HasValue.ValueChangeEvent<Path> event) {
-        if (Objects.equals(event.getOldValue(), event.getValue())) {
-            return;
-        }
-
-        fillTextField(event.getValue());
-    }
-
-    /**
-     * Reload the Log and set it in the textField
-     *
-     * @param logFileName Name of the Logfile
-     */
-    private void fillTextField(final Path logFileName) {
-        this.events.removeAll();
-
-        final List<String> logEntries = getLogEntries(logFileName);
-
-        String previousGroup = "unknown";
-        for (final String event : logEntries) {
-            final String trimmed = event.trim();
-            final Paragraph text = new Paragraph(trimmed);
-
-            final Matcher matcher = LOGLEVEL_MATCHER.matcher(trimmed);
-            if (matcher.find()) {
-                previousGroup = matcher.group().toLowerCase(Locale.ENGLISH);
-            }
-
-            text.addClassName(previousGroup);
-            this.events.add(text);
-        }
-    }
-
-    /**
-     * Gathers all available Logfiles
-     *
-     * @return Names of available Logfiles
-     */
-    private List<Path> getLogFiles() {
-        try {
-            return this.watcher.getLogs();
-        } catch (final UncheckedIOException e) {
-            logger.error("Exception while gathering LogFiles", e);
-            NotificationUtils.getNotificationForError(e).open();
-            return Collections.emptyList();
-        }
-    }
-
-    /**
-     * Reads the log for the given Logfile
-     *
-     * @param logFile Name of the log to read
-     * @return Contents of the LogFile
-     */
-    private List<String> getLogEntries(final Path logFile) {
-        try {
-            return this.watcher.readLog(logFile);
-        } catch (final UncheckedIOException e) {
-            logger.error("Exception while gathering LogFiles", e);
-            NotificationUtils.getNotificationForError(e).open();
-            return Collections.emptyList();
-        }
-    }
-}
diff --git a/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/views/logs/StreamedView.java b/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/views/logs/StreamedView.java
deleted file mode 100644
index 2d15ac9cb1..0000000000
--- a/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/views/logs/StreamedView.java
+++ /dev/null
@@ -1,189 +0,0 @@
-package org.togetherjava.tjbot.logwatcher.views.logs;
-
-import com.vaadin.componentfactory.EnhancedDialog;
-import com.vaadin.flow.component.*;
-import com.vaadin.flow.component.button.Button;
-import com.vaadin.flow.component.checkbox.Checkbox;
-import com.vaadin.flow.component.dependency.CssImport;
-import com.vaadin.flow.component.grid.Grid;
-import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
-import com.vaadin.flow.component.orderedlayout.VerticalLayout;
-import com.vaadin.flow.data.renderer.LocalDateTimeRenderer;
-import com.vaadin.flow.router.PageTitle;
-import com.vaadin.flow.router.Route;
-import com.vaadin.flow.server.SessionDestroyEvent;
-import com.vaadin.flow.server.VaadinService;
-import org.togetherjava.tjbot.db.generated.tables.pojos.Logevents;
-import org.togetherjava.tjbot.logwatcher.accesscontrol.AllowedRoles;
-import org.togetherjava.tjbot.logwatcher.accesscontrol.Role;
-import org.togetherjava.tjbot.logwatcher.constants.LogEventsConstants;
-import org.togetherjava.tjbot.logwatcher.logs.LogRepository;
-import org.togetherjava.tjbot.logwatcher.util.LogUtils;
-import org.togetherjava.tjbot.logwatcher.views.MainLayout;
-import org.togetherjava.tjbot.logwatcher.watcher.StreamWatcher;
-import org.vaadin.crudui.crud.impl.GridCrud;
-
-import javax.annotation.security.PermitAll;
-import java.time.LocalDateTime;
-import java.time.ZoneOffset;
-import java.time.format.DateTimeFormatter;
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * The Logs View in the Browser
- */
-
-@PageTitle("Streamed")
-@Route(value = "streamed", layout = MainLayout.class)
-@AllowedRoles(roles = {Role.USER})
-@PermitAll
-@CssImport(themeFor = "vaadin-grid", value = "./themes/logviewer/views/logs-view.css")
-public class StreamedView extends VerticalLayout {
-
-    private final GridCrud<Logevents> grid = new GridCrud<>(Logevents.class);
-    private final UUID uuid = UUID.randomUUID();
-    private final Set<String> enabledLogLevel = new HashSet<>(LogUtils.LogLevel.getAllNames());
-
-    public StreamedView(LogRepository logs) {
-        addClassName("logs-view");
-
-        final HorizontalLayout buttonPanel =
-                new HorizontalLayout(new Button("Change Columns", this::onChangeColumns));
-
-        for (final String level : this.enabledLogLevel) {
-            final Checkbox ch = new Checkbox(level);
-            ch.setValue(true);
-            ch.addValueChangeListener(this::onLogLevelCheckbox);
-            buttonPanel.add(ch);
-        }
-
-        add(buttonPanel, this.grid);
-
-        this.grid.setOperations(() -> logs.findWithLevelMatching(this.enabledLogLevel), null, null,
-                null);
-        this.grid.setAddOperationVisible(false);
-        this.grid.setDeleteOperationVisible(false);
-        this.grid.setUpdateOperationVisible(false);
-
-
-        final Grid<Logevents> baseGrid = this.grid.getGrid();
-        baseGrid.setColumns(LogEventsConstants.FIELD_INSTANT, LogEventsConstants.FIELD_LOGGER_NAME,
-                LogEventsConstants.FIELD_MESSAGE);
-        setInstantFormatter();
-        baseGrid.getColumns().forEach(c -> c.setAutoWidth(true));
-        baseGrid.getColumns().forEach(c -> c.setResizable(true));
-        baseGrid.setClassNameGenerator(LogUtils::logLevelToCssClass);
-        baseGrid.recalculateColumnWidths();
-        baseGrid.setColumnReorderingAllowed(true);
-
-        VaadinService.getCurrent().addSessionDestroyListener(this::onDestroy);
-        final UI ui = UI.getCurrent();
-        StreamWatcher.addSubscription(this.uuid, () -> ui.access(this.grid::refreshGrid));
-    }
-
-    private void onLogLevelCheckbox(
-            AbstractField.ComponentValueChangeEvent<Checkbox, Boolean> event) {
-        if (!event.isFromClient()) {
-            return;
-        }
-
-        final String logLevel = event.getSource().getLabel();
-
-        final boolean isChecked = event.getValue();// don't inline this, else SonarLint is crying
-        if (isChecked) {
-            this.enabledLogLevel.add(logLevel);
-        } else {
-            this.enabledLogLevel.remove(logLevel);
-        }
-        this.grid.refreshGrid();
-    }
-
-    private void onDestroy(SessionDestroyEvent event) {
-        removeHook();
-    }
-
-    @Override
-    protected void onDetach(DetachEvent detachEvent) {
-        removeHook();
-        super.onDetach(detachEvent);
-    }
-
-    private void removeHook() {
-        StreamWatcher.removeSubscription(this.uuid);
-    }
-
-    private void setInstantFormatter() {
-        final Grid<Logevents> innerGrid = this.grid.getGrid();
-        final Optional<Grid.Column<Logevents>> column =
-                Optional.ofNullable(innerGrid.getColumnByKey(LogEventsConstants.FIELD_INSTANT));
-        if (column.isEmpty()) {
-            return;
-        }
-
-        final Grid.Column<Logevents> instant = column.orElseThrow();
-        innerGrid.removeColumn(instant);
-
-        final String[] keys =
-                innerGrid.getColumns().stream().map(Grid.Column::getKey).toArray(String[]::new);
-        innerGrid.removeAllColumns();
-
-
-        innerGrid
-            .addColumn(new LocalDateTimeRenderer<>(
-                    logEvents -> LocalDateTime.ofInstant(logEvents.getTime(), ZoneOffset.UTC),
-                    DateTimeFormatter.ofPattern("yyy-MM-dd HH:mm:ss.SSS")))
-            .setHeader("Instant")
-            .setComparator(Comparator.comparing(Logevents::getTime))
-            .setKey(LogEventsConstants.FIELD_INSTANT);
-
-        innerGrid.addColumns(keys);
-    }
-
-    private void onChangeColumns(ClickEvent<Button> event) {
-        final EnhancedDialog dialog = new EnhancedDialog();
-        dialog.setHeader("Choose the Columns you want to see.");
-        final Set<String> columns = this.grid.getGrid()
-            .getColumns()
-            .stream()
-            .map(Grid.Column::getKey)
-            .collect(Collectors.toSet());
-
-        final List<Checkbox> checkBoxes = new ArrayList<>();
-        final List<String> fields =
-                Arrays.asList(LogEventsConstants.FIELD_INSTANT, LogEventsConstants.FIELD_THREAD,
-                        LogEventsConstants.FIELD_LOGGER_LEVEL, LogEventsConstants.FIELD_LOGGER_NAME,
-                        LogEventsConstants.FIELD_MESSAGE, LogEventsConstants.FIELD_LOGGER_FQCN);
-        for (String field : fields) {
-            Checkbox c = new Checkbox(field);
-            c.setValue(columns.contains(c.getLabel()));
-            checkBoxes.add(c);
-        }
-        dialog.setContent(checkBoxes.toArray(Component[]::new));
-        dialog.setFooter(new Button("Accept", evt -> this.onOkay(dialog, checkBoxes)),
-                new Button("Cancel", e -> dialog.close()));
-        dialog.open();
-    }
-
-    private void onOkay(final EnhancedDialog dialog, final List<Checkbox> checkboxes) {
-        final String[] columns = checkboxes.stream()
-            .filter(AbstractField::getValue)
-            .map(Checkbox::getLabel)
-            .toArray(String[]::new);
-
-
-        this.grid.getGrid().setColumns(columns);
-        final boolean includeTime = checkboxes.stream()
-            .filter(AbstractField::getValue)
-            .anyMatch(c -> LogEventsConstants.FIELD_INSTANT.equals(c.getLabel()));
-
-        if (includeTime) {
-            setInstantFormatter();
-        }
-
-        this.grid.getGrid().getColumns().forEach(c -> c.setAutoWidth(true));
-        this.grid.getGrid().getColumns().forEach(c -> c.setResizable(true));
-        this.grid.getGrid().recalculateColumnWidths();
-        dialog.close();
-    }
-}
diff --git a/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/views/usermanagement/UserManagement.java b/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/views/usermanagement/UserManagement.java
deleted file mode 100644
index 6b09965d39..0000000000
--- a/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/views/usermanagement/UserManagement.java
+++ /dev/null
@@ -1,202 +0,0 @@
-package org.togetherjava.tjbot.logwatcher.views.usermanagement;
-
-import com.vaadin.componentfactory.EnhancedDialog;
-import com.vaadin.flow.component.ClickEvent;
-import com.vaadin.flow.component.Text;
-import com.vaadin.flow.component.button.Button;
-import com.vaadin.flow.component.checkbox.CheckboxGroup;
-import com.vaadin.flow.component.grid.Grid;
-import com.vaadin.flow.component.grid.contextmenu.GridContextMenu;
-import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
-import com.vaadin.flow.component.orderedlayout.VerticalLayout;
-import com.vaadin.flow.component.textfield.NumberField;
-import com.vaadin.flow.component.textfield.TextField;
-import com.vaadin.flow.data.provider.DataProvider;
-import com.vaadin.flow.data.provider.Query;
-import com.vaadin.flow.router.PageTitle;
-import com.vaadin.flow.router.Route;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.togetherjava.tjbot.logwatcher.accesscontrol.AllowedRoles;
-import org.togetherjava.tjbot.logwatcher.accesscontrol.Role;
-import org.togetherjava.tjbot.logwatcher.entities.UserWrapper;
-import org.togetherjava.tjbot.logwatcher.users.UserRepository;
-import org.togetherjava.tjbot.logwatcher.util.NotificationUtils;
-import org.togetherjava.tjbot.logwatcher.views.MainLayout;
-import org.togetherjava.tjbot.db.DatabaseException;
-import org.togetherjava.tjbot.db.generated.tables.pojos.Users;
-
-import javax.annotation.security.PermitAll;
-import java.util.Collections;
-import java.util.Optional;
-import java.util.stream.Stream;
-
-/**
- * The User-Management View in the Browser
- */
-
-@PageTitle("UserManagement")
-@Route(value = "user", layout = MainLayout.class)
-@AllowedRoles(roles = {Role.ADMIN})
-@PermitAll
-public class UserManagement extends VerticalLayout {
-
-    private final transient UserRepository repo;
-    private final Grid<UserWrapper> grid = new Grid<>(UserWrapper.class, false);
-    private static final Logger logger = LoggerFactory.getLogger(UserManagement.class);
-
-    public UserManagement(UserRepository repository) {
-        this.repo = repository;
-        add(grid);
-
-
-        GridContextMenu<UserWrapper> menu = grid.addContextMenu();
-        menu.addItem("Add", this::onAdd);
-        menu.addItem("Edit", this::onEdit);
-        menu.addItem("Delete", this::onDelete);
-
-        grid.setColumns("discordID", "userName", "roles");
-
-        // The int-cast is necessary here, since DataProvider.fromCallback expects an int on the
-        // Counting Callback, and we are not going to display more than 2 Billion entries at once
-        grid.setItems(DataProvider.fromCallbacks(this::onAll, query -> (int) onAll(query).count()));
-    }
-
-    private void onDelete(GridContextMenu.GridContextMenuItemClickEvent<UserWrapper> event) {
-        event.getItem().map(DeleteDialog::new).ifPresent(EnhancedDialog::open);
-    }
-
-    private void onAdd(GridContextMenu.GridContextMenuItemClickEvent<UserWrapper> event) {
-        new CreateDialog().open();
-    }
-
-    private void onEdit(GridContextMenu.GridContextMenuItemClickEvent<UserWrapper> event) {
-        event.getItem().map(EditDialog::new).ifPresent(EditDialog::open);
-    }
-
-    private Stream<UserWrapper> onAll(Query<UserWrapper, Void> query) {
-        try {
-            return this.repo.findAll()
-                .stream()
-                .skip(query.getOffset())
-                .limit(query.getLimit())
-                .map(user -> new UserWrapper(user.getDiscordid(), user.getUsername(),
-                        this.repo.fetchRolesForUser(user)));
-        } catch (final DatabaseException e) {
-            logger.error("Exception occurred while fetching.", e);
-            NotificationUtils.getNotificationForError(e).open();
-            return Stream.empty();
-        }
-    }
-
-    private class EditDialog extends EnhancedDialog {
-        protected final TextField userNameField;
-        protected final CheckboxGroup<Role> rolesGroup;
-        protected final UserWrapper person;
-
-        private EditDialog(UserWrapper person) {
-            this.person = person;
-            this.userNameField = new TextField("UserName", person.getUserName(), "");
-            this.rolesGroup = new CheckboxGroup<>();
-            this.rolesGroup.setLabel("Roles");
-            this.rolesGroup.setItems(Role.getDisplayableRoles());
-            this.rolesGroup.setValue(person.getRoles());
-
-            initCenter();
-            initFooter();
-        }
-
-        protected void initCenter() {
-            setContent(new HorizontalLayout(this.userNameField, this.rolesGroup));
-        }
-
-        protected void initFooter() {
-            addToFooter(new HorizontalLayout(new Button("Save", this::onSave),
-                    new Button("Cancel", ev -> this.close())));
-        }
-
-        protected void onSave(ClickEvent<Button> event) {
-            this.doUpdate(new UserWrapper(this.person.getDiscordID(), this.userNameField.getValue(),
-                    this.rolesGroup.getValue()));
-            UserManagement.this.grid.getDataProvider().refreshAll();
-            this.close();
-        }
-
-        /**
-         * Saves a new User or updates an existing User in the Repository
-         *
-         * @param user User to save
-         */
-        private void doUpdate(UserWrapper user) {
-            try {
-                Users toSave = new Users(user.getDiscordID(), user.getUserName());
-                UserManagement.this.repo.save(toSave);
-
-                UserManagement.this.repo.saveRolesForUser(toSave, user.getRoles());
-            } catch (DatabaseException e) {
-                logger.error("Exception occurred while saving.", e);
-                NotificationUtils.getNotificationForError(e).open();
-            }
-
-        }
-    }
-
-
-    @SuppressWarnings("java:S110") // Inherits a single time to reduce duplicated Code
-    private class CreateDialog extends EditDialog {
-        private final NumberField id = new NumberField("Discord ID", "0");
-
-        private CreateDialog() {
-            super(new UserWrapper(0L, "", Collections.emptySet()));
-            this.id.setWidth("150px");
-            setHeader(new Text("Create new User"));
-            setContent(new HorizontalLayout(this.id, this.userNameField, this.rolesGroup));
-        }
-
-
-        @Override
-        protected void onSave(ClickEvent<Button> event) {
-            Optional<Double> discordID = this.id.getOptionalValue();
-            if (discordID.isEmpty()) {
-                return;
-            }
-
-            this.person.setDiscordID(discordID.orElseThrow().longValue());
-            super.onSave(event);
-        }
-    }
-
-
-    private class DeleteDialog extends EnhancedDialog {
-        private final UserWrapper person;
-
-        private DeleteDialog(UserWrapper person) {
-            this.person = person;
-            setContent(new Text("Are you sure you want to delete the Entry of %s?"
-                .formatted(person.getUserName())));
-            setFooter(new HorizontalLayout(new Button("Delete", this::onDelete),
-                    new Button("Cancel", e -> this.close())));
-        }
-
-        private void onDelete(ClickEvent<Button> event) {
-            this.doRemove(this.person);
-            UserManagement.this.grid.getDataProvider().refreshAll();
-            this.close();
-        }
-
-        /**
-         * Removes the given User from the Repository
-         *
-         * @param user User to remove
-         */
-        private void doRemove(UserWrapper user) {
-            try {
-                UserManagement.this.repo.delete(new Users(user.getDiscordID(), user.getUserName()));
-            } catch (DatabaseException e) {
-                logger.error("Exception occurred while removing.", e);
-                NotificationUtils.getNotificationForError(e).open();
-            }
-        }
-
-    }
-}
diff --git a/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/watcher/StreamWatcher.java b/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/watcher/StreamWatcher.java
deleted file mode 100644
index 5ff8365a4a..0000000000
--- a/logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/watcher/StreamWatcher.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.togetherjava.tjbot.logwatcher.watcher;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-
-public class StreamWatcher {
-    private static final int EXPECTED_CONCURRENT_LOG_WATCHERS = 3;
-    private static final Map<UUID, Runnable> consumerMap =
-            new ConcurrentHashMap<>(EXPECTED_CONCURRENT_LOG_WATCHERS);
-    private static final Logger logger = LoggerFactory.getLogger(StreamWatcher.class);
-
-    private StreamWatcher() {}
-
-    /**
-     * Signals an intent to be notified on new Entries
-     *
-     * @param uuid Unique Object to remove the Runnable later
-     * @param onNewEvent Run on new Event
-     */
-    public static void addSubscription(final UUID uuid, final Runnable onNewEvent) {
-        consumerMap.put(uuid, onNewEvent);
-    }
-
-    /**
-     * Removes the Subscription to save resources
-     *
-     * @param uuid Unique Object used to register the Subscription
-     */
-    public static void removeSubscription(final UUID uuid) {
-        consumerMap.remove(uuid);
-    }
-
-    /**
-     * Notify all Subscribers with their Runnable
-     */
-    public static void notifyOfEvent() {
-        consumerMap.values().forEach(StreamWatcher::notifySubscriber);
-    }
-
-    /**
-     * Runs the runnable and logs any errors that might occur
-     *
-     * @param run The Runnable of one of the consumers
-     */
-    private static void notifySubscriber(Runnable run) {
-        try {
-            run.run();
-        } catch (final Exception e) {
-            logger.error("Runnable threw Exception.", e);
-        }
-    }
-}
diff --git a/logviewer/src/main/resources/META-INF/resources/icons/icon.png b/logviewer/src/main/resources/META-INF/resources/icons/icon.png
deleted file mode 100644
index 6fde5c10d4..0000000000
Binary files a/logviewer/src/main/resources/META-INF/resources/icons/icon.png and /dev/null differ
diff --git a/logviewer/src/main/resources/application.properties b/logviewer/src/main/resources/application.properties
deleted file mode 100644
index adb584b929..0000000000
--- a/logviewer/src/main/resources/application.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-server.port=5050
-spring.mustache.check-template-location=false
-
-# We need this flag when running behind a reverse proxy terminating SSL connections,
-# as otherwise the login redirects will use plain HTTP.
-# See https://github.com/spring-projects/spring-security/issues/5631
-server.forward-headers-strategy=FRAMEWORK
-
-# To improve the performance during development.
-# For more information https://vaadin.com/docs/flow/spring/tutorial-spring-configuration.html#special-configuration-parameters
-# vaadin.whitelisted-packages= org/vaadin/example
-
diff --git a/logviewer/src/main/resources/db/V1__Logviewer.sql b/logviewer/src/main/resources/db/V1__Logviewer.sql
deleted file mode 100644
index ca5972abf2..0000000000
--- a/logviewer/src/main/resources/db/V1__Logviewer.sql
+++ /dev/null
@@ -1,32 +0,0 @@
-CREATE TABLE logevents
-(
-    id             INTEGER PRIMARY KEY autoincrement,
-    time           TIMESTAMP NOT NULL,
-    thread         TEXT      NOT NULL,
-    level          TEXT      NOT NULL,
-    loggerName     TEXT      NOT NULL,
-    message        TEXT      NOT NULL,
-    endOfBatch     boolean   NOT NULL,
-    loggerFqcn     TEXT      NOT NULL,
-    threadId       integer   NOT NULL,
-    threadPriority integer   NOT NULL
-);
-
-CREATE TABLE users
-(
-    discordID BIGINT PRIMARY KEY,
-    userName  TEXT NOT NULL
-);
-
-CREATE TABLE userRoles
-(
-    userID BIGINT,
-    roleID INTEGER,
-
-    CONSTRAINT fk_discordID
-        FOREIGN KEY(userID)
-            REFERENCES users(discordID)
-                ON DELETE CASCADE,
-
-    PRIMARY KEY(userID, roleID)
-);
diff --git a/logviewer/src/main/resources/log4j2.xml b/logviewer/src/main/resources/log4j2.xml
deleted file mode 100644
index 3f0f6b7f9e..0000000000
--- a/logviewer/src/main/resources/log4j2.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="WARN" monitorInterval="30">
-    <Appenders>
-        <Console name="Console" target="SYSTEM_OUT">
-            <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
-        </Console>
-        <RollingFile name="File" fileName="logviewer/logs/viewer.log"
-                     filePattern="logviewer/logs/viewer-%d{dd-MM-yyyy}.log.gz"
-                     ignoreExceptions="false">
-            <PatternLayout charset="UTF-8"
-                           pattern="%d{yyy-MM-dd HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
-            <Policies>
-                <SizeBasedTriggeringPolicy size="10 MB"/>
-            </Policies>
-        </RollingFile>
-    </Appenders>
-    <Loggers>
-        <Root level="info">
-            <AppenderRef ref="Console"/>
-            <AppenderRef ref="File"/>
-        </Root>
-        <!--Binder is logging because of missing Setters on the Read-Only Classes, which is fine for us-->
-        <Logger name="com.vaadin.flow.data.binder.Binder" level="WARN"/>
-    </Loggers>
-</Configuration>
diff --git a/settings.gradle b/settings.gradle
index 18a6930e6b..5c048b9ade 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -4,8 +4,5 @@ include 'application'
 include 'database'
 include 'formatter'
 include 'utils'
-// NOTE The logviewer does not properly work as of today.
-//  But it is causing major build slowdowns, so we exclude it for the time being.
-// include 'logviewer'
 include 'website'
 
diff --git a/utils/src/main/java/org/togetherjava/tjbot/annotations/MethodsReturnNonnullByDefault.java b/utils/src/main/java/org/togetherjava/tjbot/annotations/MethodsReturnNonnullByDefault.java
index c4bfeccce9..04affa49f4 100644
--- a/utils/src/main/java/org/togetherjava/tjbot/annotations/MethodsReturnNonnullByDefault.java
+++ b/utils/src/main/java/org/togetherjava/tjbot/annotations/MethodsReturnNonnullByDefault.java
@@ -2,6 +2,7 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.meta.TypeQualifierDefault;
+
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;