Support both classic and new themes