MDL-33890 Make course blocks less theme dependant