diff --git a/locale/cy_GB/LC_MESSAGES/django.po b/locale/cy_GB/LC_MESSAGES/django.po
index 463b82b1b..5ae8c513c 100644
--- a/locale/cy_GB/LC_MESSAGES/django.po
+++ b/locale/cy_GB/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: bookwyrm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-12-05 02:21+0000\n"
-"PO-Revision-Date: 2022-12-05 03:56\n"
+"POT-Creation-Date: 2022-12-11 21:08+0000\n"
+"PO-Revision-Date: 2022-12-11 22:09\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: Welsh\n"
 "Language: cy\n"
@@ -171,23 +171,23 @@ msgstr "Dileu cymedrolwr"
 msgid "Domain block"
 msgstr "Parth wedi ei rwystro"
 
-#: bookwyrm/models/book.py:266
+#: bookwyrm/models/book.py:277
 msgid "Audiobook"
 msgstr "Llyfr sain"
 
-#: bookwyrm/models/book.py:267
+#: bookwyrm/models/book.py:278
 msgid "eBook"
 msgstr "eLyfr"
 
-#: bookwyrm/models/book.py:268
+#: bookwyrm/models/book.py:279
 msgid "Graphic novel"
 msgstr "Nofel graffig"
 
-#: bookwyrm/models/book.py:269
+#: bookwyrm/models/book.py:280
 msgid "Hardcover"
 msgstr "Clawr caled"
 
-#: bookwyrm/models/book.py:270
+#: bookwyrm/models/book.py:281
 msgid "Paperback"
 msgstr "Clawr meddal"
 
@@ -215,7 +215,7 @@ msgstr "%(value)s ddim yn remote_id dilys"
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s ddim yn enw defnyddiwr dilys"
 
-#: bookwyrm/models/fields.py:181 bookwyrm/templates/layout.html:141
+#: bookwyrm/models/fields.py:181 bookwyrm/templates/layout.html:142
 #: bookwyrm/templates/ostatus/error.html:29
 msgid "username"
 msgstr "enw defnyddiwr"
@@ -300,7 +300,7 @@ msgstr "Ar gael i'w fenthyg"
 msgid "Approved"
 msgstr "Cymmeradwy"
 
-#: bookwyrm/models/user.py:32 bookwyrm/templates/book/book.html:289
+#: bookwyrm/models/user.py:32 bookwyrm/templates/book/book.html:296
 msgid "Reviews"
 msgstr "Adolygiadau"
 
@@ -332,7 +332,7 @@ msgstr "Ffrwd lyfrau"
 #: bookwyrm/templates/guided_tour/user_profile.html:101
 #: bookwyrm/templates/search/layout.html:22
 #: bookwyrm/templates/search/layout.html:43
-#: bookwyrm/templates/user/layout.html:91
+#: bookwyrm/templates/user/layout.html:95
 msgid "Books"
 msgstr "Llyfrau"
 
@@ -490,6 +490,13 @@ msgstr "Anfonwch neges uniongyrchol"
 msgid "Code of Conduct"
 msgstr "Côd Ymddygiad"
 
+#: bookwyrm/templates/about/impressum.html:4
+#: bookwyrm/templates/about/impressum.html:9
+#: bookwyrm/templates/about/layout.html:54
+#: bookwyrm/templates/snippets/footer.html:34
+msgid "Impressum"
+msgstr ""
+
 #: bookwyrm/templates/about/layout.html:11
 msgid "Active users:"
 msgstr "Defnyddwyr cyfredol:"
@@ -517,11 +524,6 @@ msgstr "Am %(site_name)s"
 msgid "Privacy Policy"
 msgstr "Polisi Preifatrwydd"
 
-#: bookwyrm/templates/about/layout.html:54
-#: bookwyrm/templates/snippets/footer.html:34
-msgid "Impressum"
-msgstr ""
-
 #: bookwyrm/templates/annual_summary/layout.html:7
 #: bookwyrm/templates/feed/summary_card.html:8
 #, python-format
@@ -713,32 +715,41 @@ msgstr "Wicipedia"
 msgid "View ISNI record"
 msgstr "Gwelwch y cofnod ISNI"
 
-#: bookwyrm/templates/author/author.html:84
+#: bookwyrm/templates/author/author.html:87
+#: bookwyrm/templates/book/book.html:164
+msgid "View on ISFDB"
+msgstr ""
+
+#: bookwyrm/templates/author/author.html:92
 #: bookwyrm/templates/author/sync_modal.html:5
 #: bookwyrm/templates/book/book.html:131
 #: bookwyrm/templates/book/sync_modal.html:5
 msgid "Load data"
 msgstr "Llwythwch y data"
 
-#: bookwyrm/templates/author/author.html:88
+#: bookwyrm/templates/author/author.html:96
 #: bookwyrm/templates/book/book.html:135
 msgid "View on OpenLibrary"
 msgstr "Gwelwch ar OpenLibrary"
 
-#: bookwyrm/templates/author/author.html:103
+#: bookwyrm/templates/author/author.html:111
 #: bookwyrm/templates/book/book.html:149
 msgid "View on Inventaire"
 msgstr "Gweld ar Inventaire"
 
-#: bookwyrm/templates/author/author.html:119
+#: bookwyrm/templates/author/author.html:127
 msgid "View on LibraryThing"
 msgstr "Gweld ar LibraryThing"
 
-#: bookwyrm/templates/author/author.html:127
+#: bookwyrm/templates/author/author.html:135
 msgid "View on Goodreads"
 msgstr "Gweld ar Goodreads"
 
-#: bookwyrm/templates/author/author.html:142
+#: bookwyrm/templates/author/author.html:143
+msgid "View ISFDB entry"
+msgstr ""
+
+#: bookwyrm/templates/author/author.html:158
 #, python-format
 msgid "Books by %(name)s"
 msgstr "Llyfrau gan %(name)s"
@@ -814,16 +825,21 @@ msgid "Librarything key:"
 msgstr "Allwedd Librarything:"
 
 #: bookwyrm/templates/author/edit_author.html:98
+#: bookwyrm/templates/book/edit/edit_book_form.html:332
 msgid "Goodreads key:"
 msgstr "Allwedd Goodreads:"
 
 #: bookwyrm/templates/author/edit_author.html:105
+msgid "ISFDB:"
+msgstr ""
+
+#: bookwyrm/templates/author/edit_author.html:112
 msgid "ISNI:"
 msgstr "ISNI:"
 
-#: bookwyrm/templates/author/edit_author.html:115
-#: bookwyrm/templates/book/book.html:202
-#: bookwyrm/templates/book/edit/edit_book.html:139
+#: bookwyrm/templates/author/edit_author.html:122
+#: bookwyrm/templates/book/book.html:209
+#: bookwyrm/templates/book/edit/edit_book.html:142
 #: bookwyrm/templates/book/file_links/add_link_modal.html:60
 #: bookwyrm/templates/book/file_links/edit_links.html:86
 #: bookwyrm/templates/groups/form.html:32
@@ -835,19 +851,21 @@ msgstr "ISNI:"
 #: bookwyrm/templates/settings/announcements/edit_announcement.html:120
 #: bookwyrm/templates/settings/federation/edit_instance.html:98
 #: bookwyrm/templates/settings/federation/instance.html:105
-#: bookwyrm/templates/settings/site.html:194
+#: bookwyrm/templates/settings/registration.html:79
+#: bookwyrm/templates/settings/registration_limited.html:76
+#: bookwyrm/templates/settings/site.html:144
 #: bookwyrm/templates/settings/users/user_moderation_actions.html:69
 #: bookwyrm/templates/shelf/form.html:25
 #: bookwyrm/templates/snippets/reading_modals/layout.html:18
 msgid "Save"
 msgstr "Cadw"
 
-#: bookwyrm/templates/author/edit_author.html:116
+#: bookwyrm/templates/author/edit_author.html:123
 #: bookwyrm/templates/author/sync_modal.html:23
-#: bookwyrm/templates/book/book.html:203
+#: bookwyrm/templates/book/book.html:210
 #: bookwyrm/templates/book/cover_add_modal.html:33
-#: bookwyrm/templates/book/edit/edit_book.html:141
 #: bookwyrm/templates/book/edit/edit_book.html:144
+#: bookwyrm/templates/book/edit/edit_book.html:147
 #: bookwyrm/templates/book/file_links/add_link_modal.html:59
 #: bookwyrm/templates/book/file_links/verification_modal.html:25
 #: bookwyrm/templates/book/sync_modal.html:23
@@ -871,7 +889,7 @@ msgid "Loading data will connect to <strong>%(source_name)s</strong> and check f
 msgstr "Cysylltir data a lwythir at <strong>%(source_name)s</strong> a bydd yn gwirio metadata eraill am yr awdur hwn. Ni fydd yn ysgrifennu dros fetadata presennol."
 
 #: bookwyrm/templates/author/sync_modal.html:24
-#: bookwyrm/templates/book/edit/edit_book.html:126
+#: bookwyrm/templates/book/edit/edit_book.html:129
 #: bookwyrm/templates/book/sync_modal.html:24
 #: bookwyrm/templates/groups/members.html:29
 #: bookwyrm/templates/landing/password_reset.html:52
@@ -901,7 +919,7 @@ msgstr "Methwyd â llwytho clawr"
 msgid "Click to enlarge"
 msgstr "Cliciwch i ehangu"
 
-#: bookwyrm/templates/book/book.html:179
+#: bookwyrm/templates/book/book.html:186
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
@@ -912,17 +930,17 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] "(adolygiadau %(review_count)s)"
 
-#: bookwyrm/templates/book/book.html:191
+#: bookwyrm/templates/book/book.html:198
 msgid "Add Description"
 msgstr "Ychwanegu disgrifiad"
 
-#: bookwyrm/templates/book/book.html:198
+#: bookwyrm/templates/book/book.html:205
 #: bookwyrm/templates/book/edit/edit_book_form.html:42
 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17
 msgid "Description:"
 msgstr "Disgrifiad:"
 
-#: bookwyrm/templates/book/book.html:214
+#: bookwyrm/templates/book/book.html:221
 #, python-format
 msgid "%(count)s edition"
 msgid_plural "%(count)s editions"
@@ -933,67 +951,67 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] "Argraffiadau %(count)s"
 
-#: bookwyrm/templates/book/book.html:228
+#: bookwyrm/templates/book/book.html:235
 msgid "You have shelved this edition in:"
 msgstr "Rydych wedi rhoi'r fersiwn yma ar silff:"
 
-#: bookwyrm/templates/book/book.html:243
+#: bookwyrm/templates/book/book.html:250
 #, python-format
 msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
 msgstr "Mae <a href=\"%(book_path)s\">fersiwn wahanol</a>o'r llyfr hwn ar eich <a href=\"%(shelf_path)s\">%(shelf_name)s</a>silff."
 
-#: bookwyrm/templates/book/book.html:254
+#: bookwyrm/templates/book/book.html:261
 msgid "Your reading activity"
 msgstr "Eich darllen"
 
-#: bookwyrm/templates/book/book.html:260
+#: bookwyrm/templates/book/book.html:267
 #: bookwyrm/templates/guided_tour/book.html:56
 msgid "Add read dates"
 msgstr "Ychwanegu dyddiadau darllen"
 
-#: bookwyrm/templates/book/book.html:268
+#: bookwyrm/templates/book/book.html:275
 msgid "You don't have any reading activity for this book."
 msgstr "Does gennych ddim cofnod darllen ar gyfer y llyfr hwn."
 
-#: bookwyrm/templates/book/book.html:294
+#: bookwyrm/templates/book/book.html:301
 msgid "Your reviews"
 msgstr "Eich adolygiadau"
 
-#: bookwyrm/templates/book/book.html:300
+#: bookwyrm/templates/book/book.html:307
 msgid "Your comments"
 msgstr "Eich sylwadau"
 
-#: bookwyrm/templates/book/book.html:306
+#: bookwyrm/templates/book/book.html:313
 msgid "Your quotes"
 msgstr "Eich dyfyniadau"
 
-#: bookwyrm/templates/book/book.html:342
+#: bookwyrm/templates/book/book.html:349
 msgid "Subjects"
 msgstr "Pynciau"
 
-#: bookwyrm/templates/book/book.html:354
+#: bookwyrm/templates/book/book.html:361
 msgid "Places"
 msgstr "Lleoedd"
 
-#: bookwyrm/templates/book/book.html:365
+#: bookwyrm/templates/book/book.html:372
 #: bookwyrm/templates/groups/group.html:19
 #: bookwyrm/templates/guided_tour/lists.html:14
 #: bookwyrm/templates/guided_tour/user_books.html:102
 #: bookwyrm/templates/guided_tour/user_profile.html:78
-#: bookwyrm/templates/layout.html:101 bookwyrm/templates/lists/curate.html:8
+#: bookwyrm/templates/layout.html:102 bookwyrm/templates/lists/curate.html:8
 #: bookwyrm/templates/lists/list.html:12 bookwyrm/templates/lists/lists.html:5
 #: bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search/layout.html:26
 #: bookwyrm/templates/search/layout.html:51
-#: bookwyrm/templates/user/layout.html:85
+#: bookwyrm/templates/user/layout.html:89
 msgid "Lists"
 msgstr "Rhestrau"
 
-#: bookwyrm/templates/book/book.html:377
+#: bookwyrm/templates/book/book.html:384
 msgid "Add to list"
 msgstr "Ychwanegu i'r rhestr"
 
-#: bookwyrm/templates/book/book.html:387
+#: bookwyrm/templates/book/book.html:394
 #: bookwyrm/templates/book/cover_add_modal.html:32
 #: bookwyrm/templates/lists/add_item_modal.html:39
 #: bookwyrm/templates/lists/list.html:255
@@ -1007,15 +1025,29 @@ msgid "ISBN:"
 msgstr "ISBN:"
 
 #: bookwyrm/templates/book/book_identifiers.html:15
-#: bookwyrm/templates/book/edit/edit_book_form.html:332
+#: bookwyrm/templates/book/edit/edit_book_form.html:341
 msgid "OCLC Number:"
 msgstr "Rhif OCLC:"
 
 #: bookwyrm/templates/book/book_identifiers.html:22
-#: bookwyrm/templates/book/edit/edit_book_form.html:341
+#: bookwyrm/templates/book/edit/edit_book_form.html:350
 msgid "ASIN:"
 msgstr "ASIN:"
 
+#: bookwyrm/templates/book/book_identifiers.html:29
+#: bookwyrm/templates/book/edit/edit_book_form.html:359
+msgid "Audible ASIN:"
+msgstr ""
+
+#: bookwyrm/templates/book/book_identifiers.html:36
+#: bookwyrm/templates/book/edit/edit_book_form.html:368
+msgid "ISFDB ID:"
+msgstr ""
+
+#: bookwyrm/templates/book/book_identifiers.html:43
+msgid "Goodreads:"
+msgstr ""
+
 #: bookwyrm/templates/book/cover_add_modal.html:5
 msgid "Add cover"
 msgstr "Ychwanegu clawr"
@@ -1082,20 +1114,20 @@ msgstr "Darganfyddwch rhagor yn isni.org"
 msgid "This is a new author"
 msgstr "Awdur newydd yw hwn"
 
-#: bookwyrm/templates/book/edit/edit_book.html:104
+#: bookwyrm/templates/book/edit/edit_book.html:107
 #, python-format
 msgid "Creating a new author: %(name)s"
 msgstr "Yn creu awdur newydd: %(name)s"
 
-#: bookwyrm/templates/book/edit/edit_book.html:111
+#: bookwyrm/templates/book/edit/edit_book.html:114
 msgid "Is this an edition of an existing work?"
 msgstr "Ai fersiwn o waith sy'n bodoli eisoes ydyw?"
 
-#: bookwyrm/templates/book/edit/edit_book.html:119
+#: bookwyrm/templates/book/edit/edit_book.html:122
 msgid "This is a new work"
 msgstr "Llyfr newydd yw hwn"
 
-#: bookwyrm/templates/book/edit/edit_book.html:128
+#: bookwyrm/templates/book/edit/edit_book.html:131
 #: bookwyrm/templates/feed/status.html:21
 #: bookwyrm/templates/guided_tour/book.html:44
 #: bookwyrm/templates/guided_tour/book.html:68
@@ -1651,7 +1683,7 @@ msgstr "Mae <a href=\"%(user_path)s\">%(username)s</a> wedi dyfynnu <a href=\"%(
 
 #: bookwyrm/templates/discover/discover.html:4
 #: bookwyrm/templates/discover/discover.html:10
-#: bookwyrm/templates/layout.html:104
+#: bookwyrm/templates/layout.html:105
 msgid "Discover"
 msgstr "Darganfyddwch"
 
@@ -1774,7 +1806,16 @@ msgstr "Os na ofynnoch i newid eich cyfrinair, anwybyddwch yr ebost yma."
 msgid "Reset your %(site_name)s password"
 msgstr "Newidiwch eich cyfrinair %(site_name)s"
 
-#: bookwyrm/templates/embed-layout.html:20 bookwyrm/templates/layout.html:40
+#: bookwyrm/templates/email/test/html_content.html:6
+#: bookwyrm/templates/email/test/text_content.html:4
+msgid "This is a test email."
+msgstr ""
+
+#: bookwyrm/templates/email/test/subject.html:2
+msgid "Test email"
+msgstr ""
+
+#: bookwyrm/templates/embed-layout.html:20 bookwyrm/templates/layout.html:41
 #: bookwyrm/templates/setup/layout.html:15
 #: bookwyrm/templates/two_factor_auth/two_factor_login.html:18
 #: bookwyrm/templates/two_factor_auth/two_factor_prompt.html:18
@@ -1913,7 +1954,7 @@ msgid "What are you reading?"
 msgstr "Beth ydych chi'n darllen?"
 
 #: bookwyrm/templates/get_started/books.html:9
-#: bookwyrm/templates/layout.html:48 bookwyrm/templates/lists/list.html:213
+#: bookwyrm/templates/layout.html:49 bookwyrm/templates/lists/list.html:213
 msgid "Search for a book"
 msgstr "Chwilio am lyfr"
 
@@ -1932,8 +1973,8 @@ msgstr "Gallwch ychwanegu llyfrau pan fyddwch yn defnyddio %(site_name)s."
 #: bookwyrm/templates/get_started/users.html:18
 #: bookwyrm/templates/get_started/users.html:19
 #: bookwyrm/templates/groups/members.html:15
-#: bookwyrm/templates/groups/members.html:16 bookwyrm/templates/layout.html:54
-#: bookwyrm/templates/layout.html:55 bookwyrm/templates/lists/list.html:217
+#: bookwyrm/templates/groups/members.html:16 bookwyrm/templates/layout.html:55
+#: bookwyrm/templates/layout.html:56 bookwyrm/templates/lists/list.html:217
 #: bookwyrm/templates/search/layout.html:5
 #: bookwyrm/templates/search/layout.html:10
 msgid "Search"
@@ -2419,8 +2460,8 @@ msgid "The bell will light up when you have a new notification. When it does, cl
 msgstr ""
 
 #: bookwyrm/templates/guided_tour/home.html:177
-#: bookwyrm/templates/layout.html:85 bookwyrm/templates/layout.html:117
-#: bookwyrm/templates/layout.html:118
+#: bookwyrm/templates/layout.html:86 bookwyrm/templates/layout.html:118
+#: bookwyrm/templates/layout.html:119
 #: bookwyrm/templates/notifications/notifications_page.html:5
 #: bookwyrm/templates/notifications/notifications_page.html:10
 msgid "Notifications"
@@ -2583,7 +2624,7 @@ msgstr ""
 
 #: bookwyrm/templates/guided_tour/user_groups.html:11
 #: bookwyrm/templates/guided_tour/user_profile.html:55
-#: bookwyrm/templates/user/layout.html:79
+#: bookwyrm/templates/user/layout.html:83
 msgid "Groups"
 msgstr ""
 
@@ -2637,7 +2678,7 @@ msgid "This tab shows everything you have read towards your annual reading goal,
 msgstr ""
 
 #: bookwyrm/templates/guided_tour/user_profile.html:32
-#: bookwyrm/templates/user/layout.html:73
+#: bookwyrm/templates/user/layout.html:77
 msgid "Reading Goal"
 msgstr ""
 
@@ -3000,7 +3041,7 @@ msgid "Login"
 msgstr ""
 
 #: bookwyrm/templates/landing/login.html:7
-#: bookwyrm/templates/landing/login.html:36 bookwyrm/templates/layout.html:149
+#: bookwyrm/templates/landing/login.html:36 bookwyrm/templates/layout.html:150
 #: bookwyrm/templates/ostatus/error.html:37
 msgid "Log in"
 msgstr ""
@@ -3011,7 +3052,7 @@ msgstr ""
 
 #: bookwyrm/templates/landing/login.html:21
 #: bookwyrm/templates/landing/reactivate.html:17
-#: bookwyrm/templates/layout.html:140 bookwyrm/templates/ostatus/error.html:28
+#: bookwyrm/templates/layout.html:141 bookwyrm/templates/ostatus/error.html:28
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr ""
@@ -3019,13 +3060,13 @@ msgstr ""
 #: bookwyrm/templates/landing/login.html:27
 #: bookwyrm/templates/landing/password_reset.html:26
 #: bookwyrm/templates/landing/reactivate.html:23
-#: bookwyrm/templates/layout.html:144 bookwyrm/templates/ostatus/error.html:32
+#: bookwyrm/templates/layout.html:145 bookwyrm/templates/ostatus/error.html:32
 #: bookwyrm/templates/preferences/2fa.html:91
 #: bookwyrm/templates/snippets/register_form.html:45
 msgid "Password:"
 msgstr ""
 
-#: bookwyrm/templates/landing/login.html:39 bookwyrm/templates/layout.html:146
+#: bookwyrm/templates/landing/login.html:39 bookwyrm/templates/layout.html:147
 #: bookwyrm/templates/ostatus/error.html:34
 msgid "Forgot your password?"
 msgstr ""
@@ -3068,35 +3109,35 @@ msgstr ""
 msgid "%(site_name)s search"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:46
+#: bookwyrm/templates/layout.html:47
 msgid "Search for a book, user, or list"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:61 bookwyrm/templates/layout.html:62
+#: bookwyrm/templates/layout.html:62 bookwyrm/templates/layout.html:63
 msgid "Scan Barcode"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:76
+#: bookwyrm/templates/layout.html:77
 msgid "Main navigation menu"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:98
+#: bookwyrm/templates/layout.html:99
 msgid "Feed"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:145 bookwyrm/templates/ostatus/error.html:33
+#: bookwyrm/templates/layout.html:146 bookwyrm/templates/ostatus/error.html:33
 msgid "password"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:157
+#: bookwyrm/templates/layout.html:158
 msgid "Join"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:191
+#: bookwyrm/templates/layout.html:192
 msgid "Successfully posted status"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:192
+#: bookwyrm/templates/layout.html:193
 msgid "Error posting status"
 msgstr ""
 
@@ -3948,7 +3989,7 @@ msgstr ""
 #: bookwyrm/templates/preferences/edit_user.html:13
 #: bookwyrm/templates/preferences/edit_user.html:64
 #: bookwyrm/templates/settings/site.html:11
-#: bookwyrm/templates/settings/site.html:90
+#: bookwyrm/templates/settings/site.html:89
 #: bookwyrm/templates/setup/config.html:91
 msgid "Display"
 msgstr ""
@@ -4243,7 +4284,7 @@ msgstr ""
 #: bookwyrm/templates/settings/announcements/announcements.html:3
 #: bookwyrm/templates/settings/announcements/announcements.html:5
 #: bookwyrm/templates/settings/announcements/edit_announcement.html:15
-#: bookwyrm/templates/settings/layout.html:97
+#: bookwyrm/templates/settings/layout.html:99
 msgid "Announcements"
 msgstr ""
 
@@ -4645,6 +4686,58 @@ msgstr[5] ""
 msgid "No email domains currently blocked"
 msgstr ""
 
+#: bookwyrm/templates/settings/email_config.html:6
+#: bookwyrm/templates/settings/email_config.html:8
+#: bookwyrm/templates/settings/layout.html:90
+msgid "Email Configuration"
+msgstr ""
+
+#: bookwyrm/templates/settings/email_config.html:16
+msgid "Error sending test email:"
+msgstr ""
+
+#: bookwyrm/templates/settings/email_config.html:24
+msgid "Successfully sent test email."
+msgstr ""
+
+#: bookwyrm/templates/settings/email_config.html:32
+#: bookwyrm/templates/setup/config.html:102
+msgid "Email sender:"
+msgstr ""
+
+#: bookwyrm/templates/settings/email_config.html:39
+msgid "Email backend:"
+msgstr ""
+
+#: bookwyrm/templates/settings/email_config.html:46
+msgid "Host:"
+msgstr ""
+
+#: bookwyrm/templates/settings/email_config.html:53
+msgid "Host user:"
+msgstr ""
+
+#: bookwyrm/templates/settings/email_config.html:60
+msgid "Port:"
+msgstr ""
+
+#: bookwyrm/templates/settings/email_config.html:67
+msgid "Use TLS:"
+msgstr ""
+
+#: bookwyrm/templates/settings/email_config.html:74
+msgid "Use SSL:"
+msgstr ""
+
+#: bookwyrm/templates/settings/email_config.html:83
+#, python-format
+msgid "Send test email to %(email)s"
+msgstr ""
+
+#: bookwyrm/templates/settings/email_config.html:90
+msgid "Send test email"
+msgstr ""
+
 #: bookwyrm/templates/settings/federation/edit_instance.html:3
 #: bookwyrm/templates/settings/federation/edit_instance.html:6
 #: bookwyrm/templates/settings/federation/edit_instance.html:15
@@ -5028,22 +5121,31 @@ msgstr ""
 msgid "System"
 msgstr ""
 
-#: bookwyrm/templates/settings/layout.html:88
+#: bookwyrm/templates/settings/layout.html:86
 msgid "Celery status"
 msgstr ""
 
-#: bookwyrm/templates/settings/layout.html:93
+#: bookwyrm/templates/settings/layout.html:95
 msgid "Instance Settings"
 msgstr ""
 
-#: bookwyrm/templates/settings/layout.html:101
+#: bookwyrm/templates/settings/layout.html:103
 #: bookwyrm/templates/settings/site.html:4
 #: bookwyrm/templates/settings/site.html:6
 msgid "Site Settings"
 msgstr ""
 
-#: bookwyrm/templates/settings/layout.html:106
-#: bookwyrm/templates/settings/site.html:108
+#: bookwyrm/templates/settings/layout.html:109
+#: bookwyrm/templates/settings/layout.html:112
+#: bookwyrm/templates/settings/registration.html:4
+#: bookwyrm/templates/settings/registration.html:6
+#: bookwyrm/templates/settings/registration_limited.html:4
+#: bookwyrm/templates/settings/registration_limited.html:6
+msgid "Registration"
+msgstr ""
+
+#: bookwyrm/templates/settings/layout.html:118
+#: bookwyrm/templates/settings/site.html:107
 #: bookwyrm/templates/settings/themes.html:4
 #: bookwyrm/templates/settings/themes.html:6
 msgid "Themes"
@@ -5082,6 +5184,58 @@ msgstr ""
 msgid "No links available for this domain."
 msgstr ""
 
+#: bookwyrm/templates/settings/registration.html:13
+#: bookwyrm/templates/settings/registration_limited.html:13
+#: bookwyrm/templates/settings/site.html:21
+msgid "Settings saved"
+msgstr ""
+
+#: bookwyrm/templates/settings/registration.html:22
+#: bookwyrm/templates/settings/registration_limited.html:22
+#: bookwyrm/templates/settings/site.html:30
+msgid "Unable to save settings"
+msgstr ""
+
+#: bookwyrm/templates/settings/registration.html:38
+msgid "Allow registration"
+msgstr ""
+
+#: bookwyrm/templates/settings/registration.html:44
+msgid "Require users to confirm email address"
+msgstr ""
+
+#: bookwyrm/templates/settings/registration.html:46
+msgid "(Recommended if registration is open)"
+msgstr ""
+
+#: bookwyrm/templates/settings/registration.html:51
+msgid "Allow invite requests"
+msgstr ""
+
+#: bookwyrm/templates/settings/registration.html:55
+#: bookwyrm/templates/settings/registration_limited.html:42
+msgid "Invite request text:"
+msgstr ""
+
+#: bookwyrm/templates/settings/registration.html:63
+#: bookwyrm/templates/settings/registration_limited.html:50
+msgid "Set a question for invite requests"
+msgstr ""
+
+#: bookwyrm/templates/settings/registration.html:68
+#: bookwyrm/templates/settings/registration_limited.html:55
+msgid "Question:"
+msgstr ""
+
+#: bookwyrm/templates/settings/registration.html:73
+#: bookwyrm/templates/settings/registration_limited.html:67
+msgid "Registration closed text:"
+msgstr ""
+
+#: bookwyrm/templates/settings/registration_limited.html:29
+msgid "Registration is enabled on this instance"
+msgstr ""
+
 #: bookwyrm/templates/settings/reports/report.html:12
 msgid "Back to reports"
 msgstr ""
@@ -5179,132 +5333,87 @@ msgid "No reports found."
 msgstr ""
 
 #: bookwyrm/templates/settings/site.html:10
-#: bookwyrm/templates/settings/site.html:44
+#: bookwyrm/templates/settings/site.html:43
 msgid "Instance Info"
 msgstr ""
 
 #: bookwyrm/templates/settings/site.html:12
-#: bookwyrm/templates/settings/site.html:123
+#: bookwyrm/templates/settings/site.html:122
 msgid "Footer Content"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:13
-#: bookwyrm/templates/settings/site.html:147
-msgid "Registration"
-msgstr ""
-
-#: bookwyrm/templates/settings/site.html:22
-msgid "Settings saved"
-msgstr ""
-
-#: bookwyrm/templates/settings/site.html:31
-msgid "Unable to save settings"
-msgstr ""
-
-#: bookwyrm/templates/settings/site.html:47
+#: bookwyrm/templates/settings/site.html:46
 msgid "Instance Name:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:51
+#: bookwyrm/templates/settings/site.html:50
 msgid "Tagline:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:55
+#: bookwyrm/templates/settings/site.html:54
 msgid "Instance description:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:59
+#: bookwyrm/templates/settings/site.html:58
 msgid "Short description:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:60
+#: bookwyrm/templates/settings/site.html:59
 msgid "Used when the instance is previewed on joinbookwyrm.com. Does not support HTML or Markdown."
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:64
+#: bookwyrm/templates/settings/site.html:63
 msgid "Code of conduct:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:68
+#: bookwyrm/templates/settings/site.html:67
 msgid "Privacy Policy:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:73
+#: bookwyrm/templates/settings/site.html:72
 msgid "Impressum:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:78
+#: bookwyrm/templates/settings/site.html:77
 msgid "Include impressum:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:92
+#: bookwyrm/templates/settings/site.html:91
 msgid "Images"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:95
+#: bookwyrm/templates/settings/site.html:94
 msgid "Logo:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:99
+#: bookwyrm/templates/settings/site.html:98
 msgid "Logo small:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:103
+#: bookwyrm/templates/settings/site.html:102
 msgid "Favicon:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:111
+#: bookwyrm/templates/settings/site.html:110
 msgid "Default theme:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:126
+#: bookwyrm/templates/settings/site.html:125
 msgid "Support link:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:130
+#: bookwyrm/templates/settings/site.html:129
 msgid "Support title:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:134
+#: bookwyrm/templates/settings/site.html:133
 msgid "Admin email:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:138
+#: bookwyrm/templates/settings/site.html:137
 msgid "Additional info:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:152
-msgid "Allow registration"
-msgstr ""
-
-#: bookwyrm/templates/settings/site.html:158
-msgid "Require users to confirm email address"
-msgstr ""
-
-#: bookwyrm/templates/settings/site.html:160
-msgid "(Recommended if registration is open)"
-msgstr ""
-
-#: bookwyrm/templates/settings/site.html:165
-msgid "Allow invite requests"
-msgstr ""
-
-#: bookwyrm/templates/settings/site.html:171
-msgid "Set a question for invite requests"
-msgstr ""
-
-#: bookwyrm/templates/settings/site.html:176
-msgid "Question:"
-msgstr ""
-
-#: bookwyrm/templates/settings/site.html:181
-msgid "Registration closed text:"
-msgstr ""
-
-#: bookwyrm/templates/settings/site.html:185
-msgid "Invite request text:"
-msgstr ""
-
 #: bookwyrm/templates/settings/themes.html:10
 msgid "Set instance default theme"
 msgstr ""
@@ -5565,10 +5674,6 @@ msgstr ""
 msgid "Default interface language:"
 msgstr ""
 
-#: bookwyrm/templates/setup/config.html:102
-msgid "Email sender:"
-msgstr ""
-
 #: bookwyrm/templates/setup/config.html:109
 msgid "Enable preview images:"
 msgstr ""
@@ -6338,6 +6443,11 @@ msgstr ""
 msgid "Follow Requests"
 msgstr ""
 
+#: bookwyrm/templates/user/layout.html:71
+#: bookwyrm/templates/user/reviews_comments.html:10
+msgid "Reviews and Comments"
+msgstr ""
+
 #: bookwyrm/templates/user/lists.html:11
 #, python-format
 msgid "Lists: %(username)s"
@@ -6362,6 +6472,10 @@ msgstr ""
 msgid "%(username)s isn't following any users"
 msgstr ""
 
+#: bookwyrm/templates/user/reviews_comments.html:24
+msgid "No reviews or comments yet!"
+msgstr ""
+
 #: bookwyrm/templates/user/user.html:16
 msgid "Edit profile"
 msgstr ""