Searching, finding and replacing text in files is a very common task when working with text editors. Currently, xi-editor only supports a very basic plain-text search within the currently opened document. Having more advanced search and replace functionality would be very beneficial for all users of xi-editor. In this project I am planning to extend xi-editor to allow search using regular expressions, replacements of matched strings and multiple search queries. Additionally, I intent to integrate a more advanced interface for find and replace into xi-mac as well as highlighting matching text in opened documents.