CON-1016

*DO NOT MERGE*
What do you think about merging those blocks and use longer selectors instead of repetition?