Updated sass files and imports