diff --git a/debug/pom.xml b/debug/pom.xml
index f79c4f763..2207ab656 100644
--- a/debug/pom.xml
+++ b/debug/pom.xml
@@ -102,7 +102,7 @@
         </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-default-datasource</artifactId>
+            <artifactId>piranha-extension-datasource</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
diff --git a/extension/default-datasource/pom.xml b/extension/datasource/pom.xml
similarity index 95%
rename from extension/default-datasource/pom.xml
rename to extension/datasource/pom.xml
index ea8d0eceb..02574b7de 100644
--- a/extension/default-datasource/pom.xml
+++ b/extension/datasource/pom.xml
@@ -8,10 +8,10 @@
         <version>25.2.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>piranha-extension-default-datasource</artifactId>
+    <artifactId>piranha-extension-datasource</artifactId>
     <packaging>jar</packaging>
 
-    <name>Piranha - Extension - Default Datasource</name>
+    <name>Piranha - Extension - Datasource</name>
 
     <dependencies>
         <!-- compile -->
diff --git a/extension/default-datasource/src/main/java/cloud/piranha/extension/datasource/DataSourceWrapper.java b/extension/datasource/src/main/java/cloud/piranha/extension/datasource/DataSourceWrapper.java
similarity index 100%
rename from extension/default-datasource/src/main/java/cloud/piranha/extension/datasource/DataSourceWrapper.java
rename to extension/datasource/src/main/java/cloud/piranha/extension/datasource/DataSourceWrapper.java
diff --git a/extension/default-datasource/src/main/java/cloud/piranha/extension/datasource/DefaultDatasourceExtension.java b/extension/datasource/src/main/java/cloud/piranha/extension/datasource/DefaultDatasourceExtension.java
similarity index 100%
rename from extension/default-datasource/src/main/java/cloud/piranha/extension/datasource/DefaultDatasourceExtension.java
rename to extension/datasource/src/main/java/cloud/piranha/extension/datasource/DefaultDatasourceExtension.java
diff --git a/extension/default-datasource/src/main/java/cloud/piranha/extension/datasource/DefaultDatasourceInitializer.java b/extension/datasource/src/main/java/cloud/piranha/extension/datasource/DefaultDatasourceInitializer.java
similarity index 100%
rename from extension/default-datasource/src/main/java/cloud/piranha/extension/datasource/DefaultDatasourceInitializer.java
rename to extension/datasource/src/main/java/cloud/piranha/extension/datasource/DefaultDatasourceInitializer.java
diff --git a/extension/default-datasource/src/main/java/cloud/piranha/extension/datasource/TxJoiningDataSource.java b/extension/datasource/src/main/java/cloud/piranha/extension/datasource/TxJoiningDataSource.java
similarity index 100%
rename from extension/default-datasource/src/main/java/cloud/piranha/extension/datasource/TxJoiningDataSource.java
rename to extension/datasource/src/main/java/cloud/piranha/extension/datasource/TxJoiningDataSource.java
diff --git a/extension/default-datasource/src/main/java/cloud/piranha/extension/datasource/XADataSourceWrapper.java b/extension/datasource/src/main/java/cloud/piranha/extension/datasource/XADataSourceWrapper.java
similarity index 100%
rename from extension/default-datasource/src/main/java/cloud/piranha/extension/datasource/XADataSourceWrapper.java
rename to extension/datasource/src/main/java/cloud/piranha/extension/datasource/XADataSourceWrapper.java
diff --git a/extension/default-datasource/src/main/java/module-info.java b/extension/datasource/src/main/java/module-info.java
similarity index 97%
rename from extension/default-datasource/src/main/java/module-info.java
rename to extension/datasource/src/main/java/module-info.java
index 77dd3b7dc..b7946fe1d 100644
--- a/extension/default-datasource/src/main/java/module-info.java
+++ b/extension/datasource/src/main/java/module-info.java
@@ -27,7 +27,7 @@
  */
 
 /**
- * This module delivers the default DataSource extension
+ * This module delivers the datasource extension
  *
  * <p>
  *  This extension adds a default DataSource under the 
diff --git a/extension/eclipselink/pom.xml b/extension/eclipselink/pom.xml
index d1a47a680..f65f83778 100644
--- a/extension/eclipselink/pom.xml
+++ b/extension/eclipselink/pom.xml
@@ -20,7 +20,7 @@
         </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-default-datasource</artifactId>
+            <artifactId>piranha-extension-datasource</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
diff --git a/extension/micro/pom.xml b/extension/micro/pom.xml
index c15423dd0..8ea68b918 100644
--- a/extension/micro/pom.xml
+++ b/extension/micro/pom.xml
@@ -38,7 +38,7 @@
         </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-default-datasource</artifactId>
+            <artifactId>piranha-extension-datasource</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
diff --git a/extension/pom.xml b/extension/pom.xml
index 47b48c7d7..5bbd8f729 100644
--- a/extension/pom.xml
+++ b/extension/pom.xml
@@ -23,7 +23,6 @@
         <module>concurro</module>
         <module>coreprofile</module>
       	<module>declared</module>
-        <module>default-datasource</module>
         <module>eclipselink</module>
         <module>epicyro</module>
         <module>exousia</module>
@@ -63,6 +62,7 @@
         <module>weld</module>
         <module>yasson</module>
         <module>wasp</module>
+        <module>datasource</module>
     </modules>
 
     <dependencyManagement>
diff --git a/extension/webprofile/pom.xml b/extension/webprofile/pom.xml
index 61ad7f108..9f663ee48 100644
--- a/extension/webprofile/pom.xml
+++ b/extension/webprofile/pom.xml
@@ -52,7 +52,7 @@
         </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-default-datasource</artifactId>
+            <artifactId>piranha-extension-datasource</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
diff --git a/src/site/resources/css/site.css b/src/site/resources/css/site.css
new file mode 100644
index 000000000..2996947ef
--- /dev/null
+++ b/src/site/resources/css/site.css
@@ -0,0 +1,89 @@
+/* Set the background color to black */
+body {
+    background-color: black;
+    color: white;
+}
+
+/* Style headers with gold color */
+h1, h2, h3, h4, h5, h6 {
+    color: goldenrod;
+}
+
+/* Style links with gold color */
+a {
+    color: goldenrod;
+}
+
+/* Style navigation menu with black background and gold text */
+.navbar, .navbar-default {
+    background-color: black;
+    color: goldenrod;
+}
+
+.navbar a {
+    color: goldenrod;
+}
+
+/* Style footer with black background and gold text */
+footer {
+    background-color: black;
+    color: goldenrod;
+}
+
+#breadcrumbs {
+    background-color: black;
+    color: goldenrod;
+}
+
+#breadcrumbs ul {
+    background-color: black;
+}
+
+#breadcrumbs li {
+    background-color: black;
+    color: goldenrod;
+}
+
+#breadcrumbs a {
+    color: goldenrod;
+}
+
+#breadcrumbs .divider {
+    color: goldenrod;
+}
+
+#publishDate {
+    color: goldenrod;
+    background-color: black;
+}
+
+.nav.nav-list {
+    background-color: black;
+    color: goldenrod;
+}
+
+.nav.nav-list a {
+    color: goldenrod;
+}
+
+.nav.nav-list .active {
+    background-color: black;
+    font-style: italic;
+    border: none;
+    box-shadow: none;
+    outline: none;
+}
+
+.sidebar-nav {
+    background-color: black;
+    color: goldenrod;
+    border: none;
+}
+
+.sidebar-nav a {
+    color: goldenrod;
+}
+
+.well.sidebar-nav {
+    border: none;
+}
diff --git a/src/site/site.xml b/src/site/site.xml
index e0a305e7d..1caad1f93 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -62,4 +62,4 @@
         <version>2.0.0</version>
     </skin>
     <version position="left"/>
-</project>
\ No newline at end of file
+</project>