diff --git a/gui/devices/2560x1600/res/ui.xml b/gui/devices/2560x1600/res/ui.xml
index fa17649..debe1b2 100644
--- a/gui/devices/2560x1600/res/ui.xml
+++ b/gui/devices/2560x1600/res/ui.xml
@@ -2,7 +2,7 @@
 
 <recovery>
 	<details>
-		<resolution width="1920" height="1200" />
+		<resolution width="2560" height="1600" />
 		<author>TeamWin</author>
 		<title>Backup Naowz</title>
 		<description>Default basic theme</description>
@@ -10,7 +10,7 @@
 	</details>
 
 	<resources>
-		<resource name="font" type="font" filename="Roboto-Regular-30" />
+		<resource name="font" type="font" filename="Roboto-Regular-40" />
 		<resource name="base" type="image" filename="background.jpg" />
 		<resource name="side" type="image" filename="backgroundside.jpg" />
 		<resource name="bottom" type="image" filename="backgroundbottom.jpg" />
@@ -45,103 +45,103 @@
 	</resources>
 
 	<variables>
-		<variable name="col1_x" value="210" />
-		<variable name="col2_x" value="590" />
-		<variable name="col3_x" value="970" />
-		<variable name="col4_x" value="1350" />
-		<variable name="row1_y" value="220" />
-		<variable name="row2_y" value="600" />
-		<variable name="col_center_x" value="780" />
-		<variable name="center_x" value="960" />
+		<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="771" />
-		<variable name="row_progressbar_y" value="1100" />
-		<variable name="col1_medium_x" value="570" />
-		<variable name="col2_medium_x" value="770" />
-		<variable name="col3_medium_x" value="970" />
-		<variable name="col4_medium_x" value="1170" />
+		<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="175" />
 		<variable name="row3_medium_y" value="245" />
 		<variable name="row4_medium_y" value="515" />
-		<variable name="row5_medium_y" value="700" />
-		<variable name="row1_text_y" value="90" />
-		<variable name="row2_text_y" value="140" />
-		<variable name="row3_text_y" value="190" />
-		<variable name="row4_text_y" value="240" />
-		<variable name="row5_text_y" value="290" />
-		<variable name="row6_text_y" value="340" />
-		<variable name="row7_text_y" value="390" />
-		<variable name="row8_text_y" value="440" />
-		<variable name="row9_text_y" value="490" />
-		<variable name="row10_text_y" value="540" />
-		<variable name="row11_text_y" value="590" />
-		<variable name="row12_text_y" value="640" />
-		<variable name="row13_text_y" value="690" />
-		<variable name="row14_text_y" value="740" />
-		<variable name="row15_text_y" value="790" />
-		<variable name="row16_text_y" value="840" />
-		<variable name="row17_text_y" value="890" />
-		<variable name="row18_text_y" value="940" />
-		<variable name="row_offsetmedium_y" value="775" />
-		<variable name="home_button_x" value="1620" />
-		<variable name="home_button_y" value="5" />
-		<variable name="back_button_x" value="1720" />
-		<variable name="back_button_y" value="5" />
-		<variable name="console_button_x" value="1820" />
-		<variable name="console_button_y" value="5" />
+		<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="200" />
-		<variable name="nandcheck_row2" value="275" />
-		<variable name="nandcheck_row3" value="350" />
-		<variable name="nandcheck_row4" value="425" />
-		<variable name="nandcheck_row5" value="500" />
-		<variable name="nandcheck_row6" value="575" />
-		<variable name="nandcheck_row7" value="650" />
+		<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="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="slider_x" value="630" />
-		<variable name="slider_y" value="1000" />
-		<variable name="slider_text_y" value="1075" />
-		<variable name="sort_text_x" value="400" />
-		<variable name="sort_asc_text_y" value="1045" />
-		<variable name="sort_asc_button_y" value="1040" />
-		<variable name="sort_desc_text_y" value="1105" />
-		<variable name="sort_desc_button_y" value="1100" />
-		<variable name="sort_col1_button_x" value="670" />
-		<variable name="sort_col2_button_x" value="770" />
-		<variable name="sort_col3_button_x" value="870" />
-		<variable name="col1_sdext_x" value="720" />
-		<variable name="col2_sdext_x" value="1100" />
+		<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="1820" />
-		<variable name="input_height" 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="1820" />
+		<variable name="console_width" value="2460" />
 		<variable name="console_foreground" value="#A0A0A0" />
 		<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="50" />
-		<variable name="fileselector_folder_width" value="610" />
-		<variable name="fileselector_folderonly_width" value="800" />
-		<variable name="fileselector_file_x" value="700" />
-		<variable name="fileselector_file_width" value="1170" />
-		<variable name="fileselector_install_y" value="190" />
-		<variable name="fileselector_install_height" value="800" />
+		<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="260" />
+		<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" />
@@ -150,29 +150,29 @@
 		<variable name="fileselector_separatorheight" value="2" />
 		<variable name="fileselector_background" value="#303030" />
 		<variable name="fileselector_spacing" value="18" />
-		<variable name="zipstorage_text_y" value="130" />
-		<variable name="listbox_x" value="560" />
-		<variable name="listbox_y" value="150" />
-		<variable name="listbox_width" value="800" />
-		<variable name="listbox_tz_height" value="400" />
+		<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="660" />
 		<variable name="lock_y" value="300" />
-		<variable name="filemanager_select_x" value="1500" />
-		<variable name="filemanager_select_y" value="980" />
+		<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="390" />
+		<variable name="backup_name_button_y" value="950" />
 		<variable name="col_right_x" value="1870" />
-		<variable name="cancel_button_y" value="240" />
+		<variable name="cancel_button_y" value="430" />
 		<variable name="terminal_console_y" value="0" />
-		<variable name="terminal_console_height" value="610" />
-		<variable name="terminal_text_y" value="624" />
-		<variable name="terminal_button_y" value="615" />
-		<variable name="terminal_input_width" value="1550" />
-		<variable name="exclamation_x" value="760" />
-		<variable name="exclamation_y" value="260" />
+		<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="exclamation_x" value="1014" />
+		<variable name="exclamation_y" value="320" />
 	</variables>
 
 	<templates>
@@ -186,7 +186,7 @@
 
 			<object type="image">
 				<image resource="side" />
-				<placement x="1875" y="0" />
+				<placement x="2500" y="0" />
 			</object>
 
 			<object type="image">
@@ -196,7 +196,7 @@
 
 			<object type="image">
 				<image resource="bottom" />
-				<placement x="1" y="1155" />
+				<placement x="1" y="1540" />
 			</object>
 
 			<object type="image">
@@ -206,13 +206,13 @@
 
 			<object type="text" color="%text_color%">
 				<font resource="font" />
-				<placement x="250" y="5" />
+				<placement x="400" y="8" />
 				<text>Team Win Recovery Project (twrp)  v%tw_version%</text>
 			</object>
 
 			<object type="text" color="%text_color%">
 				<font resource="font" />
-				<placement x="250" y="40" />
+				<placement x="400" y="55" />
 				<conditions>
 					<condition var1="tw_no_battery_percent" var2="0" />
 					<condition var1="tw_battery" op=">" var2="0" />
@@ -223,14 +223,14 @@
 
 			<object type="text" color="%text_color%">
 				<font resource="font" />
-				<placement x="600" y="40" />
+				<placement x="900" y="55" />
 				<text>%tw_time%</text>
 			</object>
 
 			<object type="text" color="%text_color%">
 				<condition var1="tw_simulate_actions" var2="1" />
 				<font resource="font" />
-				<placement x="850" y="40" />
+				<placement x="1100" y="55" />
 				<text>SIMULATING ACTIONS</text>
 			</object>
 
@@ -268,7 +268,7 @@
 			<object type="animation">
 				<placement x="%col_progressbar_x%" y="%row_progressbar_y%" />
 				<resource name="progress" />
-				<speed fps="15" render="6" />
+				<speed fps="15" render="2" />
 				<loop frame="1" />
 			</object>
 		</template>
@@ -337,7 +337,7 @@
 
 		<template name="flash_zip_console">
 			<object type="console">
-				<placement x="%console_x%" y="140" w="%console_width%" h="700" />
+				<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>
@@ -345,7 +345,7 @@
 
 		<template name="action_page_console">
 			<object type="console">
-				<placement x="%console_x%" y="400" w="%console_width%" h="600" />
+				<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>
@@ -354,7 +354,7 @@
 		<template name="footer">
 			<object type="console">
 				<slideout resource="console_button" x="%console_button_x%" y="%console_button_y%" />
-				<placement x="%console_x%" y="150" w="%console_width%" h="1000" />
+				<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>
@@ -362,36 +362,36 @@
 
 		<template name="keyboardtemplate">
 			<object type="keyboard">
-				<placement x="0" y="684" />
+				<placement x="0" y="912" />
 				<layout resource1="keyboard1" resource2="keyboard2" resource3="keyboard3" resource4="keyboard4" />
 				<highlight color="#90909080" />
 				<layout1>
-					<keysize height="129" width="159" />
-					<row1 key01="153:" 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="177:c:8" />
-					<row2 key01="213:layout3" key02="156:a" key03="156:s" key04="156:d" key05="156:f" key06="156:g" key07="156:h" key08="156:j" key09="k" key10="156:l" key11="303:action" />
-					<row3 key01="269:layout2" key02="154:z" key03="154:x" key04="154:c" key05="154:v" key06="154:b" key07="154:n" key08="154:m" key09="154:," long09="!" key10="154:." long10="?" key11="265:layout2" />
-					<row4 key01="600:" key02="720: " key03="/" long03=":" key04="-" long0="_" />
+					<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="129" width="159" />
-					<row1 key01="153:" 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="177:c:8" />
-					<row2 key01="213:layout3" key02="156:A" key03="156:S" key04="156:D" key05="156:F" key06="156:G" key07="156:H" key08="156:J" key09="156:K" key10="156:L" key11="303:action" />
-					<row3 key01="269:layout1" key02="154:Z" key03="154:X" key04="154:C" key05="154:V" key06="154:B" key07="154:N" key08="154:M" key09="154:," long09="!" key10="154:." long10="?" key11="265:layout1" />
-					<row4 key01="600:" key02="720: " key03="/" long03=":" key04="-" long0="_" />
+					<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: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="129" width="159" />
-					<row1 key01="153:" key02="1" key03="2" key04="3" key05="4" key06="5" key07="6" key08="7" key09="8" key10="9" key11="0" key12="177:c:8" />
-					<row2 key01="213:layout1" key02="156:#" key03="156:$" key04="156:%" key05="156:&" key06="156:*" key07="156:-" key08="156:+" key09="156:(" key10="156:)" key11="303:action" />
-					<row3 key01="269:layout4" key02="154:<" key03="154:>" key04="154:=" key05="154:'" key06="154:;" key07="154:," key08="154:." key09="154:!" key10="154:?" key11="265:layout4" />
-					<row4 key01="282:" key02="/" key03="@" key04="720: " key05="159:c:34" key06="_" />
+					<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:&" key06="208:*" key07="208:-" key08="208:+" key09="208:(" key10="208:)" key11="402:action" />
+					<row3 key01="354:layout4" key02="206:<" key03="206:>" 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="129" width="159" />
-					<row1 key01="153:" key02="~" key03="`" key04="|" key05="159:" key06="159:" key07="159:" key08="159:" key09="159:" key10="159:" key11="159:" key12="177:c:8" />
-					<row2 key01="213:layout1" key02="156:" key03="156:" key04="156:" key05="156:" key06="156:^" key07="156:" key08="156:" key09="156:{" key10="156:}" key11="303:action" />
-					<row3 key01="269:layout3" key02="154:\" key03="154:" key04="154:" key05="154:" key06="154:" key07="154:[" key08="154:]" key09="154:!" key10="154:?" key11="265:layout3" />
-					<row4 key01="600:" key02="720: " />
+					<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>
@@ -2253,7 +2253,7 @@
 				<actions>
 					<action function="set">tw_back=restore</action>
 					<action function="set">tw_action=cmd</action>
-					<action function="set">tw_action_param=cd %tw_backups_folder% && mv %tw_restore_name% %tw_backup_rename%</action>
+					<action function="set">tw_action_param=cd %tw_backups_folder% && mv &quot;%tw_restore_name%&quot; &quot;%tw_backup_rename%&quot;</action>
 					<action function="set">tw_text1=Rename Backup?</action>
 					<action function="set">tw_text2=This cannot be undone!</action>
 					<action function="set">tw_action_text1=Renaming Backup...</action>
@@ -3516,7 +3516,7 @@
 				<sort name="tw_gui_sort_order" />
 				<icon folder="folder_icon" file="file_icon" />
 				<background color="%fileselector_background%" />
-				<font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" />
+				<font resource="font" spacing="%fileselector_spacing%" color="%text_color%" />
 				<filter folders="1" files="0" />
 				<path name="tw_terminal_location" default="/" />
 				<data name="tw_terminal" />