Fix name user and reformat @themes @store-apps.