diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..e511b3b
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,49 @@
+## [4.0.8](https://github.com/extent-framework/extentreports-java/compare/v4.0.7...v4.0.8)
+#### Fixes
+* [#31] ExtentHtmlReporter does not display devices
+* [#32] ExtentSparkReporter freemarker issue when injecting custom js
+* [#33] ExtentSparkReporter dark theme fix
+
+## [4.0.7](https://github.com/extent-framework/extentreports-java/compare/v4.0.6...v4.0.7)
+#### New
+* ExtentSparkReporter
+#### Fixes
+* {#6] Invalid testEndTime and timeTaken
+* [#21] Adds ResourceCDN to use ExtentReports instead of cdn.rawgit
+* [#24] Timeline is broken because commas appear in duration
+* [#29] Embedded screenshot is missing in html report
+* [#30] Skipped tests not being displayed in HtmlReporter's tags view
+* Issue with KlovReporter not uploaded base64 strings to the server
+
+## [4.0.6](https://github.com/extent-framework/extentreports-java/compare/v4.0.5...v4.0.6)
+#### Fixes
+* [#testng-adapter-1] Fixes issue where test start and end times were created as per the IReporter time of execution
+* [#12] Chart increasing in size when resizing browser window
+
+## [4.0.5](https://github.com/extent-framework/extentreports-java/compare/v4.0.4...v4.0.5)
+#### Improvements
+* Several layout improvements for BDD view
+#### Fixes
+* Adds missing ScreenCapture for steps
+
+## [4.0.4](https://github.com/extent-framework/extentreports-java/compare/v4.0.3...v4.0.4)
+#### Fixes
+* Issue with BDD view showing charts in 2 rows
+
+## [4.0.3](https://github.com/extent-framework/extentreports-java/compare/v4.0.2...v4.0.3)
+#### Fixes
+* Fixes build configuration
+
+## [4.0.2](https://github.com/extent-framework/extentreports-java/compare/v4.0.1...v4.0.2)
+#### New
+* Add support for LoggerReporter to navigate from Category/Bug view to Test view
+#### Fixes
+* [#6] Fix issue where total time taken was 0
+* [#7] Fix issue where markup was not parsed correctly in code blocks
+
+## [4.0.1](https://github.com/extent-framework/extentreports-java/compare/v4.0.0...v4.0.1)
+#### New
+* [#4] Add support for Asterisk (*), BDD/Gherkin
+* [#5] Auto-size pre/textarea/code size upon click
+#### Fixes
+* Disable checking for media existence as its causing issue with several Cucumber1 users
diff --git a/Readme.md b/Readme.md
index b42cee0..b48091e 100644
--- a/Readme.md
+++ b/Readme.md
@@ -13,6 +13,11 @@ This version is Java8 only.
 
 View [extentreports.com](http://extentreports.com/docs/versions/4/java/) for complete documentation.
 
+### Samples
+
+* [ExtentSparkReporter](http://extentreports.com/samples/spark/index.html)
+* [ExtentHtmlReporter](http://extentreports.com/samples/html/index.html)
+
 ### License
 
 Apache-2.0
diff --git a/config/spark-config.xml b/config/spark-config.xml
new file mode 100644
index 0000000..0d40510
--- /dev/null
+++ b/config/spark-config.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extentreports>
+	<configuration>
+	
+		<!-- report theme -->
+		<!-- standard, dark -->
+		<theme>standard</theme>
+		
+		<!-- document encoding -->
+		<!-- defaults to UTF-8 -->
+		<encoding>UTF-8</encoding>
+		
+		<!-- protocol for script and stylesheets -->
+		<!-- defaults to https -->
+		<protocol>https</protocol>
+		
+		<!-- title of the document -->
+		<documentTitle>Extent Framework</documentTitle>
+		
+		<!-- report name - displayed at top-nav -->
+		<reportName>Build 1</reportName>
+		
+		<!-- timestamp format -->
+		<timeStampFormat>MMM dd, yyyy HH:mm:ss</timeStampFormat>
+		
+		<!-- settings to enable/disable views -->
+		<enableCategoryView>true</enableCategoryView>
+		<enableAuthorView>false</enableAuthorView>
+		<enableExceptionView>true</enableExceptionView>
+		<enableTestRunnerLogsView>true</enableTestRunnerLogsView>
+		
+		<!-- custom javascript -->
+		<scripts>
+			<![CDATA[
+				$(document).ready(function() {
+				    
+				});
+			]]>
+		</scripts>
+		
+		<!-- custom styles -->
+		<styles>
+			<![CDATA[
+			
+			]]>
+		</styles>
+		
+	</configuration>
+</extentreports>
\ No newline at end of file
diff --git a/pom-nexus.xml b/pom-nexus.xml
index 3bca73a..115e731 100644
--- a/pom-nexus.xml
+++ b/pom-nexus.xml
@@ -4,7 +4,7 @@
 
 	<groupId>com.aventstack</groupId>
 	<artifactId>extentreports</artifactId>
-	<version>4.0.7</version>
+	<version>4.0.8</version>
 
 	<name>extentreports</name>
 	<url>www.extentreports.com</url>
diff --git a/pom.xml b/pom.xml
index cbb50d9..832e7e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>com.aventstack</groupId>
 	<artifactId>extentreports</artifactId>
-	<version>4.0.7</version>
+	<version>4.0.8</version>
 
 	<name>extentreports</name>
 	<url>www.extentreports.com</url>
diff --git a/src/main/resources/com/aventstack/extentreports/view/commons/commons-inject-css.ftl b/src/main/resources/com/aventstack/extentreports/view/commons/commons-inject-css.ftl
index c9afe6e..ab42914 100644
--- a/src/main/resources/com/aventstack/extentreports/view/commons/commons-inject-css.ftl
+++ b/src/main/resources/com/aventstack/extentreports/view/commons/commons-inject-css.ftl
@@ -1,3 +1,3 @@
 <style type="text/css">
-${config.getValue("styles")}
+<#if config.getValue("styles")??>${config.getValue("styles")}</#if>
 </style>
\ No newline at end of file
diff --git a/src/main/resources/com/aventstack/extentreports/view/spark/dashboard.ftl b/src/main/resources/com/aventstack/extentreports/view/spark/dashboard.ftl
index 7b762d3..c831d74 100644
--- a/src/main/resources/com/aventstack/extentreports/view/spark/dashboard.ftl
+++ b/src/main/resources/com/aventstack/extentreports/view/spark/dashboard.ftl
@@ -1,3 +1,5 @@
+<#include "../commons/commons-variables.ftl">
+
 <#assign systemAttributeContext=report.getSystemAttributeContext().getSystemAttributeList()>
 <#assign authorContext=report.getAuthorContextInfo().getTestAttributeTestContextList()>
 <#assign categoryContext=report.getCategoryContextInfo().getTestAttributeTestContextList()>
@@ -33,7 +35,7 @@
 <!DOCTYPE html>
 <html>
 	<#include "partials/head.ftl">
-	<body class="dashboard-view @Model.MasterConfig.GetValue("theme")">
+	<body class="dashboard-view ${theme}">
 		<div class="app header-dark side-nav-folded">
 			<div class="layout">
 				<#include "partials/navbar.ftl">
diff --git a/src/main/resources/com/aventstack/extentreports/view/spark/partials/head.ftl b/src/main/resources/com/aventstack/extentreports/view/spark/partials/head.ftl
index be90649..dcc8297 100644
--- a/src/main/resources/com/aventstack/extentreports/view/spark/partials/head.ftl
+++ b/src/main/resources/com/aventstack/extentreports/view/spark/partials/head.ftl
@@ -11,4 +11,5 @@
     <link rel="shortcut icon" href="https://${cdnURI}${iconcommit}/commons/img/logo.png">
     <link href="https://${cdnURI}${csscommit}/spark/css/style.css" rel="stylesheet" />
     <link href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
+    <style><#include "../../commons/commons-inject-css.ftl"></style>
 </head>
\ No newline at end of file
diff --git a/src/main/resources/com/aventstack/extentreports/view/spark/partials/scripts.ftl b/src/main/resources/com/aventstack/extentreports/view/spark/partials/scripts.ftl
index d774960..9aaf743 100644
--- a/src/main/resources/com/aventstack/extentreports/view/spark/partials/scripts.ftl
+++ b/src/main/resources/com/aventstack/extentreports/view/spark/partials/scripts.ftl
@@ -1,4 +1,4 @@
 <script src="https://${cdnURI}${jscommit}/spark/js/script.js"></script>
 <#if config.containsKey("scripts") && config.getValue("scripts")?has_content>
-<#include "../commons/commons-inject-js.ftl">
+<#include "../../commons/commons-inject-js.ftl">
 </#if>
diff --git a/src/main/resources/com/aventstack/extentreports/view/v3html/test-view/v3-html-standard.ftl b/src/main/resources/com/aventstack/extentreports/view/v3html/test-view/v3-html-standard.ftl
index 2613c13..518ebb1 100644
--- a/src/main/resources/com/aventstack/extentreports/view/v3html/test-view/v3-html-standard.ftl
+++ b/src/main/resources/com/aventstack/extentreports/view/v3html/test-view/v3-html-standard.ftl
@@ -22,6 +22,13 @@
 		</#list>
 	</div>
 	</#if>
+	<#if test.hasDevice()>
+    <div class='device-list'>
+        <#list test.deviceContext.all as device>
+        <span class='device label'>${ device.name }</span>
+        </#list>
+    </div>
+    </#if>
 </div>
 </#if>
 <#if test.hasLog()>
diff --git a/src/main/resources/com/aventstack/extentreports/view/v3html/v3-html-index.ftl b/src/main/resources/com/aventstack/extentreports/view/v3html/v3-html-index.ftl
index 824901a..0cfcf63 100644
--- a/src/main/resources/com/aventstack/extentreports/view/v3html/v3-html-index.ftl
+++ b/src/main/resources/com/aventstack/extentreports/view/v3html/v3-html-index.ftl
@@ -37,7 +37,7 @@
 </#if>
 
 <#assign timeStampFormat = config.getValue('timeStampFormat')>
-<#assign resourceCDN=config.getValue('resourceCDN') cdnURI="cdn.rawgit.com/extent-framework/extent-github-cdn/" csscommit="8644a9c" jscommit="c23457b">
+<#assign resourceCDN=config.getValue('resourceCDN') cdnURI="cdn.rawgit.com/extent-framework/extent-github-cdn/" csscommit="bad039f" jscommit="c23457b">
 <#if resourceCDN=="extentreports">
     <#assign cdnURI="extentreports.com/resx" csscommit="" jscommit="">
 </#if>