diff --git a/ChangeLog b/ChangeLog
index f06cb7c68..8ebf7c530 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,32 @@
+====== ChangeLog from 0.3 to 0.4 ======
+In the official collection, there are now 2298 elements, and 376 catégoris for a total of 2674 files.
+
+* We have removed the flag '-fno-ipa-sra "This settled the compilation problems on Mac OS X and FreeBSD clang.
+* The official collection has been redesigned, through the work of Nuri a new structure is in place.
+* A menu has been added, allowing you to change the application language.
+* we added a summary creation tool.
+* Added button "export the nomenclature" transforms data from diagrams to CSV file for spreadsheet.
+ Arun wrote a detailed manual and quality in English.
+* New tools have been added, they can create mechanical connections and draw cabinets, desks, junction boxes, or areas on the schematic (line tool, rectangle, ellipse, polygon type: respect for style dashes).
+* An aid in positioning cross, drawing, was added.
+* The locked state images and basic forms (basic shapes) is now stored in the project.
+* The "control" during the movement of an element, text field disables snapping to the grid, for free positioning.
+It is now possible to choose the background folios in white or gray.
+* Add supports trackpad gestures (multitouch).
+The dates of the cartridges are now using the short system date and date format according to the language detected setting in the OS.
+We take advantage of the transition to standard C ++ 11, and a big cleanup in the code was done.
+* The undo action or redo the undo stack are now animated graphically.
+When the action save, save as, the status bar displays the name and path of the backup job.
+Qet is now able to come to load a style sheet (stylesheet) directly from the conf directory.
+* A DXF export has been added, the entire project folios can be exported in this format.
+* Added reports folio, Cross references.
+* Added a variable font size on the text of conductors.
+* Added new properties to all conductors at the same potential, even through referrals.
+* When several conductors have the same value potential equalization, it is not useful to display on all conductors.
+* Added button to activates the automatic connection of the conductors of the element when moving it.
+* Numbering rules are now available for the entire project.
+Qet detects the Windows version and applies the appropriate graphic style, depending on the version of Windows.
+
 
 ====== ChangeLog from 0.3 rc to 0.3 ======
 First, the collection of symbols has made a big step forward, with about 1560 new elements. 
diff --git a/elements/60_energy/11_water/grifo-aparatos/aspersor.elmt b/elements/60_energy/11_water/faucets/aspersor.elmt
similarity index 100%
rename from elements/60_energy/11_water/grifo-aparatos/aspersor.elmt
rename to elements/60_energy/11_water/faucets/aspersor.elmt
diff --git a/elements/60_energy/11_water/grifo-aparatos/banera.elmt b/elements/60_energy/11_water/faucets/banera.elmt
similarity index 100%
rename from elements/60_energy/11_water/grifo-aparatos/banera.elmt
rename to elements/60_energy/11_water/faucets/banera.elmt
diff --git a/elements/60_energy/11_water/grifo-aparatos/bide.elmt b/elements/60_energy/11_water/faucets/bide.elmt
similarity index 100%
rename from elements/60_energy/11_water/grifo-aparatos/bide.elmt
rename to elements/60_energy/11_water/faucets/bide.elmt
diff --git a/elements/60_energy/11_water/grifo-aparatos/bomba-agua-vert.elmt b/elements/60_energy/11_water/faucets/bomba-agua-vert.elmt
similarity index 100%
rename from elements/60_energy/11_water/grifo-aparatos/bomba-agua-vert.elmt
rename to elements/60_energy/11_water/faucets/bomba-agua-vert.elmt
diff --git a/elements/60_energy/11_water/grifo-aparatos/bomba-horiz1.elmt b/elements/60_energy/11_water/faucets/bomba-horiz1.elmt
similarity index 100%
rename from elements/60_energy/11_water/grifo-aparatos/bomba-horiz1.elmt
rename to elements/60_energy/11_water/faucets/bomba-horiz1.elmt
diff --git a/elements/60_energy/11_water/grifo-aparatos/calentador-gas.elmt b/elements/60_energy/11_water/faucets/calentador-gas.elmt
similarity index 100%
rename from elements/60_energy/11_water/grifo-aparatos/calentador-gas.elmt
rename to elements/60_energy/11_water/faucets/calentador-gas.elmt
diff --git a/elements/60_energy/11_water/grifo-aparatos/deposito-reserva.elmt b/elements/60_energy/11_water/faucets/deposito-reserva.elmt
similarity index 100%
rename from elements/60_energy/11_water/grifo-aparatos/deposito-reserva.elmt
rename to elements/60_energy/11_water/faucets/deposito-reserva.elmt
diff --git a/elements/60_energy/11_water/grifo-aparatos/ducha.elmt b/elements/60_energy/11_water/faucets/ducha.elmt
similarity index 100%
rename from elements/60_energy/11_water/grifo-aparatos/ducha.elmt
rename to elements/60_energy/11_water/faucets/ducha.elmt
diff --git a/elements/60_energy/11_water/grifo-aparatos/fregadero.elmt b/elements/60_energy/11_water/faucets/fregadero.elmt
similarity index 100%
rename from elements/60_energy/11_water/grifo-aparatos/fregadero.elmt
rename to elements/60_energy/11_water/faucets/fregadero.elmt
diff --git a/elements/60_energy/11_water/grifo-aparatos/fregadero1.elmt b/elements/60_energy/11_water/faucets/fregadero1.elmt
similarity index 100%
rename from elements/60_energy/11_water/grifo-aparatos/fregadero1.elmt
rename to elements/60_energy/11_water/faucets/fregadero1.elmt
diff --git a/elements/60_energy/11_water/grifo-aparatos/grifo-lavabo.elmt b/elements/60_energy/11_water/faucets/grifo-lavabo.elmt
similarity index 100%
rename from elements/60_energy/11_water/grifo-aparatos/grifo-lavabo.elmt
rename to elements/60_energy/11_water/faucets/grifo-lavabo.elmt
diff --git a/elements/60_energy/11_water/grifo-aparatos/grifo-lavabo1.elmt b/elements/60_energy/11_water/faucets/grifo-lavabo1.elmt
similarity index 100%
rename from elements/60_energy/11_water/grifo-aparatos/grifo-lavabo1.elmt
rename to elements/60_energy/11_water/faucets/grifo-lavabo1.elmt
diff --git a/elements/60_energy/11_water/grifo-aparatos/grifo-manguera.elmt b/elements/60_energy/11_water/faucets/grifo-manguera.elmt
similarity index 100%
rename from elements/60_energy/11_water/grifo-aparatos/grifo-manguera.elmt
rename to elements/60_energy/11_water/faucets/grifo-manguera.elmt
diff --git a/elements/60_energy/11_water/grifo-aparatos/inodoro.elmt b/elements/60_energy/11_water/faucets/inodoro.elmt
similarity index 100%
rename from elements/60_energy/11_water/grifo-aparatos/inodoro.elmt
rename to elements/60_energy/11_water/faucets/inodoro.elmt
diff --git a/elements/60_energy/11_water/grifo-aparatos/interacum-acs.elmt b/elements/60_energy/11_water/faucets/interacum-acs.elmt
similarity index 100%
rename from elements/60_energy/11_water/grifo-aparatos/interacum-acs.elmt
rename to elements/60_energy/11_water/faucets/interacum-acs.elmt
diff --git a/elements/60_energy/11_water/grifo-aparatos/interacumulador.elmt b/elements/60_energy/11_water/faucets/interacumulador.elmt
similarity index 100%
rename from elements/60_energy/11_water/grifo-aparatos/interacumulador.elmt
rename to elements/60_energy/11_water/faucets/interacumulador.elmt
diff --git a/elements/60_energy/11_water/grifo-aparatos/lavabo.elmt b/elements/60_energy/11_water/faucets/lavabo.elmt
similarity index 100%
rename from elements/60_energy/11_water/grifo-aparatos/lavabo.elmt
rename to elements/60_energy/11_water/faucets/lavabo.elmt
diff --git a/elements/60_energy/11_water/grifo-aparatos/lavadero.elmt b/elements/60_energy/11_water/faucets/lavadero.elmt
similarity index 100%
rename from elements/60_energy/11_water/grifo-aparatos/lavadero.elmt
rename to elements/60_energy/11_water/faucets/lavadero.elmt
diff --git a/elements/60_energy/11_water/grifo-aparatos/lavadora.elmt b/elements/60_energy/11_water/faucets/lavadora.elmt
similarity index 100%
rename from elements/60_energy/11_water/grifo-aparatos/lavadora.elmt
rename to elements/60_energy/11_water/faucets/lavadora.elmt
diff --git a/elements/60_energy/11_water/grifo-aparatos/lavavajillas.elmt b/elements/60_energy/11_water/faucets/lavavajillas.elmt
similarity index 100%
rename from elements/60_energy/11_water/grifo-aparatos/lavavajillas.elmt
rename to elements/60_energy/11_water/faucets/lavavajillas.elmt
diff --git a/elements/60_energy/11_water/grifo-aparatos/manguera.elmt b/elements/60_energy/11_water/faucets/manguera.elmt
similarity index 100%
rename from elements/60_energy/11_water/grifo-aparatos/manguera.elmt
rename to elements/60_energy/11_water/faucets/manguera.elmt
diff --git a/elements/60_energy/11_water/grifo-aparatos/qet_directory b/elements/60_energy/11_water/faucets/qet_directory
similarity index 100%
rename from elements/60_energy/11_water/grifo-aparatos/qet_directory
rename to elements/60_energy/11_water/faucets/qet_directory
diff --git a/elements/60_energy/11_water/grifo-aparatos/termo-electrico.elmt b/elements/60_energy/11_water/faucets/termo-electrico.elmt
similarity index 100%
rename from elements/60_energy/11_water/grifo-aparatos/termo-electrico.elmt
rename to elements/60_energy/11_water/faucets/termo-electrico.elmt
diff --git a/elements/60_energy/11_water/grifo-aparatos/vertedero.elmt b/elements/60_energy/11_water/faucets/vertedero.elmt
similarity index 100%
rename from elements/60_energy/11_water/grifo-aparatos/vertedero.elmt
rename to elements/60_energy/11_water/faucets/vertedero.elmt
diff --git a/elements/60_energy/11_water/multicapa/codoalpex-16.elmt b/elements/60_energy/11_water/fittings/codoalpex-16.elmt
similarity index 100%
rename from elements/60_energy/11_water/multicapa/codoalpex-16.elmt
rename to elements/60_energy/11_water/fittings/codoalpex-16.elmt
diff --git a/elements/60_energy/11_water/multicapa/codoalpex20.elmt b/elements/60_energy/11_water/fittings/codoalpex20.elmt
similarity index 100%
rename from elements/60_energy/11_water/multicapa/codoalpex20.elmt
rename to elements/60_energy/11_water/fittings/codoalpex20.elmt
diff --git a/elements/60_energy/11_water/multicapa/codoalpex25.elmt b/elements/60_energy/11_water/fittings/codoalpex25.elmt
similarity index 100%
rename from elements/60_energy/11_water/multicapa/codoalpex25.elmt
rename to elements/60_energy/11_water/fittings/codoalpex25.elmt
diff --git a/elements/60_energy/11_water/multicapa/codoalpex32.elmt b/elements/60_energy/11_water/fittings/codoalpex32.elmt
similarity index 100%
rename from elements/60_energy/11_water/multicapa/codoalpex32.elmt
rename to elements/60_energy/11_water/fittings/codoalpex32.elmt
diff --git a/elements/60_energy/11_water/multicapa/colector-aseo.elmt b/elements/60_energy/11_water/fittings/colector-aseo.elmt
similarity index 100%
rename from elements/60_energy/11_water/multicapa/colector-aseo.elmt
rename to elements/60_energy/11_water/fittings/colector-aseo.elmt
diff --git a/elements/60_energy/11_water/multicapa/colector-aseo20-16.elmt b/elements/60_energy/11_water/fittings/colector-aseo20-16.elmt
similarity index 100%
rename from elements/60_energy/11_water/multicapa/colector-aseo20-16.elmt
rename to elements/60_energy/11_water/fittings/colector-aseo20-16.elmt
diff --git a/elements/60_energy/11_water/multicapa/curvaalpex16.elmt b/elements/60_energy/11_water/fittings/curvaalpex16.elmt
similarity index 100%
rename from elements/60_energy/11_water/multicapa/curvaalpex16.elmt
rename to elements/60_energy/11_water/fittings/curvaalpex16.elmt
diff --git a/elements/60_energy/11_water/multicapa/curvaalpex20.elmt b/elements/60_energy/11_water/fittings/curvaalpex20.elmt
similarity index 100%
rename from elements/60_energy/11_water/multicapa/curvaalpex20.elmt
rename to elements/60_energy/11_water/fittings/curvaalpex20.elmt
diff --git a/elements/60_energy/11_water/multicapa/curvaalpex25.elmt b/elements/60_energy/11_water/fittings/curvaalpex25.elmt
similarity index 100%
rename from elements/60_energy/11_water/multicapa/curvaalpex25.elmt
rename to elements/60_energy/11_water/fittings/curvaalpex25.elmt
diff --git a/elements/60_energy/11_water/multicapa/curvaalpex32.elmt b/elements/60_energy/11_water/fittings/curvaalpex32.elmt
similarity index 100%
rename from elements/60_energy/11_water/multicapa/curvaalpex32.elmt
rename to elements/60_energy/11_water/fittings/curvaalpex32.elmt
diff --git a/elements/60_energy/11_water/multicapa/llave-pasoalpex20.elmt b/elements/60_energy/11_water/fittings/llave-pasoalpex20.elmt
similarity index 100%
rename from elements/60_energy/11_water/multicapa/llave-pasoalpex20.elmt
rename to elements/60_energy/11_water/fittings/llave-pasoalpex20.elmt
diff --git a/elements/60_energy/11_water/multicapa/llavealpex25.elmt b/elements/60_energy/11_water/fittings/llavealpex25.elmt
similarity index 100%
rename from elements/60_energy/11_water/multicapa/llavealpex25.elmt
rename to elements/60_energy/11_water/fittings/llavealpex25.elmt
diff --git a/elements/60_energy/11_water/multicapa/llavealpex32.elmt b/elements/60_energy/11_water/fittings/llavealpex32.elmt
similarity index 100%
rename from elements/60_energy/11_water/multicapa/llavealpex32.elmt
rename to elements/60_energy/11_water/fittings/llavealpex32.elmt
diff --git a/elements/60_energy/11_water/multicapa/manguito-codoalpex16-1_2h.elmt b/elements/60_energy/11_water/fittings/manguito-codoalpex16-1_2h.elmt
similarity index 100%
rename from elements/60_energy/11_water/multicapa/manguito-codoalpex16-1_2h.elmt
rename to elements/60_energy/11_water/fittings/manguito-codoalpex16-1_2h.elmt
diff --git a/elements/60_energy/11_water/multicapa/manguito-codoalpex20-1_2h.elmt b/elements/60_energy/11_water/fittings/manguito-codoalpex20-1_2h.elmt
similarity index 100%
rename from elements/60_energy/11_water/multicapa/manguito-codoalpex20-1_2h.elmt
rename to elements/60_energy/11_water/fittings/manguito-codoalpex20-1_2h.elmt
diff --git a/elements/60_energy/11_water/multicapa/manguito-codoalpex20-3_4h.elmt b/elements/60_energy/11_water/fittings/manguito-codoalpex20-3_4h.elmt
similarity index 100%
rename from elements/60_energy/11_water/multicapa/manguito-codoalpex20-3_4h.elmt
rename to elements/60_energy/11_water/fittings/manguito-codoalpex20-3_4h.elmt
diff --git a/elements/60_energy/11_water/multicapa/manguito16-1_2h.elmt b/elements/60_energy/11_water/fittings/manguito16-1_2h.elmt
similarity index 100%
rename from elements/60_energy/11_water/multicapa/manguito16-1_2h.elmt
rename to elements/60_energy/11_water/fittings/manguito16-1_2h.elmt
diff --git a/elements/60_energy/11_water/multicapa/manguitoalpex20-1_2h.elmt b/elements/60_energy/11_water/fittings/manguitoalpex20-1_2h.elmt
similarity index 100%
rename from elements/60_energy/11_water/multicapa/manguitoalpex20-1_2h.elmt
rename to elements/60_energy/11_water/fittings/manguitoalpex20-1_2h.elmt
diff --git a/elements/60_energy/11_water/multicapa/manguitoalpex20-3_4h.elmt b/elements/60_energy/11_water/fittings/manguitoalpex20-3_4h.elmt
similarity index 100%
rename from elements/60_energy/11_water/multicapa/manguitoalpex20-3_4h.elmt
rename to elements/60_energy/11_water/fittings/manguitoalpex20-3_4h.elmt
diff --git a/elements/60_energy/11_water/multicapa/manguitoalpex25-1h.elmt b/elements/60_energy/11_water/fittings/manguitoalpex25-1h.elmt
similarity index 100%
rename from elements/60_energy/11_water/multicapa/manguitoalpex25-1h.elmt
rename to elements/60_energy/11_water/fittings/manguitoalpex25-1h.elmt
diff --git a/elements/60_energy/11_water/multicapa/qet_directory b/elements/60_energy/11_water/fittings/qet_directory
similarity index 100%
rename from elements/60_energy/11_water/multicapa/qet_directory
rename to elements/60_energy/11_water/fittings/qet_directory
diff --git a/elements/60_energy/11_water/multicapa/racoralpex16-1_2.elmt b/elements/60_energy/11_water/fittings/racoralpex16-1_2.elmt
similarity index 100%
rename from elements/60_energy/11_water/multicapa/racoralpex16-1_2.elmt
rename to elements/60_energy/11_water/fittings/racoralpex16-1_2.elmt
diff --git a/elements/60_energy/11_water/multicapa/racoralpex20-3_4.elmt b/elements/60_energy/11_water/fittings/racoralpex20-3_4.elmt
similarity index 100%
rename from elements/60_energy/11_water/multicapa/racoralpex20-3_4.elmt
rename to elements/60_energy/11_water/fittings/racoralpex20-3_4.elmt
diff --git a/elements/60_energy/11_water/multicapa/racoralpex25-3_4.elmt b/elements/60_energy/11_water/fittings/racoralpex25-3_4.elmt
similarity index 100%
rename from elements/60_energy/11_water/multicapa/racoralpex25-3_4.elmt
rename to elements/60_energy/11_water/fittings/racoralpex25-3_4.elmt
diff --git a/elements/60_energy/11_water/multicapa/racoralpex32-1.elmt b/elements/60_energy/11_water/fittings/racoralpex32-1.elmt
similarity index 100%
rename from elements/60_energy/11_water/multicapa/racoralpex32-1.elmt
rename to elements/60_energy/11_water/fittings/racoralpex32-1.elmt
diff --git a/elements/60_energy/11_water/multicapa/reduccion20-16.elmt b/elements/60_energy/11_water/fittings/reduccion20-16.elmt
similarity index 100%
rename from elements/60_energy/11_water/multicapa/reduccion20-16.elmt
rename to elements/60_energy/11_water/fittings/reduccion20-16.elmt
diff --git a/elements/60_energy/11_water/multicapa/reduccionalpex25-20.elmt b/elements/60_energy/11_water/fittings/reduccionalpex25-20.elmt
similarity index 100%
rename from elements/60_energy/11_water/multicapa/reduccionalpex25-20.elmt
rename to elements/60_energy/11_water/fittings/reduccionalpex25-20.elmt
diff --git a/elements/60_energy/11_water/multicapa/reduccionalpex32-25.elmt b/elements/60_energy/11_water/fittings/reduccionalpex32-25.elmt
similarity index 100%
rename from elements/60_energy/11_water/multicapa/reduccionalpex32-25.elmt
rename to elements/60_energy/11_water/fittings/reduccionalpex32-25.elmt
diff --git a/elements/60_energy/11_water/multicapa/tealpex16.elmt b/elements/60_energy/11_water/fittings/tealpex16.elmt
similarity index 100%
rename from elements/60_energy/11_water/multicapa/tealpex16.elmt
rename to elements/60_energy/11_water/fittings/tealpex16.elmt
diff --git a/elements/60_energy/11_water/multicapa/tealpex20-16-20.elmt b/elements/60_energy/11_water/fittings/tealpex20-16-20.elmt
similarity index 100%
rename from elements/60_energy/11_water/multicapa/tealpex20-16-20.elmt
rename to elements/60_energy/11_water/fittings/tealpex20-16-20.elmt
diff --git a/elements/60_energy/11_water/multicapa/tealpex20.elmt b/elements/60_energy/11_water/fittings/tealpex20.elmt
similarity index 100%
rename from elements/60_energy/11_water/multicapa/tealpex20.elmt
rename to elements/60_energy/11_water/fittings/tealpex20.elmt
diff --git a/elements/60_energy/11_water/multicapa/tealpex25-20-25.elmt b/elements/60_energy/11_water/fittings/tealpex25-20-25.elmt
similarity index 100%
rename from elements/60_energy/11_water/multicapa/tealpex25-20-25.elmt
rename to elements/60_energy/11_water/fittings/tealpex25-20-25.elmt
diff --git a/elements/60_energy/11_water/multicapa/tealpex25.elmt b/elements/60_energy/11_water/fittings/tealpex25.elmt
similarity index 100%
rename from elements/60_energy/11_water/multicapa/tealpex25.elmt
rename to elements/60_energy/11_water/fittings/tealpex25.elmt
diff --git a/elements/60_energy/11_water/multicapa/tealpex32-25-32.elmt b/elements/60_energy/11_water/fittings/tealpex32-25-32.elmt
similarity index 100%
rename from elements/60_energy/11_water/multicapa/tealpex32-25-32.elmt
rename to elements/60_energy/11_water/fittings/tealpex32-25-32.elmt
diff --git a/elements/60_energy/11_water/multicapa/tealpex32.elmt b/elements/60_energy/11_water/fittings/tealpex32.elmt
similarity index 100%
rename from elements/60_energy/11_water/multicapa/tealpex32.elmt
rename to elements/60_energy/11_water/fittings/tealpex32.elmt
diff --git a/elements/60_energy/11_water/multicapa/tuboalpex16.elmt b/elements/60_energy/11_water/fittings/tuboalpex16.elmt
similarity index 100%
rename from elements/60_energy/11_water/multicapa/tuboalpex16.elmt
rename to elements/60_energy/11_water/fittings/tuboalpex16.elmt
diff --git a/elements/60_energy/11_water/multicapa/tuboalpex20.elmt b/elements/60_energy/11_water/fittings/tuboalpex20.elmt
similarity index 100%
rename from elements/60_energy/11_water/multicapa/tuboalpex20.elmt
rename to elements/60_energy/11_water/fittings/tuboalpex20.elmt
diff --git a/elements/60_energy/11_water/multicapa/tuboalpex25.elmt b/elements/60_energy/11_water/fittings/tuboalpex25.elmt
similarity index 100%
rename from elements/60_energy/11_water/multicapa/tuboalpex25.elmt
rename to elements/60_energy/11_water/fittings/tuboalpex25.elmt
diff --git a/elements/60_energy/11_water/multicapa/tuboalpex32.elmt b/elements/60_energy/11_water/fittings/tuboalpex32.elmt
similarity index 100%
rename from elements/60_energy/11_water/multicapa/tuboalpex32.elmt
rename to elements/60_energy/11_water/fittings/tuboalpex32.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/brida-pn10-rosca1h.elmt b/elements/60_energy/11_water/valves/brida-pn10-rosca1h.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/brida-pn10-rosca1h.elmt
rename to elements/60_energy/11_water/valves/brida-pn10-rosca1h.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/brida-pn10-rosca1m.elmt b/elements/60_energy/11_water/valves/brida-pn10-rosca1m.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/brida-pn10-rosca1m.elmt
rename to elements/60_energy/11_water/valves/brida-pn10-rosca1m.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/calderin3_4hembra.elmt b/elements/60_energy/11_water/valves/calderin3_4hembra.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/calderin3_4hembra.elmt
rename to elements/60_energy/11_water/valves/calderin3_4hembra.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/casquillo1_2-3_4.elmt b/elements/60_energy/11_water/valves/casquillo1_2-3_4.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/casquillo1_2-3_4.elmt
rename to elements/60_energy/11_water/valves/casquillo1_2-3_4.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/casquillo3_4-1.elmt b/elements/60_energy/11_water/valves/casquillo3_4-1.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/casquillo3_4-1.elmt
rename to elements/60_energy/11_water/valves/casquillo3_4-1.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/codo-rosca1.elmt b/elements/60_energy/11_water/valves/codo-rosca1.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/codo-rosca1.elmt
rename to elements/60_energy/11_water/valves/codo-rosca1.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/codo-rosca1_2.elmt b/elements/60_energy/11_water/valves/codo-rosca1_2.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/codo-rosca1_2.elmt
rename to elements/60_energy/11_water/valves/codo-rosca1_2.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/codo-rosca3_4.elmt b/elements/60_energy/11_water/valves/codo-rosca3_4.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/codo-rosca3_4.elmt
rename to elements/60_energy/11_water/valves/codo-rosca3_4.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/enalce3t1hembra.elmt b/elements/60_energy/11_water/valves/enalce3t1hembra.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/enalce3t1hembra.elmt
rename to elements/60_energy/11_water/valves/enalce3t1hembra.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/enlace3_4.elmt b/elements/60_energy/11_water/valves/enlace3_4.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/enlace3_4.elmt
rename to elements/60_energy/11_water/valves/enlace3_4.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/enlace3t-1_2.elmt b/elements/60_energy/11_water/valves/enlace3t-1_2.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/enlace3t-1_2.elmt
rename to elements/60_energy/11_water/valves/enlace3t-1_2.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/filtro1_2h-h.elmt b/elements/60_energy/11_water/valves/filtro1_2h-h.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/filtro1_2h-h.elmt
rename to elements/60_energy/11_water/valves/filtro1_2h-h.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/filtro3_4-hembra.elmt b/elements/60_energy/11_water/valves/filtro3_4-hembra.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/filtro3_4-hembra.elmt
rename to elements/60_energy/11_water/valves/filtro3_4-hembra.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/grifo-manguera.elmt b/elements/60_energy/11_water/valves/grifo-manguera.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/grifo-manguera.elmt
rename to elements/60_energy/11_water/valves/grifo-manguera.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/grupo-seg-termo.elmt b/elements/60_energy/11_water/valves/grupo-seg-termo.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/grupo-seg-termo.elmt
rename to elements/60_energy/11_water/valves/grupo-seg-termo.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/latiguillo-1_2.elmt b/elements/60_energy/11_water/valves/latiguillo-1_2.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/latiguillo-1_2.elmt
rename to elements/60_energy/11_water/valves/latiguillo-1_2.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/latiguillo3_4.elmt b/elements/60_energy/11_water/valves/latiguillo3_4.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/latiguillo3_4.elmt
rename to elements/60_energy/11_water/valves/latiguillo3_4.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/latiguillo3_8.elmt b/elements/60_energy/11_water/valves/latiguillo3_8.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/latiguillo3_8.elmt
rename to elements/60_energy/11_water/valves/latiguillo3_8.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/llave-latiguillo.elmt b/elements/60_energy/11_water/valves/llave-latiguillo.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/llave-latiguillo.elmt
rename to elements/60_energy/11_water/valves/llave-latiguillo.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/llavereg1.elmt b/elements/60_energy/11_water/valves/llavereg1.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/llavereg1.elmt
rename to elements/60_energy/11_water/valves/llavereg1.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/llavereg3_4.elmt b/elements/60_energy/11_water/valves/llavereg3_4.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/llavereg3_4.elmt
rename to elements/60_energy/11_water/valves/llavereg3_4.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/machon-red3_4-1.elmt b/elements/60_energy/11_water/valves/machon-red3_4-1.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/machon-red3_4-1.elmt
rename to elements/60_energy/11_water/valves/machon-red3_4-1.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/machon-red3_4-1_2.elmt b/elements/60_energy/11_water/valves/machon-red3_4-1_2.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/machon-red3_4-1_2.elmt
rename to elements/60_energy/11_water/valves/machon-red3_4-1_2.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/machon1.elmt b/elements/60_energy/11_water/valves/machon1.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/machon1.elmt
rename to elements/60_energy/11_water/valves/machon1.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/machon1_2.elmt b/elements/60_energy/11_water/valves/machon1_2.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/machon1_2.elmt
rename to elements/60_energy/11_water/valves/machon1_2.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/machon3_4.elmt b/elements/60_energy/11_water/valves/machon3_4.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/machon3_4.elmt
rename to elements/60_energy/11_water/valves/machon3_4.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/mando-ducha.elmt b/elements/60_energy/11_water/valves/mando-ducha.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/mando-ducha.elmt
rename to elements/60_energy/11_water/valves/mando-ducha.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/manguito-rosca1.elmt b/elements/60_energy/11_water/valves/manguito-rosca1.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/manguito-rosca1.elmt
rename to elements/60_energy/11_water/valves/manguito-rosca1.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/manguito-rosca1_2.elmt b/elements/60_energy/11_water/valves/manguito-rosca1_2.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/manguito-rosca1_2.elmt
rename to elements/60_energy/11_water/valves/manguito-rosca1_2.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/manguito-rosca3_4.elmt b/elements/60_energy/11_water/valves/manguito-rosca3_4.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/manguito-rosca3_4.elmt
rename to elements/60_energy/11_water/valves/manguito-rosca3_4.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/manometro1_2.elmt b/elements/60_energy/11_water/valves/manometro1_2.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/manometro1_2.elmt
rename to elements/60_energy/11_water/valves/manometro1_2.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/manometro3_8macho.elmt b/elements/60_energy/11_water/valves/manometro3_8macho.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/manometro3_8macho.elmt
rename to elements/60_energy/11_water/valves/manometro3_8macho.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/marsellesa1_2.elmt b/elements/60_energy/11_water/valves/marsellesa1_2.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/marsellesa1_2.elmt
rename to elements/60_energy/11_water/valves/marsellesa1_2.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/marsellesa3_4.elmt b/elements/60_energy/11_water/valves/marsellesa3_4.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/marsellesa3_4.elmt
rename to elements/60_energy/11_water/valves/marsellesa3_4.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/mitigeur_melangeur_03.elmt b/elements/60_energy/11_water/valves/mitigeur_melangeur_03.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/mitigeur_melangeur_03.elmt
rename to elements/60_energy/11_water/valves/mitigeur_melangeur_03.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/prescontrol.elmt b/elements/60_energy/11_water/valves/prescontrol.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/prescontrol.elmt
rename to elements/60_energy/11_water/valves/prescontrol.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/purgador1_2macho.elmt b/elements/60_energy/11_water/valves/purgador1_2macho.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/purgador1_2macho.elmt
rename to elements/60_energy/11_water/valves/purgador1_2macho.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/purgador3_8m.elmt b/elements/60_energy/11_water/valves/purgador3_8m.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/purgador3_8m.elmt
rename to elements/60_energy/11_water/valves/purgador3_8m.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/qet_directory b/elements/60_energy/11_water/valves/qet_directory
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/qet_directory
rename to elements/60_energy/11_water/valves/qet_directory
diff --git a/elements/60_energy/11_water/roscar-valvulas/racoralpex25-3_4.elmt b/elements/60_energy/11_water/valves/racoralpex25-3_4.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/racoralpex25-3_4.elmt
rename to elements/60_energy/11_water/valves/racoralpex25-3_4.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/retencion1.elmt b/elements/60_energy/11_water/valves/retencion1.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/retencion1.elmt
rename to elements/60_energy/11_water/valves/retencion1.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/retencion3_4.elmt b/elements/60_energy/11_water/valves/retencion3_4.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/retencion3_4.elmt
rename to elements/60_energy/11_water/valves/retencion3_4.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/tapon1.elmt b/elements/60_energy/11_water/valves/tapon1.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/tapon1.elmt
rename to elements/60_energy/11_water/valves/tapon1.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/tapon1_2.elmt b/elements/60_energy/11_water/valves/tapon1_2.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/tapon1_2.elmt
rename to elements/60_energy/11_water/valves/tapon1_2.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/tapon3_4.elmt b/elements/60_energy/11_water/valves/tapon3_4.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/tapon3_4.elmt
rename to elements/60_energy/11_water/valves/tapon3_4.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/te-rosca-3_4.elmt b/elements/60_energy/11_water/valves/te-rosca-3_4.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/te-rosca-3_4.elmt
rename to elements/60_energy/11_water/valves/te-rosca-3_4.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/te-rosca1.elmt b/elements/60_energy/11_water/valves/te-rosca1.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/te-rosca1.elmt
rename to elements/60_energy/11_water/valves/te-rosca1.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/te-rosca1_2.elmt b/elements/60_energy/11_water/valves/te-rosca1_2.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/te-rosca1_2.elmt
rename to elements/60_energy/11_water/valves/te-rosca1_2.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/termometro.elmt b/elements/60_energy/11_water/valves/termometro.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/termometro.elmt
rename to elements/60_energy/11_water/valves/termometro.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/tubo-rosca1.elmt b/elements/60_energy/11_water/valves/tubo-rosca1.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/tubo-rosca1.elmt
rename to elements/60_energy/11_water/valves/tubo-rosca1.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/tubo-rosca1_1_2.elmt b/elements/60_energy/11_water/valves/tubo-rosca1_1_2.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/tubo-rosca1_1_2.elmt
rename to elements/60_energy/11_water/valves/tubo-rosca1_1_2.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/tubo-rosca3_4.elmt b/elements/60_energy/11_water/valves/tubo-rosca3_4.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/tubo-rosca3_4.elmt
rename to elements/60_energy/11_water/valves/tubo-rosca3_4.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/valv-bola1-m-m.elmt b/elements/60_energy/11_water/valves/valv-bola1-m-m.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/valv-bola1-m-m.elmt
rename to elements/60_energy/11_water/valves/valv-bola1-m-m.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/valv-bola1_2h-h.elmt b/elements/60_energy/11_water/valves/valv-bola1_2h-h.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/valv-bola1_2h-h.elmt
rename to elements/60_energy/11_water/valves/valv-bola1_2h-h.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/valv-bola1_2m-m.elmt b/elements/60_energy/11_water/valves/valv-bola1_2m-m.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/valv-bola1_2m-m.elmt
rename to elements/60_energy/11_water/valves/valv-bola1_2m-m.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/valv-bola1h-h.elmt b/elements/60_energy/11_water/valves/valv-bola1h-h.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/valv-bola1h-h.elmt
rename to elements/60_energy/11_water/valves/valv-bola1h-h.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/valv-bola3_4h-h.elmt b/elements/60_energy/11_water/valves/valv-bola3_4h-h.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/valv-bola3_4h-h.elmt
rename to elements/60_energy/11_water/valves/valv-bola3_4h-h.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/valv-bola3_4m-m.elmt b/elements/60_energy/11_water/valves/valv-bola3_4m-m.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/valv-bola3_4m-m.elmt
rename to elements/60_energy/11_water/valves/valv-bola3_4m-m.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/valv-pie3_4.elmt b/elements/60_energy/11_water/valves/valv-pie3_4.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/valv-pie3_4.elmt
rename to elements/60_energy/11_water/valves/valv-pie3_4.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/valvpie1hembra.elmt b/elements/60_energy/11_water/valves/valvpie1hembra.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/valvpie1hembra.elmt
rename to elements/60_energy/11_water/valves/valvpie1hembra.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/valvsegu3_4.elmt b/elements/60_energy/11_water/valves/valvsegu3_4.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/valvsegu3_4.elmt
rename to elements/60_energy/11_water/valves/valvsegu3_4.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/valvula-flotador.elmt b/elements/60_energy/11_water/valves/valvula-flotador.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/valvula-flotador.elmt
rename to elements/60_energy/11_water/valves/valvula-flotador.elmt
diff --git a/elements/60_energy/11_water/roscar-valvulas/valvulaseg1_2.elmt b/elements/60_energy/11_water/valves/valvulaseg1_2.elmt
similarity index 100%
rename from elements/60_energy/11_water/roscar-valvulas/valvulaseg1_2.elmt
rename to elements/60_energy/11_water/valves/valvulaseg1_2.elmt
diff --git a/ico/splash-0.2.png b/ico/splash-0.2.png
deleted file mode 100644
index e833b47f3..000000000
Binary files a/ico/splash-0.2.png and /dev/null differ
diff --git a/lang/qet_ar.qm b/lang/qet_ar.qm
index 48426f8a9..21ca4c227 100644
Binary files a/lang/qet_ar.qm and b/lang/qet_ar.qm differ
diff --git a/lang/qet_ca.qm b/lang/qet_ca.qm
index 45917008e..ee98b01c8 100644
Binary files a/lang/qet_ca.qm and b/lang/qet_ca.qm differ
diff --git a/lang/qet_es.qm b/lang/qet_es.qm
index b079dbfa8..350779364 100644
Binary files a/lang/qet_es.qm and b/lang/qet_es.qm differ
diff --git a/lang/qet_hr.qm b/lang/qet_hr.qm
index b6db109a6..129543127 100644
Binary files a/lang/qet_hr.qm and b/lang/qet_hr.qm differ
diff --git a/lang/qet_nl.qm b/lang/qet_nl.qm
index 03039df67..aedb17434 100644
Binary files a/lang/qet_nl.qm and b/lang/qet_nl.qm differ
diff --git a/lang/qet_pt.qm b/lang/qet_pt.qm
index b38bf3ab6..a8ec300ec 100644
Binary files a/lang/qet_pt.qm and b/lang/qet_pt.qm differ
diff --git a/lang/qet_ro.qm b/lang/qet_ro.qm
index b3bcf96a7..b5d1f8d81 100644
Binary files a/lang/qet_ro.qm and b/lang/qet_ro.qm differ
diff --git a/lang/qet_ru.qm b/lang/qet_ru.qm
index ea60edec0..742a5639e 100644
Binary files a/lang/qet_ru.qm and b/lang/qet_ru.qm differ
diff --git a/sources/qet.h b/sources/qet.h
index bb9352edd..2d88d6441 100644
--- a/sources/qet.h
+++ b/sources/qet.h
@@ -27,7 +27,7 @@ namespace QET {
 	/// QElectroTech version (as string, used to mark projects and elements XML documents)
 	const QString version = "0.4";
 	/// QElectroTech displayed version
-	const QString displayedVersion = "0.4-rc2";
+	const QString displayedVersion = "0.4";
 	QString license();
 	
 	/// Oriented movements