Even better editor-style tweaks