elm theme - notification - note signals for category and urgency

this is bad but it's necessary. need to make the htextblock accept
events so links can be put in it. this then also requires it become
editable to support anchors and items which are needed for
notification links and inline images.

since this has to break nayway, embrace the break and add action box
swallow - and action buttons. the action buttons will probably need a
swallow added for icons still - but debating that still.

@fix / break / feat

.arcconfig

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

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

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

.ci/build-example.sh

@@ -1,16 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ -d /usr/local/lib64 ] ; then
-  export PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig
-else
-  export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
-fi
-cd .ci/example
-
-#build the example
-mkdir build
-meson . build
-ninja -C build all
-

.ci/ccache.conf

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

.ci/ci-build-test.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-
-set -e
-
-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"
-if [ "$DISTRO" != "" ] ; then
-  docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) .ci/build-example.sh
-elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
-  exit 0
-  #FIXME: we don't install efl_ui.pc on osx?
-  export PATH="$(brew --prefix gettext)/bin:$PATH"
-  .ci/build-example.sh
-fi
-travis_time_finish "app-compile-test"
-travis_fold end "app-compile-test"

.ci/ci-ccache-stats.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-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,114 +0,0 @@
-#!/bin/bash
-
-set -e
-
-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"
-
-  WAYLAND_LINUX_COPTS=" -Dwl=true -Ddrm=true -Dopengl=es-egl -Dwl-deprecated=true -Ddrm-deprecated=true"
-
-  # TODO:
-  # - No libelogind package in fedora 30 repo
-  # - 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"
-
-  # 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 \
-  -Dedje-sound-and-video=false -Dembedded-lz4=false -Dlibmount=false -Dv4l2=false \
-  -Delua=false -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 \
-  -Dharfbuzz=true -Dpixman=true -Dembedded-lz4=false "
-
-  if [ "$1" = "default" ]; then
-    OPTS="$OPTS $MONO_LINUX_COPTS"
-  elif [ "$1" = "options-enabled" ]; then
-    OPTS="$OPTS $ENABLED_LINUX_COPTS $WAYLAND_LINUX_COPTS"
-  elif [ "$1" = "options-disabled" ]; then
-    OPTS="$OPTS $DISABLED_LINUX_COPTS"
-  elif [ "$1" = "wayland" ]; then
-    OPTS="$OPTS $WAYLAND_LINUX_COPTS"
-  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"
-    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"
-  elif [ "$1" = "mingw" ]; then
-    travis_fold start "cross-native"
-    travis_time_start "cross-native"
-    OPTS="$OPTS $MINGW_COPTS"
-    docker exec $(cat $HOME/cid) sh -c '.ci/bootstrap-efl-native-for-cross.sh'
-    travis_time_finish "cross-native"
-    travis_fold end "cross-native"
-  fi
-
-  if [ "$1" = "asan" ]; then
-    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"
-  elif [ "$1" = "mingw" ]; then
-    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"
-  elif [ "$1" = "coverity" ]; then
-    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"
-  else
-    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"
-  fi
-elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
-  # Prepare OSX env for build
-  mkdir -p ~/Library/LaunchAgents
-  ln -sfv /usr/local/opt/d-bus/*.plist ~/Library/LaunchAgents
-  launchctl load ~/Library/LaunchAgents/org.freedesktop.dbus-session.plist
-  export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
-
-  export CFLAGS="-I/usr/local/opt/openssl/include -frewrite-includes $CFLAGS"
-  export LDFLAGS="-L/usr/local/opt/openssl/lib $LDFLAGS"
-  LIBFFI_VER=$(brew list --versions libffi|head -n1|cut -d' ' -f2)
-  export 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
-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 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if [ "$1" != "default" ] ; then
-  exit 0
-fi
-travis_fold start "ninja-benchmark"
-travis_time_start "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"

.ci/ci-make-check.sh

@@ -1,41 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if [ "$1" = "release-ready" ] || [ "$1" = "mingw" ] || [ "$1" = "coverity" ] || [ "$1" = "options-enabled" ] || [ "$1" = "options-disabled" ] ; then
-  exit 0
-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"
-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
-    docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) cat build/meson-logs/testlog-dbus-launch.txt
-    if [ $tries != ${NUM_TRIES} ] ; then echo "tests failed, trying again!" ; fi
-      false
-  done
-fi
-ret=$?
-travis_time_finish "ninja-test"
-travis_fold end "ninja-test"
-
-exit $ret

.ci/ci-make-distcheck.sh

@@ -1,22 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if [ "$1" != "release-ready" ] ; then
-  exit 0
-fi
-
-travis_fold start "ninja-dist"
-travis_time_start "ninja-dist"
-if [ "$DISTRO" != "" ] ; then
-  docker exec --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
-    --env CXX="ccache g++" \
-    --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \
-    --env LD="ld.gold" $(cat $HOME/cid) dbus-launch ninja -C build dist || \
-    (sudo cat efl-*/_build/sub/src/test-suite.log; false)
-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"

.ci/ci-make-install.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if [ "$1" = "release-ready" ] || [ "$1" = "coverity" ] ; then
-  exit 0
-fi
-
-travis_fold start "ninja-install"
-travis_time_start "ninja-install"
-if [ "$DISTRO" != "" ] ; then
-  docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) ninja -C build install
-elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
-  export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
-  ninja -C build install
-else
-  sudo ninja -C build install
-fi
-travis_time_finish "ninja-install"
-travis_fold end "ninja-install"

.ci/ci-make.sh

@@ -1,31 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if [ "$1" = "release-ready" ] ; then
-  exit 0
-fi
-
-travis_fold start "ninja"
-travis_time_start "ninja"
-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"
-    docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) sh -c "tar caf efl-$(git rev-parse --short HEAD).xz cov-int"
-    docker exec --env EIO_MONITOR_POLL=1 --env COVERITY_SCAN_TOKEN=$COVERITY_SCAN_TOKEN $(cat $HOME/cid) sh -c ".ci/coverity-upload.sh"
-  else
-    docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) ninja -C build
-    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"

.ci/ci-setup-ccache.sh

@@ -1,17 +0,0 @@
-#!/bin/bash
-
-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
-elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
-  cp .ci/ccache.conf ~/.ccache
-  sed -iE '/^base_dir/d' ~/.ccache/ccache.conf
-  echo "base_dir = $pwd" >> ~/.ccache/ccache.conf
-  ccache -pz
-fi
-travis_time_finish "ccache-setup"
-travis_fold end "ccache-setup"

.ci/coverity-tools-install.sh

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

.ci/coverity-upload.sh

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

.ci/cross_toolchain.txt

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

.ci/docker-ccache-setup.sh

@@ -1,8 +0,0 @@
-#!/bin/sh
-
-CI_BUILD_TYPE="$1"
-
-cp .ci/ccache.conf ~/.ccache
-
-sed -iE '/^base_dir/d' ~/.ccache/ccache.conf
-echo "base_dir = $pwd" >> ~/.ccache/ccache.conf

.ci/example/meson.build

@@ -1,13 +0,0 @@
-project(
-  'efl-example', 'c',
-  version : '0.0.1',
-  default_options: [ 'c_std=gnu99', 'warning_level=2' ],
-  meson_version : '>= 0.38.0')
-
-eina = dependency('eina', version : '>=1.20.99')
-efl = dependency('efl-ui', version : '>=1.20.99')
-elm = dependency('elementary', version : '>=1.20.99')
-
-inc = include_directories('.')
-subdir('src')
-

.ci/example/src/main.c

@@ -1,11 +0,0 @@
-#define EFL_BETA_API_SUPPORT 1
-#define EFL_NOLEGACY_API_SUPPORT
-#include <Efl_Ui.h>
-
-
-EAPI_MAIN void
-efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
-{
-   return;
-}
-EFL_MAIN()

.ci/example/src/meson.build

@@ -1,12 +0,0 @@
-src = files([
-  'main.c',
-])
-
-deps = [eina, efl, elm]
-
-executable('efl_example', src,
-  dependencies : deps,
-  include_directories : inc,
-  install : true
-)
-

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

@@ -1,19 +0,0 @@
-#!/bin/bash
-
-set -e
-
-travis_fold start "bionic-deps"
-travis_time_start "bionic-deps"
-
-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"

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

.lcov-config

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

.lgtm.yml

@@ -1,7 +0,0 @@
-extraction: 
-  python: 
-    python_setup: 
-      version: 3
-queries: 
-  - 
-    exclude: cpp/fixme-comment

.travis.yml

@@ -1,153 +0,0 @@
-version: ~> 1.0
-
-language: c
-cache:
-  directories:
-    - $HOME/cachedir
-    - $HOME/.ccache
-dist: bionic
-
-osx_image: xcode11.3
-
-addons:
-  homebrew:
-    packages:
-      - gettext
-      - check
-      - bullet
-      - dbus
-      - fontconfig
-      - freetype
-      - fribidi
-      - gst-plugins-good
-      - gstreamer
-      - luajit
-      - openssl
-      - webp
-      - libsndfile
-      - glib
-      - libspectre
-      - libraw
-      - librsvg
-      - poppler
-      - lz4
-      - pulseaudio
-      - ccache
-      - ninja
-      - python3
-      - libffi
-    update: true
-
-env:
-  global:
-    - EIO_MONITOR_POLL=1
-    - CC="ccache gcc"
-    - CXX="ccache g++"
-
-jobs:
-  include:
-    - os: linux
-      env: DISTRO=Fedora32-mingw CI_BUILD_TYPE=mingw
-    - os: linux
-      env: DISTRO=Fedora32 CI_BUILD_TYPE=options-enabled
-    - os: linux
-      env: DISTRO=Fedora32 CI_BUILD_TYPE=options-disabled
-    - os: linux
-      env: DISTRO=Fedora32 CI_BUILD_TYPE=wayland
-    - os: linux
-      env: DISTRO=Fedora32 CI_BUILD_TYPE=default
-    - os: linux
-      if: type = cron
-      env: DISTRO=Fedora32 CI_BUILD_TYPE=release-ready
-    - os: linux
-      if: type = cron
-      env: DISTRO=Ubuntu2004
-    - os: linux
-      if: type = cron
-      env: DISTRO=Ubuntu1910
-    - os: linux
-      if: type = cron
-      env: DISTRO=Debian103
-    - os: linux
-      if: type = cron
-      env: DISTRO=Fedora31 CI_BUILD_TYPE=coverity
-    - os: linux
-      if: type = cron
-      env: DISTRO=Fedora32 CI_BUILD_TYPE=asan
-    - os: linux
-      if: type = cron
-      env: CI_BUILD_TYPE=codecov
-    - os: linux
-      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
-        rm -rf $HOME/cachedir/Homebrew/Homebrew
-        mv $HOME/cachedir/Homebrew $HOME/Library/Caches/Homebrew
-        pip3 install meson
-      fi
-
-before_script:
-  - |
-      if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$DISTRO" != "" ]]; then
-        docker pull stefanschmidt1/ci-support-files:$DISTRO
-        docker version
-        docker run --cap-add SYS_PTRACE --cidfile $HOME/cid -t -d -v `pwd`:/src -v $HOME/.ccache:/root/.ccache -w /src stefanschmidt1/ci-support-files:$DISTRO bash
-      fi
-  - |
-      if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$DISTRO" == "" ]]; then
-        .ci/ubuntu-bionic-install-deps.sh
-      fi
-  - .ci/ci-ccache-stats.sh
-
-script:
-  - .ci/ci-configure.sh "$CI_BUILD_TYPE"
-  - .ci/ci-setup-ccache.sh "$CI_BUILD_TYPE"
-  - .ci/ci-make.sh "$CI_BUILD_TYPE"
-  - .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"
-
-before_cache:
-  - .ci/ci-ccache-stats.sh
-  - |
-       mkdir -p $HOME/cachedir
-       if [[ "$TRAVIS_OS_NAME" == "linux" ]] ; then
-         sudo chown travis:travis $HOME/.ccache
-       else
-         mv $HOME/Library/Caches/Homebrew $HOME/cachedir/Homebrew
-       fi
-
-notifications:
-  irc:
-    channels:
-      - "chat.freenode.net#edevelop"
-    on_success: change
-    on_failure: always
-    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.images

@@ -1,10 +0,0 @@
-Gesture Layer 2 (all the icons in data/elementary/images/g_layer):
-  Illustrations provided by GestureWorks® (www.gestureworks.com)
-  Creative Commons Attribution Sharealike license v 3.0.
-  http://gestureworks.com/
-  http://gestureworks.com/icons-fonts
-  http://creativecommons.org/licenses/by-sa/3.0/us/
-
-EFL Bluish-X icons theme (all the icons in data/elementary/themes/fdo):
-  GNU General Public License v3
-  see the README in data/elementary/themes/fdo for more info

INSTALL

@@ -1,59 +0,0 @@
-** COMPILING and INSTALLING **
-------------------------------
-
-Meson is the build system used for this project. For more information please
-see:
-
-    http://mesonbuild.com
-
-----
-
-Normal compilation in /usr/local:
-
-    meson . build
-    ninja -C build
-    sudo ninja -C build install
-
-For meson build generic options:
-
-    meson --help
-
-For a list of project specific options supported:
-
-    cat meson_options.txt
-
-To set 1 or more project specific options:
-
-    meson --prefix=/path/to -Doption=value [-Dother=value2] [...] . build
-
-To display current configuration:
-
-    meson configure build
-
-The above will only work after at least the following is done:
-
-    meson . build
-
-** QUICK AND DIRTY HELP **
---------------------------
-
-How clean out the build and config and start fresh:
-
-    rm -rf build
-
-How to make a dist tarball and check its build:
-(must do it from git tree clone and commit all changes to git first)
-
-    ninja -C build dist
-
-How to change prefix:
-
-    meson --prefix=/path/to/prefix . build
-
-How to install in a specific destination directory for packaging:
-
-    DESTDIR=/path/to/destdir ninja -C build install
-
-How to build with verbose output (full commands run):
-
-    ninja -C build -v

README.md

@@ -1,10 +1,12 @@
-EFL
-===
+![EFL](/data/readme/efl.png)
+# EFL
 
-******************************************************************************
- FOR ANY ISSUES PLEASE EMAIL:
- enlightenment-devel@lists.sourceforge.net
-******************************************************************************
+-----
+
+*Please report bugs/issues at*
+[git.enlightenment.org](https://git.enlightenment.org/enlightenment/efl/issues)
+
+-----
 
 EFL is a collection of libraries for handling many common tasks a
 developer may have such as data structures, communication, rendering,
@@ -24,22 +26,21 @@ Config files installed to help developers build against EFL.
 
 For more documentation please see:
 
-https://www.enlightenment.org/docs
+[www.enlightenment.org/doc](https://www.enlightenment.org/docs)
 
-PLATFORMS
----------
+## Platforms
 
-EFL is primarily developerd on Linux (GNU/Linux) and should work on
+EFL is primarily developed on Linux (GNU/Linux) and should work on
 most distributions as long as dependencies are provided. It has been
-compiled and run also on Windows (using MINGW32 - please see
-http://www.winbuilds.org ), Mac OS X, FreeBSD and NetBSD.
+compiled and run also on Windows (using MSYS2 + mingw-w64 - please see
+[Phabricator windows docs](https://phab.enlightenment.org/w/windows)),
+Mac OS X, FreeBSD and NetBSD.
 
-COMPONENTS
-----------
+## Components
 
 **Ecore:**
 
-//BSD 2-Clause license//
+*BSD 2-Clause license*
 
 This is the core main-loop, system events and execution layer. This
 handles running the main loop, integrating with external data and
@@ -47,31 +48,25 @@ timing sources (the system clock, file descriptors, system signals),
 and producing an event queue, walking that queue and dispatching
 events to appropriate callbacks.
 
-
-
 **Ecore Audio:**
 
-//BSD 2-Clause license//
+*BSD 2-Clause license*
 
 This library provides an API for audio playback and recording. It uses
 pulse audio underneath to handle mixing and policies. The API for this
 should not be considered stable right now because it relies on EO and
 EO is not considered finalized yet.
 
-
-
 **Ecore Cocoa:**
 
-//BSD 2-Clause license//
+*BSD 2-Clause license*
 
 This provides wrappers/abstractions around Max OS-X Cocoa APIs to help
 Mac porting.
 
-
-
 **Ecore Con:**
 
-//BSD 2-Clause license//
+*BSD 2-Clause license*
 
 This provides a completely event-based TCP/UDP and Unix domain socket
 API that integrates with the main-loop. This means no blocking to send
@@ -82,11 +77,9 @@ verification, CURL wrapping for HTTP connection usage (GETs, POSTs
 etc.), asynchronous DNS lookups and provides the ability to also be a
 server, not just a client, with the same event-based API.
 
-
-
 **Ecore Evas:**
 
-//BSD 2-Clause license//
+*BSD 2-Clause license*
 
 This acts as glue between the display target (X11, Wayland,
 Frame buffer, Cocoa on OSX, Win32 etc.) and Evas. It creates/provides a
@@ -95,69 +88,55 @@ input events (Keyboard, Mouse, Multi-touch) into Evas, which then
 selects the target object and calls the callbacks. It also provides
 wrappers/glue for manipulating the Window/Surface.
 
-
-
 **Ecore Fb:**
 
-//BSD 2-Clause license//
+*BSD 2-Clause license*
 
 This provides virtual terminal allocation, access and handling,
 frame buffer information, raw input handling for keyboard, mouse and
 touch (via tslib).
 
-
-
 **Ecore File:**
 
-//BSD 2-Clause license//
+*BSD 2-Clause license*
 
 This provides file access convenience APIs for doing simple file
 operations like renames, copies, listing directories and more. It also
 supports file change monitoring and URL downloads.
 
-
-
 **Ecore IMF:**
 
-//BSD 2-Clause license//
+*BSD 2-Clause license*
 
 This is an input method abstraction framework to allow EFL to talk to
 things like SCIM, IBus, Wayland and XIM. This allows for complex text
 entry in languages such as Chinese, Japanese and Korean.
 
-
-
 **Ecore IMF Evas:**
 
-//BSD 2-Clause license//
+*BSD 2-Clause license*
 
 This library glues Input method support from Ecore IMF and Evas
 together.
 
-
-
 **Ecore Input:**
 
-//BSD 2-Clause license//
+*BSD 2-Clause license*
 
 This acts as a generic input layer where multiple display systems can
 post events in the same format to the event queue.
 
-
-
 **Ecore Input Evas:**
 
-//BSD 2-Clause license//
+*BSD 2-Clause license*
 
 This Routes events from Ecore Input into a given Evas canvas which
 will then route the event further to the destination object and
 callbacks.
 
-
-
 **Ecore IPC:**
 
-//BSD 2-Clause license//
+*BSD 2-Clause license*
 
 This acts as a layer on top of Ecore Con which handles entire IPC
 message packets, dealing with header delta compression and
@@ -166,59 +145,39 @@ go as a single IPC message, regardless of payload data size. The
 entire API is event based almost exactly like Ecore Con and thus it
 supports all the transport layers Ecore Con supports.
 
-
-
-
 **Ecore SDL:**
 
-//BSD 2-Clause license//
+*BSD 2-Clause license*
 
 This acts as a wrapper/glue around SDL to handle SDL Windows as well
 as input events from SDL and tie them to the Ecore main-loop and event
 queue.
 
-
-
 **Ecore Wayland:**
 
-//BSD 2-Clause license//
+*BSD 2-Clause license*
 
 This is a glue/wrapper library to interface EFL to Wayland libraries
 to tie them into the Ecore main-loop and event queue.
 
-
-
 **Ecore Win32:**
 
-//BSD 2-Clause license//
+*BSD 2-Clause license*
 
 This acts as glue/wrapper around Windows Win32 APIs to tie them into
 the Ecore main-loop and event queue.
 
-
-
-**Ecore WinCE:**
-
-//BSD 2-Clause license//
-
-This acts as glue/wrapper around Windows CE APIs to tie them into the
-Ecore main-loop and event queue.
-
-
-
 **Ecore X:**
 
-//BSD 2-Clause license//
+*BSD 2-Clause license*
 
 This is a library to wrap/deal with Xlib make dealing with X11 less painful
 and less footwork as well as being glue to tie these into the Ecore main-loop
 and event queue.
 
-
-
 **Edje:**
 
-//BSD 2-Clause license// (except the epp binary which is GPLv2)
+*BSD 2-Clause license* (except the epp binary which is GPLv2)
 
 This is a graphics event, input, theme, animation and theme
 abstraction library used to place many UI/UX elements into data files
@@ -230,11 +189,9 @@ data files managed by Eet). These "edj" files are fully portable and
 can work on any OS/Architecture just like a JPEG or PNG might be
 portable.
 
-
-
 **Eet:**
 
-//BSD 2-Clause license//
+*BSD 2-Clause license*
 
 This library is a data storage, encoding and decoding library
 designed to be extremely compact, fast and easy to use. It can take
@@ -249,29 +206,23 @@ Terminology. It supports encryption of data too via SSL, signing of
 files, as well as various compression techniques. It also supports
 encoding and decoding of image data in lossless or lossy form.
 
-
-
 **Eeze:**
 
-//BSD 2-Clause license//
+*BSD 2-Clause license*
 
 This library acts as an abstraction to discovering hardware interfaces
 for sensors as well as removable media and much more.
 
-
-
 **EFL:**
 
-//BSD 2-Clause license//
+*BSD 2-Clause license*
 
 This is just some core common header data like a common version number
 for EFL and how to expose the EO API.
 
-
-
 **Efreet:**
 
-//BSD 2-Clause license//
+*BSD 2-Clause license*
 
 This library provides code for handling Freedesktop.org standards such
 as .desktop files, XDG Menus, Icon search paths and more. It provides
@@ -279,11 +230,9 @@ a central daemon to handle monitoring for changes that the library
 talks to, and the daemon handles updating local cache files the
 library reads.
 
-
-
 **Eina:**
 
-//LGPL v2 license//
+*LGPL v2 license*
 
 This library provides low-level routines for common things like linked
 lists, hash tables, growable arrays, basic string buffers, shared
@@ -292,29 +241,23 @@ memory pools, copy-on-write segments, iterators, matrices, general
 data models, red/black trees, quad-trees, a simple SAX XML parser and
 more.
 
-
-
 **EIO:**
 
-//LGPL v2 license//
+*LGPL v2 license*
 
 This is an asynchronous I/O library for doing disk I/O without blocking.
 
-
-
 **ElDBus:**
 
-//LGPL v2 license//
+*LGPL v2 license*
 
 This is a DBus access library to allow you to create DBus services as
 well as clients. This glues in DBus into the main-loop so all access is
 asynchronous.
 
-
-
 **Embryo:**
 
-//Small license (same as ZLib license)//
+*Small license (same as ZLib license)*
 
 This is a small C-like language compiler and byte-code interpreter
 library. This is used for scripting in Edje. The code is based on
@@ -322,11 +265,9 @@ original source from the Pawn/Small Language but has been made
 portable (endianness issues fixed) and 64bit issues fixed, with the
 runtime library being refactored to be extremely small.
 
-
-
 **Emotion:**
 
-//BSD 2-Clause license//
+*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
@@ -334,11 +275,9 @@ that will display the playback for you as the video plays, as well as
 providing higher level controls to seek, play, pause and query the stream
 regardless of the back-end used.
 
-
-
 **EO:**
 
-//BSD 2-Clause license//
+*BSD 2-Clause license*
 
 This is a core object system API that EFL 1.8 and on depend on. The
 API is not finalized, so do not depend on it yet in EFL 1.8, but
@@ -349,43 +288,35 @@ strong and weak references, auto-deletion of child objects, unifies
 callback handling with a single path, and also abstracts object
 pointers to be indirect table lookups for increased safety at runtime.
 
-
-
 **EPhysics:**
 
-//BSD 2-Clause license//
+*BSD 2-Clause license*
 
 This library provides a wrapper around the Bullet physics library,
 allowing for it to be linked directly with Evas objects and control
 their behavior as if they were real physical objects. This is now
 disabled by default as it's rarely if ever used by anything.
 
-
-
 **Ethumb:**
 
-//LGPL v2 license//
+*LGPL v2 license*
 
 This library provides core API for a thumbnailing daemon as well as
 the thumbnail daemon itself. Ethumb Client talks with Ethumb to pass
 off thumbnail generation to a central location to be done
 asynchronously.
 
-
-
 **Ethumb Client:**
 
-//LGPL v2 license//
+*LGPL v2 license*
 
 This is the client-side part of Ethumb that provides an API for
 clients to request the Ethumb thumbnailer to generate or find cached
 thumbnails of files.
 
-
-
 **Evas:**
 
-//BSD 2-Clause license//
+*BSD 2-Clause license*
 
 This is the core rendering and scene graph abstraction library for
 EFL. It manages a stateful 2D scene graph that defines the entire
@@ -394,121 +325,108 @@ display systems like X11, Windows, Wayland, Frame-buffer etc. and via
 many rendering APIs like OpenGL, OpenGL-ES 2, and pure software
 implementations that are fast and accurate.
 
-
-
 **Evil:**
 
-//BSD 2-Clause license//
+*BSD 2-Clause license*
 
 This library acts as a porting library for Windows to provide missing
-libc calls not in Mingw32 that EFL needs.
+libc calls not in Mingw32 that EFL needs. It is used internally and
+no symbol is public.
 
+-----
 
-**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
-------------------------
-
-See the INSTALL file: https://git.enlightenment.org/core/efl.git/tree/INSTALL
-
-
-REQUIREMENTS
-------------
+## Requirements
 
 EFL requires a C and C++ compiler by default. C++ exists mostly to interface
 to C++ libraries like Bullet and our C++ bindings.
 
 Required by default:
 
-  * libpng
-  * libjpeg
-  * openjpeg2
-  * gstreamer (Ensure all codecs you want are installed.)
-  * zlib
-  * luajit (lua 5.1 or 5.2 support optional)
-  * libtiff
-  * openssl
-  * curl
-  * dbus
-  * libc
-  * fontconfig
-  * freetype2
-  * fribidi
-  * harfbuzz
-  * libpulse
-  * libsndfile
-  * libx11
-  * libxau
-  * libxcomposite
-  * libxdamage
-  * libxdmcp
-  * libxext
-  * libxfixes
-  * libxinerama
-  * libxrandr
-  * libxrender
-  * libxss
-  * libxtst
-  * libxcursor
-  * libxi (2.2 or newer)
-  * opengl(mesa etc.) (opengl/glx/full or opengl-es2/egl. full opengl only on osx - must be explicitly specified to be full to have support)
-  * giflib/libgif
-  * util-linux (limbount + libblkid)
-  * systemd / libudev
-  * poppler / poppler-cpp
-  * libraw
-  * libspectre
-  * librsvg
-  * openmp (clang needs libomp, while gcc uses libgomp)
-  * libwebp
+* libpng
+* libjpeg
+* openjpeg2
+* gstreamer (Ensure all codecs you want are installed.)
+* zlib
+* luajit (lua 5.1 or 5.2 support optional)
+* libtiff
+* openssl
+* curl
+* dbus
+* libc
+* fontconfig
+* freetype2
+* fribidi
+* harfbuzz
+* libpulse
+* libsndfile
+* libx11
+* libxau
+* libxcomposite
+* libxdamage
+* libxdmcp
+* libxext
+* libxfixes
+* libxinerama
+* libxrandr
+* libxrender
+* libxss
+* libxtst
+* libxcursor
+* libxi (2.2 or newer)
+* opengl(mesa etc.) (opengl/glx/full or opengl-es2/egl. full opengl only on osx - must be explicitly specified to be full to have support)
+* giflib/libgif
+* util-linux (limbount + libblkid)
+* systemd / libudev
+* poppler / poppler-cpp
+* libraw
+* libspectre
+* librsvg
+* openmp (clang needs libomp, while gcc uses libgomp)
+* libwebp
 
-Wayland support:
+
+### Wayland support
 
 You may also want wayland support when on Linux. This enables support
-for EFL to trget wayland support for client applications. To do this
+for EFL to target wayland support for client applications. To do this
 supply:
+``` sh
+-Dwl=true
+```
 
-    -Dwl=true
-
-Framebuffer support:
-
-This requires linux frame-buffer support, headers etc. This supports
-basic frame-buffers like /dev/fb as well as input via /dev/input for
-keyboards and mice in a basic way. Enable this with:
-
-    -Dfb=true
+### Framebuffer support
 
 For more modern framebuffer support you may want drm/kms rendering
 support so enable this. This is what you also want for wayland
 compositor support in enlightenment as it will want to be able to
-render to a moder framebuffer tarbet with atomic buffer swapping. To
+render to a modern framebuffer target with atomic buffer swapping. To
 do this provide:
+``` sh
+-Ddrm=true
+```
 
-    -Ddrm=true
+Legacy fbcon support also exists, but you probably no longer want to
+use this as it is not maintained anymore. This supports basic frame-buffers
+like /dev/fb as well as input via /dev/input for keyboards and mice in a
+basic way. Enable this with:
+``` sh
+-Dfb=true
+```
 
 You may want to change the install prefix for EFL with:
-
-    --prefix=/path/to/prefix
+``` sh
+--prefix=/path/to/prefix
+```
 
 The default prefix if not given is "/usr/local". Many people like to
 use prefixes like /opt/e or /opt/efl or /home/USERNAME/software etc.
 
-COMPILER FLAGS
---------------
+### Compiler flags
 
 You can affect compilation optimization, debugging and other factors
-by setting your CFLAGS environment variable (and CXXFLAGS). Be aware
-that to ensure ABI stability you should use the exact same CFLAGS /
-CXXFLAGS for all the build of EFL and any applications/libraries that
+by setting your `CFLAGS` environment variable (and `CXXFLAGS`). Be aware
+that to ensure ABI stability you should use the exact same `CFLAGS` /
+`CXXFLAGS` for all the build of EFL and any applications/libraries that
 depend on them.
 
 There are many other configure options that can be used, but in
@@ -521,13 +439,108 @@ these without understanding the implications. The defaults
 have been carefully considered to provide full functionality so users
 will not be missing anything.
 
-
-CRYPTOGRAPHY
-------------
+### Cryptography
 
 EFL officially offers openssl or gnutls as cryptography backends. By
 default it uses "openssl" to do signature, cipher and related. Alternatively
 one can use "gnutls" (some distros are strict about licenses and want gnutls
 instead of openssl) You can switch to gnutls with:
+``` sh
+-Dcrypto=gnutls
+```
 
-    -Dcrypto=gnutls
+-----
+
+## Compiling and Installing
+
+Meson is the build system used for this project. For more information
+please see [mesonbuild.com](https://mesonbuild.com)
+
+You will need normal build tooling installed such as a compiler (gcc
+or clang for example), pkg-config, ninja, any relevant package-dev or
+package-devel packages if your distribution splits out development
+headers (e.g. libc6-dev) etc.
+
+Depending on where dependencies,  you might have to set your
+`PKG_CONFIG_PATH` environment variable like:
+```sh
+export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/lib/pkgconfig
+```
+
+Also note that some distributions like to add extra arch directories
+to your library locations so you might have to have more like:
+```sh
+export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/local/lib64/pkgconfig:/usr/local/lib/x86_64-linux-gnu/pkgconfig:/usr/lib/pkgconfig:/usr/lib64/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig
+```
+
+You will need to ensure that the destination library directory (e.g.
+`/usr/local/lib` is in your /etc/ld.so.conf or /etc/ld.so.conf.d/
+files and after installing anything that installs libraries you
+re-run `ldconfig`. Please see relevant documentation on ldconfig and
+ld.so.conf for your distribution.
+
+You might also want to add the destination bin dir to your environment
+variable PATH (see documentation on your shell PATH variable) such as:
+```sh
+export PATH=/usr/local/bin:/usr/bin:/bin
+```
+
+Normal compilation in /usr/local:
+```sh
+meson . build
+ninja -C build
+sudo ninja -C build install
+```
+
+For meson build generic options:
+```sh
+meson --help
+```
+
+For a list of project specific options supported:
+```sh
+cat meson_options.txt
+```
+
+To set 1 or more project specific options:
+```sh
+meson --prefix=/path/to -Doption=value [-Dother=value2] [...] . build
+```
+
+To display current configuration:
+```sh
+meson configure build
+```
+
+The above will only work after at least the following is done:
+```sh
+meson . build
+```
+
+### Quick build help
+
+How to clean out the build and config and start fresh:
+```sh
+rm -rf build
+```
+
+How to make a dist tarball and check its build:
+(must do it from git tree clone and commit all changes to git first)
+```sh
+ninja -C build dist
+```
+
+How to change prefix:
+```sh
+meson --prefix=/path/to/prefix . build
+```
+
+How to install in a specific destination directory for packaging:
+```sh
+DESTDIR=/path/to/destdir ninja -C build install
+```
+
+How to build with verbose output (full commands run):
+```sh
+ninja -C build -v
+```

confs/freebsd.sh

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

confs/linux-elogind.sh

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

confs/linux-nowayland-nosystemd.sh

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

confs/openbsd.sh

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

data/elementary/colors/candy-mint.src

@@ -0,0 +1,698 @@
+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

@@ -0,0 +1,82 @@
+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

@@ -0,0 +1,558 @@
+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

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

data/elementary/colors/light.src

@@ -0,0 +1,698 @@
+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

@@ -0,0 +1,558 @@
+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

@@ -0,0 +1,19 @@
+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

@@ -0,0 +1,726 @@
+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

@@ -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: 0;
-  value "auto_norender_iconified_same_as_withdrawn" uchar: 0;
-  value "auto_flush_withdrawn" 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_dump_withdrawn" uchar: 0;
   value "auto_throttle" uchar: 0;
-  value "auto_throttle_amount" double: 0.1;
+  value "auto_throttle_amount" double: 0.03333333333;
   value "magnifier_enable" uchar: 1;
   value "magnifier_scale" double: 1.5;
   value "audio_mute_effect" uchar: 0;

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@', '0'],
+  command: [eet_bin, '-e', '@OUTPUT@', 'config', '@INPUT@', '1'],
   install: true,
   install_dir: join_paths(dir_data, 'elementary', 'config', config),
 )

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

@@ -89,9 +89,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: 1;
-  value "auto_throttle" uchar: 1;
-  value "auto_throttle_amount" double: 0.0666666666;
+  value "auto_dump_withdrawn" uchar: 0;
+  value "auto_throttle" uchar: 0;
+  value "auto_throttle_amount" double: 0.03333333333;
   value "indicator_service_0" string: "elm_indicator_portrait";
   value "indicator_service_90" string: "elm_indicator_landscape";
   value "indicator_service_180" string: "elm_indicator_portrait";

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@', '0'],
+    command: [eet_bin, '-e', '@OUTPUT@', 'config', '@INPUT@', '1'],
     install: true,
     install_dir: join_paths(dir_data, 'elementary', 'config', config),
   )

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

@@ -87,10 +87,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: 0;
-  value "auto_norender_iconified_same_as_withdrawn" 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_dump_withdrawn" uchar: 1;
+  value "auto_dump_withdrawn" uchar: 0;
   value "auto_throttle" uchar: 0;
   value "auto_throttle_amount" double: 0.0333333333;
   value "magnifier_enable" uchar: 0;

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@', '0'],
+    command: [eet_bin, '-e', '@OUTPUT@', 'config', '@INPUT@', '1'],
     install: true,
     install_dir: join_paths(dir_data, 'elementary', 'config', config),
   )

data/elementary/config/standard/profile.desktop

@@ -9,7 +9,6 @@ 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]=標準
@@ -29,7 +28,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 si vous êtes indécis.
+Comment[fr]=Le profil standard adapté à la quasi totalité des systèmes de bureau et ordinateurs portables. Choisissez ce profil en cas d'hésitation.
 Comment[gl]=Este é o perfil estándar e universal para a maioría de ordenadores de escritorio e portátiles. Escóllao se non está seguro de cal elexir.
 Comment[hu]=Ez az általános, alap beállítás, amely megfelelő a legtöbb laptop és asztali gép számára.
 Comment[it]=Questo è il profilo standard, universale per la maggior parte dei sistemi desktop e portatili. Scegliete questo se non siete sicuri di cosa scegliere.

data/elementary/desktop/elementary_perf.desktop

@@ -1,7 +1,10 @@
 [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,7 +6,6 @@ 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 テスト
@@ -21,7 +20,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]=Programme de tests pour Elementary
+Comment[fr]=Application 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,6 +1,7 @@
 subdir('config')
 subdir('desktop')
 subdir('themes')
+subdir('colors')
 subdir('objects')
 subdir('edje_externals')
 

data/elementary/objects/font_preview.edc

@@ -1,38 +1,32 @@
 color_classes {
-   color_class {
-      name: "entry_text";
-      color: 0 0 0 255;
+   color_class { name: "/fg/normal/text";
+     color: 160 160 160 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;
-            mouse_events: 0;
+         part { name: "elm.text"; type: TEXT;
             scale: 1;
+            mouse_events: 0;
             clip_to: "clipper";
-            description {
-               state: "default" 0.0;
-               color_class: "entry_text";
-               text {
-                  font: "Sans";
+            description { state: "default" 0.0;
+               color_class: "/fg/normal/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,6 +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,
               '-id', elm_themes_image_include,
               '-id', join_paths(meson.current_source_dir()),

data/elementary/themes/default.edc

@@ -149,6 +149,7 @@ collections {
 #include "edc/bluez5.edc"
 #include "edc/packagekit.edc"
 #include "edc/tiling.edc"
+#include "edc/procstats.edc"
 
 // icons
 #include "edc/icons.edc"

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

@@ -13,15 +13,15 @@ group { name: "e/widgets/about/main";
    }
    styles {
       style { name: "about_style";
-         base: "font="FN" font_size=10 align=center text_class=tb_plain color=#fff wrap=word";
-         tag: "hilight" "+ font="FNBD" text_class=tb_light color=#fff align=center";
+         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";
          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=tb_plain color=#0004 wrap=none";
-         tag: "hilight" "+ font="FNBD" text_class=tb_light color=#fff";
+         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";
          tag: "/title" "- \n \n";
          tag: "br" "\n";
@@ -35,19 +35,10 @@ group { name: "e/widgets/about/main";
             min: 320 420;
          }
       }
-/*
-      part { name: "image";
-         description { state: "default" 0.0;
-            fixed: 1 1;
-            image.normal: "snow.jpg";
-            aspect: 1.0 1.0; aspect_preference: NONE;
-         }
-      }
- */
       part { name: "image"; type: RECT;
          description { state: "default" 0.0;
             fixed: 1 1;
-            color: 48 48 48 255;
+            color_class: "/bg/normal/entry";
          }
       }
       ////////////////////////////////////////////////////////////////
@@ -66,6 +57,7 @@ group { name: "e/widgets/about/main";
                min: 0 1;
                align: 0.5 0.0;
             }
+            offscale;
          }
          description { state: "up" 0.0;
             inherit: "default" 0.0;
@@ -104,6 +96,7 @@ group { name: "e/widgets/about/main";
                min: 0 1;
                align: 0.5 0.0;
             }
+            offscale;
          }
          description { state: "up" 0.0;
             inherit: "default" 0.0;
@@ -136,11 +129,11 @@ group { name: "e/widgets/about/main";
             rel1.relative: 0.0 0.0;
             rel2.relative: 1.0 0.0;
             fill.smooth: 1;
-            color: 64 64 64 255;
+            color_class: "/bg/normal/titlebar";
          }
          description { state: "focused" 0.0;
             inherit: "default" 0.0;
-            color: 32 32 32 255;
+            color_class: "/bg/selected/titlebar";
          }
       }
       ////////////////////////////////////////////////////////////////
@@ -154,6 +147,8 @@ group { name: "e/widgets/about/main";
             rel1.relative: 0.0 0.0;
             rel2.relative: 1.0 0.0;
             FIXED_SIZE(75, 75)
+            offscale;
+            color_class: "/fg/normal/about/logo";
          }
       }
       ////////////////////////////////////////////////////////////////
@@ -165,14 +160,14 @@ group { name: "e/widgets/about/main";
             rel2.offset: -1 13;
             rel1.relative: 0.0 1.0;
             rel2.relative: 1.0 1.0;
-            rel1.to: "logo";
-            rel2.to: "logo";
-            color: 255 255 255 255;
+            rel.to: "logo";
+            color_class: "/fg/normal/text-heading";
             text { font: FNBD; size: 16;
                min: 1 1;
                ellipsis: -1;
                text_class: "about_title";
             }
+            offscale;
          }
       }
       ////////////////////////////////////////////////////////////////
@@ -184,14 +179,14 @@ group { name: "e/widgets/about/main";
             rel2.offset: -1 13;
             rel1.relative: 0.0 1.0;
             rel2.relative: 1.0 1.0;
-            rel1.to: "e.text.title";
-            rel2.to: "e.text.title";
-            color: 255 255 255 255;
+            rel.to: "e.text.title";
+            color_class: "/fg/normal/text-heading-sub";
             text { font: FN; size: 10;
                min: 1 1;
                ellipsis: -1;
                text_class: "about_version";
             }
+            offscale;
          }
       }
       ////////////////////////////////////////////////////////////////
@@ -204,7 +199,8 @@ group { name: "e/widgets/about/main";
             image.normal: "about-triangles.png"; \
             aspect: (255/180) (255/180); aspect_preference: HORIZONTAL; \
             rel1.relative: 0.0 1.0; \
-            color: 64 64 64 255; \
+            color_class: "/bg/normal/background"; \
+            offscale; \
          } \
       }
       TRI("t1", 127, 0.5)
@@ -222,25 +218,32 @@ group { name: "e/widgets/about/main";
          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.25;
-            rel1.offset: -5 -3;
-            rel2.offset: 4 6;
+            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;
          description { state: "default" 0.0;
             rel1.offset: -6 -6;
             rel1.to: "e.text.label";
             rel2.offset: 5 5;
             rel2.to: "e.text.label";
-            color: 51 153 255 255;
+            color_class: "/bg/normal/button";
+            offscale;
          }
          description { state: "clicked" 0.0;
             inherit: "default" 0.0;
-            color: 255 153 51 255;
+            rel1.offset: -5 -5;
+            rel2.offset: 4 4;
+            color_class: "/bg/pressed/button";
          }
       }
       part { name: "e.text.label"; type: TEXT; mouse_events: 0;
@@ -250,7 +253,7 @@ group { name: "e/widgets/about/main";
             rel1.relative: 0.5 1.0;
             rel2.offset: -1 -19;
             rel2.relative: 0.5 1.0;
-            color: 255 255 255 255;
+            color_class: "/fg/normal/button";
             align: 0.5 1.0;
             min: 80 10;
             text { font: FN; size: 10;
@@ -258,35 +261,33 @@ group { name: "e/widgets/about/main";
                ellipsis: -1;
                text_class: "button";
             }
+            offscale;
          }
          description { state: "clicked" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255;
+            color_class: "/fg/pressed/button";
          }
       }
-      program {
-         signal: "mouse,down,1*"; source: "base";
+      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";
+      program { signal: "e,state,focused"; source: "e";
          action: STATE_SET "focused" 0.0;
          target: "lines";
       }
-      program {
-         signal: "e,state,unfocused"; source: "e";
+      program { signal: "e,state,unfocused"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "lines";
       }

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

@@ -2,6 +2,7 @@ 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;
    parts {
       part { name: "sizer"; type: SPACER;
@@ -10,27 +11,6 @@ group { name: "e/theme/about";
             min: 220 320;
          }
       }
-/*
-      part { name: "bg"; type: RECT;
-         description { state: "default" 0.0;
-            color: 64 64 64 255;
-         }
-      }
-      part { name: "check";
-         scale: 1;
-         description { state: "default" 0.0;
-            fixed: 1 1;
-            color: 56 56 56 255;
-            image.normal: "check_fill.png";
-            min: 5120 5120;
-            align: 0.0 0.0;
-            fill {
-              size.relative: 0.05 0.05;
-              smooth: 0;
-            }
-         }
-      }
- */
       part { name: "image";
          description { state: "default" 0.0;
             fixed: 1 1;
@@ -42,7 +22,7 @@ group { name: "e/theme/about";
          scale: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
-            color: 255 255 255 255;
+            color: 255 255 255 255; // no cc
             rel1.relative: 0.5 0.5;
             rel2.relative: 0.5 0.5;
             text { font: FNBD; size: 48;
@@ -51,18 +31,18 @@ group { name: "e/theme/about";
                ellipsis: -1;
                align: 0.5 0.5;
             }
+            offscale;
          }
       }
       part { name: "name2"; type: TEXT; mouse_events: 0;
          scale: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
-            color: 255 255 255 192;
+            color: 255 255 255 192; // no cc
+            rel.to: "name";
             rel1.relative: 0.0 1.0;
-            rel1.to: "name";
             rel1.offset: 0 16;
             rel2.relative: 1.0 1.0;
-            rel2.to: "name";
             rel2.offset: -1 16;
             align: 0.5 0.0;
             text { font: FN; size: 10;
@@ -71,20 +51,40 @@ group { name: "e/theme/about";
                ellipsis: -1;
                align: 0.5 0.0;
             }
+            offscale;
          }
       }
       ////////////////////////////////////////////////////////////////
-      part { name: "base"; type: RECT;
+      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;
+         description { state: "default" 0.0;
+            rel.to: "e.text.label";
             rel1.offset: -6 -6;
-            rel1.to: "e.text.label";
             rel2.offset: 5 5;
-            rel2.to: "e.text.label";
-            color: 48 48 48 255;
+            color_class: "/bg/normal/button";
+            offscale;
          }
          description { state: "clicked" 0.0;
             inherit: "default" 0.0;
-            color: 32 32 32 255;
+            rel1.offset: -5 -5;
+            rel2.offset: 4 4;
+            color_class: "/bg/pressed/button";
          }
       }
       part { name: "e.text.label"; type: TEXT; mouse_events: 0;
@@ -94,7 +94,7 @@ group { name: "e/theme/about";
             rel1.relative: 1.0 1.0;
             rel2.offset: -14 -14;
             rel2.relative: 1.0 1.0;
-            color: 160 160 160 255;
+            color_class: "/fg/normal/button";
             align: 1.0 1.0;
             min: 85 0;
             text { font: FN; size: 10;
@@ -104,40 +104,57 @@ group { name: "e/theme/about";
                text_class: "button";
             }
             fixed: 1 1;
+            offscale;
          }
          description { state: "clicked" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255;
+            color_class: "/fg/pressed/button";
          }
       }
-      program {
-         signal: "mouse,down,1*"; source: "base";
+      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";
+      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";
+      program { signal: "mouse,clicked,1*"; source: "base";
          action: SIGNAL_EMIT "e,action,close" "";
       }
       ////////////////////////////////////////////////////////////////
+      part { name: "shadow2"; mouse_events: 0;
+         scale: 1;
+         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";
             rel1.offset: -6 -6;
-            rel1.to: "e.text.theme";
             rel2.offset: 5 5;
-            rel2.to: "e.text.theme";
-            color: 48 48 48 255;
+            color_class: "/bg/normal/button";
          }
          description { state: "clicked" 0.0;
             inherit: "default" 0.0;
-            color: 32 32 32 255;
+            rel1.offset: -5 -5;
+            rel2.offset: 4 4;
+            color_class: "/bg/pressed/button";
          }
       }
       part { name: "e.text.theme"; type: TEXT; mouse_events: 0;
@@ -147,7 +164,7 @@ group { name: "e/theme/about";
             rel1.relative: 0.0 1.0;
             rel2.offset: 13 -14;
             rel2.relative: 0.0 1.0;
-            color: 160 160 160 255;
+            color_class: "/fg/normal/button";
             align: 0.0 1.0;
             min: 85 0;
             text { font: FN; size: 10;
@@ -157,26 +174,26 @@ group { name: "e/theme/about";
                text_class: "button";
             }
             fixed: 1 1;
+            offscale;
          }
          description { state: "clicked" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255;
+            color_class: "/fg/pressed/button";
          }
       }
-      program {
-         signal: "mouse,down,1*"; source: "base2";
+      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

@@ -4,11 +4,12 @@ group { name: "e/modules/appmenu/item";
    parts {
       part { name: "background"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            color: 32 32 32 255;
+            color_class: "/bg/normal/menu/item";
             visible: 0;
          }
          description { state: "selected" 0.0;
             inherit: "default" 0.0;
+            color_class: "/bg/selected/menu/item";
             visible: 1;
          }
       }
@@ -17,7 +18,7 @@ group { name: "e/modules/appmenu/item";
          description { state: "default" 0.0;
             rel1.offset: 4 4;
             rel2.offset: -5 -5;
-            color: 160 160 160 255;
+            color_class: "/fg/normal/menu/item";
             text { font: FN; size: 10;
                min: 1 1;
                ellipsis: -1;
@@ -27,12 +28,12 @@ group { name: "e/modules/appmenu/item";
          }
          description { state: "selected" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255;
+            color_class: "/fg/selected/menu/item";
          }
       }
       part { name: "event_area"; type: RECT;
          description { state: "default" 0.0;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
       }
    }

data/elementary/themes/edc/backlight.edc

@@ -2,6 +2,7 @@ group { name: "e/modules/backlight/main";
    alias: "e/modules/backlight/main_vert";
    images.image: "bulb_middle.png" COMP;
    images.image: "bulb_over.png" COMP;
+   images.image: "bulb_filament.png" COMP;
    min: 16 16;
    max: 160 160;
    script {
@@ -10,6 +11,7 @@ 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);
          }
       }
    }
@@ -18,30 +20,40 @@ group { name: "e/modules/backlight/main";
          description { state: "default" 0.0;
             aspect: 1.0 1.0; aspect_preference: BOTH;
             image.normal: "bulb_middle.png";
-            color: 32 32 32 255;
+            color_class: "/bg-dark/normal/gadgets/backlight";
          }
       }
       part { name: "glow";
          description { state: "default" 0.0;
-            rel1.to: "base";
+            rel.to: "base";
             rel1.relative: 0.5 0.5;
-            rel2.to: "base";
             rel2.relative: 0.5 0.5;
             image.normal: "bulb_middle.png";
-            color: 255 255 255 0;
+            color_class: "/fg/normal/gadgets/backlight/light/off";
          }
          description { state: "full" 0.0;
             inherit: "default" 0.0;
             rel1.relative: 0.0 0.0;
             rel2.relative: 1.0 1.0;
-            color: 255 255 255 255;
+            color_class: "/fg/normal/gadgets/backlight/light/on";
+         }
+      }
+      part { name: "filament";
+         description { state: "default" 0.0;
+            rel.to: "base";
+            image.normal: "bulb_filament.png";
+            color_class: "/fg/normal/gadgets/backlight/filament/off";
+         }
+         description { state: "full" 0.0;
+            inherit: "default" 0.0;
+            color_class: "/fg/normal/gadgets/backlight/filament/on";
          }
       }
       part { name: "over";
          description { state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
+            rel.to: "base";
             image.normal: "bulb_over.png";
+            color_class: "/fg/normal/gadgets/backlight/base";
          }
       }
    }

data/elementary/themes/edc/battery.edc

@@ -35,21 +35,11 @@ group { name: "e/modules/battery/main";
          }
          description { state: "faded" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 128;
-         }
-      }
-      part { name: "fill_clip_dim"; type: RECT;
-         clip_to: "pulse_clip";
-         description { state: "default" 0.0;
-            rel.to: "bg";
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            color: 160 160 160 255;
+            color: 255 255 255 128; // no cc
          }
       }
       part { name: "fill_clip"; type: RECT;
-         clip_to: "fill_clip_dim";
+         clip_to: "pulse_clip";
          description { state: "default" 0.0;
             rel.to: "bg";
          }
@@ -57,11 +47,12 @@ group { name: "e/modules/battery/main";
       part { name: "info_clip"; type: RECT;
          description { state: "default" 0.0;
             rel.to: "bg";
-            color: 255 255 255 0;
+            color_class: "/fg/normal/gadgets/battery/text/info";
+            color: 255 255 255 0; // no cc
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255;
+            color: 255 255 255 255; // no cc
          }
       }
       part { name: "bg";
@@ -69,7 +60,7 @@ group { name: "e/modules/battery/main";
          description { state: "default" 0.0;
             aspect: 1.0 1.0; aspect_preference: BOTH;
             image.normal: "bat_base.png";
-            color: 32 32 32 255;
+            color_class: "/bg-dark/normal/gadgets/battery/base";
          }
       }
       part { name: "fill";
@@ -77,11 +68,11 @@ group { name: "e/modules/battery/main";
          description { state: "default" 0.0;
             rel.to: "bg";
             image.normal: "bat_base.png";
-            color: 160 160 160 255;
+            color_class: "/fg/normal/gadgets/battery/level/discharge";
          }
          description { state: "charging" 0.0;
             inherit: "default" 0.0;
-            color: 51 153 255 255;
+            color_class: "/fg/normal/gadgets/battery/level/charge";
          }
       }
       part { name: "e.text.reading"; type: TEXT; mouse_events: 0;
@@ -92,8 +83,8 @@ group { name: "e/modules/battery/main";
             rel.to: "bg";
             rel1.relative: 0.25 0.15;
             rel2.relative: 0.75 0.53;
-            color: 255 255 255 255;
-            text { font: "Sans"; size: 8;
+            color_class: "/fg/normal/gadgets/battery/text/reading";
+            text { font: FN; size: 8;
                min: 0 1;
                fit: 1 1;
                ellipsis: -1;
@@ -110,8 +101,8 @@ group { name: "e/modules/battery/main";
             rel.to: "bg";
             rel1.relative: 0.25 0.47;
             rel2.relative: 0.75 0.85;
-            color: 255 255 255 255;
-            text { font: "Sans"; size: 8;
+            color_class: "/fg/normal/gadgets/battery/text/time";
+            text { font: FN; size: 8;
                min: 0 1;
                fit: 1 1;
                ellipsis: -1;
@@ -122,7 +113,7 @@ group { name: "e/modules/battery/main";
       }
       part { name: "over"; type: RECT;
          description { state: "default" 0.0;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
       }
    }
@@ -178,25 +169,23 @@ group { name: "e/modules/battery/main";
          action: STATE_SET "visible" 0.0;
          transition: SINUSOIDAL 0.3;
          target: "info_clip";
-         target: "fill_clip_dim";
       }
       program { signal: "mouse,out"; source: "over";
          action: STATE_SET "default" 0.0;
          transition: SINUSOIDAL 0.3;
          target: "info_clip";
-         target: "fill_clip_dim";
       }
    }
 }
 
 group { name: "e/modules/battery/popup";
-   min: 320 60;
+   min: 320 80;
    parts {
       part { name: "e.swallow.battery"; type: SWALLOW;
+         scale: 1;
          description { state: "default" 0.0;
-            aspect: 1.0 1.0; aspect_preference: VERTICAL;
-            min: 1 1;
-            max: 240 160;
+            min: 80 80;
+            max: 80 80;
             align: 0.0 0.5;
          }
       }
@@ -206,8 +195,8 @@ group { name: "e/modules/battery/popup";
             rel1.relative: 1.0 0.0;
             rel1.to_x: "e.swallow.battery";
             rel2.relative: 1.0 0.5;
-            color: 160 160 160 255;
-            text { font: "Sans:style=Bold"; size: 10;
+            color_class: "/fg/normal/gadgets/battery/popup/title";
+            text { font: FNBD; size: 10;
                text: "Your battery is low!";
                min: 1 1;
                ellipsis: -1;
@@ -220,8 +209,8 @@ group { name: "e/modules/battery/popup";
          description { state: "default" 0.0;
             rel1.relative: 1.0 0.5;
             rel1.to_x: "e.swallow.battery";
-            color: 160 160 160 255;
-            text { font: "Sans"; size: 10;
+            color_class: "/fg/normal/gadgets/battery/popup/text";
+            text { font: FN; size: 10;
                text: "AC power is recommended.";
                min: 1 1;
                ellipsis: -1;

data/elementary/themes/edc/bluez4.edc

@@ -8,7 +8,7 @@ group { name: "e/modules/bluez4/main";
             rel2.relative: (365/380) (365/380);
             aspect: 1.0 1.0; aspect_preference: BOTH;
             image.normal: "bz5_logo.png";
-            color: 160 160 160 255;
+            color_class: "/fg/normal/gadgets/bluez/on";
          }
       }
    }
@@ -24,7 +24,7 @@ group { name: "e/modules/bluez4/inactive";
             rel2.relative: (365/380) (365/380);
             aspect: 1.0 1.0; aspect_preference: BOTH;
             image.normal: "bz5_logo.png";
-            color: 160 160 160 128;
+            color_class: "/fg/normal/gadgets/bluez/off";
          }
       }
    }

data/elementary/themes/edc/bluez5.edc

@@ -53,17 +53,17 @@ group { name: "e/modules/bluez5/main";
             rel2.relative: (365/380) (365/380);
             aspect: 1.0 1.0; aspect_preference: BOTH;
             image.normal: "bz5_none.png";
-            color: 160 160 160 255;
+            color_class: "/fg/normal/gadgets/bluez/on";
          }
          description { state: "exist" 0.0;
             inherit;
             image.normal: "bz5_logo.png";
-            color: 160 160 160 128;
+            color_class: "/fg/normal/gadgets/bluez/off";
          }
          description { state: "on" 0.0;
             inherit;
             image.normal: "bz5_logo.png";
-            color: 160 160 160 255;
+            color_class: "/fg/normal/gadgets/bluez/on";
          }
       }
       part { name: "visible";
@@ -73,7 +73,7 @@ group { name: "e/modules/bluez5/main";
             rel2.relative: 0.2 1.0;
             aspect: 1.0 1.0; aspect_preference: BOTH;
             image.normal: "radio.png";
-            color: 51 153 255 255;
+            color_class: "/fg/normal/gadgets/bluez/visible";
             visible: 0;
             min: 1 1;
          }
@@ -89,7 +89,7 @@ group { name: "e/modules/bluez5/main";
             rel2.relative: 1.0 1.0;
             aspect: 1.0 1.0; aspect_preference: BOTH;
             image.normal: "radio.png";
-            color: 255 153 51 255;
+            color_class: "/fg/normal/gadgets/bluez/scan";
             visible: 0;
             min: 1 1;
          }

data/elementary/themes/edc/border.edc

@@ -3,19 +3,15 @@ group { name: "e/widgets/border/volume";
    parts {
       part { name: "base"; type: RECT;
          description { state: "default" 0.0;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
       }
       part { name: "bg"; type: RECT;
          description { state: "default" 0.0;
             fixed: 1 1;
+            color: 0 0 0 0; // no cc
             rel.to: "e.swallow.volume";
             rel2.to_x: "clip";
-            color: 64 64 64 255;
-         }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
-            color: 32 32 32 255;
          }
       }
       part { name: "clip"; type: RECT;
@@ -24,7 +20,6 @@ group { name: "e/widgets/border/volume";
             rel.to: "e.swallow.volume";
             align: 0.0 0.5;
             max: 0 999999;
-            color: 255 255 255 255;
          }
          description { state: "show" 0.0;
             rel.to: "e.swallow.volume";
@@ -56,19 +51,24 @@ group { name: "e/widgets/border/volume";
          clip_to: "clip";
          description { state: "default" 0.0;
             fixed: 1 1;
-            color: 255 255 255 128;
-            rel.to: "bg";
+            color_class: "/shadow/normal/border/volume";
+            rel.to_y: "base";
+            rel.to_x: "bg";
             rel1.relative: 1.0 0.0;
             rel1.offset: -16 0;
             rel2.offset: 15 -1;
             image.normal: "shadow_circle_vert.png";
             offscale;
          }
+         description { state: "focused" 0.0;
+            inherit: "default" 0.0;
+            color_class: "/shadow/selected/border/volume";
+         }
       }
       part { name: "event"; type: RECT; repeat_events: 1;
          description { state: "default" 0.0;
             rel.to: "base";
-            color: 255 255 255 0;
+            color: 0 0 0 0; // no cc
          }
          description { state: "large" 0.0;
             inherit: "default" 0.0;
@@ -79,11 +79,11 @@ group { name: "e/widgets/border/volume";
       programs {
          program { signal: "e,state,focused"; source: "e";
             action: STATE_SET "focused" 0.0;
-           target: "bg";
+            target: "sh_right";
          }
          program { signal: "e,state,unfocused"; source: "e";
             action: STATE_SET "default" 0.0;
-            target: "bg";
+            target: "sh_right";
          }
          program { signal: "mouse,in"; source: "event";
             action: ACTION_STOP;
@@ -135,8 +135,19 @@ group { name: "e/widgets/border/default/border";
    data.item: "shadow" "1";
    parts {
       part { name: "shadow_clip"; type: RECT; mouse_events: 0;
+         clip_to: "shadow_clip2";
          description { state: "default";
             rel.to: "_sh1";
+            color_class: "/shadow/normal/border";
+         }
+         description { state: "focused";
+            inherit: "default";
+            color_class: "/shadow/selected/border";
+         }
+      }
+      part { name: "shadow_clip2"; type: RECT; mouse_events: 0;
+         description { state: "default";
+            rel.to: "shadow_clip";
          }
          description { state: "hidden";
             visible: 0;
@@ -187,12 +198,12 @@ group { name: "e/widgets/border/default/border";
          description { state: "default" 0.0;
             rel2.to_y: "e.text.title";
             rel2.offset: -1 2;
-            color: 64 64 64 255;
+            color_class: "/bg/normal/titlebar";
             offscale;
          }
          description { state: "focused" 0.0;
             inherit: "default" 0.0;
-            color: 32 32 32 255;
+            color_class: "/bg/selected/titlebar";
          }
       }
       part { name: "e.text.title"; type: TEXT; mouse_events: 0;
@@ -205,7 +216,7 @@ group { name: "e/widgets/border/default/border";
             rel2.offset: -2 4;
             rel2.to_x: "e.event.minimize";
             align: 0.5 0.0;
-            color: 160 160 160 255;
+            color_class: "/fg/normal/titlebar";
             min: 0 16;
             text { font: FNBD; size: 10;
                text_class: "title_bar";
@@ -217,7 +228,7 @@ group { name: "e/widgets/border/default/border";
          }
          description { state: "focused" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255;
+            color_class: "/fg/selected/titlebar";
          }
       }
       part { name: "icon"; type: SPACER;
@@ -281,11 +292,11 @@ group { name: "e/widgets/border/default/border";
             rel.to: "e.event.close";
             min: 15 15; max: 15 15;
             fixed: 1 1;
-            color: 160 160 160 255;
+            color_class: "/fg/normal/titlebar/buttons/close";
          }
          description { state: "selected" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255;
+            color_class: "/fg/selected/titlebar/buttons/close";
          }
       }
       part { name: "max1"; mouse_events: 0;
@@ -296,11 +307,11 @@ group { name: "e/widgets/border/default/border";
             rel.to: "e.event.maximize";
             min: 15 15; max: 15 15;
             fixed: 1 1;
-            color: 160 160 160 255;
+            color_class: "/fg/normal/titlebar/buttons/maximize";
          }
          description { state: "selected" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255;
+            color_class: "/fg/selected/titlebar/buttons/maximize";
          }
       }
       part { name: "min1"; mouse_events: 0;
@@ -311,11 +322,11 @@ group { name: "e/widgets/border/default/border";
             rel.to: "e.event.minimize";
             min: 15 15; max: 15 15;
             fixed: 1 1;
-            color: 160 160 160 255;
+            color_class: "/fg/normal/titlebar/buttons/minimize";
          }
          description { state: "selected" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255;
+            color_class: "/fg/selected/titlebar/buttons/minimize";
          }
       }
       part { name: "close2"; mouse_events: 0;
@@ -326,11 +337,11 @@ group { name: "e/widgets/border/default/border";
             rel.to: "e.event.close";
             min: 15 15; max: 15 15;
             fixed: 1 1;
-            color: 255 255 255 255;
+            color_class: "/fg/selected/titlebar/buttons/close";
          }
          description { state: "selected" 0.0;
             inherit: "default" 0.0;
-            color: 220 220 220 255;
+            color_class: "/fg/selected-pressed/titlebar/buttons/close";
          }
       }
       part { name: "max2"; mouse_events: 0;
@@ -341,11 +352,11 @@ group { name: "e/widgets/border/default/border";
             rel.to: "e.event.maximize";
             min: 15 15; max: 15 15;
             fixed: 1 1;
-            color: 255 255 255 255;
+            color_class: "/fg/selected/titlebar/buttons/maximize";
          }
          description { state: "selected" 0.0;
             inherit: "default" 0.0;
-            color: 220 220 220 255;
+            color_class: "/fg/selected-pressed/titlebar/buttons/maximize";
          }
       }
       part { name: "min2"; mouse_events: 0;
@@ -356,16 +367,16 @@ group { name: "e/widgets/border/default/border";
             rel.to: "e.event.minimize";
             min: 15 15; max: 15 15;
             fixed: 1 1;
-            color: 255 255 255 255;
+            color_class: "/fg/selected/titlebar/buttons/minimize";
          }
          description { state: "selected" 0.0;
             inherit: "default" 0.0;
-            color: 220 220 220 255;
+            color_class: "/fg/selected-pressed/titlebar/buttons/minimize";
           }
       }
       part { name: "e.event.titlebar"; type: RECT;
          description { rel.to: "top";
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
       }
       part { name: "e.event.icon"; type: RECT;
@@ -376,7 +387,7 @@ group { name: "e/widgets/border/default/border";
             rel2.to_y: "top";
             align: 0.0 0.5;
             aspect: 1.0 1.0; aspect_preference: VERTICAL;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
       }
       part { name: "e.event.close"; type: RECT;
@@ -387,7 +398,7 @@ group { name: "e/widgets/border/default/border";
             rel2.to_y: "top";
             align: 1.0 0.5;
             aspect: 1.0 1.0; aspect_preference: VERTICAL;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
       }
       part { name: "e.event.maximize"; type: RECT;
@@ -400,7 +411,7 @@ group { name: "e/widgets/border/default/border";
             rel2.to_x: "e.event.close";
             align: 1.0 0.5;
             aspect: 1.0 1.0; aspect_preference: VERTICAL;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
       }
       part { name: "e.event.minimize"; type: RECT;
@@ -413,7 +424,7 @@ group { name: "e/widgets/border/default/border";
             rel2.to_x: "e.event.maximize";
             align: 1.0 0.5;
             aspect: 1.0 1.0; aspect_preference: VERTICAL;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
       }
       part { name: "e.event.resize.tl"; type: RECT;
@@ -422,9 +433,9 @@ group { name: "e/widgets/border/default/border";
             rel.to: "top";
             rel2.relative: 0.0 0.0;
             rel2.offset: 31 3;
-            min: 40 6;
+            min: RSZMINW RSZMINH;
             align: 1.0 1.0;
-            color: 0 0 0 0;
+            color: RSZCOL; // no cc
             fixed: 1 1;
             offscale;
          }
@@ -436,9 +447,9 @@ group { name: "e/widgets/border/default/border";
             rel1.to: "e.event.resize.tl";
             rel2.relative: 0.0 1.0;
             rel2.to: "e.event.resize.tr";
-            min: 0 6;
+            min: 0 RSZMINH;
             align: 0.5 1.0;
-            color: 0 0 0 0;
+            color: RSZCOL2; // no cc
             fixed: 1 1;
          }
       }
@@ -450,9 +461,9 @@ group { name: "e/widgets/border/default/border";
             rel1.offset: -32 0;
             rel2.relative: 1.0 0.0;
             rel2.offset: -1 3;
-            min: 40 6;
+            min: RSZMINW RSZMINH;
             align: 0.0 1.0;
-            color: 0 0 0 0;
+            color: RSZCOL; // no cc
             fixed: 1 1;
             offscale;
          }
@@ -460,7 +471,6 @@ group { name: "e/widgets/border/default/border";
       part { name: "bottom"; type: RECT; mouse_events: 0;
          scale: 1;
          description { state: "default" 0.0;
-            color: 64 64 64 255;
             rel1.relative: 0.0 1.0;
             rel2.relative: 1.0 1.0;
             align: 0.5 1.0;
@@ -479,15 +489,26 @@ group { name: "e/widgets/border/default/border";
             visible: 0;
          }
       }
+      part { name: "bottom_bar"; type: RECT; mouse_events: 0;
+         clip_to: "bottom";
+         description { state: "default" 0.0;
+            color_class: "/bg/normal/border";
+            rel.to: "bottom";
+         }
+         description { state: "focused" 0.0;
+            inherit: "default" 0.0;
+            color_class: "/bg/selected/border";
+         }
+      }
       part { name: "e.event.resize.bl"; type: RECT;
          scale: 1;
          description { state: "default" 0.0;
             rel.to: "bottom";
             rel2.relative: 0.0 1.0;
             rel2.offset: 31 -1;
-            min: 40 10;
-            align: 0.0 0.5;
-            color: 0 0 0 0;
+            min: RSZMINW RSZMINH;
+            align: 1.0 0.0;
+            color: RSZCOL; // no cc
             fixed: 1 1;
             offscale;
          }
@@ -509,9 +530,9 @@ group { name: "e/widgets/border/default/border";
             rel1.relative: 1.0 0.0;
             rel2.to: "e.event.resize.br";
             rel2.relative: 0.0 1.0;
-            min: 0 10;
-            align: 0.5 0.5;
-            color: 0 0 0 0;
+            min: 0 RSZMINH;
+            align: 0.5 0.0;
+            color: RSZCOL2; // no cc
             fixed: 1 1;
             offscale;
          }
@@ -532,9 +553,9 @@ group { name: "e/widgets/border/default/border";
             rel.to: "bottom";
             rel1.relative: 1.0 0.0;
             rel1.offset: -32 0;
-            min: 40 10;
-            align: 0.0 0.5;
-            color: 0 0 0 0;
+            min: RSZMINW RSZMINH;
+            align: 0.0 0.0;
+            color: RSZCOL; // no cc
             fixed: 1 1;
             offscale;
          }
@@ -549,20 +570,6 @@ group { name: "e/widgets/border/default/border";
             visible: 0;
          }
       }
-     part { name: "e.swallow.volume";
-         type: SWALLOW;
-         source: "e/widgets/border/volume";
-         description { state: "default" 0.0;
-            fixed: 1 0;
-            rel1.to: "e.event.icon";
-            rel1.relative: 1.0 0.0;
-            rel2.to: "e.event.icon";
-            rel2.relative: 1.0 1.0;
-            rel2.offset: 0 -1;
-            align: 0.0 0.5;
-            aspect: 1.0 1.0; aspect_preference: VERTICAL;
-         }
-      }
       part { name: "procstats"; type: RECT;
          mouse_events: 0;
          description { state: "default" 0.0;
@@ -570,7 +577,7 @@ group { name: "e/widgets/border/default/border";
             rel2.to_x: "e.procstats.swallow";
             rel1.to_y: "top";
             rel2.to_y: "top";
-            color:  0 0 0 0;
+            color:  0 0 0 0; // no cc
             visible: 0;
          }
          description { state: "visible";
@@ -583,9 +590,8 @@ group { name: "e/widgets/border/default/border";
          repeat_events: 1;
          description { state: "default" 0.0;
             fixed: 1 0;
-            rel1.to: "e.swallow.volume";
+            rel.to: "e.event.icon";
             rel1.relative: 1.0 0.0;
-            rel2.to: "e.swallow.volume";
             rel2.relative: 1.0 1.0;
             rel2.offset: 0 -1;
             align: 0.0 0.5;
@@ -596,10 +602,28 @@ group { name: "e/widgets/border/default/border";
             visible: 1;
          }
       }
+      part { name: "e.swallow.volume"; type: SWALLOW;
+         source: "e/widgets/border/volume";
+         description { state: "default" 0.0;
+            fixed: 1 0;
+            rel1.to_x: "e.event.icon";
+            rel2.to_x: "e.event.icon";
+            rel1.to_y: "top";
+            rel2.to_y: "top";
+            rel1.relative: 1.0 0.0;
+            rel2.relative: 1.0 1.0;
+            rel2.offset: 0 -1;
+            align: 0.0 0.5;
+            aspect: 1.0 1.0; aspect_preference: VERTICAL;
+         }
+         description { state: "visible";
+            inherit: "default" 0.0;
+            rel.to_x: "e.procstats.swallow";
+         }
+      }
    }
    programs {
-      program {
-         signal: "e,version,22"; source: "e";
+      program { signal: "e,version,22"; source: "e";
          script {
             set_pointer_mode(PART:"e.event.titlebar", 1);
             set_pointer_mode(PART:"e.event.resize.tl", 1);
@@ -610,34 +634,33 @@ group { name: "e/widgets/border/default/border";
             set_pointer_mode(PART:"e.event.resize.br", 1);
          }
       }
-      program {
-         signal: "e,state,shadow,on"; source: "e";
+      program { signal: "e,state,shadow,on"; source: "e";
          action: STATE_SET "default" 0.0;
-         target: "shadow_clip";
+         target: "shadow_clip2";
       }
-      program {
-         signal: "e,state,shadow,off"; source: "e";
+      program { signal: "e,state,shadow,off"; source: "e";
          action: STATE_SET "hidden" 0.0;
-         target: "shadow_clip";
+         target: "shadow_clip2";
       }
-      program {
-         signal: "e,state,focused"; source: "e";
+      program { signal: "e,state,focused"; source: "e";
          action: STATE_SET "focused" 0.0;
          target: "top";
+         target: "bottom_bar";
+         target: "shadow_clip";
          target: "e.text.title";
          target: "clip1";
          target: "clip2";
       }
-      program {
-         signal: "e,state,unfocused"; source: "e";
+      program { signal: "e,state,unfocused"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "top";
+         target: "bottom_bar";
+         target: "shadow_clip";
          target: "e.text.title";
          target: "clip1";
          target: "clip2";
       }
-      program {
-         signal: "e,state,urgent"; source: "e";
+      program { signal: "e,state,urgent"; source: "e";
          action: STATE_SET "bounce1" 0.0;
          target: "icon";
          after: "urg1";
@@ -654,13 +677,11 @@ group { name: "e/widgets/border/default/border";
          target: "icon";
          after: "urg1";
       }
-      program {
-         signal: "e,state,not_urgent"; source: "e";
+      program { signal: "e,state,not_urgent"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "icon";
       }
-      program {
-         signal: "e,state,shaded"; source: "e";
+      program { signal: "e,state,shaded"; source: "e";
          action: STATE_SET "shaded" 0.0;
          target: "shadow_base";
          after: "shading";
@@ -674,8 +695,7 @@ group { name: "e/widgets/border/default/border";
          target: "e.event.resize.b";
          target: "e.event.resize.br";
       }
-      program {
-         signal: "e,state,unshaded"; source: "e";
+      program { signal: "e,state,unshaded"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "bottom";
          target: "e.event.resize.bl";
@@ -694,11 +714,13 @@ group { name: "e/widgets/border/default/border";
       program { signal: "e,state,procstats,on"; source: "e";
          action: STATE_SET "visible" 0.0;
          target: "e.procstats.swallow";
+         target: "e.swallow.volume";
          target: "procstats";
       }
       program { signal: "e,state,procstats,off"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "e.procstats.swallow";
+         target: "e.swallow.volume";
          target: "procstats";
       }
 //      program {
@@ -713,8 +735,7 @@ group { name: "e/widgets/border/default/border";
 //      program {
 //         signal: "e,action,unmaximize,fullscreen"; source: "e";
 //      }
-      program {
-         signal: "e,action,maximize*"; source: "e";
+      program { signal: "e,action,maximize*"; source: "e";
          action: STATE_SET "max" 0.0;
          target: "e.swallow.client";
          target: "bottom";
@@ -722,8 +743,7 @@ group { name: "e/widgets/border/default/border";
          target: "e.event.resize.b";
          target: "e.event.resize.br";
       }
-      program {
-         signal: "e,action,unmaximize*"; source: "e";
+      program { signal: "e,action,unmaximize*"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "e.swallow.client";
          target: "bottom";
@@ -731,38 +751,32 @@ group { name: "e/widgets/border/default/border";
          target: "e.event.resize.b";
          target: "e.event.resize.br";
       }
-      program {
-         signal: "mouse,down,*"; source: "e.event.close";
+      program { signal: "mouse,down,*"; source: "e.event.close";
          action: STATE_SET "selected" 0.0;
          target: "close1";
          target: "close2";
       }
-      program {
-         signal: "mouse,up,*"; source: "e.event.close";
+      program { signal: "mouse,up,*"; source: "e.event.close";
          action: STATE_SET "default" 0.0;
          target: "close1";
          target: "close2";
       }
-      program {
-         signal: "mouse,down,*"; source: "e.event.maximize";
+      program { signal: "mouse,down,*"; source: "e.event.maximize";
          action: STATE_SET "selected" 0.0;
          target: "max1";
          target: "max2";
       }
-      program {
-         signal: "mouse,up,*"; source: "e.event.maximize";
+      program { signal: "mouse,up,*"; source: "e.event.maximize";
          action: STATE_SET "default" 0.0;
          target: "max1";
          target: "max2";
       }
-      program {
-         signal: "mouse,down,*"; source: "e.event.minimize";
+      program { signal: "mouse,down,*"; source: "e.event.minimize";
          action: STATE_SET "selected" 0.0;
          target: "min1";
          target: "min2";
       }
-      program {
-         signal: "mouse,up,*"; source: "e.event.minimize";
+      program { signal: "mouse,up,*"; source: "e.event.minimize";
          action: STATE_SET "default" 0.0;
          target: "min1";
          target: "min2";
@@ -941,46 +955,46 @@ group { name: "e/widgets/border/pixel/border";
       }
       part { name: "top"; type: RECT;
          description { state: "default" 0.0;
-            color: 0 0 0 255;
+            color_class: "/bg/normal/border/outline";
             align: 0.0 0.0;
             max: 99999 1;
          }
          description { state: "focused" 0.0;
             inherit: "default" 0.0;
-            color: 51 153 255 255;
+            color_class: "/bg/selected/border/outline";
          }
       }
       part { name: "bottom"; type: RECT;
          description { state: "default" 0.0;
-            color: 0 0 0 255;
+            color_class: "/bg/normal/border/outline";
             align: 0.0 1.0;
             max: 99999 1;
          }
          description { state: "focused" 0.0;
             inherit: "default" 0.0;
-            color: 51 153 255 255;
+            color_class: "/bg/selected/border/outline";
          }
       }
       part { name: "left"; type: RECT;
          description { state: "default" 0.0;
-            color: 0 0 0 255;
+            color_class: "/bg/normal/border/outline";
             align: 0.0 0.0;
             max: 1 99999;
          }
          description { state: "focused" 0.0;
             inherit: "default" 0.0;
-            color: 51 153 255 255;
+            color_class: "/bg/selected/border/outline";
          }
       }
       part { name: "right"; type: RECT;
          description { state: "default" 0.0;
-            color: 0 0 0 255;
+            color_class: "/bg/normal/border/outline";
             align: 1.0 0.0;
             max: 1 99999;
          }
          description { state: "focused" 0.0;
             inherit: "default" 0.0;
-            color: 51 153 255 255;
+            color_class: "/bg/selected/border/outline";
          }
       }
       part { name: "e.event.resize.tl"; type: RECT;
@@ -988,7 +1002,7 @@ group { name: "e/widgets/border/pixel/border";
             rel2.relative: 0.0 0.0;
             min: 32 4;
             align: 0.0 0.0;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
       }
       part { name: "e.event.resize.t"; type: RECT;
@@ -999,7 +1013,7 @@ group { name: "e/widgets/border/pixel/border";
             rel2.to_x: "e.event.resize.tr";
             min: 0 4;
             align: 0.5 0.0;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
       }
       part { name: "e.event.resize.tr"; type: RECT;
@@ -1008,7 +1022,7 @@ group { name: "e/widgets/border/pixel/border";
             rel2.relative: 1.0 0.0;
             min: 32 4;
             align: 1.0 0.0;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
       }
       part { name: "e.event.resize.bl"; type: RECT;
@@ -1017,7 +1031,7 @@ group { name: "e/widgets/border/pixel/border";
             rel2.relative: 0.0 1.0;
             min: 32 5;
             align: 0.0 1.0;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
             fixed: 1 1;
          }
       }
@@ -1029,7 +1043,7 @@ group { name: "e/widgets/border/pixel/border";
             rel2.to_x: "e.event.resize.tr";
             min: 0 5;
             align: 0.5 1.0;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
             fixed: 0 1;
          }
       }
@@ -1039,22 +1053,20 @@ group { name: "e/widgets/border/pixel/border";
             rel2.relative: 1.0 1.0;
             min: 32 5;
             align: 1.0 1.0;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
             fixed: 1 1;
          }
       }
    }
    programs {
-      program {
-         signal: "e,state,focused"; source: "e";
+      program { signal: "e,state,focused"; source: "e";
          action: STATE_SET "focused" 0.0;
          target: "top";
          target: "bottom";
          target: "left";
          target: "right";
       }
-      program {
-         signal: "e,state,unfocused"; source: "e";
+      program { signal: "e,state,unfocused"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "top";
          target: "bottom";
@@ -1069,8 +1081,19 @@ group { name: "e/widgets/border/tiling/border";
    data.item: "shadow" "1";
    parts {
       part { name: "shadow_clip"; type: RECT; mouse_events: 0;
+         clip_to: "shadow_clip2";
          description { state: "default";
             rel.to: "_sh1";
+            color_class: "/shadow/normal/border";
+         }
+         description { state: "focused";
+            inherit: "default";
+            color_class: "/shadow/selected/border";
+         }
+      }
+      part { name: "shadow_clip2"; type: RECT; mouse_events: 0;
+         description { state: "default";
+            rel.to: "shadow_clip";
          }
          description { state: "hidden";
             visible: 0;
@@ -1100,7 +1123,8 @@ group { name: "e/widgets/border/tiling/border";
       }
       part { name: "top"; type: RECT;
          description { state: "default" 0.0;
-            color: 0 0 0 0;
+            color_class: "/bg/selected/border/outline";
+            color: 0 0 0 0; // no cc
             align: 0.0 0.0;
             rel1.offset: -1 -1;
             rel2.offset: 0 0;
@@ -1108,12 +1132,13 @@ group { name: "e/widgets/border/tiling/border";
          }
          description { state: "focused" 0.0;
             inherit: "default" 0.0;
-            color: 51 153 255 255;
+            color: 255 255 255 255; // no cc
          }
       }
       part { name: "bottom"; type: RECT;
          description { state: "default" 0.0;
-            color: 0 0 0 0;
+            color_class: "/bg/selected/border/outline";
+            color: 0 0 0 0; // no cc
             align: 0.0 1.0;
             rel1.offset: -1 -1;
             rel2.offset: 0 0;
@@ -1121,12 +1146,13 @@ group { name: "e/widgets/border/tiling/border";
          }
          description { state: "focused" 0.0;
             inherit: "default" 0.0;
-            color: 51 153 255 255;
+            color: 255 255 255 255; // no cc
          }
       }
       part { name: "left"; type: RECT;
          description { state: "default" 0.0;
-            color: 0 0 0 0;
+            color_class: "/bg/selected/border/outline";
+            color: 0 0 0 0; // no cc
             align: 0.0 0.0;
             rel1.offset: -1 -1;
             rel2.offset: 0 0;
@@ -1134,12 +1160,13 @@ group { name: "e/widgets/border/tiling/border";
          }
          description { state: "focused" 0.0;
             inherit: "default" 0.0;
-            color: 51 153 255 255;
+            color: 255 255 255 255; // no cc
          }
       }
       part { name: "right"; type: RECT;
          description { state: "default" 0.0;
-            color: 0 0 0 0;
+            color_class: "/bg/selected/border/outline";
+            color: 0 0 0 0; // no cc
             align: 1.0 0.0;
             rel1.offset: -1 -1;
             rel2.offset: 0 0;
@@ -1147,7 +1174,7 @@ group { name: "e/widgets/border/tiling/border";
          }
          description { state: "focused" 0.0;
             inherit: "default" 0.0;
-            color: 51 153 255 255;
+            color: 255 255 255 255; // no cc
          }
       }
       part { name: "e.event.resize.tl"; type: RECT;
@@ -1157,7 +1184,7 @@ group { name: "e/widgets/border/tiling/border";
             rel1.offset: -1 -1;
             rel2.offset: 0 0;
             align: 0.0 0.0;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
       }
       part { name: "e.event.resize.t"; type: RECT;
@@ -1170,7 +1197,7 @@ group { name: "e/widgets/border/tiling/border";
             rel2.offset: 0 0;
             min: 0 4;
             align: 0.5 0.0;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
       }
       part { name: "e.event.resize.tr"; type: RECT;
@@ -1181,7 +1208,7 @@ group { name: "e/widgets/border/tiling/border";
             rel1.offset: -1 -1;
             rel2.offset: 0 0;
             align: 1.0 0.0;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
       }
       part { name: "e.event.resize.bl"; type: RECT;
@@ -1192,7 +1219,7 @@ group { name: "e/widgets/border/tiling/border";
             rel1.offset: -1 -1;
             rel2.offset: 0 0;
             align: 0.0 1.0;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
             fixed: 1 1;
          }
       }
@@ -1206,7 +1233,7 @@ group { name: "e/widgets/border/tiling/border";
             rel2.offset: 0 0;
             min: 0 5;
             align: 0.5 1.0;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
             fixed: 0 1;
          }
       }
@@ -1218,27 +1245,35 @@ group { name: "e/widgets/border/tiling/border";
             rel2.offset: 0 0;
             min: 32 5;
             align: 1.0 1.0;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
             fixed: 1 1;
          }
       }
    }
    programs {
-      program {
-         signal: "e,state,focused"; source: "e";
+      program { signal: "e,state,shadow,on"; source: "e";
+         action: STATE_SET "default" 0.0;
+         target: "shadow_clip2";
+      }
+      program { signal: "e,state,shadow,off"; source: "e";
+         action: STATE_SET "hidden" 0.0;
+         target: "shadow_clip2";
+      }
+      program { signal: "e,state,focused"; source: "e";
          action: STATE_SET "focused" 0.0;
          target: "top";
          target: "bottom";
          target: "left";
          target: "right";
+         target: "shadow_clip";
       }
-      program {
-         signal: "e,state,unfocused"; source: "e";
+      program { signal: "e,state,unfocused"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "top";
          target: "bottom";
          target: "left";
          target: "right";
+         target: "shadow_clip";
       }
    }
 }
@@ -1248,7 +1283,7 @@ group { name: "e/widgets/border/default/move";
       part { name: "bg"; type: RECT; mouse_events: 0;
          scale: 1;
          description { state: "default" 0.0;
-            color: 64 64 64 255;
+            color_class: "/bg/normal/border/move";
             min: 120 38;
          }
       }
@@ -1262,7 +1297,7 @@ group { name: "e/widgets/border/default/move";
             rel2.relative: 0.0 1.0;
             rel2.offset: 4 -5;
             image.normal: "i-move";
-            color: 160 160 160 255;
+            color_class: "/fg/normal/border/move";
             offscale;
          }
       }
@@ -1273,7 +1308,7 @@ group { name: "e/widgets/border/default/move";
             rel1.to_x: "icon";
             rel1.offset: 4 4;
             rel2.offset: -5 -5;
-            color: 160 160 160 255;
+            color_class: "/fg/normal/border/move";
             offscale;
             text { font: FN; size: 10;
                min: 1 1;
@@ -1288,9 +1323,20 @@ group { name: "e/widgets/border/default/move";
 group { name: "e/widgets/border/default/resize";
    inherit: "e/widgets/border/default/move";
    parts {
+      part { name: "bg";
+         description { state: "default" 0.0;
+            color_class: "/bg/normal/border/resize";
+         }
+      }
       part { name: "icon";
          description { state: "default" 0.0;
             image.normal: "i-resize";
+            color_class: "/fg/normal/border/resize";
+         }
+      }
+      part { name: "e.text.label";
+         description { state: "default" 0.0;
+            color_class: "/fg/normal/border/resize";
          }
       }
    }

data/elementary/themes/edc/button.edc

@@ -6,35 +6,39 @@ group { name: "e/widgets/button";
          description { state: "default" 0.0;
             rel.to: "base";
             WIN_SHADOW_SMALL;
+            color_class: "/shadow/normal/button";
          }
          description { state: "clicked" 0.0;
             inherit;
             image.border_scale_by: 0.25;
-            rel1.offset: -5 -3;
-            rel2.offset: 4 6;
+            rel1.offset: -2 -1;
+            rel2.offset: 0 1;
+            offscale;
+            color_class: "/shadow/pressed/button";
          }
       }
       rect { "base";
          scale: 1;
          desc { "default";
-            color: 51 153 255 255;
+            color_class: "/bg/normal/button";
             rel1.offset: 2 2;
             rel2.offset: -3 -3;
             offscale;
          }
          desc { "clicked"; inherit;
-            color: 255 153 51 255;
+            color_class: "/bg/pressed/button";
          }
          desc { "disabled"; inherit;
-            color: 64 64 64 255;
+            color_class: "/bg/disabled/button";
          }
       }
       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;
+            color: 255 255 255 64; // no cc
          }
       }
       part { name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0;
@@ -83,7 +87,7 @@ group { name: "e/widgets/button";
          clip_to: "label_clip";
          description { state: "default" 0.0;
             fixed: 0 0;
-            color: 255 255 255 255;
+            color_class: "/fg/normal/button";
             rel1.offset: 4 4;
             rel1.relative: 1.0 0.0;
             rel1.to_x: "e.swallow.icon";
@@ -100,7 +104,7 @@ group { name: "e/widgets/button";
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            color: 96 96 96 255;
+            color_class: "/fg/disabled/button";
          }
          description { state: "combo" 0.0;
             inherit: "default" 0.0;
@@ -111,28 +115,14 @@ group { name: "e/widgets/button";
          }
          description { state: "clicked" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255;
-         }
-      }
-      part { name: "glow"; type: RECT; mouse_events: 0;
-         description { state: "default" 0.0;
-            rel.to: "base";
-            rel1.relative: 0.0 1.0;
-            color: 255 255 255 255;
-            align: 0.5 1.0;
-            visible: 0;
-         }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
-            min: 0 5;
-            visible: 1;
+            color_class: "/fg/pressed/button";
          }
       }
       part { name: "event"; type: RECT;
          ignore_flags: ON_HOLD;
          description { state: "default" 0.0;
             rel.to: "base";
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -193,13 +183,5 @@ group { name: "e/widgets/button";
          target: "icon_clip";
          target: "e.text.label";
       }
-      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

@@ -3,46 +3,50 @@ group { name: "e/widgets/check";
       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;
-            align: 0.0 0.5;
-            color: 0 0 0 64;
             offscale;
             fixed: 1 1;
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            color: 0 0 0 16;
+            color_class: "/bg/disabled/check/base";
          }
       }
       part { name: "clip"; type: RECT;
          description { state: "default" 0.0;
+            rel.to: "base";
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            color: 153 153 153 255;
+            color: 255 255 255 153; // no cc
          }
       }
       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;
             visible: 0;
-            color: 160 160 160 255;
-         }
-         description { state: "selected" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
+            color_class: "/fg/normal/check/check";
+            fixed: 1 1;
          }
          description { state: "pressed" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255;
+            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;
          }
       }
@@ -53,7 +57,7 @@ group { name: "e/widgets/check";
             rel1.to_x: "base";
             rel1.relative: 1.0 0.0;
             rel2.offset: -5 -5;
-            color: 160 160 160 255;
+            color_class: "/fg/normal/check/text";
             text { font: FN; size: 10;
                min: 1 1;
                ellipsis: -1;
@@ -65,17 +69,17 @@ group { name: "e/widgets/check";
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            color: 96 96 96 255;
+            color_class: "/fg/disabled/check/text";
          }
          description { state: "pressed" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255;
+            color_class: "/fg/pressed/check/text";
          }
       }
       part { name: "event"; type: RECT;
          ignore_flags: ON_HOLD;
          description { state: "default" 0.0;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -147,7 +151,7 @@ group { name: "e/widgets/check_icon";
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            color: 96 96 96 255;
+            color_class: "/fg/disabled/check/text";
          }
       }
    }

data/elementary/themes/edc/clock.edc

@@ -28,19 +28,19 @@ group { name: "e/modules/clock/digital";
             PART:"secs2", PART:"secs2",
             PART:"ampm", PART:"ampm"
          };
-         
+
          mul = 4;
          if (get_int(do_date)) {
             mul = 3;
          }
-         
+
          for (i = 0; i < 14; i += 2) {
             custom_state(parts[i], "default", 0.0);
          }
          v[0] = 0; v[1] = 2; v[2] = 2; v[3] = 4; // hrs
          v[4] = 5; v[5] = 7; v[6] = 7; v[7] = 9; // mins
          tot = 9;
-         
+
          dosec = get_int(do_seconds);
          do24h = get_int(do_24h);
          if ((dosec) && (!do24h)) { // sec + ampm
@@ -78,7 +78,7 @@ group { name: "e/modules/clock/digital";
       }
       reset() {
          new tim;
-         
+
          evalsize();
          tim = get_int(tick_timer);
          if (tim) {
@@ -89,7 +89,7 @@ group { name: "e/modules/clock/digital";
       }
       valset(name[], v) {
          new buf[20], i;
-         
+
          for (i = 0; i < 10; i++) {
             if (i == v) {
                snprintf(buf, 20, "show,%s-%i", name, i);
@@ -108,7 +108,7 @@ group { name: "e/modules/clock/digital";
          new year, month, day, yearday, weekday, hour, minute;
          new Float:second;
          new v, dosec, do24h, tim;
-         
+
          date(year, month, day, yearday, weekday, hour, minute, second);
          dosec = get_int(do_seconds);
          if (dosec) {
@@ -123,11 +123,11 @@ group { name: "e/modules/clock/digital";
             tim = timer(60.0 - (second), "clock_cb", 1);
          }
          set_int(tick_timer, tim);
-         
+
          // set minutes to minute
          valset("m0", minute / 10);
          valset("m1", minute % 10);
-         
+
          // set hours to hour
          do24h = get_int(do_24h);
          if (do24h) {
@@ -136,7 +136,7 @@ group { name: "e/modules/clock/digital";
          }
          else {
             new pm;
-            
+
             // if 12 or later, its pm
             if (hour >= 12) {
                pm = 1;
@@ -252,7 +252,7 @@ group { name: "e/modules/clock/digital";
             rel2.to: "mins1";
             rel2.relative: 0.0 0.45;
             image.normal: "digit_sep.png";
-            color: 160 160 160 255;
+            color_class: "/fg/normal/gadgets/clock/digital/separator";
             aspect: 1.0 1.0; aspect_preference: BOTH;
          }
       }
@@ -263,7 +263,7 @@ group { name: "e/modules/clock/digital";
             rel2.to: "mins1";
             rel2.relative: 0.0 0.61;
             image.normal: "digit_sep.png";
-            color: 160 160 160 255;
+            color_class: "/fg/normal/gadgets/clock/digital/separator";
             aspect: 1.0 1.0; aspect_preference: BOTH;
          }
       }
@@ -275,7 +275,7 @@ group { name: "e/modules/clock/digital";
             rel2.to: "secs1";
             rel2.relative: 0.0 0.45;
             image.normal: "digit_sep.png";
-            color: 160 160 160 255;
+            color_class: "/fg/normal/gadgets/clock/digital/separator";
             aspect: 1.0 1.0; aspect_preference: BOTH;
          }
       }
@@ -287,37 +287,38 @@ group { name: "e/modules/clock/digital";
             rel2.to: "secs1";
             rel2.relative: 0.0 0.61;
             image.normal: "digit_sep.png";
-            color: 160 160 160 255;
+            color_class: "/fg/normal/gadgets/clock/digital/separator";
             aspect: 1.0 1.0; aspect_preference: BOTH;
          }
       }
-#define ELEM(_NAME, _TO, _DIGIT) \
+#define ELEM(_NAME, _TO, _DIGIT, _CC) \
    part { name: _NAME; \
       description { state: "default" 0.0; \
          rel1.to: _TO; rel2.to: _TO; \
          aspect: (52/72) (52/72); aspect_preference: BOTH; \
          image.normal: "digit_"_DIGIT".png"; \
          visible: 0; \
-         color: 160 160 160 0; \
+         color: 255 255 255 0; /* no cc */ \
+         color_class: _CC; \
       } \
       description { state: "active" 0.0; \
          inherit: "default" 0.0; \
          visible: 1; \
-         color: 160 160 160 255; \
+         color: 255 255 255 255; /* no cc */ \
       } \
    }
-#define DIGIT(_NAME, _TO) \
-   ELEM(_NAME"-0", _TO, "0") \
-   ELEM(_NAME"-1", _TO, "1") \
-   ELEM(_NAME"-2", _TO, "2") \
-   ELEM(_NAME"-3", _TO, "3") \
-   ELEM(_NAME"-4", _TO, "4") \
-   ELEM(_NAME"-5", _TO, "5") \
-   ELEM(_NAME"-6", _TO, "6") \
-   ELEM(_NAME"-7", _TO, "7") \
-   ELEM(_NAME"-8", _TO, "8") \
-   ELEM(_NAME"-9", _TO, "9")
-#define ELEMC(_NAME, _TO, _DIGIT, _CLIP) \
+#define DIGIT(_NAME, _TO, _CC) \
+   ELEM(_NAME"-0", _TO, "0", _CC) \
+   ELEM(_NAME"-1", _TO, "1", _CC) \
+   ELEM(_NAME"-2", _TO, "2", _CC) \
+   ELEM(_NAME"-3", _TO, "3", _CC) \
+   ELEM(_NAME"-4", _TO, "4", _CC) \
+   ELEM(_NAME"-5", _TO, "5", _CC) \
+   ELEM(_NAME"-6", _TO, "6", _CC) \
+   ELEM(_NAME"-7", _TO, "7", _CC) \
+   ELEM(_NAME"-8", _TO, "8", _CC) \
+   ELEM(_NAME"-9", _TO, "9", _CC)
+#define ELEMC(_NAME, _TO, _DIGIT, _CLIP, _CC) \
    part { name: _NAME; \
       clip_to: _CLIP; \
       description { state: "default" 0.0; \
@@ -325,47 +326,51 @@ group { name: "e/modules/clock/digital";
          aspect: (52/72) (52/72); aspect_preference: BOTH; \
          image.normal: "digit_"_DIGIT".png"; \
          visible: 0; \
-         color: 160 160 160 0; \
+         color: 255 255 255 0; /* no cc */ \
+         color_class: _CC; \
       } \
       description { state: "active" 0.0; \
          inherit: "default" 0.0; \
          visible: 1; \
-         color: 160 160 160 255; \
+         color: 255 255 255 255; /* no cc */ \
       } \
    }
-#define DIGITC(_NAME, _TO, _CLIP) \
-   ELEMC(_NAME"-0", _TO, "0", _CLIP) \
-   ELEMC(_NAME"-1", _TO, "1", _CLIP) \
-   ELEMC(_NAME"-2", _TO, "2", _CLIP) \
-   ELEMC(_NAME"-3", _TO, "3", _CLIP) \
-   ELEMC(_NAME"-4", _TO, "4", _CLIP) \
-   ELEMC(_NAME"-5", _TO, "5", _CLIP) \
-   ELEMC(_NAME"-6", _TO, "6", _CLIP) \
-   ELEMC(_NAME"-7", _TO, "7", _CLIP) \
-   ELEMC(_NAME"-8", _TO, "8", _CLIP) \
-   ELEMC(_NAME"-9", _TO, "9", _CLIP)
-      
-#define TAG(_NAME, _TO, _CLIP) \
+#define DIGITC(_NAME, _TO, _CLIP, _CC) \
+   ELEMC(_NAME"-0", _TO, "0", _CLIP, _CC) \
+   ELEMC(_NAME"-1", _TO, "1", _CLIP, _CC) \
+   ELEMC(_NAME"-2", _TO, "2", _CLIP, _CC) \
+   ELEMC(_NAME"-3", _TO, "3", _CLIP, _CC) \
+   ELEMC(_NAME"-4", _TO, "4", _CLIP, _CC) \
+   ELEMC(_NAME"-5", _TO, "5", _CLIP, _CC) \
+   ELEMC(_NAME"-6", _TO, "6", _CLIP, _CC) \
+   ELEMC(_NAME"-7", _TO, "7", _CLIP, _CC) \
+   ELEMC(_NAME"-8", _TO, "8", _CLIP, _CC) \
+   ELEMC(_NAME"-9", _TO, "9", _CLIP, _CC)
+#define TAG(_NAME, _TO, _CLIP, _CC) \
    part { name: _NAME; \
       clip_to: _CLIP; \
       description { state: "default" 0.0; \
          rel1.to: _TO; rel2.to: _TO; \
          aspect: (48/31) (48/31); aspect_preference: BOTH; \
          image.normal: "digit_am.png"; \
-         color: 160 160 160 255; \
+         color_class: _CC; \
       } \
       description { state: "active" 0.0; \
          inherit: "default" 0.0; \
          image.normal: "digit_pm.png"; \
       } \
    }
-      DIGIT ("h0", "hours1")
-      DIGIT ("h1", "hours2")
-      DIGIT ("m0", "mins1")
-      DIGIT ("m1", "mins2")
-      DIGITC("s0", "secs1", "secclip")
-      DIGITC("s1", "secs2", "secclip")
-      TAG("ap", "ampm", "ampmclip")
+// color_class: "/fg/normal/gadgets/clock/time/digital/hours";
+// color_class: "/fg/normal/gadgets/clock/time/digital/mins";
+// color_class: "/fg/normal/gadgets/clock/time/digital/secs";
+// color_class: "/fg/normal/gadgets/clock/time/digital/ampm";
+      DIGIT ("h0", "hours1", "/fg/normal/gadgets/clock/time/digital/hours")
+      DIGIT ("h1", "hours2", "/fg/normal/gadgets/clock/time/digital/hours")
+      DIGIT ("m0", "mins1", "/fg/normal/gadgets/clock/time/digital/mins")
+      DIGIT ("m1", "mins2", "/fg/normal/gadgets/clock/time/digital/mins")
+      DIGITC("s0", "secs1", "secclip", "/fg/normal/gadgets/clock/time/digital/secs")
+      DIGITC("s1", "secs2", "secclip", "/fg/normal/gadgets/clock/time/digital/secs")
+      TAG("ap", "ampm", "ampmclip", "/fg/normal/gadgets/clock/time/digital/ampm")
 #undef TAG
 #undef TAG
 #undef ELEM
@@ -380,7 +385,7 @@ group { name: "e/modules/clock/digital";
              rel1.offset: 0 1;
              rel2.offset: -1 -1;
              align: 0.5 1.0;
-             color: 160 160 160 255;
+             color_class: "/fg/normal/gadgets/clock/time/text/date";
              text { font: FN; size: 8;
                 text_class: "module_small";
                 align: 0.5 0.5;
@@ -399,19 +404,17 @@ group { name: "e/modules/clock/digital";
        }
        part { name: "event"; type: RECT;
           description { state: "default" 0.0;
-             color: 0 0 0 0;
+             color: 0 0 0 0; // no cc
           }
        }
    }
    programs {
-      program {
-         signal: "load"; source: "";
+      program { signal: "load"; source: "";
          script {
             reset();
          }
       }
-      program {
-         signal: "e,state,date,on"; source: "e";
+      program { signal: "e,state,date,on"; source: "e";
          script {
             set_int(do_date, 1);
             set_state(PART:"timearea", "date", 0.0);
@@ -419,8 +422,7 @@ group { name: "e/modules/clock/digital";
             reset();
          }
       }
-      program {
-         signal: "e,state,date,off"; source: "e";
+      program { signal: "e,state,date,off"; source: "e";
          script {
             set_int(do_date, 0);
             set_state(PART:"timearea", "default", 0.0);
@@ -428,32 +430,28 @@ group { name: "e/modules/clock/digital";
             reset();
          }
       }
-      program {
-         signal: "e,state,seconds,on"; source: "e";
+      program { signal: "e,state,seconds,on"; source: "e";
          script {
             set_int(do_seconds, 1);
             set_state(PART:"secclip", "default", 0.0);
             reset();
          }
       }
-      program {
-         signal: "e,state,seconds,off"; source: "e";
+      program { signal: "e,state,seconds,off"; source: "e";
          script {
             set_int(do_seconds, 0);
             set_state(PART:"secclip", "hidden", 0.0);
             reset();
          }
       }
-      program {
-         signal: "e,state,24h,on"; source: "e";
+      program { signal: "e,state,24h,on"; source: "e";
          script {
             set_int(do_24h, 1);
             set_state(PART:"ampmclip", "hidden", 0.0);
             reset();
          }
       }
-      program {
-         signal: "e,state,24h,off"; source: "e";
+      program { signal: "e,state,24h,off"; source: "e";
          script {
             set_int(do_24h, 0);
             set_state(PART:"ampmclip", "default", 0.0);
@@ -461,13 +459,11 @@ group { name: "e/modules/clock/digital";
          }
       }
 #define DIGPRG(_NAME) \
-      program { \
-         signal: "show,"_NAME; source: "c"; \
+      program { signal: "show,"_NAME; source: "c"; \
          action: STATE_SET "active" 0.0; \
          target: _NAME; \
       } \
-      program { \
-         signal: "hide,"_NAME; source: "c"; \
+      program { signal: "hide,"_NAME; source: "c"; \
          action: STATE_SET "default" 0.0; \
          transition: DECELERATE 0.1; \
          target: _NAME; \
@@ -492,28 +488,57 @@ group { name: "e/modules/clock/digital";
       DIGPRGS("s1")
 #undef DIGPRG
 #undef DIGPRGS
+      program { signal: "e,state,freeze"; source: "e";
+         script {
+            new tim;
+
+            tim = get_int(tick_timer);
+            if (tim) {
+               cancel_timer(tim);
+               set_int(tick_timer, 0);
+            }
+         }
+      }
+      program { signal: "e,state,thaw"; source: "e";
+         script {
+            new tim;
+
+            tim = get_int(tick_timer);
+            if (tim) {
+               cancel_timer(tim);
+               set_int(tick_timer, 0);
+            }
+            clock_cb(0);
+         }
+      }
    }
 }
 
 group { name: "e/modules/clock/main";
-   images.image: "clock_base.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: "clock_base";
+      image { image: "clock_base-160.png" COMP; size: 81 81 99999 99999; }
+      image { image: "clock_base-080.png" COMP; size: 41 41 80 80; }
+      image { image: "clock_base-040.png" COMP; size: 0 0 40 40; }
    }
-   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: "clock_base_digits";
+      image { image: "clock_base_digits-160.png" COMP; size: 81 81 99999 99999; }
+      image { image: "clock_base_digits-080.png" COMP; size: 41 41 80 80; }
+      image { image: "clock_base_digits-040.png" COMP; size: 0 0 40 40; }
    }
-   set { name: "tacho_hand_small_sec";
-      image { image: "tacho_hand_small_sec.png" COMP; size: 73 73 99999 99999; }
-      image { image: "tacho_hand_small_sec2.png" COMP; size: 37 37 72 72; }
-      image { image: "tacho_hand_small_sec3.png" COMP; size: 19 19 36 36; }
-      image { image: "tacho_hand_small_sec4.png" COMP; size: 0 0 18 18; }
+   set { name: "clock_hand_secs";
+      image { image: "clock_hand_secs-160.png" COMP; size: 81 81 99999 99999; }
+      image { image: "clock_hand_secs-080.png" COMP; size: 41 41 80 80; }
+      image { image: "clock_hand_secs-040.png" COMP; size: 0 0 40 40; }
+   }
+   set { name: "clock_hand_mins";
+      image { image: "clock_hand_mins-160.png" COMP; size: 81 81 99999 99999; }
+      image { image: "clock_hand_mins-080.png" COMP; size: 41 41 80 80; }
+      image { image: "clock_hand_mins-040.png" COMP; size: 0 0 40 40; }
+   }
+   set { name: "clock_hand_hours";
+      image { image: "clock_hand_hours-160.png" COMP; size: 81 81 99999 99999; }
+      image { image: "clock_hand_hours-080.png" COMP; size: 41 41 80 80; }
+      image { image: "clock_hand_hours-040.png" COMP; size: 0 0 40 40; }
    }
    min: 16 16;
    max: 160 160;
@@ -552,20 +577,24 @@ group { name: "e/modules/clock/main";
    parts {
       part { name: "base"; mouse_events: 0;
          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.png";
+            image.normal: "clock_base";
+            color_class: "/bg/normal/gadgets/clock/analog/base";
+         }
+      }
+      part { name: "digits"; mouse_events: 0;
+         description { state: "default" 0.0;
+            rel.to: "base";
+            image.normal: "clock_base_digits";
+            color_class: "/fg/normal/gadgets/clock/analog/digits";
          }
       }
       part { name: "seconds"; mouse_events: 0;
          description { state: "default" 0.0;
-            image.normal: "tacho_hand_small_sec";
-            color: 255 0 0 255;
-            rel1.to: "base";
-            rel2.to: "base";
-            map {
-               on: 1;
+            image.normal: "clock_hand_secs";
+            color_class: "/fg/normal/gadgets/clock/analog/hands/secs";
+            rel.to: "base";
+            map { on: 1;
                rotation.center: "base";
             }
          }
@@ -575,44 +604,38 @@ group { name: "e/modules/clock/main";
          }
       }
       part { name: "minutes"; mouse_events: 0;
-         description { state: "default" 0.0000;
-            color: 255 255 255 255;
-            image.normal: "tacho_hand_big";
-            rel1.to: "base";
-            rel2.to: "base";
-            map {
-               on: 1;
+         description { state: "default" 0.0;
+            image.normal: "clock_hand_mins";
+            color_class: "/fg/normal/gadgets/clock/analog/hands/mins";
+            rel.to: "base";
+            map { on: 1;
                rotation.center: "base";
             }
          }
       }
       part { name: "hours"; mouse_events: 0;
          description { state: "default" 0.0;
-            image.normal: "tacho_hand_small_min";
-            color: 255 255 255 255;
-            rel1.to: "base";
-            rel2.to: "base";
-            map {
-               on: 1;
+            image.normal: "clock_hand_hours";
+            color_class: "/fg/normal/gadgets/clock/analog/hands/hours";
+            rel.to: "base";
+            map { on: 1;
                rotation.center: "base";
             }
          }
       }
       part { name: "event"; type: RECT;
          description { state: "default" 0.0;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
       }
    }
    programs {
-      program {
-         signal: "load"; source: "";
+      program { signal: "load"; source: "";
          script {
             clock_cb(0);
          }
       }
-      program {
-         signal: "e,state,seconds,on"; source: "e";
+      program { signal: "e,state,seconds,on"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "seconds";
          after: "sec2";
@@ -630,8 +653,7 @@ group { name: "e/modules/clock/main";
             clock_cb(0);
          }
       }
-      program {
-         signal: "e,state,seconds,off"; source: "e";
+      program { signal: "e,state,seconds,off"; source: "e";
          action: STATE_SET "hidden" 0.0;
          target: "seconds";
          after: "sec3";
@@ -649,6 +671,29 @@ group { name: "e/modules/clock/main";
             clock_cb(0);
          }
       }
+      program { signal: "e,state,freeze"; source: "e";
+         script {
+            new tim;
+
+            tim = get_int(tick_timer);
+            if (tim) {
+               cancel_timer(tim);
+               set_int(tick_timer, 0);
+            }
+         }
+      }
+      program { signal: "e,state,thaw"; source: "e";
+         script {
+            new tim;
+
+            tim = get_int(tick_timer);
+            if (tim) {
+               cancel_timer(tim);
+               set_int(tick_timer, 0);
+            }
+            clock_cb(0);
+         }
+      }
    }
 }
 
@@ -657,7 +702,7 @@ group { name: "e/modules/clock/calendar/dayname";
       part { name: "e.text.label"; type: TEXT; mouse_events: 0;
          scale: 1;
          description { state: "default" 0.0;
-            color: 160 160 160 255;
+            color_class: "/fg/normal/gadgets/clock/cal/day/name/week";
             text { font: FN; size: 8;
                text: "WWe";
                min: 1 1;
@@ -668,18 +713,16 @@ group { name: "e/modules/clock/calendar/dayname";
          }
          description { state: "weekend" 0.0;
             inherit: "default" 0.0;
-            color: 51 153 255 255;
+            color_class: "/fg/normal/gadgets/clock/cal/day/name/weekend";
          }
       }
    }
    programs {
-      program {
-         signal: "e,state,weekend"; source: "e";
+      program { signal: "e,state,weekend"; source: "e";
          action: STATE_SET "weekend" 0.0;
          target: "e.text.label";
       }
-      program {
-         signal: "e,state,weekday"; source: "e";
+      program { signal: "e,state,weekday"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "e.text.label";
       }
@@ -692,47 +735,51 @@ group { name: "e/modules/clock/calendar/day";
       evalstate() {
          new vv = get_int(day_state);
 
-         if (vv & 2)
-           {
-              set_state(PART:"e.text.label", "today", 0.0);
-              set_state(PART:"label2", "today", 0.0);
-              set_state(PART:"base", "today", 0.0);
-           }
-         else if (vv & 4)
-           {
-              set_state(PART:"e.text.label", "hidden", 0.0);
-              set_state(PART:"label2", "default", 0.0);
-              set_state(PART:"base", "default", 0.0);
-           }
-         else if (vv & 1)
-           {
-              set_state(PART:"e.text.label", "weekend", 0.0);
-              set_state(PART:"label2", "default", 0.0); 
-              set_state(PART:"base", "default", 0.0);
-          }
-         else
-           {
-              set_state(PART:"e.text.label", "default", 0.0);
-              set_state(PART:"label2", "default", 0.0);
-              set_state(PART:"base", "default", 0.0);
-           }
+         if (vv & 2) {
+            set_state(PART:"e.text.label", "today", 0.0);
+            set_state(PART:"label2", "today", 0.0);
+            set_state(PART:"base", "today", 0.0);
+         } else if (vv & 4) {
+            set_state(PART:"e.text.label", "hidden", 0.0);
+            set_state(PART:"label2", "default", 0.0);
+            set_state(PART:"base", "default", 0.0);
+         } else if (vv & 1) {
+            set_state(PART:"e.text.label", "weekend", 0.0);
+            set_state(PART:"label2", "default", 0.0); 
+            set_state(PART:"base", "default", 0.0);
+         } else {
+            set_state(PART:"e.text.label", "default", 0.0);
+            set_state(PART:"label2", "default", 0.0);
+            set_state(PART:"base", "default", 0.0);
+         }
       }
    }
    parts {
       part { name: "base"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            color: 0 0 0 64;
+            color_class: "/bg/normal/gadgets/clock/cal/day/date/normal";
             visible: 0;
          }
          description { state: "today" 0.0;
             inherit: "default" 0.0;
+            color_class: "/bg/normal/gadgets/clock/cal/day/date/today";
+            visible: 1;
+         }
+         description { state: "weekend" 0.0;
+            inherit: "default" 0.0;
+            color_class: "/bg/normal/gadgets/clock/cal/day/date/weekend";
+            visible: 1;
+         }
+         description { state: "hidden" 0.0;
+            inherit: "default" 0.0;
+            color_class: "/bg/normal/gadgets/clock/cal/day/date/hidden";
             visible: 1;
          }
       }
       part { name: "e.text.label"; type: TEXT; mouse_events: 0;
          scale: 1;
          description { state: "default" 0.0;
-            color: 160 160 160 255;
+            color_class: "/fg/normal/gadgets/clock/cal/day/date/normal";
             rel1.offset: 3 3;
             rel2.offset: -4 -4;
             offscale;
@@ -745,23 +792,23 @@ group { name: "e/modules/clock/calendar/day";
          }
          description { state: "today" 0.0;
             inherit: "default" 0.0;
+            color_class: "/fg/normal/gadgets/clock/cal/day/date/today";
             visible: 0;
          }
          description { state: "weekend" 0.0;
             inherit: "default" 0.0;
-            color: 51 153 255 255;
+            color_class: "/fg/normal/gadgets/clock/cal/day/date/weekend";
          }
          description { state: "hidden" 0.0;
             inherit: "default" 0.0;
-            color: 40 40 40 255;
+            color_class: "/fg/normal/gadgets/clock/cal/day/date/faded";
          }
       }
       part { name: "label2"; type: TEXT; mouse_events: 0;
          scale: 1;
          description { state: "default" 0.0;
-            color: 255 255 255 255;
-            rel1.to: "e.text.label";
-            rel2.to: "e.text.label";
+            color_class: "/fg/normal/gadgets/clock/cal/day/date/today";
+            rel.to: "e.text.label";
             text { font: FN; size: 10;
                text_source: "e.text.label";
                min: 1 1;
@@ -777,16 +824,14 @@ group { name: "e/modules/clock/calendar/day";
       }
    }
    programs {
-      program {
-         signal: "e,state,weekend"; source: "e";
+      program { signal: "e,state,weekend"; source: "e";
          script {
             new vv = get_int(day_state);
             set_int(day_state, vv | 1);
             evalstate();
          }
       }
-      program {
-         signal: "e,state,weekday"; source: "e";
+      program { signal: "e,state,weekday"; source: "e";
          script {
             new vv = get_int(day_state);
             set_int(day_state, vv & (~1));
@@ -794,16 +839,14 @@ group { name: "e/modules/clock/calendar/day";
          }
       }
 
-      program {
-         signal: "e,state,today"; source: "e";
+      program { signal: "e,state,today"; source: "e";
          script {
             new vv = get_int(day_state);
             set_int(day_state, vv | 2);
             evalstate();
          }
       }
-      program {
-         signal: "e,state,someday"; source: "e";
+      program { signal: "e,state,someday"; source: "e";
          script {
             new vv = get_int(day_state);
             set_int(day_state, vv & (~2));
@@ -811,16 +854,14 @@ group { name: "e/modules/clock/calendar/day";
          }
       }
 
-      program {
-         signal: "e,state,hidden"; source: "e";
+      program { signal: "e,state,hidden"; source: "e";
          script {
             new vv = get_int(day_state);
             set_int(day_state, vv | 4);
             evalstate();
          }
       }
-      program {
-         signal: "e,state,visible"; source: "e";
+      program { signal: "e,state,visible"; source: "e";
          script {
             new vv = get_int(day_state);
             set_int(day_state, vv & (~4));
@@ -842,7 +883,7 @@ group { name: "e/modules/clock/calendar";
             rel1.relative: 1.0 0.0;
             rel1.offset: 4 0;
             rel2.relative: 1.0 0.0;
-            color: 160 160 160 255;
+            color_class: "/fg/normal/gadgets/clock/cal/month";
             text { font: FNBD; size: 10;
                text: "000000000000";
                align: 0.0 0.5;
@@ -860,7 +901,7 @@ group { name: "e/modules/clock/calendar";
             rel2.to_x: "next";
             rel2.offset: -5 -1;
             rel2.relative: 0.0 0.0;
-            color: 160 160 160 255;
+            color_class: "/fg/normal/gadgets/clock/cal/year";
             text { font: FNBD; size: 10;
                text: "0000";
                align: 1.0 0.5;
@@ -877,35 +918,32 @@ group { name: "e/modules/clock/calendar";
             max: 15 15;
             rel.to: "prev";
             image.normal: "i-arrow-l";
-            color: 160 160 160 255;
+            color_class: "/fg/normal/gadgets/clock/cal/prev";
          }
          description { state: "pressed" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255;
+            color_class: "/fg/pressed/gadgets/clock/cal/prev";
          }
       }
       part { name: "prev"; type: RECT;
          description { state: "default" 0.0;
             align: 0.0 0.5;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
             aspect: 1.0 1.0; aspect_preference: VERTICAL;
             rel1.to_y: "e.text.month";
             rel1.relative: 0.0 0.0;
             rel2.to_y: "e.text.month";
             rel2.relative: 0.0 1.0;
          }
-         program { name: "prev_down";
-            signal: "mouse,down,1*"; source: "prev";
+         program { signal: "mouse,down,1*"; source: "prev";
             action: STATE_SET "pressed" 0.0;
             target: "previm";
          }
-         program { name: "prev_up";
-            signal: "mouse,up,1"; source: "prev";
+         program { signal: "mouse,up,1"; source: "prev";
             action: STATE_SET "default" 0.0;
             target: "previm";
          }
-         program { name: "prev_clicked";
-            signal: "mouse,clicked,1*"; source: "prev";
+         program { signal: "mouse,clicked,1*"; source: "prev";
             action: SIGNAL_EMIT "e,action,prev" "";
          }
       }
@@ -917,41 +955,38 @@ group { name: "e/modules/clock/calendar";
             max: 15 15;
             rel.to: "next";
             image.normal: "i-arrow-r";
-            color: 160 160 160 255;
+            color_class: "/fg/normal/gadgets/clock/cal/next";
          }
          description { state: "pressed" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255;
+            color_class: "/fg/pressed/gadgets/clock/cal/next";
          }
       }
       part { name: "next"; type: RECT;
          description { state: "default" 0.0;
             align: 1.0 0.5;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
             aspect: 1.0 1.0; aspect_preference: VERTICAL;
             rel1.to_y: "e.text.month";
             rel1.relative: 1.0 0.0;
             rel2.to_y: "e.text.month";
             rel2.relative: 1.0 1.0;
          }
-         program { name: "next_down";
-            signal: "mouse,down,1"; source: "next";
+         program { signal: "mouse,down,1"; source: "next";
             action: STATE_SET "pressed" 0.0;
             target: "nextim";
          }
-         program { name: "next_up";
-            signal: "mouse,up,1"; source: "next";
+         program { signal: "mouse,up,1"; source: "next";
             action: STATE_SET "default" 0.0;
             target: "nextim";
          }
-         program { name: "next_clicked";
-            signal: "mouse,clicked,1"; source: "next";
+         program { signal: "mouse,clicked,1"; source: "next";
             action: SIGNAL_EMIT "e,action,next" "";
          }
       }
       part { name: "sep"; type: RECT;
          description { state: "default" 0.0;
-            color: 80 80 80 255;
+            color_class: "/fg/normal/gadgets/clock/cal/daydate-sep";
             rel1.relative: 0.0 1.0;
             rel1.offset: 8 0;
             rel1.to: "e.table.daynames";
@@ -996,11 +1031,13 @@ item { \
          }
       }
       part { name: "e.table.days"; type: TABLE;
+         scale: 1;
          description { state: "default" 0.0;
             rel1.to_y: "e.table.daynames";
             rel1.relative: 0.0 1.0;
             rel1.offset: 8 16;
             rel2.offset: -9 -9;
+            offscale;
             step: 7 5;
             table { homogeneous: TABLE;
                padding: 1 1;

data/elementary/themes/edc/colors.edc

@@ -6,7 +6,7 @@ group { name: "e/modules/conf_colors/preview/solid";
          description { state: "default" 0.0;
             rel1.offset: 2 2;
             rel2.offset: -3 -3;
-            color: DARK_GREY_BG_COLOR;
+            color_class: "/bg-dark/normal/color";
             min: 18 18;
             offscale;
          }
@@ -18,14 +18,13 @@ group { name: "e/modules/conf_colors/preview/solid";
             rel1.offset: 2 2;
             rel2.offset: -3 -3;
             image.normal: "diagonal_stripes.png";
-            color: 255 255 255 64;
+            color_class: "/bg-dark-alt/normal/color";
             TILED_PATTERN(240, 240)
             offscale;
          }
       }
       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";
          }
@@ -36,9 +35,7 @@ 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;
-         effect: OUTLINE_SHADOW;
          description { state: "default" 0.0;
-            color: FN_COL_OUTLINE_SHADOW;
             color_class: "color_preview";
             text { font: FNBD; size: 16;
                text: "Ab";
@@ -58,7 +55,7 @@ group { name: "e/modules/conf_colors/preview/unknown";
          description { state: "default" 0.0;
             rel1.offset: 2 2;
             rel2.offset: -3 -3;
-            color: DARK_GREY_BG_COLOR;
+            color_class: "/bg-dark/normal/color";
             min: 18 18;
             offscale;
          }
@@ -70,23 +67,22 @@ group { name: "e/modules/conf_colors/preview/unknown";
             rel1.offset: 2 2;
             rel2.offset: -3 -3;
             image.normal: "diagonal_stripes.png";
-            color: 255 255 255 64;
+            color_class: "/bg-dark-alt/normal/color";
             TILED_PATTERN(240, 240)
             offscale;
          }
       }
       part { name: "c1"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            color: 255 0 0 128;
+            color: 255 0 0 128; // no cc
             color_class: "color_preview_c1";
-            rel1.to: "pat";
-            rel2.to: "pat";
+            rel.to: "pat";
             rel2.relative: 0.333 1.0;
          }
       }
       part { name: "c2"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            color: 0 255 0 128;
+            color: 0 255 0 128; // no cc
             color_class: "color_preview_c2";
             rel1.to: "c1";
             rel1.relative: 1.0 0.0;
@@ -96,7 +92,7 @@ group { name: "e/modules/conf_colors/preview/unknown";
       }
       part { name: "c3"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            color: 0 0 255 128;
+            color: 0 0 255 128; // no cc
             color_class: "color_preview_c3";
             rel1.to: "c2";
             rel1.relative: 1.0 0.0;

data/elementary/themes/edc/colorwell.edc

@@ -6,7 +6,7 @@ group { name: "e/widgets/color_well";
          description { state: "default" 0.0;
             rel1.offset: 2 2;
             rel2.offset: -3 -3;
-            color: DARK_GREY_BG_COLOR;
+            color_class: "/bg-dark/normal/color";
             min: 18 18;
             offscale;
          }
@@ -18,9 +18,8 @@ group { name: "e/widgets/color_well";
               rel.to: "bg";
               rel1.offset: 2 2;
               rel2.offset: -3 -3;
-              image.normal:
-              "diagonal_stripes.png";
-              color: 255 255 255 64;
+              image.normal: "diagonal_stripes.png";
+              color_class: "/bg-dark-alt/normal/color";
               TILED_PATTERN(240, 240)
               offscale;
            }
@@ -31,7 +30,7 @@ group { name: "e/widgets/color_well";
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 64;
+            color: 255 255 255 64; // no cc
          }
       }
       part { name: "e.swallow.content"; type: SWALLOW; mouse_events: 0;

data/elementary/themes/edc/comp.edc

@@ -7,7 +7,7 @@ group { name: "e/comp/preview";
       part { name: "e.text.label"; type: TEXT; mouse_events: 0;
          scale: 1;
          description { state: "default" 0.0;
-            color: 255 255 255 255;
+            color_class: "/fg/normal/comp/preview/text";
             text { font: FNBD; size: 10;
                text_class: "fileman_icon";
                align: 0.5 0.5;
@@ -51,36 +51,36 @@ 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;
+            color: 255 255 255 0; // no cc
             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;
+            color: 255 255 255 255; // no cc
             visible: 1;
          }
       }
       part { name: "blanker"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
             visible: 0;
          }
          description { state: "visible" 0.0;
             inherit;
-            color: 0 0 0 255;
+            color: 0 0 0 255; // no cc
             visible: 1;
          }
       }
       part { name: "suspender"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
             visible: 0;
          }
          description { state: "visible" 0.0;
             inherit;
-            color: 0 0 0 255;
+            color: 0 0 0 255; // no cc
             visible: 1;
          }
       }
@@ -212,12 +212,12 @@ 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;
+            color: 255 255 255 0; // no cc
             visible: 0;
          }
          description { state: "visible" 0.0;
             inherit;
-            color: 255 255 255 255;
+            color: 255 255 255 255; // no cc
             visible: 1;
          }
       }
@@ -231,7 +231,18 @@ group { name: "e/comp/frame/default";
             visible: 0;
          }
       }
-      WIN_SHAD("e.swallow.content", "shadow", "win_shad_flat.png", 21, 21, 14, 28, 0.5)
+      part { name: "focus-shadow"; type: RECT;
+         clip_to: "shadow";
+         description { state: "default" 0.0;
+            rel.to: "clipper";
+            color_class: "/shadow/normal/comp/win";
+         }
+         description { state: "focused" 0.0;
+            inherit;
+            color_class: "/shadow/selected/comp/win";
+         }
+      }
+      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;
@@ -249,10 +260,11 @@ group { name: "e/comp/frame/default";
          mouse_events: 0;
          description { state: "default" 0.0;
             rel.to: "clipper";
+            color_class: "/bg/normal/comp/win";
          }
          description { state: "focused" 0.0;
             inherit;
-            color: 255 255 255 255;
+            color_class: "/bg/selected/comp/win";
          }
       }
       part { name: "e.swallow.content"; type: SWALLOW;
@@ -304,30 +316,17 @@ group { name: "e/comp/frame/default";
              action: SIGNAL_EMIT "e,action,hide,done" "e";
          }
       }
-/*
-      program {
-         name: "focus_on";
-         signal: "e,state,focused"; source: "e";
+      program { signal: "e,state,focused"; source: "e";
          action: STATE_SET "focused" 0.0;
          transition: SINUSOIDAL 0.1 USE_DURATION_FACTOR 1;
-         targets: "glow" "focus-clipper";
-         sequence {
-             action: STATE_SET "default" 0.0;
-             transition: SINUSOIDAL 0.4 USE_DURATION_FACTOR 1;
-             target: "glow";
-         }
+         targets: "focus-clipper" "focus-shadow";
       }
-      program {
-         name: "focus_off";
-         signal: "e,state,unfocused"; source: "e";
+      program { signal: "e,state,unfocused"; source: "e";
          action: STATE_SET "default" 0.0;
-         transition: SINUSOIDAL 0.1 USE_DURATION_FACTOR 1;
-         target: "focus-clipper";
-         sequence {
-             action: STATE_SET "default" 0.0;
-             target: "glow";
-         }
+         transition: SINUSOIDAL 0.2 USE_DURATION_FACTOR 1;
+         targets: "focus-clipper" "focus-shadow";
       }
+/*
       program { name: "urgent1";
          signal: "e,state,urgent"; source: "e";
          action: STATE_SET "focused" 0.0;
@@ -470,7 +469,12 @@ group { name: "e/comp/frame/menu";
    inherit: "e/comp/frame/popup";
    images.image: "win_shad_angle.png" COMP;
    parts {
-      WIN_SHAD("e.swallow.content", "shadow", "win_shad_angle.png", 21, 21, 14, 28, 0.5)
+      part { name: "focus-shadow"; type: RECT;
+         description { state: "default" 0.0;
+            color_class: "/shadow/selected/comp/win";
+         }
+      }
+      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;
@@ -509,17 +513,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;
+            color: 255 255 255 0; // no cc
             visible: 0;
          }
          description { state: "visible1" 0.0;
             inherit;
-            color: 255 255 255 255;
+            color: 255 255 255 255; // no cc
             visible: 1;
          }
          description { state: "visible2" 0.0;
             inherit;
-            color: 255 255 255 255;
+            color: 255 255 255 255; // no cc
             visible: 1;
          }
       }
@@ -534,25 +538,25 @@ group { name: "e/comp/frame/fullscreen";
             rel2.relative: 2.0 2.0;
             image.normal: "screen_circular_shadow.png";
             fill.smooth: 0;
-            color: 255 255 255 0;
+            color: 0 0 0 0; // no cc
             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;
+            color: 0 0 0 255; // no cc
             visible: 1;
          }
       }
-      part { name: "scr_shade"; type: RECT;
+      part { name: "scr_shade"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
             visible: 0;
          }
          description { state: "visible" 0.0;
             inherit;
-            color: 0 0 0 255;
+            color: 0 0 0 255; // no cc
             visible: 1;
          }
       }
@@ -577,25 +581,23 @@ group { name: "e/comp/frame/fullscreen";
       part { name: "e.swallow.content"; type: SWALLOW;
          clip_to: "clipper";
          description { state: "default" 0.0;
-            rel1.to: "shower";
-            rel2.to: "shower";
+            rel.to: "shower";
          }
       }
-      part { name: "fader"; type: RECT;
+      part { name: "fader"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            rel1.to: "e.swallow.content";
-            rel2.to: "e.swallow.content";
-            color: 255 255 255 0;
+            rel.to: "e.swallow.content";
+            color: 255 255 255 0; // no cc
             visible: 0;
          }
          description { state: "visible1" 0.0;
             inherit;
-            color: 255 255 255 255;
+            color: 255 255 255 255; // no cc
             visible: 1;
          }
          description { state: "visible2" 0.0;
             inherit;
-            color: 255 255 255 0;
+            color: 255 255 255 0; // no cc
             visible: 0;
          }
       }

data/elementary/themes/edc/comp_compat.edc

@@ -8,12 +8,12 @@ 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;
+            color: 255 255 255 0; // no cc
             visible: 0;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255;
+            color: 255 255 255 255; // no cc
             visible: 1;
          }
       }
@@ -27,7 +27,18 @@ group { name: "e/comp/border/default";
             visible: 0;
          }
       }
-      WIN_SHAD("e.swallow.content", "shadow", "win_shad_flat.png", 21, 21, 14, 28, 0.5)
+      part { name: "focus-shadow"; type: RECT;
+         clip_to: "shadow";
+         description { state: "default" 0.0;
+            rel.to: "clipper";
+            color_class: "/shadow/normal/comp/win";
+         }
+         description { state: "focused" 0.0;
+            inherit;
+            color_class: "/shadow/selected/comp/win";
+         }
+      }
+      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;
@@ -51,10 +62,11 @@ group { name: "e/comp/border/default";
          mouse_events: 0;
          description { state: "default" 0.0;
             rel.to: "clipper";
+            color_class: "/bg/normal/comp/win";
          }
          description { state: "focused" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255;
+            color_class: "/bg/selected/comp/win";
          }
       }
       part { name: "e.swallow.content"; type: SWALLOW;
@@ -65,19 +77,15 @@ group { name: "e/comp/border/default";
       }
    }
    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";
-         signal: "e,state,visible,on"; source: "e";
+      program { signal: "e,state,visible,on"; source: "e";
          action: STATE_SET "visible" 0.0;
          transition: DECELERATE 0.15 USE_DURATION_FACTOR 1;
          target: "clipper";
@@ -87,9 +95,7 @@ group { name: "e/comp/border/default";
       program { name: "show2";
          action: SIGNAL_EMIT "e,action,show,done" "e";
       }
-      program {
-         name: "visible_off";
-         signal: "e,state,visible,off"; source: "e";
+      program { signal: "e,state,visible,off"; source: "e";
          action: STATE_SET "default" 0.0;
          transition: DECELERATE 0.30 USE_DURATION_FACTOR 1;
          target: "clipper";
@@ -99,35 +105,17 @@ group { name: "e/comp/border/default";
       program { name: "hide2";
          action: SIGNAL_EMIT "e,action,hide,done" "e";
       }
-/*
-      program {
-         name: "focus_on";
-         signal: "e,state,focus,on"; source: "e";
+      program { signal: "e,state,focus,on"; source: "e";
          action: STATE_SET "focused" 0.0;
          transition: SINUSOIDAL 0.1 USE_DURATION_FACTOR 1;
-         target: "glow";
-         target: "focus-clipper";
-         after: "focus2";
+         targets: "focus-clipper" "focus-shadow";
       }
-      program { name: "focus2";
-         action: STATE_SET "default" 0.0;
-         transition: SINUSOIDAL 0.4 USE_DURATION_FACTOR 1;
-         target: "glow";
-      }
-      program {
-         name: "focus_off";
-         signal: "e,state,focus,off"; source: "e";
+      program { signal: "e,state,focus,off"; source: "e";
          action: STATE_SET "default" 0.0;
          transition: SINUSOIDAL 0.1 USE_DURATION_FACTOR 1;
-         target: "focus-clipper";
-         after: "focus_off2";
-      }
-      program {
-         name: "focus_off2";
-         action: STATE_SET "default" 0.0;
-         transition: SINUSOIDAL 0.4 USE_DURATION_FACTOR 1;
-         target: "glow";
+         targets: "focus-clipper" "focus-shadow";
       }
+/*
       program { name: "urgent1";
          signal: "e,state,urgent,on"; source: "e";
          action: STATE_SET "focused" 0.0;
@@ -178,14 +166,12 @@ group { name: "e/comp/border/rotate";
       }
    }
    programs {
-      program { name: "focus3";
-         signal: "e,state,focus,on"; source: "e";
+      program { 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;
       }
-      program { name: "focus_off3";
-         signal: "e,state,focus,off"; source: "e";
+      program { 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;
@@ -238,12 +224,10 @@ 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";
       }
    }
@@ -299,17 +283,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;
+            color: 255 255 255 0; // no cc
             visible: 0;
          }
          description { state: "visible1" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255;
+            color: 255 255 255 255; // no cc
             visible: 1;
          }
          description { state: "visible2" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255;
+            color: 255 255 255 255; // no cc
             visible: 1;
          }
       }
@@ -324,25 +308,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;
+            color: 255 255 255 0; // no cc
             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;
+            color: 255 255 255 255; // no cc
             visible: 1;
          }
       }
-      part { name: "scr_shade"; type: RECT;
+      part { name: "scr_shade"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
             visible: 0;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
-            color: 0 0 0 255;
+            color: 0 0 0 255; // no cc
             visible: 1;
          }
       }
@@ -371,21 +355,20 @@ group { name: "e/comp/border/fullscreen";
             rel2.to: "shower";
          }
       }
-      part { name: "fader"; type: RECT;
+      part { name: "fader"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            rel1.to: "e.swallow.content";
-            rel2.to: "e.swallow.content";
-            color: 255 255 255 0;
+            rel.to: "e.swallow.content";
+            color: 255 255 255 0; // no cc
             visible: 0;
          }
          description { state: "visible1" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255;
+            color: 255 255 255 255; // no cc
             visible: 1;
          }
          description { state: "visible2" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 0;
+            color: 255 255 255 0; // no cc
             visible: 0;
          }
       }

data/elementary/themes/edc/comp_effects.edc

@@ -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;
+            color: 255 255 255 255; // no cc
          }
          description { state: "hidden";
             rel1.to: "mover";
             rel2.to: "mover";
-            color: 255 255 255 0;
+            color: 255 255 255 0; // no cc
          }
       }
       part { name: "e.swallow.content"; clip_to: "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;
+            color: 255 255 255 255; // no cc
          }
          description { state: "hidden";
             inherit: "default" 0.0;
-            color: 255 255 255 0;
+            color: 255 255 255 0; // no cc
          }
       }
       part { name: "e.swallow.content"; type: SWALLOW;

data/elementary/themes/edc/conf.edc

@@ -2,10 +2,11 @@ group { name: "e/widgets/configure/main";
    parts {
       part { name: "base"; type: RECT;
          description { state: "default" 0.0;
-            color: 64 64 64 255;
+            color_class: "/bg/normal/background";
          }
       }
       part { name: "separator"; type: RECT; mouse_events: 0;
+         scale: 1;
          description { state: "default" 0.0;
             min: 16 1;
             max: 99999 1;
@@ -16,19 +17,21 @@ group { name: "e/widgets/configure/main";
             rel2.offset: -1 -1;
             rel2.to_y: "e.swallow.button";
             fixed: 0 1;
-            color: 72 72 72 255;
+            color_class: "/fg/normal/separator/horizontal";
          }
       }
       part { name: "e.swallow.content"; type: SWALLOW;
+         scale: 1;
          description { state: "default" 0.0;
-            rel1.offset: 0 8;
             rel1.to_x: "base";
             rel2.relative: 1.0 0.0;
             rel2.offset: -1 -17;
             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;
@@ -36,6 +39,7 @@ group { name: "e/widgets/configure/main";
             rel2.relative: 0.5 1.0;
             rel2.offset: -1 -9;
             fixed: 1 1;
+            offscale;
          }
       }
    }
@@ -47,7 +51,7 @@ group { name: "e/modules/conf/main";
    parts {
       part { name: "base"; type: RECT;
          description { state: "default" 0.0;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
          description { state: "clicked" 0.0;
             inherit: "default" 0.0;
@@ -61,30 +65,27 @@ group { name: "e/modules/conf/main";
             rel1.offset: 4 4;
             rel2.offset: -5 -5;
             image.normal: "spanner.png";
+            color_class: "/fg/normal/icon";
             offscale;
-            color: 160 160 160 255;
          }
          description { state: "clicked" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255;
+            color_class: "/fg/pressed/icon";
          }
       }
    }
    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";
       }
-      program {
-         signal: "mouse,clicked,1*"; source: "base";
+      program { signal: "mouse,clicked,1*"; source: "base";
          action: SIGNAL_EMIT "e,action,conf" "";
       }
    }

data/elementary/themes/edc/connman.edc

@@ -41,15 +41,15 @@ group { name: "e/modules/connman/main";
             rel1.relative: (50/160) (15/160);
             rel2.relative: (110/160) (145/160);
             image.normal: "eth-base.png";
-            color: 160 160 160 128;
+            color_class: "/fg/disabled/gadgets/connman/eth/cable";
          }
          description { state: "connected" 0.0;
             inherit: "default" 0.0;
-            color: 160 160 160 255;
+            color_class: "/fg/normal/gadgets/connman/eth/cable";
          }
          description { state: "online" 0.0;
             inherit: "default" 0.0;
-            color: 51 153 255 255;
+            color_class: "/fg/selected/gadgets/connman/eth/cable";
          }
       }
       part { name: "eth"; mouse_events: 0;
@@ -58,15 +58,15 @@ group { name: "e/modules/connman/main";
          description { state: "default" 0.0;
             rel.to: "eth-base";
             image.normal: "eth-top.png";
-            color: 160 160 160 128;
+            color_class: "/fg/disabled/gadgets/connman/eth/connector";
          }
          description { state: "connected" 0.0;
             inherit: "default" 0.0;
-            color: 160 160 160 255;
+            color_class: "/fg/normal/gadgets/connman/eth/connector";
          }
          description { state: "online" 0.0;
             inherit: "default" 0.0;
-            color: 160 160 160 255;
+            color_class: "/fg/normal/gadgets/connman/eth/connector";
          }
       }
 ///////////////////////
@@ -74,15 +74,15 @@ group { name: "e/modules/connman/main";
          clip_to: "clip_wifi";
          description { state: "default" 0.0;
             image.normal: "wifi-1.png";
-            color: 160 160 160 255;
+            color_class: "/fg/disabled/gadgets/connman/wifi/connected";
          }
          description { state: "connected" 0.0;
             inherit: "default" 0.0;
-            color: 160 160 160 255;
+            color_class: "/fg/normal/gadgets/connman/wifi/connected";
          }
          description { state: "online" 0.0;
             inherit: "default" 0.0;
-            color: 51 153 255 255;
+            color_class: "/fg/selected/gadgets/connman/wifi/connected";
          }
       }
       part { name: "wifi"; mouse_events: 0;
@@ -90,27 +90,28 @@ group { name: "e/modules/connman/main";
          description { state: "default" 0.0;
             rel.to: "wifi-base";
             image.normal: "wifi-1.png";
-            color: 0 0 0 0;
+            color_class: "/fg/normal/gadgets/connman/wifi/signal";
+            color: 0 0 0 0; // no cc
          }
          description { state: "default" 0.25;
             inherit: "default" 0.0;
             image.normal: "wifi-2.png";
-            color: 160 160 160 255;
+            color: 255 255 255 255; // no cc
          }
          description { state: "default" 0.5;
             inherit: "default" 0.0;
             image.normal: "wifi-3.png";
-            color: 160 160 160 255;
+            color: 255 255 255 255; // no cc
          }
          description { state: "default" 0.75;
             inherit: "default" 0.0;
             image.normal: "wifi-4.png";
-            color: 160 160 160 255;
+            color: 255 255 255 255; // no cc
          }
          description { state: "default" 1.0;
             inherit: "default" 0.0;
             image.normal: "wifi-5.png";
-            color: 160 160 160 255;
+            color: 255 255 255 255; // no cc
          }
       }
 ///////////////////////
@@ -118,7 +119,7 @@ group { name: "e/modules/connman/main";
          clip_to: "clip_bt";
          description { state: "default" 0.0;
             image.normal: "bt-base.png";
-            color: 160 160 160 255;
+            color_class: "/fg/normal/gadgets/connman/bt/base";
          }
       }
       part { name: "bt_1"; mouse_events: 0;
@@ -126,12 +127,12 @@ group { name: "e/modules/connman/main";
          description { state: "default" 0.0;
             rel.to: "bt_base";
             image.normal: "bt-1.png";
-            color: 160 160 160 255;
+            color_class: "/fg/normal/gadgets/connman/bt/signal";
             visible: 0;
          }
          description { state: "partly" 0.0;
             inherit: "default" 0.0;
-            color: 160 160 160 128;
+            color: 255 255 255 128; // no cc
             visible: 1;
          }
          description { state: "visible" 0.0;
@@ -144,12 +145,12 @@ group { name: "e/modules/connman/main";
          description { state: "default" 0.0;
             rel.to: "bt_base";
             image.normal: "bt-2.png";
-            color: 160 160 160 255;
+            color_class: "/fg/normal/gadgets/connman/bt/signal";
             visible: 0;
          }
          description { state: "partly" 0.0;
             inherit: "default" 0.0;
-            color: 160 160 160 128;
+            color: 255 255 255 128; // no cc
             visible: 1;
          }
          description { state: "visible" 0.0;
@@ -162,7 +163,7 @@ group { name: "e/modules/connman/main";
          clip_to: "clip_cell";
          description { state: "default" 0.0;
             image.normal: "cell-base.png";
-            color: 160 160 160 255;
+            color_class: "/fg/normal/gadgets/connman/cell/base";
          }
       }
       part { name: "cell_1"; mouse_events: 0;
@@ -170,12 +171,12 @@ group { name: "e/modules/connman/main";
          description { state: "default" 0.0;
             rel.to: "cell_base";
             image.normal: "cell-1.png";
-            color: 160 160 160 255;
+            color_class: "/fg/normal/gadgets/connman/cell/signal";
             visible: 0;
          }
          description { state: "partly" 0.0;
             inherit: "default" 0.0;
-            color: 160 160 160 128;
+            color: 255 255 255 128; // no cc
             visible: 1;
          }
          description { state: "visible" 0.0;
@@ -188,12 +189,12 @@ group { name: "e/modules/connman/main";
          description { state: "default" 0.0;
             rel.to: "cell_base";
             image.normal: "cell-2.png";
-            color: 160 160 160 255;
+            color_class: "/fg/normal/gadgets/connman/cell/signal";
             visible: 0;
          }
          description { state: "partly" 0.0;
             inherit: "default" 0.0;
-            color: 160 160 160 128;
+            color: 255 255 255 128; // no cc
             visible: 1;
          }
          description { state: "visible" 0.0;
@@ -206,12 +207,12 @@ group { name: "e/modules/connman/main";
          description { state: "default" 0.0;
             rel.to: "cell_base";
             image.normal: "cell-3.png";
-            color: 160 160 160 255;
+            color_class: "/fg/normal/gadgets/connman/cell/signal";
             visible: 0;
          }
          description { state: "partly" 0.0;
             inherit: "default" 0.0;
-            color: 160 160 160 128;
+            color: 255 255 255 128; // no cc
             visible: 1;
          }
          description { state: "visible" 0.0;
@@ -224,12 +225,12 @@ group { name: "e/modules/connman/main";
          description { state: "default" 0.0;
             rel.to: "cell_base";
             image.normal: "cell-4.png";
-            color: 160 160 160 255;
+            color_class: "/fg/normal/gadgets/connman/cell/signal";
             visible: 0;
          }
          description { state: "partly" 0.0;
             inherit: "default" 0.0;
-            color: 160 160 160 128;
+            color: 255 255 255 128; // no cc
             visible: 1;
          }
          description { state: "visible" 0.0;
@@ -325,7 +326,7 @@ group { name: "e/modules/connman/main";
       }
       part { name: "event"; type: RECT;
          description { state: "default" 0.0;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
       }
    }
@@ -578,25 +579,25 @@ group { name: "e/modules/connman/end";
          description { state: "default" 0.0;
             image.normal: "i-unlock";
             aspect: 1.0 1.0; aspect_preference: BOTH;
-            color: 160 160 160 255;
+            color_class: "/fg/normal/gadgets/connman/security/none";
             visible: 0;
          }
          description { state: "none" 0.0;
             inherit: "default" 0.0;
             image.normal: "i-unlock";
-            color: 160 160 160 255;
+            color_class: "/fg/normal/gadgets/connman/security/none";
             visible: 1;
          }
          description { state: "wep" 0.0;
             inherit: "default" 0.0;
             image.normal: "i-lock";
-            color: 160 160 160 255;
+            color_class: "/fg/normal/gadgets/connman/security/secure/low";
             visible: 1;
          }
          description { state: "psk" 0.0;
             inherit: "default" 0.0;
             image.normal: "i-lock-double";
-            color: 160 160 160 255;
+            color_class: "/fg/normal/gadgets/connman/security/secure/hi";
             visible: 1;
          }
       }

data/elementary/themes/edc/cpufreq.edc

@@ -1,9 +1,30 @@
 group { name: "e/modules/cpufreq/main";
-   images.image: "cpu_base.png" COMP;
-   images.image: "cpu_clip1.png" COMP;
-   images.image: "cpu_clip2.png" COMP;
-   images.image: "cpu_clip3.png" COMP;
-   set { name: "marker";
+   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; }
+   }
+   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; }
+   }
+   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; }
@@ -152,42 +173,53 @@ 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;
+            color: 255 255 255 128; // no cc
          }
       }
       part { name: "clip1";
          clip_to: "fade_clip";
          description { state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
-            image.normal: "cpu_clip1.png";
+            rel.to: "base";
+            image.normal: "cpu_clip_1";
          }
       }
       part { name: "clip2";
          clip_to: "fade_clip";
          description { state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
-            image.normal: "cpu_clip2.png";
+            rel.to: "base";
+            image.normal: "cpu_clip_2";
          }
       }
       part { name: "clip3";
          clip_to: "fade_clip";
          description { state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
-            image.normal: "cpu_clip3.png";
+            rel.to: "base";
+            image.normal: "cpu_clip_3";
          }
       }
       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: "cpu_base.png";
+            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";
          }
       }
       part { name: "readout"; type: TEXT; mouse_events: 0;
@@ -196,7 +228,7 @@ group { name: "e/modules/cpufreq/main";
          description { state: "default" 0.0;
             rel1.relative: (56/144) (56/144);
             rel2.relative: (88/144) (88/144);
-            color: 255 255 255 255;
+            color_class: "/fg/normal/gadgets/cpufreq/text";
             text { font: FN; size: 6;
                min: 1 1;
                ellipsis: -1;
@@ -207,10 +239,9 @@ group { name: "e/modules/cpufreq/main";
       part { name: "meter_min"; mouse_events: 0;
          clip_to: "clip3";
          description { state: "default" 0.0;
-            image.normal: "marker";
-            color: 51 153 255 255;
-            rel1.to: "base";
-            rel2.to: "base";
+            image.normal: "cpu_marker";
+            color_class: "/fg/normal/gadgets/cpufreq/hands/min";
+            rel.to: "base";
             map {
                on: 1;
                rotation.center: "base";
@@ -220,10 +251,9 @@ group { name: "e/modules/cpufreq/main";
       part { name: "meter_max"; mouse_events: 0;
          clip_to: "clip1";
          description { state: "default" 0.0;
-            image.normal: "marker";
-            color: 255 0 0 255;
-            rel1.to: "base";
-            rel2.to: "base";
+            image.normal: "cpu_marker";
+            color_class: "/fg/normal/gadgets/cpufreq/hands/max";
+            rel.to: "base";
             map {
                on: 1;
                rotation.center: "base";
@@ -233,10 +263,9 @@ group { name: "e/modules/cpufreq/main";
       part { name: "meter"; mouse_events: 0;
          clip_to: "clip2";
          description { state: "default" 0.0000;
-            color: 255 153 51 255;
-            image.normal: "marker";
-            rel1.to: "base";
-            rel2.to: "base";
+            image.normal: "cpu_marker";
+            color_class: "/fg/normal/gadgets/cpufreq/hands/average";
+            rel.to: "base";
             map {
                on: 1;
                rotation.center: "base";
@@ -245,13 +274,11 @@ group { name: "e/modules/cpufreq/main";
       }
    }
    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";
       }

data/elementary/themes/edc/cslider.edc

@@ -5,18 +5,17 @@ group { name: "e/widgets/cslider";
          description { state: "default" 0.0;
             rel1.offset: 2 2;
             rel2.offset: -3 -3;
-            color: DARK_GREY_BG_COLOR;
+            color_class: "/bg-dark/normal/cslider/base";
             offscale;
          }
       }
       part { name: "clipper"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to: "e.swallow.content";
-            rel2.to: "e.swallow.content";
+            rel.to: "e.swallow.content";
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 64;
+            color: 255 255 255 64; // no cc
          }
       }
       part { name: "e.swallow.content"; type: SWALLOW;
@@ -37,9 +36,8 @@ group { name: "e/widgets/cslider";
             min: 1 1;
             max: 1 1;
             visible: 0;
-            rel1.to: "e.swallow.content";
+            rel.to: "e.swallow.content";
             rel1.relative: 0.5 0.0;
-            rel2.to: "e.swallow.content";
             rel2.relative: 0.5 0.5;
          }
       }
@@ -50,7 +48,7 @@ group { name: "e/widgets/cslider";
             rel1.to_y: "e.swallow.content";
             rel2.to_x: "e.dragable.cursor";
             rel2.to_y: "e.swallow.content";
-            color: 255 255 255 192;
+            color: 255 255 255 192; // no cc
          }
          description { state: "vertical" 0.0;
             inherit: "default" 0.0;

data/elementary/themes/edc/desklock.edc

@@ -3,18 +3,18 @@ group { name: "e/desklock/background";
    parts {
       part { name: "clip"; type: RECT;
          description { state: "default" 0.0;
-            color: 255 255 255 0;
+            color: 255 255 255 0; // no cc
             visible: 0;
          }
          description { state: "visible" 0.0;
-            color: 255 255 255 255;
+            color: 255 255 255 255; // no cc
             visible: 1;
          }
       }
       part { name: "bg"; type: RECT;
          clip_to: "clip";
          description { state: "default" 0.0;
-            color: 48 48 48 255;
+            color_class: "/bg/normal/desklock/background";
          }
       }
       program { signal: "show"; source: "";
@@ -78,6 +78,7 @@ group { name: "e/desklock/login_box";
             rel1.relative: 0.5 0.5;
             rel2.relative: 0.5 0.5;
             FIXED_SIZE(150, 150)
+            color_class: "/fg/normal/desklock/logo";
          }
       }
       part { name: "e.text.title"; type: TEXT;
@@ -89,7 +90,7 @@ group { name: "e/desklock/login_box";
             rel2.relative: 1.0 1.0;
             rel2.offset: -4 3;
             rel2.to_y: "logo";
-            color: FN_COL_DEFAULT;
+            color_class: "/fg/normal/desklock/text/title";
             align: 0.5 0.0;
             text { font: FNBD; size: 10;
                min: 1 1;
@@ -109,7 +110,7 @@ group { name: "e/desklock/login_box";
             rel2.relative: 1.0 1.0;
             rel2.offset: -4 3;
             rel2.to_y: "e.text.password";
-            color: 160 160 160 255;
+            color_class: "/fg/normal/desklock/text/hint";
             align: 0.5 0.0;
             text { font: FNBD; size: 10;
                min: 1 1;
@@ -122,9 +123,8 @@ group { name: "e/desklock/login_box";
       }
       part { name: "selection"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            rel1.to: "e.text.password";
-            rel2.to: "e.text.password";
-            color: 51 153 255 255;
+            rel.to: "e.text.password";
+            color_class: "/fg/normal/desklock/selection";
             visible: 0;
          }
          description { state: "active" 0.0;
@@ -144,7 +144,7 @@ group { name: "e/desklock/login_box";
             rel2.offset: 3 10;
             rel2.to_x: "clipper";
             rel2.to_y: "e.text.title";
-            color: 255 255 255 255;
+            color_class: "/fg/normal/desklock/text/password";
             align: 0.0 0.0;
             text { font: FN; size: 10;
                min: 1 1;
@@ -156,30 +156,63 @@ group { name: "e/desklock/login_box";
          }
       }
       part { name: "cursor"; type: RECT; mouse_events: 0;
+         scale: 1;
          clip_to: "clipper";
          description { state: "default" 0.0;
-            rel1.to: "e.text.password";
+            rel.to: "e.text.password";
             rel1.relative: 1.0 0.0;
             rel1.offset: 0 -4;
-            rel2.to: "e.text.password";
             rel2.offset: -1 3;
-            color: 255 255 255 255;
+            color_class: "/fg/normal/desklock/text/cursor";
             min: 1 10;
             fixed: 1 1;
             visible: 0;
+            offscale;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
             visible: 1;
          }
       }
-      part { name: "busy_area"; type: SPACER;
+      part { name: "fprint";
+         scale: 1;
          description { state: "default" 0.0;
-            min: 20 20;
-            max: 160 160;
-            rel1.to: "clipper";
+            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;
+         }
+         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;
+         }
+      }
+      part { name: "busy_area"; type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: 40 40;
+            max: 40 40;
+            rel.to: "clipper";
             rel1.relative: 0.0 0.5;
-            rel2.to: "clipper";
             align: 0.5 0.0;
          }
       }
@@ -224,6 +257,75 @@ 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;
+      }
    }
 }
 
@@ -236,9 +338,9 @@ group { name: "e/desklock/pin_box";
             rel1.relative: 0.0 1.0;
             rel1.to_y: "e.swallow.buttons";
             rel2.offset: -4 -3;
-            color: 160 160 160 255;
+            color_class: "/fg/normal/desklock/text/title/pin";
             align: 0.5 0.0;
-            text { font: "Sans:style=Bold"; size: 10;
+            text { font: FNBD; size: 10;
                min: 0 1;
                align: 0.5 0.5;
                text_class: "desklock_title";
@@ -249,9 +351,8 @@ group { name: "e/desklock/pin_box";
       }
       part { name: "selection"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            rel1.to: "e.text.password";
-            rel2.to: "e.text.password";
-            color: 51 153 255 255;
+            rel.to: "e.text.password";
+            color_class: "/fg/normal/desklock/selection";
             visible: 0;
          }
          description { state: "active" 0.0;
@@ -266,35 +367,34 @@ group { name: "e/desklock/pin_box";
             rel1.offset: 3 2;
             rel2.relative: 0.5 0.0;
             rel2.offset: 3 -2;
-            color: 255 255 255 255;
-            text { font: "Sans"; size: 10;
+            color_class: "/fg/normal/desklock/text/password";
+            text { font: FN; 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;
          description { state: "default" 0.0;
-            rel1.to: "e.text.password";
+            rel.to: "e.text.password";
             rel1.relative: 1.0 0.0;
-            rel1.offset: 0 0;
-            rel2.to: "e.text.password";
-            rel2.offset: 1 -1;
-            color: 255 255 255 0;
+            rel1.offset: 0 -4;
+            rel2.offset: -1 3;
+            color_class: "/fg/normal/desklock/text/cursor";
             min: 1 3;
             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;

data/elementary/themes/edc/deskmirror.edc

@@ -59,7 +59,7 @@ group { name: "e/deskmirror/frame/default";
             rel2.to: "bottom";
             rel2.offset: 4 4;
             fill.smooth: 0;
-            color: 255 255 255 128;
+            color_class: "/shadow/normal/border";
          }
          description { state: "off";
             inherit: "default" 0.0;
@@ -87,27 +87,25 @@ group { name: "e/deskmirror/frame/default";
 
       part { name: "top"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to: "top_spacer";
-            rel2.to: "top_spacer";
-            color: 64 64 64 255;
+            rel.to: "top_spacer";
+            color_class: "/bg/normal/titlebar";
             min: 0 1;
          }
          description { state: "focused" 0.0;
             inherit: "default" 0.0;
-            color: 32 32 32 255;
+            color_class: "/bg/selected/titlebar";
          }
       }
 
       part { name: "e.text.title"; type: TEXT; mouse_events: 0;
          scale: 1;
          description { state: "default" 0.0;
+            rel.to: "spacer";
             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: 160 160 160 255;
+            color_class: "/fg/normal/titlebar";
             text { font: FNBD; size: 10;
                text_class: "title_bar";
                align: 0.5 0.0;
@@ -118,15 +116,14 @@ group { name: "e/deskmirror/frame/default";
          }
          description { state: "focused" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255;
+            color_class: "/fg/selected/titlebar";
          }
       }
 
       part { name: "bottom"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            rel1.to: "bottom_size";
-            rel2.to: "bottom_size";
-            color: 64 64 64 255;
+            rel.to: "bottom_size";
+            color_class: "/bg/normal/border";
          }
          description { state: "hidden" 0.0;
             inherit: "default" 0.0;
@@ -138,16 +135,15 @@ group { name: "e/deskmirror/frame/default";
       part { name: "clone"; type: PROXY; mouse_events: 0;
          description { state: "default";
             source: "e.swallow.client";
-            rel1.to: "e.swallow.client";
-            rel2.to: "e.swallow.client";
+            rel.to: "e.swallow.client";
             visible: 0;
-            color: 255 255 255 0;
+            color: 255 255 255 0; // no cc
             proxy.source_clip: 0;
          }
          description { state: "urgent1";
             inherit: "default" 0.0;
             visible: 1;
-            color: 255 255 255 255;
+            color: 255 255 255 255; // no cc
             proxy.source_clip: 0;
          }
          description { state: "urgent2" 0.0;
@@ -155,14 +151,13 @@ 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;
+            color: 255 255 255 0; // no cc
             proxy.source_clip: 0;
          }
       }
    }
    programs {
-      program { name: "urgent";
-         signal: "e,state,urgent"; source: "e";
+      program { signal: "e,state,urgent"; source: "e";
          action: ACTION_STOP;
          target: "go_big";
          target: "go_big2";
@@ -179,8 +174,7 @@ group { name: "e/deskmirror/frame/default";
          target: "clone";
          after: "go_big";
       }
-      program { name: "not_urgent";
-         signal: "e,state,not_urgent"; source: "e";
+      program { signal: "e,state,not_urgent"; source: "e";
          action: ACTION_STOP;
          target: "go_big";
          target: "go_big2";
@@ -191,51 +185,39 @@ group { name: "e/deskmirror/frame/default";
          transition: LINEAR 0.5 USE_DURATION_FACTOR 1;
          target: "clone";
       }
-      program { name: "shon";
-         signal: "e,state,shadow,on"; source: "e";
+      program { signal: "e,state,shadow,on"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "shadow";
       }
-      program { name: "shoff";
-         signal: "e,state,shadow,off"; source: "e";
+      program { signal: "e,state,shadow,off"; source: "e";
          action: STATE_SET "off" 0.0;
          target: "shadow";
       }
-      program {
-         name: "focus";
-         signal: "e,state,focused"; source: "e";
+      program { signal: "e,state,focused"; source: "e";
          action: STATE_SET "focused" 0.0;
          target: "e.text.title";
          target: "top";
       }
-      program {
-         name: "unfocus";
-         signal: "e,state,unfocused"; source: "e";
+      program { signal: "e,state,unfocused"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "e.text.title";
          target: "top";
       }
-      program {
-         name: "shade";
-         signal: "e,state,shaded"; source: "e";
+      program { signal: "e,state,shaded"; source: "e";
          action: STATE_SET "hidden" 0.0;
          target: "bottom";
       }
-      program {
-         signal: "e,state,maximize*"; source: "e";
+      program { signal: "e,state,maximize*"; source: "e";
          action: STATE_SET "hidden" 0.0;
          target: "bottom";
       }
-      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";
@@ -250,14 +232,12 @@ group { name: "e/deskmirror/frame/default";
          transition: DECELERATE 0.2 CURRENT USE_DURATION_FACTOR 1;
          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";
@@ -275,7 +255,7 @@ group { name: "e/deskmirror/frame/noresize";
       }
       part { name: "bottom"; type: RECT;
          description { state: "default" 0.0;
-            color: 64 64 64 255;
+            color_class: "/bg/normal/border";
             rel1.relative: 0.0 1.0;
             rel1.offset: 0 -1;
             rel2.relative: 1.0 1.0;
@@ -298,7 +278,7 @@ group { name: "e/deskmirror/frame/noresize_dialog";
       }
       part { name: "bottom"; type: RECT;
          description { state: "default" 0.0;
-            color: 64 64 64 255;
+            color_class: "/bg/normal/border";
             rel1.relative: 0.0 1.0;
             rel1.offset: 0 -1;
             rel2.relative: 1.0 1.0;
@@ -315,17 +295,16 @@ group { name: "e/deskmirror/frame/pixel";
    parts {
       part { name: "client_clip"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to: "e.swallow.client";
-            rel2.to: "e.swallow.client";
+            rel.to: "e.swallow.client";
          }
       }
       part { name: "frame"; type: RECT;
          description { state: "default" 0.0;
-            color: 0 0 0 255;
+            color_class: "/bg/normal/border/outline";
          }
          description { state: "focused" 0.0;
             inherit: "default" 0.0;
-            color: 51 153 255 255;
+            color_class: "/bg/selected/border/outline";
          }
       }
       part { name: "e.swallow.client"; type: SWALLOW;
@@ -337,15 +316,11 @@ group { name: "e/deskmirror/frame/pixel";
       }
    }
    programs {
-      program {
-         name: "focus";
-         signal: "e,state,focused"; source: "e";
+      program { signal: "e,state,focused"; source: "e";
          action: STATE_SET "focused" 0.0;
          target: "frame";
       }
-      program {
-         name: "unfocus";
-         signal: "e,state,unfocused"; source: "e";
+      program { signal: "e,state,unfocused"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "frame";
       }
@@ -356,19 +331,20 @@ group { name: "e/deskmirror/frame/tiling";
    parts {
       part { name: "client_clip"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to: "e.swallow.client";
-            rel2.to: "e.swallow.client";
+            rel.to: "e.swallow.client";
          }
       }
       part { name: "frame"; type: RECT;
          description { state: "default" 0.0;
-            color: 0 0 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: 51 153 255 255;
+            color: 255 255 255 255; // no cc
          }
       }
       part { name: "e.swallow.client"; type: SWALLOW;
@@ -378,15 +354,11 @@ group { name: "e/deskmirror/frame/tiling";
       }
    }
    programs {
-      program {
-         name: "focus";
-         signal: "e,state,focused"; source: "e";
+      program { signal: "e,state,focused"; source: "e";
          action: STATE_SET "focused" 0.0;
          target: "frame";
       }
-      program {
-         name: "unfocus";
-         signal: "e,state,unfocused"; source: "e";
+      program { signal: "e,state,unfocused"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "frame";
       }
@@ -411,17 +383,17 @@ group { "e/deskmirror/frame/borderless";
          desc {
             source: "e.swallow.client";
             hid;
-            color: 255 255 255 0;
+            color: 255 255 255 0; // no cc
          }
          desc { "urgent1"; inherit: "default";
             vis;
-            color: 255 255 255 255;
+            color: 255 255 255 255; // no cc
          }
          desc { "urgent2"; inherit: "default";
             vis;
             rel1.relative: -2.0  -2.0;
             rel2.relative: 3.0  3.0;
-            color: 255 255 255 0;
+            color: 255 255 255 0; // no cc
          }
       }
       program { name: "iconify";
@@ -434,20 +406,17 @@ group { "e/deskmirror/frame/borderless";
          transition: DECELERATE 0.2 CURRENT USE_DURATION_FACTOR 1;
          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 { name: "urgent";
-         signal: "e,state,urgent"; source: "e";
+      program { signal: "e,state,urgent"; source: "e";
          action: ACTION_STOP;
          target: "go_big";
          target: "go_big2";
@@ -464,8 +433,7 @@ group { "e/deskmirror/frame/borderless";
          target: "clone";
          after: "go_big";
       }
-      program { name: "not_urgent";
-         signal: "e,state,not_urgent"; source: "e";
+      program { signal: "e,state,not_urgent"; source: "e";
          action: ACTION_STOP;
          target: "go_big";
          target: "go_big2";

data/elementary/themes/edc/deskpreview.edc

@@ -4,7 +4,7 @@ group { name: "e/widgets/deskpreview/desk";
       part { name: "e.event.menu"; type: RECT;
          insert_after: "e.swallow.content";
          description { state: "default" 0.0;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
       }
    }

data/elementary/themes/edc/dialog.edc

@@ -2,10 +2,11 @@ group { name: "e/widgets/dialog/main";
    parts {
       part { name: "base"; type: RECT;
          description { state: "default" 0.0;
-            color: 64 64 64 255;
+            color_class: "/bg/normal/background";
          }
       }
       part { name: "separator"; type: RECT; mouse_events: 0;
+         scale:  1;
          description { state: "default" 0.0;
             min: 16 1;
             max: 99999 1;
@@ -15,7 +16,7 @@ group { name: "e/widgets/dialog/main";
             rel2.relative: 1.0 0.0;
             rel2.offset: -1 -1;
             rel2.to_y: "e.swallow.buttons";
-            color: 72 72 72 255;
+            color_class: "/fg/normal/separator/horizontal";
             fixed: 0 1;
             link.base: "e,state,buttons,on" "e";
             visible: 1;
@@ -88,14 +89,12 @@ group { name: "e/widgets/dialog/main";
       }
    }
    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";
@@ -106,7 +105,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=#a0a0a0 wrap=word";
+         base: "font="FN" font_size=10 text_class=tb_plain align=center color=cc:/fg/normal/text wrap=word";
          tag: "br" "\n";
          tag: "hilight" "+ font="FNBD" text_class=tb_light";
       }

data/elementary/themes/edc/edgebindings.edc

@@ -5,7 +5,7 @@ group { name: "e/modules/conf_edgebindings/selection";
    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=#a0a0a0 wrap=word";
+         base: "font="FN" font_size=10 text_class=tb_plain align=center color=cc:/fg/normal/text wrap=word";
          tag: "br" "\n";
          tag: "hilight" "+ font="FNBD" text_class=tb_light";
       }
@@ -14,7 +14,7 @@ group { name: "e/modules/conf_edgebindings/selection";
       part { name: "bg"; type: RECT;
          description { state: "default" 0.0;
             rel.to: "e.swallow.background";
-            color: DARK_GREY_BG_COLOR;
+            color_class: "/bg-dark/normal/edgebindings";
          }
       }
       part { name: "e.swallow.background"; type: SWALLOW;
@@ -33,94 +33,112 @@ group { name: "e/modules/conf_edgebindings/selection";
             rel.to: "e.swallow.background";
             rel1.relative: 0.5 0.5;
             rel2.relative: 0.5 0.5;
-            color: 255 255 255 255;
             fixed: 1 1;
             text { font: FNBD; 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;
          description { state: "default" 0.0;
             rel.to: "e.swallow.background";
             rel1.offset: 0 10;
             rel2.offset: -1 -11;
             align: 0.0 0.5;
             max: 5 99999;
-            color: 51 153 255 255;
+            color_class: "/fg/selected/edgebindings/edge";
+            offscale;
          }
       }
       part { name: "e.edge.right"; type: RECT;
+         scale: 1;
          description { state: "default" 0.0;
             rel.to: "e.swallow.background";
             rel1.offset: 0 10;
             rel2.offset: -1 -11;
             align: 1.0 0.5;
             max: 5 99999;
-            color: 51 153 255 255;
+            color_class: "/fg/selected/edgebindings/edge";
+            offscale;
          }
       }
       part { name: "e.edge.top"; type: RECT;
+         scale: 1;
          description { state: "default" 0.0;
             rel.to: "e.swallow.background";
             rel1.offset: 10 0;
             rel2.offset: -11 -1;
             align: 0.5 0.0;
             max: 99999 5;
-            color: 51 153 255 255;
+            color_class: "/fg/selected/edgebindings/edge";
+            offscale;
          }
       }
       part { name: "e.edge.bottom"; type: RECT;
+         scale: 1;
          description { state: "default" 0.0;
             rel.to: "e.swallow.background";
             rel1.offset: 10 0;
             rel2.offset: -11 -1;
             align: 0.5 1.0;
             max: 99999 5;
-            color: 51 153 255 255;
+            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";
             max: 10 10;
             image.normal: "mini_blue_glow_arrow_2.png";
             align: 0.0 0.0;
-            color: 51 153 255 255;
+            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";
             max: 10 10;
             image.normal: "mini_blue_glow_arrow_3.png";
             align: 1.0 0.0;
-            color: 51 153 255 255;
+            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";
             max: 10 10;
             image.normal: "mini_blue_glow_arrow_0.png";
             align: 1.0 1.0;
-            color: 51 153 255 255;
+            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";
             max: 10 10;
             image.normal: "mini_blue_glow_arrow_1.png";
             align: 0.0 1.0;
-            color: 51 153 255 255;
+            color_class: "/fg/selected/edgebindings/edge";
+            offscale;
          }
       }
 
       part { name: "e.box"; type: BOX;
+         scale: 1;
          description { state: "default" 0.0;
             rel1 {
                relative: 1 1;
@@ -137,9 +155,11 @@ 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 {
@@ -148,9 +168,8 @@ group { name: "e/modules/conf_edgebindings/selection";
                to_x: "e.edge.bottom_right";
                to_y: "e.box";
             }
-            rel2 {
-               offset: -5 -1;
-            }
+            rel2.offset: -5 -1;
+            offscale;
          }
       }
       part { name: "e.text.description"; type: TEXTBLOCK; mouse_events: 0;
@@ -161,14 +180,13 @@ 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

@@ -20,7 +20,7 @@ group { "efl/bg";
       }
       part { name: "base"; type: RECT;
          description { state: "default" 0.0;
-            color: 64 64 64 255;
+            color_class: "/bg/normal/background";
          }
       }
       part { name: "efl.rectangle"; type: SWALLOW; required;

data/elementary/themes/edc/efl/border.edc

@@ -76,10 +76,15 @@ group { "efl/border"; data.item: "version" "123";
       part { name: "shadow_clip"; type: RECT; mouse_events: 0;
          description { state: "default";
             rel.to: "_sh1";
+            color_class: "/shadow/normal/border";
          }
          description { state: "hidden";
             visible: 0;
          }
+         description { state: "focused";
+            inherit: "default";
+            color_class: "/shadow/selected/border";
+         }
       }
       part { name: "shadow_base"; type: SPACER;
          scale: 1;
@@ -104,7 +109,7 @@ group { "efl/border"; data.item: "version" "123";
          required; // @since 1.19
          clip: "bg_clip";
          desc { "default";
-            color: 64 64 64 255;
+            color_class: "/bg/normal/background";
             rel.to: "efl.spacer.content";
             visible: 0;
          }
@@ -136,7 +141,7 @@ group { "efl/border"; data.item: "version" "123";
       /* main menu */
       rect { "menu_bg";
          desc { "default";
-            color: 64 64 64 255;
+            color_class: "/bg/normal/menu/bar";
             align: 0.5 0.0;
             rel.to: "efl.menu";
             fixed: 1 1;
@@ -197,12 +202,13 @@ group { "efl/border"; data.item: "version" "123";
             rel1.relative: 0.0 1.0;
             rel2.to: "bottom_clip";
             rel2.relative: 1.0 0.0;
-            color: 0 0 0 0;
+            color_class: "/dim/normal/win/modal";
+            color: 255 255 255 0; // no cc
             hid;
          }
          desc { "visible";
             inherit: "default";
-            color: 32 32 32 255;
+            color: 255 255 255 255; // no cc
             vis;
          }
       }
@@ -237,11 +243,11 @@ group { "efl/border"; data.item: "version" "123";
          clip: "top_clip";
          description { state: "default" 0.0;
             rel.to: "top_clip";
-            color: 64 64 64 255;
+            color_class: "/bg/normal/titlebar";
          }
          description { state: "focused" 0.0;
             inherit: "default" 0.0;
-            color: 32 32 32 255;
+            color_class: "/bg/selected/titlebar";
          }
       }
       part { name: "efl.text.title"; type: TEXT; mouse_events: 0;
@@ -257,7 +263,7 @@ group { "efl/border"; data.item: "version" "123";
             rel2.to_x: "event.minimize";
             rel2.to_y: "shadow_base";
             align: 0.5 0.0;
-            color: 160 160 160 255;
+            color_class: "/fg/noemal/titlebar";
             min: 0 16;
             text { font: FNBD; size: 10;
                text_class: "title_bar";
@@ -269,7 +275,7 @@ group { "efl/border"; data.item: "version" "123";
          }
          description { state: "focused" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255;
+            color_class: "/fg/selected/titlebar";
          }
       }
       spacer {  "icon";
@@ -324,11 +330,11 @@ group { "efl/border"; data.item: "version" "123";
             rel.to: "event.close";
             min: 15 15; max: 15 15;
             fixed: 1 1;
-            color: 160 160 160 255;
+            color_class: "/fg/noemal/titlebar/close";
          }
          desc { "selected";
             inherit: "default";
-            color: 255 255 255 255;
+            color_class: "/fg/pressed/titlebar/close";
          }
       }
       image { "max1"; nomouse;
@@ -339,11 +345,11 @@ group { "efl/border"; data.item: "version" "123";
             rel.to: "event.maximize";
             min: 15 15; max: 15 15;
             fixed: 1 1;
-            color: 160 160 160 255;
+            color_class: "/fg/noemal/titlebar/maximize";
          }
          desc { "selected";
             inherit: "default";
-            color: 255 255 255 255;
+            color_class: "/fg/pressed/titlebar/maximize";
          }
       }
       image { "min1"; nomouse;
@@ -354,11 +360,11 @@ group { "efl/border"; data.item: "version" "123";
             rel.to: "event.minimize";
             min: 15 15; max: 15 15;
             fixed: 1 1;
-            color: 160 160 160 255;
+            color_class: "/fg/normal/titlebar/minimize";
          }
          desc { "selected";
             inherit: "default";
-            color: 255 255 255 255;
+            color_class: "/fg/pressed/titlebar/minimize";
          }
       }
       image { "close2";  nomouse;
@@ -369,11 +375,11 @@ group { "efl/border"; data.item: "version" "123";
             rel.to: "event.close";
             min: 15 15; max: 15 15;
             fixed: 1 1;
-            color: 255 255 255 255;
+            color_class: "/fg/selected/titlebar/close";
          }
          desc { "selected";
             inherit: "default";
-            color: 220 220 220 255;
+            color_class: "/fg/selected-pressed/titlebar/close";
          }
       }
       image { "max2"; nomouse;
@@ -384,11 +390,11 @@ group { "efl/border"; data.item: "version" "123";
             rel.to: "event.maximize";
             min: 15 15; max: 15 15;
             fixed: 1 1;
-            color: 255 255 255 255;
+            color_class: "/fg/selected/titlebar/maximize";
          }
          desc { "selected";
             inherit: "default";
-            color: 220 220 220 255;
+            color_class: "/fg/selected-pressed/titlebar/maximize";
          }
       }
       image { "min2"; nomouse;
@@ -399,11 +405,11 @@ group { "efl/border"; data.item: "version" "123";
             rel.to: "event.minimize";
             min: 15 15; max: 15 15;
             fixed: 1 1;
-            color: 255 255 255 255;
+            color_class: "/fg/selected/titlebar/minimize";
          }
          desc { "selected";
             inherit: "default";
-            color: 220 220 220 255;
+            color_class: "/fg/selected-pressed/titlebar/minimize";
          }
       }
       rect {  "event.icon";
@@ -414,7 +420,7 @@ group { "efl/border"; data.item: "version" "123";
             rel2.to: "top_clip";
             align: 0.0 0.5;
             aspect: 1.0 1.0; aspect_preference: VERTICAL;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
       }
       rect {  "event.titlebar";
@@ -426,7 +432,7 @@ group { "efl/border"; data.item: "version" "123";
             rel2.offset: 0 -1;
             rel2.to_x: "event.minimize";
             rel2.to_y: "top_clip";
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
       }
       rect {  "event.close";
@@ -436,7 +442,7 @@ group { "efl/border"; data.item: "version" "123";
             rel2.relative: 1.0 1.0;
             align: 1.0 0.5;
             aspect: 1.0 1.0; aspect_preference: VERTICAL;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
       }
       rect {  "event.maximize";
@@ -450,7 +456,7 @@ group { "efl/border"; data.item: "version" "123";
             rel2.to_y: "top_clip";
             align: 1.0 0.5;
             aspect: 1.0 1.0; aspect_preference: VERTICAL;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
       }
       rect {  "event.minimize";
@@ -464,7 +470,7 @@ group { "efl/border"; data.item: "version" "123";
             rel2.to_x: "event.maximize";
             align: 1.0 0.5;
             aspect: 1.0 1.0; aspect_preference: VERTICAL;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
       }
       rect { "top_resize_clip";
@@ -484,9 +490,9 @@ group { "efl/border"; data.item: "version" "123";
             rel.to: "top_clip";
             rel2.relative: 0.0 0.0;
             rel2.offset: 31 3;
-            min: 40 6;
+            min: RSZMINW RSZMINH;
             align: 1.0 1.0;
-            color: 0 0 0 0;
+            color: RSZCOL; // no cc
             fixed: 1 1;
          }
          desc { "hidden"; inherit: "default"; hid; }
@@ -499,9 +505,9 @@ group { "efl/border"; data.item: "version" "123";
             rel1.relative: 1.0 0.0;
             rel2.to: "efl.event.resize.tr";
             rel2.relative: 0.0 1.0;
-            min: 0 6;
-            align: 0.5 1.0;
-            color: 0 0 0 0;
+            min: 0 RSZMINH;
+            align: 1.0 1.0;
+            color: RSZCOL2; // no cc
             fixed: 1 1;
          }
          desc { "hidden"; inherit: "default"; hid; }
@@ -515,9 +521,9 @@ group { "efl/border"; data.item: "version" "123";
             rel1.offset: -32 0;
             rel2.relative: 1.0 0.0;
             rel2.offset: -1 3;
-            min: 40 6;
+            min: RSZMINW RSZMINH;
             align: 0.0 1.0;
-            color: 0 0 0 0;
+            color: RSZCOL; // no cc
             fixed: 1 1;
          }
          desc { "hidden"; inherit: "default"; hid; }
@@ -551,9 +557,13 @@ group { "efl/border"; data.item: "version" "123";
       part { name: "bottom"; type: RECT; mouse_events: 0;
          clip: "bottom_clip";
          description { state: "default" 0.0;
-            color: 64 64 64 255;
+            color_class: "/bg/normal/border";
             rel.to: "bottom_clip";
          }
+         description { state: "focused" 0.0;
+            inherit: "default";
+            color_class: "/bg/selected/border";
+         }
       }
 
       rect {  "efl.event.resize.bl";
@@ -563,9 +573,9 @@ group { "efl/border"; data.item: "version" "123";
             rel.to: "bottom_clip";
             rel2.relative: 0.0 1.0;
             rel2.offset: 31 -1;
-            min: 40 10;
-            align: 0.0 0.5;
-            color: 0 0 0 0;
+            min: RSZMINW RSZMINH;
+            align: 1.0 0.0;
+            color: RSZCOL; // no cc
             fixed: 1 1;
             offscale;
          }
@@ -579,9 +589,9 @@ group { "efl/border"; data.item: "version" "123";
             rel1.relative: 1.0 0.0;
             rel2.to: "efl.event.resize.br";
             rel2.relative: 0.0 1.0;
-            min: 0 10;
-            align: 0.5 0.5;
-            color: 0 0 0 0;
+            min: 0 RSZMINH;
+            align: 0.5 0.0;
+            color: RSZCOL2; // no cc
             fixed: 1 1;
             offscale;
          }
@@ -594,9 +604,9 @@ group { "efl/border"; data.item: "version" "123";
             rel.to: "bottom_clip";
             rel1.relative: 1.0 0.0;
             rel1.offset: -32 0;
-            min: 40 10;
-            align: 0.0 0.5;
-            color: 0 0 0 0;
+            min: RSZMINW RSZMINH;
+            align: 0.0 0.0;
+            color: RSZCOL; // no cc
             fixed: 1 1;
             offscale;
          }
@@ -605,12 +615,12 @@ group { "efl/border"; data.item: "version" "123";
       rect { "indicator_bg";
          clip: "bg_clip";
          desc { "default";
-            color: 148 23 45 255;
+            color: 148 23 45 255; // no cc never see this...
             rel.to: "efl.indicator";
          }
          desc { "bg_transparent";
             inherit: "default";
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc never see this...
          }
       }
       swallow { "efl.indicator";
@@ -706,16 +716,20 @@ group { "efl/border"; data.item: "version" "123";
       program { signal: "efl,action,focus"; source: "efl";
          action: STATE_SET "focused";
          target: "top";
+         target: "bottom";
          target: "efl.text.title";
          target: "clip1";
          target: "clip2";
+         target: "shadow_clip";
       }
       program { signal: "efl,action,unfocus"; source: "efl";
          action: STATE_SET "default";
          target: "top";
+         target: "bottom";
          target: "efl.text.title";
          target: "clip1";
          target: "clip2";
+         target: "shadow_clip";
       }
       program { signal: "efl,state,urgent"; source: "efl";
          action: STATE_SET "bounce1";

data/elementary/themes/edc/efl/button.edc

@@ -45,34 +45,37 @@ group { name: "efl/button";
          description { state: "default" 0.0;
             rel.to: "base";
             WIN_SHADOW_SMALL;
+            color_class: "/shadow/normal/button";
          }
          description { state: "pressed" 0.0; inherit;
             image.border_scale_by: 0.1;
             rel1.offset: -2 -1;
             rel2.offset: 0 1;
+            color_class: "/shadow/pressed/button";
          }
          description { state: "disabled" 0.0; inherit;
             image.border_scale_by: 0.1;
             rel1.offset: -2 -1;
             rel2.offset: 0 1;
+            color_class: "/shadow/disabled/button";
          }
       }
       rect { "base";
          scale: 1;
          desc { "default";
-            color: 96 96 96 255;
+            color_class: "/bg/normal/button";
             rel1.offset: 2 2;
             rel2.offset: -3 -3;
             offscale;
          }
          desc { "pressed"; inherit;
-            color: 128 128 128 255;
+            color_class: "/bg/pressed/button";
             rel1.offset: 3 3;
             rel2.offset: -4 -4;
             offscale;
          }
          desc { "disabled"; inherit;
-            color: 72 72 72 255;
+            color_class: "/bg/disabled/button";
          }
          desc { "hidden"; inherit;
             visible: 0;
@@ -89,13 +92,13 @@ group { name: "efl/button";
       }
       rect { "icon_clip";
          desc { "default";
-            color: 255 255 255 255;
+            color: 255 255 255 255; // no cc
          }
          desc { "pressed"; inherit;
-            color: 255 255 255 255;
+            color: 255 255 255 255; // no cc
          }
          desc { "disabled"; inherit;
-            color: 255 255 255 64;
+            color: 255 255 255 64; // no cc
          }
       }
       swallow { "efl.content"; nomouse; required;
@@ -128,7 +131,7 @@ group { name: "efl/button";
       text { "efl.text"; nomouse; required;
          scale: 1;
          desc { "default";
-            color: 192 192 192 255;
+            color_class: "/fg/normal/button";
             rel1.offset: 0 6;
             rel1.relative: 1.0 0.0;
             rel1.to_x: "efl.content";
@@ -148,7 +151,7 @@ group { name: "efl/button";
             visible: 1;
          }
          desc { "pressed_visible"; inherit;
-            color: 255 255 255 255;
+            color_class: "/fg/pressed/button";
             rel1.offset: 6 6;
             text.min: 1 1;
             text.ellipsis: -1;
@@ -160,20 +163,20 @@ group { name: "efl/button";
             visible: 1;
          }
          desc { "pressed_textonly"; inherit;
-            color: 255 255 255 255;
+            color_class: "/fg/pressed/button";
             text.min: 1 1;
             text.ellipsis: -1;
             visible: 1;
          }
          desc { "disabled_visible"; inherit;
-            color: 96 96 96 255;
+            color_class: "/fg/disabled/button";
             rel1.offset: 6 6;
             text.min: 1 1;
             text.ellipsis: -1;
             visible: 1;
          }
          desc { "disabled_textonly"; inherit;
-            color: 96 96 96 255;
+            color_class: "/fg/disabled/button";
             text.min: 1 1;
             text.ellipsis: -1;
             visible: 1;
@@ -182,7 +185,7 @@ group { name: "efl/button";
       rect { "event";
          ignore_flags: ON_HOLD;
          desc { "default";
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
          desc { "disabled"; inherit;
             visible: 0;
@@ -321,7 +324,7 @@ group { name: "efl/button:anchor";
    parts {
       rect { "base";
          desc { "default";
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
          desc { "pressed"; inherit;
             inherit: "default";
@@ -338,7 +341,7 @@ group { name: "efl/button:anchor";
          }
          desc { "disabled";
             inherit: "default";
-            color: 255 255 255 64;
+            color: 255 255 255 64; // no cc
          }
       }
       swallow { "efl.background"; nomouse; required;
@@ -389,7 +392,7 @@ group { name: "efl/button:anchor";
             rel1.to_y: "base";
             rel2.offset: -5 -5;
             rel2.to: "base";
-            color: 51 153 255 255;
+            color_class: "/fg/normal/button-anchor";
             text { font: FN; size: 10;
                align: 0.5 0.5;
                min: 0 0;
@@ -406,7 +409,7 @@ group { name: "efl/button:anchor";
          }
          desc { "pressed_visible";
             inherit: "default";
-            color: 255 255 255 255;
+            color_class: "/fg/pressed/button-anchor";
             rel1.offset: 4 4;
             text.min: 1 1;
             text.ellipsis: -1;
@@ -421,7 +424,7 @@ group { name: "efl/button:anchor";
          }
          desc { "pressed_textonly";
             inherit: "default";
-            color: 255 255 255 255;
+            color_class: "/fg/pressed/button-anchor";
             text.min: 1 1;
             text.ellipsis: -1;
             visible: 1;
@@ -429,7 +432,7 @@ group { name: "efl/button:anchor";
          desc { "disabled_visible";
             inherit: "default";
             rel1.offset: 0 0;
-            color: 96 96 96 255;
+            color_class: "/fg/disabled/button-anchor";
             text.min: 1 1;
             text.ellipsis: -1;
             visible: 1;
@@ -437,7 +440,7 @@ group { name: "efl/button:anchor";
          desc { "disabled_textonly";
             inherit: "default";
             rel1.offset: 0 4;
-            color: 96 96 96 255;
+            color_class: "/fg/disabled/button-anchor";
             text.min: 1 1;
             text.ellipsis: -1;
             visible: 1;
@@ -445,23 +448,23 @@ group { name: "efl/button:anchor";
       }
       rect { "bar"; nomouse;
          desc { "default";
-            color: 51 153 255 255;
+            color_class: "/fg/normal/button-anchor";
             rel1.relative: 0.0 1.0;
             rel1.offset: 2 -3;
             rel2.offset: -3 -3;
          }
          desc { "pressed";
             inherit: "default";
-            color: 255 255 255 255;
+            color_class: "/fg/pressed/button-anchor";
          }
          desc { "disabled";
             inherit: "default";
-            color: 96 96 96 255;
+            color_class: "/fg/disabled/button-anchor";
          }
       }
       rect { "event";
          desc { "default";
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
          desc { "disabled";
             inherit: "default";

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

@@ -1,21 +1,21 @@
 #define CIT_STYLES\
       style { name: "efl_ui_calendar_date_style";\
-         base: "font="FN" font_size=10 color=#a0a0a0 align=center text_class=calendar_day_text";\
+         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=#3399ff align=center text_class=calendar_day_text_holiday";\
+         base: "font="FN" font_size=10 color=cc:/fg/normal/calendar/day/holiday align=center text_class=calendar_day_text_holiday";\
       }\
       style { name: "efl_ui_calendar_date_today_style";\
-         base: "font="FN" font_size=10 color=#ffffff align=center text_class=calendar_day_text_today";\
+         base: "font="FN" font_size=10 color=cc:/fg/normal/calendar/day/today align=center text_class=calendar_day_text_today";\
       }\
       style { name: "efl_ui_calendar_date_disabled_style";\
-         base: "font="FN" font_size=10 color=#282828 align=center text_class=calendar_day_text_disabled";\
+         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=#3399ff align=center text_class=calendar_day_text_weekend1";\
+         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=#3399ff align=center text_class=calendar_day_text_weekend2";\
+         base: "font="FN" font_size=10 color=cc:/fg/normal/calendar/day/weekend2 align=center text_class=calendar_day_text_weekend2";\
       }\
 
 #define CAL_SPIN(_sufix, _text, _relative)\
@@ -34,7 +34,7 @@
             max: 25 25;\
          }\
       }\
-      part { name: "right_bt"#_sufix; type: RECT;\
+      part { name: "right_bt"#_sufix; type: SPACER;\
          scale: 1;\
          description { state: "default" 0.0;\
             fixed: 1 1;\
@@ -47,7 +47,6 @@
             align: 1.0 0.5;\
             min: 25 25;\
             max: 25 25;\
-            color: 0 0 0 0;\
          }\
       }\
       part { name: "efl.calendar.button"#_sufix".left"; type: SWALLOW;\
@@ -93,7 +92,7 @@
                min: 0 1;\
                text_class: "calendar_"#_text; \
             }\
-            color: 160 160 160 255; \
+            color_class: "/fg/normal/calendar/text/title"; \
          }\
       }
 
@@ -118,7 +117,7 @@
             ellipsis: -1; \
             text_class: "calendar_weekday_text"; \
          } \
-         color: 160 160 160 255; \
+         color_class: "/fg/normal/calendar/text/day"; \
       } \
    } \
    part { name: "ch_"#_pos"_clipper"; type: RECT; \
@@ -138,17 +137,17 @@
    part { name: "cit_"#_pos"_event"; type: RECT; repeat_events: 1; \
       description { state: "default" 0.0; \
          rel.to: "cit_"#_pos"_rect"; \
-         color: 0 0 0 0; \
+         color_class: "/bg/normal/calendar/day/normal"; \
       } \
       description { state: "today" 0.0; \
          inherit: "default" 0.0; \
-         color: 0 0 0 64; \
+         color_class: "/bg/normal/calendar/day/today"; \
       } \
    } \
    part { name: "cit_"#_pos"_selected"; type: RECT; mouse_events: 0; \
       description { state: "default" 0.0; \
          rel.to: "cit_"#_pos"_rect"; \
-         color: 51 153 255 128; \
+         color_class: "/bg/selected/calendar/day"; \
          visible: 0; \
       } \
       description { state: "selected" 0.0; \
@@ -159,7 +158,7 @@
    part { name: "cit_"#_pos"_focus"; type: RECT; mouse_events: 0; \
       description { state: "default" 0.0; \
          rel.to: "cit_"#_pos"_rect"; \
-         color: 255 153 51 128; \
+         color_class: "/bg/selected/calendar/day/focused"; \
          visible: 0; \
       } \
       description { state: "selected" 0.0; \
@@ -209,7 +208,7 @@
          max: 15 15; \
          align: 0.0 1.0;\
          image.normal: "i-check"; \
-         color: 53 153 255 255; \
+         color_class: "/fg/normal/calendar/day/checked"; \
          visible: 0; \
       } \
       description { state: "visible" 0.0; \
@@ -220,7 +219,7 @@
    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; \
+         color: 0 0 0 0; /* no cc */ \
       } \
    } \
    programs { \
@@ -452,7 +451,7 @@ group { name: "efl/calendar";
             rel1.relative: 0.0 1.0;
             rel1.offset: 8 -1;
             rel2.offset: -9 -1;
-            color: 80 80 80 255;
+            color_class: "/fg/normal/separator";
             offscale;
          }
       }
@@ -512,28 +511,28 @@ group { name: "efl/calendar/inc_button";
       part { name: "arrow.image";
          scale: 1;
          description { state: "default" 0.0;
-            min: 15 15; max: 15 15;
-            color: 160 160 160 255;
+            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: 255 255 255 255;
+            color_class: "/fg/pressed/spinner/arrow";
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            color: 96 96 96 255;
+            color_class: "/fg/disabled/spinner/arrow";
          }
       }
       part { name: "over"; type: RECT;
          repeat_events: 1;
          description { state: "default" 0.0;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
       }
       part { name: "disabler"; type: RECT;
          description { state: "default" 0.0;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
             visible: 0;
          }
          description { state: "disabled" 0.0;

data/elementary/themes/edc/efl/check.edc

@@ -47,13 +47,13 @@ group { name: "efl/check";
       }
       rect { "icon_clip";
          desc { "default";
-            color: 255 255 255 255;
+            color: 255 255 255 255; // no cc
          }
          desc { "pressed"; inherit;
-            color: 255 255 255 255;
+            color: 255 255 255 255; // no cc
          }
          desc { "disabled"; inherit;
-            color: 255 255 255 64;
+            color: 255 255 255 64; // no cc
          }
       }
       swallow { "efl.background"; nomouse;
@@ -103,7 +103,7 @@ group { name: "efl/check";
          scale: 1;
          description { state: "default";
             fixed: 1 0;
-            color: 0 0 0 64;
+            color_class: "/bg/normal/check/base";
             align: 0.0 0.5;
             min: 13 13;
             max: 13 13;
@@ -114,10 +114,10 @@ group { name: "efl/check";
             offscale;
          }
          desc { "pressed"; inherit;
-            color: 0 0 0 128;
+            color_class: "/bg/pressed/check/base";
          }
          desc { "disabled"; inherit;
-            color: 0 0 0 16;
+            color_class: "/bg/disabled/check/base";
          }
       }
       part { name: "ck_check";
@@ -130,16 +130,17 @@ group { name: "efl/check";
             min: 15 15;
             max: 15 15;
             visible: 0;
-            color: 160 160 160 255;
+            color_class: "/fg/normal/check/check";
             fixed: 1 1;
          }
          description { state: "pressed" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255;
+            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;
          }
       }
@@ -149,14 +150,14 @@ group { name: "efl/check";
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            color: 153 153 153 255;
+            color: 255 255 255 153; // no cc
          }
       }
       text { "efl.text"; nomouse;
          scale: 1;
          desc { "default";
             fixed: 0 1;
-            color: 160 160 160 255;
+            color_class: "/fg/normal/check/text";
             rel1.offset: 0 4;
             rel1.relative: 1.0 0.0;
             rel1.to_x: "efl.content";
@@ -178,7 +179,7 @@ group { name: "efl/check";
          }
          desc { "pressed_visible"; inherit;
             fixed: 0 0;
-            color: 255 255 255 255;
+            color_class: "/fg/pressed/check/text";
             rel1.offset: 4 4;
             text.min: 1 1;
             text.ellipsis: -1;
@@ -192,14 +193,14 @@ group { name: "efl/check";
          }
          desc { "pressed_textonly"; inherit;
             fixed: 0 0;
-            color: 255 255 255 255;
+            color_class: "/fg/pressed/check/text";
             text.min: 1 1;
             text.ellipsis: -1;
             visible: 1;
          }
          desc { "disabled_visible"; inherit;
             fixed: 0 0;
-            color: 96 96 96 255;
+            color_class: "/fg/disabled/check/text";
             rel1.offset: 4 4;
             text.min: 1 1;
             text.ellipsis: -1;
@@ -207,7 +208,7 @@ group { name: "efl/check";
          }
          desc { "disabled_textonly"; inherit;
             fixed: 0 0;
-            color: 96 96 96 255;
+            color_class: "/fg/disabled/check/text";
             text.min: 1 1;
             text.ellipsis: -1;
             visible: 1;
@@ -216,7 +217,7 @@ group { name: "efl/check";
       rect { "event";
          ignore_flags: ON_HOLD;
          desc { "default";
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
          desc { "disabled"; inherit;
             visible: 0;
@@ -323,13 +324,13 @@ group { name: "efl/check:toggle";
       }
       rect { "icon_clip";
          desc { "default";
-            color: 255 255 255 255;
+            color: 255 255 255 255; // no cc
          }
          desc { "pressed"; inherit;
-            color: 255 255 255 255;
+            color: 255 255 255 255; // no cc
          }
          desc { "disabled"; inherit;
-            color: 255 255 255 64;
+            color: 255 255 255 64; // no cc
          }
       }
       swallow { "efl.content"; nomouse;
@@ -376,14 +377,14 @@ group { name: "efl/check:toggle";
       rect { name: "base";
          description { state: "default";
             fixed: 1 1;
-            color: 0 0 0 64;
+            color_class: "/bg/normal/toggle/base";
             rel.to: "tog";
          }
          desc { "pressed"; inherit;
-            color: 0 0 0 128;
+            color_class: "/bg/pressed/toggle/base";
          }
          desc { "disabled"; inherit;
-            color: 0 0 0 16;
+            color_class: "/bg/disabled/toggle/base";
          }
       }
       spacer { name: "onrect";
@@ -410,7 +411,7 @@ group { name: "efl/check:toggle";
             rel2.to: "offrect";
             rel2.offset: -5 -1;
             offscale;
-            color: 160 160 160 255;
+            color_class: "/fg/normal/toggle/text/off";
             text { font: FN; size: 10;
                min: 0 1;
                align: 0.5 0.5;
@@ -420,11 +421,11 @@ group { name: "efl/check:toggle";
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            color: 96 96 96 255;
+            color_class: "/fg/disabled/toggle/text/off";
          }
          description { state: "clicked" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255;
+            color_class: "/fg/pressed/toggle/text/off";
          }
       }
       text { name: "efl.ontext"; nomouse; scale: 1;
@@ -437,7 +438,7 @@ group { name: "efl/check:toggle";
             rel2.relative: 0.0 1.0;
             rel2.offset: -5 -1;
             offscale;
-            color: 51 153 255 255;
+            color_class: "/fg/normal/toggle/text/on";
             text { font: FN; size: 10;
                min: 0 1;
                align: 0.5 0.5;
@@ -447,11 +448,11 @@ group { name: "efl/check:toggle";
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            color: 96 96 96 255;
+            color_class: "/fg/disabled/toggle/text/on";
          }
          description { state: "clicked" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255;
+            color_class: "/fg/pressed/toggle/text/on";
          }
       }
       part { name: "tog_clip"; type: RECT;
@@ -471,34 +472,34 @@ group { name: "efl/check:toggle";
             rel.to: "tog";
             min: 15 15;
             max: 15 99999;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
       }
       rect { name: "base_but"; nomouse;
          description { state: "default" 0.0;
             rel.to: "button";
-            color: 51 153 255 255;
+            color_class: "/fg/normal/toggle/button";
          }
          description { state: "clicked" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255;
+            color_class: "/fg/pressed/toggle/button";
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            color: 64 64 64 255;
+            color_class: "/fg/disabled/toggle/button";
          }
       }
       rect { name: "button_events";
          dragable.events: "button";
          description { state: "default" 0.0;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
       }
       text { "efl.text"; nomouse;
          scale: 1;
          desc { "default";
             fixed: 0 1;
-            color: 160 160 160 255;
+            color_class: "/fg/normal/toggle/text";
             rel1.offset: 0 4;
             rel1.relative: 1.0 0.0;
             rel1.to_x: "efl.content";
@@ -522,7 +523,7 @@ group { name: "efl/check:toggle";
          }
          desc { "pressed_visible"; inherit;
             fixed: 0 0;
-            color: 255 255 255 255;
+            color_class: "/fg/pressed/toggle/text";
             rel1.offset: 4 4;
             text.min: 1 1;
             text.ellipsis: -1;
@@ -536,14 +537,14 @@ group { name: "efl/check:toggle";
          }
          desc { "pressed_textonly"; inherit;
             fixed: 0 0;
-            color: 255 255 255 255;
+            color_class: "/fg/pressed/toggle/text";
             text.min: 1 1;
             text.ellipsis: -1;
             visible: 1;
          }
          desc { "disabled_visible"; inherit;
             fixed: 0 0;
-            color: 96 96 96 255;
+            color_class: "/fg/disabled/toggle/text";
             rel1.offset: 4 4;
             text.min: 1 1;
             text.ellipsis: -1;
@@ -551,7 +552,7 @@ group { name: "efl/check:toggle";
          }
          desc { "disabled_textonly"; inherit;
             fixed: 0 0;
-            color: 96 96 96 255;
+            color_class: "/fg/disabled/toggle/text";
             text.min: 1 1;
             text.ellipsis: -1;
             visible: 1;
@@ -559,7 +560,7 @@ group { name: "efl/check:toggle";
       }
       rect { "event2";
          desc { "default";
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
             visible: 0;
          }
          desc { "disabled"; inherit;
@@ -569,7 +570,7 @@ group { name: "efl/check:toggle";
       rect { "event"; repeat;
          ignore_flags: ON_HOLD;
          desc { "default";
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
          desc { "disabled"; inherit;
             visible: 0;

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

@@ -155,7 +155,7 @@ group { "efl/datepicker";
          desc { "default";
             fixed: 1 1;
             rel.to: "bg";
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
       }
    }
@@ -179,7 +179,7 @@ group { "efl/datepicker/spin_button";
          repeat;
          desc { "default";
             fixed: 1 1;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
             rel.to: "base";
             hid;
          }
@@ -243,7 +243,7 @@ group { "efl/datepicker/spin_button";
          norepeat;
          nomouse;
          desc { "default";
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
             hid;
          }
          desc { "disabled";

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

@@ -88,12 +88,12 @@ group { name: "efl/focus_highlight/top";
             rel1.offset: -999 -999;
             rel2.relative: 2.0 2.0;
             rel2.offset: 999 999;
-            color: 255 255 255 0;
+            color: 255 255 255 0; // no cc
             visible: 0;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255;
+            color: 255 255 255 255; // no cc
             visible: 1;
          }
       }
@@ -102,13 +102,13 @@ group { name: "efl/focus_highlight/top";
          scale: 1;
          description { state: "default" 0.0;
             rel.to: "base";
-            color: 51 153 255 255;
+            color_class: "/bg/selected/focus";
             rel2.relative: 1.0 0.0;
             min: 4 4;
          }
          description { state: "hi" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255;
+            color_class: "/bg/selected/focus/hilight";
          }
       }
       part { name: "topl"; type: RECT;
@@ -116,7 +116,7 @@ group { name: "efl/focus_highlight/top";
          scale: 1;
          description { state: "default" 0.0;
             rel.to: "top";
-            color: 51 153 255 255;
+            color_class: "/bg/selected/focus";
             rel1.relative: 0.0 1.0;
             rel2.relative: 0.0 1.0;
             align: 0.0 0.0;
@@ -124,7 +124,7 @@ group { name: "efl/focus_highlight/top";
          }
          description { state: "hi" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255;
+            color_class: "/bg/selected/focus/hilight";
          }
       }
       part { name: "topr"; type: RECT;
@@ -132,7 +132,7 @@ group { name: "efl/focus_highlight/top";
          scale: 1;
          description { state: "default" 0.0;
             rel.to: "top";
-            color: 51 153 255 255;
+            color_class: "/bg/selected/focus";
             rel1.relative: 1.0 1.0;
             rel2.relative: 1.0 1.0;
             align: 1.0 0.0;
@@ -140,7 +140,7 @@ group { name: "efl/focus_highlight/top";
          }
          description { state: "hi" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255;
+            color_class: "/bg/selected/focus/hilight";
          }
       }
       part { name: "bot"; type: RECT;
@@ -148,13 +148,13 @@ group { name: "efl/focus_highlight/top";
          scale: 1;
          description { state: "default" 0.0;
             rel.to: "base";
-            color: 51 153 255 255;
+            color_class: "/bg/selected/focus";
             rel1.relative: 0.0 1.0;
             min: 4 4;
          }
          description { state: "hi" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255;
+            color_class: "/bg/selected/focus/hilight";
          }
       }
       part { name: "botl"; type: RECT;
@@ -162,7 +162,7 @@ group { name: "efl/focus_highlight/top";
          scale: 1;
          description { state: "default" 0.0;
             rel.to: "bot";
-            color: 51 153 255 255;
+            color_class: "/bg/selected/focus";
             rel1.relative: 0.0 0.0;
             rel2.relative: 0.0 0.0;
             align: 0.0 1.0;
@@ -170,7 +170,7 @@ group { name: "efl/focus_highlight/top";
          }
          description { state: "hi" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255;
+            color_class: "/bg/selected/focus/hilight";
          }
       }
       part { name: "botr"; type: RECT;
@@ -178,7 +178,7 @@ group { name: "efl/focus_highlight/top";
          scale: 1;
          description { state: "default" 0.0;
             rel.to: "bot";
-            color: 51 153 255 255;
+            color_class: "/bg/selected/focus";
             rel1.relative: 1.0 0.0;
             rel2.relative: 1.0 0.0;
             align: 1.0 1.0;
@@ -186,7 +186,7 @@ group { name: "efl/focus_highlight/top";
          }
          description { state: "hi" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255;
+            color_class: "/bg/selected/focus/hilight";
          }
       }
    }

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

@@ -5,6 +5,7 @@ group { name: "efl/frame";
       part { name: "shadow"; type: RECT;
          description { state: "default" 0.0;
             rel.to: "_sh1";
+            color_class: "/shadow/normal/frame";
          }
          description { state: "hidden" 0.0;
             inherit;
@@ -12,15 +13,20 @@ group { name: "efl/frame";
          }
       }
       WIN_SHAD("base", "shadow", "win_shad_flat.png", 10, 10, 7, 14, 0.25);
-      part { name: "base"; type: RECT;
+      part { name: "base"; type: SPACER;
          scale: 1;
          description { state: "default" 0.0;
             rel1.offset: 6 6;
             rel2.offset: -7 -7;
-            color: 80 80 80 255;
             offscale;
          }
       }
+      part { name: "top_bg"; type: RECT;
+         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;
@@ -34,13 +40,12 @@ group { name: "efl/frame";
       part { name: "efl.text"; type: TEXT;
          scale: 1;
          description { state: "default" 0.0;
+            rel.to: "base";
             rel1.offset: 4 4;
-            rel1.to: "base";
             rel2.relative: 1.0 0.0;
             rel2.offset: -5 4;
-            rel2.to: "base";
             align: 0.0 0.0;
-            color: 255 255 255 255;
+            color_class: "/fg/normal/frame/title";
             text { font: FNBD; size: 10;
                align: 0.0 0.0;
                min: 0 1;
@@ -56,13 +61,12 @@ group { name: "efl/frame";
             rel1.to_y: "top";
             rel1.relative: 0.0 1.0;
             rel2.to: "base";
-            color: 64 64 64 255;
+            color_class: "/bg/normal/frame";
          }
       }
       part { name: "clip"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to: "bg";
-            rel2.to: "bg";
+            rel.to: "bg";
          }
       }
       part { name: "efl.content"; type: SWALLOW;
@@ -84,7 +88,7 @@ group { name: "efl/frame";
       }
       part { name: "event"; type: RECT; ignore_flags: ON_HOLD;
          description { state: "default" 0.0;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
             rel1.to_y: "efl.text";
             rel2.to_y: "efl.text";
          }

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

@@ -51,12 +51,12 @@ group { "efl/grid_item";
 #define BASEP() \
    part { name: "base"; type: RECT; mouse_events: 0; \
       description { state: "default" 0.0; \
-         color: 64 64 64 255; \
+         color_class: "/bg/normal/grid/item"; \
       } \
    } \
    part { name: "sel_base"; type: RECT; mouse_events: 0; \
       description { state: "default" 0.0; \
-         color: 51 153 255 255; \
+         color_class: "/bg/selected/grid/item"; \
          visible: 0; \
       } \
       description { state: "selected" 0.0; \
@@ -84,7 +84,7 @@ group { "efl/grid_item";
    part { name: "event"; type: RECT; \
       repeat_events: 1; \
       description { state: "default" 0.0; \
-         color: 0 0 0 0; \
+         color: 0 0 0 0; /* no cc */ \
       } \
       description { state: "disabled" 0.0; \
          inherit: "default" 0.0; \
@@ -93,7 +93,7 @@ group { "efl/grid_item";
    } \
    part { name: "event_block"; type: RECT; \
       description { state: "default" 0.0; \
-         color: 0 0 0 0; \
+         color: 0 0 0 0; /* no cc */ \
          visible: 0; \
       } \
       description { state: "disabled" 0.0; \
@@ -120,7 +120,7 @@ group { "efl/grid_item";
             rel1.relative: 0.0 1.0;
             rel1.offset: 4 -5;
             rel2.offset: -5 -5;
-            color: 160 160 160 255;
+            color_class: "/fg/normal/grid/item";
             align: 0.5 1.0;
             offscale;
             text { font: FN; size: 10;
@@ -131,11 +131,11 @@ group { "efl/grid_item";
          }
          description { state: "selected" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255;
+            color_class: "/fg/selected/grid/item";
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            color: 80 80 80 255;
+            color_class: "/fg/disabled/grid/item";
          }
       }
       program { signal: "efl,state,selected"; source: "efl";
@@ -164,11 +164,12 @@ group { "efl/grid_item";
             rel2.to_y: "efl.text";
             rel2.relative: 1.0 0.0;
             rel2.offset: -5 -5;
+            color: 255 255 255 255; // no cc
             offscale;
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 64;
+            color: 255 255 255 64; // no cc
          }
       }
       part { name: "efl.icon"; type: SWALLOW;

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

@@ -14,7 +14,7 @@ group { "efl/group_item";
    parts {
       rect { "base";
          desc { "default";
-             color: 32 32 32 255;
+            color_class: "/bg/normal/list/group";
          }
       }
       text { "efl.text";
@@ -29,7 +29,7 @@ group { "efl/group_item";
             rel2.relative: 0.0 1.0;
             rel2.to_x: "efl.extra";
             align: 0.0 0.5;
-            color: 255 255 255 255;
+            color_class: "/fg/normal/list/group";
             text { font: FNBD; size: 10;
                min: 1 1;
                ellipsis: -1;
@@ -40,7 +40,7 @@ group { "efl/group_item";
          }
          desc { "disabled";
             inherit: "default";
-            color: 80 80 80 255;
+            color_class: "/fg/disabled/list/group";
             link.base: "efl,state,disabled";
          }
       }

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

@@ -25,7 +25,7 @@ group { name: "efl/image_zoomable";
       part { name: "base"; type: RECT;
          scale: 1;
          description { state: "default" 0.0;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
             rel1.offset: 4 4;
             rel2.offset: -5 -5;
             align: 1.0 1.0;

data/elementary/themes/edc/efl/list.edc

@@ -63,15 +63,15 @@ group { "efl/list_item";
    parts {
       rect { "base"; nomouse;
          desc { "default";
-            color: 64 64 64 255;
+            color_class: "/bg/normal/list/item";
          }
          desc { "odd";
-            color: 56 56 56 255;
+            color_class: "/bg-alt/normal/list/item";
          }
       }
       rect { "sel_base"; nomouse;
          desc { "default";
-            color: 51 153 255 255;
+            color_class: "/bg/selected/list/item";
             hid;
          }
          desc { "selected";
@@ -95,7 +95,7 @@ group { "efl/list_item";
             rel2.offset: -5 -5;
             rel2.relative: 0.0 1.0;
             rel2.to_x: "efl.extra";
-            color: 160 160 160 255;
+            color_class: "/fg/normal/list/item";
             text { font: FN; size: 10;
                min: 1 1;
                ellipsis: -1;
@@ -106,16 +106,16 @@ group { "efl/list_item";
          }
          desc { "selected";
             inherit: "default";
-            color: 255 255 255 255;
+            color_class: "/fg/selected/list/item";
          }
          desc { "disabled";
             inherit: "default";
-            color: 80 80 80 255;
+            color_class: "/fg/disabled/list/item";
          }
       }
       rect { "event";
          desc { "default";
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
          desc { "disabled";
             inherit: "default";
@@ -149,7 +149,7 @@ group { "efl/list_item";
       }
       rect { "event_block";
          desc { "default";
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
             hid;
          }
          desc { "disabled";
@@ -208,15 +208,15 @@ group { "efl/list_item:placeholder";
    parts {
       rect { "base"; nomouse;
          desc { "default";
-            color: 64 64 64 255;
+            color_class: "/bg/normal/list/item";
          }
          desc { "odd";
-            color: 56 56 56 255;
+            color_class: "/bg-alt/normal/list/item";
          }
       }
       rect { "sel_base"; nomouse;
          desc { "default";
-            color: 51 153 255 255;
+            color_class: "/bg/selected/list/item";
             hid;
          }
          desc { "selected";
@@ -233,7 +233,7 @@ group { "efl/list_item:placeholder";
       //##//
       rect { "event";
          desc { "default";
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
          desc { "disabled";
             inherit: "default";
@@ -252,7 +252,7 @@ group { "efl/list_item:placeholder";
       }
       rect { "event_block";
          desc { "default";
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
             hid;
          }
          desc { "disabled";

data/elementary/themes/edc/efl/navigation_bar.edc

@@ -3,11 +3,11 @@ group { "efl/navigation_bar";
    data.item: "version" "123";
    styles {
       style { name: "navigation_bar_text";
-         base: "font="FNBD" font_size=10 text_class=label align=center color=#fff ellipsis=1.0 wrap=mixed";
+         base: "font="FNBD" font_size=10 text_class=label align=center color=cc:/fg/normal/navigation/title ellipsis=1.0 wrap=mixed";
          tag: "br" "\n";
          tag: "hilight" "+ font="FNBD" text_class=label_light";
          tag: "b" "+ font="FNBD" text_class=label_light";
-         tag: "whitecolor" "+ color=#fff";
+         tag: "whitecolor" "+ color=#fff"; // no cc
          tag: "tab" "\t";
       }
    }
@@ -103,7 +103,7 @@ group { name: "efl/navigation_bar/back_button";
          insert_before: "efl.content";
          desc { "default";
             image.normal: "i-arrow-l";
-            color: 160 160 160 255;
+            color_class: "/fg/normal/navigation/back/arrow";
          }
       }
    }

data/elementary/themes/edc/efl/panel.edc

@@ -42,13 +42,13 @@ group { name: "efl/scroller/panel/left";
          repeat_events: 1;
          description { state: "default" 0.0;
             rel.to: "efl.panel_area";
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
       }
       part { name: "bg"; type: RECT;
          description { state: "default" 0.0;
             rel.to: "efl.panel_area";
-            color: 64 64 64 255;
+            color_class: "/bg/normal/panel";
             visible: 0;
          }
          description { state: "visible" 0.0;
@@ -124,14 +124,14 @@ group { name: "efl/scroller/panel/right";
          description { state: "default" 0.0;
             rel1.to: "efl.panel_area";
             rel2.to: "efl.panel_area";
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
       }
       part { name: "bg"; type: RECT;
          description { state: "default" 0.0;
             rel1.to: "efl.panel_area";
             rel2.to: "efl.panel_area";
-            color: 64 64 64 255;
+            color_class: "/bg/normal/panel";
             visible: 0;
          }
          description { state: "visible" 0.0;
@@ -208,14 +208,14 @@ group { name: "efl/scroller/panel/top";
          description { state: "default" 0.0;
             rel1.to: "efl.panel_area";
             rel2.to: "efl.panel_area";
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
       }
       part { name: "bg"; type: RECT;
          description { state: "default" 0.0;
             rel1.to: "efl.panel_area";
             rel2.to: "efl.panel_area";
-            color: 64 64 64 255;
+            color_class: "/bg/normal/panel";
             visible: 0;
          }
          description { state: "visible" 0.0;
@@ -285,13 +285,13 @@ group { name: "efl/scroller/panel/bottom";
       part { name: "access.outline"; type: RECT; repeat_events: 1;
          description { state: "default" 0.0;
             rel.to: "efl.panel_area";
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
       }
       part { name: "bg"; type: RECT;
          description { state: "default" 0.0;
             rel.to: "efl.panel_area";
-            color: 64 64 64 255;
+            color_class: "/bg/normal/panel";
             visible: 0;
          }
          description { state: "visible" 0.0;
@@ -346,7 +346,7 @@ group { name: "efl/panel/left";
          scale: 1;
          description { state: "default" 0.0;
             rel.to: "base";
-            color: 51 153 255 255;
+            color_class: "/bg/selected/panel";
             visible: 0;
             offscale;
          }
@@ -366,7 +366,7 @@ group { name: "efl/panel/left";
             rel1.to_x: "all";
             rel2.to_x: "efl.swallow.event";
             rel2.relative: 0.0 1.0;
-            color: 64 64 64 255;
+            color_class: "/bg/normal/panel";
          }
       }
       part { name: "efl.content"; type: SWALLOW;
@@ -386,7 +386,7 @@ group { name: "efl/panel/left";
             align: 1.0 0.5;
             rel1.relative: 1.0 0.0;
             rel2.relative: 1.0 1.0;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
          description { state: "hidden" 0.0;
             inherit: "default" 0.0;
@@ -398,7 +398,7 @@ group { name: "efl/panel/left";
       part { name: "btn"; type: RECT;
          description { state: "default" 0.0;
             rel.to: "efl.swallow.event";
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
          description { state: "hidden" 0.0;
             rel.to: "efl.swallow.event";

data/elementary/themes/edc/efl/panes.edc

@@ -98,7 +98,11 @@ group { name: "efl/panes/vertical";
             image.normal: "pane_handle_v.png";
             fill.smooth: 0;
             rel.to: "efl.bar";
-            color: 160 160 160 255;
+            color_class: "/fg/normal/panes/handle";
+         }
+         description { state: "pressed" 0.0;
+            inherit: "default" 0.0;
+            color_class: "/fg/pressed/panes/handle";
          }
       }
       part { name: "efl.event"; type: SWALLOW;
@@ -117,7 +121,7 @@ group { name: "efl/panes/vertical";
             fixed: 1 1;
             rel1.to_x: "efl.event";
             rel2.to_x: "efl.event";
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -127,6 +131,16 @@ group { name: "efl/panes/vertical";
    }
    programs {
       EFL_UI_CLICKABLE_PART_BIND("bar")
+      program { name: "bar_down";
+         signal: "mouse,down,1"; source: "bar";
+         action: STATE_SET "pressed" 0.0;
+         target: "dots";
+      }
+      program { name: "bar_up";
+         signal: "mouse,up,1"; source: "bar";
+         action: STATE_SET "default" 0.0;
+         target: "dots";
+      }
       program { // for efl_panes_fixed_set()
          signal: "efl,panes,fixed"; source: "efl";
          action: STATE_SET "disabled" 0.0;
@@ -225,7 +239,11 @@ group { name: "efl/panes/horizontal";
             image.normal: "pane_handle_h.png";
             fill.smooth: 0;
             rel.to: "efl.bar";
-            color: 160 160 160 255;
+            color_class: "/fg/normal/panes/handle";
+         }
+         description { state: "pressed" 0.0;
+            inherit: "default" 0.0;
+            color_class: "/fg/pressed/panes/handle";
          }
       }
       part { name: "efl.event"; type: SWALLOW;
@@ -244,7 +262,7 @@ group { name: "efl/panes/horizontal";
             fixed: 1 1;
             rel1.to_y: "efl.event";
             rel2.to_y: "efl.event";
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -254,6 +272,16 @@ group { name: "efl/panes/horizontal";
    }
    programs {
       EFL_UI_CLICKABLE_PART_BIND("bar")
+      program { name: "bar_down";
+         signal: "mouse,down,1"; source: "bar";
+         action: STATE_SET "pressed" 0.0;
+         target: "dots";
+      }
+      program { name: "bar_up";
+         signal: "mouse,up,1"; source: "bar";
+         action: STATE_SET "default" 0.0;
+         target: "dots";
+      }
       program { // for efl_panes_fixed_set()
          signal: "efl,panes,fixed"; source: "efl";
          action: STATE_SET "disabled" 0.0;
@@ -362,7 +390,7 @@ group { name: "efl/panes/vertical:flush";
             rel1.relative: 0.0 0.25;
             rel2.to_x: "efl.event";
             rel2.relative: 1.0 0.75;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -376,13 +404,14 @@ group { name: "efl/panes/vertical:flush";
             image.normal: "shadow_circle_vert.png";
             rel1.to_x: "efl.bar";
             rel2.to_x: "efl.bar";
-            color: 255 255 255 0;
+            color_class: "/shadow/normal/panes/flush";
+            color: 255 255 255 0; // no cc
             offscale;
             visible: 0;
          }
          description { state: "active" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 128;
+            color: 255 255 255 255; // no cc
             rel1.offset: -16 0;
             rel2.offset: 15 -1;
             visible: 1;
@@ -395,13 +424,14 @@ group { name: "efl/panes/vertical:flush";
             image.normal: "shadow_circle_vert.png";
             rel1.to_x: "efl.bar";
             rel2.to_x: "efl.bar";
-            color: 255 255 255 0;
+            color_class: "/shadow/normal/panes/flush";
+            color: 255 255 255 0; // no cc
             offscale;
             visible: 0;
          }
          description { state: "active" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 128;
+            color: 255 255 255 255; // no cc
             rel1.offset: -16 0;
             rel2.offset: 15 -1;
             visible: 1;
@@ -413,7 +443,7 @@ group { name: "efl/panes/vertical:flush";
          description { state: "default" 0.0;
             rel1.to_x: "efl.bar";
             rel2.to_x: "efl.bar";
-            color: 51 153 255 255;
+            color_class: "/fg/normal/panes/flush";
             offscale;
             visible: 0;
          }
@@ -430,7 +460,7 @@ group { name: "efl/panes/vertical:flush";
          description { state: "default" 0.0;
             rel1.to_x: "efl.bar";
             rel2.to_x: "efl.bar";
-            color: 51 153 255 255;
+            color_class: "/fg/normal/panes/flush";
             offscale;
             visible: 0;
          }
@@ -446,7 +476,7 @@ group { name: "efl/panes/vertical:flush";
             fixed: 1 1;
             rel.to: "bar";
             rel2.relative: 0.5 1.0;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
       }
       part { name: "bar2"; type: RECT; repeat_events: 1;
@@ -454,7 +484,7 @@ group { name: "efl/panes/vertical:flush";
             fixed: 1 1;
             rel.to: "bar";
             rel1.relative: 0.5 0.0;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
       }
    }
@@ -599,7 +629,7 @@ group { name: "efl/panes/horizontal:flush";
             rel1.relative: 0.25 0.0;
             rel2.to_y: "efl.event";
             rel2.relative: 0.75 1.0;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -613,13 +643,14 @@ group { name: "efl/panes/horizontal:flush";
             image.normal: "shadow_circle_horiz.png";
             rel1.to_y: "efl.bar";
             rel2.to_y: "efl.bar";
-            color: 255 255 255 0;
+            color_class: "/shadow/normal/panes/flush";
+            color: 255 255 255 0; // no cc
             offscale;
             visible: 0;
          }
          description { state: "active" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 128;
+            color: 255 255 255 255; // no cc
             rel1.offset: 0 -16;
             rel2.offset: -1 15;
             visible: 1;
@@ -632,13 +663,14 @@ group { name: "efl/panes/horizontal:flush";
             image.normal: "shadow_circle_horiz.png";
             rel1.to_y: "efl.bar";
             rel2.to_y: "efl.bar";
-            color: 255 255 255 0;
+            color_class: "/shadow/normal/panes/flush";
+            color: 255 255 255 0; // no cc
             offscale;
             visible: 0;
          }
          description { state: "active" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 128;
+            color: 255 255 255 255; // no cc
             rel1.offset: 0 -16;
             rel2.offset: -1 15;
             visible: 1;
@@ -650,7 +682,7 @@ group { name: "efl/panes/horizontal:flush";
          description { state: "default" 0.0;
             rel1.to_y: "efl.bar";
             rel2.to_y: "efl.bar";
-            color: 51 153 255 255;
+            color_class: "/fg/normal/panes/flush";
             offscale;
             visible: 0;
          }
@@ -667,7 +699,7 @@ group { name: "efl/panes/horizontal:flush";
          description { state: "default" 0.0;
             rel1.to_y: "efl.bar";
             rel2.to_y: "efl.bar";
-            color: 51 153 255 255;
+            color_class: "/fg/normal/panes/flush";
             offscale;
             visible: 0;
          }
@@ -683,7 +715,7 @@ group { name: "efl/panes/horizontal:flush";
             fixed: 1 1;
             rel.to: "bar";
             rel2.relative: 1.0 0.5;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
       }
       part { name: "bar2"; type: RECT; repeat_events: 1;
@@ -691,7 +723,7 @@ group { name: "efl/panes/horizontal:flush";
             fixed: 1 1;
             rel.to: "bar";
             rel1.relative: 0.0 0.5;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
       }
    }
@@ -768,7 +800,7 @@ group { name: "efl/panes/vertical:left-fold";
          repeat;
          desc { "default";
             rel.to: "dots";
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
       }
    }
@@ -778,6 +810,24 @@ group { name: "efl/panes/vertical:left-fold";
             set_int(open, 1);
          }
       }
+      program { name: "bar_down";
+         script {
+            if (get_int(open) == 1) {
+               set_state(PART:"dots", "pressed", 0.0);
+            } else if (get_int(open) == 0) {
+               set_state(PART:"dots", "closed-pressed", 0.0);
+            }
+         }
+      }
+      program { name: "bar_up";
+         script {
+            if (get_int(open) == 1) {
+               set_state(PART:"dots", "default", 0.0);
+            } else if (get_int(open) == 0) {
+               set_state(PART:"dots", "closed", 0.0);
+            }
+         }
+      }
       program { signal: "mouse,clicked,1"; source: "event";
          script {
             if (get_int(open) == 1) {
@@ -822,7 +872,7 @@ group { name: "efl/panes/vertical:right-fold";
          repeat;
          desc { "default";
             rel.to: "dots";
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
       }
    }
@@ -832,6 +882,24 @@ group { name: "efl/panes/vertical:right-fold";
             set_int(open, 1);
          }
       }
+      program { name: "bar_down";
+         script {
+            if (get_int(open) == 1) {
+               set_state(PART:"dots", "pressed", 0.0);
+            } else if (get_int(open) == 0) {
+               set_state(PART:"dots", "closed-pressed", 0.0);
+            }
+         }
+      }
+      program { name: "bar_up";
+         script {
+            if (get_int(open) == 1) {
+               set_state(PART:"dots", "default", 0.0);
+            } else if (get_int(open) == 0) {
+               set_state(PART:"dots", "closed", 0.0);
+            }
+         }
+      }
       program { signal: "mouse,clicked,1"; source: "event";
          script {
             if (get_int(open) == 1) {
@@ -876,7 +944,7 @@ group { name: "efl/panes/horizontal:up-fold";
          repeat;
          desc { "default";
             rel.to: "dots";
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
       }
    }
@@ -886,6 +954,24 @@ group { name: "efl/panes/horizontal:up-fold";
             set_int(open, 1);
          }
       }
+      program { name: "bar_down";
+         script {
+            if (get_int(open) == 1) {
+               set_state(PART:"dots", "pressed", 0.0);
+            } else if (get_int(open) == 0) {
+               set_state(PART:"dots", "closed-pressed", 0.0);
+            }
+         }
+      }
+      program { name: "bar_up";
+         script {
+            if (get_int(open) == 1) {
+               set_state(PART:"dots", "default", 0.0);
+            } else if (get_int(open) == 0) {
+               set_state(PART:"dots", "closed", 0.0);
+            }
+         }
+      }
       program { signal: "mouse,clicked,1"; source: "event";
          script {
             if (get_int(open) == 1) {
@@ -930,7 +1016,7 @@ group { name: "efl/panes/horizontal:down-fold";
          repeat;
          desc { "default";
             rel.to: "dots";
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
       }
    }
@@ -940,6 +1026,24 @@ group { name: "efl/panes/horizontal:down-fold";
             set_int(open, 1);
          }
       }
+      program { name: "bar_down";
+         script {
+            if (get_int(open) == 1) {
+               set_state(PART:"dots", "pressed", 0.0);
+            } else if (get_int(open) == 0) {
+               set_state(PART:"dots", "closed-pressed", 0.0);
+            }
+         }
+      }
+      program { name: "bar_up";
+         script {
+            if (get_int(open) == 1) {
+               set_state(PART:"dots", "default", 0.0);
+            } else if (get_int(open) == 0) {
+               set_state(PART:"dots", "closed", 0.0);
+            }
+         }
+      }
       program { signal: "mouse,clicked,1"; source: "event";
          script {
             if (get_int(open) == 1) {

data/elementary/themes/edc/efl/pointer.edc

@@ -14,10 +14,11 @@ group { name: "efl/pointer";
              * will be WITHIN the bounds the axes
              * of thre part describe */
             image.normal: "pointer.png";
+            color_class: "/fg/normal/pointer/base";
          }
          description { state: "clicked" 0.0;
             inherit: "default" 0.0;
-            color: 51 153 255 255;
+            color_class: "/fg/pressed/pointer/base";
          }
       }
       part { name: "efl.hotspot"; type: SWALLOW;
@@ -64,7 +65,7 @@ group { name: "efl/pointer:bottom_right_corner";
       part { name: "box"; type: RECT;
          insert_after: "base";
          description { state: "default" 0.0;
-            color: 51 153 255 192;
+            color_class: "/fg/normal/pointer/manipulator";
             rel1.relative: 0.3 0.3;
             rel2.relative: 0.7 0.7;
          }

data/elementary/themes/edc/efl/popup.edc

@@ -71,19 +71,20 @@ Group: efl/alert_popup/left_button (@since 1.23)
 */
 group { "efl/popup";
    data.item: "version" "123";
+   images.image: "win_shad_flat.png" COMP;
    parts {
-      image { "shadow";
-         scale;
-         desc { "default";
-            rel.to: "base";
-            WIN_SHADOW;
+      part { name: "shadow"; type: RECT;
+         description { state: "default" 0.0;
+            rel.to: "_sh1";
+            color_class: "/shadow/normal/frame";
          }
       }
+      WIN_SHAD("base", "shadow", "win_shad_flat.png", 10, 10, 7, 14, 0.25);
       rect { "base";
          scale;
          desc { "default";
             min: 100 100;
-            color: 0 0 0 192;
+            color_class: "/dim/normal/popup";
             rel1.offset: 16 16;
             rel2.offset: -17 -17;
             offscale;
@@ -108,19 +109,20 @@ group { "efl/popup";
 
 group { "efl/alert_popup";
    data.item: "version" "123";
+   images.image: "win_shad_flat.png" COMP;
    parts {
-      image { "shadow";
-         scale;
-         desc { "default";
-            rel.to: "base";
-            WIN_SHADOW;
+      part { name: "shadow"; type: RECT;
+         description { state: "default" 0.0;
+            rel.to: "_sh1";
+            color_class: "/shadow/normal/frame";
          }
       }
+      WIN_SHAD("base", "shadow", "win_shad_flat.png", 10, 10, 7, 14, 0.25);
       rect { "base";
          scale;
          desc { "default";
             min: 100 100;
-            color: 0 0 0 192;
+            color_class: "/dim/normal/popup";
             rel1.offset: 16 16;
             rel2.offset: -17 -17;
             offscale;
@@ -153,7 +155,7 @@ group { "efl/alert_popup";
             rel.to: "base";
             rel2.relative: 1.0 0.0;
             align: 0.0 0.0;
-            color: 32 32 32 255;
+            color_class: "/bg/normal/popup";
          }
          desc { "title_visible";
             inherit: "default";
@@ -222,7 +224,7 @@ group { "efl/popup/backwall";
    parts {
       rect { "base";
          desc { "default";
-            color: 0 0 0 64;
+            color_class: "/dim/normal/hover";
          }
          desc { "content_visible";
             inherit: "default";
@@ -246,7 +248,7 @@ group { "efl/popup/backwall";
       rect { "block";
          desc { "default";
             rel.to: "base";
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
       }
    }

data/elementary/themes/edc/efl/progress.edc

@@ -44,7 +44,7 @@ group { name: "efl/progressbar/horizontal";
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 64;
+            color: 255 255 255 64; // no cc
          }
       }
       part { name: "pulse_clip"; type: RECT;
@@ -100,7 +100,7 @@ group { name: "efl/progressbar/horizontal";
             rel2.to_x: "efl.content";
             rel2.relative: 1.0 1.0;
             rel2.offset: -1 -5;
-            color: 160 160 160 255;
+            color_class: "/fg/normal/progress/text";
             text { font: FN; size: 10;
                text_class: "progressbar";
                min: 0 0;
@@ -121,7 +121,7 @@ group { name: "efl/progressbar/horizontal";
          }
          description { state: "disabled_visible" 0.0;
             inherit: "visible" 0.0;
-            color: 80 80 80 255;
+            color_class: "/fg/disabled/progress/text";
          }
       }
       part { name: "bg"; type: RECT;
@@ -131,7 +131,7 @@ group { name: "efl/progressbar/horizontal";
             max: -1 16;
             rel1.offset: 4 4;
             rel2.offset: -5 -5;
-            color: DARK_GREY_BG_COLOR;
+            color_class: "/bg/normal/progress/base";
             offscale;
          }
          description { state: "iclabel" 0.0;
@@ -176,7 +176,7 @@ group { name: "efl/progressbar/horizontal";
             rel1.to: "bg";
             rel2.to_x: "barend";
             rel2.to_y: "bg";
-            color: 51 153 255 255;
+            color_class: "/fg/normal/progress/bar";
             offscale;
          }
          description { state: "inv" 0.0;
@@ -194,7 +194,7 @@ group { name: "efl/progressbar/horizontal";
             max: 16 9999;
             rel.to: "efl.bar";
             align: 0.0 0.5;
-            color: 51 153 255 255;
+            color_class: "/fg/normal/progress/pulse";
          }
          description { state: "end" 0.0;
             inherit: "default" 0.0;
@@ -214,7 +214,7 @@ group { name: "efl/progressbar/horizontal";
                text_class: "progress_status";
                align: 1.0 0.5;
             }
-            color: 255 255 255 255;
+            color_class: "/fg/normal/progress/text/status";
             offscale;
          }
          description { state: "hidden" 0.0;
@@ -389,12 +389,11 @@ group { name: "efl/progressbar/vertical";
    parts {
       part { name: "dis_clip"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to: "efl.content";
-            rel2.to: "efl.content";
+            rel.to: "efl.content";
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 64;
+            color: 255 255 255 64; // no cc
          }
       }
       part { name: "pulse_clip"; type: RECT;
@@ -450,7 +449,7 @@ group { name: "efl/progressbar/vertical";
             rel2.to_y: "efl.content";
             rel2.relative: 1.0 1.0;
             rel2.offset: -5 -1;
-            color: 160 160 160 255;
+            color_class: "/fg/normal/progress/text";
             text { font: FN; size: 10;
                text_class: "progressbar";
                min: 0 0;
@@ -470,7 +469,7 @@ group { name: "efl/progressbar/vertical";
          }
          description { state: "disabled_visible" 0.0;
             inherit: "visible" 0.0;
-            color: 80 80 80 255;
+            color_class: "/fg/disabled/progress/text";
          }
       }
       part { name: "bg"; type: RECT;
@@ -480,7 +479,7 @@ group { name: "efl/progressbar/vertical";
             max: 16 -1;
             rel1.offset: 4 4;
             rel2.offset: -5 -5;
-            color: DARK_GREY_BG_COLOR;
+            color_class: "/bg/normal/progress/base";
             offscale;
          }
          description { state: "iclabel" 0.0;
@@ -491,8 +490,7 @@ group { name: "efl/progressbar/vertical";
       }
       part { name: "efl.bar"; type: SWALLOW; mouse_events: 0;
          description { state: "default" 0.0;
-            rel1.to: "bg";
-            rel2.to: "bg";
+            rel.to: "bg";
          }
       }
       part { name: "efl.cur.progressbar"; mouse_events: 0; type: SPACER;
@@ -503,8 +501,7 @@ group { name: "efl/progressbar/vertical";
             fixed: 1 1;
             min: 1 1;
             max: 9999 1;
-            rel1.to: "efl.bar";
-            rel2.to: "efl.bar";
+            rel.to: "efl.bar";
          }
       }
       part { name: "barend"; type: SPACER;
@@ -527,7 +524,7 @@ group { name: "efl/progressbar/vertical";
             rel1.to: "bg";
             rel2.to_y: "barend";
             rel2.to_x: "bg";
-            color: 51 153 255 255;
+            color_class: "/fg/normal/progress/bar";
             offscale;
          }
          description { state: "inv" 0.0;
@@ -543,10 +540,9 @@ group { name: "efl/progressbar/vertical";
             fixed: 1 1;
             min: 8 16;
             max: 9999 16;
-            rel1.to: "efl.bar";
-            rel2.to: "efl.bar";
+            rel.to: "efl.bar";
             align: 0.5 0.0;
-            color: 51 153 255 255;
+            color_class: "/fg/normal/progress/pulse";
          }
          description { state: "end" 0.0;
             inherit: "default" 0.0;
@@ -557,8 +553,7 @@ group { name: "efl/progressbar/vertical";
          scale: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
-            rel1.to: "bg";
-            rel2.to: "bg";
+            rel.to: "bg";
             aspect: 1.0 1.0; aspect_preference: NONE;
          }
       }
@@ -566,8 +561,7 @@ group { name: "efl/progressbar/vertical";
          scale: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
-            rel1.to: "statbox";
-            rel2.to: "statbox";
+            rel.to: "statbox";
             rel1.offset: 4 0;
             rel2.offset: -5 -1;
             align: 1.0 0.5;
@@ -580,6 +574,8 @@ group { name: "efl/progressbar/vertical";
             map.smooth: 0;
             map.rotation.center: "efl.bar";
             map.rotation.z: 90;
+            color_class: "/fg/normal/progress/text/status";
+            offscale;
          }
          description { state: "hidden" 0.0;
             inherit: "default" 0.0;
@@ -748,13 +744,12 @@ group { name: "efl/progressbar/horizontal:bare";
          description { state: "default" 0.0;
             min: 10 5;
             max: -1 5;
-            color: DARK_GREY_BG_COLOR;
+            color_class: "/bg/normal/progress/base";
          }
       }
       part { name: "efl.bar"; type: SWALLOW; mouse_events: 0;
          description { state: "default" 0.0;
-            rel1.to: "bg";
-            rel2.to: "bg";
+            rel.to: "bg";
          }
       }
       part { name: "efl.cur.progressbar"; mouse_events: 0; type: SPACER;
@@ -765,8 +760,7 @@ group { name: "efl/progressbar/horizontal:bare";
             fixed: 1 1;
             min: 1 1;
             max: 1 9999;
-            rel1.to: "efl.bar";
-            rel2.to: "efl.bar";
+            rel.to: "efl.bar";
          }
       }
       part { name: "barend"; type: SPACER;
@@ -788,7 +782,7 @@ group { name: "efl/progressbar/horizontal:bare";
             rel1.to: "bg";
             rel2.to_x: "barend";
             rel2.to_y: "bg";
-            color: 51 153 255 255;
+            color_class: "/fg/normal/progress/bar";
          }
          description { state: "inv" 0.0;
             inherit: "default" 0.0;
@@ -803,10 +797,9 @@ group { name: "efl/progressbar/horizontal:bare";
             fixed: 1 1;
             min: 5 5;
             max: 5 9999;
-            rel1.to: "efl.bar";
-            rel2.to: "efl.bar";
+            rel.to: "efl.bar";
             align: 0.0 0.5;
-            color: 51 153 255 255;
+            color_class: "/fg/normal/progress/pulse";
          }
          description { state: "end" 0.0;
             inherit: "default" 0.0;
@@ -871,7 +864,7 @@ group { name: "efl/progressbar/horizontal:hidden_bare";
    parts {
       part { name: "bg";
          description { state: "default" 0.0;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
       }
    }
@@ -914,13 +907,12 @@ group { name: "efl/progressbar/vertical:bare";
          description { state: "default" 0.0;
             min: 5 10;
             max: 5 -1;
-            color: DARK_GREY_BG_COLOR;
+            color_class: "/bg/normal/progress/base";
          }
       }
       part { name: "efl.bar"; type: SWALLOW; mouse_events: 0;
          description { state: "default" 0.0;
-            rel1.to: "bg";
-            rel2.to: "bg";
+            rel.to: "bg";
          }
       }
       part { name: "efl.cur.progressbar"; mouse_events: 0; type: SPACER;
@@ -931,8 +923,7 @@ group { name: "efl/progressbar/vertical:bare";
             fixed: 1 1;
             min: 1 1;
             max: 9999 1;
-            rel1.to: "efl.bar";
-            rel2.to: "efl.bar";
+            rel.to: "efl.bar";
          }
       }
       part { name: "barend"; type: SPACER;
@@ -955,7 +946,7 @@ group { name: "efl/progressbar/vertical:bare";
             rel1.to: "bg";
             rel2.to_y: "barend";
             rel2.to_x: "bg";
-            color: 51 153 255 255;
+            color_class: "/fg/normal/progress/bar";
             offscale;
          }
          description { state: "inv" 0.0;
@@ -974,7 +965,7 @@ group { name: "efl/progressbar/vertical:bare";
             rel1.to: "efl.bar";
             rel2.to: "efl.bar";
             align: 0.5 0.0;
-            color: 51 153 255 255;
+            color_class: "/fg/normal/progress/pulse";
          }
          description { state: "end" 0.0;
             inherit: "default" 0.0;
@@ -1039,7 +1030,7 @@ group { name: "efl/progressbar/vertical:hidden_bare";
    parts {
       part { name: "bg";
          description { state: "default" 0.0;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
       }
    }
@@ -1072,7 +1063,7 @@ group { name: "efl/progressbar/horizontal:hidden_wheel";
       part { name: "base"; type: RECT;
          scale: 1;
          description { state: "default" 0.0;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
             rel1.offset: 4 4;
             rel2.offset: -5 -5;
             min: 40 40;
@@ -1094,11 +1085,11 @@ group { name: "efl/progressbar/horizontal:wheel";
          description { state: "default" 0.0;
             image.normal: "speaker_vol.png";
             rel.to:"base";
-            color: 48 48 48 255;
+            color_class: "/bg/normal/progress/base/wheel";
          }
          description { state: "hidden" 0.0;
             inherit;
-            color: 48 48 48 0;
+            color: 255 255 255 0; // no cc
             visible: 0;
          }
       }
@@ -1146,7 +1137,7 @@ group { name: "efl/progressbar/horizontal:bar";
          scale: 1;
          description { state: "default" 0.0;
             image.normal: "spinner";
-            color: 160 160 160 255;
+            color_class: "/fg/normal/progress/spin";
             rel1.relative: 0.0 0.0;
             rel2.relative: 0.2 1.0;
             rel1.to: "base";
@@ -1166,7 +1157,7 @@ group { name: "efl/progressbar/horizontal:bar";
          scale: 1;
          description { state: "default" 0.0;
             image.normal: "spinner";
-            color: 160 160 160 255;
+            color_class: "/fg/normal/progress/spin";
             rel1.relative: 0.2 0.0;
             rel2.relative: 0.4 1.0;
             rel1.to: "base";
@@ -1186,7 +1177,7 @@ group { name: "efl/progressbar/horizontal:bar";
          scale: 1;
          description { state: "default" 0.0;
             image.normal: "spinner";
-            color: 160 160 160 255;
+            color_class: "/fg/normal/progress/spin";
             rel1.relative: 0.4 0.0;
             rel2.relative: 0.6 1.0;
             rel1.to: "base";
@@ -1206,7 +1197,7 @@ group { name: "efl/progressbar/horizontal:bar";
          scale: 1;
          description { state: "default" 0.0;
             image.normal: "spinner";
-            color: 160 160 160 255;
+            color_class: "/fg/normal/progress/spin";
             rel1.relative: 0.6 0.0;
             rel2.relative: 0.8 1.0;
             rel1.to: "base";
@@ -1226,7 +1217,7 @@ group { name: "efl/progressbar/horizontal:bar";
          scale: 1;
          description { state: "default" 0.0;
             image.normal: "spinner";
-            color: 160 160 160 255;
+            color_class: "/fg/normal/progress/spin";
             rel1.relative: 0.8 0.0;
             rel2.relative: 1.0 1.0;
             rel1.to: "base";
@@ -1245,7 +1236,7 @@ group { name: "efl/progressbar/horizontal:bar";
       part { name: "base"; type: RECT;
          scale: 1;
          description { state: "default" 0.0;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
             rel1.offset: 4 4;
             rel2.offset: -5 -5;
             min: 100 20;
@@ -1470,7 +1461,7 @@ group { name: "efl/progressbar/horizontal:double";
             rel1.to: "bg";
             rel2.to_x: "barend1";
             rel2.to_y: "bg";
-            color: 80 80 80 255;
+            color_class: "/fg/normal/progress/bar1";
             offscale;
          }
          description { state: "inv" 0.0;
@@ -1540,7 +1531,7 @@ group { name: "efl/progressbar/vertical:double";
             rel1.to: "bg";
             rel2.to_y: "barend1";
             rel2.to_x: "bg";
-            color: 80 80 80 255;
+            color_class: "/fg/normal/progress/bar1";
             offscale;
          }
          description { state: "inv" 0.0;

data/elementary/themes/edc/efl/radio.edc

@@ -48,13 +48,13 @@ group { name: "efl/radio";
       }
       rect { "icon_clip";
          desc { "default";
-            color: 255 255 255 255;
+            color: 255 255 255 255; // no cc
          }
          desc { "pressed"; inherit;
-            color: 255 255 255 255;
+            color: 255 255 255 255; // no cc
          }
          desc { "disabled"; inherit;
-            color: 255 255 255 64;
+            color: 255 255 255 64; // no cc
          }
       }
       swallow { "efl.content"; nomouse;
@@ -108,7 +108,7 @@ group { name: "efl/radio";
          desc { "disabled"; inherit;
          }
       }
-      part { name: "ck_check";
+      part { name: "ck_bg";
          scale: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
@@ -116,18 +116,45 @@ group { name: "efl/radio";
             image.normal: "i-radio";
             min: 15 15;
             max: 15 15;
-            color: 0 0 0 64;
+            color_class: "/bg/normal/radio/base";
          }
-         description { state: "pressed" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 255;
+         desc { "disabled"; inherit;
+            color_class: "/bg/disabled/radio/base";
+         }
+      }
+      part { name: "ck_check";
+         scale: 1;
+         description { state: "default" 0.0;
+            color_class: "/fg/selected/radio/radio";
+            fixed: 1 1;
+            rel.to: "base";
+            image.normal: "i-radio";
+            min: 15 15;
+            max: 15 15;
+            visible: 0;
          }
          description { state: "selected" 0.0;
             inherit: "default" 0.0;
-            color: 160 160 160 255;
+            visible: 1;
          }
          desc { "disabled"; inherit;
-            color: 0 0 0 16;
+            visible: 0;
+         }
+      }
+      part { name: "ck_press";
+         scale: 1;
+         description { state: "default" 0.0;
+            color_class: "/fg/pressed/radio/radio";
+            fixed: 1 1;
+            rel.to: "base";
+            image.normal: "i-radio";
+            min: 15 15;
+            max: 15 15;
+            visible: 0;
+         }
+         description { state: "pressed" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
          }
       }
       text { "efl.text"; nomouse;
@@ -135,7 +162,7 @@ group { name: "efl/radio";
          scale: 1;
          desc { "default";
             fixed: 0 1;
-            color: 160 160 160 255;
+            color_class: "/fg/normal/radio/text";
             rel1.offset: 0 4;
             rel1.relative: 1.0 0.0;
             rel1.to_x: "efl.content";
@@ -157,7 +184,7 @@ group { name: "efl/radio";
          }
          desc { "pressed_visible"; inherit;
             fixed: 0 0;
-            color: 255 255 255 255;
+            color_class: "/fg/pressed/radio/text";
             rel1.offset: 4 4;
             text.min: 1 1;
             text.ellipsis: -1;
@@ -171,14 +198,14 @@ group { name: "efl/radio";
          }
          desc { "pressed_textonly"; inherit;
             fixed: 0 0;
-            color: 255 255 255 255;
+            color_class: "/fg/pressed/radio/text";
             text.min: 1 1;
             text.ellipsis: -1;
             visible: 1;
          }
          desc { "disabled_visible"; inherit;
             fixed: 0 0;
-            color: 96 96 96 255;
+            color_class: "/fg/disabled/radio/text";
             rel1.offset: 4 4;
             text.min: 1 1;
             text.ellipsis: -1;
@@ -186,7 +213,7 @@ group { name: "efl/radio";
          }
          desc { "disabled_textonly"; inherit;
             fixed: 0 0;
-            color: 96 96 96 255;
+            color_class: "/fg/disabled/radio/text";
             text.min: 1 1;
             text.ellipsis: -1;
             visible: 1;
@@ -195,7 +222,7 @@ group { name: "efl/radio";
       rect { "event";
          ignore_flags: ON_HOLD;
          desc { "default";
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
          desc { "disabled"; inherit;
             visible: 0;
@@ -239,10 +266,20 @@ group { name: "efl/radio";
       program { signal: "efl,state,disabled"; source: "efl";
          action:  STATE_SET "disabled" 0.0;
          target: "ck_check";
+         target: "ck_bg";
       }
       program { signal: "efl,state,enabled"; source: "efl";
          action:  STATE_SET "default" 0.0;
          target: "ck_check";
+         target: "ck_bg";
+      }
+      program { signal: "mouse,down,1"; source: "event";
+         action: STATE_SET "pressed" 0.0;
+         target: "ck_press";
+      }
+      program { signal: "mouse,up,1"; source: "event";
+         action: STATE_SET "default" 0.0;
+         target: "ck_press";
       }
    }
 }