diff --git a/components/Button.qml b/components/Button.qml
index 3c21708728f5a5a656c6431f9efb8364d7d0643d..6bf4153f75ca976e6df29d8bac9b77bf04a69b84 100644
--- a/components/Button.qml
+++ b/components/Button.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
 import "custom" as Components
 import "plugin"
 
diff --git a/components/ButtonRow.qml b/components/ButtonRow.qml
index 7123b415b946d101788a6b2b019b650fd85f5d15..cb0407e0f1a2c25487bf7303bd13ac1761db6528 100644
--- a/components/ButtonRow.qml
+++ b/components/ButtonRow.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
 import "custom" as Components
 
 Components.ButtonRow {
diff --git a/components/CheckBox.qml b/components/CheckBox.qml
index 55323832c72552ee2031ca0ba87bfa07aaf65b9c..80c230aa9fb94ba4637c2a049eaa73f1597aa572 100644
--- a/components/CheckBox.qml
+++ b/components/CheckBox.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
 import "custom" as Components
 import "plugin"
 
diff --git a/components/ChoiceList.qml b/components/ChoiceList.qml
index 08a222092fb53476223a09ca4d829f9472494d6e..4a4b509999b9433ebb2929c3adfdfd60bfec40c8 100644
--- a/components/ChoiceList.qml
+++ b/components/ChoiceList.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
 import "custom" as Components
 import "plugin"
 
@@ -47,12 +47,5 @@ Components.ChoiceList {
         anchors.topMargin: backgroundItem.pixelMetric("menuvmargin") + fw
         anchors.bottomMargin: backgroundItem.pixelMetric("menuvmargin") + fw
         elementType: "menu"
-
-        effect:    DropShadow {
-            blurRadius: 10
-            color: "#60000000"
-            xOffset: 1
-            yOffset: 1
-        }
     }
 }
diff --git a/components/Dial.qml b/components/Dial.qml
index 6173774a473fb3317c8fbf7b41ce6b2d952a86fa..ef660e594c40f533c810baabda82f52d349a1f2e 100644
--- a/components/Dial.qml
+++ b/components/Dial.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
 import "custom" as Components
 import "plugin"
 
diff --git a/components/Frame.qml b/components/Frame.qml
index 24a8e8332efa58056954e2aae19c97414af799f9..e2034303e236715ba22b0f7f20011cbc1c86cda3 100644
--- a/components/Frame.qml
+++ b/components/Frame.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
 import "custom" as Components
 import "plugin"
 
diff --git a/components/GroupBox.qml b/components/GroupBox.qml
index 16dc83d059dd8af384c235411543cd7337236678..cb516709db8f2dfc6fc6f49bc8e13dd8a5919243 100644
--- a/components/GroupBox.qml
+++ b/components/GroupBox.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
 import "custom" as Components
 import "plugin"
 
diff --git a/components/ProgressBar.qml b/components/ProgressBar.qml
index b993c228c08423dbccf6d20009b8abe29e1734f8..edf4d7f9e540728ec8b1c2dfb8f650b6475dcaf1 100644
--- a/components/ProgressBar.qml
+++ b/components/ProgressBar.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
 import "custom" as Components
 import "plugin"
 
diff --git a/components/RadioButton.qml b/components/RadioButton.qml
index 885a0573ba903c137e71dfbdc1f4effede3fd893..dba26157e207fab796257c0eada92d8500b4d6f2 100644
--- a/components/RadioButton.qml
+++ b/components/RadioButton.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
 import "custom" as Components
 import "plugin"
 
diff --git a/components/ScrollArea.qml b/components/ScrollArea.qml
index c7f8473e0bbc28a8f6994eca6064967e3fe55249..250161e66ac2e355b784d9fc644cc21c5e438310 100644
--- a/components/ScrollArea.qml
+++ b/components/ScrollArea.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
 import "custom" as Components
 import "plugin"
 
diff --git a/components/ScrollBar.qml b/components/ScrollBar.qml
index 225d2ef2286a0fddb22a1344117aaaa01ade4385..8327f2f8900f582c1d85832f069117e7a1237728 100644
--- a/components/ScrollBar.qml
+++ b/components/ScrollBar.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
 import "custom" as Components
 import "plugin"
 
diff --git a/components/Slider.qml b/components/Slider.qml
index 694d2305ae2b82c7b4e4391415216dd68ec36941..05afbb8f1fbbe766c022ff2707cd71d5007fcf50 100644
--- a/components/Slider.qml
+++ b/components/Slider.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
 import "custom" as Components
 import "plugin"
 
diff --git a/components/SpinBox.qml b/components/SpinBox.qml
index 508d4f4dd2d4c166da8e2f2f005e7937f5cdcabe..96e8cef568df8d0461150a051e8ef9ef1f782222 100644
--- a/components/SpinBox.qml
+++ b/components/SpinBox.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
 import "custom" as Components
 import "plugin"
 
diff --git a/components/Switch.qml b/components/Switch.qml
index 5d661ec3d6b4f032c59355e393dcad5c256e8a3a..36be613b92abd7463c5cf0c0b85398756a086607 100644
--- a/components/Switch.qml
+++ b/components/Switch.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
 import "custom" as Components
 import "plugin"
 
diff --git a/components/Tab.qml b/components/Tab.qml
index e258185ba5299b603b8240946dfc57f2cdfac167..45bba83b6fc45f8632fe9192a170c2f2683bd8ad 100644
--- a/components/Tab.qml
+++ b/components/Tab.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 2.0
 
 Item {
     id:tab
diff --git a/components/TabBar.qml b/components/TabBar.qml
index 8ab2134eac92b192be877a58ddd80da861ee57f2..064a3d2619ce79f24728bd44e605f4467837cf7f 100644
--- a/components/TabBar.qml
+++ b/components/TabBar.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
 import "custom" as Components
 import "plugin"
 
diff --git a/components/TabFrame.qml b/components/TabFrame.qml
index c8816e660f89f7be21ad4cfd546a7021e09bc6b7..b2e8983ce05894e66b0eb50d21221ab46890ff6c 100644
--- a/components/TabFrame.qml
+++ b/components/TabFrame.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
 import "custom" as Components
 import "plugin"
 
diff --git a/components/TextArea.qml b/components/TextArea.qml
index 5c95d7edc0f0f3978bd47797ebfa7deeeee5a929..de872a5ad5634c57cb984ab40ee1620537b546c6 100644
--- a/components/TextArea.qml
+++ b/components/TextArea.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
 import "custom" as Components
 import "plugin"
 
diff --git a/components/TextField.qml b/components/TextField.qml
index ccadadf86fc900512bb2fd4d3ecd8d1a8d742d85..a83aa1674c323ec2cd0661fb6c0ccc69d69923ff 100644
--- a/components/TextField.qml
+++ b/components/TextField.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
 import "custom" as Components
 import "plugin"
 
diff --git a/components/ToolBar.qml b/components/ToolBar.qml
index 98367723c5a0be8ac80a616eb87d52c40b43a776..7b15334e4e73688a87e8a41e2bdc68a5730f4bea 100644
--- a/components/ToolBar.qml
+++ b/components/ToolBar.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
 import "custom" as Components
 import "plugin"
 
diff --git a/components/ToolButton.qml b/components/ToolButton.qml
index 636a11db59bd6574e7b07e6331337ac1cb69df96..2b265547b875a2b12158f1d4c84ba06054d5c592 100644
--- a/components/ToolButton.qml
+++ b/components/ToolButton.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
 import "custom" as Components
 import "plugin"
 
diff --git a/components/custom/BasicButton.qml b/components/custom/BasicButton.qml
index 14c929b1c9d1f1f99bfb37a528f63f3169289b2f..9eba3fc2488dd59ee30cdf935a1e567fa7e9cee3 100644
--- a/components/custom/BasicButton.qml
+++ b/components/custom/BasicButton.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
 import "./behaviors"    // ButtonBehavior
 
 Item {
diff --git a/components/custom/Button.qml b/components/custom/Button.qml
index 45abc83f6041a194dc6e690220572067d63b2aed..3d239d5dd68d7eaeacd3cd92f32257d7bfab3f46 100644
--- a/components/custom/Button.qml
+++ b/components/custom/Button.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
 
 BasicButton {
     id: button
diff --git a/components/custom/ButtonColumn.qml b/components/custom/ButtonColumn.qml
index 8d63a855c3b774f50678746cc55507e5594e3320..45a02696f146e1cdc27d8b5772e872425224deab 100644
--- a/components/custom/ButtonColumn.qml
+++ b/components/custom/ButtonColumn.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 2.0
 import "ButtonGroup.js" as Behavior
 
 /*
diff --git a/components/custom/ButtonRow.qml b/components/custom/ButtonRow.qml
index 7c2d3ea7ad62646096004778e3ed48e2254f122f..c5bc9a33c9b5121a0f3c0f1f90fe7783990941e4 100644
--- a/components/custom/ButtonRow.qml
+++ b/components/custom/ButtonRow.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 2.0
 import "ButtonGroup.js" as Behavior
 
 /*
diff --git a/components/custom/CheckBox.qml b/components/custom/CheckBox.qml
index a49d71d8a53c1cee09cb6714a24dfcb0454bf58d..82f50072bd5dd79caf09ec533bd864b066388509 100644
--- a/components/custom/CheckBox.qml
+++ b/components/custom/CheckBox.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
 import "./behaviors"
 
 Item {
diff --git a/components/custom/ChoiceList.qml b/components/custom/ChoiceList.qml
index 892a297ebd82522e84da9302e86aa354fe0158fb..b1ef10b4deda7baa11ec476f26eeb10f860223cf 100644
--- a/components/custom/ChoiceList.qml
+++ b/components/custom/ChoiceList.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
 import "./private" as Private //  for ChoiceListPopup
 
 // KNOWN ISSUES
diff --git a/components/custom/ProgressBar.qml b/components/custom/ProgressBar.qml
index 3ad8bca6c0bf7d94797b5a83433f063b39e2bc27..3e85e139397c93918678700326feca7f5035a07b 100644
--- a/components/custom/ProgressBar.qml
+++ b/components/custom/ProgressBar.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
 
 Item {
     id: progressBar
diff --git a/components/custom/Slider.qml b/components/custom/Slider.qml
index ef725d75b211b8f5840f3da05127f9c7de237e43..837b348daf0fe81a68876cb3911f2e40c2d92517 100644
--- a/components/custom/Slider.qml
+++ b/components/custom/Slider.qml
@@ -24,7 +24,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 2.0
 import "../plugin"
 
 Item {
diff --git a/components/custom/SpinBox.qml b/components/custom/SpinBox.qml
index 3eece53eaa4ec3c401ff716a0888232a649b8125..4595836385d7e9391fcd9240684f5a2d7414ce36 100644
--- a/components/custom/SpinBox.qml
+++ b/components/custom/SpinBox.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
 
 FocusScope {
     id: spinbox
diff --git a/components/custom/TextField.qml b/components/custom/TextField.qml
index b38b3ecb70d67d40fd68cea96d8995aaec88f656..2d412e1568b667c38c8784948a956841747769d1 100644
--- a/components/custom/TextField.qml
+++ b/components/custom/TextField.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
 import "./behaviors"    // TextEditMouseBehavior
 
 // KNOWN ISSUES
diff --git a/components/custom/behaviors/ButtonBehavior.qml b/components/custom/behaviors/ButtonBehavior.qml
index 57ea626906c471df9f47b4f61607b3c6fd89e11e..b9ab1f350f61364076c17074434bb6ef0e47c87e 100644
--- a/components/custom/behaviors/ButtonBehavior.qml
+++ b/components/custom/behaviors/ButtonBehavior.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
 
 Item {
     id: behavior
diff --git a/components/custom/behaviors/ModalPopupBehavior.qml b/components/custom/behaviors/ModalPopupBehavior.qml
index 108bf02ae219b761964e315726500582dfae1d5a..c5e39311f71d2575aec2d612e8c75aa508ddbab7 100644
--- a/components/custom/behaviors/ModalPopupBehavior.qml
+++ b/components/custom/behaviors/ModalPopupBehavior.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
 
 // KNOWN ISSUES
 // none
diff --git a/components/custom/private/ChoiceListPopup.qml b/components/custom/private/ChoiceListPopup.qml
index 9b34fb4c3cea5340111ba08c3b64947facedabf4..0262f52bf709be27b3aa9d70c1ad3587755f2f06 100644
--- a/components/custom/private/ChoiceListPopup.qml
+++ b/components/custom/private/ChoiceListPopup.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
 
 MouseArea {
     id: popup
diff --git a/components/styleitem/qstyleitem.cpp b/components/styleitem/qstyleitem.cpp
index 528336e1aeecb1afe6398f1c36105a3680eb0763..33b0a0d8d6a3334c95ae46d8373a684ef86e3833 100644
--- a/components/styleitem/qstyleitem.cpp
+++ b/components/styleitem/qstyleitem.cpp
@@ -49,8 +49,8 @@
 #include <QtGui/QMenu>
 
 
-QStyleItem::QStyleItem(QDeclarativeItem *parent)
-    : QDeclarativeItem(parent),
+QStyleItem::QStyleItem(QSGPaintedItem *parent)
+    : QSGPaintedItem(parent),
     m_dummywidget(0),
     m_styleoption(0),
     m_sunken(false),
@@ -66,8 +66,8 @@ QStyleItem::QStyleItem(QDeclarativeItem *parent)
     m_value(0),
     m_paintMargins(0)
 {
-    setFlag(QGraphicsItem::ItemHasNoContents, false);
-    setCacheMode(QGraphicsItem::DeviceCoordinateCache);
+    setFlag(QSGItem::ItemHasContents, true);
+    //setCacheMode(QGraphicsItem::DeviceCoordinateCache);
     setSmooth(true);
 
     connect(this, SIGNAL(infoChanged()), this, SLOT(updateItem()));
@@ -587,9 +587,9 @@ bool QStyleItem::eventFilter(QObject *o, QEvent *e) {
 
 void QStyleItem::showToolTip(const QString &str)
 {
-    QPointF scene = mapToScene(width() - 20, 0);
-    QPoint global = qApp->focusWidget()->mapToGlobal(scene.toPoint());
-    QToolTip::showText(QPoint(global.x(), global.y()), str);
+//    QPointF scene = mapToScene(width() - 20, 0);
+//    QPoint global = qApp->focusWidget()->mapToGlobal(scene.toPoint());
+//    QToolTip::showText(QPoint(global.x(), global.y()), str);
 }
 
 QRect QStyleItem::subControlRect(const QString &subcontrolString)
@@ -639,7 +639,7 @@ QRect QStyleItem::subControlRect(const QString &subcontrolString)
     return QRect();
 }
 
-void QStyleItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *)
+void QStyleItem::paint(QPainter *painter)
 {
     QString type = elementType();
     initStyleOption();
diff --git a/components/styleitem/qstyleitem.h b/components/styleitem/qstyleitem.h
index 16dd15a92eca893749f466f8465d60f60b0da634..49ca5b03d37cb7283dbcd567f4a3742e2abe0309 100644
--- a/components/styleitem/qstyleitem.h
+++ b/components/styleitem/qstyleitem.h
@@ -40,12 +40,13 @@
 #ifndef STYLEWRAPPER_H
 #define STYLEWRAPPER_H
 
-#include <QDeclarativeItem>
+#include <private/qsgpainteditem_p.h>
+//#include <QDeclarativeItem>
 #include <QtGui/QStyle>
 #include <QtGui>
 #include <QEvent>
 
-class QStyleItem: public QDeclarativeItem
+class QStyleItem: public QSGPaintedItem
 {
     Q_OBJECT
 
@@ -70,10 +71,10 @@ class QStyleItem: public QDeclarativeItem
     Q_PROPERTY( int paintMargins READ paintMargins WRITE setPaintMargins NOTIFY paintMarginsChanged)
 
 public:
-    QStyleItem(QDeclarativeItem *parent = 0);
+    QStyleItem(QSGPaintedItem *parent = 0);
     ~QStyleItem();
 
-    void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *);
+    void paint(QPainter *);
 
     bool sunken() const { return m_sunken; }
     bool raised() const { return m_raised; }
diff --git a/examples/Browser.qml b/examples/Browser.qml
index 88f920b09445ce8b1f90dc8afa79a86731ec8c64..c14e977d3dd47defe2750409187f1b6de335fc7f 100644
--- a/examples/Browser.qml
+++ b/examples/Browser.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
 import QtWebKit 1.0
 import "../components"
 
diff --git a/examples/Gallery.qml b/examples/Gallery.qml
index 370920ff89e8786052bdcd905ccb500742fc76f6..0da33a4658f516605ce66f248fb85bc4d19da999 100644
--- a/examples/Gallery.qml
+++ b/examples/Gallery.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
 import "../components"
 import "../components/plugin"
 
diff --git a/examples/Panel.qml b/examples/Panel.qml
index ed5d49b2b170e4963933100b514ee652ad4d8cb6..985e7836fd311ad20033582c926b67a1174ba40e 100644
--- a/examples/Panel.qml
+++ b/examples/Panel.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
 import QtWebKit 1.0
 import "../components"