diff --git a/plugins/ains/editors/ainsEditor/ainsEditor.xml b/plugins/ains/editors/ainsEditor/ainsEditor.xml
index 19eeac7dd5..382fa370e4 100644
--- a/plugins/ains/editors/ainsEditor/ainsEditor.xml
+++ b/plugins/ains/editors/ainsEditor/ainsEditor.xml
@@ -6,7 +6,7 @@
             <node displayedName="Центр обработки данных" name="dataCenter">
                 <graphics>
                     <picture sizex="100" sizey="100">
-                        <image y1="6" name="images/database.png" x1="1" y2="90" x2="90"/>
+                        <external file="qml/dataCenterClass.qml"/>
                     </picture>
                     <labels>
                         <label x="5" y="95" textBinded="name"/>
@@ -37,7 +37,7 @@
             <node displayedName="Обзорная диаграмма" name="diagram">
                 <graphics>
                     <picture sizex="32" sizey="32">
-                        <image y1="0" name="images/circle_blue.png" x1="0" y2="31" x2="31"/>
+                        <external file="qml/diagramClass.qml"/>
                     </picture>
                     <labels>
                         <label x="-1" y="40" textBinded="name"/>
@@ -51,7 +51,7 @@
             <node displayedName="АРМ" description="автоматизированое рабочее место" name="computer">
                 <graphics>
                     <picture sizex="80" sizey="90">
-                        <image y1="10" name="images/laptop.png" x1="8" y2="80" x2="80"/>
+                        <external file="qml/computerClass.qml"/>
                     </picture>
                     <labels>
                         <label x="0" y="85" textBinded="name"/>
@@ -82,7 +82,7 @@
             <node displayedName="Средство транспортировки" name="transport">
                 <graphics>
                     <picture sizex="70" sizey="80">
-                        <image y1="8" name="images/transport.png" x1="5" y2="70" x2="70"/>
+                        <external file="qml/transportClass.qml">
                     </picture>
                     <labels>
                         <label x="0" y="75" textBinded="name"/>
@@ -113,7 +113,7 @@
             <node displayedName="Спутник" name="satellite">
                 <graphics>
                     <picture sizex="80" sizey="90">
-                        <image y1="8" name="images/satellite.png" x1="7" y2="80" x2="80"/>
+                        <external file="qml/satelliteClass.qml"/>
                     </picture>
                     <labels>
                         <label x="0" y="85" textBinded="name"/>
@@ -144,7 +144,7 @@
             <node displayedName="Коммуникационный узел" name="communication">
                 <graphics>
                     <picture sizex="80" sizey="90">
-                        <image y1="6" name="images/network-wireless.png" x1="7" y2="80" x2="80"/>
+                        <external file="qml/communicationClass.qml"/>
                     </picture>
                     <labels>
                         <label x="0" y="85" textBinded="name"/>
@@ -175,7 +175,7 @@
             <node displayedName="Карточка" name="card">
                 <graphics>
                     <picture sizex="50" sizey="50">
-                        <image y1="3" name="images/controlpanel.png" x1="3" y2="40" x2="40"/>
+                        <external file="qml/cardClass.qml"/>
                     </picture>
                     <labels>
                         <label x="0" y="45" textBinded="name"/>
@@ -206,7 +206,7 @@
             <node displayedName="Пост проверки" name="control">
                 <graphics>
                     <picture sizex="80" sizey="90">
-                        <image y1="5" name="images/ktalkd.png" x1="5" y2="85" x2="75"/>
+                        <external file="qml/controlClass.qml"/>
                     </picture>
                     <labels>
                         <label x="0" y="85" textBinded="name"/>
@@ -237,7 +237,7 @@
             <node displayedName="Промежуточный буфер" name="buffer">
                 <graphics>
                     <picture sizex="160" sizey="160">
-                        <image y1="17" name="images/server.png" x1="21" y2="144" x2="148"/>
+                        <external file="qml/bufferClass.qml"/>
                     </picture>
                     <labels>
                         <label x="0" y="166" textBinded="name"/>
@@ -268,7 +268,7 @@
             <node displayedName="Описание" description="Блок для описания обязанностей и характера взаимодействия рассматриваемого узла" name="DescriptionBlock">
                 <graphics>
                     <picture sizex="150" sizey="180">
-                        <rectangle fill="#f0f8ff" stroke-style="solid" stroke="#000000" y1="0" stroke-width="0" x1="0" y2="180" fill-style="solid" x2="150"/>
+                        <external file="qml/DescriptionBlockClass.qml"/>
                     </picture>
 					<labels>
                         <label x="5" y="5" textBinded="text"/>
diff --git a/plugins/ains/editors/ainsEditor/qml/DescriptionBlockClass.qml b/plugins/ains/editors/ainsEditor/qml/DescriptionBlockClass.qml
new file mode 100644
index 0000000000..7453681010
--- /dev/null
+++ b/plugins/ains/editors/ainsEditor/qml/DescriptionBlockClass.qml
@@ -0,0 +1,15 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 150; height: 180
+	color: "transparent"
+	Rectangle { 
+		anchors.fill: parent
+		x: 0 * parent.width / 1
+		y: 0 * parent.height / 1
+		width: 1 * parent.width / 1
+		height: 1 * parent.height / 1
+		border.color: "#f0f8ff"
+		border.width: 0
+	} 
+} 
diff --git a/plugins/ains/editors/ainsEditor/qml/bufferClass.qml b/plugins/ains/editors/ainsEditor/qml/bufferClass.qml
new file mode 100644
index 0000000000..57530416e9
--- /dev/null
+++ b/plugins/ains/editors/ainsEditor/qml/bufferClass.qml
@@ -0,0 +1,13 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 160; height: 160
+	color: "transparent"
+	Picture { 
+		x1: 21 * parent.width / 160
+		y1: 17 * parent.height / 160
+		x2: 37 * parent.width / 40
+		y2: 9 * parent.height / 10
+		source: "images/server.png"
+	}
+} 
diff --git a/plugins/ains/editors/ainsEditor/qml/cardClass.qml b/plugins/ains/editors/ainsEditor/qml/cardClass.qml
new file mode 100644
index 0000000000..d3ebdd3d5b
--- /dev/null
+++ b/plugins/ains/editors/ainsEditor/qml/cardClass.qml
@@ -0,0 +1,13 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 50; height: 50
+	color: "transparent"
+	Picture { 
+		x1: 3 * parent.width / 50
+		y1: 3 * parent.height / 50
+		x2: 4 * parent.width / 5
+		y2: 4 * parent.height / 5
+		source: "images/controlpanel.png"
+	}
+} 
diff --git a/plugins/ains/editors/ainsEditor/qml/communicationClass.qml b/plugins/ains/editors/ainsEditor/qml/communicationClass.qml
new file mode 100644
index 0000000000..65ae8f8d7d
--- /dev/null
+++ b/plugins/ains/editors/ainsEditor/qml/communicationClass.qml
@@ -0,0 +1,13 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 80; height: 90
+	color: "transparent"
+	Picture { 
+		x1: 7 * parent.width / 80
+		y1: 1 * parent.height / 15
+		x2: 1 * parent.width / 1
+		y2: 8 * parent.height / 9
+		source: "images/network-wireless.png"
+	}
+} 
diff --git a/plugins/ains/editors/ainsEditor/qml/computerClass.qml b/plugins/ains/editors/ainsEditor/qml/computerClass.qml
new file mode 100644
index 0000000000..f12683aee8
--- /dev/null
+++ b/plugins/ains/editors/ainsEditor/qml/computerClass.qml
@@ -0,0 +1,13 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 80; height: 90
+	color: "transparent"
+	Picture { 
+		x1: 1 * parent.width / 10
+		y1: 1 * parent.height / 9
+		x2: 1 * parent.width / 1
+		y2: 8 * parent.height / 9
+		source: "images/laptop.png"
+	}
+} 
diff --git a/plugins/ains/editors/ainsEditor/qml/controlClass.qml b/plugins/ains/editors/ainsEditor/qml/controlClass.qml
new file mode 100644
index 0000000000..3a640412b3
--- /dev/null
+++ b/plugins/ains/editors/ainsEditor/qml/controlClass.qml
@@ -0,0 +1,13 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 80; height: 90
+	color: "transparent"
+	Picture { 
+		x1: 1 * parent.width / 16
+		y1: 1 * parent.height / 18
+		x2: 15 * parent.width / 16
+		y2: 17 * parent.height / 18
+		source: "images/ktalkd.png"
+	}
+} 
diff --git a/plugins/ains/editors/ainsEditor/qml/dataCenterClass.qml b/plugins/ains/editors/ainsEditor/qml/dataCenterClass.qml
new file mode 100644
index 0000000000..d817ad931e
--- /dev/null
+++ b/plugins/ains/editors/ainsEditor/qml/dataCenterClass.qml
@@ -0,0 +1,13 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 100; height: 100
+	color: "transparent"
+	Picture { 
+		x1: 1 * parent.width / 100
+		y1: 3 * parent.height / 50
+		x2: 9 * parent.width / 10
+		y2: 9 * parent.height / 10
+		source: "images/database.png"
+	}
+} 
diff --git a/plugins/ains/editors/ainsEditor/qml/diagramClass.qml b/plugins/ains/editors/ainsEditor/qml/diagramClass.qml
new file mode 100644
index 0000000000..8da1224abf
--- /dev/null
+++ b/plugins/ains/editors/ainsEditor/qml/diagramClass.qml
@@ -0,0 +1,13 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 32; height: 32
+	color: "transparent"
+	Picture { 
+		x1: 0 * parent.width / 1
+		y1: 0 * parent.height / 1
+		x2: 31 * parent.width / 32
+		y2: 31 * parent.height / 32
+		source: "images/circle_blue.png"
+	}
+} 
diff --git a/plugins/ains/editors/ainsEditor/qml/satelliteClass.qml b/plugins/ains/editors/ainsEditor/qml/satelliteClass.qml
new file mode 100644
index 0000000000..2fd59a18ad
--- /dev/null
+++ b/plugins/ains/editors/ainsEditor/qml/satelliteClass.qml
@@ -0,0 +1,13 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 80; height: 90
+	color: "transparent"
+	Picture { 
+		x1: 7 * parent.width / 80
+		y1: 4 * parent.height / 45
+		x2: 1 * parent.width / 1
+		y2: 8 * parent.height / 9
+		source: "images/satellite.png"
+	}
+} 
diff --git a/plugins/ains/editors/ainsEditor/qml/transportClass.qml b/plugins/ains/editors/ainsEditor/qml/transportClass.qml
new file mode 100644
index 0000000000..b1a07743d5
--- /dev/null
+++ b/plugins/ains/editors/ainsEditor/qml/transportClass.qml
@@ -0,0 +1,13 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 70; height: 80
+	color: "transparent"
+	Picture { 
+		x1: 1 * parent.width / 14
+		y1: 1 * parent.height / 10
+		x2: 1 * parent.width / 1
+		y2: 7 * parent.height / 8
+		source: "images/transport.png"
+	}
+} 
diff --git a/plugins/ains/editors/databaseEditor/databaseEditor.xml b/plugins/ains/editors/databaseEditor/databaseEditor.xml
index 9be34fdf7c..1ab4546108 100644
--- a/plugins/ains/editors/databaseEditor/databaseEditor.xml
+++ b/plugins/ains/editors/databaseEditor/databaseEditor.xml
@@ -52,7 +52,7 @@
             <node displayedName="Диаграмма баз данных" description="Корневой элемент создания диаграммы описания схемы базы данных. Для её создания перенесите этот элемент в обозреватель" name="DatabaseDiagram">
                 <graphics>
                     <picture sizex="48" sizey="48">
-                        <image y1="0" name="images/table.png" x1="0" y2="47" x2="47"/>
+                        <external file="qml/DatabaseDiagramClass.qml"/>
                     </picture>
                     <labels>
                         <label x="0" y="0" textBinded="name"/>
@@ -69,7 +69,7 @@
             <node displayedName="Таблица" description="Новая таблица" name="Table">
                 <graphics>
                     <picture sizex="150" sizey="180">
-                        <rectangle fill="#f5f5f5" stroke-style="solid" stroke="#000000" y1="0" stroke-width="0" x1="0" y2="180" fill-style="solid" x2="150"/>
+                        <external file="qml/TableClass.qml"/>
                     </picture>
                     <labels>
                         <label x="0" y="-30" textBinded="name"/>
@@ -115,7 +115,7 @@
             <node displayedName="Столбец строкового типа" name="ColumnString">
                 <graphics>
                     <picture sizex="200" sizey="20">
-                        <rectangle fill="#f5f5f5" stroke-style="solid" stroke="#6495ed" y1="0" stroke-width="1" x1="0" y2="20" fill-style="solid" x2="200"/>
+                        <external file="qml/ColumnStringStringClass.qml"/>
                     </picture>
                     <labels>
                         <label x="5" y="1" textBinded="name"/>
@@ -158,7 +158,7 @@
             <node displayedName="Столбец числового типа" name="ColumnNumber">
                 <graphics>
                     <picture sizex="200" sizey="20">
-                        <rectangle fill="#f5f5f5" stroke-style="solid" stroke="#f08080" y1="0" stroke-width="1" x1="0" y2="20" fill-style="solid" x2="200"/>
+                        <external file="qml/ColumnNumberClass.qml"/>
                     </picture>
                     <labels>
                         <label x="5" y="1" textBinded="name"/>
@@ -206,7 +206,7 @@
             <node displayedName="Столбец типа дата-время" name="ColumnDate">
                 <graphics>
                     <picture sizex="200" sizey="20">
-                        <rectangle fill="#f5f5f5" stroke-style="solid" stroke="#483d8b" y1="0" stroke-width="1" x1="0" y2="20" fill-style="solid" x2="200"/>
+                        <external file="qml/ColumnDateClass.qml"/>
                     </picture>
                     <labels>
                         <label x="5" y="1" textBinded="name"/>
@@ -248,7 +248,7 @@
             <node displayedName="Столбец другого типа" name="ColumnOther">
                 <graphics>
                     <picture sizex="200" sizey="20">
-                        <rectangle fill="#f5f5f5" stroke-style="solid" stroke="#00ff00" y1="0" stroke-width="1" x1="0" y2="20" fill-style="solid" x2="200"/>
+                        <external file="qml/ColumnOtherClass.qml"/>
                     </picture>
                     <labels>
                         <label x="5" y="1" textBinded="name"/>
diff --git a/plugins/ains/editors/databaseEditor/qml/ColumnDateClass.qml b/plugins/ains/editors/databaseEditor/qml/ColumnDateClass.qml
new file mode 100644
index 0000000000..a391df4fbf
--- /dev/null
+++ b/plugins/ains/editors/databaseEditor/qml/ColumnDateClass.qml
@@ -0,0 +1,15 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 200; height: 20
+	color: "transparent"
+	Rectangle { 
+		anchors.fill: parent
+		x: 0 * parent.width / 1
+		y: 0 * parent.height / 1
+		width: 1 * parent.width / 1
+		height: 1 * parent.height / 1
+		border.color: "#f5f5f5"
+		border.width: 1
+	} 
+} 
diff --git a/plugins/ains/editors/databaseEditor/qml/ColumnNumberClass.qml b/plugins/ains/editors/databaseEditor/qml/ColumnNumberClass.qml
new file mode 100644
index 0000000000..a391df4fbf
--- /dev/null
+++ b/plugins/ains/editors/databaseEditor/qml/ColumnNumberClass.qml
@@ -0,0 +1,15 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 200; height: 20
+	color: "transparent"
+	Rectangle { 
+		anchors.fill: parent
+		x: 0 * parent.width / 1
+		y: 0 * parent.height / 1
+		width: 1 * parent.width / 1
+		height: 1 * parent.height / 1
+		border.color: "#f5f5f5"
+		border.width: 1
+	} 
+} 
diff --git a/plugins/ains/editors/databaseEditor/qml/ColumnOtherClass.qml b/plugins/ains/editors/databaseEditor/qml/ColumnOtherClass.qml
new file mode 100644
index 0000000000..a391df4fbf
--- /dev/null
+++ b/plugins/ains/editors/databaseEditor/qml/ColumnOtherClass.qml
@@ -0,0 +1,15 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 200; height: 20
+	color: "transparent"
+	Rectangle { 
+		anchors.fill: parent
+		x: 0 * parent.width / 1
+		y: 0 * parent.height / 1
+		width: 1 * parent.width / 1
+		height: 1 * parent.height / 1
+		border.color: "#f5f5f5"
+		border.width: 1
+	} 
+} 
diff --git a/plugins/ains/editors/databaseEditor/qml/ColumnStringClass.qml b/plugins/ains/editors/databaseEditor/qml/ColumnStringClass.qml
new file mode 100644
index 0000000000..a391df4fbf
--- /dev/null
+++ b/plugins/ains/editors/databaseEditor/qml/ColumnStringClass.qml
@@ -0,0 +1,15 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 200; height: 20
+	color: "transparent"
+	Rectangle { 
+		anchors.fill: parent
+		x: 0 * parent.width / 1
+		y: 0 * parent.height / 1
+		width: 1 * parent.width / 1
+		height: 1 * parent.height / 1
+		border.color: "#f5f5f5"
+		border.width: 1
+	} 
+} 
diff --git a/plugins/ains/editors/databaseEditor/qml/DatabaseDiagramClass.qml b/plugins/ains/editors/databaseEditor/qml/DatabaseDiagramClass.qml
new file mode 100644
index 0000000000..c5cc6f4666
--- /dev/null
+++ b/plugins/ains/editors/databaseEditor/qml/DatabaseDiagramClass.qml
@@ -0,0 +1,13 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 48; height: 48
+	color: "transparent"
+	Picture { 
+		x1: 0 * parent.width / 1
+		y1: 0 * parent.height / 1
+		x2: 47 * parent.width / 48
+		y2: 47 * parent.height / 48
+		source: "images/table.png"
+	}
+} 
diff --git a/plugins/ains/editors/databaseEditor/qml/TableClass.qml b/plugins/ains/editors/databaseEditor/qml/TableClass.qml
new file mode 100644
index 0000000000..b7345b2d93
--- /dev/null
+++ b/plugins/ains/editors/databaseEditor/qml/TableClass.qml
@@ -0,0 +1,15 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 150; height: 180
+	color: "transparent"
+	Rectangle { 
+		anchors.fill: parent
+		x: 0 * parent.width / 1
+		y: 0 * parent.height / 1
+		width: 1 * parent.width / 1
+		height: 1 * parent.height / 1
+		border.color: "#f5f5f5"
+		border.width: 0
+	} 
+} 
diff --git a/plugins/ains/editors/usecaseDiagram/qml/actorClass.qml b/plugins/ains/editors/usecaseDiagram/qml/actorClass.qml
new file mode 100644
index 0000000000..bfce9eb527
--- /dev/null
+++ b/plugins/ains/editors/usecaseDiagram/qml/actorClass.qml
@@ -0,0 +1,13 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 132; height: 132
+	color: "transparent"
+	Picture { 
+		x1: 1 * parent.width / 66
+		y1: 1 * parent.height / 66
+		x2: 65 * parent.width / 66
+		y2: 65 * parent.height / 66
+		source: "images/user.png"
+	}
+} 
diff --git a/plugins/ains/editors/usecaseDiagram/qml/commentClass.qml b/plugins/ains/editors/usecaseDiagram/qml/commentClass.qml
new file mode 100644
index 0000000000..4b6a45e483
--- /dev/null
+++ b/plugins/ains/editors/usecaseDiagram/qml/commentClass.qml
@@ -0,0 +1,69 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 200; height: 100
+	color: "transparent"
+	Line { 
+		x1: 0 * parent.width / 1
+		y1: 0 * parent.height / 1
+		x2: 9 * parent.width / 10
+		y2: 0 * parent.height / 1
+		color: "black"
+		style: "solid"
+		width: 1
+	} 
+	Line { 
+		x1: 0 * parent.width / 1
+		y1: 0 * parent.height / 1
+		x2: 0 * parent.width / 1
+		y2: 1 * parent.height / 1
+		color: "black"
+		style: "solid"
+		width: 1
+	} 
+	Line { 
+		x1: 0 * parent.width / 1
+		y1: 1 * parent.height / 1
+		x2: 1 * parent.width / 1
+		y2: 1 * parent.height / 1
+		color: "black"
+		style: "solid"
+		width: 1
+	} 
+	Line { 
+		x1: 1 * parent.width / 1
+		y1: 1 * parent.height / 1
+		x2: 1 * parent.width / 1
+		y2: 1 * parent.height / 5
+		color: "black"
+		style: "solid"
+		width: 1
+	} 
+	Line { 
+		x1: 9 * parent.width / 10
+		y1: 0 * parent.height / 1
+		x2: 1 * parent.width / 1
+		y2: 1 * parent.height / 5
+		color: "black"
+		style: "solid"
+		width: 1
+	} 
+	Line { 
+		x1: 9 * parent.width / 10
+		y1: 0 * parent.height / 1
+		x2: 9 * parent.width / 10
+		y2: 1 * parent.height / 5
+		color: "black"
+		style: "solid"
+		width: 1
+	} 
+	Line { 
+		x1: 1 * parent.width / 1
+		y1: 1 * parent.height / 5
+		x2: 9 * parent.width / 10
+		y2: 1 * parent.height / 5
+		color: "black"
+		style: "solid"
+		width: 1
+	} 
+} 
diff --git a/plugins/ains/editors/usecaseDiagram/qml/systemClass.qml b/plugins/ains/editors/usecaseDiagram/qml/systemClass.qml
new file mode 100644
index 0000000000..cb6f1be2dd
--- /dev/null
+++ b/plugins/ains/editors/usecaseDiagram/qml/systemClass.qml
@@ -0,0 +1,26 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 500; height: 500
+	color: "transparent"
+	Rectangle { 
+		anchors.fill: parent
+		x: 0 * parent.width / 1
+		y: 0 * parent.height / 1
+		width: 1 * parent.width / 1
+		height: 1 * parent.height / 1
+		border.color: "#bbbbbb"
+		border.width: 1
+	} 
+	Text { 
+		x: 1 * parent.width / 100
+		y: 0 * parent.height / 1
+		color: "#bbbbbb"
+		text: "СИСТЕМА"
+		font.family: "Helvetica"
+		font.pixelSize: 1 * parent.height / 50
+		font.bold: false
+		font.italic: false
+		font.underline: false
+	} 
+} 
diff --git a/plugins/ains/editors/usecaseDiagram/qml/useCaseClass.qml b/plugins/ains/editors/usecaseDiagram/qml/useCaseClass.qml
new file mode 100644
index 0000000000..e4ea275ada
--- /dev/null
+++ b/plugins/ains/editors/usecaseDiagram/qml/useCaseClass.qml
@@ -0,0 +1,16 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 181; height: 93
+	color: "transparent"
+	Ellipse { 
+		x: 1 * parent.width / 2
+		y: 1 * parent.height / 2
+		width: 176 * parent.width / 181
+		height: 88 * parent.height / 93
+		color: "#bfefff"
+		border.color: "#000000"
+		border.style: "solid"
+		border.width: 1
+	} 
+} 
diff --git a/plugins/ains/editors/usecaseDiagram/qml/usecaseDiagramClass.qml b/plugins/ains/editors/usecaseDiagram/qml/usecaseDiagramClass.qml
new file mode 100644
index 0000000000..2457716a8d
--- /dev/null
+++ b/plugins/ains/editors/usecaseDiagram/qml/usecaseDiagramClass.qml
@@ -0,0 +1,13 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 36; height: 36
+	color: "transparent"
+	Picture { 
+		x1: 1 * parent.width / 18
+		y1: 1 * parent.height / 18
+		x2: 17 * parent.width / 18
+		y2: 17 * parent.height / 18
+		source: "images/puzzle.png"
+	}
+} 
diff --git a/plugins/ains/editors/usecaseDiagram/usecaseDiagram.xml b/plugins/ains/editors/usecaseDiagram/usecaseDiagram.xml
index d83aef0401..67d3378a42 100644
--- a/plugins/ains/editors/usecaseDiagram/usecaseDiagram.xml
+++ b/plugins/ains/editors/usecaseDiagram/usecaseDiagram.xml
@@ -28,13 +28,7 @@
         <node displayedName="Комментарий" name="comment">
           <graphics>
             <picture sizex="200" sizey="100">
-              <line y1="0" x1="0" y2="0" x2="180"/>
-              <line y1="0" x1="0" y2="100" x2="0"/>
-              <line y1="100" x1="0" y2="100" x2="200"/>
-              <line y1="100" x1="200" y2="20" x2="200"/>
-              <line y1="0" x1="180" y2="20" x2="200"/>
-              <line y1="0" x1="180" y2="20" x2="180"/>
-              <line y1="20" x1="200" y2="20" x2="180"/>
+				<external file="qml/commentClass.qml"/>
             </picture>
             <ports>
               <linePort>
@@ -67,7 +61,7 @@
             <node displayedName="Прецедент" name="useCase">
                 <graphics>
                     <picture sizex="181" sizey="93">
-                        <ellipse fill="#bfefff" stroke-style="solid" stroke="#000000" y1="2" stroke-width="1" x1="2" y2="90" fill-style="solid" x2="178"/>
+                        <external file="qml/useCaseClass.qml"/>
                     </picture>
                     <labels>
                         <label x="20" y="20" textBinded="name" center="true"/>
@@ -86,7 +80,7 @@
             <node displayedName="Диаграмма прецедентов" name="usecaseDiagram">
                  <graphics>
                     <picture sizex="36" sizey="36">
-                        <image y1="2" name="images/puzzle.png" x1="2" y2="34" x2="34"/>
+                        <external file="qml/usecaseDiagramClass.qml"/>
                     </picture>
                     <labels>
                         <label x="-1" y="36" textBinded="name" center="true"/>
@@ -107,7 +101,7 @@
                         <line fill="#ffffff" stroke-style="solid" stroke="#000000" y1="91" stroke-width="2" x1="43" y2="130" fill-style="none" x2="70"/>
                     </picture>-->
                     <picture sizex="132" sizey="132">
-                        <image y1="2" name="images/user.png" x1="2" y2="130" x2="130"/>
+                        <external file="qml/actorClass.qml"/>
                     </picture>
                     <labels>
                         <label x="0" y="135" textBinded="name" center="true"/>
diff --git a/plugins/bpmn/bPMNMetamodel.xml b/plugins/bpmn/bPMNMetamodel.xml
index 6e9f1a610e..3fbcad72b9 100644
--- a/plugins/bpmn/bPMNMetamodel.xml
+++ b/plugins/bpmn/bPMNMetamodel.xml
@@ -31,82 +31,84 @@
 			<port name="DataVertical"/>
 			<port name="DataRight"/>
             <enum name="StartEventType" displayedName="Start Event Type">
-                <value>None</value>
-                <value>Message</value>
-                <value>Timer</value>
-                <value>Conditional</value>
-				<value>Error</value>
-				<value>Escalation</value>
-				<value>Compensation</value>
-				<value>Signal</value>
-                <value>Multiple</value>
-                <value>Parallel Multiple</value>
+                <value name="None"/>
+                <value name="Message"/>
+                <value name="Timer"/>
+                <value name="Conditional"/>
+				<value name="Error"/>
+				<value name="Escalation"/>
+				<value name="Compensation"/>
+				<value name="Signal"/>
+                <value name="Multiple"/>
+                <value name="Parallel Multiple"/>
             </enum>
             <enum name="StartEventNonInterruptingType" displayedName="Non-Interrupting Start Event Type">
-                <value>None</value>
-                <value>Message</value>
-                <value>Timer</value>
-                <value>Conditional</value>
-				<value>Escalation</value>
-				<value>Signal</value>
-                <value>Parallel Multiple</value>
-                <value>Multiple</value>
+                <value name="None"/>
+                <value name="Message"/>
+                <value name="Timer"/>
+                <value name="Conditional"/>
+				<value name="Escalation"/>
+				<value name="Signal"/>
+                <value name="Parallel Multiple"/>
+                <value name="Multiple"/>
             </enum>
             <enum name="IntermediateEventType" displayedName="Intermediate Event Type">
-                <value>None</value>
-                <value>Receive Message</value>
-                <value>Send Message</value>
-                <value>Timer</value>
-                <value>Conditional</value>
-                <value>Multiple Catch</value>
-                <value>Multiple Throw</value>
-                <value>Catch Signal</value>
-                <value>Throw Signal</value>
-                <value>Catch Link</value>
-                <value>Throw Link</value>
-                <value>Compensation</value>
-                <value>Escalation</value>
-                <value>Parallel Multiple (Catch)</value>
+                <value name="None"/>
+                <value name="Receive Message"/>
+                <value name="Send Message"/>
+                <value name="Timer"/>
+                <value name="Conditional"/>
+                <value name="Multiple Catch"/>
+                <value name="Multiple Throw"/>
+                <value name="Catch Signal"/>
+                <value name="Throw Signal"/>
+                <value name="Catch Link"/>
+                <value name="Throw Link"/>
+                <value name="Compensation"/>
+                <value name="Escalation"/>
+                <value name="Parallel Multiple (Catch)"/>
             </enum>
             <enum name="EndEventType" displayedName="End Event Type">
-                <value>None</value>
-                <value>Message</value>
-                <value>Terminate</value>
-                <value>Error</value>
-                <value>Escalation</value>
-                <value>Cancel</value>
-                <value>Compensation</value>
-                <value>Multiple</value>
-                <value>Signal</value>
+                <value name="None"/>
+                <value name="Message"/>
+                <value name="Terminate"/>
+                <value name="Error"/>
+                <value name="Escalation"/>
+                <value name="Cancel"/>
+                <value name="Compensation"/>
+                <value name="Multiple"/>
+                <value name="Signal"/>
             </enum>
             <enum name="GatewayType" displayedName="Gateway Type">
-                <value>Exclusive (Data Based)</value>
-                <value>Exclusive (Event Based)</value>
-                <value>Inclusive</value>
-                <value>Parallel</value>
-				<value>Complex</value>
+                <value name="Exclusive (Data Based)"/>
+                <value name="Exclusive (Event Based)"/>
+                <value name="Inclusive"/>
+                <value name="Parallel"/>
+		<value name="Complex"/>
             </enum>
             <enum name="LoopType" displayedName="Loop Type">
-                <value>No Loop</value>
-                <value>Multiple Instances (Parallel)</value>
-                <value>Multiple Instances (Sequential)</value>
-				<value>Standard Loop</value>
+				<value name="No Loop"/>
+				<value name="Multiple Instances (Parallel)"/>
+				<value name="Multiple Instances (Sequential)"/>
+				<value name="Standard Loop"/>
             </enum>
             <enum name="TaskType" displayedName="Task Type">
-				<value>Abstract</value>
-				<value>Service</value>
-				<value>Send</value>
-				<value>Receive</value>
-				<value>User</value>
-				<value>Manual</value>
-				<value>Business Rule</value>
-				<value>Script</value>
+				<value name="Abstract"/>
+				<value name="Service"/>
+				<value name="Send"/>
+				<value name="Receive"/>
+				<value name="User"/>
+				<value name="Manual"/>
+				<value name="Business Rule"/>
+				<value name="Script"/>
 			</enum>
         </nonGraphicTypes>
         <graphicTypes>
             <node name="BPMNDiagramNode" displayedName="BPMN Diagram">
                 <graphics>
-                    <picture/>
+			<picture>
+				<external file="qml/BPMNDiagramNodeClass.qml"/>
+                        </picture>
                     <labels/>
                     <ports/>
                 </graphics>
@@ -132,58 +134,7 @@
             <node name="StartEvent" displayedName="Start Event">
                 <graphics>
                     <picture sizex="100" sizey="100">
-                        <ellipse fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="0" y2="100" fill-style="none" x1="0" x2="100"/>
-                        <rectangle fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="30" y2="70" fill-style="none" x1="15" x2="85">
-                            <showIf value="Message" property="Type" sign="="/>
-                        </rectangle>
-                        <line fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="30" y2="50" fill-style="none" x1="15" x2="50">
-                            <showIf value="Message" property="Type" sign="="/>
-                        </line>
-                        <line fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="50" y2="30" fill-style="none" x1="50" x2="85">
-                            <showIf value="Message" property="Type" sign="="/>
-                        </line>
-                        <polygon fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" n="5" y1="25" y2="45" y3="75" y4="75" y5="45" fill-style="none" x1="50" x2="20" x3="35" x4="65" x5="80">
-                            <showIf value="Multiple" property="Type" sign="="/>
-                        </polygon>
-                        <ellipse fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="15" y2="85" fill-style="none" x1="15" x2="85">
-                            <showIf value="Timer" property="Type" sign="="/>
-                        </ellipse>
-                        <line fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="50" y2="20" fill-style="none" x1="50" x2="55">
-                            <showIf value="Timer" property="Type" sign="="/>
-                        </line>
-                        <line fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="50" y2="48" fill-style="none" x1="50" x2="75">
-                            <showIf value="Timer" property="Type" sign="="/>
-                        </line>
-                        <rectangle fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="20" y2="80" fill-style="none" x1="25" x2="75">
-                            <showIf value="Conditional" property="Type" sign="="/>
-                        </rectangle>
-                        <line fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="35" y2="35" fill-style="none" x1="25" x2="75">
-                            <showIf value="Conditional" property="Type" sign="="/>
-                        </line>
-                        <line fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="50" y2="50" fill-style="none" x1="25" x2="75">
-                            <showIf value="Conditional" property="Type" sign="="/>
-                        </line>
-                        <line fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="65" y2="65" fill-style="none" x1="25" x2="75">
-                            <showIf value="Conditional" property="Type" sign="="/>
-                        </line>
-                        <polygon fill="#000000" stroke="#000000" stroke-style="solid" stroke-width="1" n="6" x1="40" y1="50" x2="20" y2="75" x3="35" y3="20" x4="60" y4="50" x5="80" y5="25" x6="65" y6="80" fill-style="none">
-                            <showIf value="Error" property="Type" sign="="/>
-                        </polygon>
-                        <polygon fill="#000000" stroke="#000000" stroke-style="solid" stroke-width="1" n="4" x1="50" x2="30" x3="50" x4="70" fill-style="none" y1="50" y2="70" y3="20" y4="70">
-                            <showIf value="Escalation" property="Type" sign="="/>
-                        </polygon>
-                        <polygon fill="#000000" stroke="#000000" stroke-style="solid" stroke-width="1" n="3" y1="50" y2="30" y3="70" fill-style="none" x1="20" x2="45" x3="45">
-                            <showIf value="Compensation" property="Type" sign="="/>
-                        </polygon>
-                        <polygon fill="#000000" stroke="#000000" stroke-style="solid" stroke-width="1" n="3" x1="45" x2="70" x3="70" fill-style="none" y1="50" y2="30" y3="70">
-                            <showIf value="Compensation" property="Type" sign="="/>
-                        </polygon>
-                        <polygon fill="#000000" stroke="#000000" stroke-style="solid" stroke-width="1" n="3" y1="25" y2="70" y3="70" fill-style="none" x1="50" x2="25" x3="75">
-                            <showIf value="Signal" property="Type" sign="="/>
-                        </polygon>
-                        <polygon fill="#000000" stroke="#000000" stroke-style="solid" stroke-width="1" n="12" x1="15" y1="40" x2="40" y2="40" x3="40" y3="15" x4="60" y4="15" x5="60" y5="40" x6="85" y6="40" x7="85" y7="60" x8="60" y8="60" x9="60" y9="85" x10="40" y10="85" x11="40" y11="60" x12="15" y12="60" fill-style="none">
-                            <showIf value="Parallel Multiple" property="Type" sign="="/>
-                        </polygon>
+                        <external file="qml/StartEventClass.qml"/>
                     </picture>
                     <labels>
                         <label x="0a" y="100a" textBinded="text"/>
@@ -205,52 +156,10 @@
                     </properties>
                 </logic>
             </node>
-			<node name="NonInterruptingStartEvent" displayedName="Non-Interrupting Start Event">
+	    <node name="NonInterruptingStartEvent" displayedName="Non-Interrupting Start Event">
                 <graphics>
                     <picture sizex="100" sizey="100">
-                        <ellipse fill="#ffffff" stroke="#000000" stroke-style="dash" stroke-width="0" y1="0" y2="100" fill-style="none" x1="0" x2="100"/>
-                        <rectangle fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="30" y2="70" fill-style="none" x1="15" x2="85">
-                            <showIf value="Message" property="Type" sign="="/>
-                        </rectangle>
-                        <line fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="30" y2="50" fill-style="none" x1="15" x2="50">
-                            <showIf value="Message" property="Type" sign="="/>
-                        </line>
-                        <line fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="50" y2="30" fill-style="none" x1="50" x2="85">
-                            <showIf value="Message" property="Type" sign="="/>
-                        </line>
-                        <polygon fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" n="5" y1="25" y2="45" y3="75" y4="75" y5="45" fill-style="none" x1="50" x2="20" x3="35" x4="65" x5="80">
-                            <showIf value="Multiple" property="Type" sign="="/>
-                        </polygon>
-                        <ellipse fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="15" y2="85" fill-style="none" x1="15" x2="85">
-                            <showIf value="Timer" property="Type" sign="="/>
-                        </ellipse>
-                        <line fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="50" y2="20" fill-style="none" x1="50" x2="55">
-                            <showIf value="Timer" property="Type" sign="="/>
-                        </line>
-                        <line fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="50" y2="48" fill-style="none" x1="50" x2="75">
-                            <showIf value="Timer" property="Type" sign="="/>
-                        </line>
-                        <rectangle fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="20" y2="80" fill-style="none" x1="25" x2="75">
-                            <showIf value="Conditional" property="Type" sign="="/>
-                        </rectangle>
-                        <line fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="35" y2="35" fill-style="none" x1="25" x2="75">
-                            <showIf value="Conditional" property="Type" sign="="/>
-                        </line>
-                        <line fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="50" y2="50" fill-style="none" x1="25" x2="75">
-                            <showIf value="Conditional" property="Type" sign="="/>
-                        </line>
-                        <line fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="65" y2="65" fill-style="none" x1="25" x2="75">
-                            <showIf value="Conditional" property="Type" sign="="/>
-                        </line>
-                        <polygon fill="#000000" stroke="#000000" stroke-style="solid" stroke-width="1" n="4" x1="50" x2="30" x3="50" x4="70" fill-style="none" y1="50" y2="70" y3="20" y4="70">
-                            <showIf value="Escalation" property="Type" sign="="/>
-                        </polygon>
-                        <polygon fill="#000000" stroke="#000000" stroke-style="solid" stroke-width="1" n="3" y1="25" y2="70" y3="70" fill-style="none" x1="50" x2="25" x3="75">
-                            <showIf value="Signal" property="Type" sign="="/>
-                        </polygon>
-                        <polygon fill="#000000" stroke="#000000" stroke-style="solid" stroke-width="1" n="12" x1="15" y1="40" x2="40" y2="40" x3="40" y3="15" x4="60" y4="15" x5="60" y5="40" x6="85" y6="40" x7="85" y7="60" x8="60" y8="60" x9="60" y9="85" x10="40" y10="85" x11="40" y11="60" x12="15" y12="60" fill-style="none">
-                            <showIf value="Parallel Multiple" property="Type" sign="="/>
-                        </polygon>
+                        <external file="qml/NonInterruptingStartEventClass.qml"/>
                     </picture>
                     <labels>
                         <label x="0a" y="100a" textBinded="text"/>
@@ -275,77 +184,7 @@
             <node name="IntermediateEvent" displayedName="Intermediate Event">
                 <graphics>
                     <picture sizex="100" sizey="100">
-                        <ellipse fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="0" y2="100" fill-style="none" x1="0" x2="100"/>
-                        <ellipse fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="7" y2="93" fill-style="none" x1="7" x2="93"/>
-                        <rectangle fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="30" y2="70" fill-style="none" x1="15" x2="85">
-                            <showIf value="Receive Message" property="Type" sign="="/>
-                        </rectangle>
-                        <line fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="30" y2="50" fill-style="none" x1="15" x2="50">
-                            <showIf value="Receive Message" property="Type" sign="="/>
-                        </line>
-                        <line fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="50" y2="30" fill-style="none" x1="50" x2="85">
-                            <showIf value="Receive Message" property="Type" sign="="/>
-                        </line>
-                        <rectangle fill="#000000" stroke="#000000" stroke-style="solid" stroke-width="2" y1="30" y2="70" fill-style="solid" x1="15" x2="85">
-                            <showIf value="Send Message" property="Type" sign="="/>
-                        </rectangle>
-                        <line fill="#ffffff" stroke="#ffffff" stroke-style="solid" stroke-width="2" y1="30" y2="50" fill-style="none" x1="15" x2="50">
-                            <showIf value="Send Message" property="Type" sign="="/>
-                        </line>
-                        <line fill="#ffffff" stroke="#ffffff" stroke-style="solid" stroke-width="2" y1="50" y2="30" fill-style="none" x1="50" x2="85">
-                            <showIf value="Send Message" property="Type" sign="="/>
-                        </line>
-                        <ellipse fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="15" y2="85" fill-style="none" x1="15" x2="85">
-                            <showIf value="Timer" property="Type" sign="="/>
-                        </ellipse>
-                        <line fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="50" y2="20" fill-style="none" x1="50" x2="55">
-                            <showIf value="Timer" property="Type" sign="="/>
-                        </line>
-                        <line fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="50" y2="48" fill-style="none" x1="50" x2="75">
-                            <showIf value="Timer" property="Type" sign="="/>
-                        </line>
-                        <rectangle fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="20" y2="80" fill-style="none" x1="25" x2="75">
-                            <showIf value="Conditional" property="Type" sign="="/>
-                        </rectangle>
-                        <line fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="35" y2="35" fill-style="none" x1="25" x2="75">
-                            <showIf value="Conditional" property="Type" sign="="/>
-                        </line>
-                        <line fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="50" y2="50" fill-style="none" x1="25" x2="75">
-                            <showIf value="Conditional" property="Type" sign="="/>
-                        </line>
-                        <line fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="65" y2="65" fill-style="none" x1="25" x2="75">
-                            <showIf value="Conditional" property="Type" sign="="/>
-                        </line>
-                        <polygon fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" n="5" y1="25" y2="45" y3="75" y4="75" y5="45" fill-style="none" x1="50" x2="20" x3="35" x4="65" x5="80">
-                            <showIf value="Multiple Catch" property="Type" sign="="/>
-                        </polygon>
-                        <polygon fill="#000000" stroke="#000000" stroke-style="solid" stroke-width="0" n="5" y1="25" y2="45" y3="75" y4="75" y5="45" fill-style="solid" x1="50" x2="20" x3="35" x4="65" x5="80">
-                            <showIf value="Multiple Throw" property="Type" sign="="/>
-                        </polygon>
-                        <polygon fill="#000000" stroke="#000000" stroke-style="solid" stroke-width="1" n="4" x1="50" x2="30" x3="50" x4="70" fill-style="solid" y1="50" y2="70" y3="20" y4="70">
-                            <showIf value="Escalation" property="Type" sign="="/>
-                        </polygon>
-                        <polygon fill="#000000" stroke="#000000" stroke-style="solid" stroke-width="1" n="3" y1="50" y2="30" y3="70" fill-style="solid" x1="20" x2="45" x3="45">
-                            <showIf value="Compensation" property="Type" sign="="/>
-                        </polygon>
-                        <polygon fill="#000000" stroke="#000000" stroke-style="solid" stroke-width="1" n="3" x1="45" x2="70" x3="70" fill-style="solid" y1="50" y2="30" y3="70">
-                            <showIf value="Compensation" property="Type" sign="="/>
-                        </polygon>
-                        <polygon fill="#000000" stroke="#000000" stroke-style="solid" stroke-width="1" n="3" y1="25" y2="70" y3="70" fill-style="none" x1="50" x2="25" x3="75">
-                            <showIf value="Catch Signal" property="Type" sign="="/>
-                        </polygon>
-                        <polygon fill="#000000" stroke="#000000" stroke-style="solid" stroke-width="1" n="3" y1="25" y2="70" y3="70" fill-style="solid" x1="50" x2="25" x3="75">
-                            <showIf value="Throw Signal" property="Type" sign="="/>
-                        </polygon>
-                        <polygon fill="#000000" stroke="#000000" stroke-style="solid" stroke-width="1" n="7" x1="15" y1="30" x2="70" y2="30" x3="70" y3="20" x4="85" y4="50" x5="70" y5="80" x6="70" y6="70" x7="15" y7="70" fill-style="none">
-                            <showIf value="Catch Link" property="Type" sign="="/>
-                        </polygon>
-                        <polygon fill="#000000" stroke="#000000" stroke-style="solid" stroke-width="1" n="7" x1="15" y1="30" x2="70" y2="30" x3="70" y3="20" x4="85" y4="50" x5="70" y5="80" x6="70" y6="70" x7="15" y7="70" fill-style="solid">
-                            <showIf value="Throw Link" property="Type" sign="="/>
-                        </polygon>
-                        <polygon fill="#000000" stroke="#000000" stroke-style="solid" stroke-width="1" n="12" x1="15" y1="40" x2="40" y2="40" x3="40" y3="15" x4="60" y4="15" x5="60" y5="40" x6="85" y6="40" x7="85" y7="60" x8="60" y8="60" x9="60" y9="85" x10="40" y10="85" x11="40" y11="60" x12="15" y12="60" fill-style="none">
-                            <showIf value="Parallel Multiple (Catch)" property="Type" sign="="/>
-                        </polygon>
+                        <external file="qml/IntermediateEventClass.qml"/>
                     </picture>
                     <labels>
                         <label x="0a" y="100a" textBinded="text"/>
@@ -370,43 +209,7 @@
             <node name="EndEvent" displayedName="End Event">
                 <graphics>
                     <picture sizex="100" sizey="100">
-                        <ellipse fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="10" y1="3" y2="97" fill-style="none" x1="3" x2="97"/>
-                        <rectangle fill="#000000" stroke="#000000" stroke-style="solid" stroke-width="2" y1="30" y2="70" fill-style="solid" x1="15" x2="85">
-                            <showIf value="Message" property="Type" sign="="/>
-                        </rectangle>
-                        <line fill="#000000" stroke="#ffffff" stroke-style="solid" stroke-width="2" y1="30" y2="50" fill-style="solid" x1="15" x2="50">
-                            <showIf value="Message" property="Type" sign="="/>
-                        </line>
-                        <line fill="#ffffff" stroke="#ffffff" stroke-style="solid" stroke-width="2" y1="50" y2="30" fill-style="none" x1="50" x2="85">
-                            <showIf value="Message" property="Type" sign="="/>
-                        </line>
-                        <ellipse fill="#000000" stroke="#000000" stroke-style="solid" stroke-width="1" y1="15" y2="85" fill-style="solid" x1="15" x2="85">
-                            <showIf value="Terminate" property="Type" sign="="/>
-                        </ellipse>
-                        <polygon fill="#000000" stroke="#000000" stroke-style="solid" stroke-width="1" n="3" y1="25" y2="70" y3="70" fill-style="solid" x1="50" x2="25" x3="75">
-                            <showIf value="Signal" property="Type" sign="="/>
-                        </polygon>
-                        <polygon fill="#000000" stroke="#000000" stroke-style="solid" stroke-width="0" n="5" y1="25" y2="45" y3="75" y4="75" y5="45" fill-style="solid" x1="50" x2="20" x3="35" x4="65" x5="80">
-                            <showIf value="Multiple" property="Type" sign="="/>
-                        </polygon>
-                        <polygon fill="#000000" stroke="#000000" stroke-style="solid" stroke-width="1" n="4" x1="50" x2="30" x3="50" x4="70" fill-style="solid" y1="50" y2="70" y3="20" y4="70">
-                            <showIf value="Escalation" property="Type" sign="="/>
-                        </polygon>
-                        <polygon fill="#000000" stroke="#000000" stroke-style="solid" stroke-width="1" n="3" y1="50" y2="30" y3="70" fill-style="solid" x1="20" x2="45" x3="45">
-                            <showIf value="Compensation" property="Type" sign="="/>
-                        </polygon>
-                        <polygon fill="#000000" stroke="#000000" stroke-style="solid" stroke-width="1" n="3" x1="45" x2="70" x3="70" fill-style="solid" y1="50" y2="30" y3="70">
-                            <showIf value="Compensation" property="Type" sign="="/>
-                        </polygon>
-                        <polygon fill="#000000" stroke="#000000" stroke-style="solid" stroke-width="1" n="6" x1="40" y1="50" x2="20" y2="75" x3="35" y3="20" x4="60" y4="50" x5="80" y5="25" x6="65" y6="80" fill-style="solid">
-                            <showIf value="Error" property="Type" sign="="/>
-                        </polygon>
-                        <line fill="#000000" stroke="#000000" stroke-style="solid" stroke-width="10" y1="25" y2="75" fill-style="solid" x1="25" x2="75">
-                            <showIf value="Cancel" property="Type" sign="="/>
-                        </line>
-                        <line fill="#000000" stroke="#000000" stroke-style="solid" stroke-width="10" y1="25" y2="75" fill-style="solid" x1="75" x2="25">
-                            <showIf value="Cancel" property="Type" sign="="/>
-                        </line>
+			<external file="qml/EndEventClass.qml"/>
                     </picture>
                     <labels>
                         <label x="0a" y="100a" textBinded="text"/>
@@ -431,52 +234,7 @@
             <node name="Gateway" displayedName="Gateway">
                 <graphics>
                     <picture sizex="110" sizey="110">
-                        <line fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="0" y2="55" fill-style="none" x1="55" x2="0"/>
-                        <line fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="55" y2="110" fill-style="none" x1="0" x2="55"/>
-                        <line fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="110" y2="55" fill-style="none" x1="55" x2="110"/>
-                        <line fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="0" y2="55" fill-style="none" x1="55" x2="110"/>
-                        <ellipse fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="5" y1="22" y2="88" fill-style="none" x1="22" x2="88">
-                            <showIf value="Inclusive" property="Type" sign="="/>
-                        </ellipse>
-                        <ellipse fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="25" y2="85" fill-style="none" x1="25" x2="85">
-                            <showIf value="Exclusive (Event Based)" property="Type" sign="="/>
-                        </ellipse>
-                        <ellipse fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="20" y2="90" fill-style="none" x1="20" x2="90">
-                            <showIf value="Exclusive (Event Based)" property="Type" sign="="/>
-                        </ellipse>
-                        <line fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="33" y2="52" fill-style="none" x1="55" x2="35">
-                            <showIf value="Exclusive (Event Based)" property="Type" sign="="/>
-                        </line>
-                        <line fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="75" y2="52" fill-style="none" x1="42" x2="35">
-                            <showIf value="Exclusive (Event Based)" property="Type" sign="="/>
-                        </line>
-                        <line fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="75" y2="75" fill-style="none" x1="42" x2="68">
-                            <showIf value="Exclusive (Event Based)" property="Type" sign="="/>
-                        </line>
-                        <line fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="75" y2="52" fill-style="none" x1="68" x2="75">
-                            <showIf value="Exclusive (Event Based)" property="Type" sign="="/>
-                        </line>
-                        <line fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="33" y2="52" fill-style="none" x1="55" x2="75">
-                            <showIf value="Exclusive (Event Based)" property="Type" sign="="/>
-                        </line>
-                        <line fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="6" y1="30" y2="80" fill-style="none" x1="55" x2="55">
-                            <showIf value="Parallel" property="Type" sign="="/>
-                        </line>
-                        <line fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="6" y1="55" y2="55" fill-style="none" x1="30" x2="80">
-                            <showIf value="Parallel" property="Type" sign="="/>
-                        </line>
-                        <line fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="6" y1="30" y2="80" fill-style="none" x1="55" x2="55">
-                            <showIf value="Complex" property="Type" sign="="/>
-                        </line>
-                        <line fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="6" y1="55" y2="55" fill-style="none" x1="30" x2="80">
-                            <showIf value="Complex" property="Type" sign="="/>
-                        </line>
-                        <line fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="6" y1="35" y2="75" fill-style="none" x1="35" x2="75">
-                            <showIf value="Complex" property="Type" sign="="/>
-                        </line>
-                        <line fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="6" y1="35" y2="75" fill-style="none" x1="75" x2="35">
-                            <showIf value="Complex" property="Type" sign="="/>
-                        </line>
+                        <external file="qml/GatewayClass.qml"/>
                     </picture>
                     <labels>
                         <label x="0a" y="110a" textBinded="text"/>
@@ -501,63 +259,7 @@
             <node name="Task" displayedName="Task">
                 <graphics>
                     <picture sizex="210" sizey="160">
-                        <line fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="45" y2="115" fill-style="none" x1="18" x2="18"/>
-                        <line fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="18" y2="18" fill-style="none" x1="45" x2="165"/>
-                        <line fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="45" y2="115" fill-style="none" x1="192" x2="192"/>
-                        <line fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="142" y2="142" fill-style="none" x1="45" x2="165"/>
-                        <curve fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" fill-style="none">
-                            <start startx="18" starty="45"/>
-                            <end endx="45" endy="18"/>
-                            <ctrl x="15" y="15"/>
-                        </curve>
-                        <curve fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" fill-style="none">
-                            <start startx="192" starty="45"/>
-                            <end endx="165" endy="18"/>
-                            <ctrl x="195" y="15"/>
-                        </curve>
-                        <curve fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" fill-style="none">
-                            <start startx="165" starty="142"/>
-                            <end endx="192" endy="115"/>
-                            <ctrl x="195" y="145"/>
-                        </curve>
-                        <curve fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" fill-style="none">
-                            <start startx="18" starty="115"/>
-                            <end endx="45" endy="142"/>
-                            <ctrl x="15" y="145"/>
-                        </curve>
-                        <line stroke-style="solid" fill-style="none" stroke-width="3" y1="117" fill="#ffffff" y2="133" stroke="#000000" x1="80" x2="80">
-                            <showIf value="Multiple Instances (Parallel)" property="loopType" sign="="/>
-                        </line>
-                        <line stroke-style="solid" fill-style="none" stroke-width="3" y1="117" fill="#ffffff" y2="133" stroke="#000000" x1="90" x2="90">
-                            <showIf value="Multiple Instances (Parallel)" property="loopType" sign="="/>
-                        </line>
-                        <line stroke-style="solid" fill-style="none" stroke-width="3" y1="117" fill="#ffffff" y2="133" stroke="#000000" x1="100" x2="100">
-                            <showIf value="Multiple Instances (Parallel)" property="loopType" sign="="/>
-                        </line>
-                        <line stroke-style="solid" fill-style="none" stroke-width="3" y1="115" fill="#ffffff" y2="115" stroke="#000000" x1="82" x2="98">
-                            <showIf value="Multiple Instances (Sequential)" property="loopType" sign="="/>
-                        </line>
-                        <line stroke-style="solid" fill-style="none" stroke-width="3" y1="125" fill="#ffffff" y2="125" stroke="#000000" x1="82" x2="98">
-                            <showIf value="Multiple Instances (Sequential)" property="loopType" sign="="/>
-                        </line>
-                        <line stroke-style="solid" fill-style="none" stroke-width="3" y1="135" fill="#ffffff" y2="135" stroke="#000000" x1="82" x2="98">
-                            <showIf value="Multiple Instances (Sequential)" property="loopType" sign="="/>
-                        </line>
-                        <ellipse fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="115" y2="135" fill-style="none" x1="80" x2="100">
-							<showIf value="Standard Loop" property="loopType" sign="="/>
-						</ellipse>
-                        <line stroke-style="solid" fill-style="none" stroke-width="0" y1="135" fill="#ffffff" y2="136" stroke="#000000" x1="90" x2="86">
-                            <showIf value="Standard Loop" property="loopType" sign="="/>
-                        </line>
-                        <line stroke-style="solid" fill-style="none" stroke-width="0" y1="135" fill="#ffffff" y2="132" stroke="#000000" x1="90" x2="87">
-                            <showIf value="Standard Loop" property="loopType" sign="="/>
-                        </line>
-                        <polygon fill="#000000" stroke="#000000" stroke-style="solid" stroke-width="1" n="3" y1="125" y2="115" y3="135" fill-style="none" x1="110" x2="125" x3="125">
-                            <showIf value="true" property="isForCompensation" sign="="/>
-                        </polygon>
-                        <polygon fill="#000000" stroke="#000000" stroke-style="solid" stroke-width="1" n="3" x1="125" x2="140" x3="140" fill-style="none" y1="125" y2="115" y3="135">
-                            <showIf value="true" property="isForCompensation" sign="="/>
-                        </polygon>
+                        <external file="qml/TaskClass.qml"/>
                     </picture>
                     <labels>
                         <label x="46a" y="55a" textBinded="Text"/>
@@ -600,114 +302,7 @@
             <node name="Subprocess" displayedName="Subprocess">
                 <graphics>
                     <picture sizex="210" sizey="160">
-                        <line fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="45" y2="115" fill-style="none" x1="18" x2="18"/>
-                        <line fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="18" y2="18" fill-style="none" x1="45" x2="165"/>
-                        <line fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="45" y2="115" fill-style="none" x1="192" x2="192"/>
-                        <line fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="142" y2="142" fill-style="none" x1="45" x2="165"/>
-                        <curve fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" fill-style="none">
-                            <start startx="18" starty="45"/>
-                            <end endx="45" endy="18"/>
-                            <ctrl x="15" y="15"/>
-                        </curve>
-                        <curve fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" fill-style="none">
-                            <start startx="192" starty="45"/>
-                            <end endx="165" endy="18"/>
-                            <ctrl x="195" y="15"/>
-                        </curve>
-                        <curve fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" fill-style="none">
-                            <start startx="165" starty="142"/>
-                            <end endx="192" endy="115"/>
-                            <ctrl x="195" y="145"/>
-                        </curve>
-                        <curve fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" fill-style="none">
-                            <start startx="18" starty="115"/>
-                            <end endx="45" endy="142"/>
-                            <ctrl x="15" y="145"/>
-                        </curve>
-                        <line fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="42" y2="118" fill-style="none" x1="15" x2="15">
-							<showIf value="true" property="transaction" sign="="/>
-						</line>
-                        <line fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="15" y2="15" fill-style="none" x1="42" x2="168">
-							<showIf value="true" property="transaction" sign="="/>
-						</line>
-                        <line fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="42" y2="118" fill-style="none" x1="195" x2="195">
-							<showIf value="true" property="transaction" sign="="/>
-						</line>
-                        <line fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="145" y2="145" fill-style="none" x1="42" x2="168">
-							<showIf value="true" property="transaction" sign="="/>
-						</line>
-                        <curve fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" fill-style="none">
-                            <start startx="15" starty="42"/>
-                            <end endx="42" endy="15"/>
-                            <ctrl x="13" y="13"/>
-							<showIf value="true" property="transaction" sign="="/>
-                        </curve>
-                        <curve fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" fill-style="none">
-                            <start startx="195" starty="45"/>
-                            <end endx="168" endy="15"/>
-                            <ctrl x="197" y="13"/>
-							<showIf value="true" property="transaction" sign="="/>
-                        </curve>
-                        <curve fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" fill-style="none">
-                            <start startx="168" starty="145"/>
-                            <end endx="195" endy="118"/>
-                            <ctrl x="197" y="147"/>
-							<showIf value="true" property="transaction" sign="="/>
-                        </curve>
-                        <curve fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" fill-style="none">
-                            <start startx="15" starty="115"/>
-                            <end endx="42" endy="145"/>
-                            <ctrl x="13" y="147"/>
-							<showIf value="true" property="transaction" sign="="/>
-                        </curve>
-                        <rectangle fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="115" y2="135" fill-style="none" x1="95" x2="115"/>
-                        <line fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="118" y2="132" fill-style="none" x1="105" x2="105"/>
-                        <line fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="125" y2="125" fill-style="none" x1="98" x2="112"/>
-                        <line stroke-style="solid" fill-style="none" stroke-width="3" y1="117" fill="#ffffff" y2="133" stroke="#000000" x1="70" x2="70">
-                            <showIf value="Multiple Instances (Parallel)" property="loopType" sign="="/>
-                        </line>
-                        <line stroke-style="solid" fill-style="none" stroke-width="3" y1="117" fill="#ffffff" y2="133" stroke="#000000" x1="80" x2="80">
-                            <showIf value="Multiple Instances (Parallel)" property="loopType" sign="="/>
-                        </line>
-                        <line stroke-style="solid" fill-style="none" stroke-width="3" y1="117" fill="#ffffff" y2="133" stroke="#000000" x1="90" x2="90">
-                            <showIf value="Multiple Instances (Parallel)" property="loopType" sign="="/>
-                        </line>
-                        <line stroke-style="solid" fill-style="none" stroke-width="3" y1="115" fill="#ffffff" y2="115" stroke="#000000" x1="72" x2="88">
-                            <showIf value="Multiple Instances (Sequential)" property="loopType" sign="="/>
-                        </line>
-                        <line stroke-style="solid" fill-style="none" stroke-width="3" y1="125" fill="#ffffff" y2="125" stroke="#000000" x1="72" x2="88">
-                            <showIf value="Multiple Instances (Sequential)" property="loopType" sign="="/>
-                        </line>
-                        <line stroke-style="solid" fill-style="none" stroke-width="3" y1="135" fill="#ffffff" y2="135" stroke="#000000" x1="72" x2="88">
-                            <showIf value="Multiple Instances (Sequential)" property="loopType" sign="="/>
-                        </line>
-                        <ellipse fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="115" y2="135" fill-style="none" x1="70" x2="90">
-							<showIf value="Standard Loop" property="loopType" sign="="/>
-						</ellipse>
-                        <line stroke-style="solid" fill-style="none" stroke-width="0" y1="135" fill="#ffffff" y2="136" stroke="#000000" x1="80" x2="76">
-                            <showIf value="Standard Loop" property="loopType" sign="="/>
-                        </line>
-                        <line stroke-style="solid" fill-style="none" stroke-width="0" y1="135" fill="#ffffff" y2="132" stroke="#000000" x1="80" x2="77">
-                            <showIf value="Standard Loop" property="loopType" sign="="/>
-                        </line>
-                        <polygon fill="#000000" stroke="#000000" stroke-style="solid" stroke-width="1" n="3" y1="125" y2="115" y3="135" fill-style="none" x1="120" x2="135" x3="135">
-                            <showIf value="true" property="isForCompensation" sign="="/>
-                        </polygon>
-                        <polygon fill="#000000" stroke="#000000" stroke-style="solid" stroke-width="1" n="3" x1="135" x2="150" x3="150" fill-style="none" y1="125" y2="115" y3="135">
-                            <showIf value="true" property="isForCompensation" sign="="/>
-                        </polygon>
-                        <curve fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" fill-style="none">
-                            <start startx="45" starty="125"/>
-                            <end endx="55" endy="125"/>
-                            <ctrl x="50" y="120"/>
-							<showIf value="true" property="adHoc" sign="="/>
-                        </curve>
-                        <curve fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" fill-style="none">
-                            <start startx="55" starty="125"/>
-                            <end endx="65" endy="125"/>
-                            <ctrl x="60" y="130"/>
-							<showIf value="true" property="adHoc" sign="="/>
-                        </curve>
+                        <external file="qml/SubprocessClass.qml"/>
                     </picture>
                     <labels>
                         <label x="40a" y="145a" textBinded="Text"/>
@@ -755,66 +350,7 @@
             <node name="EventSubprocess" displayedName="Event Subprocess">
                 <graphics>
                     <picture sizex="210" sizey="160">
-                        <line fill="#ffffff" stroke="#000000" stroke-style="dash" stroke-width="0" y1="45" y2="115" fill-style="none" x1="18" x2="18"/>
-                        <line fill="#ffffff" stroke="#000000" stroke-style="dash" stroke-width="0" y1="18" y2="18" fill-style="none" x1="45" x2="165"/>
-                        <line fill="#ffffff" stroke="#000000" stroke-style="dash" stroke-width="0" y1="45" y2="115" fill-style="none" x1="192" x2="192"/>
-                        <line fill="#ffffff" stroke="#000000" stroke-style="dash" stroke-width="0" y1="142" y2="142" fill-style="none" x1="45" x2="165"/>
-                        <curve fill="#ffffff" stroke="#000000" stroke-style="dash" stroke-width="0" fill-style="none">
-                            <start startx="18" starty="45"/>
-                            <end endx="45" endy="18"/>
-                            <ctrl x="15" y="15"/>
-                        </curve>
-                        <curve fill="#ffffff" stroke="#000000" stroke-style="dash" stroke-width="0" fill-style="none">
-                            <start startx="192" starty="45"/>
-                            <end endx="165" endy="18"/>
-                            <ctrl x="195" y="15"/>
-                        </curve>
-                        <curve fill="#ffffff" stroke="#000000" stroke-style="dash" stroke-width="0" fill-style="none">
-                            <start startx="165" starty="142"/>
-                            <end endx="192" endy="115"/>
-                            <ctrl x="195" y="145"/>
-                        </curve>
-                        <curve fill="#ffffff" stroke="#000000" stroke-style="dash" stroke-width="0" fill-style="none">
-                            <start startx="18" starty="115"/>
-                            <end endx="45" endy="142"/>
-                            <ctrl x="15" y="145"/>
-                        </curve>
-                        <rectangle fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="115" y2="135" fill-style="none" x1="95" x2="115"/>
-                        <line fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="118" y2="132" fill-style="none" x1="105" x2="105"/>
-                        <line fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="125" y2="125" fill-style="none" x1="98" x2="112"/>
-                        <line stroke-style="solid" fill-style="none" stroke-width="3" y1="117" fill="#ffffff" y2="133" stroke="#000000" x1="70" x2="70">
-                            <showIf value="Multiple Instances (Parallel)" property="loopType" sign="="/>
-                        </line>
-                        <line stroke-style="solid" fill-style="none" stroke-width="3" y1="117" fill="#ffffff" y2="133" stroke="#000000" x1="80" x2="80">
-                            <showIf value="Multiple Instances (Parallel)" property="loopType" sign="="/>
-                        </line>
-                        <line stroke-style="solid" fill-style="none" stroke-width="3" y1="117" fill="#ffffff" y2="133" stroke="#000000" x1="90" x2="90">
-                            <showIf value="Multiple Instances (Parallel)" property="loopType" sign="="/>
-                        </line>
-                        <line stroke-style="solid" fill-style="none" stroke-width="3" y1="115" fill="#ffffff" y2="115" stroke="#000000" x1="72" x2="88">
-                            <showIf value="Multiple Instances (Sequential)" property="loopType" sign="="/>
-                        </line>
-                        <line stroke-style="solid" fill-style="none" stroke-width="3" y1="125" fill="#ffffff" y2="125" stroke="#000000" x1="72" x2="88">
-                            <showIf value="Multiple Instances (Sequential)" property="loopType" sign="="/>
-                        </line>
-                        <line stroke-style="solid" fill-style="none" stroke-width="3" y1="135" fill="#ffffff" y2="135" stroke="#000000" x1="72" x2="88">
-                            <showIf value="Multiple Instances (Sequential)" property="loopType" sign="="/>
-                        </line>
-                        <ellipse fill="#ffffff" stroke="#000000" stroke-style="solid" stroke-width="0" y1="115" y2="135" fill-style="none" x1="70" x2="90">
-							<showIf value="Standard Loop" property="loopType" sign="="/>
-						</ellipse>
-                        <line stroke-style="solid" fill-style="none" stroke-width="0" y1="135" fill="#ffffff" y2="136" stroke="#000000" x1="80" x2="76">
-                            <showIf value="Standard Loop" property="loopType" sign="="/>
-                        </line>
-                        <line stroke-style="solid" fill-style="none" stroke-width="0" y1="135" fill="#ffffff" y2="132" stroke="#000000" x1="80" x2="77">
-                            <showIf value="Standard Loop" property="loopType" sign="="/>
-                        </line>
-                        <polygon fill="#000000" stroke="#000000" stroke-style="solid" stroke-width="1" n="3" y1="125" y2="115" y3="135" fill-style="none" x1="120" x2="135" x3="135">
-                            <showIf value="true" property="isForCompensation" sign="="/>
-                        </polygon>
-                        <polygon fill="#000000" stroke="#000000" stroke-style="solid" stroke-width="1" n="3" x1="135" x2="150" x3="150" fill-style="none" y1="125" y2="115" y3="135">
-                            <showIf value="true" property="isForCompensation" sign="="/>
-                        </polygon>
+			<external file="qml/EventSubprocessClass.qml"/>
                     </picture>
                     <labels>
                         <label x="46a" y="55a" textBinded="Text"/>
@@ -857,9 +393,7 @@
 			<node name="DataObject" displayedName="Data Object">
 				<graphics>
 					<picture sizex="50" sizey="80">
-						<polygon fill="#000000" stroke="#000000" stroke-style="solid" fill-style="none" stroke-width="1" n="5" x1="0" y1="0" x2="40" y2="0" x3="50" y3="10" x4="50" y4="80" x5="0" y5="80"/>
-						<line fill="#000000" stroke="#000000" stroke-style="solid" fill-style="none" stroke-width="1" x1="40" y1="0" x2="40" y2="10"/>
-						<line fill="#000000" stroke="#000000" stroke-style="solid" fill-style="none" stroke-width="1" x1="40" y1="10" x2="50" y2="10"/>
+						<external file="qml/DataObjectClass.qml"/>
 					</picture>
 					<labels>
 						<label x="1a" y="81a" textBinded="Text"/>
@@ -1668,7 +1202,7 @@
           <node name="Lane" displayedName="Lane">
                 <graphics>
                     <picture sizex="450" sizey="150">
-                        <rectangle stroke-style="solid" fill-style="none" stroke-width="0" y1="0" y2="150" fill="#ffffff" x1="0" stroke="#000000" x2="450"/>
+                        <external file="qml/LaneClass.qml"/>
                     </picture>
                     <labels>
                         <label x="2a" y="145a" textBinded="text" rotation="-90"/>
@@ -1692,17 +1226,7 @@
             <node name="Pool" displayedName="Pool">
                 <graphics>
                     <picture sizex="450" sizey="150">
-                        <rectangle stroke-style="solid" fill-style="none" stroke-width="0" y1="0" fill="#ffffff" y2="150" stroke="#000000" x1="0" x2="450"/>
-                        <line stroke-style="solid" fill-style="none" stroke-width="0" y1="0" fill="#ffffff" y2="150" stroke="#000000" x1="30a" x2="30a"/>
-                        <line stroke-style="solid" fill-style="none" stroke-width="2" y1="125" fill="#ffffff" y2="145" stroke="#000000" x1="215" x2="215">
-                            <showIf value="true" property="multiple" sign="="/>
-                        </line>
-                        <line stroke-style="solid" fill-style="none" stroke-width="2" y1="125" fill="#ffffff" y2="145" stroke="#000000" x1="225" x2="225">
-                            <showIf value="true" property="multiple" sign="="/>
-                        </line>
-                        <line stroke-style="solid" fill-style="none" stroke-width="2" y1="125" fill="#ffffff" y2="145" stroke="#000000" x1="235" x2="235">
-                            <showIf value="true" property="multiple" sign="="/>
-                        </line>
+			<external file="qml/PoolClass.qml"/>
                     </picture>
                     <labels>
                         <label x="2a" y="145a" textBinded="text" rotation="-90"/>
diff --git a/plugins/bpmn/qml/BPMNDiagramNodeClass.qml b/plugins/bpmn/qml/BPMNDiagramNodeClass.qml
new file mode 100644
index 0000000000..162f291e65
--- /dev/null
+++ b/plugins/bpmn/qml/BPMNDiagramNodeClass.qml
@@ -0,0 +1,7 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	property variant ids: ""
+	width: 50; height: 50
+	color: "transparent"
+} 
diff --git a/plugins/bpmn/qml/DataObjectClass.qml b/plugins/bpmn/qml/DataObjectClass.qml
new file mode 100644
index 0000000000..43e500a1f0
--- /dev/null
+++ b/plugins/bpmn/qml/DataObjectClass.qml
@@ -0,0 +1,36 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	property string ids: ""
+	width: 50; height: 80
+	color: "transparent"
+	Polygon { 
+		fill: "#000000"
+		style: "solid"
+		width: 1
+		color: "#000000"
+		sizex: parent.width
+		sizey: parent.height
+		x: "0,40,50,50,0"
+		y: "0,0,10,80,80"
+		n: 5
+	} 
+	Line { 
+		x1: 4 * parent.width / 5
+		y1: 0 * parent.height / 1
+		x2: 4 * parent.width / 5
+		y2: 1 * parent.height / 8
+		color: "#000000"
+		style: "solid"
+		width: 1
+	} 
+	Line { 
+		x1: 4 * parent.width / 5
+		y1: 1 * parent.height / 8
+		x2: 1 * parent.width / 1
+		y2: 1 * parent.height / 8
+		color: "#000000"
+		style: "solid"
+		width: 1
+	} 
+} 
diff --git a/plugins/bpmn/qml/EndEventClass.qml b/plugins/bpmn/qml/EndEventClass.qml
new file mode 100644
index 0000000000..d8bbbf486a
--- /dev/null
+++ b/plugins/bpmn/qml/EndEventClass.qml
@@ -0,0 +1,150 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	property string ids: ""
+	width: 100; height: 100
+	color: "transparent"
+    Rectangle {
+        anchors.fill: parent
+        x: 15 * parent.width / 100
+        y: 15 * parent.height / 50
+        width: 7 * parent.width / 10
+        height: 2 * parent.height / 5
+        border.color: "#000000"
+        border.width: 2
+    }
+
+	Ellipse { 
+		x: 5 * parent.width / 10
+		y: 5 * parent.height / 10
+		width: 47 * parent.width / 50
+		height: 47 * parent.height / 50
+		color: "#ffffff"
+		border.color: "#000000"
+		border.style: "solid"
+		border.width: 10
+	} 
+	Line { 
+		x1: 3 * parent.width / 20
+		y1: 3 * parent.height / 10
+		x2: 1 * parent.width / 2
+		y2: 1 * parent.height / 2
+		visible: models.getProperties(ids, "Type")== "Message"
+		color: "#ffffff"
+		style: "solid"
+		width: 2
+	} 
+	Line { 
+		x1: 1 * parent.width / 2
+		y1: 1 * parent.height / 2
+		x2: 17 * parent.width / 20
+		y2: 3 * parent.height / 10
+		visible: models.getProperties(ids, "Type")== "Message"
+		color: "#ffffff"
+		style: "solid"
+		width: 2
+	} 
+	Ellipse { 
+		visible: models.getProperties(ids, "Type")== "Terminate"
+		x: 50 * parent.width / 100
+		y: 50 * parent.height / 100
+		width: 7 * parent.width / 10
+		height: 7 * parent.height / 10
+		color: "#000000"
+		border.color: "#000000"
+		border.style: "solid"
+		border.width: 1
+	} 
+	Polygon { 
+		fill: "#000000"
+		visible: models.getProperties(ids, "Type")== "Signal"
+		style: "solid"
+		width: 1
+		color: "#000000"
+		sizex: parent.width
+		sizey: parent.height
+		x: "50,25,75"
+		y: "25,70,70"
+		n: 3
+	} 
+	Polygon { 
+		fill: "#000000"
+		visible: models.getProperties(ids, "Type")== "Multiple"
+		style: "solid"
+		width: 0
+		color: "#000000"
+		sizex: parent.width
+		sizey: parent.height
+		x: "50,20,35,65,80"
+		y: "25,45,75,75,45"
+		n: 5
+	} 
+	Polygon { 
+		fill: "#000000"
+		visible: models.getProperties(ids, "Type")== "Escalation"
+		style: "solid"
+		width: 1
+		color: "#000000"
+		sizex: parent.width
+		sizey: parent.height
+		x: "50,30,50,70"
+		y: "50,70,20,70"
+		n: 4
+	} 
+	Polygon { 
+		fill: "#000000"
+		visible: models.getProperties(ids, "Type")== "Compensation"
+		style: "solid"
+		width: 1
+		color: "#000000"
+		sizex: parent.width
+		sizey: parent.height
+		x: "20,45,45"
+		y: "50,30,70"
+		n: 3
+	} 
+	Polygon { 
+		fill: "#000000"
+		visible: models.getProperties(ids, "Type")== "Compensation"
+		style: "solid"
+		width: 1
+		color: "#000000"
+		sizex: parent.width
+		sizey: parent.height
+		x: "45,70,70"
+		y: "50,30,70"
+		n: 3
+	} 
+	Polygon { 
+		fill: "#000000"
+		visible: models.getProperties(ids, "Type")== "Error"
+		style: "solid"
+		width: 1
+		color: "#000000"
+		sizex: parent.width
+		sizey: parent.height
+		x: "40,20,35,60,80,65"
+		y: "50,75,20,50,25,80"
+		n: 6
+	} 
+	Line { 
+		x1: 1 * parent.width / 4
+		y1: 1 * parent.height / 4
+		x2: 3 * parent.width / 4
+		y2: 3 * parent.height / 4
+		visible: models.getProperties(ids, "Type")== "Cancel"
+		color: "#000000"
+		style: "solid"
+		width: 10
+	} 
+	Line { 
+		x1: 3 * parent.width / 4
+		y1: 1 * parent.height / 4
+		x2: 1 * parent.width / 4
+		y2: 3 * parent.height / 4
+		visible: models.getProperties(ids, "Type")== "Cancel"
+		color: "#000000"
+		style: "solid"
+		width: 10
+	} 
+} 
diff --git a/plugins/bpmn/qml/EventSubprocessClass.qml b/plugins/bpmn/qml/EventSubprocessClass.qml
new file mode 100644
index 0000000000..cebf444a69
--- /dev/null
+++ b/plugins/bpmn/qml/EventSubprocessClass.qml
@@ -0,0 +1,242 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	property string ids: ""
+	width: 210; height: 160
+	color: "transparent"
+	Rectangle { 
+		anchors.fill: parent
+		x: 19 * parent.width / 42
+		y: 23 * parent.height / 32
+		width: 2 * parent.width / 21
+		height: 1 * parent.height / 8
+		border.color: "#ffffff"
+		border.width: 0
+	} 
+	Line { 
+		x1: 3 * parent.width / 35
+		y1: 9 * parent.height / 32
+		x2: 3 * parent.width / 35
+		y2: 23 * parent.height / 32
+		color: "#000000"
+		style: "dash"
+		width: 0
+	} 
+	Line { 
+		x1: 3 * parent.width / 14
+		y1: 9 * parent.height / 80
+		x2: 11 * parent.width / 14
+		y2: 9 * parent.height / 80
+		color: "#000000"
+		style: "dash"
+		width: 0
+	} 
+	Line { 
+		x1: 32 * parent.width / 35
+		y1: 9 * parent.height / 32
+		x2: 32 * parent.width / 35
+		y2: 23 * parent.height / 32
+		color: "#000000"
+		style: "dash"
+		width: 0
+	} 
+	Line { 
+		x1: 3 * parent.width / 14
+		y1: 71 * parent.height / 80
+		x2: 11 * parent.width / 14
+		y2: 71 * parent.height / 80
+		color: "#000000"
+		style: "dash"
+		width: 0
+	} 
+	Curve { 
+		fill: "#ffffff"
+		style: "dash"
+		color: "#000000"
+		sizex: parent.width
+		sizey: parent.height
+		width: 0
+		startx: 18
+		starty: 45
+		endx: 45
+		endy: 18
+		x: 15
+		y: 15
+	}
+	Curve { 
+		fill: "#ffffff"
+		style: "dash"
+		color: "#000000"
+		sizex: parent.width
+		sizey: parent.height
+		width: 0
+		startx: 192
+		starty: 45
+		endx: 165
+		endy: 18
+		x: 195
+		y: 15
+	}
+	Curve { 
+		fill: "#ffffff"
+		style: "dash"
+		color: "#000000"
+		sizex: parent.width
+		sizey: parent.height
+		width: 0
+		startx: 165
+		starty: 142
+		endx: 192
+		endy: 115
+		x: 195
+		y: 145
+	}
+	Curve { 
+		fill: "#ffffff"
+		style: "dash"
+		color: "#000000"
+		sizex: parent.width
+		sizey: parent.height
+		width: 0
+		startx: 18
+		starty: 115
+		endx: 45
+		endy: 142
+		x: 15
+		y: 145
+	}
+
+	Line { 
+		x1: 1 * parent.width / 2
+		y1: 59 * parent.height / 80
+		x2: 1 * parent.width / 2
+		y2: 33 * parent.height / 40
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+	Line { 
+		x1: 7 * parent.width / 15
+		y1: 25 * parent.height / 32
+		x2: 8 * parent.width / 15
+		y2: 25 * parent.height / 32
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+	Line { 
+		x1: 1 * parent.width / 3
+		y1: 117 * parent.height / 160
+		x2: 1 * parent.width / 3
+		y2: 133 * parent.height / 160
+		visible: models.getProperties(ids, "loopType")== "Multiple Instances (Parallel)"
+		color: "#000000"
+		style: "solid"
+		width: 3
+	} 
+	Line { 
+		x1: 8 * parent.width / 21
+		y1: 117 * parent.height / 160
+		x2: 8 * parent.width / 21
+		y2: 133 * parent.height / 160
+		visible: models.getProperties(ids, "loopType")== "Multiple Instances (Parallel)"
+		color: "#000000"
+		style: "solid"
+		width: 3
+	} 
+	Line { 
+		x1: 3 * parent.width / 7
+		y1: 117 * parent.height / 160
+		x2: 3 * parent.width / 7
+		y2: 133 * parent.height / 160
+		visible: models.getProperties(ids, "loopType")== "Multiple Instances (Parallel)"
+		color: "#000000"
+		style: "solid"
+		width: 3
+	} 
+	Line { 
+		x1: 12 * parent.width / 35
+		y1: 23 * parent.height / 32
+		x2: 44 * parent.width / 105
+		y2: 23 * parent.height / 32
+		visible: models.getProperties(ids, "loopType")== "Multiple Instances (Sequential)"
+		color: "#000000"
+		style: "solid"
+		width: 3
+	} 
+	Line { 
+		x1: 12 * parent.width / 35
+		y1: 25 * parent.height / 32
+		x2: 44 * parent.width / 105
+		y2: 25 * parent.height / 32
+		visible: models.getProperties(ids, "loopType")== "Multiple Instances (Sequential)"
+		color: "#000000"
+		style: "solid"
+		width: 3
+	} 
+	Line { 
+		x1: 12 * parent.width / 35
+		y1: 27 * parent.height / 32
+		x2: 44 * parent.width / 105
+		y2: 27 * parent.height / 32
+		visible: models.getProperties(ids, "loopType")== "Multiple Instances (Sequential)"
+		color: "#000000"
+		style: "solid"
+		width: 3
+	} 
+	Ellipse { 
+		visible: models.getProperties(ids, "loopType")== "Standard Loop"
+		x: 8 * parent.width / 21
+		y: 25 * parent.height / 32
+		width: 2 * parent.width / 21
+		height: 1 * parent.height / 8
+		color: "#ffffff"
+		border.color: "#000000"
+		border.style: "solid"
+		border.width: 0
+	} 
+	Line { 
+		x1: 8 * parent.width / 21
+		y1: 27 * parent.height / 32
+		x2: 38 * parent.width / 105
+		y2: 17 * parent.height / 20
+		visible: models.getProperties(ids, "loopType")== "Standard Loop"
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+	Line { 
+		x1: 8 * parent.width / 21
+		y1: 27 * parent.height / 32
+		x2: 11 * parent.width / 30
+		y2: 33 * parent.height / 40
+		visible: models.getProperties(ids, "loopType")== "Standard Loop"
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+	Polygon { 
+		fill: "#000000"
+		visible: models.getProperties(ids, "isForCompensation")== "true"
+		style: "solid"
+		width: 1
+		color: "#000000"
+		sizex: parent.width
+		sizey: parent.height
+		x: "120,135,135"
+		y: "125,115,135"
+		n: 3
+	} 
+	Polygon { 
+		fill: "#000000"
+		visible: models.getProperties(ids, "isForCompensation")== "true"
+		style: "solid"
+		width: 1
+		color: "#000000"
+		sizex: parent.width
+		sizey: parent.height
+		x: "135,150,150"
+		y: "125,115,135"
+		n: 3
+	} 
+} 
diff --git a/plugins/bpmn/qml/GatewayClass.qml b/plugins/bpmn/qml/GatewayClass.qml
new file mode 100644
index 0000000000..ac0824f7cb
--- /dev/null
+++ b/plugins/bpmn/qml/GatewayClass.qml
@@ -0,0 +1,186 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	property string ids: ""
+	width: 110; height: 110
+	color: "transparent"
+	Line { 
+		x1: 1 * parent.width / 2
+		y1: 0 * parent.height / 1
+		x2: 0 * parent.width / 1
+		y2: 1 * parent.height / 2
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+	Line { 
+		x1: 0 * parent.width / 1
+		y1: 1 * parent.height / 2
+		x2: 1 * parent.width / 2
+		y2: 1 * parent.height / 1
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+	Line { 
+		x1: 1 * parent.width / 2
+		y1: 1 * parent.height / 1
+		x2: 1 * parent.width / 1
+		y2: 1 * parent.height / 2
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+	Line { 
+		x1: 1 * parent.width / 2
+		y1: 0 * parent.height / 1
+		x2: 1 * parent.width / 1
+		y2: 1 * parent.height / 2
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+	Ellipse { 
+		visible: models.getProperties(ids, "Type")== "Inclusive"
+		x: 11 * parent.width / 22
+		y: 11 * parent.height / 22
+		width: 3 * parent.width / 5
+		height: 3 * parent.height / 5
+		color: "#ffffff"
+		border.color: "#000000"
+		border.style: "solid"
+		border.width: 5
+	} 
+	Ellipse { 
+		visible: models.getProperties(ids, "Type")== "Exclusive (Event Based)"
+		x: 1 * parent.width / 2
+		y: 1 * parent.height / 2
+		width: 6 * parent.width / 11
+		height: 6 * parent.height / 11
+		color: "#ffffff"
+		border.color: "#000000"
+		border.style: "solid"
+		border.width: 0
+	} 
+	Ellipse { 
+		visible: models.getProperties(ids, "Type")== "Exclusive (Event Based)"
+		x: 1 * parent.width / 2
+		y: 1 * parent.height / 2
+		width: 7 * parent.width / 11
+		height: 7 * parent.height / 11
+		color: "#ffffff"
+		border.color: "#000000"
+		border.style: "solid"
+		border.width: 0
+	} 
+	Line { 
+		x1: 1 * parent.width / 2
+		y1: 3 * parent.height / 10
+		x2: 7 * parent.width / 22
+		y2: 26 * parent.height / 55
+		visible: models.getProperties(ids, "Type")== "Exclusive (Event Based)"
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+	Line { 
+		x1: 21 * parent.width / 55
+		y1: 15 * parent.height / 22
+		x2: 7 * parent.width / 22
+		y2: 26 * parent.height / 55
+		visible: models.getProperties(ids, "Type")== "Exclusive (Event Based)"
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+	Line { 
+		x1: 21 * parent.width / 55
+		y1: 15 * parent.height / 22
+		x2: 34 * parent.width / 55
+		y2: 15 * parent.height / 22
+		visible: models.getProperties(ids, "Type")== "Exclusive (Event Based)"
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+	Line { 
+		x1: 34 * parent.width / 55
+		y1: 15 * parent.height / 22
+		x2: 15 * parent.width / 22
+		y2: 26 * parent.height / 55
+		visible: models.getProperties(ids, "Type")== "Exclusive (Event Based)"
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+	Line { 
+		x1: 1 * parent.width / 2
+		y1: 3 * parent.height / 10
+		x2: 15 * parent.width / 22
+		y2: 26 * parent.height / 55
+		visible: models.getProperties(ids, "Type")== "Exclusive (Event Based)"
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+	Line { 
+		x1: 1 * parent.width / 2
+		y1: 3 * parent.height / 11
+		x2: 1 * parent.width / 2
+		y2: 8 * parent.height / 11
+		visible: models.getProperties(ids, "Type")== "Parallel"
+		color: "#000000"
+		style: "solid"
+		width: 6
+	} 
+	Line { 
+		x1: 3 * parent.width / 11
+		y1: 1 * parent.height / 2
+		x2: 8 * parent.width / 11
+		y2: 1 * parent.height / 2
+		visible: models.getProperties(ids, "Type")== "Parallel"
+		color: "#000000"
+		style: "solid"
+		width: 6
+	} 
+	Line { 
+		x1: 1 * parent.width / 2
+		y1: 3 * parent.height / 11
+		x2: 1 * parent.width / 2
+		y2: 8 * parent.height / 11
+		visible: models.getProperties(ids, "Type")== "Complex"
+		color: "#000000"
+		style: "solid"
+		width: 6
+	} 
+	Line { 
+		x1: 3 * parent.width / 11
+		y1: 1 * parent.height / 2
+		x2: 8 * parent.width / 11
+		y2: 1 * parent.height / 2
+		visible: models.getProperties(ids, "Type")== "Complex"
+		color: "#000000"
+		style: "solid"
+		width: 6
+	} 
+	Line { 
+		x1: 7 * parent.width / 22
+		y1: 7 * parent.height / 22
+		x2: 15 * parent.width / 22
+		y2: 15 * parent.height / 22
+		visible: models.getProperties(ids, "Type")== "Complex"
+		color: "#000000"
+		style: "solid"
+		width: 6
+	} 
+	Line { 
+		x1: 15 * parent.width / 22
+		y1: 7 * parent.height / 22
+		x2: 7 * parent.width / 22
+		y2: 15 * parent.height / 22
+		visible: models.getProperties(ids, "Type")== "Complex"
+		color: "#000000"
+		style: "solid"
+		width: 6
+	} 
+} 
diff --git a/plugins/bpmn/qml/IntermediateEventClass.qml b/plugins/bpmn/qml/IntermediateEventClass.qml
new file mode 100644
index 0000000000..78d169d4e0
--- /dev/null
+++ b/plugins/bpmn/qml/IntermediateEventClass.qml
@@ -0,0 +1,279 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	property string ids: ""
+	width: 100; height: 100
+	color: "transparent"
+    Rectangle {
+        anchors.fill: parent
+        x: 1 * parent.width / 4
+        y: 1 * parent.height / 5
+        width: 1 * parent.width / 2
+        height: 3 * parent.height / 5
+        border.color: "#ffffff"
+        border.width: 0
+    }
+    Rectangle {
+        anchors.fill: parent
+        x: 3 * parent.width / 20
+        y: 3 * parent.height / 10
+        width: 7 * parent.width / 10
+        height: 2 * parent.height / 5
+        border.color: "#ffffff"
+        border.width: 0
+    }
+
+    Rectangle {
+        anchors.fill: parent
+        x: 15 * parent.width / 100
+        y: 15 * parent.height / 50
+        width: 7 * parent.width / 10
+        height: 2 * parent.height / 5
+        border.color: "#000000"
+        border.width: 2
+    }
+
+	Ellipse { 
+		x: 1 * parent.width / 2
+		y: 1 * parent.height / 2
+		width: 1 * parent.width / 1
+		height: 1 * parent.height / 1
+		color: "#ffffff"
+		border.color: "#000000"
+		border.style: "solid"
+		border.width: 0
+	} 
+	Ellipse { 
+		x: 1 * parent.width / 2
+		y: 1 * parent.height / 2
+		width: 43 * parent.width / 50
+		height: 43 * parent.height / 50
+		color: "#ffffff"
+		border.color: "#000000"
+		border.style: "solid"
+		border.width: 0
+	} 
+	Line { 
+		x1: 3 * parent.width / 20
+		y1: 3 * parent.height / 10
+		x2: 1 * parent.width / 2
+		y2: 1 * parent.height / 2
+		visible: models.getProperties(ids, "Type")== "Receive Message"
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+	Line { 
+		x1: 1 * parent.width / 2
+		y1: 1 * parent.height / 2
+		x2: 17 * parent.width / 20
+		y2: 3 * parent.height / 10
+		visible: models.getProperties(ids, "Type")== "Receive Message"
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+
+	Line { 
+		x1: 3 * parent.width / 20
+		y1: 3 * parent.height / 10
+		x2: 1 * parent.width / 2
+		y2: 1 * parent.height / 2
+		visible: models.getProperties(ids, "Type")== "Send Message"
+		color: "#ffffff"
+		style: "solid"
+		width: 2
+	} 
+	Line { 
+		x1: 1 * parent.width / 2
+		y1: 1 * parent.height / 2
+		x2: 17 * parent.width / 20
+		y2: 3 * parent.height / 10
+		visible: models.getProperties(ids, "Type")== "Send Message"
+		color: "#ffffff"
+		style: "solid"
+		width: 2
+	} 
+	Ellipse { 
+		visible: models.getProperties(ids, "Type")== "Timer"
+		x: 1 * parent.width / 2
+		y: 1 * parent.height / 2
+		width: 7 * parent.width / 10
+		height: 7 * parent.height / 10
+		color: "#ffffff"
+		border.color: "#000000"
+		border.style: "solid"
+		border.width: 0
+	} 
+	Line { 
+		x1: 1 * parent.width / 2
+		y1: 1 * parent.height / 2
+		x2: 11 * parent.width / 20
+		y2: 1 * parent.height / 5
+		visible: models.getProperties(ids, "Type")== "Timer"
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+	Line { 
+		x1: 1 * parent.width / 2
+		y1: 1 * parent.height / 2
+		x2: 3 * parent.width / 4
+		y2: 12 * parent.height / 25
+		visible: models.getProperties(ids, "Type")== "Timer"
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+
+	Line { 
+		x1: 1 * parent.width / 4
+		y1: 7 * parent.height / 20
+		x2: 3 * parent.width / 4
+		y2: 7 * parent.height / 20
+		visible: models.getProperties(ids, "Type")== "Conditional"
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+	Line { 
+		x1: 1 * parent.width / 4
+		y1: 1 * parent.height / 2
+		x2: 3 * parent.width / 4
+		y2: 1 * parent.height / 2
+		visible: models.getProperties(ids, "Type")== "Conditional"
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+	Line { 
+		x1: 1 * parent.width / 4
+		y1: 13 * parent.height / 20
+		x2: 3 * parent.width / 4
+		y2: 13 * parent.height / 20
+		visible: models.getProperties(ids, "Type")== "Conditional"
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+	Polygon { 
+		fill: "#ffffff"
+		visible: models.getProperties(ids, "Type")== "Multiple Catch"
+		style: "solid"
+		width: 0
+		color: "#000000"
+		sizex: parent.width
+		sizey: parent.height
+		x: "50,20,35,65,80"
+		y: "25,45,75,75,45"
+		n: 5
+	} 
+	Polygon { 
+		fill: "#000000"
+		visible: models.getProperties(ids, "Type")== "Multiple Throw"
+		style: "solid"
+		width: 0
+		color: "#000000"
+		sizex: parent.width
+		sizey: parent.height
+		x: "50,20,35,65,80"
+		y: "25,45,75,75,45"
+		n: 5
+	} 
+	Polygon { 
+		fill: "#000000"
+		visible: models.getProperties(ids, "Type")== "Escalation"
+		style: "solid"
+		width: 1
+		color: "#000000"
+		sizex: parent.width
+		sizey: parent.height
+		x: "50,30,50,70"
+		y: "50,70,20,70"
+		n: 4
+	} 
+	Polygon { 
+		fill: "#000000"
+		visible: models.getProperties(ids, "Type")== "Compensation"
+		style: "solid"
+		width: 1
+		color: "#000000"
+		sizex: parent.width
+		sizey: parent.height
+		x: "20,45,45"
+		y: "50,30,70"
+		n: 3
+	} 
+	Polygon { 
+		fill: "#000000"
+		visible: models.getProperties(ids, "Type")== "Compensation"
+		style: "solid"
+		width: 1
+		color: "#000000"
+		sizex: parent.width
+		sizey: parent.height
+		x: "45,70,70"
+		y: "50,30,70"
+		n: 3
+	} 
+	Polygon { 
+		fill: "#000000"
+		visible: models.getProperties(ids, "Type")== "Catch Signal"
+		style: "solid"
+		width: 1
+		color: "#000000"
+		sizex: parent.width
+		sizey: parent.height
+		x: "50,25,75"
+		y: "25,70,70"
+		n: 3
+	} 
+	Polygon { 
+		fill: "#000000"
+		visible: models.getProperties(ids, "Type")== "Throw Signal"
+		style: "solid"
+		width: 1
+		color: "#000000"
+		sizex: parent.width
+		sizey: parent.height
+		x: "50,25,75"
+		y: "25,70,70"
+		n: 3
+	} 
+	Polygon { 
+		fill: "#000000"
+		visible: models.getProperties(ids, "Type")== "Catch Link"
+		style: "solid"
+		width: 1
+		color: "#000000"
+		sizex: parent.width
+		sizey: parent.height
+		x: "15,70,70,85,70,70,15"
+		y: "30,30,20,50,80,70,70"
+		n: 7
+	} 
+	Polygon { 
+		fill: "#000000"
+		visible: models.getProperties(ids, "Type")== "Throw Link"
+		style: "solid"
+		width: 1
+		color: "#000000"
+		sizex: parent.width
+		sizey: parent.height
+		x: "15,70,70,85,70,70,15"
+		y: "30,30,20,50,80,70,70"
+		n: 7
+	} 
+	Polygon { 
+		fill: "#000000"
+		visible: models.getProperties(ids, "Type")== "Parallel Multiple (Catch)"
+		style: "solid"
+		width: 1
+		color: "#000000"
+		sizex: parent.width
+		sizey: parent.height
+		x: "15,40,40,60,60,85,85,60,60,40,40,15"
+		y: "40,40,15,15,40,40,60,60,85,85,60,60"
+		n: 12
+	} 
+} 
diff --git a/plugins/bpmn/qml/LaneClass.qml b/plugins/bpmn/qml/LaneClass.qml
new file mode 100644
index 0000000000..3f5fbb594d
--- /dev/null
+++ b/plugins/bpmn/qml/LaneClass.qml
@@ -0,0 +1,16 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	property string ids: ""
+	width: 450; height: 150
+	color: "transparent"
+	Rectangle { 
+		anchors.fill: parent
+		x: 0 * parent.width / 1
+		y: 0 * parent.height / 1
+		width: 1 * parent.width / 1
+		height: 1 * parent.height / 1
+		border.color: "#ffffff"
+		border.width: 0
+	} 
+} 
diff --git a/plugins/bpmn/qml/NonInterruptingStartEventClass.qml b/plugins/bpmn/qml/NonInterruptingStartEventClass.qml
new file mode 100644
index 0000000000..873a5155f7
--- /dev/null
+++ b/plugins/bpmn/qml/NonInterruptingStartEventClass.qml
@@ -0,0 +1,169 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	property string ids: ""
+	width: 100; height: 100
+	color: "transparent"
+
+    Rectangle {
+        anchors.fill: parent
+        x: 1 * parent.width / 4
+        y: 1 * parent.height / 5
+        width: 1 * parent.width / 2
+        height: 3 * parent.height / 5
+        border.color: "#ffffff"
+        border.width: 0
+    }
+
+    Rectangle {
+        anchors.fill: parent
+        x: 3 * parent.width / 20
+        y: 3 * parent.height / 10
+        width: 7 * parent.width / 10
+        height: 2 * parent.height / 5
+        border.color: "#ffffff"
+        border.width: 0
+    }
+
+    Ellipse {
+		x: 1 * parent.width / 2
+		y: 1 * parent.height / 2
+		width: 1 * parent.width / 1
+		height: 1 * parent.height / 1
+		color: "#ffffff"
+		border.color: "#000000"
+		border.style: "dash"
+		border.width: 0
+	} 
+
+	Line { 
+		x1: 3 * parent.width / 20
+		y1: 3 * parent.height / 10
+		x2: 1 * parent.width / 2
+		y2: 1 * parent.height / 2
+		visible: models.getProperties(ids, "Type")== "Message"
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+	Line { 
+		x1: 1 * parent.width / 2
+		y1: 1 * parent.height / 2
+		x2: 17 * parent.width / 20
+		y2: 3 * parent.height / 10
+		visible: models.getProperties(ids, "Type")== "Message"
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+	Polygon { 
+		fill: "#ffffff"
+		visible: models.getProperties(ids, "Type")== "Multiple"
+		style: "solid"
+		width: 0
+		color: "#000000"
+		sizex: parent.width
+		sizey: parent.height
+		x: "50,20,35,65,80"
+		y: "25,45,75,75,45"
+		n: 5
+	} 
+	Ellipse { 
+		visible: models.getProperties(ids, "Type")== "Timer"
+		x: 1 * parent.width / 2
+		y: 1 * parent.height / 2
+		width: 7 * parent.width / 10
+		height: 7 * parent.height / 10
+		color: "#ffffff"
+		border.color: "#000000"
+		border.style: "solid"
+		border.width: 0
+	} 
+	Line { 
+		x1: 1 * parent.width / 2
+		y1: 1 * parent.height / 2
+		x2: 11 * parent.width / 20
+		y2: 1 * parent.height / 5
+		visible: models.getProperties(ids, "Type")== "Timer"
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+	Line { 
+		x1: 1 * parent.width / 2
+		y1: 1 * parent.height / 2
+		x2: 3 * parent.width / 4
+		y2: 12 * parent.height / 25
+		visible: models.getProperties(ids, "Type")== "Timer"
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+
+	Line { 
+		x1: 1 * parent.width / 4
+		y1: 7 * parent.height / 20
+		x2: 3 * parent.width / 4
+		y2: 7 * parent.height / 20
+		visible: models.getProperties(ids, "Type")== "Conditional"
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+	Line { 
+		x1: 1 * parent.width / 4
+		y1: 1 * parent.height / 2
+		x2: 3 * parent.width / 4
+		y2: 1 * parent.height / 2
+		visible: models.getProperties(ids, "Type")== "Conditional"
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+	Line { 
+		x1: 1 * parent.width / 4
+		y1: 13 * parent.height / 20
+		x2: 3 * parent.width / 4
+		y2: 13 * parent.height / 20
+		visible: models.getProperties(ids, "Type")== "Conditional"
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+	Polygon { 
+		fill: "#000000"
+		visible: models.getProperties(ids, "Type")== "Escalation"
+		style: "solid"
+		width: 1
+		color: "#000000"
+		sizex: parent.width
+		sizey: parent.height
+		x: "50,30,50,70"
+		y: "50,70,20,70"
+		n: 4
+	} 
+	Polygon { 
+		fill: "#000000"
+		visible: models.getProperties(ids, "Type")== "Signal"
+		style: "solid"
+		width: 1
+		color: "#000000"
+		sizex: parent.width
+		sizey: parent.height
+		x: "50,25,75"
+		y: "25,70,70"
+		n: 3
+	} 
+	Polygon { 
+		fill: "#000000"
+		visible: models.getProperties(ids, "Type")== "Parallel Multiple"
+		style: "solid"
+		width: 1
+		color: "#000000"
+		sizex: parent.width
+		sizey: parent.height
+		x: "15,40,40,60,60,85,85,60,60,40,40,15"
+		y: "40,40,15,15,40,40,60,60,85,85,60,60"
+		n: 12
+	} 
+} 
diff --git a/plugins/bpmn/qml/PoolClass.qml b/plugins/bpmn/qml/PoolClass.qml
new file mode 100644
index 0000000000..21131e075c
--- /dev/null
+++ b/plugins/bpmn/qml/PoolClass.qml
@@ -0,0 +1,55 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	property string ids: ""
+	width: 450; height: 150
+	color: "transparent"
+	Rectangle { 
+		anchors.fill: parent
+		x: 0 * parent.width / 1
+		y: 0 * parent.height / 1
+		width: 1 * parent.width / 1
+		height: 1 * parent.height / 1
+		border.color: "#ffffff"
+		border.width: 0
+	} 
+	Line { 
+		x1: 30 
+		y1: 0 * parent.height / 1
+		x2: 30 
+		y2: 1 * parent.height / 1
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+	Line { 
+		x1: 43 * parent.width / 90
+		y1: 5 * parent.height / 6
+		x2: 43 * parent.width / 90
+		y2: 29 * parent.height / 30
+		visible: models.getProperties(ids, "multiple")== "true"
+		color: "#000000"
+		style: "solid"
+		width: 2
+	} 
+	Line { 
+		x1: 1 * parent.width / 2
+		y1: 5 * parent.height / 6
+		x2: 1 * parent.width / 2
+		y2: 29 * parent.height / 30
+		visible: models.getProperties(ids, "multiple")== "true"
+		color: "#000000"
+		style: "solid"
+		width: 2
+	} 
+	Line { 
+		x1: 47 * parent.width / 90
+		y1: 5 * parent.height / 6
+		x2: 47 * parent.width / 90
+		y2: 29 * parent.height / 30
+		visible: models.getProperties(ids, "multiple")== "true"
+		color: "#000000"
+		style: "solid"
+		width: 2
+	} 
+} 
diff --git a/plugins/bpmn/qml/StartEventClass.qml b/plugins/bpmn/qml/StartEventClass.qml
new file mode 100644
index 0000000000..f3d59882a3
--- /dev/null
+++ b/plugins/bpmn/qml/StartEventClass.qml
@@ -0,0 +1,204 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	property string ids: ""
+	width: 100; height: 100
+	color: "transparent"
+    Rectangle {
+        anchors.fill: parent
+        x: 3 * parent.width / 20
+        y: 3 * parent.height / 10
+        width: 7 * parent.width / 10
+        height: 2 * parent.height / 5
+        border.color: "#ffffff"
+        border.width: 0
+    }
+
+    Rectangle {
+        anchors.fill: parent
+        x: 1 * parent.width / 4
+        y: 1 * parent.height / 5
+        width: 1 * parent.width / 2
+        height: 3 * parent.height / 5
+        border.color: "#ffffff"
+        border.width: 0
+    }
+
+    Ellipse {
+		x: 1 * parent.width / 2
+		y: 1 * parent.height / 2
+		width: 1 * parent.width / 1
+		height: 1 * parent.height / 1
+		color: "#ffffff"
+		border.color: "#000000"
+		border.style: "solid"
+		border.width: 0
+	} 
+
+	Line { 
+		x1: 3 * parent.width / 20
+		y1: 3 * parent.height / 10
+		x2: 1 * parent.width / 2
+		y2: 1 * parent.height / 2
+		visible: models.getProperties(ids, "Type")== "Message"
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+	Line { 
+		x1: 1 * parent.width / 2
+		y1: 1 * parent.height / 2
+		x2: 17 * parent.width / 20
+		y2: 3 * parent.height / 10
+		visible: models.getProperties(ids, "Type")== "Message"
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+	Polygon { 
+		fill: "#ffffff"
+		visible: models.getProperties(ids, "Type")== "Multiple"
+		style: "solid"
+		width: 0
+		color: "#000000"
+		sizex: parent.width
+		sizey: parent.height
+		x: "50,20,35,65,80"
+		y: "25,45,75,75,45"
+		n: 5
+	} 
+	Ellipse { 
+		visible: models.getProperties(ids, "Type")== "Timer"
+		x: 1 * parent.width / 2
+		y: 1 * parent.height / 2
+		width: 7 * parent.width / 10
+		height: 7 * parent.height / 10
+		color: "#ffffff"
+		border.color: "#000000"
+		border.style: "solid"
+		border.width: 0
+	} 
+	Line { 
+		x1: 1 * parent.width / 2
+		y1: 1 * parent.height / 2
+		x2: 11 * parent.width / 20
+		y2: 1 * parent.height / 5
+		visible: models.getProperties(ids, "Type")== "Timer"
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+	Line { 
+		x1: 1 * parent.width / 2
+		y1: 1 * parent.height / 2
+		x2: 3 * parent.width / 4
+		y2: 12 * parent.height / 25
+		visible: models.getProperties(ids, "Type")== "Timer"
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+
+	Line { 
+		x1: 1 * parent.width / 4
+		y1: 7 * parent.height / 20
+		x2: 3 * parent.width / 4
+		y2: 7 * parent.height / 20
+		visible: models.getProperties(ids, "Type")== "Conditional"
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+	Line { 
+		x1: 1 * parent.width / 4
+		y1: 1 * parent.height / 2
+		x2: 3 * parent.width / 4
+		y2: 1 * parent.height / 2
+		visible: models.getProperties(ids, "Type")== "Conditional"
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+	Line { 
+		x1: 1 * parent.width / 4
+		y1: 13 * parent.height / 20
+		x2: 3 * parent.width / 4
+		y2: 13 * parent.height / 20
+		visible: models.getProperties(ids, "Type")== "Conditional"
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+	Polygon { 
+		fill: "#000000"
+		visible: models.getProperties(ids, "Type")== "Error"
+		style: "solid"
+		width: 1
+		color: "#000000"
+		sizex: parent.width
+		sizey: parent.height
+		x: "40,20,35,60,80,65"
+		y: "50,75,20,50,25,80"
+		n: 6
+	} 
+	Polygon { 
+		fill: "#000000"
+		visible: models.getProperties(ids, "Type")== "Escalation"
+		style: "solid"
+		width: 1
+		color: "#000000"
+		sizex: parent.width
+		sizey: parent.height
+		x: "50,30,50,70"
+		y: "50,70,20,70"
+		n: 4
+	} 
+	Polygon { 
+		fill: "#000000"
+		visible: models.getProperties(ids, "Type")== "Compensation"
+		style: "solid"
+		width: 1
+		color: "#000000"
+		sizex: parent.width
+		sizey: parent.height
+		x: "20,45,45"
+		y: "50,30,70"
+		n: 3
+	} 
+	Polygon { 
+		fill: "#000000"
+		visible: models.getProperties(ids, "Type")== "Compensation"
+		style: "solid"
+		width: 1
+		color: "#000000"
+		sizex: parent.width
+		sizey: parent.height
+		x: "45,70,70"
+		y: "50,30,70"
+		n: 3
+	} 
+	Polygon { 
+		fill: "#000000"
+		visible: models.getProperties(ids, "Type")== "Signal"
+		style: "solid"
+		width: 1
+		color: "#000000"
+		sizex: parent.width
+		sizey: parent.height
+		x: "50,25,75"
+		y: "25,70,70"
+		n: 3
+	} 
+	Polygon { 
+		fill: "#000000"
+		visible: models.getProperties(ids, "Type")== "Parallel Multiple"
+		style: "solid"
+		width: 1
+		color: "#000000"
+		sizex: parent.width
+		sizey: parent.height
+		x: "15,40,40,60,60,85,85,60,60,40,40,15"
+		y: "40,40,15,15,40,40,60,60,85,85,60,60"
+		n: 12
+	} 
+} 
diff --git a/plugins/bpmn/qml/SubprocessClass.qml b/plugins/bpmn/qml/SubprocessClass.qml
new file mode 100644
index 0000000000..80ed0d57bd
--- /dev/null
+++ b/plugins/bpmn/qml/SubprocessClass.qml
@@ -0,0 +1,371 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	property string ids: ""
+	width: 210; height: 160
+	color: "transparent"
+    Rectangle {
+        anchors.fill: parent
+        x: 19 * parent.width / 42
+        y: 23 * parent.height / 32
+        width: 2 * parent.width / 21
+        height: 1 * parent.height / 8
+        border.color: "#ffffff"
+        border.width: 0
+    }
+	Line { 
+		x1: 3 * parent.width / 35
+		y1: 9 * parent.height / 32
+		x2: 3 * parent.width / 35
+		y2: 23 * parent.height / 32
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+	Line { 
+		x1: 3 * parent.width / 14
+		y1: 9 * parent.height / 80
+		x2: 11 * parent.width / 14
+		y2: 9 * parent.height / 80
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+	Line { 
+		x1: 32 * parent.width / 35
+		y1: 9 * parent.height / 32
+		x2: 32 * parent.width / 35
+		y2: 23 * parent.height / 32
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+	Line { 
+		x1: 3 * parent.width / 14
+		y1: 71 * parent.height / 80
+		x2: 11 * parent.width / 14
+		y2: 71 * parent.height / 80
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+	Curve { 
+		fill: "#ffffff"
+		style: "solid"
+		color: "#000000"
+		sizex: parent.width
+		sizey: parent.height
+		width: 0
+		startx: 18
+		starty: 45
+		endx: 45
+		endy: 18
+		x: 15
+		y: 15
+	}
+	Curve { 
+		fill: "#ffffff"
+		style: "solid"
+		color: "#000000"
+		sizex: parent.width
+		sizey: parent.height
+		width: 0
+		startx: 192
+		starty: 45
+		endx: 165
+		endy: 18
+		x: 195
+		y: 15
+	}
+	Curve { 
+		fill: "#ffffff"
+		style: "solid"
+		color: "#000000"
+		sizex: parent.width
+		sizey: parent.height
+		width: 0
+		startx: 165
+		starty: 142
+		endx: 192
+		endy: 115
+		x: 195
+		y: 145
+	}
+	Curve { 
+		fill: "#ffffff"
+		style: "solid"
+		color: "#000000"
+		sizex: parent.width
+		sizey: parent.height
+		width: 0
+		startx: 18
+		starty: 115
+		endx: 45
+		endy: 142
+		x: 15
+		y: 145
+	}
+	Line { 
+		x1: 1 * parent.width / 14
+		y1: 21 * parent.height / 80
+		x2: 1 * parent.width / 14
+		y2: 59 * parent.height / 80
+		visible: models.getProperties(ids, "transaction")== "true"
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+	Line { 
+		x1: 1 * parent.width / 5
+		y1: 3 * parent.height / 32
+		x2: 4 * parent.width / 5
+		y2: 3 * parent.height / 32
+		visible: models.getProperties(ids, "transaction")== "true"
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+	Line { 
+		x1: 13 * parent.width / 14
+		y1: 21 * parent.height / 80
+		x2: 13 * parent.width / 14
+		y2: 59 * parent.height / 80
+		visible: models.getProperties(ids, "transaction")== "true"
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+	Line { 
+		x1: 1 * parent.width / 5
+		y1: 29 * parent.height / 32
+		x2: 4 * parent.width / 5
+		y2: 29 * parent.height / 32
+		visible: models.getProperties(ids, "transaction")== "true"
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+	Curve { 
+		fill: "#ffffff"
+		style: "solid"
+		color: "#000000"
+		sizex: parent.width
+		sizey: parent.height
+		width: 0
+		startx: 15
+		starty: 42
+		endx: 42
+		endy: 15
+		x: 13
+		y: 13
+		visible: models.getProperties(ids, "transaction")== "true"
+	}
+	Curve { 
+		fill: "#ffffff"
+		style: "solid"
+		color: "#000000"
+		sizex: parent.width
+		sizey: parent.height
+		width: 0
+		startx: 195
+		starty: 45
+		endx: 168
+		endy: 15
+		x: 197
+		y: 13
+		visible: models.getProperties(ids, "transaction")== "true"
+	}
+	Curve { 
+		fill: "#ffffff"
+		style: "solid"
+		color: "#000000"
+		sizex: parent.width
+		sizey: parent.height
+		width: 0
+		startx: 168
+		starty: 145
+		endx: 195
+		endy: 118
+		x: 197
+		y: 147
+		visible: models.getProperties(ids, "transaction")== "true"
+	}
+	Curve { 
+		fill: "#ffffff"
+		style: "solid"
+		color: "#000000"
+		sizex: parent.width
+		sizey: parent.height
+		width: 0
+		startx: 15
+		starty: 115
+		endx: 42
+		endy: 145
+		x: 13
+		y: 147
+		visible: models.getProperties(ids, "transaction")== "true"
+	}
+	Line { 
+		x1: 1 * parent.width / 2
+		y1: 59 * parent.height / 80
+		x2: 1 * parent.width / 2
+		y2: 33 * parent.height / 40
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+	Line { 
+		x1: 7 * parent.width / 15
+		y1: 25 * parent.height / 32
+		x2: 8 * parent.width / 15
+		y2: 25 * parent.height / 32
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+	Line { 
+		x1: 1 * parent.width / 3
+		y1: 117 * parent.height / 160
+		x2: 1 * parent.width / 3
+		y2: 133 * parent.height / 160
+		visible: models.getProperties(ids, "loopType")== "Multiple Instances (Parallel)"
+		color: "#000000"
+		style: "solid"
+		width: 3
+	} 
+	Line { 
+		x1: 8 * parent.width / 21
+		y1: 117 * parent.height / 160
+		x2: 8 * parent.width / 21
+		y2: 133 * parent.height / 160
+		visible: models.getProperties(ids, "loopType")== "Multiple Instances (Parallel)"
+		color: "#000000"
+		style: "solid"
+		width: 3
+	} 
+	Line { 
+		x1: 3 * parent.width / 7
+		y1: 117 * parent.height / 160
+		x2: 3 * parent.width / 7
+		y2: 133 * parent.height / 160
+		visible: models.getProperties(ids, "loopType")== "Multiple Instances (Parallel)"
+		color: "#000000"
+		style: "solid"
+		width: 3
+	} 
+	Line { 
+		x1: 12 * parent.width / 35
+		y1: 23 * parent.height / 32
+		x2: 44 * parent.width / 105
+		y2: 23 * parent.height / 32
+		visible: models.getProperties(ids, "loopType")== "Multiple Instances (Sequential)"
+		color: "#000000"
+		style: "solid"
+		width: 3
+	} 
+	Line { 
+		x1: 12 * parent.width / 35
+		y1: 25 * parent.height / 32
+		x2: 44 * parent.width / 105
+		y2: 25 * parent.height / 32
+		visible: models.getProperties(ids, "loopType")== "Multiple Instances (Sequential)"
+		color: "#000000"
+		style: "solid"
+		width: 3
+	} 
+	Line { 
+		x1: 12 * parent.width / 35
+		y1: 27 * parent.height / 32
+		x2: 44 * parent.width / 105
+		y2: 27 * parent.height / 32
+		visible: models.getProperties(ids, "loopType")== "Multiple Instances (Sequential)"
+		color: "#000000"
+		style: "solid"
+		width: 3
+	} 
+	Ellipse { 
+		visible: models.getProperties(ids, "loopType")== "Standard Loop"
+		x: 8 * parent.width / 21
+		y: 25 * parent.height / 32
+		width: 2 * parent.width / 21
+		height: 1 * parent.height / 8
+		color: "#ffffff"
+		border.color: "#000000"
+		border.style: "solid"
+		border.width: 0
+	} 
+	Line { 
+		x1: 8 * parent.width / 21
+		y1: 27 * parent.height / 32
+		x2: 38 * parent.width / 105
+		y2: 17 * parent.height / 20
+		visible: models.getProperties(ids, "loopType")== "Standard Loop"
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+	Line { 
+		x1: 8 * parent.width / 21
+		y1: 27 * parent.height / 32
+		x2: 11 * parent.width / 30
+		y2: 33 * parent.height / 40
+		visible: models.getProperties(ids, "loopType")== "Standard Loop"
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+	Polygon { 
+		fill: "#000000"
+		visible: models.getProperties(ids, "isForCompensation")== "true"
+		style: "solid"
+		width: 1
+		color: "#000000"
+		sizex: parent.width
+		sizey: parent.height
+		x: "120,135,135"
+		y: "125,115,135"
+		n: 3
+	} 
+	Polygon { 
+		fill: "#000000"
+		visible: models.getProperties(ids, "isForCompensation")== "true"
+		style: "solid"
+		width: 1
+		color: "#000000"
+		sizex: parent.width
+		sizey: parent.height
+		x: "135,150,150"
+		y: "125,115,135"
+		n: 3
+	} 
+	Curve { 
+		fill: "#ffffff"
+		style: "solid"
+		color: "#000000"
+		sizex: parent.width
+		sizey: parent.height
+		width: 0
+		startx: 45
+		starty: 125
+		endx: 55
+		endy: 125
+		x: 50
+		y: 120
+		visible: models.getProperties(ids, "adHoc")== "true"
+	}
+	Curve { 
+		fill: "#ffffff"
+		style: "solid"
+		color: "#000000"
+		sizex: parent.width
+		sizey: parent.height
+		width: 0
+		startx: 55
+		starty: 125
+		endx: 65
+		endy: 125
+		x: 60
+		y: 130
+		visible: models.getProperties(ids, "adHoc")== "true"
+	}
+} 
diff --git a/plugins/bpmn/qml/TaskClass.qml b/plugins/bpmn/qml/TaskClass.qml
new file mode 100644
index 0000000000..5f42a682aa
--- /dev/null
+++ b/plugins/bpmn/qml/TaskClass.qml
@@ -0,0 +1,214 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	property string ids: ""
+	width: 210; height: 160
+	color: "transparent"
+	Line { 
+		x1: 3 * parent.width / 35
+		y1: 9 * parent.height / 32
+		x2: 3 * parent.width / 35
+		y2: 23 * parent.height / 32
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+	Line { 
+		x1: 3 * parent.width / 14
+		y1: 9 * parent.height / 80
+		x2: 11 * parent.width / 14
+		y2: 9 * parent.height / 80
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+	Line { 
+		x1: 32 * parent.width / 35
+		y1: 9 * parent.height / 32
+		x2: 32 * parent.width / 35
+		y2: 23 * parent.height / 32
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+	Line { 
+		x1: 3 * parent.width / 14
+		y1: 71 * parent.height / 80
+		x2: 11 * parent.width / 14
+		y2: 71 * parent.height / 80
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+	Curve { 
+		fill: "#ffffff"
+		style: "solid"
+		color: "#000000"
+		sizex: parent.width
+		sizey: parent.height
+		width: 0
+		startx: 18
+		starty: 45
+		endx: 45
+		endy: 18
+		x: 15
+		y: 15
+	}
+	Curve { 
+		fill: "#ffffff"
+		style: "solid"
+		color: "#000000"
+		sizex: parent.width
+		sizey: parent.height
+		width: 0
+		startx: 192
+		starty: 45
+		endx: 165
+		endy: 18
+		x: 195
+		y: 15
+	}
+	Curve { 
+		fill: "#ffffff"
+		style: "solid"
+		color: "#000000"
+		sizex: parent.width
+		sizey: parent.height
+		width: 0
+		startx: 165
+		starty: 142
+		endx: 192
+		endy: 115
+		x: 195
+		y: 145
+	}
+	Curve { 
+		fill: "#ffffff"
+		style: "solid"
+		color: "#000000"
+		sizex: parent.width
+		sizey: parent.height
+		width: 0
+		startx: 18
+		starty: 115
+		endx: 45
+		endy: 142
+		x: 15
+		y: 145
+	}
+	Line { 
+		x1: 8 * parent.width / 21
+		y1: 117 * parent.height / 160
+		x2: 8 * parent.width / 21
+		y2: 133 * parent.height / 160
+		visible: models.getProperties(ids, "loopType")== "Multiple Instances (Parallel)"
+		color: "#000000"
+		style: "solid"
+		width: 3
+	} 
+	Line { 
+		x1: 3 * parent.width / 7
+		y1: 117 * parent.height / 160
+		x2: 3 * parent.width / 7
+		y2: 133 * parent.height / 160
+		visible: models.getProperties(ids, "loopType")== "Multiple Instances (Parallel)"
+		color: "#000000"
+		style: "solid"
+		width: 3
+	} 
+	Line { 
+		x1: 10 * parent.width / 21
+		y1: 117 * parent.height / 160
+		x2: 10 * parent.width / 21
+		y2: 133 * parent.height / 160
+		visible: models.getProperties(ids, "loopType")== "Multiple Instances (Parallel)"
+		color: "#000000"
+		style: "solid"
+		width: 3
+	} 
+	Line { 
+		x1: 41 * parent.width / 105
+		y1: 23 * parent.height / 32
+		x2: 7 * parent.width / 15
+		y2: 23 * parent.height / 32
+		visible: models.getProperties(ids, "loopType")== "Multiple Instances (Sequential)"
+		color: "#000000"
+		style: "solid"
+		width: 3
+	} 
+	Line { 
+		x1: 41 * parent.width / 105
+		y1: 25 * parent.height / 32
+		x2: 7 * parent.width / 15
+		y2: 25 * parent.height / 32
+		visible: models.getProperties(ids, "loopType")== "Multiple Instances (Sequential)"
+		color: "#000000"
+		style: "solid"
+		width: 3
+	} 
+	Line { 
+		x1: 41 * parent.width / 105
+		y1: 27 * parent.height / 32
+		x2: 7 * parent.width / 15
+		y2: 27 * parent.height / 32
+		visible: models.getProperties(ids, "loopType")== "Multiple Instances (Sequential)"
+		color: "#000000"
+		style: "solid"
+		width: 3
+	} 
+	Ellipse { 
+		visible: models.getProperties(ids, "loopType")== "Standard Loop"
+		x: 3 * parent.width / 7
+		y: 25 * parent.height / 32
+		width: 2 * parent.width / 21
+		height: 1 * parent.height / 8
+		color: "#ffffff"
+		border.color: "#000000"
+		border.style: "solid"
+		border.width: 0
+	} 
+	Line { 
+		x1: 3 * parent.width / 7
+		y1: 27 * parent.height / 32
+		x2: 43 * parent.width / 105
+		y2: 17 * parent.height / 20
+		visible: models.getProperties(ids, "loopType")== "Standard Loop"
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+	Line { 
+		x1: 3 * parent.width / 7
+		y1: 27 * parent.height / 32
+		x2: 29 * parent.width / 70
+		y2: 33 * parent.height / 40
+		visible: models.getProperties(ids, "loopType")== "Standard Loop"
+		color: "#000000"
+		style: "solid"
+		width: 0
+	} 
+	Polygon { 
+		fill: "#000000"
+		visible: models.getProperties(ids, "isForCompensation")== "true"
+		style: "solid"
+		width: 1
+		color: "#000000"
+		sizex: parent.width
+		sizey: parent.height
+		x: "110,125,125"
+		y: "125,115,135"
+		n: 3
+	} 
+	Polygon { 
+		fill: "#000000"
+		visible: models.getProperties(ids, "isForCompensation")== "true"
+		style: "solid"
+		width: 1
+		color: "#000000"
+		sizex: parent.width
+		sizey: parent.height
+		x: "125,140,140"
+		y: "125,115,135"
+		n: 3
+	} 
+} 
diff --git a/plugins/domainAnalysis/domainAnalysisEditor/domainAnalysisMetamodel.xml b/plugins/domainAnalysis/domainAnalysisEditor/domainAnalysisMetamodel.xml
index aeaa5325ae..efb1823b9f 100644
--- a/plugins/domainAnalysis/domainAnalysisEditor/domainAnalysisMetamodel.xml
+++ b/plugins/domainAnalysis/domainAnalysisEditor/domainAnalysisMetamodel.xml
@@ -8,14 +8,7 @@
 			<node displayedName="Diagram" name="DiagramNode">
 				<graphics>
 					<picture sizex="200" sizey="200">
-						<line y1="0" x1="20" y2="0" x2="180"/>
-						<line y1="200" x1="20" y2="200" x2="180"/>
-						<line y1="20" x1="0" y2="180" x2="0"/>
-						<line y1="20" x1="200" y2="180" x2="200"/>
-						<arc spanAngle="1440" startAngle="1440" y1="0" x1="0" y2="40" x2="40"/>
-						<arc spanAngle="1440" startAngle="0" y1="0" x1="160" y2="40" x2="200"/>
-						<arc spanAngle="1440" startAngle="2880" y1="160" x1="0" y2="200" x2="40"/>
-						<arc spanAngle="-1440" startAngle="0" y1="160" x1="160" y2="200" x2="200"/>
+						<external filr="qml/DiagramNodeClass.qml"/>
 					</picture>
 					<labels>
 						<label x="40" y="10" textBinded="name"/>
@@ -45,7 +38,7 @@
 			<node name="CommonFeature" displayedName="Общая фича" description="Обобщающая фича">
 				<graphics>
 					<picture sizex="149" sizey="95">
-						<rectangle stroke-width="0" y1="2" y2="91a" x1="2" x2="144a" fill="#ffffff" stroke="#0000ff" fill-style="none" stroke-style="solid"/>
+						<external file="qml/CommonFeatureClass.qml"/>
 					</picture>
 					<labels>
 						<label x="20" y="14" textBinded="name"/>
@@ -65,7 +58,7 @@
 			<node name="DetailedFeature" displayedName="Детальная фича" description="Детализированная фича">
 				<graphics>
 					<picture sizex="144" sizey="88">
-						<rectangle stroke-width="0" y1="2" y2="82" x1="2" x2="138a" fill="#ffffff" stroke="#008000" fill-style="none" stroke-style="solid"/>
+						<external file="qml/DetailedFeatureClass.qml"/>
 					</picture>
 					<labels>
 						<label x="25" y="20" textBinded="name"/>
diff --git a/plugins/domainAnalysis/domainAnalysisEditor/qml/CommonFeatureClass.qml b/plugins/domainAnalysis/domainAnalysisEditor/qml/CommonFeatureClass.qml
new file mode 100644
index 0000000000..d7166a5792
--- /dev/null
+++ b/plugins/domainAnalysis/domainAnalysisEditor/qml/CommonFeatureClass.qml
@@ -0,0 +1,15 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 149; height: 95
+	color: "transparent"
+	Rectangle { 
+		anchors.fill: parent
+		x: 2 * parent.width / 149
+		y: 2 * parent.height / 95
+		width: 142 * parent.width / 149
+		height: 89 * parent.height / 95
+		border.color: "#ffffff"
+		border.width: 0
+	} 
+} 
diff --git a/plugins/domainAnalysis/domainAnalysisEditor/qml/DetailedFeatureClass.qml b/plugins/domainAnalysis/domainAnalysisEditor/qml/DetailedFeatureClass.qml
new file mode 100644
index 0000000000..5590eab45f
--- /dev/null
+++ b/plugins/domainAnalysis/domainAnalysisEditor/qml/DetailedFeatureClass.qml
@@ -0,0 +1,15 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 144; height: 88
+	color: "transparent"
+	Rectangle { 
+		anchors.fill: parent
+		x: 1 * parent.width / 72
+		y: 1 * parent.height / 44
+		width: 17 * parent.width / 18
+		height: 10 * parent.height / 11
+		border.color: "#ffffff"
+		border.width: 0
+	} 
+} 
diff --git a/plugins/domainAnalysis/domainAnalysisEditor/qml/DiagramNodeClass.qml b/plugins/domainAnalysis/domainAnalysisEditor/qml/DiagramNodeClass.qml
new file mode 100644
index 0000000000..839edba0b1
--- /dev/null
+++ b/plugins/domainAnalysis/domainAnalysisEditor/qml/DiagramNodeClass.qml
@@ -0,0 +1,82 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 200; height: 200
+	color: "transparent"
+	Line { 
+		x1: 1.0 * 1 * parent.width / 10
+		y1: 1.0 * 0 * parent.height / 1
+		x2: 1.0 * 9 * parent.width / 10
+		y2: 1.0 * 0 * parent.height / 1
+		color: "black"
+		style: "solid"
+		width: 1
+	} 
+	Line { 
+		x1: 1.0 * 1 * parent.width / 10
+		y1: 1.0 * 1 * parent.height / 1
+		x2: 1.0 * 9 * parent.width / 10
+		y2: 1.0 * 1 * parent.height / 1
+		color: "black"
+		style: "solid"
+		width: 1
+	} 
+	Line { 
+		x1: 1.0 * 0 * parent.width / 1
+		y1: 1.0 * 1 * parent.height / 10
+		x2: 1.0 * 0 * parent.width / 1
+		y2: 1.0 * 9 * parent.height / 10
+		color: "black"
+		style: "solid"
+		width: 1
+	} 
+	Line { 
+		x1: 1.0 * 1 * parent.width / 1
+		y1: 1.0 * 1 * parent.height / 10
+		x2: 1.0 * 1 * parent.width / 1
+		y2: 1.0 * 9 * parent.height / 10
+		color: "black"
+		style: "solid"
+		width: 1
+	} 
+	Arc { 
+		x1: 0 * parent.width / 1
+		y1: 0 * parent.height / 1
+		x2: 1 * parent.width / 5
+		y2: 1 * parent.height / 5
+		startAngle: 1440; spanAngle: 1440
+		color: "black"
+		style: "solid"
+		width: 1
+	} 
+	Arc { 
+		x1: 4 * parent.width / 5
+		y1: 0 * parent.height / 1
+		x2: 1 * parent.width / 1
+		y2: 1 * parent.height / 5
+		startAngle: 0; spanAngle: 1440
+		color: "black"
+		style: "solid"
+		width: 1
+	} 
+	Arc { 
+		x1: 0 * parent.width / 1
+		y1: 4 * parent.height / 5
+		x2: 1 * parent.width / 5
+		y2: 1 * parent.height / 1
+		startAngle: 2880; spanAngle: 1440
+		color: "black"
+		style: "solid"
+		width: 1
+	} 
+	Arc { 
+		x1: 4 * parent.width / 5
+		y1: 4 * parent.height / 5
+		x2: 1 * parent.width / 1
+		y2: 1 * parent.height / 1
+		startAngle: 0; spanAngle: -1440
+		color: "black"
+		style: "solid"
+		width: 1
+	} 
+} 
diff --git a/plugins/domainAnalysis/exampleGeneratedEditor/exampleGeneratedMetamodel.xml b/plugins/domainAnalysis/exampleGeneratedEditor/exampleGeneratedMetamodel.xml
index da5e365c5f..33c9a945e0 100644
--- a/plugins/domainAnalysis/exampleGeneratedEditor/exampleGeneratedMetamodel.xml
+++ b/plugins/domainAnalysis/exampleGeneratedEditor/exampleGeneratedMetamodel.xml
@@ -8,14 +8,7 @@
 			<node displayedName="Diagram" name="DiagramNode">
 				<graphics>
 					<picture sizex="200" sizey="200">
-						<line y1="0" x1="20" y2="0" x2="180"/>
-						<line y1="200" x1="20" y2="200" x2="180"/>
-						<line y1="20" x1="0" y2="180" x2="0"/>
-						<line y1="20" x1="200" y2="180" x2="200"/>
-						<arc spanAngle="1440" startAngle="1440" y1="0" x1="0" y2="40" x2="40"/>
-						<arc spanAngle="1440" startAngle="0" y1="0" x1="160" y2="40" x2="200"/>
-						<arc spanAngle="1440" startAngle="2880" y1="160" x1="0" y2="200" x2="40"/>
-						<arc spanAngle="-1440" startAngle="0" y1="160" x1="160" y2="200" x2="200"/>
+						<external file="qml/DiagramNodeClass.qml" />
 					</picture>
 					<labels>
 						<label x="40" y="10" textBinded="name"/>
@@ -45,7 +38,7 @@
 			<node displayedName="Задать время" name="Time">
 				<graphics>
 					<picture sizex="133" sizey="64">
-						<rectangle fill="#ffffff" fill-style="none" y1="0" y2="62" stroke-style="solid" stroke="#000000" x1="1" x2="129a" stroke-width="0"/>
+						<external file="qml/TimeClass.qml"/>
 					</picture>
 					<labels>
 						<label textBinded="name" x="15" y="13"/>
@@ -63,7 +56,7 @@
 			<node displayedName="Задать место" name="Place">
 				<graphics>
 					<picture sizex="152" sizey="71">
-						<rectangle fill="#ffffff" fill-style="none" y1="0" y2="69" stroke-style="solid" stroke="#000000" x1="1" x2="147" stroke-width="0"/>
+						<external file="qml/PlaceClass.qml"/>
 					</picture>
 					<labels>
 						<label textBinded="name" x="17" y="12"/>
@@ -81,7 +74,7 @@
 			<node displayedName="Ввести имя команды" name="TeamName">
 				<graphics>
 					<picture sizex="124" sizey="97">
-						<ellipse fill="#ffffff" fill-style="none" y1="0" y2="95" stroke-style="solid" stroke="#000000" x1="2" x2="118a" stroke-width="0"/>
+						<external file="qml/TeamNameClass.qml"/>
 					</picture>
 					<labels>
 						<label textBinded="name" x="23" y="30"/>
@@ -99,7 +92,7 @@
 			<node displayedName="Выбор игры" name="GameChoice">
 				<graphics>
 					<picture sizex="148" sizey="80">
-						<rectangle fill="#ffffff" fill-style="none" y1="0" y2="78" stroke-style="solid" stroke="#000000" x1="1" x2="143" stroke-width="0"/>
+						<external file="qml/GameChoiceClass.qml"/>
 					</picture>
 					<labels>
 						<label textBinded="name" x="20" y="21"/>
@@ -117,7 +110,7 @@
 			<node displayedName="Выбор команды" name="TeamChoice">
 				<graphics>
 					<picture sizex="137" sizey="75">
-						<rectangle fill="#ffffff" fill-style="none" y1="0" y2="73" stroke-style="solid" stroke="#000000" x1="3" x2="132" stroke-width="0"/>
+						<external file="qml/TeamChoiceClass.qml" />
 					</picture>
 					<labels>
 						<label textBinded="name" x="21" y="18"/>
@@ -135,7 +128,7 @@
 			<node displayedName="Выбор позиции вратаря или полевого игрока" name="GoalKeeperOrPlayer">
 				<graphics>
 					<picture sizex="155" sizey="75">
-						<rectangle fill="#ffffff" fill-style="none" y1="0" y2="73" stroke-style="solid" stroke="#000000" x1="2" x2="152" stroke-width="0"/>
+						<external file="qml/GoalKeeperOrPlayerClass.qml"/>
 					</picture>
 					<labels>
 						<label textBinded="name" x="27" y="16"/>
@@ -153,8 +146,7 @@
 			<node displayedName="Final Node" name="FinalNode">
 				<graphics>
 					<picture sizex="30" sizey="30">
-						<ellipse fill="#ffffff" stroke-style="solid" stroke="#000000" y1="0" x1="0" y2="30" stroke-width="1" x2="30" fill-style="solid"/>
-						<ellipse fill="#000000" stroke-style="solid" stroke="#000000" y1="5" x1="5" y2="25" stroke-width="1" x2="25" fill-style="solid"/>
+						<external file="qml/FinalNodeClass.qml"/>
 					</picture>
 					<ports>
 						<pointPort x="0" y="15"/>
@@ -170,7 +162,7 @@
 			<node displayedName="Initial Node" name="InitialNode">
 				<graphics>
 					<picture sizex="30" sizey="30">
-						<ellipse fill="#000000" stroke-style="solid" stroke="#000000" y1="0" x1="0" y2="30" stroke-width="1" x2="30" fill-style="solid"/>
+						<external file="qml/InitialNodeClass.qml"/>
 					</picture>
 					<ports>
 						<pointPort x="0" y="15"/>
diff --git a/plugins/domainAnalysis/exampleGeneratedEditor/qml/DiagramNodeClass.qml b/plugins/domainAnalysis/exampleGeneratedEditor/qml/DiagramNodeClass.qml
new file mode 100644
index 0000000000..839edba0b1
--- /dev/null
+++ b/plugins/domainAnalysis/exampleGeneratedEditor/qml/DiagramNodeClass.qml
@@ -0,0 +1,82 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 200; height: 200
+	color: "transparent"
+	Line { 
+		x1: 1.0 * 1 * parent.width / 10
+		y1: 1.0 * 0 * parent.height / 1
+		x2: 1.0 * 9 * parent.width / 10
+		y2: 1.0 * 0 * parent.height / 1
+		color: "black"
+		style: "solid"
+		width: 1
+	} 
+	Line { 
+		x1: 1.0 * 1 * parent.width / 10
+		y1: 1.0 * 1 * parent.height / 1
+		x2: 1.0 * 9 * parent.width / 10
+		y2: 1.0 * 1 * parent.height / 1
+		color: "black"
+		style: "solid"
+		width: 1
+	} 
+	Line { 
+		x1: 1.0 * 0 * parent.width / 1
+		y1: 1.0 * 1 * parent.height / 10
+		x2: 1.0 * 0 * parent.width / 1
+		y2: 1.0 * 9 * parent.height / 10
+		color: "black"
+		style: "solid"
+		width: 1
+	} 
+	Line { 
+		x1: 1.0 * 1 * parent.width / 1
+		y1: 1.0 * 1 * parent.height / 10
+		x2: 1.0 * 1 * parent.width / 1
+		y2: 1.0 * 9 * parent.height / 10
+		color: "black"
+		style: "solid"
+		width: 1
+	} 
+	Arc { 
+		x1: 0 * parent.width / 1
+		y1: 0 * parent.height / 1
+		x2: 1 * parent.width / 5
+		y2: 1 * parent.height / 5
+		startAngle: 1440; spanAngle: 1440
+		color: "black"
+		style: "solid"
+		width: 1
+	} 
+	Arc { 
+		x1: 4 * parent.width / 5
+		y1: 0 * parent.height / 1
+		x2: 1 * parent.width / 1
+		y2: 1 * parent.height / 5
+		startAngle: 0; spanAngle: 1440
+		color: "black"
+		style: "solid"
+		width: 1
+	} 
+	Arc { 
+		x1: 0 * parent.width / 1
+		y1: 4 * parent.height / 5
+		x2: 1 * parent.width / 5
+		y2: 1 * parent.height / 1
+		startAngle: 2880; spanAngle: 1440
+		color: "black"
+		style: "solid"
+		width: 1
+	} 
+	Arc { 
+		x1: 4 * parent.width / 5
+		y1: 4 * parent.height / 5
+		x2: 1 * parent.width / 1
+		y2: 1 * parent.height / 1
+		startAngle: 0; spanAngle: -1440
+		color: "black"
+		style: "solid"
+		width: 1
+	} 
+} 
diff --git a/plugins/domainAnalysis/exampleGeneratedEditor/qml/FinalNodeClass.qml b/plugins/domainAnalysis/exampleGeneratedEditor/qml/FinalNodeClass.qml
new file mode 100644
index 0000000000..d3e615055b
--- /dev/null
+++ b/plugins/domainAnalysis/exampleGeneratedEditor/qml/FinalNodeClass.qml
@@ -0,0 +1,26 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 30; height: 30
+	color: "transparent"
+	Ellipse { 
+		x: 15 * parent.width / 30
+		y: 15 * parent.height / 30
+		width: 1 * parent.width / 1
+		height: 1 * parent.height / 1
+		color: "#ffffff"
+		border.color: "#000000"
+		border.style: "solid"
+		border.width: 1
+	} 
+	Ellipse { 
+		x: 15 * parent.width / 30
+		y: 15 * parent.height / 30
+		width: 2 * parent.width / 3
+		height: 2 * parent.height / 3
+		color: "#000000"
+		border.color: "#000000"
+		border.style: "solid"
+		border.width: 1
+	} 
+} 
diff --git a/plugins/domainAnalysis/exampleGeneratedEditor/qml/GameChoiceClass.qml b/plugins/domainAnalysis/exampleGeneratedEditor/qml/GameChoiceClass.qml
new file mode 100644
index 0000000000..dbe4e293de
--- /dev/null
+++ b/plugins/domainAnalysis/exampleGeneratedEditor/qml/GameChoiceClass.qml
@@ -0,0 +1,15 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 148; height: 80
+	color: "transparent"
+	Rectangle { 
+		anchors.fill: parent
+		x: 1 * parent.width / 148
+		y: 0 * parent.height / 1
+		width: 71 * parent.width / 74
+		height: 39 * parent.height / 40
+		border.color: "#ffffff"
+		border.width: 0
+	} 
+} 
diff --git a/plugins/domainAnalysis/exampleGeneratedEditor/qml/GoalKeeperOrPlayerClass.qml b/plugins/domainAnalysis/exampleGeneratedEditor/qml/GoalKeeperOrPlayerClass.qml
new file mode 100644
index 0000000000..942eff6c04
--- /dev/null
+++ b/plugins/domainAnalysis/exampleGeneratedEditor/qml/GoalKeeperOrPlayerClass.qml
@@ -0,0 +1,15 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 155; height: 75
+	color: "transparent"
+	Rectangle { 
+		anchors.fill: parent
+		x: 2 * parent.width / 155
+		y: 0 * parent.height / 1
+		width: 30 * parent.width / 31
+		height: 73 * parent.height / 75
+		border.color: "#ffffff"
+		border.width: 0
+	} 
+} 
diff --git a/plugins/domainAnalysis/exampleGeneratedEditor/qml/InitialNodeClass.qml b/plugins/domainAnalysis/exampleGeneratedEditor/qml/InitialNodeClass.qml
new file mode 100644
index 0000000000..a74d911eb9
--- /dev/null
+++ b/plugins/domainAnalysis/exampleGeneratedEditor/qml/InitialNodeClass.qml
@@ -0,0 +1,16 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 30; height: 30
+	color: "transparent"
+	Ellipse { 
+		x: 15 * parent.width / 30
+		y: 15 * parent.height / 30
+		width: 1 * parent.width / 1
+		height: 1 * parent.height / 1
+		color: "#000000"
+		border.color: "#000000"
+		border.style: "solid"
+		border.width: 1
+	} 
+} 
diff --git a/plugins/domainAnalysis/exampleGeneratedEditor/qml/PlaceClass.qml b/plugins/domainAnalysis/exampleGeneratedEditor/qml/PlaceClass.qml
new file mode 100644
index 0000000000..bd95c6a728
--- /dev/null
+++ b/plugins/domainAnalysis/exampleGeneratedEditor/qml/PlaceClass.qml
@@ -0,0 +1,15 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 152; height: 71
+	color: "transparent"
+	Rectangle { 
+		anchors.fill: parent
+		x: 1 * parent.width / 152
+		y: 0 * parent.height / 1
+		width: 73 * parent.width / 76
+		height: 69 * parent.height / 71
+		border.color: "#ffffff"
+		border.width: 0
+	} 
+} 
diff --git a/plugins/domainAnalysis/exampleGeneratedEditor/qml/TeamChoiceClass.qml b/plugins/domainAnalysis/exampleGeneratedEditor/qml/TeamChoiceClass.qml
new file mode 100644
index 0000000000..b9a979020f
--- /dev/null
+++ b/plugins/domainAnalysis/exampleGeneratedEditor/qml/TeamChoiceClass.qml
@@ -0,0 +1,15 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 137; height: 75
+	color: "transparent"
+	Rectangle { 
+		anchors.fill: parent
+		x: 3 * parent.width / 137
+		y: 0 * parent.height / 1
+		width: 129 * parent.width / 137
+		height: 73 * parent.height / 75
+		border.color: "#ffffff"
+		border.width: 0
+	} 
+} 
diff --git a/plugins/domainAnalysis/exampleGeneratedEditor/qml/TeamNameClass.qml b/plugins/domainAnalysis/exampleGeneratedEditor/qml/TeamNameClass.qml
new file mode 100644
index 0000000000..20027679ec
--- /dev/null
+++ b/plugins/domainAnalysis/exampleGeneratedEditor/qml/TeamNameClass.qml
@@ -0,0 +1,16 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 124; height: 97
+	color: "transparent"
+	Ellipse { 
+		x: 15 * parent.width / 31
+		y: 47 * parent.height / 97
+		width: 29 * parent.width / 31
+		height: 95 * parent.height / 97
+		color: "#ffffff"
+		border.color: "#000000"
+		border.style: "none"
+		border.width: 0
+	} 
+} 
diff --git a/plugins/domainAnalysis/exampleGeneratedEditor/qml/TimeClass.qml b/plugins/domainAnalysis/exampleGeneratedEditor/qml/TimeClass.qml
new file mode 100644
index 0000000000..575fab637e
--- /dev/null
+++ b/plugins/domainAnalysis/exampleGeneratedEditor/qml/TimeClass.qml
@@ -0,0 +1,15 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 133; height: 64
+	color: "transparent"
+	Rectangle { 
+		anchors.fill: parent
+		x: 1 * parent.width / 133
+		y: 0 * parent.height / 1
+		width: 128 * parent.width / 133
+		height: 31 * parent.height / 32
+		border.color: "#ffffff"
+		border.width: 0
+	} 
+} 
diff --git a/plugins/dragonDiagram/editor/dragonDiagramMetamodel.xml b/plugins/dragonDiagram/editor/dragonDiagramMetamodel.xml
index 32ecc3fa45..e9961617d2 100644
--- a/plugins/dragonDiagram/editor/dragonDiagramMetamodel.xml
+++ b/plugins/dragonDiagram/editor/dragonDiagramMetamodel.xml
@@ -18,14 +18,7 @@
 			<node displayedName="Dragon Diagram" path="10, 0 : 90, 0 : 90, 100 : 10, 100 : 0, 90 : 0, 10 : 100, 10 : 100, 90 : " name="DragonDiagramNode">
 				<graphics>
 					<picture sizex="200" sizey="200">
-						<line y1="0" x1="20" y2="0" x2="180"/>
-						<line y1="200" x1="20" y2="200" x2="180"/>
-						<line y1="20" x1="0" y2="180" x2="0"/>
-						<line y1="20" x1="200" y2="180" x2="200"/>
-						<arc spanAngle="1440" startAngle="1440" y1="0" x1="0" y2="40" x2="40"/>
-						<arc spanAngle="1440" startAngle="0" y1="0" x1="160" y2="40" x2="200"/>
-						<arc spanAngle="1440" startAngle="2880" y1="160" x1="0" y2="200" x2="40"/>
-						<arc spanAngle="-1440" startAngle="0" y1="160" x1="160" y2="200" x2="200"/>
+						<external file="qml/DragonDiagramNodeClass.qml"/>
 					</picture>
 					<labels>
 						<label x="40" y="10" textBinded="name"/>
@@ -49,7 +42,7 @@
 			<node displayedName="Action Node" name="DragonActionNode">
 				<graphics>
 					<picture sizex="80" sizey="60">
-						<path fill="#f8f8f8" stroke-style="solid" int="17" stroke="#000000" stroke-width="1" d=" M 10.75 1 C 5.36522 1 1 5.41447 1 10.86 L 1 49.14 C 1 54.5855 5.36522 59 10.75 59 L 69.25 59 C 74.6348 59 79 54.5855 79 49.14 L 79 10.86 C 79 5.41447 74.6348 1 69.25 1 L 10.75 1" fill-style="solid"/>
+						<external file="qml/DragonActionNodeClass.qml"/>
 					</picture>
 					<ports>
 						<linePort>
diff --git a/plugins/dragonDiagram/editor/qml/DragonActionNodeClass.qml b/plugins/dragonDiagram/editor/qml/DragonActionNodeClass.qml
new file mode 100644
index 0000000000..0ba00179f3
--- /dev/null
+++ b/plugins/dragonDiagram/editor/qml/DragonActionNodeClass.qml
@@ -0,0 +1,15 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 80; height: 60
+	color: "transparent"
+	Path { 
+		fill: "#f8f8f8"
+		style: "solid"
+		width: 1
+		sizex: parent.width
+		sizey: parent.height
+		color: "#000000"
+		str: " M 10.75 1 C 5.36522 1 1 5.41447 1 10.86 L 1 49.14 C 1 54.5855 5.36522 59 10.75 59 L 69.25 59 C 74.6348 59 79 54.5855 79 49.14 L 79 10.86 C 79 5.41447 74.6348 1 69.25 1 L 10.75 1"
+	} 
+} 
diff --git a/plugins/dragonDiagram/editor/qml/DragonDiagramNodeClass.qml b/plugins/dragonDiagram/editor/qml/DragonDiagramNodeClass.qml
new file mode 100644
index 0000000000..4cd0b55610
--- /dev/null
+++ b/plugins/dragonDiagram/editor/qml/DragonDiagramNodeClass.qml
@@ -0,0 +1,82 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 200; height: 200
+	color: "transparent"
+	Line { 
+		x1: 1 * parent.width / 10
+		y1: 0 * parent.height / 1
+		x2: 9 * parent.width / 10
+		y2: 0 * parent.height / 1
+		color: "black"
+		style: "solid"
+		width: 1
+	} 
+	Line { 
+		x1: 1 * parent.width / 10
+		y1: 1 * parent.height / 1
+		x2: 9 * parent.width / 10
+		y2: 1 * parent.height / 1
+		color: "black"
+		style: "solid"
+		width: 1
+	} 
+	Line { 
+		x1: 0 * parent.width / 1
+		y1: 1 * parent.height / 10
+		x2: 0 * parent.width / 1
+		y2: 9 * parent.height / 10
+		color: "black"
+		style: "solid"
+		width: 1
+	} 
+	Line { 
+		x1: 1 * parent.width / 1
+		y1: 1 * parent.height / 10
+		x2: 1 * parent.width / 1
+		y2: 9 * parent.height / 10
+		color: "black"
+		style: "solid"
+		width: 1
+	} 
+	Arc { 
+		x1: 0 * parent.width / 1
+		y1: 0 * parent.height / 1
+		x2: 1 * parent.width / 5
+		y2: 1 * parent.height / 5
+		startAngle: 1440; spanAngle: 1440
+		color: "black"
+		style: "solid"
+		width: 1
+	} 
+	Arc { 
+		x1: 4 * parent.width / 5
+		y1: 0 * parent.height / 1
+		x2: 1 * parent.width / 1
+		y2: 1 * parent.height / 5
+		startAngle: 0; spanAngle: 1440
+		color: "black"
+		style: "solid"
+		width: 1
+	} 
+	Arc { 
+		x1: 0 * parent.width / 1
+		y1: 4 * parent.height / 5
+		x2: 1 * parent.width / 5
+		y2: 1 * parent.height / 1
+		startAngle: 2880; spanAngle: 1440
+		color: "black"
+		style: "solid"
+		width: 1
+	} 
+	Arc { 
+		x1: 4 * parent.width / 5
+		y1: 4 * parent.height / 5
+		x2: 1 * parent.width / 1
+		y2: 1 * parent.height / 1
+		startAngle: 0; spanAngle: -1440
+		color: "black"
+		style: "solid"
+		width: 1
+	} 
+} 
diff --git a/plugins/editorsSdk/editorsCommon.pri b/plugins/editorsSdk/editorsCommon.pri
index 8a9fca46ba..ed02553c6c 100644
--- a/plugins/editorsSdk/editorsCommon.pri
+++ b/plugins/editorsSdk/editorsCommon.pri
@@ -16,7 +16,7 @@ win32 {
 	QRXC = $$ROOT/bin/qrxc
 }
 
-LIBS += -L$$ROOT/bin -lqrkernel
+LIBS += -L$$ROOT/bin -lqrkernel -lqrutils
 
 !macx {
 	#QMAKE_LFLAGS += "-Wl,-O1,-rpath,$(PWD)/../../../bin/"
diff --git a/plugins/metaEditor/editor/metaEditor.xml b/plugins/metaEditor/editor/metaEditor.xml
index 25fb8f318c..2fd3e3e748 100644
--- a/plugins/metaEditor/editor/metaEditor.xml
+++ b/plugins/metaEditor/editor/metaEditor.xml
@@ -37,13 +37,7 @@
 			<node name="PackageDiagram" displayedName="Package Diagram" description="Предназначен для описания связей между метамоделями. Также может быть корневым элементом метамодели">
 				<graphics>
 					<picture sizex="150" sizey="130">
-						<line fill="#000000" stroke-style="solid" stroke="#000000" y1="0a" x1="0a" y2="0a" stroke-width="1" x2="100a" fill-style="solid"/>
-						<line fill="#000000" stroke-style="solid" stroke="#000000" y1="30a" x1="0a" y2="0a" stroke-width="1" x2="0a" fill-style="solid"/>
-						<line fill="#000000" stroke-style="solid" stroke="#000000" y1="30a" x1="100a" y2="0a" stroke-width="1" x2="100a" fill-style="solid"/>
-						<line fill="#000000" stroke-style="solid" stroke="#000000" y1="30a" x1="0a" y2="30a" stroke-width="1" x2="150" fill-style="solid"/>
-						<line fill="#000000" stroke-style="solid" stroke="#000000" y1="30a" x1="0a" y2="130" stroke-width="1" x2="0" fill-style="solid"/>
-						<line fill="#000000" stroke-style="solid" stroke="#000000" y1="30a" x1="150" y2="130" stroke-width="1" x2="150" fill-style="solid"/>
-						<line fill="#000000" stroke-style="solid" stroke="#000000" y1="130" x1="0" y2="130" stroke-width="1" x2="150" fill-style="solid"/>
+						<external file="qml/PackageDiagramClass.qml"/>
 					</picture>
 					<labels>
 						<label x="2" y="2" textBinded="name"/>
@@ -69,9 +63,7 @@
 			<node name="MetamodelDiagram" displayedName="Metamodel Diagram" description="Корневой элемент метамодели языка. В его свойствах указываются необходимые для сборки параметры">
 				<graphics>
 					<picture sizex="30" sizey="30">
-						<ellipse fill="#ffffff" stroke-style="dot" stroke="#000000" y1="0" x1="0" y2="30" stroke-width="1" x2="30" fill-style="solid"/>
-						<ellipse fill="#000000" stroke-style="solid" stroke="#0000f0" y1="5" x1="5" y2="25" stroke-width="1" x2="25" fill-style="solid"/>
-						<text i="0" font-fill="#ffffff" y1="20" b="0" x1="9" font-name="Helvetica" u="0" font-size="15">M</text>
+						<external file="qml/MetamodelDiagramClass.qml"/>
 					</picture>
 					<labels/>
 					<ports>
@@ -109,12 +101,7 @@
 			<node name="MetaEditorDiagramNode" displayedName="Meta Editor Diagram" description="Элемент для описания конкретного редактора создаваемого языка. Должен вкладываться в Metamodel Diagram">
 				<graphics>
 					<picture sizex="200" sizey="200">
-						<line x1="0" y1="40" x2="0" y2="160"/>
-						<line x1="200" y1="40" x2="200" y2="160"/>
-						<arc x1="0" y1="0" x2="80" y2="80" startAngle="1440" spanAngle="1440"/>
-						<arc x1="120" y1="0" x2="200" y2="80" startAngle="0" spanAngle="1440"/>
-						<arc x1="0" y1="120" x2="80" y2="200" startAngle="2880" spanAngle="1440"/>
-						<arc x1="120" y1="120" x2="200" y2="200" startAngle="0" spanAngle="-1440"/>
+						<external file="qml/MetaEditorDiagramNodeClass.qml"/>
 					</picture>
 					<labels>
 						<label x="30" y="15" textBinded="name" center="true"/>
@@ -153,11 +140,7 @@
 			<node name="MetaEntityNode" displayedName="Node" description="Элемент для описания нового узла диаграммы создаваемого языка. Должен вкладываться в Meta Editor Diagram">
 				<graphics>
 					<picture sizex="150" sizey="100">
-						<line fill="#000000" stroke-style="solid" stroke="#2f4f4f" y1="0" x1="0" y2="100" stroke-width="2" x2="0" fill-style="solid"/>
-						<line fill="#000000" stroke-style="solid" stroke="#2f4f4f" y1="0" x1="150" y2="100" stroke-width="2" x2="150" fill-style="solid"/>
-						<line fill="#000000" stroke-style="solid" stroke="#2f4f4f" y1="0" x1="0" y2="0" stroke-width="2" x2="150" fill-style="solid"/>
-						<line fill="#000000" stroke-style="solid" stroke="#2f4f4f" y1="100" x1="0" y2="100" stroke-width="2" x2="150" fill-style="solid"/>
-						<line fill="#000000" stroke-style="solid" stroke="#2f4f4f" y1="25a" x1="0a" y2="25a" stroke-width="2" x2="150" fill-style="solid"/>
+						<external file="qml/MetaEntityNodeClass.qml"/>
 					</picture>
 					<labels>
 						<label x="5" y="3" textBinded="name" center="true"/>
@@ -218,11 +201,7 @@
 			<node name="MetaEntityPort" displayedName="Port" description="Элемент для описания нового типа портов для элементов создаваемого языка. Должен вкладываться в Meta Editor Diagram">
 				<graphics>
 					<picture sizex="50" sizey="50">
-						<line fill="#000000" stroke-style="solid" stroke="#2f4f4f" y1="0" x1="0" y2="50" stroke-width="2" x2="0" fill-style="solid"/>
-						<line fill="#000000" stroke-style="solid" stroke="#2f4f4f" y1="0" x1="50" y2="50" stroke-width="2" x2="50" fill-style="solid"/>
-						<line fill="#000000" stroke-style="solid" stroke="#2f4f4f" y1="0" x1="0" y2="0" stroke-width="2" x2="50" fill-style="solid"/>
-						<line fill="#000000" stroke-style="solid" stroke="#2f4f4f" y1="50" x1="0" y2="50" stroke-width="2" x2="50" fill-style="solid"/>
-						<ellipse fill="#ffffff" stroke-style="solid" stroke="#2f4f4f" y1="0" stroke-width="1" x1="0" y2="50" fill-style="none" x2="50"/>
+						<external file="qml/MetaEntityPortClass.qml"/>
 					</picture>
 					<labels>
 						<label x="2" y="20a" textBinded="name" center="true"/>
@@ -236,11 +215,7 @@
 			<node name="MetaEntityEdge" displayedName="Edge" description="Элемент для описания новой связи на диаграмме создаваемого языка. Должен вкладываться в Meta Editor Diagram">
 				<graphics>
 					<picture sizex="100" sizey="100">
-						<line fill="#000000" stroke-style="solid" stroke="#2f4f4f" y1="0" x1="10" y2="50" stroke-width="2" x2="0" fill-style="solid"/>
-						<line fill="#000000" stroke-style="solid" stroke="#2f4f4f" y1="100" x1="10" y2="50" stroke-width="2" x2="0" fill-style="solid"/>
-						<line fill="#000000" stroke-style="solid" stroke="#2f4f4f" y1="0" x1="90" y2="50" stroke-width="2" x2="100" fill-style="solid"/>
-						<line fill="#000000" stroke-style="solid" stroke="#2f4f4f" y1="100" x1="90" y2="50" stroke-width="2" x2="100" fill-style="solid"/>
-						<line fill="#000000" stroke-style="solid" stroke="#2f4f4f" y1="24a" x1="85" y2="24a" stroke-width="2" x2="15" fill-style="solid"/>
+						<external file="qml/MetaEntityEdgeClass.qml"/>
 					</picture>
 					<labels>
 						<label x="5" y="5" textBinded="name" center="true"/>
@@ -305,11 +280,7 @@
 			<node name="MetaEntityEnum" displayedName="Enum" description="Элемент для описания перечисляемого типа данных для создаваемого языка (см. Value). Вкладывается в Meta Editor Diagram">
 				<graphics>
 					<picture sizex="100" sizey="100">
-						<line fill="#000000" stroke-style="dot" stroke="#2f4f4f" y1="0" x1="0" y2="100" stroke-width="2" x2="0" fill-style="solid"/>
-						<line fill="#000000" stroke-style="dot" stroke="#2f4f4f" y1="0" x1="100" y2="100" stroke-width="2" x2="100" fill-style="solid"/>
-						<line fill="#000000" stroke-style="dot" stroke="#2f4f4f" y1="0" x1="0" y2="0" stroke-width="2" x2="100" fill-style="solid"/>
-						<line fill="#000000" stroke-style="dot" stroke="#2f4f4f" y1="100" x1="0" y2="100" stroke-width="2" x2="100" fill-style="solid"/>
-						<line fill="#000000" stroke-style="dot" stroke="#2f4f4f" y1="25a" x1="0a" y2="25a" stroke-width="2" x2="100" fill-style="solid"/>
+						<external file="qml/MetaEntityEnumClass.qml"/>
 					</picture>
 					<labels>
 						<label x="5" y="3" textBinded="name" center="true"/>
@@ -345,6 +316,7 @@
 			<node name="MetaEntity Attribute" displayedName="Property" description="Сущность для описания нового свойства элемента. Вкладывается в соответствующий элемент Node или Edge">
 				<graphics>
 					<picture sizex="140" sizey="16">
+						<external file="qml/MetaEntity AttributeClass.qml"/>
 					</picture>
 					<labels>
 						<label x="10" y="0" textBinded="name"/>
@@ -364,8 +336,7 @@
 			<node name="MetaEntityImport" displayedName="Import" description="Сущность для добавления в создаваемый язык элемента из другого визуального языка. Должен вкладываться в Metamodel Diagram.">
 				<graphics>
 					<picture sizex="100" sizey="100">
-						<rectangle fill="#bbbbbb" stroke-style="solid" stroke="#2f4f4f" y1="0" x1="0" y2="100" stroke-width="1" x2="100" fill-style="solid"/>
-						<text i="0" font-fill="#00007f" y1="10" b="0" x1="10" font-name="Helvetica" u="0" font-size="10a">Import</text>
+						<external file="qml/MetaEntityImportClass.qml"/>
 					</picture>
 					<labels>
 						<label x="10" y="10" textBinded="name" center="true"/>
@@ -394,6 +365,7 @@
 			<node name="MetaEntityValue" displayedName="Value" description="Сущность для описания конкретного значения для создаваемого перечисляемого типа (см. Enum). Должен вкладываться в Enum">
 				<graphics>
 					<picture sizex="140" sizey="12">
+						<external file="qml/MetaEntityValueClass.qml"/>
 					</picture>
 					<labels>
 						<label x="10" y="0" textBinded="valueName"/>
@@ -412,9 +384,7 @@
 			<node name="MetaEntityConnection" displayedName="Connection" description="Не поддерживается">
 				<graphics>
 					<picture sizex="120" sizey="40">
-						<line fill="#000000" stroke-style="solid" stroke="#2f4f4f" y1="20" x1="0" y2="20" stroke-width="1" x2="120" fill-style="solid"/>
-						<line fill="#000000" stroke-style="solid" stroke="#2f4f4f" y1="20" x1="120" y2="10" stroke-width="1" x2="100" fill-style="solid"/>
-						<line fill="#000000" stroke-style="solid" stroke="#2f4f4f" y1="20" x1="120" y2="30" stroke-width="1" x2="100" fill-style="solid"/>
+						<external file="qml/MetaEntityConnectionClass.qml"/>
 					</picture>
 					<labels>
 						<label x="10" y="5" textBinded="name" center="true"/>
@@ -432,11 +402,7 @@
 			<node name="MetaEntityAssociation" displayedName="Assotiation" description="Элемент для указания типов и имен начала и конца связи (см. Edge). Вкладывается в соответствующий элемент Edge">
 				<graphics>
 					<picture sizex="120" sizey="40">
-						<line fill="#000000" stroke-style="solid" stroke="#2f4f4f" y1="20" x1="0" y2="20" stroke-width="1" x2="120" fill-style="solid"/>
-						<line fill="#000000" stroke-style="solid" stroke="#2f4f4f" y1="20" x1="120" y2="10" stroke-width="1" x2="100" fill-style="solid"/>
-						<line fill="#000000" stroke-style="solid" stroke="#2f4f4f" y1="20" x1="120" y2="30" stroke-width="1" x2="100" fill-style="solid"/>
-						<line fill="#000000" stroke-style="solid" stroke="#2f4f4f" y1="20" x1="0" y2="10" stroke-width="1" x2="20" fill-style="solid"/>
-						<line fill="#000000" stroke-style="solid" stroke="#2f4f4f" y1="20" x1="0" y2="30" stroke-width="1" x2="20" fill-style="solid"/>
+						<external file="qml/MetaEntityAssociationClass.qml"/>
 					</picture>
 					<labels>
 						<label x="10" y="5" textBinded="name" center="true"/>
@@ -461,9 +427,7 @@
 			<node name="MetaEntityUsage" displayedName="Usage" description="Не поддерживается">
 				<graphics>
 					<picture sizex="120" sizey="40">
-						<line fill="#000000" stroke-style="dot" stroke="#2f4f4f" y1="20" x1="0" y2="20" stroke-width="1" x2="120" fill-style="solid"/>
-						<line fill="#000000" stroke-style="dot" stroke="#2f4f4f" y1="20" x1="120" y2="10" stroke-width="1" x2="100" fill-style="solid"/>
-						<line fill="#000000" stroke-style="dot" stroke="#2f4f4f" y1="20" x1="120" y2="30" stroke-width="1" x2="100" fill-style="solid"/>
+						<external file="qml/MetaEntityUsageClass.qml"/>
 					</picture>
 					<labels>
 						<label x="10" y="5" textBinded="name" center="true"/>
@@ -524,8 +488,7 @@
 			<node name="MetaEntityPossibleEdge" displayedName="Possible Edge" description="Сущность для указания элементов, которые можно присоединять к данному с помощью «вытягивания» из него связей. Вкладывается в соответствующий элемент Node">
 				<graphics>
 					<picture sizex="25" sizey="25">
-						<ellipse fill="#ffffff" stroke-style="solid" stroke="#2f4f4f" y1="0" x1="0" y2="25" stroke-width="1" x2="25" fill-style="solid"/>
-						<ellipse fill="#2f4f4f" stroke-style="solid" stroke="#2f4f4f" y1="5" x1="5" y2="20" stroke-width="1" x2="20" fill-style="solid"/>
+						<external file="qml/MetaEntityPossibleEdgeClass.qml"/>
 					</picture>
 					<labels/>
 					<ports/>
@@ -543,11 +506,7 @@
 			<node name="MetaEntityPropertiesAsContainer" displayedName="Properties as Container" description="Сущность для указания дополнительной функциональности элемента создаваемого языка, являющегося контейнером (см. Container). Вкладывается в соответствующий элемент типа Node">
 				<graphics>
 					<picture sizex="50" sizey="50">
-						<rectangle fill="#ffffff" stroke-style="solid" stroke="#2f4f4f" y1="0" stroke-width="1" x1="20" y2="30" fill-style="none" x2="50"/>
-						<rectangle fill="#ffffff" stroke-style="solid" stroke="#2f4f4f" y1="50" stroke-width="1" x1="0" y2="20" fill-style="none" x2="30"/>
-						<line fill="#ffffff" stroke-style="solid" stroke="#2f4f4f" y1="5" stroke-width="1" x1="35" y2="25" fill-style="none" x2="35"/>
-						<line fill="#ffffff" stroke-style="solid" stroke="#2f4f4f" y1="15" stroke-width="1" x1="25" y2="15" fill-style="none" x2="45"/>
-						<line fill="#ffffff" stroke-style="solid" stroke="#2f4f4f" y1="35" stroke-width="1" x1="5" y2="35" fill-style="none" x2="25"/>
+						<external file="qml/MetaEntityPropertiesAsContainerClass.qml"/>
 					</picture>
 					<labels/>
 					<ports/>
@@ -574,8 +533,7 @@
 			<node name="MetaEntityContextMenuField" displayedName="Context Menu Field" description="Не поддерживается">
 				<graphics>
 					<picture sizex="100" sizey="30">
-						<rectangle fill="#ffffff" stroke-style="solid" stroke="#000000" y1="0" x1="0" y2="30" stroke-width="1" x2="100" fill-style="solid"/>
-						<text i="0" font-fill="#00007f" y1="10" b="0" x1="5" font-name="Helvetica" u="0" font-size="10a">Context Menu Field</text>
+						<external file="qml/MetaEntityContextMenuFieldClass.qml"/>
 					</picture>
 					<labels/>
 					<ports/>
@@ -587,7 +545,7 @@
 			<node name="Listener" displayedName="Listener" description="Не поддерживается">
 				<graphics>
 					<picture sizex="250" sizey="80">
-						<rectangle fill="#ffffff" stroke-style="solid" stroke="#000000" y1="0" x1="0" y2="80" stroke-width="1" x2="250" fill-style="solid"/>
+						<external file="qml/ListenerClass.qml"/>
 					</picture>
 					<labels>
 						<label x="5" y="3" textBinded="class" center="true"/>
diff --git a/plugins/metaEditor/editor/qml/ListenerClass.qml b/plugins/metaEditor/editor/qml/ListenerClass.qml
new file mode 100644
index 0000000000..38f97bd2e7
--- /dev/null
+++ b/plugins/metaEditor/editor/qml/ListenerClass.qml
@@ -0,0 +1,15 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 250; height: 80
+	color: "transparent"
+	Rectangle { 
+		anchors.fill: parent
+		x: 0 * parent.width / 1
+		y: 0 * parent.height / 1
+		width: 1 * parent.width / 1
+		height: 1 * parent.height / 1
+		border.color: "#ffffff"
+		border.width: 1
+	} 
+} 
diff --git a/plugins/metaEditor/editor/qml/MetaEditorDiagramNodeClass.qml b/plugins/metaEditor/editor/qml/MetaEditorDiagramNodeClass.qml
new file mode 100644
index 0000000000..4db4810a10
--- /dev/null
+++ b/plugins/metaEditor/editor/qml/MetaEditorDiagramNodeClass.qml
@@ -0,0 +1,64 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 200; height: 200
+	color: "transparent"
+	Line { 
+		x1: 0 * parent.width / 1
+		y1: 1 * parent.height / 5
+		x2: 0 * parent.width / 1
+		y2: 4 * parent.height / 5
+		color: "black"
+		style: "solid"
+		width: 1
+	} 
+	Line { 
+		x1: 1 * parent.width / 1
+		y1: 1 * parent.height / 5
+		x2: 1 * parent.width / 1
+		y2: 4 * parent.height / 5
+		color: "black"
+		style: "solid"
+		width: 1
+	} 
+	Arc { 
+		x1: 0 * parent.width / 1
+		y1: 0 * parent.height / 1
+		x2: 2 * parent.width / 5
+		y2: 2 * parent.height / 5
+		startAngle: 1440; spanAngle: 1440
+		color: "black"
+		style: "solid"
+		width: 1
+	} 
+	Arc { 
+		x1: 3 * parent.width / 5
+		y1: 0 * parent.height / 1
+		x2: 1 * parent.width / 1
+		y2: 2 * parent.height / 5
+		startAngle: 0; spanAngle: 1440
+		color: "black"
+		style: "solid"
+		width: 1
+	} 
+	Arc { 
+		x1: 0 * parent.width / 1
+		y1: 3 * parent.height / 5
+		x2: 2 * parent.width / 5
+		y2: 1 * parent.height / 1
+		startAngle: 2880; spanAngle: 1440
+		color: "black"
+		style: "solid"
+		width: 1
+	} 
+	Arc { 
+		x1: 3 * parent.width / 5
+		y1: 3 * parent.height / 5
+		x2: 1 * parent.width / 1
+		y2: 1 * parent.height / 1
+		startAngle: 0; spanAngle: -1440
+		color: "black"
+		style: "solid"
+		width: 1
+	} 
+} 
diff --git a/plugins/metaEditor/editor/qml/MetaEntity AttributeClass.qml b/plugins/metaEditor/editor/qml/MetaEntity AttributeClass.qml
new file mode 100644
index 0000000000..46b499d837
--- /dev/null
+++ b/plugins/metaEditor/editor/qml/MetaEntity AttributeClass.qml	
@@ -0,0 +1,6 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 140; height: 16
+	color: "transparent"
+} 
diff --git a/plugins/metaEditor/editor/qml/MetaEntityAssociationClass.qml b/plugins/metaEditor/editor/qml/MetaEntityAssociationClass.qml
new file mode 100644
index 0000000000..bbc3aaa985
--- /dev/null
+++ b/plugins/metaEditor/editor/qml/MetaEntityAssociationClass.qml
@@ -0,0 +1,51 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 120; height: 40
+	color: "transparent"
+	Line { 
+		x1: 0 * parent.width / 1
+		y1: 1 * parent.height / 2
+		x2: 1 * parent.width / 1
+		y2: 1 * parent.height / 2
+		color: "#000000"
+		style: "solid"
+		width: 1
+	} 
+	Line { 
+		x1: 1 * parent.width / 1
+		y1: 1 * parent.height / 2
+		x2: 5 * parent.width / 6
+		y2: 1 * parent.height / 4
+		color: "#000000"
+		style: "solid"
+		width: 1
+	} 
+	Line { 
+		x1: 1 * parent.width / 1
+		y1: 1 * parent.height / 2
+		x2: 5 * parent.width / 6
+		y2: 3 * parent.height / 4
+		color: "#000000"
+		style: "solid"
+		width: 1
+	} 
+	Line { 
+		x1: 0 * parent.width / 1
+		y1: 1 * parent.height / 2
+		x2: 1 * parent.width / 6
+		y2: 1 * parent.height / 4
+		color: "#000000"
+		style: "solid"
+		width: 1
+	} 
+	Line { 
+		x1: 0 * parent.width / 1
+		y1: 1 * parent.height / 2
+		x2: 1 * parent.width / 6
+		y2: 3 * parent.height / 4
+		color: "#000000"
+		style: "solid"
+		width: 1
+	} 
+} 
diff --git a/plugins/metaEditor/editor/qml/MetaEntityConnectionClass.qml b/plugins/metaEditor/editor/qml/MetaEntityConnectionClass.qml
new file mode 100644
index 0000000000..7bc6c9b342
--- /dev/null
+++ b/plugins/metaEditor/editor/qml/MetaEntityConnectionClass.qml
@@ -0,0 +1,33 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 120; height: 40
+	color: "transparent"
+	Line { 
+		x1: 0 * parent.width / 1
+		y1: 1 * parent.height / 2
+		x2: 1 * parent.width / 1
+		y2: 1 * parent.height / 2
+		color: "#000000"
+		style: "solid"
+		width: 1
+	} 
+	Line { 
+		x1: 1 * parent.width / 1
+		y1: 1 * parent.height / 2
+		x2: 5 * parent.width / 6
+		y2: 1 * parent.height / 4
+		color: "#000000"
+		style: "solid"
+		width: 1
+	} 
+	Line { 
+		x1: 1 * parent.width / 1
+		y1: 1 * parent.height / 2
+		x2: 5 * parent.width / 6
+		y2: 3 * parent.height / 4
+		color: "#000000"
+		style: "solid"
+		width: 1
+	} 
+} 
diff --git a/plugins/metaEditor/editor/qml/MetaEntityContextMenuFieldClass.qml b/plugins/metaEditor/editor/qml/MetaEntityContextMenuFieldClass.qml
new file mode 100644
index 0000000000..2cf787e137
--- /dev/null
+++ b/plugins/metaEditor/editor/qml/MetaEntityContextMenuFieldClass.qml
@@ -0,0 +1,26 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 100; height: 30
+	color: "transparent"
+	Rectangle { 
+		anchors.fill: parent
+		x: 0 * parent.width / 1
+		y: 0 * parent.height / 1
+		width: 1 * parent.width / 1
+		height: 1 * parent.height / 1
+		border.color: "#ffffff"
+		border.width: 1
+	} 
+	Text { 
+		x: 1 * parent.width / 20
+		y: 0 * parent.height / 1
+		color: "#00007f"
+		text: "Context Menu Field"
+		font.family: "Helvetica"
+		font.pixelSize: 1 * parent.height / 3
+		font.bold: false
+		font.italic: false
+		font.underline: false
+	} 
+} 
diff --git a/plugins/metaEditor/editor/qml/MetaEntityEdgeClass.qml b/plugins/metaEditor/editor/qml/MetaEntityEdgeClass.qml
new file mode 100644
index 0000000000..0c72ee6267
--- /dev/null
+++ b/plugins/metaEditor/editor/qml/MetaEntityEdgeClass.qml
@@ -0,0 +1,51 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 100; height: 100
+	color: "transparent"
+	Line { 
+		x1: 1 * parent.width / 10
+		y1: 0 * parent.height / 1
+		x2: 0 * parent.width / 1
+		y2: 1 * parent.height / 2
+		color: "#000000"
+		style: "solid"
+		width: 2
+	} 
+	Line { 
+		x1: 1 * parent.width / 10
+		y1: 1 * parent.height / 1
+		x2: 0 * parent.width / 1
+		y2: 1 * parent.height / 2
+		color: "#000000"
+		style: "solid"
+		width: 2
+	} 
+	Line { 
+		x1: 9 * parent.width / 10
+		y1: 0 * parent.height / 1
+		x2: 1 * parent.width / 1
+		y2: 1 * parent.height / 2
+		color: "#000000"
+		style: "solid"
+		width: 2
+	} 
+	Line { 
+		x1: 9 * parent.width / 10
+		y1: 1 * parent.height / 1
+		x2: 1 * parent.width / 1
+		y2: 1 * parent.height / 2
+		color: "#000000"
+		style: "solid"
+		width: 2
+	} 
+	Line { 
+		x1: 17 * parent.width / 20
+		y1: 24 
+		x2: 3 * parent.width / 20
+		y2: 24 
+		color: "#000000"
+		style: "solid"
+		width: 2
+	} 
+} 
diff --git a/plugins/metaEditor/editor/qml/MetaEntityEnumClass.qml b/plugins/metaEditor/editor/qml/MetaEntityEnumClass.qml
new file mode 100644
index 0000000000..97e50db442
--- /dev/null
+++ b/plugins/metaEditor/editor/qml/MetaEntityEnumClass.qml
@@ -0,0 +1,51 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 100; height: 100
+	color: "transparent"
+	Line { 
+		x1: 0 * parent.width / 1
+		y1: 0 * parent.height / 1
+		x2: 0 * parent.width / 1
+		y2: 1 * parent.height / 1
+		color: "#000000"
+		style: "dot"
+		width: 2
+	} 
+	Line { 
+		x1: 1 * parent.width / 1
+		y1: 0 * parent.height / 1
+		x2: 1 * parent.width / 1
+		y2: 1 * parent.height / 1
+		color: "#000000"
+		style: "dot"
+		width: 2
+	} 
+	Line { 
+		x1: 0 * parent.width / 1
+		y1: 0 * parent.height / 1
+		x2: 1 * parent.width / 1
+		y2: 0 * parent.height / 1
+		color: "#000000"
+		style: "dot"
+		width: 2
+	} 
+	Line { 
+		x1: 0 * parent.width / 1
+		y1: 1 * parent.height / 1
+		x2: 1 * parent.width / 1
+		y2: 1 * parent.height / 1
+		color: "#000000"
+		style: "dot"
+		width: 2
+	} 
+	Line { 
+		x1: 0 
+		y1: 25 
+		x2: 1 * parent.width / 1
+		y2: 25 
+		color: "#000000"
+		style: "dot"
+		width: 2
+	} 
+} 
diff --git a/plugins/metaEditor/editor/qml/MetaEntityImportClass.qml b/plugins/metaEditor/editor/qml/MetaEntityImportClass.qml
new file mode 100644
index 0000000000..9ade18038e
--- /dev/null
+++ b/plugins/metaEditor/editor/qml/MetaEntityImportClass.qml
@@ -0,0 +1,26 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 100; height: 100
+	color: "transparent"
+	Rectangle { 
+		anchors.fill: parent
+		x: 0 * parent.width / 1
+		y: 0 * parent.height / 1
+		width: 1 * parent.width / 1
+		height: 1 * parent.height / 1
+		border.color: "#bbbbbb"
+		border.width: 1
+	} 
+	Text { 
+		x: 1 * parent.width / 10
+		y: 0 * parent.height / 1
+		color: "#00007f"
+		text: "Import"
+		font.family: "Helvetica"
+		font.pixelSize: 1 * parent.height / 10
+		font.bold: false
+		font.italic: false
+		font.underline: false
+	} 
+} 
diff --git a/plugins/metaEditor/editor/qml/MetaEntityNodeClass.qml b/plugins/metaEditor/editor/qml/MetaEntityNodeClass.qml
new file mode 100644
index 0000000000..d6797b5a59
--- /dev/null
+++ b/plugins/metaEditor/editor/qml/MetaEntityNodeClass.qml
@@ -0,0 +1,51 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 150; height: 100
+	color: "transparent"
+	Line { 
+		x1: 0 * parent.width / 1
+		y1: 0 * parent.height / 1
+		x2: 0 * parent.width / 1
+		y2: 1 * parent.height / 1
+		color: "#000000"
+		style: "solid"
+		width: 2
+	} 
+	Line { 
+		x1: 1 * parent.width / 1
+		y1: 0 * parent.height / 1
+		x2: 1 * parent.width / 1
+		y2: 1 * parent.height / 1
+		color: "#000000"
+		style: "solid"
+		width: 2
+	} 
+	Line { 
+		x1: 0 * parent.width / 1
+		y1: 0 * parent.height / 1
+		x2: 1 * parent.width / 1
+		y2: 0 * parent.height / 1
+		color: "#000000"
+		style: "solid"
+		width: 2
+	} 
+	Line { 
+		x1: 0 * parent.width / 1
+		y1: 1 * parent.height / 1
+		x2: 1 * parent.width / 1
+		y2: 1 * parent.height / 1
+		color: "#000000"
+		style: "solid"
+		width: 2
+	} 
+	Line { 
+		x1: 0 
+		y1: 25 
+		x2: 1 * parent.width / 1
+		y2: 25 
+		color: "#000000"
+		style: "solid"
+		width: 2
+	} 
+} 
diff --git a/plugins/metaEditor/editor/qml/MetaEntityPortClass.qml b/plugins/metaEditor/editor/qml/MetaEntityPortClass.qml
new file mode 100644
index 0000000000..8196c2723e
--- /dev/null
+++ b/plugins/metaEditor/editor/qml/MetaEntityPortClass.qml
@@ -0,0 +1,52 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 50; height: 50
+	color: "transparent"
+	Line { 
+		x1: 0 * parent.width / 1
+		y1: 0 * parent.height / 1
+		x2: 0 * parent.width / 1
+		y2: 1 * parent.height / 1
+		color: "#000000"
+		style: "solid"
+		width: 2
+	} 
+	Line { 
+		x1: 1 * parent.width / 1
+		y1: 0 * parent.height / 1
+		x2: 1 * parent.width / 1
+		y2: 1 * parent.height / 1
+		color: "#000000"
+		style: "solid"
+		width: 2
+	} 
+	Line { 
+		x1: 0 * parent.width / 1
+		y1: 0 * parent.height / 1
+		x2: 1 * parent.width / 1
+		y2: 0 * parent.height / 1
+		color: "#000000"
+		style: "solid"
+		width: 2
+	} 
+	Line { 
+		x1: 0 * parent.width / 1
+		y1: 1 * parent.height / 1
+		x2: 1 * parent.width / 1
+		y2: 1 * parent.height / 1
+		color: "#000000"
+		style: "solid"
+		width: 2
+	} 
+	Ellipse { 
+		x: 25 * parent.width / 50
+		y: 25 * parent.height / 50
+		width: 1 * parent.width / 1
+		height: 1 * parent.height / 1
+		color: "#ffffff"
+		border.color: "#2f4f4f"
+		border.style: "none"
+		border.width: 1
+	} 
+} 
diff --git a/plugins/metaEditor/editor/qml/MetaEntityPossibleEdgeClass.qml b/plugins/metaEditor/editor/qml/MetaEntityPossibleEdgeClass.qml
new file mode 100644
index 0000000000..878ca7bc85
--- /dev/null
+++ b/plugins/metaEditor/editor/qml/MetaEntityPossibleEdgeClass.qml
@@ -0,0 +1,26 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 25; height: 25
+	color: "transparent"
+	Ellipse { 
+		x: 1 * parent.width / 2
+		y: 1 * parent.height / 2
+		width: 1 * parent.width / 1
+		height: 1 * parent.height / 1
+		color: "#ffffff"
+		border.color: "#2f4f4f"
+		border.style: "solid"
+		border.width: 1
+	} 
+	Ellipse { 
+		x: 1 * parent.width / 2
+		y: 1 * parent.height / 2
+		width: 3 * parent.width / 5
+		height: 3 * parent.height / 5
+		color: "#2f4f4f"
+		border.color: "#2f4f4f"
+		border.style: "solid"
+		border.width: 1
+	} 
+} 
diff --git a/plugins/metaEditor/editor/qml/MetaEntityPropertiesAsContainerClass.qml b/plugins/metaEditor/editor/qml/MetaEntityPropertiesAsContainerClass.qml
new file mode 100644
index 0000000000..809883f926
--- /dev/null
+++ b/plugins/metaEditor/editor/qml/MetaEntityPropertiesAsContainerClass.qml
@@ -0,0 +1,51 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 50; height: 50
+	color: "transparent"
+	Rectangle { 
+		anchors.fill: parent
+		x: 20 * parent.width / 50
+		y: 0 * parent.height / 1
+		width: 3 * parent.width / 5
+		height: 3 * parent.height / 5
+		border.color: "#ffffff"
+		border.width: 1
+	} 
+	Rectangle { 
+		anchors.fill: parent
+		x: 0 * parent.width / 1
+		y: 50 * parent.height / 50
+		width: 3 * parent.width / 5
+		height: 3 * parent.height / 5
+		border.color: "#ffffff"
+		border.width: 1
+	} 
+	Line { 
+		x1: 7 * parent.width / 10
+		y1: 1 * parent.height / 10
+		x2: 7 * parent.width / 10
+		y2: 1 * parent.height / 2
+		color: "#ffffff"
+		style: "solid"
+		width: 1
+	} 
+	Line { 
+		x1: 1 * parent.width / 2
+		y1: 3 * parent.height / 10
+		x2: 9 * parent.width / 10
+		y2: 3 * parent.height / 10
+		color: "#ffffff"
+		style: "solid"
+		width: 1
+	} 
+	Line { 
+		x1: 1 * parent.width / 10
+		y1: 7 * parent.height / 10
+		x2: 1 * parent.width / 2
+		y2: 7 * parent.height / 10
+		color: "#ffffff"
+		style: "solid"
+		width: 1
+	} 
+} 
diff --git a/plugins/metaEditor/editor/qml/MetaEntityUsageClass.qml b/plugins/metaEditor/editor/qml/MetaEntityUsageClass.qml
new file mode 100644
index 0000000000..87b2a8d2ad
--- /dev/null
+++ b/plugins/metaEditor/editor/qml/MetaEntityUsageClass.qml
@@ -0,0 +1,33 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 120; height: 40
+	color: "transparent"
+	Line { 
+		x1: 0 * parent.width / 1
+		y1: 1 * parent.height / 2
+		x2: 1 * parent.width / 1
+		y2: 1 * parent.height / 2
+		color: "#000000"
+		style: "dot"
+		width: 1
+	} 
+	Line { 
+		x1: 1 * parent.width / 1
+		y1: 1 * parent.height / 2
+		x2: 5 * parent.width / 6
+		y2: 1 * parent.height / 4
+		color: "#000000"
+		style: "dot"
+		width: 1
+	} 
+	Line { 
+		x1: 1 * parent.width / 1
+		y1: 1 * parent.height / 2
+		x2: 5 * parent.width / 6
+		y2: 3 * parent.height / 4
+		color: "#000000"
+		style: "dot"
+		width: 1
+	} 
+} 
diff --git a/plugins/metaEditor/editor/qml/MetaEntityValueClass.qml b/plugins/metaEditor/editor/qml/MetaEntityValueClass.qml
new file mode 100644
index 0000000000..f2648d9a6f
--- /dev/null
+++ b/plugins/metaEditor/editor/qml/MetaEntityValueClass.qml
@@ -0,0 +1,6 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 140; height: 12
+	color: "transparent"
+} 
diff --git a/plugins/metaEditor/editor/qml/MetamodelDiagramClass.qml b/plugins/metaEditor/editor/qml/MetamodelDiagramClass.qml
new file mode 100644
index 0000000000..5c2acc25fc
--- /dev/null
+++ b/plugins/metaEditor/editor/qml/MetamodelDiagramClass.qml
@@ -0,0 +1,37 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 30; height: 30
+	color: "transparent"
+	Ellipse { 
+		x: 15 * parent.width / 30
+		y: 15 * parent.height / 30
+		width: 1 * parent.width / 1
+		height: 1 * parent.height / 1
+		color: "#ffffff"
+		border.color: "#000000"
+		border.style: "solid"
+		border.width: 1
+	} 
+	Ellipse { 
+		x: 15 * parent.width / 30
+		y: 15 * parent.height / 30
+		width: 2 * parent.width / 3
+		height: 2 * parent.height / 3
+		color: "#000000"
+		border.color: "#0000f0"
+		border.style: "solid"
+		border.width: 1
+	} 
+	Text { 
+		x: 3 * parent.width / 10
+		y: 1 * parent.height / 6
+		color: "#ffffff"
+		text: "M"
+		font.family: "Helvetica"
+		font.pixelSize: 1 * parent.height / 2
+		font.bold: false
+		font.italic: false
+		font.underline: false
+	} 
+} 
diff --git a/plugins/metaEditor/editor/qml/PackageDiagramClass.qml b/plugins/metaEditor/editor/qml/PackageDiagramClass.qml
new file mode 100644
index 0000000000..da79187129
--- /dev/null
+++ b/plugins/metaEditor/editor/qml/PackageDiagramClass.qml
@@ -0,0 +1,69 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 150; height: 130
+	color: "transparent"
+	Line { 
+		x1: 0 
+		y1: 0 
+		x2: 100 
+		y2: 0 
+		color: "#000000"
+		style: "solid"
+		width: 1
+	} 
+	Line { 
+		x1: 0 
+		y1: 30 
+		x2: 0 
+		y2: 0 
+		color: "#000000"
+		style: "solid"
+		width: 1
+	} 
+	Line { 
+		x1: 100 
+		y1: 30 
+		x2: 100 
+		y2: 0 
+		color: "#000000"
+		style: "solid"
+		width: 1
+	} 
+	Line { 
+		x1: 0 
+		y1: 30 
+		x2: 1 * parent.width / 1
+		y2: 30 
+		color: "#000000"
+		style: "solid"
+		width: 1
+	} 
+	Line { 
+		x1: 0 
+		y1: 30 
+		x2: 0 * parent.width / 1
+		y2: 1 * parent.height / 1
+		color: "#000000"
+		style: "solid"
+		width: 1
+	} 
+	Line { 
+		x1: 1 * parent.width / 1
+		y1: 30 
+		x2: 1 * parent.width / 1
+		y2: 1 * parent.height / 1
+		color: "#000000"
+		style: "solid"
+		width: 1
+	} 
+	Line { 
+		x1: 0 * parent.width / 1
+		y1: 1 * parent.height / 1
+		x2: 1 * parent.width / 1
+		y2: 1 * parent.height / 1
+		color: "#000000"
+		style: "solid"
+		width: 1
+	} 
+} 
diff --git a/plugins/refactoring/editor/qml/afterBlockClass.qml b/plugins/refactoring/editor/qml/afterBlockClass.qml
new file mode 100644
index 0000000000..2e75b88984
--- /dev/null
+++ b/plugins/refactoring/editor/qml/afterBlockClass.qml
@@ -0,0 +1,82 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 200; height: 200
+	color: "transparent"
+	Line { 
+		x1: 1 * parent.width / 10
+		y1: 0 * parent.height / 1
+		x2: 9 * parent.width / 10
+		y2: 0 * parent.height / 1
+		color: "black"
+		style: "solid"
+		width: 3
+	} 
+	Line { 
+		x1: 1 * parent.width / 10
+		y1: 1 * parent.height / 1
+		x2: 9 * parent.width / 10
+		y2: 1 * parent.height / 1
+		color: "black"
+		style: "solid"
+		width: 3
+	} 
+	Line { 
+		x1: 0 * parent.width / 1
+		y1: 1 * parent.height / 10
+		x2: 0 * parent.width / 1
+		y2: 9 * parent.height / 10
+		color: "black"
+		style: "solid"
+		width: 3
+	} 
+	Line { 
+		x1: 1 * parent.width / 1
+		y1: 1 * parent.height / 10
+		x2: 1 * parent.width / 1
+		y2: 9 * parent.height / 10
+		color: "black"
+		style: "solid"
+		width: 3
+	} 
+	Arc { 
+		x1: 0 * parent.width / 1
+		y1: 0 * parent.height / 1
+		x2: 1 * parent.width / 5
+		y2: 1 * parent.height / 5
+		startAngle: 1440; spanAngle: 1440
+		color: "black"
+		style: "solid"
+		width: 3
+	} 
+	Arc { 
+		x1: 4 * parent.width / 5
+		y1: 0 * parent.height / 1
+		x2: 1 * parent.width / 1
+		y2: 1 * parent.height / 5
+		startAngle: 0; spanAngle: 1440
+		color: "black"
+		style: "solid"
+		width: 3
+	} 
+	Arc { 
+		x1: 0 * parent.width / 1
+		y1: 4 * parent.height / 5
+		x2: 1 * parent.width / 5
+		y2: 1 * parent.height / 1
+		startAngle: 2880; spanAngle: 1440
+		color: "black"
+		style: "solid"
+		width: 3
+	} 
+	Arc { 
+		x1: 4 * parent.width / 5
+		y1: 4 * parent.height / 5
+		x2: 1 * parent.width / 1
+		y2: 1 * parent.height / 1
+		startAngle: 0; spanAngle: -1440
+		color: "black"
+		style: "solid"
+		width: 3
+	} 
+} 
diff --git a/plugins/refactoring/editor/qml/beforeBlockClass.qml b/plugins/refactoring/editor/qml/beforeBlockClass.qml
new file mode 100644
index 0000000000..2e75b88984
--- /dev/null
+++ b/plugins/refactoring/editor/qml/beforeBlockClass.qml
@@ -0,0 +1,82 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 200; height: 200
+	color: "transparent"
+	Line { 
+		x1: 1 * parent.width / 10
+		y1: 0 * parent.height / 1
+		x2: 9 * parent.width / 10
+		y2: 0 * parent.height / 1
+		color: "black"
+		style: "solid"
+		width: 3
+	} 
+	Line { 
+		x1: 1 * parent.width / 10
+		y1: 1 * parent.height / 1
+		x2: 9 * parent.width / 10
+		y2: 1 * parent.height / 1
+		color: "black"
+		style: "solid"
+		width: 3
+	} 
+	Line { 
+		x1: 0 * parent.width / 1
+		y1: 1 * parent.height / 10
+		x2: 0 * parent.width / 1
+		y2: 9 * parent.height / 10
+		color: "black"
+		style: "solid"
+		width: 3
+	} 
+	Line { 
+		x1: 1 * parent.width / 1
+		y1: 1 * parent.height / 10
+		x2: 1 * parent.width / 1
+		y2: 9 * parent.height / 10
+		color: "black"
+		style: "solid"
+		width: 3
+	} 
+	Arc { 
+		x1: 0 * parent.width / 1
+		y1: 0 * parent.height / 1
+		x2: 1 * parent.width / 5
+		y2: 1 * parent.height / 5
+		startAngle: 1440; spanAngle: 1440
+		color: "black"
+		style: "solid"
+		width: 3
+	} 
+	Arc { 
+		x1: 4 * parent.width / 5
+		y1: 0 * parent.height / 1
+		x2: 1 * parent.width / 1
+		y2: 1 * parent.height / 5
+		startAngle: 0; spanAngle: 1440
+		color: "black"
+		style: "solid"
+		width: 3
+	} 
+	Arc { 
+		x1: 0 * parent.width / 1
+		y1: 4 * parent.height / 5
+		x2: 1 * parent.width / 5
+		y2: 1 * parent.height / 1
+		startAngle: 2880; spanAngle: 1440
+		color: "black"
+		style: "solid"
+		width: 3
+	} 
+	Arc { 
+		x1: 4 * parent.width / 5
+		y1: 4 * parent.height / 5
+		x2: 1 * parent.width / 1
+		y2: 1 * parent.height / 1
+		startAngle: 0; spanAngle: -1440
+		color: "black"
+		style: "solid"
+		width: 3
+	} 
+} 
diff --git a/plugins/refactoring/editor/qml/elementClass.qml b/plugins/refactoring/editor/qml/elementClass.qml
new file mode 100644
index 0000000000..c1ef9b26dd
--- /dev/null
+++ b/plugins/refactoring/editor/qml/elementClass.qml
@@ -0,0 +1,15 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 80; height: 80
+	color: "transparent"
+	Rectangle { 
+		anchors.fill: parent
+		x: 0 * parent.width / 1
+		y: 0 * parent.height / 1
+		width: 1 * parent.width / 1
+		height: 1 * parent.height / 1
+		border.color: "black"
+		border.width: 0
+	} 
+} 
diff --git a/plugins/refactoring/editor/qml/fromBeforeToAterClass.qml b/plugins/refactoring/editor/qml/fromBeforeToAterClass.qml
new file mode 100644
index 0000000000..ef8fae4cda
--- /dev/null
+++ b/plugins/refactoring/editor/qml/fromBeforeToAterClass.qml
@@ -0,0 +1,13 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 100; height: 100
+	color: "transparent"
+	Picture { 
+		x1: 1 * parent.width / 100
+		y1: 3 * parent.height / 50
+		x2: 9 * parent.width / 10
+		y2: 9 * parent.height / 10
+		source: "images/arrow3.png"
+	}
+} 
diff --git a/plugins/refactoring/editor/qml/refactoringDiagramNodeClass.qml b/plugins/refactoring/editor/qml/refactoringDiagramNodeClass.qml
new file mode 100644
index 0000000000..a85bd9e1be
--- /dev/null
+++ b/plugins/refactoring/editor/qml/refactoringDiagramNodeClass.qml
@@ -0,0 +1,13 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 100; height: 100
+	color: "transparent"
+	Picture { 
+		x1: 1 * parent.width / 100
+		y1: 3 * parent.height / 50
+		x2: 9 * parent.width / 10
+		y2: 9 * parent.height / 10
+		source: "images/pencil1.png"
+	}
+} 
diff --git a/plugins/refactoring/editor/qml/selectedSegmentClass.qml b/plugins/refactoring/editor/qml/selectedSegmentClass.qml
new file mode 100644
index 0000000000..48d9caad7c
--- /dev/null
+++ b/plugins/refactoring/editor/qml/selectedSegmentClass.qml
@@ -0,0 +1,15 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 80; height: 80
+	color: "transparent"
+	Rectangle { 
+		anchors.fill: parent
+		x: 0 * parent.width / 1
+		y: 0 * parent.height / 1
+		width: 1 * parent.width / 1
+		height: 1 * parent.height / 1
+		border.color: "#f0ffff"
+		border.width: 0
+	} 
+} 
diff --git a/plugins/refactoring/editor/refactoringEditor.xml b/plugins/refactoring/editor/refactoringEditor.xml
index f2d629e5ce..840426b78c 100644
--- a/plugins/refactoring/editor/refactoringEditor.xml
+++ b/plugins/refactoring/editor/refactoringEditor.xml
@@ -5,7 +5,7 @@
         <node displayedName="Refactoring Diagram" name="refactoringDiagramNode">
           <graphics>
             <picture sizex="100" sizey="100">
-              <image y1="6" name="images/pencil1.png" x1="1" y2="90" x2="90"/>
+              <external file="qml/refactoringDiagramNodeClass.qml"/>
             </picture>
 			<labels>
               <label x="5" y="95" textBinded="name"/>
@@ -35,7 +35,7 @@
         <node displayedName="Element" name="element">
                 <graphics>
                     <picture sizex="80" sizey="80">
-                        <rectangle stroke-style="solid" stroke="#000000" y1="0" stroke-width="0" x1="0" y2="80" x2="80"/>
+                        <external file="qml/elementClass.qml"/>
                     </picture>
 					<labels>
 						<label x="80" y="0" textBinded="ID"/>
@@ -69,7 +69,7 @@
 			<node displayedName="Selected segment" name="selectedSegment">
                 <graphics>
                     <picture sizex="80" sizey="80">
-                        <rectangle fill="#f0ffff" fill-style="solid" stroke-style="solid" stroke="#000000" y1="0" stroke-width="0" x1="0" y2="80" x2="80"/>
+                        <external file="qml/selectedSegmentClass.qml"/>
                     </picture>
 					<labels>
 						<label x="80" y="0" textBinded="ID"/>
@@ -118,14 +118,7 @@
         <node displayedName="Before Block" name="beforeBlock">
               <graphics>
             <picture sizex="200" sizey="200">
-              <line y1="0" x1="20" y2="0" x2="180" stroke-style="solid" stroke-width="3" stroke="#009933"/>
-              <line y1="200" x1="20" y2="200" x2="180" stroke-style="solid" stroke-width="3" stroke="#009933"/>
-              <line y1="20" x1="0" y2="180" x2="0" stroke-style="solid" stroke-width="3" stroke="#009933"/>
-              <line y1="20" x1="200" y2="180" x2="200" stroke-style="solid" stroke-width="3" stroke="#009933"/>
-              <arc spanAngle="1440" startAngle="1440" y1="0" x1="0" y2="40" x2="40" stroke-width="3" stroke-style="solid" stroke="#009933"/>
-              <arc spanAngle="1440" startAngle="0" y1="0" x1="160" y2="40" x2="200" stroke-width="3" stroke-style="solid" stroke="#009933"/>
-              <arc spanAngle="1440" startAngle="2880" y1="160" x1="0" y2="200" x2="40" stroke-width="3" stroke-style="solid" stroke="#009933"/>
-              <arc spanAngle="-1440" startAngle="0" y1="160" x1="160" y2="200" x2="200" stroke-width="3" stroke-style="solid" stroke="#009933"/>
+				<external file="qml/beforeBlockClass.qml"/>
             </picture>
             <labels>
   			  <label x="5" y="5" text="&lt;b&gt;BEFORE&lt;/b&gt;"/>
@@ -149,14 +142,7 @@
 		        <node displayedName="After Block"  name="afterBlock">
               <graphics>
             <picture sizex="200" sizey="200">
-              <line y1="0" x1="20" y2="0" x2="180" stroke-style="solid" stroke-width="3" stroke="#009933"/>
-              <line y1="200" x1="20" y2="200" x2="180" stroke-style="solid" stroke-width="3" stroke="#009933"/>
-              <line y1="20" x1="0" y2="180" x2="0" stroke-style="solid" stroke-width="3" stroke="#009933"/>
-              <line y1="20" x1="200" y2="180" x2="200" stroke-style="solid" stroke-width="3" stroke="#009933"/>
-              <arc spanAngle="1440" startAngle="1440" y1="0" x1="0" y2="40" x2="40" stroke-style="solid" stroke-width="3" stroke="#009933"/>
-              <arc spanAngle="1440" startAngle="0" y1="0" x1="160" y2="40" x2="200" stroke-style="solid" stroke-width="3" stroke="#009933"/>
-              <arc spanAngle="1440" startAngle="2880" y1="160" x1="0" y2="200" x2="40" stroke-style="solid" stroke-width="3" stroke="#009933"/>
-              <arc spanAngle="-1440" startAngle="0" y1="160" x1="160" y2="200" x2="200" stroke-width="3" stroke-style="solid" stroke="#009933"/>
+				<external file="qml/afterBlockClass.qml"/>
             </picture>
             <labels>
 			  <label x="5" y="5" text="&lt;b&gt;AFTER&lt;/b&gt;"/>
@@ -179,7 +165,7 @@
         <node displayedName="From Before To After" name="fromBeforeToAter">
           <graphics>
             <picture sizex="100" sizey="100">
-              <image y1="6" name="images/arrow3.png" x1="1" y2="90" x2="90"/>
+              <external file="qml/fromBeforeToAterClass.qml"/>
             </picture>
 			<labels/>
               <ports>
diff --git a/plugins/requirements/editor/qml/RequirementsDiagramNodeClass.qml b/plugins/requirements/editor/qml/RequirementsDiagramNodeClass.qml
new file mode 100644
index 0000000000..4cd0b55610
--- /dev/null
+++ b/plugins/requirements/editor/qml/RequirementsDiagramNodeClass.qml
@@ -0,0 +1,82 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 200; height: 200
+	color: "transparent"
+	Line { 
+		x1: 1 * parent.width / 10
+		y1: 0 * parent.height / 1
+		x2: 9 * parent.width / 10
+		y2: 0 * parent.height / 1
+		color: "black"
+		style: "solid"
+		width: 1
+	} 
+	Line { 
+		x1: 1 * parent.width / 10
+		y1: 1 * parent.height / 1
+		x2: 9 * parent.width / 10
+		y2: 1 * parent.height / 1
+		color: "black"
+		style: "solid"
+		width: 1
+	} 
+	Line { 
+		x1: 0 * parent.width / 1
+		y1: 1 * parent.height / 10
+		x2: 0 * parent.width / 1
+		y2: 9 * parent.height / 10
+		color: "black"
+		style: "solid"
+		width: 1
+	} 
+	Line { 
+		x1: 1 * parent.width / 1
+		y1: 1 * parent.height / 10
+		x2: 1 * parent.width / 1
+		y2: 9 * parent.height / 10
+		color: "black"
+		style: "solid"
+		width: 1
+	} 
+	Arc { 
+		x1: 0 * parent.width / 1
+		y1: 0 * parent.height / 1
+		x2: 1 * parent.width / 5
+		y2: 1 * parent.height / 5
+		startAngle: 1440; spanAngle: 1440
+		color: "black"
+		style: "solid"
+		width: 1
+	} 
+	Arc { 
+		x1: 4 * parent.width / 5
+		y1: 0 * parent.height / 1
+		x2: 1 * parent.width / 1
+		y2: 1 * parent.height / 5
+		startAngle: 0; spanAngle: 1440
+		color: "black"
+		style: "solid"
+		width: 1
+	} 
+	Arc { 
+		x1: 0 * parent.width / 1
+		y1: 4 * parent.height / 5
+		x2: 1 * parent.width / 5
+		y2: 1 * parent.height / 1
+		startAngle: 2880; spanAngle: 1440
+		color: "black"
+		style: "solid"
+		width: 1
+	} 
+	Arc { 
+		x1: 4 * parent.width / 5
+		y1: 4 * parent.height / 5
+		x2: 1 * parent.width / 1
+		y2: 1 * parent.height / 1
+		startAngle: 0; spanAngle: -1440
+		color: "black"
+		style: "solid"
+		width: 1
+	} 
+} 
diff --git a/plugins/requirements/editor/qml/reqnConceptAlternativeClass.qml b/plugins/requirements/editor/qml/reqnConceptAlternativeClass.qml
new file mode 100644
index 0000000000..fc77838606
--- /dev/null
+++ b/plugins/requirements/editor/qml/reqnConceptAlternativeClass.qml
@@ -0,0 +1,16 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 30; height: 30
+	color: "transparent"
+	Ellipse { 
+		x: 15 * parent.width / 30
+		y: 15 * parent.height / 30
+		width: 2 * parent.width / 3
+		height: 2 * parent.height / 3
+		color: "#000000"
+		border.color: "#000000"
+		border.style: "solid"
+		border.width: 2
+	} 
+} 
diff --git a/plugins/requirements/editor/qml/reqnFeaturedClass.qml b/plugins/requirements/editor/qml/reqnFeaturedClass.qml
new file mode 100644
index 0000000000..fc77838606
--- /dev/null
+++ b/plugins/requirements/editor/qml/reqnFeaturedClass.qml
@@ -0,0 +1,16 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 30; height: 30
+	color: "transparent"
+	Ellipse { 
+		x: 15 * parent.width / 30
+		y: 15 * parent.height / 30
+		width: 2 * parent.width / 3
+		height: 2 * parent.height / 3
+		color: "#000000"
+		border.color: "#000000"
+		border.style: "solid"
+		border.width: 2
+	} 
+} 
diff --git a/plugins/requirements/editor/qml/reqnLeafClass.qml b/plugins/requirements/editor/qml/reqnLeafClass.qml
new file mode 100644
index 0000000000..fc77838606
--- /dev/null
+++ b/plugins/requirements/editor/qml/reqnLeafClass.qml
@@ -0,0 +1,16 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 30; height: 30
+	color: "transparent"
+	Ellipse { 
+		x: 15 * parent.width / 30
+		y: 15 * parent.height / 30
+		width: 2 * parent.width / 3
+		height: 2 * parent.height / 3
+		color: "#000000"
+		border.color: "#000000"
+		border.style: "solid"
+		border.width: 2
+	} 
+} 
diff --git a/plugins/requirements/editor/qml/reqnParentAlternativeClass.qml b/plugins/requirements/editor/qml/reqnParentAlternativeClass.qml
new file mode 100644
index 0000000000..3ec7c55159
--- /dev/null
+++ b/plugins/requirements/editor/qml/reqnParentAlternativeClass.qml
@@ -0,0 +1,26 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 30; height: 30
+	color: "transparent"
+	Ellipse { 
+		x: 15 * parent.width / 30
+		y: 15 * parent.height / 30
+		width: 2 * parent.width / 3
+		height: 2 * parent.height / 3
+		color: "#ffffff"
+		border.color: "#000000"
+		border.style: "solid"
+		border.width: 2
+	} 
+	Ellipse { 
+		x: 15 * parent.width / 30
+		y: 15 * parent.height / 30
+		width: 1 * parent.width / 3
+		height: 1 * parent.height / 3
+		color: "#000000"
+		border.color: "#000000"
+		border.style: "solid"
+		border.width: 2
+	} 
+} 
diff --git a/plugins/requirements/editor/qml/reqnParentClass.qml b/plugins/requirements/editor/qml/reqnParentClass.qml
new file mode 100644
index 0000000000..fc77838606
--- /dev/null
+++ b/plugins/requirements/editor/qml/reqnParentClass.qml
@@ -0,0 +1,16 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 30; height: 30
+	color: "transparent"
+	Ellipse { 
+		x: 15 * parent.width / 30
+		y: 15 * parent.height / 30
+		width: 2 * parent.width / 3
+		height: 2 * parent.height / 3
+		color: "#000000"
+		border.color: "#000000"
+		border.style: "solid"
+		border.width: 2
+	} 
+} 
diff --git a/plugins/requirements/editor/qml/reqnParentMandatoryClass.qml b/plugins/requirements/editor/qml/reqnParentMandatoryClass.qml
new file mode 100644
index 0000000000..fc77838606
--- /dev/null
+++ b/plugins/requirements/editor/qml/reqnParentMandatoryClass.qml
@@ -0,0 +1,16 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 30; height: 30
+	color: "transparent"
+	Ellipse { 
+		x: 15 * parent.width / 30
+		y: 15 * parent.height / 30
+		width: 2 * parent.width / 3
+		height: 2 * parent.height / 3
+		color: "#000000"
+		border.color: "#000000"
+		border.style: "solid"
+		border.width: 2
+	} 
+} 
diff --git a/plugins/requirements/editor/qml/reqnParentOpAlternativeClass.qml b/plugins/requirements/editor/qml/reqnParentOpAlternativeClass.qml
new file mode 100644
index 0000000000..3ec7c55159
--- /dev/null
+++ b/plugins/requirements/editor/qml/reqnParentOpAlternativeClass.qml
@@ -0,0 +1,26 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 30; height: 30
+	color: "transparent"
+	Ellipse { 
+		x: 15 * parent.width / 30
+		y: 15 * parent.height / 30
+		width: 2 * parent.width / 3
+		height: 2 * parent.height / 3
+		color: "#ffffff"
+		border.color: "#000000"
+		border.style: "solid"
+		border.width: 2
+	} 
+	Ellipse { 
+		x: 15 * parent.width / 30
+		y: 15 * parent.height / 30
+		width: 1 * parent.width / 3
+		height: 1 * parent.height / 3
+		color: "#000000"
+		border.color: "#000000"
+		border.style: "solid"
+		border.width: 2
+	} 
+} 
diff --git a/plugins/requirements/editor/qml/reqnParentOptionalClass.qml b/plugins/requirements/editor/qml/reqnParentOptionalClass.qml
new file mode 100644
index 0000000000..d7501385b7
--- /dev/null
+++ b/plugins/requirements/editor/qml/reqnParentOptionalClass.qml
@@ -0,0 +1,16 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 30; height: 30
+	color: "transparent"
+	Ellipse { 
+		x: 15 * parent.width / 30
+		y: 15 * parent.height / 30
+		width: 2 * parent.width / 3
+		height: 2 * parent.height / 3
+		color: "#ffffff"
+		border.color: "#000000"
+		border.style: "solid"
+		border.width: 2
+	} 
+} 
diff --git a/plugins/requirements/editor/qml/reqnParentOrClass.qml b/plugins/requirements/editor/qml/reqnParentOrClass.qml
new file mode 100644
index 0000000000..d29bf91b6b
--- /dev/null
+++ b/plugins/requirements/editor/qml/reqnParentOrClass.qml
@@ -0,0 +1,24 @@
+import QtQuick 1.0 
+import CustomComponents 1.0 
+Rectangle { 
+	width: 30; height: 30
+	color: "transparent"
+	Path { 
+		fill: "#ffffff"
+		style: "solid"
+		width: 2
+		sizex: parent.width
+		sizey: parent.height
+		color: "#000000"
+		str: " M 15 15 L 5 15 C 5 20.5228 9.47715 25 15 25 C 20.5228 25 25 20.5228 25 15 C 25 9.47715 20.5228 5 15 5 L 15 15"
+	} 
+	Path { 
+		fill: "#000000"
+		style: "solid"
+		width: 2
+		sizex: parent.width
+		sizey: parent.height
+		color: "#000000"
+		str: " M 15 15 L 15 5 C 9.47715 5 5 9.47715 5 15 L 15 15"
+	} 
+} 
diff --git a/plugins/requirements/editor/requirementsMetamodel.xml b/plugins/requirements/editor/requirementsMetamodel.xml
index 2ed46b648d..114a9b26ef 100644
--- a/plugins/requirements/editor/requirementsMetamodel.xml
+++ b/plugins/requirements/editor/requirementsMetamodel.xml
@@ -22,15 +22,8 @@
       <node displayedName="Requirements Diagram" path="10, 0 : 90, 0 : 90, 100 : 10, 100 : 0, 90 : 0, 10 : 100, 10 : 100, 90 : " name="RequirementsDiagramNode">
         <graphics>
           <picture sizex="200" sizey="200">
-            <line y1="0" x1="20" y2="0" x2="180"/>
-            <line y1="200" x1="20" y2="200" x2="180"/>
-            <line y1="20" x1="0" y2="180" x2="0"/>
-            <line y1="20" x1="200" y2="180" x2="200"/>
-            <arc spanAngle="1440" startAngle="1440" y1="0" x1="0" y2="40" x2="40"/>
-            <arc spanAngle="1440" startAngle="0" y1="0" x1="160" y2="40" x2="200"/>
-            <arc spanAngle="1440" startAngle="2880" y1="160" x1="0" y2="200" x2="40"/>
-            <arc spanAngle="-1440" startAngle="0" y1="160" x1="160" y2="200" x2="200"/>
-          </picture>
+				<external file="qml/RequirementsDiagramNodeClass.qml"/>
+		  </picture>
           <labels>
             <label x="40" y="10" textBinded="name"/>
           </labels>
@@ -63,7 +56,7 @@
 
           <!--<description>as leaf - for the possibility of future node extension</description>-->
           <picture sizex="30" sizey="30" >
-            <ellipse fill="#000000" stroke-style="solid" stroke="#000000" y1="5" x1="5" y2="25" stroke-width="2" x2="25" fill-style="solid" />
+            <external file="qml/reqnFeaturedClass.qml"/>
           </picture>
           <labels>
             <label x="5" y="10" textBinded="name"/>
@@ -107,7 +100,7 @@
 
           <!--<description>concept/leaf/feature graphical representation</description>-->
           <picture sizex="30" sizey="30" >
-            <ellipse fill="#000000" stroke-style="solid" stroke="#000000" y1="5" x1="5" y2="25" stroke-width="2" x2="25" fill-style="solid" />
+            <external file="qml/reqnConceptAlternativeClass.qml" />
           </picture>
           <labels>
             <label x="5" y="10" textBinded="name"/>
@@ -134,7 +127,7 @@
         <graphics>
 
           <picture sizex="30" sizey="30" >
-            <ellipse fill="#000000" stroke-style="solid" stroke="#000000" y1="5" x1="5" y2="25" stroke-width="2" x2="25" fill-style="solid" />
+            <external file="qml/reqnLeafClass.qml"/>
           </picture>
           <labels>
             <label x="5" y="10" textBinded="name"/>
@@ -161,8 +154,8 @@
 
           <!--<description>as leaf - for the possibility of future node extension</description>-->
           <picture sizex="30" sizey="30" >
-            <ellipse fill="#000000" stroke-style="solid" stroke="#000000" y1="5" x1="5" y2="25" stroke-width="2" x2="25" fill-style="solid" />
-          </picture>
+            <external file="qml/reqnParentClass.qml"/>
+	  </picture>
           <labels>
             <label x="5" y="10" textBinded="name"/>
           </labels>
@@ -191,7 +184,7 @@
 
           <!--<description>parent of mandatory features graphical representation</description>-->
           <picture sizex="30" sizey="30" >
-            <ellipse fill="#000000" stroke-style="solid" stroke="#000000" y1="5" x1="5" y2="25" stroke-width="2" x2="25" fill-style="solid" />
+            <external file="qml/reqnParentMandatoryClass.qml"/>
           </picture>
           <labels>
             <label x="5" y="10" textBinded="name"/>
@@ -217,8 +210,7 @@
         <graphics>
 
           <picture sizex="30" sizey="30" >
-            <path fill="#ffffff" stroke-style="solid" int="12" stroke="#000000" stroke-width="2" d=" M 15 15 L 5 15 C 5 20.5228 9.47715 25 15 25 C 20.5228 25 25 20.5228 25 15 C 25 9.47715 20.5228 5 15 5 L 15 15" fill-style="solid" />
-            <path fill="#000000" stroke-style="solid" int="6" stroke="#000000" stroke-width="2" d=" M 15 15 L 15 5 C 9.47715 5 5 9.47715 5 15 L 15 15" fill-style="solid" />
+				<external file="qml/reqnParentOrClass.qml"/>
           </picture>
           <labels>
             <label x="5" y="10" textBinded="name"/>
@@ -244,7 +236,7 @@
         <graphics>
 
           <picture sizex="30" sizey="30" >
-            <ellipse fill="#ffffff" stroke-style="solid" stroke="#000000" y1="5" x1="5" y2="25" stroke-width="2" x2="25" fill-style="solid" />
+            <external file="qml/reqnParentOptionalClass.qml"/>
           </picture>
           <labels>
             <label x="5" y="10" textBinded="name"/>
@@ -270,8 +262,7 @@
         <graphics>
 
           <picture sizex="30" sizey="30" >
-            <ellipse fill="#ffffff" stroke-style="solid" stroke="#000000" y1="5" x1="5" y2="25" stroke-width="2" x2="25" fill-style="solid" />
-            <ellipse fill="#000000" stroke-style="solid" stroke="#000000" y1="10" x1="10" y2="20" stroke-width="2" x2="20" fill-style="solid" />
+            <external file="qml/reqnParentAlternativeClass.qml"/>
           </picture>
           <labels>
             <label x="5" y="10" textBinded="name"/>
@@ -297,8 +288,7 @@
         <graphics>
 
           <picture sizex="30" sizey="30" >
-            <ellipse fill="#ffffff" stroke-style="solid" stroke="#000000" y1="5" x1="5" y2="25" stroke-width="2" x2="25" fill-style="solid" />
-            <ellipse fill="#000000" stroke-style="solid" stroke="#000000" y1="10" x1="10" y2="20" stroke-width="2" x2="20" fill-style="solid" />
+            <external file="qml/reqnParentOpAlternativeClass.qml"/>
           </picture>
           <labels>
             <label x="5" y="10" textBinded="name"/>
diff --git a/qrgui/editorPluginInterface/elementImpl.h b/qrgui/editorPluginInterface/elementImpl.h
index 9f7f054b23..c9f187c50d 100644
--- a/qrgui/editorPluginInterface/elementImpl.h
+++ b/qrgui/editorPluginInterface/elementImpl.h
@@ -8,6 +8,7 @@
 #include <QtGui/QPainter>
 
 #include <qrkernel/ids.h>
+#include <qrutils/inFile.h>
 
 #include "editorPluginInterface/labelInterface.h"
 #include "editorPluginInterface/labelFactoryInterface.h"
@@ -49,7 +50,7 @@ class ElementImpl {
 	virtual void init(LabelFactoryInterface &factory
 			, QList<LabelInterface*> &titles) = 0;
 
-	virtual QUrl qmlUrl() const = 0;
+	virtual QString qmlString() const = 0;
 
 	virtual void updateData(ElementRepoInterface *repo) const = 0;
 	virtual bool isNode() const = 0;
diff --git a/qrgui/mainwindow/mainWindow.cpp b/qrgui/mainwindow/mainWindow.cpp
index 37150cfe6f..ca16dd6827 100644
--- a/qrgui/mainwindow/mainWindow.cpp
+++ b/qrgui/mainwindow/mainWindow.cpp
@@ -18,6 +18,7 @@
 #include <QtWidgets/QAction>
 #include <QtGui/QKeySequence>
 #include <QtDeclarative/QDeclarativeEngine>
+#include <QtDeclarative/QDeclarativeContext>
 
 #include <qrkernel/settingsManager.h>
 #include <qrutils/outFile.h>
@@ -58,6 +59,11 @@
 #include "qmlType/declarativeEllipse.h"
 #include "qmlType/declarativeLine.h"
 #include "qmlType/declarativePen.h"
+#include "qmlType/declarativeArc.h"
+#include "qmlType/declarativePath.h"
+#include "qmlType/declarativeImage.h"
+#include "qmlType/declarativeCurve.h"
+#include "qmlType/declarativePolygon.h"
 
 using namespace qReal;
 using namespace qReal::commands;
@@ -114,6 +120,11 @@ MainWindow::MainWindow(QString const &fileToOpen)
 
 	initDocks();
 	mModels = new models::Models(mProjectManager->saveFilePath(), mEditorManagerProxy);
+
+	//
+	mQmlEngine->rootContext()->setContextProperty("models", &mModels->graphicalModelAssistApi());
+	//
+
 	mExploser.reset(new Exploser(mModels->logicalModelAssistApi()));
 
 	mErrorReporter = new gui::ErrorReporter(mUi->errorListWidget, mUi->errorDock);
@@ -124,10 +135,10 @@ MainWindow::MainWindow(QString const &fileToOpen)
 
 
 	splashScreen.setProgress(60);
-
+	qDebug() << "May be there";
 	loadPlugins();
 
-
+	qDebug() << "Test";
 	splashScreen.setProgress(70);
 
 	mDocksVisibility.clear();
@@ -286,7 +297,12 @@ void MainWindow::registerQmlTypes()
 {
 	qmlRegisterType<qmlTypes::DeclarativeLine>("CustomComponents", 1, 0, "Line");
 	qmlRegisterType<qmlTypes::DeclarativeEllipse>("CustomComponents", 1, 0, "Ellipse");
-	qmlRegisterType<qmlTypes::DeclarativePen>("CustomComponents", 1, 0,"Border");
+	qmlRegisterType<qmlTypes::DeclarativeArc>("CustomComponents", 1, 0, "Arc");
+	qmlRegisterType<qmlTypes::DeclarativePen>("CustomComponents", 1, 0, "Border");
+	qmlRegisterType<qmlTypes::DeclarativePath>("CustomComponents", 1, 0, "Path");
+	qmlRegisterType<qmlTypes::DeclarativeImage>("CustomComponents", 1, 0, "Picture");
+	qmlRegisterType<qmlTypes::DeclarativePolygon>("CustomComponents", 1, 0, "Polygon");
+	qmlRegisterType<qmlTypes::DeclarativeCurve>("CustomComponents", 1, 0, "Curve");
 }
 
 void MainWindow::showFindDialog()
@@ -466,6 +482,7 @@ void MainWindow::sceneSelectionChanged()
 
 	foreach (QGraphicsItem* item, items) {
 		Element* element = dynamic_cast<Element*>(item);
+
 		if (element) {
 			if (element->isSelected()) {
 				selected.append(element);
@@ -2282,7 +2299,7 @@ void MainWindow::setVersion(QString const &version)
 
 void MainWindow::openStartTab()
 {
-	mStartWidget = new StartWidget(this, mProjectManager);
+	mStartWidget = new StartWidget(this, mProjectManager, mQmlEngine);
 	int const index = mUi->tabs->addTab(mStartWidget, tr("Getting Started"));
 	mUi->tabs->setTabUnclosable(index);
 	mStartWidget->setVisibleForInterpreterButton(mToolManager.customizer()->showInterpeterButton());
diff --git a/qrgui/mainwindow/startWidget/startWidget.cpp b/qrgui/mainwindow/startWidget/startWidget.cpp
index 0148fa5352..c45f63a968 100644
--- a/qrgui/mainwindow/startWidget/startWidget.cpp
+++ b/qrgui/mainwindow/startWidget/startWidget.cpp
@@ -12,7 +12,7 @@
 
 using namespace qReal;
 
-StartWidget::StartWidget(MainWindow *mainWindow, ProjectManager *projectManager)
+StartWidget::StartWidget(MainWindow *mainWindow, ProjectManager *projectManager, QDeclarativeEngine * const qmlEngine)
 	: mMainWindow(mainWindow)
 	, mProjectManager(projectManager)
 	, mProjectListSize(5)  // TODO: Why 5?
@@ -20,6 +20,7 @@ StartWidget::StartWidget(MainWindow *mainWindow, ProjectManager *projectManager)
 	, mOpenProjectButton(nullptr)
 	, mOpenInterpreterButton(nullptr)
 	, mCreateInterpreterButton(nullptr)
+	, mQmlEngine(qmlEngine)
 {
 	setStyleSheet(BrandManager::styles()->startTabSubstrateBackgroundStyle());
 	QWidget * const mainWidget = createMainWidget();
@@ -273,7 +274,7 @@ void StartWidget::openInterpretedDiagram()
 	ProxyEditorManager &editorManagerProxy = mMainWindow->editorManagerProxy();
 
 	if (!fileName.isEmpty() && mProjectManager->open(fileName)) {
-		editorManagerProxy.setProxyManager(new InterpreterEditorManager(fileName));
+		editorManagerProxy.setProxyManager(new InterpreterEditorManager(fileName, mQmlEngine));
 		QStringList interpreterDiagramsList;
 		foreach (Id const &editor, editorManagerProxy.editors()) {
 			foreach (Id const &diagram, editorManagerProxy.diagrams(editor)) {
@@ -304,7 +305,7 @@ void StartWidget::createInterpretedDiagram()
 {
 	hide();
 	ProxyEditorManager &editorManagerProxy = mMainWindow->editorManagerProxy();
-	editorManagerProxy.setProxyManager(new InterpreterEditorManager(""));
+	editorManagerProxy.setProxyManager(new InterpreterEditorManager("", mQmlEngine));
 	bool ok = false;
 	QString name = QInputDialog::getText(this, tr("Enter the diagram name:"), tr("diagram name:")
 			, QLineEdit::Normal, "", &ok);
diff --git a/qrgui/mainwindow/startWidget/startWidget.h b/qrgui/mainwindow/startWidget/startWidget.h
index 8fa688e3d3..0350ae45f4 100644
--- a/qrgui/mainwindow/startWidget/startWidget.h
+++ b/qrgui/mainwindow/startWidget/startWidget.h
@@ -6,6 +6,9 @@
 
 #include "mainwindow/projectManager/projectManager.h"
 
+class QDeclarativeItem;
+class QDeclarativeEngine;
+
 namespace qReal {
 
 class MainWindow;
@@ -19,7 +22,7 @@ class StartWidget : public QWidget
 	Q_OBJECT
 
 public:
-	StartWidget(MainWindow *mainWindow, ProjectManager *projectManager);
+	StartWidget(MainWindow *mainWindow, ProjectManager *projectManager, QDeclarativeEngine * const qmlEngine);
 
 	/// Shows or hides interpreter buttons. Also this method can change layout of the
 	/// buttons on start tab.
@@ -56,6 +59,7 @@ private slots:
 	QPushButton *mOpenProjectButton;  // Has ownership.
 	QPushButton *mOpenInterpreterButton;  // Has ownership.
 	QPushButton *mCreateInterpreterButton;  // Has ownership.
+	QDeclarativeEngine *mQmlEngine;
 };
 
 }
diff --git a/qrgui/models/graphicalModelAssistApi.cpp b/qrgui/models/graphicalModelAssistApi.cpp
index 4db94b991b..2abc26d97a 100644
--- a/qrgui/models/graphicalModelAssistApi.cpp
+++ b/qrgui/models/graphicalModelAssistApi.cpp
@@ -89,11 +89,20 @@ void GraphicalModelAssistApi::copyProperties(Id const &dest, Id const &src)
 	mGraphicalModel.mutableApi().copyProperties(dest, src);
 }
 
-QMap<QString, QVariant> GraphicalModelAssistApi::properties(Id const &id)
+QMap<QString, QVariant> GraphicalModelAssistApi::properties(Id const id)
 {
 	return mGraphicalModel.mutableApi().properties(id);
 }
 
+QString GraphicalModelAssistApi::getProperties(QString const ids, QString type)
+{
+	if (!ids.isEmpty()) {
+		return mGraphicalModel.mutableApi().properties(Id::loadFromString(ids)).take(type).toString();
+	} else {
+		return "";
+	}
+}
+
 void GraphicalModelAssistApi::setProperties(Id const &id, QMap<QString, QVariant> const &properties)
 {
 	mGraphicalModel.mutableApi().setProperties(id, properties);
diff --git a/qrgui/models/graphicalModelAssistApi.h b/qrgui/models/graphicalModelAssistApi.h
index d3eeb3ad5b..6089d43157 100644
--- a/qrgui/models/graphicalModelAssistApi.h
+++ b/qrgui/models/graphicalModelAssistApi.h
@@ -22,7 +22,7 @@ class GraphicalModel;
 class GraphicalModelAssistApi : public QObject, public GraphicalModelAssistInterface
 {
 	Q_OBJECT
-
+//	Q_PROPERTY(QMap<QString, QVariant> properties READ properties)
 public:
 	GraphicalModelAssistApi(
 			details::GraphicalModel &graphicalModel
@@ -45,7 +45,8 @@ class GraphicalModelAssistApi : public QObject, public GraphicalModelAssistInter
 	void changeParent(Id const &element, Id const &parent, QPointF const &position) override;
 
 	void copyProperties(Id const &dest, Id const &src) override;
-	QMap<QString, QVariant> properties(Id const &id) override;
+	Q_INVOKABLE QMap<QString, QVariant> properties(Id const id) override;
+	Q_INVOKABLE QString getProperties(QString const ids, QString type) override;
 	void setProperties(Id const &id, QMap<QString, QVariant> const &properties);
 
 	void stackBefore(Id const &element, Id const &sibling);
@@ -89,7 +90,7 @@ class GraphicalModelAssistApi : public QObject, public GraphicalModelAssistInter
 	QPersistentModelIndex rootIndex() const override;
 	Id rootId() const override;
 
-	bool hasRootDiagrams() const override;
+	Q_INVOKABLE bool hasRootDiagrams() const override;
 	int childrenOfRootDiagram() const override;
 	int childrenOfDiagram(const Id &parent) const override;
 
@@ -132,6 +133,7 @@ class GraphicalModelAssistApi : public QObject, public GraphicalModelAssistInter
 
 signals:
 	void nameChanged(Id const &id);
+	void idsChanged();
 
 private:
 	GraphicalModelAssistApi(GraphicalModelAssistApi const &);
@@ -140,6 +142,7 @@ class GraphicalModelAssistApi : public QObject, public GraphicalModelAssistInter
 	details::GraphicalModel &mGraphicalModel;
 	details::ModelsAssistApi mModelsAssistApi;
 	details::GraphicalPartModel &mGraphicalPartModel;
+
 };
 
 }
diff --git a/qrgui/pluginManager/details/interpreterElementImpl.cpp b/qrgui/pluginManager/details/interpreterElementImpl.cpp
index ba67265a01..f47dcc65f0 100644
--- a/qrgui/pluginManager/details/interpreterElementImpl.cpp
+++ b/qrgui/pluginManager/details/interpreterElementImpl.cpp
@@ -1,15 +1,19 @@
 #include "interpreterElementImpl.h"
 
+#include <QtDeclarative/QDeclarativeEngine>
+#include <QtDeclarative/QDeclarativeItem>
+
 #include <qrutils/outFile.h>
 #include <qrutils/scalableItem.h>
+#include <qrutils/inFile.h>
 
 #include "pluginManager/details/interpreterPortImpl.h"
 
 using namespace qReal;
 using namespace utils;
 
-InterpreterElementImpl::InterpreterElementImpl(qrRepo::RepoApi *repo, Id const &metaId)
-		: mEditorRepoApi(repo), mId(metaId)
+InterpreterElementImpl::InterpreterElementImpl(qrRepo::RepoApi *repo, Id const &metaId, QDeclarativeEngine * const qmlEngine)
+		: mEditorRepoApi(repo), mId(metaId), mQmlEngine(qmlEngine)
 {
 }
 
@@ -186,10 +190,10 @@ void InterpreterElementImpl::init(LabelFactoryInterface &labelFactory, QList<Lab
 	}
 }
 
-QUrl InterpreterElementImpl::qmlUrl() const
+QString InterpreterElementImpl::qmlString() const
 {
 	/// @todo:
-	return QUrl("qrc:/default.qml");
+	return utils::InFile::readAll("qrc:/default.qml");
 }
 
 QStringList InterpreterElementImpl::getListOfStr(QString const &labelText) const
@@ -531,13 +535,9 @@ QList<double> InterpreterElementImpl::border() const
 
 void InterpreterElementImpl::updateRendererContent(QString const &shape)
 {
-	QDomDocument classDoc;
-	mGraphics.setContent(shape);
-	QDomElement qmlElement = mGraphics.firstChildElement("graphics").firstChildElement("picture");
-	classDoc.appendChild(classDoc.importNode(qmlElement, true));
-	if (!classDoc.childNodes().isEmpty()) {
-//		mRenderer->load(classDoc);
-	}
+	QDeclarativeComponent component(mQmlEngine);
+	component.setData(shape.toLocal8Bit(),QUrl());
+	mQmlItem = qobject_cast<QDeclarativeItem *>(component.create());
 }
 
 QStringList InterpreterElementImpl::bonusContextMenuFields() const
diff --git a/qrgui/pluginManager/details/interpreterElementImpl.h b/qrgui/pluginManager/details/interpreterElementImpl.h
index 6a1fa7ac86..18c92c2218 100644
--- a/qrgui/pluginManager/details/interpreterElementImpl.h
+++ b/qrgui/pluginManager/details/interpreterElementImpl.h
@@ -2,12 +2,16 @@
 
 #include <QtCore/QMap>
 #include <QtWidgets/QWidget>
+#include <QtWidgets/QGraphicsScene>
 #include <QtCore/QList>
 #include <QtCore/QMap>
 #include <QtCore/QRectF>
 #include <QtCore/QPointF>
 #include <QtGui/QPainter>
 
+#include <QtDeclarative/QDeclarativeEngine>
+#include <QtDeclarative/QDeclarativeItem>
+
 #include <qrkernel/ids.h>
 #include <qrrepo/repoApi.h>
 
@@ -45,12 +49,12 @@ struct NodeLabel {
 class InterpreterElementImpl : public ElementImpl
 {
 public:
-	InterpreterElementImpl(qrRepo::RepoApi *repo, Id const &metaId);
+	InterpreterElementImpl(qrRepo::RepoApi *repo, Id const &metaId, QDeclarativeEngine * const qmlEngine);
 	void init(QRectF &contents, PortFactoryInterface const &portFactory, QList<PortInterface *> &ports
 			, LabelFactoryInterface &labelFactory, QList<LabelInterface *> &labels) override;
 	void init(LabelFactoryInterface &labelFactory, QList<LabelInterface *> &labels) override;
 
-	QUrl qmlUrl() const override;
+	QString qmlString() const override;
 
 	void updateData(ElementRepoInterface *repo) const override;
 	bool isNode() const override;
@@ -103,6 +107,8 @@ class InterpreterElementImpl : public ElementImpl
 
 	qrRepo::RepoApi *mEditorRepoApi;  // Doesn't have ownership.
 	Id mId;
+	QDeclarativeEngine *mQmlEngine;
+	QDeclarativeItem *mQmlItem;
 	QDomDocument mGraphics;
 	QList<NodeLabel> mNodeLabels;
 	QList<EdgeLabel> mEdgeLabels;
diff --git a/qrgui/pluginManager/editorManager.cpp b/qrgui/pluginManager/editorManager.cpp
index 505c0f3102..2df7c7940f 100644
--- a/qrgui/pluginManager/editorManager.cpp
+++ b/qrgui/pluginManager/editorManager.cpp
@@ -7,6 +7,7 @@
 #include <qrkernel/ids.h>
 #include <qrkernel/exception/exception.h>
 #include <qrrepo/repoApi.h>
+#include <qrutils/inFile.h>
 
 #include "umllib/nodeElement.h"
 #include "umllib/edgeElement.h"
@@ -252,14 +253,27 @@ QString EditorManager::mouseGesture(const Id &id) const
 
 QIcon EditorManager::icon(Id const &id) const
 {
-	Q_ASSERT(mPluginsLoaded.contains(id.editor()));
-	return QmlIconLoader::iconOf("qrc:/generated/shapes/" + id.element() + "Class.qml");
+	if (QFile(":/generated/shapes/" + id.element() + "Class.qml").exists()) {
+		Q_ASSERT(mPluginsLoaded.contains(id.editor()));
+		return	!utils::InFile::readAll(":/generated/shapes/" + id.element() + "Class.qml").isEmpty()
+				? QmlIconLoader::iconOf(utils::InFile::readAll(":/generated/shapes/" + id.element() + "Class.qml"))
+				: QIcon(":/icons/default.svg");
+	} else {
+		return QIcon(":/icons/default.svg");
+	}
+
 }
 
 QSize EditorManager::iconSize(Id const &id) const
 {
-	Q_ASSERT(mPluginsLoaded.contains(id.editor()));
-	return QmlIconLoader::preferedSizeOf("qrc:/generated/shapes/" + id.element() + "Class.qml");
+	if (QFile(":/generated/shapes/" + id.element() + "Class.qml").exists()) {
+		Q_ASSERT(mPluginsLoaded.contains(id.editor()));
+		return !utils::InFile::readAll(":/generated/shapes/" + id.element() + "Class.qml").isEmpty()
+				? QmlIconLoader::preferedSizeOf(utils::InFile::readAll(":/generated/shapes/" + id.element() + "Class.qml"))
+				: QSize(50, 50);
+	} else {
+		return QSize(50, 50);
+	}
 }
 
 ElementImpl *EditorManager::elementImpl(const Id &id) const
diff --git a/qrgui/pluginManager/interpreterEditorManager.cpp b/qrgui/pluginManager/interpreterEditorManager.cpp
index 7739fda65b..752844d69d 100644
--- a/qrgui/pluginManager/interpreterEditorManager.cpp
+++ b/qrgui/pluginManager/interpreterEditorManager.cpp
@@ -12,15 +12,17 @@
 #include "pluginManager/interpreterEditorManager.h"
 #include "umllib/nodeElement.h"
 #include "umllib/edgeElement.h"
+#include "umllib/qmlIconLoader.h"
 #include "pluginManager/details/interpreterElementImpl.h"
 #include "mainwindow/mainWindow.h"
 
 using namespace qReal;
 using namespace utils;
 
-InterpreterEditorManager::InterpreterEditorManager(QString const &fileName, QObject *parent)
+InterpreterEditorManager::InterpreterEditorManager(QString const &fileName, QDeclarativeEngine * const qmlEngine, QObject *parent)
 		: QObject(parent)
 		, mMetamodelFile(fileName)
+		, mQmlEngine(qmlEngine)
 {
 	qrRepo::RepoApi * const repo = new qrRepo::RepoApi(fileName);
 	mEditorRepoApi.insert("test", repo);
@@ -417,44 +419,35 @@ QIcon InterpreterEditorManager::icon(Id const &id) const
 	QPair<qrRepo::RepoApi*, Id> const repoAndMetaIdPair = repoAndMetaId(id);
 	qrRepo::RepoApi const * const repo = repoAndMetaIdPair.first;
 	Id const metaId = repoAndMetaIdPair.second;
-	QDomDocument classDoc;
-	QDomElement sdfElement;
+	QString source = "";
+
 	if (metaId.element() == "MetaEntityEdge") {
-		sdfElement = classDoc.createElement("picture");
-		sdfElement.setAttribute("sizex", 100);
-		sdfElement.setAttribute("sizey", 60);
-		QDomElement lineElement = classDoc.createElement("line");
-		lineElement.setAttribute("fill", "#000000");
-		QString const lineType = repo->stringProperty(metaId, "lineType").remove("Line");
-		lineElement.setAttribute("stroke-style", lineType);
-		lineElement.setAttribute("stroke", "#000000");
-		lineElement.setAttribute("y1", 0);
-		lineElement.setAttribute("x1", 0);
-		lineElement.setAttribute("y2", 60);
-		lineElement.setAttribute("stroke-width", 2);
-		lineElement.setAttribute("x2", 100);
-		lineElement.setAttribute("fill-style", "solid");
-		sdfElement.appendChild(lineElement);
+		source += QString("import QtQuick 1.1 \n")
+				+ QString("import CustomComponents 1.0 \n")
+				+ QString("Rectangle { \n")
+				+ QString("\t width : 100; height : 60 \n")
+				+ QString("\t Line{ \n")
+				+ QString("\t\t x1 : 0; y1 : 0 \n")
+				+ QString("\t\t x2 : 100; y2:60 \n")
+				+ QString("\t\t width : 2 \n")
+				+ QString("\t\t style:\"solid""\"\n")
+				+ QString("\t} \n")
+				+ QString("}\n");
 	} else {
-		QDomDocument graphics;
-		graphics.setContent(repo->stringProperty(metaId, "shape"));
-		sdfElement = graphics.firstChildElement("graphics").firstChildElement("picture");
+		source = (repo->stringProperty(metaId, "shape"));
 	}
 
-	if (sdfElement.isNull()) {
+	if (source.isEmpty()) {
 		return QIcon();
 	}
 
-	classDoc.appendChild(classDoc.importNode(sdfElement, true));
-//	SdfIconEngineV2 * const engine = new SdfIconEngineV2(classDoc);
-//	return QIcon(engine);
-	return QIcon();
+	return QmlIconLoader::iconOf(source);
 }
 
 ElementImpl *InterpreterEditorManager::elementImpl(Id const &id) const
 {
 	QPair<qrRepo::RepoApi*, Id> const repoAndMetaIdPair = repoAndMetaId(id);
-	InterpreterElementImpl * const impl = new InterpreterElementImpl(repoAndMetaIdPair.first, repoAndMetaIdPair.second);
+	InterpreterElementImpl * const impl = new InterpreterElementImpl(repoAndMetaIdPair.first, repoAndMetaIdPair.second, mQmlEngine);
 	if (!impl) {
 		return 0;
 	}
diff --git a/qrgui/pluginManager/interpreterEditorManager.h b/qrgui/pluginManager/interpreterEditorManager.h
index 10ecf70451..4dbc8e8205 100644
--- a/qrgui/pluginManager/interpreterEditorManager.h
+++ b/qrgui/pluginManager/interpreterEditorManager.h
@@ -18,6 +18,9 @@
 #include "editorPluginInterface/editorInterface.h"
 #include "pluginManager/editorManagerInterface.h"
 
+class QDeclarativeEngine;
+class QDeclarativeItem;
+
 namespace qReal {
 
 class Element;
@@ -27,7 +30,7 @@ class InterpreterEditorManager : public QObject, public EditorManagerInterface
 	Q_OBJECT
 
 public:
-	explicit InterpreterEditorManager(QString const &fileName, QObject *parent = NULL);
+	explicit InterpreterEditorManager(QString const &fileName, QDeclarativeEngine * const qmlEngine,  QObject *parent = NULL);
 	~InterpreterEditorManager();
 
 	IdList editors() const override;
@@ -160,6 +163,8 @@ class InterpreterEditorManager : public QObject, public EditorManagerInterface
 			, CheckPropertyForParent const &checker) const;
 	QString valueOfProperty(Id const &id, QString const &propertyName, QString const &value) const;
 	void deletePropertyInElement(qrRepo::RepoApi *repo, Id const &diagram, QString const &propDisplayedName) const;
+
+	QDeclarativeEngine *mQmlEngine;
 };
 
 }
diff --git a/qrgui/qmlType/declarativeArc.cpp b/qrgui/qmlType/declarativeArc.cpp
new file mode 100644
index 0000000000..551a37bf3f
--- /dev/null
+++ b/qrgui/qmlType/declarativeArc.cpp
@@ -0,0 +1,145 @@
+#include "declarativeArc.h"
+
+#include <QtGui/QPainter>
+
+using namespace qmlTypes;
+
+DeclarativeArc::DeclarativeArc(QDeclarativeItem *parent)
+	: DeclarativePen(parent)
+	, mX1(0)
+	, mY1(0)
+	, mX2(0)
+	, mY2(0)
+	, mStartAngle(0)
+	, mSpanAngle(0)
+{
+	// Important, otherwise the paint method is never called
+	setFlag(QGraphicsItem::ItemHasNoContents, false);
+}
+
+void DeclarativeArc::paint(QPainter *painter, QStyleOptionGraphicsItem const *option, QWidget *widget)
+{
+	int width, height;
+	QPen pen(mColor, mWidth);
+	if (mStyle == "solid") {
+		pen.setStyle(Qt::SolidLine);
+	} else if (mStyle == "dot") {
+		pen.setStyle(Qt::DotLine);
+	} else if (mStyle == "dash") {
+		pen.setStyle(Qt::DashLine);
+	} else if (mStyle == "dashdot") {
+		pen.setStyle(Qt::DashDotLine);
+	} else if (mStyle == "dashdotdot") {
+		pen.setStyle(Qt::DashDotDotLine);
+	} else if (mStyle == "none") {
+		pen.setStyle(Qt::NoPen);
+	}
+
+	painter->setPen(pen);
+	if (smooth()) {
+		painter->setRenderHint(QPainter::Antialiasing, true);
+	}
+	width = abs(mX2 - mX1);
+	height = abs(mY2 - mY1);
+
+	painter->drawArc(mX1, mY1, width, height, mStartAngle, mSpanAngle);
+}
+
+int DeclarativeArc::x1() const
+{
+	return mX1;
+}
+
+int DeclarativeArc::y1() const
+{
+	return mY1;
+}
+
+int DeclarativeArc::x2() const
+{
+	return mX2;
+}
+
+int DeclarativeArc::y2() const
+{
+	return mY2;
+}
+
+int DeclarativeArc::startAngle() const
+{
+	return mStartAngle;
+}
+
+int DeclarativeArc::spanAngle() const
+{
+	return mSpanAngle;
+}
+
+void DeclarativeArc::setX1(int x1)
+{
+	if (mX1 != x1) {
+		mX1 = x1;
+		updateSize();
+		emit x1Changed();
+		update();
+	}
+}
+
+void DeclarativeArc::setY1(int y1)
+{
+	if (mY1 != y1) {
+		mY1 = y1;
+		updateSize();
+		emit y1Changed();
+		update();
+	}
+}
+
+void DeclarativeArc::setX2(int X2)
+{
+	if (mX2 != X2) {
+		mX2 = X2;
+		updateSize();
+		emit x2Changed();
+		update();
+	}
+}
+
+void DeclarativeArc::setY2(int Y2)
+{
+	if (mY2 != Y2) {
+		mY2 = Y2;
+		updateSize();
+		emit y2Changed();
+		update();
+	}
+}
+
+void DeclarativeArc::setStartAngle(int startAngle)
+{
+	if (mStartAngle != startAngle) {
+		mStartAngle = startAngle;
+		updateSize();
+		emit startAngleChanged();
+		update();
+	}
+}
+
+void DeclarativeArc::setSpanAngle(int spanAngle)
+{
+	if (mSpanAngle != spanAngle) {
+		mSpanAngle = spanAngle;
+		updateSize();
+		emit spanAngleChanged();
+		update();
+	}
+}
+
+void DeclarativeArc::updateSize() {
+	setX1(mX1);
+	setY1(mY1);
+	setX2(mX2);
+	setY2(mY2);
+	setStartAngle(mStartAngle);
+	setSpanAngle(mSpanAngle);
+}
diff --git a/qrgui/qmlType/declarativeArc.h b/qrgui/qmlType/declarativeArc.h
new file mode 100644
index 0000000000..11217e93f1
--- /dev/null
+++ b/qrgui/qmlType/declarativeArc.h
@@ -0,0 +1,81 @@
+#pragma once
+
+#include "declarativePen.h"
+
+#include <QtDeclarative/QDeclarativeItem>
+
+namespace qmlTypes {
+
+/// DeclarativeLineclass is a class that provide qml arc
+class DeclarativeArc : public DeclarativePen
+{
+	Q_OBJECT
+
+	Q_PROPERTY(int x1 READ x1 WRITE setX1 NOTIFY x1Changed)
+	Q_PROPERTY(int y1 READ y1 WRITE setY1 NOTIFY y1Changed)
+	Q_PROPERTY(int x2 READ x2 WRITE setX2 NOTIFY x2Changed)
+	Q_PROPERTY(int y2 READ y2 WRITE setY2 NOTIFY y2Changed)
+	Q_PROPERTY(int startAngle READ startAngle WRITE setStartAngle NOTIFY startAngleChanged)
+	Q_PROPERTY(int spanAngle READ spanAngle WRITE setSpanAngle NOTIFY spanAngleChanged)
+
+public:
+	explicit DeclarativeArc(QDeclarativeItem *parent = 0);
+
+	/// Returns the x1 coordinate of the arc
+	int x1() const;
+	/// Returns the y1 coordinate of the arc
+	int y1() const;
+	/// Returns the x2 coordinate of the arc
+	int x2() const;
+	/// Returns the y2 coordinate of the arc
+	int y2() const;
+	/// Returns the startAngle of the arc
+	int startAngle() const;
+	/// Return the spanAngle of the arc
+	int spanAngle() const;
+
+signals:
+	/// Signal change of x1 coordinate
+	void x1Changed();
+	/// Signal change of y1 coordinate
+	void y1Changed();
+	/// Signal change of x2 coordinate
+	void x2Changed();
+	/// Signal change of y2 coordinate
+	void y2Changed();
+	/// Signal change of startAngle value
+	void startAngleChanged();
+	/// Signal change of spanAngle value
+	void spanAngleChanged();
+
+protected:
+	/// Sets the x1 coordinate of the arc
+	void setX1(int x1);
+	/// Sets the y1 coordinate of the arc
+	void setY1(int y1);
+	/// Sets the x2 coordinate of the arc
+	void setX2(int x2);
+	/// Sets the y2 coordinate of the arc
+	void setY2(int y2);
+	/// Sets the startAngle value
+	void setStartAngle(int startAngle);
+	/// Sets the spanAngle value
+	void setSpanAngle(int spanAngle);
+	void updateSize();
+
+private:
+	void paint(QPainter *painter, QStyleOptionGraphicsItem const *option, QWidget *widget);
+
+protected:
+	int mX1;
+	int mY1;
+	int mX2;
+	int mY2;
+	int mStartAngle;
+	int mSpanAngle;
+};
+
+}
+
+QML_DECLARE_TYPE(qmlTypes::DeclarativeArc)
+
diff --git a/qrgui/qmlType/declarativeCurve.cpp b/qrgui/qmlType/declarativeCurve.cpp
new file mode 100644
index 0000000000..ae77715e8b
--- /dev/null
+++ b/qrgui/qmlType/declarativeCurve.cpp
@@ -0,0 +1,191 @@
+#include <QPoint>
+
+#include "declarativeCurve.h"
+
+using namespace qmlTypes;
+
+DeclarativeCurve::DeclarativeCurve(QDeclarativeItem *parent)
+	:DeclarativePen(parent)
+	, mStartx(0)
+	, mStarty(0)
+	, mEndx(0)
+	, mEndy(0)
+	, mX(0)
+	, mY(0)
+	, mSizex(0)
+	, mSizey(0)
+	, mFill(Qt::white)
+{
+	// Important, otherwise the paint method is never called
+	setFlag(QGraphicsItem::ItemHasNoContents, false);
+}
+
+void DeclarativeCurve::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+	if (mFirstSizex == 0) {
+		mFirstSizex = mSizex;
+	}
+	if (mFirstSizey == 0) {
+		mFirstSizey = mSizey;
+	}
+	QPoint start;
+	start.setX(mStartx);
+	start.setY(mStarty);
+	QPoint end;
+	end.setX(mEndx);
+	end.setY(mEndy);
+	QPoint c1;
+	c1.setX(mX);
+	c1.setY(mY);
+	QPainterPath path(start);
+	path.quadTo(c1, end);
+	painter->drawPath(path);
+}
+
+int DeclarativeCurve::startx() const
+{
+	return mStartx;
+}
+
+int DeclarativeCurve::starty() const
+{
+	return mStarty;
+}
+
+int DeclarativeCurve::endx() const
+{
+	return mEndx;
+}
+
+int DeclarativeCurve::endy() const
+{
+	return mEndy;
+}
+
+int DeclarativeCurve::x() const
+{
+	return mX;
+}
+
+int DeclarativeCurve::y() const
+{
+	return mY;
+}
+
+int DeclarativeCurve::sizex() const
+{
+	return mSizex;
+}
+
+int DeclarativeCurve::sizey() const
+{
+	return mSizey;
+}
+
+QColor DeclarativeCurve::fill() const
+{
+	return mFill;
+}
+
+void DeclarativeCurve::setStartx(int startx)
+{
+	if (mStartx != startx) {
+		mStartx = startx;
+		updateSize();
+		emit startxChanged();
+		update();
+	}
+}
+
+void DeclarativeCurve::setStarty(int starty)
+{
+	if (mStarty != starty) {
+		mStarty = starty;
+		updateSize();
+		emit startyChanged();
+		update();
+	}
+}
+
+void DeclarativeCurve::setEndx(int endx)
+{
+	if (mEndx != endx) {
+		mEndx = endx;
+		updateSize();
+		emit endxChanged();
+		update();
+	}
+}
+
+void DeclarativeCurve::setEndy(int endy)
+{
+	if (mEndy != endy) {
+		mEndy = endy;
+		updateSize();
+		emit endyChanged();
+		update();
+	}
+}
+
+void DeclarativeCurve::setX(int x)
+{
+	if (mX != x) {
+		mX = x;
+		updateSize();
+		emit xChanged();
+		update();
+	}
+}
+
+void DeclarativeCurve::setY(int y)
+{
+	if (mY != y) {
+		mY = y;
+		updateSize();
+		emit yChanged();
+		update();
+	}
+}
+
+void DeclarativeCurve::setSizex(int sizex)
+{
+	if (mSizex != sizex) {
+		mSizex = sizex;
+		updateSize();
+		emit sizexChanged();
+		update();
+	}
+}
+
+void DeclarativeCurve::setSizey(int sizey)
+{
+	if (mSizey != sizey) {
+		mSizey = sizey;
+		updateSize();
+		emit sizeyChanged();
+		update();
+	}
+}
+
+void DeclarativeCurve::setFill(QColor color)
+{
+	if (mFill != color) {
+		mFill = color;
+		updateSize();
+		emit fillChanged();
+		update();
+	}
+}
+
+void DeclarativeCurve::updateSize()
+{
+	setStartx(mStartx);
+	setStarty(mStarty);
+	setEndx(mEndx);
+	setEndy(mEndy);
+	setX(mX);
+	setY(mY);
+	setSizex(mSizex);
+	setSizey(mSizey);
+	setFill(mFill);
+}
diff --git a/qrgui/qmlType/declarativeCurve.h b/qrgui/qmlType/declarativeCurve.h
new file mode 100644
index 0000000000..256b5857b1
--- /dev/null
+++ b/qrgui/qmlType/declarativeCurve.h
@@ -0,0 +1,103 @@
+#pragma once
+
+#include <QtDeclarative/QDeclarativeItem>
+
+#include "declarativePen.h"
+
+namespace qmlTypes {
+
+class DeclarativeCurve : public DeclarativePen
+{
+	Q_OBJECT
+
+	Q_PROPERTY(int startx READ startx WRITE setStartx NOTIFY startxChanged)
+	Q_PROPERTY(int starty READ starty WRITE setStarty NOTIFY startyChanged)
+	Q_PROPERTY(int endx READ endx WRITE setEndx NOTIFY endxChanged)
+	Q_PROPERTY(int endy READ endy WRITE setEndy NOTIFY endyChanged)
+	Q_PROPERTY(int x READ x WRITE setX NOTIFY xChanged)
+	Q_PROPERTY(int y READ y WRITE setY NOTIFY yChanged)
+	Q_PROPERTY(int sizex READ sizex WRITE setSizex NOTIFY sizexChanged)
+	Q_PROPERTY(int sizey READ sizey WRITE setSizey NOTIFY sizeyChanged)
+	Q_PROPERTY(QColor fill READ fill WRITE setFill NOTIFY fillChanged)
+
+public:
+	DeclarativeCurve(QDeclarativeItem *parent = 0);
+	/// Returns x coordinate of the starting point
+	int startx() const;
+	/// Returns y coordinate of the starting point
+	int starty() const;
+	/// Returns x coordinate of the ending point
+	int endx() const;
+	/// Returns y coordinate of the ending point
+	int endy() const;
+	/// Returns x coordinate of the middle point
+	int x() const;
+	/// Returns y coordinate of the middle point
+	int y() const;
+	/// Returns width of background
+	int sizex() const;
+	/// Returns height of background
+	int sizey() const;
+	/// Returns color
+	QColor fill() const;
+
+signals:
+	/// Signal change of x coordinate of the starting point
+	void startxChanged();
+	/// Signal change of y coordinate of the starting point
+	void startyChanged();
+	/// Signal change of x coordinate of the ending point
+	void endxChanged();
+	/// Signal change of y coordinate of the ending point
+	void endyChanged();
+	/// Signal change of x coordinate of the middle point
+	void xChanged();
+	/// Signal change of y coordinate of the middle point
+	void yChanged();
+	/// Signal change width of background
+	void sizexChanged();
+	/// Signal change height of background
+	void sizeyChanged();
+	/// Signal change color
+	void fillChanged();
+
+protected:
+	void updateSize();
+	/// Set x coordinate of the starting point
+	void setStartx(int startx);
+	/// Set y coordinate of the starting point
+	void setStarty(int starty);
+	/// Set x coordinate of the ending point
+	void setEndx(int endx);
+	/// Set y coordinate of the ending point
+	void setEndy(int endy);
+	/// Set x coordinate of the middle point
+	void setX(int x);
+	/// Set y coordinate of the middle point
+	void setY(int y);
+	/// Set width of background
+	void setSizex(int sizex);
+	/// Set height of background
+	void setSizey(int sizey);
+	/// Set color
+	void setFill(QColor color);
+
+private:
+	void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+
+protected:
+	int mStartx;
+	int mStarty;
+	int mEndx;
+	int mEndy;
+	int mX;
+	int mY;
+	int mSizex;
+	int mSizey;
+	int mFirstSizex;
+	int mFirstSizey;
+	QColor mFill;
+};
+
+}
+QML_DECLARE_TYPE(qmlTypes::DeclarativeCurve)
diff --git a/qrgui/qmlType/declarativeImage.cpp b/qrgui/qmlType/declarativeImage.cpp
new file mode 100644
index 0000000000..08e200a0bc
--- /dev/null
+++ b/qrgui/qmlType/declarativeImage.cpp
@@ -0,0 +1,199 @@
+#include "declarativeImage.h"
+
+#include <QtCore/QFileInfo>
+#include <QtGui/QPainter>
+#include <QtWidgets/QApplication>
+#include <QtCore/QDir>
+
+using namespace qmlTypes;
+using namespace qReal;
+
+DeclarativeImage::DeclarativeImage(QDeclarativeItem *parent)
+	: QDeclarativeItem(parent)
+	, mX1(0)
+	, mY1(0)
+	, mX2(0)
+	, mY2(0)
+	, mSource("default.svg")
+{
+	// Important, otherwise the paint method is never called
+	setFlag(QGraphicsItem::ItemHasNoContents, false);
+}
+
+void DeclarativeImage::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+	QString const fileName = SettingsManager::value("pathToImages").toString() + "/"
+			+ mSource;
+	QRect rect(mX1, mY1, mX2 - mX1, mY2 - mY1);
+	qDebug() << rect;
+	mImagesCache.drawImage(fileName, *painter, rect);
+}
+
+void DeclarativeImage::ImagesCache::drawImage(
+		QString const &fileName
+		, QPainter &painter
+		, QRect const &rect)
+{
+	auto savePrerenderedSvg = [this, &rect, &fileName] (QSvgRenderer &renderer) {
+		QTransform scale;
+		scale.scale(mCurrentZoomFactor, mCurrentZoomFactor);
+		auto scaledRect = scale.mapRect(rect);
+		QPixmap pixmap(scaledRect.size());
+		pixmap.fill(Qt::transparent);
+		QPainter pixmapPainter(&pixmap);
+		renderer.render(&pixmapPainter, scaledRect);
+		mPrerenderedSvgs.insert(fileName, pixmap);
+	};
+
+	if (mFileNamePixmapMap.contains(fileName)) {
+		painter.drawPixmap(rect, mFileNamePixmapMap.value(fileName));
+	} else if (mFileNameSvgRendererMap.contains(fileName)) {
+		if (!mPrerenderedSvgs.contains(fileName)) {
+			savePrerenderedSvg(*mFileNameSvgRendererMap.value(fileName));
+		}
+
+		painter.drawPixmap(rect, mPrerenderedSvgs.value(fileName));
+	} else {
+		// Cache miss - finding best file to load and loading it.
+		QString const actualFileName = fileName.startsWith("./")
+				? QApplication::applicationDirPath() + "/" + fileName
+				: fileName;
+
+		QFileInfo const actualFile = selectBestImageFile(actualFileName);
+
+		QByteArray const rawImage = loadPixmap(actualFile);
+		if (actualFile.suffix() == "svg") {
+			QSharedPointer<QSvgRenderer> renderer(new QSvgRenderer(rawImage));
+			mFileNameSvgRendererMap.insert(fileName, renderer);
+			renderer->render(&painter, rect);
+			savePrerenderedSvg(*renderer);
+		} else {
+			QPixmap pixmap;
+			pixmap.loadFromData(rawImage);
+			mFileNamePixmapMap.insert(fileName, pixmap);
+			painter.drawPixmap(rect, pixmap);
+		}
+	}
+}
+
+QFileInfo DeclarativeImage::ImagesCache::selectBestImageFile(QString const &filePath)
+{
+	QFileInfo const originalFileInfo(filePath);
+	QFileInfo const svgVersion(originalFileInfo.path() + originalFileInfo.completeBaseName() + "svg");
+
+	if (svgVersion.exists()) {
+		return svgVersion;
+	}
+
+	QFileInfo const fileInfo(filePath);
+	if (fileInfo.exists() && fileInfo.isFile()) {
+		return fileInfo;
+	}
+
+	QDir dir(fileInfo.absolutePath());
+	auto candidates = dir.entryInfoList({fileInfo.completeBaseName() + ".*"}, QDir::Files);
+	if (!candidates.empty()) {
+		return candidates.at(0);
+	}
+
+	if (fileInfo.completeBaseName() != "default") {
+		return selectBestImageFile(fileInfo.absolutePath() + "/default.svg");
+	}
+
+	return QFileInfo(":/icons/default.svg");
+}
+
+QByteArray DeclarativeImage::ImagesCache::loadPixmap(QFileInfo const &fileInfo)
+{
+	QFile file(fileInfo.absoluteFilePath());
+	if (!file.open(QIODevice::ReadOnly)) {
+		return QByteArray();
+	}
+
+	return file.readAll();
+}
+
+int DeclarativeImage::x1() const
+{
+	return mX1;
+}
+
+int DeclarativeImage::y1() const
+{
+	return mY1;
+}
+
+int DeclarativeImage::x2() const
+{
+	return mX2;
+}
+
+int DeclarativeImage::y2() const
+{
+	return mY2;
+}
+
+QString DeclarativeImage::source() const
+{
+	return mSource;
+}
+
+void DeclarativeImage::setX1(int x1)
+{
+	if (mX1 != x1) {
+		mX1 = x1;
+		updateSize();
+		emit x1Changed();
+		update();
+	}
+}
+
+void DeclarativeImage::setY1(int y1)
+{
+	if (mY1 != y1) {
+		mY1 = y1;
+		updateSize();
+		emit y1Changed();
+		update();
+	}
+}
+
+void DeclarativeImage::setX2(int x2)
+{
+	if (mX2 != x2) {
+		qDebug() << "changed";
+		mX2 = x2;
+		updateSize();
+		emit x2Changed();
+		update();
+	}
+}
+
+void DeclarativeImage::setY2(int y2)
+{
+	if (mY2 != y2) {
+		mY2 = y2;
+		updateSize();
+		emit y2Changed();
+		update();
+	}
+}
+
+void DeclarativeImage::setSource(QString source)
+{
+	if (mSource != source) {
+		mSource = source;
+		updateSize();
+		emit sourceChanged();
+		update();
+	}
+}
+
+void DeclarativeImage::updateSize()
+{
+	setX1(mX1);
+	setY1(mY1);
+	setX2(mX2);
+	setY2(mY2);
+	setSource(mSource);
+}
diff --git a/qrgui/qmlType/declarativeImage.h b/qrgui/qmlType/declarativeImage.h
new file mode 100644
index 0000000000..2e9ae6049c
--- /dev/null
+++ b/qrgui/qmlType/declarativeImage.h
@@ -0,0 +1,117 @@
+#pragma once
+
+#include <QtCore/QFileInfo>
+#include <QtDeclarative/QDeclarativeItem>
+#include <QtSvg/QSvgRenderer>
+#include <qrkernel/settingsManager.h>
+
+#include <qrkernel/settingsManager.h>
+
+namespace qmlTypes {
+
+class DeclarativeImage : public QDeclarativeItem
+{
+	Q_OBJECT
+
+	Q_PROPERTY(int x1 READ x1 WRITE setX1 NOTIFY x1Changed)
+	Q_PROPERTY(int y1 READ y1 WRITE setY1 NOTIFY y1Changed)
+	Q_PROPERTY(int x2 READ x2 WRITE setX2 NOTIFY x2Changed)
+	Q_PROPERTY(int y2 READ y2 WRITE setY2 NOTIFY y2Changed)
+	Q_PROPERTY(QString source READ source WRITE setSource NOTIFY sourceChanged)
+
+public:
+	explicit DeclarativeImage(QDeclarativeItem *parent = 0);
+	~DeclarativeImage() {qDebug() << "in descturctor" << mSource; }
+	/// Returns x1 coordinate of image
+	int x1() const;
+	/// Returns y1 coordinate of image
+	int y1() const;
+	/// Returns x2 coordinate of image
+	int x2() const;
+	/// Returns y2 coordinate of image
+	int y2() const;
+	/// Returns source of image
+	QString source() const;
+
+signals:
+	/// Signal change of x1 coordinate
+	void x1Changed();
+	/// Signal change of y1 coordinate
+	void y1Changed();
+	/// Signal change of x2 coordinate
+	void x2Changed();
+	/// Signal change of y2 coordinate
+	void y2Changed();
+	/// Signal change source of image
+	void sourceChanged();
+
+protected:
+	void updateSize();
+	/// Set x1 coordinate of image
+	void setX1(int x1);
+	/// Set y1 coordinate of image
+	void setY1(int y1);
+	/// Set x2 coordinate of image
+	void setX2(int x2);
+	/// Set y2 coordinate of image
+	void setY2(int y2);
+	/// Set source of image
+	void setSource(QString source);
+
+private:
+	/// Cache for images that contains them pre-loaded and parsed and is able to quickly draw it on a painter.
+	/// Pixmaps and svg images are contained separately as they are rendered differently.
+	class ImagesCache {
+	public:
+		/// Draws image with given file name on given painter in given rectangle. Note that actual file, from which
+		/// an image will be loaded may be different from fileName, as described in selectBestImageFile.
+		/// @see selectBestImageFile
+		void drawImage(QString const &fileName, QPainter &painter, QRect const &rect);
+
+		/// Clears prerendered svg cache.
+		void invalidateSvgCache(double zoomFactor);
+
+	private:
+		/// Selects "best available" image file, using following rules:
+		/// - if there is .svg file with given name in a directory from filePath, it is used as actual image file.
+		/// - else if there is a file with other extension but with correct name, it is used.
+		/// - else, if there is no such file, it tries to select a file with name "default" in given directory, using the
+		///   rules above.
+		/// - if everything above fails, system default image file, from qrgui/icons (or, when compiled,
+		///   from ":/icons/default.svg"), is used.
+		static QFileInfo selectBestImageFile(QString const &filePath);
+
+		/// Loads pixmap from given file, returns empty QByteArray if file does not exist.
+		static QByteArray loadPixmap(QFileInfo const &fileInfo);
+
+		/// Maps file name to pre-loaded pixmap with image.
+		QHash<QString, QPixmap> mFileNamePixmapMap;
+
+		/// Maps file name to a svg renderer object.
+		QHash<QString, QSharedPointer<QSvgRenderer>> mFileNameSvgRendererMap;
+
+		/// Maps file name to pixmaps with pre-rendered svg images.
+		QHash<QString, QPixmap> mPrerenderedSvgs;
+
+		/// Current scene zoom factor for rendering svg files.
+		double mCurrentZoomFactor = 1;
+	};
+
+	/// Loads pixmap from given file, returns empty QByteArray if file does not exist.
+	static QByteArray loadPixmap(QFileInfo const &fileInfo);
+
+	/// Smart cache for images, to avoid loading image from disc on every paint() call.
+	ImagesCache mImagesCache;
+
+	void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+	void drawImage(QString const &fileName, QPainter &painter, QRect const &rect);
+protected:
+	int mX1;
+	int mY1;
+	int mX2;
+	int mY2;
+	QString mSource;
+};
+
+}
+QML_DECLARE_TYPE(qmlTypes::DeclarativeImage)
diff --git a/qrgui/qmlType/declarativeLine.cpp b/qrgui/qmlType/declarativeLine.cpp
index 015f956b3c..d8fe43f87b 100644
--- a/qrgui/qmlType/declarativeLine.cpp
+++ b/qrgui/qmlType/declarativeLine.cpp
@@ -39,7 +39,7 @@ void DeclarativeLine::paint(QPainter *painter, QStyleOptionGraphicsItem const *o
 
 	int x = qMin(mX1, mX2) - mWidth / 2;
 	int y = qMin(mY1, mY2) - mWidth / 2;
-	painter->drawLine(mX1 - x, mY1 - y, mX2 - x, mY2 - y);
+	painter->drawLine(mX1, mY1, mX2, mY2);
 }
 
 int DeclarativeLine::x1() const
diff --git a/qrgui/qmlType/declarativePath.cpp b/qrgui/qmlType/declarativePath.cpp
new file mode 100644
index 0000000000..4a6b37abaf
--- /dev/null
+++ b/qrgui/qmlType/declarativePath.cpp
@@ -0,0 +1,265 @@
+#include "declarativePath.h"
+
+using namespace qmlTypes;
+
+DeclarativePath::DeclarativePath(QDeclarativeItem *parent)
+	: DeclarativePen(parent)
+	, mStr("")
+	, mSizex(0)
+	, mSizey(0)
+	, mFirstSizex(0)
+	, mFirstSizey(0)
+	, mFill(Qt::transparent)
+{
+	// Important, otherwise the paint method is never called
+	setFlag(QGraphicsItem::ItemHasNoContents, false);
+}
+
+bool DeclarativePath::isNotLCMZ(QString const str, int i)
+{
+	return (i != str.length()) && (str[i] != 'L') && (str[i] != 'C') && (str[i] != 'M')
+		&& (str[i] != 'Z');
+}/*
+bool DeclarativePath::isNotLCMZ(char str)
+{
+	return (str != 'L') && (str != 'C') && (str != 'M') && (str != 'Z');
+}*/
+
+void DeclarativePath::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+
+	if (mFirstSizex == 0) {
+		mFirstSizex = mSizex;
+	}
+	if (mFirstSizey == 0) {
+		mFirstSizey = mSizey;
+	}
+	QString s1;
+	QPointF end_point;
+	QPointF c1;
+	QPointF c2;
+	QPainterPath path;
+	int mStartX = 0;
+	int mStartY = 0;
+	painter->fillRect(0, 0, mSizex, mSizey, mFill);
+	QPen pen(mColor, mWidth);
+	if (mStyle == "solid") {
+		pen.setStyle(Qt::SolidLine);
+	} else if (mStyle == "dot") {
+		pen.setStyle(Qt::DotLine);
+	} else if (mStyle == "dash") {
+		pen.setStyle(Qt::DashLine);
+	} else if (mStyle == "dashdot") {
+		pen.setStyle(Qt::DashDotLine);
+	} else if (mStyle == "dashdotdot") {
+		pen.setStyle(Qt::DashDotDotLine);
+	} else if (mStyle == "none") {
+		pen.setStyle(Qt::NoPen);
+	}
+	//painter->setPen(pen);
+
+	QString d_cont = mStr;
+	d_cont.append(" Z");
+	for (int i = 0; i < d_cont.length() - 1;)
+	{
+		int j = 0;
+		if (d_cont[i] == 'M')
+		{
+			j = i + 2;
+			while (isNotLCMZ(d_cont, j))
+			{
+				while (d_cont[j] != ' ')
+				{
+					s1.append(d_cont[j]);
+					++j;
+				}
+				end_point.setX(s1.toFloat() * mSizex / mFirstSizex + mStartX);
+				s1.clear();
+				++j;
+				while (d_cont[j] != ' ')
+				{
+					s1.append(d_cont[j]);
+					++j;
+				}
+				end_point.setY(s1.toFloat() * mSizey / mFirstSizey + mStartY);
+				++j;
+				s1.clear();
+			}
+
+			path.moveTo(end_point);
+			i = j;
+		}
+		else if (d_cont[i] == 'L')
+		{
+			j = i + 2;
+			while (isNotLCMZ(d_cont, j))
+			{
+				while (d_cont[j] != ' ')
+				{
+					s1.append(d_cont[j]);
+					++j;
+				}
+
+				end_point.setX(s1.toFloat() * mSizex / mFirstSizex + mStartX);
+				s1.clear();
+				++j;
+
+				while (d_cont[j] != ' ')
+				{
+					s1.append(d_cont[j]);
+					++j;
+				}
+				end_point.setY(s1.toFloat() * mSizey / mFirstSizey + mStartY);
+				++j;
+				s1.clear();
+			}
+
+			path.lineTo(end_point);
+			i = j;
+		}
+		else if (d_cont[i] == 'C')
+		{
+			j = i + 2;
+			while(isNotLCMZ(d_cont, j))
+			{
+				while (!(d_cont[j] == ' '))
+				{
+					s1.append(d_cont[j]);
+					++j;
+				}
+
+				c1.setX(s1.toFloat() * mSizex / mFirstSizex + mStartX);
+				s1.clear();
+				++j;
+
+				while (d_cont[j] != ' ')
+				{
+					s1.append(d_cont[j]);
+					++j;
+				}
+
+				c1.setY(s1.toFloat() * mSizey / mFirstSizey + mStartY);
+				s1.clear();
+				++j;
+
+				while (d_cont[j] != ' ')
+				{
+					s1.append(d_cont[j]);
+					++j;
+				}
+
+				c2.setX(s1.toFloat() * mSizex / mFirstSizex + mStartX);
+				s1.clear();
+				++j;
+
+				while (d_cont[j] != ' ')
+				{
+					s1.append(d_cont[j]);
+					++j;
+				}
+
+				c2.setY(s1.toFloat() * mSizey / mFirstSizey + mStartY);
+				s1.clear();
+				++j;
+
+				while (d_cont[j] != ' ')
+				{
+					s1.append(d_cont[j]);
+					++j;
+				}
+
+				end_point.setX(s1.toFloat() * mSizex / mFirstSizex + mStartX);
+				s1.clear();
+				++j;
+
+				while (d_cont[j] != ' ')
+				{
+					s1.append(d_cont[j]);
+					++j;
+				}
+
+				end_point.setY(s1.toFloat() * mSizey / mFirstSizey + mStartY);
+				s1.clear();
+				++j;
+			}
+
+			path.cubicTo(c1, c2, end_point);
+			i = j;
+
+		} else if (d_cont[i] == 'Z')
+		{
+			path.closeSubpath();
+		}
+	}
+	painter->drawPath(path);
+}
+
+QString DeclarativePath::str() const
+{
+	return mStr;
+}
+
+QColor DeclarativePath::fill() const
+{
+	return mFill;
+}
+
+int DeclarativePath::sizex() const
+{
+	return mSizex;
+}
+
+int DeclarativePath::sizey() const
+{
+	return mSizey;
+}
+
+void DeclarativePath::setStr(QString str)
+{
+	if (mStr != str)
+	{
+		mStr = str.remove(0, 1);
+		updateSize();
+		emit strChanged();
+		update();
+	}
+}
+
+void DeclarativePath::setFill(QColor color)
+{
+	if (mFill != color)
+	{
+		mFill = color;
+		updateSize();
+		emit fillChanged();
+		update();
+	}
+}
+
+void DeclarativePath::setSizex(int sizex)
+{
+	if (mSizex != sizex) {
+		mSizex = sizex;
+		updateSize();
+		emit sizexChanged();
+		update();
+	}
+}
+
+void DeclarativePath::setSizey(int sizey)
+{
+	if (mSizey != sizey) {
+		mSizey = sizey;
+		updateSize();
+		emit sizeyChanged();
+		update();
+	}
+}
+
+void DeclarativePath::updateSize()
+{
+	setStr(mStr);
+	setFill(mFill);
+	setSizex(mSizex);
+	setSizey(mSizey);
+}
diff --git a/qrgui/qmlType/declarativePath.h b/qrgui/qmlType/declarativePath.h
new file mode 100644
index 0000000000..d6264f430d
--- /dev/null
+++ b/qrgui/qmlType/declarativePath.h
@@ -0,0 +1,69 @@
+#pragma once
+
+#include "declarativePen.h"
+
+#include <QtDeclarative/QDeclarativeItem>
+
+namespace qmlTypes {
+
+class DeclarativePath : public DeclarativePen
+{
+	Q_OBJECT
+
+	Q_PROPERTY(QString str READ str WRITE setStr NOTIFY strChanged)
+	Q_PROPERTY(QColor fill READ fill WRITE setFill NOTIFY fillChanged)
+	Q_PROPERTY(int sizex READ sizex WRITE setSizex NOTIFY sizexChanged)
+	Q_PROPERTY(int sizey READ sizey WRITE setSizey NOTIFY sizeyChanged)
+
+public:
+	explicit DeclarativePath(QDeclarativeItem *parent = 0);
+
+	/// Returns path
+	QString str() const;
+	/// Returns color of path
+	QColor fill() const;
+	/// Returns width of background
+	int sizex() const;
+	/// Returns height of background
+	int sizey() const;
+	///
+	bool isNotLCMZ(QString const str, int i);
+
+signals:
+	/// Signal change of path
+	void strChanged();
+	/// Signal change path color
+	void fillChanged();
+	/// Signal change width of background
+	void sizexChanged();
+	/// Signal change height of background
+	void sizeyChanged();
+
+protected:
+	/// Set path
+	void setStr(QString str);
+	/// Set color of path
+	void setFill(QColor color);
+	/// Set width of background
+	void setSizex(int sizex);
+	/// Set height of background
+	void setSizey(int sizey);
+	void updateSize();
+
+private:
+	void paint(QPainter *painter, QStyleOptionGraphicsItem const *option, QWidget *widget);
+
+protected:
+	QString mStr;
+	QColor mFill;
+	int mSizex;
+	int mSizey;
+	int mFirstSizex;
+	int mFirstSizey;
+};
+
+}
+
+QML_DECLARE_TYPE(qmlTypes::DeclarativePath)
+
+
diff --git a/qrgui/qmlType/declarativePolygon.cpp b/qrgui/qmlType/declarativePolygon.cpp
new file mode 100644
index 0000000000..91234206ac
--- /dev/null
+++ b/qrgui/qmlType/declarativePolygon.cpp
@@ -0,0 +1,178 @@
+#include "declarativePolygon.h"
+using namespace qmlTypes;
+DeclarativePolygon::DeclarativePolygon(QDeclarativeItem *parent)
+	:DeclarativePen(parent)
+	, mFill(Qt::black)
+	, mX("")
+	, mY("")
+	, mN(0)
+	, mSizex(50)
+	, mSizey(50)
+{
+	// Important, otherwise the paint method is never called
+	setFlag(QGraphicsItem::ItemHasNoContents, false);
+}
+
+void DeclarativePolygon::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+	if (mFirstSizex == 0) {
+		mFirstSizex = mSizex;
+	}
+	if (mFirstSizey == 0) {
+		mFirstSizey = mSizey;
+	}
+    painter->fillRect(0, 0, mSizex, mSizey, Qt::transparent);
+	QPoint *points = NULL;
+    points = getpoints();
+	if (points != NULL)
+	{
+		painter->drawConvexPolygon(points, mN);
+		delete[] points;
+	}
+}
+QPoint *DeclarativePolygon::getpoints()
+{
+	bool mNeedScale = true;
+	QPoint *array = new QPoint[mN];
+	QStringList xStr = mX.split(",");
+	QStringList yStr = mY.split(",");
+	float x = 0;
+	float y = 0;
+	int mStartX = 0;
+	int mStartY = 0;
+	for (int i = 0; i < mN; i++)
+	{
+		QString xnum = xStr.at(i);
+		if (xnum.endsWith("%"))
+		{
+			xnum.chop(1);
+			x = mSizex * xnum.toFloat() / 100 + mStartX;
+		} else if (xnum.endsWith("a") && mNeedScale) {
+			xnum.chop(1);
+			x = xnum.toFloat() + mStartX;
+		} else if (xnum.endsWith("a") && !mNeedScale) {
+			xnum.chop(1);
+			x = xnum.toFloat() * mSizex / mFirstSizex + mStartX;
+		} else {
+			x = xnum.toFloat() * mSizex / mFirstSizex + mStartX;
+		}
+
+		QString ynum = yStr.at(i);
+		if (ynum.endsWith("%"))
+		{
+			ynum.chop(1);
+			y = mSizey * ynum.toFloat() / 100 + mStartY;
+		} else if (ynum.endsWith("a") && mNeedScale) {
+			ynum.chop(1);
+			y = ynum.toFloat() + mStartY;
+		} else if (ynum.endsWith("a") && !mNeedScale) {
+			ynum.chop(1);
+			y = ynum.toFloat() * mSizey / mFirstSizey + mStartY;
+		} else
+			y = ynum.toFloat() * mSizey / mFirstSizey + mStartY;
+
+		array[i].setX(static_cast<int>(x));
+		array[i].setY(static_cast<int>(y));
+	}
+	return array;
+}
+
+QColor DeclarativePolygon::fill() const
+{
+	return mFill;
+}
+
+QString DeclarativePolygon::x() const
+{
+	return mX;
+}
+
+QString DeclarativePolygon::y() const
+{
+	return mY;
+}
+
+int DeclarativePolygon::n() const
+{
+	return mN;
+}
+
+int DeclarativePolygon::sizex() const
+{
+	return mSizex;
+}
+
+int DeclarativePolygon::sizey() const
+{
+	return mSizey;
+}
+
+void DeclarativePolygon::setFill(QColor color)
+{
+	if (mFill != color) {
+		mFill = color;
+		updateSize();
+		emit fillChanged();
+		update();
+	}
+}
+
+void DeclarativePolygon::setN(int n)
+{
+	if (mN != n) {
+		mN = n;
+		updateSize();
+		emit nChanged();
+		update();
+	}
+}
+
+void DeclarativePolygon::setX(QString x)
+{
+	if (mX != x) {
+		mX = x;
+		updateSize();
+		emit xChanged();
+		update();
+	}
+}
+
+void DeclarativePolygon::setY(QString y)
+{
+	if (mY != y) {
+		mY = y;
+		updateSize();
+		emit yChanged();
+		update();
+	}
+}
+
+void DeclarativePolygon::setSizex(int sizex)
+{
+	if (mSizex != sizex) {
+		mSizex = sizex;
+		updateSize();
+		emit sizexChanged();
+		update();
+	}
+}
+
+void DeclarativePolygon::setSizey(int sizey)
+{
+	if (mSizey != sizey) {
+		mSizey = sizey;
+		updateSize();
+		emit sizeyChanged();
+		update();
+	}
+}
+
+void DeclarativePolygon::updateSize()
+{
+	setX(mX);
+	setY(mY);
+	setSizex(mSizex);
+	setSizey(mSizey);
+	setFill(mFill);
+	setN(mN);
+}
diff --git a/qrgui/qmlType/declarativePolygon.h b/qrgui/qmlType/declarativePolygon.h
new file mode 100644
index 0000000000..834f16a647
--- /dev/null
+++ b/qrgui/qmlType/declarativePolygon.h
@@ -0,0 +1,81 @@
+#pragma once
+
+#include "declarativePen.h"
+
+#include <QtDeclarative/QDeclarativeItem>
+
+namespace qmlTypes {
+
+class DeclarativePolygon : public DeclarativePen
+{
+	Q_OBJECT
+
+	Q_PROPERTY(int n READ n WRITE setN NOTIFY nChanged)
+	Q_PROPERTY(QString x READ x WRITE setX NOTIFY xChanged)
+	Q_PROPERTY(QString y READ y WRITE setY NOTIFY yChanged)
+	Q_PROPERTY(QColor fill READ fill WRITE setFill NOTIFY fillChanged)
+	Q_PROPERTY(int sizex READ sizex WRITE setSizex NOTIFY sizexChanged)
+	Q_PROPERTY(int sizey READ sizey WRITE setSizey NOTIFY sizeyChanged)
+
+public:
+	explicit DeclarativePolygon(QDeclarativeItem *parent = 0);
+
+	/// Returns size of the array of points
+	int n() const;
+	/// Returns width of background
+	int sizex() const;
+	/// Returns height of background
+	int sizey() const;
+	/// Returns the color of Polygon
+	QColor fill() const;
+	/// Returns array of x coordinates
+	QString x() const;
+	/// Returns array of y coordinates
+	QString y() const;
+
+signals:
+	/// Signal change color
+	void fillChanged();
+	/// Signal change array of x coordinates
+	void xChanged();
+	/// Signal change array of y coordinates
+	void yChanged();
+	/// Signal change width of background
+	void sizexChanged();
+	/// Signal change height of background
+	void sizeyChanged();
+	/// Signal change of the array of points
+	void nChanged();
+
+protected:
+	/// Set array of x coordinates
+	void setX(QString x);
+	/// Set array of y coordinates
+	void setY(QString y);
+	/// Set width of background
+	void setSizex(int sizex);
+	/// Set height of background
+	void setSizey(int sizey);
+	/// Set color
+	void setFill(QColor color);
+	/// Set size of the array of points
+	void setN(int n);
+	void updateSize();
+
+private:
+	void paint(QPainter *painter, QStyleOptionGraphicsItem const *option, QWidget *widget);
+	QPoint *getpoints();
+
+public:
+	QColor mFill;
+	QString mX;
+	QString mY;
+	int mN;
+	int mSizex;
+	int mSizey;
+	int mFirstSizex;
+	int mFirstSizey;
+};
+
+}
+QML_DECLARE_TYPE(qmlTypes::DeclarativePolygon)
diff --git a/qrgui/qmlType/qmlType.pri b/qrgui/qmlType/qmlType.pri
index 50a1aec359..ef1227c888 100644
--- a/qrgui/qmlType/qmlType.pri
+++ b/qrgui/qmlType/qmlType.pri
@@ -2,8 +2,18 @@ HEADERS += \
 	$$PWD/declarativeEllipse.h \
 	$$PWD/declarativeLine.h \
 	$$PWD/declarativePen.h \
+	$$PWD/declarativeArc.h \
+	$$PWD/declarativePath.h \
+	$$PWD/declarativeImage.h \
+	$$PWD/declarativePolygon.h \
+	$$PWD/declarativeCurve.h \
 
 SOURCES += \
 	$$PWD/declarativeLine.cpp \
 	$$PWD/declarativeEllipse.cpp \
 	$$PWD/declarativePen.cpp \
+	$$PWD/declarativeArc.cpp \
+	$$PWD/declarativePath.cpp \
+	$$PWD/declarativeImage.cpp \
+	$$PWD/declarativePolygon.cpp \
+	$$PWD/declarativeCurve.cpp \
diff --git a/qrgui/toolPluginInterface/usedInterfaces/graphicalModelAssistInterface.h b/qrgui/toolPluginInterface/usedInterfaces/graphicalModelAssistInterface.h
index ac50b29eeb..9148a88fe8 100644
--- a/qrgui/toolPluginInterface/usedInterfaces/graphicalModelAssistInterface.h
+++ b/qrgui/toolPluginInterface/usedInterfaces/graphicalModelAssistInterface.h
@@ -20,7 +20,8 @@ class GraphicalModelAssistInterface : public details::ModelsAssistInterface
 	virtual IdList children(Id const &element) const = 0;
 	virtual void changeParent(Id const &element, Id const &parent, QPointF const &position) = 0;
 	virtual void copyProperties(Id const &dest, Id const &src) = 0;
-	virtual QMap<QString, QVariant> properties(Id const &id) = 0;
+	virtual QMap<QString, QVariant> properties(Id const id) = 0;
+	virtual QString getProperties(QString const id, QString type) = 0;
 	virtual IdList temporaryRemovedLinksFrom(Id const &elem) const = 0;
 	virtual IdList temporaryRemovedLinksTo(Id const &elem) const = 0;
 	virtual IdList temporaryRemovedLinksNone(Id const &elem) const = 0;
diff --git a/qrgui/umllib/nodeElement.cpp b/qrgui/umllib/nodeElement.cpp
index a3a26ec7a7..46b1195308 100644
--- a/qrgui/umllib/nodeElement.cpp
+++ b/qrgui/umllib/nodeElement.cpp
@@ -10,6 +10,8 @@
 
 #include <QtDeclarative/QDeclarativeEngine>
 #include <QtDeclarative/QDeclarativeItem>
+#include <QtDeclarative/QDeclarativeContext>
+#include <QtDeclarative/QDeclarativeProperty>
 
 #include <math.h>
 #include <qrutils/inFile.h>
@@ -122,9 +124,14 @@ NodeElement::~NodeElement()
 
 void NodeElement::initQml()
 {
-	QDeclarativeComponent component(mQmlEngine, mElementImpl->qmlUrl());
+	QDeclarativeComponent component(mQmlEngine);
+	component.setData(mElementImpl->qmlString().toLocal8Bit(), QUrl());
 	if (component.isReady()) {
-		mQmlItem = qobject_cast<QDeclarativeItem *>(component.create());
+		qDebug() << "May be here";
+		QObject  *object = component.create();
+		object->setProperty("ids", logicalId().toString());
+		qDebug() << mGraphicalAssistApi.properties(logicalId());
+		mQmlItem = qobject_cast<QDeclarativeItem *>(object);
 	} else {
 		qDebug() << "Qml parsing for" << id().toString() << "failed. Reason:" << component.errorString();
 		QDeclarativeComponent defaultComponent(mQmlEngine, QUrl("qrc:/default.qml"));
@@ -813,6 +820,9 @@ void NodeElement::updateData()
 		setGeometry(newRect.translated(newpos));
 	}
 	mElementImpl->updateData(this);
+	QDeclarativeProperty propertyIds(mQmlItem,"ids");
+	propertyIds.write("");
+	propertyIds.write(logicalId().toString());
 	updateLabels();
 	update();
 }
diff --git a/qrgui/umllib/qmlIconLoader.cpp b/qrgui/umllib/qmlIconLoader.cpp
index b1f973ca74..88e495d61c 100644
--- a/qrgui/umllib/qmlIconLoader.cpp
+++ b/qrgui/umllib/qmlIconLoader.cpp
@@ -21,15 +21,15 @@ void QmlIconLoader::setQmlEngine(QDeclarativeEngine * const engine)
 	instance()->mQmlEngine = engine;
 }
 
-QIcon QmlIconLoader::iconOf(QString const &fileName)
+QIcon QmlIconLoader::iconOf(QString const &qmlString)
 {
-	return loadPixmap(fileName);
+	return loadPixmap(qmlString);
 }
 
-QSize QmlIconLoader::preferedSizeOf(QString const &fileName)
+QSize QmlIconLoader::preferedSizeOf(QString const &qmlString)
 {
-	loadPixmap(fileName);
-	return instance()->mPreferedSizes[fileName];
+	loadPixmap(qmlString);
+	return instance()->mPreferedSizes[qmlString];
 }
 
 QmlIconLoader *QmlIconLoader::instance()
@@ -38,23 +38,16 @@ QmlIconLoader *QmlIconLoader::instance()
 	return &instance;
 }
 
-QIcon QmlIconLoader::loadPixmap(QString const &fileName)
+QIcon QmlIconLoader::loadPixmap(QString const &qmlString)
 {
-	if (!instance()->mLoadedIcons.contains(fileName)) {
-		QDeclarativeComponent component(instance()->mQmlEngine, QUrl(fileName));
-		if (component.isReady()) {
-			QDeclarativeItem * const item = qobject_cast<QDeclarativeItem *>(component.create());
-			QIcon const icon = graphicsUtils::ItemRenderer::renderRecursively(item
-					, item->width(), item->height(), QColor(Qt::white));
-
-			instance()->mLoadedIcons[fileName] = icon;
-			instance()->mPreferedSizes[fileName] = QSize(item->width(), item->height());
-		} else {
-			QIcon const icon(":/icons/default.svg");
-			instance()->mLoadedIcons[fileName] = icon;
-			instance()->mPreferedSizes[fileName] = QSize(50, 50);
-		}
-	}
-
-	return instance()->mLoadedIcons[fileName];
+	QDeclarativeComponent component(instance()->mQmlEngine);
+	component.setData(qmlString.toLocal8Bit(), QUrl());
+	QDeclarativeItem * const item = qobject_cast<QDeclarativeItem *>(component.create());
+	QIcon const icon = graphicsUtils::ItemRenderer::renderRecursively(item
+		, item->width(), item->height(), QColor(Qt::white));
+
+	instance()->mLoadedIcons[qmlString] = icon;
+	instance()->mPreferedSizes[qmlString] = QSize(item->width(), item->height());
+
+	return instance()->mLoadedIcons[qmlString];
 }
diff --git a/qrgui/umllib/qmlIconLoader.h b/qrgui/umllib/qmlIconLoader.h
index a9c073d52e..ec864943e7 100644
--- a/qrgui/umllib/qmlIconLoader.h
+++ b/qrgui/umllib/qmlIconLoader.h
@@ -15,14 +15,14 @@ class QmlIconLoader
 	static void setQmlEngine(QDeclarativeEngine * const engine);
 
 	/// Returns a pixmap of element in specified qml-file
-	static QIcon iconOf(QString const &fileName);
+	static QIcon iconOf(QString const &qmlString);
 
 	/// Returns a size of the pixmap of element in specified qml-file
-	static QSize preferedSizeOf(QString const &fileName);
+	static QSize preferedSizeOf(QString const &qmlString);
 
 private:
 	static QmlIconLoader *instance();
-	static QIcon loadPixmap(QString const &fileName);
+	static QIcon loadPixmap(QString const &qmlString);
 
 	QmlIconLoader();
 	~QmlIconLoader();
diff --git a/qrrepo/private/repository.cpp b/qrrepo/private/repository.cpp
index c5bff88e29..eafde3aec7 100644
--- a/qrrepo/private/repository.cpp
+++ b/qrrepo/private/repository.cpp
@@ -448,7 +448,6 @@ void Repository::saveDiagramsById(QHash<QString, IdList> const &diagramIds)
 void Repository::remove(IdList const &list) const
 {
 	foreach(Id const &id, list) {
-		qDebug() << id.toString();
 		mSerializer.removeFromDisk(id);
 	}
 }
diff --git a/qrxc/edgeType.cpp b/qrxc/edgeType.cpp
index 6fd6b4c696..e4e99b51f7 100644
--- a/qrxc/edgeType.cpp
+++ b/qrxc/edgeType.cpp
@@ -3,6 +3,7 @@
 #include <QtCore/QDebug>
 
 #include <qrutils/outFile.h>
+#include <qrutils/inFile.h>
 
 #include "association.h"
 #include "xmlCompiler.h"
@@ -247,7 +248,7 @@ void EdgeType::generateCode(OutFile &out)
 	out() << "\t\t}\n\n"
 	<< "\t\tvirtual ~" << className << "() {}\n\n"
 	<< "\t\tvoid paint(QPainter *, QRectF &){}\n"
-	<< "\t\tQUrl qmlUrl() const { return QUrl(\"qrc:/generated/shapes/" + resourceName("Class") + "\"); }\n"
+	<< "\t\tQString qmlString() const { return utils::InFile::readAll(\":/generated/shapes/" + resourceName("Class") + "\"); }\n"
 	<< "\t\tbool isNode() const { return false; }\n"
 	<< "\t\tbool isResizeable() const { return true; }\n"
 	<< "\t\tbool isContainer() const { return false; }\n"
diff --git a/qrxc/nodeType.cpp b/qrxc/nodeType.cpp
index 4957028ec4..94be31ea31 100644
--- a/qrxc/nodeType.cpp
+++ b/qrxc/nodeType.cpp
@@ -211,7 +211,7 @@ void NodeType::generateCode(OutFile &out)
 	out() << "\t\t~" << className << "() {}\n\n";
 
 	out()
-	<< "\t\tQUrl qmlUrl() const { return QUrl(\"qrc:/generated/shapes/" + resourceName("Class") + "\"); }\n"
+	<< "\t\tQString qmlString() const { return utils::InFile::readAll(\":/generated/shapes/" + resourceName("Class") + "\"); }\n"
 	<< "\t\tQt::PenStyle getPenStyle() const { return Qt::SolidLine; }\n\n"
 	<< "\t\tint getPenWidth() const { return 0; }\n\n"
 	<< "\t\tQColor getPenColor() const { return QColor(); }\n\n"
diff --git a/qrxc/xmlCompiler.cpp b/qrxc/xmlCompiler.cpp
index b46f4eea6f..03bff22acd 100644
--- a/qrxc/xmlCompiler.cpp
+++ b/qrxc/xmlCompiler.cpp
@@ -126,6 +126,7 @@ void XmlCompiler::generateElementClasses()
 	OutFile outElements("generated/elements.h");
 	outElements() << "#pragma once\n\n"
 		<< "#include <QBrush>\n"
+		<< "#include <qrutils/inFile.h>\n"
 		<< "#include <QPainter>\n\n"
 		<< "#include \"../" << mSourcesRootFolder << "/qrgui/editorPluginInterface/elementImpl.h\"\n"
 		<< "#include \"../" << mSourcesRootFolder << "/qrgui/editorPluginInterface/elementRepoInterface.h\"\n"