Update new way to get courseid and theme fix