merging new cm stuff
fixing some theme values
easter egg