Added Theme Engine support