diff --git a/data.cpp b/data.cpp
index 18af8cd..279c48c 100644
--- a/data.cpp
+++ b/data.cpp
@@ -815,7 +815,6 @@
     mValues.insert(make_pair(TW_FORCE_MD5_CHECK_VAR, make_pair("0", 1)));
     mValues.insert(make_pair(TW_COLOR_THEME_VAR, make_pair("0", 1)));
     mValues.insert(make_pair(TW_USE_COMPRESSION_VAR, make_pair("0", 1)));
-	mValues.insert(make_pair(TW_IGNORE_IMAGE_SIZE, make_pair("0", 1)));
     mValues.insert(make_pair(TW_SHOW_SPAM_VAR, make_pair("0", 1)));
     mValues.insert(make_pair(TW_TIME_ZONE_VAR, make_pair("CST6CDT", 1)));
     mValues.insert(make_pair(TW_SORT_FILES_BY_DATE_VAR, make_pair("0", 1)));
diff --git a/gui/devices/1024x600/res/ui.xml b/gui/devices/1024x600/res/ui.xml
index 383774e..a651b5b 100755
--- a/gui/devices/1024x600/res/ui.xml
+++ b/gui/devices/1024x600/res/ui.xml
@@ -2460,8 +2460,8 @@
 			<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>
-				<data variable="tw_ignore_image_size" />
+				<text>Use Military Time</text>
+				<data variable="tw_military_time" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
@@ -2482,14 +2482,6 @@
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
-                        <object type="checkbox">
-                                <placement x="%col1_x%" y="%row9_text_y%" />
-                                <font resource="font" color="%text_color%" />
-                                <text>Use Military Time</text>
-                                <data variable="tw_military_time" />
-                                <image checked="checkbox_true" unchecked="checkbox_false" />
-                        </object>
-
 			<object type="button">
 				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row2_y%" />
diff --git a/gui/devices/1024x768/res/ui.xml b/gui/devices/1024x768/res/ui.xml
index 6395c74..f4cfa44 100644
--- a/gui/devices/1024x768/res/ui.xml
+++ b/gui/devices/1024x768/res/ui.xml
@@ -2460,8 +2460,8 @@
 			<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>
-				<data variable="tw_ignore_image_size" />
+				<text>Use Military Time</text>
+				<data variable="tw_military_time" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
@@ -2482,14 +2482,6 @@
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
-                        <object type="checkbox">
-                                <placement x="%col1_x%" y="%row9_text_y%" />
-                                <font resource="font" color="%text_color%" />
-                                <text>Use Military Time</text>
-                                <data variable="tw_military_time" />
-                                <image checked="checkbox_true" unchecked="checkbox_false" />
-                        </object>
-
 			<object type="button">
 				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row2_y%" />
diff --git a/gui/devices/1280x800/res/ui.xml b/gui/devices/1280x800/res/ui.xml
index c806b85..e6ef8f9 100644
--- a/gui/devices/1280x800/res/ui.xml
+++ b/gui/devices/1280x800/res/ui.xml
@@ -2460,8 +2460,8 @@
 			<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>
-				<data variable="tw_ignore_image_size" />
+				<text>Use Military Time</text>
+				<data variable="tw_military_time" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
@@ -2482,14 +2482,6 @@
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
-                        <object type="checkbox">
-                                <placement x="%col1_x%" y="%row9_text_y%" />
-                                <font resource="font" color="%text_color%" />
-                                <text>Use Military Time</text>
-                                <data variable="tw_military_time" />
-                                <image checked="checkbox_true" unchecked="checkbox_false" />
-                        </object>
-
 			<object type="button">
 				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row2_y%" />
diff --git a/gui/devices/1920x1200/res/ui.xml b/gui/devices/1920x1200/res/ui.xml
index 1947ffa..e22494b 100644
--- a/gui/devices/1920x1200/res/ui.xml
+++ b/gui/devices/1920x1200/res/ui.xml
@@ -2460,8 +2460,8 @@
 			<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>
-				<data variable="tw_ignore_image_size" />
+				<text>Use Military Time</text>
+				<data variable="tw_military_time" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
@@ -2482,15 +2482,6 @@
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
-
-                        <object type="checkbox">
-                                <placement x="%col1_x%" y="%row9_text_y%" />
-                                <font resource="font" color="%text_color%" />
-                                <text>Use Military Time</text>
-                                <data variable="tw_military_time" />
-                                <image checked="checkbox_true" unchecked="checkbox_false" />
-                        </object>
-
 			<object type="button">
 				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row2_y%" />
diff --git a/gui/devices/2560x1600/res/ui.xml b/gui/devices/2560x1600/res/ui.xml
index e26bdb9..d3b20ab 100644
--- a/gui/devices/2560x1600/res/ui.xml
+++ b/gui/devices/2560x1600/res/ui.xml
@@ -2460,8 +2460,8 @@
 			<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>
-				<data variable="tw_ignore_image_size" />
+				<text>Use Military Time</text>
+				<data variable="tw_military_time" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
@@ -2482,14 +2482,6 @@
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
-                        <object type="checkbox">
-                                <placement x="%col1_x%" y="%row9_text_y%" />
-                                <font resource="font" color="%text_color%" />
-                                <text>Use Military Time</text>
-                                <data variable="tw_military_time" />
-                                <image checked="checkbox_true" unchecked="checkbox_false" />
-                        </object>
-
 			<object type="button">
 				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row2_y%" />
diff --git a/gui/devices/320x480/res/ui.xml b/gui/devices/320x480/res/ui.xml
index 58147d2..9f2051d 100644
--- a/gui/devices/320x480/res/ui.xml
+++ b/gui/devices/320x480/res/ui.xml
@@ -2432,8 +2432,8 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row5_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Ignore image size errors during backup.</text>
-				<data variable="tw_ignore_image_size" />
+				<text>Use Military Time.</text>
+				<data variable="tw_military_time" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
@@ -2454,14 +2454,6 @@
 				<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>Use Military Time</text>
-                                <data variable="tw_military_time" />
-                                <image checked="checkbox_true" unchecked="checkbox_false" />
-                        </object>
-
 			<object type="button">
 				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row3_y%" />
diff --git a/gui/devices/480x800/res/ui.xml b/gui/devices/480x800/res/ui.xml
index 572d1b9..2707b24 100644
--- a/gui/devices/480x800/res/ui.xml
+++ b/gui/devices/480x800/res/ui.xml
@@ -2431,8 +2431,8 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row5_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Ignore image size errors during backup.</text>
-				<data variable="tw_ignore_image_size" />
+				<text>Use Military Time.</text>
+				<data variable="tw_military_time" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
@@ -2453,14 +2453,6 @@
 				<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>Use Military Time</text>
-                                <data variable="tw_military_time" />
-                                <image checked="checkbox_true" unchecked="checkbox_false" />
-                        </object>
-
 			<object type="button">
 				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row3_y%" />
diff --git a/gui/devices/480x854/res/ui.xml b/gui/devices/480x854/res/ui.xml
index 09df803..44cd782 100644
--- a/gui/devices/480x854/res/ui.xml
+++ b/gui/devices/480x854/res/ui.xml
@@ -2430,8 +2430,8 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row5_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Ignore image size errors during backup.</text>
-				<data variable="tw_ignore_image_size" />
+				<text>Use Military Time.</text>
+				<data variable="tw_military_time" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
@@ -2452,14 +2452,6 @@
 				<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>Use Military Time</text>
-                                <data variable="tw_military_time" />
-                                <image checked="checkbox_true" unchecked="checkbox_false" />
-                        </object>
-
 			<object type="button">
 				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row3_y%" />
diff --git a/gui/devices/540x960/res/ui.xml b/gui/devices/540x960/res/ui.xml
index 9e8034b..ae0b24e 100644
--- a/gui/devices/540x960/res/ui.xml
+++ b/gui/devices/540x960/res/ui.xml
@@ -937,6 +937,48 @@
 			</object>
 		</page>
 
+		<page name="singleaction_page">
+			<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="%row3_text_y%" placement="5" />
+				<text>%tw_action_text2%</text>
+			</object>
+
+			<object type="template" name="action_page_console" />
+
+			<object type="template" name="progress_bar" />
+
+			<object type="action">
+				<condition var1="tw_operation_state" var2="1" />
+				<actions>
+					<action function="set">tw_page_done=1</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_complete">
 			<object type="template" name="header" />
 
@@ -2389,8 +2431,8 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row5_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Ignore image size errors during backup.</text>
-				<data variable="tw_ignore_image_size" />
+				<text>Use Military Time.</text>
+				<data variable="tw_military_time" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
@@ -2411,14 +2453,6 @@
 				<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>Use Military Time</text>
-                                <data variable="tw_military_time" />
-                                <image checked="checkbox_true" unchecked="checkbox_false" />
-                        </object>
-
 			<object type="button">
 				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row3_y%" />
@@ -3829,5 +3863,113 @@
 
 			<object type="template" name="footer" />
 		</page>
+
+		<page name="installsu">
+			<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>Install SuperSU?</text>
+			</object>
+
+			<object type="text" color="%text_color%">
+				<font resource="font" />
+				<placement x="%center_x%" y="%row2_text_y%" placement="5"/>
+				<text>Your device does not appear to be rooted.</text>
+			</object>
+
+			<object type="text" color="%text_color%">
+				<font resource="font" />
+				<placement x="%center_x%" y="%row3_text_y%" placement="5"/>
+				<text>Install SuperSU now?</text>
+			</object>
+
+			<object type="text" color="%text_color%">
+				<font resource="font" />
+				<placement x="%center_x%" y="%row4_text_y%" placement="5"/>
+				<text>This will root your device.</text>
+			</object>
+
+			<object type="button">
+				<highlight color="%highlight_color%" />
+				<placement x="%col_center_x%" y="%row3_y%" />
+				<font resource="font" color="%button_text_color%" />
+				<text>Do Not Install</text>
+				<image resource="main_button" />
+				<action function="set">tw_page_done=1</action>
+			</object>
+
+			<object type="slider">
+				<placement x="%slider_x%" y="%slider_y%" />
+				<resource base="slider" used="slider-used" touch="slider-touch" />
+				<actions>
+					<action function="set">tw_action=installsu</action>
+					<action function="set">tw_action_text1=Installing SuperSU</action>
+					<action function="set">tw_action_text2=</action>
+					<action function="page">singleaction_page</action>
+				</actions>
+			</object>
+
+			<object type="text" color="%text_color%">
+				<font resource="font" />
+				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
+				<text>Swipe to Install</text>
+			</object>
+		</page>
+
+		<page name="fixsu">
+			<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>Fix Superuser Permissions?</text>
+			</object>
+
+			<object type="text" color="%text_color%">
+				<font resource="font" />
+				<placement x="%center_x%" y="%row2_text_y%" placement="5"/>
+				<text>Root permissions appear to be lost.</text>
+			</object>
+
+			<object type="text" color="%text_color%">
+				<font resource="font" />
+				<placement x="%center_x%" y="%row3_text_y%" placement="5"/>
+				<text>Fix root permissions now?</text>
+			</object>
+
+			<object type="text" color="%text_color%">
+				<font resource="font" />
+				<placement x="%center_x%" y="%row4_text_y%" placement="5"/>
+				<text>(Fixes permissions on su binary & app)</text>
+			</object>
+
+			<object type="button">
+				<highlight color="%highlight_color%" />
+				<placement x="%col_center_x%" y="%row3_y%" />
+				<font resource="font" color="%button_text_color%" />
+				<text>Do Not Fix</text>
+				<image resource="main_button" />
+				<action function="set">tw_page_done=1</action>
+			</object>
+
+			<object type="slider">
+				<placement x="%slider_x%" y="%slider_y%" />
+				<resource base="slider" used="slider-used" touch="slider-touch" />
+				<actions>
+					<action function="set">tw_action=fixsu</action>
+					<action function="set">tw_action_text1=Fixing Root Permissions</action>
+					<action function="set">tw_action_text2=</action>
+					<action function="page">singleaction_page</action>
+				</actions>
+			</object>
+
+			<object type="text" color="%text_color%">
+				<font resource="font" />
+				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
+				<text>Swipe to Fix Root</text>
+			</object>
+		</page>
 	</pages>
 </recovery>
diff --git a/gui/devices/720x1280/res/ui.xml b/gui/devices/720x1280/res/ui.xml
index 6d9f061..bdd7799 100644
--- a/gui/devices/720x1280/res/ui.xml
+++ b/gui/devices/720x1280/res/ui.xml
@@ -2444,8 +2444,8 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row5_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Ignore image size errors during backup.</text>
-				<data variable="tw_ignore_image_size" />
+				<text>Use Military Time.</text>
+				<data variable="tw_military_time" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
@@ -2466,14 +2466,6 @@
 				<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>Use Military Time</text>
-                                <data variable="tw_military_time" />
-                                <image checked="checkbox_true" unchecked="checkbox_false" />
-                        </object>
-
 			<object type="button">
 				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row3_y%" />
diff --git a/gui/devices/800x1280/res/ui.xml b/gui/devices/800x1280/res/ui.xml
index 03e4e70..eb602cd 100755
--- a/gui/devices/800x1280/res/ui.xml
+++ b/gui/devices/800x1280/res/ui.xml
@@ -2432,8 +2432,8 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row5_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Ignore image size errors during backup.</text>
-				<data variable="tw_ignore_image_size" />
+				<text>Use Military Time.</text>
+				<data variable="tw_military_time" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
@@ -2454,14 +2454,6 @@
 				<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>Use Military Time</text>
-                                <data variable="tw_military_time" />
-                                <image checked="checkbox_true" unchecked="checkbox_false" />
-                        </object>
-
 			<object type="button">
 				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row3_y%" />
diff --git a/gui/devices/800x480/res/ui.xml b/gui/devices/800x480/res/ui.xml
index 9501ad8..7813aa6 100755
--- a/gui/devices/800x480/res/ui.xml
+++ b/gui/devices/800x480/res/ui.xml
@@ -2468,8 +2468,8 @@
 			<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>
-				<data variable="tw_ignore_image_size" />
+				<text>Use Military Time</text>
+				<data variable="tw_military_time" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
@@ -2490,14 +2490,6 @@
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
-                        <object type="checkbox">
-                                <placement x="%col1_x%" y="%row9_text_y%" />
-                                <font resource="font" color="%text_color%" />
-                                <text>Use Military Time</text>
-                                <data variable="tw_military_time" />
-                                <image checked="checkbox_true" unchecked="checkbox_false" />
-                        </object>
-
 			<object type="button">
 				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row2_y%" />
@@ -2534,7 +2526,7 @@
 				<touch key="back" />
 				<action function="page">main</action>
 			</object>
-
+			
 			<object type="template" name="footer" />
 		</page>
 
diff --git a/variables.h b/variables.h
index 0461c5d..826eb6b 100644
--- a/variables.h
+++ b/variables.h
@@ -1,183 +1,182 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef _VARIABLES_HEADER_
-#define _VARIABLES_HEADER_
-
-#define TW_VERSION_STR              "2.4.1.0"
-
-#define TW_USE_COMPRESSION_VAR      "tw_use_compression"
-#define TW_IGNORE_IMAGE_SIZE        "tw_ignore_image_size"
-#define TW_FILENAME                 "tw_filename"
-#define TW_ZIP_INDEX                "tw_zip_index"
-#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"
-#define TW_BACKUP_BOOT_VAR          "tw_backup_boot"
-#define TW_BACKUP_RECOVERY_VAR      "tw_backup_recovery"
-#define TW_BACKUP_CACHE_VAR         "tw_backup_cache"
-#define TW_BACKUP_ANDSEC_VAR        "tw_backup_andsec"
-#define TW_BACKUP_SDEXT_VAR         "tw_backup_sdext"
-#define TW_BACKUP_SP1_VAR           "tw_backup_sp1"
-#define TW_BACKUP_SP2_VAR           "tw_backup_sp2"
-#define TW_BACKUP_SP3_VAR           "tw_backup_sp3"
-#define TW_BACKUP_AVG_IMG_RATE      "tw_backup_avg_img_rate"
-#define TW_BACKUP_AVG_FILE_RATE     "tw_backup_avg_file_rate"
-#define TW_BACKUP_AVG_FILE_COMP_RATE    "tw_backup_avg_file_comp_rate"
-#define TW_BACKUP_SYSTEM_SIZE       "tw_backup_system_size"
-#define TW_BACKUP_DATA_SIZE         "tw_backup_data_size"
-#define TW_BACKUP_BOOT_SIZE         "tw_backup_boot_size"
-#define TW_BACKUP_RECOVERY_SIZE     "tw_backup_recovery_size"
-#define TW_BACKUP_CACHE_SIZE        "tw_backup_cache_size"
-#define TW_BACKUP_ANDSEC_SIZE       "tw_backup_andsec_size"
-#define TW_BACKUP_SDEXT_SIZE        "tw_backup_sdext_size"
-#define TW_BACKUP_SP1_SIZE          "tw_backup_sp1_size"
-#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"
-#define TW_RESTORE_RECOVERY_VAR     "tw_restore_recovery"
-#define TW_RESTORE_CACHE_VAR        "tw_restore_cache"
-#define TW_RESTORE_ANDSEC_VAR       "tw_restore_andsec"
-#define TW_RESTORE_SDEXT_VAR        "tw_restore_sdext"
-#define TW_RESTORE_SP1_VAR          "tw_restore_sp1"
-#define TW_RESTORE_SP2_VAR          "tw_restore_sp2"
-#define TW_RESTORE_SP3_VAR          "tw_restore_sp3"
-#define TW_RESTORE_AVG_IMG_RATE     "tw_restore_avg_img_rate"
-#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"
-#define TW_VERSION_VAR              "tw_version"
-#define TW_SORT_FILES_BY_DATE_VAR   "tw_sort_files_by_date"
-#define TW_GUI_SORT_ORDER           "tw_gui_sort_order"
-#define TW_ZIP_LOCATION_VAR         "tw_zip_location"
-#define TW_ZIP_INTERNAL_VAR         "tw_zip_internal"
-#define TW_ZIP_EXTERNAL_VAR         "tw_zip_external"
-#define TW_FORCE_MD5_CHECK_VAR      "tw_force_md5_check"
-#define TW_SKIP_MD5_CHECK_VAR       "tw_skip_md5_check"
-#define TW_SKIP_MD5_GENERATE_VAR    "tw_skip_md5_generate"
-#define TW_SIGNED_ZIP_VERIFY_VAR    "tw_signed_zip_verify"
-#define TW_REBOOT_AFTER_FLASH_VAR   "tw_reboot_after_flash_option"
-#define TW_TIME_ZONE_VAR            "tw_time_zone"
-#define TW_RM_RF_VAR                "tw_rm_rf"
-
-#define TW_BACKUPS_FOLDER_VAR       "tw_backups_folder"
-
-#define TW_SP1_PARTITION_NAME_VAR   "tw_sp1_name"
-#define TW_SP2_PARTITION_NAME_VAR   "tw_sp2_name"
-#define TW_SP3_PARTITION_NAME_VAR   "tw_sp3_name"
-
-#define TW_SDEXT_SIZE               "tw_sdext_size"
-#define TW_SWAP_SIZE                "tw_swap_size"
-#define TW_SDPART_FILE_SYSTEM       "tw_sdpart_file_system"
-#define TW_TIME_ZONE_GUISEL         "tw_time_zone_guisel"
-#define TW_TIME_ZONE_GUIOFFSET      "tw_time_zone_guioffset"
-#define TW_TIME_ZONE_GUIDST         "tw_time_zone_guidst"
-
-#define TW_ACTION_BUSY              "tw_busy"
-
-#define TW_ALLOW_PARTITION_SDCARD   "tw_allow_partition_sdcard"
-
-#define TW_SCREEN_OFF               "tw_screen_off"
-
-#define TW_REBOOT_SYSTEM            "tw_reboot_system"
-#define TW_REBOOT_RECOVERY          "tw_reboot_recovery"
-#define TW_REBOOT_POWEROFF          "tw_reboot_poweroff"
-#define TW_REBOOT_BOOTLOADER        "tw_reboot_bootloader"
-
-#define TW_HAS_DUAL_STORAGE         "tw_has_dual_storage"
-#define TW_USE_EXTERNAL_STORAGE     "tw_use_external_storage"
-#define TW_HAS_INTERNAL             "tw_has_internal"
-#define TW_INTERNAL_PATH            "tw_internal_path"         // /data/media or /internal
-#define TW_INTERNAL_MOUNT           "tw_internal_mount"        // /data or /internal
-#define TW_INTERNAL_LABEL           "tw_internal_label"        // data or internal
-#define TW_HAS_EXTERNAL             "tw_has_external"
-#define TW_EXTERNAL_PATH            "tw_external_path"         // /sdcard or /external/sdcard2
-#define TW_EXTERNAL_MOUNT           "tw_external_mount"        // /sdcard or /external
-#define TW_EXTERNAL_LABEL           "tw_external_label"        // sdcard or external
-
-#define TW_HAS_DATA_MEDIA           "tw_has_data_media"
-
-#define TW_HAS_BOOT_PARTITION       "tw_has_boot_partition"
-#define TW_HAS_RECOVERY_PARTITION   "tw_has_recovery_partition"
-#define TW_HAS_ANDROID_SECURE       "tw_has_android_secure"
-#define TW_HAS_SDEXT_PARTITION      "tw_has_sdext_partition"
-#define TW_HAS_USB_STORAGE          "tw_has_usb_storage"
-#define TW_NO_BATTERY_PERCENT       "tw_no_battery_percent"
-#define TW_POWER_BUTTON             "tw_power_button"
-#define TW_SIMULATE_ACTIONS         "tw_simulate_actions"
-#define TW_SIMULATE_FAIL            "tw_simulate_fail"
-#define TW_DONT_UNMOUNT_SYSTEM      "tw_dont_unmount_system"
-// #define TW_ALWAYS_RMRF              "tw_always_rmrf"
-
-#define TW_SHOW_DUMLOCK             "tw_show_dumlock"
-#define TW_HAS_INJECTTWRP           "tw_has_injecttwrp"
-#define TW_INJECT_AFTER_ZIP         "tw_inject_after_zip"
-#define TW_HAS_DATADATA             "tw_has_datadata"
-#define TW_FLASH_ZIP_IN_PLACE       "tw_flash_zip_in_place"
-#define TW_MIN_SYSTEM_SIZE          "50" // minimum system size to allow a reboot
-#define TW_MIN_SYSTEM_VAR           "tw_min_system"
-#define TW_DOWNLOAD_MODE            "tw_download_mode"
-#define TW_IS_ENCRYPTED             "tw_is_encrypted"
-#define TW_IS_DECRYPTED             "tw_is_decrypted"
-#define TW_HAS_CRYPTO               "tw_has_crypto"
-#define TW_CRYPTO_PASSWORD          "tw_crypto_password"
-#define TW_DATA_BLK_DEVICE          "tw_data_blk_device"  // Original block device - not decrypted
-#define TW_SDEXT_DISABLE_EXT4       "tw_sdext_disable_ext4"
-#define TW_MILITARY_TIME            "tw_military_time"
-
-// Also used:
-//   tw_boot_is_mountable
-//   tw_system_is_mountable
-//   tw_data_is_mountable
-//   tw_cache_is_mountable
-//   tw_sdcext_is_mountable
-//   tw_sdcint_is_mountable
-//   tw_sd-ext_is_mountable
-//   tw_sp1_is_mountable
-//   tw_sp2_is_mountable
-//   tw_sp3_is_mountable
-
+/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef _VARIABLES_HEADER_
+#define _VARIABLES_HEADER_
+
+#define TW_VERSION_STR              "2.4.1.0"
+
+#define TW_USE_COMPRESSION_VAR      "tw_use_compression"
+#define TW_FILENAME                 "tw_filename"
+#define TW_ZIP_INDEX                "tw_zip_index"
+#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"
+#define TW_BACKUP_BOOT_VAR          "tw_backup_boot"
+#define TW_BACKUP_RECOVERY_VAR      "tw_backup_recovery"
+#define TW_BACKUP_CACHE_VAR         "tw_backup_cache"
+#define TW_BACKUP_ANDSEC_VAR        "tw_backup_andsec"
+#define TW_BACKUP_SDEXT_VAR         "tw_backup_sdext"
+#define TW_BACKUP_SP1_VAR           "tw_backup_sp1"
+#define TW_BACKUP_SP2_VAR           "tw_backup_sp2"
+#define TW_BACKUP_SP3_VAR           "tw_backup_sp3"
+#define TW_BACKUP_AVG_IMG_RATE      "tw_backup_avg_img_rate"
+#define TW_BACKUP_AVG_FILE_RATE     "tw_backup_avg_file_rate"
+#define TW_BACKUP_AVG_FILE_COMP_RATE    "tw_backup_avg_file_comp_rate"
+#define TW_BACKUP_SYSTEM_SIZE       "tw_backup_system_size"
+#define TW_BACKUP_DATA_SIZE         "tw_backup_data_size"
+#define TW_BACKUP_BOOT_SIZE         "tw_backup_boot_size"
+#define TW_BACKUP_RECOVERY_SIZE     "tw_backup_recovery_size"
+#define TW_BACKUP_CACHE_SIZE        "tw_backup_cache_size"
+#define TW_BACKUP_ANDSEC_SIZE       "tw_backup_andsec_size"
+#define TW_BACKUP_SDEXT_SIZE        "tw_backup_sdext_size"
+#define TW_BACKUP_SP1_SIZE          "tw_backup_sp1_size"
+#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"
+#define TW_RESTORE_RECOVERY_VAR     "tw_restore_recovery"
+#define TW_RESTORE_CACHE_VAR        "tw_restore_cache"
+#define TW_RESTORE_ANDSEC_VAR       "tw_restore_andsec"
+#define TW_RESTORE_SDEXT_VAR        "tw_restore_sdext"
+#define TW_RESTORE_SP1_VAR          "tw_restore_sp1"
+#define TW_RESTORE_SP2_VAR          "tw_restore_sp2"
+#define TW_RESTORE_SP3_VAR          "tw_restore_sp3"
+#define TW_RESTORE_AVG_IMG_RATE     "tw_restore_avg_img_rate"
+#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"
+#define TW_VERSION_VAR              "tw_version"
+#define TW_SORT_FILES_BY_DATE_VAR   "tw_sort_files_by_date"
+#define TW_GUI_SORT_ORDER           "tw_gui_sort_order"
+#define TW_ZIP_LOCATION_VAR         "tw_zip_location"
+#define TW_ZIP_INTERNAL_VAR         "tw_zip_internal"
+#define TW_ZIP_EXTERNAL_VAR         "tw_zip_external"
+#define TW_FORCE_MD5_CHECK_VAR      "tw_force_md5_check"
+#define TW_SKIP_MD5_CHECK_VAR       "tw_skip_md5_check"
+#define TW_SKIP_MD5_GENERATE_VAR    "tw_skip_md5_generate"
+#define TW_SIGNED_ZIP_VERIFY_VAR    "tw_signed_zip_verify"
+#define TW_REBOOT_AFTER_FLASH_VAR   "tw_reboot_after_flash_option"
+#define TW_TIME_ZONE_VAR            "tw_time_zone"
+#define TW_RM_RF_VAR                "tw_rm_rf"
+
+#define TW_BACKUPS_FOLDER_VAR       "tw_backups_folder"
+
+#define TW_SP1_PARTITION_NAME_VAR   "tw_sp1_name"
+#define TW_SP2_PARTITION_NAME_VAR   "tw_sp2_name"
+#define TW_SP3_PARTITION_NAME_VAR   "tw_sp3_name"
+
+#define TW_SDEXT_SIZE               "tw_sdext_size"
+#define TW_SWAP_SIZE                "tw_swap_size"
+#define TW_SDPART_FILE_SYSTEM       "tw_sdpart_file_system"
+#define TW_TIME_ZONE_GUISEL         "tw_time_zone_guisel"
+#define TW_TIME_ZONE_GUIOFFSET      "tw_time_zone_guioffset"
+#define TW_TIME_ZONE_GUIDST         "tw_time_zone_guidst"
+
+#define TW_ACTION_BUSY              "tw_busy"
+
+#define TW_ALLOW_PARTITION_SDCARD   "tw_allow_partition_sdcard"
+
+#define TW_SCREEN_OFF               "tw_screen_off"
+
+#define TW_REBOOT_SYSTEM            "tw_reboot_system"
+#define TW_REBOOT_RECOVERY          "tw_reboot_recovery"
+#define TW_REBOOT_POWEROFF          "tw_reboot_poweroff"
+#define TW_REBOOT_BOOTLOADER        "tw_reboot_bootloader"
+
+#define TW_HAS_DUAL_STORAGE         "tw_has_dual_storage"
+#define TW_USE_EXTERNAL_STORAGE     "tw_use_external_storage"
+#define TW_HAS_INTERNAL             "tw_has_internal"
+#define TW_INTERNAL_PATH            "tw_internal_path"         // /data/media or /internal
+#define TW_INTERNAL_MOUNT           "tw_internal_mount"        // /data or /internal
+#define TW_INTERNAL_LABEL           "tw_internal_label"        // data or internal
+#define TW_HAS_EXTERNAL             "tw_has_external"
+#define TW_EXTERNAL_PATH            "tw_external_path"         // /sdcard or /external/sdcard2
+#define TW_EXTERNAL_MOUNT           "tw_external_mount"        // /sdcard or /external
+#define TW_EXTERNAL_LABEL           "tw_external_label"        // sdcard or external
+
+#define TW_HAS_DATA_MEDIA           "tw_has_data_media"
+
+#define TW_HAS_BOOT_PARTITION       "tw_has_boot_partition"
+#define TW_HAS_RECOVERY_PARTITION   "tw_has_recovery_partition"
+#define TW_HAS_ANDROID_SECURE       "tw_has_android_secure"
+#define TW_HAS_SDEXT_PARTITION      "tw_has_sdext_partition"
+#define TW_HAS_USB_STORAGE          "tw_has_usb_storage"
+#define TW_NO_BATTERY_PERCENT       "tw_no_battery_percent"
+#define TW_POWER_BUTTON             "tw_power_button"
+#define TW_SIMULATE_ACTIONS         "tw_simulate_actions"
+#define TW_SIMULATE_FAIL            "tw_simulate_fail"
+#define TW_DONT_UNMOUNT_SYSTEM      "tw_dont_unmount_system"
+// #define TW_ALWAYS_RMRF              "tw_always_rmrf"
+
+#define TW_SHOW_DUMLOCK             "tw_show_dumlock"
+#define TW_HAS_INJECTTWRP           "tw_has_injecttwrp"
+#define TW_INJECT_AFTER_ZIP         "tw_inject_after_zip"
+#define TW_HAS_DATADATA             "tw_has_datadata"
+#define TW_FLASH_ZIP_IN_PLACE       "tw_flash_zip_in_place"
+#define TW_MIN_SYSTEM_SIZE          "50" // minimum system size to allow a reboot
+#define TW_MIN_SYSTEM_VAR           "tw_min_system"
+#define TW_DOWNLOAD_MODE            "tw_download_mode"
+#define TW_IS_ENCRYPTED             "tw_is_encrypted"
+#define TW_IS_DECRYPTED             "tw_is_decrypted"
+#define TW_HAS_CRYPTO               "tw_has_crypto"
+#define TW_CRYPTO_PASSWORD          "tw_crypto_password"
+#define TW_DATA_BLK_DEVICE          "tw_data_blk_device"  // Original block device - not decrypted
+#define TW_SDEXT_DISABLE_EXT4       "tw_sdext_disable_ext4"
+#define TW_MILITARY_TIME            "tw_military_time"
+
+// Also used:
+//   tw_boot_is_mountable
+//   tw_system_is_mountable
+//   tw_data_is_mountable
+//   tw_cache_is_mountable
+//   tw_sdcext_is_mountable
+//   tw_sdcint_is_mountable
+//   tw_sd-ext_is_mountable
+//   tw_sp1_is_mountable
+//   tw_sp2_is_mountable
+//   tw_sp3_is_mountable
+
 // Max archive size for tar backups before we split (1.5GB)
-#define MAX_ARCHIVE_SIZE 1610612736LLU
-
-#ifndef CUSTOM_LUN_FILE
-#define CUSTOM_LUN_FILE "/sys/devices/platform/usb_mass_storage/lun%d/file"
-#endif
-
-#ifndef TW_BRIGHTNESS_PATH
-#define TW_BRIGHTNESS_PATH /nobrightness
-#endif
-
-// For OpenRecoveryScript
-#define SCRIPT_FILE_CACHE "/cache/recovery/openrecoveryscript"
-#define SCRIPT_FILE_TMP "/tmp/openrecoveryscript"
-
-#endif  // _VARIABLES_HEADER_
+#define MAX_ARCHIVE_SIZE 1610612736LLU
+
+#ifndef CUSTOM_LUN_FILE
+#define CUSTOM_LUN_FILE "/sys/devices/platform/usb_mass_storage/lun%d/file"
+#endif
+
+#ifndef TW_BRIGHTNESS_PATH
+#define TW_BRIGHTNESS_PATH /nobrightness
+#endif
+
+// For OpenRecoveryScript
+#define SCRIPT_FILE_CACHE "/cache/recovery/openrecoveryscript"
+#define SCRIPT_FILE_TMP "/tmp/openrecoveryscript"
+
+#endif  // _VARIABLES_HEADER_