Modernizing gems and reformatting