Efl: Remove part name in Efl.Container (use Efl.Part)

This touches Edje and also Elementary where part names are used. This commit blew up in size since now all content part APIs (get, set, unset) require to use Efl.Part instead. This is a big refactoring commit, but no logic should have been changed. Fingers crossed.
2016-05-25 21:11:43 +09:00
9723 changed files with 547578 additions and 954456 deletions
--- a/.arcconfig
+++ b/.arcconfig
@ -0,0 +1,4 @@
+{
+  "project_id" : "efl",
+  "conduit_uri" : "https://phab.enlightenment.org/"
+}
--- a/.gitignore
+++ b/.gitignore
@ -15,7 +15,6 @@
 Makefile
 Makefile.in
 tags
-.clang_complete
 .DS_Store
 .deps
 .libs
@ -34,16 +33,11 @@ tags
 *.eo.h
 *.eot.h
 *.eo.legacy.h
-*.eo.legacy.c
 *.eo.hh
 *.eo.impl.hh
 *.eo.js.cc
-*.eo.cs
-*.eot.cs
 *.eo.lua
 *.luac
-*.pyc
-__pycache__
 .dir-locals.el
 /efl-*-doc.tar.bz2
 /ar-lib
@ -72,26 +66,10 @@ __pycache__
 /compile
 /test-driver
 /missing
+/INSTALL
 /ABOUT-NLS
 /config.rpath
 /coverage
 /src/lib/ecore_x/ecore_x_vsync
 Session.vim
-/elm_intro.h
-/src/modules/evas/engines/gl_common/shader_3d/evas_3d_shaders.x
-/src/scripts/eo/eo_debug
-/src/bin/ecore_con/efl_net_proxy_helper
-/src/bin/efl_wl/efl_wl_test
-/src/bin/efl_wl/efl_wl_test_stack
-
-#wayland generated protocol - some legacy headers will be ignored
-*-protocol.h
-*-protocol.c
-
-/build
-.cproject
-.project
-/.settings/
-efl_libs.csv
-.vscode/
-.uuid
+/elm_intro.h
--- a/.lcov-config
+++ b/.lcov-config
@ -0,0 +1,3 @@
+geninfo_auto_base=1
+lcov_branch_coverage=1
+genhtml_branch_coverage=1
--- a/.mailmap
+++ b/.mailmap
@ -4,7 +4,7 @@
 # More people can be added following this scheme:
 # Proper Name <proper@email.xx> Commit Name <commit@email.xx>
 #
-# Please keep this file in sync between efl, e and terminology.
+# Please keep this file in sync between efl, elementary, e and terminology.

 Carsten Haitzler <raster@rasterman.com> Carsten Haitzler (Rasterman) <raster@rasterman.com>
 Cedric BAIL <cedric.bail@free.fr> Cedric Bail <cedric.bail@samsung.com>
@ -14,23 +14,13 @@ Cedric BAIL <cedric.bail@free.fr> Cedric BAIL <cedric@efl.so>
 Cedric BAIL <cedric.bail@free.fr> Cedric BAIL <c.bail@partner.samsung.com>
 Cedric BAIL <cedric.bail@free.fr> Cedric BAIL <cedric@osg.samsung.com>
 Vincent Torri <vincent.torri@gmail.com> Vincent Torri <vtorri@univ-evry.fr>
-Vincent Torri <vincent.torri@gmail.com> Vincent Torri <vincent dot torri at gmail dot com>
-Vincent Torri <vincent.torri@gmail.com> Vincent Torri <vincent.torri@univ-evry.fr>
-Vincent Torri <vincent.torri@gmail.com> Vincent 'vtorri' Torri <vincent.torri@gmail.com>
 Tom Hacohen <tom@stosb.com> Tom 'TAsn' Hacohen <tom@stosb.com>
 Tom Hacohen <tom@stosb.com> Tom <tom@stosb.com>
 Gustavo Sverzut Barbieri <barbieri@gmail.com> Gustavo Sverzut Barbieri <barbieri@profusion.mobi>
-Gustavo Sverzut Barbieri <barbieri@gmail.com> Gustavo Sverzut Barbieri <gustavo.barbieri@intel.com>
-Christopher Michael <devilhorns@comcast.net> Chris Michael <devilhorns@comcast.net>
-Christopher Michael <devilhorns@comcast.net> Christopher Michael <devilhorns@comcast.net>
 Christopher Michael <devilhorns@comcast.net> Christopher Michael <cpmichael@comcast.net>
-Christopher Michael <devilhorns@comcast.net> Christopher Michael <cpmichael1@comcast.net>
-Christopher Michael <devilhorns@comcast.net> Christopher <devilhorns@comcast.net>
-Christopher Michael <devilhorns@comcast.net> Christopher Michael <cpmichael@osg.samsung.com>
-Christopher Michael <devilhorns@comcast.net> Chris Michael <cpmichael@osg.samsung.com>
-Christopher Michael <devilhorns@comcast.net> Chris Micheal <cp.michael@samsung.com>
 Christopher Michael <devilhorns@comcast.net> Christopher Michael <cp.michael@samsung.com>
-Christopher Michael <devilhorns@comcast.net> Chris Michael <cp.michael@samsung.com>
+Christopher Michael <devilhorns@comcast.net> Christopher Michael <devilhorns@comcast.net>
+Christopher Michael <devilhorns@comcast.net> Christopher Michael <cpmichael@osg.samsung.com>
 Sebastian Dransfeld <sd@tango.flipp.net> Sebastian Dransfeld <sebastian.dransfeld@sintef.no>
 Sebastian Dransfeld <sd@tango.flipp.net> sebastid <sebastid>
 Mike Blumenkrantz <michael.blumenkrantz@gmail.com> Mike Blumenkrantz <m.blumenkran@samsung.com>
@ -38,26 +28,16 @@ Mike Blumenkrantz <michael.blumenkrantz@gmail.com> discomfitor <michael.blumenkr
 Mike Blumenkrantz <michael.blumenkrantz@gmail.com> zmike <michael.blumenkrantz@gmail.com>
 Mike Blumenkrantz <michael.blumenkrantz@gmail.com> Mike Blumenkrantz <zmike@samsung.com>
 Mike Blumenkrantz <michael.blumenkrantz@gmail.com> Mike Blumenkrantz <zmike@osg.samsung.com>
-Mike Blumenkrantz <michael.blumenkrantz@gmail.com> Michael Blumenkrantz <mike@zentific.com>
-Mike Blumenkrantz <michael.blumenkrantz@gmail.com> Mike Blumenkrantz <zmike@enlightenment.org>
 ChunEon Park <hermet@hermet.pe.kr> ChunEon Park <chuneon.park@samsung.com>
-ChunEon Park <hermet@hermet.pe.kr> Hermet Park <hermet@hermet.pe.kr>
-ChunEon Park <hermet@hermet.pe.kr> Hermet Park <hermetpark@gmail.com>
-ChunEon Park <hermet@hermet.pe.kr> hermet <hermet@neoni.(none)>
-ChunEon Park <hermet@hermet.pe.kr> Hermet <hermet@hermet.pe.kr>
-ChunEon Park <hermet@hermet.pe.kr> chuneon.park <chuneon.park@samsung.com>
 David Walter Seikel <onefang@gmail.com> David Walter Seikel <won_fang@yahoo.com.au>
 Rafael Antognolli <antognolli@gmail.com> Rafael Antognolli <rafael.antognolli@intel.com>
 Rafael Antognolli <antognolli@gmail.com> Rafael Antognolli <rafael.antognolli@linux.intel.com>
 Iván Briano <sachieru@gmail.com> Ivan Briano <ivan.briano@intel.com>
 Iván Briano <sachieru@gmail.com> Ivan Briano <sachieru@gmail.com>
-Iván Briano <sachieru@gmail.com> Iván Briano <ivan.briano@intel.com>
-Iván Briano <sachieru@gmail.com> Ivan Briano <ivan@profusion.mobi>
 Lucas De Marchi <lucas.demarchi@profusion.mobi> Lucas De Marchi <lucas.de.marchi@gmail.com>
 Lucas De Marchi <lucas.demarchi@profusion.mobi> Lucas De Marchi <lucas.demarchi@intel.com>
 Jihoon Kim <imfine98@gmail.com> Jihoon Kim <jihoon48.kim@samsung.com>
 Stefan Schmidt <stefan@datenfreihafen.org> Stefan Schmidt <s.schmidt@samsung.com>
-Stefan Schmidt <stefan@datenfreihafen.org> Stefan Schmidt <stefan@osg.samsung.com>
 Jonas M. Gastal <jgastal@profusion.mobi> Jonas Gastal <jgastal@profusion.mobi>
 Daniel Juyung Seo <seojuyung2@gmail.com> Daniel Juyung Seo <juyung.seo@samsung.com>
 Daniel Juyung Seo <seojuyung2@gmail.com> Daniel Juyung Seo <seojuyung@gmail.com>
@ -71,29 +51,21 @@ Mike McCormack <mike@atratus.org> Mike McCormack <mj.mccormack@samsung.com>
 Mike McCormack <mike@atratus.org> Mike McCormack <mikem@ring3k.org>
 Mike McCormack <mike@atratus.org> Mike McCormack <mikem@atratus.org>
 Boris Faure <billiob@gmail.com> Boris 'billiob' Faure <billiob@gmail.com>
-Boris Faure <billiob@gmail.com> Boris Faure <boris@fau.re>
 Eduardo Lima <eduardo.lima@intel.com> Eduardo Lima (Etrunko) <eduardo.lima@intel.com>
 Panagiotis Galatsanos <galatsanosp@gmail.com> Godfath3r <galatsanosp@gmail.com>
 Samuel F. Baggen <thanatermesis@gmail.com> Thanatermesis <thanatermesis@gmail.com>
 Samuel F. Baggen <thanatermesis@gmail.com> Samuel F. Baggen <thanatermesis.elive@gmail.com>
 Samuel F. Baggen <thanatermesis@gmail.com> Thanatermesis <thanatermesis.ecvs@gmail.com>
-Jean Guyomarc'h <jeanguyomarch.github@gmail.com> Jean Guyomarc'h <jean.guyomarch@gmail.com>
-Jean Guyomarc'h <jeanguyomarch.github@gmail.com> Jean GUYOMARC'H <jean.guyomarch@gmail.com>
-Jean Guyomarc'h <jeanguyomarch.github@gmail.com> Jean Guyomarc'h <jean.guyomarch@openwide.fr>
-Jean Guyomarc'h <jeanguyomarch.github@gmail.com> Jean Guyomarc'h <jean@guyomarch.bzh>
-Marcel Hollerbach <mail@marcel-hollerbach.de> Marcel Hollerbach <marcel.hollerbach@stzedn.de>
-Marcel Hollerbach <mail@marcel-hollerbach.de> Marcel Hollerbach <marcel-hollerbach@t-online.de>
-Marcel Hollerbach <mail@marcel-hollerbach.de> Marcel Hollerbach <marcel@osg.samsung.com>
+Jean Guyomarc'h <jean.guyomarch@gmail.com> Jean GUYOMARC'H <jean.guyomarch@gmail.com>
+Marcel Hollerbach <marcel-hollerbach@t-online.de> Marcel Hollerbach <marcel.hollerbach@stzedn.de>
 Jean-Philippe ANDRÉ <jpeg@videolan.org> Jean-Philippe Andre <jp.andre@samsung.com>
 Jean-Philippe ANDRÉ <jpeg@videolan.org> Jean-Philippe ANDRE <jpeg@videolan.org>
 Jean-Philippe ANDRÉ <jpeg@videolan.org> Jean-Philippe Andre <jpeg@videolan.org>
-Jean-Philippe ANDRÉ <jpeg@videolan.org> Jean-Philippe André <jpeg@videolan.org>
 Amitesh Singh <amitesh.sh@samsung.com> Amitesh Singh <amitesh.sh@samsung.com>
 Amitesh Singh <amitesh.sh@samsung.com> ami <singh.amitesh@gmail.com>
 Amitesh Singh <amitesh.sh@samsung.com> Amitesh Singh <singh.amitesh@gmail.com>
 Tae-Hwan Kim <the81.kim@samsung.com> bluezery <ohpowel@gmail.com>
 Tae-Hwan Kim <the81.kim@samsung.com> Bluezery <ohpowel@gmail.com>
-Tae-Hwan Kim <the81.kim@samsung.com> bluezery <the81.kim@samsung.com>
 Daniel Kolesa <daniel@octaforge.org> q66 <quaker66@gmail.com>
 Daniel Kolesa <daniel@octaforge.org> q66 <d.kolesa@samsung.com>
 Daniel Kolesa <daniel@octaforge.org> q66 <d.kolesa@osg.samsung.com>
@ -107,55 +79,4 @@ Massimo Maiurana <maiurana@gmail.com> maxerba <maiurana@gmail.com>
 Lee Gwang-O <maeryo@live.co.kr> Gwang O Lee <pu8046@gmail.com>
 Thibaut Broggi <broggi_t@epitech.eu> broggi_t <broggi_t@epitech.eu>
 Daniel Zaoui <daniel.zaoui@samsung.com> Daniel Zaoui <daniel.zaoui@yahoo.com>
-Daniel Zaoui <daniel.zaoui@samsung.com> daniel.zaoui@samsung.com <daniel.zaoui@samsung.com>
 Jérémy Anger <angerj.dev@gmail.com> kidanger <angerj.dev@gmail.com>
-Andy Williams <andy@andywilliams.me> handyande <handyande>
-Andy Williams <andy@andywilliams.me> Andy Williams <andy@andywillias.me>
-Davide Andreoli <dave@gurumeditation.it> Dave Andreoli <dave@gurumeditation.it>
-Davide Andreoli <dave@gurumeditation.it> davemds <dave@gurumeditation.it>
-Simon Lees <simon@simotek.net> Simon <simon@simotek.net>
-Simon Lees <simon@simotek.net> Simon Lees (SUSE) <sflees@suse.de>
-Subhransu Mohanty <sub.mohanty@samsung.com> SubhransuSekhar Mohanty <sub.mohanty@samsung.com>
-Subhransu Mohanty <sub.mohanty@samsung.com> Subhransu Sekhar Mohanty <sub.mohanty@samsung.com>
-Subhransu Mohanty <sub.mohanty@samsung.com> SubhransuSekhar Mohanty <sub.mohanty@samsung.com>
-Subhransu Mohanty <sub.mohanty@samsung.com> sub.mohanty@samsung.com <sub.mohanty@samsung.com>
-Subhransu Mohanty <sub.mohanty@samsung.com> subhransu <subhransu@subhransu-System.(none)>
-Subhransu Mohanty <sub.mohanty@samsung.com> subhransu mohanty <sub.mohanty@samsung.com>
-Thiep Ha <thiepha@gmail.com> Thiep Ha <thiep.ha@samsung.com>
-Thiep Ha <thiepha@gmail.com> Thiep Ha <thiep.ha@gmail.com>
-Thiep Ha <thiepha@gmail.com> thiepha (Thiep Ha) <thiepha@gmail.com>
-Derek Foreman <derekf@osg.samsung.com> Derek Foreman <derek.foreman.samsung@gmail.com>
-Daniel Hirt <hirt.danny@gmail.com> Daniel Hirt <daniel.hirt@samsung.com>
-Jiyoun Park <jijibe99@gmail.com> Ji-Youn Park <jy0703.park@samsung.com>
-Jiyoun Park <jijibe99@gmail.com> Jiyoun Park <jy0703.park@samsung.com>
-Bruno da Silva Belo <brunodasilvabelo@gmail.com> Bruno da Silva Belo <bruno.belo@expertisesolutions.com.br>
-Rafael Fonseca <rfonseca@profusion.mobi> Rafael Fonseca <r4f4rfs@gmail.com>
-Lauro Moura <lauromoura@expertisesolutions.com.br> Lauro Moura <lauromoura@gmail.com>
-Jaehyun Cho <jae_hyun.cho@samsung.com> Jaehyun Cho <jae_hyun_cho@naver.com>
-Jérémy Zurcher <jeremy@asynk.ch> Jeremy Zurcher <jeremy@asynk.ch>
-Youngbok Shin <youngb.shin@samsung.com> Youngbok Shin <youngb.shin@samsung.net>
-Stephen 'Okra' Houston <smhouston88@gmail.com> Stephen okra Houston <smhouston88@gmail.com>
-Stephen 'Okra' Houston <smhouston88@gmail.com> Stephen Houston <smhouston88@gmail.com>
-Stephen 'Okra' Houston <smhouston88@gmail.com> Stephen Houston <stephen@localhost.localdomain>
-Stephen 'Okra' Houston <smhouston88@gmail.com> Stephen Houston <stephen@lenovo.fedora>
-Stephen 'Okra' Houston <smhouston88@gmail.com> Stephen Houston <stephen@stephen.laptop>
-WooHyun Jung <wh0705.jung@samsung.com> WooHyun Jung <woohyun0705@gmail.com>
-Jaeun Choi <jaeun12.choi@samsung.com> Jaeun Choi <jaeun_choi@naver.com>
-Michael BOUCHAUD <michael.bouchaud@gmail.com> Michael Bouchaud (yoz) <yoz@efl.so>
-Michael BOUCHAUD <michael.bouchaud@gmail.com> Michael Bouchaud <yoz@efl.so>
-Michael BOUCHAUD <michael.bouchaud@gmail.com> michael bouchaud <michael.bouchaud@gmail.com>
-Michael Jennings <mej@kainx.org> Michael Jennings <mej@lbl.gov>
-Taehyub Kim <taehyub.kim@samsung.com> taehyub <taehyub.kim@samsung.com>
-Yury Usishchev <y.usishchev@samsung.com> Yury Usischev <y.usishchev@samsung.com>
-Lukasz Stanislawski <l.stanislaws@samsung.com> Lukasz Stanislawski <l.stanislaws@AMDC2785.digital.local>
-Lukasz Stanislawski <l.stanislaws@samsung.com> Lukasz Stanislawski <lukasz.stanislawski@gmail.com>
-Ryuan Choi <ryuan.choi@gmail.com> Ryuan Choi <ryuan.choi@samsung.com>
-Bryce Harrington <bryce@osg.samsung.com> Bryce Harrington <bryce@bryceharrington.org>
-Jonathan Atton <jonathan.atton@gmail.com> Atton Jonathan <jonathan.atton@gmail.com>
-Yeongjong Lee <yj34.lee@samsung.com> YeongJong Lee <yj34.lee@samsung.com>
-Jaehwan Kim <jae.hwan.kim@samsung.com> Jaehwan Kim <jae.hwan.kim.neo@gmail.com>
-Jaehwan Kim <jae.hwan.kim@samsung.com> Jae Hwan Kim <jae.hwan.kim@samsung.com>
-Jaehwan Kim <jae.hwan.kim@samsung.com> 김재환 <jae.hwan.kim@samsung.com>
-Jee-Yong Um <jc9.um@samsung.com> Jeeyong Um <jc9.um@samsung.com>
-Savio Sena <savio@expertisesolutions.com.br> Savio S. Machado <savio.sena@acm.org>
-Savio Sena <savio@expertisesolutions.com.br> Savio Sena <savio.sena@acm.org>
--- a/111
+++ b/111
@ -49,13 +49,12 @@ Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
 Patryk Kaczmarek <patryk.k@samsung.com>
 Igor Murzov <e-mail@date.by>
 Vladislav Brovko <v.brovko@samsung.com>
-Hermet Park <hermetpark@gmail.com>
+Hermet Park <hermet@hermet.pe.kr>
 Rajeev Ranjan (Rajeev) <rajeev.r@samsung.com> <rajeev.jnnce@gmail.com>
 Subodh Kumar <s7158.kumar@samsung.com>
 Michelle Legrand <legrand.michelle@outlook.com>
 Shilpa Singh <shilpa.singh@samsung.com> <shilpasingh.o@gmail.com>
-Prasoon Singh <prasoonsingh16@gmail.com>
- 
+
 Eet
 ---

@ -120,7 +119,7 @@ Jiyoun Park <jy0703.park@samsung.com>
 Myoungwoon Roy Kim(roy_kim) <myoungwoon.kim@samsung.com> <myoungwoon@gmail.com>
 Thierry el Borgi <thierry@substantiel.fr>
 Shilpa Singh <shilpa.singh@samsung.com> <shilpasingh.o@gmail.com>
-Hermet Park <hermetpark@gmail.com>
+Hermet Park <hermet@hermet.pe.kr>
 Christopher 'devilhorns' Michael <cpmichael1@comcast.net>
 Seungsoo Woo <om101.woo@samsung.com>
 Youness Alaoui <kakaroto@kakaroto.homelinux.net>
@ -150,25 +149,6 @@ Michelle Legrand <legrand.michelle@outlook.com>
 Romain Perier <romain.perier@openwide.fr>
 Subodh Kumar <s7158.kumar@samsung.com>

-Evas Generic Loaders
--------------------
-
-The Rasterman (Carsten Haitzler) <raster@rasterman.com>
-Christian Kreibich <cK@whoop.org>
-Vincent Torri <vtorri at univ-evry dot fr>
-Michael Bouchaud <michael.bouchaud@gmail.com>
-Fanina "cippp" Cristian <fancris3@gmail.com>
-Cedric BAIL <cedric.bail@free.fr>
-Jérémy Zurcher <jeremy@asynk.ch>
-Stefan Schmidt <stefan@datenfreihafen.org>
-Daniel Juyung Seo <seojuyung2@gmail.com>
-Doug Newgard <scimmia22@outlook.com>
-Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
-Alex-P. Natsios <drakevr@linuxteam.teilar.gr>
-Jihoon Kim <imfine98@gmail.com>
-Samuel F. Baggen <thanatermesis.elive@gmail.com>
-Sebastian Dransfeld <sd@tango.flipp.net>
-
 Ecore
 -----

@ -183,7 +163,7 @@ Yuri <da2001@hotmail.ru>
 Nicholas Curran <quasar@bigblue.net.au>
 Howell Tam <pigeon@pigeond.net>
 Nathan Ingersoll <rbdpngn@users.sourceforge.net>
-Andrew Williams <andy@eandywilliams.me>
+Andrew Elcock <andy@elcock.org>
 Kim Woelders <kim@woelders.dk>
 Sebastian Dransfeld <sd@tango.flipp.net>
 Simon Poole <simon.armlinux@themalago.net>
@ -215,7 +195,7 @@ Jihoon Kim <jihoon48.kim@samsung.com> <imfine98@gmail.com>
 PnB <Poor.NewBie@gmail.com>
 Daniel Juyung Seo <seojuyung2@gmail.com> <juyung.seo@samsung.com>
 Christopher 'devilhorns' Michael <cpmichael1@comcast.net>
-Hermet Park <hermetpark@gmail.com>
+Hermet Park <hermet@hermet.pe.kr>
 xlopez@igalia.com
 Rafael Antognolli <antognolli@profusion.mobi>
 Kim Yunhan <spbear@gmail.com>
@ -330,7 +310,7 @@ David Seikel <onefang at gmail.com>
 Mikael Sans <sans.mikael@gmail.com>
 Jérôme Pinot <ngc891@gmail.com>
 Rajeev Ranjan (Rajeev) <rajeev.r@samsung.com> <rajeev.jnnce@gmail.com>
-Hermet Park <hermetpark@gmail.com>
+Hermet Park <hermet@hermet.pe.kr>
 Kim Shinwoo <kimcinoo.efl@gmail.com>
 Michael Bouchaud (yoz) <michael.bouchaud@gmail.com>
 WooHyun Jung (woohyun) <woohyun0705@gmail.com>
@ -364,27 +344,6 @@ Leandro Dorileo <dorileo@profusion.mobi>
 Michael Bouchaud (yoz) <yoz@efl.so>
 Aymeric Dumaz <aymeric.dumaz@gmail.com>

-Emotion Generic VLC
---
-Cedric Bail <cedric.bail@free.fr>
-Hugo Camboulive <hugo.camboulive@zodiacaerospace.com>
-Leandro Dorileo <dorileo@profusion.mobi>
-Pierre Le Magourou <pierre.lemagourou@openwide.fr>
-Rafael Antognolli <antognolli@profusion.mobi>
-Sohyun Kim <anna1014.kim@samsung.com>
-Carsten Haitzler (Rasterman) <raster@rasterman.com>
-Davide Andreoli <dave@gurumeditation.it>
-Gustavo Sverzut Barbieri <barbieri@gmail.com>
-Stefan Schmidt <s.schmidt@samsung.com>
-Bruno Dilly <bdilly@profusion.mobi>
-Hermet Park <hermetpark@gmail.com>
-Daniel Juyung Seo <juyung.seo@samsung.com>
-Doug Newgard <scimmia22@outlook.com>
-Jerome Pinot <ngc891@gmail.com>
-Mike Blumenkrantz <zmike@samsung.com>
-Sebastian Dransfeld <sd@tango.flipp.net>
-Vincent Torri <vincent.torri@gmail.com>
-
 Ethumb
 ------
 Rafael Antognolli <antognolli@profusion.mobi>
@ -395,46 +354,6 @@ Jérôme Pinot <ngc891@gmail.com>
 EFL-C++
 -------
 Savio Sena <savio@expertisesolutions.com.br>
-Felipe Magno de Almeida <felipe@expertisesolutions.com.br>
-Vitor Sousa <vitorsousa@expertisesolutions.com.br>
-Lauro Moura <lauromoura@expertisesolutions.com.br>
-Jean-Philippe Andre <jp.andre@samsung.com>
-Luciana Magno de Almeida <luciana@expertisesolutions.com.br>
-Jaehyun Cho <jae_hyun.cho@samsung.com>
-Daniel Kolesa <quaker66@gmail.com>
-Vincent Torri <vtorri at univ-evry dot fr>
-Stefan Schmidt <stefan@datenfreihafen.org>
-Cedric BAIL <cedric.bail@free.fr>
-Xavi Artigas <xavierartigas@yahoo.es>
-YeongJong Lee <yj34.lee@samsung.com>
-Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
-Larry Lira <larry@expertisesolutions.com.br>
-WooHyun Jung (woohyun) <woohyun0705@gmail.com>
-Marcel Hollerbach <marcel-hollerbach@t-online.de>
-Daniel Zaoui <daniel.zaoui@samsung.com>
-Sanghyeon Lee <sh10233.lee@samsung.com>
-Thiep Ha <thiepha@gmail.com>
-Vinícius dos Santos Oliveira <vini.ipsmaker@expertisesolutions.com.br>
-Bryce Harrington <bryce@osg.samsung.com>
-Tom Hacohen <tom@stosb.com>
-Carsten Haitzler <raster@rasterman.com>
-Andrew Williams <andy@eandywilliams.me>
-Amitesh Singh <singh.amitesh@gmail.com> <amitesh.sh@samsung.com>
-
-EFL-C#
------
-
-Felipe Magno de Almeida <felipe@expertisesolutions.com.br>
-Vitor Sousa <vitorsousa@expertisesolutions.com.br>
-Lauro Moura <lauromoura@expertisesolutions.com.br>
-Jaehyun Cho <jae_hyun.cho@samsung.com>
-Xavi Artigas <xavierartigas@yahoo.es>
-Marcel Hollerbach <marcel-hollerbach@t-online.de>
-YeongJong Lee <yj34.lee@samsung.com>
-Daniel Kolesa <quaker66@gmail.com>
-Vincent Torri <vtorri at univ-evry dot fr>
-WooHyun Jung (woohyun) <woohyun0705@gmail.com>
-Jean-Philippe Andre <jp.andre@samsung.com>

 ELua
 ----
@ -460,7 +379,7 @@ Samsung SAIT <tbd>
 Brett Nash <nash@nash.id.au>
 Bruno Dilly <bdilly@profusion.mobi>
 Rafael Fonseca <rfonseca@profusion.mobi>
-Hermet Park <hermetpark@gmail.com>
+Hermet Park <hermet@hermet.pe.kr>
 Woohyun Jung <wh0705.jung@samsung.com>
 Jaehwan Kim <jae.hwan.kim@samsung.com>
 Wonguk Jeong <wonguk.jeong@samsung.com>
@ -716,19 +635,3 @@ Vitaliy Venzak <v.venzak@samsung.com>
 perepelits.m <perepelits.m@samsung.com>
 rustyBSD <rustyBSD@gmx.fr>
 Haifeng Deng <haifeng.deng@samsung.com>
-Alastair Poole <netstar@gmail.com>
-Marcel Hollerbach <marcel-hollerbach@t-online.de>
-Hermet Park <hermetpark@gmail.com>
-Jeeyong Um <conr2d@gmail.com>
-SooHye Shin <soohye.shin@samsung.com>
-Hosang Kim <hosang12.kim@samsung.com>
-Minkyu Kang <mk7.kang@samsung.com>
-Jinyong Park <j4939.park@samsung.com>
-Woochan Lee <wc0917.lee@samsung.com>
-Taehyub Kim <taehyub.kim@samsung.com>
-Sungtaek Hong <taxi2se@gmail.com>
-Bryce Harrington <bryce@osg.samsung.com>
-YeongJong Lee <yj34.lee@samsung.com>
-Bowon Ryu <bowon.ryu@samsung.com>
-Wonki Kim <wonki_.kim@samsung.com>
-Junsu Choi <jsuya.choi@samsung.com>
--- a/4
+++ b/4
@ -39,7 +39,9 @@ pieces of information you will need.

 Q. Do I need to make the source public of libraries or applications that I
 build on top of EFL?
-A. No
+A. No, UNLESS you use the escape library. Escape is GPL. This is ONLY
+needed for PS3 development, so unless you are doing this, it is not
+relevant.

 Q. Do I need to provide the source for EFL?
 A. Yes. In general you do. If you are shipping any of the binaries or
--- a/5
+++ b/5
@ -12,6 +12,7 @@ the licensing of such libraries is compatible with the libraries that
 use them and is not more restrictive).

 evil:            licenses/COPYING.BSD
+escape:          licenses/COPYING.GPL (used in PlayStation native)
 eina:            licenses/COPYING.LGPL
 emile:           licenses/COPYING.LGPL
 eet:             licenses/COPYING.BSD
@ -33,10 +34,6 @@ ethumb:          licenses/COPYING.LGPL
 eolian:          licenses/COPYING.BSD
 elua:            licenses/COPYING.BSD
 elementary:      licenses/COPYING.LGPL
-generic/evas:    licenses/COPYING.GPL (separate binary/executable)
-efl:             licenses/COPYING.LGPL
-csharp bindings: licenses/COPYING.ASL
-cxx bindings:    licenses/COPYING.ASL

 NOTE: If linked together, the result will be effectively be LGPL (or
 GPL if escape is used) due to license characteristics.
--- a/COPYING.images
+++ b/COPYING.images
@ -0,0 +1,9 @@
+Gesture Layer 2:
+  Illustrations provided by GestureWorks® (www.gestureworks.com)
+  Creative Commons Attribution Sharealike license v 3.0.
+  http://gestureworks.com/icons-fonts
+  http://creativecommons.org/licenses/by-sa/3.0/us/
+
+EFL Bluish-X icons theme (all the icons in data/elementary/themes/fdo):
+  GNU General Public License v3
+  see the README in data/elementary/themes/fdo for more info
--- a/1486
+++ b/1486
--- a/Makefile.am
+++ b/Makefile.am
@ -0,0 +1,501 @@
+ACLOCAL_AMFLAGS = -I m4
+AM_MAKEFLAGS = --no-print-directory
+AM_DISTCHECK_CONFIGURE_FLAGS = \
+--with-tests=regular
+
+SUBDIRS = src data config doc
+
+if HAVE_PO
+
+SUBDIRS += po
+
+endif
+
+MAINTAINERCLEANFILES = \
+Makefile.in \
+aclocal.m4 \
+compile \
+config.cache-env \
+config.guess \
+config.h.in \
+config.h.in~ \
+config.sub \
+configure \
+depcomp \
+install-sh \
+ltmain.sh \
+missing \
+m4/libtool.m4 \
+m4/lt~obsolete.m4 \
+m4/ltoptions.m4 \
+m4/ltsugar.m4 \
+m4/ltversion.m4
+
+EXTRA_DIST =  \
+m4/pkg_var.m4 \
+m4/ac_path_generic.m4 \
+m4/ecore_check_c_extension.m4 \
+m4/ecore_check_module.m4 \
+m4/efl_attribute.m4 \
+m4/efl_check_funcs.m4 \
+m4/efl_compiler.m4 \
+m4/efl_doxygen.m4 \
+m4/efl_path_max.m4 \
+m4/efl_threads.m4 \
+m4/eina_check.m4 \
+m4/eina_config.m4 \
+m4/eio_check_options.m4 \
+m4/evas_check_engine.m4 \
+m4/evas_check_loader.m4 \
+m4/evil_windows.m4 \
+m4/libgcrypt.m4 \
+m4/gcc_check_builtin.m4
+
+EXTRA_DIST += \
+README \
+AUTHORS \
+COPYING \
+COMPLIANCE \
+licenses/COPYING.LGPL \
+licenses/COPYING.GPL \
+licenses/COPYING.BSD \
+licenses/COPYING.SMALL \
+licenses/COPYING.FTL \
+licenses/COPYING.NGINX-MIT \
+old/ChangeLog.ecore \
+old/ChangeLog.edje \
+old/ChangeLog.eet \
+old/ChangeLog.eeze \
+old/ChangeLog.efreet \
+old/ChangeLog.eina \
+old/ChangeLog.eio \
+old/ChangeLog.embryo \
+old/ChangeLog.emotion \
+old/ChangeLog.escape \
+old/ChangeLog.ethumb \
+old/ChangeLog.evas \
+old/ChangeLog.evil \
+old/ChangeLog.evil.0 \
+old/NEWS.ecore \
+old/NEWS.edje \
+old/NEWS.eet \
+old/NEWS.eeze \
+old/NEWS.efreet \
+old/NEWS.eina \
+old/NEWS.eio \
+old/NEWS.embryo \
+old/NEWS.emotion \
+old/NEWS.escape \
+old/NEWS.ethumb \
+old/NEWS.evas \
+old/NEWS.evil \
+old/README.ecore \
+old/README.eldbus \
+old/README.edje \
+old/README.eet \
+old/README.eeze \
+old/README.efreet \
+old/README.eina \
+old/README.eio \
+old/README.embryo \
+old/README.emotion \
+old/README.ephysics \
+old/README.escape \
+old/README.ethumb \
+old/README.evas \
+old/README.evil \
+spec/efl.spec \
+pkgbuild/PKGBUILD \
+pkgbuild/efl.install
+
+if HAVE_FREEBSD
+pkgconfigdir = $(libdir)data/pkgconfig
+else
+pkgconfigdir = $(libdir)/pkgconfig
+endif
+
+pkgconfig_DATA =
+
+if HAVE_WINDOWS
+pkgconfig_DATA += pc/evil.pc
+endif
+
+if HAVE_PS3
+pkgconfig_DATA += pc/escape.pc
+endif
+
+pkgconfig_DATA += \
+pc/eina.pc \
+pc/eo.pc \
+pc/eolian.pc \
+pc/efl.pc \
+pc/emile.pc \
+pc/eet.pc \
+pc/evas.pc \
+pc/ecore.pc \
+pc/ecore-con.pc \
+pc/ecore-ipc.pc \
+pc/ecore-file.pc \
+pc/ecore-input.pc \
+pc/ecore-input-evas.pc \
+pc/ecore-imf.pc \
+pc/ecore-imf-evas.pc \
+pc/ecore-evas.pc \
+pc/ecore-avahi.pc \
+pc/ector.pc \
+pc/embryo.pc \
+pc/eio.pc \
+pc/eldbus.pc \
+pc/efreet.pc \
+pc/efreet-mime.pc \
+pc/efreet-trash.pc \
+pc/edje.pc \
+pc/emotion.pc \
+pc/ethumb.pc \
+pc/ethumb_client.pc \
+pc/elocation.pc \
+pc/elementary.pc
+
+if HAVE_CXX11
+pkgconfig_DATA += \
+pc/eina-cxx.pc \
+pc/evas-cxx.pc \
+pc/ecore-cxx.pc \
+pc/efl-cxx.pc \
+pc/eolian-cxx.pc \
+pc/edje-cxx.pc \
+pc/eet-cxx.pc \
+pc/eo-cxx.pc \
+pc/eio-cxx.pc \
+pc/elementary-cxx.pc
+endif
+
+if HAVE_ELUA
+pkgconfig_DATA += pc/elua.pc
+endif
+
+if HAVE_JS
+pkgconfig_DATA += \
+pc/eolian-js.pc \
+pc/efl-js.pc \
+pc/eo-js.pc \
+pc/eina-js.pc
+endif
+
+if BUILD_ENGINE_SOFTWARE_X11
+pkgconfig_DATA += pc/evas-software-x11.pc
+endif
+
+if BUILD_ENGINE_FB
+pkgconfig_DATA += pc/evas-fb.pc
+endif
+
+if BUILD_ENGINE_EGLFS
+pkgconfig_DATA += pc/evas-eglfs.pc
+endif
+
+if BUILD_ENGINE_BUFFER
+pkgconfig_DATA += pc/evas-software-buffer.pc
+endif
+
+if BUILD_ENGINE_GL_X11
+pkgconfig_DATA += pc/evas-opengl-x11.pc
+endif
+
+if BUILD_ENGINE_GL_SDL
+pkgconfig_DATA += pc/evas-opengl-sdl.pc
+endif
+
+if BUILD_ENGINE_GL_COCOA
+pkgconfig_DATA += pc/evas-opengl-cocoa.pc
+endif
+
+if BUILD_ENGINE_SOFTWARE_GDI
+pkgconfig_DATA += pc/evas-software-gdi.pc
+endif
+
+if BUILD_ENGINE_SOFTWARE_DDRAW
+pkgconfig_DATA += pc/evas-software-ddraw.pc
+endif
+
+if BUILD_ENGINE_PSL1GHT
+pkgconfig_DATA += pc/evas-psl1ght.pc
+endif
+
+if BUILD_ENGINE_WAYLAND_SHM
+pkgconfig_DATA += pc/evas-wayland-shm.pc
+endif
+
+if BUILD_ENGINE_WAYLAND_EGL
+pkgconfig_DATA += pc/evas-wayland-egl.pc
+endif
+
+if BUILD_ENGINE_DRM
+pkgconfig_DATA += pc/evas-drm.pc
+endif
+
+if HAVE_ECORE_COCOA
+pkgconfig_DATA += pc/ecore-cocoa.pc
+endif
+
+if HAVE_ECORE_FB
+pkgconfig_DATA += pc/ecore-fb.pc
+endif
+
+if HAVE_ECORE_DRM
+pkgconfig_DATA += pc/ecore-drm.pc
+endif
+
+if HAVE_PS3
+pkgconfig_DATA += pc/ecore-psl1ght.pc
+endif
+
+if HAVE_ECORE_SDL
+pkgconfig_DATA += pc/ecore-sdl.pc
+endif
+
+if HAVE_ECORE_WAYLAND
+pkgconfig_DATA += pc/ecore-wayland.pc
+endif
+
+if HAVE_ECORE_WL2
+pkgconfig_DATA += pc/ecore-wl2.pc
+endif
+
+if HAVE_WIN32
+pkgconfig_DATA += pc/ecore-win32.pc
+endif
+
+if HAVE_ECORE_X
+pkgconfig_DATA += pc/ecore-x.pc
+endif
+
+if HAVE_EEZE
+pkgconfig_DATA += pc/eeze.pc
+endif
+
+if HAVE_EPHYSICS
+pkgconfig_DATA += pc/ephysics.pc
+endif
+
+if HAVE_ECORE_AUDIO
+pkgconfig_DATA += pc/ecore-audio.pc pc/ecore-audio-cxx.pc
+endif
+
+if HAVE_ECORE_BUFFER
+pkgconfig_DATA += pc/ecore-buffer.pc
+endif
+
+if HAVE_ELPUT
+pkgconfig_DATA += pc/elput.pc
+endif
+
+# Cmake configs:
+efl_cmakeconfigdir = $(libdir)/cmake/Efl/
+efl_cmakeconfig_DATA = \
+cmakeconfig/EflConfig.cmake \
+cmakeconfig/EflConfigVersion.cmake
+
+eina_cmakeconfigdir = $(libdir)/cmake/Eina/
+eina_cmakeconfig_DATA = \
+cmakeconfig/EinaConfig.cmake \
+cmakeconfig/EinaConfigVersion.cmake
+
+eio_cmakeconfigdir = $(libdir)/cmake/Eio/
+eio_cmakeconfig_DATA = \
+cmakeconfig/EioConfig.cmake \
+cmakeconfig/EioConfigVersion.cmake
+
+eeze_cmakeconfigdir = $(libdir)/cmake/Eeze/
+eeze_cmakeconfig_DATA = \
+cmakeconfig/EezeConfig.cmake \
+cmakeconfig/EezeConfigVersion.cmake
+
+eo_cmakeconfigdir = $(libdir)/cmake/Eo/
+eo_cmakeconfig_DATA = \
+cmakeconfig/EoConfig.cmake \
+cmakeconfig/EoConfigVersion.cmake
+
+eolian_cmakeconfigdir = $(libdir)/cmake/Eolian/
+eolian_cmakeconfig_DATA = \
+cmakeconfig/EolianConfig.cmake \
+cmakeconfig/EolianConfigVersion.cmake \
+cmakeconfig/EolianHelper.cmake
+
+eolian_cxx_cmakeconfigdir = $(libdir)/cmake/EolianCxx/
+eolian_cxx_cmakeconfig_DATA = \
+cmakeconfig/EolianCxxConfig.cmake \
+cmakeconfig/EolianCxxConfigVersion.cmake
+
+eina_cxx_cmakeconfigdir = $(libdir)/cmake/EinaCxx/
+eina_cxx_cmakeconfig_DATA = \
+cmakeconfig/EinaCxxConfig.cmake \
+cmakeconfig/EinaCxxConfigVersion.cmake
+
+eo_cxx_cmakeconfigdir = $(libdir)/cmake/EoCxx/
+eo_cxx_cmakeconfig_DATA = \
+cmakeconfig/EoCxxConfig.cmake \
+cmakeconfig/EoCxxConfigVersion.cmake
+
+ecore_cxx_cmakeconfigdir = $(libdir)/cmake/EcoreCxx/
+ecore_cxx_cmakeconfig_DATA = \
+cmakeconfig/EcoreCxxConfig.cmake \
+cmakeconfig/EcoreCxxConfigVersion.cmake
+
+evas_cxx_cmakeconfigdir = $(libdir)/cmake/EvasCxx/
+evas_cxx_cmakeconfig_DATA = \
+cmakeconfig/EvasCxxConfig.cmake \
+cmakeconfig/EvasCxxConfigVersion.cmake
+
+eet_cxx_cmakeconfigdir = $(libdir)/cmake/EetCxx/
+eet_cxx_cmakeconfig_DATA = \
+cmakeconfig/EetCxxConfig.cmake \
+cmakeconfig/EetCxxConfigVersion.cmake
+
+eet_cmakeconfigdir = $(libdir)/cmake/Eet/
+eet_cmakeconfig_DATA = \
+cmakeconfig/EetConfig.cmake \
+cmakeconfig/EetConfigVersion.cmake
+
+evas_cmakeconfigdir =  $(libdir)/cmake/Evas/
+evas_cmakeconfig_DATA = \
+cmakeconfig/EvasConfig.cmake \
+cmakeconfig/EvasConfigVersion.cmake
+
+ecore_cmakeconfigdir =  $(libdir)/cmake/Ecore/
+ecore_cmakeconfig_DATA = \
+cmakeconfig/EcoreConfig.cmake \
+cmakeconfig/EcoreConfigVersion.cmake
+
+edje_cmakeconfigdir =  $(libdir)/cmake/Edje/
+edje_cmakeconfig_DATA = \
+cmakeconfig/EdjeConfig.cmake \
+cmakeconfig/EdjeConfigVersion.cmake
+
+eldbus_cmakeconfigdir = $(libdir)/cmake/Eldbus/
+eldbus_cmakeconfig_DATA = \
+cmakeconfig/EldbusConfig.cmake \
+cmakeconfig/EldbusConfigVersion.cmake
+
+efreet_cmakeconfigdir =  $(libdir)/cmake/Efreet/
+efreet_cmakeconfig_DATA = \
+cmakeconfig/EfreetConfig.cmake \
+cmakeconfig/EfreetConfigVersion.cmake
+
+ethumb_cmakeconfigdir =  $(libdir)/cmake/Ethumb/
+ethumb_cmakeconfig_DATA = \
+cmakeconfig/EthumbConfig.cmake \
+cmakeconfig/EthumbConfigVersion.cmake
+
+ethumbclient_cmakeconfigdir =  $(libdir)/cmake/EthumbClient/
+ethumbclient_cmakeconfig_DATA = \
+cmakeconfig/EthumbClientConfig.cmake \
+cmakeconfig/EthumbClientConfigVersion.cmake
+
+cmakeconfigdir = $(libdir)/cmake/Elementary
+cmakeconfig_DATA = \
+cmakeconfig/ElementaryConfig.cmake \
+cmakeconfig/ElementaryConfigVersion.cmake
+
+emotion_cmakeconfigdir =  $(libdir)/cmake/Emotion/
+emotion_cmakeconfig_DATA = \
+cmakeconfig/EmotionConfig.cmake \
+cmakeconfig/EmotionConfigVersion.cmake
+
+elua_cmakeconfigdir = $(libdir)/cmake/Elua
+elua_cmakeconfig_DATA = \
+cmakeconfig/EluaConfig.cmake \
+cmakeconfig/EluaConfigVersion.cmake
+
+emile_cmakeconfigdir = $(libdir)/cmake/Emile
+emile_cmakeconfig_DATA = \
+cmakeconfig/EmileConfig.cmake \
+cmakeconfig/EmileConfigVersion.cmake
+
+# D-Bus services:
+
+servicedir = @dbusservicedir@
+service_DATA = \
+dbus-services/org.enlightenment.Ethumb.service
+
+if HAVE_SYSTEMD_USER_SESSION
+systemdunitsdir = @USER_SESSION_DIR@
+systemdunits_DATA = \
+systemd-services/ethumb.service
+endif
+EXTRA_DIST += $(systemdunits_DATA)
+
+
+.PHONY: doc benchmark examples install-examples
+
+# Documentation
+
+doc:
+	@echo "entering doc/"
+	$(MAKE) $(AM_MAKEFLAGS) -C doc doc
+
+# Unit tests
+
+if EFL_ENABLE_COVERAGE
+
+lcov-reset:
+	@rm -rf $(top_builddir)/coverage
+	@find $(top_builddir) -name "*.gcda" -delete
+	@lcov --zerocounters --directory $(top_builddir)
+
+lcov-baseline:
+	$(MKDIR_P) $(top_builddir)/coverage
+	lcov --capture --initial --compat-libtool --no-external --output-file $(top_builddir)/coverage/coverage-baseline.info --directory $(top_builddir) --config-file .lcov-config --rc lcov_branch_coverage=1
+
+lcov-report:
+	lcov --capture --compat-libtool --no-external --output-file $(top_builddir)/coverage/coverage-check.info --directory $(top_builddir) --config-file .lcov-config --rc lcov_branch_coverage=1
+	lcov --no-external --compat-libtool --add-tracefile $(top_builddir)/coverage/coverage-baseline.info --add-tracefile $(top_builddir)/coverage/coverage-check.info --output-file $(top_builddir)/coverage/coverage.info --config-file .lcov-config --rc lcov_branch_coverage=1
+	lcov --no-external --compat-libtool --remove $(top_builddir)/coverage/coverage.info '*.h' --output-file $(top_builddir)/coverage/coverage.cleaned.info --config-file .lcov-config --rc lcov_branch_coverage=1
+	lcov --no-external --compat-libtool --remove $(top_builddir)/coverage/coverage.cleaned.info '*/tests/*' --output-file $(top_builddir)/coverage/coverage.cleaned2.info --config-file .lcov-config --rc lcov_branch_coverage=1
+	lcov --no-external --compat-libtool --remove $(top_builddir)/coverage/coverage.cleaned2.info '*NONE*' --output-file $(top_builddir)/coverage/coverage.cleaned3.info --config-file .lcov-config --rc lcov_branch_coverage=1
+	lcov --no-external --compat-libtool --remove $(top_builddir)/coverage/coverage.cleaned3.info '*/doc/*' --output-file $(top_builddir)/coverage/coverage.cleaned4.info --config-file .lcov-config --rc lcov_branch_coverage=1
+	lcov --no-external --compat-libtool --remove $(top_builddir)/coverage/coverage.cleaned4.info '*usr/include*' --output-file $(top_builddir)/coverage/coverage.cleaned5.info --config-file .lcov-config --rc lcov_branch_coverage=1
+	genhtml --config-file .lcov-config --legend -t "$(PACKAGE_STRING)" -o $(top_builddir)/coverage/html $(top_builddir)/coverage/coverage.cleaned5.info
+	@echo "Coverage Report at $(top_builddir)/coverage/html"
+
+endif
+
+if EFL_ENABLE_TESTS
+
+lcov-check:
+if EFL_ENABLE_COVERAGE
+	@$(MAKE) $(AM_MAKEFLAGS) lcov-reset
+	@$(MAKE) $(AM_MAKEFLAGS) lcov-baseline
+endif
+	@$(MAKE) $(AM_MAKEFLAGS) check
+if EFL_ENABLE_COVERAGE
+	@$(MAKE) $(AM_MAKEFLAGS) lcov-report
+endif
+
+check-build:
+	@$(MAKE) $(AM_MAKEFLAGS) -C src check-build
+endif
+
+# benchmark
+
+benchmark:
+	@$(MAKE) $(AM_MAKEFLAGS) -C src benchmark
+	$(MKDIR_P) benchmark
+	@cd benchmark && ../src/benchmarks/eo/eo_bench$(EXEEXT) `date +%F_%s`
+
+# examples
+
+examples:
+	@$(MAKE) $(AM_MAKEFLAGS) -C src examples
+
+install-examples:
+	@$(MAKE) $(AM_MAKEFLAGS) -C src install-examples
+
+pkgbuild::
+	@echo "making arch packages"
+	makepkg -f -p $(top_builddir)/pkgbuild/PKGBUILD
+
+# cleaning
+
+clean-local:
+	rm -rf benchmark coverage
--- a/Makefile_Elm_Helpers.am
+++ b/Makefile_Elm_Helpers.am
@ -0,0 +1,21 @@
+if HAVE_ELM_PREFS_CC
+ELM_PREFS_CC = @elm_prefs_cc@
+else
+ELM_PREFS_CC = $(top_builddir)/src/bin/elementary/elm_prefs_cc
+endif
+
+AM_V_EPB = $(am__v_EPB_@AM_V@)
+am__v_EPB_ = $(am__v_EPB_@AM_DEFAULT_V@)
+am__v_EPB_0 = @echo "  EPB     " $@;
+
+if HAVE_ELEMENTARY_CODEGEN
+ELEMENTARY_CODEGEN = @elementary_codegen@
+else
+ELEMENTARY_CODEGEN = $(top_builddir)/src/bin/elementary/elementary_codegen
+endif
+
+AM_V_CODEGEN = $(am__v_CODEGEN_@AM_V@)
+am__v_CODEGEN_ = $(am__v_CODEGEN_@AM_DEFAULT_V@)
+am__v_CODEGEN_0 = @echo "  CODEGEN     " $@;
+
+
--- a/2891
+++ b/2891
--- a/31
+++ b/31
@ -0,0 +1,31 @@
+Evas_VG_Color_List
+  - List of color
+
+Evas_VG_Gradient
+  gradient_type_set (radial, linear)
+  color_list_set
+  point_set (i, x, y)
+
+Evas_VG_Fill
+  - abstract
+
+Evas_VG_Root_Node (only one at the top, Evas_VG_Container)
+
+Evas_VG_Shape
+  fill
+  stroke_scale
+  stroke_color
+  stroke_fill
+  stroke_width
+  stroke_location
+  stroke_dash(length[], gap[])
+  stroke_marker(Evas_VG_Shape *)
+  stroke_cap
+  stroke_join
+
+Evas_VG_Filter
+  ??
+
+bounds_get -> Evas_VG_Node
+
+Eina_Matrix3
--- a/667
+++ b/667
@ -0,0 +1,667 @@
+EFL
+===
+
+******************************************************************************
+ FOR ANY ISSUES PLEASE EMAIL:
+ enlightenment-devel@lists.sourceforge.net
+******************************************************************************
+
+EFL is a collection of libraries for handling many common tasks a
+developer may have such as data structures, communication, rendering,
+widgets and more.
+
+There are many components inside EFL. They also build various things
+like shared libraries, loadable plug-in modules and also binary
+executables. Different elements will end up being licensed differently
+too. Below is a rundown of the components, what they do and their
+licensing.
+
+All library source is in the src/lib/ directory. All binaries are in
+src/bin/. All loadable modules are in src/modules/. All data files are
+in the data/ directory. Licensing details are listed in COPYING and
+the licenses/ directory. The pc/ directory holds all the Package
+Config files installed to help developers build against EFL.
+
+For more documentation please see:
+
+http://www.enlightenment.org/p.php?p=docs
+
+
+
+COMPONENTS
+----------
+
+**Ecore:**
+
+//BSD 2-Clause license//
+
+This is the core main-loop, system events and execution layer. This
+handles running the main loop, integrating with external data and
+timing sources (the system clock, file descriptors, system signals),
+and producing an event queue, walking that queue and dispatching
+events to appropriate callbacks.
+
+
+
+**Ecore Audio:**
+
+//BSD 2-Clause license//
+
+This library provides an API for audio playback and recording. It uses
+pulse audio underneath to handle mixing and policies. The API for this
+should not be considered stable right now because it relies on EO and
+EO is not considered finalized yet.
+
+
+
+**Ecore Cocoa:**
+
+//BSD 2-Clause license//
+
+This provides wrappers/abstractions around Max OS-X Cocoa APIs to help
+Mac porting.
+
+
+
+**Ecore Con:**
+
+//BSD 2-Clause license//
+
+This provides a completely event-based TCP/UDP and Unix domain socket
+API that integrates with the main-loop. This means no blocking to send
+or receive data, supporting "infinite send buffers" with storage and
+spooling being done by Ecore Con. It also supports SSL encryption
+transparently turned on or not on the same connection, certificate
+verification, CURL wrapping for HTTP connection usage (GETs, POSTs
+etc.), asynchronous DNS lookups and provides the ability to also be a
+server, not just a client, with the same event-based API.
+
+
+
+**Ecore Evas:**
+
+//BSD 2-Clause license//
+
+This acts as glue between the display target (X11, Wayland,
+Frame buffer, Cocoa on OSX, Win32 etc.) and Evas. It creates/provides a
+target for Evas to render to (a Window or Surface etc.) and feeds
+input events (Keyboard, Mouse, Multi-touch) into Evas, which then
+selects the target object and calls the callbacks. It also provides
+wrappers/glue for manipulating the Window/Surface.
+
+
+
+**Ecore Fb:**
+
+//BSD 2-Clause license//
+
+This provides virtual terminal allocation, access and handling,
+frame buffer information, raw input handling for keyboard, mouse and
+touch (via tslib).
+
+
+
+**Ecore File:**
+
+//BSD 2-Clause license//
+
+This provides file access convenience APIs for doing simple file
+operations like renames, copies, listing directories and more. It also
+supports file change monitoring and URL downloads.
+
+
+
+**Ecore IMF:**
+
+//BSD 2-Clause license//
+
+This is an input method abstraction framework to allow EFL to talk to
+things like SCIM, IBus, Wayland and XIM. This allows for complex text
+entry in languages such as Chinese, Japanese and Korean.
+
+
+
+**Ecore IMF Evas:**
+
+//BSD 2-Clause license//
+
+This library glues Input method support from Ecore IMF and Evas
+together.
+
+
+
+**Ecore Input:**
+
+//BSD 2-Clause license//
+
+This acts as a generic input layer where multiple display systems can
+post events in the same format to the event queue.
+
+
+
+**Ecore Input Evas:**
+
+//BSD 2-Clause license//
+
+This Routes events from Ecore Input into a given Evas canvas which
+will then route the event further to the destination object and
+callbacks.
+
+
+
+**Ecore IPC:**
+
+//BSD 2-Clause license//
+
+This acts as a layer on top of Ecore Con which handles entire IPC
+message packets, dealing with header delta compression and
+portability, as well as ensuring an entire message is received in one
+go as a single IPC message, regardless of payload data size. The
+entire API is event based almost exactly like Ecore Con and thus it
+supports all the transport layers Ecore Con supports.
+
+
+
+**Ecore Psl1ght:**
+
+//BSD 2-Clause license//
+
+This library acts as a helper for porting to the Playstation 3 (PS3)
+native runtime environment.
+
+
+
+**Ecore SDL:**
+
+//BSD 2-Clause license//
+
+This acts as a wrapper/glue around SDL to handle SDL Windows as well
+as input events from SDL and tie them to the Ecore main-loop and event
+queue.
+
+
+
+**Ecore Wayland:**
+
+//BSD 2-Clause license//
+
+This is a glue/wrapper library to interface EFL to Wayland libraries
+to tie them into the Ecore main-loop and event queue.
+
+
+
+**Ecore Win32:**
+
+//BSD 2-Clause license//
+
+This acts as glue/wrapper around Windows Win32 APIs to tie them into
+the Ecore main-loop and event queue.
+
+
+
+**Ecore WinCE:**
+
+//BSD 2-Clause license//
+
+This acts as glue/wrapper around Windows CE APIs to tie them into the
+Ecore main-loop and event queue.
+
+
+
+**Ecore X:**
+
+//BSD 2-Clause license//
+
+This is a library to wrap/deal with Xlib as well as optionally XCB to
+make dealing with X11 less painful and less footwork as well as being
+glue to tie these into the Ecore main-loop and event queue.
+
+
+
+**Edje:**
+
+//BSD 2-Clause license// (except the epp binary which is GPLv2)
+
+This is a graphics event, input, theme, animation and theme
+abstraction library used to place many UI/UX elements into data files
+(called edj files) that define how to react to incoming
+events/signals, and define animation time lines, states, relative
+scalable layout and much much more. It comes with a compiler that
+compiles source "edc" files into "edj" files (which are actually just
+data files managed by Eet). These "edj" files are fully portable and
+can work on any OS/Architecture just like a JPEG or PNG might be
+portable.
+
+
+
+**Eet:**
+
+//BSD 2-Clause license//
+
+This library is a data storage, encoding and decoding library
+designed to be extremely compact, fast and easy to use. It can take
+data structures directly from memory and serialize them portably to
+disk, then de-serialize them right back to the same data structures in
+memory, handling allocation and population of memory all for you in 1
+call. It handles indirections such as pointers, linked lists, arrays
+and hash tables too, so almost any level of data structure complexity
+can be easily saved and loaded back. It is used for "edj" files by
+Edje as well as all configuration in Enlightenment, Elementary and
+Terminology. It supports encryption of data too via SSL, signing of
+files, as well as various compression techniques. It also supports
+encoding and decoding of image data in lossless or lossy form.
+
+
+
+**Eeze:**
+
+//BSD 2-Clause license//
+
+This library acts as an abstraction to discovering hardware interfaces
+for sensors as well as removable media and much more.
+
+
+
+**EFL:**
+
+//BSD 2-Clause license//
+
+This is just some core common header data like a common version number
+for EFL and how to expose the EO API.
+
+
+
+**Efreet:**
+
+//BSD 2-Clause license//
+
+This library provides code for handling Freedesktop.org standards such
+as .desktop files, XDG Menus, Icon search paths and more. It provides
+a central daemon to handle monitoring for changes that the library
+talks to, and the daemon handles updating local cache files the
+library reads.
+
+
+
+**Eina:**
+
+//LGPL v2 license//
+
+This library provides low-level routines for common things like linked
+lists, hash tables, growable arrays, basic string buffers, shared
+string tokens, mmaped() file access, thread abstraction and locking,
+memory pools, copy-on-write segments, iterators, matrices, general
+data models, red/black trees, quad-trees, a simple SAX XML parser and
+more.
+
+
+
+**EIO:**
+
+//LGPL v2 license//
+
+This is an asynchronous I/O library for doing disk I/O without blocking.
+
+
+
+**ElDBus:**
+
+//LGPL v2 license//
+
+This is a DBus access library to allow you to create DBus services as
+well as clients. This glues in DBus into the main-loop so all access is
+asynchronous.
+
+
+
+**Embryo:**
+
+//Small license (same as ZLib license)//
+
+This is a small C-like language compiler and byte-code interpreter
+library. This is used for scripting in Edje. The code is based on
+original source from the Pawn/Small Language but has been made
+portable (endianness issues fixed) and 64bit issues fixed, with the
+runtime library being refactored to be extremely small.
+
+
+
+**Emotion:**
+
+//BSD 2-Clause license//
+
+This is a wrapper around Gstreamer and/or Xine and/or external
+pluggable decoder binaries (generic binaries provided by Emotion
+Generic Players or any suitable drop-in replacement). This glues in
+the decoder library, and its output into a smart Evas object that will
+display the playback for you as the video plays, as well as providing
+higher level controls to seek, play, pause and query the stream
+regardless of the back-end used. Note that using the Xine module may
+effectively make this library GPL v2, so be aware of that before
+turning that on.
+
+
+
+**EO:**
+
+//BSD 2-Clause license//
+
+This is a core object system API that EFL 1.8 and on depend on. The
+API is not finalized, so do not depend on it yet in EFL 1.8, but
+future EFL versions will lock it down.
+
+This object system does simple and multiple inheritance, refcounting,
+strong and weak references, auto-deletion of child objects, unifies
+callback handling with a single path, and also abstracts object
+pointers to be indirect table lookups for increased safety at runtime.
+
+
+
+**EPhysics:**
+
+//BSD 2-Clause license//
+
+This library provides a wrapper around the Bullet physics library,
+allowing for it to be linked directly with Evas objects and control
+their behavior as if they were real physical objects.
+
+
+
+**Escape:**
+
+//GPL v2 license//
+
+This library is used as a compatibility library to provide missing
+libc APIs for porting to the Playstation 3 (PS3) native runtime
+environment.
+
+
+
+**Ethumb:**
+
+//LGPL v2 license//
+
+This library provides core API for a thumbnailing daemon as well as
+the thumbnail daemon itself. Ethumb Client talks with Ethumb to pass
+off thumbnail generation to a central location to be done
+asynchronously.
+
+
+
+**Ethumb Client:**
+
+//LGPL v2 license//
+
+This is the client-side part of Ethumb that provides an API for
+clients to request the Ethumb thumbnailer to generate or find cached
+thumbnails of files.
+
+
+
+**Evas:**
+
+//BSD 2-Clause license//
+
+This is the core rendering and scene graph abstraction library for
+EFL. It manages a stateful 2D scene graph that defines the entire
+content of any canvas. This supplies rendering back-ends for many
+display systems like X11, Windows, Wayland, Frame-buffer etc. and via
+many rendering APIs like OpenGL, OpenGL-ES 2, and pure software
+implementations that are fast and accurate.
+
+
+
+**Evil:**
+
+//BSD 2-Clause license//
+
+This library acts as a porting library for Windows to provide missing
+libc calls not in Mingw32 that EFL needs.
+
+
+
+
+COMPILING AND INSTALLING
+------------------------
+
+    ./configure
+    make
+    sudo make install
+
+If you have doxygen, then you csan build documentation with:
+
+    make doc
+
+You will find documentation in the doc/ directory.
+
+
+REQUIREMENTS
+------------
+
+EFL requires a C and C++ compiler by default. C++ exists mostly to interface 
+to C++ libraries like Bullet and our C++ bindings.
+
+Required by default:
+
+  * bullet
+  * libpng
+  * libjpeg
+  * gstreamer (1.x) (ensure all codecs you want are installed. 0.10 optional)
+  * zlib
+  * luajit (lua 5.1 or 5.2 optional support)
+  * libtiff
+  * openssl
+  * curl
+  * dbus
+  * libc
+  * fontconfig
+  * freetype2
+  * fribidi
+  * libpulse
+  * libsndfile
+  * libx11
+  * libxau
+  * libxcomposite
+  * libxdamage
+  * libxdmcp
+  * libxext
+  * libxfixes
+  * libxinerama
+  * libxrandr
+  * libxrender
+  * libxss
+  * libxtst
+  * libxcursor
+  * libxp
+  * libxi
+  * libgl (opengl/glx or opengl-es2/egl)
+  * giflib
+  * util-linux (limbount + libblkid)
+  * systemd / libudev
+
+Recommended requirements (highly recommended):
+
+  * harfbuzz
+  * libxi (2.2 or newer)
+  * systemd
+  * libwebp
+
+Enable these with configure options:
+
+    --enable-xinput22 \
+    --enable-systemd \
+    --enable-image-loader-webp \
+    --enable-harfbuzz
+
+After you install EFL it is **HIGHLY** recommended to install the Evas
+Generic Loaders package and Emotion Generic Players too. These provide
+external binaries, that are either unstable or GPL licensed that are
+just drop-in utilities for handling image and video codecs. They can
+be added or removed at any time (even runtime) so they could be
+replaced or augmented with other drop-in binaries that do the same job
+and talk the same simple stdin/out and shared memory protocol.
+
+
+COMPILER FLAGS
+--------------
+
+You can affect compilation optimization, debugging and other factors
+by setting your CFLAGS environment variable (and CXXFLAGS). Be aware
+that to ensure ABI stability you should use the exact same CFLAGS / 
+CXXFLAGS for all the build of EFL and any applications/libraries that
+depend on them.
+
+Other recommendations:
+
+  * scim
+
+Enable this with:
+
+    --enable-scim
+
+Framebuffer support:
+
+This requires linux frame-buffer support, headers etc. This supports
+basic frame-buffers like /dev/fb as well as input via /dev/input for
+keyboards and mice in a basic way. Enable this with:
+
+    --enable-fb
+
+This also turns on support for touch-screens via tslib. Not everyone
+has tslib, so you may want to disable it with:
+
+    --disable-tslib
+
+You likely don't need static libraries most of the time so you can
+disable them with:
+
+    --disable-static
+
+You may want to change the install prefix for EFL with:
+
+    --prefix=/path/to/prefix
+
+The default prefix if not given is "/usr/local". Many people like to
+use prefixes like /opt/e or /opt/efl or /home/USERNAME/software etc.
+
+You may want to enable valgrind support if you plan on doing debugging
+with EFL or apps built on top of EFL. This requires an install of
+valgrind first. You can enable this with:
+
+    --enable-valgrind
+
+You may want to enable xine support in emotion, as this library
+provides fairly solid support for a lot of codecs and DVD navigation
+support and more. You can enable it with:
+
+    --enable-xine
+
+Wayland is also supported fairly solidly in EFL 1.8. It is not
+required by default due to it being new and not that widely spread.
+You can enable Wayland support with:
+
+    --enable-wayland
+
+For faster rendering when dithering down to lower-than 24/32bpp, you
+can try:
+
+    --with-evas-dither-mask=small
+
+But this will drop quality slightly, using a small 16x16 ordered
+dither mask rather than the default 128x128. This should save a little
+memory too in the binary size of Evas.
+
+There are many other configure options that can be used, but in
+general it is not a good idea to go enabling or disabling things
+unless you wish to break things. The defaults are well tested, with
+the above recommended options also being well tested. Go much further
+and your mileage may vary wildly. Disabling features is a good way of
+breaking EFL functionality, so it is not recommended. The defaults
+have been carefully considered to provide full functionality so users
+will not be missing anything.
+
+
+VALGRIND DEPENDENCY
+-------------------
+
+EFL uses the concept of memory pools (mempool) and this will confuse
+valgrind memcheck tool. By using memory pool, the memory is still
+owned by EFL, then valgrind won't alert on memory leaks or use of
+unused memory. EFL will use memcheck.h from valgrind to declare its
+memory pools to valgrind, producing better debugging results.
+
+However valgrind is only available to limited platforms, making it 
+hard for us to declare it a mandatory requirement. Based on
+--with-profile={dev,debug} valgrind will be used if available or will
+be issued a warning. You can force valgrind with --enable-valgrind, or
+disable it and the warning with --disable-valgrind.
+
+EFL does NOT link to valgrind libraries. Then there is NO runtime
+dependency on valgrind.
+
+
+BULLET PHYSICS DEPENDENCY
+-------------------------
+
+EFL comes with EPhysics (a physics wrapper library) enabled by
+default. To build it the user must have BulletPhysics engine installed.
+
+More information about BulletPhysics can be obtained in the upstream project
+web site at http://bulletphysics.org
+
+We have received many reports about BulletPhysics installation and distros
+packages in bad shape, some without even a package. If your distro doesn't
+ship a BulletPhysics package or you want to build it from source code follow
+the instructions below:
+
+**Required Packages:**
+
+You should have cmake installed. Bullet comes with autotools and cmake build
+systems, do not use the autotools alternative, it's unstable, bogus and hasn't
+been maintained for quite some time.
+
+**Download the tarball from:**
+
+http://code.google.com/p/bullet/downloads/list
+
+**NOTE:**
+
+The current supported version is 2.80 or greater.
+
+**Compiling and Installing:**
+
+Uncompress it to (say) ~/bullet and:
+
+    cd ~/bullet/build
+    cmake .. -DBUILD_CPU_DEMOS=OFF -DBUILD_DEMOS=OFF -DBUILD_SHARED_LIBS=ON
+    make
+    sudo make install
+    sudo ldconfig
+
+**Ubuntu Users:**
+
+Alternatively Ubuntu users have the option to install the BulletPhysics from
+our official EFL PPA:
+
+https://launchpad.net/~efl/+archive/trunk
+
+
+PROFILES
+--------
+
+EFL build is based on "profiles". It will default to "dev" for
+unreleased software and "release" for official tarballs. One can
+change it with --with-profile=NAME, where NAME is one of:
+
+  * **dev**: extra checks useful to test software.
+  * **debug**: superset of dev, with debug features and assert().
+  * **release**: optimizations and less checks so it runs faster.
+
+
+CRYPTOGRAPHY
+------------
+
+EFL officially uses "openssl" library to do signature, cipher and related.
+Alternatively one can use "gnutls" (some distros are strict about licenses
+and want gnutls instead of openssl) or disable it. One can change it with
+--with-crypto=NAME, where NAME is one of: "openssl", "gnutls" and "none".
--- a/README.md
+++ b/README.md
@ -1,546 +0,0 @@
-![EFL](/data/readme/efl.png)
-# EFL
-
-----
-
-*Please report bugs/issues at*
-[git.enlightenment.org](https://git.enlightenment.org/enlightenment/efl/issues)
-
-----
-
-EFL is a collection of libraries for handling many common tasks a
-developer may have such as data structures, communication, rendering,
-widgets and more.
-
-There are many components inside EFL. They also build various things
-like shared libraries, loadable plug-in modules and also binary
-executables. Different elements will end up being licensed differently
-too. Below is a rundown of the components, what they do and their
-licensing.
-
-All library source is in the src/lib/ directory. All binaries are in
-src/bin/. All loadable modules are in src/modules/. All data files are
-in the data/ directory. Licensing details are listed in COPYING and
-the licenses/ directory. The pc/ directory holds all the Package
-Config files installed to help developers build against EFL.
-
-For more documentation please see:
-
-[www.enlightenment.org/doc](https://www.enlightenment.org/docs)
-
-## Platforms
-
-EFL is primarily developed on Linux (GNU/Linux) and should work on
-most distributions as long as dependencies are provided. It has been
-compiled and run also on Windows (using MSYS2 + mingw-w64 - please see
-[Phabricator windows docs](https://phab.enlightenment.org/w/windows)),
-Mac OS X, FreeBSD and NetBSD.
-
-## Components
-
-**Ecore:**
-
-*BSD 2-Clause license*
-
-This is the core main-loop, system events and execution layer. This
-handles running the main loop, integrating with external data and
-timing sources (the system clock, file descriptors, system signals),
-and producing an event queue, walking that queue and dispatching
-events to appropriate callbacks.
-
-**Ecore Audio:**
-
-*BSD 2-Clause license*
-
-This library provides an API for audio playback and recording. It uses
-pulse audio underneath to handle mixing and policies. The API for this
-should not be considered stable right now because it relies on EO and
-EO is not considered finalized yet.
-
-**Ecore Cocoa:**
-
-*BSD 2-Clause license*
-
-This provides wrappers/abstractions around Max OS-X Cocoa APIs to help
-Mac porting.
-
-**Ecore Con:**
-
-*BSD 2-Clause license*
-
-This provides a completely event-based TCP/UDP and Unix domain socket
-API that integrates with the main-loop. This means no blocking to send
-or receive data, supporting "infinite send buffers" with storage and
-spooling being done by Ecore Con. It also supports SSL encryption
-transparently turned on or not on the same connection, certificate
-verification, CURL wrapping for HTTP connection usage (GETs, POSTs
-etc.), asynchronous DNS lookups and provides the ability to also be a
-server, not just a client, with the same event-based API.
-
-**Ecore Evas:**
-
-*BSD 2-Clause license*
-
-This acts as glue between the display target (X11, Wayland,
-Frame buffer, Cocoa on OSX, Win32 etc.) and Evas. It creates/provides a
-target for Evas to render to (a Window or Surface etc.) and feeds
-input events (Keyboard, Mouse, Multi-touch) into Evas, which then
-selects the target object and calls the callbacks. It also provides
-wrappers/glue for manipulating the Window/Surface.
-
-**Ecore Fb:**
-
-*BSD 2-Clause license*
-
-This provides virtual terminal allocation, access and handling,
-frame buffer information, raw input handling for keyboard, mouse and
-touch (via tslib).
-
-**Ecore File:**
-
-*BSD 2-Clause license*
-
-This provides file access convenience APIs for doing simple file
-operations like renames, copies, listing directories and more. It also
-supports file change monitoring and URL downloads.
-
-**Ecore IMF:**
-
-*BSD 2-Clause license*
-
-This is an input method abstraction framework to allow EFL to talk to
-things like SCIM, IBus, Wayland and XIM. This allows for complex text
-entry in languages such as Chinese, Japanese and Korean.
-
-**Ecore IMF Evas:**
-
-*BSD 2-Clause license*
-
-This library glues Input method support from Ecore IMF and Evas
-together.
-
-**Ecore Input:**
-
-*BSD 2-Clause license*
-
-This acts as a generic input layer where multiple display systems can
-post events in the same format to the event queue.
-
-**Ecore Input Evas:**
-
-*BSD 2-Clause license*
-
-This Routes events from Ecore Input into a given Evas canvas which
-will then route the event further to the destination object and
-callbacks.
-
-**Ecore IPC:**
-
-*BSD 2-Clause license*
-
-This acts as a layer on top of Ecore Con which handles entire IPC
-message packets, dealing with header delta compression and
-portability, as well as ensuring an entire message is received in one
-go as a single IPC message, regardless of payload data size. The
-entire API is event based almost exactly like Ecore Con and thus it
-supports all the transport layers Ecore Con supports.
-
-**Ecore SDL:**
-
-*BSD 2-Clause license*
-
-This acts as a wrapper/glue around SDL to handle SDL Windows as well
-as input events from SDL and tie them to the Ecore main-loop and event
-queue.
-
-**Ecore Wayland:**
-
-*BSD 2-Clause license*
-
-This is a glue/wrapper library to interface EFL to Wayland libraries
-to tie them into the Ecore main-loop and event queue.
-
-**Ecore Win32:**
-
-*BSD 2-Clause license*
-
-This acts as glue/wrapper around Windows Win32 APIs to tie them into
-the Ecore main-loop and event queue.
-
-**Ecore X:**
-
-*BSD 2-Clause license*
-
-This is a library to wrap/deal with Xlib make dealing with X11 less painful
-and less footwork as well as being glue to tie these into the Ecore main-loop
-and event queue.
-
-**Edje:**
-
-*BSD 2-Clause license* (except the epp binary which is GPLv2)
-
-This is a graphics event, input, theme, animation and theme
-abstraction library used to place many UI/UX elements into data files
-(called edj files) that define how to react to incoming
-events/signals, and define animation time lines, states, relative
-scalable layout and much much more. It comes with a compiler that
-compiles source "edc" files into "edj" files (which are actually just
-data files managed by Eet). These "edj" files are fully portable and
-can work on any OS/Architecture just like a JPEG or PNG might be
-portable.
-
-**Eet:**
-
-*BSD 2-Clause license*
-
-This library is a data storage, encoding and decoding library
-designed to be extremely compact, fast and easy to use. It can take
-data structures directly from memory and serialize them portably to
-disk, then de-serialize them right back to the same data structures in
-memory, handling allocation and population of memory all for you in 1
-call. It handles indirections such as pointers, linked lists, arrays
-and hash tables too, so almost any level of data structure complexity
-can be easily saved and loaded back. It is used for "edj" files by
-Edje as well as all configuration in Enlightenment, Elementary and
-Terminology. It supports encryption of data too via SSL, signing of
-files, as well as various compression techniques. It also supports
-encoding and decoding of image data in lossless or lossy form.
-
-**Eeze:**
-
-*BSD 2-Clause license*
-
-This library acts as an abstraction to discovering hardware interfaces
-for sensors as well as removable media and much more.
-
-**EFL:**
-
-*BSD 2-Clause license*
-
-This is just some core common header data like a common version number
-for EFL and how to expose the EO API.
-
-**Efreet:**
-
-*BSD 2-Clause license*
-
-This library provides code for handling Freedesktop.org standards such
-as .desktop files, XDG Menus, Icon search paths and more. It provides
-a central daemon to handle monitoring for changes that the library
-talks to, and the daemon handles updating local cache files the
-library reads.
-
-**Eina:**
-
-*LGPL v2 license*
-
-This library provides low-level routines for common things like linked
-lists, hash tables, growable arrays, basic string buffers, shared
-string tokens, mmaped() file access, thread abstraction and locking,
-memory pools, copy-on-write segments, iterators, matrices, general
-data models, red/black trees, quad-trees, a simple SAX XML parser and
-more.
-
-**EIO:**
-
-*LGPL v2 license*
-
-This is an asynchronous I/O library for doing disk I/O without blocking.
-
-**ElDBus:**
-
-*LGPL v2 license*
-
-This is a DBus access library to allow you to create DBus services as
-well as clients. This glues in DBus into the main-loop so all access is
-asynchronous.
-
-**Embryo:**
-
-*Small license (same as ZLib license)*
-
-This is a small C-like language compiler and byte-code interpreter
-library. This is used for scripting in Edje. The code is based on
-original source from the Pawn/Small Language but has been made
-portable (endianness issues fixed) and 64bit issues fixed, with the
-runtime library being refactored to be extremely small.
-
-**Emotion:**
-
-*BSD 2-Clause license*
-
-This is a wrapper around Gstreamer 1.x pluggable decoder libraries
-This glues in the decoder library, and its output into a smart Evas object
-that will display the playback for you as the video plays, as well as
-providing higher level controls to seek, play, pause and query the stream
-regardless of the back-end used.
-
-**EO:**
-
-*BSD 2-Clause license*
-
-This is a core object system API that EFL 1.8 and on depend on. The
-API is not finalized, so do not depend on it yet in EFL 1.8, but
-future EFL versions will lock it down.
-
-This object system does simple and multiple inheritance, refcounting,
-strong and weak references, auto-deletion of child objects, unifies
-callback handling with a single path, and also abstracts object
-pointers to be indirect table lookups for increased safety at runtime.
-
-**EPhysics:**
-
-*BSD 2-Clause license*
-
-This library provides a wrapper around the Bullet physics library,
-allowing for it to be linked directly with Evas objects and control
-their behavior as if they were real physical objects. This is now
-disabled by default as it's rarely if ever used by anything.
-
-**Ethumb:**
-
-*LGPL v2 license*
-
-This library provides core API for a thumbnailing daemon as well as
-the thumbnail daemon itself. Ethumb Client talks with Ethumb to pass
-off thumbnail generation to a central location to be done
-asynchronously.
-
-**Ethumb Client:**
-
-*LGPL v2 license*
-
-This is the client-side part of Ethumb that provides an API for
-clients to request the Ethumb thumbnailer to generate or find cached
-thumbnails of files.
-
-**Evas:**
-
-*BSD 2-Clause license*
-
-This is the core rendering and scene graph abstraction library for
-EFL. It manages a stateful 2D scene graph that defines the entire
-content of any canvas. This supplies rendering back-ends for many
-display systems like X11, Windows, Wayland, Frame-buffer etc. and via
-many rendering APIs like OpenGL, OpenGL-ES 2, and pure software
-implementations that are fast and accurate.
-
-**Evil:**
-
-*BSD 2-Clause license*
-
-This library acts as a porting library for Windows to provide missing
-libc calls not in Mingw32 that EFL needs. It is used internally and
-no symbol is public.
-
-----
-
-## Requirements
-
-EFL requires a C and C++ compiler by default. C++ exists mostly to interface
-to C++ libraries like Bullet and our C++ bindings.
-
-Required by default:
-
-* libpng
-* libjpeg
-* openjpeg2
-* gstreamer (Ensure all codecs you want are installed.)
-* zlib
-* luajit (lua 5.1 or 5.2 support optional)
-* libtiff
-* openssl
-* curl
-* dbus
-* libc
-* fontconfig
-* freetype2
-* fribidi
-* harfbuzz
-* libpulse
-* libsndfile
-* libx11
-* libxau
-* libxcomposite
-* libxdamage
-* libxdmcp
-* libxext
-* libxfixes
-* libxinerama
-* libxrandr
-* libxrender
-* libxss
-* libxtst
-* libxcursor
-* libxi (2.2 or newer)
-* opengl(mesa etc.) (opengl/glx/full or opengl-es2/egl. full opengl only on osx - must be explicitly specified to be full to have support)
-* giflib/libgif
-* util-linux (limbount + libblkid)
-* systemd / libudev
-* poppler / poppler-cpp
-* libraw
-* libspectre
-* librsvg
-* openmp (clang needs libomp, while gcc uses libgomp)
-* libwebp
-
-
-### Wayland support
-
-You may also want wayland support when on Linux. This enables support
-for EFL to target wayland support for client applications. To do this
-supply:
-``` sh
-Dwl=true
-```
-
-### Framebuffer support
-
-For more modern framebuffer support you may want drm/kms rendering
-support so enable this. This is what you also want for wayland
-compositor support in enlightenment as it will want to be able to
-render to a modern framebuffer target with atomic buffer swapping. To
-do this provide:
-``` sh
-Ddrm=true
-```
-
-Legacy fbcon support also exists, but you probably no longer want to
-use this as it is not maintained anymore. This supports basic frame-buffers
-like /dev/fb as well as input via /dev/input for keyboards and mice in a
-basic way. Enable this with:
-``` sh
-Dfb=true
-```
-
-You may want to change the install prefix for EFL with:
-``` sh
--prefix=/path/to/prefix
-```
-
-The default prefix if not given is "/usr/local". Many people like to
-use prefixes like /opt/e or /opt/efl or /home/USERNAME/software etc.
-
-### Compiler flags
-
-You can affect compilation optimization, debugging and other factors
-by setting your `CFLAGS` environment variable (and `CXXFLAGS`). Be aware
-that to ensure ABI stability you should use the exact same `CFLAGS` /
-`CXXFLAGS` for all the build of EFL and any applications/libraries that
-depend on them.
-
-There are many other configure options that can be used, but in
-general it is not a good idea to go enabling or disabling things
-unless you wish to break things. The defaults are well tested, with
-the above recommended options also being well tested. Go much further
-and your mileage may vary wildly. Disabling features is a good way of
-breaking EFL functionality, so it is not recommended to mess with
-these without understanding the implications. The defaults
-have been carefully considered to provide full functionality so users
-will not be missing anything.
-
-### Cryptography
-
-EFL officially offers openssl or gnutls as cryptography backends. By
-default it uses "openssl" to do signature, cipher and related. Alternatively
-one can use "gnutls" (some distros are strict about licenses and want gnutls
-instead of openssl) You can switch to gnutls with:
-``` sh
-Dcrypto=gnutls
-```
-
-----
-
-## Compiling and Installing
-
-Meson is the build system used for this project. For more information
-please see [mesonbuild.com](https://mesonbuild.com)
-
-You will need normal build tooling installed such as a compiler (gcc
-or clang for example), pkg-config, ninja, any relevant package-dev or
-package-devel packages if your distribution splits out development
-headers (e.g. libc6-dev) etc.
-
-Depending on where dependencies,  you might have to set your
-`PKG_CONFIG_PATH` environment variable like:
-```sh
-export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/lib/pkgconfig
-```
-
-Also note that some distributions like to add extra arch directories
-to your library locations so you might have to have more like:
-```sh
-export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/local/lib64/pkgconfig:/usr/local/lib/x86_64-linux-gnu/pkgconfig:/usr/lib/pkgconfig:/usr/lib64/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig
-```
-
-You will need to ensure that the destination library directory (e.g.
-`/usr/local/lib` is in your /etc/ld.so.conf or /etc/ld.so.conf.d/
-files and after installing anything that installs libraries you
-re-run `ldconfig`. Please see relevant documentation on ldconfig and
-ld.so.conf for your distribution.
-
-You might also want to add the destination bin dir to your environment
-variable PATH (see documentation on your shell PATH variable) such as:
-```sh
-export PATH=/usr/local/bin:/usr/bin:/bin
-```
-
-Normal compilation in /usr/local:
-```sh
-meson . build
-ninja -C build
-sudo ninja -C build install
-```
-
-For meson build generic options:
-```sh
-meson --help
-```
-
-For a list of project specific options supported:
-```sh
-cat meson_options.txt
-```
-
-To set 1 or more project specific options:
-```sh
-meson --prefix=/path/to -Doption=value [-Dother=value2] [...] . build
-```
-
-To display current configuration:
-```sh
-meson configure build
-```
-
-The above will only work after at least the following is done:
-```sh
-meson . build
-```
-
-### Quick build help
-
-How to clean out the build and config and start fresh:
-```sh
-rm -rf build
-```
-
-How to make a dist tarball and check its build:
-(must do it from git tree clone and commit all changes to git first)
-```sh
-ninja -C build dist
-```
-
-How to change prefix:
-```sh
-meson --prefix=/path/to/prefix . build
-```
-
-How to install in a specific destination directory for packaging:
-```sh
-DESTDIR=/path/to/destdir ninja -C build install
-```
-
-How to build with verbose output (full commands run):
-```sh
-ninja -C build -v
-```
--- a/autogen.sh
+++ b/autogen.sh
@ -0,0 +1,39 @@
+#!/bin/sh
+
+test -n "$srcdir" || srcdir=`dirname "$0"`
+test -n "$srcdir" || srcdir=.
+(
+  cd "$srcdir" &&
+  (
+    rm -rf autom4te.cache
+    rm -f aclocal.m4 ltmain.sh
+
+    autoreconf -vif
+  )
+
+  W=0
+
+  rm -f config.cache-env.tmp
+  echo "OLD_PARM=\"$@\"" >> config.cache-env.tmp
+  echo "OLD_CFLAGS=\"$CFLAGS\"" >> config.cache-env.tmp
+  echo "OLD_PATH=\"$PATH\"" >> config.cache-env.tmp
+  echo "OLD_PKG_CONFIG_PATH=\"$PKG_CONFIG_PATH\"" >> config.cache-env.tmp
+  echo "OLD_LDFLAGS=\"$LDFLAGS\"" >> config.cache-env.tmp
+
+  cmp config.cache-env.tmp config.cache-env >> /dev/null
+  if [ $? -ne 0 ]; then
+    W=1;
+  fi
+
+  if [ $W -ne 0 ]; then
+    echo "Cleaning configure cache...";
+    rm -f config.cache config.cache-env
+    mv config.cache-env.tmp config.cache-env
+  else
+    rm -f config.cache-env.tmp
+  fi
+)
+
+if [ -z "$NOCONFIGURE" ]; then
+  exec $srcdir/configure -C "$@"
+fi
--- a/cmakeconfig/EFLConfigVersion.cmake.in
+++ b/cmakeconfig/EFLConfigVersion.cmake.in
--- a/cmakeconfig/EolianHelper.cmake.in
+++ b/cmakeconfig/EolianHelper.cmake.in
@ -7,7 +7,7 @@
 macro(_rule_eox file include deps)
    add_custom_command(
       OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/${file}.x
-       COMMAND eolian_gen ${include} -g c -o c:${CMAKE_CURRENT_SOURCE_DIR}/${file}.x ${CMAKE_CURRENT_SOURCE_DIR}/${file}
+       COMMAND eolian_gen ${include} --gc -o ${CMAKE_CURRENT_SOURCE_DIR}/${file}.x ${CMAKE_CURRENT_SOURCE_DIR}/${file}
       DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${file}
       DEPENDS ${deps}
    )
@ -19,7 +19,7 @@ endmacro()
 macro(_rule_eoh file include deps)
    add_custom_command(
       OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/${file}.h
-       COMMAND eolian_gen ${include} -g h -o h:${CMAKE_CURRENT_SOURCE_DIR}/${file}.h ${CMAKE_CURRENT_SOURCE_DIR}/${file}
+       COMMAND eolian_gen ${include} --gh -o ${CMAKE_CURRENT_SOURCE_DIR}/${file}.h ${CMAKE_CURRENT_SOURCE_DIR}/${file}
       DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${file}
       DEPENDS ${deps}
    )
@ -47,14 +47,14 @@ function(eo_rule_create build_files relative_include_dirs)
      ${EOLIAN_EO_DIR_WITHOUT_NEWLINE}
    )

-   # convert relative to absolute
+   # convert relative to absolut
   foreach(relative_include_dir ${relative_include_dirs})
      list(APPEND include_dirs
        ${CMAKE_CURRENT_SOURCE_DIR}/${relative_include_dir}
      )
   endforeach()

-   # work with the absolute paths
+   # work with the absolut paths
   foreach(include_cmd ${include_dirs})
      # build include cmd
      string(CONCAT includes "${includes}" " -I${include_cmd}")
--- a/cmakeconfig/meson.build
+++ b/cmakeconfig/meson.build
@ -1,66 +0,0 @@
-
-cmake_src = [
-  'Ecore',
-  'EcoreCxx',
-  'Edje',
-  'Eet',
-  'EetCxx',
-  'Eeze',
-  'Efl',
-  'Efreet',
-  'Eina',
-  'EinaCxx',
-  'Eio',
-  'Eldbus',
-  'Elementary',
-  'Elua',
-  'Emile',
-  'Emotion',
-  'Eo',
-  'EoCxx',
-  'Eolian',
-  'EolianCxx',
-  'EthumbClient',
-  'Ethumb',
-  'Evas',
-  'EvasCxx',
-]
-
-cmake_version_src = [
-  'Efl',
-  'Elementary',
-]
-
-conf = configuration_data()
-conf.set('VERSION', meson.project_version())
-
-foreach cmake_file : cmake_src
-  configure_file(
-    input: cmake_file+'Config.cmake.in',
-    output: cmake_file+'Config.cmake',
-    install_dir: join_paths(dir_lib, 'cmake', cmake_file),
-    copy: true,
-  )
-  if cmake_version_src.contains(cmake_src)
-    configure_file(
-      input: cmake_version_file+'ConfigVersion.cmake.in',
-      output: cmake_version_file+'ConfigVersion.cmake',
-      install_dir: join_paths(dir_lib, 'cmake', cmake_version_file),
-      configuration : conf,
-    )
-  else
-    configure_file(
-      input: 'EflConfigVersion.cmake.in',
-      output: cmake_file+'ConfigVersion.cmake',
-      install_dir: join_paths(dir_lib, 'cmake', cmake_file),
-      configuration : conf,
-    )
-  endif
-endforeach
-
-configure_file(
-  input: 'EolianHelper.cmake.in',
-  output: 'EolianHelper.cmake',
-  install_dir: join_paths(dir_lib, 'cmake', 'Eolian'),
-  copy: true
-)
--- a/data/elementary/config/.gitignore
+++ b/data/elementary/config/.gitignore
--- a/config/Makefile.am
+++ b/config/Makefile.am
@ -0,0 +1,18 @@
+MAINTAINERCLEANFILES = Makefile.in
+SUBDIRS = default standard mobile
+
+include ../src/Makefile_Eet_Helper.am
+
+EXTRA_DIST = profile.src
+
+filesdir = $(datadir)/elementary/config
+
+files_DATA = profile.cfg
+
+%.cfg: %.src
+	$(AM_V_EET) \
+	$(MKDIR_P) $(top_builddir)/config/; \
+	$(EET) -i $(top_builddir)/config/$@ config $< 0
+
+clean-local:
+	rm -rf *.cfg *~
--- a/config/default/Makefile.am
+++ b/config/default/Makefile.am
@ -0,0 +1,23 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+include ../../src/Makefile_Eet_Helper.am
+
+EXTRA_DIST = \
+        profile.desktop \
+        icon.png \
+        base.src.in
+
+filesdir = $(datadir)/elementary/config/default
+files_DATA = \
+        profile.desktop \
+        icon.png \
+        base.cfg
+
+%.cfg: %.src
+	$(AM_V_EET) \
+	$(MKDIR_P) $(top_builddir)/config/default/; \
+	$(EET) -e $(top_builddir)/config/default/$@ config $< 1
+
+clean-local:
+	rm -rf *.cfg *~
+
--- a/config/default/base.src.in
+++ b/config/default/base.src.in
--- a/data/elementary/config/default/icon.png
+++ b/data/elementary/config/default/icon.png
--- a/config/default/profile.desktop
+++ b/config/default/profile.desktop
@ -0,0 +1,46 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Link
+Name=Default
+Name[ab]=默认
+Name[ca]=Predeterminat
+Name[cs]=Výchozí
+Name[de]=Vorgabe
+Name[el]=Προκαθορισμένο
+Name[eo]=Pravaloroj
+Name[es]=Predefinido
+Name[fi]=Oletus
+Name[fr]=Prédéfini
+Name[gl]=Predefinido
+Name[hu]=Alapértelmezett
+Name[it]=Predefinito
+Name[ja]=デフォルト
+Name[ko]=기본
+Name[lt]=Įprastas
+Name[ms]=Lalai
+Name[pl]=Domyślne
+Name[pt]=Predefinições
+Name[ru]=Заново
+Name[sr]=Подразумевано
+Name[tr]=Öntanımlı
+Name[zh_CN]=默认
+Comment=Select this to begin the initial setup again.
+Comment[ca]=Seleccioni aquí per carregar la configuració inicial de nou.
+Comment[cs]=Vyberte pro znovuspuštění tohoto průvodce.
+Comment[de]=Dieses auswählen, um mit der Ersteinrichtung erneut zu beginnen.
+Comment[el]=Επιλέξτε αυτό για να ξεκινήσετε την αρχική ρύθμιση ξανά.
+Comment[eo]=Elektu tion por restartigi la pravalorizan agordon.
+Comment[es]=Seleccione esto para reestablecer la configuración inicial.
+Comment[fi]=Valitse tämä käynnistääksesi alkuasetusvelhon.
+Comment[fr]=Sélectionnez ceci pour retrouver la configuration par défaut et reprendre le paramétrage initial.
+Comment[gl]=Seleccione isto para volverr á configuración inicial.
+Comment[hu]=Válaszd ezt az alap beállítáok megismétléséhez.
+Comment[it]=Selezionare questo per riprendere la configurazione iniziale.
+Comment[ko]=초기 설정을 사용하려면 이것을 선택하세요.
+Comment[ms]=Pilih ini untuk mulakan persediaan awalan lagi.
+Comment[pt]=Escolha isto para executar novamente a configuração inicial
+Comment[ru]=Выберите это для запуска инициализации настроек (сброс).
+Comment[sr]=Изаберите ово да би поново подесили подразумеване поставке.
+Comment[tr]=Açılış ayarlarına geri dönmek için bu profili seçin.
+Comment[zh_CN]=点击这里重新进行初始化设置主题。
+Icon=icon.png
--- a/config/mobile/Makefile.am
+++ b/config/mobile/Makefile.am
@ -0,0 +1,22 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+include ../../src/Makefile_Eet_Helper.am
+
+EXTRA_DIST = \
+        profile.desktop \
+        icon.png \
+        base.src.in
+
+filesdir = $(datadir)/elementary/config/mobile
+files_DATA = \
+        profile.desktop \
+        icon.png \
+        base.cfg
+
+%.cfg: %.src
+	$(AM_V_EET) \
+	$(MKDIR_P) $(top_builddir)/config/; \
+	$(EET) -e $(top_builddir)/config/mobile/$@ config $< 1
+
+clean-local:
+	rm -rf *.cfg *~
--- a/config/mobile/base.src.in
+++ b/config/mobile/base.src.in
--- a/data/elementary/config/mobile/icon.png
+++ b/data/elementary/config/mobile/icon.png
--- a/config/mobile/profile.desktop
+++ b/config/mobile/profile.desktop
@ -0,0 +1,35 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Link
+Name=Mobile
+Name[ca]=Mòbil
+Name[de]=Mobil
+Name[el]=Κινητό
+Name[eo]=Portebla
+Name[es]=Móvil
+Name[fi]=Mobiili
+Name[fr]=Écran tactile
+Name[gl]=Móbil
+Name[ja]=モバイル
+Name[ko]=터치스크린
+Name[lt]=Mobiliesiems įrenginiams
+Name[ms]=Bimbit
+Name[pt]=Ecrã tátil
+Name[ru]=Мобильные устройства
+Name[sr]=Покретни
+Name[tr]=Mobil
+Comment=Configuration set up to work best with touchscreen phones, tablets and similar devices.
+Comment[ca]=Configuració configurada per funcionar millor amb telèfons amb pantalla tàctil, tablets i altres dispositius similars.
+Comment[de]=Die Konfiguration ist eingerichtet, um am besten mit einem Brührungsbildschirm, Handys, Tablets und ähnlichen Geräten zu arbeiten.
+Comment[eo]=Agordoj kongruas plej kun tuŝekranaj telefonoj, tabulkomputiloj aŭ similaj aparatoj.
+Comment[es]=Configuración adaptada para el uso de pantallas táctiles como la de los móviles, tablets y dispositivos similares.
+Comment[fi]=Kosketusnäytöllisissä puhelimissa, taulutietokoneissa sekä vastaavissa laitteissa parhaiten toimivat asetukset.
+Comment[fr]=Configuration adaptée aux écrans tactiles des téléphones, tablettes et apparentés.
+Comment[gl]=Configuración adaptada para o uso de pantallas táctiles como a dos móbiles, tablets e dispositivos similares.
+Comment[it]=Configurazione adatta per l'uso in smartphone con interfaccia tattile, tablets e similari.
+Comment[ko]=터치스크린 기반의 휴대폰, 태블릿 등과 같은 장치에 맞는 설정.
+Comment[ms]=Persediaan konfigurasi untuk berfungsi  baik dengan telefon skrin sentuh, tablet dan lain-lain peranti yang serupa.
+Comment[pt]=Configuração de ecrãs táteis como os dos telefones, tablets e similares.
+Comment[sr]=Поставке које су најбоље за рад са екраном на додир телефона, таблица и сличних уређаја.
+Comment[tr]=Yapılandırma dokunmatik ekranlı telefon ve tablet benzeri cihazlarda en iyi çalışacak şekilde ayarlanır.
+Icon=icon.png
--- a/data/elementary/config/profile.src
+++ b/data/elementary/config/profile.src
--- a/config/standard/Makefile.am
+++ b/config/standard/Makefile.am
@ -0,0 +1,23 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+include ../../src/Makefile_Eet_Helper.am
+
+EXTRA_DIST = \
+        profile.desktop \
+        icon.png \
+        base.src.in
+
+filesdir = $(datadir)/elementary/config/standard
+files_DATA = \
+        profile.desktop \
+        icon.png \
+        base.cfg
+
+%.cfg: %.src
+	$(AM_V_EET) \
+	$(MKDIR_P) $(top_builddir)/config/standard/; \
+	$(EET) -e $(top_builddir)/config/standard/$@ config $< 1
+
+clean-local:
+	rm -rf *.cfg *~
+
--- a/config/standard/base.src.in
+++ b/config/standard/base.src.in
--- a/data/elementary/config/standard/icon.png
+++ b/data/elementary/config/standard/icon.png
--- a/config/standard/profile.desktop
+++ b/config/standard/profile.desktop
@ -0,0 +1,44 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Link
+Name=Standard
+Name[ab]=标准
+Name[ca]=Estàndard
+Name[cs]=Standartní
+Name[de]=Vorgabe
+Name[el]=Κανονικό
+Name[eo]=Kutima
+Name[es]=Estándar
+Name[fi]=Vakio
+Name[fr]=Standard
+Name[gl]=Estándar
+Name[hu]=Általános
+Name[ja]=標準
+Name[ko]=표준
+Name[lt]=Standartinis
+Name[ms]=Piawai
+Name[pl]=Standardowe
+Name[pt]=Padrão
+Name[ru]=Стандартный
+Name[sr]=Уобичајено
+Name[tr]=Standart
+Name[zh_CN]=标准
+Comment=This is the standard profile that is universal for most desktop and laptop systems. Choose this if you are not sure what to choose.
+Comment[ca]=Aquest és el perfil estàndard que és universal per a la majoria dels sistemes d'escriptori i portàtils. Escolliu aquest si no sabeu què triar.
+Comment[cs]=Toto je standartní univerzální profil pro většinu stolních a přenosných počítačů. Vyberte pokud si nejste jisti co vybrat.
+Comment[el]=Αυτό είναι το κανονικό προφίλ που είναι κοινό για τα περισσότερα συστήματα. Επιλέξτε αυτό αν δεν είστε σίγουροι για  την επιλογή σας.
+Comment[eo]=Tio estas la kutima profilo taŭga por preskaŭ ĉiuj oficejaj sistemoj kaj porteblaj sistemoj. Elektu ĝin se vi ne certas.
+Comment[es]=Este es el perfil estándar y universal para la mayoría de ordenadores de escritorio y portátiles. Escójalo si no está seguro de cual elegir.
+Comment[fi]=Tämä on vakioprofiili jota voidaan yleisesti käyttää työasemissa ja kannettavissa tietokoneissa. Valitse tämä jos et ole varma minkä valitsisit.
+Comment[fr]=Le profil standard adapté à la quasi totalité des systèmes de bureau et ordinateurs portables. Choisissez ce profil si vous êtes indécis.
+Comment[gl]=Este é o perfil estándar e universal para a maioría de ordenadores de escritorio e portátiles. Escóllao se non está seguro de cal elexir.
+Comment[hu]=Ez az általános, alap beállítás, amely megfelelő a legtöbb laptop és asztali gép számára.
+Comment[it]=Questo è il profilo standard, universale per la maggior parte dei sistemi desktop e portatili. Scegliete questo se non siete sicuri di cosa scegliere.
+Comment[ko]=이 표준 프로파일은 대부분의 데스크톱과 랩톱 컴퓨터 시스템을 위한 보편적인 프로파일입니다. 무엇을 선택할지 확실하지 않다면 이것을 선택하세요.
+Comment[ms]=Ini adalah profil piawai yang universal untuk kebanyakan sistem komputer desktop dan riba. Pilih ini jika anda tidak pasti apa yang hendak dipilih.
+Comment[pt]=O perfil de configuração padrão utilizado para a maioria dos computadores e portáteis. Escolha-o se não souber o que escolher.
+Comment[ru]=Этот стандартный профиль универсален для большинства стационарных и переносных систем. Выберите его если вы не знаете что надо выбрать.
+Comment[sr]=Уобичајени начин рада за већину радних станица и преклопних рачунара. Ако нисте сигурни шта треба изабрати, означите ово.
+Comment[tr]=Bu pek çok masaüstü ve dizüstü sistem için genelde uygun standart bir profildir. Hangisini seçeceğinizden emin değilseniz bunu seçin.
+Comment[zh_CN]=适用于大多数台式机和笔记本的设置主题，如果您不清楚如何选择则请使用这个。
+Icon=icon.png
--- a/configure.ac
+++ b/configure.ac
--- a/confs/freebsd.sh
+++ b/confs/freebsd.sh
@ -1,3 +0,0 @@
-#!/bin/sh -e
-meson -Dsystemd=false -Dv4l2=false -Deeze=false -Dinput=false \
- $@ . build
--- a/confs/linux-nowayland.sh
+++ b/confs/linux-nowayland.sh
@ -1,3 +0,0 @@
-#!/bin/sh -e
-meson -Dfb=true \
- $@ . build
--- a/confs/linux.sh
+++ b/confs/linux.sh
@ -1,3 +0,0 @@
-#!/bin/sh -e
-meson -Dfb=true -Ddrm=true -Dwl=true \
- $@ . build
--- a/confs/openbsd.sh
+++ b/confs/openbsd.sh
@ -1,3 +0,0 @@
-#!/bin/sh -e
-meson -Dsystemd=false -Dv4l2=false -Deeze=false -Dinput=false \
- $@ . build
--- a/confs/osx.sh
+++ b/confs/osx.sh
@ -1,6 +0,0 @@
-#!/bin/sh -e
-meson -Dsystemd=false -Dv4l2=false -Davahi=false -Deeze=false -Dx11=false \
-Dopengl=full -Dcocoa=true -Dnls=false \
-Demotion-loaders-disabler=gstreamer1,libvlc,xine \
-Decore-imf-loaders-disabler=scim,ibus \
- $@ . build
--- a/confs/windows.sh
+++ b/confs/windows.sh
@ -1,6 +0,0 @@
-#!/bin/sh -e
-meson -Dsystemd=false -Dv4l2=false -Davahi=false -Deeze=false -Dx11=false \
-Dopengl=none -Dpulseaudio=false -Dlibmount=false -Dfribidi=false \
-Devas-loaders-disabler=pdf,ps,raw,svg,rsvg,json,tga,tgv \
-Decore-imf-loaders-disabler=xim,ibus,scim \
- $@ . build
--- a/data/Makefile.am
+++ b/data/Makefile.am
@ -0,0 +1,246 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+EXTRA_DIST =
+CLEANFILES =
+
+########################################################################
+# Embryo
+embryofilesdir = $(datadir)/embryo/include
+embryofiles_DATA = embryo/default.inc
+EXTRA_DIST += $(embryofiles_DATA)
+
+########################################################################
+# Evas
+evasfilesdir = $(datadir)/evas
+evasfiles_DATA = evas/checkme
+EXTRA_DIST += $(evasfiles_DATA)
+
+########################################################################
+# Eeze
+eezefilesdir = $(datadir)/eeze
+eezefiles_DATA = eeze/checkme
+EXTRA_DIST += $(eezefiles_DATA)
+
+########################################################################
+# Ecore
+ecorefilesdir = $(datadir)/ecore
+ecorefiles_DATA = ecore/checkme
+EXTRA_DIST += $(ecorefiles_DATA)
+
+########################################################################
+# Ecore_X
+ecore_xfilesdir = $(datadir)/ecore_x
+ecore_xfiles_DATA = ecore_x/checkme
+EXTRA_DIST += $(ecore_xfiles_DATA)
+
+########################################################################
+# Ecore_Imf
+ecoreimffilesdir = $(datadir)/ecore_imf
+ecoreimffiles_DATA = ecore_imf/checkme
+EXTRA_DIST += $(ecoreimffiles_DATA)
+
+########################################################################
+# Efreet
+efreetfilesdir = $(datadir)/efreet
+efreetfiles_DATA = efreet/checkme
+EXTRA_DIST += $(efreetfiles_DATA)
+
+########################################################################
+# Eo
+eogdbdir = $(datadir)/eo/gdb
+eogdb_DATA = eo/eo_gdb.py
+EXTRA_DIST += $(eogdb_DATA)
+
+# Borrowed from gobject
+libeo.so.@VMAJ@.@VMIN@.@VMIC@-gdb.py: eo/libeo-gdb.py.in
+	$(AM_V_GEN) $(SED) -e "s|\@datadir\@|$(datadir)|" $(srcdir)/eo/libeo-gdb.py.in > $(builddir)/libeo.so.@VMAJ@.@VMIN@.@VMIC@-gdb.py
+
+eogdbloaddir = $(datadir)/gdb/auto-load/$(libdir)
+eogdbload_DATA = libeo.so.@VMAJ@.@VMIN@.@VMIC@-gdb.py
+EXTRA_DIST += $(eogdbload_DATA)
+
+CLEANFILES += libeo.so.@VMAJ@.@VMIN@.@VMIC@-gdb.py
+
+EXTRA_DIST += $(eogdb_SCRIPTS) eo/libeo-gdb.py.in
+
+########################################################################
+# Edje
+edjefilesdir = $(datadir)/edje/include
+edjefiles_DATA = edje/include/edje.inc
+EXTRA_DIST += $(edjefiles_DATA)
+
+mimedir = $(datadir)/mime/packages
+mime_DATA = edje/edje.xml
+EXTRA_DIST += $(mime_DATA)
+
+EXTRA_DIST += \
+edje/edje-mode.el
+
+# Helper for people using EDJ
+include ../src/Makefile_Edje_Helper.am
+
+########################################################################
+# Emotion
+emotionfilesdir = $(datadir)/emotion
+emotionfiles_DATA = emotion/checkme
+EXTRA_DIST += $(emotionfiles_DATA)
+
+########################################################################
+# Ethumb
+ethumbfilesdir = $(datadir)/ethumb
+ethumbfiles_DATA = ethumb/checkme
+EXTRA_DIST += $(ethumbfiles_DATA)
+
+ethumbframesdir = $(datadir)/ethumb/frames
+ethumbframes_DATA = ethumb/frames/default.edj
+CLEANFILES += ethumb/frames/default.edj
+
+ethumb/frames/default.edj: ethumb/frames/default.edc
+	$(AM_V_EDJ) \
+	$(MKDIR_P) ethumb/frames/; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) -id $(srcdir)/ethumb/frames/ $< $@
+
+
+EXTRA_DIST += \
+ethumb/frames/default.edc \
+ethumb/frames/border-0.jpg
+
+########################################################################
+# Ethumb_Client
+ethumb_clientfilesdir = $(datadir)/ethumb_client
+ethumb_clientfiles_DATA = ethumb_client/checkme
+EXTRA_DIST += $(ethumb_clientfiles_DATA)
+
+########################################################################
+# Elua
+eluafilesdir = $(datadir)/elua
+eluafiles_DATA = elua/checkme
+EXTRA_DIST += $(eluafiles_DATA)
+
+#######################################################################
+# Elementary
+
+# themes
+
+elementaryfilesdir = $(datadir)/elementary/themes
+elementaryfiles_DATA = elementary/themes/default.edj
+CLEANFILES += elementary/themes/default.edj
+
+include elementary/themes/Makefile.am
+
+elementary/themes/default.edj: elementary/themes/default.edc $(elementary_themes_files) $(top_builddir)/src/bin/edje/edje_cc${EXEEXT}
+	$(AM_V_EDJ) \
+	$(MKDIR_P) elementary/themes/; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) $(EDJE_CC_ELM_FLAGS) $< $@
+
+# desktop files
+
+elementarydesktopdir = $(datadir)/applications
+elementarydesktop_DATA = elementary/desktop/elementary_test.desktop elementary/desktop/elementary_config.desktop
+
+elementaryicondir = $(datadir)/icons
+elementaryicon_DATA = elementary/desktop/elementary.png
+
+EXTRA_DIST += $(elementarydesktop_DATA) $(elementaryicon_DATA)
+
+# edje_externals
+
+elementaryedje_externalsdir = $(datadir)/elementary/edje_externals
+elementaryedje_externals_DATA = elementary/edje_externals/icons.edj
+CLEANFILES += $(elementaryedje_externals_DATA)
+
+include elementary/edje_externals/Makefile.am
+
+elementary/edje_externals/icons.edj: elementary/edje_externals/icons.edc
+	$(AM_V_EDJ) \
+	$(MKDIR_P) elementary/edje_externals/; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
+
+# images
+
+include elementary/images/Makefile.am
+
+elementaryimagesdir = $(datadir)/elementary/images
+elementaryimages_DATA = $(elementary_images_files)
+
+elementaryimages_glayerdir = $(datadir)/elementary/images
+elementaryimages_glayer_DATA = $(elementary_images_glayer_files)
+
+EXTRA_DIST += $(elementary_images_files) $(elementary_images_glayer_files)
+
+# objects
+
+include ../Makefile_Elm_Helpers.am
+
+elementaryobjectsdir = $(datadir)/elementary/objects
+elementaryobjects_DATA = \
+elementary/objects/test.edj \
+elementary/objects/test_external.edj \
+elementary/objects/multip.edj \
+elementary/objects/cursors.edj \
+elementary/objects/combobox_multiple.edj \
+elementary/objects/font_preview.edj \
+elementary/objects/postit_ent.edj \
+elementary/objects/multibuttonentry.edj \
+elementary/objects/test_prefs.edj \
+elementary/objects/test_prefs.epb \
+elementary/objects/test_focus_style.edj
+CLEANFILES += $(elementaryobjects_DATA)
+
+include elementary/objects/Makefile.am
+
+elementary/objects/test.edj: elementary/objects/test.edc
+	$(AM_V_EDJ) \
+	$(MKDIR_P) elementary/objects/; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
+
+elementary/objects/test_external.edj: elementary/objects/test_external.edc
+	$(AM_V_EDJ) \
+	$(MKDIR_P) elementary/objects/; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
+
+elementary/objects/multip.edj: elementary/objects/test_external.edc
+	$(AM_V_EDJ) \
+	$(MKDIR_P) elementary/objects/; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
+
+elementary/objects/cursors.edj: elementary/objects/cursors.edc
+	$(AM_V_EDJ) \
+	$(MKDIR_P) elementary/objects/; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
+
+elementary/objects/combobox_multiple.edj: elementary/objects/combobox_multiple.edc
+	$(AM_V_EDJ) \
+	$(MKDIR_P) elementary/objects/; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
+
+elementary/objects/font_preview.edj: elementary/objects/font_preview.edc
+	$(AM_V_EDJ) \
+	$(MKDIR_P) elementary/objects/; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
+
+elementary/objects/postit_ent.edj: elementary/objects/postit_ent.edc
+	$(AM_V_EDJ) \
+	$(MKDIR_P) elementary/objects/; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
+
+elementary/objects/multibuttonentry.edj: elementary/objects/multibuttonentry.edc
+	$(AM_V_EDJ) \
+	$(MKDIR_P) elementary/objects/; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
+
+elementary/objects/test_prefs.edj: elementary/objects/test_prefs.edc
+	$(AM_V_EDJ) \
+	$(MKDIR_P) elementary/objects/; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
+
+elementary/objects/test_focus_style.edj: elementary/objects/test_focus_style.edc
+	$(AM_V_EDJ) \
+	$(MKDIR_P) elementary/objects/; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) -id $(top_srcdir)/data/elementary/themes/img $< $@
+
+elementary/objects/test_prefs.epb: elementary/objects/test_prefs.epc
+	$(AM_V_EPB) \
+	$(MKDIR_P) elementary/objects/; \
+	$(ELM_PREFS_CC) $(ELM_PREFS_FLAGS) $< $@
+
--- a/data/coverity/model.c
+++ b/data/coverity/model.c
@ -1,26 +0,0 @@
-/*
- * Coverity Model - not a real source file.
- *
- * See https://scan.coverity.com/tune
- * See https://scan.coverity.com/models
- *
- * Coverity doesn't detect changes to this file, update manually at:
- *
- * https://scan.coverity.com/projects/enlightenment-foundation-libraries?tab=analysis_settings
- */
-
-typedef struct {
-   int fd;
-} Eo;
-
-/* force Coverity to understand these take ownership of fd */
-
-void efl_loop_fd_set(Eo *obj, int fd)
-{
-   obj->fd = fd;
-}
-
-void efl_loop_fd_file_set(Eo *obj, int fd)
-{
-   obj->fd = fd;
-}
--- a/data/edje/edje-mode.el
+++ b/data/edje/edje-mode.el
@ -0,0 +1,513 @@
+;;; edje-mode-el -- Major mode for editing Edje files
+
+;; Author: Gustavo Sverzut Barbieri <barbieri@gmail.com>
+;; Created: 2007-07-23
+;; Keywords: Edje major-mode
+;; Url: http://barbieri-playground.googlecode.com/svn/dot-files/edje-mode.el
+;;      (if you find this file have problems, check that Url and request update)
+
+;; Copyright (C) 2007 Gustavo Sverzut Barbieri <barbieri@gmail.com>
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2 of
+;; the License, or (at your option) any later version.
+
+;; This program is distributed in the hope that it will be
+;; useful, but WITHOUT ANY WARRANTY; without even the implied
+;; warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+;; PURPOSE.  See the GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public
+;; License along with this program; if not, write to the Free
+;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+;; MA 02111-1307 USA
+
+;;; Commentary:
+;;
+;; This mode is based on tutorial from Scott Andrew Borton:
+;; http://two-wugs.net/emacs/mode-tutorial.html
+
+
+(defvar edje-mode-hook nil)
+
+(defun number-or-nil-to-string (v &optional default)
+  (cond ((numberp v) (number-to-string v))
+        ((stringp v) (if (string= v "") (number-to-string default) v))
+        (t           (number-to-string default))))
+
+(defun non-empty-string (s)
+  (and (not (eq 'nil s))
+       (not (string= "" s))))
+
+(defun edje-new-program-action-signal-emit (source emission)
+  "Insert new program SIGNAL_EMIT"
+  (interactive "ssource: \nsemission: ")
+  (insert
+   (concat
+    "               action: SIGNAL_EMIT \"" source "\" \"" emission "\";\n"
+    )))
+
+(defun edje-new-program-action-state-set (state value target)
+  "Insert new program STATE_SET"
+  (interactive "sstate: \nsvalue (0.0): \nstarget: ")
+  (insert
+   (concat
+    "               action: STATE_SET \"" state "\" "
+       (number-or-nil-to-string value 0.0) ";\n"
+    "               target: \"" target "\";\n"
+    )))
+
+(defun edje-new-program-action (action)
+  "Insert new program action"
+  (interactive "saction: ")
+  (setq action (upcase action))
+  (cond ((string= action "STATE_SET")
+         (edje-new-program-action-state-set "" 0.0 ""))
+        ((string= action "SIGNAL_EMIT")
+         (edje-new-program-action-signal-emit "" ""))
+        ))
+
+(defun edje-new-program (name signal source action)
+  "Insert new program block"
+  (interactive "sname: \nssignal: \nssource: \nsaction: ")
+  (insert
+   (concat
+    "\n"
+    "            program {\n"
+    "               name: \"" name "\";\n"
+
+    (if (non-empty-string signal)
+        (concat "               signal: \"" signal "\";\n"))
+
+    (if (non-empty-string source)
+        (concat "               source: \"" source "\";\n"))
+    ))
+
+  (edje-new-program-action action)
+
+  (insert
+   (concat
+    "            }\n"
+    "\n"
+    )))
+
+(defun edje-new-desc-relative (x y &optional defx defy)
+  "Insert new part description 'relative' line"
+  (interactive "sx: \nsy: ")
+  (insert
+   (concat
+    "                  relative: "
+    (number-or-nil-to-string x defx) " "
+    (number-or-nil-to-string y defy) ";\n"
+    )))
+
+(defun edje-new-desc-offset (x y &optional defx defy)
+  "Insert new part description 'offset' line"
+  (interactive "sx: \nsy: ")
+  (insert
+   (concat
+    "                  offset: "
+    (number-or-nil-to-string x defx) " "
+    (number-or-nil-to-string y defy) ";\n"
+    )))
+
+(defun edje-new-desc-inherit (name val)
+  "Insert new part description 'inherit' line"
+  (interactive "sname: \nsvalue: ")
+  (insert
+   (concat
+    "               inherit: \"" name "\" "
+    (number-or-nil-to-string val 0.0) ";\n"
+    )))
+
+(defun edje-new-desc-text (font size text)
+  "Insert new part description 'text' block"
+  (interactive "sfont: \nssize: \nstext: ")
+  (insert
+   (concat
+    "               text {\n"
+    "                  font: \"" font "\";\n"
+    "                  size: " (number-or-nil-to-string size) ";\n"
+    "                  text: \"" text "\";\n"
+    "               }\n"
+    )))
+
+(defun edje-new-desc-image (name)
+  "Insert new part description 'image' block"
+  (interactive "sname: ")
+  (insert
+   (concat
+    "               image {\n"
+    "                  normal: \"" name "\";\n"
+    "               }\n"
+    )))
+
+(defun edje-new-desc-color (r g b a &optional defr defg defb defa)
+  "Insert new part description 'color' line"
+  (interactive "sred: \nsgreen: \nsblue: \nsalpha: ")
+  (insert
+   (concat
+    "               color: "
+    (number-or-nil-to-string r defr) " "
+    (number-or-nil-to-string g defg) " "
+    (number-or-nil-to-string b defb) " "
+    (number-or-nil-to-string a defa) ";\n"
+    )))
+
+(defun edje-new-desc (name val &optional
+                           r1_rx r1_ry
+                           r2_rx r2_ry
+                           r1_ox r1_oy
+                           r2_ox r2_oy
+                           part_type)
+  "Insert new part description block"
+  (interactive "sName: \nsValue: ")
+  (insert
+   (concat
+    "            description {\n"
+    "               state: \"" name "\" " (number-or-nil-to-string val 0.0) ";\n"))
+  (if (string= part_type "RECT") (edje-new-desc-color 255 255 255 255))
+  (insert "               rel1 {\n")
+  (edje-new-desc-relative r1_rx r1_ry 0.0 0.0)
+  (edje-new-desc-offset r1_ox r1_oy 0 0)
+  (insert
+   (concat
+    "               }\n"
+    "               rel2 {\n"
+    ))
+  (edje-new-desc-relative r2_rx r2_ry 1.0 1.0)
+  (edje-new-desc-offset r2_ox r2_oy -1 -1)
+  (insert "               }\n")
+  (cond ((string= part_type "IMAGE") (edje-new-desc-image ""))
+        ((string= part_type "TEXT") (edje-new-desc-text "" 10 "contents"))
+        )
+  (insert "            }\n")
+  )
+
+(defun edje-new-part (name type &optional
+                           r1_rx r1_ry
+                           r2_rx r2_ry
+                           r1_ox r1_oy
+                           r2_ox r2_oy)
+  "Insert new part"
+  (interactive "sName: \nsType: ")
+  (setq type (upcase type))
+  (insert
+   (concat
+    "\n"
+    "         part {\n"
+    "            name: \"" name "\";\n"
+    "            type: " type ";\n"
+    "            mouse_events: 0;\n"
+    ))
+  (edje-new-desc "default" 0.0 r1_rx r1_ry r2_rx r2_ry r1_ox r1_oy r2_ox r2_oy type)
+  (insert
+   (concat
+    "         }\n"
+    )))
+
+(defun edje-setup-compile ()
+  (set (make-local-variable 'compile-command)
+       (concat "edje_cc " (buffer-file-name))
+  ))
+
+(defun edje-cc ()
+  "Runs edje_cc with current buffer."
+  (interactive)
+  (compile (edje-setup-compile)))
+
+(defvar edje-mode-map
+  (let ((edje-mode-map (make-sparse-keymap)))
+    (define-key edje-mode-map "\C-j" 'newline-and-indent)
+    (define-key edje-mode-map "\C-cp" 'edje-new-part)
+    (define-key edje-mode-map "\C-cd" 'edje-new-desc)
+    (define-key edje-mode-map "\C-cr" 'edje-new-desc-relative)
+    (define-key edje-mode-map "\C-co" 'edje-new-desc-offset)
+    (define-key edje-mode-map "\C-ch" 'edje-new-desc-inherit)
+    (define-key edje-mode-map "\C-cc" 'edje-new-desc-color)
+    (define-key edje-mode-map "\C-ci" 'edje-new-desc-image)
+    (define-key edje-mode-map "\C-ct" 'edje-new-desc-text)
+    (define-key edje-mode-map "\C-cg" 'edje-new-program)
+    (define-key edje-mode-map "\C-ca" 'edje-new-program-action)
+    (define-key edje-mode-map "\C-cs" 'edje-new-program-action-state-set)
+    (define-key edje-mode-map "\C-ce" 'edje-new-program-action-signal-emit)
+    edje-mode-map)
+  "Keymap for Edje major mode")
+
+(add-hook 'c-mode-hook 'edje-setup-compile)
+(add-to-list 'auto-mode-alist '("\\.edc$" . edje-mode))
+
+(defconst edje-font-lock-keywords-1
+  (eval-when-compile
+    (list
+     (list (concat "[ \t]*\\<"
+                   (regexp-opt
+                    '(
+                      "collections"
+                      "data"
+                      "description"
+                      "dragable"
+                      "fill"
+                      "fonts"
+                      "group"
+                      "image"
+                      "images"
+                      "origin"
+                      "part"
+                      "parts"
+                      "program"
+                      "programs"
+                      "rel1"
+                      "rel2"
+                      "script"
+                      "spectra"
+                      "style"
+                      "styles"
+                      "text"
+                      ) t) "\\>\\([ \t]*{\\|\\.\\)")
+           '(1 font-lock-function-name-face))
+
+     ))
+  "Major keywords")
+
+(defconst edje-font-lock-keywords-2
+  (eval-when-compile
+    (append edje-font-lock-keywords-1
+            (list
+             (list
+              (concat "^\\([ \t]*\\|[ \t]*[a-z]+\\.\\|\\)\\<"
+                      (regexp-opt
+                       '("action"
+                         "after"
+                         "alias"
+                         "align"
+                         "angle"
+                         "aspect"
+                         "aspect_preference"
+                         "base"
+                         "border"
+                         "clip_to"
+                         "collections"
+                         "color"
+                         "color2"
+                         "color3"
+                         "color_class"
+                         "color_classes"
+                         "confine"
+                         "data"
+                         "description"
+                         "dragable"
+                         "effect"
+                         "elipsis"
+                         "events"
+                         "fill"
+                         "fit"
+                         "fixed"
+                         "font"
+                         "fonts"
+                         "gradient"
+                         "group"
+                         "ignore_flags"
+                         "image"
+                         "images"
+                         "in"
+                         "inherit"
+                         "item"
+                         "max"
+                         "middle"
+                         "min"
+                         "mouse_events"
+                         "name"
+                         "normal"
+                         "offset"
+                         "origin"
+                         "part"
+                         "parts"
+                         "pointer_mode"
+                         "precise_is_inside"
+                         "program"
+                         "programs"
+                         "rel1"
+                         "rel2"
+                         "relative"
+                         "repeat_events"
+                         "signal"
+                         "size"
+                         "smooth"
+                         "source"
+                         "spectra"
+                         "spectrum"
+                         "spread"
+                         "state"
+                         "step"
+                         "style"
+                         "styles"
+                         "tag"
+                         "target"
+                         "text"
+                         "text_class"
+                         "text_source"
+                         "to"
+                         "to_x"
+                         "to_y"
+                         "transition"
+                         "tween"
+                         "type"
+                         "use_alternate_font_metrics"
+                         "visible"
+                         "x"
+                         "y"
+                         ) t) "\\>[ \t]*[:,]")
+              '(2 font-lock-keyword-face))
+             )))
+  "Minor keywords")
+
+(defconst edje-font-lock-keywords-3
+  (eval-when-compile
+    (append edje-font-lock-keywords-2
+            (list
+             (list
+              (concat "\\<"
+                      (regexp-opt
+                       '(; image options (st_images_image)
+                         "RAW"
+                         "COMP"
+                         "LOSSY"
+                         "USER"
+                         ; part types (st_collections_group_parts_part_type)
+                         "NONE"
+                         "RECT"
+                         "TEXT"
+                         "IMAGE"
+                         "SWALLOW"
+                         "TEXTBLOCK"
+                         "GRADIENT"
+                         "GROUP"
+                         ; ignore flags (st_collections_group_parts_part_ignore_flags)
+                         ;"NONE"
+                         "ON_HOLD"
+                         ; pointer mode (st_collections_group_parts_part_pointer_mode)
+                         "AUTOGRAB"
+                         "NOGRAB"
+                         ; aspect (st_collections_group_parts_part_description_aspect_preference)
+                         "NONE"
+                         "VERTICAL"
+                         "HORIZONTAL"
+                         "BOTH"
+                         ; text effect (st_collections_group_parts_part_effect)
+                         "NONE"
+                         "PLAIN"
+                         "OUTLINE"
+                         "SOFT_OUTLINE"
+                         "SHADOW"
+                         "SOFT_SHADOW"
+                         "OUTLINE_SHADOW"
+                         "OUTLINE_SOFT_SHADOW"
+                         "FAR_SHADOW"
+                         "FAR_SOFT_SHADOW"
+                         "GLOW"
+                         ; image fill (st_collections_group_parts_part_description_fill_type)
+                         "SCALE"
+                         "TILE"
+                         ; program action (st_collections_group_programs_program_action)
+                         "STATE_SET"
+                         "ACTION_STOP"
+                         "SIGNAL_EMIT"
+                         "DRAG_VAL_SET"
+                         "DRAG_VAL_STEP"
+                         "DRAG_VAL_PAGE"
+                         "SCRIPT"
+                         ; program transition (st_collections_group_programs_program_transition)
+                         "LINEAR"
+                         "SINUSOIDAL"
+                         "CUBIC_BEZIER"
+                         "ACCELERATE"
+                         "DECELERATE"
+                         ) t) "\\>")
+              '(1 font-lock-builtin-face))
+             )))
+  "Enumerate values")
+
+(defconst edje-font-lock-keywords-4
+  (eval-when-compile
+    (append edje-font-lock-keywords-3
+            (list
+             (list
+              (concat "[ \t]*#"
+                      (regexp-opt
+                       '("if"
+                         "ifdef"
+                         "ifndef"
+                         "define"
+                         "else"
+                         "endif"
+                         "include"
+                         "undef") t) "[ \t]*")
+              '(1 font-lock-builtin-face))
+             )))
+  "CPP directives")
+
+(defconst edje-font-lock-keywords-5
+  (eval-when-compile
+    (append edje-font-lock-keywords-4
+            (list
+             (list "[ \t]*#undef[ \t]+\\([a-zA-Z_][a-zA-Z0-9_]*\\)"
+                   '(1 font-lock-variable-name-face))
+             (list "[ \t]*#define[ \t]+\\([a-zA-Z_][a-zA-Z0-9_]*\\)("
+                   '(1 font-lock-function-name-face))
+             (list "[ \t]*#define[ \t]+\\([a-zA-Z_][a-zA-Z0-9_]*\\)"
+                   '(1 font-lock-variable-name-face))
+             )))
+  "CPP directives that define constants")
+
+
+(defvar edje-font-lock-keywords edje-font-lock-keywords-5)
+
+(defvar edje-mode-syntax-table
+  (let ((edje-mode-syntax-table (make-syntax-table)))
+    ; This is added so entity names with underscores can be more easily parsed
+    (modify-syntax-entry ?_ "w" edje-mode-syntax-table)
+    (modify-syntax-entry ?/ ". 124b" edje-mode-syntax-table)
+    (modify-syntax-entry ?* ". 23" edje-mode-syntax-table)
+    (modify-syntax-entry ?\n "> b" edje-mode-syntax-table)
+
+    edje-mode-syntax-table)
+  "Syntax table for edje-mode")
+
+(c-add-style
+ "edje"
+ '("gnu"
+   (indent-tabs-mode . nil)
+   (tab-width . 8)
+   (c-basic-offset . 3)
+   (c-backslash-column . 72)
+   (c-hanging-braces-alist  .
+                            ((block-open after)
+                             (brace-list-open after)
+                             (substatement-open after))
+                            )
+   (c-offsets-alist         .
+                            ((statement-block-intro . +)
+                             (defun-open            . 0)
+                             (substatement-open     . 0)
+                             (defun-block-intro     . +)
+                             (block-open            . 0)
+                             (label                 . +)
+                             ))))
+
+
+(define-derived-mode edje-mode c-mode "Edje"
+  "Major mode for editing Edje files"
+  (interactive)
+  (use-local-map edje-mode-map)
+  (set-syntax-table edje-mode-syntax-table)
+  (set (make-local-variable 'font-lock-defaults) '(edje-font-lock-keywords))
+  (set (make-local-variable 'require-final-newline) t)
+  (c-set-style "edje")
+  (run-hooks 'edje-mode-hook)
+  )
+
+(provide 'edje-mode)
+
+;;; edje-mode.el ends here
--- a/data/edje/include/edje.inc
+++ b/data/edje/include/edje.inc
@ -133,7 +133,6 @@ native       set_min_size     (Float:w, Float:h);
 native       set_max_size     (Float:w, Float:h);
 native       set_mouse_events (part_id, ev);
 native       get_mouse_events (part_id);
-native       set_pointer_mode(part_id, mode);
 native       set_repeat_events(part_id, rep);
 native       get_repeat_events(part_id);
 native       set_ignore_flags (part_id, flags);
@ -142,12 +141,6 @@ native       set_mask_flags   (part_id, flags);
 native       get_mask_flags   (part_id);
 native       part_swallow     (part_id, GROUP:str[]);

-/* set_focus() and unset_focus() may receive an optional parameter
-   seat_name[], as set_focus(part_id, seat_name[]) and
-   unset_focus(seat_name[]) */
-native       set_focus        (part_id, ...);
-native       unset_focus      (...);
-
 native       external_param_get_int(id, param_name[]);
 native       external_param_set_int(id, param_name[], value);
 native Float:external_param_get_float(id, param_name[]);
@ -336,6 +329,3 @@ enum Anim_Param

 native       set_tween_state_anim  (part_id, state1[], Float:state1_val, state2[], Float:state2_val, Anim_Param:p, Float:tween, ...);
 native       set_state_anim  (part_id, state[], Float:state1_val, Anim_Param:p, Float:tween, ...);
-native       swallow_has_content (part_id);
-
-native       echo(string[])
--- a/data/edje/include/meson.build
+++ b/data/edje/include/meson.build
@ -1,3 +0,0 @@
-install_data('edje.inc',
-  install_dir : join_paths(dir_data, 'edje', 'include')
-)
--- a/data/edje/meson.build
+++ b/data/edje/meson.build
@ -1,5 +0,0 @@
-subdir('include')
-
-install_data(files('edje.xml'),
-  install_dir : join_paths(dir_data, 'mime', 'packages')
-)
--- a/data/elementary/Makefile.am
+++ b/data/elementary/Makefile.am
@ -0,0 +1,3 @@
+AUTOMAKE_OPTIONS     = 1.4 foreign
+MAINTAINERCLEANFILES = Makefile.in
+SUBDIRS              = themes images objects desktop edje_externals
--- a/data/elementary/colors/candy-mint.src
+++ b/data/elementary/colors/candy-mint.src
@ -1,698 +0,0 @@
-group "Elm_Palette" struct {
-    group "colors" list {
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg";
-            value "r" uchar: 243;
-            value "g" uchar: 189;
-            value "b" uchar: 189;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-semi";
-            value "r" uchar: 245;
-            value "g" uchar: 187;
-            value "b" uchar: 187;
-            value "a" uchar: 182;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-trans";
-            value "r" uchar: 243;
-            value "g" uchar: 189;
-            value "b" uchar: 189;
-            value "a" uchar: 192;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-dimmest";
-            value "r" uchar: 150;
-            value "g" uchar: 58;
-            value "b" uchar: 58;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-dimmer";
-            value "r" uchar: 175;
-            value "g" uchar: 49;
-            value "b" uchar: 49;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-alt-dark";
-            value "r" uchar: 205;
-            value "g" uchar: 99;
-            value "b" uchar: 99;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-alt-light";
-            value "r" uchar: 247;
-            value "g" uchar: 201;
-            value "b" uchar: 201;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-alt";
-            value "r" uchar: 241;
-            value "g" uchar: 175;
-            value "b" uchar: 175;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-dim";
-            value "r" uchar: 244;
-            value "g" uchar: 164;
-            value "b" uchar: 164;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-dark";
-            value "r" uchar: 231;
-            value "g" uchar: 111;
-            value "b" uchar: 111;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-dark-invisible";
-            value "r" uchar: 231;
-            value "g" uchar: 111;
-            value "b" uchar: 111;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-darkest";
-            value "r" uchar: 235;
-            value "g" uchar: 111;
-            value "b" uchar: 111;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-dark-alt";
-            value "r" uchar: 219;
-            value "g" uchar: 69;
-            value "b" uchar: 69;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-medium";
-            value "r" uchar: 243;
-            value "g" uchar: 173;
-            value "b" uchar: 173;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-high";
-            value "r" uchar: 227;
-            value "g" uchar: 141;
-            value "b" uchar: 141;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-higher";
-            value "r" uchar: 251;
-            value "g" uchar: 229;
-            value "b" uchar: 229;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-highest";
-            value "r" uchar: 192;
-            value "g" uchar: 32;
-            value "b" uchar: 32;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-light";
-            value "r" uchar: 255;
-            value "g" uchar: 255;
-            value "b" uchar: 255;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-light-alt";
-            value "r" uchar: 249;
-            value "g" uchar: 215;
-            value "b" uchar: 215;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":fg-dim";
-            value "r" uchar: 211;
-            value "g" uchar: 163;
-            value "b" uchar: 163;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":fg";
-            value "r" uchar: 100;
-            value "g" uchar: 60;
-            value "b" uchar: 60;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":fg-prehigh";
-            value "r" uchar: 83;
-            value "g" uchar: 45;
-            value "b" uchar: 45;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":fg-high";
-            value "r" uchar: 83;
-            value "g" uchar: 51;
-            value "b" uchar: 51;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":fg-higher";
-            value "r" uchar: 60;
-            value "g" uchar: 36;
-            value "b" uchar: 36;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":fg-light";
-            value "r" uchar: 224;
-            value "g" uchar: 224;
-            value "b" uchar: 224;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":selected";
-            value "r" uchar: 110;
-            value "g" uchar: 190;
-            value "b" uchar: 80;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":selected-light";
-            value "r" uchar: 110;
-            value "g" uchar: 90;
-            value "b" uchar: 80;
-            value "a" uchar: 25;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":selected-medium";
-            value "r" uchar: 110;
-            value "g" uchar: 190;
-            value "b" uchar: 80;
-            value "a" uchar: 128;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":selected-heavy";
-            value "r" uchar: 110;
-            value "g" uchar: 190;
-            value "b" uchar: 80;
-            value "a" uchar: 192;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":selected-alt";
-            value "r" uchar: 239;
-            value "g" uchar: 175;
-            value "b" uchar: 110;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":selected-alt-trans";
-            value "r" uchar: 255;
-            value "g" uchar: 153;
-            value "b" uchar: 51;
-            value "a" uchar: 64;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":selected-alt-dim";
-            value "r" uchar: 231;
-            value "g" uchar: 182;
-            value "b" uchar: 134;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":selected-dim";
-            value "r" uchar: 55;
-            value "g" uchar: 95;
-            value "b" uchar: 40;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":selected2";
-            value "r" uchar: 179;
-            value "g" uchar: 232;
-            value "b" uchar: 127;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":selected2-dim";
-            value "r" uchar: 206;
-            value "g" uchar: 239;
-            value "b" uchar: 174;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":selected3";
-            value "r" uchar: 255;
-            value "g" uchar: 51;
-            value "b" uchar: 153;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":selected4";
-            value "r" uchar: 228;
-            value "g" uchar: 118;
-            value "b" uchar: 118;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":selected4-dim";
-            value "r" uchar: 229;
-            value "g" uchar: 140;
-            value "b" uchar: 140;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":selected5";
-            value "r" uchar: 119;
-            value "g" uchar: 0;
-            value "b" uchar: 238;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":selected5-dim";
-            value "r" uchar: 179;
-            value "g" uchar: 127;
-            value "b" uchar: 230;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":selected6";
-            value "r" uchar: 0;
-            value "g" uchar: 121;
-            value "b" uchar: 61;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":selected6-dim";
-            value "r" uchar: 104;
-            value "g" uchar: 202;
-            value "b" uchar: 142;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":win-normal";
-            value "r" uchar: 255;
-            value "g" uchar: 255;
-            value "b" uchar: 255;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":win-selected";
-            value "r" uchar: 255;
-            value "g" uchar: 255;
-            value "b" uchar: 255;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":light-off";
-            value "r" uchar: 255;
-            value "g" uchar: 255;
-            value "b" uchar: 255;
-            value "a" uchar: 0;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":light-medium";
-            value "r" uchar: 255;
-            value "g" uchar: 255;
-            value "b" uchar: 255;
-            value "a" uchar: 128;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":light-high";
-            value "r" uchar: 255;
-            value "g" uchar: 255;
-            value "b" uchar: 255;
-            value "a" uchar: 200;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":light-on";
-            value "r" uchar: 255;
-            value "g" uchar: 255;
-            value "b" uchar: 255;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":light-glow";
-            value "r" uchar: 255;
-            value "g" uchar: 220;
-            value "b" uchar: 160;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":dim-invisible";
-            value "r" uchar: 0;
-            value "g" uchar: 0;
-            value "b" uchar: 0;
-            value "a" uchar: 0;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":dim-lightest";
-            value "r" uchar: 0;
-            value "g" uchar: 0;
-            value "b" uchar: 0;
-            value "a" uchar: 12;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":dim-lighter";
-            value "r" uchar: 0;
-            value "g" uchar: 0;
-            value "b" uchar: 0;
-            value "a" uchar: 18;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":dim-light";
-            value "r" uchar: 0;
-            value "g" uchar: 0;
-            value "b" uchar: 0;
-            value "a" uchar: 44;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":dim";
-            value "r" uchar: 0;
-            value "g" uchar: 0;
-            value "b" uchar: 0;
-            value "a" uchar: 96;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":dim-dark";
-            value "r" uchar: 0;
-            value "g" uchar: 0;
-            value "b" uchar: 0;
-            value "a" uchar: 122;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":shadow";
-            value "r" uchar: 0;
-            value "g" uchar: 0;
-            value "b" uchar: 0;
-            value "a" uchar: 128;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":shadow-selected";
-            value "r" uchar: 0;
-            value "g" uchar: 0;
-            value "b" uchar: 0;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":shadow-disabled";
-            value "r" uchar: 0;
-            value "g" uchar: 0;
-            value "b" uchar: 0;
-            value "a" uchar: 64;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":outline";
-            value "r" uchar: 0;
-            value "g" uchar: 0;
-            value "b" uchar: 0;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":validate-fail";
-            value "r" uchar: 255;
-            value "g" uchar: 32;
-            value "b" uchar: 16;
-            value "a" uchar: 80;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":validate-pass";
-            value "r" uchar: 32;
-            value "g" uchar: 255;
-            value "b" uchar: 16;
-            value "a" uchar: 80;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":success";
-            value "r" uchar: 0;
-            value "g" uchar: 169;
-            value "b" uchar: 0;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":success-dim";
-            value "r" uchar: 125;
-            value "g" uchar: 212;
-            value "b" uchar: 125;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":keyword";
-            value "r" uchar: 255;
-            value "g" uchar: 43;
-            value "b" uchar: 43;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":keyword-dim";
-            value "r" uchar: 194;
-            value "g" uchar: 157;
-            value "b" uchar: 157;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":match";
-            value "r" uchar: 227;
-            value "g" uchar: 174;
-            value "b" uchar: 68;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":match-dim";
-            value "r" uchar: 229;
-            value "g" uchar: 196;
-            value "b" uchar: 123;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":comment";
-            value "r" uchar: 51;
-            value "g" uchar: 153;
-            value "b" uchar: 153;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":comment-dim";
-            value "r" uchar: 165;
-            value "g" uchar: 202;
-            value "b" uchar: 202;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":number";
-            value "r" uchar: 153;
-            value "g" uchar: 153;
-            value "b" uchar: 26;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":number-dim";
-            value "r" uchar: 192;
-            value "g" uchar: 192;
-            value "b" uchar: 111;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":class";
-            value "r" uchar: 119;
-            value "g" uchar: 170;
-            value "b" uchar: 221;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":class-dim";
-            value "r" uchar: 169;
-            value "g" uchar: 189;
-            value "b" uchar: 209;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":note";
-            value "r" uchar: 160;
-            value "g" uchar: 80;
-            value "b" uchar: 17;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":note-dim";
-            value "r" uchar: 236;
-            value "g" uchar: 141;
-            value "b" uchar: 65;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":todo";
-            value "r" uchar: 40;
-            value "g" uchar: 80;
-            value "b" uchar: 160;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":todo-dim";
-            value "r" uchar: 134;
-            value "g" uchar: 164;
-            value "b" uchar: 225;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: "/bg/normal/frame/title";
-            value "r" uchar: 110;
-            value "g" uchar: 190;
-            value "b" uchar: 80;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: "/bg/selected/titlebar";
-            value "r" uchar: 110;
-            value "g" uchar: 190;
-            value "b" uchar: 80;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: "/fg/normal/menu/title";
-            value "r" uchar: 86;
-            value "g" uchar: 42;
-            value "b" uchar: 42;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: "/bg/selected/button";
-            value "r" uchar: 210;
-            value "g" uchar: 174;
-            value "b" uchar: 174;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: "/fg/selected/button";
-            value "r" uchar: 128;
-            value "g" uchar: 64;
-            value "b" uchar: 64;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: "/fg/disabled/button";
-            value "r" uchar: 169;
-            value "g" uchar: 87;
-            value "b" uchar: 87;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: "/fg/selected/button/bar";
-            value "r" uchar: 110;
-            value "g" uchar: 190;
-            value "b" uchar: 80;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: "/fg/pressed/button";
-            value "r" uchar: 0;
-            value "g" uchar: 0;
-            value "b" uchar: 0;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: "/fg/pressed/button-anchor";
-            value "r" uchar: 110;
-            value "g" uchar: 190;
-            value "b" uchar: 80;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: "/fg/normal/pointer/base";
-            value "r" uchar: 255;
-            value "g" uchar: 255;
-            value "b" uchar: 255;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: "/bg/selected/menu/item/base";
-            value "r" uchar: 110;
-            value "g" uchar: 190;
-            value "b" uchar: 80;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: "/fg/normal/entry/cursor";
-            value "r" uchar: 0;
-            value "g" uchar: 0;
-            value "b" uchar: 0;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: "/fg/pressed/titlebar/buttons/close";
-            value "r" uchar: 238;
-            value "g" uchar: 146;
-            value "b" uchar: 146;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: "/fg/normal/gadgets/ibar/menu/item/base";
-            value "r" uchar: 231;
-            value "g" uchar: 185;
-            value "b" uchar: 185;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: "/fg/pressed/syscon/button/text";
-            value "r" uchar: 0;
-            value "g" uchar: 0;
-            value "b" uchar: 0;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: "/fg/selected/fileman/nav/path/text";
-            value "r" uchar: 0;
-            value "g" uchar: 0;
-            value "b" uchar: 0;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: "/fg/normal/grid/item/fileman/desktop";
-            value "r" uchar: 189;
-            value "g" uchar: 131;
-            value "b" uchar: 131;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: "/fg/normal/text-hilight";
-            value "r" uchar: 0;
-            value "g" uchar: 0;
-            value "b" uchar: 0;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: "/fg/normal/text-heading";
-            value "r" uchar: 0;
-            value "g" uchar: 0;
-            value "b" uchar: 0;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: "/fg/normal/text-heading-sub";
-            value "r" uchar: 0;
-            value "g" uchar: 0;
-            value "b" uchar: 0;
-            value "a" uchar: 200;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: "/bg/normal/hoversel/item";
-            value "r" uchar: 110;
-            value "g" uchar: 190;
-            value "b" uchar: 80;
-            value "a" uchar: 0;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: "/bg/selected/hoversel/item";
-            value "r" uchar: 110;
-            value "g" uchar: 190;
-            value "b" uchar: 80;
-            value "a" uchar: 255;
-        }
-    }
-    value "version" int: 1000;
-}
--- a/data/elementary/colors/default.src
+++ b/data/elementary/colors/default.src
@ -1,82 +0,0 @@
-group "Elm_Palette" struct {
-  value "version" int: 1000;
-  group "colors" list {
-    group "Elm_Palette_Color" struct { value "name" string: ":bg";                 value "r" uchar:  64; value "g" uchar:  64; value "b" uchar:  64; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":bg-semi";            value "r" uchar:  64; value "g" uchar:  64; value "b" uchar:  64; value "a" uchar: 182; }
-    group "Elm_Palette_Color" struct { value "name" string: ":bg-trans";           value "r" uchar:  64; value "g" uchar:  64; value "b" uchar:  64; value "a" uchar: 192; }
-    group "Elm_Palette_Color" struct { value "name" string: ":bg-dimmest";         value "r" uchar:  36; value "g" uchar:  36; value "b" uchar:  36; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":bg-dimmer";          value "r" uchar:  44; value "g" uchar:  44; value "b" uchar:  44; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":bg-alt-dark";        value "r" uchar:  54; value "g" uchar:  54; value "b" uchar:  54; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":bg-alt-light";       value "r" uchar:  58; value "g" uchar:  58; value "b" uchar:  58; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":bg-alt";             value "r" uchar:  56; value "g" uchar:  56; value "b" uchar:  56; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":bg-dim";             value "r" uchar:  48; value "g" uchar:  48; value "b" uchar:  48; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":bg-dark";            value "r" uchar:  32; value "g" uchar:  32; value "b" uchar:  32; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":bg-dark-invisible";  value "r" uchar:  32; value "g" uchar:  32; value "b" uchar:  32; value "a" uchar:   0; }
-    group "Elm_Palette_Color" struct { value "name" string: ":bg-darkest";         value "r" uchar:  16; value "g" uchar:  16; value "b" uchar:  16; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":bg-dark-alt";        value "r" uchar:  28; value "g" uchar:  28; value "b" uchar:  28; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":bg-medium";          value "r" uchar:  72; value "g" uchar:  72; value "b" uchar:  72; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":bg-high";            value "r" uchar:  80; value "g" uchar:  80; value "b" uchar:  80; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":bg-higher";          value "r" uchar:  96; value "g" uchar:  96; value "b" uchar:  96; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":bg-highest";         value "r" uchar: 112; value "g" uchar: 112; value "b" uchar: 112; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":bg-light";           value "r" uchar: 192; value "g" uchar: 192; value "b" uchar: 192; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":bg-light-alt";       value "r" uchar: 184; value "g" uchar: 184; value "b" uchar: 184; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":fg-dim";             value "r" uchar: 128; value "g" uchar: 128; value "b" uchar: 128; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":fg";                 value "r" uchar: 160; value "g" uchar: 160; value "b" uchar: 160; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":fg-prehigh";         value "r" uchar: 192; value "g" uchar: 192; value "b" uchar: 192; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":fg-high";            value "r" uchar: 200; value "g" uchar: 200; value "b" uchar: 200; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":fg-higher";          value "r" uchar: 220; value "g" uchar: 220; value "b" uchar: 220; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":fg-light";           value "r" uchar: 255; value "g" uchar: 255; value "b" uchar: 255; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":selected";           value "r" uchar:  51; value "g" uchar: 153; value "b" uchar: 255; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":selected-light";     value "r" uchar:  51; value "g" uchar: 153; value "b" uchar: 255; value "a" uchar:  25; }
-    group "Elm_Palette_Color" struct { value "name" string: ":selected-medium";    value "r" uchar:  51; value "g" uchar: 153; value "b" uchar: 255; value "a" uchar: 128; }
-    group "Elm_Palette_Color" struct { value "name" string: ":selected-heavy";     value "r" uchar:  51; value "g" uchar: 153; value "b" uchar: 255; value "a" uchar: 192; }
-    group "Elm_Palette_Color" struct { value "name" string: ":selected-alt";       value "r" uchar: 255; value "g" uchar: 153; value "b" uchar:  51; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":selected-alt-trans"; value "r" uchar: 255; value "g" uchar: 153; value "b" uchar:  51; value "a" uchar:  64; }
-    group "Elm_Palette_Color" struct { value "name" string: ":selected-alt-dim";   value "r" uchar: 128; value "g" uchar:  76; value "b" uchar:  25; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":selected-dim";       value "r" uchar:  25; value "g" uchar:  76; value "b" uchar: 128; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":selected2";          value "r" uchar: 153; value "g" uchar: 255; value "b" uchar:  51; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":selected2-dim";      value "r" uchar:  76; value "g" uchar: 128; value "b" uchar:  25; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":selected3";          value "r" uchar: 255; value "g" uchar:  51; value "b" uchar: 153; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":selected4";          value "r" uchar: 255; value "g" uchar:  51; value "b" uchar:  51; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":selected4-dim";      value "r" uchar: 153; value "g" uchar:  34; value "b" uchar:  34; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":selected5";          value "r" uchar: 153; value "g" uchar:  51; value "b" uchar: 255; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":selected5-dim";      value "r" uchar:  76; value "g" uchar:  25; value "b" uchar: 127; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":selected6";          value "r" uchar:  51; value "g" uchar: 255; value "b" uchar: 153; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":selected6-dim";      value "r" uchar:  56; value "g" uchar: 160; value "b" uchar:  96; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":win-normal";         value "r" uchar: 255; value "g" uchar: 255; value "b" uchar: 255; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":win-selected";       value "r" uchar: 255; value "g" uchar: 255; value "b" uchar: 255; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":light-off";          value "r" uchar: 255; value "g" uchar: 255; value "b" uchar: 255; value "a" uchar:   0; }
-    group "Elm_Palette_Color" struct { value "name" string: ":light-medium";       value "r" uchar: 255; value "g" uchar: 255; value "b" uchar: 255; value "a" uchar: 128; }
-    group "Elm_Palette_Color" struct { value "name" string: ":light-high";         value "r" uchar: 255; value "g" uchar: 255; value "b" uchar: 255; value "a" uchar: 200; }
-    group "Elm_Palette_Color" struct { value "name" string: ":light-on";           value "r" uchar: 255; value "g" uchar: 255; value "b" uchar: 255; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":light-glow";         value "r" uchar: 255; value "g" uchar: 220; value "b" uchar: 160; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":dim-invisible";      value "r" uchar:   0; value "g" uchar:   0; value "b" uchar:   0; value "a" uchar:   0; }
-    group "Elm_Palette_Color" struct { value "name" string: ":dim-lightest";       value "r" uchar:   0; value "g" uchar:   0; value "b" uchar:   0; value "a" uchar:  32; }
-    group "Elm_Palette_Color" struct { value "name" string: ":dim-lighter";        value "r" uchar:   0; value "g" uchar:   0; value "b" uchar:   0; value "a" uchar:  64; }
-    group "Elm_Palette_Color" struct { value "name" string: ":dim-light";          value "r" uchar:   0; value "g" uchar:   0; value "b" uchar:   0; value "a" uchar:  80; }
-    group "Elm_Palette_Color" struct { value "name" string: ":dim";                value "r" uchar:   0; value "g" uchar:   0; value "b" uchar:   0; value "a" uchar: 160; }
-    group "Elm_Palette_Color" struct { value "name" string: ":dim-dark";           value "r" uchar:   0; value "g" uchar:   0; value "b" uchar:   0; value "a" uchar: 200; }
-    group "Elm_Palette_Color" struct { value "name" string: ":shadow";             value "r" uchar:   0; value "g" uchar:   0; value "b" uchar:   0; value "a" uchar: 128; }
-    group "Elm_Palette_Color" struct { value "name" string: ":shadow-selected";    value "r" uchar:   0; value "g" uchar:   0; value "b" uchar:   0; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":shadow-disabled";    value "r" uchar:   0; value "g" uchar:   0; value "b" uchar:   0; value "a" uchar:  64; }
-    group "Elm_Palette_Color" struct { value "name" string: ":outline";            value "r" uchar:   0; value "g" uchar:   0; value "b" uchar:   0; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":validate-fail";      value "r" uchar: 255; value "g" uchar:  32; value "b" uchar:  16; value "a" uchar:  80; }
-    group "Elm_Palette_Color" struct { value "name" string: ":validate-pass";      value "r" uchar:  32; value "g" uchar: 255; value "b" uchar:  16; value "a" uchar:  80; }
-    group "Elm_Palette_Color" struct { value "name" string: ":success";            value "r" uchar:  51; value "g" uchar: 255; value "b" uchar:  51; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":success-dim";        value "r" uchar:  51; value "g" uchar: 153; value "b" uchar:  51; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":keyword";            value "r" uchar: 255; value "g" uchar: 153; value "b" uchar: 153; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":keyword-dim";        value "r" uchar: 128; value "g" uchar:  80; value "b" uchar:  80; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":match";              value "r" uchar: 255; value "g" uchar: 187; value "b" uchar:  51; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":match-dim";          value "r" uchar: 128; value "g" uchar:  96; value "b" uchar:  25; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":comment";            value "r" uchar:  51; value "g" uchar: 153; value "b" uchar: 153; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":comment-dim";        value "r" uchar:  56; value "g" uchar:  96; value "b" uchar:  96; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":number";             value "r" uchar: 220; value "g" uchar: 220; value "b" uchar:  48; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":number-dim";         value "r" uchar: 128; value "g" uchar: 128; value "b" uchar:  56; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":class";              value "r" uchar: 119; value "g" uchar: 170; value "b" uchar: 221; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":class-dim";          value "r" uchar:  59; value "g" uchar:  85; value "b" uchar: 110; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":note";               value "r" uchar: 160; value "g" uchar:  80; value "b" uchar:  17; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":note-dim";           value "r" uchar:  80; value "g" uchar:  40; value "b" uchar:   8; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":todo";               value "r" uchar:  40; value "g" uchar:  80; value "b" uchar: 160; value "a" uchar: 255; }
-    group "Elm_Palette_Color" struct { value "name" string: ":todo-dim";           value "r" uchar:  20; value "g" uchar:  40; value "b" uchar:  80; value "a" uchar: 255; }
-  }
-}
--- a/data/elementary/colors/ebony-brass.src
+++ b/data/elementary/colors/ebony-brass.src
@ -1,558 +0,0 @@
-group "Elm_Palette" struct {
-    group "colors" list {
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg";
-            value "r" uchar: 16;
-            value "g" uchar: 16;
-            value "b" uchar: 16;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-semi";
-            value "r" uchar: 16;
-            value "g" uchar: 16;
-            value "b" uchar: 16;
-            value "a" uchar: 182;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-trans";
-            value "r" uchar: 16;
-            value "g" uchar: 16;
-            value "b" uchar: 16;
-            value "a" uchar: 192;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-dimmest";
-            value "r" uchar: 8;
-            value "g" uchar: 8;
-            value "b" uchar: 8;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-dimmer";
-            value "r" uchar: 14;
-            value "g" uchar: 14;
-            value "b" uchar: 14;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-alt-dark";
-            value "r" uchar: 20;
-            value "g" uchar: 20;
-            value "b" uchar: 20;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-alt-light";
-            value "r" uchar: 42;
-            value "g" uchar: 42;
-            value "b" uchar: 42;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-alt";
-            value "r" uchar: 0;
-            value "g" uchar: 0;
-            value "b" uchar: 0;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-dim";
-            value "r" uchar: 33;
-            value "g" uchar: 33;
-            value "b" uchar: 33;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-dark";
-            value "r" uchar: 0;
-            value "g" uchar: 0;
-            value "b" uchar: 0;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-dark-invisible";
-            value "r" uchar: 0;
-            value "g" uchar: 0;
-            value "b" uchar: 0;
-            value "a" uchar: 0;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-darkest";
-            value "r" uchar: 0;
-            value "g" uchar: 0;
-            value "b" uchar: 0;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-dark-alt";
-            value "r" uchar: 8;
-            value "g" uchar: 8;
-            value "b" uchar: 8;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-medium";
-            value "r" uchar: 50;
-            value "g" uchar: 50;
-            value "b" uchar: 50;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-high";
-            value "r" uchar: 50;
-            value "g" uchar: 50;
-            value "b" uchar: 50;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-higher";
-            value "r" uchar: 69;
-            value "g" uchar: 69;
-            value "b" uchar: 69;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-highest";
-            value "r" uchar: 99;
-            value "g" uchar: 99;
-            value "b" uchar: 99;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-light";
-            value "r" uchar: 123;
-            value "g" uchar: 123;
-            value "b" uchar: 123;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-light-alt";
-            value "r" uchar: 125;
-            value "g" uchar: 125;
-            value "b" uchar: 125;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":fg-dim";
-            value "r" uchar: 221;
-            value "g" uchar: 221;
-            value "b" uchar: 221;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":fg";
-            value "r" uchar: 255;
-            value "g" uchar: 255;
-            value "b" uchar: 255;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":fg-prehigh";
-            value "r" uchar: 209;
-            value "g" uchar: 209;
-            value "b" uchar: 209;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":fg-high";
-            value "r" uchar: 192;
-            value "g" uchar: 192;
-            value "b" uchar: 192;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":fg-higher";
-            value "r" uchar: 190;
-            value "g" uchar: 190;
-            value "b" uchar: 190;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":fg-light";
-            value "r" uchar: 255;
-            value "g" uchar: 255;
-            value "b" uchar: 255;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":selected";
-            value "r" uchar: 255;
-            value "g" uchar: 171;
-            value "b" uchar: 19;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":selected-light";
-            value "r" uchar: 242;
-            value "g" uchar: 180;
-            value "b" uchar: 0;
-            value "a" uchar: 25;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":selected-medium";
-            value "r" uchar: 242;
-            value "g" uchar: 180;
-            value "b" uchar: 0;
-            value "a" uchar: 128;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":selected-heavy";
-            value "r" uchar: 242;
-            value "g" uchar: 180;
-            value "b" uchar: 0;
-            value "a" uchar: 192;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":selected-alt";
-            value "r" uchar: 255;
-            value "g" uchar: 132;
-            value "b" uchar: 4;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":selected-alt-trans";
-            value "r" uchar: 255;
-            value "g" uchar: 90;
-            value "b" uchar: 51;
-            value "a" uchar: 64;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":selected-alt-dim";
-            value "r" uchar: 128;
-            value "g" uchar: 60;
-            value "b" uchar: 25;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":selected-dim";
-            value "r" uchar: 121;
-            value "g" uchar: 76;
-            value "b" uchar: 2;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":selected2";
-            value "r" uchar: 153;
-            value "g" uchar: 255;
-            value "b" uchar: 51;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":selected2-dim";
-            value "r" uchar: 76;
-            value "g" uchar: 128;
-            value "b" uchar: 25;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":selected3";
-            value "r" uchar: 255;
-            value "g" uchar: 51;
-            value "b" uchar: 153;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":selected4";
-            value "r" uchar: 255;
-            value "g" uchar: 51;
-            value "b" uchar: 51;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":selected4-dim";
-            value "r" uchar: 153;
-            value "g" uchar: 34;
-            value "b" uchar: 34;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":selected5";
-            value "r" uchar: 153;
-            value "g" uchar: 51;
-            value "b" uchar: 255;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":selected5-dim";
-            value "r" uchar: 76;
-            value "g" uchar: 25;
-            value "b" uchar: 127;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":selected6";
-            value "r" uchar: 51;
-            value "g" uchar: 255;
-            value "b" uchar: 153;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":selected6-dim";
-            value "r" uchar: 56;
-            value "g" uchar: 160;
-            value "b" uchar: 96;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":win-normal";
-            value "r" uchar: 255;
-            value "g" uchar: 255;
-            value "b" uchar: 255;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":win-selected";
-            value "r" uchar: 255;
-            value "g" uchar: 255;
-            value "b" uchar: 255;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":light-off";
-            value "r" uchar: 255;
-            value "g" uchar: 255;
-            value "b" uchar: 255;
-            value "a" uchar: 0;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":light-medium";
-            value "r" uchar: 255;
-            value "g" uchar: 255;
-            value "b" uchar: 255;
-            value "a" uchar: 128;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":light-high";
-            value "r" uchar: 255;
-            value "g" uchar: 255;
-            value "b" uchar: 255;
-            value "a" uchar: 200;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":light-on";
-            value "r" uchar: 255;
-            value "g" uchar: 255;
-            value "b" uchar: 255;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":light-glow";
-            value "r" uchar: 255;
-            value "g" uchar: 220;
-            value "b" uchar: 160;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":dim-invisible";
-            value "r" uchar: 0;
-            value "g" uchar: 0;
-            value "b" uchar: 0;
-            value "a" uchar: 0;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":dim-lightest";
-            value "r" uchar: 0;
-            value "g" uchar: 0;
-            value "b" uchar: 0;
-            value "a" uchar: 32;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":dim-lighter";
-            value "r" uchar: 0;
-            value "g" uchar: 0;
-            value "b" uchar: 0;
-            value "a" uchar: 64;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":dim-light";
-            value "r" uchar: 0;
-            value "g" uchar: 0;
-            value "b" uchar: 0;
-            value "a" uchar: 80;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":dim";
-            value "r" uchar: 0;
-            value "g" uchar: 0;
-            value "b" uchar: 0;
-            value "a" uchar: 160;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":dim-dark";
-            value "r" uchar: 0;
-            value "g" uchar: 0;
-            value "b" uchar: 0;
-            value "a" uchar: 200;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":shadow";
-            value "r" uchar: 0;
-            value "g" uchar: 0;
-            value "b" uchar: 0;
-            value "a" uchar: 128;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":shadow-selected";
-            value "r" uchar: 0;
-            value "g" uchar: 0;
-            value "b" uchar: 0;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":shadow-disabled";
-            value "r" uchar: 0;
-            value "g" uchar: 0;
-            value "b" uchar: 0;
-            value "a" uchar: 64;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":outline";
-            value "r" uchar: 0;
-            value "g" uchar: 0;
-            value "b" uchar: 0;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":validate-fail";
-            value "r" uchar: 255;
-            value "g" uchar: 32;
-            value "b" uchar: 16;
-            value "a" uchar: 80;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":validate-pass";
-            value "r" uchar: 32;
-            value "g" uchar: 255;
-            value "b" uchar: 16;
-            value "a" uchar: 80;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":success";
-            value "r" uchar: 51;
-            value "g" uchar: 255;
-            value "b" uchar: 51;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":success-dim";
-            value "r" uchar: 51;
-            value "g" uchar: 153;
-            value "b" uchar: 51;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":keyword";
-            value "r" uchar: 255;
-            value "g" uchar: 153;
-            value "b" uchar: 153;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":keyword-dim";
-            value "r" uchar: 128;
-            value "g" uchar: 80;
-            value "b" uchar: 80;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":match";
-            value "r" uchar: 255;
-            value "g" uchar: 187;
-            value "b" uchar: 51;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":match-dim";
-            value "r" uchar: 128;
-            value "g" uchar: 96;
-            value "b" uchar: 25;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":comment";
-            value "r" uchar: 51;
-            value "g" uchar: 153;
-            value "b" uchar: 153;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":comment-dim";
-            value "r" uchar: 56;
-            value "g" uchar: 96;
-            value "b" uchar: 96;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":number";
-            value "r" uchar: 220;
-            value "g" uchar: 220;
-            value "b" uchar: 48;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":number-dim";
-            value "r" uchar: 128;
-            value "g" uchar: 128;
-            value "b" uchar: 56;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":class";
-            value "r" uchar: 119;
-            value "g" uchar: 170;
-            value "b" uchar: 221;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":class-dim";
-            value "r" uchar: 59;
-            value "g" uchar: 85;
-            value "b" uchar: 110;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":note";
-            value "r" uchar: 160;
-            value "g" uchar: 80;
-            value "b" uchar: 17;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":note-dim";
-            value "r" uchar: 80;
-            value "g" uchar: 40;
-            value "b" uchar: 8;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":todo";
-            value "r" uchar: 40;
-            value "g" uchar: 80;
-            value "b" uchar: 160;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":todo-dim";
-            value "r" uchar: 20;
-            value "g" uchar: 40;
-            value "b" uchar: 80;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: "/bg/selected/titlebar";
-            value "r" uchar: 242;
-            value "g" uchar: 148;
-            value "b" uchar: 0;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: "/bg/selected/menu/item";
-            value "r" uchar: 242;
-            value "g" uchar: 148;
-            value "b" uchar: 0;
-            value "a" uchar: 255;
-        }
-    }
-    value "version" int: 1000;
-}
--- a/data/elementary/colors/empty.src
+++ b/data/elementary/colors/empty.src
@ -1,3 +0,0 @@
-group "Elm_Palette" struct {
-  value "version" int: 1000;
-}
--- a/data/elementary/colors/light.src
+++ b/data/elementary/colors/light.src
@ -1,698 +0,0 @@
-group "Elm_Palette" struct {
-  value "version" int: 1000;
-  group "colors" list {
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":bg";
-      value "r" uchar: 216;
-      value "g" uchar: 216;
-      value "b" uchar: 216;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":bg-semi";
-      value "r" uchar: 216;
-      value "g" uchar: 216;
-      value "b" uchar: 216;
-      value "a" uchar: 182;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":bg-trans";
-      value "r" uchar: 216;
-      value "g" uchar: 216;
-      value "b" uchar: 216;
-      value "a" uchar: 192;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":bg-dimmest";
-      value "r" uchar: 104;
-      value "g" uchar: 104;
-      value "b" uchar: 104;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":bg-dimmer";
-      value "r" uchar: 112;
-      value "g" uchar: 112;
-      value "b" uchar: 112;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":bg-alt-dark";
-      value "r" uchar: 152;
-      value "g" uchar: 152;
-      value "b" uchar: 152;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":bg-alt-light";
-      value "r" uchar: 224;
-      value "g" uchar: 224;
-      value "b" uchar: 224;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":bg-alt";
-      value "r" uchar: 208;
-      value "g" uchar: 208;
-      value "b" uchar: 208;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":bg-dim";
-      value "r" uchar: 204;
-      value "g" uchar: 204;
-      value "b" uchar: 204;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":bg-dark";
-      value "r" uchar: 171;
-      value "g" uchar: 171;
-      value "b" uchar: 171;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":bg-dark-invisible";
-      value "r" uchar: 160;
-      value "g" uchar: 160;
-      value "b" uchar: 160;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":bg-darkest";
-      value "r" uchar: 173;
-      value "g" uchar: 173;
-      value "b" uchar: 173;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":bg-dark-alt";
-      value "r" uchar: 144;
-      value "g" uchar: 144;
-      value "b" uchar: 144;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":bg-medium";
-      value "r" uchar: 208;
-      value "g" uchar: 208;
-      value "b" uchar: 208;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":bg-high";
-      value "r" uchar: 184;
-      value "g" uchar: 184;
-      value "b" uchar: 184;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":bg-higher";
-      value "r" uchar: 240;
-      value "g" uchar: 240;
-      value "b" uchar: 240;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":bg-highest";
-      value "r" uchar: 112;
-      value "g" uchar: 112;
-      value "b" uchar: 112;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":bg-light";
-      value "r" uchar: 255;
-      value "g" uchar: 255;
-      value "b" uchar: 255;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":bg-light-alt";
-      value "r" uchar: 232;
-      value "g" uchar: 232;
-      value "b" uchar: 232;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":fg-dim";
-      value "r" uchar: 187;
-      value "g" uchar: 187;
-      value "b" uchar: 187;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":fg";
-      value "r" uchar: 80;
-      value "g" uchar: 80;
-      value "b" uchar: 80;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":fg-prehigh";
-      value "r" uchar: 64;
-      value "g" uchar: 64;
-      value "b" uchar: 64;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":fg-high";
-      value "r" uchar: 67;
-      value "g" uchar: 67;
-      value "b" uchar: 67;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":fg-higher";
-      value "r" uchar: 48;
-      value "g" uchar: 48;
-      value "b" uchar: 48;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":fg-light";
-      value "r" uchar: 224;
-      value "g" uchar: 224;
-      value "b" uchar: 224;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":selected";
-      value "r" uchar: 119;
-      value "g" uchar: 136;
-      value "b" uchar: 153;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":selected-light";
-      value "r" uchar: 119;
-      value "g" uchar: 136;
-      value "b" uchar: 153;
-      value "a" uchar: 25;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":selected-medium";
-      value "r" uchar: 119;
-      value "g" uchar: 136;
-      value "b" uchar: 153;
-      value "a" uchar: 128;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":selected-heavy";
-      value "r" uchar: 119;
-      value "g" uchar: 136;
-      value "b" uchar: 153;
-      value "a" uchar: 192;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":selected-alt";
-      value "r" uchar: 239;
-      value "g" uchar: 175;
-      value "b" uchar: 110;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":selected-alt-trans";
-      value "r" uchar: 255;
-      value "g" uchar: 153;
-      value "b" uchar: 51;
-      value "a" uchar: 64;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":selected-alt-dim";
-      value "r" uchar: 231;
-      value "g" uchar: 182;
-      value "b" uchar: 134;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":selected-dim";
-      value "r" uchar: 166;
-      value "g" uchar: 176;
-      value "b" uchar: 186;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":selected2";
-      value "r" uchar: 179;
-      value "g" uchar: 232;
-      value "b" uchar: 127;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":selected2-dim";
-      value "r" uchar: 206;
-      value "g" uchar: 239;
-      value "b" uchar: 174;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":selected3";
-      value "r" uchar: 255;
-      value "g" uchar: 51;
-      value "b" uchar: 153;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":selected4";
-      value "r" uchar: 228;
-      value "g" uchar: 118;
-      value "b" uchar: 118;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":selected4-dim";
-      value "r" uchar: 229;
-      value "g" uchar: 140;
-      value "b" uchar: 140;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":selected5";
-      value "r" uchar: 119;
-      value "g" uchar: 0;
-      value "b" uchar: 238;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":selected5-dim";
-      value "r" uchar: 179;
-      value "g" uchar: 127;
-      value "b" uchar: 230;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":selected6";
-      value "r" uchar: 0;
-      value "g" uchar: 121;
-      value "b" uchar: 61;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":selected6-dim";
-      value "r" uchar: 104;
-      value "g" uchar: 202;
-      value "b" uchar: 142;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":win-normal";
-      value "r" uchar: 255;
-      value "g" uchar: 255;
-      value "b" uchar: 255;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":win-selected";
-      value "r" uchar: 255;
-      value "g" uchar: 255;
-      value "b" uchar: 255;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":light-off";
-      value "r" uchar: 255;
-      value "g" uchar: 255;
-      value "b" uchar: 255;
-      value "a" uchar: 0;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":light-medium";
-      value "r" uchar: 255;
-      value "g" uchar: 255;
-      value "b" uchar: 255;
-      value "a" uchar: 128;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":light-high";
-      value "r" uchar: 255;
-      value "g" uchar: 255;
-      value "b" uchar: 255;
-      value "a" uchar: 200;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":light-on";
-      value "r" uchar: 255;
-      value "g" uchar: 255;
-      value "b" uchar: 255;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":light-glow";
-      value "r" uchar: 255;
-      value "g" uchar: 220;
-      value "b" uchar: 160;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":dim-invisible";
-      value "r" uchar: 0;
-      value "g" uchar: 0;
-      value "b" uchar: 0;
-      value "a" uchar: 0;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":dim-lightest";
-      value "r" uchar: 0;
-      value "g" uchar: 0;
-      value "b" uchar: 0;
-      value "a" uchar: 12;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":dim-lighter";
-      value "r" uchar: 0;
-      value "g" uchar: 0;
-      value "b" uchar: 0;
-      value "a" uchar: 18;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":dim-light";
-      value "r" uchar: 0;
-      value "g" uchar: 0;
-      value "b" uchar: 0;
-      value "a" uchar: 44;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":dim";
-      value "r" uchar: 0;
-      value "g" uchar: 0;
-      value "b" uchar: 0;
-      value "a" uchar: 96;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":dim-dark";
-      value "r" uchar: 0;
-      value "g" uchar: 0;
-      value "b" uchar: 0;
-      value "a" uchar: 122;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":shadow";
-      value "r" uchar: 0;
-      value "g" uchar: 0;
-      value "b" uchar: 0;
-      value "a" uchar: 128;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":shadow-selected";
-      value "r" uchar: 0;
-      value "g" uchar: 0;
-      value "b" uchar: 0;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":shadow-disabled";
-      value "r" uchar: 0;
-      value "g" uchar: 0;
-      value "b" uchar: 0;
-      value "a" uchar: 64;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":outline";
-      value "r" uchar: 0;
-      value "g" uchar: 0;
-      value "b" uchar: 0;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":validate-fail";
-      value "r" uchar: 255;
-      value "g" uchar: 32;
-      value "b" uchar: 16;
-      value "a" uchar: 80;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":validate-pass";
-      value "r" uchar: 32;
-      value "g" uchar: 255;
-      value "b" uchar: 16;
-      value "a" uchar: 80;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":success";
-      value "r" uchar: 0;
-      value "g" uchar: 169;
-      value "b" uchar: 0;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":success-dim";
-      value "r" uchar: 125;
-      value "g" uchar: 212;
-      value "b" uchar: 125;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":keyword";
-      value "r" uchar: 255;
-      value "g" uchar: 43;
-      value "b" uchar: 43;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":keyword-dim";
-      value "r" uchar: 194;
-      value "g" uchar: 157;
-      value "b" uchar: 157;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":match";
-      value "r" uchar: 227;
-      value "g" uchar: 174;
-      value "b" uchar: 68;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":match-dim";
-      value "r" uchar: 229;
-      value "g" uchar: 196;
-      value "b" uchar: 123;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":comment";
-      value "r" uchar: 51;
-      value "g" uchar: 153;
-      value "b" uchar: 153;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":comment-dim";
-      value "r" uchar: 165;
-      value "g" uchar: 202;
-      value "b" uchar: 202;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":number";
-      value "r" uchar: 153;
-      value "g" uchar: 153;
-      value "b" uchar: 26;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":number-dim";
-      value "r" uchar: 192;
-      value "g" uchar: 192;
-      value "b" uchar: 111;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":class";
-      value "r" uchar: 119;
-      value "g" uchar: 170;
-      value "b" uchar: 221;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":class-dim";
-      value "r" uchar: 169;
-      value "g" uchar: 189;
-      value "b" uchar: 209;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":note";
-      value "r" uchar: 160;
-      value "g" uchar: 80;
-      value "b" uchar: 17;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":note-dim";
-      value "r" uchar: 236;
-      value "g" uchar: 141;
-      value "b" uchar: 65;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":todo";
-      value "r" uchar: 40;
-      value "g" uchar: 80;
-      value "b" uchar: 160;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":todo-dim";
-      value "r" uchar: 134;
-      value "g" uchar: 164;
-      value "b" uchar: 225;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: "/bg/normal/frame/title";
-      value "r" uchar: 119;
-      value "g" uchar: 136;
-      value "b" uchar: 153;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: "/bg/selected/titlebar";
-      value "r" uchar: 119;
-      value "g" uchar: 136;
-      value "b" uchar: 153;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: "/fg/normal/menu/title";
-      value "r" uchar: 64;
-      value "g" uchar: 64;
-      value "b" uchar: 64;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: "/bg/selected/button";
-      value "r" uchar: 192;
-      value "g" uchar: 192;
-      value "b" uchar: 192;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: "/fg/selected/button";
-      value "r" uchar: 96;
-      value "g" uchar: 96;
-      value "b" uchar: 96;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: "/fg/disabled/button";
-      value "r" uchar: 128;
-      value "g" uchar: 128;
-      value "b" uchar: 128;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: "/fg/selected/button/bar";
-      value "r" uchar: 119;
-      value "g" uchar: 136;
-      value "b" uchar: 153;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: "/fg/pressed/button";
-      value "r" uchar: 0;
-      value "g" uchar: 0;
-      value "b" uchar: 0;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: "/fg/pressed/button-anchor";
-      value "r" uchar: 119;
-      value "g" uchar: 136;
-      value "b" uchar: 153;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: "/fg/normal/pointer/base";
-      value "r" uchar: 255;
-      value "g" uchar: 255;
-      value "b" uchar: 255;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: "/bg/selected/menu/item/base";
-      value "r" uchar: 119;
-      value "g" uchar: 136;
-      value "b" uchar: 153;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: "/fg/normal/entry/cursor";
-      value "r" uchar: 0;
-      value "g" uchar: 0;
-      value "b" uchar: 0;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: "/fg/pressed/titlebar/buttons/close";
-      value "r" uchar: 192;
-      value "g" uchar: 192;
-      value "b" uchar: 192;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: "/fg/normal/gadgets/ibar/menu/item/base";
-      value "r" uchar: 208;
-      value "g" uchar: 208;
-      value "b" uchar: 208;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: "/fg/pressed/syscon/button/text";
-      value "r" uchar: 0;
-      value "g" uchar: 0;
-      value "b" uchar: 0;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: "/fg/selected/fileman/nav/path/text";
-      value "r" uchar: 0;
-      value "g" uchar: 0;
-      value "b" uchar: 0;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: "/fg/normal/grid/item/fileman/desktop";
-      value "r" uchar: 160;
-      value "g" uchar: 160;
-      value "b" uchar: 160;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: "/fg/normal/text-hilight";
-      value "r" uchar: 0;
-      value "g" uchar: 0;
-      value "b" uchar: 0;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: "/fg/normal/text-heading";
-      value "r" uchar: 0;
-      value "g" uchar: 0;
-      value "b" uchar: 0;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: "/fg/normal/text-heading-sub";
-      value "r" uchar: 0;
-      value "g" uchar: 0;
-      value "b" uchar: 0;
-      value "a" uchar: 200;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: "/bg/normal/hoversel/item";
-      value "r" uchar: 119;
-      value "g" uchar: 136;
-      value "b" uchar: 153;
-      value "a" uchar: 0;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: "/bg/selected/hoversel/item";
-      value "r" uchar: 119;
-      value "g" uchar: 136;
-      value "b" uchar: 153;
-      value "a" uchar: 255;
-    }
-  }
-}
--- a/data/elementary/colors/mauve-sunset.src
+++ b/data/elementary/colors/mauve-sunset.src
@ -1,558 +0,0 @@
-group "Elm_Palette" struct {
-  value "version" int: 1000;
-  group "colors" list {
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":bg";
-      value "r" uchar: 62;
-      value "g" uchar: 55;
-      value "b" uchar: 73;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":bg-semi";
-      value "r" uchar: 62;
-      value "g" uchar: 55;
-      value "b" uchar: 78;
-      value "a" uchar: 182;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":bg-trans";
-      value "r" uchar: 62;
-      value "g" uchar: 55;
-      value "b" uchar: 78;
-      value "a" uchar: 192;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":bg-dimmest";
-      value "r" uchar: 37;
-      value "g" uchar: 30;
-      value "b" uchar: 42;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":bg-dimmer";
-      value "r" uchar: 43;
-      value "g" uchar: 35;
-      value "b" uchar: 53;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":bg-alt-dark";
-      value "r" uchar: 51;
-      value "g" uchar: 45;
-      value "b" uchar: 63;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":bg-alt-light";
-      value "r" uchar: 53;
-      value "g" uchar: 45;
-      value "b" uchar: 71;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":bg-alt";
-      value "r" uchar: 55;
-      value "g" uchar: 48;
-      value "b" uchar: 64;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":bg-dim";
-      value "r" uchar: 46;
-      value "g" uchar: 39;
-      value "b" uchar: 57;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":bg-dark";
-      value "r" uchar: 28;
-      value "g" uchar: 25;
-      value "b" uchar: 39;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":bg-dark-invisible";
-      value "r" uchar: 28;
-      value "g" uchar: 25;
-      value "b" uchar: 39;
-      value "a" uchar: 0;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":bg-darkest";
-      value "r" uchar: 16;
-      value "g" uchar: 13;
-      value "b" uchar: 19;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":bg-dark-alt";
-      value "r" uchar: 26;
-      value "g" uchar: 24;
-      value "b" uchar: 32;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":bg-medium";
-      value "r" uchar: 70;
-      value "g" uchar: 61;
-      value "b" uchar: 83;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":bg-high";
-      value "r" uchar: 78;
-      value "g" uchar: 67;
-      value "b" uchar: 93;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":bg-higher";
-      value "r" uchar: 99;
-      value "g" uchar: 79;
-      value "b" uchar: 113;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":bg-highest";
-      value "r" uchar: 113;
-      value "g" uchar: 92;
-      value "b" uchar: 132;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":bg-light";
-      value "r" uchar: 194;
-      value "g" uchar: 182;
-      value "b" uchar: 202;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":bg-light-alt";
-      value "r" uchar: 185;
-      value "g" uchar: 174;
-      value "b" uchar: 194;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":fg-dim";
-      value "r" uchar: 138;
-      value "g" uchar: 120;
-      value "b" uchar: 75;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":fg";
-      value "r" uchar: 224;
-      value "g" uchar: 222;
-      value "b" uchar: 202;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":fg-prehigh";
-      value "r" uchar: 204;
-      value "g" uchar: 202;
-      value "b" uchar: 180;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":fg-high";
-      value "r" uchar: 239;
-      value "g" uchar: 239;
-      value "b" uchar: 234;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":fg-higher";
-      value "r" uchar: 238;
-      value "g" uchar: 237;
-      value "b" uchar: 232;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":fg-light";
-      value "r" uchar: 255;
-      value "g" uchar: 255;
-      value "b" uchar: 255;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":selected";
-      value "r" uchar: 242;
-      value "g" uchar: 180;
-      value "b" uchar: 0;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":selected-light";
-      value "r" uchar: 242;
-      value "g" uchar: 180;
-      value "b" uchar: 0;
-      value "a" uchar: 25;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":selected-medium";
-      value "r" uchar: 242;
-      value "g" uchar: 180;
-      value "b" uchar: 0;
-      value "a" uchar: 128;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":selected-heavy";
-      value "r" uchar: 242;
-      value "g" uchar: 180;
-      value "b" uchar: 0;
-      value "a" uchar: 192;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":selected-alt";
-      value "r" uchar: 255;
-      value "g" uchar: 86;
-      value "b" uchar: 51;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":selected-alt-trans";
-      value "r" uchar: 255;
-      value "g" uchar: 90;
-      value "b" uchar: 51;
-      value "a" uchar: 64;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":selected-alt-dim";
-      value "r" uchar: 128;
-      value "g" uchar: 43;
-      value "b" uchar: 25;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":selected-dim";
-      value "r" uchar: 121;
-      value "g" uchar: 76;
-      value "b" uchar: 2;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":selected2";
-      value "r" uchar: 153;
-      value "g" uchar: 255;
-      value "b" uchar: 51;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":selected2-dim";
-      value "r" uchar: 76;
-      value "g" uchar: 128;
-      value "b" uchar: 25;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":selected3";
-      value "r" uchar: 255;
-      value "g" uchar: 51;
-      value "b" uchar: 153;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":selected4";
-      value "r" uchar: 255;
-      value "g" uchar: 51;
-      value "b" uchar: 51;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":selected4-dim";
-      value "r" uchar: 153;
-      value "g" uchar: 34;
-      value "b" uchar: 34;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":selected5";
-      value "r" uchar: 153;
-      value "g" uchar: 51;
-      value "b" uchar: 255;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":selected5-dim";
-      value "r" uchar: 76;
-      value "g" uchar: 25;
-      value "b" uchar: 127;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":selected6";
-      value "r" uchar: 51;
-      value "g" uchar: 255;
-      value "b" uchar: 153;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":selected6-dim";
-      value "r" uchar: 56;
-      value "g" uchar: 160;
-      value "b" uchar: 96;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":win-normal";
-      value "r" uchar: 255;
-      value "g" uchar: 255;
-      value "b" uchar: 255;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":win-selected";
-      value "r" uchar: 255;
-      value "g" uchar: 255;
-      value "b" uchar: 255;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":light-off";
-      value "r" uchar: 255;
-      value "g" uchar: 255;
-      value "b" uchar: 255;
-      value "a" uchar: 0;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":light-medium";
-      value "r" uchar: 255;
-      value "g" uchar: 255;
-      value "b" uchar: 255;
-      value "a" uchar: 128;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":light-high";
-      value "r" uchar: 255;
-      value "g" uchar: 255;
-      value "b" uchar: 255;
-      value "a" uchar: 200;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":light-on";
-      value "r" uchar: 255;
-      value "g" uchar: 255;
-      value "b" uchar: 255;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":light-glow";
-      value "r" uchar: 255;
-      value "g" uchar: 220;
-      value "b" uchar: 160;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":dim-invisible";
-      value "r" uchar: 0;
-      value "g" uchar: 0;
-      value "b" uchar: 0;
-      value "a" uchar: 0;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":dim-lightest";
-      value "r" uchar: 0;
-      value "g" uchar: 0;
-      value "b" uchar: 0;
-      value "a" uchar: 32;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":dim-lighter";
-      value "r" uchar: 0;
-      value "g" uchar: 0;
-      value "b" uchar: 0;
-      value "a" uchar: 64;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":dim-light";
-      value "r" uchar: 0;
-      value "g" uchar: 0;
-      value "b" uchar: 0;
-      value "a" uchar: 80;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":dim";
-      value "r" uchar: 0;
-      value "g" uchar: 0;
-      value "b" uchar: 0;
-      value "a" uchar: 160;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":dim-dark";
-      value "r" uchar: 0;
-      value "g" uchar: 0;
-      value "b" uchar: 0;
-      value "a" uchar: 200;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":shadow";
-      value "r" uchar: 0;
-      value "g" uchar: 0;
-      value "b" uchar: 0;
-      value "a" uchar: 128;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":shadow-selected";
-      value "r" uchar: 0;
-      value "g" uchar: 0;
-      value "b" uchar: 0;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":shadow-disabled";
-      value "r" uchar: 0;
-      value "g" uchar: 0;
-      value "b" uchar: 0;
-      value "a" uchar: 64;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":outline";
-      value "r" uchar: 0;
-      value "g" uchar: 0;
-      value "b" uchar: 0;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":validate-fail";
-      value "r" uchar: 255;
-      value "g" uchar: 32;
-      value "b" uchar: 16;
-      value "a" uchar: 80;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":validate-pass";
-      value "r" uchar: 32;
-      value "g" uchar: 255;
-      value "b" uchar: 16;
-      value "a" uchar: 80;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":success";
-      value "r" uchar: 51;
-      value "g" uchar: 255;
-      value "b" uchar: 51;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":success-dim";
-      value "r" uchar: 51;
-      value "g" uchar: 153;
-      value "b" uchar: 51;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":keyword";
-      value "r" uchar: 255;
-      value "g" uchar: 153;
-      value "b" uchar: 153;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":keyword-dim";
-      value "r" uchar: 128;
-      value "g" uchar: 80;
-      value "b" uchar: 80;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":match";
-      value "r" uchar: 255;
-      value "g" uchar: 187;
-      value "b" uchar: 51;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":match-dim";
-      value "r" uchar: 128;
-      value "g" uchar: 96;
-      value "b" uchar: 25;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":comment";
-      value "r" uchar: 51;
-      value "g" uchar: 153;
-      value "b" uchar: 153;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":comment-dim";
-      value "r" uchar: 56;
-      value "g" uchar: 96;
-      value "b" uchar: 96;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":number";
-      value "r" uchar: 220;
-      value "g" uchar: 220;
-      value "b" uchar: 48;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":number-dim";
-      value "r" uchar: 128;
-      value "g" uchar: 128;
-      value "b" uchar: 56;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":class";
-      value "r" uchar: 119;
-      value "g" uchar: 170;
-      value "b" uchar: 221;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":class-dim";
-      value "r" uchar: 59;
-      value "g" uchar: 85;
-      value "b" uchar: 110;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":note";
-      value "r" uchar: 160;
-      value "g" uchar: 80;
-      value "b" uchar: 17;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":note-dim";
-      value "r" uchar: 80;
-      value "g" uchar: 40;
-      value "b" uchar: 8;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":todo";
-      value "r" uchar: 40;
-      value "g" uchar: 80;
-      value "b" uchar: 160;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: ":todo-dim";
-      value "r" uchar: 20;
-      value "g" uchar: 40;
-      value "b" uchar: 80;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: "/bg/selected/titlebar";
-      value "r" uchar: 242;
-      value "g" uchar: 180;
-      value "b" uchar: 0;
-      value "a" uchar: 255;
-    }
-    group "Elm_Palette_Color" struct {
-      value "name" string: "/bg/selected/menu/item";
-      value "r" uchar: 242;
-      value "g" uchar: 180;
-      value "b" uchar: 0;
-      value "a" uchar: 255;
-    }
-  }
-}
--- a/data/elementary/colors/meson.build
+++ b/data/elementary/colors/meson.build
@ -1,19 +0,0 @@
-pals = [
-  'default',
-  'empty',
-  'light',
-  'mauve-sunset',
-  'candy-mint',
-  'ebony-brass',
-  'white-pill'
-]
-
-foreach p: pals
-  custom_target('colors_' + p + '.ecl',
-                input: p + '.src',
-                output: p + '.pal',
-                command: [eet_bin, '-e', '@OUTPUT@', 'palette', '@INPUT@', '1'],
-                install: true,
-                install_dir: join_paths(dir_data, 'elementary', 'colors'),
-                )
-endforeach
--- a/data/elementary/colors/white-pill.src
+++ b/data/elementary/colors/white-pill.src
@ -1,726 +0,0 @@
-group "Elm_Palette" struct {
-    group "colors" list {
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg";
-            value "r" uchar: 240;
-            value "g" uchar: 240;
-            value "b" uchar: 240;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-semi";
-            value "r" uchar: 226;
-            value "g" uchar: 226;
-            value "b" uchar: 226;
-            value "a" uchar: 182;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-trans";
-            value "r" uchar: 220;
-            value "g" uchar: 220;
-            value "b" uchar: 220;
-            value "a" uchar: 192;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-dimmest";
-            value "r" uchar: 143;
-            value "g" uchar: 143;
-            value "b" uchar: 143;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-dimmer";
-            value "r" uchar: 169;
-            value "g" uchar: 169;
-            value "b" uchar: 169;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-alt-dark";
-            value "r" uchar: 195;
-            value "g" uchar: 195;
-            value "b" uchar: 195;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-alt-light";
-            value "r" uchar: 230;
-            value "g" uchar: 230;
-            value "b" uchar: 230;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-alt";
-            value "r" uchar: 230;
-            value "g" uchar: 230;
-            value "b" uchar: 230;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-dim";
-            value "r" uchar: 212;
-            value "g" uchar: 212;
-            value "b" uchar: 212;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-dark";
-            value "r" uchar: 202;
-            value "g" uchar: 202;
-            value "b" uchar: 202;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-dark-invisible";
-            value "r" uchar: 202;
-            value "g" uchar: 202;
-            value "b" uchar: 202;
-            value "a" uchar: 0;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-darkest";
-            value "r" uchar: 192;
-            value "g" uchar: 192;
-            value "b" uchar: 192;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-dark-alt";
-            value "r" uchar: 186;
-            value "g" uchar: 186;
-            value "b" uchar: 186;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-medium";
-            value "r" uchar: 222;
-            value "g" uchar: 222;
-            value "b" uchar: 222;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-high";
-            value "r" uchar: 194;
-            value "g" uchar: 194;
-            value "b" uchar: 194;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-higher";
-            value "r" uchar: 240;
-            value "g" uchar: 240;
-            value "b" uchar: 240;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-highest";
-            value "r" uchar: 153;
-            value "g" uchar: 153;
-            value "b" uchar: 153;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-light";
-            value "r" uchar: 255;
-            value "g" uchar: 255;
-            value "b" uchar: 255;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":bg-light-alt";
-            value "r" uchar: 241;
-            value "g" uchar: 241;
-            value "b" uchar: 241;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":fg-dim";
-            value "r" uchar: 187;
-            value "g" uchar: 187;
-            value "b" uchar: 187;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":fg";
-            value "r" uchar: 80;
-            value "g" uchar: 80;
-            value "b" uchar: 80;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":fg-prehigh";
-            value "r" uchar: 64;
-            value "g" uchar: 64;
-            value "b" uchar: 64;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":fg-high";
-            value "r" uchar: 67;
-            value "g" uchar: 67;
-            value "b" uchar: 67;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":fg-higher";
-            value "r" uchar: 48;
-            value "g" uchar: 48;
-            value "b" uchar: 48;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":fg-light";
-            value "r" uchar: 224;
-            value "g" uchar: 224;
-            value "b" uchar: 224;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":selected";
-            value "r" uchar: 120;
-            value "g" uchar: 120;
-            value "b" uchar: 120;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":selected-light";
-            value "r" uchar: 70;
-            value "g" uchar: 70;
-            value "b" uchar: 70;
-            value "a" uchar: 25;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":selected-medium";
-            value "r" uchar: 70;
-            value "g" uchar: 70;
-            value "b" uchar: 70;
-            value "a" uchar: 128;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":selected-heavy";
-            value "r" uchar: 70;
-            value "g" uchar: 70;
-            value "b" uchar: 70;
-            value "a" uchar: 192;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":selected-alt";
-            value "r" uchar: 135;
-            value "g" uchar: 135;
-            value "b" uchar: 135;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":selected-alt-trans";
-            value "r" uchar: 113;
-            value "g" uchar: 113;
-            value "b" uchar: 113;
-            value "a" uchar: 64;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":selected-alt-dim";
-            value "r" uchar: 116;
-            value "g" uchar: 116;
-            value "b" uchar: 116;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":selected-dim";
-            value "r" uchar: 70;
-            value "g" uchar: 70;
-            value "b" uchar: 70;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":selected2";
-            value "r" uchar: 179;
-            value "g" uchar: 232;
-            value "b" uchar: 127;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":selected2-dim";
-            value "r" uchar: 206;
-            value "g" uchar: 239;
-            value "b" uchar: 174;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":selected3";
-            value "r" uchar: 255;
-            value "g" uchar: 51;
-            value "b" uchar: 153;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":selected4";
-            value "r" uchar: 228;
-            value "g" uchar: 118;
-            value "b" uchar: 118;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":selected4-dim";
-            value "r" uchar: 229;
-            value "g" uchar: 140;
-            value "b" uchar: 140;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":selected5";
-            value "r" uchar: 119;
-            value "g" uchar: 0;
-            value "b" uchar: 238;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":selected5-dim";
-            value "r" uchar: 179;
-            value "g" uchar: 127;
-            value "b" uchar: 230;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":selected6";
-            value "r" uchar: 0;
-            value "g" uchar: 121;
-            value "b" uchar: 61;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":selected6-dim";
-            value "r" uchar: 104;
-            value "g" uchar: 202;
-            value "b" uchar: 142;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":win-normal";
-            value "r" uchar: 255;
-            value "g" uchar: 255;
-            value "b" uchar: 255;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":win-selected";
-            value "r" uchar: 255;
-            value "g" uchar: 255;
-            value "b" uchar: 255;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":light-off";
-            value "r" uchar: 255;
-            value "g" uchar: 255;
-            value "b" uchar: 255;
-            value "a" uchar: 0;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":light-medium";
-            value "r" uchar: 255;
-            value "g" uchar: 255;
-            value "b" uchar: 255;
-            value "a" uchar: 128;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":light-high";
-            value "r" uchar: 255;
-            value "g" uchar: 255;
-            value "b" uchar: 255;
-            value "a" uchar: 200;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":light-on";
-            value "r" uchar: 255;
-            value "g" uchar: 255;
-            value "b" uchar: 255;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":light-glow";
-            value "r" uchar: 255;
-            value "g" uchar: 220;
-            value "b" uchar: 160;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":dim-invisible";
-            value "r" uchar: 0;
-            value "g" uchar: 0;
-            value "b" uchar: 0;
-            value "a" uchar: 0;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":dim-lightest";
-            value "r" uchar: 0;
-            value "g" uchar: 0;
-            value "b" uchar: 0;
-            value "a" uchar: 12;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":dim-lighter";
-            value "r" uchar: 0;
-            value "g" uchar: 0;
-            value "b" uchar: 0;
-            value "a" uchar: 18;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":dim-light";
-            value "r" uchar: 0;
-            value "g" uchar: 0;
-            value "b" uchar: 0;
-            value "a" uchar: 44;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":dim";
-            value "r" uchar: 0;
-            value "g" uchar: 0;
-            value "b" uchar: 0;
-            value "a" uchar: 96;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":dim-dark";
-            value "r" uchar: 0;
-            value "g" uchar: 0;
-            value "b" uchar: 0;
-            value "a" uchar: 122;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":shadow";
-            value "r" uchar: 0;
-            value "g" uchar: 0;
-            value "b" uchar: 0;
-            value "a" uchar: 64;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":shadow-selected";
-            value "r" uchar: 0;
-            value "g" uchar: 0;
-            value "b" uchar: 0;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":shadow-disabled";
-            value "r" uchar: 0;
-            value "g" uchar: 0;
-            value "b" uchar: 0;
-            value "a" uchar: 32;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":outline";
-            value "r" uchar: 0;
-            value "g" uchar: 0;
-            value "b" uchar: 0;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":validate-fail";
-            value "r" uchar: 255;
-            value "g" uchar: 32;
-            value "b" uchar: 16;
-            value "a" uchar: 80;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":validate-pass";
-            value "r" uchar: 32;
-            value "g" uchar: 255;
-            value "b" uchar: 16;
-            value "a" uchar: 80;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":success";
-            value "r" uchar: 0;
-            value "g" uchar: 169;
-            value "b" uchar: 0;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":success-dim";
-            value "r" uchar: 125;
-            value "g" uchar: 212;
-            value "b" uchar: 125;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":keyword";
-            value "r" uchar: 255;
-            value "g" uchar: 43;
-            value "b" uchar: 43;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":keyword-dim";
-            value "r" uchar: 194;
-            value "g" uchar: 157;
-            value "b" uchar: 157;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":match";
-            value "r" uchar: 227;
-            value "g" uchar: 174;
-            value "b" uchar: 68;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":match-dim";
-            value "r" uchar: 229;
-            value "g" uchar: 196;
-            value "b" uchar: 123;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":comment";
-            value "r" uchar: 51;
-            value "g" uchar: 153;
-            value "b" uchar: 153;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":comment-dim";
-            value "r" uchar: 165;
-            value "g" uchar: 202;
-            value "b" uchar: 202;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":number";
-            value "r" uchar: 153;
-            value "g" uchar: 153;
-            value "b" uchar: 26;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":number-dim";
-            value "r" uchar: 192;
-            value "g" uchar: 192;
-            value "b" uchar: 111;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":class";
-            value "r" uchar: 119;
-            value "g" uchar: 170;
-            value "b" uchar: 221;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":class-dim";
-            value "r" uchar: 169;
-            value "g" uchar: 189;
-            value "b" uchar: 209;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":note";
-            value "r" uchar: 160;
-            value "g" uchar: 80;
-            value "b" uchar: 17;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":note-dim";
-            value "r" uchar: 236;
-            value "g" uchar: 141;
-            value "b" uchar: 65;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":todo";
-            value "r" uchar: 40;
-            value "g" uchar: 80;
-            value "b" uchar: 160;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: ":todo-dim";
-            value "r" uchar: 134;
-            value "g" uchar: 164;
-            value "b" uchar: 225;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: "/bg/normal/frame/title";
-            value "r" uchar: 136;
-            value "g" uchar: 136;
-            value "b" uchar: 136;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: "/bg/selected/titlebar";
-            value "r" uchar: 136;
-            value "g" uchar: 136;
-            value "b" uchar: 136;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: "/fg/normal/menu/title";
-            value "r" uchar: 64;
-            value "g" uchar: 64;
-            value "b" uchar: 64;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: "/bg/selected/button";
-            value "r" uchar: 192;
-            value "g" uchar: 192;
-            value "b" uchar: 192;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: "/fg/selected/button";
-            value "r" uchar: 96;
-            value "g" uchar: 96;
-            value "b" uchar: 96;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: "/fg/disabled/button";
-            value "r" uchar: 128;
-            value "g" uchar: 128;
-            value "b" uchar: 128;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: "/fg/selected/button/bar";
-            value "r" uchar: 136;
-            value "g" uchar: 136;
-            value "b" uchar: 136;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: "/fg/pressed/button";
-            value "r" uchar: 0;
-            value "g" uchar: 0;
-            value "b" uchar: 0;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: "/fg/pressed/button-anchor";
-            value "r" uchar: 136;
-            value "g" uchar: 136;
-            value "b" uchar: 136;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: "/fg/normal/pointer/base";
-            value "r" uchar: 255;
-            value "g" uchar: 255;
-            value "b" uchar: 255;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: "/bg/selected/menu/item/base";
-            value "r" uchar: 136;
-            value "g" uchar: 136;
-            value "b" uchar: 136;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: "/fg/normal/entry/cursor";
-            value "r" uchar: 0;
-            value "g" uchar: 0;
-            value "b" uchar: 0;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: "/fg/pressed/titlebar/buttons/close";
-            value "r" uchar: 192;
-            value "g" uchar: 192;
-            value "b" uchar: 192;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: "/fg/normal/gadgets/ibar/menu/item/base";
-            value "r" uchar: 208;
-            value "g" uchar: 208;
-            value "b" uchar: 208;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: "/fg/pressed/syscon/button/text";
-            value "r" uchar: 0;
-            value "g" uchar: 0;
-            value "b" uchar: 0;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: "/fg/selected/fileman/nav/path/text";
-            value "r" uchar: 0;
-            value "g" uchar: 0;
-            value "b" uchar: 0;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: "/fg/normal/grid/item/fileman/desktop";
-            value "r" uchar: 160;
-            value "g" uchar: 160;
-            value "b" uchar: 160;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: "/fg/normal/text-hilight";
-            value "r" uchar: 0;
-            value "g" uchar: 0;
-            value "b" uchar: 0;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: "/fg/normal/text-heading";
-            value "r" uchar: 0;
-            value "g" uchar: 0;
-            value "b" uchar: 0;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: "/fg/normal/text-heading-sub";
-            value "r" uchar: 0;
-            value "g" uchar: 0;
-            value "b" uchar: 0;
-            value "a" uchar: 200;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: "/bg/normal/hoversel/item";
-            value "r" uchar: 119;
-            value "g" uchar: 136;
-            value "b" uchar: 153;
-            value "a" uchar: 0;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: "/bg/selected/hoversel/item";
-            value "r" uchar: 136;
-            value "g" uchar: 136;
-            value "b" uchar: 136;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: "/bg/selected/toolbar/base";
-            value "r" uchar: 64;
-            value "g" uchar: 64;
-            value "b" uchar: 64;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: "/bg/selected/toolbar/bar";
-            value "r" uchar: 0;
-            value "g" uchar: 0;
-            value "b" uchar: 0;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: "/bg/normal/naviframe/top";
-            value "r" uchar: 136;
-            value "g" uchar: 136;
-            value "b" uchar: 136;
-            value "a" uchar: 255;
-        }
-        group "Elm_Palette_Color" struct {
-            value "name" string: "/bg/normal/list/group";
-            value "r" uchar: 64;
-            value "g" uchar: 64;
-            value "b" uchar: 64;
-            value "a" uchar: 255;
-        }
-    }
-    value "version" int: 1000;
-}
--- a/data/elementary/config/default/base.src.in
+++ b/data/elementary/config/default/base.src.in
--- a/data/elementary/config/default/meson.build
+++ b/data/elementary/config/default/meson.build
@ -1,7 +0,0 @@
-custom_target('config_'+config,
-  input: config_file,
-  output: 'base.cfg',
-  command: [eet_bin, '-e', '@OUTPUT@', 'config', '@INPUT@', '1'],
-  install: true,
-  install_dir: join_paths(dir_data, 'elementary', 'config', config),
-)
--- a/data/elementary/config/default/profile.desktop
+++ b/data/elementary/config/default/profile.desktop
@ -1,45 +0,0 @@
-[Desktop Entry]
-Type=Link
-Name=Default
-Name[ab]=默认
-Name[ca]=Predeterminat
-Name[cs]=Výchozí
-Name[de]=Vorgabe
-Name[el]=Προκαθορισμένο
-Name[eo]=Pravaloroj
-Name[es]=Predefinido
-Name[fi]=Oletus
-Name[fr]=Prédéfini
-Name[gl]=Predefinido
-Name[hu]=Alapértelmezett
-Name[it]=Predefinito
-Name[ja]=デフォルト
-Name[ko]=기본
-Name[lt]=Įprastas
-Name[ms]=Lalai
-Name[pl]=Domyślne
-Name[pt]=Predefinições
-Name[ru]=Заново
-Name[sr]=Подразумевано
-Name[tr]=Öntanımlı
-Name[zh_CN]=默认
-Comment=Select this to begin the initial setup again.
-Comment[ca]=Seleccioni aquí per carregar la configuració inicial de nou.
-Comment[cs]=Vyberte pro znovuspuštění tohoto průvodce.
-Comment[de]=Dieses auswählen, um mit der Ersteinrichtung erneut zu beginnen.
-Comment[el]=Επιλέξτε αυτό για να ξεκινήσετε την αρχική ρύθμιση ξανά.
-Comment[eo]=Elektu tion por restartigi la pravalorizan agordon.
-Comment[es]=Seleccione esto para reestablecer la configuración inicial.
-Comment[fi]=Valitse tämä käynnistääksesi alkuasetusvelhon.
-Comment[fr]=Sélectionnez ceci pour recommencer la configuration initiale.
-Comment[gl]=Seleccione isto para volverr á configuración inicial.
-Comment[hu]=Válaszd ezt az alap beállítáok megismétléséhez.
-Comment[it]=Selezionare questo per riprendere la configurazione iniziale.
-Comment[ko]=초기 설정을 사용하려면 이것을 선택하세요.
-Comment[ms]=Pilih ini untuk mulakan persediaan awalan lagi.
-Comment[pt]=Escolha isto para executar novamente a configuração inicial
-Comment[ru]=Выберите это для запуска инициализации настроек (сброс).
-Comment[sr]=Изаберите ово да би поново подесили подразумеване поставке.
-Comment[tr]=Açılış ayarlarına geri dönmek için bu profili seçin.
-Comment[zh_CN]=点击这里重新进行初始化设置主题。
-Icon=icon.png
--- a/data/elementary/config/meson.build
+++ b/data/elementary/config/meson.build
@ -1,21 +0,0 @@
-configs = ['default', 'mobile', 'standard']
-
-foreach config : configs
-  config_file = join_paths(meson.current_source_dir(), config, 'base.src.in')
-  config_icon = join_paths(meson.current_source_dir(), config, 'icon.png')
-  config_desktop = join_paths(meson.current_source_dir(), config, 'profile.desktop')
-
-  install_data([config_icon, config_desktop],
-    install_dir : join_paths(dir_data, 'elementary', 'config', config)
-  )
-
-  subdir(config)
-endforeach
-
-custom_target('config_profile',
-  input: 'profile.src',
-  output: 'profile.cfg',
-  command: [eet_bin, '-i', '@OUTPUT@', 'config', '@INPUT@', '0'],
-  install: true,
-  install_dir: join_paths(dir_data, 'elementary', 'config'),
-)
--- a/data/elementary/config/mobile/base.src.in
+++ b/data/elementary/config/mobile/base.src.in
--- a/data/elementary/config/mobile/meson.build
+++ b/data/elementary/config/mobile/meson.build
@ -1,7 +0,0 @@
-  custom_target('config_'+config,
-    input: config_file,
-    output: 'base.cfg',
-    command: [eet_bin, '-e', '@OUTPUT@', 'config', '@INPUT@', '1'],
-    install: true,
-    install_dir: join_paths(dir_data, 'elementary', 'config', config),
-  )
--- a/data/elementary/config/mobile/profile.desktop
+++ b/data/elementary/config/mobile/profile.desktop
@ -1,34 +0,0 @@
-[Desktop Entry]
-Type=Link
-Name=Mobile
-Name[ca]=Mòbil
-Name[de]=Mobil
-Name[el]=Κινητό
-Name[eo]=Portebla
-Name[es]=Móvil
-Name[fi]=Mobiili
-Name[fr]=Écran tactile
-Name[gl]=Móbil
-Name[ja]=モバイル
-Name[ko]=터치스크린
-Name[lt]=Mobiliesiems įrenginiams
-Name[ms]=Bimbit
-Name[pt]=Ecrã tátil
-Name[ru]=Мобильные устройства
-Name[sr]=Покретни
-Name[tr]=Mobil
-Comment=Configuration set up to work best with touchscreen phones, tablets and similar devices.
-Comment[ca]=Configuració configurada per funcionar millor amb telèfons amb pantalla tàctil, tablets i altres dispositius similars.
-Comment[de]=Die Konfiguration ist eingerichtet, um am besten mit einem Brührungsbildschirm, Handys, Tablets und ähnlichen Geräten zu arbeiten.
-Comment[eo]=Agordoj kongruas plej kun tuŝekranaj telefonoj, tabulkomputiloj aŭ similaj aparatoj.
-Comment[es]=Configuración adaptada para el uso de pantallas táctiles como la de los móviles, tablets y dispositivos similares.
-Comment[fi]=Kosketusnäytöllisissä puhelimissa, taulutietokoneissa sekä vastaavissa laitteissa parhaiten toimivat asetukset.
-Comment[fr]=Configuration adaptée aux écrans tactiles des téléphones, tablettes et apparentés.
-Comment[gl]=Configuración adaptada para o uso de pantallas táctiles como a dos móbiles, tablets e dispositivos similares.
-Comment[it]=Configurazione adatta per l'uso in smartphone con interfaccia tattile, tablets e similari.
-Comment[ko]=터치스크린 기반의 휴대폰, 태블릿 등과 같은 장치에 맞는 설정.
-Comment[ms]=Persediaan konfigurasi untuk berfungsi  baik dengan telefon skrin sentuh, tablet dan lain-lain peranti yang serupa.
-Comment[pt]=Configuração de ecrãs táteis como os dos telefones, tablets e similares.
-Comment[sr]=Поставке које су најбоље за рад са екраном на додир телефона, таблица и сличних уређаја.
-Comment[tr]=Yapılandırma dokunmatik ekranlı telefon ve tablet benzeri cihazlarda en iyi çalışacak şekilde ayarlanır.
-Icon=icon.png
--- a/data/elementary/config/standard/base.src.in
+++ b/data/elementary/config/standard/base.src.in
--- a/data/elementary/config/standard/meson.build
+++ b/data/elementary/config/standard/meson.build
@ -1,7 +0,0 @@
-  custom_target('config_'+config,
-    input: config_file,
-    output: 'base.cfg',
-    command: [eet_bin, '-e', '@OUTPUT@', 'config', '@INPUT@', '1'],
-    install: true,
-    install_dir: join_paths(dir_data, 'elementary', 'config', config),
-  )
--- a/data/elementary/config/standard/profile.desktop
+++ b/data/elementary/config/standard/profile.desktop
@ -1,42 +0,0 @@
-[Desktop Entry]
-Type=Link
-Name=Standard
-Name[ab]=标准
-Name[ca]=Estàndard
-Name[cs]=Standartní
-Name[de]=Vorgabe
-Name[el]=Κανονικό
-Name[eo]=Kutima
-Name[es]=Estándar
-Name[fi]=Vakio
-Name[gl]=Estándar
-Name[hu]=Általános
-Name[ja]=標準
-Name[ko]=표준
-Name[lt]=Standartinis
-Name[ms]=Piawai
-Name[pl]=Standardowe
-Name[pt]=Padrão
-Name[ru]=Стандартный
-Name[sr]=Уобичајено
-Name[tr]=Standart
-Name[zh_CN]=标准
-Comment=This is the standard profile that is universal for most desktop and laptop systems. Choose this if you are not sure what to choose.
-Comment[ca]=Aquest és el perfil estàndard que és universal per a la majoria dels sistemes d'escriptori i portàtils. Escolliu aquest si no sabeu què triar.
-Comment[cs]=Toto je standartní univerzální profil pro většinu stolních a přenosných počítačů. Vyberte pokud si nejste jisti co vybrat.
-Comment[el]=Αυτό είναι το κανονικό προφίλ που είναι κοινό για τα περισσότερα συστήματα. Επιλέξτε αυτό αν δεν είστε σίγουροι για  την επιλογή σας.
-Comment[eo]=Tio estas la kutima profilo taŭga por preskaŭ ĉiuj oficejaj sistemoj kaj porteblaj sistemoj. Elektu ĝin se vi ne certas.
-Comment[es]=Este es el perfil estándar y universal para la mayoría de ordenadores de escritorio y portátiles. Escójalo si no está seguro de cual elegir.
-Comment[fi]=Tämä on vakioprofiili jota voidaan yleisesti käyttää työasemissa ja kannettavissa tietokoneissa. Valitse tämä jos et ole varma minkä valitsisit.
-Comment[fr]=Le profil standard adapté à la quasi totalité des systèmes de bureau et ordinateurs portables. Choisissez ce profil en cas d'hésitation.
-Comment[gl]=Este é o perfil estándar e universal para a maioría de ordenadores de escritorio e portátiles. Escóllao se non está seguro de cal elexir.
-Comment[hu]=Ez az általános, alap beállítás, amely megfelelő a legtöbb laptop és asztali gép számára.
-Comment[it]=Questo è il profilo standard, universale per la maggior parte dei sistemi desktop e portatili. Scegliete questo se non siete sicuri di cosa scegliere.
-Comment[ko]=이 표준 프로파일은 대부분의 데스크톱과 랩톱 컴퓨터 시스템을 위한 보편적인 프로파일입니다. 무엇을 선택할지 확실하지 않다면 이것을 선택하세요.
-Comment[ms]=Ini adalah profil piawai yang universal untuk kebanyakan sistem komputer desktop dan riba. Pilih ini jika anda tidak pasti apa yang hendak dipilih.
-Comment[pt]=O perfil de configuração padrão utilizado para a maioria dos computadores e portáteis. Escolha-o se não souber o que escolher.
-Comment[ru]=Этот стандартный профиль универсален для большинства стационарных и переносных систем. Выберите его если вы не знаете что надо выбрать.
-Comment[sr]=Уобичајени начин рада за већину радних станица и преклопних рачунара. Ако нисте сигурни шта треба изабрати, означите ово.
-Comment[tr]=Bu pek çok masaüstü ve dizüstü sistem için genelde uygun standart bir profildir. Hangisini seçeceğinizden emin değilseniz bunu seçin.
-Comment[zh_CN]=适用于大多数台式机和笔记本的设置主题，如果您不清楚如何选择则请使用这个。
-Icon=icon.png
--- a/data/elementary/desktop/Makefile.am
+++ b/data/elementary/desktop/Makefile.am
@ -0,0 +1,10 @@
+AUTOMAKE_OPTIONS     = 1.4 foreign
+MAINTAINERCLEANFILES = Makefile.in
+
+desktopdir = $(datadir)/applications
+desktop_DATA = elementary_test.desktop elementary_config.desktop
+
+icondir = $(datadir)/icons
+icon_DATA = elementary.png
+
+EXTRA_DIST = $(desktop_DATA) $(icon_DATA)
--- a/data/elementary/desktop/elementary_config.desktop
+++ b/data/elementary/desktop/elementary_config.desktop
@ -1,4 +1,5 @@
 [Desktop Entry]
+Encoding=UTF-8
 Type=Application
 Name=Elementary Configuration
 Name[ca]=Configuració Elementary
--- a/data/elementary/desktop/elementary_perf.desktop
+++ b/data/elementary/desktop/elementary_perf.desktop
@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Elementary Perf
-Name[it]=Prestazioni di Elementary
-Comment=Elementary Performance Test Application
-Comment[fr]=Test de performance pour Elementary
-Comment[it]=Test delle prestazioni per Elementary
-Icon=elementary
-Exec=elementary_perf
-Terminal=false
-Categories=Development;Utility;
--- a/data/elementary/desktop/elementary_test.desktop
+++ b/data/elementary/desktop/elementary_test.desktop
@ -1,4 +1,5 @@
 [Desktop Entry]
+Encoding=UTF-8
 Type=Application
 Name=Elementary Test
 Name[ca]=Test bàsic
@ -6,6 +7,7 @@ Name[de]=Elementary-Test
 Name[el]=Elementary Test
 Name[eo]=Provo de Elementary
 Name[fi]=Elementary-testiohjema
+Name[fr]=Test Elementary
 Name[gl]=Proba do Elementary
 Name[it]=Test per Elementary
 Name[ja]=Elementary テスト
@ -20,7 +22,7 @@ Comment[de]=Elementary-Testanwendung
 Comment[eo]=Provoversia aplikaĵo de Elementary
 Comment[es]=Aplicación de pruebas para Elementary
 Comment[fi]=Elementaryn testisovellus
-Comment[fr]=Application de tests pour Elementary
+Comment[fr]=Programme de tests pour Elementary
 Comment[gl]=Aplicativo de probas para Elementary
 Comment[it]=Applicazione di test per Elementary
 Comment[ja]=Elementary テストアプリケーション
--- a/data/elementary/desktop/meson.build
+++ b/data/elementary/desktop/meson.build
@ -1,13 +0,0 @@
-desktop_files = files(
-  'elementary_config.desktop',
-  'elementary_test.desktop',
-  'elementary_perf.desktop')
-elementary_icon = files('elementary.png')
-
-install_data(desktop_files,
-  install_dir : join_paths(dir_data, 'applications')
-)
-
-install_data(elementary_icon,
-  install_dir : join_paths(dir_data, 'icons', 'hicolor', '128x128', 'apps')
-)
--- a/data/elementary/edje_externals/Makefile.am
+++ b/data/elementary/edje_externals/Makefile.am
@ -0,0 +1,26 @@
+EDJE_CC_FLAGS += -id $(top_srcdir)/data/elementary/edje_externals -fd $(top_srcdir)/data/elementary/edje_externals
+
+EXTRA_DIST += \
+	elementary/edje_externals/icons.edc \
+	elementary/edje_externals/ico_anchorblock.png \
+	elementary/edje_externals/ico_anchorview.png \
+	elementary/edje_externals/ico_bubble.png \
+	elementary/edje_externals/ico_button.png \
+	elementary/edje_externals/ico_check.png \
+	elementary/edje_externals/ico_clock.png \
+	elementary/edje_externals/ico_fileselector.png \
+	elementary/edje_externals/ico_fileselector_button.png \
+	elementary/edje_externals/ico_genlist.png \
+	elementary/edje_externals/ico_hoversel.png \
+	elementary/edje_externals/ico_list.png \
+	elementary/edje_externals/ico_map.png \
+	elementary/edje_externals/ico_notepad.png \
+	elementary/edje_externals/ico_photocam.png \
+	elementary/edje_externals/ico_progressbar.png \
+	elementary/edje_externals/ico_radio.png \
+	elementary/edje_externals/ico_scrolled_entry.png \
+	elementary/edje_externals/ico_slider.png \
+	elementary/edje_externals/ico_slideshow.png \
+	elementary/edje_externals/ico_spinner.png \
+	elementary/edje_externals/ico_thumb.png \
+	elementary/edje_externals/ico_toolbar.png
--- a/data/elementary/edje_externals/ico_list.png
+++ b/data/elementary/edje_externals/ico_list.png
--- a/data/elementary/edje_externals/meson.build
+++ b/data/elementary/edje_externals/meson.build
@ -1,11 +0,0 @@
-custom_target('edje_cc_edje_externals',
-  input : 'icons.edc',
-  output : '@BASENAME@.edj',
-  command : edje_cc_exe + [ '-beta', '-fastcomp',
-            '-id', join_paths(meson.current_source_dir()),
-            '-id', elm_themes_image_include,
-            '@INPUT@', '@OUTPUT@'],
-  depends : edje_depends,
-  install : true,
-  install_dir : join_paths(dir_data, 'elementary', 'edje_externals'),
-)
--- a/data/elementary/images/Makefile.am
+++ b/data/elementary/images/Makefile.am
@ -0,0 +1,92 @@
+elementary_images_files = \
+	elementary/images/insanely_huge_test_image.jpg \
+	elementary/images/panel_01.jpg \
+	elementary/images/plant_01.jpg \
+	elementary/images/pol_shadow.png \
+	elementary/images/pol_sky.png \
+	elementary/images/pol_twofish.png \
+	elementary/images/rock_01.jpg \
+	elementary/images/rock_02.jpg \
+	elementary/images/sky_01.jpg \
+	elementary/images/sky_02.jpg \
+	elementary/images/sky_03.jpg \
+	elementary/images/sky_04.jpg \
+	elementary/images/wood_01.jpg \
+	elementary/images/logo.png \
+	elementary/images/logo_small.png \
+	elementary/images/animated_logo.gif \
+	elementary/images/parking.png \
+	elementary/images/icon_00.png \
+	elementary/images/icon_01.png \
+	elementary/images/icon_02.png \
+	elementary/images/icon_03.png \
+	elementary/images/icon_04.png \
+	elementary/images/icon_05.png \
+	elementary/images/icon_06.png \
+	elementary/images/icon_07.png \
+	elementary/images/icon_08.png \
+	elementary/images/icon_09.png \
+	elementary/images/icon_10.png \
+	elementary/images/icon_11.png \
+	elementary/images/icon_12.png \
+	elementary/images/icon_13.png \
+	elementary/images/icon_14.png \
+	elementary/images/icon_15.png \
+	elementary/images/icon_16.png \
+	elementary/images/icon_17.png \
+	elementary/images/icon_18.png \
+	elementary/images/icon_19.png \
+	elementary/images/icon_20.png \
+	elementary/images/icon_21.png \
+	elementary/images/icon_22.png \
+	elementary/images/icon_23.png \
+	elementary/images/icon_right_arrow.png \
+	elementary/images/bubble.png \
+	elementary/images/bubble_sh.png \
+	elementary/images/mystrale.jpg \
+	elementary/images/mystrale_2.jpg \
+	elementary/images/twofish.jpg \
+	elementary/images/pt.png \
+	elementary/images/earth_normal.png \
+	elementary/images/space.png
+
+elementary_images_glayer_files = \
+	elementary/images/g_layer/double_tap_1.png \
+	elementary/images/g_layer/line_1.png \
+	elementary/images/g_layer/momentum_1.png \
+	elementary/images/g_layer/tap_5.png \
+	elementary/images/g_layer/double_tap_2.png \
+	elementary/images/g_layer/line_2.png \
+	elementary/images/g_layer/momentum_2.png \
+	elementary/images/g_layer/triple_tap_1.png \
+	elementary/images/g_layer/double_tap_3.png \
+	elementary/images/g_layer/line_3.png \
+	elementary/images/g_layer/momentum_3.png \
+	elementary/images/g_layer/triple_tap_2.png \
+	elementary/images/g_layer/double_tap_4.png \
+	elementary/images/g_layer/line_4.png \
+	elementary/images/g_layer/momentum_4.png \
+	elementary/images/g_layer/triple_tap_3.png \
+	elementary/images/g_layer/double_tap_5.png \
+	elementary/images/g_layer/line_5.png \
+	elementary/images/g_layer/momentum_5.png \
+	elementary/images/g_layer/triple_tap_4.png \
+	elementary/images/g_layer/flick_1.png \
+	elementary/images/g_layer/long_tap_1.png \
+	elementary/images/g_layer/rotate_1.png \
+	elementary/images/g_layer/triple_tap_5.png \
+	elementary/images/g_layer/flick_2.png \
+	elementary/images/g_layer/long_tap_2.png \
+	elementary/images/g_layer/tap_1.png \
+	elementary/images/g_layer/zoom_1.png \
+	elementary/images/g_layer/flick_3.png \
+	elementary/images/g_layer/long_tap_3.png \
+	elementary/images/g_layer/tap_2.png \
+	elementary/images/g_layer/flick_4.png \
+	elementary/images/g_layer/long_tap_4.png \
+	elementary/images/g_layer/tap_3.png \
+	elementary/images/g_layer/flick_5.png \
+	elementary/images/g_layer/long_tap_5.png \
+	elementary/images/g_layer/tap_4.png
+
+EXTRA_DIST += $(files_DATA) $(files_glayer_DATA)
--- a/data/elementary/images/animated_webp_image.webp
+++ b/data/elementary/images/animated_webp_image.webp
--- a/data/elementary/images/emoji_wink.json
+++ b/data/elementary/images/emoji_wink.json
--- a/data/elementary/images/fire.gif
+++ b/data/elementary/images/fire.gif
--- a/data/elementary/images/image_items.eet
+++ b/data/elementary/images/image_items.eet
--- a/data/elementary/images/pm_fill.png
+++ b/data/elementary/images/pm_fill.png
--- a/data/elementary/images/static_webp_image.webp
+++ b/data/elementary/images/static_webp_image.webp
--- a/data/elementary/images/three_box.json
+++ b/data/elementary/images/three_box.json
@ -1 +0,0 @@
-{"v":"5.5.9","fr":29.9700012207031,"ip":0,"op":130.000005295009,"w":1920,"h":1080,"nm":"Comp 1","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"layer","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[960,540,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[300,300],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":2,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-261,"s":[1,0,0,1]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[1,0,0,1]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":16,"s":[0,1,0,1]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":57,"s":[0,0,1,1]},{"t":119.000004846969,"s":[1,0,0,1]}],"ix":4},"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-400,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":37,"s":[10]},{"t":108.00000439893,"s":[100]}],"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-600,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"box1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[300,300],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":3,"s":[1,1,1,1]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":45,"s":[1,0.917647123337,0,1]},{"t":96.0000039101602,"s":[1,1,1,1]}],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":1,"s":[2]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":46,"s":[69]},{"t":102.000004154545,"s":[2]}],"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"box2","np":3,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[300,300],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":2,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[600,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"box3","np":3,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false}],"ip":-6.00000024438501,"op":894.000036413367,"st":-6.00000024438501,"bm":0}],"markers":[]}
--- a/data/elementary/images/tiger.svg
+++ b/data/elementary/images/tiger.svg
@ -1,829 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd">
-<svg version="1.1" baseProfile="basic" id="svg2" xmlns:svg="http://www.w3.org/2000/svg"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="900px" height="900px"
-	 viewBox="0 0 900 900" xml:space="preserve">
-<path id="path482" fill="none" d="M184.013,144.428"/>
-<path id="path6" fill="#FFFFFF" stroke="#000000" stroke-width="0.172" d="M108.956,403.826c0,0,0.178,3.344-1.276,3.311
-	c-1.455-0.033-30.507-84.917-66.752-80.957C40.928,326.18,72.326,313.197,108.956,403.826z"/>
-<path id="path10" fill="#FFFFFF" stroke="#000000" stroke-width="0.172" d="M115.189,398.488c0,0-0.97,3.207-2.327,2.679
-	c-1.356-0.526,0.203-90.231-35.227-98.837C77.635,302.33,111.576,300.804,115.189,398.488z"/>
-<path id="path14" fill="#FFFFFF" stroke="#000000" stroke-width="0.172" d="M163.727,473.225c0,0,2.888,1.695,2.059,2.892
-	c-0.832,1.194-87.655-21.408-104.35,11.003C61.436,487.118,67.931,453.771,163.727,473.225z"/>
-<path id="path18" fill="#FFFFFF" stroke="#000000" stroke-width="0.172" d="M158.767,491.254c0,0,3.277,0.699,2.864,2.096
-	c-0.411,1.396-89.935,7.298-95.567,43.318C66.063,536.668,61.723,502.971,158.767,491.254z"/>
-<path id="path22" fill="#FFFFFF" stroke="#000000" stroke-width="0.172" d="M151.332,481.498c0,0,3.139,1.171,2.528,2.492
-	c-0.611,1.319-90.037-5.899-100.864,28.915C52.996,512.905,53.617,478.938,151.332,481.498z"/>
-<path id="path26" fill="#FFFFFF" stroke="#000000" stroke-width="0.172" d="M132.43,449.356c0,0,2.31,2.427,1.181,3.347
-	c-1.128,0.919-78.363-44.729-103.341-18.171C30.27,434.532,45.704,404.264,132.43,449.356z"/>
-<path id="path30" fill="#FFFFFF" stroke="#000000" stroke-width="0.172" d="M119.108,456.757c0,0,2.571,2.148,1.554,3.192
-	c-1.017,1.041-82.921-35.576-104.734-6.36C15.928,453.589,27.837,421.769,119.108,456.757z"/>
-<path id="path34" fill="#FFFFFF" stroke="#000000" stroke-width="0.172" d="M114.518,463.946c0,0,2.839,1.778,1.974,2.95
-	c-0.865,1.171-86.997-23.942-104.623,7.974C11.869,474.87,19.329,441.724,114.518,463.946z"/>
-<path id="path38" fill="#FFFFFF" stroke="#000000" stroke-width="0.172" d="M133.47,465.03c0,0,1.981,2.703,0.743,3.472
-	c-1.237,0.768-71.985-54.405-100.161-31.267C34.052,437.235,53.236,409.195,133.47,465.03z"/>
-<path id="path42" fill="#FFFFFF" stroke="#000000" stroke-width="0.172" d="M98.546,413.917c0,0,1.06,3.178-0.353,3.531
-	c-1.413,0.353-51.91-73.804-85.812-60.385C12.381,357.063,39.22,336.229,98.546,413.917z"/>
-<path id="path46" fill="#FFFFFF" stroke="#000000" stroke-width="0.172" d="M99.773,426.239c0,0,1.722,2.876,0.417,3.523
-	c-1.303,0.649-66.605-60.873-96.813-40.458C3.376,389.306,25.088,363.174,99.773,426.239z"/>
-<path id="path50" fill="#FFFFFF" stroke="#000000" stroke-width="0.172" d="M99.57,433.955c0,0,1.981,2.703,0.744,3.472
-	c-1.238,0.767-71.985-54.405-100.162-31.267C0.152,406.16,19.335,378.12,99.57,433.955z"/>
-<path id="path54" fill="#FFFFFF" stroke="#000000" d="M95.668,436.985c0.888,10.678,2.632,22.275,5.703,27.783
-	c0,0-6.356,21.895,9.181,45.2c0,0-0.707,12.712,2.119,18.362c0,0,7.063,14.832,15.538,16.244c6.858,1.143,22.26,6.561,39.67,9.04
-	c0,0,30.249,24.859,24.599,47.461c0,0-0.706,28.956-7.063,31.781c0,0,20.481-19.775,3.531,9.888l-7.769,33.192
-	c0,0,45.201-38.138,17.657-5.648l-17.657,45.906c0,0,34.607-32.487,21.894-17.656l-5.65,15.538c0,0,76.276-48.025,21.894,4.237
-	c0,0,14.125-6.356,21.894-1.412c0,0,12.006-2.119,10.594,0.706c0,0-36.726,18.361-43.082,50.851c0,0,14.831-17.657,9.181,1.412
-	l0.706,20.48c0,0,7.063-38.138,6.356,28.25c0,0,33.9-31.78,13.419,4.944v29.662c0,0,26.838-28.956,15.538-6.354
-	c0,0,17.656-15.538,10.594,11.3c0,0-1.413,18.361,6.356-1.412c0,0,28.25-54.029,17.656-7.771c0,0-1.412,33.9,7.063,7.771
-	c0,0,0.706,18.362,16.95,31.075c0,0-2.119-89.695,20.48-26.133l7.063,28.957c0,0,4.943-16.244,4.237-25.426
-	c0,0,26.132-28.957,14.125,14.125c0,0,26.838-40.257,21.188-16.95c0,0-13.419,28.251-10.594,36.727c0,0,29.663-61.444,31.782-64.271
-	c0,0-3.531,74.865,15.537,11.3c0,0,9.888,21.188,4.943,28.957c0,0,14.125-14.125,12.712-19.774c0,0,8.122-14.479,13.066,9.534
-	c0,0,3.178,16.598,6.003,10.946c0,0,7.063,42.377,9.182,2.119c0,0,2.825-24.013-9.888-44.494c0,0,1.412-5.649-3.531-12.713
-	c0,0,24.014,38.139,11.3-12.713c0,0,19.777,14.125,21.896,14.125c0,0-24.015-40.963-8.477-32.487c0,0-9.183-18.362,22.602,2.825
-	c0,0-28.252-28.251,2.825-11.301c0,0,14.125,11.301,0.706-6.356c0,0-25.428-28.25,13.419,3.532c0,0,20.48,28.956,21.895,33.9
-	c0,0-17.655-51.559-25.426-56.501c0,0,14.832-64.271,87.576-36.727c0,0,12.007,30.369,19.774-2.118c0,0,22.602-11.301,42.375,37.432
-	c0,0,7.063-24.013,5.65-28.956c0,0,12.007,2.119,10.594,0c0,0,23.308,7.769,25.427,6.356c0,0,12.006,12.006,12.712,5.648
-	c0,0,16.244,4.944,12.713-1.412c0,0,15.538,27.544,16.244,33.9l4.236-24.719l3.531,4.942c0,0,2.825-13.419,1.413-15.537
-	c-1.413-2.119,35.313,12.006,43.787,48.731l3.531,14.831c0,0,10.594-26.131,7.77-33.193c0,0,9.181,1.412,9.888,9.181
-	c0,0,7.063-40.963-1.412-51.557c0,0,7.769-1.412,9.888,4.944V714.78c0,0,12.713,1.411,12.713-2.825c0,0,7.769-7.063,11.3,1.412
-	c0,0-21.894-62.15,10.594-28.25c0,0,12.714,19.068,6.356-14.125c-6.357-33.194-13.419-36.021-4.943-36.727
-	c0,0,1.412-6.355-2.118-9.181c-3.531-2.825,2.118,0,2.118,0s8.476,7.063-0.707-31.782c0,0,11.302,2.825-9.888-48.73
-	c0,0,4.944-4.237-2.118-19.069c0,0,14.125,7.77,19.069,4.944c0,0-0.707-2.825-6.356-9.889c0,0-38.139-96.759-2.118-57.913
-	c0,0,20.923,23.925,9.623-16.332c0,0-16.088-42.394-14.716-49.979L95.668,436.985z"/>
-<path id="path58" fill="#CC7226" stroke="#000000" d="M854.095,396.693c1.108,0.32,5.004,2.304,7.211,5.217
-	c0,0,12.006,19.068,2.825-13.418c0,0-16.244-50.851-0.707-31.076c0,0,10.594,12.713,4.944-11.3
-	c-6.824-29.004-11.301-40.257-11.301-40.257s20.48,8.475-26.837-61.444l15.536,6.356c0,0-34.605-69.919-72.743-79.101
-	l-14.125-10.594c0,0,67.8-67.094,45.199-132.07c0,0-12.007-9.182-28.957,7.063c0,0-11.3,8.475-21.894,5.65
-	c0,0-54.382,2.119-57.913,2.119S630.359-21.844,514.533,9.231c0,0-9.183,3.531-16.95,1.413c0,0-32.489-28.25-118.653,12.006
-	c0,0-17.655,3.531-20.48,3.531s-7.77,0-21.895,11.3c-14.125,11.3-14.832,12.712-18.362,15.538c0,0-28.957,19.775-37.432,21.188
-	c0,0-20.481,11.3-28.25,28.957l-6.356,2.119c0,0-2.825,12.713-3.532,14.832c0,0-8.475,6.356-9.887,16.244
-	c0,0-15.538,10.594-14.832,18.362c0,0-2.825,9.182-4.238,17.657c0,0-12.712,8.475-11.3,13.419c0,0-13.419,24.719-11.3,36.725
-	c0,0-11.3-0.706-16.244,3.531c0,0-1.413,8.475-4.238,9.182c0,0-4.944,2.119-0.706,9.181c0,0-2.825,4.944-3.531,7.769
-	c0,0,1.412,4.944-6.356,14.831c0,0-11.3,33.194-7.769,42.375c0,0,0.707,8.475-4.237,11.3c0,0-6.356-0.707,8.475,20.481
-	c0,0,1.413,2.119-4.238,6.356c0,0-30.369,6.356-34.606,35.313c0,0-24.013,26.131-24.013,35.313c0,4.069,0.479,9.626,1.713,17.771
-	c0,0-1.007,14.718,47.725,16.131C191.772,453.469,854.095,396.693,854.095,396.693z"/>
-<path id="path62" fill="#CC7226" d="M120.793,436.164c-44.141-69.566-18.716,30.018-18.716,30.018
-	c15.538,60.738,244.365-5.649,244.365-5.649s298.042-53.677,317.816-60.739c19.775-7.063,187.864,4.237,187.864,4.237l-9.888-29.663
-	c-114.414-81.926-148.314-40.963-172.327-48.025c-24.013-7.062-19.774,9.888-25.425,11.3c-5.651,1.412-74.863-42.375-86.163-40.963
-	c-11.301,1.413-56.045-40.523-29.663,15.538c28.25,60.032-103.115,69.213-132.778,49.438
-	c-29.663-19.775,12.713,32.488,12.713,32.488c32.487,35.313-28.25,5.65-28.25,5.65c-60.737-22.601-103.114,22.6-108.764,24.013
-	c-5.65,1.412-14.125,7.063-15.538-4.237c-1.412-11.301-14.672-40.789-70.625,5.649c-35.313,29.313-59.679-9.534-59.679-9.534
-	L120.793,436.164z"/>
-<path id="path66" fill="#E87F3A" d="M560.632,299.761c-11.3,1.413-56.089-40.502-29.662,15.538
-	c29.311,62.151-103.113,69.213-132.775,49.438c-29.665-19.775,12.712,32.488,12.712,32.488c32.488,35.313-28.252,5.649-28.252,5.649
-	c-60.737-22.6-103.113,22.601-108.763,24.013c-5.65,1.413-14.125,7.063-15.538-4.236c-1.413-11.301-14.441-40.494-70.626,5.649
-	c-37.495,30.627-61.315-7.255-61.315-7.255l-5.65,17.849c-44.141-70.271-17.529,32.682-17.529,32.682
-	c15.54,60.739,245.521-7.962,245.521-7.962s298.043-53.676,317.817-60.738c19.774-7.062,186.325,4.109,186.325,4.109l-9.762-30.563
-	c-114.413-81.926-146.9-39.935-170.914-46.998c-24.013-7.063-19.774,9.888-25.425,11.3
-	C641.146,342.136,571.933,298.349,560.632,299.761z"/>
-<path id="path70" fill="#EA8C4D" d="M562.943,302.842c-11.301,1.413-54.973-41.014-29.663,15.538
-	c28.604,63.918-103.113,69.215-132.776,49.44c-29.662-19.775,12.713,32.488,12.713,32.488c32.488,35.313-28.25,5.649-28.25,5.649
-	c-60.738-22.6-103.115,22.601-108.766,24.013c-5.65,1.413-14.125,7.063-15.538-4.236c-1.413-11.301-14.21-40.198-70.625,5.649
-	c-39.68,31.942-62.952-4.976-62.952-4.976l-6.356,15.216c-42.022-68.86-16.341,35.345-16.341,35.345
-	c15.538,60.738,246.678-10.271,246.678-10.271s298.04-53.677,317.814-60.738c19.775-7.063,184.783,3.979,184.783,3.979l-9.63-31.46
-	c-114.415-81.926-145.49-38.909-169.503-45.972c-24.014-7.063-19.775,9.888-25.427,11.302
-	C643.457,345.219,574.243,301.429,562.943,302.842z"/>
-<path id="path74" fill="#EC9961" d="M565.255,305.925c-11.301,1.413-54.963-41.02-29.663,15.538
-	c29.663,66.311-104.057,68.586-132.775,49.438c-29.663-19.775,12.713,32.488,12.713,32.488c32.486,35.313-28.25,5.649-28.25,5.649
-	c-60.738-22.6-103.114,22.601-108.764,24.013c-5.65,1.413-14.125,7.063-15.538-4.236c-1.413-11.301-13.979-39.9-70.627,5.649
-	c-41.862,33.259-64.591-2.696-64.591-2.696l-7.063,12.584c-38.491-64.976-15.151,38.012-15.151,38.012
-	c15.538,60.736,247.833-12.586,247.833-12.586s298.04-53.677,317.817-60.738c19.773-7.063,183.24,3.853,183.24,3.853l-9.502-32.358
-	c-114.414-81.928-144.076-37.882-168.09-44.945c-24.015-7.063-19.775,9.888-25.427,11.3
-	C645.766,348.301,576.555,304.512,565.255,305.925z"/>
-<path id="path78" fill="#EEA575" d="M567.567,309.008c-11.303,1.412-54.07-41.412-29.664,15.538
-	c29.664,69.213-103.114,69.213-132.776,49.438c-29.663-19.775,12.713,32.487,12.713,32.487c32.487,35.313-28.251,5.65-28.251,5.65
-	c-60.738-22.6-103.113,22.601-108.763,24.013c-5.65,1.412-14.125,7.063-15.538-4.237s-13.746-39.604-70.626,5.649
-	c-44.046,34.575-66.229-0.418-66.229-0.418l-7.769,9.953c-34.96-61.446-13.964,40.673-13.964,40.673
-	c15.538,60.74,248.989-14.895,248.989-14.895s298.043-53.677,317.816-60.738c19.775-7.063,181.701,3.724,181.701,3.724
-	l-9.374-33.259c-114.414-81.926-142.664-36.853-166.677-43.915c-24.014-7.062-19.775,9.888-25.426,11.3
-	C648.081,351.383,578.868,307.595,567.567,309.008z"/>
-<path id="path82" fill="#F1B288" d="M569.879,312.089c-11.3,1.412-57.144-39.994-29.663,15.538
-	c33.9,68.507-103.115,69.213-132.778,49.438c-29.661-19.775,12.714,32.487,12.714,32.487c32.487,35.313-28.25,5.65-28.25,5.65
-	c-60.738-22.6-103.114,22.601-108.764,24.013c-5.65,1.412-14.125,7.063-15.538-4.237c-1.413-11.3-13.514-39.309-70.626,5.649
-	c-46.228,35.893-67.866,1.863-67.866,1.863l-8.475,7.317c-31.782-58.619-12.776,43.341-12.776,43.341
-	C123.394,553.887,358,475.94,358,475.94s298.042-53.677,317.817-60.738c19.774-7.063,180.158,3.595,180.158,3.595l-9.244-34.156
-	c-114.413-81.926-141.251-35.827-165.265-42.889c-24.013-7.062-19.774,9.888-25.426,11.3
-	C650.393,354.464,581.179,310.676,569.879,312.089z"/>
-<path id="path86" fill="#F3BF9C" d="M572.19,315.169c-11.303,1.413-57.813-39.656-29.665,15.538
-	c36.021,70.627-103.113,69.214-132.776,49.439s12.713,32.488,12.713,32.488c32.487,35.313-28.25,5.65-28.25,5.65
-	c-60.738-22.601-103.114,22.6-108.764,24.013c-5.65,1.412-14.125,7.063-15.538-4.237c-1.412-11.301-13.283-39.014-70.625,5.649
-	c-48.412,37.208-69.503,4.141-69.503,4.141l-9.181,4.688c-28.25-53.322-11.59,46.004-11.59,46.004
-	c15.538,60.738,251.301-19.519,251.301-19.519s298.041-53.677,317.816-60.738c19.775-7.063,178.619,3.466,178.619,3.466
-	l-9.117-35.055c-114.414-81.926-139.84-34.799-163.853-41.862c-24.014-7.064-19.774,9.888-25.425,11.3
-	C652.702,357.546,583.49,313.757,572.19,315.169z"/>
-<path id="path90" fill="#F5CCB0" d="M574.501,318.252c-11.3,1.413-59.753-38.624-29.662,15.538
-	c38.844,69.92-103.115,69.213-132.778,49.438c-29.662-19.775,12.714,32.488,12.714,32.488c32.486,35.313-28.251,5.65-28.251,5.65
-	c-60.737-22.602-103.113,22.6-108.764,24.013c-5.65,1.412-14.125,7.063-15.538-4.237c-1.413-11.301-13.05-38.716-70.626,5.649
-	c-50.594,38.524-71.14,6.422-71.14,6.422l-9.887,2.054c-25.427-50.145-10.401,48.668-10.401,48.668
-	c15.538,60.74,252.455-21.829,252.455-21.829s298.043-53.677,317.816-60.738c19.775-7.063,177.078,3.339,177.078,3.339
-	l-8.987-35.956c-114.414-81.926-138.428-33.771-162.439-40.834c-24.013-7.063-19.774,9.888-25.425,11.3
-	C655.015,360.628,585.802,316.84,574.501,318.252z"/>
-<path id="path94" fill="#F8D8C4" d="M576.813,321.335c-11.3,1.413-59.753-38.625-29.662,15.538
-	c38.845,69.919-103.113,69.213-132.776,49.438c-29.662-19.775,12.713,32.488,12.713,32.488c32.488,35.313-28.25,5.65-28.25,5.65
-	c-60.74-22.602-103.115,22.6-108.766,24.013c-5.65,1.412-14.125,7.063-15.538-4.238c-1.413-11.3-12.817-38.42-70.625,5.65
-	c-52.777,39.84-72.776,8.701-72.776,8.701l-10.594-0.579c-24.015-46.615-9.213,51.332-9.213,51.332
-	c15.538,60.738,253.609-24.143,253.609-24.143s298.042-53.675,317.817-60.736c19.775-7.063,175.538,3.21,175.538,3.21l-8.859-36.854
-	c-114.416-81.926-137.016-32.744-161.027-39.807c-24.013-7.063-19.775,9.888-25.427,11.3
-	C657.326,363.711,588.112,319.923,576.813,321.335z"/>
-<path id="path98" fill="#FAE5D7" d="M579.124,324.417c-11.301,1.413-59.068-38.998-29.663,15.538
-	c38.844,72.038-103.113,69.213-132.776,49.438c-29.662-19.775,12.714,32.488,12.714,32.488c32.486,35.313-28.251,5.65-28.251,5.65
-	c-60.737-22.602-103.113,22.6-108.764,24.013c-5.652,1.412-14.127,7.063-15.54-4.238c-1.412-11.3-12.585-38.123-70.625,5.65
-	c-54.959,41.157-74.413,10.979-74.413,10.979l-11.302-3.212c-22.954-42.375-8.025,53.999-8.025,53.999
-	c15.538,60.738,254.769-26.455,254.769-26.455s298.04-53.675,317.814-60.736c19.775-7.063,173.997,3.082,173.997,3.082
-	l-8.732-37.752c-114.413-81.928-135.602-31.718-159.613-38.781c-24.014-7.063-19.774,9.888-25.426,11.3
-	S590.424,323.004,579.124,324.417z"/>
-<path id="path102" fill="#FCF2EB" d="M581.435,327.498c-11.3,1.412-57.161-39.981-29.661,15.538
-	c37.432,75.571-103.114,69.215-132.776,49.439c-29.663-19.775,12.713,32.488,12.713,32.488c32.487,35.313-28.251,5.649-28.251,5.649
-	c-60.738-22.601-103.113,22.601-108.763,24.013c-5.65,1.413-14.125,7.063-15.538-4.237c-1.413-11.3-12.354-37.827-70.626,5.65
-	c-57.145,42.473-76.053,13.258-76.053,13.258l-12.006-5.842c-22.6-40.964-6.836,56.661-6.836,56.661
-	c15.538,60.736,255.921-28.766,255.921-28.766s298.043-53.676,317.817-60.737c19.775-7.063,172.454,2.951,172.454,2.951
-	l-8.604-38.65c-114.415-81.926-134.188-30.688-158.2-37.751c-24.014-7.064-19.775,9.887-25.426,11.3
-	C661.948,369.875,592.735,326.085,581.435,327.498z"/>
-<path id="path106" fill="#FFFFFF" d="M120.44,466.182c-22.601-38.846-5.65,59.325-5.65,59.325
-	c15.538,60.738,257.078-31.075,257.078-31.075s298.042-53.677,317.816-60.738c19.775-7.063,170.914,2.823,170.914,2.823
-	l-8.475-39.55c-114.414-81.926-132.776-29.663-156.789-36.726c-24.013-7.063-19.775,9.888-25.426,11.3
-	c-5.649,1.413-74.862-42.375-86.163-40.963c-11.3,1.412-55.829-40.623-29.663,15.538c39.245,84.232-107.28,66.436-132.777,49.438
-	c-29.663-19.775,12.712,32.488,12.712,32.488c32.488,35.313-28.25,5.65-28.25,5.65c-60.737-22.602-103.113,22.602-108.764,24.014
-	c-5.65,1.413-14.125,7.063-15.538-4.237c-1.413-11.302-12.121-37.532-70.625,5.65c-59.326,43.788-77.688,15.537-77.688,15.537
-	L120.44,466.182z"/>
-<path id="path110" d="M193.891,519.15c0,0-12.713,20.48,24.013,43.788c0,0,2.472,2.473-29.31-4.943c0,0-10.947-3.531-13.771-21.896
-	c0,0-8.475-7.769-16.95-17.655C149.397,508.557,193.891,519.15,193.891,519.15z"/>
-<path id="path114" fill="#CCCCCC" d="M441.08,435.104c0,0,31.249,47.356,30.193,55.797c-2.297,18.362-2.648,35.313,3.001,42.376
-	c5.651,7.063,21.188,65.682,21.188,65.682s-0.706,2.119,21.188-64.976c0,0,20.48-28.25-14.831-60.738
-	C501.82,473.244,439.668,422.392,441.08,435.104z"/>
-<path id="path118" d="M229.204,566.47c0,0,19.775,12.713-5.65,67.802l11.3-4.237c0,0-1.413,19.774-7.063,24.013l12.712-5.65
-	c0,0,8.475,14.127,1.413,22.602c0,0,29.663,14.125,28.25,25.425c0,0,11.3-14.125,4.237-25.425s-19.775-4.237-18.363-36.727
-	l-15.538,5.65c0,0,9.888-15.538,9.888-26.838l-14.125,4.237c0,0,27.313-46.928,8.475-49.438
-	C234.147,566.47,229.204,566.47,229.204,566.47z"/>
-<path id="path122" fill="#CCCCCC" d="M286.41,596.133c0,0,4.944-7.769,0-6.355c-4.944,1.413-60.032,27.544-70.625,44.494
-	C215.785,634.271,276.522,591.189,286.41,596.133z"/>
-<path id="path126" fill="#CCCCCC" d="M304.773,610.258c0,0,4.944-7.769,0-6.355s-60.032,27.544-70.625,44.494
-	C234.147,648.396,294.885,605.314,304.773,610.258z"/>
-<path id="path130" fill="#CCCCCC" d="M328.079,583.42c0,0,4.944-7.769,0-6.355c-4.943,1.412-60.032,27.545-70.625,44.494
-	C257.454,621.559,318.191,578.477,328.079,583.42z"/>
-<path id="path134" fill="#CCCCCC" d="M287.117,660.402c0,0,0-10.595-4.944-9.183c-4.944,1.413-68.507,32.488-79.101,49.438
-	C203.072,700.659,277.229,655.458,287.117,660.402z"/>
-<path id="path138" fill="#CCCCCC" d="M289.235,641.333c0,0,2.119-8.475-2.825-7.063c-3.531,0-50.144,20.481-60.738,37.433
-	C225.672,671.702,277.935,633.564,289.235,641.333z"/>
-<path id="path142" fill="#CCCCCC" d="M263.81,725.378l-17.656,13.419c0,0,18.362-13.419,24.719-11.3
-	c0,0-12.006,19.774-13.419,28.956c0,0,18.363-22.602,28.25-21.895c0,0,13.419,0.706,13.419,19.774c0,0,9.888-18.362,15.537-17.656
-	c0,0,2.119,11.302,0,23.308c0,0,7.063-13.419,14.125-10.595c0,0,11.301-3.53,9.888,16.95c0,0,0,18.362-1.412,23.308
-	c0,0,9.889-46.613,14.125-47.319c0,0,14.125-2.119,22.602,13.419c0,0-7.063-13.419,1.412-9.888c0,0,19.068,2.824,24.719,14.831
-	c0,0-12.006-21.188-2.118-15.537c0,0,12.006,0,14.125,11.3c0,0,14.831,37.432,18.362,40.257c0,0-13.419-38.138-10.595-38.138
-	c0,0-3.53-21.188,5.65,4.942c0,0-5.65-24.719,4.237-23.307c9.888,1.413,17.655,19.069,32.487,14.832
-	c0,0,16.952,9.888,20.483-112.295L263.81,725.378z"/>
-<path id="path146" d="M272.285,561.526c0,0,26.131-10.595,96.757,0c0,0,12.713,0.706,24.72-14.831
-	c12.006-15.538,59.325-28.251,70.625-24.721l16.952,11.302l1.413,2.118c0,0,21.895,18.362,22.6,31.781
-	c0.706,13.418-25.425,98.169-42.377,126.42c-16.949,28.25-33.899,50.145-67.801,45.906c0,0-36.726-7.063-81.926,0
-	c0,0-51.557-2.825-56.5-16.95s19.775-40.963,19.775-40.963s7.769-14.831,5.65-40.257C280.054,615.908,280.76,566.47,272.285,561.526
-	z"/>
-<path id="path150" fill="#E5668C" d="M311.129,565.058c14.832,32.487-37.431,147.607-37.431,147.607
-	c-3.531,2.825,22.353,13.499,40.256,9.182c19.327-4.657,90.401,2.825,90.401,2.825c41.669-27.544,64.27-105.938,64.27-105.938
-	s18.364-42.376-12.713-48.025C424.837,565.058,311.129,565.058,311.129,565.058z"/>
-<path id="path154" fill="#B23259" d="M307.543,619.608c5.873-22.582,8.67-43.419,3.586-54.552c0,0,110.177,11.301,129.951-25.426
-	c7.488-13.904,33.55,40.257,32.842,57.207c0,0-111.236,25.426-137.367,5.65L307.543,619.608z"/>
-<path id="path158" fill="#A5264C" d="M315.367,648.396c0,0,3.531,12.713-0.707,19.774c0,0-2.824,1.413-4.943,2.119
-	c0,0,2.119,6.356,12.713,9.182c0,0,3.531,7.77,7.77,8.476s12.713,10.594,19.774,8.475c7.063-2.118,26.839-9.181,26.839-9.181
-	s9.888-5.65,25.425,0.706c0,0,4.192-1.416,4.942-8.476c0.884-8.299,6.356-14.832,9.889-18.362
-	c3.531-3.531,20.48-26.133,18.362-26.838C433.313,633.564,315.367,648.396,315.367,648.396z"/>
-<path id="path162" fill="#FF727F" stroke="#000000" d="M307.598,562.938c0,0-4.943,39.552,0.707,54.383
-	c5.649,14.832,4.237,18.362,2.824,25.426c-1.412,7.063,6.356,24.719,16.244,35.313l21.188,2.825c0,0,26.839-6.355,43.082-1.412
-	c0,0,15.881,2.371,21.895-24.014c0,0,8.476-11.3,21.188-16.243c12.713-4.943,25.426-78.395,18.362-92.52
-	c-7.063-14.126-32.488-21.896-60.738,5.648S360.567,550.227,307.598,562.938z"/>
-<path id="path166" fill="#FFFFCC" stroke="#000000" stroke-width="0.5" d="M310.423,695.009c0,0-1.412-3.531-9.181-4.237
-	c0,0-39.55-6.355-54.382-28.25c0,0-12.006-9.888-4.238,10.595c0,0,18.363,36.019,30.369,40.963
-	C272.991,714.078,301.948,721.141,310.423,695.009z"/>
-<path id="path170" fill="#CC3F4C" d="M451.572,582.058c1.163-13.96,4.61-29.169,1.515-35.361
-	c-11.382-22.768-41.35-13.253-60.738,5.648c-28.25,27.544-31.78-2.118-84.751,10.595c0,0-3.081,24.653-1.598,42.332
-	c0,0,65.867-20.438,67.28-10.551c0,0,2.823-5.649,19.067-5.649S448.747,587.001,451.572,582.058z"/>
-<path id="path174" stroke="#A51926" stroke-width="2" d="M375.398,564.352c0,0,8.476,8.476,2.118,25.426
-	c0,0-25.426,28.25-21.895,52.97"/>
-<path id="path178" fill="#FFFFCC" stroke="#000000" stroke-width="0.5" d="M290.648,714.078c0,0-7.769-22.602,7.769-10.594
-	c0,0,8.475,3.53,6.356,6.354C302.654,712.665,292.767,719.729,290.648,714.078z"/>
-<path id="path182" fill="#FFFFCC" stroke="#000000" stroke-width="0.5" d="M299.547,716.196c0,0-6.215-18.08,6.215-8.476
-	c0,0,7.806,4.322,5.084,5.085C302.795,715.066,310.847,719.587,299.547,716.196z"/>
-<path id="path186" fill="#FFFFCC" stroke="#000000" stroke-width="0.5" d="M308.021,716.196c0,0-6.215-18.08,6.215-8.476
-	c0,0,7.725,4.078,5.086,5.085C313.39,715.066,319.322,719.587,308.021,716.196z"/>
-<path id="path190" fill="#FFFFCC" stroke="#000000" stroke-width="0.5" d="M319.675,716.55c0,0-6.215-18.08,6.215-8.476
-	c0,0,7.739,4.118,5.087,5.085C325.749,715.066,330.977,719.939,319.675,716.55z"/>
-<path id="path194" fill="#FFFFCC" stroke="#000000" stroke-width="0.5" d="M331.116,716.408c0,0-6.215-18.08,6.217-8.476
-	c0,0,6.78,2.825,5.085,5.085C340.723,715.278,342.418,719.799,331.116,716.408z"/>
-<path id="path198" fill="#FFFFCC" stroke="#000000" stroke-width="0.5" d="M342.911,717.609c0,0-8.477-21.896,7.769-10.595
-	c0,0,8.476,3.531,6.356,6.355C354.917,716.196,357.036,721.847,342.911,717.609z"/>
-<path id="path202" stroke="#A5264C" stroke-width="2" d="M292.767,687.24c0,0,23.307-4.944,33.9,0.706
-	c0,0,10.594,2.119,12.713,1.412c2.118-0.706,7.77-1.412,7.77-1.412"/>
-<path id="path206" stroke="#A5264C" stroke-width="2" d="M352.799,702.777c0,0,21.188-24.014,42.375-16.243
-	c12.389,4.543,10.594-1.413,12.006-6.356c1.413-4.943,1.768-12.358,10.596-17.656"/>
-<path id="path210" fill="#FFFFCC" stroke="#000000" stroke-width="0.5" d="M383.168,674.527c0,0-7.063-19.069-12.007,3.53
-	c-4.944,22.602-10.594,28.957-13.419,33.9c0,0,0,9.182,14.831,8.476c0,0,19.068-0.707,19.774-5.649
-	C393.055,709.84,390.23,689.358,383.168,674.527z"/>
-<path id="path214" stroke="#A5264C" stroke-width="2" d="M407.887,687.24c0,0,6.356-4.237,10.594-2.119"/>
-<path id="path218" stroke="#A5264C" stroke-width="2" d="M419.363,658.283c0,0,5.12-8.651,13.596-10.063"/>
-<path id="path222" fill="#B2B2B2" d="M279.348,723.259c0,0,31.781,5.65,39.551,2.825c0,0,15.536,0,0.706,3.531
-	c0,0-22.602,0-36.727-2.118C282.879,727.497,262.397,717.609,279.348,723.259z"/>
-<path id="path226" fill="#FFFFCC" stroke="#000000" stroke-width="0.5" d="M304.066,558.701c0,0,31.075,0,34.606,1.412
-	c0,0,12.713,54.382,6.356,67.801c0,0-2.118,4.944-7.063-4.943c0,0-32.488-57.913-38.138-61.443
-	C294.177,557.996,301.948,558.701,304.066,558.701z"/>
-<path id="path230" fill="#FFFFCC" stroke="#000000" stroke-width="0.5" d="M167.936,553.934c0,0,15.714,3.002,37.961,7.594
-	c0,0,8.475,39.551,14.125,48.024c5.65,8.475-0.706,8.476-7.063,3.531s-32.488-29.663-36.019-37.432
-	C173.409,567.882,167.936,553.934,167.936,553.934z"/>
-<path id="path234" fill="#FFFFCC" stroke="#000000" stroke-width="0.5" d="M206.534,561.909c0,0,10.241,2.732,12.022,6.645
-	c1.78,3.909-2.123,9.73-2.123,9.73s-1.766,5.835-3.888,2.018C210.424,576.483,205.353,562.958,206.534,561.909z"/>
-<path id="path238" d="M206.603,561.526c0,0,6.356,9.182,12.713,9.182c6.356,0,7.031-0.729,12.006,0.353
-	c8.122,1.767,7.416-1.766,19.069,0.354c4.661,0.848,9.181-0.706,14.125,1.412c4.944,2.119,10.594,0.706,12.713-2.825
-	s10.594-10.946,10.594-10.946s-22.6,3.179-27.544,4.591C260.279,563.645,220.729,565.764,206.603,561.526z"/>
-<path id="path242" fill="#FFFFCC" stroke="#000000" stroke-width="0.5" d="M285.351,561.879c0,0-11.389,6.182-12.095,10.418
-	c-0.707,4.237,9.27,10.771,9.27,10.771s4.855,8.122,5.915,3.884C289.5,582.714,286.763,562.586,285.351,561.879z"/>
-<path id="path246" fill="#FFFFCC" stroke="#000000" stroke-width="0.5" d="M219.166,571.527c0,0,12.372,19.754,12.755-0.041
-	c0,0,0.983-2.223-2.124-2.261C219.07,569.092,221.756,561.85,219.166,571.527z"/>
-<path id="path250" fill="#FFFFCC" stroke="#000000" stroke-width="0.5" d="M231.839,571.967c0,0,13.986,19.752,12.863-0.164
-	c0,0,0.012-0.587-3.083-0.855C233.238,570.215,233.847,562.238,231.839,571.967z"/>
-<path id="path254" fill="#FFFFCC" stroke="#000000" stroke-width="0.5" d="M244.575,571.98c0,0,14.054,18.766,12.873,1.697
-	c0,0,0.21-2.177-2.71-2.708C247.866,569.725,247.494,563.987,244.575,571.98z"/>
-<path id="path258" fill="#FFFFCC" stroke="#000000" stroke-width="0.5" d="M256.716,572.122c0,0,13.948,20.412,14.563,3.143
-	c0,0,2.903-2.433-0.18-2.824C260.826,571.133,262.235,563.269,256.716,572.122z"/>
-<path id="path262" fill="#E5E5B2" d="M192.845,578.354l-13.521-2.702c-4.591-8.828-8.299-19.688-8.299-19.688
-	s11.212,1.767,33.282,6.709c0,0,1.547,5.858,4.146,16.091L192.845,578.354z"/>
-<path id="path266" fill="#E5E5B2" d="M307.732,570.123c-2.942-4.425-5.268-7.528-6.416-8.245c-5.32-3.325,1.995-2.659,3.989-2.659
-	c0,0,29.258,0,32.583,1.329c0,0,0.926,3.959,2.134,9.946C340.022,570.494,322.21,566.945,307.732,570.123z"/>
-<path id="path270" fill="#CC7226" d="M402.378,326.201c48.945,6.992,94.004-55.936,97.112-73.028
-	c3.106-17.092-14.762-38.067-14.762-38.067c2.33-5.438-6.216-30.298-15.537-46.613c-9.322-16.314-37.398-14.595-68.367-16.314
-	c-27.968-1.554-60.599,39.621-62.928,42.729c-2.331,3.108,8.546,70.698,10.876,80.798s-2.33,56.712-2.33,56.712
-	C406.897,316.349,353.434,319.209,402.378,326.201z"/>
-<path id="path274" fill="#EA8E51" d="M339.182,196.051c-2.288,3.051,8.392,69.413,10.68,79.328
-	c2.288,9.916-2.288,55.682-2.288,55.682c57.687-15.679,6.864-12.967,54.918-6.102c48.056,6.865,92.296-54.918,95.347-71.701
-	c3.051-16.781-14.492-37.375-14.492-37.375c2.288-5.339-6.103-29.748-15.255-45.766c-9.153-16.018-36.717-14.328-67.125-16.018
-	C373.506,152.573,341.47,193,339.182,196.051z"/>
-<path id="path278" fill="#EFAA7C" d="M340.467,197.195c-2.245,2.995,8.235,68.127,10.481,77.859s-2.246,54.65-2.246,54.65
-	c55.448-16.173,6.737-12.727,53.9-5.989c47.166,6.738,90.587-53.901,93.581-70.373c2.994-16.47-14.224-36.683-14.224-36.683
-	c2.245-5.24-5.989-29.197-14.973-44.918c-8.984-15.721-36.037-14.063-65.882-15.721C374.155,154.522,342.713,194.2,340.467,197.195z
-	"/>
-<path id="path282" fill="#F4C6A8" d="M341.753,198.339c-2.204,2.938,8.079,66.842,10.282,76.391
-	c2.204,9.548-2.203,53.619-2.203,53.619c51.974-15.961,6.61-12.487,52.885-5.876c46.275,6.611,88.877-52.884,91.815-69.043
-	c2.938-16.161-13.956-35.993-13.956-35.993c2.203-5.142-5.876-28.646-14.69-44.07c-8.813-15.425-35.355-13.799-64.638-15.425
-	C374.806,156.472,343.956,195.401,341.753,198.339z"/>
-<path id="path286" fill="#F9E2D3" d="M343.038,199.483c-2.161,2.881,7.924,65.557,10.085,74.921
-	c2.161,9.365-2.161,52.588-2.161,52.588c49.205-15.75,6.483-12.246,51.868-5.763c45.386,6.483,87.168-51.868,90.049-67.718
-	c2.882-15.849-13.687-35.299-13.687-35.299c2.161-5.042-5.765-28.095-14.408-43.223c-8.646-15.128-34.677-13.534-63.396-15.128
-	C375.455,158.421,345.199,196.602,343.038,199.483z"/>
-<path id="path290" fill="#FFFFFF" d="M402.942,319.984c44.493,6.356,85.459-50.85,88.283-66.388
-	c2.825-15.538-13.419-34.606-13.419-34.606c2.119-4.944-5.65-27.544-14.127-42.375c-8.475-14.831-33.995-13.267-62.149-14.831
-	c-25.427-1.413-55.088,36.019-57.207,38.844c-2.119,2.825,7.769,64.27,9.888,73.451c2.119,9.182-2.119,51.557-2.119,51.557
-	C397.116,310.45,358.448,313.628,402.942,319.984z"/>
-<path id="path294" fill="#CCCCCC" d="M484.87,259.953c0,0-49.087,13.419-69.568,10.594c0,0-27.896-11.653-43.435,26.838
-	c0,0-6.356,12.713-9.889,16.244C358.447,317.16,484.87,259.953,484.87,259.953z"/>
-<path id="path298" d="M491.58,256.068c0,0-51.206,21.541-68.862,20.834c0,0-28.956-8.122-43.788,17.656
-	c0,0-14.831,16.244-20.48,19.069c0,0-0.706,2.825,10.594-4.238l18.363,9.182c0,0,26.131,16.95,43.081-11.3
-	c0,0,7.063-19.775,7.063-23.307c0-3.532,37.433-13.419,40.259-14.125C480.633,269.134,492.286,261.718,491.58,256.068z"/>
-<path id="path302" fill="#99CC32" d="M407.887,319.479c-12.134,0-26.918-6.824-26.918-17.857c0-11.032,14.784-22.094,26.918-22.094
-	c12.138,0,21.976,8.943,21.976,19.975C429.861,310.537,420.023,319.479,407.887,319.479z"/>
-<path id="path306" fill="#659900" d="M401.489,290.021c-8.557,1.275-17.541,3.929-17.414,3.547
-	c2.719-8.156,13.95-14.041,23.812-14.041c7.585,0,14.273,3.493,18.222,8.807C426.107,288.335,416.722,287.753,401.489,290.021z"/>
-<path id="path310" fill="#FFFFFF" d="M422.718,289.616c0,0-7.769-5.65-7.769-1.766C414.949,287.85,421.306,295.619,422.718,289.616z
-	"/>
-<path id="path314" d="M405.063,303.963c-4.412,0-7.989-3.577-7.989-7.991c0-4.412,3.577-7.989,7.989-7.989
-	c4.413,0,7.99,3.577,7.99,7.989C413.053,300.386,409.476,303.963,405.063,303.963z"/>
-<path id="path318" fill="#CC7226" d="M221.435,280.434c0,0-5.65-37.432-1.413-45.2c0,0,19.069-17.657,18.363-24.013
-	c0,0-0.706-31.782-2.825-33.194c-2.119-1.413-15.538-12.006-26.131-0.706c0,0-18.363,31.781-16.95,43.082v3.531
-	c0,0-13.419-0.706-16.244,2.825c0,0-2.119,9.181-4.238,9.888c0,0-4.944,4.237-1.413,9.181c0,0-3.531,4.237-2.825,11.3l13.419,7.063
-	c0,0,3.531,25.425,22.601,34.606C212.317,302.909,217.903,291.028,221.435,280.434z"/>
-<path id="path322" fill="#FFFFFF" d="M219.669,277.186c0,0-5.085-33.688-1.271-40.681c0,0,17.162-15.891,16.527-21.611
-	c0,0-0.636-28.604-2.543-29.875c-1.907-1.271-13.984-10.806-23.518-0.636c0,0-16.526,28.604-15.255,38.773v3.178
-	c0,0-12.077-0.636-14.62,2.542c0,0-1.907,8.263-3.813,8.899c0,0-4.45,3.813-1.271,8.263c0,0-3.178,3.813-2.542,10.17l12.077,6.356
-	c0,0,3.178,22.883,20.34,31.146C211.462,297.411,216.491,286.72,219.669,277.186z"/>
-<path id="path326" fill="#EB955C" d="M234.765,179.775c-1.924-1.519-15.149-11.706-25.478-0.688c0,0-17.904,30.987-16.526,42.004
-	v3.443c0,0-13.083-0.688-15.838,2.754c0,0-2.066,8.952-4.132,9.641c0,0-4.82,4.132-1.377,8.952c0,0-3.443,4.132-2.754,11.018
-	l13.083,6.886c0,0,3.443,24.79,22.035,33.741c8.323,4.008,13.772-7.574,17.215-17.903c0,0-5.509-36.496-1.377-44.07
-	c0,0,18.592-17.215,17.903-23.413C237.52,212.139,236.831,181.152,234.765,179.775z"/>
-<path id="path330" fill="#F2B892" d="M233.971,181.523c-1.73-1.625-14.761-11.406-24.825-0.671c0,0-17.444,30.192-16.103,40.927
-	v3.355c0,0-12.748-0.671-15.432,2.684c0,0-2.013,8.722-4.026,9.394c0,0-4.696,4.025-1.342,8.722c0,0-3.354,4.025-2.684,10.735
-	l12.748,6.709c0,0,3.354,24.154,21.47,32.876c8.111,3.906,13.419-7.38,16.773-17.445c0,0-5.368-35.56-1.342-42.94
-	c0,0,18.115-16.773,17.444-22.812C236.654,213.057,235.983,182.865,233.971,181.523z"/>
-<path id="path334" fill="#F8DCC8" d="M233.176,183.271c-1.536-1.73-14.373-11.106-24.172-0.653c0,0-16.985,29.398-15.679,39.851
-	v3.266c0,0-12.413-0.653-15.026,2.613c0,0-1.96,8.493-3.919,9.146c0,0-4.573,3.92-1.307,8.493c0,0-3.267,3.92-2.613,10.453
-	l12.413,6.533c0,0,3.266,23.518,20.905,32.011c7.897,3.803,13.065-7.186,16.332-16.985c0,0-5.227-34.624-1.307-41.811
-	c0,0,17.639-16.332,16.985-22.211C235.789,213.976,235.136,184.578,233.176,183.271z"/>
-<path id="path338" fill="#FFFFFF" d="M219.669,277.009c0,0-5.085-33.512-1.271-40.504c0,0,17.162-15.891,16.527-21.611
-	c0,0-0.636-28.604-2.543-29.875c-1.342-1.836-13.984-10.806-23.518-0.636c0,0-16.526,28.604-15.255,38.773v3.178
-	c0,0-12.077-0.636-14.62,2.542c0,0-1.907,8.263-3.813,8.899c0,0-4.45,3.813-1.271,8.263c0,0-3.178,3.813-2.542,10.17l12.077,6.356
-	c0,0,3.178,22.883,20.34,31.146C211.462,297.411,216.491,286.543,219.669,277.009z"/>
-<path id="path342" fill="#CCCCCC" d="M214.195,265.956c0,0-38.138-18.01-39.727-19.422c0,0,16.067,14.479,17.48,14.479
-	C193.361,261.013,214.195,265.956,214.195,265.956z"/>
-<path id="path346" d="M184.003,255.009c0,0,32.488,6.356,32.488,14.125c0,5.141-0.429,28.834-9.888,26.131
-	C191.772,291.028,198.128,265.603,184.003,255.009z"/>
-<path id="path350" fill="#99CC32" d="M198.834,261.718c0,0,15.852,2.603,17.656,7.416c1.06,2.825,2.23,17.494-7.416,19.422
-	C201.038,290.165,197.101,272.118,198.834,261.718z"/>
-<path id="path354" d="M350.671,336.845c-0.878-3.076,1.438-2.845,4.601-3.794c3.53-1.06,25.071-7.769,26.483-12.359
-	c1.413-4.591,24.719,3.178,24.719,3.178c3.18,1.412,10.947,6.003,10.947,6.003c8.476,2.119,20.128,2.825,20.128,2.825
-	c4.238,1.766,10.241,6.709,10.241,6.709c25.778,18.009,47.674,5.297,47.674,5.297c35.313-11.653,24.72-42.022,24.72-42.022
-	c-5.298-15.891,0.354-21.894,0.354-21.894c0.354-6.709,13.064,4.591,13.064,4.591c4.592,7.416,6.005,16.244,6.005,16.244
-	c14.125,19.775,8.122-11.653,8.122-11.653c0.353-1.766-4.592-8.122-4.592-10.241s-3.179-8.122-3.179-8.122
-	c-5.297-6.003-1.06-18.363-1.06-18.363c3.179-24.366-0.706-21.188-0.706-21.188c-2.118-3.178-18.362,14.478-18.362,14.478
-	c-3.885,6.003-14.479,8.828-14.479,8.828c-4.942,3.178-10.946,0.707-10.946,0.707c-4.59-0.707-14.479,11.653-14.479,11.653
-	c4.943-0.354,9.182,7.416,13.419,7.769c4.237,0.354,7.415-4.237,10.24-5.297c2.825-1.059,7.769,9.182,7.769,9.182
-	c0.707,4.59-9.181,13.065-9.181,13.065c-0.707,8.122-3.531,5.297-3.531,5.297c-5.297-1.059-7.415,5.65-9.182,13.772
-	c-1.766,8.122-9.182,8.829-9.182,8.829c-2.825,13.065-4.945,7.769-4.945,7.769c-0.354-9.888-10.947,0.353-10.947,0.353
-	c-2.118,3.531-10.239-0.353-10.239-0.353c-12.008-3.531-7.77-7.063-7.77-7.063c3.178-3.884,22.953,0,22.953,0
-	c3.884-2.825-10.241-9.888-10.241-9.888c-1.06-3.178,0.706-10.947,0.706-10.947c2.119-5.65,14.126-15.538,14.126-15.538
-	c16.599-2.119,11.654-4.944,11.654-4.944c-10.946-9.182-21.189,4.237-21.189,4.237c-3.884,10.947-34.605,37.432-34.605,37.432
-	c-8.476,6.003-3.884-6.003-10.947,0c-7.063,6.003-43.435-9.888-43.435-9.888c-20.414-2.106-25.238,25.688-31.47,20.18
-	C343.93,331.689,353.496,346.732,350.671,336.845z"/>
-<path id="path358" d="M694.629,43.132c0,0-45.201,14.125-50.145,47.319c0,0-4.237,40.256,31.78,71.332c0,0,0.707,11.3,4.238,16.95
-	c0,0-2.825,8.475,30.368-4.944l48.025-14.832c0,0,11.301-4.238,20.481-19.775c9.181-15.538,36.019-48.731,29.662-93.226
-	c0,0,2.119-19.775-8.475-20.481c0,0-14.832-2.825-27.544,10.594c0,0-12.008,5.65-16.244,4.944L694.629,43.132z"/>
-<path id="path362" d="M791.069,41.384c0,0,3.708-15.767-4.837-7.222c0,0-12.432,10.1-25.641,10.1c0,0-25.637,3.884-33.404,27.191
-	c0,0-6.992,47.39,6.99,57.489c0,0,8.546,13.207,20.978,1.554C767.587,118.843,794.954,65.467,791.069,41.384z"/>
-<path id="path366" fill="#323232" d="M790.409,42.016c0,0,3.689-15.438-4.7-7.048c0,0-12.204,9.916-25.173,9.916
-	c0,0-25.171,3.814-32.798,26.697c0,0-6.865,46.528,6.863,56.444c0,0,8.392,12.967,20.596,1.525
-	C767.403,118.108,794.224,65.661,790.409,42.016z"/>
-<path id="path370" fill="#666666" d="M789.749,42.648c0,0,3.673-15.11-4.563-6.875c0,0-11.978,9.732-24.705,9.732
-	c0,0-24.705,3.743-32.191,26.202c0,0-6.738,45.667,6.737,55.399c0,0,8.234,12.727,20.213,1.497
-	C767.22,117.374,793.492,65.855,789.749,42.648z"/>
-<path id="path374" fill="#999999" d="M789.089,43.28c0,0,3.654-14.782-4.425-6.703c0,0-11.752,9.549-24.24,9.549
-	c0,0-24.239,3.672-31.584,25.708c0,0-6.609,44.805,6.61,54.354c0,0,8.08,12.487,19.832,1.469
-	C767.036,116.639,792.762,66.05,789.089,43.28z"/>
-<path id="path378" fill="#CCCCCC" d="M788.429,43.912c0,0,3.638-14.454-4.287-6.529c0,0-11.527,9.365-23.773,9.365
-	c0,0-23.772,3.602-30.978,25.213c0,0-6.482,43.943,6.483,53.309c0,0,7.924,12.247,19.45,1.441
-	C766.851,115.904,792.03,66.244,788.429,43.912z"/>
-<path id="path382" fill="#FFFFFF" d="M787.767,44.544c0,0,3.619-14.125-4.148-6.356c0,0-11.301,9.181-23.308,9.181
-	c0,0-23.307,3.531-30.368,24.719c0,0-6.356,43.082,6.355,52.263c0,0,7.77,12.006,19.069,1.412
-	C766.667,115.17,791.298,66.438,787.767,44.544z"/>
-<path id="path386" fill="#992600" d="M414.243,403.323c0,0-36.021-33.901-50.146-35.313c0,0-60.738-7.063-86.87,24.719
-	c0,0,31.076-36.019,79.807-26.131c0,0-38.138-7.769-60.032-2.119c0,0-29.663,0-46.613,24.719l-4.944,8.475
-	c0,0,7.063-26.131,39.55-36.726c0,0,40.256-8.475,59.326,0c0,0-38.138-12.006-55.794-8.475c0,0-53.675-4.237-76.275,42.375
-	c0,0,7.063-25.425,33.194-38.138c0,0,24.013-15.538,60.032-10.594c0,0,25.425,5.65,34.607,9.888
-	c9.182,4.237,7.063-0.707-7.769-9.182c0,0-9.889-17.656-34.607-16.95c0,0-75.57,6.356-93.932,27.544
-	c0,0,24.013-19.775,42.375-24.719c0,0,39.55-14.125,54.381-12.713c0,0,43.788,1.766,57.207-5.297c0,0-19.775,8.828-14.125,14.479
-	c5.649,5.65,17.656,19.069,17.656,21.188s42.729,41.14,49.085,48.908L414.243,403.323z"/>
-<path id="path390" fill="#CCCCCC" d="M658.607,745.857c0,0-27.367-64.445-49.438-81.221c0,0,45.906,28.251,52.086,60.032
-	C661.256,724.67,661.256,742.326,658.607,745.857z"/>
-<path id="path394" fill="#CCCCCC" d="M741.593,759.1c0,0-46.789-97.109-79.454-139.484c0,0,76.807,66.212,85.635,113.001
-	l0.883,9.711l-5.297-4.414C743.358,737.912,742.476,753.803,741.593,759.1z"/>
-<path id="path398" fill="#CCCCCC" d="M841.352,673.466c0,0-110.353-105.056-113.001-109.47c0,0,106.821,116.533,112.118,129.775
-	C840.469,693.771,836.938,677.88,841.352,673.466z"/>
-<path id="path402" fill="#CCCCCC" d="M508.528,750.271c0,0,34.43-91.813,67.977-52.087c0,0,26.485,17.656,25.604,22.953
-	c0,0-7.063-11.477-38.846-10.594C563.263,710.545,529.716,705.248,508.528,750.271z"/>
-<path id="path406" fill="#CCCCCC" d="M844.883,525.152c0,0-79.454-50.321-92.695-52.971c-20.848-4.168,87.398,51.204,96.228,69.743
-	C848.414,541.926,851.945,537.512,844.883,525.152z"/>
-<path id="path410" d="M578.803,713.371c0,0,36.02-3.531,48.025-15.537l7.769,6.356l31.075-67.802l6.356,9.183
-	c0,0,25.426-26.132,24.013-40.257c-1.412-14.125,22.601,10.594,22.601,10.594s-1.413-20.481,11.301-8.477
-	c0,0-4.237-27.544,10.594-13.419c0,0-18.604-53.246,21.188-7.769c9.889,11.3,2.119-0.706,2.119-0.706s-45.905-84.751-7.769-59.325
-	c0,0,3.531-40.257,1.412-48.026c-2.118-7.769-5.649-47.319-14.125-56.502c-8.477-9.182,0.706-12.006,10.594-2.824
-	c0,0-19.775-42.375,3.531-21.188c0,0-6.356-26.838-14.125-31.782c0,0-9.889-30.369,16.949-11.3c0,0-7.769-21.894-13.419-27.544
-	c0,0-20.48-48.732-7.769-40.257l7.769,6.356c0,0-12.007-24.719-0.706-16.95s11.301,7.063,11.301,7.063s-37.433-58.62-1.412-27.544
-	c0,0-14.406-24.574-20.481-36.726c0,0-33.193-36.019-7.77-24.719l8.476,2.825c0,0-15.538-17.656-29.663-20.481
-	c-14.125-2.825,4.237-14.125,15.538-10.594c11.3,3.531,38.844,16.95,38.844,16.95s22.602,33.194,29.663,33.9
-	c0,0-35.313-13.419-24.719,0.706c0,0,25.425,24.719,12.712,24.013c0,0-10.594,12.713-2.118,28.25c0,0-32.592-32.472-6.355,12.712
-	l12.006,28.957c0,0-43.081-43.788-23.306-4.944c0,0,30.369,41.669,33.899,42.375c3.531,0.707,11.3,16.244,11.3,16.244l-7.769-3.531
-	l9.181,15.538c0,0-19.774-21.188-9.181,2.119l9.887,25.425c0,0-36.019-38.844-12.006,13.42c0,0-28.957-9.183-13.419,21.188
-	c0,0-2.825,28.252-2.119,37.434c0.707,9.183,2.825,59.325-4.942,73.451c-7.77,14.125,10.594,48.025,14.125,55.088
-	c3.53,7.063,9.888,26.131-5.65,9.889c-15.537-16.244-7.769-6.356-4.237,9.181c3.531,15.538,14.125,43.082,12.713,52.97
-	c0,0-2.118,2.119-7.769-4.236c0,0-26.132-40.258-23.307-14.832c0,0-2.119,14.125-7.77,29.663c0,0-5.649,19.068-5.649,3.53
-	c0,0-5.65-29.663-10.595-16.244c-4.943,13.42-11.301,24.014-16.244,28.251c-4.942,4.237-14.125-36.02-16.243-17.656
-	c0,0-21.188-21.895-29.662,7.063l-20.482,28.957c0,0-0.706-21.894-2.824-11.3C650.135,710.547,597.165,721.141,578.803,713.371z"/>
-<path id="path414" d="M518.064,83.389c0,0-20.481-14.125-27.545-13.419c-7.063,0.706,48.731-15.538,121.477,33.194
-	c0,0,8.476,4.944,14.832,4.238c0,0,5.648,4.237,0.706,10.594c0,0-15.538,16.95,4.237,36.725c0,0,32.487,12.006,22.601-3.531
-	c0,0,19.069,7.063,23.307,14.125c4.238,7.062,2.118,0,2.118,0s-11.3-12.713-21.894-21.894c0,0-9.183-3.531-14.125-18.363
-	c-4.944-14.832-9.183-32.488-1.413-38.138c0,0-7.063,7.769-5.649,0.706c1.412-7.063,7.77-13.419,10.594-14.125
-	c2.825-0.707,31.781-28.604,43.788-29.31c0,0-16.244,2.472-21.541,0.706S617.293,23.003,606.7,20.884c0,0-29.662-11.653-8.476-8.122
-	c0,0,63.211,6.709,95.346,30.016c0,0-12.713-14.832-45.2-27.191c0,0-39.197-22.247-101.349-13.419c0,0-31.429,5.65-45.2,8.828
-	c0,0-4.591-1.06-5.65-1.766c-1.059-0.706-21.896-16.597-70.627-4.237c0,0-30.016,8.122-45.2,16.597c0,0-26.838,2.119-33.193,7.769
-	c0,0-32.842,25.778-36.372,27.191c-3.531,1.413-23.66,14.831-25.072,15.538c0,0,43.435-11.653,47.672-15.891
-	c4.238-4.237,34.96-8.828,39.197-6.356c4.238,2.472,19.069,1.413,2.119,2.472c0,0,133.483,26.132,134.896,29.663
-	C511.002,85.507,518.064,83.389,518.064,83.389z"/>
-<path id="path418" fill="#CC7226" d="M644.131,67.145c0,0-18.009-13.066-21.54-13.066c-3.532,0-25.426-18.009-32.842-17.303
-	c-7.415,0.707-28.956-16.95-77.335-2.472c0,0-1.061-3.531,5.297-4.944c0,0,11.301-3.884,12.007-4.944c0,0,35.666-7.416,48.378-1.06
-	c0,0,16.244,4.591,27.191,15.538c0,0,19.775,5.65,25.425,3.885c0,0,15.538,3.884,16.244,7.063c0,0,10.241,5.297,7.063,9.888
-	C654.019,59.729,654.725,62.554,644.131,67.145z"/>
-<path id="path422" fill="#CC7226" d="M622.112,63.421c1.425,1.116,3.224,1.289,4.292,2.717c0.413,0.554-0.099,1.13-0.653,1.301
-	c-1.842,0.56-3.706-0.447-5.723,0.591c-0.71,0.366-1.844,0.044-2.819-0.219c-2.882-0.779-6.111-0.823-9.097,0.392
-	c-3.505-1.994-7.672-0.962-11.348-2.73c-0.102-0.047-0.493,0.563-0.625,0.516c-5.378-2.021-11.985-1.522-16.278-5.555
-	c-4.286-0.728-8.448-1.543-12.735-2.744c-3.21-0.899-5.697-2.645-8.558-4.114c-2.433-1.25-5.004-2.171-7.713-2.828
-	c-3.289-0.798-6.521-0.601-9.864-1.519c-0.164-0.044-0.503,0.563-0.648,0.516c-0.57-0.191-1.084-1.22-1.386-1.127
-	c-2.968,0.922-5.595-0.794-8.533-0.19c-2.08-2.161-5.131-1.729-7.859-2.509c-5.233-1.498-10.804,0.745-16.152-1.022
-	c7.262-3.252,15.538-1.077,22.71-4.73c4.11-2.094,8.811-0.148,13.348-1.49c0.86-0.254,2.08-0.611,2.786,0.57
-	c0.237-0.239,0.56-0.661,0.661-0.611c4.325,2.042,8.413,4.292,12.795,6.174c0.604,0.258,1.542-0.152,1.986,0.205
-	c2.684,2.147,6.114,1.965,8.569,4.119c2.998-0.886,6.164-0.215,9.218-1.317c0.137-0.048,0.55,0.554,0.606,0.516
-	c1.995-1.321,4.035-0.842,5.609-0.306c0.597,0.203,1.768,0.639,2.307,0.77c1.987,0.487,3.499,1.335,5.581,1.658
-	c0.201,0.032,0.527-0.568,0.655-0.519c1.982,0.773,3.822,0.674,4.979,2.729c0.238-0.238,0.529-0.658,0.676-0.611
-	c1.813,0.597,2.959,1.93,4.901,2.355c0.856,0.187,1.938,1.292,2.954,1.603c4.224,1.291,7.479,3.991,11.353,5.571
-	C619.447,62.132,620.994,62.545,622.112,63.421z"/>
-<path id="path426" fill="#CC7226" d="M486.804,38.296c-4.445-3.046-8.627-4.999-12.938-8.152c-0.32-0.235-0.955,0.065-1.313-0.15
-	c-1.776-1.075-3.346-2.101-5.079-3.33c-0.952-0.674-2.4-0.655-3.299-1.11c-4.491-2.281-9.134-3.267-13.56-5.375
-	c1.204-1.126,3.185-0.695,4.236-2.119c0.346,0.495,0.766,0.996,1.389,0.659c2.963-1.596,6.229-1.866,9.188-1.708
-	c3.01,0.163,6.046,0.701,9.181,1.181c0.542,0.083,0.894,1.006,1.464,1.178c3.934,1.171,8.15,0.244,11.894,1.723
-	c2.81,1.111,5.581,2.564,7.77,4.815c0.444,0.459-0.13,0.991-0.623,1.333c0.685-0.193,1.167,0.171,1.361,0.724
-	c0.148,0.422,0.148,0.955,0,1.377c-0.196,0.551-0.689,0.729-1.351,0.819c-2.484,0.336,0.645-2.101-0.591-1.31
-	c-2.248,1.438-0.932,3.92-2.246,6.159c-0.494-0.342-0.9-0.728-0.706-1.413c0.413,0.922-0.65,1.434-0.947,1.992
-	C489.953,36.869,488.366,39.367,486.804,38.296z"/>
-<path id="path430" fill="#CC7226" d="M429.424,51.27c-5.568-1.402-10.954-1.199-16.279-3.452c-0.117-0.049-0.512,0.563-0.625,0.516
-	c-2.411-1.049-4.032-2.754-5.933-4.602c-1.612-1.568-4.539-0.884-6.789-1.744c-0.572-0.219-0.931-1.123-1.462-1.192
-	c-2.152-0.277-3.789-1.953-5.634-2.961c4.124-1.404,8.381-1.349,12.729-2.027c0.199-0.031,0.455,0.535,0.69,0.535
-	c0.24,0,0.47-0.39,0.706-0.627c0.345,0.495,0.878,1.07,1.331,0.622c0.968-0.953,1.949-0.618,2.902-0.547
-	c0.255,0.018,0.476,0.553,0.709,0.553c0.24,0,0.473-0.549,0.707-0.549c0.239,0.001,0.472,0.549,0.706,0.549
-	c0.24,0,0.471-0.39,0.706-0.627c1.223,1.381,2.784,0.403,4.235,0.719c1.833,0.401,2.305,2.428,4.201,2.954
-	c8.324,2.302,15.629,6.09,23.333,9.774c0.542,0.26,0.912,0.698,0.719,1.384c0.471,0,1.023-0.155,1.359,0.078
-	c1.867,1.292,3.706,2.26,4.937,4.199c0.381,0.599-0.199,1.317-0.61,1.226C444.243,54.292,437.17,53.219,429.424,51.27z"/>
-<path id="path434" fill="#CC7226" d="M404.952,129.332c-2.813-2.152-3.842-5.738-5.834-8.902c-0.378-0.6,0.105-1.154,0.666-1.312
-	c0.987-0.281,1.946,0.563,2.669,0.92c3.081,1.522,5.792,3.715,9.316,3.96c3.515,3.945,11.036,4.625,11.049,10.594
-	c0.002,1.517-2.521-0.104-3.278,1.412c-4.328-1.771-8.546-1.589-12.748-4.179C405.702,131.152,406.285,130.353,404.952,129.332z"/>
-<path id="path438" fill="#CC7226" d="M356.33,36.5c0.238,0.002,12.652,0.413,12.622,0.614c-0.079,0.546-13.729,2.398-14.37,2.098
-	c-0.29-0.134-13.554,4.156-13.79,3.92C341.266,42.894,355.86,36.5,356.33,36.5z"/>
-<path id="path442" d="M383.521,53.726c0,0-26.133,3.178-33.9,5.297c-7.77,2.119-40.609,15.538-45.907,19.069
-	c0,0-23.66,9.535-53.675,44.848c0,0,13.419-6.003,17.303-10.947c0,0,24.013-22.247,23.66-17.656c0,0,21.541-15.185,20.481-11.3
-	c0,0,43.082-19.775,39.551-14.125c0,0,38.138-8.122,36.372-4.591c0,0,33.192,7.769,28.25,8.122c0,0-10.241,2.119,1.06,8.475
-	c0,0-6.003,7.769-15.538,0.707c-9.534-7.063-4.236-3.178-13.064-1.413c0,0-4.592,1.413-12.713-5.65c0,0-9.889-8.122-25.426-1.766
-	c0,0-54.029,22.247-57.56,23.307c0,0-6.356,4.944-10.594,11.3c0,0-10.241,7.769-15.538,10.241c0,0-22.6,20.481-24.719,22.953
-	c0,0-6.003,9.181-7.416,9.888c0,0,11.3-6.709,14.831-10.241c0,0,24.719-17.656,34.253-19.069c0,0,7.769-5.297,9.182-7.769
-	c0,0,25.425-16.244,32.84-16.244c0,0,16.244,9.181,20.482-3.178c0,0,10.239-3.178,20.128-1.06c0,0,5.649-4.591,4.236-8.475
-	c0,0,2.825-3.178,4.592,3.531c0,0,6.003,6.356,14.479,2.825c0,0,7.063-0.353,3.531,3.884c0,0-7.77,6.709-28.604,7.063
-	c0,0-21.895,1.06-50.851,14.479c0,0-52.616,18.363-68.86,36.725c0,0-11.3,15.538-20.834,17.657c0,0-10.241,1.412-20.834,14.478
-	c0,0,17.303-10.241,33.194-10.241c0,0,7.063-4.237,0.353,2.119c0,0-6.356,13.418-3.531,22.953c0,0-1.06,9.181-2.472,12.006
-	c0,0-13.772,22.6-13.772,26.838c0,4.237,2.119,21.541,2.825,22.6c0.706,1.06-1.766-2.825,4.944,1.413
-	c6.709,4.237,11.653,7.063,13.065,12.006c1.413,4.944-3.531-9.535-3.884-12.713c-0.353-3.178-7.769-15.891-6.356-20.128
-	c0,0,1.766,1.766,3.178,4.237c0,0-1.059-1.06,0-7.416c0,0,1.413-9.182,3.885-14.832s6.003-12.359,6.709-13.772
-	c0.707-1.413,0.707-11.653,3.178-7.063l6.003,4.59c0,0-4.944-4.59-1.06-8.475c0,0-1.766-9.888,1.413-14.479
-	c0,0,12.359-14.832,15.185-16.597c2.826-1.765,0.353-1.059,0.353-1.059s10.594-7.416,0.353-4.591c0,0-7.063,2.825-12.359,2.825
-	c0,0-13.419,3.531-6.356-3.885s24.719-16.95,31.429-16.597l1.413,2.825l19.775-4.237l-2.119,1.413c0,0-0.353-0.354,7.063-1.06
-	s17.656,1.766,20.128-1.413c2.473-3.178,8.477-4.944,7.771-2.472c-0.706,2.472-1.061,6.003-1.061,6.003s8.828-10.241,7.77-6.356
-	c-1.061,3.884-15.537,13.065-18.011,24.013l18.363-14.479l6.356-5.297c0,0,6.355,3.884,6.709,1.06
-	c0.354-2.825,8.476-13.066,10.594-12.713c2.119,0.353,5.649-4.591,5.297,0c-0.353,4.591,13.066,14.125,13.066,14.125
-	s5.648-3.178,8.122-0.706c2.472,2.472,9.887-34.96,9.887-34.96l44.142-18.716l76.983-6.003l-30.017-12.006L383.521,53.726z"/>
-<path id="path446" stroke="#4C0000" stroke-width="2" d="M415.655,405.089c0,0-26.484-29.663-41.316-34.254
-	c0,0-23.659-12.006-67.094,1.766"/>
-<path id="path450" stroke="#4C0000" stroke-width="2" d="M368.689,368.363c0,0-44.494-14.125-71.687-6.709
-	c0,0-32.488,3.531-47.319,27.897"/>
-<path id="path454" stroke="#4C0000" stroke-width="2" d="M362.333,366.245c0,0-30.016-12.713-56.147-16.597
-	c0,0-29.31-4.591-58.62,8.122c0,0-21.541,10.594-31.075,28.603"/>
-<path id="path458" stroke="#4C0000" stroke-width="2" d="M364.099,366.951c0,0-27.19-19.422-28.957-21.894
-	c0,0-12.358-19.422-35.313-20.128c0,0-37.785,1.413-68.154,15.538"/>
-<path id="path462" d="M361.794,351.072c2.723,2.583,50.33,53.664,50.33,53.664c62.15,64.624,12.713,4.236,12.713,4.236
-	c-13.419-8.475-29.663-41.669-29.663-41.669c-2.119-4.944,24.719,12.713,24.719,12.713c7.063,1.412,31.075,35.313,31.075,35.313
-	c-12.006-4.237-3.53,8.476-3.53,8.476c4.943,3.531,40.965,31.077,40.965,31.077c6.355,7.063,13.419,9.888,13.419,9.888
-	c24.719-9.182,13.419,14.125,13.419,14.125c4.236,12.007,14.125-8.476,14.125-8.476c19.774-29.664-9.182-25.425-9.182-25.425
-	c-52.972,4.942-64.978-23.31-64.978-23.31c-4.238-4.236,11.3,0,11.3,0c14.833,3.531-12.713-21.894-12.713-21.894
-	c4.237,0,20.481,12.006,20.481,12.006c18.363,16.244,21.896,12.713,21.896,12.713c31.782-15.538,50.146-2.119,50.146-2.119
-	c3.53,2.825-6.356,14.832-3.531,24.016c2.825,9.182,11.3,31.075,11.3,31.075c-4.237,2.824-3.531,21.895-3.531,21.895
-	c29.663,40.963,12.713,37.432,12.713,37.432c-27.544-0.707-1.411,12.712-1.411,12.712c5.648,3.531,21.188,16.244,21.188,16.244
-	c-4.944-2.119-7.769,7.063-7.769,7.063c8.475,7.063,3.53,15.538,3.53,15.538c-10.594,2.118-12.713,9.181-12.713,9.181
-	c12.006,14.126-5.649,14.832-5.649,14.832c6.355,7.769-2.118,28.956-2.118,28.956c-8.477,0-19.775,9.888-19.775,9.888
-	c4.237,8.477-14.125,18.363-14.125,18.363c-14.832,2.824-9.888,14.831-9.888,14.831c-14.125,10.594-18.363,38.844-18.363,38.844
-	c-1.412,18.363-5.648,24.014,3.531,20.481c9.182-3.531,7.77-25.425,7.77-25.425c-8.476-27.545,67.095-55.795,67.095-55.795
-	c7.063-2.824,8.476-12.007,8.476-12.007c3.531,0.706,19.069,14.125,19.069,14.125c13.418,19.775,14.125,3.531,14.125,3.531
-	c2.118-6.356-0.707-16.95-0.707-16.95c10.595-38.138-14.125-49.438-14.125-49.438c-17.656-59.326,7.063-44.494,7.063-44.494
-	c4.944,9.888,24.014,19.068,24.014,19.068l6.355-4.237c-2.824-8.477,12.007-19.069,12.007-19.069
-	c4.943,11.301,15.537-2.824,15.537-2.824c6.356-43.082,28.251-17.656,28.251-17.656c7.063,2.119,9.182-9.889,9.182-9.889
-	c6.355-18.361,0-42.375,0-42.375c6.355-0.706,23.307,9.889,23.307,9.889c4.944-6.356-11.3-36.021-4.237-31.781
-	c7.063,4.237,14.831,7.063,14.831,7.063c1.413-3.53-16.243-25.426-16.243-25.426c-7.77-4.945-16.949-40.965-16.949-40.965
-	c12.712,6.356-4.944-20.481-4.944-20.481c0-5.65,10.594-25.425,10.594-25.425c-1.412-12.006,0-11.3,0-11.3
-	c4.944,2.119,19.069,4.944,7.063-6.356c-12.006-11.3,1.413-19.775,1.413-19.775c7.769-4.944-16.244-4.238-16.244-4.238
-	c-9.183-7.769-8.477-14.831-8.477-14.831c14.126,3.531-11.3-21.894-15.536-28.25c-4.237-6.356,12.713-15.538,12.713-15.538
-	c23.307-6.356,2.823-12.006,2.823-12.006c-34.605,0.706-15.536-18.363-15.536-18.363c10.594,0.707,7.769-3.531,7.769-3.531
-	c-9.181-2.119-26.132-13.419-26.132-13.419c-7.063-6.356-0.706-4.944-0.706-4.944c29.663,2.119-21.188-17.656-21.188-17.656
-	c14.125,0-17.655-18.363-17.655-18.363c-3.531-2.825-9.183-16.244-9.183-16.244c-10.594-9.182-19.067-21.188-19.067-21.188
-	c-0.707-7.769-9.183-16.244-9.183-16.244c-20.48-24.013-30.369-23.307-30.369-23.307c-26.132-6.356-35.313-4.944-35.313-4.944
-	l-93.229,7.769c-46.612,22.6-32.842,59.679-32.842,59.679c11.301,14.831,27.544,8.122,27.544,8.122
-	c8.122-10.947,28.604-7.063,28.604-7.063c36.021,5.65,31.431-0.706,31.431-0.706c-4.237-8.122-32.843-19.069-33.196-20.128
-	c-0.353-1.06-15.891-7.063-15.891-7.063c-5.297-2.119-13.065-18.363-13.065-18.363c-5.649-6.003,22.247,4.238,22.247,4.238
-	c-2.119,1.766,10.947,8.828,10.947,8.828c30.724-1.766,49.439,17.303,49.439,17.303c19.068,29.31,19.422,14.832,19.422,14.832
-	c4.943-16.597-15.892-54.029-15.892-54.029c0.706-3.531,15.186,8.122,15.186,8.122c2.472-3.531,3.885,6.709,3.885,6.709
-	c0.353,4.237,7.063,18.362,7.063,18.362c4.942,22.954,11.3,9.888,11.3,9.888l8.122,16.597c2.472,4.591-8.122,18.01-8.122,18.01
-	c-0.354,4.944,1.06,4.59-8.828,18.009s-3.885,21.188-3.885,21.188c-2.473,11.653,13.064,10.947,13.064,10.947
-	c4.591,3.884,10.595,3.884,10.595,3.884c3.179,3.531,7.415,2.472,7.415,2.472c2.825-6.709,13.772-3.178,13.772-3.178
-	c2.472-4.238,16.95-4.944,16.95-4.944c1.766-4.591,2.472-7.416,8.475-8.475c6.004-1.06-37.432-76.982-37.432-76.982
-	c11.301-1.413-3.179-23.307-3.179-23.307c-3.885-11.653,16.244,14.125,20.128,16.597c3.886,2.472,5.65,6.356,2.825,6.003
-	s-6.003,3.532-3.531,3.885c2.473,0.354,25.427,26.837,31.43,44.847c6.003,18.01,16.597,25.072,27.544,35.666
-	c10.947,10.594,9.534,53.322,9.534,53.322c-0.706,15.538,9.888,34.253,9.888,34.253c3.531,6.709-3.885,38.844-3.885,38.844
-	c-3.531,3.884-1.06,5.297-1.06,5.297c1.767,2.119,13.771,25.425,13.771,25.425c-3.178-0.353,3.179,6.003,3.179,6.003
-	c9.181,10.594-2.119,5.297-2.119,5.297c-10.594-2.825,1.767,14.479,1.767,14.479c2.119,3.178-13.772-4.944-13.772-4.944
-	c-16.243-1.06,4.238,11.653,4.238,11.653c15.185,12.713-4.944,4.943-4.944,4.943c-8.122-3.179-2.472,8.828-2.472,8.828
-	c5.649,2.824,36.02,15.186,36.02,15.186c0.706,6.711-4.591,15.539-4.591,15.539c0.706,7.063-3.179,13.064-3.179,13.064
-	c-2.118,14.479-3.178,15.891-3.178,15.891c-7.416,0.354-20.481,24.721-20.481,24.721c-3.179,4.591-21.188,25.777-21.188,25.777
-	c-3.531,12.359-35.313-0.354-35.313-0.354c-11.653,6.003-8.122,0-8.122,0c-0.706-3.884,7.771-14.479,7.771-14.479
-	c12.358-4.59,7.769-23.658,7.769-23.658c7.063-2.473-12.713-7.416-12.359-9.534c0.354-2.119,10.595-4.591,10.595-4.591
-	c14.125-3.531,6.355-7.77,6.355-7.77c-1.06-7.063,4.237-16.95,4.237-16.95c20.48-1.413,0-30.019,0-30.019
-	c-19.068-13.418-20.835-23.659-20.835-23.659c22.247-14.478,7.77-36.372,8.122-42.729c0.354-6.356,2.473-44.494,2.473-44.494
-	c-3.531-10.947-8.828-34.96-8.828-34.96c3.885-9.181,16.949-31.428,16.949-31.428c4.944-7.416,20.481-15.891,16.598-21.188
-	c-3.885-5.297-17.655-2.119-17.655-2.119c-13.772-2.472-12.713,6.709-12.713,6.709c-2.825,1.766-4.237,10.594-4.237,10.594
-	c-1.273,14.007-16.95,25.072-16.95,25.072c-19.775,10.947-3.531,18.01-3.531,18.01c10.595,11.653-6.71,12.006-6.71,12.006
-	c-19.422-3.178-4.942,14.831-4.942,14.831c19.067,22.601,13.771,27.544,13.771,27.544c-18.009,1.766,4.237,18.009,4.237,18.009
-	s-1.412-3.531-1.06-0.353c0.354,3.178,5.649,10.594,7.063,14.125c1.412,3.531-5.65,3.885-5.65,3.885
-	c1.061,16.95-26.132,9.534-26.132,9.534s0,0-2.824,0.353c-2.824,0.354-22.601-1.059-32.841-4.944
-	c-10.241-3.884-22.248-3.884-22.248-3.884s-7.063,3.178-20.481,2.825s-27.544,4.59-27.544,4.59
-	c-7.771-0.706,7.415-8.475,7.769-8.122s10.24-9.535-3.885-8.475c-38.485,2.887-57.561-15.185-57.561-15.185
-	c-3.53-2.472-8.122-7.416-8.122-7.416c-17.655-3.531,2.473,21.894,2.473,21.894c2.119,2.472-0.354,4.238-0.354,4.238
-	c-1.413-2.825-15.185-12.359-15.185-12.359C368.316,357.817,365.91,355.461,361.794,351.072z"/>
-<path id="path466" fill="#4C0000" d="M319.604,330.579c0,0,20.481,9.887,25.072,14.831c4.591,4.944,29.311,25.072,29.311,25.072
-	s-9.535-3.531-14.125-6.709c-4.592-3.178-23.66-17.656-23.66-17.656S329.492,335.522,319.604,330.579z"/>
-<path id="path470" fill="#99CC32" d="M217.181,275.496c0.595-0.261-0.33-5.05-0.69-6.008c-1.804-4.813-17.656-7.416-17.656-7.416
-	c-0.401,2.41-0.498,5.229-0.311,8.121C198.523,270.192,207.119,279.936,217.181,275.496z"/>
-<path id="path474" fill="#659900" d="M217.181,275.143c-0.793,0.279-0.026-4.827-0.337-5.655
-	c-1.804-4.813-18.009-7.592-18.009-7.592c-0.401,2.41-0.498,5.228-0.311,8.12C198.523,270.015,206.06,279.053,217.181,275.143z"/>
-<path id="path478" d="M209.428,275.395c-1.104,0-1.997-2.013-1.997-4.495c0-2.481,0.894-4.494,1.997-4.494
-	c1.104,0,1.999,2.013,1.999,4.494C211.427,273.382,210.532,275.395,209.428,275.395z"/>
-<path id="path486" d="M128.915,448.525c0,0-9.888,17.655,33.9,7.063c0,0,24.719-2.119,28.957-6.355
-	c2.119,1.411,16.89,6.591,21.894,7.769c12.006,2.825,26.838-14.833,26.838-14.833s8.122-18.539,13.066-18.539
-	c4.944,0-0.707,2.825-0.707,2.825s-11.653,17.834-10.947,20.659c0,0-9.181,35.313-37.432,36.726c0,0-28.515,1.678-26.131,12.007
-	c0,0,15.538-4.237,19.775,0c0,0,19.069-0.707,4.944,10.595l-12.006,20.48c0,0,0.247,6.918-17.656,0.706
-	c-17.303-6.003-35.489-28.78-35.489-28.78S109.758,473.156,128.915,448.525z"/>
-<path id="path490" fill="#E59999" d="M126.796,455.588c0,0-3.531,16.95,61.444-1.413c0,0,7.769,0,12.007,1.413
-	c4.237,1.412,25.425,6.356,28.957,4.237c0,0-12.713,24.013-33.194,21.188c0,0-23.307,2.825-22.6,11.302
-	c0,0,7.063,12.712,15.538,16.949c0,0,4.944,4.237,4.237,9.888c-0.706,5.649-5.65,8.476-9.181,9.888
-	c-3.531,1.413-9.181-4.237-12.006-4.237s-17.656-11.3-25.425-19.774c-7.769-8.476-22.6-29.662-21.894-34.606
-	C125.384,465.476,126.796,455.588,126.796,455.588z"/>
-<path id="path494" fill="#B26565" d="M132.446,486.398c4.591,6.974,10.241,14.39,14.125,18.627
-	c7.769,8.476,22.6,19.774,25.425,19.774c2.825,0,8.475,5.65,12.006,4.237c3.531-1.412,8.475-4.237,9.181-9.888
-	c0.707-5.649-4.237-9.888-4.237-9.888c-5.414-2.707-10.251-8.873-13.04-12.975c0,0,0.327,4.499-8.854,3.087
-	c-9.181-1.413-18.363-6.356-21.188-12.007c-2.825-5.65-7.063-9.888-4.238-3.531s7.063,12.713,9.888,13.419
-	c2.825,0.706,2.119,2.825-2.119,2.119c-4.238-0.707-9.182-1.413-16.95-10.594L132.446,486.398L132.446,486.398z"/>
-<path id="path498" fill="#992600" d="M127.855,449.231c0,0,3.178-24.016,5.297-31.077c0,0-1.413-12.007,2.825-19.422
-	c4.237-7.417,7.769-18.363,13.066-27.897s5.65-16.597,12.712-19.422c7.062-2.825,17.656-18.01,22.6-19.775
-	c4.944-1.765,4.591-0.353,4.591-0.353s12.006-26.131,36.019-19.069c0,0-28.604-4.944-0.706-21.541c0,0-8.475,1.942-2.648-10.417
-	c3.886-8.242,3.001,3.708-16.421,24.542c0,0-8.828,15.185-18.009,20.481c-9.181,5.297-30.369,17.657-32.488,24.366
-	c-2.119,6.709-7.769,16.95-11.3,19.775c-3.531,2.825-8.475,10.241-9.181,16.244c0,0-2.119,7.063-4.591,9.181
-	c-2.472,2.119-2.825,7.769-2.825,11.299c0,3.532-3.531,8.477-3.178,12.714c0,0,1.412,33.549,0.706,37.079L127.855,449.231z"/>
-<path id="path502" fill="#FFFFFF" d="M112.671,457.354c0,0-3.531-2.472-11.3,8.122c0,0,12.889,58.267,12.889,60.738
-	c0,0,1.942-3.708-0.354-16.421c-2.295-12.713-3.884-35.137-3.884-35.137L112.671,457.354z"/>
-<path id="path506" fill="#992600" d="M150.809,350.354c0,0-31.076,5.65-30.369,57.207l-1.413,43.79c0,0-2.119-45.202-4.238-48.026
-	c-2.119-2.825,4.944-22.601-0.706-12.007c0,0-24.719,24.719-10.594,62.152c0,0,2.648,5.827-2.648-2.295
-	c0,0-8.122-22.249-6.18-33.549c0,0,0.353-3.885,3.708-8.828c0,0,15.185-20.659,19.952-24.72c0,0,3.178-25.425,30.369-34.606
-	C148.69,349.471,158.754,345.41,150.809,350.354z"/>
-<path id="path510" d="M396.939,233.468c1.164-0.625,1.148-2.338,2.174-2.644c2.027-0.607,2.317-2.491,3.231-3.875
-	c1.542-2.329,1.883-5.036,2.91-7.668c0.48-1.236,0.527-2.922-0.024-4.087c-2.072-4.381-3.313-8.705-5.858-12.988
-	c-0.473-0.794-0.937-2.196-1.29-3.252c-0.817-2.443-3.037-4.193-4.556-6.524c-0.51-0.779,0.419-2.412-0.847-2.56
-	c-1.584-0.186-4.143-1.209-4.554,0.602c-1.038,4.568,0.747,9.022,2.456,13.334c-1.381,1.222-0.791,2.848-0.522,4.202
-	c1.255,6.367-0.86,12.286-2.204,18.419c-0.041,0.184,0.563,0.533,0.514,0.643c-2.158,4.743-4.722,9.06-7.935,13.264
-	c-1.338,1.751-2.878,3.369-3.755,5.246c-0.649,1.39-1.37,3.095-0.929,4.84c-6.065,4.908-10.038,11.697-14.647,18.488
-	c-0.815,1.201-0.303,3.335,0.672,3.811c1.435,0.703,3.123-1.105,3.953-2.599c0.687-1.232,1.31-2.38,2.177-3.516
-	c0.233-0.309-0.081-1.049,0.157-1.262c4.647-4.144,7.596-9.328,11.927-13.509c3.442-0.581,6.157-2.343,9.243-4.131
-	c0.544-0.316,1.469,0.124,1.98-0.221c3.095-2.078,3.091-5.673,3.278-9.045C394.58,236.872,394.927,234.547,396.939,233.468z"/>
-<path id="path514" d="M381.329,225.583c0.22-0.136-0.055-0.883,0.138-1.264c0.286-0.572,0.998-0.904,1.284-1.476
-	c0.192-0.381-0.096-1.052,0.146-1.303c4.118-4.321,4.572-9.66,2.743-14.909c1.809-1.095,1.915-3.323,1.165-4.818
-	c-1.506-3.002-1.847-6.402-3.567-9.127c-1.416-2.24-4.202-4.437-6.623-2.136c-0.743,0.706-1.311,2.096-0.819,3.353
-	c0.113,0.288,0.616,0.545,0.568,0.69c-0.188,0.572-1.152,0.967-1.163,1.448c-0.053,2.641-1.737,5.309-0.625,7.656
-	c1.363,2.876,2.809,6.155,4.003,9.291c-2.179,3.736-0.355,8.06-3.45,11.374c-0.24,0.258-0.225,0.939-0.009,1.296
-	c0.516,0.858,1.231,1.575,2.09,2.091c0.357,0.213,0.972,0.217,1.324-0.002C379.553,227.106,380.256,226.247,381.329,225.583z"/>
-<path id="path518" d="M492.233,207.377c2.451,3.164,2.964,8.099-0.653,10.554c0.971,5.842,6.888,2.348,10.594,1.412
-	c-0.191-0.685,0.208-1.292,0.708-1.301c1.866-0.026,3.066-1.849,4.941-1.523c0.767-2.75,3.659-3.989,4.796-6.425
-	c3.048-6.524,2.004-14.069-2.559-19.8c-0.356-0.449,0.025-1.361-0.192-2c-1.335-3.904-4.986-4.46-8.401-5.675
-	c-2.078-6.842-3.245-13.959-6.354-20.481c-2.851-0.441-4.082-3.512-6.443-4.783c-2.354-1.27-3.355,1.519-3.284,3.365
-	c0.014,0.362,0.812,0.757,0.512,1.402c-0.136,0.29-0.595,0.486-0.595,0.722c0.002,0.238,0.394,0.47,0.629,0.707
-	c-1.62,1.448-4.134,2.29-4.653,4.312c-1.686,6.55,2.857,12.068,5.804,17.72c1.044,2.004-0.256,4.249-1.598,6.381
-	c-0.773,1.227-0.583,3.217-0.097,4.729C486.714,200.806,489.521,203.876,492.233,207.377z"/>
-<path id="path522" d="M426.622,239.84c-2.626,3.268-8.65,7.804-3.5,11.208c0.343,0.228,0.996,0.234,1.302-0.002
-	c3.568-2.763,7.104-4.357,11.405-5.385c0.22-0.051,0.703,0.773,1.354,0.489c2.849-1.242,6.397-1.139,8.487-3.501
-	c6.651,0.396,12.946-1.575,18.934-3.884c2.051-0.791,4.293-1.778,6.412-2.665c2.431-1.017,4.557-2.655,6.521-4.67
-	c0.233-0.24,0.858-0.082,1.331-0.082c-0.07-1.523,1.628-1.748,2.063-2.846c0.163-0.41-0.102-1.109,0.133-1.289
-	c3.775-2.878,5.399-6.441,3.336-10.638c-0.504-1.021-0.942-2.112-1.941-2.952c-1.916-1.608-3.862-0.101-5.711-0.637
-	c-0.28,1.108-1.567,0.805-2.249,1.155c-1.517,0.775-3.87-0.258-5.387,0.515c-2.405,1.227-4.598,1.526-7.106,2.191
-	c-0.552,0.145-1.925-0.025-2.208,1.083c-0.236-0.237-0.497-0.65-0.685-0.611c-3.369,0.699-5.595,1.077-7.892,4.064
-	c-0.182,0.235-0.962-0.081-1.243,0.157c-1.688,1.427-2.403,3.605-4.349,4.792c-0.354,0.217-0.977-0.079-1.319,0.148
-	c-1.141,0.761-1.787,1.893-2.922,2.682c-0.581,0.404-1.287-0.169-1.229-0.622c0.433-3.438,1.585-6.593,0.569-9.905
-	c3.667-4.449,8.111-7.891,11.301-12.713c0.025-3.824,1.248-7.613,1.049-11.28c-0.019-0.341-0.526-1.635-0.748-2.248
-	c-0.552-1.508,1.049-3.39-0.441-4.668c-2.479-2.124-4.761-0.578-6.216,1.953c-3.245,0.688-6.893,1.912-9.679-0.267
-	c-1.778-1.39-2.799-2.989-4.21-4.854c-1.738-2.299-1.147-4.834-1.023-7.596c0.011-0.226-0.546-0.466-0.546-0.703
-	c0.002-0.238,0.391-0.47,0.627-0.706c-1.246-1.105-1.731-2.974-3.531-3.532c0.538-1.928-0.654-3.489-2.192-4.022
-	c-3.522-1.22-6.483,2.156-9.823,2.285c-0.908,0.034-1.732-1.799-2.878-2.373c-0.764-0.381-2.006-0.439-2.646,0.03
-	c-1.215,0.89-2.255,1.091-3.593,1.453c-2.854,0.77-5.11,2.701-7.725,4.211c-2.622,1.513-4.31,4.05-6.216,6.381
-	c-1.661,2.034-1.901,6.296,0.605,7.179c3.254,1.148,5.557-3.625,9.027-3.049c0.551,0.09,0.915,0.639,0.721,1.324
-	c0.688,0.193,1.071-0.212,1.412-0.706c1.515,1.799,3.57,2.394,5.227,3.936c1.714,1.596,4.796,0.858,6.589,2.619
-	c2.698,2.652,1.712,7.386,5.136,9.69c-1.034,2.318-2.106,4.573-2.698,7.092c-0.497,2.129,1.258,4.243,3.396,4.082
-	c2.222-0.166,2.684-1.506,3.54-3.406c0.472,0.472,1.3,0.996,1.228,1.377c-0.807,4.214-2.62,7.733-3.429,12.025
-	c-0.104,0.56-0.644,0.917-1.33,0.722c-0.826,7.326-7.98,11.553-12.475,17.141c-0.712,0.886-0.719,3.092,0.004,3.803
-	c2.478,2.449,5.938-0.281,8.938-1.169c0.376-2.129,1.893-3.792,4.245-3.694c0.452,0.018,0.866-0.939,1.438-1.169
-	c0.614-0.244,1.501,0.152,2.007-0.198c3.053-2.11,5.539-4.063,8.606-6.162c0.339-0.231,0.946,0.05,1.328-0.141
-	c0.574-0.286,0.904-0.969,1.475-1.296c0.614-0.353,1.041,0.159,1.383,0.653c-1.142,0.616-1.147,2.306-2.176,2.663
-	c-1.367,0.473-2.358,1.379-3.549,2.168c-0.516,0.341-1.68-0.097-1.862,0.219C429.966,237.508,427.875,238.281,426.622,239.84z"/>
-<path id="path526" d="M328.785,152.602c0,0-16.312-5.071-36.019,40.257c0,0-4.238,9.181-8.475,12.712
-	c-4.238,3.531-24.013,9.888-27.544,16.95l-18.363,28.25c0,0,26.131-28.25,31.782-32.488c0,0,14.125-14.832,8.475-2.825
-	c0,0-24.719,19.069-22.601,35.313c0,0-9.887,25.425-11.3,28.957c0,0,28.25-56.5,32.488-58.62c4.237-2.119,6.356-2.119,4.237,4.238
-	c-2.119,6.357-2.825,35.313-7.769,38.844c0,0,14.125-36.02,12.712-41.669c0,0,5.65-6.356,9.888,2.825l-2.119,28.25l7.769,21.188
-	c0,0-4.237-19.775-1.413-47.319c0,0-3.531-18.363,3.531-8.475c7.062,9.888,24.013,20.481,24.013,28.957
-	c0,0-9.181-31.075-25.425-39.55l-7.063,10.594l-2.119-3.531c0,0-6.356-1.413,1.413-13.419c7.769-12.006,7.063-13.419,7.063-13.419
-	s11.3,12.713,14.125,12.713c0,0,23.307-13.419,25.425,29.663c0,0,12.007-25.425-4.237-37.432c0,0-26.132-3.531-24.013-12.712
-	l12.713-21.894c6.356-9.182,3.531-4.238,3.531-4.238L328.785,152.602z"/>
-<path id="path530" d="M293.473,181.558c0,0-22.6,0-28.25,9.181l-12.713,16.95c0,0,30.369-17.656,37.432-19.775
-	S293.473,181.558,293.473,181.558z"/>
-<path id="path534" d="M222.847,192.858c0,0-3.531,2.119-4.238,7.063c-0.706,4.944-4.944,5.65-3.531,10.594
-	c1.413,4.944,4.944,9.182,4.944,2.119c0-7.063,2.825-10.594,4.238-12.712C225.672,197.802,228.497,190.033,222.847,192.858z"/>
-<path id="path538" d="M207.31,300.916c0,0-14.832-7.063-20.481-13.419c-5.65-6.356-4.852,2.765-13.419,2.119
-	c-10.324-0.779-8.475-28.957-8.475-28.957l-7.063,13.418c0,0-2.119,25.425,12.006,21.188c6.898-2.069,9.181,0.706,6.356,2.119
-	c-2.825,1.413,9.887,2.119,4.943,4.944c-4.943,2.825,20.481-6.356,16.244,12.006L207.31,300.916z"/>
-<path id="path542" d="M185.063,326.341c0,0-27.191,7.769-33.547-9.181c0,0-8.475,4.237-4.591,9.534
-	c3.885,5.297,6.003,6.003,6.003,6.003s9.534,2.119,8.475,3.531c-1.06,1.413-5.297,7.416-5.297,7.416S174.115,333.05,185.063,326.341
-	z"/>
-<path id="path546" fill="#FFFFFF" d="M588.337,464.416c-0.754,3.768-3.704,5.182-7.063,6.355c-3.386-1.69-7.973-7.176-11.301-3.53
-	c-0.837-0.849-2.213-0.954-2.819-2.123c-0.82-1.585-0.342-3.433-0.944-4.841c-0.962-2.246-2.214-4.658-1.886-7.161
-	c3.188-1.258,4.239-4.623,3.401-7.735c-0.122-0.454-0.879-0.802-0.525-1.418c0.329-0.57,0.89-0.972,1.36-1.441
-	c-0.237,0.237-0.493,0.648-0.689,0.613c-1.077-0.188-0.857-1.313-0.628-1.995c1.032-3.083,4.589-3.549,6.969-1.443
-	c0.452-0.998,1.352-0.655,2.118-0.706c-0.088-1.022,0.633-1.953,0.982-2.694c0.913-1.938,3.791,0.014,5.197-1.065
-	c1.899-1.457,3.776-2.691,5.681-1.628c3.193,1.789,6.212,3.93,8.327,7.004c1.017,1.473,1.439,3.733,1.338,5.426
-	c-0.067,1.143-2.507,0.521-3.111,2.161c-1.139,3.086,2.095,4.003,3.43,6.364c0.35,0.616-0.117,1.153-0.673,1.326
-	c-0.726,0.227-2.11-0.107-1.866,0.691C597.351,462.212,592.484,463.409,588.337,464.416z"/>
-<path id="path550" fill="#FFFFFF" d="M571.385,499.022c-0.012-3.068-2.839-6.17-0.704-9.183c0.238,0.237,0.471,0.627,0.706,0.627
-	c0.238,0,0.471-0.39,0.706-0.627c2.641,3.913,9.088,5.552,8.837,10.576c-0.038,0.79-1.958,2.41-0.36,3.55
-	c-3.201,2.38-3.3,6.564-4.944,9.887c-2.186-0.505-4.325-1.146-6.356-2.117c0.622-2.624,0.415-5.599,1.863-7.929
-	C571.896,502.575,571.391,500.67,571.385,499.022z"/>
-<path id="path554" fill="#CCCCCC" d="M277.935,483.132c0,0-29.765,17.896-4.944-9.182c15.538-16.95,33.194-26.838,33.194-26.838
-	s18.362-7.771,24.719-9.89c6.355-2.119,33.193-11.301,38.845-12.007c5.649-0.706,22.6-7.769,34.606-0.706
-	c12.006,7.063,26.131,14.831,26.131,14.831s-28.956-14.831-35.313-10.594c-6.356,4.237-19.069,3.531-29.663,9.182
-	c0,0-26.131,7.771-31.781,11.303c-5.649,3.53-24.013,24.013-26.837,22.601c-2.825-1.413,0.706-2.119,2.825-7.063
-	c2.119-4.943-1.412-7.77-15.538,3.531C280.054,479.601,277.935,483.132,277.935,483.132z"/>
-<path id="path558" d="M291.01,472.596c0,0,2.49-23.022,17.459-20.084c0,0,14.523-7.361,19.33-10.837c0,0,14.37-3.006,16.685-4.095
-	c32.627-15.361,58.614-7.383,59.581-9.359c0.965-1.977,35.614,10.59,41.986,17.806c0.69,0.781-18.063-9.884-35.188-13.223
-	c-14.607-2.85-52.748,0.438-72.005,10.211c-5.249,2.664-21.043,12.877-25.513,12.682C308.878,455.498,291.01,472.596,291.01,472.596
-	z"/>
-<path id="path562" fill="#CCCCCC" d="M284.292,517.738c0,0-26.838-4.237,2.825-7.063c0,0,31.782-3.531,38.844-12.713
-	c0,0,24.013-16.244,28.956-16.95c4.944-0.706,57.913-13.419,58.619-17.656c0.707-4.236,10.595-4.236,13.419-2.824
-	c2.825,1.413,1.413,3.53-3.531,4.943c-4.943,1.412-60.031,30.369-71.332,32.487c-11.3,2.119-31.781,15.538-40.256,17.656
-	C303.36,517.738,284.292,517.738,284.292,517.738z"/>
-<path id="path566" d="M318.757,504.676c0,0-15.153-1.464,0.033-2.909c0,0,15.566-6.046,19.183-10.748c0,0,12.296-8.316,14.826-8.678
-	c2.531-0.362,27.18-6.872,27.542-9.04c0.362-2.17,60.51-24.384,68.314-18.751c5.14,3.709-12.343,0.748-29.354,8.535
-	c-2.393,1.095-62.164,26.85-67.95,27.934c-5.785,1.087-16.271,7.956-20.611,9.04C326.402,501.145,318.757,504.676,318.757,504.676z"
-	/>
-<path id="path570" d="M304.773,508.557c0,0,9.181-0.706,7.063,2.119c-2.119,2.825-6.357,1.412-6.357,1.412L304.773,508.557z"/>
-<path id="path574" d="M292.061,511.382c0,0,9.181-0.706,7.063,2.119c-2.119,2.825-6.356,1.412-6.356,1.412L292.061,511.382z"/>
-<path id="path578" d="M273.698,514.207c0,0,9.181-0.706,7.063,2.119c-2.119,2.824-6.356,1.412-6.356,1.412L273.698,514.207z"/>
-<path id="path582" d="M260.279,515.619c0,0,9.181-0.706,7.063,2.119c-2.118,2.825-6.356,1.412-6.356,1.412L260.279,515.619z"/>
-<path id="path586" d="M328.079,445.7c0,0,7.77,0,5.649,2.825c-2.119,2.824-7.769,2.117-7.769,2.117L328.079,445.7z"/>
-<path id="path590" d="M310.423,455.588c0,0,11.487-3.78,7.063,2.118c-2.118,2.825-6.356,1.413-6.356,1.413L310.423,455.588z"/>
-<path id="path594" d="M290.648,464.063c0,0,9.181-0.705,7.063,2.119c-2.118,2.825-6.356,1.412-6.356,1.412L290.648,464.063z"/>
-<path id="path598" d="M277.229,474.656c0,0,9.181-0.706,7.063,2.119c-2.118,2.824-6.356,1.411-6.356,1.411L277.229,474.656z"/>
-<path id="path602" d="M265.223,483.132c0,0,9.181-0.706,7.063,2.118c-2.119,2.825-6.356,1.413-6.356,1.413L265.223,483.132z"/>
-<path id="path606" d="M334.228,494.427c0,0,12.221-0.938,9.4,2.819c-2.82,3.761-8.461,1.881-8.461,1.881L334.228,494.427z"/>
-<path id="path610" d="M352.59,485.951c0,0,12.221-0.939,9.4,2.82c-2.819,3.761-8.461,1.88-8.461,1.88L352.59,485.951z"/>
-<path id="path614" d="M371.659,478.183c0,0,12.22-0.938,9.399,2.819c-2.819,3.761-8.461,1.881-8.461,1.881L371.659,478.183z"/>
-<path id="path618" d="M390.021,469.708c0,0,12.221-0.939,9.399,2.819c-2.819,3.761-8.461,1.88-8.461,1.88L390.021,469.708z"/>
-<path id="path622" d="M341.29,437.926c0,0,12.22-0.938,9.4,2.82c-2.82,3.761-9.874,3.293-9.874,3.293L341.29,437.926z"/>
-<path id="path626" d="M358.946,432.276c0,0,12.22-0.939,9.399,2.818c-2.818,3.762-10.58,3.293-10.58,3.293L358.946,432.276z"/>
-<path id="path630" d="M318.898,502.907c0,0,9.181-0.706,7.063,2.118c-2.119,2.824-6.355,1.413-6.355,1.413L318.898,502.907z"/>
-<path id="path634" fill="#992600" d="M189.653,327.753c0,0-7.769,15.538-8.475,21.188c0,0,1.413-15.538,3.531-19.069
-	C186.828,326.341,189.653,327.753,189.653,327.753z"/>
-<path id="path638" fill="#992600" d="M157.165,352.472c0,0-5.65,25.425-4.944,30.369c0,0-2.119-20.481-1.412-22.6
-	C151.515,358.123,157.165,352.472,157.165,352.472z"/>
-<path id="path642" fill="#CCCCCC" d="M193.891,220.755l-0.353,5.65l-3.885,0.354c0,0,25.072,22.247,26.132,35.666
-	C215.785,262.425,217.197,247.946,193.891,220.755z"/>
-<path id="path646" d="M200.925,222.989c-0.761-0.734-0.374-2.05-1.095-2.509c-1.428-0.911,2.292-1.012,1.889-2.276
-	c-0.676-2.129-0.346-2.167-0.562-4.419c-0.101-1.056,0.938-3.775,1.618-4.552c2.553-2.917,0.215-8.094,3.111-10.833
-	c0.537-0.51,1.201-1.485,1.704-2.223c1.164-1.7,3.254-2.562,4.931-4.024c0.562-0.487,0.207-1.948,1.211-1.785
-	c1.261,0.203,3.452-0.026,3.373,1.458c-0.2,3.743-2.546,6.78-4.806,9.725c0.796,1.243-0.013,2.364-0.514,3.348
-	c-2.357,4.626-2.023,9.642-2.331,14.657c-0.009,0.15-0.551,0.288-0.537,0.381c0.623,4.123,1.654,8.005,3.207,11.941
-	c0.646,1.642,1.478,3.222,1.743,4.859c0.196,1.211,0.378,2.682-0.343,3.927c3.593,5.103,1.282,9.783,3.346,16.018
-	c0.365,1.104,3.353,4.483,2.535,4.199c-4.437-1.538-4.635-2.241-4.947-3.57c-0.258-1.1-0.84-3.531-1.259-4.594
-	c-0.113-0.29-0.415-3.616-0.553-3.832c-2.671-4.206-0.274-3.895-2.692-8.059c-2.521-1.201-4.227-3.15-6.21-5.202
-	c-0.35-0.36,1.668-1.638,1.349-2.014c-1.928-2.276-3.964-3.63-3.371-6.267C201.997,226.126,202.238,224.26,200.925,222.989z"/>
-<path id="path650" d="M194.597,226.052c0,0,0.707,12.006,4.944,14.832c4.238,2.825,2.119,1.413-3.531-0.706
-	c-5.65-2.119-3.531-3.531-3.531-3.531s-4.944,0.706-0.706,4.237c4.237,3.531,10.594,7.769,7.769,7.769s-16.244-7.063-16.244-12.006
-	c0-4.944-1.766-12.183-1.766-12.183s1.942-1.413,10.417-1.236C191.948,223.228,194.42,224.463,194.597,226.052z"/>
-<path id="path654" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M193.184,258.894c0,0-15.043-4.928-47.672,1.059
-	c0,0,15.946-3.669,49.085,0.353C212.783,262.513,193.184,258.894,193.184,258.894z"/>
-<path id="path658" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M196.889,258.768c0,0-14.56-6.211-47.586-3.067
-	c0,0,16.205-2.276,48.871,4.596C216.103,264.068,196.889,258.768,196.889,258.768z"/>
-<path id="path662" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M200.045,258.932c0,0-14.058-7.276-47.226-6.596
-	c0,0,16.329-1.066,48.395,8.217C218.811,265.647,200.045,258.932,200.045,258.932z"/>
-<path id="path666" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M202.288,259.326c0,0-12.049-7.604-41.842-9.543
-	c0,0,14.724,0.3,42.764,11.086C218.599,266.789,202.288,259.326,202.288,259.326z"/>
-<path id="path670" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M405.838,277.894c0,0-1.642,1.137-1.264-0.948
-	c0.38-2.085,50.185-25.339,56.564-24.897C461.14,252.048,407.732,275.365,405.838,277.894z"/>
-<path id="path674" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M399.846,279.021c0,0-1.547,1.263-1.333-0.846
-	c0.214-2.108,48.04-29.202,54.436-29.262C452.947,248.914,401.537,276.354,399.846,279.021z"/>
-<path id="path678" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M394.044,281.449c0,0-1.462,1.363-1.388-0.755
-	c0.074-2.117,35.063-29.479,52.389-32.788C445.045,247.906,413.21,262.255,394.044,281.449z"/>
-<path id="path682" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M388.966,284.739c0,0-1.314,1.226-1.248-0.68
-	c0.066-1.907,31.557-26.532,47.147-29.509C434.865,254.55,406.216,267.464,388.966,284.739z"/>
-<path id="path686" fill="#CCCCCC" d="M333.023,545.988c0,0-26.838-4.237,2.824-7.063c0,0,31.781-3.531,38.845-12.712
-	c0,0,24.013-16.244,28.956-16.95c4.943-0.707,33.899-7.063,34.606-11.301c0.706-4.237,11.3-8.475,14.125-7.063
-	c2.825,1.413,2.825,17.655-2.119,19.068c-4.942,1.412-38.138,14.125-49.438,16.244c-11.301,2.118-31.782,15.537-40.257,17.656
-	C352.092,545.988,333.023,545.988,333.023,545.988z"/>
-<path id="path690" d="M461.915,479.953c0,0-5.297,2.825-7.416,7.416c0,0-11.3,18.716-36.372,24.366c0,0-40.609,15.891-54.382,19.422
-	c0,0-23.659,8.828-36.727,7.416c0,0-12.358,0.353-1.411,3.178c0,0,35.666-3.531,41.669-6.709c0,0,27.544-9.182,32.841-13.772
-	c5.297-4.59,37.432-13.419,41.315-16.949C445.317,500.789,462.621,485.957,461.915,479.953z"/>
-<path id="path694" d="M358.24,535.589c0,0,9.231-0.398,7.195,2.336c-2.034,2.737-6.356,1.193-6.356,1.193L358.24,535.589z"/>
-<path id="path698" d="M345.523,537.977c0,0,9.23-0.398,7.196,2.336c-2.036,2.736-6.357,1.195-6.357,1.195L345.523,537.977z"/>
-<path id="path702" d="M327.11,540.18c0,0,9.231-0.399,7.195,2.336c-2.034,2.735-6.356,1.193-6.356,1.193L327.11,540.18z"/>
-<path id="path706" d="M313.631,541.141c0,0,9.232-0.398,7.197,2.336c-2.036,2.736-6.358,1.193-6.358,1.193L313.631,541.141z"/>
-<path id="path710" d="M387.432,522.526c0,0,12.289-0.531,9.578,3.108c-2.708,3.642-8.463,1.59-8.463,1.59L387.432,522.526z"/>
-<path id="path714" d="M405.645,514.714c0,0,10.521-5.828,9.578,3.109c-0.477,4.513-8.463,1.589-8.463,1.589L405.645,514.714z"/>
-<path id="path718" d="M421.768,509.745c0,0,12.642-6.534,9.579,3.108c-1.374,4.326-8.465,1.59-8.465,1.59L421.768,509.745z"/>
-<path id="path722" d="M438.566,501.226c0,0,7.695-8.652,9.578,3.109c0.717,4.481-8.464,1.59-8.464,1.59L438.566,501.226z"/>
-<path id="path726" d="M372.28,530.444c0,0,9.23-0.401,7.196,2.336c-2.035,2.733-6.359,1.192-6.359,1.192L372.28,530.444z"/>
-<path id="path730" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M435.138,316.105c0,0-1.282,1.174-1.284-0.717
-	c0-1.889,30.871-25.309,46.484-27.752C480.338,287.636,451.913,299.517,435.138,316.105z"/>
-<path id="path734" d="M440.374,428.748c0,0,38.847,39.553,55.09,45.908c0,0,16.244,19.774,9.183,65.683
-	c0,0-5.65,13.419-11.301-23.307c0,0,5.649-44.494-14.125-16.244c0,0-14.834-17.479-3.533-16.95c0,0,5.651,3.531,6.357,0.706
-	c0.707-2.825-13.42-26.838-43.789-52.265C407.887,406.854,440.374,428.748,440.374,428.748z"/>
-<path id="path738" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M337.261,497.257c0,0-0.354-3.178,2.825-1.766
-	c3.178,1.412,169.503,12.358,225.298,54.734C565.384,550.227,485.576,509.264,337.261,497.257z"/>
-<path id="path742" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M355.623,489.488c0,0-0.354-3.18,2.825-1.767
-	c3.179,1.412,244.367-0.354,286.036,56.854C644.484,544.576,605.641,500.082,355.623,489.488z"/>
-<path id="path746" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M376.104,482.426c0,0-0.353-3.179,2.825-1.766
-	c3.18,1.412,309.343-21.541,351.013,35.666C729.941,516.326,712.991,471.125,376.104,482.426z"/>
-<path id="path750" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M393.762,473.95c0,0-0.354-3.178,2.824-1.767
-	c3.179,1.413,218.941-66.742,260.611-9.533C657.197,462.65,633.537,419.214,393.762,473.95z"/>
-<path id="path754" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M291.354,514.207c0,0-0.353-3.178,2.825-1.766
-	c3.178,1.412,34.606,5.297,38.138,73.804C332.317,586.245,319.604,512.088,291.354,514.207z"/>
-<path id="path758" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M275.816,517.032c0,0-0.353-3.18,2.825-1.767
-	c3.178,1.412,28.25-6.71,23.306,61.797C301.948,577.063,304.066,514.913,275.816,517.032z"/>
-<path id="path762" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M261.691,517.738c0,0-0.354-3.179,2.825-1.767
-	c3.179,1.412,30.369,2.473,8.475,42.022C272.991,557.995,289.941,515.619,261.691,517.738z"/>
-<path id="path766" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M345.252,439.457c0,0-0.784,3.529,1.951,1.381
-	c28.37-22.292,85.65-126.292,183.971-136.239C531.174,304.599,463.536,283.217,345.252,439.457z"/>
-<path id="path770" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M365.027,436.278c0,0-2.406-2.106,0.892-3.21
-	c3.298-1.104,201.831-129.115,271.194-115.05C637.113,318.018,589.252,304.758,365.027,436.278z"/>
-<path id="path774" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M328.229,447.053c0,0-0.897,2.823,2.122,1.101
-	c15.848-9.04,22.229-110.054,99.171-112.271C429.521,335.882,372.297,309.903,328.229,447.053z"/>
-<path id="path778" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M293.053,466.521c0,0-1.902,2.271,1.546,1.821
-	c18.091-2.352,55.884-75.222,134.348-66.254C428.947,402.089,372.507,376.759,293.053,466.521z"/>
-<path id="path782" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M312.895,455.704c0,0-1.432,2.594,1.868,1.49
-	c17.303-5.78,40.403-84.549,119.13-90.813C433.893,366.382,373.639,352.357,312.895,455.704z"/>
-<path id="path786" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M280.623,475.559c0,0-1.542,1.841,1.252,1.478
-	c14.653-1.905,45.265-60.929,108.822-53.665C390.696,423.37,344.979,402.854,280.623,475.559z"/>
-<path id="path790" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M267.206,485.992c0,0-1.775,1.845,1.035,1.637
-	c7.359-0.546,61.455-58.951,94.063-31.58C362.303,456.049,341.089,422.99,267.206,485.992z"/>
-<path id="path794" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M389.974,429.627c0,0-2.12-2.392,1.291-3.071
-	c3.411-0.679,216.529-102.579,283.56-79.862C674.823,346.693,629.021,327.494,389.974,429.627z"/>
-<path id="path798" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M330.904,543.164c0,0-0.354-3.179,2.824-1.768
-	c3.179,1.413,30.369,2.474,8.476,42.022C342.204,583.42,359.154,541.045,330.904,543.164z"/>
-<path id="path802" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M349.268,540.339c0,0-0.354-3.179,2.824-1.766
-	c3.18,1.412,34.607,5.297,38.14,73.804C390.23,612.377,377.518,538.22,349.268,540.339z"/>
-<path id="path806" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M361.273,537.514c0,0-0.354-3.179,2.824-1.766
-	c3.179,1.412,46.613,7.416,88.282,64.622C452.381,600.37,389.523,535.395,361.273,537.514z"/>
-<path id="path810" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M374.736,533.931c0,0-0.771-3.104,2.564-2.125
-	c3.337,0.979,39.416-2.375,106.684,57.969C483.984,589.773,402.455,528.076,374.736,533.931z"/>
-<path id="path814" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M393.1,526.162c0,0-0.771-3.104,2.565-2.126
-	c3.337,0.979,64.841,8.926,156.119,70.681C551.784,594.717,420.818,520.308,393.1,526.162z"/>
-<path id="path818" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M321.723,505.732c0,0-0.353-3.18,2.825-1.767
-	c3.179,1.412,97.464,6.003,151.14,53.322C475.688,557.289,414.064,513.545,321.723,505.732z"/>
-<path id="path822" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M304.066,512.795c0,0-0.353-3.179,2.825-1.766
-	c3.179,1.412,46.613,7.415,88.282,64.622C395.174,575.651,332.317,510.676,304.066,512.795z"/>
-<path id="path826" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M412.306,518.021c0,0-0.997-3.037,2.403-2.308
-	s65.321,4.147,160.88,59.049C575.589,574.764,438.462,514.036,412.306,518.021z"/>
-<path id="path830" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M427.138,513.785c0,0-0.998-3.039,2.402-2.309
-	c3.401,0.729,65.322,4.147,160.88,59.049C590.42,570.525,454.354,509.092,427.138,513.785z"/>
-<path id="path834" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M444.088,504.957c0,0-0.998-3.039,2.402-2.308
-	c3.399,0.729,79.447,8.385,237.863,68.936C684.354,571.585,471.303,500.264,444.088,504.957z"/>
-<path id="path838" d="M247.566,517.032c0,0,9.182-0.706,7.063,2.118s-6.356,1.412-6.356,1.412L247.566,517.032z"/>
-<path id="path842" d="M301.948,541.751c0,0,9.181-0.706,7.063,2.119c-2.119,2.825-6.356,1.412-6.356,1.412L301.948,541.751z"/>
-<path id="path846" d="M286.41,541.045c0,0,9.182-0.706,7.063,2.119c-2.119,2.824-6.356,1.412-6.356,1.412L286.41,541.045z"/>
-<path id="path850" d="M118.022,520.177c0,0,8.908,2.336,5.98,4.313c-2.926,1.978-6.469-0.745-6.469-0.745L118.022,520.177z"/>
-<path id="path854" d="M121.554,503.227c0,0,8.908,2.336,5.98,4.313c-2.926,1.978-6.469-0.745-6.469-0.745L121.554,503.227z"/>
-<path id="path858" d="M108.841,495.458c0,0,8.908,2.336,5.98,4.312c-2.925,1.979-6.469-0.744-6.469-0.744L108.841,495.458z"/>
-<path id="path862" fill="#CCCCCC" d="M249.685,627.914c0,0-2.825,0-9.888,3.531c-3.531,0-23.307,6.355-33.194,24.013
-	C206.603,655.458,228.497,638.508,249.685,627.914z"/>
-<path id="path866" fill="#CCCCCC" d="M404.56,791.494c0.249,0.456,0.348,1.197,0.862,1.228c1.161,0.07,3.339,0.603,3.118-0.521
-	c-1.497-7.604-3.041-16.319-10.338-19.51c-1.129-0.493-3.675,0.235-3.806,1.797c-0.225,2.69-0.432,5.072,0.114,7.661
-	c0.529,2.509,4.34,2.525,5.959,0.083C402.123,785.184,402.886,788.438,404.56,791.494z"/>
-<path id="path870" fill="#CCCCCC" d="M385,799.854c1.321,2.494,1.097,5.776,3.595,6.771c1.308,0.519,4.573-1.202,3.835-3.099
-	c-1.416-3.64-2.101-7.594-4.554-10.79c-0.353-0.463,0.071-1.403-0.212-1.982c-1.048-2.154-3.07-3.452-5.556-2.871
-	c-1.97,3.891,0.058,7.648,2.744,10.666C385.094,798.816,384.801,799.48,385,799.854z"/>
-<path id="path874" fill="#CCCCCC" d="M315.077,790.689c-0.19-0.666-0.258-1.483,0.033-2.052c0.938-1.822,2.338-3.805,1.742-5.608
-	c-0.613-1.864-2.585-1.543-3.731-0.538c-2.004,1.755-2.091,4.979-3.312,7.379c-0.347,0.682-0.256,1.692-1.034,2.383
-	c-0.838,0.744-1.613,3.435-1.444,4.442c0.094,0.553-0.229,18.047,0.163,17.583c1.093-1.295,6.478-18.481,6.6-20.058
-	C314.194,792.932,315.487,792.11,315.077,790.689z"/>
-<path id="path878" fill="#CCCCCC" d="M269.81,778.697c4.651-4.413,9.577-9.642,8.796-16.195c-0.205-1.723-3.339-0.792-3.669,0.701
-	c-1.416,6.4-5.016,11.099-9.55,15.322c-3.877,3.613-7.165,14.814-7.58,15.713C264.334,784.958,268.319,780.109,269.81,778.697z"/>
-<path id="path882" fill="#CCCCCC" d="M245.843,768.167c0.923-0.653,0.39-1.521,0.773-2.106c1.683-2.574,3.979-4.773,4.012-7.844
-	c0.005-0.489-0.662-1.034-1.254-0.639c-0.489,0.324-1.093,0.555-1.284,0.784c-3.584,4.322-6.056,9.04-8.604,14.005
-	c-0.323,0.63-2.343,8.56-1.79,8.756c0.422,0.148,3.459-7.232,3.83-7.434C243.756,772.479,243.777,769.627,245.843,768.167z"/>
-<path id="path886" fill="#CCCCCC" d="M275.387,802.674c0.784-1.534,3.567-3.656,3.367-5.226c-0.208-1.64,0.618-4.188-0.992-2.973
-	c-2.22,1.675-8.309,4.057-8.786,14.312C268.93,809.795,274.182,805.04,275.387,802.674z"/>
-<path id="path890" fill="#CCCCCC" d="M300.889,772.344c0.706-1.179,1.956-0.344,2.767-0.809c1.144-0.656,2.223-1.643,2.738-2.788
-	c1.713-3.794,4.836-7.008,5.089-11.234c-2.634-2.479-3.831,1.121-4.944,2.825c-2.336-2.908-4.1,0.4-6.395,1.316
-	c-0.124,0.05-0.5-0.563-0.632-0.516c-2.078,0.776-3.279,2.687-5.041,4.064c-0.302,0.236-1.017-0.082-1.276,0.158
-	c-1.151,1.064-2.869,1.639-3.364,2.843c-1.959,4.78-7.504,8.479-10.835,21.795c0.672,1.604,7.966-11.728,8.826-12.959
-	c1.476-2.112,1.685,2.933,3.938,1.757c0.09-0.048,0.418,0.372,0.655,0.608c0.342-0.494,0.727-0.898,1.413-0.706
-	c0-0.706-0.237-1.688,0.118-1.969c2.184-1.726,2.036-3.61,3.413-5.801C298.166,772.324,300.039,771.055,300.889,772.344z"/>
-<path id="path894" fill="#CCCCCC" d="M406.474,868.395c0,0,13.066-36.019,5.298-55.794c0,0,20.129,38.139,12.007,57.913
-	c0,0-0.706-18.361-7.77-27.189C416.009,843.323,408.946,865.923,406.474,868.395z"/>
-<path id="path898" fill="#CCCCCC" d="M380.343,863.805c0,0,9.534-15.538-4.591-48.024c0,0-1.413,36.019-13.419,55.439
-	C362.333,871.22,387.405,835.554,380.343,863.805z"/>
-<path id="path902" fill="#CCCCCC" d="M362.686,860.273c0,0-0.353-35.313,0.354-40.61c0,0-6.709,29.31-24.719,46.26
-	C338.32,865.923,363.745,844.735,362.686,860.273z"/>
-<path id="path906" fill="#CCCCCC" d="M345.736,803.771c0,0,10.594,24.014-7.063,56.502c0,0,11.301-21.541,2.825-33.9
-	C341.498,826.373,346.089,820.369,345.736,803.771z"/>
-<path id="path910" fill="#CCCCCC" d="M311.836,859.566c0,0-1.766-27.545,1.412-31.429c0,0,0.354-11.301-0.354-13.065
-	c0,0,7.063-10.946,7.416,2.119c0,0,2.473,13.771,7.416,21.894c0,0,6.356,9.535,6.003,20.835
-	C333.729,859.92,316.073,806.598,311.836,859.566z"/>
-<path id="path914" fill="#CCCCCC" d="M305.479,810.835c0,0-11.653,19.069-14.831,52.616c0,0-2.472-10.947,4.237-36.372
-	C294.885,827.079,302.301,799.888,305.479,810.835z"/>
-<path id="path918" fill="#CCCCCC" d="M266.988,845.795c0,0,8.828-9.535,11.3-18.363c0,0,6.356-27.896-4.943-12.712
-	c0,0,0.353,14.125-14.125,27.19C259.219,841.91,267.694,837.673,266.988,845.795z"/>
-<path id="path922" fill="#CCCCCC" d="M256.748,836.967c0,0,6.003-30.723,7.416-32.135c0,0,3.178-6.003-1.766-0.354
-	c0,0-15.538,33.9-22.6,45.555C239.797,850.032,253.922,833.788,256.748,836.967z"/>
-<path id="path926" fill="#CCCCCC" d="M246.507,807.657c0,0,20.481-39.552-18.01,6.003
-	C228.497,813.66,247.919,796.356,246.507,807.657z"/>
-<path id="path930" fill="#CCCCCC" d="M219.316,781.879c0,0,8.475-33.193,13.065-32.842c0,0,14.479-15.891,2.825,2.825
-	c0,0-10.594,16.95-9.535,34.254C225.672,786.116,224.613,769.166,219.316,781.879z"/>
-<path id="path934" fill="#CCCCCC" d="M802.508,761.748c0,0-21.188-17.656-25.602-23.836c0,0,23.836,32.664,23.836,45.023
-	C800.742,782.938,805.156,769.693,802.508,761.748z"/>
-<path id="path938" fill="#CCCCCC" d="M812.219,722.904c0,0-37.078-26.484-43.259-39.728c0,0,46.79,52.086,46.79,60.031
-	C815.75,743.209,816.633,727.318,812.219,722.904z"/>
-<path id="path942" fill="#CCCCCC" d="M842.234,450.995c0,0-21.188-14.125-23.836-10.594c0,0,18.539,11.477,22.952,26.483
-	C841.352,466.886,838.703,450.995,842.234,450.995z"/>
-<path id="path946" fill="#CCCCCC" d="M857.242,593.13l-30.898-21.188c0,0,33.547,30.017,34.431,37.079L857.242,593.13z"/>
-<path id="path950" stroke="#000000" d="M167.317,553.402l38.844,8.387"/>
-<path id="path954" stroke="#000000" d="M256.041,839.438c0,0-0.883-6.181-16.773,12.358"/>
-<path id="path958" stroke="#000000" d="M265.752,848.265c0,0,3.531-11.477-7.946-3.53"/>
-<path id="path962" stroke="#000000" d="M361.097,863.271c0,0,2.648-19.422-17.655,3.531"/>
-</svg>
--- a/data/elementary/meson.build
+++ b/data/elementary/meson.build
@ -1,11 +0,0 @@
-subdir('config')
-subdir('desktop')
-subdir('themes')
-subdir('colors')
-subdir('objects')
-subdir('edje_externals')
-
-install_subdir('images',
-  install_dir : join_paths(dir_data, 'elementary'),
-  exclude_files : ['Makefile.am']
-)
--- a/data/elementary/objects/Makefile.am
+++ b/data/elementary/objects/Makefile.am
@ -0,0 +1,25 @@
+EDJE_CC_FLAGS += -id $(top_srcdir)/data/elementary/objects -fd $(top_srcdir)/data/elementary/objects
+
+EXTRA_DIST += \
+elementary/objects/test.edc \
+elementary/objects/test_external.edc \
+elementary/objects/test_prefs.edc \
+elementary/objects/test_prefs.epc \
+elementary/objects/multip.edc \
+elementary/objects/cursors.edc \
+elementary/objects/combobox_multiple.edc \
+elementary/objects/font_preview.edc \
+elementary/objects/postit_ent.edc \
+elementary/objects/multibuttonentry.edc \
+elementary/objects/test_focus_style.edc \
+elementary/objects/over.png \
+elementary/objects/under.png \
+elementary/objects/sky.jpg \
+elementary/objects/clo.png \
+elementary/objects/cross.png \
+elementary/objects/border.png \
+elementary/objects/border2.png \
+elementary/objects/border3.png \
+elementary/objects/border4.png \
+elementary/objects/border5.png \
+elementary/objects/border6.png
--- a/data/elementary/objects/combobox_multiple.edc
+++ b/data/elementary/objects/combobox_multiple.edc
@ -0,0 +1,61 @@
+collections {
+group {
+   name: "combobox_multiple_test";
+   parts{
+      part {
+         name: "bg";
+         type: RECT;
+         mouse_events: 1;
+         scale:1;
+         description {
+            state: "default" 0.0;
+            color: 0 0 0 0;
+            rel1.relative: 0.0 0.0;
+            rel2.relative: 1.0 1.0;
+         }
+      }
+      part{
+         name: "top.left";
+         type: RECT;
+         scale: 1;
+         description {
+            state: "default" 0.0;
+            min : 0 0;
+            fixed: 1 1;
+            rel1 { relative: 0.0 0.0; to: bg; }
+            rel2 { relative: 0.0 0.0; to: bg; }
+            align: 0.0 0.0;
+            color: 0 0 0 0;
+         }
+      }
+      part{
+         name: "bottom.right";
+         type: RECT;
+         scale: 1;
+         description {
+            state: "default" 0.0;
+            min : 0 0;
+            fixed: 1 1;
+            rel1 { relative: 1.0 1.0; to: bg; }
+            rel2 { relative: 1.0 1.0; to: bg; }
+            align: 1.0 1.0;
+            color: 0 0 0 0;
+         }
+      }
+      part {
+         name: "combobox";
+         type: SWALLOW;
+         mouse_events: 1;
+         scale:1;
+         description {
+            state: "default" 0.0;
+            min : 0 0;
+            max : -1 300;
+            rel1 { relative: 0.0 1.0; to: top.left; }
+            rel2 { relative: 0.0 0.0; to: bottom.right; }
+            align: 0.0 0.0;
+         }
+      }
+   }
+}
+}
--- a/data/elementary/objects/font_preview.edc
+++ b/data/elementary/objects/font_preview.edc
@ -1,32 +1,38 @@
 color_classes {
-   color_class { name: "/fg/normal/text";
-     color: 160 160 160 255;
+   color_class {
+      name: "entry_text";
+      color: 0 0 0 255;
   }
 }

-collections { group { name: "font_preview";
+collections {
+
+   group { name: "font_preview";
      parts {
+
         /* some fonts have weird alignments, thus they overflow badly */
-         part { name: "clipper"; type: RECT;
+         part { name: "clipper";
+            type: RECT;
            description {
               state: "default" 0.0;
            }
         }
-         part { name: "elm.text"; type: TEXT;
-            scale: 1;
+
+         part { name: "elm.text";
+            type: TEXT;
            mouse_events: 0;
+            scale: 1;
            clip_to: "clipper";
-            description { state: "default" 0.0;
-               color_class: "/fg/normal/text";
-               text { font: "Sans";
+            description {
+               state: "default" 0.0;
+               color_class: "entry_text";
+               text {
+                  font: "Sans";
                  min: 0 1;
                  size: 10;
                  align: 0.5 0.5;
                  text_class: "font_preview";
               }
-               rel1.offset: 16 16;
-               rel2.offset: -17 -17;
-               offscale;
            }
         }
      }
--- a/data/elementary/objects/meson.build
+++ b/data/elementary/objects/meson.build
@ -1,43 +0,0 @@
-edc_files = [
-  'test.edc',
-  'test_external.edc',
-  'test_focus_style.edc',
-  'test_masking.edc',
-  'test_tab_pager.edc',
-  'test_tooltip.edc',
-  'test_pager.edc',
-  'test_prefs.edc',
-  'cursors.edc',
-  'font_preview.edc',
-  'multibuttonentry.edc',
-  'multip.edc',
-  'postit_ent.edc'
-]
-
-elm_themes = []
-
-foreach edc_file : edc_files
-   elm_themes += custom_target('edje_cc_elm_' + edc_file,
-    input : edc_file,
-    output : '@BASENAME@.edj',
-    command : edje_cc_exe + [ '-beta', '-fastcomp',
-              '-no-warn-unused-images',
-              '-sd', elm_themes_sound_include,
-              '-id', elm_themes_image_include,
-              '-id', join_paths(meson.current_source_dir()),
-              '-fd', join_paths(meson.current_source_dir()),
-              '@INPUT@', '@OUTPUT@'],
-    depends : edje_depends,
-    install : true,
-    install_dir : join_paths(dir_data, 'elementary', 'objects'),
-   )
-endforeach
-
-custom_target('prefs_compile',
-  input: 'test_prefs.epc',
-  output: 'test_prefs.epb',
-  command : elm_prefs_cc_exe + ['@INPUT@', '@OUTPUT@'],
-    depends : elm_prefs_cc,
-    install : true,
-    install_dir : join_paths(dir_data, 'elementary', 'objects'),
-)
--- a/data/elementary/objects/roundedrect.png
+++ b/data/elementary/objects/roundedrect.png
--- a/data/elementary/objects/test.edc
+++ b/data/elementary/objects/test.edc
@ -749,308 +749,41 @@ collections {
         }
      }
   }
-   group { name: "page_layout";
-      parts {
-         part { name: "bg";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-              min: 400 500;
-              max: 400 500;
-              color: 0 0 0 0;
+group { name: "page_layout";
+   parts {
+      part { name: "bg";
+         type: RECT;
+         scale: 1;
+         description { state: "default" 0.0;
+           min: 400 500;
+           max: 400 500;
+           color: 0 0 0 0;
+        }
+      }
+      part { name: "page";
+         type: SWALLOW;
+         scale: 1;
+         description { state: "default" 0.0;
+           rel1.relative: 0.1 0.1;
+           rel1.to:"bg";
+           rel2.relative: 0.9 0.9;
+           rel2.to:"bg";
+         }
+      }
+      part { name: "text";
+         type: TEXT;
+         scale: 1;
+         description { state: "default" 0.0;
+           fixed: 1 1;
+           rel1.relative: 0.5 0.5;
+           rel2.relative: 0.5 0.5;
+           text {
+              min: 1 1;
+              size: 50;
+              ellipsis: -1;
           }
         }
-         part { name: "page";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-              rel1.relative: 0.1 0.1;
-              rel1.to:"bg";
-              rel2.relative: 0.9 0.9;
-              rel2.to:"bg";
-            }
-         }
-         part { name: "text";
-            type: TEXT;
-            scale: 1;
-            description { state: "default" 0.0;
-              fixed: 1 1;
-              rel1.relative: 0.5 0.5;
-              rel2.relative: 0.5 0.5;
-              text {
-                 min: 1 1;
-                 size: 50;
-                 ellipsis: -1;
-              }
-            }
-         }
-         part { name: "element1";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-              rel1.relative: 0.4 0.2;
-              rel1.to:"bg";
-              rel2.relative: 0.6 0.4;
-              rel2.to:"bg";
-            }
-         }
-         part { name: "element2";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-              rel1.relative: 0.4 0.6;
-              rel1.to:"bg";
-              rel2.relative: 0.6 0.7;
-              rel2.to:"bg";
-            }
-         }
-         part { name: "element3";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-              rel1.relative: 0.4 0.7;
-              rel1.to:"bg";
-              rel2.relative: 0.6 0.8;
-              rel2.to:"bg";
-            }
-         }
      }
   }
-   group { "layout_edje";
-      parts {
-         rect { "red";
-            desc {
-               color_class: "red";
-            }
-         }
-         rect { "blue";
-            desc { "default";
-            }
-            desc { "changed";
-               color: 0 0 255 255;
-               link.base: "change" "test";
-            }
-         }
-      }
-   }
-   group { name: "font_overlay_layout";
-      styles {
-         style { name: "test_class_style";
-            base: "font=Sans font_size=20 color=#fff text_class=font_overlay_test wrap=mixed";
-         }
-      }
-      parts {
-         part { name: "bg";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 400 300;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "elm.text";
-            type: TEXTBLOCK;
-            scale: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               text {
-                  style: "test_class_style";
-               }
-            }
-         }
-      }
-   }
-   group { name: "layout3";
-      parts {
-         part { name: "bg";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 4000 4000;
-               color: 0 255 0 100;
-            }
-         }
-         part { name: "swallow";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 100 100;
-               rel1.relative: 0.3 0.3;
-               rel2.relative: 0.325 0.325;
-            }
-         }
-      }
-   }
-   group { name: "image_align";
-      parts {
-         part { name: "color";
-            type: RECT;
-            description { state: "default" 0.0;
-               rel1.to: "swallow";
-               rel2.to: "swallow";
-               color: 255 0 0 50;
-            }
-         }
-         part { name: "swallow";
-            type: SWALLOW;
-            description { state: "default" 0.0;
-               rel1.relative: 0.1 0.1;
-               rel2.relative: 0.9 0.9;
-            }
-         }

-      }
-   }
-   group { "efl_ui_popup_scroll_content";
-      parts {
-         rect { "base";
-            desc { "default";
-               min: 200 200;
-               color: 255 0 0 255;
-            }
-         }
-         rect { "top";
-            desc { "default";
-               fixed: 0 1;
-               min: 100 20;
-               color: 255 255 0 255;
-               rel1.to: "base";
-               rel2.to: "base";
-               rel2.relative: 1.0 0.0;
-               align: 0.5 0;
-            }
-         }
-         rect { "bottom";
-            desc { "default";
-              fixed: 0 1;
-              min: 100 20;
-              color: 255 255 0 255;
-              rel1.to: "base";
-              rel2.to: "base";
-              rel1.relative: 0.0 1.0;
-              align: 0.5 1.0;
-           }
-         }
-      }
-   }
-   group { "efl_ui_popup_anchor_layout";
-      parts {
-         spacer { "base";
-            desc { "default";
-            }
-         }
-         swallow { "anchor1";
-            scale;
-            desc { "default";
-               rel.to: "base";
-               rel1.relative: 0.15 0.25;
-               rel2.relative: 0.15 0.25;
-               fixed: 1 1;
-               min: 50 50;
-            }
-         }
-         swallow { "anchor2";
-            scale;
-            desc { "default";
-               rel.to: "base";
-               rel1.relative: 0.75 0.15;
-               rel2.relative: 0.75 0.15;
-               fixed: 1 1;
-               min: 50 50;
-            }
-         }
-         swallow { "anchor3";
-            scale;
-            desc { "default";
-               rel.to: "base";
-               rel1.relative: 0.25 0.85;
-               rel2.relative: 0.25 0.85;
-               fixed: 1 1;
-               min: 50 50;
-            }
-         }
-         swallow { "anchor4";
-            scale;
-            desc { "default";
-               rel.to: "base";
-               rel1.relative: 0.85 0.75;
-               rel2.relative: 0.85 0.75;
-               fixed: 1 1;
-               min: 50 50;
-            }
-         }
-         swallow { "anchor5";
-            scale;
-            desc { "default";
-               rel.to: "base";
-               rel1.relative: 0.45 0.35;
-               rel2.relative: 0.45 0.35;
-               fixed: 1 1;
-               min: 50 50;
-            }
-         }
-         swallow { "anchor6";
-            scale;
-            desc { "default";
-               rel.to: "base";
-               rel2.relative: 0.0 0.0;
-               rel1.offset: 150 300;
-               rel2.offset: 200 350;
-               fixed: 1 1;
-            }
-         }
-         swallow { "anchor_none";
-            scale;
-            desc { "default";
-               rel.to: "base";
-               rel1.relative: 0.60 0.45;
-               rel2.relative: 0.60 0.45;
-               fixed: 1 1;
-               min: 70 50;
-            }
-         }
-      }
-   }
-   group { "focus_test_6";
-      parts {
-         rect { "list_bg";
-            description { state: "default";
-               color: 200 0 0 100;
-               rel1.to: "list_swallow";
-               rel2.to: "list_swallow";
-            }
-         }
-         rect { "box_bg";
-            description { state: "default";
-               color: 0 200 0 100;
-               rel1.to: "box";
-               rel2.to: "box";
-            }
-         }
-         box { "box";
-            description { state: "default";
-               rel1.relative: 0.0 0.0;
-               rel2.relative: 1.0 0.1;
-               box {
-                  layout: "horizontal";
-                  padding: 4 4;
-                  align: 1.0 0.5;
-                  min: 1 0;
-               }
-            }
-         }
-         swallow { "list_swallow"; 
-            description { state: "default";
-               rel1.relative: 0.0 0.2;
-               rel2.relative: 0.5 1.0;
-            }
-         }
-         swallow { "label_swallow"; 
-            description { state: "default";
-               rel1.relative: 0.0 0.1;
-               rel2.relative: 1.0 0.2;
-            }
-         }
-      }
-   }
 }
--- a/data/elementary/objects/test_external.edc
+++ b/data/elementary/objects/test_external.edc
@ -81,7 +81,7 @@ collections {
               align: 0.5 0.0;
               params {
                  string: "label" "<b>Label and Buttons are edje externals</>\
-<br>Click buttons to perform edje animations.";
+<br>Click buttons to perform edje animations.<br><b>BUG</>: disabled style.";
               }
            }
         }
@ -95,7 +95,7 @@ collections {
               rel1.offset: 0 60;
               params {
                  string: "label" "icon + label";
-                  string: "icon" "user-home";
+                  string: "icon" "home";
               }
            }
         }
@ -121,7 +121,7 @@ collections {
               align: 0.5 0.0;
               rel1.offset: 0 180;
               params {
-                  string: "icon" "user-home";
+                  string: "icon" "home";
               }
            }
            description { state: "left" 0.0;
@ -157,7 +157,7 @@ collections {
               rel1.offset: 0 300;
               params {
                  string: "label" "disabled";
-                  string: "icon" "user-home";
+                  string: "icon" "home";
                  bool: "disabled" 1;
               }
            }
@ -215,7 +215,7 @@ collections {
               rel1.offset: 0 60;
               params {
                  string: "label" "Horizontal";
-                  string: "icon" "user-home";
+                  string: "icon" "home";
                  string: "unit format" "%.1f units";
                  string: "indicator format" "%.0f";
                  double: "min" -100.0;
@ -233,7 +233,7 @@ collections {
               rel1.offset: 0 90;
               params {
                  string: "label" "Disabled";
-                  string: "icon" "user-home";
+                  string: "icon" "home";
                  bool: "disabled" 1;
                  double: "value" 0.5;
               }
@ -263,7 +263,7 @@ collections {
               rel1.offset: 20 160;
               params {
                  string: "label" "Horizontal";
-                  string: "icon" "user-home";
+                  string: "icon" "home";
                  bool: "horizontal" 0;
                  string: "unit format" "%.0f u";
                  string: "indicator format" "%.3f";
@ -286,7 +286,7 @@ collections {
               rel1.offset: 80 160;
               params {
                  string: "label" "Inverted";
-                  string: "icon" "user-home";
+                  string: "icon" "home";
                  bool: "horizontal" 0;
                  bool: "inverted" 1;
                  string: "unit format" "%.0f u";
@ -310,7 +310,7 @@ collections {
               rel1.offset: 140 160;
               params {
                  string: "label" "Disabled";
-                  string: "icon" "user-home";
+                  string: "icon" "home";
                  double: "min" -70.0;
                  double: "max" 70.0;
                  bool: "disabled" 1;
@ -459,7 +459,8 @@ collections {
               max: 200 50;
               align: 0.5 0.0;
               params {
-                  string: "label" "<b>All the Widgets and the Interaction are pure edje</>";
+                  string: "label" "<b>All the Widgets and the Interaction are pure edje</>\
+<br>This is not a real test, just an experiment<br><b>BUG</>: clip issue, slider drag, lots of warning, ...";
               }
            }
         }
@ -601,7 +602,7 @@ embryo script and from C code.";
               rel1.offset: 0 140;
               params {
                  string: "label" "inverted";
-                  string: "icon" "user-home";
+                  string: "icon" "home";
                  bool: "inverted" 1;
                  string: "unit format" "%.3f units";
               }
@ -650,7 +651,7 @@ embryo script and from C code.";
               rel2.offset: 0 -50;
               params {
                  string: "label" "inverted";
-                  string: "icon" "user-home";
+                  string: "icon" "home";
                  bool: "horizontal" 0;
                  bool: "inverted" 1;
                  bool: "disabled" 1;
@ -734,18 +735,6 @@ embryo script and from C code.";
         }
         program { name: "disable_button3";
            action: PARAM_SET "ext_button3" "disabled" 1;
-            after: "start_pulsing1";
-         }
-         program { name: "start_pulsing1";
-            action: PARAM_SET "ext_pbar2" "pulsing" 1;
-            after: "start_pulsing2";
-         }
-         program { name: "start_pulsing2";
-            action: PARAM_SET "ext_pbar5" "pulsing" 1;
-            after: "start_pulsing3";
-         }
-         program { name: "start_pulsing3";
-            action: PARAM_SET "ext_pbar7" "pulsing" 1;
            after: "anim_0";
         }
         program { name: "anim_0";
@ -812,18 +801,6 @@ embryo script and from C code.";
         }
         program { name: "reenable_button3";
            action: PARAM_SET "ext_button3" "disabled" 0;
-            after: "stop_pulsing1";
-         }
-         program { name: "stop_pulsing1";
-            action: PARAM_SET "ext_pbar2" "pulsing" 0;
-            after: "stop_pulsing2";
-         }
-         program { name: "stop_pulsing2";
-            action: PARAM_SET "ext_pbar5" "pulsing" 0;
-            after: "stop_pulsing3";
-         }
-         program { name: "stop_pulsing3";
-            action: PARAM_SET "ext_pbar7" "pulsing" 0;
         }
         script {
            public my_value;
@ -842,9 +819,6 @@ embryo script and from C code.";
                  external_param_set_bool(PART:"ext_button1", "disabled", 0);
                  external_param_set_bool(PART:"ext_button2", "disabled", 0);
                  external_param_set_bool(PART:"ext_button3", "disabled", 0);
-                  external_param_set_bool(PART:"ext_pbar2", "pulsing", 0);
-                  external_param_set_bool(PART:"ext_pbar5", "pulsing", 0);
-                  external_param_set_bool(PART:"ext_pbar7", "pulsing", 0);
               }
            }
         }
@ -856,9 +830,6 @@ embryo script and from C code.";
               external_param_set_bool(PART:"ext_button1", "disabled", 1);
               external_param_set_bool(PART:"ext_button2", "disabled", 1);
               external_param_set_bool(PART:"ext_button3", "disabled", 1);
-               external_param_set_bool(PART:"ext_pbar2", "pulsing", 1);
-               external_param_set_bool(PART:"ext_pbar5", "pulsing", 1);
-               external_param_set_bool(PART:"ext_pbar7", "pulsing", 1);
               timer_cb(0);
            }
         }
@ -1057,188 +1028,4 @@ embryo script and from C code.";
         }
      }
   }
-   group { name: "external/icon";
-      parts {
-         COMMON_EXTERNAL_UNDER
-         part { name: "icon_1"; type: EXTERNAL;
-            source: "elm/icon";
-            clip_to: "clip";
-            description { state: "default" 0.0;
-               align: 0.0 0.0;
-               min: 64 64;
-               max: 64 64;
-               fixed: 1 1;
-               params {
-                  string: "icon" "user-trash";
-                  bool: "smooth" 1;
-               }
-               map {
-                  on: 1;
-                  smooth: 1;
-                  rotation.center: "icon_1";
-               }
-            }
-            description { state: "rotate" 0.0;
-               inherit: "default" 0.0;
-               map.rotation.z: 360.0;
-            }
-         }
-         part { name: "icon_3_bg"; type: RECT;
-            clip_to: "clip";
-            description { state: "default" 0.0;
-               color: 255 0 0 127;
-               rel1.relative: 0.0 0.5;
-               rel2.relative: 0.5 1.0;
-            }
-            description { state: "anim" 0.0;
-               inherit: "default" 0.0;
-               rel1.relative: 0.5 0.5;
-               rel2.relative: 0.5 0.5;
-            }
-         }
-         part { name: "icon_3"; type: EXTERNAL;
-            source: "elm/icon";
-            clip_to: "clip";
-            description { state: "default" 0.0;
-               rel.to: "icon_3_bg";
-               params {
-                  string: "icon" "view-refresh";
-                  bool: "scale up" 0;
-                  bool: "scale down" 0;
-               }
-            }
-         }
-         part { name: "info3"; type: TEXT;
-            description { state: "default" 0.0;
-               clip_to: "clip";
-               rel1.relative: 0.0 0.9;
-               text {
-                  text: "ScaleUp:0 ScaleDown:0";
-                  size: 10;
-                  align: 0.0 1.0;
-               }
-            }
-         }
-         part { name: "icon_2"; type: EXTERNAL;
-            source: "elm/icon";
-            clip_to: "clip";
-            description { state: "default" 0.0;
-               rel1.relative: 0.9 0.9;
-               align: 0.0 0.0;
-               params {
-                  string: "icon" "folder";
-                  bool: "scale up" 1;
-                  bool: "scale down" 1;
-               }
-            }
-            description { state: "anim" 0.0;
-               inherit: "default" 0.0;
-               rel1.relative: 0.2 0.2;
-            }
-         }
-         part { name: "info2"; type: TEXT;
-            description { state: "default" 0.0;
-               clip_to: "clip";
-               rel1.relative: 0.5 0.9;
-               text {
-                  align: 1.0 1.0;
-                  text: "ScaleUp:1 ScaleDown:1";
-                  size: 10;
-               }
-            }
-         }
-         part { name: "icon_4"; type: EXTERNAL;
-            source: "elm/icon";
-            clip_to: "clip";
-            description { state: "default" 0.0;
-               rel1.relative: 0.5 0.0;
-               rel2.relative: 1.0 0.5;
-               params {
-                  string: "icon" "user-bookmarks";
-               }
-            }
-         }
-         COMMON_EXTERNAL_OVER
-      }
-
-      programs {
-         COMMON_EXTERNAL_PROGRAM
-         program { signal: "elm_test,animations,start"; source: "elm_test";
-            after: "rotate_icon1";
-            after: "animate_icon2";
-            after: "animate_icon3";
-         }
-         program { name: "rotate_icon1";
-            action: STATE_SET "rotate" 0.0;
-            target: "icon_1";
-            transition: LINEAR 2.0;
-            after: "loop_rotate";
-         }
-         program { name: "loop_rotate";
-            action: STATE_SET "default" 0.0;
-            target: "icon_1";
-            after: "rotate_icon1";
-         }
-         program { name: "animate_icon2";
-            action: STATE_SET "anim" 0.0;
-            transition: ACCELERATE 4.0;
-            target: "icon_2";
-            after: "loop_animate";
-         }
-         program { name: "loop_animate";
-            action: STATE_SET "default" 0.0;
-            transition: DECELERATE 4.0;
-            target: "icon_2";
-            after: "animate_icon2";
-         }
-         program { name: "animate_icon3";
-            action: STATE_SET "anim" 0.0;
-            transition: ACCELERATE 4.0;
-            target: "icon_3_bg";
-            after: "loop_animate3";
-         }
-         program { name: "loop_animate3";
-            action: STATE_SET "default" 0.0;
-            transition: DECELERATE 4.0;
-            target: "icon_3_bg";
-            after: "animate_icon3";
-         }
-
-      }
-   }
-   group { name: "external/combobox";
-      parts {
-         COMMON_EXTERNAL_UNDER
-         part { name: "combobox"; type: EXTERNAL;
-            source: "elm/combobox";
-            clip_to: "clip";
-            description { state: "default" 0.0;
-               rel2.relative: 1.0 0.0;
-               align: 0.5 0.0;
-               params {
-                  string: "guide" "Widgets";
-               }
-            }
-         }
-         part { name: "info"; type: TEXT;
-            clip_to: "clip";
-            description { state: "default" 0.;
-               rel1 {
-                  to: "combobox";
-                  relative: 0.0 1.0;
-               }
-               text {
-                  text: "";
-                  font: "Sans";
-                  size: 24;
-                  align: 0.5 1.0;
-               }
-            }
-         }
-         COMMON_EXTERNAL_OVER
-      }
-      programs {
-         COMMON_EXTERNAL_PROGRAM
-      }
-   }
 }
--- a/data/elementary/objects/test_focus_style.edc
+++ b/data/elementary/objects/test_focus_style.edc
@ -434,8 +434,6 @@ collections {
      }
   } //group ends

-#include "../../../data/elementary/themes/snd.edc"
-#include "../../../data/elementary/themes/ic.edc"
 #include "../../../data/elementary/themes/macros.edc"
 #include "../../../data/elementary/themes/fonts.edc"
 #include "../../../data/elementary/themes/colorclasses.edc"
--- a/data/elementary/objects/test_masking.edc
+++ b/data/elementary/objects/test_masking.edc
@ -1,125 +0,0 @@
-collections {
-   images {
-      image: "roundedrect.png" COMP;
-   }
-   filters {
-      filter { name: "aura";
-         script {
-            padding_set { 5 }
-            fill { color = '#2228' }
-            blur { 5, color = 'red' }
-            blur { 2, color = 'orange' }
-            blend {}
-         }
-      }
-   }
-   group { "image";
-     parts {
-         image { "mask";
-            desc { "default";
-               image {
-                  normal: "roundedrect.png";
-                  border: 22 22 22 22;
-               }
-            }
-         }
-     }
-   }
-   group { "masking";
-         styles {
-           style { name: "textblock_style";
-              base: "font=Sans-Bold font_size=24 wrap=word color=#ffffffff";
-           }
-         }
-      parts {
-         rect { "clip"; norender; }
-         image { "mask";
-            norender;
-            desc { "default";
-               image {
-                  normal: "roundedrect.png";
-                  border: 22 22 22 22;
-               }
-            }
-         }
-         textblock { "textmask";
-            norender;
-            desc {
-               text {
-                  style: "textblock_style";
-                  ellipsis: -1;
-                  text:
-          "Lorem ipsum dolor sit amet, consectetur adipiscing elit, "
-          "sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. "
-          "Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris "
-          "nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in "
-          "reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla "
-          "pariatur. Excepteur sint occaecat cupidatat non proident, sunt in "
-          "culpa qui officia deserunt mollit anim id est laborum.";
-               }
-            }
-         }
-         swallow { "mask2";
-            norender;
-         }
-         swallow { "content";
-            desc { "default";
-               clip_to: "mask";
-            }
-            desc { "smartclip";
-               clip: "mask2";
-            }
-            desc { "textclip";
-               clip: "textmask";
-            }
-            desc { "unclipped";
-               clip_to: "clip";
-            }
-         }
-      }
-      programs {
-         program {
-            signal: "unclip";
-            source: "*";
-            action: STATE_SET "unclipped";
-            target: "content";
-         }
-         program {
-            signal: "clip";
-            source: "*";
-            action: STATE_SET "default";
-            target: "content";
-         }
-         program {
-            signal: "smartclip";
-            source: "*";
-            action: STATE_SET "smartclip";
-            target: "content";
-         }
-         program {
-            signal: "textclip";
-            source: "*";
-            action: STATE_SET "textclip";
-            target: "content";
-         }
-      }
-   }
-   group { "text";
-      parts {
-         text { "text";
-            desc { "default";
-               text {
-                  font: "Sans";
-                  size: 32;
-                  text: "HELLO";
-                  ellipsis: -1;
-               }
-               fixed: 1 1;
-               filter.code: "aura";
-               rel1.offset: -5 -5;
-               rel2.offset: 4 4;
-            }
-         }
-      }
-   }
-}
--- a/data/elementary/objects/test_pager.edc
+++ b/data/elementary/objects/test_pager.edc
@ -1,96 +0,0 @@
-collections {
-   group {
-      name: "pager";
-      parts {
-         rect { "bg";
-            desc { "default";
-               color: 0 0 0 0;
-            }
-         }
-         swallow { "pager";
-            desc { "default";
-            }
-         }
-         swallow { "prev_btn";
-            desc { "default";
-               rel1.relative: 0.0 0.5;
-               rel1.offset: 10 0;
-               rel2.relative: 0.0 0.5;
-               rel2.offset: 10 0;
-               align: 0.0 0.5;
-               min: 30 30;
-            }
-         }
-         swallow { "next_btn";
-            desc { "default";
-               rel1.relative: 1.0 0.5;
-               rel1.offset: -10 0;
-               rel2.relative: 1.0 0.5;
-               rel2.offset: -10 0;
-               align: 1.0 0.5;
-               min: 30 30;
-            }
-         }
-      }
-   }
-   group {
-      name: "page";
-      parts {
-         rect { "bg";
-            desc { "default";
-            }
-         }
-         text { "tl";
-            desc { "default";
-               rel1.relative: 0 0;
-               rel2.relative: 0 0;
-               align: 0 0;
-               color: 0 0 0 255;
-               text { size: 10;
-                  min: 1 1;
-               }
-            }
-         }
-         text { "tr";
-            desc { "default";
-               rel1.relative: 1 0;
-               rel2.relative: 1 0;
-               align: 1 0;
-               color: 0 0 0 255;
-               text { size: 10;
-                  min: 1 1;
-               }
-            }
-         }
-         text { "bl";
-            desc { "default";
-               rel1.relative: 0 1;
-               rel2.relative: 0 1;
-               align: 0 1;
-               color: 0 0 0 255;
-               text { size: 10;
-                  min: 1 1;
-               }
-            }
-         }
-         text { "br";
-            desc { "default";
-               rel1.relative: 1 1;
-               rel2.relative: 1 1;
-               align: 1 1;
-               color: 0 0 0 255;
-               text { size: 10;
-                  min: 1 1;
-               }
-            }
-         }
-         text { "text";
-            desc { "default";
-               color: 0 0 0 255;
-               text { size: 20;
-               }
-            }
-         }
-      }
-   }
-}
--- a/data/elementary/objects/test_tab_pager.edc
+++ b/data/elementary/objects/test_tab_pager.edc
@ -1,59 +0,0 @@
-collections {
-   group { "tab_page_layout";
-      parts {
-         spacer { "base";
-            scale;
-            desc { "default";
-            }
-         }
-         swallow { "menu";
-            scale;
-            desc { "default";
-               rel.to: "base";
-               align: 0 0;
-               min: 200 0;
-               max: 200 -1;
-               fixed: 0 1;
-            }
-         }
-         rect { "separator";
-            scale;
-            desc { "default";
-               rel.to: "menu";
-               rel1.relative: 1 0;
-               align: 0 0;
-               min: 1 0;
-               max: 1 -1;
-               fixed: 0 1;
-               color: 75 75 75 255;
-            }
-         }
-         swallow { "tab_pager";
-            scale;
-            desc { "default";
-               rel1.to: "separator";
-               rel2.to: "base";
-               rel1.relative: 1 0;
-            }
-         }
-      }
-   }
-   group { "page_layout";
-      parts {
-         spacer { "base";
-            scale;
-            desc { "default";
-            }
-         }
-         text { "text";
-            scale;
-            desc { "default";
-               rel.to: "base";
-               align: 0.5 0.5;
-               color: 255 255 255 255;
-               text.size: 20;
-            }
-         }
-      }
-   }
-}
--- a/data/elementary/objects/test_tooltip.edc
+++ b/data/elementary/objects/test_tooltip.edc
@ -1,41 +0,0 @@
-collections {
-   group { "elm/tooltip/base/nomin";
-      /* Copied from default theme */
-      data.item: "pad_x" "10";
-      data.item: "pad_y" "10";
-      data.item: "pad_border_x" "1";
-      data.item: "pad_border_y" "1";
-      data.item: "hide_timeout" "0.35";
-      data.item: "transparent" "enabled";
-      parts {
-         rect { "base";
-            desc { "";
-               color: 32 32 32 255;
-            }
-         }
-         rect { "outside";
-            desc { "";
-               rel1.offset: -60 -20;
-               rel2.offset: 59 19;
-               color: 32 64 96 128;
-            }
-         }
-         text { "info";
-            desc { "";
-               text {
-                  font: "Sans";
-                  size: 10;
-                  text: "No Min Size";
-               }
-               rel1.offset: -60 -20;
-               rel2.offset: 59 19;
-               color: 255 255 255 255;
-            }
-         }
-         swallow { "elm.swallow.content";
-            desc { "";
-            }
-         }
-      }
-   }
-}
--- a/data/elementary/themes/Makefile.am
+++ b/data/elementary/themes/Makefile.am
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
--- a/data/elementary/themes/default.edc
+++ b/data/elementary/themes/default.edc
@ -1,31 +1,28 @@
-efl_version: 1 25;
-
 #include "macros.edc"

 externals.external: "elm";

 // theme api version. from 1.10 on we will check version to avoid
 // compat issues
-data.item: "version" "125";
-data.item: "efl_theme_base" "dark";
+data.item: "version" "110";

 collections {
-
-#include "snd.edc"
-#include "ic.edc"
-
 #include "fonts.edc"
 #include "colorclasses.edc"

 // elm
 #include "edc/elm/bg.edc"
 #include "edc/elm/button.edc"
+#include "edc/elm/nstate.edc"
+// XXX: mobile mode needs invisible scrollers... make signals that do this
 #include "edc/elm/scroller.edc"
+// XXX: mobile mode needs different entry setup
 #include "edc/elm/entry.edc"
 #include "edc/elm/frame.edc"
 #include "edc/elm/label.edc"
 #include "edc/elm/separator.edc"
 #include "edc/elm/check.edc"
+#include "edc/elm/slider.edc"
 #include "edc/elm/radio.edc"
 #include "edc/elm/bubble.edc"
 #include "edc/elm/panes.edc"
@ -39,7 +36,7 @@ collections {
 #include "edc/elm/access.edc"
 #include "edc/elm/photo.edc"
 #include "edc/elm/focus.edc"
-#include "edc/elm/uiclock.edc"
+#include "edc/elm/datetime.edc"
 #include "edc/elm/player.edc"
 #include "edc/elm/thumb.edc"
 #include "edc/elm/pointer.edc"
@ -68,16 +65,38 @@ collections {
 #include "edc/elm/panel.edc"
 #include "edc/elm/popup.edc"
 #include "edc/elm/border.edc"
+// XXX: min size calc problems - too wide! ... err ok on my 32bit box... eh?
 #include "edc/elm/spinner.edc"
 #include "edc/elm/menu.edc"
 #include "edc/elm/clock.edc"
 #include "edc/elm/gengrid.edc"
 #include "edc/elm/hover.edc"
 #include "edc/elm/cursor.edc"
-#include "edc/elm/code.edc"
-#include "edc/elm/textpath.edc"
-#include "edc/elm/slider.edc"

+// desktop in general
+#include "edc/wallpaper.edc"
+#include "edc/comp.edc"
+#include "edc/comp_compat.edc"
+#include "edc/comp_effects.edc"
+#include "edc/background.edc"
+#include "edc/bryce.edc"
+#include "edc/bryce_editor.edc"
+#include "edc/shelf.edc"
+#include "edc/border.edc"
+#include "edc/dialog.edc"
+#include "edc/conf.edc"
+#include "edc/gadman.edc"
+#include "edc/syscon.edc"
+#include "edc/pointer.edc"
+#include "edc/sys.edc"
+#include "edc/winlist.edc"
+#include "edc/desklock.edc"
+#include "edc/deskmirror.edc"
+#include "edc/wizard.edc"
+#include "edc/init.edc"
+#include "edc/about-e.edc"
+#include "edc/about-theme.edc"
+#include "edc/transitions.edc"

 // widgets
 #include "edc/menu.edc"
@ -100,28 +119,6 @@ collections {
 #include "edc/cslider.edc"
 #include "edc/spectrum.edc"

-// desktop in general
-#include "edc/wallpaper.edc"
-#include "edc/comp.edc"
-#include "edc/comp_compat.edc"
-#include "edc/comp_effects.edc"
-#include "edc/background.edc"
-#include "edc/shelf.edc"
-#include "edc/border.edc"
-#include "edc/dialog.edc"
-#include "edc/conf.edc"
-#include "edc/gadman.edc"
-#include "edc/syscon.edc"
-#include "edc/pointer.edc"
-#include "edc/winlist.edc"
-#include "edc/desklock.edc"
-#include "edc/deskmirror.edc"
-#include "edc/wizard.edc"
-#include "edc/init.edc"
-#include "edc/about-e.edc"
-#include "edc/about-theme.edc"
-#include "edc/transitions.edc"
-
 // modules
 #include "edc/start.edc"
 #include "edc/pager.edc"
@ -146,53 +143,15 @@ collections {
 #include "edc/evrything.edc"
 #include "edc/illume.edc"
 #include "edc/bluez4.edc"
-#include "edc/bluez5.edc"
 #include "edc/packagekit.edc"
-#include "edc/tiling.edc"
-#include "edc/procstats.edc"
+#include "edc/wireless.edc"
+#include "edc/time.edc"

 // icons
 #include "edc/icons.edc"
 #include "edc/border-icons.edc"

-// New efl ui themes
-#include "edc/efl/macros.edc"
-#include "edc/efl/bg.edc"
-#include "edc/efl/button.edc"
-#include "edc/efl/calendar.edc"
-#include "edc/efl/navigation_bar.edc"
-#include "edc/efl/navigation_layout.edc"
-#include "edc/efl/scroller.edc"
-#include "edc/efl/list.edc"
-#include "edc/efl/grid.edc"
-#include "edc/efl/text.edc"
-#include "edc/efl/frame.edc"
-#include "edc/efl/check.edc"
-#include "edc/efl/slider.edc"
-#include "edc/efl/radio.edc"
-#include "edc/efl/panes.edc"
-#include "edc/efl/popup.edc"
-#include "edc/efl/video.edc"
-#include "edc/efl/focus.edc"
-#include "edc/efl/tags.edc"
-#include "edc/efl/panel.edc"
-#include "edc/efl/tooltip.edc"
-#include "edc/efl/image_zoomable.edc"
-#include "edc/efl/progress.edc"
-#include "edc/efl/border.edc"
-#include "edc/efl/spin.edc"
-#include "edc/efl/spin_button.edc"
-#include "edc/efl/datepicker.edc"
-#include "edc/efl/timepicker.edc"
-#include "edc/efl/cursor.edc"
-#include "edc/efl/pointer.edc"
-#include "edc/efl/textpath.edc"
-#include "edc/efl/win.edc"
-#include "edc/efl/uiclock.edc"
-#include "edc/efl/spotlight.edc"
-#include "edc/efl/tab_pager.edc"
-#include "edc/efl/tab_bar.edc"
-#include "edc/efl/tab_page.edc"
-#include "edc/efl/collection.edc"
-#include "edc/efl/group_item.edc"
+// port unchanged stuff so this can work as a replacement
+#include "edc/O/efm_icons.edc"
+#include "edc/O/icons.edc"
 }
--- a/data/elementary/themes/edc/O/efm_icons.edc
+++ b/data/elementary/themes/edc/O/efm_icons.edc
@ -0,0 +1,470 @@
+// EFM icons //
+
+//Base 1//
+
+#define EFM_MIME_ICON(_NAME, _IMAGE, _ASPMIN, _ASPMAX, _STRING, _SIZE, _VALIGN) \
+   group { name: "e/icons/fileman/mime/"_NAME; \
+      max: _SIZE _SIZE; \
+      images.image: "efm_generic_icon_shadow.png" COMP; \
+      images.image: "efm_generic_icon_base.png" COMP; \
+      images.image: "efm_generic_icon_over.png" COMP; \
+      images.image: _IMAGE COMP; \
+      parts { \
+         part { name: "spacer"; type: SPACER; \
+            description { state: "default" 0.0; \
+               aspect: 1.0 1.0; aspect_preference: BOTH; \
+            } \
+         } \
+         part { name: "shadow"; mouse_events: 0; \
+            description { state: "default" 0.0; \
+               rel1.to: "spacer"; \
+               rel1.relative: (15/240) (10/240); \
+               rel2.to: "spacer"; \
+               rel2.relative: (225/240) (240/240); \
+               image.normal: "efm_generic_icon_shadow.png"; \
+            } \
+         } \
+         part { name: "base"; mouse_events: 0; \
+            description { state: "default" 0.0; \
+               rel1.to: "spacer"; \
+               rel1.relative: (30/240) (15/240); \
+               rel2.to: "spacer"; \
+               rel2.relative: (210/240) (225/240); \
+               image.normal: "efm_generic_icon_base.png"; \
+            } \
+         } \
+         part { name: "content"; mouse_events: 0; \
+            description { state: "default" 0.0; \
+               rel1.to: "base"; \
+               rel1.relative: (28/180) (28/210); \
+               rel2.to: "base"; \
+               rel2.relative: (152/180) (182/210); \
+               align: 0.5 _VALIGN; \
+               aspect: _ASPMIN _ASPMAX; aspect_preference: BOTH; \
+               image.normal: _IMAGE; \
+            } \
+         } \
+         part { name: "over"; mouse_events: 0; \
+            description { state: "default" 0.0; \
+               rel1.to: "base"; \
+               rel2.to: "base"; \
+               image.normal: "efm_generic_icon_over.png"; \
+            } \
+         } \
+         part { name: "typestr"; type: TEXT; mouse_events: 0; \
+            description { state: "default" 0.0; \
+               rel1.to: "over"; \
+               rel1.relative: (72/180) (142/210); \
+               rel2.to: "over"; \
+               rel2.relative: (178/180) (188/210); \
+               color: 255 255 255 255; \
+               text { font: FN; size: 8; \
+                  fit: 0 1; \
+                  align: 0.5 0.5; \
+                  text: _STRING; \
+               } \
+            } \
+         } \
+      } \
+   }
+//Python//
+
+   EFM_MIME_ICON("application/x-python-bytecode", "efm_generic_icon_content_python.png", (114/115), (114/115), ".PYC", 240, 0.5);
+   EFM_MIME_ICON("application/x-python", "efm_generic_icon_content_python.png", (114/115), (114/115), ".PY", 240, 0.5);
+   EFM_MIME_ICON("text/x-python", "efm_generic_icon_content_python.png", (114/115), (114/115), ".PY", 240, 0.5);
+
+   //.pyo .pyd??????????????????//
+
+//Ruby//
+
+   EFM_MIME_ICON("application/x-ruby", "efm_generic_icon_content_ruby.png", (114/114), (114/114), ".RB", 240, 0.5);
+   EFM_MIME_ICON("text/x-ruby", "efm_generic_icon_content_ruby.png", (114/114), (114/114), ".RB", 240, 0.5);
+
+   //.rbw???//
+
+//Perl//
+
+   EFM_MIME_ICON("application/x-perl", "efm_generic_icon_content_perl.png", (114/122), (114/122), ".PERL", 240, 0.5);
+   EFM_MIME_ICON("text/x-perl","efm_generic_icon_content_perl.png", (114/122), (114/122), ".PL", 240, 0.5);
+
+//CAD//
+
+   EFM_MIME_ICON("application/acad", "efm_generic_icon_content_cad.png", (114/130), (114/130), ".DWG", 240, 0.5);
+   EFM_MIME_ICON("application/x-acad", "efm_generic_icon_content_cad.png", (114/130), (114/130), ".DWG", 240, 0.5);
+   EFM_MIME_ICON("application/autocad_dwg", "efm_generic_icon_content_cad.png", (114/130), (114/130), ".DWG", 240, 0.5);
+   EFM_MIME_ICON("image/x-dwg", "efm_generic_icon_content_cad.png", (114/130), (114/130), ".DWG", 240, 0.5);
+   EFM_MIME_ICON("application/dwg", "efm_generic_icon_content_cad.png", (114/130), (114/130), ".DWG", 240, 0.5);
+   EFM_MIME_ICON("application/x-dwg", "efm_generic_icon_content_cad.png", (114/130), (114/130), ".DWG", 240, 0.5);
+   EFM_MIME_ICON("application/x-autocad", "efm_generic_icon_content_cad.png", (114/130), (114/130), ".DWG", 240, 0.5);
+   EFM_MIME_ICON("image/vnd.dwg", "efm_generic_icon_content_cad.png", (114/130), (114/130), ".DWG", 240, 0.5);
+   EFM_MIME_ICON("drawing/dwg", "efm_generic_icon_content_cad.png", (114/130), (114/130), ".DWG", 240, 0.5);
+
+//ISO//
+
+   EFM_MIME_ICON("application/x-iso9660-image", "efm_generic_icon_content_iso.png", (114/114), (114/114), ".ISO", 240, 0.5);
+
+//Cue//
+
+   EFM_MIME_ICON("application/x-cue", "efm_generic_icon_content_iso.png", (114/114), (114/114), ".CUE", 240, 0.5);
+
+//Audio//
+
+   EFM_MIME_ICON("audio/mpeg", "efm_generic_icon_content_audio.png", (54/154), (54/154), ".MP3", 240, 0.5);
+   EFM_MIME_ICON("audio/x-wav","efm_generic_icon_content_audio.png", (54/154), (54/154), ".WAV", 240, 0.5);
+   EFM_MIME_ICON("audio/x-flac","efm_generic_icon_content_audio.png", (54/154), (54/154), ".FLAC", 240, 0.5);
+   EFM_MIME_ICON("audio/flac","efm_generic_icon_content_audio.png", (54/154), (54/154), ".FLAC", 240, 0.5);
+   EFM_MIME_ICON("audio/x-musepack","efm_generic_icon_content_audio.png", (54/154), (54/154), ".MPC", 240, 0.5);
+   EFM_MIME_ICON("audio/x-vorbis+ogg","efm_generic_icon_content_audio.png",(54/154), (54/154), ".OGG", 240, 0.5);
+   EFM_MIME_ICON("application/x-audacity-project","efm_generic_icon_content_audio.png",(54/154), (54/154), ".AUP", 240, 0.5);
+   EFM_MIME_ICON("audio/x-ms-wma","efm_generic_icon_content_audio.png", (54/154), (54/154),".WMA", 240, 0.5);
+   EFM_MIME_ICON("audio/opus","efm_generic_icon_content_audio.png", (54/154), (54/154),".OPUS", 240, 0.5);
+   EFM_MIME_ICON("audio/ogg","efm_generic_icon_content_audio.png", (54/154), (54/154),".OPUS", 240, 0.5);
+   EFM_MIME_ICON("audio/x-opus+ogg","efm_generic_icon_content_audio.png", (54/154), (54/154),".OPUS", 240, 0.5);
+   EFM_MIME_ICON("audio/ape","efm_generic_icon_content_audio.png", (54/154), (54/154), ".APE", 240, 0.5);
+   EFM_MIME_ICON("audio/webm","efm_generic_icon_content_audio.png", (54/154), (54/154), ".WEBA", 240, 0.5);
+   EFM_MIME_ICON("audio/mp4","efm_generic_icon_content_audio.png", (54/154), (54/154), ".MP4", 240, 0.5);
+   EFM_MIME_ICON("audio/midi","efm_generic_icon_content_audio.png", (54/154), (54/154),".MIDI", 240, 0.5);
+   EFM_MIME_ICON("audio/speex","efm_generic_icon_content_audio.png",(54/154), (54/154), ".SPX", 240, 0.5);
+   EFM_MIME_ICON("audio/aac","efm_generic_icon_content_audio.png", (54/154), (54/154),".AAC", 240, 0.5);
+   EFM_MIME_ICON("audio/vnd.rn-realaudio","efm_generic_icon_content_audio.png", (54/154), (54/154),".RA", 240, 0.5);
+   EFM_MIME_ICON("audio/x-voc","efm_generic_icon_content_audio.png", (54/154), (54/154),".VOC", 240, 0.5);
+   EFM_MIME_ICON("audio/x-tta","efm_generic_icon_content_audio.png", (54/154), (54/154),".TTA", 240, 0.5);
+   EFM_MIME_ICON("audio/x-stm","efm_generic_icon_content_audio.png", (54/154), (54/154),".STM", 240, 0.5);
+   EFM_MIME_ICON("audio/x-speex+ogg","efm_generic_icon_content_audio.png", (54/154), (54/154),".SPX", 240, 0.5);
+   EFM_MIME_ICON("audio/x-wacpack","efm_generic_icon_content_audio.png", (54/154), (54/154),".WV", 240, 0.5);
+   EFM_MIME_ICON("audio/x-xmf","efm_generic_icon_content_audio.png", (54/154), (54/154),".XMF", 240, 0.5);
+   EFM_MIME_ICON("audio/x-xm","efm_generic_icon_content_audio.png", (54/154), (54/154),".XM", 240, 0.5);
+   EFM_MIME_ICON("audio/x-xi","efm_generic_icon_content_audio.png", (54/154), (54/154),".XI", 240, 0.5);
+   EFM_MIME_ICON("audio/x-wacpack-correction","efm_generic_icon_content_audio.png", (54/154), (54/154),".WVC", 240, 0.5);
+   EFM_MIME_ICON("audio/x-s3m","efm_generic_icon_content_audio.png", (54/154), (54/154),".S3M", 240, 0.5);
+   EFM_MIME_ICON("audio/x-riff","efm_generic_icon_content_audio.png", (54/154), (54/154),".RMI", 240, 0.5);
+   EFM_MIME_ICON("audio/x-psflib","efm_generic_icon_content_audio.png", (54/154), (54/154),".PSFLIB", 240, 0.5);
+   EFM_MIME_ICON("audio/x-psf","efm_generic_icon_content_audio.png", (54/154), (54/154),".PSF", 240, 0.5);
+   EFM_MIME_ICON("audio/x-scpls","efm_generic_icon_content_audio.png", (54/154), (54/154),".PLS", 240, 0.5);
+   EFM_MIME_ICON("audio/x-ms-asx","efm_generic_icon_content_audio.png", (54/154), (54/154),".ASX", 240, 0.5);
+   EFM_MIME_ICON("audio/x-mpegurl","efm_generic_icon_content_audio.png", (54/154), (54/154),".M3U", 240, 0.5);
+   EFM_MIME_ICON("audio/x-mod","efm_generic_icon_content_audio.png", (54/154), (54/154),".MOD", 240, 0.5);
+   EFM_MIME_ICON("audio/x-mo3","efm_generic_icon_content_audio.png", (54/154), (54/154),".MO3", 240, 0.5);
+   EFM_MIME_ICON("audio/x-minipsf","efm_generic_icon_content_audio.png", (54/154), (54/154),".MINIPSF", 240, 0.5);
+   EFM_MIME_ICON("audio/matroska","efm_generic_icon_content_audio.png", (54/154), (54/154),".MKV", 240, 0.5);
+   EFM_MIME_ICON("audio/x-m4b","efm_generic_icon_content_audio.png", (54/154), (54/154),".M4B", 240, 0.5);
+   EFM_MIME_ICON("audio/x-it","efm_generic_icon_content_audio.png", (54/154), (54/154),".IT", 240, 0.5);
+   EFM_MIME_ICON("audio/x-iriver-pla","efm_generic_icon_content_audio.png", (54/154), (54/154),".PLA", 240, 0.5);
+   EFM_MIME_ICON("audio/x-gsm","efm_generic_icon_content_audio.png", (54/154), (54/154),".GSM", 240, 0.5);
+   EFM_MIME_ICON("audio/x-flac+ogg","efm_generic_icon_content_audio.png",(54/154), (54/154), ".FLAC", 240, 0.5);
+   EFM_MIME_ICON("audio/x-amzxml","efm_generic_icon_content_audio.png",(54/154), (54/154), ".AMZ", 240, 0.5);
+   EFM_MIME_ICON("audio/x-aiff","efm_generic_icon_content_audio.png",(54/154), (54/154), ".AIFF", 240, 0.5);
+   EFM_MIME_ICON("audio/x-aifc","efm_generic_icon_content_audio.png",(54/154), (54/154), ".AIFC", 240, 0.5);
+   EFM_MIME_ICON("audio/x-adpcm","efm_generic_icon_content_audio.png",(54/154), (54/154), ".ADPCM", 240, 0.5);
+   EFM_MIME_ICON("audio/vdn.rn-realaudio","efm_generic_icon_content_audio.png",(54/154), (54/154), ".RA", 240, 0.5);
+   EFM_MIME_ICON("audio/vdn.dts","efm_generic_icon_content_audio.png",(54/154), (54/154), ".DTS", 240, 0.5);
+   EFM_MIME_ICON("audio/vdn.dts.hd","efm_generic_icon_content_audio.png",(54/154), (54/154), ".DTSHD", 240, 0.5);
+   EFM_MIME_ICON("audio/prs.sid","efm_generic_icon_content_audio.png",(54/154), (54/154), ".SID", 240, 0.5);
+   EFM_MIME_ICON("audio/mp2","efm_generic_icon_content_audio.png", (54/154), (54/154), ".MP2", 240, 0.5);
+   EFM_MIME_ICON("audio/basic","efm_generic_icon_content_audio.png", (54/154), (54/154), ".SND", 240, 0.5);
+   EFM_MIME_ICON("audio/annodex","efm_generic_icon_content_audio.png", (54/154), (54/154), ".AXA", 240, 0.5);
+   EFM_MIME_ICON("audio/AMR","efm_generic_icon_content_audio.png", (54/154), (54/154), ".AMR", 240, 0.5);
+   EFM_MIME_ICON("audio/amr","efm_generic_icon_content_audio.png", (54/154), (54/154), ".AMR", 240, 0.5);
+   EFM_MIME_ICON("audio/amr-wb","efm_generic_icon_content_audio.png", (54/154), (54/154), ".AWB", 240, 0.5);
+   EFM_MIME_ICON("audio/AMR-WB","efm_generic_icon_content_audio.png", (54/154), (54/154), ".AWB", 240, 0.5);
+   EFM_MIME_ICON("audio/ac3","efm_generic_icon_content_audio.png", (54/154), (54/154), ".AC3", 240, 0.5);
+
+   EFM_MIME_ICON("application/x-mpegurl","efm_generic_icon_content_audio.png", (54/154), (54/154),".M3U", 240, 0.5);
+   EFM_MIME_ICON("application/vnd.apple.mpegurl","efm_generic_icon_content_audio.png", (54/154), (54/154),".M3U", 240, 0.5);
+
+//Code//
+
+   EFM_MIME_ICON("text/x-csrc","efm_generic_icon_content_code.png", (114/88), (114/88), ".C", 240, 0.3);
+   EFM_MIME_ICON("text/x-chdr","efm_generic_icon_content_code.png", (114/88), (114/88), ".H", 240, 0.3);
+   EFM_MIME_ICON("text/x-c++hdr","efm_generic_icon_content_code.png", (114/88), (114/88), ".HH", 240, 0.3);
+   EFM_MIME_ICON("text/x-c++src","efm_generic_icon_content_code.png", (114/88), (114/88), ".C++", 240, 0.3);
+   EFM_MIME_ICON("text/x-csharp","efm_generic_icon_content_code.png", (114/88), (114/88), ".C#", 240, 0.3);
+   EFM_MIME_ICON("application/x-awk","efm_generic_icon_content_code.png", (114/88), (114/88), ".AWK", 240, 0.3);
+   EFM_MIME_ICON("text/x-hdr","efm_generic_icon_content_code.png", (114/88), (114/88), ".HPP", 240, 0.3);
+   EFM_MIME_ICON("text/x-fortran","efm_generic_icon_content_code.png", (114/88), (114/88), ".F", 240, 0.3);
+   EFM_MIME_ICON("text/x-java-source","efm_generic_icon_content_code.png", (114/88), (114/88), ".JAVA", 240, 0.3);
+
+
+   //add moreeeeeee//
+
+//Text//   
+
+   EFM_MIME_ICON("text/x-patch","efm_generic_icon_content_text.png", (114/126), (114/126), ".PATCH", 240, 0.5);
+   EFM_MIME_ICON("text/plain","efm_generic_icon_content_text.png", (114/126), (114/126), ".TXT", 240, 0.5);
+   EFM_MIME_ICON("text/x-log","efm_generic_icon_content_text.png",  (114/126), (114/126), ".LOG", 240, 0.5);
+   EFM_MIME_ICON("application/x-md5","efm_generic_icon_content_text.png",  (114/126), (114/126), ".MD5", 240, 0.5);
+   EFM_MIME_ICON("text/x-makefile","efm_generic_icon_content_text.png",  (114/126), (114/126), ".MK", 240, 0.5);
+   EFM_MIME_ICON("application/x-m4","efm_generic_icon_content_text.png",  (114/126), (114/126), ".M4", 240, 0.5);
+   EFM_MIME_ICON("application/pkix-attr-cert","efm_generic_icon_content_text.png",  (114/126), (114/126), ".AC", 240, 0.5);
+   EFM_MIME_ICON("text/x-subviewer","efm_generic_icon_content_text.png",  (114/126), (114/126), ".SUB", 240, 0.5);
+   EFM_MIME_ICON("application/x-wais-source","efm_generic_icon_content_text.png",  (114/126), (114/126), ".SRC", 240, 0.5);
+
+//Web//
+
+   EFM_MIME_ICON("text/css","efm_generic_icon_content_web.png", (114/68), (114/68), ".CSS", 240, 0.3);
+   EFM_MIME_ICON("text/html","efm_generic_icon_content_web.png", (114/68), (114/68), ".HTML", 240, 0.3);
+   EFM_MIME_ICON("application/xml","efm_generic_icon_content_web.png", (114/68), (114/68), ".XML", 240, 0.3);
+   EFM_MIME_ICON("application/javascript","efm_generic_icon_content_web.png", (114/68), (114/68), ".JS", 240, 0.3);
+   EFM_MIME_ICON("application/json","efm_generic_icon_content_web.png", (114/68), (114/68), ".JSON", 240, 0.3);
+   EFM_MIME_ICON("text/json","efm_generic_icon_content_web.png", (114/68), (114/68), ".JSON", 240, 0.3);
+
+//Enlightenment//
+   
+   EFM_MIME_ICON("application/edje","efm_generic_icon_content_logo.png", (114/154), (114/154), ".EDJ", 240, 0.5);
+   EFM_MIME_ICON("text/edje","efm_generic_icon_content_logo.png", (114/154), (114/154), ".EDC", 240, 0.5);
+
+//Document//
+
+   EFM_MIME_ICON("application/vnd.oasis.opendocument.text","efm_generic_icon_content_doc.png", (114/154), (114/154), ".ODT", 240, 0.5);
+   EFM_MIME_ICON("application/x-msword","efm_generic_icon_content_doc.png", (114/154), (114/154), ".DOC", 240, 0.5);
+   EFM_MIME_ICON("application/vnd.openxmlformats-officedocument.wordprocessingml.document","efm_generic_icon_content_doc.png", (114/154), (114/154), ".DOCX", 240, 0.5);
+   EFM_MIME_ICON("application/x-abiword","efm_generic_icon_content_doc.png", (114/154), (114/154), ".ABW", 240, 0.5);
+   EFM_MIME_ICON("application/vnd.scribus","efm_generic_icon_content_doc.png", (114/154), (114/154), ".SLA", 240, 0.5);
+   EFM_MIME_ICON("application/x-lyx","efm_generic_icon_content_doc.png", (114/154), (114/154), ".LYX", 240, 0.5);
+
+//Spreadsheet//
+
+   EFM_MIME_ICON("application/vnd.oasis.opendocument.spreadsheet","efm_generic_icon_content_spread.png", (114/80), (114/80), ".ODS", 240, 0.5);
+   EFM_MIME_ICON("application/vnd.ms-excel","efm_generic_icon_content_spread.png", (114/80), (114/80), ".XLS", 240, 0.5);
+
+//Presentation//
+
+   EFM_MIME_ICON("application/vnd.ms-powerpoint","efm_generic_icon_content_pres.png", (114/95), (114/95), ".PPT", 240, 0.5);
+   EFM_MIME_ICON("application/vnd.oasis.opendocument.presentation","efm_generic_icon_content_pres.png", (114/95), (114/95), ".ODP", 240, 0.5);
+
+//Drawing//
+
+   EFM_MIME_ICON("application/x-vnd.oasis.opendocument.graphics","efm_generic_icon_content_draw.png", (114/96), (114/96), ".ODG", 240, 0.5);
+
+//Data Base//
+
+   EFM_MIME_ICON("application/vnd.ms-binder","efm_generic_icon_content_db.png", (114/128), (114/128), ".ODB", 240, 0.5);
+   EFM_MIME_ICON("application/x-sqlite3","efm_generic_icon_content_db.png", (114/128), (114/128), ".SQLITE", 240, 0.5);
+
+//Formula//
+
+   EFM_MIME_ICON("application/x-vnd.oasis.opendocument.formula","efm_generic_icon_content_formula.png", (114/85), (114/85), ".ODF", 240, 0.5);
+
+//Template//
+
+   EFM_MIME_ICON("application/vnd.openxmlformats-officedocument.wordprocessingml.template","efm_generic_icon_content_template.png", (114/130), (114/130), ".DOTX", 240, 0.5);
+   EFM_MIME_ICON("application/vnd.openxmlformats-officedocument.spreadsheetml.template","efm_generic_icon_content_template.png", (114/130), (114/130),".XLTX", 240, 0.5);
+   EFM_MIME_ICON("application/vnd.openxmlformats-officedocument.presentationml.template","efm_generic_icon_content_template.png", (114/130), (114/130),".POTX", 240, 0.5);
+   EFM_MIME_ICON("application/vnd.oasis.opendocument.chart-template","efm_generic_icon_content_template.png", (114/130), (114/130),".OTC", 240, 0.5);
+   EFM_MIME_ICON("application/vnd.oasis.opendocument.formula-template","efm_generic_icon_content_template.png", (114/130), (114/130), ".OTF", 240, 0.5);
+   EFM_MIME_ICON("application/vnd.oasis.opendocument.graphics-template","efm_generic_icon_content_template.png", (114/130), (114/130), ".OTG", 240, 0.5);
+   EFM_MIME_ICON("application/vnd.oasis.opendocument.image-template","efm_generic_icon_content_template.png", (114/130), (114/130), ".OTI", 240, 0.5);
+   EFM_MIME_ICON("application/vnd.oasis.opendocument.presentation-template","efm_generic_icon_content_template.png", (114/130), (114/130), ".OTP", 240, 0.5);
+   EFM_MIME_ICON("application/vnd.oasis.opendocument.spreadsheet-template","efm_generic_icon_content_template.png", (114/130), (114/130), ".ODS", 240, 0.5);
+   EFM_MIME_ICON("application/vnd.oasis.opendocument.text-template","efm_generic_icon_content_template.png",  (114/130), (114/130), ".OTT", 240, 0.5);
+
+//Video (fallback)//
+
+   EFM_MIME_ICON("video/mpeg","efm_generic_icon_content_video.png", (114/83), (114/83), ".MPEG", 240, 0.5);
+   EFM_MIME_ICON("application/ogg","efm_generic_icon_content_video.png",(114/83), (114/83), ".OGG", 240, 0.5);
+   EFM_MIME_ICON("video/x-theora+ogg","efm_generic_icon_content_video.png",(114/83), (114/83), ".OGG", 240, 0.5);
+   EFM_MIME_ICON("video/x-msvideo","efm_generic_icon_content_video.png", (114/83), (114/83), ".AVI", 240, 0.5);
+   EFM_MIME_ICON("video/ogg","efm_generic_icon_content_video.png",(114/83), (114/83), ".OGG", 240, 0.5);
+   EFM_MIME_ICON("video/mp4","efm_generic_icon_content_video.png",(114/83), (114/83), ".MP4", 240, 0.5);
+   EFM_MIME_ICON("video/quicktime","efm_generic_icon_content_video.png",(114/83), (114/83), ".MOV", 240, 0.5);
+   EFM_MIME_ICON("video/x-matroska","efm_generic_icon_content_video.png",(114/83), (114/83), ".MKV", 240, 0.5);
+   EFM_MIME_ICON("video/x-flv","efm_generic_icon_content_video.png", (114/83), (114/83), ".FLV", 240, 0.5);
+   EFM_MIME_ICON("application/vnd.rn-realmedia","efm_generic_icon_content_video.png",(114/83), (114/83), ".REAL", 240, 0.5);
+   EFM_MIME_ICON("video/x-ms-wmv","efm_generic_icon_content_video.png",(114/83), (114/83), ".WMV", 240, 0.5);
+   EFM_MIME_ICON("video/webm","efm_generic_icon_content_video.png",(114/83), (114/83), ".WEBM", 240, 0.5);
+
+
+//Image (fallback)//
+
+   EFM_MIME_ICON("image/png","efm_generic_icon_content_image.png", (114/128), (114/128), ".PNG", 240, 0.5);
+   EFM_MIME_ICON("image/jpeg","efm_generic_icon_content_image.png", (114/128), (114/128),".JPEG", 240, 0.5);
+   EFM_MIME_ICON("image/gif","efm_generic_icon_content_image.png", (114/128), (114/128),".GIF", 240, 0.5);
+   EFM_MIME_ICON("image/bmp","efm_generic_icon_content_image.png", (114/128), (114/128),".BMP", 240, 0.5);
+   EFM_MIME_ICON("application/x-xcf","efm_generic_icon_content_image.png", (114/128), (114/128),".XCF", 240, 0.5);
+   EFM_MIME_ICON("application/x-cbz","efm_generic_icon_content_image.png", (114/128), (114/128),".CBZ", 240, 0.5);
+   EFM_MIME_ICON("application/x-cbr","efm_generic_icon_content_image.png",(114/128), (114/128), ".CBR", 240, 0.5);
+   EFM_MIME_ICON("image/webp","efm_generic_icon_content_image.png", (114/128), (114/128),".WEBP", 240, 0.5);
+
+//Font//
+   
+   EFM_MIME_ICON("application/x-font-ttf","efm_generic_icon_content_font.png", (114/93), (114/93), ".TTF", 240, 0.5);
+   EFM_MIME_ICON("application/x-font-pcf","efm_generic_icon_content_font.png", (114/93), (114/93), ".PCF", 240, 0.5);
+   EFM_MIME_ICON("application/x-font-bdf","efm_generic_icon_content_font.png", (114/93), (114/93), ".BDF", 240, 0.5);
+   EFM_MIME_ICON("application/x-font-otf","efm_generic_icon_content_font.png", (114/93), (114/93), ".BDF", 240, 0.5);
+
+//PS (fallback)//
+   
+   EFM_MIME_ICON("application/postscript","efm_generic_icon_content_ps.png", (114/104), (114/104), ".PS", 240, 0.5);
+
+//PDF (fallback)//
+
+   EFM_MIME_ICON("application/pdf","efm_generic_icon_content_pdf.png", (114/101), (114/101), ".PDF", 240, 0.5);
+
+//Translate//
+
+   EFM_MIME_ICON("text/x-gettext-translation","efm_generic_icon_content_translate.png", (114/97), (114/97), ".PO", 240, 0.5);
+   EFM_MIME_ICON("application/x-gettext-translation","efm_generic_icon_content_translate.png", (114/97), (114/97), ".GMO", 240, 0.5);
+
+//Base 2//
+#define EFM_MIME_ICON_SIMPLE(_NAME, _IMAGE, _ASPMIN, _ASPMAX, _SIZE, _VALIGN) \
+   group { name: "e/icons/fileman/mime/"_NAME; \
+      max: _SIZE _SIZE; \
+      images.image: "efm_generic_icon_shadow_empty.png" COMP; \
+      images.image: "efm_generic_icon_base_empty.png" COMP; \
+      images.image: "efm_generic_icon_over_empty.png" COMP; \
+      images.image: _IMAGE COMP; \
+      parts { \
+         part { name: "spacer"; type: SPACER; \
+            description { state: "default" 0.0; \
+               aspect: 1.0 1.0; aspect_preference: BOTH; \
+            } \
+         } \
+         part { name: "shadow"; mouse_events: 0; \
+            description { state: "default" 0.0; \
+               rel1.to: "spacer"; \
+               rel1.relative: (15/240) (10/240); \
+               rel2.to: "spacer"; \
+               rel2.relative: (225/240) (240/240); \
+               image.normal: "efm_generic_icon_shadow_empty.png"; \
+            } \
+         } \
+         part { name: "base"; mouse_events: 0; \
+            description { state: "default" 0.0; \
+               rel1.to: "spacer"; \
+               rel1.relative: (30/240) (15/240); \
+               rel2.to: "spacer"; \
+               rel2.relative: (210/240) (225/240); \
+               image.normal: "efm_generic_icon_base_empty.png"; \
+            } \
+         } \
+         part { name: "content"; mouse_events: 0; \
+            description { state: "default" 0.0; \
+               rel1.to: "base"; \
+               rel1.relative: (28/180) (28/210); \
+               rel2.to: "base"; \
+               rel2.relative: (152/180) (182/210); \
+               align: 0.5 _VALIGN; \
+               aspect: _ASPMIN _ASPMAX; aspect_preference: BOTH; \
+               image.normal: _IMAGE; \
+            } \
+         } \
+         part { name: "over"; mouse_events: 0; \
+            description { state: "default" 0.0; \
+               rel1.to: "base"; \
+               rel2.to: "base"; \
+               image.normal: "efm_generic_icon_over_empty.png"; \
+            } \
+         } \
+      } \
+   }
+
+//Script//
+   
+   EFM_MIME_ICON_SIMPLE("application/x-shellscript","efm_generic_icon_content_script.png", (114/126), (114/126), 240, 0.5);
+
+//Executable//
+
+   EFM_MIME_ICON_SIMPLE("application/x-executable","efm_generic_icon_content_executable.png", (114/114), (114/114), 240, 0.5);
+   EFM_MIME_ICON_SIMPLE("application/x-ms-dos-executable","efm_generic_icon_content_executable.png", (114/114), (114/114), 240, 0.5);
+
+//Libraries//
+
+   EFM_MIME_ICON_SIMPLE("application/x-sharedlib","efm_generic_icon_content_lib.png", (114/114), (114/114), 240, 0.5);
+   EFM_MIME_ICON_SIMPLE("application/x-shared-library-la","efm_generic_icon_content_lib.png", (114/114), (114/114), 240, 0.5);
+
+//Unknown//
+   
+   EFM_MIME_ICON_SIMPLE("application/x-object","efm_generic_icon_content_unknown.png", (100/154), (100/154), 240, 0.5);
+
+//Trash//
+
+   EFM_MIME_ICON_SIMPLE("application/x-trash","efm_generic_icon_content_trash.png", (114/142), (114/142), 240, 0.5);
+
+//Octet-Stream//
+   
+   EFM_MIME_ICON_SIMPLE("application/octet-stream","efm_generic_icon_content_text.png",(114/126), (114/126), 240, 0.5);
+
+//Install//
+
+   EFM_MIME_ICON_SIMPLE("application/x-install-instructions","efm_generic_icon_content_install.png",(114/149), (114/149), 240, 0.5);
+
+//Cache//
+
+   EFM_MIME_ICON_SIMPLE("chemical/x-cache","efm_generic_icon_content_db.png", (114/128), (114/128), 240, 0.5);
+
+//Inode//
+   
+   EFM_MIME_ICON_SIMPLE("inode/chardevice","efm_generic_icon_content_inode_char.png", (114/77), (114/77), 240, 0.5);
+   EFM_MIME_ICON_SIMPLE("inode/blockdevice","efm_generic_icon_content_inode_block.png", (81/114), (81/114), 240, 0.5);
+   EFM_MIME_ICON_SIMPLE("inode/fifo","efm_generic_icon_content_inode_fifo.png", (87/114), (87/114), 240, 0.5);
+   EFM_MIME_ICON_SIMPLE("inode/socket","efm_generic_icon_content_inode_socket.png", (114/114), (114/114), 240, 0.5);
+   EFM_MIME_ICON_SIMPLE("inode/file","efm_generic_icon_content_inode_file.png", (83/114), (83/114), 240, 0.5);
+
+#undefine EFM_MIME_ICON
+#undefine EFM_MIME_ICON_SIMPLE
+
+   /* #define EFMICON(NAME, FILE, SIZE)                    \
+    * group { name: "e/icons/fileman/"NAME;                \
+    *    max: SIZE SIZE;                                  \
+    *    parts {                                           \
+    *       part { name: "icon";                           \
+    *     mouse_events: 0;                              \
+    *     description { state: "default" 0.0;            \
+    *        aspect: 1.0 1.0;                            \
+    *        aspect_preference: BOTH;                    \
+    *        image.image: FILE COMP;                     \
+    *        image.normal: FILE ;                        \
+    *     }                                              \
+    *       }                                              \
+    *    }                                                 \
+    * } */
+   //EFMICON("folder","icon_efm_folder.png", 128)
+   //EFMICON("chrdev","icon_efm_file.png", 128)
+   //EFMICON("blkdev","icon_efm_file.png", 128)
+   //EFMICON("fifo","icon_efm_file.png", 128)
+   //EFMICON("socket","icon_efm_file.png", 128)
+   //EFMICON("executable","icon_efm_file.png", 128)
+   //EFMICON("home","icon_efm_home.png", 128)
+   //EFMICON("root","icon_efm_root.png", 128)
+   //EFMICON("tmp","icon_efm_tmp.png", 128)
+   //EFMICON("desktop","icon_efm_desktop.png", 128)
+   //EFMICON("hdd","icon_efm_hdd.png", 128)
+   //EFMICON("hd","icon_efm_hdd.png", 128)
+
+   // EFM Mime type icons //
+
+   #define MIMEICON(NAME, FILE, SIZE)                 \
+   group {                                            \
+      name: "e/icons/fileman/mime/"NAME;              \
+      max: SIZE SIZE;                                \
+      parts {                                         \
+         part {                                       \
+            name: "icon";                             \
+            mouse_events: 0;                         \
+            description {                             \
+               state: "default" 0.0;                  \
+               aspect: 1.0 1.0;                       \
+               aspect_preference: BOTH;               \
+               image.image: "O/"FILE COMP;                \
+               image.normal: "O/"FILE ;                   \
+            }                                         \
+         }                                            \
+      }                                               \
+   }
+
+   MIMEICON("inode/directory","icon_efm_folder.png", 128);
+
+   MIMEICON("application/x-deb","icon_mime_deb.png", 128);
+   MIMEICON("application/x-bzip","icon_mime_package.png", 128);
+   MIMEICON("application/zip","icon_mime_package.png", 128);
+   MIMEICON("application/x-gzip","icon_mime_package.png", 128);
+   MIMEICON("application/x-bzip-compressed-tar","icon_mime_package.png", 128);
+   MIMEICON("application/x-bzip2-compressed-tar","icon_mime_package.png",128);
+   MIMEICON("application/x-compressed-tar","icon_mime_package.png",128);
+   MIMEICON("application/x-tar","icon_mime_package.png", 128);
+   MIMEICON("application/x-rar","icon_mime_package.png", 128);
+
+   MIMEICON("application/x-7z-compressed","icon_mime_package.png", 128);
+   MIMEICON("application/vnd.ms-cab-compressed","icon_mime_package.png", 128);
+
+
--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				{"v":"5.5.9","fr":29.9700012207031,"ip":0,"op":130.000005295009,"w":1920,"h":1080,"nm":"Comp 1","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"layer","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[960,540,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[300,300],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":2,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-261,"s":[1,0,0,1]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[1,0,0,1]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":16,"s":[0,1,0,1]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":57,"s":[0,0,1,1]},{"t":119.000004846969,"s":[1,0,0,1]}],"ix":4},"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":-400,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":37,"s":[10]},{"t":108.00000439893,"s":[100]}],"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-600,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"box1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[300,300],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":3,"s":[1,1,1,1]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":45,"s":[1,0.917647123337,0,1]},{"t":96.0000039101602,"s":[1,1,1,1]}],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":1,"s":[2]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":46,"s":[69]},{"t":102.000004154545,"s":[2]}],"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"box2","np":3,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[300,300],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":2,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[600,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"box3","np":3,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false}],"ip":-6.00000024438501,"op":894.000036413367,"st":-6.00000024438501,"bm":0}],"markers":[]}