update for v21 appcompat and material theme