Changed the way themes work, along with a few other tweaks.