diff --git a/src/bin/e_actions.c b/src/bin/e_actions.c
index 3ab4cb5c3..ada80a530 100644
--- a/src/bin/e_actions.c
+++ b/src/bin/e_actions.c
@@ -10,56 +10,56 @@
       if (act) act->func.go = _e_actions_act_##name##_go; \
    }
 #define ACT_FN_GO(act) \
-   static void _e_actions_act_##act##_go(E_Object *obj, char *params)
+   static void _e_actions_act_##act##_go(E_Object *obj, const char *params)
 #define ACT_GO_MOUSE(name) \
    { \
       act = e_action_add(#name); \
       if (act) act->func.go_mouse = _e_actions_act_##name##_go_mouse; \
    }
 #define ACT_FN_GO_MOUSE(act) \
-   static void _e_actions_act_##act##_go_mouse(E_Object *obj, char *params, Ecore_X_Event_Mouse_Button_Down *ev)
+   static void _e_actions_act_##act##_go_mouse(E_Object *obj, const char *params, Ecore_X_Event_Mouse_Button_Down *ev)
 #define ACT_GO_WHEEL(name) \
    { \
       act = e_action_add(#name); \
       if (act) act->func.go_wheel = _e_actions_act_##name##_go_wheel; \
    }
 #define ACT_FN_GO_WHEEL(act) \
-   static void _e_actions_act_##act##_go_wheel(E_Object *obj, char *params, Ecore_X_Event_Mouse_Wheel *ev)
+   static void _e_actions_act_##act##_go_wheel(E_Object *obj, const char *params, Ecore_X_Event_Mouse_Wheel *ev)
 #define ACT_GO_SIGNAL(name) \
    { \
       act = e_action_add(#name); \
       if (act) act->func.go_signal = _e_actions_act_##name##_go_signal; \
    }
 #define ACT_FN_GO_SIGNAL(act) \
-   static void _e_actions_act_##act##_go_signal(E_Object *obj, char *params, char *sig, char *src)
+   static void _e_actions_act_##act##_go_signal(E_Object *obj, const char *params, const char *sig, const char *src)
 #define ACT_GO_KEY(name) \
    { \
       act = e_action_add(#name); \
       if (act) act->func.go_key = _e_actions_act_##name##_go_key; \
    }
 #define ACT_FN_GO_KEY(act) \
-   static void _e_actions_act_##act##_go_key(E_Object *obj, char *params, Ecore_X_Event_Key_Down *ev)
+   static void _e_actions_act_##act##_go_key(E_Object *obj, const char *params, Ecore_X_Event_Key_Down *ev)
 #define ACT_END(name) \
    { \
       act = e_action_add(#name); \
       if (act) act->func.end = _e_actions_act_##name##_end; \
    }
 #define ACT_FN_END(act) \
-   static void _e_actions_act_##act##_end(E_Object *obj, char *params)
+   static void _e_actions_act_##act##_end(E_Object *obj, const char *params)
 #define ACT_END_MOUSE(name) \
    { \
       act = e_action_add(#name); \
       if (act) act->func.end_mouse = _e_actions_act_##name##_end_mouse; \
    }
 #define ACT_FN_END_MOUSE(act) \
-   static void _e_actions_act_##act##_end_mouse(E_Object *obj, char *params, Ecore_X_Event_Mouse_Button_Up *ev)
+   static void _e_actions_act_##act##_end_mouse(E_Object *obj, const char *params, Ecore_X_Event_Mouse_Button_Up *ev)
 #define ACT_END_KEY(name) \
    { \
       act = e_action_add(#name); \
       if (act) act->func.end_key = _e_actions_act_##name##_end_key; \
    }
 #define ACT_FN_END_KEY(act) \
-   static void _e_actions_act_##act##_end_key(E_Object *obj, char *params, Ecore_X_Event_Key_Up *ev)
+   static void _e_actions_act_##act##_end_key(E_Object *obj, const char *params, Ecore_X_Event_Key_Up *ev)
 
 /* local subsystem functions */
 static void _e_action_free(E_Action *act);
@@ -963,7 +963,7 @@ _e_actions_cb_menu_end(void *data, E_Menu *m)
    e_object_del(E_OBJECT(m));
 }
 static E_Menu *
-_e_actions_menu_find(char *name)
+_e_actions_menu_find(const char *name)
 {
    if (!strcmp(name, "main")) return e_int_menus_main_new();
    else if (!strcmp(name, "favorites")) return e_int_menus_favorite_apps_new();
diff --git a/src/bin/e_actions.h b/src/bin/e_actions.h
index 75b6b2e84..c7578901c 100644
--- a/src/bin/e_actions.h
+++ b/src/bin/e_actions.h
@@ -17,14 +17,14 @@ struct _E_Action
    
    const char *name;
    struct {
-      void (*go)        (E_Object *obj, char *params);
-      void (*go_mouse)  (E_Object *obj, char *params, Ecore_X_Event_Mouse_Button_Down *ev);
-      void (*go_wheel)  (E_Object *obj, char *params, Ecore_X_Event_Mouse_Wheel *ev);
-      void (*go_key)    (E_Object *obj, char *params, Ecore_X_Event_Key_Down *ev);
-      void (*go_signal) (E_Object *obj, char *params, char *sig, char *src);
-      void (*end)       (E_Object *obj, char *params);
-      void (*end_mouse) (E_Object *obj, char *params, Ecore_X_Event_Mouse_Button_Up *ev);
-      void (*end_key)   (E_Object *obj, char *params, Ecore_X_Event_Key_Up *ev);
+      void (*go)        (E_Object *obj, const char *params);
+      void (*go_mouse)  (E_Object *obj, const char *params, Ecore_X_Event_Mouse_Button_Down *ev);
+      void (*go_wheel)  (E_Object *obj, const char *params, Ecore_X_Event_Mouse_Wheel *ev);
+      void (*go_key)    (E_Object *obj, const char *params, Ecore_X_Event_Key_Down *ev);
+      void (*go_signal) (E_Object *obj, const char *params, const char *sig, const char *src);
+      void (*end)       (E_Object *obj, const char *params);
+      void (*end_mouse) (E_Object *obj, const char *params, Ecore_X_Event_Mouse_Button_Up *ev);
+      void (*end_key)   (E_Object *obj, const char *params, Ecore_X_Event_Key_Up *ev);
    } func;
 };
 
diff --git a/src/bin/e_apps.c b/src/bin/e_apps.c
index a5025d9b0..5834e2d25 100644
--- a/src/bin/e_apps.c
+++ b/src/bin/e_apps.c
@@ -55,8 +55,8 @@ static int       _e_app_cb_event_border_add(void *data, int type, void *event);
 static int       _e_app_cb_expire_timer    (void *data);
 static void      _e_app_cache_copy         (E_App_Cache *ac, E_App *a);
 static int       _e_app_cb_scan_cache_timer(void *data);
-static E_App    *_e_app_cache_new          (E_App_Cache *ac, char *path, int scan_subdirs);
-static int       _e_app_exe_valid_get      (char *exe);
+static E_App    *_e_app_cache_new          (E_App_Cache *ac, const char *path, int scan_subdirs);
+static int       _e_app_exe_valid_get      (const char *exe);
 
 /* local subsystem globals */
 static Evas_Hash   *_e_apps = NULL;
@@ -68,8 +68,8 @@ static Ecore_Event_Handler *_e_apps_exit_handler = NULL;
 static Ecore_Event_Handler *_e_apps_border_add_handler = NULL;
 static Evas_List   *_e_apps_repositories = NULL;
 static E_App       *_e_apps_all = NULL;
-static char        *_e_apps_path_all = NULL;
-static char        *_e_apps_path_trash = NULL;
+static const char  *_e_apps_path_all = NULL;
+static const char  *_e_apps_path_trash = NULL;
 static Evas_List   *_e_apps_start_pending = NULL;
 
 #define EAP_MIN_WIDTH 8
@@ -235,10 +235,10 @@ e_app_new(const char *path, int scan_subdirs)
 	return a;
      }
 
-   ac = e_app_cache_load((char *)path);
+   ac = e_app_cache_load(path);
    if (ac)
      {
-	a = _e_app_cache_new(ac, (char *)path, scan_subdirs);
+	a = _e_app_cache_new(ac, path, scan_subdirs);
 	if (a)
 	  {
 	     _e_apps = evas_hash_add(_e_apps, a->path, a);
@@ -786,7 +786,7 @@ e_app_window_name_class_title_role_find(const char *name, const char *class,
 }
 
 EAPI E_App *
-e_app_file_find(char *file)
+e_app_file_find(const char *file)
 {
    Evas_List *l;
    
@@ -818,7 +818,7 @@ e_app_file_find(char *file)
 }
 
 EAPI E_App *
-e_app_name_find(char *name)
+e_app_name_find(const char *name)
 {
    Evas_List *l;
    
@@ -843,7 +843,7 @@ e_app_name_find(char *name)
 }
 
 EAPI E_App *
-e_app_generic_find(char *generic)
+e_app_generic_find(const char *generic)
 {
    Evas_List *l;
    
@@ -868,7 +868,7 @@ e_app_generic_find(char *generic)
 }
 
 EAPI E_App *
-e_app_exe_find(char *exe)
+e_app_exe_find(const char *exe)
 {
    Evas_List *l;
    
@@ -895,7 +895,7 @@ e_app_exe_find(char *exe)
 
 
 EAPI Evas_List *
-e_app_name_glob_list(char *name)
+e_app_name_glob_list(const char *name)
 {
    Evas_List *l, *list = NULL;
    
@@ -916,7 +916,7 @@ e_app_name_glob_list(char *name)
 }
 
 EAPI Evas_List *
-e_app_generic_glob_list(char *generic)
+e_app_generic_glob_list(const char *generic)
 {
    Evas_List *l, *list = NULL;
    
@@ -937,7 +937,7 @@ e_app_generic_glob_list(char *generic)
 }
 
 EAPI Evas_List *
-e_app_exe_glob_list(char *exe)
+e_app_exe_glob_list(const char *exe)
 {
    Evas_List *l, *list = NULL;
    
@@ -958,7 +958,7 @@ e_app_exe_glob_list(char *exe)
 }
 
 EAPI Evas_List *
-e_app_comment_glob_list(char *comment)
+e_app_comment_glob_list(const char *comment)
 {
    Evas_List *l, *list = NULL;
    
@@ -2071,7 +2071,7 @@ _e_app_cb_scan_cache_timer(void *data)
 }
 
 static E_App *
-_e_app_cache_new(E_App_Cache *ac, char *path, int scan_subdirs)
+_e_app_cache_new(E_App_Cache *ac, const char *path, int scan_subdirs)
 {
    Evas_List *l;
    E_App *a;
@@ -2160,7 +2160,7 @@ _e_app_cache_new(E_App_Cache *ac, char *path, int scan_subdirs)
 }
 
 static int
-_e_app_exe_valid_get(char *exe)
+_e_app_exe_valid_get(const char *exe)
 {
    if ((!exe) || (!exe[0])) return 0;
    return 1;
diff --git a/src/bin/e_apps.h b/src/bin/e_apps.h
index bc9902007..99adfa88c 100644
--- a/src/bin/e_apps.h
+++ b/src/bin/e_apps.h
@@ -32,19 +32,19 @@ struct _E_App
    E_App              *parent; /* the parent e_app node */
    E_App              *orig; /* if this is a copy, point to the original */
    
-   char               *name; /* app name */
-   char               *generic; /* generic app name */
-   char               *comment; /* a longer description */
-   char               *exe; /* command to execute, NULL if directory */
+   const char         *name; /* app name */
+   const char         *generic; /* generic app name */
+   const char         *comment; /* a longer description */
+   const char         *exe; /* command to execute, NULL if directory */
    
-   char               *path; /* path to .eet containing icons etc. etc. */
+   const char         *path; /* path to .eet containing icons etc. etc. */
 
-   char               *win_name; /* window name */
-   char               *win_class; /* window class */
-   char               *win_title; /* window title */
-   char               *win_role; /* window role */
+   const char         *win_name; /* window name */
+   const char         *win_class; /* window class */
+   const char         *win_title; /* window title */
+   const char         *win_role; /* window role */
 
-   char               *icon_class; /* icon_class */
+   const char         *icon_class; /* icon_class */
    
    Evas_List          *subapps; /* if this a directory, a list of more E_App's */
    
@@ -63,7 +63,7 @@ struct _E_App
 
    unsigned char       deleted : 1; /* this app's file is deleted from disk */
    
-   char               *image; /* used when we're saving a image into the eap */
+   const char         *image; /* used when we're saving a image into the eap */
    int                 width; /* used for saving eap's image width in edje */
    int                 height; /* used for saving eap's image height in edje */
 };
@@ -111,15 +111,15 @@ EAPI void        e_app_change_callback_del               (void (*func) (void *da
 
 EAPI E_App      *e_app_launch_id_pid_find                (int launch_id, pid_t pid);
 EAPI E_App      *e_app_window_name_class_title_role_find (const char *name, const char *class, const char *title, const char *role);
-EAPI E_App      *e_app_file_find                         (char *file);
-EAPI E_App      *e_app_name_find                         (char *name);
-EAPI E_App      *e_app_generic_find                      (char *generic);
-EAPI E_App      *e_app_exe_find                          (char *exe);
+EAPI E_App      *e_app_file_find                         (const char *file);
+EAPI E_App      *e_app_name_find                         (const char *name);
+EAPI E_App      *e_app_generic_find                      (const char *generic);
+EAPI E_App      *e_app_exe_find                          (const char *exe);
 
-EAPI Evas_List  *e_app_name_glob_list                    (char *name);
-EAPI Evas_List  *e_app_generic_glob_list                 (char *generic);
-EAPI Evas_List  *e_app_exe_glob_list                     (char *exe);
-EAPI Evas_List  *e_app_comment_glob_list                 (char *comment);
+EAPI Evas_List  *e_app_name_glob_list                    (const char *name);
+EAPI Evas_List  *e_app_generic_glob_list                 (const char *generic);
+EAPI Evas_List  *e_app_exe_glob_list                     (const char *exe);
+EAPI Evas_List  *e_app_comment_glob_list                 (const char *comment);
     
 EAPI void         e_app_fields_fill                       (E_App *a, const char *path);
 EAPI void         e_app_fields_save                       (E_App *a);
diff --git a/src/bin/e_apps_cache.c b/src/bin/e_apps_cache.c
index a1380f420..4c1af538d 100644
--- a/src/bin/e_apps_cache.c
+++ b/src/bin/e_apps_cache.c
@@ -69,7 +69,7 @@ e_app_cache_shutdown(void)
 }
 
 EAPI E_App_Cache *
-e_app_cache_load(char *path)
+e_app_cache_load(const char *path)
 {
    Eet_File *ef;
    char buf[PATH_MAX];
@@ -156,7 +156,7 @@ e_app_cache_free(E_App_Cache *ac)
 }
 
 EAPI int
-e_app_cache_save(E_App_Cache *ac, char *path)
+e_app_cache_save(E_App_Cache *ac, const char *path)
 {
    Eet_File *ef;
    char buf[4096];
diff --git a/src/bin/e_apps_cache.h b/src/bin/e_apps_cache.h
index 1ae1ff307..f699372b5 100644
--- a/src/bin/e_apps_cache.h
+++ b/src/bin/e_apps_cache.h
@@ -11,20 +11,20 @@ typedef struct _E_App_Cache E_App_Cache;
 
 struct _E_App_Cache
 {
-   char               *name; /* app name */
-   char               *generic; /* generic app name */
-   char               *comment; /* a longer description */
-   char               *exe; /* command to execute, NULL if directory */
-   
-   char               *file; /* the .eap filename */
+   const char         *name; /* app name */
+   const char         *generic; /* generic app name */
+   const char         *comment; /* a longer description */
+   const char         *exe; /* command to execute, NULL if directory */
+  
+   const char         *file; /* the .eap filename */
    unsigned long long  file_mod_time; /* the last modified time of the file */
    
-   char               *win_name; /* window name */
-   char               *win_class; /* window class */
-   char               *win_title; /* window title */
-   char               *win_role; /* window role */
+   const char         *win_name; /* window name */
+   const char         *win_class; /* window class */
+   const char         *win_title; /* window title */
+   const char         *win_role; /* window role */
    
-   char               *icon_class; /* icon_class */
+   const char         *icon_class; /* icon_class */
    
    Evas_List          *subapps; /* if this a directory, a list of more E_App's */
    
@@ -41,10 +41,10 @@ struct _E_App_Cache
 EAPI int          e_app_cache_init(void);
 EAPI int          e_app_cache_shutdown(void);
 
-EAPI E_App_Cache *e_app_cache_load(char *path);
+EAPI E_App_Cache *e_app_cache_load(const char *path);
 EAPI E_App_Cache *e_app_cache_generate(E_App *a);
 EAPI void         e_app_cache_free(E_App_Cache *ac);
-EAPI int          e_app_cache_save(E_App_Cache *ac, char *path);
+EAPI int          e_app_cache_save(E_App_Cache *ac, const char *path);
 
 #endif
 #endif
diff --git a/src/bin/e_bg.c b/src/bin/e_bg.c
index 5f5e54707..dca5aff62 100644
--- a/src/bin/e_bg.c
+++ b/src/bin/e_bg.c
@@ -16,7 +16,7 @@ e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition)
    Evas_List *l, *ll, *entries;
    int ok;
    const char *bgfile = "";
-   char *trans = "";
+   const char *trans = "";
    
    if (transition == E_BG_TRANSITION_START) trans = e_config->transition_start;
    else if (transition == E_BG_TRANSITION_DESK) trans = e_config->transition_desk;
diff --git a/src/bin/e_bindings.c b/src/bin/e_bindings.c
index c1cc5fb55..5c7ffd6b3 100644
--- a/src/bin/e_bindings.c
+++ b/src/bin/e_bindings.c
@@ -117,7 +117,7 @@ e_bindings_shutdown(void)
 }
 
 EAPI void
-e_bindings_mouse_add(E_Binding_Context ctxt, int button, E_Binding_Modifier mod, int any_mod, char *action, char *params)
+e_bindings_mouse_add(E_Binding_Context ctxt, int button, E_Binding_Modifier mod, int any_mod, const char *action, const char *params)
 {
    E_Binding_Mouse *bind;
    
@@ -132,7 +132,7 @@ e_bindings_mouse_add(E_Binding_Context ctxt, int button, E_Binding_Modifier mod,
 }
 
 EAPI void
-e_bindings_mouse_del(E_Binding_Context ctxt, int button, E_Binding_Modifier mod, int any_mod, char *action, char *params)
+e_bindings_mouse_del(E_Binding_Context ctxt, int button, E_Binding_Modifier mod, int any_mod, const char *action, const char *params)
 {
    Evas_List *l;
    
@@ -309,7 +309,7 @@ e_bindings_mouse_up_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_X_
 }
 
 EAPI void
-e_bindings_key_add(E_Binding_Context ctxt, char *key, E_Binding_Modifier mod, int any_mod, char *action, char *params)
+e_bindings_key_add(E_Binding_Context ctxt, const char *key, E_Binding_Modifier mod, int any_mod, const char *action, const char *params)
 {
    E_Binding_Key *bind;
    
@@ -324,7 +324,7 @@ e_bindings_key_add(E_Binding_Context ctxt, char *key, E_Binding_Modifier mod, in
 }
 
 EAPI void
-e_bindings_key_del(E_Binding_Context ctxt, char *key, E_Binding_Modifier mod, int any_mod, char *action, char *params)
+e_bindings_key_del(E_Binding_Context ctxt, const char *key, E_Binding_Modifier mod, int any_mod, const char *action, const char *params)
 {
    Evas_List *l;
    
@@ -476,7 +476,7 @@ e_bindings_key_up_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_X_Ev
 }
 
 EAPI void
-e_bindings_signal_add(E_Binding_Context ctxt, char *sig, char *src, E_Binding_Modifier mod, int any_mod, char *action, char *params)
+e_bindings_signal_add(E_Binding_Context ctxt, const char *sig, const char *src, E_Binding_Modifier mod, int any_mod, const char *action, const char *params)
 {
    E_Binding_Signal *bind;
    
@@ -492,7 +492,7 @@ e_bindings_signal_add(E_Binding_Context ctxt, char *sig, char *src, E_Binding_Mo
 }
 
 EAPI void
-e_bindings_signal_del(E_Binding_Context ctxt, char *sig, char *src, E_Binding_Modifier mod, int any_mod, char *action, char *params)
+e_bindings_signal_del(E_Binding_Context ctxt, const char *sig, const char *src, E_Binding_Modifier mod, int any_mod, const char *action, const char *params)
 {
    Evas_List *l;
    
@@ -573,7 +573,7 @@ e_bindings_signal_handle(E_Binding_Context ctxt, E_Object *obj, char *sig, char
 }
 
 EAPI void
-e_bindings_wheel_add(E_Binding_Context ctxt, int direction, int z, E_Binding_Modifier mod, int any_mod, char *action, char *params)
+e_bindings_wheel_add(E_Binding_Context ctxt, int direction, int z, E_Binding_Modifier mod, int any_mod, const char *action, const char *params)
 {
    E_Binding_Wheel *bind;
    
@@ -589,7 +589,7 @@ e_bindings_wheel_add(E_Binding_Context ctxt, int direction, int z, E_Binding_Mod
 }
 
 EAPI void
-e_bindings_wheel_del(E_Binding_Context ctxt, int direction, int z, E_Binding_Modifier mod, int any_mod, char *action, char *params)
+e_bindings_wheel_del(E_Binding_Context ctxt, int direction, int z, E_Binding_Modifier mod, int any_mod, const char *action, const char *params)
 {
    Evas_List *l;
    
diff --git a/src/bin/e_bindings.h b/src/bin/e_bindings.h
index d8ed9440d..ab32bedbd 100644
--- a/src/bin/e_bindings.h
+++ b/src/bin/e_bindings.h
@@ -45,29 +45,29 @@ struct _E_Binding_Mouse
    int button;
    E_Binding_Modifier mod;
    unsigned char any_mod : 1;
-   char *action;
-   char *params;
+   const char *action;
+   const char *params;
 };
 
 struct _E_Binding_Key
 {
    E_Binding_Context ctxt;
-   char *key;
+   const char *key;
    E_Binding_Modifier mod;
    unsigned char any_mod : 1;
-   char *action;
-   char *params;
+   const char *action;
+   const char *params;
 };
 
 struct _E_Binding_Signal
 {
    E_Binding_Context ctxt;
-   char *sig;
-   char *src;
+   const char *sig;
+   const char *src;
    E_Binding_Modifier mod;
    unsigned char any_mod : 1;
-   char *action;
-   char *params;
+   const char *action;
+   const char *params;
 };
 
 struct _E_Binding_Wheel
@@ -77,15 +77,15 @@ struct _E_Binding_Wheel
    int z;
    E_Binding_Modifier mod;
    unsigned char any_mod : 1;
-   char *action;
-   char *params;
+   const char *action;
+   const char *params;
 };
 
 EAPI int         e_bindings_init(void);
 EAPI int         e_bindings_shutdown(void);
 
-EAPI void        e_bindings_mouse_add(E_Binding_Context ctxt, int button, E_Binding_Modifier mod, int any_mod, char *action, char *params);
-EAPI void        e_bindings_mouse_del(E_Binding_Context ctxt, int button, E_Binding_Modifier mod, int any_mod, char *action, char *params);
+EAPI void        e_bindings_mouse_add(E_Binding_Context ctxt, int button, E_Binding_Modifier mod, int any_mod, const char *action, const char *params);
+EAPI void        e_bindings_mouse_del(E_Binding_Context ctxt, int button, E_Binding_Modifier mod, int any_mod, const char *action, const char *params);
 EAPI void        e_bindings_mouse_grab(E_Binding_Context ctxt, Ecore_X_Window win);
 EAPI void        e_bindings_mouse_ungrab(E_Binding_Context ctxt, Ecore_X_Window win);
 EAPI E_Action   *e_bindings_mouse_down_find(E_Binding_Context ctxt, E_Object *obj, Ecore_X_Event_Mouse_Button_Down *ev, E_Binding_Mouse **bind_ret);
@@ -93,20 +93,20 @@ EAPI E_Action   *e_bindings_mouse_down_event_handle(E_Binding_Context ctxt, E_Ob
 EAPI E_Action   *e_bindings_mouse_up_find(E_Binding_Context ctxt, E_Object *obj, Ecore_X_Event_Mouse_Button_Up *ev, E_Binding_Mouse **bind_ret);
 EAPI E_Action   *e_bindings_mouse_up_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_X_Event_Mouse_Button_Up *ev);
 
-EAPI void        e_bindings_key_add(E_Binding_Context ctxt, char *key, E_Binding_Modifier mod, int any_mod, char *action, char *params);
-EAPI void        e_bindings_key_del(E_Binding_Context ctxt, char *key, E_Binding_Modifier mod, int any_mod, char *action, char *params);
+EAPI void        e_bindings_key_add(E_Binding_Context ctxt, const char *key, E_Binding_Modifier mod, int any_mod, const char *action, const char *params);
+EAPI void        e_bindings_key_del(E_Binding_Context ctxt, const char *key, E_Binding_Modifier mod, int any_mod, const char *action, const char *params);
 EAPI void        e_bindings_key_grab(E_Binding_Context ctxt, Ecore_X_Window win);
 EAPI void        e_bindings_key_ungrab(E_Binding_Context ctxt, Ecore_X_Window win);
 EAPI E_Action   *e_bindings_key_down_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_X_Event_Key_Down *ev);
 EAPI E_Action   *e_bindings_key_up_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_X_Event_Key_Up *ev);
 
-EAPI void        e_bindings_signal_add(E_Binding_Context ctxt, char *sig, char *src, E_Binding_Modifier mod, int any_mod, char *action, char *params);
-EAPI void        e_bindings_signal_del(E_Binding_Context ctxt, char *sig, char *src, E_Binding_Modifier mod, int any_mod, char *action, char *params);
+EAPI void        e_bindings_signal_add(E_Binding_Context ctxt, const char *sig, const char *src, E_Binding_Modifier mod, int any_mod, const char *action, const char *params);
+EAPI void        e_bindings_signal_del(E_Binding_Context ctxt, const char *sig, const char *src, E_Binding_Modifier mod, int any_mod, const char *action, const char *params);
 EAPI E_Action   *e_bindings_signal_find(E_Binding_Context ctxt, E_Object *obj, char *sig, char *src, E_Binding_Signal **bind_ret);
 EAPI E_Action   *e_bindings_signal_handle(E_Binding_Context ctxt, E_Object *obj, char *sig, char *src);
 					 
-EAPI void        e_bindings_wheel_add(E_Binding_Context ctxt, int direction, int z, E_Binding_Modifier mod, int any_mod, char *action, char *params);
-EAPI void        e_bindings_wheel_del(E_Binding_Context ctxt, int direction, int z, E_Binding_Modifier mod, int any_mod, char *action, char *params);
+EAPI void        e_bindings_wheel_add(E_Binding_Context ctxt, int direction, int z, E_Binding_Modifier mod, int any_mod, const char *action, const char *params);
+EAPI void        e_bindings_wheel_del(E_Binding_Context ctxt, int direction, int z, E_Binding_Modifier mod, int any_mod, const char *action, const char *params);
 EAPI void        e_bindings_wheel_grab(E_Binding_Context ctxt, Ecore_X_Window win);
 EAPI void        e_bindings_wheel_ungrab(E_Binding_Context ctxt, Ecore_X_Window win);
 EAPI E_Action   *e_bindings_wheel_find(E_Binding_Context ctxt, E_Object *obj, Ecore_X_Event_Mouse_Wheel *ev, E_Binding_Wheel **bind_ret);
diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index 7c37a9ef0..baf60cd72 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -2622,7 +2622,7 @@ e_border_name_get(E_Border *bd)
 
 
 EAPI void
-e_border_signal_move_begin(E_Border *bd, char *sig, char *src)
+e_border_signal_move_begin(E_Border *bd, const char *sig, const char *src)
 {
    E_OBJECT_CHECK(bd);
    E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
@@ -2634,7 +2634,7 @@ e_border_signal_move_begin(E_Border *bd, char *sig, char *src)
 }
 
 EAPI void
-e_border_signal_move_end(E_Border *bd, char *sig, char *src)
+e_border_signal_move_end(E_Border *bd, const char *sig, const char *src)
 {
    E_OBJECT_CHECK(bd);
    E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
@@ -2656,7 +2656,7 @@ e_border_resizing_get(E_Border *bd)
 }
 
 EAPI void
-e_border_signal_resize_begin(E_Border *bd, char *dir, char *sig, char *src)
+e_border_signal_resize_begin(E_Border *bd, const char *dir, const char *sig, const char *src)
 {
    Ecore_X_Gravity grav = ECORE_X_GRAVITY_NW;
    int resize_mode = RESIZE_BR;
@@ -2712,7 +2712,7 @@ e_border_signal_resize_begin(E_Border *bd, char *dir, char *sig, char *src)
 }
 
 EAPI void
-e_border_signal_resize_end(E_Border *bd, char *dir, char *sig, char *src)
+e_border_signal_resize_end(E_Border *bd, const char *dir, const char *sig, const char *src)
 {
    E_OBJECT_CHECK(bd);
    E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
diff --git a/src/bin/e_border.h b/src/bin/e_border.h
index bfb5c1ac3..16a599bde 100644
--- a/src/bin/e_border.h
+++ b/src/bin/e_border.h
@@ -139,7 +139,7 @@ struct _E_Border
       struct {
 	 unsigned char changed : 1;
 	 unsigned char user_selected : 1;
-	 char *name;
+	 const char *name;
       } border;
       
       unsigned char shaped : 1;
@@ -551,11 +551,11 @@ EAPI Evas_List *e_border_immortal_windows_get(void);
 
 EAPI const char *e_border_name_get(E_Border *bd);
 
-EAPI void e_border_signal_move_begin(E_Border *bd, char *sig, char *src);
-EAPI void e_border_signal_move_end(E_Border *bd, char *sig, char *src);
+EAPI void e_border_signal_move_begin(E_Border *bd, const char *sig, const char *src);
+EAPI void e_border_signal_move_end(E_Border *bd, const char *sig, const char *src);
 EAPI int  e_border_resizing_get(E_Border *bd);
-EAPI void e_border_signal_resize_begin(E_Border *bd, char *dir, char *sig, char *src);
-EAPI void e_border_signal_resize_end(E_Border *bd, char *dir, char *sig, char *src);
+EAPI void e_border_signal_resize_begin(E_Border *bd, const char *dir, const char *sig, const char *src);
+EAPI void e_border_signal_resize_end(E_Border *bd, const char *dir, const char *sig, const char *src);
 EAPI void e_border_resize_limit(E_Border *bd, int *w, int *h);
     
 extern EAPI int E_EVENT_BORDER_RESIZE;
diff --git a/src/bin/e_color_class.h b/src/bin/e_color_class.h
index 419781e2f..4b04620b3 100644
--- a/src/bin/e_color_class.h
+++ b/src/bin/e_color_class.h
@@ -12,7 +12,7 @@ typedef struct _E_Color_Class E_Color_Class;
 
 struct _E_Color_Class
 {
-   char		 *name;
+   const char	 *name;
    int		  r, g, b, a;
    int		  r2, g2, b2, a2;
    int		  r3, g3, b3, a3;
diff --git a/src/bin/e_config.h b/src/bin/e_config.h
index 35a41b881..d0a4a739d 100644
--- a/src/bin/e_config.h
+++ b/src/bin/e_config.h
@@ -73,9 +73,9 @@ struct _E_Config
 {
    int         config_version;
    int         show_splash; //GUI
-   char       *desktop_default_background;
+   const char *desktop_default_background;
    Evas_List  *desktop_backgrounds;
-   char       *desktop_default_name;
+   const char *desktop_default_name;
    Evas_List  *desktop_names;
    double      menus_scroll_speed; // GUI
    double      menus_fast_mouse_move_threshhold; // GUI
@@ -104,7 +104,7 @@ struct _E_Config
    int         evas_engine_drag;
    int         evas_engine_win;
    int         evas_engine_zone;
-   char       *language;
+   const char *language;
    Evas_List  *modules;
    Evas_List  *font_fallbacks;
    Evas_List  *font_defaults;
@@ -163,9 +163,9 @@ struct _E_Config
    double      kill_timer_wait;
    int         ping_clients;
    double      ping_clients_wait;
-   char       *transition_start;
-   char       *transition_desk;
-   char       *transition_change;
+   const char *transition_start;
+   const char *transition_desk;
+   const char *transition_change;
    Evas_List  *remembers;
    int         move_info_follows; // GUI
    int         resize_info_follows; // GUI
@@ -177,7 +177,7 @@ struct _E_Config
    int         cursor_size; //GUI
    int         menu_autoscroll_margin; // GUI
    int         menu_autoscroll_cursor_margin; // GUI
-   char	      *input_method;
+   const char *input_method;
    struct {
 	int    move;
 	int    resize;
@@ -216,22 +216,22 @@ struct _E_Config
 
 struct _E_Config_Module
 {
-   char          *name;
+   const char    *name;
    unsigned char  enabled;
 };
 
 struct _E_Config_Theme
 {
-   char          *category;
-   char          *file;
+   const char    *category;
+   const char    *file;
 };
 
 struct _E_Config_Binding_Mouse
 {
    int            context;
    int            modifiers;
-   char          *action;
-   char          *params;
+   const char    *action;
+   const char    *params;
    unsigned char  button;
    unsigned char  any_mod;
 };
@@ -240,21 +240,21 @@ struct _E_Config_Binding_Key
 {
    int            context;
    int            modifiers;
-   char          *key;
-   char          *action;
-   char          *params;
+   const char    *key;
+   const char    *action;
+   const char    *params;
    unsigned char  any_mod;
 };
 
 struct _E_Config_Binding_Signal
 {
    int            context;
-   char          *signal;
-   char          *source;
+   const char    *signal;
+   const char    *source;
    int            modifiers;
    unsigned char  any_mod;
-   char          *action;
-   char          *params;
+   const char    *action;
+   const char    *params;
 };
 
 struct _E_Config_Binding_Wheel
@@ -264,8 +264,8 @@ struct _E_Config_Binding_Wheel
    int            z;
    int            modifiers;
    unsigned char  any_mod;
-   char          *action;
-   char          *params;
+   const char    *action;
+   const char    *params;
 };
 
 struct _E_Config_Desktop_Background
@@ -274,7 +274,7 @@ struct _E_Config_Desktop_Background
    int            zone;
    int            desk_x;
    int            desk_y;
-   char          *file;
+   const char    *file;
 };
 
 struct _E_Config_Desktop_Name
@@ -283,18 +283,20 @@ struct _E_Config_Desktop_Name
    int            zone;
    int            desk_x;
    int            desk_y;
-   char          *name;
+   const char    *name;
 };
 
 struct _E_Config_Gadcon
 {
-   char *name, *id;
-   Evas_List *clients;
+   const char	 *name;
+   const char	 *id;
+   Evas_List	 *clients;
 };
 
 struct _E_Config_Gadcon_Client
 {
-   char *name, *id;
+   const char	 *name;
+   const char	 *id;
    struct {
       int pos, size, res;
    } geom;
@@ -302,7 +304,7 @@ struct _E_Config_Gadcon_Client
 
 struct _E_Config_Shelf
 {
-   char *name;
+   const char *name;
    int container, zone;
    int layer;
    unsigned char popup;
@@ -316,7 +318,7 @@ struct _E_Config_Shelf_Config
    } res;
    int x, y, w, h;
    int orient;
-   char *style;
+   const char *style;
 };
 
 EAPI int        e_config_init(void);
diff --git a/src/bin/e_config_dialog.c b/src/bin/e_config_dialog.c
index 229372724..fe1d495d1 100644
--- a/src/bin/e_config_dialog.c
+++ b/src/bin/e_config_dialog.c
@@ -19,7 +19,7 @@ static void _e_config_dialog_cb_close(void *data, E_Dialog *dia);
 /* externally accessible functions */
 
 EAPI E_Config_Dialog *
-e_config_dialog_new(E_Container *con, char *title, char *icon, int icon_size, E_Config_Dialog_View *view, void *data)
+e_config_dialog_new(E_Container *con, const char *title, const char *icon, int icon_size, E_Config_Dialog_View *view, void *data)
 {
    E_Config_Dialog *cfd;
    
diff --git a/src/bin/e_config_dialog.h b/src/bin/e_config_dialog.h
index 7e7233d91..7b5dee3da 100644
--- a/src/bin/e_config_dialog.h
+++ b/src/bin/e_config_dialog.h
@@ -40,8 +40,8 @@ struct _E_Config_Dialog
    E_Config_Dialog_View        *view;
    E_Config_Dialog_Data        *cfdata;
    E_Container                 *con;
-   char                        *title;
-   char                        *icon;
+   const char                  *title;
+   const char                  *icon;
    int                          icon_size;
    E_Dialog                    *dia;
    void                        *data;
@@ -49,7 +49,7 @@ struct _E_Config_Dialog
    int                          hide_buttons;
 };
 
-EAPI E_Config_Dialog *e_config_dialog_new(E_Container *con, char *title, char *icon, int icon_size, E_Config_Dialog_View *view, void *data);
+EAPI E_Config_Dialog *e_config_dialog_new(E_Container *con, const char *title, const char *icon, int icon_size, E_Config_Dialog_View *view, void *data);
 
 #endif
 #endif
diff --git a/src/bin/e_container.h b/src/bin/e_container.h
index 8ab94959f..e35adba43 100644
--- a/src/bin/e_container.h
+++ b/src/bin/e_container.h
@@ -38,7 +38,7 @@ struct _E_Container
    E_Gadman            *gadman;
    
    unsigned int         num;
-   char                *name;
+   const char	       *name;
    
    Ecore_Evas          *bg_ecore_evas;
    Evas                *bg_evas;
diff --git a/src/bin/e_desk.c b/src/bin/e_desk.c
index 71ddf1c3c..95806fcbc 100644
--- a/src/bin/e_desk.c
+++ b/src/bin/e_desk.c
@@ -91,7 +91,7 @@ e_desk_name_set(E_Desk *desk, const char *name)
 }
 
 EAPI void
-e_desk_name_add(int container, int zone, int desk_x, int desk_y, char *name)
+e_desk_name_add(int container, int zone, int desk_x, int desk_y, const char *name)
 {
    E_Config_Desktop_Name *cfname;
    
diff --git a/src/bin/e_desk.h b/src/bin/e_desk.h
index 40ca47d71..96c267e41 100644
--- a/src/bin/e_desk.h
+++ b/src/bin/e_desk.h
@@ -18,7 +18,7 @@ struct _E_Desk
    E_Object             e_obj_inherit;
 
    E_Zone              *zone;
-   char                *name;
+   const char          *name;
    int                  x, y;
    char                 visible : 1;
 
@@ -39,7 +39,7 @@ EAPI int          e_desk_init(void);
 EAPI int          e_desk_shutdown(void);
 EAPI E_Desk      *e_desk_new(E_Zone *zone, int x, int y);
 EAPI void         e_desk_name_set(E_Desk *desk, const char *name);
-EAPI void         e_desk_name_add(int container, int zone, int desk_x, int desk_y, char *name);
+EAPI void         e_desk_name_add(int container, int zone, int desk_x, int desk_y, const char *name);
 EAPI void         e_desk_name_del(int container, int zone, int desk_x, int desk_y);
 EAPI void         e_desk_name_update(void);
 EAPI void         e_desk_show(E_Desk *desk);
diff --git a/src/bin/e_desklock.h b/src/bin/e_desklock.h
index 2b6b61cd0..4039cf200 100644
--- a/src/bin/e_desklock.h
+++ b/src/bin/e_desklock.h
@@ -1,7 +1,8 @@
 
 #ifdef E_TYPEDEFS
 #else
-#ifdef E_DESKLOCK_H
+#ifndef E_DESKLOCK_H
+#define E_DESKLOCK_H
 
 EAPI int e_desklock_init(void);
 EAPI int e_desklock_shutdown(void);
diff --git a/src/bin/e_dialog.c b/src/bin/e_dialog.c
index 5bfe7ec8f..d2314fe0f 100644
--- a/src/bin/e_dialog.c
+++ b/src/bin/e_dialog.c
@@ -75,12 +75,12 @@ e_dialog_new(E_Container *con)
 }
 
 EAPI void
-e_dialog_button_add(E_Dialog *dia, char *label, char *icon, void (*func) (void *data, E_Dialog *dia), void *data)
+e_dialog_button_add(E_Dialog *dia, const char *label, const char *icon, void (*func) (void *data, E_Dialog *dia), void *data)
 {
    Evas_Object *o;
 
    if (!func) func = _e_dialog_del_func_cb;
-   o = e_widget_button_add(e_win_evas_get(dia->win), label, icon, func, data, dia);
+   o = e_widget_button_add(e_win_evas_get(dia->win), label, icon, (void (*) (void*, void*)) func, data, dia);
    e_widget_list_object_append(dia->box_object, o, 1, 0, 0.5);
    dia->buttons = evas_list_append(dia->buttons, o);
 }
@@ -117,13 +117,13 @@ e_dialog_button_disable_num_get(E_Dialog *dia, int button)
 }
 
 EAPI void
-e_dialog_title_set(E_Dialog *dia, char *title)
+e_dialog_title_set(E_Dialog *dia, const char *title)
 {
    e_win_title_set(dia->win, title);
 }
 
 EAPI void
-e_dialog_text_set(E_Dialog *dia, char *text)
+e_dialog_text_set(E_Dialog *dia, const char *text)
 {
    if (!dia->text_object)
      {
@@ -140,7 +140,7 @@ e_dialog_text_set(E_Dialog *dia, char *text)
 }
 
 EAPI void
-e_dialog_icon_set(E_Dialog *dia, char *icon, Evas_Coord size)
+e_dialog_icon_set(E_Dialog *dia, const char *icon, Evas_Coord size)
 {
    if (!icon) return;
    
diff --git a/src/bin/e_dialog.h b/src/bin/e_dialog.h
index d95a4df2a..0d154e207 100644
--- a/src/bin/e_dialog.h
+++ b/src/bin/e_dialog.h
@@ -30,13 +30,13 @@ struct _E_Dialog
 };
 
 EAPI E_Dialog *e_dialog_new                    (E_Container *con);
-EAPI void      e_dialog_button_add             (E_Dialog *dia, char *label, char *icon, void (*func) (void *data, E_Dialog *dia), void *data);
+EAPI void      e_dialog_button_add             (E_Dialog *dia, const char *label, const char *icon, void (*func) (void *data, E_Dialog *dia), void *data);
 EAPI int       e_dialog_button_focus_num       (E_Dialog *dia, int button);
 EAPI int       e_dialog_button_disable_num_set (E_Dialog *dia, int button, int disabled);
 EAPI int       e_dialog_button_disable_num_get (E_Dialog *dia, int button);
-EAPI void      e_dialog_title_set              (E_Dialog *dia, char *title);
-EAPI void      e_dialog_text_set               (E_Dialog *dia, char *text);
-EAPI void      e_dialog_icon_set               (E_Dialog *dia, char *icon, Evas_Coord size);
+EAPI void      e_dialog_title_set              (E_Dialog *dia, const char *title);
+EAPI void      e_dialog_text_set               (E_Dialog *dia, const char *text);
+EAPI void      e_dialog_icon_set               (E_Dialog *dia, const char *icon, Evas_Coord size);
 EAPI void      e_dialog_content_set            (E_Dialog *dia, Evas_Object *obj, Evas_Coord minw, Evas_Coord minh);
 EAPI void      e_dialog_resizable_set          (E_Dialog *dia, int resizable);
 EAPI void      e_dialog_show                   (E_Dialog *dia);
diff --git a/src/bin/e_error.c b/src/bin/e_error.c
index 10790fafd..aac12576a 100644
--- a/src/bin/e_error.c
+++ b/src/bin/e_error.c
@@ -62,7 +62,7 @@ e_error_message_manager_show(E_Manager *man, char *title, char *txt)
    E_Container *con;
    Ecore_X_Window win;
    int          x, y;
-   char        *s;
+   const char  *s;
 
    con = e_container_current_get(man);
 
@@ -357,7 +357,7 @@ _e_error_cb_ok_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
    Evas_Event_Mouse_Down *ev;
    Ecore_Evas *ee;
-   char *s;
+   const char *s;
    
    ev = event_info;
    if (ev->button != 1) return;
@@ -373,7 +373,7 @@ _e_error_cb_ok_up(void *data, Evas *e, Evas_Object *obj, void *event_info)
    Evas_Event_Mouse_Up *ev;
    Ecore_Evas *ee;
    Evas_Object *o;
-   char *s;
+   const char *s;
 
    ev = event_info;
    if (ev->button != 1) return;
diff --git a/src/bin/e_exebuf.c b/src/bin/e_exebuf.c
index 7619afc2d..da6c47c36 100644
--- a/src/bin/e_exebuf.c
+++ b/src/bin/e_exebuf.c
@@ -21,7 +21,7 @@ typedef struct _E_Exe_List E_Exe_List;
 
 struct _E_Exe
 {
-   char *path;
+   const char *path;
 };
 
 struct _E_Exe_List
diff --git a/src/bin/e_exehist.c b/src/bin/e_exehist.c
index 57d2d93ae..5004622e7 100644
--- a/src/bin/e_exehist.c
+++ b/src/bin/e_exehist.c
@@ -16,8 +16,8 @@ struct _E_Exehist
 
 struct _E_Exehist_Item
 {
-   char         *exe;
-   char         *launch_method;
+   const char   *exe;
+   const char   *launch_method;
    double        exetime;
 };
 
diff --git a/src/bin/e_fileman_mime.c b/src/bin/e_fileman_mime.c
index 0fb7faa8c..ff4606df0 100644
--- a/src/bin/e_fileman_mime.c
+++ b/src/bin/e_fileman_mime.c
@@ -103,7 +103,7 @@ e_fm_mime_init(void)
 {
    E_Fm_Mime_Entry *root;
    E_Fm_Mime_Entry *entry;
-   E_Fm_Mime_Entry *l1,*l2,*l3;
+   E_Fm_Mime_Entry *l1,*l2;
    E_Fm_Mime_Action *action;
 
    if(init_count)
@@ -402,7 +402,7 @@ e_fm_mime_action_call(E_Fm_Smart_Data *sd, E_Fm_Mime_Action *action)
    return 1;
 }
 
-EAPI int
+EAPI void
 e_fm_mime_action_default_call(E_Fm_Smart_Data *sd)
 {
    E_Fm_Mime_Entry  *mime;
@@ -507,7 +507,6 @@ _e_fm_mime_string_tokenizer(Evas_List *files, E_Fm_File *hover, char *istr)
 	     if(*c == 'f')
 	       {
 		  int j = 2;
-		  char *f = NULL;
 
 		  astr = calloc(PATH_MAX,sizeof(char));
 		  for(l = files; l; l = l->next)
diff --git a/src/bin/e_fileman_mime.h b/src/bin/e_fileman_mime.h
index cbf9de47e..c2b0c7160 100644
--- a/src/bin/e_fileman_mime.h
+++ b/src/bin/e_fileman_mime.h
@@ -60,7 +60,7 @@ EAPI void              e_fm_mime_shutdwon(void);
 EAPI E_Fm_Mime_Entry  *e_fm_mime_get_from_list(Evas_List *files);
 EAPI void              e_fm_mime_set(E_Fm_File *file);
 EAPI int               e_fm_mime_action_call(E_Fm_Smart_Data *sd, E_Fm_Mime_Action *action);
-EAPI int               e_fm_mime_action_default_call(E_Fm_Smart_Data *sd);
+EAPI void              e_fm_mime_action_default_call(E_Fm_Smart_Data *sd);
 EAPI char             *e_fm_mime_translate(E_Fm_Smart_Data *sd, char *istr);
 
 
diff --git a/src/bin/e_font.c b/src/bin/e_font.c
index 0a42034b1..380dc67df 100644
--- a/src/bin/e_font.c
+++ b/src/bin/e_font.c
@@ -132,7 +132,7 @@ e_font_fallback_clear(void)
 	e_config->font_fallbacks = evas_list_remove_list(
 					e_config->font_fallbacks, 
 					e_config->font_fallbacks);
-	E_FREE(eff->name);
+	if (eff->name) evas_stringshare_del(eff->name);
 	E_FREE(eff);
     }
 }
diff --git a/src/bin/e_font.h b/src/bin/e_font.h
index e7e404adc..7dcf4d64a 100644
--- a/src/bin/e_font.h
+++ b/src/bin/e_font.h
@@ -13,19 +13,19 @@ typedef struct _E_Font_Fallback E_Font_Available;
 
 struct _E_Font_Default
 {
-   char *text_class;
-   char *font;
-   int   size;
+   const char *text_class;
+   const char *font;
+   int         size;
 };
 
 struct _E_Font_Fallback
 {
-   char *name;
+   const char *name;
 };
 
 struct _E_Font_Available
 {
-   char *name;
+   const char *name;
 };
 
 EAPI int		e_font_init(void);
diff --git a/src/bin/e_gadcon.c b/src/bin/e_gadcon.c
index cfc519355..cd7dd9986 100644
--- a/src/bin/e_gadcon.c
+++ b/src/bin/e_gadcon.c
@@ -121,7 +121,7 @@ e_gadcon_provider_unregister(E_Gadcon_Client_Class *cc)
 }
 
 EAPI E_Gadcon *
-e_gadcon_swallowed_new(char *name, char *id, Evas_Object *obj, char *swallow_name)
+e_gadcon_swallowed_new(const char *name, char *id, Evas_Object *obj, char *swallow_name)
 {
    E_Gadcon    *gc;
    
diff --git a/src/bin/e_gadcon.h b/src/bin/e_gadcon.h
index d90ac4afb..fff218abc 100644
--- a/src/bin/e_gadcon.h
+++ b/src/bin/e_gadcon.h
@@ -94,7 +94,7 @@ EAPI int              e_gadcon_init(void);
 EAPI int              e_gadcon_shutdown(void);
 EAPI void             e_gadcon_provider_register(E_Gadcon_Client_Class *cc);
 EAPI void             e_gadcon_provider_unregister(E_Gadcon_Client_Class *cc);
-EAPI E_Gadcon        *e_gadcon_swallowed_new(char *name, char *id, Evas_Object *obj, char *swallow_name);
+EAPI E_Gadcon        *e_gadcon_swallowed_new(const char *name, char *id, Evas_Object *obj, char *swallow_name);
 EAPI void             e_gadcon_layout_policy_set(E_Gadcon *gc, E_Gadcon_Layout_Policy layout_policy);
 EAPI void             e_gadcon_populate(E_Gadcon *gc);
 EAPI void             e_gadcon_orient(E_Gadcon *gc, E_Gadcon_Orient orient);
diff --git a/src/bin/e_gadman.c b/src/bin/e_gadman.c
index f2b9dfd3c..017fcac0c 100644
--- a/src/bin/e_gadman.c
+++ b/src/bin/e_gadman.c
@@ -627,7 +627,7 @@ e_gadman_client_menu_new(E_Gadman_Client *gmc)
    E_Menu *m;
    E_Menu_Item *mi;
    int disallow, seperator;
-   char *s;
+   const char *s;
    
    E_OBJECT_CHECK_RETURN(gmc, NULL);
    E_OBJECT_TYPE_CHECK_RETURN(gmc, E_GADMAN_CLIENT_TYPE, NULL);
diff --git a/src/bin/e_gadman.h b/src/bin/e_gadman.h
index 3cd1ee700..e303351f7 100644
--- a/src/bin/e_gadman.h
+++ b/src/bin/e_gadman.h
@@ -75,7 +75,7 @@ struct _E_Gadman_Client
    unsigned char        resizing_u : 1;
    unsigned char        resizing_d : 1;
    E_Gadman_Edge        edge;
-   char                *domain;
+   const char          *domain;
    E_Zone              *zone;
    int                  instance;
    E_Gadman_Policy      policy;
diff --git a/src/bin/e_includes.h b/src/bin/e_includes.h
index 52d809435..56edde36a 100644
--- a/src/bin/e_includes.h
+++ b/src/bin/e_includes.h
@@ -126,3 +126,4 @@
 #include "e_stolen.h"
 #include "e_gadcon.h"
 #include "e_shelf.h"
+#include "e_tlist.h"
diff --git a/src/bin/e_init.c b/src/bin/e_init.c
index d9c37e97f..d5aaabacf 100644
--- a/src/bin/e_init.c
+++ b/src/bin/e_init.c
@@ -29,7 +29,7 @@ e_init_init(void)
    int num;
    Evas_Object *o;
    Evas_List *l, *screens;
-   char *s;
+   const char *s;
    
    num = 0;
    roots = ecore_x_window_root_list(&num);
diff --git a/src/bin/e_int_config_keybindings.c b/src/bin/e_int_config_keybindings.c
index 4a0ea2af8..6c3613c44 100644
--- a/src/bin/e_int_config_keybindings.c
+++ b/src/bin/e_int_config_keybindings.c
@@ -340,10 +340,8 @@ static void
 _fill_keybindings_data(E_Config_Dialog_Data *cfdata)
 {
   int i, j;
-  int found;
   E_Config_KeyBind  *eckb;
   E_Config_Binding_Key	*bk, *t;
-  const char *action_name = NULL;
 
   for( i = 0; actions_predefined_names[i].action_name; i++ )
     {
@@ -379,11 +377,13 @@ _fill_keybindings_data(E_Config_Dialog_Data *cfdata)
 		    continue;
 
 		  bk->context = t->context;
-		  bk->key = strdup(t->key);
+		  bk->key = evas_stringshare_add(t->key);
 		  bk->modifiers = t->modifiers;
 		  bk->any_mod = t->any_mod;
-		  bk->action = t->action == NULL ? NULL : strdup(t->action);
-		  bk->params = t->params == NULL ? NULL : strdup(t->params);
+		  bk->action = t->action == NULL ? 
+		     NULL : evas_stringshare_add(t->action);
+		  bk->params = t->params == NULL ? 
+		     NULL : evas_stringshare_add(t->params);
 
 		  eckb->bk_list = evas_list_append(eckb->bk_list, bk);
 		  break;
@@ -403,11 +403,13 @@ _fill_keybindings_data(E_Config_Dialog_Data *cfdata)
 		    continue;
 
 		  bk->context = t->context;
-		  bk->key = strdup(t->key);
+		  bk->key = evas_stringshare_add(t->key);
 		  bk->modifiers = t->modifiers;
 		  bk->any_mod = t->any_mod;
-		  bk->action = t->action == NULL ? NULL : strdup(t->action);
-		  bk->params = t->params == NULL ? NULL : strdup(t->params);
+		  bk->action = t->action == NULL ? 
+		     NULL : evas_stringshare_add(t->action);
+		  bk->params = t->params == NULL ? 
+		     NULL : evas_stringshare_add(t->params);
 
 		  eckb->bk_list = evas_list_append(eckb->bk_list, bk);
 		  break;
@@ -425,11 +427,13 @@ _fill_keybindings_data(E_Config_Dialog_Data *cfdata)
 		    continue;
 
 		  bk->context = t->context;
-		  bk->key = strdup(t->key);
+		  bk->key = evas_stringshare_add(t->key);
 		  bk->modifiers = t->modifiers;
 		  bk->any_mod = t->any_mod;
-		  bk->action = t->action == NULL ? NULL : strdup(t->action);
-		  bk->params = t->params == NULL ? NULL : strdup(t->params);
+		  bk->action = t->action == NULL ? 
+		     NULL : evas_stringshare_add(t->action);
+		  bk->params = t->params == NULL ? 
+		     NULL : evas_stringshare_add(t->params);
 
 		  eckb->bk_list = evas_list_append(eckb->bk_list, bk);
 		  break;
@@ -478,9 +482,9 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 	      bk = evas_list_nth(eckb->bk_list, j);
 	      if (bk)
 		{
-		  E_FREE(bk->key);
-		  E_FREE(bk->action);
-		  E_FREE(bk->params);
+		  if (bk->key) evas_stringshare_del(bk->key);
+		  if (bk->action) evas_stringshare_del(bk->action);
+		  if (bk->params) evas_stringshare_del(bk->params);
 		  E_FREE(bk);
 		}
 	    }
@@ -560,7 +564,7 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 		  if (bk2)
 		    {
 		      bk2->context = bk->context;
-		      bk2->key = (char *)evas_stringshare_add(bk->key);
+		      bk2->key = evas_stringshare_add(bk->key);
 		      bk2->modifiers = bk->modifiers;
 		      bk2->any_mod = bk->any_mod;
 		      bk2->action = bk->action == NULL ? NULL : 
@@ -1080,7 +1084,6 @@ _update_next_prev_add_del_buttons(E_Config_Dialog_Data *cfdata)
   E_Widget_Button_Data	*wd_prev;
   E_Widget_Button_Data	*wd_add;
   E_Widget_Button_Data	*wd_del;
-  E_Config_Binding_Key	*bk;
 
   if (cfdata == NULL) return;
 
@@ -1172,7 +1175,6 @@ _update_next_prev_add_del_buttons(E_Config_Dialog_Data *cfdata)
 static void
 _update_ilist_cur_selection_icon(E_Config_Dialog_Data *cfdata)
 {
-  int sel_indx;
   E_Smart_Item *si;
   E_Smart_Data *sd;
   E_Widget_IList_Data *wd;
@@ -1228,8 +1230,6 @@ _update_ilist_cur_selection_icon(E_Config_Dialog_Data *cfdata)
 static void
 _ilist_kb_cb_change(void *data, Evas_Object *obj)
 {
-  char buf[256];
-
   int acn, i;
   char *label;
   E_Config_Dialog_Data	*cfdata;
@@ -1267,10 +1267,12 @@ _ilist_kb_cb_change(void *data, Evas_Object *obj)
       bk->key = strdup("");
       bk->modifiers = E_BINDING_MODIFIER_NONE;
       bk->any_mod = 0;
-      bk->action = actions_predefined_names[acn].action_cmd == NULL ? strdup("") :
-					       strdup(actions_predefined_names[acn].action_cmd);
-      bk->params = actions_predefined_names[acn].action_params == NULL ? strdup("") :
-					       strdup(actions_predefined_names[acn].action_params);
+      bk->action = actions_predefined_names[acn].action_cmd == NULL ? 
+		evas_stringshare_add("") :
+		evas_stringshare_add(actions_predefined_names[acn].action_cmd);
+      bk->params = actions_predefined_names[acn].action_params == NULL ? 
+		evas_stringshare_add("") :
+		evas_stringshare_add(actions_predefined_names[acn].action_params);
 
       cfdata->cur_eckb->bk_list = evas_list_append(cfdata->cur_eckb->bk_list, bk);
     }
@@ -1327,9 +1329,7 @@ _keybind_cb_next_keybind(void *data, void *data2)
 static void
 _keybind_cb_prev_keybind(void *data, void *data2)
 {
-  char buf[50];
   E_Config_Dialog_Data *cfdata;
-  E_Widget_Button_Data *wd_next, *wd_prev;
 
   int old_kb_sel;
   int old_bk_list_size;
@@ -1391,10 +1391,12 @@ _keybind_cb_add_keybinding(void *data, void *data2)
   bk->context = E_BINDING_CONTEXT_ANY;
   bk->key = strdup("");
   bk->modifiers = E_BINDING_MODIFIER_NONE;
-  bk->action = actions_predefined_names[cfdata->cur_eckb->acn].action_cmd == NULL ? strdup("") :
-    strdup(actions_predefined_names[cfdata->cur_eckb->acn].action_cmd);
-  bk->params = actions_predefined_names[cfdata->cur_eckb->acn].action_params == NULL ? strdup("") :
-    strdup(actions_predefined_names[cfdata->cur_eckb->acn].action_params);
+  bk->action = actions_predefined_names[cfdata->cur_eckb->acn].action_cmd == NULL ? 
+     evas_stringshare_add("") :
+     evas_stringshare_add(actions_predefined_names[cfdata->cur_eckb->acn].action_cmd);
+  bk->params = actions_predefined_names[cfdata->cur_eckb->acn].action_params == NULL ? 
+     evas_stringshare_add("") :
+     evas_stringshare_add(actions_predefined_names[cfdata->cur_eckb->acn].action_params);
 
   cfdata->cur_eckb->bk_list = evas_list_append(cfdata->cur_eckb->bk_list, bk);
   cfdata->cur_eckb_kb_sel = evas_list_count(cfdata->cur_eckb->bk_list) - 1;
@@ -1410,10 +1412,7 @@ _keybind_cb_add_keybinding(void *data, void *data2)
 static void
 _keybind_cb_del_keybinding(void *data, void *data2)
 {
-  int i;
   E_Config_Dialog_Data	*cfdata;
-  E_Config_Binding_Key	*bk, *bk_del;
-  Evas_List *new_bk_list;
 
   cfdata = data;
 
@@ -1453,8 +1452,8 @@ _keybind_cb_auto_apply(E_Config_Dialog_Data *cfdata)
     return -1;
 
   bk->context = cfdata->binding_context;
-  if (bk->key) E_FREE(bk->key);
-  bk->key = strdup(cfdata->key_bind);
+  if (bk->key) evas_stringshare_del(bk->key);
+  bk->key = evas_stringshare_add(cfdata->key_bind);
 
   bk->modifiers = 0;
   if (cfdata->bind_mod.shift)
@@ -1467,12 +1466,12 @@ _keybind_cb_auto_apply(E_Config_Dialog_Data *cfdata)
     bk->modifiers |= E_BINDING_MODIFIER_WIN;
 
   bk->any_mod = 0;
-  if (bk->action) E_FREE(bk->action);
+  if (bk->action) evas_stringshare_del(bk->action);
   bk->action = (cfdata->key_action == NULL || strlen(cfdata->key_action) == 0) ? NULL :
-	       strdup(cfdata->key_action);
-  if (bk->params) E_FREE(bk->params);
+	       evas_stringshare_add(cfdata->key_action);
+  if (bk->params) evas_stringshare_del(bk->params);
   bk->params = (cfdata->key_params == NULL || strlen(cfdata->key_params) == 0) ? NULL :
-	       strdup(cfdata->key_params);
+	       evas_stringshare_add(cfdata->key_params);
 
   return 0;
 }
@@ -1507,12 +1506,9 @@ _keybind_delete_keybinding(E_Config_Dialog_Data *cfdata)
 					   evas_list_nth(cfdata->cur_eckb->bk_list, i));
 	}
 
-      if (bk_del->key != NULL)
-	E_FREE(bk_del->key);
-      if (bk_del->action != NULL)
-	E_FREE(bk_del->action);
-      if (bk_del->params != NULL)
-	E_FREE(bk_del->params);
+      if (bk_del->key) evas_stringshare_del(bk_del->key);
+      if (bk_del->action) evas_stringshare_del(bk_del->action);
+      if (bk_del->params) evas_stringshare_del(bk_del->params);
       bk_del->key = bk_del->action = bk_del->params = NULL;
       E_FREE(bk_del);
 
@@ -1524,8 +1520,7 @@ _keybind_delete_keybinding(E_Config_Dialog_Data *cfdata)
       bk_del = evas_list_nth(cfdata->cur_eckb->bk_list, 0);
       if (!bk_del) return -1;
       bk_del->context = E_BINDING_CONTEXT_NONE;
-      if (bk_del->key != NULL)
-	E_FREE(bk_del->key);
+      if (bk_del->key) evas_stringshare_del(bk_del->key);
       bk_del->key = NULL;
       bk_del->modifiers = E_BINDING_MODIFIER_NONE;
       bk_del->any_mod = 0;
diff --git a/src/bin/e_int_config_modules.c b/src/bin/e_int_config_modules.c
index 865d9143e..c6efa62ad 100644
--- a/src/bin/e_int_config_modules.c
+++ b/src/bin/e_int_config_modules.c
@@ -160,7 +160,7 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
    Evas_List *l;
 
-   while (l = cfdata->modules)
+   while ((l = cfdata->modules))
      {
         CFModule *m;
 
diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c
index 58a0169ac..817671411 100644
--- a/src/bin/e_int_menus.c
+++ b/src/bin/e_int_menus.c
@@ -180,7 +180,7 @@ e_int_menus_main_new(void)
 }
 
 EAPI E_Menu *
-e_int_menus_apps_new(char *dir)
+e_int_menus_apps_new(const char *dir)
 {
    E_Menu *m;
    E_App *a;
@@ -671,7 +671,7 @@ _e_int_menus_clients_pre_cb(void *data, E_Menu *m)
    Evas_List *l, *borders = NULL;
    E_Menu *root;
    E_Zone *zone = NULL;
-   char *s;
+   const char *s;
 
    e_menu_pre_activate_callback_set(m, NULL, NULL);
    root = e_menu_root_get(m);
diff --git a/src/bin/e_int_menus.h b/src/bin/e_int_menus.h
index 2b5f39bf6..0b72b3411 100644
--- a/src/bin/e_int_menus.h
+++ b/src/bin/e_int_menus.h
@@ -20,7 +20,7 @@ struct _E_Int_Menu_Augmentation
 EAPI E_Menu *e_int_menus_main_new(void);    
 EAPI E_Menu *e_int_menus_desktops_new(void);
 EAPI E_Menu *e_int_menus_clients_new(void);
-EAPI E_Menu *e_int_menus_apps_new(char *dir);
+EAPI E_Menu *e_int_menus_apps_new(const char *dir);
 EAPI E_Menu *e_int_menus_favorite_apps_new(void);
 EAPI E_Menu *e_int_menus_config_new(void);
 EAPI E_Menu *e_int_menus_gadgets_new(void);
diff --git a/src/bin/e_ipc_codec.c b/src/bin/e_ipc_codec.c
index ce718a1f8..2057c4168 100644
--- a/src/bin/e_ipc_codec.c
+++ b/src/bin/e_ipc_codec.c
@@ -242,11 +242,11 @@ e_ipc_codec_str_dec(char *data, int bytes, char **dest)
 }
 
 EAPI void *
-e_ipc_codec_str_enc(char *str, int *size_ret)
+e_ipc_codec_str_enc(const char *str, int *size_ret)
 {
    E_Ipc_Str dat;
    
-   dat.str = str;
+   dat.str = (char *) str;
    return eet_data_descriptor_encode(_e_ipc_str_edd, &dat, size_ret);
 }
 
@@ -263,12 +263,12 @@ e_ipc_codec_2str_dec(char *data, int bytes, E_Ipc_2Str **dest)
 }
 
 EAPI void *
-e_ipc_codec_2str_enc(char *str1, char *str2, int *size_ret)
+e_ipc_codec_2str_enc(const char *str1, const char *str2, int *size_ret)
 {
    E_Ipc_2Str dat;
    
-   dat.str1 = str1;
-   dat.str2 = str2;
+   dat.str1 = (char *) str1;
+   dat.str2 = (char *) str2;
    return eet_data_descriptor_encode(_e_ipc_2str_edd, &dat, size_ret);
 }
 
@@ -357,11 +357,11 @@ e_ipc_codec_str_int_dec(char *data, int bytes, E_Ipc_Str_Int **dest)
 }
 
 EAPI void *
-e_ipc_codec_str_int_enc(char *str, int val, int *size_ret)
+e_ipc_codec_str_int_enc(const char *str, int val, int *size_ret)
 {
    E_Ipc_Str_Int dat;
    
-   dat.str = str;
+   dat.str = (char *) str;
    dat.val = val;
    return eet_data_descriptor_encode(_e_ipc_str_int_edd, &dat, size_ret);
 }
@@ -400,12 +400,12 @@ e_ipc_codec_2str_int_dec(char *data, int bytes, E_Ipc_2Str_Int **dest)
 }
 
 EAPI void *
-e_ipc_codec_2str_int_enc(char *str1, char *str2, int val, int *size_ret)
+e_ipc_codec_2str_int_enc(const char *str1, const char *str2, int val, int *size_ret)
 {
    E_Ipc_2Str_Int dat;
    
-   dat.str1 = str1;
-   dat.str2 = str2;
+   dat.str1 = (char *) str1;
+   dat.str2 = (char *) str2;
    dat.val = val;
    return eet_data_descriptor_encode(_e_ipc_2str_int_edd, &dat, size_ret);
 }
@@ -444,7 +444,7 @@ e_ipc_codec_4int_2str_dec(char *data, int bytes, E_Ipc_4Int_2Str **dest)
 }
 
 EAPI void *
-e_ipc_codec_4int_2str_enc(int val1, int val2, int val3, int val4, char *str1, char *str2, int *size_ret)
+e_ipc_codec_4int_2str_enc(int val1, int val2, int val3, int val4, const char *str1, const char *str2, int *size_ret)
 {
    E_Ipc_4Int_2Str dat;
 
@@ -452,8 +452,8 @@ e_ipc_codec_4int_2str_enc(int val1, int val2, int val3, int val4, char *str1, ch
    dat.val2 = val2;
    dat.val3 = val3;
    dat.val4 = val4;
-   dat.str1 = str1;
-   dat.str2 = str2;
+   dat.str1 = (char *) str1;
+   dat.str2 = (char *) str2;
    return eet_data_descriptor_encode(_e_ipc_4int_2str_edd, &dat, size_ret);   
 }
 
@@ -491,7 +491,7 @@ e_ipc_codec_5int_2str_dec(char *data, int bytes, E_Ipc_5Int_2Str **dest)
 }
 
 EAPI void *
-e_ipc_codec_5int_2str_enc(int val1, int val2, int val3, int val4, int val5, char *str1, char *str2, int *size_ret)
+e_ipc_codec_5int_2str_enc(int val1, int val2, int val3, int val4, int val5, const char *str1, const char *str2, int *size_ret)
 {
    E_Ipc_5Int_2Str dat;
 
@@ -500,8 +500,8 @@ e_ipc_codec_5int_2str_enc(int val1, int val2, int val3, int val4, int val5, char
    dat.val3 = val3;
    dat.val4 = val4;
    dat.val5 = val5;
-   dat.str1 = str1;
-   dat.str2 = str2;
+   dat.str1 = (char *) str1;
+   dat.str2 = (char *) str2;
    return eet_data_descriptor_encode(_e_ipc_5int_2str_edd, &dat, size_ret);   
 }
 
@@ -539,17 +539,17 @@ e_ipc_codec_3int_4str_dec(char *data, int bytes, E_Ipc_3Int_4Str **dest)
 }
 
 EAPI void *
-e_ipc_codec_3int_4str_enc(int val1, int val2, int val3, char *str1, char *str2, char *str3, char *str4, int *size_ret)
+e_ipc_codec_3int_4str_enc(int val1, int val2, int val3, const char *str1, const char *str2, const char *str3, const char *str4, int *size_ret)
 {
    E_Ipc_3Int_4Str dat;
 
    dat.val1 = val1;
    dat.val2 = val2;
    dat.val3 = val3;
-   dat.str1 = str1;
-   dat.str2 = str2;
-   dat.str3 = str3;
-   dat.str4 = str4;
+   dat.str1 = (char *) str1;
+   dat.str2 = (char *) str2;
+   dat.str3 = (char *) str3;
+   dat.str4 = (char *) str4;
    return eet_data_descriptor_encode(_e_ipc_3int_4str_edd, &dat, size_ret);   
 }
 
@@ -587,16 +587,16 @@ e_ipc_codec_3int_3str_dec(char *data, int bytes, E_Ipc_3Int_3Str **dest)
 }
 
 EAPI void *
-e_ipc_codec_3int_3str_enc(int val1, int val2, int val3, char *str1, char *str2, char *str3, int *size_ret)
+e_ipc_codec_3int_3str_enc(int val1, int val2, int val3, const char *str1, const char *str2, const char *str3, int *size_ret)
 {
    E_Ipc_3Int_3Str dat;
 
    dat.val1 = val1;
    dat.val2 = val2;
    dat.val3 = val3;
-   dat.str1 = str1;
-   dat.str2 = str2;
-   dat.str3 = str3;
+   dat.str1 = (char *) str1;
+   dat.str2 = (char *) str2;
+   dat.str3 = (char *) str3;
    return eet_data_descriptor_encode(_e_ipc_3int_3str_edd, &dat, size_ret);   
 }
 
@@ -634,11 +634,11 @@ e_ipc_codec_str_4int_dec(char *data, int bytes, E_Ipc_Str_4Int **dest)
 }
 
 EAPI void *
-e_ipc_codec_str_4int_enc(char *str1, int val1, int val2, int val3, int val4, int *size_ret)
+e_ipc_codec_str_4int_enc(const char *str1, int val1, int val2, int val3, int val4, int *size_ret)
 {
   E_Ipc_Str_4Int dat;
 
-  dat.str = str1;
+  dat.str = (char *) str1;
   dat.val1 = val1;
   dat.val2 = val2;
   dat.val3 = val3;
diff --git a/src/bin/e_ipc_codec.h b/src/bin/e_ipc_codec.h
index 33010864f..6a8ea1c9b 100644
--- a/src/bin/e_ipc_codec.h
+++ b/src/bin/e_ipc_codec.h
@@ -106,47 +106,47 @@ EAPI int      e_ipc_codec_2int_dec(char *data, int bytes, int *dest, int *dest2x
 EAPI void    *e_ipc_codec_2int_enc(int val1, int val2, int *size_ret);
 
 EAPI int      e_ipc_codec_str_dec(char *data, int bytes, char **dest);
-EAPI void    *e_ipc_codec_str_enc(char *str, int *size_ret);
+EAPI void    *e_ipc_codec_str_enc(const char *str, int *size_ret);
 EAPI int      e_ipc_codec_str_list_dec(char *data, int bytes, Evas_List **dest);
 EAPI void    *e_ipc_codec_str_list_enc(Evas_List *list, int *size_ret);
 
 EAPI int      e_ipc_codec_2str_dec(char *data, int bytes, E_Ipc_2Str **dest);
-EAPI void    *e_ipc_codec_2str_enc(char *str1, char *str2, int *size_ret);
+EAPI void    *e_ipc_codec_2str_enc(const char *str1, const char *str2, int *size_ret);
 EAPI int      e_ipc_codec_2str_list_dec(char *data, int bytes, Evas_List **dest);
 EAPI void    *e_ipc_codec_2str_list_enc(Evas_List *list, int *size_ret);
 
 EAPI int      e_ipc_codec_str_int_dec(char *data, int bytes, E_Ipc_Str_Int **dest);
-EAPI void    *e_ipc_codec_str_int_enc(char *str, int val, int *size_ret);
+EAPI void    *e_ipc_codec_str_int_enc(const char *str, int val, int *size_ret);
 EAPI int      e_ipc_codec_str_int_list_dec(char *data, int bytes, Evas_List **dest);
 EAPI void    *e_ipc_codec_str_int_list_enc(Evas_List *list, int *size_ret);
 
 EAPI int      e_ipc_codec_2str_int_dec(char *data, int bytes, E_Ipc_2Str_Int **dest);
-EAPI void    *e_ipc_codec_2str_int_enc(char *str1, char *str2, int val, int *size_ret);
+EAPI void    *e_ipc_codec_2str_int_enc(const char *str1, const char *str2, int val, int *size_ret);
 EAPI int      e_ipc_codec_2str_int_list_dec(char *data, int bytes, Evas_List **dest);
 EAPI void    *e_ipc_codec_2str_int_list_enc(Evas_List *list, int *size_ret);
 
 EAPI int      e_ipc_codec_4int_2str_dec(char *data, int bytes, E_Ipc_4Int_2Str **dest);
-EAPI void    *e_ipc_codec_4int_2str_enc(int val1, int val2, int val3, int val4, char *str1, char *str2, int *size_ret);
+EAPI void    *e_ipc_codec_4int_2str_enc(int val1, int val2, int val3, int val4, const char *str1, const char *str2, int *size_ret);
 EAPI int      e_ipc_codec_4int_2str_list_dec(char *data, int bytes, Evas_List **dest);
 EAPI void    *e_ipc_codec_4int_2str_list_enc(Evas_List *list, int *size_ret);   
 
 EAPI int      e_ipc_codec_5int_2str_dec(char *data, int bytes, E_Ipc_5Int_2Str **dest);
-EAPI void    *e_ipc_codec_5int_2str_enc(int val1, int val2, int val3, int val4, int val5, char *str1, char *str2, int *size_ret);
+EAPI void    *e_ipc_codec_5int_2str_enc(int val1, int val2, int val3, int val4, int val5, const char *str1, const char *str2, int *size_ret);
 EAPI int      e_ipc_codec_5int_2str_list_dec(char *data, int bytes, Evas_List **dest);
 EAPI void    *e_ipc_codec_5int_2str_list_enc(Evas_List *list, int *size_ret);   
 
 EAPI int      e_ipc_codec_3int_4str_dec(char *data, int bytes, E_Ipc_3Int_4Str **dest);
-EAPI void    *e_ipc_codec_3int_4str_enc(int val1, int val2, int val3, char *str1, char *str2, char *str3, char *str4, int *size_ret);
+EAPI void    *e_ipc_codec_3int_4str_enc(int val1, int val2, int val3, const char *str1, const char *str2, const char *str3, const char *str4, int *size_ret);
 EAPI int      e_ipc_codec_3int_4str_list_dec(char *data, int bytes, Evas_List **dest);
 EAPI void    *e_ipc_codec_3int_4str_list_enc(Evas_List *list, int *size_ret);   
 
 EAPI int      e_ipc_codec_3int_3str_dec(char *data, int bytes, E_Ipc_3Int_3Str **dest);
-EAPI void    *e_ipc_codec_3int_3str_enc(int val1, int val2, int val3, char *str1, char *str2, char *str3, int *size_ret);
+EAPI void    *e_ipc_codec_3int_3str_enc(int val1, int val2, int val3, const char *str1, const char *str2, const char *str3, int *size_ret);
 EAPI int      e_ipc_codec_3int_3str_list_dec(char *data, int bytes, Evas_List **dest);
 EAPI void    *e_ipc_codec_3int_3str_list_enc(Evas_List *list, int *size_ret);   
 
 EAPI int      e_ipc_codec_str_4int_dec(char *data, int bytes, E_Ipc_Str_4Int **dest);
-EAPI void    *e_ipc_codec_str_4int_enc(char *str1, int val1, int val2, int val3, int val4, int *size_ret);
+EAPI void    *e_ipc_codec_str_4int_enc(const char *str1, int val1, int val2, int val3, int val4, int *size_ret);
 EAPI int      e_ipc_codec_str_4int_list_dec(char *data, int bytes, Evas_List **dest);
 EAPI void    *e_ipc_codec_str_4int_list_enc(Evas_List *list, int *size_ret);
 #endif
diff --git a/src/bin/e_ipc_handlers.h b/src/bin/e_ipc_handlers.h
index d5d127f6a..c0c1555b1 100644
--- a/src/bin/e_ipc_handlers.h
+++ b/src/bin/e_ipc_handlers.h
@@ -841,13 +841,29 @@ case HDL: { void *data; int bytes; \
 } \
 break;
 
-#define LIST_DATA() \
+/* 
+   Declare variables used when encoding that needs to first be 
+   constructed into a list using the FOR macro. The list to create
+   will be called 'dat' and the list to iterate will be l;
+ */
+#define LIST_ENCODE_INIT() \
    Evas_List *dat = NULL, *l; \
    void *data; int bytes;
 
+/* 
+   Declare variables used by the encode macro. Is separate to allow
+   operations to be done between declairation and encoding. 
+ */
+#define ENCODE_INIT() \
+   void *data; int bytes;
+
 #define ENCODE(__dat, __enc) \
    data = __enc(__dat, &bytes);
 
+/*
+   Iterate an evas_list starting with the pointer to __start. l 
+   is the pointer to the current position in the list. 
+ */
 #define FOR(__start) \
    for (l = __start; l; l = l->next)
 #define GENERIC(HDL) \
@@ -1036,7 +1052,7 @@ break;
    REQ_NULL(HDL);
 #elif (TYPE == E_WM_IN)
    SEND_STRING_INT_LIST(e_module_list(), E_Module, mod, v, HDL);
-   v->str = mod->name;
+   v->str = (char *) mod->name;
    v->val = mod->enabled;
    END_SEND_STRING_INT_LIST(v, E_IPC_OP_MODULE_LIST_REPLY);
 #elif (TYPE == E_REMOTE_IN)
@@ -1143,7 +1159,7 @@ break;
    REQ_NULL(HDL);
 #elif (TYPE == E_WM_IN)
    GENERIC(HDL);
-   LIST_DATA();
+   LIST_ENCODE_INIT();
    E_Font_Available *fa;
    Evas_List *fa_list;
    fa_list = e_font_available_list();
@@ -1240,7 +1256,7 @@ break;
 #elif (TYPE == E_WM_IN)
    GENERIC(HDL);
 
-   LIST_DATA();
+   LIST_ENCODE_INIT();
    E_Font_Fallback *ff;
    FOR(e_config->font_fallbacks) { ff = l->data;
       dat = evas_list_append(dat, ff->name);
@@ -1365,8 +1381,8 @@ break;
    REQ_NULL(HDL);
 #elif (TYPE == E_WM_IN)
    SEND_STRING2_INT_LIST(e_font_default_list(), E_Font_Default, efd, v, HDL);
-   v->str1 = efd->text_class;
-   v->str2 = efd->font;
+   v->str1 = (char *) efd->text_class;
+   v->str2 = (char *) efd->font;
    v->val  = efd->size;
    END_SEND_STRING2_INT_LIST(v, E_IPC_OP_FONT_DEFAULT_LIST_REPLY);
 #elif (TYPE == E_REMOTE_IN)
@@ -1441,7 +1457,7 @@ break;
    REQ_NULL(HDL);
 #elif (TYPE == E_WM_IN)
    GENERIC(HDL);
-   LIST_DATA();
+   ENCODE_INIT();
    Evas_List *languages;
    languages = e_intl_language_list();
    ENCODE(languages, e_ipc_codec_str_list_enc);
@@ -1535,7 +1551,7 @@ break;
    REQ_STRING(params[0], HDL);
 #elif (TYPE == E_WM_IN)
    STRING(s, HDL);
-   LIST_DATA()
+   LIST_ENCODE_INIT()
    Evas_List *dir_list = NULL;
    E_PATH_GET(path, s);
    if (path)
@@ -2443,8 +2459,8 @@ break;
    SEND_INT4_STRING2_LIST(e_config->mouse_bindings, E_Config_Binding_Mouse, emb, v, HDL);
    v->val1 = emb->context;
    v->val2 = emb->modifiers;
-   v->str1 = emb->action;
-   v->str2 = emb->params;
+   v->str1 = (char *) emb->action;
+   v->str2 = (char *) emb->params;
    v->val3 = emb->button;
    v->val4 = emb->any_mod;
    END_SEND_INT4_STRING2_LIST(v, E_IPC_OP_BINDING_MOUSE_LIST_REPLY);
@@ -2772,9 +2788,9 @@ break;
    v->val1 = ekb->context;
    v->val2 = ekb->modifiers;
    v->val3 = ekb->any_mod;
-   v->str1 = ekb->key;
-   v->str2 = ekb->action;
-   v->str3 = ekb->params;
+   v->str1 = (char *) ekb->key;
+   v->str2 = (char *) ekb->action;
+   v->str3 = (char *) ekb->params;
    END_SEND_INT3_STRING3_LIST(v, E_IPC_OP_BINDING_KEY_LIST_REPLY);
 #elif (TYPE == E_REMOTE_IN)
 #endif
@@ -3538,7 +3554,7 @@ break;
    v->val2 = cfbg->zone;
    v->val3 = cfbg->desk_x;
    v->val4 = cfbg->desk_y;
-   v->str1 = cfbg->file;
+   v->str1 = (char *) cfbg->file;
    v->str2 = "";
    END_SEND_INT4_STRING2_LIST(v, E_IPC_OP_DESKTOP_BG_LIST_REPLY);
 #elif (TYPE == E_REMOTE_IN)
@@ -4746,8 +4762,8 @@ break;
    REQ_NULL(HDL);
 #elif (TYPE == E_WM_IN)
    SEND_STRING2_LIST(e_config->themes, E_Config_Theme, theme, v, HDL);
-   v->str1 = theme->category;
-   v->str2 = theme->file;
+   v->str1 = (char *) theme->category;
+   v->str2 = (char *) theme->file;
    END_SEND_STRING2_LIST(v, E_IPC_OP_THEME_LIST_REPLY);
 #elif (TYPE == E_REMOTE_IN)
 #endif
@@ -5140,7 +5156,7 @@ break;
    REQ_NULL(HDL);
 #elif (TYPE == E_WM_IN)
    GENERIC(HDL);
-   LIST_DATA();
+   ENCODE_INIT();
    Evas_List *profiles;
    profiles = e_config_profile_list();
    ENCODE(profiles, e_ipc_codec_str_list_enc);
@@ -5215,7 +5231,7 @@ break;
    v->val2 = cfname->zone;
    v->val3 = cfname->desk_x;
    v->val4 = cfname->desk_y;
-   v->str1 = cfname->name;
+   v->str1 = (char *) cfname->name;
    v->str2 = "";
    END_SEND_INT4_STRING2_LIST(v, E_IPC_OP_DESKTOP_NAME_LIST_REPLY);
 #elif (TYPE == E_REMOTE_IN)
@@ -5728,7 +5744,7 @@ break;
    REQ_NULL(HDL);
 #elif (TYPE == E_WM_IN)
    GENERIC(HDL);
-   LIST_DATA();
+   ENCODE_INIT();
    Evas_List *iml;
    iml = e_intl_input_method_list();
    ENCODE(iml, e_ipc_codec_str_list_enc);
@@ -5885,12 +5901,12 @@ break;
    /* e_ipc decode request and do action or send reply */
    SEND_INT3_STRING4_LIST(e_config->signal_bindings, E_Config_Binding_Signal, emb, v, HDL);
    v->val1 = emb->context;
-   v->str1 = emb->signal;
-   v->str2 = emb->source;
+   v->str1 = (char *) emb->signal;
+   v->str2 = (char *) emb->source;
    v->val2 = emb->modifiers;
    v->val3 = emb->any_mod;
-   v->str3 = emb->action;
-   v->str4 = emb->params;
+   v->str3 = (char *) emb->action;
+   v->str4 = (char *) emb->params;
    END_SEND_INT3_STRING4_LIST(v, E_IPC_OP_BINDING_SIGNAL_LIST_REPLY);
 #endif
 #undef HDL
@@ -6227,8 +6243,8 @@ break;
    v->val3 = emb->z;
    v->val4 = emb->modifiers;
    v->val5 = emb->any_mod;
-   v->str1 = emb->action;
-   v->str2 = emb->params;
+   v->str1 = (char *) emb->action;
+   v->str2 = (char *) emb->params;
    END_SEND_INT5_STRING2_LIST(v, E_IPC_OP_BINDING_WHEEL_LIST_REPLY);
 #endif
 #undef HDL
@@ -6633,7 +6649,7 @@ break;
    REQ_NULL(HDL);
 #elif (TYPE == E_WM_IN)
    GENERIC(HDL);
-   LIST_DATA();
+   ENCODE_INIT();
    ENCODE(e_theme_category_list(), e_ipc_codec_str_list_enc);
    SEND_DATA(E_IPC_OP_THEME_CATEGORY_LIST_REPLY);
    END_GENERIC();
@@ -6667,7 +6683,7 @@ break;
    REQ_NULL(HDL);
 #elif (TYPE == E_WM_IN)
    GENERIC(HDL);
-   LIST_DATA();
+   ENCODE_INIT();
    ENCODE(e_theme_transition_list(), e_ipc_codec_str_list_enc);
    SEND_DATA(E_IPC_OP_TRANSITION_LIST_REPLY);
    END_GENERIC();
@@ -6701,7 +6717,7 @@ break;
    REQ_NULL(HDL);
 #elif (TYPE == E_WM_IN)
    GENERIC(HDL);
-   LIST_DATA();
+   ENCODE_INIT();
    ENCODE(e_action_name_list(), e_ipc_codec_str_list_enc);
    SEND_DATA(E_IPC_OP_ACTION_LIST_REPLY);
    END_GENERIC();
@@ -6830,7 +6846,7 @@ break;
    REQ_NULL(HDL);
 #elif (TYPE == E_WM_IN)
    GENERIC(HDL);
-   LIST_DATA();
+   ENCODE_INIT();
    Evas_List *engines;
    engines = e_config_engine_list();
    ENCODE(engines, e_ipc_codec_str_list_enc);
@@ -7240,7 +7256,7 @@ break;
    REQ_NULL(HDL);
 #elif (TYPE == E_WM_IN)
    SEND_STRING_INT4_LIST(e_color_class_list(), E_Color_Class, cc, v, HDL);
-   v->str = cc->name;
+   v->str = (char *) cc->name;
    v->val1 = cc->r;
    v->val2 = cc->g;
    v->val3 = cc->b;
@@ -7257,7 +7273,7 @@ break;
    REQ_NULL(HDL);
 #elif (TYPE == E_WM_IN)
    SEND_STRING_INT4_LIST(e_color_class_list(), E_Color_Class, cc, v, HDL);
-   v->str = cc->name;
+   v->str = (char *) cc->name;
    v->val1 = cc->r2;
    v->val2 = cc->g2;
    v->val3 = cc->b2;
@@ -7274,7 +7290,7 @@ break;
    REQ_NULL(HDL);
 #elif (TYPE == E_WM_IN)
    SEND_STRING_INT4_LIST(e_color_class_list(), E_Color_Class, cc, v, HDL);
-   v->str = cc->name;
+   v->str = (char *) cc->name;
    v->val1 = cc->r3;
    v->val2 = cc->g3;
    v->val3 = cc->b3;
@@ -7320,7 +7336,7 @@ break;
    REQ_NULL(HDL);
 #elif (TYPE == E_WM_IN)
    GENERIC(HDL);
-   LIST_DATA();
+   ENCODE_INIT();
    ENCODE(edje_color_class_list(), e_ipc_codec_str_list_enc);
    SEND_DATA(E_IPC_OP_COLOR_CLASS_LIST_REPLY);
    END_GENERIC();
diff --git a/src/bin/e_menu.h b/src/bin/e_menu.h
index 11ebb8be1..0589dbb19 100644
--- a/src/bin/e_menu.h
+++ b/src/bin/e_menu.h
@@ -28,7 +28,7 @@ struct _E_Menu
 {
    E_Object             e_obj_inherit;
    
-   char *		category;
+   const char	       *category;
 
    struct {
       char              visible : 1;
@@ -38,8 +38,8 @@ struct _E_Menu
    int                  frozen;
    
    struct {
-      char             *title;
-      char             *icon_file;
+      const char       *title;
+      const char       *icon_file;
       Evas_Object      *icon;
    } header;
    
@@ -82,9 +82,9 @@ struct _E_Menu_Item
 {
    E_Object       e_obj_inherit;
    E_Menu        *menu;
-   char          *icon;
-   char          *icon_key;
-   char          *label;
+   const char    *icon;
+   const char    *icon_key;
+   const char    *label;
    E_Menu        *submenu;
    
    Evas_Object   *separator_object;
diff --git a/src/bin/e_module.c b/src/bin/e_module.c
index d9fda13d7..261073cad 100644
--- a/src/bin/e_module.c
+++ b/src/bin/e_module.c
@@ -24,7 +24,7 @@ static void _e_module_menu_free(void *obj);
 static void _e_module_control_menu_about(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_module_control_menu_configuration(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_module_control_menu_enabled(void *data, E_Menu *m, E_Menu_Item *mi);
-static void _e_module_dialog_disable_show(char *title, char *body, E_Module *m);
+static void _e_module_dialog_disable_show(const char *title, const char *body, E_Module *m);
 static void _e_module_cb_dialog_disable(void *data, E_Dialog *dia);
 
 /* local subsystem globals */
@@ -84,12 +84,13 @@ e_module_shutdown(void)
 }
 
 EAPI E_Module *
-e_module_new(char *name)
+e_module_new(const char *name)
 {
    E_Module *m;
    char buf[4096];
    char body[4096], title[1024];
-   char *modpath, *s;
+   const char *modpath;
+   char *s;
    Evas_List *l;
    int in_list = 0;
 
@@ -334,7 +335,7 @@ e_module_save_all(void)
 }
 
 EAPI E_Module *
-e_module_find(char *name)
+e_module_find(const char *name)
 {
    Evas_List *l;
    
@@ -403,7 +404,7 @@ e_module_menu_new(void)
 }
 
 EAPI void
-e_module_dialog_show(char *title, char *body)
+e_module_dialog_show(const char *title, const char *body)
 {
    E_Dialog *dia;
 
@@ -548,7 +549,7 @@ _e_module_control_menu_enabled(void *data, E_Menu *m, E_Menu_Item *mi)
 }
 
 static void
-_e_module_dialog_disable_show(char *title, char *body, E_Module *m)
+_e_module_dialog_disable_show(const char *title, const char *body, E_Module *m)
 {
    E_Dialog *dia;
    char buf[4096];
diff --git a/src/bin/e_module.h b/src/bin/e_module.h
index f483ac713..182e57d3f 100644
--- a/src/bin/e_module.h
+++ b/src/bin/e_module.h
@@ -20,8 +20,8 @@ struct _E_Module
 
    E_Module_Api        *api;
    
-   char                *name;
-   char                *dir;
+   const char          *name;
+   const char          *dir;
    void                *handle;
    
    struct {
@@ -57,17 +57,17 @@ struct _E_Module_Api
 EAPI int          e_module_init(void);
 EAPI int          e_module_shutdown(void);
 
-EAPI E_Module    *e_module_new(char *name);
+EAPI E_Module    *e_module_new(const char *name);
 EAPI int          e_module_save(E_Module *m);
 EAPI const char  *e_module_dir_get(E_Module *m);
 EAPI int          e_module_enable(E_Module *m);
 EAPI int          e_module_disable(E_Module *m);
 EAPI int          e_module_enabled_get(E_Module *m);
 EAPI int          e_module_save_all(void);
-EAPI E_Module    *e_module_find(char *name);
+EAPI E_Module    *e_module_find(const char *name);
 EAPI Evas_List   *e_module_list(void);
 EAPI E_Menu      *e_module_menu_new(void);
-EAPI void         e_module_dialog_show(char *title, char *body);
+EAPI void         e_module_dialog_show(const char *title, const char *body);
 
 #endif
 #endif
diff --git a/src/bin/e_msg.c b/src/bin/e_msg.c
index e968dc3e5..1377de28f 100644
--- a/src/bin/e_msg.c
+++ b/src/bin/e_msg.c
@@ -7,15 +7,15 @@ typedef struct _E_Msg_Event E_Msg_Event;
 
 struct _E_Msg_Handler
 {
-   void (*func) (void *data, char *name, char *info, int val, E_Object *obj);
+   void (*func) (void *data, const char *name, const char *info, int val, E_Object *obj);
    void *data;
    unsigned char delete_me : 1;
 };
 
 struct _E_Msg_Event
 {
-   char *name;
-   char *info;
+   const char *name;
+   const char *info;
    int   val;
    E_Object *obj;
 };
@@ -51,7 +51,7 @@ e_msg_shutdown(void)
 }
 
 EAPI void
-e_msg_send(char *name, char *info, int val, E_Object *obj)
+e_msg_send(const char *name, const char *info, int val, E_Object *obj)
 {
    E_Msg_Event *ev;
    
@@ -67,7 +67,7 @@ e_msg_send(char *name, char *info, int val, E_Object *obj)
 }
 
 EAPI E_Msg_Handler *
-e_msg_handler_add(void (*func) (void *data, char *name, char *info, int val, E_Object *obj), void *data)
+e_msg_handler_add(void (*func) (void *data, const char *name, const char *info, int val, E_Object *obj), void *data)
 {
    E_Msg_Handler *emsgh;
    
diff --git a/src/bin/e_msg.h b/src/bin/e_msg.h
index 494d32d7e..1d564149d 100644
--- a/src/bin/e_msg.h
+++ b/src/bin/e_msg.h
@@ -12,8 +12,8 @@ typedef struct _E_Msg_Handler E_Msg_Handler;
 EAPI int            e_msg_init(void);
 EAPI int            e_msg_shutdown(void);
 
-EAPI void           e_msg_send(char *name, char *info, int val, E_Object *obj);
-EAPI E_Msg_Handler *e_msg_handler_add(void (*func) (void *data, char *name, char *info, int val, E_Object *obj), void *data);
+EAPI void           e_msg_send(const char *name, const char *info, int val, E_Object *obj);
+EAPI E_Msg_Handler *e_msg_handler_add(void (*func) (void *data, const char *name, const char *info, int val, E_Object *obj), void *data);
 EAPI void           e_msg_handler_del(E_Msg_Handler *emsgh);
 
 #endif
diff --git a/src/bin/e_path.c b/src/bin/e_path.c
index 50b437509..6b181ad07 100644
--- a/src/bin/e_path.c
+++ b/src/bin/e_path.c
@@ -249,7 +249,7 @@ e_path_user_path_remove(E_Path *ep, const char *path)
      }
 }
 
-EAPI char *
+EAPI const char *
 e_path_find(E_Path *ep, const char *file)
 {
    Evas_List *l;
diff --git a/src/bin/e_path.h b/src/bin/e_path.h
index a2a1a6f77..4ecbf4c14 100644
--- a/src/bin/e_path.h
+++ b/src/bin/e_path.h
@@ -14,7 +14,7 @@ typedef struct _E_Path_Dir E_Path_Dir;
 
 struct _E_Path_Dir
 {
-   char * dir;
+   const char * dir;
 };
 
 struct _E_Path
@@ -38,7 +38,7 @@ EAPI void        e_path_default_path_append(E_Path *ep, const char *path);
 EAPI void        e_path_user_path_append(E_Path *ep, const char *path);
 EAPI void        e_path_user_path_prepend(E_Path *ep, const char *path);
 EAPI void        e_path_user_path_remove(E_Path *ep, const char *path);
-EAPI char       *e_path_find(E_Path *ep, const char *file); /* for conveience this doesnt return a malloc'd string. it's a static buffer, so a new call will replace this buffer, but thsi means there is no need to free the return */
+EAPI const char *e_path_find(E_Path *ep, const char *file); 
 EAPI void        e_path_evas_append(E_Path *ep, Evas *evas);
 EAPI Evas_List  *e_path_dir_list_get(E_Path *ep);
 EAPI void	 e_path_dir_list_free(Evas_List *dir_list);
diff --git a/src/bin/e_pointer.c b/src/bin/e_pointer.c
index 3621e7709..1dda9bcbc 100644
--- a/src/bin/e_pointer.c
+++ b/src/bin/e_pointer.c
@@ -14,7 +14,7 @@ typedef struct _E_Pointer_Stack E_Pointer_Stack;
 struct _E_Pointer_Stack
 {
    void          *obj;
-   char          *type;
+   const char    *type;
    unsigned char  e_cursor : 1;
 };
 
@@ -165,7 +165,7 @@ e_pointers_size_set(int size)
 	  }
 	else
 	  {
-	     char *type;
+	     const char *type;
 
 	     ecore_x_cursor_size_set(e_config->cursor_size * 3 / 4);
 	     type = p->type;
diff --git a/src/bin/e_pointer.h b/src/bin/e_pointer.h
index e1610a4df..9552af1a3 100644
--- a/src/bin/e_pointer.h
+++ b/src/bin/e_pointer.h
@@ -25,7 +25,7 @@ struct _E_Pointer
    Ecore_X_Window    win;
    int               w, h;
 
-   char             *type;
+   const char       *type;
    void             *obj;
    Evas_List        *stack;
 
diff --git a/src/bin/e_remember.c b/src/bin/e_remember.c
index b2f9d0665..eb76f80e0 100644
--- a/src/bin/e_remember.c
+++ b/src/bin/e_remember.c
@@ -104,7 +104,7 @@ e_remember_find(E_Border *bd)
 	E_Remember *rem;
 	int required_matches;
 	int matches;
-	char *title = "";
+	const char *title = "";
 	
 	rem = l->data;
 	matches = 0;
diff --git a/src/bin/e_remember.h b/src/bin/e_remember.h
index 52dff59be..03050b8b5 100644
--- a/src/bin/e_remember.h
+++ b/src/bin/e_remember.h
@@ -34,7 +34,10 @@ struct _E_Remember
    int            match;
    unsigned char  apply_first_only;
    int            used_count;
-   char          *name, *class, *title, *role;
+   const char    *name;
+   const char    *class;
+   const char    *title;
+   const char    *role;
    int            type;
    unsigned char  transient;
    int            apply;
@@ -71,7 +74,7 @@ struct _E_Remember
       unsigned char lock_focus_out; 
       unsigned char lock_life;
       
-      char         *border;
+      const char   *border;
       
       unsigned char sticky;
       
diff --git a/src/bin/e_shelf.c b/src/bin/e_shelf.c
index 0919d0f7a..04a7ac867 100644
--- a/src/bin/e_shelf.c
+++ b/src/bin/e_shelf.c
@@ -105,7 +105,7 @@ e_shelf_config_init(void)
 }
 
 EAPI E_Shelf *
-e_shelf_zone_new(E_Zone *zone, char *name, char *style, int popup, int layer)
+e_shelf_zone_new(E_Zone *zone, const char *name, const char *style, int popup, int layer)
 {
    E_Shelf *es;
    char buf[1024];
diff --git a/src/bin/e_shelf.h b/src/bin/e_shelf.h
index e3737c73c..6d919417d 100644
--- a/src/bin/e_shelf.h
+++ b/src/bin/e_shelf.h
@@ -22,15 +22,15 @@ struct _E_Shelf
    Ecore_Evas          *ee;
    Evas                *evas;
    E_Gadcon            *gadcon;
-   char                *name;
-   char                *style;
+   const char          *name;
+   const char          *style;
    E_Config_Shelf      *cfg;
 };
 
 EAPI int              e_shelf_init(void);
 EAPI int              e_shelf_shutdown(void);
 EAPI void             e_shelf_config_init(void);
-EAPI E_Shelf         *e_shelf_zone_new(E_Zone *zone, char *name, char *style, int popup, int layer);
+EAPI E_Shelf         *e_shelf_zone_new(E_Zone *zone, const char *name, const char *style, int popup, int layer);
 EAPI void             e_shelf_populate(E_Shelf *es);
 EAPI void             e_shelf_show(E_Shelf *es);
 EAPI void             e_shelf_hide(E_Shelf *es);
diff --git a/src/bin/e_slider.c b/src/bin/e_slider.c
index 465de26ce..059a148e3 100644
--- a/src/bin/e_slider.c
+++ b/src/bin/e_slider.c
@@ -16,7 +16,7 @@ struct _E_Smart_Data
    Evas_Object   *edje_obj;
    double         val, val_min, val_max, step_size;
    int            reversed, step_count, horizontal;
-   char          *format;
+   const char    *format;
    Evas_Coord     minw, minh;
    Ecore_Timer   *set_timer;
 };
diff --git a/src/bin/e_theme.c b/src/bin/e_theme.c
index b576a2b87..7922b7e4d 100644
--- a/src/bin/e_theme.c
+++ b/src/bin/e_theme.c
@@ -8,8 +8,8 @@ typedef struct _E_Theme_Result E_Theme_Result;
 
 struct _E_Theme_Result
 {
-   char *file;
-   char *cache;
+   const char *file;
+   const char *cache;
 };
 
 static Evas_Bool _e_theme_mappings_free_cb(Evas_Hash *hash, const char *key, void *data, void *fdata);
@@ -122,7 +122,7 @@ e_theme_shutdown(void)
 }
 
 EAPI int
-e_theme_edje_object_set(Evas_Object *o, char *category, char *group)
+e_theme_edje_object_set(Evas_Object *o, const char *category, const char *group)
 {
    E_Theme_Result *res;
    char buf[256];
@@ -133,7 +133,7 @@ e_theme_edje_object_set(Evas_Object *o, char *category, char *group)
    res = evas_hash_find(mappings, category);
    if (res)
      {
-	char *str;
+	const char *str;
 	
 	/* if found check cached path */
 	str = res->cache;
@@ -188,7 +188,7 @@ e_theme_edje_object_set(Evas_Object *o, char *category, char *group)
 }
 
 EAPI const char *
-e_theme_edje_file_get(char *category, char *group)
+e_theme_edje_file_get(const char *category, const char *group)
 {
    E_Theme_Result *res;
    char buf[4096];
@@ -199,7 +199,7 @@ e_theme_edje_file_get(char *category, char *group)
    res = evas_hash_find(mappings, category);
    if (res)
      {
-	char *str;
+	const char *str;
 	
 	/* if found check cached path */
 	str = res->cache;
@@ -261,7 +261,7 @@ e_theme_edje_file_get(char *category, char *group)
 }
 
 EAPI void
-e_theme_file_set(char *category, char *file)
+e_theme_file_set(const char *category, const char *file)
 {
    E_Theme_Result *res;
 
@@ -480,7 +480,7 @@ _e_theme_collection_items_find(const char *base, const char *collname)
 	res = evas_hash_find(mappings, category);
 	if (res)
 	  {
-	     char *str;
+	     const char *str;
 	     
 	     /* if found check cached path */
 	     str = res->cache;
diff --git a/src/bin/e_theme.h b/src/bin/e_theme.h
index 838acc6c2..31839cfd0 100644
--- a/src/bin/e_theme.h
+++ b/src/bin/e_theme.h
@@ -9,9 +9,9 @@
 EAPI int         e_theme_init(void);
 EAPI int         e_theme_shutdown(void);
 
-EAPI int         e_theme_edje_object_set(Evas_Object *o, char *category, char *group);
-EAPI const char *e_theme_edje_file_get(char *category, char *group);
-EAPI void        e_theme_file_set(char *category, char *file);
+EAPI int         e_theme_edje_object_set(Evas_Object *o, const char *category, const char *group);
+EAPI const char *e_theme_edje_file_get(const char *category, const char *group);
+EAPI void        e_theme_file_set(const char *category, const char *file);
 
 EAPI int             e_theme_config_set(const char *category, const char *file);
 EAPI E_Config_Theme *e_theme_config_get(const char *category);
diff --git a/src/bin/e_thumb.c b/src/bin/e_thumb.c
index 34c8ef0b3..788ea5d4e 100644
--- a/src/bin/e_thumb.c
+++ b/src/bin/e_thumb.c
@@ -153,7 +153,6 @@ e_thumb_geometry_get(char *file, int *w, int *h, int from_eet)
 	eet_file = _e_thumb_file_id(file);
 	if(!eet_file)
 	  {
-	     eet_close(ef);	     
 	     if(w) *w = -1;
 	     if(h) *h = -1;
 	     return;
diff --git a/src/bin/e_utils.c b/src/bin/e_utils.c
index 3e2a5bf85..b9a90c072 100644
--- a/src/bin/e_utils.c
+++ b/src/bin/e_utils.c
@@ -190,7 +190,7 @@ e_util_container_zone_number_get(int con_num, int zone_num)
 }
 
 EAPI int
-e_util_head_exec(int head, char *cmd)
+e_util_head_exec(int head, const char *cmd)
 {
    char *penv_display;
    char *p1, *p2;
@@ -244,7 +244,7 @@ e_util_head_exec(int head, char *cmd)
 }
 
 EAPI int
-e_util_strcmp(char *s1, char *s2)
+e_util_strcmp(const char *s1, const char *s2)
 {
    if ((s1) && (s2))
      return strcmp(s1, s2);
@@ -252,7 +252,7 @@ e_util_strcmp(char *s1, char *s2)
 }
 
 EAPI int
-e_util_both_str_empty(char *s1, char *s2)
+e_util_both_str_empty(const char *s1, const char *s2)
 {
    int empty = 0;
    
@@ -285,10 +285,11 @@ e_util_immortal_check(void)
 }
 
 EAPI int
-e_util_edje_icon_list_set(Evas_Object *obj, char *list)
+e_util_edje_icon_list_set(Evas_Object *obj, const char *list)
 {
    char *buf;
-   char *p, *c;
+   const char *p;
+   const char *c;
    
    if ((!list) || (!list[0])) return 0;
    buf = alloca(strlen(list) + 1);
@@ -315,10 +316,11 @@ e_util_edje_icon_list_set(Evas_Object *obj, char *list)
 }
 
 EAPI int
-e_util_menu_item_edje_icon_list_set(E_Menu_Item *mi, char *list)
+e_util_menu_item_edje_icon_list_set(E_Menu_Item *mi, const char *list)
 {
    char *buf;
-   char *p, *c;
+   const char *p;
+   char *c;
    
    if ((!list) || (!list[0])) return 0;
    buf = alloca(strlen(list) + 1);
@@ -345,7 +347,7 @@ e_util_menu_item_edje_icon_list_set(E_Menu_Item *mi, char *list)
 }
 
 EAPI int
-e_util_edje_icon_set(Evas_Object *obj, char *name)
+e_util_edje_icon_set(Evas_Object *obj, const char *name)
 {
    char *file;
    char buf[4096];
@@ -362,7 +364,7 @@ e_util_edje_icon_set(Evas_Object *obj, char *name)
 }
 
 EAPI int
-e_util_menu_item_edje_icon_set(E_Menu_Item *mi, char *name)
+e_util_menu_item_edje_icon_set(E_Menu_Item *mi, const char *name)
 {
    char *file;
    char buf[4096];
@@ -492,7 +494,7 @@ e_util_desk_border_below(E_Border *bd)
 }
 
 EAPI int
-e_util_edje_collection_exists(char *file, char *coll)
+e_util_edje_collection_exists(const char *file, const char *coll)
 {
    Evas_List *clist, *l;
    
@@ -510,7 +512,7 @@ e_util_edje_collection_exists(char *file, char *coll)
 }
 
 EAPI void
-e_util_dialog_internal(char *title, char *txt)
+e_util_dialog_internal(const char *title, const char *txt)
 {
    E_Dialog *dia;
    
diff --git a/src/bin/e_utils.h b/src/bin/e_utils.h
index c42759271..705c82dd8 100644
--- a/src/bin/e_utils.h
+++ b/src/bin/e_utils.h
@@ -26,19 +26,19 @@ EAPI int          e_util_glob_match(const char *str, const char *glob);
 EAPI int          e_util_glob_case_match(const char *str, const char *glob);
 EAPI E_Container *e_util_container_number_get(int num);
 EAPI E_Zone      *e_util_container_zone_number_get(int con_num, int zone_num);
-EAPI int          e_util_head_exec(int head, char *cmd);
-EAPI int          e_util_strcmp(char *s1, char *s2);    
-EAPI int          e_util_both_str_empty(char *s1, char *s2);
+EAPI int          e_util_head_exec(int head, const char *cmd);
+EAPI int          e_util_strcmp(const char *s1, const char *s2);    
+EAPI int          e_util_both_str_empty(const char *s1, const char *s2);
 EAPI int          e_util_immortal_check(void);
-EAPI int          e_util_edje_icon_list_set(Evas_Object *obj, char *list);
-EAPI int          e_util_menu_item_edje_icon_list_set(E_Menu_Item *mi, char *list);
-EAPI int          e_util_edje_icon_set(Evas_Object *obj, char *name);
-EAPI int          e_util_menu_item_edje_icon_set(E_Menu_Item *mi, char *name);
+EAPI int          e_util_edje_icon_list_set(Evas_Object *obj, const char *list);
+EAPI int          e_util_menu_item_edje_icon_list_set(E_Menu_Item *mi, const char *list);
+EAPI int          e_util_edje_icon_set(Evas_Object *obj, const char *name);
+EAPI int          e_util_menu_item_edje_icon_set(E_Menu_Item *mi, const char *name);
 EAPI E_Container *e_util_container_window_find(Ecore_X_Window win);
 EAPI E_Border    *e_util_desk_border_above(E_Border *bd);
 EAPI E_Border    *e_util_desk_border_below(E_Border *bd);
-EAPI int          e_util_edje_collection_exists(char *file, char *coll);
-EAPI void         e_util_dialog_internal(char *title, char *txt);
+EAPI int          e_util_edje_collection_exists(const char *file, const char *coll);
+EAPI void         e_util_dialog_internal(const char *title, const char *txt);
     
 #endif
 #endif
diff --git a/src/bin/e_widget_button.c b/src/bin/e_widget_button.c
index b32838513..08aa0195f 100644
--- a/src/bin/e_widget_button.c
+++ b/src/bin/e_widget_button.c
@@ -23,7 +23,7 @@ static void _e_wid_focus_steal(void *data, Evas *e, Evas_Object *obj, void *even
 
 /* externally accessible functions */
 EAPI Evas_Object *
-e_widget_button_add(Evas *evas, char *label, char *icon, void (*func) (void *data, void *data2), void *data, void *data2)
+e_widget_button_add(Evas *evas, const char *label, const char *icon, void (*func) (void *data, void *data2), void *data, void *data2)
 {
    Evas_Object *obj, *o;
    E_Widget_Data *wd;
diff --git a/src/bin/e_widget_button.h b/src/bin/e_widget_button.h
index 823764e8f..d57e2254f 100644
--- a/src/bin/e_widget_button.h
+++ b/src/bin/e_widget_button.h
@@ -6,7 +6,7 @@
 #ifndef E_WIDGET_BUTTON_H
 #define E_WIDGET_BUTTON_H
 
-EAPI Evas_Object *e_widget_button_add(Evas *evas, char *label, char *icon, void (*func) (void *data, void *data2), void *data, void *data2);
+EAPI Evas_Object *e_widget_button_add(Evas *evas, const char *label, const char *icon, void (*func) (void *data, void *data2), void *data, void *data2);
 
 #endif
 #endif
diff --git a/src/bin/e_widget_textblock.c b/src/bin/e_widget_textblock.c
index 59d6dfe6d..5daf80b47 100644
--- a/src/bin/e_widget_textblock.c
+++ b/src/bin/e_widget_textblock.c
@@ -67,7 +67,9 @@ e_widget_textblock_markup_set(Evas_Object *obj, const char *text)
 EAPI void
 e_widget_textblock_plain_set(Evas_Object *obj, const char *text)
 {
-   char *markup, *p, *d;
+   char *markup;
+   char *d;
+   const char *p; 
    int mlen;
 
    if (!text)
diff --git a/src/bin/e_win.c b/src/bin/e_win.c
index dd58a17b9..8ca0567f4 100644
--- a/src/bin/e_win.c
+++ b/src/bin/e_win.c
@@ -303,7 +303,7 @@ e_win_step_set(E_Win *win, int x, int y)
 }
 
 EAPI void
-e_win_name_class_set(E_Win *win, char *name, char *class)
+e_win_name_class_set(E_Win *win, const char *name, const char *class)
 {
    E_OBJECT_CHECK(win);
    E_OBJECT_TYPE_CHECK(win, E_WIN_TYPE);
@@ -311,7 +311,7 @@ e_win_name_class_set(E_Win *win, char *name, char *class)
 }
 
 EAPI void
-e_win_title_set(E_Win *win, char *title)
+e_win_title_set(E_Win *win, const char *title)
 {
    E_OBJECT_CHECK(win);
    E_OBJECT_TYPE_CHECK(win, E_WIN_TYPE);
diff --git a/src/bin/e_win.h b/src/bin/e_win.h
index 9702e6afe..4938d0803 100644
--- a/src/bin/e_win.h
+++ b/src/bin/e_win.h
@@ -62,8 +62,8 @@ EAPI void   e_win_size_min_set       (E_Win *win, int w, int h);
 EAPI void   e_win_size_max_set       (E_Win *win, int w, int h);
 EAPI void   e_win_size_base_set      (E_Win *win, int w, int h);
 EAPI void   e_win_step_set           (E_Win *win, int x, int y);
-EAPI void   e_win_name_class_set     (E_Win *win, char *name, char *class);
-EAPI void   e_win_title_set          (E_Win *win, char *title);
+EAPI void   e_win_name_class_set     (E_Win *win, const char *name, const char *class);
+EAPI void   e_win_title_set          (E_Win *win, const char *title);
 
 EAPI void   e_win_centered_set       (E_Win *win, int centered);
 EAPI void   e_win_dialog_set         (E_Win *win, int dialog);
diff --git a/src/bin/e_zone.h b/src/bin/e_zone.h
index 69c8349da..d70d566ce 100644
--- a/src/bin/e_zone.h
+++ b/src/bin/e_zone.h
@@ -20,7 +20,7 @@ struct _E_Zone
    E_Object             e_obj_inherit;
 
    int                  x, y, w, h;
-   char                *name;
+   const char          *name;
    /* num matches the id of the xinerama screen
     * this zone belongs to. */
    unsigned int         num;