Checked in to remove dependency to appcompactv7 themes