Fix compile errors, Themed handlers were not meant to be merged yet