REVERT new CM theme engine

Change-Id: I3dcedfa43a9c4ff0a27ddb2eddb42ae61ee68bb4