Revert "New option to support theme"

This reverts commit ec7e5b2e8f535d922423f34c3a9d7234043665e4.