Modified theme toggle list and changed key mapping.