Continue work on TMP Theme