Toolkit styleguide improvements