improved theme
improved list performance