Theme changes and fixed the wrong selected item bug