fix: misc problems with style handling