diff --git a/DisCatSharp/Entities/Interaction/Components/DiscordLinkButtonComponent.cs b/DisCatSharp/Entities/Interaction/Components/DiscordLinkButtonComponent.cs
index c56973cd6..e0d56f2ae 100644
--- a/DisCatSharp/Entities/Interaction/Components/DiscordLinkButtonComponent.cs
+++ b/DisCatSharp/Entities/Interaction/Components/DiscordLinkButtonComponent.cs
@@ -1,86 +1,106 @@
 // This file is part of the DisCatSharp project.
 //
 // Copyright (c) 2021 AITSYS
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
 // in the Software without restriction, including without limitation the rights
 // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 // copies of the Software, and to permit persons to whom the Software is
 // furnished to do so, subject to the following conditions:
 //
 // The above copyright notice and this permission notice shall be included in all
 // copies or substantial portions of the Software.
 //
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
 using DisCatSharp.Enums;
 using Newtonsoft.Json;
 
 namespace DisCatSharp.Entities
 {
     /// <summary>
     /// Represents a link button. Clicking a link button does not send an interaction.
     /// </summary>
     public class DiscordLinkButtonComponent : DiscordComponent
     {
         /// <summary>
         /// The url to open when pressing this button.
         /// </summary>
         [JsonProperty("url", NullValueHandling = NullValueHandling.Ignore)]
         public string Url { get; set; }
 
         /// <summary>
         /// The text to add to this button. If this is not specified, <see cref="Emoji"/> must be.
         /// </summary>
         [JsonProperty("label", NullValueHandling = NullValueHandling.Ignore)]
         public string Label { get; set; }
 
         /// <summary>
         /// Whether this button can be pressed.
         /// </summary>
         [JsonProperty("disabled", NullValueHandling = NullValueHandling.Ignore)]
         public bool Disabled { get; set; }
 
         /// <summary>
         /// The emoji to add to the button. Can be used in conjunction with a label, or as standalone. Must be added if label is not specified.
         /// </summary>
         [JsonProperty("emoji", NullValueHandling = NullValueHandling.Ignore)]
         public DiscordComponentEmoji Emoji { get; set; }
 
         /// <summary>
         /// Gets the style.
         /// </summary>
         [JsonProperty("style", NullValueHandling = NullValueHandling.Ignore)]
         internal int Style { get; } = 5; // Link = 5; Discord throws 400 otherwise //
 
+        /// <summary>
+        /// Enables this component if it was disabled before.
+        /// </summary>
+        /// <returns>The current component.</returns>
+        public DiscordLinkButtonComponent Enable()
+        {
+            this.Disabled = false;
+            return this;
+        }
+
+        /// <summary>
+        /// Disables this component.
+        /// </summary>
+        /// <returns>The current component.</returns>
+        public DiscordLinkButtonComponent Disable()
+        {
+            this.Disabled = true;
+            return this;
+        }
+
         /// <summary>
         /// Constructs a new <see cref="DiscordLinkButtonComponent"/>. This type of button does not send back and interaction when pressed.
         /// </summary>
         /// <param name="url">The url to set the button to.</param>
         /// <param name="label">The text to display on the button. Can be left blank if <paramref name="emoji"/> is set.</param>
         /// <param name="disabled">Whether or not this button can be pressed.</param>
         /// <param name="emoji">The emoji to set with this button. This is required if <paramref name="label"/> is null or empty.</param>
         public DiscordLinkButtonComponent(string url, string label, bool disabled = false, DiscordComponentEmoji emoji = null) : this()
         {
             this.Url = url;
             this.Label = label;
             this.Disabled = disabled;
             this.Emoji = emoji;
         }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="DiscordLinkButtonComponent"/> class.
         /// </summary>
         internal DiscordLinkButtonComponent()
         {
             this.Type = ComponentType.Button;
         }
     }
 }
diff --git a/DisCatSharp/Entities/Interaction/Components/DiscordSelectComponent.cs b/DisCatSharp/Entities/Interaction/Components/DiscordSelectComponent.cs
index 5b0e61684..9f9fd1fd4 100644
--- a/DisCatSharp/Entities/Interaction/Components/DiscordSelectComponent.cs
+++ b/DisCatSharp/Entities/Interaction/Components/DiscordSelectComponent.cs
@@ -1,93 +1,113 @@
 // This file is part of the DisCatSharp project.
 //
 // Copyright (c) 2021 AITSYS
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
 // in the Software without restriction, including without limitation the rights
 // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 // copies of the Software, and to permit persons to whom the Software is
 // furnished to do so, subject to the following conditions:
 //
 // The above copyright notice and this permission notice shall be included in all
 // copies or substantial portions of the Software.
 //
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using DisCatSharp.Enums;
 using Newtonsoft.Json;
 
 namespace DisCatSharp.Entities
 {
     /// <summary>
     /// A select menu with multiple options to choose from.
     /// </summary>
     public sealed class DiscordSelectComponent : DiscordComponent
     {
         /// <summary>
         /// The options to pick from on this component.
         /// </summary>
         [JsonProperty("options", NullValueHandling = NullValueHandling.Ignore)]
         public IReadOnlyList<DiscordSelectComponentOption> Options { get; internal set; } = Array.Empty<DiscordSelectComponentOption>();
 
         /// <summary>
         /// The text to show when no option is selected.
         /// </summary>
         [JsonProperty("placeholder", NullValueHandling = NullValueHandling.Ignore)]
         public string Placeholder { get; internal set; }
 
         /// <summary>
         /// The minimum amount of options that can be selected. Must be less than or equal to <see cref="MaximumSelectedValues"/>. Defaults to one.
         /// </summary>
         [JsonProperty("min_values", NullValueHandling = NullValueHandling.Ignore)]
         public int? MinimumSelectedValues { get; internal set; }
 
         /// <summary>
         /// The maximum amount of options that can be selected. Must be greater than or equal to zero or <see cref="MinimumSelectedValues"/>. Defaults to one.
         /// </summary>
         [JsonProperty("max_values", NullValueHandling = NullValueHandling.Ignore)]
         public int? MaximumSelectedValues { get; internal set; }
 
         /// <summary>
         /// Whether this select can be used.
         /// </summary>
         [JsonProperty("disabled", NullValueHandling = NullValueHandling.Ignore)]
         public bool Disabled { get; internal set; }
 
+        /// <summary>
+        /// Enables this component if it was disabled before.
+        /// </summary>
+        /// <returns>The current component.</returns>
+        public DiscordSelectComponent Enable()
+        {
+            this.Disabled = false;
+            return this;
+        }
+
+        /// <summary>
+        /// Disables this component.
+        /// </summary>
+        /// <returns>The current component.</returns>
+        public DiscordSelectComponent Disable()
+        {
+            this.Disabled = true;
+            return this;
+        }
+
         /// <summary>
         /// Constructs a new <see cref="DiscordSelectComponent"/>.
         /// </summary>
         /// <param name="customId">The Id to assign to the button. This is sent back when a user presses it.</param>
         /// <param name="options">Array of options</param>
         /// <param name="placeholder">Text to show if no option is slected.</param>
         /// <param name="minOptions">Minmum count of selectable options.</param>
         /// <param name="maxOptions">Maximum count of selectable options.</param>
         /// <param name="disabled">Whether this button should be initialized as being disabled. User sees a greyed out button that cannot be interacted with.</param>
         public DiscordSelectComponent(string customId, string placeholder, IEnumerable<DiscordSelectComponentOption> options, int minOptions = 1, int maxOptions = 1, bool disabled = false) : this()
         {
             this.CustomId = customId;
             this.Disabled = disabled;
             this.Options = options.ToArray();
             this.Placeholder = placeholder;
             this.MinimumSelectedValues = minOptions;
             this.MaximumSelectedValues = maxOptions;
         }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="DiscordSelectComponent"/> class.
         /// </summary>
         internal DiscordSelectComponent()
         {
             this.Type = ComponentType.Select;
         }
     }
 }