Re-made with SCSS
Fixed to work with new SCSS
Various Updates