Fix Foundations styling with different colour scheme
fix merge conflicts