Between logical commits
Switching to Susy and refactoring theme.