Refactored styles/templates.
Merged and fixed conflicts.
Merge pull request #10 from matiasb/style-it

Refactored styles/templates.