clean up mq values and add prev-next
remove mq values from file names
cleaning up typography, prev next