diff --git a/Shared Files/Resources/reportparts.xml b/Shared Files/Resources/reportparts.xml
index f1079016..3354387a 100644
--- a/Shared Files/Resources/reportparts.xml	
+++ b/Shared Files/Resources/reportparts.xml	
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ReportParts>
+  <ReportPart Name="SliderLeftColour" SelectedThemeColourName="EnvironmentColors.ToolWindowTextColorKey" />
+  <ReportPart Name="SliderRightColour" SelectedThemeColourName="EnvironmentColors.ToolWindowTextColorKey" />
+  <ReportPart Name="SliderThumbColour" SelectedThemeColourName="EnvironmentColors.ScrollBarThumbBackgroundColorKey" />
   <ReportPart Name="ScrollBarArrowColour" SelectedThemeColourName="EnvironmentColors.ScrollBarArrowBackgroundColorKey" />
   <ReportPart Name="ScrollBarTrackColour" SelectedThemeColourName="EnvironmentColors.ScrollBarBackgroundColorKey" />
   <ReportPart Name="ScrollBarThumbColour" SelectedThemeColourName="EnvironmentColors.ScrollBarThumbBackgroundColorKey" />
   <ReportPart Name="ComboBoxColour" SelectedThemeColourName="CommonControlsColors.ComboBoxBackgroundColorKey" />
   <ReportPart Name="ComboBoxBorderColour" SelectedThemeColourName="CommonControlsColors.ComboBoxBorderColorKey" />
   <ReportPart Name="ComboBoxTextColour" SelectedThemeColourName="CommonControlsColors.ComboBoxTextColorKey" />
-  <ReportPart Name="GrayCoverage" SelectedThemeColourName="EnvironmentColors.SystemGrayTextColorKey" />
+  <ReportPart Name="GrayCoverageColour" SelectedThemeColourName="EnvironmentColors.SystemGrayTextColorKey" />
   <ReportPart Name="BackgroundColour" SelectedThemeColourName="EnvironmentColors.ToolWindowBackgroundColorKey" />
   <ReportPart Name="FontColour" SelectedThemeColourName="EnvironmentColors.ToolWindowTextColorKey" />
   <ReportPart Name="TableBorderColour" SelectedThemeColourName="EnvironmentColors.GridLineColorKey" />
diff --git a/SharedProject/Core/ReportGenerator/IReportColours.cs b/SharedProject/Core/ReportGenerator/IReportColours.cs
index 6a074b76..d18aa6f2 100644
--- a/SharedProject/Core/ReportGenerator/IReportColours.cs
+++ b/SharedProject/Core/ReportGenerator/IReportColours.cs
@@ -29,7 +29,7 @@ internal interface IReportColours
 
         Color FontColour { get; }
 
-        Color GrayCoverage { get; }
+        Color GrayCoverageColour { get; }
 
         Color HeaderBorderColour { get; }
 
@@ -52,6 +52,12 @@ internal interface IReportColours
         Color TextBoxColour { get; }
 
         Color TextBoxTextColour { get; }
+
+        Color SliderLeftColour { get; }
+
+        Color SliderRightColour { get; }
+
+        Color SliderThumbColour { get; }
     }
 
 }
diff --git a/SharedProject/Core/ReportGenerator/JsThemeStyling.cs b/SharedProject/Core/ReportGenerator/JsThemeStyling.cs
index e83f3651..71ff2cee 100644
--- a/SharedProject/Core/ReportGenerator/JsThemeStyling.cs
+++ b/SharedProject/Core/ReportGenerator/JsThemeStyling.cs
@@ -29,14 +29,17 @@ public class JsThemeStyling
         public string DownActiveBase64;
         public string DownInactiveBase64;
         public string UpActiveBase64;
-        public string GrayCoverage;
-        public string ComboBox;
-        public string ComboBoxBorder;
-        public string ComboBoxText;
-        public string ScrollBarArrow;
-        public string ScrollBarTrack;
-        public string ScrollBarThumb;
-//#pragma warning restore SA1401 // Fields should be private
-//#pragma warning restore IDE0079 // Remove unnecessary suppression
+        public string GrayCoverageColour;
+        public string ComboBoxColour;
+        public string ComboBoxBorderColour;
+        public string ComboBoxTextColour;
+        public string ScrollBarArrowColour;
+        public string ScrollBarTrackColour;
+        public string ScrollBarThumbColour;
+        public string SliderLeftColour;
+        public string SliderRightColour;
+        public string SliderThumbColour;
+        //#pragma warning restore SA1401 // Fields should be private
+        //#pragma warning restore IDE0079 // Remove unnecessary suppression
     }
 }
diff --git a/SharedProject/Core/ReportGenerator/ReportColours.cs b/SharedProject/Core/ReportGenerator/ReportColours.cs
index db881826..6a7710ce 100644
--- a/SharedProject/Core/ReportGenerator/ReportColours.cs
+++ b/SharedProject/Core/ReportGenerator/ReportColours.cs
@@ -29,7 +29,7 @@ internal class ReportColours : IReportColours
 
         public Color FontColour { get; set; }
 
-        public Color GrayCoverage { get; set; }
+        public Color GrayCoverageColour { get; set; }
 
         public Color HeaderBorderColour { get; set; }
 
@@ -52,6 +52,12 @@ internal class ReportColours : IReportColours
         public Color TextBoxColour { get; set; }
 
         public Color TextBoxTextColour { get; set; }
+
+        public Color SliderLeftColour { get; set; }
+
+        public Color SliderRightColour { get; set; }
+
+        public Color SliderThumbColour { get; set; }
     }
 
 }
diff --git a/SharedProject/Core/ReportGenerator/ReportColoursExtensions.cs b/SharedProject/Core/ReportGenerator/ReportColoursExtensions.cs
new file mode 100644
index 00000000..c1f96aca
--- /dev/null
+++ b/SharedProject/Core/ReportGenerator/ReportColoursExtensions.cs
@@ -0,0 +1,54 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+
+namespace FineCodeCoverage.Engine.ReportGenerator
+{
+	internal static class ReportColoursExtensions
+	{
+		private class ColourReflection
+		{
+			public PropertyInfo ReportColoursPropertyInfo { get; set; }
+			public FieldInfo JsThemeStylingFieldInfo { get; set; }
+		}
+		private static List<ColourReflection> colourReflections;
+		private static List<ColourReflection> ColourReflections
+		{
+			get
+			{
+				if (colourReflections == null)
+				{
+					var reportColourPropertyInfos = typeof(IReportColours).GetProperties();
+					var jsThemeStylingFieldInfos = typeof(JsThemeStyling).GetFields();
+					colourReflections = reportColourPropertyInfos.Select(prop =>
+					{
+						var field = jsThemeStylingFieldInfos.FirstOrDefault(f => f.Name == prop.Name);
+						if (field == null)
+						{
+							return null;
+						}
+						else
+						{
+							return new ColourReflection { ReportColoursPropertyInfo = prop, JsThemeStylingFieldInfo = field };
+						}
+					}).Where(cr => cr != null).ToList();
+				}
+				return colourReflections;
+			}
+		}
+		public static JsThemeStyling Convert(this IReportColours reportColours)
+		{
+			var jsThemeStyling = new JsThemeStyling();
+			ColourReflections.ForEach(cr =>
+			{
+				cr.JsThemeStylingFieldInfo.SetValue(jsThemeStyling, ((System.Drawing.Color)cr.ReportColoursPropertyInfo.GetValue(reportColours)).ToJsColour());
+			});
+			return jsThemeStyling;
+		}
+
+		public static string ToJsColour(this System.Drawing.Color colour)
+		{
+			return $"rgba({colour.R},{colour.G},{colour.B},{colour.A})";
+		}
+	}
+}
diff --git a/SharedProject/Core/ReportGenerator/ReportColoursProvider.cs b/SharedProject/Core/ReportGenerator/ReportColoursProvider.cs
index 96cc6aaa..95dd7512 100644
--- a/SharedProject/Core/ReportGenerator/ReportColoursProvider.cs
+++ b/SharedProject/Core/ReportGenerator/ReportColoursProvider.cs
@@ -13,7 +13,7 @@ internal class ReportColoursProvider : IReportColoursProvider
 
         public event EventHandler<IReportColours> ColoursChanged;
 
-        private static PropertyInfo[] propertyInfos;
+        private static readonly PropertyInfo[] propertyInfos;
         static ReportColoursProvider()
         {
             propertyInfos = typeof(ReportColours).GetProperties();
diff --git a/SharedProject/Core/ReportGenerator/ReportGeneratorUtil.cs b/SharedProject/Core/ReportGenerator/ReportGeneratorUtil.cs
index 3ce3c8de..6d218c2e 100644
--- a/SharedProject/Core/ReportGenerator/ReportGeneratorUtil.cs
+++ b/SharedProject/Core/ReportGenerator/ReportGeneratorUtil.cs
@@ -54,10 +54,26 @@ internal partial class ReportGeneratorUtil : IReportGeneratorUtil
 		private readonly Base64ReportImage upActiveBase64ReportImage = new Base64ReportImage(".icon-up-dir_active", "PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjxzdmcgd2lkdGg9IjE3OTIiIGhlaWdodD0iMTc5MiIgdmlld0JveD0iMCAwIDE3OTIgMTc5MiIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cGF0aCBmaWxsPSIjMDA3OEQ0IiBkPSJNMTQwOCAxMjE2cTAgMjYtMTkgNDV0LTQ1IDE5aC04OTZxLTI2IDAtNDUtMTl0LTE5LTQ1IDE5LTQ1bDQ0OC00NDhxMTktMTkgNDUtMTl0NDUgMTlsNDQ4IDQ0OHExOSAxOSAxOSA0NXoiLz48L3N2Zz4=");
         private readonly IScriptInvoker scriptInvoker;
 		private IReportColours reportColours;
+		private JsThemeStyling jsReportColours;
+		private IReportColours ReportColours
+        {
+			get => reportColours;
+            set
+            {
+				reportColours = value;
+				jsReportColours = reportColours.Convert();
+            }
+        }
 		private readonly bool showBranchCoverage = true;
 
 		public string ReportGeneratorExePath { get; private set; }
 
+		
+		static ReportGeneratorUtil()
+        {
+			
+			
+        }
 		[ImportingConstructor]
 		public ReportGeneratorUtil(
 			IAssemblyUtil assemblyUtil,
@@ -182,10 +198,9 @@ async Task<bool> run(string outputReportType, string inputReports)
 
 		private void SetInitialTheme(HtmlAgilityPack.HtmlDocument document)
 		{
-			
-			var backgroundColor = ToJsColour(reportColours.BackgroundColour);
-			var fontColour = ToJsColour(reportColours.FontColour);
-			var overviewTableBorderColor = ToJsColour(reportColours.TableBorderColour);
+			var backgroundColor = jsReportColours.BackgroundColour;
+			var fontColour = jsReportColours.FontColour;
+			var overviewTableBorderColor = jsReportColours.TableBorderColour;
 
 			var style = document.DocumentNode.Descendants("style").First();
 
@@ -203,7 +218,7 @@ Other option
                 be *dynamic* and be lighten / darken %age of the background color
             */
 			var grayRule = styleRules.First(r => r.SelectorText == ".gray");
-			grayRule.Style.BackgroundColor = ToJsColour(reportColours.GrayCoverage);
+			grayRule.Style.BackgroundColor = jsReportColours.GrayCoverageColour;
 
 			var htmlRule = styleRules.First(r => r.Selector.Text == "html");
 			var htmlStyle = htmlRule.Style;
@@ -224,22 +239,22 @@ Other option
 			overviewRule.Style.Border = overviewTableBorder;
 
 			var overviewHeaderLinks = styleRules.First(r => r.SelectorText == ".overview th a");
-			overviewHeaderLinks.Style.Color = ToJsColour(reportColours.CoverageTableHeaderFontColour);
+			overviewHeaderLinks.Style.Color = jsReportColours.CoverageTableHeaderFontColour;
 
 			var overviewTrHoverRule = styleRules.First(r => r.SelectorText == ".overview tr:hover");
-			overviewTrHoverRule.Style.Background = ToJsColour(reportColours.CoverageTableRowHoverBackgroundColour);
+			overviewTrHoverRule.Style.Background = jsReportColours.CoverageTableRowHoverBackgroundColour;
 
-			var expandCollapseIconColor = reportColours.CoverageTableExpandCollapseIconColour;
-			plusBase64ReportImage.FillSvg(styleRules, ToJsColour(expandCollapseIconColor));
-			minusBase64ReportImage.FillSvg(styleRules, ToJsColour(expandCollapseIconColor));
+			var expandCollapseIconColor = ReportColours.CoverageTableExpandCollapseIconColour;
+			plusBase64ReportImage.FillSvg(styleRules, expandCollapseIconColor.ToJsColour());
+			minusBase64ReportImage.FillSvg(styleRules, expandCollapseIconColor.ToJsColour());
 
-			var coverageTableActiveSortColor = ToJsColour(reportColours.CoverageTableActiveSortColour);
-			var coverageTableInactiveSortColor = ToJsColour(reportColours.CoverageTableInactiveSortColour);
+			var coverageTableActiveSortColor = ReportColours.CoverageTableActiveSortColour.ToJsColour();
+			var coverageTableInactiveSortColor = ReportColours.CoverageTableInactiveSortColour.ToJsColour();
 			downActiveBase64ReportImage.FillSvg(styleRules, coverageTableActiveSortColor);
 			upActiveBase64ReportImage.FillSvg(styleRules, coverageTableActiveSortColor);
 			downInactiveBase64ReportImage.FillSvg(styleRules, coverageTableInactiveSortColor);
 
-			var linkColor = ToJsColour(reportColours.LinkColour);
+			var linkColor = jsReportColours.LinkColour;
 			var linkRule = styleRules.First(r => r.SelectorText == "a");
 			var linkHoverRule = styleRules.First(r => r.SelectorText == "a:hover");
 
@@ -750,12 +765,12 @@ private string HideGroupingCss()
 ";
 		}
 
-		private string HackGroupingToAllowAll()
+		private string HackGroupingToAllowAll(int groupingLevel)
         {
-			return @"
+			return $@"
 				var customizeBox = document.getElementsByClassName('customizebox')[0];
 				var groupingInput = customizeBox.querySelector('input');
-				groupingInput.max = 1;
+				groupingInput.max = {groupingLevel};
 ";
 
 		}
@@ -764,7 +779,7 @@ public string ProcessUnifiedHtml(string htmlForProcessing, string reportOutputFo
 		{
 			var appOptions = appOptionsProvider.Get();
 			var namespacedClasses = appOptions.NamespacedClasses;
-			reportColours = reportColoursProvider.GetColours();
+			ReportColours = reportColoursProvider.GetColours();
 			return assemblyUtil.RunInAssemblyResolvingContext(() =>
 			{
 				var (cyclomaticThreshold, crapScoreThreshold, nPathThreshold) = HotspotThresholds();
@@ -807,6 +822,7 @@ public string ProcessUnifiedHtml(string htmlForProcessing, string reportOutputFo
 				assembliesToReplace = assembliesToReplace.Substring(0, endIndex + 1);
 
 				var assemblies = JArray.Parse(assembliesToReplace);
+				var groupingLevel = 0;
 				foreach (JObject assembly in assemblies)
 				{
 					var assemblyName = assembly["name"];
@@ -822,6 +838,11 @@ public string ProcessUnifiedHtml(string htmlForProcessing, string reportOutputFo
 						}
 						else
 						{
+							var namespaces = className.Split('.').Length - 1;
+							if (namespaces > groupingLevel)
+							{
+								groupingLevel = namespaces;
+							}
 							if (!namespacedClasses)
 							{
 								// simplify name
@@ -871,8 +892,9 @@ public string ProcessUnifiedHtml(string htmlForProcessing, string reportOutputFo
 
 				htmlSb.Replace(".table-fixed", ".table-fixed-ignore-me");
 
-				var fontColour = ToJsColour(reportColours.FontColour);
-				var scrollbarThumbColour = ToJsColour(reportColours.ScrollBarThumbColour);
+				var fontColour = jsReportColours.FontColour;
+				var scrollbarThumbColour = jsReportColours.ScrollBarThumbColour;
+				var sliderThumbColour = jsReportColours.SliderThumbColour;
 				htmlSb.Replace("</head>", $@"
 				<style id=""fccStyle1"" type=""text/css"">
 					*, body {{ font-size: small;  color: {fontColour}}}
@@ -884,12 +906,12 @@ public string ProcessUnifiedHtml(string htmlForProcessing, string reportOutputFo
 					table.overview th, table.overview td {{ font-size: small; white-space: nowrap; word-break: normal; padding-left:10px;padding-right:10px; }}
 					{GetGroupingCss(namespacedClasses)}
 					table,tr,th,td {{ border: 1px solid; font-size: small; }}
-					input[type=text] {{ color:{ToJsColour(reportColours.TextBoxTextColour)}; background-color:{ToJsColour(reportColours.TextBoxColour)};border-color:{ToJsColour(reportColours.TextBoxBorderColour)} }}
-					select {{ color:{ToJsColour(reportColours.ComboBoxTextColour)}; background-color:{ToJsColour(reportColours.ComboBoxColour)};border-color:{ToJsColour(reportColours.ComboBoxBorderColour)} }}
-                    body, html {{ scrollbar-arrow-color:{ToJsColour(reportColours.ScrollBarArrowColour)};scrollbar-track-color:{ToJsColour(reportColours.ScrollBarTrackColour)};scrollbar-face-color:{scrollbarThumbColour};scrollbar-shadow-color:{scrollbarThumbColour};scrollbar-highlight-color:{scrollbarThumbColour};scrollbar-3dlight-color:{scrollbarThumbColour};scrollbar-darkshadow-color:{scrollbarThumbColour} }}				
+					input[type=text] {{ color:{jsReportColours.TextBoxTextColour}; background-color:{jsReportColours.TextBoxColour};border-color:{jsReportColours.TextBoxBorderColour} }}
+					select {{ color:{jsReportColours.ComboBoxTextColour}; background-color:{jsReportColours.ComboBoxColour};border-color:{jsReportColours.ComboBoxBorderColour} }}
+                    body, html {{ scrollbar-arrow-color:{jsReportColours.ScrollBarArrowColour};scrollbar-track-color:{jsReportColours.ScrollBarTrackColour};scrollbar-face-color:{scrollbarThumbColour};scrollbar-shadow-color:{scrollbarThumbColour};scrollbar-highlight-color:{scrollbarThumbColour};scrollbar-3dlight-color:{scrollbarThumbColour};scrollbar-darkshadow-color:{scrollbarThumbColour} }}				
 					input[type=range]::-ms-thumb {{
-					  background: {scrollbarThumbColour};
-					  border: {scrollbarThumbColour}
+					  background: {sliderThumbColour};
+					  border: {sliderThumbColour}
 					}}
 					input[type=range]::-ms-track {{
 						color: transparent;
@@ -898,10 +920,10 @@ public string ProcessUnifiedHtml(string htmlForProcessing, string reportOutputFo
 					}}
 					
 					input[type=range]::-ms-fill-lower {{
-					  background: {ToJsColour(reportColours.ScrollBarTrackColour)};  
+					  background: {jsReportColours.SliderLeftColour};  
 					}}
 					input[type=range]::-ms-fill-upper {{
-					  background: {ToJsColour(reportColours.ScrollBarTrackColour)}; 
+					  background: {jsReportColours.SliderRightColour}; 
 					}}
 				</style>
 				</head>
@@ -910,7 +932,7 @@ public string ProcessUnifiedHtml(string htmlForProcessing, string reportOutputFo
 				htmlSb.Replace("</body>", $@"
 					<script type=""text/javascript"">
 						{GetStickyTableHead()}
-						{HackGroupingToAllowAll()}
+						{HackGroupingToAllowAll(groupingLevel)}
 						function getRuleBySelector(cssRules,selector){{
 						for(var i=0;i<cssRules.length;i++){{
 							if(cssRules[i].selectorText == selector){{
@@ -934,26 +956,26 @@ function getStyleSheetById(id){{
 							var fccMediaStylesheet = getStyleSheetById('fccMediaStyle');	
 							var highContrastRule = fccMediaStylesheet.cssRules[0]
 							var highContrastRules = highContrastRule.cssRules
-							getStyleBySelector(highContrastRules,'table.coverage > td.gray').setProperty('background-color',theme.{nameof(JsThemeStyling.GrayCoverage)});
+							getStyleBySelector(highContrastRules,'table.coverage > td.gray').setProperty('background-color',theme.{nameof(JsThemeStyling.GrayCoverageColour)});
 
 							var fccStyleSheet1Rules = getStyleSheetById('fccStyle1').cssRules;		
 					
 							var rangeInputFillLower = getStyleBySelector(fccStyleSheet1Rules, 'input[type=range]::-ms-fill-lower');
-							rangeInputFillLower.setProperty('background',theme.{nameof(JsThemeStyling.ScrollBarTrack)});
+							rangeInputFillLower.setProperty('background',theme.{nameof(JsThemeStyling.SliderLeftColour)});
 							var rangeInputFillUpper = getStyleBySelector(fccStyleSheet1Rules, 'input[type=range]::-ms-fill-upper');
-							rangeInputFillUpper.setProperty('background',theme.{nameof(JsThemeStyling.ScrollBarTrack)});
+							rangeInputFillUpper.setProperty('background',theme.{nameof(JsThemeStyling.SliderRightColour)});
 							var rangeInputThumb = getStyleBySelector(fccStyleSheet1Rules, 'input[type=range]::-ms-thumb');
-							rangeInputThumb.setProperty('background',theme.{nameof(JsThemeStyling.ScrollBarThumb)});
-							rangeInputThumb.setProperty('border',theme.{nameof(JsThemeStyling.ScrollBarThumb)});
+							rangeInputThumb.setProperty('background',theme.{nameof(JsThemeStyling.SliderThumbColour)});
+							rangeInputThumb.setProperty('border',theme.{nameof(JsThemeStyling.SliderThumbColour)});
 
 							var scrollBarStyle = getStyleBySelector(fccStyleSheet1Rules,'body, html');
-							scrollBarStyle.setProperty('scrollbar-arrow-color',theme.{nameof(JsThemeStyling.ScrollBarArrow)});
-							scrollBarStyle.setProperty('scrollbar-track-color',theme.{nameof(JsThemeStyling.ScrollBarTrack)});
-							scrollBarStyle.setProperty('scrollbar-face-color',theme.{nameof(JsThemeStyling.ScrollBarThumb)});
-							scrollBarStyle.setProperty('scrollbar-shadow-color',theme.{nameof(JsThemeStyling.ScrollBarThumb)});
-							scrollBarStyle.setProperty('scrollbar-highlight-color',theme.{nameof(JsThemeStyling.ScrollBarThumb)});
-							scrollBarStyle.setProperty('scrollbar-3dlight-color',theme.{nameof(JsThemeStyling.ScrollBarThumb)});
-							scrollBarStyle.setProperty('scrollbar-darkshadow-color',theme.{nameof(JsThemeStyling.ScrollBarThumb)});
+							scrollBarStyle.setProperty('scrollbar-arrow-color',theme.{nameof(JsThemeStyling.ScrollBarArrowColour)});
+							scrollBarStyle.setProperty('scrollbar-track-color',theme.{nameof(JsThemeStyling.ScrollBarTrackColour)});
+							scrollBarStyle.setProperty('scrollbar-face-color',theme.{nameof(JsThemeStyling.ScrollBarThumbColour)});
+							scrollBarStyle.setProperty('scrollbar-shadow-color',theme.{nameof(JsThemeStyling.ScrollBarThumbColour)});
+							scrollBarStyle.setProperty('scrollbar-highlight-color',theme.{nameof(JsThemeStyling.ScrollBarThumbColour)});
+							scrollBarStyle.setProperty('scrollbar-3dlight-color',theme.{nameof(JsThemeStyling.ScrollBarThumbColour)});
+							scrollBarStyle.setProperty('scrollbar-darkshadow-color',theme.{nameof(JsThemeStyling.ScrollBarThumbColour)});
 
 							getStyleBySelector(fccStyleSheet1Rules,'*, body').setProperty('color',theme.{nameof(JsThemeStyling.FontColour)});
 							var textStyle = getStyleBySelector(fccStyleSheet1Rules,'input[type=text]');
@@ -962,9 +984,9 @@ function getStyleSheetById(id){{
 							textStyle.setProperty('border-color',theme.{nameof(JsThemeStyling.TextBoxBorderColour)});
 
 							var comboStyle = getStyleBySelector(fccStyleSheet1Rules,'select');
-							comboStyle.setProperty('color',theme.{nameof(JsThemeStyling.ComboBoxText)});		
-							comboStyle.setProperty('background-color',theme.{nameof(JsThemeStyling.ComboBox)});	
-							comboStyle.setProperty('border-color',theme.{nameof(JsThemeStyling.ComboBoxBorder)});
+							comboStyle.setProperty('color',theme.{nameof(JsThemeStyling.ComboBoxTextColour)});		
+							comboStyle.setProperty('background-color',theme.{nameof(JsThemeStyling.ComboBoxColour)});	
+							comboStyle.setProperty('border-color',theme.{nameof(JsThemeStyling.ComboBoxBorderColour)});
 
 							var fccStyleSheet2Rules = getStyleSheetById('fccStyle2').cssRules;	
 							getStyleBySelector(fccStyleSheet2Rules,'#divHeader').setProperty('background-color',theme.{nameof(JsThemeStyling.DivHeaderBackgroundColour)});							
@@ -976,7 +998,7 @@ function getStyleSheetById(id){{
 							var mainStyle = document.styleSheets[0];
 							var mainRules = mainStyle.cssRules;
 
-							getStyleBySelector(mainRules,'.gray').setProperty('background-color',theme.{nameof(JsThemeStyling.GrayCoverage)});
+							getStyleBySelector(mainRules,'.gray').setProperty('background-color',theme.{nameof(JsThemeStyling.GrayCoverageColour)});
 
 							getStyleBySelector(mainRules,'html').setProperty('background-color',theme.{nameof(JsThemeStyling.BackgroundColour)});
 							getStyleBySelector(mainRules,'.container').setProperty('background-color',theme.{nameof(JsThemeStyling.BackgroundColour)});
@@ -1064,7 +1086,7 @@ function getStyleSheetById(id){{
 					@media screen and (-ms-high-contrast:active){{
 						table.coverage > td.green{{ background-color: windowText }}
 						table.coverage > td.gray{{ 
-							background-color: {ToJsColour(reportColours.GrayCoverage)}
+							background-color: {jsReportColours.GrayCoverageColour}
 						}}
 	
 					}}
@@ -1077,11 +1099,11 @@ @media screen and (-ms-high-contrast:active){{
 					<body oncontextmenu='return false;'>
 					<style id='fccStyle2'>
 						#divHeader {{
-							background-color: {ToJsColour(reportColours.DivHeaderBackgroundColour)};
+							background-color: {jsReportColours.DivHeaderBackgroundColour};
 						}}
 						table#headerTabs td {{
-							color: {ToJsColour(reportColours.HeaderFontColour)};
-							border-color: {ToJsColour(reportColours.HeaderBorderColour)};
+							color: {jsReportColours.HeaderFontColour};
+							border-color: {jsReportColours.HeaderBorderColour};
 						}}	
 						table#headerTabs td {{
 							border-width:3px;
@@ -1091,7 +1113,7 @@ @media screen and (-ms-high-contrast:active){{
 						}}
 						table#headerTabs td.tab {{
 							cursor: pointer;
-							background-color : {ToJsColour(reportColours.TabBackgroundColour)};
+							background-color : {jsReportColours.TabBackgroundColour};
 						}}
 						table#headerTabs td.active {{
 							border-bottom: 3px solid transparent;
@@ -1341,52 +1363,23 @@ private void HideRowsFromOverviewTable(HtmlDocument doc)
 
 		private void ReportColoursProvider_ColoursChanged(object sender, IReportColours reportColours)
 		{
-			var coverageTableActiveSortColour = reportColours.CoverageTableActiveSortColour;
-			var coverageTableExpandCollapseIconColour = reportColours.CoverageTableExpandCollapseIconColour;
-			var jsThemeStyling = new JsThemeStyling
-			{
-				BackgroundColour = ToJsColour(reportColours.BackgroundColour),
-
-				CoverageTableHeaderFontColour = ToJsColour(reportColours.CoverageTableHeaderFontColour),
-
-				DownActiveBase64 = downActiveBase64ReportImage.Base64FromColour(ToJsColour(coverageTableActiveSortColour)),
-				UpActiveBase64 = upActiveBase64ReportImage.Base64FromColour(ToJsColour(coverageTableActiveSortColour)),
-
-				DownInactiveBase64 = downInactiveBase64ReportImage.Base64FromColour(ToJsColour(reportColours.CoverageTableInactiveSortColour)),
-
-				MinusBase64 = minusBase64ReportImage.Base64FromColour(ToJsColour(coverageTableExpandCollapseIconColour)),
-				PlusBase64 = plusBase64ReportImage.Base64FromColour(ToJsColour(coverageTableExpandCollapseIconColour)),
-
-				CoverageTableRowHoverBackgroundColour = ToJsColour(reportColours.CoverageTableRowHoverBackgroundColour),
-				DivHeaderBackgroundColour = ToJsColour(reportColours.DivHeaderBackgroundColour),
-				FontColour = ToJsColour(reportColours.FontColour),
-				HeaderBorderColour = ToJsColour(reportColours.HeaderBorderColour),
-				HeaderFontColour = ToJsColour(reportColours.HeaderFontColour),
-				LinkColour = ToJsColour(reportColours.LinkColour),
-				TableBorderColour = ToJsColour(reportColours.TableBorderColour),
-				TextBoxBorderColour = ToJsColour(reportColours.TextBoxBorderColour),
-				TextBoxColour = ToJsColour(reportColours.TextBoxColour),
-				TextBoxTextColour = ToJsColour(reportColours.TextBoxTextColour),
-				TabBackgroundColour = ToJsColour(reportColours.TabBackgroundColour),
-
-				GrayCoverage = ToJsColour(reportColours.GrayCoverage),
-
-				ComboBox = ToJsColour(reportColours.ComboBoxColour),
-				ComboBoxBorder = ToJsColour(reportColours.ComboBoxBorderColour),
-				ComboBoxText = ToJsColour(reportColours.ComboBoxTextColour),
-
-				ScrollBarArrow = ToJsColour(reportColours.ScrollBarArrowColour),
-				ScrollBarTrack = ToJsColour(reportColours.ScrollBarTrackColour),
-				ScrollBarThumb = ToJsColour(reportColours.ScrollBarThumbColour)
-			};
-
+			var jsThemeStyling = reportColours.Convert();
+
+			var coverageTableActiveSortColour = reportColours.CoverageTableActiveSortColour.ToJsColour();
+			var coverageTableExpandCollapseIconColour = reportColours.CoverageTableExpandCollapseIconColour.ToJsColour();
+			jsThemeStyling.DownActiveBase64 = downActiveBase64ReportImage.Base64FromColour(coverageTableActiveSortColour);
+			jsThemeStyling.UpActiveBase64 = upActiveBase64ReportImage.Base64FromColour(coverageTableActiveSortColour);
+			jsThemeStyling.DownInactiveBase64 = downInactiveBase64ReportImage.Base64FromColour(reportColours.CoverageTableInactiveSortColour.ToJsColour());
+			jsThemeStyling.MinusBase64 = minusBase64ReportImage.Base64FromColour(coverageTableExpandCollapseIconColour);
+			jsThemeStyling.PlusBase64 = plusBase64ReportImage.Base64FromColour(coverageTableExpandCollapseIconColour);
+			
 			scriptInvoker.InvokeScript(ThemeChangedJSFunctionName, jsThemeStyling);
 		}
 
-		private string ToJsColour(System.Drawing.Color colour)
-		{
-			return $"rgba({colour.R},{colour.G},{colour.B},{colour.A})";
-		}
+		//private string ToJsColour(System.Drawing.Color colour)
+		//{
+		//	return $"rgba({colour.R},{colour.G},{colour.B},{colour.A})";
+		//}
 
 	}
 }
diff --git a/SharedProject/Core/ReportGenerator/ThemeResourceKeyProvider.cs b/SharedProject/Core/ReportGenerator/ThemeResourceKeyProvider.cs
index 20f34aae..6209b3ec 100644
--- a/SharedProject/Core/ReportGenerator/ThemeResourceKeyProvider.cs
+++ b/SharedProject/Core/ReportGenerator/ThemeResourceKeyProvider.cs
@@ -12,7 +12,7 @@ namespace FineCodeCoverage.Engine.ReportGenerator
     [Export(typeof(IThemeResourceKeyProvider))]
     internal class ThemeResourceKeyProvider : IThemeResourceKeyProvider
     {
-        private XElement root;
+        private readonly XElement root;
         public ThemeResourceKeyProvider()
         {
             var fccExtensionsDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
diff --git a/SharedProject/SharedProject.projitems b/SharedProject/SharedProject.projitems
index 2f1947c3..ca874b33 100644
--- a/SharedProject/SharedProject.projitems
+++ b/SharedProject/SharedProject.projitems
@@ -85,6 +85,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Core\ReportGenerator\IThemeResourceKeyProvider.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\ReportGenerator\JsThemeStyling.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\ReportGenerator\ReportColours.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Core\ReportGenerator\ReportColoursExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\ReportGenerator\ReportColoursProvider.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\ReportGenerator\ReportGeneratorUtil.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\ReportGenerator\ThemeResourceKeyProvider.cs" />