TO BE REVERTED. JUST FOR FASTER TESTING.

Just a few that I spotted when looking over the code.

.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/asan-ignore-leaks.supp

@@ -0,0 +1,16 @@
+# Evas
+leak:evas_module_find_type
+leak:generic_cache_new
+# Edje / cpplib
+leak:handle_directive
+# Edje_cc
+leak:edje_cc
+leak:_efl_loop_message_handler_message_send
+leak:ecore_ipc_client_add
+# Elm_prefs_cc
+leak:st_collection_page_items_item_label
+leak:st_collection_page_items_item_name
+leak:st_collection_page_items_item_string_placeholder
+leak:st_collection_page_items_item_string_default
+leak:st_collection_page_items_item_string_deny
+leak:ob_collection_page_items_item

.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/ci-build-test.sh

@@ -1,13 +1,13 @@
-#!/bin/bash
+#!/bin/sh
 
 set -e
+. .ci/travis.sh
 
 if [ "$1" = "codecov" ] || [ "$1" = "coverity" ] || [ "$1" = "mingw" ] || [ "$1" = "release-ready" ]; then
   exit 0
 fi
 
-travis_fold start "app-compile-test"
-travis_time_start "app-compile-test"
+travis_fold compile_test compile_test
 if [ "$DISTRO" != "" ] ; then
   docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) .ci/build-example.sh
 elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
@@ -16,5 +16,4 @@ elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
   export PATH="$(brew --prefix gettext)/bin:$PATH"
   .ci/build-example.sh
 fi
-travis_time_finish "app-compile-test"
-travis_fold end "app-compile-test"
+travis_endfold compile_test

.ci/ci-ccache-stats.sh

@@ -1,13 +1,9 @@
-#!/bin/bash
+#!/bin/sh
 
 set -e
 
-travis_fold start "ccache-stats"
-travis_time_start "ccache-stats"
 if [ "$DISTRO" != "" ] ; then
   docker exec $(cat $HOME/cid)  ccache -s
 elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
   ccache -s
 fi
-travis_time_finish "ccache-stats"
-travis_fold end "ccache-stats"

.ci/ci-configure.sh

@@ -1,43 +1,43 @@
-#!/bin/bash
+#!/bin/sh
 
 set -e
+. .ci/travis.sh
 
-travis_fold start "meson"
-travis_time_start "meson"
 if [ "$DISTRO" != "" ] ; then
   # Why do we need to disable the imf loaders here?
   OPTS=" -Decore-imf-loaders-disabler=scim,ibus"
 
-  MONO_LINUX_COPTS=" -Dbindings=cxx,mono -Dmono-beta=true"
+  MONO_LINUX_COPTS=" -Dbindings=luajit,cxx,mono -Dmono-beta=true"
 
   WAYLAND_LINUX_COPTS=" -Dwl=true -Ddrm=true -Dopengl=es-egl -Dwl-deprecated=true -Ddrm-deprecated=true"
 
   # TODO:
   # - No libelogind package in fedora 30 repo
+  # - RPM fusion repo for xine and libvlc
   # - Ibus
   ENABLED_LINUX_COPTS=" -Dfb=true -Dsdl=true -Dbuffer=true -Dbuild-id=travis-build \
   -Ddebug-threads=true -Dglib=true -Dg-mainloop=true -Dxpresent=true -Dxinput22=true \
-  -Decore-imf-loaders-disabler= \
-  -Dharfbuzz=true -Dpixman=true -Dhyphen=true -Defl-one=true \
-  -Dvnc-server=true -Delua=true -Dbindings=lua,cxx,mono -Delogind=false -Dinstall-eo-files=true -Dphysics=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,cxx,mono -Delogind=false -Dinstall-eo-files=true -Dphysics=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-loaders-disabler=gst,pdf,ps,raw,svg,xcf,bmp,dds,eet,generic,gif,ico,jp2k,json,pmaps,psd,tga,tgv,tiff,wbmp,webp,xpm,avif,heif \
-  -Decore-imf-loaders-disabler=xim,ibus,scim \
-  -Dfribidi=false -Dfontconfig=false \
+  -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=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=false -Dnls=false -Dbindings= -Dlua-interpreter=luajit -Dnative-arch-optimization=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,rsvg,avif,heif \
+  -Devas-loaders-disabler=json,pdf,ps,raw,svg,rsvg \
   -Dharfbuzz=true -Dpixman=true -Dembedded-lz4=false "
 
   if [ "$1" = "default" ]; then
@@ -51,35 +51,39 @@ if [ "$DISTRO" != "" ] ; then
   elif [ "$1" = "release-ready" ]; then
     OPTS="$OPTS $RELEASE_READY_LINUX_COPTS"
   elif [ "$1" = "coverity" ]; then
-    travis_fold start "cov-download"
-    travis_time_start "cov-download"
     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_time_finish "cov-download"
-    travis_fold end "cov-download"
+    travis_endfold cov-download
   elif [ "$1" = "mingw" ]; then
-    travis_fold start "cross-native"
-    travis_time_start "cross-native"
     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_time_finish "cross-native"
-    travis_fold end "cross-native"
+    travis_endfold cross-native
   fi
 
   if [ "$1" = "asan" ]; then
+    travis_fold meson meson
     docker exec --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
       --env CXX="ccache g++" --env CFLAGS="-O0 -g" --env CXXFLAGS="-O0 -g" \
       --env LD="ld.gold" $(cat $HOME/cid) sh -c "mkdir build && meson build $OPTS -Db_sanitize=address"
+    travis_endfold meson
   elif [ "$1" = "mingw" ]; then
+    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
 elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
   # Prepare OSX env for build
@@ -91,24 +95,13 @@ elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
   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"
-  #force using system zlib, which doesn't have a pc file provided because that's the smartest thing possible
-  zlib_vers=$(grep ZLIB_VERSION /usr/include/zlib.h|head -n1|awk '{print $3}'|cut -d'"' -f2)
-  sed -iE "s/REPLACE_THIS/$zlib_vers/" .ci/zlib.pc
-  export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig:/usr/local/Cellar/libffi/$LIBFFI_VER/lib/pkgconfig:$(pwd)/.ci"
-  mkdir build && meson build -Dopengl=full -Decore-imf-loaders-disabler=scim,ibus -Dx11=false -Davahi=false -Deeze=false -Dsystemd=false -Dnls=false -Dcocoa=true -Dgstreamer=false -Dbuild-tests=false
-else # Native Ubuntu Linux Travis builds (non-docker)
-  OPTS=" -Decore-imf-loaders-disabler=scim,ibus"
-
-  if [ "$TRAVIS_CPU_ARCH" = "ppc64le" ]; then
-      OPTS="$OPTS -Dbindings="
-  elif [ "$TRAVIS_CPU_ARCH" = "s390x" ] ; then
-      OPTS="$OPTS -Dbindings= -Delua=false -Dlua-interpreter=lua"
-  fi
-  if [ "$1" = "codecov" ]; then
-      OPTS="$OPTS -Db_coverage=true"
-  fi
-  mkdir build && meson build $OPTS
+  travis_fold meson meson
+  mkdir build && meson build -Dopengl=full -Decore-imf-loaders-disabler=scim,ibus -Dx11=false -Davahi=false -Deeze=false -Dsystemd=false -Dnls=false -Dcocoa=true -Demotion-loaders-disabler=gstreamer1,libvlc,xine
+  travis_endfold meson
+else
+  travis_fold meson meson
+  mkdir build && meson build -Decore-imf-loaders-disabler=scim,ibus -Db_coverage=true
+  travis_endfold meson
 fi
-travis_time_finish "meson"
-travis_fold end "meson"

.ci/ci-exactness.sh

@@ -1,16 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if [ "$1" != "exactness" ] ; then
-  exit 0
-fi
-
-travis_fold start "exactness"
-travis_time_start "exactness"
-if [ "$DISTRO" != "" ] ; then
-  docker exec  --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) sh -c 'git -C /exactness-elm-data pull'
-  docker exec  --env EIO_MONITOR_POLL=1 --env LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib:/usr/local/lib64 --env EINA_LOG_LEVELS_GLOB=eina_*:0,ecore*:0,efreet*:0,eldbus:0,elementary:0 $(cat $HOME/cid) exactness -j 20 -b /exactness-elm-data/default-profile -p /exactness-elm-data/default-profile/ci-fedora32-tests.txt
-fi
-travis_time_finish "exactness"
-travis_fold end "exactness"

.ci/ci-make-benchmark.sh

@@ -1,17 +1,15 @@
-#!/bin/bash
+#!/bin/sh
 
 set -e
-
+. .ci/travis.sh
 if [ "$1" != "default" ] ; then
   exit 0
 fi
-travis_fold start "ninja-benchmark"
-travis_time_start "ninja-benchmark"
+travis_fold benchmark "ninja benchmark"
 if [ "$DISTRO" != "" ] ; then
   docker exec --env EIO_MONITOR_POLL=1 --env ELM_ENGINE=buffer $(cat $HOME/cid) ninja benchmark -C build
 elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
   export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
   ninja benchmark -C build
 fi
-travis_time_finish "ninja-benchmark"
-travis_fold end "ninja-benchmark"
+travis_endfold benchmark

.ci/ci-make-check.sh

@@ -1,6 +1,7 @@
-#!/bin/bash
+#!/bin/sh
 
 set -e
+. .ci/travis.sh
 
 if [ "$1" = "release-ready" ] || [ "$1" = "mingw" ] || [ "$1" = "coverity" ] || [ "$1" = "options-enabled" ] || [ "$1" = "options-disabled" ] ; then
   exit 0
@@ -9,33 +10,35 @@ fi
 NUM_TRIES=5
 
 if [ "$1" = "codecov" ] ; then
-  travis_fold start "codecov"
-  travis_time_start "codecov"
   for tries in $(seq 1 ${NUM_TRIES}); do
-    export EFL_TEST_ECORE_CON_IPV6=1
     meson test -t 120 -C build --wrapper dbus-launch && break
     cat build/meson-logs/testlog-dbus-launch.txt
     if [ $tries != ${NUM_TRIES} ] ; then echo "tests failed, trying again!" ; fi
       false
   done
   curl -s https://codecov.io/bash | bash -s -
-  travis_time_finish "codecov"
-  travis_fold end "codecov"
   exit 0
 fi
 
-travis_fold start "ninja-test"
-travis_time_start "ninja-test"
+travis_fold check "ninja test"
 if [ "$DISTRO" != "" ] ; 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
+    if [ "$1" = "asan" ]; then
+      (docker exec --env EINA_LOG_BACKTRACE="0" --env EIO_MONITOR_POLL=1 --env ASAN_OPTIONS=detect_leaks=0:abort_on_error=0 $(cat $HOME/cid) meson test -t 120 -C build --wrapper dbus-launch) && break
+    else
+      (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
+    fi
     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
+  if [ "$1" = "exactness" ] ; then
+    docker exec  --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) sh -c 'cd /; git clone https://git.enlightenment.org/tools/exactness-elm-data.git' # How should we cache this?
+    docker exec  --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) sh -c 'cd /exactness-elm-data; git checkout origin/devs/stefan/init-shots-docker-travis-ci -b docker'
+    docker exec  --env EIO_MONITOR_POLL=1 --env LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib:/usr/local/lib64 --env EINA_LOG_LEVELS_GLOB=eina_*:0,ecore*:0,efreet*:0,eldbus:0,elementary:0 $(cat $HOME/cid) exactness -j 20 -b /exactness-elm-data/default-profile -p /exactness-elm-data/default-profile/tests.txt
+  fi
 fi
 ret=$?
-travis_time_finish "ninja-test"
-travis_fold end "ninja-test"
+travis_endfold check
 
 exit $ret

.ci/ci-make-distcheck.sh

@@ -1,13 +1,13 @@
-#!/bin/bash
+#!/bin/sh
 
 set -e
+. .ci/travis.sh
 
 if [ "$1" != "release-ready" ] ; then
   exit 0
 fi
 
-travis_fold start "ninja-dist"
-travis_time_start "ninja-dist"
+travis_fold distcheck "ninja dist"
 if [ "$DISTRO" != "" ] ; then
   docker exec --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
     --env CXX="ccache g++" \
@@ -18,5 +18,4 @@ elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
   export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
   ninja -C build dist
 fi
-travis_time_finish "ninja-dist"
-travis_fold end "ninja-dist"
+travis_endfold distcheck

.ci/ci-make-install.sh

@@ -1,13 +1,17 @@
-#!/bin/bash
+#!/bin/sh
 
 set -e
+. .ci/travis.sh
 
 if [ "$1" = "release-ready" ] || [ "$1" = "coverity" ] ; then
   exit 0
 fi
 
-travis_fold start "ninja-install"
-travis_time_start "ninja-install"
+travis_fold install "ninja install"
+if [ "$1" = "asan" ]; then
+  docker exec --env EIO_MONITOR_POLL=1 --env ASAN_OPTIONS=abort_on_error=0 --env LSAN_OPTIONS=suppressions=/src/.ci/asan-ignore-leaks.supp $(cat $HOME/cid) ninja -C build install
+  exit $?
+fi
 if [ "$DISTRO" != "" ] ; then
   docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) ninja -C build install
 elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
@@ -16,5 +20,4 @@ elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
 else
   sudo ninja -C build install
 fi
-travis_time_finish "ninja-install"
-travis_fold end "ninja-install"
+travis_endfold install

.ci/ci-make.sh

@@ -1,13 +1,18 @@
-#!/bin/bash
+#!/bin/sh
 
 set -e
+. .ci/travis.sh
 
 if [ "$1" = "release-ready" ] ; then
   exit 0
 fi
 
-travis_fold start "ninja"
-travis_time_start "ninja"
+travis_fold ninja ninja
+if [ "$1" = "asan" ]; then
+  docker exec --env EIO_MONITOR_POLL=1 --env ASAN_OPTIONS=abort_on_error=0 --env LSAN_OPTIONS=suppressions=/src/.ci/asan-ignore-leaks.supp $(cat $HOME/cid) ninja -C build
+  exit $?
+fi
+
 if [ "$DISTRO" != "" ] ; then
   if [ "$1" = "coverity" ] ; then
     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"
@@ -15,17 +20,11 @@ if [ "$DISTRO" != "" ] ; then
     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
-    if [ "$1" = "options-enabled" ]; then # we have efl-one on and want to check it after build
-      docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) python scripts/test-efl-one.py build
-    fi
   fi
 elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
-  latest_brew_python3_bin="$(ls -1d /usr/local/Cellar/python/3.*/bin | sort -n | tail -n1)"
-  export PATH="${latest_brew_python3_bin}${PATH:+:}${PATH}"
   export PATH="$(brew --prefix gettext)/bin:$PATH"
   ninja -C build
 else
   ninja -C build
 fi
-travis_time_finish "ninja"
-travis_fold end "ninja"
+travis_endfold ninja

.ci/ci-setup-ccache.sh

@@ -1,9 +1,7 @@
-#!/bin/bash
+#!/bin/sh
 
 set -e
 
-travis_fold start "ccache-setup"
-travis_time_start "ccache-setup"
 if [ "$DISTRO" != "" ] ; then
   docker exec $(cat $HOME/cid)  sh -c ".ci/docker-ccache-setup.sh $1"
   docker exec $(cat $HOME/cid)  ccache -pz
@@ -13,5 +11,3 @@ elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
   echo "base_dir = $pwd" >> ~/.ccache/ccache.conf
   ccache -pz
 fi
-travis_time_finish "ccache-setup"
-travis_fold end "ccache-setup"

.ci/docker-ccache-setup.sh

@@ -4,5 +4,10 @@ CI_BUILD_TYPE="$1"
 
 cp .ci/ccache.conf ~/.ccache
 
-sed -iE '/^base_dir/d' ~/.ccache/ccache.conf
-echo "base_dir = $pwd" >> ~/.ccache/ccache.conf
+if [ "$1" = "release-ready" ] ; then
+  sed -iE '/^base_dir/d' ~/.ccache/ccache.conf
+  echo "base_dir = $(pwd)/$(grep '^PACKAGE_STRING' config.log|cut -d\' -f2|tr ' ' -)" >> ~/.ccache/ccache.conf
+else
+  sed -iE '/^base_dir/d' ~/.ccache/ccache.conf
+  echo "base_dir = $pwd" >> ~/.ccache/ccache.conf
+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
+}

.ci/ubuntu-bionic-install-deps.sh

@@ -1,19 +1,4 @@
-#!/bin/bash
-
-set -e
-
-travis_fold start "bionic-deps"
-travis_time_start "bionic-deps"
-
+#!/bin/sh
 sudo apt-get update -y
-sudo apt-get install -y build-essential autoconf automake autopoint doxygen check libharfbuzz-dev libpng-dev libudev-dev libwebp-dev libssl-dev libfribidi-dev libcogl-gles2-dev libgif-dev libtiff5-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libdbus-1-dev libmount-dev libblkid-dev libpulse-dev libxrandr-dev libxtst-dev libxcursor-dev libxcomposite-dev libxinerama-dev libxkbfile-dev libbullet-dev libsndfile1-dev libraw-dev libspectre-dev libpoppler-cpp-dev libpam0g-dev liblz4-dev faenza-icon-theme gettext git imagemagick libasound2-dev libbluetooth-dev libfontconfig1-dev libfreetype6-dev libibus-1.0-dev libiconv-hook-dev libjpeg-dev libjpeg-turbo8-dev libpoppler-dev libpoppler-private-dev libproxy-dev librsvg2-dev libscim-dev libsystemd-dev libtool libudisks2-dev libunibreak-dev libxcb-keysyms1-dev libxss-dev linux-tools-common libcurl4-openssl-dev systemd ccache git binutils-gold python3-pip ninja-build dbus-x11 libavahi-client-dev python3-setuptools libopenjp2-7-dev libc6-dev libpcre3-dev
-# s390x on Ubuntu Bionic on Travis does not have a luajit package and fails install, use lua5.1
-if [ "$TRAVIS_CPU_ARCH" = "s390x" ] ; then
-  sudo apt-get install -y liblua5.1-dev
-else
-  sudo apt-get install -y luajit libluajit-5.1-dev
-fi
-sudo pip3 install meson==0.54.3
-
-travis_time_finish "bionic-deps"
-travis_fold end "bionic-deps"
+sudo apt-get install -y build-essential autoconf automake autopoint doxygen check luajit libharfbuzz-dev libpng-dev libudev-dev libwebp-dev libssl-dev libluajit-5.1-dev libfribidi-dev libcogl-gles2-dev libgif-dev libtiff5-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libdbus-1-dev libmount-dev libblkid-dev libpulse-dev libxrandr-dev libxtst-dev libxcursor-dev libxcomposite-dev libxinerama-dev libxkbfile-dev libbullet-dev libvlc-dev libsndfile1-dev libraw-dev libspectre-dev libpoppler-cpp-dev libpam0g-dev liblz4-dev faenza-icon-theme gettext git imagemagick libasound2-dev libbluetooth-dev libfontconfig1-dev libfreetype6-dev libibus-1.0-dev libiconv-hook-dev libjpeg-dev libjpeg-turbo8-dev libpoppler-dev libpoppler-private-dev libproxy-dev librsvg2-dev libscim-dev libsystemd-dev libtool libudisks2-dev libunibreak-dev libxcb-keysyms1-dev libxine2-dev libxss-dev linux-tools-common libcurl4-openssl-dev systemd ccache git binutils-gold python3-pip ninja-build dbus-x11 libavahi-client-dev python3-setuptools
+pip3 install meson

.ci/zlib.pc

@@ -1,13 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib64
-sharedlibdir=${libdir}
-includedir=/usr/include
-
-Name: zlib
-Description: zlib compression library
-Version: REPLACE_THIS
-
-Requires:
-Libs: -L${libdir} -L${sharedlibdir} -lz
-Cflags: -I${includedir}

.mailmap

@@ -21,16 +21,16 @@ 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>

.travis.yml

@@ -7,7 +7,7 @@ cache:
     - $HOME/.ccache
 dist: bionic
 
-osx_image: xcode11.3
+osx_image: xcode10.2
 
 addons:
   homebrew:
@@ -36,7 +36,6 @@ addons:
       - ninja
       - python3
       - libffi
-    update: true
 
 env:
   global:
@@ -46,34 +45,37 @@ env:
 
 jobs:
   include:
+    - os: osx
     - os: linux
-      env: DISTRO=Fedora32-mingw CI_BUILD_TYPE=mingw
+      env: DISTRO=Fedora31-mingw CI_BUILD_TYPE=mingw
     - os: linux
-      env: DISTRO=Fedora32 CI_BUILD_TYPE=options-enabled
+      env: DISTRO=Fedora31 CI_BUILD_TYPE=exactness
     - os: linux
-      env: DISTRO=Fedora32 CI_BUILD_TYPE=options-disabled
+      env: DISTRO=Fedora31 CI_BUILD_TYPE=options-enabled
     - os: linux
-      env: DISTRO=Fedora32 CI_BUILD_TYPE=wayland
+      env: DISTRO=Fedora31 CI_BUILD_TYPE=options-disabled
     - os: linux
-      env: DISTRO=Fedora32 CI_BUILD_TYPE=default
+      env: DISTRO=Fedora31 CI_BUILD_TYPE=wayland
+    - os: linux
+      env: DISTRO=Fedora31 CI_BUILD_TYPE=default
     - os: linux
       if: type = cron
-      env: DISTRO=Fedora32 CI_BUILD_TYPE=release-ready
+      env: DISTRO=Fedora31 CI_BUILD_TYPE=release-ready
     - os: linux
       if: type = cron
-      env: DISTRO=Ubuntu2004
+      env: DISTRO=Ubuntu1804
     - os: linux
       if: type = cron
       env: DISTRO=Ubuntu1910
     - os: linux
       if: type = cron
-      env: DISTRO=Debian103
+      env: DISTRO=Debian96
     - os: linux
       if: type = cron
       env: DISTRO=Fedora31 CI_BUILD_TYPE=coverity
     - os: linux
       if: type = cron
-      env: DISTRO=Fedora32 CI_BUILD_TYPE=asan
+      env: DISTRO=Fedora31 CI_BUILD_TYPE=asan
     - os: linux
       if: type = cron
       env: CI_BUILD_TYPE=codecov
@@ -81,23 +83,11 @@ jobs:
       if: type = cron
       arch: arm64
       env: CI_BUILD_TYPE=default
-    - os: linux
-      if: type = cron
-      arch: ppc64le
-      env: CI_BUILD_TYPE=no-bindings
-    - os: linux
-      if: type = cron
-      arch: s390x
-      env: CI_BUILD_TYPE=no-bindings
 
 services:
   - docker
 
 before_install:
-  - export -f travis_nanoseconds
-  - export -f travis_fold
-  - export -f travis_time_start
-  - export -f travis_time_finish
   - |
       if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
         rm -rf $HOME/Library/Caches/Homebrew
@@ -126,7 +116,6 @@ script:
   - .ci/ci-make-install.sh "$CI_BUILD_TYPE"
   - .ci/ci-make-benchmark.sh "$CI_BUILD_TYPE"
   - .ci/ci-make-check.sh "$CI_BUILD_TYPE"
-  - .ci/ci-exactness.sh "$CI_BUILD_TYPE"
   - .ci/ci-make-distcheck.sh "$CI_BUILD_TYPE"
   - .ci/ci-build-test.sh "$CI_BUILD_TYPE"
 
@@ -139,15 +128,3 @@ before_cache:
        else
          mv $HOME/Library/Caches/Homebrew $HOME/cachedir/Homebrew
        fi
-
-notifications:
-  irc:
-    channels:
-      - "chat.freenode.net#edevelop"
-    on_success: change
-    on_failure: always
-    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}"

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,6 +35,7 @@ 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

NEWS

@@ -1,152 +1,17 @@
 ==========
-EFL 1.25.0
+EFL 1.23.0
 ==========
 
-Changes since 1.24.0:
----------------------
-
-Features:
-
-   * ecore-drm2: Add support for using page_flip_handler2
-   * ecore-drm2: Add API function to return default depth
-
-Fixes:
-
-   * ecore_evas: only define these eina errors once
-   * exactness: remove no longer needed _evas_new()
-   * edje - don't set font sizes less than 1
-   * ecore_evas_x - fix maximize/unmaximize request corner case
-   * exactness_player: do not test for delay_ms
-   * evas + gl - fix callback-to-app-changes-state issue with pixel data
-   * canvas render: don't apply mask if the objects in the map.
-   * evas_object_textblock: fix to free style properly by edje's style_user_pop
-   * evas_vg_shape: return NULL in evas_vg_shape_add when the parent of shape is NULL
-   * efl_ui_image: fix to call "clicked" smart callback when there is no img
-   * ecore-x - ensure we fully look at all xkb events and refresh all binds
-   * evas_vg_container: return NULL in evas_vg_container_add when the parent of container is NULL
-   * ecore thread - feedback threads should not be background threads...
-   * ecore_evas_wayland_common: keep the backword compatibility for wayland dnd handler
-   * edje: fix animation memory leak.
-   * canvas vg: fix dangling vector containers.
-   * evas vg: clean up dangling instances
-   * canvas vg: fix vector file data memory leak.
-   * evas - csd and wl csd - fix alpha zeroing to avoid framespace junk
-   * efl gfx_path: fix memory leak.
-   * evas - genetic update regions smart merge - merge v adjacent regions
-   * efreet - handle runtime relocation right with default XDG_DATA_DIRS
-   * efl_ui_image: fixed elm_image_preload_disabled_set api is not working when it is called before file set
-   * elm_image: keep backword compatibility for elm_image_file_set API when setting url file set twice
-   * efreetd - cache - add more statinfo work around 0 mtime distros
-   * elm_code: on newline ensure line number visible. (T2798)
-   * elm_code: cursor visbility fix.
-   * edje - fix edje_cc mis-re-iding images in image sets
-   * efl_ui_image: remove the unnecessary code in efl_file_unload
-   * win - x io errors really just have to exit, so call the iorr cb + exit
-   * evas - render - dont crash is private data is null
-   * eina vpath - fix windows ~username handling to only error when used
-   * efl ui image - fix scal to fill - broken with non-rect src images
-   * embryo: fix a integer(cell) overflow problem
-   * elput - support libelogind.so.0 as well as libelogind-shared.so.0
-   * edje - calce - really respect max image size for img sets
-   * ecore - don't do anything with heap between fork and exec
-   * evas - fix deadlock with sw async rendering calling cbs in post flush
-   * ecore con - curl - fix error map to map right enum
-   * eina - statgen (stat generation) - fix enable api to actually enable
-   * evas - image cache - fix loading with skip head on to load changed files
-   * evas_textblock: remove style padding from native width and formatted height
-   * elm icon/thumb - fix handling of a wider range of video extns
-   * edje - calc - handle swallow disappearing mid-calc due to callabcks
-   * ecore drm - increase timeout for flips from 0.05 to 2.0 sec
-   * docs: Correct the mismatched group name in Evas.
-   * elm - toolbar - use correct theme icon for more items
-
 Changes since 1.23.0:
 ---------------------
 
-Features:
-
-   * eina: add comparison macros for Eina_Size2D and Eina_Position2D
-   * ecore-wl2: Add API to find a window by surface
-   * ecore-wl2: Add API to find a connected display given a name
-   * ecore-wl2: Add API to return the compositor object from a given display
-   * ecore-wl2: Add API to return window type
-   * ecore-wl2: Add API to find a window by given surface
-   * edje: Add text change signal
-   * edje: add json file support feature
-
-Fixes:
-
-   * efl_ui/bg: unset finger_size multiplier during construction (T8304)
-   * elementary: always use a font that matches our expectation for our test instead of the system one. (T8277)
-   * doc: improve colorselector preview (T8304)
-   * eldbus: properly call parent finalize during creation of Eldbus.Model_Method.
-   * efl_ui/win: fix max size hint eval (T8304)
-   * eet - fix loading eet files that do not have dicts (T8368)
-   * evas/callbacks: emit hardcoded legacy smart callbacks always
-   * elm/layout: add some workarounds to try handling legacy min sizes
-   * ecore_evas/wl2 0 fux xdg close cb for window when it's closed remotely
-   * wl egl - use platform get display
-   * ecore-evas-wayland: Add handler to array
-   * ecore_evas_wayland: Fix array step size
-   * efl/timer: correctly handle recursion for timer processing
-   * elm/genlist: trigger filter,done callback immediately if no filter queue exists
-   * elm/genlist: fix "drag" smart callback
-   * elm/genlist: set pan need recalc during item move on item position change
-   * elm/genlist: fix item focus unregister on item move
-   * ecore/timer: correctly handle recursive deletion of legacy timers
-   * ecore-drm2: Fix issue of shifting 1 by more than 32bits
-   * efreet - consider ctime changes as changes too
-   * edje - box - calc min size correctly at start ...
-   * vector svg: apply fill-opacity to graidents fill objects.
-   * evas vector: initialize data member properly.
-   * fix jpeg loading which freed the wrong ptr (T8497)
-   * fix the wrong method signature for evas_textgrid
-   * efl_ui/layout: fix multiple emissions of theme,changed during construction
-   * ui image: fix scale_method expand behavior.
-   * ecore-x - fix fallbacks to use capital X in lib name (T8543)
-   * elm - widget - actually check object smart data return for no data
-   * canvas vector: fix to refresh svg file of vector object.
-   * evas - fix access-after-free where during destroy hash item not cleared
-   * elm - fix filesel deferred unref to not crash
-   * ecore_con - freebsd bind blocking workaround
-   * elm win + ecore evas - fix csd stuff like base size and min sizing
-   * evas - fix access-after-free number 2 (T8534)
-   * elm win - fix client side move/resize req handling csd in x
-   * edje - store original size in edje struct and dont exceed max size
-   * evas - loaders - jp2k - re-enable in the build after it was lost
-   * edje_entry: Add matching tag.
-   * evas/events: fix multi-touch object targeting on touch down events
-   * eo - fix - fix alignment of eo object class structs - it was wrong
-   * canvas font: correct wrong masking length.
-   * Efl.Gfx.Path: Fix condition of for loop in current search
-   * canvas mask: fix incorrect render surface size.
-   * canvas proxy: fix broken proxy source clipping function.
-   * evas gl: clip rect with proper size.
-   * canvas proxy: fix a missing case that proxy not updated properly.
-   * evas_object_box: respect static clipper.
-   * ecore evas x - on argb dont create unused 1 bit pixmap masks
-   * emotion - webcam - fix segv on webcam plug/unplug and clean
-   * ui textpath: update map before rendering begins.
-   * elm icon/image efl ui image - respect aspect hints at all if set
-   * elm icon/image efl ui image - respect aspect hints at all if set
-   * elm_cnp: fix memory leaks
-   * elm menu - fix segv on deletion/shutdown where parent was not done ok
-   * canvas svg: fix memory leak.
-   * ecore_wl2: EFL Wayland Build on FreeBSD (T8659)
-   * ecore_file - address issue about false positive of finding a file in ./ (T8678)
-   * evas gl - shader cache was needless losing and overwriting
-   * efreet - work around conconforming apps putting startupwmclass in quotes
-   * ecore-evas-drm: Fix broken init count
-
 Removals:
 
    * emotion & evas: remove gstreamer 0.10 support
-   * emotion: remove xine and vlc support
    * escape: remove library from tree
    * ecore_x: remove support XGesture extension
    * elocation: remove beta library
    * eeze: remove tizen module support from eeze sensor
-   * evas3d: remove support for evas 3D which was a beta all along
 
 Changes since 1.22.0:
 ---------------------
@@ -4585,7 +4450,7 @@ Fixes:
    * ecore-drm: Send proper keycode to ecore key event, and remove erroneous variable.
    * edje/Edje_Edit: _edje_edit_real_part_add init field of Edje_Real_part
    * fix ecore_con_url using 100% cpu and just let fd handler do work (T1251)
-   * fix behavior of edje entry to match other toolkit entries (T1229)
+   * fix behavior of edje entry to match other toolkit entires (T1229)
    * fix ecore_thread_global_data_wait to work when no data exists yet
    * Eo: Fix deref after free. (CID1039898)
    * evas/render - fix segfault because of null cow access. (T1252)

README

@@ -31,9 +31,8 @@ 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 MSYS2 + mingw-w64 - please see
-https://phab.enlightenment.org/w/windows/), Mac OS X, FreeBSD and
-NetBSD.
+compiled and run also on Windows (using MINGW32 - please see
+http://www.winbuilds.org ), Mac OS X, FreeBSD and NetBSD.
 
 COMPONENTS
 ----------
@@ -198,6 +197,15 @@ 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//
@@ -320,11 +328,15 @@ runtime library being refactored to be extremely small.
 
 //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.
+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.
 
 
 
@@ -349,8 +361,7 @@ pointers to be indirect table lookups for increased safety at runtime.
 
 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.
+their behavior as if they were real physical objects.
 
 
 
@@ -393,27 +404,14 @@ implementations that are fast and accurate.
 //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.
+libc calls not in Mingw32 that EFL needs.
 
 
-**Heif:**
-
-//LGPL v3 license//
-
-The license doesnt affect efl or apps using efl, but gpl3 or lgpl3
-affects the entire os requiring any gpl/lgpl3 component be
-user-replacable.
-The end user must be able to modify the libheif code and still be
-able to use the efl.
 
 
 COMPILING AND INSTALLING
 ------------------------
 
-For sample configuration options please look in the ./confs/ directory
-for scripts that pass in commonly used options.
-
 See the INSTALL file: https://git.enlightenment.org/core/efl.git/tree/INSTALL
 
 
@@ -425,9 +423,9 @@ to C++ libraries like Bullet and our C++ bindings.
 
 Required by default:
 
+  * bullet
   * libpng
   * libjpeg
-  * openjpeg2
   * gstreamer (Ensure all codecs you want are installed.)
   * zlib
   * luajit (lua 5.1 or 5.2 support optional)
@@ -439,7 +437,6 @@ Required by default:
   * fontconfig
   * freetype2
   * fribidi
-  * harfbuzz
   * libpulse
   * libsndfile
   * libx11
@@ -455,9 +452,10 @@ Required by default:
   * libxss
   * libxtst
   * libxcursor
+  * libxp
   * 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
+  * giflib
   * util-linux (limbount + libblkid)
   * systemd / libudev
   * poppler / poppler-cpp
@@ -465,7 +463,11 @@ Required by default:
   * libspectre
   * librsvg
   * openmp (clang needs libomp, while gcc uses libgomp)
-  * libwebp
+
+You might want webp support so disable fewer loaders and remove webp
+from the disablers with:
+
+    -Devas-loaders-disabler=json
 
 Wayland support:
 

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,6 +0,0 @@
-#!/bin/sh -e
-meson -Dsystemd=false -Dv4l2=false -Davahi=false -Deeze=false -Dx11=false \
--Dopengl=full -Dcocoa=true -Dnls=false \
--Demotion-loaders-disabler=gstreamer1,libvlc,xine \
--Decore-imf-loaders-disabler=scim,ibus \
- $@ . build

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,5 +1,5 @@
 group "Elm_Config" struct {
-  value "config_version" int: 131096;
+  value "config_version" int: 131094;
   value "entry_select_allow" uchar: 1;
   value "engine" string: "";
   value "vsync" uchar: 0;
@@ -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;
@@ -3275,54 +3275,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/mobile/base.src.in

@@ -1,5 +1,5 @@
 group "Elm_Config" struct {
-  value "config_version" int: 131096;
+  value "config_version" int: 131094;
   value "entry_select_allow" uchar: 1;
   value "engine" string: "";
   value "vsync" uchar: 0;
@@ -9,9 +9,6 @@ group "Elm_Config" struct {
   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";
@@ -3264,54 +3261,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,5 +1,5 @@
 group "Elm_Config" struct {
-  value "config_version" int: 131096;
+  value "config_version" int: 131094;
   value "entry_select_allow" uchar: 1;
   value "engine" string: "";
   value "vsync" uchar: 0;
@@ -9,9 +9,6 @@ group "Elm_Config" struct {
   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;
@@ -3261,54 +3258,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/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,11 @@ collections {
 #include "edc/efl/calendar.edc"
 #include "edc/efl/navigation_bar.edc"
 #include "edc/efl/navigation_layout.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"
@@ -184,6 +197,7 @@ collections {
 #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"

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,12 +318,12 @@ 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";
          }
       }
       part { name: "e.swallow.content"; type: SWALLOW;
@@ -276,65 +335,83 @@ group { name: "e/comp/frame/default";
       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";
+      program {
+         name: "focus_on";
+         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";
+         transition: SINUSOIDAL 0.1;
+         targets: "glow" "focus-clipper";
+         sequence {
+             action: STATE_SET "default" 0.0;
+             transition: SINUSOIDAL 0.4;
+             target: "glow";
+         }
       }
-      program { signal: "e,state,unfocused"; source: "e";
+      program {
+         name: "focus_off";
+         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";
+         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";
          }
@@ -342,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";
@@ -353,12 +430,10 @@ 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: "e.swallow.content";
@@ -384,21 +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;
+      }
+   }
+}
+
+group { name: "e/comp/frame/rotate/fast";
+   inherit: "e/comp/frame/rotate";
+   programs {
+      program { name: "focus3";
+         transition: LINEAR 0;
+      }
+      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";
@@ -423,12 +511,67 @@ group { name: "e/comp/frame/flip";
    }
 }
 
+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";
-   alias: "e/comp/frame/popup/fast"; // legacy
    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: "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;
+         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: "";
          }
       }
    }
@@ -442,17 +585,18 @@ 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: "shower";
@@ -464,35 +608,69 @@ group { name: "e/comp/frame/still";
    }
 }
 
-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;
+group { name: "e/comp/frame/still/fast";
+   inherit: "e/comp/frame/default/fast";
    parts {
-      part { name: "focus-shadow"; type: RECT;
+      part { name: "shower";
          description { state: "default" 0.0;
-            color_class: "/shadow/selected/comp/win";
+            rel1.relative: 0.0 0.0;
+            rel2.relative: 1.0 1.0;
+         }
+      }
+   }
+}
+
+group { name: "e/comp/frame/menu";
+   inherit: "e/comp/frame/popup";
+   images.image: "win_menu_shadow.png" COMP;
+   parts {
+      part { name: "shadow";
+         description { state: "default" 0.0;
+            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: "shadow";
-         description { state: "hidden" 0.0;
-            visible: 1;
+      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/everything/fast";
+   inherit: "e/comp/frame/popup/fast";
+   parts {
       part { name: "shower";
          description { state: "default" 0.0;
             rel1.relative: -0.3 -0.3;
@@ -503,7 +681,6 @@ group { name: "e/comp/frame/everything";
 }
 
 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 {
@@ -513,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;
          }
       }
@@ -538,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;
          }
       }
@@ -581,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,37 +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 { 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";
+            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;
          }
       }
@@ -39,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";
@@ -59,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;
@@ -90,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;
@@ -102,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;
@@ -110,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;
@@ -123,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;
@@ -133,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;
@@ -155,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";
       }
@@ -257,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";
@@ -351,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;
@@ -361,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;
@@ -414,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";
       }

data/elementary/themes/edc/edgebindings.edc

@@ -1,11 +1,19 @@
 group { name: "e/modules/conf_edgebindings/selection";
+   images.image: "inset_shadow.png" COMP;
+   images.image: "bevel_in.png" COMP;
+   images.image: "dot_pattern.png" COMP;
+   images.image: "darken_square.png" COMP;
+   images.image: "downlight_glow.png" COMP;
+   images.image: "downlight_glow_left.png" COMP;
+   images.image: "downlight_glow_right.png" COMP;
+   images.image: "downlight_glow_up.png" COMP;
    images.image: "mini_blue_glow_arrow_0.png" COMP;
    images.image: "mini_blue_glow_arrow_1.png" COMP;
    images.image: "mini_blue_glow_arrow_2.png" COMP;
    images.image: "mini_blue_glow_arrow_3.png" COMP;
    styles {
       style { name: "edge_binding_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";
       }
@@ -13,132 +21,167 @@ group { name: "e/modules/conf_edgebindings/selection";
    parts {
       part { name: "bg"; type: RECT;
          description { state: "default" 0.0;
-            rel.to: "e.swallow.background";
-            color_class: "/bg-dark/normal/edgebindings";
+            rel1.to: "e.swallow.background";
+            rel2.to: "e.swallow.background";
+            color: 48 48 48 255;
          }
       }
-      part { name: "e.swallow.background"; type: SWALLOW;
-         scale: 1;
+      part { name: "pat";
          description { state: "default" 0.0;
-            min: 320 180;
+            rel1.to: "bg";
+            rel2.to: "bg";
+            image.normal: "dot_pattern.png";
+            TILED_PATTERN(256, 256)
+         }
+      }
+      part { name: "e.swallow.background";
+         type: SWALLOW;
+         description { state: "default" 0.0;
+            min: 160 120;
             align: 0 0.5;
-            rel1.offset: 2 2;
+            rel1.offset: 4 4;
             rel2.relative: 0.5 1.0;
-            rel2.offset: -3 -3;
-            offscale;
+            rel2.offset: -2 -5;
+         }
+      }
+      part { name: "bevel"; mouse_events: 0;
+         description { state: "default" 0.0;
+            rel1.offset: -10 -6;
+            rel1.to: "e.text.selection";
+            rel2.offset: 9 5;
+            rel2.to: "e.text.selection";
+            image.normal: "darken_square.png";
+            image.border: 6 6 6 6;
+            fill.smooth: 0;
+            fixed: 1 1;
          }
       }
       part { name: "e.text.selection"; type: TEXT; mouse_events: 0;
+         effect: SHADOW BOTTOM;
          description { state: "default" 0.0;
-            rel.to: "e.swallow.background";
             rel1.relative: 0.5 0.5;
+            rel1.to: "e.swallow.background";
             rel2.relative: 0.5 0.5;
+            rel2.to: "e.swallow.background";
+            color: FN_COL_DEFAULT;
+            color_class: "label_text";
             fixed: 1 1;
-            text { font: FNBD; size: 10;
+            text { font: FN; size: 10;
                text_class: "label";
                min: 1 1;
                ellipsis: -1;
             }
-            color_class: "/fg/normal/text-hilight";
-            offscale;
          }
       }
-      part { name: "e.edge.left"; type: RECT;
-         scale: 1;
+      part { name: "shadow"; mouse_events: 0;
          description { state: "default" 0.0;
-            rel.to: "e.swallow.background";
+            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: "e.edge.left";
+         description { state: "default" 0.0;
+            rel1.to: "e.swallow.background";
             rel1.offset: 0 10;
+            rel2.to: "e.swallow.background";
             rel2.offset: -1 -11;
+            image.normal: "downlight_glow_right.png";
+            image.border: 3 0 0 0;
+            max: 24 99999;
             align: 0.0 0.5;
-            max: 5 99999;
-            color_class: "/fg/selected/edgebindings/edge";
-            offscale;
          }
       }
-      part { name: "e.edge.right"; type: RECT;
-         scale: 1;
+      part { name: "e.edge.right";
          description { state: "default" 0.0;
-            rel.to: "e.swallow.background";
+            rel1.to: "e.swallow.background";
             rel1.offset: 0 10;
+            rel2.to: "e.swallow.background";
             rel2.offset: -1 -11;
+            image.normal: "downlight_glow_left.png";
+            image.border: 0 3 0 0;
+            max: 24 99999;
             align: 1.0 0.5;
-            max: 5 99999;
-            color_class: "/fg/selected/edgebindings/edge";
-            offscale;
          }
       }
-      part { name: "e.edge.top"; type: RECT;
-         scale: 1;
+      part { name: "e.edge.top";
          description { state: "default" 0.0;
-            rel.to: "e.swallow.background";
+            rel1.to: "e.swallow.background";
             rel1.offset: 10 0;
+            rel2.to: "e.swallow.background";
             rel2.offset: -11 -1;
+            image.normal: "downlight_glow.png";
+            image.border: 0 0 3 0;
+            max: 99999 24;
             align: 0.5 0.0;
-            max: 99999 5;
-            color_class: "/fg/selected/edgebindings/edge";
-            offscale;
          }
       }
-      part { name: "e.edge.bottom"; type: RECT;
-         scale: 1;
+      part { name: "e.edge.bottom";
          description { state: "default" 0.0;
-            rel.to: "e.swallow.background";
+            rel1.to: "e.swallow.background";
             rel1.offset: 10 0;
+            rel2.to: "e.swallow.background";
             rel2.offset: -11 -1;
+            image.normal: "downlight_glow_up.png";
+            image.border: 0 0 0 3;
+            max: 99999 24;
             align: 0.5 1.0;
-            max: 99999 5;
-            color_class: "/fg/selected/edgebindings/edge";
-            offscale;
          }
       }
-
+      
       part { name: "e.edge.top_left";
-         scale: 1;
          description { state: "default" 0.0;
-            rel.to: "e.swallow.background";
+            rel1.to: "e.swallow.background";
+            rel2.to: "e.swallow.background";
             max: 10 10;
             image.normal: "mini_blue_glow_arrow_2.png";
             align: 0.0 0.0;
-            color_class: "/fg/selected/edgebindings/edge";
-            offscale;
          }
       }
       part { name: "e.edge.top_right";
-         scale: 1;
          description { state: "default" 0.0;
-            rel.to: "e.swallow.background";
+            rel1.to: "e.swallow.background";
+            rel2.to: "e.swallow.background";
             max: 10 10;
             image.normal: "mini_blue_glow_arrow_3.png";
             align: 1.0 0.0;
-            color_class: "/fg/selected/edgebindings/edge";
-            offscale;
          }
       }
       part { name: "e.edge.bottom_right";
-         scale: 1;
          description { state: "default" 0.0;
-            rel.to: "e.swallow.background";
+            rel1.to: "e.swallow.background";
+            rel2.to: "e.swallow.background";
             max: 10 10;
             image.normal: "mini_blue_glow_arrow_0.png";
             align: 1.0 1.0;
-            color_class: "/fg/selected/edgebindings/edge";
-            offscale;
          }
       }
       part { name: "e.edge.bottom_left";
-         scale: 1;
          description { state: "default" 0.0;
-            rel.to: "e.swallow.background";
+            rel1.to: "e.swallow.background";
+            rel2.to: "e.swallow.background";
             max: 10 10;
             image.normal: "mini_blue_glow_arrow_1.png";
             align: 0.0 1.0;
-            color_class: "/fg/selected/edgebindings/edge";
-            offscale;
          }
       }
-
+      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;
+         }
+      }
       part { name: "e.box"; type: BOX;
-         scale: 1;
          description { state: "default" 0.0;
             rel1 {
                relative: 1 1;
@@ -155,11 +198,9 @@ group { name: "e/modules/conf_edgebindings/selection";
                align: 0.5 0.5;
                min: 1 1;
             }
-            offscale;
          }
       }
       part { name: "e.swallow.slider"; type: SWALLOW;
-         scale: 1;
          description { state: "default" 0.0;
             align: 0 0.0;
             rel1 {
@@ -168,8 +209,9 @@ group { name: "e/modules/conf_edgebindings/selection";
                to_x: "e.edge.bottom_right";
                to_y: "e.box";
             }
-            rel2.offset: -5 -1;
-            offscale;
+            rel2 {
+               offset: -5 -1;
+            }
          }
       }
       part { name: "e.text.description"; type: TEXTBLOCK; mouse_events: 0;
@@ -180,13 +222,14 @@ group { name: "e/modules/conf_edgebindings/selection";
                offset: 80 4;
                to_x: "e.edge.right";
             }
-            rel2.offset: -80 -45;
+            rel2 {
+               offset: -80 -45;
+            }
             text {
                style: "edge_binding_style";
                min: 1 1;
                ellipsis: -1;
             }
-            offscale;
          }
       }
    }

data/elementary/themes/edc/efl/bg.edc

@@ -13,6 +13,7 @@ Group: efl/bg (@since 1.23)
 
 group { "efl/bg";
    data.item: "version" "123";
+   images.image: "bevel_dark_out.png" COMP;
    parts {
       part { name: "clipper"; type: RECT;
          description { state: "default" 0.0;
@@ -20,7 +21,8 @@ group { "efl/bg";
       }
       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: "efl.rectangle"; type: SWALLOW; required;
@@ -33,6 +35,14 @@ group { "efl/bg";
             fixed: 1 1;
          }
       }
+      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: "efl.content"; type: SWALLOW; required;
          description { state: "default" 0.0;
          }

data/elementary/themes/edc/efl/calendar.edc

@@ -1,21 +1,12 @@
-#define CIT_STYLES\
+#define CIT_STYLE\
       style { name: "efl_ui_calendar_date_style";\
-         base: "font="FN" font_size=10 color=cc:/fg/normal/calendar/day align=center text_class=calendar_day_text";\
-      }\
-      style { name: "efl_ui_calendar_date_holiday_style";\
-         base: "font="FN" font_size=10 color=cc:/fg/normal/calendar/day/holiday align=center text_class=calendar_day_text_holiday";\
+         base: "font="FN" font_size=10 color=#ffffff style=shadow,bottom shadow_color=#00000080 align=center text_class=calendar_day_text color_class=calendar_day_text";\
       }\
       style { name: "efl_ui_calendar_date_today_style";\
-         base: "font="FN" font_size=10 color=cc:/fg/normal/calendar/day/today align=center text_class=calendar_day_text_today";\
+         base: "font="FN" font_size=10 color=#3399ff style=glow glow_color=#3399ff18 align=center text_class=calendar_day_text_today color_class=calendar_day_text_today";\
       }\
       style { name: "efl_ui_calendar_date_disabled_style";\
-         base: "font="FN" font_size=10 color=cc:/fg/normal/calendar/day/disabled align=center text_class=calendar_day_text_disabled";\
-      }\
-      style { name: "efl_ui_calendar_date_weekend1_style";\
-         base: "font="FN" font_size=10 color=cc:/fg/normal/calendar/day/weekend1 align=center text_class=calendar_day_text_weekend1";\
-      }\
-      style { name: "efl_ui_calendar_date_weekend2_style";\
-         base: "font="FN" font_size=10 color=cc:/fg/normal/calendar/day/weekend2 align=center text_class=calendar_day_text_weekend2";\
+         base: "font="FN" font_size=10 color=#151515 style=shadow,bottom shadow_color=#ffffffc0 align=center text_class=calendar_day_text_disabled text_class=calendar_day_text_disabled";\
       }\
 
 #define CAL_SPIN(_sufix, _text, _relative)\
@@ -30,11 +21,11 @@
                offset: 0 -1;\
             }\
             align: 0.0 0.5;\
-            min: 25 25;\
-            max: 25 25;\
+            min: 15 15;\
+            max: 15 15;\
          }\
       }\
-      part { name: "right_bt"#_sufix; type: SPACER;\
+      part { name: "right_bt"#_sufix; type: RECT;\
          scale: 1;\
          description { state: "default" 0.0;\
             fixed: 1 1;\
@@ -45,109 +36,125 @@
                offset: -1 -1;\
             }\
             align: 1.0 0.5;\
-            min: 25 25;\
-            max: 25 25;\
+            min: 15 15;\
+            max: 15 15;\
+            color: 0 0 0 0;\
          }\
       }\
-      part { name: "efl.calendar.button"#_sufix".left"; type: SWALLOW;\
+      part { name: "efl.calendar.button"#_sufix".left";\
+         type: SWALLOW;\
          scale: 1;\
          description { state: "default" 0.0;\
             fixed: 1 1;\
-            rel.to: "left_bt"#_sufix;\
-            min: 15 15;\
-            max: 15 15;\
+            rel1.to: "left_bt"#_sufix;\
+            rel2.to: "left_bt"#_sufix;\
          }\
          description { state: "rtl" 0.0;\
             inherit: "default" 0.0;\
-            rel.to: "right_bt"#_sufix;\
+            rel1.to: "right_bt"#_sufix;\
+            rel2.to: "right_bt"#_sufix;\
          }\
       }\
-      part { name: "efl.calendar.button"#_sufix".right"; type: SWALLOW;\
+      part { name: "efl.calendar.button"#_sufix".right";\
+         type: SWALLOW;\
          scale: 1;\
          description { state: "default" 0.0;\
             fixed: 1 1;\
-            rel.to: "right_bt"#_sufix;\
-            min: 15 15;\
-            max: 15 15;\
+            rel1.to: "right_bt"#_sufix;\
+            rel2.to: "right_bt"#_sufix;\
          }\
          description { state: "rtl" 0.0;\
             inherit: "default" 0.0;\
-            rel.to: "left_bt"#_sufix;\
+            rel1.to: "left_bt"#_sufix;\
+            rel2.to: "left_bt"#_sufix;\
          }\
       }\
       part { name: #_text; type: TEXT; mouse_events: 0;\
+         effect: SHADOW BOTTOM; \
          scale: 1;\
          description { state: "default" 0.0;\
             fixed: 1 1;\
             rel1 { relative: 1.0 0.0;\
                to: "left_bt"#_sufix;\
-               offset: 8 8;\
             }\
             rel2 { relative: 0.0 1.0;\
                to: "right_bt"#_sufix;\
-               offset: -9 -9;\
             }\
-            offscale;\
             text { font: FNBD; size: 10;\
                min: 0 1;\
                text_class: "calendar_"#_text; \
             }\
-            color_class: "/fg/normal/calendar/text/title"; \
+            color_class: "calendar_"#_text; \
          }\
       }
 
 #define CH(_pos) \
    part { name: "ch_"#_pos"_base"; type: SPACER; \
       description { state: "default" 0.0; \
-         rel.to: "header";\
-         rel1.relative: (_pos % 7 / 7) 0.0; \
-         rel2.relative: (_pos % 7 / 7 + 1 / 7) 1.0; \
+         rel1 { \
+            relative: (_pos % 7 / 7) 0.0; \
+            to: "header"; \
+         } \
+         rel2 { \
+            relative: (_pos % 7 / 7 + 1 / 7) 1.0; \
+            to: "header"; \
+         } \
       } \
    } \
    part { name: "efl.ch_"#_pos".text"; type: TEXT; mouse_events: 0; \
+      effect: SHADOW BOTTOM; \
       scale: 1; \
       clip_to: "ch_"#_pos"_clipper"; \
       description { state: "default" 0.0; \
-         rel.to: "ch_"#_pos"_base"; \
-         rel1.offset: 0 3; \
-         rel2.offset: -1 -4; \
-         offscale;\
+         rel1.to: "ch_"#_pos"_base"; \
+         rel2.to: "ch_"#_pos"_base"; \
          text { font: FN; size: 8; \
             min: 1 1; \
             ellipsis: -1; \
             text_class: "calendar_weekday_text"; \
          } \
-         color_class: "/fg/normal/calendar/text/day"; \
+         color_class: "calendar_weekday_text"; \
       } \
    } \
    part { name: "ch_"#_pos"_clipper"; type: RECT; \
       description { state: "default" 0.0; \
-         rel.to: "ch_"#_pos"_base"; \
+         rel1.to: "ch_"#_pos"_base"; \
+         rel2.to: "ch_"#_pos"_base"; \
       } \
    }
 
 #define CIT(_pos) \
    part { name: "cit_"#_pos"_rect"; type: SPACER; \
       description { state: "default" 0.0; \
-         rel.to: "base"; \
-         rel1.relative: (_pos % 7 / 7) (_pos / 7 / 6 - _pos % 7 / 7 / 6); \
-         rel2.relative: (_pos % 7 / 7 + 1 / 7) (_pos / 7 / 6 + 1 / 6 - _pos % 7 / 7 / 6); \
+         rel1 { \
+            relative: (_pos % 7 / 7) \
+            (_pos / 7 / 6 - _pos % 7 / 7 / 6); \
+            to: "base"; \
+         } \
+         rel2 { \
+            relative: (_pos % 7 / 7 + 1 / 7) \
+            (_pos / 7 / 6 + 1 / 6 - _pos % 7 / 7 / 6); \
+            to: "base"; \
+         } \
       } \
    } \
    part { name: "cit_"#_pos"_event"; type: RECT; repeat_events: 1; \
       description { state: "default" 0.0; \
-         rel.to: "cit_"#_pos"_rect"; \
-         color_class: "/bg/normal/calendar/day/normal"; \
-      } \
-      description { state: "today" 0.0; \
-         inherit: "default" 0.0; \
-         color_class: "/bg/normal/calendar/day/today"; \
+         rel1.to: "cit_"#_pos"_rect"; \
+         rel2.to: "cit_"#_pos"_rect"; \
+         color: 0 0 0 0; \
       } \
    } \
-   part { name: "cit_"#_pos"_selected"; type: RECT; mouse_events: 0; \
+   part { name: "cit_"#_pos"_pat"; mouse_events: 0; \
       description { state: "default" 0.0; \
-         rel.to: "cit_"#_pos"_rect"; \
-         color_class: "/bg/selected/calendar/day"; \
+         rel1.to: "cit_"#_pos"_selected"; \
+         rel1.offset: 1 1; \
+         rel2.to: "cit_"#_pos"_selected"; \
+         rel2.offset: -2 -2; \
+         image.normal: "diagonal_stripes.png"; \
+         color: 255 255 255 25; \
+         TILED_PATTERN(240, 240) \
+         color_class: "calendar_day_selected"; \
          visible: 0; \
       } \
       description { state: "selected" 0.0; \
@@ -155,10 +162,13 @@
          visible: 1; \
       } \
    } \
-   part { name: "cit_"#_pos"_focus"; type: RECT; mouse_events: 0; \
+   part { name: "cit_"#_pos"_selected"; mouse_events: 0; \
       description { state: "default" 0.0; \
-         rel.to: "cit_"#_pos"_rect"; \
-         color_class: "/bg/selected/calendar/day/focused"; \
+         rel1.to: "cit_"#_pos"_rect"; \
+         rel2.to: "cit_"#_pos"_rect"; \
+         image.normal: "outline_glow.png"; \
+         image.border: 4 4 4 4; \
+         color_class: "calendar_day_selected"; \
          visible: 0; \
       } \
       description { state: "selected" 0.0; \
@@ -166,20 +176,44 @@
          visible: 1; \
       } \
    } \
+   part { name: "cit_"#_pos"_selected2"; mouse_events: 0; \
+      description { state: "default" 0.0; \
+         rel1.to: "cit_"#_pos"_rect"; \
+         rel2.to: "cit_"#_pos"_rect"; \
+         image.normal: "outline_glow.png"; \
+         image.border: 4 4 4 4; \
+         color: 255 255 255 128; \
+         color_class: "calendar_day_highlighted"; \
+         visible: 0; \
+      } \
+      description { state: "highlighted" 0.0; \
+         inherit: "default" 0.0; \
+         visible: 1; \
+      } \
+   } \
+   part { name: "cit_"#_pos"_glow"; mouse_events: 0; \
+      description { state: "default" 0.0; \
+         rel1.to: "cit_"#_pos"_rect"; \
+         rel2.to: "cit_"#_pos"_rect"; \
+         image.normal: "box_glow.png"; \
+         image.border: 12 12 12 12; \
+         image.middle: 0; \
+         fill.smooth: 0; \
+         visible: 0; \
+      } \
+      description { state: "focused" 0.0; \
+         inherit: "default" 0.0; \
+         visible: 1; \
+      } \
+   } \
    part { name: "efl.cit_"#_pos".text"; type: TEXTBLOCK; mouse_events: 0; \
       scale: 1; \
       description { state: "default" 0.0; \
-         rel.to: "cit_"#_pos"_rect"; \
-         rel1.offset: 3 0; \
-         rel2.offset: -4 -1; \
+         rel1.to: "cit_"#_pos"_rect"; \
+         rel2.to: "cit_"#_pos"_rect"; \
          text.style: "efl_ui_calendar_date_style"; \
          text.min: 1 1; \
          text.ellipsis: -1; \
-         offscale; \
-      } \
-      description { state: "holiday" 0.0; \
-         inherit: "default" 0.0; \
-         text.style: "efl_ui_calendar_date_holiday_style"; \
       } \
       description { state: "today" 0.0; \
          inherit: "default" 0.0; \
@@ -189,26 +223,25 @@
          inherit: "default" 0.0; \
          text.style: "efl_ui_calendar_date_disabled_style"; \
       } \
-      description { state: "weekend/day1" 0.0; \
-         inherit: "default" 0.0; \
-         text.style: "efl_ui_calendar_date_weekend1_style"; \
-      } \
-      description { state: "weekend/day2" 0.0; \
-         inherit: "default" 0.0; \
-         text.style: "efl_ui_calendar_date_weekend2_style"; \
-      } \
    } \
    part { name: "cit_"#_pos"_check"; mouse_events: 0; \
       scale: 1; \
       description { state: "default" 0.0; \
          fixed: 1 1; \
-         rel.to: "cit_"#_pos"_rect"; \
-         rel1.relative: 0.6 0.5; \
-         min: 15 15; \
-         max: 15 15; \
+         rel1 { \
+            to: "cit_"#_pos"_rect"; \
+            relative: 0.6 0.5; \
+         } \
+         rel2 { \
+            to: "cit_"#_pos"_rect"; \
+            relative: 0.6 0.5; \
+         } \
+         min: 16 16; \
+         max: 16 16; \
+         aspect: 1 1; \
          align: 0.0 1.0;\
-         image.normal: "i-check"; \
-         color_class: "/fg/normal/calendar/day/checked"; \
+         image.normal: "icon_border_remember.png"; \
+         color_class: "calendar_day_checked"; \
          visible: 0; \
       } \
       description { state: "visible" 0.0; \
@@ -218,8 +251,9 @@
    } \
    part { name: "efl.cit_"#_pos".access"; type: RECT; repeat_events: 1; \
       description { state: "default" 0.0; \
-         rel.to: "cit_"#_pos"_event"; \
-         color: 0 0 0 0; /* no cc */ \
+         rel1.to: "cit_"#_pos"_event"; \
+         rel2.to: "cit_"#_pos"_event"; \
+         color: 0 0 0 0; \
       } \
    } \
    programs { \
@@ -228,6 +262,7 @@
          signal:  "cit_"#_pos",selected"; \
          source:  "efl"; \
          action:  STATE_SET "selected" 0.0; \
+         target:  "cit_"#_pos"_pat"; \
          target:  "cit_"#_pos"_selected"; \
       } \
       program { \
@@ -235,6 +270,7 @@
          signal:  "cit_"#_pos",unselected"; \
          source:  "efl"; \
          action:  STATE_SET "default" 0.0; \
+         target:  "cit_"#_pos"_pat"; \
          target:  "cit_"#_pos"_selected"; \
       } \
       program { \
@@ -245,7 +281,7 @@
             set_int(item_focus_enabled, 1); \
             set_int(last_focused_item, _pos); \
             if (get_int(win_focus_enabled) == 1) \
-               set_state(PART:"cit_"#_pos"_focus", "selected", 0.0); \
+               set_state(PART:"cit_"#_pos"_glow", "focused", 0.0); \
          } \
       } \
       program { \
@@ -254,7 +290,7 @@
          source:  "efl"; \
          script { \
             set_int(item_focus_enabled, 0); \
-            set_state(PART:"cit_"#_pos"_focus", "default", 0.0); \
+            set_state(PART:"cit_"#_pos"_glow", "default", 0.0); \
          } \
       } \
       program { \
@@ -263,7 +299,6 @@
          source:  "efl"; \
          action:  STATE_SET "today" 0.0; \
          target:  "efl.cit_"#_pos".text"; \
-         target:  "cit_"#_pos"_event";\
       } \
       program { \
          name:    "cit_"#_pos"_not_today"; \
@@ -271,7 +306,6 @@
          source:  "efl"; \
          action:  STATE_SET "default" 0.0; \
          target:  "efl.cit_"#_pos".text"; \
-         target:  "cit_"#_pos"_event";\
       } \
       program { \
          name:    "cit_"#_pos"_enable"; \
@@ -296,15 +330,15 @@
          source: "cit_"#_pos"_clicked"; \
          signal: "mouse,down,1"; \
          source: "cit_"#_pos"_event"; \
-         action:  STATE_SET "selected" 0.0; \
-         target:  "cit_"#_pos"_selected"; \
+         action:  STATE_SET "highlighted" 0.0; \
+         target:  "cit_"#_pos"_selected2"; \
       } \
       program { \
          source: "cit_"#_pos"_clicked"; \
          signal: "mouse,up,1"; \
          source: "cit_"#_pos"_event"; \
          action:  STATE_SET "default" 0.0; \
-         target:  "cit_"#_pos"_selected"; \
+         target:  "cit_"#_pos"_selected2"; \
       } \
       program { \
          source: "cit_"#_pos"_clicked"; \
@@ -386,8 +420,15 @@
       } \
    }
 
-group { name: "efl/calendar";
-   data.item: "version" "123";
+group { "efl/calendar"; data.item: "version" "123";
+   images.image: "sym_left_light_normal.png" COMP;
+   images.image: "sym_right_light_normal.png" COMP;
+   images.image: "sym_left_glow_normal.png" COMP;
+   images.image: "sym_right_glow_normal.png" COMP;
+   images.image: "icon_border_remember.png" COMP;
+   images.image: "outline_glow.png" COMP;
+   images.image: "box_glow.png" COMP;
+   images.image: "diagonal_stripes.png" COMP;
    data.item: "focus_highlight" "on";
    script {
       public rtl;
@@ -396,34 +437,32 @@ group { name: "efl/calendar";
       public last_focused_item;
    }
    styles {
-      CIT_STYLES
+      CIT_STYLE
    }
    parts {
       part { name: "bg"; type: SPACER;
-         scale: 1;
          description { state: "default" 0.0;
-            rel1.offset: 8 8;
-            rel2.offset: -9 -9;
-            offscale;
+            rel1.offset: 1 1;
+            rel2.offset: -2 -2;
          }
       }
       part { name: "efl.background"; type: SWALLOW;
          description { state: "default" 0.0;
-            rel.to: "bg";
+            rel1.to: "bg";
+            rel2.to: "bg";
          }
       }
       part { name: "spinner-base1"; type: SPACER;
-         scale: 1;
          description { state: "default" 0.0;
             min: 24 16;
             max: 999999 16;
-            rel.to: "bg";
+            rel1.to: "bg";
+            rel2.to: "bg";
             rel2.relative: 1.0 (1/8);
             align: 0.5 0.0;
          }
       }
       part { name: "table-base"; type: SPACER;
-         scale: 1;
          description { state: "default" 0.0;
             min: 70 60;
             rel1.to_x: "bg";
@@ -432,31 +471,29 @@ group { name: "efl/calendar";
             rel1.relative: 0.0 1.0;
             rel2.to: "bg";
             rel2.offset: -4 -4;
-            offscale;
          }
       }
       part { name: "header"; type: SPACER;
          description { state: "default" 0.0;
-            rel.to: "table-base";
+            rel1.to: "table-base";
+            rel2.to: "table-base";
             rel2.relative: 1.0 (1/7);
             align: 0.5 0.0;
-            min: 0 25;
+            min: 0 16;
          }
       }
-      part { name: "header_separator"; type: RECT; mouse_events: 0;
-         scale: 1;
+      part { name: "header_separator"; mouse_events:  0;
          description { state: "default" 0.0;
             fixed: 1 1;
-            rel.to: "header";
+            rel1.to: "header";
             rel1.relative: 0.0 1.0;
-            rel1.offset: 8 -1;
-            rel2.offset: -9 -1;
-            color_class: "/fg/normal/separator";
-            offscale;
+            rel1.offset: 0 -2;
+            rel2.to: "header";
+            image.normal: "separator_horiz.png";
+            fill.smooth: 0;
          }
       }
       part { name: "base"; type: SPACER;
-         scale: 1;
          description { state: "default" 0.0;
             rel1.to_x: "table-base";
             rel1.to_y: "header";
@@ -464,7 +501,6 @@ group { name: "efl/calendar";
             rel1.offset: 3 0;
             rel2.to: "table-base";
             rel2.offset: -3 0;
-            offscale;
          }
       }
 
@@ -501,148 +537,182 @@ group { name: "efl/calendar";
    }
 }
 
-group { name: "efl/calendar/inc_button";
-   data.item: "version" "123";
-   script {
-      public mouse_down = 0;
-      public multi_down = 0;
-   }
-   parts {
-      part { name: "arrow.image";
-         scale: 1;
-         description { state: "default" 0.0;
-            FIXED_SIZE(15, 15)
-            color_class: "/fg/normal/spinner/arrow";
-            image.normal: "i-arrow-r";
-         }
-         description { state: "pressed" 0.0;
-            inherit: "default" 0.0;
-            color_class: "/fg/pressed/spinner/arrow";
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            color_class: "/fg/disabled/spinner/arrow";
-         }
-      }
-      part { name: "over"; type: RECT;
-         repeat_events: 1;
-         description { state: "default" 0.0;
-            color: 0 0 0 0; // no cc
-         }
-      }
-      part { name: "disabler"; type: RECT;
-         description { state: "default" 0.0;
-            color: 0 0 0 0; // no cc
-            visible: 0;
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-   }
-   programs {
-      program { signal: "mouse,down,1"; source: "over";
-         script {
-            if ((get_int(multi_down) == 0) &&
-                (get_int(mouse_down) == 0)) {
-               set_int(mouse_down, 1);
-               run_program(PROGRAM:"button_press2");
-            }
-         }
-      }
-      program { name: "button_press2";
-         action: SIGNAL_EMIT "efl,action,press" "";
-         after: "button_press_anim";
-      }
-      program { name: "button_press_anim";
-         action: STATE_SET "pressed" 0.0;
-         target: "arrow.image";
-      }
-      program { signal: "mouse,up,1"; source: "over";
-         script {
-            if (get_int(mouse_down) == 1) {
-               set_int(mouse_down, 0);
-               run_program(PROGRAM:"button_unpress2");
-               run_program(PROGRAM:"button_unpress_anim");
-            }
-         }
-      }
-      program { name: "button_unpress2";
-         action: SIGNAL_EMIT "efl,action,unpress" "";
-      }
-      program { name: "button_unpress_anim";
-         action: STATE_SET "default" 0.0;
-         target: "arrow.image";
-      }
-      program { signal: "mouse,clicked,1"; source: "over";
-         script {
-            if (get_int(multi_down) == 0) {
-               run_program(PROGRAM:"button_click2");
-            }
-         }
-      }
-      program { signal: "efl,action,unpressed"; source: "efl";
-         after: "button_unpress_anim";
-      }
-      program { signal: "efl,action,pressed"; source: "efl";
-         after: "button_press_anim";
-      }
-      program { name: "button_click2";
-         action: SIGNAL_EMIT "efl,action,click" "";
-      }
-      program { signal: "efl,state,animation,activated"; source: "efl";
-         action: STATE_SET "pressed" 0.0;
-         target: "arrow.image";
-         after: "access_pressed_anim";
-      }
-      program { name: "access_pressed_anim";
-         action: STATE_SET "default" 0.0;
-         transition: DECELERATE 0.1;
-         target: "arrow.image";
-      }
-      program { signal: "efl,state,disabled"; source: "efl";
-         action: STATE_SET "disabled" 0.0;
-         target: "arrow.image";
-         target: "disabler";
-      }
-      program { signal: "efl,state,enabled"; source: "efl";
-         action: STATE_SET "default" 0.0;
-         target: "arrow.image";
-         target: "disabler";
-      }
-      program { signal: "efl,action,multi,down"; source: "efl";
-         script {
-            set_int(multi_down, 1);
-         }
-      }
-      program { signal: "efl,action,multi,up"; source: "efl";
-         script {
-            set_int(multi_down, 0);
-         }
-      }
-   }
-}
-
-group { name: "efl/calendar/dec_button";
-   inherit: "efl/calendar/inc_button";
-   data.item: "version" "123";
-   parts {
-      part { name: "arrow.image";
-         scale: 1;
-         description { state: "default" 0.0;
-            image.normal: "i-arrow-l";
-         }
-         description { state: "pressed" 0.0;
-            image.normal: "i-arrow-l";
-         }
-         description { state: "disabled" 0.0;
-            image.normal: "i-arrow-l";
-         }
-      }
-   }
-}
-#undef CIT_STYLES
 #undef CAL_SPIN
 #undef CIT
 #undef CH
+
+ group { name: "efl/calendar/inc_button"; data.item: "version" "123";
+      images.image: "sym_right_light_normal.png" COMP;
+      images.image: "sym_right_glow_normal.png" COMP;
+      images.image: "sym_right_dark_normal.png" COMP;
+      script {
+         public mouse_down = 0;
+         public multi_down = 0;
+      }
+      parts {
+         part { name: "arrow.image";
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 15 15;
+               max: 15 15;
+               color_class: "F032L1";
+               image.normal: "sym_right_light_normal.png";
+            }
+            description { state: "pressed" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "sym_right_glow_normal.png";
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "sym_right_dark_normal.png";
+            }
+         }
+         part { name: "over";
+            type: RECT;
+            repeat_events: 1;
+            description { state: "default" 0.0;
+               color: 0 0 0 0;
+            }
+         }
+         part { name: "disabler";
+            type: RECT;
+            description { state: "default" 0.0;
+               color: 0 0 0 0;
+               visible: 0;
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+      }
+      programs {
+         program { name: "button_press";
+            signal: "mouse,down,1";
+            source: "over";
+            script {
+               if ((get_int(multi_down) == 0) &&
+                   (get_int(mouse_down) == 0)) {
+                     set_int(mouse_down, 1);
+                     run_program(PROGRAM:"button_press2");
+               }
+            }
+         }
+         program { name: "button_press2";
+            action: SIGNAL_EMIT "efl,action,press" "";
+            after: "button_press_anim";
+         }
+         program { name: "button_press_anim";
+            action: STATE_SET "pressed" 0.0;
+            target: "arrow.image";
+         }
+         program { name: "button_unpress";
+            signal: "mouse,up,1";
+            source: "over";
+            script {
+               if (get_int(mouse_down) == 1) {
+                     set_int(mouse_down, 0);
+                     run_program(PROGRAM:"button_unpress2");
+                     run_program(PROGRAM:"button_unpress_anim");
+               }
+            }
+         }
+         program { name: "button_unpress2";
+            action: SIGNAL_EMIT "efl,action,unpress" "";
+         }
+         program { name: "button_unpress_anim";
+            action: STATE_SET "default" 0.0;
+            target: "arrow.image";
+         }
+         program { name: "button_click";
+            signal: "mouse,clicked,1";
+            source: "over";
+            script {
+               if (get_int(multi_down) == 0) {
+                 run_program(PROGRAM:"button_click2");
+               }
+            }
+         }
+         program { name: "action_unpressed";
+            signal: "efl,action,unpressed";
+            source: "efl";
+            after: "button_unpress_anim";
+         }
+         program { name: "action_pressed";
+            signal: "efl,action,pressed";
+            source: "efl";
+            after: "button_press_anim";
+         }
+         program { name: "button_click2";
+            action: SIGNAL_EMIT "efl,action,click" "";
+         }
+         program { name: "access_pressed";
+            signal: "efl,state,animation,activated";
+            source: "efl";
+            action: STATE_SET "pressed" 0.0;
+            target: "arrow.image";
+            after: "access_pressed_anim";
+         }
+         program { name: "access_pressed_anim";
+            action: STATE_SET "default" 0.0;
+            transition: DECELERATE 0.1;
+            target: "arrow.image";
+         }
+         program { name: "disable";
+            signal: "efl,state,disabled";
+            source: "efl";
+            action: STATE_SET "disabled" 0.0;
+            target: "arrow.image";
+            target: "disabler";
+         }
+         program { name: "enable";
+            signal: "efl,state,enabled";
+            source: "efl";
+            action: STATE_SET "default" 0.0;
+            target: "arrow.image";
+            target: "disabler";
+         }
+         program {
+            name: "multi_down";
+            signal: "efl,action,multi,down";
+            source: "efl";
+            script {
+               set_int(multi_down, 1);
+            }
+         }
+         program {
+            name: "multi_up";
+            signal: "efl,action,multi,up";
+            source: "efl";
+            script {
+               set_int(multi_down, 0);
+            }
+         }
+      }
+   }
+
+   group { name: "efl/calendar/dec_button";
+      inherit: "efl/calendar/inc_button";
+      data.item: "version" "123";
+      images.image: "sym_left_light_normal.png" COMP;
+      images.image: "sym_left_glow_normal.png" COMP;
+      images.image: "sym_left_dark_normal.png" COMP;
+      parts {
+         part { name: "arrow.image";
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 15 15;
+               max: 15 15;
+               image.normal: "sym_left_light_normal.png";
+            }
+            description { state: "pressed" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "sym_left_glow_normal.png";
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "sym_left_dark_normal.png";
+            }
+         }
+      }
+   }

data/elementary/themes/edc/efl/cursor.edc

@@ -78,12 +78,10 @@
 // "watch"
 // "xterm"
 
-group { name: "efl/cursor/hand1";
-   data.item: "version" "123";
+group { name: "efl/cursor/hand1"; data.item: "version" "123";
    images.image: "pointer_hand1.png" COMP;
    parts {
       part { name: "base"; mouse_events: 0; scale: 1;
-         scale: 1;
          description { state: "default" 0.0;
             FIXED_SIZE(32, 32)
             image.normal: "pointer_hand1.png";
@@ -93,10 +91,10 @@ group { name: "efl/cursor/hand1";
          description { state: "default" 0.0;
             visible: 0;
             fixed: 1 1;
-            rel1.relative: (21/32) (7/32);
+            rel1.relative: (26/32) (9/32);
             rel1.to: "base";
             rel2.to: "base";
-            rel2.relative: (21/32) (7/32);
+            rel2.relative: (26/32) (9/32);
             rel2.offset: 0 0;
          }
       }
@@ -105,8 +103,7 @@ group { name: "efl/cursor/hand1";
    }
 }
 
-group { name: "efl/cursor/blank";
-   data.item: "version" "123";
+group { name: "efl/cursor/blank"; data.item: "version" "123";
    parts {
       part { name: "efl.hotspot"; type: SWALLOW;
          description { state: "default" 0.0;
@@ -119,22 +116,26 @@ group { name: "efl/cursor/blank";
    }
 }
 
-group { name: "efl/cursor/xterm";
-   data.item: "version" "123";
-   images.image: "pointer_entry.png" COMP;
+group { name: "efl/cursor/xterm"; data.item: "version" "123";
+   images.image: "pointer_entry_bar.png" COMP;
+   images.image: "led_dot_white.png" COMP;
    parts {
       part { name: "base"; mouse_events: 0; scale: 1;
-         scale: 1;
          description { state: "default" 0.0;
-            image.normal: "pointer_entry.png";
-            FIXED_SIZE(16, 32)
+            min: 15 20;
+            max: 15 99999;
+            image.normal: "pointer_entry_bar.png";
+            image.border: 0 0 10 10;
+            rel1.offset: 0 2;
+            rel2.offset: -1 -3;
          }
       }
       part { name: "efl.hotspot"; type: SWALLOW;
          description { state: "default" 0.0;
             visible: 0;
             fixed: 1 1;
-            rel.to: "base";
+            rel1.to: "base";
+            rel2.to: "base";
             rel1.relative: 0.5 0.5;
             rel2.relative: 0.5 0.5;
             rel2.offset: 0 0;
@@ -142,5 +143,15 @@ group { name: "efl/cursor/xterm";
       }
       /* efl.content.hotspot is the old name for the above part */
       alias: "efl.content.hotspot" "efl.hotspot";
+      part { name: "shine";
+         description { state: "default" 0.0;
+            rel1.to: "base";
+            rel2.to: "base";
+            image.normal: "led_dot_white.png";
+            max: 27 27;
+            aspect: 1.0 1.0;
+            aspect_preference: VERTICAL;
+         }
+      }
    }
 }

data/elementary/themes/edc/efl/datepicker.edc

@@ -17,44 +17,60 @@ Group: efl/datepicker/spin_button (@since 1.23)
 	 Signal: efl,state,disabled
 	 Signal: efl,state,enabled
 */
-group { "efl/datepicker";
-   data.item: "version" "123";
+group { "efl/datepicker"; data.item: "version" "123";
    parts {
       spacer { "base";
          scale;
          desc { "default";
-             min: 160 40;
+             min: 150 170;
+         }
+      }
+      rect { "base_bg";
+         scale;
+         desc { "default";
+            rel.to: "base";
+            color_class: "datepicker_bg";
          }
       }
       spacer { "padding_bg_top";
          scale;
          desc { "default";
-            min: 0 5;
-            max: -1 5;
+            min: 0 10;
+            max: -1 10;
             fixed: 0 1;
-            rel.to: "base";
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 1.0 0.0;
+            rel1 {
+               relative: 0.0 0.0;
+               to: "base_bg";
+            }
+            rel2 {
+               relative: 1.0 0.0;
+               to: "base_bg";
+            }
             align: 0.5 0.0;
          }
       }
       spacer { "padding_bg_bottom";
          scale;
          desc { "default";
-            min: 0 5;
-            max: -1 5;
+            min: 0 10;
+            max: -1 10;
             fixed: 0 1;
-            rel.to: "base";
-            rel1.relative: 0.0 1.0;
-            rel2.relative: 1.0 1.0;
+            rel1 {
+               relative: 0.0 1.0;
+               to: "base_bg";
+            }
+            rel2 {
+               relative: 1.0 1.0;
+               to: "base_bg";
+            }
             align: 0.5 1.0;
          }
       }
       spacer { "bg";
          scale;
          desc { "default";
-            min: 160 40;
-            max: 160 40;
+            min: 150 150;
+            max: 150 150;
             rel1 {
                relative: 0.0 1.0;
                to: "padding_bg_top";
@@ -71,9 +87,14 @@ group { "efl/datepicker";
             min: 5 0;
             max: 5 -1;
             fixed: 1 0;
-            rel.to: "bg";
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 0.0 1.0;
+            rel1 {
+               relative: 0.0 0.0;
+               to: "bg";
+            }
+            rel2 {
+               relative: 0.0 1.0;
+               to: "bg";
+            }
             align: 0.0 0.0;
          }
       }
@@ -83,9 +104,15 @@ group { "efl/datepicker";
             min: 5 0;
             max: 5 -1;
             fixed: 1 0;
-            rel.to: "bg";
-            rel1.relative: 1.0 0.0;
-            rel2.relative: 1.0 1.0;
+            rel2.to: "bg";
+            rel1 {
+               relative: 1.0 0.0;
+               to: "bg";
+            }
+            rel2 {
+               relative: 1.0 1.0;
+               to: "bg";
+            }
             align: 1.0 1.0;
          }
       }
@@ -93,10 +120,13 @@ group { "efl/datepicker";
          mouse;
          scale;
          desc { "default";
-            fixed: 1 1;
+            fixed: 1 0;
             min: 40 0;
-            rel.to: "padding_left";
-            rel1.relative: 1.0 0.0;
+            rel1 {
+               relative: 1.0 0.0;
+               to: "padding_left";
+            }
+            rel2.to: "padding_left";
             align: 0.0 0.5;
          }
       }
@@ -104,10 +134,13 @@ group { "efl/datepicker";
          scale;
          desc { "default";
             fixed: 1 0;
-            min: 5 0;
-            max: 5 -1;
-            rel.to: "efl.field0";
-            rel1.relative: 1.0 0.0;
+            min: 10 0;
+            max: 10 -1;
+            rel1 {
+               relative: 1.0 0.0;
+               to: "efl.field0";
+            }
+            rel2.to: "efl.field0";
             align: 0.0 0.5;
          }
       }
@@ -115,7 +148,7 @@ group { "efl/datepicker";
          mouse;
          scale;
          desc { "default";
-            fixed: 1 1;
+            fixed: 1 0;
             min: 40 0;
             rel1 {
                relative: 1.0 0.0;
@@ -134,8 +167,11 @@ group { "efl/datepicker";
             fixed: 1 0;
             min: 10 0;
             max: 10 -1;
-            rel.to: "efl.field2";
-            rel2.relative: 0.0 1.0;
+            rel1.to: "efl.field2";
+            rel2 {
+               relative: 0.0 1.0;
+               to: "efl.field2";
+            }
             align: 1.0 0.5;
          }
       }
@@ -143,10 +179,13 @@ group { "efl/datepicker";
          mouse;
          scale;
          desc { "default";
-            fixed: 1 1;
+            fixed: 1 0;
             min: 40 0;
-            rel.to: "padding_right";
-            rel2.relative: 0.0 1.0;
+            rel1.to: "padding_right";
+            rel2 {
+               relative: 0.0 1.0;
+               to: "padding_right";
+            }
             align: 1.0 0.5;
          }
       }
@@ -154,15 +193,15 @@ group { "efl/datepicker";
          repeat;
          desc { "default";
             fixed: 1 1;
-            rel.to: "bg";
-            color: 0 0 0 0; // no cc
+            rel1.to: "bg";
+            rel2.to: "bg";
+            color: 0 0 0 0;
          }
       }
    }
 }
 
-group { "efl/datepicker/spin_button";
-   data.item: "version" "123";
+group { "efl/datepicker/spin_button"; data.item: "version" "123";
    parts {
       rect { "clip";
          desc { "default";
@@ -172,15 +211,22 @@ group { "efl/datepicker/spin_button";
       spacer { "base";
          scale;
          desc { "default";
-           min: 20 60;
+           min: 40 150;
+         }
+      }
+      rect { "bg";
+         scale;
+         desc { "default";
+            color_class: "spinner_bg";
          }
       }
       rect { "access";
          repeat;
          desc { "default";
             fixed: 1 1;
-            color: 0 0 0 0; // no cc
-            rel.to: "base";
+            color: 0 0 0 0;
+            rel1.to: "base";
+            rel2.to: "base";
             hid;
          }
          desc { "active";
@@ -192,8 +238,8 @@ group { "efl/datepicker/spin_button";
          scale;
          desc { "default";
             align: 0.5 0.0;
-            min: 20 20;
-            max: 20 20;
+            min: 40 40;
+            max: 40 40;
             fixed: 1 1;
          }
       }
@@ -201,8 +247,8 @@ group { "efl/datepicker/spin_button";
          scale;
          desc { "default";
             align: 0.5 1.0;
-            min: 20 20;
-            max: 20 20;
+            min: 40 40;
+            max: 40 40;
             fixed: 1 1;
          }
       }
@@ -210,7 +256,8 @@ group { "efl/datepicker/spin_button";
          clip: "clip";
          desc { "default";
             fixed: 1 1;
-            rel.to: "efl.text_button";
+            rel1.to: "efl.text_button";
+            rel2.to: "efl.text_button";
             hid;
          }
          desc { "active";
@@ -230,8 +277,8 @@ group { "efl/datepicker/spin_button";
                to_y: "efl.dec_button";
                relative: 1.0 0.0;
             }
-            min: 0 20;
-            max: -1 20;
+            min: 0 70;
+            max: -1 70;
             fixed: 0 1;
          }
          desc { "inactive";
@@ -243,7 +290,7 @@ group { "efl/datepicker/spin_button";
          norepeat;
          nomouse;
          desc { "default";
-            color: 0 0 0 0; // no cc
+            color: 0 0 0 0;
             hid;
          }
          desc { "disabled";
@@ -253,35 +300,51 @@ group { "efl/datepicker/spin_button";
       }
    }
    programs {
-      program { signal: "efl,entry,visible,on"; source: "efl";
+      program { "entry_active";
+         signal: "efl,entry,visible,on";
+         source: "efl";
          action: STATE_SET "active";
          target: "efl.entry";
       }
-      program { signal: "efl,entry,visible,off"; source: "efl";
+      program { "entry_inactive";
+         signal: "efl,entry,visible,off";
+         source: "efl";
          action: STATE_SET "default";
          target: "efl.entry";
       }
-      program { signal: "efl,button,visible,on"; source: "efl";
+      program { "text_button_active";
+         signal: "efl,button,visible,on";
+         source: "efl";
          action: STATE_SET "default";
          target: "efl.text_button";
       }
-      program { signal: "efl,button,visible,off"; source: "efl";
+      program { "text_button_inactive";
+         signal: "efl,button,visible,off";
+         source: "efl";
          action: STATE_SET "inactive";
          target: "efl.text_button";
       }
-      program { signal: "efl,state,access,active"; source: "efl";
+      program { "access_activate";
+         signal: "efl,state,access,active";
+         source: "efl";
          action:  STATE_SET "active";
          target: "access";
       }
-      program { signal: "efl,state,access,inactive"; source: "efl";
+      program { "access_inactivate";
+         signal: "efl,state,access,inactive";
+         source: "efl";
          action:  STATE_SET "default";
          target: "access";
       }
-      program { signal: "efl,state,disabled"; source: "efl";
+      program { "disable";
+         signal: "efl,state,disabled";
+         source: "efl";
          action: STATE_SET "disabled";
          target: "disabler";
       }
-      program { signal: "efl,state,enabled"; source: "efl";
+      program { "enable";
+         signal: "efl,state,enabled";
+         source: "efl";
          action: STATE_SET "default";
          target: "disabler";
       }

data/elementary/themes/edc/efl/focus.edc

@@ -5,8 +5,9 @@ Group: efl/focus_highlight/top (@since 1.23)
 	 Signal: efl,state,animating,stopped
 Group: efl/focus_highlight/top:blank (@since 1.23)
 */
-group { name: "efl/focus_highlight/top";
-   data.item: "version" "123";
+group { name: "efl/focus_highlight/top"; data.item: "version" "123";
+   images.image: "box_glow.png" COMP;
+   images.image: "box_outline.png" COMP;
    data.item: "animate" "on";
    script {
       public s_x, s_y, s_w, s_h; /* source */
@@ -33,14 +34,14 @@ group { name: "efl/focus_highlight/top";
 
       public update_offset(x, y, w, h) {
          set_state_val(PART:"base", STATE_REL1_OFFSET, x, y);
-         set_state_val(PART:"base", STATE_REL2_OFFSET, x + w - 1, y + h - 1);
+         set_state_val(PART:"base", STATE_REL2_OFFSET, x + w, y + h);
       }
 
       public message(Msg_Type:type, id, ...) {
          if ((type == MSG_INT_SET) && (id == 1)) {
             new x1, y1, w1, h1, x2, y2, w2, h2;
             new anim_id;
-
+            
             anim_id = get_int(g_anim_id);
             if (anim_id != 0) {
                cancel_anim(anim_id);
@@ -69,7 +70,7 @@ group { name: "efl/focus_highlight/top";
             set_state_val(PART:"base", STATE_REL2, 0.0, 0.0);
             update_offset(x1, y1, w1, h1);
             set_state(PART:"base", "custom", 0.0);
-
+            
             anim_id = anim(0.2, "animator1", 1);
             set_int(g_anim_id, anim_id);
          }
@@ -83,115 +84,48 @@ group { name: "efl/focus_highlight/top";
       }
       part { name: "clip"; type: RECT;
          description { state: "default" 0.0;
-            rel.to: "base";
-            rel1.relative: -1.0 -1.0;
-            rel1.offset: -999 -999;
-            rel2.relative: 2.0 2.0;
-            rel2.offset: 999 999;
-            color: 255 255 255 0; // no cc
-            visible: 0;
+            rel1.to: "glow";
+            rel2.to: "glow";
+            color: 255 255 255 0;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255; // no cc
-            visible: 1;
+            color: 255 255 255 255;
          }
       }
-      part { name: "top"; type: RECT;
+      part { name: "glow"; mouse_events: 0;
          clip_to: "clip";
-         scale: 1;
          description { state: "default" 0.0;
-            rel.to: "base";
-            color_class: "/bg/selected/focus";
-            rel2.relative: 1.0 0.0;
-            min: 4 4;
+            image.normal: "box_glow.png";
+            image.border: 12 12 12 12;
+            image.middle: 0;
+            fill.smooth: 0;
+            rel1.to: "base";
+            rel1.offset: -7 -7;
+            rel2.to: "base";
+            rel2.offset: 5 5;
+         }
+      }
+      part { name: "sel"; mouse_events: 0;
+         clip_to: "clip";
+         description { state: "default" 0.0;
+            image.normal: "box_outline.png";
+            image.border: 12 12 12 12;
+            image.middle: 0;
+            fill.smooth: 0;
+            rel1.to: "glow";
+            rel2.to: "glow";
+            color: 255 255 255 0;
          }
          description { state: "hi" 0.0;
             inherit: "default" 0.0;
-            color_class: "/bg/selected/focus/hilight";
-         }
-      }
-      part { name: "topl"; type: RECT;
-         clip_to: "clip";
-         scale: 1;
-         description { state: "default" 0.0;
-            rel.to: "top";
-            color_class: "/bg/selected/focus";
-            rel1.relative: 0.0 1.0;
-            rel2.relative: 0.0 1.0;
-            align: 0.0 0.0;
-            min: 4 4;
-         }
-         description { state: "hi" 0.0;
-            inherit: "default" 0.0;
-            color_class: "/bg/selected/focus/hilight";
-         }
-      }
-      part { name: "topr"; type: RECT;
-         clip_to: "clip";
-         scale: 1;
-         description { state: "default" 0.0;
-            rel.to: "top";
-            color_class: "/bg/selected/focus";
-            rel1.relative: 1.0 1.0;
-            rel2.relative: 1.0 1.0;
-            align: 1.0 0.0;
-            min: 4 4;
-         }
-         description { state: "hi" 0.0;
-            inherit: "default" 0.0;
-            color_class: "/bg/selected/focus/hilight";
-         }
-      }
-      part { name: "bot"; type: RECT;
-         clip_to: "clip";
-         scale: 1;
-         description { state: "default" 0.0;
-            rel.to: "base";
-            color_class: "/bg/selected/focus";
-            rel1.relative: 0.0 1.0;
-            min: 4 4;
-         }
-         description { state: "hi" 0.0;
-            inherit: "default" 0.0;
-            color_class: "/bg/selected/focus/hilight";
-         }
-      }
-      part { name: "botl"; type: RECT;
-         clip_to: "clip";
-         scale: 1;
-         description { state: "default" 0.0;
-            rel.to: "bot";
-            color_class: "/bg/selected/focus";
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 0.0 0.0;
-            align: 0.0 1.0;
-            min: 4 4;
-         }
-         description { state: "hi" 0.0;
-            inherit: "default" 0.0;
-            color_class: "/bg/selected/focus/hilight";
-         }
-      }
-      part { name: "botr"; type: RECT;
-         clip_to: "clip";
-         scale: 1;
-         description { state: "default" 0.0;
-            rel.to: "bot";
-            color_class: "/bg/selected/focus";
-            rel1.relative: 1.0 0.0;
-            rel2.relative: 1.0 0.0;
-            align: 1.0 1.0;
-            min: 4 4;
-         }
-         description { state: "hi" 0.0;
-            inherit: "default" 0.0;
-            color_class: "/bg/selected/focus/hilight";
+            color: 255 255 255 255;
          }
       }
    }
    programs {
-      program { signal: "efl,focus,visible,on"; source: "efl";
+      program {
+         signal: "efl,focus,visible,on"; source: "efl";
          action: ACTION_STOP;
          target: "pulse";
          target: "pulse2";
@@ -207,7 +141,8 @@ group { name: "efl/focus_highlight/top";
       program { name: "go3";
          action: SIGNAL_EMIT "efl,focus,visible,on,done" "efl";
       }
-      program { signal: "efl,focus,visible,off"; source: "efl";
+      program {
+         signal: "efl,focus,visible,off"; source: "efl";
          action: STATE_SET "default" 0.0;
          transition: DECELERATE 0.4;
          target: "clip";
@@ -226,34 +161,24 @@ group { name: "efl/focus_highlight/top";
          action: STATE_SET "hi" 0.0;
          transition: SINUSOIDAL 0.2;
          in: 3.0 0.0;
-         target: "top";
-         target: "topl";
-         target: "topr";
-         target: "bot";
-         target: "botl";
-         target: "botr";
+         target: "sel";
          after: "pulse2";
       }
       program { name: "pulse2";
          action: STATE_SET "default" 0.0;
          transition: SINUSOIDAL 0.4;
-         target: "top";
-         target: "topl";
-         target: "topr";
-         target: "bot";
-         target: "botl";
-         target: "botr";
+         target: "sel";
          after: "pulse";
       }
-      program { signal: "efl,state,animating,stopped"; source: "efl";
+      program {
+         signal: "efl,state,animating,stopped"; source: "efl";
          action: STATE_SET "default" 0.0;
          target: "base";
       }
    }
 }
 
-group { name: "efl/focus_highlight/top:blank";
-   data.item: "version" "123";
+group { name: "efl/focus_highlight/top:blank"; data.item: "version" "123";
    parts {
    }
 }

data/elementary/themes/edc/efl/frame.edc

@@ -1,101 +1,124 @@
-group { name: "efl/frame";
-   data.item: "version" "123";
-   images.image: "win_shad_flat.png" COMP;
+group { name: "efl/frame"; data.item: "version" "123";
+   images.image: "shadow_square_tiny.png" COMP;
+   images.image: "vgrad_med_curved.png" COMP;
+   images.image: "bevel_out.png" COMP;
+   images.image: "holes_tiny_vert.png" COMP;
    parts {
-      part { name: "shadow"; type: RECT;
+      part { name: "shadow"; mouse_events: 0;
          description { state: "default" 0.0;
-            rel.to: "_sh1";
-            color_class: "/shadow/normal/frame";
-         }
-         description { state: "hidden" 0.0;
-            inherit;
-            visible: 0;
+            rel1.offset: -1 0;
+            rel2.offset: 0 1;
+            image.normal: "shadow_square_tiny.png";
+            image.border: 6 6 6 6;
+            fill.smooth: 0;
          }
       }
-      WIN_SHAD("base", "shadow", "win_shad_flat.png", 10, 10, 7, 14, 0.25);
-      part { name: "base"; type: SPACER;
-         scale: 1;
+      part { name: "base"; type: RECT;
          description { state: "default" 0.0;
-            rel1.offset: 6 6;
-            rel2.offset: -7 -7;
-            offscale;
+            rel1.relative: 0.0 1.0;
+            rel1.offset: 2 0;
+            rel1.to_y: "top";
+            rel2.offset: -3 -3;
+            color: 64 64 64 255;
          }
       }
-      part { name: "top_bg"; type: RECT;
+      part { name: "top";
          description { state: "default" 0.0;
-            rel.to: "top";
-            color_class: "/bg/normal/frame/title";
-         }
-      }
-      part { name: "top"; type: SPACER;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to_x: "base";
+            image.normal: "vgrad_med_curved.png";
+            rel1.offset: 2 2;
             rel2.to_y: "efl.text";
-            rel2.offset: -1 3;
-            offscale;
+            rel2.offset: -3 -1;
+            fill.smooth: 0;
+            TILED_HORIZ(120)
+         }
+      }
+      part { name: "edge1";
+         description { state: "default" 0.0;
+            image.normal: "holes_tiny_vert.png";
+            rel1.offset: 4 0;
+            rel1.to_y: "efl.text";
+            rel2.offset: 4 -1;
+            rel2.relative: 0.0 1.0;
+            rel2.to_y: "efl.text";
+            align: 0.0 0.5;
+            FIXED_SIZE(3, 11)
+         }
+      }
+      part { name: "edge2";
+         description { state: "default" 0.0;
+            image.normal: "holes_tiny_vert.png";
+            rel1.offset: -5 0;
+            rel1.to_y: "efl.text";
+            rel1.relative: 1.0 0.0;
+            rel2.offset: -5 -1;
+            rel2.relative: 1.0 1.0;
+            rel2.to_y: "efl.text";
+            align: 1.0 0.5;
+            FIXED_SIZE(3, 11)
          }
       }
       part { name: "efl.text"; type: TEXT;
          scale: 1;
+         effect: SHADOW BOTTOM;
          description { state: "default" 0.0;
-            rel.to: "base";
-            rel1.offset: 4 4;
-            rel2.relative: 1.0 0.0;
-            rel2.offset: -5 4;
+            color_class: "frame";
+            rel1.relative: 1.0 0.0;
+            rel1.offset: 1 2;
+            rel1.to_x: "edge1";
+            rel2.relative: 0.0 0.0;
+            rel2.offset: -3 1;
+            rel2.to_x: "edge2";
             align: 0.0 0.0;
-            color_class: "/fg/normal/frame/title";
+            color: FN_COL_DISABLE;
             text { font: FNBD; size: 10;
+               text_class: "frame";
                align: 0.0 0.0;
                min: 0 1;
             }
             fixed: 0 1;
-            offscale;
-         }
-      }
-      part { name: "bg"; type: RECT;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.to_x: "base";
-            rel1.to_y: "top";
-            rel1.relative: 0.0 1.0;
-            rel2.to: "base";
-            color_class: "/bg/normal/frame";
          }
       }
       part { name: "clip"; type: RECT;
          description { state: "default" 0.0;
-            rel.to: "bg";
+            rel1.relative: 0.0 1.0;
+            rel1.offset: 5 0;
+            rel1.to_y: "efl.text";
+            rel2.offset: -7 -7;
          }
       }
       part { name: "efl.content"; type: SWALLOW;
          clip_to: "clip";
-         scale: 1;
          description { state: "default" 0.0;
             align: 0.0 1.0;
-            rel.to: "bg";
-            rel1.offset: 4 4;
-            rel2.offset: -5 -5;
-            offscale;
+            rel1.relative: 0.0 1.0;
+            rel1.offset: 5 0;
+            rel1.to_y: "efl.text";
+            rel2.offset: -7 -7;
          }
          description { state: "collapsed" 0.0;
             inherit: "default" 0.0;
             minmul: 1.0 0.0;
-            rel1.offset: 4 0;
-            rel2.offset: -5 -1;
+         }
+      }
+      part { name: "bevel"; mouse_events: 0;
+         description { state: "default" 0.0;
+            rel1.offset: 2 2;
+            rel2.offset: -3 -3;
+            image.normal: "bevel_out.png";
+            image.border: 1 1 1 1;
+            image.middle: 0;
+            fill.smooth: 0;
          }
       }
       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;
             rel1.to_y: "efl.text";
             rel2.to_y: "efl.text";
          }
       }
    }
    programs {
-      EFL_UI_CLICKABLE_PART_BIND("event")
       program { name: "collapse";
          action:  STATE_SET "collapsed" 0.0;
          target: "efl.content";
@@ -108,10 +131,9 @@ group { name: "efl/frame";
          transition: DECELERATE 0.3;
          after: "signal";
       }
-      program { signal:  "mouse,up,1"; source:  "event";
-         action:  SIGNAL_EMIT "efl,action,click" "efl";
-      }
-      program { signal:  "efl,action,toggle"; source: "efl";
+      EFL_UI_CLICKABLE_PART_BIND("event")
+      program {
+         signal:  "efl,action,toggle"; source: "efl";
          script {
             new st[31];
             new Float:vl;
@@ -122,7 +144,8 @@ group { name: "efl/frame";
               run_program(PROGRAM:"expand");
          }
       }
-      program { signal:  "efl,action,switch"; source: "efl";
+      program {
+         signal:  "efl,action,switch"; source: "efl";
          script {
             new st[31];
             new Float:vl;

data/elementary/themes/edc/efl/grid.edc

@@ -41,164 +41,265 @@ group { "efl/view_grid";
    data.item: "version" "123";
 }
 
-group { "efl/grid_item";
-   data.item: "version" "124";
+group { "efl/grid_item"; data.item: "version" "124";
    data.item: "selectraise" "on";
    data.item: "focusraise" "on";
-   data.item: "texts" "elm.text";
+   images.image: "bevel_dark_out.png" COMP;
+   images.image: "shadow_rounded_horiz.png" COMP;
+   images.image: "vgrad_med_dark.png" COMP;
+   images.image: "bevel_out.png" COMP;
+   images.image: "shine.png" COMP;
    parts {
-//---------------------------------------------------------------------------
-#define BASEP() \
-   part { name: "base"; type: RECT; mouse_events: 0; \
-      description { state: "default" 0.0; \
-         color_class: "/bg/normal/grid/item"; \
-      } \
-   } \
-   part { name: "sel_base"; type: RECT; mouse_events: 0; \
-      description { state: "default" 0.0; \
-         color_class: "/bg/selected/grid/item"; \
-         visible: 0; \
-      } \
-      description { state: "selected" 0.0; \
-         inherit: "default" 0.0; \
-         visible: 1; \
-      } \
-   } \
-   program { signal: "efl,state,selected"; source: "efl"; \
-      action: STATE_SET "selected" 0.0; \
-      target: "sel_base"; \
-   } \
-   program { signal: "efl,state,unselected"; source: "efl"; \
-      action: STATE_SET "default" 0.0; \
-      target: "sel_base"; \
-   } \
-   program { signal: "efl,state,disabled"; source: "efl"; \
-       action: STATE_SET "disabled" 0.0; \
-       target: "event"; \
-   } \
-   program { signal: "efl,state,enabled"; source: "efl"; \
-      action: STATE_SET "default" 0.0; \
-      target: "event"; \
-   }
-#define TOPP() \
-   part { name: "event"; type: RECT; \
-      repeat_events: 1; \
-      description { state: "default" 0.0; \
-         color: 0 0 0 0; /* no cc */ \
-      } \
-      description { state: "disabled" 0.0; \
-         inherit: "default" 0.0; \
-          visible: 0; \
-      } \
-   } \
-   part { name: "event_block"; type: RECT; \
-      description { state: "default" 0.0; \
-         color: 0 0 0 0; /* no cc */ \
-         visible: 0; \
-      } \
-      description { state: "disabled" 0.0; \
-         inherit: "default" 0.0; \
-         visible: 1; \
-      } \
-   } \
-   program { signal: "efl,state,disabled"; source: "efl"; \
-      action: STATE_SET "disabled" 0.0; \
-      target: "event_block"; \
-   } \
-   program { signal: "efl,state,enabled"; source: "efl"; \
-       action: STATE_SET "default" 0.0; \
-       target: "event_block"; \
-   }
-//---------------------------------------------------------------------------
-      BASEP()
 
-      //##//
-      part { name: "efl.text"; type: TEXT; mouse_events: 0;
+      // BASE PARTS //
+      rect { "base"; mouse;
+         desc { "default";
+         }
+      }
+      image { "bevel"; nomouse;
+         desc { "default";
+            image.normal: "bevel_dark_out.png";
+            image.border: 2 2 2 2;
+            image.middle: 0;
+            fill.smooth: 0;
+         }
+      }
+      image { "sel_shadow"; nomouse;
+         desc { "default";
+            image.normal: "shadow_rounded_horiz.png";
+            image.border: 0 0 9 9;
+            rel1.offset: 0 -4;
+            rel2.offset: -1 5;
+            fill.smooth: 0;
+            hid;
+         }
+         desc { "selected";
+            inherit: "default";
+            vis;
+         }
+      }
+      image { "sel_base"; nomouse;
+         desc { "default";
+            image.normal: "vgrad_med_dark.png";
+            fill.smooth: 0;
+            hid;
+            TILED_HORIZ(120)
+         }
+         desc { "selected";
+            inherit: "default";
+            vis;
+         }
+      }
+      image { "sel_bevel"; nomouse;
+         desc { "default";
+            image.normal: "bevel_out.png";
+            image.border: 2 2 2 2;
+            image.middle: 0;
+            fill.smooth: 0;
+            hid;
+         }
+         desc { "selected";
+            inherit: "default";
+            vis;
+         }
+      }
+      // BASE PARTS //
+
+      // TEXT PARTS //
+      text { "efl.text"; nomouse;
+         effect: SHADOW BOTTOM;
          scale: 1;
-         description { state: "default" 0.0;
+         desc { "default";
             fixed: 0 1;
             rel1.relative: 0.0 1.0;
-            rel1.offset: 4 -5;
+            rel1.offset: 5 -5;
+            rel2.relative: 1.0 1.0;
             rel2.offset: -5 -5;
-            color_class: "/fg/normal/grid/item";
+            color: FN_COL_DEFAULT;
+            color_class: "grid_item";
             align: 0.5 1.0;
-            offscale;
             text { font: FN; size: 10;
                min: 0 1;
                align: 0.5 1.0;
                text_class: "grid_item";
             }
          }
-         description { state: "selected" 0.0;
-            inherit: "default" 0.0;
-            color_class: "/fg/selected/grid/item";
+         desc { "selected";
+            inherit: "default";
+            hid;
          }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            color_class: "/fg/disabled/grid/item";
+         desc { "disabled";
+            inherit: "default";
+            hid;
          }
       }
-      program { signal: "efl,state,selected"; source: "efl";
-         action: STATE_SET "selected" 0.0;
-         target: "efl.text";
-      }
-      program { signal: "efl,state,unselected"; source: "efl";
-         action: STATE_SET "default" 0.0;
-         target: "efl.text";
-      }
-      program { signal: "efl,state,disabled"; source: "efl";
-         action: STATE_SET "disabled" 0.0;
-         target: "efl.text";
-         target: "icon_area";
-      }
-      program { signal: "efl,state,enabled"; source: "efl";
-         action: STATE_SET "default" 0.0;
-         target: "efl.text";
-         target: "icon_area";
-      }
-      //##//
-      part { name: "icon_area"; type: RECT;
+      text { "label2"; nomouse;
+         effect: SHADOW BOTTOM;
          scale: 1;
-         description { state: "default" 0.0;
-            rel1.offset: 4 4;
+         desc { "default";
+            rel1.to: "efl.text";
+            rel2.to: "efl.text";
+            color: FN_COL_DISABLE;
+            color_class: "grid_item_disabled";
+            text { font: FN; size: 10;
+               text_source: "efl.text";
+               align: 0.5 1.0;
+               text_class: "grid_item";
+            }
+            hid;
+         }
+         desc { "selected";
+            inherit: "default";
+            hid;
+         }
+         desc { "disabled";
+            inherit: "default";
+            vis;
+         }
+      }
+      text { "label3"; nomouse;
+         effect: GLOW;
+         scale: 1;
+         desc { "default";
+            rel1.offset: -2 -2;
+            rel1.to: "efl.text";
+            rel2.offset: 1 0;
+            rel2.to: "efl.text";
+            color: FN_COL_HIGHLIGHT;
+            color_class: "grid_item_selected";
+            text { font: FN; size: 10;
+               text_source: "efl.text";
+               align: 0.5 1.0;
+               text_class: "grid_item";
+            }
+            hid;
+         }
+         desc { "selected";
+            inherit: "default";
+            vis;
+         }
+         desc { "disabled";
+            inherit: "default";
+            hid;
+         }
+      }
+      // TEXT PARTS //
+
+      // CONTENT PARTS //
+      rect { "icon_area";
+         desc { "default";
+            fixed: 1 0;
+            rel1.offset: 2 2;
             rel2.to_y: "efl.text";
             rel2.relative: 1.0 0.0;
-            rel2.offset: -5 -5;
-            color: 255 255 255 255; // no cc
-            offscale;
+            rel2.offset: -3 -3;
          }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 64; // no cc
+         desc { "disabled";
+            inherit: "default";
+            color: 255 255 255 64;
          }
       }
-      part { name: "efl.icon"; type: SWALLOW;
-         clip_to: "icon_area";
-         description { state: "default" 0.0;
-            rel.to: "icon_area";
+      rect { "event";
+         desc { "default";
+            color: 0 0 0 0;
+         }
+         desc { "disabled";
+            inherit: "default";
+            hid;
          }
       }
-      part { name: "efl.extra"; type: SWALLOW;
-         scale: 1;
+      swallow { "efl.icon";
          clip_to: "icon_area";
-         description { state: "default" 0.0;
-            min: ICMIN ICMIN;
+         desc { "default";
+            rel1.to: "icon_area";
+            rel2.to: "icon_area";
+         }
+      }
+      swallow { "efl.extra";
+         clip_to: "icon_area";
+         desc { "default";
+            fixed: 1 1;
             align: 1.0 0.0;
-            rel.to: "icon_area";
             rel1.relative: 1.0 0.0;
-            rel1.offset: -5 4;
+            rel1.offset: -3 2;
             rel2.relative: 1.0 0.0;
-            rel2.offset: -5 4;
-            offscale;
+            rel2.offset: -3 2;
          }
       }
-      //##//
+      // CONTENT PARTS //
 
-      TOPP()
+      // TOP PARTS //
+      image { "sel_shine"; nomouse;
+         desc { "default";
+            image.normal: "shine.png";
+            rel1.offset: 0 -2;
+            rel1.to: "sel_base";
+            rel2.relative: 1.0 0.0;
+            rel2.offset: -1 2;
+            rel2.to: "sel_base";
+            hid;
+            FIXED_SIZE(69, 5)
+         }
+         desc { "selected";
+            inherit: "default";
+            vis;
+         }
+      }
+      rect { "event_block";
+         desc { "default";
+            color: 0 0 0 0;
+            hid;
+         }
+         desc { "disabled";
+            inherit: "default";
+            vis;
+         }
+      }
+      // TOP PARTS //
    }
    programs {
       EFL_UI_CLICKABLE_PART_BIND("event")
+      program {
+         signal: "efl,state,selected"; source: "efl";
+         action: STATE_SET "selected";
+         target: "sel_shadow";
+         target: "sel_base";
+         target: "sel_bevel";
+         target: "sel_shine";
+         target: "efl.text";
+         target: "label2";
+         target: "label3";
+      }
+      program {
+         signal: "efl,state,unselected"; source: "efl";
+         action: STATE_SET "default";
+         target: "sel_shadow";
+         target: "sel_base";
+         target: "sel_bevel";
+         target: "sel_shine";
+         target: "efl.text";
+         target: "label2";
+         target: "label3";
+      }
+      program {
+         signal: "efl,state,disabled"; source: "efl";
+         action: STATE_SET "disabled";
+         target: "event";
+         target: "event_block";
+         target: "efl.text";
+         target: "label2";
+         target: "label3";
+         target: "icon_area";
+      }
+      program {
+         signal: "efl,state,enabled"; source: "efl";
+         action: STATE_SET "default";
+         target: "event";
+         target: "event_block";
+         target: "efl.text";
+         target: "label2";
+         target: "label3";
+         target: "icon_area";
+      }
    }
 }
-#undef BASEP
-#undef TOPP

data/elementary/themes/edc/efl/group_item.edc

@@ -7,29 +7,56 @@ Group: efl/group_item (@since 1.23)
 	 Signal: efl,state,enabled
 
 */
-group { "efl/group_item";
-   data.item: "version" "124";
-   nomouse;
-   program_source: "efl";
+
+group { "efl/group_item"; data.item: "version" "124"; nomouse; program_source: "efl";
+   images.image: "shadow_square_tiny.png" COMP;
+   images.image: "bevel_out.png" COMP;
+   images.image: "horizontal_separated_bar_small_glow.png" COMP;
+
    parts {
-      rect { "base";
+      image { "shadow_vbar";
          desc { "default";
-            color_class: "/bg/normal/list/group";
+            rel1.offset: -3 -2;
+            rel1.to: "base_vbar";
+            rel2.offset: 2 4;
+            rel2.to: "base_vbar";
+            image.normal: "shadow_square_tiny.png";
+            image.border: 6 6 6 6;
+            fill.smooth: 0;
          }
       }
+      image { "base_vbar";
+         desc { "default";
+            image.normal: "vgrad_med_lighter.png";
+            fill.smooth: 0;
+            min: 5 13;
+            TILED_HORIZ(120)
+         }
+      }
+      image { "bevel_vbar";
+         desc { "default";
+            rel1.to: "base_vbar";
+            rel2.to: "base_vbar";
+            image.normal: "bevel_out.png";
+            image.border: 1 1 1 1;
+            image.middle: 0;
+            fill.smooth: 0;
+            min: 5 5;
+         }
+      }
+
       text { "efl.text";
+         effect: SHADOW BOTTOM;
          scale;
          desc { "default";
-            offscale;
-            min: 0 ICMIN;
-            rel1.offset: 4 4;
+            rel1.offset: 2 3;
             rel1.relative: 1.0 0.0;
             rel1.to_x: "efl.icon";
-            rel2.offset: -5 -5;
+            rel2.offset: -3 -3;
             rel2.relative: 0.0 1.0;
             rel2.to_x: "efl.extra";
-            align: 0.0 0.5;
-            color_class: "/fg/normal/list/group";
+            color: FN_COL_DEFAULT;
+            color_class: "list_group_item";
             text { font: FNBD; size: 10;
                min: 1 1;
                ellipsis: -1;
@@ -40,33 +67,56 @@ group { "efl/group_item";
          }
          desc { "disabled";
             inherit: "default";
-            color_class: "/fg/disabled/list/group";
+            color: FN_COL_DISABLE;
+            color_class: "list_group_item_disabled";
             link.base: "efl,state,disabled";
          }
       }
-      swallow { "efl.icon"; mouse;
-         scale;
+      swallow { "pad"; mouse;
          desc { "default";
-            offscale;
-            min: ICMIN ICMIN;
             fixed: 1 0;
             align: 0.0 0.5;
-            rel1.relative: 0.0 0.0;
-            rel1.offset: 4 2;
+            rel1.offset: 2 2;
             rel2.relative: 0.0 1.0;
-            rel2.offset: 4 -3;
+            rel2.offset: 2 -3;
+         }
+      }
+      swallow { "efl.icon"; mouse;
+         desc { "default";
+            fixed: 1 0;
+            align: 0.0 0.5;
+            rel1.to_x: "pad";
+            rel1.relative: 1.0 0.0;
+            rel1.offset: -1 2;
+            rel2.to_x: "pad";
+            rel2.relative: 1.0 1.0;
+            rel2.offset: -1 -3;
          }
       }
       swallow { "efl.extra"; mouse;
-         scale;
          desc { "default";
-            offscale;
-            min: ICMIN ICMIN;
             fixed: 1 0;
             align: 1.0 0.5;
-            rel1.offset: -5 4;
+            rel1.offset: -3 2;
             rel1.relative: 1.0 0.0;
-            rel2.offset: -5 -5;
+            rel2.offset: -3 -3;
+         }
+      }
+      image { "bar";
+         desc { "default";
+            image.normal: "horizontal_separated_bar_small_glow.png";
+            image.border: 4 4 4 4;
+            fill.smooth: 0;
+            fixed: 0 1;
+            rel1.relative: 0.0 1.0;
+            rel1.offset: -3 -6;
+            rel2.offset: 2 3;
+            link.base: "efl,state,enabled";
+         }
+         desc { "disabled";
+            inherit: "default";
+             color: 255 255 255 64;
+             link.base: "efl,state,disabled";
          }
       }
    }

data/elementary/themes/edc/efl/image_zoomable.edc

@@ -17,22 +17,101 @@ Group: efl/image_zoomable (@since 1.23)
 group { name: "efl/image_zoomable";
    inherit: "efl/scroller";
    data.item: "version" "123";
-   IMAGE_RING("ringa", 160)
-   IMAGE_RING("ringb", 160)
-   IMAGE_RING("ringc", 160)
+   images.image: "knob_round_busy.png" COMP;
+   images.image: "glow_round_corners.png" COMP;
    parts {
-      BUSY("base", "elm,state,pulse,started", "efl", "elm,state,pulse,stopped", "efl")
-      part { name: "base"; type: RECT;
+      part { name: "busy_clip"; type: RECT;
+         description { state: "default" 0.0;
+            visible: 0;
+            color: 255 255 255 0;
+         }
+         description { state: "active" 0.0;
+            visible: 1;
+            color: 255 255 255 255;
+         }
+      }
+      part { name: "knob"; mouse_events: 0;
+         clip_to: "busy_clip";
          scale: 1;
          description { state: "default" 0.0;
-            color: 0 0 0 0; // no cc
-            rel1.offset: 4 4;
-            rel2.offset: -5 -5;
-            align: 1.0 1.0;
+            image.normal: "knob_round_busy.png";
             min: 40 40;
             max: 40 40;
-            offscale;
+            align: 0.0 0.0;
+            rel1.offset: 3 3;
+            rel2.offset: 3 3;
+            fixed: 1 1;
+         }
+      }
+      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;
          }
       }
    }
+   programs {
+      program { name: "spin";
+         signal: "efl,state,busy,started"; source: "efl";
+         action: ACTION_STOP;
+         target: "spin";
+         target: "spin0";
+         target: "spin1";
+         target: "spin2";
+         target: "spin3";
+         target: "spin4";
+         after: "spin0";
+      }
+      program { name: "spin0";
+         action: STATE_SET "default" 0.0;
+         target: "knob_spinner";
+         after: "spin1";
+      }
+      program { name: "spin1";
+         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: "spin1";
+      }
+      
+      program {
+         signal: "efl,state,busy,started"; source: "efl";
+         action: STATE_SET "active" 0.0;
+         transition: SINUSOIDAL 0.25;
+         target: "busy_clip";
+      }
+      
+      program {
+         signal: "efl,state,busy,stopped"; source: "efl";
+         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";
+      }
+   }
 }