Removing previously integrated theme selector as it appears to be causing too many issues.