Define faces as faces, not var aliases

This allows proper use of `M-x customize-face`, and places the faces logically within the custom group.