Incremental changes to new theme