diff --git a/.travis.yml b/.travis.yml
index 1c15cf7..95b7bd4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ cache:
   - $HOME/.m2
 before_install:
 # install the gwt-material library before we build the demo
-- git clone https://github.com/GwtMaterialDesign/gwt-material.git
+- git clone -b release_2.0 https://github.com/GwtMaterialDesign/gwt-material.git
 - cd gwt-material
 - mvn install -DskipTests=true -DdryRun=true
 - cd ..
diff --git a/README.md b/README.md
index a747543..3151fba 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,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-rc6</version>
+    <version>2.0-rc7</version>
 </dependency>
 ```
 
diff --git a/pom.xml b/pom.xml
index 3478064..ad04242 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-rc6</version>
+    <version>2.0-rc7</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>gwt-material-themes</artifactId>
-  <version>2.0-rc6</version>
+  <version>2.0-rc7</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-rc6</tag>
+    <tag>v2.0-rc7</tag>
   </scm>
 
   <licenses>
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 1617e69..022b5b1 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
@@ -12,7 +12,7 @@ blockquote {
     background-color: #ffc107;
 }
 
-/**SCROLLSPY**/
+/** Scrollspy **/
 .table-of-contents a.active {
     border-left: 2px solid #ffc107 !important;
 }
@@ -21,11 +21,12 @@ blockquote {
     border-left: 1px solid #ffc107 !important;
 }
 
+/** Progress **/
 .progress div {
     background-color: #ffb300;
 }
 
-/**Time Picker**/
+/** Time Picker **/
 .lolliclock-header {
     background: #ffc107 !important;
 }
@@ -104,7 +105,7 @@ blockquote {
     background: #ffc107 !important;
 }
 
-.editorDialogs .modal .btn-large:hover, .editorDialogs .modal .btn:hover, .note-editor .modal .btn-large:hover, .note-editor .modal .btn:hover, .note-editor .modal .btn.modal-close:hover,.note-editor .modal .file-field .btn:hover, .note-editor .modal .modal-footer .note-link-btn:hover, .note-editor .modal .modal-footer .note-image-btn:hover {
+.editorDialogs .modal .btn-large:hover, .editorDialogs .modal .btn:hover, .note-editor .modal .btn-large:hover, .note-editor .modal .btn:hover, .note-editor .modal .btn.modal-close:hover, .note-editor .modal .file-field .btn:hover, .note-editor .modal .modal-footer .note-link-btn:hover, .note-editor .modal .modal-footer .note-image-btn:hover {
     background: #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 88e1724..6c0ef91 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
@@ -12,7 +12,7 @@ blockquote {
     background-color: #2196f3;
 }
 
-/**SCROLLSPY**/
+/** Scrollspy **/
 .table-of-contents a.active {
     border-left: 2px solid #2196f3 !important;
 }
@@ -21,11 +21,12 @@ blockquote {
     border-left: 1px solid #2196f3 !important;
 }
 
+/** Progress **/
 .progress div {
     background-color: #1e88e5;
 }
 
-/**Time Picker**/
+/** Time Picker **/
 .lolliclock-header {
     background: #2196f3 !important;
 }
@@ -104,7 +105,7 @@ blockquote {
     background: #2196f3 !important;
 }
 
-.editorDialogs .modal .btn-large:hover, .editorDialogs .modal .btn:hover, .note-editor .modal .btn-large:hover, .note-editor .modal .btn:hover, .note-editor .modal .btn.modal-close:hover,.note-editor .modal .file-field .btn:hover, .note-editor .modal .modal-footer .note-link-btn:hover, .note-editor .modal .modal-footer .note-image-btn:hover {
+.editorDialogs .modal .btn-large:hover, .editorDialogs .modal .btn:hover, .note-editor .modal .btn-large:hover, .note-editor .modal .btn:hover, .note-editor .modal .btn.modal-close:hover, .note-editor .modal .file-field .btn:hover, .note-editor .modal .modal-footer .note-link-btn:hover, .note-editor .modal .modal-footer .note-image-btn:hover {
     background: #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 bb9236b..f2e9d53 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
@@ -12,7 +12,7 @@ blockquote {
     background-color: #795548;
 }
 
-/**SCROLLSPY**/
+/** Scrollspy **/
 .table-of-contents a.active {
     border-left: 2px solid #795548 !important;
 }
@@ -21,11 +21,12 @@ blockquote {
     border-left: 1px solid #795548 !important;
 }
 
+/** Progress**/
 .progress div {
     background-color: #6d4c41;
 }
 
-/**Time Picker**/
+/** Time Picker **/
 .lolliclock-header {
     background: #795548 !important;
 }
@@ -104,7 +105,7 @@ blockquote {
     background: #795548 !important;
 }
 
-.editorDialogs .modal .btn-large:hover, .editorDialogs .modal .btn:hover, .note-editor .modal .btn-large:hover, .note-editor .modal .btn:hover, .note-editor .modal .btn.modal-close:hover,.note-editor .modal .file-field .btn:hover, .note-editor .modal .modal-footer .note-link-btn:hover, .note-editor .modal .modal-footer .note-image-btn:hover {
+.editorDialogs .modal .btn-large:hover, .editorDialogs .modal .btn:hover, .note-editor .modal .btn-large:hover, .note-editor .modal .btn:hover, .note-editor .modal .btn.modal-close:hover, .note-editor .modal .file-field .btn:hover, .note-editor .modal .modal-footer .note-link-btn:hover, .note-editor .modal .modal-footer .note-image-btn:hover {
     background: #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 af7e874..a3ba389 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
@@ -12,7 +12,7 @@ blockquote {
     background-color: #4caf50;
 }
 
-/**SCROLLSPY**/
+/** Scrollspy **/
 .table-of-contents a.active {
     border-left: 2px solid #4caf50 !important;
 }
@@ -21,11 +21,12 @@ blockquote {
     border-left: 1px solid #4caf50 !important;
 }
 
+/** Progress **/
 .progress div {
     background-color: #7cb342;
 }
 
-/**Time Picker**/
+/** Time Picker **/
 .lolliclock-header {
     background: #4caf50 !important;
 }
@@ -104,7 +105,7 @@ blockquote {
     background: #4caf50 !important;
 }
 
-.editorDialogs .modal .btn-large:hover, .editorDialogs .modal .btn:hover, .note-editor .modal .btn-large:hover, .note-editor .modal .btn:hover, .note-editor .modal .btn.modal-close:hover,.note-editor .modal .file-field .btn:hover, .note-editor .modal .modal-footer .note-link-btn:hover, .note-editor .modal .modal-footer .note-image-btn:hover {
+.editorDialogs .modal .btn-large:hover, .editorDialogs .modal .btn:hover, .note-editor .modal .btn-large:hover, .note-editor .modal .btn:hover, .note-editor .modal .btn.modal-close:hover, .note-editor .modal .file-field .btn:hover, .note-editor .modal .modal-footer .note-link-btn:hover, .note-editor .modal .modal-footer .note-image-btn:hover {
     background: #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 c223c8e..d94cf06 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
@@ -12,7 +12,7 @@ blockquote {
     background-color: #9e9e9e;
 }
 
-/**SCROLLSPY**/
+/** Scrollspy **/
 .table-of-contents a.active {
     border-left: 2px solid #9e9e9e !important;
 }
@@ -21,11 +21,12 @@ blockquote {
     border-left: 1px solid #9e9e9e !important;
 }
 
+/** Progress **/
 .progress div {
     background-color: #757575;
 }
 
-/**Time Picker**/
+/** Time Picker **/
 .lolliclock-header {
     background: #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 1cd7bef..1b3c57e 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
@@ -12,7 +12,7 @@ blockquote {
     background-color: #ff9800;
 }
 
-/**SCROLLSPY**/
+/** Scrollspy **/
 .table-of-contents a.active {
     border-left: 2px solid #ff9800 !important;
 }
@@ -21,11 +21,12 @@ blockquote {
     border-left: 1px solid #ff9800 !important;
 }
 
+/** Progress **/
 .progress div {
     background-color: #fb8c00;
 }
 
-/**Time Picker**/
+/** Time Picker **/
 .lolliclock-header {
     background: #ff9800 !important;
 }
@@ -104,7 +105,7 @@ blockquote {
     background: #ff9800 !important;
 }
 
-.editorDialogs .modal .btn-large:hover, .editorDialogs .modal .btn:hover, .note-editor .modal .btn-large:hover, .note-editor .modal .btn:hover, .note-editor .modal .btn.modal-close:hover,.note-editor .modal .file-field .btn:hover, .note-editor .modal .modal-footer .note-link-btn:hover, .note-editor .modal .modal-footer .note-image-btn:hover {
+.editorDialogs .modal .btn-large:hover, .editorDialogs .modal .btn:hover, .note-editor .modal .btn-large:hover, .note-editor .modal .btn:hover, .note-editor .modal .btn.modal-close:hover, .note-editor .modal .file-field .btn:hover, .note-editor .modal .modal-footer .note-link-btn:hover, .note-editor .modal .modal-footer .note-image-btn:hover {
     background: #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 6e50849..920a70b 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
@@ -12,7 +12,7 @@ blockquote {
     background-color: #e91e63;
 }
 
-/**SCROLLSPY**/
+/** Scrollspy **/
 .table-of-contents a.active {
     border-left: 2px solid #e91e63 !important;
 }
@@ -21,11 +21,12 @@ blockquote {
     border-left: 1px solid #e91e63 !important;
 }
 
+/** Progress **/
 .progress div {
     background-color: #d81b60;
 }
 
-/**Time Picker**/
+/** Time Picker **/
 .lolliclock-header {
     background: #e91e63 !important;
 }
@@ -104,7 +105,7 @@ blockquote {
     background: #e91e63 !important;
 }
 
-.editorDialogs .modal .btn-large:hover, .editorDialogs .modal .btn:hover, .note-editor .modal .btn-large:hover, .note-editor .modal .btn:hover, .note-editor .modal .btn.modal-close:hover,.note-editor .modal .file-field .btn:hover, .note-editor .modal .modal-footer .note-link-btn:hover, .note-editor .modal .modal-footer .note-image-btn:hover {
+.editorDialogs .modal .btn-large:hover, .editorDialogs .modal .btn:hover, .note-editor .modal .btn-large:hover, .note-editor .modal .btn:hover, .note-editor .modal .btn.modal-close:hover, .note-editor .modal .file-field .btn:hover, .note-editor .modal .modal-footer .note-link-btn:hover, .note-editor .modal .modal-footer .note-image-btn:hover {
     background: #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 1929522..68057b4 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
@@ -12,7 +12,7 @@ blockquote {
     background-color: #9c27b0;
 }
 
-/**SCROLLSPY**/
+/** Scrollspy **/
 .table-of-contents a.active {
     border-left: 2px solid #9c27b0 !important;
 }
@@ -21,11 +21,12 @@ blockquote {
     border-left: 1px solid #9c27b0 !important;
 }
 
+/** Progress **/
 .progress div {
     background-color: #8e24aa;
 }
 
-/**Time Picker**/
+/** Time Picker **/
 .lolliclock-header {
     background: #9c27b0 !important;
 }
@@ -104,7 +105,7 @@ blockquote {
     background: #9c27b0 !important;
 }
 
-.editorDialogs .modal .btn-large:hover, .editorDialogs .modal .btn:hover, .note-editor .modal .btn-large:hover, .note-editor .modal .btn:hover, .note-editor .modal .btn.modal-close:hover,.note-editor .modal .file-field .btn:hover, .note-editor .modal .modal-footer .note-link-btn:hover, .note-editor .modal .modal-footer .note-image-btn:hover {
+.editorDialogs .modal .btn-large:hover, .editorDialogs .modal .btn:hover, .note-editor .modal .btn-large:hover, .note-editor .modal .btn:hover, .note-editor .modal .btn.modal-close:hover, .note-editor .modal .file-field .btn:hover, .note-editor .modal .modal-footer .note-link-btn:hover, .note-editor .modal .modal-footer .note-image-btn:hover {
     background: #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 c92af09..c213e36 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
@@ -12,7 +12,7 @@ blockquote {
     background-color: #f44336;
 }
 
-/**SCROLLSPY**/
+/** Scrollspy **/
 .table-of-contents a.active {
     border-left: 2px solid #f44336 !important;
 }
@@ -21,11 +21,12 @@ blockquote {
     border-left: 1px solid #f44336 !important;
 }
 
+/** Progress **/
 .progress div {
     background-color: #e53935;
 }
 
-/**Time Picker**/
+/** Time Picker **/
 .lolliclock-header {
     background: #f44336 !important;
 }
@@ -104,7 +105,7 @@ blockquote {
     background: #f44336 !important;
 }
 
-.editorDialogs .modal .btn-large:hover, .editorDialogs .modal .btn:hover, .note-editor .modal .btn-large:hover, .note-editor .modal .btn:hover, .note-editor .modal .btn.modal-close:hover,.note-editor .modal .file-field .btn:hover, .note-editor .modal .note-link-btn:hover, .note-editor .modal .note-image-btn:hover {
+.editorDialogs .modal .btn-large:hover, .editorDialogs .modal .btn:hover, .note-editor .modal .btn-large:hover, .note-editor .modal .btn:hover, .note-editor .modal .btn.modal-close:hover, .note-editor .modal .file-field .btn:hover, .note-editor .modal .note-link-btn:hover, .note-editor .modal .note-image-btn:hover {
     background: #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 3594ab3..c007523 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
@@ -12,7 +12,7 @@ blockquote {
     background-color: #ffeb3b;
 }
 
-/**SCROLLSPY**/
+/** Scrollspy **/
 .table-of-contents a.active {
     border-left: 2px solid #ffeb3b !important;
 }
@@ -21,11 +21,12 @@ blockquote {
     border-left: 1px solid #ffeb3b !important;
 }
 
+/** Progress **/
 .progress div {
     background-color: #fdd835;
 }
 
-/**Time Picker**/
+/** Time Picker **/
 .lolliclock-header {
     background: #ffeb3b !important;
 }
@@ -104,7 +105,7 @@ blockquote {
     background: #ffeb3b !important;
 }
 
-.editorDialogs .modal .btn-large:hover, .editorDialogs .modal .btn:hover, .note-editor .modal .btn-large:hover, .note-editor .modal .btn:hover, .note-editor .modal .btn.modal-close:hover,.note-editor .modal .file-field .btn:hover, .note-editor .modal .note-link-btn:hover, .note-editor .modal .note-image-btn:hover {
+.editorDialogs .modal .btn-large:hover, .editorDialogs .modal .btn:hover, .note-editor .modal .btn-large:hover, .note-editor .modal .btn:hover, .note-editor .modal .btn.modal-close:hover, .note-editor .modal .file-field .btn:hover, .note-editor .modal .note-link-btn:hover, .note-editor .modal .note-image-btn:hover {
     background: #ffeb3b !important;
 }