Fix conflicts

14 files changed, 921 insertions, 23 deletions

diff --git a/README.md b/README.md
index 611ee14e..3bbf2b3e 100644
--- a/README.md
+++ b/README.md
@@ -2,9 +2,9 @@
 
 A web extension that redirects YouTube, Twitter, Instagram... requests to alternative privacy friendly frontends and backends.
 
-[![Matrix Badge](https://img.shields.io/matrix/libredirect:matrix.org?label=matrix%20chat)](https://matrix.to/#/#libredirect:tokhmi.xyz)
+[![Matrix Badge](https://img.shields.io/matrix/libredirect:matrix.org?label=matrix%20chat)](https://matrix.to/#/#libredirect-space:matrix.org)
 [![Firefox users Badge](https://img.shields.io/amo/users/libredirect?label=Firefox%20users)](https://addons.mozilla.org/firefox/addon/libredirect/)
-[![Matrix Badge](https://img.shields.io/liberapay/gives/libredirect?label=Liberapay)](https://liberapay.com/LibRedirect)
+[![LibrePay Badge](https://img.shields.io/liberapay/gives/libredirect?label=Liberapay)](https://liberapay.com/LibRedirect)
 
 [![Firefox Add-on](./img/badge-amo.png)](https://addons.mozilla.org/firefox/addon/libredirect/) 
 <a href="https://microsoftedge.microsoft.com/addons/detail/libredirect/aodffkeankebfonljgbcfbbaljopcpdb">
diff --git a/src/_locales/de/messages.json b/src/_locales/de/messages.json
index bd9cc42f..55bb0dc4 100644
--- a/src/_locales/de/messages.json
+++ b/src/_locales/de/messages.json
@@ -96,7 +96,7 @@
         "description": "used in the settings page"
     },
     "autoRedirect": {
-        "message": "Automatisch Instanzen meiden, die offline sind",
+        "message": "Automatisch von Offline-Instanzen zu Online-Instanzen wechseln",
         "description": "used in the settings page"
     },
     "exceptions": {
diff --git a/src/_locales/es/messages.json b/src/_locales/es/messages.json
new file mode 100644
index 00000000..07ea98c3
--- /dev/null
+++ b/src/_locales/es/messages.json
@@ -0,0 +1,215 @@
+{
+    "extensionName": {
+        "message": "LibRedirect",
+        "description": "name of the extension"
+    },
+    "switchInstance": {
+        "message": "Cambiar instancia",
+        "description": "used in manifest.json as shortcut description"
+    },
+    "settings": {
+        "message": "Ajustes",
+        "description": "used in the popup"
+    },
+    "general": {
+        "message": "General",
+        "description": "used in the settings page"
+    },
+    "translate": {
+        "message": "Traductor",
+        "description": "used in the settings page"
+    },
+    "search": {
+        "message": "Búsqueda",
+        "description": "used in the settings page"
+    },
+    "ytmusic": {
+        "message": "YT Music",
+        "description": "used in the settings page"
+    },
+    "wikipedia": {
+        "message": "Wikipedia",
+        "description": "used in the settings page"
+    },
+    "medium": {
+        "message": "Medium",
+        "description": "used in the settings page"
+    },
+    "tor": {
+        "message": "Tor",
+        "description": "used in the settings page"
+    },
+    "theme": {
+        "message": "Tema",
+        "description": "used in the settings page"
+    },
+    "light": {
+        "message": "Claro",
+        "description": "used in the settings page"
+    },
+    "autoRedirect": {
+        "message": "Redirigir automáticamente las instancias offline a las online",
+        "description": "used in the settings page"
+    },
+    "exceptions": {
+        "message": "Excepciones",
+        "description": "used in the settings page"
+    },
+    "importSettings": {
+        "message": "Importar Ajustes",
+        "description": "used in the settings page"
+    },
+    "exportSettings": {
+        "message": "Exportar Ajustes",
+        "description": "used in the settings page"
+    },
+    "customPopup": {
+        "message": "Personalizar Ventana Emergente",
+        "description": "used in the settings page"
+    },
+    "enable": {
+        "message": "Activar",
+        "description": "used in the settings page"
+    },
+    "protocol": {
+        "message": "Protocolo",
+        "description": "used in the settings page"
+    },
+    "normal": {
+        "message": "Normal",
+        "description": "used in the settings page"
+    },
+    "frontend": {
+        "message": "Frontend",
+        "description": "used in the settings page"
+    },
+    "embeddedVids": {
+        "message": "Frontend para Videos Incrustados",
+        "description": "used in the settings page"
+    },
+    "onlyEmbedded": {
+        "message": "solo incrustados",
+        "description": "used in the settings page"
+    },
+    "copyRaw": {
+        "message": "Copiar Original"
+    },
+    "copied": {
+        "message": "Copiado"
+    },
+    "unifySettings": {
+        "message": "Unificar Ajustes"
+    },
+    "lbry": {
+        "message": "LBRY"
+    },
+    "i2p": {
+        "message": "I2P"
+    },
+    "instanceOffline": {
+        "message": "Esta instancia está offline, serás redirigido/a luego de&nbsp;",
+        "description": "used in instance_offline.html"
+    },
+    "testInstancesLatency": {
+        "message": "Probar Latencia de las Instancias"
+    },
+    "youtube": {
+        "message": "YouTube",
+        "description": "used in the settings page"
+    },
+    "extensionDescription": {
+        "message": "Una extensión web que redirige sitios populares a frontends y backends alternativos que respetan la privacidad",
+        "description": "description of the extension"
+    },
+    "maps": {
+        "message": "Mapas",
+        "description": "used in the settings page"
+    },
+    "sendFiles": {
+        "message": "Enviar Archivos",
+        "description": "used in the settings page"
+    },
+    "twitter": {
+        "message": "Twitter",
+        "description": "used in the settings page"
+    },
+    "reddit": {
+        "message": "Reddit",
+        "description": "used in the settings page"
+    },
+    "instagram": {
+        "message": "Instagram",
+        "description": "used in the settings page"
+    },
+    "tiktok": {
+        "message": "TikTok",
+        "description": "used in the settings page"
+    },
+    "imgur": {
+        "message": "Imgur",
+        "description": "used in the settings page"
+    },
+    "resetSettings": {
+        "message": "Restablecer Ajustes",
+        "description": "used in the settings page"
+    },
+    "updateInstances": {
+        "message": "Actualizar Instancias",
+        "description": "used in the settings page"
+    },
+    "defaultInstances": {
+        "message": "Instancias Predeterminadas",
+        "description": "used in the settings page"
+    },
+    "peertube": {
+        "message": "PeerTube",
+        "description": "used in the settings page"
+    },
+    "system": {
+        "message": "Sistema",
+        "description": "used in the settings page"
+    },
+    "dark": {
+        "message": "Oscuro",
+        "description": "used in the settings page"
+    },
+    "customInstances": {
+        "message": "Instancias Personalizadas",
+        "description": "used in the settings page"
+    },
+    "notFullyPrivate": {
+        "message": "Este no es un frontend completamente privado."
+    },
+    "toggleAll": {
+        "message": "Alternar todo",
+        "description": "used in the settings page"
+    },
+    "onlyNotEmbedded": {
+        "message": "solo los no incrustados",
+        "description": "used in the settings page"
+    },
+    "instanceIsOff": {
+        "message": "La instancia está offline",
+        "description": "used in instance_offline.html"
+    },
+    "searchNote": {
+        "message": "Nota: Utilice la búsqueda en todo su potencial haciendo de LibRedirect su motor de búsqueda predeterminado.",
+        "description": "used in the settings page"
+    },
+    "redirectType": {
+        "message": "Tipo de Redirección",
+        "description": "used in the settings page"
+    },
+    "both": {
+        "message": "ambos",
+        "description": "used in the settings page"
+    },
+    "cancel": {
+        "message": "Cancelar",
+        "description": "used in instance_offline.html"
+    },
+    "redirectionCanceled": {
+        "message": "Redirección cancelada",
+        "description": "used in instance_offline.js"
+    }
+}
diff --git a/src/_locales/fr/messages.json b/src/_locales/fr/messages.json
index e758bacc..c3234890 100644
--- a/src/_locales/fr/messages.json
+++ b/src/_locales/fr/messages.json
@@ -44,7 +44,7 @@
         "description": "used in the settings page"
     },
     "dark": {
-        "message": "Obscur",
+        "message": "Sombre",
         "description": "used in the settings page"
     },
     "autoRedirect": {
@@ -56,11 +56,11 @@
         "description": "used in the settings page"
     },
     "importSettings": {
-        "message": "Paramètres d'importation",
+        "message": "Importation de paramètres",
         "description": "used in the settings page"
     },
     "exportSettings": {
-        "message": "Paramètres d'exportation",
+        "message": "Exportation de paramètres",
         "description": "used in the settings page"
     },
     "enable": {
@@ -211,5 +211,11 @@
     "ytmusic": {
         "message": "YT Music",
         "description": "used in the settings page"
+    },
+    "loki": {
+        "message": "Lokinet"
+    },
+    "protocolFallback": {
+        "message": "Retour au mode normal si aucune instance n’est disponible pour le protocole sélectionné"
     }
 }
diff --git a/src/_locales/gl/messages.json b/src/_locales/gl/messages.json
index 3468e337..fba02255 100644
--- a/src/_locales/gl/messages.json
+++ b/src/_locales/gl/messages.json
@@ -208,5 +208,11 @@
     },
     "i2p": {
         "message": "I2P"
+    },
+    "unifySettings": {
+        "message": "Unificar Axustes"
+    },
+    "loki": {
+        "message": "Lokinet"
     }
 }
diff --git a/src/_locales/it/messages.json b/src/_locales/it/messages.json
index 0d3cb84d..9370f1a9 100644
--- a/src/_locales/it/messages.json
+++ b/src/_locales/it/messages.json
@@ -211,5 +211,8 @@
     "frontend": {
         "message": "Frontend",
         "description": "used in the settings page"
+    },
+    "loki": {
+        "message": "Lokinet"
     }
 }
diff --git a/src/_locales/ko/messages.json b/src/_locales/ko/messages.json
new file mode 100644
index 00000000..ad48864c
--- /dev/null
+++ b/src/_locales/ko/messages.json
@@ -0,0 +1,199 @@
+{
+    "extensionName": {
+        "message": "LibRedirect",
+        "description": "name of the extension"
+    },
+    "switchInstance": {
+        "message": "인스턴스 바꾸기",
+        "description": "used in manifest.json as shortcut description"
+    },
+    "settings": {
+        "message": "설정",
+        "description": "used in the popup"
+    },
+    "general": {
+        "message": "일반",
+        "description": "used in the settings page"
+    },
+    "search": {
+        "message": "검색",
+        "description": "used in the settings page"
+    },
+    "translate": {
+        "message": "번역",
+        "description": "used in the settings page"
+    },
+    "ytmusic": {
+        "message": "YT Music",
+        "description": "used in the settings page"
+    },
+    "imgur": {
+        "message": "Imgur",
+        "description": "used in the settings page"
+    },
+    "wikipedia": {
+        "message": "Wikipedia",
+        "description": "used in the settings page"
+    },
+    "peertube": {
+        "message": "PeerTube",
+        "description": "used in the settings page"
+    },
+    "medium": {
+        "message": "Medium",
+        "description": "used in the settings page"
+    },
+    "tor": {
+        "message": "Tor",
+        "description": "used in the settings page"
+    },
+    "theme": {
+        "message": "테마",
+        "description": "used in the settings page"
+    },
+    "system": {
+        "message": "시스템",
+        "description": "used in the settings page"
+    },
+    "light": {
+        "message": "밝음",
+        "description": "used in the settings page"
+    },
+    "updateInstances": {
+        "message": "인스터스 업데이트",
+        "description": "used in the settings page"
+    },
+    "importSettings": {
+        "message": "설정 불러오기",
+        "description": "used in the settings page"
+    },
+    "exportSettings": {
+        "message": "설정 내보내기",
+        "description": "used in the settings page"
+    },
+    "enable": {
+        "message": "활성화",
+        "description": "used in the settings page"
+    },
+    "protocol": {
+        "message": "프로토콜",
+        "description": "used in the settings page"
+    },
+    "normal": {
+        "message": "일반",
+        "description": "used in the settings page"
+    },
+    "defaultInstances": {
+        "message": "기본 인스턴스",
+        "description": "used in the settings page"
+    },
+    "customInstances": {
+        "message": "사용자 인스턴스",
+        "description": "used in the settings page"
+    },
+    "frontend": {
+        "message": "프론트엔드",
+        "description": "used in the settings page"
+    },
+    "youtube": {
+        "message": "YouTube",
+        "description": "used in the settings page"
+    },
+    "testInstancesLatency": {
+        "message": "인스턴스 지연 시간 시험"
+    },
+    "redirectType": {
+        "message": "리다이렉트 종류",
+        "description": "used in the settings page"
+    },
+    "onlyEmbedded": {
+        "message": "임베디드 된 것만",
+        "description": "used in the settings page"
+    },
+    "onlyNotEmbedded": {
+        "message": "임베디드 안된 것만",
+        "description": "used in the settings page"
+    },
+    "instanceOffline": {
+        "message": "이 인스턴스는 오프라인입니다, 다음 초 후에 리다이렉트됩니다:&nbsp;",
+        "description": "used in instance_offline.html"
+    },
+    "notFullyPrivate": {
+        "message": "완전한 개인 프론트엔드가 아닙니다."
+    },
+    "searchNote": {
+        "message": "안내: LibRedirect를 기본 검색 엔진으로 만들면 완벽히 사용할 수 있습니다.",
+        "description": "used in the settings page"
+    },
+    "both": {
+        "message": "둘 다",
+        "description": "used in the settings page"
+    },
+    "embeddedVids": {
+        "message": "임베디드된 동영상 프론트엔드",
+        "description": "used in the settings page"
+    },
+    "unifySettings": {
+        "message": "설정 통일하기"
+    },
+    "maps": {
+        "message": "지도",
+        "description": "used in the settings page"
+    },
+    "sendFiles": {
+        "message": "파일 전송",
+        "description": "used in the settings page"
+    },
+    "instagram": {
+        "message": "Instagram",
+        "description": "used in the settings page"
+    },
+    "exceptions": {
+        "message": "예외",
+        "description": "used in the settings page"
+    },
+    "resetSettings": {
+        "message": "설정 초기화",
+        "description": "used in the settings page"
+    },
+    "customPopup": {
+        "message": "팝업 사용자 설정",
+        "description": "used in the settings page"
+    },
+    "dark": {
+        "message": "어두움",
+        "description": "used in the settings page"
+    },
+    "autoRedirect": {
+        "message": "오프라인 인스터스를 온라인으로 자동 리다이렉트",
+        "description": "used in the settings page"
+    },
+    "toggleAll": {
+        "message": "전체 전환",
+        "description": "used in the settings page"
+    },
+    "instanceIsOff": {
+        "message": "인스턴스 오프라인",
+        "description": "used in instance_offline.html"
+    },
+    "lbry": {
+        "message": "LBRY"
+    },
+    "i2p": {
+        "message": "I2P"
+    },
+    "cancel": {
+        "message": "취소",
+        "description": "used in instance_offline.html"
+    },
+    "redirectionCanceled": {
+        "message": "리다이렉션 취소됨",
+        "description": "used in instance_offline.js"
+    },
+    "copyRaw": {
+        "message": "Raw 복사"
+    },
+    "copied": {
+        "message": "복사됨"
+    }
+}
diff --git a/src/_locales/nl/messages.json b/src/_locales/nl/messages.json
new file mode 100644
index 00000000..fa223f60
--- /dev/null
+++ b/src/_locales/nl/messages.json
@@ -0,0 +1,211 @@
+{
+    "light": {
+        "message": "Licht thema",
+        "description": "used in the settings page"
+    },
+    "system": {
+        "message": "Systeemthema",
+        "description": "used in the settings page"
+    },
+    "customInstances": {
+        "message": "Aangepaste servers",
+        "description": "used in the settings page"
+    },
+    "dark": {
+        "message": "Donker thema",
+        "description": "used in the settings page"
+    },
+    "updateInstances": {
+        "message": "Serverlijst bijwerken",
+        "description": "used in the settings page"
+    },
+    "resetSettings": {
+        "message": "Standaardwaarden",
+        "description": "used in the settings page"
+    },
+    "customPopup": {
+        "message": "Pop-upvenster instellen",
+        "description": "used in the settings page"
+    },
+    "normal": {
+        "message": "Normaal",
+        "description": "used in the settings page"
+    },
+    "defaultInstances": {
+        "message": "Standaardservers",
+        "description": "used in the settings page"
+    },
+    "toggleAll": {
+        "message": "Alles aan/uit",
+        "description": "used in the settings page"
+    },
+    "frontend": {
+        "message": "Frontend",
+        "description": "used in the settings page"
+    },
+    "autoRedirect": {
+        "message": "Automatisch overschakelen naar online-servers",
+        "description": "used in the settings page"
+    },
+    "importSettings": {
+        "message": "Instellingen importeren",
+        "description": "used in the settings page"
+    },
+    "protocol": {
+        "message": "Protocol",
+        "description": "used in the settings page"
+    },
+    "extensionName": {
+        "message": "LibRedirect",
+        "description": "name of the extension"
+    },
+    "switchInstance": {
+        "message": "Andere server kiezen",
+        "description": "used in manifest.json as shortcut description"
+    },
+    "settings": {
+        "message": "Instellingen",
+        "description": "used in the popup"
+    },
+    "general": {
+        "message": "Algemeen",
+        "description": "used in the settings page"
+    },
+    "search": {
+        "message": "Zoeken",
+        "description": "used in the settings page"
+    },
+    "translate": {
+        "message": "Vertalen",
+        "description": "used in the settings page"
+    },
+    "maps": {
+        "message": "Kaarten",
+        "description": "used in the settings page"
+    },
+    "sendFiles": {
+        "message": "Bestanden versturen",
+        "description": "used in the settings page"
+    },
+    "youtube": {
+        "message": "YouTube",
+        "description": "used in the settings page"
+    },
+    "instagram": {
+        "message": "Instagram",
+        "description": "used in the settings page"
+    },
+    "twitter": {
+        "message": "Twitter",
+        "description": "used in the settings page"
+    },
+    "reddit": {
+        "message": "Reddit",
+        "description": "used in the settings page"
+    },
+    "tiktok": {
+        "message": "TikTok",
+        "description": "used in the settings page"
+    },
+    "ytmusic": {
+        "message": "YT Music",
+        "description": "used in the settings page"
+    },
+    "imgur": {
+        "message": "Imgur",
+        "description": "used in the settings page"
+    },
+    "wikipedia": {
+        "message": "Wikipedia",
+        "description": "used in the settings page"
+    },
+    "peertube": {
+        "message": "PeerTube",
+        "description": "used in the settings page"
+    },
+    "medium": {
+        "message": "Medium",
+        "description": "used in the settings page"
+    },
+    "theme": {
+        "message": "Thema",
+        "description": "used in the settings page"
+    },
+    "extensionDescription": {
+        "message": "Een browserextensie die je automatisch doorstuurt naar privacy-respecterende alternatieven voor populaire sites",
+        "description": "description of the extension"
+    },
+    "copied": {
+        "message": "Gekopieerd"
+    },
+    "lbry": {
+        "message": "LBRY"
+    },
+    "exceptions": {
+        "message": "Uitzonderingen",
+        "description": "used in the settings page"
+    },
+    "notFullyPrivate": {
+        "message": "Dit frontend is niet volledig privaat."
+    },
+    "searchNote": {
+        "message": "Tip: benut de extensie optimaal door LibRedirect in te stellen als de standaard zoekmachine.",
+        "description": "used in the settings page"
+    },
+    "redirectType": {
+        "message": "Soort doorverwijzing",
+        "description": "used in the settings page"
+    },
+    "embeddedVids": {
+        "message": "Ingesloten video's-frontend",
+        "description": "used in the settings page"
+    },
+    "both": {
+        "message": "Beide",
+        "description": "used in the settings page"
+    },
+    "onlyEmbedded": {
+        "message": "Alleen ingesloten",
+        "description": "used in the settings page"
+    },
+    "onlyNotEmbedded": {
+        "message": "Alleen niet-ingesloten",
+        "description": "used in the settings page"
+    },
+    "instanceOffline": {
+        "message": "Deze server is offline - je wordt doorgestuurd over&nbsp;",
+        "description": "used in instance_offline.html"
+    },
+    "cancel": {
+        "message": "Annuleren",
+        "description": "used in instance_offline.html"
+    },
+    "instanceIsOff": {
+        "message": "Server is offline",
+        "description": "used in instance_offline.html"
+    },
+    "protocolFallback": {
+        "message": "Terugvallen op reguliere server als er geen servers met het huidige protocol beschikbaar zijn"
+    },
+    "exportSettings": {
+        "message": "Instellingen exporteren",
+        "description": "used in the settings page"
+    },
+    "enable": {
+        "message": "Inschakelen",
+        "description": "used in the settings page"
+    },
+    "testInstancesLatency": {
+        "message": "Controleren op serververtragingen"
+    },
+    "copyRaw": {
+        "message": "Onbewerkte code kopiëren"
+    },
+    "redirectionCanceled": {
+        "message": "Doorverwijzen afgebroken",
+        "description": "used in instance_offline.js"
+    },
+    "unifySettings": {
+        "message": "Globale instellingen"
+    }
+}
diff --git a/src/_locales/pl/messages.json b/src/_locales/pl/messages.json
index 136f0de5..8ee06cc0 100644
--- a/src/_locales/pl/messages.json
+++ b/src/_locales/pl/messages.json
@@ -211,5 +211,8 @@
     "customPopup": {
         "message": "Dostosuj Wyskakujące Okienko",
         "description": "used in the settings page"
+    },
+    "loki": {
+        "message": "Lokinet"
     }
 }
diff --git a/src/_locales/ru/messages.json b/src/_locales/ru/messages.json
new file mode 100644
index 00000000..04afb07a
--- /dev/null
+++ b/src/_locales/ru/messages.json
@@ -0,0 +1,218 @@
+{
+    "extensionDescription": {
+        "message": "Веб-расширение, которое перенаправляет популярные сайты на альтернативные фронтенды и бэкенды, обеспечивающие конфиденциальность",
+        "description": "description of the extension"
+    },
+    "extensionName": {
+        "message": "LibRedirect",
+        "description": "name of the extension"
+    },
+    "protocol": {
+        "message": "Протокол",
+        "description": "used in the settings page"
+    },
+    "normal": {
+        "message": "Нормальный",
+        "description": "used in the settings page"
+    },
+    "settings": {
+        "message": "Настройки",
+        "description": "used in the popup"
+    },
+    "general": {
+        "message": "Общее",
+        "description": "used in the settings page"
+    },
+    "search": {
+        "message": "Поиск",
+        "description": "used in the settings page"
+    },
+    "translate": {
+        "message": "Перевод",
+        "description": "used in the settings page"
+    },
+    "maps": {
+        "message": "Карты",
+        "description": "used in the settings page"
+    },
+    "sendFiles": {
+        "message": "Отправка файлов",
+        "description": "used in the settings page"
+    },
+    "youtube": {
+        "message": "YouTube",
+        "description": "used in the settings page"
+    },
+    "tiktok": {
+        "message": "TikTok",
+        "description": "used in the settings page"
+    },
+    "ytmusic": {
+        "message": "YT Music",
+        "description": "used in the settings page"
+    },
+    "imgur": {
+        "message": "Imgur",
+        "description": "used in the settings page"
+    },
+    "wikipedia": {
+        "message": "Wikipedia",
+        "description": "used in the settings page"
+    },
+    "peertube": {
+        "message": "PeerTube",
+        "description": "used in the settings page"
+    },
+    "importSettings": {
+        "message": "Импорт настроек",
+        "description": "used in the settings page"
+    },
+    "exportSettings": {
+        "message": "Экспорт настроек",
+        "description": "used in the settings page"
+    },
+    "resetSettings": {
+        "message": "Сброс настроек",
+        "description": "used in the settings page"
+    },
+    "customPopup": {
+        "message": "Настроить всплывающее окно",
+        "description": "used in the settings page"
+    },
+    "redirectType": {
+        "message": "Тип перенаправления",
+        "description": "used in the settings page"
+    },
+    "both": {
+        "message": "оба",
+        "description": "used in the settings page"
+    },
+    "onlyEmbedded": {
+        "message": "только встроенные",
+        "description": "used in the settings page"
+    },
+    "onlyNotEmbedded": {
+        "message": "только не встроеные",
+        "description": "used in the settings page"
+    },
+    "instanceOffline": {
+        "message": "Этот экземпляр находится в автономном режиме, вы будете перенаправлены после&nbsp;",
+        "description": "used in instance_offline.html"
+    },
+    "cancel": {
+        "message": "Отмена",
+        "description": "used in instance_offline.html"
+    },
+    "instanceIsOff": {
+        "message": "Экземпляр не в сети",
+        "description": "used in instance_offline.html"
+    },
+    "redirectionCanceled": {
+        "message": "Перенаправление отменено",
+        "description": "used in instance_offline.js"
+    },
+    "switchInstance": {
+        "message": "Переключить экземпляр",
+        "description": "used in manifest.json as shortcut description"
+    },
+    "autoRedirect": {
+        "message": "Автоматическое перенаправление на экземпляров находящихся в сети",
+        "description": "used in the settings page"
+    },
+    "updateInstances": {
+        "message": "Обновить экземпляры",
+        "description": "used in the settings page"
+    },
+    "defaultInstances": {
+        "message": "Экземпляры по умолчанию",
+        "description": "used in the settings page"
+    },
+    "customInstances": {
+        "message": "Пользовательские экземпляры",
+        "description": "used in the settings page"
+    },
+    "embeddedVids": {
+        "message": "Фронтенд со встроенным видео",
+        "description": "used in the settings page"
+    },
+    "copied": {
+        "message": "Скопировано"
+    },
+    "lbry": {
+        "message": "LBRY"
+    },
+    "i2p": {
+        "message": "I2P"
+    },
+    "loki": {
+        "message": "Lokinet"
+    },
+    "testInstancesLatency": {
+        "message": "Тестирование задержки экземпляров"
+    },
+    "copyRaw": {
+        "message": "Скопировать напрямую"
+    },
+    "unifySettings": {
+        "message": "Унифицировать настройки"
+    },
+    "instagram": {
+        "message": "Instagram",
+        "description": "used in the settings page"
+    },
+    "enable": {
+        "message": "Включить",
+        "description": "used in the settings page"
+    },
+    "twitter": {
+        "message": "Twitter",
+        "description": "used in the settings page"
+    },
+    "system": {
+        "message": "Системная",
+        "description": "used in the settings page"
+    },
+    "exceptions": {
+        "message": "Исключения",
+        "description": "used in the settings page"
+    },
+    "reddit": {
+        "message": "Reddit",
+        "description": "used in the settings page"
+    },
+    "tor": {
+        "message": "Tor",
+        "description": "used in the settings page"
+    },
+    "medium": {
+        "message": "Medium",
+        "description": "used in the settings page"
+    },
+    "theme": {
+        "message": "Тема",
+        "description": "used in the settings page"
+    },
+    "light": {
+        "message": "Светлая",
+        "description": "used in the settings page"
+    },
+    "dark": {
+        "message": "Тёмная",
+        "description": "used in the settings page"
+    },
+    "toggleAll": {
+        "message": "Переключить все",
+        "description": "used in the settings page"
+    },
+    "notFullyPrivate": {
+        "message": "Это не полностью приватный фронтенд."
+    },
+    "frontend": {
+        "message": "Фронтенд",
+        "description": "used in the settings page"
+    },
+    "searchNote": {
+        "message": "Примечание: Используйте поиск в полной мере, сделав LibRedirect поисковой системой по умолчанию.",
+        "description": "used in the settings page"
+    }
+}
diff --git a/src/_locales/tr/messages.json b/src/_locales/tr/messages.json
index 3148662e..8763af8f 100644
--- a/src/_locales/tr/messages.json
+++ b/src/_locales/tr/messages.json
@@ -211,5 +211,11 @@
     "normal": {
         "message": "Normal",
         "description": "used in the settings page"
+    },
+    "loki": {
+        "message": "Lokinet"
+    },
+    "protocolFallback": {
+        "message": "Geçerli protokol için hiçbir örnek kullanılabilir değilse normale geri dön"
     }
 }
diff --git a/src/instances/blacklist.json b/src/instances/blacklist.json
index 5819fb7d..54b7fe0b 100644
--- a/src/instances/blacklist.json
+++ b/src/instances/blacklist.json
@@ -8,9 +8,12 @@
     "https://piped.mha.fi",
     "https://piped.shimul.me",
     "https://pipedus.palash.dev",
+    "https://piped.waffle.wiki",
+    "https://watch.whatever.social",
     "https://nitter.domain.glass",
     "https://birdsite.xanny.family",
     "https://nitter.moomoo.me",
+    "https://nitter.it",
     "https://notabird.site",
     "https://fuckthesacklers.network",
     "https://nitter.winscloud.net",
diff --git a/src/instances/data.json b/src/instances/data.json
index a532260f..b74d0622 100644
--- a/src/instances/data.json
+++ b/src/instances/data.json
@@ -16,10 +16,11 @@
       "https://invidious.projectsegfau.lt",
       "https://inv.vern.cc",
       "https://invidious.nerdvpn.de",
+      "https://inv.privacy.com.de",
       "https://invidious.slipfox.xyz",
+      "https://invidious.weblibre.org",
       "https://youtube.076.ne.jp",
       "https://invidious.esmailelbob.xyz",
-      "https://invidious.weblibre.org",
       "https://invidious.namazso.eu"
     ],
     "tor": [
@@ -46,10 +47,13 @@
       "https://piped.mha.fi",
       "https://piped.shimul.me",
       "https://pipedus.palash.dev",
+      "https://piped.waffle.wiki",
+      "https://watch.whatever.social",
       "https://yt.jae.fi",
       "https://piped.mint.lgbt",
       "https://piped.privacy.com.de",
-      "https://piped.esmailelbob.xyz"
+      "https://piped.esmailelbob.xyz",
+      "https://piped.projectsegfau.lt"
     ],
     "tor": [
       "http://piped2bbch4xslbl2ckr6k62q56kon56ffowxaqzy42ai22a4sash3ad.onion"
@@ -391,7 +395,8 @@
       "https://wuetre.herokuapp.com",
       "https://quetreus.herokuapp.com",
       "https://quetre.tokhmi.xyz",
-      "https://quetre.projectsegfau.lt"
+      "https://quetre.projectsegfau.lt",
+      "https://quetre.esmailelbob.xyz"
     ],
     "tor": [],
     "i2p": [],
@@ -402,7 +407,8 @@
       "https://libremdb.herokuapp.com",
       "https://libremdb.pussthecat.org",
       "https://libremdbeu.herokuapp.com",
-      "https://lmdb.tokhmi.xyz"
+      "https://lmdb.tokhmi.xyz",
+      "https://libremdb.esmailelbob.xyz"
     ],
     "tor": [],
     "i2p": [],
@@ -472,6 +478,7 @@
       "https://searx.netzspielplatz.de",
       "https://searx.nixnet.services",
       "https://searx.org",
+      "https://searx.priv.pw",
       "https://searx.pwoss.org",
       "https://searx.rasp.fr",
       "https://searx.ru",
@@ -496,7 +503,6 @@
     ],
     "tor": [
       "http://3afisqjw2rxm6z7mmstyt5rx75qfqrgxnkzftknbp2vhipr2nrmrjdyd.onion",
-      "http://w5rl6wsd7mzj4bdkbuqvzidet5osdsm5jhg2f7nvfidakfq5exda5wid.onion",
       "http://yra4tke2pwcnatxjkufpw6kvebu3h3ti2jca2lcdpgx3mpwol326lzid.onion",
       "http://z5vawdol25vrmorm4yydmohsd4u6rdoj2sylvoi3e3nqvxkvpqul7bqd.onion",
       "http://zbuc3bbzbfdqqo2x46repx2ddajbha6fpsjeeptjhhhhzji3zopxdqyd.onion",
@@ -519,10 +525,10 @@
       "https://opnxng.com",
       "https://paulgo.io",
       "https://priv.au",
-      "https://private-searx.ml",
       "https://privatus.live",
       "https://s.frlt.one",
       "https://s.zhaocloud.net",
+      "https://saber.tk",
       "https://search.affusio.com",
       "https://search.ashs.club",
       "https://search.bingowaves.xyz",
@@ -551,12 +557,10 @@
       "https://searx.fi",
       "https://searx.fmac.xyz",
       "https://searx.gnous.eu",
-      "https://searx.loafland.xyz",
       "https://searx.mha.fi",
       "https://searx.mistli.net",
       "https://searx.namejeff.xyz",
       "https://searx.orion-hub.fr",
-      "https://searx.priv.pw",
       "https://searx.prvcy.eu",
       "https://searx.rimkus.it",
       "https://searx.sethforprivacy.com",
@@ -577,8 +581,8 @@
       "https://xcxc.ml"
     ],
     "tor": [
+      "http://w5rl6wsd7mzj4bdkbuqvzidet5osdsm5jhg2f7nvfidakfq5exda5wid.onion",
       "http://4n53nafyi77iplnbrpmxnp3x4exbswwxigujaxy3b37fvr7bvlopxeyd.onion",
-      "http://x5gdjh6t7kb4yubpufhtc3l3df2acev3emxdasd5vyuyoon5rzf5zkyd.onion",
       "http://search3q76rqpektbrchlf2rjq4fnbxzeov6rljdywg3nwbunpgd7bid.onion",
       "http://searchoorwalty5a2ailrboa2asqyts2u7bdoqwnjefpgjobpvtzn4qd.onion",
       "http://gbat2pbpg7ys3fi3pbp64667tt5x66mg45xok35bxdw7v55brm7a27yd.onion",
@@ -668,6 +672,7 @@
     "loki": []
   },
   "peertube": [
+    "https://soberania.tv",
     "https://pire.artisanlogiciel.net",
     "https://trutube.xyz",
     "https://tube-test.apps.education.fr",
@@ -1022,7 +1027,6 @@
     "https://peertube.marud.fr",
     "https://freetubehub.live",
     "https://peertube.librelabucm.org",
-    "https://tube4.apolut.net",
     "https://mtube.mooo.com",
     "https://skeptube.fr",
     "https://tube.villejuif.fr",
@@ -1039,7 +1043,6 @@
     "https://open.movie",
     "https://tube.rfc1149.net",
     "https://tube.radiomercure.fr",
-    "https://medias.debrouillonet.org",
     "https://peertube.1984.cz",
     "https://tube.sp4ke.com",
     "https://pt.nix.uno",
@@ -1071,7 +1074,6 @@
     "https://dud-video.inf.tu-dresden.de",
     "https://media-test.interior.edu.uy",
     "https://media.interior.edu.uy",
-    "https://peertube.la-scic.fr",
     "https://phoenixproject.group",
     "https://peertube.sebu77.com",
     "https://www.orion-hub.fr",
@@ -1129,7 +1131,6 @@
     "https://tube.geekyboo.net",
     "https://notretube.asselma.eu",
     "https://canal.facil.services",
-    "https://ukva.li",
     "https://pt.gordons.gen.nz",
     "https://tube.misterbanal.net",
     "https://peertube.fomin.site",
@@ -1225,7 +1226,6 @@
     "https://kino.kompot.si",
     "https://tube.kockatoo.org",
     "https://peertube.cabaal.net",
-    "https://sovran.video",
     "https://stream.k-prod.fr",
     "https://tube.tylerdavis.xyz",
     "https://video.marcorennmaus.de",
@@ -1440,7 +1440,6 @@
     "https://peertube.tspu.edu.ru",
     "https://p.lu",
     "https://serv3.wiki-tube.de",
-    "https://serv1.wiki-tube.de",
     "https://video.lavolte.net",
     "https://peertube.public.cat",
     "https://peertube.anduin.net",
@@ -1508,7 +1507,6 @@
     "https://video.pony.gallery",
     "https://tube.skrep.in",
     "https://tube.others.social",
-    "https://videos.ubuntu-paris.org",
     "https://tube-poitiers.beta.education.fr",
     "https://vid.wildeboer.net",
     "https://battlepenguin.video",
@@ -1712,6 +1710,12 @@
     "https://peertube.qtg.fr",
     "https://tube.p2p.legal",
     "https://troll.tv",
-    "https://videos.iut-orsay.fr"
+    "https://videos.iut-orsay.fr",
+    "https://peertube.solidev.net",
+    "https://videos.cemea.org",
+    "https://video.passageenseine.fr",
+    "https://peertube.touhoppai.moe",
+    "https://share.tube",
+    "https://peertube.heraut.eu"
   ]
 }
\ No newline at end of file
diff --git a/src/instances/piped.json b/src/instances/piped.json
new file mode 100644
index 00000000..5076091d
--- /dev/null
+++ b/src/instances/piped.json
@@ -0,0 +1,24 @@
+{
+  "normal": [
+    "https://piped.kavin.rocks",
+    "https://piped.tokhmi.xyz",
+    "https://piped.moomoo.me",
+    "https://il.ax",
+    "https://piped.syncpundit.com",
+    "https://piped.mha.fi",
+    "https://piped.shimul.me",
+    "https://pipedus.palash.dev",
+    "https://piped.waffle.wiki",
+    "https://watch.whatever.social",
+    "https://yt.jae.fi",
+    "https://piped.mint.lgbt",
+    "https://piped.privacy.com.de",
+    "https://piped.esmailelbob.xyz",
+    "https://piped.projectsegfau.lt/"
+  ],
+  "tor": [
+    "http://piped2bbch4xslbl2ckr6k62q56kon56ffowxaqzy42ai22a4sash3ad.onion"
+  ],
+  "i2p": [],
+  "loki": []
+}
\ No newline at end of file