diff --git a/justfile b/justfile
index fababdc71b..b6e6f3c07c 100644
--- a/justfile
+++ b/justfile
@@ -122,7 +122,7 @@ dev: init dev-run
 
 # Generate docs from code & readmes
 docs: 
-	just mix-remote docs
+	just mix docs
 
 # Analyse the codebase and generate some reports. Requires Graphviz and SQLite
 arch:
diff --git a/mix.exs b/mix.exs
index e369100ffd..3063b8a470 100755
--- a/mix.exs
+++ b/mix.exs
@@ -187,6 +187,7 @@ defmodule Bonfire.Umbrella.MixProject do
       homepage_url: "https://bonfirenetworks.org",
       docs: [
         # The first page to display from the docs
+        name: "Bonfire",
         main: "readme",
         logo: config()[:logo],
         output: "docs/exdoc",
@@ -194,14 +195,14 @@ defmodule Bonfire.Umbrella.MixProject do
         # extra pages to include
         extras: Mixer.readme_paths(config()),
         # extra apps to include in module docs
-        source_beam: Mixer.beam_paths(config(), :docs),
-        deps: Mixer.doc_deps(config()),
+        source_beam: Mixer.docs_beam_paths(config()),
+        # deps: Mixer.doc_dep_urls(config()),
         # Note: first match wins
         groups_for_extras: [
           Guides: Path.wildcard("docs/*"),
           "Flavours of Bonfire": Path.wildcard("flavours/*/*"),
-          "Data schemas": Path.wildcard("{deps,forks}/bonfire_data_*/*"),
-          "UI extensions": Path.wildcard("{deps,forks}/bonfire_ui_*/*"),
+          "Data schemas": Path.wildcard("{extensions,deps,forks}/bonfire_data_*/*"),
+          "UI extensions": Path.wildcard("{extensions,deps,forks}/bonfire_ui_*/*"),
           "Bonfire utilities":
             [
               "bonfire_api_graphql",
@@ -213,9 +214,9 @@ defmodule Bonfire.Umbrella.MixProject do
               "bonfire_files",
               "bonfire_mailer"
             ]
-            |> Enum.flat_map(&Path.wildcard("{deps,forks}/#{&1}/*")),
-          "Feature extensions": Path.wildcard("{deps,forks}/bonfire_*/*"),
-          "Other utilities": Path.wildcard("{deps,forks}/*/*"),
+            |> Enum.flat_map(&Path.wildcard("{extensions,deps,forks}/#{&1}/*")),
+          "Feature extensions": Path.wildcard("{extensions,deps,forks}/bonfire_*/*"),
+          "Other utilities": Path.wildcard("{extensions,deps,forks}/*/*"),
           Dependencies: Path.wildcard("docs/DEPENDENCIES/*")
         ],
         groups_for_modules: [
@@ -231,16 +232,27 @@ defmodule Bonfire.Umbrella.MixProject do
             ~r/^Bonfire.Epics?/,
             ~r/^Bonfire.Fail?/,
             ~r/^Bonfire.Files?/,
-            ~r/^Bonfire.Mailer?/
+            ~r/^Bonfire.Mailer?/,
+            ~r/^Pointers?/
           ],
           "Feature extensions": [~r/^Bonfire.?/, ~r/^ValueFlows.?/],
+          Federation: [
+            ~r/^ActivityPub.?/,
+            ~r/^ActivityPub.?/,
+            ~r/^Nodeinfo.?/,
+            ~r/^NodeinfoWeb.?/
+          ],
+          Icons: ~r/^Iconify.?/,
           Utilities: ~r/.?/
         ],
         nest_modules_by_prefix: [
           Bonfire.Data,
           # Bonfire.UI,
           Bonfire,
-          ValueFlows
+          ActivityPub,
+          ActivityPubWeb,
+          # ValueFlows,
+          Iconify
         ]
       ]
     ]
diff --git a/priv/localisation/bonfire.po b/priv/localisation/bonfire.po
index 2e78d09d4c..4a5eb43b99 100644
--- a/priv/localisation/bonfire.po
+++ b/priv/localisation/bonfire.po
@@ -10,21 +10,161 @@
 msgid ""
 msgstr ""
 
-#: lib/web/home/home_live.ex:27
+#: lib/web/home/home_live.ex:40
 #, elixir-autogen, elixir-format
 msgid "About Bonfire"
 msgstr ""
 
+#: lib/web/home/home_live.ex:52
+#, elixir-autogen, elixir-format
+msgid "An  instance of"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Boost"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Boosted"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Boosted by %{user}"
+msgstr ""
+
 #: lib/localise.ex:18
 #, elixir-autogen, elixir-format
 msgid "Boosts"
 msgstr ""
 
-#: lib/web/home/home_live.ex:28
+#: lib/web/home/home_live.ex:41
 #, elixir-autogen, elixir-format
 msgid "Contribute"
 msgstr ""
 
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Create"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Created"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Created by %{user}"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Delete"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Deleted"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Deleted by %{user}"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Edit"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Edited"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Edited by %{user}"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Flag"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Flagged"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Flagged by %{user}"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Follow"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Followed"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Followed by %{user}"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Like"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Liked"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Liked by %{user}"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Mention"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Mentioned"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Mentioned by %{user}"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Message"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Messaged"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Messaged by %{user}"
+msgstr ""
+
 #: lib/localise.ex:17
 #, elixir-autogen, elixir-format
 msgid "Posts"
@@ -35,17 +175,233 @@ msgstr ""
 msgid "Published"
 msgstr ""
 
+#: lib/localise.ex:10
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Read"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Read by %{user}"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Replied"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Replied by %{user}"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Reply"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Request"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Request to Boost"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Request to Create"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Request to Delete"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Request to Edit"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Request to Flag"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Request to Follow"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Request to Like"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Request to Mention"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Request to Message"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Request to Read"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Request to Reply"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Request to Request"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Request to See"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Request to Tag"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Requested"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Requested by %{user}"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Requested to Boost"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Requested to Create"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Requested to Delete"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Requested to Edit"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Requested to Flag"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Requested to Follow"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Requested to Like"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Requested to Mention"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Requested to Message"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Requested to Read"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Requested to Reply"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Requested to Request"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Requested to See"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Requested to Tag"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Saw"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Saw by %{user}"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "See"
+msgstr ""
+
 #: lib/localise.ex:20
 #, elixir-autogen, elixir-format
 msgid "Submitted"
 msgstr ""
 
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Tag"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Tagged"
+msgstr ""
+
+#: lib/localise.ex:10
+#, elixir-autogen, elixir-format
+msgid "Tagged by %{user}"
+msgstr ""
+
 #: lib/localise.ex:16
 #, elixir-autogen, elixir-format
 msgid "Timeline"
 msgstr ""
 
-#: lib/web/home/home_live.sface:33
+#: lib/web/home/home_live.sface:34
 #, elixir-autogen, elixir-format
 msgid "Welcome"
 msgstr ""
+
+#: lib/web/home/home_live.ex:51
+#, elixir-autogen, elixir-format
+msgid "dashboard"
+msgstr ""
diff --git a/priv/localisation/bonfire_boundaries.po b/priv/localisation/bonfire_boundaries.po
index 78e5fbb2ec..2d169b2ab5 100644
--- a/priv/localisation/bonfire_boundaries.po
+++ b/priv/localisation/bonfire_boundaries.po
@@ -54,8 +54,8 @@ msgid "Back"
 msgstr ""
 
 #: lib/web/components/block/block_button_live.sface:4
-#: lib/web/components/block/block_button_live.sface:178
-#: lib/web/components/block/block_button_live.sface:185
+#: lib/web/components/block/block_button_live.sface:146
+#: lib/web/components/block/block_button_live.sface:153
 #, elixir-autogen, elixir-format
 msgid "Block"
 msgstr ""
@@ -66,7 +66,7 @@ msgstr ""
 msgid "Boundaries"
 msgstr ""
 
-#: lib/web/views/boundaries_live.ex:29
+#: lib/web/views/boundaries_live.ex:34
 #, elixir-autogen, elixir-format
 msgid "Boundaries & Circles"
 msgstr ""
@@ -143,6 +143,11 @@ msgstr ""
 msgid "Create and manage your circle."
 msgstr ""
 
+#: lib/web/components/display/boundary_icon_live.sface:35
+#, elixir-autogen, elixir-format
+msgid "Custom Boundaries"
+msgstr ""
+
 #: lib/web/components/acls/acl_live.sface:283
 #: lib/web/components/circles/circle_live.sface:223
 #, elixir-autogen, elixir-format
@@ -236,6 +241,11 @@ msgstr ""
 msgid "Edited!"
 msgstr ""
 
+#: lib/web/components/roles/roles_live.sface:5
+#, elixir-autogen, elixir-format
+msgid "Editor"
+msgstr ""
+
 #: lib/web/components/acls/new_acl_live.sface:57
 #, elixir-autogen, elixir-format
 msgid "Enter a name for the boundary"
@@ -251,6 +261,12 @@ msgstr ""
 msgid "Everyone on this instance will be able to see, interact, and reply"
 msgstr ""
 
+#: lib/web/components/roles/roles_live.sface:8
+#: lib/web/components/roles/roles_live.sface:18
+#, elixir-autogen, elixir-format
+msgid "Expand"
+msgstr ""
+
 #: lib/web/components/circles/circle_live.sface:179
 #: lib/web/components/circles/drag_drop_WIP/edit_circle_live.sface:196
 #, elixir-autogen, elixir-format
@@ -283,6 +299,11 @@ msgstr ""
 msgid "Ghosted instance-wide"
 msgstr ""
 
+#: lib/web/components/roles/roles_live.sface:6
+#, elixir-autogen, elixir-format
+msgid "Identify this topic"
+msgstr ""
+
 #: lib/web/components/sidebar/sidebar_nav_live.sface:109
 #, elixir-autogen, elixir-format
 msgid "Instance Boundaries"
@@ -298,6 +319,11 @@ msgstr ""
 msgid "Instance wide"
 msgstr ""
 
+#: lib/web/components/display/boundary_icon_live.sface:24
+#, elixir-autogen, elixir-format
+msgid "Local"
+msgstr ""
+
 #: lib/boundaries.ex:102
 #: lib/web/components/set/boundaries_list_live.sface:58
 #: lib/web/components/set/boundaries_list_live.sface:66
@@ -396,7 +422,7 @@ msgid "Prevent them from seeing or interacting with you or your content"
 msgstr ""
 
 #: lib/boundaries.ex:101
-#: lib/web/components/display/boundary_icon_live.sface:17
+#: lib/web/components/display/boundary_icon_live.sface:13
 #: lib/web/components/set/boundaries_list_live.sface:15
 #: lib/web/components/set/boundaries_list_live.sface:23
 #: lib/web/components/set/boundaries_selection_live.sface:25
@@ -437,11 +463,6 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
-#: lib/web/components/set/boundaries_selection_live.sface:35
-#, elixir-autogen, elixir-format
-msgid "Remove this boundary"
-msgstr ""
-
 #: lib/web/live_handler.ex:316
 #, elixir-autogen, elixir-format
 msgid "Removed from boundary"
@@ -452,6 +473,11 @@ msgstr ""
 msgid "Removed from circle!"
 msgstr ""
 
+#: lib/web/components/roles/roles_live.sface:16
+#, elixir-autogen, elixir-format
+msgid "Reviewer"
+msgstr ""
+
 #: lib/web/components/sidebar/sidebar_nav_live.sface:32
 #, elixir-autogen, elixir-format
 msgid "Safety"
@@ -684,8 +710,3 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "Your %{activity_type} will only be visible to the person you are messaging (plus yourself and possibly instance admins)."
 msgstr ""
-
-#: lib/web/components/block/block_menu_buttons_live.sface:6
-#, elixir-autogen, elixir-format
-msgid "this user"
-msgstr ""
diff --git a/priv/localisation/bonfire_breadpub.po b/priv/localisation/bonfire_breadpub.po
index ae5e59f041..e52dffcf02 100644
--- a/priv/localisation/bonfire_breadpub.po
+++ b/priv/localisation/bonfire_breadpub.po
@@ -15,11 +15,6 @@ msgstr ""
 msgid "Add a title"
 msgstr ""
 
-#: lib/web/pages/intent/intent_live.sface:18
-#, elixir-autogen, elixir-format
-msgid "Back"
-msgstr ""
-
 #: lib/web/components/intent/intent_live.sface:78
 #, elixir-autogen, elixir-format
 msgid "Bookmark"
@@ -55,12 +50,12 @@ msgstr ""
 msgid "My offers"
 msgstr ""
 
-#: lib/web/pages/intent/intent_live.sface:83
+#: lib/web/pages/intent/intent_live.sface:70
 #, elixir-autogen, elixir-format
 msgid "No"
 msgstr ""
 
-#: lib/web/pages/intent/intent_live.sface:76
+#: lib/web/pages/intent/intent_live.sface:61
 #, elixir-autogen, elixir-format
 msgid "Post a comment..."
 msgstr ""
@@ -82,25 +77,25 @@ msgid "Write an optional description"
 msgstr ""
 
 #: lib/web/components/intent/intent_live.sface:9
-#: lib/web/pages/intent/intent_live.sface:56
-#: lib/web/pages/intent/intent_live.sface:83
+#: lib/web/pages/intent/intent_live.sface:40
+#: lib/web/pages/intent/intent_live.sface:70
 #, elixir-autogen, elixir-format
 msgid "need"
 msgstr ""
 
-#: lib/web/pages/intent/intent_live.sface:83
+#: lib/web/pages/intent/intent_live.sface:70
 #, elixir-autogen, elixir-format
 msgid "needs"
 msgstr ""
 
 #: lib/web/components/intent/intent_live.sface:5
-#: lib/web/pages/intent/intent_live.sface:52
-#: lib/web/pages/intent/intent_live.sface:83
+#: lib/web/pages/intent/intent_live.sface:36
+#: lib/web/pages/intent/intent_live.sface:70
 #, elixir-autogen, elixir-format
 msgid "offer"
 msgstr ""
 
-#: lib/web/pages/intent/intent_live.sface:83
+#: lib/web/pages/intent/intent_live.sface:70
 #, elixir-autogen, elixir-format
 msgid "offers"
 msgstr ""
diff --git a/priv/localisation/bonfire_classify.po b/priv/localisation/bonfire_classify.po
index c9ab07de38..66eae2817d 100644
--- a/priv/localisation/bonfire_classify.po
+++ b/priv/localisation/bonfire_classify.po
@@ -10,14 +10,14 @@
 msgid ""
 msgstr ""
 
-#: lib/web/components/widgets/widget_subtopics/widget_subtopics_live.sface:1
+#: lib/web/pages/category/category_live.sface:65
+#: lib/web/pages/category/category_live.sface:111
 #, elixir-autogen, elixir-format
-msgid "About"
+msgid "A short topic summary"
 msgstr ""
 
-#: lib/web/components/nav/categories_nav_live.sface:33
 #: lib/web/components/nav/categories_sidebar_live.sface:12
-#: lib/web/pages/categories_list/categories_live.sface:3
+#: lib/web/components/nav/topics_nav/topics_nav_live.sface:9
 #, elixir-autogen, elixir-format
 msgid "All topics"
 msgstr ""
@@ -34,37 +34,39 @@ msgstr ""
 msgid "Archive this topic"
 msgstr ""
 
-#: lib/web/live_handler.ex:56
+#: lib/web/live_handler.ex:69
 #, elixir-autogen, elixir-format
 msgid "Category created!"
 msgstr ""
 
-#: lib/web/live_handler.ex:90
+#: lib/web/live_handler.ex:104
 #, elixir-autogen, elixir-format
 msgid "Category updated!"
 msgstr ""
 
-#: lib/web/components/taxonomy/new_category_live.sface:29
+#: lib/web/components/create/new_category_live.sface:50
+#: lib/web/components/create/new_label_live.sface:54
 #, elixir-autogen, elixir-format
 msgid "Create"
 msgstr ""
 
-#: lib/web/components/taxonomy/new_category_live.sface:14
+#: lib/web/components/create/new_category_live.sface:23
 #, elixir-autogen, elixir-format
 msgid "Create a new sub-topic"
 msgstr ""
 
-#: lib/web/components/taxonomy/new_category_live.sface:15
+#: lib/web/components/create/new_category_live.sface:24
 #, elixir-autogen, elixir-format
 msgid "Create a new top-level topic"
 msgstr ""
 
-#: lib/web/pages/category_page/category_live.ex:81
+#: lib/web/components/category_header_aside/category_header_aside_live.sface:50
 #, elixir-autogen, elixir-format
 msgid "Create a sub-topic"
 msgstr ""
 
-#: lib/web/pages/categories_list/categories_live.ex:32
+#: lib/web/pages/old/local/local_categories_live.ex:31
+#: lib/web/pages/old/remote/remote_categories_live.ex:31
 #, elixir-autogen, elixir-format
 msgid "Create a topic"
 msgstr ""
@@ -81,12 +83,22 @@ msgstr ""
 msgid "Danger zone"
 msgstr ""
 
-#: lib/web/live_handler.ex:108
+#: lib/web/components/create/new_label_live.sface:28
+#, elixir-autogen, elixir-format
+msgid "Define a label"
+msgstr ""
+
+#: lib/web/live_handler.ex:122
 #, elixir-autogen, elixir-format
 msgid "Deleted"
 msgstr ""
 
-#: lib/web/components/taxonomy/new_category_live.sface:25
+#: lib/web/components/create/new_label_live.sface:38
+#, elixir-autogen, elixir-format
+msgid "Describe the label..."
+msgstr ""
+
+#: lib/web/components/create/new_category_live.sface:34
 #, elixir-autogen, elixir-format
 msgid "Describe your category..."
 msgstr ""
@@ -101,17 +113,18 @@ msgstr ""
 msgid "Edit the topic name"
 msgstr ""
 
-#: lib/web/components/widgets/widget_subtopics/widget_subtopics_live.sface:79
+#: lib/web/pages/category/category_live.sface:42
+#: lib/web/pages/category/category_live.sface:88
+#, elixir-autogen, elixir-format
+msgid "Expand"
+msgstr ""
+
+#: lib/web/components/category_header_aside/category_header_aside_live.sface:67
 #, elixir-autogen, elixir-format
 msgid "Flag this topic"
 msgstr ""
 
-#: lib/web/pages/categories_list/categories_live.sface:4
-#, elixir-autogen, elixir-format
-msgid "Followed"
-msgstr ""
-
-#: lib/web/pages/categories_list/categories_live.ex:67
+#: lib/web/pages/categories/categories_live.ex:82
 #, elixir-autogen, elixir-format
 msgid "Followed Topics"
 msgstr ""
@@ -122,63 +135,132 @@ msgid "Followed topics"
 msgstr ""
 
 #: lib/web/components/settings/settings_live.sface:3
+#: lib/web/pages/category/category_live.sface:17
 #, elixir-autogen, elixir-format
 msgid "General"
 msgstr ""
 
+#: lib/web/pages/category/category_live.sface:40
+#, elixir-autogen, elixir-format
+msgid "Identify this topic"
+msgstr ""
+
+#: lib/web/pages/categories/categories_live.sface:3
+#, elixir-autogen, elixir-format
+msgid "Latest from topics"
+msgstr ""
+
+#: lib/web/components/nav/topics_nav/topics_nav_live.sface:14
+#, elixir-autogen, elixir-format
+msgid "Local"
+msgstr ""
+
 #: lib/web/components/nav/categories_sidebar_live.sface:25
+#: lib/web/pages/categories/categories_live.sface:25
+#: lib/web/pages/old/local/local_categories_live.ex:6
 #, elixir-autogen, elixir-format
 msgid "Local topics"
 msgstr ""
 
-#: lib/web/components/nav/categories_nav_live.sface:23
+#: lib/web/pages/categories/categories_live.ex:41
 #, elixir-autogen, elixir-format
-msgid "More"
+msgid "My coordination feed"
 msgstr ""
 
-#: lib/web/live_handler.ex:75
+#: lib/web/pages/category/category_live.sface:39
+#, elixir-autogen, elixir-format
+msgid "Name & description"
+msgstr ""
+
+#: lib/web/pages/labels/labels_live.ex:81
+#, elixir-autogen, elixir-format
+msgid "New label"
+msgstr ""
+
+#: lib/web/pages/categories/categories_live.ex:35
+#, elixir-autogen, elixir-format
+msgid "New topic"
+msgstr ""
+
+#: lib/web/pages/categories/categories_live.ex:14
+#, elixir-autogen, elixir-format
+msgid "Overview"
+msgstr ""
+
+#: lib/web/live_handler.ex:89
 #, elixir-autogen, elixir-format
 msgid "Please log in..."
 msgstr ""
 
-#: lib/web/pages/categories_list/categories_live.ex:101
+#: lib/web/pages/categories/categories_live.ex:116
+#: lib/web/pages/old/local/local_categories_live.ex:28
+#: lib/web/pages/old/remote/remote_categories_live.ex:28
 #, elixir-autogen, elixir-format
 msgid "Published in all known topics"
 msgstr ""
 
-#: lib/web/pages/categories_list/categories_live.ex:69
+#: lib/web/pages/categories/categories_live.ex:84
 #, elixir-autogen, elixir-format
 msgid "Published in followed topics"
 msgstr ""
 
+#: lib/web/pages/category/category_live.sface:21
+#, elixir-autogen, elixir-format
+msgid "Roles"
+msgstr ""
+
 #: lib/web/components/settings/settings_live.sface:36
+#: lib/web/pages/category/category_live.sface:77
+#: lib/web/pages/category/category_live.sface:123
 #, elixir-autogen, elixir-format
 msgid "Save"
 msgstr ""
 
-#: lib/web/components/widgets/widget_subtopics/widget_subtopics_live.sface:59
+#: lib/web/components/category_header_aside/category_header_aside_live.sface:32
 #, elixir-autogen, elixir-format
 msgid "Settings"
 msgstr ""
 
+#: lib/web/pages/category/category_live.sface:132
+#, elixir-autogen, elixir-format
+msgid "Show topic in Homepage"
+msgstr ""
+
 #: lib/web/components/settings/settings_live.sface:93
 #, elixir-autogen, elixir-format
 msgid "Sorry, you cannot edit this topic."
 msgstr ""
 
-#: lib/web/components/widgets/widget_subtopics/widget_subtopics_live.sface:90
+#: lib/web/components/widgets/widget_subtopics/widget_subtopics_live.sface:1
 #, elixir-autogen, elixir-format
 msgid "Sub topics"
 msgstr ""
 
-#: lib/web/pages/category_page/category_live.sface:27
+#: lib/web/components/category_header_aside/category_header_aside_live.sface:23
 #, elixir-autogen, elixir-format
-msgid "Submissions"
+msgid "Submitted"
 msgstr ""
 
-#: lib/web/components/widgets/widget_subtopics/widget_subtopics_live.sface:48
+#: lib/web/pages/category/category_live.sface:25
 #, elixir-autogen, elixir-format
-msgid "Submitted for publication"
+msgid "Suggestions"
+msgstr ""
+
+#: lib/web/components/modal/tag_modal_live.sface:30
+#, elixir-autogen, elixir-format
+msgid "Tag"
+msgstr ""
+
+#: lib/web/components/modal/tag_modal_live.sface:3
+#: lib/web/components/modal/tag_modal_live.sface:23
+#, elixir-autogen, elixir-format
+msgid "Tag with topic(s)"
+msgstr ""
+
+#: lib/web/pages/category/category_live.sface:48
+#: lib/web/pages/category/category_live.sface:94
+#, elixir-autogen, elixir-format
+msgid "The name of this topic"
 msgstr ""
 
 #: lib/web/components/settings/settings_live.sface:51
@@ -186,42 +268,73 @@ msgstr ""
 msgid "The topic will be permanently archived, so that new things can no longer be published in it. People who already follow this topic will still be able to access it."
 msgstr ""
 
+#: lib/web/pages/category/category_live.ex:83
+#, elixir-autogen, elixir-format
+msgid "Topic"
+msgstr ""
+
 #: lib/web/components/nav/categories_sidebar_live.sface:1
 #, elixir-autogen, elixir-format
 msgid "Topic navigation"
 msgstr ""
 
-#: lib/web/components/nav/categories_nav_live.sface:5
-#: lib/web/pages/categories_list/categories_live.ex:30
-#: lib/web/pages/categories_list/categories_live.ex:99
-#: lib/web/pages/categories_list/categories_live.sface:15
+#: lib/web/components/nav/categories_nav_live.sface:4
+#: lib/web/pages/categories/categories_live.ex:33
+#: lib/web/pages/categories/categories_live.ex:114
+#: lib/web/pages/old/local/local_categories_live.ex:26
+#: lib/web/pages/old/remote/remote_categories_live.ex:26
 #, elixir-autogen, elixir-format
 msgid "Topics"
 msgstr ""
 
-#: lib/web/components/taxonomy/new_category_live.sface:20
+#: lib/web/pages/category/category_live.sface:86
+#, elixir-autogen, elixir-format
+msgid "Topics order"
+msgstr ""
+
+#: lib/web/components/create/new_category_live.sface:29
 #, elixir-autogen, elixir-format
 msgid "Type the category name..."
 msgstr ""
 
+#: lib/web/components/create/new_label_live.sface:33
+#, elixir-autogen, elixir-format
+msgid "Type the label name..."
+msgstr ""
+
+#: lib/web/components/hero/category_hero_live.sface:69
+#: lib/web/components/nav/topics_nav/topics_nav_live.sface:24
 #: lib/web/components/taxonomy/subcategory_badges_live.sface:7
-#: lib/web/components/widgets/widget_subtopics/widget_subtopics_live.sface:95
-#: lib/web/pages/category_page/category_live.ex:57
+#: lib/web/components/widgets/widget_subtopics/widget_subtopics_live.sface:22
+#: lib/web/pages/categories/categories_live.sface:41
+#: lib/web/pages/category/category_live.ex:64
+#: lib/web/pages/labels/labels_live.ex:59
 #, elixir-autogen, elixir-format
 msgid "Untitled topic"
 msgstr ""
 
-#: lib/web/components/widgets/widget_subtopics/widget_subtopics_live.sface:72
+#: lib/web/components/category_header_aside/category_header_aside_live.sface:43
 #, elixir-autogen, elixir-format
 msgid "Visit the original url"
 msgstr ""
 
-#: lib/web/pages/category_page/category_live.ex:76
+#: lib/web/pages/categories/categories_live.ex:47
+#, elixir-autogen, elixir-format
+msgid "You can start by following some people, or writing adding some tasks yourself."
+msgstr ""
+
+#: lib/web/pages/categories/categories_live.ex:45
+#, elixir-autogen, elixir-format
+msgid "Your feed is empty"
+msgstr ""
+
+#: lib/web/pages/category/category_live.ex:84
+#: lib/web/pages/labels/labels_live.ex:86
 #, elixir-autogen, elixir-format
 msgid "follow"
 msgstr ""
 
-#: lib/web/components/topic/topic_live.sface:10
+#: lib/web/pages/category/category_live.sface:11
 #, elixir-autogen, elixir-format
-msgid "in "
+msgid "settings"
 msgstr ""
diff --git a/priv/localisation/bonfire_fail.po b/priv/localisation/bonfire_fail.po
new file mode 100644
index 0000000000..9ed76335f4
--- /dev/null
+++ b/priv/localisation/bonfire_fail.po
@@ -0,0 +1,97 @@
+## This file is a PO Template file.
+##
+## "msgid"s here are often extracted from source code.
+## Add new translations manually only if they're dynamic
+## translations that can't be statically extracted.
+##
+## Run "mix gettext.extract" to bring this file up to
+## date. Leave "msgstr"s empty as changing them here has no
+## effect: edit them in PO (.po) files instead.
+msgid ""
+msgstr ""
+
+#: lib/runtime_config.ex:20
+#, elixir-autogen, elixir-format
+msgid "%s Not Found."
+msgstr ""
+
+#: lib/runtime_config.ex:25
+#, elixir-autogen, elixir-format
+msgid "Bad request: malformed header."
+msgstr ""
+
+#: lib/runtime_config.ex:24
+#, elixir-autogen, elixir-format
+msgid "Could not delete:"
+msgstr ""
+
+#: lib/runtime_config.ex:36
+#, elixir-autogen, elixir-format
+msgid "Invalid arguments passed."
+msgstr ""
+
+#: lib/runtime_config.ex:34
+#, elixir-autogen, elixir-format
+msgid "Please confirm your email address first."
+msgstr ""
+
+#: lib/runtime_config.ex:37
+#, elixir-autogen, elixir-format
+msgid "Reset your password to login."
+msgstr ""
+
+#: lib/runtime_config.ex:39
+#, elixir-autogen, elixir-format
+msgid "Something went wrong."
+msgstr ""
+
+#: lib/runtime_config.ex:27
+#, elixir-autogen, elixir-format
+msgid "This link or token has expired, please request a fresh one."
+msgstr ""
+
+#: lib/runtime_config.ex:30
+#, elixir-autogen, elixir-format
+msgid "This link or token was already used, please request a fresh one if necessary."
+msgstr ""
+
+#: lib/runtime_config.ex:26
+#, elixir-autogen, elixir-format
+msgid "This site is by invitation only."
+msgstr ""
+
+#: lib/runtime_config.ex:31
+#, elixir-autogen, elixir-format
+msgid "This token was not found, please request a fresh one."
+msgstr ""
+
+#: lib/runtime_config.ex:33
+#, elixir-autogen, elixir-format
+msgid "This user account is disabled. Please contact the instance administrator."
+msgstr ""
+
+#: lib/runtime_config.ex:35
+#, elixir-autogen, elixir-format
+msgid "Unknown resource."
+msgstr ""
+
+#: lib/runtime_config.ex:38
+#, elixir-autogen, elixir-format
+msgid "User not found."
+msgstr ""
+
+#: lib/runtime_config.ex:23
+#, elixir-autogen, elixir-format
+msgid "We couldn't find an account with the details you provided."
+msgstr ""
+
+#: lib/runtime_config.ex:18
+#: lib/runtime_config.ex:19
+#, elixir-autogen, elixir-format
+msgid "You do not have permission to %s."
+msgstr ""
+
+#: lib/runtime_config.ex:21
+#, elixir-autogen, elixir-format
+msgid "You need to log in first."
+msgstr ""
diff --git a/priv/localisation/bonfire_federate_activitypub.po b/priv/localisation/bonfire_federate_activitypub.po
index 99391ddfd2..357b786373 100644
--- a/priv/localisation/bonfire_federate_activitypub.po
+++ b/priv/localisation/bonfire_federate_activitypub.po
@@ -10,12 +10,12 @@
 msgid ""
 msgstr ""
 
-#: lib/utils.ex:367
+#: lib/adapter/adapter_utils.ex:410
 #, elixir-autogen, elixir-format
 msgid "Location"
 msgstr ""
 
-#: lib/utils.ex:676
+#: lib/adapter/adapter_utils.ex:715
 #, elixir-autogen, elixir-format
 msgid "Website"
 msgstr ""
diff --git a/priv/localisation/bonfire_invite_links.po b/priv/localisation/bonfire_invite_links.po
index 93f96d1ddc..4e54169e0e 100644
--- a/priv/localisation/bonfire_invite_links.po
+++ b/priv/localisation/bonfire_invite_links.po
@@ -10,83 +10,78 @@
 msgid ""
 msgstr ""
 
-#: lib/web/invites_live.sface:44
+#: lib/web/invites_live.sface:47
 #, elixir-autogen, elixir-format
 msgid "1 day"
 msgstr ""
 
-#: lib/web/invites_live.sface:48
+#: lib/web/invites_live.sface:51
 #, elixir-autogen, elixir-format
 msgid "1 month"
 msgstr ""
 
-#: lib/web/invites_live.sface:46
+#: lib/web/invites_live.sface:49
 #, elixir-autogen, elixir-format
 msgid "1 week"
 msgstr ""
 
-#: lib/web/invites_live.sface:50
+#: lib/web/invites_live.sface:53
 #, elixir-autogen, elixir-format
 msgid "1 year"
 msgstr ""
 
-#: lib/web/invites_live.sface:45
+#: lib/web/invites_live.sface:48
 #, elixir-autogen, elixir-format
 msgid "2 days"
 msgstr ""
 
-#: lib/web/invites_live.sface:47
+#: lib/web/invites_live.sface:50
 #, elixir-autogen, elixir-format
 msgid "2 weeks"
 msgstr ""
 
-#: lib/web/invites_live.sface:49
+#: lib/web/invites_live.sface:52
 #, elixir-autogen, elixir-format
 msgid "6 months"
 msgstr ""
 
-#: lib/web/invites_live.sface:66
+#: lib/web/invites_live.sface:69
 #, elixir-autogen, elixir-format
 msgid "Existing invites"
 msgstr ""
 
-#: lib/web/invites_live.sface:38
+#: lib/web/invites_live.sface:41
 #, elixir-autogen, elixir-format
 msgid "Expire after"
 msgstr ""
 
-#: lib/web/invites_live.sface:74
+#: lib/web/invites_live.sface:77
 #, elixir-autogen, elixir-format
 msgid "Expires"
 msgstr ""
 
-#: lib/web/invites_live.sface:9
-#: lib/web/invites_live.sface:59
+#: lib/web/invites_live.sface:7
+#: lib/web/invites_live.sface:62
 #, elixir-autogen, elixir-format
 msgid "Generate a new invite link"
 msgstr ""
 
-#: lib/web/invites_live.sface:10
-#, elixir-autogen, elixir-format
-msgid "Generate and share an invite link with others to grant access to this instance"
-msgstr ""
-
-#: lib/web/invites_live.sface:72
+#: lib/web/invites_live.sface:75
 #, elixir-autogen, elixir-format
 msgid "Link"
 msgstr ""
 
-#: lib/web/invites_live.sface:15
+#: lib/web/invites_live.sface:18
 #, elixir-autogen, elixir-format
 msgid "Max number of uses"
 msgstr ""
 
-#: lib/web/invites_live.sface:43
+#: lib/web/invites_live.sface:46
 #, elixir-autogen, elixir-format
 msgid "Never"
 msgstr ""
 
-#: lib/web/invites_live.sface:20
+#: lib/web/invites_live.sface:23
 #, elixir-autogen, elixir-format
 msgid "No limits"
 msgstr ""
@@ -96,22 +91,22 @@ msgstr ""
 msgid "Sorry, this invite is no longer valid."
 msgstr ""
 
-#: lib/web/invites_live.sface:73
+#: lib/web/invites_live.sface:76
 #, elixir-autogen, elixir-format
 msgid "Uses left"
 msgstr ""
 
-#: lib/web/invites_live.sface:119
+#: lib/web/invites_live.sface:122
 #, elixir-autogen, elixir-format
 msgid "You cannot invite others, sorry!"
 msgstr ""
 
-#: lib/web/invites_live.sface:97
+#: lib/web/invites_live.sface:100
 #, elixir-autogen, elixir-format
 msgid "expired"
 msgstr ""
 
-#: lib/web/invites_live.sface:98
+#: lib/web/invites_live.sface:101
 #, elixir-autogen, elixir-format
 msgid "never"
 msgstr ""
diff --git a/priv/localisation/bonfire_me.po b/priv/localisation/bonfire_me.po
index c8c31ad76a..1fbd552225 100644
--- a/priv/localisation/bonfire_me.po
+++ b/priv/localisation/bonfire_me.po
@@ -15,12 +15,33 @@ msgstr ""
 msgid "Confirm your email"
 msgstr ""
 
-#: lib/users/shared_users.ex:75
+#: lib/users/shared_users.ex:77
+#: lib/users/shared_users.ex:77
 #, elixir-autogen, elixir-format
 msgid "Could not find an existing account on this instance with that email or username."
 msgstr ""
 
-#: lib/settings/settings.ex:282
+#: lib/mails/mails.ex:70
+#, elixir-autogen, elixir-format
+msgid "No confirmation token"
+msgstr ""
+
+#: lib/settings/settings.ex:280
+#, elixir-autogen, elixir-format
+msgid "Please contact an admin."
+msgstr ""
+
+#: lib/mails/mails.ex:67
+#, elixir-autogen, elixir-format
+msgid "Reset your password"
+msgstr ""
+
+#: lib/settings/settings.ex:310
 #, elixir-autogen, elixir-format
 msgid "You need to be authenticated to change settings."
 msgstr ""
+
+#: lib/settings/settings.ex:280
+#, elixir-autogen, elixir-format
+msgid "change instance settings."
+msgstr ""
diff --git a/priv/localisation/bonfire_pages.po b/priv/localisation/bonfire_pages.po
new file mode 100644
index 0000000000..ce1bd43dc8
--- /dev/null
+++ b/priv/localisation/bonfire_pages.po
@@ -0,0 +1,218 @@
+## This file is a PO Template file.
+##
+## "msgid"s here are often extracted from source code.
+## Add new translations manually only if they're dynamic
+## translations that can't be statically extracted.
+##
+## Run "mix gettext.extract" to bring this file up to
+## date. Leave "msgstr"s empty as changing them here has no
+## effect: edit them in PO (.po) files instead.
+msgid ""
+msgstr ""
+
+#: lib/web/views/edit_post_live.sface:32
+#, elixir-autogen, elixir-format
+msgid "Add a feature image"
+msgstr ""
+
+#: lib/web/views/edit_page_live.ex:25
+#: lib/web/views/page_editable_live.ex:24
+#, elixir-autogen, elixir-format
+msgid "Add a section"
+msgstr ""
+
+#: lib/web/components/smart_inputs/edit_section_live.sface:4
+#, elixir-autogen, elixir-format
+msgid "Add an existing section"
+msgstr ""
+
+#: lib/web/pages_live_handler.ex:148
+#, elixir-autogen, elixir-format
+msgid "Added!"
+msgstr ""
+
+#: lib/web/views/blog_post_live.sface:12
+#, elixir-autogen, elixir-format
+msgid "Blog post"
+msgstr ""
+
+#: lib/web/views/edit_page_live.ex:48
+#, elixir-autogen, elixir-format
+msgid "Could not find the section to edit"
+msgstr ""
+
+#: lib/web/components/smart_inputs/create_page_live.sface:87
+#, elixir-autogen, elixir-format
+msgid "Create"
+msgstr ""
+
+#: lib/web/views/pages_live.ex:29
+#, elixir-autogen, elixir-format
+msgid "Create a page"
+msgstr ""
+
+#: lib/web/pages_live_handler.ex:55
+#, elixir-autogen, elixir-format
+msgid "Created!"
+msgstr ""
+
+#: lib/web/views/page_editable_live.sface:11
+#, elixir-autogen, elixir-format
+msgid "Delete this section"
+msgstr ""
+
+#: lib/web/components/smart_inputs/create_page_live.sface:41
+#: lib/web/components/smart_inputs/edit_section_live.sface:58
+#, elixir-autogen, elixir-format
+msgid "Description"
+msgstr ""
+
+#: lib/web/components/page_edit_preview_live.sface:29
+#: lib/web/components/smart_inputs/edit_section_live.sface:98
+#, elixir-autogen, elixir-format
+msgid "Edit"
+msgstr ""
+
+#: lib/web/views/edit_page_live.ex:23
+#: lib/web/views/edit_page_live.ex:71
+#: lib/web/views/page_editable_live.ex:22
+#: lib/web/views/page_editable_live.ex:42
+#, elixir-autogen, elixir-format
+msgid "Edit Page"
+msgstr ""
+
+#: lib/web/views/edit_post_live.ex:24
+#, elixir-autogen, elixir-format
+msgid "Edit Post"
+msgstr ""
+
+#: lib/web/views/edit_page_live.ex:38
+#, elixir-autogen, elixir-format
+msgid "Edit section"
+msgstr ""
+
+#: lib/web/views/page_editable_live.sface:17
+#, elixir-autogen, elixir-format
+msgid "Edit this section"
+msgstr ""
+
+#: lib/web/components/smart_inputs/edit_section_live.sface:49
+#, elixir-autogen, elixir-format
+msgid "Enter a name for a new section"
+msgstr ""
+
+#: lib/web/components/smart_inputs/create_page_live.sface:50
+#, elixir-autogen, elixir-format
+msgid "Enter a plain text summary for the page (useful for showing in page lists, and for search engines)..."
+msgstr ""
+
+#: lib/web/components/smart_inputs/create_page_live.sface:32
+#, elixir-autogen, elixir-format
+msgid "Enter a title"
+msgstr ""
+
+#: lib/web/components/smart_inputs/edit_section_live.sface:64
+#, elixir-autogen, elixir-format
+msgid "Enter the markdown, liquid, and/or HTML for the new section..."
+msgstr ""
+
+#: lib/web/views/edit_post_live.sface:13
+#, elixir-autogen, elixir-format
+msgid "New post"
+msgstr ""
+
+#: lib/web/views/page_live.ex:28
+#, elixir-autogen, elixir-format
+msgid "Page"
+msgstr ""
+
+#: lib/web/views/edit_page_live.sface:51
+#, elixir-autogen, elixir-format
+msgid "Page URL"
+msgstr ""
+
+#: lib/web/views/edit_page_live.sface:40
+#: lib/web/views/edit_page_live.sface:42
+#, elixir-autogen, elixir-format
+msgid "Page settings"
+msgstr ""
+
+#: lib/web/views/pages_live.ex:27
+#: lib/web/views/pages_live.sface:7
+#, elixir-autogen, elixir-format
+msgid "Pages"
+msgstr ""
+
+#: lib/web/views/edit_page_live.sface:88
+#, elixir-autogen, elixir-format
+msgid "Pin (show in navigation)"
+msgstr ""
+
+#: lib/web/views/blog_post_live.ex:25
+#, elixir-autogen, elixir-format
+msgid "Post"
+msgstr ""
+
+#: lib/web/views/edit_post_live.sface:73
+#, elixir-autogen, elixir-format
+msgid "Post URL"
+msgstr ""
+
+#: lib/web/views/edit_post_live.sface:62
+#: lib/web/views/edit_post_live.sface:64
+#, elixir-autogen, elixir-format
+msgid "Post settings"
+msgstr ""
+
+#: lib/web/views/edit_post_live.sface:11
+#, elixir-autogen, elixir-format
+msgid "Posts"
+msgstr ""
+
+#: lib/web/views/edit_post_live.sface:16
+#, elixir-autogen, elixir-format
+msgid "Publish"
+msgstr ""
+
+#: lib/web/pages_live_handler.ex:166
+#, elixir-autogen, elixir-format
+msgid "Removed!"
+msgstr ""
+
+#: lib/web/pages_live_handler.ex:117
+#, elixir-autogen, elixir-format
+msgid "Section saved!"
+msgstr ""
+
+#: lib/web/views/pages_live.sface:7
+#, elixir-autogen, elixir-format
+msgid "Site Navigation"
+msgstr ""
+
+#: lib/web/views/edit_post_live.sface:89
+#, elixir-autogen, elixir-format
+msgid "Tags"
+msgstr ""
+
+#: lib/web/components/smart_inputs/create_page_live.sface:28
+#: lib/web/components/smart_inputs/edit_section_live.sface:44
+#, elixir-autogen, elixir-format
+msgid "Title"
+msgstr ""
+
+#: lib/web/components/page_edit_preview_live.sface:22
+#: lib/web/views/edit_page_live.sface:56
+#: lib/web/views/edit_post_live.sface:73
+#, elixir-autogen, elixir-format
+msgid "View"
+msgstr ""
+
+#: lib/web/components/page_edit_preview_live.sface:6
+#, elixir-autogen, elixir-format
+msgid "by"
+msgstr ""
+
+#: lib/web/views/edit_page_live.sface:123
+#, elixir-autogen, elixir-format
+msgid "page"
+msgstr ""
diff --git a/priv/localisation/bonfire_search.po b/priv/localisation/bonfire_search.po
index c5de7f805d..d53c777aec 100644
--- a/priv/localisation/bonfire_search.po
+++ b/priv/localisation/bonfire_search.po
@@ -25,12 +25,17 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#: lib/web/results_live.sface:30
+#, elixir-autogen, elixir-format
+msgid "Nothing relevant was found"
+msgstr ""
+
 #: lib/web/widgets/filters_search_live.sface:42
 #, elixir-autogen, elixir-format
 msgid "Posts"
 msgstr ""
 
-#: lib/web/search_live.sface:7
+#: lib/web/search_live.sface:9
 #, elixir-autogen, elixir-format
 msgid "Results for"
 msgstr ""
@@ -55,11 +60,6 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: lib/web/results_live.sface:30
-#, elixir-autogen, elixir-format
-msgid "We didn't found anything relevant"
-msgstr ""
-
 #: lib/web/form_live.sface:33
 #, elixir-autogen, elixir-format
 msgid "total results"
diff --git a/priv/localisation/bonfire_social.po b/priv/localisation/bonfire_social.po
index b6387ed068..2f7a480e28 100644
--- a/priv/localisation/bonfire_social.po
+++ b/priv/localisation/bonfire_social.po
@@ -10,139 +10,10 @@
 msgid ""
 msgstr ""
 
-#: lib/localise.ex:10
+#: lib/follows.ex:232
+#: lib/follows.ex:232
 #, elixir-autogen, elixir-format
-msgid "Boost"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Boosted"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Boosted by %{user}"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Create"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Created"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Created by %{user}"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Delete"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Deleted"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Deleted by %{user}"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Edit"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Edited"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Edited by %{user}"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Flag"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Flagged"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Flagged by %{user}"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Follow"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Followed"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Followed by %{user}"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Like"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Liked"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Liked by %{user}"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Mention"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Mentioned"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Mentioned by %{user}"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Message"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Messaged"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Messaged by %{user}"
+msgid "An error occurred while accepting the follow request"
 msgstr ""
 
 #: lib/objects.ex:277
@@ -150,225 +21,26 @@ msgstr ""
 msgid "No permission to delete this"
 msgstr ""
 
-#: lib/localise.ex:10
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Read"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Read by %{user}"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Replied"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Replied by %{user}"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Reply"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Request"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Request to Boost"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Request to Create"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Request to Delete"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Request to Edit"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Request to Flag"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Request to Follow"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Request to Like"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Request to Mention"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Request to Message"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Request to Read"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Request to Reply"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Request to Request"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Request to See"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Request to Tag"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Requested"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Requested by %{user}"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Requested to Boost"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Requested to Create"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Requested to Delete"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Requested to Edit"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Requested to Flag"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Requested to Follow"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Requested to Like"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Requested to Mention"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Requested to Message"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Requested to Read"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Requested to Reply"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Requested to Request"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Requested to See"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Requested to Tag"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Saw"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Saw by %{user}"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "See"
-msgstr ""
-
-#: lib/boosts.ex:46
-#: lib/boosts.ex:60
+#: lib/boosts.ex:47
+#: lib/boosts.ex:61
 #, elixir-autogen, elixir-format
 msgid "Sorry, you cannot boost this"
 msgstr ""
 
-#: lib/likes.ex:48
-#: lib/likes.ex:62
+#: lib/pins.ex:68
+#: lib/pins.ex:82
+#, elixir-autogen, elixir-format
+msgid "Sorry, you cannot pin this"
+msgstr ""
+
+#: lib/pins.ex:60
+#: lib/pins.ex:120
+#, elixir-autogen, elixir-format
+msgid "Sorry, you cannot pin to the instance"
+msgstr ""
+
+#: lib/likes.ex:49
+#: lib/likes.ex:63
 #, elixir-autogen, elixir-format
 msgid "Sorry, you cannot react to this"
 msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Tag"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Tagged"
-msgstr ""
-
-#: lib/localise.ex:10
-#, elixir-autogen, elixir-format
-msgid "Tagged by %{user}"
-msgstr ""
diff --git a/priv/localisation/bonfire_tag.po b/priv/localisation/bonfire_tag.po
index 2fa50f0e2c..cb105cf7e3 100644
--- a/priv/localisation/bonfire_tag.po
+++ b/priv/localisation/bonfire_tag.po
@@ -14,3 +14,19 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "404"
 msgstr ""
+
+#: lib/web/components/widget_tags/widget_tags_live.sface:68
+#, elixir-autogen, elixir-format
+msgid "No trending tags found"
+msgstr ""
+
+#: lib/web/components/widget_tags/widget_tags_live.sface:3
+#, elixir-autogen, elixir-format
+msgid "Trending topics"
+msgstr ""
+
+#: lib/web/components/widget_tags/widget_tags_live.sface:35
+#: lib/web/components/widget_tags/widget_tags_live.sface:54
+#, elixir-autogen, elixir-format
+msgid "activities"
+msgstr ""
diff --git a/priv/localisation/bonfire_ui_common.po b/priv/localisation/bonfire_ui_common.po
index af997f4d1f..380ac6fdcc 100644
--- a/priv/localisation/bonfire_ui_common.po
+++ b/priv/localisation/bonfire_ui_common.po
@@ -10,7 +10,17 @@
 msgid ""
 msgstr ""
 
-#: lib/components/smart_input/input_controls_live.sface:21
+#: lib/components/settings/sidebar/sidebar_settings_nav_live.sface:58
+#, elixir-autogen, elixir-format
+msgid "Account Settings"
+msgstr ""
+
+#: lib/components/extensions/extensions_live.sface:25
+#, elixir-autogen, elixir-format
+msgid "Active Apps"
+msgstr ""
+
+#: lib/components/smart_input/input_controls_live.sface:22
 #, elixir-autogen, elixir-format
 msgid "Add a content warning"
 msgstr ""
@@ -25,32 +35,43 @@ msgstr ""
 msgid "Add description"
 msgstr ""
 
-#: lib/components/multiselect/multiselect_live.ex:50
+#: lib/components/settings/sidebar/sidebar_instance_settings_live.sface:169
+#: lib/components/settings/sidebar/sidebar_settings_nav_live.sface:205
+#, elixir-autogen, elixir-format
+msgid "Advanced"
+msgstr ""
+
+#: lib/components/multiselect/multiselect_live.ex:55
 #, elixir-autogen, elixir-format
 msgid "Already selected"
 msgstr ""
 
+#: lib/error/error_view.ex:9
+#, elixir-autogen, elixir-format
+msgid "Attempted to update out-of-date data"
+msgstr ""
+
 #: lib/components/images/avatar_live.sface:10
 #: lib/components/images/avatar_live.sface:27
 #, elixir-autogen, elixir-format
 msgid "Avatar"
 msgstr ""
 
-#: lib/components/extensions/extensions_live.sface:106
+#: lib/components/extensions/extensions_live.sface:95
 #, elixir-autogen, elixir-format
-msgid "Bonfire Ecosystem Libraries"
+msgid "Bonfire Ecosystem libraries"
 msgstr ""
 
-#: lib/components/extensions/extensions_live.sface:49
-#, elixir-autogen, elixir-format
-msgid "Bonfire Extensions"
-msgstr ""
-
-#: lib/components/extensions/extensions_live.sface:20
+#: lib/components/extensions/extensions_live.sface:32
 #, elixir-autogen, elixir-format
 msgid "Bonfire UI extensions"
 msgstr ""
 
+#: lib/components/extensions/extensions_live.sface:55
+#, elixir-autogen, elixir-format
+msgid "Bonfire extensions"
+msgstr ""
+
 #: lib/components/extensions/extensions_live.sface:78
 #, elixir-autogen, elixir-format
 msgid "Bonfire schemas"
@@ -71,7 +92,12 @@ msgstr ""
 msgid "Boosted"
 msgstr ""
 
-#: lib/components/smart_input/input_controls_live.sface:31
+#: lib/components/settings/sidebar/sidebar_instance_settings_live.sface:104
+#, elixir-autogen, elixir-format
+msgid "Boundaries"
+msgstr ""
+
+#: lib/components/smart_input/input_controls_live.sface:32
 #, elixir-autogen, elixir-format
 msgid "CW"
 msgstr ""
@@ -81,7 +107,13 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: lib/components/settings/change_theme_live.sface:13
+#: lib/components/settings/change_themes_live.sface:19
+#, elixir-autogen, elixir-format
+msgid "Change theme"
+msgstr ""
+
+#: lib/components/settings/change_theme_live.sface:18
+#: lib/components/settings/change_theme_live.sface:18
 #, elixir-autogen, elixir-format
 msgid "Choose theme"
 msgstr ""
@@ -95,36 +127,21 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
-#: lib/components/nav/user_dropdown/mobile_user_menu_live.sface:49
-#, elixir-autogen, elixir-format
-msgid "Close menu"
-msgstr ""
-
-#: lib/components/modals/preview_content_live.sface:22
-#, elixir-autogen, elixir-format
-msgid "Close preview"
-msgstr ""
-
 #: lib/components/widgets/widget_links/widget_links_live.sface:9
 #, elixir-autogen, elixir-format
 msgid "Code of Conduct"
 msgstr ""
 
-#: lib/components/nav/user_dropdown/user_menu_links_live.sface:40
-#, elixir-autogen, elixir-format
-msgid "Code of conduct"
-msgstr ""
-
-#: lib/components/smart_input/button/smart_input_button_live.sface:11
-#: lib/components/smart_input/button/smart_input_button_live.sface:16
-#: lib/components/smart_input/button/smart_input_button_live.sface:31
+#: lib/components/smart_input/button/smart_input_button_live.sface:5
+#: lib/components/smart_input/button/smart_input_button_live.sface:10
+#: lib/components/smart_input/button/smart_input_buttons_live.sface:20
 #, elixir-autogen, elixir-format
 msgid "Compose"
 msgstr ""
 
-#: lib/components/smart_input/button/smart_input_button_live.sface:26
+#: lib/components/settings/smart_input_settings_live.sface:7
 #, elixir-autogen, elixir-format
-msgid "Compose a post"
+msgid "Composer preferences"
 msgstr ""
 
 #: lib/components/smart_input/button/choose_input_type_button_live.sface:35
@@ -132,14 +149,20 @@ msgstr ""
 msgid "Create"
 msgstr ""
 
-#: lib/components/nav/header/logged_header/logged_header_live.sface:53
-#: lib/components/nav/header/logged_header/logged_header_live.sface:66
-#: lib/components/widgets/widget_live.sface:18
+#: lib/components/nav/header/logged_header_live.sface:97
+#: lib/components/nav/header/logged_header_live.sface:113
+#: lib/components/widgets/widget_live.sface:16
 #, elixir-autogen, elixir-format
 msgid "Current Page:"
 msgstr ""
 
-#: lib/components/settings/avatars_settings_live.sface:1
+#: lib/components/settings/sidebar/sidebar_instance_settings_live.sface:6
+#: lib/components/settings/sidebar/sidebar_settings_nav_live.sface:14
+#, elixir-autogen, elixir-format
+msgid "Dashboard"
+msgstr ""
+
+#: lib/components/settings/avatars_settings_live.sface:4
 #, elixir-autogen, elixir-format
 msgid "Default avatars"
 msgstr ""
@@ -149,75 +172,116 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: lib/components/extensions/extension_toggle_live.sface:37
+#: lib/components/settings/sidebar/sidebar_instance_settings_live.sface:34
+#, elixir-autogen, elixir-format
+msgid "Design"
+msgstr ""
+
+#: lib/components/extensions/extension_toggle_live.sface:39
 #, elixir-autogen, elixir-format
 msgid "Disable for everyone"
 msgstr ""
 
-#: lib/components/extensions/extension_toggle_live.sface:18
+#: lib/components/extensions/extension_toggle_live.sface:20
 #, elixir-autogen, elixir-format
 msgid "Disable for me"
 msgstr ""
 
-#: lib/components/extensions/extension_toggle_live.sface:29
+#: lib/components/extensions/extension_toggle_live.sface:31
 #, elixir-autogen, elixir-format
 msgid "Enable by default"
 msgstr ""
 
-#: lib/components/extensions/extension_toggle_live.sface:11
+#: lib/components/extensions/extension_toggle_live.sface:13
 #, elixir-autogen, elixir-format
 msgid "Enable for me"
 msgstr ""
 
-#: lib/ui_common.ex:190
+#: lib/ui_common.ex:198
 #, elixir-autogen, elixir-format
 msgid "Error"
 msgstr ""
 
-#: lib/components/nav/nav_sidebar/nav_sidebar_live.sface:1
+#: lib/components/settings/smart_input_settings_live.sface:9
+#, elixir-autogen, elixir-format
+msgid "Expand"
+msgstr ""
+
+#: lib/components/settings/sidebar/sidebar_settings_nav_live.sface:159
+#, elixir-autogen, elixir-format
+msgid "Extension Settings"
+msgstr ""
+
+#: lib/components/nav/nav_sidebar/nav_sidebar_live.sface:6
 #, elixir-autogen, elixir-format
 msgid "Extension navigation"
 msgstr ""
 
-#: lib/components/actions/like/like_with_label/like_action_live.sface:1
+#: lib/components/extensions/extensions_live.sface:4
+#: lib/components/settings/sidebar/sidebar_instance_settings_live.sface:183
+#: lib/components/widgets/widget_apps/widget_apps_live.sface:2
 #, elixir-autogen, elixir-format
-msgid "Favourite this post"
+msgid "Extensions"
 msgstr ""
 
-#: lib/components/nav/apps/apps_live.sface:127
+#: lib/components/nav/nav_sidebar/nav_sidebar_live.sface:34
 #, elixir-autogen, elixir-format
-msgid "Feeds"
+msgid "Favourite milestones"
 msgstr ""
 
-#: lib/components/actions/flag/flag_action_live.sface:27
+#: lib/components/actions/like/like_action_live.sface:1
+#, elixir-autogen, elixir-format
+msgid "Favourite this"
+msgstr ""
+
+#: lib/components/nav/nav_sidebar/default_nav_live.sface:35
+#, elixir-autogen, elixir-format
+msgid "Favourites"
+msgstr ""
+
+#: lib/components/actions/flag/flag_action_live.sface:16
+#: lib/components/actions/flag/flag_action_live.sface:25
 #, elixir-autogen, elixir-format
 msgid "Flag"
 msgstr ""
 
-#: lib/components/actions/flag/flag_action_live.sface:9
-#: lib/components/actions/flag/flag_action_live.sface:18
+#: lib/components/actions/flag/flag_action_live.sface:8
 #, elixir-autogen, elixir-format
 msgid "Flag this object"
 msgstr ""
 
-#: lib/components/settings/smart_input_settings_live.sface:77
+#: lib/components/settings/sidebar/sidebar_instance_settings_live.sface:135
+#: lib/components/settings/sidebar/sidebar_settings_nav_live.sface:131
+#, elixir-autogen, elixir-format
+msgid "Flagged"
+msgstr ""
+
+#: lib/components/settings/smart_input_settings_live.sface:48
 #, elixir-autogen, elixir-format
 msgid "Floating at the bottom"
 msgstr ""
 
-#: lib/components/actions/follow/follow_button_live.sface:13
+#: lib/components/actions/flag/follow/follow_button_live.sface:13
 #, elixir-autogen, elixir-format
 msgid "Follow"
 msgstr ""
 
-#: lib/components/nav/user_dropdown/mobile_user_menu_live.sface:80
+#: lib/components/settings/sidebar/sidebar_settings_nav_live.sface:22
 #, elixir-autogen, elixir-format
-msgid "Followers"
+msgid "General"
 msgstr ""
 
-#: lib/components/nav/user_dropdown/mobile_user_menu_live.sface:85
+#: lib/components/settings/sidebar/sidebar_instance_settings_live.sface:148
+#: lib/components/settings/sidebar/sidebar_settings_nav_live.sface:141
 #, elixir-autogen, elixir-format
-msgid "Following"
+msgid "Ghosted"
+msgstr ""
+
+#: lib/components/modals/preview_content_live.sface:32
+#: lib/components/nav/back_button_live.sface:6
+#: lib/components/nav/back_button_live.sface:15
+#, elixir-autogen, elixir-format
+msgid "Go back to the previous page"
 msgstr ""
 
 #: lib/components/widgets/widget_feedbacks/widget_feedback_live.sface:2
@@ -230,28 +294,27 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: lib/components/nav/user_dropdown/mobile_user_menu_live.sface:143
-#: lib/components/nav/user_dropdown/user_menu_links_live.sface:32
+#: lib/components/settings/sidebar/sidebar_settings_nav_live.sface:226
 #, elixir-autogen, elixir-format
-msgid "Homepage"
+msgid "Instance Settings"
 msgstr ""
 
-#: lib/components/nav/user_dropdown/user_menu_links_live.sface:28
+#: lib/components/settings/sidebar/sidebar_instance_settings_live.sface:116
 #, elixir-autogen, elixir-format
-msgid "Instance"
+msgid "Invites"
 msgstr ""
 
-#: lib/components/settings/smart_input_settings_live.sface:61
+#: lib/components/settings/smart_input_settings_live.sface:32
 #, elixir-autogen, elixir-format
 msgid "It keeps you focused on the post."
 msgstr ""
 
-#: lib/components/actions/like/like_with_label/like_action_live.sface:19
+#: lib/components/actions/like/like_action_live.sface:19
 #, elixir-autogen, elixir-format
 msgid "Like"
 msgstr ""
 
-#: lib/components/actions/like/like_with_label/like_action_live.sface:23
+#: lib/components/actions/like/like_action_live.sface:23
 #, elixir-autogen, elixir-format
 msgid "Liked"
 msgstr ""
@@ -267,31 +330,40 @@ msgstr ""
 msgid "Load more"
 msgstr ""
 
-#: lib/components/nav/header/guest_header/guest_header_live.sface:11
+#: lib/components/nav/nav_sidebar/default_nav_live.sface:17
+#, elixir-autogen, elixir-format
+msgid "Local"
+msgstr ""
+
+#: lib/components/nav/header/guest_header_live.sface:13
 #, elixir-autogen, elixir-format
 msgid "Log in"
 msgstr ""
 
-#: lib/components/nav/header/header_mobile_guest_live.sface:14
-#, elixir-autogen, elixir-format
-msgid "Login"
-msgstr ""
-
-#: lib/components/nav/user_dropdown/mobile_user_menu_live.sface:149
-#: lib/components/nav/user_dropdown/user_menu_links_live.sface:22
+#: lib/components/nav/user_dropdown/user_menu_links_live.sface:41
 #, elixir-autogen, elixir-format
 msgid "Logout"
 msgstr ""
 
+#: lib/components/settings/sidebar/sidebar_settings_nav_live.sface:219
+#, elixir-autogen, elixir-format
+msgid "Manage Extensions"
+msgstr ""
+
 #: lib/components/smart_input/headers/smart_input_header_modal_live.sface:27
 #, elixir-autogen, elixir-format
 msgid "Maximise"
 msgstr ""
 
-#: lib/components/nav/nav_footer_mobile/nav_footer_mobile_user_live.sface:43
-#: lib/components/nav/user_dropdown/mobile_user_menu_live.sface:116
+#: lib/components/nav/user_dropdown/user_menu_live.sface:16
 #, elixir-autogen, elixir-format
-msgid "Messages"
+msgid "Me"
+msgstr ""
+
+#: lib/components/settings/sidebar/sidebar_instance_settings_live.sface:63
+#: lib/components/settings/sidebar/sidebar_instance_settings_live.sface:81
+#, elixir-autogen, elixir-format
+msgid "Members"
 msgstr ""
 
 #: lib/components/smart_input/headers/smart_input_header_modal_live.sface:23
@@ -299,15 +371,20 @@ msgstr ""
 msgid "Minimize"
 msgstr ""
 
-#: lib/components/nav/user_dropdown/mobile_user_menu_live.sface:125
+#: lib/components/settings/sidebar/sidebar_instance_settings_live.sface:125
+#: lib/components/settings/sidebar/sidebar_settings_nav_live.sface:117
 #, elixir-autogen, elixir-format
-msgid "My Favourites"
+msgid "Moderation"
 msgstr ""
 
-#: lib/components/nav/user_dropdown/mobile_user_menu_live.sface:98
-#: lib/components/nav/user_dropdown/user_menu_links_live.sface:7
+#: lib/components/nav/nav_sidebar/default_nav_live.sface:8
 #, elixir-autogen, elixir-format
-msgid "My profile"
+msgid "My feed"
+msgstr ""
+
+#: lib/components/settings/sidebar/sidebar_instance_settings_live.sface:47
+#, elixir-autogen, elixir-format
+msgid "Navigation"
 msgstr ""
 
 #: lib/components/smart_input/headers/smart_input_header_live.sface:6
@@ -328,12 +405,23 @@ msgstr ""
 msgid "No known fonts"
 msgstr ""
 
-#: lib/components/settings/change_theme_live.sface:47
+#: lib/components/settings/change_theme_live.sface:57
 #, elixir-autogen, elixir-format
 msgid "No known themes"
 msgstr ""
 
-#: lib/ui_common.ex:648
+#: lib/components/modals/preview_content_live.sface:60
+#, elixir-autogen, elixir-format
+msgid "No preview component or view is available."
+msgstr ""
+
+#: lib/error/error_view.ex:7
+#, elixir-autogen, elixir-format
+msgid "Not allowed"
+msgstr ""
+
+#: lib/error/error_view.ex:8
+#: lib/ui_common.ex:711
 #, elixir-autogen, elixir-format
 msgid "Not found"
 msgstr ""
@@ -348,7 +436,7 @@ msgstr ""
 msgid "Notifications enabled"
 msgstr ""
 
-#: lib/ui_common.ex:182
+#: lib/ui_common.ex:190
 #, elixir-autogen, elixir-format
 msgid "Ok"
 msgstr ""
@@ -358,31 +446,47 @@ msgstr ""
 msgid "Open options"
 msgstr ""
 
-#: lib/components/nav/apps/apps_live.sface:9
+#: lib/components/nav/header/logged_header_live.sface:15
 #, elixir-autogen, elixir-format
 msgid "Open_extensions_sidebar options"
 msgstr ""
 
-#: lib/components/extensions/extensions_live.sface:132
+#: lib/components/extensions/extensions_live.sface:112
 #, elixir-autogen, elixir-format
-msgid "Other Libraries"
+msgid "Other libraries"
 msgstr ""
 
-#: lib/components/settings/smart_input_settings_live.sface:58
+#: lib/components/settings/sidebar/sidebar_instance_settings_live.sface:203
+#, elixir-autogen, elixir-format
+msgid "Pages"
+msgstr ""
+
+#: lib/components/settings/smart_input_settings_live.sface:29
 #, elixir-autogen, elixir-format
 msgid "Pop-up modal"
 msgstr ""
 
-#: lib/components/smart_input/input_controls_live.sface:68
+#: lib/components/smart_input/input_controls_live.sface:69
 #, elixir-autogen, elixir-format
 msgid "Post"
 msgstr ""
 
-#: lib/components/smart_input/input_controls_live.sface:58
+#: lib/components/smart_input/input_controls_live.sface:59
 #, elixir-autogen, elixir-format
 msgid "Posting..."
 msgstr ""
 
+#: lib/components/settings/sidebar/sidebar_instance_settings_live.sface:218
+#, elixir-autogen, elixir-format
+msgid "Posts"
+msgstr ""
+
+#: lib/components/settings/sidebar/sidebar_instance_settings_live.sface:27
+#: lib/components/settings/sidebar/sidebar_settings_nav_live.sface:48
+#, elixir-autogen, elixir-format
+msgid "Preferences"
+msgstr ""
+
 #: lib/components/paginate/load_previous_live.sface:24
 #, elixir-autogen, elixir-format
 msgid "Previous page"
@@ -393,21 +497,31 @@ msgstr ""
 msgid "Privacy Policy"
 msgstr ""
 
-#: lib/ui_common.ex:1056
+#: lib/components/settings/sidebar/sidebar_settings_nav_live.sface:36
+#, elixir-autogen, elixir-format
+msgid "Profile"
+msgstr ""
+
+#: lib/ui_common.ex:1154
 #, elixir-autogen, elixir-format
 msgid "Public"
 msgstr ""
 
+#: lib/components/nav/nav_sidebar/default_nav_live.sface:26
+#, elixir-autogen, elixir-format
+msgid "Remote"
+msgstr ""
+
+#: lib/components/settings/sidebar/sidebar_instance_settings_live.sface:91
+#, elixir-autogen, elixir-format
+msgid "Roles"
+msgstr ""
+
 #: lib/components/nav/nav_footer_mobile/nav_footer_mobile_user_live.sface:21
 #, elixir-autogen, elixir-format
 msgid "Search"
 msgstr ""
 
-#: lib/components/nav/header/header_mobile_guest_live.sface:8
-#, elixir-autogen, elixir-format
-msgid "Select User"
-msgstr ""
-
 #: lib/components/smart_input/headers/smart_input_header_live.sface:12
 #, elixir-autogen, elixir-format
 msgid "Select the activity type"
@@ -418,23 +532,29 @@ msgstr ""
 msgid "Select the participants"
 msgstr ""
 
-#: lib/components/smart_input/input_controls_live.sface:66
+#: lib/components/smart_input/input_controls_live.sface:67
 #, elixir-autogen, elixir-format
 msgid "Send"
 msgstr ""
 
-#: lib/components/smart_input/input_controls_live.sface:57
+#: lib/components/smart_input/input_controls_live.sface:58
 #, elixir-autogen, elixir-format
 msgid "Sending..."
 msgstr ""
 
-#: lib/components/nav/user_dropdown/mobile_user_menu_live.sface:134
-#: lib/components/nav/user_dropdown/user_menu_links_live.sface:12
+#: lib/components/nav/user_dropdown/user_menu_links_live.sface:26
 #, elixir-autogen, elixir-format
 msgid "Settings"
 msgstr ""
 
-#: lib/components/widgets/widget_feedbacks/feedback_button_live.sface:6
+#: lib/components/settings/sidebar/sidebar_instance_settings_live.sface:1
+#: lib/components/settings/sidebar/sidebar_settings_nav_live.sface:6
+#, elixir-autogen, elixir-format
+msgid "Settings navigation"
+msgstr ""
+
+#: lib/components/nav/user_dropdown/user_menu_links_live.sface:60
+#: lib/components/widgets/widget_feedbacks/feedback_button_live.sface:7
 #, elixir-autogen, elixir-format
 msgid "Share feedback"
 msgstr ""
@@ -444,29 +564,45 @@ msgstr ""
 msgid "Show"
 msgstr ""
 
-#: lib/components/settings/avatars_settings_live.sface:18
+#: lib/components/settings/avatars_settings_live.sface:5
 #, elixir-autogen, elixir-format
 msgid "Show randomly-generated animal avatars for users without a profile picture"
 msgstr ""
 
-#: lib/components/nav/header/guest_header/guest_header_live.sface:12
+#: lib/components/nav/header/guest_header_live.sface:16
 #, elixir-autogen, elixir-format
 msgid "Sign up"
 msgstr ""
 
-#: lib/components/nav/header/header_mobile_guest_live.sface:20
+#: lib/components/settings/sidebar/sidebar_instance_settings_live.sface:160
+#: lib/components/settings/sidebar/sidebar_settings_nav_live.sface:150
 #, elixir-autogen, elixir-format
-msgid "Signup"
+msgid "Silenced"
 msgstr ""
 
-#: lib/components/nav/user_dropdown/user_menu_links_live.sface:17
+#: lib/components/widgets/widget_apps/widget_apps_live.sface:10
+#, elixir-autogen, elixir-format
+msgid "Social"
+msgstr ""
+
+#: lib/error/error_view.ex:10
+#, elixir-autogen, elixir-format
+msgid "Something went wrong"
+msgstr ""
+
+#: lib/live_plugs/live_plugs.ex:95
+#, elixir-autogen, elixir-format
+msgid "Sorry, %{app} is not enabled on this instance. You may want to get in touch with your instance admin(s)..."
+msgstr ""
+
+#: lib/components/nav/user_dropdown/user_menu_links_live.sface:35
 #, elixir-autogen, elixir-format
 msgid "Switch profile"
 msgstr ""
 
-#: lib/components/nav/user_dropdown/mobile_user_menu_live.sface:107
+#: lib/components/settings/sidebar/sidebar_instance_settings_live.sface:233
 #, elixir-autogen, elixir-format
-msgid "Switch user profile"
+msgid "Tags"
 msgstr ""
 
 #: lib/components/placeholders/empty_feed.sface:144
@@ -474,12 +610,22 @@ msgstr ""
 msgid "Take a deep breath..."
 msgstr ""
 
+#: lib/components/settings/sidebar/sidebar_settings_nav_live.sface:72
+#, elixir-autogen, elixir-format
+msgid "Team Profiles"
+msgstr ""
+
+#: lib/components/settings/sidebar/sidebar_instance_settings_live.sface:54
+#, elixir-autogen, elixir-format
+msgid "Terms / Policies"
+msgstr ""
+
 #: lib/components/widgets/widget_feedbacks/widget_feedback_live.sface:6
 #, elixir-autogen, elixir-format
 msgid "The Bonfire team is all ears if you want to report a bug, suggest an improvement or a new feature, or just say hi :)"
 msgstr ""
 
-#: lib/components/actions/flag/flag_action_live.sface:11
+#: lib/components/actions/flag/flag_action_live.sface:10
 #, elixir-autogen, elixir-format
 msgid "The admins will review the content and might get in touch with you or the author for clarification. They may then delete it and/or block the person or originating instance if appropriate."
 msgstr ""
@@ -489,17 +635,7 @@ msgstr ""
 msgid "The file is too large."
 msgstr ""
 
-#: lib/components/extensions/extensions_live.sface:134
-#, elixir-autogen, elixir-format
-msgid "These are other libre / open source software projects used by the app and/or installed extensions."
-msgstr ""
-
-#: lib/components/extensions/extensions_live.sface:80
-#, elixir-autogen, elixir-format
-msgid "These are the data schemas currently installed on this instance, which can be shared among multiple apps and extensions."
-msgstr ""
-
-#: lib/live_handlers_graceful_degradation_controller.ex:36
+#: lib/live_handlers_graceful_degradation_controller.ex:41
 #, elixir-autogen, elixir-format
 msgid "This feature usually requires JavaScript, but the app attempted to do what was expected anyway. Did it not work for you? Feedback is welcome! "
 msgstr ""
@@ -514,12 +650,12 @@ msgstr ""
 msgid "To"
 msgstr ""
 
-#: lib/ui_common.ex:194
+#: lib/ui_common.ex:202
 #, elixir-autogen, elixir-format
 msgid "Unexpected data"
 msgstr ""
 
-#: lib/components/actions/follow/follow_button_live.sface:26
+#: lib/components/actions/flag/follow/follow_button_live.sface:26
 #, elixir-autogen, elixir-format
 msgid "Unfollow"
 msgstr ""
@@ -529,26 +665,45 @@ msgstr ""
 msgid "Upload an image"
 msgstr ""
 
-#: lib/components/settings/smart_input_settings_live.sface:14
+#: lib/components/extensions/extensions_live.sface:40
+#: lib/components/extensions/extensions_live.sface:63
+#: lib/components/extensions/extensions_live.sface:86
+#: lib/components/extensions/extensions_live.sface:103
+#: lib/components/extensions/extensions_live.sface:120
 #, elixir-autogen, elixir-format
-msgid "Use light colours for the editor"
+msgid "View code"
 msgstr ""
 
-#: lib/components/settings/smart_input_settings_live.sface:20
+#: lib/components/nav/user_dropdown/user_menu_links_live.sface:20
+#, elixir-autogen, elixir-format
+msgid "View profile"
+msgstr ""
+
+#: lib/components/settings/sidebar/sidebar_instance_settings_live.sface:13
+#, elixir-autogen, elixir-format
+msgid "Website"
+msgstr ""
+
+#: lib/components/settings/smart_input_settings_live.sface:14
 #, elixir-autogen, elixir-format
 msgid "Where to show the editor"
 msgstr ""
 
-#: lib/components/actions/flag/flag_action_live.sface:4
+#: lib/components/actions/flag/flag_action_live.sface:3
 #, elixir-autogen, elixir-format
 msgid "You already flagged this"
 msgstr ""
 
-#: lib/components/settings/smart_input_settings_live.sface:80
+#: lib/components/settings/smart_input_settings_live.sface:51
 #, elixir-autogen, elixir-format
 msgid "You are able to navigate through the app while composing a post."
 msgstr ""
 
+#: lib/live_plugs/live_plugs.ex:102
+#, elixir-autogen, elixir-format
+msgid "You have not enabled %{app}. You can do so in Settings -> Extensions."
+msgstr ""
+
 #: lib/components/smart_input/upload/upload_previews_live.ex:10
 #, elixir-autogen, elixir-format
 msgid "You have selected a file type that is not permitted. Contact your instance admin if you want it added."
@@ -559,7 +714,17 @@ msgstr ""
 msgid "You have selected too many files."
 msgstr ""
 
+#: lib/ui_common.ex:700
+#, elixir-autogen, elixir-format
+msgid "You need to log in first."
+msgstr ""
+
 #: lib/notifications.ex:10
 #, elixir-autogen, elixir-format
 msgid "You will now receive notifications of messages, mentions, and other relevant activities."
 msgstr ""
+
+#: lib/components/nav/nav_footer_mobile/nav_footer_mobile_user_live.sface:47
+#, elixir-autogen, elixir-format
+msgid "Your profile"
+msgstr ""
diff --git a/priv/localisation/bonfire_ui_coordination.po b/priv/localisation/bonfire_ui_coordination.po
index 09bff8c26a..5cf486e66b 100644
--- a/priv/localisation/bonfire_ui_coordination.po
+++ b/priv/localisation/bonfire_ui_coordination.po
@@ -10,285 +10,358 @@
 msgid ""
 msgstr ""
 
-#: lib/web/components/task_actions/task_actions_menu_live.sface:88
-#: lib/web/components/task_hero/task_hero_live.sface:81
+#: lib/web/pages/task/task_live.sface:11
 #, elixir-autogen, elixir-format
-msgid "A request will be sent to remote instances to delete it as well."
+msgid "Activities"
 msgstr ""
 
-#: lib/web/components/create_task/create_task_container_live.sface:30
-#, elixir-autogen, elixir-format
-msgid "Add a new task in this list"
-msgstr ""
-
-#: lib/web/components/create_task/create_task_container_live.sface:30
-#: lib/web/pages/feed/feed_live.ex:48
-#: lib/web/pages/likes/likes_live.ex:31
-#: lib/web/pages/tasks/tasks_live.ex:43
+#: lib/web/components/create_task/create_task_container_live.sface:16
+#: lib/web/pages/likes/likes_live.ex:34
+#: lib/web/pages/tasks/tasks_live.ex:68
+#: lib/web/pages/todo/todo_live.sface:22
 #, elixir-autogen, elixir-format
 msgid "Add a task"
 msgstr ""
 
-#: lib/web/pages/process/process_live.ex:43
-#, elixir-autogen, elixir-format
-msgid "Add task to list"
-msgstr ""
-
-#: lib/web/components/lists_navigation/lists_navigation_live.sface:2
+#: lib/web/components/nav/lists_navigation_live.sface:2
 #, elixir-autogen, elixir-format
 msgid "All lists"
 msgstr ""
 
-#: lib/web/components/widgets/tasks_filter/tasks_filter_live.sface:64
+#: lib/web/pages/todo/todo_live.ex:17
+#: lib/web/pages/todo/todo_live.ex:42
+#, elixir-autogen, elixir-format
+msgid "All tasks"
+msgstr ""
+
+#: lib/web/components/widgets/tasks_filter/tasks_filter_live.sface:60
 #, elixir-autogen, elixir-format
 msgid "Any"
 msgstr ""
 
-#: lib/web/components/task_actions/task_actions_menu_live.sface:56
+#: lib/web/components/task_actions/task_actions_live.sface:14
+#, elixir-autogen, elixir-format
+msgid "Assign"
+msgstr ""
+
+#: lib/web/components/task_actions/task_actions_menu_live.sface:24
 #, elixir-autogen, elixir-format
 msgid "Assign to myself"
 msgstr ""
 
-#: lib/web/components/task_preview/task_preview_live.sface:28
+#: lib/web/components/task_actions/task_actions_live.sface:19
+#, elixir-autogen, elixir-format
+msgid "Assign to... "
+msgstr ""
+
+#: lib/web/components/task_hero/task_hero_live.sface:93
 #, elixir-autogen, elixir-format
 msgid "Assigned"
 msgstr ""
 
-#: lib/web/components/task_actions/task_actions_live.sface:3
-#, elixir-autogen, elixir-format
-msgid "Assigned to"
-msgstr ""
-
-#: lib/web/components/widgets/tasks_filter/tasks_filter_live.sface:27
+#: lib/web/components/widgets/tasks_filter/tasks_filter_live.sface:26
+#: lib/web/pages/tasks/tasks_live.sface:67
 #, elixir-autogen, elixir-format
 msgid "Assignee"
 msgstr ""
 
-#: lib/web/components/list_navigation/list_navigation_live.sface:58
-#: lib/web/components/widgets/tasks_filter/tasks_filter_live.sface:90
+#: lib/web/components/task_hero/task_hero_live.sface:35
+#, elixir-autogen, elixir-format
+msgid "Close"
+msgstr ""
+
+#: lib/web/components/task_set_status/task_set_status_live.sface:16
+#: lib/web/components/widgets/tasks_filter/tasks_filter_live.sface:86
+#: lib/web/pages/tasks/tasks_live.sface:22
 #, elixir-autogen, elixir-format
 msgid "Closed"
 msgstr ""
 
-#: lib/web/components/task_preview/task_preview_live.sface:46
+#: lib/web/pages/tasks/tasks_live.ex:153
+#, elixir-autogen, elixir-format
+msgid "Closed Tasks"
+msgstr ""
+
+#: lib/web/components/create_label/create_label_live.sface:14
+#, elixir-autogen, elixir-format
+msgid "Color"
+msgstr ""
+
+#: lib/web/components/task_preview/task_preview_live.sface:32
+#: lib/web/components/widgets/process_info/process_info_live.sface:7
 #, elixir-autogen, elixir-format
 msgid "Completed"
 msgstr ""
 
-#: lib/web/pages/processes/processes_live.ex:44
+#: lib/web/components/create_label/create_label_live.sface:43
 #, elixir-autogen, elixir-format
-msgid "Create a list"
+msgid "Create"
 msgstr ""
 
-#: lib/web/components/task_actions/task_actions_menu_live.sface:84
-#: lib/web/components/task_actions/task_actions_menu_live.sface:93
-#: lib/web/components/task_actions/task_actions_menu_live.sface:105
-#: lib/web/components/task_hero/task_hero_live.sface:77
-#: lib/web/components/task_hero/task_hero_live.sface:86
-#: lib/web/components/task_hero/task_hero_live.sface:98
+#: lib/web/components/create_label/create_label_live.sface:29
 #, elixir-autogen, elixir-format
-msgid "Delete this task"
+msgid "Description"
 msgstr ""
 
-#: lib/web/pages/tasks/tasks_live.ex:21
+#: lib/web/pages/tasks/tasks_live.ex:36
 #, elixir-autogen, elixir-format
 msgid "Discover tasks"
 msgstr ""
 
-#: lib/web/components/task_thread/task_thread_live.sface:3
+#: lib/web/components/task_hero/task_hero_live.sface:80
 #, elixir-autogen, elixir-format
-msgid "Discussion"
+msgid "Due"
 msgstr ""
 
-#: lib/web/components/create_task/create_task_live.sface:4
+#: lib/web/components/task_actions/task_actions_live.sface:49
+#, elixir-autogen, elixir-format
+msgid "Due date"
+msgstr ""
+
+#: lib/web/components/create_task/create_task_live.sface:5
 #, elixir-autogen, elixir-format
 msgid "Enter a name for the task"
 msgstr ""
 
-#: lib/web/pages/likes/likes_live.ex:5
-#, elixir-autogen, elixir-format
-msgid "Favourites"
-msgstr ""
-
-#: lib/web/components/list_navigation/list_navigation_live.sface:18
+#: lib/web/components/widgets/tasks_filter/tasks_filter_live.sface:1
 #, elixir-autogen, elixir-format
 msgid "Filter"
 msgstr ""
 
-#: lib/web/components/widgets/tasks_filter/tasks_filter_live.sface:1
+#: lib/web/pages/likes/likes_live.ex:32
 #, elixir-autogen, elixir-format
-msgid "Filters"
+msgid "Important tasks"
 msgstr ""
 
-#: lib/web/components/task_actions/task_actions_live.sface:18
+#: lib/web/components/create_label/create_label_live.sface:23
 #, elixir-autogen, elixir-format
-msgid "In list"
+msgid "Label name"
 msgstr ""
 
-#: lib/web/pages/process/process_live.ex:38
+#: lib/web/components/task_hero/task_hero_live.sface:101
+#, elixir-autogen, elixir-format
+msgid "Labels & Topics"
+msgstr ""
+
+#: lib/web/pages/process/process_live.ex:41
 #, elixir-autogen, elixir-format
 msgid "List"
 msgstr ""
 
+#: lib/web/components/task_actions/task_actions_live.sface:31
+#, elixir-autogen, elixir-format
+msgid "Milestone"
+msgstr ""
+
 #: lib/web/pages/processes/processes_live.ex:20
 #, elixir-autogen, elixir-format
-msgid "Lists"
+msgid "Milestones"
 msgstr ""
 
-#: lib/web/components/list_navigation/list_navigation_live.sface:154
-#, elixir-autogen, elixir-format
-msgid "Most discussed"
-msgstr ""
-
-#: lib/web/components/list_navigation/list_navigation_live.sface:151
-#, elixir-autogen, elixir-format
-msgid "Most voted"
-msgstr ""
-
-#: lib/web/pages/likes/likes_live.ex:29
-#, elixir-autogen, elixir-format
-msgid "My Favourites"
-msgstr ""
-
-#: lib/web/pages/feed/feed_live.ex:38
+#: lib/web/pages/feed/feed_live.ex:40
 #, elixir-autogen, elixir-format
 msgid "My coordination feed"
 msgstr ""
 
-#: lib/web/components/nav/sidebar/sidebar_navigation_live.sface:30
-#: lib/web/pages/tasks/tasks_live.ex:20
+#: lib/web/components/nav/sidebar_navigation_live.sface:30
 #, elixir-autogen, elixir-format
 msgid "My tasks"
 msgstr ""
 
-#: lib/web/components/list_navigation/list_navigation_live.sface:145
+#: lib/web/pages/labels/labels_live.ex:71
 #, elixir-autogen, elixir-format
-msgid "Newest"
+msgid "New label"
 msgstr ""
 
-#: lib/web/components/task_preview/task_preview_live.sface:82
+#: lib/web/pages/processes/processes_live.ex:58
+#, elixir-autogen, elixir-format
+msgid "New milestone"
+msgstr ""
+
+#: lib/web/pages/process/process_live.ex:45
+#, elixir-autogen, elixir-format
+msgid "New task"
+msgstr ""
+
+#: lib/web/components/task_hero/task_hero_live.sface:88
+#: lib/web/components/task_preview/task_preview_live.sface:73
 #, elixir-autogen, elixir-format
 msgid "No due date"
 msgstr ""
 
-#: lib/web/components/list_navigation/list_navigation_live.sface:148
+#: lib/web/components/task_actions/task_actions_live.sface:36
 #, elixir-autogen, elixir-format
-msgid "Oldest"
+msgid "No milestone set"
 msgstr ""
 
-#: lib/web/components/list_navigation/list_navigation_live.sface:52
-#: lib/web/components/task_preview/task_preview_live.sface:16
-#: lib/web/components/widgets/tasks_filter/tasks_filter_live.sface:77
+#: lib/web/pages/tasks/tasks_live.sface:143
+#: lib/web/pages/todo/todo_live.sface:57
+#, elixir-autogen, elixir-format
+msgid "No tasks have been found"
+msgstr ""
+
+#: lib/web/components/task_actions/task_actions_live.sface:19
+#, elixir-autogen, elixir-format
+msgid "Not assigned"
+msgstr ""
+
+#: lib/web/components/task_set_status/task_set_status_live.sface:2
+#: lib/web/components/widgets/process_info/process_info_live.sface:4
+#: lib/web/components/widgets/tasks_filter/tasks_filter_live.sface:73
+#: lib/web/pages/tasks/tasks_live.sface:12
 #, elixir-autogen, elixir-format
 msgid "Open"
 msgstr ""
 
-#: lib/web/components/task_actions/task_actions_menu_live.sface:20
-#: lib/web/components/task_hero/task_hero_live.sface:54
+#: lib/web/pages/tasks/tasks_live.ex:174
 #, elixir-autogen, elixir-format
-msgid "Open options"
+msgid "Open Tasks"
 msgstr ""
 
-#: lib/web/components/task_thread/task_thread_live.sface:14
+#: lib/web/components/task_thread/task_thread_live.sface:5
 #, elixir-autogen, elixir-format
 msgid "Post a comment..."
 msgstr ""
 
-#: lib/web/components/task_actions/task_actions_menu_live.sface:77
-#: lib/web/components/task_set_status/task_set_status_live.sface:21
+#: lib/web/components/task_actions/task_actions_menu_live.sface:46
+#: lib/web/components/task_hero/task_hero_live.sface:46
 #, elixir-autogen, elixir-format
 msgid "Re-open"
 msgstr ""
 
-#: lib/web/pages/feed/feed_live.ex:17
-#, elixir-autogen, elixir-format
-msgid "Recent"
-msgstr ""
-
-#: lib/web/pages/task/task_live.ex:49
+#: lib/web/pages/task/task_live.ex:54
 #, elixir-autogen, elixir-format
 msgid "Reply to this task"
 msgstr ""
 
-#: lib/web/components/list_navigation/list_navigation_live.sface:65
-#, elixir-autogen, elixir-format
-msgid "Search tasks"
-msgstr ""
-
-#: lib/web/components/widgets/tasks_filter/tasks_filter_live.sface:12
+#: lib/web/components/widgets/tasks_filter/tasks_filter_live.sface:11
+#: lib/web/pages/tasks/tasks_live.sface:51
+#: lib/web/pages/todo/todo_live.sface:8
 #, elixir-autogen, elixir-format
 msgid "Search tasks..."
 msgstr ""
 
-#: lib/web/components/task_actions/task_actions_menu_live.sface:68
-#: lib/web/components/task_set_status/task_set_status_live.sface:8
+#: lib/web/components/create_task/create_task_live.sface:4
+#: lib/web/components/task_actions/task_actions_live.sface:36
+#, elixir-autogen, elixir-format
+msgid "Select a milestone..."
+msgstr ""
+
+#: lib/web/pages/tasks/tasks_live.sface:80
+#, elixir-autogen, elixir-format
+msgid "Select a user..."
+msgstr ""
+
+#: lib/web/pages/tasks/tasks_live.sface:103
+#, elixir-autogen, elixir-format
+msgid "Select..."
+msgstr ""
+
+#: lib/web/components/task_actions/task_actions_menu_live.sface:35
 #, elixir-autogen, elixir-format
 msgid "Set as completed"
 msgstr ""
 
-#: lib/web/components/list_navigation/list_navigation_live.sface:115
-#, elixir-autogen, elixir-format
-msgid "Sort"
-msgstr ""
-
-#: lib/web/components/widgets/tasks_filter/tasks_filter_live.sface:52
+#: lib/web/components/widgets/tasks_filter/tasks_filter_live.sface:48
 #, elixir-autogen, elixir-format
 msgid "Status"
 msgstr ""
 
-#: lib/web/pages/task/task_live.ex:43
+#: lib/web/pages/task/task_live.ex:47
 #, elixir-autogen, elixir-format
 msgid "Task"
 msgstr ""
 
-#: lib/web/components/task_hero/task_hero_live.sface:24
+#: lib/web/components/task_hero/task_hero_live.sface:69
 #, elixir-autogen, elixir-format
 msgid "Task in"
 msgstr ""
 
-#: lib/web/components/task_set_status/task_set_status_live.sface:12
-#, elixir-autogen, elixir-format
-msgid "Task was completed"
-msgstr ""
-
-#: lib/web/pages/process/process_live.sface:12
-#: lib/web/pages/tasks/tasks_live.ex:39
-#: lib/web/pages/tasks/tasks_live.ex:128
+#: lib/web/pages/tasks/tasks_live.ex:33
+#: lib/web/pages/tasks/tasks_live.ex:55
 #, elixir-autogen, elixir-format
 msgid "Tasks"
 msgstr ""
 
-#: lib/web/pages/tasks/tasks_live.ex:18
+#: lib/web/pages/tasks/tasks_live.ex:125
 #, elixir-autogen, elixir-format
-msgid "To do"
+msgid "Tasks relevant to me"
 msgstr ""
 
-#: lib/web/components/task_preview/task_preview_live.sface:51
+#: lib/web/components/settings/team_live.ex:4
+#, elixir-autogen, elixir-format
+msgid "Team"
+msgstr ""
+
+#: lib/web/pages/process/process_live.sface:12
+#, elixir-autogen, elixir-format
+msgid "This list has no tasks yet"
+msgstr ""
+
+#: lib/web/pages/feed/feed_live.ex:7
+#: lib/web/pages/feed/feed_live.ex:36
+#, elixir-autogen, elixir-format
+msgid "Timeline"
+msgstr ""
+
+#: lib/web/pages/tasks/tasks_live.ex:34
+#, elixir-autogen, elixir-format
+msgid "To Do"
+msgstr ""
+
+#: lib/web/pages/tasks/tasks_live.sface:91
+#, elixir-autogen, elixir-format
+msgid "Topics / Labels"
+msgstr ""
+
+#: lib/web/components/task_preview/task_preview_live.sface:29
 #, elixir-autogen, elixir-format
 msgid "Untitled task"
 msgstr ""
 
-#: lib/web/pages/tasks/tasks_live.ex:103
+#: lib/web/pages/labels/labels_live.ex:59
+#: lib/web/pages/labels/labels_live.sface:24
 #, elixir-autogen, elixir-format
-msgid "Watched Tasks"
+msgid "Untitled topic"
 msgstr ""
 
-#: lib/web/pages/feed/feed_live.ex:46
+#: lib/web/pages/feed/feed_live.ex:50
 #, elixir-autogen, elixir-format
 msgid "You can start by following some people, or writing adding some tasks yourself."
 msgstr ""
 
-#: lib/web/pages/feed/feed_live.ex:44
+#: lib/web/pages/feed/feed_live.ex:48
 #, elixir-autogen, elixir-format
 msgid "Your feed is empty"
 msgstr ""
 
-#: lib/web/components/nav/sidebar/sidebar_navigation_live.sface:60
+#: lib/web/components/nav/sidebar_navigation_live.sface:60
 #, elixir-autogen, elixir-format
 msgid "all lists"
 msgstr ""
 
-#: lib/web/components/task_preview/task_preview_live.sface:55
+#: lib/web/pages/labels/labels_live.ex:76
+#, elixir-autogen, elixir-format
+msgid "follow"
+msgstr ""
+
+#: lib/web/components/task_preview/task_preview_live.sface:37
 #, elixir-autogen, elixir-format
 msgid "in"
 msgstr ""
+
+#: lib/web/pages/labels/labels_live.sface:38
+#, elixir-autogen, elixir-format
+msgid "label"
+msgstr ""
+
+#: lib/web/pages/processes/processes_live.ex:46
+#, elixir-autogen, elixir-format
+msgid "milestones"
+msgstr ""
+
+#: lib/web/components/task_actions/task_actions_menu_live.sface:53
+#: lib/web/components/task_hero/task_hero_live.sface:53
+#, elixir-autogen, elixir-format
+msgid "task"
+msgstr ""
diff --git a/priv/localisation/bonfire_ui_kanban.po b/priv/localisation/bonfire_ui_kanban.po
index a229de8236..970d97d63e 100644
--- a/priv/localisation/bonfire_ui_kanban.po
+++ b/priv/localisation/bonfire_ui_kanban.po
@@ -133,7 +133,7 @@ msgstr ""
 msgid "Requested by"
 msgstr ""
 
-#: lib/web/pages/board/board_live.sface:42
+#: lib/web/pages/board/board_live.sface:28
 #, elixir-autogen, elixir-format
 msgid "Show menu"
 msgstr ""
diff --git a/priv/localisation/bonfire_ui_me.po b/priv/localisation/bonfire_ui_me.po
index 9bcfb1d873..3741319c55 100644
--- a/priv/localisation/bonfire_ui_me.po
+++ b/priv/localisation/bonfire_ui_me.po
@@ -10,24 +10,19 @@
 msgid ""
 msgstr ""
 
-#: lib/components/settings/admin/instance_info_live.sface:109
-#, elixir-autogen, elixir-format
-msgid "(longer text shown on the homepage, you can use markdown and/or HTML)"
-msgstr ""
-
-#: lib/components/settings/admin/instance_info_live.sface:90
-#, elixir-autogen, elixir-format
-msgid "(short summary shown in various places)"
-msgstr ""
-
 #: lib/components/signup/signup_form_live.sface:63
 #, elixir-autogen, elixir-format
 msgid "10 characters minimum"
 msgstr ""
 
-#: lib/components/settings/user_profile/edit_profile_live.sface:93
+#: lib/components/settings/dashboard/user_dashboard_live.sface:119
 #, elixir-autogen, elixir-format
-msgid "About"
+msgid "A la carte"
+msgstr ""
+
+#: lib/components/settings/instance/preferences/instance_preferences_live.sface:48
+#, elixir-autogen, elixir-format
+msgid "A short summary shown in various places"
 msgstr ""
 
 #: lib/live_handlers/users_live_handler.ex:32
@@ -35,17 +30,17 @@ msgstr ""
 msgid "Access granted to the team!"
 msgstr ""
 
-#: lib/components/settings/sidebar/sidebar_settings_nav_live.sface:50
-#, elixir-autogen, elixir-format
-msgid "Account Settings"
-msgstr ""
-
 #: lib/components/login/login_view_live.sface:14
 #, elixir-autogen, elixir-format
 msgid "Account not found. Either your username or password was incorrect. Did you want to "
 msgstr ""
 
-#: lib/components/settings/admin/admin_live.sface:241
+#: lib/components/settings/account/edit_account_live.sface:4
+#, elixir-autogen, elixir-format
+msgid "Account settings"
+msgstr ""
+
+#: lib/components/settings/instance/instance_old/admin_live.sface:237
 #, elixir-autogen, elixir-format
 msgid "Activities shared only with members of this instance."
 msgstr ""
@@ -55,18 +50,30 @@ msgstr ""
 msgid "Add a new user"
 msgstr ""
 
-#: lib/components/profile/profile_hero/profile_hero_full_live.sface:26
+#: lib/components/profile/profile_hero/profile_hero_full_live.sface:33
 #: lib/components/user_previews/user_preview_live.sface:34
 #, elixir-autogen, elixir-format
 msgid "Admin"
 msgstr ""
 
-#: lib/components/settings/admin/admin_live.sface:172
+#: lib/components/settings/instance/instance_old/admin_live.sface:168
+#: lib/components/settings/instance/preferences/instance_preferences_live.sface:319
 #: lib/components/widgets/widget_users/widget_admins_live.sface:3
 #, elixir-autogen, elixir-format
 msgid "Admins"
 msgstr ""
 
+#: lib/components/settings/dashboard/user_dashboard_live.sface:108
+#: lib/components/settings/instance/dashboard/instance_dashboard_live.sface:103
+#, elixir-autogen, elixir-format
+msgid "Advanced"
+msgstr ""
+
+#: lib/components/settings/instance/preferences/instance_preferences_live.sface:346
+#, elixir-autogen, elixir-format
+msgid "Advanced settings"
+msgstr ""
+
 #: lib/views/confirm_email/confirm_email_live.sface:58
 #, elixir-autogen, elixir-format
 msgid "Already confirmed your email?"
@@ -94,42 +101,52 @@ msgstr ""
 msgid "Anyone you add will have admin-level access over this user identity, meaning they can post as @%{username}, read private messages, etc. You might want to %{a} first create a new user %{b} for this purpose?"
 msgstr ""
 
+#: lib/components/settings/instance/preferences/instance_preferences_live.sface:14
+#, elixir-autogen, elixir-format
+msgid "Appearance"
+msgstr ""
+
 #: lib/components/remote_interaction/remote_interaction_form_live.sface:30
 #, elixir-autogen, elixir-format
 msgid "Are you a user of this instance?"
 msgstr ""
 
-#: lib/views/settings/settings_live.ex:156
+#: lib/views/settings/settings_live.ex:167
 #, elixir-autogen, elixir-format
 msgid "Avatar changed!"
 msgstr ""
 
-#: lib/views/signup/signup_live.sface:24
+#: lib/views/signup/signup_live.sface:29
 #, elixir-autogen, elixir-format
 msgid "Back to home page"
 msgstr ""
 
-#: lib/views/settings/settings_live.ex:171
+#: lib/views/settings/settings_live.ex:182
 #, elixir-autogen, elixir-format
 msgid "Background image changed!"
 msgstr ""
 
+#: lib/components/settings/profile/edit_profile_live.sface:32
+#, elixir-autogen, elixir-format
+msgid "Bio"
+msgstr ""
+
+#: lib/components/settings/instance/dashboard/instance_dashboard_live.sface:97
+#, elixir-autogen, elixir-format
+msgid "Blocks"
+msgstr ""
+
 #: lib/views/dashboard/logged_dashboard_live.ex:27
 #, elixir-autogen, elixir-format
 msgid "Bonfire Dashboard"
 msgstr ""
 
-#: lib/components/settings/user_profile/edit_profile_live.sface:97
-#, elixir-autogen, elixir-format
-msgid "Brief description for your profile. You can use markdown formatting."
-msgstr ""
-
-#: lib/components/settings/admin/instance_info_live.sface:20
+#: lib/components/settings/instance/preferences/instance_preferences_live.sface:93
 #, elixir-autogen, elixir-format
 msgid "Change"
 msgstr ""
 
-#: lib/components/settings/account/edit_account_live.sface:7
+#: lib/components/settings/account/edit_account_live.sface:6
 #: lib/views/change_password/change_password_live.ex:20
 #, elixir-autogen, elixir-format
 msgid "Change my password"
@@ -140,21 +157,11 @@ msgstr ""
 msgid "Choose a password"
 msgstr ""
 
-#: lib/components/create_user/create_user_view_live.sface:67
+#: lib/components/create_user/create_user_view_live.sface:75
 #, elixir-autogen, elixir-format
 msgid "Choose a username"
 msgstr ""
 
-#: lib/components/settings/sidebar/sidebar_settings_mobile_live.sface:49
-#, elixir-autogen, elixir-format
-msgid "Close menu"
-msgstr ""
-
-#: lib/components/settings/admin/terms_live.sface:10
-#, elixir-autogen, elixir-format
-msgid "Code of Conduct"
-msgstr ""
-
 #: lib/views/change_password/change_password_live.sface:42
 #, elixir-autogen, elixir-format
 msgid "Confirm new password"
@@ -165,16 +172,21 @@ msgstr ""
 msgid "Confirm your password"
 msgstr ""
 
-#: lib/components/settings/admin/instance_info_live.sface:29
+#: lib/components/settings/instance/preferences/instance_preferences_live.sface:102
 #, elixir-autogen, elixir-format
 msgid "Cover image"
 msgstr ""
 
-#: lib/components/create_user/create_user_view_live.sface:95
+#: lib/components/create_user/create_user_view_live.sface:103
 #, elixir-autogen, elixir-format
 msgid "Create"
 msgstr ""
 
+#: lib/components/create_user/create_user_view_live.sface:57
+#, elixir-autogen, elixir-format
+msgid "Create a new user"
+msgstr ""
+
 #: lib/views/create_user/create_user_live.ex:23
 #: lib/views/create_user/create_user_live.ex:24
 #, elixir-autogen, elixir-format
@@ -191,19 +203,49 @@ msgstr ""
 msgid "Current password"
 msgstr ""
 
-#: lib/components/settings/admin/admin_live.sface:41
+#: lib/components/settings/instance/preferences/instance_preferences_live.sface:143
+#: lib/components/settings/preferences/preferences_live.sface:17
+#, elixir-autogen, elixir-format
+msgid "Customise the look and feel"
+msgstr ""
+
+#: lib/components/settings/instance/preferences/instance_preferences_live.sface:204
+#, elixir-autogen, elixir-format
+msgid "Default behaviours"
+msgstr ""
+
+#: lib/components/settings/instance/instance_old/admin_live.sface:37
+#: lib/components/settings/instance/preferences/instance_preferences_live.sface:168
+#: lib/components/settings/preferences/preferences_live.sface:70
 #, elixir-autogen, elixir-format
 msgid "Default font"
 msgstr ""
 
-#: lib/components/settings/admin/admin_live.sface:32
+#: lib/components/settings/instance/instance_old/admin_live.sface:28
+#: lib/components/settings/instance/preferences/instance_preferences_live.sface:192
+#: lib/components/settings/preferences/preferences_live.sface:94
 #, elixir-autogen, elixir-format
 msgid "Default language"
 msgstr ""
 
-#: lib/components/settings/settings_items/discoverable_live.sface:4
+#: lib/components/settings/account/edit_account_live.sface:19
 #, elixir-autogen, elixir-format
-msgid "Discoverability"
+msgid "Default look and feel"
+msgstr ""
+
+#: lib/components/settings/preferences/preferences_live.sface:27
+#, elixir-autogen, elixir-format
+msgid "Default theme"
+msgstr ""
+
+#: lib/components/settings/instance/dashboard/instance_dashboard_live.sface:22
+#, elixir-autogen, elixir-format
+msgid "Design"
+msgstr ""
+
+#: lib/components/settings/settings_items/discoverable_live.sface:6
+#, elixir-autogen, elixir-format
+msgid "Discoverable"
 msgstr ""
 
 #: lib/components/signup/signup_form_live.sface:162
@@ -216,11 +258,26 @@ msgstr ""
 msgid "Don't have an account yet?"
 msgstr ""
 
-#: lib/components/profile/profile_hero/profile_hero_full_live.sface:98
+#: lib/components/settings/instance/posts/instance_posts_live.sface:31
+#, elixir-autogen, elixir-format
+msgid "Edit"
+msgstr ""
+
+#: lib/components/settings/dashboard/user_dashboard_live.sface:38
+#, elixir-autogen, elixir-format
+msgid "Edit account"
+msgstr ""
+
+#: lib/components/profile/profile_hero/profile_hero_full_live.sface:104
 #, elixir-autogen, elixir-format
 msgid "Edit profile"
 msgstr ""
 
+#: lib/components/settings/profile/edit_profile_live.sface:8
+#, elixir-autogen, elixir-format
+msgid "Edit your profile"
+msgstr ""
+
 #: lib/components/signup/signup_form_live.sface:51
 #, elixir-autogen, elixir-format
 msgid "Email address"
@@ -231,7 +288,17 @@ msgstr ""
 msgid "Email address or @username"
 msgstr ""
 
-#: lib/components/settings/admin/admin_live.sface:59
+#: lib/components/settings/dashboard/user_dashboard_live.sface:39
+#, elixir-autogen, elixir-format
+msgid "Email and password"
+msgstr ""
+
+#: lib/components/settings/instance/preferences/instance_preferences_live.sface:351
+#, elixir-autogen, elixir-format
+msgid "Enable federation"
+msgstr ""
+
+#: lib/components/settings/instance/instance_old/admin_live.sface:55
 #, elixir-autogen, elixir-format
 msgid "Enable federation:"
 msgstr ""
@@ -241,11 +308,6 @@ msgstr ""
 msgid "Enable two-factor authentication (recommended)"
 msgstr ""
 
-#: lib/components/settings/admin/instance_info_live.sface:112
-#, elixir-autogen, elixir-format
-msgid "Enter a short title"
-msgstr ""
-
 #: lib/components/signup/signup_form_live.sface:82
 #, elixir-autogen, elixir-format
 msgid "Enter the same password again"
@@ -261,35 +323,52 @@ msgstr ""
 msgid "Enter your fediverse nick to %{verb} %{user_name} remotely:"
 msgstr ""
 
-#: lib/components/create_user/create_user_view_live.sface:56
+#: lib/components/create_user/create_user_view_live.sface:64
 #, elixir-autogen, elixir-format
 msgid "Enter your name or a pseudonym"
 msgstr ""
 
-#: lib/components/settings/sidebar/sidebar_settings_nav_live.sface:103
+#: lib/components/settings/instance/instance_old/terms_live.sface:38
+#: lib/components/settings/instance/instance_old/terms_live.sface:65
+#: lib/components/settings/instance/preferences/instance_preferences_live.sface:23
+#: lib/components/settings/instance/preferences/instance_preferences_live.sface:76
+#: lib/components/settings/instance/preferences/instance_preferences_live.sface:145
+#: lib/components/settings/instance/preferences/instance_preferences_live.sface:184
+#: lib/components/settings/instance/preferences/instance_preferences_live.sface:268
+#: lib/components/settings/instance/preferences/instance_preferences_live.sface:335
+#: lib/components/settings/preferences/preferences_live.sface:19
+#: lib/components/settings/preferences/preferences_live.sface:86
+#: lib/components/settings/preferences/preferences_live.sface:112
+#, elixir-autogen, elixir-format
+msgid "Expand"
+msgstr ""
+
+#: lib/components/settings/dashboard/user_dashboard_live.sface:118
+#: lib/components/settings/instance/dashboard/instance_dashboard_live.sface:110
 #, elixir-autogen, elixir-format
 msgid "Extensions"
 msgstr ""
 
-#: lib/components/profile/profile_hero/profile_hero_full_live.sface:209
+#: lib/components/profile/profile_hero/profile_hero_full_live.sface:192
 #, elixir-autogen, elixir-format
 msgid "Flag"
 msgstr ""
 
-#: lib/components/settings/sidebar/sidebar_settings_nav_live.sface:125
+#: lib/components/settings/dashboard/user_dashboard_live.sface:76
+#: lib/components/settings/instance/dashboard/instance_dashboard_live.sface:87
 #, elixir-autogen, elixir-format
-msgid "Flags"
+msgid "Flagged"
 msgstr ""
 
 #: lib/components/profile/profile_follows/profile_follows_live.sface:8
-#: lib/components/profile/profile_hero/profile_hero_full_live.sface:46
+#: lib/components/profile/profile_hero/profile_hero_full_live.sface:80
 #: lib/components/user_previews/user_preview_live.sface:46
 #, elixir-autogen, elixir-format
 msgid "Followers"
 msgstr ""
 
 #: lib/components/profile/profile_follows/profile_follows_live.sface:19
-#: lib/components/profile/profile_hero/profile_hero_full_live.sface:58
+#: lib/components/profile/profile_hero/profile_hero_full_live.sface:92
 #: lib/components/user_previews/user_preview_live.sface:51
 #, elixir-autogen, elixir-format
 msgid "Following"
@@ -311,19 +390,20 @@ msgstr ""
 msgid "Forgot your password?"
 msgstr ""
 
-#: lib/components/settings/user_profile/edit_profile_live.sface:62
+#: lib/components/settings/profile/edit_profile_live.sface:17
 #, elixir-autogen, elixir-format
 msgid "Full name"
 msgstr ""
 
-#: lib/components/settings/user_preferences/preferences_live.sface:4
+#: lib/components/settings/dashboard/user_dashboard_live.sface:2
+#: lib/components/settings/instance/dashboard/instance_dashboard_live.sface:12
 #, elixir-autogen, elixir-format
-msgid "General user_settings"
+msgid "General"
 msgstr ""
 
-#: lib/components/settings/shared_user/shared_user_live.sface:31
+#: lib/components/settings/dashboard/user_dashboard_live.sface:89
 #, elixir-autogen, elixir-format
-msgid "Give a label to this team"
+msgid "Ghosted"
 msgstr ""
 
 #: lib/components/settings/shared_user/shared_user_live.sface:4
@@ -336,7 +416,8 @@ msgstr ""
 msgid "Great! We've emailed you another link. Please click it to continue."
 msgstr ""
 
-#: lib/components/settings/admin/admin_live.sface:140
+#: lib/components/settings/instance/instance_old/admin_live.sface:136
+#: lib/components/settings/instance/preferences/instance_preferences_live.sface:287
 #, elixir-autogen, elixir-format
 msgid "Guests"
 msgstr ""
@@ -351,26 +432,54 @@ msgstr ""
 msgid "Hey there! Let's fill out your profile!"
 msgstr ""
 
-#: lib/components/settings/admin/admin_live.sface:116
+#: lib/components/settings/instance/instance_old/admin_live.sface:112
+#: lib/components/settings/instance/preferences/instance_preferences_live.sface:246
+#: lib/components/settings/instance/preferences/instance_preferences_live.sface:247
 #, elixir-autogen, elixir-format
 msgid "Hide the number of total users on this instance"
 msgstr ""
 
-#: lib/views/signup/signup_live.sface:13
+#: lib/components/settings/instance/dashboard/instance_dashboard_live.sface:120
+#, elixir-autogen, elixir-format
+msgid "History"
+msgstr ""
+
+#: lib/views/signup/signup_live.sface:18
 #, elixir-autogen, elixir-format
 msgid "Hooray! You are registered"
 msgstr ""
 
-#: lib/components/settings/user_preferences/preferences_live.sface:75
+#: lib/components/settings/dashboard/user_dashboard_live.sface:26
+#, elixir-autogen, elixir-format
+msgid "How things should behave"
+msgstr ""
+
+#: lib/components/settings/dashboard/user_dashboard_live.sface:13
+#, elixir-autogen, elixir-format
+msgid "How you present yourself"
+msgstr ""
+
+#: lib/components/settings/preferences/preferences_live.sface:124
 #, elixir-autogen, elixir-format
 msgid "I want my profile (@%{username}) and content to appear publicly in search engines (in Bonfire, the fediverse, and the web in general)"
 msgstr ""
 
-#: lib/views/settings/settings_live.ex:125
+#: lib/components/settings/instance/preferences/instance_preferences_live.sface:73
+#, elixir-autogen, elixir-format
+msgid "Icon & banner"
+msgstr ""
+
+#: lib/views/settings/instance_settings_live.ex:132
+#: lib/views/settings/settings_live.ex:136
 #, elixir-autogen, elixir-format
 msgid "Icon changed!"
 msgstr ""
 
+#: lib/components/settings/instance/preferences/instance_preferences_live.sface:21
+#, elixir-autogen, elixir-format
+msgid "Identify this instance"
+msgstr ""
+
 #: lib/components/signup/signup_form_live.sface:125
 #, elixir-autogen, elixir-format
 msgid "If you have a two-factor authentication app, please enable it by scanning the QR Code with your app (or you can enter the secret below instead), and then enter the code provided by your app at the bottom."
@@ -381,55 +490,43 @@ msgstr ""
 msgid "If you have two-factor authentication enabled, please enter the code provided by your app (optional)."
 msgstr ""
 
-#: lib/views/settings/settings_live.ex:140
+#: lib/components/settings/dashboard/user_dashboard_live.sface:102
+#, elixir-autogen, elixir-format
+msgid "Ignored / Silenced"
+msgstr ""
+
+#: lib/views/settings/instance_settings_live.ex:147
+#: lib/views/settings/settings_live.ex:151
 #, elixir-autogen, elixir-format
 msgid "Image changed!"
 msgstr ""
 
-#: lib/components/settings/admin/admin_live.sface:189
-#: lib/components/settings/admin/admin_live.sface:195
+#: lib/components/settings/instance/instance_old/admin_live.sface:185
+#: lib/components/settings/instance/instance_old/admin_live.sface:191
 #, elixir-autogen, elixir-format
 msgid "Indexing of data in this instance's search engine"
 msgstr ""
 
-#: lib/components/settings/sidebar/sidebar_settings_nav_live.sface:147
-#, elixir-autogen, elixir-format
-msgid "Instance"
-msgstr ""
-
-#: lib/components/settings/sidebar/sidebar_settings_nav_live.sface:164
-#, elixir-autogen, elixir-format
-msgid "Instance Info"
-msgstr ""
-
-#: lib/components/settings/sidebar/sidebar_settings_nav_live.sface:181
+#: lib/components/settings/instance/dashboard/instance_dashboard_live.sface:2
+#: lib/views/settings/instance_settings_live.ex:27
 #, elixir-autogen, elixir-format
 msgid "Instance Settings"
 msgstr ""
 
-#: lib/components/settings/admin/admin_live.sface:9
+#: lib/components/settings/instance/instance_old/admin_live.sface:11
+#: lib/components/settings/instance/preferences/instance_preferences_live.sface:153
 #, elixir-autogen, elixir-format
 msgid "Instance default theme"
 msgstr ""
 
-#: lib/components/settings/admin/instance_info_live.sface:89
-#, elixir-autogen, elixir-format
-msgid "Instance description"
-msgstr ""
-
-#: lib/components/settings/admin/instance_info_live.sface:9
+#: lib/components/settings/instance/preferences/instance_preferences_live.sface:82
 #, elixir-autogen, elixir-format
 msgid "Instance icon"
 msgstr ""
 
-#: lib/components/settings/admin/instance_info_live.sface:69
+#: lib/components/settings/instance/preferences/instance_preferences_live.sface:11
 #, elixir-autogen, elixir-format
-msgid "Instance name"
-msgstr ""
-
-#: lib/components/settings/admin/instance_info_live.sface:108
-#, elixir-autogen, elixir-format
-msgid "Instance welcome"
+msgid "Instance preferences"
 msgstr ""
 
 #: lib/views/confirm_email/confirm_email_live.sface:25
@@ -437,22 +534,23 @@ msgstr ""
 msgid "Invalid confirmation link. Please request a new one below."
 msgstr ""
 
-#: lib/components/settings/sidebar/sidebar_settings_nav_live.sface:225
+#: lib/components/settings/instance/dashboard/instance_dashboard_live.sface:74
 #, elixir-autogen, elixir-format
 msgid "Invites"
 msgstr ""
 
-#: lib/components/settings/user_preferences/preferences_live.sface:21
+#: lib/components/settings/instance/preferences/instance_preferences_live.sface:181
+#: lib/components/settings/preferences/preferences_live.sface:83
 #, elixir-autogen, elixir-format
 msgid "Language"
 msgstr ""
 
-#: lib/components/settings/admin/admin_live.sface:238
+#: lib/components/settings/instance/instance_old/admin_live.sface:234
 #, elixir-autogen, elixir-format
 msgid "Local-only"
 msgstr ""
 
-#: lib/components/settings/user_profile/edit_profile_live.sface:117
+#: lib/components/settings/profile/edit_profile_live.sface:116
 #, elixir-autogen, elixir-format
 msgid "Location"
 msgstr ""
@@ -470,41 +568,75 @@ msgstr ""
 msgid "Logged out successfully. Until next time!"
 msgstr ""
 
-#: lib/components/settings/sidebar/sidebar_settings_nav_live.sface:299
-#, elixir-autogen, elixir-format
-msgid "Logout"
-msgstr ""
-
-#: lib/components/settings/user_preferences/preferences_live.sface:9
-#, elixir-autogen, elixir-format
-msgid "Look and feel"
-msgstr ""
-
-#: lib/components/profile/profile_hero/profile_hero_full_live.sface:193
+#: lib/components/profile/profile_hero/profile_hero_full_live.sface:176
 #, elixir-autogen, elixir-format
 msgid "Make admin"
 msgstr ""
 
-#: lib/components/settings/admin/admin_live.sface:261
+#: lib/components/settings/instance/preferences/instance_preferences_live.sface:211
+#, elixir-autogen, elixir-format
+msgid "Make invite only"
+msgstr ""
+
+#: lib/components/settings/instance/instance_old/admin_live.sface:257
 #, elixir-autogen, elixir-format
 msgid "Make private content (except messages) searcheable by those allowed (based on boundaries)."
 msgstr ""
 
+#: lib/components/settings/instance/dashboard/instance_dashboard_live.sface:43
+#, elixir-autogen, elixir-format
+msgid "Manage roles and collaborators"
+msgstr ""
+
+#: lib/components/settings/instance/dashboard/instance_dashboard_live.sface:57
+#: lib/components/settings/instance/dashboard/instance_dashboard_live.sface:64
+#: lib/components/settings/instance/members/instance_members_live.sface:3
+#, elixir-autogen, elixir-format
+msgid "Members"
+msgstr ""
+
+#: lib/components/settings/dashboard/user_dashboard_live.sface:66
+#: lib/components/settings/instance/dashboard/instance_dashboard_live.sface:80
+#, elixir-autogen, elixir-format
+msgid "Moderation"
+msgstr ""
+
 #: lib/views/dashboard/logged_dashboard_live.ex:28
 #, elixir-autogen, elixir-format
 msgid "My feed"
 msgstr ""
 
+#: lib/components/settings/instance/preferences/instance_preferences_live.sface:20
+#, elixir-autogen, elixir-format
+msgid "Name & description"
+msgstr ""
+
+#: lib/components/settings/instance/dashboard/instance_dashboard_live.sface:32
+#: lib/components/settings/instance/navigation/instance_navigation_live.sface:3
+#, elixir-autogen, elixir-format
+msgid "Navigation"
+msgstr ""
+
 #: lib/views/change_password/change_password_live.sface:27
 #, elixir-autogen, elixir-format
 msgid "New password"
 msgstr ""
 
-#: lib/components/settings/admin/admin_live.sface:295
+#: lib/components/settings/instance/posts/instance_posts_live.sface:5
+#, elixir-autogen, elixir-format
+msgid "New post"
+msgstr ""
+
+#: lib/components/settings/instance/instance_old/admin_live.sface:291
 #, elixir-autogen, elixir-format
 msgid "New users and their content should appear in publicly in search engines (in Bonfire, the fediverse, and the web in general) by default (this can be overriden by each user)"
 msgstr ""
 
+#: lib/components/settings/instance/preferences/instance_preferences_live.sface:368
+#, elixir-autogen, elixir-format
+msgid "New users and their content should appear publicly in search engines (in Bonfire, the fediverse, and the web in general) by default (this can be overriden by each user)"
+msgstr ""
+
 #: lib/components/profile/profile_follows/profile_follows_live.sface:58
 #, elixir-autogen, elixir-format
 msgid "Nobody following"
@@ -515,23 +647,24 @@ msgstr ""
 msgid "Not following anyone"
 msgstr ""
 
-#: lib/views/profile/character_live.ex:61
+#: lib/views/profile/character_live.ex:74
 #, elixir-autogen, elixir-format
 msgid "Not found"
 msgstr ""
 
-#: lib/views/signup/signup_live.sface:16
+#: lib/views/signup/signup_live.sface:21
 #, elixir-autogen, elixir-format
 msgid "Now we need you to confirm your email address. We've emailed you a link (check your spam folder!). Please click on it to continue."
 msgstr ""
 
-#: lib/components/settings/admin/admin_live.sface:73
+#: lib/components/settings/instance/instance_old/admin_live.sface:69
+#: lib/components/settings/instance/preferences/instance_preferences_live.sface:212
 #, elixir-autogen, elixir-format
 msgid "Only people with a valid invite link can sign up to this instance."
 msgstr ""
 
-#: lib/components/settings/admin/instance_info_live.sface:55
-#: lib/components/settings/user_profile/edit_profile_live.sface:31
+#: lib/components/settings/instance/preferences/instance_preferences_live.sface:128
+#: lib/components/settings/profile/edit_profile_live.sface:64
 #, elixir-autogen, elixir-format
 msgid "PNG, JPG, GIF up to 10MB"
 msgstr ""
@@ -541,12 +674,22 @@ msgstr ""
 msgid "Password (Min 10 characters)"
 msgstr ""
 
+#: lib/components/settings/dashboard/user_dashboard_live.sface:90
+#, elixir-autogen, elixir-format
+msgid "People and instances who shouldn't see you"
+msgstr ""
+
+#: lib/components/settings/dashboard/user_dashboard_live.sface:103
+#, elixir-autogen, elixir-format
+msgid "People and instances you don't want to see"
+msgstr ""
+
 #: lib/views/create_user/create_user_controller.ex:40
 #, elixir-autogen, elixir-format
 msgid "Please double check your inputs... "
 msgstr ""
 
-#: lib/views/profile/profile_live.ex:132
+#: lib/views/profile/profile_live.ex:139
 #, elixir-autogen, elixir-format
 msgid "Please login first, and then... "
 msgstr ""
@@ -556,22 +699,22 @@ msgstr ""
 msgid "Please note they need to already be signed up on this instance."
 msgstr ""
 
-#: lib/components/settings/user_preferences/preferences_live.sface:52
+#: lib/components/settings/instance/posts/instance_posts_live.sface:3
 #, elixir-autogen, elixir-format
-msgid "Prefer compact layouts"
+msgid "Posts"
 msgstr ""
 
-#: lib/components/settings/user_preferences/preferences_live.sface:34
+#: lib/components/settings/dashboard/user_dashboard_live.sface:25
 #, elixir-autogen, elixir-format
-msgid "Preferred font"
+msgid "Preferences"
 msgstr ""
 
-#: lib/components/settings/admin/terms_live.sface:24
+#: lib/components/settings/instance/instance_old/terms_live.sface:62
 #, elixir-autogen, elixir-format
 msgid "Privacy Policy"
 msgstr ""
 
-#: lib/components/settings/admin/admin_live.sface:258
+#: lib/components/settings/instance/instance_old/admin_live.sface:254
 #, elixir-autogen, elixir-format
 msgid "Private activities"
 msgstr ""
@@ -581,32 +724,43 @@ msgstr ""
 msgid "Proceed to %{verb}"
 msgstr ""
 
-#: lib/components/settings/sidebar/sidebar_settings_nav_live.sface:19
+#: lib/components/settings/dashboard/user_dashboard_live.sface:12
 #, elixir-autogen, elixir-format
-msgid "Profile Info"
+msgid "Profile"
 msgstr ""
 
-#: lib/views/profile/profile_live.ex:143
+#: lib/views/profile/profile_live.ex:150
 #, elixir-autogen, elixir-format
 msgid "Profile not found"
 msgstr ""
 
-#: lib/components/settings/admin/admin_live.sface:218
+#: lib/components/settings/instance/instance_old/terms_live.sface:26
+#, elixir-autogen, elixir-format
+msgid "Protip: instead of text you can paste the URL of a remote markdown-formated document, and its contents will be pulled in."
+msgstr ""
+
+#: lib/components/settings/instance/preferences/instance_preferences_live.sface:74
+#, elixir-autogen, elixir-format
+msgid "Provide some visuals"
+msgstr ""
+
+#: lib/components/settings/instance/instance_old/admin_live.sface:214
 #, elixir-autogen, elixir-format
 msgid "Public content"
 msgstr ""
 
-#: lib/components/settings/admin/admin_live.sface:59
+#: lib/components/settings/instance/instance_old/admin_live.sface:55
+#: lib/components/settings/instance/preferences/instance_preferences_live.sface:353
 #, elixir-autogen, elixir-format
 msgid "Push local activities to the fediverse, and accept remote activities"
 msgstr ""
 
-#: lib/views/signup/signup_live.sface:62
+#: lib/views/signup/signup_live.sface:67
 #, elixir-autogen, elixir-format
 msgid "Read our code of conduct"
 msgstr ""
 
-#: lib/views/signup/signup_live.sface:99
+#: lib/views/signup/signup_live.sface:104
 #, elixir-autogen, elixir-format
 msgid "Read our privacy policy"
 msgstr ""
@@ -621,19 +775,24 @@ msgstr ""
 msgid "Request email confirmation link"
 msgstr ""
 
-#: lib/components/profile/profile_hero/profile_hero_full_live.sface:203
+#: lib/components/settings/dashboard/user_dashboard_live.sface:77
+#, elixir-autogen, elixir-format
+msgid "Review what you've flagged"
+msgstr ""
+
+#: lib/components/profile/profile_hero/profile_hero_full_live.sface:186
 #, elixir-autogen, elixir-format
 msgid "Revoke admin"
 msgstr ""
 
-#: lib/components/settings/sidebar/sidebar_settings_nav_live.sface:109
+#: lib/components/settings/instance/dashboard/instance_dashboard_live.sface:42
 #, elixir-autogen, elixir-format
-msgid "Safety"
+msgid "Roles"
 msgstr ""
 
-#: lib/components/settings/admin/instance_info_live.sface:134
-#: lib/components/settings/admin/terms_live.sface:38
-#: lib/components/settings/user_profile/edit_profile_live.sface:182
+#: lib/components/settings/instance/instance_old/terms_live.sface:10
+#: lib/components/settings/instance/preferences/instance_preferences_live.sface:60
+#: lib/components/settings/profile/edit_profile_live.sface:10
 #, elixir-autogen, elixir-format
 msgid "Save"
 msgstr ""
@@ -643,7 +802,7 @@ msgstr ""
 msgid "Send"
 msgstr ""
 
-#: lib/components/profile/profile_hero/profile_hero_full_live.sface:121
+#: lib/components/profile/profile_hero/profile_hero_full_live.sface:155
 #, elixir-autogen, elixir-format
 msgid "Send a message"
 msgstr ""
@@ -668,13 +827,14 @@ msgstr ""
 msgid "Share full access to this user identity (@%{username}) with the following users."
 msgstr ""
 
-#: lib/components/settings/admin/admin_live.sface:87
-#: lib/components/settings/user_preferences/preferences_live.sface:66
+#: lib/components/settings/instance/instance_old/admin_live.sface:83
 #, elixir-autogen, elixir-format
 msgid "Show followed topics in the sidebar"
 msgstr ""
 
-#: lib/components/settings/admin/admin_live.sface:102
+#: lib/components/settings/instance/instance_old/admin_live.sface:98
+#: lib/components/settings/instance/preferences/instance_preferences_live.sface:228
+#: lib/components/settings/instance/preferences/instance_preferences_live.sface:229
 #, elixir-autogen, elixir-format
 msgid "Show list of admins on public homepage"
 msgstr ""
@@ -707,29 +867,25 @@ msgid "Submit"
 msgstr ""
 
 #: lib/components/create_user/create_user_view_live.sface:31
-#: lib/views/switch_user/switch_user_live.ex:25
+#: lib/views/switch_user/switch_user_live.ex:26
 #, elixir-autogen, elixir-format
 msgid "Switch user profile"
 msgstr ""
 
-#: lib/components/settings/sidebar/sidebar_settings_nav_live.sface:87
-#, elixir-autogen, elixir-format
-msgid "Team Profiles"
-msgstr ""
-
-#: lib/components/create_user/create_user_view_live.sface:86
+#: lib/components/create_user/create_user_view_live.sface:94
 #, elixir-autogen, elixir-format
 msgid "Tell people a bit about yourself"
 msgstr ""
 
-#: lib/components/settings/sidebar/sidebar_settings_nav_live.sface:206
+#: lib/components/settings/instance/dashboard/instance_dashboard_live.sface:52
+#: lib/components/settings/instance/instance_old/terms_live.sface:8
 #, elixir-autogen, elixir-format
 msgid "Terms / Policies"
 msgstr ""
 
-#: lib/components/settings/admin/terms_live.sface:9
+#: lib/components/settings/instance/instance_old/terms_live.sface:35
 #, elixir-autogen, elixir-format
-msgid "Terms of Use"
+msgid "Terms of Use / Code of Conduct"
 msgstr ""
 
 #: lib/views/forgot_password/forgot_password_controller.ex:29
@@ -745,11 +901,28 @@ msgstr ""
 msgid "That page is only accessible to instance administrators."
 msgstr ""
 
+#: lib/components/settings/instance/preferences/instance_preferences_live.sface:31
+#, elixir-autogen, elixir-format
+msgid "The name of your instance"
+msgstr ""
+
+#: lib/components/settings/instance/instance_old/terms_live.sface:43
+#: lib/components/settings/instance/instance_old/terms_live.sface:70
+#, elixir-autogen, elixir-format
+msgid "The terms of use that will be in place in your instance"
+msgstr ""
+
 #: lib/views/users_directory/users_directory_live.ex:51
 #, elixir-autogen, elixir-format
 msgid "The user directory is disabled on this instance"
 msgstr ""
 
+#: lib/components/settings/instance/preferences/instance_preferences_live.sface:142
+#: lib/components/settings/preferences/preferences_live.sface:16
+#, elixir-autogen, elixir-format
+msgid "Theme & font"
+msgstr ""
+
 #: lib/components/login/login_view_live.sface:51
 #, elixir-autogen, elixir-format
 msgid "There was an error"
@@ -780,7 +953,7 @@ msgstr ""
 msgid "This information will be displayed publicly so be careful what you share."
 msgstr ""
 
-#: lib/views/signup/signup_live.sface:36
+#: lib/views/signup/signup_live.sface:41
 #, elixir-autogen, elixir-format
 msgid "This instance is currently invite-only."
 msgstr ""
@@ -790,6 +963,11 @@ msgstr ""
 msgid "This username has already been taken. Please choose another. Did you mean to"
 msgstr ""
 
+#: lib/components/profile/profile_hero/profile_hero_full_live.sface:206
+#, elixir-autogen, elixir-format
+msgid "Timeline"
+msgstr ""
+
 #: lib/components/signup/signup_form_live.sface:67
 #, elixir-autogen, elixir-format
 msgid "Type a strong password"
@@ -816,27 +994,22 @@ msgstr ""
 msgid "Unable to change your password. Try entering your old password correctly..."
 msgstr ""
 
-#: lib/components/settings/user_profile/edit_profile_live.sface:22
+#: lib/components/settings/profile/edit_profile_live.sface:55
 #, elixir-autogen, elixir-format
 msgid "Upload a background image"
 msgstr ""
 
-#: lib/components/settings/admin/instance_info_live.sface:44
+#: lib/components/settings/instance/preferences/instance_preferences_live.sface:117
 #, elixir-autogen, elixir-format
 msgid "Upload an image"
 msgstr ""
 
-#: lib/components/settings/user_profile/edit_profile_live.sface:52
+#: lib/components/settings/profile/edit_profile_live.sface:85
 #, elixir-autogen, elixir-format
 msgid "Upload or drop"
 msgstr ""
 
-#: lib/components/settings/sidebar/sidebar_settings_nav_live.sface:3
-#, elixir-autogen, elixir-format
-msgid "User"
-msgstr ""
-
-#: lib/components/settings/sidebar/sidebar_settings_nav_live.sface:34
+#: lib/components/settings/preferences/preferences_live.sface:9
 #, elixir-autogen, elixir-format
 msgid "User Preferences"
 msgstr ""
@@ -846,16 +1019,19 @@ msgstr ""
 msgid "User timeline"
 msgstr ""
 
-#: lib/components/settings/admin/admin_live.sface:157
+#: lib/components/settings/instance/instance_old/admin_live.sface:153
+#: lib/components/settings/instance/preferences/instance_preferences_live.sface:304
 #, elixir-autogen, elixir-format
 msgid "Users"
 msgstr ""
 
+#: lib/components/settings/instance/members/instance_members_live.ex:21
 #: lib/views/users_directory/users_directory_live.ex:41
 #, elixir-autogen, elixir-format
 msgid "Users directory"
 msgstr ""
 
+#: lib/components/settings/instance/members/instance_members_live.ex:20
 #: lib/views/users_directory/users_directory_live.ex:40
 #, elixir-autogen, elixir-format
 msgid "Users directory (%{total})"
@@ -866,7 +1042,17 @@ msgstr ""
 msgid "Verification code (optional)"
 msgstr ""
 
-#: lib/components/profile/profile_hero/profile_hero_full_live.sface:134
+#: lib/components/settings/instance/posts/instance_posts_live.sface:24
+#, elixir-autogen, elixir-format
+msgid "View"
+msgstr ""
+
+#: lib/components/settings/instance/dashboard/instance_dashboard_live.sface:121
+#, elixir-autogen, elixir-format
+msgid "View system event log"
+msgstr ""
+
+#: lib/components/profile/profile_hero/profile_hero_full_live.sface:166
 #, elixir-autogen, elixir-format
 msgid "Visit the original url"
 msgstr ""
@@ -876,7 +1062,7 @@ msgstr ""
 msgid "Warning!"
 msgstr ""
 
-#: lib/components/settings/user_profile/edit_profile_live.sface:103
+#: lib/components/settings/profile/edit_profile_live.sface:102
 #, elixir-autogen, elixir-format
 msgid "Website"
 msgstr ""
@@ -902,17 +1088,32 @@ msgstr ""
 msgid "Welcome back, %{name}!"
 msgstr ""
 
-#: lib/components/settings/admin/admin_live.sface:182
+#: lib/components/settings/instance/instance_old/admin_live.sface:178
+#: lib/components/settings/instance/preferences/instance_preferences_live.sface:332
+#: lib/components/settings/instance/preferences/instance_preferences_live.sface:339
+#: lib/components/settings/preferences/preferences_live.sface:109
+#: lib/components/settings/preferences/preferences_live.sface:116
 #, elixir-autogen, elixir-format
 msgid "What activities to include in home feeds by default"
 msgstr ""
 
-#: lib/components/settings/user_preferences/preferences_live.sface:72
+#: lib/components/settings/shared_user/shared_user_live.sface:31
 #, elixir-autogen, elixir-format
-msgid "What activities to include in my home feed"
+msgid "What kind of team or organisation is it?"
 msgstr ""
 
-#: lib/components/settings/admin/admin_live.sface:122
+#: lib/components/settings/instance/preferences/instance_preferences_live.sface:182
+#, elixir-autogen, elixir-format
+msgid "What language do most new users understand?"
+msgstr ""
+
+#: lib/components/settings/preferences/preferences_live.sface:84
+#, elixir-autogen, elixir-format
+msgid "What language do you want your interface to speak?"
+msgstr ""
+
+#: lib/components/settings/instance/instance_old/admin_live.sface:118
+#: lib/components/settings/instance/preferences/instance_preferences_live.sface:265
 #, elixir-autogen, elixir-format
 msgid "Who can see the list of local users?"
 msgstr ""
@@ -927,7 +1128,7 @@ msgstr ""
 msgid "You can have multiple user profiles for different online identities, or for your organizations or projects."
 msgstr ""
 
-#: lib/views/signup/signup_live.sface:20
+#: lib/views/signup/signup_live.sface:25
 #, elixir-autogen, elixir-format
 msgid "You can now log in."
 msgstr ""
@@ -937,13 +1138,18 @@ msgstr ""
 msgid "You can only identify as valid users in your account."
 msgstr ""
 
-#: lib/components/settings/admin/admin_live.sface:302
-#: lib/components/settings/admin/terms_live.sface:45
+#: lib/components/settings/profile/edit_profile_live.sface:36
+#, elixir-autogen, elixir-format
+msgid "You can use markdown formatting."
+msgstr ""
+
+#: lib/components/settings/instance/instance_old/admin_live.sface:298
+#: lib/components/settings/instance/instance_old/terms_live.sface:88
 #, elixir-autogen, elixir-format
 msgid "You don't have permission to configure the instance, sorry!"
 msgstr ""
 
-#: lib/components/settings/admin/instance_info_live.sface:139
+#: lib/components/settings/instance/preferences/instance_preferences_live.sface:376
 #, elixir-autogen, elixir-format
 msgid "You don't have permission to describe the instance, sorry!"
 msgstr ""
@@ -991,7 +1197,7 @@ msgstr ""
 msgid "Your profile"
 msgstr ""
 
-#: lib/components/settings/user_profile/edit_profile_live.sface:54
+#: lib/components/settings/profile/edit_profile_live.sface:87
 #, elixir-autogen, elixir-format
 msgid "avatar"
 msgstr ""
@@ -1002,6 +1208,11 @@ msgstr ""
 msgid "follow"
 msgstr ""
 
+#: lib/components/settings/shared_user/shared_user_live.sface:40
+#, elixir-autogen, elixir-format
+msgid "for example: Team, Cooperative, Non-profit Organisation, or Moderation Team, ..."
+msgstr ""
+
 #: lib/components/create_user/create_user_view_live.sface:31
 #, elixir-autogen, elixir-format
 msgid "login"
@@ -1012,8 +1223,8 @@ msgstr ""
 msgid "or"
 msgstr ""
 
-#: lib/components/settings/admin/instance_info_live.sface:47
-#: lib/components/settings/user_profile/edit_profile_live.sface:23
+#: lib/components/settings/instance/preferences/instance_preferences_live.sface:120
+#: lib/components/settings/profile/edit_profile_live.sface:56
 #, elixir-autogen, elixir-format
 msgid "or drag and drop"
 msgstr ""
@@ -1027,3 +1238,8 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "signup"
 msgstr ""
+
+#: lib/components/settings/instance/dashboard/instance_dashboard_live.sface:5
+#, elixir-autogen, elixir-format
+msgid "website"
+msgstr ""
diff --git a/priv/localisation/bonfire_ui_social.po b/priv/localisation/bonfire_ui_social.po
index e97274421b..dcd1df007b 100644
--- a/priv/localisation/bonfire_ui_social.po
+++ b/priv/localisation/bonfire_ui_social.po
@@ -10,83 +10,70 @@
 msgid ""
 msgstr ""
 
-#: lib/components/activity/actions/flagged_actions_live.sface:35
-#: lib/components/activity/actions/more_actions_live.sface:136
+#: lib/components/activity/actions/more_actions_live.sface:88
+#, elixir-autogen, elixir-format
+msgid "%{activity_verb} from feeds"
+msgstr ""
+
+#: lib/components/activity/actions/delete_object_live.sface:14
 #, elixir-autogen, elixir-format
 msgid "A request will be sent to remote instances to delete it as well."
 msgstr ""
 
-#: lib/live_handlers/feeds_live_handler.ex:378
+#: lib/live_handlers/feeds_live_handler.ex:396
 #, elixir-autogen, elixir-format
 msgid "Activities from around the fediverse"
 msgstr ""
 
-#: lib/live_handlers/feeds_live_handler.ex:403
+#: lib/live_handlers/feeds_live_handler.ex:421
 #, elixir-autogen, elixir-format
 msgid "Activities on this instance"
 msgstr ""
 
-#: lib/components/activity/object/intent/intent_task_live.sface:52
-#, elixir-autogen, elixir-format
-msgid "Assigned"
-msgstr ""
-
 #: lib/components/thread/thread_live.sface:75
 #, elixir-autogen, elixir-format
-msgid "Be the first to reply..."
+msgid "Be the first to reply"
 msgstr ""
 
-#: lib/components/settings/my_feed_items_live.sface:20
+#: lib/components/settings/my_feed_items_live.sface:16
 #, elixir-autogen, elixir-format
 msgid "Boosts"
 msgstr ""
 
+#: lib/components/messages/message_threads_live.sface:3
+#, elixir-autogen, elixir-format
+msgid "Chats"
+msgstr ""
+
 #: lib/components/messages/sidebar_messages_mobile_live.sface:49
 #, elixir-autogen, elixir-format
 msgid "Close menu"
 msgstr ""
 
-#: lib/components/activity/object/intent/intent_task_live.sface:67
 #: lib/components/activity/object/process/process_reflow/process_reflow_live.sface:31
 #, elixir-autogen, elixir-format
 msgid "Completed"
 msgstr ""
 
-#: lib/views/threads/write_live.ex:6
-#, elixir-autogen, elixir-format
-msgid "Compose"
-msgstr ""
-
-#: lib/views/messages/messages_live.ex:47
-#: lib/views/messages/messages_live.ex:120
+#: lib/views/messages/messages_live.ex:46
+#: lib/views/messages/messages_live.ex:130
 #, elixir-autogen, elixir-format
 msgid "Compose a thoughtful message..."
 msgstr ""
 
-#: lib/views/messages/messages_live.ex:224
+#: lib/views/messages/messages_live.ex:234
 #, elixir-autogen, elixir-format
 msgid "Compose a thoughtful response"
 msgstr ""
 
-#: lib/views/messages/messages_live.ex:227
+#: lib/views/messages/messages_live.ex:237
 #, elixir-autogen, elixir-format
 msgid "Conversation"
 msgstr ""
 
-#: lib/components/nav_sidebar/sidebar_navigation_items_live.sface:8
-#: lib/components/nav_sidebar/sidebar_navigation_items_live.sface:24
-#: lib/components/nav_sidebar/sidebar_navigation_items_live.sface:40
-#: lib/components/nav_sidebar/sidebar_navigation_items_live.sface:56
-#, elixir-autogen, elixir-format
-msgid "Current Page:"
-msgstr ""
-
-#: lib/components/activity/actions/flagged_actions_live.sface:33
-#: lib/components/activity/actions/flagged_actions_live.sface:38
-#: lib/components/activity/actions/flagged_actions_live.sface:48
-#: lib/components/activity/actions/more_actions_live.sface:133
-#: lib/components/activity/actions/more_actions_live.sface:141
-#: lib/components/activity/actions/more_actions_live.sface:152
+#: lib/components/activity/actions/delete_object_live.sface:11
+#: lib/components/activity/actions/delete_object_live.sface:20
+#: lib/components/activity/actions/delete_object_live.sface:33
 #, elixir-autogen, elixir-format
 msgid "Delete this"
 msgstr ""
@@ -101,7 +88,12 @@ msgstr ""
 msgid "Deleted!"
 msgstr ""
 
-#: lib/components/smart_input/write/write_post_content_live.sface:51
+#: lib/components/activity/actions/more_actions_live.sface:90
+#, elixir-autogen, elixir-format
+msgid "Deleting from feeds means this %{verb} and this %{object} still exist, but this activity won't be discoverable via the local instance's feeds. Remote feeds won't be affected."
+msgstr ""
+
+#: lib/components/smart_input/write/write_post_content_live.sface:53
 #, elixir-autogen, elixir-format
 msgid "Description"
 msgstr ""
@@ -112,123 +104,123 @@ msgid "Did you know you can customise which activities you want to be notified f
 msgstr ""
 
 #: lib/components/messages/sidebar_messages_mobile_live.sface:68
-#: lib/views/messages/messages_live.ex:144
-#: lib/views/messages/messages_live.ex:276
+#: lib/views/messages/messages_live.ex:154
+#: lib/views/messages/messages_live.ex:277
 #, elixir-autogen, elixir-format
 msgid "Direct Messages"
 msgstr ""
 
-#: lib/components/activity/actions/actions_live.sface:25
-#: lib/components/object_with_thread/object_thread_live.sface:23
-#: lib/live_handlers/objects_live_handler.ex:124
-#: lib/live_handlers/objects_live_handler.ex:163
+#: lib/components/activity/actions/actions_live.sface:26
+#: lib/components/activity/actions/actions_live.sface:42
+#: lib/live_handlers/objects_live_handler.ex:129
+#: lib/live_handlers/objects_live_handler.ex:182
 #: lib/views/threads/discussion_live.ex:22
 #, elixir-autogen, elixir-format
 msgid "Discussion"
 msgstr ""
 
-#: lib/components/object_with_thread/object_header_aside/object_header_aside_live.sface:10
-#: lib/components/object_with_thread/object_header_aside/object_header_aside_live.sface:18
+#: lib/views/feeds/feeds_live.ex:23
+#, elixir-autogen, elixir-format
+msgid "Discussions"
+msgstr ""
+
+#: lib/components/object_with_thread/object_header_aside/object_header_aside_live.sface:27
+#: lib/components/object_with_thread/object_header_aside/object_header_aside_live.sface:35
 #, elixir-autogen, elixir-format
 msgid "Edit the thread title"
 msgstr ""
 
 #: lib/components/smart_input/write/old/set_cw_live.sface:5
-#: lib/components/smart_input/write/write_post_content_live.sface:42
+#: lib/components/smart_input/write/write_post_content_live.sface:47
 #, elixir-autogen, elixir-format
 msgid "Enter a content warning"
 msgstr ""
 
-#: lib/views/messages/messages_live.sface:60
+#: lib/views/messages/messages_live.sface:57
 #, elixir-autogen, elixir-format
 msgid "Enter an optional subject"
 msgstr ""
 
-#: lib/components/activity/activity_live.ex:221
-#, elixir-autogen, elixir-format
-msgid "Expand"
-msgstr ""
-
-#: lib/components/nav_sidebar/sidebar_navigation_items_live.sface:58
-#: lib/views/feeds/likes/likes_live.ex:5
+#: lib/live_handlers/feeds_live_handler.ex:439
 #, elixir-autogen, elixir-format
 msgid "Favourites"
 msgstr ""
 
 #: lib/components/feeds/header_aside_feeds_live.sface:34
-#: lib/components/nav_sidebar/sidebar_navigation_items_live.sface:42
-#: lib/components/widgets/widget_timelines/widget_timelines_live.sface:74
 #, elixir-autogen, elixir-format
 msgid "Federated"
 msgstr ""
 
-#: lib/live_handlers/feeds_live_handler.ex:377
+#: lib/live_handlers/feeds_live_handler.ex:395
 #, elixir-autogen, elixir-format
 msgid "Federated activities from remote instances"
 msgstr ""
 
-#: lib/views/feeds/federation/federation_live.ex:26
+#: lib/views/_deprecated/federation/federation_live.ex:29
 #, elixir-autogen, elixir-format
 msgid "Federation"
 msgstr ""
 
-#: lib/components/activity/actions/more_actions_live.sface:81
+#: lib/views/feeds/feeds_live.ex:20
+#, elixir-autogen, elixir-format
+msgid "Feeds"
+msgstr ""
+
+#: lib/components/activity/actions/more_actions_live.sface:60
 #, elixir-autogen, elixir-format
 msgid "Flag "
 msgstr ""
 
-#: lib/components/activity/actions/more_actions_live.sface:68
+#: lib/components/activity/actions/more_actions_live.sface:50
 #, elixir-autogen, elixir-format
 msgid "Flag this"
 msgstr ""
 
-#: lib/components/settings/my_feed_items_live.sface:24
+#: lib/components/settings/my_feed_items_live.sface:20
 #, elixir-autogen, elixir-format
 msgid "Follows"
 msgstr ""
 
 #: lib/components/feeds/header_aside_feeds_live.sface:15
-#: lib/components/widgets/widget_timelines/widget_timelines_live.sface:17
 #, elixir-autogen, elixir-format
 msgid "Home"
 msgstr ""
 
-#: lib/live_handlers/feeds_live_handler.ex:406
+#: lib/live_handlers/feeds_live_handler.ex:424
 #, elixir-autogen, elixir-format
 msgid "It seems like the paint is still fresh on this instance..."
 msgstr ""
 
-#: lib/live_handlers/feeds_live_handler.ex:381
+#: lib/live_handlers/feeds_live_handler.ex:399
 #, elixir-autogen, elixir-format
 msgid "It seems you and other local users do not follow anyone on a different federated instance"
 msgstr ""
 
+#: lib/components/feeds/feed_live.sface:10
+#, elixir-autogen, elixir-format
+msgid "Liked"
+msgstr ""
+
 #: lib/components/thread/load_previous_live.sface:9
 #, elixir-autogen, elixir-format
 msgid "Load previous comments"
 msgstr ""
 
-#: lib/components/feeds/feed_live.sface:2609
+#: lib/components/feeds/feed_live.sface:2622
 #, elixir-autogen, elixir-format
 msgid "Loading..."
 msgstr ""
 
+#: lib/components/feeds/feed_live.sface:10
+#: lib/components/feeds/feed_live.sface:11
 #: lib/components/feeds/header_aside_feeds_live.sface:24
-#: lib/components/nav_sidebar/sidebar_navigation_items_live.sface:26
-#: lib/components/widgets/widget_timelines/widget_timelines_live.sface:50
-#: lib/live_handlers/feeds_live_handler.ex:402
-#: lib/views/feeds/local/local_live.ex:6
-#: lib/views/feeds/local/local_live.ex:29
+#: lib/live_handlers/feeds_live_handler.ex:420
+#: lib/views/_deprecated/local/local_live.ex:31
 #, elixir-autogen, elixir-format
 msgid "Local"
 msgstr ""
 
-#: lib/components/widgets/widget_timelines/widget_timelines_live.sface:28
-#, elixir-autogen, elixir-format
-msgid "Login"
-msgstr ""
-
-#: lib/components/feeds/header_aside_notifications_seen_live.sface:6
+#: lib/components/feeds/header_aside_notifications_seen_live.sface:9
 #, elixir-autogen, elixir-format
 msgid "Mark all as read"
 msgstr ""
@@ -239,45 +231,32 @@ msgstr ""
 msgid "Message"
 msgstr ""
 
-#: lib/components/messages/message_threads_live.sface:18
-#, elixir-autogen, elixir-format
-msgid "Message threads"
-msgstr ""
-
-#: lib/components/settings/my_feed_items_live.sface:39
-#: lib/views/messages/messages_live.ex:8
+#: lib/components/settings/my_feed_items_live.sface:35
 #: lib/views/messages/messages_live.ex:34
-#: lib/views/messages/messages_live.ex:115
+#: lib/views/messages/messages_live.ex:125
 #, elixir-autogen, elixir-format
 msgid "Messages"
 msgstr ""
 
-#: lib/components/activity/activity_live.ex:222
-#, elixir-autogen, elixir-format
-msgid "Minimize"
-msgstr ""
-
-#: lib/components/activity/actions/more_actions_live.sface:4
-#, elixir-autogen, elixir-format
-msgid "More"
-msgstr ""
-
-#: lib/views/feeds/likes/likes_live.ex:36
+#: lib/views/_deprecated/likes/likes_live.ex:51
 #, elixir-autogen, elixir-format
 msgid "My Favourites"
 msgstr ""
 
-#: lib/components/nav_sidebar/sidebar_navigation_dropdown_live.sface:13
-#: lib/components/nav_sidebar/sidebar_navigation_items_live.sface:10
-#: lib/live_handlers/feeds_live_handler.ex:356
-#: lib/live_handlers/feeds_live_handler.ex:357
-#: lib/views/feeds/feeds_live.ex:17
-#: lib/views/feeds/feeds_live.ex:38
+#: lib/live_handlers/feeds_live_handler.ex:440
+#, elixir-autogen, elixir-format
+msgid "My favourites"
+msgstr ""
+
+#: lib/components/feeds/feed_live.sface:10
+#: lib/live_handlers/feeds_live_handler.ex:375
+#: lib/live_handlers/feeds_live_handler.ex:376
+#: lib/views/feeds/feeds_live.ex:48
 #, elixir-autogen, elixir-format
 msgid "My feed"
 msgstr ""
 
-#: lib/components/settings/my_feed_items_live.sface:27
+#: lib/components/settings/my_feed_items_live.sface:23
 #, elixir-autogen, elixir-format
 msgid "My own activities"
 msgstr ""
@@ -287,48 +266,38 @@ msgstr ""
 msgid "Name updated!"
 msgstr ""
 
-#: lib/components/messages/message_threads_live.sface:7
-#, elixir-autogen, elixir-format
-msgid "New message"
-msgstr ""
-
-#: lib/components/activity/object/intent/intent_task_live.sface:98
+#: lib/components/activity/object/intent/intent_task_live.sface:79
 #, elixir-autogen, elixir-format
 msgid "No due date"
 msgstr ""
 
-#: lib/views/messages/messages_live.ex:44
+#: lib/views/messages/messages_live.ex:43
 #, elixir-autogen, elixir-format
 msgid "No messages"
 msgstr ""
 
-#: lib/components/thread/thread_live.sface:76
+#: lib/components/thread/thread_live.sface:81
 #, elixir-autogen, elixir-format
 msgid "No replies yet..."
 msgstr ""
 
-#: lib/components/widgets/widget_tags/widget_tags_live.sface:58
-#, elixir-autogen, elixir-format
-msgid "No trending tags found"
-msgstr ""
-
-#: lib/live_handlers/objects_live_handler.ex:172
+#: lib/live_handlers/objects_live_handler.ex:164
+#: lib/live_handlers/objects_live_handler.ex:197
 #, elixir-autogen, elixir-format
 msgid "Not found"
 msgstr ""
 
-#: lib/views/messages/messages_live.ex:263
+#: lib/views/messages/messages_live.ex:264
 #, elixir-autogen, elixir-format
 msgid "Not found (or you don't have permission to view this message)"
 msgstr ""
 
-#: lib/components/settings/my_feed_items_live.sface:33
+#: lib/components/settings/my_feed_items_live.sface:29
 #: lib/views/feeds/notifications/notifications_live.ex:33
 #, elixir-autogen, elixir-format
 msgid "Notifications"
 msgstr ""
 
-#: lib/components/activity/object/intent/intent_task_live.sface:43
 #: lib/components/activity/object/process/process_reflow/process_reflow_live.sface:33
 #, elixir-autogen, elixir-format
 msgid "Open"
@@ -340,8 +309,23 @@ msgstr ""
 msgid "Originates from a remote instance"
 msgstr ""
 
-#: lib/live_handlers/objects_live_handler.ex:133
-#: lib/live_handlers/objects_live_handler.ex:144
+#: lib/components/activity/actions/pin/pin_action_live.sface:56
+#, elixir-autogen, elixir-format
+msgid "Pin to instance"
+msgstr ""
+
+#: lib/components/activity/actions/pin/pin_action_live.sface:56
+#, elixir-autogen, elixir-format
+msgid "Pin to your profile"
+msgstr ""
+
+#: lib/live_handlers/pins_live_handler.ex:68
+#, elixir-autogen, elixir-format
+msgid "Pinned!"
+msgstr ""
+
+#: lib/live_handlers/objects_live_handler.ex:138
+#: lib/live_handlers/objects_live_handler.ex:149
 #: lib/views/threads/post_live.ex:23
 #, elixir-autogen, elixir-format
 msgid "Post"
@@ -352,55 +336,55 @@ msgstr ""
 msgid "Posted!"
 msgstr ""
 
-#: lib/components/settings/my_feed_items_live.sface:6
+#: lib/views/feeds/feeds_live.ex:21
+#, elixir-autogen, elixir-format
+msgid "Posts"
+msgstr ""
+
+#: lib/components/settings/my_feed_items_live.sface:2
 #, elixir-autogen, elixir-format
 msgid "Posts and other activities from followed people"
 msgstr ""
 
-#: lib/components/activity/subject/subject_minimal_live.sface:124
+#: lib/components/activity/subject/subject_minimal_live.sface:128
 #, elixir-autogen, elixir-format
 msgid "Published in"
 msgstr ""
 
-#: lib/components/activity/actions/actions_live.sface:24
+#: lib/components/activity/actions/actions_live.sface:25
 #, elixir-autogen, elixir-format
 msgid "Read discussion"
 msgstr ""
 
-#: lib/views/feeds/federation/federation_live.ex:6
+#: lib/components/feeds/feed_live.sface:10
+#: lib/components/feeds/feed_live.sface:11
 #, elixir-autogen, elixir-format
 msgid "Remote"
 msgstr ""
 
-#: lib/components/settings/my_feed_items_live.sface:22
+#: lib/components/settings/my_feed_items_live.sface:18
 #, elixir-autogen, elixir-format
 msgid "Replies"
 msgstr ""
 
 #: lib/components/activity/actions/reply/reply_live.sface:7
-#: lib/components/activity/actions/reply/reply_live.sface:56
 #: lib/components/activity/actions/reply/reply_live.sface:64
-#: lib/live_handlers/objects_live_handler.ex:66
+#: lib/live_handlers/objects_live_handler.ex:70
 #, elixir-autogen, elixir-format
 msgid "Reply"
 msgstr ""
 
-#: lib/views/messages/messages_live.ex:185
-#, elixir-autogen, elixir-format
-msgid "Reply to message:"
-msgstr ""
-
-#: lib/views/threads/discussion_live.ex:29
+#: lib/views/threads/discussion_live.ex:28
 #, elixir-autogen, elixir-format
 msgid "Reply to this discussion"
 msgstr ""
 
-#: lib/views/threads/post_live.ex:28
+#: lib/views/threads/post_live.ex:27
 #, elixir-autogen, elixir-format
 msgid "Reply to this thread"
 msgstr ""
 
-#: lib/components/object_with_thread/object_header_aside/object_header_aside_live.sface:24
+#: lib/components/object_with_thread/object_header_aside/object_header_aside_live.sface:41
 #, elixir-autogen, elixir-format
 msgid "Save"
 msgstr ""
@@ -410,93 +394,84 @@ msgstr ""
 msgid "See discussion"
 msgstr ""
 
-#: lib/views/messages/messages_live.ex:45
+#: lib/views/messages/messages_live.ex:44
 #, elixir-autogen, elixir-format
 msgid "Select a thread or start a new one..."
 msgstr ""
 
-#: lib/live_handlers/messages_live_handler.ex:106
-#: lib/live_handlers/messages_live_handler.ex:113
+#: lib/live_handlers/messages_live_handler.ex:109
+#: lib/live_handlers/messages_live_handler.ex:116
 #, elixir-autogen, elixir-format
 msgid "Sent!"
 msgstr ""
 
+#: lib/views/threads/write_live.ex:29
+#, elixir-autogen, elixir-format
+msgid "Share a feedback"
+msgstr ""
+
 #: lib/live_handlers/posts_live_handler.ex:96
 #, elixir-autogen, elixir-format
 msgid "Show"
 msgstr ""
 
-#: lib/components/activity/object/note/note_live.sface:43
+#: lib/components/activity/object/note/note_live.sface:48
 #, elixir-autogen, elixir-format
 msgid "Show less"
 msgstr ""
 
-#: lib/components/activity/object/note/note_live.sface:35
+#: lib/components/activity/object/note/note_live.sface:40
 #, elixir-autogen, elixir-format
 msgid "Show more"
 msgstr ""
 
-#: lib/components/widgets/widget_timelines/widget_timelines_live.sface:39
-#, elixir-autogen, elixir-format
-msgid "Signup"
-msgstr ""
-
-#: lib/components/nav_sidebar/sidebar_navigation_live.sface:1
-#, elixir-autogen, elixir-format
-msgid "Social navigation"
-msgstr ""
-
 #: lib/live_handlers/feeds_live_handler.ex:89
 #, elixir-autogen, elixir-format
 msgid "Sorry, you cannot reply to this"
 msgstr ""
 
-#: lib/live_handlers/objects_live_handler.ex:169
+#: lib/live_handlers/objects_live_handler.ex:161
+#: lib/live_handlers/objects_live_handler.ex:194
 #, elixir-autogen, elixir-format
 msgid "Sorry, you don't have permission to view this %{thing}"
 msgstr ""
 
-#: lib/components/activity/actions/more_actions_live.sface:54
-#, elixir-autogen, elixir-format
-msgid "Tag"
-msgstr ""
-
-#: lib/components/activity/actions/more_actions_live.sface:29
-#: lib/components/activity/actions/more_actions_live.sface:48
-#, elixir-autogen, elixir-format
-msgid "Tag with topic(s)"
-msgstr ""
-
 #: lib/live_handlers/objects_live_handler.ex:31
 #, elixir-autogen, elixir-format
 msgid "Tagged!"
 msgstr ""
 
-#: lib/components/thread/comment_live.sface:77
+#: lib/components/activity/actions/actions_live.sface:50
+#: lib/components/activity/actions/actions_live.sface:57
+#, elixir-autogen, elixir-format
+msgid "Task"
+msgstr ""
+
+#: lib/components/thread/comment_live.sface:79
 #, elixir-autogen, elixir-format
 msgid "This comment was deleted."
 msgstr ""
 
-#: lib/components/activity/object/note/note_live.sface:71
+#: lib/components/activity/object/note/note_live.sface:80
 #, elixir-autogen, elixir-format
 msgid "This post has been deleted."
 msgstr ""
 
-#: lib/components/smart_input/write/write_post_content_live.sface:38
+#: lib/components/smart_input/write/write_post_content_live.sface:43
 #, elixir-autogen, elixir-format
 msgid "Title"
 msgstr ""
 
-#: lib/components/widgets/widget_tags/widget_tags_live.sface:3
-#, elixir-autogen, elixir-format
-msgid "Trending topics"
-msgstr ""
-
-#: lib/components/activity/actions/flagged_actions_live.sface:59
+#: lib/components/activity/actions/flagged_actions_live.sface:42
 #, elixir-autogen, elixir-format
 msgid "Unflag this"
 msgstr ""
 
+#: lib/live_handlers/pins_live_handler.ex:68
+#, elixir-autogen, elixir-format
+msgid "Unpinned"
+msgstr ""
+
 #: lib/components/activity/object/unknown/unknown_live.sface:19
 #, elixir-autogen, elixir-format
 msgid "Unsupported type or deleted object"
@@ -507,29 +482,29 @@ msgstr ""
 msgid "Untitled task"
 msgstr ""
 
-#: lib/views/messages/messages_live.ex:132
+#: lib/views/messages/messages_live.ex:142
 #, elixir-autogen, elixir-format
 msgid "User not found"
 msgstr ""
 
-#: lib/components/settings/my_feed_items_live.sface:27
+#: lib/components/settings/my_feed_items_live.sface:23
 #, elixir-autogen, elixir-format
 msgid "User's own activities"
 msgstr ""
 
-#: lib/components/widgets/widget_timelines/widget_timelines_live.sface:61
-#, elixir-autogen, elixir-format
-msgid "Users directory"
-msgstr ""
-
-#: lib/components/activity/actions/actions_live.sface:54
+#: lib/components/activity/actions/actions_live.sface:66
 #, elixir-autogen, elixir-format
 msgid "View"
 msgstr ""
 
-#: lib/components/activity/media/media_live.sface:37
-#: lib/components/activity/media/media_live.sface:120
-#: lib/components/activity/media/media_live.sface:166
+#: lib/components/activity/actions/actions_live.sface:62
+#, elixir-autogen, elixir-format
+msgid "View list"
+msgstr ""
+
+#: lib/components/activity/media/media_live.sface:41
+#: lib/components/activity/media/media_live.sface:98
+#: lib/components/activity/media/media_live.sface:144
 #, elixir-autogen, elixir-format
 msgid "View media"
 msgstr ""
@@ -540,7 +515,7 @@ msgstr ""
 msgid "View more"
 msgstr ""
 
-#: lib/components/object_with_thread/object_header_aside/object_header_aside_live.sface:50
+#: lib/components/object_with_thread/object_header_aside/object_header_aside_live.sface:67
 #, elixir-autogen, elixir-format
 msgid "View participants"
 msgstr ""
@@ -555,76 +530,70 @@ msgstr ""
 msgid "View resource"
 msgstr ""
 
-#: lib/components/activity/media/media_live.sface:56
+#: lib/components/activity/actions/actions_live.sface:49
 #, elixir-autogen, elixir-format
-msgid "View the media"
+msgid "View task"
 msgstr ""
 
-#: lib/components/activity/actions/category_actions/category_actions_live.sface:14
+#: lib/components/activity/media/remote_media_live.sface:10
 #, elixir-autogen, elixir-format
-msgid "View topic"
+msgid "View the %{media}"
 msgstr ""
 
-#: lib/views/threads/write_live.ex:29
-#, elixir-autogen, elixir-format
-msgid "Write"
-msgstr ""
-
-#: lib/components/smart_input/write/write_post_content_live.sface:58
-#: lib/views/threads/write_live.sface:12
-#, elixir-autogen, elixir-format
-msgid "Write something..."
-msgstr ""
-
-#: lib/components/activity/subject/subject_live.sface:111
+#: lib/components/activity/subject/subject_live.sface:95
+#: lib/components/activity/subject/subject_minimal_live.sface:89
 #, elixir-autogen, elixir-format
 msgid "You"
 msgstr ""
 
-#: lib/views/messages/messages_live.sface:41
+#: lib/views/messages/messages_live.sface:40
 #, elixir-autogen, elixir-format
 msgid "You can search for people you follow. If you want to message someone else, you can do some via their profile page."
 msgstr ""
 
-#: lib/views/feeds/feeds_live.ex:44
+#: lib/views/feeds/feeds_live.ex:57
 #, elixir-autogen, elixir-format
 msgid "You can start by following some people, or writing a new post yourself."
 msgstr ""
 
-#: lib/components/messages/message_threads_live.sface:85
+#: lib/components/messages/message_threads_live.sface:83
 #, elixir-autogen, elixir-format
 msgid "You dont have any messages yet"
 msgstr ""
 
+#: lib/live_handlers/feeds_live_handler.ex:441
+#, elixir-autogen, elixir-format
+msgid "You have no favourites yet"
+msgstr ""
+
 #: lib/views/feeds/notifications/notifications_live.ex:34
 #, elixir-autogen, elixir-format
 msgid "You have no notifications"
 msgstr ""
 
-#: lib/live_handlers/feeds_live_handler.ex:379
+#: lib/live_handlers/feeds_live_handler.ex:397
 #, elixir-autogen, elixir-format
 msgid "Your fediverse feed is empty"
 msgstr ""
 
-#: lib/views/feeds/feeds_live.ex:42
+#: lib/views/feeds/feeds_live.ex:55
 #, elixir-autogen, elixir-format
 msgid "Your feed is empty"
 msgstr ""
 
-#: lib/live_handlers/feeds_live_handler.ex:404
+#: lib/live_handlers/feeds_live_handler.ex:422
 #, elixir-autogen, elixir-format
 msgid "Your local feed is empty"
 msgstr ""
 
-#: lib/components/widgets/widget_tags/widget_tags_live.sface:29
-#: lib/components/widgets/widget_tags/widget_tags_live.sface:44
+#: lib/components/activity/actions/more_actions_live.sface:87
 #, elixir-autogen, elixir-format
-msgid "activities"
+msgid "activity from feeds"
 msgstr ""
 
-#: lib/components/activity/subject/subject_minimal_live.sface:234
+#: lib/components/activity/subject/subject_live.sface:130
 #, elixir-autogen, elixir-format
-msgid "assigned to %{name}"
+msgid "assigned a task to %{name}"
 msgstr ""
 
 #: lib/live_handlers/boosts_live_handler.ex:24
@@ -632,14 +601,14 @@ msgstr ""
 msgid "boost"
 msgstr ""
 
-#: lib/components/activity/object/process/process_list/process_list_live.sface:43
+#: lib/components/activity/subject/subject_live.sface:126
 #, elixir-autogen, elixir-format
-msgid "complete"
+msgid "completed a task"
 msgstr ""
 
-#: lib/components/activity/subject/subject_minimal_live.sface:230
+#: lib/components/activity/subject/subject_live.sface:115
 #, elixir-autogen, elixir-format
-msgid "completed"
+msgid "created a new"
 msgstr ""
 
 #: lib/live_handlers/flags_live_handler.ex:7
@@ -652,12 +621,13 @@ msgstr ""
 msgid "follow"
 msgstr ""
 
-#: lib/components/activity/subject/subject_live.sface:150
+#: lib/components/activity/object/intent/intent_task_live.sface:38
+#: lib/components/activity/subject/subject_live.sface:200
 #, elixir-autogen, elixir-format
 msgid "in"
 msgstr ""
 
-#: lib/components/activity/object/category/category_live.sface:13
+#: lib/components/activity/object/category/category_live.sface:14
 #, elixir-autogen, elixir-format
 msgid "in "
 msgstr ""
@@ -667,40 +637,57 @@ msgstr ""
 msgid "like"
 msgstr ""
 
-#: lib/components/activity/actions/flagged_actions_live.sface:33
-#: lib/components/activity/actions/flagged_actions_live.sface:38
-#: lib/components/activity/actions/flagged_actions_live.sface:48
-#: lib/components/activity/actions/more_actions_live.sface:68
-#: lib/components/activity/actions/more_actions_live.sface:133
-#: lib/components/activity/actions/more_actions_live.sface:141
-#: lib/components/activity/actions/more_actions_live.sface:152
+#: lib/components/activity/media/remote_media_live.sface:10
+#, elixir-autogen, elixir-format
+msgid "media"
+msgstr ""
+
+#: lib/components/activity/actions/delete_object_live.sface:11
+#: lib/components/activity/actions/delete_object_live.sface:20
+#: lib/components/activity/actions/delete_object_live.sface:33
+#: lib/components/activity/actions/more_actions_live.sface:50
+#: lib/components/activity/actions/more_actions_live.sface:92
 #, elixir-autogen, elixir-format
 msgid "object"
 msgstr ""
 
-#: lib/components/activity/object/process/process_list/process_list_live.sface:45
-#, elixir-autogen, elixir-format
-msgid "of"
-msgstr ""
-
 #: lib/components/activity/actions/main_object_info_live.sface:13
-#: lib/components/object_with_thread/object_header_aside/object_header_aside_live.sface:34
+#: lib/components/object_with_thread/object_header_aside/object_header_aside_live.sface:51
 #, elixir-autogen, elixir-format
 msgid "participants"
 msgstr ""
 
-#: lib/components/activity/subject/subject_minimal_live.sface:126
-#: lib/components/activity/subject/subject_minimal_live.sface:154
-#: lib/components/activity/subject/subject_minimal_live.sface:174
-#: lib/components/activity/subject/subject_minimal_live.sface:204
-#: lib/components/activity/subject/subject_minimal_live.sface:221
+#: lib/live_handlers/pins_live_handler.ex:36
+#, elixir-autogen, elixir-format
+msgid "pin"
+msgstr ""
+
+#: lib/components/activity/subject/subject_live.sface:122
+#, elixir-autogen, elixir-format
+msgid "pinned"
+msgstr ""
+
+#: lib/live_handlers/objects_live_handler.ex:161
+#, elixir-autogen, elixir-format
+msgid "post"
+msgstr ""
+
+#: lib/components/activity/subject/subject_minimal_live.sface:130
+#: lib/components/activity/subject/subject_minimal_live.sface:158
+#: lib/components/activity/subject/subject_minimal_live.sface:178
+#: lib/components/activity/subject/subject_minimal_live.sface:208
 #, elixir-autogen, elixir-format
 msgid "profile"
 msgstr ""
 
-#: lib/components/activity/subject/subject_minimal_live.sface:232
+#: lib/components/activity/subject/subject_live.sface:128
 #, elixir-autogen, elixir-format
-msgid "re-opened"
+msgid "re-opened a task"
+msgstr ""
+
+#: lib/components/activity/subject/subject_live.sface:120
+#, elixir-autogen, elixir-format
+msgid "replied"
 msgstr ""
 
 #: lib/live_handlers/feeds_live_handler.ex:46
@@ -708,36 +695,36 @@ msgstr ""
 msgid "reply"
 msgstr ""
 
-#: lib/components/activity/subject/subject_minimal_live.sface:228
+#: lib/components/activity/subject/subject_live.sface:124
 #, elixir-autogen, elixir-format
-msgid "scheduled for %{date}"
+msgid "scheduled a task %{date}"
 msgstr ""
 
 #: lib/live_handlers/feeds_live_handler.ex:55
-#: lib/live_handlers/objects_live_handler.ex:73
-#: lib/views/messages/messages_live.ex:105
-#: lib/views/messages/messages_live.ex:209
+#: lib/live_handlers/objects_live_handler.ex:77
+#: lib/views/messages/messages_live.ex:115
+#: lib/views/messages/messages_live.ex:219
 #, elixir-autogen, elixir-format
 msgid "someone"
 msgstr ""
 
-#: lib/views/messages/messages_live.ex:218
+#: lib/views/messages/messages_live.ex:228
 #, elixir-autogen, elixir-format
 msgid "someone else"
 msgstr ""
 
-#: lib/components/activity/object/process/process_list/process_list_live.sface:46
-#, elixir-autogen, elixir-format
-msgid "tasks"
-msgstr ""
-
 #: lib/components/activity/actions/flagged_actions_live.sface:24
-#: lib/components/activity/actions/more_actions_live.ex:25
+#: lib/components/activity/actions/more_actions_live.ex:28
 #, elixir-autogen, elixir-format
 msgid "this user"
 msgstr ""
 
-#: lib/components/activity/subject/subject_minimal_live.sface:113
+#: lib/components/activity/subject/subject_live.sface:118
+#, elixir-autogen, elixir-format
+msgid "topic"
+msgstr ""
+
+#: lib/components/activity/subject/subject_minimal_live.sface:117
 #, elixir-autogen, elixir-format
 msgid "you"
 msgstr ""
diff --git a/priv/localisation/bonfire_ui_valueflows.po b/priv/localisation/bonfire_ui_valueflows.po
index ce6488520e..cc9bb1de53 100644
--- a/priv/localisation/bonfire_ui_valueflows.po
+++ b/priv/localisation/bonfire_ui_valueflows.po
@@ -10,367 +10,354 @@
 msgid ""
 msgstr ""
 
-#: lib/web/components/create_economic_event/create_economic_event_live.sface:120
+#: lib/components/create_economic_event/create_economic_event_live.sface:120
 #, elixir-autogen, elixir-format
 msgid "Add a resource description"
 msgstr ""
 
-#: lib/web/components/create_economic_event/create_economic_event_live.sface:17
+#: lib/components/create_economic_event/create_economic_event_live.sface:17
 #, elixir-autogen, elixir-format
 msgid "Add a resource to inventory"
 msgstr ""
 
-#: lib/web/components/create_intent/create_intent_live.sface:37
-#: lib/web/components/create_process/create_process_live.sface:25
+#: lib/components/create_intent/create_intent_live.sface:53
+#: lib/components/create_process/create_process_live.sface:37
 #, elixir-autogen, elixir-format
 msgid "Add an optional description"
 msgstr ""
 
-#: lib/web/components/create_economic_event/create_economic_event_live.sface:202
+#: lib/components/create_economic_event/create_economic_event_live.sface:202
 #, elixir-autogen, elixir-format
 msgid "Add an optional note about the event"
 msgstr ""
 
-#: lib/web/components/process/process_hero/process_hero_live.sface:254
+#: lib/components/widgets/filter_intents/filter_intents_live.sface:38
 #, elixir-autogen, elixir-format
-msgid "Archive"
+msgid "All"
 msgstr ""
 
-#: lib/web/components/process/process_hero/process_hero_live.sface:239
-#, elixir-autogen, elixir-format
-msgid "Archive the process"
-msgstr ""
-
-#: lib/web/components/process/process_hero/process_hero_live.sface:243
-#, elixir-autogen, elixir-format
-msgid "Are you sure you want to archive the process?"
-msgstr ""
-
-#: lib/web/components/create_intent/create_intent_live.sface:44
+#: lib/components/create_intent/create_intent_live.sface:63
 #, elixir-autogen, elixir-format
 msgid "Assign to"
 msgstr ""
 
-#: lib/web/components/primary_accountable/primary_accountable_widget_live.sface:6
-#: lib/web/components/resource/resource_hero_live.sface:64
+#: lib/components/assign_item/assign_item_live.sface:4
+#, elixir-autogen, elixir-format
+msgid "Assign to..."
+msgstr ""
+
+#: lib/components/primary_accountable/primary_accountable_widget_live.sface:6
+#: lib/components/resource/resource_hero_live.sface:64
 #, elixir-autogen, elixir-format
 msgid "Assigned to"
 msgstr ""
 
-#: lib/web/components/status_item/status_item_live.sface:57
+#: lib/components/status_item/status_item_live.sface:57
 #, elixir-autogen, elixir-format
 msgid "Backlog"
 msgstr ""
 
-#: lib/web/components/create_process/create_process_live.sface:34
-#: lib/web/components/edit_description/edit_description_live.sface:37
-#: lib/web/components/process/process_hero/process_hero_live.sface:260
+#: lib/components/edit_description/edit_description_live.sface:44
 #, elixir-autogen, elixir-format
 msgid "Cancel"
 msgstr ""
 
-#: lib/web/components/status_item/status_item_live.sface:87
+#: lib/components/status_item/status_item_live.sface:87
 #, elixir-autogen, elixir-format
 msgid "Cancelled"
 msgstr ""
 
-#: lib/web/components/create_process/create_process_live.sface:19
+#: lib/components/create_process/create_process_live.sface:31
 #, elixir-autogen, elixir-format
 msgid "Choose a name"
 msgstr ""
 
-#: lib/web/components/process/process_hero/process_hero_live.sface:40
+#: lib/components/process/process_hero/process_hero_live.sface:44
 #, elixir-autogen, elixir-format
-msgid "Completed"
+msgid "Closed"
 msgstr ""
 
-#: lib/web/components/select_economic_event/select_economic_event_live.sface:52
+#: lib/components/select_economic_event/select_economic_event_live.sface:52
 #, elixir-autogen, elixir-format
 msgid "Consume"
 msgstr ""
 
-#: lib/web/components/create_economic_event/create_economic_event_live.sface:29
+#: lib/components/create_economic_event/create_economic_event_live.sface:29
 #, elixir-autogen, elixir-format
 msgid "Consume a resource"
 msgstr ""
 
-#: lib/web/components/create_intent/create_intent_live.sface:57
+#: lib/components/create_intent/create_intent_live.sface:88
 #, elixir-autogen, elixir-format
 msgid "Create"
 msgstr ""
 
-#: lib/web/components/create_process/create_process_smart_input_live.sface:8
+#: lib/components/create_process/create_process_smart_input_live.sface:8
 #, elixir-autogen, elixir-format
 msgid "Create a new process"
 msgstr ""
 
-#: lib/web/components/resource/resource_hero_live.sface:82
+#: lib/components/resource/resource_hero_live.sface:82
 #, elixir-autogen, elixir-format
 msgid "Current location"
 msgstr ""
 
-#: lib/web/components/edit_description/edit_description_live.sface:3
+#: lib/components/edit_description/edit_description_live.sface:4
 #, elixir-autogen, elixir-format
 msgid "Description"
 msgstr ""
 
-#: lib/web/components/select_economic_event/select_economic_event_live.sface:11
+#: lib/components/select_economic_event/select_economic_event_live.sface:11
 #, elixir-autogen, elixir-format
 msgid "Do you want to perform an action"
 msgstr ""
 
-#: lib/web/components/status_item/status_item_live.sface:81
+#: lib/components/status_item/status_item_live.sface:81
 #, elixir-autogen, elixir-format
 msgid "Done"
 msgstr ""
 
-#: lib/web/components/due_item/due_item_live.sface:11
-#, elixir-autogen, elixir-format
-msgid "Due"
-msgstr ""
-
-#: lib/web/components/filters/filters_live.sface:53
+#: lib/components/filters/filters_live.sface:53
 #, elixir-autogen, elixir-format
 msgid "Due date"
 msgstr ""
 
-#: lib/web/components/create_intent/create_intent_live.sface:49
+#: lib/components/create_intent/create_intent_live.sface:72
 #, elixir-autogen, elixir-format
 msgid "Due on"
 msgstr ""
 
-#: lib/web/components/edit_process/edit_process_live.sface:23
+#: lib/components/edit_description/edit_description_live.sface:13
+#: lib/components/edit_process/edit_process_live.sface:19
 #, elixir-autogen, elixir-format
 msgid "Edit"
 msgstr ""
 
-#: lib/web/components/edit_description/edit_description_live.sface:12
-#, elixir-autogen, elixir-format
-msgid "Edit description"
-msgstr ""
-
-#: lib/web/components/process/process_hero/process_hero_live.sface:105
-#, elixir-autogen, elixir-format
-msgid "Edit process"
-msgstr ""
-
-#: lib/web/components/edit_description/edit_description_live.sface:31
-#: lib/web/components/edit_process/edit_process_live.sface:15
+#: lib/components/edit_description/edit_description_live.sface:37
+#: lib/components/edit_process/edit_process_live.sface:11
 #, elixir-autogen, elixir-format
 msgid "Edit the description"
 msgstr ""
 
-#: lib/web/components/edit_process/edit_process_live.sface:3
+#: lib/components/edit_description/edit_description_live.sface:33
 #, elixir-autogen, elixir-format
-msgid "Edit the process"
+msgid "Edit the name"
 msgstr ""
 
-#: lib/web/components/edit_process/edit_process_live.sface:7
+#: lib/components/edit_process/edit_process_live.sface:3
 #, elixir-autogen, elixir-format
 msgid "Edit the process title"
 msgstr ""
 
-#: lib/web/components/create_intent/create_intent_live.sface:29
+#: lib/components/create_intent/create_intent_live.sface:45
 #, elixir-autogen, elixir-format
 msgid "Enter a name for the intent"
 msgstr ""
 
-#: lib/web/components/create_intent/create_intent_live.sface:27
+#: lib/components/create_intent/create_intent_live.sface:43
 #, elixir-autogen, elixir-format
 msgid "Enter a name for the task"
 msgstr ""
 
-#: lib/web/components/processes_list/processes_list_live.sface:7
+#: lib/components/widgets/filter_intents/filter_intents_live.sface:147
 #, elixir-autogen, elixir-format
-msgid "Favourited lists"
+msgid "Federated"
 msgstr ""
 
-#: lib/web/components/filters/filters_live.sface:1
+#: lib/components/filters/filters_live.sface:1
+#: lib/components/widgets/filter_intents/filter_intents_live.sface:1
 #, elixir-autogen, elixir-format
 msgid "Filters"
 msgstr ""
 
-#: lib/web/components/status_item/status_item_live.sface:69
+#: lib/components/widgets/filter_intents/filter_intents_live.sface:136
+#, elixir-autogen, elixir-format
+msgid "From"
+msgstr ""
+
+#: lib/components/status_item/status_item_live.sface:69
 #, elixir-autogen, elixir-format
 msgid "In progress"
 msgstr ""
 
-#: lib/web/components/status_item/status_item_live.sface:75
+#: lib/components/status_item/status_item_live.sface:75
 #, elixir-autogen, elixir-format
 msgid "In review"
 msgstr ""
 
-#: lib/web/components/create_economic_event/create_economic_event_live.sface:30
+#: lib/components/create_economic_event/create_economic_event_live.sface:30
 #, elixir-autogen, elixir-format
 msgid "Indicate which resource you want to consume"
 msgstr ""
 
-#: lib/web/components/create_economic_event/create_economic_event_live.sface:34
+#: lib/components/create_economic_event/create_economic_event_live.sface:34
 #, elixir-autogen, elixir-format
 msgid "Indicate which resource you want to lower"
 msgstr ""
 
-#: lib/web/components/create_economic_event/create_economic_event_live.sface:22
+#: lib/components/create_economic_event/create_economic_event_live.sface:22
 #, elixir-autogen, elixir-format
 msgid "Indicate which resource you want to transfer to another user"
 msgstr ""
 
-#: lib/web/components/create_economic_event/create_economic_event_live.sface:26
+#: lib/components/create_economic_event/create_economic_event_live.sface:26
 #, elixir-autogen, elixir-format
 msgid "Indicate which resource you want to use"
 msgstr ""
 
-#: lib/web/components/location/location_widget_live.sface:3
+#: lib/components/widgets/filter_intents/filter_intents_live.sface:141
+#, elixir-autogen, elixir-format
+msgid "Local"
+msgstr ""
+
+#: lib/components/location/location_widget_live.sface:3
 #, elixir-autogen, elixir-format
 msgid "Location"
 msgstr ""
 
-#: lib/web/components/select_economic_event/select_economic_event_live.sface:59
+#: lib/components/select_economic_event/select_economic_event_live.sface:59
 #, elixir-autogen, elixir-format
 msgid "Lower"
 msgstr ""
 
-#: lib/web/components/filters/filters_live.sface:36
+#: lib/components/filters/filters_live.sface:36
 #, elixir-autogen, elixir-format
 msgid "Milestone"
 msgstr ""
 
-#: lib/web/components/filters/filters_live.sface:17
+#: lib/components/filters/filters_live.sface:17
+#: lib/components/widgets/filter_intents/filter_intents_live.sface:51
 #, elixir-autogen, elixir-format
 msgid "Needs"
 msgstr ""
 
-#: lib/web/components/filters/filters_live.sface:29
+#: lib/components/filters/filters_live.sface:29
+#: lib/components/widgets/filter_intents/filter_intents_live.sface:64
 #, elixir-autogen, elixir-format
 msgid "Offers"
 msgstr ""
 
-#: lib/web/components/process/process_hero/process_hero_live.sface:34
+#: lib/components/process/process_hero/process_hero_live.sface:34
 #, elixir-autogen, elixir-format
 msgid "Open"
 msgstr ""
 
-#: lib/web/components/process/process_hero/process_hero_live.sface:74
-#, elixir-autogen, elixir-format
-msgid "Open_process_dropdown options"
-msgstr ""
-
-#: lib/web/components/select_economic_event/select_economic_event_live.sface:23
+#: lib/components/select_economic_event/select_economic_event_live.sface:23
 #, elixir-autogen, elixir-format
 msgid "Produce"
 msgstr ""
 
-#: lib/web/components/create_economic_event/create_economic_event_live.sface:13
+#: lib/components/create_economic_event/create_economic_event_live.sface:13
 #, elixir-autogen, elixir-format
 msgid "Produce a resource"
 msgstr ""
 
-#: lib/web/components/filters/filters_live.sface:87
+#: lib/components/filters/filters_live.sface:87
 #, elixir-autogen, elixir-format
 msgid "Provider"
 msgstr ""
 
-#: lib/web/components/create_process/create_process_live.sface:36
+#: lib/components/create_process/create_process_live.sface:47
 #, elixir-autogen, elixir-format
 msgid "Publish"
 msgstr ""
 
-#: lib/web/components/select_economic_event/select_economic_event_live.sface:31
+#: lib/components/select_economic_event/select_economic_event_live.sface:31
 #, elixir-autogen, elixir-format
 msgid "Raise"
 msgstr ""
 
-#: lib/web/components/filters/filters_live.sface:104
+#: lib/components/filters/filters_live.sface:104
 #, elixir-autogen, elixir-format
 msgid "Receiver"
 msgstr ""
 
-#: lib/web/components/create_economic_event/create_economic_event_live.sface:33
+#: lib/components/create_economic_event/create_economic_event_live.sface:33
 #, elixir-autogen, elixir-format
 msgid "Remove a resource from iventory"
 msgstr ""
 
-#: lib/web/components/filters/filters_live.sface:5
+#: lib/components/filters/filters_live.sface:5
 #, elixir-autogen, elixir-format
 msgid "Search for"
 msgstr ""
 
-#: lib/web/components/process/process_hero/process_hero_live.sface:114
+#: lib/components/select_process/select_process_live.sface:6
 #, elixir-autogen, elixir-format
-msgid "Set as completed"
+msgid "Select a process..."
 msgstr ""
 
-#: lib/web/components/process/process_hero/process_hero_live.sface:123
+#: lib/components/create_intent/create_intent_live.sface:21
 #, elixir-autogen, elixir-format
-msgid "Set as open"
+msgid "Select label(s) or topic(s)..."
 msgstr ""
 
-#: lib/web/views/settings/settings_live.ex:30
+#: lib/views/settings/settings_live.ex:30
 #, elixir-autogen, elixir-format
 msgid "Settings"
 msgstr ""
 
-#: lib/web/components/create_economic_event/create_economic_event_live.sface:18
+#: lib/components/widgets/filter_intents/filter_intents_live.sface:26
+#, elixir-autogen, elixir-format
+msgid "Show"
+msgstr ""
+
+#: lib/components/widgets/filter_intents/filter_intents_live.sface:71
+#, elixir-autogen, elixir-format
+msgid "Sort by"
+msgstr ""
+
+#: lib/components/create_economic_event/create_economic_event_live.sface:18
 #, elixir-autogen, elixir-format
 msgid "Specify the resource you want to add"
 msgstr ""
 
-#: lib/web/components/create_economic_event/create_economic_event_live.sface:14
+#: lib/components/create_economic_event/create_economic_event_live.sface:14
 #, elixir-autogen, elixir-format
 msgid "Specify the resource you want to produce"
 msgstr ""
 
-#: lib/web/components/status_item/status_item_live.sface:63
+#: lib/components/status_item/status_item_live.sface:63
 #, elixir-autogen, elixir-format
 msgid "Todo"
 msgstr ""
 
-#: lib/web/components/select_economic_event/select_economic_event_live.sface:38
+#: lib/components/select_economic_event/select_economic_event_live.sface:38
 #, elixir-autogen, elixir-format
 msgid "Transfer"
 msgstr ""
 
-#: lib/web/components/create_economic_event/create_economic_event_live.sface:21
+#: lib/components/create_economic_event/create_economic_event_live.sface:21
 #, elixir-autogen, elixir-format
 msgid "Transfer a resource"
 msgstr ""
 
-#: lib/web/components/edit_description/edit_description_live.sface:38
+#: lib/components/widgets/filter_intents/filter_intents_live.sface:12
+#, elixir-autogen, elixir-format
+msgid "Type here..."
+msgstr ""
+
+#: lib/components/edit_description/edit_description_live.sface:45
 #, elixir-autogen, elixir-format
 msgid "Update"
 msgstr ""
 
-#: lib/web/components/select_economic_event/select_economic_event_live.sface:45
+#: lib/components/select_economic_event/select_economic_event_live.sface:45
 #, elixir-autogen, elixir-format
 msgid "Use"
 msgstr ""
 
-#: lib/web/components/create_economic_event/create_economic_event_live.sface:25
+#: lib/components/create_economic_event/create_economic_event_live.sface:25
 #, elixir-autogen, elixir-format
 msgid "Use a resource"
 msgstr ""
 
-#: lib/web/components/filters/filters_live.sface:70
+#: lib/components/filters/filters_live.sface:70
 #, elixir-autogen, elixir-format
 msgid "Where"
 msgstr ""
 
-#: lib/web/components/process/process_hero/process_hero_live.sface:22
-#, elixir-autogen, elixir-format
-msgid "complete"
-msgstr ""
-
-#: lib/web/components/process/process_hero/process_hero_live.sface:25
-#, elixir-autogen, elixir-format
-msgid "of"
-msgstr ""
-
-#: lib/web/components/select_economic_event/select_economic_event_live.sface:13
+#: lib/components/select_economic_event/select_economic_event_live.sface:13
 #, elixir-autogen, elixir-format
 msgid "on this resource"
 msgstr ""
-
-#: lib/web/components/process/process_hero/process_hero_live.sface:26
-#, elixir-autogen, elixir-format
-msgid "tasks"
-msgstr ""
diff --git a/priv/localisation/bonfire_upcycle.po b/priv/localisation/bonfire_upcycle.po
index 444ebcf88c..91b7157141 100644
--- a/priv/localisation/bonfire_upcycle.po
+++ b/priv/localisation/bonfire_upcycle.po
@@ -10,380 +10,380 @@
 msgid ""
 msgstr ""
 
-#: lib/web_upcycle/components/create_resource/create_resource_live.sface:80
+#: lib/web_upcycle/pages/intent/intent_live.sface:56
 #, elixir-autogen, elixir-format
-msgid "Add Resource"
+msgid "About this need"
 msgstr ""
 
-#: lib/web_upcycle/components/create_resource/create_resource_live.sface:14
+#: lib/web_upcycle/pages/intent/intent_live.sface:56
 #, elixir-autogen, elixir-format
-msgid "Add a Resource to Inventory"
+msgid "About this offer"
 msgstr ""
 
-#: lib/web_upcycle/components/create_resource/create_resource_live.sface:66
+#: lib/web_upcycle/components/resource/edit_resource_live.sface:57
 #, elixir-autogen, elixir-format
-msgid "Add an optional image"
+msgid "Action"
 msgstr ""
 
-#: lib/web_upcycle/components/edit_resource/edit_resource_live.sface:140
+#: lib/web_upcycle/components/resource/edit_resource_live.sface:160
 #, elixir-autogen, elixir-format
 msgid "Add an optional note"
 msgstr ""
 
-#: lib/web_upcycle/components/create_transfer/create_transfer_live.sface:117
+#: lib/web_upcycle/components/transfer/create_transfer_live.sface:147
 #, elixir-autogen, elixir-format
 msgid "Add an optional note about the transfer"
 msgstr ""
 
-#: lib/web_upcycle/components/create_resource/create_resource_live.sface:58
+#: lib/web_upcycle/components/resource/create_resource_live.sface:60
 #, elixir-autogen, elixir-format
 msgid "Add an optional resource description"
 msgstr ""
 
-#: lib/web_upcycle/components/create_offer/create_offer_live.sface:90
+#: lib/web_upcycle/components/transfer/create_transfer_live.sface:61
+#, elixir-autogen, elixir-format
+msgid "Amount"
+msgstr ""
+
+#: lib/web_upcycle/components/_deprecated/create_offer/create_offer_live.sface:87
 #, elixir-autogen, elixir-format
 msgid "Amount I can offer"
 msgstr ""
 
-#: lib/web_upcycle/components/create_need/create_need_live.sface:43
+#: lib/web_upcycle/components/_deprecated/create_need/create_need_live.sface:43
 #, elixir-autogen, elixir-format
 msgid "Amount I need"
 msgstr ""
 
-#: lib/web_upcycle/components/nav/main_navigation/main_navigation_live.sface:19
-#, elixir-autogen, elixir-format
-msgid "Bookmarked"
-msgstr ""
-
-#: lib/web_upcycle/pages/inventory/inventory_live.sface:39
-#, elixir-autogen, elixir-format
-msgid "Create New Resource"
-msgstr ""
-
-#: lib/web_upcycle/pages/transfer/transfer_live.sface:28
-#, elixir-autogen, elixir-format
-msgid "Create New Transfer"
-msgstr ""
-
-#: lib/web_upcycle/components/create_transfer/create_transfer_live.sface:129
-#, elixir-autogen, elixir-format
-msgid "Create Transfer"
-msgstr ""
-
-#: lib/web_upcycle/components/my_needs/my_needs_live.sface:10
-#, elixir-autogen, elixir-format
-msgid "Create a new need"
-msgstr ""
-
-#: lib/web_upcycle/components/my_offers/my_offers_live.sface:13
+#: lib/web_upcycle/components/_deprecated/my_offers/my_offers_live.sface:13
 #, elixir-autogen, elixir-format
 msgid "Create a new offer"
 msgstr ""
 
-#: lib/web_upcycle/components/resource/resource_live.sface:46
+#: lib/web_upcycle/pages/resource/resource_live.sface:37
 #, elixir-autogen, elixir-format
-msgid "Description:"
+msgid "Description"
 msgstr ""
 
-#: lib/web_upcycle/components/nav/main_navigation/main_navigation_live.sface:4
+#: lib/web_upcycle/components/_deprecated/main_navigation/main_navigation_live.sface:4
+#: lib/web_upcycle/pages/home/home_live.ex:38
 #, elixir-autogen, elixir-format
 msgid "Discover"
 msgstr ""
 
-#: lib/web_upcycle/components/resource/resource_live.sface:70
+#: lib/web_upcycle/components/resource/resource_actions_live.sface:8
 #, elixir-autogen, elixir-format
-msgid "Edit Quantity"
+msgid "Edit"
 msgstr ""
 
-#: lib/web_upcycle/components/edit_resource/edit_resource_live.sface:5
+#: lib/web_upcycle/components/resource/resource_actions_live.sface:3
 #, elixir-autogen, elixir-format
-msgid "Edit Resource "
+msgid "Edit resource"
 msgstr ""
 
+#: lib/web_upcycle/components/transfer/create_transfer_live.sface:17
 #: lib/web_upcycle/components/transfer/transfer_live.sface:6
 #, elixir-autogen, elixir-format
-msgid "FROM"
+msgid "From"
 msgstr ""
 
-#: lib/web_upcycle/components/create_transfer/create_transfer_live.sface:21
-#, elixir-autogen, elixir-format
-msgid "From: "
-msgstr ""
-
-#: lib/web_upcycle/pages/inventory/inventory_live.sface:30
-#, elixir-autogen, elixir-format
-msgid "Goto Resource Specifications"
-msgstr ""
-
-#: lib/web_upcycle/components/create_offer/create_offer_live.sface:3
+#: lib/web_upcycle/components/_deprecated/create_offer/create_offer_live.sface:3
 #, elixir-autogen, elixir-format
 msgid "I can offer"
 msgstr ""
 
-#: lib/web_upcycle/components/create_need/create_need_live.sface:2
+#: lib/web_upcycle/components/_deprecated/create_need/create_need_live.sface:2
+#: lib/web_upcycle/components/intent/create_intent_live.sface:50
 #, elixir-autogen, elixir-format
 msgid "I need"
 msgstr ""
 
-#: lib/web_upcycle/components/nav/main_navigation/main_navigation_live.sface:13
+#: lib/web_upcycle/components/resource/resource_actions_live.sface:64
+#: lib/web_upcycle/components/resource/resource_actions_live.sface:67
+#, elixir-autogen, elixir-format
+msgid "I need this resource"
+msgstr ""
+
+#: lib/web_upcycle/components/intent/create_intent_live.sface:63
+#, elixir-autogen, elixir-format
+msgid "I offer"
+msgstr ""
+
+#: lib/web_upcycle/components/_deprecated/main_navigation/main_navigation_live.sface:13
+#: lib/web_upcycle/pages/resource/inventory_live.ex:10
+#: lib/web_upcycle/pages/resource/inventory_live.ex:31
 #, elixir-autogen, elixir-format
 msgid "Inventory"
 msgstr ""
 
-#: lib/web_upcycle/components/resource/resource_live.sface:35
+#: lib/web_upcycle/pages/intent/intent_live.sface:76
+#: lib/web_upcycle/pages/resource/resource_live.sface:49
 #, elixir-autogen, elixir-format
-msgid "Last Activity [2 days ago]"
+msgid "Join the discussion"
 msgstr ""
 
-#: lib/web_upcycle/components/resource/resource_live.sface:62
-#: lib/web_upcycle/components/transfer/transfer_live.sface:63
+#: lib/web_upcycle/pages/intent/intent_live.sface:132
+#: lib/web_upcycle/pages/resource/resource_live.sface:89
 #, elixir-autogen, elixir-format
-msgid "Location: "
+msgid "Location"
 msgstr ""
 
-#: lib/web_upcycle/components/nav/main_navigation/main_navigation_live.sface:7
+#: lib/web_upcycle/components/resource/edit_resource_live.sface:82
+#, elixir-autogen, elixir-format
+msgid "Lower"
+msgstr ""
+
+#: lib/web_upcycle/components/_deprecated/main_navigation/main_navigation_live.sface:7
 #, elixir-autogen, elixir-format
 msgid "My needs"
 msgstr ""
 
-#: lib/web_upcycle/components/nav/main_navigation/main_navigation_live.sface:10
+#: lib/web_upcycle/components/_deprecated/main_navigation/main_navigation_live.sface:10
 #, elixir-autogen, elixir-format
 msgid "My offers"
 msgstr ""
 
-#: lib/web_upcycle/pages/intent/intent_live.sface:80
+#: lib/web_upcycle/pages/home/home_live.ex:39
+#: lib/web_upcycle/pages/home/home_live.ex:127
 #, elixir-autogen, elixir-format
-msgid "No"
+msgid "My offers & needs"
 msgstr ""
 
-#: lib/web_upcycle/pages/transfer/transfer_live.sface:43
+#: lib/web_upcycle/components/resource/resource_actions_live.sface:70
+#: lib/web_upcycle/pages/intent/intent_live.ex:48
+#, elixir-autogen, elixir-format
+msgid "Need"
+msgstr ""
+
+#: lib/web_upcycle/pages/intent/intent_live.sface:103
+#, elixir-autogen, elixir-format
+msgid "Needed by"
+msgstr ""
+
+#: lib/web_upcycle/pages/home/home_live.ex:66
+#: lib/web_upcycle/pages/starred/starred_live.ex:31
+#, elixir-autogen, elixir-format
+msgid "New offer or need"
+msgstr ""
+
+#: lib/web_upcycle/pages/resource/inventory_live.ex:34
+#, elixir-autogen, elixir-format
+msgid "New resource"
+msgstr ""
+
+#: lib/web_upcycle/pages/transfers/transfers_live.sface:41
 #, elixir-autogen, elixir-format
 msgid "No Transfers."
 msgstr ""
 
-#: lib/web_upcycle/components/create_need/create_need_live.sface:61
-#: lib/web_upcycle/components/create_offer/create_offer_live.sface:109
+#: lib/web_upcycle/components/discover/discover_live.sface:10
+#, elixir-autogen, elixir-format
+msgid "No item were found"
+msgstr ""
+
+#: lib/web_upcycle/components/intent/my_intents_live.sface:18
+#, elixir-autogen, elixir-format
+msgid "No items were found"
+msgstr ""
+
+#: lib/web_upcycle/components/transfer/transfer_live.sface:65
+#, elixir-autogen, elixir-format
+msgid "Note about the transfer"
+msgstr ""
+
+#: lib/web_upcycle/components/resource/resource_actions_live.sface:52
+#: lib/web_upcycle/pages/intent/intent_live.ex:48
+#, elixir-autogen, elixir-format
+msgid "Offer"
+msgstr ""
+
+#: lib/web_upcycle/components/_deprecated/create_need/create_need_live.sface:61
+#: lib/web_upcycle/components/_deprecated/create_offer/create_offer_live.sface:106
 #, elixir-autogen, elixir-format
 msgid "Offer Expires"
 msgstr ""
 
-#: lib/web_upcycle/components/bookmarked/bookmarked_live.sface:4
+#: lib/web_upcycle/components/resource/resource_actions_live.sface:46
+#: lib/web_upcycle/components/resource/resource_actions_live.sface:49
 #, elixir-autogen, elixir-format
-msgid "Order by"
+msgid "Offer this resource"
 msgstr ""
 
-#: lib/web_upcycle/pages/intent/intent_live.sface:75
-#: lib/web_upcycle/pages/resource/resource_live.sface:50
+#: lib/web_upcycle/pages/intent/intent_live.sface:94
+#, elixir-autogen, elixir-format
+msgid "Offered by"
+msgstr ""
+
+#: lib/web_upcycle/pages/resource/resource_live.sface:61
+#, elixir-autogen, elixir-format
+msgid "Owner"
+msgstr ""
+
+#: lib/web_upcycle/pages/intent/intent_live.sface:81
+#: lib/web_upcycle/pages/resource/resource_live.sface:54
 #, elixir-autogen, elixir-format
 msgid "Post a comment..."
 msgstr ""
 
-#: lib/web_upcycle/components/create_need/create_need_live.sface:74
-#: lib/web_upcycle/components/create_offer/create_offer_live.sface:123
+#: lib/web_upcycle/components/_deprecated/create_need/create_need_live.sface:74
+#: lib/web_upcycle/components/_deprecated/create_offer/create_offer_live.sface:120
 #, elixir-autogen, elixir-format
 msgid "Publish"
 msgstr ""
 
-#: lib/web_upcycle/components/resource/resource_live.sface:55
+#: lib/web_upcycle/components/intent/create_intent_live.sface:79
+#: lib/web_upcycle/components/resource/edit_resource_live.sface:111
+#: lib/web_upcycle/pages/intent/intent_live.sface:123
+#: lib/web_upcycle/pages/resource/resource_live.sface:80
 #, elixir-autogen, elixir-format
-msgid "Quantity: "
+msgid "Quantity"
 msgstr ""
 
-#: lib/web_upcycle/pages/inventory/inventory_live.sface:33
+#: lib/web_upcycle/components/resource/edit_resource_live.sface:69
 #, elixir-autogen, elixir-format
-msgid "Receive Transfer"
+msgid "Raise"
 msgstr ""
 
-#: lib/web_upcycle/components/create_offer/create_offer_live.sface:43
-#: lib/web_upcycle/components/create_transfer/create_transfer_live.sface:61
+#: lib/web_upcycle/components/resource/resource_actions_live.sface:29
+#: lib/web_upcycle/pages/transfers/transfers_live.ex:39
+#, elixir-autogen, elixir-format
+msgid "Record a transfer"
+msgstr ""
+
+#: lib/web_upcycle/components/transfer/create_transfer_live.sface:102
+#, elixir-autogen, elixir-format
+msgid "Resource"
+msgstr ""
+
+#: lib/web_upcycle/components/_deprecated/create_offer/create_offer_live.sface:43
 #, elixir-autogen, elixir-format
 msgid "Resource I can offer"
 msgstr ""
 
-#: lib/web_upcycle/components/create_need/create_need_live.sface:35
+#: lib/web_upcycle/components/_deprecated/create_need/create_need_live.sface:35
 #, elixir-autogen, elixir-format
 msgid "Resource I need"
 msgstr ""
 
-#: lib/web_upcycle/components/resource/resource_live.sface:52
+#: lib/web_upcycle/pages/intent/intent_live.sface:64
 #, elixir-autogen, elixir-format
-msgid "Resource Specification: "
+msgid "Resource description"
 msgstr ""
 
-#: lib/web_upcycle/components/discover/discover_live.sface:4
+#: lib/web_upcycle/pages/intent/intent_live.ex:57
 #, elixir-autogen, elixir-format
-msgid "Search for"
+msgid "Respond to need"
 msgstr ""
 
-#: lib/web_upcycle/components/create_need/create_need_live.sface:31
-#: lib/web_upcycle/components/create_offer/create_offer_live.sface:37
+#: lib/web_upcycle/pages/intent/intent_live.ex:57
+#, elixir-autogen, elixir-format
+msgid "Respond to offer"
+msgstr ""
+
+#: lib/web_upcycle/components/_deprecated/create_need/create_need_live.sface:31
+#: lib/web_upcycle/components/_deprecated/create_offer/create_offer_live.sface:37
 #, elixir-autogen, elixir-format
 msgid "Select for which organization"
 msgstr ""
 
-#: lib/web_upcycle/components/discover/discover_live.sface:8
+#: lib/web_upcycle/components/_deprecated/main_navigation/main_navigation_live.sface:22
+#: lib/web_upcycle/pages/home/home_live.ex:40
 #, elixir-autogen, elixir-format
-msgid "Show"
+msgid "Settings"
 msgstr ""
 
-#: lib/web_upcycle/components/discover/discover_live.sface:28
-#, elixir-autogen, elixir-format
-msgid "Show expired: "
-msgstr ""
-
-#: lib/web_upcycle/components/discover/discover_live.sface:15
-#, elixir-autogen, elixir-format
-msgid "Sort by"
-msgstr ""
-
-#: lib/web_upcycle/components/create_resource/create_resource_live.sface:35
+#: lib/web_upcycle/components/resource/create_resource_live.sface:30
 #, elixir-autogen, elixir-format
 msgid "Specify a name"
 msgstr ""
 
-#: lib/web_upcycle/components/create_resource/create_resource_live.sface:43
-#: lib/web_upcycle/components/create_transfer/create_transfer_live.sface:99
+#: lib/web_upcycle/components/resource/create_resource_live.sface:42
 #, elixir-autogen, elixir-format
 msgid "Specify the quantity and units"
 msgstr ""
 
-#: lib/web_upcycle/components/edit_resource/edit_resource_live.sface:76
+#: lib/web_upcycle/pages/starred/starred_live.ex:5
+#: lib/web_upcycle/pages/starred/starred_live.ex:29
 #, elixir-autogen, elixir-format
-msgid "Specify the quantity to "
+msgid "Starred"
 msgstr ""
 
-#: lib/web_upcycle/components/create_transfer/create_transfer_live.sface:26
+#: lib/web_upcycle/components/_deprecated/main_navigation/main_navigation_live.sface:19
 #, elixir-autogen, elixir-format
-msgid "Specify the receiver"
+msgid "Starred "
 msgstr ""
 
-#: lib/web_upcycle/components/create_resource/create_resource_live.sface:20
+#: lib/web_upcycle/components/resource/create_resource_live.sface:105
+#: lib/web_upcycle/components/resource/resource_actions_live.sface:12
+#: lib/web_upcycle/components/transfer/create_transfer_live.sface:184
 #, elixir-autogen, elixir-format
-msgid "Specify the resource you want to add"
+msgid "Submit"
 msgstr ""
 
-#: lib/web_upcycle/components/transfer/transfer_live.sface:30
+#: lib/web_upcycle/components/intent/create_intent_live.sface:71
 #, elixir-autogen, elixir-format
-msgid "TO"
+msgid "Title"
 msgstr ""
 
-#: lib/web_upcycle/components/edit_resource/edit_resource_live.sface:125
+#: lib/web_upcycle/components/transfer/create_transfer_live.sface:30
+#: lib/web_upcycle/components/transfer/transfer_live.sface:25
 #, elixir-autogen, elixir-format
-msgid "The new quantity will be"
+msgid "To"
 msgstr ""
 
-#: lib/web_upcycle/components/transfer/transfer_live.sface:57
+#: lib/web_upcycle/components/resource/resource_actions_live.sface:34
 #, elixir-autogen, elixir-format
-msgid "Transfer Date: "
+msgid "Transfer"
 msgstr ""
 
-#: lib/web_upcycle/components/transfer/transfer_live.sface:71
-#, elixir-autogen, elixir-format
-msgid "Transfer Description"
-msgstr ""
-
-#: lib/web_upcycle/components/create_transfer/create_transfer_live.sface:15
-#, elixir-autogen, elixir-format
-msgid "Transfer a Resource"
-msgstr ""
-
-#: lib/web_upcycle/components/nav/main_navigation/main_navigation_live.sface:16
+#: lib/web_upcycle/components/_deprecated/main_navigation/main_navigation_live.sface:16
+#: lib/web_upcycle/pages/transfers/transfers_live.ex:10
 #, elixir-autogen, elixir-format
 msgid "Transfers"
 msgstr ""
 
-#: lib/web_upcycle/components/resource/resource_live.sface:58
+#: lib/web_upcycle/components/intent/create_intent_live.sface:37
 #, elixir-autogen, elixir-format
-msgid "Units: "
+msgid "Type"
 msgstr ""
 
-#: lib/web_upcycle/components/create_need/create_need_live.sface:71
-#: lib/web_upcycle/components/create_offer/create_offer_live.sface:120
+#: lib/web_upcycle/pages/home/home_live.ex:91
+#, elixir-autogen, elixir-format
+msgid "Upcycle: offers & needs"
+msgstr ""
+
+#: lib/web_upcycle/components/_deprecated/create_need/create_need_live.sface:71
+#: lib/web_upcycle/components/_deprecated/create_offer/create_offer_live.sface:117
+#: lib/web_upcycle/components/intent/create_intent_live.sface:113
 #, elixir-autogen, elixir-format
 msgid "Write an optional description"
 msgstr ""
 
-#: lib/web_upcycle/components/resource/resource_live.sface:32
+#: lib/web_upcycle/pages/intent/intent_live.sface:85
 #, elixir-autogen, elixir-format
-msgid "[Offered]"
+msgid "You may be interested in"
 msgstr ""
 
-#: lib/web_upcycle/components/resource/resource_live.sface:29
-#, elixir-autogen, elixir-format
-msgid "[Organization Name]"
-msgstr ""
-
-#: lib/web_upcycle/components/transfer/transfer_live.sface:60
-#, elixir-autogen, elixir-format
-msgid "[date]"
-msgstr ""
-
-#: lib/web_upcycle/components/edit_resource/edit_resource_live.sface:43
-#, elixir-autogen, elixir-format
-msgid "consume"
-msgstr ""
-
-#: lib/web_upcycle/components/edit_resource/edit_resource_live.sface:32
-#, elixir-autogen, elixir-format
-msgid "lower"
-msgstr ""
-
-#: lib/web_upcycle/components/intent/intent_live.sface:15
-#: lib/web_upcycle/pages/intent/intent_live.sface:13
-#: lib/web_upcycle/pages/intent/intent_live.sface:80
+#: lib/web_upcycle/components/intent/intent_preview_live.sface:30
+#: lib/web_upcycle/pages/intent/intent_live.ex:53
+#: lib/web_upcycle/pages/intent/intent_live.sface:32
 #, elixir-autogen, elixir-format
 msgid "need"
 msgstr ""
 
-#: lib/web_upcycle/pages/intent/intent_live.sface:80
+#: lib/web_upcycle/components/transfer/create_transfer_live.sface:84
 #, elixir-autogen, elixir-format
-msgid "needs"
+msgid "of"
 msgstr ""
 
-#: lib/web_upcycle/components/intent/intent_live.sface:8
-#: lib/web_upcycle/pages/intent/intent_live.sface:9
-#: lib/web_upcycle/pages/intent/intent_live.sface:80
+#: lib/web_upcycle/components/intent/intent_preview_live.sface:26
+#: lib/web_upcycle/pages/intent/intent_live.ex:53
+#: lib/web_upcycle/pages/intent/intent_live.sface:28
 #, elixir-autogen, elixir-format
 msgid "offer"
 msgstr ""
 
-#: lib/web_upcycle/pages/intent/intent_live.sface:80
-#, elixir-autogen, elixir-format
-msgid "offers"
-msgstr ""
-
-#: lib/web_upcycle/components/edit_resource/edit_resource_live.sface:21
-#, elixir-autogen, elixir-format
-msgid "raise"
-msgstr ""
-
-#: lib/web_upcycle/components/bookmarked/bookmarked_live.sface:10
-#: lib/web_upcycle/components/bookmarked/bookmarked_live.sface:11
-#: lib/web_upcycle/components/bookmarked/bookmarked_live.sface:12
-#: lib/web_upcycle/components/create_offer/create_offer_live.sface:51
-#: lib/web_upcycle/components/create_transfer/create_transfer_live.sface:69
-#: lib/web_upcycle/components/discover/discover_live.sface:27
-#: lib/web_upcycle/components/edit_resource/edit_resource_live.sface:77
-#: lib/web_upcycle/components/transfer/transfer_live.sface:23
-#: lib/web_upcycle/components/transfer/transfer_live.sface:44
-#: lib/web_upcycle/components/transfer/transfer_live.sface:51
-#: lib/web_upcycle/components/transfer/transfer_live.sface:54
-#, elixir-autogen, elixir-format
-msgid " "
-msgstr ""
-
-#: lib/web_upcycle/components/create_offer/create_offer_live.sface:69
-#: lib/web_upcycle/components/create_transfer/create_transfer_live.sface:86
-#, elixir-autogen, elixir-format
-msgid "   "
-msgstr ""
-
-#: lib/web_upcycle/components/create_offer/create_offer_live.sface:81
+#: lib/web_upcycle/components/_deprecated/create_offer/create_offer_live.sface:78
 #, elixir-autogen, elixir-format
 msgid "   Create a new resource"
 msgstr ""
-
-#: lib/web_upcycle/components/edit_resource/edit_resource_live.sface:90
-#, elixir-autogen, elixir-format
-msgid " by"
-msgstr ""