Feature/style guide corrections

Need to merge this in order to get new styles for style-guide-corrections