Updated the forms rules to have search-filter separated, added the themes.