diff --git a/RGB.NET.Core/Decorators/AbstractDecorateable.cs b/RGB.NET.Core/Decorators/AbstractDecorateable.cs
index 94b8f05..d12afcd 100644
--- a/RGB.NET.Core/Decorators/AbstractDecorateable.cs
+++ b/RGB.NET.Core/Decorators/AbstractDecorateable.cs
@@ -12,18 +12,15 @@ namespace RGB.NET.Core
         #region Properties & Fields
 
         private readonly List<T> _decorators = new List<T>();
-        /// <summary>
-        /// Gets a readonly-list of all <see cref="IDecorator"/> attached to this <see cref="IDecoratable{T}"/>.
-        /// </summary>
-        protected IReadOnlyCollection<T> Decorators { get; }
 
-        #endregion
-
-        #region Constructors
-
-        protected AbstractDecoratable()
+        /// <inheritdoc />
+        public IReadOnlyCollection<T> Decorators
         {
-            Decorators = new ReadOnlyCollection<T>(_decorators);
+            get
+            {
+                lock (_decorators)
+                    return new ReadOnlyCollection<T>(_decorators);
+            }
         }
 
         #endregion
diff --git a/RGB.NET.Core/Decorators/AbstractDecorator.cs b/RGB.NET.Core/Decorators/AbstractDecorator.cs
index 381f4f5..50e007c 100644
--- a/RGB.NET.Core/Decorators/AbstractDecorator.cs
+++ b/RGB.NET.Core/Decorators/AbstractDecorator.cs
@@ -1,4 +1,6 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace RGB.NET.Core
 {
@@ -42,16 +44,17 @@ namespace RGB.NET.Core
         /// <summary>
         /// Detaches the decorator from all <see cref="IDecoratable"/> it is currently attached to.
         /// </summary>
-        /// <typeparam name="TDecoratable">The type of the <see cref="IDecoratable"/> this decorator is attached to.</typeparam>
-        /// <typeparam name="TDecorator">The type of this <see cref="IDecorator"/>.</typeparam>
-        protected virtual void Detach<TDecoratable, TDecorator>()
-            where TDecoratable : IDecoratable<TDecorator>
-            where TDecorator : AbstractDecorator
+        protected virtual void Detach()
         {
             List<IDecoratable> decoratables = new List<IDecoratable>(DecoratedObjects);
             foreach (IDecoratable decoratable in decoratables)
-                if (decoratable is TDecoratable typedDecoratable)
-                    typedDecoratable.RemoveDecorator((TDecorator)this);
+            {
+                IEnumerable<Type> types = decoratable.GetType().GetInterfaces().Where(t => t.IsGenericType
+                                                                                        && (t.Name == typeof(IDecoratable<>).Name)
+                                                                                        && t.GenericTypeArguments[0].IsInstanceOfType(this));
+                foreach (Type decoratableType in types)
+                    decoratableType.GetMethod(nameof(IDecoratable<IDecorator>.RemoveDecorator))?.Invoke(decoratable, new object[] { this });
+            }
         }
 
         #endregion
diff --git a/RGB.NET.Core/Decorators/IDecoratable.cs b/RGB.NET.Core/Decorators/IDecoratable.cs
index 9e2a32c..781d9f1 100644
--- a/RGB.NET.Core/Decorators/IDecoratable.cs
+++ b/RGB.NET.Core/Decorators/IDecoratable.cs
@@ -1,4 +1,5 @@
-using System.ComponentModel;
+using System.Collections.Generic;
+using System.ComponentModel;
 
 namespace RGB.NET.Core
 {
@@ -13,9 +14,14 @@ namespace RGB.NET.Core
     /// Represents a basic decoratable for a specific type of <see cref="T:RGB.NET.Core.IDecorator" />
     /// </summary>
     /// <typeparam name="T"></typeparam>
-    public interface IDecoratable<in T> : IDecoratable
+    public interface IDecoratable<T> : IDecoratable
         where T : IDecorator
     {
+        /// <summary>
+        /// Gets a readonly-list of all <see cref="IDecorator"/> attached to this <see cref="IDecoratable{T}"/>.
+        /// </summary>
+        IReadOnlyCollection<T> Decorators { get; }
+
         /// <summary>
         /// Adds an <see cref="IDecorator"/> to the <see cref="IDecoratable"/>.
         /// </summary>
diff --git a/RGB.NET.Decorators/Brush/FlashDecorator.cs b/RGB.NET.Decorators/Brush/FlashDecorator.cs
index 618b243..580fce4 100644
--- a/RGB.NET.Decorators/Brush/FlashDecorator.cs
+++ b/RGB.NET.Decorators/Brush/FlashDecorator.cs
@@ -129,7 +129,7 @@ namespace RGB.NET.Decorators.Brush
                 else
                 {
                     if ((++_repetitionCount >= Repetitions) && (Repetitions > 0))
-                        Detach<IBrush, FlashDecorator>();
+                        Detach();
                     _currentPhaseValue = Attack;
                     _currentPhase = ADSRPhase.Attack;
                 }
diff --git a/RGB.NET.Devices.CoolerMaster/CoolerMasterDeviceProvider.cs b/RGB.NET.Devices.CoolerMaster/CoolerMasterDeviceProvider.cs
index 0f34084..05546aa 100644
--- a/RGB.NET.Devices.CoolerMaster/CoolerMasterDeviceProvider.cs
+++ b/RGB.NET.Devices.CoolerMaster/CoolerMasterDeviceProvider.cs
@@ -132,7 +132,8 @@ namespace RGB.NET.Devices.CoolerMaster
                                         continue;
                             }
 
-                            _CoolerMasterSDK.EnableLedControl(true, index);
+                            if (!_CoolerMasterSDK.EnableLedControl(true, index))
+                                throw new RGBDeviceException("Failed to enable LED control for device " + index);
 
                             device.Initialize(UpdateTrigger);
                             devices.Add(device);
diff --git a/RGB.NET.Devices.CoolerMaster/Enum/CoolerMasterDevicesIndexes.cs b/RGB.NET.Devices.CoolerMaster/Enum/CoolerMasterDevicesIndexes.cs
index cf84cbc..45d8ae2 100644
--- a/RGB.NET.Devices.CoolerMaster/Enum/CoolerMasterDevicesIndexes.cs
+++ b/RGB.NET.Devices.CoolerMaster/Enum/CoolerMasterDevicesIndexes.cs
@@ -69,6 +69,18 @@ namespace RGB.NET.Devices.CoolerMaster
         [DeviceType(RGBDeviceType.Keyboard)]
         CK551 = 13,
 
+        [Description("MM830")]
+        [DeviceType(RGBDeviceType.Mouse)]
+        MM830 = 14,
+
+        [Description("CK530")]
+        [DeviceType(RGBDeviceType.Keyboard)]
+        CK530 = 15,
+
+        [Description("MK850")]
+        [DeviceType(RGBDeviceType.Keyboard)]
+        MK850 = 16,
+
         [DeviceType(RGBDeviceType.None)]
         Default = 0xFFFF
     }
diff --git a/RGB.NET.Devices.Msi/GraphicsCard/MsiGraphicsCardRGBDevice.cs b/RGB.NET.Devices.Msi/GraphicsCard/MsiGraphicsCardRGBDevice.cs
index f5cf4e4..74bd673 100644
--- a/RGB.NET.Devices.Msi/GraphicsCard/MsiGraphicsCardRGBDevice.cs
+++ b/RGB.NET.Devices.Msi/GraphicsCard/MsiGraphicsCardRGBDevice.cs
@@ -41,7 +41,7 @@ namespace RGB.NET.Devices.Msi
             }
 
             //TODO DarthAffe 07.10.2017: We don't know the model, how to save layouts and images?
-            ApplyLayoutFromFile(PathHelper.GetAbsolutePath($@"Layouts\MSI\GraphicsCard\{DeviceInfo.Model.Replace(" ", string.Empty).ToUpper()}.xml"), null);
+            ApplyLayoutFromFile(PathHelper.GetAbsolutePath(this, $@"Layouts\MSI\GraphicsCard\{DeviceInfo.Model.Replace(" ", string.Empty).ToUpper()}.xml"), null);
         }
 
         /// <inheritdoc />
diff --git a/RGB.NET.Devices.Msi/Mainboard/MsiMainboardRGBDevice.cs b/RGB.NET.Devices.Msi/Mainboard/MsiMainboardRGBDevice.cs
index a7e11cb..455e63a 100644
--- a/RGB.NET.Devices.Msi/Mainboard/MsiMainboardRGBDevice.cs
+++ b/RGB.NET.Devices.Msi/Mainboard/MsiMainboardRGBDevice.cs
@@ -39,7 +39,7 @@ namespace RGB.NET.Devices.Msi
             }
 
             //TODO DarthAffe 07.10.2017: We don't know the model, how to save layouts and images?
-            ApplyLayoutFromFile(PathHelper.GetAbsolutePath($@"Layouts\MSI\Mainboards\{DeviceInfo.Model.Replace(" ", string.Empty).ToUpper()}.xml"), null);
+            ApplyLayoutFromFile(PathHelper.GetAbsolutePath(this, $@"Layouts\MSI\Mainboards\{DeviceInfo.Model.Replace(" ", string.Empty).ToUpper()}.xml"), null);
         }
 
         /// <inheritdoc />
diff --git a/RGB.NET.Devices.Msi/Mouse/MsiMouseRGBDevice.cs b/RGB.NET.Devices.Msi/Mouse/MsiMouseRGBDevice.cs
index a153190..bbcbd57 100644
--- a/RGB.NET.Devices.Msi/Mouse/MsiMouseRGBDevice.cs
+++ b/RGB.NET.Devices.Msi/Mouse/MsiMouseRGBDevice.cs
@@ -39,7 +39,7 @@ namespace RGB.NET.Devices.Msi
             }
 
             //TODO DarthAffe 07.10.2017: We don't know the model, how to save layouts and images?
-            ApplyLayoutFromFile(PathHelper.GetAbsolutePath($@"Layouts\MSI\Mouses\{DeviceInfo.Model.Replace(" ", string.Empty).ToUpper()}.xml"), null);
+            ApplyLayoutFromFile(PathHelper.GetAbsolutePath(this, $@"Layouts\MSI\Mouses\{DeviceInfo.Model.Replace(" ", string.Empty).ToUpper()}.xml"), null);
         }
 
         /// <inheritdoc />