diff --git a/README.md b/README.md
index 951671b..8282715 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ Gwt Material Design Themes for https://github.com/GwtMaterialDesign/gwt-material
 <dependency>
     <groupId>com.github.gwtmaterialdesign</groupId>
     <artifactId>gwt-material-themes</artifactId>
-    <version>2.0-rc2</version>
+    <version>2.0-rc3</version>
 </dependency>
 ```
 
diff --git a/pom.xml b/pom.xml
index 7939d78..1cb98a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,12 +3,12 @@
   <parent>
     <artifactId>gwt-material-parent</artifactId>
     <groupId>com.github.gwtmaterialdesign</groupId>
-    <version>2.0-rc2</version>
+    <version>2.0-rc3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>gwt-material-themes</artifactId>
-  <version>2.0-rc2</version>
+  <version>2.0-rc3</version>
 
   <name>Gwt Material Themes</name>
   <description>Themes for gwt-material</description>
@@ -23,7 +23,7 @@
     <connection>scm:git:git@github.com:GwtMaterialDesign/gwt-material-themes.git</connection>
     <developerConnection>scm:git:git@github.com:GwtMaterialDesign/gwt-material-themes.git</developerConnection>
     <url>http://github.com/GwtMaterialDesign/gwt-material-themes</url>
-    <tag>v2.0-rc2</tag>
+    <tag>v2.0-rc3</tag>
   </scm>
 
   <licenses>
diff --git a/src/main/java/gwt/material/design/themes/client/ThemeLoader.java b/src/main/java/gwt/material/design/themes/client/ThemeLoader.java
index bf0f009..a64c182 100644
--- a/src/main/java/gwt/material/design/themes/client/ThemeLoader.java
+++ b/src/main/java/gwt/material/design/themes/client/ThemeLoader.java
@@ -21,7 +21,7 @@
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.core.client.RunAsyncCallback;
-import com.google.gwt.dom.client.StyleElement;
+import com.google.gwt.dom.client.Element;
 import com.google.gwt.dom.client.StyleInjector;
 import com.google.gwt.resources.client.ClientBundle;
 import com.google.gwt.resources.client.TextResource;
@@ -54,7 +54,7 @@ public interface ThemeBundle extends ClientBundle {
         TextResource overrides();
     }
 
-    private static List<StyleElement> styleElements;
+    private static List<Element> elements;
 
     /**
      * Load a provided {@link ThemeBundle} asynchronously.
@@ -67,19 +67,19 @@ public static void loadAsync(final ThemeBundle bundle, final ThemeAsyncCallback
             @Override
             public void onSuccess() {
                 if(bundle != null) {
-                    if(styleElements == null) {
-                        styleElements = new ArrayList<>();
+                    if(elements == null) {
+                        elements = new ArrayList<>();
                     } else {
                         unload();
                     }
 
                     // More resources might be loaded in the future.
-                    styleElements.add(StyleInjector.injectStylesheet(bundle.style().getText()));
-                    styleElements.add(StyleInjector.injectStylesheet(bundle.overrides().getText()));
+                    elements.add(StyleInjector.injectStylesheet(bundle.style().getText()));
+                    elements.add(StyleInjector.injectStylesheet(bundle.overrides().getText()));
                 }
 
                 if(callback != null) {
-                    callback.onSuccess(styleElements.size());
+                    callback.onSuccess(elements.size());
                 }
             }
             @Override
@@ -95,11 +95,11 @@ public void onFailure(Throwable reason) {
      * Unload the current loaded theme.
      */
     public static void unload() {
-        if(styleElements != null) {
-            for (StyleElement style : styleElements) {
+        if(elements != null) {
+            for (Element style : elements) {
                 style.removeFromParent();
             }
-            styleElements.clear();
+            elements.clear();
         }
     }
 }
diff --git a/src/main/resources/gwt/material/design/themes/amber/css/overridecss.amber.css b/src/main/resources/gwt/material/design/themes/amber/css/overridecss.amber.css
index 5ea0448..0f0fc08 100644
--- a/src/main/resources/gwt/material/design/themes/amber/css/overridecss.amber.css
+++ b/src/main/resources/gwt/material/design/themes/amber/css/overridecss.amber.css
@@ -81,7 +81,7 @@ blockquote {
 }
 
 /** Window **/
-.window-overlay .window .window-toolbar {
+.window .window-toolbar {
     background-color: #ffc107 !important;
 }
 
diff --git a/src/main/resources/gwt/material/design/themes/blue/css/overridecss.blue.css b/src/main/resources/gwt/material/design/themes/blue/css/overridecss.blue.css
index de09c83..36009a5 100644
--- a/src/main/resources/gwt/material/design/themes/blue/css/overridecss.blue.css
+++ b/src/main/resources/gwt/material/design/themes/blue/css/overridecss.blue.css
@@ -81,7 +81,7 @@ blockquote {
 }
 
 /** Window **/
-.window-overlay .window .window-toolbar {
+.window .window-toolbar {
     background-color: #2196f3 !important;
 }
 
diff --git a/src/main/resources/gwt/material/design/themes/brown/css/overridecss.brown.css b/src/main/resources/gwt/material/design/themes/brown/css/overridecss.brown.css
index 9549192..0fb6d15 100644
--- a/src/main/resources/gwt/material/design/themes/brown/css/overridecss.brown.css
+++ b/src/main/resources/gwt/material/design/themes/brown/css/overridecss.brown.css
@@ -81,7 +81,7 @@ blockquote {
 }
 
 /** Window **/
-.window-overlay .window .window-toolbar {
+.window .window-toolbar {
     background-color: #795548 !important;
 }
 
diff --git a/src/main/resources/gwt/material/design/themes/green/css/overridecss.green.css b/src/main/resources/gwt/material/design/themes/green/css/overridecss.green.css
index 212dac3..7e1e973 100644
--- a/src/main/resources/gwt/material/design/themes/green/css/overridecss.green.css
+++ b/src/main/resources/gwt/material/design/themes/green/css/overridecss.green.css
@@ -81,7 +81,7 @@ blockquote {
 }
 
 /** Window **/
-.window-overlay .window .window-toolbar {
+.window .window-toolbar {
     background-color: #4caf50 !important;
 }
 
diff --git a/src/main/resources/gwt/material/design/themes/grey/css/overridecss.grey.css b/src/main/resources/gwt/material/design/themes/grey/css/overridecss.grey.css
index ea7e452..883ff48 100644
--- a/src/main/resources/gwt/material/design/themes/grey/css/overridecss.grey.css
+++ b/src/main/resources/gwt/material/design/themes/grey/css/overridecss.grey.css
@@ -81,7 +81,7 @@ blockquote {
 }
 
 /** Window **/
-.window-overlay .window .window-toolbar {
+.window .window-toolbar {
     background-color: #9e9e9e !important;
 }
 
diff --git a/src/main/resources/gwt/material/design/themes/orange/css/overridecss.orange.css b/src/main/resources/gwt/material/design/themes/orange/css/overridecss.orange.css
index fb02788..19586b9 100644
--- a/src/main/resources/gwt/material/design/themes/orange/css/overridecss.orange.css
+++ b/src/main/resources/gwt/material/design/themes/orange/css/overridecss.orange.css
@@ -81,7 +81,7 @@ blockquote {
 }
 
 /** Window **/
-.window-overlay .window .window-toolbar {
+.window .window-toolbar {
     background-color: #ff9800 !important;
 }
 
diff --git a/src/main/resources/gwt/material/design/themes/pink/css/overridecss.pink.css b/src/main/resources/gwt/material/design/themes/pink/css/overridecss.pink.css
index f8e2023..22239e2 100644
--- a/src/main/resources/gwt/material/design/themes/pink/css/overridecss.pink.css
+++ b/src/main/resources/gwt/material/design/themes/pink/css/overridecss.pink.css
@@ -81,7 +81,7 @@ blockquote {
 }
 
 /** Window **/
-.window-overlay .window .window-toolbar {
+.window .window-toolbar {
     background-color: #e91e63 !important;
 }
 
diff --git a/src/main/resources/gwt/material/design/themes/purple/css/overridecss.purple.css b/src/main/resources/gwt/material/design/themes/purple/css/overridecss.purple.css
index 974b7ab..18ae861 100644
--- a/src/main/resources/gwt/material/design/themes/purple/css/overridecss.purple.css
+++ b/src/main/resources/gwt/material/design/themes/purple/css/overridecss.purple.css
@@ -81,7 +81,7 @@ blockquote {
 }
 
 /** Window **/
-.window-overlay .window .window-toolbar {
+.window .window-toolbar {
     background-color: #9c27b0 !important;
 }
 
diff --git a/src/main/resources/gwt/material/design/themes/red/css/overridecss.red.css b/src/main/resources/gwt/material/design/themes/red/css/overridecss.red.css
index 1c076d9..4826c7e 100644
--- a/src/main/resources/gwt/material/design/themes/red/css/overridecss.red.css
+++ b/src/main/resources/gwt/material/design/themes/red/css/overridecss.red.css
@@ -81,7 +81,7 @@ blockquote {
 }
 
 /** Window **/
-.window-overlay .window .window-toolbar {
+.window .window-toolbar {
     background-color: #f44336 !important;
 }
 
diff --git a/src/main/resources/gwt/material/design/themes/yellow/css/overridecss.yellow.css b/src/main/resources/gwt/material/design/themes/yellow/css/overridecss.yellow.css
index c8d15ef..64a8ebe 100644
--- a/src/main/resources/gwt/material/design/themes/yellow/css/overridecss.yellow.css
+++ b/src/main/resources/gwt/material/design/themes/yellow/css/overridecss.yellow.css
@@ -81,7 +81,7 @@ blockquote {
 }
 
 /** Window **/
-.window-overlay .window .window-toolbar {
+.window .window-toolbar {
     background-color: #ffeb3b !important;
 }