New option for theme selection; bug fixes