merging theme update work from develop