improvements in theme