summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorSimon Lees <simon@simotek.net>2014-03-05 15:55:26 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2014-03-05 16:01:19 +0900
commit5003400f9ecb466aea951aa885f5729e101136df (patch)
tree064a8e2b71706b5c629bff23decd613c3f3df54a /data
parent036cec14548828d28b9f3668ceb08b299ab97e01 (diff)
Enhancement: #define names for text colors
Summary: Previously text colors were specfied in the form color: XXX XXX XXX AAA throughout all the edc files, eg color: 255 255 255 255 this made it imposible to write a script to change text colors with sed as it changed many other parts of the theme as well. Some colors had been defined in fonts.edc and in some places these were used but not many. This change means that all non textblock font colors are defined in fonts.edc and the defined names are used throughout the entire code base. This means that sed only needs to be run on 1 file to change the text color or it is easy to do manually textblock colors were not done for 2 reasons 1. They hadn't been done in the past so there was no standard for me to follow. 2. They are all specified in html notation eg #FFFFFF which means that they can be changed with sed without effecting the rest of the theme. If a standard can be come up with for doing this and people think it is worthwhile i can probably fix them at a later date Reviewers: raster, zmike Reviewed By: raster CC: seoz Differential Revision: https://phab.enlightenment.org/D577 Conflicts: data/themes/edc/battery.edc data/themes/edc/xkbswitch.edc
Diffstat (limited to 'data')
-rw-r--r--data/themes/edc/about-e.edc3
-rw-r--r--data/themes/edc/about-theme.edc14
-rw-r--r--data/themes/edc/appmenu.edc7
-rw-r--r--data/themes/edc/battery.edc10
-rw-r--r--data/themes/edc/border.edc9
-rw-r--r--data/themes/edc/button.edc9
-rw-r--r--data/themes/edc/check.edc9
-rw-r--r--data/themes/edc/clock.edc25
-rw-r--r--data/themes/edc/colors.edc6
-rw-r--r--data/themes/edc/comp.edc3
-rw-r--r--data/themes/edc/desklock.edc12
-rw-r--r--data/themes/edc/deskmirror.edc6
-rw-r--r--data/themes/edc/edgebindings.edc3
-rw-r--r--data/themes/edc/elm/border.edc12
-rw-r--r--data/themes/edc/elm/bubble.edc24
-rw-r--r--data/themes/edc/elm/button.edc36
-rw-r--r--data/themes/edc/elm/calendar.edc3
-rw-r--r--data/themes/edc/elm/check.edc32
-rw-r--r--data/themes/edc/elm/datetime.edc6
-rw-r--r--data/themes/edc/elm/diskselector.edc16
-rw-r--r--data/themes/edc/elm/flipselector.edc12
-rw-r--r--data/themes/edc/elm/frame.edc3
-rw-r--r--data/themes/edc/elm/gengrid.edc30
-rw-r--r--data/themes/edc/elm/genlist.edc186
-rw-r--r--data/themes/edc/elm/layout.edc9
-rw-r--r--data/themes/edc/elm/list.edc20
-rw-r--r--data/themes/edc/elm/map.edc9
-rw-r--r--data/themes/edc/elm/menu.edc14
-rw-r--r--data/themes/edc/elm/multibuttonentry.edc7
-rw-r--r--data/themes/edc/elm/naviframe.edc15
-rw-r--r--data/themes/edc/elm/progress.edc20
-rw-r--r--data/themes/edc/elm/radio.edc6
-rw-r--r--data/themes/edc/elm/segment_control.edc7
-rw-r--r--data/themes/edc/elm/slider.edc30
-rw-r--r--data/themes/edc/elm/toolbar.edc30
-rw-r--r--data/themes/edc/evrything.edc42
-rw-r--r--data/themes/edc/fileman.edc26
-rw-r--r--data/themes/edc/fontpreview.edc3
-rw-r--r--data/themes/edc/frame.edc3
-rw-r--r--data/themes/edc/ibar-ibox.edc13
-rw-r--r--data/themes/edc/ilist.edc16
-rw-r--r--data/themes/edc/init.edc11
-rw-r--r--data/themes/edc/label.edc6
-rw-r--r--data/themes/edc/menu.edc13
-rw-r--r--data/themes/edc/notification.edc3
-rw-r--r--data/themes/edc/packagekit.edc3
-rw-r--r--data/themes/edc/pager.edc6
-rw-r--r--data/themes/edc/pager16.edc6
-rw-r--r--data/themes/edc/radio.edc9
-rw-r--r--data/themes/edc/slider.edc12
-rw-r--r--data/themes/edc/syscon.edc9
-rw-r--r--data/themes/edc/tasks.edc14
-rw-r--r--data/themes/edc/temperature.edc7
-rw-r--r--data/themes/edc/toolbar.edc7
-rw-r--r--data/themes/edc/winlist.edc16
-rw-r--r--data/themes/edc/wizard.edc10
-rw-r--r--data/themes/edc/xkbswitch.edc11
-rw-r--r--data/themes/fonts.edc33
58 files changed, 313 insertions, 609 deletions
diff --git a/data/themes/edc/about-e.edc b/data/themes/edc/about-e.edc
index ef1c14f..5e98f55 100644
--- a/data/themes/edc/about-e.edc
+++ b/data/themes/edc/about-e.edc
@@ -215,8 +215,7 @@ group { name: "e/widgets/about/main";
215 rel1.relative: 0.5 1.0; 215 rel1.relative: 0.5 1.0;
216 rel2.offset: -1 -14; 216 rel2.offset: -1 -14;
217 rel2.relative: 0.5 1.0; 217 rel2.relative: 0.5 1.0;
218 color: 255 255 255 255; 218 color: FN_COL_DEFAULT;
219 color3: 0 0 0 128;
220 color_class: "button_text"; 219 color_class: "button_text";
221 align: 0.5 1.0; 220 align: 0.5 1.0;
222 text { font: FN; size: 10; 221 text { font: FN; size: 10;
diff --git a/data/themes/edc/about-theme.edc b/data/themes/edc/about-theme.edc
index 13fee85..70c0127 100644
--- a/data/themes/edc/about-theme.edc
+++ b/data/themes/edc/about-theme.edc
@@ -27,9 +27,7 @@ group { name: "e/theme/about";
27 scale: 1; 27 scale: 1;
28 description { state: "default" 0.0; 28 description { state: "default" 0.0;
29 fixed: 1 1; 29 fixed: 1 1;
30 color: 51 153 255 255; 30 color: FN_COL_HIGHLIGHT;
31 color2: 51 153 255 24;
32 color3: 51 153 255 18;
33 rel1.relative: 0.5 0.5; 31 rel1.relative: 0.5 0.5;
34 rel2.relative: 0.5 0.5; 32 rel2.relative: 0.5 0.5;
35 text { font: FNBD; size: 64; 33 text { font: FNBD; size: 64;
@@ -44,9 +42,7 @@ group { name: "e/theme/about";
44 scale: 1; 42 scale: 1;
45 description { state: "default" 0.0; 43 description { state: "default" 0.0;
46 fixed: 1 1; 44 fixed: 1 1;
47 color: 51 153 255 255; 45 color: FN_COL_HIGHLIGHT;
48 color2: 51 153 255 24;
49 color3: 51 153 255 18;
50 rel1.relative: 0.5 0.9; 46 rel1.relative: 0.5 0.9;
51 rel1.to: "name"; 47 rel1.to: "name";
52 rel2.relative: 0.5 0.9; 48 rel2.relative: 0.5 0.9;
@@ -100,8 +96,7 @@ group { name: "e/theme/about";
100 rel1.relative: 1.0 1.0; 96 rel1.relative: 1.0 1.0;
101 rel2.offset: -14 -14; 97 rel2.offset: -14 -14;
102 rel2.relative: 1.0 1.0; 98 rel2.relative: 1.0 1.0;
103 color: 255 255 255 255; 99 color: FN_COL_DEFAULT;
104 color3: 0 0 0 128;
105 color_class: "button_text"; 100 color_class: "button_text";
106 align: 1.0 1.0; 101 align: 1.0 1.0;
107 min: 85 0; 102 min: 85 0;
@@ -138,8 +133,7 @@ group { name: "e/theme/about";
138 rel1.relative: 0.0 1.0; 133 rel1.relative: 0.0 1.0;
139 rel2.offset: 13 -14; 134 rel2.offset: 13 -14;
140 rel2.relative: 0.0 1.0; 135 rel2.relative: 0.0 1.0;
141 color: 255 255 255 255; 136 color: FN_COL_DEFAULT;
142 color3: 0 0 0 128;
143 color_class: "button_text"; 137 color_class: "button_text";
144 align: 0.0 1.0; 138 align: 0.0 1.0;
145 min: 85 0; 139 min: 85 0;
diff --git a/data/themes/edc/appmenu.edc b/data/themes/edc/appmenu.edc
index 80cdc8d..37fef87 100644
--- a/data/themes/edc/appmenu.edc
+++ b/data/themes/edc/appmenu.edc
@@ -39,8 +39,7 @@ group { name: "e/modules/appmenu/item";
39 state: "default" 0.0; 39 state: "default" 0.0;
40 rel1.offset: 2 2; 40 rel1.offset: 2 2;
41 rel2.offset: -3 -3; 41 rel2.offset: -3 -3;
42 color: 255 255 255 255; 42 color: FN_COL_DEFAULT;
43 color3: 0 0 0 128;
44 text { 43 text {
45 font: FN; 44 font: FN;
46 size: 10; 45 size: 10;
@@ -52,9 +51,7 @@ group { name: "e/modules/appmenu/item";
52 description { 51 description {
53 state: "selected" 0.0; 52 state: "selected" 0.0;
54 inherit: "default" 0.0; 53 inherit: "default" 0.0;
55 color: 51 153 255 255; 54 color: FN_COL_HIGHLIGHT;
56 color2: 51 153 255 24;
57 color3: 51 153 255 18;
58 } 55 }
59 } 56 }
60 } 57 }
diff --git a/data/themes/edc/battery.edc b/data/themes/edc/battery.edc
index e04514e..f8b164a 100644
--- a/data/themes/edc/battery.edc
+++ b/data/themes/edc/battery.edc
@@ -221,7 +221,7 @@ group { name: "e/modules/battery/main";
221 rel2.to_x: "bg"; 221 rel2.to_x: "bg";
222 rel2.to_y: "pwr"; 222 rel2.to_y: "pwr";
223 rel2.offset: -1 2; 223 rel2.offset: -1 2;
224 color: 255 255 255 255; 224 color: FN_COL_DEFAULT_BASIC;
225 color_class: "module_label"; 225 color_class: "module_label";
226 text { font: "Sans"; size: 8; 226 text { font: "Sans"; size: 8;
227 min: 0 1; 227 min: 0 1;
@@ -240,7 +240,7 @@ group { name: "e/modules/battery/main";
240 rel1.to_y: "pwr"; 240 rel1.to_y: "pwr";
241 rel2.offset: -1 1; 241 rel2.offset: -1 1;
242 rel2.to: "bg"; 242 rel2.to: "bg";
243 color: 255 255 255 255; 243 color: FN_COL_DEFAULT_BASIC;
244 color_class: "module_label"; 244 color_class: "module_label";
245 text { font: "Sans"; size: 8; 245 text { font: "Sans"; size: 8;
246 min: 0 1; 246 min: 0 1;
@@ -322,8 +322,7 @@ group { name: "e/modules/battery/popup";
322 rel1.relative: 1.0 0.0; 322 rel1.relative: 1.0 0.0;
323 rel1.to_x: "e.swallow.battery"; 323 rel1.to_x: "e.swallow.battery";
324 rel2.relative: 1.0 0.5; 324 rel2.relative: 1.0 0.5;
325 color: 255 255 255 255; 325 color: FN_COL_DEFAULT;
326 color3: 0 0 0 128;
327 text { font: "Sans:style=Bold"; size: 10; 326 text { font: "Sans:style=Bold"; size: 10;
328 text: "Your battery is low!"; 327 text: "Your battery is low!";
329 min: 1 1; 328 min: 1 1;
@@ -337,8 +336,7 @@ group { name: "e/modules/battery/popup";
337 description { state: "default" 0.0; 336 description { state: "default" 0.0;
338 rel1.relative: 1.0 0.5; 337 rel1.relative: 1.0 0.5;
339 rel1.to_x: "e.swallow.battery"; 338 rel1.to_x: "e.swallow.battery";
340 color: 255 255 255 255; 339 color: FN_COL_DEFAULT;
341 color3: 0 0 0 128;
342 text { font: "Sans"; size: 10; 340 text { font: "Sans"; size: 10;
343 text: "AC power is recommended."; 341 text: "AC power is recommended.";
344 min: 1 1; 342 min: 1 1;
diff --git a/data/themes/edc/border.edc b/data/themes/edc/border.edc
index fedba2e..f415686 100644
--- a/data/themes/edc/border.edc
+++ b/data/themes/edc/border.edc
@@ -113,8 +113,7 @@ group { name: "e/widgets/border/default/border";
113 rel2.offset: -2 3; 113 rel2.offset: -2 3;
114 rel2.to_x: "e.event.minimize"; 114 rel2.to_x: "e.event.minimize";
115 align: 0.5 0.0; 115 align: 0.5 0.0;
116 color: 21 21 21 255; 116 color: FN_COL_DISABLE;
117 color3: 255 255 255 25;
118 text { font: FNBD; size: 10; 117 text { font: FNBD; size: 10;
119 text_class: "title_bar"; 118 text_class: "title_bar";
120 align: 0.5 0.0; 119 align: 0.5 0.0;
@@ -139,8 +138,7 @@ group { name: "e/widgets/border/default/border";
139 rel2.offset: -1 2; 138 rel2.offset: -1 2;
140 rel2.to_x: "e.event.minimize"; 139 rel2.to_x: "e.event.minimize";
141 align: 0.5 0.0; 140 align: 0.5 0.0;
142 color: 255 255 255 255; 141 color: FN_COL_DEFAULT_SOFT_SHADOW;
143 color3: 0 0 0 18;
144 text { font: FNBD; size: 10; 142 text { font: FNBD; size: 10;
145 text_source: "e.text.title"; 143 text_source: "e.text.title";
146 text_class: "title_bar"; 144 text_class: "title_bar";
@@ -1240,8 +1238,7 @@ group { name: "e/widgets/border/default/move";
1240 rel1.offset: 4 4; 1238 rel1.offset: 4 4;
1241 rel1.relative: 1.0 0.0; 1239 rel1.relative: 1.0 0.0;
1242 rel2.offset: -5 -5; 1240 rel2.offset: -5 -5;
1243 color: 255 255 255 255; 1241 color: FN_COL_DEFAULT;
1244 color3: 0 0 0 128;
1245 color_class: "move_text"; 1242 color_class: "move_text";
1246 text { font: FN; size: 10; 1243 text { font: FN; size: 10;
1247 min: 1 1; 1244 min: 1 1;
diff --git a/data/themes/edc/button.edc b/data/themes/edc/button.edc
index 8369efe..69258c1 100644
--- a/data/themes/edc/button.edc
+++ b/data/themes/edc/button.edc
@@ -67,8 +67,7 @@
67 rel1.to_y: "base"; 67 rel1.to_y: "base";
68 rel2.offset: -7 -7; 68 rel2.offset: -7 -7;
69 rel2.to: "base"; 69 rel2.to: "base";
70 color: 255 255 255 255; 70 color: FN_COL_DEFAULT;
71 color3: 0 0 0 128;
72 color_class: "button_text"; 71 color_class: "button_text";
73 text { font: FN; size: 10; 72 text { font: FN; size: 10;
74 min: 1 1; 73 min: 1 1;
@@ -78,8 +77,7 @@
78 } 77 }
79 description { state: "disabled" 0.0; 78 description { state: "disabled" 0.0;
80 inherit: "default" 0.0; 79 inherit: "default" 0.0;
81 color: 21 21 21 255; 80 color: FN_COL_DISABLE;
82 color3: 255 255 255 25;
83 color_class: "button_text_disabled"; 81 color_class: "button_text_disabled";
84 } 82 }
85 description { state: "combo" 0.0; 83 description { state: "combo" 0.0;
@@ -99,8 +97,7 @@
99 description { state: "default" 0.0; 97 description { state: "default" 0.0;
100 rel1.to: "e.text.label"; 98 rel1.to: "e.text.label";
101 rel2.to: "e.text.label"; 99 rel2.to: "e.text.label";
102 color: 21 21 21 255; 100 color: FN_COL_DISABLE;
103 color3: 255 255 255 25;
104 color_class: "button_text_disabled"; 101 color_class: "button_text_disabled";
105 text { font: FN; size: 10; 102 text { font: FN; size: 10;
106 text_source: "e.text.label"; 103 text_source: "e.text.label";
diff --git a/data/themes/edc/check.edc b/data/themes/edc/check.edc
index 59ab0a0..bdd1b6c 100644
--- a/data/themes/edc/check.edc
+++ b/data/themes/edc/check.edc
@@ -73,8 +73,7 @@ group { name: "e/widgets/check";
73 rel1.to_x: "inset"; 73 rel1.to_x: "inset";
74 rel1.relative: 1.0 0.0; 74 rel1.relative: 1.0 0.0;
75 rel2.offset: -3 -3; 75 rel2.offset: -3 -3;
76 color: 255 255 255 255; 76 color: FN_COL_DEFAULT;
77 color3: 0 0 0 128;
78 color_class: "check_text"; 77 color_class: "check_text";
79 text { font: FN; size: 10; 78 text { font: FN; size: 10;
80 min: 1 1; 79 min: 1 1;
@@ -84,8 +83,7 @@ group { name: "e/widgets/check";
84 } 83 }
85 description { state: "disabled" 0.0; 84 description { state: "disabled" 0.0;
86 inherit: "default" 0.0; 85 inherit: "default" 0.0;
87 color: 21 21 21 255; 86 color: FN_COL_DISABLE;
88 color3: 255 255 255 25;
89 } 87 }
90 } 88 }
91 part { name: "event"; type: RECT; 89 part { name: "event"; type: RECT;
@@ -158,8 +156,7 @@ group { name: "e/widgets/check_icon";
158 } 156 }
159 description { state: "disabled" 0.0; 157 description { state: "disabled" 0.0;
160 inherit: "default" 0.0; 158 inherit: "default" 0.0;
161 color: 21 21 21 255; 159 color: FN_COL_DISABLE;
162 color3: 255 255 255 25;
163 } 160 }
164 } 161 }
165 } 162 }
diff --git a/data/themes/edc/clock.edc b/data/themes/edc/clock.edc
index e0f5b16..22c35b2 100644
--- a/data/themes/edc/clock.edc
+++ b/data/themes/edc/clock.edc
@@ -420,9 +420,7 @@ group { name: "e/modules/clock/digital";
420 rel1.offset: 0 1; 420 rel1.offset: 0 1;
421 rel2.offset: -1 1; 421 rel2.offset: -1 1;
422 align: 0.5 1.0; 422 align: 0.5 1.0;
423 color: 51 153 255 255; 423 color: FN_COL_HIGHLIGHT;
424 color2: 51 153 255 24;
425 color3: 51 153 255 18;
426 text { font: FN; size: 8; 424 text { font: FN; size: 8;
427 text_class: "module_small"; 425 text_class: "module_small";
428 align: 0.5 0.5; 426 align: 0.5 0.5;
@@ -813,8 +811,7 @@ group { name: "e/modules/clock/calendar/dayname";
813 effect: SHADOW BOTTOM; 811 effect: SHADOW BOTTOM;
814 scale: 1; 812 scale: 1;
815 description { state: "default" 0.0; 813 description { state: "default" 0.0;
816 color: 21 21 21 255; 814 color: FN_COL_DISABLE;
817 color3: 255 255 255 25;
818 text { font: FN; size: 8; 815 text { font: FN; size: 8;
819 text: "WWe"; 816 text: "WWe";
820 min: 1 1; 817 min: 1 1;
@@ -875,8 +872,7 @@ group { name: "e/modules/clock/calendar/day";
875 effect: SHADOW BOTTOM; 872 effect: SHADOW BOTTOM;
876 scale: 1; 873 scale: 1;
877 description { state: "default" 0.0; 874 description { state: "default" 0.0;
878 color: 255 255 255 255; 875 color: FN_COL_DEFAULT;
879 color3: 0 0 0 128;
880 text { font: FN; size: 10; 876 text { font: FN; size: 10;
881 text: "00"; 877 text: "00";
882 min: 1 1; 878 min: 1 1;
@@ -889,12 +885,11 @@ group { name: "e/modules/clock/calendar/day";
889 } 885 }
890 description { state: "weekend" 0.0; 886 description { state: "weekend" 0.0;
891 inherit: "default" 0.0; 887 inherit: "default" 0.0;
892 color: 128 128 128 255; 888 color: FN_COL_MID_GREY;
893 } 889 }
894 description { state: "hidden" 0.0; 890 description { state: "hidden" 0.0;
895 inherit: "default" 0.0; 891 inherit: "default" 0.0;
896 color: 21 21 21 255; 892 color: FN_COL_DISABLE;
897 color3: 255 255 255 25;
898 } 893 }
899 } 894 }
900 part { name: "label2"; type: TEXT; mouse_events: 0; 895 part { name: "label2"; type: TEXT; mouse_events: 0;
@@ -905,9 +900,7 @@ group { name: "e/modules/clock/calendar/day";
905 rel1.to: "e.text.label"; 900 rel1.to: "e.text.label";
906 rel2.offset: 2 1; 901 rel2.offset: 2 1;
907 rel2.to: "e.text.label"; 902 rel2.to: "e.text.label";
908 color: 51 153 255 255; 903 color: FN_COL_HIGHLIGHT;
909 color2: 51 153 255 24;
910 color3: 51 153 255 18;
911 text { font: FN; size: 10; 904 text { font: FN; size: 10;
912 text_source: "e.text.label"; 905 text_source: "e.text.label";
913 min: 1 1; 906 min: 1 1;
@@ -992,8 +985,7 @@ group { name: "e/modules/clock/calendar";
992 rel1.to_x: "prev"; 985 rel1.to_x: "prev";
993 rel1.relative: 1.0 0.0; 986 rel1.relative: 1.0 0.0;
994 rel2.relative: 1.0 0.0; 987 rel2.relative: 1.0 0.0;
995 color: 255 255 255 255; 988 color: FN_COL_DEFAULT;
996 color3: 0 0 0 128;
997 text { font: FNBD; size: 10; 989 text { font: FNBD; size: 10;
998 text: "000000000000"; 990 text: "000000000000";
999 align: 0.0 0.5; 991 align: 0.0 0.5;
@@ -1011,8 +1003,7 @@ group { name: "e/modules/clock/calendar";
1011 rel1.relative: 0.0 0.0; 1003 rel1.relative: 0.0 0.0;
1012 rel2.to_x: "next"; 1004 rel2.to_x: "next";
1013 rel2.relative: 0.0 0.0; 1005 rel2.relative: 0.0 0.0;
1014 color: 255 255 255 255; 1006 color: FN_COL_DEFAULT;
1015 color3: 0 0 0 128;
1016 text { font: FNBD; size: 10; 1007 text { font: FNBD; size: 10;
1017 text: "0000"; 1008 text: "0000";
1018 align: 1.0 0.5; 1009 align: 1.0 0.5;
diff --git a/data/themes/edc/colors.edc b/data/themes/edc/colors.edc
index d980a67..47b5162 100644
--- a/data/themes/edc/colors.edc
+++ b/data/themes/edc/colors.edc
@@ -57,7 +57,7 @@ group { name: "e/modules/conf_colors/preview/text";
57 parts { 57 parts {
58 part { name: "shadow"; type: TEXT; mouse_events: 0; 58 part { name: "shadow"; type: TEXT; mouse_events: 0;
59 description { state: "default" 0.0; 59 description { state: "default" 0.0;
60 color: 255 255 255 32; 60 color: FN_COL_SHADOW;
61 text { font: FN; size: 10; 61 text { font: FN; size: 10;
62 text: "Text"; 62 text: "Text";
63 min: 1 1; 63 min: 1 1;
@@ -67,9 +67,7 @@ group { name: "e/modules/conf_colors/preview/text";
67 part { name: "e.text"; type: TEXT; mouse_events: 0; 67 part { name: "e.text"; type: TEXT; mouse_events: 0;
68 effect: OUTLINE_SHADOW; 68 effect: OUTLINE_SHADOW;
69 description { state: "default" 0.0; 69 description { state: "default" 0.0;
70 color: 255 255 255 255; 70 color: FN_COL_OUTLINE_SHADOW;
71 color2: 255 255 255 255;
72 color3: 255 255 255 255;
73 color_class: "color_preview"; 71 color_class: "color_preview";
74 text { font: FNBD; size: 16; 72 text { font: FNBD; size: 16;
75 text: "Ab"; 73 text: "Ab";
diff --git a/data/themes/edc/comp.edc b/data/themes/edc/comp.edc
index 23bb0f5..796f0be 100644
--- a/data/themes/edc/comp.edc
+++ b/data/themes/edc/comp.edc
@@ -8,8 +8,7 @@ group { name: "e/comp/preview";
8 scale: 1; 8 scale: 1;
9 effect: SHADOW BOTTOM; 9 effect: SHADOW BOTTOM;
10 description { state: "default" 0.0; 10 description { state: "default" 0.0;
11 color: 255 255 255 255; 11 color: FN_COL_DEFAULT;
12 color3: 0 0 0 128;
13 text { font: FNBD; size: 10; 12 text { font: FNBD; size: 10;
14 text_class: "fileman_icon"; 13 text_class: "fileman_icon";
15 align: 0.5 0.5; 14 align: 0.5 0.5;
diff --git a/data/themes/edc/desklock.edc b/data/themes/edc/desklock.edc
index 687a2b4..1b52148 100644
--- a/data/themes/edc/desklock.edc
+++ b/data/themes/edc/desklock.edc
@@ -85,8 +85,7 @@ group { name: "e/desklock/login_box";
85 rel2.relative: 1.0 1.0; 85 rel2.relative: 1.0 1.0;
86 rel2.offset: -4 3; 86 rel2.offset: -4 3;
87 rel2.to_y: "logo"; 87 rel2.to_y: "logo";
88 color: 255 255 255 255; 88 color: FN_COL_DEFAULT;
89 color3: 0 0 0 128;
90 align: 0.5 0.0; 89 align: 0.5 0.0;
91 text { font: FNBD; size: 10; 90 text { font: FNBD; size: 10;
92 min: 0 1; 91 min: 0 1;
@@ -121,8 +120,7 @@ group { name: "e/desklock/login_box";
121 rel2.offset: 3 10; 120 rel2.offset: 3 10;
122 rel2.to_x: "inset"; 121 rel2.to_x: "inset";
123 rel2.to_y: "e.text.title"; 122 rel2.to_y: "e.text.title";
124 color: 255 255 255 255; 123 color: FN_COL_DEFAULT;
125 color3: 0 0 0 128;
126 color_class: "desklock_passwd"; 124 color_class: "desklock_passwd";
127 align: 0.0 0.0; 125 align: 0.0 0.0;
128 text { font: FN; size: 10; 126 text { font: FN; size: 10;
@@ -326,8 +324,7 @@ group { name: "e/desklock/pin_box";
326 rel1.relative: 0.0 1.0; 324 rel1.relative: 0.0 1.0;
327 rel1.to_y: "e.swallow.buttons"; 325 rel1.to_y: "e.swallow.buttons";
328 rel2.offset: -4 -3; 326 rel2.offset: -4 -3;
329 color: 255 255 255 255; 327 color: FN_COL_DEFAULT;
330 color3: 0 0 0 128;
331 align: 0.5 0.0; 328 align: 0.5 0.0;
332 text { font: "Sans:style=Bold"; size: 10; 329 text { font: "Sans:style=Bold"; size: 10;
333 min: 0 1; 330 min: 0 1;
@@ -358,8 +355,7 @@ group { name: "e/desklock/pin_box";
358 rel1.offset: 3 2; 355 rel1.offset: 3 2;
359 rel2.relative: 0.5 0.0; 356 rel2.relative: 0.5 0.0;
360 rel2.offset: 3 -2; 357 rel2.offset: 3 -2;
361 color: 255 255 255 255; 358 color: FN_COL_DEFAULT;
362 color3: 0 0 0 128;
363 color_class: "desklock_passwd"; 359 color_class: "desklock_passwd";
364 text { font: "Sans"; size: 10; 360 text { font: "Sans"; size: 10;
365 min: 1 1; 361 min: 1 1;
diff --git a/data/themes/edc/deskmirror.edc b/data/themes/edc/deskmirror.edc
index d46402c..ec96663 100644
--- a/data/themes/edc/deskmirror.edc
+++ b/data/themes/edc/deskmirror.edc
@@ -106,8 +106,7 @@ group { name: "e/deskmirror/frame/default";
106 rel2.offset: -2 3; 106 rel2.offset: -2 3;
107 rel2.to: "spacer"; 107 rel2.to: "spacer";
108 align: 0.5 0.0; 108 align: 0.5 0.0;
109 color: 21 21 21 255; 109 color: FN_COL_DISABLE;
110 color3: 255 255 255 25;
111 text { font: FNBD; size: 10; 110 text { font: FNBD; size: 10;
112 text_class: "title_bar"; 111 text_class: "title_bar";
113 align: 0.5 0.0; 112 align: 0.5 0.0;
@@ -128,8 +127,7 @@ group { name: "e/deskmirror/frame/default";
128 rel2.offset: -1 2; 127 rel2.offset: -1 2;
129 rel2.to: "spacer"; 128 rel2.to: "spacer";
130 align: 0.5 0.0; 129 align: 0.5 0.0;
131 color: 255 255 255 255; 130 color: FN_COL_DEFAULT_SOFT_SHADOW;
132 color3: 0 0 0 18;
133 text { font: FNBD; size: 10; 131 text { font: FNBD; size: 10;
134 text_source: "e.text.title"; 132 text_source: "e.text.title";
135 text_class: "title_bar"; 133 text_class: "title_bar";
diff --git a/data/themes/edc/edgebindings.edc b/data/themes/edc/edgebindings.edc
index 1a6b8c0..33228db 100644
--- a/data/themes/edc/edgebindings.edc
+++ b/data/themes/edc/edgebindings.edc
@@ -62,8 +62,7 @@ group { name: "e/modules/conf_edgebindings/selection";
62 rel1.to: "e.swallow.background"; 62 rel1.to: "e.swallow.background";
63 rel2.relative: 0.5 0.5; 63 rel2.relative: 0.5 0.5;
64 rel2.to: "e.swallow.background"; 64 rel2.to: "e.swallow.background";
65 color: 255 255 255 255; 65 color: FN_COL_DEFAULT;
66 color3: 0 0 0 128;
67 color_class: "label_text"; 66 color_class: "label_text";
68 fixed: 1 1; 67 fixed: 1 1;
69 text { font: FN; size: 10; 68 text { font: FN; size: 10;
diff --git a/data/themes/edc/elm/border.edc b/data/themes/edc/elm/border.edc
index 7af91f7..81e5d2b 100644
--- a/data/themes/edc/elm/border.edc
+++ b/data/themes/edc/elm/border.edc
@@ -114,8 +114,7 @@ group { name: "elm/ews/decoration/default";
114 rel2.offset: -2 -3; 114 rel2.offset: -2 -3;
115 rel2.to_x: "e.event.minimize"; 115 rel2.to_x: "e.event.minimize";
116 align: 0.5 1.0; 116 align: 0.5 1.0;
117 color: 21 21 21 255; 117 color: FN_COL_DISABLE;
118 color3: 255 255 255 25;
119 text { font: FNBD; size: 10; 118 text { font: FNBD; size: 10;
120 text_class: "title_bar"; 119 text_class: "title_bar";
121 align: 0.5 0.0; 120 align: 0.5 0.0;
@@ -140,8 +139,7 @@ group { name: "elm/ews/decoration/default";
140 rel2.offset: -1 2; 139 rel2.offset: -1 2;
141 rel2.to_x: "e.event.minimize"; 140 rel2.to_x: "e.event.minimize";
142 align: 0.5 1.0; 141 align: 0.5 1.0;
143 color: 255 255 255 255; 142 color: FN_COL_DEFAULT_SOFT_SHADOW;
144 color3: 0 0 0 18;
145 text { font: FNBD; size: 10; 143 text { font: FNBD; size: 10;
146 text_source: "elm.text.title"; 144 text_source: "elm.text.title";
147 text_class: "title_bar"; 145 text_class: "title_bar";
@@ -929,8 +927,7 @@ group { name: "elm/border/base/default";
929 rel2.to_x: "e.event.minimize"; 927 rel2.to_x: "e.event.minimize";
930 rel2.to_y: "frame"; 928 rel2.to_y: "frame";
931 align: 0.5 0.0; 929 align: 0.5 0.0;
932 color: 21 21 21 255; 930 color: FN_COL_DISABLE;
933 color3: 255 255 255 25;
934 text { font: FNBD; size: 10; 931 text { font: FNBD; size: 10;
935 text_class: "title_bar"; 932 text_class: "title_bar";
936 align: 0.5 0.0; 933 align: 0.5 0.0;
@@ -957,8 +954,7 @@ group { name: "elm/border/base/default";
957 rel2.to_x: "e.event.minimize"; 954 rel2.to_x: "e.event.minimize";
958 rel2.to_y: "frame"; 955 rel2.to_y: "frame";
959 align: 0.5 0.0; 956 align: 0.5 0.0;
960 color: 255 255 255 255; 957 color: FN_COL_DEFAULT_SOFT_SHADOW;
961 color3: 0 0 0 18;
962 text { font: FNBD; size: 10; 958 text { font: FNBD; size: 10;
963 text_source: "elm.text.title"; 959 text_source: "elm.text.title";
964 text_class: "title_bar"; 960 text_class: "title_bar";
diff --git a/data/themes/edc/elm/bubble.edc b/data/themes/edc/elm/bubble.edc
index 379b661..79a09b7 100644
--- a/data/themes/edc/elm/bubble.edc
+++ b/data/themes/edc/elm/bubble.edc
@@ -64,8 +64,7 @@ group { name: "elm/bubble/top_left/default";
64 relative: 0.0 0.0; 64 relative: 0.0 0.0;
65 offset: -3 2; 65 offset: -3 2;
66 } 66 }
67 color: 255 255 255 255; 67 color: FN_COL_DEFAULT;
68 color3: 0 0 0 128;
69 color_class: "bubble_text"; 68 color_class: "bubble_text";
70 text { font: FNBD; size: 10; 69 text { font: FNBD; size: 10;
71 min: 0 1; 70 min: 0 1;
@@ -85,8 +84,7 @@ group { name: "elm/bubble/top_left/default";
85 rel1.offset: -3 2; 84 rel1.offset: -3 2;
86 rel2.relative: 1.0 0.0; 85 rel2.relative: 1.0 0.0;
87 rel2.offset: -3 2; 86 rel2.offset: -3 2;
88 color: 21 21 21 255; 87 color: FN_COL_DISABLE;
89 color3: 255 255 255 25;
90 color_class: "bubble_info"; 88 color_class: "bubble_info";
91 text { font: FNBD; size: 10; 89 text { font: FNBD; size: 10;
92 min: 1 1; 90 min: 1 1;
@@ -249,8 +247,7 @@ group { name: "elm/bubble/top_right/default";
249 relative: 0.0 0.0; 247 relative: 0.0 0.0;
250 offset: -3 2; 248 offset: -3 2;
251 } 249 }
252 color: 255 255 255 255; 250 color: FN_COL_DEFAULT;
253 color3: 0 0 0 128;
254 color_class: "bubble_text"; 251 color_class: "bubble_text";
255 text { font: FNBD; size: 10; 252 text { font: FNBD; size: 10;
256 min: 0 1; 253 min: 0 1;
@@ -271,8 +268,7 @@ group { name: "elm/bubble/top_right/default";
271 rel2.to_x: "elm.swallow.icon"; 268 rel2.to_x: "elm.swallow.icon";
272 rel2.relative: 0.0 0.0; 269 rel2.relative: 0.0 0.0;
273 rel2.offset: -3 2; 270 rel2.offset: -3 2;
274 color: 21 21 21 255; 271 color: FN_COL_DISABLE;
275 color3: 255 255 255 25;
276 color_class: "bubble_info"; 272 color_class: "bubble_info";
277 text { font: FNBD; size: 10; 273 text { font: FNBD; size: 10;
278 min: 1 1; 274 min: 1 1;
@@ -440,8 +436,7 @@ group { name: "elm/bubble/bottom_left/default";
440 relative: 0.0 1.0; 436 relative: 0.0 1.0;
441 offset: -3 -3; 437 offset: -3 -3;
442 } 438 }
443 color: 255 255 255 255; 439 color: FN_COL_DEFAULT;
444 color3: 0 0 0 128;
445 color_class: "bubble_text"; 440 color_class: "bubble_text";
446 text { font: FNBD; size: 10; 441 text { font: FNBD; size: 10;
447 min: 0 1; 442 min: 0 1;
@@ -461,8 +456,7 @@ group { name: "elm/bubble/bottom_left/default";
461 rel1.offset: -3 -3; 456 rel1.offset: -3 -3;
462 rel2.relative: 1.0 1.0; 457 rel2.relative: 1.0 1.0;
463 rel2.offset: -3 -3; 458 rel2.offset: -3 -3;
464 color: 21 21 21 255; 459 color: FN_COL_DISABLE;
465 color3: 255 255 255 25;
466 color_class: "bubble_info"; 460 color_class: "bubble_info";
467 text { font: FNBD; size: 10; 461 text { font: FNBD; size: 10;
468 min: 1 1; 462 min: 1 1;
@@ -621,8 +615,7 @@ group { name: "elm/bubble/bottom_right/default";
621 relative: 0.0 1.0; 615 relative: 0.0 1.0;
622 offset: -3 -3; 616 offset: -3 -3;
623 } 617 }
624 color: 255 255 255 255; 618 color: FN_COL_DEFAULT;
625 color3: 0 0 0 128;
626 color_class: "bubble_text"; 619 color_class: "bubble_text";
627 text { font: FNBD; size: 10; 620 text { font: FNBD; size: 10;
628 min: 0 1; 621 min: 0 1;
@@ -643,8 +636,7 @@ group { name: "elm/bubble/bottom_right/default";
643 rel2.to_x: "elm.swallow.icon"; 636 rel2.to_x: "elm.swallow.icon";
644 rel2.relative: 0.0 1.0; 637 rel2.relative: 0.0 1.0;
645 rel2.offset: -3 -3; 638 rel2.offset: -3 -3;
646 color: 21 21 21 255; 639 color: FN_COL_DISABLE;
647 color3: 255 255 255 25;
648 color_class: "bubble_info"; 640 color_class: "bubble_info";
649 text { font: FNBD; size: 10; 641 text { font: FNBD; size: 10;
650 min: 1 1; 642 min: 1 1;
diff --git a/data/themes/edc/elm/button.edc b/data/themes/edc/elm/button.edc
index f3852b7..e665457 100644
--- a/data/themes/edc/elm/button.edc
+++ b/data/themes/edc/elm/button.edc
@@ -153,8 +153,7 @@ group { name: "elm/button/base/default";
153 rel1.to_y: "base"; 153 rel1.to_y: "base";
154 rel2.offset: -7 -7; 154 rel2.offset: -7 -7;
155 rel2.to: "base"; 155 rel2.to: "base";
156 color: 255 255 255 255; 156 color: FN_COL_DEFAULT;
157 color3: 0 0 0 128;
158 color_class: "button_text"; 157 color_class: "button_text";
159 text { font: FN; size: 10; 158 text { font: FN; size: 10;
160 align: 0.5 0.5; 159 align: 0.5 0.5;
@@ -177,16 +176,14 @@ group { name: "elm/button/base/default";
177 description { state: "disabled_visible" 0.0; 176 description { state: "disabled_visible" 0.0;
178 inherit: "default" 0.0; 177 inherit: "default" 0.0;
179 rel1.offset: 2 5; 178 rel1.offset: 2 5;
180 color: 21 21 21 255; 179 color: FN_COL_DISABLE;
181 color3: 255 255 255 25;
182 color_class: "button_text_disabled"; 180 color_class: "button_text_disabled";
183 text.min: 1 1; 181 text.min: 1 1;
184 visible: 1; 182 visible: 1;
185 } 183 }
186 description { state: "disabled_textonly" 0.0; 184 description { state: "disabled_textonly" 0.0;
187 inherit: "default" 0.0; 185 inherit: "default" 0.0;
188 color: 21 21 21 255; 186 color: FN_COL_DISABLE;
189 color3: 255 255 255 25;
190 color_class: "button_text_disabled"; 187 color_class: "button_text_disabled";
191 text.min: 1 1; 188 text.min: 1 1;
192 visible: 1; 189 visible: 1;
@@ -441,9 +438,7 @@ group { name: "elm/button/base/anchor";
441 rel1.to_y: "base"; 438 rel1.to_y: "base";
442 rel2.offset: -1 -1; 439 rel2.offset: -1 -1;
443 rel2.to: "base"; 440 rel2.to: "base";
444 color: 51 153 255 255; 441 color: FN_COL_HIGHLIGHT;
445 color2: 51 153 255 24;
446 color3: 51 153 255 18;
447 color_class: "button_text_anchor"; 442 color_class: "button_text_anchor";
448 text { font: FN; size: 10; 443 text { font: FN; size: 10;
449 align: 0.5 0.5; 444 align: 0.5 0.5;
@@ -490,9 +485,7 @@ group { name: "elm/button/base/anchor";
490 fixed: 1 1; 485 fixed: 1 1;
491 rel1.to: "elm.text"; 486 rel1.to: "elm.text";
492 rel2.to: "elm.text"; 487 rel2.to: "elm.text";
493 color: 255 255 255 255; 488 color: FN_COL_HIGHLIGHT_CLICKED;
494 color2: 51 153 255 64;
495 color3: 51 153 255 32;
496 color_class: "button_text_anchor"; 489 color_class: "button_text_anchor";
497 text { font: FN; size: 10; 490 text { font: FN; size: 10;
498 text_source: "elm.text"; 491 text_source: "elm.text";
@@ -822,16 +815,14 @@ group { name: "elm/button/base/hoversel_vertical/default";
822 description { state: "disabled_visible" 0.0; 815 description { state: "disabled_visible" 0.0;
823 inherit: "default" 0.0; 816 inherit: "default" 0.0;
824 rel1.offset: 2 5; 817 rel1.offset: 2 5;
825 color: 21 21 21 255; 818 color: FN_COL_DISABLE;
826 color3: 255 255 255 25;
827 color_class: "hoversel_text_disabled"; 819 color_class: "hoversel_text_disabled";
828 text.min: 1 1; 820 text.min: 1 1;
829 visible: 1; 821 visible: 1;
830 } 822 }
831 description { state: "disabled_textonly" 0.0; 823 description { state: "disabled_textonly" 0.0;
832 inherit: "default" 0.0; 824 inherit: "default" 0.0;
833 color: 21 21 21 255; 825 color: FN_COL_DISABLE;
834 color3: 255 255 255 25;
835 color_class: "hoversel_text_disabled"; 826 color_class: "hoversel_text_disabled";
836 text.min: 1 1; 827 text.min: 1 1;
837 visible: 1; 828 visible: 1;
@@ -1055,8 +1046,7 @@ group { name: "elm/button/base/hoversel_vertical_entry/default";
1055 rel1.to_y: "base"; 1046 rel1.to_y: "base";
1056 rel2.offset: -7 -7; 1047 rel2.offset: -7 -7;
1057 rel2.to: "base"; 1048 rel2.to: "base";
1058 color: 255 255 255 255; 1049 color: FN_COL_DEFAULT;
1059 color3: 0 0 0 128;
1060 color_class: "button_text"; 1050 color_class: "button_text";
1061 text { font: FN; size: 10; 1051 text { font: FN; size: 10;
1062 align: 0.0 0.5; 1052 align: 0.0 0.5;
@@ -1079,16 +1069,14 @@ group { name: "elm/button/base/hoversel_vertical_entry/default";
1079 description { state: "disabled_visible" 0.0; 1069 description { state: "disabled_visible" 0.0;
1080 inherit: "default" 0.0; 1070 inherit: "default" 0.0;
1081 rel1.offset: 2 5; 1071 rel1.offset: 2 5;
1082 color: 21 21 21 255; 1072 color: FN_COL_DISABLE;
1083 color3: 255 255 255 25;
1084 color_class: "button_text_disabled"; 1073 color_class: "button_text_disabled";
1085 text.min: 1 1; 1074 text.min: 1 1;
1086 visible: 1; 1075 visible: 1;
1087 } 1076 }
1088 description { state: "disabled_textonly" 0.0; 1077 description { state: "disabled_textonly" 0.0;
1089 inherit: "default" 0.0; 1078 inherit: "default" 0.0;
1090 color: 21 21 21 255; 1079 color: FN_COL_DISABLE;
1091 color3: 255 255 255 25;
1092 color_class: "button_text_disabled"; 1080 color_class: "button_text_disabled";
1093 text.min: 1 1; 1081 text.min: 1 1;
1094 visible: 1; 1082 visible: 1;
@@ -1103,9 +1091,7 @@ group { name: "elm/button/base/hoversel_vertical_entry/default";
1103 rel1.to: "elm.text"; 1091 rel1.to: "elm.text";
1104 rel2.offset: 2 1; 1092 rel2.offset: 2 1;
1105 rel2.to: "elm.text"; 1093 rel2.to: "elm.text";
1106 color: 51 153 255 255; 1094 color: FN_COL_HIGHLIGHT;
1107 color2: 51 153 255 24;
1108 color3: 51 153 255 18;
1109 color_class: "hoversel_item_active"; 1095 color_class: "hoversel_item_active";
1110 text { font: FN; size: 10; 1096 text { font: FN; size: 10;
1111 text_source: "elm.text"; 1097 text_source: "elm.text";
diff --git a/data/themes/edc/elm/calendar.edc b/data/themes/edc/elm/calendar.edc
index ecced35..477a46e 100644
--- a/data/themes/edc/elm/calendar.edc
+++ b/data/themes/edc/elm/calendar.edc
@@ -195,8 +195,7 @@
195 description { state: "default" 0.0; \ 195 description { state: "default" 0.0; \
196 rel1.to: "ch_"#_pos".base"; \ 196 rel1.to: "ch_"#_pos".base"; \
197 rel2.to: "ch_"#_pos".base"; \ 197 rel2.to: "ch_"#_pos".base"; \
198 color: 21 21 21 255;\ 198 color: FN_COL_DISABLE;\
199 color3: 255 255 255 25;\
200 text { font: FN; size: 8; \ 199 text { font: FN; size: 8; \
201 min: 1 1; \ 200 min: 1 1; \
202 } \ 201 } \
diff --git a/data/themes/edc/elm/check.edc b/data/themes/edc/elm/check.edc
index af03b2e..2a6ad62 100644
--- a/data/themes/edc/elm/check.edc
+++ b/data/themes/edc/elm/check.edc
@@ -195,8 +195,7 @@ group { name: "elm/check/base/default";
195 rel1.to_x: "elm.swallow.content"; 195 rel1.to_x: "elm.swallow.content";
196 rel1.relative: 1.0 0.0; 196 rel1.relative: 1.0 0.0;
197 rel2.offset: -3 -3; 197 rel2.offset: -3 -3;
198 color: 255 255 255 255; 198 color: FN_COL_DEFAULT;
199 color3: 0 0 0 128;
200 color_class: "check_text"; 199 color_class: "check_text";
201 text { font: FN; size: 10; 200 text { font: FN; size: 10;
202 min: 0 0; 201 min: 0 0;
@@ -206,8 +205,7 @@ group { name: "elm/check/base/default";
206 } 205 }
207 description { state: "disabled" 0.0; 206 description { state: "disabled" 0.0;
208 inherit: "default" 0.0; 207 inherit: "default" 0.0;
209 color: 21 21 21 255; 208 color: FN_COL_DISABLE;
210 color3: 255 255 255 25;
211 } 209 }
212 description { state: "visible" 0.0; 210 description { state: "visible" 0.0;
213 inherit: "default" 0.0; 211 inherit: "default" 0.0;
@@ -216,8 +214,7 @@ group { name: "elm/check/base/default";
216 } 214 }
217 description { state: "disabled_visible" 0.0; 215 description { state: "disabled_visible" 0.0;
218 inherit: "default" 0.0; 216 inherit: "default" 0.0;
219 color: 21 21 21 255; 217 color: FN_COL_DISABLE;
220 color3: 255 255 255 25;
221 visible: 1; 218 visible: 1;
222 text.min: 1 1; 219 text.min: 1 1;
223 } 220 }
@@ -457,8 +454,7 @@ group { name: "elm/check/base/toggle";
457 rel1.to: "button"; 454 rel1.to: "button";
458 rel1.relative: 1.0 0.0; 455 rel1.relative: 1.0 0.0;
459 rel2.to: "offrect"; 456 rel2.to: "offrect";
460 color: 255 255 255 255; 457 color: FN_COL_DEFAULT;
461 color3: 0 0 0 128;
462 color_class: "check_off_text"; 458 color_class: "check_off_text";
463 text { font: FN; size: 10; 459 text { font: FN; size: 10;
464 min: 0 1; 460 min: 0 1;
@@ -469,8 +465,7 @@ group { name: "elm/check/base/toggle";
469 } 465 }
470 description { state: "disabled" 0.0; 466 description { state: "disabled" 0.0;
471 inherit: "default" 0.0; 467 inherit: "default" 0.0;
472 color: 21 21 21 255; 468 color: FN_COL_DISABLE;
473 color3: 255 255 255 25;
474 } 469 }
475 } 470 }
476 part { name: "elm.ontext"; type: TEXT; mouse_events: 0; 471 part { name: "elm.ontext"; type: TEXT; mouse_events: 0;
@@ -484,9 +479,7 @@ group { name: "elm/check/base/toggle";
484 rel2.to: "button"; 479 rel2.to: "button";
485 rel2.relative: 0.0 1.0; 480 rel2.relative: 0.0 1.0;
486 rel2.offset: -1 -2; 481 rel2.offset: -1 -2;
487 color: 51 153 255 255; 482 color: FN_COL_HIGHLIGHT;
488 color2: 51 153 255 24;
489 color3: 51 153 255 18;
490 color_class: "check_on_text"; 483 color_class: "check_on_text";
491 text { font: FN; size: 10; 484 text { font: FN; size: 10;
492 min: 0 1; 485 min: 0 1;
@@ -497,9 +490,7 @@ group { name: "elm/check/base/toggle";
497 } 490 }
498 description { state: "disabled" 0.0; 491 description { state: "disabled" 0.0;
499 inherit: "default" 0.0; 492 inherit: "default" 0.0;
500 color: 51 153 255 64; 493 color: FN_COL_HIGHLIGHT_DISABLE;
501 color2: 51 153 255 16;
502 color3: 51 153 255 8;
503 } 494 }
504 } 495 }
505 part { name: "shadow"; mouse_events: 0; 496 part { name: "shadow"; mouse_events: 0;
@@ -676,8 +667,7 @@ group { name: "elm/check/base/toggle";
676 rel2.to_x: "tog"; 667 rel2.to_x: "tog";
677 rel2.relative: 0.0 1.0; 668 rel2.relative: 0.0 1.0;
678 rel2.offset: -5 -3; 669 rel2.offset: -5 -3;
679 color: 255 255 255 255; 670 color: FN_COL_DEFAULT;
680 color3: 0 0 0 128;
681 color_class: "check_text"; 671 color_class: "check_text";
682 text { font: FN; size: 10; 672 text { font: FN; size: 10;
683 min: 0 0; 673 min: 0 0;
@@ -687,8 +677,7 @@ group { name: "elm/check/base/toggle";
687 } 677 }
688 description { state: "disabled" 0.0; 678 description { state: "disabled" 0.0;
689 inherit: "default" 0.0; 679 inherit: "default" 0.0;
690 color: 21 21 21 255; 680 color: FN_COL_DISABLE;
691 color3: 255 255 255 25;
692 } 681 }
693 description { state: "visible" 0.0; 682 description { state: "visible" 0.0;
694 inherit: "default" 0.0; 683 inherit: "default" 0.0;
@@ -697,8 +686,7 @@ group { name: "elm/check/base/toggle";
697 } 686 }
698 description { state: "disabled_visible" 0.0; 687 description { state: "disabled_visible" 0.0;
699 inherit: "default" 0.0; 688 inherit: "default" 0.0;
700 color: 21 21 21 255; 689 color: FN_COL_DISABLE;
701 color3: 255 255 255 25;
702 visible: 1; 690 visible: 1;
703 text.min: 1 1; 691 text.min: 1 1;
704 } 692 }
diff --git a/data/themes/edc/elm/datetime.edc b/data/themes/edc/elm/datetime.edc
index d405cc9..16b5d59 100644
--- a/data/themes/edc/elm/datetime.edc
+++ b/data/themes/edc/elm/datetime.edc
@@ -49,8 +49,7 @@
49 relative: 1.0 1.0; \ 49 relative: 1.0 1.0; \
50 to: "field"#_after; \ 50 to: "field"#_after; \
51 } \ 51 } \
52 color: 255 255 255 255; \ 52 color: FN_COL_DEFAULT; \
53 color3: 0 0 0 128; \
54 color_class: "datetime_text"; \ 53 color_class: "datetime_text"; \
55 text { \ 54 text { \
56 font: "Sans"; size: 10; \ 55 font: "Sans"; size: 10; \
@@ -74,8 +73,7 @@
74 visible: 0; \ 73 visible: 0; \
75 rel1.to: "separator"#_pos; \ 74 rel1.to: "separator"#_pos; \
76 rel2.to: "separator"#_pos; \ 75 rel2.to: "separator"#_pos; \
77 color: 21 21 21 255; \ 76 color: FN_COL_DISABLE; \
78 color3: 255 255 255 25; \
79 color_class: "datetime_text"; \ 77 color_class: "datetime_text"; \
80 text { \ 78 text { \
81 text_source: "separator"#_pos; \ 79 text_source: "separator"#_pos; \
diff --git a/data/themes/edc/elm/diskselector.edc b/data/themes/edc/elm/diskselector.edc
index 72bfbd7..9ec4c09 100644
--- a/data/themes/edc/elm/diskselector.edc
+++ b/data/themes/edc/elm/diskselector.edc
@@ -128,14 +128,14 @@ group { name: "elm/diskselector/item/default";
128 } 128 }
129 description { state: "left_side" 0.0; 129 description { state: "left_side" 0.0;
130 inherit: "default" 0.0; 130 inherit: "default" 0.0;
131 color: 127 127 127 255; 131 color: FN_COL_GREY_152;
132 text.size: 8; 132 text.size: 8;
133 visible: 1; 133 visible: 1;
134 text.align: 0.2 0.5; 134 text.align: 0.2 0.5;
135 } 135 }
136 description { state: "right_side" 0.0; 136 description { state: "right_side" 0.0;
137 inherit: "default" 0.0; 137 inherit: "default" 0.0;
138 color: 127 127 127 255; 138 color: FN_COL_GREY_152;
139 visible: 1; 139 visible: 1;
140 text.size: 8; 140 text.size: 8;
141 text.align: 0.8 0.5; 141 text.align: 0.8 0.5;
@@ -265,7 +265,7 @@ group { name: "elm/diskselector/item/datetime/default";
265 description { state: "default" 0.0; 265 description { state: "default" 0.0;
266 min: 10 10; 266 min: 10 10;
267 align: 0.0 0.0; 267 align: 0.0 0.0;
268 color: 172 172 172 255; 268 color: FN_COL_GREY_172;
269 visible: 1; 269 visible: 1;
270 text { 270 text {
271 font: "Sans,Edje-Vera"; 271 font: "Sans,Edje-Vera";
@@ -275,26 +275,26 @@ group { name: "elm/diskselector/item/datetime/default";
275 } 275 }
276 description { state: "center_sel" 0.0; 276 description { state: "center_sel" 0.0;
277 inherit: "default" 0.0; 277 inherit: "default" 0.0;
278 color: 255 255 255 255; 278 color: FN_COL_WHITE;
279 } 279 }
280 description { state: "left_side" 0.0; 280 description { state: "left_side" 0.0;
281 inherit: "default" 0.0; 281 inherit: "default" 0.0;
282 color: 152 152 152 255; 282 color: FN_COL_GREY_152;
283 text.align: 0.2 0.5; 283 text.align: 0.2 0.5;
284 } 284 }
285 description { state: "left_side_sel" 0.0; 285 description { state: "left_side_sel" 0.0;
286 inherit: "default" 0.0; 286 inherit: "default" 0.0;
287 color: 255 255 255 255; 287 color: FN_COL_WHITE;
288 text.align: 0.2 0.5; 288 text.align: 0.2 0.5;
289 } 289 }
290 description { state: "right_side" 0.0; 290 description { state: "right_side" 0.0;
291 inherit: "default" 0.0; 291 inherit: "default" 0.0;
292 color: 152 152 152 255; 292 color: FN_COL_GREY_152;
293 text.align: 0.8 0.5; 293 text.align: 0.8 0.5;
294 } 294 }
295 description { state: "right_side_sel" 0.0; 295 description { state: "right_side_sel" 0.0;
296 inherit: "default" 0.0; 296 inherit: "default" 0.0;
297 color: 255 255 255 255; 297 color: FN_COL_WHITE;
298 text.align: 0.8 0.5; 298 text.align: 0.8 0.5;
299 } 299 }
300 } 300 }
diff --git a/data/themes/edc/elm/flipselector.edc b/data/themes/edc/elm/flipselector.edc
index 9087f67..e629d1b 100644
--- a/data/themes/edc/elm/flipselector.edc
+++ b/data/themes/edc/elm/flipselector.edc
@@ -323,13 +323,11 @@ group { name: "elm/flipselector/base/default";
323 align: 0.5 0.5; 323 align: 0.5 0.5;
324 source: "elm.top"; 324 source: "elm.top";
325 } 325 }
326 color: 192 192 192 255; 326 color: FN_COL_GREY_192;
327 color3: 0 0 0 128;
328 } 327 }
329 description { state: "disabled" 0.0; 328 description { state: "disabled" 0.0;
330 inherit: "default" 0.0; 329 inherit: "default" 0.0;
331 color: 16 16 16 255; 330 color: FN_COL_GREY_16;
332 color3: 255 255 255 25;
333 } 331 }
334 } 332 }
335 part { name: "top_shine_prev"; mouse_events: 0; 333 part { name: "top_shine_prev"; mouse_events: 0;
@@ -367,8 +365,7 @@ group { name: "elm/flipselector/base/default";
367 min: 1 1; 365 min: 1 1;
368 align: 0.5 0.5; 366 align: 0.5 0.5;
369 } 367 }
370 color: 192 192 192 255; 368 color: FN_COL_GREY_192;
371 color3: 0 0 0 128;
372 } 369 }
373 description { state: "shrink" 0.0; 370 description { state: "shrink" 0.0;
374 inherit: "default" 0.0; 371 inherit: "default" 0.0;
@@ -377,8 +374,7 @@ group { name: "elm/flipselector/base/default";
377 } 374 }
378 description { state: "disabled" 0.0; 375 description { state: "disabled" 0.0;
379 inherit: "default" 0.0; 376 inherit: "default" 0.0;
380 color: 16 16 16 255; 377 color: FN_COL_GREY_16;
381 color3: 255 255 255 25;
382 } 378 }
383 } 379 }
384 part { name: "top_shine_cur"; mouse_events: 0; 380 part { name: "top_shine_cur"; mouse_events: 0;
diff --git a/data/themes/edc/elm/frame.edc b/data/themes/edc/elm/frame.edc
index 42e495a..bc29811 100644
--- a/data/themes/edc/elm/frame.edc
+++ b/data/themes/edc/elm/frame.edc
@@ -69,8 +69,7 @@ group { name: "elm/frame/base/default";
69 rel2.offset: -2 2; 69 rel2.offset: -2 2;
70 rel2.to_x: "edge2"; 70 rel2.to_x: "edge2";
71 align: 0.0 0.0; 71 align: 0.0 0.0;
72 color: 21 21 21 255; 72 color: FN_COL_DISABLE;
73 color3: 255 255 255 25;
74 text { font: FNBD; size: 10; 73 text { font: FNBD; size: 10;
75 text_class: "frame"; 74 text_class: "frame";
76 align: 0.0 0.0; 75 align: 0.0 0.0;
diff --git a/data/themes/edc/elm/gengrid.edc b/data/themes/edc/elm/gengrid.edc
index 4ffce94..4889b7d 100644
--- a/data/themes/edc/elm/gengrid.edc
+++ b/data/themes/edc/elm/gengrid.edc
@@ -175,8 +175,7 @@ group { name: "elm/gengrid/item/default/default";
175 rel1.offset: 5 -5; 175 rel1.offset: 5 -5;
176 rel2.relative: 1.0 1.0; 176 rel2.relative: 1.0 1.0;
177 rel2.offset: -5 -5; 177 rel2.offset: -5 -5;
178 color: 255 255 255 255; 178 color: FN_COL_DEFAULT;
179 color3: 0 0 0 128;
180 color_class: "grid_item"; 179 color_class: "grid_item";
181 align: 0.5 1.0; 180 align: 0.5 1.0;
182 text { font: FN; size: 10; 181 text { font: FN; size: 10;
@@ -200,8 +199,7 @@ group { name: "elm/gengrid/item/default/default";
200 description { state: "default" 0.0; 199 description { state: "default" 0.0;
201 rel1.to: "elm.text"; 200 rel1.to: "elm.text";
202 rel2.to: "elm.text"; 201 rel2.to: "elm.text";
203 color: 21 21 21 255; 202 color: FN_COL_DISABLE;
204 color3: 255 255 255 25;
205 color_class: "grid_item_disabled"; 203 color_class: "grid_item_disabled";
206 text { font: FN; size: 10; 204 text { font: FN; size: 10;
207 text_source: "elm.text"; 205 text_source: "elm.text";
@@ -227,9 +225,7 @@ group { name: "elm/gengrid/item/default/default";
227 rel1.to: "elm.text"; 225 rel1.to: "elm.text";
228 rel2.offset: 1 0; 226 rel2.offset: 1 0;
229 rel2.to: "elm.text"; 227 rel2.to: "elm.text";
230 color: 51 153 255 255; 228 color: FN_COL_HIGHLIGHT;
231 color2: 51 153 255 24;
232 color3: 51 153 255 18;
233 color_class: "grid_item_selected"; 229 color_class: "grid_item_selected";
234 text { font: FN; size: 10; 230 text { font: FN; size: 10;
235 text_source: "elm.text"; 231 text_source: "elm.text";
@@ -548,8 +544,7 @@ group { name: "elm/gengrid/item/album-preview/default";
548 rel1.offset: 5 -5; 544 rel1.offset: 5 -5;
549 rel2.relative: 1.0 1.0; 545 rel2.relative: 1.0 1.0;
550 rel2.offset: -5 -5; 546 rel2.offset: -5 -5;
551 color: 255 255 255 255; 547 color: FN_COL_DEFAULT;
552 color3: 0 0 0 128;
553 color_class: "grid_item"; 548 color_class: "grid_item";
554 align: 0.5 1.0; 549 align: 0.5 1.0;
555 text { font: FN; size: 10; 550 text { font: FN; size: 10;
@@ -573,8 +568,7 @@ group { name: "elm/gengrid/item/album-preview/default";
573 description { state: "default" 0.0; 568 description { state: "default" 0.0;
574 rel1.to: "elm.text"; 569 rel1.to: "elm.text";
575 rel2.to: "elm.text"; 570 rel2.to: "elm.text";
576 color: 21 21 21 255; 571 color: FN_COL_DISABLE;
577 color3: 255 255 255 25;
578 color_class: "grid_item_disabled"; 572 color_class: "grid_item_disabled";
579 text { font: FN; size: 10; 573 text { font: FN; size: 10;
580 text_source: "elm.text"; 574 text_source: "elm.text";
@@ -600,9 +594,7 @@ group { name: "elm/gengrid/item/album-preview/default";
600 rel1.to: "elm.text"; 594 rel1.to: "elm.text";
601 rel2.offset: 1 0; 595 rel2.offset: 1 0;
602 rel2.to: "elm.text"; 596 rel2.to: "elm.text";
603 color: 51 153 255 255; 597 color: FN_COL_HIGHLIGHT;
604 color2: 51 153 255 24;
605 color3: 51 153 255 18;
606 color_class: "grid_item_selected"; 598 color_class: "grid_item_selected";
607 text { font: FN; size: 10; 599 text { font: FN; size: 10;
608 text_source: "elm.text"; 600 text_source: "elm.text";
@@ -835,8 +827,7 @@ group { name: "elm/gengrid/item/thumb/default";
835 rel1.offset: 5 -5; 827 rel1.offset: 5 -5;
836 rel2.relative: 1.0 1.0; 828 rel2.relative: 1.0 1.0;
837 rel2.offset: -5 -5; 829 rel2.offset: -5 -5;
838 color: 255 255 255 255; 830 color: FN_COL_DEFAULT;
839 color3: 0 0 0 128;
840 color_class: "grid_item"; 831 color_class: "grid_item";
841 align: 0.5 1.0; 832 align: 0.5 1.0;
842 text { font: FN; size: 10; 833 text { font: FN; size: 10;
@@ -860,8 +851,7 @@ group { name: "elm/gengrid/item/thumb/default";
860 description { state: "default" 0.0; 851 description { state: "default" 0.0;
861 rel1.to: "elm.text"; 852 rel1.to: "elm.text";
862 rel2.to: "elm.text"; 853 rel2.to: "elm.text";
863 color: 21 21 21 255; 854 color: FN_COL_DISABLE;
864 color3: 255 255 255 25;
865 color_class: "grid_item_disabled"; 855 color_class: "grid_item_disabled";
866 text { font: FN; size: 10; 856 text { font: FN; size: 10;
867 text_source: "elm.text"; 857 text_source: "elm.text";
@@ -887,9 +877,7 @@ group { name: "elm/gengrid/item/thumb/default";
887 rel1.to: "elm.text"; 877 rel1.to: "elm.text";
888 rel2.offset: 1 0; 878 rel2.offset: 1 0;
889 rel2.to: "elm.text"; 879 rel2.to: "elm.text";
890 color: 51 153 255 255; 880 color: FN_COL_HIGHLIGHT;
891 color2: 51 153 255 24;
892 color3: 51 153 255 18;
893 color_class: "grid_item_selected"; 881 color_class: "grid_item_selected";
894 text { font: FN; size: 10; 882 text { font: FN; size: 10;
895 text_source: "elm.text"; 883 text_source: "elm.text";
diff --git a/data/themes/edc/elm/genlist.edc b/data/themes/edc/elm/genlist.edc
index b46ba88..9066a4d 100644
--- a/data/themes/edc/elm/genlist.edc
+++ b/data/themes/edc/elm/genlist.edc
@@ -166,8 +166,7 @@ group { name: "elm/genlist/item/group_index/default";
166 rel2.offset: -3 -3; 166 rel2.offset: -3 -3;
167 rel2.relative: 0.0 1.0; 167 rel2.relative: 0.0 1.0;
168 rel2.to_x: "elm.swallow.end"; 168 rel2.to_x: "elm.swallow.end";
169 color: 255 255 255 255; 169 color: FN_COL_DEFAULT;
170 color3: 0 0 0 128;
171 color_class: "list_group_item"; 170 color_class: "list_group_item";
172 text { font: FNBD; size: 10; 171 text { font: FNBD; size: 10;
173 min: 1 1; 172 min: 1 1;
@@ -177,8 +176,7 @@ group { name: "elm/genlist/item/group_index/default";
177 } 176 }
178 description { state: "disabled" 0.0; 177 description { state: "disabled" 0.0;
179 inherit: "default" 0.0; 178 inherit: "default" 0.0;
180 color: 21 21 21 255; 179 color: FN_COL_DISABLE;
181 color3: 255 255 255 25;
182 color_class: "list_group_item_disabled"; 180 color_class: "list_group_item_disabled";
183 } 181 }
184 } 182 }
@@ -437,8 +435,7 @@ group { name: "elm/genlist/item/default/default";
437 rel2.offset: -3 -3; 435 rel2.offset: -3 -3;
438 rel2.relative: 0.0 1.0; 436 rel2.relative: 0.0 1.0;
439 rel2.to_x: "elm.swallow.end"; 437 rel2.to_x: "elm.swallow.end";
440 color: 255 255 255 255; 438 color: FN_COL_DEFAULT;
441 color3: 0 0 0 128;
442 color_class: "list_item"; 439 color_class: "list_item";
443 text { font: FN; size: 10; 440 text { font: FN; size: 10;
444 min: 1 1; 441 min: 1 1;
@@ -465,8 +462,7 @@ group { name: "elm/genlist/item/default/default";
465 description { state: "default" 0.0; 462 description { state: "default" 0.0;
466 rel1.to: "elm.text"; 463 rel1.to: "elm.text";
467 rel2.to: "elm.text"; 464 rel2.to: "elm.text";
468 color: 21 21 21 255; 465 color: FN_COL_DISABLE;
469 color3: 255 255 255 25;
470 color_class: "list_item_disabled"; 466 color_class: "list_item_disabled";
471 text { font: FN; size: 10; 467 text { font: FN; size: 10;
472 text_source: "elm.text"; 468 text_source: "elm.text";
@@ -496,9 +492,7 @@ group { name: "elm/genlist/item/default/default";
496 rel1.to: "elm.text"; 492 rel1.to: "elm.text";
497 rel2.offset: -1 1; 493 rel2.offset: -1 1;
498 rel2.to: "elm.text"; 494 rel2.to: "elm.text";
499 color: 51 153 255 255; 495 color: FN_COL_HIGHLIGHT;
500 color2: 51 153 255 24;
501 color3: 51 153 255 18;
502 color_class: "list_item_selected"; 496 color_class: "list_item_selected";
503 text { font: FN; size: 10; 497 text { font: FN; size: 10;
504 text_source: "elm.text"; 498 text_source: "elm.text";
@@ -897,8 +891,7 @@ group { name: "elm/genlist/item/one_icon/default";
897 rel1.relative: 1.0 0.0; 891 rel1.relative: 1.0 0.0;
898 rel1.to_x: "elm.swallow.icon"; 892 rel1.to_x: "elm.swallow.icon";
899 rel2.offset: -3 -3; 893 rel2.offset: -3 -3;
900 color: 255 255 255 255; 894 color: FN_COL_DEFAULT;
901 color3: 0 0 0 128;
902 color_class: "list_item"; 895 color_class: "list_item";
903 text { font: FN; size: 10; 896 text { font: FN; size: 10;
904 min: 0 1; 897 min: 0 1;
@@ -925,8 +918,7 @@ group { name: "elm/genlist/item/one_icon/default";
925 description { state: "default" 0.0; 918 description { state: "default" 0.0;
926 rel1.to: "elm.text"; 919 rel1.to: "elm.text";
927 rel2.to: "elm.text"; 920 rel2.to: "elm.text";
928 color: 21 21 21 255; 921 color: FN_COL_DISABLE;
929 color3: 255 255 255 25;
930 color_class: "list_item_disabled"; 922 color_class: "list_item_disabled";
931 text { font: FN; size: 10; 923 text { font: FN; size: 10;
932 text_source: "elm.text"; 924 text_source: "elm.text";
@@ -956,9 +948,7 @@ group { name: "elm/genlist/item/one_icon/default";
956 rel1.to: "elm.text"; 948 rel1.to: "elm.text";
957 rel2.offset: -1 1; 949 rel2.offset: -1 1;
958 rel2.to: "elm.text"; 950 rel2.to: "elm.text";
959 color: 51 153 255 255; 951 color: FN_COL_HIGHLIGHT;
960 color2: 51 153 255 24;
961 color3: 51 153 255 18;
962 color_class: "list_item_selected"; 952 color_class: "list_item_selected";
963 text { font: FN; size: 10; 953 text { font: FN; size: 10;
964 text_source: "elm.text"; 954 text_source: "elm.text";
@@ -1103,8 +1093,7 @@ group { name: "elm/genlist/item/end_icon/default";
1103 rel2.offset: -3 -3; 1093 rel2.offset: -3 -3;
1104 rel2.relative: 0.0 1.0; 1094 rel2.relative: 0.0 1.0;
1105 rel2.to_x: "elm.swallow.icon"; 1095 rel2.to_x: "elm.swallow.icon";
1106 color: 255 255 255 255; 1096 color: FN_COL_DEFAULT;
1107 color3: 0 0 0 128;
1108 color_class: "list_item"; 1097 color_class: "list_item";
1109 text { font: FN; size: 10; 1098 text { font: FN; size: 10;
1110 min: 1 1; 1099 min: 1 1;
@@ -1131,8 +1120,7 @@ group { name: "elm/genlist/item/end_icon/default";
1131 description { state: "default" 0.0; 1120 description { state: "default" 0.0;
1132 rel1.to: "elm.text"; 1121 rel1.to: "elm.text";
1133 rel2.to: "elm.text"; 1122 rel2.to: "elm.text";
1134 color: 21 21 21 255; 1123 color: FN_COL_DISABLE;
1135 color3: 255 255 255 25;
1136 color_class: "list_item_disabled"; 1124 color_class: "list_item_disabled";
1137 text { font: FN; size: 10; 1125 text { font: FN; size: 10;
1138 text_source: "elm.text"; 1126 text_source: "elm.text";
@@ -1162,9 +1150,7 @@ group { name: "elm/genlist/item/end_icon/default";
1162 rel1.to: "elm.text"; 1150 rel1.to: "elm.text";
1163 rel2.offset: -1 1; 1151 rel2.offset: -1 1;
1164 rel2.to: "elm.text"; 1152 rel2.to: "elm.text";
1165 color: 51 153 255 255; 1153 color: FN_COL_HIGHLIGHT;
1166 color2: 51 153 255 24;
1167 color3: 51 153 255 18;
1168 color_class: "list_item_selected"; 1154 color_class: "list_item_selected";
1169 text { font: FN; size: 10; 1155 text { font: FN; size: 10;
1170 text_source: "elm.text"; 1156 text_source: "elm.text";
@@ -1303,8 +1289,7 @@ group { name: "elm/genlist/item/no_icon/default";
1303 rel1.relative: 1.0 0.0; 1289 rel1.relative: 1.0 0.0;
1304 rel1.to_x: "elm.swallow.pad"; 1290 rel1.to_x: "elm.swallow.pad";
1305 rel2.offset: -3 -3; 1291 rel2.offset: -3 -3;
1306 color: 255 255 255 255; 1292 color: FN_COL_DEFAULT;
1307 color3: 0 0 0 128;
1308 color_class: "list_item"; 1293 color_class: "list_item";
1309 text { font: FN; size: 10; 1294 text { font: FN; size: 10;
1310 min: 1 1; 1295 min: 1 1;
@@ -1331,8 +1316,7 @@ group { name: "elm/genlist/item/no_icon/default";
1331 description { state: "default" 0.0; 1316 description { state: "default" 0.0;
1332 rel1.to: "elm.text"; 1317 rel1.to: "elm.text";
1333 rel2.to: "elm.text"; 1318 rel2.to: "elm.text";
1334 color: 21 21 21 255; 1319 color: FN_COL_DISABLE;
1335 color3: 255 255 255 25;
1336 color_class: "list_item_disabled"; 1320 color_class: "list_item_disabled";
1337 text { font: FN; size: 10; 1321 text { font: FN; size: 10;
1338 text_source: "elm.text"; 1322 text_source: "elm.text";
@@ -1362,9 +1346,7 @@ group { name: "elm/genlist/item/no_icon/default";
1362 rel1.to: "elm.text"; 1346 rel1.to: "elm.text";
1363 rel2.offset: -1 1; 1347 rel2.offset: -1 1;
1364 rel2.to: "elm.text"; 1348 rel2.to: "elm.text";
1365 color: 51 153 255 255; 1349 color: FN_COL_HIGHLIGHT;
1366 color2: 51 153 255 24;
1367 color3: 51 153 255 18;
1368 color_class: "list_item_selected"; 1350 color_class: "list_item_selected";
1369 text { font: FN; size: 10; 1351 text { font: FN; size: 10;
1370 text_source: "elm.text"; 1352 text_source: "elm.text";
@@ -2018,8 +2000,7 @@ group { name: "elm/genlist/item/icon_top_text_bottom/default";
2018 rel1.to_x: "elm.swallow.pad"; 2000 rel1.to_x: "elm.swallow.pad";
2019 rel1.to_y: "elm.swallow.icon"; 2001 rel1.to_y: "elm.swallow.icon";
2020 rel2.offset: -3 -3; 2002 rel2.offset: -3 -3;
2021 color: 255 255 255 255; 2003 color: FN_COL_DEFAULT;
2022 color3: 0 0 0 128;
2023 color_class: "list_item"; 2004 color_class: "list_item";
2024 text { font: FN; size: 10; 2005 text { font: FN; size: 10;
2025 min: 1 1; 2006 min: 1 1;
@@ -2046,8 +2027,7 @@ group { name: "elm/genlist/item/icon_top_text_bottom/default";
2046 description { state: "default" 0.0; 2027 description { state: "default" 0.0;
2047 rel1.to: "elm.text"; 2028 rel1.to: "elm.text";
2048 rel2.to: "elm.text"; 2029 rel2.to: "elm.text";
2049 color: 21 21 21 255; 2030 color: FN_COL_DISABLE;
2050 color3: 255 255 255 25;
2051 color_class: "list_item_disabled"; 2031 color_class: "list_item_disabled";
2052 text { font: FN; size: 10; 2032 text { font: FN; size: 10;
2053 text_source: "elm.text"; 2033 text_source: "elm.text";
@@ -2077,9 +2057,7 @@ group { name: "elm/genlist/item/icon_top_text_bottom/default";
2077 rel1.to: "elm.text"; 2057 rel1.to: "elm.text";
2078 rel2.offset: -1 1; 2058 rel2.offset: -1 1;
2079 rel2.to: "elm.text"; 2059 rel2.to: "elm.text";
2080 color: 51 153 255 255; 2060 color: FN_COL_HIGHLIGHT;
2081 color2: 51 153 255 24;
2082 color3: 51 153 255 18;
2083 color_class: "list_item_selected"; 2061 color_class: "list_item_selected";
2084 text { font: FN; size: 10; 2062 text { font: FN; size: 10;
2085 text_source: "elm.text"; 2063 text_source: "elm.text";
@@ -2454,8 +2432,7 @@ group { name: "elm/genlist/item/double_label/default";
2454 rel2.relative: 0.0 0.0; 2432 rel2.relative: 0.0 0.0;
2455 rel2.to_x: "elm.swallow.end"; 2433 rel2.to_x: "elm.swallow.end";
2456 rel2.to_y: "elm.text.sub"; 2434 rel2.to_y: "elm.text.sub";
2457 color: 255 255 255 255; 2435 color: FN_COL_DEFAULT;
2458 color3: 0 0 0 128;
2459 color_class: "list_item"; 2436 color_class: "list_item";
2460 align: 0.0 0.0; 2437 align: 0.0 0.0;
2461 text { font: FN; size: 10; 2438 text { font: FN; size: 10;
@@ -2483,8 +2460,7 @@ group { name: "elm/genlist/item/double_label/default";
2483 description { state: "default" 0.0; 2460 description { state: "default" 0.0;
2484 rel1.to: "elm.text"; 2461 rel1.to: "elm.text";
2485 rel2.to: "elm.text"; 2462 rel2.to: "elm.text";
2486 color: 21 21 21 255; 2463 color: FN_COL_DISABLE;
2487 color3: 255 255 255 25;
2488 color_class: "list_item_disabled"; 2464 color_class: "list_item_disabled";
2489 text { font: FN; size: 10; 2465 text { font: FN; size: 10;
2490 text_source: "elm.text"; 2466 text_source: "elm.text";
@@ -2514,9 +2490,7 @@ group { name: "elm/genlist/item/double_label/default";
2514 rel1.to: "elm.text"; 2490 rel1.to: "elm.text";
2515 rel2.offset: -1 1; 2491 rel2.offset: -1 1;
2516 rel2.to: "elm.text"; 2492 rel2.to: "elm.text";
2517 color: 51 153 255 255; 2493 color: FN_COL_HIGHLIGHT;
2518 color2: 51 153 255 24;
2519 color3: 51 153 255 18;
2520 color_class: "list_item_selected"; 2494 color_class: "list_item_selected";
2521 text { font: FN; size: 10; 2495 text { font: FN; size: 10;
2522 text_source: "elm.text"; 2496 text_source: "elm.text";
@@ -2561,8 +2535,7 @@ group { name: "elm/genlist/item/double_label/default";
2561 rel2.offset: -3 -3; 2535 rel2.offset: -3 -3;
2562 rel2.relative: 0.0 1.0; 2536 rel2.relative: 0.0 1.0;
2563 rel2.to_x: "elm.swallow.end"; 2537 rel2.to_x: "elm.swallow.end";
2564 color: 255 255 255 255; 2538 color: FN_COL_DEFAULT;
2565 color3: 0 0 0 128;
2566 color_class: "list_item_sub"; 2539 color_class: "list_item_sub";
2567 align: 0.0 1.0; 2540 align: 0.0 1.0;
2568 text { font: FN; size: 8; 2541 text { font: FN; size: 8;
@@ -2590,8 +2563,7 @@ group { name: "elm/genlist/item/double_label/default";
2590 description { state: "default" 0.0; 2563 description { state: "default" 0.0;
2591 rel1.to: "elm.text.sub"; 2564 rel1.to: "elm.text.sub";
2592 rel2.to: "elm.text.sub"; 2565 rel2.to: "elm.text.sub";
2593 color: 21 21 21 255; 2566 color: FN_COL_DISABLE;
2594 color3: 255 255 255 25;
2595 color_class: "list_item_sub_disabled"; 2567 color_class: "list_item_sub_disabled";
2596 text { font: FN; size: 8; 2568 text { font: FN; size: 8;
2597 text_source: "elm.text.sub"; 2569 text_source: "elm.text.sub";
@@ -2621,9 +2593,7 @@ group { name: "elm/genlist/item/double_label/default";
2621 rel1.to: "elm.text.sub"; 2593 rel1.to: "elm.text.sub";
2622 rel2.offset: -1 0; 2594 rel2.offset: -1 0;
2623 rel2.to: "elm.text.sub"; 2595 rel2.to: "elm.text.sub";
2624 color: 51 153 255 255; 2596 color: FN_COL_HIGHLIGHT;
2625 color2: 51 153 255 24;
2626 color3: 51 153 255 18;
2627 color_class: "list_item_sub_selected"; 2597 color_class: "list_item_sub_selected";
2628 text { font: FN; size: 8; 2598 text { font: FN; size: 8;
2629 text_source: "elm.text.sub"; 2599 text_source: "elm.text.sub";
@@ -3084,8 +3054,7 @@ group { name: "elm/genlist/item/message/default";
3084 rel1.to_x: "elm.swallow.pad"; 3054 rel1.to_x: "elm.swallow.pad";
3085 rel2.offset: -3 2; 3055 rel2.offset: -3 2;
3086 rel2.relative: 1.0 0.0; 3056 rel2.relative: 1.0 0.0;
3087 color: 255 255 255 255; 3057 color: FN_COL_DEFAULT;
3088 color3: 0 0 0 128;
3089 color_class: "list_item"; 3058 color_class: "list_item";
3090 align: 0.0 0.0; 3059 align: 0.0 0.0;
3091 text { font: FN; size: 10; 3060 text { font: FN; size: 10;
@@ -3115,8 +3084,7 @@ group { name: "elm/genlist/item/message/default";
3115 fixed: 1 1; 3084 fixed: 1 1;
3116 rel1.to: "elm.text"; 3085 rel1.to: "elm.text";
3117 rel2.to: "elm.text"; 3086 rel2.to: "elm.text";
3118 color: 21 21 21 255; 3087 color: FN_COL_DISABLE;
3119 color3: 255 255 255 25;
3120 color_class: "list_item_disabled"; 3088 color_class: "list_item_disabled";
3121 text { font: FN; size: 10; 3089 text { font: FN; size: 10;
3122 text_source: "elm.text"; 3090 text_source: "elm.text";
@@ -3147,9 +3115,7 @@ group { name: "elm/genlist/item/message/default";
3147 rel1.to: "elm.text"; 3115 rel1.to: "elm.text";
3148 rel2.offset: -1 1; 3116 rel2.offset: -1 1;
3149 rel2.to: "elm.text"; 3117 rel2.to: "elm.text";
3150 color: 51 153 255 255; 3118 color: FN_COL_HIGHLIGHT;
3151 color2: 51 153 255 24;
3152 color3: 51 153 255 18;
3153 color_class: "list_item_selected"; 3119 color_class: "list_item_selected";
3154 text { font: FN; size: 10; 3120 text { font: FN; size: 10;
3155 text_source: "elm.text"; 3121 text_source: "elm.text";
@@ -3195,8 +3161,7 @@ group { name: "elm/genlist/item/message/default";
3195 rel2.offset: -3 -3; 3161 rel2.offset: -3 -3;
3196 rel2.relative: 1.0 0.0; 3162 rel2.relative: 1.0 0.0;
3197 rel2.to_y: "elm.title.2"; 3163 rel2.to_y: "elm.title.2";
3198 color: 255 255 255 255; 3164 color: FN_COL_DEFAULT;
3199 color3: 0 0 0 128;
3200 color_class: "list_item"; 3165 color_class: "list_item";
3201 text { font: FN; size: 10; 3166 text { font: FN; size: 10;
3202 min: 1 1; 3167 min: 1 1;
@@ -3223,8 +3188,7 @@ group { name: "elm/genlist/item/message/default";
3223 description { state: "default" 0.0; 3188 description { state: "default" 0.0;
3224 rel1.to: "elm.title.1"; 3189 rel1.to: "elm.title.1";
3225 rel2.to: "elm.title.1"; 3190 rel2.to: "elm.title.1";
3226 color: 21 21 21 255; 3191 color: FN_COL_DISABLE;
3227 color3: 255 255 255 25;
3228 color_class: "list_item_disabled"; 3192 color_class: "list_item_disabled";
3229 text { font: FN; size: 10; 3193 text { font: FN; size: 10;
3230 text_source: "elm.title.1"; 3194 text_source: "elm.title.1";
@@ -3254,9 +3218,7 @@ group { name: "elm/genlist/item/message/default";
3254 rel1.to: "elm.title.1"; 3218 rel1.to: "elm.title.1";
3255 rel2.offset: -1 1; 3219 rel2.offset: -1 1;
3256 rel2.to: "elm.title.1"; 3220 rel2.to: "elm.title.1";
3257 color: 51 153 255 255; 3221 color: FN_COL_HIGHLIGHT;
3258 color2: 51 153 255 24;
3259 color3: 51 153 255 18;
3260 color_class: "list_item_selected"; 3222 color_class: "list_item_selected";
3261 text { font: FN; size: 10; 3223 text { font: FN; size: 10;
3262 text_source: "elm.title.1"; 3224 text_source: "elm.title.1";
@@ -3287,8 +3249,7 @@ group { name: "elm/genlist/item/message/default";
3287 rel1.relative: 1.0 1.0; 3249 rel1.relative: 1.0 1.0;
3288 rel1.to_x: "elm.swallow.pad"; 3250 rel1.to_x: "elm.swallow.pad";
3289 rel2.offset: -3 -3; 3251 rel2.offset: -3 -3;
3290 color: 255 255 255 255; 3252 color: FN_COL_DEFAULT;
3291 color3: 0 0 0 128;
3292 color_class: "list_item"; 3253 color_class: "list_item";
3293 align: 0.0 1.0; 3254 align: 0.0 1.0;
3294 text { font: FN; size: 10; 3255 text { font: FN; size: 10;
@@ -3317,8 +3278,7 @@ group { name: "elm/genlist/item/message/default";
3317 description { state: "default" 0.0; 3278 description { state: "default" 0.0;
3318 rel1.to: "elm.title.2"; 3279 rel1.to: "elm.title.2";
3319 rel2.to: "elm.title.2"; 3280 rel2.to: "elm.title.2";
3320 color: 21 21 21 255; 3281 color: FN_COL_DISABLE;
3321 color3: 255 255 255 25;
3322 color_class: "list_item_disabled"; 3282 color_class: "list_item_disabled";
3323 text { font: FN; size: 10; 3283 text { font: FN; size: 10;
3324 text_source: "elm.title.2"; 3284 text_source: "elm.title.2";
@@ -3348,9 +3308,7 @@ group { name: "elm/genlist/item/message/default";
3348 rel1.to: "elm.title.2"; 3308 rel1.to: "elm.title.2";
3349 rel2.offset: -1 2; 3309 rel2.offset: -1 2;
3350 rel2.to: "elm.title.2"; 3310 rel2.to: "elm.title.2";
3351 color: 51 153 255 255; 3311 color: FN_COL_HIGHLIGHT;
3352 color2: 51 153 255 24;
3353 color3: 51 153 255 18;
3354 color_class: "list_item_selected"; 3312 color_class: "list_item_selected";
3355 text { font: FN; size: 10; 3313 text { font: FN; size: 10;
3356 text_source: "elm.title.2"; 3314 text_source: "elm.title.2";
@@ -3491,8 +3449,7 @@ group { name: "elm/genlist/item/media/default";
3491 rel2.offset: -3 -3; 3449 rel2.offset: -3 -3;
3492 rel2.relative: 1.0 0.0; 3450 rel2.relative: 1.0 0.0;
3493 rel2.to_y: "elm.text.album-artist"; 3451 rel2.to_y: "elm.text.album-artist";
3494 color: 255 255 255 255; 3452 color: FN_COL_DEFAULT;
3495 color3: 0 0 0 128;
3496 color_class: "list_item"; 3453 color_class: "list_item";
3497 align: 0.0 0.0; 3454 align: 0.0 0.0;
3498 text { font: FN; size: 10; 3455 text { font: FN; size: 10;
@@ -3520,8 +3477,7 @@ group { name: "elm/genlist/item/media/default";
3520 description { state: "default" 0.0; 3477 description { state: "default" 0.0;
3521 rel1.to: "elm.text.title"; 3478 rel1.to: "elm.text.title";
3522 rel2.to: "elm.text.title"; 3479 rel2.to: "elm.text.title";
3523 color: 21 21 21 255; 3480 color: FN_COL_DISABLE;
3524 color3: 255 255 255 25;
3525 color_class: "list_item_disabled"; 3481 color_class: "list_item_disabled";
3526 text { font: FN; size: 10; 3482 text { font: FN; size: 10;
3527 text_source: "elm.text.title"; 3483 text_source: "elm.text.title";
@@ -3551,9 +3507,7 @@ group { name: "elm/genlist/item/media/default";
3551 rel1.to: "elm.text.title"; 3507 rel1.to: "elm.text.title";
3552 rel2.offset: -1 1; 3508 rel2.offset: -1 1;
3553 rel2.to: "elm.text.title"; 3509 rel2.to: "elm.text.title";
3554 color: 51 153 255 255; 3510 color: FN_COL_HIGHLIGHT;
3555 color2: 51 153 255 24;
3556 color3: 51 153 255 18;
3557 color_class: "list_item_selected"; 3511 color_class: "list_item_selected";
3558 text { font: FN; size: 10; 3512 text { font: FN; size: 10;
3559 text_source: "elm.text.title"; 3513 text_source: "elm.text.title";
@@ -3597,8 +3551,7 @@ group { name: "elm/genlist/item/media/default";
3597 rel1.to_x: "elm.swallow.pad"; 3551 rel1.to_x: "elm.swallow.pad";
3598 rel2.offset: -3 -3; 3552 rel2.offset: -3 -3;
3599 rel2.relative: 1.0 1.0; 3553 rel2.relative: 1.0 1.0;
3600 color: 255 255 255 255; 3554 color: FN_COL_DEFAULT;
3601 color3: 0 0 0 128;
3602 color_class: "list_item_sub"; 3555 color_class: "list_item_sub";
3603 align: 0.0 1.0; 3556 align: 0.0 1.0;
3604 text { font: FN; size: 8; 3557 text { font: FN; size: 8;
@@ -3626,8 +3579,7 @@ group { name: "elm/genlist/item/media/default";
3626 description { state: "default" 0.0; 3579 description { state: "default" 0.0;
3627 rel1.to: "elm.text.album-artist"; 3580 rel1.to: "elm.text.album-artist";
3628 rel2.to: "elm.text.album-artist"; 3581 rel2.to: "elm.text.album-artist";
3629 color: 21 21 21 255; 3582 color: FN_COL_DISABLE;
3630 color3: 255 255 255 25;
3631 color_class: "list_item_sub_disabled"; 3583 color_class: "list_item_sub_disabled";
3632 text { font: FN; size: 8; 3584 text { font: FN; size: 8;
3633 text_source: "elm.text.album-artist"; 3585 text_source: "elm.text.album-artist";
@@ -3657,9 +3609,7 @@ group { name: "elm/genlist/item/media/default";
3657 rel1.to: "elm.text.album-artist"; 3609 rel1.to: "elm.text.album-artist";
3658 rel2.offset: -1 0; 3610 rel2.offset: -1 0;
3659 rel2.to: "elm.text.album-artist"; 3611 rel2.to: "elm.text.album-artist";
3660 color: 51 153 255 255; 3612 color: FN_COL_HIGHLIGHT;
3661 color2: 51 153 255 24;
3662 color3: 51 153 255 18;
3663 color_class: "list_item_sub_selected"; 3613 color_class: "list_item_sub_selected";
3664 text { font: FN; size: 8; 3614 text { font: FN; size: 8;
3665 text_source: "elm.text.album-artist"; 3615 text_source: "elm.text.album-artist";
@@ -3969,8 +3919,7 @@ group { name: "elm/genlist/item/media-album/default";
3969 rel2.relative: 1.0 0.0; 3919 rel2.relative: 1.0 0.0;
3970 rel2.to_x: "elm.swallow.pad"; 3920 rel2.to_x: "elm.swallow.pad";
3971 rel2.to_y: "elm.text.length"; 3921 rel2.to_y: "elm.text.length";
3972 color: 255 255 255 255; 3922 color: FN_COL_DEFAULT;
3973 color3: 0 0 0 128;
3974 color_class: "list_item"; 3923 color_class: "list_item";
3975 align: 0.0 0.0; 3924 align: 0.0 0.0;
3976 text { font: FN; size: 10; 3925 text { font: FN; size: 10;
@@ -3999,8 +3948,7 @@ group { name: "elm/genlist/item/media-album/default";
3999 description { state: "default" 0.0; 3948 description { state: "default" 0.0;
4000 rel1.to: "elm.text.trackno"; 3949 rel1.to: "elm.text.trackno";
4001 rel2.to: "elm.text.trackno"; 3950 rel2.to: "elm.text.trackno";
4002 color: 21 21 21 255; 3951 color: FN_COL_DISABLE;
4003 color3: 255 255 255 25;
4004 color_class: "list_item_disabled"; 3952 color_class: "list_item_disabled";
4005 text { font: FN; size: 10; 3953 text { font: FN; size: 10;
4006 text_source: "elm.text.trackno"; 3954 text_source: "elm.text.trackno";
@@ -4030,9 +3978,7 @@ group { name: "elm/genlist/item/media-album/default";
4030 rel1.to: "elm.text.trackno"; 3978 rel1.to: "elm.text.trackno";
4031 rel2.offset: -1 1; 3979 rel2.offset: -1 1;
4032 rel2.to: "elm.text.trackno"; 3980 rel2.to: "elm.text.trackno";
4033 color: 51 153 255 255; 3981 color: FN_COL_HIGHLIGHT;
4034 color2: 51 153 255 24;
4035 color3: 51 153 255 18;
4036 color_class: "list_item_selected"; 3982 color_class: "list_item_selected";
4037 text { font: FN; size: 10; 3983 text { font: FN; size: 10;
4038 text_source: "elm.text.trackno"; 3984 text_source: "elm.text.trackno";
@@ -4098,8 +4044,7 @@ group { name: "elm/genlist/item/media-album/default";
4098 rel2.offset: -3 -1; 4044 rel2.offset: -3 -1;
4099 rel2.relative: 1.0 1.0; 4045 rel2.relative: 1.0 1.0;
4100 rel2.to_y: "elm.text.trackno"; 4046 rel2.to_y: "elm.text.trackno";
4101 color: 255 255 255 255; 4047 color: FN_COL_DEFAULT;
4102 color3: 0 0 0 128;
4103 color_class: "list_item"; 4048 color_class: "list_item";
4104 align: 0.0 0.0; 4049 align: 0.0 0.0;
4105 text { font: FN; size: 10; 4050 text { font: FN; size: 10;
@@ -4127,8 +4072,7 @@ group { name: "elm/genlist/item/media-album/default";
4127 description { state: "default" 0.0; 4072 description { state: "default" 0.0;
4128 rel1.to: "elm.text.title"; 4073 rel1.to: "elm.text.title";
4129 rel2.to: "elm.text.title"; 4074 rel2.to: "elm.text.title";
4130 color: 21 21 21 255; 4075 color: FN_COL_DISABLE;
4131 color3: 255 255 255 25;
4132 color_class: "list_item_disabled"; 4076 color_class: "list_item_disabled";
4133 text { font: FN; size: 10; 4077 text { font: FN; size: 10;
4134 text_source: "elm.text.title"; 4078 text_source: "elm.text.title";
@@ -4158,9 +4102,7 @@ group { name: "elm/genlist/item/media-album/default";
4158 rel1.to: "elm.text.title"; 4102 rel1.to: "elm.text.title";
4159 rel2.offset: -1 1; 4103 rel2.offset: -1 1;
4160 rel2.to: "elm.text.title"; 4104 rel2.to: "elm.text.title";
4161 color: 51 153 255 255; 4105 color: FN_COL_HIGHLIGHT;
4162 color2: 51 153 255 24;
4163 color3: 51 153 255 18;
4164 color_class: "list_item_selected"; 4106 color_class: "list_item_selected";
4165 text { font: FN; size: 10; 4107 text { font: FN; size: 10;
4166 text_source: "elm.text.title"; 4108 text_source: "elm.text.title";
@@ -4193,8 +4135,7 @@ group { name: "elm/genlist/item/media-album/default";
4193 rel1.to_x: "elm.swallow.pad"; 4135 rel1.to_x: "elm.swallow.pad";
4194 rel2.offset: -3 -3; 4136 rel2.offset: -3 -3;
4195 rel2.relative: 1.0 1.0; 4137 rel2.relative: 1.0 1.0;
4196 color: 255 255 255 255; 4138 color: FN_COL_DEFAULT;
4197 color3: 0 0 0 128;
4198 color_class: "list_item_sub"; 4139 color_class: "list_item_sub";
4199 align: 0.0 1.0; 4140 align: 0.0 1.0;
4200 text { font: FN; size: 8; 4141 text { font: FN; size: 8;
@@ -4222,8 +4163,7 @@ group { name: "elm/genlist/item/media-album/default";
4222 description { state: "default" 0.0; 4163 description { state: "default" 0.0;
4223 rel1.to: "elm.text.length"; 4164 rel1.to: "elm.text.length";
4224 rel2.to: "elm.text.length"; 4165 rel2.to: "elm.text.length";
4225 color: 21 21 21 255; 4166 color: FN_COL_DISABLE;
4226 color3: 255 255 255 25;
4227 color_class: "list_item_sub_disabled"; 4167 color_class: "list_item_sub_disabled";
4228 text { font: FN; size: 8; 4168 text { font: FN; size: 8;
4229 text_source: "elm.text.length"; 4169 text_source: "elm.text.length";
@@ -4253,9 +4193,7 @@ group { name: "elm/genlist/item/media-album/default";
4253 rel1.to: "elm.text.length"; 4193 rel1.to: "elm.text.length";
4254 rel2.offset: -1 0; 4194 rel2.offset: -1 0;
4255 rel2.to: "elm.text.length"; 4195 rel2.to: "elm.text.length";
4256 color: 51 153 255 255; 4196 color: FN_COL_HIGHLIGHT;
4257 color2: 51 153 255 24;
4258 color3: 51 153 255 18;
4259 color_class: "list_item_sub_selected"; 4197 color_class: "list_item_sub_selected";
4260 text { font: FN; size: 8; 4198 text { font: FN; size: 8;
4261 text_source: "elm.text.length"; 4199 text_source: "elm.text.length";
@@ -4573,8 +4511,7 @@ group { name: "elm/genlist/item/media-preview/default";
4573 rel2.offset: -3 -3; 4511 rel2.offset: -3 -3;
4574 rel2.relative: 1.0 0.0; 4512 rel2.relative: 1.0 0.0;
4575 rel2.to_y: "elm.text.artist"; 4513 rel2.to_y: "elm.text.artist";
4576 color: 255 255 255 255; 4514 color: FN_COL_DEFAULT;
4577 color3: 0 0 0 128;
4578 color_class: "list_item"; 4515 color_class: "list_item";
4579 align: 0.0 0.0; 4516 align: 0.0 0.0;
4580 text { font: FN; size: 10; 4517 text { font: FN; size: 10;
@@ -4602,8 +4539,7 @@ group { name: "elm/genlist/item/media-preview/default";
4602 description { state: "default" 0.0; 4539 description { state: "default" 0.0;
4603 rel1.to: "elm.text"; 4540 rel1.to: "elm.text";
4604 rel2.to: "elm.text"; 4541 rel2.to: "elm.text";
4605 color: 21 21 21 255; 4542 color: FN_COL_DISABLE;
4606 color3: 255 255 255 25;
4607 color_class: "list_item_disabled"; 4543 color_class: "list_item_disabled";
4608 text { font: FN; size: 10; 4544 text { font: FN; size: 10;
4609 text_source: "elm.text"; 4545 text_source: "elm.text";
@@ -4633,9 +4569,7 @@ group { name: "elm/genlist/item/media-preview/default";
4633 rel1.to: "elm.text"; 4569 rel1.to: "elm.text";
4634 rel2.offset: -1 1; 4570 rel2.offset: -1 1;
4635 rel2.to: "elm.text"; 4571 rel2.to: "elm.text";
4636 color: 51 153 255 255; 4572 color: FN_COL_HIGHLIGHT;
4637 color2: 51 153 255 24;
4638 color3: 51 153 255 18;
4639 color_class: "list_item_selected"; 4573 color_class: "list_item_selected";
4640 text { font: FN; size: 10; 4574 text { font: FN; size: 10;
4641 text_source: "elm.text"; 4575 text_source: "elm.text";
@@ -4679,8 +4613,7 @@ group { name: "elm/genlist/item/media-preview/default";
4679 rel1.to_x: "elm.swallow.preview"; 4613 rel1.to_x: "elm.swallow.preview";
4680 rel2.offset: -3 -3; 4614 rel2.offset: -3 -3;
4681 rel2.relative: 1.0 1.0; 4615 rel2.relative: 1.0 1.0;
4682 color: 255 255 255 255; 4616 color: FN_COL_DEFAULT;
4683 color3: 0 0 0 128;
4684 color_class: "list_item_sub"; 4617 color_class: "list_item_sub";
4685 align: 0.0 1.0; 4618 align: 0.0 1.0;
4686 text { font: FN; size: 8; 4619 text { font: FN; size: 8;
@@ -4708,8 +4641,7 @@ group { name: "elm/genlist/item/media-preview/default";
4708 description { state: "default" 0.0; 4641 description { state: "default" 0.0;
4709 rel1.to: "elm.text.artist"; 4642 rel1.to: "elm.text.artist";
4710 rel2.to: "elm.text.artist"; 4643 rel2.to: "elm.text.artist";
4711 color: 21 21 21 255; 4644 color: FN_COL_DISABLE;
4712 color3: 255 255 255 25;
4713 color_class: "list_item_sub_disabled"; 4645 color_class: "list_item_sub_disabled";
4714 text { font: FN; size: 8; 4646 text { font: FN; size: 8;
4715 text_source: "elm.text.artist"; 4647 text_source: "elm.text.artist";
@@ -4739,9 +4671,7 @@ group { name: "elm/genlist/item/media-preview/default";
4739 rel1.to: "elm.text.artist"; 4671 rel1.to: "elm.text.artist";
4740 rel2.offset: -1 0; 4672 rel2.offset: -1 0;
4741 rel2.to: "elm.text.artist"; 4673 rel2.to: "elm.text.artist";
4742 color: 51 153 255 255; 4674 color: FN_COL_HIGHLIGHT;
4743 color2: 51 153 255 24;
4744 color3: 51 153 255 18;
4745 color_class: "list_item_sub_selected"; 4675 color_class: "list_item_sub_selected";
4746 text { font: FN; size: 8; 4676 text { font: FN; size: 8;
4747 text_source: "elm.text.artist"; 4677 text_source: "elm.text.artist";
@@ -5168,8 +5098,7 @@ group { name: "elm/genlist/item/mode/default";
5168 rel1.relative: 1.0 0.0; 5098 rel1.relative: 1.0 0.0;
5169 rel1.to_x: "elm.swallow.pad"; 5099 rel1.to_x: "elm.swallow.pad";
5170 rel2.offset: -3 -3; 5100 rel2.offset: -3 -3;
5171 color: 255 255 255 255; 5101 color: FN_COL_DEFAULT;
5172 color3: 0 0 0 128;
5173 color_class: "list_item"; 5102 color_class: "list_item";
5174 text { font: FN; size: 10; 5103 text { font: FN; size: 10;
5175 min: 1 1; 5104 min: 1 1;
@@ -5196,8 +5125,7 @@ group { name: "elm/genlist/item/mode/default";
5196 description { state: "default" 0.0; 5125 description { state: "default" 0.0;
5197 rel1.to: "elm.text.mode"; 5126 rel1.to: "elm.text.mode";
5198 rel2.to: "elm.text.mode"; 5127 rel2.to: "elm.text.mode";
5199 color: 21 21 21 255; 5128 color: FN_COL_DISABLE;
5200 color3: 255 255 255 25;
5201 color_class: "list_item_disabled"; 5129 color_class: "list_item_disabled";
5202 text { font: FN; size: 10; 5130 text { font: FN; size: 10;
5203 text_source: "elm.text.mode"; 5131 text_source: "elm.text.mode";
@@ -5227,9 +5155,7 @@ group { name: "elm/genlist/item/mode/default";
5227 rel1.to: "elm.text.mode"; 5155 rel1.to: "elm.text.mode";
5228 rel2.offset: -1 1; 5156 rel2.offset: -1 1;
5229 rel2.to: "elm.text.mode"; 5157 rel2.to: "elm.text.mode";
5230 color: 51 153 255 255; 5158 color: FN_COL_HIGHLIGHT;
5231 color2: 51 153 255 24;
5232 color3: 51 153 255 18;
5233 color_class: "list_item_selected"; 5159 color_class: "list_item_selected";
5234 text { font: FN; size: 10; 5160 text { font: FN; size: 10;
5235 text_source: "elm.text.mode"; 5161 text_source: "elm.text.mode";
diff --git a/data/themes/edc/elm/layout.edc b/data/themes/edc/elm/layout.edc
index 902d82b..a2e0fec 100644
--- a/data/themes/edc/elm/layout.edc
+++ b/data/themes/edc/elm/layout.edc
@@ -105,8 +105,7 @@ group { name: "elm/layout/application/content-back";
105 relative: 0.0 1.0; 105 relative: 0.0 1.0;
106 offset: -3 -1; 106 offset: -3 -1;
107 } 107 }
108 color: 255 255 255 255; 108 color: FN_COL_DEFAULT;
109 color3: 0 0 0 128;
110 text { font: FNBD; size: 10; 109 text { font: FNBD; size: 10;
111 } 110 }
112 } 111 }
@@ -247,8 +246,7 @@ group { name: "elm/layout/application/content-back-next";
247 relative: 0.0 1.0; 246 relative: 0.0 1.0;
248 offset: -3 -1; 247 offset: -3 -1;
249 } 248 }
250 color: 255 255 255 255; 249 color: FN_COL_DEFAULT;
251 color3: 0 0 0 128;
252 text { font: FNBD; size: 10; 250 text { font: FNBD; size: 10;
253 } 251 }
254 } 252 }
@@ -524,8 +522,7 @@ group { name: "elm/layout/application/titlebar";
524 to: "elm.swallow.end"; 522 to: "elm.swallow.end";
525 relative: 0.0 1.0; 523 relative: 0.0 1.0;
526 } 524 }
527 color: 255 255 255 255; 525 color: FN_COL_DEFAULT;
528 color3: 0 0 0 128;
529 text { font: FNBD; size: 10; 526 text { font: FNBD; size: 10;
530 } 527 }
531 } 528 }
diff --git a/data/themes/edc/elm/list.edc b/data/themes/edc/elm/list.edc
index 0932ca6..b05038a 100644
--- a/data/themes/edc/elm/list.edc
+++ b/data/themes/edc/elm/list.edc
@@ -216,8 +216,7 @@ group { name: "elm/list/item/default";
216 rel2.offset: -3 -3; 216 rel2.offset: -3 -3;
217 rel2.relative: 0.0 1.0; 217 rel2.relative: 0.0 1.0;
218 rel2.to_x: "elm.swallow.end"; 218 rel2.to_x: "elm.swallow.end";
219 color: 255 255 255 255; 219 color: FN_COL_DEFAULT;
220 color3: 0 0 0 128;
221 color_class: "list_item"; 220 color_class: "list_item";
222 text { font: FN; size: 10; 221 text { font: FN; size: 10;
223 min: 1 1; 222 min: 1 1;
@@ -240,8 +239,7 @@ group { name: "elm/list/item/default";
240 description { state: "default" 0.0; 239 description { state: "default" 0.0;
241 rel1.to: "elm.text"; 240 rel1.to: "elm.text";
242 rel2.to: "elm.text"; 241 rel2.to: "elm.text";
243 color: 21 21 21 255; 242 color: FN_COL_DISABLE;
244 color3: 255 255 255 25;
245 color_class: "list_item_disabled"; 243 color_class: "list_item_disabled";
246 text { font: FN; size: 10; 244 text { font: FN; size: 10;
247 text_source: "elm.text"; 245 text_source: "elm.text";
@@ -267,9 +265,7 @@ group { name: "elm/list/item/default";
267 rel1.to: "elm.text"; 265 rel1.to: "elm.text";
268 rel2.offset: 1 1; 266 rel2.offset: 1 1;
269 rel2.to: "elm.text"; 267 rel2.to: "elm.text";
270 color: 51 153 255 255; 268 color: FN_COL_HIGHLIGHT;
271 color2: 51 153 255 24;
272 color3: 51 153 255 18;
273 color_class: "list_item_selected"; 269 color_class: "list_item_selected";
274 text { font: FN; size: 10; 270 text { font: FN; size: 10;
275 text_source: "elm.text"; 271 text_source: "elm.text";
@@ -530,8 +526,7 @@ group { name: "elm/list/h_item/default";
530 rel2.offset: -3 -3; 526 rel2.offset: -3 -3;
531 rel2.relative: 1.0 0.0; 527 rel2.relative: 1.0 0.0;
532 rel2.to_y: "elm.swallow.end"; 528 rel2.to_y: "elm.swallow.end";
533 color: 255 255 255 255; 529 color: FN_COL_DEFAULT;
534 color3: 0 0 0 128;
535 color_class: "list_item"; 530 color_class: "list_item";
536 text { font: FN; size: 10; 531 text { font: FN; size: 10;
537 min: 1 1; 532 min: 1 1;
@@ -554,8 +549,7 @@ group { name: "elm/list/h_item/default";
554 description { state: "default" 0.0; 549 description { state: "default" 0.0;
555 rel1.to: "elm.text"; 550 rel1.to: "elm.text";
556 rel2.to: "elm.text"; 551 rel2.to: "elm.text";
557 color: 21 21 21 255; 552 color: FN_COL_DISABLE;
558 color3: 255 255 255 25;
559 color_class: "list_item_disabled"; 553 color_class: "list_item_disabled";
560 text { font: FN; size: 10; 554 text { font: FN; size: 10;
561 text_source: "elm.text"; 555 text_source: "elm.text";
@@ -581,9 +575,7 @@ group { name: "elm/list/h_item/default";
581 rel1.to: "elm.text"; 575 rel1.to: "elm.text";
582 rel2.offset: 1 1; 576 rel2.offset: 1 1;
583 rel2.to: "elm.text"; 577 rel2.to: "elm.text";
584 color: 51 153 255 255; 578 color: FN_COL_HIGHLIGHT;
585 color2: 51 153 255 24;
586 color3: 51 153 255 18;
587 color_class: "list_item_selected"; 579 color_class: "list_item_selected";
588 text { font: FN; size: 10; 580 text { font: FN; size: 10;
589 text_source: "elm.text"; 581 text_source: "elm.text";
diff --git a/data/themes/edc/elm/map.edc b/data/themes/edc/elm/map.edc
index 90b3fe4..fe3170f 100644
--- a/data/themes/edc/elm/map.edc
+++ b/data/themes/edc/elm/map.edc
@@ -38,8 +38,7 @@ group { name: "elm/map/marker/radio/default";
38 rel1.to: "elm.icon"; 38 rel1.to: "elm.icon";
39 rel2.to: "elm.icon"; 39 rel2.to: "elm.icon";
40 color_class: "map_radio"; 40 color_class: "map_radio";
41 color: 21 21 21 255; 41 color: FN_COL_DISABLE_SHADOW;
42 color3: 255 255 255 192;
43 text { font: FNBD; size: 10; 42 text { font: FNBD; size: 10;
44 text_class: "map_radio"; 43 text_class: "map_radio";
45 min: 1 1; 44 min: 1 1;
@@ -73,8 +72,7 @@ group { name: "elm/map/marker/empty/default";
73 rel1.to: "knob"; 72 rel1.to: "knob";
74 rel2.to: "knob"; 73 rel2.to: "knob";
75 color_class: "map_empty"; 74 color_class: "map_empty";
76 color: 255 255 255 255; 75 color: FN_COL_DEFAULT;
77 color3: 0 0 0 128;
78 text { font: FNBD; size: 10; 76 text { font: FNBD; size: 10;
79 text_class: "map_empty"; 77 text_class: "map_empty";
80 min: 1 1; 78 min: 1 1;
@@ -114,8 +112,7 @@ group { name: "elm/map/scale/base/default";
114 rel1.offset: 6 5; 112 rel1.offset: 6 5;
115 rel2.offset: -7 -5; 113 rel2.offset: -7 -5;
116 color_class: "map_scale"; 114 color_class: "map_scale";
117 color: 255 255 255 255; 115 color: FN_COL_DEFAULT;
118 color3: 0 0 0 128;
119 text { font: FNBD; size: 10; 116 text { font: FNBD; size: 10;
120 text_class: "map_scale"; 117 text_class: "map_scale";
121 min: 1 1; 118 min: 1 1;
diff --git a/data/themes/edc/elm/menu.edc b/data/themes/edc/elm/menu.edc
index 81757d4..9e8e106 100644
--- a/data/themes/edc/elm/menu.edc
+++ b/data/themes/edc/elm/menu.edc
@@ -103,8 +103,7 @@ group { name: "elm/menu/item/default";
103 description { state: "default" 0.0; 103 description { state: "default" 0.0;
104 rel1.to: "elm.text"; 104 rel1.to: "elm.text";
105 rel2.to: "elm.text"; 105 rel2.to: "elm.text";
106 color: 21 21 21 255; 106 color: FN_COL_DISABLE;
107 color3: 255 255 255 25;
108 color_class: "menu_item_disabled"; 107 color_class: "menu_item_disabled";
109 text { font: FN; size: 10; 108 text { font: FN; size: 10;
110 text_source: "elm.text"; 109 text_source: "elm.text";
@@ -130,9 +129,7 @@ group { name: "elm/menu/item/default";
130 rel1.to: "elm.text"; 129 rel1.to: "elm.text";
131 rel2.offset: 2 1; 130 rel2.offset: 2 1;
132 rel2.to: "elm.text"; 131 rel2.to: "elm.text";
133 color: 51 153 255 255; 132 color: FN_COL_HIGHLIGHT;
134 color2: 51 153 255 24;
135 color3: 51 153 255 18;
136 color_class: "menu_item_active"; 133 color_class: "menu_item_active";
137 text { font: FN; size: 10; 134 text { font: FN; size: 10;
138 text_source: "elm.text"; 135 text_source: "elm.text";
@@ -484,8 +481,7 @@ group { name: "elm/menu/main_menu_submenu/default";
484 description { state: "default" 0.0; 481 description { state: "default" 0.0;
485 rel1.to: "elm.text"; 482 rel1.to: "elm.text";
486 rel2.to: "elm.text"; 483 rel2.to: "elm.text";
487 color: 21 21 21 255; 484 color: FN_COL_DISABLE;
488 color3: 255 255 255 25;
489 color_class: "menu_item_disabled"; 485 color_class: "menu_item_disabled";
490 text { font: FN; size: 10; 486 text { font: FN; size: 10;
491 text_source: "elm.text"; 487 text_source: "elm.text";
@@ -511,9 +507,7 @@ group { name: "elm/menu/main_menu_submenu/default";
511 rel1.to: "elm.text"; 507 rel1.to: "elm.text";
512 rel2.offset: 2 1; 508 rel2.offset: 2 1;
513 rel2.to: "elm.text"; 509 rel2.to: "elm.text";
514 color: 51 153 255 255; 510 color: FN_COL_HIGHLIGHT;
515 color2: 51 153 255 24;
516 color3: 51 153 255 18;
517 color_class: "menu_item_active"; 511 color_class: "menu_item_active";
518 text { font: FN; size: 10; 512 text { font: FN; size: 10;
519 text_source: "elm.text"; 513 text_source: "elm.text";
diff --git a/data/themes/edc/elm/multibuttonentry.edc b/data/themes/edc/elm/multibuttonentry.edc
index bbe03f5..6234dd1 100644
--- a/data/themes/edc/elm/multibuttonentry.edc
+++ b/data/themes/edc/elm/multibuttonentry.edc
@@ -15,9 +15,7 @@ group { name: "elm/multibuttonentry/label/default";
15 effect: GLOW; 15 effect: GLOW;
16 scale: 1; 16 scale: 1;
17 description { state: "default" 0.0; 17 description { state: "default" 0.0;
18 color: 51 153 255 255; 18 color: FN_COL_HIGHLIGHT;
19 color2: 51 153 255 24;
20 color3: 51 153 255 18;
21 color_class: "multibuttonentry_label"; 19 color_class: "multibuttonentry_label";
22 text { font: FNBD; size: 10; 20 text { font: FNBD; size: 10;
23 min: 1 1; 21 min: 1 1;
@@ -58,8 +56,7 @@ group { name: "elm/multibuttonentry/guidetext/default";
58 description { state: "default" 0.0; 56 description { state: "default" 0.0;
59 rel1.offset: 2 2; 57 rel1.offset: 2 2;
60 rel2.offset: -3 -3; 58 rel2.offset: -3 -3;
61 color: 21 21 21 255; 59 color: FN_COL_DISABLE;
62 color3: 255 255 255 25;
63 text { font: FNBD; size: 10; 60 text { font: FNBD; size: 10;
64 min: 0 1; 61 min: 0 1;
65 align: 0.0 0.5; 62 align: 0.0 0.5;
diff --git a/data/themes/edc/elm/naviframe.edc b/data/themes/edc/elm/naviframe.edc
index 025d24a..6bf6149 100644
--- a/data/themes/edc/elm/naviframe.edc
+++ b/data/themes/edc/elm/naviframe.edc
@@ -138,8 +138,7 @@ group { name: "elm/naviframe/item/basic/default";
138 rel2.relative: 1.0 0.0; 138 rel2.relative: 1.0 0.0;
139 rel2.offset: -1 2; 139 rel2.offset: -1 2;
140 align: 0.5 0.0; 140 align: 0.5 0.0;
141 color: 255 255 255 255; 141 color: FN_COL_DEFAULT_SOFT_SHADOW;
142 color3: 0 0 0 18;
143 text { font: FN; size: 8; 142 text { font: FN; size: 8;
144 text: "X"; 143 text: "X";
145 text_class: "title_bar_sub"; 144 text_class: "title_bar_sub";
@@ -161,8 +160,7 @@ group { name: "elm/naviframe/item/basic/default";
161 rel2.to_y: "title1"; 160 rel2.to_y: "title1";
162 rel2.offset: -1 -1; 161 rel2.offset: -1 -1;
163 align: 0.5 0.0; 162 align: 0.5 0.0;
164 color: 255 255 255 255; 163 color: FN_COL_DEFAULT_SOFT_SHADOW;
165 color3: 0 0 0 18;
166 text { font: FNBD; size: 10; 164 text { font: FNBD; size: 10;
167 text: "X"; 165 text: "X";
168 text_class: "title_bar"; 166 text_class: "title_bar";
@@ -182,8 +180,7 @@ group { name: "elm/naviframe/item/basic/default";
182 rel2.to_y: "title2"; 180 rel2.to_y: "title2";
183 rel2.offset: -1 -3; 181 rel2.offset: -1 -3;
184 align: 0.5 0.0; 182 align: 0.5 0.0;
185 color: 255 255 255 255; 183 color: FN_COL_DEFAULT_SOFT_SHADOW;
186 color3: 0 0 0 18;
187 text { font: FN; size: 8; 184 text { font: FN; size: 8;
188 text: "X"; 185 text: "X";
189 text_class: "title_bar_sub"; 186 text_class: "title_bar_sub";
@@ -312,8 +309,7 @@ group { name: "elm/naviframe/item/basic/default";
312 rel2.to_y: "top"; 309 rel2.to_y: "top";
313 rel2.relative: 1.0 0.5; 310 rel2.relative: 1.0 0.5;
314 align: 0.5 0.5; 311 align: 0.5 0.5;
315 color: 255 255 255 255; 312 color: FN_COL_DEFAULT_SOFT_SHADOW;
316 color3: 0 0 0 18;
317 text { font: FNBD; size: 10; 313 text { font: FNBD; size: 10;
318 text_class: "title_bar"; 314 text_class: "title_bar";
319 align: 0.5 0.5; 315 align: 0.5 0.5;
@@ -339,8 +335,7 @@ group { name: "elm/naviframe/item/basic/default";
339 rel2.to_y: "elm.text.title"; 335 rel2.to_y: "elm.text.title";
340 rel2.offset: -1 -3; 336 rel2.offset: -1 -3;
341 align: 0.5 0.0; 337 align: 0.5 0.0;
342 color: 255 255 255 255; 338 color: FN_COL_DEFAULT;
343 color3: 0 0 0 128;
344 text { font: FN; size: 8; 339 text { font: FN; size: 8;
345 text_class: "title_bar_sub"; 340 text_class: "title_bar_sub";
346 align: 0.5 0.0; 341 align: 0.5 0.0;
diff --git a/data/themes/edc/elm/progress.edc b/data/themes/edc/elm/progress.edc
index d8be3d3..7d0a8ec 100644
--- a/data/themes/edc/elm/progress.edc
+++ b/data/themes/edc/elm/progress.edc
@@ -122,8 +122,7 @@ group { name: "elm/progressbar/horizontal/default";
122 rel2.to_x: "elm.swallow.content"; 122 rel2.to_x: "elm.swallow.content";
123 rel2.relative: 1.0 1.0; 123 rel2.relative: 1.0 1.0;
124 rel2.offset: -1 -3; 124 rel2.offset: -1 -3;
125 color: 255 255 255 255; 125 color: FN_COL_DEFAULT;
126 color3: 0 0 0 128;
127 color_class: "progressbar_text"; 126 color_class: "progressbar_text";
128 text { font: FN; size: 10; 127 text { font: FN; size: 10;
129 text_class: "progressbar"; 128 text_class: "progressbar";
@@ -143,8 +142,7 @@ group { name: "elm/progressbar/horizontal/default";
143 description { state: "disabled_visible" 0.0; 142 description { state: "disabled_visible" 0.0;
144 inherit: "visible" 0.0; 143 inherit: "visible" 0.0;
145 color_class: "progressbar_text_disabled"; 144 color_class: "progressbar_text_disabled";
146 color: 21 21 21 255; 145 color: FN_COL_DISABLE_LIGHTER_SHADOW;
147 color3: 255 255 255 15;
148 } 146 }
149 } 147 }
150 part { name: "bg-hi"; 148 part { name: "bg-hi";
@@ -339,9 +337,7 @@ group { name: "elm/progressbar/horizontal/default";
339 text_class: "progress_status"; 337 text_class: "progress_status";
340 align: 1.0 0.5; 338 align: 1.0 0.5;
341 } 339 }
342 color: 255 255 255 255; 340 color: FN_COL_HIGHLIGHT_CLICKED;
343 color2: 51 153 255 64;
344 color3: 51 153 255 32;
345 visible: 1; 341 visible: 1;
346 } 342 }
347 description { state: "hidden" 0.0; 343 description { state: "hidden" 0.0;
@@ -681,8 +677,7 @@ group { name: "elm/progressbar/vertical/default";
681 rel2.to_y: "elm.swallow.content"; 677 rel2.to_y: "elm.swallow.content";
682 rel2.relative: 1.0 1.0; 678 rel2.relative: 1.0 1.0;
683 rel2.offset: -3 -1; 679 rel2.offset: -3 -1;
684 color: 255 255 255 255; 680 color: FN_COL_DEFAULT;
685 color3: 0 0 0 128;
686 color_class: "progressbar_text"; 681 color_class: "progressbar_text";
687 text { font: FN; size: 10; 682 text { font: FN; size: 10;
688 text_class: "progressbar"; 683 text_class: "progressbar";
@@ -702,8 +697,7 @@ group { name: "elm/progressbar/vertical/default";
702 description { state: "disabled_visible" 0.0; 697 description { state: "disabled_visible" 0.0;
703 inherit: "visible" 0.0; 698 inherit: "visible" 0.0;
704 color_class: "progressbar_text_disabled"; 699 color_class: "progressbar_text_disabled";
705 color: 21 21 21 255; 700 color: FN_COL_DISABLE_LIGHTER_SHADOW;
706 color3: 255 255 255 15;
707 } 701 }
708 } 702 }
709 part { name: "bg-hi"; 703 part { name: "bg-hi";
@@ -907,9 +901,7 @@ group { name: "elm/progressbar/vertical/default";
907 text_class: "progress_status"; 901 text_class: "progress_status";
908 align: 1.0 0.5; 902 align: 1.0 0.5;
909 } 903 }
910 color: 255 255 255 255; 904 color: FN_COL_HIGHLIGHT_CLICKED;
911 color2: 51 153 255 64;
912 color3: 51 153 255 32;
913 visible: 1; 905 visible: 1;
914 map.on: 1; 906 map.on: 1;
915 map.smooth: 0; 907 map.smooth: 0;
diff --git a/data/themes/edc/elm/radio.edc b/data/themes/edc/elm/radio.edc
index 2dacbe9..e391d90 100644
--- a/data/themes/edc/elm/radio.edc
+++ b/data/themes/edc/elm/radio.edc
@@ -164,8 +164,7 @@ group { name: "elm/radio/base/default";
164 rel1.to_x: "elm.swallow.content"; 164 rel1.to_x: "elm.swallow.content";
165 rel1.relative: 1.0 0.0; 165 rel1.relative: 1.0 0.0;
166 rel2.offset: -3 -3; 166 rel2.offset: -3 -3;
167 color: 255 255 255 255; 167 color: FN_COL_DEFAULT;
168 color3: 0 0 0 128;
169 color_class: "radio_text"; 168 color_class: "radio_text";
170 text { font: FN; size: 10; 169 text { font: FN; size: 10;
171 min: 0 0; 170 min: 0 0;
@@ -175,8 +174,7 @@ group { name: "elm/radio/base/default";
175 } 174 }
176 description { state: "disabled" 0.0; 175 description { state: "disabled" 0.0;
177 inherit: "default" 0.0; 176 inherit: "default" 0.0;
178 color: 21 21 21 255; 177 color: FN_COL_DISABLE;
179 color3: 255 255 255 25;
180 } 178 }
181 description { state: "visible" 0.0; 179 description { state: "visible" 0.0;
182 inherit: "default" 0.0; 180 inherit: "default" 0.0;
diff --git a/data/themes/edc/elm/segment_control.edc b/data/themes/edc/elm/segment_control.edc
index 3ab699c..365f828 100644
--- a/data/themes/edc/elm/segment_control.edc
+++ b/data/themes/edc/elm/segment_control.edc
@@ -192,8 +192,7 @@ group { name: "elm/segment_control/item/default";
192 } 192 }
193 description { state: "pressed" 0.0; 193 description { state: "pressed" 0.0;
194 inherit: "default" 0.0; 194 inherit: "default" 0.0;
195 color: 255 255 255 255; 195 color: FN_COL_DEFAULT_BASIC2;
196 color3: 255 255 255 0;
197 visible: 1; 196 visible: 1;
198 } 197 }
199 description { state: "disabled" 0.0; 198 description { state: "disabled" 0.0;
@@ -221,9 +220,7 @@ group { name: "elm/segment_control/item/default";
221 text_source: "elm.text"; 220 text_source: "elm.text";
222 text_class: "button"; 221 text_class: "button";
223 } 222 }
224 color: 255 255 255 255; 223 color: FN_COL_WHITE_GLOW;
225 color2: 255 255 255 24;
226 color3: 255 255 255 18;
227 } 224 }
228 description { state: "selected" 0.0; 225 description { state: "selected" 0.0;
229 inherit: "default" 0.0; 226 inherit: "default" 0.0;
diff --git a/data/themes/edc/elm/slider.edc b/data/themes/edc/elm/slider.edc
index 578b25f..4aefb02 100644
--- a/data/themes/edc/elm/slider.edc
+++ b/data/themes/edc/elm/slider.edc
@@ -262,8 +262,7 @@ group { name: "elm/slider/horizontal/default";
262 rel2.to_x: "elm.swallow.icon"; 262 rel2.to_x: "elm.swallow.icon";
263 rel2.relative: 1.0 1.0; 263 rel2.relative: 1.0 1.0;
264 rel2.offset: -1 -3; 264 rel2.offset: -1 -3;
265 color: 255 255 255 255; 265 color: FN_COL_DEFAULT;
266 color3: 0 0 0 128;
267 color_class: "slider_text"; 266 color_class: "slider_text";
268 text { font: FN; size: 10; 267 text { font: FN; size: 10;
269 text_class: "slider"; 268 text_class: "slider";
@@ -283,8 +282,7 @@ group { name: "elm/slider/horizontal/default";
283 description { state: "disabled_visible" 0.0; 282 description { state: "disabled_visible" 0.0;
284 inherit: "visible" 0.0; 283 inherit: "visible" 0.0;
285 color_class: "slider_text_disabled"; 284 color_class: "slider_text_disabled";
286 color: 21 21 21 255; 285 color: FN_COL_DISABLE;
287 color3: 255 255 255 15;
288 } 286 }
289 } 287 }
290 part { name: "elm.swallow.end"; type: SWALLOW; 288 part { name: "elm.swallow.end"; type: SWALLOW;
@@ -356,8 +354,7 @@ group { name: "elm/slider/horizontal/default";
356 fixed: 1 1; 354 fixed: 1 1;
357 rel1.to_x: "limits"; 355 rel1.to_x: "limits";
358 rel2.to_x: "limits"; 356 rel2.to_x: "limits";
359 color: 255 255 255 255; 357 color: FN_COL_DEFAULT;
360 color3: 0 0 0 128;
361 color_class: "slider_text"; 358 color_class: "slider_text";
362 text { font: FN; size: 10; 359 text { font: FN; size: 10;
363 text_class: "slider"; 360 text_class: "slider";
@@ -371,8 +368,7 @@ group { name: "elm/slider/horizontal/default";
371 } 368 }
372 description { state: "disabled_visible" 0.0; 369 description { state: "disabled_visible" 0.0;
373 inherit: "visible" 0.0; 370 inherit: "visible" 0.0;
374 color: 21 21 21 255; 371 color: FN_COL_DISABLE_LIGHTER_SHADOW;
375 color3: 255 255 255 15;
376 color_class: "slider_text_disabled"; 372 color_class: "slider_text_disabled";
377 } 373 }
378 } 374 }
@@ -672,8 +668,7 @@ group { name: "elm/slider/horizontal/indicator/default";
672 rel2.relative: 1.0 -0.1; 668 rel2.relative: 1.0 -0.1;
673 rel2.offset: -1 -12; 669 rel2.offset: -1 -12;
674 color_class: "slider_indicator"; 670 color_class: "slider_indicator";
675 color: 255 255 255 255; 671 color: FN_COL_DEFAULT;
676 color3: 0 0 0 128;
677 text { font: FNBD; size: 10; 672 text { font: FNBD; size: 10;
678 min: 1 1; 673 min: 1 1;
679 align: 0.5 1.0; 674 align: 0.5 1.0;
@@ -974,8 +969,7 @@ group { name: "elm/slider/vertical/default";
974 rel2.to_y: "elm.swallow.icon"; 969 rel2.to_y: "elm.swallow.icon";
975 rel2.relative: 1.0 1.0; 970 rel2.relative: 1.0 1.0;
976 rel2.offset: -3 -1; 971 rel2.offset: -3 -1;
977 color: 255 255 255 255; 972 color: FN_COL_DEFAULT;
978 color3: 0 0 0 128;
979 color_class: "slider_text"; 973 color_class: "slider_text";
980 text { font: FN; size: 10; 974 text { font: FN; size: 10;
981 text_class: "slider"; 975 text_class: "slider";
@@ -994,8 +988,7 @@ group { name: "elm/slider/vertical/default";
994 description { state: "disabled_visible" 0.0; 988 description { state: "disabled_visible" 0.0;
995 inherit: "visible" 0.0; 989 inherit: "visible" 0.0;
996 color_class: "slider_text_disabled"; 990 color_class: "slider_text_disabled";
997 color: 21 21 21 255; 991 color: FN_COL_DISABLE_LIGHTER_SHADOW;
998 color3: 255 255 255 15;
999 } 992 }
1000 } 993 }
1001 part { name: "elm.swallow.end"; type: SWALLOW; 994 part { name: "elm.swallow.end"; type: SWALLOW;
@@ -1067,8 +1060,7 @@ group { name: "elm/slider/vertical/default";
1067 fixed: 1 1; 1060 fixed: 1 1;
1068 rel1.to_y: "limits"; 1061 rel1.to_y: "limits";
1069 rel2.to_y: "limits"; 1062 rel2.to_y: "limits";
1070 color: 255 255 255 255; 1063 color: FN_COL_DEFAULT;
1071 color3: 0 0 0 128;
1072 color_class: "slider_text"; 1064 color_class: "slider_text";
1073 text { font: FN; size: 10; 1065 text { font: FN; size: 10;
1074 text_class: "slider"; 1066 text_class: "slider";
@@ -1083,8 +1075,7 @@ group { name: "elm/slider/vertical/default";
1083 } 1075 }
1084 description { state: "disabled_visible" 0.0; 1076 description { state: "disabled_visible" 0.0;
1085 inherit: "visible" 0.0; 1077 inherit: "visible" 0.0;
1086 color: 21 21 21 255; 1078 color: FN_COL_DISABLE_LIGHTER_SHADOW;
1087 color3: 255 255 255 15;
1088 color_class: "slider_text_disabled"; 1079 color_class: "slider_text_disabled";
1089 } 1080 }
1090 } 1081 }
@@ -1384,8 +1375,7 @@ group { name: "elm/slider/vertical/indicator/default";
1384 rel2.relative: 1.1 1.0; 1375 rel2.relative: 1.1 1.0;
1385 rel2.offset: 11 -1; 1376 rel2.offset: 11 -1;
1386 color_class: "slider_indicator"; 1377 color_class: "slider_indicator";
1387 color: 255 255 255 255; 1378 color: FN_COL_DEFAULT;
1388 color3: 0 0 0 128;
1389 text { font: FNBD; size: 10; 1379 text { font: FNBD; size: 10;
1390 min: 1 1; 1380 min: 1 1;
1391 align: 0.0 0.5; 1381 align: 0.0 0.5;
diff --git a/data/themes/edc/elm/toolbar.edc b/data/themes/edc/elm/toolbar.edc
index 9793709..e3c4d9b 100644
--- a/data/themes/edc/elm/toolbar.edc
+++ b/data/themes/edc/elm/toolbar.edc
@@ -608,8 +608,7 @@ group { name: "elm/toolbar/item/default";
608 } 608 }
609 description { state: "disabled" 0.0; 609 description { state: "disabled" 0.0;
610 inherit: "default" 0.0; 610 inherit: "default" 0.0;
611 color: 21 21 21 255; 611 color: FN_COL_DISABLE;
612 color3: 255 255 255 25;
613 color_class: "toolbar_item_disabled"; 612 color_class: "toolbar_item_disabled";
614 } 613 }
615 description { state: "noicon" 0.0; 614 description { state: "noicon" 0.0;
@@ -620,8 +619,7 @@ group { name: "elm/toolbar/item/default";
620 } 619 }
621 description { state: "noicon_disabled" 0.0; 620 description { state: "noicon_disabled" 0.0;
622 inherit: "noicon" 0.0; 621 inherit: "noicon" 0.0;
623 color: 21 21 21 255; 622 color: FN_COL_DISABLE;
624 color3: 255 255 255 25;
625 color_class: "toolbar_item_disabled"; 623 color_class: "toolbar_item_disabled";
626 } 624 }
627 description { state: "icononly" 0.0; 625 description { state: "icononly" 0.0;
@@ -702,8 +700,7 @@ group { name: "elm/toolbar/item/default";
702 } 700 }
703 description { state: "disabled" 0.0; 701 description { state: "disabled" 0.0;
704 inherit: "default" 0.0; 702 inherit: "default" 0.0;
705 color: 21 21 21 255; 703 color: FN_COL_DISABLE;
706 color3: 255 255 255 25;
707 color_class: "toolbar_item_disabled"; 704 color_class: "toolbar_item_disabled";
708 } 705 }
709 description { state: "noicon" 0.0; 706 description { state: "noicon" 0.0;
@@ -714,8 +711,7 @@ group { name: "elm/toolbar/item/default";
714 } 711 }
715 description { state: "noicon_disabled" 0.0; 712 description { state: "noicon_disabled" 0.0;
716 inherit: "noicon" 0.0; 713 inherit: "noicon" 0.0;
717 color: 21 21 21 255; 714 color: FN_COL_DISABLE;
718 color3: 255 255 255 25;
719 color_class: "toolbar_item_disabled"; 715 color_class: "toolbar_item_disabled";
720 } 716 }
721 description { state: "icononly" 0.0; 717 description { state: "icononly" 0.0;
@@ -1043,8 +1039,7 @@ group { name: "elm/toolbar/item/item_horizontal";
1043 rel1.to_x: "elm.swallow.icon"; 1039 rel1.to_x: "elm.swallow.icon";
1044 rel2.offset: -5 -3; 1040 rel2.offset: -5 -3;
1045 align: 0.0 0.5; 1041 align: 0.0 0.5;
1046 color: 255 255 255 255; 1042 color: FN_COL_DEFAULT;
1047 color3: 0 0 0 128;
1048 color_class: "toolbar_item"; 1043 color_class: "toolbar_item";
1049 text { font: FN; size: 10; 1044 text { font: FN; size: 10;
1050 min: 1 1; 1045 min: 1 1;
@@ -1059,8 +1054,7 @@ group { name: "elm/toolbar/item/item_horizontal";
1059 } 1054 }
1060 description { state: "disabled" 0.0; 1055 description { state: "disabled" 0.0;
1061 inherit: "default" 0.0; 1056 inherit: "default" 0.0;
1062 color: 21 21 21 255; 1057 color: FN_COL_DISABLE;
1063 color3: 255 255 255 25;
1064 color_class: "toolbar_item_disabled"; 1058 color_class: "toolbar_item_disabled";
1065 } 1059 }
1066 description { state: "noicon" 0.0; 1060 description { state: "noicon" 0.0;
@@ -1072,8 +1066,7 @@ group { name: "elm/toolbar/item/item_horizontal";
1072 } 1066 }
1073 description { state: "noicon_disabled" 0.0; 1067 description { state: "noicon_disabled" 0.0;
1074 inherit: "noicon" 0.0; 1068 inherit: "noicon" 0.0;
1075 color: 21 21 21 255; 1069 color: FN_COL_DISABLE;
1076 color3: 255 255 255 25;
1077 color_class: "toolbar_item_disabled"; 1070 color_class: "toolbar_item_disabled";
1078 } 1071 }
1079 description { state: "icononly" 0.0; 1072 description { state: "icononly" 0.0;
@@ -1107,8 +1100,7 @@ group { name: "elm/toolbar/item/item_horizontal";
1107 rel1.to_x: "elm.swallow.icon"; 1100 rel1.to_x: "elm.swallow.icon";
1108 rel2.offset: -5 -3; 1101 rel2.offset: -5 -3;
1109 align: 0.0 0.5; 1102 align: 0.0 0.5;
1110 color: 255 255 255 255; 1103 color: FN_COL_DEFAULT;
1111 color3: 0 0 0 128;
1112 color_class: "toolbar_item"; 1104 color_class: "toolbar_item";
1113 text { font: FN; size: 10; 1105 text { font: FN; size: 10;
1114 min: 1 1; 1106 min: 1 1;
@@ -1123,8 +1115,7 @@ group { name: "elm/toolbar/item/item_horizontal";
1123 } 1115 }
1124 description { state: "disabled" 0.0; 1116 description { state: "disabled" 0.0;
1125 inherit: "default" 0.0; 1117 inherit: "default" 0.0;
1126 color: 21 21 21 255; 1118 color: FN_COL_DISABLE;
1127 color3: 255 255 255 25;
1128 color_class: "toolbar_item_disabled"; 1119 color_class: "toolbar_item_disabled";
1129 } 1120 }
1130 description { state: "noicon" 0.0; 1121 description { state: "noicon" 0.0;
@@ -1136,8 +1127,7 @@ group { name: "elm/toolbar/item/item_horizontal";
1136 } 1127 }
1137 description { state: "noicon_disabled" 0.0; 1128 description { state: "noicon_disabled" 0.0;
1138 inherit: "noicon" 0.0; 1129 inherit: "noicon" 0.0;
1139 color: 21 21 21 255; 1130 color: FN_COL_DISABLE;
1140 color3: 255 255 255 25;
1141 color_class: "toolbar_item_disabled"; 1131 color_class: "toolbar_item_disabled";
1142 } 1132 }
1143 description { state: "icononly" 0.0; 1133 description { state: "icononly" 0.0;
diff --git a/data/themes/edc/evrything.edc b/data/themes/edc/evrything.edc
index ec9de7b..0fd3536 100644
--- a/data/themes/edc/evrything.edc
+++ b/data/themes/edc/evrything.edc
@@ -205,8 +205,7 @@ group { name: "e/modules/everything/selector_item";
205 rel2.to: "clip"; 205 rel2.to: "clip";
206 rel1.offset: 2 3; 206 rel1.offset: 2 3;
207 rel2.offset: -6 -7; 207 rel2.offset: -6 -7;
208 color: 255 255 255 255; 208 color: FN_COL_DEFAULT;
209 color3: 0 0 0 128;
210 color_class: "menu_item"; 209 color_class: "menu_item";
211 text { font: FNBD; size: 10; 210 text { font: FNBD; size: 10;
212 min: 0 1; 211 min: 0 1;
@@ -228,9 +227,7 @@ group { name: "e/modules/everything/selector_item";
228 rel1.to: "e.text.label"; 227 rel1.to: "e.text.label";
229 rel2.offset: 2 0; 228 rel2.offset: 2 0;
230 rel2.to: "e.text.label"; 229 rel2.to: "e.text.label";
231 color: 51 153 255 255; 230 color: FN_COL_HIGHLIGHT;
232 color2: 51 153 255 24;
233 color3: 51 153 255 18;
234 color_class: "menu_item_active"; 231 color_class: "menu_item_active";
235 text { font: FNBD; size: 10; 232 text { font: FNBD; size: 10;
236 text_source: "e.text.label"; 233 text_source: "e.text.label";
@@ -253,8 +250,7 @@ group { name: "e/modules/everything/selector_item";
253 align: 1.0 0.0; 250 align: 1.0 0.0;
254 rel1.offset: 6 6; 251 rel1.offset: 6 6;
255 rel2.offset: -7 -1; 252 rel2.offset: -7 -1;
256 color: 255 255 255 255; 253 color: FN_COL_DEFAULT;
257 color3: 0 0 0 128;
258 color_class: "menu_item"; 254 color_class: "menu_item";
259 text { font: FN; size: 10; 255 text { font: FN; size: 10;
260 min: 0 1; 256 min: 0 1;
@@ -276,9 +272,7 @@ group { name: "e/modules/everything/selector_item";
276 rel1.to: "e.text.plugin"; 272 rel1.to: "e.text.plugin";
277 rel2.offset: 1 1; 273 rel2.offset: 1 1;
278 rel2.to: "e.text.plugin"; 274 rel2.to: "e.text.plugin";
279 color: 51 153 255 255; 275 color: FN_COL_HIGHLIGHT;
280 color2: 51 153 255 24;
281 color3: 51 153 255 18;
282 color_class: "menu_item_active"; 276 color_class: "menu_item_active";
283 text { font: FN; size: 10; 277 text { font: FN; size: 10;
284 text_source: "e.text.plugin"; 278 text_source: "e.text.plugin";
@@ -454,8 +448,7 @@ group { name: "e/modules/everything/list";
454 rel1.offset: 4 4; 448 rel1.offset: 4 4;
455 rel2.relative: 0.0 0.0; 449 rel2.relative: 0.0 0.0;
456 rel2.offset: 4 4; 450 rel2.offset: 4 4;
457 color: 255 255 255 255; 451 color: FN_COL_DEFAULT;
458 color3: 0 0 0 128;
459 text { font: FN; size: 10; 452 text { font: FN; size: 10;
460 align: 0.0 0.5; 453 align: 0.0 0.5;
461 min: 1 1; 454 min: 1 1;
@@ -759,8 +752,7 @@ group { name: "e/modules/everything/tab_item";
759 rel2.offset: -5 -3; 752 rel2.offset: -5 -3;
760 rel2.relative: 0.5 1.0; 753 rel2.relative: 0.5 1.0;
761 align: 0.5 0.5; 754 align: 0.5 0.5;
762 color: 255 255 255 255; 755 color: FN_COL_DEFAULT;
763 color3: 0 0 0 128;
764 color_class: "menu_item"; 756 color_class: "menu_item";
765 text { font: FN; size: 10; 757 text { font: FN; size: 10;
766 min: 1 1; 758 min: 1 1;
@@ -782,9 +774,7 @@ group { name: "e/modules/everything/tab_item";
782 rel1.to: "e.text.label"; 774 rel1.to: "e.text.label";
783 rel2.offset: 2 1; 775 rel2.offset: 2 1;
784 rel2.to: "e.text.label"; 776 rel2.to: "e.text.label";
785 color: 51 153 255 255; 777 color: FN_COL_HIGHLIGHT;
786 color2: 51 153 255 24;
787 color3: 51 153 255 18;
788 color_class: "menu_item_active"; 778 color_class: "menu_item_active";
789 text { font: FN; size: 10; 779 text { font: FN; size: 10;
790 text_source: "e.text.label"; 780 text_source: "e.text.label";
@@ -1385,9 +1375,7 @@ group { name: "e/modules/everything/thumbview/item/thumb";
1385 rel1.to: "e.text.label"; 1375 rel1.to: "e.text.label";
1386 rel2.offset: 2 2; 1376 rel2.offset: 2 2;
1387 rel2.to: "e.text.label"; 1377 rel2.to: "e.text.label";
1388 color: 51 153 255 255; 1378 color: FN_COL_HIGHLIGHT;
1389 color2: 51 153 255 24;
1390 color3: 51 153 255 18;
1391 color_class: "menu_item_active"; 1379 color_class: "menu_item_active";
1392 text { font: FN; size: 10; 1380 text { font: FN; size: 10;
1393 text_source: "e.text.label"; 1381 text_source: "e.text.label";
@@ -1613,8 +1601,7 @@ group { name: "e/modules/everything/thumbview/item/list";
1613 rel2.offset: -3 -3; 1601 rel2.offset: -3 -3;
1614 rel2.relative: 0.0 1.0; 1602 rel2.relative: 0.0 1.0;
1615 rel2.to_x: "arrow"; 1603 rel2.to_x: "arrow";
1616 color: 255 255 255 255; 1604 color: FN_COL_DEFAULT;
1617 color3: 0 0 0 128;
1618 color_class: "ilist_item"; 1605 color_class: "ilist_item";
1619 align: 1.0 0.5; 1606 align: 1.0 0.5;
1620 max: 160 99999; 1607 max: 160 99999;
@@ -1638,9 +1625,7 @@ group { name: "e/modules/everything/thumbview/item/list";
1638 rel1.to: "e.text.detail"; 1625 rel1.to: "e.text.detail";
1639 rel2.offset: 1 1; 1626 rel2.offset: 1 1;
1640 rel2.to: "e.text.detail"; 1627 rel2.to: "e.text.detail";
1641 color: 51 153 255 255; 1628 color: FN_COL_HIGHLIGHT;
1642 color2: 51 153 255 24;
1643 color3: 51 153 255 18;
1644 color_class: "ilist_item_selected"; 1629 color_class: "ilist_item_selected";
1645 align: 1.0 0.5; 1630 align: 1.0 0.5;
1646 max: 160 99999; 1631 max: 160 99999;
@@ -1667,8 +1652,7 @@ group { name: "e/modules/everything/thumbview/item/list";
1667 rel2.offset: -3 -3; 1652 rel2.offset: -3 -3;
1668 rel2.relative: 0.0 1.0; 1653 rel2.relative: 0.0 1.0;
1669 rel2.to_x: "e.text.detail"; 1654 rel2.to_x: "e.text.detail";
1670 color: 255 255 255 255; 1655 color: FN_COL_DEFAULT;
1671 color3: 0 0 0 128;
1672 color_class: "ilist_item"; 1656 color_class: "ilist_item";
1673 text { font: FN; size: 10; 1657 text { font: FN; size: 10;
1674 min: 0 1; 1658 min: 0 1;
@@ -1689,9 +1673,7 @@ group { name: "e/modules/everything/thumbview/item/list";
1689 rel1.to: "e.text.label"; 1673 rel1.to: "e.text.label";
1690 rel2.offset: 2 1; 1674 rel2.offset: 2 1;
1691 rel2.to: "e.text.label"; 1675 rel2.to: "e.text.label";
1692 color: 51 153 255 255; 1676 color: FN_COL_HIGHLIGHT;
1693 color2: 51 153 255 24;
1694 color3: 51 153 255 18;
1695 color_class: "ilist_item_selected"; 1677 color_class: "ilist_item_selected";
1696 text { font: FN; size: 10; 1678 text { font: FN; size: 10;
1697 min: 0 1; 1679 min: 0 1;
diff --git a/data/themes/edc/fileman.edc b/data/themes/edc/fileman.edc
index cea767a..26b1bba 100644
--- a/data/themes/edc/fileman.edc
+++ b/data/themes/edc/fileman.edc
@@ -80,8 +80,7 @@ group { name: "e/fileman/default/list/variable";
80 rel1.to_x: "icon0"; 80 rel1.to_x: "icon0";
81 rel2.offset: -3 -3; 81 rel2.offset: -3 -3;
82 rel2.relative: 1.0 1.0; 82 rel2.relative: 1.0 1.0;
83 color: 255 255 255 255; 83 color: FN_COL_DEFAULT;
84 color3: 0 0 0 128;
85 color_class: "ilist_item"; 84 color_class: "ilist_item";
86 text { font: FN; size: 10; 85 text { font: FN; size: 10;
87 min: 1 1; 86 min: 1 1;
@@ -104,8 +103,7 @@ group { name: "e/fileman/default/list/variable";
104 description { state: "default" 0.0; 103 description { state: "default" 0.0;
105 rel1.to: "e.text.label"; 104 rel1.to: "e.text.label";
106 rel2.to: "e.text.label"; 105 rel2.to: "e.text.label";
107 color: 21 21 21 255; 106 color: FN_COL_DISABLE;
108 color3: 255 255 255 25;
109 color_class: "ilist_item_disabled"; 107 color_class: "ilist_item_disabled";
110 text { font: FN; size: 10; 108 text { font: FN; size: 10;
111 text_source: "e.text.label"; 109 text_source: "e.text.label";
@@ -131,9 +129,7 @@ group { name: "e/fileman/default/list/variable";
131 rel1.to: "e.text.label"; 129 rel1.to: "e.text.label";
132 rel2.offset: 2 1; 130 rel2.offset: 2 1;
133 rel2.to: "e.text.label"; 131 rel2.to: "e.text.label";
134 color: 51 153 255 255; 132 color: FN_COL_HIGHLIGHT;
135 color2: 51 153 255 24;
136 color3: 51 153 255 18;
137 color_class: "ilist_item_selected"; 133 color_class: "ilist_item_selected";
138 text { font: FN; size: 10; 134 text { font: FN; size: 10;
139 text_source: "e.text.label"; 135 text_source: "e.text.label";
@@ -1219,8 +1215,7 @@ group { name: "e/fileman/popup/default";
1219 rel2.relative: 1.0 0.0; 1215 rel2.relative: 1.0 0.0;
1220 rel2.offset: -2 3; 1216 rel2.offset: -2 3;
1221 align: 0.5 0.0; 1217 align: 0.5 0.0;
1222 color: 255 255 255 255; 1218 color: FN_COL_DEFAULT;
1223 color3: 0 0 0 128;
1224 text { font: FNBD; size: 10; 1219 text { font: FNBD; size: 10;
1225 text_class: "fileman_popup_title"; 1220 text_class: "fileman_popup_title";
1226 align: 0.5 0.0; 1221 align: 0.5 0.0;
@@ -1319,8 +1314,7 @@ group { name: "e/fileman/default/overlay";
1319 rel2.offset: 12 -1; 1314 rel2.offset: 12 -1;
1320 rel2.to: "knob"; 1315 rel2.to: "knob";
1321 align: 0.0 0.5; 1316 align: 0.0 0.5;
1322 color: 255 255 255 255; 1317 color: FN_COL_DEFAULT;
1323 color3: 0 0 0 128;
1324 color_class: "fileman_busy"; 1318 color_class: "fileman_busy";
1325 text { font: FNBD; size: 10; 1319 text { font: FNBD; size: 10;
1326 min: 1 1; 1320 min: 1 1;
@@ -1381,8 +1375,7 @@ group { name: "e/fileman/default/overlay";
1381 rel1.offset: -8 -8; 1375 rel1.offset: -8 -8;
1382 rel2.relative: 0.5 0.5; 1376 rel2.relative: 0.5 0.5;
1383 rel2.offset: 7 7; 1377 rel2.offset: 7 7;
1384 color: 255 255 255 255; 1378 color: FN_COL_DEFAULT;
1385 color3: 0 0 0 128;
1386 color_class: "fileman_typebuf"; 1379 color_class: "fileman_typebuf";
1387 text { font: FNBD; size: 10; 1380 text { font: FNBD; size: 10;
1388 min: 1 1; 1381 min: 1 1;
@@ -2218,8 +2211,7 @@ group { name: "modules/efm_navigation/pathbar_button";
2218 description { state: "default" 0.0; 2211 description { state: "default" 0.0;
2219 rel1.offset: 6 6; 2212 rel1.offset: 6 6;
2220 rel2.offset: -7 -6; 2213 rel2.offset: -7 -6;
2221 color: 255 255 255 255; 2214 color: FN_COL_DEFAULT;
2222 color3: 0 0 0 128;
2223 color_class: "button_text"; 2215 color_class: "button_text";
2224 text { font: FN; size: 10; 2216 text { font: FN; size: 10;
2225 min: 1 1; 2217 min: 1 1;
@@ -2240,9 +2232,7 @@ group { name: "modules/efm_navigation/pathbar_button";
2240 rel1.to: "e.text.label"; 2232 rel1.to: "e.text.label";
2241 rel2.offset: 3 1; 2233 rel2.offset: 3 1;
2242 rel2.to: "e.text.label"; 2234 rel2.to: "e.text.label";
2243 color: 51 153 255 255; 2235 color: FN_COL_HIGHLIGHT;
2244 color2: 51 153 255 24;
2245 color3: 51 153 255 18;
2246 color_class: "button_selected"; 2236 color_class: "button_selected";
2247 text { font: FN; size: 10; 2237 text { font: FN; size: 10;
2248 text_source: "e.text.label"; 2238 text_source: "e.text.label";
diff --git a/data/themes/edc/fontpreview.edc b/data/themes/edc/fontpreview.edc
index 58ac322..2bffb90 100644
--- a/data/themes/edc/fontpreview.edc
+++ b/data/themes/edc/fontpreview.edc
@@ -7,8 +7,7 @@ group { name: "e/widgets/fontpreview";
7 color_class: "entry_text"; 7 color_class: "entry_text";
8 rel1.offset: 3 3; 8 rel1.offset: 3 3;
9 rel2.offset: -4 -4; 9 rel2.offset: -4 -4;
10 color: 255 255 255 255; 10 color: FN_COL_DEFAULT;
11 color3: 0 0 0 128;
12 text { font: FN; size: 10; 11 text { font: FN; size: 10;
13 min: 1 1; 12 min: 1 1;
14 align: 0.5 0.5; 13 align: 0.5 0.5;
diff --git a/data/themes/edc/frame.edc b/data/themes/edc/frame.edc
index c383361..8ac02bb 100644
--- a/data/themes/edc/frame.edc
+++ b/data/themes/edc/frame.edc
@@ -69,8 +69,7 @@ group { name: "e/widgets/frame";
69 rel2.offset: -2 2; 69 rel2.offset: -2 2;
70 rel2.to_x: "edge2"; 70 rel2.to_x: "edge2";
71 align: 0.0 0.0; 71 align: 0.0 0.0;
72 color: 21 21 21 255; 72 color: FN_COL_DISABLE;
73 color3: 255 255 255 25;
74 text { font: FNBD; size: 10; 73 text { font: FNBD; size: 10;
75 text_class: "frame"; 74 text_class: "frame";
76 align: 0.0 0.0; 75 align: 0.0 0.0;
diff --git a/data/themes/edc/ibar-ibox.edc b/data/themes/edc/ibar-ibox.edc
index 322d966..91bf063 100644
--- a/data/themes/edc/ibar-ibox.edc
+++ b/data/themes/edc/ibar-ibox.edc
@@ -304,8 +304,7 @@ group { name: "e/modules/ibar/menu/item";
304 rel1.relative: 1.0 0.0; 304 rel1.relative: 1.0 0.0;
305 rel1.offset: 3 0; 305 rel1.offset: 3 0;
306 rel2.offset: -3 -3; 306 rel2.offset: -3 -3;
307 color: 255 255 255 255; 307 color: FN_COL_DEFAULT;
308 color3: 0 0 0 128;
309 align: 0.0 0.0; 308 align: 0.0 0.0;
310 color_class: "menu_item"; 309 color_class: "menu_item";
311 min: 128 0; 310 min: 128 0;
@@ -329,9 +328,7 @@ group { name: "e/modules/ibar/menu/item";
329 rel1.to: "e.text.title"; 328 rel1.to: "e.text.title";
330 rel2.offset: 2 1; 329 rel2.offset: 2 1;
331 rel2.to: "e.text.title"; 330 rel2.to: "e.text.title";
332 color: 51 153 255 255; 331 color: FN_COL_HIGHLIGHT;
333 color2: 51 153 255 24;
334 color3: 51 153 255 18;
335 color_class: "menu_item_active"; 332 color_class: "menu_item_active";
336 min: 128 0; 333 min: 128 0;
337 text { font: FNBD; size: 10; 334 text { font: FNBD; size: 10;
@@ -482,8 +479,7 @@ group { name: "e/modules/ibox/icon_overlay";
482 description { state: "default" 0.0; 479 description { state: "default" 0.0;
483 rel1.relative: 0.0 1.0; 480 rel1.relative: 0.0 1.0;
484 rel2.relative: 1.0 1.0; 481 rel2.relative: 1.0 1.0;
485 color: 255 255 255 0; 482 color: FN_COL_TRANSPARENT;
486 color3: 0 0 0 0;
487 color_class: "module_label"; 483 color_class: "module_label";
488 text { font: FN; size: 10; 484 text { font: FN; size: 10;
489 min: 1 1; 485 min: 1 1;
@@ -495,8 +491,7 @@ group { name: "e/modules/ibox/icon_overlay";
495 inherit: "default" 0.0; 491 inherit: "default" 0.0;
496 rel1.relative: 0.0 0.5; 492 rel1.relative: 0.0 0.5;
497 rel2.relative: 1.0 0.5; 493 rel2.relative: 1.0 0.5;
498 color: 255 255 255 255; 494 color: FN_COL_DEFAULT;
499 color3: 0 0 0 128;
500 } 495 }
501 } 496 }
502 } 497 }
diff --git a/data/themes/edc/ilist.edc b/data/themes/edc/ilist.edc
index 90206a0..078a4eb 100644
--- a/data/themes/edc/ilist.edc
+++ b/data/themes/edc/ilist.edc
@@ -32,8 +32,7 @@ group { name: "e/ilist";
32 rel1.offset: -8 -8; 32 rel1.offset: -8 -8;
33 rel2.relative: 0.5 0.5; 33 rel2.relative: 0.5 0.5;
34 rel2.offset: 7 7; 34 rel2.offset: 7 7;
35 color: 255 255 255 255; 35 color: FN_COL_DEFAULT;
36 color3: 0 0 0 128;
37 color_class: "ilist_typebuf"; 36 color_class: "ilist_typebuf";
38 text { font: FNBD; size: 10; 37 text { font: FNBD; size: 10;
39 min: 1 1; 38 min: 1 1;
@@ -141,8 +140,7 @@ group { name: "e/widgets/ilist";
141 rel2.offset: -3 -3; 140 rel2.offset: -3 -3;
142 rel2.relative: 0.0 1.0; 141 rel2.relative: 0.0 1.0;
143 rel2.to_x: "e.swallow.end"; 142 rel2.to_x: "e.swallow.end";
144 color: 255 255 255 255; 143 color: FN_COL_DEFAULT;
145 color3: 0 0 0 128;
146 color_class: "ilist_item"; 144 color_class: "ilist_item";
147 text { font: FN; size: 10; 145 text { font: FN; size: 10;
148 min: 1 1; 146 min: 1 1;
@@ -165,8 +163,7 @@ group { name: "e/widgets/ilist";
165 description { state: "default" 0.0; 163 description { state: "default" 0.0;
166 rel1.to: "e.text.label"; 164 rel1.to: "e.text.label";
167 rel2.to: "e.text.label"; 165 rel2.to: "e.text.label";
168 color: 21 21 21 255; 166 color: FN_COL_DISABLE;
169 color3: 255 255 255 25;
170 color_class: "ilist_item_disabled"; 167 color_class: "ilist_item_disabled";
171 text { font: FN; size: 10; 168 text { font: FN; size: 10;
172 text_source: "e.text.label"; 169 text_source: "e.text.label";
@@ -192,9 +189,7 @@ group { name: "e/widgets/ilist";
192 rel1.to: "e.text.label"; 189 rel1.to: "e.text.label";
193 rel2.offset: 2 1; 190 rel2.offset: 2 1;
194 rel2.to: "e.text.label"; 191 rel2.to: "e.text.label";
195 color: 51 153 255 255; 192 color: FN_COL_HIGHLIGHT;
196 color2: 51 153 255 24;
197 color3: 51 153 255 18;
198 color_class: "ilist_item_selected"; 193 color_class: "ilist_item_selected";
199 text { font: FN; size: 10; 194 text { font: FN; size: 10;
200 text_source: "e.text.label"; 195 text_source: "e.text.label";
@@ -344,8 +339,7 @@ group { name: "e/widgets/ilist_header";
344 rel2.offset: -3 -7; 339 rel2.offset: -3 -7;
345 rel2.relative: 0.0 1.0; 340 rel2.relative: 0.0 1.0;
346 rel2.to_x: "e.swallow.end"; 341 rel2.to_x: "e.swallow.end";
347 color: 255 255 255 255; 342 color: FN_COL_DEFAULT;
348 color3: 0 0 0 128;
349 color_class: "ilist_item_header"; 343 color_class: "ilist_item_header";
350 text { font: FNBD; size: 10; 344 text { font: FNBD; size: 10;
351 min: 0 1; 345 min: 0 1;
diff --git a/data/themes/edc/init.edc b/data/themes/edc/init.edc
index 254701e..10faaab 100644
--- a/data/themes/edc/init.edc
+++ b/data/themes/edc/init.edc
@@ -63,8 +63,7 @@ group { name: "e/init/splash";
63 rel2.relative: 0.95 0.0; 63 rel2.relative: 0.95 0.0;
64 rel2.offset: -5 -1; 64 rel2.offset: -5 -1;
65 rel2.to_y: "e.text.status"; 65 rel2.to_y: "e.text.status";
66 color: 255 255 255 255; 66 color: FN_COL_DEFAULT;
67 color3: 0 0 0 128;
68 text { font: FNBD; size: 20; 67 text { font: FNBD; size: 20;
69 min: 0 1; 68 min: 0 1;
70 text_class: "init_title"; 69 text_class: "init_title";
@@ -83,9 +82,7 @@ group { name: "e/init/splash";
83 rel2.relative: 0.95 0.0; 82 rel2.relative: 0.95 0.0;
84 rel2.offset: -5 -1; 83 rel2.offset: -5 -1;
85 rel2.to_y: "logo"; 84 rel2.to_y: "logo";
86 color: 51 153 255 255; 85 color: FN_COL_HIGHLIGHT;
87 color2: 51 153 255 24;
88 color3: 51 153 255 18;
89 text { font: FN; size: 10; 86 text { font: FN; size: 10;
90 min: 0 1; 87 min: 0 1;
91 text_class: "init_status"; 88 text_class: "init_status";
@@ -101,9 +98,7 @@ group { name: "e/init/splash";
101 rel1.offset: -4 -4; 98 rel1.offset: -4 -4;
102 rel2.relative: 1.0 1.0; 99 rel2.relative: 1.0 1.0;
103 rel2.offset: -4 -4; 100 rel2.offset: -4 -4;
104 color: 51 153 255 255; 101 color: FN_COL_HIGHLIGHT;
105 color2: 51 153 255 24;
106 color3: 51 153 255 18;
107 text { font: FN; size: 8; 102 text { font: FN; size: 8;
108 text: "0.19"; 103 text: "0.19";
109 min: 1 1; 104 min: 1 1;
diff --git a/data/themes/edc/label.edc b/data/themes/edc/label.edc
index e5a4080..d1d59bf 100644
--- a/data/themes/edc/label.edc
+++ b/data/themes/edc/label.edc
@@ -6,8 +6,7 @@ group { name: "e/widgets/label";
6 description { state: "default" 0.0; 6 description { state: "default" 0.0;
7 rel1.offset: 2 2; 7 rel1.offset: 2 2;
8 rel2.offset: -3 -3; 8 rel2.offset: -3 -3;
9 color: 255 255 255 255; 9 color: FN_COL_DEFAULT;
10 color3: 0 0 0 128;
11 color_class: "label_text"; 10 color_class: "label_text";
12 text { font: FN; size: 10; 11 text { font: FN; size: 10;
13 min: 1 1; 12 min: 1 1;
@@ -17,8 +16,7 @@ group { name: "e/widgets/label";
17 } 16 }
18 description { state: "disabled" 0.0; 17 description { state: "disabled" 0.0;
19 inherit: "default" 0.0; 18 inherit: "default" 0.0;
20 color: 21 21 21 255; 19 color: FN_COL_DISABLE;
21 color3: 255 255 255 25;
22 } 20 }
23 } 21 }
24 } 22 }
diff --git a/data/themes/edc/menu.edc b/data/themes/edc/menu.edc
index b03d8f4..cf375ff 100644
--- a/data/themes/edc/menu.edc
+++ b/data/themes/edc/menu.edc
@@ -37,8 +37,7 @@ group { name: "e/widgets/menu/default/background";
37 rel2.relative: 1.0 0.0; 37 rel2.relative: 1.0 0.0;
38 rel2.offset: -2 -1; 38 rel2.offset: -2 -1;
39 align: 0.5 0.0; 39 align: 0.5 0.0;
40 color: 21 21 21 255; 40 color: FN_COL_DISABLE;
41 color3: 255 255 255 25;
42 max: 0 0; 41 max: 0 0;
43 text { font: FNBD; size: 10; 42 text { font: FNBD; size: 10;
44 text_class: "menu_title"; 43 text_class: "menu_title";
@@ -266,8 +265,7 @@ group { name: "e/widgets/menu/default/label";
266 description { state: "default" 0.0; 265 description { state: "default" 0.0;
267 rel1.offset: 5 -1; 266 rel1.offset: 5 -1;
268 rel2.offset: -4 -1; 267 rel2.offset: -4 -1;
269 color: 255 255 255 255; 268 color: FN_COL_DEFAULT;
270 color3: 0 0 0 128;
271 color_class: "menu_item"; 269 color_class: "menu_item";
272 text { font: FN; size: 10; 270 text { font: FN; size: 10;
273 min: 1 1; 271 min: 1 1;
@@ -290,8 +288,7 @@ group { name: "e/widgets/menu/default/label";
290 description { state: "default" 0.0; 288 description { state: "default" 0.0;
291 rel1.to: "e.text.label"; 289 rel1.to: "e.text.label";
292 rel2.to: "e.text.label"; 290 rel2.to: "e.text.label";
293 color: 21 21 21 255; 291 color: FN_COL_DISABLE;
294 color3: 255 255 255 25;
295 color_class: "menu_item_disabled"; 292 color_class: "menu_item_disabled";
296 text { font: FN; size: 10; 293 text { font: FN; size: 10;
297 text_source: "e.text.label"; 294 text_source: "e.text.label";
@@ -317,9 +314,7 @@ group { name: "e/widgets/menu/default/label";
317 rel1.to: "e.text.label"; 314 rel1.to: "e.text.label";
318 rel2.offset: 2 1; 315 rel2.offset: 2 1;
319 rel2.to: "e.text.label"; 316 rel2.to: "e.text.label";
320 color: 51 153 255 255; 317 color: FN_COL_HIGHLIGHT;
321 color2: 51 153 255 24;
322 color3: 51 153 255 18;
323 color_class: "menu_item_active"; 318 color_class: "menu_item_active";
324 text { font: FN; size: 10; 319 text { font: FN; size: 10;
325 text_source: "e.text.label"; 320 text_source: "e.text.label";
diff --git a/data/themes/edc/notification.edc b/data/themes/edc/notification.edc
index 878e912..40314b7 100644
--- a/data/themes/edc/notification.edc
+++ b/data/themes/edc/notification.edc
@@ -116,8 +116,7 @@ group { name: "e/modules/notification/main";
116 rel2.relative: 0.0 0.0; 116 rel2.relative: 0.0 0.0;
117 rel2.to_x: "e.event.close"; 117 rel2.to_x: "e.event.close";
118 rel2.offset: -5 12; 118 rel2.offset: -5 12;
119 color: 255 255 255 255; 119 color: FN_COL_DEFAULT;
120 color3: 0 0 0 128;
121 align: 0.0 0.0; 120 align: 0.0 0.0;
122 color_class: "notification_title"; 121 color_class: "notification_title";
123 text { font: FNBD; size: 10; 122 text { font: FNBD; size: 10;
diff --git a/data/themes/edc/packagekit.edc b/data/themes/edc/packagekit.edc
index 1e2d2fd..e37d351 100644
--- a/data/themes/edc/packagekit.edc
+++ b/data/themes/edc/packagekit.edc
@@ -110,8 +110,7 @@ group { name: "e/modules/packagekit/main";
110 description { state: "default" 0.0; 110 description { state: "default" 0.0;
111 rel1.relative: (36/160) (60/160); 111 rel1.relative: (36/160) (60/160);
112 rel2.relative: ((36+88)/160) ((60+88)/160); 112 rel2.relative: ((36+88)/160) ((60+88)/160);
113 color: 21 21 21 255; 113 color: FN_COL_DISABLE;
114 color3: 255 255 255 25;
115 text { font: FN; size: 10; 114 text { font: FN; size: 10;
116 } 115 }
117 } 116 }
diff --git a/data/themes/edc/pager.edc b/data/themes/edc/pager.edc
index 8858817..9e76455 100644
--- a/data/themes/edc/pager.edc
+++ b/data/themes/edc/pager.edc
@@ -38,8 +38,7 @@ group { name: "e/modules/pager/popup";
38 rel2.relative: 1.0 0.0; 38 rel2.relative: 1.0 0.0;
39 rel2.offset: -1 1; 39 rel2.offset: -1 1;
40 align: 0.5 0.0; 40 align: 0.5 0.0;
41 color: 21 21 21 255; 41 color: FN_COL_DISABLE;
42 color3: 255 255 255 25;
43 text { font: FNBD; size: 10; 42 text { font: FNBD; size: 10;
44 text_class: "title_bar"; 43 text_class: "title_bar";
45 align: 0.5 0.0; 44 align: 0.5 0.0;
@@ -154,8 +153,7 @@ group { name: "e/modules/pager/desk";
154 color_class: "module_label"; 153 color_class: "module_label";
155 rel1.to: "base"; 154 rel1.to: "base";
156 rel2.to: "base"; 155 rel2.to: "base";
157 color: 255 255 255 255; 156 color: FN_COL_DEFAULT;
158 color3: 0 0 0 128;
159 text { font: FN; size: 10; 157 text { font: FN; size: 10;
160 text_class: "module_small"; 158 text_class: "module_small";
161 align: 0.5 0.5; 159 align: 0.5 0.5;
diff --git a/data/themes/edc/pager16.edc b/data/themes/edc/pager16.edc
index 109e015..55995b5 100644
--- a/data/themes/edc/pager16.edc
+++ b/data/themes/edc/pager16.edc
@@ -38,8 +38,7 @@ group { name: "e/modules/pager2/popup";
38 rel2.relative: 1.0 0.0; 38 rel2.relative: 1.0 0.0;
39 rel2.offset: -1 1; 39 rel2.offset: -1 1;
40 align: 0.5 0.0; 40 align: 0.5 0.0;
41 color: 21 21 21 255; 41 color: FN_COL_DISABLE;
42 color3: 255 255 255 25;
43 text { font: FNBD; size: 10; 42 text { font: FNBD; size: 10;
44 text_class: "title_bar"; 43 text_class: "title_bar";
45 align: 0.5 0.0; 44 align: 0.5 0.0;
@@ -133,8 +132,7 @@ group { name: "e/modules/pager2/desk";
133 color_class: "module_label"; 132 color_class: "module_label";
134 rel1.to: "base"; 133 rel1.to: "base";
135 rel2.to: "base"; 134 rel2.to: "base";
136 color: 255 255 255 255; 135 color: FN_COL_DEFAULT;
137 color3: 0 0 0 128;
138 text { font: "Sans"; size: 10; 136 text { font: "Sans"; size: 10;
139 text_class: "module_small"; 137 text_class: "module_small";
140 align: 0.5 0.5; 138 align: 0.5 0.5;
diff --git a/data/themes/edc/radio.edc b/data/themes/edc/radio.edc
index be25e71..bdb0074 100644
--- a/data/themes/edc/radio.edc
+++ b/data/themes/edc/radio.edc
@@ -50,8 +50,7 @@ group { name: "e/widgets/radio";
50 rel1.to_x: "inset"; 50 rel1.to_x: "inset";
51 rel1.relative: 1.0 0.0; 51 rel1.relative: 1.0 0.0;
52 rel2.offset: -3 -3; 52 rel2.offset: -3 -3;
53 color: 255 255 255 255; 53 color: FN_COL_DEFAULT;
54 color3: 0 0 0 128;
55 color_class: "radio_text"; 54 color_class: "radio_text";
56 text { font: FN; size: 10; 55 text { font: FN; size: 10;
57 min: 1 1; 56 min: 1 1;
@@ -61,8 +60,7 @@ group { name: "e/widgets/radio";
61 } 60 }
62 description { state: "disabled" 0.0; 61 description { state: "disabled" 0.0;
63 inherit: "default" 0.0; 62 inherit: "default" 0.0;
64 color: 21 21 21 255; 63 color: FN_COL_DISABLE;
65 color3: 255 255 255 25;
66 } 64 }
67 } 65 }
68 part { name: "event"; type: RECT; 66 part { name: "event"; type: RECT;
@@ -133,8 +131,7 @@ group { name: "e/widgets/radio_icon";
133 } 131 }
134 description { state: "disabled" 0.0; 132 description { state: "disabled" 0.0;
135 inherit: "default" 0.0; 133 inherit: "default" 0.0;
136 color: 21 21 21 255; 134 color: FN_COL_DISABLE;
137 color3: 255 255 255 25;
138 } 135 }
139 } 136 }
140 } 137 }
diff --git a/data/themes/edc/slider.edc b/data/themes/edc/slider.edc
index a532516..5fcf908 100644
--- a/data/themes/edc/slider.edc
+++ b/data/themes/edc/slider.edc
@@ -77,8 +77,7 @@ group { name: "e/widgets/slider_horizontal";
77 rel1.relative: 1.0 0.0; 77 rel1.relative: 1.0 0.0;
78 rel2.offset: -1 -1; 78 rel2.offset: -1 -1;
79 align: 1.0 0.5; 79 align: 1.0 0.5;
80 color: 255 255 255 255; 80 color: FN_COL_DEFAULT;
81 color3: 0 0 0 128;
82 color_class: "slider_text"; 81 color_class: "slider_text";
83 text { font: FN; size: 10; 82 text { font: FN; size: 10;
84 min: 0 1; 83 min: 0 1;
@@ -112,8 +111,7 @@ group { name: "e/widgets/slider_horizontal";
112 description { state: "default" 0.0; 111 description { state: "default" 0.0;
113 rel1.to: "e.text.label"; 112 rel1.to: "e.text.label";
114 rel2.to: "e.text.label"; 113 rel2.to: "e.text.label";
115 color: 21 21 21 255; 114 color: FN_COL_DISABLE;
116 color3: 255 255 255 15;
117 color_class: "slider_text"; 115 color_class: "slider_text";
118 text { font: FN; size: 10; 116 text { font: FN; size: 10;
119 text_source: "e.text.label"; 117 text_source: "e.text.label";
@@ -303,8 +301,7 @@ group { name: "e/widgets/slider_vertical";
303 rel1.relative: 0.0 1.0; 301 rel1.relative: 0.0 1.0;
304 rel2.offset: -1 -1; 302 rel2.offset: -1 -1;
305 align: 0.5 1.0; 303 align: 0.5 1.0;
306 color: 255 255 255 255; 304 color: FN_COL_DEFAULT;
307 color3: 0 0 0 128;
308 color_class: "slider_text"; 305 color_class: "slider_text";
309 text { font: FN; size: 10; 306 text { font: FN; size: 10;
310 min: 0 0; 307 min: 0 0;
@@ -338,8 +335,7 @@ group { name: "e/widgets/slider_vertical";
338 description { state: "default" 0.0; 335 description { state: "default" 0.0;
339 rel1.to: "e.text.label"; 336 rel1.to: "e.text.label";
340 rel2.to: "e.text.label"; 337 rel2.to: "e.text.label";
341 color: 21 21 21 255; 338 color: FN_COL_DISABLE;
342 color3: 255 255 255 15;
343 color_class: "slider_text"; 339 color_class: "slider_text";
344 text { font: FN; size: 10; 340 text { font: FN; size: 10;
345 text_source: "e.text.label"; 341 text_source: "e.text.label";
diff --git a/data/themes/edc/syscon.edc b/data/themes/edc/syscon.edc
index 618a126..eeb60d8 100644
--- a/data/themes/edc/syscon.edc
+++ b/data/themes/edc/syscon.edc
@@ -73,8 +73,7 @@ group { name: "e/widgets/syscon/main";
73 rel1.to_y: "e.swallow.extra"; 73 rel1.to_y: "e.swallow.extra";
74 rel2.offset: -1 -14; 74 rel2.offset: -1 -14;
75 rel2.relative: 0.5 1.0; 75 rel2.relative: 0.5 1.0;
76 color: 255 255 255 255; 76 color: FN_COL_DEFAULT;
77 color3: 0 0 0 128;
78 color_class: "button_text"; 77 color_class: "button_text";
79 align: 0.5 1.0; 78 align: 0.5 1.0;
80 text { font: FN; size: 10; 79 text { font: FN; size: 10;
@@ -174,8 +173,7 @@ group { name: "e/widgets/syscon/item/button";
174 rel2.offset: -7 -7; 173 rel2.offset: -7 -7;
175 rel2.to: "base"; 174 rel2.to: "base";
176 align: 0.5 1.0; 175 align: 0.5 1.0;
177 color: 255 255 255 255; 176 color: FN_COL_DEFAULT;
178 color3: 0 0 0 128;
179 color_class: "button_text"; 177 color_class: "button_text";
180 text { font: FN; size: 10; 178 text { font: FN; size: 10;
181 min: 1 1; 179 min: 1 1;
@@ -196,8 +194,7 @@ group { name: "e/widgets/syscon/item/button";
196 description { state: "default" 0.0; 194 description { state: "default" 0.0;
197 rel1.to: "e.text.label"; 195 rel1.to: "e.text.label";
198 rel2.to: "e.text.label"; 196 rel2.to: "e.text.label";
199 color: 21 21 21 255; 197 color: FN_COL_DISABLE;
200 color3: 255 255 255 25;
201 color_class: "button_text_disabled"; 198 color_class: "button_text_disabled";
202 text { font: FN; size: 10; 199 text { font: FN; size: 10;
203 text_source: "e.text.label"; 200 text_source: "e.text.label";
diff --git a/data/themes/edc/tasks.edc b/data/themes/edc/tasks.edc
index 8468496..0d980c4 100644
--- a/data/themes/edc/tasks.edc
+++ b/data/themes/edc/tasks.edc
@@ -73,9 +73,7 @@ group { name:"e/modules/tasks/item";
73 rel1.to: "e.text.label"; 73 rel1.to: "e.text.label";
74 rel2.offset: 3 1; 74 rel2.offset: 3 1;
75 rel2.to: "e.text.label"; 75 rel2.to: "e.text.label";
76 color: 51 153 255 255; 76 color: FN_COL_HIGHLIGHT;
77 color2: 51 153 255 24;
78 color3: 51 153 255 18;
79 color_class: "ilist_item_selected"; 77 color_class: "ilist_item_selected";
80 text { font: FN; size: 10; 78 text { font: FN; size: 10;
81 text_source: "e.text.label"; 79 text_source: "e.text.label";
@@ -85,9 +83,7 @@ group { name:"e/modules/tasks/item";
85 } 83 }
86 description { state: "clicked" 0.0; 84 description { state: "clicked" 0.0;
87 inherit: "default" 0.0; 85 inherit: "default" 0.0;
88 color: 255 255 255 255; 86 color: FN_COL_HIGHLIGHT_CLICKED;
89 color2: 51 153 255 64;
90 color3: 51 153 255 32;
91 } 87 }
92 } 88 }
93 part { name: "base"; 89 part { name: "base";
@@ -119,8 +115,7 @@ group { name:"e/modules/tasks/item";
119 rel1.to_y: "sel_base"; 115 rel1.to_y: "sel_base";
120 rel2.offset: -5 -5; 116 rel2.offset: -5 -5;
121 rel2.to: "sel_base"; 117 rel2.to: "sel_base";
122 color: 255 255 255 255; 118 color: FN_COL_DEFAULT;
123 color3: 0 0 0 128;
124 color_class: "tasks_text"; 119 color_class: "tasks_text";
125 text { font: FN; size: 10; 120 text { font: FN; size: 10;
126 min: 0 1; 121 min: 0 1;
@@ -130,8 +125,7 @@ group { name:"e/modules/tasks/item";
130 } 125 }
131 description { state: "iconic" 0.0; 126 description { state: "iconic" 0.0;
132 inherit: "default" 0.0; 127 inherit: "default" 0.0;
133 color: 21 21 21 255; 128 color: FN_COL_DISABLE;
134 color3: 255 255 255 25;
135 } 129 }
136 } 130 }
137 part { name: "icon"; type: SPACER; 131 part { name: "icon"; type: SPACER;
diff --git a/data/themes/edc/temperature.edc b/data/themes/edc/temperature.edc
index 695b8d9..b7638cf 100644
--- a/data/themes/edc/temperature.edc
+++ b/data/themes/edc/temperature.edc
@@ -42,9 +42,7 @@ group { name: "e/modules/temperature/main";
42 effect: SHADOW BOTTOM; 42 effect: SHADOW BOTTOM;
43 clip_to: "fade_clip"; 43 clip_to: "fade_clip";
44 description { state: "default" 0.0; 44 description { state: "default" 0.0;
45 color: 255 255 255 0; 45 color: FN_COL_SHADOW_BOTTOM;
46 color2: 0 0 0 255;
47 color3: 0 0 0 0;
48 color_class: "module_label"; 46 color_class: "module_label";
49 text { font: FN; size: 10; 47 text { font: FN; size: 10;
50 min: 1 1; 48 min: 1 1;
@@ -53,8 +51,7 @@ group { name: "e/modules/temperature/main";
53 } 51 }
54 description { state: "visible" 0.0; 52 description { state: "visible" 0.0;
55 inherit: "default" 0.0; 53 inherit: "default" 0.0;
56 color: 255 255 255 255; 54 color: FN_COL_DEFAULT;
57 color3: 0 0 0 128;
58 } 55 }
59 } 56 }
60 part { name: "fade_clip"; type: RECT; 57 part { name: "fade_clip"; type: RECT;
diff --git a/data/themes/edc/toolbar.edc b/data/themes/edc/toolbar.edc
index 98364fa..4a4ecff 100644
--- a/data/themes/edc/toolbar.edc
+++ b/data/themes/edc/toolbar.edc
@@ -256,8 +256,7 @@ group { name: "e/widgets/toolbar/item";
256 rel1.relative: 0.0 1.0; 256 rel1.relative: 0.0 1.0;
257 rel2.offset: -5 -3; 257 rel2.offset: -5 -3;
258 align: 0.5 1.0; 258 align: 0.5 1.0;
259 color: 255 255 255 255; 259 color: FN_COL_DEFAULT;
260 color3: 0 0 0 128;
261 color_class: "menu_item"; 260 color_class: "menu_item";
262 text { font: FN; size: 10; 261 text { font: FN; size: 10;
263 min: 1 1; 262 min: 1 1;
@@ -279,9 +278,7 @@ group { name: "e/widgets/toolbar/item";
279 rel1.to: "e.text.label"; 278 rel1.to: "e.text.label";
280 rel2.offset: 2 1; 279 rel2.offset: 2 1;
281 rel2.to: "e.text.label"; 280 rel2.to: "e.text.label";
282 color: 51 153 255 255; 281 color: FN_COL_HIGHLIGHT;
283 color2: 51 153 255 24;
284 color3: 51 153 255 18;
285 color_class: "menu_item_active"; 282 color_class: "menu_item_active";
286 text { font: FN; size: 10; 283 text { font: FN; size: 10;
287 text_source: "e.text.label"; 284 text_source: "e.text.label";
diff --git a/data/themes/edc/winlist.edc b/data/themes/edc/winlist.edc
index 101dd26..d2df85a 100644
--- a/data/themes/edc/winlist.edc
+++ b/data/themes/edc/winlist.edc
@@ -32,8 +32,7 @@ group { name: "e/widgets/winlist/main";
32 rel2.relative: 1.0 0.0; 32 rel2.relative: 1.0 0.0;
33 rel2.offset: -2 3; 33 rel2.offset: -2 3;
34 align: 0.5 0.0; 34 align: 0.5 0.0;
35 color: 21 21 21 255; 35 color: FN_COL_DISABLE;
36 color3: 255 255 255 25;
37 text { font: FNBD; size: 10; 36 text { font: FNBD; size: 10;
38 text_class: "menu_title"; 37 text_class: "menu_title";
39 align: 0.5 0.0; 38 align: 0.5 0.0;
@@ -66,8 +65,7 @@ group { name: "e/widgets/winlist/main";
66 rel2.offset: -7 -1; 65 rel2.offset: -7 -1;
67 rel2.to_y: "e.swallow.icon"; 66 rel2.to_y: "e.swallow.icon";
68 align: 0.0 0.5; 67 align: 0.0 0.5;
69 color: 255 255 255 255; 68 color: FN_COL_DEFAULT;
70 color3: 0 0 0 128;
71 text { font: FNBD; size: 10; 69 text { font: FNBD; size: 10;
72 text_class: "winlist_label"; 70 text_class: "winlist_label";
73 align: 0.0 0.5; 71 align: 0.0 0.5;
@@ -140,8 +138,7 @@ group { name: "e/widgets/winlist/item";
140 rel1.relative: 1.0 0.0; 138 rel1.relative: 1.0 0.0;
141 rel1.to_x: "icon"; 139 rel1.to_x: "icon";
142 rel2.offset: -3 -3; 140 rel2.offset: -3 -3;
143 color: 255 255 255 255; 141 color: FN_COL_DEFAULT;
144 color3: 0 0 0 128;
145 color_class: "ilist_item"; 142 color_class: "ilist_item";
146 text { font: FN; size: 10; 143 text { font: FN; size: 10;
147 min: 0 1; 144 min: 0 1;
@@ -151,8 +148,7 @@ group { name: "e/widgets/winlist/item";
151 } 148 }
152 description { state: "iconified" 0.0; 149 description { state: "iconified" 0.0;
153 inherit: "default" 0.0; 150 inherit: "default" 0.0;
154 color: 21 21 21 255; 151 color: FN_COL_DISABLE;
155 color3: 255 255 255 25;
156 } 152 }
157 } 153 }
158 part { name: "sel_shadow"; mouse_events: 0; 154 part { name: "sel_shadow"; mouse_events: 0;
@@ -223,9 +219,7 @@ group { name: "e/widgets/winlist/item";
223 rel1.to: "e.text.label"; 219 rel1.to: "e.text.label";
224 rel2.offset: 2 1; 220 rel2.offset: 2 1;
225 rel2.to: "e.text.label"; 221 rel2.to: "e.text.label";
226 color: 51 153 255 255; 222 color: FN_COL_HIGHLIGHT;
227 color2: 51 153 255 24;
228 color3: 51 153 255 18;
229 color_class: "ilist_item_selected"; 223 color_class: "ilist_item_selected";
230 text { font: FN; size: 10; 224 text { font: FN; size: 10;
231 text_source: "e.text.label"; 225 text_source: "e.text.label";
diff --git a/data/themes/edc/wizard.edc b/data/themes/edc/wizard.edc
index dc3df57..a24742f 100644
--- a/data/themes/edc/wizard.edc
+++ b/data/themes/edc/wizard.edc
@@ -99,8 +99,7 @@ group { name: "e/wizard/main";
99 rel1.offset: 4 -5; 99 rel1.offset: 4 -5;
100 rel2.relative: 0.5 0.99; 100 rel2.relative: 0.5 0.99;
101 rel2.offset: -5 -5; 101 rel2.offset: -5 -5;
102 color: 255 255 255 255; 102 color: FN_COL_DEFAULT;
103 color3: 0 0 0 128;
104 text { font: FN; size: 10; 103 text { font: FN; size: 10;
105 text: "Next"; 104 text: "Next";
106 min: 1 1; 105 min: 1 1;
@@ -108,8 +107,7 @@ group { name: "e/wizard/main";
108 } 107 }
109 description { state: "disabled" 0.0; 108 description { state: "disabled" 0.0;
110 inherit: "default" 0.0; 109 inherit: "default" 0.0;
111 color: 21 21 21 255; 110 color: FN_COL_DISABLE;
112 color3: 255 255 255 25;
113 } 111 }
114 } 112 }
115 part { name: "shadow"; mouse_events: 0; 113 part { name: "shadow"; mouse_events: 0;
@@ -137,9 +135,7 @@ group { name: "e/wizard/main";
137 rel2.relative: 0.95 0.01; 135 rel2.relative: 0.95 0.01;
138 rel2.offset: -5 4; 136 rel2.offset: -5 4;
139 align: 0.5 0.0; 137 align: 0.5 0.0;
140 color: 51 153 255 255; 138 color: FN_COL_HIGHLIGHT;
141 color2: 51 153 255 24;
142 color3: 51 153 255 18;
143 text { font: FNBD; size: 10; 139 text { font: FNBD; size: 10;
144 min: 0 1; 140 min: 0 1;
145 text_class: "init_title"; 141 text_class: "init_title";
diff --git a/data/themes/edc/xkbswitch.edc b/data/themes/edc/xkbswitch.edc
index 85873dc..bd61ffc 100644
--- a/data/themes/edc/xkbswitch.edc
+++ b/data/themes/edc/xkbswitch.edc
@@ -28,9 +28,7 @@ group { name: "e/modules/xkbswitch/main";
28 rel1.relative: 0.0 0.5; 28 rel1.relative: 0.0 0.5;
29 rel2.to: "e.swallow.flag"; 29 rel2.to: "e.swallow.flag";
30 rel2.relative: 1.0 0.5; 30 rel2.relative: 1.0 0.5;
31 color: 255 255 255 0; 31 color: FN_COL_OUTLINE_TRANSPARENT;
32 color2: 0 0 0 0;
33 color3: 0 0 0 0;
34 text { font: FN; size: 9; 32 text { font: FN; size: 9;
35 min: 0 1; 33 min: 0 1;
36 text_class: "module_small"; 34 text_class: "module_small";
@@ -39,9 +37,7 @@ group { name: "e/modules/xkbswitch/main";
39 } 37 }
40 description { state: "visible" 0.0; 38 description { state: "visible" 0.0;
41 inherit: "default" 0.0; 39 inherit: "default" 0.0;
42 color: 255 255 255 255; 40 color: FN_COL_OUTLINE_DEFAULT;
43 color2: 0 0 0 128;
44 color3: 0 0 0 24;
45 } 41 }
46 } 42 }
47 part { name: "bevel"; mouse_events: 0; 43 part { name: "bevel"; mouse_events: 0;
@@ -126,8 +122,7 @@ group { name: "e/modules/xkbswitch/noflag";
126 rel1.relative: 0.0 0.5; 122 rel1.relative: 0.0 0.5;
127 rel2.to: "base"; 123 rel2.to: "base";
128 rel2.relative: 1.0 0.5; 124 rel2.relative: 1.0 0.5;
129 color: 255 255 255 255; 125 color: FN_COL_DEFAULT;
130 color3: 0 0 0 128;
131 text { font: FNBD; size: 9; 126 text { font: FNBD; size: 9;
132 min: 0 1; 127 min: 0 1;
133 text_class: "module_small"; 128 text_class: "module_small";
diff --git a/data/themes/fonts.edc b/data/themes/fonts.edc
index 8a31bd4..a196ee4 100644
--- a/data/themes/fonts.edc
+++ b/data/themes/fonts.edc
@@ -15,10 +15,43 @@
15#define FNIT "Sans:style=Oblique" 15#define FNIT "Sans:style=Oblique"
16#define FNBDIT "Sans:style=Bold Italic" 16#define FNBDIT "Sans:style=Bold Italic"
17 17
18#define FN_COL_DEFAULT_BASIC 255 255 255 255
19/* fonts.edc not sure if this one is neccesary */
18#define FN_COL_DEFAULT 255 255 255 255; color3: 0 0 0 128 20#define FN_COL_DEFAULT 255 255 255 255; color3: 0 0 0 128
21#define FN_COL_DEFAULT_SOFT_SHADOW 255 255 255 255; color3: 0 0 0 18
19#define FN_COL_HIGHLIGHT 51 153 255 255; color2: 51 153 255 24; color3: 51 153 255 18 22#define FN_COL_HIGHLIGHT 51 153 255 255; color2: 51 153 255 24; color3: 51 153 255 18
23#define FN_COL_HIGHLIGHT_CLICKED 255 255 255 255; color2: 51 153 255 64; color3: 51 153 255 32
24#define FN_COL_HIGHLIGHT_DISABLE 51 153 255 64; color2: 51 153 255 16; color3: 51 153 255 8
25#define FN_COL_MID_GREY 128 128 128 255
20#define FN_COL_DISABLE 21 21 21 255; color3: 255 255 255 25; 26#define FN_COL_DISABLE 21 21 21 255; color3: 255 255 255 25;
27#define FN_COL_DISABLE_SHADOW 21 21 21 255; color3: 255 255 255 192
28#define FN_COL_TRANSPARENT 255 255 255 0; color3: 0 0 0 0
29#define FN_COL_WHITE_GLOW 255 255 255 255; color2: 255 255 255 24; color3: 255 255 255 18
21 30
31/* e/module/conf_colors/preview/text */
32#define FN_COL_SHADOW 255 255 255 32
33#define FN_COL_OUTLINE_SHADOW 255 255 255 255; color2: 255 255 255 255; color3: 255 255 255 255
34
35/* temperature.edc */
36#define FN_COL_SHADOW_BOTTOM 255 255 255 0; color2: 0 0 0 255; color3: 0 0 0 0
37
38/* elm/diskselector */
39#define FN_COL_WHITE 255 255 255 255
40#define FN_COL_GREY_152 152 152 152 255
41#define FN_COL_GREY_172 172 172 172 255
42
43/* elm/flipselector */
44#define FN_COL_GREY_192 192 192 192 255; color3: 0 0 0 128
45/* TBD: This could probably just be disabled */