revamp sass structure + fix includes
fix recompilation error. should be automated in future
Merge branch 'design-fixes'