Revert "some theme changes"

This reverts commit 8537acceee605c95d7e53b19a47ce828cfbdf219.