diff --git a/src/adaptors/UBCFFSubsetAdaptor.cpp b/src/adaptors/UBCFFSubsetAdaptor.cpp
index 3c462c91..bc43b758 100644
--- a/src/adaptors/UBCFFSubsetAdaptor.cpp
+++ b/src/adaptors/UBCFFSubsetAdaptor.cpp
@@ -31,7 +31,7 @@
 #include "domain/UBGraphicsWidgetItem.h"
 #include "domain/UBGraphicsTextItem.h"
 #include "domain/UBGraphicsTextItemDelegate.h"
-#include "domain/UBW3CWidget.h"
+#include "domain/UBGraphicsWidgetItem.h"
 
 #include "frameworks/UBFileSystemUtils.h"
 
@@ -776,7 +776,7 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgFlash(const QDomElement &ele
         return false;
     }
 
-    QString flashUrl = UBW3CWidget::createNPAPIWrapperInDir(flashPath, tmpFlashDir, "application/x-shockwave-flash"
+    QString flashUrl = UBGraphicsW3CWidgetItem::createNPAPIWrapperInDir(flashPath, tmpFlashDir, "application/x-shockwave-flash"
                                                             ,QSize(mCurrentSceneRect.width(), mCurrentSceneRect.height()));
     UBGraphicsWidgetItem *flashItem = mCurrentScene->addW3CWidget(QUrl::fromLocalFile(flashUrl));
     flashItem->setSourceUrl(urlPath);
diff --git a/src/adaptors/UBSvgSubsetAdaptor.cpp b/src/adaptors/UBSvgSubsetAdaptor.cpp
index a9a325e8..84b155d9 100644
--- a/src/adaptors/UBSvgSubsetAdaptor.cpp
+++ b/src/adaptors/UBSvgSubsetAdaptor.cpp
@@ -27,7 +27,6 @@
 #include "domain/UBGraphicsPDFItem.h"
 #include "domain/UBGraphicsTextItem.h"
 #include "domain/UBGraphicsTextItemDelegate.h"
-#include "domain/UBAbstractWidget.h"
 #include "domain/UBGraphicsStroke.h"
 #include "domain/UBGraphicsStrokesGroup.h"
 #include "domain/UBGraphicsGroupContainerItem.h"
@@ -2488,7 +2487,7 @@ void UBSvgSubsetAdaptor::UBSvgSubsetWriter::graphicsW3CWidgetToSvg(UBGraphicsW3C
 
 void UBSvgSubsetAdaptor::UBSvgSubsetWriter::graphicsWidgetToSvg(UBGraphicsWidgetItem* item)
 {
-    QUrl widgetRootUrl = item->widgetWebView()->widgetUrl();
+    QUrl widgetRootUrl = item->widgetUrl();
     QString uuid = UBStringUtils::toCanonicalUuid(item->uuid());
     QString widgetDirectoryPath = UBPersistenceManager::widgetDirectory;
     if (widgetRootUrl.toString().startsWith("file://"))
@@ -2517,13 +2516,13 @@ void UBSvgSubsetAdaptor::UBSvgSubsetWriter::graphicsWidgetToSvg(UBGraphicsWidget
 
     graphicsItemToSvg(item);
 
-    if (item->widgetWebView()->isFrozen())
+    if (item->isFrozen())
     {
         mXmlWriter.writeAttribute(UBSettings::uniboardDocumentNamespaceUri, "frozen", xmlTrue);
     }
 
     QString snapshotPath = mDocumentPath + "/" + UBPersistenceManager::widgetDirectory + "/" + uuid + ".png";
-    item->widgetWebView()->takeSnapshot().save(snapshotPath, "PNG");
+    item->takeSnapshot().save(snapshotPath, "PNG");
 
     mXmlWriter.writeStartElement(nsXHtml, "iframe");
 
@@ -2532,10 +2531,10 @@ void UBSvgSubsetAdaptor::UBSvgSubsetWriter::graphicsWidgetToSvg(UBGraphicsWidget
     mXmlWriter.writeAttribute("height", QString("%1").arg(item->boundingRect().height()));
 
     QString startFileUrl;
-    if (item->widgetWebView()->mainHtmlFileName().startsWith("http://"))
-        startFileUrl = item->widgetWebView()->mainHtmlFileName();
+    if (item->mainHtmlFileName().startsWith("http://"))
+        startFileUrl = item->mainHtmlFileName();
     else
-        startFileUrl = widgetRootUrl.toString() + "/" + item->widgetWebView()->mainHtmlFileName();
+        startFileUrl = widgetRootUrl.toString() + "/" + item->mainHtmlFileName();
 
     mXmlWriter.writeAttribute("src", startFileUrl);
     mXmlWriter.writeEndElement(); //iFrame
@@ -2626,13 +2625,13 @@ UBGraphicsW3CWidgetItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::graphicsW3CWidge
 
     QPixmap snapshot(pixPath);
     if (!snapshot.isNull())
-        widgetItem->w3cWidget()->setSnapshot(snapshot);
+        widgetItem->setSnapshot(snapshot);
 
     QStringRef frozen = mXmlReader.attributes().value(mNamespaceUri, "frozen");
 
     if (!frozen.isNull() && frozen.toString() == xmlTrue && !snapshot.isNull())
     {
-        widgetItem->w3cWidget()->freeze();
+        widgetItem->freeze();
     }
 
     graphicsItemFromSvg(widgetItem);
diff --git a/src/adaptors/publishing/UBDocumentPublisher.cpp b/src/adaptors/publishing/UBDocumentPublisher.cpp
index 1c360a1f..39174dba 100644
--- a/src/adaptors/publishing/UBDocumentPublisher.cpp
+++ b/src/adaptors/publishing/UBDocumentPublisher.cpp
@@ -281,12 +281,12 @@ void UBDocumentPublisher::upgradeDocumentForPublishing()
                 jsonFile.write(QString("      \"uuid\": \"%1\",\n").arg(UBStringUtils::toCanonicalUuid(widget->uuid())).toUtf8());
                 jsonFile.write(QString("      \"id\": \"%1\",\n").arg(widget->metadatas().id).toUtf8());
 
-                jsonFile.write(QString("      \"name\": \"%1\",\n").arg(widget->w3cWidget()->metadatas().name).toUtf8());
-                jsonFile.write(QString("      \"description\": \"%1\",\n").arg(widget->w3cWidget()->metadatas().description).toUtf8());
-                jsonFile.write(QString("      \"author\": \"%1\",\n").arg(widget->w3cWidget()->metadatas().author).toUtf8());
-                jsonFile.write(QString("      \"authorEmail\": \"%1\",\n").arg(widget->w3cWidget()->metadatas().authorEmail).toUtf8());
-                jsonFile.write(QString("      \"authorHref\": \"%1\",\n").arg(widget->w3cWidget()->metadatas().authorHref).toUtf8());
-                jsonFile.write(QString("      \"version\": \"%1\",\n").arg(widget->w3cWidget()->metadatas().authorHref).toUtf8());
+                jsonFile.write(QString("      \"name\": \"%1\",\n").arg(widget->metadatas().name).toUtf8());
+                jsonFile.write(QString("      \"description\": \"%1\",\n").arg(widget->metadatas().description).toUtf8());
+                jsonFile.write(QString("      \"author\": \"%1\",\n").arg(widget->metadatas().author).toUtf8());
+                jsonFile.write(QString("      \"authorEmail\": \"%1\",\n").arg(widget->metadatas().authorEmail).toUtf8());
+                jsonFile.write(QString("      \"authorHref\": \"%1\",\n").arg(widget->metadatas().authorHref).toUtf8());
+                jsonFile.write(QString("      \"version\": \"%1\",\n").arg(widget->metadatas().authorHref).toUtf8());
 
                 jsonFile.write(QString("      \"x\": %1,\n").arg(widget->sceneBoundingRect().x()).toUtf8());
                 jsonFile.write(QString("      \"y\": %1,\n").arg(widget->sceneBoundingRect().y()).toUtf8());
@@ -298,10 +298,10 @@ void UBDocumentPublisher::upgradeDocumentForPublishing()
 
                 QString url = UBPersistenceManager::widgetDirectory + "/" + widget->uuid().toString() + ".wgt";
                 jsonFile.write(QString("      \"src\": \"%1\",\n").arg(url).toUtf8());
-                QString startFile = widget->w3cWidget()->mainHtmlFileName();
+                QString startFile = widget->mainHtmlFileName();
                 jsonFile.write(QString("      \"startFile\": \"%1\",\n").arg(startFile).toUtf8());
 
-                QMap<QString, QString> preferences = widget->preferences();
+                QMap<QString, QString> preferences = widget->UBGraphicsWidgetItem::preferences();
 
                 jsonFile.write(QString("      \"preferences\": {\n").toUtf8());
 
@@ -360,10 +360,10 @@ void UBDocumentPublisher::upgradeDocumentForPublishing()
 void UBDocumentPublisher::generateWidgetPropertyScript(UBGraphicsW3CWidgetItem *widgetItem, int pageNumber)
 {
 
-    QMap<QString, QString> preferences = widgetItem->preferences();
+    QMap<QString, QString> preferences = widgetItem->UBGraphicsWidgetItem::preferences();
     QMap<QString, QString> datastoreEntries = widgetItem->datastoreEntries();
 
-    QString startFileName = widgetItem->w3cWidget()->mainHtmlFileName();
+    QString startFileName = widgetItem->mainHtmlFileName();
 
     if (!startFileName.startsWith("http://"))
     {
@@ -394,18 +394,18 @@ void UBDocumentPublisher::generateWidgetPropertyScript(UBGraphicsW3CWidgetItem *
                             lines << "  <script type=\"text/javascript\">";
 
                             lines << "    var widget = {};";
-                            lines << "    widget.id = '" + widgetItem->w3cWidget()->metadatas().id + "';";
-                            lines << "    widget.name = '" + widgetItem->w3cWidget()->metadatas().name + "';";
-                            lines << "    widget.description = '" + widgetItem->w3cWidget()->metadatas().description + "';";
-                            lines << "    widget.author = '" + widgetItem->w3cWidget()->metadatas().author + "';";
-                            lines << "    widget.authorEmail = '" + widgetItem->w3cWidget()->metadatas().authorEmail + "';";
-                            lines << "    widget.authorHref = '" + widgetItem->w3cWidget()->metadatas().authorHref + "';";
-                            lines << "    widget.version = '" + widgetItem->w3cWidget()->metadatas().version + "';";
+                            lines << "    widget.id = '" + widgetItem->metadatas().id + "';";
+                            lines << "    widget.name = '" + widgetItem->metadatas().name + "';";
+                            lines << "    widget.description = '" + widgetItem->metadatas().description + "';";
+                            lines << "    widget.author = '" + widgetItem->metadatas().author + "';";
+                            lines << "    widget.authorEmail = '" + widgetItem->metadatas().authorEmail + "';";
+                            lines << "    widget.authorHref = '" + widgetItem->metadatas().authorHref + "';";
+                            lines << "    widget.version = '" + widgetItem->metadatas().version + "';";
 
                             lines << "    widget.uuid = '" + UBStringUtils::toCanonicalUuid(widgetItem->uuid()) + "';";
 
-                            lines << "    widget.width = " + QString("%1").arg(widgetItem->w3cWidget()->width()) + ";";
-                            lines << "    widget.height = " + QString("%1").arg(widgetItem->w3cWidget()->height()) + ";";
+                            lines << "    widget.width = " + QString("%1").arg(widgetItem->nominalSize().width()) + ";";
+                            lines << "    widget.height = " + QString("%1").arg(widgetItem->nominalSize().height()) + ";";
                             lines << "    widget.openUrl = function(url) { window.open(url); }";
                             lines << "    widget.preferences = new Array()";
 
diff --git a/src/api/UBW3CWidgetAPI.cpp b/src/api/UBW3CWidgetAPI.cpp
index a58e7eb6..4af72cbe 100644
--- a/src/api/UBW3CWidgetAPI.cpp
+++ b/src/api/UBW3CWidgetAPI.cpp
@@ -30,25 +30,14 @@
 
 #include "core/memcheck.h"
 
-UBW3CWidgetAPI::UBW3CWidgetAPI(UBGraphicsW3CWidgetItem *graphicsWidget)
-    : QObject(graphicsWidget)
+UBW3CWidgetAPI::UBW3CWidgetAPI(UBGraphicsW3CWidgetItem *graphicsWidget, QObject *parent)
+    : QObject(parent)
     , mGraphicsW3CWidget(graphicsWidget)
-    , mW3CWidget(mGraphicsW3CWidget->w3cWidget())
 {
-    mPreferencesAPI = new UBW3CWidgetPreferenceAPI(graphicsWidget);
+    mPreferencesAPI = new UBW3CWidgetPreferenceAPI(graphicsWidget, parent);
 
 }
 
-
-UBW3CWidgetAPI::UBW3CWidgetAPI(UBW3CWidget *widget)
-    : QObject(widget)
-    , mGraphicsW3CWidget(0)
-    , mW3CWidget(widget)
-{
-    mPreferencesAPI = new UBW3CWidgetPreferenceAPI(widget);
-}
-
-
 UBW3CWidgetAPI::~UBW3CWidgetAPI()
 {
     // NOOP
@@ -66,55 +55,55 @@ QString UBW3CWidgetAPI::uuid()
 
 int UBW3CWidgetAPI::width()
 {
-    return mW3CWidget->geometry().width();
+    return mGraphicsW3CWidget->nominalSize().width();
 }
 
 
 int UBW3CWidgetAPI::height()
 {
-    return mW3CWidget->geometry().height();
+    return mGraphicsW3CWidget->nominalSize().height();
 }
 
 
 QString UBW3CWidgetAPI::id()
 {
-    return mW3CWidget->metadatas().id;
+    return mGraphicsW3CWidget->metadatas().id;
 }
 
 
 QString UBW3CWidgetAPI::name()
 {
-    return mW3CWidget->metadatas().name;
+    return mGraphicsW3CWidget->metadatas().name;
 }
 
 
 QString UBW3CWidgetAPI::description()
 {
-    return mW3CWidget->metadatas().description;
+    return mGraphicsW3CWidget->metadatas().description;
 }
 
 
 QString UBW3CWidgetAPI::author()
 {
-    return mW3CWidget->metadatas().author;
+    return mGraphicsW3CWidget->metadatas().author;
 }
 
 
 QString UBW3CWidgetAPI::authorEmail()
 {
-    return mW3CWidget->metadatas().authorEmail;
+    return mGraphicsW3CWidget->metadatas().authorEmail;
 }
 
 
 QString UBW3CWidgetAPI::authorHref()
 {
-    return mW3CWidget->metadatas().authorHref;
+    return mGraphicsW3CWidget->metadatas().authorHref;
 }
 
 
 QString UBW3CWidgetAPI::version()
 {
-    return mW3CWidget->metadatas().version;
+    return mGraphicsW3CWidget->metadatas().version;
 }
 
 QObject* UBW3CWidgetAPI::preferences()
@@ -129,24 +118,13 @@ void UBW3CWidgetAPI::openURL(const QString& url)
 }
 
 
-UBW3CWidgetPreferenceAPI::UBW3CWidgetPreferenceAPI(UBGraphicsW3CWidgetItem *graphicsWidget)
-    : UBW3CWebStorage(graphicsWidget)
+UBW3CWidgetPreferenceAPI::UBW3CWidgetPreferenceAPI(UBGraphicsW3CWidgetItem *graphicsWidget, QObject *parent)
+    : UBW3CWebStorage(parent)
     , mGraphicsW3CWidget(graphicsWidget)
-    , mW3CWidget(graphicsWidget->w3cWidget())
-{
-    // NOOP
-}
-
-UBW3CWidgetPreferenceAPI::UBW3CWidgetPreferenceAPI(UBW3CWidget *widget)
-    : UBW3CWebStorage(widget)
-    , mGraphicsW3CWidget(0)
-    , mW3CWidget(widget)
 {
     // NOOP
 }
 
-
-
 UBW3CWidgetPreferenceAPI::~UBW3CWidgetPreferenceAPI()
 {
     // NOOP
@@ -155,45 +133,35 @@ UBW3CWidgetPreferenceAPI::~UBW3CWidgetPreferenceAPI()
 
 QString UBW3CWidgetPreferenceAPI::key(int index)
 {
-   QMap<QString, UBW3CWidget::PreferenceValue> w3CPrefs = mW3CWidget->preferences();
-
-   if (index < w3CPrefs.size())
-       return w3CPrefs.keys().at(index);
-   else
-       return "";
+  QMap<QString, UBGraphicsW3CWidgetItem::PreferenceValue> w3CPrefs = mGraphicsW3CWidget->preferences();
 
+  if (index < w3CPrefs.size())
+    return w3CPrefs.keys().at(index);
+  else
+    return "";
 }
 
-
 QString UBW3CWidgetPreferenceAPI::getItem(const QString& key)
 {
-   if (mGraphicsW3CWidget)
-   {
-       QMap<QString, QString> docPref = mGraphicsW3CWidget->preferences();
-
-       if (docPref.contains(key))
-           return docPref.value(key);
-   }
-
-   QMap<QString, UBW3CWidget::PreferenceValue> w3cPrefs = mW3CWidget->preferences();
+  if (mGraphicsW3CWidget) {
+    QMap<QString, QString> docPref = mGraphicsW3CWidget->UBGraphicsWidgetItem::preferences();
+    if (docPref.contains(key))
+      return docPref.value(key);
+  
 
-   if (w3cPrefs.contains(key))
-   {
-       UBW3CWidget::PreferenceValue pref = w3cPrefs.value(key);
-
-       return pref.value;
-   }
-   else
-   {
-       return "";
-   }
+    QMap<QString, UBGraphicsW3CWidgetItem::PreferenceValue> w3cPrefs = mGraphicsW3CWidget->preferences();
 
+    if (w3cPrefs.contains(key)) {
+      UBGraphicsW3CWidgetItem::PreferenceValue pref = w3cPrefs.value(key);
+      return pref.value;
+    }
+  }
+  return QString();
 }
 
-
 int UBW3CWidgetPreferenceAPI::length()
 {
-   QMap<QString, UBW3CWidget::PreferenceValue> w3cPrefs = mW3CWidget->preferences();
+   QMap<QString, UBGraphicsW3CWidgetItem::PreferenceValue> w3cPrefs = mGraphicsW3CWidget->preferences();
 
    return w3cPrefs.size();
 }
@@ -201,39 +169,28 @@ int UBW3CWidgetPreferenceAPI::length()
 
 void UBW3CWidgetPreferenceAPI::setItem(const QString& key, const QString& value)
 {
-   if (mGraphicsW3CWidget)
-   {
-       QMap<QString, UBW3CWidget::PreferenceValue> w3cPrefs = mW3CWidget->preferences();
+  if (mGraphicsW3CWidget) {
+    QMap<QString, UBGraphicsW3CWidgetItem::PreferenceValue> w3cPrefs = mGraphicsW3CWidget->preferences();
 
-       if (w3cPrefs.contains(key) && !w3cPrefs.value(key).readonly)
-           mGraphicsW3CWidget->setPreference(key, value);
-   }
-   else
-   {
-       // No state for non graphics widget (aka tool widget)
-   }
+    if (w3cPrefs.contains(key) && !w3cPrefs.value(key).readonly)
+      mGraphicsW3CWidget->setPreference(key, value);
+  }
 }
 
 
+
+
 void UBW3CWidgetPreferenceAPI::removeItem(const QString& key)
 {
-   if (mGraphicsW3CWidget)
-       mGraphicsW3CWidget->removePreference(key);
-   else
-   {
-       // No state for non graphics widget (aka tool widget)
-   }
+  if (mGraphicsW3CWidget)
+    mGraphicsW3CWidget->removePreference(key);
 }
 
 
 void UBW3CWidgetPreferenceAPI::clear()
 {
-    if (mGraphicsW3CWidget)
-        mGraphicsW3CWidget->removeAllPreferences();
-    else
-    {
-       // No state for non graphics widget (aka tool widget)
-    }
+  if (mGraphicsW3CWidget)
+    mGraphicsW3CWidget->removeAllPreferences();
 }
 
 
diff --git a/src/api/UBW3CWidgetAPI.h b/src/api/UBW3CWidgetAPI.h
index 849320ce..cc00efe0 100644
--- a/src/api/UBW3CWidgetAPI.h
+++ b/src/api/UBW3CWidgetAPI.h
@@ -47,8 +47,7 @@ class UBW3CWidgetAPI : public QObject
 
     public:
 
-        UBW3CWidgetAPI(UBGraphicsW3CWidgetItem *graphicsWidget);
-        UBW3CWidgetAPI(UBW3CWidget *widget);
+        UBW3CWidgetAPI(UBGraphicsW3CWidgetItem *graphicsWidget, QObject *parent = 0);
 
         virtual ~UBW3CWidgetAPI();
 
@@ -72,7 +71,6 @@ class UBW3CWidgetAPI : public QObject
     private:
 
         UBGraphicsW3CWidgetItem* mGraphicsW3CWidget;
-        UBW3CWidget *mW3CWidget;
 
         UBW3CWidgetPreferenceAPI* mPreferencesAPI;
 
@@ -88,8 +86,8 @@ class UBW3CWebStorage : public QObject
 
     public:
         UBW3CWebStorage(QObject *parent = 0)
-        : QObject(parent){}
-        virtual ~UBW3CWebStorage(){}
+        : QObject(parent){/* NOOP */}
+        virtual ~UBW3CWebStorage(){/* NOOP */}
 
     public slots:
 
@@ -110,8 +108,7 @@ class UBW3CWidgetPreferenceAPI : public UBW3CWebStorage
     Q_OBJECT;
 
     public:
-        UBW3CWidgetPreferenceAPI(UBGraphicsW3CWidgetItem *graphicsWidget);
-        UBW3CWidgetPreferenceAPI(UBW3CWidget *widget);
+        UBW3CWidgetPreferenceAPI(UBGraphicsW3CWidgetItem *graphicsWidget, QObject *parent = 0);
 
         virtual ~UBW3CWidgetPreferenceAPI();
 
@@ -129,7 +126,6 @@ class UBW3CWidgetPreferenceAPI : public UBW3CWebStorage
     private:
 
         UBGraphicsW3CWidgetItem* mGraphicsW3CWidget;
-        UBW3CWidget* mW3CWidget;
 
 };
 
diff --git a/src/api/UBWidgetMessageAPI.cpp b/src/api/UBWidgetMessageAPI.cpp
index 2df2f2c0..306f2702 100644
--- a/src/api/UBWidgetMessageAPI.cpp
+++ b/src/api/UBWidgetMessageAPI.cpp
@@ -17,16 +17,15 @@
 
 #include "core/UBApplication.h"
 
-#include "domain/UBAbstractWidget.h"
+#include "domain/UBGraphicsWebView.h"
 
 #include "core/memcheck.h"
 
-UBWidgetMessageAPI::UBWidgetMessageAPI(UBW3CWidget *widget)
-    : QObject(widget)
-    , mWebWidget(widget)
+UBWidgetMessageAPI::UBWidgetMessageAPI(UBGraphicsWidgetItem *graphicsWidgetItem, QObject *parent)
+    : QObject(parent)
+    , mGraphicsWidgetItem(graphicsWidgetItem)
 {
-    connect(UBWidgetAPIMessageBroker::instance(), SIGNAL(newMessage(const QString&, const QString&))
-            , this, SLOT(onNewMessage(const QString&, const QString&)), Qt::QueuedConnection);
+    connect(UBWidgetAPIMessageBroker::instance(), SIGNAL(newMessage(const QString&, const QString&)), this, SLOT(onNewMessage(const QString&, const QString&)), Qt::QueuedConnection);
 }
 
 UBWidgetMessageAPI::~UBWidgetMessageAPI()
@@ -45,9 +44,7 @@ void UBWidgetMessageAPI::onNewMessage(const QString& pTopicName, const QString&
 {
     if (mSubscribedTopics.contains(pTopicName))
     {
-        if (mWebWidget
-                && mWebWidget->page()
-                && mWebWidget->page()->mainFrame())
+        if (mGraphicsWidgetItem && mGraphicsWidgetItem->page() && mGraphicsWidgetItem->page()->mainFrame())
         {
 
             QString js;
@@ -55,7 +52,7 @@ void UBWidgetMessageAPI::onNewMessage(const QString& pTopicName, const QString&
             js += "{widget.messages.onmessage('";
             js += pMessage + "', '" + pTopicName + "')}";
 
-            mWebWidget->page()->
+            mGraphicsWidgetItem->page()->
                 mainFrame()->evaluateJavaScript(js);
 
         }
diff --git a/src/api/UBWidgetMessageAPI.h b/src/api/UBWidgetMessageAPI.h
index f33544fc..98723702 100644
--- a/src/api/UBWidgetMessageAPI.h
+++ b/src/api/UBWidgetMessageAPI.h
@@ -25,7 +25,7 @@ class UBWidgetMessageAPI : public QObject
     Q_OBJECT;
 
     public:
-        UBWidgetMessageAPI(UBW3CWidget *widget);
+        UBWidgetMessageAPI(UBGraphicsWidgetItem *graphicsWidgetItem, QObject *parent = 0);
         virtual ~UBWidgetMessageAPI();
 
     public slots:
@@ -49,7 +49,7 @@ class UBWidgetMessageAPI : public QObject
     private:
 
         QSet<QString> mSubscribedTopics;
-        UBW3CWidget *mWebWidget;
+        UBGraphicsWidgetItem *mGraphicsWidgetItem;
 };
 
 
diff --git a/src/api/UBWidgetUniboardAPI.cpp b/src/api/UBWidgetUniboardAPI.cpp
index 87d8b97d..73ecbfae 100644
--- a/src/api/UBWidgetUniboardAPI.cpp
+++ b/src/api/UBWidgetUniboardAPI.cpp
@@ -30,7 +30,6 @@
 
 #include "domain/UBGraphicsScene.h"
 #include "domain/UBGraphicsWidgetItem.h"
-#include "domain/UBAbstractWidget.h"
 
 #include "adaptors/UBThumbnailAdaptor.h"
 
@@ -79,7 +78,7 @@ UBWidgetUniboardAPI::UBWidgetUniboardAPI(UBGraphicsScene *pScene, UBGraphicsWidg
 
     if (w3CGraphicsWidget)
     {
-        mMessagesAPI = new UBWidgetMessageAPI(w3CGraphicsWidget->w3cWidget());
+        mMessagesAPI = new UBWidgetMessageAPI(w3CGraphicsWidget);
         mDatastoreAPI = new UBDatastoreAPI(w3CGraphicsWidget);
     }
 
@@ -547,7 +546,7 @@ void UBWidgetUniboardAPI::ProcessDropEvent(QDropEvent *event)
 
     QDropEvent readyEvent(dropPoint, dropActions, &dropMimeData, dropMouseButtons, dropModifiers);
     //sending event to destination either it had been downloaded or not
-    QApplication::sendEvent(mGraphicsWidget->widgetWebView(),&readyEvent);
+    QApplication::sendEvent(mGraphicsWidget,&readyEvent);
     readyEvent.acceptProposedAction();
 }
 
@@ -602,11 +601,11 @@ void UBWidgetUniboardAPI::onDownloadFinished(bool pSuccess, sDownloadFileDesc de
 
     //To make js interpreter accept drop event we need to generate move event first.
     QDragMoveEvent pseudoMove(dropPoint, desc.dropActions, &dropMimeData, desc.dropMouseButtons, desc.dropModifiers);
-    QApplication::sendEvent(mGraphicsWidget->widgetWebView(),&pseudoMove);
+    QApplication::sendEvent(mGraphicsWidget,&pseudoMove);
 
     QDropEvent readyEvent(dropPoint, desc.dropActions, &dropMimeData, desc.dropMouseButtons, desc.dropModifiers);
     //sending event to destination either it had been downloaded or not
-    QApplication::sendEvent(mGraphicsWidget->widgetWebView(),&readyEvent);
+    QApplication::sendEvent(mGraphicsWidget,&readyEvent);
     readyEvent.acceptProposedAction();
 }
 
@@ -736,9 +735,9 @@ void UBDocumentDatastoreAPI::removeItem(const QString& key)
 {
     mGraphicsW3CWidget->removeDatastoreEntry(key);
 }
+void
 
-
-void UBDocumentDatastoreAPI::clear()
+ UBDocumentDatastoreAPI::clear()
 {
     mGraphicsW3CWidget->removeAllDatastoreEntries();
 }
diff --git a/src/board/UBBoardController.cpp b/src/board/UBBoardController.cpp
index 88f98768..587a3269 100644
--- a/src/board/UBBoardController.cpp
+++ b/src/board/UBBoardController.cpp
@@ -49,7 +49,6 @@
 #include "domain/UBGraphicsWidgetItem.h"
 #include "domain/UBGraphicsMediaItem.h"
 #include "domain/UBGraphicsPDFItem.h"
-#include "domain/UBW3CWidget.h"
 #include "domain/UBGraphicsTextItem.h"
 #include "domain/UBPageSizeUndoCommand.h"
 #include "domain/UBGraphicsGroupContainerItem.h"
@@ -1151,7 +1150,7 @@ UBItem *UBBoardController::downloadFinished(bool pSuccess, QUrl sourceUrl, QStri
         else
             size = mActiveScene->nominalSize() * .8;
 
-        QString widgetUrl = UBW3CWidget::createNPAPIWrapper(sUrl, mimeType, size);
+        QString widgetUrl = UBGraphicsW3CWidgetItem::createNPAPIWrapper(sUrl, mimeType, size);
 
         if (widgetUrl.length() > 0)
         {
@@ -1274,7 +1273,7 @@ UBItem *UBBoardController::downloadFinished(bool pSuccess, QUrl sourceUrl, QStri
                         else
                             size = mActiveScene->nominalSize() * .8;
 
-                        QString widgetUrl = UBW3CWidget::createNPAPIWrapper(swfFile, "application/x-shockwave-flash", size);
+                        QString widgetUrl = UBGraphicsW3CWidgetItem::createNPAPIWrapper(swfFile, "application/x-shockwave-flash", size);
 
                         if (widgetUrl.length() > 0)
                         {
@@ -1655,52 +1654,15 @@ qreal UBBoardController::currentZoom()
         return 1.0;
 }
 
-
-UBToolWidget* UBBoardController::addTool(const QUrl& toolUrl)
-{
-    return addTool(toolUrl, mControlView->mapToScene(mControlView->rect().center()));
-}
-
-
-UBToolWidget* UBBoardController::addTool(const QUrl& toolUrl, QPointF scenePos)
-{
-    UBToolWidget *toolWidget = new UBToolWidget(toolUrl, mMainWindow); // Deleted in UBBoardController::removeTool
-    QPoint pos = mControlView->mapToGlobal(mControlView->mapFromScene(scenePos));
-    pos -= QPoint(toolWidget->width() / 2, toolWidget->height() / 2);
-
-    toolWidget->move(pos);
-
-    mTools.append(toolWidget);
-
-    toolWidget->show();
-
-    return toolWidget;
-}
-
-
-void UBBoardController::removeTool(UBToolWidget* toolWidget)
-{
-    toolWidget->hide();
-
-    mTools.removeAll(toolWidget);
-
-    delete toolWidget;
-}
-
-
 void UBBoardController::hide()
 {
     UBApplication::mainWindow->actionLibrary->setChecked(false);
-
-    controlViewHidden();
 }
 
 
 void UBBoardController::show()
 {
     UBApplication::mainWindow->actionLibrary->setChecked(false);
-
-    controlViewShown();
 }
 
 
@@ -1925,25 +1887,6 @@ void UBBoardController::grabScene(const QRectF& pSceneRect)
     }
 }
 
-
-void UBBoardController::controlViewHidden()
-{
-    foreach(UBToolWidget* tool, mTools)
-    {
-        tool->hide();
-    }
-}
-
-
-void UBBoardController::controlViewShown()
-{
-    foreach(UBToolWidget* tool, mTools)
-    {
-        tool->show();
-    }
-}
-
-
 UBGraphicsMediaItem* UBBoardController::addVideo(const QUrl& pSourceUrl, bool startPlay, const QPointF& pos)
 {
     QUuid uuid = QUuid::createUuid();
@@ -2003,7 +1946,7 @@ UBGraphicsWidgetItem *UBBoardController::addW3cWidget(const QUrl &pUrl, const QP
         w3cWidgetItem->setSnapshotPath(QUrl::fromLocalFile(snapshotPath));
         UBGraphicsWidgetItem *tmpItem = dynamic_cast<UBGraphicsWidgetItem*>(w3cWidgetItem);
         if (tmpItem)
-           tmpItem->widgetWebView()->takeSnapshot().save(snapshotPath, "PNG");
+           tmpItem->takeSnapshot().save(snapshotPath, "PNG");
 
     }
 
@@ -2208,56 +2151,23 @@ void UBBoardController::togglePodcast(bool checked)
 
 void UBBoardController::moveGraphicsWidgetToControlView(UBGraphicsWidgetItem* graphicsWidget)
 {
-    QPoint controlViewPos = mControlView->mapFromScene(graphicsWidget->sceneBoundingRect().center());
-
-    graphicsWidget->setSelected(false);
-
-    UBAbstractWidget *aw = graphicsWidget->widgetWebView();
-    graphicsWidget->setWidget(0);
+    graphicsWidget->remove();
 
-    UBToolWidget *toolWidget = new UBToolWidget(aw, mControlContainer);
+    UBToolWidget *toolWidget = new UBToolWidget(graphicsWidget);
+    mActiveScene->addItem(toolWidget);
+    qreal ssf = 1 / UBApplication::boardController->systemScaleFactor();
 
-    graphicsWidget->scene()->removeItem(graphicsWidget); // TODO UB 4.6 probably leaking the frame
-
-    toolWidget->centerOn(mControlView->mapTo(mControlContainer, controlViewPos));
-
-    toolWidget->show();
+    toolWidget->setScale(ssf);
+    toolWidget->setPos(graphicsWidget->scenePos());
 }
 
 
 void UBBoardController::moveToolWidgetToScene(UBToolWidget* toolWidget)
 {
-    int xIsOdd = toolWidget->width() % 2;
-    int yIsOdd = toolWidget->height() % 2;
-
-    QPoint mainWindowCenter = toolWidget->mapTo(mMainWindow, QPoint(toolWidget->width(), toolWidget->height()) / 2);
-
-    UBAbstractWidget* webWidget = toolWidget->webWidget();
-    webWidget->setParent(0);
-
-    UBGraphicsWidgetItem* graphicsWidget = 0;
-
-    UBW3CWidget* w3cWidget = qobject_cast<UBW3CWidget*>(webWidget);
-    if (w3cWidget)
-    {
-        graphicsWidget = new UBGraphicsW3CWidgetItem(w3cWidget);
-    }
-    else
-    {
-        UBAppleWidget* appleWidget = qobject_cast<UBAppleWidget*>(webWidget);
-        if (appleWidget)
-        {
-            graphicsWidget = new UBGraphicsAppleWidgetItem(appleWidget);
-        }
-    }
-
-    QPoint controlViewCenter = mControlView->mapFrom(mMainWindow, mainWindowCenter);
-    QPointF scenePos = mControlView->mapToScene(controlViewCenter) + QPointF(xIsOdd * 0.5, yIsOdd * 0.5);
-
-    mActiveScene->addGraphicsWidget(graphicsWidget, scenePos);
-
-    toolWidget->hide();
-    toolWidget->deleteLater();
+    UBGraphicsWidgetItem *graphicsWidgetItem = addW3cWidget(toolWidget->graphicsWidgetItem()->widgetUrl(), QPointF(0, 0));
+    graphicsWidgetItem->setPos(toolWidget->pos());
+    toolWidget->remove();
+    graphicsWidgetItem->setSelected(true); 
 }
 
 
@@ -2343,8 +2253,8 @@ void UBBoardController::freezeW3CWidget(QGraphicsItem *item, bool freeze)
             return;
 
         if (freeze) {
-            item_casted->widgetWebView()->load(QUrl(item_casted->w3cWidget()->freezedWidgetFilePath()));
-        }else
-            item_casted->widgetWebView()->loadMainHtml();
+            item_casted->load(QUrl(UBGraphicsW3CWidgetItem::freezedWidgetFilePath()));
+        } else
+            item_casted->loadMainHtml();
     }
 }
diff --git a/src/board/UBBoardController.h b/src/board/UBBoardController.h
index e2fd4dfe..7d0404e0 100644
--- a/src/board/UBBoardController.h
+++ b/src/board/UBBoardController.h
@@ -197,17 +197,12 @@ class UBBoardController : public UBDocumentContainer
         void hideMessage();
         void setDisabled(bool disable);
         void setColorIndex(int pColorIndex);
-        UBToolWidget* addTool(const QUrl& toolUrl, QPointF scenePos);
-        UBToolWidget* addTool(const QUrl& toolUrl);
-        void removeTool(UBToolWidget* toolWidget);
         void hide();
         void show();
         void setWidePageSize(bool checked);
         void setRegularPageSize(bool checked);
         void stylusToolChanged(int tool);
         void grabScene(const QRectF& pSceneRect);
-        void controlViewHidden();
-        void controlViewShown();
         UBGraphicsMediaItem* addVideo(const QUrl& pUrl, bool startPlay, const QPointF& pos);
         UBGraphicsMediaItem* addAudio(const QUrl& pUrl, bool startPlay, const QPointF& pos);
         UBGraphicsWidgetItem *addW3cWidget(const QUrl& pUrl, const QPointF& pos);
@@ -277,7 +272,6 @@ class UBBoardController : public UBDocumentContainer
         QColor mPenColorOnLightBackground;
         QColor mMarkerColorOnDarkBackground;
         QColor mMarkerColorOnLightBackground;
-        QList<UBToolWidget*> mTools;
         qreal mSystemScaleFactor;
         bool mCleanupDone;
         QMap<QAction*, QPair<QString, QString> > mActionTexts;
diff --git a/src/board/UBBoardPaletteManager.cpp b/src/board/UBBoardPaletteManager.cpp
index b663bdb3..1468e753 100644
--- a/src/board/UBBoardPaletteManager.cpp
+++ b/src/board/UBBoardPaletteManager.cpp
@@ -48,7 +48,6 @@
 #include "network/UBServerXMLHttpRequest.h"
 
 #include "domain/UBGraphicsScene.h"
-#include "domain/UBAbstractWidget.h"
 #include "domain/UBGraphicsPixmapItem.h"
 
 #include "document/UBDocumentProxy.h"
@@ -678,8 +677,10 @@ void UBBoardPaletteManager::changeMode(eUBDockPaletteWidgetMode newMode, bool is
     {
         case eUBDockPaletteWidget_BOARD:
             {
-                mLeftPalette->assignParent(UBApplication::boardController->controlContainer());
-                mRightPalette->assignParent(UBApplication::boardController->controlContainer());
+                mLeftPalette->assignParent(mContainer);
+                mRightPalette->assignParent(mContainer);
+                mRightPalette->stackUnder(mStylusPalette);
+                mLeftPalette->stackUnder(mStylusPalette);
                 if (UBPlatformUtils::hasVirtualKeyboard() && mKeyboardPalette != NULL)
                 {
 
@@ -711,6 +712,8 @@ void UBBoardPaletteManager::changeMode(eUBDockPaletteWidgetMode newMode, bool is
             {
                 mLeftPalette->assignParent((QWidget*)UBApplication::applicationController->uninotesController()->drawingView());
                 mRightPalette->assignParent((QWidget*)UBApplication::applicationController->uninotesController()->drawingView());
+                mRightPalette->lower();
+                mLeftPalette->lower();
                 if (UBPlatformUtils::hasVirtualKeyboard() && mKeyboardPalette != NULL)
                 {
 
diff --git a/src/board/UBBoardPaletteManager.h b/src/board/UBBoardPaletteManager.h
index c0113052..335b4bcd 100644
--- a/src/board/UBBoardPaletteManager.h
+++ b/src/board/UBBoardPaletteManager.h
@@ -18,8 +18,7 @@
 
 #include <QtGui>
 #include <QtWebKit>
-
-#include "web/UBRoutedMouseEventWebView.h"
+ 
 #include "gui/UBLeftPalette.h"
 #include "gui/UBRightPalette.h"
 #include "gui/UBPageNavigationWidget.h"
diff --git a/src/board/UBBoardView.cpp b/src/board/UBBoardView.cpp
index 4953c018..31e0160a 100644
--- a/src/board/UBBoardView.cpp
+++ b/src/board/UBBoardView.cpp
@@ -123,8 +123,6 @@ UBBoardView::init ()
   setHorizontalScrollBarPolicy (Qt::ScrollBarAlwaysOff);
   setAcceptDrops (true);
 
-  setOptimizationFlag (QGraphicsView::IndirectPainting); // enable UBBoardView::drawItems filter
-
   mTabletStylusIsPressed = false;
   mMouseButtonIsPressed = false;
   mPendingStylusReleaseEvent = false;
@@ -426,7 +424,7 @@ bool UBBoardView::itemShouldReceiveMousePressEvent(QGraphicsItem *item)
     UBStylusTool::Enum currentTool = (UBStylusTool::Enum)UBDrawingController::drawingController()->stylusTool();
 
     if ((currentTool == UBStylusTool::Play) && UBGraphicsGroupContainerItem::Type == movingItem->type())
-        return movingItem = NULL;
+        return movingItem == NULL;
 
     switch(item->type())
     {
@@ -536,7 +534,7 @@ bool UBBoardView::itemShouldBeMoved(QGraphicsItem *item)
         return !item->isSelected();
 
     default: 
-        false;
+        return false;
     }
 
     return false;
@@ -1182,7 +1180,7 @@ void UBBoardView::dragMoveEvent (QDragMoveEvent *event)
             }
             QPoint newPoint(graphicsWidget->mapFromScene(mapToScene(event->pos())).toPoint());
             QDragMoveEvent newEvent(newPoint, event->dropAction(), event->mimeData(), event->mouseButtons(), event->keyboardModifiers());
-            QApplication::sendEvent(graphicsWidget->widgetWebView(),&newEvent);
+            QApplication::sendEvent(graphicsWidget,&newEvent);
         } else {
             mOkOnWidget = false;
             event->ignore();
diff --git a/src/board/UBBoardView.h b/src/board/UBBoardView.h
index 0314b392..0df2dc6e 100644
--- a/src/board/UBBoardView.h
+++ b/src/board/UBBoardView.h
@@ -21,7 +21,6 @@
 #include "domain/UBGraphicsDelegateFrame.h"
 
 class UBBoardController;
-class UBAppleWidget;
 class UBGraphicsScene;
 class UBGraphicsWidgetItem;
 class UBRubberBand;
diff --git a/src/board/UBFeaturesController.cpp b/src/board/UBFeaturesController.cpp
index e8ad51c4..e63b04f7 100644
--- a/src/board/UBFeaturesController.cpp
+++ b/src/board/UBFeaturesController.cpp
@@ -11,7 +11,6 @@
 #include "frameworks/UBPlatformUtils.h"
 
 #include "core/UBDownloadManager.h"
-#include "domain/UBAbstractWidget.h"
 #include "domain/UBGraphicsScene.h"
 #include "domain/UBGraphicsSvgItem.h"
 #include "domain/UBGraphicsPixmapItem.h"
@@ -22,10 +21,9 @@
 
 const QString UBFeaturesController::virtualRootName = "root";
 
-
-
 void UBFeaturesComputingThread::scanFS(const QUrl & currentPath, const QString & currVirtualPath)
 {
+    
     Q_ASSERT(QFileInfo(currentPath.toLocalFile()).exists());
 
     QFileInfoList fileInfoList = UBFileSystemUtils::allElementsInDirectory(currentPath.toLocalFile());
@@ -558,7 +556,7 @@ QImage UBFeaturesController::getIcon(const QString &path, UBFeatureElementType p
         return QImage(":images/libpalette/folder.svg");
 
     } else if (pFType == FEATURE_INTERACTIVE) {
-        return QImage(UBAbstractWidget::iconFilePath(QUrl::fromLocalFile(path)));
+        return QImage(UBGraphicsWidgetItem::iconFilePath(QUrl::fromLocalFile(path)));
     }
 
 
@@ -566,7 +564,7 @@ QImage UBFeaturesController::getIcon(const QString &path, UBFeatureElementType p
         return QImage( UBToolsManager::manager()->iconFromToolId(path) );
 
     } if ( UBFileSystemUtils::mimeTypeFromFileName(path).contains("application"))  {
-        return QImage( UBAbstractWidget::iconFilePath( QUrl::fromLocalFile(path) ) );
+        return QImage( UBGraphicsWidgetItem::iconFilePath( QUrl::fromLocalFile(path) ) );
     }
 
     QImage thumb;
@@ -624,6 +622,7 @@ void UBFeaturesController::importImage(const QImage &image, const QString &fileN
     importImage(image, currentElement, fileName);
 }
 
+
 void UBFeaturesController::importImage( const QImage &image, const UBFeature &destination, const QString &fileName )
 {
     QString mFileName = fileName;
@@ -650,6 +649,27 @@ void UBFeaturesController::importImage( const QImage &image, const UBFeature &de
 
 }
 
+QStringList UBFeaturesController::getFileNamesInFolders()
+{
+    QStringList strList;
+
+    Q_ASSERT(curListModel);
+
+    for (int i = 0; i < curListModel->rowCount(QModelIndex()); i++) {
+        QModelIndex ind = curListModel->index(i, 0);
+        if (!ind.isValid()) {
+            qDebug() << "incorrect model index catched";
+            continue;
+        }
+        UBFeature curFeature = curListModel->data(ind, Qt::UserRole + 1).value<UBFeature>();
+        if (curFeature.getType() == FEATURE_FOLDER) {
+            strList << QFileInfo(curFeature.getFullPath().toLocalFile()).fileName();
+        }
+    }
+
+    return strList;
+}
+
 void UBFeaturesController::addNewFolder(QString name)
 {
     QString path = currentElement.getFullPath().toLocalFile() + "/" + name;
diff --git a/src/board/UBFeaturesController.h b/src/board/UBFeaturesController.h
index 13f0142d..64bbd5cc 100644
--- a/src/board/UBFeaturesController.h
+++ b/src/board/UBFeaturesController.h
@@ -157,6 +157,7 @@ public:
     void removeFromFavorite(const QUrl &path, bool deleteManualy = false);
     void importImage(const QImage &image, const QString &fileName = QString());
     void importImage( const QImage &image, const UBFeature &destination, const QString &fileName = QString() );
+    QStringList getFileNamesInFolders();
 
     void fileSystemScan(const QUrl &currPath, const QString & currVirtualPath);
     int featuresCount(const QUrl &currPath);
diff --git a/src/board/UBLibraryController.cpp b/src/board/UBLibraryController.cpp
index efc7e393..d9204ef0 100644
--- a/src/board/UBLibraryController.cpp
+++ b/src/board/UBLibraryController.cpp
@@ -24,7 +24,6 @@
 #include "core/UBApplicationController.h"
 #include "core/UBDownloadManager.h"
 
-#include "domain/UBAbstractWidget.h"
 #include "domain/UBGraphicsScene.h"
 #include "domain/UBGraphicsSvgItem.h"
 #include "domain/UBGraphicsPixmapItem.h"
@@ -325,7 +324,7 @@ QImage UBLibraryController::thumbnailForFile(UBLibElement* pElement)
             return image;
     }
     if (pElement->type() == eUBLibElementType_InteractiveItem){
-        QImage image = QImage(UBAbstractWidget::iconFilePath(pElement->path()));
+        QImage image = QImage(UBGraphicsWidgetItem::iconFilePath(pElement->path()));
         return image;
     }
 
@@ -780,7 +779,7 @@ UBLibElement::UBLibElement(eUBLibElementType type, const QUrl &path, const QStri
         mThumbnail = QImage(":images/libpalette/folder.svg");
 
     if (type == eUBLibElementType_InteractiveItem)
-        mThumbnail = QImage(UBAbstractWidget::iconFilePath(path));
+        mThumbnail = QImage(UBGraphicsWidgetItem::iconFilePath(path));
 
     if (type == eUBLibElementType_Item)
         mExtension = QFileInfo(path.toLocalFile()).completeSuffix();
diff --git a/src/core/UBApplicationController.cpp b/src/core/UBApplicationController.cpp
index c9e241b9..fbb20af6 100644
--- a/src/core/UBApplicationController.cpp
+++ b/src/core/UBApplicationController.cpp
@@ -33,6 +33,8 @@
 #include "document/UBDocumentProxy.h"
 #include "document/UBDocumentController.h"
 
+#include "domain/UBGraphicsWidgetItem.h"
+
 #include "desktop/UBDesktopPalette.h"
 #include "desktop/UBDesktopAnnotationController.h"
 
@@ -44,7 +46,6 @@
 #include "gui/UBTeacherGuideWidget.h"
 
 #include "domain/UBGraphicsPixmapItem.h"
-#include "domain/UBW3CWidget.h"
 
 #include "podcast/UBPodcastController.h"
 
@@ -318,7 +319,7 @@ void UBApplicationController::addCapturedEmbedCode(const QString& embedCode)
         int width = 300;
         int height = 150;
 
-        QString widgetPath = UBW3CWidget::createHtmlWrapperInDir(embedCode, userWidgetDir,
+        QString widgetPath = UBGraphicsW3CWidgetItem::createHtmlWrapperInDir(embedCode, userWidgetDir,
                 QSize(width, height), UBStringUtils::toCanonicalUuid(QUuid::createUuid()));
 
         if (widgetPath.length() > 0)
diff --git a/src/domain/UBAbstractWidget.cpp b/src/domain/UBAbstractWidget.cpp
deleted file mode 100644
index b0053b54..00000000
--- a/src/domain/UBAbstractWidget.cpp
+++ /dev/null
@@ -1,476 +0,0 @@
-/*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "UBAbstractWidget.h"
-
-#include <QtNetwork>
-#include <QtXml>
-
-#include "frameworks/UBFileSystemUtils.h"
-
-#include "core/UBApplicationController.h"
-#include "core/UBApplication.h"
-#include "core/UBSettings.h"
-
-#include "network/UBNetworkAccessManager.h"
-
-#include "web/UBWebPage.h"
-#include "web/UBWebKitUtils.h"
-#include "web/UBWebController.h"
-
-#include "core/memcheck.h"
-
-QStringList UBAbstractWidget::sInlineJavaScripts;
-bool UBAbstractWidget::sInlineJavaScriptLoaded = false;
-
-UBAbstractWidget::UBAbstractWidget(const QUrl& pWidgetUrl, QWidget *parent)
-    : UBRoutedMouseEventWebView(parent)
-    , mWidgetUrl(pWidgetUrl)
-    , mIsResizable(false)
-    , mInitialLoadDone(false)
-    , mLoadIsErronous(false)
-    , mIsFreezable(true)
-    , mCanBeContent(0)
-    , mCanBeTool(0)
-    , mIsFrozen(false)
-    , mIsTakingSnapshot(false)
-{
-    setAcceptDrops(true);
-    setPage(new UBWebPage(this));
-    QWebView::settings()->setAttribute(QWebSettings::JavaEnabled, true);
-    QWebView::settings()->setAttribute(QWebSettings::PluginsEnabled, true);
-    QWebView::settings()->setAttribute(QWebSettings::LocalStorageDatabaseEnabled, true);
-    QWebView::settings()->setAttribute(QWebSettings::OfflineWebApplicationCacheEnabled, true);
-    QWebView::settings()->setAttribute(QWebSettings::OfflineStorageDatabaseEnabled, true);
-    QWebView::settings()->setAttribute(QWebSettings::JavascriptCanAccessClipboard, true);
-    QWebView::settings()->setAttribute(QWebSettings::DnsPrefetchEnabled, true);
-
-    QWebView::page()->setNetworkAccessManager(UBNetworkAccessManager::defaultAccessManager());
-
-    setAutoFillBackground(false);
-
-    QPalette pagePalette = QWebView::page()->palette();
-    pagePalette.setBrush(QPalette::Base, QBrush(Qt::transparent));
-    pagePalette.setBrush(QPalette::Window, QBrush(Qt::transparent));
-    QWebView::page()->setPalette(pagePalette);
-
-    QPalette viewPalette = palette();
-    pagePalette.setBrush(QPalette::Base, QBrush(Qt::transparent));
-    viewPalette.setBrush(QPalette::Window, QBrush(Qt::transparent));
-    setPalette(viewPalette);
-
-    connect(QWebView::page()->mainFrame(), SIGNAL(javaScriptWindowObjectCleared()), this, SLOT(javaScriptWindowObjectCleared()));
-    connect(QWebView::page(), SIGNAL(geometryChangeRequested(const QRect&)), this, SIGNAL(geometryChangeRequested(const QRect&)));
-    connect(this, SIGNAL(loadFinished(bool)), this, SLOT(mainFrameLoadFinished (bool)));
-
-    setMouseTracking(true);
-}
-
-bool UBAbstractWidget::canBeContent()
-{
-    // if we under MAC OS
-    #if defined(Q_OS_MAC)
-        return mCanBeContent & UBAbstractWidget::type_MAC;
-    #endif
-
-    // if we under UNIX OS
-    #if defined(Q_OS_UNIX)
-        return mCanBeContent & UBAbstractWidget::type_UNIX;
-    #endif
-
-    // if we under WINDOWS OS
-    #if defined(Q_OS_WIN)
-        return mCanBeContent & UBAbstractWidget::type_WIN;
-    #endif
-}
-
-bool UBAbstractWidget::canBeTool()
-{
-    // if we under MAC OS
-    #if defined(Q_OS_MAC)
-        return mCanBeTool & UBAbstractWidget::type_MAC;
-    #endif
-
-        // if we under UNIX OS
-    #if defined(Q_OS_UNIX)
-        return mCanBeTool & UBAbstractWidget::type_UNIX;
-    #endif
-
-        // if we under WINDOWS OS
-    #if defined(Q_OS_WIN)
-        return mCanBeTool & UBAbstractWidget::type_WIN;
-    #endif
-}
-
-UBAbstractWidget::~UBAbstractWidget()
-{
-    // NOOP
-}
-
-void UBAbstractWidget::loadMainHtml()
-{
-    mInitialLoadDone = false;
-    QWebView::load(mMainHtmlUrl);
-}
-
-bool UBAbstractWidget::event(QEvent *event)
-{
-    if (event->type() == QEvent::ContextMenu)
-    {
-        event->accept();
-        return true;
-    } else {
-        return QWebView::event(event);
-    }
-}
-
-
-void UBAbstractWidget::mainFrameLoadFinished (bool ok)
-{
-    mInitialLoadDone = true;
-    mLoadIsErronous = !ok;
-
-    update();
-}
-
-
-bool UBAbstractWidget::hasEmbededObjects()
-{
-    if (QWebView::page()->mainFrame())
-    {
-        QList<UBWebKitUtils::HtmlObject> htmlObjects = UBWebKitUtils::objectsInFrame(QWebView::page()->mainFrame());
-        return htmlObjects.length() > 0;
-    }
-
-    return false;
-}
-
-
-bool UBAbstractWidget::hasEmbededFlash()
-{
-    if (hasEmbededObjects())
-    {
-        return QWebView::page()->mainFrame()->toHtml().contains("application/x-shockwave-flash");
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-void UBAbstractWidget::resize(qreal width, qreal height)
-{
-    qreal w = qMax((qreal)mNominalSize.width(), width);
-    qreal h = qMax((qreal)mNominalSize.height(), height);
-    QWebView::page()->setViewportSize(QSize(w, h));
-    QWebView::setFixedSize(QSize(w, h));
-}
-
-
-QString UBAbstractWidget::iconFilePath(const QUrl& pUrl)
-{
-    // TODO UB 4.x read config.xml widget.icon param first
-
-    QStringList files;
-
-    files << "icon.svg";  // W3C widget default 1
-    files << "icon.ico";  // W3C widget default 2
-    files << "icon.png";  // W3C widget default 3
-    files << "icon.gif";  // W3C widget default 4
-
-    files << "Icon.png";  // Apple widget default
-
-    QString file = UBFileSystemUtils::getFirstExistingFileFromList(pUrl.toLocalFile(), files);
-
-    // default
-    if (file.length() == 0)
-    {
-        file = QString(":/images/defaultWidgetIcon.png");
-    }
-
-    return file;
-}
-
-
-
-QString UBAbstractWidget::widgetName(const QUrl& widgetPath)
-{
-    QString name;
-    QString version;
-
-    QFile w3CConfigFile(widgetPath.toLocalFile() + "/config.xml");
-    QFile appleConfigFile(widgetPath.toLocalFile() + "/Info.plist");
-
-    if (w3CConfigFile.exists() && w3CConfigFile.open(QFile::ReadOnly))
-    {
-        QDomDocument doc;
-        doc.setContent(w3CConfigFile.readAll());
-        QDomElement root = doc.firstChildElement("widget");
-        if (!root.isNull())
-        {
-            QDomElement nameElement = root.firstChildElement("name");
-            if (!nameElement.isNull())
-                name = nameElement.text();
-
-            version = root.attribute("version", "");
-        }
-
-        w3CConfigFile.close();
-    }
-    else if (appleConfigFile.exists() && appleConfigFile.open(QFile::ReadOnly))
-    {
-        QDomDocument doc;
-        doc.setContent(appleConfigFile.readAll());
-        QDomElement root = doc.firstChildElement("plist");
-        if (!root.isNull())
-        {
-            QDomElement dictElement = root.firstChildElement("dict");
-            if (!dictElement.isNull())
-            {
-                QDomNodeList childNodes  = dictElement.childNodes();
-
-                // looking for something like
-                //  ..
-                //  <key>CFBundleDisplayName</key>
-                //  <string>brain scans</string>
-                //  ..
-
-                for(int i = 0; i < childNodes.count() - 1; i++)
-                {
-                    if (childNodes.at(i).isElement())
-                    {
-                        QDomElement elKey = childNodes.at(i).toElement();
-                        if (elKey.text() == "CFBundleDisplayName")
-                        {
-                            if (childNodes.at(i + 1).isElement())
-                            {
-                               QDomElement elValue = childNodes.at(i + 1).toElement();
-                               name = elValue.text();
-                            }
-                        }
-                        else if (elKey.text() == "CFBundleShortVersionString")
-                        {
-                            if (childNodes.at(i + 1).isElement())
-                            {
-                               QDomElement elValue = childNodes.at(i + 1).toElement();
-                               version = elValue.text();
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        appleConfigFile.close();
-    }
-
-    QString result;
-
-    if (name.length() > 0)
-    {
-        result = name;
-        if (version.length() > 0)
-        {
-            result += " ";
-            result += version;
-        }
-    }
-
-    return result;
-}
-
-
-int UBAbstractWidget::widgetType(const QUrl& pUrl)
-{
-    QString mime = UBFileSystemUtils::mimeTypeFromFileName(pUrl.toString());
-
-    if (mime == "application/vnd.apple-widget")
-    {
-        return UBWidgetType::Apple;
-    }
-    else if (mime == "application/widget")
-    {
-        return UBWidgetType::W3C;
-    }
-    else
-    {
-        return UBWidgetType::Other;
-    }
-}
-
-
-void UBAbstractWidget::mousePressEvent(QMouseEvent *event)
-{
-    if(mIsFrozen)
-    {
-        event->accept();
-        return;
-    }
-    UBRoutedMouseEventWebView::mousePressEvent(event);
-    mMouseIsPressed = true;
-}
-
-
-void UBAbstractWidget::mouseMoveEvent(QMouseEvent *event)
-{
-
-    if(mIsFrozen)
-    {
-        event->accept();
-        return;
-    }
-
-    // TODO UB 4.x fix web kit mouse move routing
-
-    if (mFirstReleaseAfterMove)
-    {
-        mFirstReleaseAfterMove = false;
-    }
-    else
-    {
-        UBRoutedMouseEventWebView::mouseMoveEvent(event);
-    }
-}
-
-
-void UBAbstractWidget::mouseReleaseEvent(QMouseEvent *event)
-{
-    if(mIsFrozen)
-    {
-        event->accept();
-        return;
-    }
-
-    UBRoutedMouseEventWebView::mouseReleaseEvent(event);
-    mMouseIsPressed = false;
-    mFirstReleaseAfterMove = true;
-}
-
-QWebView * UBAbstractWidget::createWindow(QWebPage::WebWindowType type)
-{
-    if (type == QWebPage::WebBrowserWindow)
-    {
-        UBApplication::applicationController->showInternet();
-        return UBApplication::webController->createNewTab();
-    }
-    else
-    {
-        return this;
-    }
-}
-
-
-void UBAbstractWidget::injectInlineJavaScript()
-{
-    if (!sInlineJavaScriptLoaded)
-    {
-        sInlineJavaScripts = UBApplication::applicationController->widgetInlineJavaScripts();
-        sInlineJavaScriptLoaded = true;
-    }
-
-    foreach(QString script, sInlineJavaScripts)
-    {
-        QWebView::page()->mainFrame()->evaluateJavaScript(script);
-    }
-}
-
-
-void UBAbstractWidget::javaScriptWindowObjectCleared()
-{
-    injectInlineJavaScript();
-}
-
-
-void UBAbstractWidget::paintEvent(QPaintEvent * event)
-{
-    if (mIsFrozen)
-    {
-        QPainter p(this);
-        p.drawPixmap(0, 0, mSnapshot);
-    }
-    else
-    {
-        QWebView::paintEvent(event);
-    }
-    if (!mInitialLoadDone || mLoadIsErronous)
-    {
-         QPainter p(this);
-         QString message = tr("Loading ...");
-
-         // this is the right way of doing but we receive two callback and the one return always that the
-         // load as failed... to check
-         if (mInitialLoadDone && mLoadIsErronous)
-             message = tr("Cannot load content");
-         else
-             message = tr("Loading ...");
-
-         p.setFont(QFont("Arial", 12));
-
-         QFontMetrics fm = p.fontMetrics();
-         QRect txtBoundingRect = fm.boundingRect(message);
-
-         txtBoundingRect.moveCenter(rect().center());
-         txtBoundingRect.adjust(-10, -5, 10, 5);
-
-         p.setPen(Qt::NoPen);
-         p.setBrush(UBSettings::paletteColor);
-         p.drawRoundedRect(txtBoundingRect, 3, 3);
-
-         p.setPen(Qt::white);
-         p.drawText(rect(), Qt::AlignCenter, message);
-    }
-}
-void UBAbstractWidget::dropEvent(QDropEvent *event)
-{
-    QWebView::dropEvent(event);
-}
-
-QPixmap UBAbstractWidget::takeSnapshot()
-{
-    mIsTakingSnapshot = true;
-
-    QPixmap pix(size());
-    pix.fill(Qt::transparent);
-
-    render(&pix);
-
-    mIsTakingSnapshot = false;
-
-    return pix;
-}
-
-
-void UBAbstractWidget::setSnapshot(const QPixmap& pix)
-{
-    mSnapshot = pix;
-}
-
-
-void UBAbstractWidget::freeze()
-{
-    QPixmap pix = takeSnapshot();
-    mIsFrozen = true;
-    setSnapshot(pix);
-    update();
-}
-
-
-void UBAbstractWidget::unFreeze()
-{
-    mIsFrozen = false;
-    update();
-}
-
diff --git a/src/domain/UBAbstractWidget.h b/src/domain/UBAbstractWidget.h
deleted file mode 100644
index 304e00d4..00000000
--- a/src/domain/UBAbstractWidget.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef UBABSTRACTWIDGET_H_
-#define UBABSTRACTWIDGET_H_
-
-#include <QtGui>
-#include <QtWebKit>
-
-#include "web/UBRoutedMouseEventWebView.h"
-
-
-struct UBWidgetType
-{
-    enum Enum
-    {
-        W3C = 0, Apple, Other
-    };
-};
-
-
-class UBAbstractWidget : public UBRoutedMouseEventWebView
-{
-    Q_OBJECT;
-
-    public:
-        UBAbstractWidget(const QUrl& pWidgetUrl, QWidget *parent = 0);
-        virtual ~UBAbstractWidget();
-
-        void loadMainHtml();
-
-        QUrl mainHtml()
-        {
-            return mMainHtmlUrl;
-        }
-
-        QUrl widgetUrl()
-        {
-            return mWidgetUrl;
-        }
-
-        QString mainHtmlFileName()
-        {
-            return mMainHtmlFileName;
-        }
-
-        bool hasEmbededObjects();
-        bool hasEmbededFlash();
-
-        void resize(qreal width, qreal height);
-
-        QSize nominalSize() const
-        {
-            return mNominalSize;
-        }
-
-        bool canBeContent();
-        bool canBeTool();
-
-        bool hasLoadedSuccessfully() const
-        {
-            return (mInitialLoadDone && !mLoadIsErronous);
-        }
-
-        bool freezable() { return mIsFreezable;}
-        bool resizable() { return mIsResizable;}
-
-        static QString iconFilePath(const QUrl& pUrl);
-        static QString widgetName(const QUrl& pUrl);
-        static int widgetType(const QUrl& pUrl);
-
-        bool isFrozen(){ return mIsFrozen;}
-
-        QPixmap snapshot(){return mSnapshot;}
-        void setSnapshot(const QPixmap& pix);
-
-        QPixmap takeSnapshot();
-
-    public slots:
-        void freeze();
-        void unFreeze();
-
-    signals:
-
-        void geometryChangeRequested(const QRect & geom);
-
-    protected:
-
-        bool mMouseIsPressed;
-        bool mFirstReleaseAfterMove;
-
-        virtual bool event(QEvent *e);
-
-        virtual void mousePressEvent(QMouseEvent *event);
-        virtual void mouseMoveEvent(QMouseEvent *event);
-        virtual void mouseReleaseEvent(QMouseEvent *event);
-
-        virtual QWebView * createWindow(QWebPage::WebWindowType type);
-
-        QUrl mMainHtmlUrl;
-        QString mMainHtmlFileName;
-        QUrl mWidgetUrl;
-        QSize mNominalSize;
-        bool mIsResizable;
-        bool mInitialLoadDone;
-        bool mLoadIsErronous;
-
-        bool mIsFreezable;
-        int mCanBeContent;
-        int mCanBeTool;
-        enum OSType
-        {
-            type_NONE = 0, // 0000
-            type_WIN  = 1, // 0001
-            type_MAC  = 2, // 0010
-            type_UNIX = 4, // 0100
-            type_ALL  = 7, // 0111
-        };
-
-        virtual void injectInlineJavaScript();
-        virtual void paintEvent(QPaintEvent * event);
-        virtual void dropEvent(QDropEvent *);
-
-    protected slots:
-
-        void mainFrameLoadFinished(bool ok);
-
-    private:
-
-        static QStringList sInlineJavaScripts;
-        static bool sInlineJavaScriptLoaded;
-
-        bool mIsFrozen;
-        QPixmap mSnapshot;
-
-        bool mIsTakingSnapshot;
-
-    private slots:
-        void javaScriptWindowObjectCleared();
-
-};
-
-#endif /* UBABSTRACTWIDGET_H_ */
diff --git a/src/domain/UBAppleWidget.cpp b/src/domain/UBAppleWidget.cpp
deleted file mode 100644
index 832240d8..00000000
--- a/src/domain/UBAppleWidget.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "UBAppleWidget.h"
-
-#include <QtNetwork>
-
-#include "web/UBWebKitUtils.h"
-
-#include "network/UBNetworkAccessManager.h"
-
-#include "core/memcheck.h"
-
-UBAppleWidget::UBAppleWidget(const QUrl& pWidgetUrl, QWidget *parent)
-    : UBAbstractWidget(pWidgetUrl, parent)
-{
-    QString path = pWidgetUrl.toLocalFile();
-
-    if (!path.endsWith(".wdgt") && !path.endsWith(".wdgt/"))
-    {
-        int lastSlashIndex = path.lastIndexOf("/");
-        if (lastSlashIndex > 0)
-        {
-            path = path.mid(0, lastSlashIndex + 1);
-        }
-    }
-
-    QFile plistFile(path + "/Info.plist");
-    plistFile.open(QFile::ReadOnly);
-
-    QByteArray plistBin = plistFile.readAll();
-    QString plist = QString::fromUtf8(plistBin);
-
-    int mainHtmlIndex = plist.indexOf("MainHTML");
-    int mainHtmlIndexStart = plist.indexOf("<string>", mainHtmlIndex);
-    int mainHtmlIndexEnd = plist.indexOf("</string>", mainHtmlIndexStart);
-
-    if (mainHtmlIndex > -1 && mainHtmlIndexStart > -1 && mainHtmlIndexEnd > -1)
-    {
-        mMainHtmlFileName = plist.mid(mainHtmlIndexStart + 8, mainHtmlIndexEnd - mainHtmlIndexStart - 8);
-    }
-
-    mMainHtmlUrl = pWidgetUrl;
-    mMainHtmlUrl.setPath(pWidgetUrl.path() + "/" + mMainHtmlFileName);
-
-    QWebView::load(mMainHtmlUrl);
-
-    QPixmap defaultPixmap(pWidgetUrl.toLocalFile() + "/Default.png");
-
-    setFixedSize(defaultPixmap.size());
-
-    mNominalSize = defaultPixmap.size();
-}
-
-UBAppleWidget::~UBAppleWidget()
-{
-    // NOOP
-}
-
-
-
-
-
-
-
diff --git a/src/domain/UBAppleWidget.h b/src/domain/UBAppleWidget.h
deleted file mode 100644
index 91dbebb4..00000000
--- a/src/domain/UBAppleWidget.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef UBAPPLEWIDGET_H_
-#define UBAPPLEWIDGET_H_
-
-#include <QtGui>
-#include <QtWebKit>
-
-#include "UBAbstractWidget.h"
-
-class UBItem;
-
-class UBAppleWidget : public UBAbstractWidget
-{
-    Q_OBJECT;
-
-    public:
-        UBAppleWidget(const QUrl& pWidgetUrl, QWidget *parent = 0);
-        virtual ~UBAppleWidget();
-
-};
-
-#endif /* UBAPPLEWIDGET_H_ */
diff --git a/src/domain/UBGraphicsItemDelegate.cpp b/src/domain/UBGraphicsItemDelegate.cpp
index dc59bb35..4556cb0c 100644
--- a/src/domain/UBGraphicsItemDelegate.cpp
+++ b/src/domain/UBGraphicsItemDelegate.cpp
@@ -37,7 +37,6 @@
 
 #include "UBGraphicsWidgetItem.h"
 
-#include "domain/UBAbstractWidget.h"
 #include "domain/UBGraphicsTextItem.h"
 #include "domain/UBGraphicsMediaItem.h"
 #include "domain/UBGraphicsGroupContainerItem.h"
@@ -107,12 +106,12 @@ UBGraphicsItemDelegate::UBGraphicsItemDelegate(QGraphicsItem* pDelegated, QObjec
     , mFrame(0)
     , mFrameWidth(UBSettings::settings()->objectFrameWidth)
     , mAntiScaleRatio(1.0)
+    , mToolBarItem(NULL)
     , mCanRotate(canRotate)
     , mCanDuplicate(true)
     , mRespectRatio(respectRatio)
     , mMimeData(NULL)
     , mFlippable(false)
-    , mToolBarItem(NULL)
     , mToolBarUsed(useToolBar)
 {
     // NOOP
@@ -379,7 +378,14 @@ void UBGraphicsItemDelegate::setZOrderButtonsVisible(bool visible)
 
 void UBGraphicsItemDelegate::remove(bool canUndo)
 {
-//    QGraphicsScene* scene = mDelegated->scene();
+    /*UBGraphicsScene* scene = dynamic_cast<UBGraphicsScene*>(mDelegated->scene());
+    if (scene && canUndo)
+    {
+        UBGraphicsItemUndoCommand *uc = new UBGraphicsItemUndoCommand(scene, mDelegated, 0);
+        UBApplication::undoStack->push(uc);
+    }
+    mDelegated->hide();  */
+
     UBGraphicsScene* scene = dynamic_cast<UBGraphicsScene*>(mDelegated->scene());
     if (scene)
     {
@@ -387,11 +393,17 @@ void UBGraphicsItemDelegate::remove(bool canUndo)
             scene->removeItem(button);
 
         scene->removeItem(mFrame);
+
+        /* this is performed because when removing delegated from scene while it contains flash content, segfault happens because of QGraphicsScene::removeItem() */ 
+        UBGraphicsWebView *mDelegated_casted = dynamic_cast<UBGraphicsWebView*>(mDelegated);
+        if (mDelegated_casted)
+            mDelegated_casted->setHtml(QString());
+
         scene->removeItem(mDelegated);
 
         if (canUndo)
         {
-            UBGraphicsItemUndoCommand *uc = new UBGraphicsItemUndoCommand((UBGraphicsScene*) scene, mDelegated, 0);
+            UBGraphicsItemUndoCommand *uc = new UBGraphicsItemUndoCommand(scene, mDelegated, 0);
             UBApplication::undoStack->push(uc);
         }
     }
@@ -406,6 +418,10 @@ bool UBGraphicsItemDelegate::isLocked()
 
 void UBGraphicsItemDelegate::duplicate()
 {
+    // TODO UB 4.x .. rewrite .. .this is absurde ... we know what we are duplicating
+
+    UBApplication::boardController->copy();
+    UBApplication::boardController->paste();
     UBApplication::boardController->duplicateItem(dynamic_cast<UBItem*>(delegated()));
 }
 
@@ -724,7 +740,11 @@ void UBGraphicsToolBarItem::paint(QPainter *painter, const QStyleOptionGraphicsI
 }
 
 MediaTimer::MediaTimer(QGraphicsItem * parent): QGraphicsRectItem(parent) 
-{}
+{
+    val        = 0;
+    smallPoint = false;
+    setNumDigits(4);
+}
 
 MediaTimer::~MediaTimer()
 {}
@@ -807,9 +827,7 @@ void MediaTimer::drawDigit(const QPoint &pos, QPainter &p, int segLen,
      }
 }
 
-char* MediaTimer::getSegments(char ch)               // gets list of segments for ch
-{
-     char segments[30][8] =
+char MediaTimer::segments [][8] = 
         { 
               { 0, 1, 2, 4, 5, 6,99, 0},             // 0    0
               { 2, 5,99, 0, 0, 0, 0, 0},             // 1    1
@@ -824,16 +842,17 @@ char* MediaTimer::getSegments(char ch)               // gets list of segments fo
               { 8, 9,99, 0, 0, 0, 0, 0},             // 10   :
               {99, 0, 0, 0, 0, 0, 0, 0}              // 11   empty
         };
- 
-     int n;
+
+const char* MediaTimer::getSegments(char ch)               // gets list of segments for ch
+{
      if (ch >= '0' && ch <= '9')
         return segments[ch - '0'];
      if (ch == ':')
-        n = 10;
+        return segments[10];
      if (ch == ' ')
-        n = 11;
+        return segments[11];
      
-     return segments[n];
+     return NULL;
 }
 
 void MediaTimer::drawSegment(const QPoint &pos, char segmentNo, QPainter &p,
@@ -1055,13 +1074,6 @@ void MediaTimer::internalSetString(const QString& s)
     update();
 }
 
-void MediaTimer::init()
-{
-    val        = 0;
-    smallPoint = false;
-    setNumDigits(4);
-}
-
 void MediaTimer::display(const QString &s)
 {
     val = 0;
@@ -1075,11 +1087,11 @@ void MediaTimer::display(const QString &s)
 void MediaTimer::setNumDigits(int numDigits)
 {
     if (numDigits > 99) {
-        qWarning("QLCDNumber::setNumDigits: (%s) Max 99 digits allowed");
+        qWarning("QLCDNumber::setNumDigits: Max 99 digits allowed");
         numDigits = 99;
     }
     if (numDigits < 0) {
-        qWarning("QLCDNumber::setNumDigits: (%s) Min 0 digits allowed");
+        qWarning("QLCDNumber::setNumDigits: Min 0 digits allowed");
         numDigits = 0;
     }
     if (digitStr.isNull()) {                  // from constructor
@@ -1128,9 +1140,7 @@ DelegateMediaControl::DelegateMediaControl(UBGraphicsMediaItem* pDelegated, QGra
     setPen(Qt::NoPen);
     setData(UBGraphicsItemData::ItemLayerType, QVariant(UBItemLayerType::Control));
 
-    lcdTimer = 0;
-    //lcdTimer = new MediaTimer(this);
-    //lcdTimer->init();
+    lcdTimer = new MediaTimer(this);
 
     update();
 }
@@ -1181,6 +1191,8 @@ void DelegateMediaControl::positionHandles()
 {
     mLCDTimerArea.setWidth(parentItem()->boundingRect().height());
     mLCDTimerArea.setHeight(parentItem()->boundingRect().height());
+    lcdTimer->setRect(mLCDTimerArea);
+    lcdTimer->setPos(mSeecArea.width()-mLCDTimerArea.width(),0);
     //lcdTimer->setRect(mLCDTimerArea);
     //lcdTimer->setPos(mSeecArea.width()-mLCDTimerArea.width(),0);
 
@@ -1190,6 +1202,7 @@ void DelegateMediaControl::positionHandles()
     selfRect.setHeight(parentItem()->boundingRect().height());
     setRect(selfRect);
 
+    lcdTimer->setPos(rect().width() - mLCDTimerArea.width(), 0); 
     //lcdTimer->setPos(rect().width() - mLCDTimerArea.width(), 0); 
 
 }
@@ -1198,6 +1211,7 @@ void DelegateMediaControl::update()
 {
     QTime t;
     t = t.addMSecs(mCurrentTimeInMs < 0 ? 0 : mCurrentTimeInMs);
+    lcdTimer->display(t.toString("m:ss"));
     //lcdTimer->display(t.toString("m:ss"));
 
     QGraphicsRectItem::update();
@@ -1250,6 +1264,7 @@ void DelegateMediaControl::seekToMousePos(QPointF mousePos)
     qreal frameWidth = rect().height() / 2;
 
     minX = frameWidth;
+    length = mSeecArea.width() - lcdTimer->rect().width();
     length = mSeecArea.width() /*- lcdTimer->rect().width()*/;
 
     qreal mouseX = mousePos.x();
diff --git a/src/domain/UBGraphicsItemDelegate.h b/src/domain/UBGraphicsItemDelegate.h
index 68c9e35e..f135f66b 100644
--- a/src/domain/UBGraphicsItemDelegate.h
+++ b/src/domain/UBGraphicsItemDelegate.h
@@ -71,33 +71,40 @@ class DelegateButton: public QGraphicsSvgItem
 
 };
 
+/*
+    Code of this class is copied from QT QLCDNumber class sources
+    See src\gui\widgets\qlcdnumber.cpp for original code
+*/
 class MediaTimer: public QGraphicsRectItem
 {
 public:
     MediaTimer(QGraphicsItem * parent = 0);
     ~MediaTimer();
 
-    char* getSegments(char);
-    void addPoint(QPolygon&, const QPoint&);
-    void init();
-    void internalSetString(const QString& s);
-    void drawString(const QString& s, QPainter &, QBitArray * = 0, bool = true);
-    void drawDigit(const QPoint &, QPainter &, int, char, char = ' ');
-    void drawSegment(const QPoint &, char, QPainter &, int, bool = false);
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
                 QWidget *widget);
+
     void display(const QString &str);
-    void setNumDigits(int nDigits);
 
 private:
+
+    static const char* getSegments(char);
+    void drawString(const QString& s, QPainter &, QBitArray * = 0, bool = true);
+    void drawDigit(const QPoint &, QPainter &, int, char, char = ' ');
+    void drawSegment(const QPoint &, char, QPainter &, int, bool = false);
+    void addPoint(QPolygon&, const QPoint&);
+    void internalSetString(const QString& s);
+    void setNumDigits(int nDigits);
+
+    static char segments [][8];
+
     int ndigits;
     QString digitStr;
     QBitArray points;
     double val;
 
-uint shadow : 1;
-uint smallPoint : 1;
-
+    uint shadow : 1;
+    uint smallPoint : 1;
 };
 
 class DelegateMediaControl: public QObject, public QGraphicsRectItem
diff --git a/src/domain/UBGraphicsScene.cpp b/src/domain/UBGraphicsScene.cpp
index 1c45145f..9ee4fb67 100644
--- a/src/domain/UBGraphicsScene.cpp
+++ b/src/domain/UBGraphicsScene.cpp
@@ -31,6 +31,7 @@
 
 #include "gui/UBMagnifer.h"
 #include "gui/UBMainWindow.h"
+#include "gui/UBToolWidget.h"
 
 #include "tools/UBGraphicsRuler.h"
 #include "tools/UBGraphicsProtractor.h"
@@ -59,8 +60,6 @@
 
 #include "domain/UBGraphicsGroupContainerItem.h"
 
-#include "UBAppleWidget.h"
-#include "UBW3CWidget.h"
 #include "UBGraphicsStroke.h"
 
 #include "core/memcheck.h"
@@ -256,8 +255,8 @@ UBGraphicsScene::UBGraphicsScene(UBDocumentProxy* parent)
     , mDocument(parent)
     , mDarkBackground(false)
     , mCrossedBackground(false)
-    , mZoomFactor(1)
     , mIsDesktopMode(false)
+    , mZoomFactor(1)
     , mIsModified(true)
     , mBackgroundObject(0)
     , mPreviousWidth(0)
@@ -1396,7 +1395,7 @@ UBGraphicsMediaItem* UBGraphicsScene::addAudio(const QUrl& pAudioFileUrl, bool s
 
 UBGraphicsWidgetItem* UBGraphicsScene::addWidget(const QUrl& pWidgetUrl, const QPointF& pPos)
 {
-    int widgetType = UBAbstractWidget::widgetType(pWidgetUrl);
+    int widgetType = UBGraphicsWidgetItem::widgetType(pWidgetUrl);
 
     if(widgetType == UBWidgetType::Apple)
     {
@@ -1422,9 +1421,9 @@ UBGraphicsAppleWidgetItem* UBGraphicsScene::addAppleWidget(const QUrl& pWidgetUr
     return appleWidget;
 }
 
-UBGraphicsW3CWidgetItem* UBGraphicsScene::addW3CWidget(const QUrl& pWidgetUrl, const QPointF& pPos, int widgetType)
+UBGraphicsW3CWidgetItem* UBGraphicsScene::addW3CWidget(const QUrl& pWidgetUrl, const QPointF& pPos)
 {
-    UBGraphicsW3CWidgetItem *w3CWidget = new UBGraphicsW3CWidgetItem(pWidgetUrl, 0, widgetType);
+    UBGraphicsW3CWidgetItem *w3CWidget = new UBGraphicsW3CWidgetItem(pWidgetUrl, 0);
 
     addGraphicsWidget(w3CWidget, pPos);
 
@@ -1444,7 +1443,7 @@ void UBGraphicsScene::addGraphicsWidget(UBGraphicsWidgetItem* graphicsWidget, co
     graphicsWidget->setPos(QPointF(pPos.x() - graphicsWidget->boundingRect().width() / 2,
         pPos.y() - graphicsWidget->boundingRect().height() / 2));
 
-    if (graphicsWidget->widgetWebView()->canBeContent())
+    if (graphicsWidget->canBeContent())
     {
 //        graphicsWidget->widgetWebView()->loadMainHtml();
 
@@ -1464,6 +1463,8 @@ void UBGraphicsScene::addGraphicsWidget(UBGraphicsWidgetItem* graphicsWidget, co
     UBApplication::boardController->controlView()->setFocus();
 }
 
+
+
 UBGraphicsW3CWidgetItem* UBGraphicsScene::addOEmbed(const QUrl& pContentUrl, const QPointF& pPos)
 {
     QStringList widgetPaths = UBPersistenceManager::persistenceManager()->allWidgets(UBSettings::settings()->applicationApplicationsLibraryDirectory());
diff --git a/src/domain/UBGraphicsScene.h b/src/domain/UBGraphicsScene.h
index 7433cde9..a9a82f11 100644
--- a/src/domain/UBGraphicsScene.h
+++ b/src/domain/UBGraphicsScene.h
@@ -35,12 +35,12 @@ class UBGraphicsAudioItem;
 class UBGraphicsWidgetItem;
 class UBGraphicsW3CWidgetItem;
 class UBGraphicsAppleWidgetItem;
+class UBToolWidget;
 class UBGraphicsPDFItem;
 class UBGraphicsTextItem;
 class UBGraphicsRuler;
 class UBGraphicsProtractor;
 class UBGraphicsCompass;
-class UBAbstractWidget;
 class UBDocumentProxy;
 class UBGraphicsCurtainItem;
 class UBGraphicsStroke;
@@ -132,9 +132,11 @@ class UBGraphicsScene: public UBCoreGraphicsScene, public UBItem
 
         UBGraphicsWidgetItem* addWidget(const QUrl& pWidgetUrl, const QPointF& pPos = QPointF(0, 0));
         UBGraphicsAppleWidgetItem* addAppleWidget(const QUrl& pWidgetUrl, const QPointF& pPos = QPointF(0, 0));
-        UBGraphicsW3CWidgetItem* addW3CWidget(const QUrl& pWidgetUrl, const QPointF& pPos = QPointF(0, 0),int widgetType = UBGraphicsItemType::W3CWidgetItemType);
+        UBGraphicsW3CWidgetItem* addW3CWidget(const QUrl& pWidgetUrl, const QPointF& pPos = QPointF(0, 0));
         void addGraphicsWidget(UBGraphicsWidgetItem* graphicsWidget, const QPointF& pPos = QPointF(0, 0));
 
+        
+
         UBGraphicsMediaItem* addMedia(const QUrl& pMediaFileUrl, bool shouldPlayAsap, const QPointF& pPos = QPointF(0, 0));
         UBGraphicsMediaItem* addVideo(const QUrl& pVideoFileUrl, bool shouldPlayAsap, const QPointF& pPos = QPointF(0, 0));
         UBGraphicsMediaItem* addAudio(const QUrl& pAudioFileUrl, bool shouldPlayAsap, const QPointF& pPos = QPointF(0, 0));
diff --git a/src/domain/UBGraphicsWebView.cpp b/src/domain/UBGraphicsWebView.cpp
new file mode 100644
index 00000000..39c4f931
--- /dev/null
+++ b/src/domain/UBGraphicsWebView.cpp
@@ -0,0 +1,160 @@
+/*
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <QtGui>
+#include <QtWebKit>
+
+#include "UBGraphicsWebView.h"
+#include "UBGraphicsScene.h"
+#include "UBGraphicsItemDelegate.h"
+#include "UBGraphicsDelegateFrame.h"
+
+#include "core/memcheck.h"
+
+UBGraphicsWebView::UBGraphicsWebView(QGraphicsItem* parent)
+    : QGraphicsWebView(parent)
+{
+    setData(UBGraphicsItemData::ItemLayerType, UBItemLayerType::Object);
+
+    mDelegate = new UBGraphicsItemDelegate(this, 0, true, false, false);
+    mDelegate->init();
+
+    setFlag(QGraphicsItem::ItemSendsGeometryChanges, true);
+
+    QGraphicsWebView::setAcceptHoverEvents(true);
+}
+
+
+UBGraphicsWebView::~UBGraphicsWebView()
+{
+    if (mDelegate)
+        delete mDelegate;
+}
+
+
+QVariant UBGraphicsWebView::itemChange(GraphicsItemChange change, const QVariant &value)
+{
+    if ((change == QGraphicsItem::ItemSelectedHasChanged) &&  scene()) {
+        if (isSelected())
+            scene()->setActiveWindow(this);
+        else
+            if(scene()->activeWindow() == this)
+                scene()->setActiveWindow(0);
+    }
+
+    QVariant newValue = mDelegate->itemChange(change, value);
+    return QGraphicsWebView::itemChange(change, newValue);
+}
+
+void UBGraphicsWebView::setUuid(const QUuid &pUuid)
+{
+    UBItem::setUuid(pUuid);
+    setData(UBGraphicsItemData::ItemUuid, QVariant(pUuid)); //store item uuid inside the QGraphicsItem to fast operations with Items on the scene
+}
+
+void UBGraphicsWebView::mousePressEvent(QGraphicsSceneMouseEvent *event)
+{
+    if (!mDelegate->mousePressEvent(event))
+        setSelected(true); /* forcing selection */
+
+    QGraphicsWebView::mousePressEvent(event);
+}
+
+
+void UBGraphicsWebView::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
+{
+    if (!mDelegate->mouseMoveEvent(event))
+        QGraphicsWebView::mouseMoveEvent(event);
+}
+
+
+void UBGraphicsWebView::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
+{
+    mDelegate->mouseReleaseEvent(event);
+    QGraphicsWebView::mouseReleaseEvent(event);
+}
+
+void UBGraphicsWebView::wheelEvent(QGraphicsSceneWheelEvent *event)
+{
+    if (mDelegate->weelEvent(event))
+    {
+        QGraphicsWebView::wheelEvent(event);
+        event->accept();
+    }
+}
+
+void UBGraphicsWebView::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
+{
+    Q_UNUSED(event)
+    /* NOOP */
+}
+void UBGraphicsWebView::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
+{
+    Q_UNUSED(event)
+    /* NOOP */
+}
+
+void UBGraphicsWebView::setDelegate(UBGraphicsItemDelegate* pDelegate)
+{
+    if (mDelegate)
+        delete mDelegate;
+
+    mDelegate = pDelegate;
+}
+
+
+void UBGraphicsWebView::resize(qreal w, qreal h)
+{
+    UBGraphicsWebView::resize(QSizeF(w, h));
+}
+
+
+void UBGraphicsWebView::resize(const QSizeF & pSize)
+{
+    if (pSize != size()) {
+        QGraphicsWebView::setMaximumSize(pSize.width(), pSize.height());
+        QGraphicsWebView::resize(pSize.width(), pSize.height());
+        if (mDelegate)
+            mDelegate->positionHandles();
+        if (scene())
+            scene()->setModified(true);
+    }
+}
+
+QSizeF UBGraphicsWebView::size() const
+{
+    return QGraphicsWebView::size();
+}
+
+
+UBGraphicsScene* UBGraphicsWebView::scene()
+{
+    return static_cast<UBGraphicsScene*>(QGraphicsItem::scene());
+}
+
+
+void UBGraphicsWebView::remove()
+{
+    if (mDelegate)
+        mDelegate->remove(true);
+}
+
+bool UBGraphicsWebView::event(QEvent *event)
+{
+    if (event->type() == QEvent::ShortcutOverride)
+        event->accept();
+
+    return QGraphicsWebView::event(event);
+}
diff --git a/src/domain/UBGraphicsWebView.h b/src/domain/UBGraphicsWebView.h
new file mode 100644
index 00000000..988c4cbd
--- /dev/null
+++ b/src/domain/UBGraphicsWebView.h
@@ -0,0 +1,62 @@
+/*
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef UBGRAPHICSWEBVIEW_H_
+#define UBGRAPHICSWEBVIEW_H_
+
+#include <QtGui>
+#include <QtWebKit>
+
+#include "UBItem.h"
+#include "UBResizableGraphicsItem.h"
+
+class UBGraphicsItemDelegate;
+
+class UBGraphicsWebView: public QGraphicsWebView, public UBItem, public UBResizableGraphicsItem, public UBGraphicsItem
+{
+    public:
+        UBGraphicsWebView(QGraphicsItem* parent = 0);
+        virtual ~UBGraphicsWebView();
+
+        virtual void resize(qreal w, qreal h);
+        virtual void resize(const QSizeF & size);
+
+        virtual QSizeF size() const;
+
+        void setDelegate(UBGraphicsItemDelegate* pDelegate);
+
+        virtual UBGraphicsScene* scene();
+
+        virtual void remove();
+
+        virtual UBGraphicsItemDelegate* Delegate() const { return mDelegate;}
+
+        virtual void clearSource(){;}
+        virtual void setUuid(const QUuid &pUuid);
+
+    protected:
+
+        virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
+        virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
+        virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
+        virtual void wheelEvent(QGraphicsSceneWheelEvent *event);
+        virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
+        virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
+        virtual bool event(QEvent *event);
+        virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value);
+
+};
+
+#endif /* UBGRAPHICSWEBVIEW_H_ */
diff --git a/src/domain/UBGraphicsWidgetItem.cpp b/src/domain/UBGraphicsWidgetItem.cpp
index 8ef47b33..7c94b758 100644
--- a/src/domain/UBGraphicsWidgetItem.cpp
+++ b/src/domain/UBGraphicsWidgetItem.cpp
@@ -13,308 +13,646 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "UBGraphicsWidgetItem.h"
-
-#include "api/UBWidgetUniboardAPI.h"
-#include "api/UBW3CWidgetAPI.h"
+#include <QtNetwork>
+#include <QtXml>
 
+#include "UBGraphicsWidgetItem.h"
+#include "UBGraphicsScene.h"
 #include "UBGraphicsItemDelegate.h"
 #include "UBGraphicsWidgetItemDelegate.h"
 #include "UBGraphicsDelegateFrame.h"
 
-#include "UBW3CWidget.h"
-#include "UBGraphicsScene.h"
-#include "UBAppleWidget.h"
-#include "frameworks/UBFileSystemUtils.h"
+#include "api/UBWidgetUniboardAPI.h"
+#include "api/UBW3CWidgetAPI.h"
+
+ #include "board/UBBoardController.h"
 
 #include "core/memcheck.h"
+#include "core/UBApplicationController.h"
+#include "core/UBApplication.h"
+#include "core/UBSettings.h"
 
-UBGraphicsWidgetItem::UBGraphicsWidgetItem(QGraphicsItem *parent, int widgetType)
-    : UBGraphicsProxyWidget(parent)
-    , mWebKitWidget(0)
+#include "frameworks/UBFileSystemUtils.h"
+#include "frameworks/UBPlatformUtils.h"
+
+#include "network/UBNetworkAccessManager.h"
+
+#include "web/UBWebPage.h"
+#include "web/UBWebKitUtils.h"
+#include "web/UBWebController.h"
+
+bool UBGraphicsWidgetItem::sInlineJavaScriptLoaded = false;
+QStringList UBGraphicsWidgetItem::sInlineJavaScripts;
+
+UBGraphicsWidgetItem::UBGraphicsWidgetItem(const QUrl &pWidgetUrl, QGraphicsItem *parent)
+    : UBGraphicsWebView(parent)
+    , mInitialLoadDone(false)
+    , mIsFreezable(true)
+    , mIsResizable(false)    
+    , mLoadIsErronous(false)    
+    , mCanBeContent(0)
+    , mCanBeTool(0)
+    , mWidgetUrl(pWidgetUrl)
+    , mIsFrozen(false)
+    , mIsTakingSnapshot(false)
     , mShouldMoveWidget(false)
-    , mUniboardAPI(0)
+    , mUniboardAPI(0)    
 {
-    setAcceptDrops(false);
-    UBGraphicsWidgetItemDelegate* delegate = new UBGraphicsWidgetItemDelegate(this, widgetType);
-    delegate->init();
-    setDelegate(delegate);
     setData(UBGraphicsItemData::itemLayerType, QVariant(itemLayerType::ObjectItem)); //Necessary to set if we want z value to be assigned correctly
-}
 
+    QGraphicsWebView::setPage(new UBWebPage(this));
+    QGraphicsWebView::settings()->setAttribute(QWebSettings::JavaEnabled, true);
+    QGraphicsWebView::settings()->setAttribute(QWebSettings::PluginsEnabled, true);
+    QGraphicsWebView::settings()->setAttribute(QWebSettings::LocalStorageDatabaseEnabled, true);
+    QGraphicsWebView::settings()->setAttribute(QWebSettings::OfflineWebApplicationCacheEnabled, true);
+    QGraphicsWebView::settings()->setAttribute(QWebSettings::OfflineStorageDatabaseEnabled, true);
+    QGraphicsWebView::settings()->setAttribute(QWebSettings::JavascriptCanAccessClipboard, true);
+    QGraphicsWebView::settings()->setAttribute(QWebSettings::DnsPrefetchEnabled, true);
 
-UBGraphicsWidgetItem::~UBGraphicsWidgetItem()
-{
-    // NOOP
-}
+    page()->setNetworkAccessManager(UBNetworkAccessManager::defaultAccessManager());
 
+    setAcceptDrops(true);
+    setAutoFillBackground(false);
 
-void UBGraphicsWidgetItem::javaScriptWindowObjectCleared()
-{
-    if(!mUniboardAPI)
-            mUniboardAPI = new UBWidgetUniboardAPI(scene(), this);
+    QPalette pagePalette = page()->palette();
+    pagePalette.setBrush(QPalette::Base, QBrush(Qt::transparent));
+    pagePalette.setBrush(QPalette::Window, QBrush(Qt::transparent));
+    page()->setPalette(pagePalette);
 
-    mWebKitWidget->page()->mainFrame()->addToJavaScriptWindowObject("sankore", mUniboardAPI);
+    QPalette viewPalette = palette();
+    pagePalette.setBrush(QPalette::Base, QBrush(Qt::transparent));
+    viewPalette.setBrush(QPalette::Window, QBrush(Qt::transparent));
+    setPalette(viewPalette);
 
+    UBGraphicsWidgetItemDelegate* delegate = new UBGraphicsWidgetItemDelegate(this);
+    delegate->init();
+    setDelegate(delegate);
 }
 
-void UBGraphicsWidgetItem::setUuid(const QUuid &pUuid)
+
+UBGraphicsWidgetItem::~UBGraphicsWidgetItem()
 {
-    UBItem::setUuid(pUuid);
-    setData(UBGraphicsItemData::ItemUuid, QVariant(pUuid)); //store item uuid inside the QGraphicsItem to fast operations with Items on the scene
+    /* NOOP */
 }
 
-void UBGraphicsWidgetItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
+void UBGraphicsWidgetItem::initialize()
 {
-    UBGraphicsProxyWidget::mousePressEvent(event);
+    installEventFilter(this);
+    UBGraphicsWebView::setMinimumSize(nominalSize());
+    setData(UBGraphicsItemData::itemLayerType, QVariant(itemLayerType::ObjectItem)); // Necessary to set if we want z value to be assigned correctly
 
-    // did webkit consume the mouse press ?
-    mShouldMoveWidget = !event->isAccepted() && (event->buttons() & Qt::LeftButton);
+    if (mDelegate && mDelegate->frame() && resizable())
+        mDelegate->frame()->setOperationMode(UBGraphicsDelegateFrame::Resizing);
 
-    mLastMousePos = mapToScene(event->pos());
+    QPalette palette = page()->palette();
+    palette.setBrush(QPalette::Base, QBrush(Qt::transparent));
+    page()->setPalette(palette);    
 
-    event->accept();
+    connect(page()->mainFrame(), SIGNAL(javaScriptWindowObjectCleared()), this, SLOT(javaScriptWindowObjectCleared()));
+    connect(page(), SIGNAL(geometryChangeRequested(const QRect&)), this, SLOT(geometryChangeRequested(const QRect&)));
+    connect(this, SIGNAL(loadFinished(bool)), this, SLOT(mainFrameLoadFinished (bool)));
 }
 
-
-void UBGraphicsWidgetItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
+QUrl UBGraphicsWidgetItem::mainHtml()
 {
-    mShouldMoveWidget = false;
-
-    UBGraphicsProxyWidget::mouseReleaseEvent(event);
+    return mMainHtmlUrl;
 }
 
-void UBGraphicsWidgetItem::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
+void UBGraphicsWidgetItem::loadMainHtml()
 {
-    sendJSEnterEvent();
-    mDelegate->hoverEnterEvent(event);
-    UBGraphicsProxyWidget::hoverEnterEvent(event);
+    mInitialLoadDone = false;
+    load(mMainHtmlUrl);
 }
-void UBGraphicsWidgetItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
+
+QUrl UBGraphicsWidgetItem::widgetUrl()
 {
-    sendJSLeaveEvent();
-    mDelegate->hoverLeaveEvent(event);
-    UBGraphicsProxyWidget::hoverLeaveEvent(event);
+    return mWidgetUrl;
 }
-void UBGraphicsWidgetItem::hoverMoveEvent(QGraphicsSceneHoverEvent *event)
+QString UBGraphicsWidgetItem::mainHtmlFileName()
 {
-    UBGraphicsProxyWidget::hoverMoveEvent(event);
+    return mMainHtmlFileName;
 }
 
-
-bool UBGraphicsWidgetItem::eventFilter(QObject *obj, QEvent *event)
+bool UBGraphicsWidgetItem::hasEmbededObjects()
 {
-    if (mShouldMoveWidget && obj == mWebKitWidget && event->type() == QEvent::MouseMove)
-    {
-        QMouseEvent *mouseMoveEvent = static_cast<QMouseEvent*>(event);
+    if (page()->mainFrame()) {
+        QList<UBWebKitUtils::HtmlObject> htmlObjects = UBWebKitUtils::objectsInFrame(page()->mainFrame());
+        return htmlObjects.length() > 0;
+    }
 
-        if (mouseMoveEvent->buttons() & Qt::LeftButton)
-        {
-            QPointF scenePos = mapToScene(mouseMoveEvent->pos());
+    return false;
+}
 
-            QPointF newPos = pos() + scenePos - mLastMousePos;
+bool UBGraphicsWidgetItem::hasEmbededFlash()
+{
+    if (hasEmbededObjects())
+        return page()->mainFrame()->toHtml().contains("application/x-shockwave-flash");
+    else
+        return false;
+}
 
-            setPos(newPos);
+bool UBGraphicsWidgetItem::canBeContent()
+{
+    // if we under MAC OS
+    #if defined(Q_OS_MAC)
+        return mCanBeContent & UBGraphicsWidgetItem::type_MAC;
+    #endif
+
+    // if we under UNIX OS
+    #if defined(Q_OS_UNIX)
+        return mCanBeContent & UBGraphicsWidgetItem::type_UNIX;
+    #endif
+
+    // if we under WINDOWS OS
+    #if defined(Q_OS_WIN)
+        return mCanBeContent & UBGraphicsWidgetItem::type_WIN;
+    #endif
+}
 
-            mLastMousePos = scenePos;
+bool UBGraphicsWidgetItem::canBeTool()
+{
+    // if we under MAC OS
+    #if defined(Q_OS_MAC)
+        return mCanBeTool & UBGraphicsWidgetItem::type_MAC;
+    #endif
+
+        // if we under UNIX OS
+    #if defined(Q_OS_UNIX)
+        return mCanBeTool & UBGraphicsWidgetItem::type_UNIX;
+    #endif
+
+        // if we under WINDOWS OS
+    #if defined(Q_OS_WIN)
+        return mCanBeTool & UBGraphicsWidgetItem::type_WIN;
+    #endif
+}
 
-            event->accept();
+QString UBGraphicsWidgetItem::preference(const QString& key) const
+{
+    return mPreferences.value(key);
+}
 
-            return true;
-        }
-    }
+void UBGraphicsWidgetItem::setPreference(const QString& key, QString value)
+{
+    if (key == "" || (mPreferences.contains(key) && mPreferences.value(key) == value))
+        return;
 
-    //standard event processing
-    return QObject::eventFilter(obj, event);
+    mPreferences.insert(key, value);
+    if (scene())
+        scene()->setModified(true);
 }
 
-
-void UBGraphicsWidgetItem::resize ( qreal w, qreal h )
+QMap<QString, QString> UBGraphicsWidgetItem::preferences() const
 {
-    UBGraphicsProxyWidget::resize(w, h);
-
-    mWebKitWidget->resize(w, h);
+    return mPreferences;
 }
 
 
-void UBGraphicsWidgetItem::resize ( const QSizeF & size )
+void UBGraphicsWidgetItem::removePreference(const QString& key)
 {
-    resize(size.width(), size.height());
+    mPreferences.remove(key);
 }
 
 
-void UBGraphicsWidgetItem::geometryChangeRequested(const QRect& geom)
+void UBGraphicsWidgetItem::removeAllPreferences()
 {
-    resize(geom.width(), geom.height());
+    mPreferences.clear();
 }
 
-
-void UBGraphicsWidgetItem::initialize()
+QString UBGraphicsWidgetItem::datastoreEntry(const QString& key) const
 {
-    connect(mWebKitWidget->page()->mainFrame(), SIGNAL(javaScriptWindowObjectCleared()), this, SLOT(javaScriptWindowObjectCleared()));
+    if (mDatastore.contains(key))
+        return mDatastore.value(key);
+    else
+        return QString();
+}
 
-    QPalette palette = mWebKitWidget->page()->palette();
-    palette.setBrush(QPalette::Base, QBrush(Qt::transparent));
-    mWebKitWidget->page()->setPalette(palette);
+void UBGraphicsWidgetItem::setDatastoreEntry(const QString& key, QString value)
+{
+    if (key == "" || (mDatastore.contains(key) && mDatastore.value(key) == value))
+        return;
 
-    UBGraphicsProxyWidget::setWidget(mWebKitWidget);
+    mDatastore.insert(key, value);
+    if (scene())
+        scene()->setModified(true);
+}
 
-    mWebKitWidget->installEventFilter(this);
+QMap<QString, QString> UBGraphicsWidgetItem::datastoreEntries() const
+{
+    return mDatastore;
+}
 
-    UBGraphicsProxyWidget::setMinimumSize(mWebKitWidget->nominalSize());
 
-    connect(mWebKitWidget, SIGNAL(geometryChangeRequested(const QRect&)), this, SLOT(geometryChangeRequested(const QRect&)));
+void UBGraphicsWidgetItem::removeDatastoreEntry(const QString& key)
+{
+    mDatastore.remove(key);
+}
 
-    if (mDelegate && mDelegate->frame() && mWebKitWidget->resizable())
-        mDelegate->frame()->setOperationMode(UBGraphicsDelegateFrame::Resizing);
 
-    setData(UBGraphicsItemData::itemLayerType, QVariant(itemLayerType::ObjectItem)); //Necessary to set if we want z value to be assigned correctly
+void UBGraphicsWidgetItem::removeAllDatastoreEntries()
+{
+    mDatastore.clear();
 }
 
+UBGraphicsItemDelegate* UBGraphicsWidgetItem::Delegate() const 
+{
+    return mDelegate;
+}
 
-UBGraphicsScene* UBGraphicsWidgetItem::scene()
+void UBGraphicsWidgetItem::remove()
 {
-    return qobject_cast<UBGraphicsScene*>(QGraphicsItem::scene());
+    if (mDelegate)
+        mDelegate->remove();
 }
 
+void UBGraphicsWidgetItem::removeScript()
+{
+    if (page() && page()->mainFrame())
+        page()->mainFrame()->evaluateJavaScript("if(widget && widget.onremove) { widget.onremove();}");
+}
 
-UBAbstractWidget* UBGraphicsWidgetItem::widgetWebView()
+void UBGraphicsWidgetItem::processDropEvent(QDropEvent *event)
+{
+    return mUniboardAPI->ProcessDropEvent(event);
+}
+bool UBGraphicsWidgetItem::isDropableData(const QMimeData *data) const
 {
-    return mWebKitWidget;
+    return mUniboardAPI->isDropableData(data);
 }
 
+QUrl UBGraphicsWidgetItem::getOwnFolder() const {
+    return ownFolder;
+}
 
-void UBGraphicsWidgetItem::setPreference(const QString& key, QString value)
+void UBGraphicsWidgetItem::setOwnFolder(const QUrl &newFolder)
 {
-    if (key == "" || (mPreferences.contains(key) && mPreferences.value(key) == value))
-        return;
-
-    mPreferences.insert(key, value);
-    if (scene())
-        scene()->setModified(true);
+    ownFolder = newFolder;
 }
 
+void UBGraphicsWidgetItem::setSnapshotPath(const QUrl &newFilePath)
+{
+    SnapshotFile = newFilePath;
+}
 
-QString UBGraphicsWidgetItem::preference(const QString& key) const
+QUrl UBGraphicsWidgetItem::getSnapshotPath()
 {
-    return mPreferences.value(key);
+    return SnapshotFile;
 }
 
+void UBGraphicsWidgetItem::clearSource()
+{
+    UBFileSystemUtils::deleteDir(getOwnFolder().toLocalFile());
+    UBFileSystemUtils::deleteFile(getSnapshotPath().toLocalFile());
+}
 
-QMap<QString, QString> UBGraphicsWidgetItem::preferences() const
+void UBGraphicsWidgetItem::setUuid(const QUuid &pUuid)
 {
-    return mPreferences;
+    UBItem::setUuid(pUuid);
+    setData(UBGraphicsItemData::ItemUuid, QVariant(pUuid)); //store item uuid inside the QGraphicsItem to fast operations with Items on the scene
 }
 
+QSize UBGraphicsWidgetItem::nominalSize() const
+{
+    return mNominalSize;
+}
 
-void UBGraphicsWidgetItem::removePreference(const QString& key)
+bool UBGraphicsWidgetItem::hasLoadedSuccessfully() const
 {
-    mPreferences.remove(key);
+    return (mInitialLoadDone && !mLoadIsErronous);
 }
 
+bool UBGraphicsWidgetItem::freezable() 
+{ 
+    return mIsFreezable;
+}
 
-void UBGraphicsWidgetItem::removeAllPreferences()
-{
-    mPreferences.clear();
+bool UBGraphicsWidgetItem::resizable()
+{ 
+    return mIsResizable;
+}        
+
+bool UBGraphicsWidgetItem::isFrozen()
+{ 
+    return mIsFrozen;
 }
 
+QPixmap UBGraphicsWidgetItem::snapshot()
+{
+    return mSnapshot;
+}
 
-void UBGraphicsWidgetItem::setDatastoreEntry(const QString& key, QString value)
+QPixmap UBGraphicsWidgetItem::takeSnapshot()
 {
-    if (key == "" || (mDatastore.contains(key) && mDatastore.value(key) == value))
-        return;
+    mIsTakingSnapshot = true;
 
-    mDatastore.insert(key, value);
-    if (scene())
-        scene()->setModified(true);
-}
+    QPixmap pixmap(size().toSize());
+    pixmap.fill(Qt::transparent);
+    QPainter painter(&pixmap);
+ 
+    QStyleOptionGraphicsItem options;
+    paint(&painter, &options);
 
+    mIsTakingSnapshot = false;
 
-QString UBGraphicsWidgetItem::datastoreEntry(const QString& key) const
+    return pixmap;
+}
+
+void UBGraphicsWidgetItem::setSnapshot(const QPixmap& pix)
 {
-    if (mDatastore.contains(key))
-        return mDatastore.value(key);
-    else
-        return "";
+    mSnapshot = pix;
 }
 
+UBGraphicsScene* UBGraphicsWidgetItem::scene()
+{
+    return qobject_cast<UBGraphicsScene*>(QGraphicsItem::scene());
+}
 
-QMap<QString, QString> UBGraphicsWidgetItem::datastoreEntries() const
+int UBGraphicsWidgetItem::widgetType(const QUrl& pUrl)
 {
-    return mDatastore;
+    QString mime = UBFileSystemUtils::mimeTypeFromFileName(pUrl.toString());
+
+    if (mime == "application/vnd.apple-widget")
+        return UBWidgetType::Apple;
+    else if (mime == "application/widget")
+        return UBWidgetType::W3C;
+    else
+        return UBWidgetType::Other;
 }
 
+QString UBGraphicsWidgetItem::widgetName(const QUrl& widgetPath)
+{
+    QString name;
+    QString version;
+    QFile w3CConfigFile(widgetPath.toLocalFile() + "/config.xml");
+    QFile appleConfigFile(widgetPath.toLocalFile() + "/Info.plist");
+
+    if (w3CConfigFile.exists() && w3CConfigFile.open(QFile::ReadOnly)) {
+        QDomDocument doc;
+        doc.setContent(w3CConfigFile.readAll());
+        QDomElement root = doc.firstChildElement("widget");
+        if (!root.isNull()) {
+            QDomElement nameElement = root.firstChildElement("name");
+            if (!nameElement.isNull())
+                name = nameElement.text();
+            version = root.attribute("version", "");
+        }
+        w3CConfigFile.close();
+    }
+    else if (appleConfigFile.exists() && appleConfigFile.open(QFile::ReadOnly)) {
+        QDomDocument doc;
+        doc.setContent(appleConfigFile.readAll());
+        QDomElement root = doc.firstChildElement("plist");
+        if (!root.isNull()) {
+            QDomElement dictElement = root.firstChildElement("dict");
+            if (!dictElement.isNull()) {
+                QDomNodeList childNodes  = dictElement.childNodes();
+
+                /* looking for something like
+                 * ..
+                 * <key>CFBundleDisplayName</key>
+                 * <string>brain scans</string>
+                 * ..
+                 */
+
+                for(int i = 0; i < childNodes.count() - 1; i++) {
+                    if (childNodes.at(i).isElement()) {
+                        QDomElement elKey = childNodes.at(i).toElement();
+                        if (elKey.text() == "CFBundleDisplayName") {
+                            if (childNodes.at(i + 1).isElement()) {
+                               QDomElement elValue = childNodes.at(i + 1).toElement();
+                               name = elValue.text();
+                            }
+                        }
+                        else if (elKey.text() == "CFBundleShortVersionString") {
+                            if (childNodes.at(i + 1).isElement()) {
+                               QDomElement elValue = childNodes.at(i + 1).toElement();
+                               version = elValue.text();
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        appleConfigFile.close();
+    }
+    QString result;
 
-void UBGraphicsWidgetItem::removeDatastoreEntry(const QString& key)
+    if (name.length() > 0) {
+        result = name;
+        if (version.length() > 0) {
+            result += " ";
+            result += version;
+        }
+    }
+    return result;
+}
+
+QString UBGraphicsWidgetItem::iconFilePath(const QUrl& pUrl)
 {
-    mDatastore.remove(key);
+    /* TODO UB 4.x read config.xml widget.icon param first */
+
+    QStringList files;
+
+    files << "icon.svg";  /* W3C widget default 1 */
+    files << "icon.ico";  /* W3C widget default 2 */
+    files << "icon.png";  /* W3C widget default 3 */
+    files << "icon.gif";  /* W3C widget default 4 */
+    files << "Icon.png";  /* Apple widget default */
+
+    QString file = UBFileSystemUtils::getFirstExistingFileFromList(pUrl.toLocalFile(), files);
+    /* default */
+    if (file.length() == 0)
+    {
+        file = QString(":/images/defaultWidgetIcon.png");
+    }
+    return file;
 }
 
+void UBGraphicsWidgetItem::freeze()
+{
+    QPixmap pix = takeSnapshot();
+    mIsFrozen = true;
+    setSnapshot(pix);
+}
 
-void UBGraphicsWidgetItem::removeAllDatastoreEntries()
+void UBGraphicsWidgetItem::unFreeze()
 {
-    mDatastore.clear();
+    mIsFrozen = false;
 }
 
+void UBGraphicsWidgetItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
+{
+    UBGraphicsWebView::mousePressEvent(event);
 
-void UBGraphicsWidgetItem::remove()
+    // did webkit consume the mouse press ?
+    mShouldMoveWidget = !event->isAccepted() && (event->buttons() & Qt::LeftButton);
+
+    mLastMousePos = mapToScene(event->pos());
+
+    event->accept();
+}
+
+void UBGraphicsWidgetItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 {
+    mShouldMoveWidget = false;
 
-    if (mDelegate)
-        mDelegate->remove();
+    UBGraphicsWebView::mouseReleaseEvent(event);
+}
 
+void UBGraphicsWidgetItem::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
+{
+    sendJSEnterEvent();
+    mDelegate->hoverEnterEvent(event);
+    UBGraphicsWebView::hoverEnterEvent(event);
+}
+void UBGraphicsWidgetItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
+{
+    sendJSLeaveEvent();
+    mDelegate->hoverLeaveEvent(event);
+    UBGraphicsWebView::hoverLeaveEvent(event);
+}
+void UBGraphicsWidgetItem::hoverMoveEvent(QGraphicsSceneHoverEvent *event)
+{
+    UBGraphicsWebView::hoverMoveEvent(event);
 }
 
-void UBGraphicsWidgetItem::removeScript()
+bool UBGraphicsWidgetItem::eventFilter(QObject *obj, QEvent *event)
 {
-    if (mWebKitWidget && mWebKitWidget->page() && mWebKitWidget->page()->mainFrame())
-    {
-        mWebKitWidget->page()->mainFrame()->evaluateJavaScript("if(widget && widget.onremove) { widget.onremove();}");
+    if (mShouldMoveWidget && obj == this && event->type() == QEvent::MouseMove) {
+        QMouseEvent *mouseMoveEvent = static_cast<QMouseEvent*>(event);
+
+        if (mouseMoveEvent->buttons() & Qt::LeftButton) {
+            QPointF scenePos = mapToScene(mouseMoveEvent->pos());
+
+            QPointF newPos = pos() + scenePos - mLastMousePos;
+
+            setPos(newPos);
+
+            mLastMousePos = scenePos;
+
+            event->accept();
+
+            return true;
+        }
     }
+
+    /* standard event processing */
+    return QObject::eventFilter(obj, event);
 }
+
 void UBGraphicsWidgetItem::sendJSEnterEvent()
 {
-    if (mWebKitWidget && mWebKitWidget->page() && mWebKitWidget->page()->mainFrame())
-    {
-        mWebKitWidget->page()->mainFrame()->evaluateJavaScript("if(widget && widget.onenter) { widget.onenter();}");
-    }
+    if (page() && page()->mainFrame())
+        page()->mainFrame()->evaluateJavaScript("if(widget && widget.onenter) { widget.onenter();}");
 }
+
 void UBGraphicsWidgetItem::sendJSLeaveEvent()
 {
-    if (mWebKitWidget && mWebKitWidget->page() && mWebKitWidget->page()->mainFrame())
-    {
-        mWebKitWidget->page()->mainFrame()->evaluateJavaScript("if(widget && widget.onleave) { widget.onleave();}");
+    if (page() && page()->mainFrame())
+        page()->mainFrame()->evaluateJavaScript("if(widget && widget.onleave) { widget.onleave();}");
+}
+
+void UBGraphicsWidgetItem::injectInlineJavaScript()
+{
+    if (!sInlineJavaScriptLoaded) {
+        sInlineJavaScripts = UBApplication::applicationController->widgetInlineJavaScripts();
+        sInlineJavaScriptLoaded = true;
     }
+
+    foreach(QString script, sInlineJavaScripts)
+        page()->mainFrame()->evaluateJavaScript(script);
 }
 
-void UBGraphicsWidgetItem::clearSource()
+void UBGraphicsWidgetItem::paint( QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
 {
-    UBFileSystemUtils::deleteDir(getOwnFolder().toLocalFile());
-    UBFileSystemUtils::deleteFile(getSnapshotPath().toLocalFile());
+    if (mIsFrozen)
+        painter->drawPixmap(0, 0, mSnapshot);
+    else
+        UBGraphicsWebView::paint(painter, option, widget);
+    if (!mInitialLoadDone || mLoadIsErronous) {
+        QString message;
+
+        if (mInitialLoadDone && mLoadIsErronous)
+            message = tr("Cannot load content");
+        else
+            message = tr("Loading ...");
+
+        painter->setFont(QFont("Arial", 12));
+
+        QFontMetrics fm = painter->fontMetrics();
+        QRect txtBoundingRect = fm.boundingRect(message);
+
+        txtBoundingRect.moveCenter(rect().center().toPoint());
+        txtBoundingRect.adjust(-10, -5, 10, 5);
+
+        painter->setPen(Qt::NoPen);
+        painter->setBrush(UBSettings::paletteColor);
+        painter->drawRoundedRect(txtBoundingRect, 3, 3);
+
+        painter->setPen(Qt::white);
+        painter->drawText(rect(), Qt::AlignCenter, message);
+    }
 }
 
-void UBGraphicsWidgetItem::processDropEvent(QDropEvent *event)
+void UBGraphicsWidgetItem::geometryChangeRequested(const QRect& geom)
 {
-    return mUniboardAPI->ProcessDropEvent(event);
+    resize(geom.width(), geom.height());
 }
-bool UBGraphicsWidgetItem::isDropableData(const QMimeData *data) const
+
+void UBGraphicsWidgetItem::javaScriptWindowObjectCleared()
 {
-    return mUniboardAPI->isDropableData(data);
+    injectInlineJavaScript();
+
+    if(!mUniboardAPI)
+        mUniboardAPI = new UBWidgetUniboardAPI(scene(), this);
+
+    page()->mainFrame()->addToJavaScriptWindowObject("sankore", mUniboardAPI);
+
 }
 
-UBGraphicsAppleWidgetItem::UBGraphicsAppleWidgetItem(const QUrl& pWidgetUrl, QGraphicsItem *parent)
-    : UBGraphicsWidgetItem(parent)
+void UBGraphicsWidgetItem::mainFrameLoadFinished (bool ok)
 {
-    mWebKitWidget = new UBAppleWidget(pWidgetUrl, 0);
-    initialize();
+    mInitialLoadDone = true;
+    mLoadIsErronous = !ok;
+    update(boundingRect());
 }
 
 
-UBGraphicsAppleWidgetItem::UBGraphicsAppleWidgetItem(UBAppleWidget *appleWidget, QGraphicsItem *parent)
-    : UBGraphicsWidgetItem(parent)
 
+UBGraphicsAppleWidgetItem::UBGraphicsAppleWidgetItem(const QUrl& pWidgetUrl, QGraphicsItem *parent)
+    : UBGraphicsWidgetItem(pWidgetUrl, parent)
 {
-    mWebKitWidget = appleWidget;
+    QString path = pWidgetUrl.toLocalFile();
+
+    if (!path.endsWith(".wdgt") && !path.endsWith(".wdgt/")) {
+        int lastSlashIndex = path.lastIndexOf("/");
+        if (lastSlashIndex > 0)
+            path = path.mid(0, lastSlashIndex + 1);
+    }
+
+    QFile plistFile(path + "/Info.plist");
+    plistFile.open(QFile::ReadOnly);
+
+    QByteArray plistBin = plistFile.readAll();
+    QString plist = QString::fromUtf8(plistBin);
+
+    int mainHtmlIndex = plist.indexOf("MainHTML");
+    int mainHtmlIndexStart = plist.indexOf("<string>", mainHtmlIndex);
+    int mainHtmlIndexEnd = plist.indexOf("</string>", mainHtmlIndexStart);
+
+    if (mainHtmlIndex > -1 && mainHtmlIndexStart > -1 && mainHtmlIndexEnd > -1)
+        mMainHtmlFileName = plist.mid(mainHtmlIndexStart + 8, mainHtmlIndexEnd - mainHtmlIndexStart - 8);
+
+    mMainHtmlUrl = pWidgetUrl;
+    mMainHtmlUrl.setPath(pWidgetUrl.path() + "/" + mMainHtmlFileName);
+
+    load(mMainHtmlUrl);
+
+    QPixmap defaultPixmap(pWidgetUrl.toLocalFile() + "/Default.png");
+
+    setMaximumSize(defaultPixmap.size());
+
+    mNominalSize = defaultPixmap.size();
 
     initialize();
 }
@@ -322,13 +660,23 @@ UBGraphicsAppleWidgetItem::UBGraphicsAppleWidgetItem(UBAppleWidget *appleWidget,
 
 UBGraphicsAppleWidgetItem::~UBGraphicsAppleWidgetItem()
 {
-    // NOOP
+    /* NOOP */
 }
 
+int UBGraphicsAppleWidgetItem::type() const
+{
+    return Type;
+}
+
+void UBGraphicsAppleWidgetItem::setUuid(const QUuid &pUuid)
+{
+    UBItem::setUuid(pUuid);
+    setData(UBGraphicsItemData::ItemUuid, QVariant(pUuid)); //store item uuid inside the QGraphicsItem to fast operations with Items on the scene
+}
 
 UBItem* UBGraphicsAppleWidgetItem::deepCopy() const
 {
-    UBGraphicsAppleWidgetItem *appleWidget = new UBGraphicsAppleWidgetItem(mWebKitWidget->widgetUrl(), parentItem());
+    UBGraphicsAppleWidgetItem *appleWidget = new UBGraphicsAppleWidgetItem(QGraphicsWebView::url(), parentItem());
 
     copyItemParameters(appleWidget);
 
@@ -355,38 +703,183 @@ void UBGraphicsAppleWidgetItem::copyItemParameters(UBItem *copy) const
     }
 
 }
-void UBGraphicsAppleWidgetItem::setUuid(const QUuid &pUuid)
-{
-    UBItem::setUuid(pUuid);
-    setData(UBGraphicsItemData::ItemUuid, QVariant(pUuid)); //store item uuid inside the QGraphicsItem to fast operations with Items on the scene
-}
 
-UBGraphicsW3CWidgetItem::UBGraphicsW3CWidgetItem(const QUrl& pWidgetUrl, QGraphicsItem *parent, int widgetType)
-    : UBGraphicsWidgetItem(parent, widgetType)
+
+
+
+bool UBGraphicsW3CWidgetItem::sTemplateLoaded = false;
+QString UBGraphicsW3CWidgetItem::sNPAPIWrappperConfigTemplate;
+QMap<QString, QString> UBGraphicsW3CWidgetItem::sNPAPIWrapperTemplates;
+
+UBGraphicsW3CWidgetItem::UBGraphicsW3CWidgetItem(const QUrl& pWidgetUrl, QGraphicsItem *parent)
+    : UBGraphicsWidgetItem(pWidgetUrl, parent)
     , mW3CWidgetAPI(0)
 {
-    mW3CWidget = new UBW3CWidget(pWidgetUrl, 0);
-    mWebKitWidget = mW3CWidget;
+    QString path = pWidgetUrl.toLocalFile();
+    QDir potentialDir(path);
+
+    if (!path.endsWith(".wgt") && !path.endsWith(".wgt/") && !potentialDir.exists()) {
+        int lastSlashIndex = path.lastIndexOf("/");
+        if (lastSlashIndex > 0)
+            path = path.mid(0, lastSlashIndex + 1);
+    }
+
+    if (!path.endsWith("/"))
+        path += "/";
+
+    int width = 300;
+    int height = 150;
+
+    QFile configFile(path + "config.xml");
+    configFile.open(QFile::ReadOnly);
+
+    QDomDocument doc;
+    doc.setContent(configFile.readAll());
+    QDomNodeList widgetDomList = doc.elementsByTagName("widget");
+
+    if (widgetDomList.count() > 0) {
+        QDomElement widgetElement = widgetDomList.item(0).toElement();
+
+        width = widgetElement.attribute("width", "300").toInt();
+        height = widgetElement.attribute("height", "150").toInt();
+
+        mMetadatas.id = widgetElement.attribute("id", "");
+
+        /* some early widget (<= 4.3.4) where using identifier instead of id */
+        if (mMetadatas.id.length() == 0)
+             mMetadatas.id = widgetElement.attribute("identifier", "");
+
+        mMetadatas.version = widgetElement.attribute("version", "");
+
+        /* TODO UB 4.x map properly ub namespace */
+        mIsResizable = widgetElement.attribute("ub:resizable", "false") == "true";
+        mIsFreezable = widgetElement.attribute("ub:freezable", "true") == "true";
+
+        QString roles = widgetElement.attribute("ub:roles", "content tool").trimmed().toLower();
+
+        /* ------------------------------ */
+
+        if (roles == "" || roles.contains("tool"))
+            mCanBeTool = UBGraphicsWidgetItem::type_ALL;
+
+        if (roles.contains("twin"))
+            mCanBeTool |= UBGraphicsWidgetItem::type_WIN;
+
+        if (roles.contains("tmac"))
+            mCanBeTool |= UBGraphicsWidgetItem::type_MAC;
+        
+        if (roles.contains("tunix"))
+            mCanBeTool |= UBGraphicsWidgetItem::type_UNIX;
+
+        /* --------- */
+
+        if (roles == "" || roles.contains("content"))
+            mCanBeContent = UBGraphicsWidgetItem::type_ALL;
+
+        if (roles.contains("cwin"))
+            mCanBeContent |= UBGraphicsWidgetItem::type_WIN;
+
+        if (roles.contains("cmac"))
+            mCanBeContent |= UBGraphicsWidgetItem::type_MAC;
+
+        if (roles.contains("cunix"))
+            mCanBeContent |= UBGraphicsWidgetItem::type_UNIX;
+
+        //------------------------------//
+
+        QDomNodeList contentDomList = widgetElement.elementsByTagName("content");
+
+        if (contentDomList.count() > 0) {
+            QDomElement contentElement = contentDomList.item(0).toElement();
+            mMainHtmlFileName = contentElement.attribute("src", "");
+        }
+
+        mMetadatas.name = textForSubElementByLocale(widgetElement, "name", QLocale::system());
+        mMetadatas.description = textForSubElementByLocale(widgetElement, "description ", QLocale::system());
+
+        QDomNodeList authorDomList = widgetElement.elementsByTagName("author");
+
+        if (authorDomList.count() > 0) {
+            QDomElement authorElement = authorDomList.item(0).toElement();
+
+            mMetadatas.author = authorElement.text();
+            mMetadatas.authorHref = authorElement.attribute("href", "");
+            mMetadatas.authorEmail = authorElement.attribute("email ", "");
+        }
+
+        QDomNodeList propertiesDomList = widgetElement.elementsByTagName("preference");
+
+        for (uint i = 0; i < propertiesDomList.length(); i++) {
+            QDomElement preferenceElement = propertiesDomList.at(i).toElement();
+            QString prefName = preferenceElement.attribute("name", "");
+
+            if (prefName.length() > 0) {
+                QString prefValue = preferenceElement.attribute("value", "");
+                bool readOnly = (preferenceElement.attribute("readonly", "false") == "true");
+
+                mPreferences.insert(prefName, PreferenceValue(prefValue, readOnly));
+            }
+        }
+    }
+
+    if (mMainHtmlFileName.length() == 0) {
+        QFile defaultStartFile(path + "index.htm");
+
+        if (defaultStartFile.exists())
+            mMainHtmlFileName = "index.htm";
+        else {
+            QFile secondDefaultStartFile(path + "index.html");
+
+            if (secondDefaultStartFile.exists())
+                mMainHtmlFileName = "index.html";
+        }
+    }
+
+    mMainHtmlUrl = pWidgetUrl;
+    mMainHtmlUrl.setPath(pWidgetUrl.path() + "/" + mMainHtmlFileName);
+    /* is it a valid local file ? */
+    QFile f(mMainHtmlUrl.toLocalFile());
+
+    if(!f.exists())
+        mMainHtmlUrl = QUrl(mMainHtmlFileName);
+
+    connect(page()->mainFrame(), SIGNAL(javaScriptWindowObjectCleared()), this, SLOT(javaScriptWindowObjectCleared()));
+    connect(UBApplication::boardController, SIGNAL(activeSceneChanged()), this, SLOT(javaScriptWindowObjectCleared()));
+
+    load(mMainHtmlUrl);
+
+    setMaximumSize(QSize(width, height));
+
+    mNominalSize = QSize(width, height);
+
     initialize();
     setOwnFolder(pWidgetUrl);
 }
 
-UBGraphicsW3CWidgetItem::UBGraphicsW3CWidgetItem(UBW3CWidget *w3cWidget, QGraphicsItem *parent, int widgetType)
-    : UBGraphicsWidgetItem(parent)
-    , mW3CWidget(w3cWidget)
-    , mW3CWidgetAPI(0)
+UBGraphicsW3CWidgetItem::~UBGraphicsW3CWidgetItem()
 {
-    Q_UNUSED(widgetType);
-    mWebKitWidget = mW3CWidget;
-    initialize();
+    /* NOOP */
 }
 
+int UBGraphicsW3CWidgetItem::type() const
+{
+    return Type;
+}
 
-UBGraphicsW3CWidgetItem::~UBGraphicsW3CWidgetItem()
+void UBGraphicsW3CWidgetItem::setUuid(const QUuid &pUuid)
 {
-    // NOOP
+    UBItem::setUuid(pUuid);
+    setData(UBGraphicsItemData::ItemUuid, QVariant(pUuid)); //store item uuid inside the QGraphicsItem to fast operations with Items on the scene
 }
 
+UBItem* UBGraphicsW3CWidgetItem::deepCopy() const
+{
+    UBGraphicsW3CWidgetItem *copy = new UBGraphicsW3CWidgetItem(mWidgetUrl, parentItem());
+    copy->setUuid(this->uuid()); // this is OK for now as long as Widgets are imutable
+    copyItemParameters(copy);
+
+    return copy;
+}
 
 void UBGraphicsW3CWidgetItem::paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget)
 {
@@ -395,23 +888,222 @@ void UBGraphicsW3CWidgetItem::paint(QPainter * painter, const QStyleOptionGraphi
     if (scene())
       rc =  scene()->renderingContext();
 
-    if ((!w3cWidget()->hasLoadedSuccessfully()) && (rc == UBGraphicsScene::NonScreen || rc == UBGraphicsScene::PdfExport))
-    {
-        if (!w3cWidget()->snapshot().isNull())
-        {
-           painter->drawPixmap(0, 0, w3cWidget()->snapshot());
+    if (rc == UBGraphicsScene::NonScreen || rc == UBGraphicsScene::PdfExport) {
+        if (!snapshot().isNull())
+           painter->drawPixmap(0, 0, snapshot());
+    }
+    else
+        UBGraphicsWidgetItem::paint(painter, option, widget);
+}
+
+QMap<QString, UBGraphicsW3CWidgetItem::PreferenceValue> UBGraphicsW3CWidgetItem::preferences()
+{
+    return mPreferences;
+}
+
+UBGraphicsW3CWidgetItem::Metadata UBGraphicsW3CWidgetItem::metadatas() const
+{
+    return mMetadatas;
+}
+
+QString UBGraphicsW3CWidgetItem::createNPAPIWrapper(const QString& url, const QString& pMimeType, const QSize& sizeHint, const QString& pName)
+{
+    const QString userWidgetPath = UBSettings::settings()->userInteractiveDirectory() + "/" + tr("Web");
+    QDir userWidgetDir(userWidgetPath);
+
+    return createNPAPIWrapperInDir(url, userWidgetDir, pMimeType, sizeHint, pName);
+}
+
+QString UBGraphicsW3CWidgetItem::createNPAPIWrapperInDir(const QString& pUrl, const QDir& pDir, const QString& pMimeType, const QSize& sizeHint, const QString& pName)
+{
+    QString url = pUrl;
+    url = UBFileSystemUtils::removeLocalFilePrefix(url);
+    QString name = pName;
+
+    QFileInfo fi(url);
+
+    if (name.length() == 0)
+        name = fi.baseName();
+
+    if (fi.exists())
+        url = fi.fileName();
+
+    loadNPAPIWrappersTemplates();
+
+    QString htmlTemplate;
+
+    if (pMimeType.length() > 0 && sNPAPIWrapperTemplates.contains(pMimeType))
+        htmlTemplate = sNPAPIWrapperTemplates.value(pMimeType);
+    else {
+        QString extension = UBFileSystemUtils::extension(url);
+        if (sNPAPIWrapperTemplates.contains(extension))
+            htmlTemplate = sNPAPIWrapperTemplates.value(extension);
+    }
+
+    if (htmlTemplate.length() > 0) {
+        htmlTemplate = htmlTemplate.replace(QString("{in.url}"), url)
+            .replace(QString("{in.width}"), QString("%1").arg(sizeHint.width()))
+            .replace(QString("{in.height}"), QString("%1").arg(sizeHint.height()));
+
+        QString configTemplate = sNPAPIWrappperConfigTemplate
+            .replace(QString("{in.id}"), url)
+            .replace(QString("{in.width}"), QString("%1").arg(sizeHint.width()))
+            .replace(QString("{in.height}"), QString("%1").arg(sizeHint.height()))
+            .replace(QString("{in.name}"), name)
+            .replace(QString("{in.startFile}"), QString("index.htm"));
+
+        QString dirPath = pDir.path();
+        if (!pDir.exists())
+            pDir.mkpath(dirPath);
+
+        QString widgetLibraryPath = dirPath + "/" + name + ".wgt";
+        QDir widgetLibraryDir(widgetLibraryPath);
+
+        if (widgetLibraryDir.exists())
+            if (!UBFileSystemUtils::deleteDir(widgetLibraryDir.path()))
+                qWarning() << "Cannot delete old widget " << widgetLibraryDir.path();
+
+        widgetLibraryDir.mkpath(widgetLibraryPath);
+        if (fi.exists()) {
+            QString target = widgetLibraryPath + "/" + fi.fileName();
+            QString source = pUrl;
+            source = UBFileSystemUtils::removeLocalFilePrefix(source);
+            QFile::copy(source, target);
+        }
+
+        QFile configFile(widgetLibraryPath + "/config.xml");
+
+        if (!configFile.open(QIODevice::WriteOnly)) {
+            qWarning() << "Cannot open file " << configFile.fileName();
+            return QString();
         }
+
+        QTextStream outConfig(&configFile);
+        outConfig.setCodec("UTF-8");
+
+        outConfig << configTemplate;
+        configFile.close();
+
+        QFile indexFile(widgetLibraryPath + "/index.htm");
+
+        if (!indexFile.open(QIODevice::WriteOnly)) {
+            qWarning() << "Cannot open file " << indexFile.fileName();
+            return QString();
+        }
+
+        QTextStream outIndex(&indexFile);
+        outIndex.setCodec("UTF-8");
+
+        outIndex << htmlTemplate;
+        indexFile.close();
+
+        return widgetLibraryPath;
     }
     else
-    {
-        UBGraphicsProxyWidget::paint(painter, option, widget);
+        return QString();
+}
+
+QString UBGraphicsW3CWidgetItem::createHtmlWrapperInDir(const QString& html, const QDir& pDir, const QSize& sizeHint, const QString& pName)
+{
+    QString widgetPath = pDir.path() + "/" + pName + ".wgt";
+    widgetPath = UBFileSystemUtils::nextAvailableFileName(widgetPath);
+    QDir widgetDir(widgetPath);
+
+    if (!widgetDir.exists())
+        widgetDir.mkpath(widgetDir.path());
+
+    QFile configFile(widgetPath + "/" + "config.xml");
+
+    if (configFile.exists())
+        configFile.remove(configFile.fileName());
+
+    if (!configFile.open(QIODevice::WriteOnly)) {
+        qWarning() << "Cannot open file " << configFile.fileName();
+        return "";
+    }
+
+    QTextStream outConfig(&configFile);
+    outConfig.setCodec("UTF-8");
+    outConfig << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << endl;
+    outConfig << "<widget xmlns=\"http://www.w3.org/ns/widgets\"" << endl;
+    outConfig << "    xmlns:ub=\"http://uniboard.mnemis.com/widgets\"" << endl;
+    outConfig << "    id=\"http://uniboard.mnemis.com/" << pName << "\"" <<endl;
+
+    outConfig << "    version=\"1.0\"" << endl;
+    outConfig << "    width=\"" << sizeHint.width() << "\"" << endl;
+    outConfig << "    height=\"" << sizeHint.height() << "\"" << endl;
+    outConfig << "    ub:resizable=\"true\">" << endl;
+
+    outConfig << "  <name>" << pName << "</name>" << endl;
+    outConfig << "  <content src=\"" << pName << ".html\"/>" << endl;
+
+    outConfig << "</widget>" << endl;
+
+    configFile.close();
+
+    const QString fullHtmlFileName = widgetPath + "/" + pName + ".html";
+
+    QFile widgetHtmlFile(fullHtmlFileName);
+    if (widgetHtmlFile.exists())
+        widgetHtmlFile.remove(widgetHtmlFile.fileName());
+    if (!widgetHtmlFile.open(QIODevice::WriteOnly)) {
+        qWarning() << "cannot open file " << widgetHtmlFile.fileName();
+        return QString();
+    }
+
+    QTextStream outStartFile(&widgetHtmlFile);
+    outStartFile.setCodec("UTF-8");
+
+    outStartFile << "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http://www.w3.org/TR/html4/strict.dtd\">" << endl;
+    outStartFile << "<html>" << endl;
+    outStartFile << "<head>" << endl;
+    outStartFile << "    <meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\">" << endl;
+    outStartFile << "</head>" << endl;
+    outStartFile << "  <body>" << endl;
+    outStartFile << html << endl;
+    outStartFile << "  </body>" << endl;
+    outStartFile << "</html>" << endl;
+
+    widgetHtmlFile.close();
+
+    return widgetPath;
+}
+
+QString UBGraphicsW3CWidgetItem::freezedWidgetPage()
+{
+    static QString defaultcontent;
+
+    if (defaultcontent.isNull()) {
+        QString freezedWidgetDefaultContentFilePath = freezedWidgetFilePath();
+        QFile wrapperFile(freezedWidgetDefaultContentFilePath);
+        if (!wrapperFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
+            qDebug() << "can't open wrapper file " + freezedWidgetDefaultContentFilePath;
+            defaultcontent = "";
+        } 
+        else {
+            QByteArray arr = wrapperFile.readAll();
+            if (!arr.isEmpty())
+                defaultcontent = QString(arr); 
+            else {
+                qDebug() << "content of " + freezedWidgetDefaultContentFilePath + "is empty";
+                defaultcontent = QString();
+            }
+        }
     }
+
+    return defaultcontent;
 }
 
-void UBGraphicsW3CWidgetItem::setUuid(const QUuid &pUuid)
+QString UBGraphicsW3CWidgetItem::freezedWidgetFilePath()
 {
-    UBItem::setUuid(pUuid);
-    setData(UBGraphicsItemData::ItemUuid, QVariant(pUuid)); //store item uuid inside the QGraphicsItem to fast operations with Items on the scene
+    return UBPlatformUtils::applicationResourcesDirectory() + "/etc/" + "freezedWidgetWrapper.html";
+}
+
+bool UBGraphicsW3CWidgetItem::hasNPAPIWrapper(const QString& pMimeType)
+{
+    loadNPAPIWrappersTemplates();
+
+    return sNPAPIWrapperTemplates.contains(pMimeType);
 }
 
 void UBGraphicsW3CWidgetItem::javaScriptWindowObjectCleared()
@@ -421,30 +1113,71 @@ void UBGraphicsW3CWidgetItem::javaScriptWindowObjectCleared()
     if(!mW3CWidgetAPI)
         mW3CWidgetAPI = new UBW3CWidgetAPI(this);
 
-    mWebKitWidget->page()->mainFrame()->addToJavaScriptWindowObject("widget", mW3CWidgetAPI);
+    page()->mainFrame()->addToJavaScriptWindowObject("widget", mW3CWidgetAPI);
 
 }
 
-
-UBW3CWidget::Metadata UBGraphicsW3CWidgetItem::metadatas() const
+void UBGraphicsW3CWidgetItem::loadNPAPIWrappersTemplates()
 {
-    return mW3CWidget->metadatas();
-}
+    if (!sTemplateLoaded) {
+        sNPAPIWrapperTemplates.clear();
 
+        QString etcPath = UBPlatformUtils::applicationResourcesDirectory() + "/etc/";
 
-UBW3CWidget* UBGraphicsW3CWidgetItem::w3cWidget() const
-{
-    return mW3CWidget;
-}
+        QDir etcDir(etcPath);
 
+        foreach(QString fileName, etcDir.entryList()) {
+            if (fileName.startsWith("npapi-wrapper") && (fileName.endsWith(".htm") || fileName.endsWith(".html"))) {
 
-UBItem* UBGraphicsW3CWidgetItem::deepCopy() const
+                QString htmlContent = UBFileSystemUtils::readTextFile(etcPath + fileName);
+
+                if (htmlContent.length() > 0) {
+                    QStringList tokens = fileName.split(".");
+
+                    if (tokens.length() >= 4) {
+                        QString mime = tokens.at(tokens.length() - 4 );
+                        mime += "/" + tokens.at(tokens.length() - 3);
+
+                        QString fileExtension = tokens.at(tokens.length() - 2);
+
+                        sNPAPIWrapperTemplates.insert(mime, htmlContent);
+                        sNPAPIWrapperTemplates.insert(fileExtension, htmlContent);
+                    }
+                }
+            }
+        }
+        sNPAPIWrappperConfigTemplate = UBFileSystemUtils::readTextFile(etcPath + "npapi-wrapper.config.xml");
+        sTemplateLoaded = true;
+    }
+}
+
+QString UBGraphicsW3CWidgetItem::textForSubElementByLocale(QDomElement rootElement, QString subTagName, QLocale locale)
 {
-    UBGraphicsW3CWidgetItem *copy = new UBGraphicsW3CWidgetItem(mWebKitWidget->widgetUrl(), parentItem());
-    copy->setUuid(this->uuid()); // this is OK for now as long as Widgets are imutable
-    copyItemParameters(copy);
+    QDomNodeList subList = rootElement.elementsByTagName(subTagName);
 
-    return copy;
+    QString lang = locale.name();
+
+    if (lang.length() > 2)
+        lang[2] = QLatin1Char('-');
+
+    if (subList.count() > 1) {
+        for(int i = 0; i < subList.count(); i++) {
+            QDomNode node = subList.at(i);
+            QDomElement element = node.toElement();
+
+            QString configLang = element.attribute("xml:lang", "");
+
+            if(lang == configLang || (configLang.length() == 2 && configLang == lang.left(2)))
+                 return element.text();
+        }
+    }
+
+    if (subList.count() >= 1) {
+        QDomElement element = subList.item(0).toElement();
+        return element.text();
+    }
+
+    return QString();
 }
 
 void UBGraphicsW3CWidgetItem::copyItemParameters(UBItem *copy) const
@@ -462,9 +1195,9 @@ void UBGraphicsW3CWidgetItem::copyItemParameters(UBItem *copy) const
 
         cp->resize(this->size());
 
-        foreach(QString key, mPreferences.keys())
+        foreach(QString key, UBGraphicsWidgetItem::preferences().keys())
         {
-            cp->setPreference(key, mPreferences.value(key));
+            cp->setPreference(key, UBGraphicsWidgetItem::preferences().value(key));
         }
 
         foreach(QString key, mDatastore.keys())
@@ -472,4 +1205,5 @@ void UBGraphicsW3CWidgetItem::copyItemParameters(UBItem *copy) const
             cp->setDatastoreEntry(key, mDatastore.value(key));
         }
     }
-}
\ No newline at end of file
+}
+
diff --git a/src/domain/UBGraphicsWidgetItem.h b/src/domain/UBGraphicsWidgetItem.h
index d3728b00..6125ab88 100644
--- a/src/domain/UBGraphicsWidgetItem.h
+++ b/src/domain/UBGraphicsWidgetItem.h
@@ -17,100 +17,153 @@
 
 #include <QtGui>
 #include <QtWebKit>
+#include <QDomElement>
 
-#include "core/UB.h"
+#include "UBGraphicsWebView.h"
 
-#include "UBGraphicsProxyWidget.h"
-#include "UBW3CWidget.h"
-#include "UBAppleWidget.h"
+#include "core/UB.h"
 
 class UBWidgetUniboardAPI;
 class UBGraphicsScene;
-class UBAbstractWidget;
 class UBW3CWidgetAPI;
 class UBW3CWidgetWebStorageAPI;
 class UBGraphiscItem;
 class UBGraphiscItemDelegate;
 
-class UBGraphicsWidgetItem : public UBGraphicsProxyWidget
+struct UBWidgetType
+{
+    enum Enum
+    {
+        W3C = 0, Apple, Other
+    };
+};
+
+class UBGraphicsWidgetItem : public UBGraphicsWebView
 {
     Q_OBJECT
 
     public:
-        UBGraphicsWidgetItem(QGraphicsItem *parent = 0, int widgetType = 0);
+        UBGraphicsWidgetItem(const QUrl &pWidgetUrl = QUrl(), QGraphicsItem *parent = 0);
         ~UBGraphicsWidgetItem();
 
-        virtual UBGraphicsScene* scene();
-
-        UBAbstractWidget* widgetWebView();
-
         virtual void initialize();
 
-        virtual UBItem* deepCopy() const = 0;
+        QUrl mainHtml();
+        void loadMainHtml();
+        QUrl widgetUrl();
+        QString mainHtmlFileName();
 
-        virtual void resize ( qreal w, qreal h );
-        virtual void resize ( const QSizeF & size );
+        bool hasEmbededObjects();
+        bool hasEmbededFlash();
+
+        bool canBeContent();
+        bool canBeTool();
 
-        void setPreference(const QString& key, QString value);
         QString preference(const QString& key) const;
+        void setPreference(const QString& key, QString value);      
         QMap<QString, QString> preferences() const;
         void removePreference(const QString& key);
         void removeAllPreferences();
 
-        void setDatastoreEntry(const QString& key, QString value);
         QString datastoreEntry(const QString& key) const;
+        void setDatastoreEntry(const QString& key, QString value);
         QMap<QString, QString> datastoreEntries() const;
         void removeDatastoreEntry(const QString& key);
         void removeAllDatastoreEntries();
-        virtual UBGraphicsItemDelegate* Delegate() const {return mDelegate; }
+
+        virtual UBGraphicsItemDelegate* Delegate() const;
 
         virtual void remove();
         void removeScript();
 
-        QString downloadUrl(const QString &fileUrl, const QString &extention);
-        QString downloadWeb(const QString &fileUrl);
         void processDropEvent(QDropEvent *event);
         bool isDropableData(const QMimeData *data) const;
 
-        virtual void setOwnFolder(const QUrl &newFolder) {ownFolder = newFolder;}
-        virtual QUrl getOwnFolder() const {return ownFolder;}
-        virtual void setSnapshotPath(const QUrl &newFilePath){SnapshotFile = newFilePath;}
-        virtual QUrl getSnapshotPath(){return SnapshotFile;}
+        virtual QUrl getOwnFolder() const;
+        virtual void setOwnFolder(const QUrl &newFolder);
+        virtual void setSnapshotPath(const QUrl &newFilePath);
+        virtual QUrl getSnapshotPath();
 
         virtual void clearSource();
+
         virtual void setUuid(const QUuid &pUuid);
 
+        QSize nominalSize() const;       
+
+        bool hasLoadedSuccessfully() const;
+
+        bool freezable();
+        bool resizable();
+        bool isFrozen();
+
+        QPixmap snapshot();
+        void setSnapshot(const QPixmap& pix);
+        QPixmap takeSnapshot();
+
+        virtual UBItem* deepCopy() const = 0;
+        virtual UBGraphicsScene* scene();
+
+        static int widgetType(const QUrl& pUrl);
+        static QString widgetName(const QUrl& pUrl);        
+        static QString iconFilePath(const QUrl& pUrl);
+
+    public slots:
+        void freeze();
+        void unFreeze();
 
     protected:
+        enum OSType
+        {
+            type_NONE = 0, // 0000
+            type_WIN  = 1, // 0001
+            type_MAC  = 2, // 0010
+            type_UNIX = 4, // 0100
+            type_ALL  = 7, // 0111
+        };
+
+        bool mFirstReleaseAfterMove;        
+        bool mInitialLoadDone;
+        bool mIsFreezable;
+        bool mIsResizable;
+        bool mLoadIsErronous;
+        bool mMouseIsPressed;
+        int mCanBeContent;
+        int mCanBeTool;
+        QSize mNominalSize;
+        QString mMainHtmlFileName;
+        QUrl mMainHtmlUrl;        
+        QUrl mWidgetUrl;
+        QMap<QString, QString> mDatastore;
+        QMap<QString, QString> mPreferences;
 
         virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
         virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
-
         virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
         virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
         virtual void hoverMoveEvent(QGraphicsSceneHoverEvent *event);
-
-
         virtual bool eventFilter(QObject *obj, QEvent *event);
-
         virtual void sendJSEnterEvent();
         virtual void sendJSLeaveEvent();
-
-        UBAbstractWidget* mWebKitWidget;
-
-        QMap<QString, QString> mPreferences;
-        QMap<QString, QString> mDatastore;
+        virtual void injectInlineJavaScript();
+        virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
 
     protected slots:
         void geometryChangeRequested(const QRect& geom);
         virtual void javaScriptWindowObjectCleared();
+        void mainFrameLoadFinished(bool ok);
 
     private:
-        QPointF mLastMousePos;
-        bool mShouldMoveWidget;
+        bool mIsFrozen;
+        bool mIsTakingSnapshot;
+        bool mShouldMoveWidget;        
         UBWidgetUniboardAPI* mUniboardAPI;
+        QPixmap mSnapshot;
+        QPointF mLastMousePos;
         QUrl ownFolder;
-        QUrl SnapshotFile;
+        QUrl SnapshotFile;  
+
+        static bool sInlineJavaScriptLoaded;
+        static QStringList sInlineJavaScripts;        
 };
 
 class UBGraphicsAppleWidgetItem : public UBGraphicsWidgetItem
@@ -119,21 +172,17 @@ class UBGraphicsAppleWidgetItem : public UBGraphicsWidgetItem
 
     public:
         UBGraphicsAppleWidgetItem(const QUrl& pWidgetUrl, QGraphicsItem *parent = 0);
-        UBGraphicsAppleWidgetItem(UBAppleWidget *appleWidget, QGraphicsItem *parent = 0);
-        ~UBGraphicsAppleWidgetItem();
-
-        enum { Type = UBGraphicsItemType::AppleWidgetItemType };
-
-        virtual int type() const
-        {
-            return Type;
-        }
-
-        virtual UBItem* deepCopy() const;
+        ~UBGraphicsAppleWidgetItem();        
 
         virtual void copyItemParameters(UBItem *copy) const;
-
+        virtual int type() const;
         virtual void setUuid(const QUuid &pUuid);
+        virtual UBItem* deepCopy() const;        
+
+        enum 
+        { 
+            Type = UBGraphicsItemType::AppleWidgetItemType 
+        };
 
 };
 
@@ -142,38 +191,76 @@ class UBGraphicsW3CWidgetItem : public UBGraphicsWidgetItem
     Q_OBJECT
 
     public:
-        UBGraphicsW3CWidgetItem(const QUrl& pWidgetUrl, QGraphicsItem *parent = 0, int widgetType = UBGraphicsItemType::W3CWidgetItemType);
-        UBGraphicsW3CWidgetItem(UBW3CWidget *w3cWidget, QGraphicsItem *parent = 0, int widgetType = UBGraphicsItemType::W3CWidgetItemType);
-        ~UBGraphicsW3CWidgetItem();
+        class PreferenceValue
+        {
+            public:
 
-        enum { Type = UBGraphicsItemType::W3CWidgetItemType };
+                PreferenceValue()
+                {
+                    /* NOOP */
+                }
+                
 
-        virtual int type() const
-        {
-            return Type;
-        }
+                PreferenceValue(const QString& pValue, bool pReadonly)
+                {
+                    value = pValue;
+                    readonly = pReadonly;
+                }
 
-        virtual UBItem* deepCopy() const;
+                bool readonly;
+                QString value;
+         };
 
+        class Metadata
+        {
+            public:
+                QString id;
+                QString name;
+                QString description;
+                QString author;
+                QString authorEmail;
+                QString authorHref;
+                QString version;
+        };
+
+        enum 
+        { 
+            Type = UBGraphicsItemType::W3CWidgetItemType
+        };
+
+        UBGraphicsW3CWidgetItem(const QUrl& pWidgetUrl, QGraphicsItem *parent = 0);
+        ~UBGraphicsW3CWidgetItem();        
+
+        virtual int type() const;
+        virtual void setUuid(const QUuid &pUuid);
+        virtual UBItem* deepCopy() const;
         virtual void copyItemParameters(UBItem *copy) const;
+        virtual void paint ( QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget );     
+        QMap<QString, PreferenceValue> preferences();
+        Metadata metadatas() const;  
 
-        UBW3CWidget::Metadata metadatas() const;
-
-        UBW3CWidget* w3cWidget() const;
+        static QString freezedWidgetFilePath();
+        static QString createNPAPIWrapper(const QString& url, const QString& pMimeType = QString(), const QSize& sizeHint = QSize(300, 150), const QString& pName = QString());
+        static QString createNPAPIWrapperInDir(const QString& url, const QDir& pDir, const QString& pMimeType = QString(), const QSize& sizeHint = QSize(300, 150), const QString& pName = QString());
+        static QString createHtmlWrapperInDir(const QString& html, const QDir& pDir, const QSize& sizeHint,  const QString& pName);
+        static QString freezedWidgetPage();
+        static bool hasNPAPIWrapper(const QString& pMimeType);
 
-        virtual void paint ( QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget );
-        virtual void setUuid(const QUuid &pUuid);
+        Metadata mMetadatas;
 
     private slots:
-
         virtual void javaScriptWindowObjectCleared();
 
     private:
+        static void loadNPAPIWrappersTemplates();
+        static QString textForSubElementByLocale(QDomElement rootElement, QString subTagName, QLocale locale);
 
-        UBW3CWidget* mW3CWidget;
         UBW3CWidgetAPI* mW3CWidgetAPI;
+        QMap<QString, PreferenceValue> mPreferences;        
 
-
+        static bool sTemplateLoaded;
+        static QString sNPAPIWrappperConfigTemplate;
+        static QMap<QString, QString> sNPAPIWrapperTemplates;    
 };
 
 #endif // UBGRAPHICSWIDGETITEM_H
diff --git a/src/domain/UBGraphicsWidgetItemDelegate.cpp b/src/domain/UBGraphicsWidgetItemDelegate.cpp
index a17a72d7..9d250038 100644
--- a/src/domain/UBGraphicsWidgetItemDelegate.cpp
+++ b/src/domain/UBGraphicsWidgetItemDelegate.cpp
@@ -55,7 +55,7 @@ void UBGraphicsWidgetItemDelegate::updateMenuActionState()
     UBGraphicsItemDelegate::updateMenuActionState();
 
     if (freezeAction)
-        freezeAction->setChecked(delegated()->widgetWebView()->isFrozen());
+        freezeAction->setChecked(delegated()->isFrozen());
 }
 
 void UBGraphicsWidgetItemDelegate::decorateMenu(QMenu* menu)
@@ -71,7 +71,7 @@ void UBGraphicsWidgetItemDelegate::decorateMenu(QMenu* menu)
 
     freezeAction->setCheckable(true);
 
-    if (delegated()->widgetWebView()->canBeTool())
+    if (delegated()->canBeTool())
     {
         setAsToolAction = mMenu->addAction(tr("Transform as Tool "), this, SLOT(pin()));
         QIcon pinIcon;
@@ -86,11 +86,11 @@ void UBGraphicsWidgetItemDelegate::freeze(bool frozen)
 {
     if(frozen)
     {
-       delegated()->widgetWebView()->freeze();
+       delegated()->freeze();
     }
     else
     {
-       delegated()->widgetWebView()->unFreeze();
+       delegated()->unFreeze();
     }
 }
 
diff --git a/src/domain/UBW3CWidget.cpp b/src/domain/UBW3CWidget.cpp
deleted file mode 100644
index 594b2fac..00000000
--- a/src/domain/UBW3CWidget.cpp
+++ /dev/null
@@ -1,525 +0,0 @@
-/*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "UBW3CWidget.h"
-
-#include <QtNetwork>
-#include <QtXml>
-
-#include "frameworks/UBPlatformUtils.h"
-#include "frameworks/UBFileSystemUtils.h"
-
-#include "core/UBApplication.h"
-#include "core/UBSettings.h"
-#include "api/UBWidgetUniboardAPI.h"
-
-#include "board/UBBoardController.h"
-
-#include "core/memcheck.h"
-
-
-bool UBW3CWidget::sTemplateLoaded = false;
-QMap<QString, QString> UBW3CWidget::sNPAPIWrapperTemplates;
-QString UBW3CWidget::sNPAPIWrappperConfigTemplate;
-
-
-UBW3CWidget::UBW3CWidget(const QUrl& pWidgetUrl, QWidget *parent)
-    : UBAbstractWidget(pWidgetUrl, parent)
-
-{
-    QString path = pWidgetUrl.toLocalFile();
-    QDir potentialDir(path);
-
-    if (!path.endsWith(".wgt") && !path.endsWith(".wgt/") && !potentialDir.exists())
-    {
-        int lastSlashIndex = path.lastIndexOf("/");
-        if (lastSlashIndex > 0)
-        {
-            path = path.mid(0, lastSlashIndex + 1);
-        }
-    }
-
-    if(!path.endsWith("/"))
-        path += "/";
-
-    int width = 300;
-    int height = 150;
-
-    QFile configFile(path + "config.xml");
-    configFile.open(QFile::ReadOnly);
-
-    QDomDocument doc;
-    doc.setContent(configFile.readAll());
-    QDomNodeList widgetDomList = doc.elementsByTagName("widget");
-
-    if (widgetDomList.count() > 0)
-    {
-        QDomElement widgetElement = widgetDomList.item(0).toElement();
-
-        width = widgetElement.attribute("width", "300").toInt();
-        height = widgetElement.attribute("height", "150").toInt();
-
-        mMetadatas.id = widgetElement.attribute("id", "");
-
-        //some early widget (<= 4.3.4) where using identifier instead of id
-        if (mMetadatas.id.length() == 0)
-             mMetadatas.id = widgetElement.attribute("identifier", "");
-
-        mMetadatas.version = widgetElement.attribute("version", "");
-
-        // TODO UB 4.x map properly ub namespace
-        mIsResizable = widgetElement.attribute("ub:resizable", "false") == "true";
-        mIsFreezable = widgetElement.attribute("ub:freezable", "true") == "true";
-
-        QString roles = widgetElement.attribute("ub:roles", "content tool").trimmed().toLower();
-
-        //------------------------------//
-
-        if( roles == "" || roles.contains("tool") )
-        {
-            mCanBeTool = UBAbstractWidget::type_ALL;
-        }
-
-        if( roles.contains("twin") )
-        {
-            mCanBeTool |= UBAbstractWidget::type_WIN;
-        }
-
-        if( roles.contains("tmac") )
-        {
-            mCanBeTool |= UBAbstractWidget::type_MAC;
-        }
-        
-        if( roles.contains("tunix") )
-        {
-            mCanBeTool |= UBAbstractWidget::type_UNIX;
-        }
-
-        //---------//
-
-        if( roles == "" || roles.contains("content") )
-        {
-            mCanBeContent = UBAbstractWidget::type_ALL;
-        }
-
-        if( roles.contains("cwin") )
-        {
-            mCanBeContent |= UBAbstractWidget::type_WIN;
-        }
-
-        if( roles.contains("cmac") )
-        {
-            mCanBeContent |= UBAbstractWidget::type_MAC;
-        }
-
-        if( roles.contains("cunix") )
-        {
-            mCanBeContent |= UBAbstractWidget::type_UNIX;
-        }
-
-        //------------------------------//
-
-        QDomNodeList contentDomList = widgetElement.elementsByTagName("content");
-
-        if (contentDomList.count() > 0)
-        {
-            QDomElement contentElement = contentDomList.item(0).toElement();
-
-            mMainHtmlFileName = contentElement.attribute("src", "");
-        }
-
-        mMetadatas.name = textForSubElementByLocale(widgetElement, "name", locale());
-        mMetadatas.description = textForSubElementByLocale(widgetElement, "description ", locale());
-
-        QDomNodeList authorDomList = widgetElement.elementsByTagName("author");
-
-        if (authorDomList.count() > 0)
-        {
-            QDomElement authorElement = authorDomList.item(0).toElement();
-
-            mMetadatas.author = authorElement.text();
-            mMetadatas.authorHref = authorElement.attribute("href", "");
-            mMetadatas.authorEmail = authorElement.attribute("email ", "");
-        }
-
-        QDomNodeList propertiesDomList = widgetElement.elementsByTagName("preference");
-
-        for (uint i = 0; i < propertiesDomList.length(); i++)
-        {
-            QDomElement preferenceElement = propertiesDomList.at(i).toElement();
-            QString prefName = preferenceElement.attribute("name", "");
-
-            if (prefName.length() > 0)
-            {
-                QString prefValue = preferenceElement.attribute("value", "");
-                bool readOnly = (preferenceElement.attribute("readonly", "false") == "true");
-
-                mPreferences.insert(prefName, PreferenceValue(prefValue, readOnly));
-            }
-        }
-    }
-
-    if (mMainHtmlFileName.length() == 0)
-    {
-        QFile defaultStartFile(path + "index.htm");
-
-        if (defaultStartFile.exists())
-        {
-            mMainHtmlFileName = "index.htm";
-        }
-        else
-        {
-            QFile secondDefaultStartFile(path + "index.html");
-
-            if (secondDefaultStartFile.exists())
-            {
-                mMainHtmlFileName = "index.html";
-            }
-        }
-    }
-
-    mMainHtmlUrl = pWidgetUrl;
-    mMainHtmlUrl.setPath(pWidgetUrl.path() + "/" + mMainHtmlFileName);
-    // is it a valid local file ?
-    QFile f(mMainHtmlUrl.toLocalFile());
-
-    if(!f.exists())
-        mMainHtmlUrl = QUrl(mMainHtmlFileName);
-
-    connect(page()->mainFrame(), SIGNAL(javaScriptWindowObjectCleared()), this, SLOT(javaScriptWindowObjectCleared()));
-    connect(UBApplication::boardController, SIGNAL(activeSceneChanged()), this, SLOT(javaScriptWindowObjectCleared()));
-
-    QWebView::load(mMainHtmlUrl);
-
-    setFixedSize(QSize(width, height));
-
-    mNominalSize = QSize(width, height);
-}
-
-UBW3CWidget::~UBW3CWidget()
-{
-    // NOOP
-}
-
-void UBW3CWidget::javaScriptWindowObjectCleared()
-{
-    UBWidgetUniboardAPI *uniboardAPI = new UBWidgetUniboardAPI(UBApplication::boardController->activeScene(), 0);
-
-    page()->mainFrame()->addToJavaScriptWindowObject("sankore", uniboardAPI);
-
-}
-
-bool UBW3CWidget::hasNPAPIWrapper(const QString& pMimeType)
-{
-    loadNPAPIWrappersTemplates();
-
-    return sNPAPIWrapperTemplates.contains(pMimeType);
-}
-
-
-QString UBW3CWidget::createNPAPIWrapper(const QString& url,
-        const QString& pMimeType, const QSize& sizeHint, const QString& pName)
-{
-    const QString userWidgetPath = UBSettings::settings()->userInteractiveDirectory() + "/" + tr("Web");
-    QDir userWidgetDir(userWidgetPath);
-
-    return createNPAPIWrapperInDir(url, userWidgetDir, pMimeType, sizeHint, pName);
-}
-
-
-
-QString UBW3CWidget::createNPAPIWrapperInDir(const QString& pUrl, const QDir& pDir,
-    const QString& pMimeType, const QSize& sizeHint,
-    const QString& pName)
-{
-    QString url = pUrl;
-    url = UBFileSystemUtils::removeLocalFilePrefix(url);
-    QString name = pName;
-
-    QFileInfo fi(url);
-
-    if (name.length() == 0)
-        name = fi.baseName();
-
-    if (fi.exists()){
-        url = fi.fileName();
-    }
-
-    loadNPAPIWrappersTemplates();
-
-    QString htmlTemplate;
-
-    if (pMimeType.length() > 0 && sNPAPIWrapperTemplates.contains(pMimeType)){
-        htmlTemplate = sNPAPIWrapperTemplates.value(pMimeType);
-    }
-    else {
-        QString extension = UBFileSystemUtils::extension(url);
-
-        if (sNPAPIWrapperTemplates.contains(extension))
-            htmlTemplate = sNPAPIWrapperTemplates.value(extension);
-    }
-
-    if (htmlTemplate.length() > 0){
-        htmlTemplate = htmlTemplate.replace(QString("{in.url}"), url)
-            .replace(QString("{in.width}"), QString("%1").arg(sizeHint.width()))
-            .replace(QString("{in.height}"), QString("%1").arg(sizeHint.height()));
-
-        QString configTemplate = sNPAPIWrappperConfigTemplate
-            .replace(QString("{in.id}"), url)
-            .replace(QString("{in.width}"), QString("%1").arg(sizeHint.width()))
-            .replace(QString("{in.height}"), QString("%1").arg(sizeHint.height()))
-            .replace(QString("{in.name}"), name)
-            .replace(QString("{in.startFile}"), QString("index.htm"));
-
-        QString dirPath = pDir.path();
-        if (!pDir.exists())
-            pDir.mkpath(dirPath);
-
-        QString widgetLibraryPath = dirPath + "/" + name + ".wgt";
-        QDir widgetLibraryDir(widgetLibraryPath);
-
-        if (widgetLibraryDir.exists())
-        {
-            if (!UBFileSystemUtils::deleteDir(widgetLibraryDir.path()))
-            {
-                qWarning() << "Cannot delete old widget " << widgetLibraryDir.path();
-            }
-        }
-
-        widgetLibraryDir.mkpath(widgetLibraryPath);
-        if (fi.exists()){
-            QString target = widgetLibraryPath + "/" + fi.fileName();
-            QString source = pUrl;
-            source = UBFileSystemUtils::removeLocalFilePrefix(source);
-            QFile::copy(source, target);
-        }
-
-        QFile configFile(widgetLibraryPath + "/config.xml");
-
-        if (!configFile.open(QIODevice::WriteOnly))
-        {
-            qWarning() << "Cannot open file " << configFile.fileName();
-            return "";
-        }
-
-        QTextStream outConfig(&configFile);
-        outConfig.setCodec("UTF-8");
-
-        outConfig << configTemplate;
-        configFile.close();
-
-        QFile indexFile(widgetLibraryPath + "/index.htm");
-
-        if (!indexFile.open(QIODevice::WriteOnly))
-        {
-            qWarning() << "Cannot open file " << indexFile.fileName();
-            return "";
-        }
-
-        QTextStream outIndex(&indexFile);
-        outIndex.setCodec("UTF-8");
-
-        outIndex << htmlTemplate;
-        indexFile.close();
-
-        return widgetLibraryPath;
-    }
-    else
-    {
-        return "";
-    }
-}
-
-
-QString UBW3CWidget::createHtmlWrapperInDir(const QString& html, const QDir& pDir,
-    const QSize& sizeHint, const QString& pName)
-{
-
-    QString widgetPath = pDir.path() + "/" + pName + ".wgt";
-    widgetPath = UBFileSystemUtils::nextAvailableFileName(widgetPath);
-    QDir widgetDir(widgetPath);
-
-    if (!widgetDir.exists())
-    {
-        widgetDir.mkpath(widgetDir.path());
-    }
-
-    QFile configFile(widgetPath + "/" + "config.xml");
-
-    if (configFile.exists())
-    {
-        configFile.remove(configFile.fileName());
-    }
-
-    if (!configFile.open(QIODevice::WriteOnly))
-    {
-        qWarning() << "Cannot open file " << configFile.fileName();
-        return "";
-    }
-
-    QTextStream outConfig(&configFile);
-    outConfig.setCodec("UTF-8");
-    outConfig << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << endl;
-    outConfig << "<widget xmlns=\"http://www.w3.org/ns/widgets\"" << endl;
-    outConfig << "    xmlns:ub=\"http://uniboard.mnemis.com/widgets\"" << endl;
-    outConfig << "    id=\"http://uniboard.mnemis.com/" << pName << "\"" <<endl;
-
-    outConfig << "    version=\"1.0\"" << endl;
-    outConfig << "    width=\"" << sizeHint.width() << "\"" << endl;
-    outConfig << "    height=\"" << sizeHint.height() << "\"" << endl;
-    outConfig << "    ub:resizable=\"true\">" << endl;
-
-    outConfig << "  <name>" << pName << "</name>" << endl;
-    outConfig << "  <content src=\"" << pName << ".html\"/>" << endl;
-
-    outConfig << "</widget>" << endl;
-
-    configFile.close();
-
-    const QString fullHtmlFileName = widgetPath + "/" + pName + ".html";
-
-    QFile widgetHtmlFile(fullHtmlFileName);
-    if (widgetHtmlFile.exists())
-    {
-        widgetHtmlFile.remove(widgetHtmlFile.fileName());
-    }
-    if (!widgetHtmlFile.open(QIODevice::WriteOnly))
-    {
-        qWarning() << "cannot open file " << widgetHtmlFile.fileName();
-        return "";
-    }
-
-    QTextStream outStartFile(&widgetHtmlFile);
-    outStartFile.setCodec("UTF-8");
-
-    outStartFile << "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http://www.w3.org/TR/html4/strict.dtd\">" << endl;
-    outStartFile << "<html>" << endl;
-    outStartFile << "<head>" << endl;
-    outStartFile << "    <meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\">" << endl;
-    outStartFile << "</head>" << endl;
-    outStartFile << "  <body>" << endl;
-    outStartFile << html << endl;
-    outStartFile << "  </body>" << endl;
-    outStartFile << "</html>" << endl;
-
-    widgetHtmlFile.close();
-
-    return widgetPath;
-
-}
-
-QString UBW3CWidget::freezedWidgetPage()
-{
-    static QString defaultcontent;
-
-    if (defaultcontent.isNull()) {
-        QString freezedWidgetDefaultContentFilePath = freezedWidgetFilePath();
-        QFile wrapperFile(freezedWidgetDefaultContentFilePath);
-        if (!wrapperFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
-            qDebug() << "can't open wrapper file " + freezedWidgetDefaultContentFilePath;
-            defaultcontent = "";
-        } else {
-            QByteArray arr = wrapperFile.readAll();
-            if (!arr.isEmpty()) {
-                defaultcontent = QString(arr);
-            } else {
-                qDebug() << "content of " + freezedWidgetDefaultContentFilePath + "is empty";
-                defaultcontent = "";
-            }
-        }
-    }
-
-    return defaultcontent;
-}
-
-QString UBW3CWidget::freezedWidgetFilePath()
-{
-    return UBPlatformUtils::applicationResourcesDirectory() + "/etc/" + "freezedWidgetWrapper.html";
-}
-
-void UBW3CWidget::loadNPAPIWrappersTemplates()
-{
-    if (!sTemplateLoaded)
-    {
-        sNPAPIWrapperTemplates.clear();
-
-        QString etcPath = UBPlatformUtils::applicationResourcesDirectory() + "/etc/";
-
-        QDir etcDir(etcPath);
-
-        foreach(QString fileName, etcDir.entryList())
-        {
-            if (fileName.startsWith("npapi-wrapper") && (fileName.endsWith(".htm") || fileName.endsWith(".html")))
-            {
-
-                QString htmlContent = UBFileSystemUtils::readTextFile(etcPath + fileName);
-
-                if (htmlContent.length() > 0)
-                {
-                    QStringList tokens = fileName.split(".");
-
-                    if (tokens.length() >= 4)
-                    {
-                        QString mime = tokens.at(tokens.length() - 4 );
-                        mime += "/" + tokens.at(tokens.length() - 3);
-
-                        QString fileExtension = tokens.at(tokens.length() - 2);
-
-                        sNPAPIWrapperTemplates.insert(mime, htmlContent);
-                        sNPAPIWrapperTemplates.insert(fileExtension, htmlContent);
-                    }
-                }
-            }
-        }
-
-        sNPAPIWrappperConfigTemplate = UBFileSystemUtils::readTextFile(etcPath + "npapi-wrapper.config.xml");
-
-        sTemplateLoaded = true;
-    }
-}
-
-
-QString UBW3CWidget::textForSubElementByLocale(QDomElement rootElement, QString subTagName, QLocale locale)
-{
-    QDomNodeList subList = rootElement.elementsByTagName(subTagName);
-
-    QString lang = locale.name();
-
-    if (lang.length() > 2)
-        lang[2] = QLatin1Char('-');
-
-    if (subList.count() > 1)
-    {
-        for(int i = 0; i < subList.count(); i++)
-        {
-            QDomNode node = subList.at(i);
-            QDomElement element = node.toElement();
-
-            QString configLang = element.attribute("xml:lang", "");
-
-            if(lang == configLang || (configLang.length() == 2 && configLang == lang.left(2)))
-                 return element.text();
-        }
-    }
-
-    if (subList.count() >= 1)
-    {
-        QDomElement element = subList.item(0).toElement();
-        return element.text();
-    }
-
-    return "";
-}
-
diff --git a/src/domain/UBW3CWidget.h b/src/domain/UBW3CWidget.h
deleted file mode 100644
index 081fe612..00000000
--- a/src/domain/UBW3CWidget.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef UBW3CWIDGET_H_
-#define UBW3CWIDGET_H_
-
-#include <QtGui>
-#include <QtWebKit>
-#include <QtXml>
-
-/*
- * wrapper for w3c widget 1.0 as define in http://www.w3.org/TR/widgets/
- */
-
-#include "UBAbstractWidget.h"
-
-class UBItem;
-
-class UBW3CWidget : public UBAbstractWidget
-{
-        Q_OBJECT;
-
-    public:
-        UBW3CWidget(const QUrl& pWidgetUrl, QWidget *parent = 0);
-
-        virtual ~UBW3CWidget();
-
-        static QString createNPAPIWrapper(const QString& url,
-            const QString& pMimeType = QString(), const QSize& sizeHint = QSize(300, 150),
-            const QString& pName = QString());
-
-        static QString createNPAPIWrapperInDir(const QString& url, const QDir& pDir,
-            const QString& pMimeType = QString(), const QSize& sizeHint = QSize(300, 150),
-            const QString& pName = QString());
-
-        static QString createHtmlWrapperInDir(const QString& html, const QDir& pDir,
-            const QSize& sizeHint,  const QString& pName);
-
-        static QString freezedWidgetPage();
-
-        static QString freezedWidgetFilePath();
-
-        static bool hasNPAPIWrapper(const QString& pMimeType);
-
-        class PreferenceValue
-        {
-            public:
-
-                PreferenceValue()
-                {
-                    // NOOP
-                }
-                
-
-                PreferenceValue(const QString& pValue, bool pReadonly)
-                {
-                    value = pValue;
-                    readonly = pReadonly;
-                }
-
-                QString value;
-                bool readonly;
-         };
-
-        class Metadata
-        {
-            public:
-                QString id;
-                QString name;
-                QString description;
-                QString author;
-                QString authorEmail;
-                QString authorHref;
-                QString version;
-        };
-
-
-        QMap<QString, PreferenceValue> preferences()
-        {
-            return mPreferences;
-        }
-
-        Metadata metadatas() const
-        {
-            return mMetadatas;
-        }
-
-    private:
-
-        QMap<QString, PreferenceValue> mPreferences;
-
-        static bool sTemplateLoaded;
-
-        static QMap<QString, QString> sNPAPIWrapperTemplates;
-
-        static QString sNPAPIWrappperConfigTemplate;
-
-        static void loadNPAPIWrappersTemplates();
-
-        static QString textForSubElementByLocale(QDomElement rootElement, QString subTagName, QLocale locale);
-
-        // w3c metadata widget attributes
-        //
-        // http://www.w3.org/TR/widgets/#widget0
-
-        Metadata mMetadatas;
-
-    private slots:
-
-        void javaScriptWindowObjectCleared();
-
-};
-
-#endif /* UBW3CWIDGET_H_ */
diff --git a/src/domain/domain.pri b/src/domain/domain.pri
index 96dbe679..fb6cd717 100644
--- a/src/domain/domain.pri
+++ b/src/domain/domain.pri
@@ -7,26 +7,24 @@ HEADERS      += src/domain/UBGraphicsScene.h \
                 src/domain/UBDocumentUndoCommand.h \
                 src/domain/UBPageSizeUndoCommand.h \
                 src/domain/UBGraphicsProxyWidget.h \
+                src/domain/UBGraphicsWebView.h \
                 src/domain/UBGraphicsSvgItem.h \
                 src/domain/UBGraphicsPolygonItem.h \
                 src/domain/UBItem.h \
                 src/domain/UBGraphicsWidgetItem.h \
-                src/domain/UBAppleWidget.h \
                 src/domain/UBGraphicsPDFItem.h \
                 src/domain/UBGraphicsTextItem.h \
-                src/domain/UBAbstractWidget.h \
-                src/domain/UBW3CWidget.h \
                 src/domain/UBResizableGraphicsItem.h \
                 src/domain/UBGraphicsStroke.h \
-    src/domain/UBGraphicsMediaItem.h \
-    src/domain/UBAbstractUndoCommand.h\
-    src/domain/UBAngleWidget.h \
-    src/domain/UBGraphicsGroupContainerItem.h \
-    src/domain/UBGraphicsGroupContainerItemDelegate.h \
-    src/domain/UBGraphicsStrokesGroup.h
+                src/domain/UBGraphicsMediaItem.h \
+                src/domain/UBAbstractUndoCommand.h\
+                src/domain/UBAngleWidget.h \
+                src/domain/UBGraphicsGroupContainerItem.h \
+                src/domain/UBGraphicsGroupContainerItemDelegate.h \
+                src/domain/UBGraphicsStrokesGroup.h
                 
 HEADERS      += src/domain/UBGraphicsItemDelegate.h \
-				src/domain/UBGraphicsTextItemDelegate.h \
+                src/domain/UBGraphicsTextItemDelegate.h \
                 src/domain/UBGraphicsDelegateFrame.h \
                 src/domain/UBGraphicsWidgetItemDelegate.h \
                 src/domain/UBGraphicsMediaItemDelegate.h
@@ -40,27 +38,25 @@ SOURCES      += src/domain/UBGraphicsScene.cpp \
                 src/domain/UBDocumentUndoCommand.cpp \
                 src/domain/UBPageSizeUndoCommand.cpp \
                 src/domain/UBGraphicsProxyWidget.cpp \
+                src/domain/UBGraphicsWebView.cpp \
                 src/domain/UBGraphicsSvgItem.cpp \
                 src/domain/UBGraphicsPolygonItem.cpp \
                 src/domain/UBItem.cpp \
                 src/domain/UBGraphicsVideoItem.cpp \
                 src/domain/UBGraphicsWidgetItem.cpp \
-                src/domain/UBAppleWidget.cpp \
                 src/domain/UBGraphicsPDFItem.cpp \
                 src/domain/UBGraphicsTextItem.cpp \
-                src/domain/UBAbstractWidget.cpp \
-                src/domain/UBW3CWidget.cpp \
                 src/domain/UBResizableGraphicsItem.cpp \
                 src/domain/UBGraphicsStroke.cpp \
-    src/domain/UBGraphicsMediaItem.cpp \
-    src/domain/UBAbstractUndoCommand.cpp \
-    src/domain/UBAngleWidget.cpp \
-    src/domain/ubgraphicsgroupcontaineritem.cpp \
-    src/domain/ubgraphicsgroupcontaineritemdelegate.cpp \
-    src/domain/UBGraphicsStrokesGroup.cpp
+                src/domain/UBGraphicsMediaItem.cpp \
+                src/domain/UBAbstractUndoCommand.cpp \
+                src/domain/UBAngleWidget.cpp \
+                src/domain/ubgraphicsgroupcontaineritem.cpp \
+                src/domain/ubgraphicsgroupcontaineritemdelegate.cpp \
+                src/domain/UBGraphicsStrokesGroup.cpp
                 
 SOURCES      += src/domain/UBGraphicsItemDelegate.cpp \
-			src/domain/UBGraphicsTextItemDelegate.cpp \
+                src/domain/UBGraphicsTextItemDelegate.cpp \
                 src/domain/UBGraphicsMediaItemDelegate.cpp \
                 src/domain/UBGraphicsDelegateFrame.cpp \
                 src/domain/UBGraphicsWidgetItemDelegate.cpp \
diff --git a/src/frameworks/UBCoreGraphicsScene.cpp b/src/frameworks/UBCoreGraphicsScene.cpp
index 00c77ebb..fd4948ec 100644
--- a/src/frameworks/UBCoreGraphicsScene.cpp
+++ b/src/frameworks/UBCoreGraphicsScene.cpp
@@ -32,7 +32,7 @@ UBCoreGraphicsScene::~UBCoreGraphicsScene()
     //we must delete removed items that are no more in any scene
     foreach (const QGraphicsItem* item, mItemsToDelete)
     {
-        if (item->scene()==NULL || item->scene() == this)
+        if (item->scene() == NULL || item->scene() == this)
         {
             delete item;
         }
@@ -61,6 +61,7 @@ void UBCoreGraphicsScene::removeItem(QGraphicsItem* item, bool forceDelete)
     {
         mItemsToDelete.remove(item);
         delete item;
+        item = 0;
     }
 }
 
@@ -84,6 +85,7 @@ bool UBCoreGraphicsScene::deleteItem(QGraphicsItem* item)
 
         mItemsToDelete.remove(item);
         delete item;
+        item = 0;
         return true;
     }
     else
diff --git a/src/gui/UBFavoriteToolPalette.cpp b/src/gui/UBFavoriteToolPalette.cpp
index ad734942..c67163a7 100644
--- a/src/gui/UBFavoriteToolPalette.cpp
+++ b/src/gui/UBFavoriteToolPalette.cpp
@@ -18,11 +18,10 @@
 #include "core/UBSettings.h"
 
 #include "board/UBBoardController.h"
+#include "domain/UBGraphicsWidgetItem.h"
 
 #include "tools/UBToolsManager.h"
 
-#include "domain/UBAbstractWidget.h"
-
 #include "gui/UBMainWindow.h"
 
 #include "core/memcheck.h"
@@ -67,9 +66,9 @@ UBFavoriteToolPalette::UBFavoriteToolPalette(QWidget* parent)
 
     foreach(QString widgetPath, appPathes)
     {
-        QAction *action = new QAction(UBAbstractWidget::widgetName(QUrl::fromLocalFile(widgetPath)), this);
+        QAction *action = new QAction(UBGraphicsWidgetItem::widgetName(QUrl::fromLocalFile(widgetPath)), this);
         action->setData(QUrl::fromLocalFile(widgetPath));
-        action->setIcon(QIcon(UBAbstractWidget::iconFilePath(QUrl::fromLocalFile(widgetPath))));
+        action->setIcon(QIcon(UBGraphicsWidgetItem::iconFilePath(QUrl::fromLocalFile(widgetPath))));
         connect(action, SIGNAL(triggered()), this, SLOT(addFavorite()));
 
         toolsActions << action;
diff --git a/src/gui/UBFeaturesActionBar.cpp b/src/gui/UBFeaturesActionBar.cpp
index 80341927..65ee920f 100644
--- a/src/gui/UBFeaturesActionBar.cpp
+++ b/src/gui/UBFeaturesActionBar.cpp
@@ -209,6 +209,16 @@ void UBFeaturesActionBar::onActionRescanModel()
     emit rescanModel();
 }
 
+void UBFeaturesActionBar::lockIt()
+{
+    setEnabled(false);
+}
+
+void UBFeaturesActionBar::unlockIt()
+{
+    setEnabled(true);
+}
+
 void UBFeaturesActionBar::dragEnterEvent( QDragEnterEvent *event )
 {
     const UBFeaturesMimeData *fMimeData = qobject_cast<const UBFeaturesMimeData*>(event->mimeData());
diff --git a/src/gui/UBFeaturesActionBar.h b/src/gui/UBFeaturesActionBar.h
index 71b6fdc0..b3a406e6 100644
--- a/src/gui/UBFeaturesActionBar.h
+++ b/src/gui/UBFeaturesActionBar.h
@@ -45,6 +45,8 @@ private slots:
     void onActionRemoveFavorite();
     void onActionTrash();
     void onActionRescanModel();
+    void lockIt();
+    void unlockIt();
 
 protected:
     void dragEnterEvent( QDragEnterEvent *event );
diff --git a/src/gui/UBFeaturesWidget.cpp b/src/gui/UBFeaturesWidget.cpp
index 20393c75..7476c8bc 100644
--- a/src/gui/UBFeaturesWidget.cpp
+++ b/src/gui/UBFeaturesWidget.cpp
@@ -1,7 +1,5 @@
 #include <QDomDocument>
-
 #include "UBFeaturesWidget.h"
-#include "domain/UBAbstractWidget.h"
 #include "gui/UBThumbnailWidget.h"
 #include "frameworks/UBFileSystemUtils.h"
 #include "core/UBApplication.h"
@@ -61,6 +59,7 @@ UBFeaturesWidget::UBFeaturesWidget(QWidget *parent, const char *name)
     layout->addWidget(mActionBar);
 
     connect(centralWidget->listView(), SIGNAL(clicked(const QModelIndex &)), this, SLOT(currentSelected(const QModelIndex &)));
+    connect(this, SIGNAL(sendFileNameList(QStringList)), centralWidget, SIGNAL(sendFileNameList(QStringList)));
     connect(mActionBar, SIGNAL(searchElement(const QString &)), this, SLOT( searchStarted(const QString &)));
     connect(mActionBar, SIGNAL(newFolderToCreate()), this, SLOT(createNewFolder()));
     connect(mActionBar, SIGNAL(deleteElements(const UBFeaturesMimeData *)), this, SLOT(deleteElements(const UBFeaturesMimeData *)));
@@ -79,6 +78,8 @@ UBFeaturesWidget::UBFeaturesWidget(QWidget *parent, const char *name)
     connect(centralWidget, SIGNAL(createNewFolderSignal(QString)), controller, SLOT(addNewFolder(QString)));
     connect(controller, SIGNAL(scanStarted()), centralWidget, SLOT(scanStarted()));
     connect(controller, SIGNAL(scanFinished()), centralWidget, SLOT(scanFinished()));
+    connect(controller, SIGNAL(scanStarted()), mActionBar, SLOT(lockIt()));
+    connect(controller, SIGNAL(scanFinished()), mActionBar, SLOT(unlockIt()));
     connect(controller, SIGNAL(maxFilesCountEvaluated(int)), centralWidget, SIGNAL(maxFilesCountEvaluated(int)));
     connect(controller, SIGNAL(featureAddedFromThread()), centralWidget, SLOT(increaseStatusBarValue()));
 }
@@ -145,6 +146,7 @@ void UBFeaturesWidget::currentSelected(const QModelIndex &current)
 void UBFeaturesWidget::createNewFolder()
 {
     centralWidget->showAdditionalData(UBFeaturesCentralWidget::NewFolderDialog, UBFeaturesCentralWidget::Modal);
+    emit sendFileNameList(controller->getFileNamesInFolders());
 }
 
 void UBFeaturesWidget::addFolder()
@@ -492,6 +494,7 @@ UBFeaturesCentralWidget::UBFeaturesCentralWidget(QWidget *parent) : QWidget(pare
 
     connect(dlg, SIGNAL(createNewFolder(QString)), this, SLOT(createNewFolderSlot(QString)));
     connect(dlg, SIGNAL(closeDialog()), this, SLOT(hideAdditionalData()));
+    connect(this, SIGNAL(sendFileNameList(QStringList)), dlg, SLOT(setFileNameList(QStringList)));
 
     //Progress bar to show scanning progress
     QProgressBar *progressBar = new QProgressBar();
@@ -604,8 +607,6 @@ void UBFeaturesCentralWidget::increaseStatusBarValue()
 
 UBFeaturesNewFolderDialog::UBFeaturesNewFolderDialog(QWidget *parent) : QWidget(parent)
 {
-//    SET_STYLE_SHEET()
-
     this->setStyleSheet("background:white;");
 
     QVBoxLayout *mainLayout = new QVBoxLayout();
@@ -616,14 +617,14 @@ UBFeaturesNewFolderDialog::UBFeaturesNewFolderDialog(QWidget *parent) : QWidget(
     QLabel *mLabel = new QLabel(labelText, this);
     mLineEdit = new QLineEdit(this);
 
-    //mValidator = new QRegExpValidator(QRegExp("[A-Za-z][1-9][0-9]{0,2}"), this);
-    //mLineEdit->setValidator(mValidator);
+    mValidator = new QRegExpValidator(QRegExp("[^\\/\\:\\?\\*\\|\\<\\>\\\"]{2,}"), this);
+    mLineEdit->setValidator(mValidator);
     labelLayout->addWidget(mLabel);
     labelLayout->addWidget(mLineEdit);
 
     QHBoxLayout *buttonLayout = new QHBoxLayout(this);
 
-    QPushButton *acceptButton = new QPushButton(acceptText, this);
+    acceptButton = new QPushButton(acceptText, this);
     QPushButton *cancelButton = new QPushButton(cancelText, this);
     buttonLayout->addWidget(acceptButton);
     buttonLayout->addWidget(cancelButton);
@@ -631,14 +632,23 @@ UBFeaturesNewFolderDialog::UBFeaturesNewFolderDialog(QWidget *parent) : QWidget(
     mainLayout->addLayout(labelLayout);
     mainLayout->addLayout(buttonLayout);
 
+    acceptButton->setEnabled(false);
+
     connect(acceptButton, SIGNAL(clicked()), this, SLOT(accept()));
     connect(cancelButton, SIGNAL(clicked()), this, SLOT(reject()));
+    connect(mLineEdit, SIGNAL(textEdited(QString)), this, SLOT(reactOnTextChanged(QString)));
+
+    reactOnTextChanged(QString());
 }
 
 void UBFeaturesNewFolderDialog::setRegexp(const QRegExp pRegExp)
 {
     mValidator->setRegExp(pRegExp);
 }
+bool UBFeaturesNewFolderDialog::validString(const QString &pStr)
+{
+    return mLineEdit->hasAcceptableInput() && !mFileNameList.contains(pStr, Qt::CaseSensitive);
+}
 
 void UBFeaturesNewFolderDialog::accept()
 {
@@ -651,6 +661,20 @@ void UBFeaturesNewFolderDialog::reject()
     mLineEdit->clear();
     emit closeDialog();
 }
+void UBFeaturesNewFolderDialog::setFileNameList(const QStringList &pLst)
+{
+    mFileNameList = pLst;
+}
+void UBFeaturesNewFolderDialog::reactOnTextChanged(const QString &pStr)
+{
+    if (validString(pStr)) {
+        acceptButton->setEnabled(true);
+        mLineEdit->setStyleSheet("background:white;");
+    } else {
+        acceptButton->setEnabled(false);
+        mLineEdit->setStyleSheet("background:#FFB3C8;");
+    }
+}
 
 UBFeaturesWebView::UBFeaturesWebView(QWidget* parent, const char* name):QWidget(parent)
     , mpView(NULL)
diff --git a/src/gui/UBFeaturesWidget.h b/src/gui/UBFeaturesWidget.h
index 0f3f21c2..788de51b 100644
--- a/src/gui/UBFeaturesWidget.h
+++ b/src/gui/UBFeaturesWidget.h
@@ -72,6 +72,9 @@ public:
     int scrollbarHorisontalPadding() const { return 10;}
     int scrollbarVerticalIndent() const { return 0;}
 
+signals:
+    void sendFileNameList(const QStringList lst);
+
 private slots:
     void onPreviewLoaded(int id, bool pSuccess, QUrl sourceUrl, QString pContentTypeHeader, QByteArray pData, QPointF pPos, QSize pSize, bool isBackground);
     void currentSelected( const QModelIndex & );
@@ -190,7 +193,6 @@ public:
 
     void setLockedExcludingAdditional(bool pLock);
 
-
     QStackedWidget *mStackedWidget;
         UBFeaturesNavigatorWidget *mNavigator;
         UBFeatureProperties *mFeatureProperties;
@@ -201,6 +203,7 @@ public:
 signals:
     void lockMainWidget(bool pLock);
     void createNewFolderSignal(QString pStr);
+    void sendFileNameList(const QStringList lst);
 
 //    progressbar widget related signals
     void maxFilesCountEvaluated(int pValue);
@@ -228,6 +231,7 @@ public:
 
     UBFeaturesNewFolderDialog(QWidget *parent = 0);
     void setRegexp(const QRegExp pRegExp);
+    bool validString(const QString &pStr);
 
 signals:
     void createNewFolder(QString str);
@@ -236,10 +240,15 @@ signals:
 private slots:
     void accept();
     void reject();
+    void setFileNameList(const QStringList &pLst);
+    void reactOnTextChanged(const QString &pStr);
+
 
 private:
     QLineEdit *mLineEdit;
     QRegExpValidator *mValidator;
+    QStringList mFileNameList;
+    QPushButton *acceptButton;
 
 };
 
diff --git a/src/gui/UBKeyboardPalette.cpp b/src/gui/UBKeyboardPalette.cpp
index 846d9d89..3f1fe242 100644
--- a/src/gui/UBKeyboardPalette.cpp
+++ b/src/gui/UBKeyboardPalette.cpp
@@ -243,6 +243,8 @@ void UBKeyboardPalette::adjustSizeAndPosition(bool pUp)
 
 void  UBKeyboardPalette::paintEvent( QPaintEvent* event)
 {
+    checkLayout();
+
     UBActionPalette::paintEvent(event);
 
     QRect r = this->geometry();
diff --git a/src/gui/UBKeyboardPalette.h b/src/gui/UBKeyboardPalette.h
index 3b717fc8..8cee0686 100644
--- a/src/gui/UBKeyboardPalette.h
+++ b/src/gui/UBKeyboardPalette.h
@@ -127,6 +127,7 @@ protected:
 
     void init();
 
+
 private:
 
     QRect originalRect;
@@ -134,6 +135,11 @@ private:
     UBKeyButton** buttons;
     UBKeyboardButton** ctrlButtons;
 
+    /*
+      For MacOS: synchronization with system locale.
+    */
+    void checkLayout();
+
     void createCtrlButtons();
 
     void setInput(const UBKeyboardLocale* locale);
@@ -145,10 +151,6 @@ private:
     void* storage;
     // Linux-related parameters
     int min_keycodes, max_keycodes, byte_per_code;
-
-    // Save locale before activation to restore it after (MAC)
-    QString activeLocale;
-
 };
 
 class UBKeyboardButton : public QWidget
diff --git a/src/gui/UBKeyboardPalette_linux.cpp b/src/gui/UBKeyboardPalette_linux.cpp
index 1b216e9e..317a2b91 100644
--- a/src/gui/UBKeyboardPalette_linux.cpp
+++ b/src/gui/UBKeyboardPalette_linux.cpp
@@ -164,6 +164,9 @@ void UBKeyboardPalette::createCtrlButtons()
 }
 
 
+void UBKeyboardPalette::checkLayout()
+{}
+
 void UBKeyboardPalette::onActivated(bool activated)
 {
     if (activated)
diff --git a/src/gui/UBKeyboardPalette_mac.cpp b/src/gui/UBKeyboardPalette_mac.cpp
index 3b91d782..3b179c36 100644
--- a/src/gui/UBKeyboardPalette_mac.cpp
+++ b/src/gui/UBKeyboardPalette_mac.cpp
@@ -74,32 +74,35 @@ void SetMacLocaleByIdentifier(const QString& id)
 	}
 }
 
-void UBKeyboardPalette::onActivated(bool activated)
+
+void UBKeyboardPalette::checkLayout()
 {
-	if (activated)
-	{
-		TISInputSourceRef selectedLocale = TISCopyCurrentKeyboardInputSource();
-
-		CFStringRef sr = (CFStringRef) TISGetInputSourceProperty(selectedLocale,
-															  kTISPropertyInputSourceID);  
-
-		if (sr!=NULL)
-		{
-			char tmp[1024];
-			CFStringGetCString(sr, tmp, 1024, 0);
-			activeLocale = tmp;	
-		}
-		else
-			activeLocale = "";
-	
+    TISInputSourceRef selectedLocale = TISCopyCurrentKeyboardInputSource();
 
-	    onLocaleChanged(locales[nCurrentLocale]);
-	}
-	else
-	{
-		if (activeLocale != "")
-			SetMacLocaleByIdentifier(activeLocale);
-	}
+    CFStringRef sr = (CFStringRef) TISGetInputSourceProperty(selectedLocale,
+                                                          kTISPropertyInputSourceID);
+
+    if (sr!=NULL)
+    {
+        char clId[1024];
+        CFStringGetCString(sr, clId, 1024, 0);
+
+        for(int i=0; i<nLocalesCount;i++)
+        {
+            if (locales[i]->id == clId)
+            {
+                if (nCurrentLocale!=i)
+                {
+                    setLocale(i);
+                }
+                break;
+            }
+        }
+    }
+}
+
+void UBKeyboardPalette::onActivated(bool)
+{
 }
 
 void UBKeyboardPalette::onLocaleChanged(UBKeyboardLocale* locale)
diff --git a/src/gui/UBKeyboardPalette_win.cpp b/src/gui/UBKeyboardPalette_win.cpp
index 495175c8..cee91e92 100644
--- a/src/gui/UBKeyboardPalette_win.cpp
+++ b/src/gui/UBKeyboardPalette_win.cpp
@@ -64,9 +64,12 @@ void UBKeyboardPalette::createCtrlButtons()
     ctrlButtons[ctrlID++] = new UBLocaleButton(this);                  // Language Switch 
 }
 
+void UBKeyboardPalette::checkLayout()
+{}
+
 void UBKeyboardPalette::onActivated(bool)
-{
-}
+{}
+
 void UBKeyboardPalette::onLocaleChanged(UBKeyboardLocale* )
 {}
 
diff --git a/src/gui/UBTeacherGuideWidgetsTools.cpp b/src/gui/UBTeacherGuideWidgetsTools.cpp
index a7b4e199..f31e3481 100644
--- a/src/gui/UBTeacherGuideWidgetsTools.cpp
+++ b/src/gui/UBTeacherGuideWidgetsTools.cpp
@@ -22,6 +22,8 @@
 #include <QUrl>
 #include <QWebSettings>
 #include <QApplication>
+#include <QDomElement>
+#include <QWebFrame>
 
 #include "UBTeacherGuideWidgetsTools.h"
 
@@ -30,7 +32,7 @@
 
 #include "board/UBBoardController.h"
 
-#include "domain/UBW3CWidget.h"
+#include "domain/UBGraphicsWidgetItem.h"
 
 #include "globals/UBGlobals.h"
 
@@ -360,7 +362,7 @@ void UBTGMediaWidget::removeSource()
 void UBTGMediaWidget::hideEvent(QHideEvent* event)
 {
     if(mpWebView)
-        mpWebView->page()->mainFrame()->setContent(UBW3CWidget::freezedWidgetPage().toAscii());
+        mpWebView->page()->mainFrame()->setContent(UBGraphicsW3CWidgetItem::freezedWidgetPage().toAscii());
     QWidget::hideEvent(event);
 }
 
@@ -421,7 +423,7 @@ void UBTGMediaWidget::createWorkWidget()
         mMediaType = "w3c";
         if(!(mIsPresentationMode || mIsInitializationMode)){
             QDir baseW3CDirectory(UBPersistenceManager::persistenceManager()->teacherGuideAbsoluteObjectPath(proxyDocument));
-            mMediaPath = UBW3CWidget::createNPAPIWrapperInDir(mMediaPath,baseW3CDirectory,mimeType,QSize(100,100),QUuid::createUuid());
+            mMediaPath = UBGraphicsW3CWidgetItem::createNPAPIWrapperInDir(mMediaPath,baseW3CDirectory,mimeType,QSize(100,100),QUuid::createUuid());
         }
         mpWebView = new UBDraggableWeb(mMediaPath);
         mpWebView->setAcceptDrops(false);
diff --git a/src/gui/UBToolWidget.cpp b/src/gui/UBToolWidget.cpp
index a12b2cd7..730a3c39 100644
--- a/src/gui/UBToolWidget.cpp
+++ b/src/gui/UBToolWidget.cpp
@@ -23,9 +23,6 @@
 #include "core/UBApplication.h"
 #include "core/UBSettings.h"
 
-#include "domain/UBAbstractWidget.h"
-#include "domain/UBAppleWidget.h"
-#include "domain/UBW3CWidget.h"
 #include "domain/UBGraphicsScene.h"
 #include "domain/UBGraphicsWidgetItem.h"
 
@@ -41,38 +38,30 @@ QPixmap* UBToolWidget::sClosePixmap = 0;
 QPixmap* UBToolWidget::sUnpinPixmap = 0;
 
 
-UBToolWidget::UBToolWidget(const QUrl& pUrl, QWidget* pParent)
-    : QWidget(pParent, Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint)
-    , mToolWidget(0)
+UBToolWidget::UBToolWidget(const QUrl& pUrl, QGraphicsItem *pParent)
+    : QGraphicsWidget(pParent, Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint)
+    , mGraphicsWidgetItem(0)
+    , mGraphicsWebView(0)
     , mShouldMoveWidget(false)
 {
-    int widgetType = UBAbstractWidget::widgetType(pUrl);
+    int widgetType = UBGraphicsWidgetItem::widgetType(pUrl);
 
-    if(widgetType == UBWidgetType::Apple)
-    {
-        mToolWidget = new UBAppleWidget(pUrl, this);
-    }
-    else if(widgetType == UBWidgetType::W3C)
-    {
-        mToolWidget = new UBW3CWidget(pUrl, this);
-    }
+    if (widgetType == UBWidgetType::Apple)
+        mGraphicsWidgetItem = new UBGraphicsAppleWidgetItem(pUrl, this);
+    else if (widgetType == UBWidgetType::W3C)
+        mGraphicsWidgetItem = new UBGraphicsW3CWidgetItem(pUrl, this);
     else
-    {
         qDebug() << "UBToolWidget::UBToolWidget: Unknown widget Type";
-        return;
-    }
 
     initialize();
 }
 
 
-UBToolWidget::UBToolWidget(UBAbstractWidget* pWidget, QWidget* pParent)
-    : QWidget(pParent, Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint)
-    , mToolWidget(pWidget)
+UBToolWidget::UBToolWidget(UBGraphicsWidgetItem *pWidget, QGraphicsItem *pParent)
+    : QGraphicsWidget(pParent, Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint)
     , mShouldMoveWidget(false)
 {
-    mToolWidget->setParent(this);
-    mToolWidget->loadMainHtml();
+    mGraphicsWidgetItem = pWidget;
 
     initialize();
 
@@ -88,85 +77,90 @@ UBToolWidget::~UBToolWidget()
 
 void UBToolWidget::initialize()
 {
-    mToolWidget->setAcceptDrops(false);
-
-    if(!sClosePixmap)
-    {
+    if (!sClosePixmap)
         sClosePixmap = new QPixmap(":/images/close.svg");
-    }
 
     if(!sUnpinPixmap)
-    {
         sUnpinPixmap = new QPixmap(":/images/unpin.svg");
-    }
-
-    mToolWidget->settings()->setAttribute(QWebSettings::PluginsEnabled, true);
-
-    mToolWidget->setAttribute(Qt::WA_OpaquePaintEvent, false);
-
-    QPalette palette = mToolWidget->page()->palette();
-    palette.setBrush(QPalette::Base, QBrush(Qt::transparent));
-    mToolWidget->page()->setPalette(palette);
-
-    connect(mToolWidget->page()->mainFrame(), SIGNAL(javaScriptWindowObjectCleared()), this, SLOT(javaScriptWindowObjectCleared()));
-    connect(UBApplication::boardController, SIGNAL(activeSceneChanged()), this, SLOT(javaScriptWindowObjectCleared()));
-
-    setLayout(new QVBoxLayout());
+    
+    QGraphicsLinearLayout *graphicsLayout = new QGraphicsLinearLayout(Qt::Vertical);
 
     mFrameWidth = UBSettings::settings()->objectFrameWidth;
     mContentMargin = sClosePixmap->width() / 2 + mFrameWidth;
+    graphicsLayout->setContentsMargins(mContentMargin, mContentMargin, mContentMargin, mContentMargin);
+    setPreferredSize(mGraphicsWidgetItem->preferredWidth() + mContentMargin * 2, mGraphicsWidgetItem->preferredHeight() + mContentMargin * 2);
 
-    layout()->setContentsMargins(mContentMargin, mContentMargin, mContentMargin, mContentMargin);
-    layout()->addWidget(mToolWidget);
+    mGraphicsWebView = new QGraphicsWebView();
+    connect(mGraphicsWebView->page()->mainFrame(), SIGNAL(javaScriptWindowObjectCleared()), this, SLOT(javaScriptWindowObjectCleared()));
+    mGraphicsWebView->load(mGraphicsWidgetItem->mainHtml());
+    graphicsLayout->addItem(mGraphicsWebView);
 
-    setFixedSize(mToolWidget->width() + mContentMargin * 2, mToolWidget->height() + mContentMargin * 2);
+    mGraphicsWebView->setAcceptDrops(false);
+    mGraphicsWebView->settings()->setAttribute(QWebSettings::PluginsEnabled, true);
+    mGraphicsWebView->setAttribute(Qt::WA_OpaquePaintEvent, false);
 
-    mToolWidget->installEventFilter(this);
+    QPalette palette = mGraphicsWebView->page()->palette();
+    palette.setBrush(QPalette::Base, QBrush(Qt::transparent));
+    mGraphicsWebView->page()->setPalette(palette);
+
+    setLayout(graphicsLayout);
+
+    connect(UBApplication::boardController, SIGNAL(activeSceneChanged()), this, SLOT(javaScriptWindowObjectCleared()));
 }
 
 
 void UBToolWidget::javaScriptWindowObjectCleared()
 {
-    UBWidgetUniboardAPI* uniboardAPI = new UBWidgetUniboardAPI(UBApplication::boardController->activeScene());
+    UBWidgetUniboardAPI *uniboardAPI = new UBWidgetUniboardAPI(UBApplication::boardController->activeScene(), mGraphicsWidgetItem);
 
-    mToolWidget->page()->mainFrame()->addToJavaScriptWindowObject("sankore", uniboardAPI);
+    mGraphicsWebView->page()->mainFrame()->addToJavaScriptWindowObject("sankore", uniboardAPI);
 
-    UBW3CWidget* w3c = dynamic_cast<UBW3CWidget*>(mToolWidget);
-    if (w3c)
+    UBGraphicsW3CWidgetItem *graphicsW3cWidgetItem = dynamic_cast<UBGraphicsW3CWidgetItem*>(mGraphicsWidgetItem);
+    if (graphicsW3cWidgetItem)
     {
-        UBW3CWidgetAPI* widgetAPI = new UBW3CWidgetAPI(w3c);
-        mToolWidget->page()->mainFrame()->addToJavaScriptWindowObject("widget", widgetAPI);
+        UBW3CWidgetAPI* widgetAPI = new UBW3CWidgetAPI(graphicsW3cWidgetItem);
+        mGraphicsWebView->page()->mainFrame()->addToJavaScriptWindowObject("widget", widgetAPI);
     }
 }
 
+void UBToolWidget::setPos(const QPointF &point)
+{
+    UBToolWidget::setPos(point.x(), point.y());
+}
+
+void UBToolWidget::setPos(qreal x, qreal y)
+{
+    QGraphicsItem::setPos(x - mContentMargin * scale(), y - mContentMargin * scale());
+}
+
+QPointF UBToolWidget::pos() const
+{
+    return QPointF(QGraphicsItem::pos().x() + mContentMargin * scale(), QGraphicsItem::pos().y() + mContentMargin * scale());
+}
 
-void UBToolWidget::paintEvent(QPaintEvent *event)
+void UBToolWidget::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
 {
-    QWidget::paintEvent(event);
+    QGraphicsWidget::paint(painter, option, widget);
 
     if (isActiveWindow())
     {
-        QPainter painter(this);
-        painter.setRenderHint(QPainter::Antialiasing);
-        painter.setPen(Qt::NoPen);
-        painter.setBrush(QColor(127, 127, 127, 127));
+        painter->setRenderHint(QPainter::Antialiasing);
+        painter->setPen(Qt::NoPen);
+        painter->setBrush(QColor(127, 127, 127, 127));
 
-        painter.drawRoundedRect(QRectF(sClosePixmap->width() / 2
-            , sClosePixmap->height() / 2
-            , width() - sClosePixmap->width()
-            , mFrameWidth), mFrameWidth / 2, mFrameWidth / 2);
+        painter->drawRoundedRect(QRectF(sClosePixmap->width() / 2, sClosePixmap->height() / 2, preferredWidth() - sClosePixmap->width(), mFrameWidth), mFrameWidth / 2, mFrameWidth / 2);
 
-        painter.drawPixmap(0, 0, *sClosePixmap);
+        painter->drawPixmap(0, 0, *sClosePixmap);
 
-        if (mToolWidget->canBeContent())
-            painter.drawPixmap(mContentMargin, 0, *sUnpinPixmap);
+        if (mGraphicsWidgetItem->canBeContent())
+            painter->drawPixmap(mContentMargin, 0, *sUnpinPixmap);
     }
 }
 
 
-void UBToolWidget::mousePressEvent ( QMouseEvent * event )
+void UBToolWidget::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
-    QWidget::mousePressEvent(event);
+    QGraphicsWidget::mousePressEvent(event);
 
     // did webkit consume the mouse press ?
     mShouldMoveWidget = !event->isAccepted() && (event->buttons() & Qt::LeftButton);
@@ -179,50 +173,50 @@ void UBToolWidget::mousePressEvent ( QMouseEvent * event )
 }
 
 
-void UBToolWidget::mouseMoveEvent ( QMouseEvent * event )
+void UBToolWidget::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 {
     if(mShouldMoveWidget && (event->buttons() & Qt::LeftButton))
     {
-        move(pos() - mMousePressPos + event->pos());
+        setPos(pos() - mMousePressPos + event->pos());
         event->accept();
     }
 
-    QWidget::mouseMoveEvent(event);
+    QGraphicsWidget::mouseMoveEvent(event);
 
 }
 
 
-void UBToolWidget::mouseReleaseEvent(QMouseEvent * event)
+void UBToolWidget::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 {
     mShouldMoveWidget = false;
 
     if (event->pos().x() >= 0 && event->pos().x() < sClosePixmap->width()
         && event->pos().y() >= 0 && event->pos().y() < sClosePixmap->height())
     {
-        UBApplication::boardController->removeTool(this);
+        remove();
         event->accept();
     }
-    else if (mToolWidget->canBeContent() && event->pos().x() >= mContentMargin && event->pos().x() < mContentMargin + sUnpinPixmap->width()
+    else if (mGraphicsWidgetItem->canBeContent() && event->pos().x() >= mContentMargin && event->pos().x() < mContentMargin + sUnpinPixmap->width()
         && event->pos().y() >= 0 && event->pos().y() < sUnpinPixmap->height())
     {
         UBApplication::boardController->moveToolWidgetToScene(this);
         event->accept();
     }
     else
-        QWidget::mouseReleaseEvent(event); // don't propgate to parent, the widget is deleted in UBApplication::boardController->removeTool
+        QGraphicsWidget::mouseReleaseEvent(event); // don't propgate to parent, the widget is deleted in UBApplication::boardController->removeTool
 
 }
 
 
 bool UBToolWidget::eventFilter(QObject *obj, QEvent *event)
 {
-    if (mShouldMoveWidget && obj == mToolWidget && event->type() == QEvent::MouseMove)
+    if (mShouldMoveWidget && obj == mGraphicsWidgetItem && event->type() == QEvent::MouseMove)
     {
         QMouseEvent *mouseMoveEvent = static_cast<QMouseEvent*>(event);
 
         if (mouseMoveEvent->buttons() & Qt::LeftButton)
         {
-            move(pos() - mMousePressPos + mToolWidget->mapTo(this, mouseMoveEvent->pos()));
+            setPos(pos() - mMousePressPos + mGraphicsWidgetItem->mapToItem(this, mouseMoveEvent->pos()));
 
             event->accept();
             return true;
@@ -234,22 +228,33 @@ bool UBToolWidget::eventFilter(QObject *obj, QEvent *event)
 }
 
 
-void UBToolWidget::centerOn(const QPoint& pos)
+void UBToolWidget::centerOn(const QPointF& pos)
 {
-    QWidget::move(pos - QPoint(width() / 2, height() / 2));
+    QGraphicsWidget::setPos(pos - QPointF(preferredWidth() / 2, preferredHeight() / 2));
 }
 
 
-QPoint UBToolWidget::naturalCenter() const
+QPointF UBToolWidget::naturalCenter() const
 {
-    if (mToolWidget)
-        return mToolWidget->geometry().center();
+    if (mGraphicsWebView)
+        return mGraphicsWebView->geometry().center();
     else
-        return QPoint(0, 0);
+        return QPointF(0, 0);
 }
 
 
-UBAbstractWidget* UBToolWidget::webWidget() const
+UBGraphicsWidgetItem* UBToolWidget::graphicsWidgetItem() const
+{
+    return mGraphicsWidgetItem;
+}
+
+UBGraphicsScene* UBToolWidget::scene()
+{
+    return qobject_cast<UBGraphicsScene*>(QGraphicsItem::scene());
+}
+
+void UBToolWidget::remove()
 {
-    return mToolWidget;
+    mGraphicsWebView->setHtml(QString());
+    scene()->removeItem(this);
 }
diff --git a/src/gui/UBToolWidget.h b/src/gui/UBToolWidget.h
index f0fb0c7f..fa23a459 100644
--- a/src/gui/UBToolWidget.h
+++ b/src/gui/UBToolWidget.h
@@ -17,33 +17,39 @@
 #define UBTOOLWIDGET_H_
 
 #include <QtGui>
+#include <QtWebKit>
 
-class UBAbstractWidget;
+class UBGraphicsWidgetItem;
 class QWidget;
 class UBGraphicsScene;
 
-class UBToolWidget : public QWidget
+class UBToolWidget : public QGraphicsWidget
 {
-    Q_OBJECT;
+    Q_OBJECT
 
     public:
-        UBToolWidget(const QUrl& pUrl, QWidget* pParent = 0);
-        UBToolWidget(UBAbstractWidget* pWidget, QWidget* pParent = 0);
+        UBToolWidget(const QUrl& pUrl, QGraphicsItem *pParent = 0);
+        UBToolWidget(UBGraphicsWidgetItem* pGraphicsWidgetItem, QGraphicsItem *pParent = 0);
         virtual ~UBToolWidget();
 
-        void centerOn(const QPoint& pos);
+        void centerOn(const QPointF& pos);
 
-        QPoint naturalCenter() const;
+        QPointF naturalCenter() const;
 
-        UBAbstractWidget* webWidget() const;
+        UBGraphicsWidgetItem* graphicsWidgetItem() const;
+        void remove();
+        virtual UBGraphicsScene* scene();
+        virtual void setPos(const QPointF &point);
+        virtual void setPos(qreal x, qreal y);
+        virtual QPointF pos() const;
 
     protected:
         void initialize();
-        virtual void paintEvent(QPaintEvent *);
+        virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
 
-        virtual void mousePressEvent ( QMouseEvent * event );
-        virtual void mouseMoveEvent ( QMouseEvent * event );
-        virtual void mouseReleaseEvent ( QMouseEvent * event );
+        virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
+        virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
+        virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
 
         virtual bool eventFilter(QObject *obj, QEvent *event);
 
@@ -55,9 +61,10 @@ class UBToolWidget : public QWidget
         static QPixmap *sClosePixmap;
         static QPixmap *sUnpinPixmap;
 
-        UBAbstractWidget *mToolWidget;
+        UBGraphicsWidgetItem *mGraphicsWidgetItem;
+        QGraphicsWebView *mGraphicsWebView;
 
-        QPoint mMousePressPos;
+        QPointF mMousePressPos;
 
         bool mShouldMoveWidget;
 
diff --git a/src/web/UBRoutedMouseEventWebView.cpp b/src/web/UBRoutedMouseEventWebView.cpp
deleted file mode 100644
index c5613ad3..00000000
--- a/src/web/UBRoutedMouseEventWebView.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "UBRoutedMouseEventWebView.h"
-
-#include <QtCore>
-#include <QtWebKit>
-#include <QtGui>
-
-#include "core/memcheck.h"
-
-UBRoutedMouseEventWebView::UBRoutedMouseEventWebView(QWidget * parent)
-    : QWebView(parent)
-{
-    QWebView::setRenderHints(QPainter::Antialiasing | QPainter::TextAntialiasing | QPainter::SmoothPixmapTransform);
-}
-
-UBRoutedMouseEventWebView::~UBRoutedMouseEventWebView()
-{
-    // NOOP
-}
-
-
-void UBRoutedMouseEventWebView::mouseMoveEvent(QMouseEvent* ev)
-{
-    QWebPage* p = page();
-
-    if (p)
-    {
-        p->event(ev);
-    }
-}
-
-void UBRoutedMouseEventWebView::mousePressEvent(QMouseEvent* ev)
-{
-    QWebPage* p = page();
-
-    if (p)
-    {
-        p->event(ev);
-    }
-}
-
-void UBRoutedMouseEventWebView::mouseDoubleClickEvent(QMouseEvent* ev)
-{
-    QWebPage* p = page();
-
-    if (p)
-    {
-        p->event(ev);
-    }
-}
-
-void UBRoutedMouseEventWebView::mouseReleaseEvent(QMouseEvent* ev)
-{
-    QWebPage* p = page();
-
-    if (p)
-    {
-        p->event(ev);
-    }
-}
-
-void UBRoutedMouseEventWebView::contextMenuEvent(QContextMenuEvent* ev)
-{
-    QWebPage* p = page();
-
-    if (p)
-    {
-        p->event(ev);
-    }
-}
-
-
-void UBRoutedMouseEventWebView::wheelEvent(QWheelEvent* ev)
-{
-    QWebPage* p = page();
-
-    if (p)
-    {
-        p->event(ev);
-    }
-}
-//void UBRoutedMouseEventWebView::dropEvent(QDropEvent *event)
-//{
-////    QWebView::dropEvent(event);
-//    event->accept();
-//}
diff --git a/src/web/UBRoutedMouseEventWebView.h b/src/web/UBRoutedMouseEventWebView.h
deleted file mode 100644
index d954aabd..00000000
--- a/src/web/UBRoutedMouseEventWebView.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef UBROUTEDMOUSEEVENTWEBVIEW_H_
-#define UBROUTEDMOUSEEVENTWEBVIEW_H_
-
-#include <QtWebKit>
-
-/*
- * This class changes the routing of mouse events.
- * Qt 4.5.2 does not report back the "accepted" flag set
- * by WebKit, as we want to know if a mouse event has been
- * consumed by webKit, we override them without keeping the
- * accepted flag status
- */
-
-class UBRoutedMouseEventWebView : public QWebView
-{
-    public:
-        UBRoutedMouseEventWebView(QWidget * parent = 0 );
-        virtual ~UBRoutedMouseEventWebView();
-
-    protected:
-        virtual void mouseMoveEvent(QMouseEvent* ev);
-        virtual void mousePressEvent(QMouseEvent* ev);
-        virtual void mouseDoubleClickEvent(QMouseEvent* ev);
-        virtual void mouseReleaseEvent(QMouseEvent* ev);
-        virtual void contextMenuEvent(QContextMenuEvent* ev);
-        virtual void wheelEvent(QWheelEvent* ev);
-//        virtual void dropEvent(QDropEvent *);
-};
-
-#endif /* UBROUTEDMOUSEEVENTWEBVIEW_H_ */
diff --git a/src/web/web.pri b/src/web/web.pri
index fcc383c1..0b447efa 100644
--- a/src/web/web.pri
+++ b/src/web/web.pri
@@ -13,7 +13,6 @@ HEADERS      += src/web/UBWebController.h \
                 src/web/UBWebKitUtils.h \
                 src/web/UBWebPage.h \
                 src/web/UBWebPluginWidget.h \
-                src/web/UBRoutedMouseEventWebView.h \
                 src/web/UBOEmbedParser.h\
                 src/web/browser/WBBrowserWindow.h \
                 src/web/browser/WBChaseWidget.h \
@@ -35,7 +34,6 @@ SOURCES      += src/web/UBWebController.cpp \
                 src/web/UBWebKitUtils.cpp \
                 src/web/UBWebPage.cpp \
                 src/web/UBWebPluginWidget.cpp \
-                src/web/UBRoutedMouseEventWebView.cpp \
                 src/web/UBOEmbedParser.cpp\
                 src/web/browser/WBBrowserWindow.cpp \
                 src/web/browser/WBChaseWidget.cpp \