Remove use of _theme()