Cleanup styles
Replace span by mark tags
Remove unused images
Merge pull request #1 from paulgreg/cleanup

Cleanup