From 9efdda43f2a1d264ce20e150c9f34cc85497611d Mon Sep 17 00:00:00 2001
From: William Casarin <jb55@jb55.com>
Date: Fri, 5 May 2023 08:31:47 -0700
Subject: [PATCH] Ensure we have proper sizes on iconography

---
 .../Fundrise.imageset/Contents.json           | 24 ++++++++++---------
 .../iconography/GIF.imageset/Contents.json    | 24 ++++++++++---------
 .../iconography/Key.imageset/Contents.json    | 24 ++++++++++---------
 .../iconography/NFC.imageset/Contents.json    | 24 ++++++++++---------
 .../activity.imageset/Contents.json           | 24 ++++++++++---------
 .../add-bookmark.imageset/Contents.json       | 24 ++++++++++---------
 .../add-reaction.imageset/Contents.json       | 24 ++++++++++---------
 .../added-bookmark.imageset/Contents.json     | 24 ++++++++++---------
 .../ai-2-stars.fill.imageset/Contents.json    | 24 ++++++++++---------
 .../ai-2-stars.imageset/Contents.json         | 24 ++++++++++---------
 .../ai-3-stars.fill.imageset/Contents.json    | 24 ++++++++++---------
 .../ai-3-stars.imageset/Contents.json         | 24 ++++++++++---------
 .../ai-avatar.imageset/Contents.json          | 24 ++++++++++---------
 .../ai-image.fill.imageset/Contents.json      | 24 ++++++++++---------
 .../ai-image.imageset/Contents.json           | 24 ++++++++++---------
 .../ai-star.fill.imageset/Contents.json       | 24 ++++++++++---------
 .../ai-star.imageset/Contents.json            | 24 ++++++++++---------
 .../ai-star2.fill.imageset/Contents.json      | 24 ++++++++++---------
 .../ai-star2.imageset/Contents.json           | 24 ++++++++++---------
 .../ai-text.fill.imageset/Contents.json       | 24 ++++++++++---------
 .../ai-text.imageset/Contents.json            | 24 ++++++++++---------
 .../airplay.imageset/Contents.json            | 24 ++++++++++---------
 .../iconography/albums.imageset/Contents.json | 24 ++++++++++---------
 .../iconography/anchor.imageset/Contents.json | 24 ++++++++++---------
 .../archive-folder.imageset/Contents.json     | 24 ++++++++++---------
 .../archive.imageset/Contents.json            | 24 ++++++++++---------
 .../arrow-bottom-down.imageset/Contents.json  | 24 ++++++++++---------
 .../arrow-bottom-left.imageset/Contents.json  | 24 ++++++++++---------
 .../arrow-down-circle.imageset/Contents.json  | 24 ++++++++++---------
 .../arrow-down.imageset/Contents.json         | 24 ++++++++++---------
 .../Contents.json                             | 24 ++++++++++---------
 .../Contents.json                             | 24 ++++++++++---------
 .../arrow-left-circle.imageset/Contents.json  | 24 ++++++++++---------
 .../arrow-left.imageset/Contents.json         | 24 ++++++++++---------
 .../arrow-right-circle.imageset/Contents.json | 24 ++++++++++---------
 .../arrow-right.imageset/Contents.json        | 24 ++++++++++---------
 .../arrow-top-left.imageset/Contents.json     | 24 ++++++++++---------
 .../arrow-top-right.imageset/Contents.json    | 24 ++++++++++---------
 .../arrow-up-circle.imageset/Contents.json    | 24 ++++++++++---------
 .../arrow-up.imageset/Contents.json           | 24 ++++++++++---------
 .../iconography/at.imageset/Contents.json     | 24 ++++++++++---------
 .../attachment.fill.imageset/Contents.json    | 24 ++++++++++---------
 .../attachment.imageset/Contents.json         | 24 ++++++++++---------
 .../auto-size.imageset/Contents.json          | 24 ++++++++++---------
 .../backward.imageset/Contents.json           | 24 ++++++++++---------
 .../iconography/badge.imageset/Contents.json  | 24 ++++++++++---------
 .../iconography/bank.imageset/Contents.json   | 24 ++++++++++---------
 .../iconography/basket.imageset/Contents.json | 24 ++++++++++---------
 .../bitcoin-icon.imageset/Contents.json       | 24 ++++++++++---------
 .../bitcoin.imageset/Contents.json            | 24 ++++++++++---------
 .../iconography/block.imageset/Contents.json  | 24 ++++++++++---------
 .../iconography/bold.imageset/Contents.json   | 24 ++++++++++---------
 .../iconography/book.imageset/Contents.json   | 24 ++++++++++---------
 .../iconography/book2.imageset/Contents.json  | 24 ++++++++++---------
 .../iconography/book3.imageset/Contents.json  | 24 ++++++++++---------
 .../bookmark.fill.fill.imageset/Contents.json | 24 ++++++++++---------
 .../bookmark.imageset/Contents.json           | 24 ++++++++++---------
 .../iconography/bot.imageset/Contents.json    | 24 ++++++++++---------
 .../branches.imageset/Contents.json           | 24 ++++++++++---------
 .../iconography/broom.imageset/Contents.json  | 24 ++++++++++---------
 .../broseer-window.imageset/Contents.json     | 24 ++++++++++---------
 .../bubble-circle.imageset/Contents.json      | 24 ++++++++++---------
 .../bubble-circle2.imageset/Contents.json     | 24 ++++++++++---------
 .../iconography/bubble.imageset/Contents.json | 24 ++++++++++---------
 .../bubble2.imageset/Contents.json            | 24 ++++++++++---------
 .../bubbles.imageset/Contents.json            | 24 ++++++++++---------
 .../iconography/bucket.imageset/Contents.json | 24 ++++++++++---------
 .../buildings.imageset/Contents.json          | 24 ++++++++++---------
 .../bullet-list.imageset/Contents.json        | 24 ++++++++++---------
 .../iconography/cake.imageset/Contents.json   | 24 ++++++++++---------
 .../calendar.imageset/Contents.json           | 24 ++++++++++---------
 .../iconography/camera.imageset/Contents.json | 24 ++++++++++---------
 .../chat-text.imageset/Contents.json          | 24 ++++++++++---------
 .../iconography/chat.imageset/Contents.json   | 24 ++++++++++---------
 .../check-circle.fill.imageset/Contents.json  | 24 ++++++++++---------
 .../check-circle.imageset/Contents.json       | 24 ++++++++++---------
 .../checkbox.imageset/Contents.json           | 24 ++++++++++---------
 .../checkmark.imageset/Contents.json          | 24 ++++++++++---------
 .../Contents.json                             | 24 ++++++++++---------
 .../Contents.json                             | 24 ++++++++++---------
 .../Contents.json                             | 24 ++++++++++---------
 .../chevron-double-up.imageset/Contents.json  | 24 ++++++++++---------
 .../chevron-down.imageset/Contents.json       | 24 ++++++++++---------
 .../Contents.json                             | 24 ++++++++++---------
 .../Contents.json                             | 24 ++++++++++---------
 .../Contents.json                             | 24 ++++++++++---------
 .../chevron-large-left.imageset/Contents.json | 24 ++++++++++---------
 .../Contents.json                             | 24 ++++++++++---------
 .../chevron-large-top.imageset/Contents.json  | 24 ++++++++++---------
 .../chevron-left.imageset/Contents.json       | 24 ++++++++++---------
 .../chevron-right.imageset/Contents.json      | 24 ++++++++++---------
 .../chevron-up.imageset/Contents.json         | 24 ++++++++++---------
 .../Contents.json                             | 24 ++++++++++---------
 .../circle-placeholder.imageset/Contents.json | 24 ++++++++++---------
 .../clipboard.imageset/Contents.json          | 24 ++++++++++---------
 .../close-circle.imageset/Contents.json       | 24 ++++++++++---------
 .../close-small.imageset/Contents.json        | 24 ++++++++++---------
 .../close-square.imageset/Contents.json       | 24 ++++++++++---------
 .../iconography/close.imageset/Contents.json  | 24 ++++++++++---------
 .../cloud-download.imageset/Contents.json     | 24 ++++++++++---------
 .../cloud-offline.imageset/Contents.json      | 24 ++++++++++---------
 .../cloud-upload.imageset/Contents.json       | 24 ++++++++++---------
 .../iconography/cloud.imageset/Contents.json  | 24 ++++++++++---------
 .../iconography/cloudy.imageset/Contents.json | 24 ++++++++++---------
 .../code-insert.imageset/Contents.json        | 24 ++++++++++---------
 .../iconography/code.imageset/Contents.json   | 24 ++++++++++---------
 .../color-palette.imageset/Contents.json      | 24 ++++++++++---------
 .../color-swatch.imageset/Contents.json       | 24 ++++++++++---------
 .../command-square.imageset/Contents.json     | 24 ++++++++++---------
 .../command.imageset/Contents.json            | 24 ++++++++++---------
 .../copy.fill.imageset/Contents.json          | 24 ++++++++++---------
 .../iconography/copy.imageset/Contents.json   | 24 ++++++++++---------
 .../copy2.fill.imageset/Contents.json         | 24 ++++++++++---------
 .../iconography/copy2.imageset/Contents.json  | 24 ++++++++++---------
 .../corsor-click.imageset/Contents.json       | 24 ++++++++++---------
 .../iconography/court.imageset/Contents.json  | 24 ++++++++++---------
 .../credit-card-add.imageset/Contents.json    | 24 ++++++++++---------
 .../credit-card.imageset/Contents.json        | 24 ++++++++++---------
 .../iconography/crop.imageset/Contents.json   | 24 ++++++++++---------
 .../cursor-box.imageset/Contents.json         | 24 ++++++++++---------
 .../iconography/cursor.imageset/Contents.json | 24 ++++++++++---------
 .../dark-mode.imageset/Contents.json          | 24 ++++++++++---------
 .../iconography/delete.imageset/Contents.json | 24 ++++++++++---------
 .../iconography/disk.imageset/Contents.json   | 24 ++++++++++---------
 .../iconography/dock.imageset/Contents.json   | 24 ++++++++++---------
 .../document-add.imageset/Contents.json       | 24 ++++++++++---------
 .../Contents.json                             | 24 ++++++++++---------
 .../document.imageset/Contents.json           | 24 ++++++++++---------
 .../dollar-currency.imageset/Contents.json    | 24 ++++++++++---------
 .../dots-grid.imageset/Contents.json          | 24 ++++++++++---------
 .../download.imageset/Contents.json           | 24 ++++++++++---------
 .../iconography/drag.imageset/Contents.json   | 24 ++++++++++---------
 .../iconography/draw.imageset/Contents.json   | 24 ++++++++++---------
 .../iconography/earth.imageset/Contents.json  | 24 ++++++++++---------
 .../edit-list.imageset/Contents.json          | 24 ++++++++++---------
 .../iconography/edited.imageset/Contents.json | 24 ++++++++++---------
 .../iconography/expand.imageset/Contents.json | 24 ++++++++++---------
 .../explore-compass.imageset/Contents.json    | 24 ++++++++++---------
 .../eye-off.fill.imageset/Contents.json       | 24 ++++++++++---------
 .../eye-off.imageset/Contents.json            | 24 ++++++++++---------
 .../eye.fill.imageset/Contents.json           | 24 ++++++++++---------
 .../iconography/eye.imageset/Contents.json    | 24 ++++++++++---------
 .../face-id.imageset/Contents.json            | 24 ++++++++++---------
 .../file-attachment.imageset/Contents.json    | 24 ++++++++++---------
 .../Contents.json                             | 24 ++++++++++---------
 .../file-document1.imageset/Contents.json     | 24 ++++++++++---------
 .../file-documents.imageset/Contents.json     | 24 ++++++++++---------
 .../filter-timeline.imageset/Contents.json    | 24 ++++++++++---------
 .../iconography/filter.imageset/Contents.json | 24 ++++++++++---------
 .../filter2.imageset/Contents.json            | 24 ++++++++++---------
 .../finger-print.imageset/Contents.json       | 24 ++++++++++---------
 .../fire.fill.imageset/Contents.json          | 24 ++++++++++---------
 .../iconography/fire.imageset/Contents.json   | 24 ++++++++++---------
 .../iconography/flag.imageset/Contents.json   | 24 ++++++++++---------
 .../iconography/focus.imageset/Contents.json  | 24 ++++++++++---------
 .../folder-add.imageset/Contents.json         | 24 ++++++++++---------
 .../folder-bookmarks.imageset/Contents.json   | 24 ++++++++++---------
 .../folder-cloud.imageset/Contents.json       | 24 ++++++++++---------
 .../folder-delete.imageset/Contents.json      | 24 ++++++++++---------
 .../folder-download.imageset/Contents.json    | 24 ++++++++++---------
 .../folder-linked.imageset/Contents.json      | 24 ++++++++++---------
 .../folder-restricted.imageset/Contents.json  | 24 ++++++++++---------
 .../folder-shared.imageset/Contents.json      | 24 ++++++++++---------
 .../folder-upload.imageset/Contents.json      | 24 ++++++++++---------
 .../iconography/folder.imageset/Contents.json | 24 ++++++++++---------
 .../folder2.imageset/Contents.json            | 24 ++++++++++---------
 .../folders.imageset/Contents.json            | 24 ++++++++++---------
 .../iconography/fork.imageset/Contents.json   | 24 ++++++++++---------
 .../iconography/gift.imageset/Contents.json   | 24 ++++++++++---------
 .../iconography/globe.imageset/Contents.json  | 24 ++++++++++---------
 .../iconography/grow.imageset/Contents.json   | 24 ++++++++++---------
 .../growth.fill.imageset/Contents.json        | 24 ++++++++++---------
 .../hamburger-menu.imageset/Contents.json     | 24 ++++++++++---------
 .../hamburger-menu2.imageset/Contents.json    | 24 ++++++++++---------
 .../hamburger-menu3.imageset/Contents.json    | 24 ++++++++++---------
 .../headphones.imageset/Contents.json         | 24 ++++++++++---------
 .../heart.fill.imageset/Contents.json         | 24 ++++++++++---------
 .../iconography/heart.imageset/Contents.json  | 24 ++++++++++---------
 .../help2.fill.imageset/Contents.json         | 24 ++++++++++---------
 .../iconography/help2.imageset/Contents.json  | 24 ++++++++++---------
 .../hexagon.imageset/Contents.json            | 24 ++++++++++---------
 .../home.fill.fill.imageset/Contents.json     | 24 ++++++++++---------
 .../iconography/home.imageset/Contents.json   | 24 ++++++++++---------
 .../iconography/images.imageset/Contents.json | 24 ++++++++++---------
 .../images2.imageset/Contents.json            | 24 ++++++++++---------
 .../iconography/inbox.imageset/Contents.json  | 24 ++++++++++---------
 .../info-square.imageset/Contents.json        | 24 ++++++++++---------
 .../iconography/info.imageset/Contents.json   | 24 ++++++++++---------
 .../iconography/italic.imageset/Contents.json | 24 ++++++++++---------
 .../keyboard-down.imageset/Contents.json      | 24 ++++++++++---------
 .../keyboard-up.imageset/Contents.json        | 24 ++++++++++---------
 .../iconography/launch.imageset/Contents.json | 24 ++++++++++---------
 .../iconography/layers.imageset/Contents.json | 24 ++++++++++---------
 .../library.imageset/Contents.json            | 24 ++++++++++---------
 .../light-bulb.imageset/Contents.json         | 24 ++++++++++---------
 .../light-mode.imageset/Contents.json         | 24 ++++++++++---------
 .../link-horizontal.imageset/Contents.json    | 24 ++++++++++---------
 .../iconography/link.imageset/Contents.json   | 24 ++++++++++---------
 .../iconography/loader.imageset/Contents.json | 24 ++++++++++---------
 .../Contents.json                             | 24 ++++++++++---------
 .../location-map.imageset/Contents.json       | 24 ++++++++++---------
 .../iconography/lock.imageset/Contents.json   | 24 ++++++++++---------
 .../iconography/login.imageset/Contents.json  | 24 ++++++++++---------
 .../iconography/logout.imageset/Contents.json | 24 ++++++++++---------
 .../luggage.imageset/Contents.json            | 24 ++++++++++---------
 .../magic-book.imageset/Contents.json         | 24 ++++++++++---------
 .../magic-box.imageset/Contents.json          | 24 ++++++++++---------
 .../magic-hat.imageset/Contents.json          | 24 ++++++++++---------
 .../magic-pencil.imageset/Contents.json       | 24 ++++++++++---------
 .../magic-stick.fill.imageset/Contents.json   | 24 ++++++++++---------
 .../magic-stick.imageset/Contents.json        | 24 ++++++++++---------
 .../magic-stick2.fill.imageset/Contents.json  | 24 ++++++++++---------
 .../magic-stick2.imageset/Contents.json       | 24 ++++++++++---------
 .../iconography/map.imageset/Contents.json    | 24 ++++++++++---------
 .../markdown.imageset/Contents.json           | 24 ++++++++++---------
 .../megaphone.imageset/Contents.json          | 24 ++++++++++---------
 .../Contents.json                             | 24 ++++++++++---------
 .../Contents.json                             | 24 ++++++++++---------
 .../messages.fill.imageset/Contents.json      | 24 ++++++++++---------
 .../messages.imageset/Contents.json           | 24 ++++++++++---------
 .../microphone-off.imageset/Contents.json     | 24 ++++++++++---------
 .../microphone.imageset/Contents.json         | 24 ++++++++++---------
 .../minimize.imageset/Contents.json           | 24 ++++++++++---------
 .../minus-circle.imageset/Contents.json       | 24 ++++++++++---------
 .../minus-small.imageset/Contents.json        | 24 ++++++++++---------
 .../minus-square.imageset/Contents.json       | 24 ++++++++++---------
 .../iconography/minus.imageset/Contents.json  | 24 ++++++++++---------
 .../more-horizontal.imageset/Contents.json    | 24 ++++++++++---------
 .../more-vertical.imageset/Contents.json      | 24 ++++++++++---------
 .../iconography/move.imageset/Contents.json   | 24 ++++++++++---------
 .../multi-media.imageset/Contents.json        | 24 ++++++++++---------
 .../multiple-icons.imageset/Contents.json     | 24 ++++++++++---------
 .../music-audio.imageset/Contents.json        | 24 ++++++++++---------
 .../iconography/mute.imageset/Contents.json   | 24 ++++++++++---------
 .../new-message.imageset/Contents.json        | 24 ++++++++++---------
 .../iconography/news.imageset/Contents.json   | 24 ++++++++++---------
 .../nostrich.imageset/Contents.json           | 24 ++++++++++---------
 .../nostrich2.imageset/Contents.json          | 24 ++++++++++---------
 .../note-book.imageset/Contents.json          | 24 ++++++++++---------
 .../notes.fill.imageset/Contents.json         | 24 ++++++++++---------
 .../iconography/notes.imageset/Contents.json  | 24 ++++++++++---------
 .../Contents.json                             | 24 ++++++++++---------
 .../Contents.json                             | 24 ++++++++++---------
 .../Contents.json                             | 24 ++++++++++---------
 .../notification-bell.imageset/Contents.json  | 24 ++++++++++---------
 .../Contents.json                             | 24 ++++++++++---------
 .../Contents.json                             | 24 ++++++++++---------
 .../numbered-list.imageset/Contents.json      | 24 ++++++++++---------
 .../option-alt.imageset/Contents.json         | 24 ++++++++++---------
 .../iconography/option.imageset/Contents.json | 24 ++++++++++---------
 .../overcast.imageset/Contents.json           | 24 ++++++++++---------
 .../password-lock.imageset/Contents.json      | 24 ++++++++++---------
 .../iconography/pause.imageset/Contents.json  | 24 ++++++++++---------
 .../pencil-edit.imageset/Contents.json        | 24 ++++++++++---------
 .../percent.imageset/Contents.json            | 24 ++++++++++---------
 .../performance.imageset/Contents.json        | 24 ++++++++++---------
 .../iconography/phone.imageset/Contents.json  | 24 ++++++++++---------
 .../pin-location.imageset/Contents.json       | 24 ++++++++++---------
 .../pin.fill.imageset/Contents.json           | 24 ++++++++++---------
 .../iconography/pin.imageset/Contents.json    | 24 ++++++++++---------
 .../iconography/play.imageset/Contents.json   | 24 ++++++++++---------
 .../plus-circle.imageset/Contents.json        | 24 ++++++++++---------
 .../plus-small.imageset/Contents.json         | 24 ++++++++++---------
 .../plus-square.imageset/Contents.json        | 24 ++++++++++---------
 .../iconography/plus.imageset/Contents.json   | 24 ++++++++++---------
 .../pointer-hand.imageset/Contents.json       | 24 ++++++++++---------
 .../power-off.imageset/Contents.json          | 24 ++++++++++---------
 .../pull-request.imageset/Contents.json       | 24 ++++++++++---------
 .../qr-code.fill.imageset/Contents.json       | 24 ++++++++++---------
 .../qr-code.imageset/Contents.json            | 24 ++++++++++---------
 .../question.imageset/Contents.json           | 24 ++++++++++---------
 .../iconography/radar.imageset/Contents.json  | 24 ++++++++++---------
 .../raising-hand.imageset/Contents.json       | 24 ++++++++++---------
 .../iconography/record.imageset/Contents.json | 24 ++++++++++---------
 .../iconography/redo.imageset/Contents.json   | 24 ++++++++++---------
 .../remove-bookmark.imageset/Contents.json    | 24 ++++++++++---------
 .../remove-tag.imageset/Contents.json         | 24 ++++++++++---------
 .../iconography/repeat.imageset/Contents.json | 24 ++++++++++---------
 .../iconography/repost.imageset/Contents.json | 24 ++++++++++---------
 .../resize-big.imageset/Contents.json         | 24 ++++++++++---------
 .../resize-small.imageset/Contents.json       | 24 ++++++++++---------
 .../iconography/rotate.imageset/Contents.json | 24 ++++++++++---------
 .../iconography/scan.imageset/Contents.json   | 24 ++++++++++---------
 .../search-grid.imageset/Contents.json        | 24 ++++++++++---------
 .../search-list.imageset/Contents.json        | 24 ++++++++++---------
 .../search-page-find.imageset/Contents.json   | 24 ++++++++++---------
 .../search.fill.imageset/Contents.json        | 24 ++++++++++---------
 .../iconography/search.imageset/Contents.json | 24 ++++++++++---------
 .../security-shield.imageset/Contents.json    | 24 ++++++++++---------
 .../send-email.imageset/Contents.json         | 24 ++++++++++---------
 .../iconography/send.imageset/Contents.json   | 24 ++++++++++---------
 .../iconography/server.imageset/Contents.json | 24 ++++++++++---------
 .../settings-controls.imageset/Contents.json  | 24 ++++++++++---------
 .../settings-levels.imageset/Contents.json    | 24 ++++++++++---------
 .../settings.fill.imageset/Contents.json      | 24 ++++++++++---------
 .../settings.imageset/Contents.json           | 24 ++++++++++---------
 .../shaka.fill.imageset/Contents.json         | 24 ++++++++++---------
 .../iconography/shaka.imageset/Contents.json  | 24 ++++++++++---------
 .../iconography/share2.imageset/Contents.json | 24 ++++++++++---------
 .../iconography/share3.imageset/Contents.json | 24 ++++++++++---------
 .../shield-off.imageset/Contents.json         | 24 ++++++++++---------
 .../shield-protected.imageset/Contents.json   | 24 ++++++++++---------
 .../iconography/shield.imageset/Contents.json | 24 ++++++++++---------
 .../iconography/shop.imageset/Contents.json   | 24 ++++++++++---------
 .../shopping-bag.imageset/Contents.json       | 24 ++++++++++---------
 .../shopping-cart.imageset/Contents.json      | 24 ++++++++++---------
 .../sidebar.imageset/Contents.json            | 24 ++++++++++---------
 .../sign-direction.imageset/Contents.json     | 24 ++++++++++---------
 .../snow-flakes.imageset/Contents.json        | 24 ++++++++++---------
 .../sort-ascending.imageset/Contents.json     | 24 ++++++++++---------
 .../sort-descending.imageset/Contents.json    | 24 ++++++++++---------
 .../sort-horizontal.imageset/Contents.json    | 24 ++++++++++---------
 .../sort-vertical.imageset/Contents.json      | 24 ++++++++++---------
 .../iconography/square.imageset/Contents.json | 24 ++++++++++---------
 .../star.fill.imageset/Contents.json          | 24 ++++++++++---------
 .../iconography/star.imageset/Contents.json   | 24 ++++++++++---------
 .../iconography/stop.imageset/Contents.json   | 24 ++++++++++---------
 .../strike-through.imageset/Contents.json     | 24 ++++++++++---------
 .../iconography/table.imageset/Contents.json  | 24 ++++++++++---------
 .../target-on.imageset/Contents.json          | 24 ++++++++++---------
 .../iconography/target.imageset/Contents.json | 24 ++++++++++---------
 .../target2.imageset/Contents.json            | 24 ++++++++++---------
 .../terminal.imageset/Contents.json           | 24 ++++++++++---------
 .../text-indicator.imageset/Contents.json     | 24 ++++++++++---------
 .../text-size.imageset/Contents.json          | 24 ++++++++++---------
 .../iconography/text.imageset/Contents.json   | 24 ++++++++++---------
 .../thumbs-down.fill.imageset/Contents.json   | 24 ++++++++++---------
 .../thumbs-down.imageset/Contents.json        | 24 ++++++++++---------
 .../thumbs-up.fill.imageset/Contents.json     | 24 ++++++++++---------
 .../thumbs-up.imageset/Contents.json          | 24 ++++++++++---------
 .../iconography/ticket.imageset/Contents.json | 24 ++++++++++---------
 .../title-case.imageset/Contents.json         | 24 ++++++++++---------
 .../underline.imageset/Contents.json          | 24 ++++++++++---------
 .../iconography/undo.imageset/Contents.json   | 24 ++++++++++---------
 .../iconography/undock.imageset/Contents.json | 24 ++++++++++---------
 .../iconography/unlink.imageset/Contents.json | 24 ++++++++++---------
 .../unlocked.imageset/Contents.json           | 24 ++++++++++---------
 .../iconography/upload.imageset/Contents.json | 24 ++++++++++---------
 .../user-add-down.imageset/Contents.json      | 24 ++++++++++---------
 .../user-add-up.imageset/Contents.json        | 24 ++++++++++---------
 .../user-added.imageset/Contents.json         | 24 ++++++++++---------
 .../user-circle.imageset/Contents.json        | 24 ++++++++++---------
 .../user-copy.imageset/Contents.json          | 24 ++++++++++---------
 .../user-like.imageset/Contents.json          | 24 ++++++++++---------
 .../user-remove-1.imageset/Contents.json      | 24 ++++++++++---------
 .../user-remove.imageset/Contents.json        | 24 ++++++++++---------
 .../iconography/user.imageset/Contents.json   | 24 ++++++++++---------
 .../iconography/users.imageset/Contents.json  | 24 ++++++++++---------
 .../verified.fill.imageset/Contents.json      | 24 ++++++++++---------
 .../verified.imageset/Contents.json           | 24 ++++++++++---------
 .../video-clip.imageset/Contents.json         | 24 ++++++++++---------
 .../iconography/video.imageset/Contents.json  | 24 ++++++++++---------
 .../visit-page.imageset/Contents.json         | 24 ++++++++++---------
 .../voice-sound.imageset/Contents.json        | 24 ++++++++++---------
 .../volume-down.imageset/Contents.json        | 24 ++++++++++---------
 .../volume-full.imageset/Contents.json        | 24 ++++++++++---------
 .../volume-half.imageset/Contents.json        | 24 ++++++++++---------
 .../volume-minimum.imageset/Contents.json     | 24 ++++++++++---------
 .../volume-off.imageset/Contents.json         | 24 ++++++++++---------
 .../volume-up.imageset/Contents.json          | 24 ++++++++++---------
 .../wallet.fill.imageset/Contents.json        | 24 ++++++++++---------
 .../iconography/wallet.imageset/Contents.json | 24 ++++++++++---------
 .../warning.fill.imageset/Contents.json       | 24 ++++++++++---------
 .../warning.imageset/Contents.json            | 24 ++++++++++---------
 .../iconography/windy.imageset/Contents.json  | 24 ++++++++++---------
 .../world-relays.imageset/Contents.json       | 24 ++++++++++---------
 .../zap.fill.imageset/Contents.json           | 24 ++++++++++---------
 .../iconography/zap.imageset/Contents.json    | 24 ++++++++++---------
 .../zoom-in.imageset/Contents.json            | 24 ++++++++++---------
 .../zoom-out.imageset/Contents.json           | 24 ++++++++++---------
 370 files changed, 4810 insertions(+), 4070 deletions(-)

diff --git a/damus/Assets.xcassets/iconography/Fundrise.imageset/Contents.json b/damus/Assets.xcassets/iconography/Fundrise.imageset/Contents.json
index 60126571..f8eb7650 100644
--- a/damus/Assets.xcassets/iconography/Fundrise.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/Fundrise.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "Fundrise.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "Fundrise.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "Fundrise.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "Fundrise.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/GIF.imageset/Contents.json b/damus/Assets.xcassets/iconography/GIF.imageset/Contents.json
index e2801bcb..9d25cb8f 100644
--- a/damus/Assets.xcassets/iconography/GIF.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/GIF.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "GIF.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "GIF.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "GIF.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "GIF.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/Key.imageset/Contents.json b/damus/Assets.xcassets/iconography/Key.imageset/Contents.json
index 642fb7ef..4564bd93 100644
--- a/damus/Assets.xcassets/iconography/Key.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/Key.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "Key.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "Key.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "Key.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "Key.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/NFC.imageset/Contents.json b/damus/Assets.xcassets/iconography/NFC.imageset/Contents.json
index ec30f76d..e8fba45e 100644
--- a/damus/Assets.xcassets/iconography/NFC.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/NFC.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "NFC.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "NFC.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "NFC.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "NFC.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/activity.imageset/Contents.json b/damus/Assets.xcassets/iconography/activity.imageset/Contents.json
index 57f7bf41..2cad819e 100644
--- a/damus/Assets.xcassets/iconography/activity.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/activity.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "activity.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "activity.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "activity.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "activity.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/add-bookmark.imageset/Contents.json b/damus/Assets.xcassets/iconography/add-bookmark.imageset/Contents.json
index 437386cf..af35e3d1 100644
--- a/damus/Assets.xcassets/iconography/add-bookmark.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/add-bookmark.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "add-bookmark.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "add-bookmark.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "add-bookmark.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "add-bookmark.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/add-reaction.imageset/Contents.json b/damus/Assets.xcassets/iconography/add-reaction.imageset/Contents.json
index ee6e5e61..dfe5bc9a 100644
--- a/damus/Assets.xcassets/iconography/add-reaction.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/add-reaction.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "add-reaction.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "add-reaction.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "add-reaction.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "add-reaction.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/added-bookmark.imageset/Contents.json b/damus/Assets.xcassets/iconography/added-bookmark.imageset/Contents.json
index 4a9ad0be..b03d2033 100644
--- a/damus/Assets.xcassets/iconography/added-bookmark.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/added-bookmark.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "added-bookmark.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "added-bookmark.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "added-bookmark.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "added-bookmark.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/ai-2-stars.fill.imageset/Contents.json b/damus/Assets.xcassets/iconography/ai-2-stars.fill.imageset/Contents.json
index 6c810220..09a41529 100644
--- a/damus/Assets.xcassets/iconography/ai-2-stars.fill.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/ai-2-stars.fill.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "ai-2-stars.fill.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "ai-2-stars.fill.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "ai-2-stars.fill.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "ai-2-stars.fill.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/ai-2-stars.imageset/Contents.json b/damus/Assets.xcassets/iconography/ai-2-stars.imageset/Contents.json
index d5897d6c..71d04882 100644
--- a/damus/Assets.xcassets/iconography/ai-2-stars.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/ai-2-stars.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "ai-2-stars.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "ai-2-stars.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "ai-2-stars.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "ai-2-stars.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/ai-3-stars.fill.imageset/Contents.json b/damus/Assets.xcassets/iconography/ai-3-stars.fill.imageset/Contents.json
index ef445051..105b94c4 100644
--- a/damus/Assets.xcassets/iconography/ai-3-stars.fill.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/ai-3-stars.fill.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "ai-3-stars.fill.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "ai-3-stars.fill.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "ai-3-stars.fill.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "ai-3-stars.fill.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/ai-3-stars.imageset/Contents.json b/damus/Assets.xcassets/iconography/ai-3-stars.imageset/Contents.json
index 47110b5b..5940cfcf 100644
--- a/damus/Assets.xcassets/iconography/ai-3-stars.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/ai-3-stars.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "ai-3-stars.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "ai-3-stars.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "ai-3-stars.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "ai-3-stars.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/ai-avatar.imageset/Contents.json b/damus/Assets.xcassets/iconography/ai-avatar.imageset/Contents.json
index efce5c94..ebd46c01 100644
--- a/damus/Assets.xcassets/iconography/ai-avatar.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/ai-avatar.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "ai-avatar.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "ai-avatar.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "ai-avatar.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "ai-avatar.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/ai-image.fill.imageset/Contents.json b/damus/Assets.xcassets/iconography/ai-image.fill.imageset/Contents.json
index 0f1c5d72..630847d9 100644
--- a/damus/Assets.xcassets/iconography/ai-image.fill.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/ai-image.fill.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "ai-image.fill.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "ai-image.fill.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "ai-image.fill.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "ai-image.fill.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/ai-image.imageset/Contents.json b/damus/Assets.xcassets/iconography/ai-image.imageset/Contents.json
index ad03c0e7..fa82a572 100644
--- a/damus/Assets.xcassets/iconography/ai-image.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/ai-image.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "ai-image.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "ai-image.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "ai-image.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "ai-image.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/ai-star.fill.imageset/Contents.json b/damus/Assets.xcassets/iconography/ai-star.fill.imageset/Contents.json
index 4eb7ab7f..6a2ef6d9 100644
--- a/damus/Assets.xcassets/iconography/ai-star.fill.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/ai-star.fill.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "ai-star.fill.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "ai-star.fill.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "ai-star.fill.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "ai-star.fill.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/ai-star.imageset/Contents.json b/damus/Assets.xcassets/iconography/ai-star.imageset/Contents.json
index eb6ba8d8..0fe0b4f6 100644
--- a/damus/Assets.xcassets/iconography/ai-star.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/ai-star.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "ai-star.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "ai-star.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "ai-star.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "ai-star.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/ai-star2.fill.imageset/Contents.json b/damus/Assets.xcassets/iconography/ai-star2.fill.imageset/Contents.json
index b80e75eb..5160eeeb 100644
--- a/damus/Assets.xcassets/iconography/ai-star2.fill.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/ai-star2.fill.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "ai-star2.fill.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "ai-star2.fill.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "ai-star2.fill.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "ai-star2.fill.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/ai-star2.imageset/Contents.json b/damus/Assets.xcassets/iconography/ai-star2.imageset/Contents.json
index efa35e43..748816f5 100644
--- a/damus/Assets.xcassets/iconography/ai-star2.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/ai-star2.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "ai-star2.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "ai-star2.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "ai-star2.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "ai-star2.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/ai-text.fill.imageset/Contents.json b/damus/Assets.xcassets/iconography/ai-text.fill.imageset/Contents.json
index 94a7a346..e2497ebf 100644
--- a/damus/Assets.xcassets/iconography/ai-text.fill.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/ai-text.fill.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "ai-text.fill.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "ai-text.fill.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "ai-text.fill.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "ai-text.fill.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/ai-text.imageset/Contents.json b/damus/Assets.xcassets/iconography/ai-text.imageset/Contents.json
index 077defbc..aabe0328 100644
--- a/damus/Assets.xcassets/iconography/ai-text.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/ai-text.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "ai-text.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "ai-text.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "ai-text.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "ai-text.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/airplay.imageset/Contents.json b/damus/Assets.xcassets/iconography/airplay.imageset/Contents.json
index a9a61376..0ddd7874 100644
--- a/damus/Assets.xcassets/iconography/airplay.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/airplay.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "airplay.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "airplay.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "airplay.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "airplay.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/albums.imageset/Contents.json b/damus/Assets.xcassets/iconography/albums.imageset/Contents.json
index be756df9..38743c0e 100644
--- a/damus/Assets.xcassets/iconography/albums.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/albums.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "albums.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "albums.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "albums.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "albums.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/anchor.imageset/Contents.json b/damus/Assets.xcassets/iconography/anchor.imageset/Contents.json
index a33af2ab..8af82f2a 100644
--- a/damus/Assets.xcassets/iconography/anchor.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/anchor.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "anchor.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "anchor.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "anchor.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "anchor.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/archive-folder.imageset/Contents.json b/damus/Assets.xcassets/iconography/archive-folder.imageset/Contents.json
index ab342e4f..5b4fc453 100644
--- a/damus/Assets.xcassets/iconography/archive-folder.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/archive-folder.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "archive-folder.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "archive-folder.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "archive-folder.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "archive-folder.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/archive.imageset/Contents.json b/damus/Assets.xcassets/iconography/archive.imageset/Contents.json
index cdfd1372..2144768d 100644
--- a/damus/Assets.xcassets/iconography/archive.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/archive.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "archive.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "archive.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "archive.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "archive.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/arrow-bottom-down.imageset/Contents.json b/damus/Assets.xcassets/iconography/arrow-bottom-down.imageset/Contents.json
index 75631edd..6cb2041c 100644
--- a/damus/Assets.xcassets/iconography/arrow-bottom-down.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/arrow-bottom-down.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "arrow-bottom-down.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "arrow-bottom-down.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "arrow-bottom-down.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "arrow-bottom-down.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/arrow-bottom-left.imageset/Contents.json b/damus/Assets.xcassets/iconography/arrow-bottom-left.imageset/Contents.json
index 9ac82398..eec8d6f1 100644
--- a/damus/Assets.xcassets/iconography/arrow-bottom-left.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/arrow-bottom-left.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "arrow-bottom-left.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "arrow-bottom-left.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "arrow-bottom-left.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "arrow-bottom-left.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/arrow-down-circle.imageset/Contents.json b/damus/Assets.xcassets/iconography/arrow-down-circle.imageset/Contents.json
index 6f8605dd..97c2930d 100644
--- a/damus/Assets.xcassets/iconography/arrow-down-circle.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/arrow-down-circle.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "arrow-down-circle.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "arrow-down-circle.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "arrow-down-circle.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "arrow-down-circle.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/arrow-down.imageset/Contents.json b/damus/Assets.xcassets/iconography/arrow-down.imageset/Contents.json
index 2a6a7b4f..357054f2 100644
--- a/damus/Assets.xcassets/iconography/arrow-down.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/arrow-down.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "arrow-down.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "arrow-down.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "arrow-down.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "arrow-down.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/arrow-expand-horizontal.imageset/Contents.json b/damus/Assets.xcassets/iconography/arrow-expand-horizontal.imageset/Contents.json
index abf327b9..0022c7ba 100644
--- a/damus/Assets.xcassets/iconography/arrow-expand-horizontal.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/arrow-expand-horizontal.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "arrow-expand-horizontal.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "arrow-expand-horizontal.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "arrow-expand-horizontal.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "arrow-expand-horizontal.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/arrow-expand-vertical.imageset/Contents.json b/damus/Assets.xcassets/iconography/arrow-expand-vertical.imageset/Contents.json
index 263be18f..884d4581 100644
--- a/damus/Assets.xcassets/iconography/arrow-expand-vertical.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/arrow-expand-vertical.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "arrow-expand-vertical.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "arrow-expand-vertical.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "arrow-expand-vertical.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "arrow-expand-vertical.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/arrow-left-circle.imageset/Contents.json b/damus/Assets.xcassets/iconography/arrow-left-circle.imageset/Contents.json
index 99ab7d59..c40e1424 100644
--- a/damus/Assets.xcassets/iconography/arrow-left-circle.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/arrow-left-circle.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "arrow-left-circle.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "arrow-left-circle.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "arrow-left-circle.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "arrow-left-circle.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/arrow-left.imageset/Contents.json b/damus/Assets.xcassets/iconography/arrow-left.imageset/Contents.json
index fc6a4421..7abdf71f 100644
--- a/damus/Assets.xcassets/iconography/arrow-left.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/arrow-left.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "arrow-left.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "arrow-left.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "arrow-left.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "arrow-left.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/arrow-right-circle.imageset/Contents.json b/damus/Assets.xcassets/iconography/arrow-right-circle.imageset/Contents.json
index 2f6277d0..f6f95db4 100644
--- a/damus/Assets.xcassets/iconography/arrow-right-circle.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/arrow-right-circle.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "arrow-right-circle.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "arrow-right-circle.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "arrow-right-circle.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "arrow-right-circle.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/arrow-right.imageset/Contents.json b/damus/Assets.xcassets/iconography/arrow-right.imageset/Contents.json
index e32a0420..4cffc29f 100644
--- a/damus/Assets.xcassets/iconography/arrow-right.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/arrow-right.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "arrow-right.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "arrow-right.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "arrow-right.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "arrow-right.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/arrow-top-left.imageset/Contents.json b/damus/Assets.xcassets/iconography/arrow-top-left.imageset/Contents.json
index 9c2d5cfa..846b26b3 100644
--- a/damus/Assets.xcassets/iconography/arrow-top-left.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/arrow-top-left.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "arrow-top-left.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "arrow-top-left.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "arrow-top-left.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "arrow-top-left.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/arrow-top-right.imageset/Contents.json b/damus/Assets.xcassets/iconography/arrow-top-right.imageset/Contents.json
index 6d0fd910..9d77b634 100644
--- a/damus/Assets.xcassets/iconography/arrow-top-right.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/arrow-top-right.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "arrow-top-right.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "arrow-top-right.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "arrow-top-right.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "arrow-top-right.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/arrow-up-circle.imageset/Contents.json b/damus/Assets.xcassets/iconography/arrow-up-circle.imageset/Contents.json
index 2779dfdf..c6ddeac5 100644
--- a/damus/Assets.xcassets/iconography/arrow-up-circle.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/arrow-up-circle.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "arrow-up-circle.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "arrow-up-circle.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "arrow-up-circle.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "arrow-up-circle.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/arrow-up.imageset/Contents.json b/damus/Assets.xcassets/iconography/arrow-up.imageset/Contents.json
index f4cd7a70..6e789e12 100644
--- a/damus/Assets.xcassets/iconography/arrow-up.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/arrow-up.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "arrow-up.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "arrow-up.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "arrow-up.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "arrow-up.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/at.imageset/Contents.json b/damus/Assets.xcassets/iconography/at.imageset/Contents.json
index 2affdd27..f01ee1e1 100644
--- a/damus/Assets.xcassets/iconography/at.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/at.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "at.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "at.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "at.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "at.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/attachment.fill.imageset/Contents.json b/damus/Assets.xcassets/iconography/attachment.fill.imageset/Contents.json
index 8eedc5cf..c9400435 100644
--- a/damus/Assets.xcassets/iconography/attachment.fill.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/attachment.fill.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "attachment.fill.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "attachment.fill.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "attachment.fill.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "attachment.fill.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/attachment.imageset/Contents.json b/damus/Assets.xcassets/iconography/attachment.imageset/Contents.json
index a033a3cb..16b9b8e2 100644
--- a/damus/Assets.xcassets/iconography/attachment.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/attachment.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "attachment.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "attachment.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "attachment.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "attachment.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/auto-size.imageset/Contents.json b/damus/Assets.xcassets/iconography/auto-size.imageset/Contents.json
index a473ec56..48ebf23d 100644
--- a/damus/Assets.xcassets/iconography/auto-size.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/auto-size.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "auto-size.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "auto-size.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "auto-size.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "auto-size.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/backward.imageset/Contents.json b/damus/Assets.xcassets/iconography/backward.imageset/Contents.json
index 952effd3..5012f7c8 100644
--- a/damus/Assets.xcassets/iconography/backward.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/backward.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "backward.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "backward.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "backward.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "backward.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/badge.imageset/Contents.json b/damus/Assets.xcassets/iconography/badge.imageset/Contents.json
index 2da878fd..e9a6c16a 100644
--- a/damus/Assets.xcassets/iconography/badge.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/badge.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "badge.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "badge.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "badge.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "badge.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/bank.imageset/Contents.json b/damus/Assets.xcassets/iconography/bank.imageset/Contents.json
index f8d012d8..ca21b026 100644
--- a/damus/Assets.xcassets/iconography/bank.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/bank.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "bank.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "bank.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "bank.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "bank.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/basket.imageset/Contents.json b/damus/Assets.xcassets/iconography/basket.imageset/Contents.json
index c5d3b285..c1cb86c8 100644
--- a/damus/Assets.xcassets/iconography/basket.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/basket.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "basket.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "basket.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "basket.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "basket.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/bitcoin-icon.imageset/Contents.json b/damus/Assets.xcassets/iconography/bitcoin-icon.imageset/Contents.json
index b9933062..364f5f2d 100644
--- a/damus/Assets.xcassets/iconography/bitcoin-icon.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/bitcoin-icon.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "bitcoin-icon.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "bitcoin-icon.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "bitcoin-icon.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "bitcoin-icon.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/bitcoin.imageset/Contents.json b/damus/Assets.xcassets/iconography/bitcoin.imageset/Contents.json
index 4393f54f..d0d6e113 100644
--- a/damus/Assets.xcassets/iconography/bitcoin.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/bitcoin.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "bitcoin.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "bitcoin.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "bitcoin.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "bitcoin.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/block.imageset/Contents.json b/damus/Assets.xcassets/iconography/block.imageset/Contents.json
index 0271bd23..7863996d 100644
--- a/damus/Assets.xcassets/iconography/block.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/block.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "block.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "block.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "block.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "block.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/bold.imageset/Contents.json b/damus/Assets.xcassets/iconography/bold.imageset/Contents.json
index 24d34dac..4b6391b1 100644
--- a/damus/Assets.xcassets/iconography/bold.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/bold.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "bold.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "bold.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "bold.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "bold.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/book.imageset/Contents.json b/damus/Assets.xcassets/iconography/book.imageset/Contents.json
index 7edc5aa5..72c962fd 100644
--- a/damus/Assets.xcassets/iconography/book.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/book.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "book.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "book.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "book.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "book.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/book2.imageset/Contents.json b/damus/Assets.xcassets/iconography/book2.imageset/Contents.json
index 321188bd..5e5bd657 100644
--- a/damus/Assets.xcassets/iconography/book2.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/book2.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "book2.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "book2.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "book2.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "book2.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/book3.imageset/Contents.json b/damus/Assets.xcassets/iconography/book3.imageset/Contents.json
index 73cf00a0..1661d242 100644
--- a/damus/Assets.xcassets/iconography/book3.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/book3.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "book3.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "book3.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "book3.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "book3.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/bookmark.fill.fill.imageset/Contents.json b/damus/Assets.xcassets/iconography/bookmark.fill.fill.imageset/Contents.json
index cc81947f..4875e243 100644
--- a/damus/Assets.xcassets/iconography/bookmark.fill.fill.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/bookmark.fill.fill.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "bookmark.fill.fill.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "bookmark.fill.fill.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "bookmark.fill.fill.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "bookmark.fill.fill.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/bookmark.imageset/Contents.json b/damus/Assets.xcassets/iconography/bookmark.imageset/Contents.json
index b9a0914c..6331610e 100644
--- a/damus/Assets.xcassets/iconography/bookmark.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/bookmark.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "bookmark.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "bookmark.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "bookmark.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "bookmark.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/bot.imageset/Contents.json b/damus/Assets.xcassets/iconography/bot.imageset/Contents.json
index 93de7b76..7b91b9ab 100644
--- a/damus/Assets.xcassets/iconography/bot.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/bot.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "bot.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "bot.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "bot.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "bot.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/branches.imageset/Contents.json b/damus/Assets.xcassets/iconography/branches.imageset/Contents.json
index f071b1cf..69fa8262 100644
--- a/damus/Assets.xcassets/iconography/branches.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/branches.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "branches.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "branches.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "branches.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "branches.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/broom.imageset/Contents.json b/damus/Assets.xcassets/iconography/broom.imageset/Contents.json
index 8b222155..056541c4 100644
--- a/damus/Assets.xcassets/iconography/broom.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/broom.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "broom.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "broom.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "broom.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "broom.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/broseer-window.imageset/Contents.json b/damus/Assets.xcassets/iconography/broseer-window.imageset/Contents.json
index 6fbceba8..6ee49493 100644
--- a/damus/Assets.xcassets/iconography/broseer-window.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/broseer-window.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "broseer-window.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "broseer-window.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "broseer-window.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "broseer-window.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/bubble-circle.imageset/Contents.json b/damus/Assets.xcassets/iconography/bubble-circle.imageset/Contents.json
index 3182acb7..579c57fd 100644
--- a/damus/Assets.xcassets/iconography/bubble-circle.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/bubble-circle.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "bubble-circle.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "bubble-circle.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "bubble-circle.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "bubble-circle.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/bubble-circle2.imageset/Contents.json b/damus/Assets.xcassets/iconography/bubble-circle2.imageset/Contents.json
index ee322ca0..c0461d1a 100644
--- a/damus/Assets.xcassets/iconography/bubble-circle2.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/bubble-circle2.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "bubble-circle2.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "bubble-circle2.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "bubble-circle2.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "bubble-circle2.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/bubble.imageset/Contents.json b/damus/Assets.xcassets/iconography/bubble.imageset/Contents.json
index 82fd61d8..4754683e 100644
--- a/damus/Assets.xcassets/iconography/bubble.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/bubble.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "bubble.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "bubble.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "bubble.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "bubble.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/bubble2.imageset/Contents.json b/damus/Assets.xcassets/iconography/bubble2.imageset/Contents.json
index dd0d6d63..9a4fdb08 100644
--- a/damus/Assets.xcassets/iconography/bubble2.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/bubble2.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "bubble2.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "bubble2.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "bubble2.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "bubble2.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/bubbles.imageset/Contents.json b/damus/Assets.xcassets/iconography/bubbles.imageset/Contents.json
index 6b85831d..6982c949 100644
--- a/damus/Assets.xcassets/iconography/bubbles.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/bubbles.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "bubbles.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "bubbles.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "bubbles.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "bubbles.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/bucket.imageset/Contents.json b/damus/Assets.xcassets/iconography/bucket.imageset/Contents.json
index 8237aea6..f9f062a9 100644
--- a/damus/Assets.xcassets/iconography/bucket.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/bucket.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "bucket.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "bucket.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "bucket.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "bucket.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/buildings.imageset/Contents.json b/damus/Assets.xcassets/iconography/buildings.imageset/Contents.json
index d94db60d..19b03b8d 100644
--- a/damus/Assets.xcassets/iconography/buildings.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/buildings.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "buildings.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "buildings.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "buildings.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "buildings.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/bullet-list.imageset/Contents.json b/damus/Assets.xcassets/iconography/bullet-list.imageset/Contents.json
index 45ac6cb6..df99c221 100644
--- a/damus/Assets.xcassets/iconography/bullet-list.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/bullet-list.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "bullet-list.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "bullet-list.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "bullet-list.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "bullet-list.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/cake.imageset/Contents.json b/damus/Assets.xcassets/iconography/cake.imageset/Contents.json
index 72564b88..9977287f 100644
--- a/damus/Assets.xcassets/iconography/cake.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/cake.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "cake.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "cake.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "cake.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "cake.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/calendar.imageset/Contents.json b/damus/Assets.xcassets/iconography/calendar.imageset/Contents.json
index 14f63638..f354cfd0 100644
--- a/damus/Assets.xcassets/iconography/calendar.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/calendar.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "calendar.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "calendar.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "calendar.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "calendar.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/camera.imageset/Contents.json b/damus/Assets.xcassets/iconography/camera.imageset/Contents.json
index 5375d722..8f93bd73 100644
--- a/damus/Assets.xcassets/iconography/camera.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/camera.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "camera.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "camera.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "camera.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "camera.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/chat-text.imageset/Contents.json b/damus/Assets.xcassets/iconography/chat-text.imageset/Contents.json
index 1fb54e40..3ea6c92d 100644
--- a/damus/Assets.xcassets/iconography/chat-text.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/chat-text.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "chat-text.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "chat-text.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "chat-text.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "chat-text.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/chat.imageset/Contents.json b/damus/Assets.xcassets/iconography/chat.imageset/Contents.json
index eb18f675..b4b4e9a4 100644
--- a/damus/Assets.xcassets/iconography/chat.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/chat.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "chat.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "chat.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "chat.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "chat.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/check-circle.fill.imageset/Contents.json b/damus/Assets.xcassets/iconography/check-circle.fill.imageset/Contents.json
index c1b4f8ac..7fb340d7 100644
--- a/damus/Assets.xcassets/iconography/check-circle.fill.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/check-circle.fill.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "check-circle.fill.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "check-circle.fill.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "check-circle.fill.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "check-circle.fill.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/check-circle.imageset/Contents.json b/damus/Assets.xcassets/iconography/check-circle.imageset/Contents.json
index 1238de9d..c92b9019 100644
--- a/damus/Assets.xcassets/iconography/check-circle.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/check-circle.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "check-circle.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "check-circle.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "check-circle.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "check-circle.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/checkbox.imageset/Contents.json b/damus/Assets.xcassets/iconography/checkbox.imageset/Contents.json
index b55e074e..8030eae0 100644
--- a/damus/Assets.xcassets/iconography/checkbox.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/checkbox.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "checkbox.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "checkbox.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "checkbox.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "checkbox.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/checkmark.imageset/Contents.json b/damus/Assets.xcassets/iconography/checkmark.imageset/Contents.json
index ba8cfddd..930803b1 100644
--- a/damus/Assets.xcassets/iconography/checkmark.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/checkmark.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "checkmark.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "checkmark.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "checkmark.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "checkmark.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/chevron-double-down.imageset/Contents.json b/damus/Assets.xcassets/iconography/chevron-double-down.imageset/Contents.json
index 9dbc6c96..19f8b96a 100644
--- a/damus/Assets.xcassets/iconography/chevron-double-down.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/chevron-double-down.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "chevron-double-down.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "chevron-double-down.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "chevron-double-down.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "chevron-double-down.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/chevron-double-left.imageset/Contents.json b/damus/Assets.xcassets/iconography/chevron-double-left.imageset/Contents.json
index f6090bdb..987f87c6 100644
--- a/damus/Assets.xcassets/iconography/chevron-double-left.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/chevron-double-left.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "chevron-double-left.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "chevron-double-left.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "chevron-double-left.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "chevron-double-left.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/chevron-double-right.imageset/Contents.json b/damus/Assets.xcassets/iconography/chevron-double-right.imageset/Contents.json
index 75b38d63..87da5492 100644
--- a/damus/Assets.xcassets/iconography/chevron-double-right.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/chevron-double-right.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "chevron-double-right.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "chevron-double-right.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "chevron-double-right.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "chevron-double-right.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/chevron-double-up.imageset/Contents.json b/damus/Assets.xcassets/iconography/chevron-double-up.imageset/Contents.json
index 9b3998a1..7fc54f3f 100644
--- a/damus/Assets.xcassets/iconography/chevron-double-up.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/chevron-double-up.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "chevron-double-up.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "chevron-double-up.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "chevron-double-up.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "chevron-double-up.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/chevron-down.imageset/Contents.json b/damus/Assets.xcassets/iconography/chevron-down.imageset/Contents.json
index fb3f58b1..cad91939 100644
--- a/damus/Assets.xcassets/iconography/chevron-down.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/chevron-down.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "chevron-down.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "chevron-down.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "chevron-down.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "chevron-down.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/chevron-grabber-horizontal.imageset/Contents.json b/damus/Assets.xcassets/iconography/chevron-grabber-horizontal.imageset/Contents.json
index cac6b955..92658866 100644
--- a/damus/Assets.xcassets/iconography/chevron-grabber-horizontal.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/chevron-grabber-horizontal.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "chevron-grabber-horizontal.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "chevron-grabber-horizontal.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "chevron-grabber-horizontal.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "chevron-grabber-horizontal.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/chevron-grabber-vertical.imageset/Contents.json b/damus/Assets.xcassets/iconography/chevron-grabber-vertical.imageset/Contents.json
index 37f2e919..669eae9b 100644
--- a/damus/Assets.xcassets/iconography/chevron-grabber-vertical.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/chevron-grabber-vertical.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "chevron-grabber-vertical.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "chevron-grabber-vertical.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "chevron-grabber-vertical.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "chevron-grabber-vertical.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/chevron-large-bottom.imageset/Contents.json b/damus/Assets.xcassets/iconography/chevron-large-bottom.imageset/Contents.json
index a3174916..2e5f8ddd 100644
--- a/damus/Assets.xcassets/iconography/chevron-large-bottom.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/chevron-large-bottom.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "chevron-large-bottom.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "chevron-large-bottom.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "chevron-large-bottom.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "chevron-large-bottom.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/chevron-large-left.imageset/Contents.json b/damus/Assets.xcassets/iconography/chevron-large-left.imageset/Contents.json
index c2356e1a..d239966d 100644
--- a/damus/Assets.xcassets/iconography/chevron-large-left.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/chevron-large-left.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "chevron-large-left.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "chevron-large-left.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "chevron-large-left.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "chevron-large-left.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/chevron-large-right.imageset/Contents.json b/damus/Assets.xcassets/iconography/chevron-large-right.imageset/Contents.json
index d4de47ae..f4fb5a52 100644
--- a/damus/Assets.xcassets/iconography/chevron-large-right.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/chevron-large-right.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "chevron-large-right.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "chevron-large-right.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "chevron-large-right.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "chevron-large-right.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/chevron-large-top.imageset/Contents.json b/damus/Assets.xcassets/iconography/chevron-large-top.imageset/Contents.json
index adffbd40..42ad3bbd 100644
--- a/damus/Assets.xcassets/iconography/chevron-large-top.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/chevron-large-top.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "chevron-large-top.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "chevron-large-top.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "chevron-large-top.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "chevron-large-top.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/chevron-left.imageset/Contents.json b/damus/Assets.xcassets/iconography/chevron-left.imageset/Contents.json
index 866ec61d..b2d8f521 100644
--- a/damus/Assets.xcassets/iconography/chevron-left.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/chevron-left.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "chevron-left.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "chevron-left.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "chevron-left.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "chevron-left.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/chevron-right.imageset/Contents.json b/damus/Assets.xcassets/iconography/chevron-right.imageset/Contents.json
index 18c08345..ffff31ea 100644
--- a/damus/Assets.xcassets/iconography/chevron-right.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/chevron-right.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "chevron-right.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "chevron-right.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "chevron-right.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "chevron-right.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/chevron-up.imageset/Contents.json b/damus/Assets.xcassets/iconography/chevron-up.imageset/Contents.json
index c82fc35a..c2bae88f 100644
--- a/damus/Assets.xcassets/iconography/chevron-up.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/chevron-up.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "chevron-up.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "chevron-up.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "chevron-up.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "chevron-up.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/circle-placeholder-off.imageset/Contents.json b/damus/Assets.xcassets/iconography/circle-placeholder-off.imageset/Contents.json
index 1222706a..a1412995 100644
--- a/damus/Assets.xcassets/iconography/circle-placeholder-off.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/circle-placeholder-off.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "circle-placeholder-off.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "circle-placeholder-off.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "circle-placeholder-off.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "circle-placeholder-off.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/circle-placeholder.imageset/Contents.json b/damus/Assets.xcassets/iconography/circle-placeholder.imageset/Contents.json
index 34fefb7a..feced415 100644
--- a/damus/Assets.xcassets/iconography/circle-placeholder.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/circle-placeholder.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "circle-placeholder.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "circle-placeholder.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "circle-placeholder.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "circle-placeholder.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/clipboard.imageset/Contents.json b/damus/Assets.xcassets/iconography/clipboard.imageset/Contents.json
index 98ebc391..9cd6a6a1 100644
--- a/damus/Assets.xcassets/iconography/clipboard.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/clipboard.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "clipboard.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "clipboard.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "clipboard.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "clipboard.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/close-circle.imageset/Contents.json b/damus/Assets.xcassets/iconography/close-circle.imageset/Contents.json
index 996af3d7..c5870a00 100644
--- a/damus/Assets.xcassets/iconography/close-circle.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/close-circle.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "close-circle.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "close-circle.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "close-circle.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "close-circle.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/close-small.imageset/Contents.json b/damus/Assets.xcassets/iconography/close-small.imageset/Contents.json
index 62479910..a039286e 100644
--- a/damus/Assets.xcassets/iconography/close-small.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/close-small.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "close-small.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "close-small.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "close-small.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "close-small.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/close-square.imageset/Contents.json b/damus/Assets.xcassets/iconography/close-square.imageset/Contents.json
index 104a2645..4d4bbf15 100644
--- a/damus/Assets.xcassets/iconography/close-square.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/close-square.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "close-square.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "close-square.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "close-square.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "close-square.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/close.imageset/Contents.json b/damus/Assets.xcassets/iconography/close.imageset/Contents.json
index 28298d7b..c01e65bb 100644
--- a/damus/Assets.xcassets/iconography/close.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/close.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "close.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "close.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "close.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "close.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/cloud-download.imageset/Contents.json b/damus/Assets.xcassets/iconography/cloud-download.imageset/Contents.json
index ab86cd3e..f4580338 100644
--- a/damus/Assets.xcassets/iconography/cloud-download.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/cloud-download.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "cloud-download.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "cloud-download.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "cloud-download.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "cloud-download.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/cloud-offline.imageset/Contents.json b/damus/Assets.xcassets/iconography/cloud-offline.imageset/Contents.json
index 10228389..aa508136 100644
--- a/damus/Assets.xcassets/iconography/cloud-offline.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/cloud-offline.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "cloud-offline.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "cloud-offline.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "cloud-offline.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "cloud-offline.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/cloud-upload.imageset/Contents.json b/damus/Assets.xcassets/iconography/cloud-upload.imageset/Contents.json
index 5bcaf0be..c723b114 100644
--- a/damus/Assets.xcassets/iconography/cloud-upload.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/cloud-upload.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "cloud-upload.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "cloud-upload.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "cloud-upload.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "cloud-upload.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/cloud.imageset/Contents.json b/damus/Assets.xcassets/iconography/cloud.imageset/Contents.json
index 8251c396..016f83e8 100644
--- a/damus/Assets.xcassets/iconography/cloud.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/cloud.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "cloud.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "cloud.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "cloud.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "cloud.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/cloudy.imageset/Contents.json b/damus/Assets.xcassets/iconography/cloudy.imageset/Contents.json
index b087448d..2b82e327 100644
--- a/damus/Assets.xcassets/iconography/cloudy.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/cloudy.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "cloudy.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "cloudy.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "cloudy.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "cloudy.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/code-insert.imageset/Contents.json b/damus/Assets.xcassets/iconography/code-insert.imageset/Contents.json
index da1d4925..c806ee5a 100644
--- a/damus/Assets.xcassets/iconography/code-insert.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/code-insert.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "code-insert.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "code-insert.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "code-insert.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "code-insert.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/code.imageset/Contents.json b/damus/Assets.xcassets/iconography/code.imageset/Contents.json
index 091ec3ab..ceeeb487 100644
--- a/damus/Assets.xcassets/iconography/code.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/code.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "code.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "code.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "code.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "code.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/color-palette.imageset/Contents.json b/damus/Assets.xcassets/iconography/color-palette.imageset/Contents.json
index a95e81e3..9fc4774a 100644
--- a/damus/Assets.xcassets/iconography/color-palette.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/color-palette.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "color-palette.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "color-palette.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "color-palette.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "color-palette.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/color-swatch.imageset/Contents.json b/damus/Assets.xcassets/iconography/color-swatch.imageset/Contents.json
index 06b858ae..3b5405f2 100644
--- a/damus/Assets.xcassets/iconography/color-swatch.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/color-swatch.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "color-swatch.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "color-swatch.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "color-swatch.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "color-swatch.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/command-square.imageset/Contents.json b/damus/Assets.xcassets/iconography/command-square.imageset/Contents.json
index 8134feaf..0e413fd9 100644
--- a/damus/Assets.xcassets/iconography/command-square.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/command-square.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "command-square.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "command-square.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "command-square.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "command-square.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/command.imageset/Contents.json b/damus/Assets.xcassets/iconography/command.imageset/Contents.json
index e8cf8a14..5c0ba63d 100644
--- a/damus/Assets.xcassets/iconography/command.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/command.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "command.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "command.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "command.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "command.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/copy.fill.imageset/Contents.json b/damus/Assets.xcassets/iconography/copy.fill.imageset/Contents.json
index c03890be..fed82243 100644
--- a/damus/Assets.xcassets/iconography/copy.fill.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/copy.fill.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "copy.fill.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "copy.fill.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "copy.fill.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "copy.fill.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/copy.imageset/Contents.json b/damus/Assets.xcassets/iconography/copy.imageset/Contents.json
index be85778c..e6c84ad3 100644
--- a/damus/Assets.xcassets/iconography/copy.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/copy.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "copy.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "copy.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "copy.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "copy.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/copy2.fill.imageset/Contents.json b/damus/Assets.xcassets/iconography/copy2.fill.imageset/Contents.json
index 869ff830..97ebe8d8 100644
--- a/damus/Assets.xcassets/iconography/copy2.fill.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/copy2.fill.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "copy2.fill.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "copy2.fill.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "copy2.fill.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "copy2.fill.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/copy2.imageset/Contents.json b/damus/Assets.xcassets/iconography/copy2.imageset/Contents.json
index 137c6d99..d9bdb4e0 100644
--- a/damus/Assets.xcassets/iconography/copy2.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/copy2.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "copy2.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "copy2.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "copy2.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "copy2.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/corsor-click.imageset/Contents.json b/damus/Assets.xcassets/iconography/corsor-click.imageset/Contents.json
index 072f68c4..88e15f57 100644
--- a/damus/Assets.xcassets/iconography/corsor-click.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/corsor-click.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "corsor-click.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "corsor-click.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "corsor-click.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "corsor-click.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/court.imageset/Contents.json b/damus/Assets.xcassets/iconography/court.imageset/Contents.json
index 8264586a..8407cbd2 100644
--- a/damus/Assets.xcassets/iconography/court.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/court.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "court.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "court.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "court.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "court.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/credit-card-add.imageset/Contents.json b/damus/Assets.xcassets/iconography/credit-card-add.imageset/Contents.json
index 5e8c99cf..83920362 100644
--- a/damus/Assets.xcassets/iconography/credit-card-add.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/credit-card-add.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "credit-card-add.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "credit-card-add.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "credit-card-add.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "credit-card-add.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/credit-card.imageset/Contents.json b/damus/Assets.xcassets/iconography/credit-card.imageset/Contents.json
index fd7d7bae..b6748ffc 100644
--- a/damus/Assets.xcassets/iconography/credit-card.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/credit-card.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "credit-card.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "credit-card.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "credit-card.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "credit-card.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/crop.imageset/Contents.json b/damus/Assets.xcassets/iconography/crop.imageset/Contents.json
index b825abee..c315e435 100644
--- a/damus/Assets.xcassets/iconography/crop.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/crop.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "crop.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "crop.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "crop.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "crop.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/cursor-box.imageset/Contents.json b/damus/Assets.xcassets/iconography/cursor-box.imageset/Contents.json
index 105d3acb..2549861f 100644
--- a/damus/Assets.xcassets/iconography/cursor-box.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/cursor-box.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "cursor-box.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "cursor-box.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "cursor-box.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "cursor-box.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/cursor.imageset/Contents.json b/damus/Assets.xcassets/iconography/cursor.imageset/Contents.json
index 2e37ea9d..8b0e80a4 100644
--- a/damus/Assets.xcassets/iconography/cursor.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/cursor.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "cursor.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "cursor.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "cursor.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "cursor.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/dark-mode.imageset/Contents.json b/damus/Assets.xcassets/iconography/dark-mode.imageset/Contents.json
index caa0f174..e3844dcb 100644
--- a/damus/Assets.xcassets/iconography/dark-mode.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/dark-mode.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "dark-mode.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "dark-mode.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "dark-mode.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "dark-mode.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/delete.imageset/Contents.json b/damus/Assets.xcassets/iconography/delete.imageset/Contents.json
index 9aec9919..818fb53e 100644
--- a/damus/Assets.xcassets/iconography/delete.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/delete.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "delete.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "delete.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "delete.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "delete.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/disk.imageset/Contents.json b/damus/Assets.xcassets/iconography/disk.imageset/Contents.json
index 9993c8c9..db294f23 100644
--- a/damus/Assets.xcassets/iconography/disk.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/disk.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "disk.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "disk.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "disk.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "disk.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/dock.imageset/Contents.json b/damus/Assets.xcassets/iconography/dock.imageset/Contents.json
index 4dbda5e7..b39b546b 100644
--- a/damus/Assets.xcassets/iconography/dock.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/dock.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "dock.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "dock.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "dock.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "dock.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/document-add.imageset/Contents.json b/damus/Assets.xcassets/iconography/document-add.imageset/Contents.json
index a828d920..159cc972 100644
--- a/damus/Assets.xcassets/iconography/document-add.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/document-add.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "document-add.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "document-add.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "document-add.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "document-add.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/document-with-lines.imageset/Contents.json b/damus/Assets.xcassets/iconography/document-with-lines.imageset/Contents.json
index 208347a0..3fc64461 100644
--- a/damus/Assets.xcassets/iconography/document-with-lines.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/document-with-lines.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "document-with-lines.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "document-with-lines.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "document-with-lines.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "document-with-lines.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/document.imageset/Contents.json b/damus/Assets.xcassets/iconography/document.imageset/Contents.json
index 7abe3e75..1bdb78f0 100644
--- a/damus/Assets.xcassets/iconography/document.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/document.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "document.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "document.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "document.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "document.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/dollar-currency.imageset/Contents.json b/damus/Assets.xcassets/iconography/dollar-currency.imageset/Contents.json
index 1e2e5829..99e50d70 100644
--- a/damus/Assets.xcassets/iconography/dollar-currency.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/dollar-currency.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "dollar-currency.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "dollar-currency.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "dollar-currency.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "dollar-currency.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/dots-grid.imageset/Contents.json b/damus/Assets.xcassets/iconography/dots-grid.imageset/Contents.json
index 9fe3b0ca..3d398326 100644
--- a/damus/Assets.xcassets/iconography/dots-grid.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/dots-grid.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "dots-grid.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "dots-grid.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "dots-grid.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "dots-grid.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/download.imageset/Contents.json b/damus/Assets.xcassets/iconography/download.imageset/Contents.json
index 817359a2..9bb55227 100644
--- a/damus/Assets.xcassets/iconography/download.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/download.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "download.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "download.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "download.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "download.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/drag.imageset/Contents.json b/damus/Assets.xcassets/iconography/drag.imageset/Contents.json
index f80890bc..10196a27 100644
--- a/damus/Assets.xcassets/iconography/drag.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/drag.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "drag.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "drag.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "drag.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "drag.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/draw.imageset/Contents.json b/damus/Assets.xcassets/iconography/draw.imageset/Contents.json
index f45d2199..f890d62d 100644
--- a/damus/Assets.xcassets/iconography/draw.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/draw.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "draw.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "draw.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "draw.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "draw.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/earth.imageset/Contents.json b/damus/Assets.xcassets/iconography/earth.imageset/Contents.json
index ce928664..efd91757 100644
--- a/damus/Assets.xcassets/iconography/earth.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/earth.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "earth.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "earth.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "earth.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "earth.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/edit-list.imageset/Contents.json b/damus/Assets.xcassets/iconography/edit-list.imageset/Contents.json
index f6e8d3a3..498abf7e 100644
--- a/damus/Assets.xcassets/iconography/edit-list.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/edit-list.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "edit-list.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "edit-list.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "edit-list.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "edit-list.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/edited.imageset/Contents.json b/damus/Assets.xcassets/iconography/edited.imageset/Contents.json
index 0a625945..9cc5cde9 100644
--- a/damus/Assets.xcassets/iconography/edited.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/edited.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "edited.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "edited.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "edited.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "edited.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/expand.imageset/Contents.json b/damus/Assets.xcassets/iconography/expand.imageset/Contents.json
index 547db547..b1d563bc 100644
--- a/damus/Assets.xcassets/iconography/expand.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/expand.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "expand.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "expand.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "expand.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "expand.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/explore-compass.imageset/Contents.json b/damus/Assets.xcassets/iconography/explore-compass.imageset/Contents.json
index 398d4aef..ec41213b 100644
--- a/damus/Assets.xcassets/iconography/explore-compass.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/explore-compass.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "explore-compass.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "explore-compass.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "explore-compass.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "explore-compass.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/eye-off.fill.imageset/Contents.json b/damus/Assets.xcassets/iconography/eye-off.fill.imageset/Contents.json
index 1cc0c3f9..a429fb39 100644
--- a/damus/Assets.xcassets/iconography/eye-off.fill.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/eye-off.fill.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "eye-off.fill.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "eye-off.fill.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "eye-off.fill.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "eye-off.fill.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/eye-off.imageset/Contents.json b/damus/Assets.xcassets/iconography/eye-off.imageset/Contents.json
index 1aee9d90..1d7617d0 100644
--- a/damus/Assets.xcassets/iconography/eye-off.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/eye-off.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "eye-off.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "eye-off.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "eye-off.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "eye-off.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/eye.fill.imageset/Contents.json b/damus/Assets.xcassets/iconography/eye.fill.imageset/Contents.json
index d82ecf88..3d70538d 100644
--- a/damus/Assets.xcassets/iconography/eye.fill.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/eye.fill.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "eye.fill.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "eye.fill.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "eye.fill.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "eye.fill.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/eye.imageset/Contents.json b/damus/Assets.xcassets/iconography/eye.imageset/Contents.json
index d5696cab..a729ac63 100644
--- a/damus/Assets.xcassets/iconography/eye.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/eye.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "eye.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "eye.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "eye.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "eye.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/face-id.imageset/Contents.json b/damus/Assets.xcassets/iconography/face-id.imageset/Contents.json
index 435f22d3..340eafc3 100644
--- a/damus/Assets.xcassets/iconography/face-id.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/face-id.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "face-id.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "face-id.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "face-id.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "face-id.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/file-attachment.imageset/Contents.json b/damus/Assets.xcassets/iconography/file-attachment.imageset/Contents.json
index 019ae4b0..6e68b1d7 100644
--- a/damus/Assets.xcassets/iconography/file-attachment.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/file-attachment.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "file-attachment.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "file-attachment.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "file-attachment.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "file-attachment.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/file-document-cloud.imageset/Contents.json b/damus/Assets.xcassets/iconography/file-document-cloud.imageset/Contents.json
index b32f43ae..ef3f4acb 100644
--- a/damus/Assets.xcassets/iconography/file-document-cloud.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/file-document-cloud.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "file-document-cloud.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "file-document-cloud.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "file-document-cloud.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "file-document-cloud.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/file-document1.imageset/Contents.json b/damus/Assets.xcassets/iconography/file-document1.imageset/Contents.json
index 2fb1f827..9ba3007d 100644
--- a/damus/Assets.xcassets/iconography/file-document1.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/file-document1.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "file-document1.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "file-document1.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "file-document1.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "file-document1.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/file-documents.imageset/Contents.json b/damus/Assets.xcassets/iconography/file-documents.imageset/Contents.json
index 4d87001c..93a5e0e6 100644
--- a/damus/Assets.xcassets/iconography/file-documents.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/file-documents.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "file-documents.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "file-documents.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "file-documents.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "file-documents.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/filter-timeline.imageset/Contents.json b/damus/Assets.xcassets/iconography/filter-timeline.imageset/Contents.json
index d91f9c49..2b7ad304 100644
--- a/damus/Assets.xcassets/iconography/filter-timeline.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/filter-timeline.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "filter-timeline.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "filter-timeline.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "filter-timeline.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "filter-timeline.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/filter.imageset/Contents.json b/damus/Assets.xcassets/iconography/filter.imageset/Contents.json
index 01d6c7dd..6f25adbc 100644
--- a/damus/Assets.xcassets/iconography/filter.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/filter.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "filter.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "filter.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "filter.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "filter.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/filter2.imageset/Contents.json b/damus/Assets.xcassets/iconography/filter2.imageset/Contents.json
index 1b903387..03f8f60c 100644
--- a/damus/Assets.xcassets/iconography/filter2.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/filter2.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "filter2.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "filter2.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "filter2.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "filter2.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/finger-print.imageset/Contents.json b/damus/Assets.xcassets/iconography/finger-print.imageset/Contents.json
index 26fdf27e..3d7e79b3 100644
--- a/damus/Assets.xcassets/iconography/finger-print.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/finger-print.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "finger-print.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "finger-print.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "finger-print.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "finger-print.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/fire.fill.imageset/Contents.json b/damus/Assets.xcassets/iconography/fire.fill.imageset/Contents.json
index 9b637a36..dfe4d12e 100644
--- a/damus/Assets.xcassets/iconography/fire.fill.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/fire.fill.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "fire.fill.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "fire.fill.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "fire.fill.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "fire.fill.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/fire.imageset/Contents.json b/damus/Assets.xcassets/iconography/fire.imageset/Contents.json
index 22c6560a..7fea66cf 100644
--- a/damus/Assets.xcassets/iconography/fire.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/fire.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "fire.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "fire.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "fire.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "fire.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/flag.imageset/Contents.json b/damus/Assets.xcassets/iconography/flag.imageset/Contents.json
index 22cecc7b..8243e14b 100644
--- a/damus/Assets.xcassets/iconography/flag.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/flag.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "flag.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "flag.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "flag.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "flag.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/focus.imageset/Contents.json b/damus/Assets.xcassets/iconography/focus.imageset/Contents.json
index 9def768b..fd69b15a 100644
--- a/damus/Assets.xcassets/iconography/focus.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/focus.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "focus.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "focus.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "focus.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "focus.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/folder-add.imageset/Contents.json b/damus/Assets.xcassets/iconography/folder-add.imageset/Contents.json
index 01a9e354..59055626 100644
--- a/damus/Assets.xcassets/iconography/folder-add.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/folder-add.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "folder-add.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "folder-add.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "folder-add.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "folder-add.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/folder-bookmarks.imageset/Contents.json b/damus/Assets.xcassets/iconography/folder-bookmarks.imageset/Contents.json
index ead1fbe4..d7e12e9a 100644
--- a/damus/Assets.xcassets/iconography/folder-bookmarks.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/folder-bookmarks.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "folder-bookmarks.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "folder-bookmarks.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "folder-bookmarks.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "folder-bookmarks.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/folder-cloud.imageset/Contents.json b/damus/Assets.xcassets/iconography/folder-cloud.imageset/Contents.json
index 7dc3790b..b80fe5f4 100644
--- a/damus/Assets.xcassets/iconography/folder-cloud.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/folder-cloud.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "folder-cloud.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "folder-cloud.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "folder-cloud.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "folder-cloud.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/folder-delete.imageset/Contents.json b/damus/Assets.xcassets/iconography/folder-delete.imageset/Contents.json
index 488fa1c9..94355c27 100644
--- a/damus/Assets.xcassets/iconography/folder-delete.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/folder-delete.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "folder-delete.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "folder-delete.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "folder-delete.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "folder-delete.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/folder-download.imageset/Contents.json b/damus/Assets.xcassets/iconography/folder-download.imageset/Contents.json
index 0cde2af4..85dba461 100644
--- a/damus/Assets.xcassets/iconography/folder-download.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/folder-download.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "folder-download.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "folder-download.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "folder-download.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "folder-download.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/folder-linked.imageset/Contents.json b/damus/Assets.xcassets/iconography/folder-linked.imageset/Contents.json
index 35048605..51ebd36e 100644
--- a/damus/Assets.xcassets/iconography/folder-linked.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/folder-linked.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "folder-linked.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "folder-linked.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "folder-linked.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "folder-linked.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/folder-restricted.imageset/Contents.json b/damus/Assets.xcassets/iconography/folder-restricted.imageset/Contents.json
index 542fa584..d5982415 100644
--- a/damus/Assets.xcassets/iconography/folder-restricted.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/folder-restricted.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "folder-restricted.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "folder-restricted.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "folder-restricted.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "folder-restricted.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/folder-shared.imageset/Contents.json b/damus/Assets.xcassets/iconography/folder-shared.imageset/Contents.json
index dafbf913..0e44b224 100644
--- a/damus/Assets.xcassets/iconography/folder-shared.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/folder-shared.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "folder-shared.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "folder-shared.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "folder-shared.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "folder-shared.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/folder-upload.imageset/Contents.json b/damus/Assets.xcassets/iconography/folder-upload.imageset/Contents.json
index 9e9b01c1..99ca8eed 100644
--- a/damus/Assets.xcassets/iconography/folder-upload.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/folder-upload.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "folder-upload.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "folder-upload.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "folder-upload.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "folder-upload.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/folder.imageset/Contents.json b/damus/Assets.xcassets/iconography/folder.imageset/Contents.json
index 1231a585..64e94a6f 100644
--- a/damus/Assets.xcassets/iconography/folder.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/folder.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "folder.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "folder.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "folder.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "folder.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/folder2.imageset/Contents.json b/damus/Assets.xcassets/iconography/folder2.imageset/Contents.json
index b9aa2403..dcc31cc1 100644
--- a/damus/Assets.xcassets/iconography/folder2.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/folder2.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "folder2.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "folder2.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "folder2.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "folder2.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/folders.imageset/Contents.json b/damus/Assets.xcassets/iconography/folders.imageset/Contents.json
index 1ef444b2..59000ff3 100644
--- a/damus/Assets.xcassets/iconography/folders.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/folders.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "folders.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "folders.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "folders.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "folders.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/fork.imageset/Contents.json b/damus/Assets.xcassets/iconography/fork.imageset/Contents.json
index 363c8853..84d66e7d 100644
--- a/damus/Assets.xcassets/iconography/fork.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/fork.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "fork.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "fork.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "fork.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "fork.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/gift.imageset/Contents.json b/damus/Assets.xcassets/iconography/gift.imageset/Contents.json
index 67f932c1..ffed9e51 100644
--- a/damus/Assets.xcassets/iconography/gift.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/gift.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "gift.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "gift.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "gift.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "gift.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/globe.imageset/Contents.json b/damus/Assets.xcassets/iconography/globe.imageset/Contents.json
index fbcf4e5f..decd639f 100644
--- a/damus/Assets.xcassets/iconography/globe.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/globe.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "globe.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "globe.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "globe.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "globe.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/grow.imageset/Contents.json b/damus/Assets.xcassets/iconography/grow.imageset/Contents.json
index 1108a5af..50cd96d2 100644
--- a/damus/Assets.xcassets/iconography/grow.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/grow.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "grow.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "grow.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "grow.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "grow.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/growth.fill.imageset/Contents.json b/damus/Assets.xcassets/iconography/growth.fill.imageset/Contents.json
index 50f07a77..38816833 100644
--- a/damus/Assets.xcassets/iconography/growth.fill.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/growth.fill.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "growth.fill.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "growth.fill.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "growth.fill.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "growth.fill.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/hamburger-menu.imageset/Contents.json b/damus/Assets.xcassets/iconography/hamburger-menu.imageset/Contents.json
index 8b9d717c..258aa0c0 100644
--- a/damus/Assets.xcassets/iconography/hamburger-menu.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/hamburger-menu.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "hamburger-menu.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "hamburger-menu.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "hamburger-menu.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "hamburger-menu.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/hamburger-menu2.imageset/Contents.json b/damus/Assets.xcassets/iconography/hamburger-menu2.imageset/Contents.json
index 17f1eccd..628e217d 100644
--- a/damus/Assets.xcassets/iconography/hamburger-menu2.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/hamburger-menu2.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "hamburger-menu2.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "hamburger-menu2.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "hamburger-menu2.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "hamburger-menu2.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/hamburger-menu3.imageset/Contents.json b/damus/Assets.xcassets/iconography/hamburger-menu3.imageset/Contents.json
index 7b2381e7..0efc954b 100644
--- a/damus/Assets.xcassets/iconography/hamburger-menu3.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/hamburger-menu3.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "hamburger-menu3.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "hamburger-menu3.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "hamburger-menu3.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "hamburger-menu3.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/headphones.imageset/Contents.json b/damus/Assets.xcassets/iconography/headphones.imageset/Contents.json
index 7c32580e..39e35445 100644
--- a/damus/Assets.xcassets/iconography/headphones.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/headphones.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "headphones.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "headphones.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "headphones.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "headphones.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/heart.fill.imageset/Contents.json b/damus/Assets.xcassets/iconography/heart.fill.imageset/Contents.json
index c163c68f..203e42f6 100644
--- a/damus/Assets.xcassets/iconography/heart.fill.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/heart.fill.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "heart.fill.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "heart.fill.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "heart.fill.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "heart.fill.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/heart.imageset/Contents.json b/damus/Assets.xcassets/iconography/heart.imageset/Contents.json
index 0b277d7d..23613e4f 100644
--- a/damus/Assets.xcassets/iconography/heart.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/heart.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "heart.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "heart.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "heart.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "heart.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/help2.fill.imageset/Contents.json b/damus/Assets.xcassets/iconography/help2.fill.imageset/Contents.json
index 103c20f0..19ea5b7f 100644
--- a/damus/Assets.xcassets/iconography/help2.fill.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/help2.fill.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "help2.fill.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "help2.fill.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "help2.fill.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "help2.fill.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/help2.imageset/Contents.json b/damus/Assets.xcassets/iconography/help2.imageset/Contents.json
index c864566c..34beff8b 100644
--- a/damus/Assets.xcassets/iconography/help2.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/help2.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "help2.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "help2.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "help2.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "help2.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/hexagon.imageset/Contents.json b/damus/Assets.xcassets/iconography/hexagon.imageset/Contents.json
index a90ec85f..707cf3e7 100644
--- a/damus/Assets.xcassets/iconography/hexagon.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/hexagon.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "hexagon.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "hexagon.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "hexagon.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "hexagon.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/home.fill.fill.imageset/Contents.json b/damus/Assets.xcassets/iconography/home.fill.fill.imageset/Contents.json
index 027a4799..cf0a72ca 100644
--- a/damus/Assets.xcassets/iconography/home.fill.fill.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/home.fill.fill.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "home.fill.fill.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "home.fill.fill.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "home.fill.fill.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "home.fill.fill.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/home.imageset/Contents.json b/damus/Assets.xcassets/iconography/home.imageset/Contents.json
index 654a69df..dc2a06a1 100644
--- a/damus/Assets.xcassets/iconography/home.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/home.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "home.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "home.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "home.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "home.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/images.imageset/Contents.json b/damus/Assets.xcassets/iconography/images.imageset/Contents.json
index ea0094dd..83970fa0 100644
--- a/damus/Assets.xcassets/iconography/images.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/images.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "images.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "images.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "images.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "images.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/images2.imageset/Contents.json b/damus/Assets.xcassets/iconography/images2.imageset/Contents.json
index eee9999f..0397ac22 100644
--- a/damus/Assets.xcassets/iconography/images2.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/images2.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "images2.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "images2.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "images2.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "images2.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/inbox.imageset/Contents.json b/damus/Assets.xcassets/iconography/inbox.imageset/Contents.json
index b5681ed8..c87225ca 100644
--- a/damus/Assets.xcassets/iconography/inbox.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/inbox.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "inbox.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "inbox.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "inbox.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "inbox.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/info-square.imageset/Contents.json b/damus/Assets.xcassets/iconography/info-square.imageset/Contents.json
index 89ecf622..040b284e 100644
--- a/damus/Assets.xcassets/iconography/info-square.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/info-square.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "info-square.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "info-square.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "info-square.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "info-square.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/info.imageset/Contents.json b/damus/Assets.xcassets/iconography/info.imageset/Contents.json
index b5faab12..5029e385 100644
--- a/damus/Assets.xcassets/iconography/info.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/info.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "info.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "info.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "info.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "info.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/italic.imageset/Contents.json b/damus/Assets.xcassets/iconography/italic.imageset/Contents.json
index 93ac6015..517fb707 100644
--- a/damus/Assets.xcassets/iconography/italic.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/italic.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "italic.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "italic.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "italic.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "italic.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/keyboard-down.imageset/Contents.json b/damus/Assets.xcassets/iconography/keyboard-down.imageset/Contents.json
index 10151723..f9fa6641 100644
--- a/damus/Assets.xcassets/iconography/keyboard-down.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/keyboard-down.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "keyboard-down.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "keyboard-down.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "keyboard-down.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "keyboard-down.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/keyboard-up.imageset/Contents.json b/damus/Assets.xcassets/iconography/keyboard-up.imageset/Contents.json
index 74a81f2c..20f8605a 100644
--- a/damus/Assets.xcassets/iconography/keyboard-up.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/keyboard-up.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "keyboard-up.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "keyboard-up.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "keyboard-up.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "keyboard-up.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/launch.imageset/Contents.json b/damus/Assets.xcassets/iconography/launch.imageset/Contents.json
index 51548c67..13b79d9d 100644
--- a/damus/Assets.xcassets/iconography/launch.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/launch.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "launch.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "launch.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "launch.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "launch.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/layers.imageset/Contents.json b/damus/Assets.xcassets/iconography/layers.imageset/Contents.json
index 2f69454e..d96b2d3b 100644
--- a/damus/Assets.xcassets/iconography/layers.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/layers.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "layers.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "layers.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "layers.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "layers.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/library.imageset/Contents.json b/damus/Assets.xcassets/iconography/library.imageset/Contents.json
index 04d6f771..8a243d86 100644
--- a/damus/Assets.xcassets/iconography/library.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/library.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "library.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "library.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "library.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "library.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/light-bulb.imageset/Contents.json b/damus/Assets.xcassets/iconography/light-bulb.imageset/Contents.json
index 57bd553b..53aeebbd 100644
--- a/damus/Assets.xcassets/iconography/light-bulb.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/light-bulb.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "light-bulb.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "light-bulb.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "light-bulb.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "light-bulb.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/light-mode.imageset/Contents.json b/damus/Assets.xcassets/iconography/light-mode.imageset/Contents.json
index 8e71faed..769e7235 100644
--- a/damus/Assets.xcassets/iconography/light-mode.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/light-mode.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "light-mode.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "light-mode.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "light-mode.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "light-mode.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/link-horizontal.imageset/Contents.json b/damus/Assets.xcassets/iconography/link-horizontal.imageset/Contents.json
index c0df8347..26114879 100644
--- a/damus/Assets.xcassets/iconography/link-horizontal.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/link-horizontal.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "link-horizontal.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "link-horizontal.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "link-horizontal.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "link-horizontal.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/link.imageset/Contents.json b/damus/Assets.xcassets/iconography/link.imageset/Contents.json
index 6060b671..07dcd2b2 100644
--- a/damus/Assets.xcassets/iconography/link.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/link.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "link.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "link.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "link.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "link.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/loader.imageset/Contents.json b/damus/Assets.xcassets/iconography/loader.imageset/Contents.json
index 573b300c..bfca45c9 100644
--- a/damus/Assets.xcassets/iconography/loader.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/loader.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "loader.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "loader.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "loader.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "loader.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/location-explore-compass.imageset/Contents.json b/damus/Assets.xcassets/iconography/location-explore-compass.imageset/Contents.json
index a8dd4ef7..fda2c67f 100644
--- a/damus/Assets.xcassets/iconography/location-explore-compass.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/location-explore-compass.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "location-explore-compass.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "location-explore-compass.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "location-explore-compass.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "location-explore-compass.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/location-map.imageset/Contents.json b/damus/Assets.xcassets/iconography/location-map.imageset/Contents.json
index 99808105..15b9e78a 100644
--- a/damus/Assets.xcassets/iconography/location-map.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/location-map.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "location-map.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "location-map.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "location-map.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "location-map.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/lock.imageset/Contents.json b/damus/Assets.xcassets/iconography/lock.imageset/Contents.json
index 8ca48af9..4d69c19f 100644
--- a/damus/Assets.xcassets/iconography/lock.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/lock.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "lock.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "lock.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "lock.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "lock.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/login.imageset/Contents.json b/damus/Assets.xcassets/iconography/login.imageset/Contents.json
index 4bdb538e..3911a450 100644
--- a/damus/Assets.xcassets/iconography/login.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/login.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "login.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "login.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "login.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "login.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/logout.imageset/Contents.json b/damus/Assets.xcassets/iconography/logout.imageset/Contents.json
index 814f41a8..693d0a8c 100644
--- a/damus/Assets.xcassets/iconography/logout.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/logout.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "logout.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "logout.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "logout.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "logout.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/luggage.imageset/Contents.json b/damus/Assets.xcassets/iconography/luggage.imageset/Contents.json
index eb92c612..3787bad6 100644
--- a/damus/Assets.xcassets/iconography/luggage.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/luggage.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "luggage.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "luggage.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "luggage.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "luggage.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/magic-book.imageset/Contents.json b/damus/Assets.xcassets/iconography/magic-book.imageset/Contents.json
index 590d1ace..a2ecbf14 100644
--- a/damus/Assets.xcassets/iconography/magic-book.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/magic-book.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "magic-book.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "magic-book.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "magic-book.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "magic-book.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/magic-box.imageset/Contents.json b/damus/Assets.xcassets/iconography/magic-box.imageset/Contents.json
index 2562513d..0cc8b2aa 100644
--- a/damus/Assets.xcassets/iconography/magic-box.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/magic-box.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "magic-box.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "magic-box.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "magic-box.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "magic-box.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/magic-hat.imageset/Contents.json b/damus/Assets.xcassets/iconography/magic-hat.imageset/Contents.json
index 6e9fba97..78d7da2d 100644
--- a/damus/Assets.xcassets/iconography/magic-hat.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/magic-hat.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "magic-hat.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "magic-hat.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "magic-hat.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "magic-hat.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/magic-pencil.imageset/Contents.json b/damus/Assets.xcassets/iconography/magic-pencil.imageset/Contents.json
index 5a99d5b6..a1acd65c 100644
--- a/damus/Assets.xcassets/iconography/magic-pencil.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/magic-pencil.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "magic-pencil.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "magic-pencil.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "magic-pencil.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "magic-pencil.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/magic-stick.fill.imageset/Contents.json b/damus/Assets.xcassets/iconography/magic-stick.fill.imageset/Contents.json
index 37ef71e7..de9d88bf 100644
--- a/damus/Assets.xcassets/iconography/magic-stick.fill.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/magic-stick.fill.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "magic-stick.fill.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "magic-stick.fill.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "magic-stick.fill.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "magic-stick.fill.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/magic-stick.imageset/Contents.json b/damus/Assets.xcassets/iconography/magic-stick.imageset/Contents.json
index 9a5883a5..d0d39874 100644
--- a/damus/Assets.xcassets/iconography/magic-stick.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/magic-stick.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "magic-stick.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "magic-stick.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "magic-stick.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "magic-stick.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/magic-stick2.fill.imageset/Contents.json b/damus/Assets.xcassets/iconography/magic-stick2.fill.imageset/Contents.json
index e161cacf..42eb9e42 100644
--- a/damus/Assets.xcassets/iconography/magic-stick2.fill.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/magic-stick2.fill.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "magic-stick2.fill.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "magic-stick2.fill.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "magic-stick2.fill.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "magic-stick2.fill.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/magic-stick2.imageset/Contents.json b/damus/Assets.xcassets/iconography/magic-stick2.imageset/Contents.json
index 5ec5b632..4b8f5ba2 100644
--- a/damus/Assets.xcassets/iconography/magic-stick2.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/magic-stick2.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "magic-stick2.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "magic-stick2.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "magic-stick2.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "magic-stick2.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/map.imageset/Contents.json b/damus/Assets.xcassets/iconography/map.imageset/Contents.json
index d2765f1a..94cab379 100644
--- a/damus/Assets.xcassets/iconography/map.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/map.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "map.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "map.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "map.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "map.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/markdown.imageset/Contents.json b/damus/Assets.xcassets/iconography/markdown.imageset/Contents.json
index 1eb0f5db..ef47f6a7 100644
--- a/damus/Assets.xcassets/iconography/markdown.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/markdown.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "markdown.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "markdown.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "markdown.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "markdown.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/megaphone.imageset/Contents.json b/damus/Assets.xcassets/iconography/megaphone.imageset/Contents.json
index 1a3ea1fb..c5165c0c 100644
--- a/damus/Assets.xcassets/iconography/megaphone.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/megaphone.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "megaphone.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "megaphone.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "megaphone.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "megaphone.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/menu-circle-horizontal.imageset/Contents.json b/damus/Assets.xcassets/iconography/menu-circle-horizontal.imageset/Contents.json
index 001ae4a5..b99f7034 100644
--- a/damus/Assets.xcassets/iconography/menu-circle-horizontal.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/menu-circle-horizontal.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "menu-circle-horizontal.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "menu-circle-horizontal.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "menu-circle-horizontal.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "menu-circle-horizontal.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/menu-circle-vertical.imageset/Contents.json b/damus/Assets.xcassets/iconography/menu-circle-vertical.imageset/Contents.json
index dd163061..756e91b3 100644
--- a/damus/Assets.xcassets/iconography/menu-circle-vertical.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/menu-circle-vertical.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "menu-circle-vertical.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "menu-circle-vertical.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "menu-circle-vertical.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "menu-circle-vertical.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/messages.fill.imageset/Contents.json b/damus/Assets.xcassets/iconography/messages.fill.imageset/Contents.json
index f5f93a11..7d251d53 100644
--- a/damus/Assets.xcassets/iconography/messages.fill.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/messages.fill.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "messages.fill.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "messages.fill.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "messages.fill.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "messages.fill.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/messages.imageset/Contents.json b/damus/Assets.xcassets/iconography/messages.imageset/Contents.json
index b04e07ec..b411ee2d 100644
--- a/damus/Assets.xcassets/iconography/messages.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/messages.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "messages.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "messages.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "messages.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "messages.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/microphone-off.imageset/Contents.json b/damus/Assets.xcassets/iconography/microphone-off.imageset/Contents.json
index 82b9de31..fe650c61 100644
--- a/damus/Assets.xcassets/iconography/microphone-off.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/microphone-off.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "microphone-off.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "microphone-off.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "microphone-off.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "microphone-off.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/microphone.imageset/Contents.json b/damus/Assets.xcassets/iconography/microphone.imageset/Contents.json
index 49b7a33f..44581922 100644
--- a/damus/Assets.xcassets/iconography/microphone.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/microphone.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "microphone.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "microphone.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "microphone.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "microphone.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/minimize.imageset/Contents.json b/damus/Assets.xcassets/iconography/minimize.imageset/Contents.json
index e2060a60..b1b186fb 100644
--- a/damus/Assets.xcassets/iconography/minimize.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/minimize.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "minimize.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "minimize.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "minimize.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "minimize.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/minus-circle.imageset/Contents.json b/damus/Assets.xcassets/iconography/minus-circle.imageset/Contents.json
index e082450e..a9bb6556 100644
--- a/damus/Assets.xcassets/iconography/minus-circle.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/minus-circle.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "minus-circle.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "minus-circle.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "minus-circle.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "minus-circle.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/minus-small.imageset/Contents.json b/damus/Assets.xcassets/iconography/minus-small.imageset/Contents.json
index 7cfe37d0..f992b221 100644
--- a/damus/Assets.xcassets/iconography/minus-small.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/minus-small.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "minus-small.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "minus-small.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "minus-small.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "minus-small.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/minus-square.imageset/Contents.json b/damus/Assets.xcassets/iconography/minus-square.imageset/Contents.json
index 75aabf6a..dfeb0696 100644
--- a/damus/Assets.xcassets/iconography/minus-square.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/minus-square.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "minus-square.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "minus-square.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "minus-square.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "minus-square.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/minus.imageset/Contents.json b/damus/Assets.xcassets/iconography/minus.imageset/Contents.json
index 19e2fbc3..2a9f3bb2 100644
--- a/damus/Assets.xcassets/iconography/minus.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/minus.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "minus.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "minus.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "minus.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "minus.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/more-horizontal.imageset/Contents.json b/damus/Assets.xcassets/iconography/more-horizontal.imageset/Contents.json
index 30232575..4af6640e 100644
--- a/damus/Assets.xcassets/iconography/more-horizontal.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/more-horizontal.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "more-horizontal.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "more-horizontal.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "more-horizontal.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "more-horizontal.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/more-vertical.imageset/Contents.json b/damus/Assets.xcassets/iconography/more-vertical.imageset/Contents.json
index f3f76348..aa23f4bd 100644
--- a/damus/Assets.xcassets/iconography/more-vertical.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/more-vertical.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "more-vertical.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "more-vertical.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "more-vertical.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "more-vertical.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/move.imageset/Contents.json b/damus/Assets.xcassets/iconography/move.imageset/Contents.json
index 0f8dc0fd..b6f35c20 100644
--- a/damus/Assets.xcassets/iconography/move.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/move.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "move.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "move.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "move.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "move.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/multi-media.imageset/Contents.json b/damus/Assets.xcassets/iconography/multi-media.imageset/Contents.json
index 7fb4514d..d3e1ba81 100644
--- a/damus/Assets.xcassets/iconography/multi-media.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/multi-media.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "multi-media.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "multi-media.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "multi-media.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "multi-media.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/multiple-icons.imageset/Contents.json b/damus/Assets.xcassets/iconography/multiple-icons.imageset/Contents.json
index ec95c8df..632ead16 100644
--- a/damus/Assets.xcassets/iconography/multiple-icons.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/multiple-icons.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "multiple-icons.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "multiple-icons.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "multiple-icons.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "multiple-icons.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/music-audio.imageset/Contents.json b/damus/Assets.xcassets/iconography/music-audio.imageset/Contents.json
index 90c374e8..39540ee6 100644
--- a/damus/Assets.xcassets/iconography/music-audio.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/music-audio.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "music-audio.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "music-audio.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "music-audio.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "music-audio.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/mute.imageset/Contents.json b/damus/Assets.xcassets/iconography/mute.imageset/Contents.json
index da4b29ca..24e9d73c 100644
--- a/damus/Assets.xcassets/iconography/mute.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/mute.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "mute.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "mute.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "mute.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "mute.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/new-message.imageset/Contents.json b/damus/Assets.xcassets/iconography/new-message.imageset/Contents.json
index 79b0f090..9459663e 100644
--- a/damus/Assets.xcassets/iconography/new-message.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/new-message.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "new-message.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "new-message.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "new-message.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "new-message.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/news.imageset/Contents.json b/damus/Assets.xcassets/iconography/news.imageset/Contents.json
index 4bd2f10a..ecb14916 100644
--- a/damus/Assets.xcassets/iconography/news.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/news.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "news.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "news.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "news.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "news.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/nostrich.imageset/Contents.json b/damus/Assets.xcassets/iconography/nostrich.imageset/Contents.json
index 7fac48a9..43f870a5 100644
--- a/damus/Assets.xcassets/iconography/nostrich.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/nostrich.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "nostrich.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "nostrich.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "nostrich.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "nostrich.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/nostrich2.imageset/Contents.json b/damus/Assets.xcassets/iconography/nostrich2.imageset/Contents.json
index 2e4650f9..3fd8896c 100644
--- a/damus/Assets.xcassets/iconography/nostrich2.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/nostrich2.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "nostrich2.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "nostrich2.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "nostrich2.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "nostrich2.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/note-book.imageset/Contents.json b/damus/Assets.xcassets/iconography/note-book.imageset/Contents.json
index c623f896..59f539d8 100644
--- a/damus/Assets.xcassets/iconography/note-book.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/note-book.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "note-book.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "note-book.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "note-book.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "note-book.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/notes.fill.imageset/Contents.json b/damus/Assets.xcassets/iconography/notes.fill.imageset/Contents.json
index f05ef33c..949d13d4 100644
--- a/damus/Assets.xcassets/iconography/notes.fill.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/notes.fill.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "notes.fill.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "notes.fill.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "notes.fill.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "notes.fill.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/notes.imageset/Contents.json b/damus/Assets.xcassets/iconography/notes.imageset/Contents.json
index b94b152a..51db3021 100644
--- a/damus/Assets.xcassets/iconography/notes.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/notes.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "notes.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "notes.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "notes.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "notes.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/notification-bell-off.imageset/Contents.json b/damus/Assets.xcassets/iconography/notification-bell-off.imageset/Contents.json
index 83abae15..0e1b7436 100644
--- a/damus/Assets.xcassets/iconography/notification-bell-off.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/notification-bell-off.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "notification-bell-off.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "notification-bell-off.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "notification-bell-off.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "notification-bell-off.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/notification-bell-on.imageset/Contents.json b/damus/Assets.xcassets/iconography/notification-bell-on.imageset/Contents.json
index 0c029816..27cdc7fc 100644
--- a/damus/Assets.xcassets/iconography/notification-bell-on.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/notification-bell-on.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "notification-bell-on.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "notification-bell-on.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "notification-bell-on.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "notification-bell-on.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/notification-bell.fill.imageset/Contents.json b/damus/Assets.xcassets/iconography/notification-bell.fill.imageset/Contents.json
index a1a3d6df..bb635f82 100644
--- a/damus/Assets.xcassets/iconography/notification-bell.fill.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/notification-bell.fill.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "notification-bell.fill.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "notification-bell.fill.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "notification-bell.fill.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "notification-bell.fill.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/notification-bell.imageset/Contents.json b/damus/Assets.xcassets/iconography/notification-bell.imageset/Contents.json
index ea9ea581..1c569b38 100644
--- a/damus/Assets.xcassets/iconography/notification-bell.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/notification-bell.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "notification-bell.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "notification-bell.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "notification-bell.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "notification-bell.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/notification-indicator.fill.imageset/Contents.json b/damus/Assets.xcassets/iconography/notification-indicator.fill.imageset/Contents.json
index 77e012b9..5a16a0eb 100644
--- a/damus/Assets.xcassets/iconography/notification-indicator.fill.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/notification-indicator.fill.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "notification-indicator.fill.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "notification-indicator.fill.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "notification-indicator.fill.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "notification-indicator.fill.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/notification-indicator.imageset/Contents.json b/damus/Assets.xcassets/iconography/notification-indicator.imageset/Contents.json
index 378d2808..646f6d96 100644
--- a/damus/Assets.xcassets/iconography/notification-indicator.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/notification-indicator.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "notification-indicator.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "notification-indicator.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "notification-indicator.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "notification-indicator.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/numbered-list.imageset/Contents.json b/damus/Assets.xcassets/iconography/numbered-list.imageset/Contents.json
index 538cfeb2..9c2f0119 100644
--- a/damus/Assets.xcassets/iconography/numbered-list.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/numbered-list.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "numbered-list.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "numbered-list.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "numbered-list.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "numbered-list.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/option-alt.imageset/Contents.json b/damus/Assets.xcassets/iconography/option-alt.imageset/Contents.json
index f6a0e2c1..f0b67ecb 100644
--- a/damus/Assets.xcassets/iconography/option-alt.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/option-alt.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "option-alt.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "option-alt.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "option-alt.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "option-alt.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/option.imageset/Contents.json b/damus/Assets.xcassets/iconography/option.imageset/Contents.json
index f529879e..fe466f41 100644
--- a/damus/Assets.xcassets/iconography/option.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/option.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "option.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "option.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "option.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "option.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/overcast.imageset/Contents.json b/damus/Assets.xcassets/iconography/overcast.imageset/Contents.json
index 8119bc33..072c6f0a 100644
--- a/damus/Assets.xcassets/iconography/overcast.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/overcast.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "overcast.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "overcast.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "overcast.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "overcast.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/password-lock.imageset/Contents.json b/damus/Assets.xcassets/iconography/password-lock.imageset/Contents.json
index d9e62588..ecfbcfa6 100644
--- a/damus/Assets.xcassets/iconography/password-lock.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/password-lock.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "password-lock.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "password-lock.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "password-lock.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "password-lock.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/pause.imageset/Contents.json b/damus/Assets.xcassets/iconography/pause.imageset/Contents.json
index 61f53a7c..2d014165 100644
--- a/damus/Assets.xcassets/iconography/pause.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/pause.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "pause.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "pause.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "pause.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "pause.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/pencil-edit.imageset/Contents.json b/damus/Assets.xcassets/iconography/pencil-edit.imageset/Contents.json
index c32ee0d4..0105819e 100644
--- a/damus/Assets.xcassets/iconography/pencil-edit.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/pencil-edit.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "pencil-edit.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "pencil-edit.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "pencil-edit.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "pencil-edit.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/percent.imageset/Contents.json b/damus/Assets.xcassets/iconography/percent.imageset/Contents.json
index 245aa8aa..d7edc1b6 100644
--- a/damus/Assets.xcassets/iconography/percent.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/percent.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "percent.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "percent.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "percent.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "percent.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/performance.imageset/Contents.json b/damus/Assets.xcassets/iconography/performance.imageset/Contents.json
index 95bbfd13..2af07b45 100644
--- a/damus/Assets.xcassets/iconography/performance.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/performance.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "performance.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "performance.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "performance.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "performance.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/phone.imageset/Contents.json b/damus/Assets.xcassets/iconography/phone.imageset/Contents.json
index 1c2ef1a6..090afdd0 100644
--- a/damus/Assets.xcassets/iconography/phone.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/phone.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "phone.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "phone.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "phone.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "phone.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/pin-location.imageset/Contents.json b/damus/Assets.xcassets/iconography/pin-location.imageset/Contents.json
index 7751dfa9..fa473c9e 100644
--- a/damus/Assets.xcassets/iconography/pin-location.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/pin-location.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "pin-location.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "pin-location.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "pin-location.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "pin-location.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/pin.fill.imageset/Contents.json b/damus/Assets.xcassets/iconography/pin.fill.imageset/Contents.json
index a7617d38..f3bccfbd 100644
--- a/damus/Assets.xcassets/iconography/pin.fill.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/pin.fill.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "pin.fill.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "pin.fill.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "pin.fill.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "pin.fill.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/pin.imageset/Contents.json b/damus/Assets.xcassets/iconography/pin.imageset/Contents.json
index 65d75e83..f16a25b6 100644
--- a/damus/Assets.xcassets/iconography/pin.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/pin.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "pin.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "pin.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "pin.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "pin.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/play.imageset/Contents.json b/damus/Assets.xcassets/iconography/play.imageset/Contents.json
index b17e13df..f51e1d99 100644
--- a/damus/Assets.xcassets/iconography/play.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/play.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "play.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "play.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "play.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "play.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/plus-circle.imageset/Contents.json b/damus/Assets.xcassets/iconography/plus-circle.imageset/Contents.json
index 1775f9ba..5fae17a1 100644
--- a/damus/Assets.xcassets/iconography/plus-circle.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/plus-circle.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "plus-circle.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "plus-circle.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "plus-circle.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "plus-circle.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/plus-small.imageset/Contents.json b/damus/Assets.xcassets/iconography/plus-small.imageset/Contents.json
index 32fb890b..bbe83b51 100644
--- a/damus/Assets.xcassets/iconography/plus-small.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/plus-small.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "plus-small.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "plus-small.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "plus-small.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "plus-small.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/plus-square.imageset/Contents.json b/damus/Assets.xcassets/iconography/plus-square.imageset/Contents.json
index 8db7ec34..0993d95c 100644
--- a/damus/Assets.xcassets/iconography/plus-square.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/plus-square.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "plus-square.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "plus-square.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "plus-square.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "plus-square.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/plus.imageset/Contents.json b/damus/Assets.xcassets/iconography/plus.imageset/Contents.json
index 16eddb49..0e5393dd 100644
--- a/damus/Assets.xcassets/iconography/plus.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/plus.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "plus.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "plus.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "plus.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "plus.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/pointer-hand.imageset/Contents.json b/damus/Assets.xcassets/iconography/pointer-hand.imageset/Contents.json
index 6d636396..8a8af34f 100644
--- a/damus/Assets.xcassets/iconography/pointer-hand.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/pointer-hand.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "pointer-hand.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "pointer-hand.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "pointer-hand.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "pointer-hand.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/power-off.imageset/Contents.json b/damus/Assets.xcassets/iconography/power-off.imageset/Contents.json
index 3d1693fc..ba977b63 100644
--- a/damus/Assets.xcassets/iconography/power-off.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/power-off.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "power-off.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "power-off.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "power-off.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "power-off.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/pull-request.imageset/Contents.json b/damus/Assets.xcassets/iconography/pull-request.imageset/Contents.json
index 427deb02..b87d31c0 100644
--- a/damus/Assets.xcassets/iconography/pull-request.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/pull-request.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "pull-request.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "pull-request.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "pull-request.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "pull-request.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/qr-code.fill.imageset/Contents.json b/damus/Assets.xcassets/iconography/qr-code.fill.imageset/Contents.json
index 06821f41..75232ae7 100644
--- a/damus/Assets.xcassets/iconography/qr-code.fill.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/qr-code.fill.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "qr-code.fill.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "qr-code.fill.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "qr-code.fill.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "qr-code.fill.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/qr-code.imageset/Contents.json b/damus/Assets.xcassets/iconography/qr-code.imageset/Contents.json
index 12ceab54..5fc56898 100644
--- a/damus/Assets.xcassets/iconography/qr-code.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/qr-code.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "qr-code.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "qr-code.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "qr-code.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "qr-code.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/question.imageset/Contents.json b/damus/Assets.xcassets/iconography/question.imageset/Contents.json
index 893d8a3b..099ae83c 100644
--- a/damus/Assets.xcassets/iconography/question.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/question.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "question.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "question.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "question.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "question.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/radar.imageset/Contents.json b/damus/Assets.xcassets/iconography/radar.imageset/Contents.json
index e37c9d76..4d589eb0 100644
--- a/damus/Assets.xcassets/iconography/radar.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/radar.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "radar.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "radar.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "radar.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "radar.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/raising-hand.imageset/Contents.json b/damus/Assets.xcassets/iconography/raising-hand.imageset/Contents.json
index 083d2523..a0267988 100644
--- a/damus/Assets.xcassets/iconography/raising-hand.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/raising-hand.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "raising-hand.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "raising-hand.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "raising-hand.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "raising-hand.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/record.imageset/Contents.json b/damus/Assets.xcassets/iconography/record.imageset/Contents.json
index 94e6dd3c..e8596786 100644
--- a/damus/Assets.xcassets/iconography/record.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/record.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "record.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "record.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "record.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "record.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/redo.imageset/Contents.json b/damus/Assets.xcassets/iconography/redo.imageset/Contents.json
index 969c027b..5d819b05 100644
--- a/damus/Assets.xcassets/iconography/redo.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/redo.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "redo.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "redo.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "redo.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "redo.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/remove-bookmark.imageset/Contents.json b/damus/Assets.xcassets/iconography/remove-bookmark.imageset/Contents.json
index ac563f83..36dd9684 100644
--- a/damus/Assets.xcassets/iconography/remove-bookmark.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/remove-bookmark.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "remove-bookmark.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "remove-bookmark.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "remove-bookmark.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "remove-bookmark.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/remove-tag.imageset/Contents.json b/damus/Assets.xcassets/iconography/remove-tag.imageset/Contents.json
index 2687436b..6527fcf2 100644
--- a/damus/Assets.xcassets/iconography/remove-tag.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/remove-tag.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "remove-tag.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "remove-tag.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "remove-tag.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "remove-tag.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/repeat.imageset/Contents.json b/damus/Assets.xcassets/iconography/repeat.imageset/Contents.json
index c96465cc..62f493f2 100644
--- a/damus/Assets.xcassets/iconography/repeat.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/repeat.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "repeat.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "repeat.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "repeat.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "repeat.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/repost.imageset/Contents.json b/damus/Assets.xcassets/iconography/repost.imageset/Contents.json
index 25b814cc..8480dbb6 100644
--- a/damus/Assets.xcassets/iconography/repost.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/repost.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "repost.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "repost.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "repost.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "repost.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/resize-big.imageset/Contents.json b/damus/Assets.xcassets/iconography/resize-big.imageset/Contents.json
index e6359e6a..63f0155a 100644
--- a/damus/Assets.xcassets/iconography/resize-big.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/resize-big.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "resize-big.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "resize-big.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "resize-big.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "resize-big.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/resize-small.imageset/Contents.json b/damus/Assets.xcassets/iconography/resize-small.imageset/Contents.json
index d640321f..f07899aa 100644
--- a/damus/Assets.xcassets/iconography/resize-small.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/resize-small.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "resize-small.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "resize-small.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "resize-small.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "resize-small.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/rotate.imageset/Contents.json b/damus/Assets.xcassets/iconography/rotate.imageset/Contents.json
index d7702ada..88a052e9 100644
--- a/damus/Assets.xcassets/iconography/rotate.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/rotate.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "rotate.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "rotate.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "rotate.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "rotate.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/scan.imageset/Contents.json b/damus/Assets.xcassets/iconography/scan.imageset/Contents.json
index 90bb7279..f0cefb52 100644
--- a/damus/Assets.xcassets/iconography/scan.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/scan.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "scan.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "scan.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "scan.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "scan.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/search-grid.imageset/Contents.json b/damus/Assets.xcassets/iconography/search-grid.imageset/Contents.json
index ee9fbb03..700a1b2b 100644
--- a/damus/Assets.xcassets/iconography/search-grid.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/search-grid.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "search-grid.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "search-grid.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "search-grid.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "search-grid.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/search-list.imageset/Contents.json b/damus/Assets.xcassets/iconography/search-list.imageset/Contents.json
index 7bdb0b43..758c5a8f 100644
--- a/damus/Assets.xcassets/iconography/search-list.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/search-list.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "search-list.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "search-list.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "search-list.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "search-list.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/search-page-find.imageset/Contents.json b/damus/Assets.xcassets/iconography/search-page-find.imageset/Contents.json
index 2353ac0b..cad66140 100644
--- a/damus/Assets.xcassets/iconography/search-page-find.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/search-page-find.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "search-page-find.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "search-page-find.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "search-page-find.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "search-page-find.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/search.fill.imageset/Contents.json b/damus/Assets.xcassets/iconography/search.fill.imageset/Contents.json
index c5d5a420..4c09f621 100644
--- a/damus/Assets.xcassets/iconography/search.fill.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/search.fill.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "search.fill.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "search.fill.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "search.fill.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "search.fill.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/search.imageset/Contents.json b/damus/Assets.xcassets/iconography/search.imageset/Contents.json
index 6e779188..9b452132 100644
--- a/damus/Assets.xcassets/iconography/search.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/search.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "search.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "search.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "search.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "search.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/security-shield.imageset/Contents.json b/damus/Assets.xcassets/iconography/security-shield.imageset/Contents.json
index 5e3d095d..8edfd454 100644
--- a/damus/Assets.xcassets/iconography/security-shield.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/security-shield.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "security-shield.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "security-shield.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "security-shield.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "security-shield.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/send-email.imageset/Contents.json b/damus/Assets.xcassets/iconography/send-email.imageset/Contents.json
index 7e4b7048..6212d3ab 100644
--- a/damus/Assets.xcassets/iconography/send-email.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/send-email.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "send-email.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "send-email.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "send-email.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "send-email.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/send.imageset/Contents.json b/damus/Assets.xcassets/iconography/send.imageset/Contents.json
index ddccb0bd..4ccbc810 100644
--- a/damus/Assets.xcassets/iconography/send.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/send.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "send.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "send.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "send.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "send.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/server.imageset/Contents.json b/damus/Assets.xcassets/iconography/server.imageset/Contents.json
index 83a042fb..239069b5 100644
--- a/damus/Assets.xcassets/iconography/server.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/server.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "server.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "server.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "server.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "server.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/settings-controls.imageset/Contents.json b/damus/Assets.xcassets/iconography/settings-controls.imageset/Contents.json
index c98f0fd6..c6be04a0 100644
--- a/damus/Assets.xcassets/iconography/settings-controls.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/settings-controls.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "settings-controls.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "settings-controls.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "settings-controls.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "settings-controls.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/settings-levels.imageset/Contents.json b/damus/Assets.xcassets/iconography/settings-levels.imageset/Contents.json
index 9ded5068..6d4a737c 100644
--- a/damus/Assets.xcassets/iconography/settings-levels.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/settings-levels.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "settings-levels.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "settings-levels.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "settings-levels.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "settings-levels.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/settings.fill.imageset/Contents.json b/damus/Assets.xcassets/iconography/settings.fill.imageset/Contents.json
index c292da00..e2fde746 100644
--- a/damus/Assets.xcassets/iconography/settings.fill.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/settings.fill.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "settings.fill.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "settings.fill.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "settings.fill.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "settings.fill.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/settings.imageset/Contents.json b/damus/Assets.xcassets/iconography/settings.imageset/Contents.json
index b322f1ec..118bd633 100644
--- a/damus/Assets.xcassets/iconography/settings.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/settings.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "settings.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "settings.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "settings.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "settings.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/shaka.fill.imageset/Contents.json b/damus/Assets.xcassets/iconography/shaka.fill.imageset/Contents.json
index 7f11ca8b..7f4eb545 100644
--- a/damus/Assets.xcassets/iconography/shaka.fill.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/shaka.fill.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "shaka.fill.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "shaka.fill.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "shaka.fill.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "shaka.fill.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/shaka.imageset/Contents.json b/damus/Assets.xcassets/iconography/shaka.imageset/Contents.json
index 03efec68..16a181ac 100644
--- a/damus/Assets.xcassets/iconography/shaka.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/shaka.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "shaka.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "shaka.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "shaka.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "shaka.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/share2.imageset/Contents.json b/damus/Assets.xcassets/iconography/share2.imageset/Contents.json
index 6270f9d3..cadc9f81 100644
--- a/damus/Assets.xcassets/iconography/share2.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/share2.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "share2.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "share2.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "share2.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "share2.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/share3.imageset/Contents.json b/damus/Assets.xcassets/iconography/share3.imageset/Contents.json
index 7383ca73..1912cb63 100644
--- a/damus/Assets.xcassets/iconography/share3.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/share3.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "share3.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "share3.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "share3.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "share3.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/shield-off.imageset/Contents.json b/damus/Assets.xcassets/iconography/shield-off.imageset/Contents.json
index 119fe097..5705eaf4 100644
--- a/damus/Assets.xcassets/iconography/shield-off.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/shield-off.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "shield-off.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "shield-off.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "shield-off.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "shield-off.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/shield-protected.imageset/Contents.json b/damus/Assets.xcassets/iconography/shield-protected.imageset/Contents.json
index d1191524..9520eac4 100644
--- a/damus/Assets.xcassets/iconography/shield-protected.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/shield-protected.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "shield-protected.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "shield-protected.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "shield-protected.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "shield-protected.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/shield.imageset/Contents.json b/damus/Assets.xcassets/iconography/shield.imageset/Contents.json
index acbbc200..122f41dc 100644
--- a/damus/Assets.xcassets/iconography/shield.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/shield.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "shield.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "shield.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "shield.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "shield.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/shop.imageset/Contents.json b/damus/Assets.xcassets/iconography/shop.imageset/Contents.json
index 2e32ad41..b0694e7b 100644
--- a/damus/Assets.xcassets/iconography/shop.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/shop.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "shop.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "shop.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "shop.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "shop.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/shopping-bag.imageset/Contents.json b/damus/Assets.xcassets/iconography/shopping-bag.imageset/Contents.json
index e1ce5932..f890659d 100644
--- a/damus/Assets.xcassets/iconography/shopping-bag.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/shopping-bag.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "shopping-bag.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "shopping-bag.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "shopping-bag.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "shopping-bag.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/shopping-cart.imageset/Contents.json b/damus/Assets.xcassets/iconography/shopping-cart.imageset/Contents.json
index 2c7e6cb0..7fa6a342 100644
--- a/damus/Assets.xcassets/iconography/shopping-cart.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/shopping-cart.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "shopping-cart.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "shopping-cart.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "shopping-cart.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "shopping-cart.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/sidebar.imageset/Contents.json b/damus/Assets.xcassets/iconography/sidebar.imageset/Contents.json
index 7a121990..2a9b29af 100644
--- a/damus/Assets.xcassets/iconography/sidebar.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/sidebar.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "sidebar.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "sidebar.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "sidebar.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "sidebar.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/sign-direction.imageset/Contents.json b/damus/Assets.xcassets/iconography/sign-direction.imageset/Contents.json
index 99632028..018ec08c 100644
--- a/damus/Assets.xcassets/iconography/sign-direction.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/sign-direction.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "sign-direction.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "sign-direction.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "sign-direction.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "sign-direction.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/snow-flakes.imageset/Contents.json b/damus/Assets.xcassets/iconography/snow-flakes.imageset/Contents.json
index 009b996f..0cbb3c50 100644
--- a/damus/Assets.xcassets/iconography/snow-flakes.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/snow-flakes.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "snow-flakes.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "snow-flakes.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "snow-flakes.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "snow-flakes.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/sort-ascending.imageset/Contents.json b/damus/Assets.xcassets/iconography/sort-ascending.imageset/Contents.json
index 7382f780..67a11965 100644
--- a/damus/Assets.xcassets/iconography/sort-ascending.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/sort-ascending.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "sort-ascending.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "sort-ascending.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "sort-ascending.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "sort-ascending.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/sort-descending.imageset/Contents.json b/damus/Assets.xcassets/iconography/sort-descending.imageset/Contents.json
index 7ea5c23e..6240a2c1 100644
--- a/damus/Assets.xcassets/iconography/sort-descending.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/sort-descending.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "sort-descending.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "sort-descending.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "sort-descending.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "sort-descending.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/sort-horizontal.imageset/Contents.json b/damus/Assets.xcassets/iconography/sort-horizontal.imageset/Contents.json
index 6ef772f4..3b3779ee 100644
--- a/damus/Assets.xcassets/iconography/sort-horizontal.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/sort-horizontal.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "sort-horizontal.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "sort-horizontal.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "sort-horizontal.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "sort-horizontal.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/sort-vertical.imageset/Contents.json b/damus/Assets.xcassets/iconography/sort-vertical.imageset/Contents.json
index 45e10ec0..25b2981b 100644
--- a/damus/Assets.xcassets/iconography/sort-vertical.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/sort-vertical.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "sort-vertical.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "sort-vertical.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "sort-vertical.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "sort-vertical.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/square.imageset/Contents.json b/damus/Assets.xcassets/iconography/square.imageset/Contents.json
index abee0dcf..8c94df89 100644
--- a/damus/Assets.xcassets/iconography/square.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/square.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "square.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "square.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "square.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "square.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/star.fill.imageset/Contents.json b/damus/Assets.xcassets/iconography/star.fill.imageset/Contents.json
index 9e86bb28..000644da 100644
--- a/damus/Assets.xcassets/iconography/star.fill.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/star.fill.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "star.fill.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "star.fill.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "star.fill.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "star.fill.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/star.imageset/Contents.json b/damus/Assets.xcassets/iconography/star.imageset/Contents.json
index 2309ec60..9548af64 100644
--- a/damus/Assets.xcassets/iconography/star.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/star.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "star.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "star.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "star.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "star.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/stop.imageset/Contents.json b/damus/Assets.xcassets/iconography/stop.imageset/Contents.json
index c1e1cc86..9a62422c 100644
--- a/damus/Assets.xcassets/iconography/stop.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/stop.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "stop.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "stop.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "stop.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "stop.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/strike-through.imageset/Contents.json b/damus/Assets.xcassets/iconography/strike-through.imageset/Contents.json
index 41f5c607..0763526f 100644
--- a/damus/Assets.xcassets/iconography/strike-through.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/strike-through.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "strike-through.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "strike-through.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "strike-through.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "strike-through.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/table.imageset/Contents.json b/damus/Assets.xcassets/iconography/table.imageset/Contents.json
index 66e83d10..bab1e58c 100644
--- a/damus/Assets.xcassets/iconography/table.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/table.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "table.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "table.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "table.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "table.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/target-on.imageset/Contents.json b/damus/Assets.xcassets/iconography/target-on.imageset/Contents.json
index 8fe41781..83ab2927 100644
--- a/damus/Assets.xcassets/iconography/target-on.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/target-on.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "target-on.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "target-on.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "target-on.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "target-on.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/target.imageset/Contents.json b/damus/Assets.xcassets/iconography/target.imageset/Contents.json
index 82418c1b..d60fbb6a 100644
--- a/damus/Assets.xcassets/iconography/target.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/target.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "target.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "target.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "target.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "target.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/target2.imageset/Contents.json b/damus/Assets.xcassets/iconography/target2.imageset/Contents.json
index cbbc41de..72e91da9 100644
--- a/damus/Assets.xcassets/iconography/target2.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/target2.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "target2.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "target2.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "target2.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "target2.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/terminal.imageset/Contents.json b/damus/Assets.xcassets/iconography/terminal.imageset/Contents.json
index 67e46c84..45a4ecb0 100644
--- a/damus/Assets.xcassets/iconography/terminal.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/terminal.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "terminal.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "terminal.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "terminal.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "terminal.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/text-indicator.imageset/Contents.json b/damus/Assets.xcassets/iconography/text-indicator.imageset/Contents.json
index 37c8a635..bfda5827 100644
--- a/damus/Assets.xcassets/iconography/text-indicator.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/text-indicator.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "text-indicator.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "text-indicator.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "text-indicator.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "text-indicator.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/text-size.imageset/Contents.json b/damus/Assets.xcassets/iconography/text-size.imageset/Contents.json
index 32e2548d..fff47b74 100644
--- a/damus/Assets.xcassets/iconography/text-size.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/text-size.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "text-size.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "text-size.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "text-size.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "text-size.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/text.imageset/Contents.json b/damus/Assets.xcassets/iconography/text.imageset/Contents.json
index aac14d4d..43c0b22b 100644
--- a/damus/Assets.xcassets/iconography/text.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/text.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "text.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "text.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "text.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "text.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/thumbs-down.fill.imageset/Contents.json b/damus/Assets.xcassets/iconography/thumbs-down.fill.imageset/Contents.json
index 567edcdf..4bee7b22 100644
--- a/damus/Assets.xcassets/iconography/thumbs-down.fill.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/thumbs-down.fill.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "thumbs-down.fill.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "thumbs-down.fill.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "thumbs-down.fill.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "thumbs-down.fill.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/thumbs-down.imageset/Contents.json b/damus/Assets.xcassets/iconography/thumbs-down.imageset/Contents.json
index 182086aa..e0442b0e 100644
--- a/damus/Assets.xcassets/iconography/thumbs-down.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/thumbs-down.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "thumbs-down.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "thumbs-down.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "thumbs-down.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "thumbs-down.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/thumbs-up.fill.imageset/Contents.json b/damus/Assets.xcassets/iconography/thumbs-up.fill.imageset/Contents.json
index 34d27fee..2e4df203 100644
--- a/damus/Assets.xcassets/iconography/thumbs-up.fill.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/thumbs-up.fill.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "thumbs-up.fill.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "thumbs-up.fill.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "thumbs-up.fill.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "thumbs-up.fill.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/thumbs-up.imageset/Contents.json b/damus/Assets.xcassets/iconography/thumbs-up.imageset/Contents.json
index e16f5b71..768a187a 100644
--- a/damus/Assets.xcassets/iconography/thumbs-up.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/thumbs-up.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "thumbs-up.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "thumbs-up.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "thumbs-up.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "thumbs-up.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/ticket.imageset/Contents.json b/damus/Assets.xcassets/iconography/ticket.imageset/Contents.json
index 2ec6c424..32f97136 100644
--- a/damus/Assets.xcassets/iconography/ticket.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/ticket.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "ticket.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "ticket.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "ticket.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "ticket.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/title-case.imageset/Contents.json b/damus/Assets.xcassets/iconography/title-case.imageset/Contents.json
index b3cc367b..db325d62 100644
--- a/damus/Assets.xcassets/iconography/title-case.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/title-case.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "title-case.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "title-case.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "title-case.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "title-case.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/underline.imageset/Contents.json b/damus/Assets.xcassets/iconography/underline.imageset/Contents.json
index 08b123fa..bd652ea0 100644
--- a/damus/Assets.xcassets/iconography/underline.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/underline.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "underline.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "underline.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "underline.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "underline.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/undo.imageset/Contents.json b/damus/Assets.xcassets/iconography/undo.imageset/Contents.json
index ff848257..5ef99f42 100644
--- a/damus/Assets.xcassets/iconography/undo.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/undo.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "undo.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "undo.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "undo.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "undo.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/undock.imageset/Contents.json b/damus/Assets.xcassets/iconography/undock.imageset/Contents.json
index 06338f39..cd422d63 100644
--- a/damus/Assets.xcassets/iconography/undock.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/undock.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "undock.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "undock.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "undock.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "undock.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/unlink.imageset/Contents.json b/damus/Assets.xcassets/iconography/unlink.imageset/Contents.json
index 826f3d26..0dd9c19d 100644
--- a/damus/Assets.xcassets/iconography/unlink.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/unlink.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "unlink.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "unlink.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "unlink.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "unlink.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/unlocked.imageset/Contents.json b/damus/Assets.xcassets/iconography/unlocked.imageset/Contents.json
index ff73035e..62ed270e 100644
--- a/damus/Assets.xcassets/iconography/unlocked.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/unlocked.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "unlocked.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "unlocked.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "unlocked.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "unlocked.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/upload.imageset/Contents.json b/damus/Assets.xcassets/iconography/upload.imageset/Contents.json
index 138ce722..320cdb1b 100644
--- a/damus/Assets.xcassets/iconography/upload.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/upload.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "upload.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "upload.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "upload.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "upload.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/user-add-down.imageset/Contents.json b/damus/Assets.xcassets/iconography/user-add-down.imageset/Contents.json
index 651de65c..cdd558df 100644
--- a/damus/Assets.xcassets/iconography/user-add-down.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/user-add-down.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "user-add-down.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "user-add-down.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "user-add-down.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "user-add-down.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/user-add-up.imageset/Contents.json b/damus/Assets.xcassets/iconography/user-add-up.imageset/Contents.json
index 9903151a..2879da8b 100644
--- a/damus/Assets.xcassets/iconography/user-add-up.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/user-add-up.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "user-add-up.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "user-add-up.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "user-add-up.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "user-add-up.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/user-added.imageset/Contents.json b/damus/Assets.xcassets/iconography/user-added.imageset/Contents.json
index a48ee8a6..3fa29af7 100644
--- a/damus/Assets.xcassets/iconography/user-added.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/user-added.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "user-added.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "user-added.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "user-added.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "user-added.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/user-circle.imageset/Contents.json b/damus/Assets.xcassets/iconography/user-circle.imageset/Contents.json
index 6a3349d4..e04a896d 100644
--- a/damus/Assets.xcassets/iconography/user-circle.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/user-circle.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "user-circle.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "user-circle.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "user-circle.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "user-circle.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/user-copy.imageset/Contents.json b/damus/Assets.xcassets/iconography/user-copy.imageset/Contents.json
index 8e5c4e5d..af584cda 100644
--- a/damus/Assets.xcassets/iconography/user-copy.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/user-copy.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "user-copy.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "user-copy.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "user-copy.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "user-copy.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/user-like.imageset/Contents.json b/damus/Assets.xcassets/iconography/user-like.imageset/Contents.json
index 6cb1a557..58609b16 100644
--- a/damus/Assets.xcassets/iconography/user-like.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/user-like.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "user-like.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "user-like.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "user-like.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "user-like.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/user-remove-1.imageset/Contents.json b/damus/Assets.xcassets/iconography/user-remove-1.imageset/Contents.json
index 06a377d4..5c9f0695 100644
--- a/damus/Assets.xcassets/iconography/user-remove-1.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/user-remove-1.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "user-remove-1.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "user-remove-1.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "user-remove-1.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "user-remove-1.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/user-remove.imageset/Contents.json b/damus/Assets.xcassets/iconography/user-remove.imageset/Contents.json
index 2d5dfda3..a14db209 100644
--- a/damus/Assets.xcassets/iconography/user-remove.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/user-remove.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "user-remove.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "user-remove.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "user-remove.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "user-remove.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/user.imageset/Contents.json b/damus/Assets.xcassets/iconography/user.imageset/Contents.json
index 53cf2fd7..3d19a6d0 100644
--- a/damus/Assets.xcassets/iconography/user.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/user.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "user.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "user.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "user.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "user.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/users.imageset/Contents.json b/damus/Assets.xcassets/iconography/users.imageset/Contents.json
index 8e987b94..d970381b 100644
--- a/damus/Assets.xcassets/iconography/users.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/users.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "users.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "users.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "users.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "users.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/verified.fill.imageset/Contents.json b/damus/Assets.xcassets/iconography/verified.fill.imageset/Contents.json
index f922d57b..3d85d32b 100644
--- a/damus/Assets.xcassets/iconography/verified.fill.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/verified.fill.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "verified.fill.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "verified.fill.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "verified.fill.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "verified.fill.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/verified.imageset/Contents.json b/damus/Assets.xcassets/iconography/verified.imageset/Contents.json
index 2773adda..961a896b 100644
--- a/damus/Assets.xcassets/iconography/verified.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/verified.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "verified.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "verified.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "verified.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "verified.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/video-clip.imageset/Contents.json b/damus/Assets.xcassets/iconography/video-clip.imageset/Contents.json
index f89ab974..3847cd3a 100644
--- a/damus/Assets.xcassets/iconography/video-clip.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/video-clip.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "video-clip.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "video-clip.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "video-clip.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "video-clip.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/video.imageset/Contents.json b/damus/Assets.xcassets/iconography/video.imageset/Contents.json
index bc2706e6..b90613db 100644
--- a/damus/Assets.xcassets/iconography/video.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/video.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "video.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "video.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "video.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "video.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/visit-page.imageset/Contents.json b/damus/Assets.xcassets/iconography/visit-page.imageset/Contents.json
index 9ff17a92..8f3c1af4 100644
--- a/damus/Assets.xcassets/iconography/visit-page.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/visit-page.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "visit-page.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "visit-page.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "visit-page.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "visit-page.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/voice-sound.imageset/Contents.json b/damus/Assets.xcassets/iconography/voice-sound.imageset/Contents.json
index 9c35fb43..96812ad6 100644
--- a/damus/Assets.xcassets/iconography/voice-sound.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/voice-sound.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "voice-sound.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "voice-sound.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "voice-sound.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "voice-sound.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/volume-down.imageset/Contents.json b/damus/Assets.xcassets/iconography/volume-down.imageset/Contents.json
index e9bb1371..fa426a1a 100644
--- a/damus/Assets.xcassets/iconography/volume-down.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/volume-down.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "volume-down.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "volume-down.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "volume-down.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "volume-down.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/volume-full.imageset/Contents.json b/damus/Assets.xcassets/iconography/volume-full.imageset/Contents.json
index 29b0d865..7a19beb4 100644
--- a/damus/Assets.xcassets/iconography/volume-full.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/volume-full.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "volume-full.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "volume-full.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "volume-full.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "volume-full.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/volume-half.imageset/Contents.json b/damus/Assets.xcassets/iconography/volume-half.imageset/Contents.json
index e401395e..1301c622 100644
--- a/damus/Assets.xcassets/iconography/volume-half.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/volume-half.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "volume-half.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "volume-half.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "volume-half.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "volume-half.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/volume-minimum.imageset/Contents.json b/damus/Assets.xcassets/iconography/volume-minimum.imageset/Contents.json
index 2a187689..a73049d0 100644
--- a/damus/Assets.xcassets/iconography/volume-minimum.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/volume-minimum.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "volume-minimum.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "volume-minimum.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "volume-minimum.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "volume-minimum.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/volume-off.imageset/Contents.json b/damus/Assets.xcassets/iconography/volume-off.imageset/Contents.json
index 46765b30..07f20f2d 100644
--- a/damus/Assets.xcassets/iconography/volume-off.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/volume-off.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "volume-off.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "volume-off.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "volume-off.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "volume-off.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/volume-up.imageset/Contents.json b/damus/Assets.xcassets/iconography/volume-up.imageset/Contents.json
index d843e4ab..4715a6ae 100644
--- a/damus/Assets.xcassets/iconography/volume-up.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/volume-up.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "volume-up.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "volume-up.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "volume-up.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "volume-up.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/wallet.fill.imageset/Contents.json b/damus/Assets.xcassets/iconography/wallet.fill.imageset/Contents.json
index 18b1ec3f..b8794a5f 100644
--- a/damus/Assets.xcassets/iconography/wallet.fill.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/wallet.fill.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "wallet.fill.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "wallet.fill.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "wallet.fill.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "wallet.fill.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/wallet.imageset/Contents.json b/damus/Assets.xcassets/iconography/wallet.imageset/Contents.json
index 8cbf4e3a..f72f4f3e 100644
--- a/damus/Assets.xcassets/iconography/wallet.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/wallet.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "wallet.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "wallet.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "wallet.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "wallet.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/warning.fill.imageset/Contents.json b/damus/Assets.xcassets/iconography/warning.fill.imageset/Contents.json
index da336c28..62a40076 100644
--- a/damus/Assets.xcassets/iconography/warning.fill.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/warning.fill.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "warning.fill.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "warning.fill.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "warning.fill.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "warning.fill.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/warning.imageset/Contents.json b/damus/Assets.xcassets/iconography/warning.imageset/Contents.json
index d07182d3..88371662 100644
--- a/damus/Assets.xcassets/iconography/warning.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/warning.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "warning.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "warning.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "warning.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "warning.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/windy.imageset/Contents.json b/damus/Assets.xcassets/iconography/windy.imageset/Contents.json
index 3c7ecb6b..bd69ed7e 100644
--- a/damus/Assets.xcassets/iconography/windy.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/windy.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "windy.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "windy.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "windy.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "windy.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/world-relays.imageset/Contents.json b/damus/Assets.xcassets/iconography/world-relays.imageset/Contents.json
index 44888fb5..1bb7a359 100644
--- a/damus/Assets.xcassets/iconography/world-relays.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/world-relays.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "world-relays.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "world-relays.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "world-relays.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "world-relays.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/zap.fill.imageset/Contents.json b/damus/Assets.xcassets/iconography/zap.fill.imageset/Contents.json
index f9eb46be..b23c8fb3 100644
--- a/damus/Assets.xcassets/iconography/zap.fill.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/zap.fill.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "zap.fill.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "zap.fill.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "zap.fill.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "zap.fill.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/zap.imageset/Contents.json b/damus/Assets.xcassets/iconography/zap.imageset/Contents.json
index 6ea8ab1f..6c3b22d9 100644
--- a/damus/Assets.xcassets/iconography/zap.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/zap.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "zap.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "zap.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "zap.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "zap.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/zoom-in.imageset/Contents.json b/damus/Assets.xcassets/iconography/zoom-in.imageset/Contents.json
index 4cc178fc..12f9a3a6 100644
--- a/damus/Assets.xcassets/iconography/zoom-in.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/zoom-in.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "zoom-in.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "zoom-in.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "zoom-in.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "zoom-in.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/damus/Assets.xcassets/iconography/zoom-out.imageset/Contents.json b/damus/Assets.xcassets/iconography/zoom-out.imageset/Contents.json
index 24698c19..d19c5b59 100644
--- a/damus/Assets.xcassets/iconography/zoom-out.imageset/Contents.json
+++ b/damus/Assets.xcassets/iconography/zoom-out.imageset/Contents.json
@@ -1,21 +1,23 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "zoom-out.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
+      "filename": "zoom-out.svg",
+      "idiom": "universal",
+      "scale": "1x"
     },
     {
-      "idiom" : "universal",
-      "scale" : "2x"
+      "idiom": "universal",
+      "scale": "2x",
+      "filename": "zoom-out.svg"
     },
     {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom": "universal",
+      "scale": "3x",
+      "filename": "zoom-out.svg"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
 }