Fixed load order for sass partials; updated clash