First stage implementation of new styling :D