Refactor code, plus first pass at using CSS animations
Remove variables
Merge branch 'feature/dpad-update' into develop