moved core stuff to core.scss
merged changes from master