Themes and list issues fixed.