Updated normalization

Updated naming and reverted the integration of variables in the reset
file to reflect the shared codebase with normalize.sass