A working base for per-style changes as per #817