diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6f3ab24..3884013 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,6 +3,7 @@ cmake_minimum_required(VERSION 2.8.1)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
 
 project(CLOUSEAU)
+string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
 
 set(DEBUG_COMMON_DEFINITIONS -DEFL_EO_API_SUPPORT -DEFL_BETA_API_SUPPORT)
 add_definitions(${DEBUG_COMMON_DEFINITIONS})
@@ -20,3 +21,6 @@ find_package(Edebug REQUIRED)
 
 add_subdirectory(src/bin)
 add_subdirectory(src/lib)
+add_subdirectory(data)
+
+add_dependencies(clouseau_evlog clouseau_evlog_edj)
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
new file mode 100644
index 0000000..be39b14
--- /dev/null
+++ b/data/CMakeLists.txt
@@ -0,0 +1,15 @@
+add_custom_command (
+   OUTPUT clouseau_evlog.edj
+   COMMAND edje_cc -id ${CMAKE_CURRENT_SOURCE_DIR}/images ${CMAKE_CURRENT_SOURCE_DIR}/evlog.edc clouseau_evlog.edj
+   DEPENDS evlog.edc
+)
+
+add_custom_target (
+   clouseau_evlog_edj
+   DEPENDS clouseau_evlog.edj evlog.edc
+)
+
+install (
+   FILES ${CMAKE_CURRENT_BINARY_DIR}/clouseau_evlog.edj images/show-screenshot.png images/take-screenshot.png
+   DESTINATION share/${PROJECT_NAME_LOWER}
+)
diff --git a/data/evlog.edc b/data/evlog.edc
new file mode 100644
index 0000000..940a542
--- /dev/null
+++ b/data/evlog.edc
@@ -0,0 +1,138 @@
+#define TILED_PATTERN(_WIDTH, _HEIGHT) \
+   fill { size { relative: 0.0 0.0; offset: _WIDTH _HEIGHT; } }
+
+collections {
+   images.image: "box_glow.png" COMP;
+   images.image: "box_outline.png" COMP;
+
+   group { name: "range";
+      parts {
+         part { name: "bg"; type: RECT;
+            description { state: "default" 0.0;
+               rel1.offset: 1 1;
+               rel2.offset: -2 -2;
+               color_class: "range";
+            }
+         }
+         part { name: "text"; type: TEXT;
+            scale: 1;
+            description { state: "default" 0.0;
+               rel1.to: "bg";
+               rel2.to: "bg";
+               color: 255 255 255 255;
+               text { font: "Sans"; size: 10;
+                  min: 0 1;
+                  align: 0.0 1.0;
+               }
+            }
+         }
+      }
+   }
+
+   group { name: "cpufreq";
+      parts {
+         part { name: "bg"; type: RECT;
+            description { state: "default" 0.0;
+//               rel1.offset: 1 1;
+//               rel2.offset: -2 -2;
+               color_class: "range";
+            }
+         }
+      }
+   }
+
+   group { name: "cpuused";
+      parts {
+         part { name: "bg"; type: RECT;
+            description { state: "default" 0.0;
+//               rel1.offset: 1 1;
+//               rel2.offset: -2 -2;
+               color_class: "range";
+            }
+         }
+      }
+   }
+
+   images.image: "diagonal_stripes.png" COMP;
+
+   group { name: "state";
+      parts {
+         part { name: "bg";
+            description { state: "default" 0.0;
+               rel1.offset: 1 1;
+               rel2.offset: -2 -2;
+               color_class: "state";
+               TILED_PATTERN(240, 240)
+               image.normal: "diagonal_stripes.png";
+            }
+         }
+         part { name: "text"; type: TEXT;
+            scale: 1;
+            description { state: "default" 0.0;
+               rel1.to: "bg";
+               rel2.to: "bg";
+               color: 255 255 255 255;
+               text { font: "Sans"; size: 10;
+                  min: 0 1;
+                  align: 0.0 1.0;
+               }
+            }
+         }
+      }
+   }
+
+   images.image: "handle_pick_up_right.png" COMP;
+
+   group { name: "frame";
+      parts {
+         part { name: "base"; type: RECT;
+            description { state: "default" 0.0;
+               color: 51 153 255 128;
+               min: 1 1;
+            }
+         }
+         part { name: "bg";
+            description { state: "default" 0.0;
+               image.normal: "handle_pick_up_right.png";
+               rel1.offset: -12 -11;
+               rel1.relative: 0.0 1.0;
+               rel2.offset: -12 -11;
+               rel2.relative: 0.0 1.0;
+               align: 0.0 0.0;
+               min: 42 54;
+               max: 42 54;
+            }
+         }
+      }
+   }
+
+   group { name: "event";
+      parts {
+         part { name: "base"; type: RECT; mouse_events: 0;
+            description { state: "default" 0.0;
+               color_class: "event";
+               min: 1 1;
+            }
+         }
+         part { name: "over"; type: RECT;
+            description { state: "default" 0.0;
+               color: 0 0 0 0;
+               min: 5 1;
+            }
+         }
+         part { name: "text"; type: TEXT;
+            scale: 1;
+            description { state: "default" 0.0;
+               rel1.relative: 0.0 1.0;
+               rel2.relative: 1.0 1.0;
+               align: 0.5 0.0;
+               color_class: "event";
+               text { font: "Sans"; size: 10;
+                  min: 1 1;
+                  align: 0.5 0.0;
+               }
+            }
+         }
+      }
+   }
+}
diff --git a/data/images/diagonal_stripes.png b/data/images/diagonal_stripes.png
new file mode 100644
index 0000000..6fa9138
Binary files /dev/null and b/data/images/diagonal_stripes.png differ
diff --git a/data/images/handle_pick_up_right.png b/data/images/handle_pick_up_right.png
new file mode 100644
index 0000000..53fee75
Binary files /dev/null and b/data/images/handle_pick_up_right.png differ
diff --git a/src/bin/CMakeLists.txt b/src/bin/CMakeLists.txt
index c9ca8c9..29da8b8 100644
--- a/src/bin/CMakeLists.txt
+++ b/src/bin/CMakeLists.txt
@@ -2,7 +2,7 @@ set(CMAKE_BUILD_TYPE Debug)
 
 LIST(APPEND SOURCES clouseau_client.c gui.c)
 
-add_definitions(-DEFL_EO_API_SUPPORT -DGUI_IMAGES_PATH="${CMAKE_HOME_DIRECTORY}/data/images")
+add_definitions(-DEFL_EO_API_SUPPORT -DGUI_IMAGES_PATH="${CMAKE_INSTALL_PREFIX}/data/images")
 add_definitions(-DINSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}")
 
 link_directories (${PC_LIBELEMENTARY_LIBRARY_DIRS})
diff --git a/src/lib/extensions/evlog/CMakeLists.txt b/src/lib/extensions/evlog/CMakeLists.txt
index 21cc504..8d4db1a 100644
--- a/src/lib/extensions/evlog/CMakeLists.txt
+++ b/src/lib/extensions/evlog/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(CMAKE_BUILD_TYPE Debug)
 
-add_definitions(-DEFL_EO_API_SUPPORT -DGUI_IMAGES_PATH="${CMAKE_HOME_DIRECTORY}/data/images")
+add_definitions(-DEFL_EO_API_SUPPORT -DEVLOG_EDJ="${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME_LOWER}/clouseau_evlog.edj")
 
 set(EOLIAN_INCLUDE_FLAG -I \"${EOLIAN_EO_DIR}/eo-1\" -I${CMAKE_CURRENT_SOURCE_DIR})
 
@@ -26,3 +26,4 @@ target_link_libraries(clouseau_evlog
    )
 
 INSTALL(TARGETS clouseau_evlog LIBRARY DESTINATION lib)
+
diff --git a/src/lib/extensions/evlog/main.c b/src/lib/extensions/evlog/main.c
index 8f05624..99fd0bf 100644
--- a/src/lib/extensions/evlog/main.c
+++ b/src/lib/extensions/evlog/main.c
@@ -992,7 +992,7 @@ _add_log_state_object(Evas_Object *main, Evas_Object *grid, Event *ev)
 
    o = elm_layout_add(main);
    oe = elm_layout_edje_get(o);
-   elm_layout_file_set(o, "./evlog.edj", "state");
+   elm_layout_file_set(o, EVLOG_EDJ, "state");
    i = 0;
    for (s = ev->event; *s; s++)
      {
@@ -1038,7 +1038,7 @@ _add_log_event_object(Evas_Object *main, Evas_Object *grid, Event *ev)
 
    o = elm_layout_add(main);
    oe = elm_layout_edje_get(o);
-   elm_layout_file_set(o, "./evlog.edj", "range");
+   elm_layout_file_set(o, EVLOG_EDJ, "range");
    i = 0;
    for (s = ev->event; *s; s++)
      {
@@ -1075,7 +1075,7 @@ _add_log_cpuused_object(Evas_Object *main, Evas_Object *grid, Event *ev)
 
    o = elm_layout_add(main);
    oe = elm_layout_edje_get(o);
-   elm_layout_file_set(o, "./evlog.edj", "cpuused");
+   elm_layout_file_set(o, EVLOG_EDJ, "cpuused");
    if (ev->n <= 33)
      {
         col[0] = (ev->n * 255) / 33;
@@ -1110,7 +1110,7 @@ _add_log_frame_object(Evas_Object *main, Evas_Object *grid, Event *ev)
    char buf[512];
 
    o = elm_layout_add(main);
-   elm_layout_file_set(o, "./evlog.edj", "frame");
+   elm_layout_file_set(o, EVLOG_EDJ, "frame");
    elm_grid_pack(grid, o, ev->t0 * RES, ev->n, 0, 1);
    snprintf(buf, sizeof(buf), "%s - %1.5fms", ev->event, ev->t0 * 1000.0);
    elm_object_tooltip_text_set(o, buf);
@@ -1128,7 +1128,7 @@ _add_log_event_event_object(Evas_Object *main, Evas_Object *grid, Event *ev)
 
    o = elm_layout_add(main);
    oe = elm_layout_edje_get(o);
-   elm_layout_file_set(o, "./evlog.edj", "event");
+   elm_layout_file_set(o, EVLOG_EDJ, "event");
    i = 0;
    max = 0;
    for (s = ev->event; *s; s++)
@@ -1174,7 +1174,7 @@ _add_log_cpufreq_object(Evas_Object *parent, Evas_Object *grid, Event *ev, int m
 
    o = elm_layout_add(parent);
    oe = elm_layout_edje_get(o);
-   elm_layout_file_set(o, "./evlog.edj", "cpufreq");
+   elm_layout_file_set(o, EVLOG_EDJ, "cpufreq");
 
    n = (ev->n2 * 100) / mhzmax;
    if (n <= 33)
diff --git a/src/lib/extensions/objects_introspection/CMakeLists.txt b/src/lib/extensions/objects_introspection/CMakeLists.txt
index 4f2dd70..d9cefbd 100644
--- a/src/lib/extensions/objects_introspection/CMakeLists.txt
+++ b/src/lib/extensions/objects_introspection/CMakeLists.txt
@@ -5,7 +5,7 @@ STRING(REGEX REPLACE " " "" EOLIAN_EO_DIR ${EOLIAN_EO_DIR})
 add_definitions(${CLI_COMMON_DEFINITIONS} -DEFL_EO_API_SUPPORT
    -DEOLIAN_EO_DIR="${EOLIAN_EO_DIR}")
 
-add_definitions(-DEFL_EO_API_SUPPORT -DGUI_IMAGES_PATH="${CMAKE_HOME_DIRECTORY}/data/images")
+add_definitions(-DEFL_EO_API_SUPPORT -DGUI_IMAGES_PATH="${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME_LOWER}")
 
 set(EOLIAN_INCLUDE_FLAG -I \"${EOLIAN_EO_DIR}/eo-1\" -I${CMAKE_CURRENT_SOURCE_DIR})