Added theme, added search