38 files changed, 3 insertions, 422 deletions

diff --git a/gui/Android.mk b/gui/Android.mk
index 2acbc92c8..fa40e0fae 100644
--- a/gui/Android.mk
+++ b/gui/Android.mk
@@ -96,12 +96,10 @@ TWRP_RES_LOC := $(commands_recovery_local_path)/gui/devices/common/res
 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
 	TWRP_THEME_LOC := $(commands_recovery_local_path)/gui/devices/$(DEVICE_RESOLUTION)/res
-	ifneq ($(filter $(DEVICE_RESOLUTION), $(PORTRAIT)),)
+	ifneq ($(filter $(DEVICE_RESOLUTION), 320x480 480x800 480x854 540x960 720x1280 800x1280 1080x1920 1200x1920 1600x2560),)
 		TWRP_COMMON_XML := cp -fr $(commands_recovery_local_path)/gui/devices/portrait/res/* $(TARGET_RECOVERY_ROOT_OUT)/res/
-	else ifneq ($(filter $(DEVICE_RESOLUTION), $(LANDSCAPE)),)
+	else ifneq ($(filter $(DEVICE_RESOLUTION), 800x480 1024x600 1024x768 1280x800 1920x1200 2560x1600),)
 		TWRP_COMMON_XML := cp -fr $(commands_recovery_local_path)/gui/devices/landscape/res/* $(TARGET_RECOVERY_ROOT_OUT)/res/
 	endif
 else
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 ae9c0f64d..000000000
--- a/gui/devices/1440x2560/res/fonts/Roboto-Condensed-50.dat
+++ /dev/null
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 439ec19a7..000000000
--- a/gui/devices/1440x2560/res/images/back-icon.png
+++ /dev/null
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 65d0b34da..000000000
--- a/gui/devices/1440x2560/res/images/checkbox_checked.png
+++ /dev/null
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 89b4c9627..000000000
--- a/gui/devices/1440x2560/res/images/checkbox_empty.png
+++ /dev/null
diff --git a/gui/devices/1440x2560/res/images/cursor.png b/gui/devices/1440x2560/res/images/cursor.png
deleted file mode 100644
index 32c8ae1ca..000000000
--- a/gui/devices/1440x2560/res/images/cursor.png
+++ /dev/null
diff --git a/gui/devices/1440x2560/res/images/curtain.jpg b/gui/devices/1440x2560/res/images/curtain.jpg
deleted file mode 100644
index c168882d5..000000000
--- a/gui/devices/1440x2560/res/images/curtain.jpg
+++ /dev/null
diff --git a/gui/devices/1440x2560/res/images/file.png b/gui/devices/1440x2560/res/images/file.png
deleted file mode 100644
index a69b61996..000000000
--- a/gui/devices/1440x2560/res/images/file.png
+++ /dev/null
diff --git a/gui/devices/1440x2560/res/images/folder.png b/gui/devices/1440x2560/res/images/folder.png
deleted file mode 100644
index fbea7a970..000000000
--- a/gui/devices/1440x2560/res/images/folder.png
+++ /dev/null
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 b9e40393c..000000000
--- a/gui/devices/1440x2560/res/images/home-icon.png
+++ /dev/null
diff --git a/gui/devices/1440x2560/res/images/indeterminate001.png b/gui/devices/1440x2560/res/images/indeterminate001.png
deleted file mode 100644
index f5e164698..000000000
--- a/gui/devices/1440x2560/res/images/indeterminate001.png
+++ /dev/null
diff --git a/gui/devices/1440x2560/res/images/indeterminate002.png b/gui/devices/1440x2560/res/images/indeterminate002.png
deleted file mode 100644
index c841fb449..000000000
--- a/gui/devices/1440x2560/res/images/indeterminate002.png
+++ /dev/null
diff --git a/gui/devices/1440x2560/res/images/indeterminate003.png b/gui/devices/1440x2560/res/images/indeterminate003.png
deleted file mode 100644
index 651f9e7e3..000000000
--- a/gui/devices/1440x2560/res/images/indeterminate003.png
+++ /dev/null
diff --git a/gui/devices/1440x2560/res/images/indeterminate004.png b/gui/devices/1440x2560/res/images/indeterminate004.png
deleted file mode 100644
index 21e9fca04..000000000
--- a/gui/devices/1440x2560/res/images/indeterminate004.png
+++ /dev/null
diff --git a/gui/devices/1440x2560/res/images/indeterminate005.png b/gui/devices/1440x2560/res/images/indeterminate005.png
deleted file mode 100644
index 1dd0172f8..000000000
--- a/gui/devices/1440x2560/res/images/indeterminate005.png
+++ /dev/null
diff --git a/gui/devices/1440x2560/res/images/indeterminate006.png b/gui/devices/1440x2560/res/images/indeterminate006.png
deleted file mode 100644
index 4e5803baa..000000000
--- a/gui/devices/1440x2560/res/images/indeterminate006.png
+++ /dev/null
diff --git a/gui/devices/1440x2560/res/images/keyboard1.png b/gui/devices/1440x2560/res/images/keyboard1.png
deleted file mode 100644
index 400f62db7..000000000
--- a/gui/devices/1440x2560/res/images/keyboard1.png
+++ /dev/null
diff --git a/gui/devices/1440x2560/res/images/keyboard2.png b/gui/devices/1440x2560/res/images/keyboard2.png
deleted file mode 100644
index 8b864a9ba..000000000
--- a/gui/devices/1440x2560/res/images/keyboard2.png
+++ /dev/null
diff --git a/gui/devices/1440x2560/res/images/keyboard3.png b/gui/devices/1440x2560/res/images/keyboard3.png
deleted file mode 100644
index be7ca4774..000000000
--- a/gui/devices/1440x2560/res/images/keyboard3.png
+++ /dev/null
diff --git a/gui/devices/1440x2560/res/images/keyboard4.png b/gui/devices/1440x2560/res/images/keyboard4.png
deleted file mode 100644
index 306c4b303..000000000
--- a/gui/devices/1440x2560/res/images/keyboard4.png
+++ /dev/null
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 a3bf30d58..000000000
--- a/gui/devices/1440x2560/res/images/medium-button.png
+++ /dev/null
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 d65105579..000000000
--- a/gui/devices/1440x2560/res/images/menu-button.png
+++ /dev/null
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 e2edbe45f..000000000
--- a/gui/devices/1440x2560/res/images/minus-button.png
+++ /dev/null
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 28fb825c6..000000000
--- a/gui/devices/1440x2560/res/images/plus-button.png
+++ /dev/null
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 4d610c6b7..000000000
--- a/gui/devices/1440x2560/res/images/progress_empty.png
+++ /dev/null
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 3860c2413..000000000
--- a/gui/devices/1440x2560/res/images/progress_fill.png
+++ /dev/null
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 9c2c66bb0..000000000
--- a/gui/devices/1440x2560/res/images/radio_empty.png
+++ /dev/null
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 8d05b9d48..000000000
--- a/gui/devices/1440x2560/res/images/radio_selected.png
+++ /dev/null
diff --git a/gui/devices/1440x2560/res/images/slideout.png b/gui/devices/1440x2560/res/images/slideout.png
deleted file mode 100644
index a2f2be140..000000000
--- a/gui/devices/1440x2560/res/images/slideout.png
+++ /dev/null
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 f6dac624a..000000000
--- a/gui/devices/1440x2560/res/images/slider-touch.png
+++ /dev/null
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 f18f8ce23..000000000
--- a/gui/devices/1440x2560/res/images/slider-used.png
+++ /dev/null
diff --git a/gui/devices/1440x2560/res/images/slider.png b/gui/devices/1440x2560/res/images/slider.png
deleted file mode 100644
index 46fa928e9..000000000
--- a/gui/devices/1440x2560/res/images/slider.png
+++ /dev/null
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 c4f9eddaf..000000000
--- a/gui/devices/1440x2560/res/images/sort-button.png
+++ /dev/null
diff --git a/gui/devices/1440x2560/res/images/tg_background.png b/gui/devices/1440x2560/res/images/tg_background.png
deleted file mode 100644
index 1576e7b65..000000000
--- a/gui/devices/1440x2560/res/images/tg_background.png
+++ /dev/null
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 93137b8c2..000000000
--- a/gui/devices/1440x2560/res/images/top-bar.jpg
+++ /dev/null
diff --git a/gui/devices/1440x2560/res/images/unlock.png b/gui/devices/1440x2560/res/images/unlock.png
deleted file mode 100644
index dc3894b76..000000000
--- a/gui/devices/1440x2560/res/images/unlock.png
+++ /dev/null
diff --git a/gui/devices/1440x2560/res/ui.xml b/gui/devices/1440x2560/res/ui.xml
deleted file mode 100644
index fa78add57..000000000
--- a/gui/devices/1440x2560/res/ui.xml
+++ /dev/null
@@ -1,417 +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="Roboto-Condensed-50" />
-		<resource name="mediumfont" type="font" filename="Roboto-Condensed-50" />
-		<resource name="filelist" type="font" filename="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" />
-		<resource name="checkbox_true" type="image" filename="checkbox_checked" />
-		<resource name="radio_false" type="image" filename="radio_empty" />
-		<resource name="radio_true" type="image" filename="radio_selected" />
-		<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" />
-	</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="550" />
-		<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="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="2195" />
-		<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="#808080" />
-		<variable name="fastscroll_rectcolor" value="#808080" />
-		<variable name="fastscroll_w" value="120" />
-		<variable name="fastscroll_linew" value="4" />
-		<variable name="fastscroll_rectw" value="80" />
-		<variable name="fastscroll_recth" value="140" />
-		<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="539" y="132" />
-				<conditions>
-					<condition var1="tw_no_battery_percent" var2="0" />
-					<condition var1="tw_battery" op=">" var2="0" />
-					<condition var1="tw_battery" op="<" var2="101" />
-				</conditions>
-				<text>Battery: %tw_battery%</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="212" 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="238:a" long01="@" key02="s" long02="#" key03="d" long03="$" key04="f" long04="%" key05="g" long05="&" 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="212" 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="238:A" long01="@" key02="S" long02="#" key03="D" long03="$" key04="F" long04="%" key05="G" long05="&" 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="212" 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="&" 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="212" width="144" />
-					<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="<" key08=">" 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/portrait/res/portrait.xml b/gui/devices/portrait/res/portrait.xml
index 6a3618e62..466c64bbf 100644
--- a/gui/devices/portrait/res/portrait.xml
+++ b/gui/devices/portrait/res/portrait.xml
@@ -1387,7 +1387,7 @@
 			</object>
 
 			<object type="slider">
-				<placement x="%slider_x%" y="%slider_y%" />
+				<placement x="%slider_x%" y="slider_y" />
 				<resource base="slider" used="slider-used" touch="slider-touch" />
 				<action function="page">backup_run</action>
 			</object>