diff --git a/ChartJs.Blazor/ChartJS/BarChart/BarConfig.cs b/ChartJs.Blazor/ChartJS/BarChart/BarConfig.cs
index d062548..1c04673 100644
--- a/ChartJs.Blazor/ChartJS/BarChart/BarConfig.cs
+++ b/ChartJs.Blazor/ChartJS/BarChart/BarConfig.cs
@@ -9,6 +9,6 @@ namespace ChartJs.Blazor.ChartJS.BarChart
     /// </summary>
     public class BarConfig : ConfigBase<BarOptions, BarData>
     {
-        public BarConfig(ChartTypes type = null) : base(type ?? ChartTypes.Bar) { }
+        public BarConfig(ChartType type = null) : base(type ?? ChartType.Bar) { }
     }
 }
\ No newline at end of file
diff --git a/ChartJs.Blazor/ChartJS/BarChart/Dataset/BaseBarDataset.cs b/ChartJs.Blazor/ChartJS/BarChart/Dataset/BaseBarDataset.cs
index 8fe5e51..5d39f55 100644
--- a/ChartJs.Blazor/ChartJS/BarChart/Dataset/BaseBarDataset.cs
+++ b/ChartJs.Blazor/ChartJS/BarChart/Dataset/BaseBarDataset.cs
@@ -20,7 +20,7 @@ public BaseBarDataset(IEnumerable<TData> data) : this()
         public BaseBarDataset() { }
 
 
-        public override ChartTypes Type => ChartTypes.Bar;
+        public override ChartType Type => ChartType.Bar;
 
         /// <summary>
         /// The label for the dataset which appears in the legend and tooltips.
@@ -42,7 +42,7 @@ public BaseBarDataset() { }
         /// <summary>
         /// Which edge to skip drawing the border for. 
         /// </summary>
-        public Positions BorderSkipped { get; set; }
+        public Position BorderSkipped { get; set; }
 
         /// <summary>
         /// The ID of the group to which this dataset belongs to (when stacked, each group will be a separate stack)
diff --git a/ChartJs.Blazor/ChartJS/BubbleChart/BubbleConfig.cs b/ChartJs.Blazor/ChartJS/BubbleChart/BubbleConfig.cs
index e5bdc05..d050a5b 100644
--- a/ChartJs.Blazor/ChartJS/BubbleChart/BubbleConfig.cs
+++ b/ChartJs.Blazor/ChartJS/BubbleChart/BubbleConfig.cs
@@ -5,6 +5,6 @@ namespace ChartJs.Blazor.ChartJS.BubbleChart
 {
     public class BubbleConfig : ConfigBase<BubbleOptions, BubbleData>
     {
-        public BubbleConfig() : base(ChartTypes.Bubble) { }
+        public BubbleConfig() : base(ChartType.Bubble) { }
     }
 }
\ No newline at end of file
diff --git a/ChartJs.Blazor/ChartJS/BubbleChart/BubbleDataset.cs b/ChartJs.Blazor/ChartJS/BubbleChart/BubbleDataset.cs
index bd1aa06..b33665c 100644
--- a/ChartJs.Blazor/ChartJS/BubbleChart/BubbleDataset.cs
+++ b/ChartJs.Blazor/ChartJS/BubbleChart/BubbleDataset.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using ChartJs.Blazor.ChartJS.Common;
 using ChartJs.Blazor.ChartJS.Common.Enums;
 using ChartJs.Blazor.Util;
 
@@ -25,13 +26,13 @@ public class BubbleDataset
 
         public List<BubbleDataPoint> Data { get; set; } = new List<BubbleDataPoint> { new BubbleDataPoint { X = 1, Y = 2, r = 3 } };
 
-        /// <summary>
-        /// <para>See <see cref="ColorUtil"/> for working with colors.</para>
+        /// <summary>
+        /// <para>See <see cref="ColorUtil"/> for working with colors.</para>
         /// </summary>
         public string HoverBackgroundColor { get; set; }
 
-        /// <summary>
-        /// <para>See <see cref="ColorUtil"/> for working with colors.</para>
+        /// <summary>
+        /// <para>See <see cref="ColorUtil"/> for working with colors.</para>
         /// </summary>
         public string HoverBorderColor { get; set; }
 
@@ -46,12 +47,15 @@ public class BubbleDataset
         /// </summary>
         public string Label { get; set; }
 
-        public string PointStyle { get; set; } = BubblePointStyle.circle.ToString();
+        /// <summary>
+        /// Gets or sets the point style.
+        /// </summary>
+        public IndexableOption<PointStyle> PointStyle { get; set; }
 
         public int Rotation { get; set; } = 0;
 
         public int Radius { get; set; } = 3;
 
-        public ChartTypes Type { get; } = ChartTypes.Bubble;
+        public ChartType Type { get; } = ChartType.Bubble;
     }
 }
\ No newline at end of file
diff --git a/ChartJs.Blazor/ChartJS/BubbleChart/BubblePointStyle.cs b/ChartJs.Blazor/ChartJS/BubbleChart/BubblePointStyle.cs
deleted file mode 100644
index 2f39614..0000000
--- a/ChartJs.Blazor/ChartJS/BubbleChart/BubblePointStyle.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-namespace ChartJs.Blazor.ChartJS.BubbleChart
-{
-    public enum BubblePointStyle
-    {
-        circle,
-        cross,
-        crossRot,
-        dash,
-        line,
-        rect,
-        rectRounded,
-        rectRot,
-        star,
-        triangle
-    }
-}
\ No newline at end of file
diff --git a/ChartJs.Blazor/ChartJS/Common/ConfigBase.cs b/ChartJs.Blazor/ChartJS/Common/ConfigBase.cs
index 851b26f..88ac585 100644
--- a/ChartJs.Blazor/ChartJS/Common/ConfigBase.cs
+++ b/ChartJs.Blazor/ChartJS/Common/ConfigBase.cs
@@ -13,7 +13,7 @@ public abstract class ConfigBase
         /// Creates a new instance of <see cref="ConfigBase"/>
         /// </summary>
         /// <param name="chartType">The chartType this config is for</param>
-        protected ConfigBase(ChartTypes chartType)
+        protected ConfigBase(ChartType chartType)
         {
             Type = chartType;
         }
@@ -21,7 +21,7 @@ protected ConfigBase(ChartTypes chartType)
         /// <summary>
         /// Defines what type of chart this config is for
         /// </summary>
-        public ChartTypes Type { get; }
+        public ChartType Type { get; }
 
         /// <summary>
         /// The id for the html canvas element associated with this chart
@@ -42,7 +42,7 @@ public abstract class ConfigBase<TOptions, TData> : ConfigBase
         /// Creates a new instance of <see cref="ConfigBase"/>
         /// </summary>
         /// <param name="chartType">The chartType this config is for</param>
-        protected ConfigBase(ChartTypes chartType) : base(chartType)
+        protected ConfigBase(ChartType chartType) : base(chartType)
         {
             Data = new TData();
         }
diff --git a/ChartJs.Blazor/ChartJS/Common/Enums/AxisDisplay.cs b/ChartJs.Blazor/ChartJS/Common/Enums/AxisDisplay.cs
index f49e612..d18a52d 100644
--- a/ChartJs.Blazor/ChartJS/Common/Enums/AxisDisplay.cs
+++ b/ChartJs.Blazor/ChartJS/Common/Enums/AxisDisplay.cs
@@ -4,7 +4,7 @@ namespace ChartJs.Blazor.ChartJS.Common.Enums
     /// <summary>
     /// As per documentation here https://www.chartjs.org/docs/latest/axes/#common-configuration
     /// </summary>
-    public class AxisDisplay: ObjectEnum
+    public sealed class AxisDisplay : ObjectEnum
     {
         /// <summary>
         /// Hidden
diff --git a/ChartJs.Blazor/ChartJS/Common/Enums/AxisType.cs b/ChartJs.Blazor/ChartJS/Common/Enums/AxisType.cs
index 938f6ff..c2216be 100644
--- a/ChartJs.Blazor/ChartJS/Common/Enums/AxisType.cs
+++ b/ChartJs.Blazor/ChartJS/Common/Enums/AxisType.cs
@@ -3,7 +3,6 @@
     /// <summary>
     /// As per documentation here https://www.chartjs.org/docs/latest/axes/cartesian/
     /// </summary>
-    /// 
     public sealed class AxisType : StringEnum
     {
         /// <summary>
@@ -28,7 +27,7 @@ public sealed class AxisType : StringEnum
         /// If only data.labels is defined, this will be used. If data.xLabels is defined and the axis is horizontal, this will be used. 
         /// Similarly, if data.yLabels is defined and the axis is vertical, this property will be used.
         /// Using both xLabels and yLabels together can create a chart that uses strings for both the X and Y axes. 
-        /// Specifying any of the settings above defines the x axis as type: 'category' if not defined otherwise.
+        /// Specifying any of the settings above defines the x axis as type: <see cref="AxisType.Category" /> if not defined otherwise.
         /// For more fine-grained control of category labels it is also possible to add labels as part of the category axis definition.
         /// Doing so does not apply the global defaults.
         /// <para>See https://www.chartjs.org/docs/latest/axes/cartesian/category.html </para>
diff --git a/ChartJs.Blazor/ChartJS/Common/Enums/BorderAlign.cs b/ChartJs.Blazor/ChartJS/Common/Enums/BorderAlign.cs
new file mode 100644
index 0000000..0fab106
--- /dev/null
+++ b/ChartJs.Blazor/ChartJS/Common/Enums/BorderAlign.cs
@@ -0,0 +1,25 @@
+namespace ChartJs.Blazor.ChartJS.Common.Enums
+{
+    /// <summary>
+    /// Specifies the border alignment of a <see cref="PieChart"/> and a <see cref="PolarAreaChart"/>.
+    /// <para>As per documentation here https://www.chartjs.org/docs/latest/charts/doughnut.html#border-alignment </para>
+    /// </summary>
+    public sealed class BorderAlign : StringEnum
+    {
+        /// <summary>
+        /// When <see cref="BorderAlign.Center" /> is set, the borders of arcs next to each other will overlap. The default value.
+        /// </summary>
+        public static BorderAlign Center => new BorderAlign("center");
+
+        /// <summary>
+        /// When <see cref="BorderAlign.Inner" /> is set, it is guaranteed that all the borders will not overlap.
+        /// </summary>
+        public static BorderAlign Inner => new BorderAlign("inner");
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="BorderAlign"/> class.
+        /// </summary>
+        /// <param name="stringValue">The <see cref="string"/> value to set.</param>
+        private BorderAlign(string stringValue) : base(stringValue) { }
+    }
+}
diff --git a/ChartJs.Blazor/ChartJS/Common/Enums/BorderCapStyle.cs b/ChartJs.Blazor/ChartJS/Common/Enums/BorderCapStyle.cs
new file mode 100644
index 0000000..7a11704
--- /dev/null
+++ b/ChartJs.Blazor/ChartJS/Common/Enums/BorderCapStyle.cs
@@ -0,0 +1,30 @@
+namespace ChartJs.Blazor.ChartJS.Common.Enums
+{
+    /// <summary>
+    /// Specifies the border cap style.
+    /// <para>As per documentation here https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/lineCap </para>
+    /// </summary>
+    public sealed class BorderCapStyle : StringEnum
+    {
+        /// <summary>
+        /// The ends of lines are squared off at the endpoints.
+        /// </summary>
+        public static BorderCapStyle Butt => new BorderCapStyle("butt");
+
+        /// <summary>
+        /// The ends of lines are rounded.
+        /// </summary>
+        public static BorderCapStyle Round => new BorderCapStyle("round");
+
+        /// <summary>
+        /// The ends of lines are squared off by adding a box with an equal width and half the height of the line's thickness.
+        /// </summary>
+        public static BorderCapStyle Square => new BorderCapStyle("square");
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="BorderCapStyle"/> class.
+        /// </summary>
+        /// <param name="stringValue">The <see cref="string"/> value to set.</param>
+        private BorderCapStyle(string stringValue) : base(stringValue) { }
+    }
+}
diff --git a/ChartJs.Blazor/ChartJS/Common/Enums/BorderJoinStyle.cs b/ChartJs.Blazor/ChartJS/Common/Enums/BorderJoinStyle.cs
new file mode 100644
index 0000000..9b73956
--- /dev/null
+++ b/ChartJs.Blazor/ChartJS/Common/Enums/BorderJoinStyle.cs
@@ -0,0 +1,30 @@
+namespace ChartJs.Blazor.ChartJS.Common.Enums
+{
+    /// <summary>
+    /// Specifies the border join style.
+    /// <para>As per documentation here https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/lineJoin </para>
+    /// </summary>
+    public sealed class BorderJoinStyle : StringEnum
+    {
+        /// <summary>
+        /// Fills an additional triangular area between the common endpoint of connected segments, and the separate outside rectangular corners of each segment.
+        /// </summary>
+        public static BorderJoinStyle Bevel => new BorderJoinStyle("bevel");
+
+        /// <summary>
+        /// Rounds off the corners of a shape by filling an additional sector of disc centered at the common endpoint of connected segments. The radius for these rounded corners is equal to the line width.
+        /// </summary>
+        public static BorderJoinStyle Round => new BorderJoinStyle("round");
+
+        /// <summary>
+        /// Connected segments are joined by extending their outside edges to connect at a single point, with the effect of filling an additional lozenge-shaped area.
+        /// </summary>
+        public static BorderJoinStyle Miter => new BorderJoinStyle("miter");
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="BorderJoinStyle"/> class.
+        /// </summary>
+        /// <param name="stringValue">The <see cref="string"/> value to set.</param>
+        private BorderJoinStyle(string stringValue) : base(stringValue) { }
+    }
+}
diff --git a/ChartJs.Blazor/ChartJS/Common/Enums/ChartType.cs b/ChartJs.Blazor/ChartJS/Common/Enums/ChartType.cs
new file mode 100644
index 0000000..58b4927
--- /dev/null
+++ b/ChartJs.Blazor/ChartJS/Common/Enums/ChartType.cs
@@ -0,0 +1,59 @@
+namespace ChartJs.Blazor.ChartJS.Common.Enums
+{
+    /// <summary>
+    /// Defines the chart types.
+    /// </summary>
+    public sealed class ChartType : StringEnum
+    {
+        /// <summary>
+        /// The bar chart type.
+        /// </summary>
+        public static ChartType Bar => new ChartType("bar");
+
+        /// <summary>
+        /// The horizontal bar chart type.
+        /// </summary>
+        public static ChartType HorizontalBar => new ChartType("horizontalBar");
+
+        /// <summary>
+        /// The line chart type.
+        /// </summary>
+        public static ChartType Line => new ChartType("line");
+
+        /// <summary>
+        /// The pie chart type.
+        /// </summary>
+        public static ChartType Pie => new ChartType("pie");
+
+        /// <summary>
+        /// The doughnut chart type.
+        /// </summary>
+        public static ChartType Doughnut => new ChartType("doughnut");
+
+        /// <summary>
+        /// The radar chart type.
+        /// </summary>
+        public static ChartType Radar => new ChartType("radar");
+
+        /// <summary>
+        /// The bubble chart type.
+        /// </summary>
+        public static ChartType Bubble => new ChartType("bubble");
+
+        /// <summary>
+        /// The polar area chart type.
+        /// </summary>
+        public static ChartType PolarArea => new ChartType("polarArea");
+
+        /// <summary>
+        /// The scatter chart type.
+        /// </summary>
+        public static ChartType Scatter => new ChartType("scatter");
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="ChartType"/> class.
+        /// </summary>
+        /// <param name="stringValue">The <see cref="string"/> value to set.</param>
+        private ChartType(string stringValue) : base(stringValue) { }
+    }
+}
diff --git a/ChartJs.Blazor/ChartJS/Common/Enums/ChartTypes.cs b/ChartJs.Blazor/ChartJS/Common/Enums/ChartTypes.cs
deleted file mode 100644
index 7885e98..0000000
--- a/ChartJs.Blazor/ChartJS/Common/Enums/ChartTypes.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-namespace ChartJs.Blazor.ChartJS.Common.Enums
-{
-    /// <summary>
-    /// Defines the type of a chart
-    /// </summary>
-    public sealed class ChartTypes : StringEnum
-    {
-#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
-        public static ChartTypes Bar => new ChartTypes("bar");
-        public static ChartTypes HorizontalBar => new ChartTypes("horizontalBar");
-        public static ChartTypes Line => new ChartTypes("line");
-        public static ChartTypes Pie => new ChartTypes("pie");
-        public static ChartTypes Doughnut => new ChartTypes("doughnut");
-        public static ChartTypes Radar => new ChartTypes("radar");
-        public static ChartTypes Bubble => new ChartTypes("bubble");
-        public static ChartTypes PolarArea => new ChartTypes("polarArea");
-        public static ChartTypes Scatter => new ChartTypes("scatter");
-#pragma warning restore CS1591 // Missing XML comment for publicly visible type or member
-
-        private ChartTypes(string stringRep) : base(stringRep) { }
-    }
-}
\ No newline at end of file
diff --git a/ChartJs.Blazor/ChartJS/Common/Enums/CubicInterpolationMode.cs b/ChartJs.Blazor/ChartJS/Common/Enums/CubicInterpolationMode.cs
new file mode 100644
index 0000000..94cb42e
--- /dev/null
+++ b/ChartJs.Blazor/ChartJS/Common/Enums/CubicInterpolationMode.cs
@@ -0,0 +1,28 @@
+namespace ChartJs.Blazor.ChartJS.Common.Enums
+{
+    /// <summary>
+    /// Specifies the cubic interpolation mode.
+    /// <para>As per documentation here https://www.chartjs.org/docs/latest/charts/line.html#cubicinterpolationmode </para>
+    /// </summary>
+    public sealed class CubicInterpolationMode : StringEnum
+    {
+        /// <summary>
+        /// The default cubic interpolation mode.
+        /// The <see cref="CubicInterpolationMode.Default" /> algorithm uses a custom weighted cubic interpolation, which produces pleasant curves for all types of datasets.
+        /// </summary>
+        public static CubicInterpolationMode Default => new CubicInterpolationMode("default");
+
+        /// <summary>
+        /// The monotone cubic interpolation mode.
+        /// The <see cref="CubicInterpolationMode.Monotone" /> algorithm is more suited to y = f(x) datasets:
+        /// It preserves monotonicity (or piecewise monotonicity) of the dataset being interpolated, and ensures local extrema (if any) stay at input data points.
+        /// </summary>
+        public static CubicInterpolationMode Monotone => new CubicInterpolationMode("monotone");
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="CubicInterpolationMode"/> class.
+        /// </summary>
+        /// <param name="stringValue">The <see cref="string"/> value to set.</param>
+        private CubicInterpolationMode(string stringValue) : base(stringValue) { }
+    }
+}
diff --git a/ChartJs.Blazor/ChartJS/Common/Enums/FontStyle.cs b/ChartJs.Blazor/ChartJS/Common/Enums/FontStyle.cs
new file mode 100644
index 0000000..b27b30b
--- /dev/null
+++ b/ChartJs.Blazor/ChartJS/Common/Enums/FontStyle.cs
@@ -0,0 +1,40 @@
+namespace ChartJs.Blazor.ChartJS.Common.Enums
+{
+    /// <summary>
+    /// Specifies the css font style of text.
+    /// <para>As per documentation here https://developer.mozilla.org/en-US/docs/Web/CSS/font-style </para>
+    /// </summary>
+    public sealed class FontStyle : StringEnum
+    {
+        /// <summary>
+        /// Specifies a font that is classified as normal within a font-family.
+        /// </summary>
+        public static FontStyle Normal => new FontStyle("normal");
+
+        /// <summary>
+        /// Specifies a font that is classified as italic. If no italic version of the face is available, one classified as oblique is used instead. If neither is available, the style is artificially simulated.
+        /// </summary>
+        public static FontStyle Italic => new FontStyle("italic");
+
+        /// <summary>
+        /// Specifies a font that is classified as oblique. If no oblique version of the face is available, one classified as italic is used instead. If neither is available, the style is artificially simulated.
+        /// </summary>
+        public static FontStyle Oblique => new FontStyle("oblique");
+
+        /// <summary>
+        /// Specifies a font with its font style set to its default value.
+        /// </summary>
+        public static FontStyle Initial => new FontStyle("initial");
+
+        /// <summary>
+        /// Specifies a font that inherits the font style from its parent element.
+        /// </summary>
+        public static FontStyle Inherit => new FontStyle("inherit");
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="FontStyle"/> class.
+        /// </summary>
+        /// <param name="stringValue">The <see cref="string"/> value to set.</param>
+        private FontStyle(string stringValue) : base(stringValue) { }
+    }
+}
diff --git a/ChartJs.Blazor/ChartJS/Common/Enums/PointStyle.cs b/ChartJs.Blazor/ChartJS/Common/Enums/PointStyle.cs
new file mode 100644
index 0000000..45010fa
--- /dev/null
+++ b/ChartJs.Blazor/ChartJS/Common/Enums/PointStyle.cs
@@ -0,0 +1,70 @@
+
+namespace ChartJs.Blazor.ChartJS.Common.Enums
+{
+    /// <summary>
+    /// Specifies how a data-point on the chart will be styled.
+    /// <para>As per documentation here https://www.chartjs.org/docs/latest/configuration/elements.html#point-styles </para>
+    /// <para>Some samples showcasing the different styles can be found here https://www.chartjs.org/samples/latest/charts/line/point-styles.html </para>
+    /// </summary>
+    public sealed class PointStyle : StringEnum
+    {
+        /// <summary>
+        /// The circle point style.
+        /// </summary>
+        public static PointStyle Circle => new PointStyle("circle");
+
+        /// <summary>
+        /// The cross point style.
+        /// </summary>
+        public static PointStyle Cross => new PointStyle("cross");
+
+        /// <summary>
+        /// The rotated (45°) cross point style.
+        /// </summary>
+        public static PointStyle CrossRot => new PointStyle("crossRot");
+
+        /// <summary>
+        /// The dash point style.
+        /// <para>Unlike <see cref="Line"/>, this style only displayes a dash on the right side of the point.</para>
+        /// </summary>
+        public static PointStyle Dash => new PointStyle("dash");
+
+        /// <summary>
+        /// The line point style.
+        /// <para>Unlike <see cref="Dash"/>, this style displayes a dash on both the right and the left side of the point.</para>
+        /// </summary>
+        public static PointStyle Line => new PointStyle("line");
+
+        /// <summary>
+        /// The rectangle point style.
+        /// </summary>
+        public static PointStyle Rect => new PointStyle("rect");
+
+        /// <summary>
+        /// The rounded rectangle point style.
+        /// </summary>
+        public static PointStyle RectRounded => new PointStyle("rectRounded");
+
+        /// <summary>
+        /// The rotated (45°) rectangle point style.
+        /// </summary>
+        public static PointStyle RectRot => new PointStyle("rectRot");
+
+        /// <summary>
+        /// The star point style.
+        /// <para>Same as <see cref="Cross"/> and <see cref="CrossRot"/> overlapping.</para>
+        /// </summary>
+        public static PointStyle Star => new PointStyle("star");
+
+        /// <summary>
+        /// The triangle point style.
+        /// </summary>
+        public static PointStyle Triangle => new PointStyle("triangle");
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="PointStyle"/> class.
+        /// </summary>
+        /// <param name="stringValue">The <see cref="string"/> value to set.</param>
+        private PointStyle(string stringValue) : base(stringValue) { }
+    }
+}
\ No newline at end of file
diff --git a/ChartJs.Blazor/ChartJS/Common/Enums/Position.cs b/ChartJs.Blazor/ChartJS/Common/Enums/Position.cs
new file mode 100644
index 0000000..d891546
--- /dev/null
+++ b/ChartJs.Blazor/ChartJS/Common/Enums/Position.cs
@@ -0,0 +1,17 @@
+namespace ChartJs.Blazor.ChartJS.Common.Enums
+{
+    /// <summary>
+    /// Represents a relative direction or position on a 2D canvas.
+    /// </summary>
+    public sealed class Position : StringEnum
+    {
+#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
+        public static Position Left => new Position("left");
+        public static Position Right => new Position("right");
+        public static Position Top => new Position("top");
+        public static Position Bottom => new Position("bottom");
+#pragma warning restore CS1591 // Missing XML comment for publicly visible type or member
+
+        private Position(string stringRep) : base(stringRep) { }
+    }
+}
\ No newline at end of file
diff --git a/ChartJs.Blazor/ChartJS/Common/Enums/Positions.cs b/ChartJs.Blazor/ChartJS/Common/Enums/Positions.cs
deleted file mode 100644
index 24e7df9..0000000
--- a/ChartJs.Blazor/ChartJS/Common/Enums/Positions.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace ChartJs.Blazor.ChartJS.Common.Enums
-{
-    /// <summary>
-    /// Represents a relative direction or position on a 2D canvas
-    /// </summary>
-    public sealed class Positions : StringEnum
-    {
-#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
-        public static Positions Left => new Positions("left");
-        public static Positions Right => new Positions("right");
-        public static Positions Top => new Positions("top");
-        public static Positions Bottom => new Positions("bottom");
-#pragma warning restore CS1591 // Missing XML comment for publicly visible type or member
-
-        private Positions(string stringRep) : base(stringRep) { }
-    }
-}
\ No newline at end of file
diff --git a/ChartJs.Blazor/ChartJS/Common/Enums/ScaleBound.cs b/ChartJs.Blazor/ChartJS/Common/Enums/ScaleBound.cs
new file mode 100644
index 0000000..20fec76
--- /dev/null
+++ b/ChartJs.Blazor/ChartJS/Common/Enums/ScaleBound.cs
@@ -0,0 +1,21 @@
+namespace ChartJs.Blazor.ChartJS.Common.Enums
+{
+    /// <summary>
+    /// Specifies the scale boundary strategy.
+    /// <para>As per documentation here https://www.chartjs.org/docs/latest/axes/cartesian/time.html#scale-bounds </para>
+    /// </summary>
+    public sealed class ScaleBound : StringEnum
+    {
+        /// <summary>
+        /// Makes sure data are fully visible, labels outside are removed.
+        /// </summary>
+        public static ScaleBound Data => new ScaleBound("data");
+
+        /// <summary>
+        /// Makes sure ticks are fully visible, data outside are truncated.
+        /// </summary>
+        public static ScaleBound Ticks => new ScaleBound("ticks");
+
+        private ScaleBound(string stringRep) : base(stringRep) { }
+    }
+}
\ No newline at end of file
diff --git a/ChartJs.Blazor/ChartJS/Common/Enums/ScaleBounds.cs b/ChartJs.Blazor/ChartJS/Common/Enums/ScaleBounds.cs
deleted file mode 100644
index ff8a0f8..0000000
--- a/ChartJs.Blazor/ChartJS/Common/Enums/ScaleBounds.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-namespace ChartJs.Blazor.ChartJS.Common.Enums
-{
-    /// <summary>
-    /// As per documentation here https://www.chartjs.org/docs/latest/axes/cartesian/time.html#scale-bounds
-    /// </summary>
-    /// 
-    public sealed class ScaleBounds : StringEnum
-    {
-        /// <summary>
-        /// Makes sure data are fully visible, labels outside are removed
-        /// </summary>
-        public static ScaleBounds Data => new ScaleBounds("data");
-
-        /// <summary>
-        /// Makes sure ticks are fully visible, data outside are truncated
-        /// </summary>
-        public static ScaleBounds Ticks => new ScaleBounds("ticks");
-
-        private ScaleBounds(string stringRep) : base(stringRep) { }
-    }
-}
\ No newline at end of file
diff --git a/ChartJs.Blazor/ChartJS/Common/Enums/SteppedLine.cs b/ChartJs.Blazor/ChartJS/Common/Enums/SteppedLine.cs
index 3b166c6..bc3613d 100644
--- a/ChartJs.Blazor/ChartJS/Common/Enums/SteppedLine.cs
+++ b/ChartJs.Blazor/ChartJS/Common/Enums/SteppedLine.cs
@@ -4,7 +4,7 @@ namespace ChartJs.Blazor.ChartJS.Common.Enums
     /// <summary>
     /// As per documentation here https://www.chartjs.org/docs/latest/charts/line.html#stepped-line
     /// </summary>
-    public class SteppedLine : ObjectEnum
+    public sealed class SteppedLine : ObjectEnum
     {
         /// <summary>
         /// No Step Interpolation (default)
diff --git a/ChartJs.Blazor/ChartJS/Common/Legends/Labels.cs b/ChartJs.Blazor/ChartJS/Common/Legends/Labels.cs
index d3b161a..2f0f0c9 100644
--- a/ChartJs.Blazor/ChartJS/Common/Legends/Labels.cs
+++ b/ChartJs.Blazor/ChartJS/Common/Legends/Labels.cs
@@ -1,4 +1,5 @@
 using ChartJs.Blazor.Util;
+using ChartJs.Blazor.ChartJS.Common.Enums;
 
 namespace ChartJs.Blazor.ChartJS.Common.Legends
 {
@@ -17,13 +18,10 @@ public class LegendLabelConfiguration
         /// </summary>
         public int FontSize { get; set; } = 12;
 
-        // TODO: implement with enum (normal, italic, oblique, initial, inherit)
         /// <summary>
-        /// Font style of text.
-        ///
-        /// <para>Supported fonts: http://www.chartjs.org/docs/latest/configuration/legend.html#legend-label-configuration </para>
+        /// Gets or sets the font style for the labels text.
         /// </summary>
-        public string FontStyle { get; set; }
+        public FontStyle FontStyle { get; set; }
 
         /// <summary>
         /// Color of text.
diff --git a/ChartJs.Blazor/ChartJS/Common/Legends/Legend.cs b/ChartJs.Blazor/ChartJS/Common/Legends/Legend.cs
index 2a38def..3cffae6 100644
--- a/ChartJs.Blazor/ChartJS/Common/Legends/Legend.cs
+++ b/ChartJs.Blazor/ChartJS/Common/Legends/Legend.cs
@@ -18,7 +18,7 @@ public class Legend
         /// <summary>
         /// Position of the legend
         /// </summary>
-        public Positions Position { get; set; } = Positions.Top;
+        public Position Position { get; set; } = Position.Top;
 
         /// <summary>
         /// Marks that this box should take the full width of the canvas (pushing down other boxes). This is unlikely to need to be changed in day-to-day use.
diff --git a/ChartJs.Blazor/ChartJS/Common/SubTicks.cs b/ChartJs.Blazor/ChartJS/Common/SubTicks.cs
index 99600fc..7bb360c 100644
--- a/ChartJs.Blazor/ChartJS/Common/SubTicks.cs
+++ b/ChartJs.Blazor/ChartJS/Common/SubTicks.cs
@@ -1,4 +1,5 @@
 using ChartJs.Blazor.Util;
+using ChartJs.Blazor.ChartJS.Common.Enums;
 
 namespace ChartJs.Blazor.ChartJS.Common
 {
@@ -14,7 +15,7 @@ public abstract class SubTicks
         public string FontColor { get; set; }
 
         /// <summary>
-        /// Gets or sets the font family for a tick's label, follows CSS font-family options.
+        /// Gets or sets the font family for a tick's label.
         /// </summary>
         public string FontFamily { get; set; }
 
@@ -24,9 +25,9 @@ public abstract class SubTicks
         public int FontSize { get; set; } = 12;
 
         /// <summary>
-        /// Gets or sets the font style for a tick's label, follows CSS font-style options (i.e. normal, italic, oblique, initial, inherit).
+        /// Gets or sets the font style for a tick's label.
         /// </summary>
-        public string FontStyle { get; set; }
+        public FontStyle FontStyle { get; set; }
 
         /// <summary>
         /// Gets or sets the height of an individual line of text.
diff --git a/ChartJs.Blazor/ChartJS/Common/Ticks.cs b/ChartJs.Blazor/ChartJS/Common/Ticks.cs
index d9e7e19..f954480 100644
--- a/ChartJs.Blazor/ChartJS/Common/Ticks.cs
+++ b/ChartJs.Blazor/ChartJS/Common/Ticks.cs
@@ -1,4 +1,5 @@
 using ChartJs.Blazor.Util;
+using ChartJs.Blazor.ChartJS.Common.Enums;
 
 namespace ChartJs.Blazor.ChartJS.Common
 {
@@ -20,7 +21,7 @@ public abstract class Ticks
         public string FontColor { get; set; }
 
         /// <summary>
-        /// Gets or sets the font family for the <see cref="Ticks"/> labels, follows CSS font-family options.
+        /// Gets or sets the font family for the <see cref="Ticks"/> labels.
         /// </summary>
         public string FontFamily { get; set; }
 
@@ -30,9 +31,9 @@ public abstract class Ticks
         public int FontSize { get; set; } = 12;
 
         /// <summary>
-        /// Gets or sets the font style for the <see cref="Ticks"/> labels, follows CSS font-style options (i.e. normal, italic, oblique, initial, inherit).
+        /// Gets or sets the font style for the <see cref="Ticks"/> labels.
         /// </summary>
-        public string FontStyle { get; set; }
+        public FontStyle FontStyle { get; set; }
 
         /// <summary>
         /// Gets or sets the height of an individual line of text.
diff --git a/ChartJs.Blazor/ChartJS/LineChart/Axes/CartesianAxis.cs b/ChartJs.Blazor/ChartJS/LineChart/Axes/CartesianAxis.cs
index 74b75c6..655dbc8 100644
--- a/ChartJs.Blazor/ChartJS/LineChart/Axes/CartesianAxis.cs
+++ b/ChartJs.Blazor/ChartJS/LineChart/Axes/CartesianAxis.cs
@@ -25,7 +25,7 @@ public abstract class CartesianAxis : Axis
         /// <summary>
         /// Position of the axis in the chart
         /// </summary>
-        public Positions Position { get; set; }
+        public Position Position { get; set; }
 
         /// <summary>
         /// If true, extra space is added to the both edges and the axis is scaled to fit into the chart area. 
diff --git a/ChartJs.Blazor/ChartJS/LineChart/Axes/TimeAxis.cs b/ChartJs.Blazor/ChartJS/LineChart/Axes/TimeAxis.cs
index 999df3f..bb1c53d 100644
--- a/ChartJs.Blazor/ChartJS/LineChart/Axes/TimeAxis.cs
+++ b/ChartJs.Blazor/ChartJS/LineChart/Axes/TimeAxis.cs
@@ -24,7 +24,7 @@ public class TimeAxis : CartesianAxis<TimeTicks>
         /// <summary>
         /// The bounds property controls the scale boundary strategy (bypassed by min/max time options).
         /// </summary>
-        public ScaleBounds Bounds { get; set; }
+        public ScaleBound Bounds { get; set; }
 
         /// <summary>
         /// Configuration for time related stuff
diff --git a/ChartJs.Blazor/ChartJS/LineChart/LineConfig.cs b/ChartJs.Blazor/ChartJS/LineChart/LineConfig.cs
index 03e0839..0bc9e1c 100644
--- a/ChartJs.Blazor/ChartJS/LineChart/LineConfig.cs
+++ b/ChartJs.Blazor/ChartJS/LineChart/LineConfig.cs
@@ -11,6 +11,6 @@ public class LineConfig : ConfigBase<LineOptions, LineData>
         /// <summary>
         /// Creates a new instance of <see cref="LineConfig"/>
         /// </summary>
-        public LineConfig() : base(ChartTypes.Line) { }
+        public LineConfig() : base(ChartType.Line) { }
     }
 }
\ No newline at end of file
diff --git a/ChartJs.Blazor/ChartJS/LineChart/LineDataset.cs b/ChartJs.Blazor/ChartJS/LineChart/LineDataset.cs
index 4d68fb9..9298dfc 100644
--- a/ChartJs.Blazor/ChartJS/LineChart/LineDataset.cs
+++ b/ChartJs.Blazor/ChartJS/LineChart/LineDataset.cs
@@ -27,7 +27,7 @@ public LineDataset() { }
         /// <summary>
         /// The type of chart this dataset is for.
         /// </summary>
-        public override ChartTypes Type => ChartTypes.Line;
+        public override ChartType Type => ChartType.Line;
 
         /// <summary>
         /// The label for the dataset which appears in the legend and tooltips.
@@ -49,26 +49,20 @@ public LineDataset() { }
         /// </summary>
         public int BorderWidth { get; set; } = 1;
 
-        // TODO: Implement options
         /// <summary>
-        /// Cap style of the line.
-        /// <para>See https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/lineCap for options.</para>
+        /// Gets or sets the cap style of the line.
         /// </summary>
-        public string BorderCapStyle { get; set; }
+        public BorderCapStyle BorderCapStyle { get; set; }
 
-        // TODO: Implement options
         /// <summary>
-        /// Line joint style.
-        /// <para>See https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/lineJoin for options.</para>
+        /// Gets or sets the line join style.
         /// </summary>
-        public string BorderJoinStyle { get; set; }
+        public BorderJoinStyle BorderJoinStyle { get; set; }
 
-        // TODO: Implement options
         /// <summary>
-        /// Algorithm used to interpolate a smooth curve from the discrete data points.
-        /// <para>See https://www.chartjs.org/docs/latest/charts/line.html#cubicinterpolationmode for options.</para>
+        /// Gets or sets the algorithm used to interpolate a smooth curve from the discrete data points.
         /// </summary>
-        public string CubicInterpolationMode { get; set; }
+        public CubicInterpolationMode CubicInterpolationMode { get; set; }
 
         /// <summary>
         /// Length and spacing of dashes. It's an int array. Whatever JS!
diff --git a/ChartJs.Blazor/ChartJS/MixedChart/BaseMixableDataset.cs b/ChartJs.Blazor/ChartJS/MixedChart/BaseMixableDataset.cs
index b1ea0ac..a40f6fa 100644
--- a/ChartJs.Blazor/ChartJS/MixedChart/BaseMixableDataset.cs
+++ b/ChartJs.Blazor/ChartJS/MixedChart/BaseMixableDataset.cs
@@ -13,7 +13,7 @@ public abstract class BaseMixableDataset<TData> : IMixableDataset<TData>
         /// <summary>
         /// The type of chart this dataset is for.
         /// </summary>
-        public abstract ChartTypes Type { get; }
+        public abstract ChartType Type { get; }
 
         private readonly List<TData> _data = new List<TData>();
 
diff --git a/ChartJs.Blazor/ChartJS/MixedChart/IMixableDataset.cs b/ChartJs.Blazor/ChartJS/MixedChart/IMixableDataset.cs
index 2fce314..2d3b86e 100644
--- a/ChartJs.Blazor/ChartJS/MixedChart/IMixableDataset.cs
+++ b/ChartJs.Blazor/ChartJS/MixedChart/IMixableDataset.cs
@@ -12,7 +12,7 @@ public interface IMixableDataset<out TData>
         /// <summary>
         /// The type of chart this dataset is for.
         /// </summary>
-        ChartTypes Type { get; }
+        ChartType Type { get; }
 
         /// <summary>
         /// The data contained in this dataset (readonly because covariant).
diff --git a/ChartJs.Blazor/ChartJS/MixedChart/MixedConfig.cs b/ChartJs.Blazor/ChartJS/MixedChart/MixedConfig.cs
index e2ef996..627536f 100644
--- a/ChartJs.Blazor/ChartJS/MixedChart/MixedConfig.cs
+++ b/ChartJs.Blazor/ChartJS/MixedChart/MixedConfig.cs
@@ -5,7 +5,7 @@ namespace ChartJs.Blazor.ChartJS.MixedChart
 {
     public class MixedConfig<TData> : ConfigBase<MixedOptions, MixedData<TData>>
     {
-        public MixedConfig() : base(ChartTypes.Bar) // This is not a mistake
+        public MixedConfig() : base(ChartType.Bar) // This is not a mistake
         {
         }
     }
diff --git a/ChartJs.Blazor/ChartJS/PieChart/PieConfig.cs b/ChartJs.Blazor/ChartJS/PieChart/PieConfig.cs
index 4325856..1f632f5 100644
--- a/ChartJs.Blazor/ChartJS/PieChart/PieConfig.cs
+++ b/ChartJs.Blazor/ChartJS/PieChart/PieConfig.cs
@@ -11,7 +11,7 @@ public class PieConfig : ConfigBase<PieOptions, PieData>
         /// <summary>
         /// Creates a new instance of <see cref="PieConfig"/>.
         /// </summary>
-        public PieConfig() : base(ChartTypes.Pie)
+        public PieConfig() : base(ChartType.Pie)
         {
         }
     }
diff --git a/ChartJs.Blazor/ChartJS/PieChart/PieDataset.cs b/ChartJs.Blazor/ChartJS/PieChart/PieDataset.cs
index 33c90df..40fe0d1 100644
--- a/ChartJs.Blazor/ChartJS/PieChart/PieDataset.cs
+++ b/ChartJs.Blazor/ChartJS/PieChart/PieDataset.cs
@@ -11,9 +11,9 @@ namespace ChartJs.Blazor.ChartJS.PieChart
     public class PieDataset
     {
         /// <summary>
-        /// Gets or sets the chart type. <see cref="ChartTypes.Pie"/> in this case. This is needed for mixed datasets only.
+        /// Gets or sets the chart type. <see cref="ChartType.Pie"/> in this case. This is needed for mixed datasets only.
         /// </summary>
-        public ChartTypes Type { get; } = ChartTypes.Pie;
+        public ChartType Type { get; } = ChartType.Pie;
 
         /// <summary>
         /// Gets or sets the fill color of the arcs in the dataset.
@@ -22,12 +22,11 @@ public class PieDataset
         /// </summary>
         public IndexableOption<string> BackgroundColor { get; set; }
 
-        // Todo: Make this an enum later?!
         /// <summary>
-        /// Gets or sets the border align. When 'center' is set, the borders of arcs next to each other will overlap.
-        /// When 'inner' is set, it is guaranteed that all the borders are not overlap.
+        /// Gets or sets the border align. When <see cref="BorderAlign.Center" /> is set, the borders of arcs next to each other will overlap.
+        /// When <see cref="BorderAlign.Inner" /> is set, it is guaranteed that all the borders are not overlap.
         /// </summary>
-        public string BorderAlign { get; set; } = "center";
+        public IndexableOption<BorderAlign> BorderAlign { get; set; }
 
         /// <summary>
         /// Gets or sets the border color of the arcs in the dataset.
diff --git a/ChartJs.Blazor/ChartJS/PolarAreaChart/Axis/PointLabels.cs b/ChartJs.Blazor/ChartJS/PolarAreaChart/Axis/PointLabels.cs
index 8983f66..3dbe855 100644
--- a/ChartJs.Blazor/ChartJS/PolarAreaChart/Axis/PointLabels.cs
+++ b/ChartJs.Blazor/ChartJS/PolarAreaChart/Axis/PointLabels.cs
@@ -1,4 +1,5 @@
 using ChartJs.Blazor.ChartJS.Common;
+using ChartJs.Blazor.ChartJS.Common.Enums;
 using ChartJs.Blazor.Util;
 
 namespace ChartJs.Blazor.ChartJS.PolarAreaChart.Axis
@@ -23,7 +24,7 @@ public class PointLabels
         /// <summary>
         /// Gets or sets the font style to use when rendering a point label.
         /// </summary>
-        public string FontStyle { get; set; }
+        public FontStyle FontStyle { get; set; }
 
         /// <summary>
         /// Gets or sets the height of an individual line of text.
diff --git a/ChartJs.Blazor/ChartJS/PolarAreaChart/PolarAreaConfig.cs b/ChartJs.Blazor/ChartJS/PolarAreaChart/PolarAreaConfig.cs
index 8313871..8178fad 100644
--- a/ChartJs.Blazor/ChartJS/PolarAreaChart/PolarAreaConfig.cs
+++ b/ChartJs.Blazor/ChartJS/PolarAreaChart/PolarAreaConfig.cs
@@ -12,7 +12,7 @@ public class PolarAreaConfig : ConfigBase<PolarAreaOptions, PolarAreaData>
         /// <summary>
         /// Creates a new instance of <see cref="PolarAreaConfig"/>
         /// </summary>
-        public PolarAreaConfig() : base(ChartTypes.PolarArea)
+        public PolarAreaConfig() : base(ChartType.PolarArea)
         {
         }
     }
diff --git a/ChartJs.Blazor/ChartJS/PolarAreaChart/PolarAreaDataset.cs b/ChartJs.Blazor/ChartJS/PolarAreaChart/PolarAreaDataset.cs
index 2b287ef..24a8174 100644
--- a/ChartJs.Blazor/ChartJS/PolarAreaChart/PolarAreaDataset.cs
+++ b/ChartJs.Blazor/ChartJS/PolarAreaChart/PolarAreaDataset.cs
@@ -12,10 +12,10 @@ namespace ChartJs.Blazor.ChartJS.PolarAreaChart
     /// </summary>
     public class PolarAreaDataset
     {
-        /// <summary>
-        /// Gets the chart type. <see cref="ChartTypes.PolarArea"/> in this case. This is needed for mixed datasets only.
+        /// <summary>
+        /// Gets the chart type. <see cref="ChartType.PolarArea"/> in this case. This is needed for mixed datasets only.
         /// </summary>
-        public ChartTypes Type { get; } = ChartTypes.PolarArea;
+        public ChartType Type { get; } = ChartType.PolarArea;
 
         /// <summary>
         /// Gets or sets the fill color of the arcs in the dataset.
@@ -23,12 +23,11 @@ public class PolarAreaDataset
         /// </summary>
         public IndexableOption<string> BackgroundColor { get; set; }
 
-        // Todo: Make this an enum later?!
         /// <summary>
-        /// Gets or sets the border align. When 'center' is set, the borders of arcs next to each other will overlap.
-        /// When 'inner' is set, it is guaranteed that all the borders are not overlap.
+        /// Gets or sets the border align. When <see cref="BorderAlign.Center" /> is set, the borders of arcs next to each other will overlap.
+        /// When <see cref="BorderAlign.Inner" /> is set, it is guaranteed that all the borders are not overlap.
         /// </summary>
-        public string BorderAlign { get; set; }
+        public IndexableOption<BorderAlign> BorderAlign { get; set; }
 
         /// <summary>
         /// Gets or sets the border color of the arcs in the dataset.
@@ -58,8 +57,8 @@ public class PolarAreaDataset
         /// </summary>
         public IndexableOption<int> HoverBorderWidth { get; set; }
 
-        /// <summary>
-        /// Gets the data in the dataset.
+        /// <summary>
+        /// Gets the data in the dataset.
         /// </summary>
         public List<double> Data { get; } = new List<double>();
     }
diff --git a/ChartJs.Blazor/ChartJS/RadarChart/RadarConfig.cs b/ChartJs.Blazor/ChartJS/RadarChart/RadarConfig.cs
index cc0a849..3be876b 100644
--- a/ChartJs.Blazor/ChartJS/RadarChart/RadarConfig.cs
+++ b/ChartJs.Blazor/ChartJS/RadarChart/RadarConfig.cs
@@ -5,6 +5,6 @@ namespace ChartJs.Blazor.ChartJS.RadarChart
 {
     public class RadarConfig : ConfigBase<RadarOptions, RadarData>
     {
-        public RadarConfig() : base(ChartTypes.Radar) { }
+        public RadarConfig() : base(ChartType.Radar) { }
     }
 }
\ No newline at end of file
diff --git a/ChartJs.Blazor/ChartJS/RadarChart/RadarDataset.cs b/ChartJs.Blazor/ChartJS/RadarChart/RadarDataset.cs
index 03be712..13e8c3f 100644
--- a/ChartJs.Blazor/ChartJS/RadarChart/RadarDataset.cs
+++ b/ChartJs.Blazor/ChartJS/RadarChart/RadarDataset.cs
@@ -8,7 +8,7 @@ namespace ChartJs.Blazor.ChartJS.RadarChart
 {
     public class RadarDataset
     {
-        public ChartTypes Type { get; } = ChartTypes.Radar;
+        public ChartType Type { get; } = ChartType.Radar;
 
         /// <summary>
         /// The label for the dataset which appears in the legend and tooltips.
@@ -38,14 +38,14 @@ public class RadarDataset
         public double BorderDashOffset { get; set; }
 
         /// <summary>
-        /// Cap style of the line
+        /// Gets or sets the cap style of the line.
         /// </summary>
-        public string BorderCapStyle { get; set; }
+        public BorderCapStyle BorderCapStyle { get; set; }
 
         /// <summary>
-        /// Line joint style
+        /// Gets or sets the line join style.
         /// </summary>
-        public string BorderJoinStyle { get; set; }
+        public BorderJoinStyle BorderJoinStyle { get; set; }
 
         /// <summary>
         /// Both line and radar charts support a fill option on the dataset object which can be used to create area between two datasets or a dataset and a boundary, i.e. the scale origin, start or end
@@ -92,9 +92,9 @@ public class RadarDataset
         public IndexableOption<int> PointRotation { get; set; }
 
         /// <summary>
-        /// Style of the point
+        /// Gets or sets the point style.
         /// </summary>
-        public IndexableOption<RadarPointStyles> PointStyle { get; set; }
+        public IndexableOption<PointStyle> PointStyle { get; set; }
 
         /// <summary>
         /// The pixel size of the non-displayed point that reacts to mouse events.
diff --git a/ChartJs.Blazor/ChartJS/RadarChart/RadarPointStyles.cs b/ChartJs.Blazor/ChartJS/RadarChart/RadarPointStyles.cs
deleted file mode 100644
index ecfc141..0000000
--- a/ChartJs.Blazor/ChartJS/RadarChart/RadarPointStyles.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using Newtonsoft.Json;
-
-namespace ChartJs.Blazor.ChartJS.RadarChart
-{
-    public class RadarPointStyles
-    {
-        private readonly string _style;
-
-        public static RadarPointStyles CIRCLE = new RadarPointStyles("circle");
-        public static RadarPointStyles CROSS = new RadarPointStyles("cross");
-        public static RadarPointStyles CROSSROT = new RadarPointStyles("crossRot");
-        public static RadarPointStyles DASH = new RadarPointStyles("dash");
-        public static RadarPointStyles LINE = new RadarPointStyles("line");
-        public static RadarPointStyles RECT = new RadarPointStyles("rect");
-        public static RadarPointStyles RETROUNDED = new RadarPointStyles("rectRounded");
-        public static RadarPointStyles RECTROT = new RadarPointStyles("rectRot");
-        public static RadarPointStyles STAR = new RadarPointStyles("star");
-        public static RadarPointStyles TRIANGLE = new RadarPointStyles("triangle");
-
-        [JsonConstructor]
-        public RadarPointStyles(string style)
-        {
-            _style = style;
-        }
-
-        public override string ToString()
-        {
-            return _style;
-        }
-    }
-}
\ No newline at end of file
diff --git a/ChartJs.Blazor/ChartJS/ScatterChart/ScatterConfig.cs b/ChartJs.Blazor/ChartJS/ScatterChart/ScatterConfig.cs
index c8af00a..23c9338 100644
--- a/ChartJs.Blazor/ChartJS/ScatterChart/ScatterConfig.cs
+++ b/ChartJs.Blazor/ChartJS/ScatterChart/ScatterConfig.cs
@@ -5,6 +5,6 @@ namespace ChartJs.Blazor.ChartJS.ScatterChart
 {
     public class ScatterConfig : ConfigBase<ScatterOptions, ScatterData>
     {
-        public ScatterConfig() : base(ChartTypes.Scatter) { }
+        public ScatterConfig() : base(ChartType.Scatter) { }
     }
 }
\ No newline at end of file
diff --git a/ChartJs.Blazor/ChartJS/ScatterChart/ScatterDataset.cs b/ChartJs.Blazor/ChartJS/ScatterChart/ScatterDataset.cs
index d4e8166..08330a0 100644
--- a/ChartJs.Blazor/ChartJS/ScatterChart/ScatterDataset.cs
+++ b/ChartJs.Blazor/ChartJS/ScatterChart/ScatterDataset.cs
@@ -12,7 +12,7 @@ public class ScatterDataset
 
         public List<Point> Data { get; set; }
 
-        public ChartTypes Type { get; } = ChartTypes.Scatter;
+        public ChartType Type { get; } = ChartType.Scatter;
 
         public string Label { get; set; } = "";
 
@@ -32,19 +32,19 @@ public class ScatterDataset
         public int BorderWidth { get; set; } = 1;
 
         /// <summary>
-        /// Cap style of the line.
+        /// Gets or sets the cap style of the line.
         /// </summary>
-        public string BorderCapStyle { get; set; }
+        public BorderCapStyle BorderCapStyle { get; set; }
 
         /// <summary>
-        /// Line joint style.
+        /// Gets or sets the line join style.
         /// </summary>
-        public string BorderJoinStyle { get; set; }
+        public BorderJoinStyle BorderJoinStyle { get; set; }
 
         /// <summary>
-        /// Algorithm used to interpolate a smooth curve from the discrete data points.
+        /// Gets or sets the algorithm used to interpolate a smooth curve from the discrete data points.
         /// </summary>
-        public string CubicInterpolationMode { get; set; }
+        public CubicInterpolationMode CubicInterpolationMode { get; set; }
 
         /// <summary>
         /// Length and spacing of dashes. It's an int array. Whatever JS!
diff --git a/ChartJs.Blazor/ChartJs.Blazor.xml b/ChartJs.Blazor/ChartJs.Blazor.xml
index 83cfc11..f4380db 100644
--- a/ChartJs.Blazor/ChartJs.Blazor.xml
+++ b/ChartJs.Blazor/ChartJs.Blazor.xml
@@ -189,6 +189,11 @@
             Defines the text associated to the dataset and which appears in the legend and tooltips.
             </summary>
         </member>
+        <member name="P:ChartJs.Blazor.ChartJS.BubbleChart.BubbleDataset.PointStyle">
+            <summary>
+            Gets or sets the point style.
+            </summary>
+        </member>
         <member name="M:ChartJs.Blazor.ChartJS.ChartJsInterop.ConvertExpandoObjectToDictionary(System.Dynamic.ExpandoObject)">
             <summary>
             This method is specifically used to convert an <see cref="T:System.Dynamic.ExpandoObject"/> with a Tree structure to a <see cref="!:Dictionary&lt;string, object&gt;"/>.
@@ -272,7 +277,7 @@
             <para>Contains the most basic required information about a chart</para>
             </summary>
         </member>
-        <member name="M:ChartJs.Blazor.ChartJS.Common.ConfigBase.#ctor(ChartJs.Blazor.ChartJS.Common.Enums.ChartTypes)">
+        <member name="M:ChartJs.Blazor.ChartJS.Common.ConfigBase.#ctor(ChartJs.Blazor.ChartJS.Common.Enums.ChartType)">
             <summary>
             Creates a new instance of <see cref="T:ChartJs.Blazor.ChartJS.Common.ConfigBase"/>
             </summary>
@@ -295,7 +300,7 @@
             <typeparam name="TOptions">The type of the options-subconfig</typeparam>
             <typeparam name="TData">The type of the data-subconfig</typeparam>
         </member>
-        <member name="M:ChartJs.Blazor.ChartJS.Common.ConfigBase`2.#ctor(ChartJs.Blazor.ChartJS.Common.Enums.ChartTypes)">
+        <member name="M:ChartJs.Blazor.ChartJS.Common.ConfigBase`2.#ctor(ChartJs.Blazor.ChartJS.Common.Enums.ChartType)">
             <summary>
             Creates a new instance of <see cref="T:ChartJs.Blazor.ChartJS.Common.ConfigBase"/>
             </summary>
@@ -335,7 +340,6 @@
             <summary>
             As per documentation here https://www.chartjs.org/docs/latest/axes/cartesian/
             </summary>
-            
         </member>
         <member name="P:ChartJs.Blazor.ChartJS.Common.Enums.AxisType.Linear">
             <summary>
@@ -358,7 +362,7 @@
             If only data.labels is defined, this will be used. If data.xLabels is defined and the axis is horizontal, this will be used. 
             Similarly, if data.yLabels is defined and the axis is vertical, this property will be used.
             Using both xLabels and yLabels together can create a chart that uses strings for both the X and Y axes. 
-            Specifying any of the settings above defines the x axis as type: 'category' if not defined otherwise.
+            Specifying any of the settings above defines the x axis as type: <see cref="P:ChartJs.Blazor.ChartJS.Common.Enums.AxisType.Category" /> if not defined otherwise.
             For more fine-grained control of category labels it is also possible to add labels as part of the category axis definition.
             Doing so does not apply the global defaults.
             <para>See https://www.chartjs.org/docs/latest/axes/cartesian/category.html </para>
@@ -370,10 +374,199 @@
             When building its ticks, it will automatically calculate the most comfortable unit base on the size of the scale.
             </summary>
         </member>
-        <member name="T:ChartJs.Blazor.ChartJS.Common.Enums.ChartTypes">
+        <member name="T:ChartJs.Blazor.ChartJS.Common.Enums.BorderAlign">
+            <summary>
+            Specifies the border alignment of a <see cref="N:ChartJs.Blazor.ChartJS.PieChart"/> and a <see cref="N:ChartJs.Blazor.ChartJS.PolarAreaChart"/>.
+            <para>As per documentation here https://www.chartjs.org/docs/latest/charts/doughnut.html#border-alignment </para>
+            </summary>
+        </member>
+        <member name="P:ChartJs.Blazor.ChartJS.Common.Enums.BorderAlign.Center">
+            <summary>
+            When <see cref="P:ChartJs.Blazor.ChartJS.Common.Enums.BorderAlign.Center" /> is set, the borders of arcs next to each other will overlap. The default value.
+            </summary>
+        </member>
+        <member name="P:ChartJs.Blazor.ChartJS.Common.Enums.BorderAlign.Inner">
+            <summary>
+            When <see cref="P:ChartJs.Blazor.ChartJS.Common.Enums.BorderAlign.Inner" /> is set, it is guaranteed that all the borders will not overlap.
+            </summary>
+        </member>
+        <member name="M:ChartJs.Blazor.ChartJS.Common.Enums.BorderAlign.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the <see cref="T:ChartJs.Blazor.ChartJS.Common.Enums.BorderAlign"/> class.
+            </summary>
+            <param name="stringValue">The <see cref="T:System.String"/> value to set.</param>
+        </member>
+        <member name="T:ChartJs.Blazor.ChartJS.Common.Enums.BorderCapStyle">
+            <summary>
+            Specifies the border cap style.
+            <para>As per documentation here https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/lineCap </para>
+            </summary>
+        </member>
+        <member name="P:ChartJs.Blazor.ChartJS.Common.Enums.BorderCapStyle.Butt">
+            <summary>
+            The ends of lines are squared off at the endpoints.
+            </summary>
+        </member>
+        <member name="P:ChartJs.Blazor.ChartJS.Common.Enums.BorderCapStyle.Round">
+            <summary>
+            The ends of lines are rounded.
+            </summary>
+        </member>
+        <member name="P:ChartJs.Blazor.ChartJS.Common.Enums.BorderCapStyle.Square">
+            <summary>
+            The ends of lines are squared off by adding a box with an equal width and half the height of the line's thickness.
+            </summary>
+        </member>
+        <member name="M:ChartJs.Blazor.ChartJS.Common.Enums.BorderCapStyle.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the <see cref="T:ChartJs.Blazor.ChartJS.Common.Enums.BorderCapStyle"/> class.
+            </summary>
+            <param name="stringValue">The <see cref="T:System.String"/> value to set.</param>
+        </member>
+        <member name="T:ChartJs.Blazor.ChartJS.Common.Enums.BorderJoinStyle">
+            <summary>
+            Specifies the border join style.
+            <para>As per documentation here https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/lineJoin </para>
+            </summary>
+        </member>
+        <member name="P:ChartJs.Blazor.ChartJS.Common.Enums.BorderJoinStyle.Bevel">
+            <summary>
+            Fills an additional triangular area between the common endpoint of connected segments, and the separate outside rectangular corners of each segment.
+            </summary>
+        </member>
+        <member name="P:ChartJs.Blazor.ChartJS.Common.Enums.BorderJoinStyle.Round">
+            <summary>
+            Rounds off the corners of a shape by filling an additional sector of disc centered at the common endpoint of connected segments. The radius for these rounded corners is equal to the line width.
+            </summary>
+        </member>
+        <member name="P:ChartJs.Blazor.ChartJS.Common.Enums.BorderJoinStyle.Miter">
+            <summary>
+            Connected segments are joined by extending their outside edges to connect at a single point, with the effect of filling an additional lozenge-shaped area.
+            </summary>
+        </member>
+        <member name="M:ChartJs.Blazor.ChartJS.Common.Enums.BorderJoinStyle.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the <see cref="T:ChartJs.Blazor.ChartJS.Common.Enums.BorderJoinStyle"/> class.
+            </summary>
+            <param name="stringValue">The <see cref="T:System.String"/> value to set.</param>
+        </member>
+        <member name="T:ChartJs.Blazor.ChartJS.Common.Enums.ChartType">
+            <summary>
+            Defines the chart types.
+            </summary>
+        </member>
+        <member name="P:ChartJs.Blazor.ChartJS.Common.Enums.ChartType.Bar">
+            <summary>
+            The bar chart type.
+            </summary>
+        </member>
+        <member name="P:ChartJs.Blazor.ChartJS.Common.Enums.ChartType.HorizontalBar">
+            <summary>
+            The horizontal bar chart type.
+            </summary>
+        </member>
+        <member name="P:ChartJs.Blazor.ChartJS.Common.Enums.ChartType.Line">
+            <summary>
+            The line chart type.
+            </summary>
+        </member>
+        <member name="P:ChartJs.Blazor.ChartJS.Common.Enums.ChartType.Pie">
+            <summary>
+            The pie chart type.
+            </summary>
+        </member>
+        <member name="P:ChartJs.Blazor.ChartJS.Common.Enums.ChartType.Doughnut">
+            <summary>
+            The doughnut chart type.
+            </summary>
+        </member>
+        <member name="P:ChartJs.Blazor.ChartJS.Common.Enums.ChartType.Radar">
+            <summary>
+            The radar chart type.
+            </summary>
+        </member>
+        <member name="P:ChartJs.Blazor.ChartJS.Common.Enums.ChartType.Bubble">
+            <summary>
+            The bubble chart type.
+            </summary>
+        </member>
+        <member name="P:ChartJs.Blazor.ChartJS.Common.Enums.ChartType.PolarArea">
+            <summary>
+            The polar area chart type.
+            </summary>
+        </member>
+        <member name="P:ChartJs.Blazor.ChartJS.Common.Enums.ChartType.Scatter">
+            <summary>
+            The scatter chart type.
+            </summary>
+        </member>
+        <member name="M:ChartJs.Blazor.ChartJS.Common.Enums.ChartType.#ctor(System.String)">
             <summary>
-            Defines the type of a chart
+            Creates a new instance of the <see cref="T:ChartJs.Blazor.ChartJS.Common.Enums.ChartType"/> class.
             </summary>
+            <param name="stringValue">The <see cref="T:System.String"/> value to set.</param>
+        </member>
+        <member name="T:ChartJs.Blazor.ChartJS.Common.Enums.CubicInterpolationMode">
+            <summary>
+            Specifies the cubic interpolation mode.
+            <para>As per documentation here https://www.chartjs.org/docs/latest/charts/line.html#cubicinterpolationmode </para>
+            </summary>
+        </member>
+        <member name="P:ChartJs.Blazor.ChartJS.Common.Enums.CubicInterpolationMode.Default">
+            <summary>
+            The default cubic interpolation mode.
+            The <see cref="P:ChartJs.Blazor.ChartJS.Common.Enums.CubicInterpolationMode.Default" /> algorithm uses a custom weighted cubic interpolation, which produces pleasant curves for all types of datasets.
+            </summary>
+        </member>
+        <member name="P:ChartJs.Blazor.ChartJS.Common.Enums.CubicInterpolationMode.Monotone">
+            <summary>
+            The monotone cubic interpolation mode.
+            The <see cref="P:ChartJs.Blazor.ChartJS.Common.Enums.CubicInterpolationMode.Monotone" /> algorithm is more suited to y = f(x) datasets:
+            It preserves monotonicity (or piecewise monotonicity) of the dataset being interpolated, and ensures local extrema (if any) stay at input data points.
+            </summary>
+        </member>
+        <member name="M:ChartJs.Blazor.ChartJS.Common.Enums.CubicInterpolationMode.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the <see cref="T:ChartJs.Blazor.ChartJS.Common.Enums.CubicInterpolationMode"/> class.
+            </summary>
+            <param name="stringValue">The <see cref="T:System.String"/> value to set.</param>
+        </member>
+        <member name="T:ChartJs.Blazor.ChartJS.Common.Enums.FontStyle">
+            <summary>
+            Specifies the css font style of text.
+            <para>As per documentation here https://developer.mozilla.org/en-US/docs/Web/CSS/font-style </para>
+            </summary>
+        </member>
+        <member name="P:ChartJs.Blazor.ChartJS.Common.Enums.FontStyle.Normal">
+            <summary>
+            Specifies a font that is classified as normal within a font-family.
+            </summary>
+        </member>
+        <member name="P:ChartJs.Blazor.ChartJS.Common.Enums.FontStyle.Italic">
+            <summary>
+            Specifies a font that is classified as italic. If no italic version of the face is available, one classified as oblique is used instead. If neither is available, the style is artificially simulated.
+            </summary>
+        </member>
+        <member name="P:ChartJs.Blazor.ChartJS.Common.Enums.FontStyle.Oblique">
+            <summary>
+            Specifies a font that is classified as oblique. If no oblique version of the face is available, one classified as italic is used instead. If neither is available, the style is artificially simulated.
+            </summary>
+        </member>
+        <member name="P:ChartJs.Blazor.ChartJS.Common.Enums.FontStyle.Initial">
+            <summary>
+            Specifies a font with its font style set to its default value.
+            </summary>
+        </member>
+        <member name="P:ChartJs.Blazor.ChartJS.Common.Enums.FontStyle.Inherit">
+            <summary>
+            Specifies a font that inherits the font style from its parent element.
+            </summary>
+        </member>
+        <member name="M:ChartJs.Blazor.ChartJS.Common.Enums.FontStyle.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the <see cref="T:ChartJs.Blazor.ChartJS.Common.Enums.FontStyle"/> class.
+            </summary>
+            <param name="stringValue">The <see cref="T:System.String"/> value to set.</param>
         </member>
         <member name="T:ChartJs.Blazor.ChartJS.Common.Enums.InteractionMode">
             <summary>
@@ -459,25 +652,91 @@
             </summary>
             <returns>The hash of the underlying object.</returns>
         </member>
-        <member name="T:ChartJs.Blazor.ChartJS.Common.Enums.Positions">
+        <member name="T:ChartJs.Blazor.ChartJS.Common.Enums.PointStyle">
             <summary>
-            Represents a relative direction or position on a 2D canvas
+            Specifies how a data-point on the chart will be styled.
+            <para>As per documentation here https://www.chartjs.org/docs/latest/configuration/elements.html#point-styles </para>
+            <para>Some samples showcasing the different styles can be found here https://www.chartjs.org/samples/latest/charts/line/point-styles.html </para>
             </summary>
         </member>
-        <member name="T:ChartJs.Blazor.ChartJS.Common.Enums.ScaleBounds">
+        <member name="P:ChartJs.Blazor.ChartJS.Common.Enums.PointStyle.Circle">
             <summary>
-            As per documentation here https://www.chartjs.org/docs/latest/axes/cartesian/time.html#scale-bounds
+            The circle point style.
             </summary>
-            
         </member>
-        <member name="P:ChartJs.Blazor.ChartJS.Common.Enums.ScaleBounds.Data">
+        <member name="P:ChartJs.Blazor.ChartJS.Common.Enums.PointStyle.Cross">
             <summary>
-            Makes sure data are fully visible, labels outside are removed
+            The cross point style.
             </summary>
         </member>
-        <member name="P:ChartJs.Blazor.ChartJS.Common.Enums.ScaleBounds.Ticks">
+        <member name="P:ChartJs.Blazor.ChartJS.Common.Enums.PointStyle.CrossRot">
             <summary>
-            Makes sure ticks are fully visible, data outside are truncated
+            The rotated (45°) cross point style.
+            </summary>
+        </member>
+        <member name="P:ChartJs.Blazor.ChartJS.Common.Enums.PointStyle.Dash">
+            <summary>
+            The dash point style.
+            <para>Unlike <see cref="P:ChartJs.Blazor.ChartJS.Common.Enums.PointStyle.Line"/>, this style only displayes a dash on the right side of the point.</para>
+            </summary>
+        </member>
+        <member name="P:ChartJs.Blazor.ChartJS.Common.Enums.PointStyle.Line">
+            <summary>
+            The line point style.
+            <para>Unlike <see cref="P:ChartJs.Blazor.ChartJS.Common.Enums.PointStyle.Dash"/>, this style displayes a dash on both the right and the left side of the point.</para>
+            </summary>
+        </member>
+        <member name="P:ChartJs.Blazor.ChartJS.Common.Enums.PointStyle.Rect">
+            <summary>
+            The rectangle point style.
+            </summary>
+        </member>
+        <member name="P:ChartJs.Blazor.ChartJS.Common.Enums.PointStyle.RectRounded">
+            <summary>
+            The rounded rectangle point style.
+            </summary>
+        </member>
+        <member name="P:ChartJs.Blazor.ChartJS.Common.Enums.PointStyle.RectRot">
+            <summary>
+            The rotated (45°) rectangle point style.
+            </summary>
+        </member>
+        <member name="P:ChartJs.Blazor.ChartJS.Common.Enums.PointStyle.Star">
+            <summary>
+            The star point style.
+            <para>Same as <see cref="P:ChartJs.Blazor.ChartJS.Common.Enums.PointStyle.Cross"/> and <see cref="P:ChartJs.Blazor.ChartJS.Common.Enums.PointStyle.CrossRot"/> overlapping.</para>
+            </summary>
+        </member>
+        <member name="P:ChartJs.Blazor.ChartJS.Common.Enums.PointStyle.Triangle">
+            <summary>
+            The triangle point style.
+            </summary>
+        </member>
+        <member name="M:ChartJs.Blazor.ChartJS.Common.Enums.PointStyle.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the <see cref="T:ChartJs.Blazor.ChartJS.Common.Enums.PointStyle"/> class.
+            </summary>
+            <param name="stringValue">The <see cref="T:System.String"/> value to set.</param>
+        </member>
+        <member name="T:ChartJs.Blazor.ChartJS.Common.Enums.Position">
+            <summary>
+            Represents a relative direction or position on a 2D canvas.
+            </summary>
+        </member>
+        <member name="T:ChartJs.Blazor.ChartJS.Common.Enums.ScaleBound">
+            <summary>
+            Specifies the scale boundary strategy.
+            <para>As per documentation here https://www.chartjs.org/docs/latest/axes/cartesian/time.html#scale-bounds </para>
+            </summary>
+        </member>
+        <member name="P:ChartJs.Blazor.ChartJS.Common.Enums.ScaleBound.Data">
+            <summary>
+            Makes sure data are fully visible, labels outside are removed.
+            </summary>
+        </member>
+        <member name="P:ChartJs.Blazor.ChartJS.Common.Enums.ScaleBound.Ticks">
+            <summary>
+            Makes sure ticks are fully visible, data outside are truncated.
             </summary>
         </member>
         <member name="T:ChartJs.Blazor.ChartJS.Common.Enums.SteppedLine">
@@ -736,11 +995,9 @@
             </summary>
         </member>
         <member name="P:ChartJs.Blazor.ChartJS.Common.Legends.LegendLabelConfiguration.FontStyle">
-             <summary>
-             Font style of text.
-            
-             <para>Supported fonts: http://www.chartjs.org/docs/latest/configuration/legend.html#legend-label-configuration </para>
-             </summary>
+            <summary>
+            Gets or sets the font style for the labels text.
+            </summary>
         </member>
         <member name="P:ChartJs.Blazor.ChartJS.Common.Legends.LegendLabelConfiguration.FontColor">
             <summary>
@@ -1061,7 +1318,7 @@
         </member>
         <member name="P:ChartJs.Blazor.ChartJS.Common.SubTicks.FontFamily">
             <summary>
-            Gets or sets the font family for a tick's label, follows CSS font-family options.
+            Gets or sets the font family for a tick's label.
             </summary>
         </member>
         <member name="P:ChartJs.Blazor.ChartJS.Common.SubTicks.FontSize">
@@ -1071,7 +1328,7 @@
         </member>
         <member name="P:ChartJs.Blazor.ChartJS.Common.SubTicks.FontStyle">
             <summary>
-            Gets or sets the font style for a tick's label, follows CSS font-style options (i.e. normal, italic, oblique, initial, inherit).
+            Gets or sets the font style for a tick's label.
             </summary>
         </member>
         <member name="P:ChartJs.Blazor.ChartJS.Common.SubTicks.LineHeight">
@@ -1099,7 +1356,7 @@
         </member>
         <member name="P:ChartJs.Blazor.ChartJS.Common.Ticks.FontFamily">
             <summary>
-            Gets or sets the font family for the <see cref="T:ChartJs.Blazor.ChartJS.Common.Ticks"/> labels, follows CSS font-family options.
+            Gets or sets the font family for the <see cref="T:ChartJs.Blazor.ChartJS.Common.Ticks"/> labels.
             </summary>
         </member>
         <member name="P:ChartJs.Blazor.ChartJS.Common.Ticks.FontSize">
@@ -1109,7 +1366,7 @@
         </member>
         <member name="P:ChartJs.Blazor.ChartJS.Common.Ticks.FontStyle">
             <summary>
-            Gets or sets the font style for the <see cref="T:ChartJs.Blazor.ChartJS.Common.Ticks"/> labels, follows CSS font-style options (i.e. normal, italic, oblique, initial, inherit).
+            Gets or sets the font style for the <see cref="T:ChartJs.Blazor.ChartJS.Common.Ticks"/> labels.
             </summary>
         </member>
         <member name="P:ChartJs.Blazor.ChartJS.Common.Ticks.LineHeight">
@@ -1500,20 +1757,17 @@
         </member>
         <member name="P:ChartJs.Blazor.ChartJS.LineChart.LineDataset`1.BorderCapStyle">
             <summary>
-            Cap style of the line.
-            <para>See https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/lineCap for options.</para>
+            Gets or sets the cap style of the line.
             </summary>
         </member>
         <member name="P:ChartJs.Blazor.ChartJS.LineChart.LineDataset`1.BorderJoinStyle">
             <summary>
-            Line joint style.
-            <para>See https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/lineJoin for options.</para>
+            Gets or sets the line join style.
             </summary>
         </member>
         <member name="P:ChartJs.Blazor.ChartJS.LineChart.LineDataset`1.CubicInterpolationMode">
             <summary>
-            Algorithm used to interpolate a smooth curve from the discrete data points.
-            <para>See https://www.chartjs.org/docs/latest/charts/line.html#cubicinterpolationmode for options.</para>
+            Gets or sets the algorithm used to interpolate a smooth curve from the discrete data points.
             </summary>
         </member>
         <member name="P:ChartJs.Blazor.ChartJS.LineChart.LineDataset`1.BorderDash">
@@ -1890,7 +2144,7 @@
         </member>
         <member name="P:ChartJs.Blazor.ChartJS.PieChart.PieDataset.Type">
             <summary>
-            Gets or sets the chart type. <see cref="P:ChartJs.Blazor.ChartJS.Common.Enums.ChartTypes.Pie"/> in this case. This is needed for mixed datasets only.
+            Gets or sets the chart type. <see cref="P:ChartJs.Blazor.ChartJS.Common.Enums.ChartType.Pie"/> in this case. This is needed for mixed datasets only.
             </summary>
         </member>
         <member name="P:ChartJs.Blazor.ChartJS.PieChart.PieDataset.BackgroundColor">
@@ -1902,8 +2156,8 @@
         </member>
         <member name="P:ChartJs.Blazor.ChartJS.PieChart.PieDataset.BorderAlign">
             <summary>
-            Gets or sets the border align. When 'center' is set, the borders of arcs next to each other will overlap.
-            When 'inner' is set, it is guaranteed that all the borders are not overlap.
+            Gets or sets the border align. When <see cref="P:ChartJs.Blazor.ChartJS.Common.Enums.BorderAlign.Center" /> is set, the borders of arcs next to each other will overlap.
+            When <see cref="P:ChartJs.Blazor.ChartJS.Common.Enums.BorderAlign.Inner" /> is set, it is guaranteed that all the borders are not overlap.
             </summary>
         </member>
         <member name="P:ChartJs.Blazor.ChartJS.PieChart.PieDataset.BorderColor">
@@ -2173,7 +2427,7 @@
         </member>
         <member name="P:ChartJs.Blazor.ChartJS.PolarAreaChart.PolarAreaDataset.Type">
             <summary>
-            Gets the chart type. <see cref="P:ChartJs.Blazor.ChartJS.Common.Enums.ChartTypes.PolarArea"/> in this case. This is needed for mixed datasets only.
+            Gets the chart type. <see cref="P:ChartJs.Blazor.ChartJS.Common.Enums.ChartType.PolarArea"/> in this case. This is needed for mixed datasets only.
             </summary>
         </member>
         <member name="P:ChartJs.Blazor.ChartJS.PolarAreaChart.PolarAreaDataset.BackgroundColor">
@@ -2184,8 +2438,8 @@
         </member>
         <member name="P:ChartJs.Blazor.ChartJS.PolarAreaChart.PolarAreaDataset.BorderAlign">
             <summary>
-            Gets or sets the border align. When 'center' is set, the borders of arcs next to each other will overlap.
-            When 'inner' is set, it is guaranteed that all the borders are not overlap.
+            Gets or sets the border align. When <see cref="P:ChartJs.Blazor.ChartJS.Common.Enums.BorderAlign.Center" /> is set, the borders of arcs next to each other will overlap.
+            When <see cref="P:ChartJs.Blazor.ChartJS.Common.Enums.BorderAlign.Inner" /> is set, it is guaranteed that all the borders are not overlap.
             </summary>
         </member>
         <member name="P:ChartJs.Blazor.ChartJS.PolarAreaChart.PolarAreaDataset.BorderColor">
@@ -2270,12 +2524,12 @@
         </member>
         <member name="P:ChartJs.Blazor.ChartJS.RadarChart.RadarDataset.BorderCapStyle">
             <summary>
-            Cap style of the line
+            Gets or sets the cap style of the line.
             </summary>
         </member>
         <member name="P:ChartJs.Blazor.ChartJS.RadarChart.RadarDataset.BorderJoinStyle">
             <summary>
-            Line joint style
+            Gets or sets the line join style.
             </summary>
         </member>
         <member name="P:ChartJs.Blazor.ChartJS.RadarChart.RadarDataset.Fill">
@@ -2324,7 +2578,7 @@
         </member>
         <member name="P:ChartJs.Blazor.ChartJS.RadarChart.RadarDataset.PointStyle">
             <summary>
-            Style of the point
+            Gets or sets the point style.
             </summary>
         </member>
         <member name="P:ChartJs.Blazor.ChartJS.RadarChart.RadarDataset.PointHitRadius">
@@ -2371,17 +2625,17 @@
         </member>
         <member name="P:ChartJs.Blazor.ChartJS.ScatterChart.ScatterDataset.BorderCapStyle">
             <summary>
-            Cap style of the line.
+            Gets or sets the cap style of the line.
             </summary>
         </member>
         <member name="P:ChartJs.Blazor.ChartJS.ScatterChart.ScatterDataset.BorderJoinStyle">
             <summary>
-            Line joint style.
+            Gets or sets the line join style.
             </summary>
         </member>
         <member name="P:ChartJs.Blazor.ChartJS.ScatterChart.ScatterDataset.CubicInterpolationMode">
             <summary>
-            Algorithm used to interpolate a smooth curve from the discrete data points.
+            Gets or sets the algorithm used to interpolate a smooth curve from the discrete data points.
             </summary>
         </member>
         <member name="P:ChartJs.Blazor.ChartJS.ScatterChart.ScatterDataset.BorderDash">
diff --git a/WebCore/Pages/LineLinearExample.razor b/WebCore/Pages/LineLinearExample.razor
index 229d5f2..4c940ea 100644
--- a/WebCore/Pages/LineLinearExample.razor
+++ b/WebCore/Pages/LineLinearExample.razor
@@ -39,7 +39,7 @@
                 },
                 Legend = new Legend
                 {
-                    Position = Positions.Right,
+                    Position = Position.Right,
                     Labels = new LegendLabelConfiguration
                     {
                         UsePointStyle = true
diff --git a/WebCore/Pages/LineLogarithmicExample.razor b/WebCore/Pages/LineLogarithmicExample.razor
index ae2e1a3..075291e 100644
--- a/WebCore/Pages/LineLogarithmicExample.razor
+++ b/WebCore/Pages/LineLogarithmicExample.razor
@@ -33,7 +33,7 @@
                 },
                 Legend = new Legend
                 {
-                    Position = Positions.Right,
+                    Position = Position.Right,
                     Labels = new LegendLabelConfiguration
                     {
                         UsePointStyle = true
diff --git a/WebCore/Pages/LineTimeExample.razor b/WebCore/Pages/LineTimeExample.razor
index 61fb0c9..a008112 100644
--- a/WebCore/Pages/LineTimeExample.razor
+++ b/WebCore/Pages/LineTimeExample.razor
@@ -50,7 +50,7 @@
                 },
                 Legend = new Legend
                 {
-                    Position = Positions.Right,
+                    Position = Position.Right,
                     Labels = new LegendLabelConfiguration
                     {
                         UsePointStyle = true
diff --git a/WebCore/Pages/SimpleLineLinearExample.razor b/WebCore/Pages/SimpleLineLinearExample.razor
index 05647a9..25f3a15 100644
--- a/WebCore/Pages/SimpleLineLinearExample.razor
+++ b/WebCore/Pages/SimpleLineLinearExample.razor
@@ -35,7 +35,7 @@
                 },
                 Legend = new Legend
                 {
-                    Position = Positions.Right,
+                    Position = Position.Right,
                     Labels = new LegendLabelConfiguration
                     {
                         UsePointStyle = true