diff --git a/data/images/meson.build b/data/images/meson.build
index 50682e1..57d80b7 100644
--- a/data/images/meson.build
+++ b/data/images/meson.build
@@ -5,8 +5,7 @@ install_data('go-up.png', 'go-down.png',
              'sensor.png', 'mount.png', 'ladyhand.png',
              'find.png', 'bug.png', 'exit.png', 'cpu.png',
              'memory.png', 'storage.png', 'misc.png',
-             'sky_01.jpg', 'sky_02.jpg', 'sky_03.jpg',
-             'sky_04.jpg', 'effects.png', 'info.png',
+             'effects.png', 'info.png',
              'menu.png','lovethisdogharvey.png', 'application.png',
              'e.png', 'freebsd.png', 'linux.png', 'on.png', 'off.png',
              'proc.png', 'manual.png', 'actions.png', 'threads.png',
diff --git a/data/images/sky_01.jpg b/data/images/sky_01.jpg
deleted file mode 100644
index 11bd83c..0000000
Binary files a/data/images/sky_01.jpg and /dev/null differ
diff --git a/data/images/sky_02.jpg b/data/images/sky_02.jpg
deleted file mode 100644
index 1fae0ba..0000000
Binary files a/data/images/sky_02.jpg and /dev/null differ
diff --git a/data/images/sky_03.jpg b/data/images/sky_03.jpg
deleted file mode 100644
index 17d74fb..0000000
Binary files a/data/images/sky_03.jpg and /dev/null differ
diff --git a/data/images/sky_04.jpg b/data/images/sky_04.jpg
deleted file mode 100644
index a6655b5..0000000
Binary files a/data/images/sky_04.jpg and /dev/null differ
diff --git a/src/bin/evisum_config.h b/src/bin/evisum_config.h
index 767cdc0..9a35feb 100644
--- a/src/bin/evisum_config.h
+++ b/src/bin/evisum_config.h
@@ -1,7 +1,7 @@
 #ifndef __CONFIGURATION_H__
 #define __CONFIGURATION_H__
 
-#include "ui/ui.h"
+#include "ui/evisum_ui.h"
 
 #define CONFIG_VERSION 0x0010
 
diff --git a/src/bin/evisum_server.c b/src/bin/evisum_server.c
index e18e50e..eb4cf13 100644
--- a/src/bin/evisum_server.c
+++ b/src/bin/evisum_server.c
@@ -6,7 +6,7 @@
 #include <Ecore.h>
 #include <Ecore_Con.h>
 #include "evisum_server.h"
-#include "src/bin/ui/ui.h"
+#include "src/bin/ui/evisum_ui.h"
 
 #define LISTEN_SOCKET_NAME "evisum_server"
 #define WANTED "bonjour monde"
@@ -23,7 +23,7 @@ _evisum_server_server_client_connect_cb(void *data EINA_UNUSED, int type EINA_UN
 {
    Ecore_Con_Event_Client_Data *ev;
    Evisum_Action *action;
-   Ui *ui;
+   Evisum_Ui *ui;
    int *pid;
 
    ev = event;
@@ -54,7 +54,7 @@ evisum_server_shutdown(void)
 Eina_Bool
 evisum_server_init(void *data)
 {
-   Ui *ui = data;
+   Evisum_Ui *ui = data;
    Evisum_Server *server = calloc(1, sizeof(Evisum_Server));
    if (!server) return 0;
 
diff --git a/src/bin/main.c b/src/bin/main.c
index 92e5e3b..f356a1c 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -7,12 +7,12 @@
 #include "config.h"
 #include "evisum_config.h"
 #include "evisum_server.h"
-#include "ui/ui.h"
+#include "ui/evisum_ui.h"
 
 static Eina_Bool
 _shutdown_cb(void *data, int type, void *event EINA_UNUSED)
 {
-   Ui *ui = data;
+   Evisum_Ui *ui = data;
 
    if (ui->cpu.win) evas_object_del(ui->cpu.win);
    if (ui->mem.win) evas_object_del(ui->mem.win);
@@ -24,7 +24,7 @@ _shutdown_cb(void *data, int type, void *event EINA_UNUSED)
 }
 
 static void
-_signals(Ui *ui)
+_signals(Evisum_Ui *ui)
 {
    ui->handler_sig = ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, _shutdown_cb, ui);
 }
@@ -32,7 +32,7 @@ _signals(Ui *ui)
 int
 elm_main(int argc, char **argv)
 {
-   Ui *ui;
+   Evisum_Ui *ui;
    int i, pid = -1;
    Evisum_Action action = EVISUM_ACTION_DEFAULT;
 
diff --git a/src/bin/ui/ui.c b/src/bin/ui/evisum_ui.c
similarity index 96%
rename from src/bin/ui/ui.c
rename to src/bin/ui/evisum_ui.c
index aa42d21..338dd48 100644
--- a/src/bin/ui/ui.c
+++ b/src/bin/ui/evisum_ui.c
@@ -5,7 +5,7 @@
 
 #include "system/filesystems.h"
 
-#include "ui.h"
+#include "evisum_ui.h"
 #include "ui/ui_cpu.h"
 #include "ui/ui_memory.h"
 #include "ui/ui_disk.h"
@@ -20,14 +20,14 @@ int EVISUM_EVENT_CONFIG_CHANGED;
 static Evas_Object *_slider_alpha = NULL;
 
 void
-evisum_ui_config_save(Ui *ui)
+evisum_ui_config_save(Evisum_Ui *ui)
 {
    Eina_Bool notify = 0;
 
    if (!_evisum_config) return;
 
    _evisum_config->effects = 0;
-   _evisum_config->backgrounds = evisum_ui_backgrounds_enabled_get();
+   _evisum_config->backgrounds = 0;
 
    if (ui->proc.win)
      {
@@ -111,14 +111,12 @@ evisum_ui_config_save(Ui *ui)
 }
 
 void
-evisum_ui_config_load(Ui *ui)
+evisum_ui_config_load(Evisum_Ui *ui)
 {
    _evisum_config = NULL;
 
    _evisum_config = config_load();
 
-   evisum_ui_backgrounds_enabled_set(_evisum_config->backgrounds);
-
    ui->proc.sort_type    = _evisum_config->proc.sort_type;
    ui->proc.sort_reverse = _evisum_config->proc.sort_reverse;
    ui->proc.poll_delay   = _evisum_config->proc.poll_delay;
@@ -168,7 +166,7 @@ evisum_ui_config_load(Ui *ui)
 }
 
 void
-evisum_ui_restart(Ui *ui)
+evisum_ui_restart(Evisum_Ui *ui)
 {
    if (ui->proc.win) ui->proc.restart = 1;
    if (ui->cpu.win) ui->cpu.restart = 1;
@@ -187,7 +185,7 @@ static void
 _about_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
                   void *event_info EINA_UNUSED)
 {
-   Ui *ui = data;
+   Evisum_Ui *ui = data;
 
    evisum_about_window_show(ui);
 }
@@ -196,7 +194,7 @@ static void
 _menu_memory_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
                                  void *event_info EINA_UNUSED)
 {
-   Ui *ui = data;
+   Evisum_Ui *ui = data;
 
    ui_mem_win_add(ui);
 }
@@ -205,7 +203,7 @@ static void
 _menu_network_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
                                   void *event_info EINA_UNUSED)
 {
-   Ui *ui = data;
+   Evisum_Ui *ui = data;
 
    ui_network_win_add(ui);
 }
@@ -214,7 +212,7 @@ static void
 _menu_disk_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
                                void *event_info EINA_UNUSED)
 {
-   Ui *ui = data;
+   Evisum_Ui *ui = data;
 
    ui_disk_win_add(ui);
 }
@@ -223,7 +221,7 @@ static void
 _menu_sensors_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
                                void *event_info EINA_UNUSED)
 {
-   Ui *ui = data;
+   Evisum_Ui *ui = data;
 
    ui_sensors_win_add(ui);
 }
@@ -232,7 +230,7 @@ static void
 _menu_cpu_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
                               void *event_info EINA_UNUSED)
 {
-   Ui *ui = data;
+   Evisum_Ui *ui = data;
 
    ui_cpu_win_add(ui);
 }
@@ -241,7 +239,7 @@ static void
 _menu_process_view_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
                               void *event_info EINA_UNUSED)
 {
-   Ui *ui = data;
+   Evisum_Ui *ui = data;
 
    ui_process_list_win_add(ui);
 }
@@ -250,18 +248,15 @@ static void
 _menu_effects_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
                          void *event_info EINA_UNUSED)
 {
-   Ui *ui;
-   Eina_Bool state;
+   Evisum_Ui *ui;
 
    ui = data;
 
-   state = !evisum_ui_backgrounds_enabled_get();
-
-   evisum_ui_backgrounds_enabled_set(state);
-
+#if 0
    evisum_ui_config_save(ui);
 
    evisum_ui_restart(ui);
+#endif
 }
 
 static Evas_Object *
@@ -290,7 +285,7 @@ static void
 _main_menu_slider_changed_cb(void *data EINA_UNUSED, Evas_Object *obj,
                              void *event_info EINA_UNUSED)
 {
-   Ui *ui = data;
+   Evisum_Ui *ui = data;
 
    ui->proc.poll_delay = elm_slider_value_get(obj) + 0.5;
 
@@ -306,7 +301,7 @@ static void
 _main_menu_slider_alpha_changed_cb(void *data EINA_UNUSED, Evas_Object *obj,
                              void *event_info EINA_UNUSED)
 {
-   Ui *ui = data;
+   Evisum_Ui *ui = data;
 
    ui->proc.alpha = elm_slider_value_get(obj) + 0.5;
 
@@ -317,7 +312,7 @@ static void
 _main_menu_transparant_changed_cb(void *data EINA_UNUSED, Evas_Object *obj,
                                     void *event_info EINA_UNUSED)
 {
-   Ui *ui = data;
+   Evisum_Ui *ui = data;
 
    if (!ui->proc.alpha) return;
 
@@ -331,7 +326,7 @@ static void
 _main_menu_show_threads_changed_cb(void *data EINA_UNUSED, Evas_Object *obj,
                                    void *event_info EINA_UNUSED)
 {
-   Ui *ui = data;
+   Evisum_Ui *ui = data;
 
    ui->proc.show_kthreads = elm_check_state_get(obj);
    evisum_ui_config_save(ui);
@@ -341,7 +336,7 @@ static void
 _main_menu_show_scroller_changed_cb(void *data EINA_UNUSED, Evas_Object *obj,
                                     void *event_info EINA_UNUSED)
 {
-   Ui *ui = data;
+   Evisum_Ui *ui = data;
 
    ui->proc.show_scroller = elm_check_state_get(obj);
    evisum_ui_config_save(ui);
@@ -351,7 +346,7 @@ static void
 _main_menu_show_user_changed_cb(void *data EINA_UNUSED, Evas_Object *obj,
                                 void *event_info EINA_UNUSED)
 {
-   Ui *ui = data;
+   Evisum_Ui *ui = data;
 
    ui->proc.show_user = elm_check_state_get(obj);
    evisum_ui_config_save(ui);
@@ -388,7 +383,7 @@ _main_menu_focus_timer_cb(void *data)
 }
 
 Evas_Object *
-evisum_ui_main_menu_create(Ui *ui, Evas_Object *parent, Evas_Object *obj)
+evisum_ui_main_menu_create(Evisum_Ui *ui, Evas_Object *parent, Evas_Object *obj)
 {
    Evas_Object *o, *obx, *bx, *tb, *hbx, *sep, *fr, *sli;
    Evas_Object *it_focus, *btn, *chk, *rec;
@@ -636,7 +631,7 @@ evisum_ui_main_menu_create(Ui *ui, Evas_Object *parent, Evas_Object *obj)
 
 // Any OS specific feature checks.
 static void
-_ui_init_system_probe(Ui *ui)
+_ui_init_system_probe(Evisum_Ui *ui)
 {
 #if defined(__OpenBSD__)
    ui->proc.has_kthreads = 0;
@@ -649,7 +644,7 @@ _ui_init_system_probe(Ui *ui)
 }
 
 void
-evisum_ui_activate(Ui *ui, Evisum_Action action, int pid)
+evisum_ui_activate(Evisum_Ui *ui, Evisum_Action action, int pid)
 {
    Eina_Bool restart = 0;
 
@@ -725,7 +720,7 @@ evisum_ui_activate(Ui *ui, Evisum_Action action, int pid)
 }
 
 void
-evisum_ui_shutdown(Ui *ui)
+evisum_ui_shutdown(Evisum_Ui *ui)
 {
    evisum_icon_cache_shutdown();
    evisum_ui_config_save(ui);
@@ -733,10 +728,10 @@ evisum_ui_shutdown(Ui *ui)
    free(ui);
 }
 
-Ui *
+Evisum_Ui *
 evisum_ui_init(void)
 {
-   Ui *ui = calloc(1, sizeof(Ui));
+   Evisum_Ui *ui = calloc(1, sizeof(Evisum_Ui));
    if (!ui) return NULL;
 
    ui->proc.poll_delay = 3;
@@ -747,7 +742,6 @@ evisum_ui_init(void)
 
    EVISUM_EVENT_CONFIG_CHANGED = ecore_event_type_new();
 
-   evisum_ui_backgrounds_enabled_set(0);
    evisum_ui_config_load(ui);
 
    evisum_icon_cache_init();
diff --git a/src/bin/ui/ui.h b/src/bin/ui/evisum_ui.h
similarity index 80%
rename from src/bin/ui/ui.h
rename to src/bin/ui/evisum_ui.h
index bd4ea30..7370c18 100644
--- a/src/bin/ui/ui.h
+++ b/src/bin/ui/evisum_ui.h
@@ -1,5 +1,5 @@
-#ifndef __UI_H__
-#define __UI_H__
+#ifndef __EVISUM_UI_H__
+#define __EVISUM_UI_H__
 
 #include <Elementary.h>
 #include "gettext.h"
@@ -16,7 +16,7 @@
 #define EVISUM_WIN_WIDTH  800
 #define EVISUM_WIN_HEIGHT 600
 
-typedef struct Ui
+typedef struct _Evisum_Ui
 {
    pid_t                program_pid;
    Ecore_Event_Handler *handler_sig;
@@ -91,30 +91,30 @@ typedef struct Ui
       int           x, y;
       Eina_Bool     restart;
    } network;
-} Ui;
+} Evisum_Ui;
 
-Ui *
+Evisum_Ui *
 evisum_ui_init(void);
 
 void
-evisum_ui_shutdown(Ui *ui);
+evisum_ui_shutdown(Evisum_Ui *ui);
 
 Evas_Object *
-evisum_ui_main_menu_create(Ui *ui, Evas_Object *parent, Evas_Object *obj);
+evisum_ui_main_menu_create(Evisum_Ui *ui, Evas_Object *parent, Evas_Object *obj);
 
 void
-evisum_ui_activate(Ui *ui, Evisum_Action action, int pid);
+evisum_ui_activate(Evisum_Ui *ui, Evisum_Action action, int pid);
 
 const char *
-evisum_ui_icon_cache_find(Ui *ui, const char *cmd);
+evisum_ui_icon_cache_find(Evisum_Ui *ui, const char *cmd);
 
 void
-evisum_ui_config_load(Ui *ui);
+evisum_ui_config_load(Evisum_Ui *ui);
 
 void
-evisum_ui_config_save(Ui *ui);
+evisum_ui_config_save(Evisum_Ui *ui);
 
 void
-evisum_ui_restart(Ui *ui);
+evisum_ui_restart(Evisum_Ui *ui);
 
 #endif
diff --git a/src/bin/ui/meson.build b/src/bin/ui/meson.build
index 4ecb2db..35a8caf 100644
--- a/src/bin/ui/meson.build
+++ b/src/bin/ui/meson.build
@@ -1,7 +1,7 @@
 src += files([
    'gettext.h',
-   'ui.h',
-   'ui.c',
+   'evisum_ui.h',
+   'evisum_ui.c',
    'ui_util.h',
    'ui_util.c',
    'ui_cache.c',
diff --git a/src/bin/ui/ui_cpu.c b/src/bin/ui/ui_cpu.c
index 2cf6b19..3a26862 100644
--- a/src/bin/ui/ui_cpu.c
+++ b/src/bin/ui/ui_cpu.c
@@ -8,8 +8,6 @@ typedef struct {
 } Core;
 
 typedef struct {
-   Ui             *ui;
-
    Ecore_Thread   *thread;
 
    Evas_Object    *win;
@@ -19,9 +17,7 @@ typedef struct {
    Evas_Object    *obj;
 
    Evas_Object    *colors;
-
    int             cpu_count;
-
    int            *cpu_order;
 
    Eina_Bool       show_cpufreq;
@@ -38,6 +34,8 @@ typedef struct {
 
    Eina_Bool       confused;
    Eina_List      *explainers;
+
+   Evisum_Ui      *ui;
 } Animate;
 
 typedef struct _Color_Point {
@@ -345,7 +343,7 @@ static void
 _win_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
    Animate *ad;
-   Ui *ui;
+   Evisum_Ui *ui;
 
    ad = data;
    ui = ad->ui;
@@ -358,7 +356,7 @@ _win_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
 {
    Explainer *exp;
    Animate *ad = data;
-   Ui *ui = ad->ui;
+   Evisum_Ui *ui = ad->ui;
 
    evisum_ui_config_save(ui);
    ecore_thread_cancel(ad->thread);
@@ -461,7 +459,7 @@ static void
 _btn_menu_clicked_cb(void *data, Evas_Object *obj,
                      void *event_info EINA_UNUSED)
 {
-   Ui *ui;
+   Evisum_Ui *ui;
    Animate *ad = data;
 
    ui = ad->ui;
@@ -475,7 +473,7 @@ _btn_menu_clicked_cb(void *data, Evas_Object *obj,
 }
 
 static Animate *
-_graph(Ui *ui, Evas_Object *parent)
+_graph(Evisum_Ui *ui, Evas_Object *parent)
 {
    Evas_Object *tbl, *tbl2, *box, *obj, *ic, *lb, *rec;
    Evas_Object *fr, *bx, *hbx, *colors, *check, *btn;
@@ -770,13 +768,13 @@ _graph(Ui *ui, Evas_Object *parent)
  static void
 _win_resize_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
-   Ui *ui = data;
+   Evisum_Ui *ui = data;
 
    evas_object_geometry_get(obj, NULL, NULL, &ui->cpu.width, &ui->cpu.height);
 }
 
 void
-ui_cpu_win_add(Ui *ui)
+ui_cpu_win_add(Evisum_Ui *ui)
 {
    Animate *ad;
    Evas_Object *win, *box, *scr;
@@ -792,9 +790,6 @@ ui_cpu_win_add(Ui *ui)
    elm_win_autodel_set(win, 1);
    evas_object_size_hint_weight_set(win, EXPAND, EXPAND);
    evas_object_size_hint_align_set(win, FILL, FILL);
-   evisum_ui_background_random_add(win,
-                                   evisum_ui_backgrounds_enabled_get());
-
    evas_object_event_callback_add(win, EVAS_CALLBACK_RESIZE,
                                   _win_resize_cb, ui);
 
diff --git a/src/bin/ui/ui_cpu.h b/src/bin/ui/ui_cpu.h
index 8fb0423..bffbcc0 100644
--- a/src/bin/ui/ui_cpu.h
+++ b/src/bin/ui/ui_cpu.h
@@ -1,10 +1,10 @@
 #ifndef __UI_CPU_H__
 #define __UI_CPU_H__
 
-#include "ui.h"
+#include "evisum_ui.h"
 #include "../system/machine.h"
 
 void
-ui_cpu_win_add(Ui *ui);
+ui_cpu_win_add(Evisum_Ui *ui);
 
 #endif
diff --git a/src/bin/ui/ui_disk.c b/src/bin/ui/ui_disk.c
index 61401b8..14a15db 100644
--- a/src/bin/ui/ui_disk.c
+++ b/src/bin/ui/ui_disk.c
@@ -17,14 +17,14 @@ typedef struct
    Eina_Bool        sort_reverse;
    Eina_Bool        skip_wait;
 
-   Ui              *ui;
-} Ui_Data;
+   Evisum_Ui       *ui;
+} Data;
 
 static void
 _item_unrealized_cb(void *data, Evas_Object *obj EINA_UNUSED,
                     void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd;
+   Data *pd;
    Evas_Object *o;
    Eina_List *contents = NULL;
 
@@ -102,7 +102,7 @@ _content_get(void *data, Evas_Object *obj, const char *source)
 {
    Evas_Object *lb, *r, *pb;
    Evas_Coord w, ow;
-   Ui_Data *pd;
+   Data *pd;
    File_System *inf = data;
 
    if (!inf) return NULL;
@@ -218,7 +218,7 @@ _glist_ensure_n_items(Evas_Object *glist, unsigned int items)
 static void
 _disks_poll(void *data, Ecore_Thread *thread)
 {
-   Ui_Data *pd = data;
+   Data *pd = data;
 
    while (!ecore_thread_check(thread))
      {
@@ -242,7 +242,7 @@ _disks_poll_feedback_cb(void *data, Ecore_Thread *thread, void *msgdata)
 {
    Elm_Object_Item *it;
    File_System *fs;
-   Ui_Data *pd;
+   Data *pd;
    Eina_List *mounted;
 
    pd = data;
@@ -267,7 +267,7 @@ _disks_poll_feedback_cb(void *data, Ecore_Thread *thread, void *msgdata)
 }
 
 static void
-_disks_poll_update(Ui_Data *pd)
+_disks_poll_update(Data *pd)
 {
    pd->skip_wait = 1;
 }
@@ -276,7 +276,7 @@ static void
 _win_key_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
    Evas_Event_Key_Down *ev;
-   Ui_Data *pd;
+   Data *pd;
 
    pd = data;
    ev = event_info;
@@ -291,8 +291,8 @@ _win_key_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 static void
 _win_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd;
-   Ui *ui;
+   Data *pd;
+   Evisum_Ui *ui;
 
    pd = data;
    ui = pd->ui;
@@ -304,8 +304,8 @@ static void
 _win_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
             void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd;
-   Ui *ui;
+   Data *pd;
+   Evisum_Ui *ui;
 
    pd = data;
    ui = pd->ui;
@@ -437,7 +437,7 @@ static void
 _btn_device_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj,
                        void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
+   Data *pd = data;
 
    if (pd->sort_cb == _sort_by_device)
      pd->sort_reverse = !pd->sort_reverse;
@@ -451,7 +451,7 @@ static void
 _btn_mount_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj,
                       void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
+   Data *pd = data;
 
    if (pd->sort_cb == _sort_by_mount)
      pd->sort_reverse = !pd->sort_reverse;
@@ -465,7 +465,7 @@ static void
 _btn_fs_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj,
                    void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
+   Data *pd = data;
 
    if (pd->sort_cb == _sort_by_type)
      pd->sort_reverse = !pd->sort_reverse;
@@ -479,7 +479,7 @@ static void
 _btn_used_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj,
                      void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
+   Data *pd = data;
 
    if (pd->sort_cb == _sort_by_used)
      pd->sort_reverse = !pd->sort_reverse;
@@ -493,7 +493,7 @@ static void
 _btn_free_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj,
                      void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
+   Data *pd = data;
 
    if (pd->sort_cb == _sort_by_free)
      pd->sort_reverse = !pd->sort_reverse;
@@ -507,7 +507,7 @@ static void
 _btn_total_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj,
                       void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
+   Data *pd = data;
 
    if (pd->sort_cb == _sort_by_total)
      pd->sort_reverse = !pd->sort_reverse;
@@ -521,7 +521,7 @@ static void
 _btn_usage_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj,
                       void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
+   Data *pd = data;
 
    if (pd->sort_cb == _sort_by_cpu_usage)
      pd->sort_reverse = !pd->sort_reverse;
@@ -534,8 +534,8 @@ _btn_usage_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj,
 static void
 _win_resize_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
-   Ui_Data *pd = data;
-   Ui *ui = pd->ui;
+   Data *pd = data;
+   Evisum_Ui *ui = pd->ui;
 
    _disks_poll_update(pd);
    evas_object_geometry_get(obj, NULL, NULL, &ui->disk.width, &ui->disk.height);
@@ -551,7 +551,7 @@ _btn_min_size(Evas_Object *parent)
 }
 
 void
-ui_disk_win_add(Ui *ui)
+ui_disk_win_add(Evisum_Ui *ui)
 {
    Evas_Object *win, *tb, *scr;
    Evas_Object *glist, *rec, *btn;
@@ -567,10 +567,8 @@ ui_disk_win_add(Ui *ui)
    elm_win_autodel_set(win, 1);
    evas_object_size_hint_weight_set(win, EXPAND, EXPAND);
    evas_object_size_hint_align_set(win, FILL, FILL);
-   evisum_ui_background_random_add(win,
-                                   evisum_ui_backgrounds_enabled_get());
 
-   Ui_Data *pd = calloc(1, sizeof(Ui_Data));
+   Data *pd = calloc(1, sizeof(Data));
    pd->ui = ui;
    pd->skip_wait = 1;
 
diff --git a/src/bin/ui/ui_disk.h b/src/bin/ui/ui_disk.h
index 1b130dd..cd7acfd 100644
--- a/src/bin/ui/ui_disk.h
+++ b/src/bin/ui/ui_disk.h
@@ -1,9 +1,9 @@
 #ifndef __UI_DISK_H__
 #define __UI_DISK_H__
 
-#include "ui.h"
+#include "evisum_ui.h"
 
 void
-ui_disk_win_add(Ui *ui);
+ui_disk_win_add(Evisum_Ui *ui);
 
 #endif
diff --git a/src/bin/ui/ui_memory.c b/src/bin/ui/ui_memory.c
index f3f5105..a0127a9 100644
--- a/src/bin/ui/ui_memory.c
+++ b/src/bin/ui/ui_memory.c
@@ -14,8 +14,8 @@ typedef struct  {
    Evas_Object  *swap;
    Evas_Object  *video[MEM_VIDEO_CARD_MAX];
 
-   Ui           *ui;
-} Ui_Data;
+   Evisum_Ui    *ui;
+} Data;
 
 static Evas_Object *
 _label_mem(Evas_Object *parent, const char *text)
@@ -64,7 +64,7 @@ _mem_usage_main_cb(void *data EINA_UNUSED, Ecore_Thread *thread)
 }
 
 static void
-_update_widgets(Ui_Data *pd, meminfo_t *memory)
+_update_widgets(Data *pd, meminfo_t *memory)
 {
    Evas_Object *pb;
    double ratio, value;
@@ -139,7 +139,7 @@ _update_widgets(Ui_Data *pd, meminfo_t *memory)
 static void
 _mem_usage_feedback_cb(void *data, Ecore_Thread *thread EINA_UNUSED, void *msgdata)
 {
-   Ui_Data *pd;
+   Data *pd;
    meminfo_t *memory;
 
    pd = data;
@@ -154,7 +154,7 @@ static void
 _win_key_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
    Evas_Event_Key_Down *ev;
-   Ui_Data *pd;
+   Data *pd;
 
    pd = data;
    ev = event_info;
@@ -169,8 +169,8 @@ _win_key_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 static void
 _win_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd;
-   Ui *ui;
+   Data *pd;
+   Evisum_Ui *ui;
 
    pd = data;
    ui = pd->ui;
@@ -182,8 +182,8 @@ static void
 _win_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj,
             void *event_info EINA_UNUSED)
 {
-   Ui *ui;
-   Ui_Data *pd = data;
+   Evisum_Ui *ui;
+   Data *pd = data;
 
    ui = pd->ui;
 
@@ -198,14 +198,14 @@ _win_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj,
 static void
 _win_resize_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
-   Ui_Data *pd = data;
-   Ui *ui = pd->ui;
+   Data *pd = data;
+   Evisum_Ui *ui = pd->ui;
 
    evas_object_geometry_get(obj, NULL, NULL, &ui->mem.width, &ui->mem.height);
 }
 
 void
-ui_mem_win_add(Ui *ui)
+ui_mem_win_add(Evisum_Ui *ui)
 {
    Evas_Object *win, *lb, *bx, *tb, *pb;
    Evas_Object *fr;
@@ -218,7 +218,7 @@ ui_mem_win_add(Ui *ui)
         return;
      }
 
-   Ui_Data *pd = calloc(1, sizeof(Ui_Data));
+   Data *pd = calloc(1, sizeof(Data));
    if (!pd) return;
    pd->ui = ui;
 
@@ -230,8 +230,6 @@ ui_mem_win_add(Ui *ui)
    elm_win_autodel_set(win, 1);
    evas_object_size_hint_weight_set(win, EXPAND, EXPAND);
    evas_object_size_hint_align_set(win, FILL, FILL);
-   evisum_ui_background_random_add(win,
-                                   evisum_ui_backgrounds_enabled_get());
 
    bx = elm_box_add(win);
    evas_object_size_hint_weight_set(bx, EXPAND, 0);
diff --git a/src/bin/ui/ui_memory.h b/src/bin/ui/ui_memory.h
index c71829c..44f8cff 100644
--- a/src/bin/ui/ui_memory.h
+++ b/src/bin/ui/ui_memory.h
@@ -1,10 +1,10 @@
 #ifndef __UI_MEMORY_H__
 #define __UI_MEMORY_H__
 
-#include "ui.h"
+#include "evisum_ui.h"
 #include "../system/machine.h"
 
 void
-ui_mem_win_add(Ui *ui);
+ui_mem_win_add(Evisum_Ui *ui);
 
 #endif
diff --git a/src/bin/ui/ui_network.c b/src/bin/ui/ui_network.c
index 4d30b32..e04a7f0 100644
--- a/src/bin/ui/ui_network.c
+++ b/src/bin/ui/ui_network.c
@@ -7,8 +7,9 @@ typedef struct
    Evas_Object           *win;
    Evas_Object           *glist;
    Elm_Genlist_Item_Class itc, itc2;
-   Ui                    *ui;
-} Ui_Data;
+
+   Evisum_Ui             *ui;
+} Data;
 
 typedef struct
 {
@@ -29,7 +30,7 @@ typedef struct
 } Network_Interface;
 
 static void
-_interface_gone(net_iface_t **ifaces, int n, Eina_List *list, Ui_Data *pd)
+_interface_gone(net_iface_t **ifaces, int n, Eina_List *list, Data *pd)
 {
    Eina_List *l;
    Network_Interface *iface;
@@ -54,7 +55,7 @@ _interface_gone(net_iface_t **ifaces, int n, Eina_List *list, Ui_Data *pd)
 static void
 _network_update(void *data, Ecore_Thread *thread)
 {
-   Ui_Data *pd = data;
+   Data *pd = data;
    Eina_List *interfaces = NULL;
    Network_Interface *iface;
 
@@ -215,7 +216,7 @@ _network_update_feedback_cb(void *data, Ecore_Thread *thread, void *msgdata EINA
 {
    Eina_List *interfaces;
    Network_Interface *iface;
-   Ui_Data *pd;
+   Data *pd;
    Evas_Object *obj;
    Eina_List *l, *l2;
    char *s;
@@ -275,7 +276,7 @@ static void
 _win_key_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
    Evas_Event_Key_Down *ev;
-   Ui_Data *pd;
+   Data *pd;
 
    pd = data;
    ev = event_info;
@@ -290,8 +291,8 @@ _win_key_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 static void
 _win_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd;
-   Ui *ui;
+   Data *pd;
+   Evisum_Ui *ui;
 
    pd = data;
    ui = pd->ui;
@@ -303,8 +304,8 @@ static void
 _win_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
             void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
-   Ui *ui = pd->ui;
+   Data *pd = data;
+   Evisum_Ui *ui = pd->ui;
 
    evisum_ui_config_save(ui);
    ecore_thread_cancel(pd->thread);
@@ -316,14 +317,14 @@ _win_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
 static void
 _win_resize_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
-   Ui_Data *pd = data;
-   Ui *ui = pd->ui;
+   Data *pd = data;
+   Evisum_Ui *ui = pd->ui;
 
    evas_object_geometry_get(obj, NULL, NULL, &ui->network.width, &ui->network.height);
 }
 
 void
-ui_network_win_add(Ui *ui)
+ui_network_win_add(Evisum_Ui *ui)
 {
    Evas_Object *win, *bx, *glist;;
    Elm_Genlist_Item_Class *itc;
@@ -334,7 +335,7 @@ ui_network_win_add(Ui *ui)
         return;
      }
 
-   Ui_Data *pd = calloc(1, sizeof(Ui_Data));
+   Data *pd = calloc(1, sizeof(Data));
    if (!pd) return;
    pd->ui = ui;
 
diff --git a/src/bin/ui/ui_network.h b/src/bin/ui/ui_network.h
index 40af2aa..59eaca5 100644
--- a/src/bin/ui/ui_network.h
+++ b/src/bin/ui/ui_network.h
@@ -1,10 +1,10 @@
 #ifndef __UI_NETWORK_H__
 #define __UI_NETWORK_H__
 
-#include "ui.h"
+#include "evisum_ui.h"
 #include "../system/machine.h"
 
 void
-ui_network_win_add(Ui *ui);
+ui_network_win_add(Evisum_Ui *ui);
 
 #endif
diff --git a/src/bin/ui/ui_process_list.c b/src/bin/ui/ui_process_list.c
index ac8c61f..4b81107 100644
--- a/src/bin/ui/ui_process_list.c
+++ b/src/bin/ui/ui_process_list.c
@@ -1,7 +1,7 @@
 #include "config.h"
 #include "evisum_config.h"
 
-#include "ui.h"
+#include "evisum_ui.h"
 #include "ui/ui_process_list.h"
 #include "ui/ui_process_view.h"
 
@@ -33,8 +33,6 @@ typedef struct
    pid_t                  selected_pid;
    int                    poll_count;
 
-   Ui                    *ui;
-
    Ecore_Timer           *resize_timer;
    Evas_Object           *win;
    Evas_Object           *main_menu;
@@ -91,9 +89,12 @@ typedef struct
       int                  zombie;
       int                  dsleep;
    } summary;
-} Ui_Data;
+ 
+   Evisum_Ui              *ui;
 
-static Ui_Data *_pd = NULL;
+} Data;
+
+static Data *_pd = NULL;
 
 typedef struct
 {
@@ -153,7 +154,7 @@ _field_enabled(Proc_Field id)
 }
 
 static void
-_content_reset(Ui_Data *pd)
+_content_reset(Data *pd)
 {
    Evas_Object *rec;
    int j = 0;
@@ -186,13 +187,13 @@ _field_menu_check_changed_cb(void *data, Evas_Object *obj, void *event_info)
 {
    Field *f = data;
    f->enabled = !f->enabled;
-   Ui *ui = _pd->ui;
+   Evisum_Ui *ui = _pd->ui;
    _content_reset(_pd);
    ui->proc.fields ^= (1 << f->id);
 }
 
 static Evas_Object *
-_field_menu_create(Ui_Data *pd, Evas_Object *parent)
+_field_menu_create(Data *pd, Evas_Object *parent)
 {
    Evas_Object *o, *fr, *bx, *ck;
 
@@ -236,7 +237,7 @@ _field_mouse_up_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED,
    Evas_Event_Mouse_Up *ev;
    Evas_Object *o;
    Evas_Coord ox, oy, ow, oh;
-   Ui_Data *pd;
+   Data *pd;
 
    ev = event_info;
    pd = data;
@@ -255,7 +256,7 @@ _field_mouse_up_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED,
 }
 
 static void
-_fields_init(Ui_Data *pd)
+_fields_init(Data *pd)
 {
    for (int i = PROC_FIELD_CMD; i < PROC_FIELD_MAX; i++)
      {
@@ -280,7 +281,7 @@ _item_unrealized_cb(void *data, Evas_Object *obj EINA_UNUSED,
                     void *event_info EINA_UNUSED)
 {
    Evas_Object *o;
-   Ui_Data *pd;
+   Data *pd;
    Eina_List *contents = NULL;
 
    pd = data;
@@ -461,7 +462,7 @@ _run_time_set(char *buf, size_t n, int64_t secs)
 }
 
 static void
-_field_adjust(Ui_Data *pd, Proc_Field id, Evas_Object *obj, Evas_Coord w)
+_field_adjust(Data *pd, Proc_Field id, Evas_Object *obj, Evas_Coord w)
 {
    Evas_Object *rec = evas_object_data_get(obj, "rec");
    if (id != pd->field_max)
@@ -483,7 +484,7 @@ _content_get(void *data, Evas_Object *obj, const char *source)
    Evas_Object *rec, *lb, *o, *hbx, *pb;
    char buf[128];
    Evas_Coord w, ow;
-   Ui_Data *pd = _pd;
+   Data *pd = _pd;
 
    proc = (void *) data;
 
@@ -720,7 +721,7 @@ _glist_ensure_n_items(Evas_Object *glist, unsigned int items,
 static Eina_Bool
 _bring_in(void *data)
 {
-   Ui_Data *pd;
+   Data *pd;
    int h_page, v_page;
 
    pd = data;
@@ -734,7 +735,7 @@ _bring_in(void *data)
 }
 
 static void
-_summary_reset(Ui_Data *pd)
+_summary_reset(Data *pd)
 {
    pd->summary.total = pd->summary.running = pd->summary.sleeping = 0;
    pd->summary.stopped = pd->summary.idle  = pd->summary.zombie = 0;
@@ -742,7 +743,7 @@ _summary_reset(Ui_Data *pd)
 }
 
 static void
-_summary_update(Ui_Data *pd)
+_summary_update(Data *pd)
 {
    Eina_Strbuf *buf = eina_strbuf_new();
 
@@ -770,7 +771,7 @@ _summary_update(Ui_Data *pd)
 }
 
 static void
-_summary_total(Ui_Data *pd, Proc_Info *proc)
+_summary_total(Data *pd, Proc_Info *proc)
 {
    pd->summary.total++;
    if (!strcmp(proc->state, "running"))
@@ -790,9 +791,9 @@ _summary_total(Ui_Data *pd, Proc_Info *proc)
 }
 
 static Eina_List *
-_process_list_sort(Eina_List *list, Ui_Data *pd)
+_process_list_sort(Eina_List *list, Data *pd)
 {
-   Ui *ui;
+   Evisum_Ui *ui;
    Sorter s;
    ui = pd->ui;
 
@@ -832,11 +833,11 @@ _cpu_times_free_cb(void *data)
 }
 
 static Eina_List *
-_process_list_search_trim(Eina_List *list, Ui_Data *pd)
+_process_list_search_trim(Eina_List *list, Data *pd)
 {
    Eina_List *l, *l_next;
    Proc_Info *proc;
-   Ui *ui = pd->ui;
+   Evisum_Ui *ui = pd->ui;
 
    _summary_reset(pd);
 
@@ -879,10 +880,10 @@ _process_list_search_trim(Eina_List *list, Ui_Data *pd)
 }
 
 static Eina_List *
-_process_list_get(Ui_Data *pd)
+_process_list_get(Data *pd)
 {
    Eina_List *list;
-   Ui *ui;
+   Evisum_Ui *ui;
 
    ui = pd->ui;
 
@@ -900,9 +901,9 @@ _process_list_get(Ui_Data *pd)
 static void
 _process_list(void *data, Ecore_Thread *thread)
 {
-   Ui_Data *pd;
+   Data *pd;
    Eina_List *list;
-   Ui *ui;
+   Evisum_Ui *ui;
    Proc_Info *proc;
    int i, delay = 1;
 
@@ -938,7 +939,7 @@ static void
 _process_list_feedback_cb(void *data, Ecore_Thread *thread EINA_UNUSED,
                           void *msg EINA_UNUSED)
 {
-   Ui_Data *pd;
+   Data *pd;
    Eina_List *list;
    Proc_Info *proc;
    Elm_Object_Item *it;
@@ -995,7 +996,7 @@ _process_list_feedback_cb(void *data, Ecore_Thread *thread EINA_UNUSED,
 }
 
 static void
-_process_list_update(Ui_Data *pd)
+_process_list_update(Data *pd)
 {
    pd->skip_wait = 1;
 }
@@ -1015,9 +1016,9 @@ _btn_icon_state_update(Evas_Object *btn, Eina_Bool reverse,
 }
 
 static void
-_btn_clicked_state_save(Ui_Data *pd, Evas_Object *btn)
+_btn_clicked_state_save(Data *pd, Evas_Object *btn)
 {
-   Ui *ui = pd->ui;
+   Evisum_Ui *ui = pd->ui;
 
    if (pd->fields_menu)
      {
@@ -1037,8 +1038,8 @@ static void
 _btn_cmd_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
                     void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
-   Ui *ui = pd->ui;
+   Data *pd = data;
+   Evisum_Ui *ui = pd->ui;
 
    if (ui->proc.sort_type == PROC_SORT_BY_CMD)
      ui->proc.sort_reverse = !ui->proc.sort_reverse;
@@ -1050,8 +1051,8 @@ static void
 _btn_uid_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
                     void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
-   Ui *ui = pd->ui;
+   Data *pd = data;
+   Evisum_Ui *ui = pd->ui;
 
    if (ui->proc.sort_type == PROC_SORT_BY_UID)
      ui->proc.sort_reverse = !ui->proc.sort_reverse;
@@ -1063,8 +1064,8 @@ static void
 _btn_pid_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
                     void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
-   Ui *ui = pd->ui;
+   Data *pd = data;
+   Evisum_Ui *ui = pd->ui;
 
    if (ui->proc.sort_type == PROC_SORT_BY_PID)
      ui->proc.sort_reverse = !ui->proc.sort_reverse;
@@ -1076,8 +1077,8 @@ static void
 _btn_threads_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
                         void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
-   Ui *ui = pd->ui;
+   Data *pd = data;
+   Evisum_Ui *ui = pd->ui;
 
    if (ui->proc.sort_type == PROC_SORT_BY_THREADS)
      ui->proc.sort_reverse = !ui->proc.sort_reverse;
@@ -1089,8 +1090,8 @@ static void
 _btn_cpu_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
                     void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
-   Ui *ui = pd->ui;
+   Data *pd = data;
+   Evisum_Ui *ui = pd->ui;
 
    if (ui->proc.sort_type == PROC_SORT_BY_CPU)
      ui->proc.sort_reverse = !ui->proc.sort_reverse;
@@ -1102,8 +1103,8 @@ static void
 _btn_pri_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
                     void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
-   Ui *ui = pd->ui;
+   Data *pd = data;
+   Evisum_Ui *ui = pd->ui;
 
    if (ui->proc.sort_type == PROC_SORT_BY_PRI)
      ui->proc.sort_reverse = !ui->proc.sort_reverse;
@@ -1115,8 +1116,8 @@ static void
 _btn_nice_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
                      void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
-   Ui *ui = pd->ui;
+   Data *pd = data;
+   Evisum_Ui *ui = pd->ui;
 
    if (ui->proc.sort_type == PROC_SORT_BY_NICE)
      ui->proc.sort_reverse = !ui->proc.sort_reverse;
@@ -1128,8 +1129,8 @@ static void
 _btn_files_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
                       void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
-   Ui *ui = pd->ui;
+   Data *pd = data;
+   Evisum_Ui *ui = pd->ui;
 
    if (ui->proc.sort_type == PROC_SORT_BY_FILES)
      ui->proc.sort_reverse = !ui->proc.sort_reverse;
@@ -1141,8 +1142,8 @@ static void
 _btn_size_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
                      void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
-   Ui *ui = pd->ui;
+   Data *pd = data;
+   Evisum_Ui *ui = pd->ui;
 
    if (ui->proc.sort_type == PROC_SORT_BY_SIZE)
      ui->proc.sort_reverse = !ui->proc.sort_reverse;
@@ -1154,8 +1155,8 @@ static void
 _btn_virt_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
                      void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
-   Ui *ui = pd->ui;
+   Data *pd = data;
+   Evisum_Ui *ui = pd->ui;
 
    if (ui->proc.sort_type == PROC_SORT_BY_VIRT)
      ui->proc.sort_reverse = !ui->proc.sort_reverse;
@@ -1167,8 +1168,8 @@ static void
 _btn_rss_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
                     void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
-   Ui *ui = pd->ui;
+   Data *pd = data;
+   Evisum_Ui *ui = pd->ui;
 
    if (ui->proc.sort_type == PROC_SORT_BY_RSS)
      ui->proc.sort_reverse = !ui->proc.sort_reverse;
@@ -1180,8 +1181,8 @@ static void
 _btn_shared_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
                        void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
-   Ui *ui = pd->ui;
+   Data *pd = data;
+   Evisum_Ui *ui = pd->ui;
 
    if (ui->proc.sort_type == PROC_SORT_BY_SHARED)
      ui->proc.sort_reverse = !ui->proc.sort_reverse;
@@ -1193,8 +1194,8 @@ static void
 _btn_state_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
                       void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
-   Ui *ui = pd->ui;
+   Data *pd = data;
+   Evisum_Ui *ui = pd->ui;
 
    if (ui->proc.sort_type == PROC_SORT_BY_STATE)
      ui->proc.sort_reverse = !ui->proc.sort_reverse;
@@ -1206,8 +1207,8 @@ static void
 _btn_time_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
                      void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
-   Ui *ui = pd->ui;
+   Data *pd = data;
+   Evisum_Ui *ui = pd->ui;
 
    if (ui->proc.sort_type == PROC_SORT_BY_TIME)
      ui->proc.sort_reverse = !ui->proc.sort_reverse;
@@ -1219,8 +1220,8 @@ static void
 _btn_cpu_usage_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
                           void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
-   Ui *ui = pd->ui;
+   Data *pd = data;
+   Evisum_Ui *ui = pd->ui;
 
    if (ui->proc.sort_type == PROC_SORT_BY_CPU_USAGE)
      ui->proc.sort_reverse = !ui->proc.sort_reverse;
@@ -1232,7 +1233,7 @@ static void
 _item_menu_dismissed_cb(void *data EINA_UNUSED, Evas_Object *obj,
                         void *ev EINA_UNUSED)
 {
-   Ui_Data *pd = data;
+   Data *pd = data;
 
    evas_object_del(obj);
 
@@ -1243,7 +1244,7 @@ static void
 _item_menu_start_cb(void *data, Evas_Object *obj EINA_UNUSED,
                     void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
+   Data *pd = data;
    kill(pd->selected_pid, SIGCONT);
 }
 
@@ -1251,7 +1252,7 @@ static void
 _item_menu_stop_cb(void *data, Evas_Object *obj EINA_UNUSED,
                    void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
+   Data *pd = data;
    kill(pd->selected_pid, SIGSTOP);
 }
 
@@ -1259,7 +1260,7 @@ static void
 _item_menu_kill_cb(void *data, Evas_Object *obj EINA_UNUSED,
                    void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
+   Data *pd = data;
    kill(pd->selected_pid, SIGKILL);
 }
 
@@ -1267,7 +1268,7 @@ static void
 _item_menu_cancel_cb(void *data, Evas_Object *obj EINA_UNUSED,
                      void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
+   Data *pd = data;
    elm_menu_close(pd->menu);
    pd->menu = NULL;
 }
@@ -1278,7 +1279,7 @@ _item_menu_debug_cb(void *data, Evas_Object *obj EINA_UNUSED,
 {
    Proc_Info *proc;
    const char *terminal = "xterm";
-   Ui_Data *pd = data;
+   Data *pd = data;
 
    _item_menu_cancel_cb(pd, NULL, NULL);
 
@@ -1295,7 +1296,7 @@ _item_menu_debug_cb(void *data, Evas_Object *obj EINA_UNUSED,
 }
 
 static void
-_item_menu_actions_add(Evas_Object *menu, Elm_Object_Item *menu_it, Ui_Data *pd)
+_item_menu_actions_add(Evas_Object *menu, Elm_Object_Item *menu_it, Data *pd)
 {
    elm_menu_item_add(menu, menu_it, evisum_icon_path_get("bug"),
                      _("Debug"), _item_menu_debug_cb, pd);
@@ -1305,7 +1306,7 @@ static void
 _item_menu_manual_cb(void *data, Evas_Object *obj EINA_UNUSED,
                      void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
+   Data *pd = data;
 
    _item_menu_cancel_cb(pd, NULL, NULL);
 
@@ -1316,7 +1317,7 @@ static void
 _item_menu_threads_cb(void *data, Evas_Object *obj EINA_UNUSED,
                       void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
+   Data *pd = data;
 
    _item_menu_cancel_cb(pd, NULL, NULL);
 
@@ -1327,7 +1328,7 @@ static void
 _item_menu_children_cb(void *data, Evas_Object *obj EINA_UNUSED,
                        void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
+   Data *pd = data;
 
    _item_menu_cancel_cb(pd, NULL, NULL);
 
@@ -1338,7 +1339,7 @@ static void
 _item_menu_general_cb(void *data, Evas_Object *obj EINA_UNUSED,
                       void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
+   Data *pd = data;
 
    _item_menu_cancel_cb(pd, NULL, NULL);
 
@@ -1346,7 +1347,7 @@ _item_menu_general_cb(void *data, Evas_Object *obj EINA_UNUSED,
 }
 
 static void
-_item_menu_info_add(Evas_Object *menu, Elm_Object_Item *menu_it, Ui_Data *pd)
+_item_menu_info_add(Evas_Object *menu, Elm_Object_Item *menu_it, Data *pd)
 {
    elm_menu_item_add(menu, menu_it, evisum_icon_path_get("info"),
                      _("General"), _item_menu_general_cb, pd);
@@ -1359,7 +1360,7 @@ _item_menu_info_add(Evas_Object *menu, Elm_Object_Item *menu_it, Ui_Data *pd)
 }
 
 static Evas_Object *
-_item_menu_create(Ui_Data *pd, Proc_Info *proc)
+_item_menu_create(Data *pd, Proc_Info *proc)
 {
    Elm_Object_Item *menu_it, *menu_it2;
    Evas_Object *menu;
@@ -1415,7 +1416,7 @@ _item_pid_secondary_clicked_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED,
 {
    Evas_Object *menu;
    Evas_Event_Mouse_Up *ev;
-   Ui_Data *pd;
+   Data *pd;
    Elm_Object_Item *it;
    Proc_Info *proc;
 
@@ -1440,7 +1441,7 @@ _item_pid_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
 {
    Elm_Object_Item *it;
    Proc_Info *proc;
-   Ui_Data *pd = data;
+   Data *pd = data;
 
    it = event_info;
 
@@ -1457,7 +1458,7 @@ _item_pid_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
 static Eina_Bool
 _main_menu_timer_cb(void *data)
 {
-   Ui_Data *pd = data;
+   Data *pd = data;
    evas_object_del(pd->main_menu);
    pd->main_menu_timer = NULL;
    pd->main_menu = NULL;
@@ -1469,7 +1470,7 @@ static void
 _main_menu_dismissed_cb(void *data, Evas_Object *obj EINA_UNUSED,
                         void *ev EINA_UNUSED)
 {
-   Ui_Data *pd = data;
+   Data *pd = data;
 
    elm_ctxpopup_dismiss(pd->main_menu);
    if (pd->main_menu_timer)
@@ -1505,8 +1506,8 @@ static void
 _btn_menu_clicked_cb(void *data, Evas_Object *obj,
                      void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd;
-   Ui *ui;
+   Data *pd;
+   Evisum_Ui *ui;
 
    pd = data;
    ui = pd->ui;
@@ -1518,11 +1519,11 @@ _btn_menu_clicked_cb(void *data, Evas_Object *obj,
 }
 
 static Evas_Object *
-_content_add(Ui_Data *pd, Evas_Object *parent)
+_content_add(Data *pd, Evas_Object *parent)
 {
    Evas_Object *tb, *btn, *glist;
    Evas_Object *fr, *lb;
-   Ui *ui = pd->ui;
+   Evisum_Ui *ui = pd->ui;
 
    tb = elm_table_add(parent);
    evas_object_size_hint_weight_set(tb, EXPAND, EXPAND);
@@ -1772,7 +1773,7 @@ _content_add(Ui_Data *pd, Evas_Object *parent)
 static Eina_Bool
 _search_empty_cb(void *data)
 {
-   Ui_Data *pd = data;
+   Data *pd = data;
 
    if (!pd->search.len)
      {
@@ -1796,7 +1797,7 @@ _search_empty_cb(void *data)
 }
 
 static void
-_search_clear(Ui_Data *pd)
+_search_clear(Data *pd)
 {
    if (pd->search.text)
      free(pd->search.text);
@@ -1809,7 +1810,7 @@ _search_key_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
    Evas_Event_Key_Down *ev;
    const char *text;
-   Ui_Data *pd;
+   Data *pd;
 
    pd = data;
    ev = event_info;
@@ -1830,7 +1831,7 @@ _search_key_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 }
 
 static void
-_search_add(Ui_Data *pd)
+_search_add(Data *pd)
 {
    Evas_Object *tb, *fr, *rec, *entry;
 
@@ -1864,7 +1865,7 @@ _search_add(Ui_Data *pd)
 }
 
 static void
-_win_key_down_search(Ui_Data *pd, Evas_Event_Key_Down *ev)
+_win_key_down_search(Data *pd, Evas_Event_Key_Down *ev)
 {
    Evas_Coord w, h;
 
@@ -1902,7 +1903,7 @@ static void
 _win_key_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
    Evas_Event_Key_Down *ev;
-   Ui_Data *pd;
+   Data *pd;
    Evas_Coord x, y, w, h;
 
    pd = data;
@@ -1933,7 +1934,7 @@ _win_key_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 static Eina_Bool
 _resize_cb(void *data)
 {
-   Ui_Data *pd = data;
+   Data *pd = data;
 
    pd->skip_wait = 0;
    pd->resize_timer = NULL;
@@ -1944,8 +1945,8 @@ _resize_cb(void *data)
 static void
 _win_resize_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
-   Ui_Data *pd;
-   Ui *ui;
+   Data *pd;
+   Evisum_Ui *ui;
 
    pd = data;
    ui = pd->ui;
@@ -1967,10 +1968,10 @@ _win_resize_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 }
 
 static void
-_win_alpha_set(Ui_Data *pd)
+_win_alpha_set(Data *pd)
 {
    Evas_Object *bg, *win;
-   Ui *ui;
+   Evisum_Ui *ui;
    int r, g, b, a;
    double fade;
 
@@ -2010,8 +2011,8 @@ _evisum_config_changed_cb(void *data, int type EINA_UNUSED,
                           void *event EINA_UNUSED)
 {
    Eina_Iterator *it;
-   Ui *ui;
-   Ui_Data *pd = data;
+   Evisum_Ui *ui;
+   Data *pd = data;
    void *d = NULL;
 
    ui = pd->ui;
@@ -2039,8 +2040,8 @@ static void
 _win_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj,
              void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd;
-   Ui *ui;
+   Data *pd;
+   Evisum_Ui *ui;
 
    pd = data;
    ui = pd->ui;
@@ -2052,8 +2053,8 @@ static void
 _win_del_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED,
             Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
-   Ui *ui;
-   Ui_Data *pd = data;
+   Evisum_Ui *ui;
+   Data *pd = data;
 
    ui = pd->ui;
 
@@ -2086,7 +2087,7 @@ _win_del_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED,
 }
 
 static void
-_init(Ui_Data *pd)
+_init(Data *pd)
 {
    pd->sorters[PROC_SORT_BY_NONE].sort_cb = proc_sort_by_pid;
    pd->sorters[PROC_SORT_BY_UID].sort_cb = proc_sort_by_uid;
@@ -2107,7 +2108,7 @@ _init(Ui_Data *pd)
 }
 
 void
-ui_process_list_win_add(Ui *ui)
+ui_process_list_win_add(Evisum_Ui *ui)
 {
    Evas_Object *win, *icon;
    Evas_Object *tb;
@@ -2118,7 +2119,7 @@ ui_process_list_win_add(Ui *ui)
         return;
      }
 
-   Ui_Data *pd = _pd = calloc(1, sizeof(Ui_Data));
+   Data *pd = _pd = calloc(1, sizeof(Data));
    if (!pd) return;
 
    pd->selected_pid = -1;
diff --git a/src/bin/ui/ui_process_list.h b/src/bin/ui/ui_process_list.h
index 9778d7d..1ef86da 100644
--- a/src/bin/ui/ui_process_list.h
+++ b/src/bin/ui/ui_process_list.h
@@ -1,7 +1,7 @@
 #ifndef __UI_PROCESS_LIST_H__
 #define __UI_PROCESS_LIST_H__
 
-#include "ui.h"
+#include "evisum_ui.h"
 
 typedef enum
 {
@@ -45,6 +45,6 @@ typedef enum
 } Proc_Field;
 
 void
-ui_process_list_win_add(Ui *ui);
+ui_process_list_win_add(Evisum_Ui *ui);
 
 #endif
diff --git a/src/bin/ui/ui_process_view.c b/src/bin/ui/ui_process_view.c
index 86880ae..606aea4 100644
--- a/src/bin/ui/ui_process_view.c
+++ b/src/bin/ui/ui_process_view.c
@@ -90,7 +90,7 @@ typedef struct
       Eina_Bool     init;
    } manual;
 
-} Ui_Data;
+} Data;
 
 typedef struct _Color_Point {
    unsigned int val;
@@ -174,7 +174,7 @@ typedef struct
 } Thread_Info;
 
 static Thread_Info *
-_thread_info_new(Ui_Data *pd, Proc_Info *th)
+_thread_info_new(Data *pd, Proc_Info *th)
 {
    Thread_Info *t;
    Thread_Cpu_Info *inf;
@@ -231,7 +231,7 @@ static void
 _item_unrealized_cb(void *data, Evas_Object *obj EINA_UNUSED,
                     void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd;
+   Data *pd;
    Evas_Object *o;
    Eina_List *contents = NULL;
 
@@ -316,7 +316,7 @@ _item_create(Evas_Object *parent)
 static Evas_Object *
 _content_get(void *data, Evas_Object *obj, const char *source)
 {
-   Ui_Data *pd;
+   Data *pd;
    Thread_Info *th;
    Evas_Object *lb, *rec, *pb;
    Evas_Coord w, ow;
@@ -466,7 +466,7 @@ _sort_by_tid(const void *p1, const void *p2)
 }
 
 static void
-_thread_view_update(Ui_Data *pd, Proc_Info *proc)
+_thread_view_update(Data *pd, Proc_Info *proc)
 {
    Proc_Info *p;
    Thread_Info *t;
@@ -506,7 +506,7 @@ _thread_view_update(Ui_Data *pd, Proc_Info *proc)
 }
 
 static void
-_threads_cpu_usage(Ui_Data *pd, Proc_Info *proc)
+_threads_cpu_usage(Data *pd, Proc_Info *proc)
 {
    Eina_List *l;
    Proc_Info *p;
@@ -631,7 +631,7 @@ _children_view_update(void *data)
 {
    Eina_List *children, *l;
    Proc_Info *child;
-   Ui_Data *pd = data;
+   Data *pd = data;
 
    elm_genlist_clear(pd->children.glist);
 
@@ -659,7 +659,7 @@ _children_view_update(void *data)
 static void
 _proc_info_main(void *data, Ecore_Thread *thread)
 {
-   Ui_Data *pd = data;
+   Data *pd = data;
 
    while (!ecore_thread_check(thread))
      {
@@ -674,7 +674,7 @@ _proc_info_main(void *data, Ecore_Thread *thread)
 }
 
 static void
-_graph_summary_update(Ui_Data *pd, Proc_Info *proc)
+_graph_summary_update(Data *pd, Proc_Info *proc)
 {
    elm_object_text_set(pd->threads.graph.lb, eina_slstr_printf(
                        _("<b>"
@@ -690,7 +690,7 @@ _graph_summary_update(Ui_Data *pd, Proc_Info *proc)
 }
 
 static void
-_graph_update(Ui_Data *pd, Proc_Info *proc)
+_graph_update(Data *pd, Proc_Info *proc)
 {
    Evas_Object *obj = pd->threads.graph.obj;
    unsigned int *pixels, *pix;
@@ -737,7 +737,7 @@ _graph_update(Ui_Data *pd, Proc_Info *proc)
 }
 
 static Evas_Object *
-_graph(Evas_Object *parent, Ui_Data *pd)
+_graph(Evas_Object *parent, Data *pd)
 {
    Evas_Object *tb, *obj, *tb2, *lb, *scr, *fr, *rec;
 
@@ -842,7 +842,7 @@ _manual_init_cb(void *data, Ecore_Thread *thread)
    char buf[4096];
    char *line;
    int n = 1;
-   Ui_Data *pd = data;
+   Data *pd = data;
 
    setenv("MANWIDTH", "75", 1);
    ecore_thread_feedback(thread, strdup("<code>"));
@@ -885,7 +885,7 @@ _manual_init_feedback_cb(void *data, Ecore_Thread *thread, void *msgdata)
 {
    Evas_Object *ent;
    char *s;
-   Ui_Data *pd = data;
+   Data *pd = data;
 
    ent = pd->manual.entry;
    s = msgdata;
@@ -895,7 +895,7 @@ _manual_init_feedback_cb(void *data, Ecore_Thread *thread, void *msgdata)
 }
 
 static void
-_manual_init(Ui_Data *pd)
+_manual_init(Data *pd)
 {
    if (pd->manual.init) return;
 
@@ -908,7 +908,7 @@ _manual_init(Ui_Data *pd)
 }
 
 static void
-_general_view_update(Ui_Data *pd, Proc_Info *proc)
+_general_view_update(Data *pd, Proc_Info *proc)
 {
    struct passwd *pwd_entry;
    char *s;
@@ -979,7 +979,7 @@ _general_view_update(Ui_Data *pd, Proc_Info *proc)
 }
 
 static void
-_proc_gone(Ui_Data *pd)
+_proc_gone(Data *pd)
 {
     const char *fmt = _("%s (%d) - Not running");
 
@@ -1000,7 +1000,7 @@ _proc_gone(Ui_Data *pd)
 static void
 _proc_info_feedback_cb(void *data, Ecore_Thread *thread, void *msg)
 {
-   Ui_Data *pd;
+   Data *pd;
    Proc_Info *proc;
    double cpu_usage = 0.0;
 
@@ -1050,7 +1050,7 @@ static void
 _btn_start_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
                       void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
+   Data *pd = data;
 
    if (pd->selected_pid == -1)
      return;
@@ -1062,7 +1062,7 @@ static void
 _btn_stop_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
                      void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
+   Data *pd = data;
 
    if (pd->selected_pid == -1)
      return;
@@ -1074,7 +1074,7 @@ static void
 _btn_kill_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
                      void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
+   Data *pd = data;
 
    if (pd->selected_pid == -1)
      return;
@@ -1108,7 +1108,7 @@ _lb_add(Evas_Object *parent, const char *text)
 }
 
 static Evas_Object *
-_general_tab_add(Evas_Object *parent, Ui_Data *pd)
+_general_tab_add(Evas_Object *parent, Data *pd)
 {
    Evas_Object *fr, *hbx, *tb;
    Evas_Object *lb, *entry, *btn, *pad, *ic;
@@ -1304,7 +1304,7 @@ _btn_icon_state_set(Evas_Object *btn, Eina_Bool reverse)
 }
 
 static void
-_threads_list_reorder(Ui_Data *pd)
+_threads_list_reorder(Data *pd)
 {
    pd->poll_count = 0;
    elm_scroller_page_bring_in(pd->threads.glist, 0, 0);
@@ -1314,7 +1314,7 @@ static void
 _btn_name_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
                      void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
+   Data *pd = data;
 
    if (pd->threads.sort_cb == _sort_by_name)
      pd->threads.sort_reverse = !pd->threads.sort_reverse;
@@ -1327,7 +1327,7 @@ static void
 _btn_thread_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
                        void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
+   Data *pd = data;
 
    if (pd->threads.sort_cb == _sort_by_tid)
      pd->threads.sort_reverse = !pd->threads.sort_reverse;
@@ -1340,7 +1340,7 @@ static void
 _btn_state_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
                       void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
+   Data *pd = data;
 
    if (pd->threads.sort_cb == _sort_by_state)
      pd->threads.sort_reverse = !pd->threads.sort_reverse;
@@ -1353,7 +1353,7 @@ static void
 _btn_cpu_id_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
                        void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
+   Data *pd = data;
 
    if (pd->threads.sort_cb == _sort_by_cpu_id)
      pd->threads.sort_reverse = !pd->threads.sort_reverse;
@@ -1366,7 +1366,7 @@ static void
 _btn_cpu_usage_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
                           void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
+   Data *pd = data;
 
    if (pd->threads.sort_cb == _sort_by_cpu_usage)
      pd->threads.sort_reverse = !pd->threads.sort_reverse;
@@ -1377,7 +1377,7 @@ _btn_cpu_usage_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
 }
 
 static Evas_Object *
-_threads_tab_add(Evas_Object *parent, Ui_Data *pd)
+_threads_tab_add(Evas_Object *parent, Data *pd)
 {
    Evas_Object *fr, *bx, *bx2, *tb, *rec, *btn, *glist;
    Evas_Object *graph;
@@ -1482,7 +1482,7 @@ _threads_tab_add(Evas_Object *parent, Ui_Data *pd)
 }
 
 static Evas_Object *
-_children_tab_add(Evas_Object *parent, Ui_Data *pd)
+_children_tab_add(Evas_Object *parent, Data *pd)
 {
    Evas_Object *fr, *bx, *glist;
 
@@ -1513,7 +1513,7 @@ _children_tab_add(Evas_Object *parent, Ui_Data *pd)
 }
 
 static Evas_Object *
-_manual_tab_add(Evas_Object *parent, Ui_Data *pd)
+_manual_tab_add(Evas_Object *parent, Data *pd)
 {
    Evas_Object *fr, *bx, *entry;
    Evas_Object *tb;
@@ -1550,7 +1550,7 @@ _manual_tab_add(Evas_Object *parent, Ui_Data *pd)
 }
 
 static void
-_tab_change(Ui_Data *pd, Evas_Object *view, Evas_Object *obj)
+_tab_change(Data *pd, Evas_Object *view, Evas_Object *obj)
 {
    Elm_Transit *trans;
 
@@ -1580,7 +1580,7 @@ static void
 _tab_general_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
                      void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
+   Data *pd = data;
 
    _tab_change(pd, pd->general_view, obj);
    elm_object_focus_set(pd->tab_children, 1);
@@ -1590,7 +1590,7 @@ static void
 _tab_children_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
                          void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
+   Data *pd = data;
 
    _children_view_update(pd);
    _tab_change(pd, pd->children_view, obj);
@@ -1601,7 +1601,7 @@ static void
 _tab_threads_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
                         void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
+   Data *pd = data;
 
    _tab_change(pd, pd->thread_view, obj);
    elm_object_focus_set(pd->tab_manual, 1);
@@ -1611,7 +1611,7 @@ static void
 _tab_manual_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
                        void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd = data;
+   Data *pd = data;
 
    _tab_change(pd, pd->manual_view, obj);
    elm_object_focus_set(pd->tab_general, 1);
@@ -1619,13 +1619,10 @@ _tab_manual_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
 }
 
 static Evas_Object *
-_tabs_add(Evas_Object *parent, Ui_Data *pd)
+_tabs_add(Evas_Object *parent, Data *pd)
 {
    Evas_Object *hbx, *pad, *btn;
 
-   evisum_ui_background_random_add(parent,
-                                   evisum_ui_backgrounds_enabled_get());
-
    hbx = elm_box_add(parent);
    evas_object_size_hint_weight_set(hbx, EXPAND, 0);
    evas_object_size_hint_align_set(hbx, FILL, 0.5);
@@ -1698,7 +1695,7 @@ _win_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
             void *event_info EINA_UNUSED)
 {
    Evas_Object *win;
-   Ui_Data *pd;
+   Data *pd;
 
    pd  = data;
    win = obj;
@@ -1724,7 +1721,7 @@ _win_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
 static void
 _win_resize_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
-   Ui_Data *pd = data;
+   Data *pd = data;
 
    elm_genlist_realized_items_update(pd->threads.glist);
 }
@@ -1733,7 +1730,7 @@ static void
 _win_key_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
    Evas_Event_Key_Down *ev;
-   Ui_Data *pd;
+   Data *pd;
 
    pd = data;
    ev = event_info;
@@ -1746,7 +1743,7 @@ _win_key_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 }
 
 static void
-_action_do(Ui_Data *pd, Evisum_Proc_Action action)
+_action_do(Data *pd, Evisum_Proc_Action action)
 {
    switch (action)
      {
@@ -1776,7 +1773,7 @@ ui_process_view_win_add(int pid, Evisum_Proc_Action action)
    Evas_Object *win, *ic, *bx, *tabs, *tb;
    Proc_Info *proc;
 
-   Ui_Data *pd = calloc(1, sizeof(Ui_Data));
+   Data *pd = calloc(1, sizeof(Data));
    pd->selected_pid = pid;
    pd->poll_delay = 1;
    pd->threads.cache = NULL;
diff --git a/src/bin/ui/ui_process_view.h b/src/bin/ui/ui_process_view.h
index 4a1104e..10d4072 100644
--- a/src/bin/ui/ui_process_view.h
+++ b/src/bin/ui/ui_process_view.h
@@ -1,7 +1,7 @@
 #ifndef __UI_PROCESS_H__
 #define __UI_PROCESS_H__
 
-#include "ui.h"
+#include "evisum_ui.h"
 
 typedef enum
 {
diff --git a/src/bin/ui/ui_sensors.c b/src/bin/ui/ui_sensors.c
index d0e66fc..2832e27 100644
--- a/src/bin/ui/ui_sensors.c
+++ b/src/bin/ui/ui_sensors.c
@@ -14,8 +14,9 @@ typedef struct
    Evas_Object            *thermal_pb;
    Evas_Object            *power_ic;
    Eina_Bool               skip_wait;
-   Ui                     *ui;
-} Ui_Data;
+
+   Evisum_Ui              *ui;
+} Data;
 
 typedef struct
 {
@@ -27,7 +28,7 @@ typedef struct
    power_t   power;
    double    thermal_temp;
    Eina_Bool thermal_valid;
-} Data;
+} Sensor_Data;
 
 static void
 _name_set(char *buf, size_t len, sensor_t *s)
@@ -53,7 +54,7 @@ _sort_cb(const void *p1, const void *p2)
 }
 
 static void
-_sensors_refresh(Ui_Data *pd)
+_sensors_refresh(Data *pd)
 {
    sensor_t **sensors;
    int n;
@@ -74,9 +75,9 @@ _sensors_refresh(Ui_Data *pd)
 static void
 _sensors_update(void *data, Ecore_Thread *thread)
 {
-   Ui_Data *pd = data;
+   Data *pd = data;
 
-   Data *msg = malloc(sizeof(Data));
+   Sensor_Data *msg = malloc(sizeof(Data));
    if (!msg) return;
 
    while (!ecore_thread_check(thread))
@@ -106,8 +107,8 @@ _sensors_update(void *data, Ecore_Thread *thread)
 static void
 _sensors_update_feedback_cb(void *data, Ecore_Thread *thread, void *msgdata)
 {
-   Data *msg;
-   Ui_Data *pd;
+   Sensor_Data *msg;
+   Data *pd;
    sensor_t *s;
    Eina_List *l;
    int i = 0;
@@ -160,7 +161,7 @@ _item_del(void *data, Evas_Object *obj)
 static void
 _glist_item_pressed_cb(void *data, Evas_Object *obj, void *event_info)
 {
-   Ui_Data *pd;
+   Data *pd;
    Elm_Object_Item *it;
    sensor_t *s;
    char buf[64];
@@ -193,7 +194,7 @@ static void
 _win_key_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
    Evas_Event_Key_Down *ev;
-   Ui_Data *pd;
+   Data *pd;
 
    pd = data;
    ev = event_info;
@@ -208,8 +209,8 @@ _win_key_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 static void
 _win_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
-   Ui_Data *pd;
-   Ui *ui;
+   Data *pd;
+   Evisum_Ui *ui;
 
    pd = data;
    ui = pd->ui;
@@ -222,8 +223,8 @@ _win_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
             void *event_info EINA_UNUSED)
 {
    Bat *bat;
-   Ui_Data *pd = data;
-   Ui *ui = pd->ui;
+   Data *pd = data;
+   Evisum_Ui *ui = pd->ui;
 
    evisum_ui_config_save(ui);
    ecore_thread_cancel(pd->thread);
@@ -239,14 +240,14 @@ _win_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
 static void
 _win_resize_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
-   Ui_Data *pd = data;
-   Ui *ui = pd->ui;
+   Data *pd = data;
+   Evisum_Ui *ui = pd->ui;
 
    evas_object_geometry_get(obj, NULL, NULL, &ui->sensors.width, &ui->sensors.height);
 }
 
 void
-ui_sensors_win_add(Ui *ui)
+ui_sensors_win_add(Evisum_Ui *ui)
 {
    Evas_Object *win, *content, *tbl, *bx, *fr;
    Evas_Object *glist, *pb;
@@ -260,7 +261,7 @@ ui_sensors_win_add(Ui *ui)
         return;
      }
 
-   Ui_Data *pd = calloc(1, sizeof(Ui_Data));
+   Data *pd = calloc(1, sizeof(Data));
    if (!pd) return;
    pd->ui = ui;
 
@@ -268,8 +269,6 @@ ui_sensors_win_add(Ui *ui)
    elm_win_autodel_set(win, 1);
    evas_object_size_hint_weight_set(win, EXPAND, EXPAND);
    evas_object_size_hint_align_set(win, FILL, FILL);
-   evisum_ui_background_random_add(win,
-                                   evisum_ui_backgrounds_enabled_get());
    evas_object_event_callback_add(win, EVAS_CALLBACK_DEL, _win_del_cb, pd);
    evas_object_event_callback_add(win, EVAS_CALLBACK_MOVE, _win_move_cb, pd);
    evas_object_event_callback_add(win, EVAS_CALLBACK_RESIZE, _win_resize_cb, pd);
diff --git a/src/bin/ui/ui_sensors.h b/src/bin/ui/ui_sensors.h
index e15af2d..2539414 100644
--- a/src/bin/ui/ui_sensors.h
+++ b/src/bin/ui/ui_sensors.h
@@ -1,10 +1,10 @@
 #ifndef __UI_SENSORS_H__
 #define __UI_SENSORS_H__
 
-#include "ui.h"
+#include "evisum_ui.h"
 #include "../system/machine.h"
 
 void
-ui_sensors_win_add(Ui *ui);
+ui_sensors_win_add(Evisum_Ui *ui);
 
 #endif
diff --git a/src/bin/ui/ui_util.c b/src/bin/ui/ui_util.c
index a3fc5b8..96c6948 100644
--- a/src/bin/ui/ui_util.c
+++ b/src/bin/ui/ui_util.c
@@ -1,11 +1,10 @@
 #include "ui_util.h"
-#include "ui.h"
+#include "evisum_ui.h"
 #include <Elementary.h>
 #include "config.h"
 
 #define ARRAY_SIZE(n) sizeof(n) / sizeof(n[0])
 
-Eina_Bool _backgrounds_enabled = 0;
 #if !defined(__OpenBSD__)
 static
 #endif
@@ -273,7 +272,7 @@ evisum_ui_textblock_font_size_get(Evas_Object *tb)
 }
 
 typedef struct {
-   Ui             *ui;
+   Evisum_Ui      *ui;
    Evas_Object    *obj;
    Evas_Object    *win;
    Evas_Object    *bg;
@@ -288,7 +287,7 @@ _win_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
             void *event_info EINA_UNUSED)
 {
    Animate_Data *ad;
-   Ui *ui;
+   Evisum_Ui *ui;
 
    ad = data;
    ui = ad->ui;
@@ -307,7 +306,7 @@ _btn_close_cb(void *data EINA_UNUSED, Evas_Object *obj,
               void *event_info EINA_UNUSED)
 {
    Animate_Data *ad;
-   Ui *ui;
+   Evisum_Ui *ui;
 
    ad = data;
    ui = ad->ui;
@@ -388,7 +387,7 @@ _win_key_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 void
 evisum_about_window_show(void *data)
 {
-   Ui *ui;
+   Evisum_Ui *ui;
    Animate_Data *about;
    Evas_Object *win, *bg, *tb, *version, *lb, *btn, *im;
    Evas_Object *hbx, *rec, *pad, *br;
@@ -576,30 +575,6 @@ evisum_image_path_get(const char *name)
    return icon_path;
 }
 
-Evas_Object *
-evisum_ui_background_random_add(Evas_Object *win, Eina_Bool enabled)
-{
-   Evas_Object *bg;
-   int i;
-   char *images[] = { "sky_01", "sky_02", "sky_03", "sky_04"  };
-
-   if (!enabled) return NULL;
-
-   srand(time(NULL));
-
-   i = rand() % ARRAY_SIZE(images);
-
-   bg = elm_bg_add(win);
-   elm_bg_file_set(bg, evisum_image_path_get(images[i]), NULL);
-   evas_object_size_hint_align_set(bg, FILL, FILL);
-   evas_object_size_hint_weight_set(bg, EXPAND, EXPAND);
-   evas_object_data_set(win, "bg", bg);
-   elm_win_resize_object_add(win, bg);
-   evas_object_show(bg);
-
-   return bg;
-}
-
 Evas_Object *
 evisum_ui_background_add(Evas_Object *win)
 {
@@ -614,18 +589,6 @@ evisum_ui_background_add(Evas_Object *win)
    return bg;
 }
 
-Eina_Bool
-evisum_ui_backgrounds_enabled_get(void)
-{
-   return _backgrounds_enabled;
-}
-
-void
-evisum_ui_backgrounds_enabled_set(Eina_Bool enabled)
-{
-   _backgrounds_enabled = enabled;
-}
-
 void
 evisum_ui_icon_size_set(Evas_Object *ic, int size)
 {
diff --git a/src/bin/ui/ui_util.h b/src/bin/ui/ui_util.h
index e474ff7..e9a17d6 100644
--- a/src/bin/ui/ui_util.h
+++ b/src/bin/ui/ui_util.h
@@ -48,15 +48,6 @@ evisum_image_path_get(const char *name);
 Evas_Object *
 evisum_ui_background_add(Evas_Object *win);
 
-Evas_Object *
-evisum_ui_background_random_add(Evas_Object *win, Eina_Bool enabled);
-
-void
-evisum_ui_backgrounds_enabled_set(Eina_Bool enabled);
-
-Eina_Bool
-evisum_ui_backgrounds_enabled_get(void);
-
 int
 evisum_ui_textblock_font_size_get(Evas_Object *tb);