Revert "Merge pull request #364 from illori/Theme-Variants-Broken"

Revert #364.

This reverts commit 074d358190656dcf1391bb78dc720975df0639a0, reversing
changes made to 51f8086c8dc0caab43261db7d793ae25219ee422.