theme changes for next 2.0 beta release