merged sass with daltons code