tgupdate: merge t/girocco/style-updates into girocco base