diff --git a/Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved
index f406af44f..47f1e5fe6 100644
--- a/Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -84,7 +84,7 @@
     {
       "identity" : "swift-ogg",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/vector-im/swift-ogg",
+      "location" : "https://github.com/element-hq/swift-ogg",
       "state" : {
         "branch" : "0.0.1",
         "revision" : "e9a9e7601da662fd8b97d93781ff5c60b4becf88"
diff --git a/Riot/Assets/de.lproj/Vector.strings b/Riot/Assets/de.lproj/Vector.strings
index 80eb95172..331614eca 100644
--- a/Riot/Assets/de.lproj/Vector.strings
+++ b/Riot/Assets/de.lproj/Vector.strings
@@ -2616,8 +2616,8 @@
 "manage_session_name_info" = "Sei dir bitte bewusst, dass Sitzungsnamen auch für Personen, mit denen du kommunizierst, sichtbar sind. %@";
 "manage_session_name_hint" = "Individuelle Sitzungsnamen können dir helfen, deine Geräte einfacher zu erkennen.";
 "user_other_session_filter" = "Filtern";
-"wysiwyg_composer_format_action_strikethrough" = "Unterstrichen formatieren";
-"wysiwyg_composer_format_action_underline" = "Durchgestrichen formatieren";
+"wysiwyg_composer_format_action_strikethrough" = "Durchgestrichen formatieren";
+"wysiwyg_composer_format_action_underline" = "Unterstrichen formatieren";
 "wysiwyg_composer_format_action_italic" = "Kursiv formatieren";
 
 // Formatting Actions
diff --git a/Riot/Assets/et.lproj/Vector.strings b/Riot/Assets/et.lproj/Vector.strings
index 5080a7ea5..3df4d23b9 100644
--- a/Riot/Assets/et.lproj/Vector.strings
+++ b/Riot/Assets/et.lproj/Vector.strings
@@ -2499,8 +2499,8 @@
 "authentication_qr_login_start_title" = "Loe QR-koodi";
 "authentication_login_with_qr" = "Logi sisse QR-koodi abil";
 "wysiwyg_composer_format_action_strikethrough" = "Kasuta allajoonitud kirja";
-"wysiwyg_composer_format_action_underline" = "Kasuta läbijoonitud kirja";
-"wysiwyg_composer_format_action_italic" = "Kasuta kaldkirja";
+"wysiwyg_composer_format_action_italic" = "Kasuta läbijoonitud kirja";
+"wysiwyg_composer_format_action_underline" = "Kasuta kaldkirja";
 
 // Formatting Actions
 "wysiwyg_composer_format_action_bold" = "Kasuta paksu kirja";
diff --git a/Riot/Assets/fr.lproj/Vector.strings b/Riot/Assets/fr.lproj/Vector.strings
index 5dfc717c9..ee1435894 100644
--- a/Riot/Assets/fr.lproj/Vector.strings
+++ b/Riot/Assets/fr.lproj/Vector.strings
@@ -2631,8 +2631,8 @@
 "wysiwyg_composer_format_action_unordered_list" = "Liste à puces";
 "wysiwyg_composer_format_action_inline_code" = "Formater comme code informatique";
 "wysiwyg_composer_format_action_link" = "Formater comme lien";
-"wysiwyg_composer_format_action_strikethrough" = "Souligner";
-"wysiwyg_composer_format_action_underline" = "Barrer";
+"wysiwyg_composer_format_action_strikethrough" = "Barrer";
+"wysiwyg_composer_format_action_underline" = "Souligner";
 "wysiwyg_composer_format_action_italic" = "Mettre en italique";
 
 // Formatting Actions
diff --git a/Riot/Assets/hu.lproj/Vector.strings b/Riot/Assets/hu.lproj/Vector.strings
index a77322f08..274042639 100644
--- a/Riot/Assets/hu.lproj/Vector.strings
+++ b/Riot/Assets/hu.lproj/Vector.strings
@@ -2501,8 +2501,8 @@
 "room_first_message_placeholder" = "Küld el az első üzenetedet…";
 "authentication_qr_login_confirm_title" = "Biztonságos kapcsolat beállítva";
 "room_event_encryption_info_key_authenticity_not_guaranteed" = "A titkosított üzenetek valódiságát ezen az eszközön nem lehet garantálni.";
-"wysiwyg_composer_format_action_strikethrough" = "Aláhúzott";
-"wysiwyg_composer_format_action_underline" = "Áthúzott";
+"wysiwyg_composer_format_action_underline" = "Aláhúzott";
+"wysiwyg_composer_format_action_strikethrough" = "Áthúzott";
 "wysiwyg_composer_format_action_italic" = "Dőlt";
 
 // Formatting Actions
diff --git a/Riot/Assets/id.lproj/Vector.strings b/Riot/Assets/id.lproj/Vector.strings
index 0a43411c3..5e8e1c027 100644
--- a/Riot/Assets/id.lproj/Vector.strings
+++ b/Riot/Assets/id.lproj/Vector.strings
@@ -2782,8 +2782,8 @@
 "authentication_qr_login_start_subtitle" = "Gunakan kamera pada perangkat ini untuk memindai kode QR yang ditampilkan di perangkat Anda yang lain:";
 "authentication_qr_login_start_title" = "Pindai kode QR";
 "authentication_login_with_qr" = "Masuk dengan kode QR";
-"wysiwyg_composer_format_action_strikethrough" = "Terapkan format garis bawah";
-"wysiwyg_composer_format_action_underline" = "Terapkan format coret";
+"wysiwyg_composer_format_action_underline" = "Terapkan format garis bawah";
+"wysiwyg_composer_format_action_strikethrough" = "Terapkan format coret";
 "wysiwyg_composer_format_action_italic" = "Terapkan format miring";
 
 // Formatting Actions
diff --git a/Riot/Assets/it.lproj/Vector.strings b/Riot/Assets/it.lproj/Vector.strings
index 5658e7478..0e893b97c 100644
--- a/Riot/Assets/it.lproj/Vector.strings
+++ b/Riot/Assets/it.lproj/Vector.strings
@@ -2555,8 +2555,8 @@
 "authentication_qr_login_start_subtitle" = "Usa la fotocamera di questo dispositivo per scansionare il codice QR mostrato nell'altro dispositivo:";
 "authentication_qr_login_start_title" = "Scansiona codice QR";
 "authentication_login_with_qr" = "Accedi con codice QR";
-"wysiwyg_composer_format_action_strikethrough" = "Applica formato sottolineato";
-"wysiwyg_composer_format_action_underline" = "Applica formato sbarrato";
+"wysiwyg_composer_format_action_underline" = "Applica formato sottolineato";
+"wysiwyg_composer_format_action_strikethrough" = "Applica formato sbarrato";
 "wysiwyg_composer_format_action_italic" = "Applica formato corsivo";
 
 // Formatting Actions
diff --git a/Riot/Assets/ja.lproj/Vector.strings b/Riot/Assets/ja.lproj/Vector.strings
index c1d767830..0dfb2562b 100644
--- a/Riot/Assets/ja.lproj/Vector.strings
+++ b/Riot/Assets/ja.lproj/Vector.strings
@@ -2752,8 +2752,8 @@
 "notice_error_unformattable_event" = "** メッセージを描画できません。不具合を報告してください";
 "wysiwyg_composer_format_action_un_indent" = "インデントを減らす";
 "wysiwyg_composer_format_action_indent" = "インデントを増やす";
-"wysiwyg_composer_format_action_strikethrough" = "下線で装飾";
-"wysiwyg_composer_format_action_underline" = "打ち消し線で装飾";
+"wysiwyg_composer_format_action_underline" = "下線で装飾";
+"wysiwyg_composer_format_action_strikethrough" = "打ち消し線で装飾";
 
 
 // MARK: - WYSIWYG Composer
diff --git a/Riot/Assets/nl.lproj/Vector.strings b/Riot/Assets/nl.lproj/Vector.strings
index a814c281b..f0ddd9d10 100644
--- a/Riot/Assets/nl.lproj/Vector.strings
+++ b/Riot/Assets/nl.lproj/Vector.strings
@@ -2646,8 +2646,8 @@
 "invite_to" = "Uitnodigen %@";
 "room_event_encryption_info_key_authenticity_not_guaranteed" = "De authenticiteit van dit versleutelde bericht kan niet worden gegarandeerd op dit apparaat.";
 "deselect_all" = "Deselecteer alles";
-"wysiwyg_composer_format_action_strikethrough" = "Onderstrepen formaat toepassen";
-"wysiwyg_composer_format_action_underline" = "Doorstrepen formaat toepassen";
+"wysiwyg_composer_format_action_underline" = "Onderstrepen formaat toepassen";
+"wysiwyg_composer_format_action_strikethrough" = "Doorstrepen formaat toepassen";
 "wysiwyg_composer_format_action_italic" = "Cursief formaat toepassen";
 
 // Formatting Actions
diff --git a/Riot/Assets/pl.lproj/Vector.strings b/Riot/Assets/pl.lproj/Vector.strings
index 21be89f5d..ba5a2bc09 100644
--- a/Riot/Assets/pl.lproj/Vector.strings
+++ b/Riot/Assets/pl.lproj/Vector.strings
@@ -2694,8 +2694,8 @@
 "wysiwyg_composer_format_action_unordered_list" = "Przełącz listę punktorów";
 "wysiwyg_composer_format_action_inline_code" = "Zastosuj kod w tekście";
 "wysiwyg_composer_format_action_link" = "Zastosuj link";
-"wysiwyg_composer_format_action_strikethrough" = "Zastosuj podkreślenie";
-"wysiwyg_composer_format_action_underline" = "Zastosuj przekreślenie";
+"wysiwyg_composer_format_action_underline" = "Zastosuj podkreślenie";
+"wysiwyg_composer_format_action_strikethrough" = "Zastosuj przekreślenie";
 "wysiwyg_composer_format_action_italic" = "Zastosuj kursywę";
 
 // Formatting Actions
diff --git a/Riot/Assets/pt_BR.lproj/Vector.strings b/Riot/Assets/pt_BR.lproj/Vector.strings
index d60ed99b6..991716cd9 100644
--- a/Riot/Assets/pt_BR.lproj/Vector.strings
+++ b/Riot/Assets/pt_BR.lproj/Vector.strings
@@ -2556,8 +2556,8 @@
 "authentication_qr_login_start_subtitle" = "Use a câmera neste dispositivo para scannar o QR code mostrado em seu outro dispositivo:";
 "authentication_qr_login_start_title" = "Scannar QR code";
 "authentication_login_with_qr" = "Fazer signin com QR code";
-"wysiwyg_composer_format_action_strikethrough" = "Aplicar formato sublinhar";
-"wysiwyg_composer_format_action_underline" = "Aplicar formato tachar";
+"wysiwyg_composer_format_action_underline" = "Aplicar formato sublinhar";
+"wysiwyg_composer_format_action_strikethrough" = "Aplicar formato tachar";
 "wysiwyg_composer_format_action_italic" = "Aplicar formato itálico";
 
 // Formatting Actions
diff --git a/Riot/Assets/sk.lproj/Vector.strings b/Riot/Assets/sk.lproj/Vector.strings
index 6f4eda6a4..a18873e4d 100644
--- a/Riot/Assets/sk.lproj/Vector.strings
+++ b/Riot/Assets/sk.lproj/Vector.strings
@@ -2778,8 +2778,8 @@
 "authentication_qr_login_start_subtitle" = "Pomocou fotoaparátu na tomto zariadení naskenujte QR kód zobrazený na vašom druhom zariadení:";
 "authentication_qr_login_start_title" = "Skenovať QR kód";
 "authentication_login_with_qr" = "Prihlásiť sa pomocou QR kódu";
-"wysiwyg_composer_format_action_strikethrough" = "Použiť formát podčiarknutia";
-"wysiwyg_composer_format_action_underline" = "Použiť formát prečiarknutia";
+"wysiwyg_composer_format_action_underline" = "Použiť formát podčiarknutia";
+"wysiwyg_composer_format_action_strikethrough" = "Použiť formát prečiarknutia";
 "wysiwyg_composer_format_action_italic" = "Použiť formát kurzívou";
 
 // Formatting Actions
diff --git a/Riot/Assets/sq.lproj/Vector.strings b/Riot/Assets/sq.lproj/Vector.strings
index 4b123786e..cd338d626 100644
--- a/Riot/Assets/sq.lproj/Vector.strings
+++ b/Riot/Assets/sq.lproj/Vector.strings
@@ -2420,8 +2420,8 @@
 "all_chats_edit_layout_add_section_message" = "Fiksoni ndarje te kreu, për hyrje të lehtë në ta";
 "room_event_encryption_info_key_authenticity_not_guaranteed" = "S’mund të garantohet mirëfilltësia e këtij mesazhi të fshehtëzuar në këtë pajisje.";
 "deselect_all" = "Shpërzgjidhi Krejt";
-"wysiwyg_composer_format_action_strikethrough" = "Apliko format me të nënvizuara";
-"wysiwyg_composer_format_action_underline" = "Apliko format me të hequravije";
+"wysiwyg_composer_format_action_underline" = "Apliko format me të nënvizuara";
+"wysiwyg_composer_format_action_strikethrough" = "Apliko format me të hequravije";
 "wysiwyg_composer_format_action_italic" = "Apliko format me të pjerrëta";
 
 // Formatting Actions
diff --git a/Riot/Assets/sv.lproj/Vector.strings b/Riot/Assets/sv.lproj/Vector.strings
index cb9918a3a..85662f029 100644
--- a/Riot/Assets/sv.lproj/Vector.strings
+++ b/Riot/Assets/sv.lproj/Vector.strings
@@ -2485,8 +2485,8 @@
 "wysiwyg_composer_format_action_unordered_list" = "Växla punktlista";
 "wysiwyg_composer_format_action_inline_code" = "Tillämpa inline-kodstil";
 "wysiwyg_composer_format_action_link" = "Tillämpa länkformat";
-"wysiwyg_composer_format_action_strikethrough" = "Tillämpa understruken stil";
-"wysiwyg_composer_format_action_underline" = "Tillämpa genomstruken stil";
+"wysiwyg_composer_format_action_underline" = "Tillämpa understruken stil";
+"wysiwyg_composer_format_action_strikethrough" = "Tillämpa genomstruken stil";
 "wysiwyg_composer_format_action_italic" = "Tillämpa kursiv stil";
 
 // Formatting Actions
diff --git a/Riot/Assets/uk.lproj/Vector.strings b/Riot/Assets/uk.lproj/Vector.strings
index 04e9b75d5..7c18d9f8b 100644
--- a/Riot/Assets/uk.lproj/Vector.strings
+++ b/Riot/Assets/uk.lproj/Vector.strings
@@ -2780,8 +2780,8 @@
 "authentication_qr_login_start_subtitle" = "Використовуйте камеру на цьому пристрої, щоб зісканувати QR-код, показаний на іншому пристрої:";
 "authentication_qr_login_start_title" = "Сканувати QR-код";
 "authentication_login_with_qr" = "Увійти використавши QR-код";
-"wysiwyg_composer_format_action_strikethrough" = "Застосувати форматування підкресленим";
-"wysiwyg_composer_format_action_underline" = "Застосувати форматування перекресленим";
+"wysiwyg_composer_format_action_underline" = "Застосувати форматування підкресленим";
+"wysiwyg_composer_format_action_strikethrough" = "Застосувати форматування перекресленим";
 
 // Formatting Actions
 "wysiwyg_composer_format_action_bold" = "Застосувати форматування жирним";
diff --git a/Riot/Assets/zh_Hant.lproj/Vector.strings b/Riot/Assets/zh_Hant.lproj/Vector.strings
index f92adb766..f7818a790 100644
--- a/Riot/Assets/zh_Hant.lproj/Vector.strings
+++ b/Riot/Assets/zh_Hant.lproj/Vector.strings
@@ -2026,8 +2026,8 @@
 // Links
 "wysiwyg_composer_link_action_text" = "文字";
 "wysiwyg_composer_format_action_link" = "套用連結格式";
-"wysiwyg_composer_format_action_strikethrough" = "套用底線格式";
-"wysiwyg_composer_format_action_underline" = "套用刪除線格式";
+"wysiwyg_composer_format_action_underline" = "套用底線格式";
+"wysiwyg_composer_format_action_strikethrough" = "套用刪除線格式";
 "wysiwyg_composer_format_action_italic" = "套用義式斜體格式";
 
 // Formatting Actions