Revert for now "add new theme UI"

This reverts commit ff2cfddfdc07c64ea742bf3cba6d8a47dadda8f4.