Various zstyle tweaks