Updated SCSS, more data, updated naming-scheme