diff --git a/src/activities/electric/CMakeLists.txt b/src/activities/electric/CMakeLists.txt
index cb57b00ad..afc18012e 100644
--- a/src/activities/electric/CMakeLists.txt
+++ b/src/activities/electric/CMakeLists.txt
@@ -1 +1 @@
-GCOMPRIS_ADD_RCC(activities/electric *.qml *.svg *.js resource/*)
+GCOMPRIS_ADD_RCC(activities/electric *.qml *.svg *.js resource/*.svg resource/*/*)
diff --git a/src/activities/electric/Electric.qml b/src/activities/electric/Electric.qml
index 275ef2453..3c4c4ba0a 100644
--- a/src/activities/electric/Electric.qml
+++ b/src/activities/electric/Electric.qml
@@ -1,85 +1,202 @@
 /* GCompris - electric.qml
  *
  * Copyright (C) 2015 YOUR NAME <xx@yy.org>
  *
  * Authors:
  *   <THE GTK VERSION AUTHOR> (GTK+ version)
  *   YOUR NAME <YOUR EMAIL> (Qt Quick port)
  *
  *   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 3 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/>.
  */
 import QtQuick 2.1
+import GCompris 1.0
 
 import "../../core"
 import "electric.js" as Activity
 
 ActivityBase {
     id: activity
 
+    property string url: "qrc:/gcompris/src/activities/electric/resource/"
+    property int levelCount: 3
+
     onStart: focus = true
     onStop: {}
 
     pageComponent: Rectangle {
         id: background
         anchors.fill: parent
         color: "#ABCDEF"
         signal start
         signal stop
 
+        property bool vert: background.width > background.height
+
         Component.onCompleted: {
             activity.start.connect(start)
             activity.stop.connect(stop)
         }
 
         // Add here the QML items you need to access in javascript
         QtObject {
             id: items
             property Item main: activity.main
             property alias background: background
             property alias bar: bar
             property alias bonus: bonus
         }
 
+        Loader {
+            id: dataset
+            asynchronous: false
+        }
+
         onStart: { Activity.start(items) }
         onStop: { Activity.stop() }
 
         GCText {
             anchors.centerIn: parent
             text: "electric activity"
             fontSize: largeSize
         }
 
         DialogHelp {
             id: dialogHelp
             onClose: home()
         }
 
         Bar {
             id: bar
             content: BarEnumContent { value: help | home | level }
             onHelpClicked: {
                 displayDialog(dialogHelp)
             }
             onPreviousLevelClicked: Activity.previousLevel()
             onNextLevelClicked: Activity.nextLevel()
             onHomeClicked: activity.home()
         }
 
         Bonus {
             id: bonus
             Component.onCompleted: win.connect(Activity.nextLevel)
         }
+
+        Rectangle {
+            id: leftWidget
+            width: background.vert ?
+                       90 * ApplicationInfo.ratio :
+                       background.width
+            height: background.vert ?
+                        background.height :
+                        90 * ApplicationInfo.ratio
+            color: "#FFFF42"
+            border.color: "#FFD85F"
+            border.width: 4
+            anchors.left: parent.left
+            //            ListWidget {
+            //                id: availablePieces
+            //                vert: background.vert
+            //            }
+        }
+
+        Rectangle {
+            id: toolTip
+            anchors.top: toolTipTxt.top
+            anchors.horizontalCenter: toolTipTxt.horizontalCenter
+            width: toolTipTxt.width + 10
+            height: toolTipTxt.height + 5
+            visible: false
+            opacity: 0.8
+            radius: 10
+            z: 100
+            border.width: 2
+            border.color: "black"
+            gradient: Gradient {
+                GradientStop { position: 0.0; color: "#000" }
+                GradientStop { position: 0.9; color: "#666" }
+                GradientStop { position: 1.0; color: "#AAA" }
+            }
+            property alias text: toolTipTxt.text
+        }
+
+        GCText {
+            id: toolTipTxt
+            anchors {
+                bottom: bar.top
+                bottomMargin: 10
+                left: leftWidget.left//horizontalCenter
+                leftMargin: 5
+            }
+            visible: toolTip.visible
+            z: 101
+            fontSize: regularSize
+            color: "white"
+            style: Text.Outline
+            styleColor: "black"
+            horizontalAlignment: Text.AlignHCenter
+            wrapMode: TextEdit.WordWrap
+        }
+
+        Rectangle {
+            id: grid
+
+            color: "transparent"
+            z: 2
+            x: background.vert ? 90 * ApplicationInfo.ratio : 0
+            y: background.vert ? 0 : 90 * ApplicationInfo.ratio
+            width: background.vert ?
+                       background.width - 90 * ApplicationInfo.ratio : background.width
+            height: background.vert ?
+                        background.height - (bar.height * 1.1) :
+                        background.height - (bar.height * 1.1) - 90 * ApplicationInfo.ratio
+        }
+
+        Rectangle {
+            id: instruction
+            anchors.fill: instructionTxt
+            opacity: 0.8
+            radius: 10
+            z: 3
+            border.width: 2
+            border.color: "black"
+            gradient: Gradient {
+                GradientStop { position: 0.0; color: "#000" }
+                GradientStop { position: 0.9; color: "#666" }
+                GradientStop { position: 1.0; color: "#AAA" }
+            }
+            property alias text: instructionTxt.text
+
+            Behavior on opacity { PropertyAnimation { duration: 200 } }
+        }
+
+        GCText {
+            id: instructionTxt
+            anchors {
+                top: background.vert ? grid.top : leftWidget.bottom
+                topMargin: -10
+                horizontalCenter: background.vert ? grid.horizontalCenter : leftWidget.horizontalCenter
+            }
+            opacity: instruction.opacity
+            z: instruction.z
+            fontSize: regularSize
+            color: "white"
+            style: Text.Outline
+            styleColor: "black"
+            horizontalAlignment: Text.AlignHCenter
+            width: Math.max(Math.min(parent.width * 0.9, text.length * 11), parent.width * 0.3)
+            wrapMode: TextEdit.WordWrap
+        }
     }
 
 }
diff --git a/src/activities/electric/resource/battery.png b/src/activities/electric/resource/images/battery.png
similarity index 100%
rename from src/activities/electric/resource/battery.png
rename to src/activities/electric/resource/images/battery.png
diff --git a/src/activities/electric/resource/battery_dead.png b/src/activities/electric/resource/images/battery_dead.png
similarity index 100%
rename from src/activities/electric/resource/battery_dead.png
rename to src/activities/electric/resource/images/battery_dead.png
diff --git a/src/activities/electric/resource/battery_icon.png b/src/activities/electric/resource/images/battery_icon.png
similarity index 100%
rename from src/activities/electric/resource/battery_icon.png
rename to src/activities/electric/resource/images/battery_icon.png
diff --git a/src/activities/electric/resource/bulb1.png b/src/activities/electric/resource/images/bulb1.png
similarity index 100%
rename from src/activities/electric/resource/bulb1.png
rename to src/activities/electric/resource/images/bulb1.png
diff --git a/src/activities/electric/resource/bulb10.png b/src/activities/electric/resource/images/bulb10.png
similarity index 100%
rename from src/activities/electric/resource/bulb10.png
rename to src/activities/electric/resource/images/bulb10.png
diff --git a/src/activities/electric/resource/bulb11.png b/src/activities/electric/resource/images/bulb11.png
similarity index 100%
rename from src/activities/electric/resource/bulb11.png
rename to src/activities/electric/resource/images/bulb11.png
diff --git a/src/activities/electric/resource/bulb2.png b/src/activities/electric/resource/images/bulb2.png
similarity index 100%
rename from src/activities/electric/resource/bulb2.png
rename to src/activities/electric/resource/images/bulb2.png
diff --git a/src/activities/electric/resource/bulb3.png b/src/activities/electric/resource/images/bulb3.png
similarity index 100%
rename from src/activities/electric/resource/bulb3.png
rename to src/activities/electric/resource/images/bulb3.png
diff --git a/src/activities/electric/resource/bulb4.png b/src/activities/electric/resource/images/bulb4.png
similarity index 100%
rename from src/activities/electric/resource/bulb4.png
rename to src/activities/electric/resource/images/bulb4.png
diff --git a/src/activities/electric/resource/bulb5.png b/src/activities/electric/resource/images/bulb5.png
similarity index 100%
rename from src/activities/electric/resource/bulb5.png
rename to src/activities/electric/resource/images/bulb5.png
diff --git a/src/activities/electric/resource/bulb6.png b/src/activities/electric/resource/images/bulb6.png
similarity index 100%
rename from src/activities/electric/resource/bulb6.png
rename to src/activities/electric/resource/images/bulb6.png
diff --git a/src/activities/electric/resource/bulb7.png b/src/activities/electric/resource/images/bulb7.png
similarity index 100%
rename from src/activities/electric/resource/bulb7.png
rename to src/activities/electric/resource/images/bulb7.png
diff --git a/src/activities/electric/resource/bulb8.png b/src/activities/electric/resource/images/bulb8.png
similarity index 100%
rename from src/activities/electric/resource/bulb8.png
rename to src/activities/electric/resource/images/bulb8.png
diff --git a/src/activities/electric/resource/bulb9.png b/src/activities/electric/resource/images/bulb9.png
similarity index 100%
rename from src/activities/electric/resource/bulb9.png
rename to src/activities/electric/resource/images/bulb9.png
diff --git a/src/activities/electric/resource/bulb_icon.png b/src/activities/electric/resource/images/bulb_icon.png
similarity index 100%
rename from src/activities/electric/resource/bulb_icon.png
rename to src/activities/electric/resource/images/bulb_icon.png
diff --git a/src/activities/electric/resource/connect.png b/src/activities/electric/resource/images/connect.png
similarity index 100%
rename from src/activities/electric/resource/connect.png
rename to src/activities/electric/resource/images/connect.png
diff --git a/src/activities/electric/resource/connect_icon.png b/src/activities/electric/resource/images/connect_icon.png
similarity index 100%
rename from src/activities/electric/resource/connect_icon.png
rename to src/activities/electric/resource/images/connect_icon.png
diff --git a/src/activities/electric/resource/connect_spot.png b/src/activities/electric/resource/images/connect_spot.png
similarity index 100%
rename from src/activities/electric/resource/connect_spot.png
rename to src/activities/electric/resource/images/connect_spot.png
diff --git a/src/activities/electric/resource/diode.png b/src/activities/electric/resource/images/diode.png
similarity index 100%
rename from src/activities/electric/resource/diode.png
rename to src/activities/electric/resource/images/diode.png
diff --git a/src/activities/electric/resource/diode_icon.png b/src/activities/electric/resource/images/diode_icon.png
similarity index 100%
rename from src/activities/electric/resource/diode_icon.png
rename to src/activities/electric/resource/images/diode_icon.png
diff --git a/src/activities/electric/resource/red_led_icon.png b/src/activities/electric/resource/images/red_led_icon.png
similarity index 100%
rename from src/activities/electric/resource/red_led_icon.png
rename to src/activities/electric/resource/images/red_led_icon.png
diff --git a/src/activities/electric/resource/red_led_off.png b/src/activities/electric/resource/images/red_led_off.png
similarity index 100%
rename from src/activities/electric/resource/red_led_off.png
rename to src/activities/electric/resource/images/red_led_off.png
diff --git a/src/activities/electric/resource/red_led_on.png b/src/activities/electric/resource/images/red_led_on.png
similarity index 100%
rename from src/activities/electric/resource/red_led_on.png
rename to src/activities/electric/resource/images/red_led_on.png
diff --git a/src/activities/electric/resource/resistor.png b/src/activities/electric/resource/images/resistor.png
similarity index 100%
rename from src/activities/electric/resource/resistor.png
rename to src/activities/electric/resource/images/resistor.png
diff --git a/src/activities/electric/resource/resistor_icon.png b/src/activities/electric/resource/images/resistor_icon.png
similarity index 100%
rename from src/activities/electric/resource/resistor_icon.png
rename to src/activities/electric/resource/images/resistor_icon.png
diff --git a/src/activities/electric/resource/resistor_track.png b/src/activities/electric/resource/images/resistor_track.png
similarity index 100%
rename from src/activities/electric/resource/resistor_track.png
rename to src/activities/electric/resource/images/resistor_track.png
diff --git a/src/activities/electric/resource/resistor_track_icon.png b/src/activities/electric/resource/images/resistor_track_icon.png
similarity index 100%
rename from src/activities/electric/resource/resistor_track_icon.png
rename to src/activities/electric/resource/images/resistor_track_icon.png
diff --git a/src/activities/electric/resource/resistor_wiper.png b/src/activities/electric/resource/images/resistor_wiper.png
similarity index 100%
rename from src/activities/electric/resource/resistor_wiper.png
rename to src/activities/electric/resource/images/resistor_wiper.png
diff --git a/src/activities/electric/resource/switch2_icon.png b/src/activities/electric/resource/images/switch2_icon.png
similarity index 100%
rename from src/activities/electric/resource/switch2_icon.png
rename to src/activities/electric/resource/images/switch2_icon.png
diff --git a/src/activities/electric/resource/switch2_off.png b/src/activities/electric/resource/images/switch2_off.png
similarity index 100%
rename from src/activities/electric/resource/switch2_off.png
rename to src/activities/electric/resource/images/switch2_off.png
diff --git a/src/activities/electric/resource/switch2_on.png b/src/activities/electric/resource/images/switch2_on.png
similarity index 100%
rename from src/activities/electric/resource/switch2_on.png
rename to src/activities/electric/resource/images/switch2_on.png
diff --git a/src/activities/electric/resource/switch_click.png b/src/activities/electric/resource/images/switch_click.png
similarity index 100%
rename from src/activities/electric/resource/switch_click.png
rename to src/activities/electric/resource/images/switch_click.png
diff --git a/src/activities/electric/resource/switch_icon.png b/src/activities/electric/resource/images/switch_icon.png
similarity index 100%
rename from src/activities/electric/resource/switch_icon.png
rename to src/activities/electric/resource/images/switch_icon.png
diff --git a/src/activities/electric/resource/switch_off.png b/src/activities/electric/resource/images/switch_off.png
similarity index 100%
rename from src/activities/electric/resource/switch_off.png
rename to src/activities/electric/resource/images/switch_off.png
diff --git a/src/activities/electric/resource/switch_on.png b/src/activities/electric/resource/images/switch_on.png
similarity index 100%
rename from src/activities/electric/resource/switch_on.png
rename to src/activities/electric/resource/images/switch_on.png
diff --git a/src/activities/electric/resource/tool-del.png b/src/activities/electric/resource/images/tool-del.png
similarity index 100%
rename from src/activities/electric/resource/tool-del.png
rename to src/activities/electric/resource/images/tool-del.png
diff --git a/src/activities/electric/resource/tool-del_on.png b/src/activities/electric/resource/images/tool-del_on.png
similarity index 100%
rename from src/activities/electric/resource/tool-del_on.png
rename to src/activities/electric/resource/images/tool-del_on.png
diff --git a/src/activities/electric/resource/tool-select.png b/src/activities/electric/resource/images/tool-select.png
similarity index 100%
rename from src/activities/electric/resource/tool-select.png
rename to src/activities/electric/resource/images/tool-select.png
diff --git a/src/activities/electric/resource/tool-select_on.png b/src/activities/electric/resource/images/tool-select_on.png
similarity index 100%
rename from src/activities/electric/resource/tool-select_on.png
rename to src/activities/electric/resource/images/tool-select_on.png