diff --git a/README.md b/README.md
index 3118daa..0543346 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,16 @@
 # gwt-material-pwa-archetype
 PWA (Progressive Web App) + GMD Archetype
 
-# Current Version - 2.1
+# Current Version - 2.1.1
 ### Includes
 - Updated GWT Version to 2.8.2
 - Updated GWTP Version to 1.5.3
-- Updated GMD Version to 2.1
+- Updated GMD Version to 2.1.1
 
 # Usage:
 1. Download the archetype
 2. From the download folder, install the archetype in your local Maven repo by running this command: <code>mvn clean install</code>
-3. Create a new project by running the following command in a folder of your choice: <code>mvn archetype:generate -DarchetypeGroupId=com.github.gwtmaterialdesign -DarchetypeArtifactId=gwt-material-pwa-archetype -DarchetypeVersion=2.1</code>
+3. Create a new project by running the following command in a folder of your choice: <code>mvn archetype:generate -DarchetypeGroupId=com.github.gwtmaterialdesign -DarchetypeArtifactId=gwt-material-pwa-archetype -DarchetypeVersion=2.1.1</code>
 4. Follow the prompts
 
         mvn clean install archetype:update-local-catalog
@@ -19,7 +19,7 @@ PWA (Progressive Web App) + GMD Archetype
 
         mvn archetype:generate -DarchetypeGroupId=com.github.gwtmaterialdesign \
           -DarchetypeArtifactId=gwt-material-pwa-archetype \
-          -DarchetypeVersion=2.1
+          -DarchetypeVersion=2.1.1
 
 4. Follow the prompts. That's it!
 
@@ -27,7 +27,7 @@ PWA (Progressive Web App) + GMD Archetype
 
         mvn archetype:generate -DarchetypeGroupId=com.github.gwtmaterialdesign \
           -DarchetypeArtifactId=gwt-material-pwa-archetype \
-          -DarchetypeVersion=2.1 \
+          -DarchetypeVersion=2.1.1 \
           -DgroupId=your.company.domain \
           -Dpackage=your.company.domain.myapp \
           -DartifactId=your-project \
@@ -39,7 +39,7 @@ PWA (Progressive Web App) + GMD Archetype
         mvn archetype:generate -DarchetypeGroupId=com.github.gwtmaterialdesign 
          -DarchetypeArtifactId=gwt-material-pwa-archetype 
          -DarchetypeRepository=https://oss.sonatype.org/content/repositories/snapshots/
-         -DarchetypeVersion=2.1-SNAPSHOT
+         -DarchetypeVersion=2.2-SNAPSHOT
      
 # Test/Run
 
diff --git a/gwt-test/pom.xml b/gwt-test/pom.xml
index 6771058..98d6fd3 100644
--- a/gwt-test/pom.xml
+++ b/gwt-test/pom.xml
@@ -36,7 +36,7 @@
         <gwt.version>2.8.2</gwt.version>
         <gwtp.version>1.6</gwtp.version>
         <gin.version>2.1.2</gin.version>
-        <gwt-material.version>2.1</gwt-material.version>
+        <gwt-material.version>2.1.1</gwt-material.version>
 
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
diff --git a/pom.xml b/pom.xml
index f7fdb1c..6c4ea81 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,12 +4,12 @@
     <parent>
         <artifactId>gwt-material-parent</artifactId>
         <groupId>com.github.gwtmaterialdesign</groupId>
-        <version>2.1</version>
+        <version>2.1.1</version>
     </parent>
 
     <groupId>com.github.gwtmaterialdesign</groupId>
     <artifactId>gwt-material-pwa-archetype</artifactId>
-    <version>2.1</version>
+    <version>2.1.1</version>
     <packaging>jar</packaging>
 
     <distributionManagement>
diff --git a/src/main/resources/META-INF/maven/archetype-metadata.xml b/src/main/resources/META-INF/maven/archetype-metadata.xml
index 925759c..4c5a3d5 100644
--- a/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -40,7 +40,7 @@
             <defaultValue>${groupId}</defaultValue>
         </requiredProperty>
         <requiredProperty key="gwt-material-version">
-            <defaultValue>2.1</defaultValue>
+            <defaultValue>2.1.1</defaultValue>
         </requiredProperty>
     </requiredProperties>
     <fileSets>
diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml
index 82289a4..c925499 100644
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@ -36,7 +36,7 @@
         <gwt.version>2.8.2</gwt.version>
         <gwtp.version>1.6</gwtp.version>
         <gin.version>2.1.2</gin.version>
-        <gwt-material.version>2.1</gwt-material.version>
+        <gwt-material.version>2.1.1</gwt-material.version>
 
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
diff --git a/src/main/resources/archetype-resources/src/main/java/__moduleName__.gwt.xml b/src/main/resources/archetype-resources/src/main/java/__moduleName__.gwt.xml
index b4ac187..0fd3a3b 100644
--- a/src/main/resources/archetype-resources/src/main/java/__moduleName__.gwt.xml
+++ b/src/main/resources/archetype-resources/src/main/java/__moduleName__.gwt.xml
@@ -34,10 +34,10 @@
     <source path='shared'/>
 
     <!--GWT Material-->
-    <inherits name="gwt.material.design.GwtMaterialWithJQuery"/>
-    <inherits name="gwt.material.design.themes.ThemeBlue"/>
+    <inherits name="gwt.material.design.GwtMaterialBasicWithJQuery"/>
     <inherits name="gwt.material.design.addins.GwtMaterialAddins"/>
     <inherits name="gwt.material.design.GwtMaterialTable"/>
+    <inherits name="gwt.material.design.themes.ThemeBlue"/>
 
     <set-configuration-property name="CssResource.enableGss" value="true"/>