Simplify tonal CSS

Makes markup of tonal styling easier