diff --git a/Android.mk b/Android.mk
index da8cdd0..f0e1a61 100755
--- a/Android.mk
+++ b/Android.mk
@@ -237,9 +237,6 @@
 ifneq ($(RECOVERY_SDCARD_ON_DATA),)
 	LOCAL_CFLAGS += -DRECOVERY_SDCARD_ON_DATA
 endif
-ifneq ($(TW_INCLUDE_DUMLOCK),)
-	LOCAL_CFLAGS += -DTW_INCLUDE_DUMLOCK
-endif
 ifneq ($(TW_INTERNAL_STORAGE_PATH),)
 	LOCAL_CFLAGS += -DTW_INTERNAL_STORAGE_PATH=$(TW_INTERNAL_STORAGE_PATH)
 endif
@@ -557,11 +554,6 @@
 ifneq ($(TW_EXCLUDE_ENCRYPTED_BACKUPS),)
     TWRP_REQUIRED_MODULES += openaes openaes_license
 endif
-ifeq ($(TW_INCLUDE_DUMLOCK), true)
-    TWRP_REQUIRED_MODULES += \
-        htcdumlock htcdumlocksys flash_imagesys dump_imagesys libbmlutils.so \
-        libflashutils.so libmmcutils.so libmtdutils.so HTCDumlock.apk
-endif
 ifeq ($(TW_INCLUDE_FB2PNG), true)
     TWRP_REQUIRED_MODULES += fb2png
 endif
@@ -714,7 +706,6 @@
 
 #includes for TWRP
 include $(commands_TWRP_local_path)/injecttwrp/Android.mk \
-    $(commands_TWRP_local_path)/htcdumlock/Android.mk \
     $(commands_TWRP_local_path)/mmcutils/Android.mk \
     $(commands_TWRP_local_path)/bmlutils/Android.mk \
     $(commands_TWRP_local_path)/prebuilt/Android.mk \
diff --git a/data.cpp b/data.cpp
index 22efb18..f7d028f 100755
--- a/data.cpp
+++ b/data.cpp
@@ -606,13 +606,6 @@
 	mConst.SetValue(TW_ALLOW_PARTITION_SDCARD, "1");
 #endif
 
-#ifdef TW_INCLUDE_DUMLOCK
-	printf("TW_INCLUDE_DUMLOCK := true\n");
-	mConst.SetValue(TW_SHOW_DUMLOCK, "1");
-#else
-	mConst.SetValue(TW_SHOW_DUMLOCK, "0");
-#endif
-
 	mData.SetValue(TW_RECOVERY_FOLDER_VAR, TW_DEFAULT_RECOVERY_FOLDER);
 
 	str = GetCurrentStoragePath();
diff --git a/gui/objects.hpp b/gui/objects.hpp
index ae1eeff..89cb742 100755
--- a/gui/objects.hpp
+++ b/gui/objects.hpp
@@ -341,9 +341,6 @@
 	int fixpermissions(std::string arg);
 	int dd(std::string arg);
 	int partitionsd(std::string arg);
-	int installhtcdumlock(std::string arg);
-	int htcdumlockrestoreboot(std::string arg);
-	int htcdumlockreflashrecovery(std::string arg);
 	int cmd(std::string arg);
 	int terminalcommand(std::string arg);
 	int killterminal(std::string arg);
diff --git a/gui/theme/common/landscape.xml b/gui/theme/common/landscape.xml
index f8eb0c2..4daf50f 100755
--- a/gui/theme/common/landscape.xml
+++ b/gui/theme/common/landscape.xml
@@ -3769,10 +3769,6 @@
 					<condition var1="tw_has_data_media" var2="1"/>
 					<action function="page">fixcontexts</action>
 				</listitem>
-				<listitem name="{@dumlock_btn=HTC Dumlock}">
-					<condition var1="tw_show_dumlock" var2="1"/>
-					<action function="page">htcdumlock</action>
-				</listitem>
 				<listitem name="{@inject_twrp_btn=Inject TWRP}">
 					<condition var1="tw_has_injecttwrp" var2="1"/>
 					<actions>
@@ -4075,72 +4071,6 @@
 			</action>
 		</page>
 
-		<page name="htcdumlock">
-			<template name="page"/>
-
-			<text style="text_l">
-				<placement x="%col1_x_header%" y="%row3_header_y%"/>
-				<text>{@advanced_hdr=Advanced}</text>
-			</text>
-
-			<text style="text_m">
-				<placement x="%col1_x_header%" y="%row4_header_y%"/>
-				<text>{@dumlock_hdr=HTC Dumlock}</text>
-			</text>
-
-			<button style="main_button_m">
-				<placement x="%col2_x_left%" y="%row2_y%"/>
-				<text>{@dumlock_restore_btn=Restore Original Boot}</text>
-				<actions>
-					<action function="set">tw_back=htcdumlock</action>
-					<action function="set">tw_action=htcdumlockrestoreboot</action>
-					<action function="set">tw_text1={@dumlock_restore_confirm=Restore original boot image?}</action>
-					<action function="set">tw_action_text1={@dumlock_restoring=Restoring Original Boot...}</action>
-					<action function="set">tw_complete_text1={@dumlock_restore_complete=Restore Original Boot Complete}</action>
-					<action function="set">tw_slider_text={@swipe_to_confirm=Swipe to Confirm}</action>
-					<action function="page">confirm_action</action>
-				</actions>
-			</button>
-
-			<button style="main_button_m">
-				<placement x="%col2_x_left%" y="%row6a_y%"/>
-				<text>{@dumlock_reflash_btn=Reflash Recovery}</text>
-				<actions>
-					<action function="set">tw_back=htcdumlock</action>
-					<action function="set">tw_action=htcdumlockreflashrecovery</action>
-					<action function="set">tw_text1={@dumlock_reflash_confirm=Reflash recovery to boot?}</action>
-					<action function="set">tw_action_text1={@dumlock_reflashing=Flashing recovery to boot...}</action>
-					<action function="set">tw_complete_text1={@dumlock_reflash_complete=Recovery Flash to Boot Complete}</action>
-					<action function="set">tw_slider_text={@swipe_to_confirm=Swipe to Confirm}</action>
-					<action function="page">confirm_action</action>
-				</actions>
-			</button>
-
-			<button style="main_button_m">
-				<placement x="%col2_x_left%" y="%row11_y%"/>
-				<text>{@dumlock_install_btn=Install HTC Dumlock}</text>
-				<actions>
-					<action function="set">tw_back=htcdumlock</action>
-					<action function="set">tw_action=installhtcdumlock</action>
-					<action function="set">tw_text1={@dumlock_install_confirm=Install HTC dumlock files to ROM?}</action>
-					<action function="set">tw_action_text1={@dumlock_installing=Installing HTC Dumlock...}</action>
-					<action function="set">tw_complete_text1={@dumlock_install_complete=HTC Dumlock Install Complete}</action>
-					<action function="set">tw_slider_text={@swipe_to_confirm=Swipe to Confirm}</action>
-					<action function="page">confirm_action</action>
-				</actions>
-			</button>
-
-			<action>
-				<touch key="home"/>
-				<action function="page">main</action>
-			</action>
-
-			<action>
-				<touch key="back"/>
-				<action function="page">advanced</action>
-			</action>
-		</page>
-
 		<page name="repackselect">
 			<template name="page"/>
 
diff --git a/gui/theme/common/languages/cz.xml b/gui/theme/common/languages/cz.xml
index 5194704..69c4ed2 100644
--- a/gui/theme/common/languages/cz.xml
+++ b/gui/theme/common/languages/cz.xml
@@ -399,7 +399,6 @@
 		<string name="language_hdr">Jazyk</string>
 		<string name="terminal_btn">Terminál</string>
 		<string name="reload_theme_btn">Načíst téma</string>
-		<string name="dumlock_btn">HTC Dumlock</string>
 		<string name="inject_twrp_btn">Vložit TWRP</string>
 		<string name="inject_twrp_confirm">Znova vložit TWRP?</string>
 		<string name="injecting_twrp">Znova vkladám TWRP...</string>
@@ -419,19 +418,6 @@
 		<string name="partitioning_sd">Rozdělování SD karty...</string>
 		<string name="partitioning_sd2">Toto potrvá několik minut.</string>
 		<string name="part_sd_complete">Rozdělení dokončeno</string>
-		<string name="dumlock_hdr">HTC Dumlock</string>
-		<string name="dumlock_restore_btn">Onbovit původní Boot</string>
-		<string name="dumlock_restore_confirm">Obnovit původní Boot?</string>
-		<string name="dumlock_restoring">Obnovování původního Bootu...</string>
-		<string name="dumlock_restore_complete">Obnova původního Bootu dokončená</string>
-		<string name="dumlock_reflash_btn">Přepsání Recovery</string>
-		<string name="dumlock_reflash_confirm">Přepsat Recovery při startu?</string>
-		<string name="dumlock_reflashing">Přepisování Recovery při startu...</string>
-		<string name="dumlock_reflash_complete">Přepsání Recovery při startu dokončeno</string>
-		<string name="dumlock_install_btn">Instalovat HTC Dumlock</string>
-		<string name="dumlock_install_confirm">Instalovat soubory HTC Dumlock do ROM?</string>
-		<string name="dumlock_installing">Instalace HTC Dumlock...</string>
-		<string name="dumlock_install_complete">Instalace HTC Dumlock dokončená</string>
 		<string name="swipe_to_unlock">Potáhnutím odemknout</string>
 		<string name="swipe_unlock">   Odemknout</string>
 		<string name="fm_hdr">Souborový manažer</string>
@@ -700,9 +686,6 @@
 		<string name="digest_match" version="2">Digest souhlasí</string>
 		<string name="pid_signal">Proces {1} skončil se signálem: {2}</string>
 		<string name="pid_error">Proces {1} skončil s CHYBOU: {2}</string>
-		<string name="install_dumlock">Instalování HTC Dumlock do systému...</string>
-		<string name="dumlock_restore">Obnovování původního Bootu...</string>
-		<string name="dumlock_reflash">Zapisování Recovery do Bootu...</string>
 		<string name="run_script">Provádění skriptu {1}...</string>
 		<string name="rename_stock">Přejmenování souboru s tovární Recovery v /systém pro zabránění přepsání TWRP tovární ROM.</string>
 		<string name="split_backup">Rozdělení zálohy do více archívů...</string>
diff --git a/gui/theme/common/languages/de.xml b/gui/theme/common/languages/de.xml
index 92cf03c..2b5963e 100644
--- a/gui/theme/common/languages/de.xml
+++ b/gui/theme/common/languages/de.xml
@@ -397,7 +397,6 @@
 		<string name="language_hdr">Sprache</string>
 		<string name="terminal_btn">Terminal</string>
 		<string name="reload_theme_btn">Theme neu laden</string>
-		<string name="dumlock_btn">HTC Dumlock</string>
 		<string name="inject_twrp_btn">TWRP injizieren</string>
 		<string name="inject_twrp_confirm">TWRP wieder injizieren?</string>
 		<string name="injecting_twrp">TWRP wird wieder injiziert...</string>
@@ -417,19 +416,6 @@
 		<string name="partitioning_sd">Partitioniere SD-Karte...</string>
 		<string name="partitioning_sd2">Dies wird einige Minuten dauern.</string>
 		<string name="part_sd_complete">Partitionierung abgeschlossen</string>
-		<string name="dumlock_hdr">HTC Dumlock</string>
-		<string name="dumlock_restore_btn">Orginale Boot-Partition wiederherstellen</string>
-		<string name="dumlock_restore_confirm">Orginales Image der Boot-Partition wiederherstellen?</string>
-		<string name="dumlock_restoring">Stelle originale Boot-Partition wieder her...</string>
-		<string name="dumlock_restore_complete">Wiederherstellen der orginalen Boot-Partition abgeschlossen</string>
-		<string name="dumlock_reflash_btn">Recovery erneut einspielen</string>
-		<string name="dumlock_reflash_confirm">Recovery in Boot-Partition einspielen?</string>
-		<string name="dumlock_reflashing">Spiele Recovery in Boot-Partition ein...</string>
-		<string name="dumlock_reflash_complete">Einspielen der Recovery in die Boot-Partition abgeschlossen</string>
-		<string name="dumlock_install_btn">HTC Dumlock installieren</string>
-		<string name="dumlock_install_confirm">HTC Dumlock Dateien ins ROM installieren?</string>
-		<string name="dumlock_installing">Installiere HTC Dumlock...</string>
-		<string name="dumlock_install_complete">HTC Dumlock Installation abgeschlossen</string>
 		<string name="swipe_to_unlock">Bildschirm entsperren</string>
 		<string name="swipe_unlock">Entsperren</string>
 		<string name="fm_hdr">Dateimanager</string>
@@ -685,9 +671,6 @@
 		<string name="digest_match" version="2">Digest stimmt überein</string>
 		<string name="pid_signal">Prozess {1} endete mit Meldung: {2}</string>
 		<string name="pid_error">Prozess {1} endete mit FEHLER: {2}</string>
-		<string name="install_dumlock">Installiere HTC Dumlock in System-Partition...</string>
-		<string name="dumlock_restore">Stelle originale Boot-Partition wieder her...</string>
-		<string name="dumlock_reflash">Recovery auf Boot-Partition einspielen...</string>
 		<string name="run_script">Führe {1}-Skript aus...</string>
 		<string name="rename_stock">Hersteller-Recovery in "/system" wurde umbenannt, damit das Hersteller-ROM TWRP nicht überschreibt.</string>
 		<string name="split_backup">Sicherungs-Datei wird in mehrere Archive aufgeteilt...</string>
diff --git a/gui/theme/common/languages/el.xml b/gui/theme/common/languages/el.xml
index 688299a..79b6ecb 100644
--- a/gui/theme/common/languages/el.xml
+++ b/gui/theme/common/languages/el.xml
@@ -375,7 +375,6 @@
         <string name="language_hdr">Γλώσσα</string>
         <string name="terminal_btn">Τερματικό</string>
         <string name="reload_theme_btn">Επαναφόρτ. θέματ.</string>
-        <string name="dumlock_btn">HTC Dumlock</string>
         <string name="inject_twrp_btn">Εισαγωγή TWRP</string>
         <string name="inject_twrp_confirm">Επανεισαγωγή TWRP;</string>
         <string name="injecting_twrp">Επανεισαγωγή TWRP...</string>
@@ -395,19 +394,6 @@
         <string name="partitioning_sd">Διαχώριση κάρτας SD...</string>
         <string name="partitioning_sd2">Αυτό θα διαρκέσει μερικά λεπτά.</string>
         <string name="part_sd_complete">Η Διαχώριση ολοκληρώθηκε</string>
-        <string name="dumlock_hdr">HTC Dumlock</string>
-        <string name="dumlock_restore_btn">Επαναφέρετε το Αρχικό Boot</string>
-        <string name="dumlock_restore_confirm">Επαναφορά την αρχικής εικόνας boot;</string>
-        <string name="dumlock_restoring">Επαναφορά του Αρχικού Boot...</string>
-        <string name="dumlock_restore_complete">Επαναφορά του Αρχικού Boot Ολοκληρώθηκε</string>
-        <string name="dumlock_reflash_btn">Επανεγγραφή Recovery</string>
-        <string name="dumlock_reflash_confirm">Επανεγγραφή Recovery στο boot;</string>
-        <string name="dumlock_reflashing">Εγγραφή recovery στο boot...</string>
-        <string name="dumlock_reflash_complete">Η Εγγραφή Recovery στο Boot Ολοκληρώθηκε</string>
-        <string name="dumlock_install_btn">Εγκατάσταση του HTC Dumlock</string>
-        <string name="dumlock_install_confirm">Εγκατάσταση αρχείων HTC dumlock στο λειτουργικό;</string>
-        <string name="dumlock_installing">Εγκατάσταση του HTC Dumlock...</string>
-        <string name="dumlock_install_complete">Η εγκατάσταση HTC Dumlock Ολοκληρώθηκε</string>
         <string name="swipe_to_unlock">Σύρετε για ξεκλείδωμα</string>
         <string name="swipe_unlock">   Ξεκλείδωμα</string>
         <string name="fm_hdr">Διαχείριση αρχείων</string>
@@ -623,9 +609,6 @@
         <string name="digest_match" version="2">Τα Digest ταυτίζονται</string>
         <string name="pid_signal">{1} διαδικασία τερματίστηκε με σήμα: {2}</string>
         <string name="pid_error">{1} διαδικασία τερματίστηκε με ΣΦΑΛΜΑ: {2}</string>
-        <string name="install_dumlock">Εγκατάσταση HTC Dumlock στο σύστημα...</string>
-        <string name="dumlock_restore">Επαναφορά του Αρχικού Boot...</string>
-        <string name="dumlock_reflash">Επανεγγραφή recovery στο boot...</string>
         <string name="run_script">Εκτέλεση {1} script...</string>
         <string name="rename_stock">Μετονομασία αρχικού recovery στο /system για να αποτρέψετε την αντικατάσταση του TWRP από το λειτουργικό.</string>
         <string name="split_backup">Διάσπαση αντίγραφου ασφαλείας σε πολλαπλά αρχεία...</string>
diff --git a/gui/theme/common/languages/en.xml b/gui/theme/common/languages/en.xml
index 1f3e494..e284006 100755
--- a/gui/theme/common/languages/en.xml
+++ b/gui/theme/common/languages/en.xml
@@ -399,7 +399,6 @@
 		<string name="language_hdr">Language</string>
 		<string name="terminal_btn">Terminal</string>
 		<string name="reload_theme_btn">Reload Theme</string>
-		<string name="dumlock_btn">HTC Dumlock</string>
 		<string name="inject_twrp_btn">Inject TWRP</string>
 		<string name="inject_twrp_confirm">Re-Inject TWRP?</string>
 		<string name="injecting_twrp">Re-Injecting TWRP...</string>
@@ -419,19 +418,6 @@
 		<string name="partitioning_sd">Partitioning SD card...</string>
 		<string name="partitioning_sd2">This will take a few minutes.</string>
 		<string name="part_sd_complete">Partitioning Complete</string>
-		<string name="dumlock_hdr">HTC Dumlock</string>
-		<string name="dumlock_restore_btn">Restore Original Boot</string>
-		<string name="dumlock_restore_confirm">Restore original boot image?</string>
-		<string name="dumlock_restoring">Restoring Original Boot...</string>
-		<string name="dumlock_restore_complete">Restore Original Boot Complete</string>
-		<string name="dumlock_reflash_btn">Reflash Recovery</string>
-		<string name="dumlock_reflash_confirm">Reflash recovery to boot?</string>
-		<string name="dumlock_reflashing">Flashing recovery to boot...</string>
-		<string name="dumlock_reflash_complete">Recovery Flash to Boot Complete</string>
-		<string name="dumlock_install_btn">Install HTC Dumlock</string>
-		<string name="dumlock_install_confirm">Install HTC dumlock files to ROM?</string>
-		<string name="dumlock_installing">Installing HTC Dumlock...</string>
-		<string name="dumlock_install_complete">HTC Dumlock Install Complete</string>
 		<string name="swipe_to_unlock">Swipe to Unlock</string>
 		<string name="swipe_unlock">   Unlock</string>
 		<string name="fm_hdr">File Manager</string>
@@ -700,9 +686,6 @@
 		<string name="digest_match" version="2">Digest matched</string>
 		<string name="pid_signal">{1} process ended with signal: {2}</string>
 		<string name="pid_error">{1} process ended with ERROR: {2}</string>
-		<string name="install_dumlock">Installing HTC Dumlock to system...</string>
-		<string name="dumlock_restore">Restoring original boot...</string>
-		<string name="dumlock_reflash">Reflashing recovery to boot...</string>
 		<string name="run_script">Running {1} script...</string>
 		<string name="rename_stock">Renamed stock recovery file in /system to prevent the stock ROM from replacing TWRP.</string>
 		<string name="split_backup">Breaking backup file into multiple archives...</string>
diff --git a/gui/theme/common/languages/es.xml b/gui/theme/common/languages/es.xml
index bdf9b24..96c801e 100644
--- a/gui/theme/common/languages/es.xml
+++ b/gui/theme/common/languages/es.xml
@@ -365,7 +365,6 @@
 		<string name="language_hdr">Idioma</string>
 		<string name="terminal_btn">Terminal</string>
 		<string name="reload_theme_btn">Recargar Tema</string>
-		<string name="dumlock_btn">HTC Dumlock</string>
 		<string name="inject_twrp_btn">Injectar TWRP</string>
 		<string name="inject_twrp_confirm">Re-Injectar TWRP?</string>
 		<string name="injecting_twrp">Re-Injectando TWRP...</string>
@@ -385,19 +384,6 @@
 		<string name="partitioning_sd">Particionando Tarjeta SD...</string>
 		<string name="partitioning_sd2">Esto puede tomar unos Minutos.</string>
 		<string name="part_sd_complete">Particionar Completado</string>
-		<string name="dumlock_hdr">HTC Dumlock</string>
-		<string name="dumlock_restore_btn">Restaurar Boot Original</string>
-		<string name="dumlock_restore_confirm">¿Restaurar imagen de boot original?</string>
-		<string name="dumlock_restoring">Restaurando boot Original...</string>
-		<string name="dumlock_restore_complete">Restauración del Boot Original Completado</string>
-		<string name="dumlock_reflash_btn">Reflashear Recovery</string>
-		<string name="dumlock_reflash_confirm">¿Reflashear recovery a boot?</string>
-		<string name="dumlock_reflashing">Flasheando recovery a boot...</string>
-		<string name="dumlock_reflash_complete">Flasheo del Recovery a Boot Completado</string>
-		<string name="dumlock_install_btn">Instalar HTC Dumlock</string>
-		<string name="dumlock_install_confirm">¿Instalar los archivos de HTC dumlock en la ROM?</string>
-		<string name="dumlock_installing">Instalando HTC Dumlock...</string>
-		<string name="dumlock_install_complete">Instalación de HTC Dumlock Completada</string>
 		<string name="swipe_to_unlock">Desliza para Desbloquear</string>
 		<string name="swipe_unlock">   Desbloquear</string>
 		<string name="fm_hdr">Administrador de Archivos </string>
@@ -610,9 +596,6 @@
 		<string name="digest_match" version="2">Digest coincide</string>
 		<string name="pid_signal">Proceso {1} terminó con señal: {2}</string>
 		<string name="pid_error">Proceso {1} terminó con ERROR: {2}</string>
-		<string name="install_dumlock">Instalando HTC Dumlock en el sistema…</string>
-		<string name="dumlock_restore">Restaurando el boot original...</string>
-		<string name="dumlock_reflash">Reflasheando el recovery en boot...</string>
 		<string name="run_script">Ejecutando script {1} ...</string>
 		<string name="rename_stock">Renombrado stock recovery en /system para prevenir que la ROM stock remplace TWRP.</string>
 		<string name="split_backup">Dividiendo copia de seguridad en múltiples archivos...</string>
diff --git a/gui/theme/common/languages/fr.xml b/gui/theme/common/languages/fr.xml
index 6e824af..402ce88 100644
--- a/gui/theme/common/languages/fr.xml
+++ b/gui/theme/common/languages/fr.xml
@@ -362,7 +362,6 @@
         <string name="language_hdr">Langue</string>
         <string name="terminal_btn">Terminal</string>
         <string name="reload_theme_btn">Recharger le thème</string>
-        <string name="dumlock_btn">HTC Dumlock</string>
         <string name="inject_twrp_btn">Injecter TWRP</string>
         <string name="inject_twrp_confirm">Réinjecter TWRP ?</string>
         <string name="injecting_twrp">Réinjection de TWRP en cours...</string>
@@ -381,19 +380,6 @@
         <string name="partitioning_sd">Partitionnement de la carte SD en cours...</string>
         <string name="partitioning_sd2">Cela va durer quelques minutes.</string>
         <string name="part_sd_complete">Partitionnement Terminé</string>
-        <string name="dumlock_hdr">HTC Dumlock</string>
-        <string name="dumlock_restore_btn">Restaurer l'image de démarrage originale</string>
-        <string name="dumlock_restore_confirm">Restaurer l'image de démarrage originale ?</string>
-        <string name="dumlock_restoring">Restauration de l'image de démarrage originale en cours...</string>
-        <string name="dumlock_restore_complete">Restauration de l'image de démarrage originale effectué</string>
-        <string name="dumlock_reflash_btn">Réinstaller le mode de Récupération</string>
-        <string name="dumlock_reflash_confirm">Réinstaller le mode de Récupération sur le Démarrage ?</string>
-        <string name="dumlock_reflashing">Réinstallation du mode de Récupération sur Démarrage...</string>
-        <string name="dumlock_reflash_complete">Réinstallation du mode de Récupération sur Démarrage effectuée</string>
-        <string name="dumlock_install_btn">Installer HTC Dumlock</string>
-        <string name="dumlock_install_confirm">Installer les fichiers HTC Dumlock sur la ROM?</string>
-        <string name="dumlock_installing">Installation de HTC Dumlock...</string>
-        <string name="dumlock_install_complete">Installation de HTC Dumlock complétée</string>
         <string name="swipe_to_unlock">Glisser pour déverrouiller</string>
         <string name="swipe_unlock">Dévérrouiller</string>
         <string name="fm_hdr">Gestionnaire de fichiers</string>
@@ -608,9 +594,6 @@
         <string name="digest_match" version="2">Le Digest correspond</string>
         <string name="pid_signal">Le processus {1} s'est terminé avec le signal: {2}</string>
         <string name="pid_error">Le processus {1} s'est terminé avec ERREUR: {2}</string>
-        <string name="install_dumlock">Installation de HTC Dumlock...</string>
-        <string name="dumlock_restore">Restauration de l'image de démarrage originale en cours...</string>
-        <string name="dumlock_reflash">Réécriture de l'image de récupération sur celle de démarrage...</string>
         <string name="run_script">Exécution du script {1}...</string>
         <string name="rename_stock">Renommé le fichier de récupération original dans /system pour empêcher le système d'exploitation original de remplacer TWRP.</string>
         <string name="split_backup">Morcellement des fichiers de sauvegarde en plusieurs archives...</string>
diff --git a/gui/theme/common/languages/hu.xml b/gui/theme/common/languages/hu.xml
index 2030889..48751f8 100644
--- a/gui/theme/common/languages/hu.xml
+++ b/gui/theme/common/languages/hu.xml
@@ -387,7 +387,6 @@
 		<string name="language_hdr">Nyelv</string>
 		<string name="terminal_btn">Terminál</string>
 		<string name="reload_theme_btn">Téma újratöltése</string>
-		<string name="dumlock_btn">HTC Dumlock</string>
 		<string name="inject_twrp_btn">TWRP injektálása</string>
 		<string name="inject_twrp_confirm">TWRP újrainjektálása?</string>
 		<string name="injecting_twrp">TWRP újrainjektálása...</string>
@@ -407,19 +406,6 @@
 		<string name="partitioning_sd">SD-kártya particionálása...</string>
 		<string name="partitioning_sd2">Ez néhány percet igénybe vesz.</string>
 		<string name="part_sd_complete">Particionálás kész</string>
-		<string name="dumlock_hdr">HTC Dumlock</string>
-		<string name="dumlock_restore_btn">Eredeti boot visszaállítása</string>
-		<string name="dumlock_restore_confirm">Visszaállítja az eredeti boot lemezképet?</string>
-		<string name="dumlock_restoring">Eredeti boot visszaállítása...</string>
-		<string name="dumlock_restore_complete">Eredeti boot visszaállítása kész</string>
-		<string name="dumlock_reflash_btn">Recovery újraflashelése</string>
-		<string name="dumlock_reflash_confirm">Recovery újraflashelése bootba?</string>
-		<string name="dumlock_reflashing">Recovery újraflashelése bootba...</string>
-		<string name="dumlock_reflash_complete">Recovery flashelése bootba kész</string>
-		<string name="dumlock_install_btn">HTC Dumlock telepítése</string>
-		<string name="dumlock_install_confirm">HTC Dumlock telepítése a ROM-hoz?</string>
-		<string name="dumlock_installing">HTC Dumlock telepítése...</string>
-		<string name="dumlock_install_complete">HTC Dumlock telepítése kész</string>
 		<string name="swipe_to_unlock">Csúsztasson a feloldáshoz</string>
 		<string name="swipe_unlock">   Feloldás</string>
 		<string name="fm_hdr">Fájlkezelő</string>
@@ -642,9 +628,6 @@
 		<string name="digest_match" version="3">Digest egyezik</string>
 		<string name="pid_signal">{1} folyamat véget ért a következő jellel: {2}</string>
 		<string name="pid_error">{1} folyamat véget ért a következő HIBÁVAL: {2}</string>
-		<string name="install_dumlock">HTC Dumlock telepítése a rendszerbe...</string>
-		<string name="dumlock_restore">Eredeti boot visszaállítása...</string>
-		<string name="dumlock_reflash">Recovery újraflashelése a bootba...</string>
 		<string name="run_script">{1} script futtatása...</string>
 		<string name="rename_stock">Gyári recovery fájl a /rendszer partíción átnevezve, annak megakadályozására, hogy a gyári ROM lecserélje TWRP-t.</string>
 		<string name="split_backup">Biztonsági mentés fájljának tördelése több archívumba...</string>
diff --git a/gui/theme/common/languages/id.xml b/gui/theme/common/languages/id.xml
index 5ace582..33c0240 100755
--- a/gui/theme/common/languages/id.xml
+++ b/gui/theme/common/languages/id.xml
@@ -397,7 +397,6 @@
 		<string name="language_hdr">Bahasa</string>
 		<string name="terminal_btn">Terminal</string>
 		<string name="reload_theme_btn">Reset Tema</string>
-		<string name="dumlock_btn">HTC Dumlock</string>
 		<string name="inject_twrp_btn">Suntik TWRP</string>
 		<string name="inject_twrp_confirm">Suntik ulang TWRP?</string>
 		<string name="injecting_twrp">Menyuntik ulang TWRP...</string>
@@ -417,19 +416,6 @@
 		<string name="partitioning_sd">Mempartisi kartu SD...</string>
 		<string name="partitioning_sd2">Ini membutuhkan waktu beberapa menit.</string>
 		<string name="part_sd_complete">Mempartisi selesai.</string>
-		<string name="dumlock_hdr">HTC Dumlock</string>
-		<string name="dumlock_restore_btn">Pulihkan boot original</string>
-		<string name="dumlock_restore_confirm">Pulihkan image boot original?</string>
-		<string name="dumlock_restoring">Memulihkan boot original...</string>
-		<string name="dumlock_restore_complete">Memulihkan boot original selesai</string>
-		<string name="dumlock_reflash_btn">Flash ulang recovery</string>
-		<string name="dumlock_reflash_confirm">Flash ulang recovery ke boot?</string>
-		<string name="dumlock_reflashing">Memflash recovery ke boot...</string>
-		<string name="dumlock_reflash_complete">Flash recovery ke boot selesai.</string>
-		<string name="dumlock_install_btn">Instal HTC Dumlock</string>
-		<string name="dumlock_install_confirm">Instal file HTC dumlock ke ROM?</string>
-		<string name="dumlock_installing">Menginstal HTC Dumlock...</string>
-		<string name="dumlock_install_complete">Instal HTC Dumlock selesai.</string>
 		<string name="swipe_to_unlock">Geser untuk Membuka</string>
 		<string name="swipe_unlock">   Buka</string>
 		<string name="fm_hdr">File Manager</string>
@@ -691,9 +677,6 @@
 		<string name="digest_match" version="2">Digest cocok</string>
 		<string name="pid_signal">{1} proses diakhiri dengan sinyal: {2}</string>
 		<string name="pid_error">{1} proses diakhiri dengan kesalahan: {2}</string>
-		<string name="install_dumlock">Menginstal HTC Dumlock ke sistem...</string>
-		<string name="dumlock_restore">Memulihkan boot original...</string>
-		<string name="dumlock_reflash">Memlash ulang recovery ke boot...</string>
 		<string name="run_script">Menjalankan skripsi {1}...</string>
 		<string name="rename_stock">Ubah nama file stok recovery dalam /sistem untuk mencegah stok ROM mengubah TWRP.</string>
 		<string name="split_backup">Memecah file cadangan menjadi beberapa arsip ...</string>
diff --git a/gui/theme/common/languages/it.xml b/gui/theme/common/languages/it.xml
index 3427710..283fa8f 100644
--- a/gui/theme/common/languages/it.xml
+++ b/gui/theme/common/languages/it.xml
@@ -387,7 +387,6 @@
 		<string name="language_hdr">Lingua</string>
 		<string name="terminal_btn">Terminale</string>
 		<string name="reload_theme_btn">Ricarica tema</string>
-		<string name="dumlock_btn">HTC Dumlock</string>
 		<string name="inject_twrp_btn">TWRP Inject</string>
 		<string name="inject_twrp_confirm">Eseguire nuovamente TWRP Inject?</string>
 		<string name="injecting_twrp">Esecuzione di TWRP Inject in corso...</string>
@@ -407,19 +406,6 @@
 		<string name="partitioning_sd">Partizionamento scheda SD in corso...</string>
 		<string name="partitioning_sd2">Ci vorranno un paio di minuti.</string>
 		<string name="part_sd_complete">Partizionamento completato</string>
-		<string name="dumlock_hdr">HTC Dumlock</string>
-		<string name="dumlock_restore_btn">Ripristina Boot originale</string>
-		<string name="dumlock_restore_confirm">Ripristinare l'immagine di Boot originale?</string>
-		<string name="dumlock_restoring">Ripristino del Boot originale in corso...</string>
-		<string name="dumlock_restore_complete">Ripristino del Boot originale completato</string>
-		<string name="dumlock_reflash_btn">Reinstalla Recovery</string>
-		<string name="dumlock_reflash_confirm">Reinstallare la Recovery in Boot?</string>
-		<string name="dumlock_reflashing">Installazione Recovery in Boot in corso...</string>
-		<string name="dumlock_reflash_complete">Installazione della Recovery in Boot completata</string>
-		<string name="dumlock_install_btn">Installa HTC Dumlock</string>
-		<string name="dumlock_install_confirm">Installare i file di HTC Dumlock nella ROM?</string>
-		<string name="dumlock_installing">Installazione di HTC Dumlock in corso...</string>
-		<string name="dumlock_install_complete">Installazione di HTC Dumlock Install completata</string>
 		<string name="swipe_to_unlock">Scorri per sbloccare</string>
 		<string name="swipe_unlock">   Sblocca</string>
 		<string name="fm_hdr">File manager</string>
@@ -642,9 +628,6 @@
 		<string name="digest_match" version="2">L'Digest corrisponde</string>
 		<string name="pid_signal">Il processo {1} è terminato con segnale: {2}</string>
 		<string name="pid_error">Il processo {1} è terminato con ERRORE: {2}</string>
-		<string name="install_dumlock">Installazione di HTC Dumlock in System...</string>
-		<string name="dumlock_restore">Ripristino del Boot originale...</string>
-		<string name="dumlock_reflash">Reinstallazione della Recovery in Boot...</string>
 		<string name="run_script">Esecuzione dello script {1}...</string>
 		<string name="rename_stock">Il file della Recovery stock, in System, è stato rinominato per prevenire la sostituzione di TWRP da paete della ROM.</string>
 		<string name="split_backup">Divisione del backup in archivi multipli...</string>
diff --git a/gui/theme/common/languages/nl.xml b/gui/theme/common/languages/nl.xml
index 37e712a..708bc23 100644
--- a/gui/theme/common/languages/nl.xml
+++ b/gui/theme/common/languages/nl.xml
@@ -392,7 +392,6 @@
 		<string name="language_hdr">Taal</string>
 		<string name="terminal_btn">Terminal</string>
 		<string name="reload_theme_btn">Thema herladen</string>
-		<string name="dumlock_btn">HTC Dumlock</string>
 		<string name="inject_twrp_btn">TWRP injecteren</string>
 		<string name="inject_twrp_confirm">TWRP opnieuw injecteren?</string>
 		<string name="injecting_twrp">TWRP opnieuw injecteren...</string>
@@ -412,19 +411,6 @@
 		<string name="partitioning_sd">SD-kaart wordt gepartitioneerd...</string>
 		<string name="partitioning_sd2">Dit duurt een paar minuten.</string>
 		<string name="part_sd_complete">Partitioneren voltooid</string>
-		<string name="dumlock_hdr">HTC Dumlock</string>
-		<string name="dumlock_restore_btn">Oorspronkelijk bootimage herstellen</string>
-		<string name="dumlock_restore_confirm">Oorspronkelijk bootimage herstellen?</string>
-		<string name="dumlock_restoring">Oorspronkelijk bootimage wordt hersteld...</string>
-		<string name="dumlock_restore_complete">Oorspronkelijk bootimage hersteld</string>
-		<string name="dumlock_reflash_btn">Recovery opnieuw flashen</string>
-		<string name="dumlock_reflash_confirm">Recovery opnieuw naar boot flashen?</string>
-		<string name="dumlock_reflashing">Recovery wordt naar boot geflasht...</string>
-		<string name="dumlock_reflash_complete">Flashen recovery naar boot voltooid</string>
-		<string name="dumlock_install_btn">HTC Dumlock installeren</string>
-		<string name="dumlock_install_confirm">HTC Dumlock-bestanden in ROM installeren?</string>
-		<string name="dumlock_installing">HTC Dumlock wordt geïnstalleerd...</string>
-		<string name="dumlock_install_complete">Installatie HTC Dumlock voltooid</string>
 		<string name="swipe_to_unlock">Veeg om te ontgrendelen</string>
 		<string name="swipe_unlock">   Ontgrendelen</string>
 		<string name="fm_hdr">Bestandsbeheer</string>
@@ -685,9 +671,6 @@
 		<string name="digest_match" version="2">Digest klopt</string>
 		<string name="pid_signal">{1} proces geëindigd met signaal: {2}</string>
 		<string name="pid_error">{1} proces geëindigd met fout: {2}</string>
-		<string name="install_dumlock">HTC Dumlock wordt geïninstalleerd...</string>
-		<string name="dumlock_restore">Oorspronkelijke boot wordt hersteld...</string>
-		<string name="dumlock_reflash">Recovery wordt opnieuw naar boot geflasht...</string>
 		<string name="run_script">Script {1} wordt uitgevoerd...</string>
 		<string name="rename_stock">Oorspronkelijke recoverybestand hernoemd in /system om te voorkomen dat de ROM TWRP vervangt.</string>
 		<string name="split_backup">Back-upbestand wordt in meerdere archiefbestanden opgesplitst...</string>
diff --git a/gui/theme/common/languages/pl.xml b/gui/theme/common/languages/pl.xml
index 469b037..874e397 100644
--- a/gui/theme/common/languages/pl.xml
+++ b/gui/theme/common/languages/pl.xml
@@ -399,7 +399,6 @@
 		<string name="language_hdr">Język</string>
 		<string name="terminal_btn">Terminal</string>
 		<string name="reload_theme_btn">Odśwież Motyw</string>
-		<string name="dumlock_btn">HTC Dumlock</string>
 		<string name="inject_twrp_btn">Zaszczep TWRP</string>
 		<string name="inject_twrp_confirm">Ponownie zaszczepić TWRP?</string>
 		<string name="injecting_twrp">Szczepienie TWRP...</string>
@@ -419,19 +418,6 @@
 		<string name="partitioning_sd">Partycjonowanie Karty SD...</string>
 		<string name="partitioning_sd2">To potrwa parę minut.</string>
 		<string name="part_sd_complete">Partycjonowanie zakończone</string>
-		<string name="dumlock_hdr">HTC Dumlock</string>
-		<string name="dumlock_restore_btn">Przywróć oryginalny Boot</string>
-		<string name="dumlock_restore_confirm">Przywrócić oryginalny obraz Boot?</string>
-		<string name="dumlock_restoring">Przywracanie oryginalnego obrazu Boot...</string>
-		<string name="dumlock_restore_complete">Przywracanie oryginalnego obrazu Boot zakończone</string>
-		<string name="dumlock_reflash_btn">Reinstaluj Recovery</string>
-		<string name="dumlock_reflash_confirm">Instalować recovery do boot?</string>
-		<string name="dumlock_reflashing">Instalowanie recovery do boot...</string>
-		<string name="dumlock_reflash_complete">Instalowanie recovery do boot zakończone</string>
-		<string name="dumlock_install_btn">Instaluj HTC Dumlock</string>
-		<string name="dumlock_install_confirm">Instalować pliki HTC Dumlock do ROMu?</string>
-		<string name="dumlock_installing">Instalowanie HTC Dumlock...</string>
-		<string name="dumlock_install_complete">Instalowanie HTC Dumlock zakończone</string>
 		<string name="swipe_to_unlock">Przesuń, aby odblokować</string>
 		<string name="swipe_unlock">   Odblokuj</string>
 		<string name="fm_hdr">Menedżer Plików</string>
@@ -701,9 +687,6 @@
 		<string name="digest_match" version="2">Digest zgodne</string>
 		<string name="pid_signal">Proces {1} zakończony z sygnałem: {2}</string>
 		<string name="pid_error">Proces {1} zakończony z błędem: {2}</string>
-		<string name="install_dumlock">Instalowanie HTC Dumlock do systemu...</string>
-		<string name="dumlock_restore">Przywracanie oryginalnego obrazu boot...</string>
-		<string name="dumlock_reflash">Reinstalowanie recovery do boot...</string>
 		<string name="run_script">Uruchomiono skrypt {1}...</string>
 		<string name="rename_stock">Zmieniono nazwę stock recovery w /system w celu uniknięcia podmiany TWRP przez stock ROM.</string>
 		<string name="split_backup">Dzielenie pliku kopii zapasowej na wiele plików...</string>
diff --git a/gui/theme/common/languages/pt_BR.xml b/gui/theme/common/languages/pt_BR.xml
index 9f717b5..62cb24a 100644
--- a/gui/theme/common/languages/pt_BR.xml
+++ b/gui/theme/common/languages/pt_BR.xml
@@ -363,7 +363,6 @@
 		<string name="language_hdr">Idioma</string>
 		<string name="terminal_btn">Terminal</string>
 		<string name="reload_theme_btn">Tema carregado</string>
-		<string name="dumlock_btn">HTC Dumlock</string>
 		<string name="inject_twrp_btn">Injetar TWRP</string>
 		<string name="inject_twrp_confirm">Re-injetar TWRP?</string>
 		<string name="injecting_twrp">Re-injetar TWRP...</string>
@@ -383,19 +382,6 @@
 		<string name="partitioning_sd">Particionando o cartão SD...</string>
 		<string name="partitioning_sd2">Isso levará alguns minutos.</string>
 		<string name="part_sd_complete">Particionamento completo</string>
-		<string name="dumlock_hdr">HTC Dumlock</string>
-		<string name="dumlock_restore_btn">Restaurar a Inicialização Original</string>
-		<string name="dumlock_restore_confirm">Restaurar a imagem de inicialização original?</string>
-		<string name="dumlock_restoring">Restauração de inicialização Original...</string>
-		<string name="dumlock_restore_complete">Restauração completa de inicialização Original</string>
-		<string name="dumlock_reflash_btn">Reflash recuperação</string>
-		<string name="dumlock_reflash_confirm">Reflash recuperação para arrancar?</string>
-		<string name="dumlock_reflashing">Reflash recuperação para arrancar...</string>
-		<string name="dumlock_reflash_complete">Flash de recuperação de inicialização completa</string>
-		<string name="dumlock_install_btn">Instalar o HTC Dumlock</string>
-		<string name="dumlock_install_confirm">Instalar HTC dumlock arquivos de ROM?</string>
-		<string name="dumlock_installing">Instalando o HTC Dumlock...</string>
-		<string name="dumlock_install_complete">HTC Dumlock instalação completa</string>
 		<string name="swipe_to_unlock">Deslize para desbloquear</string>
 		<string name="swipe_unlock">   Desbloquear</string>
 		<string name="fm_hdr">Gerenciador de arquivos</string>
@@ -597,9 +583,6 @@
 		<string name="digest_match" version="2">Correspondência de Digest</string>
 		<string name="pid_signal">{1} processo terminou com sinal: {2}</string>
 		<string name="pid_error">{1} processo terminou com erro: {2}</string>
-		<string name="install_dumlock">Instalação HTC Dumlock sistema...</string>
-		<string name="dumlock_restore">Restauração de inicialização Original...</string>
-		<string name="dumlock_reflash">Regravando recuperação para arrancar...</string>
 		<string name="run_script">Executando o script {1}...</string>
 		<string name="rename_stock">Renomeado o arquivo de recuperação das ações em / / sistema para impedir que o stock ROM substituindo TWRP.</string>
 		<string name="split_backup">Quebrando o arquivo de cópia de segurança em vários arquivos...</string>
diff --git a/gui/theme/common/languages/pt_PT.xml b/gui/theme/common/languages/pt_PT.xml
index ee589eb..34bb913 100644
--- a/gui/theme/common/languages/pt_PT.xml
+++ b/gui/theme/common/languages/pt_PT.xml
@@ -396,7 +396,6 @@
 		<string name="language_hdr">Idioma</string>
 		<string name="terminal_btn">Terminal</string>
 		<string name="reload_theme_btn">Recarregar Tema</string>
-		<string name="dumlock_btn">HTC Dumlock</string>
 		<string name="inject_twrp_btn">Injetar TWRP</string>
 		<string name="inject_twrp_confirm">Pretende injetar a TWRP?</string>
 		<string name="injecting_twrp">A injetar a TWRP...</string>
@@ -416,19 +415,6 @@
 		<string name="partitioning_sd">A particionar o cartão SD...</string>
 		<string name="partitioning_sd2">Esta operação demorará algum tempo.</string>
 		<string name="part_sd_complete">Particionamento concluído</string>
-		<string name="dumlock_hdr">HTC Dumlock</string>
-		<string name="dumlock_restore_btn">Restaurar a imagem de Boot Original</string>
-		<string name="dumlock_restore_confirm">Pretende restaurar a imagem de Boot original?</string>
-		<string name="dumlock_restoring">A restaurar a imagem de Boot Original...</string>
-		<string name="dumlock_restore_complete">Imagem de Boot restaurada</string>
-		<string name="dumlock_reflash_btn">Instalar Recovery</string>
-		<string name="dumlock_reflash_confirm">Pretende instalar a Recovery para a partição Boot?</string>
-		<string name="dumlock_reflashing">A instalar a Recovery para a partição Boot...</string>
-		<string name="dumlock_reflash_complete">Instalação da Recovery para a partição Boot concluída</string>
-		<string name="dumlock_install_btn">Instalar o HTC Dumlock</string>
-		<string name="dumlock_install_confirm">Pretende instalar os ficheiros HTC dumlock para a ROM?</string>
-		<string name="dumlock_installing">A instalar o HTC Dumlock...</string>
-		<string name="dumlock_install_complete">Instalção do HTC Dumlock concluída</string>
 		<string name="swipe_to_unlock">    Deslize para desbloquear</string>
 		<string name="swipe_unlock">   Desbloquear</string>
 		<string name="fm_hdr">Gestor de ficheiros</string>
@@ -675,9 +661,6 @@
 		<string name="digest_match" version="2">O MD5 coincide</string>
 		<string name="pid_signal">O processo {1} terminou com o sinal: {2}</string>
 		<string name="pid_error">O processo {1} terminou com o erro: {2}</string>
-		<string name="install_dumlock">A instalar o HTC Dumlock para o sistema...</string>
-		<string name="dumlock_restore">A restaurar a imagem de Boot original...</string>
-		<string name="dumlock_reflash">A instalar a Recovery para o Boot...</string>
 		<string name="run_script">A executar o script {1}...</string>
 		<string name="rename_stock">O ficheiro da Recovery em /system foi renomeado de modo a impedir que a stock ROM substitua a TWRP.</string>
 		<string name="split_backup">A dividir o ficheiro de Backup em vários arquivos...</string>
diff --git a/gui/theme/common/languages/ru.xml b/gui/theme/common/languages/ru.xml
index 7c0f5ea..6c3bebf 100644
--- a/gui/theme/common/languages/ru.xml
+++ b/gui/theme/common/languages/ru.xml
@@ -398,7 +398,6 @@
 		<string name="language_hdr">Язык</string>
 		<string name="terminal_btn">Терминал</string>
 		<string name="reload_theme_btn">Перезагрузить тему</string>
-		<string name="dumlock_btn">HTC Dumlock</string>
 		<string name="inject_twrp_btn">Интегрировать TWRP</string>
 		<string name="inject_twrp_confirm">Интегрировать TWRP заново?</string>
 		<string name="injecting_twrp">Интегрирование TWRP...</string>
@@ -418,19 +417,6 @@
 		<string name="partitioning_sd">Разметка SD-карты...</string>
 		<string name="partitioning_sd2">Это может занять несколько минут.</string>
 		<string name="part_sd_complete">Разметка завершена</string>
-		<string name="dumlock_hdr">HTC Dumlock</string>
-		<string name="dumlock_restore_btn">Восстановление оригинального Boot</string>
-		<string name="dumlock_restore_confirm">Восстановить оригинальный образ boot?</string>
-		<string name="dumlock_restoring">Восстановление оригинального Boot...</string>
-		<string name="dumlock_restore_complete">Восстановление оригинального Boot завершено</string>
-		<string name="dumlock_reflash_btn">Перепрошивка рекавери</string>
-		<string name="dumlock_reflash_confirm">Перепрошить recovery в boot?</string>
-		<string name="dumlock_reflashing">Прошивка recovery в boot...</string>
-		<string name="dumlock_reflash_complete">Прошивка recovery в boot завершена</string>
-		<string name="dumlock_install_btn">Установка HTC Dumlock</string>
-		<string name="dumlock_install_confirm">Установить HTC dumlock файлы в прошивку?</string>
-		<string name="dumlock_installing">Установка HTC Dumlock...</string>
-		<string name="dumlock_install_complete">Установка HTC Dumlock завершена</string>
 		<string name="swipe_to_unlock">Свайп для разблокировки</string>
 		<string name="swipe_unlock">   Разблокировать</string>
 		<string name="fm_hdr">Файловый менеджер</string>
@@ -694,9 +680,6 @@
 		<string name="digest_match" version="2">Контрольная сумма соответствует</string>
 		<string name="pid_signal">Процесс {1} завершился с кодом {2}</string>
 		<string name="pid_error">Процесс {1} завершился с ОШИБКОЙ: {2}</string>
-		<string name="install_dumlock">Установка HTC Dumlock в систему...</string>
-		<string name="dumlock_restore">Восстановление оригинального boot...</string>
-		<string name="dumlock_reflash">Перепрошивка recovery в boot...</string>
 		<string name="run_script">Запуск сценария {1}...</string>
 		<string name="rename_stock">Переименование файла стокового рекавери в /system для предотвращения возврата на стоковое рекавери вместо TWRP.</string>
 		<string name="split_backup">Разделение резервной копии на несколько архивов...</string>
diff --git a/gui/theme/common/languages/sk.xml b/gui/theme/common/languages/sk.xml
index e212f7d..13cd92c 100644
--- a/gui/theme/common/languages/sk.xml
+++ b/gui/theme/common/languages/sk.xml
@@ -363,7 +363,6 @@
 		<string name="language_hdr">Jazyk</string>
 		<string name="terminal_btn">Terminál</string>
 		<string name="reload_theme_btn">Načítať tému</string>
-		<string name="dumlock_btn">HTC Dumlock</string>
 		<string name="inject_twrp_btn">Vložiť TWRP</string>
 		<string name="inject_twrp_confirm">Znova vložiť TWRP?</string>
 		<string name="injecting_twrp">Vkladanie TWRP...</string>
@@ -383,19 +382,6 @@
 		<string name="partitioning_sd">Delenie SD karty...</string>
 		<string name="partitioning_sd2">Môže to trvať niekoľko minút.</string>
 		<string name="part_sd_complete">Rozdelenie kompletné</string>
-		<string name="dumlock_hdr">HTC Dumlock</string>
-		<string name="dumlock_restore_btn">Obnoviť pôvodný boot.img</string>
-		<string name="dumlock_restore_confirm">Obnoviť pôvodný boot.img?</string>
-		<string name="dumlock_restoring">Obnovenie pôvodného boot.img...</string>
-		<string name="dumlock_restore_complete">Obnova pôvodného boot.img dokončená</string>
-		<string name="dumlock_reflash_btn">Prepísanie recovery</string>
-		<string name="dumlock_reflash_confirm">Prepísať recovery pri štarte?</string>
-		<string name="dumlock_reflashing">Prepísanie recovery pri štarte...</string>
-		<string name="dumlock_reflash_complete">Prepísanie recovery pri štarte dokončené</string>
-		<string name="dumlock_install_btn">Inštalovať HTC Dumlock</string>
-		<string name="dumlock_install_confirm">Inštalovať súbory HTC Dumlock do ROM?</string>
-		<string name="dumlock_installing">Inštalácia HTC Dumlock...</string>
-		<string name="dumlock_install_complete">Inštalácia HTC Dumlock dokončená</string>
 		<string name="swipe_to_unlock">Potiahnutím odomknúť</string>
 		<string name="swipe_unlock">   Odomknúť</string>
 		<string name="fm_hdr">Súborový manažér</string>
@@ -597,9 +583,6 @@
 		<string name="digest_match" version="2">Digest sa zhoduje</string>
 		<string name="pid_signal">Proces {1} skončil so signálom: {2}</string>
 		<string name="pid_error">Proces {1} skončil s CHYBOU: {2}</string>
-		<string name="install_dumlock">Inštalovanie HTC Dumlock do systému...</string>
-		<string name="dumlock_restore">Obnovenie pôvodného boot.img...</string>
-		<string name="dumlock_reflash">Zapisovanie recovery do boot.img...</string>
 		<string name="run_script">Beh skriptu {1}...</string>
 		<string name="rename_stock">Premenovaný originál recovery súbor v /system pre zabránenie prepísania TWRP originál ROM.</string>
 		<string name="split_backup">Rozdelenie zálohy do viacerých archívov...</string>
diff --git a/gui/theme/common/languages/sl.xml b/gui/theme/common/languages/sl.xml
index ef0a692..eb1b777 100644
--- a/gui/theme/common/languages/sl.xml
+++ b/gui/theme/common/languages/sl.xml
@@ -363,7 +363,6 @@
 		<string name="language_hdr">Jezik</string>
 		<string name="terminal_btn">Terminal</string>
 		<string name="reload_theme_btn">Ponovno naloži temo</string>
-		<string name="dumlock_btn">HTC Dumlock</string>
 		<string name="inject_twrp_btn">Vstavi TWRP</string>
 		<string name="inject_twrp_confirm">Ponovno vstavi TWRP?</string>
 		<string name="injecting_twrp">Ponovno vstavljanje TWRP-ja …</string>
@@ -383,19 +382,6 @@
 		<string name="partitioning_sd">Razdeljevanje kartice SD …</string>
 		<string name="partitioning_sd2">To bo trajalo nekaj minut.</string>
 		<string name="part_sd_complete">Razdeljevanje končano</string>
-		<string name="dumlock_hdr">HTC Dumlock</string>
-		<string name="dumlock_restore_btn">Obnovi izvirni zagon</string>
-		<string name="dumlock_restore_confirm">Obnovi izvirni zagonski odtis?</string>
-		<string name="dumlock_restoring">Obnavljanje izvirnega zagona …</string>
-		<string name="dumlock_restore_complete">Obnavljanje izvirnega zagona končano</string>
-		<string name="dumlock_reflash_btn">Ponovno namesti obnovitev</string>
-		<string name="dumlock_reflash_confirm">Ponovno namesti obnovitev v zagon?</string>
-		<string name="dumlock_reflashing">Nameščanje obnovitve v zagon …</string>
-		<string name="dumlock_reflash_complete">Namestite v obnovitve v zagon končana</string>
-		<string name="dumlock_install_btn">Namesti HTC Dumlock</string>
-		<string name="dumlock_install_confirm">Namesti datoteke HTC Dumlock v ROM?</string>
-		<string name="dumlock_installing">Nameščanje HTC Dumlocka …</string>
-		<string name="dumlock_install_complete">Nameščanje HTC Dumlocka končano</string>
 		<string name="swipe_to_unlock">Povlecite za odklepanje</string>
 		<string name="swipe_unlock">   Odkleni</string>
 		<string name="fm_hdr">Upravljalnik datotek</string>
@@ -597,9 +583,6 @@
 		<string name="digest_match" version="2">Digest se ujema</string>
 		<string name="pid_signal">{1} opravilo se je končalo s signalom: {2}</string>
 		<string name="pid_error">{1} opravilo se je končalo z NAPAKO: {2}</string>
-		<string name="install_dumlock">Nameščanje HTC Dumlocka na sistem …</string>
-		<string name="dumlock_restore">Obnavljanje izvirnega zagona …</string>
-		<string name="dumlock_reflash">Ponovno nameščanje obnovitve v zagon …</string>
 		<string name="run_script">Izvajanje skripta {1} …</string>
 		<string name="rename_stock">Tovarniška datoteka obnovitve v /system je bila preimenovana, da tovarniškemu ROM-u prepreči nadomestitev TWRP-ja.</string>
 		<string name="split_backup">Razcepljanje varnostne kopije v več arhivov …</string>
diff --git a/gui/theme/common/languages/sv.xml b/gui/theme/common/languages/sv.xml
index 1f4368c..b278e7e 100644
--- a/gui/theme/common/languages/sv.xml
+++ b/gui/theme/common/languages/sv.xml
@@ -141,15 +141,11 @@
 		<string name="file_manager_btn">Filhanterare</string>
 		<string name="language_hdr">Språk</string>
 		<string name="terminal_btn">Terminal</string>
-		<string name="dumlock_btn">HTC Dumlock</string>
 		<string name="inject_twrp_btn">Injicera TWRP</string>
 		<string name="part_sd_m">-</string>
 		<string name="part_sd_p">+</string>
 		<string name="file_system">Filsystem:</string>
 		<string name="swipe_part_sd_s">Partition</string>
-		<string name="dumlock_hdr">HTC Dumlock</string>
-		<string name="dumlock_install_btn">Installera HTC Dumlock</string>
-		<string name="dumlock_installing">Installerar HTC Dumlock...</string>
 		<string name="swipe_unlock">   Lås upp</string>
 		<string name="fm_hdr">Filhanterare</string>
 		<string name="fm_type_folder">Mapp</string>
diff --git a/gui/theme/common/languages/tr.xml b/gui/theme/common/languages/tr.xml
index 3e040de..71cf60d 100644
--- a/gui/theme/common/languages/tr.xml
+++ b/gui/theme/common/languages/tr.xml
@@ -388,7 +388,6 @@
 		<string name="language_hdr">Dil</string>
 		<string name="terminal_btn">Terminal</string>
 		<string name="reload_theme_btn">Temayı Yeniden Yükle</string>
-		<string name="dumlock_btn">HTC Dumlock</string>
 		<string name="inject_twrp_btn">TWRP Ekle</string>
 		<string name="inject_twrp_confirm">TWRP yeniden eklensin mi?</string>
 		<string name="injecting_twrp">TWRP yeniden ekleniyor...</string>
@@ -408,19 +407,6 @@
 		<string name="partitioning_sd">SD Kart Bölümleniyor...</string>
 		<string name="partitioning_sd2">Bu işlem birkaç dakika sürecek.</string>
 		<string name="part_sd_complete">Bölümleme Tamamlandı</string>
-		<string name="dumlock_hdr">HTC Dumlock</string>
-		<string name="dumlock_restore_btn">Orijinal Boot'u Geri Yükle</string>
-		<string name="dumlock_restore_confirm">Orijinal boot imajı geri yüklensin mi?</string>
-		<string name="dumlock_restoring">Orijinal Boot Geri Yükleniyor...</string>
-		<string name="dumlock_restore_complete">Orijinal Boot Geri Yüklemesi Tamamlandı</string>
-		<string name="dumlock_reflash_btn">Recovery'yi Yeniden Flashla</string>
-		<string name="dumlock_reflash_confirm">Cihazın açılması için kurtarma yazılımı tekrar yüklensin mi?</string>
-		<string name="dumlock_reflashing">Cihazın açılması için kurtarma yazılımı tekrar yükleniyor...</string>
-		<string name="dumlock_reflash_complete">Cihazın açılması için kurtarma yazılımını tekrar yükleme tamamlandı</string>
-		<string name="dumlock_install_btn">HTC Dumlock Yükle</string>
-		<string name="dumlock_install_confirm">HTC dumlock dosyaları ROM'a yüklensin mi?</string>
-		<string name="dumlock_installing">HTC Dumlock Yükleniyor...</string>
-		<string name="dumlock_install_complete">HTC Dumlock Yüklemesi Tamamlandı</string>
 		<string name="swipe_to_unlock">Kilidi Açmak için Kaydır</string>
 		<string name="swipe_unlock">   Kilidi Aç</string>
 		<string name="fm_hdr">Dosya Yöneticisi</string>
@@ -643,9 +629,6 @@
 		<string name="digest_match" version="2">Digest eşleşti</string>
 		<string name="pid_signal">{1} process ended with signal: {2}</string>
 		<string name="pid_error">{1} process ended with ERROR: {2}</string>
-		<string name="install_dumlock">HTC Dumlock sisteme yükleniyor...</string>
-		<string name="dumlock_restore">Boot geri yükleniyor...</string>
-		<string name="dumlock_reflash">Boot için recovery yeniden flashlanıyor...</string>
 		<string name="run_script">{1} komut dosyası çalıştırılıyor...</string>
 		<string name="rename_stock">Stok ROM'un TWRP'yi değiştirmesini önlemek için /systemde stok kurtarma dosyası yeniden adlandırıldı.</string>
 		<string name="split_backup">Yedek dosyayı birden fazla arşiv haline getirme...</string>
diff --git a/gui/theme/common/languages/uk.xml b/gui/theme/common/languages/uk.xml
index d48310b..9a20a38 100644
--- a/gui/theme/common/languages/uk.xml
+++ b/gui/theme/common/languages/uk.xml
@@ -370,7 +370,6 @@
 		<string name="language_hdr">Мова</string>
 		<string name="terminal_btn">Термінал</string>
 		<string name="reload_theme_btn">Завантажити тему</string>
-		<string name="dumlock_btn">HTC Dumlock</string>
 		<string name="inject_twrp_btn">Інтегрувати TWRP</string>
 		<string name="inject_twrp_confirm">Інтегрувати TWRP наново?</string>
 		<string name="injecting_twrp">Інтегрування TWRP...</string>
@@ -388,19 +387,6 @@
 		<string name="partitioning_sd">Розмітка SD карти...</string>
 		<string name="partitioning_sd2">Це може зайняти кілька хвилин.</string>
 		<string name="part_sd_complete">Розмітка завершена</string>
-		<string name="dumlock_hdr">HTC Dumlock</string>
-		<string name="dumlock_restore_btn">Відновлення оригінального Boot</string>
-		<string name="dumlock_restore_confirm">Відновити оригінальний образ Boot?</string>
-		<string name="dumlock_restoring">Відновлення оригінального Boot...</string>
-		<string name="dumlock_restore_complete">Відновлення оригінального Boot завершено</string>
-		<string name="dumlock_reflash_btn">Перепрошивка Recovery</string>
-		<string name="dumlock_reflash_confirm">Прошити recovery в boot?</string>
-		<string name="dumlock_reflashing">Прошивка recovery в boot...</string>
-		<string name="dumlock_reflash_complete">Прошивка recovery в boot завершена</string>
-		<string name="dumlock_install_btn">Встановлення HTC Dumlock</string>
-		<string name="dumlock_install_confirm">Встановити HTC dumlock до прошивки?</string>
-		<string name="dumlock_installing">Встановлення HTC Dumlock...</string>
-		<string name="dumlock_install_complete">Встановлення HTC Dumlock завершено</string>
 		<string name="swipe_to_unlock">Розблокувати</string>
 		<string name="swipe_unlock">   Разблокування</string>
 		<string name="fm_hdr">Файловий менеджер</string>
@@ -618,9 +604,6 @@
 		<string name="digest_match" version="2">Digest співпадає</string>
 		<string name="pid_signal">{1} процес завершився з кодом: {2}</string>
 		<string name="pid_error">{1} процес завершився з ПОМИЛКОЮ: {2}</string>
-		<string name="install_dumlock">Встановлення HTC Dumlock у систему...</string>
-		<string name="dumlock_restore">Відновлення оригінального boot...</string>
-		<string name="dumlock_reflash">Прошивка recovery до boot...</string>
 		<string name="run_script">Виконання сценарію {1}...</string>
 		<string name="rename_stock">Перейменування файлу стокового рекавері у /system для попередження відновлення стокового замість TWRP.</string>
 		<string name="split_backup">Розбиття резервної копії на частини...</string>
diff --git a/gui/theme/common/portrait.xml b/gui/theme/common/portrait.xml
index 22379d1..06b1024 100755
--- a/gui/theme/common/portrait.xml
+++ b/gui/theme/common/portrait.xml
@@ -3892,10 +3892,6 @@
 					<condition var1="tw_has_data_media" var2="1"/>
 					<action function="page">fixcontexts</action>
 				</listitem>
-				<listitem name="{@dumlock_btn=HTC Dumlock}">
-					<condition var1="tw_show_dumlock" var2="1"/>
-					<action function="page">htcdumlock</action>
-				</listitem>
 				<listitem name="{@inject_twrp_btn=Inject TWRP}">
 					<condition var1="tw_has_injecttwrp" var2="1"/>
 					<actions>
@@ -4201,72 +4197,6 @@
 			</action>
 		</page>
 
-		<page name="htcdumlock">
-			<template name="page"/>
-
-			<text style="text_l">
-				<placement x="%col1_x_header%" y="%row3_header_y%"/>
-				<text>{@advanced_hdr=Advanced}</text>
-			</text>
-
-			<text style="text_m">
-				<placement x="%col1_x_header%" y="%row4_header_y%"/>
-				<text>{@dumlock_hdr=HTC Dumlock}</text>
-			</text>
-
-			<button style="main_button_half_height_full_width">
-				<placement x="%indent%" y="%row15a_y%"/>
-				<text>{@dumlock_restore_btn=Restore Original Boot}</text>
-				<actions>
-					<action function="set">tw_back=htcdumlock</action>
-					<action function="set">tw_action=htcdumlockrestoreboot</action>
-					<action function="set">tw_text1={@dumlock_restore_confirm=Restore original boot image?}</action>
-					<action function="set">tw_action_text1={@dumlock_restoring=Restoring Original Boot...}</action>
-					<action function="set">tw_complete_text1={@dumlock_restore_complete=Restore Original Boot Complete}</action>
-					<action function="set">tw_slider_text={@swipe_to_confirm=Swipe to Confirm}</action>
-					<action function="page">confirm_action</action>
-				</actions>
-			</button>
-
-			<button style="main_button_half_height_full_width">
-				<placement x="%indent%" y="%row18a_y%"/>
-				<text>{@dumlock_reflash_btn=Reflash Recovery}</text>
-				<actions>
-					<action function="set">tw_back=htcdumlock</action>
-					<action function="set">tw_action=htcdumlockreflashrecovery</action>
-					<action function="set">tw_text1={@dumlock_reflash_confirm=Reflash recovery to boot?}</action>
-					<action function="set">tw_action_text1={@dumlock_reflashing=Flashing recovery to boot...}</action>
-					<action function="set">tw_complete_text1={@dumlock_reflash_complete=Recovery Flash to Boot Complete}</action>
-					<action function="set">tw_slider_text={@swipe_to_confirm=Swipe to Confirm}</action>
-					<action function="page">confirm_action</action>
-				</actions>
-			</button>
-
-			<button style="main_button_half_height_full_width">
-				<placement x="%indent%" y="%row21a_y%"/>
-				<text>{@dumlock_install_btn=Install HTC Dumlock}</text>
-				<actions>
-					<action function="set">tw_back=htcdumlock</action>
-					<action function="set">tw_action=installhtcdumlock</action>
-					<action function="set">tw_text1={@dumlock_install_confirm=Install HTC dumlock files to ROM?}</action>
-					<action function="set">tw_action_text1={@dumlock_installing=Installing HTC Dumlock...}</action>
-					<action function="set">tw_complete_text1={@dumlock_install_complete=HTC Dumlock Install Complete}</action>
-					<action function="set">tw_slider_text={@swipe_to_confirm=Swipe to Confirm}</action>
-					<action function="page">confirm_action</action>
-				</actions>
-			</button>
-
-			<action>
-				<touch key="home"/>
-				<action function="page">main</action>
-			</action>
-
-			<action>
-				<touch key="back"/>
-				<action function="page">advanced</action>
-			</action>
-		</page>
-
 		<page name="repackselect">
 			<template name="page"/>
 
diff --git a/gui/theme/common/watch.xml b/gui/theme/common/watch.xml
index b95474c..b8a2df0 100755
--- a/gui/theme/common/watch.xml
+++ b/gui/theme/common/watch.xml
@@ -4379,10 +4379,6 @@
 						<action function="page">partsdcardsel</action>
 					</actions>
 				</listitem>
-				<listitem name="{@dumlock_btn=HTC Dumlock}">
-					<condition var1="tw_show_dumlock" var2="1"/>
-					<action function="page">htcdumlock</action>
-				</listitem>
 				<listitem name="{@inject_twrp_btn=Inject TWRP}">
 					<condition var1="tw_has_injecttwrp" var2="1"/>
 					<actions>
@@ -4835,69 +4831,6 @@
 			</action>
 		</page>
 
-		<page name="htcdumlock">
-			<template name="page"/>
-
-			<template name="statusbar"/>
-
-			<text style="text_m">
-				<placement x="%col1_x_left%" y="%row1_header_y%"/>
-				<text>{@advanced_hdr=Advanced} &gt; {@dumlock_hdr=HTC Dumlock}</text>
-			</text>
-
-			<button style="main_button_full_width">
-				<placement x="%indent%" y="%row1_y%"/>
-				<text>{@dumlock_restore_btn=Restore Original Boot}</text>
-				<actions>
-					<action function="set">tw_back=htcdumlock</action>
-					<action function="set">tw_action=htcdumlockrestoreboot</action>
-					<action function="set">tw_text1={@dumlock_restore_confirm=Restore original boot image?}</action>
-					<action function="set">tw_action_text1={@dumlock_restoring=Restoring Original Boot...}</action>
-					<action function="set">tw_complete_text1={@dumlock_restore_complete=Restore Original Boot Complete}</action>
-					<action function="set">tw_slider_text={@swipe_confirm=   Confirm}</action>
-					<action function="page">confirm_action</action>
-				</actions>
-			</button>
-
-			<button style="main_button_full_width">
-				<placement x="%indent%" y="%row6_y%"/>
-				<text>{@dumlock_reflash_btn=Reflash Recovery}</text>
-				<actions>
-					<action function="set">tw_back=htcdumlock</action>
-					<action function="set">tw_action=htcdumlockreflashrecovery</action>
-					<action function="set">tw_text1={@dumlock_reflash_confirm=Reflash recovery to boot?}</action>
-					<action function="set">tw_action_text1={@dumlock_reflashing=Flashing recovery to boot...}</action>
-					<action function="set">tw_complete_text1={@dumlock_reflash_complete=Recovery Flash to Boot Complete}</action>
-					<action function="set">tw_slider_text={@swipe_confirm=   Confirm}</action>
-					<action function="page">confirm_action</action>
-				</actions>
-			</button>
-
-			<button style="main_button_full_width">
-				<placement x="%indent%" y="%row11_y%"/>
-				<text>{@dumlock_install_btn=Install HTC Dumlock}</text>
-				<actions>
-					<action function="set">tw_back=htcdumlock</action>
-					<action function="set">tw_action=installhtcdumlock</action>
-					<action function="set">tw_action_text1={@dumlock_installing=Installing HTC Dumlock...}</action>
-					<action function="set">tw_complete_text1={@dumlock_install_complete=HTC Dumlock Install Complete}</action>
-					<action function="set">tw_slider_text={@swipe_to_confirm=Swipe to Confirm}</action>
-					<action function="set">tw_slider_text={@swipe_confirm=   Confirm}</action>
-					<action function="page">confirm_action</action>
-				</actions>
-			</button>
-
-			<action>
-				<touch key="home"/>
-				<action function="page">main</action>
-			</action>
-
-			<action>
-				<touch key="back"/>
-				<action function="page">advanced</action>
-			</action>
-		</page>
-
 		<page name="repackselect">
 			<template name="page"/>
 
diff --git a/gui/theme/extra-languages/languages/ja.xml b/gui/theme/extra-languages/languages/ja.xml
index 9fe767b..8f7085a 100644
--- a/gui/theme/extra-languages/languages/ja.xml
+++ b/gui/theme/extra-languages/languages/ja.xml
@@ -369,7 +369,6 @@
 		<string name="language_hdr">言語</string>
 		<string name="terminal_btn">ターミナル</string>
 		<string name="reload_theme_btn">テーマの再読み込み</string>
-		<string name="dumlock_btn">HTC Dumlock</string>
 		<string name="inject_twrp_btn">TWRP の組み込み</string>
 		<string name="inject_twrp_confirm">TWRP を再度組み込みますか?</string>
 		<string name="injecting_twrp">TWRP を組み込み中...</string>
@@ -389,19 +388,6 @@
 		<string name="partitioning_sd">SD カードの分割中...</string>
 		<string name="partitioning_sd2">完了まで数分かかります。</string>
 		<string name="part_sd_complete">分割しました</string>
-		<string name="dumlock_hdr">HTC Dumlock</string>
-		<string name="dumlock_restore_btn">元の Boot をリストアする</string>
-		<string name="dumlock_restore_confirm">元の Boot イメージをリストアしますか?</string>
-		<string name="dumlock_restoring">元の Boot をリストア中...</string>
-		<string name="dumlock_restore_complete">元の Boot をリストアしました</string>
-		<string name="dumlock_reflash_btn">リカバリの再書き込み</string>
-		<string name="dumlock_reflash_confirm">boot にリカバリを再書き込みしますか?</string>
-		<string name="dumlock_reflashing">boot にリカバリを書き込み中...</string>
-		<string name="dumlock_reflash_complete">リカバリを書き込みました</string>
-		<string name="dumlock_install_btn">HTC Dumlock のインストール</string>
-		<string name="dumlock_install_confirm">ROM に HTC dumlock をインストールしますか?</string>
-		<string name="dumlock_installing">HTC Dumlock のインストール中...</string>
-		<string name="dumlock_install_complete">HTC Dumlock をインストールしました</string>
 		<string name="swipe_to_unlock">スワイプでロック解除</string>
 		<string name="swipe_unlock">   ロック解除</string>
 		<string name="fm_hdr">ファイルマネージャ</string>
@@ -621,9 +607,6 @@
 		<string name="digest_match">Digest が一致しました</string>
 		<string name="pid_signal">{1} プロセスはこのシグナルで終了しました: {2}</string>
 		<string name="pid_error">{1} プロセスはこのエラーで終了しました: {2}</string>
-		<string name="install_dumlock">HTC Dumlock を system にインストール中...</string>
-		<string name="dumlock_restore">元の Boot をリストア中...</string>
-		<string name="dumlock_reflash">boot にリカバリを書き込み中...</string>
 		<string name="run_script">{1} スクリプトを実行しています...</string>
 		<string name="rename_stock">stock ROM が TWRP を置き換えるのを防ぐため、 /system の stock リカバリファイルの名前を変更しました。</string>
 		<string name="split_backup">バックアップファイルを複数の書庫に分割中...</string>
diff --git a/gui/theme/extra-languages/languages/zh_CN.xml b/gui/theme/extra-languages/languages/zh_CN.xml
index a998be3..aa318a4 100644
--- a/gui/theme/extra-languages/languages/zh_CN.xml
+++ b/gui/theme/extra-languages/languages/zh_CN.xml
@@ -399,7 +399,6 @@
 		<string name="language_hdr">语言</string>
 		<string name="terminal_btn">终端命令</string>
 		<string name="reload_theme_btn">重载主题</string>
-		<string name="dumlock_btn">HTC Dumlock</string>
 		<string name="inject_twrp_btn">注入 TWRP</string>
 		<string name="inject_twrp_confirm">是否重新注入 TWRP？</string>
 		<string name="injecting_twrp">正在重新注入 TWRP…</string>
@@ -419,19 +418,6 @@
 		<string name="partitioning_sd">正在对 SD 卡分区…</string>
 		<string name="partitioning_sd2">这将需要几分钟的时间。</string>
 		<string name="part_sd_complete">分区完成</string>
-		<string name="dumlock_hdr">HTC Dumlock</string>
-		<string name="dumlock_restore_btn">恢复原版 Boot 镜像</string>
-		<string name="dumlock_restore_confirm">是否恢复原版 Boot 镜像？</string>
-		<string name="dumlock_restoring">正在恢复原版 Boot 镜像…</string>
-		<string name="dumlock_restore_complete">恢复原版 Boot 镜像完成</string>
-		<string name="dumlock_reflash_btn">重新刷入 Recovery</string>
-		<string name="dumlock_reflash_confirm">是否重新刷入 Recovery 至 Boot 分区？</string>
-		<string name="dumlock_reflashing">正在刷入 Recovery 至 Boot 分区…</string>
-		<string name="dumlock_reflash_complete">Recovery 刷入完成</string>
-		<string name="dumlock_install_btn">安装 HTC Dumlock</string>
-		<string name="dumlock_install_confirm">是否安装 HTC Dumlock 文件到系统中？</string>
-		<string name="dumlock_installing">正在安装 HTC Dumlock…</string>
-		<string name="dumlock_install_complete">HTC Dumlock 安装完成</string>
 		<string name="swipe_to_unlock">滑动滑块解锁</string>
 		<string name="swipe_unlock">   解锁</string>
 		<string name="fm_hdr">文件管理</string>
@@ -698,9 +684,6 @@
 		<string name="digest_match" version="2">Digest 校验成功</string>
 		<string name="pid_signal">{1} 过程结束，标志: {2}</string>
 		<string name="pid_error">{1} 过程结束，错误: {2}</string>
-		<string name="install_dumlock">安装 HTC Dumlock 到系统…</string>
-		<string name="dumlock_restore">正在恢复原版 Boot…</string>
-		<string name="dumlock_reflash">正在重新刷入 Recovery 到 Boot…</string>
 		<string name="run_script">正在运行 {1} 脚本…</string>
 		<string name="rename_stock">重命名/system 下原版 Recovery 的补丁文件，避免原厂固件替换 TWRP。</string>
 		<string name="split_backup">分解备份文件为多个压缩文件…</string>
diff --git a/gui/theme/extra-languages/languages/zh_TW.xml b/gui/theme/extra-languages/languages/zh_TW.xml
index 3d211b5..27542a3 100644
--- a/gui/theme/extra-languages/languages/zh_TW.xml
+++ b/gui/theme/extra-languages/languages/zh_TW.xml
@@ -397,7 +397,6 @@
 		<string name="language_hdr">語言</string>
 		<string name="terminal_btn">終端指令</string>
 		<string name="reload_theme_btn">重載主題</string>
-		<string name="dumlock_btn">HTC Dumlock</string>
 		<string name="inject_twrp_btn">注入 TWRP</string>
 		<string name="inject_twrp_confirm">是否重新注入 TWRP？</string>
 		<string name="injecting_twrp">正在重新注入 TWRP…</string>
@@ -417,19 +416,6 @@
 		<string name="partitioning_sd">正在對 SD 卡分割區…</string>
 		<string name="partitioning_sd2">這將需要幾分鐘的時間。</string>
 		<string name="part_sd_complete">分割區完成</string>
-		<string name="dumlock_hdr">HTC Dumlock</string>
-		<string name="dumlock_restore_btn">恢復原廠 Boot 映像</string>
-		<string name="dumlock_restore_confirm">是否恢復原廠 Boot 映像？</string>
-		<string name="dumlock_restoring">正在恢復原廠 Boot 映像…</string>
-		<string name="dumlock_restore_complete">恢復原廠 Boot 映像完成。</string>
-		<string name="dumlock_reflash_btn">重新刷入 Recovery</string>
-		<string name="dumlock_reflash_confirm">是否重新刷入 Recovery 至 Boot 分割區？</string>
-		<string name="dumlock_reflashing">正在刷入 Recovery 至 Boot 分割區…</string>
-		<string name="dumlock_reflash_complete">Recovery 刷入完成</string>
-		<string name="dumlock_install_btn">安裝 HTC Dumlock</string>
-		<string name="dumlock_install_confirm">是否安裝 HTC Dumlock 檔案到系統中？</string>
-		<string name="dumlock_installing">正在安裝 HTC Dumlock…</string>
-		<string name="dumlock_install_complete">HTC Dumlock 安裝完成</string>
 		<string name="swipe_to_unlock">滑動滑塊解鎖</string>
 		<string name="swipe_unlock">   解鎖</string>
 		<string name="fm_hdr">檔案管理</string>
@@ -689,9 +675,6 @@
 		<string name="digest_match" version="2">Digest 校驗成功</string>
 		<string name="pid_signal">{1} 過程結束，標誌: {2}</string>
 		<string name="pid_error">{1} 過程結束，錯誤: {2}</string>
-		<string name="install_dumlock">安裝 HTC Dumlock 到系統…</string>
-		<string name="dumlock_restore">正在恢復原廠 Boot…</string>
-		<string name="dumlock_reflash">正在重新刷入 Recovery 到 Boot…</string>
 		<string name="run_script">正在執行 {1} 腳本…</string>
 		<string name="rename_stock">重新命名/system 下原廠 Recovery 的補丁，避免原廠韌體替換 TWRP。</string>
 		<string name="split_backup">拆分備份檔案為多個壓縮檔…</string>
diff --git a/htcdumlock/Android.mk b/htcdumlock/Android.mk
deleted file mode 100755
index ffc1601..0000000
--- a/htcdumlock/Android.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-ifeq ($(TW_INCLUDE_DUMLOCK), true)
-	LOCAL_SRC_FILES:= \
-		htcdumlock.c
-	LOCAL_CFLAGS:= -g -c -W
-	LOCAL_MODULE:=htcdumlock
-	LOCAL_MODULE_TAGS:= optional
-	LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
-	LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/
-	include $(BUILD_EXECUTABLE)
-endif
diff --git a/htcdumlock/htcdumlock.c b/htcdumlock/htcdumlock.c
deleted file mode 100644
index 9119612..0000000
--- a/htcdumlock/htcdumlock.c
+++ /dev/null
@@ -1,364 +0,0 @@
-/*
- * This binary is a workaround for HTC's unlock method that doesn't let
- * you flash boot while booted to recovery.  It is designed to dump
- * recovery and boot to the sdcard then flash recovery to boot. When
- * used with a supported recovery, you can reflash the dumped copy of
- * boot once you enter the recovery.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 and
- * only version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- *
- * The code was written from scratch by Dees_Troy dees_troy at
- * yahoo
- *
- * Copyright (c) 2012
- *
- * Note that this all could probably be done as a shell script, but
- * I am much better at C than I am at scripting. :)
- */
-#include <stdio.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-
-// Number of bytes in the ramdisks to compare
-#define SCAN_SIZE 60
-
-#define DEVID_MAX 64
-
-#define CMDLINE_SERIALNO        "androidboot.serialno="
-#define CMDLINE_SERIALNO_LEN    (strlen(CMDLINE_SERIALNO))
-#define CPUINFO_SERIALNO        "Serial"
-#define CPUINFO_SERIALNO_LEN    (strlen(CPUINFO_SERIALNO))
-#define CPUINFO_HARDWARE        "Hardware"
-#define CPUINFO_HARDWARE_LEN    (strlen(CPUINFO_HARDWARE))
-
-char device_id[DEVID_MAX] = { 0 };
-int verbose = 0, java = 0;
-
-void sanitize_device_id(void) {
-	const char* whitelist ="-._";
-	char str[DEVID_MAX];
-	char* c = str;
-
-	snprintf(str, DEVID_MAX, "%s", device_id);
-	memset(device_id, 0, strlen(device_id));
-	while (*c) {
-		if (isalnum(*c) || strchr(whitelist, *c))
-			strncat(device_id, c, 1);
-		c++;
-	}
-	return;
-}
-
-/* Recent HTC devices that still take advantage of dumlock
-   can safely rely on cmdline device_id retrieval */
-void get_device_id(void)
-{
-	FILE *fp;
-	char line[2048];
-	char* token;
-
-	// Check the cmdline to see if the serial number was supplied
-	fp = fopen("/proc/cmdline", "rt");
-	if (fp != NULL) {
-		fgets(line, sizeof(line), fp);
-		fclose(fp); // cmdline is only one line long
-
-		token = strtok(line, " ");
-		while (token) {
-			if (memcmp(token, CMDLINE_SERIALNO, CMDLINE_SERIALNO_LEN) == 0) {
-				token += CMDLINE_SERIALNO_LEN;
-				snprintf(device_id, DEVID_MAX, "%s", token);
-				sanitize_device_id(); // also removes newlines
-				return;
-			}
-			token = strtok(NULL, " ");
-		}
-	}
-
-	strcpy(device_id, "serialno");
-	if (verbose)
-		printf("device id not found, using '%s'.", device_id);
-	return;
-}
-
-void reboot_device() {
-	// Reboot
-	printf("Rebooting!\n");
-	system("reboot system");
-}
-
-void scan_for_ramdisk_data(char *filename, char *ramdisk) {
-	FILE *pFile;
-	unsigned long lSize;
-	unsigned char *buffer;
-	size_t result;
-	int i;
-
-	pFile = fopen(filename, "rb");
-	if(pFile==NULL){
-		printf("Unabled to open image.\nFailed\n");
-		exit(1);
-	}
-
-	fseek (pFile , 0 , SEEK_END);
-	lSize = ftell(pFile);
-	rewind(pFile);
-
-	//printf("\n\nFile is %ld bytes big\n\n", lSize);
-
-	buffer = (unsigned char*)malloc(sizeof(unsigned char) * lSize);
-	if(buffer == NULL){
-		printf("File read error!\nFailed\n");
-		exit(2);
-	}
-
-	result = fread (buffer, 1, lSize, pFile);
-	if (result != lSize) {
-		printf("Error reading file '%s'\nFailed\n", filename);
-		exit(3);
-	}
-
-	unsigned char needle[6] = {0x00, 0x00, 0x00, 0x00, 0x1f, 0x8b};
-	unsigned char *last_needle = NULL;
-	//char *p = memmem(needle, lSize, buffer, sizeof(needle));
-	unsigned char *p = memmem(buffer + 2048, lSize - 2048, needle, sizeof(needle));
-	if (!p) {
-		fclose(pFile);
-		printf("Ramdisk not found in '%s', error!\nFailed\n", filename);
-		exit(4);
-	} else {
-		//printf("Ramdisk found in '%s'!\n", filename);
-	}
-
-	memcpy(ramdisk, p, sizeof(char) * SCAN_SIZE);
-	fclose(pFile);
-	free(buffer);
-}
-
-int compare_ramdisks(char *boot_path, char *recovery_path) {
-	char boot_data[SCAN_SIZE], recovery_data[SCAN_SIZE];
-
-	scan_for_ramdisk_data(boot_path, (char*)&boot_data);
-	scan_for_ramdisk_data(recovery_path, (char*)&recovery_data);
-	if (memcmp(boot_data, recovery_data, sizeof(boot_data)) == 0) {
-		if (verbose)
-			printf("Boot and recovery are the same.\n");
-		return 0;
-	} else {
-		if (verbose)
-			printf("Boot and recovery are NOT the same.\n");
-		return 1;
-	}
-}
-
-void flash_recovery_to_boot(int no_flash, int no_reboot) {
-	char twrp_device_path[255], recovery_path[255], boot_path[255],
-		exec[255], md5recovery[255], md5boot[255],
-		recoveryimg[255], bootimg[255], tempimg[255];
-	int ret_val = 0;
-	FILE *fp;
-	char* token;
-
-	// Create folders
-	if (verbose)
-		printf("Making '/sdcard/TWRP'\n");
-	mkdir("/sdcard/TWRP", 0777);
-	if (verbose)
-		printf("Making folder '/sdcard/TWRP/htcdumlock'\n");
-	mkdir("/sdcard/TWRP/htcdumlock", 0777);
-	strcpy(twrp_device_path, "/sdcard/TWRP/htcdumlock/");
-	strcat(twrp_device_path, device_id);
-	if (verbose)
-		printf("Making folder '%s'\n", twrp_device_path);
-	mkdir(twrp_device_path, 0777);
-	// Make folder for recovery
-	strcpy(recovery_path, twrp_device_path);
-	strcat(recovery_path, "/recovery");
-	if (verbose)
-		printf("Making folder '%s'\n", recovery_path);
-	mkdir(recovery_path, 0777);
-	strcat(recovery_path, "/");
-	// Make folder for boot
-	strcpy(boot_path, twrp_device_path);
-	strcat(boot_path, "/boot");
-	if (verbose)
-		printf("Making folder '%s'\n", boot_path);
-	mkdir(boot_path, 0777);
-	strcat(boot_path, "/");
-
-	// Set up file locations
-	strcpy(recoveryimg, recovery_path);
-	strcat(recoveryimg, "recovery.img");
-	strcpy(bootimg, boot_path);
-	strcat(bootimg, "boot.img");
-	strcpy(tempimg, twrp_device_path);
-	strcat(tempimg, "/temp.img");
-
-	// Dump recovery
-	strcpy(exec, "dump_image recovery ");
-	strcat(exec, recoveryimg);
-	if (verbose)
-		printf("Running command: '%s'\n", exec);
-	ret_val = system(exec);
-	if (ret_val != 0) {
-		printf("Unable to dump recovery.\nFailed\n");
-		return;
-	}
-
-	// Dump boot (kernel)
-	strcpy(exec, "dump_image boot ");
-	strcat(exec, tempimg);
-	if (verbose)
-		printf("Running command: '%s'\n", exec);
-	ret_val = system(exec);
-	if (ret_val != 0) {
-		printf("Unable to dump recovery.\nFailed\n");
-		return;
-	}
-
-	// Compare the ramdisks of the images from boot and recovery to make sure they are different
-	// If they are the same, then recovery is already flashed to boot and we don't want to wipe
-	// out our existing backup of boot
-	if (compare_ramdisks(tempimg, recoveryimg) != 0) {
-		if (verbose)
-			printf("Boot and recovery do not match so recovery is not flashed to boot yet...\n");
-		strcpy(exec, "mv ");
-		strcat(exec, tempimg);
-		strcat(exec, " ");
-		strcat(exec, bootimg);
-		if (verbose)
-			printf("Moving temporary boot.img: '%s'\n", exec);
-		ret_val = system(exec);
-		if (ret_val != 0) {
-			printf("Unable to move temporary boot image.\nFailed\n");
-			return;
-		}
-	} else {
-		if (!java)
-			printf("Ramdisk recovery and boot matches! Recovery is already flashed to boot!\n");
-		if (!no_reboot)
-			reboot_device();
-		return;
-	}
-
-	// Flash recovery to boot
-	strcpy(exec, "flash_image boot ");
-	strcat(exec, recoveryimg);
-	if (no_flash) {
-		if (verbose)
-			printf("NOT flashing recovery to boot due to argument 'noflash', command is '%s'\n", exec);
-	} else {
-		if (verbose)
-			printf("Running command: '%s'\n", exec);
-		ret_val = system(exec);
-		if (ret_val != 0) {
-			printf("Unable to flash recovery to boot.\nFailed\n");
-			return;
-		}
-	}
-
-	if (!no_reboot && !ret_val)
-		reboot_device();
-}
-
-void restore_original_boot(int no_flash) {
-	char boot_path[255], exec[255];
-
-	// Restore original boot partition
-	strcpy(boot_path, "/sdcard/TWRP/htcdumlock/");
-	strcat(boot_path, device_id);
-	strcat(boot_path, "/boot/");
-	strcpy(exec, "flash_image boot ");
-	strcat(exec, boot_path);
-	strcat(exec, "boot.img");
-	if (no_flash) {
-		if (verbose)
-			printf("NOT restoring boot due to argument 'noflash', command is '%s'\n", exec);
-	} else {
-		if (verbose)
-			printf("Running command: '%s'\n", exec);
-		system(exec);
-	}
-}
-
-int main(int argc, char** argv)
-{
-	int recovery = 0, no_flash = 0, restore_boot = 0, arg_error = 0,
-		no_reboot = 0, i;
-
-	// Parse the arguments
-	if (argc < 2)
-		arg_error = 1;
-	else {
-		for (i=1; i<argc; i++) {
-			if (strcmp(argv[i], "recovery") == 0) {
-				// Check to see if restore option is already set
-				// Do not allow user to do recovery and restore at the same time
-				if (restore_boot)
-					arg_error = 1;
-				recovery = 1;
-			} else if (strcmp(argv[i], "restore") == 0) {
-				// Check to see if recovery option is already set
-				// Do not allow user to do recovery and restore at the same time
-				if (recovery)
-					arg_error = 1;
-				restore_boot = 1;
-			} else if (strcmp(argv[i], "noflash") == 0)
-				no_flash = 1;
-			else if (strcmp(argv[i], "noreboot") == 0)
-				no_reboot = 1;
-			else if (strcmp(argv[i], "verbose") == 0)
-				verbose = 1;
-			else if (strcmp(argv[i], "java") == 0)
-				java = 1;
-			else
-				arg_error = 1;
-		}
-	}
-	if (arg_error) {
-		printf("Invalid argument given.\n");
-		printf("Valid arguments are:\n");
-		printf("  recovery -- backs up boot and recovery and flashes recovery to boot\n");
-		printf("  restore  -- restores the most recent backup of boot made by this utility\n");
-		printf("  noflash  -- same as 'recovery' but does not flash boot or reboot at the end\n");
-		printf("  noreboot -- does not reboot after flashing boot during 'recovery'\n");
-		printf("  verbose  -- show extra debug information\n");
-		printf("\nNOTE: You cannot do 'recovery' and 'restore' in the same operation.\nFailed\n");
-		return 0;
-	}
-
-	get_device_id();
-	if (verbose)
-		printf("Device ID is: '%s'\n", device_id);
-	if (strcmp(device_id, "serialno") == 0) {
-		printf("Error, dummy device ID detected!\n");
-		printf("Did you 'su' first? HTC Dumlock requires root access.\nFailed\n");
-		return 0;
-	}
-
-	if (recovery) {
-		if (!java)
-			printf("Flashing recovery to boot, this may take a few minutes . . .\n");
-		flash_recovery_to_boot(no_flash, no_reboot);
-	}
-	if (restore_boot) {
-		printf("Restoring boot, this may take a few minutes . . .\n");
-		restore_original_boot(no_flash);
-	}
-
-	return 0;
-}
diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index c214166..fa396fc 100755
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -478,80 +478,6 @@
     include $(BUILD_PREBUILT)
 endif
 
-ifeq ($(TW_INCLUDE_DUMLOCK), true)
-    #htcdumlock for /system for dumlock
-    include $(CLEAR_VARS)
-    LOCAL_MODULE := htcdumlocksys
-    LOCAL_MODULE_TAGS := optional
-    LOCAL_MODULE_CLASS := EXECUTABLES
-    LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)$(TWHTCD_PATH)
-    LOCAL_SRC_FILES := $(LOCAL_MODULE)
-    include $(BUILD_PREBUILT)
-
-    #flash_image for /system for dumlock
-    include $(CLEAR_VARS)
-    LOCAL_MODULE := flash_imagesys
-    LOCAL_MODULE_TAGS := optional
-    LOCAL_MODULE_CLASS := EXECUTABLES
-    LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)$(TWHTCD_PATH)
-    LOCAL_SRC_FILES := $(LOCAL_MODULE)
-    include $(BUILD_PREBUILT)
-
-    #dump_image for /system for dumlock
-    include $(CLEAR_VARS)
-    LOCAL_MODULE := dump_imagesys
-    LOCAL_MODULE_TAGS := optional
-    LOCAL_MODULE_CLASS := EXECUTABLES
-    LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)$(TWHTCD_PATH)
-    LOCAL_SRC_FILES := $(LOCAL_MODULE)
-    include $(BUILD_PREBUILT)
-
-    #libbmlutils for /system for dumlock
-    include $(CLEAR_VARS)
-    LOCAL_MODULE := libbmlutils.so
-    LOCAL_MODULE_TAGS := optional
-    LOCAL_MODULE_CLASS := EXECUTABLES
-    LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)$(TWHTCD_PATH)
-    LOCAL_SRC_FILES := $(LOCAL_MODULE)
-    include $(BUILD_PREBUILT)
-
-    #libflashutils for /system for dumlock
-    include $(CLEAR_VARS)
-    LOCAL_MODULE := libflashutils.so
-    LOCAL_MODULE_TAGS := optional
-    LOCAL_MODULE_CLASS := EXECUTABLES
-    LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)$(TWHTCD_PATH)
-    LOCAL_SRC_FILES := $(LOCAL_MODULE)
-    include $(BUILD_PREBUILT)
-
-    #libmmcutils for /system for dumlock
-    include $(CLEAR_VARS)
-    LOCAL_MODULE := libmmcutils.so
-    LOCAL_MODULE_TAGS := optional
-    LOCAL_MODULE_CLASS := EXECUTABLES
-    LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)$(TWHTCD_PATH)
-    LOCAL_SRC_FILES := $(LOCAL_MODULE)
-    include $(BUILD_PREBUILT)
-
-    #libmtdutils for /system for dumlock
-    include $(CLEAR_VARS)
-    LOCAL_MODULE := libmtdutils.so
-    LOCAL_MODULE_TAGS := optional
-    LOCAL_MODULE_CLASS := EXECUTABLES
-    LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)$(TWHTCD_PATH)
-    LOCAL_SRC_FILES := $(LOCAL_MODULE)
-    include $(BUILD_PREBUILT)
-
-    #HTCDumlock.apk
-    include $(CLEAR_VARS)
-    LOCAL_MODULE := HTCDumlock.apk
-    LOCAL_MODULE_TAGS := optional
-    LOCAL_MODULE_CLASS := EXECUTABLES
-    LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)$(TWHTCD_PATH)
-    LOCAL_SRC_FILES := $(LOCAL_MODULE)
-    include $(BUILD_PREBUILT)
-endif
-
 ifeq ($(TW_USE_TOOLBOX), true)
    include $(CLEAR_VARS)
    LOCAL_MODULE := mkshrc_twrp
diff --git a/prebuilt/HTCDumlock.apk b/prebuilt/HTCDumlock.apk
deleted file mode 100644
index 8298197..0000000
--- a/prebuilt/HTCDumlock.apk
+++ /dev/null
Binary files differ
diff --git a/prebuilt/htcdumlock b/prebuilt/htcdumlock
deleted file mode 100644
index 18068e5..0000000
--- a/prebuilt/htcdumlock
+++ /dev/null
Binary files differ
diff --git a/prebuilt/htcdumlocksys b/prebuilt/htcdumlocksys
deleted file mode 100644
index c63725e..0000000
--- a/prebuilt/htcdumlocksys
+++ /dev/null
Binary files differ
diff --git a/twrp-functions.hpp b/twrp-functions.hpp
index 825d667..3fa2df6 100755
--- a/twrp-functions.hpp
+++ b/twrp-functions.hpp
@@ -78,9 +78,6 @@
 	static bool Wait_For_Battery(std::chrono::nanoseconds timeout);             // Wait For /sys/class/power_supply/battery or TW_CUSTOM_BATTERY_PATH, True is success, False is timeout;
 
 #ifndef BUILD_TWRPTAR_MAIN
-	static void install_htc_dumlock(void);                                      // Installs HTC Dumlock
-	static void htc_dumlock_restore_original_boot(void);                        // Restores the backup of boot from HTC Dumlock
-	static void htc_dumlock_reflash_recovery_to_boot(void);                     // Reflashes the current recovery to boot
 	static int Recursive_Mkdir(string Path);                                    // Recursively makes the entire path
 	static void GUI_Operation_Text(string Read_Value, string Default_Text);     // Updates text for display in the GUI, e.g. Backing up %partition name%
 	static void GUI_Operation_Text(string Read_Value, string Partition_Name, string Default_Text); // Same as above but includes partition name
diff --git a/variables.h b/variables.h
index 72411e4..e648d8f 100755
--- a/variables.h
+++ b/variables.h
@@ -126,7 +126,6 @@
 #define TW_DONT_UNMOUNT_SYSTEM      "tw_dont_unmount_system"
 // #define TW_ALWAYS_RMRF              "tw_always_rmrf"
 
-#define TW_SHOW_DUMLOCK             "tw_show_dumlock"
 #define TW_HAS_INJECTTWRP           "tw_has_injecttwrp"
 #define TW_INJECT_AFTER_ZIP         "tw_inject_after_zip"
 #define TW_HAS_DATADATA             "tw_has_datadata"