From 205229a2ca3b61c871eda3d2b8faa86625c647d5 Mon Sep 17 00:00:00 2001
From: Michael Rittmeister <michael@rittmeister.in>
Date: Tue, 5 Nov 2024 19:38:46 +0100
Subject: [PATCH] Update to Kordex 2.0.0

---
 .idea/gradle.xml                              |   1 -
 .idea/misc.xml                                | Bin 1471 -> 0 bytes
 app/desktop/uwp_helper/Cargo.lock             |  20 ++++----
 app/desktop/uwp_helper/build.gradle.kts       |   5 +-
 app/shared/build.gradle.kts                   |   4 --
 bot/build.gradle.kts                          |  11 +++--
 .../dev/schlaubi/tonbrett/bot/Plugin.kt       |  18 +++----
 .../tonbrett/bot/command/EmojiConverter.kt    |  30 ++++++------
 .../tonbrett/bot/command/SoundConverter.kt    |  37 +++++++++------
 .../tonbrett/bot/command/TagConverter.kt      |   7 +--
 .../tonbrett/bot/commands/AddCommand.kt       |  44 +++++++++---------
 .../tonbrett/bot/commands/JoinCommand.kt      |  10 ++--
 .../tonbrett/bot/commands/PlayCommand.kt      |   9 ++--
 .../bot/commands/RemoveSoundCommand.kt        |  14 +++---
 .../tonbrett/bot/commands/UpdateCommand.kt    |  42 +++++++++--------
 .../tonbrett/bot/core/VoiceStateWatcher.kt    |   7 ++-
 .../tonbrett/bot/io/SoundBoardDatabase.kt     |   2 +-
 .../tonbrett/bot/server/FileServer.kt         |   1 -
 .../dev/schlaubi/tonbrett/bot/server/Ktor.kt  |   3 +-
 .../tonbrett/bot/server/SoundsRoute.kt        |   5 +-
 .../dev/schlaubi/tonbrett/bot/server/Ui.kt    |  11 ++---
 .../schlaubi/tonbrett/bot/server/UserRoute.kt |   6 +--
 .../tonbrett/bot/util/LavalinkUtil.kt         |   4 +-
 ...gs_en_GB.properties => strings.properties} |  23 +++++++++
 build.gradle.kts                              |   2 +-
 common/build.gradle.kts                       |   2 +-
 gradle/libs.versions.toml                     |  16 +++----
 settings.gradle.kts                           |   1 +
 28 files changed, 184 insertions(+), 151 deletions(-)
 delete mode 100644 .idea/misc.xml
 rename bot/src/main/resources/translations/soundboard/{strings_en_GB.properties => strings.properties} (70%)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 6d096c70..cd08aae6 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -17,7 +17,6 @@
         </compositeConfiguration>
         <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index e2044b03836f8527bff4357aa37c1e73a1a760d6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1471
XcmZQz7zLvtFd71*Aut*OLofsY1-}3R

diff --git a/app/desktop/uwp_helper/Cargo.lock b/app/desktop/uwp_helper/Cargo.lock
index 47fc9d58..f138486f 100644
--- a/app/desktop/uwp_helper/Cargo.lock
+++ b/app/desktop/uwp_helper/Cargo.lock
@@ -92,9 +92,9 @@ checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "hashbrown"
-version = "0.15.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3"
 
 [[package]]
 name = "heck"
@@ -198,9 +198,9 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustix"
-version = "0.38.37"
+version = "0.38.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
+checksum = "375116bee2be9ed569afe2154ea6a99dfdffd257f533f187498c2a8f5feaf4ee"
 dependencies = [
  "bitflags",
  "errno",
@@ -217,18 +217,18 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
 [[package]]
 name = "serde"
-version = "1.0.213"
+version = "1.0.214"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ea7893ff5e2466df8d720bb615088341b295f849602c6956047f8f80f0e9bc1"
+checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.213"
+version = "1.0.214"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e85ad2009c50b58e87caa8cd6dac16bdf511bbfb7af6c33df902396aa480fa5"
+checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -258,9 +258,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.85"
+version = "2.0.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56"
+checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/app/desktop/uwp_helper/build.gradle.kts b/app/desktop/uwp_helper/build.gradle.kts
index 779cd8a3..2e6f68b5 100644
--- a/app/desktop/uwp_helper/build.gradle.kts
+++ b/app/desktop/uwp_helper/build.gradle.kts
@@ -59,6 +59,9 @@ tasks {
 
     compileJava {
         dependsOn(generateBindingsWithJextract)
-        options.compilerArgs.add("--enable-preview")
     }
 }
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_22
+}
diff --git a/app/shared/build.gradle.kts b/app/shared/build.gradle.kts
index 700a49ac..4a882724 100644
--- a/app/shared/build.gradle.kts
+++ b/app/shared/build.gradle.kts
@@ -1,6 +1,5 @@
 import dev.schlaubi.tonbrett.gradle.androidSdk
 import dev.schlaubi.tonbrett.gradle.apiUrl
-import org.gradle.configurationcache.extensions.capitalized
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 
 plugins {
@@ -11,9 +10,6 @@ plugins {
     alias(libs.plugins.ksp)
 }
 
-// TODO: https://github.com/google/ksp/issues/1823
-project.setProperty("ksp.useKSP2", false)
-
 @OptIn(ExperimentalKotlinGradlePluginApi::class)
 kotlin {
     applyDefaultHierarchyTemplate {
diff --git a/bot/build.gradle.kts b/bot/build.gradle.kts
index 73bbaf29..02f04819 100644
--- a/bot/build.gradle.kts
+++ b/bot/build.gradle.kts
@@ -1,6 +1,5 @@
 import dev.schlaubi.mikbot.gradle.mikbot
 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
-import java.util.Locale
 
 plugins {
     alias(libs.plugins.ksp)
@@ -40,13 +39,15 @@ mikbotPlugin {
     pluginId = "tonbrett"
     license = "MIT"
     enableKordexProcessor = true
-}
 
-tasks {
-    generateDefaultTranslationBundle {
-        defaultLocale = Locale.Builder().setLanguage("en").setRegion("US").build()
+    i18n {
+        classPackage = "dev.schlaubi.tonbrett.bot.translations"
+        translationBundle = "soundboard"
+        className = "SoundboardTranslations"
     }
+}
 
+tasks {
     val buildWebApp = register<Copy>("buildWebApp") {
         val webApp = project(":app:web")
         from(webApp.tasks.named("jsBrowserDistribution"))
diff --git a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/Plugin.kt b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/Plugin.kt
index a210fdb1..2b6f8016 100644
--- a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/Plugin.kt
+++ b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/Plugin.kt
@@ -2,17 +2,20 @@
 
 package dev.schlaubi.tonbrett.bot
 
-import com.kotlindiscord.kord.extensions.builders.ExtensibleBotBuilder
-import com.kotlindiscord.kord.extensions.extensions.primaryEntryPointCommand
-import com.kotlindiscord.kord.extensions.modules.unsafe.annotations.UnsafeAPI
+import dev.kordex.core.extensions.primaryEntryPointCommand
 import dev.kord.common.entity.PrimaryEntryPointCommandHandlerType
 import dev.kord.gateway.Intent
+import dev.kordex.core.builders.ExtensionsBuilder
+import dev.kordex.core.i18n.toKey
+import dev.kordex.core.i18n.types.Key
+import dev.kordex.modules.dev.unsafe.annotations.UnsafeAPI
 import dev.schlaubi.mikbot.plugin.api.Plugin
 import dev.schlaubi.mikbot.plugin.api.PluginContext
 import dev.schlaubi.mikbot.plugin.api.PluginMain
 import dev.schlaubi.mikbot.plugin.api.module.SubCommandModule
 import dev.schlaubi.tonbrett.bot.commands.*
 import dev.schlaubi.tonbrett.bot.core.VoiceStateWatcher
+import dev.schlaubi.tonbrett.bot.translations.SoundboardTranslations
 import dev.schlaubi.tonbrett.common.TonbrettSerializersModule
 import org.litote.kmongo.serialization.registerModule
 
@@ -22,7 +25,7 @@ class Plugin(context: PluginContext) : Plugin(context) {
         registerModule(TonbrettSerializersModule)
     }
 
-    override fun ExtensibleBotBuilder.ExtensionsBuilder.addExtensions() {
+    override fun ExtensionsBuilder.addExtensions() {
         add(::Module)
         add(::VoiceStateWatcher)
     }
@@ -30,8 +33,7 @@ class Plugin(context: PluginContext) : Plugin(context) {
 
 private class Module(context: PluginContext) : SubCommandModule(context) {
     override val name: String = "tonbrett"
-    override val bundle: String = "soundboard"
-    override val commandName: String = "sound"
+    override val commandName: Key = SoundboardTranslations.Commands.Sound.name
     override suspend fun overrideSetup() {
         intents.add(Intent.GuildVoiceStates)
         addCommand()
@@ -41,8 +43,8 @@ private class Module(context: PluginContext) : SubCommandModule(context) {
         playCommand()
 
         primaryEntryPointCommand {
-            name = "Tonbrett"
-            description = "commands.entry_point.description"
+            name = "Tonbrett".toKey()
+            description = SoundboardTranslations.Commands.EntryPoint.description
 
             handler = PrimaryEntryPointCommandHandlerType.DiscordLaunchActivity
         }
diff --git a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/command/EmojiConverter.kt b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/command/EmojiConverter.kt
index 3bcf0e2d..91677f9c 100644
--- a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/command/EmojiConverter.kt
+++ b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/command/EmojiConverter.kt
@@ -1,24 +1,25 @@
 package dev.schlaubi.tonbrett.bot.command
 
-import com.kotlindiscord.kord.extensions.annotations.UnexpectedFunctionBehaviour
-import com.kotlindiscord.kord.extensions.commands.Arguments
-import com.kotlindiscord.kord.extensions.commands.CommandContext
-import com.kotlindiscord.kord.extensions.commands.converters.Converter
-import com.kotlindiscord.kord.extensions.commands.converters.ConverterToOptional
-import com.kotlindiscord.kord.extensions.commands.converters.OptionalCoalescingConverter
-import com.kotlindiscord.kord.extensions.commands.converters.builders.ConverterBuilder
-import com.kotlindiscord.kord.extensions.commands.converters.builders.OptionalCoalescingConverterBuilder
-import com.kotlindiscord.kord.extensions.commands.converters.impl.emoji
-import com.kotlindiscord.kord.extensions.commands.converters.impl.string
-import com.kotlindiscord.kord.extensions.modules.unsafe.annotations.UnsafeAPI
-import com.kotlindiscord.kord.extensions.modules.unsafe.converters.union
 import dev.kord.core.entity.GuildEmoji
 import dev.kord.core.entity.StandardEmoji
 import dev.kord.x.emoji.Emojis
+import dev.kordex.core.annotations.UnexpectedFunctionBehaviour
+import dev.kordex.core.commands.Arguments
+import dev.kordex.core.commands.converters.Converter
+import dev.kordex.core.commands.converters.ConverterToOptional
+import dev.kordex.core.commands.converters.OptionalCoalescingConverter
+import dev.kordex.core.commands.converters.builders.ConverterBuilder
+import dev.kordex.core.commands.converters.builders.OptionalCoalescingConverterBuilder
+import dev.kordex.core.commands.converters.impl.emoji
+import dev.kordex.core.commands.converters.impl.string
+import dev.kordex.core.i18n.types.Key
+import dev.kordex.modules.dev.unsafe.annotations.UnsafeAPI
+import dev.kordex.modules.dev.unsafe.converters.union
+import dev.schlaubi.tonbrett.bot.translations.SoundboardTranslations
 import dev.schlaubi.tonbrett.common.Sound
 
 @OptIn(UnsafeAPI::class, ConverterToOptional::class, UnexpectedFunctionBehaviour::class)
-fun Arguments.emoji(name: String, description: String): OptionalCoalescingConverter<Any> {
+fun Arguments.emoji(name: Key, description: Key): OptionalCoalescingConverter<Any> {
     fun ConverterBuilder<*>.applyName() {
         this.name = name
         this.description = description
@@ -31,7 +32,7 @@ fun Arguments.emoji(name: String, description: String): OptionalCoalescingConver
 
         validate {
             if (Emojis[value] == null) {
-                fail(translate("arguments.emoji.invalid"))
+                fail(SoundboardTranslations.Arguments.Emoji.invalid)
             }
         }
     }
@@ -41,7 +42,6 @@ fun Arguments.emoji(name: String, description: String): OptionalCoalescingConver
     return arg(name, description, brokenConverter.toOptional().withBuilder(DummyBuilder))
 }
 
-context(CommandContext)
 fun Any.toEmoji(): Sound.Emoji = when (this) {
     is String -> Sound.DiscordEmoji(this)
     is GuildEmoji -> Sound.GuildEmoji(id, isAnimated)
diff --git a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/command/SoundConverter.kt b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/command/SoundConverter.kt
index 5ffb9f78..84131c54 100644
--- a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/command/SoundConverter.kt
+++ b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/command/SoundConverter.kt
@@ -1,23 +1,27 @@
 package dev.schlaubi.tonbrett.bot.command
 
-import com.kotlindiscord.kord.extensions.DiscordRelayedException
-import com.kotlindiscord.kord.extensions.commands.Argument
-import com.kotlindiscord.kord.extensions.commands.CommandContext
-import com.kotlindiscord.kord.extensions.commands.converters.SingleConverter
-import com.kotlindiscord.kord.extensions.commands.converters.Validator
-import com.kotlindiscord.kord.extensions.commands.converters.builders.ConverterBuilder
-import com.kotlindiscord.kord.extensions.modules.annotations.converters.Converter
-import com.kotlindiscord.kord.extensions.modules.annotations.converters.ConverterType
-import com.kotlindiscord.kord.extensions.parser.StringParser
 import dev.kord.core.behavior.interaction.suggestString
 import dev.kord.core.entity.interaction.AutoCompleteInteraction
 import dev.kord.core.entity.interaction.OptionValue
 import dev.kord.core.entity.interaction.StringOptionValue
-import dev.kord.rest.builder.interaction.OptionsBuilder
 import dev.kord.rest.builder.interaction.StringChoiceBuilder
+import dev.kordex.core.DiscordRelayedException
+import dev.kordex.core.annotations.InternalAPI
+import dev.kordex.core.annotations.converters.Converter
+import dev.kordex.core.annotations.converters.ConverterType
+import dev.kordex.core.commands.Argument
+import dev.kordex.core.commands.CommandContext
+import dev.kordex.core.commands.OptionWrapper
+import dev.kordex.core.commands.converters.SingleConverter
+import dev.kordex.core.commands.converters.Validator
+import dev.kordex.core.commands.converters.builders.ConverterBuilder
+import dev.kordex.core.i18n.EMPTY_KEY
+import dev.kordex.core.i18n.types.Key
+import dev.kordex.parser.StringParser
 import dev.schlaubi.mikbot.plugin.api.util.safeInput
 import dev.schlaubi.tonbrett.bot.io.SoundBoardDatabase
 import dev.schlaubi.tonbrett.bot.io.search
+import dev.schlaubi.tonbrett.bot.translations.SoundboardTranslations
 import dev.schlaubi.tonbrett.common.Sound
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.take
@@ -32,7 +36,7 @@ private const val idPrefix = "id:"
     types = [ConverterType.SINGLE]
 )
 class SoundConverter(validator: Validator<Sound>) : SingleConverter<Sound>(validator) {
-    override val signatureTypeString: String = "Sound"
+    override val signatureType: Key = EMPTY_KEY
     override fun withBuilder(builder: ConverterBuilder<Sound>): SingleConverter<Sound> {
         val builderWithAutoComplete = builder.apply {
             autoComplete { onAutoComplete() }
@@ -69,7 +73,11 @@ class SoundConverter(validator: Validator<Sound>) : SingleConverter<Sound>(valid
                 parsed = foundByName
             } else {
                 handleError(
-                    DiscordRelayedException(context.translate("commands.generic.not_found", arrayOf(text))),
+                    DiscordRelayedException(
+                        SoundboardTranslations.Commands.Generic.notFound.withOrdinalPlaceholders(
+                            text
+                        )
+                    ),
                     context
                 )
             }
@@ -78,8 +86,9 @@ class SoundConverter(validator: Validator<Sound>) : SingleConverter<Sound>(valid
         return true
     }
 
-    override suspend fun toSlashOption(arg: Argument<*>): OptionsBuilder =
-        StringChoiceBuilder(arg.displayName, arg.description).apply { required = true }
+    @OptIn(InternalAPI::class)
+    override suspend fun toSlashOption(arg: Argument<*>): OptionWrapper<*> =
+        OptionWrapper(arg.displayName, arg.description, { required = true }, StringChoiceBuilder::class)
 
     private suspend fun AutoCompleteInteraction.onAutoComplete() {
         val input = focusedOption.safeInput
diff --git a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/command/TagConverter.kt b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/command/TagConverter.kt
index a76102cd..8a571947 100644
--- a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/command/TagConverter.kt
+++ b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/command/TagConverter.kt
@@ -1,15 +1,16 @@
 package dev.schlaubi.tonbrett.bot.command
 
-import com.kotlindiscord.kord.extensions.commands.Arguments
-import com.kotlindiscord.kord.extensions.commands.converters.impl.optionalString
 import dev.kord.core.behavior.interaction.suggestString
+import dev.kordex.core.commands.Arguments
+import dev.kordex.core.commands.converters.impl.optionalString
+import dev.kordex.core.i18n.types.Key
 import dev.schlaubi.mikbot.plugin.api.util.safeInput
 import dev.schlaubi.tonbrett.bot.io.SoundBoardDatabase
 import dev.schlaubi.tonbrett.bot.io.findAllTags
 import kotlinx.coroutines.flow.take
 import kotlinx.coroutines.flow.toList
 
-fun Arguments.tagArgument(name: String, description: String) = optionalString {
+fun Arguments.tagArgument(name: Key, description: Key) = optionalString {
     this.name = name
     this.description = description
 
diff --git a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/commands/AddCommand.kt b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/commands/AddCommand.kt
index bdae3b40..c9a99e1d 100644
--- a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/commands/AddCommand.kt
+++ b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/commands/AddCommand.kt
@@ -1,18 +1,20 @@
 package dev.schlaubi.tonbrett.bot.commands
 
-import com.kotlindiscord.kord.extensions.commands.Arguments
-import com.kotlindiscord.kord.extensions.commands.converters.impl.*
+import dev.kordex.core.commands.Arguments
+import dev.kordex.core.commands.converters.impl.*
 import dev.arbjerg.lavalink.protocol.v4.LoadResult
 import dev.schlaubi.lavakord.rest.loadItem
 import dev.schlaubi.mikbot.plugin.api.module.SubCommandModule
 import dev.schlaubi.mikbot.plugin.api.util.kord
 import dev.schlaubi.mikbot.plugin.api.util.safeGuild
+import dev.schlaubi.mikbot.plugin.api.util.translate
 import dev.schlaubi.tonbrett.bot.command.emoji
 import dev.schlaubi.tonbrett.bot.command.tagArgument
 import dev.schlaubi.tonbrett.bot.command.toEmoji
 import dev.schlaubi.tonbrett.bot.config.Config
 import dev.schlaubi.tonbrett.bot.io.SoundBoardDatabase
 import dev.schlaubi.tonbrett.bot.server.broadcastEvent
+import dev.schlaubi.tonbrett.bot.translations.SoundboardTranslations
 import dev.schlaubi.tonbrett.bot.util.player
 import dev.schlaubi.tonbrett.common.Sound
 import dev.schlaubi.tonbrett.common.SoundCreatedEvent
@@ -30,42 +32,42 @@ import kotlin.time.toDuration
 
 class AddSoundCommandArguments : Arguments() {
     val sound by attachment {
-        name = "attachment"
-        description = "commands.add_sound.arguments.attachment.description"
+        name = SoundboardTranslations.Commands.AddSound.Arguments.Attachment.name
+        description = SoundboardTranslations.Commands.AddSound.Arguments.Attachment.description
     }
 
     val name by string {
-        name = "name"
-        description = "commands.add_sound.arguments.name.description"
+        name = SoundboardTranslations.Commands.AddSound.Arguments.Name.name
+        description = SoundboardTranslations.Commands.AddSound.Arguments.Name.description
         maxLength = NAME_MAX_LENGTH
     }
 
     val description by optionalString {
-        name = "description"
-        description = "commands.add_sound.arguments.description.description"
+        name = SoundboardTranslations.Commands.AddSound.Arguments.Description.name
+        description = SoundboardTranslations.Commands.AddSound.Arguments.Description.description
     }
 
-    val emoji by emoji("emoji", "commands.add_sound.arguments.emoji.description")
+    val emoji by emoji(SoundboardTranslations.Commands.AddSound.Arguments.Emoji.name, SoundboardTranslations.Commands.AddSound.Arguments.Emoji.description)
 
-    val tag by tagArgument("tag", "commands.add_sound.arguments.tag.description")
+    val tag by tagArgument(SoundboardTranslations.Commands.AddSound.Arguments.Tag.name, SoundboardTranslations.Commands.AddSound.Arguments.Tag.description)
 
     val public by defaultingBoolean {
-        name = "public"
-        description = "commands.add_sound.arguments.public.description"
+        name = SoundboardTranslations.Commands.AddSound.Arguments.Public.name
+        description = SoundboardTranslations.Commands.AddSound.Arguments.Public.description
         defaultValue = true
     }
 
     val volume by optionalInt {
-        name = "volume"
-        description = "commands.add_sound.arguments.volume.description"
+        name = SoundboardTranslations.Commands.AddSound.Arguments.Volume.name
+        description = SoundboardTranslations.Commands.AddSound.Arguments.Volume.description
         minValue = 0
         maxValue = 1000
     }
 }
 
 fun SubCommandModule.addCommand() = ephemeralSubCommand(::AddSoundCommandArguments) {
-    name = "add"
-    description = "commands.add_sound.description"
+    name = SoundboardTranslations.Commands.AddSound.name
+    description = SoundboardTranslations.Commands.AddSound.description
 
     action {
         val found = SoundBoardDatabase.sounds.countDocuments(
@@ -74,7 +76,7 @@ fun SubCommandModule.addCommand() = ephemeralSubCommand(::AddSoundCommandArgumen
 
         if (found >= 1) {
             respond {
-                content = translate("commands.add_sound.taken")
+                content = translate(SoundboardTranslations.Commands.AddSound.taken)
             }
             return@action
         }
@@ -86,20 +88,20 @@ fun SubCommandModule.addCommand() = ephemeralSubCommand(::AddSoundCommandArgumen
         if (audioInfo !is LoadResult.TrackLoaded) {
             respond {
                 val message = (audioInfo as? LoadResult.LoadFailed)?.data?.message
-                content = translate("commands.add_sound.invalid_file", arrayOf(message))
+                content = translate(SoundboardTranslations.Commands.AddSound.invalidFile, message)
             }
             return@action
         }
         if (audioInfo.data.info.length.toDuration(DurationUnit.MILLISECONDS) > Config.MAX_SOUND_LENGTH) {
             respond {
-                content = translate("commands.add_sound.too_long", arrayOf(Config.MAX_SOUND_LENGTH))
+                content = translate(SoundboardTranslations.Commands.AddSound.tooLong, Config.MAX_SOUND_LENGTH)
             }
             return@action
         }
         val cdnResponse = kord.resources.httpClient.get(arguments.sound.proxyUrl)
         if (!cdnResponse.status.isSuccess()) {
             respond {
-                content = translate("commands.add_sound.invalid_cdn_response", arrayOf(cdnResponse.status))
+                content = translate(SoundboardTranslations.Commands.AddSound.invalidCdnResponse, cdnResponse.status)
             }
             return@action
         }
@@ -119,7 +121,7 @@ fun SubCommandModule.addCommand() = ephemeralSubCommand(::AddSoundCommandArgumen
         SoundBoardDatabase.sounds.save(sound)
 
         respond {
-            content = translate("commands.add_sound.success")
+            content = translate(SoundboardTranslations.Commands.AddSound.success)
         }
 
         broadcastEvent(SoundCreatedEvent(sound.convertForNonJvmPlatforms()))
diff --git a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/commands/JoinCommand.kt b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/commands/JoinCommand.kt
index 136d65ad..a2e854ea 100644
--- a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/commands/JoinCommand.kt
+++ b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/commands/JoinCommand.kt
@@ -1,12 +1,14 @@
 package dev.schlaubi.tonbrett.bot.commands
 
-import com.kotlindiscord.kord.extensions.extensions.ephemeralSlashCommand
+import dev.kordex.core.extensions.ephemeralSlashCommand
 import dev.schlaubi.mikbot.plugin.api.module.SubCommandModule
+import dev.schlaubi.mikbot.plugin.api.util.translate
 import dev.schlaubi.mikmusic.checks.joinSameChannelCheck
+import dev.schlaubi.tonbrett.bot.translations.SoundboardTranslations
 
 suspend fun SubCommandModule.joinCommand() = ephemeralSlashCommand {
-    name = "join"
-    description = "commands.join.description"
+    name = SoundboardTranslations.Commands.Join.name
+    description = SoundboardTranslations.Commands.Join.description
 
     check {
         joinSameChannelCheck(bot)
@@ -14,7 +16,7 @@ suspend fun SubCommandModule.joinCommand() = ephemeralSlashCommand {
 
     action {
         respond {
-            content = translate("commands.join.success")
+            content = translate(SoundboardTranslations.Commands.Join.success)
         }
     }
 }
diff --git a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/commands/PlayCommand.kt b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/commands/PlayCommand.kt
index 2839444e..d59779c5 100644
--- a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/commands/PlayCommand.kt
+++ b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/commands/PlayCommand.kt
@@ -1,12 +1,13 @@
 package dev.schlaubi.tonbrett.bot.commands
 
-import com.kotlindiscord.kord.extensions.modules.unsafe.annotations.UnsafeAPI
+import dev.kordex.modules.dev.unsafe.annotations.UnsafeAPI
 import dev.schlaubi.mikbot.plugin.api.module.SubCommandModule
+import dev.schlaubi.tonbrett.bot.translations.SoundboardTranslations
 
 @OptIn(UnsafeAPI::class)
-fun SubCommandModule.playCommand() = unsafeSubCommand("play") {
-    name = "play"
-    description = "commands.play.description"
+fun SubCommandModule.playCommand() = unsafeSubCommand {
+    name = SoundboardTranslations.Commands.Play.name
+    description = SoundboardTranslations.Commands.Play.description
 
     action {
         event.interaction.openActivity()
diff --git a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/commands/RemoveSoundCommand.kt b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/commands/RemoveSoundCommand.kt
index 605016ef..bfc96b01 100644
--- a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/commands/RemoveSoundCommand.kt
+++ b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/commands/RemoveSoundCommand.kt
@@ -1,28 +1,30 @@
  package dev.schlaubi.tonbrett.bot.commands
 
-import com.kotlindiscord.kord.extensions.commands.Arguments
+import dev.kordex.core.commands.Arguments
 import dev.schlaubi.mikbot.plugin.api.module.SubCommandModule
+import dev.schlaubi.mikbot.plugin.api.util.translate
 import dev.schlaubi.tonbrett.bot.command.sound
 import dev.schlaubi.tonbrett.bot.io.SoundBoardDatabase
 import dev.schlaubi.tonbrett.bot.server.broadcastEvent
+import dev.schlaubi.tonbrett.bot.translations.SoundboardTranslations
 import dev.schlaubi.tonbrett.common.SoundDeletedEvent
 
  class RemoveSoundArguments : Arguments() {
     val sound by sound {
-        name = "sound"
-        description = "commands.remove_sound.arguments.sound.description"
+        name = SoundboardTranslations.Commands.RemoveSound.Arguments.Sound.name
+        description = SoundboardTranslations.Commands.RemoveSound.Arguments.Sound.description
     }
 }
 
 fun SubCommandModule.removeCommand() = ephemeralSubCommand(::RemoveSoundArguments) {
-    name = "remove"
-    description = "commands.remove.description"
+    name = SoundboardTranslations.Commands.Remove.name
+    description = SoundboardTranslations.Commands.Remove.description
 
     action {
         SoundBoardDatabase.sounds.deleteOneById(arguments.sound.id)
 
         respond {
-            content = translate("commands.remove_sound.success")
+            content = translate(SoundboardTranslations.Commands.RemoveSound.success)
         }
 
         broadcastEvent(SoundDeletedEvent(arguments.sound.id))
diff --git a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/commands/UpdateCommand.kt b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/commands/UpdateCommand.kt
index 6a0cd131..548b7798 100644
--- a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/commands/UpdateCommand.kt
+++ b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/commands/UpdateCommand.kt
@@ -1,17 +1,19 @@
 package dev.schlaubi.tonbrett.bot.commands
 
-import com.kotlindiscord.kord.extensions.commands.Arguments
-import com.kotlindiscord.kord.extensions.commands.converters.impl.optionalBoolean
-import com.kotlindiscord.kord.extensions.commands.converters.impl.optionalInt
-import com.kotlindiscord.kord.extensions.commands.converters.impl.optionalString
+import dev.kordex.core.commands.Arguments
+import dev.kordex.core.commands.converters.impl.optionalBoolean
+import dev.kordex.core.commands.converters.impl.optionalInt
+import dev.kordex.core.commands.converters.impl.optionalString
 import dev.schlaubi.mikbot.plugin.api.module.SubCommandModule
 import dev.schlaubi.mikbot.plugin.api.util.discordError
+import dev.schlaubi.mikbot.plugin.api.util.translate
 import dev.schlaubi.tonbrett.bot.command.emoji
 import dev.schlaubi.tonbrett.bot.command.sound
 import dev.schlaubi.tonbrett.bot.command.tagArgument
 import dev.schlaubi.tonbrett.bot.command.toEmoji
 import dev.schlaubi.tonbrett.bot.io.SoundBoardDatabase
 import dev.schlaubi.tonbrett.bot.server.broadcastEvent
+import dev.schlaubi.tonbrett.bot.translations.SoundboardTranslations
 import dev.schlaubi.tonbrett.common.Sound
 import dev.schlaubi.tonbrett.common.SoundUpdatedEvent
 import dev.schlaubi.tonbrett.common.util.convertForNonJvmPlatforms
@@ -20,41 +22,41 @@ import org.litote.kmongo.eq
 
 class UpdateSoundArguments : Arguments() {
     val sound by sound {
-        name = "sound"
-        description = "commands.update_sound.arguments.sound.description"
+        name = SoundboardTranslations.Commands.UpdateSound.Arguments.Sound.name
+        description = SoundboardTranslations.Commands.UpdateSound.Arguments.Sound.description
     }
 
     val name by optionalString {
-        name = "name"
-        description = "commands.update_sound.arguments.name.description"
+        name = SoundboardTranslations.Commands.UpdateSound.Arguments.Name.name
+        description = SoundboardTranslations.Commands.UpdateSound.Arguments.Name.description
         maxLength = NAME_MAX_LENGTH
     }
 
     val description by optionalString {
-        name = "description"
-        description = "commands.update_sound.arguments.description.description"
+        name = SoundboardTranslations.Commands.UpdateSound.Arguments.Description.name
+        description = SoundboardTranslations.Commands.UpdateSound.Arguments.Description.description
     }
 
-    val emoji by emoji("emoji", "commands.update_sound.arguments.emoji.description")
+    val emoji by emoji(SoundboardTranslations.Commands.UpdateSound.Arguments.Emoji.name, SoundboardTranslations.Commands.UpdateSound.Arguments.Emoji.description)
 
-    val tag by tagArgument("tag", "commands.update_sound.arguments.tag.description")
+    val tag by tagArgument(SoundboardTranslations.Commands.UpdateSound.Arguments.Tag.name, SoundboardTranslations.Commands.UpdateSound.Arguments.Tag.description)
 
     val public by optionalBoolean {
-        name = "public"
-        description = "commands.update_sound.arguments.public.description"
+        name = SoundboardTranslations.Commands.UpdateSound.Arguments.Public.name
+        description = SoundboardTranslations.Commands.UpdateSound.Arguments.Public.description
     }
 
     val volume by optionalInt {
-        name = "volume"
-        description = "commands.update_sound.arguments.volume.description"
+        name = SoundboardTranslations.Commands.UpdateSound.Arguments.Volume.name
+        description = SoundboardTranslations.Commands.UpdateSound.Arguments.Volume.description
         minValue = 0
         maxValue = 1000
     }
 }
 
 fun SubCommandModule.updateCommand() = ephemeralSubCommand(::UpdateSoundArguments) {
-    name = "update"
-    description = "commands.update_sound.description"
+    name = SoundboardTranslations.Commands.UpdateSound.name
+    description = SoundboardTranslations.Commands.UpdateSound.description
 
     action {
         if (arguments.name != null) {
@@ -66,7 +68,7 @@ fun SubCommandModule.updateCommand() = ephemeralSubCommand(::UpdateSoundArgument
             )
 
             if (foundByName != null) {
-                discordError(translate("commands.update_sound.name_in_use", arrayOf(arguments.name)))
+                discordError(SoundboardTranslations.Commands.UpdateSound.nameInUse.withOrdinalPlaceholders(arguments.name))
             }
         }
 
@@ -82,7 +84,7 @@ fun SubCommandModule.updateCommand() = ephemeralSubCommand(::UpdateSoundArgument
 
         SoundBoardDatabase.sounds.save(newSound)
         respond {
-            content = translate("commands.update_sound.success")
+            content = translate(SoundboardTranslations.Commands.UpdateSound.success)
         }
 
         broadcastEvent(SoundUpdatedEvent(newSound.convertForNonJvmPlatforms()))
diff --git a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/core/VoiceStateWatcher.kt b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/core/VoiceStateWatcher.kt
index 2d54f53d..342dc2e9 100644
--- a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/core/VoiceStateWatcher.kt
+++ b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/core/VoiceStateWatcher.kt
@@ -1,15 +1,14 @@
 package dev.schlaubi.tonbrett.bot.core
 
-import com.kotlindiscord.kord.extensions.extensions.Extension
-import com.kotlindiscord.kord.extensions.extensions.event
-import com.kotlindiscord.kord.extensions.koin.KordExContext
 import dev.kord.cache.api.query
 import dev.kord.common.annotation.KordExperimental
 import dev.kord.common.annotation.KordUnsafe
-import dev.kord.common.entity.DiscordUser
 import dev.kord.core.Kord
 import dev.kord.core.cache.data.VoiceStateData
 import dev.kord.core.event.user.VoiceStateUpdateEvent
+import dev.kordex.core.extensions.Extension
+import dev.kordex.core.extensions.event
+import dev.kordex.core.koin.KordExContext
 import dev.schlaubi.tonbrett.bot.server.sendEvent
 import dev.schlaubi.tonbrett.common.Snowflake
 import dev.schlaubi.tonbrett.common.User
diff --git a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/io/SoundBoardDatabase.kt b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/io/SoundBoardDatabase.kt
index 6a528ece..f659fcd4 100644
--- a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/io/SoundBoardDatabase.kt
+++ b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/io/SoundBoardDatabase.kt
@@ -1,6 +1,6 @@
 package dev.schlaubi.tonbrett.bot.io
 
-import com.kotlindiscord.kord.extensions.koin.KordExKoinComponent
+import dev.kordex.core.koin.KordExKoinComponent
 import com.mongodb.client.model.Collation
 import dev.schlaubi.mikbot.plugin.api.io.getCollection
 import dev.schlaubi.mikbot.plugin.api.util.database
diff --git a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/server/FileServer.kt b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/server/FileServer.kt
index d3f00b44..2a3a7afe 100644
--- a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/server/FileServer.kt
+++ b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/server/FileServer.kt
@@ -7,7 +7,6 @@ import dev.schlaubi.tonbrett.bot.util.soundNotFound
 import dev.schlaubi.tonbrett.common.Route.Sounds
 import io.ktor.client.content.*
 import io.ktor.http.*
-import io.ktor.server.application.*
 import io.ktor.server.resources.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
diff --git a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/server/Ktor.kt b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/server/Ktor.kt
index 93a38331..d7da87c3 100644
--- a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/server/Ktor.kt
+++ b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/server/Ktor.kt
@@ -1,6 +1,6 @@
 package dev.schlaubi.tonbrett.bot.server
 
-import com.kotlindiscord.kord.extensions.koin.KordExKoinComponent
+import dev.kordex.core.koin.KordExKoinComponent
 import dev.schlaubi.mikbot.plugin.api.config.Environment
 import dev.schlaubi.mikbot.util_plugins.ktor.api.KtorExtensionPoint
 import dev.schlaubi.tonbrett.common.Route
@@ -21,7 +21,6 @@ import kotlinx.serialization.modules.SerializersModule
 import org.litote.kmongo.id.serialization.IdKotlinXSerializationModule
 import org.pf4j.Extension
 import kotlin.time.Duration.Companion.seconds
-import kotlin.time.toJavaDuration
 import dev.schlaubi.mikbot.plugin.api.config.Config as BotConfig
 
 @Extension
diff --git a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/server/SoundsRoute.kt b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/server/SoundsRoute.kt
index 6a39c427..50e24917 100644
--- a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/server/SoundsRoute.kt
+++ b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/server/SoundsRoute.kt
@@ -1,9 +1,9 @@
 package dev.schlaubi.tonbrett.bot.server
 
-import com.kotlindiscord.kord.extensions.koin.KordExContext
 import dev.kord.common.annotation.KordExperimental
 import dev.kord.common.annotation.KordUnsafe
 import dev.kord.core.Kord
+import dev.kordex.core.koin.KordExContext
 import dev.schlaubi.lavakord.kord.connectAudio
 import dev.schlaubi.tonbrett.bot.core.soundPlayer
 import dev.schlaubi.tonbrett.bot.core.voiceState
@@ -17,7 +17,6 @@ import dev.schlaubi.tonbrett.bot.util.translate
 import dev.schlaubi.tonbrett.common.Route.*
 import dev.schlaubi.tonbrett.common.util.convertForNonJvmPlatforms
 import io.ktor.http.*
-import io.ktor.server.application.*
 import io.ktor.server.resources.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.Route
@@ -27,7 +26,7 @@ import kotlin.time.Duration.Companion.milliseconds
 
 @OptIn(KordUnsafe::class, KordExperimental::class)
 fun Route.sounds() {
-    val kord by KordExContext.get().inject<Kord>()
+    val kord by lazy { KordExContext.get().get<Kord>() }
 
     post<StopPlayer> {
         val guild = call.userId.voiceState?.guildId ?: badRequest("Not connected to voice channel")
diff --git a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/server/Ui.kt b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/server/Ui.kt
index 175a1e1c..d082b8af 100644
--- a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/server/Ui.kt
+++ b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/server/Ui.kt
@@ -2,14 +2,11 @@ package dev.schlaubi.tonbrett.bot.server
 
 import dev.schlaubi.tonbrett.common.Route.AuthDeepLink
 import dev.schlaubi.tonbrett.common.Route.Ui
-import io.ktor.events.Events
-import io.ktor.http.HttpHeaders
+import io.ktor.events.*
 import io.ktor.server.application.*
-import io.ktor.server.application.Application
 import io.ktor.server.engine.*
 import io.ktor.server.http.content.*
 import io.ktor.server.resources.*
-import io.ktor.server.response.header
 import io.ktor.server.routing.*
 import kotlin.reflect.jvm.javaField
 
@@ -31,14 +28,14 @@ fun Route.ui() {
 
 
 private fun ApplicationCall.fixClassLoader() {
-    @Suppress("INVISIBLE_REFERENCE")
+    @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
     val fixedApplication = Application(
         HackedEnvironment(application.environment),
         false,
         "/",
         Events(),
-        coroutineContext,
-        { error("Unsupported") })
+        coroutineContext
+    ) { error("Unsupported") }
     val call = (this as RoutingPipelineCall).engineCall
     BaseApplicationCall::application.javaField!!.apply {
         isAccessible = true
diff --git a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/server/UserRoute.kt b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/server/UserRoute.kt
index 4dee3a88..dac034a1 100644
--- a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/server/UserRoute.kt
+++ b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/server/UserRoute.kt
@@ -3,7 +3,6 @@ package dev.schlaubi.tonbrett.bot.server
 import dev.schlaubi.tonbrett.bot.core.voiceState
 import dev.schlaubi.tonbrett.common.Route.Me
 import dev.schlaubi.tonbrett.common.User
-import io.ktor.server.application.*
 import io.ktor.server.resources.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
@@ -13,9 +12,6 @@ fun Route.users() {
         val user = call.userId
         val voiceState = user.voiceState
 
-        call.respond(User(
-            user,
-            voiceState
-        ))
+        call.respond(User(user, voiceState))
     }
 }
diff --git a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/util/LavalinkUtil.kt b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/util/LavalinkUtil.kt
index a4a44dd2..701d3b37 100644
--- a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/util/LavalinkUtil.kt
+++ b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/util/LavalinkUtil.kt
@@ -1,7 +1,7 @@
 package dev.schlaubi.tonbrett.bot.util
 
-import com.kotlindiscord.kord.extensions.ExtensibleBot
-import com.kotlindiscord.kord.extensions.koin.KordExContext
+import dev.kordex.core.ExtensibleBot
+import dev.kordex.core.koin.KordExContext
 import dev.kord.core.behavior.GuildBehavior
 import dev.schlaubi.mikmusic.core.MusicModule
 import dev.schlaubi.mikmusic.player.MusicPlayer
diff --git a/bot/src/main/resources/translations/soundboard/strings_en_GB.properties b/bot/src/main/resources/translations/soundboard/strings.properties
similarity index 70%
rename from bot/src/main/resources/translations/soundboard/strings_en_GB.properties
rename to bot/src/main/resources/translations/soundboard/strings.properties
index 295115ca..624dc48f 100644
--- a/bot/src/main/resources/translations/soundboard/strings_en_GB.properties
+++ b/bot/src/main/resources/translations/soundboard/strings.properties
@@ -1,7 +1,12 @@
+commands.add_sound.name=add_sound
 commands.add_sound.description=Adds a new sound
+commands.add_sound.arguments.attachment.name=attachment
 commands.add_sound.arguments.attachment.description=The audio file you want to add
+commands.add_sound.arguments.name.name=name
 commands.add_sound.arguments.name.description=The name of the sound
+commands.add_sound.arguments.emoji.name=emoji
 commands.add_sound.arguments.emoji.description=An emoji to identify the sound
+commands.add_sound.arguments.description.name=description
 commands.add_sound.arguments.description.description=An optional description
 commands.add_sound.success=Successfully added sound.
 commands.add_sound.invalid_cdn_response=CDN responded with unexpected error code: `{0}`.
@@ -9,27 +14,45 @@ commands.add_sound.invalid_file=Audio file could not be loaded! Error: `{0}`
 commands.add_sound.too_long=Audio file cannot exceed {0}.
 commands.add_sound.taken=You already have a sound with that name.
 commands.generic.not_found=Sound `{0}` does not exist.
+commands.remove.name=remove
 commands.remove.description=Remove a sound
+commands.remove_sound.arguments.sound.name=sound
 commands.remove_sound.arguments.sound.description=The sound to remove
 commands.remove_sound.success=Sound successfully deleted!
 commands.update_sound.success=Sound successfully updated!
 commands.update_sound.name_in_use=You already have a sound with the name `{0}`
+commands.update_sound.name=update_sound
 commands.update_sound.description=Update a sound
+commands.update_sound.arguments.sound.name=sound
 commands.update_sound.arguments.sound.description=The sound to update
+commands.update_sound.arguments.name.name=name
 commands.update_sound.arguments.name.description=The new name for the sound
+commands.update_sound.arguments.description.name=description
 commands.update_sound.arguments.description.description=The new description for the sound
+commands.update_sound.arguments.emoji.name=emoji
 commands.update_sound.arguments.emoji.description=The new emoji for the sound
 commands.join.success=Successfully joined your channel
+commands.join.name=join
 commands.join.description=Joins your current channel
+commands.play.name=play
 commands.play.description=Lets you play sounds
 commands.play=You can play sounds using our web player
 commands.play.button=Player öffnen
 rest.errors.not_connected_to_vc=You are not connected to a voice channel
 rest.errors.vc_mismatch=You are not connected to the same voice channel as the bot
+commands.add_sound.arguments.tag.name=tag
 commands.add_sound.arguments.tag.description=An optional tag for the sound to group simmilar commands together
+commands.update_sound.arguments.tag.name=tag
 commands.update_sound.arguments.tag.description=The new tag of the sound
+commands.update_sound.arguments.public.name=public
 commands.update_sound.arguments.public.description=Whether this command should be public
+commands.add_sound.arguments.public.name=public
 commands.add_sound.arguments.public.description=Whether this command should be public
+commands.add_sound.arguments.volume.name=volume
 commands.add_sound.arguments.volume.description=The volume of the audio
+commands.update_sound.arguments.volume.name=volume
 commands.update_sound.arguments.volume.description=The volume of the audio
+commands.entry_point.name=entry_point
 commands.entry_point.description=Offers sounds to play
+commands.sound.name=sound
+arguments.emoji.invalid=The specified emoji was invalid
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index 49a2f83b..b841d2bf 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 
 allprojects {
     group = "dev.schlaubi.tonbrett"
-    version = "1.22.12"
+    version = "2.0.0"
 
     repositories {
         mavenCentral()
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
index 8b538713..45ec5198 100644
--- a/common/build.gradle.kts
+++ b/common/build.gradle.kts
@@ -21,7 +21,7 @@ kotlin {
             }
         }
 
-        desktopMain {
+        named("jvmMain") {
             dependencies {
                 compileOnly(libs.kmongo.id.serialization)
                 compileOnly(libs.kord.common)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 8892ace3..799f5ad1 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,12 +1,12 @@
 [versions]
 kotlin = "2.0.21"
-ktor = "3.0.0"
+ktor = "3.0.1"
 kmongo = "5.1.0"
 kord = "0.15.0"
-mikbot = "3.37.22"
+mikbot = "4.1.1"
 ksp = "2.0.21-1.0.26"
-kordex = "1.9.12-mikbot-SNAPSHOT"
-android = "8.7.1"
+kordex = "2.3.1-MIKBOT.2"
+android = "8.7.2"
 compose = "1.7.0"
 compose-wear = "1.4.0"
 lyricist = "1.7.0"
@@ -22,7 +22,7 @@ kotlinx-serialization = { group = "org.jetbrains.kotlinx", name = "kotlinx-seria
 kmongo-id-serialization = { group = "org.litote.kmongo", name = "kmongo-id-serialization", version.ref = "kmongo" }
 kmongo-serialization = { group = "org.litote.kmongo", name = "kmongo-serialization", version.ref = "kmongo" }
 kord-common = { group = "dev.kord", name = "kord-common", version.ref = "kord" }
-kordex-processor = { group = "com.kotlindiscord.kord.extensions", name = "annotation-processor", version.ref = "kordex" }
+kordex-processor = { group = "dev.kordex", name = "annotation-processor", version.ref = "kordex" }
 
 kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "coroutines" }
 kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "coroutines" }
@@ -49,20 +49,20 @@ ktor-sse = { group = "io.ktor", name = "ktor-sse", version.ref = "ktor" }
 ktor-serialization-kotlinx-json = { group = "io.ktor", name = "ktor-serialization-kotlinx-json", version.ref = "ktor" }
 
 mikbot-ktor = { group = "dev.schlaubi", name = "mikbot-ktor", version.ref = "mikbot" }
-mikbot-music = { group = "dev.schlaubi", name = "mikbot-music-player", version = "3.12.0-SNAPSHOT" }
+mikbot-music = { group = "dev.schlaubi", name = "mikbot-music-player", version = "4.0.0-SNAPSHOT" }
 
 kotlin-logging = { group = "io.github.oshai", name = "kotlin-logging", version = "7.0.0" }
 
 lyricist = { group = "cafe.adriel.lyricist", name = "lyricist", version.ref = "lyricist" }
 lyricist-processor = { group = "cafe.adriel.lyricist", name = "lyricist-processor", version.ref = "lyricist" }
 
-logback = { group = "ch.qos.logback", name = "logback-classic", version = "1.5.11" }
+logback = { group = "ch.qos.logback", name = "logback-classic", version = "1.5.12" }
 
 kvault = { group = "com.liftric", name = "kvault", version = "1.12.0" }
 
 androidx-activity = { group = "androidx.activity", name = "activity-compose", version = "1.9.3" }
 androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version = "1.7.0" }
-androidx-core = { group = "androidx.core", name = "core-ktx", version = "1.15.0-rc01" }
+androidx-core = { group = "androidx.core", name = "core-ktx", version = "1.15.0" }
 androidx-browser = { group = "androidx.browser", name = "browser", version = "1.8.0" }
 mdc-android = { group = "com.google.android.material", name = "material", version = "1.12.0" }
 google-play = { group = "com.google.android.play", name = "app-update", version.ref = "google-play" }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index f00d4b93..aa82a7e1 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -4,6 +4,7 @@ pluginManagement {
         maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
         google()
         maven("https://maven.pkg.jetbrains.space/kotlin/p/wasm/experimental")
+        maven("https://releases-repo.kordex.dev")
     }
 }