Improvements in theme