updated theme handling; removed functionality which kept track of selected item