Apply theme to search form; refactored
Refactored
Refactored, restyled