Index: src/org/vaadin/sparklines/SparklinesWidgetset.gwt.xml
===================================================================
--- src/org/vaadin/sparklines/SparklinesWidgetset.gwt.xml	(revision 5)
+++ src/org/vaadin/sparklines/SparklinesWidgetset.gwt.xml	(working copy)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 1.7.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/1.7.0/distro-source/core/src/gwt-module.dtd">
 <module>
-	<inherits name="com.vaadin.terminal.gwt.DefaultWidgetSet" />
+	
 	<inherits name='org.vaadin.gwtgraphics.GWTGraphics' />
 	
     <!--
@@ -22,4 +22,6 @@
     
     <stylesheet src="sparkline.css"/>
 
+
+    <inherits name="com.vaadin.DefaultWidgetSet" />
 </module>
Index: src/org/vaadin/sparklines/Sparklines.java
===================================================================
--- src/org/vaadin/sparklines/Sparklines.java	(revision 5)
+++ src/org/vaadin/sparklines/Sparklines.java	(working copy)
@@ -8,10 +8,10 @@
 import org.vaadin.sparklines.client.ui.SparklinesConnector;
 
 import com.vaadin.data.util.converter.Converter.ConversionException;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.Vaadin6Component;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
 import com.vaadin.ui.AbstractField;
+import com.vaadin.ui.LegacyComponent;
 
 /**
  * <p>
@@ -49,7 +49,7 @@
  * </p>
  * 
  */
-public class Sparklines extends AbstractField implements Vaadin6Component {
+public class Sparklines extends AbstractField implements LegacyComponent {
 
     private int graphHeight;
     private int graphWidth;
Index: src/org/vaadin/sparklines/client/ui/SparklinesConnector.java
===================================================================
--- src/org/vaadin/sparklines/client/ui/SparklinesConnector.java	(revision 5)
+++ src/org/vaadin/sparklines/client/ui/SparklinesConnector.java	(working copy)
@@ -3,14 +3,14 @@
 import org.vaadin.sparklines.Sparklines;
 
 import com.google.gwt.core.client.GWT;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
-import com.vaadin.terminal.gwt.client.ui.Connect;
-import com.vaadin.terminal.gwt.client.ui.Vaadin6Connector;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.UIDL;
+import com.vaadin.client.communication.StateChangeEvent;
+import com.vaadin.client.ui.LegacyConnector;
+import com.vaadin.shared.ui.Connect;
 
 @Connect(Sparklines.class)
-public class SparklinesConnector extends Vaadin6Connector {
+public class SparklinesConnector extends LegacyConnector {
 
     public static final String graphHeight = "gh";
     public static final String graphWidth = "gw";
@@ -105,7 +105,7 @@
     @Override
     public void onStateChanged(StateChangeEvent stateChangeEvent) {
         super.onStateChanged(stateChangeEvent);
-        getWidget().setCaption(getState().getCaption());
+        getWidget().setCaption(getState().caption);
     }
 
     @Override
Index: src/org/vaadin/sparklines/SparklinesRoot.java
===================================================================
--- src/org/vaadin/sparklines/SparklinesRoot.java	(revision 5)
+++ src/org/vaadin/sparklines/SparklinesRoot.java	(working copy)
@@ -7,7 +7,7 @@
 import com.vaadin.annotations.Theme;
 import com.vaadin.data.Item;
 import com.vaadin.data.util.BeanItem;
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.VaadinRequest;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
@@ -18,19 +18,21 @@
 import com.vaadin.ui.FormFieldFactory;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
-import com.vaadin.ui.Root;
+import com.vaadin.ui.UI;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.Window;
 
 @Theme("sparklinestheme")
-public class SparklinesRoot extends Root {
+public class SparklinesRoot extends UI {
     Window configure;
+	private final VerticalLayout verticalLayout = new VerticalLayout();
 
     @Override
-    public void init(WrappedRequest request) {
+    public void init(VaadinRequest request) {
+    	setContent(verticalLayout);
 
-        getContent().setStyleName("black");
-        getContent().setHeight("100%");
+    	verticalLayout.setStyleName("black");
+    	verticalLayout.setHeight("100%");
 
         Label info = new Label(
                 "<h1>Sparklines for GWT and Vaadin</h1><h2>\"small, intense, simple datawords\"</h2><a href=\"http://www.edwardtufte.com/bboard/q-and-a-fetch-msg?msg_id=0001OR\">Refer to Edward Tufte for more information about sparklines</a> (must read)");
@@ -134,8 +136,8 @@
 
         HorizontalLayout hl = new HorizontalLayout();
         addComponent(hl);
-        ((VerticalLayout) getContent()).setExpandRatio(hl, 1);
-        ((VerticalLayout) getContent()).setComponentAlignment(hl,
+        verticalLayout.setExpandRatio(hl, 1);
+        verticalLayout.setComponentAlignment(hl,
                 Alignment.MIDDLE_LEFT);
 
         final Sparklines s2 = new Sparklines("Random", 200, 70, 0, 200) {
@@ -201,6 +203,9 @@
     class ConfigureWindow extends Window {
 
         ConfigureWindow(Sparklines s) {
+        	VerticalLayout layout = new VerticalLayout();
+        	setContent(layout);
+        	
             setWidth("400px");
             setHeight("300px");
 
@@ -227,14 +232,17 @@
                     "normalRangeColor", "normalRangeMin", "normalRangeMax",
                     "pathColor", "pathWidth", "valueDotVisible",
                     "valueLabelVisible", "valueColor" });
-            conf.setWriteThrough(false);
-            addComponent(conf);
+            conf.setBuffered(true);
+            layout.addComponent(conf);
 
-            addComponent(new Button("Apply", new Button.ClickListener() {
+            layout.addComponent(new Button("Apply", new Button.ClickListener() {
                 public void buttonClick(ClickEvent event) {
                     conf.commit();
                 }
             }));
         }
     }
+	private void addComponent(Component c) {
+		this.verticalLayout.addComponent(c);
+	}
 }
Index: WebContent/META-INF/MANIFEST.MF
===================================================================
--- WebContent/META-INF/MANIFEST.MF	(revision 5)
+++ WebContent/META-INF/MANIFEST.MF	(working copy)
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Implementation-Title: Sparklines
-Implementation-Version: 7.0.1
+Implementation-Version: 7.0.2-SNAPSHOT
 Vaadin-Package-Version: 1
 Class-Path: 
 Vaadin-Widgetsets: org.vaadin.sparklines.SparklinesWidgetset
Index: WebContent/VAADIN/themes/sparklinestheme/styles.css
===================================================================
--- WebContent/VAADIN/themes/sparklinestheme/styles.css	(revision 5)
+++ WebContent/VAADIN/themes/sparklinestheme/styles.css	(working copy)
@@ -1,25 +0,0 @@
-@import url(../reindeer/styles.css);
-
-/*
-table.v-sparkline {
-	font-family: Georgia, serif;
-	text-transform: none;
-}
-
-.v-sparkline .v-sparklinecaption {
-	border-bottom: 2px solid #ccc;
-}
-
-.v-sparkline .v-sparklinevalue {
-	border-bottom: 2px solid #69f;
-}
-
-.v-sparkline .v-sparklineminmax {
-	background-color: #444;
-	border-radius: 3px;
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	padding: 3px;
-	border-bottom: 2px solid #6f9;
-}
-*/
\ No newline at end of file
Index: WebContent/VAADIN/themes/sparklinestheme/styles.scss
===================================================================
--- WebContent/VAADIN/themes/sparklinestheme/styles.scss	(working copy)
+++ WebContent/VAADIN/themes/sparklinestheme/styles.scss	(working copy)
@@ -1,25 +1,27 @@
-@import url(../reindeer/styles.css);
-
-/*
-table.v-sparkline {
-	font-family: Georgia, serif;
-	text-transform: none;
-}
-
-.v-sparkline .v-sparklinecaption {
-	border-bottom: 2px solid #ccc;
-}
-
-.v-sparkline .v-sparklinevalue {
-	border-bottom: 2px solid #69f;
-}
-
-.v-sparkline .v-sparklineminmax {
-	background-color: #444;
-	border-radius: 3px;
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	padding: 3px;
-	border-bottom: 2px solid #6f9;
-}
-*/
\ No newline at end of file
+@import "../reindeer/reindeer.scss";
+.sparklinestheme {
+	@include reindeer;
+	/*
+	table.v-sparkline {
+		font-family: Georgia, serif;
+		text-transform: none;
+	}
+	
+	.v-sparkline .v-sparklinecaption {
+		border-bottom: 2px solid #ccc;
+	}
+	
+	.v-sparkline .v-sparklinevalue {
+		border-bottom: 2px solid #69f;
+	}
+	
+	.v-sparkline .v-sparklineminmax {
+		background-color: #444;
+		border-radius: 3px;
+		-moz-border-radius: 3px;
+		-webkit-border-radius: 3px;
+		padding: 3px;
+		border-bottom: 2px solid #6f9;
+	}
+	*/
+}
\ No newline at end of file
Index: WebContent/WEB-INF/web.xml
===================================================================
--- WebContent/WEB-INF/web.xml	(revision 5)
+++ WebContent/WEB-INF/web.xml	(working copy)
@@ -9,12 +9,11 @@
   </context-param>
   <servlet>
   	<servlet-name>Sparklines Demo</servlet-name>
-  	<servlet-class>
-  	com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
+  	<servlet-class>com.vaadin.server.VaadinServlet</servlet-class>
   	<init-param>
   		<description>
   		Vaadin application class to start</description>
-  		<param-name>root</param-name>
+		<param-name>UI</param-name>
   		<param-value>org.vaadin.sparklines.SparklinesRoot</param-value>
   	</init-param>
   	<init-param>