Fix issues on theme selection

fixes #1 
fixes #2