diff --git a/elm_code/bin/elm_code_test_main.c b/elm_code/bin/elm_code_test_main.c
index b462ef0..7180eb7 100644
--- a/elm_code/bin/elm_code_test_main.c
+++ b/elm_code/bin/elm_code_test_main.c
@@ -84,10 +84,12 @@ return obj;
 static Evas_Object *
 _elm_code_test_diff_setup(Evas_Object *parent)
 {
-   char *path = "elm_code/tests/testdiff.diff";
+   char path[PATH_MAX];
    Evas_Object *diff;
    Elm_Code *code;
 
+   snprintf(path, sizeof(path), "%s/../edi/data/testdiff.diff", elm_app_data_dir_get());
+
    code = elm_code_create();
    elm_code_file_open(code, path);
 
diff --git a/elm_code/tests/Makefile.am b/elm_code/tests/Makefile.am
index d1edb30..2f63f38 100644
--- a/elm_code/tests/Makefile.am
+++ b/elm_code/tests/Makefile.am
@@ -23,4 +23,7 @@ elm_code_suite_DEPENDENCIES = $(top_builddir)/elm_code/lib/libelm_code.la
 
 endif
 
-EXTRA_DIST = elm_code_suite.h
+testdir = $(datadir)/$(PACKAGE)/data
+test_DATA = testdiff.diff
+
+EXTRA_DIST = elm_code_suite.h $(test_DATA)
diff --git a/src/bin/edi_content_provider.c b/src/bin/edi_content_provider.c
index 80025ba..fdf5958 100644
--- a/src/bin/edi_content_provider.c
+++ b/src/bin/edi_content_provider.c
@@ -47,7 +47,7 @@ _edi_content_provider_diff_add(Evas_Object *parent, Edi_Mainview_Item *item)
 
 static Edi_Content_Provider _edi_content_provider_registry[] =
 {
-   {"text", EINA_TRUE, EINA_TRUE, edi_editor_add},
+   {"text", EINA_TRUE, EINA_TRUE, _edi_editor_add},
    {"image", EINA_FALSE, EINA_FALSE, _edi_content_provider_image_add},
    {"diff", EINA_TRUE, EINA_FALSE, _edi_content_provider_diff_add},
 
@@ -60,7 +60,8 @@ EAPI Edi_Content_Provider *edi_content_provider_for_mime_get(const char *mime)
 
    if (!strcasecmp(mime, "text/plain") || !strcasecmp(mime, "application/x-shellscript"))
      id = "text";
-   else if (!strcasecmp(mime, "text/x-chdr") || !strcasecmp(mime, "text/x-csrc"))
+   else if (!strcasecmp(mime, "text/x-chdr") || !strcasecmp(mime, "text/x-csrc")
+            || !strcasecmp(mime, "text/x-modelica"))
      id = "text"; // TODO make a code view
    else if (!strncasecmp(mime, "image/", 6))
      id = "image";
diff --git a/src/bin/edi_main.c b/src/bin/edi_main.c
index 4024074..43388eb 100644
--- a/src/bin/edi_main.c
+++ b/src/bin/edi_main.c
@@ -670,7 +670,7 @@ edi_toolbar_setup(Evas_Object *win)
    tb_it = elm_toolbar_item_append(tb, "separator", "", NULL, NULL);
    elm_toolbar_item_separator_set(tb_it, EINA_TRUE);
 
-   tb_it = elm_toolbar_item_append(tb, "find", "Find", _tb_search_cb, NULL);
+   tb_it = elm_toolbar_item_append(tb, "find", "Find & Replace", _tb_search_cb, NULL);
    tb_it = elm_toolbar_item_append(tb, "go-jump", "Goto Line", _tb_goto_cb, NULL);
 
    tb_it = elm_toolbar_item_append(tb, "separator", "", NULL, NULL);
diff --git a/src/bin/editor/edi_editor.c b/src/bin/editor/edi_editor.c
index 32b5899..adb264f 100644
--- a/src/bin/editor/edi_editor.c
+++ b/src/bin/editor/edi_editor.c
@@ -695,7 +695,7 @@ _text_set_done(void *data, Evas_Object *obj EINA_UNUSED, void *source EINA_UNUSE
    _reset_highlight(editor);
 }
 
-EAPI Evas_Object *edi_editor_add(Evas_Object *parent, Edi_Mainview_Item *item)
+EAPI Evas_Object *_edi_editor_add(Evas_Object *parent, Edi_Mainview_Item *item)
 {
    Evas_Object *txt, *lines, *vbox, *box, *searchbar, *statusbar;
    Evas_Modifier_Mask ctrl, shift, alt;
@@ -764,7 +764,7 @@ EAPI Evas_Object *edi_editor_add(Evas_Object *parent, Edi_Mainview_Item *item)
    elm_box_pack_end(box, txt);
 
 
-   edi_editor_search_add(searchbar, editor);
+   _edi_editor_search_add(searchbar, editor);
    _edi_editor_statusbar_add(statusbar, editor, item);
 
    e = evas_object_evas_get(txt);
diff --git a/src/bin/editor/edi_editor.h b/src/bin/editor/edi_editor.h
index bd649bc..24daed7 100644
--- a/src/bin/editor/edi_editor.h
+++ b/src/bin/editor/edi_editor.h
@@ -75,7 +75,7 @@ struct _Edi_Editor
  *
  * @ingroup Editor
  */
-EAPI Evas_Object *edi_editor_add(Evas_Object *parent, Edi_Mainview_Item *item);
+EAPI Evas_Object *_edi_editor_add(Evas_Object *parent, Edi_Mainview_Item *item);
 
 /**
  * @}
@@ -95,7 +95,7 @@ EAPI Evas_Object *edi_editor_add(Evas_Object *parent, Edi_Mainview_Item *item);
  *
  * @ingroup Widgets
  */
-EAPI void edi_editor_search_add(Evas_Object *parent, Edi_Editor *editor);
+EAPI void _edi_editor_search_add(Evas_Object *parent, Edi_Editor *editor);
 
 /**
  * Start a search in the specified editor.
@@ -104,7 +104,7 @@ EAPI void edi_editor_search_add(Evas_Object *parent, Edi_Editor *editor);
  *
  * @ingroup Widgets
  */
-EAPI void edi_editor_search(Edi_Editor *editor);
+EAPI void _edi_editor_search(Edi_Editor *editor);
 
 /**
  * @}
diff --git a/src/bin/editor/edi_editor_search.c b/src/bin/editor/edi_editor_search.c
index fe0f639..7b15bb2 100644
--- a/src/bin/editor/edi_editor_search.c
+++ b/src/bin/editor/edi_editor_search.c
@@ -3,9 +3,11 @@
 #endif
 
 /*
- * Search for text within an entry based on what is entered into a search dialog
+ * Search for, and possibly replace, text within an entry based on what is entered into 
+ * the search and replace entry boxes.
  *
  * Based largely on code in Ecrire by Tom Hacohen <tom@stosb.com>
+ * Replace added by Kelly Wilson
  */
 
 #include <Elementary.h>
@@ -25,11 +27,15 @@ struct _Edi_Editor_Search
    Evas_Object *parent; /**< The parent panel we will insert into */
    Evas_Textblock_Cursor *current_search; /**< The current search cursor for this session */
 
+   Eina_Bool term_found;
+   Evas_Object *replace_entry; /**< The replace text widget */
+   Evas_Object *replace_btn; /**< The replace button for our search */
+
    /* Add new members here. */
 };
 
 static Eina_Bool
-_search_in_entry(Evas_Object *entry, Edi_Editor_Search *search)
+_edi_search_in_entry(Evas_Object *entry, Edi_Editor_Search *search)
 {
    Eina_Bool try_next = EINA_FALSE;
    const char *found, *text;
@@ -41,7 +47,10 @@ _search_in_entry(Evas_Object *entry, Edi_Editor_Search *search)
 
    text = elm_object_text_get(search->entry);
    if (!text || !*text)
-      return EINA_FALSE;
+     {
+        search->term_found = EINA_FALSE;
+        return EINA_FALSE;
+     }
 
    mcur = (Evas_Textblock_Cursor *) evas_object_textblock_cursor_get(tb);
    if (!search->current_search)
@@ -63,7 +72,10 @@ _search_in_entry(Evas_Object *entry, Edi_Editor_Search *search)
          EVAS_TEXTBLOCK_TEXT_PLAIN);
 
    if (!utf8)
-      return EINA_FALSE;
+     {
+        search->term_found = EINA_FALSE;
+        return EINA_FALSE;
+     }
 
    if (try_next)
      {
@@ -78,6 +90,7 @@ _search_in_entry(Evas_Object *entry, Edi_Editor_Search *search)
         found = strstr(utf8, text);
      }
 
+   search->term_found = !!found;
    elm_entry_select_none(entry);
    if (found)
      {
@@ -107,6 +120,48 @@ _search_in_entry(Evas_Object *entry, Edi_Editor_Search *search)
    return !!found;
 }
 
+static void
+_edi_replace_entry_changed(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+   Edi_Editor *editor;
+   Edi_Editor_Search *replace;
+
+   editor = (Edi_Editor *)data;
+   replace = editor->search;
+
+   if (!elm_entry_is_empty(replace->replace_entry))
+     elm_object_disabled_set(replace->replace_btn, EINA_FALSE);
+   else
+     elm_object_disabled_set(replace->replace_btn, EINA_TRUE);
+
+   return;
+}
+
+static void
+_edi_replace_in_entry(void *data, Edi_Editor_Search *search)
+{
+   Edi_Editor *editor;
+   editor = (Edi_Editor *)data;
+
+   // If there is no search term found to replace, then do a new search first.
+   if (search && !search->term_found)
+     _edi_search_in_entry(editor->entry, search);
+
+   // If we found a matching searched term the go ahead and replace it if appropriate.
+   if (search->term_found)
+     {
+        if (search->current_search)
+          {
+             elm_entry_entry_insert(editor->entry, elm_object_text_get(search->replace_entry));
+             evas_textblock_cursor_free(search->current_search);
+             search->current_search = NULL;
+          }
+        _edi_search_in_entry(editor->entry, search);
+     }
+
+   return;
+}
+
 static void
 _edi_editor_search_hide(Edi_Editor *editor)
 {
@@ -116,6 +171,7 @@ _edi_editor_search_hide(Edi_Editor *editor)
    if (!search)
      return;
 
+   search->term_found = EINA_FALSE;
    if (eina_list_data_find(elm_box_children_get(search->parent), search->widget))
      {
         evas_object_hide(search->widget);
@@ -126,25 +182,36 @@ _edi_editor_search_hide(Edi_Editor *editor)
      evas_textblock_cursor_free(search->current_search);
    search->current_search = NULL;
    elm_entry_select_none(editor->entry);
+
+   // Re-focus in the editor proper since we are closing the search bar here
+   elm_object_focus_set(editor->entry, EINA_TRUE);
 }
 
 EAPI void
-edi_editor_search(Edi_Editor *editor)
+_edi_editor_search(Edi_Editor *editor)
 {
    Edi_Editor_Search *search;
 
    search = editor->search;
+   search->term_found = EINA_FALSE;
    if (search && !eina_list_data_find(elm_box_children_get(search->parent), search->widget))
      {
         evas_object_show(search->widget);
         elm_box_pack_end(search->parent, search->widget);
+
+        // Check if there is already data in the replace entry. Enable the replace
+        // button as appropriate
+        if (!elm_entry_is_empty(search->replace_entry))
+          elm_object_disabled_set(search->replace_btn, EINA_FALSE);
+        else
+          elm_object_disabled_set(search->replace_btn, EINA_TRUE);
      }
 
    elm_object_focus_set(search->entry, EINA_TRUE);
 }
 
 static void
-_search_clicked(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
+_edi_search_clicked(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Edi_Editor *editor;
    Edi_Editor_Search *search;
@@ -153,17 +220,30 @@ _search_clicked(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_
    search = editor->search;
 
    if (search)
-      _search_in_entry(editor->entry, search);
+     _edi_search_in_entry(editor->entry, search);
 }
 
 static void
-_cancel_clicked(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
+_edi_replace_clicked(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+   Edi_Editor *editor;
+   Edi_Editor_Search *replace;
+
+   editor = (Edi_Editor *)data;
+   replace = editor->search;
+
+   if (replace)
+     _edi_replace_in_entry(data, replace);
+}
+
+static void
+_edi_cancel_clicked(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    _edi_editor_search_hide((Edi_Editor *)data);
 }
 
 static void
-_search_key_up_cb(void *data , Evas *e EINA_UNUSED, Evas_Object *obj,
+_edi_search_key_up_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj,
                   void *event_info)
 {
    Edi_Editor *editor;
@@ -174,12 +254,13 @@ _search_key_up_cb(void *data , Evas *e EINA_UNUSED, Evas_Object *obj,
    editor = (Edi_Editor *)data;
    search = editor->search;
 
+   search->term_found = EINA_TRUE;
    str = elm_object_text_get(obj);
 
    if (strlen(str) && (!strcmp(ev->key, "KP_Enter") || !strcmp(ev->key, "Return")))
-     _search_clicked(data, NULL, NULL);
+     _edi_search_clicked(data, NULL, NULL);
    else if (!strcmp(ev->key, "Escape"))
-     _cancel_clicked(data, NULL, NULL);
+     _edi_cancel_clicked(data, NULL, NULL);
    else
      {
         if (search->current_search)
@@ -188,27 +269,34 @@ _search_key_up_cb(void *data , Evas *e EINA_UNUSED, Evas_Object *obj,
      }
 }
 
-
 EAPI void
-edi_editor_search_add(Evas_Object *parent, Edi_Editor *editor)
+_edi_editor_search_add(Evas_Object *parent, Edi_Editor *editor)
 {
-   Evas_Object *entry, *lbl, *btn, *box;
+   Evas_Object *entry, *lbl, *btn, *box, *big_box;
+   Evas_Object *replace_entry, *replace_lbl, *replace_btn, *replace_box;
    Edi_Editor_Search *search;
 
-   box = elm_box_add(parent);
-   elm_box_horizontal_set(box, EINA_TRUE);
-   evas_object_size_hint_align_set(box, EVAS_HINT_FILL, 0.5);
-   evas_object_size_hint_weight_set(box, 0.0, 0.0);
-   elm_box_padding_set(box, 15, 0);
+   big_box = elm_box_add(parent);
+   evas_object_size_hint_align_set(big_box, EVAS_HINT_FILL, 0.5);
+   evas_object_size_hint_weight_set(big_box, 0.0, 0.0);
 
-   lbl = elm_label_add(box);
-   elm_object_text_set(lbl, "Search term:");
+   box = elm_box_add(parent);
+   elm_box_homogeneous_set(box, EINA_FALSE);
+   elm_box_padding_set(box, 15, 0);
+   elm_box_horizontal_set(box, EINA_TRUE);
+   evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, 0.0);
+   evas_object_show(box);
+   elm_box_pack_end(big_box, box);
+
+   lbl = elm_label_add(parent);
+   elm_object_text_set(lbl, "Search  term:");
    evas_object_size_hint_align_set(lbl, EVAS_HINT_FILL, 0.5);
    evas_object_size_hint_weight_set(lbl, 0.0, 0.0);
    elm_box_pack_end(box, lbl);
    evas_object_show(lbl);
 
-   entry = elm_entry_add(box);
+   entry = elm_entry_add(parent);
    elm_entry_scrollable_set(entry, EINA_TRUE);
    elm_entry_single_line_set(entry, EINA_TRUE);
    evas_object_size_hint_align_set(entry, EVAS_HINT_FILL, 0.0);
@@ -216,28 +304,71 @@ edi_editor_search_add(Evas_Object *parent, Edi_Editor *editor)
    elm_box_pack_end(box, entry);
    evas_object_show(entry);
 
-   evas_object_event_callback_add(entry, EVAS_CALLBACK_KEY_UP, _search_key_up_cb, editor);
+   replace_box = elm_box_add(parent);
+   elm_box_padding_set(replace_box, 15, 0);
+   elm_box_horizontal_set(replace_box, EINA_TRUE);
+   evas_object_size_hint_align_set(replace_box, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   evas_object_size_hint_weight_set(replace_box, EVAS_HINT_EXPAND, 0.0);
+   evas_object_show(replace_box);
+   elm_box_pack_end(big_box, replace_box);
 
-   btn = elm_button_add(box);
+   replace_lbl = elm_label_add(parent);
+   elm_object_text_set(replace_lbl, "Replace term:");
+   evas_object_size_hint_align_set(replace_lbl, EVAS_HINT_FILL, 0.5);
+   evas_object_size_hint_weight_set(replace_lbl, 0.0, 0.0);
+   elm_box_pack_end(replace_box, replace_lbl);
+   evas_object_show(replace_lbl);
+
+   replace_entry = elm_entry_add(parent);
+   elm_entry_scrollable_set(replace_entry, EINA_TRUE);
+   elm_entry_single_line_set(replace_entry, EINA_TRUE);
+   evas_object_size_hint_align_set(replace_entry, EVAS_HINT_FILL, 0.0);
+   evas_object_size_hint_weight_set(replace_entry, EVAS_HINT_EXPAND, 0.0);
+   elm_box_pack_end(replace_box, replace_entry);
+   evas_object_show(replace_entry);
+   evas_object_smart_callback_add(replace_entry, "changed", _edi_replace_entry_changed, editor);
+
+   box = elm_box_add(parent);
+   elm_box_homogeneous_set(box, EINA_FALSE);
+   elm_box_padding_set(box, 15, 0);
+   elm_box_horizontal_set(box, EINA_TRUE);
+   evas_object_size_hint_align_set(box, 1.0, EVAS_HINT_FILL);
+   evas_object_size_hint_weight_set(box, 0.0, 0.0);
+   evas_object_show(box);
+   elm_box_pack_end(big_box, box);
+
+   evas_object_event_callback_add(entry, EVAS_CALLBACK_KEY_UP, _edi_search_key_up_cb, editor);
+
+   btn = elm_button_add(parent);
    elm_object_text_set(btn, "Search");
    evas_object_size_hint_align_set(btn, 1.0, 0.0);
    evas_object_size_hint_weight_set(btn, 0.0, 0.0);
    evas_object_show(btn);
    elm_box_pack_end(box, btn);
-   evas_object_smart_callback_add(btn, "clicked", _search_clicked, editor);
+   evas_object_smart_callback_add(btn, "clicked", _edi_search_clicked, editor);
 
-   btn = elm_button_add(box);
+   replace_btn = elm_button_add(parent);
+   elm_object_text_set(replace_btn, "Replace");
+   evas_object_size_hint_align_set(replace_btn, 1.0, 0.0);
+   evas_object_size_hint_weight_set(replace_btn, 0.0, 0.0);
+   evas_object_show(replace_btn);
+   elm_box_pack_end(box, replace_btn);
+   evas_object_smart_callback_add(replace_btn, "clicked", _edi_replace_clicked, editor);
+
+   btn = elm_button_add(parent);
    elm_object_text_set(btn, "Cancel");
    evas_object_size_hint_align_set(btn, 1.0, 0.0);
    evas_object_size_hint_weight_set(btn, 0.0, 0.0);
    evas_object_show(btn);
    elm_box_pack_end(box, btn);
-   evas_object_smart_callback_add(btn, "clicked", _cancel_clicked, editor);
+   evas_object_smart_callback_add(btn, "clicked", _edi_cancel_clicked, editor);
 
    search = calloc(1, sizeof(*search));
    search->entry = entry;
+   search->replace_entry = replace_entry;
+   search->replace_btn = replace_btn;
    search->parent = parent;
-   search->widget = box;
+   search->widget = big_box;
    editor->search = search;
    evas_object_show(parent);
 }
diff --git a/src/bin/mainview/edi_mainview.c b/src/bin/mainview/edi_mainview.c
index 1104a71..1b2d08b 100644
--- a/src/bin/mainview/edi_mainview.c
+++ b/src/bin/mainview/edi_mainview.c
@@ -519,7 +519,7 @@ edi_mainview_search()
    editor = (Edi_Editor *)evas_object_data_get(content, "editor");
 
    if (editor)
-     edi_editor_search(editor);
+     _edi_editor_search(editor);
 }
 
 EAPI void