diff --git a/gui/Android.mk b/gui/Android.mk
index 0b5afe1..81cd559 100644
--- a/gui/Android.mk
+++ b/gui/Android.mk
@@ -29,9 +29,9 @@
     scrolllist.cpp
 
 ifneq ($(TWRP_CUSTOM_KEYBOARD),)
-  LOCAL_SRC_FILES += $(TWRP_CUSTOM_KEYBOARD)
+    LOCAL_SRC_FILES += $(TWRP_CUSTOM_KEYBOARD)
 else
-  LOCAL_SRC_FILES += hardwarekeyboard.cpp
+    LOCAL_SRC_FILES += hardwarekeyboard.cpp
 endif
 
 LOCAL_SHARED_LIBRARIES += libminuitwrp libc libstdc++ libminzip libaosprecovery
@@ -43,10 +43,10 @@
 endif
 
 ifneq ($(TW_NO_SCREEN_BLANK),)
-	LOCAL_CFLAGS += -DTW_NO_SCREEN_BLANK
+    LOCAL_CFLAGS += -DTW_NO_SCREEN_BLANK
 endif
 ifneq ($(TW_NO_SCREEN_TIMEOUT),)
-	LOCAL_CFLAGS += -DTW_NO_SCREEN_TIMEOUT
+    LOCAL_CFLAGS += -DTW_NO_SCREEN_TIMEOUT
 endif
 ifeq ($(HAVE_SELINUX), true)
 LOCAL_CFLAGS += -DHAVE_SELINUX
@@ -58,31 +58,13 @@
     LOCAL_CFLAGS += -DTW_DISABLE_TTF
 endif
 ifneq ($(TW_X_OFFSET),)
-  LOCAL_CFLAGS += -DTW_X_OFFSET=$(TW_X_OFFSET)
+    LOCAL_CFLAGS += -DTW_X_OFFSET=$(TW_X_OFFSET)
 endif
 ifneq ($(TW_Y_OFFSET),)
-  LOCAL_CFLAGS += -DTW_Y_OFFSET=$(TW_Y_OFFSET)
+    LOCAL_CFLAGS += -DTW_Y_OFFSET=$(TW_Y_OFFSET)
 endif
 ifeq ($(TW_ROUND_SCREEN), true)
-  LOCAL_CFLAGS += -DTW_ROUND_SCREEN
-endif
-
-ifeq ($(DEVICE_RESOLUTION),)
-  $(warning ********************************************************************************)
-  $(warning * DEVICE_RESOLUTION is NOT SET in BoardConfig.mk )
-  $(warning * Please see http://tinyw.in/50tg for details.   )
-  $(warning ********************************************************************************)
-  $(error stopping)
-endif
-
-ifeq ($(TW_CUSTOM_THEME),)
-  ifeq "$(wildcard $(commands_recovery_local_path)/gui/devices/$(DEVICE_RESOLUTION))" ""
-    $(warning ********************************************************************************)
-    $(warning * DEVICE_RESOLUTION ($(DEVICE_RESOLUTION)) does NOT EXIST in $(commands_recovery_local_path)/gui/devices )
-    $(warning * Please choose an existing theme or create a new one for your device. )
-    $(warning ********************************************************************************)
-    $(error stopping)
-  endif
+    LOCAL_CFLAGS += -DTW_ROUND_SCREEN
 endif
 
 LOCAL_C_INCLUDES += bionic external/stlport/stlport $(commands_recovery_local_path)/gui/devices/$(DEVICE_RESOLUTION)
@@ -100,32 +82,64 @@
 TWRP_COMMON_XML := $(hide) echo "No common TWRP XML resources"
 
 ifeq ($(TW_CUSTOM_THEME),)
-	PORTRAIT := 320x480 480x800 480x854 540x960 720x1280 800x1280 1080x1920 1200x1920 1440x2560 1600x2560
-	LANDSCAPE := 800x480 1024x600 1024x768 1280x800 1920x1200 2560x1600
-	WATCH := 240x240 280x280 320x320
-	TWRP_THEME_LOC := $(commands_recovery_local_path)/gui/devices/$(DEVICE_RESOLUTION)/res
-	ifneq ($(filter $(DEVICE_RESOLUTION), $(PORTRAIT)),)
-		TWRP_COMMON_XML := cp -fr $(commands_recovery_local_path)/gui/devices/portrait/res/* $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH)
-	else ifneq ($(filter $(DEVICE_RESOLUTION), $(LANDSCAPE)),)
-		TWRP_COMMON_XML := cp -fr $(commands_recovery_local_path)/gui/devices/landscape/res/* $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH)
-	else ifneq ($(filter $(DEVICE_RESOLUTION), $(WATCH)),)
-		TWRP_COMMON_XML := cp -fr $(commands_recovery_local_path)/gui/devices/watch/res/* $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH)
-	endif
+    ifeq ($(TW_THEME),)
+        # This converts the old DEVICE_RESOLUTION flag to the new TW_THEME flag
+        PORTRAIT_MDPI := 320x480 480x800 480x854 540x960
+        PORTRAIT_HDPI := 720x1280 800x1280 1080x1920 1200x1920 1440x2560 1600x2560
+        WATCH_MDPI := 240x240 280x280 320x320
+        LANDSCAPE_MDPI := 800x480 1024x600 1024x768
+        LANDSCAPE_HDPI := 1280x800 1920x1200 2560x1600
+        ifneq ($(filter $(DEVICE_RESOLUTION), $(PORTRAIT_MDPI)),)
+            TW_THEME := portrait_mdpi
+        else ifneq ($(filter $(DEVICE_RESOLUTION), $(PORTRAIT_HDPI)),)
+            TW_THEME := portrait_hdpi
+        else ifneq ($(filter $(DEVICE_RESOLUTION), $(WATCH_MDPI)),)
+            TW_THEME := watch_mdpi
+        else ifneq ($(filter $(DEVICE_RESOLUTION), $(LANDSCAPE_MDPI)),)
+            TW_THEME := landscape_mdpi
+        else ifneq ($(filter $(DEVICE_RESOLUTION), $(LANDSCAPE_HDPI)),)
+            TW_THEME := landscape_hdpi
+        endif
+    endif
+    ifeq ($(TW_THEME), portrait_mdpi)
+        TWRP_THEME_LOC := $(commands_recovery_local_path)/gui/devices/480x800/res
+        TWRP_COMMON_XML := cp -fr $(commands_recovery_local_path)/gui/devices/portrait/res/* $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH)
+    else ifeq ($(TW_THEME), portrait_hdpi)
+        TWRP_THEME_LOC := $(commands_recovery_local_path)/gui/devices/1080x1920/res
+        TWRP_COMMON_XML := cp -fr $(commands_recovery_local_path)/gui/devices/portrait/res/* $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH)
+    else ifeq ($(TW_THEME), watch_mdpi)
+        TWRP_THEME_LOC := $(commands_recovery_local_path)/gui/devices/320x320/res
+        TWRP_COMMON_XML := cp -fr $(commands_recovery_local_path)/gui/devices/watch/res/* $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH)
+    else ifeq ($(TW_THEME), landscape_mdpi)
+        TWRP_THEME_LOC := $(commands_recovery_local_path)/gui/devices/800x480/res
+        TWRP_COMMON_XML := cp -fr $(commands_recovery_local_path)/gui/devices/landscape/res/* $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH)
+    else ifeq ($(TW_THEME), landscape_hdpi)
+        TWRP_THEME_LOC := $(commands_recovery_local_path)/gui/devices/1920x1200/res
+        TWRP_COMMON_XML := cp -fr $(commands_recovery_local_path)/gui/devices/landscape/res/* $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH)
+    else
+        $(warning ****************************************************************************)
+        $(warning * TW_THEME ($(TW_THEME)) is not valid.)
+        $(warning * Please choose an appropriate TW_THEME or create a new one for your device.)
+        $(warning * Valid options are portrait_mdpi portrait_hdpi watch_mdpi)
+        $(warning *                   landscape_mdpi landscape_hdpi)
+        $(warning ****************************************************************************)
+        $(error stopping)
+    endif
 else
-	TWRP_THEME_LOC := $(TW_CUSTOM_THEME)
+    TWRP_THEME_LOC := $(TW_CUSTOM_THEME)
 endif
 
 ifeq ($(TW_DISABLE_TTF), true)
-	TWRP_REMOVE_FONT := rm -f $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH)fonts/*.ttf
+    TWRP_REMOVE_FONT := rm -f $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH)fonts/*.ttf
 else
-	TWRP_REMOVE_FONT := rm -f $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH)fonts/*.dat
+    TWRP_REMOVE_FONT := rm -f $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH)fonts/*.dat
 endif
 
 TWRP_RES_GEN := $(intermediates)/twrp
 ifneq ($(TW_USE_TOOLBOX), true)
-	TWRP_SH_TARGET := /sbin/busybox
+    TWRP_SH_TARGET := /sbin/busybox
 else
-	TWRP_SH_TARGET := /sbin/mksh
+    TWRP_SH_TARGET := /sbin/mksh
 endif
 
 $(TWRP_RES_GEN):
diff --git a/gui/console.cpp b/gui/console.cpp
index b1b025c..1544d77 100644
--- a/gui/console.cpp
+++ b/gui/console.cpp
@@ -130,7 +130,7 @@
 		{
 			mSlideout = 1;
 			mSlideoutState = hidden;
-			LoadPlacement(child, &mSlideoutX, &mSlideoutY);
+			LoadPlacement(child, &mSlideoutX, &mSlideoutY, &mSlideoutW, &mSlideoutH, &mPlacement);
 
 			mSlideoutImage = LoadAttrImage(child, "resource");
 
@@ -138,6 +138,12 @@
 			{
 				mSlideoutW = mSlideoutImage->GetWidth();
 				mSlideoutH = mSlideoutImage->GetHeight();
+				if (mPlacement == CENTER || mPlacement == CENTER_X_ONLY) {
+					mSlideoutX = mSlideoutX - (mSlideoutW / 2);
+					if (mPlacement == CENTER) {
+						mSlideoutY = mSlideoutY - (mSlideoutH / 2);
+					}
+				}
 			}
 		}
 	}
diff --git a/gui/devices/1024x600/res/fonts/Roboto-Regular-20.dat b/gui/devices/1024x600/res/fonts/Roboto-Regular-20.dat
deleted file mode 100755
index 6588b41..0000000
--- a/gui/devices/1024x600/res/fonts/Roboto-Regular-20.dat
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x600/res/images/back-icon.png b/gui/devices/1024x600/res/images/back-icon.png
deleted file mode 100644
index 1096c90..0000000
--- a/gui/devices/1024x600/res/images/back-icon.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x600/res/images/background.jpg b/gui/devices/1024x600/res/images/background.jpg
deleted file mode 100644
index 2ac48e0..0000000
--- a/gui/devices/1024x600/res/images/background.jpg
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x600/res/images/button.png b/gui/devices/1024x600/res/images/button.png
deleted file mode 100644
index 6ae29ae..0000000
--- a/gui/devices/1024x600/res/images/button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x600/res/images/checkbox_checked.png b/gui/devices/1024x600/res/images/checkbox_checked.png
deleted file mode 100644
index 3447349..0000000
--- a/gui/devices/1024x600/res/images/checkbox_checked.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x600/res/images/checkbox_empty.png b/gui/devices/1024x600/res/images/checkbox_empty.png
deleted file mode 100644
index f5f35d8..0000000
--- a/gui/devices/1024x600/res/images/checkbox_empty.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x600/res/images/console-icon.png b/gui/devices/1024x600/res/images/console-icon.png
deleted file mode 100644
index 91a727d..0000000
--- a/gui/devices/1024x600/res/images/console-icon.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x600/res/images/console-toggle.png b/gui/devices/1024x600/res/images/console-toggle.png
deleted file mode 100644
index 963b9fd..0000000
--- a/gui/devices/1024x600/res/images/console-toggle.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x600/res/images/cursor.png b/gui/devices/1024x600/res/images/cursor.png
deleted file mode 100644
index 32c8ae1..0000000
--- a/gui/devices/1024x600/res/images/cursor.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x600/res/images/curtain.jpg b/gui/devices/1024x600/res/images/curtain.jpg
deleted file mode 100644
index bb66e99..0000000
--- a/gui/devices/1024x600/res/images/curtain.jpg
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x600/res/images/file.png b/gui/devices/1024x600/res/images/file.png
deleted file mode 100644
index 8556bc7..0000000
--- a/gui/devices/1024x600/res/images/file.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x600/res/images/folder.png b/gui/devices/1024x600/res/images/folder.png
deleted file mode 100644
index a3a5f69..0000000
--- a/gui/devices/1024x600/res/images/folder.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x600/res/images/home-icon.png b/gui/devices/1024x600/res/images/home-icon.png
deleted file mode 100644
index e42d774..0000000
--- a/gui/devices/1024x600/res/images/home-icon.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x600/res/images/indeterminate001.png b/gui/devices/1024x600/res/images/indeterminate001.png
deleted file mode 100755
index e6fa1c5..0000000
--- a/gui/devices/1024x600/res/images/indeterminate001.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x600/res/images/indeterminate002.png b/gui/devices/1024x600/res/images/indeterminate002.png
deleted file mode 100755
index e1fceab..0000000
--- a/gui/devices/1024x600/res/images/indeterminate002.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x600/res/images/indeterminate003.png b/gui/devices/1024x600/res/images/indeterminate003.png
deleted file mode 100755
index 6702867..0000000
--- a/gui/devices/1024x600/res/images/indeterminate003.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x600/res/images/indeterminate004.png b/gui/devices/1024x600/res/images/indeterminate004.png
deleted file mode 100755
index ff65e09..0000000
--- a/gui/devices/1024x600/res/images/indeterminate004.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x600/res/images/indeterminate005.png b/gui/devices/1024x600/res/images/indeterminate005.png
deleted file mode 100755
index e61e2cc..0000000
--- a/gui/devices/1024x600/res/images/indeterminate005.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x600/res/images/indeterminate006.png b/gui/devices/1024x600/res/images/indeterminate006.png
deleted file mode 100755
index c9c21ba..0000000
--- a/gui/devices/1024x600/res/images/indeterminate006.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x600/res/images/keyboard1.png b/gui/devices/1024x600/res/images/keyboard1.png
deleted file mode 100644
index c2aa0a0..0000000
--- a/gui/devices/1024x600/res/images/keyboard1.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x600/res/images/keyboard2.png b/gui/devices/1024x600/res/images/keyboard2.png
deleted file mode 100644
index 8851145..0000000
--- a/gui/devices/1024x600/res/images/keyboard2.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x600/res/images/keyboard3.png b/gui/devices/1024x600/res/images/keyboard3.png
deleted file mode 100644
index 5c99fad..0000000
--- a/gui/devices/1024x600/res/images/keyboard3.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x600/res/images/keyboard4.png b/gui/devices/1024x600/res/images/keyboard4.png
deleted file mode 100644
index 30bae14..0000000
--- a/gui/devices/1024x600/res/images/keyboard4.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x600/res/images/medium-button.png b/gui/devices/1024x600/res/images/medium-button.png
deleted file mode 100644
index 77dc540..0000000
--- a/gui/devices/1024x600/res/images/medium-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x600/res/images/mediumwide-button.png b/gui/devices/1024x600/res/images/mediumwide-button.png
deleted file mode 100644
index b2b7d4d..0000000
--- a/gui/devices/1024x600/res/images/mediumwide-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x600/res/images/minus-button.png b/gui/devices/1024x600/res/images/minus-button.png
deleted file mode 100644
index 5a49c75..0000000
--- a/gui/devices/1024x600/res/images/minus-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x600/res/images/plus-button.png b/gui/devices/1024x600/res/images/plus-button.png
deleted file mode 100644
index da1326c..0000000
--- a/gui/devices/1024x600/res/images/plus-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x600/res/images/progress_empty.png b/gui/devices/1024x600/res/images/progress_empty.png
deleted file mode 100644
index b853710..0000000
--- a/gui/devices/1024x600/res/images/progress_empty.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x600/res/images/progress_fill.png b/gui/devices/1024x600/res/images/progress_fill.png
deleted file mode 100644
index 669c6ef..0000000
--- a/gui/devices/1024x600/res/images/progress_fill.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x600/res/images/radio_empty.png b/gui/devices/1024x600/res/images/radio_empty.png
deleted file mode 100644
index 88d1c1f..0000000
--- a/gui/devices/1024x600/res/images/radio_empty.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x600/res/images/radio_selected.png b/gui/devices/1024x600/res/images/radio_selected.png
deleted file mode 100644
index 864065d..0000000
--- a/gui/devices/1024x600/res/images/radio_selected.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x600/res/images/slider-touch.png b/gui/devices/1024x600/res/images/slider-touch.png
deleted file mode 100644
index d8647b8..0000000
--- a/gui/devices/1024x600/res/images/slider-touch.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x600/res/images/slider-used.png b/gui/devices/1024x600/res/images/slider-used.png
deleted file mode 100644
index bf6cad9..0000000
--- a/gui/devices/1024x600/res/images/slider-used.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x600/res/images/slider.png b/gui/devices/1024x600/res/images/slider.png
deleted file mode 100644
index 4081ea5..0000000
--- a/gui/devices/1024x600/res/images/slider.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x600/res/images/sort-button.png b/gui/devices/1024x600/res/images/sort-button.png
deleted file mode 100644
index 13ab929..0000000
--- a/gui/devices/1024x600/res/images/sort-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x600/res/images/unlock.png b/gui/devices/1024x600/res/images/unlock.png
deleted file mode 100644
index 9041221..0000000
--- a/gui/devices/1024x600/res/images/unlock.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x600/res/ui.xml b/gui/devices/1024x600/res/ui.xml
deleted file mode 100644
index 0d09750..0000000
--- a/gui/devices/1024x600/res/ui.xml
+++ /dev/null
@@ -1,441 +0,0 @@
-<?xml version="1.0"?>
-
-<recovery>
-	<details>
-		<resolution width="1024" height="600" />
-		<author>TeamWin</author>
-		<title>Backup Naowz</title>
-		<description>Default basic theme</description>
-		<preview>preview.jpg</preview>
-	</details>
-
-	<include>
-		<xmlfile name="landscape.xml" />
-	</include>
-
-	<resources>
-		<resource name="font" type="font" filename="RobotoCondensed-Regular.ttf" size="20" fallback="Roboto-Regular-20" />
-		<resource name="base" type="image" filename="background.jpg" />
-		<resource name="main_button" type="image" filename="button" />
-		<resource name="file_icon" type="image" filename="file" />
-		<resource name="folder_icon" type="image" filename="folder" />
-		<resource name="progress" type="animation" filename="indeterminate" />
-		<resource name="progress_empty" type="image" filename="progress_empty" />
-		<resource name="progress_full" type="image" filename="progress_fill" />
-		<resource name="checkbox_false" type="image" filename="checkbox_empty" retainaspect="1" />
-		<resource name="checkbox_true" type="image" filename="checkbox_checked" retainaspect="1" />
-		<resource name="radio_false" type="image" filename="radio_empty" retainaspect="1" />
-		<resource name="radio_true" type="image" filename="radio_selected" retainaspect="1" />
-		<resource name="medium_button" type="image" filename="medium-button" />
-		<resource name="mediumwide_button" type="image" filename="mediumwide-button" />
-		<resource name="sort_button" type="image" filename="sort-button" />
-		<resource name="minus_button" type="image" filename="minus-button" />
-		<resource name="plus_button" type="image" filename="plus-button" />
-		<resource name="home_icon" type="image" filename="home-icon" />
-		<resource name="back_icon" type="image" filename="back-icon" />
-		<resource name="console_button" type="image" filename="console-toggle" />
-		<resource name="slider" type="image" filename="slider" />
-		<resource name="slider-used" type="image" filename="slider-used" />
-		<resource name="slider-touch" type="image" filename="slider-touch" />
-		<resource name="unlock-icon" type="image" filename="unlock" />
-		<resource name="keyboard1" type="image" filename="keyboard1" />
-		<resource name="keyboard2" type="image" filename="keyboard2" />
-		<resource name="keyboard3" type="image" filename="keyboard3" />
-		<resource name="keyboard4" type="image" filename="keyboard4" />
-		<resource name="cursor" type="image" filename="cursor" retainaspect="1" />
-	</resources>
-
-	<variables>
-		<variable name="col1_x" value="23" />
-		<variable name="col2_x" value="269" />
-		<variable name="col3_x" value="515" />
-		<variable name="col4_x" value="761" />
-		<variable name="row1_y" value="127" />
-		<variable name="row2_y" value="388" />
-		<variable name="col_center_x" value="392" />
-		<variable name="center_x" value="512" />
-		<variable name="screen_width" value="1024" />
-		<variable name="screen_height" value="600" />
-		<variable name="col_progressbar_x" value="386" />
-		<variable name="row_progressbar_y" value="540" />
-		<variable name="col1_medium_x" value="257" />
-		<variable name="col2_medium_x" value="387" />
-		<variable name="col3_medium_x" value="517" />
-		<variable name="col4_medium_x" value="647" />
-		<variable name="row1_medium_y" value="105" />
-		<variable name="row2_medium_y" value="200" />
-		<variable name="row3_medium_y" value="245" />
-		<variable name="row4_medium_y" value="440" />
-		<variable name="row5_medium_y" value="405" />
-		<variable name="row1_text_y" value="58" />
-		<variable name="row2_text_y" value="105" />
-		<variable name="row3_text_y" value="140" />
-		<variable name="row4_text_y" value="170" />
-		<variable name="row5_text_y" value="200" />
-		<variable name="row6_text_y" value="230" />
-		<variable name="row7_text_y" value="260" />
-		<variable name="row8_text_y" value="290" />
-		<variable name="row9_text_y" value="320" />
-		<variable name="row10_text_y" value="350" />
-		<variable name="row11_text_y" value="380" />
-		<variable name="row12_text_y" value="410" />
-		<variable name="row13_text_y" value="440" />
-		<variable name="row14_text_y" value="470" />
-		<variable name="row15_text_y" value="500" />
-		<variable name="row16_text_y" value="530" />
-		<variable name="row17_text_y" value="560" />
-		<variable name="row18_text_y" value="590" />
-		<variable name="row_offsetmedium_y" value="465" />
-		<variable name="home_button_x" value="813" />
-		<variable name="home_button_y" value="5" />
-		<variable name="back_button_x" value="883" />
-		<variable name="back_button_y" value="5" />
-		<variable name="console_button_x" value="953" />
-		<variable name="console_button_y" value="5" />
-		<variable name="nandcheck_col1" value="150" />
-		<variable name="nandcheck_col2" value="450" />
-		<variable name="nandcheck_row1" value="150" />
-		<variable name="nandcheck_row2" value="195" />
-		<variable name="nandcheck_row3" value="240" />
-		<variable name="nandcheck_row4" value="285" />
-		<variable name="nandcheck_row5" value="330" />
-		<variable name="nandcheck_row6" value="375" />
-		<variable name="nandcheck_row7" value="410" />
-		<variable name="nandcheck_row8" value="445" />
-		<variable name="button_text_color" value="#AAAAAA" />
-		<variable name="text_color" value="#A0A0A0" />
-		<variable name="text_success_color" value="#33B5E5" />
-		<variable name="text_fail_color" value="#FF0101" />
-		<variable name="highlight_color" value="#90909080" />
-		<variable name="caps_highlight_color" value="#33B5E580" />
-		<variable name="slider_x" value="307" />
-		<variable name="slider_y" value="470" />
-		<variable name="slider_text_y" value="520" />
-		<variable name="sort_text_x" value="270" />
-		<variable name="sort_asc_text_y" value="510" />
-		<variable name="sort_asc_button_y" value="505" />
-		<variable name="sort_desc_text_y" value="545" />
-		<variable name="sort_desc_button_y" value="542" />
-		<variable name="sort_col1_button_x" value="440" />
-		<variable name="sort_col2_button_x" value="510" />
-		<variable name="sort_col3_button_x" value="580" />
-		<variable name="col1_sdext_x" value="370" />
-		<variable name="col2_sdext_x" value="600" />
-		<variable name="row1_sdext_y" value="115" />
-		<variable name="row2_sdext_y" value="180" />
-		<variable name="row_extsize_y" value="115" />
-		<variable name="row_swapsize_y" value="180" />
-		<variable name="input_x" value="28" />
-		<variable name="input_width" value="944" />
-		<variable name="input_height" value="30" />
-		<variable name="input_background_color" value="#303030" />
-		<variable name="input_cursor_color" value="#33B5E5" />
-		<variable name="input_cursor_width" value="3" />
-		<variable name="console_x" value="25" />
-		<variable name="console_width" value="974" />
-		<variable name="console_foreground" value="#A0A0A0" />
-		<variable name="warning" value="#F8F8A0" />
-		<variable name="error" value="#FF4040" />
-		<variable name="highlight" value="#33B5E5" />
-		<variable name="console_background" value="#303030" />
-		<variable name="console_scroll" value="#303030" />
-		<variable name="console_action_height" value="320" />
-		<variable name="console_install_height" value="440" />
-		<variable name="console_installdone_height" value="300" />
-		<variable name="fileselector_folder_x" value="28" />
-		<variable name="fileselector_folder_width" value="282" />
-		<variable name="fileselector_folderonly_width" value="460" />
-		<variable name="fileselector_file_x" value="317" />
-		<variable name="fileselector_file_width" value="682" />
-		<variable name="fileselector_install_y" value="120" />
-		<variable name="fileselector_install_height" value="382" />
-		<variable name="fileselector_header_background" value="#202020" />
-		<variable name="fileselector_header_textcolor" value="#AAAAAA" />
-		<variable name="fileselector_header_separatorcolor" value="#33B5E5" />
-		<variable name="fileselector_header_separatorheight" value="3" />
-		<variable name="fileselector_separatorcolor" value="#505050" />
-		<variable name="fileselector_separatorheight" value="2" />
-		<variable name="fileselector_background" value="#303030" />
-		<variable name="fileselector_highlight_color" value="#505050" />
-		<variable name="fileselector_highlight_font_color" value="#33B5E5" />
-		<variable name="fileselector_spacing" value="18" />
-		<variable name="fastscroll_linecolor" value="#50505080" />
-		<variable name="fastscroll_rectcolor" value="#33B5E580" />
-		<variable name="fastscroll_w" value="32" />
-		<variable name="fastscroll_linew" value="2" />
-		<variable name="fastscroll_rectw" value="12" />
-		<variable name="fastscroll_recth" value="22" />
-		<variable name="zipstorage_text_y" value="88" />
-		<variable name="listbox_x" value="269" />
-		<variable name="listbox_y" value="90" />
-		<variable name="listbox_width" value="460" />
-		<variable name="listbox_tz_height" value="290" />
-		<variable name="listbox_background" value="#303030" />
-		<variable name="listbox_spacing" value="18" />
-		<variable name="sd_plus_x" value="280" />
-		<variable name="lock_x" value="312" />
-		<variable name="lock_y" value="184" />
-		<variable name="filemanager_select_x" value="761" />
-		<variable name="filemanager_select_y" value="495" />
-		<variable name="backup_name_text_y" value="440" />
-		<variable name="backup_name_button_y" value="240" />
-		<variable name="col_right_x" value="996" />
-		<variable name="cancel_button_y" value="220" />
-		<variable name="terminal_console_y" value="0" />
-		<variable name="terminal_console_height" value="300" />
-		<variable name="terminal_text_y" value="307" />
-		<variable name="terminal_button_y" value="298" />
-		<variable name="terminal_input_width" value="775" />
-		<variable name="button_fill_color" value="#303030" />
-		<variable name="button_fill_full_width" value="512" />
-		<variable name="button_fill_main_width" value="486" />
-		<variable name="button_fill_main_height" value="150" />
-		<variable name="button_fill_half_height" value="50" />
-		<variable name="button_fill_quarter_height" value="30" />
-		<variable name="button_full_center_x" value="256" />
-		<variable name="flash_list_height" value="200" />
-		<variable name="backup_list_x" value="23" />
-		<variable name="backup_list_y" value="105" />
-		<variable name="backup_list_width" value="486" />
-		<variable name="backup_list_height" value="360" />
-		<variable name="backup_storage_y" value="250" />
-		<variable name="backup_encrypt_y" value="310" />
-		<variable name="restore_list_y" value="140" />
-		<variable name="restore_list_height" value="320" />
-		<variable name="mount_list_height" value="400" />
-		<variable name="mount_storage_row" value="500" />
-		<variable name="wipe_list_height" value="300" />
-		<variable name="wipe_button_y" value="190" />
-		<variable name="slidervalue_x" value="256" />
-		<variable name="slidervalue_w" value="512" />
-		<variable name="slidervalue_line_clr" value="#FFFFFF" />
-		<variable name="slidervalue_slider_clr" value="#33B5E5" />
-		<variable name="slidervalue_lineh" value="2" />
-		<variable name="slidervalue_padding" value="0" />
-		<variable name="slidervalue_sliderw" value="10" />
-		<variable name="slidervalue_sliderh" value="50" />
-	</variables>
-
-	<mousecursor>
-		<placement w="15" h="15" />
-		<background color="#FFFF00FF" resource="cursor" />
-		<speed multiplier="2" />
-	</mousecursor>
-
-	<templates>
-		<template name="header">
-			<background color="#000000FF" />
-
-			<object type="image">
-				<image resource="base" />
-				<placement x="0" y="0" />
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="200" y="5" />
-				<text>Team Win Recovery Project  v%tw_version%</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="200" y="30" />
-				<conditions>
-					<condition var1="tw_no_battery_percent" var2="0" />
-					<condition var1="tw_battery" op="&gt;" var2="0" />
-					<condition var1="tw_battery" op="&lt;" var2="101" />
-				</conditions>
-				<text>Battery Level: %tw_battery%</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="400" y="30" />
-				<text>%tw_time%</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="700" y="30" />
-				<conditions>
-					<condition var1="tw_no_cpu_temp" var2="0" />
-				</conditions>
-				<text>CPU: %tw_cpu_temp% C</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<condition var1="tw_simulate_actions" var2="1" />
-				<font resource="font" />
-				<placement x="475" y="30" />
-				<text>SIMULATING ACTIONS</text>
-			</object>
-
-			<object type="button">
-				<placement x="%home_button_x%" y="%home_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text></text>
-				<image resource="home_icon" />
-				<condition var1="tw_busy" var2="0" />
-				<action function="key">home</action>
-			</object>
-
-			<object type="button">
-				<placement x="%back_button_x%" y="%back_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text></text>
-				<image resource="back_icon" />
-				<condition var1="tw_busy" var2="0" />
-				<action function="key">back</action>
-			</object>
-
-			<object type="action">
-				<touch key="power" />
-				<action function="overlay">lock</action>
-			</object>
-
-			<object type="action">
-				<touch key="power+voldown" />
-				<action function="screenshot" />
-			</object>
-		</template>
-
-		<template name="progress_bar">
-			<object type="progressbar">
-				<placement x="%col_progressbar_x%" y="%row_progressbar_y%" />
-				<resource empty="progress_empty" full="progress_full" />
-				<data name="ui_progress" />
-			</object>
-
-			<object type="animation">
-				<placement x="%col_progressbar_x%" y="%row_progressbar_y%" />
-				<resource name="progress" />
-				<speed fps="15" render="2" />
-				<loop frame="1" />
-			</object>
-		</template>
-
-		<template name="sort_options">
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<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="font" color="%button_text_color%" />
-				<text>Name</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=1</action>
-			</object>
-
-			<object type="button">
-				<placement x="%sort_col2_button_x%" y="%sort_asc_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Date</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=2</action>
-			</object>
-
-			<object type="button">
-				<placement x="%sort_col3_button_x%" y="%sort_asc_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Size</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=3</action>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<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="font" color="%button_text_color%" />
-				<text>Name</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=-1</action>
-			</object>
-
-			<object type="button">
-				<placement x="%sort_col2_button_x%" y="%sort_desc_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Date</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=-2</action>
-			</object>
-
-			<object type="button">
-				<placement x="%sort_col3_button_x%" y="%sort_desc_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Size</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=-3</action>
-			</object>
-		</template>
-
-		<template name="flash_zip_console">
-			<object type="console">
-				<placement x="%console_x%" y="85" w="%console_width%" h="340" />
-				<color foreground="%console_foreground%" background="%console_background%" scroll="%console_scroll%" />
-				<font resource="fixed" />
-			</object>
-		</template>
-
-		<template name="action_page_console">
-			<object type="console">
-				<placement x="%console_x%" y="200" w="%console_width%" h="265" />
-				<color foreground="%console_foreground%" background="%console_background%" scroll="%console_scroll%" />
-				<font resource="fixed" />
-			</object>
-		</template>
-
-		<template name="footer">
-			<object type="console">
-				<slideout resource="console_button" x="%console_button_x%" y="%console_button_y%" />
-				<placement x="%console_x%" y="75" w="%console_width%" h="497" />
-				<color foreground="%console_foreground%" background="%console_background%" scroll="%console_scroll%" />
-				<font resource="fixed" />
-			</object>
-		</template>
-
-		<template name="keyboardtemplate">
-			<object type="keyboard">
-				<placement x="0" y="341" />
-				<layout resource1="keyboard1" resource2="keyboard2" resource3="keyboard3" resource4="keyboard4" />
-				<highlight color="%highlight_color%" />
-				<capshighlight color="%caps_highlight_color%" />
-				<layout1>
-					<keysize height="65" width="92" />
-					<row1 key01="q" long01="1" key02="w" long02="2" key03="e" long03="3" key04="r" long04="4" key05="t" long05="5" key06="y" long06="6" key07="u" long07="7" key08="i" long08="8" key09="o" long09="9" key10="p" long10="0" key11="104:c:8" />
-					<row2 key01="138:a" key02="s" key03="d" key04="f" key05="g" key06="h" key07="j" key08="k" key09="l" key10="150:action" />
-					<row3 key01="102:layout2" key02="91:z" key03="91:x" key04="91:c" key05="91:v" key06="91:b" key07="91:n" key08="91:m" key09="91:," long09="!" key10="91:." long10="?" key11="103::" long11="+" />
-					<row4 key01="132:layout3" key02="92:" key03="/" long03="@" key04="404: " key05="'" long05="92:c:34" key06="-" long06="_" />
-				</layout1>
-				<layout2>
-					<keysize height="65" width="92" capslock="0" revert_layout="1" />
-					<row1 key01="Q" long01="1" key02="W" long02="2" key03="E" long03="3" key04="R" long04="4" key05="T" long05="5" key06="Y" long06="6" key07="U" long07="7" key08="I" long08="8" key09="O" long09="9" key10="P" long10="0" key11="104:c:8" />
-					<row2 key01="138:A" key02="S" key03="D" key04="F" key05="G" key06="H" key07="J" key08="K" key09="L" key10="150:action" />
-					<row3 key01="102:layout1" key02="91:Z" key03="91:X" key04="91:C" key05="91:V" key06="91:B" key07="91:N" key08="91:M" key09="91:," long09="!" key10="91:." long10="?" key11="103::" long11="+" />
-					<row4 key01="132:layout3" key02="92:" key03="/" long03="@" key04="404: " key05="'" long05="92:c:34" key06="-" long06="_" />
-				</layout2>
-				<layout3>
-					<keysize height="65" width="92" />
-					<row1 key01="1" key02="2" key03="3" key04="4" key05="5" key06="6" key07="7" key08="8" key09="9" key10="0" key11="104:c:8" />
-					<row2 key01="138:#" key02="$" key03="%" key04="&amp;" key05="*" key06="-" key07="+" key08="(" key09=")" key10="150:action" />
-					<row3 key01="102:layout4" key02="91:&lt;" key03="91:&gt;" key04="91:=" key05="91::" key06="91:;" key07="91:," key08="91:." key09="91:!" key10="91:?" key11="103:/" />
-					<row4 key01="132:layout1" key02="92:" key03="@" key04="404: " key05="92:c:34" key06="_" />
-				</layout3>
-				<layout4>
-					<keysize height="65" width="92" />
-					<row1 key01="~" key02="`" key03="|" key04="92:" key05="92:" key06="92:" key07="92:" key08="92:" key09="92:" key10="92:" key11="104:c:8" />
-					<row2 key01="138:" key02="92:" key03="92:" key04="92:" key05="^" key06="92:" key07="92:" key08="{" key09="}" key10="150:action" />
-					<row3 key01="102:layout3" key02="91:\" key03="91:" key04="91:" key05="91:" key06="91:" key07="91:[" key08="91:]" key09="91:!" key10="91:?" />
-					<row4 key01="132:layout1" key02="92:" key03="92:" key04="404: " />
-				</layout4>
-			</object>
-		</template>
-	</templates>
-</recovery>
diff --git a/gui/devices/1024x768/res/fonts/Roboto-Regular-20.dat b/gui/devices/1024x768/res/fonts/Roboto-Regular-20.dat
deleted file mode 100755
index 6588b41..0000000
--- a/gui/devices/1024x768/res/fonts/Roboto-Regular-20.dat
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x768/res/images/back-icon.png b/gui/devices/1024x768/res/images/back-icon.png
deleted file mode 100644
index 1096c90..0000000
--- a/gui/devices/1024x768/res/images/back-icon.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x768/res/images/background.jpg b/gui/devices/1024x768/res/images/background.jpg
deleted file mode 100644
index 2ac48e0..0000000
--- a/gui/devices/1024x768/res/images/background.jpg
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x768/res/images/button.png b/gui/devices/1024x768/res/images/button.png
deleted file mode 100644
index 6ae29ae..0000000
--- a/gui/devices/1024x768/res/images/button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x768/res/images/checkbox_checked.png b/gui/devices/1024x768/res/images/checkbox_checked.png
deleted file mode 100644
index 3447349..0000000
--- a/gui/devices/1024x768/res/images/checkbox_checked.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x768/res/images/checkbox_empty.png b/gui/devices/1024x768/res/images/checkbox_empty.png
deleted file mode 100644
index f5f35d8..0000000
--- a/gui/devices/1024x768/res/images/checkbox_empty.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x768/res/images/console-icon.png b/gui/devices/1024x768/res/images/console-icon.png
deleted file mode 100644
index 91a727d..0000000
--- a/gui/devices/1024x768/res/images/console-icon.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x768/res/images/console-toggle.png b/gui/devices/1024x768/res/images/console-toggle.png
deleted file mode 100644
index 963b9fd..0000000
--- a/gui/devices/1024x768/res/images/console-toggle.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x768/res/images/cursor.png b/gui/devices/1024x768/res/images/cursor.png
deleted file mode 100644
index 32c8ae1..0000000
--- a/gui/devices/1024x768/res/images/cursor.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x768/res/images/curtain.jpg b/gui/devices/1024x768/res/images/curtain.jpg
deleted file mode 100644
index 38cc331..0000000
--- a/gui/devices/1024x768/res/images/curtain.jpg
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x768/res/images/file.png b/gui/devices/1024x768/res/images/file.png
deleted file mode 100644
index 8556bc7..0000000
--- a/gui/devices/1024x768/res/images/file.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x768/res/images/folder.png b/gui/devices/1024x768/res/images/folder.png
deleted file mode 100644
index a3a5f69..0000000
--- a/gui/devices/1024x768/res/images/folder.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x768/res/images/home-icon.png b/gui/devices/1024x768/res/images/home-icon.png
deleted file mode 100644
index e42d774..0000000
--- a/gui/devices/1024x768/res/images/home-icon.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x768/res/images/indeterminate001.png b/gui/devices/1024x768/res/images/indeterminate001.png
deleted file mode 100755
index e6fa1c5..0000000
--- a/gui/devices/1024x768/res/images/indeterminate001.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x768/res/images/indeterminate002.png b/gui/devices/1024x768/res/images/indeterminate002.png
deleted file mode 100755
index e1fceab..0000000
--- a/gui/devices/1024x768/res/images/indeterminate002.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x768/res/images/indeterminate003.png b/gui/devices/1024x768/res/images/indeterminate003.png
deleted file mode 100755
index 6702867..0000000
--- a/gui/devices/1024x768/res/images/indeterminate003.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x768/res/images/indeterminate004.png b/gui/devices/1024x768/res/images/indeterminate004.png
deleted file mode 100755
index ff65e09..0000000
--- a/gui/devices/1024x768/res/images/indeterminate004.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x768/res/images/indeterminate005.png b/gui/devices/1024x768/res/images/indeterminate005.png
deleted file mode 100755
index e61e2cc..0000000
--- a/gui/devices/1024x768/res/images/indeterminate005.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x768/res/images/indeterminate006.png b/gui/devices/1024x768/res/images/indeterminate006.png
deleted file mode 100755
index c9c21ba..0000000
--- a/gui/devices/1024x768/res/images/indeterminate006.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x768/res/images/keyboard1.png b/gui/devices/1024x768/res/images/keyboard1.png
deleted file mode 100644
index 1c262e6..0000000
--- a/gui/devices/1024x768/res/images/keyboard1.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x768/res/images/keyboard2.png b/gui/devices/1024x768/res/images/keyboard2.png
deleted file mode 100644
index 140503b..0000000
--- a/gui/devices/1024x768/res/images/keyboard2.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x768/res/images/keyboard3.png b/gui/devices/1024x768/res/images/keyboard3.png
deleted file mode 100644
index bb8f58d..0000000
--- a/gui/devices/1024x768/res/images/keyboard3.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x768/res/images/keyboard4.png b/gui/devices/1024x768/res/images/keyboard4.png
deleted file mode 100644
index f3b4445..0000000
--- a/gui/devices/1024x768/res/images/keyboard4.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x768/res/images/medium-button.png b/gui/devices/1024x768/res/images/medium-button.png
deleted file mode 100644
index 77dc540..0000000
--- a/gui/devices/1024x768/res/images/medium-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x768/res/images/mediumwide-button.png b/gui/devices/1024x768/res/images/mediumwide-button.png
deleted file mode 100644
index b2b7d4d..0000000
--- a/gui/devices/1024x768/res/images/mediumwide-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x768/res/images/minus-button.png b/gui/devices/1024x768/res/images/minus-button.png
deleted file mode 100644
index 5a49c75..0000000
--- a/gui/devices/1024x768/res/images/minus-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x768/res/images/plus-button.png b/gui/devices/1024x768/res/images/plus-button.png
deleted file mode 100644
index da1326c..0000000
--- a/gui/devices/1024x768/res/images/plus-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x768/res/images/progress_empty.png b/gui/devices/1024x768/res/images/progress_empty.png
deleted file mode 100644
index b853710..0000000
--- a/gui/devices/1024x768/res/images/progress_empty.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x768/res/images/progress_fill.png b/gui/devices/1024x768/res/images/progress_fill.png
deleted file mode 100644
index 669c6ef..0000000
--- a/gui/devices/1024x768/res/images/progress_fill.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x768/res/images/radio_empty.png b/gui/devices/1024x768/res/images/radio_empty.png
deleted file mode 100644
index 88d1c1f..0000000
--- a/gui/devices/1024x768/res/images/radio_empty.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x768/res/images/radio_selected.png b/gui/devices/1024x768/res/images/radio_selected.png
deleted file mode 100644
index 864065d..0000000
--- a/gui/devices/1024x768/res/images/radio_selected.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x768/res/images/slider-touch.png b/gui/devices/1024x768/res/images/slider-touch.png
deleted file mode 100644
index d8647b8..0000000
--- a/gui/devices/1024x768/res/images/slider-touch.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x768/res/images/slider-used.png b/gui/devices/1024x768/res/images/slider-used.png
deleted file mode 100644
index bf6cad9..0000000
--- a/gui/devices/1024x768/res/images/slider-used.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x768/res/images/slider.png b/gui/devices/1024x768/res/images/slider.png
deleted file mode 100644
index 4081ea5..0000000
--- a/gui/devices/1024x768/res/images/slider.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x768/res/images/sort-button.png b/gui/devices/1024x768/res/images/sort-button.png
deleted file mode 100644
index 13ab929..0000000
--- a/gui/devices/1024x768/res/images/sort-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x768/res/images/unlock.png b/gui/devices/1024x768/res/images/unlock.png
deleted file mode 100644
index 9041221..0000000
--- a/gui/devices/1024x768/res/images/unlock.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1024x768/res/ui.xml b/gui/devices/1024x768/res/ui.xml
deleted file mode 100644
index fbc984a..0000000
--- a/gui/devices/1024x768/res/ui.xml
+++ /dev/null
@@ -1,441 +0,0 @@
-<?xml version="1.0"?>
-
-<recovery>
-	<details>
-		<resolution width="1024" height="768" />
-		<author>TeamWin</author>
-		<title>Backup Naowz</title>
-		<description>Default basic theme</description>
-		<preview>preview.jpg</preview>
-	</details>
-
-	<include>
-		<xmlfile name="landscape.xml" />
-	</include>
-
-	<resources>
-		<resource name="font" type="font" filename="RobotoCondensed-Regular.ttf" size="20" fallback="Roboto-Regular-20" />
-		<resource name="base" type="image" filename="background.jpg" />
-		<resource name="main_button" type="image" filename="button" />
-		<resource name="file_icon" type="image" filename="file" />
-		<resource name="folder_icon" type="image" filename="folder" />
-		<resource name="progress" type="animation" filename="indeterminate" />
-		<resource name="progress_empty" type="image" filename="progress_empty" />
-		<resource name="progress_full" type="image" filename="progress_fill" />
-		<resource name="checkbox_false" type="image" filename="checkbox_empty" retainaspect="1" />
-		<resource name="checkbox_true" type="image" filename="checkbox_checked" retainaspect="1" />
-		<resource name="radio_false" type="image" filename="radio_empty" retainaspect="1" />
-		<resource name="radio_true" type="image" filename="radio_selected" retainaspect="1" />
-		<resource name="medium_button" type="image" filename="medium-button" />
-		<resource name="mediumwide_button" type="image" filename="mediumwide-button" />
-		<resource name="sort_button" type="image" filename="sort-button" />
-		<resource name="minus_button" type="image" filename="minus-button" />
-		<resource name="plus_button" type="image" filename="plus-button" />
-		<resource name="home_icon" type="image" filename="home-icon" />
-		<resource name="back_icon" type="image" filename="back-icon" />
-		<resource name="console_button" type="image" filename="console-toggle" />
-		<resource name="slider" type="image" filename="slider" />
-		<resource name="slider-used" type="image" filename="slider-used" />
-		<resource name="slider-touch" type="image" filename="slider-touch" />
-		<resource name="unlock-icon" type="image" filename="unlock" />
-		<resource name="keyboard1" type="image" filename="keyboard1" />
-		<resource name="keyboard2" type="image" filename="keyboard2" />
-		<resource name="keyboard3" type="image" filename="keyboard3" />
-		<resource name="keyboard4" type="image" filename="keyboard4" />
-		<resource name="cursor" type="image" filename="cursor" retainaspect="1" />
-	</resources>
-
-	<variables>
-		<variable name="col1_x" value="23" />
-		<variable name="col2_x" value="269" />
-		<variable name="col3_x" value="515" />
-		<variable name="col4_x" value="761" />
-		<variable name="row1_y" value="127" />
-		<variable name="row2_y" value="388" />
-		<variable name="col_center_x" value="392" />
-		<variable name="center_x" value="512" />
-		<variable name="screen_width" value="1024" />
-		<variable name="screen_height" value="768" />
-		<variable name="col_progressbar_x" value="386" />
-		<variable name="row_progressbar_y" value="700" />
-		<variable name="col1_medium_x" value="257" />
-		<variable name="col2_medium_x" value="387" />
-		<variable name="col3_medium_x" value="517" />
-		<variable name="col4_medium_x" value="647" />
-		<variable name="row1_medium_y" value="105" />
-		<variable name="row2_medium_y" value="245" />
-		<variable name="row3_medium_y" value="245" />
-		<variable name="row4_medium_y" value="450" />
-		<variable name="row5_medium_y" value="405" />
-		<variable name="row1_text_y" value="58" />
-		<variable name="row2_text_y" value="105" />
-		<variable name="row3_text_y" value="140" />
-		<variable name="row4_text_y" value="170" />
-		<variable name="row5_text_y" value="200" />
-		<variable name="row6_text_y" value="230" />
-		<variable name="row7_text_y" value="260" />
-		<variable name="row8_text_y" value="290" />
-		<variable name="row9_text_y" value="320" />
-		<variable name="row10_text_y" value="350" />
-		<variable name="row11_text_y" value="380" />
-		<variable name="row12_text_y" value="410" />
-		<variable name="row13_text_y" value="440" />
-		<variable name="row14_text_y" value="470" />
-		<variable name="row15_text_y" value="500" />
-		<variable name="row16_text_y" value="530" />
-		<variable name="row17_text_y" value="560" />
-		<variable name="row18_text_y" value="590" />
-		<variable name="row_offsetmedium_y" value="465" />
-		<variable name="home_button_x" value="813" />
-		<variable name="home_button_y" value="5" />
-		<variable name="back_button_x" value="883" />
-		<variable name="back_button_y" value="5" />
-		<variable name="console_button_x" value="953" />
-		<variable name="console_button_y" value="5" />
-		<variable name="nandcheck_col1" value="150" />
-		<variable name="nandcheck_col2" value="450" />
-		<variable name="nandcheck_row1" value="150" />
-		<variable name="nandcheck_row2" value="200" />
-		<variable name="nandcheck_row3" value="250" />
-		<variable name="nandcheck_row4" value="300" />
-		<variable name="nandcheck_row5" value="350" />
-		<variable name="nandcheck_row6" value="400" />
-		<variable name="nandcheck_row7" value="450" />
-		<variable name="nandcheck_row8" value="500" />
-		<variable name="button_text_color" value="#AAAAAA" />
-		<variable name="text_color" value="#A0A0A0" />
-		<variable name="text_success_color" value="#33B5E5" />
-		<variable name="text_fail_color" value="#FF0101" />
-		<variable name="highlight_color" value="#90909080" />
-		<variable name="caps_highlight_color" value="#33B5E580" />
-		<variable name="slider_x" value="307" />
-		<variable name="slider_y" value="600" />
-		<variable name="slider_text_y" value="650" />
-		<variable name="sort_text_x" value="270" />
-		<variable name="sort_asc_text_y" value="655" />
-		<variable name="sort_asc_button_y" value="650" />
-		<variable name="sort_desc_text_y" value="700" />
-		<variable name="sort_desc_button_y" value="695" />
-		<variable name="sort_col1_button_x" value="440" />
-		<variable name="sort_col2_button_x" value="510" />
-		<variable name="sort_col3_button_x" value="580" />
-		<variable name="col1_sdext_x" value="370" />
-		<variable name="col2_sdext_x" value="600" />
-		<variable name="row1_sdext_y" value="115" />
-		<variable name="row2_sdext_y" value="180" />
-		<variable name="row_extsize_y" value="115" />
-		<variable name="row_swapsize_y" value="180" />
-		<variable name="input_x" value="28" />
-		<variable name="input_width" value="944" />
-		<variable name="input_height" value="30" />
-		<variable name="input_background_color" value="#303030" />
-		<variable name="input_cursor_color" value="#33B5E5" />
-		<variable name="input_cursor_width" value="3" />
-		<variable name="console_x" value="25" />
-		<variable name="console_width" value="974" />
-		<variable name="console_foreground" value="#A0A0A0" />
-		<variable name="warning" value="#F8F8A0" />
-		<variable name="error" value="#FF4040" />
-		<variable name="highlight" value="#33B5E5" />
-		<variable name="console_background" value="#303030" />
-		<variable name="console_scroll" value="#303030" />
-		<variable name="console_action_height" value="320" />
-		<variable name="console_install_height" value="440" />
-		<variable name="console_installdone_height" value="300" />
-		<variable name="fileselector_folder_x" value="28" />
-		<variable name="fileselector_folder_width" value="282" />
-		<variable name="fileselector_folderonly_width" value="460" />
-		<variable name="fileselector_file_x" value="317" />
-		<variable name="fileselector_file_width" value="682" />
-		<variable name="fileselector_install_y" value="120" />
-		<variable name="fileselector_install_height" value="510" />
-		<variable name="fileselector_header_background" value="#202020" />
-		<variable name="fileselector_header_textcolor" value="#AAAAAA" />
-		<variable name="fileselector_header_separatorcolor" value="#33B5E5" />
-		<variable name="fileselector_header_separatorheight" value="3" />
-		<variable name="fileselector_separatorcolor" value="#505050" />
-		<variable name="fileselector_separatorheight" value="2" />
-		<variable name="fileselector_background" value="#303030" />
-		<variable name="fileselector_highlight_color" value="#505050" />
-		<variable name="fileselector_highlight_font_color" value="#33B5E5" />
-		<variable name="fileselector_spacing" value="18" />
-		<variable name="fastscroll_linecolor" value="#50505080" />
-		<variable name="fastscroll_rectcolor" value="#33B5E580" />
-		<variable name="fastscroll_w" value="32" />
-		<variable name="fastscroll_linew" value="2" />
-		<variable name="fastscroll_rectw" value="12" />
-		<variable name="fastscroll_recth" value="22" />
-		<variable name="zipstorage_text_y" value="88" />
-		<variable name="listbox_x" value="269" />
-		<variable name="listbox_y" value="90" />
-		<variable name="listbox_width" value="460" />
-		<variable name="listbox_tz_height" value="290" />
-		<variable name="listbox_background" value="#303030" />
-		<variable name="listbox_spacing" value="18" />
-		<variable name="sd_plus_x" value="280" />
-		<variable name="lock_x" value="312" />
-		<variable name="lock_y" value="184" />
-		<variable name="filemanager_select_x" value="761" />
-		<variable name="filemanager_select_y" value="620" />
-		<variable name="backup_name_text_y" value="440" />
-		<variable name="backup_name_button_y" value="240" />
-		<variable name="col_right_x" value="996" />
-		<variable name="cancel_button_y" value="240" />
-		<variable name="terminal_console_y" value="0" />
-		<variable name="terminal_console_height" value="362" />
-		<variable name="terminal_text_y" value="368" />
-		<variable name="terminal_button_y" value="358" />
-		<variable name="terminal_input_width" value="775" />
-		<variable name="button_fill_color" value="#303030" />
-		<variable name="button_fill_full_width" value="512" />
-		<variable name="button_fill_main_width" value="486" />
-		<variable name="button_fill_main_height" value="150" />
-		<variable name="button_fill_half_height" value="50" />
-		<variable name="button_fill_quarter_height" value="30" />
-		<variable name="button_full_center_x" value="256" />
-		<variable name="flash_list_height" value="200" />
-		<variable name="backup_list_x" value="23" />
-		<variable name="backup_list_y" value="105" />
-		<variable name="backup_list_width" value="486" />
-		<variable name="backup_list_height" value="450" />
-		<variable name="backup_storage_y" value="250" />
-		<variable name="backup_encrypt_y" value="310" />
-		<variable name="restore_list_y" value="140" />
-		<variable name="restore_list_height" value="400" />
-		<variable name="mount_list_height" value="500" />
-		<variable name="mount_storage_row" value="500" />
-		<variable name="wipe_list_height" value="400" />
-		<variable name="wipe_button_y" value="190" />
-		<variable name="slidervalue_x" value="256" />
-		<variable name="slidervalue_w" value="512" />
-		<variable name="slidervalue_line_clr" value="#FFFFFF" />
-		<variable name="slidervalue_slider_clr" value="#33B5E5" />
-		<variable name="slidervalue_lineh" value="2" />
-		<variable name="slidervalue_padding" value="0" />
-		<variable name="slidervalue_sliderw" value="10" />
-		<variable name="slidervalue_sliderh" value="50" />
-	</variables>
-
-	<mousecursor>
-		<placement w="15" h="15" />
-		<background color="#FFFF00FF" resource="cursor" />
-		<speed multiplier="2" />
-	</mousecursor>
-
-	<templates>
-		<template name="header">
-			<background color="#000000FF" />
-
-			<object type="image">
-				<image resource="base" />
-				<placement x="0" y="0" />
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="200" y="5" />
-				<text>Team Win Recovery Project  v%tw_version%</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="200" y="30" />
-				<conditions>
-					<condition var1="tw_no_battery_percent" var2="0" />
-					<condition var1="tw_battery" op="&gt;" var2="0" />
-					<condition var1="tw_battery" op="&lt;" var2="101" />
-				</conditions>
-				<text>Battery Level: %tw_battery%</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="400" y="30" />
-				<text>%tw_time%</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="700" y="30" />
-				<conditions>
-					<condition var1="tw_no_cpu_temp" var2="0" />
-				</conditions>
-				<text>CPU: %tw_cpu_temp% C</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<condition var1="tw_simulate_actions" var2="1" />
-				<font resource="font" />
-				<placement x="475" y="30" />
-				<text>SIMULATING ACTIONS</text>
-			</object>
-
-			<object type="button">
-				<placement x="%home_button_x%" y="%home_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text></text>
-				<image resource="home_icon" />
-				<condition var1="tw_busy" var2="0" />
-				<action function="key">home</action>
-			</object>
-
-			<object type="button">
-				<placement x="%back_button_x%" y="%back_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text></text>
-				<image resource="back_icon" />
-				<condition var1="tw_busy" var2="0" />
-				<action function="key">back</action>
-			</object>
-
-			<object type="action">
-				<touch key="power" />
-				<action function="overlay">lock</action>
-			</object>
-
-			<object type="action">
-				<touch key="power+voldown" />
-				<action function="screenshot" />
-			</object>
-		</template>
-
-		<template name="progress_bar">
-			<object type="progressbar">
-				<placement x="%col_progressbar_x%" y="%row_progressbar_y%" />
-				<resource empty="progress_empty" full="progress_full" />
-				<data name="ui_progress" />
-			</object>
-
-			<object type="animation">
-				<placement x="%col_progressbar_x%" y="%row_progressbar_y%" />
-				<resource name="progress" />
-				<speed fps="15" render="2" />
-				<loop frame="1" />
-			</object>
-		</template>
-
-		<template name="sort_options">
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<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="font" color="%button_text_color%" />
-				<text>Name</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=1</action>
-			</object>
-
-			<object type="button">
-				<placement x="%sort_col2_button_x%" y="%sort_asc_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Date</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=2</action>
-			</object>
-
-			<object type="button">
-				<placement x="%sort_col3_button_x%" y="%sort_asc_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Size</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=3</action>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<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="font" color="%button_text_color%" />
-				<text>Name</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=-1</action>
-			</object>
-
-			<object type="button">
-				<placement x="%sort_col2_button_x%" y="%sort_desc_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Date</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=-2</action>
-			</object>
-
-			<object type="button">
-				<placement x="%sort_col3_button_x%" y="%sort_desc_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Size</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=-3</action>
-			</object>
-		</template>
-
-		<template name="flash_zip_console">
-			<object type="console">
-				<placement x="%console_x%" y="85" w="%console_width%" h="430" />
-				<color foreground="%console_foreground%" background="%console_background%" scroll="%console_scroll%" />
-				<font resource="fixed" />
-			</object>
-		</template>
-
-		<template name="action_page_console">
-			<object type="console">
-				<placement x="%console_x%" y="200" w="%console_width%" h="380" />
-				<color foreground="%console_foreground%" background="%console_background%" scroll="%console_scroll%" />
-				<font resource="fixed" />
-			</object>
-		</template>
-
-		<template name="footer">
-			<object type="console">
-				<slideout resource="console_button" x="%console_button_x%" y="%console_button_y%" />
-				<placement x="%console_x%" y="75" w="%console_width%" h="665" />
-				<color foreground="%console_foreground%" background="%console_background%" scroll="%console_scroll%" />
-				<font resource="fixed" />
-			</object>
-		</template>
-
-		<template name="keyboardtemplate">
-			<object type="keyboard">
-				<placement x="0" y="408" />
-				<layout resource1="keyboard1" resource2="keyboard2" resource3="keyboard3" resource4="keyboard4" />
-				<highlight color="%highlight_color%" />
-				<capshighlight color="%caps_highlight_color%" />
-				<layout1>
-					<keysize height="90" width="85" />
-					<row1 key01="80:" key02="q" long02="1" key03="w" long03="2" key04="e" long04="3" key05="r" long05="4" key06="t" long06="5" key07="y" long07="6" key08="u" long08="7" key09="i" long09="8" key10="o" long10="9" key11="p" long11="0" key12="94:c:8" />
-					<row2 key01="115:layout3" key02="83:a" key03="83:s" key04="83:d" key05="83:f" key06="83:g" key07="83:h" key08="83:j" key09="83:k" key10="83:l" key11="162:action" />
-					<row3 key01="140:layout2" key02="82:z" key03="82:x" key04="82:c" key05="82:v" key06="82:b" key07="82:n" key08="82:m" key09="82:," long09="!" key10="82:." long10="?" key11="144:layout2" />
-					<row4 key01="320:" key02="385: " key03="80:/" long03=":" key04="80:-" long04="_" />
-				</layout1>
-				<layout2>
-					<keysize height="90" width="85" capslock="0" revert_layout="1" />
-					<row1 key01="80:" key02="Q" long02="1" key03="W" long03="2" key04="E" long04="3" key05="R" long05="4" key06="T" long06="5" key07="Y" long07="6" key08="U" long08="7" key09="I" long09="8" key10="O" long10="9" key11="P" long11="0" key12="94:c:8" />
-					<row2 key01="115:layout3" key02="83:A" key03="83:S" key04="83:D" key05="83:F" key06="83:G" key07="83:H" key08="83:J" key09="83:K" key10="83:L" key11="162:action" />
-					<row3 key01="140:layout1" key02="82:Z" key03="82:X" key04="82:C" key05="82:V" key06="82:B" key07="82:N" key08="82:M" key09="82:," long09="!" key10="82:." long10="?" key11="144:layout1" />
-					<row4 key01="320:" key02="385: " key03="80:/" long03=":" key04="80:-" long04="_" />
-				</layout2>
-				<layout3>
-					<keysize height="90" width="85" />
-					<row1 key01="80:" key02="1" key03="2" key04="3" key05="4" key06="5" key07="6" key08="7" key09="8" key10="9" key11="0" key12="94:c:8" />
-					<row2 key01="115:layout1" key02="83:#" key03="83:$" key04="83:%" key05="83:&amp;" key06="83:*" key07="83:-" key08="83:+" key09="83:(" key10="83:)" key11="162:action" />
-					<row3 key01="140:layout4" key02="82:&lt;" key03="82:&gt;" key04="82:=" key05="82:'" key06="82:;" key07="82:," key08="82:." key09="82:!" key10="82:?" key11="144:layout4" />
-					<row4 key01="155:" key02="85:/" key03="85:@" key04="385: " key05="80:c:34" key06="_" />
-				</layout3>
-				<layout4>
-					<keysize height="90" width="85" />
-					<row1 key01="80:" key02="~" key03="`" key04="|" key05="85:" key06="85:" key07="85:" key08="85:" key09="85:" key10="85:" key11="85:" key12="94:c:8" />
-					<row2 key01="115:layout1" key02="83:" key03="83:" key04="83:" key05="83:" key06="83:^" key07="83:" key08="83:" key09="83:{" key10="83:}" key11="162:action" />
-					<row3 key01="140:layout3" key02="82:\" key03="82:" key04="82:" key05="82:" key06="82:" key07="82:[" key08="82:]" key09="82:!" key10="82:?" key11="144:layout3" />
-					<row4 key01="320:" key02="385: " />
-				</layout4>
-			</object>
-		</template>
-	</templates>
-</recovery>
diff --git a/gui/devices/1080x1920/res/images/top-bar.jpg b/gui/devices/1080x1920/res/images/top-bar.jpg
deleted file mode 100644
index 5121a03..0000000
--- a/gui/devices/1080x1920/res/images/top-bar.jpg
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1080x1920/res/images/twrplogo.png b/gui/devices/1080x1920/res/images/twrplogo.png
new file mode 100644
index 0000000..16b1b2a
--- /dev/null
+++ b/gui/devices/1080x1920/res/images/twrplogo.png
Binary files differ
diff --git a/gui/devices/1080x1920/res/ui.xml b/gui/devices/1080x1920/res/ui.xml
index 84f2c5e..e480fec 100644
--- a/gui/devices/1080x1920/res/ui.xml
+++ b/gui/devices/1080x1920/res/ui.xml
@@ -17,11 +17,11 @@
 		<resource name="font" type="font" filename="RobotoCondensed-Regular.ttf" size="40" fallback="Roboto-Condensed-40" />
 		<resource name="mediumfont" type="font" filename="RobotoCondensed-Regular.ttf" size="40" fallback="Roboto-Condensed-40" />
 		<resource name="filelist" type="font" filename="RobotoCondensed-Regular.ttf" size="40" fallback="Roboto-Condensed-40" />
-		<resource name="top_bar" type="image" filename="top-bar.jpg" />
+		<resource name="twrplogo" type="image" filename="twrplogo" retainaspect="1" />
 		<resource name="main_button" type="image" filename="menu-button" />
-		<resource name="file_icon" type="image" filename="file" />
-		<resource name="folder_icon" type="image" filename="folder" />
-		<resource name="slideout" type="image" filename="slideout" />
+		<resource name="file_icon" type="image" filename="file" retainaspect="1" />
+		<resource name="folder_icon" type="image" filename="folder" retainaspect="1" />
+		<resource name="slideout" type="image" filename="slideout" retainaspect="1" />
 		<resource name="progress" type="animation" filename="indeterminate" />
 		<resource name="progress_empty" type="image" filename="progress_empty" />
 		<resource name="progress_full" type="image" filename="progress_fill" />
@@ -33,12 +33,12 @@
 		<resource name="sort_button" type="image" filename="sort-button" />
 		<resource name="minus_button" type="image" filename="minus-button" />
 		<resource name="plus_button" type="image" filename="plus-button" />
-		<resource name="home_icon" type="image" filename="home-icon" />
-		<resource name="back_icon" type="image" filename="back-icon" />
-		<resource name="slider" type="image" filename="slider" />
-		<resource name="slider-used" type="image" filename="slider-used" />
-		<resource name="slider-touch" type="image" filename="slider-touch" />
-		<resource name="unlock-icon" type="image" filename="unlock" />
+		<resource name="home_icon" type="image" filename="home-icon" retainaspect="1" />
+		<resource name="back_icon" type="image" filename="back-icon" retainaspect="1" />
+		<resource name="slider" type="image" filename="slider" retainaspect="1" />
+		<resource name="slider-used" type="image" filename="slider-used" retainaspect="1" />
+		<resource name="slider-touch" type="image" filename="slider-touch" retainaspect="1" />
+		<resource name="unlock-icon" type="image" filename="unlock" retainaspect="1" />
 		<resource name="keyboard1" type="image" filename="keyboard1" />
 		<resource name="keyboard2" type="image" filename="keyboard2" />
 		<resource name="keyboard3" type="image" filename="keyboard3" />
@@ -98,7 +98,6 @@
 		<variable name="row5_medium_y" value="795" />
 		<variable name="row6_medium_y" value="1260" />
 		<variable name="row7_medium_y" value="730" />
-		<variable name="slider_x" value="101" />
 		<variable name="slider_y" value="1575" />
 		<variable name="slider_text_y" value="1676" />
 		<variable name="button_text_color" value="#AAAAAA" />
@@ -109,7 +108,7 @@
 		<variable name="caps_highlight_color" value="#33B5E580" />
 		<variable name="home_button_x" value="10" />
 		<variable name="home_button_y" value="1839" />
-		<variable name="back_button_x" value="944" />
+		<variable name="back_button_x" value="1070" />
 		<variable name="back_button_y" value="1839" />
 		<variable name="sort_text_x" value="10" />
 		<variable name="sort_asc_text_y" value="1635" />
@@ -167,8 +166,7 @@
 		<variable name="sdswap_text_y" value="405" />
 		<variable name="sdfilesystem_text_y" value="510" />
 		<variable name="sdfilesystem_button_y" value="570" />
-		<variable name="lock_x" value="240" />
-		<variable name="lock_y" value="600" />
+		<variable name="lock_y" value="700" />
 		<variable name="filemanager_select_x" value="840" />
 		<variable name="filemanager_select_y" value="1620" />
 		<variable name="backup_name_y" value="825" />
@@ -212,9 +210,17 @@
 		<template name="header">
 			<background color="#000000FF" />
 
+			<object type="fill" color="%button_fill_color%">
+				<placement x="0" y="0" w="1080" h="176" />
+			</object>
+
+			<object type="fill" color="%highlight%">
+				<placement x="0" y="176" w="1080" h="4" />
+			</object>
+
 			<object type="image">
-				<image resource="top_bar" />
-				<placement x="0" y="0" />
+				<image resource="twrplogo" />
+				<placement x="85" y="85" placement="4" />
 			</object>
 
 			<object type="text" color="%text_color%">
@@ -268,7 +274,7 @@
 
 			<object type="button">
 				<highlight color="%highlight_color%" />
-				<placement x="%back_button_x%" y="%back_button_y%" />
+				<placement x="%back_button_x%" y="%back_button_y%" placement="1" />
 				<font resource="font" color="%button_text_color%" />
 				<text></text>
 				<image resource="back_icon" />
@@ -380,7 +386,7 @@
 
 		<template name="footer">
 			<object type="console">
-				<slideout resource="slideout" x="500" y="1841" />
+				<slideout resource="slideout" x="%center_x%" y="1841" placement="5" />
 				<placement x="%console_x%" y="0" w="%console_width%" h="1841" />
 				<color foreground="%console_foreground%" background="%console_background%" scroll="%console_scroll%" />
 				<font resource="fixed" />
diff --git a/gui/devices/1200x1920/res/fonts/Roboto-Condensed-40.dat b/gui/devices/1200x1920/res/fonts/Roboto-Condensed-40.dat
deleted file mode 100644
index ff23add..0000000
--- a/gui/devices/1200x1920/res/fonts/Roboto-Condensed-40.dat
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1200x1920/res/images/back-icon.png b/gui/devices/1200x1920/res/images/back-icon.png
deleted file mode 100644
index 85c6a5d..0000000
--- a/gui/devices/1200x1920/res/images/back-icon.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1200x1920/res/images/checkbox_checked.png b/gui/devices/1200x1920/res/images/checkbox_checked.png
deleted file mode 100644
index 65d0b34..0000000
--- a/gui/devices/1200x1920/res/images/checkbox_checked.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1200x1920/res/images/checkbox_empty.png b/gui/devices/1200x1920/res/images/checkbox_empty.png
deleted file mode 100644
index 89b4c96..0000000
--- a/gui/devices/1200x1920/res/images/checkbox_empty.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1200x1920/res/images/cursor.png b/gui/devices/1200x1920/res/images/cursor.png
deleted file mode 100644
index 32c8ae1..0000000
--- a/gui/devices/1200x1920/res/images/cursor.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1200x1920/res/images/curtain.jpg b/gui/devices/1200x1920/res/images/curtain.jpg
deleted file mode 100644
index d2160ab..0000000
--- a/gui/devices/1200x1920/res/images/curtain.jpg
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1200x1920/res/images/file.png b/gui/devices/1200x1920/res/images/file.png
deleted file mode 100644
index a69b619..0000000
--- a/gui/devices/1200x1920/res/images/file.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1200x1920/res/images/folder.png b/gui/devices/1200x1920/res/images/folder.png
deleted file mode 100644
index fbea7a9..0000000
--- a/gui/devices/1200x1920/res/images/folder.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1200x1920/res/images/home-icon.png b/gui/devices/1200x1920/res/images/home-icon.png
deleted file mode 100644
index d6bc73d..0000000
--- a/gui/devices/1200x1920/res/images/home-icon.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1200x1920/res/images/indeterminate001.png b/gui/devices/1200x1920/res/images/indeterminate001.png
deleted file mode 100644
index a205e91..0000000
--- a/gui/devices/1200x1920/res/images/indeterminate001.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1200x1920/res/images/indeterminate002.png b/gui/devices/1200x1920/res/images/indeterminate002.png
deleted file mode 100644
index f777408..0000000
--- a/gui/devices/1200x1920/res/images/indeterminate002.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1200x1920/res/images/indeterminate003.png b/gui/devices/1200x1920/res/images/indeterminate003.png
deleted file mode 100644
index cbb5974..0000000
--- a/gui/devices/1200x1920/res/images/indeterminate003.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1200x1920/res/images/indeterminate004.png b/gui/devices/1200x1920/res/images/indeterminate004.png
deleted file mode 100644
index 5ff7734..0000000
--- a/gui/devices/1200x1920/res/images/indeterminate004.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1200x1920/res/images/indeterminate005.png b/gui/devices/1200x1920/res/images/indeterminate005.png
deleted file mode 100644
index 7cc9abb..0000000
--- a/gui/devices/1200x1920/res/images/indeterminate005.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1200x1920/res/images/indeterminate006.png b/gui/devices/1200x1920/res/images/indeterminate006.png
deleted file mode 100644
index 9eed176..0000000
--- a/gui/devices/1200x1920/res/images/indeterminate006.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1200x1920/res/images/keyboard1.png b/gui/devices/1200x1920/res/images/keyboard1.png
deleted file mode 100644
index d746933..0000000
--- a/gui/devices/1200x1920/res/images/keyboard1.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1200x1920/res/images/keyboard2.png b/gui/devices/1200x1920/res/images/keyboard2.png
deleted file mode 100644
index 23b46ab..0000000
--- a/gui/devices/1200x1920/res/images/keyboard2.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1200x1920/res/images/keyboard3.png b/gui/devices/1200x1920/res/images/keyboard3.png
deleted file mode 100644
index 56ed4df..0000000
--- a/gui/devices/1200x1920/res/images/keyboard3.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1200x1920/res/images/keyboard4.png b/gui/devices/1200x1920/res/images/keyboard4.png
deleted file mode 100644
index b40d6c2..0000000
--- a/gui/devices/1200x1920/res/images/keyboard4.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1200x1920/res/images/medium-button.png b/gui/devices/1200x1920/res/images/medium-button.png
deleted file mode 100644
index a3bf30d..0000000
--- a/gui/devices/1200x1920/res/images/medium-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1200x1920/res/images/menu-button.png b/gui/devices/1200x1920/res/images/menu-button.png
deleted file mode 100644
index 7b48be3..0000000
--- a/gui/devices/1200x1920/res/images/menu-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1200x1920/res/images/minus-button.png b/gui/devices/1200x1920/res/images/minus-button.png
deleted file mode 100644
index e2edbe4..0000000
--- a/gui/devices/1200x1920/res/images/minus-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1200x1920/res/images/plus-button.png b/gui/devices/1200x1920/res/images/plus-button.png
deleted file mode 100644
index b67d9b9..0000000
--- a/gui/devices/1200x1920/res/images/plus-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1200x1920/res/images/progress_empty.png b/gui/devices/1200x1920/res/images/progress_empty.png
deleted file mode 100644
index d4ea0c2..0000000
--- a/gui/devices/1200x1920/res/images/progress_empty.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1200x1920/res/images/progress_fill.png b/gui/devices/1200x1920/res/images/progress_fill.png
deleted file mode 100644
index 836e437..0000000
--- a/gui/devices/1200x1920/res/images/progress_fill.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1200x1920/res/images/radio_empty.png b/gui/devices/1200x1920/res/images/radio_empty.png
deleted file mode 100644
index 9c2c66b..0000000
--- a/gui/devices/1200x1920/res/images/radio_empty.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1200x1920/res/images/radio_selected.png b/gui/devices/1200x1920/res/images/radio_selected.png
deleted file mode 100644
index 8d05b9d..0000000
--- a/gui/devices/1200x1920/res/images/radio_selected.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1200x1920/res/images/slideout.png b/gui/devices/1200x1920/res/images/slideout.png
deleted file mode 100644
index 56a9ac2..0000000
--- a/gui/devices/1200x1920/res/images/slideout.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1200x1920/res/images/slider-touch.png b/gui/devices/1200x1920/res/images/slider-touch.png
deleted file mode 100644
index b3365af..0000000
--- a/gui/devices/1200x1920/res/images/slider-touch.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1200x1920/res/images/slider-used.png b/gui/devices/1200x1920/res/images/slider-used.png
deleted file mode 100644
index 229d910..0000000
--- a/gui/devices/1200x1920/res/images/slider-used.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1200x1920/res/images/slider.png b/gui/devices/1200x1920/res/images/slider.png
deleted file mode 100644
index 1e034a6..0000000
--- a/gui/devices/1200x1920/res/images/slider.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1200x1920/res/images/sort-button.png b/gui/devices/1200x1920/res/images/sort-button.png
deleted file mode 100644
index c6783a1..0000000
--- a/gui/devices/1200x1920/res/images/sort-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1200x1920/res/images/top-bar.jpg b/gui/devices/1200x1920/res/images/top-bar.jpg
deleted file mode 100644
index 5d35f29..0000000
--- a/gui/devices/1200x1920/res/images/top-bar.jpg
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1200x1920/res/images/unlock.png b/gui/devices/1200x1920/res/images/unlock.png
deleted file mode 100644
index dc3894b..0000000
--- a/gui/devices/1200x1920/res/images/unlock.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1200x1920/res/ui.xml b/gui/devices/1200x1920/res/ui.xml
deleted file mode 100644
index b9aa7be..0000000
--- a/gui/devices/1200x1920/res/ui.xml
+++ /dev/null
@@ -1,430 +0,0 @@
-<?xml version="1.0"?>
-
-<recovery>
-	<details>
-		<resolution width="1200" height="1920" />
-		<author>TeamWin</author>
-		<title>Backup Naowz</title>
-		<description>Default basic theme</description>
-		<preview>preview.jpg</preview>
-	</details>
-
-	<include>
-		<xmlfile name="portrait.xml" />
-	</include>
-
-	<resources>
-		<resource name="font" type="font" filename="RobotoCondensed-Regular.ttf" size="40" fallback="Roboto-Condensed-40" />
-		<resource name="mediumfont" type="font" filename="RobotoCondensed-Regular.ttf" size="40" fallback="Roboto-Condensed-40" />
-		<resource name="filelist" type="font" filename="RobotoCondensed-Regular.ttf" size="40" fallback="Roboto-Condensed-40" />
-		<resource name="top_bar" type="image" filename="top-bar.jpg" />
-		<resource name="main_button" type="image" filename="menu-button" />
-		<resource name="file_icon" type="image" filename="file" />
-		<resource name="folder_icon" type="image" filename="folder" />
-		<resource name="slideout" type="image" filename="slideout" />
-		<resource name="progress" type="animation" filename="indeterminate" />
-		<resource name="progress_empty" type="image" filename="progress_empty" />
-		<resource name="progress_full" type="image" filename="progress_fill" />
-		<resource name="checkbox_false" type="image" filename="checkbox_empty" retainaspect="1" />
-		<resource name="checkbox_true" type="image" filename="checkbox_checked" retainaspect="1" />
-		<resource name="radio_false" type="image" filename="radio_empty" retainaspect="1" />
-		<resource name="radio_true" type="image" filename="radio_selected" retainaspect="1" />
-		<resource name="medium_button" type="image" filename="medium-button" />
-		<resource name="sort_button" type="image" filename="sort-button" />
-		<resource name="minus_button" type="image" filename="minus-button" />
-		<resource name="plus_button" type="image" filename="plus-button" />
-		<resource name="home_icon" type="image" filename="home-icon" />
-		<resource name="back_icon" type="image" filename="back-icon" />
-		<resource name="slider" type="image" filename="slider" />
-		<resource name="slider-used" type="image" filename="slider-used" />
-		<resource name="slider-touch" type="image" filename="slider-touch" />
-		<resource name="unlock-icon" type="image" filename="unlock" />
-		<resource name="keyboard1" type="image" filename="keyboard1" />
-		<resource name="keyboard2" type="image" filename="keyboard2" />
-		<resource name="keyboard3" type="image" filename="keyboard3" />
-		<resource name="keyboard4" type="image" filename="keyboard4" />
-		<resource name="cursor" type="image" filename="cursor" retainaspect="1" />
-	</resources>
-
-	<variables>
-		<variable name="col1_x" value="10" />
-		<variable name="col2_x" value="624" />
-		<variable name="col_center_x" value="317" />
-		<variable name="col_center_medium_x" value="473" />
-		<variable name="center_x" value="600" />
-		<variable name="row1_y" value="255" />
-		<variable name="row2_y" value="615" />
-		<variable name="row3_y" value="975" />
-		<variable name="row4_y" value="1335" />
-
-		<!-- these two are unused? -->
-		<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="1140" />
-		<variable name="row1_header_y" value="180" />
-		<variable name="row1_text_y" value="255" />
-		<variable name="row2_text_y" value="330" />
-		<variable name="row3_text_y" value="405" />
-		<variable name="row4_text_y" value="480" />
-		<variable name="row5_text_y" value="555" />
-		<variable name="row6_text_y" value="630" />
-		<variable name="row7_text_y" value="705" />
-		<variable name="row8_text_y" value="780" />
-		<variable name="row9_text_y" value="855" />
-		<variable name="row10_text_y" value="930" />
-		<variable name="row11_text_y" value="1005" />
-		<variable name="row12_text_y" value="1080" />
-		<variable name="row13_text_y" value="1155" />
-		<variable name="row14_text_y" value="1230" />
-		<variable name="row15_text_y" value="1305" />
-		<variable name="row16_text_y" value="1380" />
-		<variable name="row17_text_y" value="1455" />
-		<variable name="row18_text_y" value="1530" />
-		<variable name="zip_status_y" value="922" />
-		<variable name="flash_list_height" value="500" />
-		<variable name="tz_selected_y" value="240" />
-		<variable name="tz_set_y" value="1500" />
-		<variable name="tz_current_y" value="1425" />
-		<variable name="col_progressbar_x" value="411" />
-		<variable name="row_progressbar_y" value="1650" />
-		<variable name="col1_medium_x" value="10" />
-		<variable name="col2_medium_x" value="318" />
-		<variable name="col3_medium_x" value="626" />
-		<variable name="col4_medium_x" value="934" />
-		<variable name="row1_medium_y" value="195" />
-		<variable name="row2_medium_y" value="345" />
-		<variable name="row3_medium_y" value="392" />
-		<variable name="row4_medium_y" value="645" />
-		<variable name="row5_medium_y" value="795" />
-		<variable name="row6_medium_y" value="1260" />
-		<variable name="row7_medium_y" value="730" />
-		<variable name="slider_x" value="161" />
-		<variable name="slider_y" value="1575" />
-		<variable name="slider_text_y" value="1676" />
-		<variable name="button_text_color" value="#AAAAAA" />
-		<variable name="text_color" value="#FFFFFF" />
-		<variable name="text_success_color" value="#33B5E5" />
-		<variable name="text_fail_color" value="#FF0101" />
-		<variable name="highlight_color" value="#90909080" />
-		<variable name="caps_highlight_color" value="#33B5E580" />
-		<variable name="home_button_x" value="10" />
-		<variable name="home_button_y" value="1839" />
-		<variable name="back_button_x" value="1064" />
-		<variable name="back_button_y" value="1839" />
-		<variable name="sort_text_x" value="10" />
-		<variable name="sort_asc_text_y" value="1635" />
-		<variable name="sort_asc_button_y" value="1620" />
-		<variable name="sort_desc_text_y" value="1725" />
-		<variable name="sort_desc_button_y" value="1710" />
-		<variable name="sort_col1_button_x" value="390" />
-		<variable name="sort_col2_button_x" value="540" />
-		<variable name="sort_col3_button_x" value="690" />
-		<variable name="input_width" value="1180" />
-		<variable name="input_height" value="75" />
-		<variable name="input_background_color" value="#303030" />
-		<variable name="input_cursor_color" value="#33B5E5" />
-		<variable name="input_cursor_width" value="4" />
-		<variable name="console_x" value="0" />
-		<variable name="console_width" value="1200" />
-		<variable name="console_foreground" value="#A0A0A0" />
-		<variable name="warning" value="#F8F8A0" />
-		<variable name="error" value="#FF4040" />
-		<variable name="highlight" value="#33B5E5" />
-		<variable name="console_background" value="#303030" />
-		<variable name="console_scroll" value="#303030" />
-		<variable name="console_action_height" value="705" />
-		<variable name="console_install_height" value="900" />
-		<variable name="console_installdone_height" value="660" />
-		<variable name="fileselector_x" value="5" />
-		<variable name="fileselector_width" value="1190" />
-		<variable name="fileselector_install_height" value="1170" />
-		<variable name="fileselector_header_background" value="#202020" />
-		<variable name="fileselector_header_textcolor" value="#AAAAAA" />
-		<variable name="fileselector_header_separatorcolor" value="#33B5E5" />
-		<variable name="fileselector_header_separatorheight" value="4" />
-		<variable name="fileselector_separatorcolor" value="#505050" />
-		<variable name="fileselector_separatorheight" value="3" />
-		<variable name="fileselector_background" value="#303030" />
-		<variable name="fileselector_highlight_color" value="#505050" />
-		<variable name="fileselector_highlight_font_color" value="#33B5E5" />
-		<variable name="fileselector_spacing" value="48" />
-		<variable name="fastscroll_linecolor" value="#50505080" />
-		<variable name="fastscroll_rectcolor" value="#33B5E580" />
-		<variable name="fastscroll_w" value="90" />
-		<variable name="fastscroll_linew" value="3" />
-		<variable name="fastscroll_rectw" value="21" />
-		<variable name="fastscroll_recth" value="60" />
-		<variable name="listbox_x" value="5" />
-		<variable name="listbox_width" value="1190" />
-		<variable name="listbox_tz_height" value="885" />
-		<variable name="listbox_background" value="#303030" />
-		<variable name="listbox_spacing" value="24" />
-		<variable name="sd_plus_x" value="525" />
-		<variable name="sdext_text_x" value="165" />
-		<variable name="sdext_text_y" value="270" />
-		<variable name="sdswap_button_y" value="390" />
-		<variable name="sdswap_text_x" value="165" />
-		<variable name="sdswap_text_y" value="405" />
-		<variable name="sdfilesystem_text_y" value="510" />
-		<variable name="sdfilesystem_button_y" value="570" />
-		<variable name="lock_x" value="240" />
-		<variable name="lock_y" value="600" />
-		<variable name="filemanager_select_x" value="840" />
-		<variable name="filemanager_select_y" value="1620" />
-		<variable name="backup_name_y" value="825" />
-		<variable name="terminal_console_height" value="980" />
-		<variable name="terminal_text_y" value="1025" />
-		<variable name="terminal_button_y" value="1050" />
-		<variable name="row_dst_text_y" value="1080" />
-		<variable name="row_offset_text_y" value="1155" />
-		<variable name="row_offset_medium_y" value="1260" />
-		<variable name="button_fill_color" value="#303030" />
-		<variable name="button_fill_full_width" value="1180" />
-		<variable name="button_fill_main_width" value="565" />
-		<variable name="button_fill_main_height" value="324" />
-		<variable name="button_fill_half_height" value="162" />
-		<variable name="button_fill_quarter_height" value="81" />
-		<variable name="backup_list_height" value="780" />
-		<variable name="backup_button_row1" value="1118" />
-		<variable name="backup_button_row2" value="1220" />
-		<variable name="mount_list_height" value="1035" />
-		<variable name="mount_storage_row" value="1240" />
-		<variable name="storage_list_height" value="1000" />
-		<variable name="wipe_list_height" value="1105" />
-		<variable name="wipe_button_row1" value="1350" />
-		<variable name="wipe_button_y" value="975" />
-		<variable name="slidervalue_w" value="1180" />
-		<variable name="slidervalue_line_clr" value="#FFFFFF" />
-		<variable name="slidervalue_slider_clr" value="#33B5E5" />
-		<variable name="slidervalue_lineh" value="3" />
-		<variable name="slidervalue_padding" value="30" />
-		<variable name="slidervalue_sliderw" value="15" />
-		<variable name="slidervalue_sliderh" value="90" />
-	</variables>
-
-	<mousecursor>
-		<placement w="15" h="15" />
-		<background color="#FFFF00FF" resource="cursor" />
-		<speed multiplier="2.5" />
-	</mousecursor>
-
-	<templates>
-		<template name="header">
-			<background color="#000000FF" />
-
-			<object type="image">
-				<image resource="top_bar" />
-				<placement x="0" y="0" />
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="180" y="15" />
-				<text>Team Win Recovery Project  v%tw_version%</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<condition var1="tw_simulate_actions" var2="1" />
-				<font resource="font" />
-				<placement x="180" y="60" />
-				<text>SIMULATING ACTIONS</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="180" y="114" />
-				<text>%tw_time%</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="405" y="114" />
-				<conditions>
-					<condition var1="tw_no_battery_percent" var2="0" />
-					<condition var1="tw_battery" op="&gt;" var2="0" />
-					<condition var1="tw_battery" op="&lt;" var2="101" />
-				</conditions>
-				<text>Battery: %tw_battery%</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="730" y="114" />
-				<conditions>
-					<condition var1="tw_no_cpu_temp" var2="0" />
-				</conditions>
-				<text>CPU: %tw_cpu_temp% C</text>
-			</object>
-
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<placement x="%home_button_x%" y="%home_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text></text>
-				<image resource="home_icon" />
-				<condition var1="tw_busy" var2="0" />
-				<action function="key">home</action>
-			</object>
-
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<placement x="%back_button_x%" y="%back_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text></text>
-				<image resource="back_icon" />
-				<condition var1="tw_busy" var2="0" />
-				<action function="key">back</action>
-			</object>
-
-			<object type="action">
-				<touch key="power" />
-				<action function="overlay">lock</action>
-			</object>
-
-			<object type="action">
-				<touch key="power+voldown" />
-				<action function="screenshot" />
-			</object>
-		</template>
-
-		<template name="progress_bar">
-			<object type="progressbar">
-				<placement x="%col_progressbar_x%" y="%row_progressbar_y%" />
-				<resource empty="progress_empty" full="progress_full" />
-				<data name="ui_progress" />
-			</object>
-
-			<object type="animation">
-				<placement x="%col_progressbar_x%" y="%row_progressbar_y%" />
-				<resource name="progress" />
-				<speed fps="15" render="2" />
-				<loop frame="1" />
-			</object>
-		</template>
-
-		<template name="sort_options">
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="%sort_text_x%" y="%sort_asc_text_y%" />
-				<text>Sort Ascending:</text>
-			</object>
-
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<placement x="%sort_col1_button_x%" y="%sort_asc_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Name</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=1</action>
-			</object>
-
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<placement x="%sort_col2_button_x%" y="%sort_asc_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Date</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=2</action>
-			</object>
-
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<placement x="%sort_col3_button_x%" y="%sort_asc_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Size</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=3</action>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="%sort_text_x%" y="%sort_desc_text_y%" />
-				<text>Sort Descending:</text>
-			</object>
-
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<placement x="%sort_col1_button_x%" y="%sort_desc_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Name</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=-1</action>
-			</object>
-
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<placement x="%sort_col2_button_x%" y="%sort_desc_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Date</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=-2</action>
-			</object>
-
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<placement x="%sort_col3_button_x%" y="%sort_desc_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Size</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=-3</action>
-			</object>
-		</template>
-
-		<template name="action_page_console">
-			<object type="console">
-				<placement x="0" y="%row2_y%" w="1200" h="705" />
-				<color foreground="%console_foreground%" background="%console_background%" scroll="%console_scroll%" />
-				<font resource="fixed" />
-			</object>
-		</template>
-
-		<template name="footer">
-			<object type="console">
-				<slideout resource="slideout" x="540" y="1841" />
-				<placement x="%console_x%" y="0" w="%console_width%" h="1841" />
-				<color foreground="%console_foreground%" background="%console_background%" scroll="%console_scroll%" />
-				<font resource="fixed" />
-			</object>
-		</template>
-
-		<template name="keyboardtemplate">
-			<object type="keyboard">
-				<placement x="0" y="1129" />
-				<layout resource1="keyboard1" resource2="keyboard2" resource3="keyboard3" resource4="keyboard4" />
-				<highlight color="%highlight_color%" />
-				<capshighlight color="%caps_highlight_color%" />
-				<layout1>
-					<keysize height="179" width="120" />
-					<row1 key01="q" long01="1" key02="w" long02="2" key03="e" long03="3" key04="r" long04="4" key05="t" long05="5" key06="y" long06="6" key07="u" long07="7" key08="i" long08="8" key09="o" long09="9" key10="p" long10="0" />
-					<row2 key01="180:a" long01="@" key02="s" long02="#" key03="d" long03="$" key04="f" long04="%" key05="g" long05="&amp;" key06="h" long06="*" key07="j" long07="-" key08="k" long08="+" key09="162:l" long09="_" />
-					<row3 key01="180:layout2" key02="z" long02="!" key03="x" key04="c" long04="'" key05="v" long05=":" key06="b" long06=";" key07="n" long07="/" key08="m" long08="?" key09="182:c:8" />
-					<row4 key01="180:layout3" key02="120:c:47" key03="600: " key04="." key05="180:action" />
-				</layout1>
-				<layout2>
-					<keysize height="179" width="120" capslock="0" revert_layout="1" />
-					<row1 key01="Q" long01="1" key02="W" long02="2" key03="E" long03="3" key04="R" long04="4" key05="T" long05="5" key06="Y" long06="6" key07="U" long07="7" key08="I" long08="8" key09="O" long09="9" key10="P" long10="0" />
-					<row2 key01="180:A" long01="@" key02="S" long02="#" key03="D" long03="$" key04="F" long04="%" key05="G" long05="&amp;" key06="H" long06="*" key07="J" long07="-" key08="K" long08="+" key09="162:L" long09="_" />
-					<row3 key01="180:layout1" key02="Z" long02="!" key03="X" key04="C" long04="'" key05="V" long05=":" key06="B" long06=";" key07="N" long07="/" key08="M" long08="?" key09="180:c:8" />
-					<row4 key01="180:layout3" key02="120:c:47" key03="600: " key04="." key05="180:action" />
-				</layout2>
-				<layout3>
-					<keysize height="179" width="120" />
-					<row1 key01="1" key02="2" key03="3" key04="4" key05="5" key06="6" key07="7" key08="8" key09="9" key10="0" />
-					<row2 key01="@" key02="#" key03="$" key04="%" key05="&amp;" key06="*" key07="-" key08="+" key09="(" key10=")" />
-					<row3 key01="180:layout4" key02="!" key03="120:c:34" key04="'" key05=":" key06=";" key07="/" key08="?" key09="180:c:8" />
-					<row4 key01="180:layout1" key02="," key03="600: " key04="." key05="180:action" />
-				</layout3>
-				<layout4>
-					<keysize height="179" width="120" />
-					<row1 key01="~" key02="`" key03="|" key04="120:" key05="120:" key06="120:" key07="%" key08="120:" key09="{" key10="}" />
-					<row2 key01="120:" key02="120:" key03="120:" key04="120:" key05="120:" key06="^" key07="_" key08="=" key09="[" key10="]" />
-					<row3 key01="180:layout3" key02="120:" key03="120:" key04="120:" key05="120:" key06="\" key07="&lt;" key08="&gt;" key09="180:c:8" />
-					<row4 key01="180:layout1" key02="120:c:34" key03="600: " key04="." key05="180:action" />
-				</layout4>
-			</object>
-		</template>
-	</templates>
-</recovery>
diff --git a/gui/devices/1280x800/res/fonts/Roboto-Regular-20.dat b/gui/devices/1280x800/res/fonts/Roboto-Regular-20.dat
deleted file mode 100755
index 6588b41..0000000
--- a/gui/devices/1280x800/res/fonts/Roboto-Regular-20.dat
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1280x800/res/images/back-icon.png b/gui/devices/1280x800/res/images/back-icon.png
deleted file mode 100644
index 1096c90..0000000
--- a/gui/devices/1280x800/res/images/back-icon.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1280x800/res/images/background.jpg b/gui/devices/1280x800/res/images/background.jpg
deleted file mode 100644
index d9681c6..0000000
--- a/gui/devices/1280x800/res/images/background.jpg
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1280x800/res/images/button.png b/gui/devices/1280x800/res/images/button.png
deleted file mode 100644
index 6ae29ae..0000000
--- a/gui/devices/1280x800/res/images/button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1280x800/res/images/checkbox_checked.png b/gui/devices/1280x800/res/images/checkbox_checked.png
deleted file mode 100644
index 3447349..0000000
--- a/gui/devices/1280x800/res/images/checkbox_checked.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1280x800/res/images/checkbox_empty.png b/gui/devices/1280x800/res/images/checkbox_empty.png
deleted file mode 100644
index f5f35d8..0000000
--- a/gui/devices/1280x800/res/images/checkbox_empty.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1280x800/res/images/console-icon.png b/gui/devices/1280x800/res/images/console-icon.png
deleted file mode 100644
index 91a727d..0000000
--- a/gui/devices/1280x800/res/images/console-icon.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1280x800/res/images/console-toggle.png b/gui/devices/1280x800/res/images/console-toggle.png
deleted file mode 100644
index 963b9fd..0000000
--- a/gui/devices/1280x800/res/images/console-toggle.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1280x800/res/images/cursor.png b/gui/devices/1280x800/res/images/cursor.png
deleted file mode 100644
index 32c8ae1..0000000
--- a/gui/devices/1280x800/res/images/cursor.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1280x800/res/images/curtain.jpg b/gui/devices/1280x800/res/images/curtain.jpg
deleted file mode 100644
index 7646e3e..0000000
--- a/gui/devices/1280x800/res/images/curtain.jpg
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1280x800/res/images/file.png b/gui/devices/1280x800/res/images/file.png
deleted file mode 100644
index 8556bc7..0000000
--- a/gui/devices/1280x800/res/images/file.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1280x800/res/images/folder.png b/gui/devices/1280x800/res/images/folder.png
deleted file mode 100644
index a3a5f69..0000000
--- a/gui/devices/1280x800/res/images/folder.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1280x800/res/images/home-icon.png b/gui/devices/1280x800/res/images/home-icon.png
deleted file mode 100644
index e42d774..0000000
--- a/gui/devices/1280x800/res/images/home-icon.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1280x800/res/images/indeterminate001.png b/gui/devices/1280x800/res/images/indeterminate001.png
deleted file mode 100755
index e6fa1c5..0000000
--- a/gui/devices/1280x800/res/images/indeterminate001.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1280x800/res/images/indeterminate002.png b/gui/devices/1280x800/res/images/indeterminate002.png
deleted file mode 100755
index e1fceab..0000000
--- a/gui/devices/1280x800/res/images/indeterminate002.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1280x800/res/images/indeterminate003.png b/gui/devices/1280x800/res/images/indeterminate003.png
deleted file mode 100755
index 6702867..0000000
--- a/gui/devices/1280x800/res/images/indeterminate003.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1280x800/res/images/indeterminate004.png b/gui/devices/1280x800/res/images/indeterminate004.png
deleted file mode 100755
index ff65e09..0000000
--- a/gui/devices/1280x800/res/images/indeterminate004.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1280x800/res/images/indeterminate005.png b/gui/devices/1280x800/res/images/indeterminate005.png
deleted file mode 100755
index e61e2cc..0000000
--- a/gui/devices/1280x800/res/images/indeterminate005.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1280x800/res/images/indeterminate006.png b/gui/devices/1280x800/res/images/indeterminate006.png
deleted file mode 100755
index c9c21ba..0000000
--- a/gui/devices/1280x800/res/images/indeterminate006.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1280x800/res/images/keyboard1.png b/gui/devices/1280x800/res/images/keyboard1.png
deleted file mode 100644
index d75550f..0000000
--- a/gui/devices/1280x800/res/images/keyboard1.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1280x800/res/images/keyboard2.png b/gui/devices/1280x800/res/images/keyboard2.png
deleted file mode 100644
index cf2eb8f..0000000
--- a/gui/devices/1280x800/res/images/keyboard2.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1280x800/res/images/keyboard3.png b/gui/devices/1280x800/res/images/keyboard3.png
deleted file mode 100644
index c8f7b03..0000000
--- a/gui/devices/1280x800/res/images/keyboard3.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1280x800/res/images/keyboard4.png b/gui/devices/1280x800/res/images/keyboard4.png
deleted file mode 100644
index 7dd3987..0000000
--- a/gui/devices/1280x800/res/images/keyboard4.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1280x800/res/images/medium-button.png b/gui/devices/1280x800/res/images/medium-button.png
deleted file mode 100644
index 77dc540..0000000
--- a/gui/devices/1280x800/res/images/medium-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1280x800/res/images/mediumwide-button.png b/gui/devices/1280x800/res/images/mediumwide-button.png
deleted file mode 100644
index b2b7d4d..0000000
--- a/gui/devices/1280x800/res/images/mediumwide-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1280x800/res/images/minus-button.png b/gui/devices/1280x800/res/images/minus-button.png
deleted file mode 100644
index 5a49c75..0000000
--- a/gui/devices/1280x800/res/images/minus-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1280x800/res/images/plus-button.png b/gui/devices/1280x800/res/images/plus-button.png
deleted file mode 100644
index da1326c..0000000
--- a/gui/devices/1280x800/res/images/plus-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1280x800/res/images/progress_empty.png b/gui/devices/1280x800/res/images/progress_empty.png
deleted file mode 100644
index b853710..0000000
--- a/gui/devices/1280x800/res/images/progress_empty.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1280x800/res/images/progress_fill.png b/gui/devices/1280x800/res/images/progress_fill.png
deleted file mode 100644
index 669c6ef..0000000
--- a/gui/devices/1280x800/res/images/progress_fill.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1280x800/res/images/radio_empty.png b/gui/devices/1280x800/res/images/radio_empty.png
deleted file mode 100644
index 88d1c1f..0000000
--- a/gui/devices/1280x800/res/images/radio_empty.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1280x800/res/images/radio_selected.png b/gui/devices/1280x800/res/images/radio_selected.png
deleted file mode 100644
index 864065d..0000000
--- a/gui/devices/1280x800/res/images/radio_selected.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1280x800/res/images/slider-touch.png b/gui/devices/1280x800/res/images/slider-touch.png
deleted file mode 100644
index d8647b8..0000000
--- a/gui/devices/1280x800/res/images/slider-touch.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1280x800/res/images/slider-used.png b/gui/devices/1280x800/res/images/slider-used.png
deleted file mode 100644
index bf6cad9..0000000
--- a/gui/devices/1280x800/res/images/slider-used.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1280x800/res/images/slider.png b/gui/devices/1280x800/res/images/slider.png
deleted file mode 100644
index 4081ea5..0000000
--- a/gui/devices/1280x800/res/images/slider.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1280x800/res/images/sort-button.png b/gui/devices/1280x800/res/images/sort-button.png
deleted file mode 100644
index 13ab929..0000000
--- a/gui/devices/1280x800/res/images/sort-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1280x800/res/images/unlock.png b/gui/devices/1280x800/res/images/unlock.png
deleted file mode 100644
index 9041221..0000000
--- a/gui/devices/1280x800/res/images/unlock.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1280x800/res/ui.xml b/gui/devices/1280x800/res/ui.xml
deleted file mode 100644
index d9fc6b4..0000000
--- a/gui/devices/1280x800/res/ui.xml
+++ /dev/null
@@ -1,441 +0,0 @@
-<?xml version="1.0"?>
-
-<recovery>
-	<details>
-		<resolution width="1280" height="800" />
-		<author>TeamWin</author>
-		<title>Backup Naowz</title>
-		<description>Default basic theme</description>
-		<preview>preview.jpg</preview>
-	</details>
-
-	<include>
-		<xmlfile name="landscape.xml" />
-	</include>
-
-	<resources>
-		<resource name="font" type="font" filename="RobotoCondensed-Regular.ttf" size="20" fallback="Roboto-Regular-20" />
-		<resource name="base" type="image" filename="background.jpg" />
-		<resource name="main_button" type="image" filename="button" />
-		<resource name="file_icon" type="image" filename="file" />
-		<resource name="folder_icon" type="image" filename="folder" />
-		<resource name="progress" type="animation" filename="indeterminate" />
-		<resource name="progress_empty" type="image" filename="progress_empty" />
-		<resource name="progress_full" type="image" filename="progress_fill" />
-		<resource name="checkbox_false" type="image" filename="checkbox_empty" retainaspect="1" />
-		<resource name="checkbox_true" type="image" filename="checkbox_checked" retainaspect="1" />
-		<resource name="radio_false" type="image" filename="radio_empty" retainaspect="1" />
-		<resource name="radio_true" type="image" filename="radio_selected" retainaspect="1" />
-		<resource name="medium_button" type="image" filename="medium-button" />
-		<resource name="mediumwide_button" type="image" filename="mediumwide-button" />
-		<resource name="sort_button" type="image" filename="sort-button" />
-		<resource name="minus_button" type="image" filename="minus-button" />
-		<resource name="plus_button" type="image" filename="plus-button" />
-		<resource name="home_icon" type="image" filename="home-icon" />
-		<resource name="back_icon" type="image" filename="back-icon" />
-		<resource name="console_button" type="image" filename="console-toggle" />
-		<resource name="slider" type="image" filename="slider" />
-		<resource name="slider-used" type="image" filename="slider-used" />
-		<resource name="slider-touch" type="image" filename="slider-touch" />
-		<resource name="unlock-icon" type="image" filename="unlock" />
-		<resource name="keyboard1" type="image" filename="keyboard1" />
-		<resource name="keyboard2" type="image" filename="keyboard2" />
-		<resource name="keyboard3" type="image" filename="keyboard3" />
-		<resource name="keyboard4" type="image" filename="keyboard4" />
-		<resource name="cursor" type="image" filename="cursor" retainaspect="1" />
-	</resources>
-
-	<variables>
-		<variable name="col1_x" value="151" />
-		<variable name="col2_x" value="397" />
-		<variable name="col3_x" value="643" />
-		<variable name="col4_x" value="889" />
-		<variable name="row1_y" value="127" />
-		<variable name="row2_y" value="388" />
-		<variable name="col_center_x" value="520" />
-		<variable name="center_x" value="640" />
-		<variable name="screen_width" value="1280" />
-		<variable name="screen_height" value="800" />
-		<variable name="col_progressbar_x" value="514" />
-		<variable name="row_progressbar_y" value="700" />
-		<variable name="col1_medium_x" value="385" />
-		<variable name="col2_medium_x" value="515" />
-		<variable name="col3_medium_x" value="645" />
-		<variable name="col4_medium_x" value="775" />
-		<variable name="row1_medium_y" value="105" />
-		<variable name="row2_medium_y" value="245" />
-		<variable name="row3_medium_y" value="245" />
-		<variable name="row4_medium_y" value="450" />
-		<variable name="row5_medium_y" value="405" />
-		<variable name="row1_text_y" value="58" />
-		<variable name="row2_text_y" value="105" />
-		<variable name="row3_text_y" value="140" />
-		<variable name="row4_text_y" value="170" />
-		<variable name="row5_text_y" value="200" />
-		<variable name="row6_text_y" value="230" />
-		<variable name="row7_text_y" value="260" />
-		<variable name="row8_text_y" value="290" />
-		<variable name="row9_text_y" value="320" />
-		<variable name="row10_text_y" value="350" />
-		<variable name="row11_text_y" value="380" />
-		<variable name="row12_text_y" value="410" />
-		<variable name="row13_text_y" value="440" />
-		<variable name="row14_text_y" value="470" />
-		<variable name="row15_text_y" value="500" />
-		<variable name="row16_text_y" value="530" />
-		<variable name="row17_text_y" value="560" />
-		<variable name="row18_text_y" value="590" />
-		<variable name="row_offsetmedium_y" value="465" />
-		<variable name="home_button_x" value="1069" />
-		<variable name="home_button_y" value="5" />
-		<variable name="back_button_x" value="1139" />
-		<variable name="back_button_y" value="5" />
-		<variable name="console_button_x" value="1209" />
-		<variable name="console_button_y" value="5" />
-		<variable name="nandcheck_col1" value="328" />
-		<variable name="nandcheck_col2" value="600" />
-		<variable name="nandcheck_row1" value="150" />
-		<variable name="nandcheck_row2" value="200" />
-		<variable name="nandcheck_row3" value="250" />
-		<variable name="nandcheck_row4" value="300" />
-		<variable name="nandcheck_row5" value="350" />
-		<variable name="nandcheck_row6" value="400" />
-		<variable name="nandcheck_row7" value="450" />
-		<variable name="nandcheck_row8" value="500" />
-		<variable name="button_text_color" value="#AAAAAA" />
-		<variable name="text_color" value="#A0A0A0" />
-		<variable name="text_success_color" value="#33B5E5" />
-		<variable name="text_fail_color" value="#FF0101" />
-		<variable name="highlight_color" value="#90909080" />
-		<variable name="caps_highlight_color" value="#33B5E580" />
-		<variable name="slider_x" value="435" />
-		<variable name="slider_y" value="600" />
-		<variable name="slider_text_y" value="650" />
-		<variable name="sort_text_x" value="398" />
-		<variable name="sort_asc_text_y" value="655" />
-		<variable name="sort_asc_button_y" value="650" />
-		<variable name="sort_desc_text_y" value="700" />
-		<variable name="sort_desc_button_y" value="695" />
-		<variable name="sort_col1_button_x" value="568" />
-		<variable name="sort_col2_button_x" value="638" />
-		<variable name="sort_col3_button_x" value="708" />
-		<variable name="col1_sdext_x" value="508" />
-		<variable name="col2_sdext_x" value="718" />
-		<variable name="row1_sdext_y" value="115" />
-		<variable name="row2_sdext_y" value="180" />
-		<variable name="row_extsize_y" value="115" />
-		<variable name="row_swapsize_y" value="180" />
-		<variable name="input_x" value="28" />
-		<variable name="input_width" value="1200" />
-		<variable name="input_height" value="30" />
-		<variable name="input_background_color" value="#303030" />
-		<variable name="input_cursor_color" value="#33B5E5" />
-		<variable name="input_cursor_width" value="3" />
-		<variable name="console_x" value="25" />
-		<variable name="console_width" value="1230" />
-		<variable name="console_foreground" value="#A0A0A0" />
-		<variable name="warning" value="#F8F8A0" />
-		<variable name="error" value="#FF4040" />
-		<variable name="highlight" value="#33B5E5" />
-		<variable name="console_background" value="#303030" />
-		<variable name="console_scroll" value="#303030" />
-		<variable name="console_action_height" value="320" />
-		<variable name="console_install_height" value="440" />
-		<variable name="console_installdone_height" value="300" />
-		<variable name="fileselector_folder_x" value="28" />
-		<variable name="fileselector_folder_width" value="410" />
-		<variable name="fileselector_folderonly_width" value="588" />
-		<variable name="fileselector_file_x" value="445" />
-		<variable name="fileselector_file_width" value="810" />
-		<variable name="fileselector_install_y" value="130" />
-		<variable name="fileselector_install_height" value="510" />
-		<variable name="fileselector_header_background" value="#202020" />
-		<variable name="fileselector_header_textcolor" value="#AAAAAA" />
-		<variable name="fileselector_header_separatorcolor" value="#33B5E5" />
-		<variable name="fileselector_header_separatorheight" value="3" />
-		<variable name="fileselector_separatorcolor" value="#505050" />
-		<variable name="fileselector_separatorheight" value="2" />
-		<variable name="fileselector_background" value="#303030" />
-		<variable name="fileselector_highlight_color" value="#505050" />
-		<variable name="fileselector_highlight_font_color" value="#33B5E5" />
-		<variable name="fileselector_spacing" value="18" />
-		<variable name="fastscroll_linecolor" value="#50505080" />
-		<variable name="fastscroll_rectcolor" value="#33B5E580" />
-		<variable name="fastscroll_w" value="40" />
-		<variable name="fastscroll_linew" value="2" />
-		<variable name="fastscroll_rectw" value="16" />
-		<variable name="fastscroll_recth" value="30" />
-		<variable name="zipstorage_text_y" value="88" />
-		<variable name="listbox_x" value="397" />
-		<variable name="listbox_y" value="90" />
-		<variable name="listbox_width" value="588" />
-		<variable name="listbox_tz_height" value="290" />
-		<variable name="listbox_background" value="#303030" />
-		<variable name="listbox_spacing" value="18" />
-		<variable name="sd_plus_x" value="408" />
-		<variable name="lock_x" value="440" />
-		<variable name="lock_y" value="184" />
-		<variable name="filemanager_select_x" value="1017" />
-		<variable name="filemanager_select_y" value="620" />
-		<variable name="backup_name_text_y" value="440" />
-		<variable name="backup_name_button_y" value="240" />
-		<variable name="col_right_x" value="1252" />
-		<variable name="cancel_button_y" value="240" />
-		<variable name="terminal_console_y" value="0" />
-		<variable name="terminal_console_height" value="362" />
-		<variable name="terminal_text_y" value="368" />
-		<variable name="terminal_button_y" value="358" />
-		<variable name="terminal_input_width" value="1031" />
-		<variable name="button_fill_color" value="#303030" />
-		<variable name="button_fill_full_width" value="640" />
-		<variable name="button_fill_main_width" value="609" />
-		<variable name="button_fill_main_height" value="160" />
-		<variable name="button_fill_half_height" value="53" />
-		<variable name="button_fill_quarter_height" value="40" />
-		<variable name="button_full_center_x" value="320" />
-		<variable name="flash_list_height" value="220" />
-		<variable name="backup_list_x" value="28" />
-		<variable name="backup_list_y" value="105" />
-		<variable name="backup_list_width" value="609" />
-		<variable name="backup_list_height" value="440" />
-		<variable name="backup_storage_y" value="270" />
-		<variable name="backup_encrypt_y" value="330" />
-		<variable name="restore_list_y" value="140" />
-		<variable name="restore_list_height" value="400" />
-		<variable name="mount_list_height" value="600" />
-		<variable name="mount_storage_row" value="550" />
-		<variable name="wipe_list_height" value="420" />
-		<variable name="wipe_button_y" value="250" />
-		<variable name="slidervalue_x" value="320" />
-		<variable name="slidervalue_w" value="640" />
-		<variable name="slidervalue_line_clr" value="#FFFFFF" />
-		<variable name="slidervalue_slider_clr" value="#33B5E5" />
-		<variable name="slidervalue_lineh" value="2" />
-		<variable name="slidervalue_padding" value="0" />
-		<variable name="slidervalue_sliderw" value="15" />
-		<variable name="slidervalue_sliderh" value="60" />
-	</variables>
-
-	<mousecursor>
-		<placement w="15" h="15" />
-		<background color="#FFFF00FF" resource="cursor" />
-		<speed multiplier="2" />
-	</mousecursor>
-
-	<templates>
-		<template name="header">
-			<background color="#000000FF" />
-
-			<object type="image">
-				<image resource="base" />
-				<placement x="0" y="0" />
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="250" y="5" />
-				<text>Team Win Recovery Project  v%tw_version%</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="250" y="30" />
-				<conditions>
-					<condition var1="tw_no_battery_percent" var2="0" />
-					<condition var1="tw_battery" op="&gt;" var2="0" />
-					<condition var1="tw_battery" op="&lt;" var2="101" />
-				</conditions>
-				<text>Battery Level: %tw_battery%</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="450" y="30" />
-				<text>%tw_time%</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="850" y="30" />
-				<conditions>
-					<condition var1="tw_no_cpu_temp" var2="0" />
-				</conditions>
-				<text>CPU: %tw_cpu_temp% C</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<condition var1="tw_simulate_actions" var2="1" />
-				<font resource="font" />
-				<placement x="550" y="30" />
-				<text>SIMULATING ACTIONS</text>
-			</object>
-
-			<object type="button">
-				<placement x="%home_button_x%" y="%home_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text></text>
-				<image resource="home_icon" />
-				<condition var1="tw_busy" var2="0" />
-				<action function="key">home</action>
-			</object>
-
-			<object type="button">
-				<placement x="%back_button_x%" y="%back_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text></text>
-				<image resource="back_icon" />
-				<condition var1="tw_busy" var2="0" />
-				<action function="key">back</action>
-			</object>
-
-			<object type="action">
-				<touch key="power" />
-				<action function="overlay">lock</action>
-			</object>
-
-			<object type="action">
-				<touch key="power+voldown" />
-				<action function="screenshot" />
-			</object>
-		</template>
-
-		<template name="progress_bar">
-			<object type="progressbar">
-				<placement x="%col_progressbar_x%" y="%row_progressbar_y%" />
-				<resource empty="progress_empty" full="progress_full" />
-				<data name="ui_progress" />
-			</object>
-
-			<object type="animation">
-				<placement x="%col_progressbar_x%" y="%row_progressbar_y%" />
-				<resource name="progress" />
-				<speed fps="15" render="2" />
-				<loop frame="1" />
-			</object>
-		</template>
-
-		<template name="sort_options">
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<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="font" color="%button_text_color%" />
-				<text>Name</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=1</action>
-			</object>
-
-			<object type="button">
-				<placement x="%sort_col2_button_x%" y="%sort_asc_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Date</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=2</action>
-			</object>
-
-			<object type="button">
-				<placement x="%sort_col3_button_x%" y="%sort_asc_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Size</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=3</action>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<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="font" color="%button_text_color%" />
-				<text>Name</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=-1</action>
-			</object>
-
-			<object type="button">
-				<placement x="%sort_col2_button_x%" y="%sort_desc_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Date</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=-2</action>
-			</object>
-
-			<object type="button">
-				<placement x="%sort_col3_button_x%" y="%sort_desc_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Size</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=-3</action>
-			</object>
-		</template>
-
-		<template name="flash_zip_console">
-			<object type="console">
-				<placement x="%console_x%" y="85" w="%console_width%" h="430" />
-				<color foreground="%console_foreground%" background="%console_background%" scroll="%console_scroll%" />
-				<font resource="fixed" />
-			</object>
-		</template>
-
-		<template name="action_page_console">
-			<object type="console">
-				<placement x="%console_x%" y="200" w="%console_width%" h="380" />
-				<color foreground="%console_foreground%" background="%console_background%" scroll="%console_scroll%" />
-				<font resource="fixed" />
-			</object>
-		</template>
-
-		<template name="footer">
-			<object type="console">
-				<slideout resource="console_button" x="%console_button_x%" y="%console_button_y%" />
-				<placement x="%console_x%" y="75" w="%console_width%" h="665" />
-				<color foreground="%console_foreground%" background="%console_background%" scroll="%console_scroll%" />
-				<font resource="fixed" />
-			</object>
-		</template>
-
-		<template name="keyboardtemplate">
-			<object type="keyboard">
-				<placement x="0" y="438" />
-				<layout resource1="keyboard1" resource2="keyboard2" resource3="keyboard3" resource4="keyboard4" />
-				<highlight color="%highlight_color%" />
-				<capshighlight color="%caps_highlight_color%" />
-				<layout1>
-					<keysize height="91" width="106" />
-					<row1 key01="102:" key02="q" long02="1" key03="w" long03="2" key04="e" long04="3" key05="r" long05="4" key06="t" long06="5" key07="y" long07="6" key08="u" long08="7" key09="i" long09="8" key10="o" long10="9" key11="p" long11="0" key12="118:c:8" />
-					<row2 key01="142:layout3" key02="104:a" key03="104:s" key04="104:d" key05="104:f" key06="104:g" key07="104:h" key08="104:j" key09="104:k" key10="104:l" key11="202:action" />
-					<row3 key01="176:layout2" key02="103:z" key03="103:x" key04="103:c" key05="103:v" key06="103:b" key07="103:n" key08="103:m" key09="103:," long09="!" key10="103:." long10="?" key11="177:layout2" />
-					<row4 key01="190:" key02=":" long02="+" key03="104:/" long03="@" key04="480: " key05="102:'" long05="102:c:34" key06="-" long06="_" />
-				</layout1>
-				<layout2>
-					<keysize height="90" width="106" capslock="0" revert_layout="1" />
-					<row1 key01="102:" key02="Q" long02="1" key03="W" long03="2" key04="E" long04="3" key05="R" long05="4" key06="T" long06="5" key07="Y" long07="6" key08="U" long08="7" key09="I" long09="8" key10="O" long10="9" key11="P" long11="0" key12="118:c:8" />
-					<row2 key01="142:layout3" key02="104:A" key03="104:S" key04="104:D" key05="104:F" key06="104:G" key07="104:H" key08="104:J" key09="104:K" key10="104:L" key11="202:action" />
-					<row3 key01="176:layout1" key02="103:Z" key03="103:X" key04="103:C" key05="103:V" key06="103:B" key07="103:N" key08="103:M" key09="103:," long09="!" key10="103:." long10="?" key11="177:layout1" />
-					<row4 key01="190:" key02=":" long02="+" key03="104:/" long03="@" key04="480: " key05="102:'" long05="102:c:34" key06="-" long06="_" />
-				</layout2>
-				<layout3>
-					<keysize height="90" width="106" />
-					<row1 key01="102:" key02="1" key03="2" key04="3" key05="4" key06="5" key07="6" key08="7" key09="8" key10="9" key11="0" key12="118:c:8" />
-					<row2 key01="142:layout1" key02="104:#" key03="104:$" key04="104:%" key05="104:&amp;" key06="104:*" key07="104:-" key08="104:+" key09="104:(" key10="104:)" key11="202:action" />
-					<row3 key01="176:layout4" key02="103:&lt;" key03="103:&gt;" key04="103:=" key05="103:'" key06="103:;" key07="103:," key08="103:." key09="103:!" key10="103:?" key11="177:layout4" />
-					<row4 key01="190:" key02="/" key03="104:@" key04="480: " key05="102:c:34" key06="_" />
-				</layout3>
-				<layout4>
-					<keysize height="91" width="106" />
-					<row1 key01="102:" key02="~" key03="`" key04="|" key05="106:" key06="106:" key07="106:" key08="106:" key09="106:" key10="106:" key11="106:" key12="118:c:8" />
-					<row2 key01="142:layout1" key02="104:" key03="104:" key04="104:" key05="104:" key06="104:^" key07="104:" key08="104:" key09="104:{" key10="104:}" key11="202:action" />
-					<row3 key01="176:layout3" key02="103:\" key03="103:" key04="103:" key05="103:" key06="103:" key07="103:[" key08="103:]" key09="103:!" key10="103:?" key11="177:layout3" />
-					<row4 key01="400:" key02="480: " />
-				</layout4>
-			</object>
-		</template>
-	</templates>
-</recovery>
diff --git a/gui/devices/1440x2560/res/fonts/Roboto-Condensed-50.dat b/gui/devices/1440x2560/res/fonts/Roboto-Condensed-50.dat
deleted file mode 100644
index ae9c0f6..0000000
--- a/gui/devices/1440x2560/res/fonts/Roboto-Condensed-50.dat
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1440x2560/res/images/back-icon.png b/gui/devices/1440x2560/res/images/back-icon.png
deleted file mode 100644
index 439ec19..0000000
--- a/gui/devices/1440x2560/res/images/back-icon.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1440x2560/res/images/checkbox_checked.png b/gui/devices/1440x2560/res/images/checkbox_checked.png
deleted file mode 100644
index 65d0b34..0000000
--- a/gui/devices/1440x2560/res/images/checkbox_checked.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1440x2560/res/images/checkbox_empty.png b/gui/devices/1440x2560/res/images/checkbox_empty.png
deleted file mode 100644
index 89b4c96..0000000
--- a/gui/devices/1440x2560/res/images/checkbox_empty.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1440x2560/res/images/cursor.png b/gui/devices/1440x2560/res/images/cursor.png
deleted file mode 100644
index 32c8ae1..0000000
--- a/gui/devices/1440x2560/res/images/cursor.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1440x2560/res/images/curtain.jpg b/gui/devices/1440x2560/res/images/curtain.jpg
deleted file mode 100644
index c168882..0000000
--- a/gui/devices/1440x2560/res/images/curtain.jpg
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1440x2560/res/images/file.png b/gui/devices/1440x2560/res/images/file.png
deleted file mode 100644
index a69b619..0000000
--- a/gui/devices/1440x2560/res/images/file.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1440x2560/res/images/folder.png b/gui/devices/1440x2560/res/images/folder.png
deleted file mode 100644
index fbea7a9..0000000
--- a/gui/devices/1440x2560/res/images/folder.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1440x2560/res/images/home-icon.png b/gui/devices/1440x2560/res/images/home-icon.png
deleted file mode 100644
index b9e4039..0000000
--- a/gui/devices/1440x2560/res/images/home-icon.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1440x2560/res/images/indeterminate001.png b/gui/devices/1440x2560/res/images/indeterminate001.png
deleted file mode 100644
index f5e1646..0000000
--- a/gui/devices/1440x2560/res/images/indeterminate001.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1440x2560/res/images/indeterminate002.png b/gui/devices/1440x2560/res/images/indeterminate002.png
deleted file mode 100644
index c841fb4..0000000
--- a/gui/devices/1440x2560/res/images/indeterminate002.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1440x2560/res/images/indeterminate003.png b/gui/devices/1440x2560/res/images/indeterminate003.png
deleted file mode 100644
index 651f9e7..0000000
--- a/gui/devices/1440x2560/res/images/indeterminate003.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1440x2560/res/images/indeterminate004.png b/gui/devices/1440x2560/res/images/indeterminate004.png
deleted file mode 100644
index 21e9fca..0000000
--- a/gui/devices/1440x2560/res/images/indeterminate004.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1440x2560/res/images/indeterminate005.png b/gui/devices/1440x2560/res/images/indeterminate005.png
deleted file mode 100644
index 1dd0172..0000000
--- a/gui/devices/1440x2560/res/images/indeterminate005.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1440x2560/res/images/indeterminate006.png b/gui/devices/1440x2560/res/images/indeterminate006.png
deleted file mode 100644
index 4e5803b..0000000
--- a/gui/devices/1440x2560/res/images/indeterminate006.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1440x2560/res/images/keyboard1.png b/gui/devices/1440x2560/res/images/keyboard1.png
deleted file mode 100644
index 400f62d..0000000
--- a/gui/devices/1440x2560/res/images/keyboard1.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1440x2560/res/images/keyboard2.png b/gui/devices/1440x2560/res/images/keyboard2.png
deleted file mode 100644
index 8b864a9..0000000
--- a/gui/devices/1440x2560/res/images/keyboard2.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1440x2560/res/images/keyboard3.png b/gui/devices/1440x2560/res/images/keyboard3.png
deleted file mode 100644
index be7ca47..0000000
--- a/gui/devices/1440x2560/res/images/keyboard3.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1440x2560/res/images/keyboard4.png b/gui/devices/1440x2560/res/images/keyboard4.png
deleted file mode 100644
index 306c4b3..0000000
--- a/gui/devices/1440x2560/res/images/keyboard4.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1440x2560/res/images/medium-button.png b/gui/devices/1440x2560/res/images/medium-button.png
deleted file mode 100644
index a3bf30d..0000000
--- a/gui/devices/1440x2560/res/images/medium-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1440x2560/res/images/menu-button.png b/gui/devices/1440x2560/res/images/menu-button.png
deleted file mode 100644
index d651055..0000000
--- a/gui/devices/1440x2560/res/images/menu-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1440x2560/res/images/minus-button.png b/gui/devices/1440x2560/res/images/minus-button.png
deleted file mode 100644
index e2edbe4..0000000
--- a/gui/devices/1440x2560/res/images/minus-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1440x2560/res/images/plus-button.png b/gui/devices/1440x2560/res/images/plus-button.png
deleted file mode 100644
index 28fb825..0000000
--- a/gui/devices/1440x2560/res/images/plus-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1440x2560/res/images/progress_empty.png b/gui/devices/1440x2560/res/images/progress_empty.png
deleted file mode 100644
index 4d610c6..0000000
--- a/gui/devices/1440x2560/res/images/progress_empty.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1440x2560/res/images/progress_fill.png b/gui/devices/1440x2560/res/images/progress_fill.png
deleted file mode 100644
index 3860c24..0000000
--- a/gui/devices/1440x2560/res/images/progress_fill.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1440x2560/res/images/radio_empty.png b/gui/devices/1440x2560/res/images/radio_empty.png
deleted file mode 100644
index 9c2c66b..0000000
--- a/gui/devices/1440x2560/res/images/radio_empty.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1440x2560/res/images/radio_selected.png b/gui/devices/1440x2560/res/images/radio_selected.png
deleted file mode 100644
index 8d05b9d..0000000
--- a/gui/devices/1440x2560/res/images/radio_selected.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1440x2560/res/images/slideout.png b/gui/devices/1440x2560/res/images/slideout.png
deleted file mode 100644
index a2f2be1..0000000
--- a/gui/devices/1440x2560/res/images/slideout.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1440x2560/res/images/slider-touch.png b/gui/devices/1440x2560/res/images/slider-touch.png
deleted file mode 100644
index f6dac62..0000000
--- a/gui/devices/1440x2560/res/images/slider-touch.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1440x2560/res/images/slider-used.png b/gui/devices/1440x2560/res/images/slider-used.png
deleted file mode 100644
index f18f8ce..0000000
--- a/gui/devices/1440x2560/res/images/slider-used.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1440x2560/res/images/slider.png b/gui/devices/1440x2560/res/images/slider.png
deleted file mode 100644
index 46fa928..0000000
--- a/gui/devices/1440x2560/res/images/slider.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1440x2560/res/images/sort-button.png b/gui/devices/1440x2560/res/images/sort-button.png
deleted file mode 100644
index c4f9edd..0000000
--- a/gui/devices/1440x2560/res/images/sort-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1440x2560/res/images/top-bar.jpg b/gui/devices/1440x2560/res/images/top-bar.jpg
deleted file mode 100755
index 93137b8..0000000
--- a/gui/devices/1440x2560/res/images/top-bar.jpg
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1440x2560/res/images/unlock.png b/gui/devices/1440x2560/res/images/unlock.png
deleted file mode 100644
index dc3894b..0000000
--- a/gui/devices/1440x2560/res/images/unlock.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1440x2560/res/ui.xml b/gui/devices/1440x2560/res/ui.xml
deleted file mode 100644
index fa785b8..0000000
--- a/gui/devices/1440x2560/res/ui.xml
+++ /dev/null
@@ -1,427 +0,0 @@
-<?xml version="1.0"?>
-
-<recovery>
-	<details>
-		<resolution width="1440" height="2560" />
-		<author>TeamWin</author>
-		<title>Backup Naowz</title>
-		<description>Default basic theme</description>
-		<preview>preview.jpg</preview>
-	</details>
-
-	<include>
-		<xmlfile name="portrait.xml" />
-	</include>
-
-	<resources>
-		<resource name="font" type="font" filename="RobotoCondensed-Regular.ttf" size="50" fallback="Roboto-Condensed-50" />
-		<resource name="mediumfont" type="font" filename="RobotoCondensed-Regular.ttf" size="50" fallback="Roboto-Condensed-50" />
-		<resource name="filelist" type="font" filename="RobotoCondensed-Regular.ttf" size="50" fallback="Roboto-Condensed-50" />
-		<resource name="top_bar" type="image" filename="top-bar.jpg" />
-		<resource name="main_button" type="image" filename="menu-button" />
-		<resource name="file_icon" type="image" filename="file" />
-		<resource name="folder_icon" type="image" filename="folder" />
-		<resource name="slideout" type="image" filename="slideout" />
-		<resource name="progress" type="animation" filename="indeterminate" />
-		<resource name="progress_empty" type="image" filename="progress_empty" />
-		<resource name="progress_full" type="image" filename="progress_fill" />
-		<resource name="checkbox_false" type="image" filename="checkbox_empty" retainaspect="1" />
-		<resource name="checkbox_true" type="image" filename="checkbox_checked" retainaspect="1" />
-		<resource name="radio_false" type="image" filename="radio_empty" retainaspect="1" />
-		<resource name="radio_true" type="image" filename="radio_selected" retainaspect="1" />
-		<resource name="medium_button" type="image" filename="medium-button" />
-		<resource name="sort_button" type="image" filename="sort-button" />
-		<resource name="minus_button" type="image" filename="minus-button" />
-		<resource name="plus_button" type="image" filename="plus-button" />
-		<resource name="home_icon" type="image" filename="home-icon" />
-		<resource name="back_icon" type="image" filename="back-icon" />
-		<resource name="slider" type="image" filename="slider" />
-		<resource name="slider-used" type="image" filename="slider-used" />
-		<resource name="slider-touch" type="image" filename="slider-touch" />
-		<resource name="unlock-icon" type="image" filename="unlock" />
-		<resource name="keyboard1" type="image" filename="keyboard1" />
-		<resource name="keyboard2" type="image" filename="keyboard2" />
-		<resource name="keyboard3" type="image" filename="keyboard3" />
-		<resource name="keyboard4" type="image" filename="keyboard4" />
-		<resource name="cursor" type="image" filename="cursor" retainaspect="1" />
-	</resources>
-
-	<variables>
-		<variable name="col1_x" value="0" />
-		<variable name="col2_x" value="780" />
-		<variable name="col_center_x" value="410" />
-		<variable name="col_center_medium_x" value="593" />
-		<variable name="center_x" value="720" />
-		<variable name="row1_y" value="339" />
-		<variable name="row2_y" value="915" />
-		<variable name="row3_y" value="1480" />
-		<variable name="row4_y" value="2052" />
-		<variable name="col1_center_x" value="238" />
-		<variable name="col2_center_x" value="734" />
-		<variable name="row1_text2_y" value="412" />
-		<variable name="row2_text2_y" value="732" />
-		<variable name="row_queue_y" value="1516" />
-		<variable name="row1_header_y" value="239" />
-		<variable name="row1_text_y" value="339" />
-		<variable name="row2_text_y" value="439" />
-		<variable name="row3_text_y" value="539" />
-		<variable name="row4_text_y" value="638" />
-		<variable name="row5_text_y" value="738" />
-		<variable name="row6_text_y" value="838" />
-		<variable name="row7_text_y" value="938" />
-		<variable name="row8_text_y" value="1037" />
-		<variable name="row9_text_y" value="1137" />
-		<variable name="row10_text_y" value="1237" />
-		<variable name="row11_text_y" value="1337" />
-		<variable name="row12_text_y" value="1436" />
-		<variable name="row13_text_y" value="1536" />
-		<variable name="row14_text_y" value="1636" />
-		<variable name="row15_text_y" value="1741" />
-		<variable name="row16_text_y" value="1835" />
-		<variable name="row17_text_y" value="1935" />
-		<variable name="row18_text_y" value="2035" />
-		<variable name="zip_status_y" value="1375" />
-		<variable name="flash_list_height" value="650" />
-		<variable name="tz_selected_y" value="319" />
-		<variable name="tz_set_y" value="1995" />
-		<variable name="tz_current_y" value="1895" />
-		<variable name="col_progressbar_x" value="`0" />
-		<variable name="row_progressbar_y" value="2250" />
-		<variable name="col1_medium_x" value="13" />
-		<variable name="col2_medium_x" value="370" />
-		<variable name="col3_medium_x" value="730" />
-		<variable name="col4_medium_x" value="1080" />
-		<variable name="row1_medium_y" value="259" />
-		<variable name="row2_medium_y" value="459" />
-		<variable name="row3_medium_y" value="521" />
-		<variable name="row4_medium_y" value="858" />
-		<variable name="row5_medium_y" value="1057" />
-		<variable name="row6_medium_y" value="1676" />
-		<variable name="row7_medium_y" value="971" />
-		<variable name="slider_x" value="40" />
-		<variable name="slider_y" value="2025" />
-		<variable name="slider_text_y" value="2149" />
-		<variable name="button_text_color" value="#AAAAAA" />
-		<variable name="text_color" value="#FFFFFF" />
-		<variable name="text_success_color" value="#33B5E5" />
-		<variable name="text_fail_color" value="#FF0101" />
-		<variable name="highlight_color" value="#90909080" />
-		<variable name="caps_highlight_color" value="#33B5E580" />
-		<variable name="home_button_x" value="40" />
-		<variable name="home_button_y" value="2446" />
-		<variable name="back_button_x" value="1250" />
-		<variable name="back_button_y" value="2446" />
-		<variable name="sort_text_x" value="13" />
-		<variable name="sort_asc_text_y" value="2175" />
-		<variable name="sort_asc_button_y" value="2155" />
-		<variable name="sort_desc_text_y" value="2294" />
-		<variable name="sort_desc_button_y" value="2274" />
-		<variable name="sort_col1_button_x" value="510" />
-		<variable name="sort_col2_button_x" value="720" />
-		<variable name="sort_col3_button_x" value="920" />
-		<variable name="input_width" value="1569" />
-		<variable name="input_height" value="100" />
-		<variable name="input_background_color" value="#303030" />
-		<variable name="input_cursor_color" value="#33B5E5" />
-		<variable name="input_cursor_width" value="4" />
-		<variable name="console_x" value="0" />
-		<variable name="console_width" value="1440" />
-		<variable name="console_foreground" value="#A0A0A0" />
-		<variable name="warning" value="#F8F8A0" />
-		<variable name="error" value="#FF4040" />
-		<variable name="highlight" value="#33B5E5" />
-		<variable name="console_background" value="#303030" />
-		<variable name="console_scroll" value="#303030" />
-		<variable name="console_action_height" value="938" />
-		<variable name="console_install_height" value="1200" />
-		<variable name="console_installdone_height" value="950" />
-		<variable name="fileselector_x" value="6" />
-		<variable name="fileselector_width" value="1420" />
-		<variable name="fileselector_install_height" value="1556" />
-		<variable name="fileselector_header_background" value="#1c1c1c" />
-		<variable name="fileselector_header_textcolor" value="#AAAAAA" />
-		<variable name="fileselector_header_separatorcolor" value="#33B5E5" />
-		<variable name="fileselector_header_separatorheight" value="5" />
-		<variable name="fileselector_separatorcolor" value="#505050" />
-		<variable name="fileselector_separatorheight" value="4" />
-		<variable name="fileselector_background" value="#303030" />
-		<variable name="fileselector_highlight_color" value="#505050" />
-		<variable name="fileselector_highlight_font_color" value="#33B5E5" />
-		<variable name="fileselector_spacing" value="64" />
-		<variable name="fastscroll_linecolor" value="#50505080" />
-		<variable name="fastscroll_rectcolor" value="#33B5E580" />
-		<variable name="fastscroll_w" value="120" />
-		<variable name="fastscroll_linew" value="4" />
-		<variable name="fastscroll_rectw" value="32" />
-		<variable name="fastscroll_recth" value="90" />
-		<variable name="listbox_x" value="6" />
-		<variable name="listbox_width" value="1583" />
-		<variable name="listbox_tz_height" value="1177" />
-		<variable name="listbox_background" value="#303030" />
-		<variable name="listbox_spacing" value="62" />
-		<variable name="sd_plus_x" value="698" />
-		<variable name="sdext_text_x" value="219" />
-		<variable name="sdext_text_y" value="360" />
-		<variable name="sdswap_button_y" value="519" />
-		<variable name="sdswap_text_x" value="220" />
-		<variable name="sdswap_text_y" value="539" />
-		<variable name="sdfilesystem_text_y" value="678" />
-		<variable name="sdfilesystem_button_y" value="758" />
-		<variable name="lock_x" value="420" />
-		<variable name="lock_y" value="800" />
-		<variable name="filemanager_select_x" value="1117" />
-		<variable name="filemanager_select_y" value="2155" />
-		<variable name="backup_name_y" value="1097" />
-		<variable name="terminal_console_height" value="1303" />
-		<variable name="terminal_text_y" value="1363" />
-		<variable name="terminal_button_y" value="1397" />
-		<variable name="row_dst_text_y" value="1436" />
-		<variable name="row_offset_text_y" value="1536" />
-		<variable name="row_offset_medium_y" value="1676" />
-		<variable name="button_fill_color" value="#303030" />
-		<variable name="button_fill_full_width" value="1569" />
-		<variable name="button_fill_main_width" value="751" />
-		<variable name="button_fill_main_height" value="431" />
-		<variable name="button_fill_half_height" value="216" />
-		<variable name="button_fill_quarter_height" value="108" />
-		<variable name="backup_list_height" value="1037" />
-		<variable name="backup_button_row1" value="1487" />
-		<variable name="backup_button_row2" value="1623" />
-		<variable name="mount_list_height" value="1377" />
-		<variable name="mount_storage_row" value="1649" />
-		<variable name="storage_list_height" value="1330" />
-		<variable name="wipe_list_height" value="1320" />
-		<variable name="wipe_button_row1" value="1684" />
-		<variable name="wipe_button_y" value="1298" />
-		<variable name="slidervalue_w" value="1569" />
-		<variable name="slidervalue_line_clr" value="#FFFFFF" />
-		<variable name="slidervalue_slider_clr" value="#33B5E5" />
-		<variable name="slidervalue_lineh" value="3" />
-		<variable name="slidervalue_padding" value="30" />
-		<variable name="slidervalue_sliderw" value="15" />
-		<variable name="slidervalue_sliderh" value="90" />
-	</variables>
-
-	<mousecursor>
-		<placement w="15" h="15" />
-		<background color="#FFFF00FF" resource="cursor" />
-		<speed multiplier="2.5" />
-	</mousecursor>
-
-	<templates>
-		<template name="header">
-			<background color="#000000FF" />
-
-			<object type="image">
-				<image resource="top_bar" />
-				<placement x="0" y="0" />
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="239" y="20" />
-				<text>Team Win Recovery Project  v%tw_version%</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<condition var1="tw_simulate_actions" var2="1" />
-				<font resource="font" />
-				<placement x="239" y="80" />
-				<text>SIMULATING ACTIONS</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="239" y="132" />
-				<text>%tw_time%</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="489" y="132" />
-				<conditions>
-					<condition var1="tw_no_battery_percent" var2="0" />
-					<condition var1="tw_battery" op="&gt;" var2="0" />
-					<condition var1="tw_battery" op="&lt;" var2="101" />
-				</conditions>
-				<text>Battery: %tw_battery%</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="819" y="132" />
-				<conditions>
-					<condition var1="tw_no_cpu_temp" var2="0" />
-				</conditions>
-				<text>CPU: %tw_cpu_temp% C</text>
-			</object>
-
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<placement x="%home_button_x%" y="%home_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text></text>
-				<image resource="home_icon" />
-				<condition var1="tw_busy" var2="0" />
-				<action function="key">home</action>
-			</object>
-
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<placement x="%back_button_x%" y="%back_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text></text>
-				<image resource="back_icon" />
-				<condition var1="tw_busy" var2="0" />
-				<action function="key">back</action>
-			</object>
-
-			<object type="action">
-				<touch key="power" />
-				<action function="overlay">lock</action>
-			</object>
-
-			<object type="action">
-				<touch key="power+voldown" />
-				<action function="screenshot" />
-			</object>
-		</template>
-
-		<template name="progress_bar">
-			<object type="progressbar">
-				<placement x="%col_progressbar_x%" y="%row_progressbar_y%" />
-				<resource empty="progress_empty" full="progress_full" />
-				<data name="ui_progress" />
-			</object>
-
-			<object type="animation">
-				<placement x="%col_progressbar_x%" y="%row_progressbar_y%" />
-				<resource name="progress" />
-				<speed fps="15" render="2" />
-				<loop frame="1" />
-			</object>
-		</template>
-
-		<template name="sort_options">
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="%sort_text_x%" y="%sort_asc_text_y%" />
-				<text>Sort Ascending:</text>
-			</object>
-
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<placement x="%sort_col1_button_x%" y="%sort_asc_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Name</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=1</action>
-			</object>
-
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<placement x="%sort_col2_button_x%" y="%sort_asc_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Date</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=2</action>
-			</object>
-
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<placement x="%sort_col3_button_x%" y="%sort_asc_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Size</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=3</action>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="%sort_text_x%" y="%sort_desc_text_y%" />
-				<text>Sort Descending:</text>
-			</object>
-
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<placement x="%sort_col1_button_x%" y="%sort_desc_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Name</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=-1</action>
-			</object>
-
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<placement x="%sort_col2_button_x%" y="%sort_desc_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Date</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=-2</action>
-			</object>
-
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<placement x="%sort_col3_button_x%" y="%sort_desc_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Size</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=-3</action>
-			</object>
-		</template>
-
-		<template name="action_page_console">
-			<object type="console">
-				<placement x="0" y="%row2_y%" w="1440" h="938" />
-				<color foreground="%console_foreground%" background="%console_background%" scroll="%console_scroll%" />
-				<font resource="fixed" />
-			</object>
-		</template>
-
-		<template name="footer">
-			<object type="console">
-				<slideout resource="slideout" x="650" y="2448" />
-				<placement x="%console_x%" y="0" w="%console_width%" h="2448" />
-				<color foreground="%console_foreground%" background="%console_background%" scroll="%console_scroll%" />
-				<font resource="fixed" />
-			</object>
-		</template>
-
-		<template name="keyboardtemplate">
-			<object type="keyboard">
-				<placement x="0" y="1440" />
-				<layout resource1="keyboard1" resource2="keyboard2" resource3="keyboard3" resource4="keyboard4" />
-				<highlight color="%highlight_color%" />
-				<capshighlight color="%caps_highlight_color%" />
-				<layout1>
-					<keysize height="215" width="144" />
-					<row1 key01="q" long01="1" key02="w" long02="2" key03="e" long03="3" key04="r" long04="4" key05="t" long05="5" key06="y" long06="6" key07="u" long07="7" key08="i" long08="8" key09="o" long09="9" key10="p" long10="0" />
-					<row2 key01="216:a" long01="@" key02="s" long02="#" key03="d" long03="$" key04="f" long04="%" key05="g" long05="&amp;" key06="h" long06="*" key07="j" long07="-" key08="k" long08="+" key09="216:l" long09="_" />
-					<row3 key01="216:layout2" key02="z" long02="!" key03="x" key04="c" long04="'" key05="v" long05=":" key06="b" long06=";" key07="n" long07="/" key08="m" long08="?" key09="216:c:8" />
-					<row4 key01="216:layout3" key02="/" key03="720: " key04="." key05="216:action" />
-				</layout1>
-				<layout2>
-					<keysize height="214" width="144" capslock="0" revert_layout="1" />
-					<row1 key01="Q" long01="1" key02="W" long02="2" key03="E" long03="3" key04="R" long04="4" key05="T" long05="5" key06="Y" long06="6" key07="U" long07="7" key08="I" long08="8" key09="O" long09="9" key10="P" long10="0" />
-					<row2 key01="216:A" long01="@" key02="S" long02="#" key03="D" long03="$" key04="F" long04="%" key05="G" long05="&amp;" key06="H" long06="*" key07="J" long07="-" key08="K" long08="+" key09="216:L" long09="_" />
-					<row3 key01="216:layout1" key02="Z" long02="!" key03="X" key04="C" long04="'" key05="V" long05=":" key06="B" long06=";" key07="N" long07="/" key08="M" long08="?" key09="216:c:8" />
-					<row4 key01="216:layout3" key02="/" key03="720: " key04="." key05="216:action" />
-				</layout2>
-				<layout3>
-					<keysize height="215" width="144" />
-					<row1 key01="1" key02="2" key03="3" key04="4" key05="5" key06="6" key07="7" key08="8" key09="9" key10="0" />
-					<row2 key01="@" key02="#" key03="$" key04="%" key05="&amp;" key06="*" key07="-" key08="+" key09="(" key10=")" />
-					<row3 key01="216:layout4" key02="!" key03="144:c:34" key04="'" key05=":" key06=";" key07="/" key08="?" key09="216:c:8" />
-					<row4 key01="216:layout1" key02="," key03="720: " key04="." key05="216:action" />
-				</layout3>
-				<layout4>
-					<keysize height="214" width="144" />
-					<row1 key01="~" key02="`" key03="|" key04="144:" key05="144:" key06="144:" key07="144:" key08="144:" key09="{" key10="}" />
-					<row2 key01="144:" key02="144:" key03="144:" key04="144:" key05="144:" key06="^" key07="_" key08="=" key09="[" key10="]" />
-					<row3 key01="216:layout3" key02="144:" key03="144:" key04="144:" key05="144:" key06="\" key07="&lt;" key08="&gt;" key09="216:c:8" />
-					<row4 key01="216:layout1" key02="144:c:34" key03="720: " key04="." key05="216:action" />
-				</layout4>
-			</object>
-		</template>
-	</templates>
-</recovery>
diff --git a/gui/devices/1600x2560/res/fonts/Roboto-Condensed-40.dat b/gui/devices/1600x2560/res/fonts/Roboto-Condensed-40.dat
deleted file mode 100644
index ff23add..0000000
--- a/gui/devices/1600x2560/res/fonts/Roboto-Condensed-40.dat
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1600x2560/res/images/back-icon.png b/gui/devices/1600x2560/res/images/back-icon.png
deleted file mode 100644
index 85c6a5d..0000000
--- a/gui/devices/1600x2560/res/images/back-icon.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1600x2560/res/images/checkbox_checked.png b/gui/devices/1600x2560/res/images/checkbox_checked.png
deleted file mode 100644
index 65d0b34..0000000
--- a/gui/devices/1600x2560/res/images/checkbox_checked.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1600x2560/res/images/checkbox_empty.png b/gui/devices/1600x2560/res/images/checkbox_empty.png
deleted file mode 100644
index 89b4c96..0000000
--- a/gui/devices/1600x2560/res/images/checkbox_empty.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1600x2560/res/images/cursor.png b/gui/devices/1600x2560/res/images/cursor.png
deleted file mode 100644
index 32c8ae1..0000000
--- a/gui/devices/1600x2560/res/images/cursor.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1600x2560/res/images/curtain.jpg b/gui/devices/1600x2560/res/images/curtain.jpg
deleted file mode 100644
index bcbfa46..0000000
--- a/gui/devices/1600x2560/res/images/curtain.jpg
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1600x2560/res/images/file.png b/gui/devices/1600x2560/res/images/file.png
deleted file mode 100644
index a69b619..0000000
--- a/gui/devices/1600x2560/res/images/file.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1600x2560/res/images/folder.png b/gui/devices/1600x2560/res/images/folder.png
deleted file mode 100644
index fbea7a9..0000000
--- a/gui/devices/1600x2560/res/images/folder.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1600x2560/res/images/home-icon.png b/gui/devices/1600x2560/res/images/home-icon.png
deleted file mode 100644
index d6bc73d..0000000
--- a/gui/devices/1600x2560/res/images/home-icon.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1600x2560/res/images/indeterminate001.png b/gui/devices/1600x2560/res/images/indeterminate001.png
deleted file mode 100644
index a205e91..0000000
--- a/gui/devices/1600x2560/res/images/indeterminate001.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1600x2560/res/images/indeterminate002.png b/gui/devices/1600x2560/res/images/indeterminate002.png
deleted file mode 100644
index f777408..0000000
--- a/gui/devices/1600x2560/res/images/indeterminate002.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1600x2560/res/images/indeterminate003.png b/gui/devices/1600x2560/res/images/indeterminate003.png
deleted file mode 100644
index cbb5974..0000000
--- a/gui/devices/1600x2560/res/images/indeterminate003.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1600x2560/res/images/indeterminate004.png b/gui/devices/1600x2560/res/images/indeterminate004.png
deleted file mode 100644
index 5ff7734..0000000
--- a/gui/devices/1600x2560/res/images/indeterminate004.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1600x2560/res/images/indeterminate005.png b/gui/devices/1600x2560/res/images/indeterminate005.png
deleted file mode 100644
index 7cc9abb..0000000
--- a/gui/devices/1600x2560/res/images/indeterminate005.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1600x2560/res/images/indeterminate006.png b/gui/devices/1600x2560/res/images/indeterminate006.png
deleted file mode 100644
index 9eed176..0000000
--- a/gui/devices/1600x2560/res/images/indeterminate006.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1600x2560/res/images/keyboard1.png b/gui/devices/1600x2560/res/images/keyboard1.png
deleted file mode 100644
index fbec19b..0000000
--- a/gui/devices/1600x2560/res/images/keyboard1.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1600x2560/res/images/keyboard2.png b/gui/devices/1600x2560/res/images/keyboard2.png
deleted file mode 100644
index 9e6ea26..0000000
--- a/gui/devices/1600x2560/res/images/keyboard2.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1600x2560/res/images/keyboard3.png b/gui/devices/1600x2560/res/images/keyboard3.png
deleted file mode 100644
index bba12d0..0000000
--- a/gui/devices/1600x2560/res/images/keyboard3.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1600x2560/res/images/keyboard4.png b/gui/devices/1600x2560/res/images/keyboard4.png
deleted file mode 100644
index bd5a80c..0000000
--- a/gui/devices/1600x2560/res/images/keyboard4.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1600x2560/res/images/medium-button.png b/gui/devices/1600x2560/res/images/medium-button.png
deleted file mode 100644
index a3bf30d..0000000
--- a/gui/devices/1600x2560/res/images/medium-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1600x2560/res/images/menu-button.png b/gui/devices/1600x2560/res/images/menu-button.png
deleted file mode 100644
index 7b48be3..0000000
--- a/gui/devices/1600x2560/res/images/menu-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1600x2560/res/images/minus-button.png b/gui/devices/1600x2560/res/images/minus-button.png
deleted file mode 100644
index e2edbe4..0000000
--- a/gui/devices/1600x2560/res/images/minus-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1600x2560/res/images/plus-button.png b/gui/devices/1600x2560/res/images/plus-button.png
deleted file mode 100644
index b67d9b9..0000000
--- a/gui/devices/1600x2560/res/images/plus-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1600x2560/res/images/progress_empty.png b/gui/devices/1600x2560/res/images/progress_empty.png
deleted file mode 100644
index d4ea0c2..0000000
--- a/gui/devices/1600x2560/res/images/progress_empty.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1600x2560/res/images/progress_fill.png b/gui/devices/1600x2560/res/images/progress_fill.png
deleted file mode 100644
index 836e437..0000000
--- a/gui/devices/1600x2560/res/images/progress_fill.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1600x2560/res/images/radio_empty.png b/gui/devices/1600x2560/res/images/radio_empty.png
deleted file mode 100644
index 9c2c66b..0000000
--- a/gui/devices/1600x2560/res/images/radio_empty.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1600x2560/res/images/radio_selected.png b/gui/devices/1600x2560/res/images/radio_selected.png
deleted file mode 100644
index 8d05b9d..0000000
--- a/gui/devices/1600x2560/res/images/radio_selected.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1600x2560/res/images/slideout.png b/gui/devices/1600x2560/res/images/slideout.png
deleted file mode 100644
index 56a9ac2..0000000
--- a/gui/devices/1600x2560/res/images/slideout.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1600x2560/res/images/slider-touch.png b/gui/devices/1600x2560/res/images/slider-touch.png
deleted file mode 100644
index b3365af..0000000
--- a/gui/devices/1600x2560/res/images/slider-touch.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1600x2560/res/images/slider-used.png b/gui/devices/1600x2560/res/images/slider-used.png
deleted file mode 100644
index 229d910..0000000
--- a/gui/devices/1600x2560/res/images/slider-used.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1600x2560/res/images/slider.png b/gui/devices/1600x2560/res/images/slider.png
deleted file mode 100644
index 1e034a6..0000000
--- a/gui/devices/1600x2560/res/images/slider.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1600x2560/res/images/sort-button.png b/gui/devices/1600x2560/res/images/sort-button.png
deleted file mode 100644
index c6783a1..0000000
--- a/gui/devices/1600x2560/res/images/sort-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1600x2560/res/images/top-bar.jpg b/gui/devices/1600x2560/res/images/top-bar.jpg
deleted file mode 100644
index 93137b8..0000000
--- a/gui/devices/1600x2560/res/images/top-bar.jpg
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1600x2560/res/images/unlock.png b/gui/devices/1600x2560/res/images/unlock.png
deleted file mode 100644
index dc3894b..0000000
--- a/gui/devices/1600x2560/res/images/unlock.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1600x2560/res/ui.xml b/gui/devices/1600x2560/res/ui.xml
deleted file mode 100644
index 1970c8b..0000000
--- a/gui/devices/1600x2560/res/ui.xml
+++ /dev/null
@@ -1,425 +0,0 @@
-<?xml version="1.0"?>
-
-<recovery>
-	<details>
-		<resolution width="1600" height="2560" />
-		<author>TeamWin</author>
-		<title>Backup Naowz</title>
-		<description>Default basic theme</description>
-		<preview>preview.jpg</preview>
-	</details>
-
-	<include>
-		<xmlfile name="portrait.xml" />
-	</include>
-
-	<resources>
-		<resource name="font" type="font" filename="RobotoCondensed-Regular.ttf" size="40" fallback="Roboto-Condensed-40" />
-		<resource name="mediumfont" type="font" filename="RobotoCondensed-Regular.ttf" size="40" fallback="Roboto-Condensed-40" />
-		<resource name="filelist" type="font" filename="RobotoCondensed-Regular.ttf" size="40" fallback="Roboto-Condensed-40" />
-		<resource name="top_bar" type="image" filename="top-bar.jpg" />
-		<resource name="main_button" type="image" filename="menu-button" />
-		<resource name="file_icon" type="image" filename="file" />
-		<resource name="folder_icon" type="image" filename="folder" />
-		<resource name="slideout" type="image" filename="slideout" />
-		<resource name="progress" type="animation" filename="indeterminate" />
-		<resource name="progress_empty" type="image" filename="progress_empty" />
-		<resource name="progress_full" type="image" filename="progress_fill" />
-		<resource name="checkbox_false" type="image" filename="checkbox_empty" retainaspect="1" />
-		<resource name="checkbox_true" type="image" filename="checkbox_checked" retainaspect="1" />
-		<resource name="radio_false" type="image" filename="radio_empty" retainaspect="1" />
-		<resource name="radio_true" type="image" filename="radio_selected" retainaspect="1" />
-		<resource name="medium_button" type="image" filename="medium-button" />
-		<resource name="sort_button" type="image" filename="sort-button" />
-		<resource name="minus_button" type="image" filename="minus-button" />
-		<resource name="plus_button" type="image" filename="plus-button" />
-		<resource name="home_icon" type="image" filename="home-icon" />
-		<resource name="back_icon" type="image" filename="back-icon" />
-		<resource name="slider" type="image" filename="slider" />
-		<resource name="slider-used" type="image" filename="slider-used" />
-		<resource name="slider-touch" type="image" filename="slider-touch" />
-		<resource name="unlock-icon" type="image" filename="unlock" />
-		<resource name="keyboard1" type="image" filename="keyboard1" />
-		<resource name="keyboard2" type="image" filename="keyboard2" />
-		<resource name="keyboard3" type="image" filename="keyboard3" />
-		<resource name="keyboard4" type="image" filename="keyboard4" />
-		<resource name="cursor" type="image" filename="cursor" retainaspect="1" />
-	</resources>
-
-	<variables>
-		<variable name="col1_x" value="120" />
-		<variable name="col2_x" value="904" />
-		<variable name="col_center_x" value="521" />
-		<variable name="col_center_medium_x" value="629" />
-		<variable name="center_x" value="798" />
-		<variable name="row1_y" value="339" />
-		<variable name="row2_y" value="818" />
-		<variable name="row3_y" value="1297" />
-		<variable name="row4_y" value="1776" />
-
-		<!-- these two are unused? -->
-		<variable name="col1_center_x" value="238" />
-		<variable name="col2_center_x" value="734" />
-
-		<variable name="row1_text2_y" value="412" />
-		<variable name="row2_text2_y" value="732" />
-		<variable name="row_queue_y" value="1516" />
-		<variable name="row1_header_y" value="239" />
-		<variable name="row1_text_y" value="339" />
-		<variable name="row2_text_y" value="439" />
-		<variable name="row3_text_y" value="539" />
-		<variable name="row4_text_y" value="638" />
-		<variable name="row5_text_y" value="738" />
-		<variable name="row6_text_y" value="838" />
-		<variable name="row7_text_y" value="938" />
-		<variable name="row8_text_y" value="1037" />
-		<variable name="row9_text_y" value="1137" />
-		<variable name="row10_text_y" value="1237" />
-		<variable name="row11_text_y" value="1337" />
-		<variable name="row12_text_y" value="1436" />
-		<variable name="row13_text_y" value="1536" />
-		<variable name="row14_text_y" value="1636" />
-		<variable name="row15_text_y" value="1736" />
-		<variable name="row16_text_y" value="1835" />
-		<variable name="row17_text_y" value="1935" />
-		<variable name="row18_text_y" value="2035" />
-		<variable name="zip_status_y" value="1250" />
-		<variable name="flash_list_height" value="650" />
-		<variable name="tz_selected_y" value="319" />
-		<variable name="tz_set_y" value="1995" />
-		<variable name="tz_current_y" value="1895" />
-		<variable name="col_progressbar_x" value="615" />
-		<variable name="row_progressbar_y" value="2195" />
-		<variable name="col1_medium_x" value="110" />
-		<variable name="col2_medium_x" value="490" />
-		<variable name="col3_medium_x" value="860" />
-		<variable name="col4_medium_x" value="1242" />
-		<variable name="row1_medium_y" value="259" />
-		<variable name="row2_medium_y" value="459" />
-		<variable name="row3_medium_y" value="521" />
-		<variable name="row4_medium_y" value="858" />
-		<variable name="row5_medium_y" value="1057" />
-		<variable name="row6_medium_y" value="1676" />
-		<variable name="row7_medium_y" value="971" />
-		<variable name="slider_x" value="353" />
-		<variable name="slider_y" value="2125" />
-		<variable name="slider_text_y" value="2229" />
-		<variable name="button_text_color" value="#AAAAAA" />
-		<variable name="text_color" value="#FFFFFF" />
-		<variable name="text_success_color" value="#33B5E5" />
-		<variable name="text_fail_color" value="#FF0101" />
-		<variable name="highlight_color" value="#90909080" />
-		<variable name="caps_highlight_color" value="#33B5E580" />
-		<variable name="home_button_x" value="385" />
-		<variable name="home_button_y" value="2446" />
-		<variable name="back_button_x" value="1090" />
-		<variable name="back_button_y" value="2446" />
-		<variable name="sort_text_x" value="120" />
-		<variable name="sort_asc_text_y" value="2175" />
-		<variable name="sort_asc_button_y" value="2155" />
-		<variable name="sort_desc_text_y" value="2294" />
-		<variable name="sort_desc_button_y" value="2274" />
-		<variable name="sort_col1_button_x" value="519" />
-		<variable name="sort_col2_button_x" value="718" />
-		<variable name="sort_col3_button_x" value="918" />
-		<variable name="input_width" value="1360" />
-		<variable name="input_height" value="100" />
-		<variable name="input_background_color" value="#303030" />
-		<variable name="input_cursor_color" value="#33B5E5" />
-		<variable name="input_cursor_width" value="4" />
-		<variable name="console_x" value="0" />
-		<variable name="console_width" value="1600" />
-		<variable name="console_foreground" value="#A0A0A0" />
-		<variable name="warning" value="#F8F8A0" />
-		<variable name="error" value="#FF4040" />
-		<variable name="highlight" value="#33B5E5" />
-		<variable name="console_background" value="#303030" />
-		<variable name="console_scroll" value="#303030" />
-		<variable name="console_action_height" value="938" />
-		<variable name="console_install_height" value="1500" />
-		<variable name="console_installdone_height" value="900" />
-		<variable name="fileselector_x" value="120" />
-		<variable name="fileselector_width" value="1360" />
-		<variable name="fileselector_install_height" value="1556" />
-		<variable name="fileselector_header_background" value="#202020" />
-		<variable name="fileselector_header_textcolor" value="#AAAAAA" />
-		<variable name="fileselector_header_separatorcolor" value="#33B5E5" />
-		<variable name="fileselector_header_separatorheight" value="5" />
-		<variable name="fileselector_separatorcolor" value="#505050" />
-		<variable name="fileselector_separatorheight" value="4" />
-		<variable name="fileselector_background" value="#303030" />
-		<variable name="fileselector_highlight_color" value="#505050" />
-		<variable name="fileselector_highlight_font_color" value="#33B5E5" />
-		<variable name="fileselector_spacing" value="64" />
-		<variable name="fastscroll_linecolor" value="#50505080" />
-		<variable name="fastscroll_rectcolor" value="#33B5E580" />
-		<variable name="fastscroll_w" value="120" />
-		<variable name="fastscroll_linew" value="4" />
-		<variable name="fastscroll_rectw" value="24" />
-		<variable name="fastscroll_recth" value="90" />
-		<variable name="listbox_x" value="120" />
-		<variable name="listbox_width" value="1360" />
-		<variable name="listbox_tz_height" value="1177" />
-		<variable name="listbox_background" value="#303030" />
-		<variable name="listbox_spacing" value="62" />
-		<variable name="sd_plus_x" value="698" />
-		<variable name="sdext_text_x" value="219" />
-		<variable name="sdext_text_y" value="360" />
-		<variable name="sdswap_button_y" value="519" />
-		<variable name="sdswap_text_x" value="220" />
-		<variable name="sdswap_text_y" value="539" />
-		<variable name="sdfilesystem_text_y" value="678" />
-		<variable name="sdfilesystem_button_y" value="758" />
-		<variable name="lock_x" value="495" />
-		<variable name="lock_y" value="800" />
-		<variable name="filemanager_select_x" value="1117" />
-		<variable name="filemanager_select_y" value="2155" />
-		<variable name="backup_name_y" value="1097" />
-		<variable name="terminal_console_height" value="1303" />
-		<variable name="terminal_text_y" value="1363" />
-		<variable name="terminal_button_y" value="1397" />
-		<variable name="row_dst_text_y" value="1436" />
-		<variable name="row_offset_text_y" value="1536" />
-		<variable name="row_offset_medium_y" value="1676" />
-		<variable name="button_fill_color" value="#303030" />
-		<variable name="button_fill_full_width" value="1360" />
-		<variable name="button_fill_main_width" value="577" />
-		<variable name="button_fill_main_height" value="431" />
-		<variable name="button_fill_half_height" value="216" />
-		<variable name="button_fill_quarter_height" value="108" />
-		<variable name="backup_list_height" value="1037" />
-		<variable name="backup_button_row1" value="1487" />
-		<variable name="backup_button_row2" value="1623" />
-		<variable name="mount_list_height" value="1377" />
-		<variable name="mount_storage_row" value="1649" />
-		<variable name="storage_list_height" value="1330" />
-		<variable name="wipe_list_height" value="1620" />
-		<variable name="wipe_button_row1" value="1884" />
-		<variable name="wipe_button_y" value="1298" />
-		<variable name="slidervalue_w" value="1355" />
-		<variable name="slidervalue_line_clr" value="#FFFFFF" />
-		<variable name="slidervalue_slider_clr" value="#33B5E5" />
-		<variable name="slidervalue_lineh" value="3" />
-		<variable name="slidervalue_padding" value="30" />
-		<variable name="slidervalue_sliderw" value="15" />
-		<variable name="slidervalue_sliderh" value="90" />
-	</variables>
-
-	<mousecursor>
-		<placement w="15" h="15" />
-		<background color="#FFFF00FF" resource="cursor" />
-		<speed multiplier="2.5" />
-	</mousecursor>
-
-	<templates>
-		<template name="header">
-			<background color="#000000FF" />
-
-			<object type="image">
-				<image resource="top_bar" />
-				<placement x="0" y="0" />
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="500" y="20" />
-				<text>Team Win Recovery Project  v%tw_version%</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<condition var1="tw_simulate_actions" var2="1" />
-				<font resource="font" />
-				<placement x="239" y="80" />
-				<text>SIMULATING ACTIONS</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="239" y="132" />
-				<text>Time: %tw_time%</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="650" y="132" />
-				<conditions>
-					<condition var1="tw_no_battery_percent" var2="0" />
-					<condition var1="tw_battery" op="&gt;" var2="0" />
-					<condition var1="tw_battery" op="&lt;" var2="101" />
-				</conditions>
-				<text>Battery Level: %tw_battery%</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="1200" y="132" />
-				<conditions>
-					<condition var1="tw_no_cpu_temp" var2="0" />
-				</conditions>
-				<text>CPU Temp: %tw_cpu_temp%C</text>
-			</object>
-
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<placement x="%home_button_x%" y="%home_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text></text>
-				<image resource="home_icon" />
-				<condition var1="tw_busy" var2="0" />
-				<action function="key">home</action>
-			</object>
-
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<placement x="%back_button_x%" y="%back_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text></text>
-				<image resource="back_icon" />
-				<condition var1="tw_busy" var2="0" />
-				<action function="key">back</action>
-			</object>
-
-			<object type="action">
-				<touch key="power" />
-				<action function="overlay">lock</action>
-			</object>
-		</template>
-
-		<template name="progress_bar">
-			<object type="progressbar">
-				<placement x="%col_progressbar_x%" y="%row_progressbar_y%" />
-				<resource empty="progress_empty" full="progress_full" />
-				<data name="ui_progress" />
-			</object>
-
-			<object type="animation">
-				<placement x="%col_progressbar_x%" y="%row_progressbar_y%" />
-				<resource name="progress" />
-				<speed fps="15" render="2" />
-				<loop frame="1" />
-			</object>
-		</template>
-
-		<template name="sort_options">
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="%sort_text_x%" y="%sort_asc_text_y%" />
-				<text>Sort Ascending:</text>
-			</object>
-
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<placement x="%sort_col1_button_x%" y="%sort_asc_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Name</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=1</action>
-			</object>
-
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<placement x="%sort_col2_button_x%" y="%sort_asc_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Date</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=2</action>
-			</object>
-
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<placement x="%sort_col3_button_x%" y="%sort_asc_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Size</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=3</action>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="%sort_text_x%" y="%sort_desc_text_y%" />
-				<text>Sort Descending:</text>
-			</object>
-
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<placement x="%sort_col1_button_x%" y="%sort_desc_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Name</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=-1</action>
-			</object>
-
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<placement x="%sort_col2_button_x%" y="%sort_desc_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Date</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=-2</action>
-			</object>
-
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<placement x="%sort_col3_button_x%" y="%sort_desc_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Size</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=-3</action>
-			</object>
-		</template>
-
-		<template name="action_page_console">
-			<object type="console">
-				<placement x="0" y="%row2_y%" w="1600" h="938" />
-				<color foreground="%console_foreground%" background="%console_background%" scroll="%console_scroll%" />
-				<font resource="fixed" />
-			</object>
-		</template>
-
-		<template name="footer">
-			<object type="console">
-				<slideout resource="slideout" x="745" y="2446" />
-				<placement x="%console_x%" y="0" w="%console_width%" h="2448" />
-				<color foreground="%console_foreground%" background="%console_background%" scroll="%console_scroll%" />
-				<font resource="fixed" />
-			</object>
-		</template>
-
-		<template name="keyboardtemplate">
-			<object type="keyboard">
-				<placement x="0" y="1487" />
-				<layout resource1="keyboard1" resource2="keyboard2" resource3="keyboard3" resource4="keyboard4" />
-				<highlight color="%highlight_color%" />
-				<capshighlight color="%caps_highlight_color%" />
-				<layout1>
-					<keysize height="238" width="160" />
-					<row1 key01="q" long01="1" key02="w" long02="2" key03="e" long03="3" key04="r" long04="4" key05="t" long05="5" key06="y" long06="6" key07="u" long07="7" key08="i" long08="8" key09="o" long09="9" key10="p" long10="0" />
-					<row2 key01="238:a" long01="@" key02="s" long02="#" key03="d" long03="$" key04="f" long04="%" key05="g" long05="&amp;" key06="h" long06="*" key07="j" long07="-" key08="k" long08="+" key09="162:l" long09="_" />
-					<row3 key01="238:layout2" key02="z" long02="!" key03="x" key04="c" long04="'" key05="v" long05=":" key06="b" long06=";" key07="n" long07="/" key08="m" long08="?" key09="238:c:8" />
-					<row4 key01="238:layout3" key02="160:c:47" key03="800: " key04="." key05="238:action" />
-				</layout1>
-				<layout2>
-					<keysize height="238" width="160" capslock="0" revert_layout="1" />
-					<row1 key01="Q" long01="1" key02="W" long02="2" key03="E" long03="3" key04="R" long04="4" key05="T" long05="5" key06="Y" long06="6" key07="U" long07="7" key08="I" long08="8" key09="O" long09="9" key10="P" long10="0" />
-					<row2 key01="238:A" long01="@" key02="S" long02="#" key03="D" long03="$" key04="F" long04="%" key05="G" long05="&amp;" key06="H" long06="*" key07="J" long07="-" key08="K" long08="+" key09="162:L" long09="_" />
-					<row3 key01="238:layout1" key02="Z" long02="!" key03="X" key04="C" long04="'" key05="V" long05=":" key06="B" long06=";" key07="N" long07="/" key08="M" long08="?" key09="238:c:8" />
-					<row4 key01="238:layout3" key02="160:c:47" key03="800: " key04="." key05="238:action" />
-				</layout2>
-				<layout3>
-					<keysize height="238" width="160" />
-					<row1 key01="1" key02="2" key03="3" key04="4" key05="5" key06="6" key07="7" key08="8" key09="9" key10="0" />
-					<row2 key01="@" key02="#" key03="$" key04="%" key05="&amp;" key06="*" key07="-" key08="+" key09="(" key10=")" />
-					<row3 key01="238:layout4" key02="!" key03="160:c:34" key04="'" key05=":" key06=";" key07="/" key08="?" key09="238:c:8" />
-					<row4 key01="238:layout1" key02="," key03="800: " key04="." key05="238:action" />
-				</layout3>
-				<layout4>
-					<keysize height="238" width="160" />
-					<row1 key01="~" key02="`" key03="|" key04="160:" key05="160:" key06="160:" key07="%" key08="160:" key09="{" key10="}" />
-					<row2 key01="160:" key02="160:" key03="160:" key04="160:" key05="160:" key06="^" key07="_" key08="=" key09="[" key10="]" />
-					<row3 key01="238:layout3" key02="160:" key03="160:" key04="160:" key05="160:" key06="\" key07="&lt;" key08="&gt;" key09="238:c:8" />
-					<row4 key01="238:layout1" key02="160:c:34" key03="800: " key04="." key05="238:action" />
-				</layout4>
-			</object>
-		</template>
-	</templates>
-</recovery>
diff --git a/gui/devices/1920x1200/res/images/background.jpg b/gui/devices/1920x1200/res/images/background.jpg
deleted file mode 100644
index 9e61f9e..0000000
--- a/gui/devices/1920x1200/res/images/background.jpg
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1920x1200/res/images/twrplogo.png b/gui/devices/1920x1200/res/images/twrplogo.png
new file mode 100644
index 0000000..6847db6
--- /dev/null
+++ b/gui/devices/1920x1200/res/images/twrplogo.png
Binary files differ
diff --git a/gui/devices/1920x1200/res/ui.xml b/gui/devices/1920x1200/res/ui.xml
index 2cd42b5..867233b 100644
--- a/gui/devices/1920x1200/res/ui.xml
+++ b/gui/devices/1920x1200/res/ui.xml
@@ -15,10 +15,10 @@
 
 	<resources>
 		<resource name="font" type="font" filename="RobotoCondensed-Regular.ttf" size="30" fallback="Roboto-Regular-30" />
-		<resource name="base" type="image" filename="background.jpg" />
+		<resource name="twrplogo" type="image" filename="twrplogo" retainaspect="1" />
 		<resource name="main_button" type="image" filename="button" />
-		<resource name="file_icon" type="image" filename="file" />
-		<resource name="folder_icon" type="image" filename="folder" />
+		<resource name="file_icon" type="image" filename="file" retainaspect="1" />
+		<resource name="folder_icon" type="image" filename="folder" retainaspect="1" />
 		<resource name="progress" type="animation" filename="indeterminate" />
 		<resource name="progress_empty" type="image" filename="progress_empty" />
 		<resource name="progress_full" type="image" filename="progress_fill" />
@@ -31,13 +31,13 @@
 		<resource name="sort_button" type="image" filename="sort-button" />
 		<resource name="minus_button" type="image" filename="minus-button" />
 		<resource name="plus_button" type="image" filename="plus-button" />
-		<resource name="home_icon" type="image" filename="home-icon" />
-		<resource name="back_icon" type="image" filename="back-icon" />
-		<resource name="console_button" type="image" filename="console-toggle" />
-		<resource name="slider" type="image" filename="slider" />
-		<resource name="slider-used" type="image" filename="slider-used" />
-		<resource name="slider-touch" type="image" filename="slider-touch" />
-		<resource name="unlock-icon" type="image" filename="unlock" />
+		<resource name="home_icon" type="image" filename="home-icon" retainaspect="1" />
+		<resource name="back_icon" type="image" filename="back-icon" retainaspect="1" />
+		<resource name="console_button" type="image" filename="console-toggle" retainaspect="1" />
+		<resource name="slider" type="image" filename="slider" retainaspect="1" />
+		<resource name="slider-used" type="image" filename="slider-used" retainaspect="1" />
+		<resource name="slider-touch" type="image" filename="slider-touch" retainaspect="1" />
+		<resource name="unlock-icon" type="image" filename="unlock" retainaspect="1" />
 		<resource name="keyboard1" type="image" filename="keyboard1" />
 		<resource name="keyboard2" type="image" filename="keyboard2" />
 		<resource name="keyboard3" type="image" filename="keyboard3" />
@@ -108,7 +108,6 @@
 		<variable name="text_fail_color" value="#FF0101" />
 		<variable name="highlight_color" value="#90909080" />
 		<variable name="caps_highlight_color" value="#33B5E580" />
-		<variable name="slider_x" value="630" />
 		<variable name="slider_y" value="1000" />
 		<variable name="slider_text_y" value="1075" />
 		<variable name="sort_text_x" value="400" />
@@ -173,7 +172,6 @@
 		<variable name="listbox_background" value="#303030" />
 		<variable name="listbox_spacing" value="18" />
 		<variable name="sd_plus_x" value="408" />
-		<variable name="lock_x" value="660" />
 		<variable name="lock_y" value="300" />
 		<variable name="filemanager_select_x" value="1500" />
 		<variable name="filemanager_select_y" value="980" />
@@ -226,20 +224,28 @@
 		<template name="header">
 			<background color="#000000FF" />
 
+			<object type="fill" color="%button_fill_color%">
+				<placement x="0" y="0" w="1920" h="87" />
+			</object>
+
+			<object type="fill" color="%highlight%">
+				<placement x="0" y="87" w="1920" h="3" />
+			</object>
+
 			<object type="image">
-				<image resource="base" />
-				<placement x="0" y="0" />
+				<image resource="twrplogo" />
+				<placement x="55" y="45" placement="4" />
 			</object>
 
 			<object type="text" color="%text_color%">
 				<font resource="font" />
-				<placement x="250" y="5" />
+				<placement x="100" y="5" />
 				<text>Team Win Recovery Project  v%tw_version%</text>
 			</object>
 
 			<object type="text" color="%text_color%">
 				<font resource="font" />
-				<placement x="250" y="40" />
+				<placement x="100" y="40" />
 				<conditions>
 					<condition var1="tw_no_battery_percent" var2="0" />
 					<condition var1="tw_battery" op="&gt;" var2="0" />
diff --git a/gui/devices/240x240/res/fonts/Roboto-Condensed-12.dat b/gui/devices/240x240/res/fonts/Roboto-Condensed-12.dat
deleted file mode 100644
index b48c4f2..0000000
--- a/gui/devices/240x240/res/fonts/Roboto-Condensed-12.dat
+++ /dev/null
Binary files differ
diff --git a/gui/devices/240x240/res/images/android.png b/gui/devices/240x240/res/images/android.png
deleted file mode 100644
index 0ccd02c..0000000
--- a/gui/devices/240x240/res/images/android.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/240x240/res/images/back-icon.png b/gui/devices/240x240/res/images/back-icon.png
deleted file mode 100644
index 97b17dd..0000000
--- a/gui/devices/240x240/res/images/back-icon.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/240x240/res/images/checkbox_checked.png b/gui/devices/240x240/res/images/checkbox_checked.png
deleted file mode 100644
index c50b53b..0000000
--- a/gui/devices/240x240/res/images/checkbox_checked.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/240x240/res/images/checkbox_empty.png b/gui/devices/240x240/res/images/checkbox_empty.png
deleted file mode 100644
index 42ab7f5..0000000
--- a/gui/devices/240x240/res/images/checkbox_empty.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/240x240/res/images/cursor.png b/gui/devices/240x240/res/images/cursor.png
deleted file mode 100644
index 32c8ae1..0000000
--- a/gui/devices/240x240/res/images/cursor.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/240x240/res/images/curtain.jpg b/gui/devices/240x240/res/images/curtain.jpg
deleted file mode 100644
index 83d4895..0000000
--- a/gui/devices/240x240/res/images/curtain.jpg
+++ /dev/null
Binary files differ
diff --git a/gui/devices/240x240/res/images/file.png b/gui/devices/240x240/res/images/file.png
deleted file mode 100644
index cc91f2f..0000000
--- a/gui/devices/240x240/res/images/file.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/240x240/res/images/folder.png b/gui/devices/240x240/res/images/folder.png
deleted file mode 100644
index 9825a41..0000000
--- a/gui/devices/240x240/res/images/folder.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/240x240/res/images/home-icon.png b/gui/devices/240x240/res/images/home-icon.png
deleted file mode 100644
index f746790..0000000
--- a/gui/devices/240x240/res/images/home-icon.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/240x240/res/images/indeterminate001.png b/gui/devices/240x240/res/images/indeterminate001.png
deleted file mode 100644
index bd58cb6..0000000
--- a/gui/devices/240x240/res/images/indeterminate001.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/240x240/res/images/indeterminate002.png b/gui/devices/240x240/res/images/indeterminate002.png
deleted file mode 100644
index aaa7b9f..0000000
--- a/gui/devices/240x240/res/images/indeterminate002.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/240x240/res/images/indeterminate003.png b/gui/devices/240x240/res/images/indeterminate003.png
deleted file mode 100644
index e2b2475..0000000
--- a/gui/devices/240x240/res/images/indeterminate003.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/240x240/res/images/indeterminate004.png b/gui/devices/240x240/res/images/indeterminate004.png
deleted file mode 100644
index fadd737..0000000
--- a/gui/devices/240x240/res/images/indeterminate004.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/240x240/res/images/indeterminate005.png b/gui/devices/240x240/res/images/indeterminate005.png
deleted file mode 100644
index 5751dd5..0000000
--- a/gui/devices/240x240/res/images/indeterminate005.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/240x240/res/images/indeterminate006.png b/gui/devices/240x240/res/images/indeterminate006.png
deleted file mode 100644
index 92481dc..0000000
--- a/gui/devices/240x240/res/images/indeterminate006.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/240x240/res/images/keyboard1.png b/gui/devices/240x240/res/images/keyboard1.png
deleted file mode 100644
index 22cdcec..0000000
--- a/gui/devices/240x240/res/images/keyboard1.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/240x240/res/images/keyboard2.png b/gui/devices/240x240/res/images/keyboard2.png
deleted file mode 100644
index 4c303f2..0000000
--- a/gui/devices/240x240/res/images/keyboard2.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/240x240/res/images/keyboard3.png b/gui/devices/240x240/res/images/keyboard3.png
deleted file mode 100644
index 2bb32e9..0000000
--- a/gui/devices/240x240/res/images/keyboard3.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/240x240/res/images/keyboard4.png b/gui/devices/240x240/res/images/keyboard4.png
deleted file mode 100644
index c5b1d60..0000000
--- a/gui/devices/240x240/res/images/keyboard4.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/240x240/res/images/medium-button.png b/gui/devices/240x240/res/images/medium-button.png
deleted file mode 100644
index 38f2597..0000000
--- a/gui/devices/240x240/res/images/medium-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/240x240/res/images/menu-button.png b/gui/devices/240x240/res/images/menu-button.png
deleted file mode 100644
index f3001c2..0000000
--- a/gui/devices/240x240/res/images/menu-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/240x240/res/images/minus-button.png b/gui/devices/240x240/res/images/minus-button.png
deleted file mode 100644
index 52d24d5..0000000
--- a/gui/devices/240x240/res/images/minus-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/240x240/res/images/plus-button.png b/gui/devices/240x240/res/images/plus-button.png
deleted file mode 100644
index 188cae8..0000000
--- a/gui/devices/240x240/res/images/plus-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/240x240/res/images/progress_empty.png b/gui/devices/240x240/res/images/progress_empty.png
deleted file mode 100644
index c065bca..0000000
--- a/gui/devices/240x240/res/images/progress_empty.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/240x240/res/images/progress_fill.png b/gui/devices/240x240/res/images/progress_fill.png
deleted file mode 100644
index 5f10be7..0000000
--- a/gui/devices/240x240/res/images/progress_fill.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/240x240/res/images/radio_empty.png b/gui/devices/240x240/res/images/radio_empty.png
deleted file mode 100644
index 1697acb..0000000
--- a/gui/devices/240x240/res/images/radio_empty.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/240x240/res/images/radio_selected.png b/gui/devices/240x240/res/images/radio_selected.png
deleted file mode 100644
index 5c67cd8..0000000
--- a/gui/devices/240x240/res/images/radio_selected.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/240x240/res/images/slideout.png b/gui/devices/240x240/res/images/slideout.png
deleted file mode 100644
index 9658400..0000000
--- a/gui/devices/240x240/res/images/slideout.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/240x240/res/images/slider-touch.png b/gui/devices/240x240/res/images/slider-touch.png
deleted file mode 100644
index 93b72f5..0000000
--- a/gui/devices/240x240/res/images/slider-touch.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/240x240/res/images/slider-used.png b/gui/devices/240x240/res/images/slider-used.png
deleted file mode 100644
index fa6d601..0000000
--- a/gui/devices/240x240/res/images/slider-used.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/240x240/res/images/slider.png b/gui/devices/240x240/res/images/slider.png
deleted file mode 100644
index 2aa9557..0000000
--- a/gui/devices/240x240/res/images/slider.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/240x240/res/images/sort-button.png b/gui/devices/240x240/res/images/sort-button.png
deleted file mode 100644
index 1bb5c72..0000000
--- a/gui/devices/240x240/res/images/sort-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/240x240/res/images/top-bar.jpg b/gui/devices/240x240/res/images/top-bar.jpg
deleted file mode 100644
index 57de155..0000000
--- a/gui/devices/240x240/res/images/top-bar.jpg
+++ /dev/null
Binary files differ
diff --git a/gui/devices/240x240/res/images/unlock.png b/gui/devices/240x240/res/images/unlock.png
deleted file mode 100644
index 7d0f490..0000000
--- a/gui/devices/240x240/res/images/unlock.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/240x240/res/ui.xml b/gui/devices/240x240/res/ui.xml
deleted file mode 100644
index 22979e6..0000000
--- a/gui/devices/240x240/res/ui.xml
+++ /dev/null
@@ -1,418 +0,0 @@
-<?xml version="1.0"?>
-
-<recovery>
-	<details>
-		<resolution width="240" height="240" />
-		<roundscreen offset_x="30" offset_y="30" />
-		<author>masteroftime</author>
-		<title>TWRP x201</title>
-		<description>tDPI Smartwatch Theme</description>
-		<preview>preview.jpg</preview>
-	</details>
-
-	<include>
-		<xmlfile name="watch.xml" />
-	</include>
-
-	<resources>
-		<resource name="font" type="font" filename="RobotoCondensed-Regular.ttf" size="12" fallback="Roboto-Condensed-12" />
-		<resource name="mediumfont" type="font" filename="RobotoCondensed-Regular.ttf" size="12" fallback="Roboto-Condensed-12" />
-		<resource name="filelist" type="font" filename="RobotoCondensed-Regular.ttf" size="12" fallback="Roboto-Condensed-12" />
-		<resource name="top_bar" type="image" filename="top-bar.jpg" />
-		<resource name="main_button" type="image" filename="menu-button" />
-		<resource name="file_icon" type="image" filename="file" />
-		<resource name="folder_icon" type="image" filename="folder" />
-		<resource name="slideout" type="image" filename="slideout" />
-		<resource name="progress" type="animation" filename="indeterminate" />
-		<resource name="progress_empty" type="image" filename="progress_empty" />
-		<resource name="progress_full" type="image" filename="progress_fill" />
-		<resource name="checkbox_false" type="image" filename="checkbox_empty" retainaspect="1" />
-		<resource name="checkbox_true" type="image" filename="checkbox_checked" retainaspect="1" />
-		<resource name="radio_false" type="image" filename="radio_empty" retainaspect="1" />
-		<resource name="radio_true" type="image" filename="radio_selected" retainaspect="1" />
-		<resource name="medium_button" type="image" filename="medium-button" />
-		<resource name="sort_button" type="image" filename="sort-button" />
-		<resource name="minus_button" type="image" filename="minus-button" />
-		<resource name="plus_button" type="image" filename="plus-button" />
-		<resource name="home_icon" type="image" filename="home-icon" />
-		<resource name="back_icon" type="image" filename="back-icon" />
-		<resource name="slider" type="image" filename="slider" />
-		<resource name="slider-used" type="image" filename="slider-used" />
-		<resource name="slider-touch" type="image" filename="slider-touch" />
-		<resource name="unlock-icon" type="image" filename="unlock" />
-		<resource name="keyboard1" type="image" filename="keyboard1" />
-		<resource name="keyboard2" type="image" filename="keyboard2" />
-		<resource name="keyboard3" type="image" filename="keyboard3" />
-		<resource name="keyboard4" type="image" filename="keyboard4" />
-		<resource name="cursor" type="image" filename="cursor" retainaspect="1" />
-	</resources>
-
-	<variables>
-		<variable name="col1_x" value="6" />
-		<variable name="col2_x" value="126" />
-		<variable name="col_center_x" value="62" />
-		<variable name="col_center_medium_x" value="122" />
-		<variable name="center_x" value="120" />
-		<variable name="row1_home_y" value="40" />
-		<variable name="row2_home_y" value="80" />
-		<variable name="row3_home_y" value="120" />
-		<variable name="row4_home_y" value="160" />
-		<variable name="row1_y" value="20" />
-		<variable name="row2_y" value="65" />
-		<variable name="row3_y" value="110" />
-		<variable name="row4_y" value="155" />
-		<variable name="row_queue_y" value="134" />
-		<variable name="row1_header_y" value="0" />
-		<variable name="row1_text_y" value="16" />
-		<variable name="row2_text_y" value="32" />
-		<variable name="row3_text_y" value="48" />
-		<variable name="row4_text_y" value="64" />
-		<variable name="row5_text_y" value="80" />
-		<variable name="row6_text_y" value="96" />
-		<variable name="row7_text_y" value="112" />
-		<variable name="row8_text_y" value="128" />
-		<variable name="row9_text_y" value="144" />
-		<variable name="row10_text_y" value="160" />
-		<variable name="row11_text_y" value="176" />
-		<variable name="row12_text_y" value="192" />
-		<variable name="row13_text_y" value="208" />
-		<variable name="zip_status_y" value="224" />
-		<variable name="flash_list_height" value="120" />
-		<variable name="backup_text_y" value="60" />
-		<variable name="tz_set_y" value="200" />
-		<variable name="tz_current_y" value="184" />
-		<variable name="col_progressbar_x" value="25" />
-		<variable name="row_progressbar_y" value="200" />
-		<variable name="col1_medium_x" value="6" />
-		<variable name="col2_medium_x" value="70" />
-		<variable name="col3_medium_x" value="134" />
-		<variable name="col4_medium_x" value="198" />
-		<variable name="row1_medium_y" value="24" />
-		<variable name="row2_medium_y" value="40" />
-		<variable name="row3_medium_y" value="56" />
-		<variable name="row4_medium_y" value="72" />
-		<variable name="row5_medium_y" value="88" />
-		<variable name="row6_medium_y" value="104" />
-		<variable name="row7_medium_y" value="120" />
-		<variable name="slider_x" value="34" />
-		<variable name="slider_y" value="200" />
-		<variable name="slider_text_y" value="218" />
-		<variable name="button_text_color" value="#AAAAAA" />
-		<variable name="text_color" value="#FFFFFF" />
-		<variable name="text_success_color" value="#33B5E5" />
-		<variable name="text_fail_color" value="#FF0101" />
-		<variable name="highlight_color" value="#90909080" />
-		<variable name="caps_highlight_color" value="#33B5E580" />
-		<variable name="home_button_x" value="3" />
-		<variable name="home_button_y" value="220" />
-		<variable name="back_button_x" value="209" />
-		<variable name="back_button_y" value="220" />
-		<variable name="sort_text_x" value="8" />
-		<variable name="sort_asc_text_y" value="174" />
-		<variable name="sort_asc_button_y" value="173" />
-		<variable name="sort_desc_text_y" value="198" />
-		<variable name="sort_desc_button_y" value="197" />
-		<variable name="sort_col1_button_x" value="120" />
-		<variable name="sort_col2_button_x" value="160" />
-		<variable name="sort_col3_button_x" value="200" />
-		<variable name="input_width" value="228" />
-		<variable name="input_width_conf" value="10" />
-		<variable name="input_height" value="18" />
-		<variable name="input_background_color" value="#303030" />
-		<variable name="input_cursor_color" value="#33B5E5" />
-		<variable name="input_cursor_width" value="2" />
-		<variable name="console_x" value="0" />
-		<variable name="console_width" value="240" />
-		<variable name="console_foreground" value="#A0A0A0" />
-		<variable name="warning" value="#F8F8A0" />
-		<variable name="error" value="#FF4040" />
-		<variable name="highlight" value="#33B5E5" />
-		<variable name="console_background" value="#303030" />
-		<variable name="console_scroll" value="#303030" />
-		<variable name="console_action_height" value="120" />
-		<variable name="console_install_height" value="120" />
-		<variable name="console_installdone_height" value="120" />
-		<variable name="fileselector_x" value="0" />
-		<variable name="fileselector_y" value="38" />
-		<variable name="fileselector_width" value="240" />
-		<variable name="fileselector_install_height" value="132" />
-		<variable name="fileselector_header_background" value="#202020" />
-		<variable name="fileselector_header_textcolor" value="#AAAAAA" />
-		<variable name="fileselector_header_separatorcolor" value="#33B5E5" />
-		<variable name="fileselector_header_separatorheight" value="2" />
-		<variable name="fileselector_separatorcolor" value="#505050" />
-		<variable name="fileselector_separatorheight" value="1" />
-		<variable name="fileselector_background" value="#303030" />
-		<variable name="fileselector_highlight_color" value="#505050" />
-		<variable name="fileselector_highlight_font_color" value="#33B5E5" />
-		<variable name="fileselector_spacing" value="12" />
-		<variable name="fastscroll_linecolor" value="#50505080" />
-		<variable name="fastscroll_rectcolor" value="#33B5E580" />
-		<variable name="fastscroll_w" value="32" />
-		<variable name="fastscroll_linew" value="1" />
-		<variable name="fastscroll_rectw" value="7" />
-		<variable name="fastscroll_recth" value="24" />
-		<variable name="listbox_x" value="0" />
-		<variable name="listbox_width" value="240" />
-		<variable name="listbox_tz_height" value="114" />
-		<variable name="listbox_background" value="#303030" />
-		<variable name="listbox_spacing" value="12" />
-		<variable name="sd_plus_x" value="174" />
-		<variable name="sdext_text_x" value="56" />
-		<variable name="sdext_text_y" value="18" />
-		<variable name="sdswap_button_y" value="45" />
-		<variable name="sdswap_text_x" value="56" />
-		<variable name="sdswap_text_y" value="47" />
-		<variable name="sdfilesystem_text_y" value="92" />
-		<variable name="sdfilesystem_button_y" value="120" />
-		<variable name="lock_x" value="72" />
-		<variable name="lock_y" value="46" />
-		<variable name="filemanager_select_x" value="98" />
-		<variable name="filemanager_select_y" value="210" />
-		<variable name="terminal_console_height" value="71" />
-		<variable name="terminal_text_y" value="72" />
-		<variable name="terminal_button_y" value="220" />
-		<variable name="row_dst_text_y" value="116" />
-		<variable name="row_offset_text_y" value="132" />
-		<variable name="row_offset_medium_y" value="148" />
-		<variable name="button_fill_color" value="#303030" />
-		<variable name="button_fill_full_width" value="228" />
-		<variable name="button_fill_main_width" value="110" />
-		<variable name="button_fill_med_width" value="72" />
-		<variable name="button_fill_small_width" value="24" />
-		<variable name="button_fill_main_height" value="38" />
-		<variable name="button_fill_half_height" value="19" />
-		<variable name="button_fill_quarter_height" value="19" />
-		<variable name="button_refresh_x" value="152" />
-		<variable name="backup_list_y" value="26" />
-		<variable name="backup_list_height" value="129" />
-		<variable name="restore_list_height" value="155" />
-		<variable name="backup_button_row1" value="159" />
-		<variable name="backup_button_row2" value="180" />
-		<variable name="mount_list_height" value="146" />
-		<variable name="mount_storage_row" value="195" />
-		<variable name="storage_list_height" value="134" />
-		<variable name="wipe_list_height" value="170" />
-		<variable name="wipe_button_y" value="136" />
-		<variable name="slidervalue_w" value="228" />
-		<variable name="slidervalue_line_clr" value="#FFFFFF" />
-		<variable name="slidervalue_slider_clr" value="#33B5E5" />
-		<variable name="slidervalue_lineh" value="1" />
-		<variable name="slidervalue_padding" value="8" />
-		<variable name="slidervalue_sliderw" value="4" />
-		<variable name="slidervalue_sliderh" value="20" />
-		<variable name="wipe_button_row1" value="180" />
-		<variable name="invalid_partition_y" value="167" />
-	</variables>
-
-	<templates>
-		<template name="twrpheader">
-			<object type="image">
-				<image resource="top_bar" />
-				<placement x="0" y="0" />
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="1" y="3" />
-				<text>TWRP v%tw_version%</text>
-			</object>
-
-			<object type="text" color="%text_fail_color%">
-				<condition var1="tw_simulate_actions" var2="1" />
-				<font resource="font" />
-				<placement x="3" y="21" />
-				<text>SIMULATION</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="89" y="3" />
-				<text>%tw_time%</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="236" y="3" placement="1" />
-				<conditions>
-					<condition var1="tw_no_battery_percent" var2="0" />
-					<condition var1="tw_battery" op="&gt;" var2="0" />
-					<condition var1="tw_battery" op="&lt;" var2="101" />
-				</conditions>
-				<text>%tw_battery%</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="145" y="3" />
-				<conditions>
-					<condition var1="tw_no_cpu_temp" var2="0" />
-				</conditions>
-				<text>%tw_cpu_temp% C</text>
-			</object>
-		</template>
-
-		<template name="header">
-			<background color="#000000FF" />
-
-			<object type="button">
-				<placement x="%home_button_x%" y="%home_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text></text>
-				<image resource="home_icon" />
-				<condition var1="tw_busy" var2="0" />
-				<action function="key">home</action>
-			</object>
-
-			<object type="button">
-				<placement x="%back_button_x%" y="%back_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text></text>
-				<image resource="back_icon" />
-				<condition var1="tw_busy" var2="0" />
-				<action function="key">back</action>
-			</object>
-
-			<object type="action">
-				<touch key="power" />
-				<action function="key">back</action>
-			</object>
-
-			<object type="action">
-				<touch key="power+voldown" />
-				<action function="screenshot" />
-			</object>
-		</template>
-
-		<template name="progress_bar">
-			<object type="progressbar">
-				<placement x="%col_progressbar_x%" y="%row_progressbar_y%" />
-				<resource empty="progress_empty" full="progress_full" />
-				<data name="ui_progress" />
-			</object>
-
-			<object type="animation">
-				<placement x="%col_progressbar_x%" y="%row_progressbar_y%" />
-				<resource name="progress" />
-				<speed fps="15" render="2" />
-				<loop frame="1" />
-			</object>
-		</template>
-
-		<template name="action_page_console">
-			<object type="console">
-				<placement x="%console_x%" y="%row2_y%" w="%console_width%" h="%console_action_height%" />
-				<color foreground="%console_foreground%" background="%console_background%" scroll="%console_scroll%" />
-				<font resource="fixed" />
-			</object>
-		</template>
-
-		<template name="sort_options">
-			<object type="text" color="%text_color%">
-				<font resource="mediumfont" />
-				<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="mediumfont" color="%button_text_color%" />
-				<text>Name</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=1</action>
-			</object>
-
-			<object type="button">
-				<placement x="%sort_col2_button_x%" y="%sort_asc_button_y%" />
-				<font resource="mediumfont" color="%button_text_color%" />
-				<text>Date</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=2</action>
-			</object>
-
-			<object type="button">
-				<placement x="%sort_col3_button_x%" y="%sort_asc_button_y%" />
-				<font resource="mediumfont" color="%button_text_color%" />
-				<text>Size</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=3</action>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="mediumfont" />
-				<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="mediumfont" color="%button_text_color%" />
-				<text>Name</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=-1</action>
-			</object>
-
-			<object type="button">
-				<placement x="%sort_col2_button_x%" y="%sort_desc_button_y%" />
-				<font resource="mediumfont" color="%button_text_color%" />
-				<text>Date</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=-2</action>
-			</object>
-
-			<object type="button">
-				<placement x="%sort_col3_button_x%" y="%sort_desc_button_y%" />
-				<font resource="mediumfont" color="%button_text_color%" />
-				<text>Size</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=-3</action>
-			</object>
-		</template>
-
-		<template name="footer">
-			<object type="console">
-				<slideout resource="slideout" x="97" y="220" />
-				<placement x="%console_x%" y="0" w="%console_width%" h="220" />
-				<color foreground="%console_foreground%" background="%console_background%" scroll="%console_scroll%" />
-				<font resource="fixed" />
-			</object>
-		</template>
-
-		<template name="keyboardtemplate">
-			<object type="keyboard">
-				<placement x="0" y="90" />
-				<layout resource1="keyboard1" resource2="keyboard2" resource3="keyboard3" resource4="keyboard4" />
-				<highlight color="%highlight_color%" />
-				<capshighlight color="%caps_highlight_color%" />
-				<layout1>
-					<keysize height="32" width="24" />
-					<row1 key01="q" long01="1" key02="w" long02="2" key03="e" long03="3" key04="r" long04="4" key05="t" long05="5" key06="y" long06="6" key07="u" long07="7" key08="i" long08="8" key09="o" long09="9" key10="p" long10="0" />
-					<row2 key01="36:a" key02="s" key03="d" key04="f" key05="g" key06="h" key07="j" key08="k" key09="36:l" />
-					<row3 key01="36:layout2" key02="z" key03="x" key04="c" key05="v" key06="b" key07="n" key08="m" key09="36:c:8" />
-					<row4 key01="36:layout3" key02="24:" key03="120: " key04="24:." key05="36:a:action" />
-				</layout1>
-				<layout2>
-					<keysize height="32" width="24" capslock="0" revert_layout="1" />
-					<row1 key01="Q" long01="1" key02="W" long02="2" key03="E" long03="3" key04="R" long04="4" key05="T" long05="5" key06="Y" long06="6" key07="U" long07="7" key08="I" long08="8" key09="O" long09="9" key10="P" long10="0" />
-					<row2 key01="36:A" key02="S" key03="D" key04="F" key05="G" key06="H" key07="J" key08="K" key09="36:L" />
-					<row3 key01="36:layout1" key02="Z" key03="X" key04="C" key05="V" key06="B" key07="N" key08="M" key09="36:c:8" />
-					<row4 key01="36:layout3" key02="32:" key03="120: " key04="32:." key05="36:action" />
-				</layout2>
-				<layout3>
-					<keysize height="32" width="24" />
-					<row1 key01="1" key02="2" key03="3" key04="4" key05="5" key06="6" key07="7" key08="8" key09="9" key10="0" />
-					<row2 key01="@" key02="#" key03="$" key04="%" key05="&amp;" key06="*" key07="-" key08="+" key09="(" key10=")" />
-					<row3 key01="36:layout4" key02="!" key03="24:c:34" key04="'" key05=":" key06=";" key07="/" key08="?" key09="36:c:8" />
-					<row4 key01="36:layout1" key02="24:," key03="120: " key04="24:." key05="36:action" />
-				</layout3>
-				<layout4>
-					<keysize height="32" width="24" />
-					<row1 key01="~" key02="`" key03="|" key04="24:" key05="24:" key06="24:" key07="%" key08="24:" key09="{" key10="}" />
-					<row2 key01="24:" key02="24:" key03="24:" key04="24:" key05="24:" key06="^" key07="_" key08="=" key09="[" key10="]" />
-					<row3 key01="36:layout3" key02="24:" key03="24:" key04="24:" key05="24:" key06="\" key07="&lt;" key08="&gt;" key09="36:c:8" />
-					<row4 key01="36:layout1" key02="24:c:34" key03="120: " key04="24:." key05="36:action" />
-				</layout4>
-			</object>
-		</template>
-	</templates>
-</recovery>
diff --git a/gui/devices/2560x1600/res/fonts/Roboto-Regular-40.dat b/gui/devices/2560x1600/res/fonts/Roboto-Regular-40.dat
deleted file mode 100644
index 637d9fe..0000000
--- a/gui/devices/2560x1600/res/fonts/Roboto-Regular-40.dat
+++ /dev/null
Binary files differ
diff --git a/gui/devices/2560x1600/res/images/back-icon.png b/gui/devices/2560x1600/res/images/back-icon.png
deleted file mode 100644
index effe411..0000000
--- a/gui/devices/2560x1600/res/images/back-icon.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/2560x1600/res/images/background.jpg b/gui/devices/2560x1600/res/images/background.jpg
deleted file mode 100644
index 3b8a71a..0000000
--- a/gui/devices/2560x1600/res/images/background.jpg
+++ /dev/null
Binary files differ
diff --git a/gui/devices/2560x1600/res/images/button.png b/gui/devices/2560x1600/res/images/button.png
deleted file mode 100644
index 4743ba5..0000000
--- a/gui/devices/2560x1600/res/images/button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/2560x1600/res/images/checkbox_checked.png b/gui/devices/2560x1600/res/images/checkbox_checked.png
deleted file mode 100644
index c3ceeef..0000000
--- a/gui/devices/2560x1600/res/images/checkbox_checked.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/2560x1600/res/images/checkbox_empty.png b/gui/devices/2560x1600/res/images/checkbox_empty.png
deleted file mode 100644
index 87d6dd9..0000000
--- a/gui/devices/2560x1600/res/images/checkbox_empty.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/2560x1600/res/images/console-icon.png b/gui/devices/2560x1600/res/images/console-icon.png
deleted file mode 100644
index 4dd1a14..0000000
--- a/gui/devices/2560x1600/res/images/console-icon.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/2560x1600/res/images/console-toggle.png b/gui/devices/2560x1600/res/images/console-toggle.png
deleted file mode 100644
index 3bf8a1a..0000000
--- a/gui/devices/2560x1600/res/images/console-toggle.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/2560x1600/res/images/cursor.png b/gui/devices/2560x1600/res/images/cursor.png
deleted file mode 100644
index 32c8ae1..0000000
--- a/gui/devices/2560x1600/res/images/cursor.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/2560x1600/res/images/curtain.jpg b/gui/devices/2560x1600/res/images/curtain.jpg
deleted file mode 100644
index e58811a..0000000
--- a/gui/devices/2560x1600/res/images/curtain.jpg
+++ /dev/null
Binary files differ
diff --git a/gui/devices/2560x1600/res/images/file.png b/gui/devices/2560x1600/res/images/file.png
deleted file mode 100644
index 793b61d..0000000
--- a/gui/devices/2560x1600/res/images/file.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/2560x1600/res/images/folder.png b/gui/devices/2560x1600/res/images/folder.png
deleted file mode 100644
index f3ab28f..0000000
--- a/gui/devices/2560x1600/res/images/folder.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/2560x1600/res/images/home-icon.png b/gui/devices/2560x1600/res/images/home-icon.png
deleted file mode 100644
index 692d8dd..0000000
--- a/gui/devices/2560x1600/res/images/home-icon.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/2560x1600/res/images/indeterminate001.png b/gui/devices/2560x1600/res/images/indeterminate001.png
deleted file mode 100755
index f0cb4b2..0000000
--- a/gui/devices/2560x1600/res/images/indeterminate001.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/2560x1600/res/images/indeterminate002.png b/gui/devices/2560x1600/res/images/indeterminate002.png
deleted file mode 100755
index eba46eb..0000000
--- a/gui/devices/2560x1600/res/images/indeterminate002.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/2560x1600/res/images/indeterminate003.png b/gui/devices/2560x1600/res/images/indeterminate003.png
deleted file mode 100755
index 34ef03e..0000000
--- a/gui/devices/2560x1600/res/images/indeterminate003.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/2560x1600/res/images/indeterminate004.png b/gui/devices/2560x1600/res/images/indeterminate004.png
deleted file mode 100755
index de6f4d9..0000000
--- a/gui/devices/2560x1600/res/images/indeterminate004.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/2560x1600/res/images/indeterminate005.png b/gui/devices/2560x1600/res/images/indeterminate005.png
deleted file mode 100755
index d993f2c..0000000
--- a/gui/devices/2560x1600/res/images/indeterminate005.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/2560x1600/res/images/indeterminate006.png b/gui/devices/2560x1600/res/images/indeterminate006.png
deleted file mode 100755
index 08ca229..0000000
--- a/gui/devices/2560x1600/res/images/indeterminate006.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/2560x1600/res/images/keyboard1.png b/gui/devices/2560x1600/res/images/keyboard1.png
deleted file mode 100644
index cef79d9..0000000
--- a/gui/devices/2560x1600/res/images/keyboard1.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/2560x1600/res/images/keyboard2.png b/gui/devices/2560x1600/res/images/keyboard2.png
deleted file mode 100644
index d860279..0000000
--- a/gui/devices/2560x1600/res/images/keyboard2.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/2560x1600/res/images/keyboard3.png b/gui/devices/2560x1600/res/images/keyboard3.png
deleted file mode 100644
index 3478097..0000000
--- a/gui/devices/2560x1600/res/images/keyboard3.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/2560x1600/res/images/keyboard4.png b/gui/devices/2560x1600/res/images/keyboard4.png
deleted file mode 100644
index d491625..0000000
--- a/gui/devices/2560x1600/res/images/keyboard4.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/2560x1600/res/images/medium-button.png b/gui/devices/2560x1600/res/images/medium-button.png
deleted file mode 100644
index ef731cd..0000000
--- a/gui/devices/2560x1600/res/images/medium-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/2560x1600/res/images/mediumwide-button.png b/gui/devices/2560x1600/res/images/mediumwide-button.png
deleted file mode 100644
index 94af419..0000000
--- a/gui/devices/2560x1600/res/images/mediumwide-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/2560x1600/res/images/minus-button.png b/gui/devices/2560x1600/res/images/minus-button.png
deleted file mode 100644
index 8d343a7..0000000
--- a/gui/devices/2560x1600/res/images/minus-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/2560x1600/res/images/plus-button.png b/gui/devices/2560x1600/res/images/plus-button.png
deleted file mode 100644
index cc4c70a..0000000
--- a/gui/devices/2560x1600/res/images/plus-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/2560x1600/res/images/progress_empty.png b/gui/devices/2560x1600/res/images/progress_empty.png
deleted file mode 100644
index 8f3f02a..0000000
--- a/gui/devices/2560x1600/res/images/progress_empty.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/2560x1600/res/images/progress_fill.png b/gui/devices/2560x1600/res/images/progress_fill.png
deleted file mode 100644
index 88d82d5..0000000
--- a/gui/devices/2560x1600/res/images/progress_fill.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/2560x1600/res/images/radio_empty.png b/gui/devices/2560x1600/res/images/radio_empty.png
deleted file mode 100644
index 946d46d..0000000
--- a/gui/devices/2560x1600/res/images/radio_empty.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/2560x1600/res/images/radio_selected.png b/gui/devices/2560x1600/res/images/radio_selected.png
deleted file mode 100644
index d68e855..0000000
--- a/gui/devices/2560x1600/res/images/radio_selected.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/2560x1600/res/images/slider-touch.png b/gui/devices/2560x1600/res/images/slider-touch.png
deleted file mode 100644
index 14c8f99..0000000
--- a/gui/devices/2560x1600/res/images/slider-touch.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/2560x1600/res/images/slider-used.png b/gui/devices/2560x1600/res/images/slider-used.png
deleted file mode 100644
index 21372da..0000000
--- a/gui/devices/2560x1600/res/images/slider-used.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/2560x1600/res/images/slider.png b/gui/devices/2560x1600/res/images/slider.png
deleted file mode 100644
index ec27200..0000000
--- a/gui/devices/2560x1600/res/images/slider.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/2560x1600/res/images/sort-button.png b/gui/devices/2560x1600/res/images/sort-button.png
deleted file mode 100644
index d577096..0000000
--- a/gui/devices/2560x1600/res/images/sort-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/2560x1600/res/images/unlock.png b/gui/devices/2560x1600/res/images/unlock.png
deleted file mode 100644
index a605d05..0000000
--- a/gui/devices/2560x1600/res/images/unlock.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/2560x1600/res/ui.xml b/gui/devices/2560x1600/res/ui.xml
deleted file mode 100644
index 8f48cf2..0000000
--- a/gui/devices/2560x1600/res/ui.xml
+++ /dev/null
@@ -1,441 +0,0 @@
-<?xml version="1.0"?>
-
-<recovery>
-	<details>
-		<resolution width="2560" height="1600" />
-		<author>TeamWin</author>
-		<title>Backup Naowz</title>
-		<description>Default basic theme</description>
-		<preview>preview.jpg</preview>
-	</details>
-
-	<include>
-		<xmlfile name="landscape.xml" />
-	</include>
-
-	<resources>
-		<resource name="font" type="font" filename="RobotoCondensed-Regular.ttf" size="40" fallback="Roboto-Regular-40" />
-		<resource name="base" type="image" filename="background.jpg" />
-		<resource name="main_button" type="image" filename="button" />
-		<resource name="file_icon" type="image" filename="file" />
-		<resource name="folder_icon" type="image" filename="folder" />
-		<resource name="progress" type="animation" filename="indeterminate" />
-		<resource name="progress_empty" type="image" filename="progress_empty" />
-		<resource name="progress_full" type="image" filename="progress_fill" />
-		<resource name="checkbox_false" type="image" filename="checkbox_empty" retainaspect="1" />
-		<resource name="checkbox_true" type="image" filename="checkbox_checked" retainaspect="1" />
-		<resource name="radio_false" type="image" filename="radio_empty" retainaspect="1" />
-		<resource name="radio_true" type="image" filename="radio_selected" retainaspect="1" />
-		<resource name="medium_button" type="image" filename="medium-button" />
-		<resource name="mediumwide_button" type="image" filename="mediumwide-button" />
-		<resource name="sort_button" type="image" filename="sort-button" />
-		<resource name="minus_button" type="image" filename="minus-button" />
-		<resource name="plus_button" type="image" filename="plus-button" />
-		<resource name="home_icon" type="image" filename="home-icon" />
-		<resource name="back_icon" type="image" filename="back-icon" />
-		<resource name="console_button" type="image" filename="console-toggle" />
-		<resource name="slider" type="image" filename="slider" />
-		<resource name="slider-used" type="image" filename="slider-used" />
-		<resource name="slider-touch" type="image" filename="slider-touch" />
-		<resource name="unlock-icon" type="image" filename="unlock" />
-		<resource name="keyboard1" type="image" filename="keyboard1" />
-		<resource name="keyboard2" type="image" filename="keyboard2" />
-		<resource name="keyboard3" type="image" filename="keyboard3" />
-		<resource name="keyboard4" type="image" filename="keyboard4" />
-		<resource name="cursor" type="image" filename="cursor" retainaspect="1" />
-	</resources>
-
-	<variables>
-		<variable name="col1_x" value="260" />
-		<variable name="col2_x" value="770" />
-		<variable name="col3_x" value="1310" />
-		<variable name="col4_x" value="1820" />
-		<variable name="row1_y" value="300" />
-		<variable name="row2_y" value="1000" />
-		<variable name="col_center_x" value="1040" />
-		<variable name="center_x" value="1280" />
-		<variable name="screen_width" value="1920" />
-		<variable name="screen_height" value="1200" />
-		<variable name="col_progressbar_x" value="1028" />
-		<variable name="row_progressbar_y" value="1500" />
-		<variable name="col1_medium_x" value="755" />
-		<variable name="col2_medium_x" value="1025" />
-		<variable name="col3_medium_x" value="1310" />
-		<variable name="col4_medium_x" value="1580" />
-		<variable name="row1_medium_y" value="105" />
-		<variable name="row2_medium_y" value="500" />
-		<variable name="row3_medium_y" value="245" />
-		<variable name="row4_medium_y" value="1000" />
-		<variable name="row5_medium_y" value="950" />
-		<variable name="row1_text_y" value="120" />
-		<variable name="row2_text_y" value="195" />
-		<variable name="row3_text_y" value="270" />
-		<variable name="row4_text_y" value="345" />
-		<variable name="row5_text_y" value="420" />
-		<variable name="row6_text_y" value="495" />
-		<variable name="row7_text_y" value="570" />
-		<variable name="row8_text_y" value="645" />
-		<variable name="row9_text_y" value="720" />
-		<variable name="row10_text_y" value="795" />
-		<variable name="row11_text_y" value="870" />
-		<variable name="row12_text_y" value="945" />
-		<variable name="row13_text_y" value="1020" />
-		<variable name="row14_text_y" value="1095" />
-		<variable name="row15_text_y" value="1170" />
-		<variable name="row16_text_y" value="1240" />
-		<variable name="row17_text_y" value="1310" />
-		<variable name="row18_text_y" value="1395" />
-		<variable name="row_offsetmedium_y" value="1100" />
-		<variable name="home_button_x" value="2200" />
-		<variable name="home_button_y" value="15" />
-		<variable name="back_button_x" value="2320" />
-		<variable name="back_button_y" value="15" />
-		<variable name="console_button_x" value="2440" />
-		<variable name="console_button_y" value="15" />
-		<variable name="nandcheck_col1" value="328" />
-		<variable name="nandcheck_col2" value="800" />
-		<variable name="nandcheck_row1" value="260" />
-		<variable name="nandcheck_row2" value="360" />
-		<variable name="nandcheck_row3" value="460" />
-		<variable name="nandcheck_row4" value="560" />
-		<variable name="nandcheck_row5" value="660" />
-		<variable name="nandcheck_row6" value="760" />
-		<variable name="nandcheck_row7" value="860" />
-		<variable name="nandcheck_row8" value="960" />
-		<variable name="button_text_color" value="#AAAAAA" />
-		<variable name="text_color" value="#A0A0A0" />
-		<variable name="text_success_color" value="#33B5E5" />
-		<variable name="text_fail_color" value="#FF0101" />
-		<variable name="highlight_color" value="#90909080" />
-		<variable name="caps_highlight_color" value="#33B5E580" />
-		<variable name="slider_x" value="841" />
-		<variable name="slider_y" value="1335" />
-		<variable name="slider_text_y" value="1435" />
-		<variable name="sort_text_x" value="800" />
-		<variable name="sort_asc_text_y" value="1410" />
-		<variable name="sort_asc_button_y" value="1400" />
-		<variable name="sort_desc_text_y" value="1490" />
-		<variable name="sort_desc_button_y" value="1480" />
-		<variable name="sort_col1_button_x" value="1200" />
-		<variable name="sort_col2_button_x" value="1350" />
-		<variable name="sort_col3_button_x" value="1500" />
-		<variable name="col1_sdext_x" value="960" />
-		<variable name="col2_sdext_x" value="1600" />
-		<variable name="row1_sdext_y" value="180" />
-		<variable name="row2_sdext_y" value="265" />
-		<variable name="row_extsize_y" value="175" />
-		<variable name="row_swapsize_y" value="260" />
-		<variable name="input_x" value="50" />
-		<variable name="input_width" value="2460" />
-		<variable name="input_height" value="65" />
-		<variable name="input_background_color" value="#303030" />
-		<variable name="input_cursor_color" value="#33B5E5" />
-		<variable name="input_cursor_width" value="3" />
-		<variable name="console_x" value="50" />
-		<variable name="console_width" value="2460" />
-		<variable name="console_foreground" value="#A0A0A0" />
-		<variable name="warning" value="#F8F8A0" />
-		<variable name="error" value="#FF4040" />
-		<variable name="highlight" value="#33B5E5" />
-		<variable name="console_background" value="#303030" />
-		<variable name="console_scroll" value="#303030" />
-		<variable name="console_action_height" value="320" />
-		<variable name="console_install_height" value="440" />
-		<variable name="console_installdone_height" value="300" />
-		<variable name="fileselector_folder_x" value="70" />
-		<variable name="fileselector_folder_width" value="910" />
-		<variable name="fileselector_folderonly_width" value="1200" />
-		<variable name="fileselector_file_x" value="1000" />
-		<variable name="fileselector_file_width" value="1500" />
-		<variable name="fileselector_install_y" value="290" />
-		<variable name="fileselector_install_height" value="1100" />
-		<variable name="fileselector_header_background" value="#202020" />
-		<variable name="fileselector_header_textcolor" value="#AAAAAA" />
-		<variable name="fileselector_header_separatorcolor" value="#33B5E5" />
-		<variable name="fileselector_header_separatorheight" value="3" />
-		<variable name="fileselector_separatorcolor" value="#505050" />
-		<variable name="fileselector_separatorheight" value="2" />
-		<variable name="fileselector_background" value="#303030" />
-		<variable name="fileselector_highlight_color" value="#505050" />
-		<variable name="fileselector_highlight_font_color" value="#33B5E5" />
-		<variable name="fileselector_spacing" value="18" />
-		<variable name="fastscroll_linecolor" value="#50505080" />
-		<variable name="fastscroll_rectcolor" value="#33B5E580" />
-		<variable name="fastscroll_w" value="80" />
-		<variable name="fastscroll_linew" value="4" />
-		<variable name="fastscroll_rectw" value="24" />
-		<variable name="fastscroll_recth" value="60" />
-		<variable name="zipstorage_text_y" value="190" />
-		<variable name="listbox_x" value="680" />
-		<variable name="listbox_y" value="195" />
-		<variable name="listbox_width" value="1200" />
-		<variable name="listbox_tz_height" value="650" />
-		<variable name="listbox_background" value="#303030" />
-		<variable name="listbox_spacing" value="18" />
-		<variable name="sd_plus_x" value="408" />
-		<variable name="lock_x" value="880" />
-		<variable name="lock_y" value="300" />
-		<variable name="filemanager_select_x" value="2000" />
-		<variable name="filemanager_select_y" value="1360" />
-		<variable name="backup_name_text_y" value="440" />
-		<variable name="backup_name_button_y" value="950" />
-		<variable name="col_right_x" value="2510" />
-		<variable name="cancel_button_y" value="430" />
-		<variable name="terminal_console_y" value="0" />
-		<variable name="terminal_console_height" value="810" />
-		<variable name="terminal_text_y" value="837" />
-		<variable name="terminal_button_y" value="815" />
-		<variable name="terminal_input_width" value="2100" />
-		<variable name="button_fill_color" value="#303030" />
-		<variable name="button_fill_full_width" value="1280" />
-		<variable name="button_fill_main_width" value="1200" />
-		<variable name="button_fill_main_height" value="320" />
-		<variable name="button_fill_half_height" value="107" />
-		<variable name="button_fill_quarter_height" value="80" />
-		<variable name="button_full_center_x" value="640" />
-		<variable name="flash_list_height" value="450" />
-		<variable name="backup_list_x" value="50" />
-		<variable name="backup_list_y" value="210" />
-		<variable name="backup_list_width" value="1200" />
-		<variable name="backup_list_height" value="880" />
-		<variable name="backup_storage_y" value="540" />
-		<variable name="backup_encrypt_y" value="650" />
-		<variable name="restore_list_y" value="280" />
-		<variable name="restore_list_height" value="800" />
-		<variable name="mount_list_height" value="1200" />
-		<variable name="mount_storage_row" value="1100" />
-		<variable name="wipe_list_height" value="1100" />
-		<variable name="wipe_button_y" value="500" />
-		<variable name="slidervalue_x" value="640" />
-		<variable name="slidervalue_w" value="1280" />
-		<variable name="slidervalue_line_clr" value="#FFFFFF" />
-		<variable name="slidervalue_slider_clr" value="#33B5E5" />
-		<variable name="slidervalue_lineh" value="4" />
-		<variable name="slidervalue_padding" value="0" />
-		<variable name="slidervalue_sliderw" value="30" />
-		<variable name="slidervalue_sliderh" value="90" />
-	</variables>
-
-	<mousecursor>
-		<placement w="15" h="15" />
-		<background color="#FFFF00FF" resource="cursor" />
-		<speed multiplier="2.5" />
-	</mousecursor>
-
-	<templates>
-		<template name="header">
-			<background color="#000000FF" />
-
-			<object type="image">
-				<image resource="base" />
-				<placement x="0" y="0" />
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="400" y="8" />
-				<text>Team Win Recovery Project  v%tw_version%</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="400" y="55" />
-				<conditions>
-					<condition var1="tw_no_battery_percent" var2="0" />
-					<condition var1="tw_battery" op="&gt;" var2="0" />
-					<condition var1="tw_battery" op="&lt;" var2="101" />
-				</conditions>
-				<text>Battery Level: %tw_battery%</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="900" y="55" />
-				<text>%tw_time%</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="1650" y="55" />
-				<conditions>
-					<condition var1="tw_no_cpu_temp" var2="0" />
-				</conditions>
-				<text>CPU: %tw_cpu_temp% C</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<condition var1="tw_simulate_actions" var2="1" />
-				<font resource="font" />
-				<placement x="1100" y="55" />
-				<text>SIMULATING ACTIONS</text>
-			</object>
-
-			<object type="button">
-				<placement x="%home_button_x%" y="%home_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text></text>
-				<image resource="home_icon" />
-				<condition var1="tw_busy" var2="0" />
-				<action function="key">home</action>
-			</object>
-
-			<object type="button">
-				<placement x="%back_button_x%" y="%back_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text></text>
-				<image resource="back_icon" />
-				<condition var1="tw_busy" var2="0" />
-				<action function="key">back</action>
-			</object>
-
-			<object type="action">
-				<touch key="power" />
-				<action function="overlay">lock</action>
-			</object>
-
-			<object type="action">
-				<touch key="power+voldown" />
-				<action function="screenshot" />
-			</object>
-		</template>
-
-		<template name="progress_bar">
-			<object type="progressbar">
-				<placement x="%col_progressbar_x%" y="%row_progressbar_y%" />
-				<resource empty="progress_empty" full="progress_full" />
-				<data name="ui_progress" />
-			</object>
-
-			<object type="animation">
-				<placement x="%col_progressbar_x%" y="%row_progressbar_y%" />
-				<resource name="progress" />
-				<speed fps="15" render="2" />
-				<loop frame="1" />
-			</object>
-		</template>
-
-		<template name="sort_options">
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<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="font" color="%button_text_color%" />
-				<text>Name</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=1</action>
-			</object>
-
-			<object type="button">
-				<placement x="%sort_col2_button_x%" y="%sort_asc_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Date</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=2</action>
-			</object>
-
-			<object type="button">
-				<placement x="%sort_col3_button_x%" y="%sort_asc_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Size</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=3</action>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<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="font" color="%button_text_color%" />
-				<text>Name</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=-1</action>
-			</object>
-
-			<object type="button">
-				<placement x="%sort_col2_button_x%" y="%sort_desc_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Date</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=-2</action>
-			</object>
-
-			<object type="button">
-				<placement x="%sort_col3_button_x%" y="%sort_desc_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Size</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=-3</action>
-			</object>
-		</template>
-
-		<template name="flash_zip_console">
-			<object type="console">
-				<placement x="%console_x%" y="195" w="%console_width%" h="950" />
-				<color foreground="%console_foreground%" background="%console_background%" scroll="%console_scroll%" />
-				<font resource="fixed" />
-			</object>
-		</template>
-
-		<template name="action_page_console">
-			<object type="console">
-				<placement x="%console_x%" y="400" w="%console_width%" h="800" />
-				<color foreground="%console_foreground%" background="%console_background%" scroll="%console_scroll%" />
-				<font resource="fixed" />
-			</object>
-		</template>
-
-		<template name="footer">
-			<object type="console">
-				<slideout resource="console_button" x="%console_button_x%" y="%console_button_y%" />
-				<placement x="%console_x%" y="195" w="%console_width%" h="1335" />
-				<color foreground="%console_foreground%" background="%console_background%" scroll="%console_scroll%" />
-				<font resource="fixed" />
-			</object>
-		</template>
-
-		<template name="keyboardtemplate">
-			<object type="keyboard">
-				<placement x="0" y="912" />
-				<layout resource1="keyboard1" resource2="keyboard2" resource3="keyboard3" resource4="keyboard4" />
-				<highlight color="%highlight_color%" />
-				<capshighlight color="%caps_highlight_color%" />
-				<layout1>
-					<keysize height="172" width="212" />
-					<row1 key01="204:" key02="q" long02="1" key03="w" long03="2" key04="e" long04="3" key05="r" long05="4" key06="t" long06="5" key07="y" long07="6" key08="u" long08="7" key09="i" long09="8" key10="o" long10="9" key11="p" long11="0" key12="236:c:8" />
-					<row2 key01="286:layout3" key02="208:a" key03="208:s" key04="208:d" key05="208:f" key06="208:g" key07="208:h" key08="208:j" key09="208:k" key10="208:l" key11="402:action" />
-					<row3 key01="354:layout2" key02="206:z" key03="206:x" key04="206:c" key05="206:v" key06="206:b" key07="206:n" key08="206:m" key09="206:," long09="!" key10="206:." long10="?" key11="352:layout2" />
-					<row4 key01="560:" key02="206:/" long02="@" key03="1030: " key04="206:'" long04="206:c:34" key05="212:-" long05="212:_" />
-				</layout1>
-				<layout2>
-					<keysize height="172" width="212" capslock="0" revert_layout="1" />
-					<row1 key01="204:" key02="Q" long02="1" key03="W" long03="2" key04="E" long04="3" key05="R" long05="4" key06="T" long06="5" key07="Y" long07="6" key08="U" long08="7" key09="I" long09="8" key10="O" long10="9" key11="P" long11="0" key12="236:c:8" />
-					<row2 key01="286:layout3" key02="208:A" key03="208:S" key04="208:D" key05="208:F" key06="208:G" key07="208:H" key08="208:J" key09="208:K" key10="208:L" key11="402:action" />
-					<row3 key01="354:layout1" key02="206:Z" key03="206:X" key04="206:C" key05="206:V" key06="206:B" key07="206:N" key08="206:M" key09="206:," long09="!" key10="206:." long10="?" key11="352:layout1" />
-					<row4 key01="560:" key02="206:/" long02="@" key03="1030: " key04="206:'" long04="206:c:34" key05="-" long05="_" />
-				</layout2>
-				<layout3>
-					<keysize height="172" width="212" />
-					<row1 key01="204:" key02="1" key03="2" key04="3" key05="4" key06="5" key07="6" key08="7" key09="8" key10="9" key11="0" key12="236:c:8" />
-					<row2 key01="286:layout1" key02="208:#" key03="208:$" key04="208:%" key05="208:&amp;" key06="208:*" key07="208:-" key08="208:+" key09="208:(" key10="208:)" key11="402:action" />
-					<row3 key01="354:layout4" key02="206:&lt;" key03="206:&gt;" key04="206:=" key05="206:'" key06="206:;" key07="206:," key08="206:." key09="206:!" key10="206:?" key11="352:layout4" />
-					<row4 key01="354:" key02="206:/" key03="206:@" key04="1030: " key05="206:c:34" key06="206:_" />
-				</layout3>
-				<layout4>
-					<keysize height="172" width="212" />
-					<row1 key01="204:" key02="~" key03="`" key04="|" key05="212:" key06="212:" key07="212:" key08="212:" key09="212:" key10="212:" key11="212:" key12="236:c:8" />
-					<row2 key01="286:layout1" key02="208:" key03="208:" key04="208:" key05="208:" key06="208:^" key07="208:" key08="208:" key09="208:{" key10="208:}" key11="402:action" />
-					<row3 key01="354:layout3" key02="206:\" key03="206:" key04="206:" key05="206:" key06="206:" key07="206:[" key08="206:]" key09="206:!" key10="206:?" key11="352:layout3" />
-					<row4 key01="766:" key02="1030: " />
-				</layout4>
-			</object>
-		</template>
-	</templates>
-</recovery>
diff --git a/gui/devices/280x280/res/fonts/Roboto-Condensed-12.dat b/gui/devices/280x280/res/fonts/Roboto-Condensed-12.dat
deleted file mode 100644
index b48c4f2..0000000
--- a/gui/devices/280x280/res/fonts/Roboto-Condensed-12.dat
+++ /dev/null
Binary files differ
diff --git a/gui/devices/280x280/res/images/back-icon.png b/gui/devices/280x280/res/images/back-icon.png
deleted file mode 100644
index a136c5d..0000000
--- a/gui/devices/280x280/res/images/back-icon.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/280x280/res/images/checkbox_checked.png b/gui/devices/280x280/res/images/checkbox_checked.png
deleted file mode 100644
index 82cde7e..0000000
--- a/gui/devices/280x280/res/images/checkbox_checked.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/280x280/res/images/checkbox_empty.png b/gui/devices/280x280/res/images/checkbox_empty.png
deleted file mode 100644
index 720a810..0000000
--- a/gui/devices/280x280/res/images/checkbox_empty.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/280x280/res/images/cursor.png b/gui/devices/280x280/res/images/cursor.png
deleted file mode 100644
index 32c8ae1..0000000
--- a/gui/devices/280x280/res/images/cursor.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/280x280/res/images/curtain.jpg b/gui/devices/280x280/res/images/curtain.jpg
deleted file mode 100644
index c0865b8..0000000
--- a/gui/devices/280x280/res/images/curtain.jpg
+++ /dev/null
Binary files differ
diff --git a/gui/devices/280x280/res/images/file.png b/gui/devices/280x280/res/images/file.png
deleted file mode 100644
index dcc7374..0000000
--- a/gui/devices/280x280/res/images/file.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/280x280/res/images/folder.png b/gui/devices/280x280/res/images/folder.png
deleted file mode 100644
index 6fb128f..0000000
--- a/gui/devices/280x280/res/images/folder.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/280x280/res/images/home-icon.png b/gui/devices/280x280/res/images/home-icon.png
deleted file mode 100644
index d24bd26..0000000
--- a/gui/devices/280x280/res/images/home-icon.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/280x280/res/images/indeterminate001.png b/gui/devices/280x280/res/images/indeterminate001.png
deleted file mode 100644
index 0b2b9b5..0000000
--- a/gui/devices/280x280/res/images/indeterminate001.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/280x280/res/images/indeterminate002.png b/gui/devices/280x280/res/images/indeterminate002.png
deleted file mode 100644
index dd94cb6..0000000
--- a/gui/devices/280x280/res/images/indeterminate002.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/280x280/res/images/indeterminate003.png b/gui/devices/280x280/res/images/indeterminate003.png
deleted file mode 100644
index 53716cd..0000000
--- a/gui/devices/280x280/res/images/indeterminate003.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/280x280/res/images/indeterminate004.png b/gui/devices/280x280/res/images/indeterminate004.png
deleted file mode 100644
index 71a6b58..0000000
--- a/gui/devices/280x280/res/images/indeterminate004.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/280x280/res/images/indeterminate005.png b/gui/devices/280x280/res/images/indeterminate005.png
deleted file mode 100644
index bda971c..0000000
--- a/gui/devices/280x280/res/images/indeterminate005.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/280x280/res/images/indeterminate006.png b/gui/devices/280x280/res/images/indeterminate006.png
deleted file mode 100644
index bfd38e2..0000000
--- a/gui/devices/280x280/res/images/indeterminate006.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/280x280/res/images/keyboard1.png b/gui/devices/280x280/res/images/keyboard1.png
deleted file mode 100644
index b6ce15d..0000000
--- a/gui/devices/280x280/res/images/keyboard1.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/280x280/res/images/keyboard2.png b/gui/devices/280x280/res/images/keyboard2.png
deleted file mode 100644
index 2c0a99e..0000000
--- a/gui/devices/280x280/res/images/keyboard2.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/280x280/res/images/keyboard3.png b/gui/devices/280x280/res/images/keyboard3.png
deleted file mode 100644
index 3a3f898..0000000
--- a/gui/devices/280x280/res/images/keyboard3.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/280x280/res/images/keyboard4.png b/gui/devices/280x280/res/images/keyboard4.png
deleted file mode 100644
index cba351a..0000000
--- a/gui/devices/280x280/res/images/keyboard4.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/280x280/res/images/medium-button.png b/gui/devices/280x280/res/images/medium-button.png
deleted file mode 100644
index 4422c16..0000000
--- a/gui/devices/280x280/res/images/medium-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/280x280/res/images/menu-button.png b/gui/devices/280x280/res/images/menu-button.png
deleted file mode 100644
index 2dd0428..0000000
--- a/gui/devices/280x280/res/images/menu-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/280x280/res/images/minus-button.png b/gui/devices/280x280/res/images/minus-button.png
deleted file mode 100644
index 345139e..0000000
--- a/gui/devices/280x280/res/images/minus-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/280x280/res/images/plus-button.png b/gui/devices/280x280/res/images/plus-button.png
deleted file mode 100644
index a44f764..0000000
--- a/gui/devices/280x280/res/images/plus-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/280x280/res/images/progress_empty.png b/gui/devices/280x280/res/images/progress_empty.png
deleted file mode 100644
index cdbb9b0..0000000
--- a/gui/devices/280x280/res/images/progress_empty.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/280x280/res/images/progress_fill.png b/gui/devices/280x280/res/images/progress_fill.png
deleted file mode 100644
index eb4cdca..0000000
--- a/gui/devices/280x280/res/images/progress_fill.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/280x280/res/images/radio_empty.png b/gui/devices/280x280/res/images/radio_empty.png
deleted file mode 100644
index f4cfa4f..0000000
--- a/gui/devices/280x280/res/images/radio_empty.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/280x280/res/images/radio_selected.png b/gui/devices/280x280/res/images/radio_selected.png
deleted file mode 100644
index d92f3ce..0000000
--- a/gui/devices/280x280/res/images/radio_selected.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/280x280/res/images/slideout.png b/gui/devices/280x280/res/images/slideout.png
deleted file mode 100644
index 14508c8..0000000
--- a/gui/devices/280x280/res/images/slideout.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/280x280/res/images/slider-touch.png b/gui/devices/280x280/res/images/slider-touch.png
deleted file mode 100644
index 25d5e1c..0000000
--- a/gui/devices/280x280/res/images/slider-touch.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/280x280/res/images/slider-used.png b/gui/devices/280x280/res/images/slider-used.png
deleted file mode 100644
index 13f1c03..0000000
--- a/gui/devices/280x280/res/images/slider-used.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/280x280/res/images/slider.png b/gui/devices/280x280/res/images/slider.png
deleted file mode 100644
index 283f0a3..0000000
--- a/gui/devices/280x280/res/images/slider.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/280x280/res/images/sort-button.png b/gui/devices/280x280/res/images/sort-button.png
deleted file mode 100644
index 229f392..0000000
--- a/gui/devices/280x280/res/images/sort-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/280x280/res/images/top-bar.jpg b/gui/devices/280x280/res/images/top-bar.jpg
deleted file mode 100644
index 5768497..0000000
--- a/gui/devices/280x280/res/images/top-bar.jpg
+++ /dev/null
Binary files differ
diff --git a/gui/devices/280x280/res/images/unlock.png b/gui/devices/280x280/res/images/unlock.png
deleted file mode 100644
index 1867559..0000000
--- a/gui/devices/280x280/res/images/unlock.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/280x280/res/ui.xml b/gui/devices/280x280/res/ui.xml
deleted file mode 100644
index ab03425..0000000
--- a/gui/devices/280x280/res/ui.xml
+++ /dev/null
@@ -1,418 +0,0 @@
-<?xml version="1.0"?>
-
-<recovery>
-	<details>
-		<resolution width="280" height="280" />
-		<roundscreen offset_x="35" offset_y="35" />
-		<author>TeamWin</author>
-		<title>Backup Naowz</title>
-		<description>Default basic theme</description>
-		<preview>preview.jpg</preview>
-	</details>
-
-	<include>
-		<xmlfile name="watch.xml" />
-	</include>
-
-	<resources>
-		<resource name="font" type="font" filename="RobotoCondensed-Regular.ttf" size="12" fallback="Roboto-Condensed-12" />
-		<resource name="mediumfont" type="font" filename="RobotoCondensed-Regular.ttf" size="12" fallback="Roboto-Condensed-12" />
-		<resource name="filelist" type="font" filename="RobotoCondensed-Regular.ttf" size="12" fallback="Roboto-Condensed-12" />
-		<resource name="top_bar" type="image" filename="top-bar.jpg" />
-		<resource name="main_button" type="image" filename="menu-button" />
-		<resource name="file_icon" type="image" filename="file" />
-		<resource name="folder_icon" type="image" filename="folder" />
-		<resource name="slideout" type="image" filename="slideout" />
-		<resource name="progress" type="animation" filename="indeterminate" />
-		<resource name="progress_empty" type="image" filename="progress_empty" />
-		<resource name="progress_full" type="image" filename="progress_fill" />
-		<resource name="checkbox_false" type="image" filename="checkbox_empty" retainaspect="1" />
-		<resource name="checkbox_true" type="image" filename="checkbox_checked" retainaspect="1" />
-		<resource name="radio_false" type="image" filename="radio_empty" retainaspect="1" />
-		<resource name="radio_true" type="image" filename="radio_selected" retainaspect="1" />
-		<resource name="medium_button" type="image" filename="medium-button" />
-		<resource name="sort_button" type="image" filename="sort-button" />
-		<resource name="minus_button" type="image" filename="minus-button" />
-		<resource name="plus_button" type="image" filename="plus-button" />
-		<resource name="home_icon" type="image" filename="home-icon" />
-		<resource name="back_icon" type="image" filename="back-icon" />
-		<resource name="slider" type="image" filename="slider" />
-		<resource name="slider-used" type="image" filename="slider-used" />
-		<resource name="slider-touch" type="image" filename="slider-touch" />
-		<resource name="unlock-icon" type="image" filename="unlock" />
-		<resource name="keyboard1" type="image" filename="keyboard1" />
-		<resource name="keyboard2" type="image" filename="keyboard2" />
-		<resource name="keyboard3" type="image" filename="keyboard3" />
-		<resource name="keyboard4" type="image" filename="keyboard4" />
-		<resource name="cursor" type="image" filename="cursor" retainaspect="1" />
-	</resources>
-
-	<variables>
-		<variable name="col1_x" value="6" />
-		<variable name="col2_x" value="148" />
-		<variable name="col_center_x" value="77" />
-		<variable name="col_center_medium_x" value="115" />
-		<variable name="center_x" value="140" />
-		<variable name="row1_home_y" value="40" />
-		<variable name="row2_home_y" value="95" />
-		<variable name="row3_home_y" value="150" />
-		<variable name="row4_home_y" value="205" />
-		<variable name="row1_y" value="25" />
-		<variable name="row2_y" value="85" />
-		<variable name="row3_y" value="145" />
-		<variable name="row4_y" value="205" />
-		<variable name="row_queue_y" value="164" />
-		<variable name="row1_header_y" value="0" />
-		<variable name="row1_text_y" value="19" />
-		<variable name="row2_text_y" value="38" />
-		<variable name="row3_text_y" value="57" />
-		<variable name="row4_text_y" value="76" />
-		<variable name="row5_text_y" value="95" />
-		<variable name="row6_text_y" value="114" />
-		<variable name="row7_text_y" value="133" />
-		<variable name="row8_text_y" value="152" />
-		<variable name="row9_text_y" value="171" />
-		<variable name="row10_text_y" value="190" />
-		<variable name="row11_text_y" value="209" />
-		<variable name="row12_text_y" value="228" />
-		<variable name="row13_text_y" value="237" />
-		<variable name="flash_list_height" value="140" />
-		<variable name="zip_status_y" value="265" />
-		<variable name="backup_text_y" value="50" />
-		<variable name="col_progressbar_x" value="31" />
-		<variable name="row_progressbar_y" value="250" />
-		<variable name="col1_medium_x" value="6" />
-		<variable name="col2_medium_x" value="79" />
-		<variable name="col3_medium_x" value="150" />
-		<variable name="col4_medium_x" value="223" />
-		<variable name="row1_medium_y" value="24" />
-		<variable name="row2_medium_y" value="64" />
-		<variable name="row3_medium_y" value="104" />
-		<variable name="row4_medium_y" value="144" />
-		<variable name="row5_medium_y" value="184" />
-		<variable name="row6_medium_y" value="224" />
-		<variable name="row7_medium_y" value="264" />
-		<variable name="slider_x" value="40" />
-		<variable name="slider_y" value="234" />
-		<variable name="slider_text_y" value="254" />
-		<variable name="button_text_color" value="#AAAAAA" />
-		<variable name="text_color" value="#FFFFFF" />
-		<variable name="text_success_color" value="#33B5E5" />
-		<variable name="text_fail_color" value="#FF0101" />
-		<variable name="highlight_color" value="#90909080" />
-		<variable name="caps_highlight_color" value="#33B5E580" />
-		<variable name="home_button_x" value="3" />
-		<variable name="home_button_y" value="262" />
-		<variable name="back_button_x" value="244" />
-		<variable name="back_button_y" value="262" />
-		<variable name="sort_text_x" value="16" />
-		<variable name="sort_asc_text_y" value="205" />
-		<variable name="sort_asc_button_y" value="203" />
-		<variable name="sort_desc_text_y" value="230" />
-		<variable name="sort_desc_button_y" value="228" />
-		<variable name="sort_col1_button_x" value="125" />
-		<variable name="sort_col2_button_x" value="175" />
-		<variable name="sort_col3_button_x" value="225" />
-		<variable name="input_width" value="268" />
-		<variable name="input_width_conf" value="10" />
-		<variable name="input_height" value="18" />
-		<variable name="input_background_color" value="#303030" />
-		<variable name="input_cursor_color" value="#33B5E5" />
-		<variable name="input_cursor_width" value="2" />
-		<variable name="console_x" value="0" />
-		<variable name="console_width" value="280" />
-		<variable name="console_foreground" value="#A0A0A0" />
-		<variable name="warning" value="#F8F8A0" />
-		<variable name="error" value="#FF4040" />
-		<variable name="highlight" value="#33B5E5" />
-		<variable name="console_background" value="#303030" />
-		<variable name="console_scroll" value="#303030" />
-		<variable name="console_action_height" value="140" />
-		<variable name="console_install_height" value="140" />
-		<variable name="console_installdone_height" value="140" />
-		<variable name="fileselector_x" value="0" />
-		<variable name="fileselector_y" value="44" />
-		<variable name="fileselector_width" value="280" />
-		<variable name="fileselector_install_height" value="152" />
-		<variable name="fileselector_header_background" value="#202020" />
-		<variable name="fileselector_header_textcolor" value="#AAAAAA" />
-		<variable name="fileselector_header_separatorcolor" value="#33B5E5" />
-		<variable name="fileselector_header_separatorheight" value="2" />
-		<variable name="fileselector_separatorcolor" value="#505050" />
-		<variable name="fileselector_separatorheight" value="1" />
-		<variable name="fileselector_background" value="#303030" />
-		<variable name="fileselector_highlight_color" value="#505050" />
-		<variable name="fileselector_highlight_font_color" value="#33B5E5" />
-		<variable name="fileselector_spacing" value="12" />
-		<variable name="fastscroll_linecolor" value="#50505080" />
-		<variable name="fastscroll_rectcolor" value="#33B5E580" />
-		<variable name="fastscroll_w" value="32" />
-		<variable name="fastscroll_linew" value="1" />
-		<variable name="fastscroll_rectw" value="7" />
-		<variable name="fastscroll_recth" value="24" />
-		<variable name="listbox_x" value="0" />
-		<variable name="listbox_width" value="280" />
-		<variable name="listbox_background" value="#303030" />
-		<variable name="listbox_spacing" value="12" />
-		<variable name="sd_plus_x" value="174" />
-		<variable name="sdext_text_x" value="56" />
-		<variable name="sdext_text_y" value="30" />
-		<variable name="sdswap_button_y" value="60" />
-		<variable name="sdswap_text_x" value="56" />
-		<variable name="sdswap_text_y" value="63" />
-		<variable name="sdfilesystem_text_y" value="92" />
-		<variable name="sdfilesystem_button_y" value="120" />
-		<variable name="lock_x" value="96" />
-		<variable name="lock_y" value="70" />
-		<variable name="filemanager_select_x" value="115" />
-		<variable name="filemanager_select_y" value="250" />
-		<variable name="terminal_console_height" value="114" />
-		<variable name="terminal_text_y" value="116" />
-		<variable name="terminal_button_y" value="250" />
-		<variable name="listbox_tz_height" value="139" />
-		<variable name="row_dst_text_y" value="142" />
-		<variable name="row_offset_text_y" value="163" />
-		<variable name="row_offset_medium_y" value="179" />
-		<variable name="tz_set_y" value="237" />
-		<variable name="tz_current_y" value="221" />
-		<variable name="button_fill_color" value="#303030" />
-		<variable name="button_fill_full_width" value="268" />
-		<variable name="button_fill_main_width" value="126" />
-		<variable name="button_fill_med_width" value="65" />
-		<variable name="button_fill_small_width" value="32" />
-		<variable name="button_fill_main_height" value="40" />
-		<variable name="button_fill_half_height" value="20" />
-		<variable name="button_fill_quarter_height" value="20" />
-		<variable name="button_refresh_x" value="152" />
-		<variable name="backup_list_y" value="26" />
-		<variable name="backup_list_height" value="154" />
-		<variable name="restore_list_height" value="180" />
-		<variable name="backup_button_row1" value="184" />
-		<variable name="backup_button_row2" value="208" />
-		<variable name="mount_list_height" value="170" />
-		<variable name="mount_storage_row" value="175" />
-		<variable name="storage_list_height" value="134" />
-		<variable name="wipe_list_height" value="194" />
-		<variable name="wipe_button_y" value="170" />
-		<variable name="slidervalue_w" value="268" />
-		<variable name="slidervalue_line_clr" value="#FFFFFF" />
-		<variable name="slidervalue_slider_clr" value="#33B5E5" />
-		<variable name="slidervalue_lineh" value="1" />
-		<variable name="slidervalue_padding" value="8" />
-		<variable name="slidervalue_sliderw" value="4" />
-		<variable name="slidervalue_sliderh" value="20" />
-		<variable name="wipe_button_row1" value="210" />
-		<variable name="invalid_partition_y" value="195" />
-	</variables>
-
-	<templates>
-		<template name="twrpheader">
-			<object type="image">
-				<image resource="top_bar" />
-				<placement x="0" y="0" />
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="3" y="3" />
-				<text>TWRP v%tw_version%</text>
-			</object>
-
-			<object type="text" color="%text_fail_color%">
-				<condition var1="tw_simulate_actions" var2="1" />
-				<font resource="font" />
-				<placement x="3" y="21" />
-				<text>SIMULATION</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="95" y="3" />
-				<text>%tw_time%</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="277" y="3" placement="1" />
-				<conditions>
-					<condition var1="tw_no_battery_percent" var2="0" />
-					<condition var1="tw_battery" op="&gt;" var2="0" />
-					<condition var1="tw_battery" op="&lt;" var2="101" />
-				</conditions>
-				<text>%tw_battery%</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="160" y="3" />
-				<conditions>
-					<condition var1="tw_no_cpu_temp" var2="0" />
-				</conditions>
-				<text>CPU: %tw_cpu_temp% C</text>
-			</object>
-		</template>
-
-		<template name="header">
-			<background color="#000000FF" />
-
-			<object type="button">
-				<placement x="%home_button_x%" y="%home_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text></text>
-				<image resource="home_icon" />
-				<condition var1="tw_busy" var2="0" />
-				<action function="key">home</action>
-			</object>
-
-			<object type="button">
-				<placement x="%back_button_x%" y="%back_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text></text>
-				<image resource="back_icon" />
-				<condition var1="tw_busy" var2="0" />
-				<action function="key">back</action>
-			</object>
-
-			<object type="action">
-				<touch key="power" />
-				<action function="key">back</action>
-			</object>
-
-			<object type="action">
-				<touch key="power+voldown" />
-				<action function="screenshot" />
-			</object>
-		</template>
-
-		<template name="progress_bar">
-			<object type="progressbar">
-				<placement x="%col_progressbar_x%" y="%row_progressbar_y%" />
-				<resource empty="progress_empty" full="progress_full" />
-				<data name="ui_progress" />
-			</object>
-
-			<object type="animation">
-				<placement x="%col_progressbar_x%" y="%row_progressbar_y%" />
-				<resource name="progress" />
-				<speed fps="15" render="2" />
-				<loop frame="1" />
-			</object>
-		</template>
-
-		<template name="action_page_console">
-			<object type="console">
-				<placement x="%console_x%" y="%row2_y%" w="%console_width%" h="%console_action_height%" />
-				<color foreground="%console_foreground%" background="%console_background%" scroll="%console_scroll%" />
-				<font resource="fixed" />
-			</object>
-		</template>
-
-		<template name="sort_options">
-			<object type="text" color="%text_color%">
-				<font resource="mediumfont" />
-				<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="mediumfont" color="%button_text_color%" />
-				<text>Name</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=1</action>
-			</object>
-
-			<object type="button">
-				<placement x="%sort_col2_button_x%" y="%sort_asc_button_y%" />
-				<font resource="mediumfont" color="%button_text_color%" />
-				<text>Date</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=2</action>
-			</object>
-
-			<object type="button">
-				<placement x="%sort_col3_button_x%" y="%sort_asc_button_y%" />
-				<font resource="mediumfont" color="%button_text_color%" />
-				<text>Size</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=3</action>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="mediumfont" />
-				<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="mediumfont" color="%button_text_color%" />
-				<text>Name</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=-1</action>
-			</object>
-
-			<object type="button">
-				<placement x="%sort_col2_button_x%" y="%sort_desc_button_y%" />
-				<font resource="mediumfont" color="%button_text_color%" />
-				<text>Date</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=-2</action>
-			</object>
-
-			<object type="button">
-				<placement x="%sort_col3_button_x%" y="%sort_desc_button_y%" />
-				<font resource="mediumfont" color="%button_text_color%" />
-				<text>Size</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=-3</action>
-			</object>
-		</template>
-
-		<template name="footer">
-			<object type="console">
-				<slideout resource="slideout" x="113" y="255" />
-				<placement x="%console_x%" y="0" w="%console_width%" h="255" />
-				<color foreground="%console_foreground%" background="%console_background%" scroll="%console_scroll%" />
-				<font resource="fixed" />
-			</object>
-		</template>
-
-		<template name="keyboardtemplate">
-			<object type="keyboard">
-				<placement x="0" y="136" />
-				<layout resource1="keyboard1" resource2="keyboard2" resource3="keyboard3" resource4="keyboard4" />
-				<highlight color="%highlight_color%" />
-				<capshighlight color="%caps_highlight_color%" />
-				<layout1>
-					<keysize height="32" width="28" />
-					<row1 key01="q" long01="1" key02="w" long02="2" key03="e" long03="3" key04="r" long04="4" key05="t" long05="5" key06="y" long06="6" key07="u" long07="7" key08="i" long08="8" key09="o" long09="9" key10="p" long10="0" />
-					<row2 key01="42:a" key02="s" key03="d" key04="f" key05="g" key06="h" key07="j" key08="k" key09="42:l" />
-					<row3 key01="42:layout2" key02="z" key03="x" key04="c" key05="v" key06="b" key07="n" key08="m" key09="42:c:8" />
-					<row4 key01="42:layout3" key02="28:," key03="140: " key04="28:." key05="42:a:action" />
-				</layout1>
-				<layout2>
-					<keysize height="32" width="28" capslock="0" revert_layout="1" />
-					<row1 key01="Q" long01="1" key02="W" long02="2" key03="E" long03="3" key04="R" long04="4" key05="T" long05="5" key06="Y" long06="6" key07="U" long07="7" key08="I" long08="8" key09="O" long09="9" key10="P" long10="0" />
-					<row2 key01="42:A" key02="S" key03="D" key04="F" key05="G" key06="H" key07="J" key08="K" key09="42:L" />
-					<row3 key01="42:layout1" key02="Z" key03="X" key04="C" key05="V" key06="B" key07="N" key08="M" key09="42:c:8" />
-					<row4 key01="42:layout3" key02="28:," key03="140: " key04="28:." key05="42:action" />
-				</layout2>
-				<layout3>
-					<keysize height="32" width="28" />
-					<row1 key01="1" key02="2" key03="3" key04="4" key05="5" key06="6" key07="7" key08="8" key09="9" key10="0" />
-					<row2 key01="@" key02="#" key03="$" key04="%" key05="&amp;" key06="*" key07="-" key08="+" key09="(" key10=")" />
-					<row3 key01="42:layout4" key02="!" key03="28:c:34" key04="'" key05=":" key06=";" key07="/" key08="?" key09="42:c:8" />
-					<row4 key01="42:layout1" key02="28:," key03="140: " key04="28:." key05="42:action" />
-				</layout3>
-				<layout4>
-					<keysize height="32" width="28" />
-					<row1 key01="~" key02="`" key03="|" key04="28:" key05="28:" key06="28:" key07="%" key08="28:" key09="{" key10="}" />
-					<row2 key01="28:" key02="28:" key03="28:" key04="28:" key05="28:" key06="^" key07="_" key08="=" key09="[" key10="]" />
-					<row3 key01="42:layout3" key02="28:" key03="28:" key04="28:" key05="28:" key06="\" key07="&lt;" key08="&gt;" key09="42:c:8" />
-					<row4 key01="42:layout1" key02="28:c:34" key03="140: " key04="28:." key05="42:action" />
-				</layout4>
-			</object>
-		</template>
-	</templates>
-</recovery>
diff --git a/gui/devices/320x320/res/images/top-bar.jpg b/gui/devices/320x320/res/images/top-bar.jpg
deleted file mode 100644
index 5c02ec8..0000000
--- a/gui/devices/320x320/res/images/top-bar.jpg
+++ /dev/null
Binary files differ
diff --git a/gui/devices/320x320/res/images/twrplogo.png b/gui/devices/320x320/res/images/twrplogo.png
new file mode 100644
index 0000000..a95be1a
--- /dev/null
+++ b/gui/devices/320x320/res/images/twrplogo.png
Binary files differ
diff --git a/gui/devices/320x320/res/ui.xml b/gui/devices/320x320/res/ui.xml
index 71cc5e2..a0b1c8a 100644
--- a/gui/devices/320x320/res/ui.xml
+++ b/gui/devices/320x320/res/ui.xml
@@ -18,11 +18,11 @@
 		<resource name="font" type="font" filename="RobotoCondensed-Regular.ttf" size="14" fallback="Roboto-Condensed-14" />
 		<resource name="mediumfont" type="font" filename="RobotoCondensed-Regular.ttf" size="14" fallback="Roboto-Condensed-14" />
 		<resource name="filelist" type="font" filename="RobotoCondensed-Regular.ttf" size="14" fallback="Roboto-Condensed-14" />
-		<resource name="top_bar" type="image" filename="top-bar.jpg" />
+		<resource name="twrplogo" type="image" filename="twrplogo" retainaspect="1" />
 		<resource name="main_button" type="image" filename="menu-button" />
-		<resource name="file_icon" type="image" filename="file" />
-		<resource name="folder_icon" type="image" filename="folder" />
-		<resource name="slideout" type="image" filename="slideout" />
+		<resource name="file_icon" type="image" filename="file" retainaspect="1" />
+		<resource name="folder_icon" type="image" filename="folder" retainaspect="1" />
+		<resource name="slideout" type="image" filename="slideout" retainaspect="1" />
 		<resource name="progress" type="animation" filename="indeterminate" />
 		<resource name="progress_empty" type="image" filename="progress_empty" />
 		<resource name="progress_full" type="image" filename="progress_fill" />
@@ -34,12 +34,12 @@
 		<resource name="sort_button" type="image" filename="sort-button" />
 		<resource name="minus_button" type="image" filename="minus-button" />
 		<resource name="plus_button" type="image" filename="plus-button" />
-		<resource name="home_icon" type="image" filename="home-icon" />
-		<resource name="back_icon" type="image" filename="back-icon" />
-		<resource name="slider" type="image" filename="slider" />
-		<resource name="slider-used" type="image" filename="slider-used" />
-		<resource name="slider-touch" type="image" filename="slider-touch" />
-		<resource name="unlock-icon" type="image" filename="unlock" />
+		<resource name="home_icon" type="image" filename="home-icon" retainaspect="1" />
+		<resource name="back_icon" type="image" filename="back-icon" retainaspect="1" />
+		<resource name="slider" type="image" filename="slider" retainaspect="1" />
+		<resource name="slider-used" type="image" filename="slider-used" retainaspect="1" />
+		<resource name="slider-touch" type="image" filename="slider-touch" retainaspect="1" />
+		<resource name="unlock-icon" type="image" filename="unlock" retainaspect="1" />
 		<resource name="keyboard1" type="image" filename="keyboard1" />
 		<resource name="keyboard2" type="image" filename="keyboard2" />
 		<resource name="keyboard3" type="image" filename="keyboard3" />
@@ -92,7 +92,6 @@
 		<variable name="row5_medium_y" value="88" />
 		<variable name="row6_medium_y" value="104" />
 		<variable name="row7_medium_y" value="120" />
-		<variable name="slider_x" value="45" />
 		<variable name="slider_y" value="268" />
 		<variable name="slider_text_y" value="294" />
 		<variable name="button_text_color" value="#AAAAAA" />
@@ -103,7 +102,7 @@
 		<variable name="caps_highlight_color" value="#33B5E580" />
 		<variable name="home_button_x" value="3" />
 		<variable name="home_button_y" value="300" />
-		<variable name="back_button_x" value="280" />
+		<variable name="back_button_x" value="317" />
 		<variable name="back_button_y" value="300" />
 		<variable name="sort_text_x" value="20" />
 		<variable name="sort_asc_text_y" value="232" />
@@ -162,8 +161,7 @@
 		<variable name="sdswap_text_y" value="47" />
 		<variable name="sdfilesystem_text_y" value="92" />
 		<variable name="sdfilesystem_button_y" value="120" />
-		<variable name="lock_x" value="96" />
-		<variable name="lock_y" value="70" />
+		<variable name="lock_y" value="120" />
 		<variable name="filemanager_select_x" value="130" />
 		<variable name="filemanager_select_y" value="280" />
 		<variable name="terminal_console_height" value="126" />
@@ -207,27 +205,35 @@
 
 	<templates>
 		<template name="twrpheader">
+			<object type="fill" color="%button_fill_color%">
+				<placement x="0" y="0" w="320" h="26" />
+			</object>
+
+			<object type="fill" color="%highlight%">
+				<placement x="0" y="26" w="320" h="1" />
+			</object>
+
 			<object type="image">
-				<image resource="top_bar" />
-				<placement x="0" y="0" />
+				<image resource="twrplogo" />
+				<placement x="13" y="13" placement="4" />
 			</object>
 
 			<object type="text" color="%text_color%">
 				<font resource="font" />
-				<placement x="3" y="3" />
+				<placement x="25" y="3" />
 				<text>TWRP v%tw_version%</text>
 			</object>
 
 			<object type="text" color="%text_fail_color%">
 				<condition var1="tw_simulate_actions" var2="1" />
 				<font resource="font" />
-				<placement x="3" y="21" />
+				<placement x="25" y="21" />
 				<text>SIMULATION</text>
 			</object>
 
 			<object type="text" color="%text_color%">
 				<font resource="font" />
-				<placement x="110" y="3" />
+				<placement x="160" y="3" placement="5" />
 				<text>%tw_time%</text>
 			</object>
 
@@ -265,7 +271,7 @@
 			</object>
 
 			<object type="button">
-				<placement x="%back_button_x%" y="%back_button_y%" />
+				<placement x="%back_button_x%" y="%back_button_y%" placement="1" />
 				<font resource="font" color="%button_text_color%" />
 				<text></text>
 				<image resource="back_icon" />
@@ -371,7 +377,7 @@
 
 		<template name="footer">
 			<object type="console">
-				<slideout resource="slideout" x="130" y="288" />
+				<slideout resource="slideout" x="%center_x%" y="288" placement="5" />
 				<placement x="%console_x%" y="0" w="%console_width%" h="288" />
 				<color foreground="%console_foreground%" background="%console_background%" scroll="%console_scroll%" />
 				<font resource="fixed" />
diff --git a/gui/devices/320x480/res/fonts/Roboto-Condensed-14.dat b/gui/devices/320x480/res/fonts/Roboto-Condensed-14.dat
deleted file mode 100644
index f7b174c..0000000
--- a/gui/devices/320x480/res/fonts/Roboto-Condensed-14.dat
+++ /dev/null
Binary files differ
diff --git a/gui/devices/320x480/res/fonts/Roboto-Condensed-16.dat b/gui/devices/320x480/res/fonts/Roboto-Condensed-16.dat
deleted file mode 100644
index 19c1147..0000000
--- a/gui/devices/320x480/res/fonts/Roboto-Condensed-16.dat
+++ /dev/null
Binary files differ
diff --git a/gui/devices/320x480/res/images/android.png b/gui/devices/320x480/res/images/android.png
deleted file mode 100644
index 0ccd02c..0000000
--- a/gui/devices/320x480/res/images/android.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/320x480/res/images/back-icon.png b/gui/devices/320x480/res/images/back-icon.png
deleted file mode 100644
index 26778d9..0000000
--- a/gui/devices/320x480/res/images/back-icon.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/320x480/res/images/checkbox_checked.png b/gui/devices/320x480/res/images/checkbox_checked.png
deleted file mode 100644
index 620fee8..0000000
--- a/gui/devices/320x480/res/images/checkbox_checked.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/320x480/res/images/checkbox_empty.png b/gui/devices/320x480/res/images/checkbox_empty.png
deleted file mode 100644
index fa86e0d..0000000
--- a/gui/devices/320x480/res/images/checkbox_empty.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/320x480/res/images/cursor.png b/gui/devices/320x480/res/images/cursor.png
deleted file mode 100644
index 32c8ae1..0000000
--- a/gui/devices/320x480/res/images/cursor.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/320x480/res/images/curtain.jpg b/gui/devices/320x480/res/images/curtain.jpg
deleted file mode 100644
index 63c9619..0000000
--- a/gui/devices/320x480/res/images/curtain.jpg
+++ /dev/null
Binary files differ
diff --git a/gui/devices/320x480/res/images/file.png b/gui/devices/320x480/res/images/file.png
deleted file mode 100644
index 8556bc7..0000000
--- a/gui/devices/320x480/res/images/file.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/320x480/res/images/folder.png b/gui/devices/320x480/res/images/folder.png
deleted file mode 100644
index a3a5f69..0000000
--- a/gui/devices/320x480/res/images/folder.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/320x480/res/images/hdpi-medium-button.png b/gui/devices/320x480/res/images/hdpi-medium-button.png
deleted file mode 100644
index cb223b1..0000000
--- a/gui/devices/320x480/res/images/hdpi-medium-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/320x480/res/images/hdpi-menu-button.png b/gui/devices/320x480/res/images/hdpi-menu-button.png
deleted file mode 100644
index 1fa62cf..0000000
--- a/gui/devices/320x480/res/images/hdpi-menu-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/320x480/res/images/hdpi-minus-button.png b/gui/devices/320x480/res/images/hdpi-minus-button.png
deleted file mode 100644
index 025b379..0000000
--- a/gui/devices/320x480/res/images/hdpi-minus-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/320x480/res/images/hdpi-plus-button.png b/gui/devices/320x480/res/images/hdpi-plus-button.png
deleted file mode 100644
index f567e1d..0000000
--- a/gui/devices/320x480/res/images/hdpi-plus-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/320x480/res/images/hdpi-small-button.png b/gui/devices/320x480/res/images/hdpi-small-button.png
deleted file mode 100644
index 3694098..0000000
--- a/gui/devices/320x480/res/images/hdpi-small-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/320x480/res/images/hdpi-sort-button.png b/gui/devices/320x480/res/images/hdpi-sort-button.png
deleted file mode 100644
index 3662f23..0000000
--- a/gui/devices/320x480/res/images/hdpi-sort-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/320x480/res/images/home-icon.png b/gui/devices/320x480/res/images/home-icon.png
deleted file mode 100644
index 690bfaf..0000000
--- a/gui/devices/320x480/res/images/home-icon.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/320x480/res/images/indeterminate001.png b/gui/devices/320x480/res/images/indeterminate001.png
deleted file mode 100644
index e6fa1c5..0000000
--- a/gui/devices/320x480/res/images/indeterminate001.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/320x480/res/images/indeterminate002.png b/gui/devices/320x480/res/images/indeterminate002.png
deleted file mode 100644
index e1fceab..0000000
--- a/gui/devices/320x480/res/images/indeterminate002.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/320x480/res/images/indeterminate003.png b/gui/devices/320x480/res/images/indeterminate003.png
deleted file mode 100644
index 6702867..0000000
--- a/gui/devices/320x480/res/images/indeterminate003.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/320x480/res/images/indeterminate004.png b/gui/devices/320x480/res/images/indeterminate004.png
deleted file mode 100644
index ff65e09..0000000
--- a/gui/devices/320x480/res/images/indeterminate004.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/320x480/res/images/indeterminate005.png b/gui/devices/320x480/res/images/indeterminate005.png
deleted file mode 100644
index e61e2cc..0000000
--- a/gui/devices/320x480/res/images/indeterminate005.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/320x480/res/images/indeterminate006.png b/gui/devices/320x480/res/images/indeterminate006.png
deleted file mode 100644
index c9c21ba..0000000
--- a/gui/devices/320x480/res/images/indeterminate006.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/320x480/res/images/keyboard1.png b/gui/devices/320x480/res/images/keyboard1.png
deleted file mode 100644
index 914304c..0000000
--- a/gui/devices/320x480/res/images/keyboard1.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/320x480/res/images/keyboard2.png b/gui/devices/320x480/res/images/keyboard2.png
deleted file mode 100644
index 4761f3a..0000000
--- a/gui/devices/320x480/res/images/keyboard2.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/320x480/res/images/keyboard3.png b/gui/devices/320x480/res/images/keyboard3.png
deleted file mode 100644
index 23103dc..0000000
--- a/gui/devices/320x480/res/images/keyboard3.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/320x480/res/images/keyboard4.png b/gui/devices/320x480/res/images/keyboard4.png
deleted file mode 100644
index 58c7289..0000000
--- a/gui/devices/320x480/res/images/keyboard4.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/320x480/res/images/medium-button.png b/gui/devices/320x480/res/images/medium-button.png
deleted file mode 100644
index eee6cce..0000000
--- a/gui/devices/320x480/res/images/medium-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/320x480/res/images/menu-button.png b/gui/devices/320x480/res/images/menu-button.png
deleted file mode 100644
index 731453b..0000000
--- a/gui/devices/320x480/res/images/menu-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/320x480/res/images/minus-button.png b/gui/devices/320x480/res/images/minus-button.png
deleted file mode 100644
index 21cd774..0000000
--- a/gui/devices/320x480/res/images/minus-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/320x480/res/images/plus-button.png b/gui/devices/320x480/res/images/plus-button.png
deleted file mode 100644
index ce9ec4e..0000000
--- a/gui/devices/320x480/res/images/plus-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/320x480/res/images/progress_empty.png b/gui/devices/320x480/res/images/progress_empty.png
deleted file mode 100644
index b853710..0000000
--- a/gui/devices/320x480/res/images/progress_empty.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/320x480/res/images/progress_fill.png b/gui/devices/320x480/res/images/progress_fill.png
deleted file mode 100644
index 669c6ef..0000000
--- a/gui/devices/320x480/res/images/progress_fill.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/320x480/res/images/radio_empty.png b/gui/devices/320x480/res/images/radio_empty.png
deleted file mode 100644
index d993c4a..0000000
--- a/gui/devices/320x480/res/images/radio_empty.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/320x480/res/images/radio_selected.png b/gui/devices/320x480/res/images/radio_selected.png
deleted file mode 100644
index c89aac3..0000000
--- a/gui/devices/320x480/res/images/radio_selected.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/320x480/res/images/slideout.png b/gui/devices/320x480/res/images/slideout.png
deleted file mode 100644
index 8974fef..0000000
--- a/gui/devices/320x480/res/images/slideout.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/320x480/res/images/slider-touch.png b/gui/devices/320x480/res/images/slider-touch.png
deleted file mode 100644
index 77cb809..0000000
--- a/gui/devices/320x480/res/images/slider-touch.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/320x480/res/images/slider-used.png b/gui/devices/320x480/res/images/slider-used.png
deleted file mode 100644
index 85c2f43..0000000
--- a/gui/devices/320x480/res/images/slider-used.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/320x480/res/images/slider.png b/gui/devices/320x480/res/images/slider.png
deleted file mode 100644
index 2d09187..0000000
--- a/gui/devices/320x480/res/images/slider.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/320x480/res/images/sort-button.png b/gui/devices/320x480/res/images/sort-button.png
deleted file mode 100644
index 579c75f..0000000
--- a/gui/devices/320x480/res/images/sort-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/320x480/res/images/top-bar.jpg b/gui/devices/320x480/res/images/top-bar.jpg
deleted file mode 100644
index 84f7f1e..0000000
--- a/gui/devices/320x480/res/images/top-bar.jpg
+++ /dev/null
Binary files differ
diff --git a/gui/devices/320x480/res/images/top-bar.png b/gui/devices/320x480/res/images/top-bar.png
deleted file mode 100644
index 887f629..0000000
--- a/gui/devices/320x480/res/images/top-bar.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/320x480/res/images/unlock.png b/gui/devices/320x480/res/images/unlock.png
deleted file mode 100644
index 09e9efd..0000000
--- a/gui/devices/320x480/res/images/unlock.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/320x480/res/ui.xml b/gui/devices/320x480/res/ui.xml
deleted file mode 100644
index 865ab50..0000000
--- a/gui/devices/320x480/res/ui.xml
+++ /dev/null
@@ -1,414 +0,0 @@
-<?xml version="1.0"?>
-
-<recovery>
-	<details>
-		<resolution width="320" height="480" />
-		<author>TeamWin</author>
-		<title>Backup Naowz</title>
-		<description>Default basic theme</description>
-		<preview>preview.jpg</preview>
-	</details>
-
-	<include>
-		<xmlfile name="portrait.xml" />
-	</include>
-
-	<resources>
-		<resource name="font" type="font" filename="RobotoCondensed-Regular.ttf" size="14" fallback="Roboto-Condensed-16" />
-		<resource name="mediumfont" type="font" filename="RobotoCondensed-Regular.ttf" size="14" fallback="Roboto-Condensed-14" />
-		<resource name="filelist" type="font" filename="RobotoCondensed-Regular.ttf" size="14" fallback="Roboto-Condensed-14" />
-		<resource name="top_bar" type="image" filename="top-bar.jpg" />
-		<resource name="main_button" type="image" filename="menu-button" />
-		<resource name="file_icon" type="image" filename="file" />
-		<resource name="folder_icon" type="image" filename="folder" />
-		<resource name="slideout" type="image" filename="slideout" />
-		<resource name="progress" type="animation" filename="indeterminate" />
-		<resource name="progress_empty" type="image" filename="progress_empty" />
-		<resource name="progress_full" type="image" filename="progress_fill" />
-		<resource name="checkbox_false" type="image" filename="checkbox_empty" retainaspect="1" />
-		<resource name="checkbox_true" type="image" filename="checkbox_checked" retainaspect="1" />
-		<resource name="radio_false" type="image" filename="radio_empty" retainaspect="1" />
-		<resource name="radio_true" type="image" filename="radio_selected" retainaspect="1" />
-		<resource name="medium_button" type="image" filename="medium-button" />
-		<resource name="sort_button" type="image" filename="sort-button" />
-		<resource name="minus_button" type="image" filename="minus-button" />
-		<resource name="plus_button" type="image" filename="plus-button" />
-		<resource name="home_icon" type="image" filename="home-icon" />
-		<resource name="back_icon" type="image" filename="back-icon" />
-		<resource name="slider" type="image" filename="slider" />
-		<resource name="slider-used" type="image" filename="slider-used" />
-		<resource name="slider-touch" type="image" filename="slider-touch" />
-		<resource name="unlock-icon" type="image" filename="unlock" />
-		<resource name="keyboard1" type="image" filename="keyboard1" />
-		<resource name="keyboard2" type="image" filename="keyboard2" />
-		<resource name="keyboard3" type="image" filename="keyboard3" />
-		<resource name="keyboard4" type="image" filename="keyboard4" />
-		<resource name="cursor" type="image" filename="cursor" retainaspect="1" />
-	</resources>
-
-	<variables>
-		<variable name="col1_x" value="8" />
-		<variable name="col2_x" value="162" />
-		<variable name="col_center_x" value="85" />
-		<variable name="col_center_medium_x" value="122" />
-		<variable name="center_x" value="160" />
-		<variable name="row1_y" value="84" />
-		<variable name="row2_y" value="174" />
-		<variable name="row3_y" value="270" />
-		<variable name="row4_y" value="366" />
-		<variable name="row_queue_y" value="306" />
-		<variable name="row1_header_y" value="64" />
-		<variable name="row1_text_y" value="85" />
-		<variable name="row2_text_y" value="104" />
-		<variable name="row3_text_y" value="123" />
-		<variable name="row4_text_y" value="142" />
-		<variable name="row5_text_y" value="161" />
-		<variable name="row6_text_y" value="180" />
-		<variable name="row7_text_y" value="199" />
-		<variable name="row8_text_y" value="218" />
-		<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="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="flash_list_height" value="150" />
-		<variable name="tz_selected_y" value="66" />
-		<variable name="tz_set_y" value="348" />
-		<variable name="tz_current_y" value="438" />
-		<variable name="col_progressbar_x" value="32" />
-		<variable name="row_progressbar_y" value="432" />
-		<variable name="col1_medium_x" value="7" />
-		<variable name="col2_medium_x" value="83" />
-		<variable name="col3_medium_x" value="160" />
-		<variable name="col4_medium_x" value="237" />
-		<variable name="row1_medium_y" value="78" />
-		<variable name="row2_medium_y" value="123" />
-		<variable name="row3_medium_y" value="168" />
-		<variable name="row4_medium_y" value="213" />
-		<variable name="row5_medium_y" value="258" />
-		<variable name="row6_medium_y" value="303" />
-		<variable name="row7_medium_y" value="348" />
-		<variable name="slider_x" value="55" />
-		<variable name="slider_y" value="410" />
-		<variable name="slider_text_y" value="425" />
-		<variable name="button_text_color" value="#AAAAAA" />
-		<variable name="text_color" value="#FFFFFF" />
-		<variable name="text_success_color" value="#33B5E5" />
-		<variable name="text_fail_color" value="#FF0101" />
-		<variable name="highlight_color" value="#90909080" />
-		<variable name="caps_highlight_color" value="#33B5E580" />
-		<variable name="home_button_x" value="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" />
-		<variable name="sort_desc_button_y" value="435" />
-		<variable name="sort_col1_button_x" value="120" />
-		<variable name="sort_col2_button_x" value="160" />
-		<variable name="sort_col3_button_x" value="200" />
-		<variable name="input_width" value="307" />
-		<variable name="input_height" value="24" />
-		<variable name="input_background_color" value="#303030" />
-		<variable name="input_cursor_color" value="#33B5E5" />
-		<variable name="input_cursor_width" value="2" />
-		<variable name="console_x" value="0" />
-		<variable name="console_width" value="320" />
-		<variable name="console_foreground" value="#A0A0A0" />
-		<variable name="warning" value="#F8F8A0" />
-		<variable name="error" value="#FF4040" />
-		<variable name="highlight" value="#33B5E5" />
-		<variable name="console_background" value="#303030" />
-		<variable name="console_scroll" value="#303030" />
-		<variable name="console_action_height" value="192" />
-		<variable name="console_install_height" value="264" />
-		<variable name="console_installdone_height" value="180" />
-		<variable name="fileselector_x" value="3" />
-		<variable name="fileselector_width" value="313" />
-		<variable name="fileselector_install_height" value="284" />
-		<variable name="fileselector_header_background" value="#202020" />
-		<variable name="fileselector_header_textcolor" value="#AAAAAA" />
-		<variable name="fileselector_header_separatorcolor" value="#33B5E5" />
-		<variable name="fileselector_header_separatorheight" value="2" />
-		<variable name="fileselector_separatorcolor" value="#505050" />
-		<variable name="fileselector_separatorheight" value="1" />
-		<variable name="fileselector_background" value="#303030" />
-		<variable name="fileselector_highlight_color" value="#505050" />
-		<variable name="fileselector_highlight_font_color" value="#33B5E5" />
-		<variable name="fileselector_spacing" value="12" />
-		<variable name="fastscroll_linecolor" value="#50505080" />
-		<variable name="fastscroll_rectcolor" value="#33B5E580" />
-		<variable name="fastscroll_w" value="27" />
-		<variable name="fastscroll_linew" value="1" />
-		<variable name="fastscroll_rectw" value="7" />
-		<variable name="fastscroll_recth" value="24" />
-		<variable name="listbox_x" value="3" />
-		<variable name="listbox_width" value="313" />
-		<variable name="listbox_tz_height" value="189" />
-		<variable name="listbox_background" value="#303030" />
-		<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="83" />
-		<variable name="sdswap_button_y" value="111" />
-		<variable name="sdswap_text_x" value="56" />
-		<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="terminal_console_height" value="220" />
-		<variable name="terminal_text_y" value="225" />
-		<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" />
-		<variable name="button_fill_color" value="#303030" />
-		<variable name="button_fill_full_width" value="304" />
-		<variable name="button_fill_main_width" value="150" />
-		<variable name="button_fill_main_height" value="81" />
-		<variable name="button_fill_half_height" value="40" />
-		<variable name="button_fill_quarter_height" value="24" />
-		<variable name="backup_list_height" value="193" />
-		<variable name="backup_button_row1" value="300" />
-		<variable name="backup_button_row2" value="326" />
-		<variable name="mount_list_height" value="270" />
-		<variable name="mount_storage_row" value="340" />
-		<variable name="storage_list_height" value="290" />
-		<variable name="wipe_list_height" value="270" />
-		<variable name="wipe_button_row1" value="350" />
-		<variable name="wipe_button_y" value="270" />
-		<variable name="slidervalue_w" value="304" />
-		<variable name="slidervalue_line_clr" value="#FFFFFF" />
-		<variable name="slidervalue_slider_clr" value="#33B5E5" />
-		<variable name="slidervalue_lineh" value="1" />
-		<variable name="slidervalue_padding" value="8" />
-		<variable name="slidervalue_sliderw" value="4" />
-		<variable name="slidervalue_sliderh" value="20" />
-	</variables>
-
-	<mousecursor>
-		<placement w="15" h="15" />
-		<background color="#FFFF00FF" resource="cursor" />
-		<speed multiplier="1" />
-	</mousecursor>
-
-	<templates>
-		<template name="header">
-			<background color="#000000FF" />
-
-			<object type="image">
-				<image resource="top_bar" />
-				<placement x="0" y="0" />
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="65" y="3" />
-				<text>TeamWin Recovery v%tw_version%</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<condition var1="tw_simulate_actions" var2="1" />
-				<font resource="font" />
-				<placement x="65" y="21" />
-				<text>SIMULATING ACTIONS</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="65" y="39" />
-				<text>%tw_time%</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="135" y="39" />
-				<conditions>
-					<condition var1="tw_no_battery_percent" var2="0" />
-					<condition var1="tw_battery" op="&gt;" var2="0" />
-					<condition var1="tw_battery" op="&lt;" var2="101" />
-				</conditions>
-				<text>Battery: %tw_battery%</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="265" y="39" />
-				<conditions>
-					<condition var1="tw_no_cpu_temp" var2="0" />
-				</conditions>
-				<text>%tw_cpu_temp% C</text>
-			</object>
-
-			<object type="button">
-				<placement x="%home_button_x%" y="%home_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text></text>
-				<image resource="home_icon" />
-				<condition var1="tw_busy" var2="0" />
-				<action function="key">home</action>
-			</object>
-
-			<object type="button">
-				<placement x="%back_button_x%" y="%back_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text></text>
-				<image resource="back_icon" />
-				<condition var1="tw_busy" var2="0" />
-				<action function="key">back</action>
-			</object>
-
-			<object type="action">
-				<touch key="power" />
-				<action function="overlay">lock</action>
-			</object>
-
-			<object type="action">
-				<touch key="power+voldown" />
-				<action function="screenshot" />
-			</object>
-		</template>
-
-		<template name="progress_bar">
-			<object type="progressbar">
-				<placement x="%col_progressbar_x%" y="%row_progressbar_y%" />
-				<resource empty="progress_empty" full="progress_full" />
-				<data name="ui_progress" />
-			</object>
-
-			<object type="animation">
-				<placement x="%col_progressbar_x%" y="%row_progressbar_y%" />
-				<resource name="progress" />
-				<speed fps="15" render="2" />
-				<loop frame="1" />
-			</object>
-		</template>
-
-		<template name="action_page_console">
-			<object type="console">
-				<placement x="%console_x%" y="%row2_y%" w="%console_width%" h="%console_action_height%" />
-				<color foreground="%console_foreground%" background="%console_background%" scroll="%console_scroll%" />
-				<font resource="fixed" />
-			</object>
-		</template>
-
-		<template name="sort_options">
-			<object type="text" color="%text_color%">
-				<font resource="mediumfont" />
-				<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="mediumfont" color="%button_text_color%" />
-				<text>Name</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=1</action>
-			</object>
-
-			<object type="button">
-				<placement x="%sort_col2_button_x%" y="%sort_asc_button_y%" />
-				<font resource="mediumfont" color="%button_text_color%" />
-				<text>Date</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=2</action>
-			</object>
-
-			<object type="button">
-				<placement x="%sort_col3_button_x%" y="%sort_asc_button_y%" />
-				<font resource="mediumfont" color="%button_text_color%" />
-				<text>Size</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=3</action>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="mediumfont" />
-				<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="mediumfont" color="%button_text_color%" />
-				<text>Name</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=-1</action>
-			</object>
-
-			<object type="button">
-				<placement x="%sort_col2_button_x%" y="%sort_desc_button_y%" />
-				<font resource="mediumfont" color="%button_text_color%" />
-				<text>Date</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=-2</action>
-			</object>
-
-			<object type="button">
-				<placement x="%sort_col3_button_x%" y="%sort_desc_button_y%" />
-				<font resource="mediumfont" color="%button_text_color%" />
-				<text>Size</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=-3</action>
-			</object>
-		</template>
-
-		<template name="footer">
-			<object type="console">
-				<slideout resource="slideout" x="140" y="456" />
-				<placement x="%console_x%" y="0" w="%console_width%" h="456" />
-				<color foreground="%console_foreground%" background="%console_background%" scroll="%console_scroll%" />
-				<font resource="fixed" />
-			</object>
-		</template>
-
-		<template name="keyboardtemplate">
-			<object type="keyboard">
-				<placement x="0" y="253" />
-				<layout resource1="keyboard1" resource2="keyboard2" resource3="keyboard3" resource4="keyboard4" />
-				<highlight color="%highlight_color%" />
-				<capshighlight color="%caps_highlight_color%" />
-				<layout1>
-					<keysize height="52" width="32" />
-					<row1 key01="q" long01="1" key02="w" long02="2" key03="e" long03="3" key04="r" long04="4" key05="t" long05="5" key06="y" long06="6" key07="u" long07="7" key08="i" long08="8" key09="o" long09="9" key10="p" long10="0" />
-					<row2 key01="48:a" key02="s" key03="d" key04="f" key05="g" key06="h" key07="j" key08="k" key09="48:l" />
-					<row3 key01="48:layout2" key02="z" key03="x" key04="c" key05="v" key06="b" key07="n" key08="m" key09="48:c:8" />
-					<row4 key01="48:layout3" key02="32:" key03="160: " key04="32:." key05="48:a:action" />
-				</layout1>
-				<layout2>
-					<keysize height="52" width="32" capslock="0" revert_layout="1" />
-					<row1 key01="Q" long01="1" key02="W" long02="2" key03="E" long03="3" key04="R" long04="4" key05="T" long05="5" key06="Y" long06="6" key07="U" long07="7" key08="I" long08="8" key09="O" long09="9" key10="P" long10="0" />
-					<row2 key01="48:A" key02="S" key03="D" key04="F" key05="G" key06="H" key07="J" key08="K" key09="48:L" />
-					<row3 key01="48:layout1" key02="Z" key03="X" key04="C" key05="V" key06="B" key07="N" key08="M" key09="48:c:8" />
-					<row4 key01="48:layout3" key02="32:" key03="160: " key04="32:." key05="48:action" />
-				</layout2>
-				<layout3>
-					<keysize height="52" width="32" />
-					<row1 key01="1" key02="2" key03="3" key04="4" key05="5" key06="6" key07="7" key08="8" key09="9" key10="0" />
-					<row2 key01="@" key02="#" key03="$" key04="%" key05="&amp;" key06="*" key07="-" key08="+" key09="(" key10=")" />
-					<row3 key01="48:layout4" key02="!" key03="32:c:34" key04="'" key05=":" key06=";" key07="/" key08="?" key09="48:c:8" />
-					<row4 key01="48:layout1" key02="32:," key03="160: " key04="32:." key05="48:action" />
-				</layout3>
-				<layout4>
-					<keysize height="52" width="32" />
-					<row1 key01="~" key02="`" key03="|" key04="32:" key05="32:" key06="32:" key07="%" key08="32:" key09="{" key10="}" />
-					<row2 key01="32:" key02="32:" key03="32:" key04="32:" key05="32:" key06="^" key07="_" key08="=" key09="[" key10="]" />
-					<row3 key01="48:layout3" key02="32:" key03="32:" key04="32:" key05="32:" key06="\" key07="&lt;" key08="&gt;" key09="48:c:8" />
-					<row4 key01="48:layout1" key02="32:c:34" key03="160: " key04="32:." key05="48:action" />
-				</layout4>
-			</object>
-		</template>
-	</templates>
-</recovery>
diff --git a/gui/devices/480x800/res/images/top-bar.jpg b/gui/devices/480x800/res/images/top-bar.jpg
deleted file mode 100644
index 3e0e5b5..0000000
--- a/gui/devices/480x800/res/images/top-bar.jpg
+++ /dev/null
Binary files differ
diff --git a/gui/devices/480x800/res/images/twrplogo.png b/gui/devices/480x800/res/images/twrplogo.png
new file mode 100644
index 0000000..4b39da8
--- /dev/null
+++ b/gui/devices/480x800/res/images/twrplogo.png
Binary files differ
diff --git a/gui/devices/480x800/res/ui.xml b/gui/devices/480x800/res/ui.xml
index 53441fd..3a9cd86 100644
--- a/gui/devices/480x800/res/ui.xml
+++ b/gui/devices/480x800/res/ui.xml
@@ -17,11 +17,11 @@
 		<resource name="font" type="font" filename="RobotoCondensed-Regular.ttf" size="20" fallback="Roboto-Regular-20" />
 		<resource name="mediumfont" type="font" filename="RobotoCondensed-Regular.ttf" size="20" fallback="Roboto-Regular-20" />
 		<resource name="filelist" type="font" filename="RobotoCondensed-Regular.ttf" size="20" fallback="Roboto-Regular-20" />
-		<resource name="top_bar" type="image" filename="top-bar.jpg" />
+		<resource name="twrplogo" type="image" filename="twrplogo" retainaspect="1" />
 		<resource name="main_button" type="image" filename="menu-button" />
-		<resource name="file_icon" type="image" filename="file" />
-		<resource name="folder_icon" type="image" filename="folder" />
-		<resource name="slideout" type="image" filename="slideout" />
+		<resource name="file_icon" type="image" filename="file" retainaspect="1" />
+		<resource name="folder_icon" type="image" filename="folder" retainaspect="1" />
+		<resource name="slideout" type="image" filename="slideout" retainaspect="1" />
 		<resource name="progress" type="animation" filename="indeterminate" />
 		<resource name="progress_empty" type="image" filename="progress_empty" />
 		<resource name="progress_full" type="image" filename="progress_fill" />
@@ -33,12 +33,12 @@
 		<resource name="sort_button" type="image" filename="sort-button" />
 		<resource name="minus_button" type="image" filename="minus-button" />
 		<resource name="plus_button" type="image" filename="plus-button" />
-		<resource name="home_icon" type="image" filename="home-icon" />
-		<resource name="back_icon" type="image" filename="back-icon" />
-		<resource name="slider" type="image" filename="slider" />
-		<resource name="slider-used" type="image" filename="slider-used" />
-		<resource name="slider-touch" type="image" filename="slider-touch" />
-		<resource name="unlock-icon" type="image" filename="unlock" />
+		<resource name="home_icon" type="image" filename="home-icon" retainaspect="1" />
+		<resource name="back_icon" type="image" filename="back-icon" retainaspect="1" />
+		<resource name="slider" type="image" filename="slider" retainaspect="1" />
+		<resource name="slider-used" type="image" filename="slider-used" retainaspect="1" />
+		<resource name="slider-touch" type="image" filename="slider-touch" retainaspect="1" />
+		<resource name="unlock-icon" type="image" filename="unlock" retainaspect="1" />
 		<resource name="keyboard1" type="image" filename="keyboard1" />
 		<resource name="keyboard2" type="image" filename="keyboard2" />
 		<resource name="keyboard3" type="image" filename="keyboard3" />
@@ -94,7 +94,6 @@
 		<variable name="row5_medium_y" value="430" />
 		<variable name="row6_medium_y" value="505" />
 		<variable name="row7_medium_y" value="580" />
-		<variable name="slider_x" value="58" />
 		<variable name="slider_y" value="680" />
 		<variable name="slider_text_y" value="721" />
 		<variable name="button_text_color" value="#AAAAAA" />
@@ -105,7 +104,7 @@
 		<variable name="caps_highlight_color" value="#33B5E580" />
 		<variable name="home_button_x" value="10" />
 		<variable name="home_button_y" value="766" />
-		<variable name="back_button_x" value="413" />
+		<variable name="back_button_x" value="470" />
 		<variable name="back_button_y" value="766" />
 		<variable name="sort_asc_text_y" value="685" />
 		<variable name="sort_asc_button_y" value="685" />
@@ -162,8 +161,7 @@
 		<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" />
-		<variable name="lock_y" value="200" />
+		<variable name="lock_y" value="250" />
 		<variable name="filemanager_select_x" value="365" />
 		<variable name="filemanager_select_y" value="690" />
 		<variable name="backup_name_y" value="350" />
@@ -207,9 +205,17 @@
 		<template name="header">
 			<background color="%backgroundcolor%" />
 
+			<object type="fill" color="%button_fill_color%">
+				<placement x="0" y="0" w="480" h="98" />
+			</object>
+
+			<object type="fill" color="%highlight%">
+				<placement x="0" y="98" w="480" h="2" />
+			</object>
+
 			<object type="image">
-				<image resource="top_bar" />
-				<placement x="0" y="0" />
+				<image resource="twrplogo" />
+				<placement x="50" y="50" placement="4" />
 			</object>
 
 			<object type="text" color="%text_color%">
@@ -261,7 +267,7 @@
 			</object>
 
 			<object type="button">
-				<placement x="%back_button_x%" y="%back_button_y%" />
+				<placement x="%back_button_x%" y="%back_button_y%" placement="1" />
 				<font resource="font" color="%button_text_color%" />
 				<text></text>
 				<image resource="back_icon" />
@@ -367,7 +373,7 @@
 
 		<template name="footer">
 			<object type="console">
-				<slideout resource="slideout" x="210" y="760" />
+				<slideout resource="slideout" x="%center_x%" y="760" placement="5" />
 				<placement x="%console_x%" y="0" w="%console_width%" h="760" />
 				<color foreground="%console_foreground%" background="%console_background%" scroll="%console_scroll%" />
 				<font resource="fixed" />
diff --git a/gui/devices/480x854/res/fonts/Roboto-Regular-20.dat b/gui/devices/480x854/res/fonts/Roboto-Regular-20.dat
deleted file mode 100644
index 6588b41..0000000
--- a/gui/devices/480x854/res/fonts/Roboto-Regular-20.dat
+++ /dev/null
Binary files differ
diff --git a/gui/devices/480x854/res/fonts/Roboto-Regular-40.dat b/gui/devices/480x854/res/fonts/Roboto-Regular-40.dat
deleted file mode 100644
index 637d9fe..0000000
--- a/gui/devices/480x854/res/fonts/Roboto-Regular-40.dat
+++ /dev/null
Binary files differ
diff --git a/gui/devices/480x854/res/images/back-icon.png b/gui/devices/480x854/res/images/back-icon.png
deleted file mode 100644
index 688436e..0000000
--- a/gui/devices/480x854/res/images/back-icon.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/480x854/res/images/checkbox_checked.png b/gui/devices/480x854/res/images/checkbox_checked.png
deleted file mode 100644
index 3447349..0000000
--- a/gui/devices/480x854/res/images/checkbox_checked.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/480x854/res/images/checkbox_empty.png b/gui/devices/480x854/res/images/checkbox_empty.png
deleted file mode 100644
index f5f35d8..0000000
--- a/gui/devices/480x854/res/images/checkbox_empty.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/480x854/res/images/cursor.png b/gui/devices/480x854/res/images/cursor.png
deleted file mode 100644
index 32c8ae1..0000000
--- a/gui/devices/480x854/res/images/cursor.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/480x854/res/images/curtain.jpg b/gui/devices/480x854/res/images/curtain.jpg
deleted file mode 100644
index 6e60648..0000000
--- a/gui/devices/480x854/res/images/curtain.jpg
+++ /dev/null
Binary files differ
diff --git a/gui/devices/480x854/res/images/file.png b/gui/devices/480x854/res/images/file.png
deleted file mode 100644
index 8556bc7..0000000
--- a/gui/devices/480x854/res/images/file.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/480x854/res/images/folder.png b/gui/devices/480x854/res/images/folder.png
deleted file mode 100644
index a3a5f69..0000000
--- a/gui/devices/480x854/res/images/folder.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/480x854/res/images/home-icon.png b/gui/devices/480x854/res/images/home-icon.png
deleted file mode 100644
index 5519520..0000000
--- a/gui/devices/480x854/res/images/home-icon.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/480x854/res/images/indeterminate001.png b/gui/devices/480x854/res/images/indeterminate001.png
deleted file mode 100644
index e6fa1c5..0000000
--- a/gui/devices/480x854/res/images/indeterminate001.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/480x854/res/images/indeterminate002.png b/gui/devices/480x854/res/images/indeterminate002.png
deleted file mode 100644
index e1fceab..0000000
--- a/gui/devices/480x854/res/images/indeterminate002.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/480x854/res/images/indeterminate003.png b/gui/devices/480x854/res/images/indeterminate003.png
deleted file mode 100644
index 6702867..0000000
--- a/gui/devices/480x854/res/images/indeterminate003.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/480x854/res/images/indeterminate004.png b/gui/devices/480x854/res/images/indeterminate004.png
deleted file mode 100644
index ff65e09..0000000
--- a/gui/devices/480x854/res/images/indeterminate004.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/480x854/res/images/indeterminate005.png b/gui/devices/480x854/res/images/indeterminate005.png
deleted file mode 100644
index e61e2cc..0000000
--- a/gui/devices/480x854/res/images/indeterminate005.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/480x854/res/images/indeterminate006.png b/gui/devices/480x854/res/images/indeterminate006.png
deleted file mode 100644
index c9c21ba..0000000
--- a/gui/devices/480x854/res/images/indeterminate006.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/480x854/res/images/keyboard1.png b/gui/devices/480x854/res/images/keyboard1.png
deleted file mode 100644
index 5a691ac..0000000
--- a/gui/devices/480x854/res/images/keyboard1.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/480x854/res/images/keyboard2.png b/gui/devices/480x854/res/images/keyboard2.png
deleted file mode 100644
index 69b0154..0000000
--- a/gui/devices/480x854/res/images/keyboard2.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/480x854/res/images/keyboard3.png b/gui/devices/480x854/res/images/keyboard3.png
deleted file mode 100644
index 498cef8..0000000
--- a/gui/devices/480x854/res/images/keyboard3.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/480x854/res/images/keyboard4.png b/gui/devices/480x854/res/images/keyboard4.png
deleted file mode 100644
index e8f9dde..0000000
--- a/gui/devices/480x854/res/images/keyboard4.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/480x854/res/images/medium-button.png b/gui/devices/480x854/res/images/medium-button.png
deleted file mode 100644
index 1d5b816..0000000
--- a/gui/devices/480x854/res/images/medium-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/480x854/res/images/menu-button.png b/gui/devices/480x854/res/images/menu-button.png
deleted file mode 100644
index c8d3794..0000000
--- a/gui/devices/480x854/res/images/menu-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/480x854/res/images/minus-button.png b/gui/devices/480x854/res/images/minus-button.png
deleted file mode 100644
index 9c92d2f..0000000
--- a/gui/devices/480x854/res/images/minus-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/480x854/res/images/plus-button.png b/gui/devices/480x854/res/images/plus-button.png
deleted file mode 100644
index 5d3068e..0000000
--- a/gui/devices/480x854/res/images/plus-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/480x854/res/images/progress_empty.png b/gui/devices/480x854/res/images/progress_empty.png
deleted file mode 100644
index b853710..0000000
--- a/gui/devices/480x854/res/images/progress_empty.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/480x854/res/images/progress_fill.png b/gui/devices/480x854/res/images/progress_fill.png
deleted file mode 100644
index 669c6ef..0000000
--- a/gui/devices/480x854/res/images/progress_fill.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/480x854/res/images/radio_empty.png b/gui/devices/480x854/res/images/radio_empty.png
deleted file mode 100644
index 88d1c1f..0000000
--- a/gui/devices/480x854/res/images/radio_empty.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/480x854/res/images/radio_selected.png b/gui/devices/480x854/res/images/radio_selected.png
deleted file mode 100644
index 864065d..0000000
--- a/gui/devices/480x854/res/images/radio_selected.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/480x854/res/images/slideout.png b/gui/devices/480x854/res/images/slideout.png
deleted file mode 100644
index 963b9fd..0000000
--- a/gui/devices/480x854/res/images/slideout.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/480x854/res/images/slider-touch.png b/gui/devices/480x854/res/images/slider-touch.png
deleted file mode 100644
index c8c0f43..0000000
--- a/gui/devices/480x854/res/images/slider-touch.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/480x854/res/images/slider-used.png b/gui/devices/480x854/res/images/slider-used.png
deleted file mode 100644
index 2f3d519..0000000
--- a/gui/devices/480x854/res/images/slider-used.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/480x854/res/images/slider.png b/gui/devices/480x854/res/images/slider.png
deleted file mode 100644
index 6fcce6f..0000000
--- a/gui/devices/480x854/res/images/slider.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/480x854/res/images/sort-button.png b/gui/devices/480x854/res/images/sort-button.png
deleted file mode 100644
index 69d511b..0000000
--- a/gui/devices/480x854/res/images/sort-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/480x854/res/images/top-bar.jpg b/gui/devices/480x854/res/images/top-bar.jpg
deleted file mode 100644
index 3e0e5b5..0000000
--- a/gui/devices/480x854/res/images/top-bar.jpg
+++ /dev/null
Binary files differ
diff --git a/gui/devices/480x854/res/images/unlock.png b/gui/devices/480x854/res/images/unlock.png
deleted file mode 100644
index 9041221..0000000
--- a/gui/devices/480x854/res/images/unlock.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/480x854/res/ui.xml b/gui/devices/480x854/res/ui.xml
deleted file mode 100644
index 461bce2..0000000
--- a/gui/devices/480x854/res/ui.xml
+++ /dev/null
@@ -1,414 +0,0 @@
-<?xml version="1.0"?>
-
-<recovery>
-	<details>
-		<resolution width="480" height="854" />
-		<author>TeamWin</author>
-		<title>Backup Naowz</title>
-		<description>Default basic theme</description>
-		<preview>preview.jpg</preview>
-	</details>
-
-	<include>
-		<xmlfile name="portrait.xml" />
-	</include>
-
-	<resources>
-		<resource name="font" type="font" filename="RobotoCondensed-Regular.ttf" size="20" fallback="Roboto-Regular-20" />
-		<resource name="mediumfont" type="font" filename="RobotoCondensed-Regular.ttf" size="20" fallback="Roboto-Regular-20" />
-		<resource name="filelist" type="font" filename="RobotoCondensed-Regular.ttf" size="20" fallback="Roboto-Regular-20" />
-		<resource name="top_bar" type="image" filename="top-bar.jpg" />
-		<resource name="main_button" type="image" filename="menu-button" />
-		<resource name="file_icon" type="image" filename="file" />
-		<resource name="folder_icon" type="image" filename="folder" />
-		<resource name="slideout" type="image" filename="slideout" />
-		<resource name="progress" type="animation" filename="indeterminate" />
-		<resource name="progress_empty" type="image" filename="progress_empty" />
-		<resource name="progress_full" type="image" filename="progress_fill" />
-		<resource name="checkbox_false" type="image" filename="checkbox_empty" retainaspect="1" />
-		<resource name="checkbox_true" type="image" filename="checkbox_checked" retainaspect="1" />
-		<resource name="radio_false" type="image" filename="radio_empty" retainaspect="1" />
-		<resource name="radio_true" type="image" filename="radio_selected" retainaspect="1" />
-		<resource name="medium_button" type="image" filename="medium-button" />
-		<resource name="sort_button" type="image" filename="sort-button" />
-		<resource name="minus_button" type="image" filename="minus-button" />
-		<resource name="plus_button" type="image" filename="plus-button" />
-		<resource name="home_icon" type="image" filename="home-icon" />
-		<resource name="back_icon" type="image" filename="back-icon" />
-		<resource name="slider" type="image" filename="slider" />
-		<resource name="slider-used" type="image" filename="slider-used" />
-		<resource name="slider-touch" type="image" filename="slider-touch" />
-		<resource name="unlock-icon" type="image" filename="unlock" />
-		<resource name="keyboard1" type="image" filename="keyboard1" />
-		<resource name="keyboard2" type="image" filename="keyboard2" />
-		<resource name="keyboard3" type="image" filename="keyboard3" />
-		<resource name="keyboard4" type="image" filename="keyboard4" />
-		<resource name="cursor" type="image" filename="cursor" retainaspect="1" />
-	</resources>
-
-	<variables>
-		<variable name="col1_x" value="10" />
-		<variable name="col2_x" value="240" />
-		<variable name="col_center_x" value="128" />
-		<variable name="col_center_medium_x" value="183" />
-		<variable name="center_x" value="240" />
-		<variable name="row1_y" value="140" />
-		<variable name="row2_y" value="290" />
-		<variable name="row3_y" value="450" />
-		<variable name="row4_y" value="610" />
-		<variable name="row_queue_y" value="510" />
-		<variable name="row1_header_y" value="110" />
-		<variable name="row1_text_y" value="140" />
-		<variable name="row2_text_y" value="170" />
-		<variable name="row3_text_y" value="200" />
-		<variable name="row4_text_y" value="230" />
-		<variable name="row5_text_y" value="260" />
-		<variable name="row6_text_y" value="290" />
-		<variable name="row7_text_y" value="320" />
-		<variable name="row8_text_y" value="350" />
-		<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="zip_status_y" value="585" />
-		<variable name="flash_list_height" value="210" />
-		<variable name="tz_selected_y" value="110" />
-		<variable name="tz_set_y" value="580" />
-		<variable name="tz_current_y" value="730" />
-		<variable name="col_progressbar_x" value="114" />
-		<variable name="row_progressbar_y" value="720" />
-		<variable name="col1_medium_x" value="10" />
-		<variable name="col2_medium_x" value="125" />
-		<variable name="col3_medium_x" value="240" />
-		<variable name="col4_medium_x" value="355" />
-		<variable name="row1_medium_y" value="130" />
-		<variable name="row2_medium_y" value="205" />
-		<variable name="row3_medium_y" value="280" />
-		<variable name="row4_medium_y" value="355" />
-		<variable name="row5_medium_y" value="430" />
-		<variable name="row6_medium_y" value="505" />
-		<variable name="row7_medium_y" value="580" />
-		<variable name="slider_x" value="58" />
-		<variable name="slider_y" value="680" />
-		<variable name="slider_text_y" value="721" />
-		<variable name="button_text_color" value="#AAAAAA" />
-		<variable name="text_color" value="#FFFFFF" />
-		<variable name="text_success_color" value="#33B5E5" />
-		<variable name="text_fail_color" value="#FF0101" />
-		<variable name="highlight_color" value="#90909080" />
-		<variable name="caps_highlight_color" value="#33B5E580" />
-		<variable name="home_button_x" value="10" />
-		<variable name="home_button_y" value="820" />
-		<variable name="back_button_x" value="413" />
-		<variable name="back_button_y" value="820" />
-		<variable name="sort_asc_text_y" value="739" />
-		<variable name="sort_asc_button_y" value="739" />
-		<variable name="sort_desc_text_y" value="779" />
-		<variable name="sort_desc_button_y" value="779" />
-		<variable name="sort_col1_button_x" value="180" />
-		<variable name="sort_col2_button_x" value="240" />
-		<variable name="sort_col3_button_x" value="300" />
-		<variable name="input_width" value="460" />
-		<variable name="input_height" value="40" />
-		<variable name="input_background_color" value="#303030" />
-		<variable name="input_cursor_color" value="#33B5E5" />
-		<variable name="input_cursor_width" value="3" />
-		<variable name="console_x" value="0" />
-		<variable name="console_width" value="480" />
-		<variable name="console_foreground" value="#A0A0A0" />
-		<variable name="warning" value="#F8F8A0" />
-		<variable name="error" value="#FF4040" />
-		<variable name="highlight" value="#33B5E5" />
-		<variable name="console_background" value="#303030" />
-		<variable name="console_scroll" value="#303030" />
-		<variable name="console_action_height" value="320" />
-		<variable name="console_install_height" value="440" />
-		<variable name="console_installdone_height" value="300" />
-		<variable name="fileselector_x" value="5" />
-		<variable name="fileselector_width" value="470" />
-		<variable name="fileselector_install_height" value="534" />
-		<variable name="fileselector_header_background" value="#202020" />
-		<variable name="fileselector_header_textcolor" value="#AAAAAA" />
-		<variable name="fileselector_header_separatorcolor" value="#33B5E5" />
-		<variable name="fileselector_header_separatorheight" value="3" />
-		<variable name="fileselector_separatorcolor" value="#505050" />
-		<variable name="fileselector_separatorheight" value="2" />
-		<variable name="fileselector_background" value="#303030" />
-		<variable name="fileselector_highlight_color" value="#505050" />
-		<variable name="fileselector_highlight_font_color" value="#33B5E5" />
-		<variable name="fileselector_spacing" value="18" />
-		<variable name="fastscroll_linecolor" value="#50505080" />
-		<variable name="fastscroll_rectcolor" value="#33B5E580" />
-		<variable name="fastscroll_w" value="40" />
-		<variable name="fastscroll_linew" value="2" />
-		<variable name="fastscroll_rectw" value="12" />
-		<variable name="fastscroll_recth" value="30" />
-		<variable name="listbox_x" value="5" />
-		<variable name="listbox_width" value="470" />
-		<variable name="listbox_tz_height" value="310" />
-		<variable name="listbox_background" value="#303030" />
-		<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="sdswap_button_y" value="185" />
-		<variable name="sdswap_text_x" value="84" />
-		<variable name="sdswap_text_y" value="195" />
-		<variable name="sdfilesystem_text_y" value="240" />
-		<variable name="sdfilesystem_button_y" value="280" />
-		<variable name="lock_x" value="40" />
-		<variable name="lock_y" value="200" />
-		<variable name="filemanager_select_x" value="365" />
-		<variable name="filemanager_select_y" value="744" />
-		<variable name="backup_name_y" value="350" />
-		<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" />
-		<variable name="button_fill_color" value="#303030" />
-		<variable name="button_fill_full_width" value="455" />
-		<variable name="button_fill_main_width" value="225" />
-		<variable name="button_fill_main_height" value="135" />
-		<variable name="button_fill_half_height" value="67" />
-		<variable name="button_fill_quarter_height" value="34" />
-		<variable name="backup_list_height" value="300" />
-		<variable name="backup_button_row1" value="480" />
-		<variable name="backup_button_row2" value="520" />
-		<variable name="mount_list_height" value="380" />
-		<variable name="mount_storage_row" value="500" />
-		<variable name="storage_list_height" value="400" />
-		<variable name="wipe_list_height" value="460" />
-		<variable name="wipe_button_row1" value="600" />
-		<variable name="wipe_button_y" value="400" />
-		<variable name="slidervalue_w" value="460" />
-		<variable name="slidervalue_line_clr" value="#FFFFFF" />
-		<variable name="slidervalue_slider_clr" value="#33B5E5" />
-		<variable name="slidervalue_lineh" value="1" />
-		<variable name="slidervalue_padding" value="13" />
-		<variable name="slidervalue_sliderw" value="7" />
-		<variable name="slidervalue_sliderh" value="40" />
-	</variables>
-
-	<mousecursor>
-		<placement w="15" h="15" />
-		<background color="#FFFF00FF" resource="cursor" />
-		<speed multiplier="1.5" />
-	</mousecursor>
-
-	<templates>
-		<template name="header">
-			<background color="%backgroundcolor%" />
-
-			<object type="image">
-				<image resource="top_bar" />
-				<placement x="0" y="0" />
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="100" y="10" />
-				<text>Team Win Recovery Project  v%tw_version%</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<condition var1="tw_simulate_actions" var2="1" />
-				<font resource="font" />
-				<placement x="100" y="40" />
-				<text>SIMULATING ACTIONS</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="100" y="70" />
-				<text>%tw_time%</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="190" y="70" />
-				<conditions>
-					<condition var1="tw_no_battery_percent" var2="0" />
-					<condition var1="tw_battery" op="&gt;" var2="0" />
-					<condition var1="tw_battery" op="&lt;" var2="101" />
-				</conditions>
-				<text>Battery: %tw_battery%</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="350" y="70" />
-				<conditions>
-					<condition var1="tw_no_cpu_temp" var2="0" />
-				</conditions>
-				<text>CPU: %tw_cpu_temp% C</text>
-			</object>
-
-			<object type="button">
-				<placement x="%home_button_x%" y="%home_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text></text>
-				<image resource="home_icon" />
-				<condition var1="tw_busy" var2="0" />
-				<action function="key">home</action>
-			</object>
-
-			<object type="button">
-				<placement x="%back_button_x%" y="%back_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text></text>
-				<image resource="back_icon" />
-				<condition var1="tw_busy" var2="0" />
-				<action function="key">back</action>
-			</object>
-
-			<object type="action">
-				<touch key="power" />
-				<action function="overlay">lock</action>
-			</object>
-
-			<object type="action">
-				<touch key="power+voldown" />
-				<action function="screenshot" />
-			</object>
-		</template>
-
-		<template name="progress_bar">
-			<object type="progressbar">
-				<placement x="%col_progressbar_x%" y="%row_progressbar_y%" />
-				<resource empty="progress_empty" full="progress_full" />
-				<data name="ui_progress" />
-			</object>
-
-			<object type="animation">
-				<placement x="%col_progressbar_x%" y="%row_progressbar_y%" />
-				<resource name="progress" />
-				<speed fps="15" render="2" />
-				<loop frame="1" />
-			</object>
-		</template>
-
-		<template name="action_page_console">
-			<object type="console">
-				<placement x="%console_x%" y="%row2_y%" w="%console_width%" h="%console_action_height%" />
-				<color foreground="%console_foreground%" background="%console_background%" scroll="%console_scroll%" />
-				<font resource="fixed" />
-			</object>
-		</template>
-
-		<template name="sort_options">
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="%col1_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="font" color="%button_text_color%" />
-				<text>Name</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=1</action>
-			</object>
-
-			<object type="button">
-				<placement x="%sort_col2_button_x%" y="%sort_asc_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Date</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=2</action>
-			</object>
-
-			<object type="button">
-				<placement x="%sort_col3_button_x%" y="%sort_asc_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Size</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=3</action>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="%col1_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="font" color="%button_text_color%" />
-				<text>Name</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=-1</action>
-			</object>
-
-			<object type="button">
-				<placement x="%sort_col2_button_x%" y="%sort_desc_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Date</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=-2</action>
-			</object>
-
-			<object type="button">
-				<placement x="%sort_col3_button_x%" y="%sort_desc_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Size</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=-3</action>
-			</object>
-		</template>
-
-		<template name="footer">
-			<object type="console">
-				<slideout resource="slideout" x="210" y="814" />
-				<placement x="%console_x%" y="0" w="%console_width%" h="814" />
-				<color foreground="%console_foreground%" background="%console_background%" scroll="%console_scroll%" />
-				<font resource="fixed" />
-			</object>
-		</template>
-
-		<template name="keyboardtemplate">
-			<object type="keyboard">
-				<placement x="0" y="504" />
-				<layout resource1="keyboard1" resource2="keyboard2" resource3="keyboard3" resource4="keyboard4" />
-				<highlight color="%highlight_color%" />
-				<capshighlight color="%caps_highlight_color%" />
-				<layout1>
-					<keysize height="78" width="48" />
-					<row1 key01="q" long01="1" key02="w" long02="2" key03="e" long03="3" key04="r" long04="4" key05="t" long05="5" key06="y" long06="6" key07="u" long07="7" key08="i" long08="8" key09="o" long09="9" key10="p" long10="0" />
-					<row2 key01="72:a" key02="s" key03="d" key04="f" key05="g" key06="h" key07="j" key08="k" key09="72:l" />
-					<row3 key01="72:layout2" key02="z" key03="x" key04="c" key05="v" key06="b" key07="n" key08="m" key09="72:c:8" />
-					<row4 key01="72:layout3" key02="48:" key03="240: " key04="48:." key05="72:a:action" />
-				</layout1>
-				<layout2>
-					<keysize height="78" width="48" capslock="0" revert_layout="1" />
-					<row1 key01="Q" long01="1" key02="W" long02="2" key03="E" long03="3" key04="R" long04="4" key05="T" long05="5" key06="Y" long06="6" key07="U" long07="7" key08="I" long08="8" key09="O" long09="9" key10="P" long10="0" />
-					<row2 key01="72:A" key02="S" key03="D" key04="F" key05="G" key06="H" key07="J" key08="K" key09="72:L" />
-					<row3 key01="72:layout1" key02="Z" key03="X" key04="C" key05="V" key06="B" key07="N" key08="M" key09="72:c:8" />
-					<row4 key01="72:layout3" key02="48:" key03="240: " key04="48:." key05="72:action" />
-				</layout2>
-				<layout3>
-					<keysize height="78" width="48" />
-					<row1 key01="1" key02="2" key03="3" key04="4" key05="5" key06="6" key07="7" key08="8" key09="9" key10="0" />
-					<row2 key01="@" key02="#" key03="$" key04="%" key05="&amp;" key06="*" key07="-" key08="+" key09="(" key10=")" />
-					<row3 key01="72:layout4" key02="!" key03="48:c:34" key04="'" key05=":" key06=";" key07="/" key08="?" key09="72:c:8" />
-					<row4 key01="72:layout1" key02="48:," key03="240: " key04="48:." key05="72:action" />
-				</layout3>
-				<layout4>
-					<keysize height="78" width="48" />
-					<row1 key01="~" key02="`" key03="|" key04="48:" key05="48:" key06="48:" key07="%" key08="48:" key09="{" key10="}" />
-					<row2 key01="48:" key02="48:" key03="48:" key04="48:" key05="48:" key06="^" key07="_" key08="=" key09="[" key10="]" />
-					<row3 key01="72:layout3" key02="48:" key03="48:" key04="48:" key05="48:" key06="\" key07="&lt;" key08="&gt;" key09="72:c:8" />
-					<row4 key01="72:layout1" key02="48:c:34" key03="240: " key04="48:." key05="72:action" />
-				</layout4>
-			</object>
-		</template>
-	</templates>
-</recovery>
diff --git a/gui/devices/540x960/res/fonts/Roboto-Regular-20.dat b/gui/devices/540x960/res/fonts/Roboto-Regular-20.dat
deleted file mode 100644
index 6588b41..0000000
--- a/gui/devices/540x960/res/fonts/Roboto-Regular-20.dat
+++ /dev/null
Binary files differ
diff --git a/gui/devices/540x960/res/fonts/Roboto-Regular-25.dat b/gui/devices/540x960/res/fonts/Roboto-Regular-25.dat
deleted file mode 100644
index 392cce9..0000000
--- a/gui/devices/540x960/res/fonts/Roboto-Regular-25.dat
+++ /dev/null
Binary files differ
diff --git a/gui/devices/540x960/res/fonts/Roboto-Regular-40.dat b/gui/devices/540x960/res/fonts/Roboto-Regular-40.dat
deleted file mode 100644
index 637d9fe..0000000
--- a/gui/devices/540x960/res/fonts/Roboto-Regular-40.dat
+++ /dev/null
Binary files differ
diff --git a/gui/devices/540x960/res/images/.BridgeSort b/gui/devices/540x960/res/images/.BridgeSort
deleted file mode 100644
index b475f87..0000000
--- a/gui/devices/540x960/res/images/.BridgeSort
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' standalone='yes' ?>
-<dirinfo>
-<files>
-<item key='checkbox_checked.png20120416172546' />
-<item key='checkbox_empty.png20120416172604' />
-<item key='file.png20120411171839' />
-<item key='folder.png20120411173532' />
-<item key='indeterminate001.png20120412113445' />
-<item key='indeterminate002.png20120412113445' />
-<item key='indeterminate003.png20120412113445' />
-<item key='indeterminate004.png20120412113445' />
-<item key='indeterminate005.png20120412113445' />
-<item key='indeterminate006.png20120412113445' />
-<item key='qhd-medium-button.png20120417101729' />
-<item key='qhd-menu-button.png20120417101649' />
-<item key='qhd-minus-button.png20120417101827' />
-<item key='qhd-plus-button.png20120417101847' />
-<item key='qhd-small-button.png20120417101930' />
-<item key='qhd-sort-button.png20120417102006' />
-<item key='radio_empty.png20120411175722' />
-<item key='radio_selected.png20120411175739' />
-<item key='slideout.png20120416182450' />
-<item key='slider-touch.png20120412103144' />
-<item key='slider-used.png20120412103705' />
-<item key='slider.png20120412103630' />
-<item key='top-bar-01.jpg20120417101442' />
-<item key='unlock.png20120412111348' />
-</files>
-</dirinfo>
diff --git a/gui/devices/540x960/res/images/back-icon.png b/gui/devices/540x960/res/images/back-icon.png
deleted file mode 100644
index f5ba872..0000000
--- a/gui/devices/540x960/res/images/back-icon.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/540x960/res/images/checkbox_checked.png b/gui/devices/540x960/res/images/checkbox_checked.png
deleted file mode 100644
index 3447349..0000000
--- a/gui/devices/540x960/res/images/checkbox_checked.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/540x960/res/images/checkbox_empty.png b/gui/devices/540x960/res/images/checkbox_empty.png
deleted file mode 100644
index f5f35d8..0000000
--- a/gui/devices/540x960/res/images/checkbox_empty.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/540x960/res/images/cursor.png b/gui/devices/540x960/res/images/cursor.png
deleted file mode 100644
index 32c8ae1..0000000
--- a/gui/devices/540x960/res/images/cursor.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/540x960/res/images/curtain.jpg b/gui/devices/540x960/res/images/curtain.jpg
deleted file mode 100644
index f1a6316..0000000
--- a/gui/devices/540x960/res/images/curtain.jpg
+++ /dev/null
Binary files differ
diff --git a/gui/devices/540x960/res/images/file.png b/gui/devices/540x960/res/images/file.png
deleted file mode 100644
index 8556bc7..0000000
--- a/gui/devices/540x960/res/images/file.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/540x960/res/images/folder.png b/gui/devices/540x960/res/images/folder.png
deleted file mode 100644
index a3a5f69..0000000
--- a/gui/devices/540x960/res/images/folder.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/540x960/res/images/home-icon.png b/gui/devices/540x960/res/images/home-icon.png
deleted file mode 100644
index 46ccf6a..0000000
--- a/gui/devices/540x960/res/images/home-icon.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/540x960/res/images/indeterminate001.png b/gui/devices/540x960/res/images/indeterminate001.png
deleted file mode 100644
index e6fa1c5..0000000
--- a/gui/devices/540x960/res/images/indeterminate001.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/540x960/res/images/indeterminate002.png b/gui/devices/540x960/res/images/indeterminate002.png
deleted file mode 100644
index e1fceab..0000000
--- a/gui/devices/540x960/res/images/indeterminate002.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/540x960/res/images/indeterminate003.png b/gui/devices/540x960/res/images/indeterminate003.png
deleted file mode 100644
index 6702867..0000000
--- a/gui/devices/540x960/res/images/indeterminate003.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/540x960/res/images/indeterminate004.png b/gui/devices/540x960/res/images/indeterminate004.png
deleted file mode 100644
index ff65e09..0000000
--- a/gui/devices/540x960/res/images/indeterminate004.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/540x960/res/images/indeterminate005.png b/gui/devices/540x960/res/images/indeterminate005.png
deleted file mode 100644
index e61e2cc..0000000
--- a/gui/devices/540x960/res/images/indeterminate005.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/540x960/res/images/indeterminate006.png b/gui/devices/540x960/res/images/indeterminate006.png
deleted file mode 100644
index c9c21ba..0000000
--- a/gui/devices/540x960/res/images/indeterminate006.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/540x960/res/images/keyboard1.png b/gui/devices/540x960/res/images/keyboard1.png
deleted file mode 100644
index 9fecdcd..0000000
--- a/gui/devices/540x960/res/images/keyboard1.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/540x960/res/images/keyboard2.png b/gui/devices/540x960/res/images/keyboard2.png
deleted file mode 100644
index 0d1e966..0000000
--- a/gui/devices/540x960/res/images/keyboard2.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/540x960/res/images/keyboard3.png b/gui/devices/540x960/res/images/keyboard3.png
deleted file mode 100644
index b9eab17..0000000
--- a/gui/devices/540x960/res/images/keyboard3.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/540x960/res/images/keyboard4.png b/gui/devices/540x960/res/images/keyboard4.png
deleted file mode 100644
index 909956b..0000000
--- a/gui/devices/540x960/res/images/keyboard4.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/540x960/res/images/progress_empty.png b/gui/devices/540x960/res/images/progress_empty.png
deleted file mode 100644
index b853710..0000000
--- a/gui/devices/540x960/res/images/progress_empty.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/540x960/res/images/progress_fill.png b/gui/devices/540x960/res/images/progress_fill.png
deleted file mode 100644
index 669c6ef..0000000
--- a/gui/devices/540x960/res/images/progress_fill.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/540x960/res/images/qhd-medium-button.png b/gui/devices/540x960/res/images/qhd-medium-button.png
deleted file mode 100644
index b91e7fc..0000000
--- a/gui/devices/540x960/res/images/qhd-medium-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/540x960/res/images/qhd-menu-button.png b/gui/devices/540x960/res/images/qhd-menu-button.png
deleted file mode 100644
index ec2b1fd..0000000
--- a/gui/devices/540x960/res/images/qhd-menu-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/540x960/res/images/qhd-minus-button.png b/gui/devices/540x960/res/images/qhd-minus-button.png
deleted file mode 100644
index 0cbc5ce..0000000
--- a/gui/devices/540x960/res/images/qhd-minus-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/540x960/res/images/qhd-plus-button.png b/gui/devices/540x960/res/images/qhd-plus-button.png
deleted file mode 100644
index 89c8048..0000000
--- a/gui/devices/540x960/res/images/qhd-plus-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/540x960/res/images/qhd-small-button.png b/gui/devices/540x960/res/images/qhd-small-button.png
deleted file mode 100644
index 255d09d..0000000
--- a/gui/devices/540x960/res/images/qhd-small-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/540x960/res/images/qhd-sort-button.png b/gui/devices/540x960/res/images/qhd-sort-button.png
deleted file mode 100644
index e06618e..0000000
--- a/gui/devices/540x960/res/images/qhd-sort-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/540x960/res/images/radio_empty.png b/gui/devices/540x960/res/images/radio_empty.png
deleted file mode 100644
index 88d1c1f..0000000
--- a/gui/devices/540x960/res/images/radio_empty.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/540x960/res/images/radio_selected.png b/gui/devices/540x960/res/images/radio_selected.png
deleted file mode 100644
index 864065d..0000000
--- a/gui/devices/540x960/res/images/radio_selected.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/540x960/res/images/slideout.png b/gui/devices/540x960/res/images/slideout.png
deleted file mode 100644
index 963b9fd..0000000
--- a/gui/devices/540x960/res/images/slideout.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/540x960/res/images/slider-touch.png b/gui/devices/540x960/res/images/slider-touch.png
deleted file mode 100644
index d8647b8..0000000
--- a/gui/devices/540x960/res/images/slider-touch.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/540x960/res/images/slider-used.png b/gui/devices/540x960/res/images/slider-used.png
deleted file mode 100644
index bf6cad9..0000000
--- a/gui/devices/540x960/res/images/slider-used.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/540x960/res/images/slider.png b/gui/devices/540x960/res/images/slider.png
deleted file mode 100644
index 4081ea5..0000000
--- a/gui/devices/540x960/res/images/slider.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/540x960/res/images/top-bar.jpg b/gui/devices/540x960/res/images/top-bar.jpg
deleted file mode 100644
index fbe7230..0000000
--- a/gui/devices/540x960/res/images/top-bar.jpg
+++ /dev/null
Binary files differ
diff --git a/gui/devices/540x960/res/images/unlock.png b/gui/devices/540x960/res/images/unlock.png
deleted file mode 100644
index 9041221..0000000
--- a/gui/devices/540x960/res/images/unlock.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/540x960/res/ui.xml b/gui/devices/540x960/res/ui.xml
deleted file mode 100644
index 66f4cbe..0000000
--- a/gui/devices/540x960/res/ui.xml
+++ /dev/null
@@ -1,414 +0,0 @@
-<?xml version="1.0"?>
-
-<recovery>
-	<details>
-		<resolution width="540" height="960" />
-		<author>TeamWin</author>
-		<title>Backup Naowz</title>
-		<description>Default basic theme</description>
-		<preview>preview.jpg</preview>
-	</details>
-
-	<include>
-		<xmlfile name="portrait.xml" />
-	</include>
-
-	<resources>
-		<resource name="font" type="font" filename="RobotoCondensed-Regular.ttf" size="20" fallback="Roboto-Regular-20" />
-		<resource name="mediumfont" type="font" filename="RobotoCondensed-Regular.ttf" size="20" fallback="Roboto-Regular-20" />
-		<resource name="filelist" type="font" filename="RobotoCondensed-Regular.ttf" size="20" fallback="Roboto-Regular-25" />
-		<resource name="top_bar" type="image" filename="top-bar.jpg" />
-		<resource name="main_button" type="image" filename="qhd-menu-button" />
-		<resource name="file_icon" type="image" filename="file" />
-		<resource name="folder_icon" type="image" filename="folder" />
-		<resource name="slideout" type="image" filename="slideout" />
-		<resource name="progress" type="animation" filename="indeterminate" />
-		<resource name="progress_empty" type="image" filename="progress_empty" />
-		<resource name="progress_full" type="image" filename="progress_fill" />
-		<resource name="checkbox_false" type="image" filename="checkbox_empty" retainaspect="1" />
-		<resource name="checkbox_true" type="image" filename="checkbox_checked" retainaspect="1" />
-		<resource name="radio_false" type="image" filename="radio_empty" retainaspect="1" />
-		<resource name="radio_true" type="image" filename="radio_selected" retainaspect="1" />
-		<resource name="medium_button" type="image" filename="qhd-medium-button" />
-		<resource name="sort_button" type="image" filename="qhd-sort-button" />
-		<resource name="minus_button" type="image" filename="qhd-minus-button" />
-		<resource name="plus_button" type="image" filename="qhd-plus-button" />
-		<resource name="home_icon" type="image" filename="home-icon" />
-		<resource name="back_icon" type="image" filename="back-icon" />
-		<resource name="slider" type="image" filename="slider" />
-		<resource name="slider-used" type="image" filename="slider-used" />
-		<resource name="slider-touch" type="image" filename="slider-touch" />
-		<resource name="unlock-icon" type="image" filename="unlock" />
-		<resource name="keyboard1" type="image" filename="keyboard1" />
-		<resource name="keyboard2" type="image" filename="keyboard2" />
-		<resource name="keyboard3" type="image" filename="keyboard3" />
-		<resource name="keyboard4" type="image" filename="keyboard4" />
-		<resource name="cursor" type="image" filename="cursor" retainaspect="1" />
-	</resources>
-
-	<variables>
-		<variable name="col1_x" value="10" />
-		<variable name="col2_x" value="277" />
-		<variable name="col_center_x" value="143" />
-		<variable name="col_center_medium_x" value="206" />
-		<variable name="center_x" value="270" />
-		<variable name="row1_y" value="140" />
-		<variable name="row2_y" value="332" />
-		<variable name="row3_y" value="524" />
-		<variable name="row4_y" value="716" />
-		<variable name="row_queue_y" value="625" />
-		<variable name="row1_header_y" value="110" />
-		<variable name="row1_text_y" value="140" />
-		<variable name="row2_text_y" value="180" />
-		<variable name="row3_text_y" value="220" />
-		<variable name="row4_text_y" value="260" />
-		<variable name="row5_text_y" value="300" />
-		<variable name="row6_text_y" value="340" />
-		<variable name="row7_text_y" value="380" />
-		<variable name="row8_text_y" value="420" />
-		<variable name="row9_text_y" value="460" />
-		<variable name="row10_text_y" value="500" />
-		<variable name="row11_text_y" value="540" />
-		<variable name="row12_text_y" value="580" />
-		<variable name="row13_text_y" value="620" />
-		<variable name="row14_text_y" value="660" />
-		<variable name="row15_text_y" value="700" />
-		<variable name="row16_text_y" value="740" />
-		<variable name="row17_text_y" value="780" />
-		<variable name="row18_text_y" value="820" />
-		<variable name="zip_status_y" value="696" />
-		<variable name="flash_list_height" value="260" />
-		<variable name="tz_selected_y" value="110" />
-		<variable name="tz_set_y" value="720" />
-		<variable name="tz_current_y" value="895" />
-		<variable name="col_progressbar_x" value="144" />
-		<variable name="row_progressbar_y" value="850" />
-		<variable name="col1_medium_x" value="10" />
-		<variable name="col2_medium_x" value="145" />
-		<variable name="col3_medium_x" value="280" />
-		<variable name="col4_medium_x" value="415" />
-		<variable name="row1_medium_y" value="130" />
-		<variable name="row2_medium_y" value="230" />
-		<variable name="row3_medium_y" value="330" />
-		<variable name="row4_medium_y" value="430" />
-		<variable name="row5_medium_y" value="530" />
-		<variable name="row6_medium_y" value="630" />
-		<variable name="row7_medium_y" value="730" />
-		<variable name="slider_x" value="50" />
-		<variable name="slider_y" value="820" />
-		<variable name="slider_text_y" value="870" />
-		<variable name="button_text_color" value="#AAAAAA" />
-		<variable name="text_color" value="#FFFFFF" />
-		<variable name="text_success_color" value="#33B5E5" />
-		<variable name="text_fail_color" value="#FF0101" />
-		<variable name="highlight_color" value="#90909080" />
-		<variable name="caps_highlight_color" value="#33B5E580" />
-		<variable name="home_button_x" value="10" />
-		<variable name="home_button_y" value="919" />
-		<variable name="back_button_x" value="466" />
-		<variable name="back_button_y" value="919" />
-		<variable name="sort_asc_text_y" value="830" />
-		<variable name="sort_asc_button_y" value="820" />
-		<variable name="sort_desc_text_y" value="880" />
-		<variable name="sort_desc_button_y" value="870" />
-		<variable name="sort_col1_button_x" value="180" />
-		<variable name="sort_col2_button_x" value="255" />
-		<variable name="sort_col3_button_x" value="330" />
-		<variable name="input_width" value="520" />
-		<variable name="input_height" value="40" />
-		<variable name="input_background_color" value="#303030" />
-		<variable name="input_cursor_color" value="#33B5E5" />
-		<variable name="input_cursor_width" value="3" />
-		<variable name="console_x" value="0" />
-		<variable name="console_width" value="540" />
-		<variable name="console_foreground" value="#A0A0A0" />
-		<variable name="warning" value="#F8F8A0" />
-		<variable name="error" value="#FF4040" />
-		<variable name="highlight" value="#33B5E5" />
-		<variable name="console_background" value="#303030" />
-		<variable name="console_scroll" value="#303030" />
-		<variable name="console_action_height" value="380" />
-		<variable name="console_install_height" value="580" />
-		<variable name="console_installdone_height" value="380" />
-		<variable name="fileselector_x" value="5" />
-		<variable name="fileselector_width" value="530" />
-		<variable name="fileselector_install_height" value="590" />
-		<variable name="fileselector_header_background" value="#202020" />
-		<variable name="fileselector_header_textcolor" value="#AAAAAA" />
-		<variable name="fileselector_header_separatorcolor" value="#33B5E5" />
-		<variable name="fileselector_header_separatorheight" value="3" />
-		<variable name="fileselector_separatorcolor" value="#505050" />
-		<variable name="fileselector_separatorheight" value="2" />
-		<variable name="fileselector_background" value="#303030" />
-		<variable name="fileselector_highlight_color" value="#505050" />
-		<variable name="fileselector_highlight_font_color" value="#33B5E5" />
-		<variable name="fileselector_spacing" value="18" />
-		<variable name="fastscroll_linecolor" value="#50505080" />
-		<variable name="fastscroll_rectcolor" value="#33B5E580" />
-		<variable name="fastscroll_w" value="45" />
-		<variable name="fastscroll_linew" value="2" />
-		<variable name="fastscroll_rectw" value="12" />
-		<variable name="fastscroll_recth" value="32" />
-		<variable name="listbox_x" value="5" />
-		<variable name="listbox_width" value="530" />
-		<variable name="listbox_tz_height" value="420" />
-		<variable name="listbox_background" value="#303030" />
-		<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="sdswap_button_y" value="185" />
-		<variable name="sdswap_text_x" value="84" />
-		<variable name="sdswap_text_y" value="195" />
-		<variable name="sdfilesystem_text_y" value="240" />
-		<variable name="sdfilesystem_button_y" value="280" />
-		<variable name="lock_x" value="70" />
-		<variable name="lock_y" value="250" />
-		<variable name="filemanager_select_x" value="405" />
-		<variable name="filemanager_select_y" value="825" />
-		<variable name="backup_name_y" value="420" />
-		<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" />
-		<variable name="button_fill_color" value="#303030" />
-		<variable name="button_fill_full_width" value="520" />
-		<variable name="button_fill_main_width" value="253" />
-		<variable name="button_fill_main_height" value="162" />
-		<variable name="button_fill_half_height" value="81" />
-		<variable name="button_fill_quarter_height" value="40" />
-		<variable name="backup_list_height" value="410" />
-		<variable name="backup_button_row1" value="600" />
-		<variable name="backup_button_row2" value="645" />
-		<variable name="mount_list_height" value="500" />
-		<variable name="mount_storage_row" value="630" />
-		<variable name="storage_list_height" value="575" />
-		<variable name="wipe_list_height" value="570" />
-		<variable name="wipe_button_row1" value="700" />
-		<variable name="wipe_button_y" value="475" />
-		<variable name="slidervalue_w" value="520" />
-		<variable name="slidervalue_line_clr" value="#FFFFFF" />
-		<variable name="slidervalue_slider_clr" value="#33B5E5" />
-		<variable name="slidervalue_lineh" value="2" />
-		<variable name="slidervalue_padding" value="15" />
-		<variable name="slidervalue_sliderw" value="8" />
-		<variable name="slidervalue_sliderh" value="45" />
-	</variables>
-
-	<mousecursor>
-		<placement w="15" h="15" />
-		<background color="#FFFF00FF" resource="cursor" />
-		<speed multiplier="1.5" />
-	</mousecursor>
-
-	<templates>
-		<template name="header">
-			<background color="#000000FF" />
-
-			<object type="image">
-				<image resource="top_bar" />
-				<placement x="0" y="0" />
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="100" y="10" />
-				<text>Team Win Recovery Project  v%tw_version%</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<condition var1="tw_simulate_actions" var2="1" />
-				<font resource="font" />
-				<placement x="100" y="40" />
-				<text>SIMULATING ACTIONS</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="100" y="70" />
-				<text>%tw_time%</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="200" y="70" />
-				<conditions>
-					<condition var1="tw_no_battery_percent" var2="0" />
-					<condition var1="tw_battery" op="&gt;" var2="0" />
-					<condition var1="tw_battery" op="&lt;" var2="101" />
-				</conditions>
-				<text>Battery: %tw_battery%</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="400" y="70" />
-				<conditions>
-					<condition var1="tw_no_cpu_temp" var2="0" />
-				</conditions>
-				<text>CPU: %tw_cpu_temp% C</text>
-			</object>
-
-			<object type="button">
-				<placement x="%home_button_x%" y="%home_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text></text>
-				<image resource="home_icon" />
-				<condition var1="tw_busy" var2="0" />
-				<action function="key">home</action>
-			</object>
-
-			<object type="button">
-				<placement x="%back_button_x%" y="%back_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text></text>
-				<image resource="back_icon" />
-				<condition var1="tw_busy" var2="0" />
-				<action function="key">back</action>
-			</object>
-
-			<object type="action">
-				<touch key="power" />
-				<action function="overlay">lock</action>
-			</object>
-
-			<object type="action">
-				<touch key="power+voldown" />
-				<action function="screenshot" />
-			</object>
-		</template>
-
-		<template name="progress_bar">
-			<object type="progressbar">
-				<placement x="%col_progressbar_x%" y="%row_progressbar_y%" />
-				<resource empty="progress_empty" full="progress_full" />
-				<data name="ui_progress" />
-			</object>
-
-			<object type="animation">
-				<placement x="%col_progressbar_x%" y="%row_progressbar_y%" />
-				<resource name="progress" />
-				<speed fps="15" render="2" />
-				<loop frame="1" />
-			</object>
-		</template>
-
-		<template name="action_page_console">
-			<object type="console">
-				<placement x="%console_x%" y="%row2_y%" w="%console_width%" h="%console_action_height%" />
-				<color foreground="%console_foreground%" background="%console_background%" scroll="%console_scroll%" />
-				<font resource="fixed" />
-			</object>
-		</template>
-
-		<template name="sort_options">
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="%col1_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="mediumfont" color="%button_text_color%" />
-				<text>Name</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=1</action>
-			</object>
-
-			<object type="button">
-				<placement x="%sort_col2_button_x%" y="%sort_asc_button_y%" />
-				<font resource="mediumfont" color="%button_text_color%" />
-				<text>Date</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=2</action>
-			</object>
-
-			<object type="button">
-				<placement x="%sort_col3_button_x%" y="%sort_asc_button_y%" />
-				<font resource="mediumfont" color="%button_text_color%" />
-				<text>Size</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=3</action>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="%col1_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="mediumfont" color="%button_text_color%" />
-				<text>Name</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=-1</action>
-			</object>
-
-			<object type="button">
-				<placement x="%sort_col2_button_x%" y="%sort_desc_button_y%" />
-				<font resource="mediumfont" color="%button_text_color%" />
-				<text>Date</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=-2</action>
-			</object>
-
-			<object type="button">
-				<placement x="%sort_col3_button_x%" y="%sort_desc_button_y%" />
-				<font resource="mediumfont" color="%button_text_color%" />
-				<text>Size</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=-3</action>
-			</object>
-		</template>
-
-		<template name="footer">
-			<object type="console">
-				<slideout resource="slideout" x="240" y="920" />
-				<placement x="%console_x%" y="0" w="%console_width%" h="920" />
-				<color foreground="#A0A0A0" background="#303030" scroll="#303030" />
-				<font resource="fixed" />
-			</object>
-		</template>
-
-		<template name="keyboardtemplate">
-			<object type="keyboard">
-				<placement x="0" y="600" />
-				<layout resource1="keyboard1" resource2="keyboard2" resource3="keyboard3" resource4="keyboard4" />
-				<highlight color="%highlight_color%" />
-				<capshighlight color="%caps_highlight_color%" />
-				<layout1>
-					<keysize height="78" width="54" />
-					<row1 key01="q" long01="1" key02="w" long02="2" key03="e" long03="3" key04="r" long04="4" key05="t" long05="5" key06="y" long06="6" key07="u" long07="7" key08="i" long08="8" key09="o" long09="9" key10="p" long10="0" />
-					<row2 key01="81:a" key02="s" key03="d" key04="f" key05="g" key06="h" key07="j" key08="k" key09="81:l" />
-					<row3 key01="81:layout2" key02="z" key03="x" key04="c" key05="v" key06="b" key07="n" key08="m" key09="81:c:8" />
-					<row4 key01="81:layout3" key02="54:/" key03="270: " key04="54:." key05="81:a:action" />
-				</layout1>
-				<layout2>
-					<keysize height="78" width="54" capslock="0" revert_layout="1" />
-					<row1 key01="Q" long01="1" key02="W" long02="2" key03="E" long03="3" key04="R" long04="4" key05="T" long05="5" key06="Y" long06="6" key07="U" long07="7" key08="I" long08="8" key09="O" long09="9" key10="P" long10="0" />
-					<row2 key01="81:A" key02="S" key03="D" key04="F" key05="G" key06="H" key07="J" key08="K" key09="81:L" />
-					<row3 key01="81:layout1" key02="Z" key03="X" key04="C" key05="V" key06="B" key07="N" key08="M" key09="81:c:8" />
-					<row4 key01="81:layout3" key02="54:/" key03="270: " key04="54:." key05="81:action" />
-				</layout2>
-				<layout3>
-					<keysize height="78" width="54" />
-					<row1 key01="1" key02="2" key03="3" key04="4" key05="5" key06="6" key07="7" key08="8" key09="9" key10="0" />
-					<row2 key01="@" key02="#" key03="$" key04="%" key05="&amp;" key06="*" key07="-" key08="+" key09="(" key10=")" />
-					<row3 key01="81:layout4" key02="!" key03="54:c:34" key04="'" key05=":" key06=";" key07="/" key08="?" key09="81:c:8" />
-					<row4 key01="81:layout1" key02="54:," key03="270: " key04="54:." key05="81:action" />
-				</layout3>
-				<layout4>
-					<keysize height="78" width="54" />
-					<row1 key01="~" key02="`" key03="|" key04="54:" key05="54:" key06="54:" key07="%" key08="54:" key09="{" key10="}" />
-					<row2 key01="54:" key02="54:" key03="54:" key04="54:" key05="54:" key06="^" key07="_" key08="=" key09="[" key10="]" />
-					<row3 key01="81:layout3" key02="54:" key03="54:" key04="54:" key05="54:" key06="\" key07="&lt;" key08="&gt;" key09="81:c:8" />
-					<row4 key01="81:layout1" key02="54:c:34" key03="270: " key04="54:." key05="81:action" />
-				</layout4>
-			</object>
-		</template>
-	</templates>
-</recovery>
diff --git a/gui/devices/720x1280/res/fonts/Roboto-Condensed-30.dat b/gui/devices/720x1280/res/fonts/Roboto-Condensed-30.dat
deleted file mode 100644
index 621b332..0000000
--- a/gui/devices/720x1280/res/fonts/Roboto-Condensed-30.dat
+++ /dev/null
Binary files differ
diff --git a/gui/devices/720x1280/res/images/back-icon.png b/gui/devices/720x1280/res/images/back-icon.png
deleted file mode 100644
index e0c0442..0000000
--- a/gui/devices/720x1280/res/images/back-icon.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/720x1280/res/images/checkbox_checked.png b/gui/devices/720x1280/res/images/checkbox_checked.png
deleted file mode 100644
index 2af7609..0000000
--- a/gui/devices/720x1280/res/images/checkbox_checked.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/720x1280/res/images/checkbox_empty.png b/gui/devices/720x1280/res/images/checkbox_empty.png
deleted file mode 100644
index 5f65c26..0000000
--- a/gui/devices/720x1280/res/images/checkbox_empty.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/720x1280/res/images/cursor.png b/gui/devices/720x1280/res/images/cursor.png
deleted file mode 100644
index 32c8ae1..0000000
--- a/gui/devices/720x1280/res/images/cursor.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/720x1280/res/images/curtain.jpg b/gui/devices/720x1280/res/images/curtain.jpg
deleted file mode 100644
index a10cc02..0000000
--- a/gui/devices/720x1280/res/images/curtain.jpg
+++ /dev/null
Binary files differ
diff --git a/gui/devices/720x1280/res/images/file.png b/gui/devices/720x1280/res/images/file.png
deleted file mode 100644
index aea3ac2..0000000
--- a/gui/devices/720x1280/res/images/file.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/720x1280/res/images/folder.png b/gui/devices/720x1280/res/images/folder.png
deleted file mode 100644
index 56f4bc2..0000000
--- a/gui/devices/720x1280/res/images/folder.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/720x1280/res/images/home-icon.png b/gui/devices/720x1280/res/images/home-icon.png
deleted file mode 100644
index d4373b7..0000000
--- a/gui/devices/720x1280/res/images/home-icon.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/720x1280/res/images/indeterminate001.png b/gui/devices/720x1280/res/images/indeterminate001.png
deleted file mode 100644
index e6fa1c5..0000000
--- a/gui/devices/720x1280/res/images/indeterminate001.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/720x1280/res/images/indeterminate002.png b/gui/devices/720x1280/res/images/indeterminate002.png
deleted file mode 100644
index e1fceab..0000000
--- a/gui/devices/720x1280/res/images/indeterminate002.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/720x1280/res/images/indeterminate003.png b/gui/devices/720x1280/res/images/indeterminate003.png
deleted file mode 100644
index 6702867..0000000
--- a/gui/devices/720x1280/res/images/indeterminate003.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/720x1280/res/images/indeterminate004.png b/gui/devices/720x1280/res/images/indeterminate004.png
deleted file mode 100644
index ff65e09..0000000
--- a/gui/devices/720x1280/res/images/indeterminate004.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/720x1280/res/images/indeterminate005.png b/gui/devices/720x1280/res/images/indeterminate005.png
deleted file mode 100644
index e61e2cc..0000000
--- a/gui/devices/720x1280/res/images/indeterminate005.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/720x1280/res/images/indeterminate006.png b/gui/devices/720x1280/res/images/indeterminate006.png
deleted file mode 100644
index c9c21ba..0000000
--- a/gui/devices/720x1280/res/images/indeterminate006.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/720x1280/res/images/keyboard1.png b/gui/devices/720x1280/res/images/keyboard1.png
deleted file mode 100644
index a1af160..0000000
--- a/gui/devices/720x1280/res/images/keyboard1.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/720x1280/res/images/keyboard2.png b/gui/devices/720x1280/res/images/keyboard2.png
deleted file mode 100644
index 5b0a4b5..0000000
--- a/gui/devices/720x1280/res/images/keyboard2.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/720x1280/res/images/keyboard3.png b/gui/devices/720x1280/res/images/keyboard3.png
deleted file mode 100644
index 38ee5af..0000000
--- a/gui/devices/720x1280/res/images/keyboard3.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/720x1280/res/images/keyboard4.png b/gui/devices/720x1280/res/images/keyboard4.png
deleted file mode 100644
index dc9a976..0000000
--- a/gui/devices/720x1280/res/images/keyboard4.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/720x1280/res/images/medium-button.png b/gui/devices/720x1280/res/images/medium-button.png
deleted file mode 100644
index 73faebb..0000000
--- a/gui/devices/720x1280/res/images/medium-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/720x1280/res/images/menu-button.png b/gui/devices/720x1280/res/images/menu-button.png
deleted file mode 100644
index c24f155..0000000
--- a/gui/devices/720x1280/res/images/menu-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/720x1280/res/images/minus-button.png b/gui/devices/720x1280/res/images/minus-button.png
deleted file mode 100644
index 7b5f79f..0000000
--- a/gui/devices/720x1280/res/images/minus-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/720x1280/res/images/plus-button.png b/gui/devices/720x1280/res/images/plus-button.png
deleted file mode 100644
index b328577..0000000
--- a/gui/devices/720x1280/res/images/plus-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/720x1280/res/images/progress_empty.png b/gui/devices/720x1280/res/images/progress_empty.png
deleted file mode 100644
index b853710..0000000
--- a/gui/devices/720x1280/res/images/progress_empty.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/720x1280/res/images/progress_fill.png b/gui/devices/720x1280/res/images/progress_fill.png
deleted file mode 100644
index 669c6ef..0000000
--- a/gui/devices/720x1280/res/images/progress_fill.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/720x1280/res/images/radio_empty.png b/gui/devices/720x1280/res/images/radio_empty.png
deleted file mode 100644
index 88d1c1f..0000000
--- a/gui/devices/720x1280/res/images/radio_empty.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/720x1280/res/images/radio_selected.png b/gui/devices/720x1280/res/images/radio_selected.png
deleted file mode 100644
index 864065d..0000000
--- a/gui/devices/720x1280/res/images/radio_selected.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/720x1280/res/images/slideout.png b/gui/devices/720x1280/res/images/slideout.png
deleted file mode 100644
index c3c65e4..0000000
--- a/gui/devices/720x1280/res/images/slideout.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/720x1280/res/images/slider-touch.png b/gui/devices/720x1280/res/images/slider-touch.png
deleted file mode 100644
index 83fce08..0000000
--- a/gui/devices/720x1280/res/images/slider-touch.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/720x1280/res/images/slider-used.png b/gui/devices/720x1280/res/images/slider-used.png
deleted file mode 100644
index 4e4a1f4..0000000
--- a/gui/devices/720x1280/res/images/slider-used.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/720x1280/res/images/slider.png b/gui/devices/720x1280/res/images/slider.png
deleted file mode 100644
index 118edc6..0000000
--- a/gui/devices/720x1280/res/images/slider.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/720x1280/res/images/sort-button.png b/gui/devices/720x1280/res/images/sort-button.png
deleted file mode 100644
index 125c2ce..0000000
--- a/gui/devices/720x1280/res/images/sort-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/720x1280/res/images/top-bar.jpg b/gui/devices/720x1280/res/images/top-bar.jpg
deleted file mode 100644
index 02c8051..0000000
--- a/gui/devices/720x1280/res/images/top-bar.jpg
+++ /dev/null
Binary files differ
diff --git a/gui/devices/720x1280/res/images/unlock.png b/gui/devices/720x1280/res/images/unlock.png
deleted file mode 100644
index 9041221..0000000
--- a/gui/devices/720x1280/res/images/unlock.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/720x1280/res/ui.xml b/gui/devices/720x1280/res/ui.xml
deleted file mode 100644
index d45b0e6..0000000
--- a/gui/devices/720x1280/res/ui.xml
+++ /dev/null
@@ -1,427 +0,0 @@
-<?xml version="1.0"?>
-
-<recovery>
-	<details>
-		<resolution width="720" height="1280" />
-		<author>TeamWin</author>
-		<title>Backup Naowz</title>
-		<description>Default basic theme</description>
-		<preview>preview.jpg</preview>
-	</details>
-
-	<include>
-		<xmlfile name="portrait.xml" />
-	</include>
-
-	<resources>
-		<resource name="font" type="font" filename="RobotoCondensed-Regular.ttf" size="30" fallback="Roboto-Condensed-30" />
-		<resource name="mediumfont" type="font" filename="RobotoCondensed-Regular.ttf" size="30" fallback="Roboto-Condensed-30" />
-		<resource name="filelist" type="font" filename="RobotoCondensed-Regular.ttf" size="30" fallback="Roboto-Condensed-30" />
-		<resource name="top_bar" type="image" filename="top-bar.jpg" />
-		<resource name="main_button" type="image" filename="menu-button" />
-		<resource name="file_icon" type="image" filename="file" />
-		<resource name="folder_icon" type="image" filename="folder" />
-		<resource name="slideout" type="image" filename="slideout" />
-		<resource name="progress" type="animation" filename="indeterminate" />
-		<resource name="progress_empty" type="image" filename="progress_empty" />
-		<resource name="progress_full" type="image" filename="progress_fill" />
-		<resource name="checkbox_false" type="image" filename="checkbox_empty" retainaspect="1" />
-		<resource name="checkbox_true" type="image" filename="checkbox_checked" retainaspect="1" />
-		<resource name="radio_false" type="image" filename="radio_empty" retainaspect="1" />
-		<resource name="radio_true" type="image" filename="radio_selected" retainaspect="1" />
-		<resource name="medium_button" type="image" filename="medium-button" />
-		<resource name="sort_button" type="image" filename="sort-button" />
-		<resource name="minus_button" type="image" filename="minus-button" />
-		<resource name="plus_button" type="image" filename="plus-button" />
-		<resource name="home_icon" type="image" filename="home-icon" />
-		<resource name="back_icon" type="image" filename="back-icon" />
-		<resource name="slider" type="image" filename="slider" />
-		<resource name="slider-used" type="image" filename="slider-used" />
-		<resource name="slider-touch" type="image" filename="slider-touch" />
-		<resource name="unlock-icon" type="image" filename="unlock" />
-		<resource name="keyboard1" type="image" filename="keyboard1" />
-		<resource name="keyboard2" type="image" filename="keyboard2" />
-		<resource name="keyboard3" type="image" filename="keyboard3" />
-		<resource name="keyboard4" type="image" filename="keyboard4" />
-		<resource name="cursor" type="image" filename="cursor" retainaspect="1" />
-	</resources>
-
-	<variables>
-		<variable name="col1_x" value="10" />
-		<variable name="col2_x" value="373" />
-		<variable name="col_center_x" value="191" />
-		<variable name="col_center_medium_x" value="275" />
-		<variable name="center_x" value="360" />
-		<variable name="row1_y" value="170" />
-		<variable name="row2_y" value="410" />
-		<variable name="row3_y" value="650" />
-		<variable name="row4_y" value="890" />
-		<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="760" />
-		<variable name="row1_header_y" value="120" />
-		<variable name="row1_text_y" value="170" />
-		<variable name="row2_text_y" value="220" />
-		<variable name="row3_text_y" value="270" />
-		<variable name="row4_text_y" value="320" />
-		<variable name="row5_text_y" value="370" />
-		<variable name="row6_text_y" value="420" />
-		<variable name="row7_text_y" value="470" />
-		<variable name="row8_text_y" value="520" />
-		<variable name="row9_text_y" value="570" />
-		<variable name="row10_text_y" value="620" />
-		<variable name="row11_text_y" value="670" />
-		<variable name="row12_text_y" value="720" />
-		<variable name="row13_text_y" value="770" />
-		<variable name="row14_text_y" value="820" />
-		<variable name="row15_text_y" value="870" />
-		<variable name="row16_text_y" value="920" />
-		<variable name="row17_text_y" value="970" />
-		<variable name="row18_text_y" value="1020" />
-		<variable name="zip_status_y" value="615" />
-		<variable name="flash_list_height" value="330" />
-		<variable name="tz_selected_y" value="160" />
-		<variable name="tz_set_y" value="950" />
-		<variable name="tz_current_y" value="1180" />
-		<variable name="col_progressbar_x" value="234" />
-		<variable name="row_progressbar_y" value="1100" />
-		<variable name="col1_medium_x" value="10" />
-		<variable name="col2_medium_x" value="185" />
-		<variable name="col3_medium_x" value="365" />
-		<variable name="col4_medium_x" value="540" />
-		<variable name="row1_medium_y" value="130" />
-		<variable name="row2_medium_y" value="230" />
-		<variable name="row3_medium_y" value="330" />
-		<variable name="row4_medium_y" value="430" />
-		<variable name="row5_medium_y" value="530" />
-		<variable name="row6_medium_y" value="840" />
-		<variable name="row7_medium_y" value="730" />
-		<variable name="slider_x" value="68" />
-		<variable name="slider_y" value="1050" />
-		<variable name="slider_text_y" value="1117" />
-		<variable name="button_text_color" value="#AAAAAA" />
-		<variable name="text_color" value="#FFFFFF" />
-		<variable name="text_success_color" value="#33B5E5" />
-		<variable name="text_fail_color" value="#FF0101" />
-		<variable name="highlight_color" value="#90909080" />
-		<variable name="caps_highlight_color" value="#33B5E580" />
-		<variable name="home_button_x" value="10" />
-		<variable name="home_button_y" value="1226" />
-		<variable name="back_button_x" value="625" />
-		<variable name="back_button_y" value="1226" />
-		<variable name="sort_text_x" value="10" />
-		<variable name="sort_asc_text_y" value="1090" />
-		<variable name="sort_asc_button_y" value="1080" />
-		<variable name="sort_desc_text_y" value="1150" />
-		<variable name="sort_desc_button_y" value="1140" />
-		<variable name="sort_col1_button_x" value="260" />
-		<variable name="sort_col2_button_x" value="360" />
-		<variable name="sort_col3_button_x" value="460" />
-		<variable name="input_width" value="700" />
-		<variable name="input_height" value="50" />
-		<variable name="input_background_color" value="#303030" />
-		<variable name="input_cursor_color" value="#33B5E5" />
-		<variable name="input_cursor_width" value="3" />
-		<variable name="console_x" value="0" />
-		<variable name="console_width" value="720" />
-		<variable name="console_foreground" value="#A0A0A0" />
-		<variable name="warning" value="#F8F8A0" />
-		<variable name="error" value="#FF4040" />
-		<variable name="highlight" value="#33B5E5" />
-		<variable name="console_background" value="#303030" />
-		<variable name="console_scroll" value="#303030" />
-		<variable name="console_action_height" value="470" />
-		<variable name="console_install_height" value="600" />
-		<variable name="console_installdone_height" value="440" />
-		<variable name="fileselector_x" value="5" />
-		<variable name="fileselector_width" value="710" />
-		<variable name="fileselector_install_height" value="780" />
-		<variable name="fileselector_header_background" value="#202020" />
-		<variable name="fileselector_header_textcolor" value="#AAAAAA" />
-		<variable name="fileselector_header_separatorcolor" value="#33B5E5" />
-		<variable name="fileselector_header_separatorheight" value="3" />
-		<variable name="fileselector_separatorcolor" value="#505050" />
-		<variable name="fileselector_separatorheight" value="2" />
-		<variable name="fileselector_background" value="#303030" />
-		<variable name="fileselector_highlight_color" value="#505050" />
-		<variable name="fileselector_highlight_font_color" value="#33B5E5" />
-		<variable name="fileselector_spacing" value="36" />
-		<variable name="fastscroll_linecolor" value="#50505080" />
-		<variable name="fastscroll_rectcolor" value="#33B5E580" />
-		<variable name="fastscroll_w" value="60" />
-		<variable name="fastscroll_linew" value="2" />
-		<variable name="fastscroll_rectw" value="16" />
-		<variable name="fastscroll_recth" value="40" />
-		<variable name="listbox_x" value="5" />
-		<variable name="listbox_width" value="710" />
-		<variable name="listbox_tz_height" value="590" />
-		<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="sdswap_button_y" value="260" />
-		<variable name="sdswap_text_x" value="110" />
-		<variable name="sdswap_text_y" value="270" />
-		<variable name="sdfilesystem_text_y" value="340" />
-		<variable name="sdfilesystem_button_y" value="380" />
-		<variable name="lock_x" value="160" />
-		<variable name="lock_y" value="400" />
-		<variable name="filemanager_select_x" value="560" />
-		<variable name="filemanager_select_y" value="1080" />
-		<variable name="backup_name_y" value="550" />
-		<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" />
-		<variable name="button_fill_color" value="#303030" />
-		<variable name="button_fill_full_width" value="700" />
-		<variable name="button_fill_main_width" value="337" />
-		<variable name="button_fill_main_height" value="216" />
-		<variable name="button_fill_half_height" value="108" />
-		<variable name="button_fill_quarter_height" value="54" />
-		<variable name="backup_list_height" value="520" />
-		<variable name="backup_button_row1" value="745" />
-		<variable name="backup_button_row2" value="810" />
-		<variable name="mount_list_height" value="690" />
-		<variable name="mount_storage_row" value="820" />
-		<variable name="storage_list_height" value="775" />
-		<variable name="wipe_list_height" value="670" />
-		<variable name="wipe_button_row1" value="900" />
-		<variable name="wipe_button_y" value="650" />
-		<variable name="slidervalue_w" value="700" />
-		<variable name="slidervalue_line_clr" value="#FFFFFF" />
-		<variable name="slidervalue_slider_clr" value="#33B5E5" />
-		<variable name="slidervalue_lineh" value="2" />
-		<variable name="slidervalue_padding" value="20" />
-		<variable name="slidervalue_sliderw" value="10" />
-		<variable name="slidervalue_sliderh" value="60" />
-	</variables>
-
-	<mousecursor>
-		<placement w="15" h="15" />
-		<background color="#FFFF00FF" resource="cursor" />
-		<speed multiplier="2" />
-	</mousecursor>
-
-	<templates>
-		<template name="header">
-			<background color="#000000FF" />
-
-			<object type="image">
-				<image resource="top_bar" />
-				<placement x="0" y="0" />
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="120" y="10" />
-				<text>Team Win Recovery Project  v%tw_version%</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<condition var1="tw_simulate_actions" var2="1" />
-				<font resource="font" />
-				<placement x="120" y="45" />
-				<text>SIMULATING ACTIONS</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="120" y="76" />
-				<text>%tw_time%</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="270" y="76" />
-				<conditions>
-					<condition var1="tw_no_battery_percent" var2="0" />
-					<condition var1="tw_battery" op="&gt;" var2="0" />
-					<condition var1="tw_battery" op="&lt;" var2="101" />
-				</conditions>
-				<text>Battery: %tw_battery%</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="500" y="76" />
-				<conditions>
-					<condition var1="tw_no_cpu_temp" var2="0" />
-				</conditions>
-				<text>CPU: %tw_cpu_temp% C</text>
-			</object>
-
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<placement x="%home_button_x%" y="%home_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text></text>
-				<image resource="home_icon" />
-				<condition var1="tw_busy" var2="0" />
-				<action function="key">home</action>
-			</object>
-
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<placement x="%back_button_x%" y="%back_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text></text>
-				<image resource="back_icon" />
-				<condition var1="tw_busy" var2="0" />
-				<action function="key">back</action>
-			</object>
-
-			<object type="action">
-				<touch key="power" />
-				<action function="overlay">lock</action>
-			</object>
-
-			<object type="action">
-				<touch key="power+voldown" />
-				<action function="screenshot" />
-			</object>
-		</template>
-
-		<template name="progress_bar">
-			<object type="progressbar">
-				<placement x="%col_progressbar_x%" y="%row_progressbar_y%" />
-				<resource empty="progress_empty" full="progress_full" />
-				<data name="ui_progress" />
-			</object>
-
-			<object type="animation">
-				<placement x="%col_progressbar_x%" y="%row_progressbar_y%" />
-				<resource name="progress" />
-				<speed fps="15" render="2" />
-				<loop frame="1" />
-			</object>
-		</template>
-
-		<template name="sort_options">
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="%sort_text_x%" y="%sort_asc_text_y%" />
-				<text>Sort Ascending:</text>
-			</object>
-
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<placement x="%sort_col1_button_x%" y="%sort_asc_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Name</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=1</action>
-			</object>
-
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<placement x="%sort_col2_button_x%" y="%sort_asc_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Date</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=2</action>
-			</object>
-
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<placement x="%sort_col3_button_x%" y="%sort_asc_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Size</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=3</action>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="%sort_text_x%" y="%sort_desc_text_y%" />
-				<text>Sort Descending:</text>
-			</object>
-
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<placement x="%sort_col1_button_x%" y="%sort_desc_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Name</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=-1</action>
-			</object>
-
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<placement x="%sort_col2_button_x%" y="%sort_desc_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Date</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=-2</action>
-			</object>
-
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<placement x="%sort_col3_button_x%" y="%sort_desc_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Size</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=-3</action>
-			</object>
-		</template>
-
-		<template name="action_page_console">
-			<object type="console">
-				<placement x="0" y="%row2_y%" w="720" h="470" />
-				<color foreground="%console_foreground%" background="%console_background%" scroll="%console_scroll%" />
-				<font resource="fixed" />
-			</object>
-		</template>
-
-		<template name="footer">
-			<object type="console">
-				<slideout resource="slideout" x="325" y="1220" />
-				<placement x="%console_x%" y="0" w="%console_width%" h="1220" />
-				<color foreground="%console_foreground%" background="%console_background%" scroll="%console_scroll%" />
-				<font resource="fixed" />
-			</object>
-		</template>
-
-		<template name="keyboardtemplate">
-			<object type="keyboard">
-				<placement x="0" y="800" />
-				<layout resource1="keyboard1" resource2="keyboard2" resource3="keyboard3" resource4="keyboard4" />
-				<highlight color="%highlight_color%" />
-				<capshighlight color="%caps_highlight_color%" />
-				<layout1>
-					<keysize height="106" width="72" />
-					<row1 key01="q" long01="1" key02="w" long02="2" key03="e" long03="3" key04="r" long04="4" key05="t" long05="5" key06="y" long06="6" key07="u" long07="7" key08="i" long08="8" key09="o" long09="9" key10="p" long10="0" />
-					<row2 key01="108:a" key02="s" key03="d" key04="f" key05="g" key06="h" key07="j" key08="k" key09="108:l" />
-					<row3 key01="108:layout2" key02="z" key03="x" key04="c" key05="v" key06="b" key07="n" key08="m" key09="108:c:8" />
-					<row4 key01="100:layout3" key02="130:" key03="260: " key04="65:." key05="165:a:action" />
-				</layout1>
-				<layout2>
-					<keysize height="106" width="72" capslock="0" revert_layout="1" />
-					<row1 key01="Q" long01="1" key02="W" long02="2" key03="E" long03="3" key04="R" long04="4" key05="T" long05="5" key06="Y" long06="6" key07="U" long07="7" key08="I" long08="8" key09="O" long09="9" key10="P" long10="0" />
-					<row2 key01="108:A" key02="S" key03="D" key04="F" key05="G" key06="H" key07="J" key08="K" key09="108:L" />
-					<row3 key01="108:layout1" key02="Z" key03="X" key04="C" key05="V" key06="B" key07="N" key08="M" key09="108:c:8" />
-					<row4 key01="100:layout3" key02="130:" key03="260: " key04="65:." key05="165:action" />
-				</layout2>
-				<layout3>
-					<keysize height="106" width="72" />
-					<row1 key01="1" key02="2" key03="3" key04="4" key05="5" key06="6" key07="7" key08="8" key09="9" key10="0" />
-					<row2 key01="@" key02="#" key03="$" key04="%" key05="&amp;" key06="*" key07="-" key08="+" key09="(" key10=")" />
-					<row3 key01="108:layout4" key02="!" key03="72:c:34" key04="'" key05=":" key06=";" key07="/" key08="?" key09="108:c:8" />
-					<row4 key01="100:layout1" key02="65:" key03="65:," key04="260: " key05="65:." key06="165:action" />
-				</layout3>
-				<layout4>
-					<keysize height="106" width="72" />
-					<row1 key01="~" key02="`" key03="|" key04="72:" key05="72:" key06="72:" key07="%" key08="72:" key09="{" key10="}" />
-					<row2 key01="72:" key02="72:" key03="72:" key04="72:" key05="72:" key06="^" key07="_" key08="=" key09="[" key10="]" />
-					<row3 key01="108:layout3" key02="72:" key03="72:" key04="72:" key05="72:" key06="\" key07="&lt;" key08="&gt;" key09="108:c:8" />
-					<row4 key01="100:layout1" key02="65:" key03="65:c:34" key04="260: " key05="65:." key06="165:action" />
-				</layout4>
-			</object>
-		</template>
-	</templates>
-</recovery>
diff --git a/gui/devices/800x1280/res/fonts/Roboto-Condensed-30.dat b/gui/devices/800x1280/res/fonts/Roboto-Condensed-30.dat
deleted file mode 100644
index 621b332..0000000
--- a/gui/devices/800x1280/res/fonts/Roboto-Condensed-30.dat
+++ /dev/null
Binary files differ
diff --git a/gui/devices/800x1280/res/images/back-icon.png b/gui/devices/800x1280/res/images/back-icon.png
deleted file mode 100644
index e0c0442..0000000
--- a/gui/devices/800x1280/res/images/back-icon.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/800x1280/res/images/checkbox_checked.png b/gui/devices/800x1280/res/images/checkbox_checked.png
deleted file mode 100644
index 2af7609..0000000
--- a/gui/devices/800x1280/res/images/checkbox_checked.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/800x1280/res/images/checkbox_empty.png b/gui/devices/800x1280/res/images/checkbox_empty.png
deleted file mode 100644
index 5f65c26..0000000
--- a/gui/devices/800x1280/res/images/checkbox_empty.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/800x1280/res/images/cursor.png b/gui/devices/800x1280/res/images/cursor.png
deleted file mode 100644
index 32c8ae1..0000000
--- a/gui/devices/800x1280/res/images/cursor.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/800x1280/res/images/curtain.jpg b/gui/devices/800x1280/res/images/curtain.jpg
deleted file mode 100644
index b21df31..0000000
--- a/gui/devices/800x1280/res/images/curtain.jpg
+++ /dev/null
Binary files differ
diff --git a/gui/devices/800x1280/res/images/file.png b/gui/devices/800x1280/res/images/file.png
deleted file mode 100644
index aea3ac2..0000000
--- a/gui/devices/800x1280/res/images/file.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/800x1280/res/images/folder.png b/gui/devices/800x1280/res/images/folder.png
deleted file mode 100644
index 56f4bc2..0000000
--- a/gui/devices/800x1280/res/images/folder.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/800x1280/res/images/home-icon.png b/gui/devices/800x1280/res/images/home-icon.png
deleted file mode 100644
index d4373b7..0000000
--- a/gui/devices/800x1280/res/images/home-icon.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/800x1280/res/images/indeterminate001.png b/gui/devices/800x1280/res/images/indeterminate001.png
deleted file mode 100644
index e6fa1c5..0000000
--- a/gui/devices/800x1280/res/images/indeterminate001.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/800x1280/res/images/indeterminate002.png b/gui/devices/800x1280/res/images/indeterminate002.png
deleted file mode 100644
index e1fceab..0000000
--- a/gui/devices/800x1280/res/images/indeterminate002.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/800x1280/res/images/indeterminate003.png b/gui/devices/800x1280/res/images/indeterminate003.png
deleted file mode 100644
index 6702867..0000000
--- a/gui/devices/800x1280/res/images/indeterminate003.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/800x1280/res/images/indeterminate004.png b/gui/devices/800x1280/res/images/indeterminate004.png
deleted file mode 100644
index ff65e09..0000000
--- a/gui/devices/800x1280/res/images/indeterminate004.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/800x1280/res/images/indeterminate005.png b/gui/devices/800x1280/res/images/indeterminate005.png
deleted file mode 100644
index e61e2cc..0000000
--- a/gui/devices/800x1280/res/images/indeterminate005.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/800x1280/res/images/indeterminate006.png b/gui/devices/800x1280/res/images/indeterminate006.png
deleted file mode 100644
index c9c21ba..0000000
--- a/gui/devices/800x1280/res/images/indeterminate006.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/800x1280/res/images/keyboard1.png b/gui/devices/800x1280/res/images/keyboard1.png
deleted file mode 100755
index 17205c8..0000000
--- a/gui/devices/800x1280/res/images/keyboard1.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/800x1280/res/images/keyboard2.png b/gui/devices/800x1280/res/images/keyboard2.png
deleted file mode 100755
index e4f5c36..0000000
--- a/gui/devices/800x1280/res/images/keyboard2.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/800x1280/res/images/keyboard3.png b/gui/devices/800x1280/res/images/keyboard3.png
deleted file mode 100755
index 7214ff3..0000000
--- a/gui/devices/800x1280/res/images/keyboard3.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/800x1280/res/images/keyboard4.png b/gui/devices/800x1280/res/images/keyboard4.png
deleted file mode 100755
index efe6dc6..0000000
--- a/gui/devices/800x1280/res/images/keyboard4.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/800x1280/res/images/medium-button.png b/gui/devices/800x1280/res/images/medium-button.png
deleted file mode 100644
index 207faef..0000000
--- a/gui/devices/800x1280/res/images/medium-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/800x1280/res/images/menu-button.png b/gui/devices/800x1280/res/images/menu-button.png
deleted file mode 100644
index 0642f38..0000000
--- a/gui/devices/800x1280/res/images/menu-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/800x1280/res/images/minus-button.png b/gui/devices/800x1280/res/images/minus-button.png
deleted file mode 100644
index 7b5f79f..0000000
--- a/gui/devices/800x1280/res/images/minus-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/800x1280/res/images/plus-button.png b/gui/devices/800x1280/res/images/plus-button.png
deleted file mode 100644
index b328577..0000000
--- a/gui/devices/800x1280/res/images/plus-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/800x1280/res/images/progress_empty.png b/gui/devices/800x1280/res/images/progress_empty.png
deleted file mode 100644
index b853710..0000000
--- a/gui/devices/800x1280/res/images/progress_empty.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/800x1280/res/images/progress_fill.png b/gui/devices/800x1280/res/images/progress_fill.png
deleted file mode 100644
index 669c6ef..0000000
--- a/gui/devices/800x1280/res/images/progress_fill.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/800x1280/res/images/radio_empty.png b/gui/devices/800x1280/res/images/radio_empty.png
deleted file mode 100644
index 88d1c1f..0000000
--- a/gui/devices/800x1280/res/images/radio_empty.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/800x1280/res/images/radio_selected.png b/gui/devices/800x1280/res/images/radio_selected.png
deleted file mode 100644
index 864065d..0000000
--- a/gui/devices/800x1280/res/images/radio_selected.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/800x1280/res/images/slideout.png b/gui/devices/800x1280/res/images/slideout.png
deleted file mode 100644
index c3c65e4..0000000
--- a/gui/devices/800x1280/res/images/slideout.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/800x1280/res/images/slider-touch.png b/gui/devices/800x1280/res/images/slider-touch.png
deleted file mode 100644
index 83fce08..0000000
--- a/gui/devices/800x1280/res/images/slider-touch.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/800x1280/res/images/slider-used.png b/gui/devices/800x1280/res/images/slider-used.png
deleted file mode 100644
index 4e4a1f4..0000000
--- a/gui/devices/800x1280/res/images/slider-used.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/800x1280/res/images/slider.png b/gui/devices/800x1280/res/images/slider.png
deleted file mode 100644
index 118edc6..0000000
--- a/gui/devices/800x1280/res/images/slider.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/800x1280/res/images/sort-button.png b/gui/devices/800x1280/res/images/sort-button.png
deleted file mode 100644
index 125c2ce..0000000
--- a/gui/devices/800x1280/res/images/sort-button.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/800x1280/res/images/top-bar.jpg b/gui/devices/800x1280/res/images/top-bar.jpg
deleted file mode 100644
index 265b717..0000000
--- a/gui/devices/800x1280/res/images/top-bar.jpg
+++ /dev/null
Binary files differ
diff --git a/gui/devices/800x1280/res/images/unlock.png b/gui/devices/800x1280/res/images/unlock.png
deleted file mode 100644
index 9041221..0000000
--- a/gui/devices/800x1280/res/images/unlock.png
+++ /dev/null
Binary files differ
diff --git a/gui/devices/800x1280/res/ui.xml b/gui/devices/800x1280/res/ui.xml
deleted file mode 100644
index fc9da12..0000000
--- a/gui/devices/800x1280/res/ui.xml
+++ /dev/null
@@ -1,416 +0,0 @@
-<?xml version="1.0"?>
-
-<recovery>
-	<details>
-		<resolution width="800" height="1280" />
-		<author>TeamWin</author>
-		<title>Backup Naowz</title>
-		<description>Default basic theme</description>
-		<preview>preview.jpg</preview>
-	</details>
-
-	<include>
-		<xmlfile name="portrait.xml" />
-	</include>
-
-	<resources>
-		<resource name="font" type="font" filename="RobotoCondensed-Regular.ttf" size="30" fallback="Roboto-Condensed-30" />
-		<resource name="mediumfont" type="font" filename="RobotoCondensed-Regular.ttf" size="30" fallback="Roboto-Condensed-30" />
-		<resource name="filelist" type="font" filename="RobotoCondensed-Regular.ttf" size="30" fallback="Roboto-Condensed-30" />
-		<resource name="top_bar" type="image" filename="top-bar.jpg" />
-		<resource name="main_button" type="image" filename="menu-button" />
-		<resource name="file_icon" type="image" filename="file" />
-		<resource name="folder_icon" type="image" filename="folder" />
-		<resource name="slideout" type="image" filename="slideout" />
-		<resource name="progress" type="animation" filename="indeterminate" />
-		<resource name="progress_empty" type="image" filename="progress_empty" />
-		<resource name="progress_full" type="image" filename="progress_fill" />
-		<resource name="checkbox_false" type="image" filename="checkbox_empty" retainaspect="1" />
-		<resource name="checkbox_true" type="image" filename="checkbox_checked" retainaspect="1" />
-		<resource name="radio_false" type="image" filename="radio_empty" retainaspect="1" />
-		<resource name="radio_true" type="image" filename="radio_selected" retainaspect="1" />
-		<resource name="medium_button" type="image" filename="medium-button" />
-		<resource name="sort_button" type="image" filename="sort-button" />
-		<resource name="minus_button" type="image" filename="minus-button" />
-		<resource name="plus_button" type="image" filename="plus-button" />
-		<resource name="home_icon" type="image" filename="home-icon" />
-		<resource name="back_icon" type="image" filename="back-icon" />
-		<resource name="slider" type="image" filename="slider" />
-		<resource name="slider-used" type="image" filename="slider-used" />
-		<resource name="slider-touch" type="image" filename="slider-touch" />
-		<resource name="unlock-icon" type="image" filename="unlock" />
-		<resource name="keyboard1" type="image" filename="keyboard1" />
-		<resource name="keyboard2" type="image" filename="keyboard2" />
-		<resource name="keyboard3" type="image" filename="keyboard3" />
-		<resource name="keyboard4" type="image" filename="keyboard4" />
-		<resource name="cursor" type="image" filename="cursor" retainaspect="1" />
-	</resources>
-
-	<variables>
-		<variable name="col1_x" value="10" />
-		<variable name="col2_x" value="415" />
-		<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="row_queue_y" value="710" />
-		<variable name="row1_header_y" value="131" />
-		<variable name="text_row_height" value="50" />
-		<variable name="row1_text_y" value="170" />
-		<variable name="row2_text_y" value="%row1_text_y%+%text_row_height%" />
-		<variable name="row3_text_y" value="%row2_text_y%+%text_row_height%" />
-		<variable name="row4_text_y" value="%row3_text_y%+%text_row_height%" />
-		<variable name="row5_text_y" value="%row4_text_y%+%text_row_height%" />
-		<variable name="row6_text_y" value="%row5_text_y%+%text_row_height%" />
-		<variable name="row7_text_y" value="%row6_text_y%+%text_row_height%" />
-		<variable name="row8_text_y" value="%row7_text_y%+%text_row_height%" />
-		<variable name="row9_text_y" value="%row8_text_y%+%text_row_height%" />
-		<variable name="row10_text_y" value="%row9_text_y%+%text_row_height%" />
-		<variable name="row11_text_y" value="%row10_text_y%+%text_row_height%" />
-		<variable name="row12_text_y" value="%row11_text_y%+%text_row_height%" />
-		<variable name="row13_text_y" value="%row12_text_y%+%text_row_height%" />
-		<variable name="row14_text_y" value="%row13_text_y%+%text_row_height%" />
-		<variable name="row15_text_y" value="%row14_text_y%+%text_row_height%" />
-		<variable name="row16_text_y" value="%row15_text_y%+%text_row_height%" />
-		<variable name="row17_text_y" value="%row16_text_y%+%text_row_height%" />
-		<variable name="row18_text_y" value="%row17_text_y%+%text_row_height%" />
-		<variable name="zip_status_y" value="640" />
-		<variable name="flash_list_height" value="330" />
-		<variable name="tz_selected_y" value="160" />
-		<variable name="tz_set_y" value="955" />
-		<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="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" />
-		<variable name="row4_medium_y" value="430" />
-		<variable name="row5_medium_y" value="530" />
-		<variable name="row6_medium_y" value="840" />
-		<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="1096" />
-		<variable name="button_text_color" value="#AAAAAA" />
-		<variable name="text_color" value="#FFFFFF" />
-		<variable name="text_success_color" value="#33B5E5" />
-		<variable name="text_fail_color" value="#FF0101" />
-		<variable name="highlight_color" value="#90909080" />
-		<variable name="caps_highlight_color" value="#33B5E580" />
-		<variable name="home_button_x" value="50" />
-		<variable name="home_button_y" value="1226" />
-		<variable name="back_button_x" value="666" />
-		<variable name="back_button_y" value="1226" />
-		<variable name="sort_text_x" value="85" />
-		<variable name="sort_asc_text_y" value="1090" />
-		<variable name="sort_asc_button_y" value="1080" />
-		<variable name="sort_desc_text_y" value="1150" />
-		<variable name="sort_desc_button_y" value="1140" />
-		<variable name="sort_col1_button_x" value="330" />
-		<variable name="sort_col2_button_x" value="430" />
-		<variable name="sort_col3_button_x" value="530" />
-		<variable name="input_width" value="750" />
-		<variable name="input_height" value="50" />
-		<variable name="input_background_color" value="#303030" />
-		<variable name="input_cursor_color" value="#33B5E5" />
-		<variable name="input_cursor_width" value="3" />
-		<variable name="console_x" value="0" />
-		<variable name="console_width" value="800" />
-		<variable name="console_foreground" value="#A0A0A0" />
-		<variable name="warning" value="#F8F8A0" />
-		<variable name="error" value="#FF4040" />
-		<variable name="highlight" value="#33B5E5" />
-		<variable name="console_background" value="#303030" />
-		<variable name="console_scroll" value="#303030" />
-		<variable name="console_action_height" value="470" />
-		<variable name="console_install_height" value="600" />
-		<variable name="console_installdone_height" value="440" />
-		<variable name="fileselector_x" value="5" />
-		<variable name="fileselector_width" value="790" />
-		<variable name="fileselector_install_height" value="750" />
-		<variable name="fileselector_header_background" value="#202020" />
-		<variable name="fileselector_header_textcolor" value="#AAAAAA" />
-		<variable name="fileselector_header_separatorcolor" value="#33B5E5" />
-		<variable name="fileselector_header_separatorheight" value="3" />
-		<variable name="fileselector_separatorcolor" value="#505050" />
-		<variable name="fileselector_separatorheight" value="2" />
-		<variable name="fileselector_background" value="#303030" />
-		<variable name="fileselector_highlight_color" value="#505050" />
-		<variable name="fileselector_highlight_font_color" value="#33B5E5" />
-		<variable name="fileselector_spacing" value="36"/>
-		<variable name="fastscroll_linecolor" value="#50505080" />
-		<variable name="fastscroll_rectcolor" value="#33B5E580" />
-		<variable name="fastscroll_w" value="60" />
-		<variable name="fastscroll_linew" value="2" />
-		<variable name="fastscroll_rectw" value="16" />
-		<variable name="fastscroll_recth" value="40" />
-		<variable name="listbox_x" value="5" />
-		<variable name="listbox_width" value="790" />
-		<variable name="listbox_tz_height" value="580" />
-		<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="115" />
-		<variable name="sdext_text_y" value="190" />
-		<variable name="sdswap_button_y" value="260" />
-		<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" />
-		<variable name="lock_y" value="400" />
-		<variable name="filemanager_select_x" value="320" />
-		<variable name="filemanager_select_y" value="950" />
-		<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="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" />
-		<variable name="button_fill_color" value="#303030" />
-		<variable name="button_fill_full_width" value="780" />
-		<variable name="button_fill_main_width" value="375" />
-		<variable name="button_fill_main_height" value="240" />
-		<variable name="button_fill_half_height" value="120" />
-		<variable name="button_fill_quarter_height" value="54" />
-		<variable name="backup_list_height" value="520" />
-		<variable name="backup_button_row1" value="745" />
-		<variable name="backup_button_row2" value="810" />
-		<variable name="mount_list_height" value="690" />
-		<variable name="mount_storage_row" value="830" />
-		<variable name="storage_list_height" value="775" />
-		<variable name="wipe_list_height" value="670" />
-		<variable name="wipe_button_row1" value="900" />
-		<variable name="wipe_button_y" value="650" />
-		<variable name="slidervalue_w" value="780" />
-		<variable name="slidervalue_line_clr" value="#FFFFFF" />
-		<variable name="slidervalue_slider_clr" value="#33B5E5" />
-		<variable name="slidervalue_lineh" value="2" />
-		<variable name="slidervalue_padding" value="20" />
-		<variable name="slidervalue_sliderw" value="10" />
-		<variable name="slidervalue_sliderh" value="60" />
-	</variables>
-
-	<mousecursor>
-		<placement w="15" h="15" />
-		<background color="#FFFF00FF" resource="cursor" />
-		<speed multiplier="2.5" />
-	</mousecursor>
-
-	<templates>
-		<template name="header">
-			<background color="#000000FF" />
-
-			<object type="image">
-				<image resource="top_bar" />
-				<placement x="0" y="0" />
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="120" y="10" />
-				<text>Team Win Recovery Project  v%tw_version%</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<condition var1="tw_simulate_actions" var2="1" />
-				<font resource="font" />
-				<placement x="120" y="45" />
-				<text>SIMULATING ACTIONS</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="120" y="76" />
-				<text>%tw_time%</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="270" y="76" />
-				<conditions>
-					<condition var1="tw_no_battery_percent" var2="0" />
-					<condition var1="tw_battery" op="&gt;" var2="0" />
-					<condition var1="tw_battery" op="&lt;" var2="101" />
-				</conditions>
-				<text>Battery: %tw_battery%</text>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="420" y="76" />
-				<conditions>
-					<condition var1="tw_no_cpu_temp" var2="0" />
-				</conditions>
-				<text>CPU: %tw_cpu_temp% C</text>
-			</object>
-
-			<object type="button">
-				<placement x="%home_button_x%" y="%home_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text></text>
-				<image resource="home_icon" />
-				<condition var1="tw_busy" var2="0" />
-				<action function="key">home</action>
-			</object>
-
-			<object type="button">
-				<placement x="%back_button_x%" y="%back_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text></text>
-				<image resource="back_icon" />
-				<condition var1="tw_busy" var2="0" />
-				<action function="key">back</action>
-			</object>
-
-			<object type="action">
-				<touch key="power" />
-				<action function="overlay">lock</action>
-			</object>
-
-			<object type="action">
-				<touch key="power+voldown" />
-				<action function="screenshot" />
-			</object>
-		</template>
-
-		<template name="progress_bar">
-			<object type="progressbar">
-				<placement x="%col_progressbar_x%" y="%row_progressbar_y%" />
-				<resource empty="progress_empty" full="progress_full" />
-				<data name="ui_progress" />
-			</object>
-
-			<object type="animation">
-				<placement x="%col_progressbar_x%" y="%row_progressbar_y%" />
-				<resource name="progress" />
-				<speed fps="15" render="2" />
-				<loop frame="1" />
-			</object>
-		</template>
-
-		<template name="sort_options">
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<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="font" color="%button_text_color%" />
-				<text>Name</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=1</action>
-			</object>
-
-			<object type="button">
-				<placement x="%sort_col2_button_x%" y="%sort_asc_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Date</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=2</action>
-			</object>
-
-			<object type="button">
-				<placement x="%sort_col3_button_x%" y="%sort_asc_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Size</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=3</action>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<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="font" color="%button_text_color%" />
-				<text>Name</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=-1</action>
-			</object>
-
-			<object type="button">
-				<placement x="%sort_col2_button_x%" y="%sort_desc_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Date</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=-2</action>
-			</object>
-
-			<object type="button">
-				<placement x="%sort_col3_button_x%" y="%sort_desc_button_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Size</text>
-				<image resource="sort_button" />
-				<action function="set">tw_gui_sort_order=-3</action>
-			</object>
-		</template>
-
-		<template name="action_page_console">
-			<object type="console">
-				<placement x="0" y="%row3_text_y%" w="800" h="600" />
-				<color foreground="%console_foreground%" background="%console_background%" scroll="%console_scroll%" />
-				<font resource="fixed" />
-			</object>
-		</template>
-
-		<template name="footer">
-			<object type="console">
-				<slideout resource="slideout" x="355" y="1220" />
-				<placement x="%console_x%" y="0" w="%console_width%" h="1220" />
-				<color foreground="%console_foreground%" background="%console_background%" scroll="%console_scroll%" />
-				<font resource="fixed" />
-			</object>
-		</template>
-
-		<template name="keyboardtemplate">
-			<object type="keyboard">
-				<placement x="0" y="740" />
-				<layout resource1="keyboard1" resource2="keyboard2" resource3="keyboard3" resource4="keyboard4" />
-				<highlight color="%highlight_color%" />
-				<capshighlight color="%caps_highlight_color%" />
-				<layout1>
-					<keysize height="115" width="80" />
-					<row1 key01="q" long01="1" key02="w" long02="2" key03="e" long03="3" key04="r" long04="4" key05="t" long05="5" key06="y" long06="6" key07="u" long07="7" key08="i" long08="8" key09="o" long09="9" key10="p" long10="0" />
-					<row2 key01="117:a" key02="s" key03="d" key04="f" key05="g" key06="h" key07="j" key08="k" key09="123:l" />
-					<row3 key01="117:layout2" key02="z" key03="x" key04="c" key05="v" key06="b" key07="n" key08="m" key09="123:c:8" />
-					<row4 key01="117:layout3" key02="80:" key03="400: " key04="80:." key05="123:a:action" />
-				</layout1>
-				<layout2>
-					<keysize height="116" width="80" capslock="0" revert_layout="1" />
-					<row1 key01="Q" long01="1" key02="W" long02="2" key03="E" long03="3" key04="R" long04="4" key05="T" long05="5" key06="Y" long06="6" key07="U" long07="7" key08="I" long08="8" key09="O" long09="9" key10="P" long10="0" />
-					<row2 key01="117:A" key02="S" key03="D" key04="F" key05="G" key06="H" key07="J" key08="K" key09="123:L" />
-					<row3 key01="117:layout1" key02="Z" key03="X" key04="C" key05="V" key06="B" key07="N" key08="M" key09="123:c:8" />
-					<row4 key01="117:layout3" key02="80:," key03="400: " key04="80:." key05="123:action" />
-				</layout2>
-				<layout3>
-					<keysize height="115" width="80" />
-					<row1 key01="1" key02="2" key03="3" key04="4" key05="5" key06="6" key07="7" key08="8" key09="9" key10="0" />
-					<row2 key01="@" key02="#" key03="$" key04="%" key05="&amp;" key06="*" key07="-" key08="+" key09="(" key10=")" />
-					<row3 key01="117:layout4" key02="!" key03="80:c:34" key04="'" key05=":" key06=";" key07="/" key08="?" key09="123:c:8" />
-					<row4 key01="117:layout1" key02="80:," key03="400: " key04="80:." key05="123:action" />
-				</layout3>
-				<layout4>
-					<keysize height="116" width="80" />
-					<row1 key01="~" key02="`" key03="|" key04="80:" key05="80:" key06="80:" key07="80:" key08="80:" key09="{" key10="}" />
-					<row2 key01="80:" key02="80:" key03="80:" key04="80:" key05="80:" key06="^" key07="_" key08="=" key09="[" key10="]" />
-					<row3 key01="117:layout3" key02="80:" key03="80:" key04="80:" key05="80:" key06="\" key07="&lt;" key08="&gt;" key09="123:c:8" />
-					<row4 key01="117:layout1" key02="80:" key03="400: " key04="80:" key05="123:action" />
-				</layout4>
-			</object>
-		</template>
-	</templates>
-</recovery>
diff --git a/gui/devices/800x480/res/images/background.jpg b/gui/devices/800x480/res/images/background.jpg
deleted file mode 100644
index af82531..0000000
--- a/gui/devices/800x480/res/images/background.jpg
+++ /dev/null
Binary files differ
diff --git a/gui/devices/800x480/res/images/twrplogo.png b/gui/devices/800x480/res/images/twrplogo.png
new file mode 100644
index 0000000..309012f
--- /dev/null
+++ b/gui/devices/800x480/res/images/twrplogo.png
Binary files differ
diff --git a/gui/devices/800x480/res/ui.xml b/gui/devices/800x480/res/ui.xml
index 436732a..49c2475 100644
--- a/gui/devices/800x480/res/ui.xml
+++ b/gui/devices/800x480/res/ui.xml
@@ -15,10 +15,10 @@
 
 	<resources>
 		<resource name="font" type="font" filename="RobotoCondensed-Regular.ttf" size="16" fallback="Roboto-Condensed-16" />
-		<resource name="base" type="image" filename="background.jpg" />
+		<resource name="twrplogo" type="image" filename="twrplogo" retainaspect="1" />
 		<resource name="main_button" type="image" filename="button" />
-		<resource name="file_icon" type="image" filename="file" />
-		<resource name="folder_icon" type="image" filename="folder" />
+		<resource name="file_icon" type="image" filename="file" retainaspect="1" />
+		<resource name="folder_icon" type="image" filename="folder" retainaspect="1" />
 		<resource name="progress" type="animation" filename="indeterminate" />
 		<resource name="progress_empty" type="image" filename="progress_empty" />
 		<resource name="progress_full" type="image" filename="progress_fill" />
@@ -31,13 +31,13 @@
 		<resource name="sort_button" type="image" filename="sort-button" />
 		<resource name="minus_button" type="image" filename="minus-button" />
 		<resource name="plus_button" type="image" filename="plus-button" />
-		<resource name="home_icon" type="image" filename="home-icon" />
-		<resource name="back_icon" type="image" filename="back-icon" />
-		<resource name="console_button" type="image" filename="console-toggle" />
-		<resource name="slider" type="image" filename="slider" />
-		<resource name="slider-used" type="image" filename="slider-used" />
-		<resource name="slider-touch" type="image" filename="slider-touch" />
-		<resource name="unlock-icon" type="image" filename="unlock" />
+		<resource name="home_icon" type="image" filename="home-icon" retainaspect="1" />
+		<resource name="back_icon" type="image" filename="back-icon" retainaspect="1" />
+		<resource name="console_button" type="image" filename="console-toggle" retainaspect="1" />
+		<resource name="slider" type="image" filename="slider" retainaspect="1" />
+		<resource name="slider-used" type="image" filename="slider-used" retainaspect="1" />
+		<resource name="slider-touch" type="image" filename="slider-touch" retainaspect="1" />
+		<resource name="unlock-icon" type="image" filename="unlock" retainaspect="1" />
 		<resource name="keyboard1" type="image" filename="keyboard1" />
 		<resource name="keyboard2" type="image" filename="keyboard2" />
 		<resource name="keyboard3" type="image" filename="keyboard3" />
@@ -173,8 +173,7 @@
 		<variable name="listbox_background" value="#303030" />
 		<variable name="listbox_spacing" value="12" />
 		<variable name="sd_plus_x" value="280" />
-		<variable name="lock_x" value="250" />
-		<variable name="lock_y" value="90" />
+		<variable name="lock_y" value="150" />
 		<variable name="filemanager_select_x" value="610" />
 		<variable name="filemanager_select_y" value="413" />
 		<variable name="backup_name_text_y" value="440" />
@@ -226,20 +225,28 @@
 		<template name="header">
 			<background color="#000000FF" />
 
+			<object type="fill" color="%button_fill_color%">
+				<placement x="0" y="0" w="800" h="58" />
+			</object>
+
+			<object type="fill" color="%highlight%">
+				<placement x="0" y="58" w="800" h="2" />
+			</object>
+
 			<object type="image">
-				<image resource="base" />
-				<placement x="0" y="0" />
+				<image resource="twrplogo" />
+				<placement x="35" y="29" placement="4" />
 			</object>
 
 			<object type="text" color="%text_color%">
 				<font resource="font" />
-				<placement x="250" y="2" />
+				<placement x="70" y="2" />
 				<text>Team Win Recovery Project  v%tw_version%</text>
 			</object>
 
 			<object type="text" color="%text_color%">
 				<font resource="font" />
-				<placement x="250" y="37" />
+				<placement x="70" y="37" />
 				<conditions>
 					<condition var1="tw_no_battery_percent" var2="0" />
 					<condition var1="tw_battery" op="&gt;" var2="0" />
diff --git a/gui/devices/landscape/res/landscape.xml b/gui/devices/landscape/res/landscape.xml
index c05ab50..0a907cb 100644
--- a/gui/devices/landscape/res/landscape.xml
+++ b/gui/devices/landscape/res/landscape.xml
@@ -80,7 +80,7 @@
 		<style name="slider">
 			<text>Swipe to Confirm</text>
 			<font resource="font" color="%text_color%" />
-			<placement x="%slider_x%" y="%slider_y%" placement="5" />
+			<placement x="%center_x%" y="%slider_y%" placement="5" />
 			<resource base="slider" used="slider-used" touch="slider-touch" />
 		</style>
 
@@ -2771,7 +2771,7 @@
 
 			<object type="image">
 				<image resource="unlock-icon" />
-				<placement x="%lock_x%" y="%lock_y%" />
+				<placement x="%center_x%" y="%lock_y%" placement="4" />
 			</object>
 
 			<object type="slider">
diff --git a/gui/devices/portrait/res/portrait.xml b/gui/devices/portrait/res/portrait.xml
index beb076b..02e3a5a 100644
--- a/gui/devices/portrait/res/portrait.xml
+++ b/gui/devices/portrait/res/portrait.xml
@@ -75,7 +75,7 @@
 		<style name="slider">
 			<text>Swipe to Confirm</text>
 			<font resource="font" color="%text_color%" />
-			<placement x="%slider_x%" y="%slider_y%" placement="5" />
+			<placement x="%center_x%" y="%slider_y%" placement="5" />
 			<resource base="slider" used="slider-used" touch="slider-touch" />
 		</style>
 
@@ -2809,7 +2809,7 @@
 
 			<object type="image">
 				<image resource="unlock-icon" />
-				<placement x="%lock_x%" y="%lock_y%" />
+				<placement x="%center_x%" y="%lock_y%" placement="4" />
 			</object>
 
 			<object type="slider">
diff --git a/gui/devices/watch/res/watch.xml b/gui/devices/watch/res/watch.xml
index 00806f0..c40e981 100644
--- a/gui/devices/watch/res/watch.xml
+++ b/gui/devices/watch/res/watch.xml
@@ -75,7 +75,7 @@
 		<style name="slider">
 			<text>Swipe to Confirm</text>
 			<font resource="font" color="%text_color%" />
-			<placement x="%slider_x%" y="%slider_y%" placement="5" />
+			<placement x="%center_x%" y="%slider_y%" placement="5" />
 			<resource base="slider" used="slider-used" touch="slider-touch" />
 		</style>
 
@@ -2807,7 +2807,7 @@
 
 			<object type="image">
 				<image resource="unlock-icon" />
-				<placement x="%lock_x%" y="%lock_y%" />
+				<placement x="%center_x%" y="%lock_y%" placement="4" />
 			</object>
 
 			<object type="slider">
diff --git a/gui/gui.cpp b/gui/gui.cpp
index cd6f45d..3aef983 100644
--- a/gui/gui.cpp
+++ b/gui/gui.cpp
@@ -775,7 +775,7 @@
 
 	if (res_create_surface(curtain_path.c_str(), &source_Surface))
 	{
-		printf("Unable to locate '%s'\nDid you set a DEVICE_RESOLUTION in your config files?\n", curtain_path.c_str());
+		printf("Unable to locate '%s'\nDid you set a TW_THEME in your config files?\n", curtain_path.c_str());
 		return -1;
 	}
 	if (gr_get_width(source_Surface) != gr_fb_width() || gr_get_height(source_Surface) != gr_fb_height()) {
diff --git a/gui/slider.cpp b/gui/slider.cpp
index 2fd114d..a388447 100644
--- a/gui/slider.cpp
+++ b/gui/slider.cpp
@@ -68,6 +68,12 @@
 
 	mRenderW = sSlider->GetWidth();
 	mRenderH = sSlider->GetHeight();
+	if (TextPlacement == CENTER || TextPlacement == CENTER_X_ONLY) {
+		mRenderX = mRenderX - (mRenderW / 2);
+		if (TextPlacement == CENTER) {
+			mRenderY = mRenderY - (mRenderH / 2);
+		}
+	}
 	if (sSliderLabel) {
 		int sTextX = mRenderX + (mRenderW / 2);
 		int w, h;
diff --git a/minuitwrp/Android.mk b/minuitwrp/Android.mk
index cff5321..c9749eb 100644
--- a/minuitwrp/Android.mk
+++ b/minuitwrp/Android.mk
@@ -96,19 +96,36 @@
 ifneq ($(BOARD_USE_CUSTOM_RECOVERY_FONT),)
   LOCAL_CFLAGS += -DBOARD_USE_CUSTOM_RECOVERY_FONT=$(BOARD_USE_CUSTOM_RECOVERY_FONT)
 else
-  FONT_7x16 := 240x240 280x280 320x320 320x480
-  ROBOTO_10x18 := 480x800 480x854 540x960 800x480 1024x600 1024x768 1280x800
-  ROBOTO_15x24 := 720x1280 800x1280
-  ROBOTO_23x41 := 1080x1920 1200x1920 1440x2560 1600x2560 1920x1200 2560x1600
-  ifneq ($(filter $(DEVICE_RESOLUTION), $(FONT_7x16)),)
-    LOCAL_CFLAGS += -DBOARD_USE_CUSTOM_RECOVERY_FONT=\"font_7x16.h\"
-  else ifneq ($(filter $(DEVICE_RESOLUTION), $(ROBOTO_10x18)),)
-    LOCAL_CFLAGS += -DBOARD_USE_CUSTOM_RECOVERY_FONT=\"roboto_10x18.h\"
-  else ifneq ($(filter $(DEVICE_RESOLUTION), $(ROBOTO_15x24)),)
-    LOCAL_CFLAGS += -DBOARD_USE_CUSTOM_RECOVERY_FONT=\"roboto_15x24.h\"
-  else ifneq ($(filter $(DEVICE_RESOLUTION), $(ROBOTO_23x41)),)
-    LOCAL_CFLAGS += -DBOARD_USE_CUSTOM_RECOVERY_FONT=\"roboto_23x41.h\"
-  endif
+    ifeq ($(TW_THEME),)
+        # This converts the old DEVICE_RESOLUTION flag to the new TW_THEME flag
+        PORTRAIT_MDPI := 320x480 480x800 480x854 540x960
+        PORTRAIT_HDPI := 720x1280 800x1280 1080x1920 1200x1920 1440x2560 1600x2560
+        WATCH_MDPI := 240x240 280x280 320x320
+        LANDSCAPE_MDPI := 800x480 1024x600 1024x768
+        LANDSCAPE_HDPI := 1280x800 1920x1200 2560x1600
+        ifneq ($(filter $(DEVICE_RESOLUTION), $(PORTRAIT_MDPI)),)
+            TW_THEME := portrait_mdpi
+        else ifneq ($(filter $(DEVICE_RESOLUTION), $(PORTRAIT_HDPI)),)
+            TW_THEME := portrait_hdpi
+        else ifneq ($(filter $(DEVICE_RESOLUTION), $(WATCH_MDPI)),)
+            TW_THEME := watch_mdpi
+        else ifneq ($(filter $(DEVICE_RESOLUTION), $(LANDSCAPE_MDPI)),)
+            TW_THEME := landscape_mdpi
+        else ifneq ($(filter $(DEVICE_RESOLUTION), $(LANDSCAPE_HDPI)),)
+            TW_THEME := landscape_hdpi
+        endif
+    endif
+    ifeq ($(TW_THEME), portrait_mdpi)
+        LOCAL_CFLAGS += -DBOARD_USE_CUSTOM_RECOVERY_FONT=\"roboto_10x18.h\"
+    else ifeq ($(TW_THEME), portrait_hdpi)
+        LOCAL_CFLAGS += -DBOARD_USE_CUSTOM_RECOVERY_FONT=\"roboto_15x24.h\"
+    else ifeq ($(TW_THEME), watch_mdpi)
+        LOCAL_CFLAGS += -DBOARD_USE_CUSTOM_RECOVERY_FONT=\"font_7x16.h\"
+    else ifeq ($(TW_THEME), landscape_mdpi)
+        LOCAL_CFLAGS += -DBOARD_USE_CUSTOM_RECOVERY_FONT=\"roboto_10x18.h\"
+    else ifeq ($(TW_THEME), landscape_hdpi)
+        LOCAL_CFLAGS += -DBOARD_USE_CUSTOM_RECOVERY_FONT=\"roboto_15x24.h\"
+    endif
 endif
 
 ifneq ($(TW_WHITELIST_INPUT),)