From b46a6849719a8cd1045e08cd2c48f2ef94a2ccf6 Mon Sep 17 00:00:00 2001
From: Dees_Troy <dees_troy@teamw.in>
Date: Tue, 25 Sep 2012 11:06:46 -0400
Subject: [PATCH] Unify portrait layouts again

---
 data.cpp                        |  21 +-
 gui/devices/320x480/res/ui.xml  |  58 ++---
 gui/devices/480x800/res/ui.xml  | 106 +++++-----
 gui/devices/480x854/res/ui.xml  | 125 +++++++----
 gui/devices/540x960/res/ui.xml  |  86 ++++----
 gui/devices/720x1280/res/ui.xml |  86 ++++----
 gui/devices/800x1280/res/ui.xml | 360 ++++++++++++++------------------
 partition.cpp                   |  14 +-
 partitionmanager.cpp            |   3 +
 twrp-functions.cpp              |  23 ++
 twrp-functions.hpp              |   2 +
 variables.h                     |   5 +
 12 files changed, 466 insertions(+), 423 deletions(-)

diff --git a/data.cpp b/data.cpp
index 70411a11..9c53c46f 100644
--- a/data.cpp
+++ b/data.cpp
@@ -605,23 +605,26 @@ void DataManager::SetDefaultValues()
     str += dev_id;
 	SetValue(TW_BACKUPS_FOLDER_VAR, str, 0);
 
-#ifdef SP1_NAME
-	if (strlen(EXPAND(SP1_NAME)))    mConstValues.insert(make_pair(TW_SP1_PARTITION_NAME_VAR, EXPAND(SP1_NAME)));
-#endif
-#ifdef SP2_NAME
-	if (strlen(EXPAND(SP2_NAME)))    mConstValues.insert(make_pair(TW_SP1_PARTITION_NAME_VAR, EXPAND(SP2_NAME)));
-#endif
-#ifdef SP3_NAME
-	if (strlen(EXPAND(SP3_NAME)))    mConstValues.insert(make_pair(TW_SP1_PARTITION_NAME_VAR, EXPAND(SP3_NAME)));
-#endif
 #ifdef SP1_DISPLAY_NAME
     if (strlen(EXPAND(SP1_DISPLAY_NAME)))    mConstValues.insert(make_pair(TW_SP1_PARTITION_NAME_VAR, EXPAND(SP1_DISPLAY_NAME)));
+#else
+	#ifdef SP1_NAME
+		if (strlen(EXPAND(SP1_NAME)))    mConstValues.insert(make_pair(TW_SP1_PARTITION_NAME_VAR, EXPAND(SP1_NAME)));
+	#endif
 #endif
 #ifdef SP2_DISPLAY_NAME
     if (strlen(EXPAND(SP2_DISPLAY_NAME)))    mConstValues.insert(make_pair(TW_SP2_PARTITION_NAME_VAR, EXPAND(SP2_DISPLAY_NAME)));
+#else
+	#ifdef SP2_NAME
+		if (strlen(EXPAND(SP2_NAME)))    mConstValues.insert(make_pair(TW_SP1_PARTITION_NAME_VAR, EXPAND(SP2_NAME)));
+	#endif
 #endif
 #ifdef SP3_DISPLAY_NAME
     if (strlen(EXPAND(SP3_DISPLAY_NAME)))    mConstValues.insert(make_pair(TW_SP3_PARTITION_NAME_VAR, EXPAND(SP3_DISPLAY_NAME)));
+#else
+	#ifdef SP3_NAME
+		if (strlen(EXPAND(SP3_NAME)))    mConstValues.insert(make_pair(TW_SP1_PARTITION_NAME_VAR, EXPAND(SP3_NAME)));
+	#endif
 #endif
 
     mConstValues.insert(make_pair(TW_REBOOT_SYSTEM, tw_isRebootCommandSupported(rb_system) ? "1" : "0"));
diff --git a/gui/devices/320x480/res/ui.xml b/gui/devices/320x480/res/ui.xml
index 0890821b..e43ec691 100644
--- a/gui/devices/320x480/res/ui.xml
+++ b/gui/devices/320x480/res/ui.xml
@@ -12,7 +12,6 @@
 	<resources>
 		<resource name="font" type="font" filename="Roboto-Condensed-16" />
 		<resource name="mediumfont" type="font" filename="Roboto-Condensed-14" />
-		<resource name="UItext" type="font" filename="Roboto-Condensed-12" />
 		<resource name="filelist" type="font" filename="Roboto-Condensed-14" />
 		<resource name="top_bar" type="image" filename="top-bar.jpg" />
 		<resource name="main_button" type="image" filename="menu-button" />
@@ -43,7 +42,6 @@
 	</resources>
 
 	<variables>
-		<variable name="backgroundcolor" value="#000000FF" />
 		<variable name="col1_x" value="8" />
 		<variable name="col2_x" value="162" />
 		<variable name="col_center_x" value="85" />
@@ -66,13 +64,13 @@
 		<variable name="row9_text_y" value="237" />
 		<variable name="row10_text_y" value="256" />
 		<variable name="row11_text_y" value="275" />
-		<variable name="row12_text_y" value="300" />
-		<variable name="row13_text_y" value="319" />
-		<variable name="row14_text_y" value="338" />
-		<variable name="row15_text_y" value="357" />
-		<variable name="row16_text_y" value="376" />
-		<variable name="row17_text_y" value="395" />
-		<variable name="row18_text_y" value="414" />
+		<variable name="row12_text_y" value="294" />
+		<variable name="row13_text_y" value="313" />
+		<variable name="row14_text_y" value="332" />
+		<variable name="row15_text_y" value="351" />
+		<variable name="row16_text_y" value="370" />
+		<variable name="row17_text_y" value="389" />
+		<variable name="row18_text_y" value="408" />
 		<variable name="zip_status_y" value="350" />
 		<variable name="tz_selected_y" value="66" />
 		<variable name="tz_set_y" value="348" />
@@ -101,6 +99,7 @@
 		<variable name="home_button_y" value="460" />
 		<variable name="back_button_x" value="275" />
 		<variable name="back_button_y" value="460" />
+		<variable name="sort_text_x" value="8" />
 		<variable name="sort_asc_text_y" value="411" />
 		<variable name="sort_asc_button_y" value="411" />
 		<variable name="sort_desc_text_y" value="435" />
@@ -139,25 +138,28 @@
 		<variable name="listbox_spacing" value="12" />
 		<variable name="sd_plus_x" value="187" />
 		<variable name="sdext_text_x" value="56" />
-		<variable name="sdext_text_y" value="90" />
+		<variable name="sdext_text_y" value="83" />
 		<variable name="sdswap_button_y" value="111" />
 		<variable name="sdswap_text_x" value="56" />
-		<variable name="sdswap_text_y" value="117" />
+		<variable name="sdswap_text_y" value="110" />
 		<variable name="sdfilesystem_text_y" value="144" />
 		<variable name="sdfilesystem_button_y" value="168" />
 		<variable name="lock_x" value="27" />
 		<variable name="lock_y" value="120" />
 		<variable name="filemanager_select_x" value="243" />
 		<variable name="filemanager_select_y" value="414" />
-		<variable name="backup_name_y" value="210" />
+		<variable name="backup_name_y" value="218" />
 		<variable name="terminal_console_height" value="220" />
 		<variable name="terminal_text_y" value="225" />
-		<variable name="terminal_button_y" value="228" />
+		<variable name="terminal_button_y" value="220" />
+		<variable name="row_dst_text_y" value="256" />
+		<variable name="row_offset_text_y" value="275" />
+		<variable name="row_offset_medium_y" value="303" />
 	</variables>
 
 	<templates>
 		<template name="header">
-			<background color="%backgroundcolor%" />
+			<background color="#000000FF" />
 
 			<object type="image">
 				<image resource="top_bar" />
@@ -244,13 +246,13 @@
 		<template name="sort_options">
 			<object type="text" color="%text_color%">
 				<font resource="mediumfont" />
-				<placement x="%col1_x%" y="%sort_asc_text_y%" />
+				<placement x="%sort_text_x%" y="%sort_asc_text_y%" />
 				<text>Sort Ascending:</text>
 			</object>
 
 			<object type="button">
 				<placement x="%sort_col1_button_x%" y="%sort_asc_button_y%" />
-				<font resource="UItext" color="%button_text_color%" />
+				<font resource="mediumfont" color="%button_text_color%" />
 				<text>Name</text>
 				<image resource="sort_button" />
 				<action function="set">tw_gui_sort_order=1</action>
@@ -258,7 +260,7 @@
 
 			<object type="button">
 				<placement x="%sort_col2_button_x%" y="%sort_asc_button_y%" />
-				<font resource="UItext" color="%button_text_color%" />
+				<font resource="mediumfont" color="%button_text_color%" />
 				<text>Date</text>
 				<image resource="sort_button" />
 				<action function="set">tw_gui_sort_order=2</action>
@@ -266,7 +268,7 @@
 
 			<object type="button">
 				<placement x="%sort_col3_button_x%" y="%sort_asc_button_y%" />
-				<font resource="UItext" color="%button_text_color%" />
+				<font resource="mediumfont" color="%button_text_color%" />
 				<text>Size</text>
 				<image resource="sort_button" />
 				<action function="set">tw_gui_sort_order=3</action>
@@ -274,13 +276,13 @@
 
 			<object type="text" color="%text_color%">
 				<font resource="mediumfont" />
-				<placement x="%col1_x%" y="%sort_desc_text_y%" />
+				<placement x="%sort_text_x%" y="%sort_desc_text_y%" />
 				<text>Sort Descending:</text>
 			</object>
 
 			<object type="button">
 				<placement x="%sort_col1_button_x%" y="%sort_desc_button_y%" />
-				<font resource="UItext" color="%button_text_color%" />
+				<font resource="mediumfont" color="%button_text_color%" />
 				<text>Name</text>
 				<image resource="sort_button" />
 				<action function="set">tw_gui_sort_order=-1</action>
@@ -288,7 +290,7 @@
 
 			<object type="button">
 				<placement x="%sort_col2_button_x%" y="%sort_desc_button_y%" />
-				<font resource="UItext" color="%button_text_color%" />
+				<font resource="mediumfont" color="%button_text_color%" />
 				<text>Date</text>
 				<image resource="sort_button" />
 				<action function="set">tw_gui_sort_order=-2</action>
@@ -296,7 +298,7 @@
 
 			<object type="button">
 				<placement x="%sort_col3_button_x%" y="%sort_desc_button_y%" />
-				<font resource="UItext" color="%button_text_color%" />
+				<font resource="mediumfont" color="%button_text_color%" />
 				<text>Size</text>
 				<image resource="sort_button" />
 				<action function="set">tw_gui_sort_order=-3</action>
@@ -2406,7 +2408,7 @@
 			</object>
 
 			<object type="checkbox">
-				<placement x="%col1_x%" y="%row10_text_y%" />
+				<placement x="%col1_x%" y="%row_dst_text_y%" />
 				<font resource="font" color="%text_color%" />
 				<text>Do you use daylight savings time (DST)?</text>
 				<data variable="tw_time_zone_guidst" />
@@ -2415,12 +2417,12 @@
 
 			<object type="text" color="%text_color%">
 				<font resource="font" />
-				<placement x="%center_x%" y="%row11_text_y%" placement="5" />
+				<placement x="%center_x%" y="%row_offset_text_y%" placement="5" />
 				<text>Offset (usually 0): %tw_time_zone_guioffset%</text>
 			</object>
 
 			<object type="button">
-				<placement x="%col1_medium_x%" y="%row6_medium_y%" />
+				<placement x="%col1_medium_x%" y="%row_offset_medium_y%" />
 				<font resource="font" color="%button_text_color%" />
 				<text>None</text>
 				<image resource="medium_button" />
@@ -2428,7 +2430,7 @@
 			</object>
 
 			<object type="button">
-				<placement x="%col2_medium_x%" y="%row6_medium_y%" />
+				<placement x="%col2_medium_x%" y="%row_offset_medium_y%" />
 				<font resource="font" color="%button_text_color%" />
 				<text>15</text>
 				<image resource="medium_button" />
@@ -2436,7 +2438,7 @@
 			</object>
 
 			<object type="button">
-				<placement x="%col3_medium_x%" y="%row6_medium_y%" />
+				<placement x="%col3_medium_x%" y="%row_offset_medium_y%" />
 				<font resource="font" color="%button_text_color%" />
 				<text>30</text>
 				<image resource="medium_button" />
@@ -2444,7 +2446,7 @@
 			</object>
 
 			<object type="button">
-				<placement x="%col4_medium_x%" y="%row6_medium_y%" />
+				<placement x="%col4_medium_x%" y="%row_offset_medium_y%" />
 				<font resource="font" color="%button_text_color%" />
 				<text>45</text>
 				<image resource="medium_button" />
diff --git a/gui/devices/480x800/res/ui.xml b/gui/devices/480x800/res/ui.xml
index c98c1c4d..de7304a3 100644
--- a/gui/devices/480x800/res/ui.xml
+++ b/gui/devices/480x800/res/ui.xml
@@ -11,7 +11,7 @@
 
 	<resources>
 		<resource name="font" type="font" filename="Roboto-Regular-20" />
-		<resource name="condensedfont" type="font" filename="Roboto-Regular-20" />
+		<resource name="mediumfont" type="font" filename="Roboto-Regular-20" />
 		<resource name="filelist" type="font" filename="Roboto-Regular-20" />
 		<resource name="top_bar" type="image" filename="top-bar.jpg" />
 		<resource name="main_button" type="image" filename="menu-button" />
@@ -42,7 +42,6 @@
 	</resources>
 
 	<variables>
-		<variable name="backgroundcolor" value="#000000FF" />
 		<variable name="col1_x" value="10" />
 		<variable name="col2_x" value="240" />
 		<variable name="col_center_x" value="128" />
@@ -65,13 +64,13 @@
 		<variable name="row9_text_y" value="380" />
 		<variable name="row10_text_y" value="410" />
 		<variable name="row11_text_y" value="440" />
-		<variable name="row12_text_y" value="480" />
-		<variable name="row13_text_y" value="510" />
-		<variable name="row14_text_y" value="540" />
-		<variable name="row15_text_y" value="570" />
-		<variable name="row16_text_y" value="600" />
-		<variable name="row17_text_y" value="630" />
-		<variable name="row18_text_y" value="660" />
+		<variable name="row12_text_y" value="470" />
+		<variable name="row13_text_y" value="500" />
+		<variable name="row14_text_y" value="530" />
+		<variable name="row15_text_y" value="560" />
+		<variable name="row16_text_y" value="590" />
+		<variable name="row17_text_y" value="620" />
+		<variable name="row18_text_y" value="650" />
 		<variable name="zip_status_y" value="585" />
 		<variable name="tz_selected_y" value="110" />
 		<variable name="tz_set_y" value="580" />
@@ -138,10 +137,10 @@
 		<variable name="listbox_spacing" value="18" />
 		<variable name="sd_plus_x" value="280" />
 		<variable name="sdext_text_x" value="84" />
-		<variable name="sdext_text_y" value="150" />
+		<variable name="sdext_text_y" value="145" />
 		<variable name="sdswap_button_y" value="185" />
 		<variable name="sdswap_text_x" value="84" />
-		<variable name="sdswap_text_y" value="195" />
+		<variable name="sdswap_text_y" value="190" />
 		<variable name="sdfilesystem_text_y" value="240" />
 		<variable name="sdfilesystem_button_y" value="280" />
 		<variable name="lock_x" value="40" />
@@ -152,6 +151,9 @@
 		<variable name="terminal_console_height" value="370" />
 		<variable name="terminal_text_y" value="390" />
 		<variable name="terminal_button_y" value="380" />
+		<variable name="row_dst_text_y" value="440" />
+		<variable name="row_offset_text_y" value="480" />
+		<variable name="row_offset_medium_y" value="505" />
 	</variables>
 
 	<templates>
@@ -442,7 +444,7 @@
 
 			<object type="button">
 				<placement x="%col1_x%" y="%row1_text_y%" />
-				<font resource="font" color="%text_color%" />
+				<font resource="mediumfont" color="%text_color%" />
 				<conditions>
 					<condition var1="tw_has_dual_storage" var2="1" />
 					<condition var1="tw_use_external_storage" var2="1" />
@@ -454,7 +456,7 @@
 
 			<object type="button">
 				<placement x="%col1_x%" y="%row1_text_y%" />
-				<font resource="font" color="%text_color%" />
+				<font resource="mediumfont" color="%text_color%" />
 				<conditions>
 					<condition var1="tw_has_dual_storage" var2="1" />
 					<condition var1="tw_use_external_storage" var2="0" />
@@ -466,7 +468,7 @@
 
 			<object type="button">
 				<placement x="%col2_x%" y="%row1_text_y%" />
-				<font resource="font" color="%text_color%" />
+				<font resource="mediumfont" color="%text_color%" />
 				<conditions>
 					<condition var1="tw_has_dual_storage" var2="1" />
 					<condition var1="tw_use_external_storage" var2="1" />
@@ -478,7 +480,7 @@
 
 			<object type="button">
 				<placement x="%col2_x%" y="%row1_text_y%" />
-				<font resource="font" color="%text_color%" />
+				<font resource="mediumfont" color="%text_color%" />
 				<conditions>
 					<condition var1="tw_has_dual_storage" var2="1" />
 					<condition var1="tw_use_external_storage" var2="0" />
@@ -548,7 +550,7 @@
 			</object>
 
 			<object type="text" color="%text_color%">
-				<font resource="font" />
+				<font resource="mediumfont" />
 				<placement x="%center_x%" y="%row4_text_y%" placement="5" />
 				<text>%tw_zip_location%</text>
 			</object>
@@ -560,7 +562,7 @@
 			</object>
 
 			<object type="text" color="%text_color%">
-				<font resource="font" />
+				<font resource="mediumfont" />
 				<placement x="%center_x%" y="%row6_text_y%" placement="5" />
 				<text>%tw_file%</text>
 			</object>
@@ -574,7 +576,7 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row8_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Zip file signature verification?</text>
+				<text>Zip file signature verification.</text>
 				<data variable="tw_signed_zip_verify" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
@@ -582,7 +584,7 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row9_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Force MD5 check on all zips?</text>
+				<text>Force MD5 check on all zips.</text>
 				<data variable="tw_force_md5_check" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
@@ -591,14 +593,14 @@
 				<condition var1="tw_has_injecttwrp" var2="1" />
 				<placement x="%col1_x%" y="%row10_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Inject TWRP after install?</text>
+				<text>Inject TWRP after install.</text>
 				<data variable="tw_inject_after_zip" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="text" color="%text_color%">
 				<font resource="font" />
-				<placement x="%center_x%" y="%row12_text_y%" placement="5" />
+				<placement x="%center_x%" y="%row11_text_y%" placement="5" />
 				<text>File %tw_zip_queue_count% of max of 10</text>
 			</object>
 
@@ -666,7 +668,7 @@
 			</object>
 
 			<object type="text" color="%text_color%">
-				<font resource="font" />
+				<font resource="mediumfont" />
 				<placement x="%center_x%" y="%row18_text_y%" placement="5" />
 				<text>%tw_filename%</text>
 			</object>
@@ -1105,7 +1107,7 @@
 					<action function="set">tw_has_action2=1</action>
 					<action function="set">tw_action2=set</action>
 					<action function="set">tw_action2_param=tw_zip_location=/sdcard</action>
-					<action function="set">tw_text1=Wipe External Storage (SD card)?</action>
+					<action function="set">tw_text1=Wipe External Storage (SD Card)?</action>
 					<action function="set">tw_action_text1=Wiping External Storage...</action>
 					<action function="set">tw_complete_text1=External Storage Wipe Complete</action>
 					<action function="set">tw_slider_text=Swipe to Wipe</action>
@@ -1300,7 +1302,7 @@
 
 			<object type="checkbox">
 				<condition var1="tw_sp1_name" op=">" var2="" />
-				<placement x="%col1_x%" y="%row10_text_y%" />
+				<placement x="%col1_x%" y="%row9_text_y%" />
 				<font resource="font" color="%text_color%" />
 				<text>%tw_sp1_name% (%tw_backup_sp1_size% MB)</text>
 				<data variable="tw_backup_sp1" />
@@ -1309,7 +1311,7 @@
 
 			<object type="checkbox">
 				<condition var1="tw_sp2_name" op=">" var2="" />
-				<placement x="%col1_x%" y="%row11_text_y%" />
+				<placement x="%col1_x%" y="%row10_text_y%" />
 				<font resource="font" color="%text_color%" />
 				<text>%tw_sp2_name% (%tw_backup_sp2_size% MB)</text>
 				<data variable="tw_backup_sp2" />
@@ -1318,7 +1320,7 @@
 
 			<object type="checkbox">
 				<condition var1="tw_sp3_name" op=">" var2="" />
-				<placement x="%col1_x%" y="%row12_text_y%" />
+				<placement x="%col1_x%" y="%row11_text_y%" />
 				<font resource="font" color="%text_color%" />
 				<text>%tw_sp3_name% (%tw_backup_sp3_size% MB)</text>
 				<data variable="tw_backup_sp3" />
@@ -1327,28 +1329,28 @@
 
 			<object type="text" color="%text_color%">
 				<font resource="font" />
-				<placement x="%col1_x%" y="%row14_text_y%" />
+				<placement x="%col1_x%" y="%row13_text_y%" />
 				<text>Free Space: %tw_storage_free_size% MB</text>
 			</object>
 
 			<object type="checkbox">
-				<placement x="%col1_x%" y="%row15_text_y%" />
+				<placement x="%col1_x%" y="%row14_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Enable Compression (Requires more time)</text>
+				<text>Enable compression.</text>
 				<data variable="tw_use_compression" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="checkbox">
-				<placement x="%col1_x%" y="%row16_text_y%" />
+				<placement x="%col1_x%" y="%row15_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Skip MD5 generation on backups</text>
+				<text>Skip MD5 generation during backup.</text>
 				<data variable="tw_skip_md5_generate" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="button">
-				<placement x="%col1_x%" y="%row17_text_y%" />
+				<placement x="%col1_x%" y="%row16_text_y%" />
 				<font resource="font" color="%text_color%" />
 				<conditions>
 					<condition var1="tw_has_dual_storage" var2="1" />
@@ -1360,7 +1362,7 @@
 			</object>
 
 			<object type="button">
-				<placement x="%col1_x%" y="%row17_text_y%" />
+				<placement x="%col1_x%" y="%row16_text_y%" />
 				<font resource="font" color="%text_color%" />
 				<conditions>
 					<condition var1="tw_has_dual_storage" var2="1" />
@@ -1372,7 +1374,7 @@
 			</object>
 
 			<object type="button">
-				<placement x="%col2_x%" y="%row17_text_y%" />
+				<placement x="%col2_x%" y="%row16_text_y%" />
 				<font resource="font" color="%text_color%" />
 				<conditions>
 					<condition var1="tw_has_dual_storage" var2="1" />
@@ -1384,7 +1386,7 @@
 			</object>
 
 			<object type="button">
-				<placement x="%col2_x%" y="%row17_text_y%" />
+				<placement x="%col2_x%" y="%row16_text_y%" />
 				<font resource="font" color="%text_color%" />
 				<conditions>
 					<condition var1="tw_has_dual_storage" var2="1" />
@@ -1734,7 +1736,7 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row14_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Enable MD5 checking of backup files</text>
+				<text>Enable MD5 verification of backup files.</text>
 				<data variable="tw_skip_md5_check" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
@@ -1933,7 +1935,7 @@
 					<condition var1="tw_has_external" var2="1" />
 					<condition var1="mounted" op="!=" var2="EXTERNAL" />
 				</conditions>
-				<text>Mount SDCard</text>
+				<text>Mount SD Card</text>
 				<image resource="checkbox_false" />
 				<action function="mount">EXTERNAL</action>
 			</object>
@@ -1945,7 +1947,7 @@
 					<condition var1="tw_has_external" var2="1" />
 					<condition var1="mounted" op="=" var2="EXTERNAL" />
 				</conditions>
-				<text>Unmount SDCard</text>
+				<text>Unmount SD Card</text>
 				<image resource="checkbox_true" />
 				<action function="umount">EXTERNAL</action>
 			</object>
@@ -2272,7 +2274,7 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row1_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Zip file signature verification?</text>
+				<text>Zip file signature verification.</text>
 				<data variable="tw_signed_zip_verify" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
@@ -2280,7 +2282,7 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row2_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Force MD5 check on all zips?</text>
+				<text>Force MD5 check on all zips.</text>
 				<data variable="tw_force_md5_check" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
@@ -2288,7 +2290,7 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row3_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Use rm -rf instead of formatting?</text>
+				<text>Use rm -rf instead of formatting.</text>
 				<data variable="tw_rm_rf" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
@@ -2296,7 +2298,7 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row4_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Skip MD5 generation on backups</text>
+				<text>Skip MD5 generation during backup.</text>
 				<data variable="tw_skip_md5_generate" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
@@ -2304,7 +2306,7 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row5_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Enable MD5 checking of backup files</text>
+				<text>Enable MD5 verification of backup files.</text>
 				<data variable="tw_skip_md5_check" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
@@ -2312,7 +2314,7 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row6_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Ignore image size errors during backup</text>
+				<text>Ignore image size errors during backup.</text>
 				<data variable="tw_ignore_image_size" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
@@ -2320,7 +2322,7 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row7_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Simulate most actions for theme testing</text>
+				<text>Simulate actions for theme testing.</text>
 				<data variable="tw_simulate_actions" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
@@ -2329,7 +2331,7 @@
 				<condition var1="tw_simulate_actions" var2="1" />
 				<placement x="%col1_x%" y="%row8_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Simulate failure for actions</text>
+				<text>Simulate failure for actions.</text>
 				<data variable="tw_simulate_fail" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
@@ -2405,7 +2407,7 @@
 			</object>
 
 			<object type="checkbox">
-				<placement x="%col1_x%" y="%row11_text_y%" />
+				<placement x="%col1_x%" y="%row_dst_text_y%" />
 				<font resource="font" color="%text_color%" />
 				<text>Do you use daylight savings time (DST)?</text>
 				<data variable="tw_time_zone_guidst" />
@@ -2414,12 +2416,12 @@
 
 			<object type="text" color="%text_color%">
 				<font resource="font" />
-				<placement x="%center_x%" y="%row12_text_y%" placement="5" />
+				<placement x="%center_x%" y="%row_offset_text_y%" placement="5" />
 				<text>Offset (usually 0): %tw_time_zone_guioffset%</text>
 			</object>
 
 			<object type="button">
-				<placement x="%col1_medium_x%" y="%row6_medium_y%" />
+				<placement x="%col1_medium_x%" y="%row_offset_medium_y%" />
 				<font resource="font" color="%button_text_color%" />
 				<text>None</text>
 				<image resource="medium_button" />
@@ -2427,7 +2429,7 @@
 			</object>
 
 			<object type="button">
-				<placement x="%col2_medium_x%" y="%row6_medium_y%" />
+				<placement x="%col2_medium_x%" y="%row_offset_medium_y%" />
 				<font resource="font" color="%button_text_color%" />
 				<text>15</text>
 				<image resource="medium_button" />
@@ -2435,7 +2437,7 @@
 			</object>
 
 			<object type="button">
-				<placement x="%col3_medium_x%" y="%row6_medium_y%" />
+				<placement x="%col3_medium_x%" y="%row_offset_medium_y%" />
 				<font resource="font" color="%button_text_color%" />
 				<text>30</text>
 				<image resource="medium_button" />
@@ -2443,7 +2445,7 @@
 			</object>
 
 			<object type="button">
-				<placement x="%col4_medium_x%" y="%row6_medium_y%" />
+				<placement x="%col4_medium_x%" y="%row_offset_medium_y%" />
 				<font resource="font" color="%button_text_color%" />
 				<text>45</text>
 				<image resource="medium_button" />
diff --git a/gui/devices/480x854/res/ui.xml b/gui/devices/480x854/res/ui.xml
index 76d193d6..c13ce5c5 100644
--- a/gui/devices/480x854/res/ui.xml
+++ b/gui/devices/480x854/res/ui.xml
@@ -11,7 +11,7 @@
 
 	<resources>
 		<resource name="font" type="font" filename="Roboto-Regular-20" />
-		<resource name="condensedfont" type="font" filename="Roboto-Regular-20" />
+		<resource name="mediumfont" type="font" filename="Roboto-Regular-20" />
 		<resource name="filelist" type="font" filename="Roboto-Regular-20" />
 		<resource name="top_bar" type="image" filename="top-bar.jpg" />
 		<resource name="main_button" type="image" filename="menu-button" />
@@ -42,7 +42,6 @@
 	</resources>
 
 	<variables>
-		<variable name="backgroundcolor" value="#000000FF" />
 		<variable name="col1_x" value="10" />
 		<variable name="col2_x" value="240" />
 		<variable name="col_center_x" value="128" />
@@ -151,6 +150,9 @@
 		<variable name="terminal_console_height" value="424" />
 		<variable name="terminal_text_y" value="444" />
 		<variable name="terminal_button_y" value="434" />
+		<variable name="row_dst_text_y" value="440" />
+		<variable name="row_offset_text_y" value="480" />
+		<variable name="row_offset_medium_y" value="505" />
 	</variables>
 
 	<templates>
@@ -441,7 +443,7 @@
 
 			<object type="button">
 				<placement x="%col1_x%" y="%row1_text_y%" />
-				<font resource="font" color="%text_color%" />
+				<font resource="mediumfont" color="%text_color%" />
 				<conditions>
 					<condition var1="tw_has_dual_storage" var2="1" />
 					<condition var1="tw_use_external_storage" var2="1" />
@@ -453,7 +455,7 @@
 
 			<object type="button">
 				<placement x="%col1_x%" y="%row1_text_y%" />
-				<font resource="font" color="%text_color%" />
+				<font resource="mediumfont" color="%text_color%" />
 				<conditions>
 					<condition var1="tw_has_dual_storage" var2="1" />
 					<condition var1="tw_use_external_storage" var2="0" />
@@ -465,7 +467,7 @@
 
 			<object type="button">
 				<placement x="%col2_x%" y="%row1_text_y%" />
-				<font resource="font" color="%text_color%" />
+				<font resource="mediumfont" color="%text_color%" />
 				<conditions>
 					<condition var1="tw_has_dual_storage" var2="1" />
 					<condition var1="tw_use_external_storage" var2="1" />
@@ -477,7 +479,7 @@
 
 			<object type="button">
 				<placement x="%col2_x%" y="%row1_text_y%" />
-				<font resource="font" color="%text_color%" />
+				<font resource="mediumfont" color="%text_color%" />
 				<conditions>
 					<condition var1="tw_has_dual_storage" var2="1" />
 					<condition var1="tw_use_external_storage" var2="0" />
@@ -547,7 +549,7 @@
 			</object>
 
 			<object type="text" color="%text_color%">
-				<font resource="font" />
+				<font resource="mediumfont" />
 				<placement x="%center_x%" y="%row4_text_y%" placement="5" />
 				<text>%tw_zip_location%</text>
 			</object>
@@ -559,7 +561,7 @@
 			</object>
 
 			<object type="text" color="%text_color%">
-				<font resource="font" />
+				<font resource="mediumfont" />
 				<placement x="%center_x%" y="%row6_text_y%" placement="5" />
 				<text>%tw_file%</text>
 			</object>
@@ -573,7 +575,7 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row8_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Zip file signature verification?</text>
+				<text>Zip file signature verification.</text>
 				<data variable="tw_signed_zip_verify" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
@@ -581,7 +583,7 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row9_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Force MD5 check on all zips?</text>
+				<text>Force MD5 check on all zips.</text>
 				<data variable="tw_force_md5_check" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
@@ -590,14 +592,14 @@
 				<condition var1="tw_has_injecttwrp" var2="1" />
 				<placement x="%col1_x%" y="%row10_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Inject TWRP after install?</text>
+				<text>Inject TWRP after install.</text>
 				<data variable="tw_inject_after_zip" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="text" color="%text_color%">
 				<font resource="font" />
-				<placement x="%center_x%" y="%row12_text_y%" placement="5" />
+				<placement x="%center_x%" y="%row11_text_y%" placement="5" />
 				<text>File %tw_zip_queue_count% of max of 10</text>
 			</object>
 
@@ -665,7 +667,7 @@
 			</object>
 
 			<object type="text" color="%text_color%">
-				<font resource="font" />
+				<font resource="mediumfont" />
 				<placement x="%center_x%" y="%row18_text_y%" placement="5" />
 				<text>%tw_filename%</text>
 			</object>
@@ -787,6 +789,9 @@
 				<action function="set">tw_has_action2=0</action>
 				<action function="set">tw_action2=</action>
 				<action function="set">tw_action2_param=</action>
+				<action function="set">tw_has_cancel=0</action>
+				<action function="set">tw_cancel_action=</action>
+				<action function="set">tw_cancel_param=</action>
 				<action function="page">%tw_clear_destination%</action>
 			</object>
 		</page>
@@ -869,6 +874,15 @@
 
 			<object type="template" name="action_page_console" />
 
+			<object type="button">
+				<condition var1="tw_has_cancel" var2="1" />
+				<placement x="%col_center_medium_x%" y="%row4_y%" />
+				<font resource="font" color="%button_text_color%" />
+				<text>Cancel</text>
+				<image resource="medium_button" />
+				<action function="%tw_cancel_action%">%tw_cancel_param%</action>
+			</object>
+
 			<object type="template" name="progress_bar" />
 
 			<object type="action">
@@ -1092,7 +1106,7 @@
 					<action function="set">tw_has_action2=1</action>
 					<action function="set">tw_action2=set</action>
 					<action function="set">tw_action2_param=tw_zip_location=/sdcard</action>
-					<action function="set">tw_text1=Wipe External Storage (SD card)?</action>
+					<action function="set">tw_text1=Wipe External Storage (SD Card)?</action>
 					<action function="set">tw_action_text1=Wiping External Storage...</action>
 					<action function="set">tw_complete_text1=External Storage Wipe Complete</action>
 					<action function="set">tw_slider_text=Swipe to Wipe</action>
@@ -1287,7 +1301,7 @@
 
 			<object type="checkbox">
 				<condition var1="tw_sp1_name" op=">" var2="" />
-				<placement x="%col1_x%" y="%row10_text_y%" />
+				<placement x="%col1_x%" y="%row9_text_y%" />
 				<font resource="font" color="%text_color%" />
 				<text>%tw_sp1_name% (%tw_backup_sp1_size% MB)</text>
 				<data variable="tw_backup_sp1" />
@@ -1296,7 +1310,7 @@
 
 			<object type="checkbox">
 				<condition var1="tw_sp2_name" op=">" var2="" />
-				<placement x="%col1_x%" y="%row11_text_y%" />
+				<placement x="%col1_x%" y="%row10_text_y%" />
 				<font resource="font" color="%text_color%" />
 				<text>%tw_sp2_name% (%tw_backup_sp2_size% MB)</text>
 				<data variable="tw_backup_sp2" />
@@ -1305,7 +1319,7 @@
 
 			<object type="checkbox">
 				<condition var1="tw_sp3_name" op=">" var2="" />
-				<placement x="%col1_x%" y="%row12_text_y%" />
+				<placement x="%col1_x%" y="%row11_text_y%" />
 				<font resource="font" color="%text_color%" />
 				<text>%tw_sp3_name% (%tw_backup_sp3_size% MB)</text>
 				<data variable="tw_backup_sp3" />
@@ -1314,28 +1328,28 @@
 
 			<object type="text" color="%text_color%">
 				<font resource="font" />
-				<placement x="%col1_x%" y="%row14_text_y%" />
+				<placement x="%col1_x%" y="%row13_text_y%" />
 				<text>Free Space: %tw_storage_free_size% MB</text>
 			</object>
 
 			<object type="checkbox">
-				<placement x="%col1_x%" y="%row15_text_y%" />
+				<placement x="%col1_x%" y="%row14_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Enable Compression (Requires more time)</text>
+				<text>Enable compression.</text>
 				<data variable="tw_use_compression" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="checkbox">
-				<placement x="%col1_x%" y="%row16_text_y%" />
+				<placement x="%col1_x%" y="%row15_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Skip MD5 generation on backups</text>
+				<text>Skip MD5 generation during backup.</text>
 				<data variable="tw_skip_md5_generate" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="button">
-				<placement x="%col1_x%" y="%row17_text_y%" />
+				<placement x="%col1_x%" y="%row16_text_y%" />
 				<font resource="font" color="%text_color%" />
 				<conditions>
 					<condition var1="tw_has_dual_storage" var2="1" />
@@ -1347,7 +1361,7 @@
 			</object>
 
 			<object type="button">
-				<placement x="%col1_x%" y="%row17_text_y%" />
+				<placement x="%col1_x%" y="%row16_text_y%" />
 				<font resource="font" color="%text_color%" />
 				<conditions>
 					<condition var1="tw_has_dual_storage" var2="1" />
@@ -1359,7 +1373,7 @@
 			</object>
 
 			<object type="button">
-				<placement x="%col2_x%" y="%row17_text_y%" />
+				<placement x="%col2_x%" y="%row16_text_y%" />
 				<font resource="font" color="%text_color%" />
 				<conditions>
 					<condition var1="tw_has_dual_storage" var2="1" />
@@ -1371,7 +1385,7 @@
 			</object>
 
 			<object type="button">
-				<placement x="%col2_x%" y="%row17_text_y%" />
+				<placement x="%col2_x%" y="%row16_text_y%" />
 				<font resource="font" color="%text_color%" />
 				<conditions>
 					<condition var1="tw_has_dual_storage" var2="1" />
@@ -1721,7 +1735,7 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row14_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Enable MD5 checking of backup files</text>
+				<text>Enable MD5 verification of backup files.</text>
 				<data variable="tw_skip_md5_check" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
@@ -1920,7 +1934,7 @@
 					<condition var1="tw_has_external" var2="1" />
 					<condition var1="mounted" op="!=" var2="EXTERNAL" />
 				</conditions>
-				<text>Mount SDCard</text>
+				<text>Mount SD Card</text>
 				<image resource="checkbox_false" />
 				<action function="mount">EXTERNAL</action>
 			</object>
@@ -1932,7 +1946,7 @@
 					<condition var1="tw_has_external" var2="1" />
 					<condition var1="mounted" op="=" var2="EXTERNAL" />
 				</conditions>
-				<text>Unmount SDCard</text>
+				<text>Unmount SD Card</text>
 				<image resource="checkbox_true" />
 				<action function="umount">EXTERNAL</action>
 			</object>
@@ -2259,7 +2273,7 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row1_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Zip file signature verification?</text>
+				<text>Zip file signature verification.</text>
 				<data variable="tw_signed_zip_verify" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
@@ -2267,7 +2281,7 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row2_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Force MD5 check on all zips?</text>
+				<text>Force MD5 check on all zips.</text>
 				<data variable="tw_force_md5_check" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
@@ -2275,7 +2289,7 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row3_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Use rm -rf instead of formatting?</text>
+				<text>Use rm -rf instead of formatting.</text>
 				<data variable="tw_rm_rf" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
@@ -2283,7 +2297,7 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row4_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Skip MD5 generation on backups</text>
+				<text>Skip MD5 generation during backup.</text>
 				<data variable="tw_skip_md5_generate" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
@@ -2291,7 +2305,7 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row5_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Enable MD5 checking of backup files</text>
+				<text>Enable MD5 verification of backup files.</text>
 				<data variable="tw_skip_md5_check" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
@@ -2299,7 +2313,7 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row6_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Ignore image size errors during backup</text>
+				<text>Ignore image size errors during backup.</text>
 				<data variable="tw_ignore_image_size" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
@@ -2307,7 +2321,7 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row7_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Simulate most actions for theme testing</text>
+				<text>Simulate actions for theme testing.</text>
 				<data variable="tw_simulate_actions" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
@@ -2316,7 +2330,7 @@
 				<condition var1="tw_simulate_actions" var2="1" />
 				<placement x="%col1_x%" y="%row8_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Simulate failure for actions</text>
+				<text>Simulate failure for actions.</text>
 				<data variable="tw_simulate_fail" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
@@ -2392,7 +2406,7 @@
 			</object>
 
 			<object type="checkbox">
-				<placement x="%col1_x%" y="%row11_text_y%" />
+				<placement x="%col1_x%" y="%row_dst_text_y%" />
 				<font resource="font" color="%text_color%" />
 				<text>Do you use daylight savings time (DST)?</text>
 				<data variable="tw_time_zone_guidst" />
@@ -2401,12 +2415,12 @@
 
 			<object type="text" color="%text_color%">
 				<font resource="font" />
-				<placement x="%center_x%" y="%row12_text_y%" placement="5" />
+				<placement x="%center_x%" y="%row_offset_text_y%" placement="5" />
 				<text>Offset (usually 0): %tw_time_zone_guioffset%</text>
 			</object>
 
 			<object type="button">
-				<placement x="%col1_medium_x%" y="%row6_medium_y%" />
+				<placement x="%col1_medium_x%" y="%row_offset_medium_y%" />
 				<font resource="font" color="%button_text_color%" />
 				<text>None</text>
 				<image resource="medium_button" />
@@ -2414,7 +2428,7 @@
 			</object>
 
 			<object type="button">
-				<placement x="%col2_medium_x%" y="%row6_medium_y%" />
+				<placement x="%col2_medium_x%" y="%row_offset_medium_y%" />
 				<font resource="font" color="%button_text_color%" />
 				<text>15</text>
 				<image resource="medium_button" />
@@ -2422,7 +2436,7 @@
 			</object>
 
 			<object type="button">
-				<placement x="%col3_medium_x%" y="%row6_medium_y%" />
+				<placement x="%col3_medium_x%" y="%row_offset_medium_y%" />
 				<font resource="font" color="%button_text_color%" />
 				<text>30</text>
 				<image resource="medium_button" />
@@ -2430,7 +2444,7 @@
 			</object>
 
 			<object type="button">
-				<placement x="%col4_medium_x%" y="%row6_medium_y%" />
+				<placement x="%col4_medium_x%" y="%row_offset_medium_y%" />
 				<font resource="font" color="%button_text_color%" />
 				<text>45</text>
 				<image resource="medium_button" />
@@ -2532,6 +2546,31 @@
 				<action function="page">terminalfolder</action>
 			</object>
 
+			<object type="button">
+				<placement x="%col2_x%" y="%row3_y%" />
+				<font resource="font" color="%button_text_color%" />
+				<text>Reload Theme</text>
+				<image resource="main_button" />
+				<action function="reload"></action>
+			</object>
+
+			<object type="button">
+				<placement x="%col1_x%" y="%row4_y%" />
+				<font resource="font" color="%button_text_color%" />
+				<text>ADB Sideload</text>
+				<image resource="main_button" />
+				<actions>
+					<action function="set">tw_back=advanced</action>
+					<action function="set">tw_action=adbsideload</action>
+					<action function="set">tw_action_text1=ADB Sideload</action>
+					<action function="set">tw_action_text2=Usage: adb sideload filename.zip</action>
+					<action function="set">tw_complete_text1=ADB Sideload Complete</action>
+					<action function="set">tw_has_cancel=1</action>
+					<action function="set">tw_cancel_action=adbsideloadcancel</action>
+					<action function="page">action_page</action>
+				</actions>
+			</object>
+
 			<object type="button">
 				<condition var1="tw_show_dumlock" var2="1" />
 				<placement x="%col2_x%" y="%row4_y%" />
diff --git a/gui/devices/540x960/res/ui.xml b/gui/devices/540x960/res/ui.xml
index 39876412..43268111 100644
--- a/gui/devices/540x960/res/ui.xml
+++ b/gui/devices/540x960/res/ui.xml
@@ -11,6 +11,7 @@
 
 	<resources>
 		<resource name="font" type="font" filename="Roboto-Regular-20" />
+		<resource name="mediumfont" type="font" filename="Roboto-Regular-20" />
 		<resource name="filelist" type="font" filename="Roboto-Regular-25" />
 		<resource name="top_bar" type="image" filename="top-bar.jpg" />
 		<resource name="main_button" type="image" filename="qhd-menu-button" />
@@ -150,6 +151,9 @@
 		<variable name="terminal_console_height" value="530" />
 		<variable name="terminal_text_y" value="550" />
 		<variable name="terminal_button_y" value="525" />
+		<variable name="row_dst_text_y" value="540" />
+		<variable name="row_offset_text_y" value="580" />
+		<variable name="row_offset_medium_y" value="630" />
 	</variables>
 
 	<templates>
@@ -440,7 +444,7 @@
 
 			<object type="button">
 				<placement x="%col1_x%" y="%row1_text_y%" />
-				<font resource="font" color="%text_color%" />
+				<font resource="mediumfont" color="%text_color%" />
 				<conditions>
 					<condition var1="tw_has_dual_storage" var2="1" />
 					<condition var1="tw_use_external_storage" var2="1" />
@@ -452,7 +456,7 @@
 
 			<object type="button">
 				<placement x="%col1_x%" y="%row1_text_y%" />
-				<font resource="font" color="%text_color%" />
+				<font resource="mediumfont" color="%text_color%" />
 				<conditions>
 					<condition var1="tw_has_dual_storage" var2="1" />
 					<condition var1="tw_use_external_storage" var2="0" />
@@ -464,7 +468,7 @@
 
 			<object type="button">
 				<placement x="%col2_x%" y="%row1_text_y%" />
-				<font resource="font" color="%text_color%" />
+				<font resource="mediumfont" color="%text_color%" />
 				<conditions>
 					<condition var1="tw_has_dual_storage" var2="1" />
 					<condition var1="tw_use_external_storage" var2="1" />
@@ -476,7 +480,7 @@
 
 			<object type="button">
 				<placement x="%col2_x%" y="%row1_text_y%" />
-				<font resource="font" color="%text_color%" />
+				<font resource="mediumfont" color="%text_color%" />
 				<conditions>
 					<condition var1="tw_has_dual_storage" var2="1" />
 					<condition var1="tw_use_external_storage" var2="0" />
@@ -546,7 +550,7 @@
 			</object>
 
 			<object type="text" color="%text_color%">
-				<font resource="font" />
+				<font resource="mediumfont" />
 				<placement x="%center_x%" y="%row4_text_y%" placement="5" />
 				<text>%tw_zip_location%</text>
 			</object>
@@ -558,7 +562,7 @@
 			</object>
 
 			<object type="text" color="%text_color%">
-				<font resource="font" />
+				<font resource="mediumfont" />
 				<placement x="%center_x%" y="%row6_text_y%" placement="5" />
 				<text>%tw_file%</text>
 			</object>
@@ -572,7 +576,7 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row8_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Zip file signature verification?</text>
+				<text>Zip file signature verification.</text>
 				<data variable="tw_signed_zip_verify" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
@@ -580,7 +584,7 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row9_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Force MD5 check on all zips?</text>
+				<text>Force MD5 check on all zips.</text>
 				<data variable="tw_force_md5_check" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
@@ -589,14 +593,14 @@
 				<condition var1="tw_has_injecttwrp" var2="1" />
 				<placement x="%col1_x%" y="%row10_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Inject TWRP after install?</text>
+				<text>Inject TWRP after install.</text>
 				<data variable="tw_inject_after_zip" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="text" color="%text_color%">
 				<font resource="font" />
-				<placement x="%center_x%" y="%row12_text_y%" placement="5" />
+				<placement x="%center_x%" y="%row11_text_y%" placement="5" />
 				<text>File %tw_zip_queue_count% of max of 10</text>
 			</object>
 
@@ -664,7 +668,7 @@
 			</object>
 
 			<object type="text" color="%text_color%">
-				<font resource="font" />
+				<font resource="mediumfont" />
 				<placement x="%center_x%" y="%row18_text_y%" placement="5" />
 				<text>%tw_filename%</text>
 			</object>
@@ -1103,7 +1107,7 @@
 					<action function="set">tw_has_action2=1</action>
 					<action function="set">tw_action2=set</action>
 					<action function="set">tw_action2_param=tw_zip_location=/sdcard</action>
-					<action function="set">tw_text1=Wipe External Storage (SD card)?</action>
+					<action function="set">tw_text1=Wipe External Storage (SD Card)?</action>
 					<action function="set">tw_action_text1=Wiping External Storage...</action>
 					<action function="set">tw_complete_text1=External Storage Wipe Complete</action>
 					<action function="set">tw_slider_text=Swipe to Wipe</action>
@@ -1298,7 +1302,7 @@
 
 			<object type="checkbox">
 				<condition var1="tw_sp1_name" op=">" var2="" />
-				<placement x="%col1_x%" y="%row10_text_y%" />
+				<placement x="%col1_x%" y="%row9_text_y%" />
 				<font resource="font" color="%text_color%" />
 				<text>%tw_sp1_name% (%tw_backup_sp1_size% MB)</text>
 				<data variable="tw_backup_sp1" />
@@ -1307,7 +1311,7 @@
 
 			<object type="checkbox">
 				<condition var1="tw_sp2_name" op=">" var2="" />
-				<placement x="%col1_x%" y="%row11_text_y%" />
+				<placement x="%col1_x%" y="%row10_text_y%" />
 				<font resource="font" color="%text_color%" />
 				<text>%tw_sp2_name% (%tw_backup_sp2_size% MB)</text>
 				<data variable="tw_backup_sp2" />
@@ -1316,7 +1320,7 @@
 
 			<object type="checkbox">
 				<condition var1="tw_sp3_name" op=">" var2="" />
-				<placement x="%col1_x%" y="%row12_text_y%" />
+				<placement x="%col1_x%" y="%row11_text_y%" />
 				<font resource="font" color="%text_color%" />
 				<text>%tw_sp3_name% (%tw_backup_sp3_size% MB)</text>
 				<data variable="tw_backup_sp3" />
@@ -1325,28 +1329,28 @@
 
 			<object type="text" color="%text_color%">
 				<font resource="font" />
-				<placement x="%col1_x%" y="%row14_text_y%" />
+				<placement x="%col1_x%" y="%row13_text_y%" />
 				<text>Free Space: %tw_storage_free_size% MB</text>
 			</object>
 
 			<object type="checkbox">
-				<placement x="%col1_x%" y="%row15_text_y%" />
+				<placement x="%col1_x%" y="%row14_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Enable Compression (Requires more time)</text>
+				<text>Enable compression.</text>
 				<data variable="tw_use_compression" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="checkbox">
-				<placement x="%col1_x%" y="%row16_text_y%" />
+				<placement x="%col1_x%" y="%row15_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Skip MD5 generation on backups</text>
+				<text>Skip MD5 generation during backup.</text>
 				<data variable="tw_skip_md5_generate" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="button">
-				<placement x="%col1_x%" y="%row17_text_y%" />
+				<placement x="%col1_x%" y="%row16_text_y%" />
 				<font resource="font" color="%text_color%" />
 				<conditions>
 					<condition var1="tw_has_dual_storage" var2="1" />
@@ -1358,7 +1362,7 @@
 			</object>
 
 			<object type="button">
-				<placement x="%col1_x%" y="%row17_text_y%" />
+				<placement x="%col1_x%" y="%row16_text_y%" />
 				<font resource="font" color="%text_color%" />
 				<conditions>
 					<condition var1="tw_has_dual_storage" var2="1" />
@@ -1370,7 +1374,7 @@
 			</object>
 
 			<object type="button">
-				<placement x="%col2_x%" y="%row17_text_y%" />
+				<placement x="%col2_x%" y="%row16_text_y%" />
 				<font resource="font" color="%text_color%" />
 				<conditions>
 					<condition var1="tw_has_dual_storage" var2="1" />
@@ -1382,7 +1386,7 @@
 			</object>
 
 			<object type="button">
-				<placement x="%col2_x%" y="%row17_text_y%" />
+				<placement x="%col2_x%" y="%row16_text_y%" />
 				<font resource="font" color="%text_color%" />
 				<conditions>
 					<condition var1="tw_has_dual_storage" var2="1" />
@@ -1732,7 +1736,7 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row14_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Enable MD5 checking of backup files</text>
+				<text>Enable MD5 verification of backup files.</text>
 				<data variable="tw_skip_md5_check" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
@@ -1931,7 +1935,7 @@
 					<condition var1="tw_has_external" var2="1" />
 					<condition var1="mounted" op="!=" var2="EXTERNAL" />
 				</conditions>
-				<text>Mount SDCard</text>
+				<text>Mount SD Card</text>
 				<image resource="checkbox_false" />
 				<action function="mount">EXTERNAL</action>
 			</object>
@@ -1943,7 +1947,7 @@
 					<condition var1="tw_has_external" var2="1" />
 					<condition var1="mounted" op="=" var2="EXTERNAL" />
 				</conditions>
-				<text>Unmount SDCard</text>
+				<text>Unmount SD Card</text>
 				<image resource="checkbox_true" />
 				<action function="umount">EXTERNAL</action>
 			</object>
@@ -2270,7 +2274,7 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row1_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Zip file signature verification?</text>
+				<text>Zip file signature verification.</text>
 				<data variable="tw_signed_zip_verify" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
@@ -2278,7 +2282,7 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row2_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Force MD5 check on all zips?</text>
+				<text>Force MD5 check on all zips.</text>
 				<data variable="tw_force_md5_check" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
@@ -2286,7 +2290,7 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row3_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Use rm -rf instead of formatting?</text>
+				<text>Use rm -rf instead of formatting.</text>
 				<data variable="tw_rm_rf" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
@@ -2294,7 +2298,7 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row4_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Skip MD5 generation on backups</text>
+				<text>Skip MD5 generation during backup.</text>
 				<data variable="tw_skip_md5_generate" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
@@ -2302,7 +2306,7 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row5_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Enable MD5 checking of backup files</text>
+				<text>Enable MD5 verification of backup files.</text>
 				<data variable="tw_skip_md5_check" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
@@ -2310,7 +2314,7 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row6_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Ignore image size errors during backup</text>
+				<text>Ignore image size errors during backup.</text>
 				<data variable="tw_ignore_image_size" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
@@ -2318,7 +2322,7 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row7_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Simulate most actions for theme testing</text>
+				<text>Simulate actions for theme testing.</text>
 				<data variable="tw_simulate_actions" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
@@ -2327,7 +2331,7 @@
 				<condition var1="tw_simulate_actions" var2="1" />
 				<placement x="%col1_x%" y="%row8_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Simulate failure for actions</text>
+				<text>Simulate failure for actions.</text>
 				<data variable="tw_simulate_fail" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
@@ -2403,7 +2407,7 @@
 			</object>
 
 			<object type="checkbox">
-				<placement x="%col1_x%" y="%row11_text_y%" />
+				<placement x="%col1_x%" y="%row_dst_text_y%" />
 				<font resource="font" color="%text_color%" />
 				<text>Do you use daylight savings time (DST)?</text>
 				<data variable="tw_time_zone_guidst" />
@@ -2412,12 +2416,12 @@
 
 			<object type="text" color="%text_color%">
 				<font resource="font" />
-				<placement x="%center_x%" y="%row12_text_y%" placement="5" />
+				<placement x="%center_x%" y="%row_offset_text_y%" placement="5" />
 				<text>Offset (usually 0): %tw_time_zone_guioffset%</text>
 			</object>
 
 			<object type="button">
-				<placement x="%col1_medium_x%" y="%row6_medium_y%" />
+				<placement x="%col1_medium_x%" y="%row_offset_medium_y%" />
 				<font resource="font" color="%button_text_color%" />
 				<text>None</text>
 				<image resource="medium_button" />
@@ -2425,7 +2429,7 @@
 			</object>
 
 			<object type="button">
-				<placement x="%col2_medium_x%" y="%row6_medium_y%" />
+				<placement x="%col2_medium_x%" y="%row_offset_medium_y%" />
 				<font resource="font" color="%button_text_color%" />
 				<text>15</text>
 				<image resource="medium_button" />
@@ -2433,7 +2437,7 @@
 			</object>
 
 			<object type="button">
-				<placement x="%col3_medium_x%" y="%row6_medium_y%" />
+				<placement x="%col3_medium_x%" y="%row_offset_medium_y%" />
 				<font resource="font" color="%button_text_color%" />
 				<text>30</text>
 				<image resource="medium_button" />
@@ -2441,7 +2445,7 @@
 			</object>
 
 			<object type="button">
-				<placement x="%col4_medium_x%" y="%row6_medium_y%" />
+				<placement x="%col4_medium_x%" y="%row_offset_medium_y%" />
 				<font resource="font" color="%button_text_color%" />
 				<text>45</text>
 				<image resource="medium_button" />
diff --git a/gui/devices/720x1280/res/ui.xml b/gui/devices/720x1280/res/ui.xml
index 35e7de61..13a52ba6 100644
--- a/gui/devices/720x1280/res/ui.xml
+++ b/gui/devices/720x1280/res/ui.xml
@@ -11,6 +11,7 @@
 
 	<resources>
 		<resource name="font" type="font" filename="Roboto-Condensed-30" />
+		<resource name="mediumfont" type="font" filename="Roboto-Condensed-30" />
 		<resource name="filelist" type="font" filename="Roboto-Condensed-30" />
 		<resource name="top_bar" type="image" filename="top-bar.jpg" />
 		<resource name="main_button" type="image" filename="menu-button" />
@@ -155,6 +156,9 @@
 		<variable name="terminal_console_height" value="700" />
 		<variable name="terminal_text_y" value="730" />
 		<variable name="terminal_button_y" value="700" />
+		<variable name="row_dst_text_y" value="720" />
+		<variable name="row_offset_text_y" value="770" />
+		<variable name="row_offset_medium_y" value="840" />
 	</variables>
 
 	<templates>
@@ -445,7 +449,7 @@
 
 			<object type="button">
 				<placement x="%col1_x%" y="%row1_text_y%" />
-				<font resource="font" color="%text_color%" />
+				<font resource="mediumfont" color="%text_color%" />
 				<conditions>
 					<condition var1="tw_has_dual_storage" var2="1" />
 					<condition var1="tw_use_external_storage" var2="1" />
@@ -457,7 +461,7 @@
 
 			<object type="button">
 				<placement x="%col1_x%" y="%row1_text_y%" />
-				<font resource="font" color="%text_color%" />
+				<font resource="mediumfont" color="%text_color%" />
 				<conditions>
 					<condition var1="tw_has_dual_storage" var2="1" />
 					<condition var1="tw_use_external_storage" var2="0" />
@@ -469,7 +473,7 @@
 
 			<object type="button">
 				<placement x="%col2_x%" y="%row1_text_y%" />
-				<font resource="font" color="%text_color%" />
+				<font resource="mediumfont" color="%text_color%" />
 				<conditions>
 					<condition var1="tw_has_dual_storage" var2="1" />
 					<condition var1="tw_use_external_storage" var2="1" />
@@ -481,7 +485,7 @@
 
 			<object type="button">
 				<placement x="%col2_x%" y="%row1_text_y%" />
-				<font resource="font" color="%text_color%" />
+				<font resource="mediumfont" color="%text_color%" />
 				<conditions>
 					<condition var1="tw_has_dual_storage" var2="1" />
 					<condition var1="tw_use_external_storage" var2="0" />
@@ -551,7 +555,7 @@
 			</object>
 
 			<object type="text" color="%text_color%">
-				<font resource="font" />
+				<font resource="mediumfont" />
 				<placement x="%center_x%" y="%row4_text_y%" placement="5" />
 				<text>%tw_zip_location%</text>
 			</object>
@@ -563,7 +567,7 @@
 			</object>
 
 			<object type="text" color="%text_color%">
-				<font resource="font" />
+				<font resource="mediumfont" />
 				<placement x="%center_x%" y="%row6_text_y%" placement="5" />
 				<text>%tw_file%</text>
 			</object>
@@ -577,7 +581,7 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row8_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Zip file signature verification?</text>
+				<text>Zip file signature verification.</text>
 				<data variable="tw_signed_zip_verify" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
@@ -585,7 +589,7 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row9_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Force MD5 check on all zips?</text>
+				<text>Force MD5 check on all zips.</text>
 				<data variable="tw_force_md5_check" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
@@ -594,14 +598,14 @@
 				<condition var1="tw_has_injecttwrp" var2="1" />
 				<placement x="%col1_x%" y="%row10_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Inject TWRP after install?</text>
+				<text>Inject TWRP after install.</text>
 				<data variable="tw_inject_after_zip" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="text" color="%text_color%">
 				<font resource="font" />
-				<placement x="%center_x%" y="%row12_text_y%" placement="5" />
+				<placement x="%center_x%" y="%row11_text_y%" placement="5" />
 				<text>File %tw_zip_queue_count% of max of 10</text>
 			</object>
 
@@ -669,7 +673,7 @@
 			</object>
 
 			<object type="text" color="%text_color%">
-				<font resource="font" />
+				<font resource="mediumfont" />
 				<placement x="%center_x%" y="%row18_text_y%" placement="5" />
 				<text>%tw_filename%</text>
 			</object>
@@ -1108,7 +1112,7 @@
 					<action function="set">tw_has_action2=1</action>
 					<action function="set">tw_action2=set</action>
 					<action function="set">tw_action2_param=tw_zip_location=/sdcard</action>
-					<action function="set">tw_text1=Wipe External Storage (SD card)?</action>
+					<action function="set">tw_text1=Wipe External Storage (SD Card)?</action>
 					<action function="set">tw_action_text1=Wiping External Storage...</action>
 					<action function="set">tw_complete_text1=External Storage Wipe Complete</action>
 					<action function="set">tw_slider_text=Swipe to Wipe</action>
@@ -1303,7 +1307,7 @@
 
 			<object type="checkbox">
 				<condition var1="tw_sp1_name" op=">" var2="" />
-				<placement x="%col1_x%" y="%row10_text_y%" />
+				<placement x="%col1_x%" y="%row9_text_y%" />
 				<font resource="font" color="%text_color%" />
 				<text>%tw_sp1_name% (%tw_backup_sp1_size% MB)</text>
 				<data variable="tw_backup_sp1" />
@@ -1312,7 +1316,7 @@
 
 			<object type="checkbox">
 				<condition var1="tw_sp2_name" op=">" var2="" />
-				<placement x="%col1_x%" y="%row11_text_y%" />
+				<placement x="%col1_x%" y="%row10_text_y%" />
 				<font resource="font" color="%text_color%" />
 				<text>%tw_sp2_name% (%tw_backup_sp2_size% MB)</text>
 				<data variable="tw_backup_sp2" />
@@ -1321,7 +1325,7 @@
 
 			<object type="checkbox">
 				<condition var1="tw_sp3_name" op=">" var2="" />
-				<placement x="%col1_x%" y="%row12_text_y%" />
+				<placement x="%col1_x%" y="%row11_text_y%" />
 				<font resource="font" color="%text_color%" />
 				<text>%tw_sp3_name% (%tw_backup_sp3_size% MB)</text>
 				<data variable="tw_backup_sp3" />
@@ -1330,28 +1334,28 @@
 
 			<object type="text" color="%text_color%">
 				<font resource="font" />
-				<placement x="%col1_x%" y="%row14_text_y%" />
+				<placement x="%col1_x%" y="%row13_text_y%" />
 				<text>Free Space: %tw_storage_free_size% MB</text>
 			</object>
 
 			<object type="checkbox">
-				<placement x="%col1_x%" y="%row15_text_y%" />
+				<placement x="%col1_x%" y="%row14_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Enable Compression (Requires more time)</text>
+				<text>Enable compression.</text>
 				<data variable="tw_use_compression" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="checkbox">
-				<placement x="%col1_x%" y="%row16_text_y%" />
+				<placement x="%col1_x%" y="%row15_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Skip MD5 generation on backups</text>
+				<text>Skip MD5 generation during backup.</text>
 				<data variable="tw_skip_md5_generate" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="button">
-				<placement x="%col1_x%" y="%row17_text_y%" />
+				<placement x="%col1_x%" y="%row16_text_y%" />
 				<font resource="font" color="%text_color%" />
 				<conditions>
 					<condition var1="tw_has_dual_storage" var2="1" />
@@ -1363,7 +1367,7 @@
 			</object>
 
 			<object type="button">
-				<placement x="%col1_x%" y="%row17_text_y%" />
+				<placement x="%col1_x%" y="%row16_text_y%" />
 				<font resource="font" color="%text_color%" />
 				<conditions>
 					<condition var1="tw_has_dual_storage" var2="1" />
@@ -1375,7 +1379,7 @@
 			</object>
 
 			<object type="button">
-				<placement x="%col2_x%" y="%row17_text_y%" />
+				<placement x="%col2_x%" y="%row16_text_y%" />
 				<font resource="font" color="%text_color%" />
 				<conditions>
 					<condition var1="tw_has_dual_storage" var2="1" />
@@ -1387,7 +1391,7 @@
 			</object>
 
 			<object type="button">
-				<placement x="%col2_x%" y="%row17_text_y%" />
+				<placement x="%col2_x%" y="%row16_text_y%" />
 				<font resource="font" color="%text_color%" />
 				<conditions>
 					<condition var1="tw_has_dual_storage" var2="1" />
@@ -1737,7 +1741,7 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row14_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Enable MD5 checking of backup files</text>
+				<text>Enable MD5 verification of backup files.</text>
 				<data variable="tw_skip_md5_check" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
@@ -1936,7 +1940,7 @@
 					<condition var1="tw_has_external" var2="1" />
 					<condition var1="mounted" op="!=" var2="EXTERNAL" />
 				</conditions>
-				<text>Mount SDCard</text>
+				<text>Mount SD Card</text>
 				<image resource="checkbox_false" />
 				<action function="mount">EXTERNAL</action>
 			</object>
@@ -1948,7 +1952,7 @@
 					<condition var1="tw_has_external" var2="1" />
 					<condition var1="mounted" op="=" var2="EXTERNAL" />
 				</conditions>
-				<text>Unmount SDCard</text>
+				<text>Unmount SD Card</text>
 				<image resource="checkbox_true" />
 				<action function="umount">EXTERNAL</action>
 			</object>
@@ -2275,7 +2279,7 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row1_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Zip file signature verification?</text>
+				<text>Zip file signature verification.</text>
 				<data variable="tw_signed_zip_verify" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
@@ -2283,7 +2287,7 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row2_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Force MD5 check on all zips?</text>
+				<text>Force MD5 check on all zips.</text>
 				<data variable="tw_force_md5_check" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
@@ -2291,7 +2295,7 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row3_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Use rm -rf instead of formatting?</text>
+				<text>Use rm -rf instead of formatting.</text>
 				<data variable="tw_rm_rf" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
@@ -2299,7 +2303,7 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row4_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Skip MD5 generation on backups</text>
+				<text>Skip MD5 generation during backup.</text>
 				<data variable="tw_skip_md5_generate" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
@@ -2307,7 +2311,7 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row5_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Enable MD5 checking of backup files</text>
+				<text>Enable MD5 verification of backup files.</text>
 				<data variable="tw_skip_md5_check" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
@@ -2315,7 +2319,7 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row6_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Ignore image size errors during backup</text>
+				<text>Ignore image size errors during backup.</text>
 				<data variable="tw_ignore_image_size" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
@@ -2323,7 +2327,7 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row7_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Simulate most actions for theme testing</text>
+				<text>Simulate actions for theme testing.</text>
 				<data variable="tw_simulate_actions" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
@@ -2332,7 +2336,7 @@
 				<condition var1="tw_simulate_actions" var2="1" />
 				<placement x="%col1_x%" y="%row8_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Simulate failure for actions</text>
+				<text>Simulate failure for actions.</text>
 				<data variable="tw_simulate_fail" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
@@ -2408,7 +2412,7 @@
 			</object>
 
 			<object type="checkbox">
-				<placement x="%col1_x%" y="%row11_text_y%" />
+				<placement x="%col1_x%" y="%row_dst_text_y%" />
 				<font resource="font" color="%text_color%" />
 				<text>Do you use daylight savings time (DST)?</text>
 				<data variable="tw_time_zone_guidst" />
@@ -2417,12 +2421,12 @@
 
 			<object type="text" color="%text_color%">
 				<font resource="font" />
-				<placement x="%center_x%" y="%row12_text_y%" placement="5" />
+				<placement x="%center_x%" y="%row_offset_text_y%" placement="5" />
 				<text>Offset (usually 0): %tw_time_zone_guioffset%</text>
 			</object>
 
 			<object type="button">
-				<placement x="%col1_medium_x%" y="%row6_medium_y%" />
+				<placement x="%col1_medium_x%" y="%row_offset_medium_y%" />
 				<font resource="font" color="%button_text_color%" />
 				<text>None</text>
 				<image resource="medium_button" />
@@ -2430,7 +2434,7 @@
 			</object>
 
 			<object type="button">
-				<placement x="%col2_medium_x%" y="%row6_medium_y%" />
+				<placement x="%col2_medium_x%" y="%row_offset_medium_y%" />
 				<font resource="font" color="%button_text_color%" />
 				<text>15</text>
 				<image resource="medium_button" />
@@ -2438,7 +2442,7 @@
 			</object>
 
 			<object type="button">
-				<placement x="%col3_medium_x%" y="%row6_medium_y%" />
+				<placement x="%col3_medium_x%" y="%row_offset_medium_y%" />
 				<font resource="font" color="%button_text_color%" />
 				<text>30</text>
 				<image resource="medium_button" />
@@ -2446,7 +2450,7 @@
 			</object>
 
 			<object type="button">
-				<placement x="%col4_medium_x%" y="%row6_medium_y%" />
+				<placement x="%col4_medium_x%" y="%row_offset_medium_y%" />
 				<font resource="font" color="%button_text_color%" />
 				<text>45</text>
 				<image resource="medium_button" />
diff --git a/gui/devices/800x1280/res/ui.xml b/gui/devices/800x1280/res/ui.xml
index a131e896..552a12c0 100755
--- a/gui/devices/800x1280/res/ui.xml
+++ b/gui/devices/800x1280/res/ui.xml
@@ -11,6 +11,7 @@
 
 	<resources>
 		<resource name="font" type="font" filename="Roboto-Condensed-30" />
+		<resource name="mediumfont" type="font" filename="Roboto-Condensed-30" />
 		<resource name="filelist" type="font" filename="Roboto-Condensed-30" />
 		<resource name="top_bar" type="image" filename="top-bar.jpg" />
 		<resource name="main_button" type="image" filename="menu-button" />
@@ -42,18 +43,14 @@
 
 	<variables>
 		<variable name="col1_x" value="25" />
-		<variable name="col2_x" value="398" />
-		<variable name="col3_x" value="400" />
+		<variable name="col2_x" value="425" />
 		<variable name="col_center_x" value="213" />
+		<variable name="col_center_medium_x" value="306" />
 		<variable name="center_x" value="400" />
 		<variable name="row1_y" value="185" />
 		<variable name="row2_y" value="425" />
 		<variable name="row3_y" value="665" />
 		<variable name="row4_y" value="905" />
-		<variable name="col1_center_x" value="179" />
-		<variable name="col2_center_x" value="552" />
-		<variable name="row1_text2_y" value="310" />
-		<variable name="row2_text2_y" value="550" />
 		<variable name="row_queue_y" value="710" />
 		<variable name="row1_header_y" value="131" />
 		<variable name="row1_text_y" value="170" />
@@ -77,13 +74,13 @@
 		<variable name="zip_status_y" value="640" />
 		<variable name="tz_selected_y" value="160" />
 		<variable name="tz_set_y" value="955" />
-		<variable name="tz_current_y" value="1205" />
+		<variable name="tz_current_y" value="1185" />
 		<variable name="col_progressbar_x" value="264" />
 		<variable name="row_progressbar_y" value="1100" />
-		<variable name="col1_medium_x" value="30" />
-		<variable name="col2_medium_x" value="205" />
-		<variable name="col3_medium_x" value="385" />
-		<variable name="col4_medium_x" value="560" />
+		<variable name="col1_medium_x" value="10" />
+		<variable name="col2_medium_x" value="208" />
+		<variable name="col3_medium_x" value="406" />
+		<variable name="col4_medium_x" value="604" />
 		<variable name="row1_medium_y" value="130" />
 		<variable name="row2_medium_y" value="230" />
 		<variable name="row3_medium_y" value="330" />
@@ -93,7 +90,7 @@
 		<variable name="row7_medium_y" value="730" />
 		<variable name="slider_x" value="98" />
 		<variable name="slider_y" value="1030" />
-		<variable name="slider_text_y" value="1073" />
+		<variable name="slider_text_y" value="1096" />
 		<variable name="button_text_color" value="#AAAAAA" />
 		<variable name="text_color" value="#FFFFFF" />
 		<variable name="text_success_color" value="#33B5E5" />
@@ -140,11 +137,11 @@
 		<variable name="listbox_background" value="#303030" />
 		<variable name="listbox_spacing" value="16" />
 		<variable name="sd_plus_x" value="350" />
-		<variable name="sdext_text_x" value="110" />
-		<variable name="sdext_text_y" value="180" />
+		<variable name="sdext_text_x" value="115" />
+		<variable name="sdext_text_y" value="190" />
 		<variable name="sdswap_button_y" value="260" />
-		<variable name="sdswap_text_x" value="110" />
-		<variable name="sdswap_text_y" value="270" />
+		<variable name="sdswap_text_x" value="115" />
+		<variable name="sdswap_text_y" value="265" />
 		<variable name="sdfilesystem_text_y" value="340" />
 		<variable name="sdfilesystem_button_y" value="380" />
 		<variable name="lock_x" value="200" />
@@ -154,7 +151,10 @@
 		<variable name="backup_name_y" value="550" />
 		<variable name="terminal_console_height" value="600" />
 		<variable name="terminal_text_y" value="650" />
-		<variable name="terminal_button_y" value="700" />
+		<variable name="terminal_button_y" value="620" />
+		<variable name="row_dst_text_y" value="720" />
+		<variable name="row_offset_text_y" value="800" />
+		<variable name="row_offset_medium_y" value="840" />
 	</variables>
 
 	<templates>
@@ -414,6 +414,7 @@
 				<action function="page">settings</action>
 			</object>
 
+
 			<object type="button">
 				<placement x="%col1_x%" y="%row4_y%" />
 				<font resource="font" color="%button_text_color%" />
@@ -444,7 +445,7 @@
 
 			<object type="button">
 				<placement x="%col1_x%" y="%row1_text_y%" />
-				<font resource="font" color="%text_color%" />
+				<font resource="mediumfont" color="%text_color%" />
 				<conditions>
 					<condition var1="tw_has_dual_storage" var2="1" />
 					<condition var1="tw_use_external_storage" var2="1" />
@@ -456,7 +457,7 @@
 
 			<object type="button">
 				<placement x="%col1_x%" y="%row1_text_y%" />
-				<font resource="font" color="%text_color%" />
+				<font resource="mediumfont" color="%text_color%" />
 				<conditions>
 					<condition var1="tw_has_dual_storage" var2="1" />
 					<condition var1="tw_use_external_storage" var2="0" />
@@ -468,7 +469,7 @@
 
 			<object type="button">
 				<placement x="%col2_x%" y="%row1_text_y%" />
-				<font resource="font" color="%text_color%" />
+				<font resource="mediumfont" color="%text_color%" />
 				<conditions>
 					<condition var1="tw_has_dual_storage" var2="1" />
 					<condition var1="tw_use_external_storage" var2="1" />
@@ -477,9 +478,10 @@
 				<image resource="radio_false" />
 				<action function="togglestorage">internal</action>
 			</object>
+
 			<object type="button">
 				<placement x="%col2_x%" y="%row1_text_y%" />
-				<font resource="font" color="%text_color%" />
+				<font resource="mediumfont" color="%text_color%" />
 				<conditions>
 					<condition var1="tw_has_dual_storage" var2="1" />
 					<condition var1="tw_use_external_storage" var2="0" />
@@ -488,7 +490,7 @@
 				<image resource="radio_true" />
 				<action function="togglestorage">internal</action>
 			</object>
-						
+
 			<object type="fileselector">
 				<placement x="%fileselector_x%" y="%row2_text_y%" w="%fileselector_width%" h="%fileselector_install_height%" />
 				<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
@@ -549,7 +551,7 @@
 			</object>
 
 			<object type="text" color="%text_color%">
-				<font resource="font" />
+				<font resource="mediumfont" />
 				<placement x="%center_x%" y="%row4_text_y%" placement="5" />
 				<text>%tw_zip_location%</text>
 			</object>
@@ -561,7 +563,7 @@
 			</object>
 
 			<object type="text" color="%text_color%">
-				<font resource="font" />
+				<font resource="mediumfont" />
 				<placement x="%center_x%" y="%row6_text_y%" placement="5" />
 				<text>%tw_file%</text>
 			</object>
@@ -575,7 +577,7 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row8_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Zip file signature verification?</text>
+				<text>Zip file signature verification.</text>
 				<data variable="tw_signed_zip_verify" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
@@ -583,7 +585,7 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row9_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Force MD5 check on all zips?</text>
+				<text>Force MD5 check on all zips.</text>
 				<data variable="tw_force_md5_check" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
@@ -592,7 +594,7 @@
 				<condition var1="tw_has_injecttwrp" var2="1" />
 				<placement x="%col1_x%" y="%row10_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Inject TWRP after install?</text>
+				<text>Inject TWRP after install.</text>
 				<data variable="tw_inject_after_zip" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
@@ -611,7 +613,7 @@
 
 			<object type="text" color="%text_color%">
 				<font resource="font" />
-				<placement x="%center_x%" y="%slider_text_y%" placement="5" />
+				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
 				<text>Swipe to Confirm Flash</text>
 			</object>
 
@@ -667,7 +669,7 @@
 			</object>
 
 			<object type="text" color="%text_color%">
-				<font resource="font" />
+				<font resource="mediumfont" />
 				<placement x="%center_x%" y="%row18_text_y%" placement="5" />
 				<text>%tw_filename%</text>
 			</object>
@@ -789,6 +791,9 @@
 				<action function="set">tw_has_action2=0</action>
 				<action function="set">tw_action2=</action>
 				<action function="set">tw_action2_param=</action>
+				<action function="set">tw_has_cancel=0</action>
+				<action function="set">tw_cancel_action=</action>
+				<action function="set">tw_cancel_param=</action>
 				<action function="page">%tw_clear_destination%</action>
 			</object>
 		</page>
@@ -834,7 +839,7 @@
 
 			<object type="text" color="%text_color%">
 				<font resource="font" />
-				<placement x="%center_x%" y="%slider_text_y%" placement="5" />
+				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
 				<text>%tw_slider_text%</text>
 			</object>
 
@@ -871,69 +876,15 @@
 
 			<object type="template" name="action_page_console" />
 
-			<object type="template" name="progress_bar" />
-
-			<object type="action">
-				<conditions>
-					<condition var1="tw_operation_state" var2="1" />
-					<condition var1="tw_operation_status" var2="0" />
-				</conditions>
-				<actions>
-					<action function="page">action_complete</action>
-				</actions>
-			</object>
-
-			<object type="action">
-				<conditions>
-					<condition var1="tw_operation_state" var2="1" />
-					<condition var1="tw_operation_status" op="!=" var2="0" />
-				</conditions>
-				<actions>
-					<action function="page">action_complete</action>
-				</actions>
-			</object>
-
-			<object type="action">
-				<condition var1="tw_has_action2" var2="0" />
-				<actions>
-					<action function="%tw_action%">%tw_action_param%</action>
-				</actions>
-			</object>
-
-			<object type="action">
-				<condition var1="tw_has_action2" var2="1" />
-				<actions>
-					<action function="%tw_action%">%tw_action_param%</action>
-					<action function="%tw_action2%">%tw_action2_param%</action>
-				</actions>
-			</object>
-		</page>
-
-		<page name="action_page_cancel">
-			<object type="template" name="header" />
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
-				<text>%tw_action_text1%</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="%center_x%" y="%row2_text_y%" placement="5" />
-				<text>%tw_action_text2%</text>
-			</object>
-
 			<object type="button">
-				<placement x="%col_center_x%" y="%row4_y%" />
+				<condition var1="tw_has_cancel" var2="1" />
+				<placement x="%col_center_medium_x%" y="%row4_y%" />
 				<font resource="font" color="%button_text_color%" />
 				<text>Cancel</text>
-				<image resource="main_button" />
-				<action function="%tw_cancel_function%"></action>
+				<image resource="medium_button" />
+				<action function="%tw_cancel_action%">%tw_cancel_param%</action>
 			</object>
 
-			<object type="template" name="action_page_console" />
-
 			<object type="template" name="progress_bar" />
 
 			<object type="action">
@@ -1157,7 +1108,7 @@
 					<action function="set">tw_has_action2=1</action>
 					<action function="set">tw_action2=set</action>
 					<action function="set">tw_action2_param=tw_zip_location=/sdcard</action>
-					<action function="set">tw_text1=Wipe External Storage (SD card)?</action>
+					<action function="set">tw_text1=Wipe External Storage (SD Card)?</action>
 					<action function="set">tw_action_text1=Wiping External Storage...</action>
 					<action function="set">tw_complete_text1=External Storage Wipe Complete</action>
 					<action function="set">tw_slider_text=Swipe to Wipe</action>
@@ -1245,27 +1196,27 @@
 		<page name="backup">
 			<object type="template" name="header" />
 
-                        <object type="text" color="%text_color%">
-                                <font resource="font" />
-                                <placement x="%center_x%" y="%row1_header_y%" placement="5" />
-                                <text>Backup Name: %tw_backup_name%</text>
-                        </object>
+			<object type="text" color="%text_color%">
+				<font resource="font" />
+				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
+				<text>Backup Name: %tw_backup_name%</text>
+			</object>
 
-                        <object type="text" color="%text_color%">
-                                <placement x="%col1_x%" y="%row1_text_y%" />
-                                <font resource="font" />
-                                <text>Backup Device</text>
-                        </object>
+			<object type="text" color="%text_color%">
+				<placement x="%col1_x%" y="%row1_text_y%" />
+				<font resource="font" />
+				<text>Backup Device</text>
+			</object>
 
-                        <object type="slider">
-                                <placement x="%slider_x%" y="slider_y" />
-                                <resource base="slider" used="slider-used" touch="slider-touch" />
-                                <action function="page">backup_run</action>
-                        </object>
+			<object type="slider">
+				<placement x="%slider_x%" y="slider_y" />
+				<resource base="slider" used="slider-used" touch="slider-touch" />
+				<action function="page">backup_run</action>
+			</object>
 
 			<object type="text" color="%text_color%">
 				<font resource="font" />
-				<placement x="%center_x%" y="slider_text_y" placement="5" />
+				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
 				<text>Swipe to Back Up</text>
 			</object>
 
@@ -1352,7 +1303,7 @@
 
 			<object type="checkbox">
 				<condition var1="tw_sp1_name" op=">" var2="" />
-				<placement x="%col1_x%" y="%row10_text_y%" />
+				<placement x="%col1_x%" y="%row9_text_y%" />
 				<font resource="font" color="%text_color%" />
 				<text>%tw_sp1_name% (%tw_backup_sp1_size% MB)</text>
 				<data variable="tw_backup_sp1" />
@@ -1361,7 +1312,7 @@
 
 			<object type="checkbox">
 				<condition var1="tw_sp2_name" op=">" var2="" />
-				<placement x="%col1_x%" y="%row11_text_y%" />
+				<placement x="%col1_x%" y="%row10_text_y%" />
 				<font resource="font" color="%text_color%" />
 				<text>%tw_sp2_name% (%tw_backup_sp2_size% MB)</text>
 				<data variable="tw_backup_sp2" />
@@ -1370,7 +1321,7 @@
 
 			<object type="checkbox">
 				<condition var1="tw_sp3_name" op=">" var2="" />
-				<placement x="%col1_x%" y="%row12_text_y%" />
+				<placement x="%col1_x%" y="%row11_text_y%" />
 				<font resource="font" color="%text_color%" />
 				<text>%tw_sp3_name% (%tw_backup_sp3_size% MB)</text>
 				<data variable="tw_backup_sp3" />
@@ -1379,28 +1330,28 @@
 
 			<object type="text" color="%text_color%">
 				<font resource="font" />
-				<placement x="%col1_x%" y="%row14_text_y%" />
+				<placement x="%col1_x%" y="%row13_text_y%" />
 				<text>Free Space: %tw_storage_free_size% MB</text>
 			</object>
 
 			<object type="checkbox">
-				<placement x="%col1_x%" y="%row15_text_y%" />
+				<placement x="%col1_x%" y="%row14_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Enable Compression (Requires more time)</text>
+				<text>Enable compression.</text>
 				<data variable="tw_use_compression" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="checkbox">
-				<placement x="%col1_x%" y="%row16_text_y%" />
+				<placement x="%col1_x%" y="%row15_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Skip MD5 generation on backups</text>
+				<text>Skip MD5 generation during backup.</text>
 				<data variable="tw_skip_md5_generate" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="button">
-				<placement x="%col1_x%" y="%row17_text_y%" />
+				<placement x="%col1_x%" y="%row16_text_y%" />
 				<font resource="font" color="%text_color%" />
 				<conditions>
 					<condition var1="tw_has_dual_storage" var2="1" />
@@ -1412,7 +1363,7 @@
 			</object>
 
 			<object type="button">
-				<placement x="%col1_x%" y="%row17_text_y%" />
+				<placement x="%col1_x%" y="%row16_text_y%" />
 				<font resource="font" color="%text_color%" />
 				<conditions>
 					<condition var1="tw_has_dual_storage" var2="1" />
@@ -1424,7 +1375,7 @@
 			</object>
 
 			<object type="button">
-				<placement x="%col2_x%" y="%row17_text_y%" />
+				<placement x="%col2_x%" y="%row16_text_y%" />
 				<font resource="font" color="%text_color%" />
 				<conditions>
 					<condition var1="tw_has_dual_storage" var2="1" />
@@ -1436,7 +1387,7 @@
 			</object>
 
 			<object type="button">
-				<placement x="%col2_x%" y="%row17_text_y%" />
+				<placement x="%col2_x%" y="%row16_text_y%" />
 				<font resource="font" color="%text_color%" />
 				<conditions>
 					<condition var1="tw_has_dual_storage" var2="1" />
@@ -1503,34 +1454,34 @@
 				<text>A backup with that name already exists!</text>
 			</object>
 
-                        <object type="button">
-                                <placement x="%col_center_x%" y="%row2_y%" />
-                                <font resource="font" color="%button_text_color%" />
-                                <text>Cancel</text>
-                                <image resource="main_button" />
-                                <actions>
-                                        <action function="set">tw_backup_name=(Current Date)</action>
-                                        <action function="page">backup</action>
-                                </actions>
-                        </object>
+			<object type="button">
+				<placement x="%col_center_x%" y="%row2_y%" />
+				<font resource="font" color="%button_text_color%" />
+				<text>Cancel</text>
+				<image resource="main_button" />
+				<actions>
+					<action function="set">tw_backup_name=(Current Date)</action>
+					<action function="page">backup</action>
+				</actions>
+			</object>
 
 			<object type="template" name="keyboardtemplate" />
 
-                        <object type="action">
-                                <touch key="home" />
-                                <actions>
-                                        <action function="set">tw_backup_name=(Current Date)</action>
-                                        <action function="page">main</action>
-                                </actions>
-                        </object>
+			<object type="action">
+				<touch key="home" />
+				<actions>
+					<action function="set">tw_backup_name=(Current Date)</action>
+					<action function="page">main</action>
+				</actions>
+			</object>
 
-                        <object type="action">
-                                <touch key="back" />
-                                <actions>
-                                        <action function="set">tw_backup_name=(Current Date)</action>
-                                        <action function="page">backup</action>
-                                </actions>
-                        </object>
+			<object type="action">
+				<touch key="back" />
+				<actions>
+					<action function="set">tw_backup_name=(Current Date)</action>
+					<action function="page">backup</action>
+				</actions>
+			</object>
 
 			<object type="template" name="footer" />
 		</page>
@@ -1600,6 +1551,7 @@
 				<image resource="radio_false" />
 				<action function="togglestorage">internal</action>
 			</object>
+
 			<object type="button">
 				<placement x="%col2_x%" y="%row1_header_y%" />
 				<font resource="font" color="%text_color%" />
@@ -1688,6 +1640,7 @@
 					<action function="page">confirm_action</action>
 				</actions>
 			</object>
+
 			<object type="slider">
 				<placement x="%slider_x%" y="%slider_y%" />
 				<resource base="slider" used="slider-used" touch="slider-touch" />
@@ -1696,7 +1649,7 @@
 
 			<object type="text" color="%text_color%">
 				<font resource="font" />
-				<placement x="%center_x%" y="%slider_text_y%" placement="5" />
+				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
 				<text>Swipe to Restore</text>
 			</object>
 
@@ -1727,15 +1680,6 @@
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
-									<object type="checkbox">
-				<placement x="%col1_x%" y="%row5_text_y%" />
-				<font resource="font" color="%text_color%" />
-				<text>Recovery</text>
-				<condition var1="tw_restore_recovery" op=">=" var2="0" />
-				<data variable="tw_restore_recovery" />
-				<image checked="checkbox_true" unchecked="checkbox_false" />
-			</object>
-
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row6_text_y%" />
 				<font resource="font" color="%text_color%" />
@@ -1793,16 +1737,16 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row14_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Enable MD5 checking of backup files</text>
+				<text>Enable MD5 verification of backup files.</text>
 				<data variable="tw_skip_md5_check" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
-                        <object type="text" color="%text_color%">
-                                <font resource="font" />
-                                <placement x="%center_x%" y="%row15_text_y%" placement="5" />
-                                <text>Package Date: %tw_restore_file_date%</text>
-                        </object>
+			<object type="text" color="%text_color%">
+				<font resource="font" />
+				<placement x="%center_x%" y="%row15_text_y%" placement="5" />
+				<text>Package Date: %tw_restore_file_date%</text>
+			</object>
 
 			<object type="action">
 				<touch key="home" />
@@ -1992,7 +1936,7 @@
 					<condition var1="tw_has_external" var2="1" />
 					<condition var1="mounted" op="!=" var2="EXTERNAL" />
 				</conditions>
-				<text>Mount SDCard</text>
+				<text>Mount SD Card</text>
 				<image resource="checkbox_false" />
 				<action function="mount">EXTERNAL</action>
 			</object>
@@ -2004,7 +1948,7 @@
 					<condition var1="tw_has_external" var2="1" />
 					<condition var1="mounted" op="=" var2="EXTERNAL" />
 				</conditions>
-				<text>Unmount SDCard</text>
+				<text>Unmount SD Card</text>
 				<image resource="checkbox_true" />
 				<action function="umount">EXTERNAL</action>
 			</object>
@@ -2073,6 +2017,7 @@
 					<condition var1="tw_boot_is_mountable" var2="1" />
 					<condition var1="mounted" op="=" var2="/boot" />
 				</conditions>
+
 				<placement x="%col1_x%" y="%row6_text_y%" />
 				<font resource="font" color="#A0A0A0" />
 				<text>Unmount Boot</text>
@@ -2105,7 +2050,7 @@
 			</object>
 
 			<object type="button">
-				<placement x="%col3_x%" y="%row8_text_y%" />
+				<placement x="%col2_x%" y="%row8_text_y%" />
 				<font resource="font" color="%text_color%" />
 				<conditions>
 					<condition var1="tw_has_dual_storage" var2="1" />
@@ -2117,7 +2062,7 @@
 			</object>
 
 			<object type="button">
-				<placement x="%col3_x%" y="%row8_text_y%" />
+				<placement x="%col2_x%" y="%row8_text_y%" />
 				<font resource="font" color="%text_color%" />
 				<conditions>
 					<condition var1="tw_has_dual_storage" var2="1" />
@@ -2204,7 +2149,7 @@
 				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
 				<text>Reboot Menu</text>
 			</object>
-			
+
 			<object type="button">
 				<condition var1="tw_reboot_system" var2="1" />
 				<placement x="%col1_x%" y="%row1_y%" />
@@ -2287,7 +2232,7 @@
 
 			<object type="button">
 				<condition var1="tw_download_mode" var2="1" />
-				<placement x="%col2_x%" y="%row2_y%" />
+				<placement x="%col1_x%" y="%row3_y%" />
 				<font resource="font" color="%button_text_color%" />
 				<text>Download</text>
 				<image resource="main_button" />
@@ -2327,67 +2272,67 @@
 				<text>Settings</text>
 			</object>
 
+			<object type="checkbox">
+				<placement x="%col1_x%" y="%row1_text_y%" />
+				<font resource="font" color="%text_color%" />
+				<text>Zip file signature verification.</text>
+				<data variable="tw_signed_zip_verify" />
+				<image checked="checkbox_true" unchecked="checkbox_false" />
+			</object>
+
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row2_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Zip file signature verification?</text>
-				<data variable="tw_signed_zip_verify" />
+				<text>Force MD5 check on all zips.</text>
+				<data variable="tw_force_md5_check" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row3_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Force MD5 check on all zips?</text>
-				<data variable="tw_force_md5_check" />
+				<text>Use rm -rf instead of formatting.</text>
+				<data variable="tw_rm_rf" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row4_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Use rm -rf instead of formatting?</text>
-				<data variable="tw_rm_rf" />
+				<text>Skip MD5 generation during backup.</text>
+				<data variable="tw_skip_md5_generate" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row5_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Skip MD5 generation on backups</text>
-				<data variable="tw_skip_md5_generate" />
+				<text>Enable MD5 verification of backup files.</text>
+				<data variable="tw_skip_md5_check" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row6_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Enable MD5 checking of backup files</text>
-				<data variable="tw_skip_md5_check" />
+				<text>Ignore image size errors during backup.</text>
+				<data variable="tw_ignore_image_size" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row7_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Ignore image size errors during backup</text>
-				<data variable="tw_ignore_image_size" />
-				<image checked="checkbox_true" unchecked="checkbox_false" />
-			</object>
-
-			<object type="checkbox">
-				<placement x="%col1_x%" y="%row8_text_y%" />
-				<font resource="font" color="%text_color%" />
-				<text>Simulate most actions for theme testing</text>
+				<text>Simulate actions for theme testing.</text>
 				<data variable="tw_simulate_actions" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="checkbox">
 				<condition var1="tw_simulate_actions" var2="1" />
-				<placement x="%col1_x%" y="%row9_text_y%" />
+				<placement x="%col1_x%" y="%row8_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Simulate failure for actions</text>
+				<text>Simulate failure for actions.</text>
 				<data variable="tw_simulate_fail" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
@@ -2463,7 +2408,7 @@
 			</object>
 
 			<object type="checkbox">
-				<placement x="%col1_x%" y="%row12_text_y%" />
+				<placement x="%col1_x%" y="%row_dst_text_y%" />
 				<font resource="font" color="%text_color%" />
 				<text>Do you use daylight savings time (DST)?</text>
 				<data variable="tw_time_zone_guidst" />
@@ -2472,12 +2417,12 @@
 
 			<object type="text" color="%text_color%">
 				<font resource="font" />
-				<placement x="%center_x%" y="%row14_text_y%" placement="5" />
+				<placement x="%center_x%" y="%row_offset_text_y%" placement="5" />
 				<text>Offset (usually 0): %tw_time_zone_guioffset%</text>
 			</object>
 
 			<object type="button">
-				<placement x="%col1_medium_x%" y="%row6_medium_y%" />
+				<placement x="%col1_medium_x%" y="%row_offset_medium_y%" />
 				<font resource="font" color="%button_text_color%" />
 				<text>None</text>
 				<image resource="medium_button" />
@@ -2485,7 +2430,7 @@
 			</object>
 
 			<object type="button">
-				<placement x="%col2_medium_x%" y="%row6_medium_y%" />
+				<placement x="%col2_medium_x%" y="%row_offset_medium_y%" />
 				<font resource="font" color="%button_text_color%" />
 				<text>15</text>
 				<image resource="medium_button" />
@@ -2493,7 +2438,7 @@
 			</object>
 
 			<object type="button">
-				<placement x="%col3_medium_x%" y="%row6_medium_y%" />
+				<placement x="%col3_medium_x%" y="%row_offset_medium_y%" />
 				<font resource="font" color="%button_text_color%" />
 				<text>30</text>
 				<image resource="medium_button" />
@@ -2501,7 +2446,7 @@
 			</object>
 
 			<object type="button">
-				<placement x="%col4_medium_x%" y="%row6_medium_y%" />
+				<placement x="%col4_medium_x%" y="%row_offset_medium_y%" />
 				<font resource="font" color="%button_text_color%" />
 				<text>45</text>
 				<image resource="medium_button" />
@@ -2603,6 +2548,14 @@
 				<action function="page">terminalfolder</action>
 			</object>
 
+			<object type="button">
+				<placement x="%col2_x%" y="%row3_y%" />
+				<font resource="font" color="%button_text_color%" />
+				<text>Reload Theme</text>
+				<image resource="main_button" />
+				<action function="reload"></action>
+			</object>
+
 			<object type="button">
 				<placement x="%col1_x%" y="%row4_y%" />
 				<font resource="font" color="%button_text_color%" />
@@ -2614,8 +2567,9 @@
 					<action function="set">tw_action_text1=ADB Sideload</action>
 					<action function="set">tw_action_text2=Usage: adb sideload filename.zip</action>
 					<action function="set">tw_complete_text1=ADB Sideload Complete</action>
-					<action function="set">tw_cancel_function=adbsideloadcancel</action>
-					<action function="page">action_page_cancel</action>
+					<action function="set">tw_has_cancel=1</action>
+					<action function="set">tw_cancel_action=adbsideloadcancel</action>
+					<action function="page">action_page</action>
 				</actions>
 			</object>
 
@@ -2645,14 +2599,6 @@
 				</actions>
 			</object>
 
-			<object type="button">
-				<placement x="%col2_x%" y="%row3_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Reload Theme</text>
-				<image resource="main_button" />
-				<action function="reload"></action>
-			</object>
-
 			<object type="action">
 				<touch key="home" />
 				<action function="page">main</action>
@@ -2773,7 +2719,7 @@
 
 			<object type="text" color="%text_color%">
 				<font resource="font" />
-				<placement x="%center_x%" y="%slider_text_y%" placement="5" />
+				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
 				<text>Swipe to Partition</text>
 			</object>
 
@@ -2788,7 +2734,6 @@
 			</object>
 
 			<object type="template" name="footer" />
-
 		</page>
 
 		<page name="htcdumlock">
@@ -2880,7 +2825,7 @@
 
 			<object type="text" color="%text_color%">
 				<font resource="font" />
-				<placement x="%center_x%" y="%slider_text_y%" placement="5" />
+				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
 				<text>Swipe to Unlock</text>
 			</object>
 		</page>
@@ -3329,10 +3274,10 @@
 				<resource base="slider" used="slider-used" touch="slider-touch" />
 				<action function="page">filemanageracction</action>
 			</object>
-
+			
 			<object type="text" color="%text_color%">
 				<font resource="font" />
-				<placement x="%center_x%" y="%slider_text_y%" placement="5" />
+				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
 				<text>Swipe to Confirm</text>
 			</object>
 
@@ -3345,7 +3290,7 @@
 				<touch key="home" />
 				<action function="page">main</action>
 			</object>
-
+				
 			<object type="template" name="footer" />
 		</page>
 
@@ -3544,6 +3489,7 @@
 
 			<object type="template" name="footer" />
 		</page>
+
 		<page name="terminalcommand">
 			<object type="template" name="header" />
 
@@ -3592,7 +3538,5 @@
 				<action function="page">terminalfolder</action>
 			</object>
 		</page>
-
 	</pages>
 </recovery>
-
diff --git a/partition.cpp b/partition.cpp
index 42a44812..3c82e2b5 100644
--- a/partition.cpp
+++ b/partition.cpp
@@ -178,6 +178,7 @@ bool TWPartition::Process_Fstab_Line(string Line, bool Display_Error) {
 			Has_Data_Media = true;
 			Is_Storage = true;
 			Storage_Path = "/data/media";
+			Recreate_Media_Folder();
 			if (strcmp(EXPAND(TW_EXTERNAL_STORAGE_PATH), "/sdcard") == 0) {
 				Make_Dir("/emmc", Display_Error);
 				Symlink_Path = "/data/media";
@@ -212,6 +213,10 @@ bool TWPartition::Process_Fstab_Line(string Line, bool Display_Error) {
 			Wipe_Available_in_GUI = true;
 			Wipe_During_Factory_Reset = true;
 			MTD_Name = "cache";
+			if (!TWFunc::Path_Exists("/cache/recovery")) {
+				LOGI("Recreating /cache/recovery folder.\n");
+				TWFunc::Recursive_Mkdir("/cache/recovery");
+			}
 		} else if (Mount_Point == "/datadata") {
 			Wipe_During_Factory_Reset = true;
 			Display_Name = "DataData";
@@ -821,6 +826,7 @@ bool TWPartition::Wipe_Encryption() {
 		if (Has_Data_Media && !Symlink_Mount_Point.empty()) {
 			Recreate_Media_Folder();
 		}
+		ui_print("You may need to reboot recovery to be able to use /data again.\n");
 		return true;
 	} else {
 		Has_Data_Media = Save_Data_Media;
@@ -1074,6 +1080,7 @@ bool TWPartition::Backup_Tar(string backup_folder) {
 	if (!Mount(true))
 		return false;
 
+	TWFunc::GUI_Operation_Text(TW_BACKUP_TEXT, Display_Name, "Backing Up");
 	ui_print("Backing up %s...\n", Display_Name.c_str());
 
 	DataManager::GetValue(TW_USE_COMPRESSION_VAR, use_compression);
@@ -1127,6 +1134,7 @@ bool TWPartition::Backup_DD(string backup_folder) {
 	string Full_FileName, Command;
 	int use_compression;
 
+	TWFunc::GUI_Operation_Text(TW_BACKUP_TEXT, Display_Name, "Backing Up");
 	ui_print("Backing up %s...\n", Display_Name.c_str());
 
 	sprintf(back_name, "%s.%s.win", Backup_Name.c_str(), Current_File_System.c_str());
@@ -1145,6 +1153,7 @@ bool TWPartition::Backup_Dump_Image(string backup_folder) {
 	string Full_FileName, Command;
 	int use_compression;
 
+	TWFunc::GUI_Operation_Text(TW_BACKUP_TEXT, Display_Name, "Backing Up");
 	ui_print("Backing up %s...\n", Display_Name.c_str());
 
 	sprintf(back_name, "%s.%s.win", Backup_Name.c_str(), Current_File_System.c_str());
@@ -1164,6 +1173,7 @@ bool TWPartition::Restore_Tar(string restore_folder) {
 	int index = 0;
 	char split_index[5];
 
+	TWFunc::GUI_Operation_Text(TW_RESTORE_TEXT, Display_Name, "Restoring");
 	LOGI("Restore filename is: %s\n", Backup_FileName.c_str());
 
 	// Parse backup filename to extract the file system before wiping
@@ -1224,6 +1234,7 @@ bool TWPartition::Restore_Tar(string restore_folder) {
 bool TWPartition::Restore_DD(string restore_folder) {
 	string Full_FileName, Command;
 
+	TWFunc::GUI_Operation_Text(TW_RESTORE_TEXT, Display_Name, "Restoring");
 	ui_print("Restoring %s...\n", Display_Name.c_str());
 	Full_FileName = restore_folder + "/" + Backup_FileName;
 	Command = "dd bs=4096 if='" + Full_FileName + "' of=" + Actual_Block_Device;
@@ -1235,6 +1246,7 @@ bool TWPartition::Restore_DD(string restore_folder) {
 bool TWPartition::Restore_Flash_Image(string restore_folder) {
 	string Full_FileName, Command;
 
+	TWFunc::GUI_Operation_Text(TW_RESTORE_TEXT, Display_Name, "Restoring");
 	ui_print("Restoring %s...\n", Display_Name.c_str());
 	Full_FileName = restore_folder + "/" + Backup_FileName;
 	// Sometimes flash image doesn't like to flash due to the first 2KB matching, so we erase first to ensure that it flashes
@@ -1309,7 +1321,7 @@ void TWPartition::Recreate_Media_Folder(void) {
 
 	if (!Mount(true)) {
 		LOGE("Unable to recreate /data/media folder.\n");
-	} else {
+	} else if (!TWFunc::Path_Exists("/data/media")) {
 		LOGI("Recreating /data/media folder.\n");
 		system("cd /data && mkdir media && chmod 755 media");
 		Command = "umount " + Symlink_Mount_Point;
diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index 75ade658..df67bb52 100644
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -421,6 +421,7 @@ bool TWPartitionManager::Make_MD5(bool generate_md5, string Backup_Folder, strin
 	if (!generate_md5)
 		return true;
 
+	TWFunc::GUI_Operation_Text(TW_GENERATE_MD5_TEXT, "Generating MD5");
 	ui_print(" * Generating md5...\n");
 
 	if (TWFunc::Path_Exists(Full_File)) {
@@ -960,6 +961,7 @@ int TWPartitionManager::Run_Restore(string Restore_Name) {
 
 	if (check_md5 > 0) {
 		// Check MD5 files first before restoring to ensure that all of them match before starting a restore
+		TWFunc::GUI_Operation_Text(TW_VERIFY_MD5_TEXT, "Verifying MD5");
 		ui_print("Verifying MD5...\n");
 		if (restore_sys != NULL && !restore_sys->Check_MD5(Restore_Name))
 			return false;
@@ -1014,6 +1016,7 @@ int TWPartitionManager::Run_Restore(string Restore_Name) {
 	if (restore_sp3 != NULL && !Restore_Partition(restore_sp3, Restore_Name, partition_count))
 		return false;
 
+	TWFunc::GUI_Operation_Text(TW_UPDATE_SYSTEM_DETAILS_TEXT, "Updating System Details");
 	Update_System_Details();
 	time(&rStop);
 	ui_print("[RESTORE COMPLETED IN %d SECONDS]\n\n",(int)difftime(rStop,rStart));
diff --git a/twrp-functions.cpp b/twrp-functions.cpp
index 0b2258a9..a681de28 100644
--- a/twrp-functions.cpp
+++ b/twrp-functions.cpp
@@ -12,6 +12,7 @@
 #include "twrp-functions.hpp"
 #include "partitions.hpp"
 #include "common.h"
+#include "data.hpp"
 
 /*  Checks md5 for a path
     Return values:
@@ -226,4 +227,26 @@ bool TWFunc::Path_Exists(string Path) {
 		return false;
 	else
 		return true;
+}
+
+void TWFunc::GUI_Operation_Text(string Read_Value, string Default_Text) {
+	string Display_Text;
+
+	DataManager::GetValue(Read_Value, Display_Text);
+	if (Display_Text.empty())
+		Display_Text = Default_Text;
+
+	DataManager::SetValue("tw_operation", Display_Text);
+	DataManager::SetValue("tw_partition", "");
+}
+
+void TWFunc::GUI_Operation_Text(string Read_Value, string Partition_Name, string Default_Text) {
+	string Display_Text;
+
+	DataManager::GetValue(Read_Value, Display_Text);
+	if (Display_Text.empty())
+		Display_Text = Default_Text;
+
+	DataManager::SetValue("tw_operation", Display_Text);
+	DataManager::SetValue("tw_partition", Partition_Name);
 }
\ No newline at end of file
diff --git a/twrp-functions.hpp b/twrp-functions.hpp
index b619239b..e4af7eea 100644
--- a/twrp-functions.hpp
+++ b/twrp-functions.hpp
@@ -20,6 +20,8 @@ public:
 	static int Recursive_Mkdir(string Path);                                    // Recursively makes the entire path
 	static unsigned long long Get_Folder_Size(string Path, bool Display_Error); // Gets the size of a folder and all of its subfolders using dirent and stat
 	static bool Path_Exists(string Path);                                       // Returns true if the path exists
+	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 d93933ca..8f493047 100644
--- a/variables.h
+++ b/variables.h
@@ -26,6 +26,7 @@
 #define TW_ZIP_QUEUE_COUNT			"tw_zip_queue_count"
 
 #define MAX_BACKUP_NAME_LEN 64
+#define TW_BACKUP_TEXT              "tw_backup_text"
 #define TW_BACKUP_NAME		        "tw_backup_name"
 #define TW_BACKUP_SYSTEM_VAR        "tw_backup_system"
 #define TW_BACKUP_DATA_VAR          "tw_backup_data"
@@ -51,7 +52,9 @@
 #define TW_BACKUP_SP2_SIZE          "tw_backup_sp2_size"
 #define TW_BACKUP_SP3_SIZE          "tw_backup_sp3_size"
 #define TW_STORAGE_FREE_SIZE        "tw_storage_free_size"
+#define TW_GENERATE_MD5_TEXT        "tw_generate_md5_text"
 
+#define TW_RESTORE_TEXT             "tw_restore_text"
 #define TW_RESTORE_SYSTEM_VAR       "tw_restore_system"
 #define TW_RESTORE_DATA_VAR         "tw_restore_data"
 #define TW_RESTORE_BOOT_VAR         "tw_restore_boot"
@@ -66,6 +69,8 @@
 #define TW_RESTORE_AVG_FILE_RATE    "tw_restore_avg_file_rate"
 #define TW_RESTORE_AVG_FILE_COMP_RATE    "tw_restore_avg_file_comp_rate"
 #define TW_RESTORE_FILE_DATE        "tw_restore_file_date"
+#define TW_VERIFY_MD5_TEXT          "tw_verify_md5_text"
+#define TW_UPDATE_SYSTEM_DETAILS_TEXT "tw_update_system_details_text"
 
 #define TW_SHOW_SPAM_VAR            "tw_show_spam"
 #define TW_COLOR_THEME_VAR          "tw_color_theme"