CM Theme Engine Stuff minor fixes