Updated the list with .DS_Store
Reorganized files, new mixins and renamed variables