Improved theme picker UI