Bug/9075/usage styling

Finished ! ;)