changing the usse of some classes on the styleguide