ci: move release-ready to default build and enable tests+install on it

with meson, the only difference between our 'default' and 'release-ready'
builds is that the release build uses a different build type which sets
some compile/build flags. these should not provide any differing coverage
over a regular build, so we can reduce our job matrix by one here

Differential Revision: https://phab.enlightenment.org/D9123

.arcconfig

@@ -0,0 +1,7 @@
+{
+  "project_id" : "efl",
+  "projects" : "efl",
+  "conduit_uri" : "https://phab.enlightenment.org/",
+  "phabricator.uri" : "https://phab.enlightenment.org/",
+  "repository.callsign" : "EFL"
+}

.ci/README

@@ -0,0 +1,21 @@
+Matrix build:
+-------------
+We are building our software on different distributions with the help of docker images. Right now
+we are using versions of Ubuntu, Fedora and Debian.
+
+OSX build:
+----------
+We are using the OSX support of Travis CI to build EFL on OSX. Build testing two combinations: Xcode
+7.3.1 on OS X 10.11 and Xcode 8.3.3 on OS X 10.12.
+
+Run locally:
+------------
+For easy developer testing the CI setup can also be run in full or only parts locally on the
+developers machine. You need to have docker installed and after that it is a simple:
+
+docker pull fedora:26
+docker build -f .ci/Dockerfile-Fedora26 .
+
+Travis:
+-------
+https://travis-ci.org/Enlightenment/efl

.ci/bootstrap-efl-native-for-cross.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+mkdir build-bootstrap-native
+meson --prefix=/usr/ --libdir=/usr/lib -Dbuild-examples=false -Dbuild-tests=false -Dbindings="" build-bootstrap-native
+ninja -C build-bootstrap-native install
+rm -rf build-bootstrap-native
+ldconfig

.ci/build-efl-app.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+set -e
+
+#clone our examples from efl
+git clone --depth=1 -b master http://git.enlightenment.org/tools/examples.git/
+
+cd examples/apps/c/life/
+
+#build the example
+mkdir build
+meson . ./build
+ninja -C build all
+
+#remove the folder again so its not left in the artifacts
+cd ../../../..
+rm -rf examples

.ci/ccache.conf

@@ -0,0 +1,7 @@
+max_size = 500M
+compression = true
+compression_level = 1
+sloppiness = time_macros,include_file_mtime,include_file_ctime,file_macro
+run_second_cpp = false
+hash_dir = false
+

.ci/ci-ccache-stats.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+if [ "$DISTRO" != "" ] ; then
+  docker exec $(cat $HOME/cid)  ccache -s
+else
+  ccache -s
+fi

.ci/ci-configure.sh

@@ -0,0 +1,106 @@
+#!/bin/sh
+
+set -e
+
+. .ci/travis.sh
+
+if [ "$DISTRO" != "" ] ; then
+  # Normal build test of all targets
+  OPTS=" -Decore-imf-loaders-disabler=scim,ibus -Dbindings=luajit"
+  # Why do we need to disable the imf loaders here?
+
+  WAYLAND_LINUX_COPTS=" -Dwl=true -Ddrm=true -Dopengl=es-egl -Dwl-deprecated=true -Ddrm-deprecated=true"
+
+  # TODO:
+  # - Enable C++ and mono bindings: -Dbindings=luajit,cxx,mono -Dmono-beta=true
+  # - No libelogind, Xgesture packages in fedora 30 repo
+  # - RPM fusion repo for xine and libvlc
+  ENABLED_LINUX_COPTS=" -Dfb=true -Dsdl=true -Dbuffer=true -Dbuild-id=travis-build \
+  -Ddebug-threads=true -Dg-mainloop=true -Dxpresent=true -Dxgesture=false -Dxinput22=true \
+  -Devas-loaders-disabler=json -Decore-imf-loaders-disabler= -Demotion-loaders-disabler=libvlc,xine \
+  -Demotion-generic-loaders-disabler=vlc -Dharfbuzz=true -Dpixman=true -Dhyphen=true \
+  -Dvnc-server=true -Dbindings=luajit -Delogind=false -Dinstall-eo-files=true"
+
+  # Enabled png, jpeg evas loader for in tree edje file builds
+  DISABLED_LINUX_COPTS=" -Daudio=false -Davahi=false -Dx11=false -Dphysics=false -Deeze=false \
+  -Dopengl=none -Deina-magic-debug=false -Dbuild-examples=false -Dbuild-tests=false \
+  -Dcrypto=gnutls -Dglib=false -Dgstreamer=false -Dsystemd=false -Dpulseaudio=false \
+  -Dnetwork-backend=connman -Dxinput2=false -Dtslib=false -Devas-modules=static \
+  -Devas-loaders-disabler=gst,pdf,ps,raw,svg,xcf,bmp,dds,eet,generic,gif,ico,jp2k,json,pmaps,psd,tga,tgv,tiff,wbmp,webp,xpm \
+  -Decore-imf-loaders-disabler=xim,ibus,scim  -Demotion-loaders-disabler=gstreamer,gstreamer1,libvlc,xine \
+  -Demotion-generic-loaders-disabler=vlc -Dfribidi=false -Dfontconfig=false \
+  -Dedje-sound-and-video=false -Dembedded-lz4=false -Dlibmount=false -Dv4l2=false \
+  -Delua=true -Dnls=false -Dbindings= -Dlua-interpreter=luajit -Dnative-arch-optimization=false"
+  #evas_filter_parser.c:(.text+0xc59): undefined reference to `lua_getglobal' with interpreter lua
+
+  RELEASE_READY_LINUX_COPTS=" --buildtype=release"
+
+  MINGW_COPTS="--cross-file .ci/cross_toolchain.txt -Davahi=false -Deeze=false -Dsystemd=false \
+  -Dpulseaudio=false -Dx11=false -Dopengl=none -Dlibmount=false \
+  -Devas-loaders-disabler=json,pdf,ps,raw,svg -Devas-modules=static -Dbindings=luajit \
+  -Dbuild-examples=false -Dbuild-tests=false"
+
+  if [ "$1" = "options-enabled" ]; then
+    OPTS="$OPTS $ENABLED_LINUX_COPTS $WAYLAND_LINUX_COPTS"
+  fi
+
+  if [ "$1" = "options-disabled" ]; then
+    OPTS="$OPTS $DISABLED_LINUX_COPTS"
+  fi
+
+  if [ "$1" = "wayland" ]; then
+    OPTS="$OPTS $WAYLAND_LINUX_COPTS"
+  fi
+
+  if [ "$1" = "release-ready" ]; then
+    OPTS="$OPTS $RELEASE_READY_LINUX_COPTS"
+  fi
+
+  if [ "$1" = "coverity" ]; then
+    if [ $(date +%A) != "Saturday" ]; then
+      echo "Not Saturday so we are not running our weekly Coverity scan build."
+      exit 0
+    fi
+    OPTS="$OPTS $WAYLAND_LINUX_COPTS"
+    travis_fold cov-download cov-download
+    docker exec --env COVERITY_SCAN_TOKEN=$COVERITY_SCAN_TOKEN $(cat $HOME/cid) sh -c '.ci/coverity-tools-install.sh'
+    travis_endfold cov-download
+  fi
+
+  if [ "$1" = "mingw" ]; then
+    OPTS="$OPTS $MINGW_COPTS"
+    travis_fold cross-native cross-native
+    docker exec $(cat $HOME/cid) sh -c '.ci/bootstrap-efl-native-for-cross.sh'
+    travis_endfold cross-native
+    travis_fold meson meson
+    docker exec --env EIO_MONITOR_POLL=1 --env PKG_CONFIG_PATH="/ewpi-64-install/lib/pkgconfig/" \
+       $(cat $HOME/cid) sh -c "mkdir build && meson build $OPTS"
+    travis_endfold meson
+  elif [ "$1" = "coverity" ]; then
+    travis_fold meson meson
+    docker exec --env EIO_MONITOR_POLL=1 --env CFLAGS="-fdirectives-only"  --env CC="gcc" --env CXX="g++"\
+    --env CXXFLAGS="-fdirectives-only" $(cat $HOME/cid) sh -c "mkdir build && meson build $OPTS"
+    travis_endfold meson
+  else
+    travis_fold meson meson
+    docker exec --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
+      --env CXX="ccache g++" --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \
+      --env LD="ld.gold" $(cat $HOME/cid) sh -c "mkdir build && meson build $OPTS"
+    travis_endfold meson
+  fi
+else
+  # Prepare OSX env for build
+  mkdir -p ~/Library/LaunchAgents
+  ln -sfv /usr/local/opt/d-bus/*.plist ~/Library/LaunchAgents
+  launchctl load ~/Library/LaunchAgents/org.freedesktop.dbus-session.plist
+  export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
+
+  export CFLAGS="-I/usr/local/opt/openssl/include -frewrite-includes $CFLAGS"
+  export LDFLAGS="-L/usr/local/opt/openssl/lib $LDFLAGS"
+  LIBFFI_VER=$(brew list --versions libffi|head -n1|cut -d' ' -f2)
+  export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig:/usr/local/Cellar/libffi/$LIBFFI_VER/lib/pkgconfig"
+  export CC="ccache gcc"
+  travis_fold meson meson
+  mkdir build && meson build -Decore-imf-loaders-disabler=scim,ibus -Dx11=false -Davahi=false -Dbindings=luajit -Deeze=false -Dsystemd=false -Dnls=false -Dcocoa=true -Demotion-loaders-disabler=gstreamer,gstreamer1,libvlc,xine
+  travis_endfold meson
+fi

.ci/ci-make-benchmark.sh

@@ -0,0 +1,21 @@
+#!/bin/sh
+
+set -e
+. .ci/travis.sh
+if [ "$1" = "release-ready" ] ; then
+  exit 0
+fi
+if [ "$1" = "coverity" ] ; then
+  exit 0
+fi
+travis_fold benchmark "ninja benchmark"
+echo "Nothing to do here, the benchmarks don't seem to terminate"
+#else
+  #if [ "$DISTRO" != "" ] ; then
+    #docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make benchmark
+  #else
+    #export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
+    #make benchmark
+  #fi
+#fi
+travis_endfold benchmark

.ci/ci-make-check.sh

@@ -0,0 +1,36 @@
+#!/bin/sh
+
+. .ci/travis.sh
+
+if [ "$1" = "mingw" ] ; then
+  exit 0
+fi
+
+if [ "$1" = "coverity" ] ; then
+  exit 0
+fi
+
+#T7151
+if [ "$1" = "options-enabled" ] || [ "$1" = "options-disabled" ] ; then
+  exit 0
+fi
+
+NUM_TRIES=5
+
+travis_fold check "ninja test"
+if [ "$DISTRO" != "" ] ; then
+   # disable them for this distros, after meson 0.49 is out, this can be removed
+   # https://github.com/mesonbuild/meson/commit/253c581412d7f2b09af353dd83d943454bd555be
+   if [ "$DISTRO" != "Ubuntu1810" ] && [ "$DISTRO" != "Debian96" ]; then
+     for tries in $(seq 1 ${NUM_TRIES}); do
+         (docker exec --env EINA_LOG_BACKTRACE="0" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) meson test -t 120 -C build --wrapper dbus-launch ) && break
+         docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) cat build/meson-logs/testlog-dbus-launch.txt
+         if [ $tries != ${NUM_TRIES} ] ; then echo "tests failed, trying again!" ; fi
+         false
+     done
+   fi
+fi
+ret=$?
+travis_endfold check
+
+exit $ret

.ci/ci-make-distcheck.sh

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+set -e
+. .ci/travis.sh
+if [ "$1" != "release-ready" ] ; then
+  exit 0
+fi
+travis_fold distcheck "ninja dist"
+if [ "$DISTRO" != "" ] ; then
+  docker exec --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
+    --env CXX="ccache g++" \
+    --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \
+    --env LD="ld.gold" $(cat $HOME/cid) dbus-launch ninja -C build dist || \
+    (sudo cat efl-*/_build/sub/src/test-suite.log; false)
+else
+  export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
+  ninja -C build dist
+fi
+travis_endfold distcheck

.ci/ci-make-install.sh

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+. .ci/travis.sh
+if [ "$1" = "coverity" ] ; then
+  exit 0
+fi
+travis_fold install "ninja install"
+if [ "$DISTRO" != "" ] ; then
+  docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) ninja -C build install
+else
+  export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
+  ninja -C build install
+fi
+travis_endfold install

.ci/ci-make.sh

@@ -0,0 +1,24 @@
+#!/bin/sh
+
+set -e
+. .ci/travis.sh
+if [ "$1" = "release-ready" ] ; then
+  exit 0
+fi
+travis_fold ninja ninja
+if [ "$DISTRO" != "" ] ; then
+  if [ "$1" = "coverity" ] ; then
+    if [ $(date +%A) != "Saturday" ]; then
+      exit 0
+    fi
+    docker exec --env EIO_MONITOR_POLL=1 --env PATH="/src/cov-analysis-linux64-2019.03/bin:$PATH" $(cat $HOME/cid) sh -c "cov-build --dir cov-int ninja -C build"
+    docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) sh -c "tar caf efl-$(git rev-parse --short HEAD).xz cov-int"
+    docker exec --env EIO_MONITOR_POLL=1 --env COVERITY_SCAN_TOKEN=$COVERITY_SCAN_TOKEN $(cat $HOME/cid) sh -c ".ci/coverity-upload.sh"
+  else
+    docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) ninja -C build
+  fi
+else
+  export PATH="$(brew --prefix gettext)/bin:$PATH"
+  ninja -C build
+fi
+travis_endfold ninja

.ci/ci-setup-ccache.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+if [ "$DISTRO" != "" ] ; then
+  docker exec $(cat $HOME/cid)  sh -c ".ci/docker-ccache-setup.sh $1"
+  docker exec $(cat $HOME/cid)  ccache -pz
+else
+  cp .ci/ccache.conf ~/.ccache
+  ccache -o base_dir="$(pwd)"
+  ccache -pz
+fi

.ci/coverity-tools-install.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+wget https://scan.coverity.com/download/linux64 --post-data="token=$COVERITY_SCAN_TOKEN&project=Enlightenment+Foundation+Libraries" -O coverity_tool.tgz
+tar xzf coverity_tool.tgz

.ci/coverity-upload.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+curl --form token=$COVERITY_SCAN_TOKEN \
+     --form email=stefan@datenfreihafen.org \
+     --form file=@efl-$(git rev-parse --short HEAD).xz \
+     --form version=$(git rev-parse --short HEAD) \
+     --form description="Submission from Travis CI" \
+     https://scan.coverity.com/builds?project=Enlightenment+Foundation+Libraries

.ci/cross_toolchain.txt

@@ -0,0 +1,20 @@
+[binaries]
+c = ['ccache', 'x86_64-w64-mingw32-gcc']
+cpp = ['ccache', 'x86_64-w64-mingw32-g++']
+ar = 'x86_64-w64-mingw32-ar'
+ranlib = 'x86_64-w64-mingw32-ranlib'
+strip = 'x86_64-w64-mingw32-strip'
+windres = 'x86_64-w64-mingw32-windres'
+pkgconfig = 'pkg-config'
+
+[host_machine]
+system = 'windows'
+cpu_family = 'x86_64'
+cpu = 'x86_64'
+endian = 'little'
+
+[properties]
+c_args = ['-D_WIN32_WINNT=0x0601', '-I/ewpi-64-install/include', '-O2', '-pipe', '-march=x86-64']
+c_link_args = ['-L/ewpi-64-install/lib', '-s']
+cpp_args = ['-D_WIN32_WINNT=0x0601', '-I/ewpi-64-install/include', '-O2', '-pipe', '-march=x86-64']
+cpp_link_args = ['-L/ewpi-64-install/lib', '-s']

.ci/docker-ccache-setup.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+CI_BUILD_TYPE="$1"
+
+cp .ci/ccache.conf ~/.ccache
+
+if [ "$1" = "release-ready" ] ; then
+  ccache -o base_dir="$(pwd)/$(grep '^PACKAGE_STRING' config.log|cut -d\' -f2|tr ' ' -)"
+else
+  ccache -o base_dir=$(pwd)
+fi

.ci/travis.sh

@@ -0,0 +1,24 @@
+#!/bin/sh
+
+# https://github.com/travis-ci/travis-rubies/blob/9f7962a881c55d32da7c76baefc58b89e3941d91/build.sh#L38-L44
+
+travis_fold() {
+  echo -e "travis_fold:start:$1\033[33;1m$2\033[0m"
+}
+travis_endfold() {
+  echo -e "\ntravis_fold:end:$1\r"
+}
+
+travis_time_start() {
+  travis_timer_id=$(printf %08x $(( RANDOM * RANDOM )))
+  travis_start_time=$(travis_nanoseconds)
+  echo -en "travis_time:start:$travis_timer_id\r${ANSI_CLEAR}"
+}
+
+travis_time_finish() {
+  local result=$?
+  travis_end_time=$(travis_nanoseconds)
+  local duration=$(($travis_end_time-$travis_start_time))
+  echo -en "\ntravis_time:end:$travis_timer_id:start=$travis_start_time,finish=$travis_end_time,duration=$duration\r${ANSI_CLEAR}"
+  return $result
+}

.gitignore

@@ -72,6 +72,7 @@ __pycache__
 /compile
 /test-driver
 /missing
+/INSTALL
 /ABOUT-NLS
 /config.rpath
 /coverage
@@ -94,4 +95,3 @@ Session.vim
 /.settings/
 efl_libs.csv
 .vscode/
-.uuid

.lcov-config

@@ -0,0 +1 @@
+geninfo_auto_base=1

.mailmap

@@ -16,21 +16,18 @@ 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> Christopher Michael <cpmichael@comcast.net>
+Christopher Michael <devilhorns@comcast.net> Christopher Michael <cp.michael@samsung.com>
+Christopher Michael <devilhorns@comcast.net> Christopher Michael <cpmichael1@comcast.net>
 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> Chris Michael <cp.michael@samsung.com>
 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>
 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,21 +35,13 @@ 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>
@@ -71,29 +60,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>
@@ -110,52 +91,7 @@ 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>

.travis.yml

@@ -0,0 +1,133 @@
+language: c
+cache:
+  directories:
+    - $HOME/cachedir
+    - $HOME/.ccache
+sudo: required
+dist: trusty
+
+osx_image: xcode10.2
+
+addons:
+  homebrew:
+    packages:
+      - gettext
+      - check
+      - bullet
+      - dbus
+      - fontconfig
+      - freetype
+      - fribidi
+      - gst-plugins-good
+      - gstreamer
+      - luajit
+      - openssl
+      - webp
+      - libsndfile
+      - glib
+      - libspectre
+      - libraw
+      - librsvg
+      - poppler
+      - lz4
+      - pulseaudio
+      - ccache
+      - ninja
+      - python3
+      - libffi
+
+env:
+  global:
+    - EIO_MONITOR_POLL=1
+    - CC="ccache gcc"
+    - CXX="ccache g++"
+
+jobs:
+  include:
+    - os: osx
+    - os: linux
+      env: DISTRO=Fedora30-mingw CI_BUILD_TYPE=mingw
+    - os: linux
+      env: DISTRO=Fedora30 CI_BUILD_TYPE=options-enabled
+    - os: linux
+      env: DISTRO=Fedora30 CI_BUILD_TYPE=options-disabled
+    - os: linux
+      env: DISTRO=Fedora29 CI_BUILD_TYPE=wayland
+    - os: linux
+      env: DISTRO=Fedora29 CI_BUILD_TYPE=release-ready
+    - os: linux
+      if: type = cron
+      env: DISTRO=Ubuntu1804
+    - os: linux
+      if: type = cron
+      env: DISTRO=Ubuntu1904
+    - os: linux
+      if: type = cron
+      env: DISTRO=Debian96
+    - os: linux
+      if: type = cron
+      env: DISTRO=Fedora30 CI_BUILD_TYPE=coverity
+
+services:
+  - docker
+
+before_install:
+  - |
+      if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+        rm -rf $HOME/Library/Caches/Homebrew
+        rm -rf $HOME/cachedir/Homebrew/Homebrew
+        mv $HOME/cachedir/Homebrew $HOME/Library/Caches/Homebrew
+        pip3 install meson
+      fi
+
+before_script:
+  - |
+      if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$DISTRO" != "" ]]; then
+        docker pull stefanschmidt1/ci-support-files:$DISTRO
+      fi
+  - |
+      if [[ "$TRAVIS_OS_NAME" == "linux" ]] ; then
+        docker version
+        docker run --cidfile $HOME/cid -t -d -v `pwd`:/src -v $HOME/.ccache:/root/.ccache -w /src stefanschmidt1/ci-support-files:$DISTRO bash
+      fi
+  - .ci/ci-ccache-stats.sh
+
+script:
+  - .ci/ci-configure.sh "$CI_BUILD_TYPE"
+  - .ci/ci-setup-ccache.sh "$CI_BUILD_TYPE"
+  - .ci/ci-make.sh "$CI_BUILD_TYPE"
+  - |
+      if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$CI_BUILD_TYPE" == "" ]]; then
+          .ci/ci-make-benchmark.sh "$CI_BUILD_TYPE"
+      fi
+  #- .ci/ci-make-install.sh "$CI_BUILD_TYPE"
+  - .ci/ci-make-check.sh "$CI_BUILD_TYPE"
+  - .ci/ci-make-distcheck.sh "$CI_BUILD_TYPE"
+  #- |
+      #if [[ "$DISTRO" == "" ]] && [[ "$TRAVIS_OS_NAME" != "linux" ]] ; then
+        #true
+      #elif [[ "$CI_BUILD_TYPE" != "release-ready" ]] ; then
+        #docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) .ci/build-efl-app.sh
+      #fi
+before_cache:
+  - .ci/ci-ccache-stats.sh
+  - |
+       mkdir -p $HOME/cachedir
+       if [[ "$TRAVIS_OS_NAME" == "linux" ]] ; then
+         sudo chown travis:travis $HOME/.ccache
+       else
+         mv $HOME/Library/Caches/Homebrew $HOME/cachedir/Homebrew
+       fi
+
+notifications:
+  irc:
+    channels:
+      - "chat.freenode.net#edevelop"
+    on_success: change
+    on_failure: always
+    on_cancel: never
+    template:
+      - "TravisCI build %{build_number} in branch %{branch}: %{result} - %{message} (%{elapsed_time})"
+      - "Commit: %{commit_subject} (%{commit}) from %{author}"
+      - "Change view : %{compare_url}"
+      - "Build details : %{build_url}"

AUTHORS

@@ -395,46 +395,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
 ----

COMPLIANCE

@@ -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

COPYING

@@ -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
@@ -34,9 +35,8 @@ eolian:          licenses/COPYING.BSD
 elua:            licenses/COPYING.BSD
 elementary:      licenses/COPYING.LGPL
 generic/evas:    licenses/COPYING.GPL (separate binary/executable)
+generic/emotion: 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.

COPYING.images

@@ -0,0 +1,10 @@
+Gesture Layer 2 (all the icons in data/elementary/images/g_layer):
+  Illustrations provided by GestureWorks® (www.gestureworks.com)
+  Creative Commons Attribution Sharealike license v 3.0.
+  http://gestureworks.com/
+  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

README

@@ -0,0 +1,661 @@
+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:
+
+https://www.enlightenment.org/docs
+
+PLATFORMS
+---------
+
+EFL is primarily developerd 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 MINGW32 - please see
+http://www.winbuilds.org ), 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 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 can 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, 0.10 support optional. 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
+  * libpulse
+  * libsndfile
+  * libx11
+  * libxau
+  * libxcomposite
+  * libxdamage
+  * libxdmcp
+  * libxext
+  * libxfixes
+  * libxinerama
+  * libxrandr
+  * libxrender
+  * libxss
+  * libxtst
+  * libxcursor
+  * libxp
+  * libxi (2.2 or newer)
+  * libgl (opengl/glx or opengl-es2/egl)
+  * giflib
+  * util-linux (limbount + libblkid)
+  * systemd / libudev
+  * poppler / poppler-cpp
+  * libraw
+  * libspectre
+  * librsvg
+
+Recommended requirements (highly recommended):
+
+  * harfbuzz
+  * libwebp
+  * libunwind (where available)
+
+Enable these with configure options:
+
+    --enable-xinput22 \
+    --enable-image-loader-webp \
+    --enable-harfbuzz \
+    --enable-multisense
+
+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 possible 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 \
+    --enable-elput \
+    --enable-drm
+
+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".

README.md

@@ -1,547 +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)),
-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.
-
------
-
-## 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
-```
-
------
-
-**NOTE:** Nvidia OpenGL-ES/EGL seems to have bugs and performance issues.
-All other drivers work just fine except Nvidia with OpenGL-ES/EGL. Users have
-reported stuttering and graphical glitches and sometimes windows not
-updating. If you want the best results and are stuck on Nvidia and unable to
-change that, then:
-
-  * Make sure you do not enable **Wayland** i.e. Meson option `-Dwl=false` (this is default anyway if not provided)
-  * Make sure you do not enable **DRM** i.e. Meson option `-Ddrm=false` (this is default anyway if not provided)
-  * Make sure **OpenGL** is **full** i.e. Meson option `-Dopengl=full`

README.meson

@@ -0,0 +1,53 @@
+# BUILDING EFL WITH MESON
+
+ Building, testing, installing:
+    mkdir build
+    cd build
+    meson ..
+    ninja all
+    ninja test
+    sudo ninja install
+
+In autotools there have been a few flags that are used to disable loaders.
+In meson the following four disabler arrays are used:
+
+   emotion-generic-loaders-disabler
+
+   emotion-loaders-disabler
+
+   ecore-imf-loaders-disabler
+
+   evas-loaders-disabler
+
+Autotools options that are converted are:
+
+  --disable-poppler -> Disable pdf loader
+  --disable-spectre -> Disable ps loader
+  --disable-libraw -> Disable raw loader
+  --disable-librsvg -> Disable svg loader
+  --disable-xcf -> Disable xcf loader
+  --disable-xim -> Disable xim loader
+  --disable-scim -> Disable scim loader
+  --disable-ibus -> Disable ibus loader
+  --enable-xine -> Disable xine loader
+  --enable-libvlc -> Disable vlc loader
+  --disable-librsvg -> Disable svg loader
+
+The following options are dropped as they did not affect compilation
+  --enable-lua-old
+  --enable-cancel-ok
+  --enable-debug
+  --disable-quick-launch
+  --enable-tile-rotate
+
+The following options are merged into the pixman option
+  --enable-pixman-font
+  --enable-pixman-rect
+  --enable-pixman-line
+  --enable-pixman-poly
+  --enable-pixman-image
+  --enable-pixman-image-scale-sample
+
+
+--disable-valgrind Is dropped, and handled due to the build profile, this can
+be handled with --buildtype release or plain.

cmakeconfig/EolianHelper.cmake.in

@@ -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}")

confs/freebsd.sh

@@ -1,3 +0,0 @@
-#!/bin/sh -e
-meson -Dsystemd=false -Dv4l2=false -Deeze=false -Dinput=false \
- $@ . build

confs/linux-nowayland.sh

@@ -1,3 +0,0 @@
-#!/bin/sh -e
-meson -Dfb=true \
- $@ . build

confs/linux.sh

@@ -1,3 +0,0 @@
-#!/bin/sh -e
-meson -Dfb=true -Ddrm=true -Dwl=true \
- $@ . build

confs/openbsd.sh

@@ -1,3 +0,0 @@
-#!/bin/sh -e
-meson -Dsystemd=false -Dv4l2=false -Deeze=false -Dinput=false \
- $@ . build

confs/osx.sh

@@ -1,5 +0,0 @@
-#!/bin/sh -e
-meson -Dsystemd=false -Dv4l2=false -Davahi=false -Deeze=false -Dx11=false \
--Dopengl=full -Dcocoa=true -Dnls=false -Dinput=false \
--Decore-imf-loaders-disabler=scim,ibus \
- $@ . build

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

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;
-}

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; }
-  }
-}

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;
-}

data/elementary/colors/empty.src

@@ -1,3 +0,0 @@
-group "Elm_Palette" struct {
-  value "version" int: 1000;
-}

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;
-    }
-  }
-}

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;
-    }
-  }
-}

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

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;
-}

data/elementary/config/default/base.src.in

@@ -1,8 +1,8 @@
 group "Elm_Config" struct {
-  value "config_version" int: 131096;
+  value "config_version" int: 131093;
   value "entry_select_allow" uchar: 1;
   value "engine" string: "";
-  value "vsync" uchar: 1;
+  value "vsync" uchar: 0;
   //
   value "thumbscroll_enable" uchar: 1;
   value "thumbscroll_threshold" int: 24;
@@ -90,12 +90,12 @@ group "Elm_Config" struct {
   value "year_min" int: 2;
   value "year_max" int: 137;
   value "softcursor_mode" uchar: 0;
-  value "auto_norender_withdrawn" uchar: 1;
-  value "auto_norender_iconified_same_as_withdrawn" uchar: 1;
-  value "auto_flush_withdrawn" uchar: 1;
+  value "auto_norender_withdrawn" uchar: 0;
+  value "auto_norender_iconified_same_as_withdrawn" uchar: 0;
+  value "auto_flush_withdrawn" uchar: 0;
   value "auto_dump_withdrawn" uchar: 0;
   value "auto_throttle" uchar: 0;
-  value "auto_throttle_amount" double: 0.03333333333;
+  value "auto_throttle_amount" double: 0.1;
   value "magnifier_enable" uchar: 1;
   value "magnifier_scale" double: 1.5;
   value "audio_mute_effect" uchar: 0;
@@ -2634,29 +2634,6 @@ group "Elm_Config" struct {
            }
         }
      }
-     group "Elm_Config_Bindings_Widget" struct {
-        value "name" string: "Efl.Ui.Item";
-        group "key_bindings" list {
-           group "Elm_Config_Binding_Key" struct {
-              value "context" int: 0;
-              value "key" string: "Return";
-              value "action" string: "select";
-              value "params" string: "";
-           }
-           group "Elm_Config_Binding_Key" struct {
-              value "context" int: 0;
-              value "key" string: "KP_Enter";
-              value "action" string: "select";
-              value "params" string: "";
-           }
-           group "Elm_Config_Binding_Key" struct {
-              value "context" int: 0;
-              value "key" string: "space";
-              value "action" string: "select";
-              value "params" string: "";
-           }
-        }
-     }
      group "Elm_Config_Bindings_Widget" struct {
         value "name" string: "Efl.Ui.Tab_Bar";
         group "key_bindings" list {
@@ -3275,54 +3252,7 @@ group "Elm_Config" struct {
               value "action" string: "move";
               value "params" string: "next";
            }
-       }
-     }
-     group "Elm_Config_Bindings_Widget" struct {
-        value "name" string: "Efl.Ui.Textbox";
-        group "key_bindings" list {
-           group "Elm_Config_Binding_Key" struct {
-              value "context" int: 0;
-              value "key" string: "c";
-              value "action" string: "copy";
-              value "params" string: "";
-              group "modifiers" list {
-                 group "Elm_Config_Binding_Modifier" struct {
-                    value "mod" string: "Control";
-                    value "flag" uchar: 1;
-                 }
-              }
-           }
-           group "Elm_Config_Binding_Key" struct {
-              value "context" int: 0;
-              value "key" string: "x";
-              value "action" string: "cut";
-              value "params" string: "";
-              group "modifiers" list {
-                 group "Elm_Config_Binding_Modifier" struct {
-                    value "mod" string: "Control";
-                    value "flag" uchar: 1;
-                 }
-              }
-           }
-           group "Elm_Config_Binding_Key" struct {
-              value "context" int: 0;
-              value "key" string: "v";
-              value "action" string: "paste";
-              value "params" string: "";
-              group "modifiers" list {
-                 group "Elm_Config_Binding_Modifier" struct {
-                    value "mod" string: "Control";
-                    value "flag" uchar: 1;
-                 }
-              }
-           }
-           group "Elm_Config_Binding_Key" struct {
-              value "context" int: 0;
-              value "key" string: "menu";
-              value "action" string: "menu";
-              value "params" string: "";
-           }
-        }
-     }
+		}
+	 }
   }
 }

data/elementary/config/default/meson.build

@@ -1,7 +1,7 @@
 custom_target('config_'+config,
   input: config_file,
   output: 'base.cfg',
-  command: [eet_bin, '-e', '@OUTPUT@', 'config', '@INPUT@', '1'],
+  command: [eet_bin, '-e', '@OUTPUT@', 'config', '@INPUT@', '0'],
   install: true,
   install_dir: join_paths(dir_data, 'elementary', 'config', config),
 )

data/elementary/config/default/profile.desktop

@@ -31,7 +31,7 @@ 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[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.

data/elementary/config/mobile/base.src.in

@@ -1,17 +1,14 @@
 group "Elm_Config" struct {
-  value "config_version" int: 131096;
+  value "config_version" int: 131093;
   value "entry_select_allow" uchar: 1;
   value "engine" string: "";
-  value "vsync" uchar: 1;
+  value "vsync" uchar: 0;
   value "thumbscroll_enable" uchar: 1;
   value "thumbscroll_threshold" int: 24;
   value "thumbscroll_hold_threshold" int: 100;
   value "thumbscroll_momentum_threshold" double: 100.0;
   value "thumbscroll_flick_distance_tolerance" int: 3000;
   value "thumbscroll_friction" double: 0.95;
-  value "thumbscroll_momentum_distance_max" int: 3000;
-  value "thumbscroll_momentum_friction" double: 0.95;
-
   value "thumbscroll_momentum_animation_duration_min_limit" double: 0.3;
   value "thumbscroll_momentum_animation_duration_max_limit" double: 1.3;
   // will not be used
@@ -89,9 +86,9 @@ group "Elm_Config" struct {
   value "auto_norender_withdrawn" uchar: 1;
   value "auto_norender_iconified_same_as_withdrawn" uchar: 1;
   value "auto_flush_withdrawn" uchar: 1;
-  value "auto_dump_withdrawn" uchar: 0;
-  value "auto_throttle" uchar: 0;
-  value "auto_throttle_amount" double: 0.03333333333;
+  value "auto_dump_withdrawn" uchar: 1;
+  value "auto_throttle" uchar: 1;
+  value "auto_throttle_amount" double: 0.0666666666;
   value "indicator_service_0" string: "elm_indicator_portrait";
   value "indicator_service_90" string: "elm_indicator_landscape";
   value "indicator_service_180" string: "elm_indicator_portrait";
@@ -2634,29 +2631,6 @@ group "Elm_Config" struct {
            }
         }
      }
-     group "Elm_Config_Bindings_Widget" struct {
-        value "name" string: "Efl.Ui.Item";
-        group "key_bindings" list {
-           group "Elm_Config_Binding_Key" struct {
-              value "context" int: 0;
-              value "key" string: "Return";
-              value "action" string: "select";
-              value "params" string: "";
-           }
-           group "Elm_Config_Binding_Key" struct {
-              value "context" int: 0;
-              value "key" string: "KP_Enter";
-              value "action" string: "select";
-              value "params" string: "";
-           }
-           group "Elm_Config_Binding_Key" struct {
-              value "context" int: 0;
-              value "key" string: "space";
-              value "action" string: "select";
-              value "params" string: "";
-           }
-        }
-     }
      group "Elm_Config_Bindings_Widget" struct {
         value "name" string: "Efl.Ui.Tab_Bar";
         group "key_bindings" list {
@@ -3264,54 +3238,7 @@ group "Elm_Config" struct {
               value "action" string: "move";
               value "params" string: "next";
            }
-       }
-     }
-     group "Elm_Config_Bindings_Widget" struct {
-        value "name" string: "Efl.Ui.Textbox";
-        group "key_bindings" list {
-           group "Elm_Config_Binding_Key" struct {
-              value "context" int: 0;
-              value "key" string: "c";
-              value "action" string: "copy";
-              value "params" string: "";
-              group "modifiers" list {
-                 group "Elm_Config_Binding_Modifier" struct {
-                    value "mod" string: "Control";
-                    value "flag" uchar: 1;
-                 }
-              }
-           }
-           group "Elm_Config_Binding_Key" struct {
-              value "context" int: 0;
-              value "key" string: "x";
-              value "action" string: "cut";
-              value "params" string: "";
-              group "modifiers" list {
-                 group "Elm_Config_Binding_Modifier" struct {
-                    value "mod" string: "Control";
-                    value "flag" uchar: 1;
-                 }
-              }
-           }
-           group "Elm_Config_Binding_Key" struct {
-              value "context" int: 0;
-              value "key" string: "v";
-              value "action" string: "paste";
-              value "params" string: "";
-              group "modifiers" list {
-                 group "Elm_Config_Binding_Modifier" struct {
-                    value "mod" string: "Control";
-                    value "flag" uchar: 1;
-                 }
-              }
-           }
-           group "Elm_Config_Binding_Key" struct {
-              value "context" int: 0;
-              value "key" string: "menu";
-              value "action" string: "menu";
-              value "params" string: "";
-           }
-        }
-     }
+		}
+	 }
   }
 }

data/elementary/config/mobile/meson.build

@@ -1,7 +1,7 @@
   custom_target('config_'+config,
     input: config_file,
     output: 'base.cfg',
-    command: [eet_bin, '-e', '@OUTPUT@', 'config', '@INPUT@', '1'],
+    command: [eet_bin, '-e', '@OUTPUT@', 'config', '@INPUT@', '0'],
     install: true,
     install_dir: join_paths(dir_data, 'elementary', 'config', config),
   )

data/elementary/config/standard/base.src.in

@@ -1,17 +1,14 @@
 group "Elm_Config" struct {
-  value "config_version" int: 131096;
+  value "config_version" int: 131093;
   value "entry_select_allow" uchar: 1;
   value "engine" string: "";
-  value "vsync" uchar: 1;
+  value "vsync" uchar: 0;
   value "thumbscroll_enable" uchar: 0;
   value "thumbscroll_threshold" int: 4;
   value "thumbscroll_hold_threshold" int: 4;
   value "thumbscroll_momentum_threshold" double: 100.0;
   value "thumbscroll_flick_distance_tolerance" int: 1000;
   value "thumbscroll_friction" double: 1.0;
-  value "thumbscroll_momentum_distance_max" int: 3000;
-  value "thumbscroll_momentum_friction" double: 0.95;
-
   value "thumbscroll_momentum_animation_duration_min_limit" double: 0.3;
   value "thumbscroll_momentum_animation_duration_max_limit" double: 1.3;
   // will not be used
@@ -87,10 +84,10 @@ group "Elm_Config" struct {
   value "year_min" int: 2;
   value "year_max" int: 137;
   value "softcursor_mode" uchar: 0;
-  value "auto_norender_withdrawn" uchar: 1;
-  value "auto_norender_iconified_same_as_withdrawn" uchar: 1;
+  value "auto_norender_withdrawn" uchar: 0;
+  value "auto_norender_iconified_same_as_withdrawn" uchar: 0;
   value "auto_flush_withdrawn" uchar: 1;
-  value "auto_dump_withdrawn" uchar: 0;
+  value "auto_dump_withdrawn" uchar: 1;
   value "auto_throttle" uchar: 0;
   value "auto_throttle_amount" double: 0.0333333333;
   value "magnifier_enable" uchar: 0;
@@ -2631,29 +2628,6 @@ group "Elm_Config" struct {
            }
         }
      }
-     group "Elm_Config_Bindings_Widget" struct {
-        value "name" string: "Efl.Ui.Item";
-        group "key_bindings" list {
-           group "Elm_Config_Binding_Key" struct {
-              value "context" int: 0;
-              value "key" string: "Return";
-              value "action" string: "select";
-              value "params" string: "";
-           }
-           group "Elm_Config_Binding_Key" struct {
-              value "context" int: 0;
-              value "key" string: "KP_Enter";
-              value "action" string: "select";
-              value "params" string: "";
-           }
-           group "Elm_Config_Binding_Key" struct {
-              value "context" int: 0;
-              value "key" string: "space";
-              value "action" string: "select";
-              value "params" string: "";
-           }
-        }
-     }
      group "Elm_Config_Bindings_Widget" struct {
         value "name" string: "Efl.Ui.Tab_Bar";
         group "key_bindings" list {
@@ -3261,54 +3235,7 @@ group "Elm_Config" struct {
               value "action" string: "move";
               value "params" string: "next";
            }
-       }
-     }
-     group "Elm_Config_Bindings_Widget" struct {
-        value "name" string: "Efl.Ui.Textbox";
-        group "key_bindings" list {
-           group "Elm_Config_Binding_Key" struct {
-              value "context" int: 0;
-              value "key" string: "c";
-              value "action" string: "copy";
-              value "params" string: "";
-              group "modifiers" list {
-                 group "Elm_Config_Binding_Modifier" struct {
-                    value "mod" string: "Control";
-                    value "flag" uchar: 1;
-                 }
-              }
-           }
-           group "Elm_Config_Binding_Key" struct {
-              value "context" int: 0;
-              value "key" string: "x";
-              value "action" string: "cut";
-              value "params" string: "";
-              group "modifiers" list {
-                 group "Elm_Config_Binding_Modifier" struct {
-                    value "mod" string: "Control";
-                    value "flag" uchar: 1;
-                 }
-              }
-           }
-           group "Elm_Config_Binding_Key" struct {
-              value "context" int: 0;
-              value "key" string: "v";
-              value "action" string: "paste";
-              value "params" string: "";
-              group "modifiers" list {
-                 group "Elm_Config_Binding_Modifier" struct {
-                    value "mod" string: "Control";
-                    value "flag" uchar: 1;
-                 }
-              }
-           }
-           group "Elm_Config_Binding_Key" struct {
-              value "context" int: 0;
-              value "key" string: "menu";
-              value "action" string: "menu";
-              value "params" string: "";
-           }
-        }
-     }
+		}
+	 }
   }
 }

data/elementary/config/standard/meson.build

@@ -1,7 +1,7 @@
   custom_target('config_'+config,
     input: config_file,
     output: 'base.cfg',
-    command: [eet_bin, '-e', '@OUTPUT@', 'config', '@INPUT@', '1'],
+    command: [eet_bin, '-e', '@OUTPUT@', 'config', '@INPUT@', '0'],
     install: true,
     install_dir: join_paths(dir_data, 'elementary', 'config', config),
   )

data/elementary/config/standard/profile.desktop

@@ -9,6 +9,7 @@ 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]=標準
@@ -28,7 +29,7 @@ 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[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.

data/elementary/desktop/elementary_perf.desktop

@@ -1,10 +1,7 @@
 [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

data/elementary/desktop/elementary_test.desktop

@@ -6,6 +6,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 +21,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 テストアプリケーション

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":[]}

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>

data/elementary/meson.build

@@ -1,7 +1,6 @@
 subdir('config')
 subdir('desktop')
 subdir('themes')
-subdir('colors')
 subdir('objects')
 subdir('edje_externals')
 

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;
             }
          }
       }

data/elementary/objects/meson.build

@@ -21,8 +21,7 @@ foreach edc_file : edc_files
     input : edc_file,
     output : '@BASENAME@.edj',
     command : edje_cc_exe + [ '-beta', '-fastcomp',
-              '-no-warn-unused-images',
-              '-sd', elm_themes_sound_include,
+              '-sd', join_paths(meson.current_source_dir()),
               '-id', elm_themes_image_include,
               '-id', join_paths(meson.current_source_dir()),
               '-fd', join_paths(meson.current_source_dir()),

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"

data/elementary/objects/test_tab_pager.edc

@@ -45,12 +45,19 @@ collections {
             desc { "default";
             }
          }
+         rect { "bg";
+            scale;
+            desc { "default";
+               rel.to: "base";
+               color: 255 255 255 255;
+            }
+         }
          text { "text";
             scale;
             desc { "default";
                rel.to: "base";
                align: 0.5 0.5;
-               color: 255 255 255 255;
+               color: 0 0 0 255;
                text.size: 20;
             }
          }

data/elementary/themes/default.edc

@@ -1,4 +1,4 @@
-efl_version: 1 25;
+efl_version: 1 22;
 
 #include "macros.edc"
 
@@ -6,26 +6,25 @@ externals.external: "elm";
 
 // theme api version. from 1.10 on we will check version to avoid
 // compat issues
-data.item: "version" "125";
+data.item: "version" "119";
 data.item: "efl_theme_base" "dark";
 
 collections {
-
-#include "snd.edc"
-#include "ic.edc"
-
 #include "fonts.edc"
 #include "colorclasses.edc"
 
 // elm
 #include "edc/elm/bg.edc"
 #include "edc/elm/button.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"
@@ -68,6 +67,7 @@ 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"
@@ -75,10 +75,35 @@ collections {
 #include "edc/elm/hover.edc"
 #include "edc/elm/cursor.edc"
 #include "edc/elm/code.edc"
+#include "edc/elm/ews.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"
 #include "edc/button.edc"
@@ -100,28 +125,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"
@@ -143,18 +146,26 @@ collections {
 #include "edc/backlight.edc"
 #include "edc/mixer.edc"
 #include "edc/battery.edc"
+#include "edc/batman.edc"
 #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"
+#include "edc/luncher.edc"
+#include "edc/memusage.edc"
+#include "edc/cpumonitor.edc"
+#include "edc/netstatus.edc"
 
 // icons
 #include "edc/icons.edc"
 #include "edc/border-icons.edc"
 
+// port unchanged stuff so this can work as a replacement
+#include "edc/O/efm_icons.edc"
+#include "edc/O/icons.edc"
+
 // New efl ui themes
 #include "edc/efl/macros.edc"
 #include "edc/efl/bg.edc"
@@ -162,9 +173,12 @@ collections {
 #include "edc/efl/calendar.edc"
 #include "edc/efl/navigation_bar.edc"
 #include "edc/efl/navigation_layout.edc"
+#include "edc/efl/nstate.edc"
+// XXX: mobile mode needs invisible scrollers... make signals that do this
 #include "edc/efl/scroller.edc"
 #include "edc/efl/list.edc"
 #include "edc/efl/grid.edc"
+// XXX: mobile mode needs different entry setup
 #include "edc/efl/text.edc"
 #include "edc/efl/frame.edc"
 #include "edc/efl/check.edc"
@@ -177,22 +191,21 @@ collections {
 #include "edc/efl/tags.edc"
 #include "edc/efl/panel.edc"
 #include "edc/efl/tooltip.edc"
-#include "edc/efl/image_zoomable.edc"
+#include "edc/efl/photocam.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"
+// XXX: min size calc problems - too wide! ... err ok on my 32bit box... eh?
 #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/pager.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"
 }

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);
+
+

data/elementary/themes/edc/O/icons.edc

@@ -0,0 +1,200 @@
+/////////////////////////////////////////////////////////////////////////////
+/*** ICONS ***/
+
+   #define ICON(NAME, FILE, SIZE)                     \
+   group {                                            \
+      name: "e/icons/"NAME ;                          \
+      max: SIZE SIZE;                                 \
+      parts {                                         \
+         part {                                       \
+            name: "icon";                             \
+            repeat_events: 1;                        \
+            description {                             \
+               state: "default" 0.0;                  \
+               aspect: 1.0 1.0;                       \
+               aspect_preference: BOTH;               \
+               image.image: "O/"FILE COMP;                \
+               image.normal: "O/"FILE ;                   \
+            }                                         \
+         }                                            \
+      }                                               \
+   }
+
+   #define ICONMIME(NAME, FILE, SIZE) ICON("mimetypes/"NAME, FILE, SIZE)
+   /* FreeDesktop.Org Icons
+    * http://standards.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html
+    *
+    * In the comment you can find the old e icon name.
+    *
+    * Icons marked with *** are not mentioned in the spec, but we still try to
+    * follow the naming convention.
+    *
+    * TO ADD A NEW ICON:
+    * 1. Search for a name in the spec OR
+    * 2. Search for a name in kde (oxygen) and gnome (tango - human) icon set OR
+    * 3. Try to follow the naming convention
+    */
+   //Standard Action Icons
+   ICON("list-add","icon_add.png",64)                              // "widget/add"
+   ICON("list-remove","icon_del.png",64)                           // "widget/del"
+   ICON("go-up","icon_up_arrow.png",64)                            // "widget/up_arrow" "widget/up_dir"
+   ICON("go-down","icon_down_arrow.png",64)                        // "widget/down_arrow"
+   ICON("go-next","icon_right_arrow.png",64)                       // "widget/new_dialog"
+   ICON("go-previous","icon_left_arrow.png",64)                    // none
+   ICON("bookmark-new","icon_add_fav.png",64)                      // "widget/add_fav"
+   ICON("edit-swap","icon_swap.png",64)                     // *** // "widget/swap"
+   ICON("edit-copy","icon_efm_copy.png",16)                        // EFMBUTTON("copy"
+   ICON("edit-cut","icon_efm_cut.png",16)                          // EFMBUTTON("cut"
+   ICON("edit-paste","icon_efm_paste.png",16)                      // EFMBUTTON("paste"
+   ICON("edit-delete","icon_efm_delete.png",16)                    // EFMBUTTON("delete"
+   ICON("edit-rename","icon_efm_rename.png",16)                    // EFMBUTTON("rename"
+   ICON("edit-select-all","icon_efm_select.png",16)                // EFMBUTTON("select"
+   ICON("document-open","icon_efm_open.png",16)                    // "widget/open" EFMBUTTON("open") EFMBUTTON("new")
+   ICON("document-new","icon_new.png",64)                          // "widget/new"
+   ICON("document-properties","icon_efm_properties.png",16)        // EFMBUTTON("properties"
+   ICON("folder-new","icon_efm_new_dir.png",16)                    // EFMBUTTON("new_dir"
+   ICON("view-sort","icon_efm_sort.png",16)                 // *** // EFMBUTTON("sort",
+   ICON("view-order","icon_efm_sort.png",16)                // *** // EFMBUTTON("ordering"
+   ICON("view-hidden-files","icon_efm_view.png",16)         // *** // EFMBUTTON("hidden_files"
+   ICON("configure","icon_config.png",64)                          // "widget/config"
+   ICON("system-run","icon_run.png",64)                            // "enlightenment/run"
+   ICON("window-close","icon_close.png",64)                        // "widget/close"
+   ICON("dialog-ok-apply","icon_check.png",64)                     // "enlightenment/check"
+   ICON("transform-scale","icon_resize.png",64)                    // "widget/resize"
+   ICON("transform-move","icon_autoscroll.png",64)                 // "enlightenment/autoscroll"
+   ICON("view-refresh","icon_reset.png",16)                  // EFMBUTTON("refresh"
+   ICON("view-inherit","icon_dummy.png",64)                 // *** // EFMBUTTON("inherit"
+   ICON("screenshot","icon_screenshot.png",64)                     // dunno
+   //Standard Status Icons
+   ICON("dialog-warning","icon_warning.png",128)                   // "enlightenment/warning"
+   ICON("dialog-error","icon_warning.png",128)                     // "enlightenment/error"
+   ICON("dialog-ask","icon_dummy.png",64)                          // "enlightenment/unknown"
+   ICON("unknown","icon_dummy.png",64)                      // *** // "enlightenment/unknown"
+   //Standard Application Icons
+   ICON("preferences-desktop","icon_desktops.png",64)                         // "enlightenment/desktops"
+   ICON("preferences-desktop-theme","icon_theme.png",64)                      // "enlightenment/themes"
+   ICON("preferences-desktop-wallpaper","icon_wallpaper.png",64)              // "enlightenment/background"
+   ICON("preferences-desktop-color","icon_colors.png",64)                     // "enlightenment/colors"
+   ICON("preferences-desktop-font","icon_fonts.png",64)                       // "enlightenment/fonts"
+   ICON("preferences-desktop-screensaver","icon_screensaver.png",64)          // "enlightenment/screensaver"
+   ICON("preferences-desktop-display","icon_screen_setup.png",64)             // "enlightenment/screen_setup"
+   ICON("preferences-desktop-keyboard","icon_keyboard.png",64)                // "enlightenment/keys"
+   ICON("preferences-desktop-keyboard-shortcuts","icon_keys.png",64)          // "enlightenment/keys"
+   ICON("preferences-desktop-pointer","icon_mouse.png",64)             // *** // "enlightenment/mouse"
+   ICON("preferences-desktop-mouse","icon_mouse_clean.png",64)                // "enlightenment/mouse_clean"
+   ICON("preferences-desktop-mouse-left","icon_mouse_left.png",64)     // *** // "enlightenment/mouse_left"
+   ICON("preferences-desktop-mouse-right","icon_mouse_right.png",64)   // *** // "enlightenment/mouse_right"
+   ICON("preferences-desktop-mouse-middle","icon_mouse_middle.png",64) // *** // "enlightenment/mouse_middle"
+   ICON("preferences-desktop-mouse-wheel","icon_mouse_wheel.png",64)   // *** // "enlightenment/mouse_wheel"
+   ICON("preferences-desktop-mouse-extra","icon_mouse_extra.png",64)   // *** // "enlightenment/mouse_extra"
+   ICON("preferences-desktop-locale","icon_intl.png",64)                      // "enlightenment/intl"
+   ICON("preferences-desktop-mixer","icon_mixer.png",64)                      // "enlightenment/mixer"
+   ICON("preferences-desktop-shelf","icon_shelf.png",64)                        // *** // "enlightenment/shelf"
+   ICON("preferences-desktop-shelf-bottom-desk","icon_shelf_bottom_desk.png",64)// *** // "enlightenment/shelf_bottom_desk"
+   ICON("preferences-desktop-shelf-custom","icon_shelf_custom.png",64)          // *** // "enlightenment/shelf_custom"
+   ICON("preferences-desktop-shelf-dock","icon_shelf_dock.png",64)              // *** // "enlightenment/shelf_dock"
+   ICON("preferences-desktop-shelf-menu-bar","icon_shelf_menu_bar.png",64)      // *** // "enlightenment/shelf_menu_bar"
+   ICON("preferences-desktop-shelf-panel","icon_shelf_panel.png",64)            // *** // "enlightenment/shelf_panel"
+   ICON("preferences-desktop-shelf-top-desk","icon_shelf_top_desk.png",64)      // *** // "enlightenment/shelf_top_desk"
+   ICON("preferences-desktop-window-remember","icon_window_remembers.png",64)   // *** // "enlightenment/window_remembers"
+   ICON("preferences-position-bottom","icon_shelf_bottom.png",64)               // *** // "enlightenment/shelf_position_bottom"
+   ICON("preferences-position-bottom-left","icon_shelf_bottom_left.png",64)     // *** // "enlightenment/shelf_position_bottom_left"
+   ICON("preferences-position-bottom-right","icon_shelf_bottom_right.png",64)   // *** // "enlightenment/shelf_position_bottom_right"
+   ICON("preferences-position-top","icon_shelf_top.png",64)                     // *** // "enlightenment/shelf_position_top"
+   ICON("preferences-position-top-left","icon_shelf_top_left.png",64)           // *** // "enlightenment/shelf_position_top_left"
+   ICON("preferences-position-top-right","icon_shelf_top_right.png",64)         // *** // "enlightenment/shelf_position_top_right"
+   ICON("preferences-position-left","icon_shelf_left.png",64)                   // *** // "enlightenment/shelf_position_left"
+   ICON("preferences-position-left-top","icon_shelf_left_top.png",64)           // *** // "enlightenment/shelf_position_left_top"
+   ICON("preferences-position-left-bottom","icon_shelf_left_bottom.png",64)     // *** // "enlightenment/shelf_position_left_bottom"
+   ICON("preferences-position-right","icon_shelf_right.png",64)                 // *** // "enlightenment/shelf_position_right"
+   ICON("preferences-position-right-top","icon_shelf_right_top.png",64)         // *** // "enlightenment/shelf_position_right_top"
+   ICON("preferences-position-right-bottom","icon_shelf_right_bottom.png",64)   // *** // "enlightenment/shelf_position_right_bottom"
+   ICON("preferences-window-process","icon_window_process_management.png",64)    // *** // "enlightenment/window_process"
+   ICON("preferences-window-manipulation","icon_window_manipulation.png",64)    // *** // "enlightenment/window_manipulation"
+   ICON("preferences-window-maximize","icon_window_manipulation.png",64)        // *** // "enlightenment/window_maximize"
+   ICON("preferences-window-stacking","icon_winlist.png",64)                    // *** // "enlightenment/window_stacking"
+   ICON("preferences-window-geometry","icon_window_geometry.png",64)            // *** // "enlightenment/window_geometry"
+   ICON("preferences-windows-lost","icon_lost_windows.png",64)                  // *** // "enlightenment/lost_windows"
+   ICON("preferences-gradient","icon_gradient.png",64)           // *** // "enlightenment/gradient"
+   ICON("preferences-focus","icon_window_focus.png",64)          // *** // "enlightenment/focus"
+   ICON("preferences-engine","icon_engine.png",64)               // *** // "enlightenment/engine"
+   ICON("preferences-dialogs","icon_dummy.png",64)               // *** // "enlightenment/dialogs"
+   ICON("preferences-imc","icon_imc.png",64)                     // *** // "enlightenment/imc"
+   ICON("preferences-system-lock-screen","icon_desklock.png",64) // *** // "enlightenment/desklock"
+   ICON("preferences-icon-theme","icon_icon_theme.png",64)       // *** // "enlightenment/icon_theme"
+   ICON("preferences-transitions","icon_transitions.png",64)     // *** // "enlightenment/transitions"
+   ICON("preferences-desktop-edge-bindings","icon_shelf_right.png",64)  // *** // "enlightenment/edges"
+   ICON("preferences-toolbar","icon_toolbar.png",64)             // *** // "enlightenment/toolbar"
+   ICON("preferences-profiles","icon_profiles.png",64)           // *** // "enlightenment/profiles"
+   ICON("preferences-startup","icon_startup.png",64)             // *** // "enlightenment/startup"
+   ICON("preferences-winlist","icon_winlist.png",64)             // *** // "enlightenment/winlist"
+   ICON("preferences-menus","icon_menus.png",64)                 // *** // "enlightenment/menus"
+   ICON("preferences-menu-settings","icon_menu_settings.png",64) // *** // "enlightenment/menu_settings"
+   ICON("preferences-advanced","icon_advanced.png",64)           // *** // "enlightenment/advanced"
+   ICON("preferences-behavior","icon_behavior.png",64)           // *** // "enlightenment/behavior"
+   ICON("preferences-look","icon_look.png",64)                   // *** // "enlightenment/look"
+   ICON("preferences-utils","icon_gadget.png",64)                // *** // "enlightenment/utils"
+   ICON("preferences-extensions","icon_extensions.png",64)       // *** // "enlightenment/extensions"
+   ICON("preferences-file-icons","icon_file_icons.png",64)       // *** // "enlightenment/file_icons"
+   ICON("preferences-pager","icon_pager.png",64)                 // *** // "enlightenment/pager"
+   ICON("preferences-scale","icon_scale.png",64)                 // *** // "enlightenment/scale"
+   ICON("preferences-directories","icon_directories.png",64)     // *** // "enlightenment/directories"
+   ICON("preferences-screen-normal","icon_screen_normal.png",64) // *** // "enlightenment/screen_normal"
+   ICON("preferences-screen-around","icon_screen_around.png",64) // *** // "enlightenment/screen_around"
+   ICON("preferences-screen-left","icon_screen_left.png",64)     // *** // "enlightenment/screen_left"
+   ICON("preferences-screen-right","icon_screen_right.png",64)   // *** // "enlightenment/screen_right"
+   ICON("preferences-screen-vflip","icon_screen_vflip.png",64)   // *** // "enlightenment/screen_vflip"
+   ICON("preferences-screen-hflip","icon_screen_hflip.png",64)   // *** // "enlightenment/screen_hflip"
+   ICON("preferences-applications","icon_applications.png",64)                 // *** // "enlightenment/applications"
+   ICON("preferences-applications-add","icon_applications_new.png",64)         // *** // "enlightenment/add_application"
+   ICON("preferences-applications-ibar","icon_applications_ibar.png",64)       // *** // "enlightenment/ibar_applications"
+   ICON("preferences-applications-restart","icon_applications_restart.png",64) // *** // "enlightenment/restart_applications"
+   ICON("preferences-applications-startup","icon_applications_startup.png",64) // *** // "enlightenment/startup_applications"
+   ICON("preferences-desktop-default-applications","icon_advanced.png",64)
+   ICON("preferences-preferences","icon_config.png",64)                             // "enlightenment/configuration" "enlightenment/settings"
+   ICON("preferences-plugin","icon_modules.png",64)                                   // "enlightenment/modules"
+   ICON("preferences-system","icon_configuration.png",64)                             // "enlightenment/configuration" "enlightenment/settings"
+   ICON("preferences-system-windows","icon_windows.png",64)                           // "enlightenment/windows" "enlightenment/showhide"
+   ICON("preferences-system-performance","icon_performance.png",64)                   // "enlightenment/performance"
+   ICON("preferences-system-power-management","icon_power_management.png",64)         // "enlightenment/power_management"
+   ICON("preferences-system-screen-resolution","icon_screen_resolution.png",64)// *** // "enlightenment/screen_resolution"
+   ICON("preferences-illume","icon_illume.png",64)
+   ICON("system-file-manager","icon_efm_folder.png",64)                               // "enlightenment/fileman"
+   //Standard Module Category Icons 
+   ICON("modules-utils","icon_gadget.png",64)
+   ICON("modules-system","icon_gadget.png",64)
+   ICON("modules-look","icon_look.png",64)
+   ICON("modules-files","icon_efm_folder.png",64)
+   ICON("modules-launcher","icon_run.png",64)
+   ICON("modules-core","logo_white_128.png",64)
+   ICON("modules-mobile","icon_globe.png",64)
+   ICON("modules-settings","icon_config.png",64)
+   //Standard Emblem Icons
+   ICON("emblem-symbolic-link","icon_dummy.png",64)                // EFMBUTTON("symlink")
+   //Standard Place Icons
+   ICON("start-here","logo_white_128.png",128)                     // "enlightenment/e"
+   ICON("folder","icon_efm_folder.png",64)                         // "fileman/folder"
+   ICON("user-home","icon_efm_home.png",64)                        // "fileman/home"
+   ICON("user-temp","icon_efm_tmp.png",64)                  // *** // "fileman/tmp"
+   ICON("user-desktop","icon_efm_desktop.png",64)                  // "fileman/desktop"
+   ICON("user-bookmarks","icon_favorites.png",64)                  // "enlightenment/favorites"
+   ICON("folder-image","icon_wallpaper.png",64)                    // "enlightenment/picture"
+   ICON("network-website","icon_globe.png",64)                     // "enlightenment/website"
+   //Standard Device Icons
+   ICON("computer","icon_efm_root.png", 64)                        // "fileman/root"
+   ICON("drive-harddisk","icon_efm_hdd.png", 128)                  // "fileman/hd" "fileman/hdd"
+   ICON("drive-optical","icon_efm_cd.png", 128)                    // "fileman/??"
+   ICON("media-flash","icon_efm_flash.png", 128)                   // "fileman/??"
+   ICON("drive-removable-media","icon_efm_usbmedia.png", 128);
+   ICON("media-eject","icon_efm_eject.png", 64)
+   /* End of FreeDesktop.Org icons */
+   //E Specific icons
+   ICON("everything-launch","icon_advanced.png",64)
+   ICON("everything-clipboard","icon_evry_clipboard.png", 256)
+   //EFM Mime icons
+   ICONMIME("inode/chardevice","icon_efm_file.png",128)
+   ICONMIME("inode/blockdevice","icon_efm_file.png",128)
+   ICONMIME("inode/directory-locked","icon_efm_file.png",128)
+   ICONMIME("inode/directory","icon_efm_folder.png",128)
+   ICONMIME("inode/fifo","icon_efm_file.png",128)
+   ICONMIME("inode/socket","icon_efm_file.png",128)

data/elementary/themes/edc/about-e.edc

@@ -1,47 +1,56 @@
 group { name: "e/widgets/about/main";
    // data.item: "borderless" "1";
    // data.item: "shaped" "1";
-   images.image: "about-lines.png" COMP;
-   images.image: "about-triangles.png" COMP;
-   images.image: "win_shadow.png" COMP;
-   set { name: "logo_mono";
-      image { image: "logo.png" COMP;  size: 601 601 99999 99999; }
-      image { image: "logo2.png" COMP; size: 301 301   600   600; }
-      image { image: "logo3.png" COMP; size: 151 151   300   300; }
-      image { image: "logo4.png" COMP; size:  76  76   150   150; }
-      image { image: "logo5.png" COMP; size:  0    0    75    75; }
-   }
+   images.image: "bg_radgrad.png" COMP;
+   images.image: "dot_pattern.png" COMP;
+   images.image: "bevel_dark_out.png" COMP;
+   images.image: "vgrad_med_lighter.png" COMP;
+   images.image: "bevel_out.png" COMP;
+   images.image: "shine.png" COMP;
+   images.image: "shadow_square_tiny.png" COMP;
+   images.image: "screen_circular_shadow.png" COMP;
+   images.image: "logo_blue_bottom.png" COMP;
+   images.image: "button_normal.png" COMP;
+   images.image: "button_clicked.png" COMP;
    styles {
       style { name: "about_style";
-         base: "font="FN" font_size=10 align=center text_class=e-about color=cc:/fg/normal/text-overlay wrap=word";
-         tag: "hilight" "+ font="FNBD" text_class=tb_light color=cc:/fg/normal/text-hilight align=center";
+         base: "font="FN" font_size=10 align=center text_class=tb_plain color=#ffff style=shadow,bottom shadow_color=#00000080 wrap=word";
+         tag: "hilight" "+ font="FNBD" text_class=tb_light style=glow color=#3399ffff glow_color=#3399ff18 align=center glow2_color=#3399ff12";
          tag: "title" "+ font_size=16 font="FNBD" text_class=tb_big";
          tag: "/title" "- \n \n";
          tag: "br" "\n";
       }
       style { name: "authors_style";
-         base: "font="FNBD" font_size=10 align=left text_class=e-about-authors color=cc:/fg/normal/text-subtle wrap=none";
-         tag: "hilight" "+ font="FNBD" text_class=tb_light color=cc:/fg/normal/text-hilight";
-         tag: "title" "+ font_size=16 font="FNBD" text_class=tb_big";
+         base: "font="FNBD" font_size=16 align=left text_class=tb_plain color=#00000044 wrap=none";
+         tag: "hilight" "+ font="FNBD" text_class=tb_light color=#3399ff44";
+         tag: "title" "+ font_size=24 font="FNBD" text_class=tb_big";
          tag: "/title" "- \n \n";
          tag: "br" "\n";
       }
    }
-   min: 320 420;
+   min: 220 260;
+   max: 800 600;
    parts {
       part { name: "sizer"; type: SPACER;
          scale: 1;
          description { state: "default" 0.0;
-            min: 320 420;
+            min: 220 260;
          }
       }
-      part { name: "image"; type: RECT;
+      part { name: "bg";
          description { state: "default" 0.0;
-            fixed: 1 1;
-            color_class: "/bg/normal/entry";
+            image.normal: "bg_radgrad.png";
+            image.scale_hint: STATIC;
+            fill.smooth: 0;
+            ASPECT_FILL((1024/653))
+         }
+      }
+      part { name: "pat";
+         description { state: "default" 0.0;
+            image.normal: "dot_pattern.png";
+            TILED_PATTERN(256, 256)
          }
       }
-      ////////////////////////////////////////////////////////////////
       part { name: "e.textblock.authors"; type: TEXTBLOCK; mouse_events: 0;
          scale: 1;
          description { state: "default" 0.0;
@@ -49,38 +58,24 @@ group { name: "e/widgets/about/main";
             max: 20000 20000;
             min: 160 0;
             rel1.relative: 0.0 1.0;
-            rel1.offset: 13 13;
+            rel1.offset: 4 4;
             rel2.relative: 1.0 1.0;
-            rel2.offset: -14 13;
+            rel2.offset: -5 4;
             align: 0.5 0.0;
             text { style: "authors_style";
                min: 0 1;
                align: 0.5 0.0;
             }
-            offscale;
          }
          description { state: "up" 0.0;
             inherit: "default" 0.0;
             rel1.relative: 0.0 0.0;
-            rel1.offset: 13 -14;
+            rel1.offset: 4 -5;
             rel2.relative: 1.0 0.0;
-            rel2.offset: -14 -14;
+            rel2.offset: -5 -5;
             align: 0.5 1.0;
          }
       }
-      program { name: "show1";
-         signal: "show"; source: "";
-         action: STATE_SET "up" 0.0;
-         transition: LINEAR 60.0;
-         target: "e.textblock.authors";
-         after: "show2";
-      }
-      program { name: "show2";
-         action: STATE_SET "default" 0.0;
-         target: "e.textblock.authors";
-         after: "show1";
-      }
-      ////////////////////////////////////////////////////////////////
       part { name: "e.textblock.about"; type: TEXTBLOCK; mouse_events: 0;
          scale: 1;
          description { state: "default" 0.0;
@@ -88,208 +83,202 @@ group { name: "e/widgets/about/main";
             max: 20000 20000;
             min: 160 0;
             rel1.relative: 0.0 1.0;
-            rel1.offset: 13 13;
+            rel1.offset: 4 4;
             rel2.relative: 1.0 1.0;
-            rel2.offset: -14 13;
+            rel2.offset: -5 4;
             align: 0.5 0.0;
             text { style: "about_style";
                min: 0 1;
                align: 0.5 0.0;
             }
-            offscale;
          }
          description { state: "up" 0.0;
             inherit: "default" 0.0;
             rel1.relative: 0.0 0.0;
-            rel1.offset: 13 -14;
+            rel1.offset: 4 -5;
             rel2.relative: 1.0 0.0;
-            rel2.offset: -14 -14;
+            rel2.offset: -5 -5;
             align: 0.5 1.0;
          }
       }
-      program { name: "show3";
-         signal: "show"; source: "";
-         action: STATE_SET "up" 0.0;
-         transition: LINEAR 25.0;
-         target: "e.textblock.about";
-         after: "show4";
-      }
-      program { name: "show4";
-         action: STATE_SET "default" 0.0;
-         target: "e.textblock.about";
-         after: "show3";
-      }
-      ////////////////////////////////////////////////////////////////
-      part { name: "lines";
-         scale: 1;
+      part { name: "shadow"; mouse_events: 0;
          description { state: "default" 0.0;
-            image.normal: "about-lines.png";
-            min: 0 128;
-            align: 0.5 0.0;
             rel1.relative: 0.0 0.0;
-            rel2.relative: 1.0 0.0;
-            fill.smooth: 1;
-            color_class: "/bg/normal/titlebar";
-         }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
-            color_class: "/bg/selected/titlebar";
+            rel2.relative: 1.0 1.0;
+            image.normal: "screen_circular_shadow.png";
+            fill.smooth: 0;
+         }
+      }
+      part { name: "bevel";
+         description { state: "default" 0.0;
+            image.normal: "bevel_dark_out.png";
+            image.border: 1 1 1 1;
+            image.middle: 0;
+            fill.smooth: 0;
+         }
+      }
+      part { name: "top_shadow"; mouse_events: 0;
+         description { state: "default" 0.0;
+            rel1.offset: -3 -2;
+            rel1.to: "top_base";
+            rel2.offset: 3 4;
+            rel2.to: "top_base";
+            image.normal: "shadow_square_tiny.png";
+            image.border: 6 6 6 6;
+            fill.smooth: 0;
          }
       }
-      ////////////////////////////////////////////////////////////////
       part { name: "logo";
-         scale: 1;
          description { state: "default" 0.0;
-            image.normal: "logo_mono";
-            align: 0.5 0.0;
-            rel1.offset: 0 13;
-            rel2.offset: -1 13;
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 1.0 0.0;
-            FIXED_SIZE(75, 75)
-            offscale;
-            color_class: "/fg/normal/about/logo";
+            image.normal: "logo_blue_bottom.png";
+            image.scale_hint: STATIC;
+            FIXED_SIZE(263,100);
+            rel1.to: "top_base";
+            rel2.to: "top_base";
+            align: 0.5 0.25;
+         }
+      }
+      part { name: "top_base";
+         description { state: "default" 0.0;
+            image.normal: "vgrad_med_lighter.png";
+            rel2.to_y: "e.text.title";
+            rel2.offset: -1 3;
+            fill.smooth: 0;
+            TILED_HORIZ(120)
+         }
+      }
+      part { name: "top_bevel"; mouse_events: 0;
+         description { state: "default" 0.0;
+            rel1.to: "top_base";
+            rel2.to: "top_base";
+            image.normal: "bevel_out.png";
+            image.border: 1 1 1 1;
+            image.middle: 0;
+            fill.smooth: 0;
          }
       }
-      ////////////////////////////////////////////////////////////////
       part { name: "e.text.title"; type: TEXT;
          scale: 1;
+         effect: SHADOW BOTTOM;
          description { state: "default" 0.0;
-            align: 0.5 0.0;
-            rel1.offset: 0 13;
-            rel2.offset: -1 13;
-            rel1.relative: 0.0 1.0;
-            rel2.relative: 1.0 1.0;
-            rel.to: "logo";
-            color_class: "/fg/normal/text-heading";
-            text { font: FNBD; size: 16;
-               min: 1 1;
-               ellipsis: -1;
-               text_class: "about_title";
-            }
-            offscale;
-         }
-      }
-      ////////////////////////////////////////////////////////////////
-      part { name: "e.text.version"; type: TEXT;
-         scale: 1;
-         description { state: "default" 0.0;
-            align: 0.5 0.0;
-            rel1.offset: 0 13;
-            rel2.offset: -1 13;
-            rel1.relative: 0.0 1.0;
-            rel2.relative: 1.0 1.0;
-            rel.to: "e.text.title";
-            color_class: "/fg/normal/text-heading-sub";
+            align: 0.0 0.0;
+            rel1.offset: 3 3;
+            rel2.relative: 0.0 0.0;
+            rel2.offset: 3 3;
             text { font: FN; size: 10;
                min: 1 1;
                ellipsis: -1;
+               align: 0.0 0.0;
+               text_class: "about_title";
+            }
+            fixed: 1 1;
+         }
+      }
+      part { name: "e.text.version"; type: TEXT;
+         scale: 1;
+         effect: SHADOW BOTTOM;
+         description { state: "default" 0.0;
+            align: 1.0 0.0;
+            rel1.relative: 0.0 0.0;
+            rel1.offset: -4 3;
+            rel2.relative: 1.0 0.0;
+            rel2.offset: -4 3;
+            text { font: FN; size: 10;
+               min: 1 1;
+               ellipsis: -1;
+               align: 1.0 0.0;
                text_class: "about_version";
             }
-            offscale;
+            fixed: 1 1;
          }
       }
-      ////////////////////////////////////////////////////////////////
-#define TRI(_name, _size, _align) \
-      part { name: _name; \
-         scale: 1; \
-         description { state: "default" 0.0; \
-            max: _size (_size*180/255); \
-            align: _align 1.0; \
-            image.normal: "about-triangles.png"; \
-            aspect: (255/180) (255/180); aspect_preference: HORIZONTAL; \
-            rel1.relative: 0.0 1.0; \
-            color_class: "/bg/normal/background"; \
-            offscale; \
-         } \
-      }
-      TRI("t1", 127, 0.5)
-      TRI("t2", 83,  0.2)
-      TRI("t3", 163, 0.9)
-      TRI("t4", 47,  1.0)
-      TRI("t5", 63,  0.0)
-      TRI("t6", 99,  0.3)
-      TRI("t7", 199, 0.7)
-      TRI("t8", 141, 0.1)
-      TRI("t9", 75,  0.6)
-      ////////////////////////////////////////////////////////////////
-      part { name: "shadow"; mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel.to: "base";
-            WIN_SHADOW_SMALL;
-            color_class: "/shadow/normal";
-            offscale;
-         }
-         description { state: "clicked" 0.0;
-            inherit;
-            image.border_scale_by: 0.125;
-            rel1.offset: -2 -1;
-            rel2.offset: 1 2;
-            color_class: "/shadow/pressed";
-         }
-      }
-      part { name: "base"; type: RECT;
-         scale: 1;
+      part { name: "base";
          description { state: "default" 0.0;
+            image.normal: "button_normal.png";
+            image.border: 4 4 3 5;
+            image.middle: SOLID;
             rel1.offset: -6 -6;
             rel1.to: "e.text.label";
             rel2.offset: 5 5;
             rel2.to: "e.text.label";
-            color_class: "/bg/normal/button";
-            offscale;
-         }
+            fill.smooth: 0;
+                     }
          description { state: "clicked" 0.0;
             inherit: "default" 0.0;
-            rel1.offset: -5 -5;
-            rel2.offset: 4 4;
-            color_class: "/bg/pressed/button";
+            image.normal: "button_clicked.png";
+            image.border: 5 5 4 6;
          }
       }
       part { name: "e.text.label"; type: TEXT; mouse_events: 0;
+         effect: SHADOW BOTTOM;
          scale: 1;
          description { state: "default" 0.0;
-            rel1.offset: 0 -19;
+            rel1.offset: 0 -14;
             rel1.relative: 0.5 1.0;
-            rel2.offset: -1 -19;
+            rel2.offset: -1 -14;
             rel2.relative: 0.5 1.0;
-            color_class: "/fg/normal/button";
+            color: FN_COL_DEFAULT;
+            color_class: "button_text";
             align: 0.5 1.0;
-            min: 80 10;
             text { font: FN; size: 10;
                min: 1 1;
                ellipsis: -1;
+               align: 0.5 0.5;
                text_class: "button";
             }
-            offscale;
-         }
-         description { state: "clicked" 0.0;
-            inherit: "default" 0.0;
-            color_class: "/fg/pressed/button";
+            fixed: 1 1;
          }
       }
-      program { signal: "mouse,down,1*"; source: "base";
+      part { name: "shine"; mouse_events: 0;
+         description { state: "default" 0.0;
+            image.normal: "shine.png";
+            rel1.offset: 0 -2;
+            rel1.to: "top_base";
+            rel2.relative: 1.0 0.0;
+            rel2.offset: -1 2;
+            rel2.to: "top_base";
+            FIXED_SIZE(69, 5)
+         }
+      }
+   }
+   programs {
+      program { name: "show1";
+         signal: "show"; source: "";
+         action: STATE_SET "up" 0.0;
+         transition: LINEAR 45.0;
+         target: "e.textblock.about";
+         after: "show2";
+      }
+      program { name: "show2";
+         action: STATE_SET "default" 0.0;
+         target: "e.textblock.about";
+         after: "show1";
+      }
+      program { name: "show3";
+         signal: "show"; source: "";
+         action: STATE_SET "up" 0.0;
+         transition: LINEAR 120.0;
+         target: "e.textblock.authors";
+         after: "show4";
+      }
+      program { name: "show4";
+         action: STATE_SET "default" 0.0;
+         target: "e.textblock.authors";
+         after: "show3";
+      }
+      program {
+         signal: "mouse,down,1*"; source: "base";
          action: STATE_SET "clicked" 0.0;
-         target: "e.text.label";
          target: "base";
-         target: "shadow";
       }
-      program { signal: "mouse,up,1"; source: "base";
+      program {
+         signal: "mouse,up,1"; source: "base";
          action: STATE_SET "default" 0.0;
-         target: "e.text.label";
          target: "base";
-         target: "shadow";
       }
-      program { signal: "mouse,clicked,1*"; source: "base";
+      program {
+         signal: "mouse,clicked,1*"; source: "base";
          action: SIGNAL_EMIT "e,action,close" "";
       }
-      program { signal: "e,state,focused"; source: "e";
-         action: STATE_SET "focused" 0.0;
-         target: "lines";
-      }
-      program { signal: "e,state,unfocused"; source: "e";
-         action: STATE_SET "default" 0.0;
-         target: "lines";
-      }
    }
 }

data/elementary/themes/edc/about-theme.edc

@@ -1,100 +1,105 @@
 group { name: "e/theme/about";
    // data.item: "borderless" "1";
    // data.item: "shaped" "1";
-   images.image: "about-flat-bg.png" COMP;
-   images.image: "win_shadow.png" COMP;
-   min: 220 320;
+   images.image: "bevel_dark_out.png" COMP;
+   images.image: "screen_circular_shadow.png" COMP;
+   images.image: "button_normal.png" COMP;
+   images.image: "button_clicked.png" COMP;
+   min: 220 220;
+   max: 220 220;
    parts {
       part { name: "sizer"; type: SPACER;
          scale: 1;
          description { state: "default" 0.0;
-            min: 220 320;
+            min: 220 220;
          }
       }
-      part { name: "image";
+      part { name: "bg";
          description { state: "default" 0.0;
-            fixed: 1 1;
-            image.normal: "about-flat-bg.png";
-            aspect: 1.0 1.0; aspect_preference: NONE;
+            image.normal: "bg_radgrad.png";
+            image.scale_hint: STATIC;
+            fill.smooth: 0;
+            ASPECT_FILL((1024/653))
          }
       }
       part { name: "name"; type: TEXT; mouse_events: 0;
+         effect: GLOW;
          scale: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
-            color: 255 255 255 255; // no cc
+            color: FN_COL_HIGHLIGHT;
             rel1.relative: 0.5 0.5;
             rel2.relative: 0.5 0.5;
-            text { font: FNBD; size: 48;
-               text: "FLAT";
+            text { font: FNBD; size: 64;
+               text: "Dark";
                min: 1 1;
                ellipsis: -1;
                align: 0.5 0.5;
             }
-            offscale;
          }
       }
       part { name: "name2"; type: TEXT; mouse_events: 0;
+         effect: GLOW;
          scale: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
-            color: 255 255 255 192; // no cc
-            rel.to: "name";
-            rel1.relative: 0.0 1.0;
-            rel1.offset: 0 16;
-            rel2.relative: 1.0 1.0;
-            rel2.offset: -1 16;
-            align: 0.5 0.0;
+            color: FN_COL_HIGHLIGHT;
+            rel1.relative: 0.5 0.9;
+            rel1.to: "name";
+            rel2.relative: 0.5 0.9;
+            rel2.to: "name";
+            align: 0.5 1.0;
             text { font: FN; size: 10;
                text: "The default theme for Enlightenment";
                min: 1 1;
                ellipsis: -1;
-               align: 0.5 0.0;
+               align: 0.5 1.0;
             }
-            offscale;
          }
       }
-      ////////////////////////////////////////////////////////////////
       part { name: "shadow"; mouse_events: 0;
-         scale: 1;
          description { state: "default" 0.0;
-            rel.to: "base";
-            WIN_SHADOW_SMALL;
-            color_class: "/shadow/normal";
-            offscale;
-         }
-         description { state: "clicked" 0.0;
-            inherit;
-            image.border_scale_by: 0.125;
-            rel1.offset: -2 -1;
-            rel2.offset: 1 2;
-            color_class: "/shadow/pressed";
+            rel1.relative: 0.0 0.0;
+            rel2.relative: 1.0 1.0;
+            image.normal: "screen_circular_shadow.png";
+            fill.smooth: 0;
          }
       }
-      part { name: "base"; type: RECT;
-         scale: 1;
+      part { name: "bevel";
          description { state: "default" 0.0;
-            rel.to: "e.text.label";
-            rel1.offset: -6 -6;
-            rel2.offset: 5 5;
-            color_class: "/bg/normal/button";
-            offscale;
+            image.normal: "bevel_dark_out.png";
+            image.border: 1 1 1 1;
+            image.middle: 0;
+            fill.smooth: 0;
          }
+      }
+      part { name: "base";
+         description { state: "default" 0.0;
+            image.normal: "button_normal.png";
+            image.border: 4 4 3 5;
+            image.middle: SOLID;
+            rel1.offset: -6 -6;
+            rel1.to: "e.text.label";
+            rel2.offset: 5 5;
+            rel2.to: "e.text.label";
+            fill.smooth: 0;
+                     }
          description { state: "clicked" 0.0;
             inherit: "default" 0.0;
-            rel1.offset: -5 -5;
-            rel2.offset: 4 4;
-            color_class: "/bg/pressed/button";
+            image.normal: "button_clicked.png";
+            image.border: 5 5 4 6;
          }
       }
       part { name: "e.text.label"; type: TEXT; mouse_events: 0;
+         effect: SHADOW BOTTOM;
          scale: 1;
          description { state: "default" 0.0;
             rel1.offset: -14 -14;
             rel1.relative: 1.0 1.0;
             rel2.offset: -14 -14;
             rel2.relative: 1.0 1.0;
-            color_class: "/fg/normal/button";
+            color: FN_COL_DEFAULT;
+            color_class: "button_text";
             align: 1.0 1.0;
             min: 85 0;
             text { font: FN; size: 10;
@@ -104,67 +109,35 @@ group { name: "e/theme/about";
                text_class: "button";
             }
             fixed: 1 1;
-            offscale;
-         }
-         description { state: "clicked" 0.0;
-            inherit: "default" 0.0;
-            color_class: "/fg/pressed/button";
          }
       }
-      program { signal: "mouse,down,1*"; source: "base";
-         action: STATE_SET "clicked" 0.0;
-         target: "base";
-         target: "shadow";
-         target: "e.text.label";
-      }
-      program { signal: "mouse,up,1"; source: "base";
-         action: STATE_SET "default" 0.0;
-         target: "base";
-         target: "shadow";
-         target: "e.text.label";
-      }
-      program { signal: "mouse,clicked,1*"; source: "base";
-         action: SIGNAL_EMIT "e,action,close" "";
-      }
-      ////////////////////////////////////////////////////////////////
-      part { name: "shadow2"; mouse_events: 0;
-         scale: 1;
+      part { name: "base2";
          description { state: "default" 0.0;
-            rel.to: "base2";
-            WIN_SHADOW_SMALL;
-            color_class: "/shadow/normal";
-            offscale;
-         }
-         description { state: "clicked" 0.0;
-            inherit;
-            image.border_scale_by: 0.125;
-            rel1.offset: -2 -1;
-            rel2.offset: 1 2;
-            color_class: "/shadow/pressed";
-         }
-      }
-      part { name: "base2"; type: RECT;
-         description { state: "default" 0.0;
-            rel.to: "e.text.theme";
+            image.normal: "button_normal.png";
+            image.border: 4 4 3 5;
+            image.middle: SOLID;
             rel1.offset: -6 -6;
+            rel1.to: "e.text.theme";
             rel2.offset: 5 5;
-            color_class: "/bg/normal/button";
-         }
+            rel2.to: "e.text.theme";
+            fill.smooth: 0;
+                     }
          description { state: "clicked" 0.0;
             inherit: "default" 0.0;
-            rel1.offset: -5 -5;
-            rel2.offset: 4 4;
-            color_class: "/bg/pressed/button";
+            image.normal: "button_clicked.png";
+            image.border: 5 5 4 6;
          }
       }
       part { name: "e.text.theme"; type: TEXT; mouse_events: 0;
+         effect: SHADOW BOTTOM;
          scale: 1;
          description { state: "default" 0.0;
             rel1.offset: 13 -14;
             rel1.relative: 0.0 1.0;
             rel2.offset: 13 -14;
             rel2.relative: 0.0 1.0;
-            color_class: "/fg/normal/button";
+            color: FN_COL_DEFAULT;
+            color_class: "button_text";
             align: 0.0 1.0;
             min: 85 0;
             text { font: FN; size: 10;
@@ -174,26 +147,36 @@ group { name: "e/theme/about";
                text_class: "button";
             }
             fixed: 1 1;
-            offscale;
-         }
-         description { state: "clicked" 0.0;
-            inherit: "default" 0.0;
-            color_class: "/fg/pressed/button";
          }
       }
-      program { signal: "mouse,down,1*"; source: "base2";
+   }
+   programs {
+      program {
+         signal: "mouse,down,1*"; source: "base";
+         action: STATE_SET "clicked" 0.0;
+         target: "base";
+      }
+      program {
+         signal: "mouse,up,1"; source: "base";
+         action: STATE_SET "default" 0.0;
+         target: "base";
+      }
+      program {
+         signal: "mouse,clicked,1*"; source: "base";
+         action: SIGNAL_EMIT "e,action,close" "";
+      }
+      program {
+         signal: "mouse,down,1*"; source: "base2";
          action: STATE_SET "clicked" 0.0;
          target: "base2";
-         target: "shadow2";
-         target: "e.text.theme";
       }
-      program { signal: "mouse,up,1"; source: "base2";
+      program {
+         signal: "mouse,up,1"; source: "base2";
          action: STATE_SET "default" 0.0;
          target: "base2";
-         target: "shadow2";
-         target: "e.text.theme";
       }
-      program { signal: "mouse,clicked,1*"; source: "base2";
+      program {
+         signal: "mouse,clicked,1*"; source: "base2";
          action: SIGNAL_EMIT "e,action,settings,theme" "";
       }
    }

data/elementary/themes/edc/appmenu.edc

@@ -1,49 +1,72 @@
 group { name: "e/modules/appmenu/item";
+   images.image: "vgrad_med_dark.png" COMP;
    data.item: "padding_horizontal" "5";
-   data.item: "padding_vertical"   "5";
+   data.item: "padding_vertical" "5";
    parts {
-      part { name: "background"; type: RECT; mouse_events: 0;
-         description { state: "default" 0.0;
-            color_class: "/bg/normal/menu/item";
+      part {
+         name: "event_area";
+         type: RECT;
+         mouse_events: 1;
+         description {
+            state: "default" 0.0;
+            color: 0 0 0 0;
+         }
+      }
+      part {
+         name: "background";
+         type: IMAGE;
+         mouse_events: 0;
+         description {
+            state: "default" 0.0;
+            image.normal: "vgrad_med_dark.png";
+            fill.smooth: 0;
+            TILED_HORIZ(120)
             visible: 0;
          }
-         description { state: "selected" 0.0;
+         description {
+            state: "selected" 0.0;
             inherit: "default" 0.0;
-            color_class: "/bg/selected/menu/item";
             visible: 1;
          }
       }
-      part { name: "text"; type: TEXT; mouse_events: 0;
+      part {
+         name: "text";
+         type: TEXT;
+         mouse_events: 0;
+         effect: SHADOW BOTTOM;
          scale: 1;
-         description { state: "default" 0.0;
-            rel1.offset: 4 4;
-            rel2.offset: -5 -5;
-            color_class: "/fg/normal/menu/item";
-            text { font: FN; size: 10;
+         description {
+            state: "default" 0.0;
+            rel1.offset: 2 2;
+            rel2.offset: -3 -3;
+            color: FN_COL_DEFAULT;
+            text {
+               font: FN;
+               size: 10;
                min: 1 1;
                ellipsis: -1;
+               align: 0.5 0.5;
                text_class: "label";
             }
-            offscale;
          }
-         description { state: "selected" 0.0;
+         description {
+            state: "selected" 0.0;
             inherit: "default" 0.0;
-            color_class: "/fg/selected/menu/item";
-         }
-      }
-      part { name: "event_area"; type: RECT;
-         description { state: "default" 0.0;
-            color: 0 0 0 0; // no cc
+            color: FN_COL_HIGHLIGHT;
          }
       }
    }
    programs {
-      program { signal: "mouse,in"; source: "event_area";
+      program {
+         signal: "mouse,in";
+         source: "event_area";
          action: STATE_SET "selected" 0.0;
          target: "background";
          target: "text";
       }
-      program { signal: "mouse,out"; source: "event_area";
+      program {
+         signal: "mouse,out";
+         source: "event_area";
          action: STATE_SET "default" 0.0;
          target: "background";
          target: "text";

data/elementary/themes/edc/background.edc

@@ -1,17 +1,19 @@
 group { name: "e/desktop/background";
-   alias: "elm/ews/background/default";
-   BACKGROUND_IMG
+   images.image: "bg_radgrad.png" COMP;
+   images.image: "dot_pattern.png" COMP;
    parts {
-      part { name: "clip"; type: RECT; mouse_events: 0;
+      part { name: "bg";
          description { state: "default" 0.0;
+            image.normal: "bg_radgrad.png";
+            image.scale_hint: STATIC;
+            fill.smooth: 0;
+            ASPECT_FILL((1024/653))
          }
       }
-      part { name: "bg";
-         clip_to: "clip";
+      part { name: "pat";
          description { state: "default" 0.0;
-            image.normal: "background";
-            image.scale_hint: STATIC;
-            ASPECT_FILL((7680/4320))
+            image.normal: "dot_pattern.png";
+            TILED_PATTERN(256, 256)
          }
       }
    }

data/elementary/themes/edc/backlight.edc

@@ -1,8 +1,10 @@
 group { name: "e/modules/backlight/main";
-   alias: "e/modules/backlight/main_vert";
-   images.image: "bulb_middle.png" COMP;
+   alias: "e/gadget/backlight/main";
+   alias: "e/gadget/backlight/main_vert";
+   images.image: "bulb_glow.png" COMP;
+   images.image: "bulb_off.png" COMP;
+   images.image: "bulb_on.png" COMP;
    images.image: "bulb_over.png" COMP;
-   images.image: "bulb_filament.png" COMP;
    min: 16 16;
    max: 160 160;
    script {
@@ -11,49 +13,54 @@ group { name: "e/modules/backlight/main";
             new Float:val;
             val = getfarg(2);
             set_tween_state(PART:"glow", val, "default", 0.0, "full", 0.0);
-            set_tween_state(PART:"filament", val, "default", 0.0, "full", 0.0);
+            set_tween_state(PART:"glow2", val, "default", 0.0, "full", 0.0);
          }
       }
    }
    parts {
-      part { name: "base";
-         description { state: "default" 0.0;
-            aspect: 1.0 1.0; aspect_preference: BOTH;
-            image.normal: "bulb_middle.png";
-            color_class: "/bg-dark/normal/gadgets/backlight";
-         }
-      }
       part { name: "glow";
          description { state: "default" 0.0;
-            rel.to: "base";
-            rel1.relative: 0.5 0.5;
-            rel2.relative: 0.5 0.5;
-            image.normal: "bulb_middle.png";
-            color_class: "/fg/normal/gadgets/backlight/light/off";
+            rel1.to: "base";
+            rel1.relative: (76/152) (69/152);
+            rel2.to: "base";
+            rel2.relative: (76/152) (69/152);
+            image.normal: "bulb_glow.png";
+            color: 255 255 255 0;
+            max: 138 138;
          }
          description { state: "full" 0.0;
             inherit: "default" 0.0;
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 1.0 1.0;
-            color_class: "/fg/normal/gadgets/backlight/light/on";
+            rel1.relative: (7/152) (0/152);
+            rel2.relative: (145/152) (138/152);
+            color: 255 255 255 255;
          }
       }
-      part { name: "filament";
+      part { name: "base";
          description { state: "default" 0.0;
-            rel.to: "base";
-            image.normal: "bulb_filament.png";
-            color_class: "/fg/normal/gadgets/backlight/filament/off";
+            rel1.relative: (4/160) (4/160);
+            rel2.relative: (156/160) (156/160);
+            aspect: 1.0 1.0; aspect_preference: BOTH;
+            image.normal: "bulb_off.png";
+            max: 152 152;
+         }
+      }
+      part { name: "glow2";
+         description { state: "default" 0.0;
+            rel1.to: "base";
+            rel2.to: "base";
+            image.normal: "bulb_on.png";
+            color: 255 255 255 0;
          }
          description { state: "full" 0.0;
             inherit: "default" 0.0;
-            color_class: "/fg/normal/gadgets/backlight/filament/on";
+            color: 255 255 255 255;
          }
       }
       part { name: "over";
          description { state: "default" 0.0;
-            rel.to: "base";
+            rel1.to: "base";
+            rel2.to: "base";
             image.normal: "bulb_over.png";
-            color_class: "/fg/normal/gadgets/backlight/base";
          }
       }
    }

data/elementary/themes/edc/batman.edc

@@ -0,0 +1,272 @@
+group { name: "e/gadget/batman/main";
+   alias: "e/gadget/batman/main_vert";
+   images.image: "bat_shadow.png" COMP;
+   images.image: "bat_base.png" COMP;
+   images.image: "bat_bottom0.png" COMP;
+   images.image: "bat_top0.png" COMP;
+   images.image: "batman_overlay.png" COMP;
+   images.image: "glow_med_white.png" COMP;
+   script {
+      public message(Msg_Type:type, id, ...) {
+         if ((type == MSG_FLOAT) && (id == 1)) {
+            new Float:val;
+            new r = 51, g = 153, b = 255;
+            new lr = 255, lg = 0, lb = 0;
+            
+            val = getfarg(2);
+            if (val < 0.35) {
+               new Float:val1, Float:val2;
+               
+               val1 = (val - 0.10) / 0.25;
+               val2 = 1.0 - val1;
+               r = round((r * val1) + (lr * val2), ROUND);
+               g = round((g * val1) + (lg * val2), ROUND);
+               b = round((b * val1) + (lb * val2), ROUND);
+            } 
+            custom_state(PART:"fill", "default", 0.0);
+            set_state_val(PART:"fill", STATE_COLOR, r, g, b, 255);
+            set_state_val(PART:"fill", STATE_COLOR, r, g, b, 255);
+            set_state_val(PART:"fill", STATE_COLOR, r, g, b, 255);
+            set_state_val(PART:"fill", STATE_REL1, 0.0, 1.0 - val);
+            set_state(PART:"fill", "custom", 0.0);
+         }
+      }
+   }
+   parts {
+      part { name: "fade_clip"; type: RECT;
+         description { state: "default" 0.0;
+            color: 255 255 255 255;
+         }
+         description { state: "faded" 0.0;
+            color: 128 128 128 255;
+         }
+      }
+      part { name: "pulse_clip"; type: RECT;
+         clip_to: "fade_clip";
+         description { state: "default" 0.0;
+            color: 255 255 255 255;
+         }
+         description { state: "faded" 1.0;
+            color: 255 255 255 255;
+         }
+         description { state: "faded" 0.0;
+            color: 255 255 255 64;
+         }
+      }
+      part { name: "fill_region"; type: SPACER;
+         description { state: "default" 0.0;
+            rel1.to: "bg";
+            rel1.offset: 1 0;
+            rel2.to: "bg";
+            rel2.offset: -2 -1;
+         }
+      }
+      part { name: "pwr"; type: SPACER;
+         description { state: "default" 0.0;
+            rel1.to: "bg";
+            rel1.relative: 0.40 0.40;
+            rel2.to: "bg";
+            rel2.relative: 0.60 0.60;
+            aspect: 1.0 1.0; aspect_preference: BOTH;
+            step: 5 5;
+         }
+      }
+      part { name: "base"; type: SPACER;
+         description { state: "default" 0.0;
+            aspect: 1.0 1.0; aspect_preference: BOTH;
+         }
+      }
+      part { name: "shadow";
+         clip_to: "pulse_clip";
+         description { state: "default" 0.0;
+            rel1.to: "top";
+            rel1.offset: -4 0;
+            rel2.to: "bottom";
+            rel2.offset: 3 3;
+            image.normal: "bat_shadow.png";
+         }
+      }
+      part { name: "bg";
+         clip_to: "pulse_clip";
+         description { state: "default" 0.0;
+            rel1.to: "top";
+            rel1.relative: 0.0 1.0;
+            rel2.to: "bottom";
+            rel2.relative: 1.0 0.0;
+            image.normal: "bat_base.png";
+            fill.smooth: 0;
+         }
+      }
+      part { name: "top";
+         clip_to: "pulse_clip";
+         description { state: "default" 0.0;
+            rel1.to: "base";
+            rel1.offset: 6 4;
+            rel2.to: "base";
+            rel2.offset: -7 4;
+            rel2.relative: 1.0 0.0;
+            aspect: (112/24) (112/24); aspect_preference: HORIZONTAL;
+            align: 0.5 0.0;
+            image.normal: "bat_top0.png";
+         }
+      }
+      part { name: "bottom";
+         clip_to: "pulse_clip";
+         description { state: "default" 0.0;
+            rel1.to: "base";
+            rel1.offset: 6 -5;
+            rel2.to: "base";
+            rel2.offset: -7 -5;
+            aspect: (112/12) (112/12); aspect_preference: HORIZONTAL;
+            align: 0.5 1.0;
+            image.normal: "bat_bottom0.png";
+         }
+      }
+      part { name: "fill"; mouse_events: 0;
+         clip_to: "pulse_clip";
+         description { state: "default" 0.0;
+            rel1.to: "fill_region";
+            rel1.offset: -5 -5;
+            rel2.to: "fill_region";
+            rel2.offset: 4 4;
+            image.normal: "glow_med_white.png";
+            image.border: 10 10 10 10;
+            color: 51 153 255 255;
+         }
+      }
+      part { name: "overlay";
+         clip_to: "pulse_clip";
+         description { state: "default" 0.0;
+            rel1.to: "bg";
+            rel1.offset: 0 0;
+            rel2.to: "bg";
+            rel2.offset: -1 -1;
+            image.normal: "batman_overlay.png";
+            image.border: 0 0 7 7;
+         }
+      }
+      part { name: "pwr1";
+         clip_to: "pulse_clip";
+         description { state: "default" 0.0;
+            rel1.to: "pwr";
+            rel1.relative: (2/5) 0.0;
+            rel1.offset: -5 -5;
+            rel2.to: "pwr";
+            rel2.relative: (3/5) 1.0;
+            rel2.offset: 4 4;
+            image.normal: "glow_med_white.png";
+            image.border: 5 5 5 5;
+            fill.smooth: 0;
+            visible: 0;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      part { name: "pwr2";
+         clip_to: "pulse_clip";
+         description { state: "default" 0.0;
+            rel1.to: "pwr";
+            rel1.relative: 0.0 (2/5);
+            rel1.offset: -5 -5;
+            rel2.to: "pwr";
+            rel2.relative: 1.0 (3/5);
+            rel2.offset: 4 4;
+            image.normal: "glow_med_white.png";
+            image.border: 5 5 5 5;
+            fill.smooth: 0;
+            visible: 0;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      part { name: "over"; type: RECT;
+         description { state: "default" 0.0;
+            color: 0 0 0 0;
+         }
+      }
+   }
+   programs {
+      program {
+         signal: "e,state,charging"; source: "e";
+         action: STATE_SET "visible" 0.0;
+         target: "pwr1";
+         target: "pwr2";
+      }
+      program {
+         signal: "e,state,discharging"; source: "e";
+         action: STATE_SET "default" 0.0;
+         target: "pwr1";
+         target: "pwr2";
+      }
+      program {
+         signal: "e,state,unknown"; source: "e";
+         action: STATE_SET "faded" 0.0;
+         target: "fade_clip";
+      }
+      program { name: "pulse";
+         signal: "e,action,pulse,start"; source: "e";
+         action: STATE_SET "faded" 0.0;
+         transition: ACCELERATE 0.3;
+         after: "pulse2";
+         target: "pulse_clip";
+      }
+      program { name: "pulse2";
+         action: STATE_SET "faded" 1.0; transition: ACCELERATE 0.1;
+         target: "pulse_clip";
+      }
+      program {
+         signal: "e,action,pulse,stop"; source: "e";
+         action: STATE_SET "default" 0.0;
+         target: "pulse_clip";
+      }
+   }
+}
+
+group { name: "e/gadget/batman/popup";
+   min: 240 60;
+   parts {
+      part { name: "e.swallow.batman"; type: SWALLOW;
+         description { state: "default" 0.0;
+            aspect: 1.0 1.0; aspect_preference: VERTICAL;
+            min: 1 1;
+            max: 160 160;
+            align: 0.0 0.5;
+         }
+      }
+      part { name: "e.text.title"; type: TEXT;
+         effect: SHADOW BOTTOM;
+         scale: 1;
+         description { state: "default" 0.0;
+            rel1.relative: 1.0 0.0;
+            rel1.to_x: "e.swallow.batman";
+            rel2.relative: 1.0 0.5;
+            color: FN_COL_DEFAULT;
+            text { font: "Sans:style=Bold"; size: 10;
+               text: "Your battery is low!";
+               min: 1 1;
+               ellipsis: -1;
+               text_class: "module_large";
+            }
+         }
+      }
+      part { name: "e.text.label"; type: TEXT;
+         effect: SHADOW BOTTOM;
+         scale: 1;
+         description { state: "default" 0.0;
+            rel1.relative: 1.0 0.5;
+            rel1.to_x: "e.swallow.batman";
+            color: FN_COL_DEFAULT;
+            text { font: "Sans"; size: 10;
+               text: "AC power is recommended.";
+               min: 1 1;
+               ellipsis: -1;
+               text_class: "module_normal";
+            }
+         }
+      }
+   }
+}

data/elementary/themes/edc/battery.edc

@@ -1,78 +1,210 @@
 group { name: "e/modules/battery/main";
+   images.image: "bat_shadow.png" COMP;
    images.image: "bat_base.png" COMP;
-   min: 16 16;
-   max: 160 160;
+   images.image: "bat_shine.png" COMP;
+   images.image: "bat_bottom0.png" COMP;
+   images.image: "bat_bottom1.png" COMP;
+   images.image: "bat_top0.png" COMP;
+   images.image: "bat_top1.png" COMP;
+   images.image: "glow_med_white.png" COMP;
    script {
-      public load_time;
       public message(Msg_Type:type, id, ...) {
          if ((type == MSG_FLOAT) && (id == 1)) {
-            new Float:val = getfarg(2);
-            val = 0.05 + (0.9 * (1.0 - val));
-            custom_state(PART:"fill_clip", "default", 0.0);
-            set_state_val(PART:"fill_clip", STATE_REL1, 0.0, val);
-            set_state(PART:"fill_clip", "custom", 0.0);
+            new Float:val;
+            new r = 51, g = 153, b = 255;
+            new lr = 255, lg = 0, lb = 0;
+            
+            val = getfarg(2);
+            if (val < 0.35) {
+               new Float:val1, Float:val2;
+               
+               val1 = (val - 0.10) / 0.25;
+               val2 = 1.0 - val1;
+               r = round((r * val1) + (lr * val2), ROUND);
+               g = round((g * val1) + (lg * val2), ROUND);
+               b = round((b * val1) + (lb * val2), ROUND);
+            } 
+            custom_state(PART:"fill", "default", 0.0);
+            set_state_val(PART:"fill", STATE_COLOR, r, g, b, 255);
+            set_state_val(PART:"fill", STATE_COLOR, r, g, b, 255);
+            set_state_val(PART:"fill", STATE_COLOR, r, g, b, 255);
+            set_state_val(PART:"fill", STATE_REL1, 0.0, 1.0 - val);
+            set_state(PART:"fill", "custom", 0.0);
          }
       }
-      public Float:year_sec() {
-         new year, month, day, yearday, weekday, hour, minute;
-         new Float:second;
-
-         date(year, month, day, yearday, weekday, hour, minute, second);
-         return seconds() + float(yearday * 24 * 3600);
-      }
-      public run_prog_later(prog) {
-         new Float:second, Float:start;
-
-         second = Float:year_sec();
-         start = get_float(load_time);
-         if ((second - start) > float(5)) run_program(prog);
-      }
    }
    parts {
-      part { name: "pulse_clip"; type: RECT;
+      part { name: "fade_clip"; type: RECT;
          description { state: "default" 0.0;
-            rel.to: "bg";
+            color: 255 255 255 255;
          }
          description { state: "faded" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 128; // no cc
-         }
-      }
-      part { name: "fill_clip"; type: RECT;
-         clip_to: "pulse_clip";
-         description { state: "default" 0.0;
-            rel.to: "bg";
+            color: 128 128 128 255;
          }
       }
       part { name: "info_clip"; type: RECT;
+         clip_to: "fade_clip";
          description { state: "default" 0.0;
-            rel.to: "bg";
-            color_class: "/fg/normal/gadgets/battery/text/info";
-            color: 255 255 255 0; // no cc
+            color: 255 255 255 0;
          }
          description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 255; // no cc
+            color: 255 255 255 255;
+         }
+      }
+      part { name: "pulse_clip"; type: RECT;
+         clip_to: "fade_clip";
+         description { state: "default" 0.0;
+            color: 255 255 255 255;
+         }
+         description { state: "faded" 1.0;
+            color: 255 255 255 255;
+         }
+         description { state: "faded" 0.0;
+            color: 255 255 255 64;
+         }
+      }
+      part { name: "fill_region"; type: SPACER;
+         description { state: "default" 0.0;
+            rel1.to: "bg";
+            rel2.to: "bg";
+         }
+      }
+      part { name: "pwr"; type: SPACER;
+         description { state: "default" 0.0;
+            rel1.to: "bg";
+            rel1.relative: 0.40 0.40;
+            rel2.to: "bg";
+            rel2.relative: 0.60 0.60;
+            aspect: 1.0 1.0; aspect_preference: BOTH;
+            step: 5 5;
+         }
+      }
+      part { name: "base"; type: SPACER;
+         description { state: "default" 0.0;
+            aspect: 1.0 1.0; aspect_preference: BOTH;
+         }
+      }
+      part { name: "shadow";
+         clip_to: "pulse_clip";
+         description { state: "default" 0.0;
+            rel1.to: "top";
+            rel1.offset: -4 0;
+            rel2.to: "bottom";
+            rel2.offset: 3 3;
+            image.normal: "bat_shadow.png";
          }
       }
       part { name: "bg";
          clip_to: "pulse_clip";
          description { state: "default" 0.0;
-            aspect: 1.0 1.0; aspect_preference: BOTH;
+            rel1.to: "top";
+            rel1.relative: 0.0 1.0;
+            rel2.to: "bottom";
+            rel2.relative: 1.0 0.0;
             image.normal: "bat_base.png";
-            color_class: "/bg-dark/normal/gadgets/battery/base";
+            fill.smooth: 0;
          }
       }
-      part { name: "fill";
-         clip_to: "fill_clip";
+      part { name: "top";
+         clip_to: "pulse_clip";
          description { state: "default" 0.0;
-            rel.to: "bg";
-            image.normal: "bat_base.png";
-            color_class: "/fg/normal/gadgets/battery/level/discharge";
+            rel1.to: "base";
+            rel1.offset: 6 4;
+            rel2.to: "base";
+            rel2.offset: -7 4;
+            rel2.relative: 1.0 0.0;
+            aspect: (112/24) (112/24); aspect_preference: HORIZONTAL;
+            align: 0.5 0.0;
+            image.normal: "bat_top0.png";
          }
-         description { state: "charging" 0.0;
+      }
+      part { name: "bottom";
+         clip_to: "pulse_clip";
+         description { state: "default" 0.0;
+            rel1.to: "base";
+            rel1.offset: 6 -5;
+            rel2.to: "base";
+            rel2.offset: -7 -5;
+            aspect: (112/12) (112/12); aspect_preference: HORIZONTAL;
+            align: 0.5 1.0;
+            image.normal: "bat_bottom0.png";
+         }
+      }
+      part { name: "fill"; mouse_events: 0;
+         clip_to: "pulse_clip";
+         description { state: "default" 0.0;
+            rel1.to: "fill_region";
+            rel1.offset: -5 -5;
+            rel2.to: "fill_region";
+            rel2.offset: 4 4;
+            image.normal: "glow_med_white.png";
+            image.border: 10 10 10 10;
+            color: 51 153 255 255;
+         }
+      }
+      part { name: "top-shine";
+         clip_to: "pulse_clip";
+         description { state: "default" 0.0;
+            rel1.to: "top";
+            rel2.to: "top";
+            image.normal: "bat_top1.png";
+         }
+      }
+      part { name: "bottom-shine";
+         clip_to: "pulse_clip";
+         description { state: "default" 0.0;
+            rel1.to: "bottom";
+            rel2.to: "bottom";
+            image.normal: "bat_bottom1.png";
+         }
+      }
+      part { name: "shine";
+         clip_to: "pulse_clip";
+         description { state: "default" 0.0;
+            rel1.to: "bg";
+            rel1.offset: 0 -6;
+            rel2.to: "bg";
+            rel2.offset: -1 5;
+            image.normal: "bat_shine.png";
+            image.border: 0 0 7 7;
+         }
+      }
+      part { name: "pwr1";
+         clip_to: "pulse_clip";
+         description { state: "default" 0.0;
+            rel1.to: "pwr";
+            rel1.relative: (2/5) 0.0;
+            rel1.offset: -5 -5;
+            rel2.to: "pwr";
+            rel2.relative: (3/5) 1.0;
+            rel2.offset: 4 4;
+            image.normal: "glow_med_white.png";
+            image.border: 5 5 5 5;
+            fill.smooth: 0;
+            visible: 0;
+         }
+         description { state: "visible" 0.0;
             inherit: "default" 0.0;
-            color_class: "/fg/normal/gadgets/battery/level/charge";
+            visible: 1;
+         }
+      }
+      part { name: "pwr2";
+         clip_to: "pulse_clip";
+         description { state: "default" 0.0;
+            rel1.to: "pwr";
+            rel1.relative: 0.0 (2/5);
+            rel1.offset: -5 -5;
+            rel2.to: "pwr";
+            rel2.relative: 1.0 (3/5);
+            rel2.offset: 4 4;
+            image.normal: "glow_med_white.png";
+            image.border: 5 5 5 5;
+            fill.smooth: 0;
+            visible: 0;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
          }
       }
       part { name: "e.text.reading"; type: TEXT; mouse_events: 0;
@@ -80,12 +212,15 @@ group { name: "e/modules/battery/main";
          clip_to: "info_clip";
          description { state: "default" 0.0;
             align: 0.5 0.0;
-            rel.to: "bg";
-            rel1.relative: 0.25 0.15;
-            rel2.relative: 0.75 0.53;
-            color_class: "/fg/normal/gadgets/battery/text/reading";
-            text { font: FN; size: 8;
-               min: 0 1;
+            rel1.to: "bg";
+            rel1.offset: 0 -2;
+            rel2.relative: 1.0 0.0;
+            rel2.to_x: "bg";
+            rel2.to_y: "pwr";
+            rel2.offset: -1 2;
+            color_class: "module_label_plain";
+            color3: 255 255 255 255;
+            text { font: "Sans";
                fit: 1 1;
                ellipsis: -1;
                align: 0.5 0.5;
@@ -98,12 +233,15 @@ group { name: "e/modules/battery/main";
          clip_to: "info_clip";
          description { state: "default" 0.0;
             align: 0.5 1.0;
-            rel.to: "bg";
-            rel1.relative: 0.25 0.47;
-            rel2.relative: 0.75 0.85;
-            color_class: "/fg/normal/gadgets/battery/text/time";
-            text { font: FN; size: 8;
-               min: 0 1;
+            rel1.relative: 0.0 1.0;
+            rel1.offset: 0 -2;
+            rel1.to_x: "bg";
+            rel1.to_y: "pwr";
+            rel2.offset: -1 1;
+            rel2.to: "bg";
+            color_class: "module_label_plain";
+            color3: 255 255 255 255;
+            text { font: "Sans";
                fit: 1 1;
                ellipsis: -1;
                align: 0.5 0.5;
@@ -113,33 +251,39 @@ group { name: "e/modules/battery/main";
       }
       part { name: "over"; type: RECT;
          description { state: "default" 0.0;
-            color: 0 0 0 0; // no cc
+            color: 0 0 0 0;
          }
       }
    }
    programs {
-      program { signal: "load"; source: "";
-         script { set_float(load_time, year_sec()); }
+      program {
+         signal: "mouse,in"; source: "over";
+         action: STATE_SET "visible" 0.0;
+         transition: LINEAR 0.3;
+         target: "info_clip";
       }
-      program { signal: "e,state,ac,on"; source: "e";
-         script { run_prog_later(PROGRAM:"ac_on"); }
-      }
-      program { name: "ac_on";
-         action: PLAY_SAMPLE "synth-worble-up" 1.0 ALERT;
-      }
-      program { signal: "e,state,ac,off"; source: "e";
-         script { run_prog_later(PROGRAM:"ac_off"); }
-      }
-      program { name: "ac_off";
-         action: PLAY_SAMPLE "synth-worble-dn" 1.0 ALERT;
-      }
-      program { signal: "e,state,charging"; source: "e";
-         action: STATE_SET "charging" 0.0;
-         target: "fill";
-      }
-      program { signal: "e,state,discharging"; source: "e";
+      program {
+         signal: "mouse,out"; source: "over";
          action: STATE_SET "default" 0.0;
-         target: "fill";
+         transition: LINEAR 0.3;
+         target: "info_clip";
+      }
+      program {
+         signal: "e,state,charging"; source: "e";
+         action: STATE_SET "visible" 0.0;
+         target: "pwr1";
+         target: "pwr2";
+      }
+      program {
+         signal: "e,state,discharging"; source: "e";
+         action: STATE_SET "default" 0.0;
+         target: "pwr1";
+         target: "pwr2";
+      }
+      program {
+         signal: "e,state,unknown"; source: "e";
+         action: STATE_SET "faded" 0.0;
+         target: "fade_clip";
       }
       program { name: "pulse";
          signal: "e,action,pulse,start"; source: "e";
@@ -149,54 +293,37 @@ group { name: "e/modules/battery/main";
          target: "pulse_clip";
       }
       program { name: "pulse2";
-         action: STATE_SET "default" 0.0;
-         transition: ACCELERATE 0.1;
+         action: STATE_SET "faded" 1.0; transition: ACCELERATE 0.1;
          target: "pulse_clip";
-         after: "pulse";
       }
-      program { signal: "e,action,pulse,stop"; source: "e";
-         action: ACTION_STOP;
-         target: "pulse";
-         target: "pulse2";
-         after: "pulse3";
-      }
-      program { name: "pulse3";
+      program {
          signal: "e,action,pulse,stop"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "pulse_clip";
       }
-      program { signal: "mouse,in"; source: "over";
-         action: STATE_SET "visible" 0.0;
-         transition: SINUSOIDAL 0.3;
-         target: "info_clip";
-      }
-      program { signal: "mouse,out"; source: "over";
-         action: STATE_SET "default" 0.0;
-         transition: SINUSOIDAL 0.3;
-         target: "info_clip";
-      }
    }
 }
 
 group { name: "e/modules/battery/popup";
-   min: 320 80;
+   min: 240 60;
    parts {
       part { name: "e.swallow.battery"; type: SWALLOW;
-         scale: 1;
          description { state: "default" 0.0;
-            min: 80 80;
-            max: 80 80;
+            aspect: 1.0 1.0; aspect_preference: VERTICAL;
+            min: 1 1;
+            max: 160 160;
             align: 0.0 0.5;
          }
       }
       part { name: "e.text.title"; type: TEXT;
+         effect: SHADOW BOTTOM;
          scale: 1;
          description { state: "default" 0.0;
             rel1.relative: 1.0 0.0;
             rel1.to_x: "e.swallow.battery";
             rel2.relative: 1.0 0.5;
-            color_class: "/fg/normal/gadgets/battery/popup/title";
-            text { font: FNBD; size: 10;
+            color: FN_COL_DEFAULT;
+            text { font: "Sans:style=Bold"; size: 10;
                text: "Your battery is low!";
                min: 1 1;
                ellipsis: -1;
@@ -205,12 +332,13 @@ group { name: "e/modules/battery/popup";
          }
       }
       part { name: "e.text.label"; type: TEXT;
+         effect: SHADOW BOTTOM;
          scale: 1;
          description { state: "default" 0.0;
             rel1.relative: 1.0 0.5;
             rel1.to_x: "e.swallow.battery";
-            color_class: "/fg/normal/gadgets/battery/popup/text";
-            text { font: FN; size: 10;
+            color: FN_COL_DEFAULT;
+            text { font: "Sans"; size: 10;
                text: "AC power is recommended.";
                min: 1 1;
                ellipsis: -1;

data/elementary/themes/edc/bluez4.edc

@@ -1,30 +1,25 @@
 group { name: "e/modules/bluez4/main";
-   images.image: "bz5_logo.png" COMP;
+   images.image: "bt_base.png" COMP;
    max: 160 160;
    parts {
       part { name: "base";
          description { state: "default" 0.0;
-            rel1.relative: (25/380) (25/380);
-            rel2.relative: (365/380) (365/380);
-            aspect: 1.0 1.0; aspect_preference: BOTH;
-            image.normal: "bz5_logo.png";
-            color_class: "/fg/normal/gadgets/bluez/on";
+            aspect: (160/144) (160/144); aspect_preference: BOTH;
+            image.normal: "bt_base.png";
          }
       }
    }
 }
 
 group { name: "e/modules/bluez4/inactive";
-   images.image: "bz5_logo.png" COMP;
+   images.image: "bt_base.png" COMP;
    max: 160 160;
    parts {
       part { name: "base";
          description { state: "default" 0.0;
-            rel1.relative: (25/380) (25/380);
-            rel2.relative: (365/380) (365/380);
-            aspect: 1.0 1.0; aspect_preference: BOTH;
-            image.normal: "bz5_logo.png";
-            color_class: "/fg/normal/gadgets/bluez/off";
+            aspect: (160/144) (160/144); aspect_preference: BOTH;
+            image.normal: "bt_base.png";
+            color: 255 255 255 128;
          }
       }
    }

data/elementary/themes/edc/bluez5.edc

@@ -1,164 +0,0 @@
-#define BZ5_EXIST   1
-#define BZ5_ON      2
-#define BZ5_VISIBLE 4
-#define BZ5_SCAN    8
-
-group { name: "e/modules/bluez5/main";
-   images.image: "bz5_none.png" COMP;
-   images.image: "bz5_logo.png" COMP;
-   images.image: "radio.png" COMP;
-   max: 160 160;
-   script {
-      public bzmode;
-      eval_mode(m) {
-         new prev = get_int(bzmode);
-         if (m & BZ5_ON)
-            set_state(PART:"base", "on", 0.0);
-         else if (m & BZ5_EXIST)
-            set_state(PART:"base", "exist", 0.0);
-         else
-            set_state(PART:"base", "default", 0.0);
-
-         if      ((!(prev & BZ5_VISIBLE)) && ( (m & BZ5_VISIBLE))) {
-            run_program(PROGRAM:"visible0");
-         }
-         else if (( (prev & BZ5_VISIBLE)) && (!(m & BZ5_VISIBLE))) {
-            stop_program(PROGRAM:"visible0");
-            stop_program(PROGRAM:"visible1");
-            run_program(PROGRAM:"visiblereset");
-         }
-
-         if      ((!(prev & BZ5_SCAN)) && ( (m & BZ5_SCAN))) {
-            run_program(PROGRAM:"scan0");
-         }
-         else if (( (prev & BZ5_SCAN)) && (!(m & BZ5_SCAN))) {
-            stop_program(PROGRAM:"scan0");
-            stop_program(PROGRAM:"scan1");
-            run_program(PROGRAM:"scanreset");
-         }
-      }
-      flag_set(flag) {
-         new m = get_int(bzmode) | flag;
-         eval_mode(m); set_int(bzmode, m);
-      }
-      flag_unset(flag) {
-         new m = get_int(bzmode) & ~flag;
-         eval_mode(m); set_int(bzmode, m);
-      }
-   }
-   parts {
-      part { name: "base";
-         description { state: "default" 0.0;
-            rel1.relative: (25/380) (25/380);
-            rel2.relative: (365/380) (365/380);
-            aspect: 1.0 1.0; aspect_preference: BOTH;
-            image.normal: "bz5_none.png";
-            color_class: "/fg/normal/gadgets/bluez/on";
-         }
-         description { state: "exist" 0.0;
-            inherit;
-            image.normal: "bz5_logo.png";
-            color_class: "/fg/normal/gadgets/bluez/off";
-         }
-         description { state: "on" 0.0;
-            inherit;
-            image.normal: "bz5_logo.png";
-            color_class: "/fg/normal/gadgets/bluez/on";
-         }
-      }
-      part { name: "visible";
-         description { state: "default" 0.0;
-            rel.to: "base";
-            rel1.relative: 0.0 0.8;
-            rel2.relative: 0.2 1.0;
-            aspect: 1.0 1.0; aspect_preference: BOTH;
-            image.normal: "radio.png";
-            color_class: "/fg/normal/gadgets/bluez/visible";
-            visible: 0;
-            min: 1 1;
-         }
-         description { state: "on" 0.0;
-            inherit;
-            visible: 1;
-         }
-      }
-      part { name: "scan";
-         description { state: "default" 0.0;
-            rel.to: "base";
-            rel1.relative: 0.8 0.8;
-            rel2.relative: 1.0 1.0;
-            aspect: 1.0 1.0; aspect_preference: BOTH;
-            image.normal: "radio.png";
-            color_class: "/fg/normal/gadgets/bluez/scan";
-            visible: 0;
-            min: 1 1;
-         }
-         description { state: "on" 0.0;
-            inherit;
-            visible: 1;
-         }
-      }
-   }
-   programs {
-      program { signal: "e,state,exist"; source: "e";
-         script { flag_set(BZ5_EXIST); }
-      }
-      program { signal: "e,state,noexist"; source: "e";
-         script { flag_unset(BZ5_EXIST); }
-      }
-      program { signal: "e,state,on"; source: "e";
-         script { flag_set(BZ5_ON); }
-      }
-      program { signal: "e,state,off"; source: "e";
-         script { flag_unset(BZ5_ON); }
-      }
-      program { signal: "e,state,visible"; source: "e";
-         script { flag_set(BZ5_VISIBLE); }
-      }
-      program { signal: "e,state,invisible"; source: "e";
-         script { flag_unset(BZ5_VISIBLE); }
-      }
-      program { signal: "e,state,scanning"; source: "e";
-//         action: STATE_SET "on" 0.0;
-//         target: "scan";
-         script { flag_set(BZ5_SCAN); }
-      }
-      program { signal: "e,state,unscanning"; source: "e";
-//         action: STATE_SET "default" 0.0;
-//         target: "scan";
-         script { flag_unset(BZ5_SCAN); }
-      }
-      program { name: "visible0";
-         action: STATE_SET "on" 0.0;
-         target: "visible";
-         in: 0.5 0.0;
-         after: "visible1";
-      }
-      program { name: "visible1";
-         action: STATE_SET "default" 0.0;
-         target: "visible";
-         in: 0.5 0.0;
-         after: "visible0";
-      }
-      program { name: "visiblereset";
-         action: STATE_SET "default" 0.0;
-         target: "visible";
-      }
-      program { name: "scan0";
-         action: STATE_SET "on" 0.0;
-         target: "scan";
-         in: 0.5 0.0;
-         after: "scan1";
-      }
-      program { name: "scan1";
-         action: STATE_SET "default" 0.0;
-         target: "scan";
-         in: 0.5 0.0;
-         after: "scan0";
-      }
-      program { name: "scanreset";
-         action: STATE_SET "default" 0.0;
-         target: "scan";
-      }
-   }
-}

data/elementary/themes/edc/border-icons.edc

@@ -0,0 +1,42 @@
+#define ICON(_NAME, _FILE) \
+   group { \
+      name: "e/widgets/border/default/"_NAME; \
+      max: 16 16; \
+      parts { \
+         part { name: "icon"; mouse_events: 0; \
+            description { state: "default" 0.0; \
+               max: 16 16; \
+               aspect: 1.0 1.0; aspect_preference: BOTH; \
+               image.image: _FILE COMP; \
+               image.normal: _FILE; \
+            } \
+         } \
+      } \
+   }
+
+   ICON("basic", "icon_border_more.png")
+   ICON("close", "icon_border_close.png")
+   ICON("kill", "icon_border_kill.png")
+   ICON("stacking", "icon_border_stack_norm.png")
+   ICON("stack_on_top", "icon_border_stack_top.png")
+   ICON("stack_normal", "icon_border_stack_norm.png")
+   ICON("stack_below", "icon_border_stack_bot.png")
+   ICON("move_icon", "icon_border_move.png")
+   ICON("resize_icon", "icon_border_resize.png");
+   ICON("maximize", "icon_border_maximize.png")
+   ICON("fullscreen", "icon_border_maximize.png")
+   ICON("minimize", "icon_border_minimize.png")
+   ICON("stick", "icon_border_pin.png")
+   ICON("sendto", "icon_border_sendto.png")
+   ICON("skip", "icon_border_skip.png")
+   ICON("skip_pager", "icon_border_pager.png")
+   ICON("skip_taskbar", "icon_border_skip.png")
+   ICON("skip_winlist", "icon_border_skip.png")
+   ICON("borderless", "icon_border_border.png")
+   ICON("remember", "icon_border_remember.png")
+   ICON("shade", "icon_border_shaded.png")
+   ICON("locks", "icon_border_lock.png")
+   ICON("locks_user", "icon_border_lock.png")
+   ICON("locks_application", "icon_border_lock.png")
+   ICON("properties", "icon_border_properties.png")
+#undef ICON

data/elementary/themes/edc/bryce.edc

@@ -0,0 +1,361 @@
+group { name: "e/bryce/default/base"; nomouse;
+   data {
+      /* this tells e the number of pixels of the bryce to leave "exposed"
+       * when auto-hiding the bryce */
+      item: "hidden_state_size" "2";
+   }
+   images.image: "vgrad_med.png" COMP;
+   images.image: "vgrad_tall.png" COMP;
+   images.image: "bevel_out.png" COMP;
+   images.image: "holes_vert.png" COMP;
+   images.image: "holes_horiz.png" COMP;
+   images.image: "shine.png" COMP;
+   parts {
+      rect { "mouse"; mouse;
+         desc { color: 0 0 0 0; }
+      }
+      part { name: "bg";
+         description { state: "default" 0.0;
+            image.normal: "vgrad_med.png";
+            fill.smooth: 0;
+            TILED_HORIZ(120)
+            color_class: "bryce_base";
+         }
+         description { state: "vert" 0.0;
+            image.normal: "vgrad_tall.png";
+            fill.smooth: 0;
+            TILED_HORIZ(40)
+            color_class: "bryce_base";
+         }
+      }
+      part { name: "bevel";
+         description { state: "default" 0.0;
+            image.normal: "bevel_out.png";
+            image.border: 1 1 1 1;
+            image.middle: 0;
+            fill.smooth: 0;
+         }
+      }
+      part { name: "dots_start";
+         description { state: "default" 0.0;
+            image.normal: "holes_vert.png";
+            rel1.offset: 2 2;
+            rel2.relative: 0.0 1.0;
+            rel2.offset: 5 -3;
+            FIXED_SIZE(4, 14)
+         }
+         description { state: "vert" 0.0;
+            image.normal: "holes_horiz.png";
+            rel1.offset: 2 2;
+            rel2.relative: 1.0 0.0;
+            rel2.offset: -3 5;
+            FIXED_SIZE(14, 4)
+         }
+      }
+      part { name: "dots_end";
+         description { state: "default" 0.0;
+            image.normal: "holes_vert.png";
+            rel1.relative: 1.0 0.0;
+            rel1.offset: -6 2;
+            rel2.offset: -3 -3;
+            FIXED_SIZE(4, 14)
+         }
+         description { state: "vert" 0.0;
+            image.normal: "holes_horiz.png";
+            rel1.relative: 0.0 1.0;
+            rel1.offset: 2 -6;
+            rel2.offset: -3 -3;
+            FIXED_SIZE(14, 4)
+         }
+      }
+      spacer { "sizer";
+         description { state: "default" 0.0;
+            rel1.offset: 1 0;
+            rel1.relative: 1.0 0.0;
+            rel1.to_x: "dots_start";
+            rel2.offset: -2 -1;
+            rel2.to_x: "dots_end";
+            rel2.relative: 0.0 1.0;
+         }
+         description { state: "vert" 0.0;
+            rel1.offset: 0 1;
+            rel1.relative: 0.0 1.0;
+            rel1.to_y: "dots_start";
+            rel2.offset: -1 -2;
+            rel2.to_y: "dots_end";
+            rel2.relative: 1.0 0.0;
+         }
+      }
+      part { name: "e.swallow.content"; type: SWALLOW; mouse;
+         desc {
+            rel.to: "sizer";
+            link.base: "e,state,visible" "e";
+         }
+         desc { "hidden"; hid;
+            rel.to: "sizer";
+            link.base: "e,state,hidden" "e";
+         }
+      }
+      part { name: "shine";
+         description { state: "default" 0.0;
+            image.normal: "shine.png";
+            rel1.offset: 0 -2;
+            rel2.relative: 1.0 0.0;
+            rel2.offset: -1 2;
+            FIXED_SIZE(69, 5)
+         }
+      }
+      rect { "text_fader"; mouse;
+         desc { hid;
+            color: 0 0 0 0;
+         }
+         desc { "active";
+            color: 0 0 0 192;
+         }
+      }
+      text { "e.text"; scale;
+         effect: SHADOW BOTTOM;
+         desc { hid;
+            color: 255 255 255 0;
+            text { font: "Sans:style=Bold"; size: 14;
+               ellipsis: -1;
+            }
+         }
+         desc { "active"; inherit; vis;
+            color: 255 255 255 255;
+         }
+      }
+      program { signal: "e,action,resize"; source: "e";
+         action: STATE_SET "active";
+         transition: LINEAR 0.1;
+         targets: "e.text" "text_fader";
+         sequence {
+            action: ACTION_STOP;
+            target: "text_hide";
+            action: STATE_SET "default";
+            name: "text_hide";
+            in: 1.0 0;
+            transition: LINEAR 0.2;
+            targets: "e.text" "text_fader";
+         }
+      }
+      programs  {
+#define ORIENT_SATE(_ORIENT, _STATE) \
+         program { \
+            signal: "e,state,orient,"_ORIENT; source: "e"; \
+            action: STATE_SET _STATE 0.0; \
+            target: "bg"; \
+            target: "sizer"; \
+            target: "dots_start"; \
+            target: "dots_end"; \
+         }
+      }
+      ORIENT_SATE("horizontal", "default")
+      ORIENT_SATE("vertical", "vert")
+#undef ORIENT_SATE
+   }
+}
+
+group { name: "e/bryce/invisible/base"; nomouse;
+   inherit: "e/bryce/default/base";
+   data.item: "noshadow" "1";
+   parts {
+      part { name: "bg";
+         description { state: "default" 0.0;
+            visible: 0;
+         }
+         description { state: "vert" 0.0;
+            visible: 0;
+         }
+      }
+      part { name: "bevel";
+         description { state: "default" 0.0;
+            visible: 0;
+         }
+      }
+      part { name: "shine";
+         description { state: "default" 0.0;
+            visible: 0;
+         }
+      }
+      part { name: "dots_start";
+         description { state: "default" 0.0;
+            rel1.offset: 0 0;
+            rel2.offset: -1 -1;
+            min: 0 0;
+            max: 0 0;
+            visible: 0;
+         }
+         description { state: "vert" 0.0;
+            rel1.offset: 0 0;
+            rel2.offset: -1 -1;
+            min: 0 0;
+            max: 0 0;
+            visible: 0;
+         }
+      }
+      part { name: "dots_end";
+         description { state: "default" 0.0;
+            rel1.offset: 0 0;
+            rel2.offset: -1 -1;
+            min: 0 0;
+            max: 0 0;
+            visible: 0;
+         }
+         description { state: "vert" 0.0;
+            rel1.offset: 0 0;
+            rel2.offset: -1 -1;
+            min: 0 0;
+            max: 0 0;
+            visible: 0;
+         }
+      }
+   }
+}
+
+group { name: "e/bryce/translucent/base"; nomouse;
+   inherit: "e/bryce/default/base";
+   data.item: "noshadow" "1";
+   parts {
+      part { name: "bg";
+         description { state: "default" 0.0;
+            color: 127 127 127 135;
+         }
+         description { state: "vert" 0.0;
+            color: 127 127 127 135;
+         }
+      }
+      part { name: "bevel";
+         description { state: "default" 0.0;
+            color: 127 127 127 135;
+         }
+      }
+      part { name: "shine";
+         description { state: "default" 0.0;
+            color: 127 127 127 135;
+         }
+      }
+   }
+}
+
+group { name: "e/bryce/default/inset"; nomouse;
+   alias: "e/bryce/invisible/inset";
+   alias: "e/bryce/translucent/inset";
+   images.image: "horiz_bar_inset.png" COMP;
+   images.image: "vert_bar_inset.png" COMP;
+   parts {
+      rect { "mouse"; mouse;
+         desc { color: 0 0 0 0; }
+      }
+      part { name: "base"; type: RECT;
+         description { state: "default" 0.0;
+            color: 0 0 0 0;
+         }
+      }
+      spacer { "sizer";
+         description { state: "default" 0.0;
+            rel1.offset: 4 1;
+            rel2.offset: -5 -2;
+         }
+         description { state: "vert" 0.0;
+            rel1.offset: 1 4;
+            rel2.offset: -2 -5;
+         }
+      }
+      part { name: "e.swallow.content"; type: SWALLOW; mouse;
+         desc {
+            rel.to: "sizer";
+            link.base: "e,state,visible" "e";
+         }
+         desc { "hidden"; hid;
+            rel.to: "sizer";
+            link.base: "e,state,hidden" "e";
+         }
+      }
+      part { name: "inset";
+         description { state: "default" 0.0;
+            rel1.offset: 2 0;
+            rel2.offset: -3 -1;
+            image.normal: "horiz_bar_inset.png";
+            image.border: 7 7 1 1;
+            image.middle: 0;
+            fill.smooth: 0;
+         }
+         description { state: "vert" 0.0;
+            rel1.offset: 0 2;
+            rel2.offset: -1 -3;
+            image.normal: "vert_bar_inset.png";
+            image.border: 1 1 8 6;
+            image.middle: 0;
+            fill.smooth: 0;
+         }
+      }
+      rect { "events"; repeat; mouse;
+         desc { color: 0 0 0 0; }
+      }
+   }
+   programs {
+#define ORIENT_SATE(_ORIENT, _STATE) \
+         program { \
+            signal: "e,state,orient,"_ORIENT; source: "e"; \
+            action: STATE_SET _STATE 0.0; \
+            target: "sizer"; \
+            target: "inset"; \
+         }
+      ORIENT_SATE("horizontal", "default")
+      ORIENT_SATE("vertical", "vert")
+#undef ORIENT_SATE
+   }
+}
+
+group { name: "e/bryce/default/plain"; nomouse;
+   alias: "e/bryce/invisible/plain";
+   alias: "e/bryce/translucent/plain";
+   parts {
+      rect { "mouse"; mouse;
+         desc { color: 0 0 0 0; }
+      }
+      part { name: "base"; type: RECT;
+         description { state: "default" 0.0;
+            color: 0 0 0 0;
+         }
+      }
+      spacer { "sizer";
+         desc {
+            rel1.offset: 1 1;
+            rel2.offset: -2 -2;
+         }
+      }
+      part { name: "e.swallow.content"; type: SWALLOW; mouse;
+         desc {
+            rel.to: "sizer";
+            link.base: "e,state,visible" "e";
+         }
+         desc { "hidden"; hid;
+            rel.to: "sizer";
+            link.base: "e,state,hidden" "e";
+         }
+      }
+      rect { "events"; repeat; mouse;
+         desc { color: 0 0 0 0; }
+      }
+   }
+}
+
+group { "elm/scroller/base/bryce";
+   parts {
+      rect { "clip";
+         desc {
+            rel1.offset: 0 -99999;
+            rel2.offset: -1 99999;
+            link.base: "e,state,orient,horizontal" "e";
+         }
+         desc { "vert";
+            rel1.offset: -99999 0;
+            rel2.offset: 99999 -1;
+            link.base: "e,state,orient,vertical" "e";
+         }
+      }
+      swallow { "elm.swallow.content" clip: "clip"; }
+   }
+}

data/elementary/themes/edc/bryce_editor.edc

@@ -0,0 +1,404 @@
+group { "bryce_editor_text"; inherit_only: 1;
+   parts {
+      text { "e.text"; scale; nomouse;
+         effect: SHADOW BOTTOM;
+         desc {
+            color: 255 255 255 255;
+            text { font: "Sans:style=Bold"; size: 18;
+               min: 1 1;
+               ellipsis: -1;
+            }
+         }
+      }
+   }
+}
+
+group { "e/bryce/editor/side";
+   parts {
+      rect { "base"; desc { color: 0 0 0 192; } }
+      program { signal: "mouse,down,*"; source: "base";
+         action: SIGNAL_EMIT "e,action,dismiss" "e";
+      }
+      rect { "bottom"; scale;
+         desc {
+            min: 33 32;
+            align: 0 1;
+            rel1.relative: 0.3 1;
+            rel2.relative: 0.7 1;
+            color: 52 153 255 90;
+            link.base: "mouse,out" "bottom";
+            link.transition: LINEAR 0.2;
+         }
+         desc { "active"; inherit;
+            color: 52 153 255 230;
+            link.base: "mouse,in" "bottom";
+            link.transition: LINEAR 0.2;
+         }
+         desc { "hid"; hid;
+            link.base: "e,bryce,exists,bottom" "e";
+         }
+      }
+      program { signal: "mouse,down,1"; source: "bottom";
+         action: SIGNAL_EMIT "e,bryce,add,bottom" "e";
+      }
+      rect { "top"; scale;
+         desc {
+            min: 33 32;
+            align: 0 0;
+            rel1.relative: 0.3 0;
+            rel2.relative: 0.7 0;
+            color: 52 153 255 90;
+            link.base: "mouse,out" "top";
+            link.transition: LINEAR 0.2;
+         }
+         desc { "active"; inherit;
+            color: 52 153 255 230;
+            link.base: "mouse,in" "top";
+            link.transition: LINEAR 0.2;
+         }
+         desc { "hid"; hid;
+            link.base: "e,bryce,exists,top" "e";
+         }
+      }
+      program { signal: "mouse,down,1"; source: "top";
+         action: SIGNAL_EMIT "e,bryce,add,top" "e";
+      }
+      rect { "left"; scale;
+         desc {
+            min: 32 33;
+            align: 0 0;
+            rel1.relative: 0 0.3;
+            rel2.relative: 0 0.7;
+            color: 52 153 255 90;
+            link.base: "mouse,out" "left";
+            link.transition: LINEAR 0.2;
+         }
+         desc { "active"; inherit;
+            color: 52 153 255 230;
+            link.base: "mouse,in" "left";
+            link.transition: LINEAR 0.2;
+         }
+         desc { "hid"; hid;
+            link.base: "e,bryce,exists,left" "e";
+         }
+      }
+      program { signal: "mouse,down,1"; source: "left";
+         action: SIGNAL_EMIT "e,bryce,add,left" "e";
+      }
+      rect { "right"; scale;
+         desc {
+            min: 32 33;
+            align: 1 0;
+            rel1.relative: 1 0.3;
+            rel2.relative: 1 0.7;
+            color: 52 153 255 90;
+            link.base: "mouse,out" "right";
+            link.transition: LINEAR 0.2;
+         }
+         desc { "active"; inherit;
+            color: 52 153 255 230;
+            link.base: "mouse,in" "right";
+            link.transition: LINEAR 0.2;
+         }
+         desc { "hid"; hid;
+            link.base: "e,bryce,exists,right" "e";
+         }
+      }
+      program { signal: "mouse,down,1"; source: "right";
+         action: SIGNAL_EMIT "e,bryce,add,right" "e";
+      }
+   }
+   inherit: "bryce_editor_text";
+}
+
+group { "e/bryce/editor/side/horizontal";
+   parts {
+      rect { "base"; desc { color: 0 0 0 192; } }
+      program { signal: "mouse,down,*"; source: "base";
+         action: SIGNAL_EMIT "e,action,dismiss" "e";
+      }
+      spacer { "pos";
+         desc { align: 0 0;
+            min: 0 32;
+            rel2.relative: 1 0;
+         }
+         desc { "bottom";
+            align: 0 1;
+            min: 0 32;
+            rel1.relative: 0 1;
+            link.base: "e,state,bottom" "e";
+         }
+      }
+      rect { "center"; scale;
+         desc {
+            min: 33 32;
+            align: 0 0;
+            rel.to_y: "pos";
+            rel1.relative: 0.4 0;
+            rel2.relative: 0.6 1;
+            color: 52 153 255 90;
+            link.base: "mouse,out" "center";
+            link.transition: LINEAR 0.2;
+         }
+         desc { "active"; inherit;
+            color: 52 153 255 230;
+            link.base: "mouse,in" "center";
+            link.transition: LINEAR 0.2;
+         }
+         desc { "hid"; hid;
+            link.base: "e,bryce,exists,center" "e";
+         }
+      }
+      program { signal: "mouse,down,1"; source: "center";
+         action: SIGNAL_EMIT "e,bryce,add,center" "e";
+      }
+      rect { "left"; scale;
+         desc {
+            min: 33 32;
+            align: 0 0;
+            rel.to_y: "pos";
+            rel1.relative: 0 0;
+            rel2.relative: 0.2 1;
+            color: 52 153 255 90;
+            link.base: "mouse,out" "left";
+            link.transition: LINEAR 0.2;
+         }
+         desc { "active"; inherit;
+            color: 52 153 255 230;
+            link.base: "mouse,in" "left";
+            link.transition: LINEAR 0.2;
+         }
+         desc { "hid"; hid;
+            link.base: "e,bryce,exists,left" "e";
+         }
+      }
+      program { signal: "mouse,down,1"; source: "left";
+         action: SIGNAL_EMIT "e,bryce,add,left" "e";
+      }
+      rect { "right"; scale;
+         desc {
+            min: 33 32;
+            align: 1 0;
+            rel.to_y: "pos";
+            rel1.relative: 0.8 0;
+            rel2.relative: 1 1;
+            color: 52 153 255 90;
+            link.base: "mouse,out" "right";
+            link.transition: LINEAR 0.2;
+         }
+         desc { "active"; inherit;
+            color: 52 153 255 230;
+            link.base: "mouse,in" "right";
+            link.transition: LINEAR 0.2;
+         }
+         desc { "hid"; hid;
+            link.base: "e,bryce,exists,right" "e";
+         }
+      }
+      program { signal: "mouse,down,1"; source: "right";
+         action: SIGNAL_EMIT "e,bryce,add,right" "e";
+      }
+   }
+   inherit: "bryce_editor_text";
+}
+
+group { "e/bryce/editor/side/vertical";
+   parts {
+      rect { "base"; desc { color: 0 0 0 192; } }
+      program { signal: "mouse,down,*"; source: "base";
+         action: SIGNAL_EMIT "e,action,dismiss" "e";
+      }
+      spacer { "pos";
+         desc { align: 0 0;
+            min: 32 0;
+            rel2.relative: 0 1;
+         }
+         desc { "right";
+            align: 1 0;
+            min: 32 0;
+            rel1.relative: 1 0;
+            link.base: "e,state,right" "e";
+         }
+      }
+      rect { "center"; scale;
+         desc {
+            min: 32 33;
+            align: 0 0;
+            rel.to_x: "pos";
+            rel1.relative: 0 0.4;
+            rel2.relative: 1 0.6;
+            color: 52 153 255 90;
+            link.base: "mouse,out" "center";
+            link.transition: LINEAR 0.2;
+         }
+         desc { "active"; inherit;
+            color: 52 153 255 230;
+            link.base: "mouse,in" "center";
+            link.transition: LINEAR 0.2;
+         }
+         desc { "hid"; hid;
+            link.base: "e,bryce,exists,center" "e";
+         }
+      }
+      program { signal: "mouse,down,1"; source: "center";
+         action: SIGNAL_EMIT "e,bryce,add,center" "e";
+      }
+      rect { "top"; scale;
+         desc {
+            min: 32 33;
+            align: 0 0;
+            rel.to_x: "pos";
+            rel1.relative: 0 0;
+            rel2.relative: 1 0.2;
+            color: 52 153 255 90;
+            link.base: "mouse,out" "top";
+            link.transition: LINEAR 0.2;
+         }
+         desc { "active"; inherit;
+            color: 52 153 255 230;
+            link.base: "mouse,in" "top";
+            link.transition: LINEAR 0.2;
+         }
+         desc { "hid"; hid;
+            link.base: "e,bryce,exists,top" "e";
+         }
+      }
+      program { signal: "mouse,down,1"; source: "top";
+         action: SIGNAL_EMIT "e,bryce,add,top" "e";
+      }
+      rect { "bottom"; scale;
+         desc {
+            min: 32 33;
+            align: 0 1;
+            rel.to_x: "pos";
+            rel1.relative: 0 0.8;
+            rel2.relative: 1 1;
+            color: 52 153 255 90;
+            link.base: "mouse,out" "bottom";
+            link.transition: LINEAR 0.2;
+         }
+         desc { "active"; inherit;
+            color: 52 153 255 230;
+            link.base: "mouse,in" "bottom";
+            link.transition: LINEAR 0.2;
+         }
+         desc { "hid"; hid;
+            link.base: "e,bryce,exists,bottom" "e";
+         }
+      }
+      program { signal: "mouse,down,1"; source: "bottom";
+         action: SIGNAL_EMIT "e,bryce,add,bottom" "e";
+      }
+   }
+   inherit: "bryce_editor_text";
+}
+
+group { "e/bryce/editor/style/item"; nomouse;
+   parts {
+      rect { "highlight_t"; scale;
+         desc {
+            align: 0.5 0;
+            max: -1 1;
+            color: 255 255 255 150;
+            link.base: "mouse,out" "events";
+         }
+         desc { "active"; max: -1 1;
+            align: 0.5 0;
+            color: 52 153 255 230;
+            link.base: "mouse,in" "events";
+         }
+      }
+      rect { "highlight_l"; scale;
+         desc { align: 0 0.5;
+            max: 1 -1;
+            color: 255 255 255 150;
+            link.base: "mouse,out" "events";
+         }
+         desc { "active"; max: 1 -1;
+            align: 0 0.5;
+            color: 52 153 255 230;
+            link.base: "mouse,in" "events";
+         }
+      }
+      rect { "highlight_r"; scale;
+         desc {
+            align: 1 0.5;
+            max: 1 -1;
+            color: 255 255 255 150;
+            link.base: "mouse,out" "events";
+         }
+         desc { "active"; align: 1 0.5;
+            max: 1 -1;
+            color: 52 153 255 230;
+            link.base: "mouse,in" "events";
+         }
+      }
+      rect { "highlight_b"; scale;
+         desc {
+            align: 0.5 1;
+            max: -1 1;
+            color: 255 255 255 150;
+            link.base: "mouse,out" "events";
+         }
+         desc { "active"; align: 0.5 1;
+            max: -1 1;
+            color: 52 153 255 230;
+            link.base: "mouse,in" "events";
+         }
+      }
+      swallow { "e.swallow.content";
+         desc {
+            rel1.offset: 1 1;
+            rel2.offset: -2 -2;
+         }
+      }
+      text { "e.text"; scale;
+         effect: SHADOW BOTTOM;
+         desc {
+            color: 255 255 255 255;
+            text { font: "Sans:style=Bold"; size: 14;
+               min: 1 1;
+               ellipsis: -1;
+            }
+         }
+      }
+      rect { "events"; mouse;
+         desc { color: 0 0 0 0; }
+      }
+   }
+}
+
+group { "e/bryce/editor/style";
+   parts {
+      rect { "base"; desc { color: 0 0 0 192; } }
+      program { signal: "mouse,down,*"; source: "base";
+         action: SIGNAL_EMIT "e,action,dismiss" "e";
+      }
+      swallow { "e.swallow.content";
+         desc { align: 0.5 0;
+            rel1.to_y: "e.text";
+            rel1.relative: 0 1;
+         }
+      }
+   }
+   inherit: "bryce_editor_text";
+   parts {
+      text { "e.text";
+         desc { "default";
+           align: 0.5 0;
+           rel2.relative: 1 0;
+         }
+      }
+   }
+}
+
+group { "e/bryce/editor/finish"; inherit: "e/bryce/editor/style";
+   parts {
+      swallow { "e.swallow.content";
+         desc { "default";
+            rel1.relative: 1 1;
+            rel2.relative: 0 1;
+         }
+      }
+   }
+}

data/elementary/themes/edc/button.edc

@@ -1,77 +1,52 @@
-group { name: "e/widgets/button";
-   images.image: "win_shadow.png" COMP;
+ group { name: "e/widgets/button";
+   images.image: "button_normal.png" COMP;
+   images.image: "button_clicked.png" COMP;
+   images.image: "win_glow.png" COMP;
    parts {
-      part { name: "shadow"; mouse_events: 0;
-         scale: 1;
+      part { name: "base";
          description { state: "default" 0.0;
-            rel.to: "base";
-            WIN_SHADOW_SMALL;
-            color_class: "/shadow/normal/button";
+            image.normal: "button_normal.png";
+            image.border: 4 4 3 5;
+            image.middle: SOLID;
+            rel1.offset: -1 0;
+            rel2.offset: 0 1;
+            fill.smooth: 0;
          }
          description { state: "clicked" 0.0;
-            inherit;
-            image.border_scale_by: 0.25;
-            rel1.offset: -2 -1;
-            rel2.offset: 0 1;
-            offscale;
-            color_class: "/shadow/pressed/button";
-         }
-      }
-      rect { "base";
-         scale: 1;
-         desc { "default";
-            color_class: "/bg/normal/button";
-            rel1.offset: 2 2;
-            rel2.offset: -3 -3;
-            offscale;
-         }
-         desc { "clicked"; inherit;
-            color_class: "/bg/pressed/button";
-         }
-         desc { "disabled"; inherit;
-            color_class: "/bg/disabled/button";
+            inherit: "default" 0.0;
+            image.normal: "button_clicked.png";
+            image.border: 5 5 4 6;
          }
       }
       part { name: "icon_clip"; type: RECT;
          description { state: "default" 0.0;
-            color: 255 255 255 255; // no cc
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 64; // no cc
+            color: 255 255 255 64;
          }
       }
       part { name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0;
          clip_to: "icon_clip";
-         scale: 1;
-         desc { "default";
-            fixed: 1 0;
+         description { state: "default" 0.0;
             align: 0.0 0.5;
-            rel.to: "base";
-            rel1.offset: 0 4;
+            rel1.offset: 6 5;
+            rel1.to: "base";
             rel2.relative: 0.0 1.0;
-            rel2.offset: -1 -5;
-            visible: 0;
-            max: 0 999999;
-            offscale;
+            rel2.offset: 6 -8;
+            rel2.to: "base";
          }
-         desc { "combo"; inherit;
-            fixed: 1 0;
-            rel1.offset: 4 4;
-            rel2.relative: 0.0 1.0;
-            rel2.offset: 4 -5;
+         description { state: "combo" 0.0;
+            inherit: "default" 0.0;
             aspect: 1.0 1.0; aspect_preference: VERTICAL;
-            visible: 1;
-            min: ICMIN ICMIN;
          }
          description { state: "icon" 0.0;
-            fixed: 0 0;
+            inherit: "default" 0.0;
+            min: 17 17;
+            aspect: 1.0 1.0; aspect_preference: BOTH;
             align: 0.5 0.5;
-            rel1.offset: 4 4;
             rel2.relative: 1.0 1.0;
-            rel2.offset: -5 -5;
-            visible: 1;
-            min: ICMIN ICMIN;
+            rel2.offset: -7 -8;
          }
       }
       part { name: "label_clip"; type: RECT;
@@ -83,46 +58,94 @@ group { name: "e/widgets/button";
          }
       }
       part { name: "e.text.label"; type: TEXT; mouse_events: 0;
+         effect: SHADOW BOTTOM;
          scale: 1;
          clip_to: "label_clip";
          description { state: "default" 0.0;
-            fixed: 0 0;
-            color_class: "/fg/normal/button";
-            rel1.offset: 4 4;
-            rel1.relative: 1.0 0.0;
-            rel1.to_x: "e.swallow.icon";
+            rel1.offset: 6 5;
+            rel1.to_x: "base";
             rel1.to_y: "base";
+            rel2.offset: -7 -7;
             rel2.to: "base";
-            rel2.offset: -5 -5;
+            color_class: "button_text";
+            color3: 255 255 255 255;
             text { font: FN; size: 10;
-               align: 0.5 0.5;
                min: 1 1;
                ellipsis: -1;
+               align: 0.5 0.5;
+               text_class: "button";
             }
-            offscale;
-            min: 0 ICMIN;
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            color_class: "/fg/disabled/button";
+            color_class: "button_text_disabled";
+            color3: 255 255 255 255;
          }
          description { state: "combo" 0.0;
             inherit: "default" 0.0;
+            rel1.relative: 1.0 0.0;
+            rel1.offset: 2 5;
+            rel1.to_x: "e.swallow.icon";
          }
          description { state: "icon" 0.0;
             inherit: "default" 0.0;
             visible: 0;
          }
+      }
+      part { name: "label2"; type: TEXT; mouse_events: 0;
+         effect: SHADOW BOTTOM;
+         scale: 1;
+         description { state: "default" 0.0;
+            rel1.to: "e.text.label";
+            rel2.to: "e.text.label";
+            color_class: "button_text_disabled";
+            color3: 255 255 255 255;
+            text { font: FN; size: 10;
+               text_source: "e.text.label";
+               align: 0.5 0.5;
+               text_class: "button";
+            }
+            visible: 0;
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      part { name: "base2"; type: SPACER;
+         description { state: "default" 0.0;
+            rel1.to: "base";
+            rel2.to: "base";
+         }
          description { state: "clicked" 0.0;
             inherit: "default" 0.0;
-            color_class: "/fg/pressed/button";
+            rel1.offset: 1 1;
+            rel2.offset: -2 -2;
+         }
+      }
+      part { name: "glow"; mouse_events: 0;
+         description { state: "default" 0.0;
+            image.normal: "win_glow.png";
+            image.border: 9 9 9 9;
+            image.middle: 0;
+            rel1.to: "base2";
+            rel1.offset: -2 -3;
+            rel2.to: "base2";
+            rel2.offset: 1 0;
+            fill.smooth: 0;
+            color: 255 255 255 0;
+            visible: 0;
+         }
+         description { state: "focused" 0.0;
+            inherit: "default" 0.0;
+            color: 255 255 255 150;
+            visible: 1;
          }
       }
       part { name: "event"; type: RECT;
          ignore_flags: ON_HOLD;
          description { state: "default" 0.0;
-            rel.to: "base";
-            color: 0 0 0 0; // no cc
+            color: 0 0 0 0;
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -134,16 +157,14 @@ group { name: "e/widgets/button";
       program {
          signal: "mouse,down,1"; source: "event";
          action: STATE_SET "clicked" 0.0;
-         target: "shadow";
          target: "base";
-         target: "e.text.label";
+         target: "base2";
       }
       program {
          signal: "mouse,up,1"; source: "event";
          action: STATE_SET "default" 0.0;
-         target: "shadow";
          target: "base";
-         target: "e.text.label";
+         target: "base2";
       }
       program {
          signal: "mouse,clicked,1*"; source: "event";
@@ -171,17 +192,25 @@ group { name: "e/widgets/button";
          signal: "e,state,disabled"; source: "e";
          action: STATE_SET "disabled" 0.0;
          target: "event";
-         target: "base";
          target: "icon_clip";
-         target: "e.text.label";
+         target: "label_clip";
+         target: "label2";
       }
       program {
          signal: "e,state,enabled"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "event";
-         target: "base";
          target: "icon_clip";
-         target: "e.text.label";
+         target: "label_clip";
+         target: "label2";
+      }
+      program { signal: "e,state,focused"; source: "e";
+         action: STATE_SET "focused" 0.0;
+         target: "glow";
+      }
+      program { signal: "e,state,unfocused"; source: "e";
+         action: STATE_SET "default" 0.0;
+         target: "glow";
       }
    }
 }

data/elementary/themes/edc/check.edc

@@ -1,85 +1,97 @@
 group { name: "e/widgets/check";
+   images.image: "inset_shadow_tiny.png" COMP;
+   images.image: "bevel_in.png" COMP;
+   images.image: "sym_check_alum.png" COMP;
    parts {
       part { name: "base"; type: RECT;
-         scale: 1;
          description { state: "default" 0.0;
-            color_class: "/bg/normal/check/base";
-            align: 0.0 0.5;
-            min: 13 13;
-            max: 13 13;
-            rel1.offset: 4 4;
-            rel2.offset: 4 -5;
-            rel2.relative: 0.0 1.0;
-            offscale;
-            fixed: 1 1;
+            rel1.offset: 1 1;
+            rel1.to: "inset";
+            rel2.offset: -2 -2;
+            rel2.to: "inset";
+            color: 24 24 24 255;
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            color_class: "/bg/disabled/check/base";
+            color: 64 64 64 255;
+         }
+      }
+      part { name: "shadow"; mouse_events: 0;
+         description { state: "default" 0.0;
+            image.normal: "inset_shadow_tiny.png";
+            rel1.to: "base";
+            rel2.to: "base";
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
+         }
+      }
+      part { name: "inset"; mouse_events: 0;
+         description { state: "default" 0.0;
+            rel1.offset: 2 2;
+            rel2.relative: 0.0 1.0;
+            rel2.offset: 2 -3;
+            image.normal: "bevel_in.png";
+            image.border: 1 1 1 1;
+            image.middle: 0;
+            fill.smooth: 0;
+            align: 0.0 0.5;
+            min: 13 13;
+            max: 13 13;
+            fixed: 1 1;
          }
       }
       part { name: "clip"; type: RECT;
          description { state: "default" 0.0;
-            rel.to: "base";
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 153; // no cc
+            color: 255 255 255 64;
          }
       }
       part { name: "indicator"; mouse_events: 0;
          clip_to: "clip";
-         scale: 1;
          description { state: "default" 0.0;
-            rel.to: "base";
-            image.normal: "i-check";
-            min: 15 15;
-            max: 15 15;
+            rel1.to: "base";
+            rel2.to: "base";
+            image.normal: "sym_check_alum.png";
+            min: 11 11;
+            max: 11 11;
             visible: 0;
-            color_class: "/fg/normal/check/check";
-            fixed: 1 1;
-         }
-         description { state: "pressed" 0.0;
-            inherit: "default" 0.0;
-            color_class: "/fg/pressed/check/check";
-            visible: 1;
          }
          description { state: "selected" 0.0;
             inherit: "default" 0.0;
-            color_class: "/fg/selected/check/check";
             visible: 1;
          }
       }
       part { name: "e.text.label"; type: TEXT;
+         effect: SHADOW BOTTOM;
          scale: 1;
          description { state: "default" 0.0;
-            rel1.offset: 4 4;
-            rel1.to_x: "base";
+            rel1.offset: 2 2;
+            rel1.to_x: "inset";
             rel1.relative: 1.0 0.0;
-            rel2.offset: -5 -5;
-            color_class: "/fg/normal/check/text";
+            rel2.offset: -3 -3;
+            color_class: "check_text";
+            color3: 255 255 255 255;
             text { font: FN; size: 10;
                min: 1 1;
                ellipsis: -1;
                align: 0.0 0.5;
                text_class: "check_button";
             }
-            offscale;
-            min: 0 ICMIN;
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            color_class: "/fg/disabled/check/text";
-         }
-         description { state: "pressed" 0.0;
-            inherit: "default" 0.0;
-            color_class: "/fg/pressed/check/text";
+            color_class: "check_text_disabled";
+            color3: 255 255 255 255;
          }
       }
       part { name: "event"; type: RECT;
          ignore_flags: ON_HOLD;
          description { state: "default" 0.0;
-            color: 0 0 0 0; // no cc
+            color: 0 0 0 0;
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -88,37 +100,34 @@ group { name: "e/widgets/check";
       }
    }
    programs {
-      program { signal: "e,state,checked"; source: "e";
+      program {
+         signal: "e,state,checked"; source: "e";
          action: STATE_SET "selected" 0.0;
          target: "indicator";
       }
-      program { signal: "e,state,unchecked"; source: "e";
+      program {
+         signal: "e,state,unchecked"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "indicator";
       }
-      program { signal: "mouse,down,1"; source: "event";
-         action: STATE_SET "pressed" 0.0;
-//         target: "indicator";
-         target: "e.text.label";
-      }
-      program { signal: "mouse,up,1"; source: "event";
-         action: STATE_SET "default" 0.0;
-//         target: "indicator";
-         target: "e.text.label";
-      }
-      program { signal: "mouse,clicked,1"; source: "event";
+      program {
+         signal: "mouse,up,1"; source: "event";
          action: SIGNAL_EMIT "e,action,toggle" "";
       }
-      program { signal: "e,state,disabled"; source: "e";
+      program {
+         signal: "e,state,disabled"; source: "e";
          action: STATE_SET "disabled" 0.0;
          target: "base";
+         target: "shadow";
          target: "clip";
          target: "e.text.label";
          target: "event";
       }
-      program { signal: "e,state,enabled"; source: "e";
+      program {
+         signal: "e,state,enabled"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "base";
+         target: "shadow";
          target: "clip";
          target: "e.text.label";
          target: "event";
@@ -130,29 +139,23 @@ group { name: "e/widgets/check_icon";
    inherit: "e/widgets/check";
    parts {
       part { name: "e.swallow.icon"; type: SWALLOW;
-         scale: 1;
          insert_before: "event";
          clip_to: "clip";
          description { state: "default" 0.0;
-            rel1.offset: 4 4;
-            rel1.relative: 1.0 0.0;
-            rel1.to_x: "base";
-            rel2.offset: 4 -5;
+            rel1.offset: 2 2;
+            rel1.relative: 1.0 0.0; 
+            rel1.to_x: "inset";
+            rel2.offset: 2 -3;
             rel2.relative: 1.0 1.0;
-            rel2.to_x: "base";
+            rel1.to_x: "inset";
             align: 0.0 0.5;
             aspect: 1.0 1.0; aspect_preference: VERTICAL;
-            offscale;
          }
       }
       part { name: "e.text.label";
          description { state: "default" 0.0;
             rel1.to_x: "e.swallow.icon";
          }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            color_class: "/fg/disabled/check/text";
-         }
       }
    }
 }

data/elementary/themes/edc/colors.edc

@@ -1,32 +1,53 @@
 group { name: "e/modules/conf_colors/preview/solid";
-   images.image: "diagonal_stripes.png" COMP;
+   images.image: "inset_shadow.png" COMP;
+   images.image: "bevel_in.png" COMP;
+   images.image: "dot_pattern.png" COMP;
    parts {
       part { name: "bg"; type: RECT;
-         scale: 1;
          description { state: "default" 0.0;
-            rel1.offset: 2 2;
-            rel2.offset: -3 -3;
-            color_class: "/bg-dark/normal/color";
+            rel1.offset: 3 3;
+            rel2.offset: -4 -4;
+            color: 48 48 48 255;
             min: 18 18;
-            offscale;
          }
       }
       part { name: "pat";
-         scale: 1;
          description { state: "default" 0.0;
-            rel.to: "bg";
-            rel1.offset: 2 2;
-            rel2.offset: -3 -3;
-            image.normal: "diagonal_stripes.png";
-            color_class: "/bg-dark-alt/normal/color";
-            TILED_PATTERN(240, 240)
-            offscale;
+            rel1.to: "bg";
+            rel2.to: "bg";
+            image.normal: "dot_pattern.png";
+            TILED_PATTERN(256, 256)
          }
       }
       part { name: "e.rect"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
+            color: 255 255 255 255;
             color_class: "color_preview";
-            rel.to: "pat";
+            rel1.to: "bg";
+            rel2.to: "bg";
+         }
+      }
+      part { name: "shadow"; mouse_events: 0;
+         description { state: "default" 0.0;
+            image.normal: "inset_shadow.png";
+            image.border: 5 5 7 3;
+            image.middle: 0;
+            rel1.to: "bg";
+            rel2.to: "bg";
+            fill.smooth: 0;
+            color: 255 255 255 128;
+         }
+      }
+      part { name: "inset";
+         description { state: "default" 0.0;
+            image.normal: "bevel_in.png";
+            image.border: 1 1 1 1;
+            image.middle: 0;
+            rel1.to: "bg";
+            rel1.offset: -1 -1;
+            rel2.to: "bg";
+            rel2.offset: 0 0;
+            fill.smooth: 0;
          }
       }
    }
@@ -34,8 +55,20 @@ group { name: "e/modules/conf_colors/preview/solid";
 
 group { name: "e/modules/conf_colors/preview/text";
    parts {
-      part { name: "e.text"; type: TEXT; mouse_events: 0;
+      part { name: "shadow"; type: TEXT; mouse_events: 0;
          description { state: "default" 0.0;
+            color: FN_COL_SHADOW;
+            text { font: FN; size: 10;
+               text: "Text";
+               min: 1 1;
+               ellipsis: -1;
+            }
+         }
+      }
+      part { name: "e.text"; type: TEXT; mouse_events: 0;
+         effect: OUTLINE_SHADOW;
+         description { state: "default" 0.0;
+            color: FN_COL_OUTLINE_SHADOW;
             color_class: "color_preview";
             text { font: FNBD; size: 16;
                text: "Ab";
@@ -48,55 +81,75 @@ group { name: "e/modules/conf_colors/preview/text";
 }
 
 group { name: "e/modules/conf_colors/preview/unknown";
-   images.image: "diagonal_stripes.png" COMP;
+   images.image: "inset_shadow.png" COMP;
+   images.image: "bevel_in.png" COMP;
+   images.image: "dot_pattern.png" COMP;
    parts {
       part { name: "bg"; type: RECT;
-         scale: 1;
          description { state: "default" 0.0;
-            rel1.offset: 2 2;
-            rel2.offset: -3 -3;
-            color_class: "/bg-dark/normal/color";
+            rel1.offset: 3 3;
+            rel2.offset: -4 -4;
+            color: 48 48 48 255;
             min: 18 18;
-            offscale;
          }
       }
       part { name: "pat";
-         scale: 1;
          description { state: "default" 0.0;
-            rel.to: "bg";
-            rel1.offset: 2 2;
-            rel2.offset: -3 -3;
-            image.normal: "diagonal_stripes.png";
-            color_class: "/bg-dark-alt/normal/color";
-            TILED_PATTERN(240, 240)
-            offscale;
+            rel1.to: "bg";
+            rel2.to: "bg";
+            image.normal: "dot_pattern.png";
+            TILED_PATTERN(256, 256)
          }
       }
       part { name: "c1"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            color: 255 0 0 128; // no cc
+            color: 255 0 0 128;
             color_class: "color_preview_c1";
-            rel.to: "pat";
+            rel1.to: "bg";
+            rel2.to: "bg";
             rel2.relative: 0.333 1.0;
          }
       }
       part { name: "c2"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            color: 0 255 0 128; // no cc
+            color: 0 255 0 128;
             color_class: "color_preview_c2";
             rel1.to: "c1";
             rel1.relative: 1.0 0.0;
-            rel2.to: "pat";
+            rel2.to: "bg";
             rel2.relative: 0.667 1.0;
          }
       }
       part { name: "c3"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            color: 0 0 255 128; // no cc
+            color: 0 0 255 128;
             color_class: "color_preview_c3";
             rel1.to: "c2";
             rel1.relative: 1.0 0.0;
-            rel2.to: "pat";
+            rel2.to: "bg";
+         }
+      }
+      part { name: "shadow"; mouse_events: 0;
+         description { state: "default" 0.0;
+            image.normal: "inset_shadow.png";
+            image.border: 5 5 7 3;
+            image.middle: 0;
+            rel1.to: "bg";
+            rel2.to: "bg";
+            fill.smooth: 0;
+            color: 255 255 255 128;
+         }
+      }
+      part { name: "inset";
+         description { state: "default" 0.0;
+            image.normal: "bevel_in.png";
+            image.border: 1 1 1 1;
+            image.middle: 0;
+            rel1.to: "bg";
+            rel1.offset: -1 -1;
+            rel2.to: "bg";
+            rel2.offset: 0 0;
+            fill.smooth: 0;
          }
       }
    }

data/elementary/themes/edc/colorwell.edc

@@ -1,54 +1,76 @@
 group { name: "e/widgets/color_well";
-   images.image: "diagonal_stripes.png" COMP;
+   images.image: "inset_shadow.png" COMP;
+   images.image: "bevel_in.png" COMP;
+   images.image: "dot_pattern.png" COMP;
    parts {
       part { name: "bg"; type: RECT;
-         scale: 1;
          description { state: "default" 0.0;
-            rel1.offset: 2 2;
-            rel2.offset: -3 -3;
-            color_class: "/bg-dark/normal/color";
-            min: 18 18;
-            offscale;
+            rel1.to: "e.swallow.content";
+            rel2.to: "e.swallow.content";
+            color: 48 48 48 255;
          }
       }
       part { name: "pat";
-         scale: 1;
-         description
-           { state: "default" 0.0;
-              rel.to: "bg";
-              rel1.offset: 2 2;
-              rel2.offset: -3 -3;
-              image.normal: "diagonal_stripes.png";
-              color_class: "/bg-dark-alt/normal/color";
-              TILED_PATTERN(240, 240)
-              offscale;
-           }
+         description { state: "default" 0.0;
+            rel1.to: "bg";
+            rel2.to: "bg";
+            image.normal: "dot_pattern.png";
+            TILED_PATTERN(256, 256)
+         }
       }
       part { name: "clipper"; type: RECT;
          description { state: "default" 0.0;
-            rel.to: "pat";
+            rel1.to: "e.swallow.content";
+            rel2.to: "e.swallow.content";
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 64; // no cc
+            color: 255 255 255 64;
          }
       }
-      part { name: "e.swallow.content"; type: SWALLOW; mouse_events: 0;
+      part { name: "e.swallow.content"; type: SWALLOW;
          clip_to: "clipper";
          description { state: "default" 0.0;
-            rel.to: "pat";
+            rel1.offset: 3 3;
+            rel2.offset: -4 -4;
+         }
+      }
+      part { name: "shadow"; mouse_events: 0;
+         description { state: "default" 0.0;
+            image.normal: "inset_shadow.png";
+            image.border: 5 5 7 3;
+            image.middle: 0;
+            rel1.to: "bg";
+            rel2.to: "bg";
+            fill.smooth: 0;
+            color: 255 255 255 128;
+         }
+      }
+      part { name: "inset";
+         description { state: "default" 0.0;
+            image.normal: "bevel_in.png";
+            image.border: 1 1 1 1;
+            image.middle: 0;
+            rel1.to: "bg";
+            rel1.offset: -1 -1;
+            rel2.to: "bg";
+            rel2.offset: 0 0;
+            fill.smooth: 0;
          }
       }
    }
    programs {
-      program { signal: "mouse,clicked,1"; source: "pat";
+      program {
+         signal: "mouse,clicked,1"; source: "inset";
          action: SIGNAL_EMIT "e,action,click" "";
       }
-      program { signal: "e,state,disabled"; source: "e";
+      program {
+         signal: "e,state,disabled"; source: "e";
          action: STATE_SET "disabled" 0.0;
          target: "clipper";
       }
-      program { signal: "e,state,enabled"; source: "e";
+      program {
+         signal: "e,state,enabled"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "clipper";
       }

data/elementary/themes/edc/comp.edc

@@ -6,8 +6,9 @@ group { name: "e/comp/preview";
       }
       part { name: "e.text.label"; type: TEXT; mouse_events: 0;
          scale: 1;
+         effect: SHADOW BOTTOM;
          description { state: "default" 0.0;
-            color_class: "/fg/normal/comp/preview/text";
+            color: FN_COL_DEFAULT;
             text { font: FNBD; size: 10;
                text_class: "fileman_icon";
                align: 0.5 0.5;
@@ -21,7 +22,7 @@ group { name: "e/comp/preview";
 }
 
 group { name: "e/comp/screen/base/default";
-   alias: "e/comp/screen/base/noeffects"; // legacy
+   alias: "e/comp/screen/base/noeffects";
    parts {
       part { name: "clip"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
@@ -36,9 +37,7 @@ group { name: "e/comp/screen/base/default";
 }
 
 group { name: "e/comp/screen/overlay/default";
-   alias: "e/comp/screen/overlay/noeffects"; // legacy
    images.image: "screen_circular_shadow.png" COMP;
-   data.item: "restarted" "on";
    parts {
       part { name: "clip"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
@@ -51,135 +50,182 @@ group { name: "e/comp/screen/overlay/default";
             rel2.relative: 2.0 2.0;
             image.normal: "screen_circular_shadow.png";
             fill.smooth: 0;
-            color: 255 255 255 0; // no cc
+            color: 255 255 255 0;
             visible: 0;
          }
          description { state: "visible" 0.0;
             inherit;
             rel1.relative: 0.0 0.0;
             rel2.relative: 1.0 1.0;
-            color: 255 255 255 255; // no cc
+            color: 255 255 255 255;
             visible: 1;
          }
       }
       part { name: "blanker"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            color: 0 0 0 0; // no cc
+            color: 0 0 0 0;
             visible: 0;
          }
          description { state: "visible" 0.0;
             inherit;
-            color: 0 0 0 255; // no cc
+            color: 0 0 0 255;
             visible: 1;
          }
       }
       part { name: "suspender"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            color: 0 0 0 0; // no cc
+            color: 0 0 0 0;
             visible: 0;
          }
          description { state: "visible" 0.0;
             inherit;
-            color: 0 0 0 255; // no cc
+            color: 0 0 0 255;
             visible: 1;
          }
       }
    }
    programs {
-         program { signal: "e,state,screensaver,on"; source: "e";
+         program {
+            name: "screensaver_on";
+            signal: "e,state,screensaver,on"; source: "e";
             action: STATE_SET "visible" 0.0;
-            transition: ACCELERATE 3.0 USE_DURATION_FACTOR 1 CURRENT;
+            transition: ACCELERATE 3.0 CURRENT;
             target: "blanker";
             sequence {
                action: SIGNAL_EMIT "e,state,screensaver,active" "e";
             }
          }
-         program { signal: "e,state,screensaver,on"; source: "e";
+         program {
+            name: "screensaver_on2";
+            signal: "e,state,screensaver,on"; source: "e";
             action: STATE_SET "visible" 0.0;
-            transition: DECELERATE 3.0 USE_DURATION_FACTOR 1 CURRENT;
+            transition: DECELERATE 1.5 CURRENT;
             target: "shadow";
          }
-         program { signal: "e,state,screensaver,off"; source: "e";
+         program {
+            name: "screensaver_off";
+            signal: "e,state,screensaver,off"; source: "e";
             action: STATE_SET "default" 0.0;
-            transition: ACCELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT;
+            transition: ACCELERATE 0.5 CURRENT;
             target: "blanker";
          }
-         program { signal: "e,state,screensaver,off"; source: "e";
+         program {
+            name: "screensaver_off2";
+            signal: "e,state,screensaver,off"; source: "e";
             action: STATE_SET "default" 0.0;
-            transition: ACCELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT;
+            transition: ACCELERATE 0.25 CURRENT;
             target: "shadow";
          }
-         program { signal: "e,state,sys,suspend"; source: "e";
+         program {
+            name: "suspend";
+            signal: "e,state,sys,suspend"; source: "e";
             action: STATE_SET "visible" 0.0;
-            transition: ACCELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT;
+            transition: ACCELERATE 0.5 CURRENT;
             target: "suspender";
             sequence {
                action: SIGNAL_EMIT "e,state,sys,suspend,done" "e";
             }
          }
-         program { signal: "e,state,sys,hibernate"; source: "e";
+         program {
+            name: "hibernate";
+            signal: "e,state,sys,hibernate"; source: "e";
             action: STATE_SET "visible" 0.0;
-            transition: ACCELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT;
+            transition: ACCELERATE 0.5 CURRENT;
             target: "suspender";
             sequence {
                action: SIGNAL_EMIT "e,state,sys,hibernate,done" "e";
             }
          }
-         program { signal: "e,state,sys,resume"; source: "e";
+         program {
+            name: "resume";
+            signal: "e,state,sys,resume"; source: "e";
             action: STATE_SET "default" 0.0;
-            transition: DECELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT;
+            transition: DECELERATE 1.0 CURRENT;
             target: "suspender";
          }
-         program { signal: "e,state,sys,reboot"; source: "e";
+         program {
+            name: "reboot";
+            signal: "e,state,sys,reboot"; source: "e";
             action: STATE_SET "visible" 0.0;
-            transition: ACCELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT;
+            transition: ACCELERATE 0.5 CURRENT;
             target: "suspender";
             sequence {
                 action: SIGNAL_EMIT "e,state,sys,reboot,done" "e";
             }
          }
-         program { signal: "e,state,sys,halt"; source: "e";
+         program {
+            name: "halt";
+            signal: "e,state,sys,halt"; source: "e";
             action: STATE_SET "visible" 0.0;
-            transition: ACCELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT;
+            transition: ACCELERATE 0.5 CURRENT;
             target: "suspender";
             sequence {
                 action: SIGNAL_EMIT "e,state,sys,halt,done" "e";
             }
          }
-         program { signal: "e,state,sys,logout"; source: "e";
+         program {
+            name: "logout";
+            signal: "e,state,sys,logout"; source: "e";
             action: STATE_SET "visible" 0.0;
-            transition: ACCELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT;
+            transition: ACCELERATE 0.5 CURRENT;
             target: "suspender";
             sequence {
                 action: SIGNAL_EMIT "e,state,sys,logout,done" "e";
             }
          }
-         program { signal: "e,state,sys,restart"; source: "e";
-            action: STATE_SET "visible" 0.0;
-            transition: ACCELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT;
-            target: "suspender";
-            sequence {
-                action: SIGNAL_EMIT "e,state,sys,restart,done" "e";
-            }
+   }
+}
+
+
+group { name: "e/comp/screen/overlay/noeffects";
+   inherit: "e/comp/screen/overlay/default";
+   programs {
+         program {
+            name: "screensaver_on";
+            transition: ACCELERATE 0 CURRENT;
          }
-         program { signal: "e,state,sys,restarted"; source: "e";
-            action: STATE_SET "visible" 0.0;
-            target: "suspender";
+         program {
+            name: "screensaver_on2";
+            transition: DECELERATE 0 CURRENT;
          }
-         program { signal: "e,state,sys,restarted,show"; source: "e";
-            action: STATE_SET "default" 0.0;
-            transition: ACCELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT;
-            target: "suspender";
-            sequence {
-              action: SIGNAL_EMIT "e,state,sys,restarted,show,done" "e";
-            }
+         program {
+            name: "screensaver_off";
+            transition: ACCELERATE 0 CURRENT;
+         }
+         program {
+            name: "screensaver_off2";
+            transition: ACCELERATE 0 CURRENT;
+         }
+         program {
+            name: "suspend";
+            transition: ACCELERATE 0 CURRENT;
+         }
+         program {
+            name: "hibernate";
+            transition: ACCELERATE 0 CURRENT;
+         }
+         program {
+            name: "resume";
+            transition: DECELERATE 0 CURRENT;
+         }
+         program {
+            name: "reboot";
+            transition: DECELERATE 0 CURRENT;
+         }
+         program {
+            name: "halt";
+            transition: DECELERATE 0 CURRENT;
+         }
+         program {
+            name: "logout";
+            transition: DECELERATE 0 CURRENT;
          }
    }
 }
 
 group { name: "e/comp/frame/default";
-   alias: "e/comp/frame/default/fast"; // legacy
-   images.image: "win_shad_flat.png" COMP;
+   images.image: "win_glow.png" COMP;
+   images.image: "win_shadow.png" COMP;
    script {
       public message(Msg_Type:type, id, ...) {
          if ((type == MSG_INT) && (id == 0)) {
@@ -212,37 +258,50 @@ group { name: "e/comp/frame/default";
             rel1.offset: -9999 -9999;
             rel2.relative: 2.0   2.0;
             rel2.offset: 9999  9999;
-            color: 255 255 255 0; // no cc
+            color: 255 255 255 0;
             visible: 0;
          }
          description { state: "visible" 0.0;
             inherit;
-            color: 255 255 255 255; // no cc
+            color: 255 255 255 255;
             visible: 1;
          }
       }
-      part { name: "shadow"; type: RECT;
+      part { name: "shadow"; mouse_events: 0;
          clip_to: "clipper";
          description { state: "default" 0.0;
-            rel.to: "clipper";
+            rel.to: "e.swallow.content";
+            WIN_SHADOW;
          }
          description { state: "hidden" 0.0;
             inherit;
             visible: 0;
          }
       }
-      part { name: "focus-shadow"; type: RECT;
-         clip_to: "shadow";
+      rect { "focus_clip"; clip: "clipper";
+         desc {
+            rel1.offset: -9999 -9999;
+            rel2.offset: 9999 9999;
+         }
+         desc { "hid"; hid; }
+      }
+      part { name: "glow"; mouse_events: 0;
+         clip_to: "focus_clip";
          description { state: "default" 0.0;
-            rel.to: "clipper";
-            color_class: "/shadow/normal/comp/win";
+            image.normal: "win_glow.png";
+            image.border: 9 9 9 9;
+            image.middle: 0;
+            rel.to: "gspacer";
+            fill.smooth: 0;
+            color: 255 255 255 0;
+            visible: 0;
          }
          description { state: "focused" 0.0;
             inherit;
-            color_class: "/shadow/selected/comp/win";
+            color: 255 255 255 255;
+            visible: 1;
          }
       }
-      WIN_SHAD("e.swallow.content", "focus-shadow", "win_shad_flat.png", 21, 21, 14, 28, 0.5)
       part { name: "shower"; type: SPACER;
          description { state: "default" 0.0;
             rel1.relative: 0.05 0.05;
@@ -259,156 +318,100 @@ group { name: "e/comp/frame/default";
          clip_to: "clipper";
          mouse_events: 0;
          description { state: "default" 0.0;
+            color_class: "comp_focus-out_color";
             rel.to: "clipper";
-            color_class: "/bg/normal/comp/win";
          }
          description { state: "focused" 0.0;
             inherit;
-            color_class: "/bg/selected/comp/win";
+            color_class: "comp_focus_color";
          }
       }
-#define FOCUSGLOWSZ 20
-      part { name: "focusglow"; type: RECT;
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            rel.to: "e.swallow.content";
-         }
-         description { state: "active" 0.0;
-            inherit: "default" 0.0;
-            offscale;
-            rel1.offset: (0-FOCUSGLOWSZ) (0-FOCUSGLOWSZ);
-            rel2.offset: (FOCUSGLOWSZ-1) (FOCUSGLOWSZ-1);
-            color: 255 255 255 0; // no cc
-        }
-      }
-      part { name: "focusglow1"; type: RECT;
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            clip_to: "focusglow";
-            offscale;
-            rel2.relative: 1.0 0.0;
-            rel1.offset: (0-FOCUSGLOWSZ) (0-FOCUSGLOWSZ);
-            rel2.offset: (FOCUSGLOWSZ-1) -1;
-            color_class: "/bg/selected/comp/focusglow";
-         }
-      }
-      part { name: "focusglow2"; type: RECT;
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            clip_to: "focusglow";
-            offscale;
-            rel1.relative: 0.0 1.0;
-            rel1.offset: (0-FOCUSGLOWSZ) 0;
-            rel2.offset: (FOCUSGLOWSZ-1) (FOCUSGLOWSZ-1);
-            color_class: "/bg/selected/comp/focusglow";
-         }
-      }
-      part { name: "focusglow3"; type: RECT;
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            clip_to: "focusglow";
-            offscale;
-            rel2.relative: 0.0 1.0;
-            rel1.offset: (0-FOCUSGLOWSZ) 0;
-            rel2.offset: -1 -1;
-            color_class: "/bg/selected/comp/focusglow";
-         }
-      }
-      part { name: "focusglow4"; type: RECT;
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            clip_to: "focusglow";
-            offscale;
-            rel1.relative: 1.0 0.0;
-            rel1.offset: 0 0;
-            rel2.offset: (FOCUSGLOWSZ-1) -1;
-            color_class: "/bg/selected/comp/focusglow";
-         }
-      }
-#undef FOCUSGLOWSZ
       part { name: "e.swallow.content"; type: SWALLOW;
          clip_to: "focus-clipper";
          description { state: "default" 0.0;
             rel.to: "shower";
-          }
+         }
       }
       spacer { "gspacer";
          desc {
             rel.to: "e.swallow.content";
-            rel1.offset: -5 -5;
-            rel2.offset:  4  4;
+            rel1.offset: -5  -5;
+            rel2.offset: 4 4;
          }
       }
    }
    programs {
-       program { signal: "e,state,shadow,on"; source: "e";
+       program {
+         signal: "e,state,shadow,on"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "shadow";
       }
-      program { signal: "e,state,shadow,off"; source: "e";
+      program {
+         signal: "e,state,shadow,off"; source: "e";
          action: STATE_SET "hidden" 0.0;
          target: "shadow";
       }
-      program { name: "visible_on";
+      program {
+         name: "visible_on";
          signal: "e,state,visible"; source: "e";
          action: STATE_SET "visible" 0.0;
-         transition: DECELERATE 0.15 USE_DURATION_FACTOR 1;
+         transition: DECELERATE 0.15;
          targets: "clipper" "shower";
          sequence {
              action: SIGNAL_EMIT "e,action,show,done" "e";
          }
       }
-      program { signal: "e,state,visible"; source: "e";
+      program {
+         signal: "e,state,visible"; source: "e";
          action: ACTION_STOP;
          target: "visible_off";
       }
-      program { signal: "e,state,hidden"; source: "e";
+      program {
+         signal: "e,state,hidden"; source: "e";
          action: ACTION_STOP;
          target: "visible_on";
       }
-      program { name: "visible_off";
+      program {
+         name: "visible_off";
          signal: "e,state,hidden"; source: "e";
          action: STATE_SET "default" 0.0;
-         transition: DECELERATE 0.30 USE_DURATION_FACTOR 1;
+         transition: DECELERATE 0.30;
          targets: "clipper" "shower";
          sequence {
              action: SIGNAL_EMIT "e,action,hide,done" "e";
          }
       }
-      program { signal: "e,state,focused"; source: "e";
-         action: STATE_SET "focused" 0.0;
-         transition: SINUSOIDAL 0.1 USE_DURATION_FACTOR 1;
-         targets: "focus-clipper" "focus-shadow";
-      }
-      program { signal: "e,state,unfocused"; source: "e";
-         action: STATE_SET "default" 0.0;
-         transition: SINUSOIDAL 0.2 USE_DURATION_FACTOR 1;
-         targets: "focus-clipper" "focus-shadow";
-      }
-      program { name: "focusbounce";
+      program {
+         name: "focus_on";
          signal: "e,state,focused"; source: "e";
-         action: STATE_SET "default" 0.0;
-         target: "focusglow";
+         action: STATE_SET "focused" 0.0;
+         transition: SINUSOIDAL 0.1;
+         targets: "glow" "focus-clipper";
          sequence {
-            action: STATE_SET "active" 0.0;
-            target: "focusglow";
-            transition: DECELERATE 0.3 USE_DURATION_FACTOR 1;
+             action: STATE_SET "default" 0.0;
+             transition: SINUSOIDAL 0.4;
+             target: "glow";
          }
       }
-      program { name: "focusbounceoff";
+      program {
+         name: "focus_off";
          signal: "e,state,unfocused"; source: "e";
          action: STATE_SET "default" 0.0;
-         target: "focusglow";
+         transition: SINUSOIDAL 0.1;
+         target: "focus-clipper";
+         sequence {
+             action: STATE_SET "default" 0.0;
+             target: "glow";
+         }
       }
-/*
       program { name: "urgent1";
          signal: "e,state,urgent"; source: "e";
          action: STATE_SET "focused" 0.0;
-         transition: SINUSOIDAL 0.3 USE_DURATION_FACTOR 1;
+         transition: SINUSOIDAL 0.3;
          target: "glow";
          sequence {
              action: STATE_SET "default" 0.0;
-             transition: SINUSOIDAL 0.3 USE_DURATION_FACTOR 1;
+             transition: SINUSOIDAL 0.3;
              target: "glow";
              after: "urgent1";
          }
@@ -416,7 +419,7 @@ group { name: "e/comp/frame/default";
       program {
          signal: "e,state,not_urgent"; source: "e";
          action: STATE_SET "default" 0.0;
-         transition: SINUSOIDAL 0.6 CURRENT USE_DURATION_FACTOR 1;
+         transition: SINUSOIDAL 0.6 CURRENT;
          target: "glow";
       }
       program { signal: "e,state,focus,disabled"; source: "e";
@@ -427,23 +430,12 @@ group { name: "e/comp/frame/default";
          action: STATE_SET "default";
          target: "focus_clip";
       }
- */
    }
 }
 
 group { name: "e/comp/frame/rotate";
-   alias: "e/comp/frame/rotate/fast"; // legacy
    inherit: "e/comp/frame/default";
    parts {
-      part { name: "focusglow"; type: RECT;
-         description { state: "default" 0.0;
-            visible: 0;
-         }
-         description { state: "active" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-        }
-      }
       part { name: "e.swallow.content";
          description { state: "default";
             map {
@@ -467,27 +459,34 @@ group { name: "e/comp/frame/rotate";
       }
    }
    programs {
-      program { signal: "e,state,focused"; source: "e";
+      program { name: "focus3";
+         signal: "e,state,focused"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "e.swallow.content";
-         transition: LINEAR 0.3 USE_DURATION_FACTOR 1;
+         transition: LINEAR 0.3;
       }
-      program { signal: "e,state,unfocused"; source: "e";
+      program { name: "focus_off3";
+         signal: "e,state,unfocused"; source: "e";
          action: STATE_SET "focus-out" 0.0;
          target: "e.swallow.content";
-         transition: LINEAR 0.3 USE_DURATION_FACTOR 1;
+         transition: LINEAR 0.3;
       }
-      program { name: "focusbounce";
-         signal: "xxx";
+   }
+}
+
+group { name: "e/comp/frame/rotate/fast";
+   inherit: "e/comp/frame/rotate";
+   programs {
+      program { name: "focus3";
+         transition: LINEAR 0;
       }
-      program { name: "focusbounceoff";
-         signal: "xxx";
+      program { name: "focus_off3";
+         transition: LINEAR 0;
       }
    }
 }
 
 group { name: "e/comp/frame/flip";
-   alias: "e/comp/frame/flip/fast"; // legacy
    inherit: "e/comp/frame/rotate";
    parts {
       part { name: "e.swallow.content";
@@ -512,30 +511,68 @@ group { name: "e/comp/frame/flip";
    }
 }
 
-group { name: "e/comp/frame/popup";
-   alias: "e/comp/frame/popup/fast"; // legacy
-   inherit: "e/comp/frame/default";
-   parts {
-      part { name: "focusglow"; type: RECT;
-         description { state: "default" 0.0;
-            visible: 0;
-         }
-         description { state: "active" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-        }
+group { name: "e/comp/frame/flip/fast";
+   inherit: "e/comp/frame/flip";
+   programs {
+      program { name: "focus3";
+         transition: LINEAR 0;
       }
+      program { name: "focus_off3";
+         transition: LINEAR 0;
+      }
+   }
+}
+
+group { name: "e/comp/frame/popup";
+   inherit: "e/comp/frame/default";
+   images.image: "win_shadow.png" COMP;
+   parts {
       part { name: "focus-clipper";
          description { state: "default";
+            color_class: "";
          }
       }
    }
+}
+
+group { name: "e/comp/frame/default/fast";
+   inherit: "e/comp/frame/default";
    programs {
-      program { name: "focusbounce";
-         signal: "xxx";
+      program {
+         name: "visible_on";
+         transition: DECELERATE 0;
       }
-      program { name: "focusbounceoff";
-         signal: "xxx";
+      program {
+         name: "visible_off";
+         transition: DECELERATE 0;
+      }
+      program {
+         name: "focus_on";
+         signal: "e,state,focus,on"; source: "e";
+         action: STATE_SET "focused" 0.0;
+         transition: SINUSOIDAL 0.1;
+         targets: "glow" "focus-clipper";
+         sequence {
+             action: STATE_SET "default" 0.0;
+             transition: SINUSOIDAL 0.1;
+             target: "glow";
+         }
+      }
+      program {
+         name: "focus_off";
+         transition: SINUSOIDAL 0;
+      }
+   }
+}
+
+group { name: "e/comp/frame/popup/fast";
+   inherit: "e/comp/frame/default/fast";
+   images.image: "win_shadow.png" COMP;
+   parts {
+      part { name: "focus-clipper";
+         description { state: "default";
+            color_class: "";
+         }
       }
    }
 }
@@ -548,28 +585,20 @@ group { name: "e/comp/frame/none";
       }
    }
    programs {
-      program { signal: "e,state,visible"; source: "e";
+      program {
+         signal: "e,state,visible"; source: "e";
          action: SIGNAL_EMIT "e,action,show,done" "e";
       }
-      program { signal: "e,state,hidden"; source: "e";
+      program {
+         signal: "e,state,hidden"; source: "e";
          action: SIGNAL_EMIT "e,action,hide,done" "e";
       }
    }
 }
 
 group { name: "e/comp/frame/still";
-   alias: "e/comp/frame/still/fast"; // legacy
    inherit: "e/comp/frame/default";
    parts {
-      part { name: "focusglow"; type: RECT;
-         description { state: "default" 0.0;
-            visible: 0;
-         }
-         description { state: "active" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-        }
-      }
       part { name: "shower";
          description { state: "default" 0.0;
             rel1.relative: 0.0 0.0;
@@ -577,54 +606,59 @@ group { name: "e/comp/frame/still";
          }
       }
    }
-   programs {
-      program { name: "focusbounce";
-         signal: "xxx";
-      }
-      program { name: "focusbounceoff";
-         signal: "xxx";
+}
+
+group { name: "e/comp/frame/still/fast";
+   inherit: "e/comp/frame/default/fast";
+   parts {
+      part { name: "shower";
+         description { state: "default" 0.0;
+            rel1.relative: 0.0 0.0;
+            rel2.relative: 1.0 1.0;
+         }
       }
    }
 }
 
 group { name: "e/comp/frame/menu";
-   alias: "e/comp/frame/menu/fast"; // legacy
    inherit: "e/comp/frame/popup";
-   images.image: "win_shad_angle.png" COMP;
+   images.image: "win_menu_shadow.png" COMP;
    parts {
-      part { name: "focus-shadow"; type: RECT;
+      part { name: "shadow";
          description { state: "default" 0.0;
-            color_class: "/shadow/selected/comp/win";
+            WIN_MENU_SHADOW;
          }
       }
-      WIN_SHAD("e.swallow.content", "focus-shadow", "win_shad_angle.png", 21, 21, 14, 28, 0.5)
       part { name: "shower";
          description { state: "default" 0.0;
             rel1.relative: 0.05 0.0;
             rel2.relative: 0.95 0.9;
          }
       }
+      image { "glow";
+         desc { "focused"; hid; }
+      }
+   }
+}
+
+group { name: "e/comp/frame/menu/fast";
+   inherit: "e/comp/frame/popup/fast";
+   parts {
+      part { name: "shower";
+         description { state: "default" 0.0;
+            rel1.relative: 0.05 0.0;
+            rel2.relative: 0.95 0.9;
+         }
+      }
+      image { "glow";
+         desc { "focused"; hid; }
+      }
    }
 }
 
 group { name: "e/comp/frame/everything";
-   alias: "e/comp/frame/everything/fast"; // legacy
    inherit: "e/comp/frame/popup";
    parts {
-      part { name: "focusglow"; type: RECT;
-         description { state: "default" 0.0;
-            visible: 0;
-         }
-         description { state: "active" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-        }
-      }
-      part { name: "shadow";
-         description { state: "hidden" 0.0;
-            visible: 1;
-         }
-      }
       part { name: "shower";
          description { state: "default" 0.0;
             rel1.relative: -0.3 -0.3;
@@ -632,18 +666,21 @@ group { name: "e/comp/frame/everything";
          }
       }
    }
-   programs {
-      program { name: "focusbounce";
-         signal: "xxx";
-      }
-      program { name: "focusbounceoff";
-         signal: "xxx";
+}
+
+group { name: "e/comp/frame/everything/fast";
+   inherit: "e/comp/frame/popup/fast";
+   parts {
+      part { name: "shower";
+         description { state: "default" 0.0;
+            rel1.relative: -0.3 -0.3;
+            rel2.relative: 1.3 1.3;
+         }
       }
    }
 }
 
 group { name: "e/comp/frame/fullscreen";
-   alias: "e/comp/frame/fullscreen/fast"; // legacy
    images.image: "screen_circular_shadow.png" COMP;
    data.item: "screen.bg" "fullscreen.bg";
    parts {
@@ -653,17 +690,17 @@ group { name: "e/comp/frame/fullscreen";
             rel1.offset: -9999 -9999;
             rel2.relative: 2.0   2.0;
             rel2.offset: 9999  9999;
-            color: 255 255 255 0; // no cc
+            color: 255 255 255 0;
             visible: 0;
          }
          description { state: "visible1" 0.0;
             inherit;
-            color: 255 255 255 255; // no cc
+            color: 255 255 255 255;
             visible: 1;
          }
          description { state: "visible2" 0.0;
             inherit;
-            color: 255 255 255 255; // no cc
+            color: 255 255 255 255;
             visible: 1;
          }
       }
@@ -678,25 +715,25 @@ group { name: "e/comp/frame/fullscreen";
             rel2.relative: 2.0 2.0;
             image.normal: "screen_circular_shadow.png";
             fill.smooth: 0;
-            color: 0 0 0 0; // no cc
+            color: 255 255 255 0;
             visible: 0;
          }
          description { state: "visible" 0.0;
             inherit;
             rel1.relative: 0.0 0.0;
             rel2.relative: 1.0 1.0;
-            color: 0 0 0 255; // no cc
+            color: 255 255 255 255;
             visible: 1;
          }
       }
-      part { name: "scr_shade"; type: RECT; mouse_events: 0;
+      part { name: "scr_shade"; type: RECT;
          description { state: "default" 0.0;
-            color: 0 0 0 0; // no cc
+            color: 0 0 0 0;
             visible: 0;
          }
          description { state: "visible" 0.0;
             inherit;
-            color: 0 0 0 255; // no cc
+            color: 0 0 0 255;
             visible: 1;
          }
       }
@@ -721,71 +758,107 @@ group { name: "e/comp/frame/fullscreen";
       part { name: "e.swallow.content"; type: SWALLOW;
          clip_to: "clipper";
          description { state: "default" 0.0;
-            rel.to: "shower";
+            rel1.to: "shower";
+            rel2.to: "shower";
          }
       }
-      part { name: "fader"; type: RECT; mouse_events: 0;
+      part { name: "fader"; type: RECT;
          description { state: "default" 0.0;
-            rel.to: "e.swallow.content";
-            color: 255 255 255 0; // no cc
+            rel1.to: "e.swallow.content";
+            rel2.to: "e.swallow.content";
+            color: 255 255 255 0;
             visible: 0;
          }
          description { state: "visible1" 0.0;
             inherit;
-            color: 255 255 255 255; // no cc
+            color: 255 255 255 255;
             visible: 1;
          }
          description { state: "visible2" 0.0;
             inherit;
-            color: 255 255 255 0; // no cc
+            color: 255 255 255 0;
             visible: 0;
          }
       }
    }
    programs {
-      program { name: "visible_on";
+      program {
+         name: "visible_on";
          signal: "e,state,visible"; source: "e";
          action: STATE_SET "visible" 0.0;
-         transition: DECELERATE 0.25 USE_DURATION_FACTOR 1;
+         transition: DECELERATE 0.25;
          targets: "scr_shadow" "scr_shade";
       }
-      program { name: "visible_on2";
+      program {
+         name: "visible_on2";
          signal: "e,state,visible"; source: "e";
          action: STATE_SET "visible1" 0.0;
-         transition: DECELERATE 0.05 USE_DURATION_FACTOR 1;
+         transition: DECELERATE 0.05;
          targets: "clipper" "shower" "fader";
          sequence {
              action: STATE_SET "visible2" 0.0;
-             transition: DECELERATE 0.20 USE_DURATION_FACTOR 1;
+             transition: DECELERATE 0.20;
              targets: "clipper" "shower" "fader";
              action: SIGNAL_EMIT "e,action,show,done" "e";
          }
       }
-      program { signal: "e,state,visible"; source: "e";
+      program {
+         signal: "e,state,visible"; source: "e";
          action: ACTION_STOP;
          targets: "visible_off" "visible_off2";
       }
-      program { signal: "e,state,hidden"; source: "e";
+      program {
+         signal: "e,state,hidden"; source: "e";
          action: ACTION_STOP;
          targets: "visible_on" "visible_on2";
       }
-      program { name: "visible_off";
+      program {
+         name: "visible_off";
          signal: "e,state,hidden"; source: "e";
          action: STATE_SET "default" 0.0;
-         transition: DECELERATE 0.25 USE_DURATION_FACTOR 1;
+         transition: DECELERATE 0.25;
          targets: "scr_shadow" "scr_shade";
       }
-      program { name: "visible_off2";
+      program {
+         name: "visible_off2";
          signal: "e,state,hidden"; source: "e";
          action: STATE_SET "visible1" 0.0;
-         transition: DECELERATE 0.2 USE_DURATION_FACTOR 1;
+         transition: DECELERATE 0.2;
          targets: "clipper" "shower" "fader";
          sequence {
              action: STATE_SET "default" 0.0;
-             transition: DECELERATE 0.05 USE_DURATION_FACTOR 1;
+             transition: DECELERATE 0.05;
              targets: "clipper" "shower" "fader";
              action: SIGNAL_EMIT "e,action,hide,done" "e";
          }
       }
    }
 }
+
+group { name: "e/comp/frame/fullscreen/fast";
+   inherit: "e/comp/frame/fullscreen";
+   programs {
+      program {
+         name: "visible_on";
+         transition: DECELERATE 0;
+      }
+      program {
+         name: "visible_on2";
+         transition: DECELERATE 0;
+      }
+      program { name: "show2";
+         transition: DECELERATE 0;
+      }
+      program {
+         name: "visible_off";
+         transition: DECELERATE 0;
+      }
+      program {
+         name: "visible_off2";
+         transition: DECELERATE 0;
+      }
+      program { name: "hide2";
+         transition: DECELERATE 0;
+      }
+   }
+}

data/elementary/themes/edc/comp_compat.edc

@@ -1,6 +1,6 @@
 group { name: "e/comp/border/default";
-   alias: "e/comp/border/default/fast"; // legacy
-   images.image: "win_shad_flat.png" COMP;
+   images.image: "win_shadow.png" COMP;
+   images.image: "win_glow.png" COMP;
    parts {
       part { name: "clipper"; type: RECT;
          description { state: "default" 0.0;
@@ -8,37 +8,47 @@ group { name: "e/comp/border/default";
             rel1.offset: -9999 -9999;
             rel2.relative: 2.0   2.0;
             rel2.offset: 9999  9999;
-            color: 255 255 255 0; // no cc
+            color: 255 255 255 0;
             visible: 0;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255; // no cc
+            color: 255 255 255 255;
             visible: 1;
          }
       }
-      part { name: "shadow"; type: RECT; mouse_events: 0;
+      part { name: "shadow"; mouse_events: 0;
          clip_to: "clipper";
          description { state: "default" 0.0;
-            rel.to: "clipper";
+            rel1.to: "e.swallow.content";
+            rel2.to: "e.swallow.content";
+            WIN_SHADOW;
          }
          description { state: "hidden" 0.0;
             inherit: "default" 0.0;
             visible: 0;
          }
       }
-      part { name: "focus-shadow"; type: RECT;
-         clip_to: "shadow";
+      part { name: "glow"; mouse_events: 0;
+         clip_to: "clipper";
          description { state: "default" 0.0;
-            rel.to: "clipper";
-            color_class: "/shadow/normal/comp/win";
+            image.normal: "win_glow.png";
+            image.border: 9 9 9 9;
+            image.middle: 0;
+            rel1.to: "e.swallow.content";
+            rel1.offset: -5  -5;
+            rel2.to: "e.swallow.content";
+            rel2.offset: 4 4;
+            fill.smooth: 0;
+            color: 255 255 255 0;
+            visible: 0;
          }
          description { state: "focused" 0.0;
-            inherit;
-            color_class: "/shadow/selected/comp/win";
+            inherit: "default" 0.0;
+            color: 255 255 255 255;
+            visible: 1;
          }
       }
-      WIN_SHAD("e.swallow.content", "focus-shadow", "win_shad_flat.png", 21, 21, 14, 28, 0.5)
       part { name: "shower"; type: SPACER;
          description { state: "default" 0.0;
             rel1.relative: 0.05 0.05;
@@ -50,44 +60,55 @@ group { name: "e/comp/border/default";
             rel2.relative: 1.0  1.0;
          }
       }
-      part { name: "trans-clipper"; type: RECT;
+      part { name: "trans-clipper";
+         type: RECT;
          clip_to: "clipper";
          mouse_events: 0;
          description { state: "default" 0.0;
-            rel.to: "clipper";
+            color_class: "comp_alpha";
+            rel1.to: "clipper";
+            rel2.to: "clipper";
          }
       }
-      part { name: "focus-clipper"; type: RECT;
+      part { name: "focus-clipper";
+         type: RECT;
          clip_to: "trans-clipper";
          mouse_events: 0;
          description { state: "default" 0.0;
-            rel.to: "clipper";
-            color_class: "/bg/normal/comp/win";
+            color_class: "comp_focus-out_color";
+            rel1.to: "clipper";
+            rel2.to: "clipper";
          }
          description { state: "focused" 0.0;
             inherit: "default" 0.0;
-            color_class: "/bg/selected/comp/win";
+            color_class: "";
+            color: 255 255 255 255;
          }
       }
       part { name: "e.swallow.content"; type: SWALLOW;
          clip_to: "focus-clipper";
          description { state: "default" 0.0;
-            rel.to: "shower";
+            rel1.to: "shower";
+            rel2.to: "shower";
          }
       }
    }
    programs {
-      program { signal: "e,state,shadow,on"; source: "e";
+      program {
+         signal: "e,state,shadow,on"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "shadow";
       }
-      program { signal: "e,state,shadow,off"; source: "e";
+      program {
+         signal: "e,state,shadow,off"; source: "e";
          action: STATE_SET "hidden" 0.0;
          target: "shadow";
       }
-      program { signal: "e,state,visible,on"; source: "e";
+      program {
+         name: "visible_on";
+         signal: "e,state,visible,on"; source: "e";
          action: STATE_SET "visible" 0.0;
-         transition: DECELERATE 0.15 USE_DURATION_FACTOR 1;
+         transition: DECELERATE 0.15;
          target: "clipper";
          target: "shower";
          after: "show2";
@@ -95,9 +116,11 @@ group { name: "e/comp/border/default";
       program { name: "show2";
          action: SIGNAL_EMIT "e,action,show,done" "e";
       }
-      program { signal: "e,state,visible,off"; source: "e";
+      program {
+         name: "visible_off";
+         signal: "e,state,visible,off"; source: "e";
          action: STATE_SET "default" 0.0;
-         transition: DECELERATE 0.30 USE_DURATION_FACTOR 1;
+         transition: DECELERATE 0.30;
          target: "clipper";
          target: "shower";
          after: "hide2";
@@ -105,42 +128,57 @@ group { name: "e/comp/border/default";
       program { name: "hide2";
          action: SIGNAL_EMIT "e,action,hide,done" "e";
       }
-      program { signal: "e,state,focus,on"; source: "e";
+      program {
+         name: "focus_on";
+         signal: "e,state,focus,on"; source: "e";
          action: STATE_SET "focused" 0.0;
-         transition: SINUSOIDAL 0.1 USE_DURATION_FACTOR 1;
-         targets: "focus-clipper" "focus-shadow";
+         transition: SINUSOIDAL 0.1;
+         target: "glow";
+         target: "focus-clipper";
+         after: "focus2";
       }
-      program { signal: "e,state,focus,off"; source: "e";
+      program { name: "focus2";
          action: STATE_SET "default" 0.0;
-         transition: SINUSOIDAL 0.1 USE_DURATION_FACTOR 1;
-         targets: "focus-clipper" "focus-shadow";
+         transition: SINUSOIDAL 0.4;
+         target: "glow";
+      }
+      program {
+         name: "focus_off";
+         signal: "e,state,focus,off"; source: "e";
+         action: STATE_SET "default" 0.0;
+         transition: SINUSOIDAL 0.1;
+         target: "focus-clipper";
+         after: "focus_off2";
+      }
+      program {
+         name: "focus_off2";
+         action: STATE_SET "default" 0.0;
+         transition: SINUSOIDAL 0.4;
+         target: "glow";
       }
-/*
       program { name: "urgent1";
          signal: "e,state,urgent,on"; source: "e";
          action: STATE_SET "focused" 0.0;
-         transition: SINUSOIDAL 0.3 USE_DURATION_FACTOR 1;
+         transition: SINUSOIDAL 0.3;
          target: "glow";
          after: "urgent2";
       }
       program { name: "urgent2";
          action: STATE_SET "default" 0.0;
-         transition: SINUSOIDAL 0.3 USE_DURATION_FACTOR 1;
+         transition: SINUSOIDAL 0.3;
          target: "glow";
          after: "urgent1";
       }
       program {
          signal: "e,state,urgent,off"; source: "e";
          action: STATE_SET "default" 0.0;
-         transition: SINUSOIDAL 0.6 CURRENT USE_DURATION_FACTOR 1;
+         transition: SINUSOIDAL 0.6 CURRENT;
          target: "glow";
       }
- */
    }
 }
 
 group { name: "e/comp/border/rotate";
-   alias: "e/comp/border/rotate/fast"; // legacy
    inherit: "e/comp/border/default";
    parts {
       part { name: "e.swallow.content";
@@ -166,21 +204,34 @@ group { name: "e/comp/border/rotate";
       }
    }
    programs {
-      program { signal: "e,state,focus,on"; source: "e";
+      program { name: "focus3";
+         signal: "e,state,focus,on"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "e.swallow.content";
-         transition: LINEAR 0.3 USE_DURATION_FACTOR 1;
+         transition: LINEAR 0.3;
       }
-      program { signal: "e,state,focus,off"; source: "e";
+      program { name: "focus_off3";
+         signal: "e,state,focus,off"; source: "e";
          action: STATE_SET "focus-out" 0.0;
          target: "e.swallow.content";
-         transition: LINEAR 0.3 USE_DURATION_FACTOR 1;
+         transition: LINEAR 0.3;
+      }
+   }
+}
+
+group { name: "e/comp/border/rotate/fast";
+   inherit: "e/comp/border/rotate";
+   programs {
+      program { name: "focus3";
+         transition: LINEAR 0;
+      }
+      program { name: "focus_off3";
+         transition: LINEAR 0;
       }
    }
 }
 
 group { name: "e/comp/border/flip";
-   alias: "e/comp/border/flip/fast"; // legacy
    inherit: "e/comp/border/rotate";
    parts {
       part { name: "e.swallow.content";
@@ -205,12 +256,67 @@ group { name: "e/comp/border/flip";
    }
 }
 
+group { name: "e/comp/border/flip/fast";
+   inherit: "e/comp/border/flip";
+   programs {
+      program { name: "focus3";
+         transition: LINEAR 0;
+      }
+      program { name: "focus_off3";
+         transition: LINEAR 0;
+      }
+   }
+}
+
 group { name: "e/comp/border/popup";
-   alias: "e/comp/border/popup/fast"; // legacy
    inherit: "e/comp/border/default";
    parts {
       part { name: "focus-clipper";
          description { state: "default";
+            color_class: "";
+         }
+      }
+   }
+}
+
+group { name: "e/comp/border/default/fast";
+   inherit: "e/comp/border/default";
+   programs {
+      program {
+         name: "visible_on";
+         transition: DECELERATE 0;
+      }
+      program {
+         name: "visible_off";
+         transition: DECELERATE 0;
+      }
+      program {
+         name: "focus_on";
+         signal: "e,state,focus,on"; source: "e";
+         action: STATE_SET "focused" 0.0;
+         transition: SINUSOIDAL 0.1;
+         target: "glow";
+         target: "focus-clipper";
+         after: "focus2";
+      }
+      program { name: "focus2";
+         action: STATE_SET "default" 0.0;
+         transition: SINUSOIDAL 0.1;
+         target: "glow";
+      }
+      program {
+         name: "focus_off";
+         transition: SINUSOIDAL 0;
+      }
+   }
+}
+
+group { name: "e/comp/border/popup/fast";
+   inherit: "e/comp/border/default/fast";
+   parts {
+      part { name: "focus-clipper";
+         description { state: "default";
+            color_class: "";
          }
       }
    }
@@ -224,17 +330,18 @@ group { name: "e/comp/border/none";
       }
    }
    programs {
-      program { signal: "e,state,visible,on"; source: "e";
+      program {
+         signal: "e,state,visible,on"; source: "e";
          action: SIGNAL_EMIT "e,action,show,done" "e";
       }
-      program { signal: "e,state,visible,off"; source: "e";
+      program {
+         signal: "e,state,visible,off"; source: "e";
          action: SIGNAL_EMIT "e,action,hide,done" "e";
       }
    }
 }
 
 group { name: "e/comp/border/still";
-   alias: "e/comp/border/still/fast"; // legacy
    inherit: "e/comp/border/default";
    parts {
       part { name: "shower";
@@ -246,8 +353,19 @@ group { name: "e/comp/border/still";
    }
 }
 
+group { name: "e/comp/border/still/fast";
+   inherit: "e/comp/border/default/fast";
+   parts {
+      part { name: "shower";
+         description { state: "default" 0.0;
+            rel1.relative: 0.0 0.0;
+            rel2.relative: 1.0 1.0;
+         }
+      }
+   }
+}
+
 group { name: "e/comp/border/menu";
-   alias: "e/comp/border/menu/fast"; // legacy
    inherit: "e/comp/border/popup";
    parts {
       part { name: "shower";
@@ -259,8 +377,19 @@ group { name: "e/comp/border/menu";
    }
 }
 
+group { name: "e/comp/border/menu/fast";
+   inherit: "e/comp/border/popup/fast";
+   parts {
+      part { name: "shower";
+         description { state: "default" 0.0;
+            rel1.relative: 0.05 0.0;
+            rel2.relative: 0.95 0.9;
+         }
+      }
+   }
+}
+
 group { name: "e/comp/border/everything";
-   alias: "e/comp/border/everything/fast"; // legacy
    inherit: "e/comp/border/popup";
    parts {
       part { name: "shower";
@@ -272,8 +401,19 @@ group { name: "e/comp/border/everything";
    }
 }
 
+group { name: "e/comp/border/everything/fast";
+   inherit: "e/comp/border/popup/fast";
+   parts {
+      part { name: "shower";
+         description { state: "default" 0.0;
+            rel1.relative: -0.3 -0.3;
+            rel2.relative: 1.3 1.3;
+         }
+      }
+   }
+}
+
 group { name: "e/comp/border/fullscreen";
-   alias: "e/comp/border/fullscreen/fast"; // legacy
    images.image: "screen_circular_shadow.png" COMP;
    data.item: "screen.bg" "fullscreen.bg";
    parts {
@@ -283,17 +423,17 @@ group { name: "e/comp/border/fullscreen";
             rel1.offset: -9999 -9999;
             rel2.relative: 2.0   2.0;
             rel2.offset: 9999  9999;
-            color: 255 255 255 0; // no cc
+            color: 255 255 255 0;
             visible: 0;
          }
          description { state: "visible1" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255; // no cc
+            color: 255 255 255 255;
             visible: 1;
          }
          description { state: "visible2" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255; // no cc
+            color: 255 255 255 255;
             visible: 1;
          }
       }
@@ -308,25 +448,25 @@ group { name: "e/comp/border/fullscreen";
             rel2.relative: 2.0 2.0;
             image.normal: "screen_circular_shadow.png";
             fill.smooth: 0;
-            color: 255 255 255 0; // no cc
+            color: 255 255 255 0;
             visible: 0;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
             rel1.relative: 0.0 0.0;
             rel2.relative: 1.0 1.0;
-            color: 255 255 255 255; // no cc
+            color: 255 255 255 255;
             visible: 1;
          }
       }
-      part { name: "scr_shade"; type: RECT; mouse_events: 0;
+      part { name: "scr_shade"; type: RECT;
          description { state: "default" 0.0;
-            color: 0 0 0 0; // no cc
+            color: 0 0 0 0;
             visible: 0;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
-            color: 0 0 0 255; // no cc
+            color: 0 0 0 255;
             visible: 1;
          }
       }
@@ -355,20 +495,21 @@ group { name: "e/comp/border/fullscreen";
             rel2.to: "shower";
          }
       }
-      part { name: "fader"; type: RECT; mouse_events: 0;
+      part { name: "fader"; type: RECT;
          description { state: "default" 0.0;
-            rel.to: "e.swallow.content";
-            color: 255 255 255 0; // no cc
+            rel1.to: "e.swallow.content";
+            rel2.to: "e.swallow.content";
+            color: 255 255 255 0;
             visible: 0;
          }
          description { state: "visible1" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255; // no cc
+            color: 255 255 255 255;
             visible: 1;
          }
          description { state: "visible2" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 0; // no cc
+            color: 255 255 255 0;
             visible: 0;
          }
       }
@@ -378,7 +519,7 @@ group { name: "e/comp/border/fullscreen";
          name: "visible_on";
          signal: "e,state,visible,on"; source: "e";
          action: STATE_SET "visible" 0.0;
-         transition: DECELERATE 0.25 USE_DURATION_FACTOR 1;
+         transition: DECELERATE 0.25;
          target: "scr_shadow";
          target: "scr_shade";
       }
@@ -386,7 +527,7 @@ group { name: "e/comp/border/fullscreen";
          name: "visible_on2";
          signal: "e,state,visible,on"; source: "e";
          action: STATE_SET "visible1" 0.0;
-         transition: DECELERATE 0.05 USE_DURATION_FACTOR 1;
+         transition: DECELERATE 0.05;
          target: "clipper";
          target: "shower";
          target: "fader";
@@ -394,7 +535,7 @@ group { name: "e/comp/border/fullscreen";
       }
       program { name: "show2";
          action: STATE_SET "visible2" 0.0;
-         transition: DECELERATE 0.20 USE_DURATION_FACTOR 1;
+         transition: DECELERATE 0.20;
          target: "clipper";
          target: "shower";
          target: "fader";
@@ -407,7 +548,7 @@ group { name: "e/comp/border/fullscreen";
          name: "visible_off";
          signal: "e,state,visible,off"; source: "e";
          action: STATE_SET "default" 0.0;
-         transition: DECELERATE 0.25 USE_DURATION_FACTOR 1;
+         transition: DECELERATE 0.25;
          target: "scr_shadow";
          target: "scr_shade";
       }
@@ -415,7 +556,7 @@ group { name: "e/comp/border/fullscreen";
          name: "visible_off2";
          signal: "e,state,visible,off"; source: "e";
          action: STATE_SET "visible1" 0.0;
-         transition: DECELERATE 0.2 USE_DURATION_FACTOR 1;
+         transition: DECELERATE 0.2;
          target: "clipper";
          target: "shower";
          target: "fader";
@@ -423,7 +564,7 @@ group { name: "e/comp/border/fullscreen";
       }
       program { name: "hide2";
          action: STATE_SET "default" 0.0;
-         transition: DECELERATE 0.05 USE_DURATION_FACTOR 1;
+         transition: DECELERATE 0.05;
          target: "clipper";
          target: "shower";
          target: "fader";
@@ -434,3 +575,31 @@ group { name: "e/comp/border/fullscreen";
       }
    }
 }
+
+group { name: "e/comp/border/fullscreen/fast";
+   inherit: "e/comp/border/fullscreen";
+   programs {
+      program {
+         name: "visible_on";
+         transition: DECELERATE 0;
+      }
+      program {
+         name: "visible_on2";
+         transition: DECELERATE 0;
+      }
+      program { name: "show2";
+         transition: DECELERATE 0;
+      }
+      program {
+         name: "visible_off";
+         transition: DECELERATE 0;
+      }
+      program {
+         name: "visible_off2";
+         transition: DECELERATE 0;
+      }
+      program { name: "hide2";
+         transition: DECELERATE 0;
+      }
+   }
+}

data/elementary/themes/edc/comp_effects.edc

@@ -1,5 +1,5 @@
-#define COMP_EFFECT_DURATION 0.2
-#define COMP_EFFECT_DURATION_FAST 0.15
+#define COMP_EFFECT_DURATION 0.4
+#define COMP_EFFECT_DURATION_FAST 0.2
 
 group { name: "e/comp/effects/none";
    parts {
@@ -55,7 +55,7 @@ group { name: "e/comp/effects/move";
          source: "e";
          filter: "mover" "default";
          action: STATE_SET "custom" 0.0;
-         transition: DECELERATE COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
+         transition: DECELERATE COMP_EFFECT_DURATION CURRENT;
          target: "mover";
          after: "done";
       }
@@ -65,7 +65,7 @@ group { name: "e/comp/effects/move";
          source: "e";
          filter: "mover" "custom";
          action: STATE_SET "default" 0.0;
-         transition: DECELERATE COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
+         transition: DECELERATE COMP_EFFECT_DURATION CURRENT;
          target: "mover";
          after: "done";
       }
@@ -135,7 +135,7 @@ group { name: "e/comp/effects/auto/pane";
          source: "e";
          filter: "mover" "default";
          action: STATE_SET "custom" 0.0;
-         transition: DECELERATE COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
+         transition: DECELERATE COMP_EFFECT_DURATION CURRENT;
          target: "mover";
          after: "done";
       }
@@ -145,7 +145,7 @@ group { name: "e/comp/effects/auto/pane";
          source: "e";
          filter: "mover" "custom";
          action: STATE_SET "default" 0.0;
-         transition: DECELERATE COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
+         transition: DECELERATE COMP_EFFECT_DURATION CURRENT;
          target: "mover";
          after: "done";
       }
@@ -280,12 +280,12 @@ group { name: "e/comp/effects/auto/zoom";
             rel1.offset: -20 -20;
             rel2.to: "mover";
             rel2.offset: 20 20;
-            color: 255 255 255 255; // no cc
+            color: 255 255 255 255;
          }
          description { state: "hidden";
             rel1.to: "mover";
             rel2.to: "mover";
-            color: 255 255 255 0; // no cc
+            color: 255 255 255 0;
          }
       }
       part { name: "e.swallow.content"; clip_to: "clip";
@@ -298,7 +298,7 @@ group { name: "e/comp/effects/auto/zoom";
          source: "e";
          filter: "mover" "default";
          action: STATE_SET "hidden" 0.0;
-         transition: ACCELERATE COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
+         transition: ACCELERATE COMP_EFFECT_DURATION CURRENT;
          target: "clip";
       }
       program {
@@ -307,7 +307,7 @@ group { name: "e/comp/effects/auto/zoom";
          source: "e";
          filter: "mover" "custom";
          action: STATE_SET "default" 0.0;
-         transition: ACCELERATE COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
+         transition: ACCELERATE COMP_EFFECT_DURATION CURRENT;
          target: "clip";
       }
    }
@@ -338,11 +338,11 @@ group { name: "e/comp/effects/auto/blend";
             rel1.offset: -20 -20;
             rel2.to: "e.swallow.content";
             rel2.offset: 20 20;
-            color: 255 255 255 255; // no cc
+            color: 255 255 255 255;
          }
          description { state: "hidden";
             inherit: "default" 0.0;
-            color: 255 255 255 0; // no cc
+            color: 255 255 255 0;
          }
       }
       part { name: "e.swallow.content"; type: SWALLOW;
@@ -358,7 +358,7 @@ group { name: "e/comp/effects/auto/blend";
          source: "e";
          filter: "clip" "default";
          action: STATE_SET "hidden" 0.0;
-         transition: LINEAR COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
+         transition: LINEAR COMP_EFFECT_DURATION CURRENT;
          target: "clip";
          after: "done";
       }
@@ -368,7 +368,7 @@ group { name: "e/comp/effects/auto/blend";
          source: "e";
          filter: "clip" "hidden";
          action: STATE_SET "default" 0.0;
-         transition: LINEAR COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
+         transition: LINEAR COMP_EFFECT_DURATION CURRENT;
          target: "clip";
          after: "done";
       }
@@ -453,7 +453,7 @@ group { name: "e/comp/effects/visibility/vertical";
          source: "e";
          filter: "clip" "default";
          action: STATE_SET "hid" 0.0;
-         transition: DECELERATE COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
+         transition: DECELERATE COMP_EFFECT_DURATION CURRENT;
          target: "clip";
          after: "done";
       }
@@ -463,7 +463,7 @@ group { name: "e/comp/effects/visibility/vertical";
          source: "e";
          filter: "clip" "hid";
          action: STATE_SET "default" 0.0;
-         transition: DECELERATE COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
+         transition: DECELERATE COMP_EFFECT_DURATION CURRENT;
          target: "clip";
          after: "done";
       }
@@ -547,7 +547,7 @@ group { name: "e/comp/effects/visibility/tooltip";
          source: "e";
          filter: "mover" "default";
          action: STATE_SET "custom" 0.0;
-         transition: DECELERATE COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
+         transition: DECELERATE COMP_EFFECT_DURATION CURRENT;
          target: "mover";
          after: "done";
       }
@@ -557,7 +557,7 @@ group { name: "e/comp/effects/visibility/tooltip";
          source: "e";
          filter: "mover" "custom";
          action: STATE_SET "default" 0.0;
-         transition: DECELERATE COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
+         transition: DECELERATE COMP_EFFECT_DURATION CURRENT;
          target: "mover";
          after: "done";
       }
@@ -626,7 +626,7 @@ group { name: "e/comp/effects/iconify/default";
          source: "e";
          filter: "mover" "default";
          action: STATE_SET "custom" 0.0;
-         transition: ACCELERATE_FACTOR COMP_EFFECT_DURATION 2 USE_DURATION_FACTOR 1 CURRENT;
+         transition: ACCELERATE_FACTOR COMP_EFFECT_DURATION 2 CURRENT;
          target: "mover";
          after: "done";
       }
@@ -636,7 +636,7 @@ group { name: "e/comp/effects/iconify/default";
          source: "e";
          filter: "mover" "custom";
          action: STATE_SET "default" 0.0;
-         transition: DECELERATE_FACTOR COMP_EFFECT_DURATION_FAST 2 USE_DURATION_FACTOR 1 CURRENT;
+         transition: DECELERATE_FACTOR COMP_EFFECT_DURATION_FAST 2 CURRENT;
          target: "mover";
          after: "done";
       }
@@ -716,7 +716,7 @@ group { name: "e/comp/effects/auto/rotate";
          signal: "e,action,go";
          source: "e";
          action: STATE_SET "hidden" 0.0;
-         transition: DECELERATE COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
+         transition: DECELERATE COMP_EFFECT_DURATION CURRENT;
          target: "proxy";
       }
       program {
@@ -724,7 +724,7 @@ group { name: "e/comp/effects/auto/rotate";
          signal: "e,action,go";
          source: "e";
          action: STATE_SET "default" 0.0;
-         transition: DECELERATE COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
+         transition: DECELERATE COMP_EFFECT_DURATION CURRENT;
          target: "proxy";
       }
    }

data/elementary/themes/edc/conf.edc

@@ -1,92 +1,142 @@
 group { name: "e/widgets/configure/main";
+   images.image: "bevel_dark_out.png" COMP;
+   images.image: "separator_horiz.png" COMP;
    parts {
       part { name: "base"; type: RECT;
          description { state: "default" 0.0;
-            color_class: "/bg/normal/background";
+            color_class: "dialog_base";
+            color: 64 64 64 255;
          }
       }
-      part { name: "separator"; type: RECT; mouse_events: 0;
-         scale: 1;
+      part { name: "bevel";
          description { state: "default" 0.0;
-            min: 16 1;
-            max: 99999 1;
+            image.normal: "bevel_dark_out.png";
+            image.border: 1 1 1 1;
+            image.middle: 0;
+            fill.smooth: 0;
+         }
+      }
+      part { name: "separator"; mouse_events: 0;
+         description { state: "default" 0.0;
+            min: 16 2;
+            max: 99999 2;
             rel1.relative: 0.0 1.0;
             rel1.offset: 0 0;
             rel1.to_y: "e.swallow.content";
             rel2.relative: 1.0 0.0;
             rel2.offset: -1 -1;
             rel2.to_y: "e.swallow.button";
+            image.normal: "separator_horiz.png";
+            fill.smooth: 0;
             fixed: 0 1;
-            color_class: "/fg/normal/separator/horizontal";
          }
       }
       part { name: "e.swallow.content"; type: SWALLOW;
-         scale: 1;
          description { state: "default" 0.0;
+            rel1.offset: 4 4;
             rel1.to_x: "base";
             rel2.relative: 1.0 0.0;
-            rel2.offset: -1 -17;
+            rel2.offset: -5 -8;
             rel2.to_y: "e.swallow.button";
-            offscale;
          }
       }
       part { name: "e.swallow.button"; type: SWALLOW;
-         scale: 1;
          description { state: "default" 0.0;
             align: 0.5 1.0;
             rel1.relative: 0.5 1.0;
-            rel1.offset: 0 -9;
+            rel1.offset: 0 -5;
             rel2.relative: 0.5 1.0;
-            rel2.offset: -1 -9;
+            rel2.offset: -1 -5;
             fixed: 1 1;
-            offscale;
          }
       }
    }
 }
 
 group { name: "e/modules/conf/main";
-   images.image: "spanner.png" COMP;
+   images.image: "button_normal.png" COMP;
+   images.image: "button_clicked.png" COMP;
+   images.image: "spanner_inset.png" COMP;
+   images.image: "spanner_hilight.png" COMP;
+   images.image: "spanner_glow.png" COMP;
    min: 16 16;
+   max: 80 80;
    parts {
-      part { name: "base"; type: RECT;
+      part { name: "base";
          description { state: "default" 0.0;
-            color: 0 0 0 0; // no cc
+            image.normal: "button_normal.png";
+            image.border: 4 4 3 5;
+            image.middle: SOLID;
+            rel1.offset: -1 0;
+            rel2.offset: 0 1;
+            fill.smooth: 0;
          }
          description { state: "clicked" 0.0;
             inherit: "default" 0.0;
+            image.normal: "button_clicked.png";
+            image.border: 5 5 4 6;
+         }
+      }
+      part { name: "spanner_hilight"; mouse_events: 0;
+         description { state: "default" 0.0;
+            aspect: 1.0 1.0; aspect_preference: BOTH;
+            max: 80 80;
+            rel1.offset: 0 1;
+            rel1.to: "spanner";
+            rel2.offset: -1 0;
+            rel2.to: "spanner";
+            image.normal: "spanner_hilight.png";
          }
       }
       part { name: "spanner"; mouse_events: 0;
-         scale: 1;
          description { state: "default" 0.0;
             aspect: 1.0 1.0; aspect_preference: BOTH;
-            rel.to: "base";
+            max: 80 80;
             rel1.offset: 4 4;
             rel2.offset: -5 -5;
-            image.normal: "spanner.png";
-            color_class: "/fg/normal/icon";
-            offscale;
+            image.normal: "spanner_inset.png";
+         }
+      }
+      part { name: "spanner_glow"; mouse_events: 0;
+         description { state: "default" 0.0;
+            aspect: 1.0 1.0; aspect_preference: BOTH;
+            max: 80 80;
+            rel1.to: "spanner";
+            rel2.to: "spanner";
+            image.normal: "spanner_glow.png";
+            visible: 0;
          }
          description { state: "clicked" 0.0;
             inherit: "default" 0.0;
-            color_class: "/fg/pressed/icon";
+            visible: 1;
          }
       }
    }
    programs {
-      program { signal: "mouse,down,1"; source: "base";
+      program {
+         signal: "mouse,down,1"; source: "base";
          action: STATE_SET "clicked" 0.0;
          target: "base";
-         target: "spanner";
       }
-      program { signal: "mouse,up,1"; source: "base";
+      program {
+         signal: "mouse,up,1"; source: "base";
          action: STATE_SET "default" 0.0;
          target: "base";
-         target: "spanner";
+         target: "spanner_glow";
       }
-      program { signal: "mouse,clicked,1*"; source: "base";
+      program {
+         signal: "mouse,clicked,1*"; source: "base";
          action: SIGNAL_EMIT "e,action,conf" "";
       }
+      program {
+         signal: "mouse,in"; source: "base";
+         action: STATE_SET "clicked" 0.0;
+         target: "spanner_glow";
+      }
+      program {
+         signal: "mouse,out"; source: "base";
+         action: STATE_SET "default" 0.0;
+         target: "spanner_glow";
+      }
    }
 }

data/elementary/themes/edc/connman.edc

@@ -1,138 +1,143 @@
 group { name: "e/modules/connman/main";
-   images.image: "cloud-conn.png" COMP;
-
-   images.image: "eth-top.png" COMP;
-   images.image: "eth-base.png" COMP;
-
-   images.image: "wifi-1.png" COMP;
-   images.image: "wifi-2.png" COMP;
-   images.image: "wifi-3.png" COMP;
-   images.image: "wifi-4.png" COMP;
-   images.image: "wifi-5.png" COMP;
-
-   images.image: "bt-1.png" COMP;
-   images.image: "bt-2.png" COMP;
-   images.image: "bt-base.png" COMP;
-
-   images.image: "cell-1.png" COMP;
-   images.image: "cell-2.png" COMP;
-   images.image: "cell-3.png" COMP;
-   images.image: "cell-4.png" COMP;
-   images.image: "cell-base.png" COMP;
+   images.image: "slot_horiz_top.png" COMP;
+   images.image: "slot_horiz_bottom.png" COMP;
+   images.image: "wifi_base.png" COMP;
+   images.image: "wifi_sig_1.png" COMP;
+   images.image: "wifi_sig_2.png" COMP;
+   images.image: "wifi_sig_3.png" COMP;
+   images.image: "eth.png" COMP;
+   images.image: "exlclam.png" COMP;
+   images.image: "hole_tiny.png" COMP;
+   images.image: "led_tiny_orange.png" COMP;
+   images.image: "led_tiny_green.png" COMP;
+   images.image: "bt_base.png" COMP;
+   images.image: "bt_sig_1.png" COMP;
+   images.image: "bt_sig_2.png" COMP;
+   images.image: "cell_base.png" COMP;
+   images.image: "cell_sig_1.png" COMP;
+   images.image: "cell_sig_2.png" COMP;
+   images.image: "cell_sig_3.png" COMP;
+   images.image: "cell_sig_4.png" COMP;
    parts {
+      part { name: "slot_bottom"; mouse_events: 0;
+         description { state: "default" 0.0;
+            rel1.to: "slot";
+            rel2.relative: 1.0 0.5;
+            rel2.to: "slot";
+            min: 0 3;
+            image.normal: "slot_horiz_bottom.png";
+            fixed: 0 1;
+         }
+      }
+///////////////////////
       part { name: "exclam_base"; mouse_events: 0;
-         scale: 1;
          clip_to: "clip_exclam";
          description { state: "default" 0.0;
-            min: 11 10;
-            rel1.relative: (20/160) (50/160);
-            rel2.relative: (135/160) (150/160);
-            aspect: (115/105) (115/105); aspect_preference: BOTH;
-            image.normal: "cloud-conn.png";
+            aspect: (71/144) (71/144); aspect_preference: BOTH;
+            align: 0.5 1.0;
+            rel2.relative: 1.0 0.5;
+            rel2.to_y: "slot";
+            image.normal: "exlclam.png";
          }
       }
 ///////////////////////
-      part { name: "eth-base"; mouse_events: 0;
-         scale: 1;
+      part { name: "eth_base"; mouse_events: 0;
          clip_to: "clip_eth";
          description { state: "default" 0.0;
-            min: 6 13;
-            aspect: (60/130) (60/130); aspect_preference: BOTH;
-            rel1.relative: (50/160) (15/160);
-            rel2.relative: (110/160) (145/160);
-            image.normal: "eth-base.png";
-            color_class: "/fg/disabled/gadgets/connman/eth/cable";
-         }
-         description { state: "connected" 0.0;
-            inherit: "default" 0.0;
-            color_class: "/fg/normal/gadgets/connman/eth/cable";
-         }
-         description { state: "online" 0.0;
-            inherit: "default" 0.0;
-            color_class: "/fg/selected/gadgets/connman/eth/cable";
-         }
-      }
-      part { name: "eth"; mouse_events: 0;
-         scale: 1;
-         clip_to: "clip_eth";
-         description { state: "default" 0.0;
-            rel.to: "eth-base";
-            image.normal: "eth-top.png";
-            color_class: "/fg/disabled/gadgets/connman/eth/connector";
-         }
-         description { state: "connected" 0.0;
-            inherit: "default" 0.0;
-            color_class: "/fg/normal/gadgets/connman/eth/connector";
-         }
-         description { state: "online" 0.0;
-            inherit: "default" 0.0;
-            color_class: "/fg/normal/gadgets/connman/eth/connector";
+            aspect: (60/144) (60/144); aspect_preference: BOTH;
+            align: 0.5 1.0;
+            rel2.relative: 1.0 0.5;
+            rel2.to_y: "slot";
+            image.normal: "eth.png";
          }
       }
 ///////////////////////
-      part { name: "wifi-base"; mouse_events: 0;
+      part { name: "wifi_base"; mouse_events: 0;
          clip_to: "clip_wifi";
          description { state: "default" 0.0;
-            image.normal: "wifi-1.png";
-            color_class: "/fg/disabled/gadgets/connman/wifi/connected";
-         }
-         description { state: "connected" 0.0;
-            inherit: "default" 0.0;
-            color_class: "/fg/normal/gadgets/connman/wifi/connected";
-         }
-         description { state: "online" 0.0;
-            inherit: "default" 0.0;
-            color_class: "/fg/selected/gadgets/connman/wifi/connected";
+            aspect: (160/144) (160/144); aspect_preference: BOTH;
+            align: 0.5 1.0;
+            rel2.relative: 1.0 0.5;
+            rel2.to_y: "slot";
+            image.normal: "wifi_base.png";
          }
       }
-      part { name: "wifi"; mouse_events: 0;
+      part { name: "wifi_1"; mouse_events: 0;
          clip_to: "clip_wifi";
          description { state: "default" 0.0;
-            rel.to: "wifi-base";
-            image.normal: "wifi-1.png";
-            color_class: "/fg/normal/gadgets/connman/wifi/signal";
-            color: 0 0 0 0; // no cc
+            rel1.to: "wifi_base";
+            rel2.to: "wifi_base";
+            image.normal: "wifi_sig_1.png";
+            visible: 0;
          }
-         description { state: "default" 0.25;
+         description { state: "partly" 0.0;
             inherit: "default" 0.0;
-            image.normal: "wifi-2.png";
-            color: 255 255 255 255; // no cc
+            color: 255 255 255 128;
+            visible: 1;
          }
-         description { state: "default" 0.5;
+         description { state: "visible" 0.0;
             inherit: "default" 0.0;
-            image.normal: "wifi-3.png";
-            color: 255 255 255 255; // no cc
+            visible: 1;
          }
-         description { state: "default" 0.75;
-            inherit: "default" 0.0;
-            image.normal: "wifi-4.png";
-            color: 255 255 255 255; // no cc
+      }
+      part { name: "wifi_2"; mouse_events: 0;
+         clip_to: "clip_wifi";
+         description { state: "default" 0.0;
+            rel1.to: "wifi_base";
+            rel2.to: "wifi_base";
+            image.normal: "wifi_sig_2.png";
+            visible: 0;
          }
-         description { state: "default" 1.0;
+         description { state: "partly" 0.0;
             inherit: "default" 0.0;
-            image.normal: "wifi-5.png";
-            color: 255 255 255 255; // no cc
+            color: 255 255 255 128;
+            visible: 1;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      part { name: "wifi_3"; mouse_events: 0;
+         clip_to: "clip_wifi";
+         description { state: "default" 0.0;
+            rel1.to: "wifi_base";
+            rel2.to: "wifi_base";
+            image.normal: "wifi_sig_3.png";
+            visible: 0;
+         }
+         description { state: "partly" 0.0;
+            inherit: "default" 0.0;
+            color: 255 255 255 128;
+            visible: 1;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
          }
       }
 ///////////////////////
       part { name: "bt_base"; mouse_events: 0;
          clip_to: "clip_bt";
          description { state: "default" 0.0;
-            image.normal: "bt-base.png";
-            color_class: "/fg/normal/gadgets/connman/bt/base";
+            aspect: (160/144) (160/144); aspect_preference: BOTH;
+            align: 0.5 1.0;
+            rel2.relative: 1.0 0.5;
+            rel2.to_y: "slot";
+            image.normal: "bt_base.png";
          }
       }
       part { name: "bt_1"; mouse_events: 0;
          clip_to: "clip_bt";
          description { state: "default" 0.0;
-            rel.to: "bt_base";
-            image.normal: "bt-1.png";
-            color_class: "/fg/normal/gadgets/connman/bt/signal";
+            rel1.to: "bt_base";
+            rel2.to: "bt_base";
+            image.normal: "bt_sig_1.png";
             visible: 0;
          }
          description { state: "partly" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 128; // no cc
+            color: 255 255 255 128;
             visible: 1;
          }
          description { state: "visible" 0.0;
@@ -143,14 +148,14 @@ group { name: "e/modules/connman/main";
       part { name: "bt_2"; mouse_events: 0;
          clip_to: "clip_bt";
          description { state: "default" 0.0;
-            rel.to: "bt_base";
-            image.normal: "bt-2.png";
-            color_class: "/fg/normal/gadgets/connman/bt/signal";
+            rel1.to: "bt_base";
+            rel2.to: "bt_base";
+            image.normal: "bt_sig_2.png";
             visible: 0;
          }
          description { state: "partly" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 128; // no cc
+            color: 255 255 255 128;
             visible: 1;
          }
          description { state: "visible" 0.0;
@@ -162,21 +167,24 @@ group { name: "e/modules/connman/main";
       part { name: "cell_base"; mouse_events: 0;
          clip_to: "clip_cell";
          description { state: "default" 0.0;
-            image.normal: "cell-base.png";
-            color_class: "/fg/normal/gadgets/connman/cell/base";
+            aspect: (160/144) (160/144); aspect_preference: BOTH;
+            align: 0.5 1.0;
+            rel2.relative: 1.0 0.5;
+            rel2.to_y: "slot";
+            image.normal: "cell_base.png";
          }
       }
       part { name: "cell_1"; mouse_events: 0;
          clip_to: "clip_cell";
          description { state: "default" 0.0;
-            rel.to: "cell_base";
-            image.normal: "cell-1.png";
-            color_class: "/fg/normal/gadgets/connman/cell/signal";
+            rel1.to: "cell_base";
+            rel2.to: "cell_base";
+            image.normal: "cell_sig_1.png";
             visible: 0;
          }
          description { state: "partly" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 128; // no cc
+            color: 255 255 255 128;
             visible: 1;
          }
          description { state: "visible" 0.0;
@@ -187,14 +195,14 @@ group { name: "e/modules/connman/main";
       part { name: "cell_2"; mouse_events: 0;
          clip_to: "clip_cell";
          description { state: "default" 0.0;
-            rel.to: "cell_base";
-            image.normal: "cell-2.png";
-            color_class: "/fg/normal/gadgets/connman/cell/signal";
+            rel1.to: "cell_base";
+            rel2.to: "cell_base";
+            image.normal: "cell_sig_2.png";
             visible: 0;
          }
          description { state: "partly" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 128; // no cc
+            color: 255 255 255 128;
             visible: 1;
          }
          description { state: "visible" 0.0;
@@ -205,14 +213,14 @@ group { name: "e/modules/connman/main";
       part { name: "cell_3"; mouse_events: 0;
          clip_to: "clip_cell";
          description { state: "default" 0.0;
-            rel.to: "cell_base";
-            image.normal: "cell-3.png";
-            color_class: "/fg/normal/gadgets/connman/cell/signal";
+            rel1.to: "cell_base";
+            rel2.to: "cell_base";
+            image.normal: "cell_sig_3.png";
             visible: 0;
          }
          description { state: "partly" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 128; // no cc
+            color: 255 255 255 128;
             visible: 1;
          }
          description { state: "visible" 0.0;
@@ -223,14 +231,14 @@ group { name: "e/modules/connman/main";
       part { name: "cell_4"; mouse_events: 0;
          clip_to: "clip_cell";
          description { state: "default" 0.0;
-            rel.to: "cell_base";
-            image.normal: "cell-4.png";
-            color_class: "/fg/normal/gadgets/connman/cell/signal";
+            rel1.to: "cell_base";
+            rel2.to: "cell_base";
+            image.normal: "cell_sig_4.png";
             visible: 0;
          }
          description { state: "partly" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 128; // no cc
+            color: 255 255 255 128;
             visible: 1;
          }
          description { state: "visible" 0.0;
@@ -239,6 +247,30 @@ group { name: "e/modules/connman/main";
          }
       }
 ///////////////////////
+      part { name: "slot"; mouse_events: 0;
+         description { state: "default" 0.0;
+            rel1.offset: 0 -1;
+            rel1.relative: (21/160) 1.0;
+            rel2.offset: -1 -1;
+            rel2.relative: (140/160) 1.0;
+            align: 0.5 1.0;
+            min: 0 6;
+            image.normal: "slot_horiz_top.png";
+            fixed: 0 1;
+         }
+      }
+      part { name: "hole"; mouse_events: 0;
+         description { state: "default" 0.0;
+            rel1.offset: -4 -4;
+            rel1.relative: 1.0 1.0;
+            rel2.offset: -4 -4;
+            align: 1.0 1.0;
+            min: 4 4;
+            max: 4 4;
+            image.normal: "hole_tiny.png";
+            fixed: 1 1;
+         }
+      }
       part { name: "clip_exclam"; type: RECT;
          description { state: "default" 0.0;
             visible: 1;
@@ -324,9 +356,30 @@ group { name: "e/modules/connman/main";
             visible: 1;
          }
       }
+      part { name: "led"; mouse_events: 0;
+         description { state: "default" 0.0;
+            rel1.to: "hole";
+            rel2.to: "hole";
+            min: 10 10;
+            max: 10 10;
+            image.normal: "led_tiny_orange.png";
+            fixed: 1 1;
+            visible: 0;
+         }
+         description { state: "connected" 0.0;
+            inherit: "default" 0.0;
+            image.normal: "led_tiny_orange.png";
+            visible: 1;
+         }
+         description { state: "online" 0.0;
+            inherit: "default" 0.0;
+            image.normal: "led_tiny_green.png";
+            visible: 1;
+         }
+      }
       part { name: "event"; type: RECT;
          description { state: "default" 0.0;
-            color: 0 0 0 0; // no cc
+            color: 0 0 0 0;
          }
       }
    }
@@ -336,7 +389,41 @@ script { \
 public message(Msg_Type:type, id, ...) { \
 if ((type == MSG_INT_SET) && (id == 1)) { \
 new state = getarg(2), signl = getarg(3); \
-set_state(PART:"wifi", "default", float(signl) / 100.0); \
+if (signl <= 14) { \
+set_state(PART:"wifi_1", "default", 0.0); \
+set_state(PART:"wifi_2", "default", 0.0); \
+set_state(PART:"wifi_3", "default", 0.0); \
+} \
+else if (signl <= 28) { \
+set_state(PART:"wifi_1", "partly", 0.0); \
+set_state(PART:"wifi_2", "default", 0.0); \
+set_state(PART:"wifi_3", "default", 0.0); \
+} \
+else if (signl <= 42) { \
+set_state(PART:"wifi_1", "visible", 0.0); \
+set_state(PART:"wifi_2", "default", 0.0); \
+set_state(PART:"wifi_3", "default", 0.0); \
+} \
+else if (signl <= 57) { \
+set_state(PART:"wifi_1", "visible", 0.0); \
+set_state(PART:"wifi_2", "partly", 0.0); \
+set_state(PART:"wifi_3", "default", 0.0); \
+} \
+else if (signl <= 71) { \
+set_state(PART:"wifi_1", "visible", 0.0); \
+set_state(PART:"wifi_2", "visible", 0.0); \
+set_state(PART:"wifi_3", "default", 0.0); \
+} \
+else if (signl <= 85) { \
+set_state(PART:"wifi_1", "visible", 0.0); \
+set_state(PART:"wifi_2", "visible", 0.0); \
+set_state(PART:"wifi_3", "partly", 0.0); \
+} \
+else { \
+set_state(PART:"wifi_1", "visible", 0.0); \
+set_state(PART:"wifi_2", "visible", 0.0); \
+set_state(PART:"wifi_3", "visible", 0.0); \
+} \
 if (signl <= 20) { \
 set_state(PART:"bt_1", "default", 0.0); \
 set_state(PART:"bt_2", "default", 0.0); \
@@ -412,31 +499,17 @@ set_state(PART:"cell_3", "visible", 0.0); \
 set_state(PART:"cell_4", "visible", 0.0); \
 } \
 if ((state == 2)) { \
-   set_state(PART:"wifi-base", "default", 0.0); \
-   set_state(PART:"eth-base", "default", 0.0); \
-   set_state(PART:"eth", "default", 0.0); \
-/*run_program(PROGRAM:"connecting");*/ \
+set_state(PART:"led", "default", 0.0); \
+run_program(PROGRAM:"connecting"); \
 return; } \
 else if ((state == 3)) { return; } \
-else if ((state == 4)) { \
-   set_state(PART:"wifi-base", "connected", 0.0); \
-   set_state(PART:"eth-base", "connected", 0.0); \
-   set_state(PART:"eth", "connected", 0.0); \
-} \
-else if ((state == 5)) { \
-   set_state(PART:"wifi-base", "online", 0.0); \
-   set_state(PART:"eth-base", "online", 0.0); \
-   set_state(PART:"eth", "online", 0.0); \
-} \
-else { \
-   set_state(PART:"wifi-base", "default", 0.0); \
-   set_state(PART:"eth-base", "default", 0.0); \
-   set_state(PART:"eth", "default", 0.0); \
+else if ((state == 4)) { set_state(PART:"led", "connected", 0.0); } \
+else if ((state == 5)) { set_state(PART:"led", "online", 0.0); } \
+else { set_state(PART:"led", "default", 0.0); \
 } } } }
    
    SCRIPT_MESSAGE()
    programs {
-/*
       program { name: "connecting";
          action: STATE_SET "connected" 0.0;
          target: "led";
@@ -449,7 +522,6 @@ else { \
          in: 0.3 0.0;
          after:  "connecting";
       }
- */
 //      program {
 //         signal: "e,available"; source: "e";
 //      }
@@ -517,7 +589,8 @@ group { name: "e/modules/connman/icon/wifi";
    inherit: "e/modules/connman/main";
    SCRIPT_MESSAGE()
    programs {
-      program { signal: "load"; source: "";
+      program {
+         signal: "load"; source: "";
          action: STATE_SET "wifi" 0.0;
          target: "clip_exclam";
          target: "clip_wifi";
@@ -532,7 +605,8 @@ group { name: "e/modules/connman/icon/ethernet";
    inherit: "e/modules/connman/main";
    SCRIPT_MESSAGE()
    programs {
-      program { signal: "load"; source: "";
+      program {
+         signal: "load"; source: "";
          action: STATE_SET "eth" 0.0;
          target: "clip_exclam";
          target: "clip_wifi";
@@ -547,7 +621,8 @@ group { name: "e/modules/connman/icon/bluetooth";
    inherit: "e/modules/connman/main";
    SCRIPT_MESSAGE()
    programs {
-      program { signal: "load"; source: "";
+      program {
+         signal: "load"; source: "";
          action: STATE_SET "bt" 0.0;
          target: "clip_exclam";
          target: "clip_wifi";
@@ -562,7 +637,8 @@ group { name: "e/modules/connman/icon/cellular";
    inherit: "e/modules/connman/main";
    SCRIPT_MESSAGE()
    programs {
-      program { signal: "load"; source: "";
+      program {
+         signal: "load"; source: "";
          action: STATE_SET "cell" 0.0;
          target: "clip_exclam";
          target: "clip_wifi";
@@ -574,56 +650,61 @@ group { name: "e/modules/connman/icon/cellular";
 }
 
 group { name: "e/modules/connman/end";
+   images.image: "glow_lock_locked.png" COMP;
+   images.image: "glow_lock_unlocked.png" COMP;
+   images.image: "glow_lock_double.png" COMP;
    parts {
       part { name: "base"; mouse_events: 0;
          description { state: "default" 0.0;
-            image.normal: "i-unlock";
+            image.normal: "glow_lock_locked.png";
             aspect: 1.0 1.0; aspect_preference: BOTH;
-            color_class: "/fg/normal/gadgets/connman/security/none";
             visible: 0;
          }
          description { state: "none" 0.0;
             inherit: "default" 0.0;
-            image.normal: "i-unlock";
-            color_class: "/fg/normal/gadgets/connman/security/none";
+            image.normal: "glow_lock_unlocked.png";
             visible: 1;
          }
          description { state: "wep" 0.0;
             inherit: "default" 0.0;
-            image.normal: "i-lock";
-            color_class: "/fg/normal/gadgets/connman/security/secure/low";
+            image.normal: "glow_lock_locked.png";
             visible: 1;
          }
          description { state: "psk" 0.0;
             inherit: "default" 0.0;
-            image.normal: "i-lock-double";
-            color_class: "/fg/normal/gadgets/connman/security/secure/hi";
+            image.normal: "glow_lock_double.png";
             visible: 1;
          }
       }
    }
    programs {
-      program { signal: "e,security,off"; source: "e";
+      program {
+         signal: "e,security,off"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "base";
       }
-      program { signal: "e,security,none"; source: "e";
+      program {
+         signal: "e,security,none"; source: "e";
          action: STATE_SET "none" 0.0;
          target: "base";
       }
-      program { signal: "e,security,wep"; source: "e";
+      program {
+         signal: "e,security,wep"; source: "e";
          action: STATE_SET "wep" 0.0;
          target: "base";
       }
-      program { signal: "e,security,psk"; source: "e";
+      program {
+         signal: "e,security,psk"; source: "e";
          action: STATE_SET "psk" 0.0;
          target: "base";
       }
-      program { signal: "e,security,ieee8021x"; source: "e";
+      program {
+         signal: "e,security,ieee8021x"; source: "e";
          action: STATE_SET "psk" 0.0;
          target: "base";
       }
-      program { signal: "e,security,wps"; source: "e";
+      program {
+         signal: "e,security,wps"; source: "e";
          action: STATE_SET "wep" 0.0;
          target: "base";
       }

data/elementary/themes/edc/cpufreq.edc

@@ -1,61 +1,64 @@
 group { name: "e/modules/cpufreq/main";
-   set { name: "cpu_markers";
-      image { image: "cpu_markers-160.png"  COMP; size: 81 81 99999 99999; }
-      image { image: "cpu_markers-080.png"  COMP; size: 41 41 80 80 99999; }
-      image { image: "cpu_markers-040.png"  COMP; size:  0  0 40 40; }
+   alias: "e/gadget/cpuclock/main";
+   alias: "e/gadget/cpuclock/main_vert";
+   images.image: "tacho_base.png" COMP;
+   images.image: "inset_round_hilight.png" COMP;
+   images.image: "inset_round_shadow.png" COMP;
+   images.image: "inset_round_shading.png" COMP;
+   set { name: "tacho_hand_big";
+      image { image: "tacho_hand_big.png" COMP; size: 73 73 99999 99999; }
+      image { image: "tacho_hand_big2.png" COMP; size: 37 37 72 72; }
+      image { image: "tacho_hand_big3.png" COMP; size: 19 19 36 36; }
+      image { image: "tacho_hand_big4.png" COMP; size: 0 0 18 18; }
    }
-   set { name: "cpu_detail";
-      image { image: "cpu_detail-160.png"  COMP; size: 81 81 99999 99999; }
-      image { image: "cpu_detail-080.png"  COMP; size: 41 41 80 80 99999; }
-      image { image: "cpu_detail-040.png"  COMP; size:  0  0 40 40; }
+   images.image: "tacho_hand_big_shadow.png" COMP;
+   set { name: "tacho_hand_small_min";
+      image { image: "tacho_hand_small_min.png" COMP; size: 73 73 99999 99999; }
+      image { image: "tacho_hand_small_min2.png" COMP; size: 37 37 72 72; }
+      image { image: "tacho_hand_small_min3.png" COMP; size: 19 19 36 36; }
+      image { image: "tacho_hand_small_min4.png" COMP; size: 0 0 18 18; }
    }
-   set { name: "cpu_clip_1";
-      image { image: "cpu_clip_1-160.png"  COMP; size: 81 81 99999 99999; }
-      image { image: "cpu_clip_1-080.png"  COMP; size: 41 41 80 80 99999; }
-      image { image: "cpu_clip_1-040.png"  COMP; size:  0  0 40 40; }
-   }
-   set { name: "cpu_clip_2";
-      image { image: "cpu_clip_2-160.png"  COMP; size: 81 81 99999 99999; }
-      image { image: "cpu_clip_2-080.png"  COMP; size: 41 41 80 80 99999; }
-      image { image: "cpu_clip_2-040.png"  COMP; size:  0  0 40 40; }
-   }
-   set { name: "cpu_clip_3";
-      image { image: "cpu_clip_3-160.png"  COMP; size: 81 81 99999 99999; }
-      image { image: "cpu_clip_3-080.png"  COMP; size: 41 41 80 80 99999; }
-      image { image: "cpu_clip_3-040.png"  COMP; size:  0  0 40 40; }
-   }
-   set { name: "cpu_marker";
-      image { image: "cpu_marker.png"  COMP; size: 72 72 99999 99999; }
-      image { image: "cpu_marker2.png" COMP; size: 36 36 72 72; }
-      image { image: "cpu_marker3.png" COMP; size: 18 18 36 36; }
-      image { image: "cpu_marker4.png" COMP; size: 0 0 4 18; }
+   images.image: "tacho_hand_small_shadow.png" COMP;
+   set { name: "knob";
+      image { image: "knob_sz_24.png"  COMP; size: 31 31 32 32; }
+      image { image: "knob_sz_22.png"  COMP; size: 29 29 30 30; }
+      image { image: "knob_sz_20.png"  COMP; size: 27 27 28 28; }
+      image { image: "knob_sz_18.png"  COMP; size: 25 25 26 26; }
+      image { image: "knob_sz_16.png"  COMP; size: 23 23 24 24; }
+      image { image: "knob_sz_14.png"  COMP; size: 21 21 22 22; }
+      image { image: "knob_sz_12.png"  COMP; size: 19 19 20 20; }
+      image { image: "knob_sz_10.png"  COMP; size: 17 17 18 18; }
+      image { image: "knob_sz_08.png"  COMP; size: 15 15 16 16; }
+      image { image: "knob_sz_06.png"  COMP; size: 13 13 14 14; }
+      image { image: "knob_sz_04.png"  COMP; size:  0  0 12 12; }
    }
    script {
       public available_frequencies;
       public available_governors;
-
-//      public cur_freq_anim;
-
+      
       public cur_freq_old;
       public cur_freq_new;
       public cur_freq_now;
-
+      public cur_freq_anim;
+      
       public min_freq_old;
       public min_freq_new;
       public min_freq_now;
-
+      
       public max_freq_old;
       public max_freq_new;
       public max_freq_now;
-
-      public show_freq(Float:v) {
+      
+      public slide_cur_freq(val, Float:v) {
          new Float:freq, Float:min_freq, Float:max_freq, Float:tf;
          new f, f0, f1;
-
+         
+         v = (1.0 - cos(v * 3.141592654)) / 2.0;
+         
          min_freq = fetch_int(available_frequencies, 0);
          max_freq = fetch_int(available_frequencies,
                               count(available_frequencies) - 1);
-
+         
          f0 = get_int(cur_freq_old);
          f1 = get_int(cur_freq_new);
          f = f1 - f0;
@@ -63,13 +66,16 @@ group { name: "e/modules/cpufreq/main";
          f = round(freq);
          f = f + f0;
          set_int(cur_freq_now, f);
-
+         
          freq = (float(f) - min_freq) / (max_freq - min_freq);
          tf = (freq * 225.0) - 135.0;
          custom_state(PART:"meter", "default", 0.0);
          set_state_val(PART:"meter", STATE_MAP_ROT_Z, tf);
          set_state(PART:"meter", "custom", 0.0);
-
+         custom_state(PART:"meter_sh", "default", 0.0);
+         set_state_val(PART:"meter_sh", STATE_MAP_ROT_Z, tf);
+         set_state(PART:"meter_sh", "custom", 0.0);
+         
          f0 = get_int(min_freq_old);
          f1 = get_int(min_freq_new);
          f = f1 - f0;
@@ -77,13 +83,16 @@ group { name: "e/modules/cpufreq/main";
          f = round(freq);
          f = f + f0;
          set_int(min_freq_now, f);
-
+         
          freq = (float(f) - min_freq) / (max_freq - min_freq);
          tf = (freq * 225.0) - 135.0;
          custom_state(PART:"meter_min", "default", 0.0);
          set_state_val(PART:"meter_min", STATE_MAP_ROT_Z, tf);
          set_state(PART:"meter_min", "custom", 0.0);
-
+         custom_state(PART:"meter_min_sh", "default", 0.0);
+         set_state_val(PART:"meter_min_sh", STATE_MAP_ROT_Z, tf);
+         set_state(PART:"meter_min_sh", "custom", 0.0);
+         
          f0 = get_int(max_freq_old);
          f1 = get_int(max_freq_new);
          f = f1 - f0;
@@ -91,24 +100,23 @@ group { name: "e/modules/cpufreq/main";
          f = round(freq);
          f = f + f0;
          set_int(max_freq_now, f);
-
+         
          freq = (float(f) - min_freq) / (max_freq - min_freq);
          tf = (freq * 225.0) - 135.0;
          custom_state(PART:"meter_max", "default", 0.0);
          set_state_val(PART:"meter_max", STATE_MAP_ROT_Z, tf);
          set_state(PART:"meter_max", "custom", 0.0);
-
+         custom_state(PART:"meter_max_sh", "default", 0.0);
+         set_state_val(PART:"meter_max_sh", STATE_MAP_ROT_Z, tf);
+         set_state(PART:"meter_max_sh", "custom", 0.0);
+         
+         if (v >= 1.0) {
+            set_int(cur_freq_anim, 0);
+            return 0;
+         }
+         return 1;
       }
-//      public slide_cur_freq(val, Float:v) {
-//         v = (1.0 - cos(v * 3.141592654)) / 2.0;
-//         show_freq(v);
-//         if (v >= 1.0) {
-//            set_int(cur_freq_anim, 0);
-//            return 0;
-//         }
-//         return 1;
-//      }
-
+      
       public message(Msg_Type:type, id, ...) {
          if ((type == MSG_INT_SET) && (id == 1)) { // add an available freq
             while (count(available_frequencies) > 0) {
@@ -117,7 +125,7 @@ group { name: "e/modules/cpufreq/main";
             for (new i = 2; i < numargs(); i++) {
                append_int(available_frequencies, getarg(i));
             }
-         }
+         } 
          else if ((type == MSG_STRING_SET) && (id == 2)) { // add a governor
             new text[100];
             while (count(available_governors) > 0) {
@@ -128,11 +136,11 @@ group { name: "e/modules/cpufreq/main";
                append_str(available_governors, text);
             }
          } else if ((type == MSG_INT_SET) && (id == 3)) { // avg freq
-//            new ani;
-            new f, curf, minf, maxf;
+            new f;
+            new ani, curf, minf, maxf;
             new text[100];
-
-            f = getarg(2);
+            
+            f = getarg(2);              
             if (f < 1000000) {
                f += 500;
                snprintf(text, 100, "%i", f / 1000);
@@ -142,28 +150,26 @@ group { name: "e/modules/cpufreq/main";
                         (f % 1000000) / 100000);
             }
             set_text(PART:"readout", text);
-
+            
+            ani = get_int(cur_freq_anim);
+            if (ani > 0) cancel_anim(ani);
+            ani = anim(0.25, "slide_cur_freq", 0);
+            set_int(cur_freq_anim, ani);
+            
             f = getarg(2);
             curf = get_int(cur_freq_now);
             set_int(cur_freq_old, curf);
             set_int(cur_freq_new, f);
-
+            
             f = getarg(4);
             minf = get_int(min_freq_now);
             set_int(min_freq_old, minf);
             set_int(min_freq_new, f);
-
+            
             f = getarg(5);
             maxf = get_int(max_freq_now);
             set_int(max_freq_old, maxf);
             set_int(max_freq_new, f);
-
-//            ani = get_int(cur_freq_anim);
-//            if (ani > 0) cancel_anim(ani);
-//            ani = anim(0.2, "slide_cur_freq", 0);
-//            set_int(cur_freq_anim, ani);
-            show_freq(1.0);
-
          } else if ((type == MSG_STRING) && (id == 4)) {
             new text[100];
             snprintf(text, 100, "%s", getarg(2));
@@ -173,115 +179,191 @@ group { name: "e/modules/cpufreq/main";
    parts {
       part { name: "fade_clip"; type: RECT;
          description { state: "default" 0.0;
+            color: 255 255 255 255;
          }
          description { state: "faded" 0.0;
-            color: 255 255 255 128; // no cc
+            color: 255 255 255 128;
          }
       }
-      part { name: "clip1";
-         clip_to: "fade_clip";
+      part { name: "base-sh";
          description { state: "default" 0.0;
-            rel.to: "base";
-            image.normal: "cpu_clip_1";
+            rel1.to: "base";
+            rel1.offset: 0 -1;
+            rel2.to: "base";
+            rel2.offset: -1 -2;
+            image.normal: "inset_round_shadow.png";
          }
       }
-      part { name: "clip2";
-         clip_to: "fade_clip";
+      part { name: "base-hi";
          description { state: "default" 0.0;
-            rel.to: "base";
-            image.normal: "cpu_clip_2";
-         }
-      }
-      part { name: "clip3";
-         clip_to: "fade_clip";
-         description { state: "default" 0.0;
-            rel.to: "base";
-            image.normal: "cpu_clip_3";
+            rel1.to: "base";
+            rel1.offset: 0 1;
+            rel2.to: "base";
+            rel2.offset: -1 0;
+            image.normal: "inset_round_hilight.png";
          }
       }
       part { name: "base";
          description { state: "default" 0.0;
+            rel1.relative: (25/380) (25/380);
+            rel2.relative: (365/380) (365/380);
             aspect: 1.0 1.0; aspect_preference: BOTH;
-            image.normal: "clock_base";
-            color_class: "/bg/normal/gadgets/cpufreq/base";
-         }
-      }
-      part { name: "base_detail";
-         description { state: "default" 0.0;
-            rel.to: "base";
-            aspect: 1.0 1.0; aspect_preference: BOTH;
-            image.normal: "cpu_detail";
-            color_class: "/bg/normal/gadgets/cpufreq/detail";
-         }
-      }
-      part { name: "base_markers";
-         description { state: "default" 0.0;
-            rel.to: "base";
-            aspect: 1.0 1.0; aspect_preference: BOTH;
-            image.normal: "cpu_markers";
-            color_class: "/fg/normal/gadgets/cpufreq/digits";
+            image.normal: "tacho_base.png";
          }
       }
       part { name: "readout"; type: TEXT; mouse_events: 0;
          scale: 1;
+         effect: SHADOW BOTTOM;
          clip_to: "fade_clip";
          description { state: "default" 0.0;
-            rel1.relative: (56/144) (56/144);
-            rel2.relative: (88/144) (88/144);
-            color_class: "/fg/normal/gadgets/cpufreq/text";
-            text { font: FN; size: 6;
-               min: 1 1;
+            rel1.to: "knob2";
+            rel1.relative: 1.0 1.0;
+            rel1.offset: -2 -2;
+            rel2.relative: 0.75 0.75;
+            color_class: "module_label";
+            color3: 255 255 255 255;
+            text { font: FNBOLD; size: 6;
+               align: 0.5 0.5;
                ellipsis: -1;
                text_class: "module_small";
             }
          }
       }
-      part { name: "meter_min"; mouse_events: 0;
-         clip_to: "clip3";
+      part { name: "meter_min_sh"; mouse_events: 0;
+         clip_to: "fade_clip";
          description { state: "default" 0.0;
-            image.normal: "cpu_marker";
-            color_class: "/fg/normal/gadgets/cpufreq/hands/min";
-            rel.to: "base";
+            image.normal: "tacho_hand_small_shadow.png";
+            rel1.to: "meter_sh";
+            rel2.to: "meter_sh";
+            map {
+               on: 1;
+               rotation.center: "meter_min_sh";
+            }
+         }
+      }
+      part { name: "meter_min"; mouse_events: 0;
+         clip_to: "fade_clip";
+         description { state: "default" 0.0;
+            image.normal: "tacho_hand_small_min";
+            color: 51 153 255 255;
+            rel1.to: "base";
+            rel2.to: "base";
             map {
                on: 1;
                rotation.center: "base";
             }
          }
       }
+      part { name: "meter_max_sh"; mouse_events: 0;
+         clip_to: "fade_clip";
+         description { state: "default" 0.0;
+            image.normal: "tacho_hand_small_shadow.png";
+            rel1.to: "meter_sh";
+            rel2.to: "meter_sh";
+            map {
+               on: 1;
+               rotation.center: "meter_max_sh";
+            }
+         }
+      }
       part { name: "meter_max"; mouse_events: 0;
-         clip_to: "clip1";
+         clip_to: "fade_clip";
          description { state: "default" 0.0;
-            image.normal: "cpu_marker";
-            color_class: "/fg/normal/gadgets/cpufreq/hands/max";
-            rel.to: "base";
+            image.normal: "tacho_hand_small_min";
+            color: 255 153 51 255;
+            rel1.to: "base";
+            rel2.to: "base";
             map {
                on: 1;
                rotation.center: "base";
             }
          }
       }
+      part { name: "meter_sh"; mouse_events: 0;
+         clip_to: "fade_clip";
+         description { state: "default" 0.0;
+            image.normal: "tacho_hand_big_shadow.png";
+            rel1.to: "meter";
+            rel1.relative: 0.0 (15/380);
+            rel1.offset: 0 1;
+            rel2.to: "meter";
+            rel2.relative: 1.0 (395/380);
+            rel2.offset: -1 0;
+            map {
+               on: 1;
+               rotation.center: "meter_sh";
+            }
+         }
+      }
       part { name: "meter"; mouse_events: 0;
-         clip_to: "clip2";
+         clip_to: "fade_clip";
          description { state: "default" 0.0000;
-            image.normal: "cpu_marker";
-            color_class: "/fg/normal/gadgets/cpufreq/hands/average";
-            rel.to: "base";
+            color: 255 0 0 255;
+            image.normal: "tacho_hand_big";
+            rel1.to: "base";
+            rel2.to: "base";
             map {
                on: 1;
                rotation.center: "base";
             }
          }
       }
+      part { name: "over"; mouse_events: 0;
+         description { state: "default" 0.0;
+            rel1.to: "base";
+            rel2.to: "base";
+            image.normal: "inset_round_shading.png";
+         }
+      }
+      part { name: "knob"; type: SPACER;
+         description { state: "default" 0.0;
+            rel1.relative: (140/340) (140/340);
+            rel1.to: "base";
+            rel2.relative: (205/340) (205/340);
+            rel2.to: "base";
+            min: 4 4;
+            step: 2 2;
+            max: 24 24;
+         }
+      }
+      part { name: "knob2";
+         description { state: "default" 0.0;
+            rel1.offset: -4 -4;
+            rel1.to: "knob";
+            rel2.offset: 3 3;
+            rel2.to: "knob";
+            min: 12 12;
+            max: 32 32;
+            image.normal: "knob";
+         }
+      }
    }
    programs {
-      program { signal: "e,state,enabled"; source: "e";
+      program {
+         signal: "e,state,enabled"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "fade_clip";
       }
-      program { signal: "e,state,disabled"; source: "e";
+      program {
+         signal: "e,state,disabled"; source: "e";
          action: STATE_SET "faded" 0.0;
          target: "fade_clip";
       }
    }
 }
 
+group { name: "e/gadget/cpuclock/main";
+   alias: "e/gadget/cpuclock/main_vert";
+   inherit: "e/modules/cpufreq/main";
+   parts {
+      part { name: "readout"; type: TEXT; mouse_events: 0;
+         scale: 1;
+         effect: SHADOW BOTTOM;
+         clip_to: "fade_clip";
+         description { state: "default" 0.0;
+            visible: 0;
+         }
+      }
+   }
+}
+

data/elementary/themes/edc/cpumonitor.edc

@@ -0,0 +1,186 @@
+group { name: "e/gadget/cpumonitor/main";
+   alias: "e/gadget/cpumonitor/main_vert";
+   parts {
+      part { name: "e.swallow.content"; type: SWALLOW;
+         description { state: "default" 0.0;
+         }
+      }
+   }
+}
+group { name: "e/gadget/cpumonitor/core/main";
+   image: "cpu_bar.png" COMP;
+   image: "cpu_green_on.png" COMP;
+   image: "cpu_yellow_on.png" COMP;
+   image: "cpu_red_on.png" COMP;
+   script {
+      public message(Msg_Type:type, id, ...) {
+         if ((type == MSG_INT_SET) && (id == 1)) {
+            new val = getarg(2);
+            if (val > (100 / 7 * 1)) set_state(PART:"led1", "on",  0.0);
+            else                     set_state(PART:"led1", "off", 0.0);
+            if (val > (100 / 7 * 2)) set_state(PART:"led2", "on",  0.0);
+            else                     set_state(PART:"led2", "off", 0.0);
+            if (val > (100 / 7 * 3)) set_state(PART:"led3", "on",  0.0);
+            else                     set_state(PART:"led3", "off", 0.0);
+            if (val > (100 / 7 * 4)) set_state(PART:"led4", "on",  0.0);
+            else                     set_state(PART:"led4", "off", 0.0);
+            if (val > (100 / 7 * 5)) set_state(PART:"led5", "on",  0.0);
+            else                     set_state(PART:"led5", "off", 0.0);
+            if (val > (100 / 7 * 6)) set_state(PART:"led6", "on",  0.0);
+            else                     set_state(PART:"led6", "off", 0.0);
+         }
+      }
+   }
+   parts {
+      part { name: "bg";
+         desc { "default";
+            aspect: (10 / 54) (10 / 54);
+            aspect_preference: VERTICAL;
+            image.normal: "cpu_bar.png";
+         }
+         part { name: "led1";
+            desc { "default"; hid;
+               rel1.relative: 0.0 (1.0 / 6 * 5);
+               rel2.relative: 1.0 (1.0 / 6 * 6);
+               image.normal: "cpu_green_on.png";
+            }
+            desc { "on";  inherit: "default"; vis; }
+            desc { "off"; inherit: "default"; hid; }
+         }
+         part { name: "led2";
+            desc { "default"; hid;
+               rel1.relative: 0.0 (1.0 / 6 * 4);
+               rel2.relative: 1.0 (1.0 / 6 * 5);
+               image.normal: "cpu_green_on.png";
+            }
+            desc { "on";  inherit: "default"; vis; }
+            desc { "off"; inherit: "default"; hid; }
+         }
+         part { name: "led3";
+            desc { "default"; hid;
+               rel1.relative: 0.0 (1.0 / 6 * 3);
+               rel2.relative: 1.0 (1.0 / 6 * 4);
+               image.normal: "cpu_green_on.png";
+            }
+            desc { "on";  inherit: "default"; vis; }
+            desc { "off"; inherit: "default"; hid; }
+         }
+         part { name: "led4";
+            desc { "default"; hid;
+               rel1.relative: 0.0 (1.0 / 6 * 2);
+               rel2.relative: 1.0 (1.0 / 6 * 3);
+               image.normal: "cpu_yellow_on.png";
+            }
+            desc { "on";  inherit: "default"; vis; }
+            desc { "off"; inherit: "default"; hid; }
+         }
+         part { name: "led5";
+            desc { "default"; hid;
+               rel1.relative: 0.0 (1.0 / 6 * 1);
+               rel2.relative: 1.0 (1.0 / 6 * 2);
+               image.normal: "cpu_yellow_on.png";
+            }
+            desc { "on";  inherit: "default"; vis; }
+            desc { "off"; inherit: "default"; hid; }
+         }
+         part { name: "led6";
+            desc { "default"; hid;
+               rel1.relative: 0.0 (1.0 / 6 * 0);
+               rel2.relative: 1.0 (1.0 / 6 * 1);
+               image.normal: "cpu_red_on.png";
+            }
+            desc { "on";  inherit: "default"; vis; }
+            desc { "off"; inherit: "default"; hid; }
+         }
+      }
+   }
+}
+
+group { name: "e/gadget/cpumonitor/core/main_vert";
+   image: "cpu_bar_vert.png" COMP;
+   image: "cpu_green_on_vert.png" COMP;
+   image: "cpu_yellow_on_vert.png" COMP;
+   image: "cpu_red_on_vert.png" COMP;
+   script {
+      public message(Msg_Type:type, id, ...) {
+         if ((type == MSG_INT_SET) && (id == 1)) {
+            new val = getarg(2);
+            if (val > (100 / 7 * 1)) set_state(PART:"led1", "on",  0.0);
+            else                     set_state(PART:"led1", "off", 0.0);
+            if (val > (100 / 7 * 2)) set_state(PART:"led2", "on",  0.0);
+            else                     set_state(PART:"led2", "off", 0.0);
+            if (val > (100 / 7 * 3)) set_state(PART:"led3", "on",  0.0);
+            else                     set_state(PART:"led3", "off", 0.0);
+            if (val > (100 / 7 * 4)) set_state(PART:"led4", "on",  0.0);
+            else                     set_state(PART:"led4", "off", 0.0);
+            if (val > (100 / 7 * 5)) set_state(PART:"led5", "on",  0.0);
+            else                     set_state(PART:"led5", "off", 0.0);
+            if (val > (100 / 7 * 6)) set_state(PART:"led6", "on",  0.0);
+            else                     set_state(PART:"led6", "off", 0.0);
+         }
+      }
+   }
+   parts {
+      part { name: "bg";
+         desc { "default";
+            aspect: (54 / 10) (54 / 10);
+            aspect_preference: HORIZONTAL;
+            image.normal: "cpu_bar_vert.png";
+         }
+         part { name: "led1";
+            desc { "default"; hid;
+               rel1.relative: (1.0 / 6 * 0) 0.0;
+               rel2.relative: (1.0 / 6 * 1) 1.0;
+               image.normal: "cpu_green_on_vert.png";
+            }
+            desc { "on";  inherit: "default"; vis; }
+            desc { "off"; inherit: "default"; hid; }
+         }
+         part { name: "led2";
+            desc { "default"; hid;
+               rel1.relative: (1.0 / 6 * 1) 0.0;
+               rel2.relative: (1.0 / 6 * 2) 1.0;
+               image.normal: "cpu_green_on_vert.png";
+            }
+            desc { "on";  inherit: "default"; vis; }
+            desc { "off"; inherit: "default"; hid; }
+         }
+         part { name: "led3";
+            desc { "default"; hid;
+               rel1.relative: (1.0 / 6 * 2) 0.0;
+               rel2.relative: (1.0 / 6 * 3) 1.0;
+               image.normal: "cpu_green_on_vert.png";
+            }
+            desc { "on";  inherit: "default"; vis; }
+            desc { "off"; inherit: "default"; hid; }
+         }
+         part { name: "led4";
+            desc { "default"; hid;
+               rel1.relative: (1.0 / 6 * 3) 0.0;
+               rel2.relative: (1.0 / 6 * 4) 1.0;
+               image.normal: "cpu_yellow_on_vert.png";
+            }
+            desc { "on";  inherit: "default"; vis; }
+            desc { "off"; inherit: "default"; hid; }
+         }
+         part { name: "led5";
+            desc { "default"; hid;
+               rel1.relative: (1.0 / 6 * 4) 0.0;
+               rel2.relative: (1.0 / 6 * 5) 1.0;
+               image.normal: "cpu_yellow_on_vert.png";
+            }
+            desc { "on";  inherit: "default"; vis; }
+            desc { "off"; inherit: "default"; hid; }
+         }
+         part { name: "led6";
+            desc { "default"; hid;
+               rel1.relative: (1.0 / 6 * 5) 0.0;
+               rel2.relative: (1.0 / 6 * 6) 1.0;
+               image.normal: "cpu_red_on_vert.png";
+            }
+            desc { "on";  inherit: "default"; vis; }
+            desc { "off"; inherit: "default"; hid; }
+         }
+      }
+   }
+}

data/elementary/themes/edc/cslider.edc

@@ -1,54 +1,102 @@
 group { name: "e/widgets/cslider";
+   images.image: "inset_shadow.png" COMP;
+   images.image: "bevel_in.png" COMP;
+   images.image: "col_sel_end_bottom.png" COMP;
+   images.image: "col_sel_end_top.png" COMP;
+   images.image: "col_sel_end_left.png" COMP;
+   images.image: "col_sel_end_right.png" COMP;
    parts {
       part { name: "bg"; type: RECT;
-         scale: 1;
          description { state: "default" 0.0;
-            rel1.offset: 2 2;
-            rel2.offset: -3 -3;
-            color_class: "/bg-dark/normal/cslider/base";
-            offscale;
+            rel1.to: "e.swallow.content";
+            rel2.to: "e.swallow.content";
+            color: 48 48 48 255;
          }
       }
       part { name: "clipper"; type: RECT;
          description { state: "default" 0.0;
-            rel.to: "e.swallow.content";
+            rel1.to: "e.swallow.content";
+            rel2.to: "e.swallow.content";
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 64; // no cc
+            color: 255 255 255 64;
          }
       }
       part { name: "e.swallow.content"; type: SWALLOW;
          clip_to: "clipper";
-         scale: 1;
          description { state: "default" 0.0;
-            rel1.offset: 2 2;
-            rel2.offset: -3 -3;
-            offscale;
+            rel1.offset: 3 3;
+            rel2.offset: -4 -4;
          }
       }
-      part { name: "e.dragable.cursor"; type: RECT; mouse_events: 0;
+      part { name: "e.dragable.cursor"; type: RECT;
+         clip_to: "clipper";
          dragable.confine: "e.swallow.content";
          dragable.x: 1 1 0;
          dragable.y: -1 1 0;
          description { state: "default" 0.0;
-            fixed: 1 1;
             min: 1 1;
             max: 1 1;
+            fixed: 1 1;
             visible: 0;
-            rel.to: "e.swallow.content";
+            rel1.to: "e.swallow.content";
             rel1.relative: 0.5 0.0;
+            rel2.to: "e.swallow.content";
             rel2.relative: 0.5 0.5;
+            color: 255 255 255 150;
+         }
+      }
+      part { name: "shadow"; mouse_events: 0;
+         description { state: "default" 0.0;
+            image.normal: "inset_shadow.png";
+            image.border: 5 5 7 3;
+            image.middle: 0;
+            rel1.to: "bg";
+            rel2.to: "bg";
+            fill.smooth: 0;
+            color: 255 255 255 128;
+         }
+      }
+      part { name: "end1"; mouse_events: 0;
+         clip_to: "clipper";
+         description { state: "default" 0.0;
+            image.normal: "col_sel_end_top.png";
+            FIXED_SIZE(11, 8)
+            align: 0.5 0.0;
+            rel1.to: "cursor";
+            rel2.to: "cursor";
+         }
+         description { state: "vertical" 0.0;
+            inherit: "default" 0.0;
+            image.normal: "col_sel_end_left.png";
+            FIXED_SIZE(8, 11)
+            align: 0.0 0.5;
+         }
+      }
+      part { name: "end2"; mouse_events: 0;
+         clip_to: "clipper";
+         description { state: "default" 0.0;
+            image.normal: "col_sel_end_bottom.png";
+            FIXED_SIZE(11, 8)
+            align: 0.5 1.0;
+            rel1.to: "cursor";
+            rel2.to: "cursor";
+         }
+         description { state: "vertical" 0.0;
+            inherit: "default" 0.0;
+            image.normal: "col_sel_end_right.png";
+            FIXED_SIZE(8, 11)
+            align: 1.0 0.5;
          }
       }
       part { name: "cursor"; type: RECT; mouse_events: 0;
-         clip_to: "clipper";
          description { state: "default" 0.0;
             rel1.to_x: "e.dragable.cursor";
             rel1.to_y: "e.swallow.content";
             rel2.to_x: "e.dragable.cursor";
             rel2.to_y: "e.swallow.content";
-            color: 255 255 255 192; // no cc
+            color: 255 255 255 150;
          }
          description { state: "vertical" 0.0;
             inherit: "default" 0.0;
@@ -58,22 +106,41 @@ group { name: "e/widgets/cslider";
             rel2.to_y: "e.dragable.cursor";
          }
       }
+      part { name: "inset"; mouse_events: 0;
+         description { state: "default" 0.0;
+            image.normal: "bevel_in.png";
+            image.border: 1 1 1 1;
+            image.middle: 0;
+            rel1.to: "bg";
+            rel1.offset: -1 -1;
+            rel2.to: "bg";
+            rel2.offset: 0 0;
+            fill.smooth: 0;
+         }
+      }
    }
    programs {
-      program { signal: "e,state,direction,v"; source: "e";
+      program {
+         signal: "e,state,direction,v"; source: "e";
          action: STATE_SET "vertical" 0.0;
          target: "cursor";
+         target: "end1";
+         target: "end2";
       }
-      program { signal: "mouse,clicked,1"; source: "inset";
+      program {
+         signal: "mouse,clicked,1"; source: "inset";
          action: SIGNAL_EMIT "e,action,click" "";
       }
-      program { signal: "e,state,disabled"; source: "e";
+      program {
+         signal: "e,state,disabled"; source: "e";
          action: STATE_SET "disabled" 0.0;
          target: "clipper";
       }
-      program { signal: "e,state,enabled"; source: "e";
+      program {
+         signal: "e,state,enabled"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "clipper";
       }
    }
 }
+         

data/elementary/themes/edc/desklock.edc

@@ -1,45 +1,22 @@
 group { name: "e/desklock/background";
-   data.item: "hide_signal" "1";
+   images.image: "bg_radgrad.png" COMP;
+   images.image: "dot_pattern.png" COMP;
    parts {
-      part { name: "clip"; type: RECT;
+      part { name: "bg";
          description { state: "default" 0.0;
-            color: 255 255 255 0; // no cc
-            visible: 0;
-         }
-         description { state: "visible" 0.0;
-            color: 255 255 255 255; // no cc
-            visible: 1;
+            image.normal: "bg_radgrad.png";
+            image.scale_hint: STATIC;
+            fill.smooth: 0;
+            ASPECT_FILL((1024/653))
          }
       }
-      part { name: "bg"; type: RECT;
-         clip_to: "clip";
+      part { name: "pat";
          description { state: "default" 0.0;
-            color_class: "/bg/normal/desklock/background";
-         }
-      }
-      program { name: "shower"; signal: "show"; source: "";
-         action: STATE_SET "visible" 0.0;
-         transition: SINUSOIDAL 0.5 USE_DURATION_FACTOR 1;
-         target: "clip";
-      }
-      program { signal: "e,action,hide"; source: "e";
-         action: STATE_SET "default" 0.0;
-         transition: SINUSOIDAL 0.5 USE_DURATION_FACTOR 1;
-         target: "clip";
-         sequence {
-            action: SIGNAL_EMIT "e,action,hide,done" "e";
-         }
-      }
-      program { signal: "e,action,show,immediate"; source: "e";
-         action: ACTION_STOP;
-         target: "shower";
-         sequence {
-            action: STATE_SET "visible" 0.0;
-            target: "clip";
+            image.normal: "dot_pattern.png";
+            TILED_PATTERN(256, 256)
          }
       }
       part { name: "e.swallow.login_box"; type: SWALLOW;
-         clip_to: "clip";
          description { state: "default" 0.0;
          }
       }
@@ -47,16 +24,13 @@ group { name: "e/desklock/background";
 }
 
 group { name: "e/desklock/login_box";
-   set { name: "logo_mono";
-      image { image: "logo.png" COMP;  size: 601 601 99999 99999; }
-      image { image: "logo2.png" COMP; size: 301 301   600   600; }
-      image { image: "logo3.png" COMP; size: 151 151   300   300; }
-      image { image: "logo4.png" COMP; size:  76  76   150   150; }
-      image { image: "logo5.png" COMP; size:  0    0    75    75; }
-   }
-   IMAGE_RING("ringa", 160)
-   IMAGE_RING("ringb", 160)
-   IMAGE_RING("ringc", 160)
+   images.image: "inset_shadow.png" COMP;
+   images.image: "bevel_in.png" COMP;
+   images.image: "white_bar_vert_glow.png" COMP;
+   images.image: "logo_blue_small.png" COMP;
+   images.image: "logo_blue_small_glow.png" COMP;
+   images.image: "knob_round_busy.png" COMP;
+   images.image: "glow_round_corners.png" COMP;
    parts {
       part { name: "logo_clip"; type: RECT;
          description { state: "default";
@@ -67,29 +41,43 @@ group { name: "e/desklock/login_box";
             visible: 0;
          }
       }
-      part { name: "clipper"; type: RECT;
-         description { state: "default" 0.0;
-            rel1.to_x: "logo";
-            rel1.to_y: "e.text.password";
-            rel1.relative: 0.3 0.0;
-            rel1.offset: -100 -4;
-            rel2.to_x: "logo";
-            rel2.to_y: "e.text.password";
-            rel2.relative: 0.7 1.0;
-            rel2.offset: 99 196;
-         }
-      }
       part { name: "logo"; clip_to: "logo_clip";
-         scale: 1;
          description { state: "default" 0.0;
-            image.normal: "logo_mono";
+            image.normal: "logo_blue_small.png";
             rel1.relative: 0.5 0.5;
             rel2.relative: 0.5 0.5;
-            FIXED_SIZE(150, 150)
-            color_class: "/fg/normal/desklock/logo";
+            FIXED_SIZE(100, 127)
+         }
+      }
+      part { name: "logo_glow"; clip_to: "logo_clip";
+         description { state: "default" 0.0;
+            image.normal: "logo_blue_small_glow.png";
+            rel1.to: "logo";
+            rel2.to: "logo";
+            color: 255 255 255 128;
+         }
+         description { state: "active" 0.0;
+            inherit: "default" 0.0;
+            color: 255 255 255 255;
+         }
+      }
+      part { name: "bg"; type: RECT;
+         description { state: "default" 0.0;
+            rel1.to: "inset";
+            rel1.offset: 1 1;
+            rel2.to: "inset";
+            rel2.offset: -2 -2;
+            color: 48 48 48 255;
+         }
+      }
+      part { name: "clipper"; type: RECT;
+         description { state: "default" 0.0;
+            rel1.to: "bg";
+            rel2.to: "bg";
          }
       }
       part { name: "e.text.title"; type: TEXT;
+         effect: SHADOW BOTTOM;
          scale: 1;
          description { state: "default" 0.0;
             rel1.relative: 0.0 1.0;
@@ -98,7 +86,7 @@ group { name: "e/desklock/login_box";
             rel2.relative: 1.0 1.0;
             rel2.offset: -4 3;
             rel2.to_y: "logo";
-            color_class: "/fg/normal/desklock/text/title";
+            color: FN_COL_DEFAULT;
             align: 0.5 0.0;
             text { font: FNBD; size: 10;
                min: 1 1;
@@ -110,6 +98,7 @@ group { name: "e/desklock/login_box";
          }
       }
       part { name: "e.text.hint"; type: TEXT;
+         effect: SHADOW BOTTOM;
          scale: 1;
          description { state: "default" 0.0;
             rel1.relative: 0.0 1.0;
@@ -118,7 +107,7 @@ group { name: "e/desklock/login_box";
             rel2.relative: 1.0 1.0;
             rel2.offset: -4 3;
             rel2.to_y: "e.text.password";
-            color_class: "/fg/normal/desklock/text/hint";
+            color: FN_COL_DEFAULT;
             align: 0.5 0.0;
             text { font: FNBD; size: 10;
                min: 1 1;
@@ -131,8 +120,9 @@ group { name: "e/desklock/login_box";
       }
       part { name: "selection"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            rel.to: "e.text.password";
-            color_class: "/fg/normal/desklock/selection";
+            rel1.to: "e.text.password";
+            rel2.to: "e.text.password";
+            color: 51 153 255 255;
             visible: 0;
          }
          description { state: "active" 0.0;
@@ -141,18 +131,20 @@ group { name: "e/desklock/login_box";
          }
       }
       part { name: "e.text.password"; type: TEXT;
+         effect: SHADOW BOTTOM;
          scale: 1;
          clip_to: "clipper";
          description { state: "default" 0.0;
             rel1.relative: 0.0 1.0;
             rel1.offset: 3 10;
-            rel1.to_x: "clipper";
+            rel1.to_x: "inset";
             rel1.to_y: "e.text.title";
             rel2.relative: 0.0 1.0;
             rel2.offset: 3 10;
-            rel2.to_x: "clipper";
+            rel2.to_x: "inset";
             rel2.to_y: "e.text.title";
-            color_class: "/fg/normal/desklock/text/password";
+            color: FN_COL_DEFAULT;
+            color_class: "desklock_passwd";
             align: 0.0 0.0;
             text { font: FN; size: 10;
                min: 1 1;
@@ -163,97 +155,175 @@ group { name: "e/desklock/login_box";
             fixed: 1 1;
          }
       }
-      part { name: "cursor"; type: RECT; mouse_events: 0;
-         scale: 1;
+      part { name: "cursor"; mouse_events: 0;
          clip_to: "clipper";
          description { state: "default" 0.0;
-            rel.to: "e.text.password";
+            rel1.to: "e.text.password";
             rel1.relative: 1.0 0.0;
-            rel1.offset: 0 -4;
-            rel2.offset: -1 3;
-            color_class: "/fg/normal/desklock/text/cursor";
-            min: 1 10;
+            rel1.offset: -4 -4;
+            rel2.to: "e.text.password";
+            rel2.offset: 3 3;
+            image.normal: "white_bar_vert_glow.png";
+            image.border: 4 4 4 4;
+            fill.smooth: 0;
+            color: 255 255 255 0;
+            min: 9 10;
             fixed: 1 1;
-            visible: 0;
-            offscale;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
-            visible: 1;
+            color: 255 255 255 255;
          }
       }
-      part { name: "fprint";
-         scale: 1;
+      part { name: "shadow"; mouse_events: 0; repeat_events: 1;
+         description { state: "default" 0.0;
+            image.normal: "inset_shadow.png";
+            image.border: 5 5 7 3;
+            image.middle: 0;
+            rel1.to: "bg";
+            rel2.to: "bg";
+            fill.smooth: 0;
+            color: 255 255 255 128;
+         }
+      }
+      part { name: "inset"; mouse_events: 0; repeat_events: 1;
+         description { state: "default" 0.0;
+            rel1.relative: 0.5 0.0;
+            rel1.offset: -100 -4;
+            rel1.to_x: "logo";
+            rel1.to_y: "e.text.password";
+            rel2.relative: 0.5 1.0;
+            rel2.offset: 99 3;
+            rel2.to_x: "logo";
+            rel2.to_y: "e.text.password";
+            align: 0.5 0.5;
+            image.normal: "bevel_in.png";
+            image.border: 1 1 1 1;
+            image.middle: 0;
+            fill.smooth: 0;
+         }
+      }
+      part { name: "busy_clip"; type: RECT;
          description { state: "default" 0.0;
-            image.normal: "i-fingerprint";
-            min: 40 40;
-            max: 40 40;
-            rel.to_x: "clipper";
-            rel.to_y: "e.text.password";
-            rel1.relative: 0.0 1.0;
-            align: 0.5 0.0;
-            color: 255 255 255 0; // no cc
-            color_class: "/fg/normal/desklock/fprint/normal";
             visible: 0;
+            color: 255 255 255 0;
          }
          description { state: "active" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 255; // no cc
-            visible: 1;
-         }
-         description { state: "auth-success" 0.0;
-            inherit: "default" 0.0;
-            color_class: "/fg/normal/desklock/fprint/success";
-            color: 255 255 255 255; // no cc
-            visible: 1;
-         }
-         description { state: "auth-fail" 0.0;
-            inherit: "default" 0.0;
-            color_class: "/fg/normal/desklock/fprint/fail";
-            color: 255 255 255 255; // no cc
             visible: 1;
+            color: 255 255 255 255;
          }
       }
-      part { name: "busy_area"; type: SPACER;
-         scale: 1;
+      part { name: "knob"; mouse_events: 0;
+         clip_to: "busy_clip";
          description { state: "default" 0.0;
+            fixed: 1 1;
+            image.normal: "knob_round_busy.png";
             min: 40 40;
             max: 40 40;
-            rel.to: "clipper";
-            rel1.relative: 0.0 0.5;
+            rel1.relative: 0.5 1.0;
+            rel1.offset: 0 3;
+            rel1.to_y: "inset";
+            rel2.relative: 0.5 1.0;
+            rel2.offset: -1 3;
+            rel2.to_y: "inset";
             align: 0.5 0.0;
+            fixed: 1 1;
          }
       }
-      program { signal: "e,action,hide"; source: "e";
-         action: SIGNAL_EMIT "e,state,invalid" "e";
+      part { name: "knob_spinner"; mouse_events: 0;
+         clip_to: "busy_clip";
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            rel1.to: "knob";
+            rel2.to: "knob";
+            image.normal: "glow_round_corners.png";
+            map.on: 1;
+            map.smooth: 1;
+            map.rotation.center: "knob";
+         }
+         description { state: "spin" 0.0;
+            inherit: "default" 0.0;
+            map.rotation.z: 360;
+         }
       }
-      BUSY("busy_area", "e,state,checking", "e", "e,state,invalid", "e")
    }
    programs {
+      program { name: "logo_pulse";
+         signal: "show"; source: "";
+         in: 3.0 5.0;
+         action: STATE_SET "active" 0.0;
+         target: "logo_glow";
+         transition: BOUNCE 0.8 0.5 6;
+         after: "logo_pulse2";
+      }
+      program { name: "logo_pulse2";
+         action: STATE_SET "default" 0.0;
+         target: "logo_glow";
+         transition: SINUSOIDAL 2.4;
+         after: "logo_pulse";
+      }
       program { name: "cursor_show";
          signal: "show"; source: "";
          action: STATE_SET "visible" 0.0;
          target: "cursor";
          after: "cursor_show_timer";
       }
-      program { name: "cursor_show_timer";
-         in: 0.4 0.0;
-         after: "cursor_hide";
-      }
       program { name: "cursor_hide";
          action: STATE_SET "default" 0.0;
          target: "cursor";
+         transition: SINUSOIDAL 0.2;
          after: "cursor_hide_timer";
       }
+      program { name: "cursor_show_timer";
+         in: 0.5 0.0;
+         after: "cursor_hide";
+      }
       program { name: "cursor_hide_timer";
-         in: 0.4 0.0;
+         in: 0.2 0.0;
          after: "cursor_show";
       }
-      program { signal: "e,state,selected"; source: "e";
+      program { name: "spin";
+         signal: "e,state,checking"; source: "e";
+         action: STATE_SET "spin" 0.0;
+         transition: LINEAR 1.0;
+         target: "knob_spinner";
+         after: "spin2";
+      }
+      program { name: "spin2";
+         action: STATE_SET "default" 0.0;
+         target: "knob_spinner";
+         after: "spin";
+      }
+      program {
+         signal: "e,state,checking"; source: "e";
+         action: STATE_SET "active" 0.0;
+         transition: SINUSOIDAL 0.25;
+         target: "busy_clip";
+      }
+      program {
+         signal: "e,state,invalid"; source: "e";
+         action: STATE_SET "default" 0.0;
+         transition: SINUSOIDAL 1.0;
+         target: "busy_clip";
+         after: "spin3";
+      }
+      program { name: "spin3";
+         action: ACTION_STOP;
+         target: "spin";
+         target: "spin2";
+         after: "spin4";
+      }
+      program { name: "spin4";
+         action: STATE_SET "default" 0.0;
+         target: "knob_spinner";
+      }
+      program {
+         signal: "e,state,selected"; source: "e";
          action: STATE_SET "active" 0.0;
          target: "selection";
       }
-      program { signal: "e,state,unselected"; source: "e";
+      program {
+         signal: "e,state,unselected"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "selection";
       }
@@ -265,90 +335,22 @@ group { name: "e/desklock/login_box";
          action: STATE_SET "default" 0.0;
          target: "logo_clip";
       }
-
-      program { signal: "e,fprint,unknown"; source: "e";
-         action: STATE_SET "active" 0.0;
-         transition: SINUSOIDAL 0.5 USE_DURATION_FACTOR 1;
-         target: "fprint";
-      }
-      program { signal: "e,fprint,press"; source: "e";
-         action: STATE_SET "active" 0.0;
-         transition: SINUSOIDAL 0.5 USE_DURATION_FACTOR 1;
-         target: "fprint";
-      }
-      program { signal: "e,fprint,swipe"; source: "e";
-         action: STATE_SET "active" 0.0;
-         transition: SINUSOIDAL 0.5 USE_DURATION_FACTOR 1;
-         target: "fprint";
-      }
-
-      program { signal: "e,fprint,auth,success"; source: "e";
-         action: STATE_SET "auth-success" 0.0;
-         transition: SINUSOIDAL 0.2 USE_DURATION_FACTOR 1;
-         target: "fprint";
-      }
-      program { signal: "e,fprint,auth,fail"; source: "e";
-         action: STATE_SET "auth-fail" 0.0;
-         transition: SINUSOIDAL 0.2 USE_DURATION_FACTOR 1;
-         target: "fprint";
-         after: "fprint-reset";
-      }
-      program { signal: "e,fprint,auth,short"; source: "e";
-         action: STATE_SET "auth-fail" 0.0;
-         transition: SINUSOIDAL 0.2 USE_DURATION_FACTOR 1;
-         target: "fprint";
-         after: "fprint-reset";
-      }
-      program { signal: "e,fprint,auth,nocenter"; source: "e";
-         action: STATE_SET "auth-fail" 0.0;
-         transition: SINUSOIDAL 0.2 USE_DURATION_FACTOR 1;
-         target: "fprint";
-         after: "fprint-reset";
-      }
-      program { signal: "e,fprint,auth,removeretry"; source: "e";
-         action: STATE_SET "auth-fail" 0.0;
-         transition: SINUSOIDAL 0.2 USE_DURATION_FACTOR 1;
-         target: "fprint";
-         after: "fprint-reset";
-      }
-      program { signal: "e,fprint,auth,retry"; source: "e";
-         action: STATE_SET "auth-fail" 0.0;
-         transition: SINUSOIDAL 0.2 USE_DURATION_FACTOR 1;
-         target: "fprint";
-         after: "fprint-reset";
-      }
-      program { signal: "e,fprint,auth,disconnect"; source: "e";
-         action: STATE_SET "default" 0.0;
-         transition: SINUSOIDAL 0.2 USE_DURATION_FACTOR 1;
-         target: "fprint";
-      }
-      program { signal: "e,fprint,auth,error"; source: "e";
-         action: STATE_SET "auth-fail" 0.0;
-         transition: SINUSOIDAL 0.2 USE_DURATION_FACTOR 1;
-         target: "fprint";
-         after: "fprint-reset";
-      }
-      program { name: "fprint-reset";
-         action: STATE_SET "active" 0.0;
-         transition: SINUSOIDAL 0.5 USE_DURATION_FACTOR 1;
-         target: "fprint";
-         in: 0.5 0.0;
-      }
    }
 }
 
 group { name: "e/desklock/pin_box";
    parts {
       part { name: "e.text.title"; type: TEXT;
+         effect: SHADOW BOTTOM;
          scale: 1;
          description { state: "default" 0.0;
             rel1.offset: 3 3;
             rel1.relative: 0.0 1.0;
             rel1.to_y: "e.swallow.buttons";
             rel2.offset: -4 -3;
-            color_class: "/fg/normal/desklock/text/title/pin";
+            color: FN_COL_DEFAULT;
             align: 0.5 0.0;
-            text { font: FNBD; size: 10;
+            text { font: "Sans:style=Bold"; size: 10;
                min: 0 1;
                align: 0.5 0.5;
                text_class: "desklock_title";
@@ -359,8 +361,9 @@ group { name: "e/desklock/pin_box";
       }
       part { name: "selection"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            rel.to: "e.text.password";
-            color_class: "/fg/normal/desklock/selection";
+            rel1.to: "e.text.password";
+            rel2.to: "e.text.password";
+            color: 51 153 255 255;
             visible: 0;
          }
          description { state: "active" 0.0;
@@ -369,40 +372,46 @@ group { name: "e/desklock/pin_box";
          }
       }
       part { name: "e.text.password"; type: TEXT;
+         effect: SHADOW BOTTOM;
          scale: 1;
          description { state: "default" 0.0;
             rel1.relative: 0.5 0.0;
             rel1.offset: 3 2;
             rel2.relative: 0.5 0.0;
             rel2.offset: 3 -2;
-            color_class: "/fg/normal/desklock/text/password";
-            text { font: FN; size: 10;
+            color: FN_COL_DEFAULT;
+            color_class: "desklock_passwd";
+            text { font: "Sans"; size: 10;
                min: 1 1;
                ellipsis: -1;
                align: 1.0 0.5;
                text_class: "desklock_passwd";
             }
             fixed: 1 1;
-            offscale;
          }
       }
-      part { name: "cursor"; type: RECT; mouse_events: 0;
+      part { name: "cursor"; mouse_events: 0;
          description { state: "default" 0.0;
-            rel.to: "e.text.password";
+            rel1.to: "e.text.password";
             rel1.relative: 1.0 0.0;
-            rel1.offset: 0 -4;
-            rel2.offset: -1 3;
-            color_class: "/fg/normal/desklock/text/cursor";
-            min: 1 3;
+            rel1.offset: -4 -4;
+            rel2.to: "e.text.password";
+            rel2.offset: 3 3;
+            image.normal: "white_bar_vert_glow.png";
+            image.border: 4 4 4 4;
+            fill.smooth: 0;
+            color: 255 255 255 0;
+            min: 9 10;
             fixed: 1 1;
-            offscale;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
+            color: 255 255 255 255;
          }
       }
       part { name: "button_clip"; type: RECT;
          description { state: "default";
+            color: 255 255 255 255;
          }
       }
       part { name: "e.swallow.buttons"; type: SWALLOW;
@@ -422,25 +431,27 @@ group { name: "e/desklock/pin_box";
          target: "cursor";
          after: "cursor_show_timer";
       }
-      program { name: "cursor_show_timer";
-         in: 0.5 0.0;
-         after: "cursor_hide";
-      }
       program { name: "cursor_hide";
          action: STATE_SET "default" 0.0;
          target: "cursor";
-         transition: SINUSOIDAL 0.2 USE_DURATION_FACTOR 1;
+         transition: SINUSOIDAL 0.2;
          after: "cursor_hide_timer";
       }
+      program { name: "cursor_show_timer";
+         in: 0.5 0.0;
+         after: "cursor_hide";
+      }
       program { name: "cursor_hide_timer";
          in: 0.2 0.0;
          after: "cursor_show";
       }
-      program { signal: "e,state,selected"; source: "e";
+      program {
+         signal: "e,state,selected"; source: "e";
          action: STATE_SET "active" 0.0;
          target: "selection";
       }
-      program { signal: "e,state,unselected"; source: "e";
+      program {
+         signal: "e,state,unselected"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "selection";
       }

data/elementary/themes/edc/deskmirror.edc

@@ -2,15 +2,24 @@ group { name: "e/deskmirror/frame/default";
    alias: "e/deskmirror/frame/dialog";
    alias: "e/deskmirror/frame/urgent";
    alias: "e/deskmirror/frame/sparkle";
-   images.image: "pager_mini_win_shadow.png" COMP;
+   images.image: "mini_box_bevel_shadow.png" COMP;
+   images.image: "shine.png" COMP;
+   images.image: "vgrad_med_lighter.png" COMP;
+   images.image: "vgrad_med_dark.png" COMP;
+   images.image: "bevel_out.png" COMP;
+   images.image: "bevel_dark_out.png" COMP;
    script {
       public message(Msg_Type:type, id, ...) {
          if ((type == MSG_FLOAT) && (id == 0)) {
             new Float:sc = getfarg(2);
-
+            
             custom_state(PART:"top_spacer", "default", 0.0);
             set_state_val(PART:"top_spacer", STATE_REL2, 1.0, sc);
             set_state(PART:"top_spacer", "custom", 0.0);
+            
+            custom_state(PART:"bottom_spacer", "default", 0.0);
+            set_state_val(PART:"bottom_spacer", STATE_REL1, 0.0, 1.0 - sc);
+            set_state(PART:"bottom_spacer", "custom", 0.0);
          }
       }
    }
@@ -19,7 +28,6 @@ group { name: "e/deskmirror/frame/default";
          description { state: "default";
          }
          description { state: "iconic";
-            inherit: "default" 0.0;
             rel1.relative: 0.0 1.0;
             rel2.relative: 0.0 1.0;
          }
@@ -28,30 +36,32 @@ group { name: "e/deskmirror/frame/default";
          description { state: "default" 0.0;
             rel1.to: "spacer";
             rel2.to_x: "spacer";
-            rel2.to_y: "e.text.title";
+            rel2.to_y: "title2";
             rel2.offset: -1 -4;
             align: 0.5 0.0;
          }
       }
+      part { name: "bottom_spacer"; type: SPACER;
+         description { state: "default" 0.0;
+            rel1.to: "bottom_size";
+            rel2.to: "bottom_size";
+            align: 0.5 1.0;
+         }
+      }
       part { name: "bottom_size"; type: SPACER;
          description { state: "default" 0.0;
             rel1.to_x: "spacer";
             rel1.relative: 0.0 1.0;
-            rel1.offset: 0 -1;
+            rel1.offset: 0 -3;
             rel2.to: "spacer";
             min: 0 1;
             fixed: 0 1;
          }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            min: 0 0;
-            max: 0 0;
-         }
       }
       part { name: "shadow";
          mouse_events: 0;
          description { state: "default" 0.0;
-            image.normal: "pager_mini_win_shadow.png";
+            image.normal: "mini_box_bevel_shadow.png";
             image.border: 7 7 7 7;
             image.middle: 0;
             rel1.to: "top";
@@ -59,14 +69,14 @@ group { name: "e/deskmirror/frame/default";
             rel2.to: "bottom";
             rel2.offset: 4 4;
             fill.smooth: 0;
-            color_class: "/shadow/normal/border";
          }
          description { state: "off";
             inherit: "default" 0.0;
             visible: 0;
          }
       }
-
+      
+      
       part { name: "client_clip"; type: RECT;
          description { state: "default" 0.0;
             rel1.to_y: "top";
@@ -84,28 +94,19 @@ group { name: "e/deskmirror/frame/default";
             rel2.relative: 1.0 0.0;
          }
       }
-
-      part { name: "top"; type: RECT;
-         description { state: "default" 0.0;
-            rel.to: "top_spacer";
-            color_class: "/bg/normal/titlebar";
-            min: 0 1;
-         }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
-            color_class: "/bg/selected/titlebar";
-         }
-      }
-
+      
       part { name: "e.text.title"; type: TEXT; mouse_events: 0;
          scale: 1;
+         effect: SHADOW BOTTOM;
          description { state: "default" 0.0;
-            rel.to: "spacer";
+            color_class: "border_title";
             rel1.offset: 1 3;
+            rel1.to: "spacer";
             rel2.relative: 1.0 0.0;
             rel2.offset: -2 3;
+            rel2.to: "spacer";
             align: 0.5 0.0;
-            color_class: "/fg/normal/titlebar";
+            color: FN_COL_DISABLE;
             text { font: FNBD; size: 10;
                text_class: "title_bar";
                align: 0.5 0.0;
@@ -114,36 +115,84 @@ group { name: "e/deskmirror/frame/default";
             visible: 0;
             fixed: 0 1;
          }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
-            color_class: "/fg/selected/titlebar";
+      }
+      part { name: "title2"; type: TEXT; mouse_events: 0;
+         scale: 1;
+         effect: SOFT_SHADOW BOTTOM;
+         description { state: "default" 0.0;
+            color_class: "border_title_active";
+            rel1.offset: 1 2;
+            rel1.to: "spacer";
+            rel2.relative: 1.0 0.0;
+            rel2.offset: -1 2;
+            rel2.to: "spacer";
+            align: 0.5 0.0;
+            color: FN_COL_DEFAULT_SOFT_SHADOW;
+            text { font: FNBD; size: 10;
+               text_source: "e.text.title";
+               text_class: "title_bar";
+               align: 0.5 0.0;
+               min: 0 1;
+            }
+            visible: 0;
+            fixed: 0 1;
+         }
+      }
+      
+      part { name: "top";
+         description { state: "default" 0.0;
+            color_class: "border_top";
+            image.normal: "vgrad_med_lighter.png";
+            fill.smooth: 0;
+            TILED_HORIZ(120)
+            rel1.to: "top_spacer";
+            rel2.to: "top_spacer";
+            min: 0 1;
+         }
+      }
+      part { name: "bevel"; mouse_events: 0;
+         description { state: "default" 0.0;
+            image.normal: "bevel_out.png";
+            image.border: 1 1 1 1;
+            image.middle: 0;
+            rel1.to: "top";
+            rel2.to: "top";
+            fill.smooth: 0;
          }
       }
 
       part { name: "bottom"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            rel.to: "bottom_size";
-            color_class: "/bg/normal/border";
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            max: 0 0;
-            visible: 0;
+            color_class: "border_bottom";
+            rel1.to: "bottom_spacer";
+            rel2.to: "bottom_spacer";
+            color: 64 64 64 255;
          }
       }
-
+      part { name: "bevel2"; mouse_events: 0;
+         description { state: "default" 0.0;
+            image.normal: "bevel_dark_out.png";
+            image.border: 1 1 1 1;
+            image.middle: 0;
+            rel1.to: "bottom";
+            rel2.to: "bottom";
+            fill.smooth: 0;
+         }
+      }
+      
       part { name: "clone"; type: PROXY; mouse_events: 0;
          description { state: "default";
             source: "e.swallow.client";
-            rel.to: "e.swallow.client";
+            rel1.to: "e.swallow.client";
+            rel2.to: "e.swallow.client";
             visible: 0;
-            color: 255 255 255 0; // no cc
+            color: 255 255 255 0;
             proxy.source_clip: 0;
          }
          description { state: "urgent1";
             inherit: "default" 0.0;
             visible: 1;
-            color: 255 255 255 255; // no cc
+            color: 255 255 255 255;
             proxy.source_clip: 0;
          }
          description { state: "urgent2" 0.0;
@@ -151,13 +200,26 @@ group { name: "e/deskmirror/frame/default";
             visible: 1;
             rel1.relative: -2.0  -2.0;
             rel2.relative: 3.0  3.0;
-            color: 255 255 255 0; // no cc
+            color: 255 255 255 0;
             proxy.source_clip: 0;
          }
       }
+      part { name: "shine"; mouse_events: 0;
+         description { state: "default" 0.0;
+            fixed: 0 1;
+            image.normal: "shine.png";
+            rel1.offset: 0 -1;
+            rel1.to: "top";
+            rel2.relative: 1.0 0.0;
+            rel2.offset: -1 1;
+            rel2.to: "top";
+            max: 69 3;
+         }
+      }
    }
    programs {
-      program { signal: "e,state,urgent"; source: "e";
+      program { name: "urgent";
+         signal: "e,state,urgent"; source: "e";
          action: ACTION_STOP;
          target: "go_big";
          target: "go_big2";
@@ -170,11 +232,12 @@ group { name: "e/deskmirror/frame/default";
       }
       program { name: "go_big2";
          action: STATE_SET "urgent2" 0.0;
-         transition: LINEAR 0.5 USE_DURATION_FACTOR 1;
+         transition: LINEAR 0.5;
          target: "clone";
          after: "go_big";
       }
-      program { signal: "e,state,not_urgent"; source: "e";
+      program { name: "not_urgent";
+         signal: "e,state,not_urgent"; source: "e";
          action: ACTION_STOP;
          target: "go_big";
          target: "go_big2";
@@ -182,62 +245,100 @@ group { name: "e/deskmirror/frame/default";
       }
       program { name: "go_hid";
          action: STATE_SET "default" 0.0;
-         transition: LINEAR 0.5 USE_DURATION_FACTOR 1;
+         transition: LINEAR 0.5;
          target: "clone";
       }
-      program { signal: "e,state,shadow,on"; source: "e";
+      program { name: "shon";
+         signal: "e,state,shadow,on"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "shadow";
       }
-      program { signal: "e,state,shadow,off"; source: "e";
+      program { name: "shoff";
+         signal: "e,state,shadow,off"; source: "e";
          action: STATE_SET "off" 0.0;
          target: "shadow";
       }
-      program { signal: "e,state,focused"; source: "e";
-         action: STATE_SET "focused" 0.0;
-         target: "e.text.title";
-         target: "top";
+      program {
+         name: "focus";
+         signal: "e,state,focused"; source: "e";
+         script {
+            custom_state(PART:"top", "default", 0.0);
+            set_state_val(PART:"top", STATE_IMAGE, get_image_id("vgrad_med_dark.png"));
+            set_state(PART:"top", "custom", 0.0);
+         }
       }
-      program { signal: "e,state,unfocused"; source: "e";
-         action: STATE_SET "default" 0.0;
-         target: "e.text.title";
-         target: "top";
+      program {
+         name: "unfocus";
+         signal: "e,state,unfocused"; source: "e";
+         script {
+            custom_state(PART:"top", "default", 0.0);
+            set_state_val(PART:"top", STATE_IMAGE, get_image_id("vgrad_med_lighter.png"));
+            set_state(PART:"top", "custom", 0.0);
+         }
       }
-      program { signal: "e,state,shaded"; source: "e";
-         action: STATE_SET "hidden" 0.0;
-         target: "bottom";
+      program {
+         name: "shade";
+         signal: "e,state,shaded"; source: "e";
+         script {
+            custom_state(PART:"bottom", "default", 0.0);
+            set_state_val(PART:"bottom", STATE_VISIBLE, 0);
+            set_state(PART:"bottom", "custom", 0.0);
+            custom_state(PART:"bevel2", "default", 0.0);
+            set_state_val(PART:"bevel2", STATE_VISIBLE, 0);
+            set_state(PART:"bevel2", "custom", 0.0);
+         }
       }
-      program { signal: "e,state,maximize*"; source: "e";
-         action: STATE_SET "hidden" 0.0;
-         target: "bottom";
+      program {
+         signal: "e,state,maximize*"; source: "e";
+         script {
+            custom_state(PART:"bottom", "default", 0.0);
+            set_state_val(PART:"bottom", STATE_VISIBLE, 0);
+            set_state_val(PART:"bottom", STATE_MAX, 0, 0);
+            set_state(PART:"bottom", "custom", 0.0);
+            custom_state(PART:"bevel2", "default", 0.0);
+            set_state_val(PART:"bevel2", STATE_VISIBLE, 0);
+            set_state(PART:"bevel2", "custom", 0.0);
+         }
       }
-      program { signal: "e,state,unmaximize*"; source: "e";
+      program {
+         signal: "e,state,unmaximize*"; source: "e";
          after: "unshade";
       }
-      program { signal: "e,state,unshaded"; source: "e";
+      program {
+         signal: "e,state,unshaded"; source: "e";
          after: "unshade";
       }
-      program { name: "unshade";
+      program {
+         name: "unshade";
          signal: "e,state,unshading"; source: "e";
-         action: STATE_SET "default" 0.0;
-         target: "bottom";
+         script {
+            custom_state(PART:"bottom", "default", 0.0);
+            set_state_val(PART:"bottom", STATE_VISIBLE, 1);
+            set_state_val(PART:"bottom", STATE_MAX, 99999, 99999);
+            set_state(PART:"bottom", "custom", 0.0);
+            custom_state(PART:"bevel2", "default", 0.0);
+            set_state_val(PART:"bevel2", STATE_VISIBLE, 1);
+            set_state(PART:"bevel2", "custom", 0.0);
+         }
       }
       program { name: "iconify";
          action: STATE_SET "iconic" 0.0;
-         transition: ACCELERATE 0.2 CURRENT USE_DURATION_FACTOR 1;
+         transition: ACCELERATE 0.2 CURRENT;
          target: "spacer";
       }
       program { name: "uniconify";
          action: STATE_SET "default" 0.0;
-         transition: DECELERATE 0.2 CURRENT USE_DURATION_FACTOR 1;
+         transition: DECELERATE 0.2 CURRENT;
          target: "spacer";
       }
-      program { signal: "e,action,uniconify"; source: "e";
+      program {
+         signal: "e,action,uniconify"; source: "e";
          action: ACTION_STOP;
          target: "iconify";
          after: "uniconify";
       }
-      program { signal: "e,action,iconify"; source: "e";
+      program {
+         signal: "e,action,iconify"; source: "e";
          action: ACTION_STOP;
          target: "uniconify";
          after: "iconify";
@@ -255,7 +356,7 @@ group { name: "e/deskmirror/frame/noresize";
       }
       part { name: "bottom"; type: RECT;
          description { state: "default" 0.0;
-            color_class: "/bg/normal/border";
+            color_class: "border_bottom";
             rel1.relative: 0.0 1.0;
             rel1.offset: 0 -1;
             rel2.relative: 1.0 1.0;
@@ -265,6 +366,11 @@ group { name: "e/deskmirror/frame/noresize";
             visible: 0;
          }
       }
+      part { name: "bevel2";
+         description { state: "default" 0.0;
+            visible: 0;
+         }
+      }
    }
 }
 
@@ -278,7 +384,7 @@ group { name: "e/deskmirror/frame/noresize_dialog";
       }
       part { name: "bottom"; type: RECT;
          description { state: "default" 0.0;
-            color_class: "/bg/normal/border";
+            color_class: "border_bottom";
             rel1.relative: 0.0 1.0;
             rel1.offset: 0 -1;
             rel2.relative: 1.0 1.0;
@@ -288,6 +394,11 @@ group { name: "e/deskmirror/frame/noresize_dialog";
             visible: 0;
          }
       }
+      part { name: "bevel2";
+         description { state: "default" 0.0;
+            visible: 0;
+         }
+      }
    }
 }
 
@@ -295,70 +406,37 @@ group { name: "e/deskmirror/frame/pixel";
    parts {
       part { name: "client_clip"; type: RECT;
          description { state: "default" 0.0;
-            rel.to: "e.swallow.client";
+            rel1.to: "e.swallow.client";
+            rel2.to: "e.swallow.client";
          }
       }
       part { name: "frame"; type: RECT;
          description { state: "default" 0.0;
-            color_class: "/bg/normal/border/outline";
+            color: 0 0 0 255;
+            rel2.offset: 0 0;
          }
          description { state: "focused" 0.0;
             inherit: "default" 0.0;
-            color_class: "/bg/selected/border/outline";
+            color: 51 153 255 255;
          }
       }
       part { name: "e.swallow.client"; type: SWALLOW;
          clip_to: "client_clip";
          description { state: "default" 0.0;
             rel1.offset: 1 1;
-            rel2.offset: -2 -2;
          }
       }
    }
    programs {
-      program { signal: "e,state,focused"; source: "e";
+      program {
+         name: "focus";
+         signal: "e,state,focused"; source: "e";
          action: STATE_SET "focused" 0.0;
          target: "frame";
       }
-      program { signal: "e,state,unfocused"; source: "e";
-         action: STATE_SET "default" 0.0;
-         target: "frame";
-      }
-   }
-}
-
-group { name: "e/deskmirror/frame/tiling";
-   parts {
-      part { name: "client_clip"; type: RECT;
-         description { state: "default" 0.0;
-            rel.to: "e.swallow.client";
-         }
-      }
-      part { name: "frame"; type: RECT;
-         description { state: "default" 0.0;
-            color: 0 0 0 0; // no cc
-            rel1.offset: -1 -1;
-            rel2.offset: 0 0;
-            color_class: "/bg/selected/border/outline";
-            color: 255 255 255 0; // no cc
-         }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 255; // no cc
-         }
-      }
-      part { name: "e.swallow.client"; type: SWALLOW;
-         clip_to: "client_clip";
-         description { state: "default" 0.0;
-         }
-      }
-   }
-   programs {
-      program { signal: "e,state,focused"; source: "e";
-         action: STATE_SET "focused" 0.0;
-         target: "frame";
-      }
-      program { signal: "e,state,unfocused"; source: "e";
+      program {
+         name: "unfocus";
+         signal: "e,state,unfocused"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "frame";
       }
@@ -383,40 +461,43 @@ group { "e/deskmirror/frame/borderless";
          desc {
             source: "e.swallow.client";
             hid;
-            color: 255 255 255 0; // no cc
+            color: 255 255 255 0;
          }
          desc { "urgent1"; inherit: "default";
             vis;
-            color: 255 255 255 255; // no cc
+            color: 255 255 255 255;
          }
          desc { "urgent2"; inherit: "default";
             vis;
             rel1.relative: -2.0  -2.0;
             rel2.relative: 3.0  3.0;
-            color: 255 255 255 0; // no cc
+            color: 255 255 255 0;
          }
       }
       program { name: "iconify";
          action: STATE_SET "iconic" 0.0;
-         transition: ACCELERATE 0.2 CURRENT USE_DURATION_FACTOR 1;
+         transition: ACCELERATE 0.2 CURRENT;
          target: "spacer";
       }
       program { name: "uniconify";
          action: STATE_SET "default" 0.0;
-         transition: DECELERATE 0.2 CURRENT USE_DURATION_FACTOR 1;
+         transition: DECELERATE 0.2 CURRENT;
          target: "spacer";
       }
-      program { signal: "e,action,uniconify"; source: "e";
+      program {
+         signal: "e,action,uniconify"; source: "e";
          action: ACTION_STOP;
          target: "iconify";
          after: "uniconify";
       }
-      program { signal: "e,action,iconify"; source: "e";
+      program {
+         signal: "e,action,iconify"; source: "e";
          action: ACTION_STOP;
          target: "uniconify";
          after: "iconify";
       }
-      program { signal: "e,state,urgent"; source: "e";
+      program { name: "urgent";
+         signal: "e,state,urgent"; source: "e";
          action: ACTION_STOP;
          target: "go_big";
          target: "go_big2";
@@ -429,11 +510,12 @@ group { "e/deskmirror/frame/borderless";
       }
       program { name: "go_big2";
          action: STATE_SET "urgent2" 0.0;
-         transition: LINEAR 0.5 USE_DURATION_FACTOR 1;
+         transition: LINEAR 0.5;
          target: "clone";
          after: "go_big";
       }
-      program { signal: "e,state,not_urgent"; source: "e";
+      program { name: "not_urgent";
+         signal: "e,state,not_urgent"; source: "e";
          action: ACTION_STOP;
          target: "go_big";
          target: "go_big2";
@@ -441,7 +523,7 @@ group { "e/deskmirror/frame/borderless";
       }
       program { name: "go_hid";
          action: STATE_SET "default" 0.0;
-         transition: LINEAR 0.5 USE_DURATION_FACTOR 1;
+         transition: LINEAR 0.5;
          target: "clone";
       }
    }

data/elementary/themes/edc/deskpreview.edc

@@ -1,10 +1,16 @@
 group { name: "e/widgets/deskpreview/desk";
    inherit: "e/widgets/preview";
    parts {
-      part { name: "e.event.menu"; type: RECT;
-         insert_after: "e.swallow.content";
+      part { name: "e.swallow.content";
          description { state: "default" 0.0;
-            color: 0 0 0 0; // no cc
+            rel1.offset: 3 3;
+            rel2.offset: -4 -4;
+         }
+      }
+      part { name: "e.event.menu"; type: RECT;
+         insert_after: "inset";
+         description { state: "default" 0.0;
+            color: 0 0 0 0;
          }
       }
    }

data/elementary/themes/edc/dialog.edc

@@ -1,43 +1,51 @@
 group { name: "e/widgets/dialog/main";
+   images.image: "bevel_dark_out.png" COMP;
+   images.image: "separator_horiz.png" COMP;
    parts {
       part { name: "base"; type: RECT;
          description { state: "default" 0.0;
-            color_class: "/bg/normal/background";
+            color_class: "dialog_base";
+            color: 64 64 64 255;
          }
       }
-      part { name: "separator"; type: RECT; mouse_events: 0;
-         scale:  1;
+      part { name: "bevel";
          description { state: "default" 0.0;
-            min: 16 1;
-            max: 99999 1;
+            image.normal: "bevel_dark_out.png";
+            image.border: 1 1 1 1;
+            image.middle: 0;
+            fill.smooth: 0;
+         }
+      }
+      part { name: "separator"; mouse_events: 0;
+         description { state: "default" 0.0;
+            min: 16 2;
+            max: 99999 2;
             rel1.relative: 0.0 1.0;
             rel1.offset: 0 0;
             rel1.to_y: "e.swallow.content";
             rel2.relative: 1.0 0.0;
             rel2.offset: -1 -1;
             rel2.to_y: "e.swallow.buttons";
-            color_class: "/fg/normal/separator/horizontal";
+            image.normal: "separator_horiz.png";
+            fill.smooth: 0;
             fixed: 0 1;
             link.base: "e,state,buttons,on" "e";
-            visible: 1;
          }
          desc { "hid"; hid;
-            visible: 0;
+            image.normal: "separator_horiz.png";
             link.base: "e,state,buttons,off" "e";
          }
       }
       part { name: "e.swallow.icon"; type: SWALLOW;
-         scale: 1;
          description { state: "default" 0.0;
             align: 0.0 0.5;
             rel1.relative: 0.0 0.0;
-            rel1.offset: 8 8;
+            rel1.offset: 4 4;
             rel2.relative: 0.0 1.0;
             rel2.offset: -1 0;
             rel2.to_y: "button_spacer";
             fixed: 1 0;
             visible: 0;
-            offscale;
          }
          description { state: "icon" 0.0;
             inherit: "default" 0.0;
@@ -45,14 +53,12 @@ group { name: "e/widgets/dialog/main";
          }
       }
       part { name: "e.swallow.content"; type: SWALLOW;
-         scale: 1;
          description { state: "default" 0.0;
-            rel1.offset: 8 8;
+            rel1.offset: 4 4;
             rel1.to_x: "base";
             rel2.to_x: "base";
-            rel2.offset: -9 -1;
+            rel2.offset: -5 -1;
             rel2.to_y: "button_spacer";
-            offscale;
          }
          description { state: "icon" 0.0;
             inherit: "default" 0.0;
@@ -61,13 +67,11 @@ group { name: "e/widgets/dialog/main";
          }
       }
       spacer { "button_spacer";
-         scale: 1;
          desc {
             rel2.relative: 1.0 0.0;
-            rel2.offset: -9 -17;
+            rel2.offset: -5 -8;
             rel2.to_y: "e.swallow.buttons";
             link.base: "e,state,buttons,on" "e";
-            offscale;
          }
          desc { "hid";
             link.base: "e,state,buttons,off" "e";
@@ -75,26 +79,26 @@ group { name: "e/widgets/dialog/main";
          }
       }
       part { name: "e.swallow.buttons"; type: SWALLOW;
-         scale: 1;
          description { state: "default" 0.0;
             align: 0.5 1.0;
             rel1.relative: 0.0 1.0;
-            rel1.offset: 8 -9;
+            rel1.offset: 4 -5;
             rel2.relative: 1.0 1.0;
-            rel2.offset: -9 -9;
+            rel2.offset: -5 -5;
             fixed: 0 1;
-            offscale;
          }
          desc { "hid"; hid; }
       }
    }
    programs {
-      program { signal: "e,icon,enabled"; source: "e";
+      program {
+         signal: "e,icon,enabled"; source: "e";
          action: STATE_SET "icon" 0.0;
          target: "e.swallow.icon";
          target: "e.swallow.content";
       }
-      program { signal: "e,icon,disabled"; source: "e";
+      program {
+         signal: "e,icon,disabled"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "e.swallow.icon";
          target: "e.swallow.content";
@@ -105,7 +109,7 @@ group { name: "e/widgets/dialog/main";
 group { name: "e/widgets/dialog/text";
    styles {
       style { name: "dialog_style";
-         base: "font="FN" font_size=10 text_class=tb_plain align=center color=cc:/fg/normal/text wrap=word";
+         base: "font="FN" font_size=10 text_class=tb_plain align=center color=#ffff style=shadow,bottom shadow_color=#00000080 wrap=word";
          tag: "br" "\n";
          tag: "hilight" "+ font="FNBD" text_class=tb_light";
       }