fix non-closing dialog for selecting currency && add theme choosing