Converting _s to -s for consistency
Adding diagonals
Formatting SVG