diff --git a/README.md b/README.md
index 860a2acb3..13bbe2d8d 100644
--- a/README.md
+++ b/README.md
@@ -22,6 +22,7 @@
 	* [V90.## (2024-11-xx - Build 2411 - November 2024)](v90-24-11-xx--build-2411---november-2024)
 	    * [Support for .NET 7](#support-for-net-7)
 		* [`KryptonButton` Properties](#kryptonbutton-properties)
+		* [API Changes](#api-changes)
 	* [V80.## (2023-11-14 - Build 2311 - November 2023)](#v80-2023-11-14---build-2311---november-2023)
 		* [Support for .NET Core 3.1 and .NET 5](#support-for-net-core-31-and-net-5)
 		* [KryptonMessageBoxButtons](#kryptonmessageboxbuttons)
@@ -185,6 +186,9 @@ As of V90.##, support for .NET 7 has been removed due to their release cadences.
 ### `KryptonButton` Properties
 Some properties previously found in the root such as, `ShowSplitOption`, `UseAsADialogButton`, `UseAsUACElevationButton` and `UACShieldIconSize` are now located in the `Values` section.
 
+### API Changes
+If using `KryptonAboutToolkit`, please note that this has been superceeded by `KryptonAboutBox`. Or if you use `KryptonThemeBrowserForm`, it has now been moved to `KryptonThemeBrowser` as the public facing API.
+
 ## V80.## (2023-11-14 - Build 2311 - November 2023)
 There are list of changes that have occurred during the development of the V80.## version
 
diff --git a/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonBorderEdgeActionList.cs b/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonBorderEdgeActionList.cs
index efabb0144..9e73f916b 100644
--- a/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonBorderEdgeActionList.cs	
+++ b/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonBorderEdgeActionList.cs	
@@ -34,18 +34,20 @@ public KryptonBorderEdgeActionList(KryptonBorderEdgeDesigner owner)
             if (_borderEdge != null)
             {
                 // Get access to the actual Orientation property
-                PropertyDescriptor orientationProp = TypeDescriptor.GetProperties(_borderEdge)[nameof(Orientation)];
+                PropertyDescriptor? orientationProp = TypeDescriptor.GetProperties(_borderEdge)[nameof(Orientation)];
 
                 // If we succeeded in getting the property
                 if (orientationProp != null)
                 {
                     // Decide on the next action to take given the current setting
-                    _action = (Orientation)orientationProp.GetValue(_borderEdge) == Orientation.Vertical ? "Horizontal border orientation" : "Vertical border orientation";
+                    _action = (Orientation)orientationProp.GetValue(_borderEdge) == Orientation.Vertical
+                        ? "Horizontal border orientation"
+                        : "Vertical border orientation";
                 }
             }
 
             // Cache service used to notify when a property has changed
-            _service = (IComponentChangeService)GetService(typeof(IComponentChangeService));
+            _service = (GetService(typeof(IComponentChangeService)) as IComponentChangeService)!;
         }
         #endregion
 
@@ -55,11 +57,11 @@ public KryptonBorderEdgeActionList(KryptonBorderEdgeDesigner owner)
         /// </summary>
         public PaletteBorderStyle BorderStyle
         {
-            get => _borderEdge.BorderStyle;
+            get => _borderEdge!.BorderStyle;
 
             set
             {
-                if (_borderEdge.BorderStyle != value)
+                if (_borderEdge!.BorderStyle != value)
                 {
                     _service.OnComponentChanged(_borderEdge, null, _borderEdge.BorderStyle, value);
                     _borderEdge.BorderStyle = value;
@@ -72,11 +74,11 @@ public PaletteBorderStyle BorderStyle
         /// </summary>
         public bool AutoSize
         {
-            get => _borderEdge.AutoSize;
+            get => _borderEdge!.AutoSize;
 
             set
             {
-                if (_borderEdge.AutoSize != value)
+                if (_borderEdge!.AutoSize != value)
                 {
                     _service.OnComponentChanged(_borderEdge, null, _borderEdge.AutoSize, value);
                     _borderEdge.AutoSize = value;
@@ -89,11 +91,11 @@ public bool AutoSize
         /// </summary>
         public DockStyle Dock
         {
-            get => _borderEdge.Dock;
+            get => _borderEdge!.Dock;
 
             set
             {
-                if (_borderEdge.Dock != value)
+                if (_borderEdge!.Dock != value)
                 {
                     _service.OnComponentChanged(_borderEdge, null, _borderEdge.Dock, value);
                     _borderEdge.Dock = value;
@@ -106,11 +108,11 @@ public DockStyle Dock
         /// </summary>
         public PaletteMode PaletteMode
         {
-            get => _borderEdge.PaletteMode;
+            get => _borderEdge!.PaletteMode;
 
             set
             {
-                if (_borderEdge.PaletteMode != value)
+                if (_borderEdge!.PaletteMode != value)
                 {
                     _service.OnComponentChanged(_borderEdge, null, _borderEdge.PaletteMode, value);
                     _borderEdge.PaletteMode = value;
@@ -162,7 +164,7 @@ private void OnOrientationClick(object sender, EventArgs e)
                 _action = orientation == Orientation.Vertical ? "Horizontal border orientation" : "Vertical border orientation";
 
                 // Get access to the actual Orientation property
-                PropertyDescriptor orientationProp = TypeDescriptor.GetProperties(_borderEdge)[nameof(Orientation)];
+                PropertyDescriptor? orientationProp = TypeDescriptor.GetProperties(_borderEdge)[nameof(Orientation)];
 
                 // If we succeeded in getting the property
                 // Update the actual property with the new value
diff --git a/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonBreadCrumbActionList.cs b/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonBreadCrumbActionList.cs
index 3057ab5b9..2ab633ea6 100644
--- a/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonBreadCrumbActionList.cs	
+++ b/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonBreadCrumbActionList.cs	
@@ -41,11 +41,11 @@ public KryptonBreadCrumbActionList(KryptonBreadCrumbDesigner owner)
         /// </summary>
         public PaletteBackStyle ControlBackStyle
         {
-            get => _breadCrumb.ControlBackStyle;
+            get => _breadCrumb!.ControlBackStyle;
 
             set
             {
-                if (_breadCrumb.ControlBackStyle != value)
+                if (_breadCrumb!.ControlBackStyle != value)
                 {
                     _service.OnComponentChanged(_breadCrumb, null, _breadCrumb.ControlBackStyle, value);
                     _breadCrumb.ControlBackStyle = value;
@@ -58,11 +58,11 @@ public PaletteBackStyle ControlBackStyle
         /// </summary>
         public PaletteBorderStyle ControlBorderStyle
         {
-            get => _breadCrumb.ControlBorderStyle;
+            get => _breadCrumb!.ControlBorderStyle;
 
             set
             {
-                if (_breadCrumb.ControlBorderStyle != value)
+                if (_breadCrumb!.ControlBorderStyle != value)
                 {
                     _service.OnComponentChanged(_breadCrumb, null, _breadCrumb.ControlBorderStyle, value);
                     _breadCrumb.ControlBorderStyle = value;
@@ -75,11 +75,11 @@ public PaletteBorderStyle ControlBorderStyle
         /// </summary>
         public ButtonStyle CrumbButtonStyle
         {
-            get => _breadCrumb.CrumbButtonStyle;
+            get => _breadCrumb!.CrumbButtonStyle;
 
             set
             {
-                if (_breadCrumb.CrumbButtonStyle != value)
+                if (_breadCrumb!.CrumbButtonStyle != value)
                 {
                     _service.OnComponentChanged(_breadCrumb, null, _breadCrumb.CrumbButtonStyle, value);
                     _breadCrumb.CrumbButtonStyle = value;
@@ -92,11 +92,11 @@ public ButtonStyle CrumbButtonStyle
         /// </summary>
         public PaletteMode PaletteMode
         {
-            get => _breadCrumb.PaletteMode;
+            get => _breadCrumb!.PaletteMode;
 
             set
             {
-                if (_breadCrumb.PaletteMode != value)
+                if (_breadCrumb!.PaletteMode != value)
                 {
                     _service.OnComponentChanged(_breadCrumb, null, _breadCrumb.PaletteMode, value);
                     _breadCrumb.PaletteMode = value;
diff --git a/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonButtonActionList.cs b/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonButtonActionList.cs
index 9970e127d..b9ea17317 100644
--- a/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonButtonActionList.cs	
+++ b/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonButtonActionList.cs	
@@ -41,11 +41,11 @@ public KryptonButtonActionList(KryptonButtonDesigner owner)
         /// </summary>
         public ButtonStyle ButtonStyle
         {
-            get => _button.ButtonStyle;
+            get => _button!.ButtonStyle;
 
             set
             {
-                if (_button.ButtonStyle != value)
+                if (_button!.ButtonStyle != value)
                 {
                     _service.OnComponentChanged(_button, null, _button.ButtonStyle, value);
                     _button.ButtonStyle = value;
@@ -57,11 +57,11 @@ public ButtonStyle ButtonStyle
         /// <value>The dialog result.</value>
         public DialogResult DialogResult
         {
-            get => _button.DialogResult;
+            get => _button!.DialogResult;
 
             set
             {
-                if (_button.DialogResult != value)
+                if (_button!.DialogResult != value)
                 {
                     _service.OnComponentChanged(_button, null, _button.DialogResult, value);
                     _button.DialogResult = value;
@@ -73,11 +73,11 @@ public DialogResult DialogResult
         /// <value>The krypton context menu.</value>
         public KryptonContextMenu? KryptonContextMenu
         {
-            get => _button.KryptonContextMenu;
+            get => _button!.KryptonContextMenu;
 
             set
             {
-                if (_button.KryptonContextMenu != value)
+                if (_button!.KryptonContextMenu != value)
                 {
                     _service.OnComponentChanged(_button, null, _button.KryptonContextMenu, value);
 
@@ -91,11 +91,11 @@ public KryptonContextMenu? KryptonContextMenu
         /// </summary>
         public VisualOrientation Orientation
         {
-            get => _button.Orientation;
+            get => _button!.Orientation;
 
             set
             {
-                if (_button.Orientation != value)
+                if (_button!.Orientation != value)
                 {
                     _service.OnComponentChanged(_button, null, _button.Orientation, value);
                     _button.Orientation = value;
@@ -108,11 +108,11 @@ public VisualOrientation Orientation
         /// </summary>
         public string Text
         {
-            get => _button.Values.Text;
+            get => _button!.Values.Text;
 
             set
             {
-                if (_button.Values.Text != value)
+                if (_button!.Values.Text != value)
                 {
                     _service.OnComponentChanged(_button, null, _button.Values.Text, value);
                     _button.Values.Text = value;
@@ -125,11 +125,11 @@ public string Text
         /// </summary>
         public string ExtraText
         {
-            get => _button.Values.ExtraText;
+            get => _button!.Values.ExtraText;
 
             set
             {
-                if (_button.Values.ExtraText != value)
+                if (_button!.Values.ExtraText != value)
                 {
                     _service.OnComponentChanged(_button, null, _button.Values.ExtraText, value);
                     _button.Values.ExtraText = value;
@@ -142,11 +142,11 @@ public string ExtraText
         /// </summary>
         public Image? Image
         {
-            get => _button.Values.Image;
+            get => _button!.Values.Image;
 
             set
             {
-                if (_button.Values.Image != value)
+                if (_button!.Values.Image != value)
                 {
                     _service.OnComponentChanged(_button, null, _button.Values.Image, value);
                     _button.Values.Image = value;
@@ -159,11 +159,11 @@ public Image? Image
         /// </summary>
         public PaletteMode PaletteMode
         {
-            get => _button.PaletteMode;
+            get => _button!.PaletteMode;
 
             set
             {
-                if (_button.PaletteMode != value)
+                if (_button!.PaletteMode != value)
                 {
                     _service.OnComponentChanged(_button, null, _button.PaletteMode, value);
                     _button.PaletteMode = value;
@@ -173,13 +173,13 @@ public PaletteMode PaletteMode
 
         /// <summary>Gets or sets the font.</summary>
         /// <value>The font.</value>
-        public Font StateCommonShortTextFont
+        public Font? StateCommonShortTextFont
         {
-            get => _button.StateCommon.Content.ShortText.Font;
+            get => _button!.StateCommon.Content.ShortText.Font;
 
             set
             {
-                if (_button.StateCommon.Content.ShortText.Font != value)
+                if (_button!.StateCommon.Content.ShortText.Font != value)
                 {
                     _service.OnComponentChanged(_button, null, _button.StateCommon.Content.ShortText.Font, value);
 
@@ -190,13 +190,13 @@ public Font StateCommonShortTextFont
 
         /// <summary>Gets or sets the font.</summary>
         /// <value>The font.</value>
-        public Font StateCommonLongTextFont
+        public Font? StateCommonLongTextFont
         {
-            get => _button.StateCommon.Content.LongText.Font;
+            get => _button!.StateCommon.Content.LongText.Font;
 
             set
             {
-                if (_button.StateCommon.Content.LongText.Font != value)
+                if (_button!.StateCommon.Content.LongText.Font != value)
                 {
                     _service.OnComponentChanged(_button, null, _button.StateCommon.Content.LongText.Font, value);
 
@@ -210,11 +210,11 @@ public Font StateCommonLongTextFont
         [DefaultValue(GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE)]
         public float StateCommonCornerRoundingRadius
         {
-            get => _button.StateCommon.Border.Rounding;
+            get => _button!.StateCommon.Border.Rounding;
 
             set
             {
-                if (_button.StateCommon.Border.Rounding != value)
+                if (_button!.StateCommon.Border.Rounding != value)
                 {
                     _service.OnComponentChanged(_button, null, _button.StateCommon.Border.Rounding, value);
 
@@ -228,11 +228,11 @@ public float StateCommonCornerRoundingRadius
         [DefaultValue(false)]
         public bool UseAsUACElevatedButton
         {
-            get => _button.Values.UseAsUACElevationButton;
+            get => _button!.Values.UseAsUACElevationButton;
 
             set
             {
-                if (_button.Values.UseAsUACElevationButton != value)
+                if (_button!.Values.UseAsUACElevationButton != value)
                 {
                     _service.OnComponentChanged(_button, null, _button.Values.UseAsUACElevationButton, value);
 
diff --git a/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonCheckBoxActionList.cs b/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonCheckBoxActionList.cs
index 9433d8478..74309aa3c 100644
--- a/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonCheckBoxActionList.cs	
+++ b/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonCheckBoxActionList.cs	
@@ -41,11 +41,11 @@ public KryptonCheckBoxActionList(KryptonCheckBoxDesigner owner)
         /// </summary>
         public bool Checked
         {
-            get => _checkBox.Checked;
+            get => _checkBox!.Checked;
 
             set
             {
-                if (_checkBox.Checked != value)
+                if (_checkBox!.Checked != value)
                 {
                     _service.OnComponentChanged(_checkBox, null, _checkBox.Checked, value);
                     _checkBox.Checked = value;
@@ -58,11 +58,11 @@ public bool Checked
         /// </summary>
         public CheckState CheckState
         {
-            get => _checkBox.CheckState;
+            get => _checkBox!.CheckState;
 
             set
             {
-                if (_checkBox.CheckState != value)
+                if (_checkBox!.CheckState != value)
                 {
                     _service.OnComponentChanged(_checkBox, null, _checkBox.CheckState, value);
                     _checkBox.CheckState = value;
@@ -75,11 +75,11 @@ public CheckState CheckState
         /// </summary>
         public bool ThreeState
         {
-            get => _checkBox.ThreeState;
+            get => _checkBox!.ThreeState;
 
             set
             {
-                if (_checkBox.ThreeState != value)
+                if (_checkBox!.ThreeState != value)
                 {
                     _service.OnComponentChanged(_checkBox, null, _checkBox.ThreeState, value);
                     _checkBox.ThreeState = value;
@@ -92,11 +92,11 @@ public bool ThreeState
         /// </summary>
         public bool AutoCheck
         {
-            get => _checkBox.AutoCheck;
+            get => _checkBox!.AutoCheck;
 
             set
             {
-                if (_checkBox.AutoCheck != value)
+                if (_checkBox!.AutoCheck != value)
                 {
                     _service.OnComponentChanged(_checkBox, null, _checkBox.AutoCheck, value);
                     _checkBox.AutoCheck = value;
@@ -108,11 +108,11 @@ public bool AutoCheck
         /// <value>The Krypton Context Menu.</value>
         public KryptonContextMenu? KryptonContextMenu
         {
-            get => _checkBox.KryptonContextMenu;
+            get => _checkBox!.KryptonContextMenu;
 
             set
             {
-                if (_checkBox.KryptonContextMenu != value)
+                if (_checkBox!.KryptonContextMenu != value)
                 {
                     _service.OnComponentChanged(_checkBox, null, _checkBox.KryptonContextMenu, value);
 
@@ -126,11 +126,11 @@ public KryptonContextMenu? KryptonContextMenu
         /// </summary>
         public LabelStyle LabelStyle
         {
-            get => _checkBox.LabelStyle;
+            get => _checkBox!.LabelStyle;
 
             set
             {
-                if (_checkBox.LabelStyle != value)
+                if (_checkBox!.LabelStyle != value)
                 {
                     _service.OnComponentChanged(_checkBox, null, _checkBox.LabelStyle, value);
                     _checkBox.LabelStyle = value;
@@ -143,11 +143,11 @@ public LabelStyle LabelStyle
         /// </summary>
         public VisualOrientation Orientation
         {
-            get => _checkBox.Orientation;
+            get => _checkBox!.Orientation;
 
             set
             {
-                if (_checkBox.Orientation != value)
+                if (_checkBox!.Orientation != value)
                 {
                     _service.OnComponentChanged(_checkBox, null, _checkBox.Orientation, value);
                     _checkBox.Orientation = value;
@@ -160,11 +160,11 @@ public VisualOrientation Orientation
         /// </summary>
         public string Text
         {
-            get => _checkBox.Values.Text;
+            get => _checkBox!.Values.Text;
 
             set
             {
-                if (_checkBox.Values.Text != value)
+                if (_checkBox!.Values.Text != value)
                 {
                     _service.OnComponentChanged(_checkBox, null, _checkBox.Values.Text, value);
                     _checkBox.Values.Text = value;
@@ -177,11 +177,11 @@ public string Text
         /// </summary>
         public string ExtraText
         {
-            get => _checkBox.Values.ExtraText;
+            get => _checkBox!.Values.ExtraText;
 
             set
             {
-                if (_checkBox.Values.ExtraText != value)
+                if (_checkBox!.Values.ExtraText != value)
                 {
                     _service.OnComponentChanged(_checkBox, null, _checkBox.Values.ExtraText, value);
                     _checkBox.Values.ExtraText = value;
@@ -194,11 +194,11 @@ public string ExtraText
         /// </summary>
         public Image? Image
         {
-            get => _checkBox.Values.Image;
+            get => _checkBox!.Values.Image;
 
             set
             {
-                if (_checkBox.Values.Image != value)
+                if (_checkBox!.Values.Image != value)
                 {
                     _service.OnComponentChanged(_checkBox, null, _checkBox.Values.Image, value);
                     _checkBox.Values.Image = value;
@@ -211,11 +211,11 @@ public Image? Image
         /// </summary>
         public PaletteMode PaletteMode
         {
-            get => _checkBox.PaletteMode;
+            get => _checkBox!.PaletteMode;
 
             set
             {
-                if (_checkBox.PaletteMode != value)
+                if (_checkBox!.PaletteMode != value)
                 {
                     _service.OnComponentChanged(_checkBox, null, _checkBox.PaletteMode, value);
                     _checkBox.PaletteMode = value;
@@ -225,13 +225,13 @@ public PaletteMode PaletteMode
 
         /// <summary>Gets or sets the font.</summary>
         /// <value>The font.</value>
-        public Font StateCommonShortTextFont
+        public Font? StateCommonShortTextFont
         {
-            get => _checkBox.StateCommon.ShortText.Font;
+            get => _checkBox!.StateCommon.ShortText.Font;
 
             set
             {
-                if (_checkBox.StateCommon.ShortText.Font != value)
+                if (_checkBox!.StateCommon.ShortText.Font != value)
                 {
                     _service.OnComponentChanged(_checkBox, null, _checkBox.StateCommon.ShortText.Font, value);
 
@@ -242,13 +242,13 @@ public Font StateCommonShortTextFont
 
         /// <summary>Gets or sets the font.</summary>
         /// <value>The font.</value>
-        public Font StateCommonLongTextFont
+        public Font? StateCommonLongTextFont
         {
-            get => _checkBox.StateCommon.LongText.Font;
+            get => _checkBox!.StateCommon.LongText.Font;
 
             set
             {
-                if (_checkBox.StateCommon.LongText.Font != value)
+                if (_checkBox!.StateCommon.LongText.Font != value)
                 {
                     _service.OnComponentChanged(_checkBox, null, _checkBox.StateCommon.LongText.Font, value);
 
@@ -261,11 +261,11 @@ public Font StateCommonLongTextFont
         /// <value>The long text trim.</value>
         public PaletteTextTrim LongTextTrim
         {
-            get => _checkBox.StateCommon.LongText.Trim;
+            get => _checkBox!.StateCommon.LongText.Trim;
 
             set
             {
-                if (_checkBox.StateCommon.LongText.Trim != value)
+                if (_checkBox!.StateCommon.LongText.Trim != value)
                 {
                     _service.OnComponentChanged(_checkBox, null, _checkBox.StateCommon.LongText.Trim, value);
 
@@ -278,11 +278,11 @@ public PaletteTextTrim LongTextTrim
         /// <value>The short text trim.</value>
         public PaletteTextTrim ShortTextTrim
         {
-            get => _checkBox.StateCommon.ShortText.Trim;
+            get => _checkBox!.StateCommon.ShortText.Trim;
 
             set
             {
-                if (_checkBox.StateCommon.ShortText.Trim != value)
+                if (_checkBox!.StateCommon.ShortText.Trim != value)
                 {
                     _service.OnComponentChanged(_checkBox, null, _checkBox.StateCommon.ShortText.Trim, value);
 
diff --git a/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonCheckButtonActionList.cs b/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonCheckButtonActionList.cs
index 1cfac74bd..a7380c2a0 100644
--- a/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonCheckButtonActionList.cs	
+++ b/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonCheckButtonActionList.cs	
@@ -16,7 +16,7 @@ internal class KryptonCheckButtonActionList : KryptonButtonActionList
     {
         #region Instance Fields
         private readonly KryptonCheckButton? _checkButton;
-        private readonly IComponentChangeService _service;
+        private readonly IComponentChangeService? _service;
         private string _action;
         #endregion
 
@@ -35,7 +35,7 @@ public KryptonCheckButtonActionList(KryptonCheckButtonDesigner owner)
             if (_checkButton != null)
             {
                 // Get access to the actual Orientation property
-                PropertyDescriptor checkedProp = TypeDescriptor.GetProperties(_checkButton)[nameof(Checked)];
+                PropertyDescriptor? checkedProp = TypeDescriptor.GetProperties(_checkButton)[nameof(Checked)];
 
                 // If we succeeded in getting the property
                 if (checkedProp != null)
@@ -46,7 +46,7 @@ public KryptonCheckButtonActionList(KryptonCheckButtonDesigner owner)
             }
 
             // Cache service used to notify when a property has changed
-            _service = (IComponentChangeService)GetService(typeof(IComponentChangeService));
+            _service = GetService(typeof(IComponentChangeService)) as IComponentChangeService;
         }
         #endregion
 
@@ -56,13 +56,13 @@ public KryptonCheckButtonActionList(KryptonCheckButtonDesigner owner)
         /// </summary>
         public bool Checked
         {
-            get => _checkButton.Checked;
+            get => _checkButton!.Checked;
 
             set
             {
-                if (_checkButton.Checked != value)
+                if (_checkButton!.Checked != value)
                 {
-                    _service.OnComponentChanged(_checkButton, null, _checkButton.Checked, value);
+                    _service?.OnComponentChanged(_checkButton, null, _checkButton.Checked, value);
                     _checkButton.Checked = value;
                 }
             }
diff --git a/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonCheckedListBoxActionList.cs b/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonCheckedListBoxActionList.cs
index 92c5ee813..0cf420d26 100644
--- a/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonCheckedListBoxActionList.cs	
+++ b/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonCheckedListBoxActionList.cs	
@@ -41,11 +41,11 @@ public KryptonCheckedListBoxActionList(KryptonCheckedListBoxDesigner owner)
         /// </summary>
         public ButtonStyle ItemStyle
         {
-            get => _checkedListBox.ItemStyle;
+            get => _checkedListBox!.ItemStyle;
 
             set
             {
-                if (_checkedListBox.ItemStyle != value)
+                if (_checkedListBox!.ItemStyle != value)
                 {
                     _service.OnComponentChanged(_checkedListBox, null, _checkedListBox.ItemStyle, value);
                     _checkedListBox.ItemStyle = value;
@@ -58,11 +58,11 @@ public ButtonStyle ItemStyle
         /// </summary>
         public PaletteBackStyle BackStyle
         {
-            get => _checkedListBox.BackStyle;
+            get => _checkedListBox!.BackStyle;
 
             set
             {
-                if (_checkedListBox.BackStyle != value)
+                if (_checkedListBox!.BackStyle != value)
                 {
                     _service.OnComponentChanged(_checkedListBox, null, _checkedListBox.BackStyle, value);
                     _checkedListBox.BackStyle = value;
@@ -75,11 +75,11 @@ public PaletteBackStyle BackStyle
         /// </summary>
         public PaletteBorderStyle BorderStyle
         {
-            get => _checkedListBox.BorderStyle;
+            get => _checkedListBox!.BorderStyle;
 
             set
             {
-                if (_checkedListBox.BorderStyle != value)
+                if (_checkedListBox!.BorderStyle != value)
                 {
                     _service.OnComponentChanged(_checkedListBox, null, _checkedListBox.BorderStyle, value);
                     _checkedListBox.BorderStyle = value;
@@ -91,11 +91,11 @@ public PaletteBorderStyle BorderStyle
         /// <value>The Krypton Context Menu.</value>
         public KryptonContextMenu? KryptonContextMenu
         {
-            get => _checkedListBox.KryptonContextMenu;
+            get => _checkedListBox!.KryptonContextMenu;
 
             set
             {
-                if (_checkedListBox.KryptonContextMenu != value)
+                if (_checkedListBox!.KryptonContextMenu != value)
                 {
                     _service.OnComponentChanged(_checkedListBox, null, _checkedListBox.KryptonContextMenu, value);
 
@@ -109,11 +109,11 @@ public KryptonContextMenu? KryptonContextMenu
         /// </summary>
         public CheckedSelectionMode SelectionMode
         {
-            get => _checkedListBox.SelectionMode;
+            get => _checkedListBox!.SelectionMode;
 
             set
             {
-                if (_checkedListBox.SelectionMode != value)
+                if (_checkedListBox!.SelectionMode != value)
                 {
                     _service.OnComponentChanged(_checkedListBox, null, _checkedListBox.SelectionMode, value);
                     _checkedListBox.SelectionMode = value;
@@ -126,11 +126,11 @@ public CheckedSelectionMode SelectionMode
         /// </summary>
         public bool Sorted
         {
-            get => _checkedListBox.Sorted;
+            get => _checkedListBox!.Sorted;
 
             set
             {
-                if (_checkedListBox.Sorted != value)
+                if (_checkedListBox!.Sorted != value)
                 {
                     _service.OnComponentChanged(_checkedListBox, null, _checkedListBox.Sorted, value);
                     _checkedListBox.Sorted = value;
@@ -143,11 +143,11 @@ public bool Sorted
         /// </summary>
         public bool CheckOnClick
         {
-            get => _checkedListBox.CheckOnClick;
+            get => _checkedListBox!.CheckOnClick;
 
             set
             {
-                if (_checkedListBox.CheckOnClick != value)
+                if (_checkedListBox!.CheckOnClick != value)
                 {
                     _service.OnComponentChanged(_checkedListBox, null, _checkedListBox.CheckOnClick, value);
                     _checkedListBox.CheckOnClick = value;
@@ -160,11 +160,11 @@ public bool CheckOnClick
         /// </summary>
         public PaletteMode PaletteMode
         {
-            get => _checkedListBox.PaletteMode;
+            get => _checkedListBox!.PaletteMode;
 
             set
             {
-                if (_checkedListBox.PaletteMode != value)
+                if (_checkedListBox!.PaletteMode != value)
                 {
                     _service.OnComponentChanged(_checkedListBox, null, _checkedListBox.PaletteMode, value);
                     _checkedListBox.PaletteMode = value;
@@ -174,13 +174,13 @@ public PaletteMode PaletteMode
 
         /// <summary>Gets or sets the font.</summary>
         /// <value>The font.</value>
-        public Font StateCommonShortTextFont
+        public Font? StateCommonShortTextFont
         {
-            get => _checkedListBox.StateCommon.Item.Content.ShortText.Font;
+            get => _checkedListBox!.StateCommon!.Item.Content.ShortText.Font;
 
             set
             {
-                if (_checkedListBox.StateCommon.Item.Content.ShortText.Font != value)
+                if (_checkedListBox!.StateCommon!.Item.Content.ShortText.Font != value)
                 {
                     _service.OnComponentChanged(_checkedListBox, null, _checkedListBox.StateCommon.Item.Content.ShortText.Font, value);
 
@@ -191,13 +191,13 @@ public Font StateCommonShortTextFont
 
         /// <summary>Gets or sets the font.</summary>
         /// <value>The font.</value>
-        public Font StateCommonLongTextFont
+        public Font? StateCommonLongTextFont
         {
-            get => _checkedListBox.StateCommon.Item.Content.LongText.Font;
+            get => _checkedListBox!.StateCommon!.Item.Content.LongText.Font;
 
             set
             {
-                if (_checkedListBox.StateCommon.Item.Content.LongText.Font != value)
+                if (_checkedListBox!.StateCommon!.Item.Content.LongText.Font != value)
                 {
                     _service.OnComponentChanged(_checkedListBox, null, _checkedListBox.StateCommon.Item.Content.LongText.Font, value);
 
@@ -211,11 +211,11 @@ public Font StateCommonLongTextFont
         [DefaultValue(GlobalStaticValues.PRIMARY_CORNER_ROUNDING_VALUE)]
         public float StateCommonCornerRoundingRadius
         {
-            get => _checkedListBox.StateCommon.Border.Rounding;
+            get => _checkedListBox!.StateCommon!.Border.Rounding;
 
             set
             {
-                if (_checkedListBox.StateCommon.Border.Rounding != value)
+                if (_checkedListBox!.StateCommon!.Border.Rounding != value)
                 {
                     _service.OnComponentChanged(_checkedListBox, null, _checkedListBox.StateCommon.Border.Rounding, value);
 
diff --git a/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonCommandLinkButtonActionList.cs b/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonCommandLinkButtonActionList.cs
index 480071a6e..8554b41fc 100644
--- a/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonCommandLinkButtonActionList.cs	
+++ b/Source/Krypton Components/Krypton.Toolkit/Designers/Action Lists/KryptonCommandLinkButtonActionList.cs	
@@ -104,7 +104,7 @@ public string Description
         /// <summary>
         /// Gets and sets the button image.
         /// </summary>
-        public Image Image
+        public Image? Image
         {
             get => _button!.CommandLinkImageValues.Image;