Small fixes to the themeing system