diff --git a/common/api/common.api b/common/api/common.api
index 18bc51e9ee3..5cb549c51f8 100644
--- a/common/api/common.api
+++ b/common/api/common.api
@@ -3226,11 +3226,11 @@ public final class dev/kord/common/entity/DiscordChatComponent : dev/kord/common
 	public final fun getDivider ()Ldev/kord/common/entity/optional/OptionalBoolean;
 	public fun getEmoji ()Ldev/kord/common/entity/optional/Optional;
 	public final fun getFile ()Ldev/kord/common/entity/optional/Optional;
-	public final fun getImage ()Ldev/kord/common/entity/optional/Optional;
 	public final fun getItems ()Ldev/kord/common/entity/optional/Optional;
 	public fun getLabel ()Ldev/kord/common/entity/optional/Optional;
 	public fun getMaxLength ()Ldev/kord/common/entity/optional/OptionalInt;
 	public fun getMaxValues ()Ldev/kord/common/entity/optional/OptionalInt;
+	public final fun getMedia ()Ldev/kord/common/entity/optional/Optional;
 	public fun getMinLength ()Ldev/kord/common/entity/optional/OptionalInt;
 	public fun getMinValues ()Ldev/kord/common/entity/optional/OptionalInt;
 	public fun getOptions ()Ldev/kord/common/entity/optional/Optional;
diff --git a/common/api/common.klib.api b/common/api/common.klib.api
index 6f6e8e3d3c7..499edd1fdcc 100644
--- a/common/api/common.klib.api
+++ b/common/api/common.klib.api
@@ -1730,8 +1730,6 @@ final class dev.kord.common.entity/DiscordChatComponent : dev.kord.common.entity
         final fun <get-emoji>(): dev.kord.common.entity.optional/Optional<dev.kord.common.entity/DiscordPartialEmoji> // dev.kord.common.entity/DiscordChatComponent.emoji.<get-emoji>|<get-emoji>(){}[0]
     final val file // dev.kord.common.entity/DiscordChatComponent.file|{}file[0]
         final fun <get-file>(): dev.kord.common.entity.optional/Optional<dev.kord.common.entity/UnfurledMediaItem> // dev.kord.common.entity/DiscordChatComponent.file.<get-file>|<get-file>(){}[0]
-    final val image // dev.kord.common.entity/DiscordChatComponent.image|{}image[0]
-        final fun <get-image>(): dev.kord.common.entity.optional/Optional<dev.kord.common.entity/UnfurledMediaItem> // dev.kord.common.entity/DiscordChatComponent.image.<get-image>|<get-image>(){}[0]
     final val items // dev.kord.common.entity/DiscordChatComponent.items|{}items[0]
         final fun <get-items>(): dev.kord.common.entity.optional/Optional<kotlin.collections/List<dev.kord.common.entity/MediaGalleryItem>> // dev.kord.common.entity/DiscordChatComponent.items.<get-items>|<get-items>(){}[0]
     final val label // dev.kord.common.entity/DiscordChatComponent.label|{}label[0]
@@ -1740,6 +1738,8 @@ final class dev.kord.common.entity/DiscordChatComponent : dev.kord.common.entity
         final fun <get-maxLength>(): dev.kord.common.entity.optional/OptionalInt // dev.kord.common.entity/DiscordChatComponent.maxLength.<get-maxLength>|<get-maxLength>(){}[0]
     final val maxValues // dev.kord.common.entity/DiscordChatComponent.maxValues|{}maxValues[0]
         final fun <get-maxValues>(): dev.kord.common.entity.optional/OptionalInt // dev.kord.common.entity/DiscordChatComponent.maxValues.<get-maxValues>|<get-maxValues>(){}[0]
+    final val media // dev.kord.common.entity/DiscordChatComponent.media|{}media[0]
+        final fun <get-media>(): dev.kord.common.entity.optional/Optional<dev.kord.common.entity/UnfurledMediaItem> // dev.kord.common.entity/DiscordChatComponent.media.<get-media>|<get-media>(){}[0]
     final val minLength // dev.kord.common.entity/DiscordChatComponent.minLength|{}minLength[0]
         final fun <get-minLength>(): dev.kord.common.entity.optional/OptionalInt // dev.kord.common.entity/DiscordChatComponent.minLength.<get-minLength>|<get-minLength>(){}[0]
     final val minValues // dev.kord.common.entity/DiscordChatComponent.minValues|{}minValues[0]
diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/EmbedType.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/EmbedType.kt
index c84333fc9e6..46d4739158f 100644
--- a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/EmbedType.kt
+++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/EmbedType.kt
@@ -57,7 +57,7 @@ public sealed class EmbedType(
     public object Video : EmbedType("video")
 
     /**
-     * Animated gif image embed rendered as a video embed.
+     * Animated gif media embed rendered as a video embed.
      */
     public object Gifv : EmbedType("gifv")
 
diff --git a/rest/api/rest.api b/rest/api/rest.api
index 0f7be299fa3..cead793a4c5 100644
--- a/rest/api/rest.api
+++ b/rest/api/rest.api
@@ -1046,7 +1046,19 @@ public final class dev/kord/rest/builder/channel/thread/ThreadModifyBuilderKt {
 public abstract interface class dev/kord/rest/builder/component/AccessoryComponentBuilder : dev/kord/rest/builder/component/ComponentBuilder {
 }
 
-public final class dev/kord/rest/builder/component/ActionRowBuilder : dev/kord/rest/builder/component/ContainerComponentBuilder, dev/kord/rest/builder/component/MessageComponentBuilder {
+public abstract interface class dev/kord/rest/builder/component/AccessoryHolder {
+	public abstract fun getAccessory ()Ldev/kord/rest/builder/component/AccessoryComponentBuilder;
+	public abstract fun setAccessory (Ldev/kord/rest/builder/component/AccessoryComponentBuilder;)V
+}
+
+public final class dev/kord/rest/builder/component/AccessoryHolderKt {
+	public static final fun interactionButtonAccessory (Ldev/kord/rest/builder/component/AccessoryHolder;Ldev/kord/common/entity/ButtonStyle;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
+	public static synthetic fun interactionButtonAccessory$default (Ldev/kord/rest/builder/component/AccessoryHolder;Ldev/kord/common/entity/ButtonStyle;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+	public static final fun linkButtonAccessory (Ldev/kord/rest/builder/component/AccessoryHolder;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
+	public static synthetic fun linkButtonAccessory$default (Ldev/kord/rest/builder/component/AccessoryHolder;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+}
+
+public final class dev/kord/rest/builder/component/ActionRowBuilder : dev/kord/rest/builder/component/ContainerComponentBuilder {
 	public fun <init> ()V
 	public fun build ()Ldev/kord/common/entity/DiscordChatComponent;
 	public synthetic fun build ()Ldev/kord/common/entity/DiscordComponent;
@@ -1113,20 +1125,37 @@ public abstract interface class dev/kord/rest/builder/component/ComponentBuilder
 	public abstract fun build ()Ldev/kord/common/entity/DiscordComponent;
 }
 
-public final class dev/kord/rest/builder/component/ContainerBuilder : dev/kord/rest/builder/component/MessageComponentBuilder {
+public abstract interface class dev/kord/rest/builder/component/ComponentContainerBuilder {
+	public abstract fun separator (Ldev/kord/common/entity/SeparatorSpacingSize;)V
+	public abstract fun textDisplay (Ljava/lang/String;)V
+}
+
+public final class dev/kord/rest/builder/component/ComponentContainerBuilder$DefaultImpls {
+	public static fun separator (Ldev/kord/rest/builder/component/ComponentContainerBuilder;Ldev/kord/common/entity/SeparatorSpacingSize;)V
+	public static fun textDisplay (Ldev/kord/rest/builder/component/ComponentContainerBuilder;Ljava/lang/String;)V
+}
+
+public final class dev/kord/rest/builder/component/ComponentContainerBuilderKt {
+	public static final fun actionRow (Ldev/kord/rest/builder/component/ComponentContainerBuilder;Lkotlin/jvm/functions/Function1;)V
+	public static final fun file (Ldev/kord/rest/builder/component/ComponentContainerBuilder;Lkotlin/jvm/functions/Function1;)V
+	public static final fun mediaGallery (Ldev/kord/rest/builder/component/ComponentContainerBuilder;Lkotlin/jvm/functions/Function1;)V
+	public static final fun section (Ldev/kord/rest/builder/component/ComponentContainerBuilder;Lkotlin/jvm/functions/Function1;)V
+	public static final fun separator (Ldev/kord/rest/builder/component/ComponentContainerBuilder;Lkotlin/jvm/functions/Function1;)V
+	public static final fun textDisplay (Ldev/kord/rest/builder/component/ComponentContainerBuilder;Lkotlin/jvm/functions/Function1;)V
+}
+
+public final class dev/kord/rest/builder/component/ContainerBuilder : dev/kord/rest/builder/component/ComponentContainerBuilder, dev/kord/rest/builder/component/MessageComponentBuilder {
 	public fun <init> ()V
-	public final fun actionRow (Lkotlin/jvm/functions/Function1;)V
+	public fun addComponent (Ldev/kord/rest/builder/component/ContainerComponentBuilder;)V
 	public fun build ()Ldev/kord/common/entity/DiscordComponent;
-	public final fun file (Lkotlin/jvm/functions/Function1;)V
 	public final fun getAccentColor ()Ldev/kord/common/Color;
 	public final fun getComponents ()Ljava/util/List;
 	public final fun getSpoiler ()Ljava/lang/Boolean;
-	public final fun mediaGallery (Lkotlin/jvm/functions/Function1;)V
-	public final fun section (Lkotlin/jvm/functions/Function1;)V
-	public final fun separator (Lkotlin/jvm/functions/Function1;)V
+	public fun separator (Ldev/kord/common/entity/SeparatorSpacingSize;)V
 	public final fun setAccentColor (Ldev/kord/common/Color;)V
+	public final fun setComponents (Ljava/util/List;)V
 	public final fun setSpoiler (Ljava/lang/Boolean;)V
-	public final fun textDisplay (Lkotlin/jvm/functions/Function1;)V
+	public fun textDisplay (Ljava/lang/String;)V
 }
 
 public abstract interface class dev/kord/rest/builder/component/ContainerComponentBuilder : dev/kord/rest/builder/component/MessageComponentBuilder {
@@ -1181,16 +1210,13 @@ public final class dev/kord/rest/builder/component/RoleSelectBuilder : dev/kord/
 	public final fun getDefaultRoles ()Ljava/util/List;
 }
 
-public final class dev/kord/rest/builder/component/SectionBuilder : dev/kord/rest/builder/component/ContainerComponentBuilder {
+public final class dev/kord/rest/builder/component/SectionBuilder : dev/kord/rest/builder/component/AccessoryHolder, dev/kord/rest/builder/component/ContainerComponentBuilder {
 	public fun <init> ()V
 	public fun build ()Ldev/kord/common/entity/DiscordComponent;
-	public final fun getAccessory ()Ldev/kord/rest/builder/component/AccessoryComponentBuilder;
+	public fun getAccessory ()Ldev/kord/rest/builder/component/AccessoryComponentBuilder;
 	public final fun getComponents ()Ljava/util/List;
-	public final fun interactionButtonAccessory (Ldev/kord/common/entity/ButtonStyle;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
-	public static synthetic fun interactionButtonAccessory$default (Ldev/kord/rest/builder/component/SectionBuilder;Ldev/kord/common/entity/ButtonStyle;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
-	public final fun linkButtonAccessory (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
-	public static synthetic fun linkButtonAccessory$default (Ldev/kord/rest/builder/component/SectionBuilder;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
-	public final fun setAccessory (Ldev/kord/rest/builder/component/AccessoryComponentBuilder;)V
+	public fun setAccessory (Ldev/kord/rest/builder/component/AccessoryComponentBuilder;)V
+	public final fun textDisplay (Ljava/lang/String;)V
 	public final fun textDisplay (Lkotlin/jvm/functions/Function1;)V
 	public final fun thumbnailAccessory (Lkotlin/jvm/functions/Function1;)V
 }
@@ -2269,7 +2295,8 @@ public final class dev/kord/rest/builder/message/EmbedBuilder$Thumbnail : dev/ko
 	public synthetic fun toRequest ()Ljava/lang/Object;
 }
 
-public abstract interface class dev/kord/rest/builder/message/MessageBuilder {
+public abstract interface class dev/kord/rest/builder/message/MessageBuilder : dev/kord/rest/builder/component/ComponentContainerBuilder {
+	public abstract fun addComponent (Ldev/kord/rest/builder/component/ContainerComponentBuilder;)V
 	public abstract fun addFile (Ljava/lang/String;Lio/ktor/client/request/forms/ChannelProvider;)Ldev/kord/rest/NamedFile;
 	public abstract fun getAllowedMentions ()Ldev/kord/rest/builder/message/AllowedMentionsBuilder;
 	public abstract fun getAttachments ()Ljava/util/List;
@@ -2289,7 +2316,10 @@ public abstract interface class dev/kord/rest/builder/message/MessageBuilder {
 }
 
 public final class dev/kord/rest/builder/message/MessageBuilder$DefaultImpls {
+	public static fun addComponent (Ldev/kord/rest/builder/message/MessageBuilder;Ldev/kord/rest/builder/component/ContainerComponentBuilder;)V
 	public static fun addFile (Ldev/kord/rest/builder/message/MessageBuilder;Ljava/lang/String;Lio/ktor/client/request/forms/ChannelProvider;)Ldev/kord/rest/NamedFile;
+	public static fun separator (Ldev/kord/rest/builder/message/MessageBuilder;Ldev/kord/common/entity/SeparatorSpacingSize;)V
+	public static fun textDisplay (Ldev/kord/rest/builder/message/MessageBuilder;Ljava/lang/String;)V
 }
 
 public final class dev/kord/rest/builder/message/MessageBuilderJvmKt {
@@ -2302,11 +2332,13 @@ public final class dev/kord/rest/builder/message/MessageBuilderKt {
 	public static final fun addFile (Ldev/kord/rest/builder/message/MessageBuilder;Ljava/lang/String;Lio/ktor/client/request/forms/ChannelProvider;Lkotlin/jvm/functions/Function1;)Ldev/kord/rest/NamedFile;
 	public static final fun allowedMentions (Ldev/kord/rest/builder/message/MessageBuilder;Lkotlin/jvm/functions/Function1;)V
 	public static synthetic fun allowedMentions$default (Ldev/kord/rest/builder/message/MessageBuilder;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+	public static final fun container (Ldev/kord/rest/builder/message/MessageBuilder;Lkotlin/jvm/functions/Function1;)V
 	public static final fun embed (Ldev/kord/rest/builder/message/MessageBuilder;Lkotlin/jvm/functions/Function1;)V
 	public static final fun messageFlags (Ldev/kord/rest/builder/message/MessageBuilder;Lkotlin/jvm/functions/Function1;)V
 }
 
 public abstract class dev/kord/rest/builder/message/create/AbstractMessageCreateBuilder : dev/kord/rest/builder/message/create/MessageCreateBuilder {
+	public fun addComponent (Ldev/kord/rest/builder/component/ContainerComponentBuilder;)V
 	public fun addFile (Ljava/lang/String;Lio/ktor/client/request/forms/ChannelProvider;)Ldev/kord/rest/NamedFile;
 	public final fun getAllowedMentions ()Ldev/kord/rest/builder/message/AllowedMentionsBuilder;
 	public final fun getAttachments ()Ljava/util/List;
@@ -2318,6 +2350,7 @@ public abstract class dev/kord/rest/builder/message/create/AbstractMessageCreate
 	public final fun getSuppressEmbeds ()Ljava/lang/Boolean;
 	public final fun getSuppressNotifications ()Ljava/lang/Boolean;
 	public final fun getTts ()Ljava/lang/Boolean;
+	public fun separator (Ldev/kord/common/entity/SeparatorSpacingSize;)V
 	public final fun setAllowedMentions (Ldev/kord/rest/builder/message/AllowedMentionsBuilder;)V
 	public final fun setAttachments (Ljava/util/List;)V
 	public final fun setComponents (Ljava/util/List;)V
@@ -2327,6 +2360,7 @@ public abstract class dev/kord/rest/builder/message/create/AbstractMessageCreate
 	public final fun setSuppressEmbeds (Ljava/lang/Boolean;)V
 	public final fun setSuppressNotifications (Ljava/lang/Boolean;)V
 	public final fun setTts (Ljava/lang/Boolean;)V
+	public fun textDisplay (Ljava/lang/String;)V
 }
 
 public final class dev/kord/rest/builder/message/create/FollowupMessageCreateBuilder : dev/kord/rest/builder/message/create/AbstractMessageCreateBuilder, dev/kord/rest/builder/RequestBuilder {
@@ -2367,7 +2401,10 @@ public abstract interface class dev/kord/rest/builder/message/create/MessageCrea
 }
 
 public final class dev/kord/rest/builder/message/create/MessageCreateBuilder$DefaultImpls {
+	public static fun addComponent (Ldev/kord/rest/builder/message/create/MessageCreateBuilder;Ldev/kord/rest/builder/component/ContainerComponentBuilder;)V
 	public static fun addFile (Ldev/kord/rest/builder/message/create/MessageCreateBuilder;Ljava/lang/String;Lio/ktor/client/request/forms/ChannelProvider;)Ldev/kord/rest/NamedFile;
+	public static fun separator (Ldev/kord/rest/builder/message/create/MessageCreateBuilder;Ldev/kord/common/entity/SeparatorSpacingSize;)V
+	public static fun textDisplay (Ldev/kord/rest/builder/message/create/MessageCreateBuilder;Ljava/lang/String;)V
 }
 
 public final class dev/kord/rest/builder/message/create/UpdateMessageInteractionResponseCreateBuilder : dev/kord/rest/builder/message/create/AbstractMessageCreateBuilder, dev/kord/rest/builder/RequestBuilder {
@@ -2415,6 +2452,7 @@ public final class dev/kord/rest/builder/message/create/WebhookMessageCreateBuil
 }
 
 public abstract class dev/kord/rest/builder/message/modify/AbstractMessageModifyBuilder : dev/kord/rest/builder/message/modify/MessageModifyBuilder {
+	public fun addComponent (Ldev/kord/rest/builder/component/ContainerComponentBuilder;)V
 	public fun addFile (Ljava/lang/String;Lio/ktor/client/request/forms/ChannelProvider;)Ldev/kord/rest/NamedFile;
 	public final fun getAllowedMentions ()Ldev/kord/rest/builder/message/AllowedMentionsBuilder;
 	public final fun getAttachments ()Ljava/util/List;
@@ -2424,6 +2462,7 @@ public abstract class dev/kord/rest/builder/message/modify/AbstractMessageModify
 	public final fun getFiles ()Ljava/util/List;
 	public final fun getFlags ()Ldev/kord/common/entity/MessageFlags;
 	public final fun getSuppressEmbeds ()Ljava/lang/Boolean;
+	public fun separator (Ldev/kord/common/entity/SeparatorSpacingSize;)V
 	public final fun setAllowedMentions (Ldev/kord/rest/builder/message/AllowedMentionsBuilder;)V
 	public final fun setAttachments (Ljava/util/List;)V
 	public final fun setComponents (Ljava/util/List;)V
@@ -2431,6 +2470,7 @@ public abstract class dev/kord/rest/builder/message/modify/AbstractMessageModify
 	public final fun setEmbeds (Ljava/util/List;)V
 	public final fun setFlags (Ldev/kord/common/entity/MessageFlags;)V
 	public final fun setSuppressEmbeds (Ljava/lang/Boolean;)V
+	public fun textDisplay (Ljava/lang/String;)V
 }
 
 public final class dev/kord/rest/builder/message/modify/FollowupMessageModifyBuilder : dev/kord/rest/builder/message/modify/AbstractMessageModifyBuilder, dev/kord/rest/builder/RequestBuilder {
@@ -2449,7 +2489,10 @@ public abstract interface class dev/kord/rest/builder/message/modify/MessageModi
 }
 
 public final class dev/kord/rest/builder/message/modify/MessageModifyBuilder$DefaultImpls {
+	public static fun addComponent (Ldev/kord/rest/builder/message/modify/MessageModifyBuilder;Ldev/kord/rest/builder/component/ContainerComponentBuilder;)V
 	public static fun addFile (Ldev/kord/rest/builder/message/modify/MessageModifyBuilder;Ljava/lang/String;Lio/ktor/client/request/forms/ChannelProvider;)Ldev/kord/rest/NamedFile;
+	public static fun separator (Ldev/kord/rest/builder/message/modify/MessageModifyBuilder;Ldev/kord/common/entity/SeparatorSpacingSize;)V
+	public static fun textDisplay (Ldev/kord/rest/builder/message/modify/MessageModifyBuilder;Ljava/lang/String;)V
 }
 
 public final class dev/kord/rest/builder/message/modify/MessageModifyBuilderKt {
diff --git a/rest/api/rest.klib.api b/rest/api/rest.klib.api
index 9699c244a84..f936d9da19d 100644
--- a/rest/api/rest.klib.api
+++ b/rest/api/rest.klib.api
@@ -249,6 +249,17 @@ abstract interface dev.kord.rest.builder.channel/PermissionOverwritesModifyBuild
     open fun addOverwrite(dev.kord.common.entity/Overwrite) // dev.kord.rest.builder.channel/PermissionOverwritesModifyBuilder.addOverwrite|addOverwrite(dev.kord.common.entity.Overwrite){}[0]
 }
 
+abstract interface dev.kord.rest.builder.component/AccessoryHolder { // dev.kord.rest.builder.component/AccessoryHolder|null[0]
+    abstract var accessory // dev.kord.rest.builder.component/AccessoryHolder.accessory|{}accessory[0]
+        abstract fun <get-accessory>(): dev.kord.rest.builder.component/AccessoryComponentBuilder? // dev.kord.rest.builder.component/AccessoryHolder.accessory.<get-accessory>|<get-accessory>(){}[0]
+        abstract fun <set-accessory>(dev.kord.rest.builder.component/AccessoryComponentBuilder?) // dev.kord.rest.builder.component/AccessoryHolder.accessory.<set-accessory>|<set-accessory>(dev.kord.rest.builder.component.AccessoryComponentBuilder?){}[0]
+}
+
+abstract interface dev.kord.rest.builder.component/ComponentContainerBuilder { // dev.kord.rest.builder.component/ComponentContainerBuilder|null[0]
+    open fun separator(dev.kord.common.entity/SeparatorSpacingSize) // dev.kord.rest.builder.component/ComponentContainerBuilder.separator|separator(dev.kord.common.entity.SeparatorSpacingSize){}[0]
+    open fun textDisplay(kotlin/String) // dev.kord.rest.builder.component/ComponentContainerBuilder.textDisplay|textDisplay(kotlin.String){}[0]
+}
+
 abstract interface dev.kord.rest.builder.interaction/ApplicationCommandCreateBuilder : dev.kord.rest.builder.interaction/LocalizedNameCreateBuilder, dev.kord.rest.builder/RequestBuilder<dev.kord.rest.json.request/ApplicationCommandCreateRequest> { // dev.kord.rest.builder.interaction/ApplicationCommandCreateBuilder|null[0]
     abstract val type // dev.kord.rest.builder.interaction/ApplicationCommandCreateBuilder.type|{}type[0]
         abstract fun <get-type>(): dev.kord.common.entity/ApplicationCommandType // dev.kord.rest.builder.interaction/ApplicationCommandCreateBuilder.type.<get-type>|<get-type>(){}[0]
@@ -362,7 +373,7 @@ abstract interface dev.kord.rest.builder.interaction/UserCommandCreateBuilder :
 
 abstract interface dev.kord.rest.builder.interaction/UserCommandModifyBuilder : dev.kord.rest.builder.interaction/ApplicationCommandModifyBuilder // dev.kord.rest.builder.interaction/UserCommandModifyBuilder|null[0]
 
-abstract interface dev.kord.rest.builder.message/MessageBuilder { // dev.kord.rest.builder.message/MessageBuilder|null[0]
+abstract interface dev.kord.rest.builder.message/MessageBuilder : dev.kord.rest.builder.component/ComponentContainerBuilder { // dev.kord.rest.builder.message/MessageBuilder|null[0]
     abstract val files // dev.kord.rest.builder.message/MessageBuilder.files|{}files[0]
         abstract fun <get-files>(): kotlin.collections/MutableList<dev.kord.rest/NamedFile> // dev.kord.rest.builder.message/MessageBuilder.files.<get-files>|<get-files>(){}[0]
 
@@ -388,6 +399,7 @@ abstract interface dev.kord.rest.builder.message/MessageBuilder { // dev.kord.re
         abstract fun <get-suppressEmbeds>(): kotlin/Boolean? // dev.kord.rest.builder.message/MessageBuilder.suppressEmbeds.<get-suppressEmbeds>|<get-suppressEmbeds>(){}[0]
         abstract fun <set-suppressEmbeds>(kotlin/Boolean?) // dev.kord.rest.builder.message/MessageBuilder.suppressEmbeds.<set-suppressEmbeds>|<set-suppressEmbeds>(kotlin.Boolean?){}[0]
 
+    open fun addComponent(dev.kord.rest.builder.component/ContainerComponentBuilder) // dev.kord.rest.builder.message/MessageBuilder.addComponent|addComponent(dev.kord.rest.builder.component.ContainerComponentBuilder){}[0]
     open fun addFile(kotlin/String, io.ktor.client.request.forms/ChannelProvider): dev.kord.rest/NamedFile // dev.kord.rest.builder.message/MessageBuilder.addFile|addFile(kotlin.String;io.ktor.client.request.forms.ChannelProvider){}[0]
 }
 
@@ -1672,7 +1684,7 @@ final class dev.kord.rest.builder.channel/VoiceChannelModifyBuilder : dev.kord.r
     final fun toRequest(): dev.kord.rest.json.request/ChannelModifyPatchRequest // dev.kord.rest.builder.channel/VoiceChannelModifyBuilder.toRequest|toRequest(){}[0]
 }
 
-final class dev.kord.rest.builder.component/ActionRowBuilder : dev.kord.rest.builder.component/ContainerComponentBuilder, dev.kord.rest.builder.component/MessageComponentBuilder { // dev.kord.rest.builder.component/ActionRowBuilder|null[0]
+final class dev.kord.rest.builder.component/ActionRowBuilder : dev.kord.rest.builder.component/ContainerComponentBuilder { // dev.kord.rest.builder.component/ActionRowBuilder|null[0]
     constructor <init>() // dev.kord.rest.builder.component/ActionRowBuilder.<init>|<init>(){}[0]
 
     final val components // dev.kord.rest.builder.component/ActionRowBuilder.components|{}components[0]
@@ -1701,26 +1713,21 @@ final class dev.kord.rest.builder.component/ChannelSelectBuilder : dev.kord.rest
         final fun <set-channelTypes>(kotlin.collections/MutableList<dev.kord.common.entity/ChannelType>?) // dev.kord.rest.builder.component/ChannelSelectBuilder.channelTypes.<set-channelTypes>|<set-channelTypes>(kotlin.collections.MutableList<dev.kord.common.entity.ChannelType>?){}[0]
 }
 
-final class dev.kord.rest.builder.component/ContainerBuilder : dev.kord.rest.builder.component/MessageComponentBuilder { // dev.kord.rest.builder.component/ContainerBuilder|null[0]
+final class dev.kord.rest.builder.component/ContainerBuilder : dev.kord.rest.builder.component/ComponentContainerBuilder, dev.kord.rest.builder.component/MessageComponentBuilder { // dev.kord.rest.builder.component/ContainerBuilder|null[0]
     constructor <init>() // dev.kord.rest.builder.component/ContainerBuilder.<init>|<init>(){}[0]
 
-    final val components // dev.kord.rest.builder.component/ContainerBuilder.components|{}components[0]
-        final fun <get-components>(): kotlin.collections/MutableList<dev.kord.rest.builder.component/ContainerComponentBuilder> // dev.kord.rest.builder.component/ContainerBuilder.components.<get-components>|<get-components>(){}[0]
-
     final var accentColor // dev.kord.rest.builder.component/ContainerBuilder.accentColor|{}accentColor[0]
         final fun <get-accentColor>(): dev.kord.common/Color? // dev.kord.rest.builder.component/ContainerBuilder.accentColor.<get-accentColor>|<get-accentColor>(){}[0]
         final fun <set-accentColor>(dev.kord.common/Color?) // dev.kord.rest.builder.component/ContainerBuilder.accentColor.<set-accentColor>|<set-accentColor>(dev.kord.common.Color?){}[0]
+    final var components // dev.kord.rest.builder.component/ContainerBuilder.components|{}components[0]
+        final fun <get-components>(): kotlin.collections/MutableList<dev.kord.rest.builder.component/MessageComponentBuilder>? // dev.kord.rest.builder.component/ContainerBuilder.components.<get-components>|<get-components>(){}[0]
+        final fun <set-components>(kotlin.collections/MutableList<dev.kord.rest.builder.component/MessageComponentBuilder>?) // dev.kord.rest.builder.component/ContainerBuilder.components.<set-components>|<set-components>(kotlin.collections.MutableList<dev.kord.rest.builder.component.MessageComponentBuilder>?){}[0]
     final var spoiler // dev.kord.rest.builder.component/ContainerBuilder.spoiler|{}spoiler[0]
         final fun <get-spoiler>(): kotlin/Boolean? // dev.kord.rest.builder.component/ContainerBuilder.spoiler.<get-spoiler>|<get-spoiler>(){}[0]
         final fun <set-spoiler>(kotlin/Boolean?) // dev.kord.rest.builder.component/ContainerBuilder.spoiler.<set-spoiler>|<set-spoiler>(kotlin.Boolean?){}[0]
 
-    final fun actionRow(kotlin/Function1<dev.kord.rest.builder.component/ActionRowBuilder, kotlin/Unit>) // dev.kord.rest.builder.component/ContainerBuilder.actionRow|actionRow(kotlin.Function1<dev.kord.rest.builder.component.ActionRowBuilder,kotlin.Unit>){}[0]
+    final fun addComponent(dev.kord.rest.builder.component/ContainerComponentBuilder) // dev.kord.rest.builder.component/ContainerBuilder.addComponent|addComponent(dev.kord.rest.builder.component.ContainerComponentBuilder){}[0]
     final fun build(): dev.kord.common.entity/DiscordComponent // dev.kord.rest.builder.component/ContainerBuilder.build|build(){}[0]
-    final fun file(kotlin/Function1<dev.kord.rest.builder.component/FileBuilder, kotlin/Unit>) // dev.kord.rest.builder.component/ContainerBuilder.file|file(kotlin.Function1<dev.kord.rest.builder.component.FileBuilder,kotlin.Unit>){}[0]
-    final fun mediaGallery(kotlin/Function1<dev.kord.rest.builder.component/MediaGalleryBuilder, kotlin/Unit>) // dev.kord.rest.builder.component/ContainerBuilder.mediaGallery|mediaGallery(kotlin.Function1<dev.kord.rest.builder.component.MediaGalleryBuilder,kotlin.Unit>){}[0]
-    final fun section(kotlin/Function1<dev.kord.rest.builder.component/SectionBuilder, kotlin/Unit>) // dev.kord.rest.builder.component/ContainerBuilder.section|section(kotlin.Function1<dev.kord.rest.builder.component.SectionBuilder,kotlin.Unit>){}[0]
-    final fun separator(kotlin/Function1<dev.kord.rest.builder.component/SeparatorBuilder, kotlin/Unit>) // dev.kord.rest.builder.component/ContainerBuilder.separator|separator(kotlin.Function1<dev.kord.rest.builder.component.SeparatorBuilder,kotlin.Unit>){}[0]
-    final fun textDisplay(kotlin/Function1<dev.kord.rest.builder.component/TextDisplayBuilder, kotlin/Unit>) // dev.kord.rest.builder.component/ContainerBuilder.textDisplay|textDisplay(kotlin.Function1<dev.kord.rest.builder.component.TextDisplayBuilder,kotlin.Unit>){}[0]
 }
 
 final class dev.kord.rest.builder.component/FileBuilder : dev.kord.rest.builder.component/ContainerComponentBuilder { // dev.kord.rest.builder.component/FileBuilder|null[0]
@@ -1788,7 +1795,7 @@ final class dev.kord.rest.builder.component/RoleSelectBuilder : dev.kord.rest.bu
         final fun <get-defaultRoles>(): kotlin.collections/MutableList<dev.kord.common.entity/Snowflake> // dev.kord.rest.builder.component/RoleSelectBuilder.defaultRoles.<get-defaultRoles>|<get-defaultRoles>(){}[0]
 }
 
-final class dev.kord.rest.builder.component/SectionBuilder : dev.kord.rest.builder.component/ContainerComponentBuilder { // dev.kord.rest.builder.component/SectionBuilder|null[0]
+final class dev.kord.rest.builder.component/SectionBuilder : dev.kord.rest.builder.component/AccessoryHolder, dev.kord.rest.builder.component/ContainerComponentBuilder { // dev.kord.rest.builder.component/SectionBuilder|null[0]
     constructor <init>() // dev.kord.rest.builder.component/SectionBuilder.<init>|<init>(){}[0]
 
     final val components // dev.kord.rest.builder.component/SectionBuilder.components|{}components[0]
@@ -1799,8 +1806,7 @@ final class dev.kord.rest.builder.component/SectionBuilder : dev.kord.rest.build
         final fun <set-accessory>(dev.kord.rest.builder.component/AccessoryComponentBuilder?) // dev.kord.rest.builder.component/SectionBuilder.accessory.<set-accessory>|<set-accessory>(dev.kord.rest.builder.component.AccessoryComponentBuilder?){}[0]
 
     final fun build(): dev.kord.common.entity/DiscordComponent // dev.kord.rest.builder.component/SectionBuilder.build|build(){}[0]
-    final inline fun interactionButtonAccessory(dev.kord.common.entity/ButtonStyle, kotlin/String, kotlin/Function1<dev.kord.rest.builder.component/ButtonBuilder, kotlin/Unit> = ...) // dev.kord.rest.builder.component/SectionBuilder.interactionButtonAccessory|interactionButtonAccessory(dev.kord.common.entity.ButtonStyle;kotlin.String;kotlin.Function1<dev.kord.rest.builder.component.ButtonBuilder,kotlin.Unit>){}[0]
-    final inline fun linkButtonAccessory(kotlin/String, kotlin/Function1<dev.kord.rest.builder.component/ButtonBuilder, kotlin/Unit> = ...) // dev.kord.rest.builder.component/SectionBuilder.linkButtonAccessory|linkButtonAccessory(kotlin.String;kotlin.Function1<dev.kord.rest.builder.component.ButtonBuilder,kotlin.Unit>){}[0]
+    final fun textDisplay(kotlin/String) // dev.kord.rest.builder.component/SectionBuilder.textDisplay|textDisplay(kotlin.String){}[0]
     final inline fun textDisplay(kotlin/Function1<dev.kord.rest.builder.component/TextDisplayBuilder, kotlin/Unit>) // dev.kord.rest.builder.component/SectionBuilder.textDisplay|textDisplay(kotlin.Function1<dev.kord.rest.builder.component.TextDisplayBuilder,kotlin.Unit>){}[0]
     final inline fun thumbnailAccessory(kotlin/Function1<dev.kord.rest.builder.component/ThumbnailBuilder, kotlin/Unit>) // dev.kord.rest.builder.component/SectionBuilder.thumbnailAccessory|thumbnailAccessory(kotlin.Function1<dev.kord.rest.builder.component.ThumbnailBuilder,kotlin.Unit>){}[0]
 }
@@ -8207,6 +8213,14 @@ final inline fun (dev.kord.rest.builder.automoderation/MemberProfileAutoModerati
 final inline fun (dev.kord.rest.builder.automoderation/TimeoutAutoModerationRuleBuilder).dev.kord.rest.builder.automoderation/timeout(kotlin.time/Duration, kotlin/Function1<dev.kord.rest.builder.automoderation/TimeoutAutoModerationActionBuilder, kotlin/Unit> = ...) // dev.kord.rest.builder.automoderation/timeout|timeout@dev.kord.rest.builder.automoderation.TimeoutAutoModerationRuleBuilder(kotlin.time.Duration;kotlin.Function1<dev.kord.rest.builder.automoderation.TimeoutAutoModerationActionBuilder,kotlin.Unit>){}[0]
 final inline fun (dev.kord.rest.builder.channel/PermissionOverwritesBuilder).dev.kord.rest.builder.channel/addMemberOverwrite(dev.kord.common.entity/Snowflake, kotlin/Function1<dev.kord.rest.builder.channel/PermissionOverwriteBuilder, kotlin/Unit>) // dev.kord.rest.builder.channel/addMemberOverwrite|addMemberOverwrite@dev.kord.rest.builder.channel.PermissionOverwritesBuilder(dev.kord.common.entity.Snowflake;kotlin.Function1<dev.kord.rest.builder.channel.PermissionOverwriteBuilder,kotlin.Unit>){}[0]
 final inline fun (dev.kord.rest.builder.channel/PermissionOverwritesBuilder).dev.kord.rest.builder.channel/addRoleOverwrite(dev.kord.common.entity/Snowflake, kotlin/Function1<dev.kord.rest.builder.channel/PermissionOverwriteBuilder, kotlin/Unit>) // dev.kord.rest.builder.channel/addRoleOverwrite|addRoleOverwrite@dev.kord.rest.builder.channel.PermissionOverwritesBuilder(dev.kord.common.entity.Snowflake;kotlin.Function1<dev.kord.rest.builder.channel.PermissionOverwriteBuilder,kotlin.Unit>){}[0]
+final inline fun (dev.kord.rest.builder.component/AccessoryHolder).dev.kord.rest.builder.component/interactionButtonAccessory(dev.kord.common.entity/ButtonStyle, kotlin/String, kotlin/Function1<dev.kord.rest.builder.component/ButtonBuilder, kotlin/Unit> = ...) // dev.kord.rest.builder.component/interactionButtonAccessory|interactionButtonAccessory@dev.kord.rest.builder.component.AccessoryHolder(dev.kord.common.entity.ButtonStyle;kotlin.String;kotlin.Function1<dev.kord.rest.builder.component.ButtonBuilder,kotlin.Unit>){}[0]
+final inline fun (dev.kord.rest.builder.component/AccessoryHolder).dev.kord.rest.builder.component/linkButtonAccessory(kotlin/String, kotlin/Function1<dev.kord.rest.builder.component/ButtonBuilder, kotlin/Unit> = ...) // dev.kord.rest.builder.component/linkButtonAccessory|linkButtonAccessory@dev.kord.rest.builder.component.AccessoryHolder(kotlin.String;kotlin.Function1<dev.kord.rest.builder.component.ButtonBuilder,kotlin.Unit>){}[0]
+final inline fun (dev.kord.rest.builder.component/ComponentContainerBuilder).dev.kord.rest.builder.component/actionRow(kotlin/Function1<dev.kord.rest.builder.component/ActionRowBuilder, kotlin/Unit>) // dev.kord.rest.builder.component/actionRow|actionRow@dev.kord.rest.builder.component.ComponentContainerBuilder(kotlin.Function1<dev.kord.rest.builder.component.ActionRowBuilder,kotlin.Unit>){}[0]
+final inline fun (dev.kord.rest.builder.component/ComponentContainerBuilder).dev.kord.rest.builder.component/file(kotlin/Function1<dev.kord.rest.builder.component/FileBuilder, kotlin/Unit>) // dev.kord.rest.builder.component/file|file@dev.kord.rest.builder.component.ComponentContainerBuilder(kotlin.Function1<dev.kord.rest.builder.component.FileBuilder,kotlin.Unit>){}[0]
+final inline fun (dev.kord.rest.builder.component/ComponentContainerBuilder).dev.kord.rest.builder.component/mediaGallery(kotlin/Function1<dev.kord.rest.builder.component/MediaGalleryBuilder, kotlin/Unit>) // dev.kord.rest.builder.component/mediaGallery|mediaGallery@dev.kord.rest.builder.component.ComponentContainerBuilder(kotlin.Function1<dev.kord.rest.builder.component.MediaGalleryBuilder,kotlin.Unit>){}[0]
+final inline fun (dev.kord.rest.builder.component/ComponentContainerBuilder).dev.kord.rest.builder.component/section(kotlin/Function1<dev.kord.rest.builder.component/SectionBuilder, kotlin/Unit>) // dev.kord.rest.builder.component/section|section@dev.kord.rest.builder.component.ComponentContainerBuilder(kotlin.Function1<dev.kord.rest.builder.component.SectionBuilder,kotlin.Unit>){}[0]
+final inline fun (dev.kord.rest.builder.component/ComponentContainerBuilder).dev.kord.rest.builder.component/separator(kotlin/Function1<dev.kord.rest.builder.component/SeparatorBuilder, kotlin/Unit>) // dev.kord.rest.builder.component/separator|separator@dev.kord.rest.builder.component.ComponentContainerBuilder(kotlin.Function1<dev.kord.rest.builder.component.SeparatorBuilder,kotlin.Unit>){}[0]
+final inline fun (dev.kord.rest.builder.component/ComponentContainerBuilder).dev.kord.rest.builder.component/textDisplay(kotlin/Function1<dev.kord.rest.builder.component/TextDisplayBuilder, kotlin/Unit>) // dev.kord.rest.builder.component/textDisplay|textDisplay@dev.kord.rest.builder.component.ComponentContainerBuilder(kotlin.Function1<dev.kord.rest.builder.component.TextDisplayBuilder,kotlin.Unit>){}[0]
 final inline fun (dev.kord.rest.builder.component/StringSelectBuilder).dev.kord.rest.builder.component/option(kotlin/String, kotlin/String, kotlin/Function1<dev.kord.rest.builder.component/SelectOptionBuilder, kotlin/Unit> = ...) // dev.kord.rest.builder.component/option|option@dev.kord.rest.builder.component.StringSelectBuilder(kotlin.String;kotlin.String;kotlin.Function1<dev.kord.rest.builder.component.SelectOptionBuilder,kotlin.Unit>){}[0]
 final inline fun (dev.kord.rest.builder.guild/GuildOnboardingModifyBuilder).dev.kord.rest.builder.guild/prompt(dev.kord.common.entity/OnboardingPromptType, kotlin/String, kotlin/Boolean, kotlin/Boolean, kotlin/Boolean, kotlin/Function1<dev.kord.rest.builder.guild/OnboardingPromptBuilder, kotlin/Unit>) // dev.kord.rest.builder.guild/prompt|prompt@dev.kord.rest.builder.guild.GuildOnboardingModifyBuilder(dev.kord.common.entity.OnboardingPromptType;kotlin.String;kotlin.Boolean;kotlin.Boolean;kotlin.Boolean;kotlin.Function1<dev.kord.rest.builder.guild.OnboardingPromptBuilder,kotlin.Unit>){}[0]
 final inline fun (dev.kord.rest.builder.guild/OnboardingPromptBuilder).dev.kord.rest.builder.guild/option(kotlin/String, kotlin/Function1<dev.kord.rest.builder.guild/OnboardingPromptOptionBuilder, kotlin/Unit>) // dev.kord.rest.builder.guild/option|option@dev.kord.rest.builder.guild.OnboardingPromptBuilder(kotlin.String;kotlin.Function1<dev.kord.rest.builder.guild.OnboardingPromptOptionBuilder,kotlin.Unit>){}[0]
@@ -8228,6 +8242,7 @@ final inline fun (dev.kord.rest.builder.message.modify/MessageModifyBuilder).dev
 final inline fun (dev.kord.rest.builder.message/MessageBuilder).dev.kord.rest.builder.message/actionRow(kotlin/Function1<dev.kord.rest.builder.component/ActionRowBuilder, kotlin/Unit>) // dev.kord.rest.builder.message/actionRow|actionRow@dev.kord.rest.builder.message.MessageBuilder(kotlin.Function1<dev.kord.rest.builder.component.ActionRowBuilder,kotlin.Unit>){}[0]
 final inline fun (dev.kord.rest.builder.message/MessageBuilder).dev.kord.rest.builder.message/addFile(kotlin/String, io.ktor.client.request.forms/ChannelProvider, kotlin/Function1<dev.kord.rest.builder.message/AttachmentBuilder, kotlin/Unit>): dev.kord.rest/NamedFile // dev.kord.rest.builder.message/addFile|addFile@dev.kord.rest.builder.message.MessageBuilder(kotlin.String;io.ktor.client.request.forms.ChannelProvider;kotlin.Function1<dev.kord.rest.builder.message.AttachmentBuilder,kotlin.Unit>){}[0]
 final inline fun (dev.kord.rest.builder.message/MessageBuilder).dev.kord.rest.builder.message/allowedMentions(kotlin/Function1<dev.kord.rest.builder.message/AllowedMentionsBuilder, kotlin/Unit> = ...) // dev.kord.rest.builder.message/allowedMentions|allowedMentions@dev.kord.rest.builder.message.MessageBuilder(kotlin.Function1<dev.kord.rest.builder.message.AllowedMentionsBuilder,kotlin.Unit>){}[0]
+final inline fun (dev.kord.rest.builder.message/MessageBuilder).dev.kord.rest.builder.message/container(kotlin/Function1<dev.kord.rest.builder.component/ContainerBuilder, kotlin/Unit>) // dev.kord.rest.builder.message/container|container@dev.kord.rest.builder.message.MessageBuilder(kotlin.Function1<dev.kord.rest.builder.component.ContainerBuilder,kotlin.Unit>){}[0]
 final inline fun (dev.kord.rest.builder.message/MessageBuilder).dev.kord.rest.builder.message/embed(kotlin/Function1<dev.kord.rest.builder.message/EmbedBuilder, kotlin/Unit>) // dev.kord.rest.builder.message/embed|embed@dev.kord.rest.builder.message.MessageBuilder(kotlin.Function1<dev.kord.rest.builder.message.EmbedBuilder,kotlin.Unit>){}[0]
 final inline fun (dev.kord.rest.builder.message/MessageBuilder).dev.kord.rest.builder.message/messageFlags(kotlin/Function1<dev.kord.common.entity/MessageFlags.Builder, kotlin/Unit>) // dev.kord.rest.builder.message/messageFlags|messageFlags@dev.kord.rest.builder.message.MessageBuilder(kotlin.Function1<dev.kord.common.entity.MessageFlags.Builder,kotlin.Unit>){}[0]
 final suspend fun (io.ktor.client.statement/HttpResponse).dev.kord.rest.request/errorString(): kotlin/String // dev.kord.rest.request/errorString|errorString@io.ktor.client.statement.HttpResponse(){}[0]