Clean up face assignment.

Another failed attempt at ironing out some bugs in this theme, but
I like how its been cleaned up so keeping this version.