Update based on Etyllica Themes changes