theme cms various fixes