Combining the themes and domains to help make less table-consulting.
And removed the plurals.
Obviously, this isn't my first commit.