Update w/ history search, rename theme functions