Adding @1x gfx and moving to sass/scss