diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c
index f29b872cd7..8ec4714b1c 100644
--- a/src/lib/elementary/elm_colorselector.c
+++ b/src/lib/elementary/elm_colorselector.c
@@ -42,141 +42,141 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] =
 static const Elm_Color_Name _color_name[] = {
    {{0, 0, 0, 255},       "black"},
    {{0, 0, 128, 255},     "navy"},
-   {{0, 0, 139, 255},     "darkblue"},
-   {{0, 0, 205, 255},     "mediumblue"},
+   {{0, 0, 139, 255},     "dark blue"},
+   {{0, 0, 205, 255},     "medium blue"},
    {{0, 0, 255, 255},     "blue"},
-   {{0, 100, 0, 255},     "darkgreen"},
+   {{0, 100, 0, 255},     "dark green"},
    {{0, 128, 0, 255},     "green"},
    {{0, 128, 128, 255},   "teal"},
-   {{0, 139, 139, 255},   "darkcyan"},
-   {{0, 191, 255, 255},   "deepskyblue"},
-   {{0, 206, 209, 255},   "darkturquoise"},
-   {{0, 250, 154, 255},   "mediumspringgreen"},
+   {{0, 139, 139, 255},   "dark cyan"},
+   {{0, 191, 255, 255},   "deep sky blue"},
+   {{0, 206, 209, 255},   "dark turquoise"},
+   {{0, 250, 154, 255},   "medium spring green"},
    {{0, 255, 0, 255},     "lime"},
-   {{0, 255, 127, 255},   "springgreen"},
+   {{0, 255, 127, 255},   "spring green"},
    {{0, 255, 255, 255},   "aqua"},
    {{0, 255, 255, 255},   "cyan"},
-   {{25, 25, 112, 255},   "midnightblue"},
-   {{30, 144, 255, 255},  "dodgerblue"},
-   {{32, 178, 170, 255},  "lightseagreen"},
-   {{34, 139, 34, 255},   "forestgreen"},
-   {{46, 139, 87, 255},   "seagreen"},
-   {{47, 79, 79, 255},    "darkslategrey"},
-   {{50, 205, 50, 255},   "limegreen"},
-   {{60, 179, 113, 255},  "mediumseagreen"},
+   {{25, 25, 112, 255},   "midnight blue"},
+   {{30, 144, 255, 255},  "dodger blue"},
+   {{32, 178, 170, 255},  "light sea green"},
+   {{34, 139, 34, 255},   "forest green"},
+   {{46, 139, 87, 255},   "sea green"},
+   {{47, 79, 79, 255},    "dark slate grey"},
+   {{50, 205, 50, 255},   "lime green"},
+   {{60, 179, 113, 255},  "medium sea green"},
    {{64, 224, 208, 255},  "turquoise"},
-   {{65, 105, 225, 255},  "royalblue"},
-   {{70, 130, 180, 255},  "steelblue"},
-   {{72, 61, 139, 255},   "darkslateblue"},
-   {{72, 209, 204, 255},  "mediumturquoise"},
+   {{65, 105, 225, 255},  "royal blue"},
+   {{70, 130, 180, 255},  "steel blue"},
+   {{72, 61, 139, 255},   "dark slate blue"},
+   {{72, 209, 204, 255},  "medium turquoise"},
    {{75, 0, 130, 255},    "indigo"},
-   {{85, 107, 47, 255},   "darkolivegreen"},
-   {{95, 158, 160, 255},  "cadetblue"},
-   {{100, 149, 237, 255}, "cornflowerblue"},
-   {{102, 205, 170, 255}, "mediumaquamarine"},
-   {{105, 105, 105, 255}, "dimgrey"},
-   {{106, 90, 205, 255},  "slateblue"},
-   {{107, 142, 35, 255},  "olivedrab"},
-   {{112, 128, 144, 255}, "slategrey"},
-   {{119, 136, 153, 255}, "lightslategrey"},
-   {{123, 104, 238, 255}, "mediumslateblue"},
-   {{124, 252, 0, 255},   "lawngreen"},
+   {{85, 107, 47, 255},   "dark olive green"},
+   {{95, 158, 160, 255},  "cadet blue"},
+   {{100, 149, 237, 255}, "corn flower blue"},
+   {{102, 205, 170, 255}, "medium aquamarine"},
+   {{105, 105, 105, 255}, "dim grey"},
+   {{106, 90, 205, 255},  "slate blue"},
+   {{107, 142, 35, 255},  "olive drab"},
+   {{112, 128, 144, 255}, "slate grey"},
+   {{119, 136, 153, 255}, "light slate grey"},
+   {{123, 104, 238, 255}, "medium slate blue"},
+   {{124, 252, 0, 255},   "lawn green"},
    {{127, 255, 0, 255},   "chartreuse"},
    {{127, 255, 212, 255}, "aquamarine"},
    {{128, 0, 0, 255},     "maroon"},
    {{128, 0, 128, 255},   "purple"},
    {{128, 128, 0, 255},   "olive"},
    {{128, 128, 128, 255}, "grey"},
-   {{135, 206, 235, 255}, "skyblue"},
-   {{135, 206, 250, 255}, "lightskyblue"},
-   {{138, 43, 226, 255},  "blueviolet"},
-   {{139, 0, 0, 255},     "darkred"},
-   {{139, 0, 139, 255},   "darkmagenta"},
-   {{139, 69, 19, 255},   "saddlebrown"},
-   {{143, 188, 143, 255}, "darkseagreen"},
-   {{144, 238, 144, 255}, "lightgreen"},
-   {{147, 112, 219, 255}, "mediumpurple"},
-   {{148, 0, 211, 255},   "darkviolet"},
-   {{152, 251, 152, 255}, "palegreen"},
-   {{153, 50, 204, 255},  "darkorchid"},
-   {{154, 205, 50, 255},  "yellowgreen"},
+   {{135, 206, 235, 255}, "sky blue"},
+   {{135, 206, 250, 255}, "light sky blue"},
+   {{138, 43, 226, 255},  "blue violet"},
+   {{139, 0, 0, 255},     "dark red"},
+   {{139, 0, 139, 255},   "dark magenta"},
+   {{139, 69, 19, 255},   "saddle brown"},
+   {{143, 188, 143, 255}, "dark sea green"},
+   {{144, 238, 144, 255}, "light green"},
+   {{147, 112, 219, 255}, "medium purple"},
+   {{148, 0, 211, 255},   "dark violet"},
+   {{152, 251, 152, 255}, "pale green"},
+   {{153, 50, 204, 255},  "dark orchid"},
+   {{154, 205, 50, 255},  "yellow green"},
    {{160, 82, 45, 255},   "sienna"},
    {{165, 42, 42, 255},   "brown"},
-   {{169, 169, 169, 255}, "darkgrey"},
-   {{173, 216, 230, 255}, "lightblue"},
-   {{173, 255, 47, 255},  "greenyellow"},
-   {{175, 238, 238, 255}, "paleturquoise"},
-   {{176, 196, 222, 255}, "lightsteelblue"},
-   {{176, 224, 230, 255}, "powderblue"},
-   {{178, 34, 34, 255},   "firebrick"},
-   {{184, 134, 11, 255},  "darkgoldenrod"},
-   {{186, 85, 211, 255},  "mediumorchid"},
-   {{188, 143, 143, 255}, "rosybrown"},
-   {{189, 183, 107, 255}, "darkkhaki"},
+   {{169, 169, 169, 255}, "dark grey"},
+   {{173, 216, 230, 255}, "light blue"},
+   {{173, 255, 47, 255},  "green yellow"},
+   {{175, 238, 238, 255}, "pale turquoise"},
+   {{176, 196, 222, 255}, "light steel blue"},
+   {{176, 224, 230, 255}, "powder blue"},
+   {{178, 34, 34, 255},   "fire brick"},
+   {{184, 134, 11, 255},  "dark golden rod"},
+   {{186, 85, 211, 255},  "medium orchid"},
+   {{188, 143, 143, 255}, "rosy brown"},
+   {{189, 183, 107, 255}, "dark khaki"},
    {{192, 192, 192, 255}, "silver"},
-   {{199, 21, 133, 255},  "mediumvioletred"},
-   {{205, 92, 92, 255},   "indianred"},
+   {{199, 21, 133, 255},  "medium violet red"},
+   {{205, 92, 92, 255},   "indian red"},
    {{205, 133, 63, 255},  "peru"},
    {{210, 105, 30, 255},  "chocolate"},
    {{210, 180, 140, 255}, "tan"},
-   {{211, 211, 211, 255}, "lightgrey"},
+   {{211, 211, 211, 255}, "light grey"},
    {{216, 191, 216, 255}, "thistle"},
    {{218, 112, 214, 255}, "orchid"},
-   {{218, 165, 32, 255},  "goldenrod"},
-   {{219, 112, 147, 255}, "palevioletred"},
+   {{218, 165, 32, 255},  "golden rod"},
+   {{219, 112, 147, 255}, "pale violet red"},
    {{220, 20, 60, 255},   "crimson"},
    {{220, 220, 220, 255}, "gainsboro"},
    {{221, 160, 221, 255}, "plum"},
    {{222, 184, 135, 255}, "burlywood"},
-   {{224, 255, 255, 255}, "lightcyan"},
+   {{224, 255, 255, 255}, "light cyan"},
    {{230, 230, 250, 255}, "lavender"},
-   {{233, 150, 122, 255}, "darksalmon"},
+   {{233, 150, 122, 255}, "dark salmon"},
    {{238, 130, 238, 255}, "violet"},
-   {{238, 232, 170, 255}, "palegoldenrod"},
-   {{240, 128, 128, 255}, "lightcoral"},
+   {{238, 232, 170, 255}, "pale golden rod"},
+   {{240, 128, 128, 255}, "light coral"},
    {{240, 230, 140, 255}, "khaki"},
-   {{240, 248, 255, 255}, "aliceblue"},
+   {{240, 248, 255, 255}, "alice blue"},
    {{240, 255, 255, 255}, "azure"},
-   {{240, 255, 240, 255}, "honeydew"},
-   {{244, 164, 96, 255},  "sandybrown"},
+   {{240, 255, 240, 255}, "honey dew"},
+   {{244, 164, 96, 255},  "sandy brown"},
    {{245, 222, 179, 255}, "wheat"},
    {{245, 245, 220, 255}, "beige"},
-   {{245, 245, 245, 255}, "whitesmoke"},
-   {{245, 255, 250, 255}, "mintcream"},
-   {{248, 248, 255, 255}, "ghostwhite"},
-   {{250, 235, 215, 255}, "antiquewhite"},
+   {{245, 245, 245, 255}, "white smoke"},
+   {{245, 255, 250, 255}, "mint cream"},
+   {{248, 248, 255, 255}, "ghost white"},
+   {{250, 235, 215, 255}, "antique white"},
    {{250, 128, 114, 255}, "salmon"},
-   {{250, 250, 210, 255}, "lightgoldenrodyellow"},
+   {{250, 250, 210, 255}, "light golden rod yellow"},
    {{250, 240, 230, 255}, "linen"},
-   {{253, 245, 230, 255}, "oldlace"},
+   {{253, 245, 230, 255}, "old lace"},
    {{255, 0, 0, 255},     "red"},
    {{255, 0, 255, 255},   "fuchsia"},
    {{255, 0, 255, 255},   "magenta"},
-   {{255, 20, 147, 255},  "deeppink"},
-   {{255, 69, 0, 255},    "orangered"},
+   {{255, 20, 147, 255},  "deep pink"},
+   {{255, 69, 0, 255},    "orange red"},
    {{255, 99, 71, 255},   "tomato"},
-   {{255, 105, 180, 255}, "hotpink"},
+   {{255, 105, 180, 255}, "hot pink"},
    {{255, 127, 80, 255},  "coral"},
-   {{255, 140, 0, 255},   "darkorange"},
-   {{255, 160, 122, 255}, "lightsalmon"},
+   {{255, 140, 0, 255},   "dark orange"},
+   {{255, 160, 122, 255}, "light salmon"},
    {{255, 165, 0, 255},   "orange"},
-   {{255, 182, 193, 255}, "lightpink "},
+   {{255, 182, 193, 255}, "light pink "},
    {{255, 192, 203, 255}, "pink"},
    {{255, 215, 0, 255},   "gold"},
-   {{255, 218, 185, 255}, "peachpuff"},
-   {{255, 222, 173, 255}, "navajowhite"},
+   {{255, 218, 185, 255}, "peach puff"},
+   {{255, 222, 173, 255}, "navajo white"},
    {{255, 228, 181, 255}, "moccasin"},
    {{255, 228, 196, 255}, "bisque"},
-   {{255, 228, 225, 255}, "mistyrose"},
-   {{255, 235, 205, 255}, "blanchedalmond"},
-   {{255, 239, 213, 255}, "papayawhip"},
-   {{255, 240, 245, 255}, "lavenderblush"},
-   {{255, 245, 238, 255}, "seashell"},
-   {{255, 248, 220, 255}, "cornsilk"},
-   {{255, 250, 205, 255}, "lemonchiffon"},
-   {{255, 250, 240, 255}, "floralwhite"},
+   {{255, 228, 225, 255}, "misty rose"},
+   {{255, 235, 205, 255}, "blanched almond"},
+   {{255, 239, 213, 255}, "papaya whip"},
+   {{255, 240, 245, 255}, "lavender blush"},
+   {{255, 245, 238, 255}, "sea shell"},
+   {{255, 248, 220, 255}, "corn silk"},
+   {{255, 250, 205, 255}, "lemon chiffon"},
+   {{255, 250, 240, 255}, "floral white"},
    {{255, 255, 0, 255},   "yellow"},
-   {{255, 255, 224, 255}, "lightyellow"},
+   {{255, 255, 224, 255}, "light yellow"},
    {{255, 255, 240, 255}, "ivory"},
    {{255, 250, 250, 255}, "snow"},
    {{255, 255, 255, 255}, "white"}