improvements in themes