diff --git a/.gitignore b/.gitignore
index d311a43..743211d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,6 @@ hs_err_pid*
 target/
 test-output/
 *.iml
+
+# nexus
+deploycmd.txt
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ff9697..ca627b6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+## [4.1.3](https://github.com/extent-framework/extentreports-java/compare/v4.1.2...v4.1.3)
+#### Improvements
+* [#119] `ExtentSparkReporter` now displays thumbnails as default 
+
+#### Fixes
+* [#123] Prevent class cast exception in `ExtentHtmlReporterConfiguration`  
+* [#124] Fixes issue with `ExtentHtmlReporter` throwing freemarker errors due to image path being empty
+ 
+#### Deprecation
+* ExtentHtmlReporter has been deprecated. ExtentSparkReporter is the default reporter starting version 4 and it now supports SPA-style view by default. 
+
 ## [4.1.2](https://github.com/extent-framework/extentreports-java/compare/v4.1.1...v4.1.2)
 #### Improvements
 * [#114] Tags tab lost a display of a full name of test
diff --git a/pom-nexus.xml b/pom-nexus.xml
index 6f0ec20..084aa94 100644
--- a/pom-nexus.xml
+++ b/pom-nexus.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.aventstack</groupId>
 	<artifactId>extentreports</artifactId>
-	<version>4.1.2</version>
+	<version>4.1.3</version>
 
 	<name>extentreports</name>
 	<url>www.extentreports.com</url>
diff --git a/pom.xml b/pom.xml
index feb05d5..084aa94 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.aventstack</groupId>
 	<artifactId>extentreports</artifactId>
-	<version>4.1.2</version>
+	<version>4.1.3</version>
 
 	<name>extentreports</name>
 	<url>www.extentreports.com</url>
@@ -114,9 +114,92 @@
 				<artifactId>maven-resources-plugin</artifactId>
 				<version>2.7</version>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-gpg-plugin</artifactId>
+				<version>1.6</version>
+				<executions>
+					<execution>
+						<id>sign-artifacts</id>
+						<phase>verify</phase>
+						<goals>
+							<goal>sign</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.jacoco</groupId>
+				<artifactId>jacoco-maven-plugin</artifactId>
+				<version>0.7.9</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>prepare-agent</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>report</id>
+						<phase>test</phase>
+						<goals>
+							<goal>report</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 
+	<profiles>
+		<profile>
+			<id>release-sign-artifacts</id>
+			<activation>
+				<property>
+					<name>performRelease</name>
+					<value>true</value>
+				</property>
+			</activation>
+			<properties>
+				<gpg.keyname>41414BBD</gpg.keyname>
+				<!-- GPG Key ID to use for signing -->
+				<release.username>anshooarora</release.username>
+				<!-- username for our svn repository -->
+			</properties>
+			<build>
+				<resources>
+				</resources>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-source-plugin</artifactId>
+						<version>2.3</version>
+						<executions>
+							<execution>
+								<id>attach-sources</id>
+								<goals>
+									<goal>jar</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-javadoc-plugin</artifactId>
+						<version>2.3</version>
+						<executions>
+							<execution>
+								<id>attach-javadocs</id>
+								<goals>
+									<goal>jar</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+
 	<distributionManagement>
 		<snapshotRepository>
 			<id>ossrh</id>
diff --git a/src/main/java/com/aventstack/extentreports/reporter/BasicFileReporter.java b/src/main/java/com/aventstack/extentreports/reporter/BasicFileReporter.java
index 92cf3b3..9caf04a 100644
--- a/src/main/java/com/aventstack/extentreports/reporter/BasicFileReporter.java
+++ b/src/main/java/com/aventstack/extentreports/reporter/BasicFileReporter.java
@@ -167,8 +167,8 @@ protected Configuration getFreemarkerConfig() {
 
 	protected Boolean enforceOfflineMode() {
 		if (getConfigurationStore().containsConfig("enableOfflineMode")) {
-			String offlineMode = String.valueOf(getConfigurationStore().containsConfig("enableOfflineMode"));
-			if (!getConfigurationStore().containsConfig("offlineDirectory") && offlineMode.equals("true")) {
+			String offlineMode = String.valueOf(getConfigurationStore().getConfig("enableOfflineMode"));
+			if (!getConfigurationStore().containsConfig("offlineDirectory") && Boolean.parseBoolean(offlineMode)) {
 				return true;
 			}
 		}
diff --git a/src/main/java/com/aventstack/extentreports/reporter/ExtentHtmlReporter.java b/src/main/java/com/aventstack/extentreports/reporter/ExtentHtmlReporter.java
index 11c7d40..93ec7da 100644
--- a/src/main/java/com/aventstack/extentreports/reporter/ExtentHtmlReporter.java
+++ b/src/main/java/com/aventstack/extentreports/reporter/ExtentHtmlReporter.java
@@ -15,6 +15,7 @@
  * The ExtentSparkReporter creates a rich standalone spark file. It allows
  * several configuration options via the <code>config()</code> method.
  */
+@Deprecated
 public class ExtentHtmlReporter extends BasicFileReporter {
 
 	private static final Logger logger = Logger.getLogger(ExtentHtmlReporter.class.getName());
diff --git a/src/main/java/com/aventstack/extentreports/reporter/configuration/ExtentHtmlReporterConfiguration.java b/src/main/java/com/aventstack/extentreports/reporter/configuration/ExtentHtmlReporterConfiguration.java
index b7f5915..b44b73b 100644
--- a/src/main/java/com/aventstack/extentreports/reporter/configuration/ExtentHtmlReporterConfiguration.java
+++ b/src/main/java/com/aventstack/extentreports/reporter/configuration/ExtentHtmlReporterConfiguration.java
@@ -5,8 +5,8 @@
 
 import com.aventstack.extentreports.ExtentReports;
 import com.aventstack.extentreports.offline.OfflineResxDelegate;
+import com.aventstack.extentreports.reporter.BasicFileReporter;
 import com.aventstack.extentreports.reporter.ExtentHtmlReporter;
-import com.aventstack.extentreports.reporter.ExtentSparkReporter;
 import com.aventstack.extentreports.utils.FileUtil;
 
 /**
@@ -28,7 +28,7 @@ public void enableOfflineMode(Boolean offline) {
 		getConfigurationStore().storeConfig("enableOfflineMode", String.valueOf(offline));
 		getConfigurationStore().storeConfig("offlineDirectory", getReporter().getReporterName() + "/");
 		if (offline) {
-			File f = getTargetDirectory(((ExtentSparkReporter) getReporter()).getFileFile());
+			File f = getTargetDirectory(((BasicFileReporter) getReporter()).getFileFile());
 			String s = "/";
 			String resourcePackagePath = ExtentReports.class.getPackage().getName().replace(".", s);
 			resourcePackagePath += s + "offline" + s;
diff --git a/src/main/resources/com/aventstack/extentreports/view/spark/partials/standard-content.ftl b/src/main/resources/com/aventstack/extentreports/view/spark/partials/standard-content.ftl
index 0cbdf50..c03fe81 100644
--- a/src/main/resources/com/aventstack/extentreports/view/spark/partials/standard-content.ftl
+++ b/src/main/resources/com/aventstack/extentreports/view/spark/partials/standard-content.ftl
@@ -8,19 +8,8 @@
 	<ul class="attachments">
 		<#list test.screenCaptureContext.all as sc>
 		<li>
-			<a href="${sc.screenCapturePath}" data-featherlight="image">
-				<div class="file-icon">
-					<i class="fa fa-file-image-o"></i> 
-				</div>
-				<div class="file-info">
-					<#if sc.isBase64()>
-					<span class="file-name">base64</span>
-					<span class="file-size">0Kb</span>
-					<#else>
-					<span class="file-name">${sc.name}</span>
-					<span class="file-size"> ${sc.fileSize}Kb</span>
-					</#if>
-				</div>
+			<a href="#" data-featherlight="image">
+				${sc.source}
 			</a>
 		</li>
 		</#list>
diff --git a/src/main/resources/com/aventstack/extentreports/view/v3html/test-view/v3-html-bdd.ftl b/src/main/resources/com/aventstack/extentreports/view/v3html/test-view/v3-html-bdd.ftl
index c4fd719..1b33f2e 100644
--- a/src/main/resources/com/aventstack/extentreports/view/v3html/test-view/v3-html-bdd.ftl
+++ b/src/main/resources/com/aventstack/extentreports/view/v3html/test-view/v3-html-bdd.ftl
@@ -1,78 +1,92 @@
 <div class="sr-filters bdd-filters">
-    <a class="btn-floating waves-effect waves-light pass green" title="pass"><i class='material-icons'>${MaterialIcon.getIcon(Status.PASS)}</i></a>
-    <a class="btn-floating waves-effect waves-light fail red" title="fail"><i class='material-icons'>${MaterialIcon.getIcon(Status.FAIL)}</i></a>
-    <a class="btn-floating waves-effect waves-light skip blue" title="skip"><i class='material-icons'>${MaterialIcon.getIcon(Status.SKIP)}</i></a>
-    <a class="btn-floating waves-effect waves-light clear grey" title="clear"><i class='material-icons'>clear</i></a>
+	<a class="btn-floating waves-effect waves-light pass green" title="pass"><i class='material-icons'>${MaterialIcon.getIcon(Status.PASS)}</i></a>
+	<a class="btn-floating waves-effect waves-light fail red" title="fail"><i class='material-icons'>${MaterialIcon.getIcon(Status.FAIL)}</i></a>
+	<a class="btn-floating waves-effect waves-light skip blue" title="skip"><i class='material-icons'>${MaterialIcon.getIcon(Status.SKIP)}</i></a>
+	<a class="btn-floating waves-effect waves-light clear grey" title="clear"><i class='material-icons'>clear</i></a>
 </div>
 <#if test.description?? && test.description?has_content>
 <div class='test-desc'>${test.description}</div>
 </#if>
 <#list test.nodeContext.all as node>
 <div class='${node.behaviorDrivenTypeName?lower_case} node' test-id='${node.getId()}' status='${node.status}'>
-    <#if TestService.testHasCategory(node)>
-    <div class='category-list'>
-        <#list node.categoryContext.all as category>
-        <span class='category label'>${category.name}</span>
-        </#list>
-    </div>
-    </#if>
-    <span class='duration right label'>${TestService.getRunDuration(node)}</span>
-    <div class="bdd-test">
-        <div class="scenario-name"><span class='status ${node.status}' title='${node.status}'><i class='material-icons'>${MaterialIcon.getIcon(node.status)}</i></span> ${node.behaviorDrivenTypeName}: ${node.name}</div>
-        <#if TestService.testHasScreenCapture(node)>
-        <ul class='screenshots right'>
-            <#list node.screenCaptureContext.all as sc>
-            <li><a data-featherlight="image" href="${sc.path}"><i class='material-icons'>panorama</i></a></li>
-            </#list>
-        </ul>
-        </#if>
-        <#if node.description?? && node.description?has_content>
-        ${node.description}
-        </#if>
-    </div>
-    <#if TestService.testHasChildren(node)>
-    <ul class='steps'>
-        <#list node.nodeContext.all as child>
-        <li test-id='${child.getId()}' class='node ${child.behaviorDrivenTypeName?lower_case} ${child.status}' status='${child.status}'>
-            <div class="step-name" title="${child.description}"><span class='status ${child.status}' title='${child.status}'><i class='material-icons'>${MaterialIcon.getIcon(child.status)}</i></span>${child.name}</div>
-            <#if TestService.testHasScreenCapture(child)>
-            <ul class='screenshots right'>
-                <#list child.screenCaptureContext.all as sc>
-                <li><a data-featherlight="image" href="${sc.path}"><i class='material-icons'>panorama</i></a></li>
-                </#list>
-            </ul>
-            </#if>
-            <#list child.logContext.all as log>
-            <#if log.exceptionInfo??>
-                <textarea disabled class="code-block">${log.exceptionInfo.stackTrace}</textarea>
-            <#else>
-                <div class="node-step">${log.details}</div>
-            </#if>
-            </#list>
-            <#if TestService.testHasChildren(child)>
-            <ul class='gc steps'>
-                <#list child.nodeContext.all as gc>
-                    <li test-id='${gc.getId()}' class='gc ${gc.behaviorDrivenTypeName?lower_case} ${gc.status}' status='${gc.status}'>
-                        <h6 class="step-name" title="${gc.description}"><span class='status ${gc.status}' title='${gc.status}'><i class='material-icons'>${MaterialIcon.getIcon(gc.status)}</i></span>${gc.name}</h6>
-                        <#if TestService.testHasScreenCapture(gc)>
-                        <ul class='screenshots right'>
-                            <#list gc.screenCaptureContext.all as sc>
-                            <li><a data-featherlight="image" href="${sc.path}"><i class='material-icons'>panorama</i></a></li>
-                            </#list>
-                        </ul>
-                        </#if>
-                        <#list gc.logContext.all as log>
-                            <#if log.exceptionInfo??><textarea disabled class="code-block">${log.exceptionInfo.stackTrace}</textarea>
-                            <#else><div class="node-step">${log.details}</div>
-                        </#if>
-                        </#list>
-                    </li>
-                </#list>
-            </ul>
-            </#if>
-        </li>
-        </#list>
-    </ul>
-    </#if>
+	<#if TestService.testHasCategory(node)>
+	<div class='category-list'>
+		<#list node.categoryContext.all as category>
+		<span class='category label'>${category.name}</span>
+		</#list>
+	</div>
+	</#if>
+	<span class='duration right label'>${TestService.getRunDuration(node)}</span>
+	<div class="bdd-test">
+		<div class="scenario-name"><span class='status ${node.status}' title='${node.status}'><i class='material-icons'>${MaterialIcon.getIcon(node.status)}</i></span> ${node.behaviorDrivenTypeName}: ${node.name}</div>
+		<#if TestService.testHasScreenCapture(node)>
+		<ul class='screenshots right'>
+			<#list node.screenCaptureContext.all as sc>
+			<#if sc.path??>
+			<li><a data-featherlight="image" href="${sc.path}"><i class='material-icons'>panorama</i></a></li>
+			<#elseif sc.isBase64()>
+			<li><a data-featherlight="image" href="${sc.base64String}"><i class='material-icons'>panorama</i></a></li>
+			</#if>
+			</#list>
+		</ul>
+		</#if>
+		<#if node.description?? && node.description?has_content>
+		${node.description}
+		</#if>
+	</div>
+	<#if TestService.testHasChildren(node)>
+	<ul class='steps'>
+		<#list node.nodeContext.all as child>
+		<li test-id='${child.getId()}' class='node ${child.behaviorDrivenTypeName?lower_case} ${child.status}' status='${child.status}'>
+			<div class="step-name" title="${child.description}"><span class='status ${child.status}' title='${child.status}'><i class='material-icons'>${MaterialIcon.getIcon(child.status)}</i></span>${child.name}</div>
+			<#if TestService.testHasScreenCapture(child)>
+			<ul class='screenshots right'>
+				<#list child.screenCaptureContext.all as sc>
+				<#if sc.path??>
+				<li><a data-featherlight="image" href="${sc.path}"><i class='material-icons'>panorama</i></a></li>
+				<#elseif sc.isBase64()>
+				<li><a data-featherlight="image" href="${sc.base64String}"><i class='material-icons'>panorama</i></a></li>
+				</#if>
+				</#list>
+			</ul>
+			</#if>
+			<#list child.logContext.all as log>
+			<#if log.exceptionInfo??>
+			<textarea disabled class="code-block">${log.exceptionInfo.stackTrace}</textarea>
+			<#else>
+			<div class="node-step">${log.details}</div>
+			</#if>
+			</#list>
+			<#if TestService.testHasChildren(child)>
+			<ul class='gc steps'>
+				<#list child.nodeContext.all as gc>
+				<li test-id='${gc.getId()}' class='gc ${gc.behaviorDrivenTypeName?lower_case} ${gc.status}' status='${gc.status}'>
+					<h6 class="step-name" title="${gc.description}"><span class='status ${gc.status}' title='${gc.status}'><i class='material-icons'>${MaterialIcon.getIcon(gc.status)}</i></span>${gc.name}</h6>
+					<#if TestService.testHasScreenCapture(gc)>
+					<ul class='screenshots right'>
+						<#list gc.screenCaptureContext.all as sc>
+						<#if sc.path??>
+						<li><a data-featherlight="image" href="${sc.path}"><i class='material-icons'>panorama</i></a></li>
+						<#elseif sc.isBase64>
+						<li><a data-featherlight="image" href="${sc.base64String}"><i class='material-icons'>panorama</i></a></li>
+						</#if>
+						</#list>
+					</ul>
+					</#if>
+					<#list gc.logContext.all as log>
+					<#if log.exceptionInfo??>
+					<textarea disabled class="code-block">${log.exceptionInfo.stackTrace}</textarea>
+					<#else>
+					<div class="node-step">${log.details}</div>
+					</#if>
+					</#list>
+				</li>
+				</#list>
+			</ul>
+			</#if>
+		</li>
+		</#list>
+	</ul>
+	</#if>
 </div>
 </#list>
\ No newline at end of file
diff --git a/src/test/java/com/aventstack/extentreports/reporter/Base64Tests.java b/src/test/java/com/aventstack/extentreports/reporter/Base64Tests.java
new file mode 100644
index 0000000..c86fa3f
--- /dev/null
+++ b/src/test/java/com/aventstack/extentreports/reporter/Base64Tests.java
@@ -0,0 +1,50 @@
+package com.aventstack.extentreports.reporter;
+
+import org.testng.annotations.Test;
+
+import com.aventstack.extentreports.ExtentReports;
+import com.aventstack.extentreports.gherkin.model.Feature;
+import com.aventstack.extentreports.gherkin.model.Given;
+import com.aventstack.extentreports.gherkin.model.Scenario;
+
+public class Base64Tests {
+
+	private final static String BASE64 = "";
+	
+	@Test
+	public void testBase64BDDAtFeature() {
+		ExtentReports extent = new ExtentReports();
+		ExtentHtmlReporter html = new ExtentHtmlReporter("html/index.html");
+		ExtentSparkReporter spark = new ExtentSparkReporter("spark/index.html");
+		extent.attachReporter(html, spark);
+		extent.createTest(Feature.class, "Feature")
+			.addScreenCaptureFromBase64String(BASE64);
+		extent.flush();
+	}
+	
+	@Test
+	public void testBase64BDDAtScenario() {
+		ExtentReports extent = new ExtentReports();
+		ExtentHtmlReporter html = new ExtentHtmlReporter("html/index.html");
+		ExtentSparkReporter spark = new ExtentSparkReporter("spark/index.html");
+		extent.attachReporter(html, spark);
+		extent.createTest(Feature.class, "Feature")
+			.createNode(Scenario.class, "Scenario")
+			.addScreenCaptureFromBase64String(BASE64);
+		extent.flush();
+	}
+	
+	@Test
+	public void testBase64BDDAtStep() {
+		ExtentReports extent = new ExtentReports();
+		ExtentHtmlReporter html = new ExtentHtmlReporter("html/index.html");
+		ExtentSparkReporter spark = new ExtentSparkReporter("spark/index.html");
+		extent.attachReporter(html, spark);
+		extent.createTest(Feature.class, "Feature")
+			.createNode(Scenario.class, "Scenario")
+			.createNode(Given.class, "Given")
+			.addScreenCaptureFromBase64String(BASE64);
+		extent.flush();
+	}
+	
+}
diff --git a/src/test/java/com/aventstack/extentreports/reporter/HtmlBasicFileReporterConfigurationTest.java b/src/test/java/com/aventstack/extentreports/reporter/HtmlBasicFileReporterConfigurationTest.java
index 6a18c37..9d9b6a7 100644
--- a/src/test/java/com/aventstack/extentreports/reporter/HtmlBasicFileReporterConfigurationTest.java
+++ b/src/test/java/com/aventstack/extentreports/reporter/HtmlBasicFileReporterConfigurationTest.java
@@ -11,20 +11,20 @@ public class HtmlBasicFileReporterConfigurationTest extends Base {
 
     @Test
     public void htmlReporterHasInitialConfig(Method method) {
-        ExtentHtmlReporter html = new ExtentHtmlReporter(method.getName() + ".html");
+        ExtentSparkReporter html = new ExtentSparkReporter(method.getName() + ".html");
         Assert.assertFalse(html.getConfigurationStore().isEmpty());
     }
     
     @Test
     public void testHtmlReporterUserConfigInitialCSSNull(Method method) {
-        ExtentHtmlReporter html = new ExtentHtmlReporter(method.getName() + ".html");
+        ExtentSparkReporter html = new ExtentSparkReporter(method.getName() + ".html");
         String v = (String) html.getConfigurationStore().getConfig("css");
         Assert.assertNull(v);
     }
     
     @Test
     public void testHtmlReporterUserConfigCSSHasValue(Method method) {
-        ExtentHtmlReporter html = new ExtentHtmlReporter(method.getName() + ".html");
+        ExtentSparkReporter html = new ExtentSparkReporter(method.getName() + ".html");
         String css = ".dark{background:black;}";
         html.config().setCSS(css);
         String v = (String) html.getConfigurationStore().getConfig("css");
@@ -33,7 +33,7 @@ public void testHtmlReporterUserConfigCSSHasValue(Method method) {
     
     @Test
     public void testHtmlReporterUserConfigCSSValue(Method method) {
-        ExtentHtmlReporter html = new ExtentHtmlReporter(method.getName() + ".html");
+        ExtentSparkReporter html = new ExtentSparkReporter(method.getName() + ".html");
         String css = ".dark{background:black;}";
         html.config().setCSS(css);
         String v = (String) html.getConfigurationStore().getConfig("css");
@@ -42,14 +42,14 @@ public void testHtmlReporterUserConfigCSSValue(Method method) {
     
     @Test
     public void testHtmlReporterUserConfigInitialJSNull(Method method) {
-        ExtentHtmlReporter html = new ExtentHtmlReporter(method.getName() + ".html");
+        ExtentSparkReporter html = new ExtentSparkReporter(method.getName() + ".html");
         String v = (String) html.getConfigurationStore().getConfig("js");
         Assert.assertNull(v);
     }
     
     @Test
     public void testHtmlReporterUserConfigJSHasValue(Method method) {
-        ExtentHtmlReporter html = new ExtentHtmlReporter(method.getName() + ".html");
+        ExtentSparkReporter html = new ExtentSparkReporter(method.getName() + ".html");
         html.config().setJS("alert('');");
         String v = (String) html.getConfigurationStore().getConfig("js");
         Assert.assertFalse(v.isEmpty());
@@ -57,7 +57,7 @@ public void testHtmlReporterUserConfigJSHasValue(Method method) {
     
     @Test
     public void testHtmlReporterUserConfigJSValue(Method method) {
-        ExtentHtmlReporter html = new ExtentHtmlReporter(method.getName() + ".html");
+        ExtentSparkReporter html = new ExtentSparkReporter(method.getName() + ".html");
         String js = "alert('');";
         html.config().setJS(js);
         String v = (String) html.getConfigurationStore().getConfig("js");
@@ -66,20 +66,20 @@ public void testHtmlReporterUserConfigJSValue(Method method) {
     
     @Test
     public void documentTitleInitialValueTest(Method method) {
-        ExtentHtmlReporter html = new ExtentHtmlReporter(method.getName() + ".html");
+        ExtentSparkReporter html = new ExtentSparkReporter(method.getName() + ".html");
         Assert.assertFalse(html.getConfigurationStore().getConfig("documentTitle").toString().isEmpty());
     }
     
     @Test
     public void documentTitleInitialUserValueTest(Method method) {
-        ExtentHtmlReporter html = new ExtentHtmlReporter(method.getName() + ".html");
+        ExtentSparkReporter html = new ExtentSparkReporter(method.getName() + ".html");
         String v = (String) html.getConfigurationStore().getConfig("documentTitle");
         Assert.assertNotNull(v);
     }
     
     @Test
     public void documentTitleUserValueTest(Method method) {
-        ExtentHtmlReporter html = new ExtentHtmlReporter(method.getName() + ".html");
+        ExtentSparkReporter html = new ExtentSparkReporter(method.getName() + ".html");
         String docTitle = "test";
         html.config().setDocumentTitle(docTitle);
         String v = (String) html.getConfigurationStore().getConfig("documentTitle");
@@ -88,20 +88,20 @@ public void documentTitleUserValueTest(Method method) {
     
     @Test
     public void encodingInitialValueTest(Method method) {
-        ExtentHtmlReporter html = new ExtentHtmlReporter(method.getName() + ".html");
+        ExtentSparkReporter html = new ExtentSparkReporter(method.getName() + ".html");
         Assert.assertTrue(html.getConfigurationStore().getConfig("encoding").toString().equalsIgnoreCase("utf-8"));
     }
     
     @Test
     public void encodingInitialUserValueTest(Method method) {
-        ExtentHtmlReporter html = new ExtentHtmlReporter(method.getName() + ".html");
+        ExtentSparkReporter html = new ExtentSparkReporter(method.getName() + ".html");
         String v = (String) html.getConfigurationStore().getConfig("encoding");
         Assert.assertNotNull(v);
     }
     
     @Test
     public void encodingUserValueTest(Method method) {
-        ExtentHtmlReporter html = new ExtentHtmlReporter(method.getName() + ".html");
+        ExtentSparkReporter html = new ExtentSparkReporter(method.getName() + ".html");
         String encoding = "utf-16";
         html.config().setEncoding(encoding);
         String v = (String) html.getConfigurationStore().getConfig("encoding");
diff --git a/src/test/java/com/aventstack/extentreports/reporter/HtmlConfigurableReporterTest.java b/src/test/java/com/aventstack/extentreports/reporter/HtmlConfigurableReporterTest.java
index 7c2bca2..73c6aa7 100644
--- a/src/test/java/com/aventstack/extentreports/reporter/HtmlConfigurableReporterTest.java
+++ b/src/test/java/com/aventstack/extentreports/reporter/HtmlConfigurableReporterTest.java
@@ -19,47 +19,47 @@ public class HtmlConfigurableReporterTest extends Base {
     private static final String CSS = ".test.active { border: 1px solid #ccc; }";
     private static final String JS = "$('.test').click(function() { console.log('test'); });";    
     
-    private ExtentHtmlReporter html;
+    private ExtentSparkReporter spark;
     
     @BeforeClass
     public void beforeClass() {
-        html = new ExtentHtmlReporter("Extent.html");
-        html.loadXMLConfig(CONFIG_PATH);
+        spark = new ExtentSparkReporter("Extent.html");
+        spark.loadXMLConfig(CONFIG_PATH);
     }
     
     @Test
     public void testTheme(Method method) {
-        Assert.assertEquals(html.getConfigurationStore().getConfig("theme"), THEME);
+        Assert.assertEquals(spark.getConfigurationStore().getConfig("theme"), THEME);
     }
     
     @Test
     public void testEncoding(Method method) {
-        Assert.assertTrue(String.valueOf(html.getConfigurationStore().getConfig("encoding")).equalsIgnoreCase(ENCODING));
+        Assert.assertTrue(String.valueOf(spark.getConfigurationStore().getConfig("encoding")).equalsIgnoreCase(ENCODING));
     }
     
     @Test
     public void testDocumentTitle(Method method) {
-        Assert.assertEquals(html.getConfigurationStore().getConfig("documentTitle"), DOCUMENT_TITLE);
+        Assert.assertEquals(spark.getConfigurationStore().getConfig("documentTitle"), DOCUMENT_TITLE);
     }
     
     @Test
     public void testReportName(Method method) {
-        Assert.assertEquals(html.getConfigurationStore().getConfig("reportName"), REPORT_NAME);
+        Assert.assertEquals(spark.getConfigurationStore().getConfig("reportName"), REPORT_NAME);
     }
     
     @Test
     public void testTimestampFormat(Method method) {
-        Assert.assertEquals(html.getConfigurationStore().getConfig("timeStampFormat"), TIMESTAMP_FORMAT);
+        Assert.assertEquals(spark.getConfigurationStore().getConfig("timeStampFormat"), TIMESTAMP_FORMAT);
     }
     
     @Test
     public void testCSS(Method method) {
-        Assert.assertTrue(html.getConfigurationStore().getConfig("styles").toString().contains(CSS));
+        Assert.assertTrue(spark.getConfigurationStore().getConfig("styles").toString().contains(CSS));
     }
     
     @Test
     public void testJS(Method method) {
-        Assert.assertTrue(html.getConfigurationStore().getConfig("scripts").toString().contains(JS));
+        Assert.assertTrue(spark.getConfigurationStore().getConfig("scripts").toString().contains(JS));
     }
     
 }
diff --git a/src/test/java/com/aventstack/extentreports/reporter/HtmlRichViewReporterConfigurationTest.java b/src/test/java/com/aventstack/extentreports/reporter/HtmlRichViewReporterConfigurationTest.java
index 566c560..6ddbde5 100644
--- a/src/test/java/com/aventstack/extentreports/reporter/HtmlRichViewReporterConfigurationTest.java
+++ b/src/test/java/com/aventstack/extentreports/reporter/HtmlRichViewReporterConfigurationTest.java
@@ -12,65 +12,49 @@ public class HtmlRichViewReporterConfigurationTest {
 
     @Test
     public void testHtmlReporterUserConfigEnableTimelineEnabled(Method method) {
-        ExtentHtmlReporter html = new ExtentHtmlReporter(method.getName() + ".html");
-        html.config().enableTimeline(true);
-        String v = (String) html.getConfigurationStore().getConfig("enableTimeline");
+        ExtentSparkReporter spark = new ExtentSparkReporter(method.getName() + ".html");
+        spark.config().enableTimeline(true);
+        String v = (String) spark.getConfigurationStore().getConfig("enableTimeline");
         Assert.assertEquals(v, String.valueOf(true));
     }
     
     @Test
     public void testHtmlReporterUserConfigEnableTimelineDisabled(Method method) {
-        ExtentHtmlReporter html = new ExtentHtmlReporter(method.getName() + ".html");
-        html.config().enableTimeline(false);
-        String v = (String) html.getConfigurationStore().getConfig("enableTimeline");
+        ExtentSparkReporter spark = new ExtentSparkReporter(method.getName() + ".html");
+        spark.config().enableTimeline(false);
+        String v = (String) spark.getConfigurationStore().getConfig("enableTimeline");
         Assert.assertEquals(v, String.valueOf(false));
     }
-    /*
-    @Test
-    public void testHtmlReporterUserConfigAutoConfigMediaEnabled(Method method) {
-        ExtentHtmlReporter html = new ExtentHtmlReporter(method.getName() + ".html");
-        html.config().setAutoCreateRelativePathMedia(true);
-        String v = (String) html.getConfigurationStore().getConfig("autoCreateRelativePathMedia");
-        Assert.assertEquals(v, String.valueOf(true));
-    }
     
-    @Test
-    public void testHtmlReporterUserConfigAutoConfigMediaDisabled(Method method) {
-        ExtentHtmlReporter html = new ExtentHtmlReporter(method.getName() + ".html");
-        html.config().setAutoCreateRelativePathMedia(false);
-        String v = (String) html.getConfigurationStore().getConfig("autoCreateRelativePathMedia");
-        Assert.assertEquals(v, String.valueOf(false));
-    }
-    */
     @Test
     public void testHtmlReporterUserConfigDetaultProtocol(Method method) {
-        ExtentHtmlReporter html = new ExtentHtmlReporter(method.getName() + ".html");
-        String v = (String) html.getConfigurationStore().getConfig("protocol");
+        ExtentSparkReporter spark = new ExtentSparkReporter(method.getName() + ".html");
+        String v = (String) spark.getConfigurationStore().getConfig("protocol");
         Assert.assertEquals(Enum.valueOf(Protocol.class, v.toUpperCase()), Protocol.HTTPS);
     }
     
     @Test
     public void testHtmlReporterUserConfigProtocolSetting(Method method) {
-        ExtentHtmlReporter html = new ExtentHtmlReporter(method.getName() + ".html");
-        html.config().setProtocol(Protocol.HTTP);
-        Object p = html.getConfigurationStore().getConfig("protocol");
+        ExtentSparkReporter spark = new ExtentSparkReporter(method.getName() + ".html");
+        spark.config().setProtocol(Protocol.HTTP);
+        Object p = spark.getConfigurationStore().getConfig("protocol");
         Protocol v = Protocol.valueOf(String.valueOf(p).toUpperCase());
         Assert.assertEquals(v, Protocol.HTTP);
     }
     
     @Test
     public void testHtmlReporterUserConfigDetaultTheme(Method method) {
-        ExtentHtmlReporter html = new ExtentHtmlReporter(method.getName() + ".html");
-        Object t = html.getConfigurationStore().getConfig("theme");
+        ExtentSparkReporter spark = new ExtentSparkReporter(method.getName() + ".html");
+        Object t = spark.getConfigurationStore().getConfig("theme");
         Theme theme = Theme.valueOf(String.valueOf(t).toUpperCase());
         Assert.assertEquals(theme, Theme.STANDARD);
     }
     
     @Test
     public void testHtmlReporterUserConfigThemeSetting(Method method) {
-        ExtentHtmlReporter html = new ExtentHtmlReporter(method.getName() + ".html");
-        html.config().setTheme(Theme.DARK);
-        Object t = html.config().getConfigurationStore().getConfig("theme");
+        ExtentSparkReporter spark = new ExtentSparkReporter(method.getName() + ".html");
+        spark.config().setTheme(Theme.DARK);
+        Object t = spark.config().getConfigurationStore().getConfig("theme");
         Theme theme = Theme.valueOf(String.valueOf(t).toUpperCase());
         Assert.assertEquals(theme, Theme.DARK);
     }