improved theme selector