Move out theme loader from theme.config, use separate include