Replace confusing (,@ with , (tex-font-lock-keywords-1, tex-font-lock-keywords-2): Don't use regexp-opt-depth. Spice up the regexp for args. Don't distinguish between cmds that can take an opt arg or not. Use `append' and `prepend' rather than `keep'.