Add substyle category number and id for styles
move style shaping into it's own service
Fixed and updated tests for new styles retrieval and shaping