gui: theme changes for terminal

Done:

Portrait HDPI, MDPI
Landscape HDPI, MDPI
Watch

Also still includes ugly changes for the old portrait theme to test the
terminal emulator.

Change-Id: If32af1c69b85417522a8a2fb9c20be515b4d70fc
diff --git a/gui/devices/1080x1920/res/ui.xml b/gui/devices/1080x1920/res/ui.xml
index d491577..79bf502 100644
--- a/gui/devices/1080x1920/res/ui.xml
+++ b/gui/devices/1080x1920/res/ui.xml
@@ -17,6 +17,9 @@
 		<resource name="font" type="font" filename="RobotoCondensed-Regular.ttf" size="40" />
 		<resource name="mediumfont" type="font" filename="RobotoCondensed-Regular.ttf" size="40" />
 		<resource name="filelist" type="font" filename="RobotoCondensed-Regular.ttf" size="40" />
+		<resource name="keylabel" type="font" filename="RobotoCondensed-Regular.ttf" size="50" />
+		<resource name="keylabel-small" type="font" filename="RobotoCondensed-Regular.ttf" size="40" />
+		<resource name="keylabel-longpress" type="font" filename="RobotoCondensed-Regular.ttf" size="30" />
 		<resource name="fixed" type="font" filename="DroidSansMono.ttf" size="30" />
 		<resource name="twrplogo" type="image" filename="twrplogo" retainaspect="1" />
 		<resource name="main_button" type="image" filename="menu-button" />
@@ -172,7 +175,7 @@
 		<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="1050" />
+		<variable name="terminal_console_height" value="1200" />
 		<variable name="terminal_text_y" value="1095" />
 		<variable name="terminal_button_y" value="1050" />
 		<variable name="row_dst_text_y" value="1080" />
@@ -444,8 +447,21 @@
 
 		<template name="keyboardtemplate">
 			<object type="keyboard">
-				<placement x="0" y="1200" />
+				<placement x="0" y="1200" w="1080" h="644" />
+				<keymargin x="6" y="6"/>
+				<background color="#202020"/>
+				<key-alphanumeric color="#282828" font="keylabel" textcolor="#ffffff"/>
+				<key-other color="#242424" font="keylabel-small" textcolor="#c0c0c0"/>
+				<longpress font="keylabel-longpress" textcolor="#808080" x="4" y="0"/>
+				<keylabel key="0:c:8" text="Bksp" resource="backspace"/>
+				<keylabel key="0:action" text="Enter" resource="enter"/>
+				<keylabel key="0:k:105" text="&lt;"/>
+				<keylabel key="0:k:108" text="v"/>
+				<keylabel key="0:k:103" text="^"/>
+				<keylabel key="0:k:106" text="&gt;"/>
+				<!--
 				<layout resource1="keyboard1" resource2="keyboard2" resource3="keyboard3" resource4="keyboard4" />
+				-->
 				<highlight color="%highlight_color%" />
 				<capshighlight color="%caps_highlight_color%" />
 				<layout1>
@@ -453,7 +469,9 @@
 					<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="162: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="162:layout2" key02="z" long02="!" key03="x" key04="c" long04="'" key05="v" long05=":" key06="b" long06=";" key07="n" long07="/" key08="m" long08="?" key09="162:c:8" />
-					<row4 key01="162:layout3" key02="108:c:47" key03="108:" key04="432: " key05="." key06="162:action" />
+					<row4 key01="162:layout3" key02="108:c:47" key03="108:c:27" long03=":c:3" key04="432: " key05="." key06="162:action" />
+					<keylabel key="0:layout2" text="Shift" resource="shift"/>
+					<keylabel key="0:layout3" text="?123"/>
 				</layout1>
 				<layout2>
 					<keysize height="161" width="108" capslock="0" revert_layout="1" />
@@ -461,6 +479,8 @@
 					<row2 key01="162: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="162:layout1" key02="Z" long02="!" key03="X" key04="C" long04="'" key05="V" long05=":" key06="B" long06=";" key07="N" long07="/" key08="M" long08="?" key09="162:c:8" />
 					<row4 key01="162:layout3" key02="/" key03="108:" key04="432: " key05="." key06="162:action" />
+					<keylabel key="0:layout1" text="Shift" resource="shift_fill"/>
+					<keylabel key="0:layout3" text="?123"/>
 				</layout2>
 				<layout3>
 					<keysize height="161" width="108" />
@@ -468,13 +488,17 @@
 					<row2 key01="@" key02="#" key03="$" key04="%" key05="&amp;" key06="*" key07="-" key08="+" key09="(" key10=")" />
 					<row3 key01="162:layout4" key02="!" key03="108:c:34" key04="'" key05=":" key06=";" key07="/" key08="?" key09="162:c:8" />
 					<row4 key01="162:layout1" key02="," key03="108:" key04="432: " key05="." key06="162:action" />
+					<keylabel key="0:layout1" text="ABC"/>
+					<keylabel key="0:layout4" text="~\{"/>
 				</layout3>
 				<layout4>
 					<keysize height="161" width="108" />
 					<row1 key01="~" key02="`" key03="|" key04="108:" key05="108:" key06="108:" key07="%" key08="108:" key09="{" key10="}" />
-					<row2 key01="108:" key02="108:" key03="108:" key04="108:" key05="108:" key06="^" key07="_" key08="=" key09="[" key10="]" />
+					<row2 key01="108:c:9" key02="108:k:105" key03="108:k:108" key04="108:k:103" key05="108:k:106" key06="^" key07="_" key08="=" key09="[" key10="]" />
 					<row3 key01="162:layout3" key02="108:" key03="108:" key04="108:" key05="108:" key06="\" key07="&lt;" key08="&gt;" key09="162:c:8" />
 					<row4 key01="162:layout1" key02="108:c:34" key03="108:" key04="432: " key05="." key06="162:action" />
+					<keylabel key="0:layout1" text="ABC"/>
+					<keylabel key="0:layout3" text="?123"/>
 				</layout4>
 			</object>
 		</template>
diff --git a/gui/devices/1920x1200/res/ui.xml b/gui/devices/1920x1200/res/ui.xml
index 160ddf6..ae75f8d 100644
--- a/gui/devices/1920x1200/res/ui.xml
+++ b/gui/devices/1920x1200/res/ui.xml
@@ -459,10 +459,10 @@
 				<capshighlight color="%caps_highlight_color%" />
 				<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" />
+					<row1 key01="153:c:9" 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="-" long04="_" />
+					<row4 key01="600:c:27" long01=":c:3" key02="720: " key03="/" long03=":" key04="-" long04="_" />
 				</layout1>
 				<layout2>
 					<keysize height="129" width="159" capslock="0" revert_layout="1" />
@@ -481,7 +481,7 @@
 				<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" />
+					<row2 key01="213:layout1" key02="156:c:-105" key03="156:c:-108" key04="156:c:-103" key05="156:c:-106" 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: " />
 				</layout4>
diff --git a/gui/devices/landscape/res/landscape.xml b/gui/devices/landscape/res/landscape.xml
index b0f6b16..c2a117d 100644
--- a/gui/devices/landscape/res/landscape.xml
+++ b/gui/devices/landscape/res/landscape.xml
@@ -3467,7 +3467,8 @@
 		<page name="terminalcommand">
 			<background color="#000000FF" />
 
-			<object type="console">
+			<object type="terminal" style="console">
+				<font resource="fixed" spacing="3" color="%text_color%" />
 				<placement x="%console_x%" y="%terminal_console_y%" w="%console_width%" h="%terminal_console_height%" />
 			</object>
 
@@ -3475,7 +3476,7 @@
 				<placement x="%input_x%" y="%terminal_text_y%" placement="0" />
 				<text>Starting Path: %tw_terminal_location%</text>
 			</object>
-
+<!--
 			<object type="input">
 				<condition var1="tw_terminal_state" var2="0" />
 				<placement x="%input_x%" y="%terminal_text_y%" w="%terminal_input_width%" h="%input_height%" placement="0" />
@@ -3485,7 +3486,7 @@
 				<restrict minlen="1" />
 				<action function="terminalcommand">%tw_terminal_command%</action>
 			</object>
-
+-->
 			<object type="button" style="mediumbutton">
 				<condition var1="tw_terminal_state" var2="1" />
 				<placement x="%filemanager_select_x%" y="%terminal_button_y%" />
diff --git a/gui/devices/portrait/res/portrait.xml b/gui/devices/portrait/res/portrait.xml
index b7e79e9..8d21777 100644
--- a/gui/devices/portrait/res/portrait.xml
+++ b/gui/devices/portrait/res/portrait.xml
@@ -2653,8 +2653,8 @@
 
 			<object type="button">
 				<placement x="%col1_x%" y="%row3_y%" />
-				<text>Terminal Command</text>
-				<action function="page">terminalfolder</action>
+				<text>Terminal Emulator</text>
+				<action function="page">terminalcommand</action>
 			</object>
 
 			<object type="button">
@@ -3450,7 +3450,7 @@
 				</actions>
 			</object>
 		</page>
-
+<!--
 		<page name="terminalfolder">
 			<object type="template" name="header" />
 
@@ -3490,14 +3490,15 @@
 
 			<object type="template" name="footer" />
 		</page>
-
+-->
 		<page name="terminalcommand">
 			<object type="template" name="header" />
 
-			<object type="console">
-				<placement x="%console_x%" y="0" w="%console_width%" h="%terminal_console_height%" />
+			<object type="terminal" style="console">
+				<font resource="fixed" spacing="3" color="%text_color%" />
+				<placement x="%console_x%" y="%terminal_console_y%" w="%console_width%" h="%terminal_console_height%" />
 			</object>
-
+<!--
 			<object type="text">
 				<placement x="%col1_x%" y="%terminal_text_y%" placement="0" />
 				<text>Starting Path: %tw_terminal_location%</text>
@@ -3512,16 +3513,38 @@
 				<restrict minlen="1" />
 				<action function="terminalcommand">%tw_terminal_command%</action>
 			</object>
-
 			<object type="button" style="mediumbutton">
 				<condition var1="tw_terminal_state" var2="1" />
 				<placement x="%filemanager_select_x%" y="%terminal_button_y%" />
 				<text>KILL</text>
 				<action function="killterminal"></action>
 			</object>
+-->
 
 			<object type="template" name="keyboardtemplate" />
 
+			<object type="keyboard">
+				<placement x="120" y="1840" w="840" h="80" />
+				<keymargin x="6" y="6"/>
+				<background color="#202020"/>
+				<key-alphanumeric color="#282828" font="keylabel" textcolor="#ffffff"/>
+				<key-other color="#242424" font="keylabel-small" textcolor="#c0c0c0"/>
+				<longpress font="keylabel-longpress" textcolor="#808080"/>
+				<keylabel key="0:k:29" text="Ctrl"/>
+				<keylabel key="0:c:27" text="Esc"/>
+				<keylabel key="0:c:9" text="Tab"/>
+				<keylabel key="0:k:105" text="&lt;"/>
+				<keylabel key="0:k:108" text="v"/>
+				<keylabel key="0:k:103" text="^"/>
+				<keylabel key="0:k:106" text="&gt;"/>
+				<highlight color="%highlight_color%" />
+				<ctrlhighlight color="#E5333380" />
+				<layout1>
+					<keysize height="80" width="120" />
+					<row1 key01="120:k:29" key02="120:c:27" long02=":c:3" key03="120:c:9" key04="120:k:105" key05="120:k:108" key06="120:k:103" key07="120:k:106"/>
+				</layout1>
+			</object>
+
 			<object type="action">
 				<touch key="home" />
 				<action function="page">main</action>
@@ -3529,7 +3552,7 @@
 
 			<object type="action">
 				<touch key="back" />
-				<action function="page">terminalfolder</action>
+				<action function="page">advanced</action>
 			</object>
 		</page>
 
diff --git a/gui/theme/common/landscape.xml b/gui/theme/common/landscape.xml
index 19cc657..6c91d06 100755
--- a/gui/theme/common/landscape.xml
+++ b/gui/theme/common/landscape.xml
@@ -109,6 +109,12 @@
 			<font resource="fixed"/>
 		</style>
 
+		<style name="terminal">
+			<fastscroll linecolor="%transparent%" rectcolor="%accent_color%" w="%fastscroll_w%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%"/>
+			<background color="%background_color%"/>
+			<font resource="fixed" spacing="3" color="%text_color%"/>
+		</style>
+
 		<style name="fileselector">
 			<highlight color="%fileselector_highlight_color%"/>
 			<header background="%background_color%" textcolor="%accent_color%" separatorcolor="%accent_color%" separatorheight="%fileselector_separatorheight%"/>
@@ -3027,15 +3033,18 @@
 			</fill>
 
 			<listbox>
-				<placement x="%indent%" y="%row3_y%" w="%fileselector_filemanager_height%" h="%listbox_settings_height%"/>
+				<placement x="%col1_x_left%" y="%row3_y%" w="%content_half_width%" h="%listbox_timezone_height%"/>
 				<text>{@select_language=Select Language:}</text>
 				<icon selected="radio_true" unselected="radio_false" />
 				<data name="tw_language" />
 			</listbox>
 
-			<button style="main_button_half_width_low">
-				<placement x="%col_button_right%" y="%row16a_y%"/>
+			<button>
+				<highlight color="%highlight_color%"/>
+				<placement x="%col2_x_right%" y="%row15a_y%"/>
+				<font resource="font_m" color="%text_button_color%"/>
 				<text>{@set_language_btn=Set Language}</text>
+				<image resource="main_button_half_width"/>
 				<action function="setlanguage"></action>
 			</button>
 
@@ -3094,7 +3103,7 @@
 			<button style="main_button">
 				<placement x="%col1_x_left%" y="%row11_y%"/>
 				<text>{@terminal_btn=Terminal}</text>
-				<action function="page">terminalfolder</action>
+				<action function="page">terminalcommand</action>
 			</button>
 
 			<button style="main_button">
@@ -4011,47 +4020,6 @@
 			</action>
 		</page>
 
-		<page name="terminalfolder">
-			<template name="page"/>
-
-			<text style="text_l">
-				<placement x="%col1_x_header%" y="%row3_header_y%"/>
-				<text>{term_hdr=Terminal Command}</text>
-			</text>
-
-			<text style="text_m">
-				<placement x="%col1_x_header%" y="%row4_header_y%"/>
-				<text>{@term_sel_folder_hdr=Browse to Starting Folder}</text>
-			</text>
-
-			<template name="sort_options"/>
-
-			<fileselector>
-				<placement x="%col1_x_left%" y="%row1a_y%" w="%content_quarter_width%" h="%fileselector_filemanager_height%"/>
-				<text>%tw_terminal_location%</text>
-				<filter folders="1" files="0"/>
-				<path name="tw_terminal_location" default="/"/>
-				<data name="tw_terminal"/>
-				<selection name="tw_terminal_selection"/>
-			</fileselector>
-
-			<button style="main_button_half_width_low">
-				<placement x="%col_button_right%" y="%row16a_y%"/>
-				<text>{@fm_sel_curr_folder=Select Current Folder}</text>
-				<action function="page">terminalcommand</action>
-			</button>
-
-			<action>
-				<touch key="home"/>
-				<action function="page">main</action>
-			</action>
-
-			<action>
-				<touch key="back"/>
-				<action function="page">advanced</action>
-			</action>
-		</page>
-
 		<page name="terminalcommand">
 			<template name="page"/>
 
@@ -4059,41 +4027,303 @@
 				<placement x="0" y="%status_height%" w="%screen_width%" h="%header_height%"/>
 			</fill>
 
-			<template name="console_terminal"/>
+			<terminal>
+				<condition var1="tw_hide_kb" var2="0"/>
+				<placement x="0" y="%row3_header_y%" w="%screen_width%" h="%terminal_s_height%"/>
+			</terminal>
 
-			<input>
-				<placement x="%col1_x_left%" y="%row8_y%" w="%content_quarter_width%" h="%input_height%"/>
-				<text>%tw_terminal_command%</text>
-				<data name="tw_terminal_command"/>
-				<restrict minlen="1"/>
-				<action function="terminalcommand">%tw_terminal_command%</action>
-			</input>
+			<terminal>
+				<condition var1="tw_hide_kb" var2="1"/>
+				<placement x="0" y="%row3_header_y%" w="%screen_width%" h="%terminal_l_height%"/>
+			</terminal>
 
-			<fill color="%accent_color%">
-				<placement x="%col1_x_left%" y="row9_y" w="%content_quarter_width%" h="input_line_width" placement="1"/>
-			</fill>
+			<template name="keyboardterminaltemplate"/>
 
-			<button>
-				<condition var1="tw_terminal_state" var2="1"/>
-				<highlight color="%highlight_color%"/>
-				<placement x="%btn4_col4_x_right%" y="%row7a_y%"/>
-				<font resource="font_m" color="%text_button_color%"/>
-				<text>{@term_kill_btn=Kill}</text>
-				<image resource="tab_4"/>
-				<action function="killterminal"/>
-			</button>
+			<object type="fill" color="#000000">
+				<placement x="0" y="%navbar_y%" w="%screen_width%" h="%navbar_height%" />
+			</object>
 
-			<template name="keyboardtemplate"/>
+			<object type="button">
+				<condition var1="tw_navbar_button_position" op="=" var2="0" />
+				<condition var1="tw_samsung_navbar" op="!=" var2="1" />
+				<placement x="%back_button_x%" y="%navbar_btn_y%" placement="4" />
+				<image resource="back" />
+				<condition var1="tw_busy" var2="0" />
+				<actions>
+					<action function="set">tw_hide_kb=0</action>
+					<action function="page">advanced</action>
+				</actions>
+			</object>
+
+			<object type="button">
+				<condition var1="tw_navbar_button_position" op="=" var2="0" />
+				<condition var1="tw_samsung_navbar" op="=" var2="1" />
+				<condition var1="tw_hide_kb" op="=" var2="0" />
+				<placement x="%back_button_x%" y="%navbar_btn_y%" placement="4" />
+				<image resource="kb_hide" />
+				<condition var1="tw_busy" var2="0" />
+				<actions>
+					<action function="set">tw_hide_kb=1</action>
+					<action function="page">terminalcommand</action>
+				</actions>
+			</object>
+
+			<object type="button">
+				<condition var1="tw_navbar_button_position" op="=" var2="0" />
+				<condition var1="tw_samsung_navbar" op="=" var2="1" />
+				<condition var1="tw_hide_kb" op="=" var2="1" />
+				<placement x="%back_button_x%" y="%navbar_btn_y%" placement="4" />
+				<image resource="kb_show" />
+				<condition var1="tw_busy" var2="0" />
+				<actions>
+					<action function="set">tw_hide_kb=0</action>
+					<action function="page">terminalcommand</action>
+				</actions>
+			</object>
+
+			<object type="button">
+				<condition var1="tw_navbar_button_position" op="=" var2="0" />
+				<placement x="%center_x%" y="%navbar_btn_y%" placement="4" />
+				<image resource="home" />
+				<condition var1="tw_busy" var2="0" />
+				<actions>
+					<action function="set">tw_hide_kb=0</action>
+					<action function="key">home</action>
+				</actions>
+			</object>
+
+			<object type="button">
+				<condition var1="tw_navbar_button_position" op="=" var2="0" />
+				<condition var1="tw_samsung_navbar" op="!=" var2="1" />
+				<condition var1="tw_hide_kb" op="=" var2="0" />
+				<placement x="%console_button_x%" y="%navbar_btn_y%" placement="4" />
+				<image resource="kb_hide" />
+				<condition var1="tw_busy" var2="0" />
+				<actions>
+					<action function="set">tw_hide_kb=1</action>
+					<action function="page">terminalcommand</action>
+				</actions>
+			</object>
+
+			<object type="button">
+				<condition var1="tw_navbar_button_position" op="=" var2="0" />
+				<condition var1="tw_samsung_navbar" op="!=" var2="1" />
+				<condition var1="tw_hide_kb" op="=" var2="1" />
+				<placement x="%console_button_x%" y="%navbar_btn_y%" placement="4" />
+				<image resource="kb_show" />
+				<condition var1="tw_busy" var2="0" />
+				<actions>
+					<action function="set">tw_hide_kb=0</action>
+					<action function="page">terminalcommand</action>
+				</actions>
+			</object>
+
+			<object type="button">
+				<condition var1="tw_navbar_button_position" op="=" var2="0" />
+				<condition var1="tw_samsung_navbar" op="=" var2="1" />
+				<placement x="%console_button_x%" y="%navbar_btn_y%" placement="4" />
+				<image resource="back" />
+				<condition var1="tw_busy" var2="0" />
+				<actions>
+					<action function="set">tw_hide_kb=0</action>
+					<action function="page">advanced</action>
+				</actions>
+			</object>
+
+			<object type="button">
+				<condition var1="tw_navbar_button_position" op="=" var2="1" />
+				<condition var1="tw_samsung_navbar" op="!=" var2="1" />
+				<placement x="%back_button_x_1%" y="%navbar_btn_y%" placement="4" />
+				<image resource="back" />
+				<condition var1="tw_busy" var2="0" />
+				<actions>
+					<action function="set">tw_hide_kb=0</action>
+					<action function="page">advanced</action>
+				</actions>
+			</object>
+
+			<object type="button">
+				<condition var1="tw_navbar_button_position" op="=" var2="1" />
+				<condition var1="tw_samsung_navbar" op="=" var2="1" />
+				<condition var1="tw_hide_kb" op="=" var2="0" />
+				<placement x="%back_button_x_1%" y="%navbar_btn_y%" placement="4" />
+				<image resource="kb_hide" />
+				<condition var1="tw_busy" var2="0" />
+				<actions>
+					<action function="set">tw_hide_kb=1</action>
+					<action function="page">terminalcommand</action>
+				</actions>
+			</object>
+
+			<object type="button">
+				<condition var1="tw_navbar_button_position" op="=" var2="1" />
+				<condition var1="tw_samsung_navbar" op="=" var2="1" />
+				<condition var1="tw_hide_kb" op="=" var2="1" />
+				<placement x="%back_button_x_1%" y="%navbar_btn_y%" placement="4" />
+				<image resource="kb_show" />
+				<condition var1="tw_busy" var2="0" />
+				<actions>
+					<action function="set">tw_hide_kb=0</action>
+					<action function="page">terminalcommand</action>
+				</actions>
+			</object>
+
+			<object type="button">
+				<condition var1="tw_navbar_button_position" op="=" var2="1" />
+				<placement x="%home_button_x_1%" y="%navbar_btn_y%" placement="4" />
+				<image resource="home" />
+				<condition var1="tw_busy" var2="0" />
+				<actions>
+					<action function="set">tw_hide_kb=0</action>
+					<action function="key">home</action>
+				</actions>
+			</object>
+
+			<object type="button">
+				<condition var1="tw_navbar_button_position" op="=" var2="1" />
+				<condition var1="tw_samsung_navbar" op="!=" var2="1" />
+				<condition var1="tw_hide_kb" op="=" var2="0" />
+				<placement x="%console_button_x_1%" y="%navbar_btn_y%" placement="4" />
+				<image resource="kb_hide" />
+				<condition var1="tw_busy" var2="0" />
+				<actions>
+					<action function="set">tw_hide_kb=1</action>
+					<action function="page">terminalcommand</action>
+				</actions>
+			</object>
+
+			<object type="button">
+				<condition var1="tw_navbar_button_position" op="=" var2="1" />
+				<condition var1="tw_samsung_navbar" op="!=" var2="1" />
+				<condition var1="tw_hide_kb" op="=" var2="1" />
+				<placement x="%console_button_x_1%" y="%navbar_btn_y%" placement="4" />
+				<image resource="kb_show" />
+				<condition var1="tw_busy" var2="0" />
+				<actions>
+					<action function="set">tw_hide_kb=0</action>
+					<action function="page">terminalcommand</action>
+				</actions>
+			</object>
+
+			<object type="button">
+				<condition var1="tw_navbar_button_position" op="=" var2="1" />
+				<condition var1="tw_samsung_navbar" op="=" var2="1" />
+				<placement x="%console_button_x_1%" y="%navbar_btn_y%" placement="4" />
+				<image resource="back" />
+				<condition var1="tw_busy" var2="0" />
+				<actions>
+					<action function="set">tw_hide_kb=0</action>
+					<action function="page">advanced</action>
+				</actions>
+			</object>
+
+			<object type="button">
+				<condition var1="tw_navbar_button_position" op="=" var2="2" />
+				<condition var1="tw_samsung_navbar" op="!=" var2="1" />
+				<placement x="%back_button_x_2%" y="%navbar_btn_y%" placement="4" />
+				<image resource="back" />
+				<condition var1="tw_busy" var2="0" />
+				<actions>
+					<action function="set">tw_hide_kb=0</action>
+					<action function="page">advanced</action>
+				</actions>
+			</object>
+
+			<object type="button">
+				<condition var1="tw_navbar_button_position" op="=" var2="2" />
+				<condition var1="tw_samsung_navbar" op="=" var2="1" />
+				<condition var1="tw_hide_kb" op="=" var2="0" />
+				<placement x="%back_button_x_2%" y="%navbar_btn_y%" placement="4" />
+				<image resource="kb_hide" />
+				<condition var1="tw_busy" var2="0" />
+				<actions>
+					<action function="set">tw_hide_kb=1</action>
+					<action function="page">terminalcommand</action>
+				</actions>
+			</object>
+
+			<object type="button">
+				<condition var1="tw_navbar_button_position" op="=" var2="2" />
+				<condition var1="tw_samsung_navbar" op="=" var2="1" />
+				<condition var1="tw_hide_kb" op="=" var2="1" />
+				<placement x="%back_button_x_2%" y="%navbar_btn_y%" placement="4" />
+				<image resource="kb_show" />
+				<condition var1="tw_busy" var2="0" />
+				<actions>
+					<action function="set">tw_hide_kb=0</action>
+					<action function="page">terminalcommand</action>
+				</actions>
+			</object>
+
+			<object type="button">
+				<condition var1="tw_navbar_button_position" op="=" var2="2" />
+				<placement x="%home_button_x_2%" y="%navbar_btn_y%" placement="4" />
+				<image resource="home" />
+				<condition var1="tw_busy" var2="0" />
+				<actions>
+					<action function="set">tw_hide_kb=0</action>
+					<action function="key">home</action>
+				</actions>
+			</object>
+
+			<object type="button">
+				<condition var1="tw_navbar_button_position" op="=" var2="2" />
+				<condition var1="tw_samsung_navbar" op="!=" var2="1" />
+				<condition var1="tw_hide_kb" op="=" var2="0" />
+				<placement x="%console_button_x_2%" y="%navbar_btn_y%" placement="4" />
+				<image resource="kb_hide" />
+				<condition var1="tw_busy" var2="0" />
+				<actions>
+					<action function="set">tw_hide_kb=1</action>
+					<action function="page">terminalcommand</action>
+				</actions>
+			</object>
+
+			<object type="button">
+				<condition var1="tw_navbar_button_position" op="=" var2="2" />
+				<condition var1="tw_samsung_navbar" op="!=" var2="1" />
+				<condition var1="tw_hide_kb" op="=" var2="1" />
+				<placement x="%console_button_x_2%" y="%navbar_btn_y%" placement="4" />
+				<image resource="kb_show" />
+				<condition var1="tw_busy" var2="0" />
+				<actions>
+					<action function="set">tw_hide_kb=0</action>
+					<action function="page">terminalcommand</action>
+				</actions>
+			</object>
+
+			<object type="button">
+				<condition var1="tw_navbar_button_position" op="=" var2="2" />
+				<condition var1="tw_samsung_navbar" op="=" var2="1" />
+				<placement x="%console_button_x_2%" y="%navbar_btn_y%" placement="4" />
+				<image resource="back" />
+				<condition var1="tw_busy" var2="0" />
+				<actions>
+					<action function="set">tw_hide_kb=0</action>
+					<action function="page">advanced</action>
+				</actions>
+			</object>
 
 			<action>
 				<touch key="home"/>
-				<action function="page">main</action>
+				<actions>
+					<action function="page">main</action>
+					<action function="set">tw_hide_kb=0</action>
+				</actions>
 			</action>
 
 			<action>
 				<touch key="back"/>
-				<action function="page">terminalfolder</action>
+				<actions>
+					<action function="page">advanced</action>
+					<action function="set">tw_hide_kb=0</action>
+				</actions>
 			</action>
+
+			<object type="action">
+				<touch key="power+voldown" />
+				<action function="screenshot" />
+			</object>
 		</page>
 
 		<page name="sideload">
diff --git a/gui/theme/common/portrait.xml b/gui/theme/common/portrait.xml
index b1ab160..251be75 100755
--- a/gui/theme/common/portrait.xml
+++ b/gui/theme/common/portrait.xml
@@ -80,6 +80,12 @@
 			<font resource="fixed"/>
 		</style>
 
+		<style name="terminal">
+			<fastscroll linecolor="%transparent%" rectcolor="%accent_color%" w="%fastscroll_w%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%"/>
+			<background color="%background_color%"/>
+			<font resource="fixed" spacing="3" color="%text_color%"/>
+		</style>
+
 		<style name="fileselector">
 			<highlight color="%fileselector_highlight_color%"/>
 			<header background="%background_color%" textcolor="%accent_color%" separatorcolor="%accent_color%" separatorheight="%fileselector_separatorheight%"/>
@@ -3167,7 +3173,7 @@
 			<button style="main_button">
 				<placement x="%indent%" y="%row13a_y%"/>
 				<text>{@terminal_btn=Terminal}</text>
-				<action function="page">terminalfolder</action>
+				<action function="page">terminalcommand</action>
 			</button>
 
 			<button style="main_button">
@@ -4082,94 +4088,131 @@
 			</action>
 		</page>
 
-		<page name="terminalfolder">
-			<template name="page"/>
-
-			<text style="text_l">
-				<placement x="%col1_x_header%" y="%row3_header_y%"/>
-				<text>{@term_hdr=Terminal Command}</text>
-			</text>
-
-			<text style="text_m">
-				<placement x="%col1_x_header%" y="%row4_header_y%"/>
-				<text>{@term_sel_folder_hdr=Browse to Starting Folder}</text>
-			</text>
-
-			<template name="sort_options"/>
-
-			<fileselector>
-				<placement x="%indent%" y="%row3_y%" w="%content_width%" h="%fileselector_filemanager_height%"/>
-				<text>%tw_terminal_location%</text>
-				<filter folders="1" files="0"/>
-				<path name="tw_terminal_location" default="/"/>
-				<data name="tw_terminal"/>
-				<selection name="tw_terminal_selection"/>
-			</fileselector>
-
-			<button style="fab">
-				<image resource="fab_selectfolder"/>
-				<action function="page">terminalcommand</action>
-			</button>
-
-			<action>
-				<touch key="home"/>
-				<action function="page">main</action>
-			</action>
-
-			<action>
-				<touch key="back"/>
-				<action function="page">advanced</action>
-			</action>
-		</page>
-
 		<page name="terminalcommand">
 			<template name="page"/>
 
-			<text style="text_l">
-				<placement x="%col1_x_header%" y="%row3_header_y%"/>
-				<text>{term_hdr=Terminal Command}</text>
-			</text>
-
-			<text style="text_m">
-				<placement x="%col1_x_header%" y="%row4_header_y%"/>
-				<text>%tw_terminal_location%</text>
-			</text>
-
-			<template name="console_terminal"/>
-
-			<input>
-				<placement x="%indent%" y="%row11a_y%" w="%content_width%" h="%input_height%"/>
-				<text>%tw_terminal_command%</text>
-				<data name="tw_terminal_command"/>
-				<restrict minlen="1"/>
-				<action function="terminalcommand">%tw_terminal_command%</action>
-			</input>
-
-			<fill color="%accent_color%">
-				<placement x="%indent%" y="row12a_y" w="%content_width%" h="input_line_width" placement="1"/>
+			<fill color="%background_color%">
+				<placement x="0" y="%row2_header_y%" w="%screen_width%" h="%slideout_bg_height%"/>
 			</fill>
 
-			<button>
-				<condition var1="tw_terminal_state" var2="1"/>
-				<highlight color="%highlight_color%"/>
-				<placement x="%btn4_col4_x%" y="%row12a_y%"/>
-				<font resource="font_m" color="%text_button_color%"/>
-				<text>{@term_kill_btn=Kill}</text>
-				<image resource="tab_4"/>
-				<action function="killterminal"/>
-			</button>
+			<terminal>
+				<condition var1="tw_hide_kb" var2="0"/>
+				<placement x="0" y="%row3_header_y%" w="%screen_width%" h="%console_terminal_height%"/>
+			</terminal>
+
+			<terminal>
+				<condition var1="tw_hide_kb" var2="1"/>
+				<placement x="0" y="%row3_header_y%" w="%screen_width%" h="%slideout_height%"/>
+			</terminal>
+
+			<template name="keyboardterminaltemplate"/>
 
 			<template name="keyboardtemplate"/>
 
+			<object type="fill" color="#000000">
+				<placement x="0" y="%navbar_y%" w="%screen_width%" h="%navbar_height%" />
+			</object>
+
+			<object type="button">
+				<condition var1="tw_samsung_navbar" op="!=" var2="1" />
+				<placement x="%back_button_x%" y="%navbar_btn_y%" placement="4" />
+				<image resource="back" />
+				<condition var1="tw_busy" var2="0" />
+				<actions>
+					<action function="set">tw_hide_kb=0</action>
+					<action function="key">back</action>
+				</actions>
+			</object>
+
+			<object type="button">
+				<condition var1="tw_samsung_navbar" op="=" var2="1" />
+				<condition var1="tw_hide_kb" op="=" var2="0" />
+				<placement x="%back_button_x%" y="%navbar_btn_y%" placement="4" />
+				<image resource="kb_hide" />
+				<condition var1="tw_busy" var2="0" />
+				<actions>
+					<action function="set">tw_hide_kb=1</action>
+					<action function="page">terminalcommand</action>
+				</actions>
+			</object>
+
+			<object type="button">
+				<condition var1="tw_samsung_navbar" op="=" var2="1" />
+				<condition var1="tw_hide_kb" op="=" var2="1" />
+				<placement x="%back_button_x%" y="%navbar_btn_y%" placement="4" />
+				<image resource="kb_show" />
+				<condition var1="tw_busy" var2="0" />
+				<actions>
+					<action function="set">tw_hide_kb=0</action>
+					<action function="page">terminalcommand</action>
+				</actions>
+			</object>
+
+			<object type="button">
+				<placement x="%center_x%" y="%navbar_btn_y%" placement="4" />
+				<image resource="home" />
+				<condition var1="tw_busy" var2="0" />
+				<actions>
+					<action function="set">tw_hide_kb=0</action>
+					<action function="key">home</action>
+				</actions>
+			</object>
+
+			<object type="button">
+				<condition var1="tw_samsung_navbar" op="!=" var2="1" />
+				<condition var1="tw_hide_kb" op="=" var2="0" />
+				<placement x="%console_button_x%" y="%navbar_btn_y%" placement="4" />
+				<image resource="kb_hide" />
+				<condition var1="tw_busy" var2="0" />
+				<actions>
+					<action function="set">tw_hide_kb=1</action>
+					<action function="page">terminalcommand</action>
+				</actions>
+			</object>
+
+			<object type="button">
+				<condition var1="tw_samsung_navbar" op="!=" var2="1" />
+				<condition var1="tw_hide_kb" op="=" var2="1" />
+				<placement x="%console_button_x%" y="%navbar_btn_y%" placement="4" />
+				<image resource="kb_show" />
+				<condition var1="tw_busy" var2="0" />
+				<actions>
+					<action function="set">tw_hide_kb=0</action>
+					<action function="page">terminalcommand</action>
+				</actions>
+			</object>
+
+			<object type="button">
+				<condition var1="tw_samsung_navbar" op="=" var2="1" />
+				<placement x="%console_button_x%" y="%navbar_btn_y%" placement="4" />
+				<image resource="back" />
+				<condition var1="tw_busy" var2="0" />
+				<actions>
+					<action function="set">tw_hide_kb=0</action>
+					<action function="key">back</action>
+				</actions>
+			</object>
+
 			<action>
 				<touch key="home"/>
-				<action function="page">main</action>
+				<actions>
+					<action function="set">tw_hide_kb=0</action>
+					<action function="page">main</action>
+				</actions>
 			</action>
 
 			<action>
 				<touch key="back"/>
-				<action function="page">terminalfolder</action>
+				<actions>
+					<action function="set">tw_hide_kb=0</action>
+					<action function="page">advanced</action>
+				</actions>
 			</action>
+
+			<object type="action">
+				<touch key="power+voldown" />
+				<action function="screenshot" />
+			</object>
 		</page>
 
 		<page name="sideload">
diff --git a/gui/theme/common/watch.xml b/gui/theme/common/watch.xml
index 3d68f44..7d343dd 100755
--- a/gui/theme/common/watch.xml
+++ b/gui/theme/common/watch.xml
@@ -77,6 +77,12 @@
 			<font resource="fixed"/>
 		</style>
 
+		<style name="terminal">
+			<fastscroll linecolor="%transparent%" rectcolor="%accent_color%" w="%fastscroll_w%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%"/>
+			<background color="%background_color%"/>
+			<font resource="fixed" spacing="2" color="%text_color%"/>
+		</style>
+
 		<style name="fileselector">
 			<highlight color="%fileselector_highlight_color%"/>
 			<header background="%background_color%" textcolor="%accent_color%" separatorcolor="%accent_color%" separatorheight="%fileselector_separatorheight%"/>
@@ -3871,7 +3877,7 @@
 			<button style="main_button">
 				<placement x="%col1_x_left%" y="%row1_y%"/>
 				<text>{@terminal_btn=Terminal}</text>
-				<action function="page">terminalfolder</action>
+				<action function="page">terminalcommand</action>
 			</button>
 
 			<button style="main_button">
@@ -4934,87 +4940,87 @@
 			</action>
 		</page>
 
-		<page name="terminalfolder">
-			<template name="page"/>
-
-			<template name="statusbar"/>
-
-			<text style="text_m">
-				<placement x="%col1_x_left%" y="%row1_header_y%"/>
-				<text>{@term_s_hdr=Terminal} &gt; {@term_sel_folder_hdr=Browse to Starting Folder}</text>
-			</text>
-
-			<fileselector>
-				<placement x="%col1_x_left%" y="%row2_header_y%" w="%content_width%" h="%fileselector_install_height%"/>
-				<text>%tw_terminal_location%</text>
-				<filter folders="1" files="0"/>
-				<path name="tw_terminal_location" default="/"/>
-				<data name="tw_terminal"/>
-				<selection name="tw_terminal_selection"/>
-			</fileselector>
-
-			<button>
-				<placement x="%btn4_col4_x%" y="%row11_y%"/>
-				<highlight color="%highlight_color%"/>
-				<image resource="q_btn_accept_transp"/>
-				<action function="page">terminalcommand</action>
-			</button>
-
-			<action>
-				<touch key="home"/>
-				<action function="page">main</action>
-			</action>
-
-			<action>
-				<touch key="back"/>
-				<action function="page">advanced</action>
-			</action>
-		</page>
-
 		<page name="terminalcommand">
-			<template name="page"/>
+			<terminal>
+				<condition var1="tw_hide_kb" var2="0"/>
+				<placement x="0" y="0" w="%screen_width%" h="%console_terminal_s_height%"/>
+			</terminal>
 
-			<template name="statusbar"/>
+			<terminal>
+				<condition var1="tw_hide_kb" var2="1"/>
+				<placement x="0" y="0" w="%screen_width%" h="%console_terminal_l_height%"/>
+			</terminal>
 
-			<text style="text_m">
-				<placement x="%col1_x_left%" y="%row1_header_y%"/>
-				<text>{@term_s_hdr=Terminal} &gt; %tw_terminal_location%</text>
-			</text>
-
-			<template name="console_terminal"/>
-
-			<input>
-				<placement x="%col1_x_left%" y="%row5a_y%" w="%input_line_console%" h="%input_height%"/>
-				<text>%tw_terminal_command%</text>
-				<data name="tw_terminal_command"/>
-				<restrict minlen="1"/>
-				<action function="terminalcommand">%tw_terminal_command%</action>
-			</input>
-
-			<fill color="%accent_color%">
-				<placement x="%col1_x_left%" y="row6a_input_y" w="%input_line_console%" h="input_line_width" placement="1"/>
-			</fill>
-
-			<button>
-				<condition var1="tw_terminal_state" var2="1"/>
-				<highlight color="%highlight_color%"/>
-				<placement x="%close_btn_x%" y="%row5_y%"/>
-				<font resource="font_m" color="%text_button_color%"/>
-				<image resource="close"/>
-				<action function="killterminal"/>
-			</button>
+			<template name="keyboardterminaltemplate"/>
 
 			<template name="keyboardtemplate"/>
 
+			<object type="fill" color="#000000">
+				<placement x="0" y="%navbar_y%" w="%screen_width%" h="%navbar_height%" />
+			</object>
+
+			<object type="button">
+				<placement x="%back_button_x%" y="%navbar_btn_y%" placement="4" />
+				<image resource="back" />
+				<condition var1="tw_busy" var2="0" />
+				<actions>
+					<action function="set">tw_hide_kb=0</action>
+					<action function="key">back</action>
+				</actions>
+			</object>
+
+			<object type="button">
+				<placement x="%center_x%" y="%navbar_btn_y%" placement="4" />
+				<image resource="home" />
+				<condition var1="tw_busy" var2="0" />
+				<actions>
+					<action function="set">tw_hide_kb=0</action>
+					<action function="key">home</action>
+				</actions>
+			</object>
+
+			<object type="button">
+				<condition var1="tw_hide_kb" var2="0"/>
+				<placement x="%console_button_x%" y="%navbar_btn_y%" placement="4" />
+				<image resource="kb_hide" />
+				<condition var1="tw_busy" var2="0" />
+				<actions>
+					<action function="set">tw_hide_kb=1</action>
+					<action function="page">terminalcommand</action>
+				</actions>
+			</object>
+
+			<object type="button">
+				<condition var1="tw_hide_kb" var2="1"/>
+				<placement x="%console_button_x%" y="%navbar_btn_y%" placement="4" />
+				<image resource="kb_show" />
+				<condition var1="tw_busy" var2="0" />
+				<actions>
+					<action function="set">tw_hide_kb=0</action>
+					<action function="page">terminalcommand</action>
+				</actions>
+			</object>
+
 			<action>
 				<touch key="home"/>
-				<action function="page">main</action>
+				<actions>
+					<action function="set">tw_hide_kb=0</action>
+					<action function="page">main</action>
+				</actions>
 			</action>
 
 			<action>
 				<touch key="back"/>
-				<action function="page">terminalfolder</action>
+				<actions>
+					<action function="set">tw_hide_kb=0</action>
+					<action function="page">advanced</action>
+				</actions>
 			</action>
+
+			<object type="action">
+				<touch key="power+voldown" />
+				<action function="screenshot" />
+			</object>
 		</page>
 
 		<page name="sideload">
diff --git a/gui/theme/landscape_hdpi/images/backspace_terminal.png b/gui/theme/landscape_hdpi/images/backspace_terminal.png
new file mode 100644
index 0000000..2e7cf8d
--- /dev/null
+++ b/gui/theme/landscape_hdpi/images/backspace_terminal.png
Binary files differ
diff --git a/gui/theme/landscape_hdpi/images/enter_terminal.png b/gui/theme/landscape_hdpi/images/enter_terminal.png
new file mode 100644
index 0000000..15fc155
--- /dev/null
+++ b/gui/theme/landscape_hdpi/images/enter_terminal.png
Binary files differ
diff --git a/gui/theme/landscape_hdpi/images/kb_arrow_down.png b/gui/theme/landscape_hdpi/images/kb_arrow_down.png
new file mode 100644
index 0000000..a14750e
--- /dev/null
+++ b/gui/theme/landscape_hdpi/images/kb_arrow_down.png
Binary files differ
diff --git a/gui/theme/landscape_hdpi/images/kb_arrow_left.png b/gui/theme/landscape_hdpi/images/kb_arrow_left.png
new file mode 100644
index 0000000..85c868e
--- /dev/null
+++ b/gui/theme/landscape_hdpi/images/kb_arrow_left.png
Binary files differ
diff --git a/gui/theme/landscape_hdpi/images/kb_arrow_right.png b/gui/theme/landscape_hdpi/images/kb_arrow_right.png
new file mode 100644
index 0000000..df7954b
--- /dev/null
+++ b/gui/theme/landscape_hdpi/images/kb_arrow_right.png
Binary files differ
diff --git a/gui/theme/landscape_hdpi/images/kb_arrow_up.png b/gui/theme/landscape_hdpi/images/kb_arrow_up.png
new file mode 100644
index 0000000..d5b76e2
--- /dev/null
+++ b/gui/theme/landscape_hdpi/images/kb_arrow_up.png
Binary files differ
diff --git a/gui/theme/landscape_hdpi/images/kb_hide.png b/gui/theme/landscape_hdpi/images/kb_hide.png
new file mode 100644
index 0000000..33c8689
--- /dev/null
+++ b/gui/theme/landscape_hdpi/images/kb_hide.png
Binary files differ
diff --git a/gui/theme/landscape_hdpi/images/kb_show.png b/gui/theme/landscape_hdpi/images/kb_show.png
new file mode 100644
index 0000000..7eb6bea
--- /dev/null
+++ b/gui/theme/landscape_hdpi/images/kb_show.png
Binary files differ
diff --git a/gui/theme/landscape_hdpi/images/shift_terminal.png b/gui/theme/landscape_hdpi/images/shift_terminal.png
new file mode 100644
index 0000000..e4a19e5
--- /dev/null
+++ b/gui/theme/landscape_hdpi/images/shift_terminal.png
Binary files differ
diff --git a/gui/theme/landscape_hdpi/images/shift_terminal_fill.png b/gui/theme/landscape_hdpi/images/shift_terminal_fill.png
new file mode 100644
index 0000000..c76ac7a
--- /dev/null
+++ b/gui/theme/landscape_hdpi/images/shift_terminal_fill.png
Binary files differ
diff --git a/gui/theme/landscape_hdpi/images/space.png b/gui/theme/landscape_hdpi/images/space.png
index ece8100..143fbcb 100644
--- a/gui/theme/landscape_hdpi/images/space.png
+++ b/gui/theme/landscape_hdpi/images/space.png
Binary files differ
diff --git a/gui/theme/landscape_hdpi/images/space_terminal.png b/gui/theme/landscape_hdpi/images/space_terminal.png
new file mode 100644
index 0000000..a370c86
--- /dev/null
+++ b/gui/theme/landscape_hdpi/images/space_terminal.png
Binary files differ
diff --git a/gui/theme/landscape_hdpi/ui.xml b/gui/theme/landscape_hdpi/ui.xml
index e6a6b68..c3bb96f 100644
--- a/gui/theme/landscape_hdpi/ui.xml
+++ b/gui/theme/landscape_hdpi/ui.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0"?>
-
 <recovery>
 	<details>
-		<resolution width="1920" height="1200" />
+		<resolution width="1920" height="1200"/>
 		<author>TeamWin</author>
 		<title>Backup Naowz</title>
 		<description>Default basic theme</description>
@@ -10,590 +9,665 @@
 	</details>
 
 	<include>
-		<xmlfile name="landscape.xml" />
+		<xmlfile name="landscape.xml"/>
 	</include>
 
 	<resources>
-		<resource name="font_l" type="font"  filename="RobotoCondensed-Regular.ttf" size="42" />
-		<resource name="font_m" type="font" filename="RobotoCondensed-Regular.ttf" size="32" />
-		<resource name="font_s" type="font" filename="RobotoCondensed-Regular.ttf" size="28" />
-		<resource name="fixed" type="font" filename="DroidSansMono.ttf" size="26" />
+		<font name="font_l" filename="RobotoCondensed-Regular.ttf" size="42"/>
+		<font name="font_m" filename="RobotoCondensed-Regular.ttf" size="32"/>
+		<font name="font_s" filename="RobotoCondensed-Regular.ttf" size="28"/>
+		<font name="fixed" filename="DroidSansMono.ttf" size="26"/>
 
-		<resource name="keylabel" type="font" filename="RobotoCondensed-Regular.ttf" size="50" />
-		<resource name="keylabel-small" type="font" filename="RobotoCondensed-Regular.ttf" size="42" />
-		<resource name="keylabel-longpress" type="font" filename="RobotoCondensed-Regular.ttf" size="26" />
+		<font name="keylabel" filename="RobotoCondensed-Regular.ttf" size="50"/>
+		<font name="keylabel-small" filename="RobotoCondensed-Regular.ttf" size="42"/>
+		<font name="keylabel-longpress" filename="RobotoCondensed-Regular.ttf" size="26"/>
 
-		<resource name="logo" type="image" filename="logo" retainaspect="1" />
-		<resource name="main_button" type="image" filename="main_button" />
-		<resource name="main_button_half_width" type="image" filename="main_button_half_width" />
-		<resource name="main_button_half_width_low" type="image" filename="main_button_half_width_low" />
-		<resource name="tab_3" type="image" filename="tab_3" />
-		<resource name="tab_4" type="image" filename="tab_4" />
-		<resource name="file" type="image" filename="file" retainaspect="1" />
-		<resource name="folder" type="image" filename="folder" retainaspect="1" />
-		<resource name="unlock_icon" type="image" filename="unlock_icon" retainaspect="1" />
-		<resource name="home" type="image" filename="home" retainaspect="1" />
-		<resource name="back" type="image" filename="back" retainaspect="1" />
-		<resource name="console" type="image" filename="console" retainaspect="1" />
-		<resource name="checkbox_false" type="image" filename="checkbox_false" retainaspect="1" />
-		<resource name="checkbox_true" type="image" filename="checkbox_true" retainaspect="1" />
-		<resource name="radio_false" type="image" filename="radio_false" retainaspect="1" />
-		<resource name="radio_true" type="image" filename="radio_true" retainaspect="1" />
-		<resource name="sort_asc" type="image" filename="sort_asc" />
-		<resource name="sort_desc" type="image" filename="sort_desc" />
-		<resource name="sort_empty" type="image" filename="sort_empty" />
-		<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="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="handle" type="image" filename="handle" />
-		<resource name="cursor" type="image" filename="cursor" retainaspect="1" />
+		<image name="logo" filename="logo" retainaspect="1"/>
+		<image name="main_button" filename="main_button"/>
+		<image name="main_button_half_width" filename="main_button_half_width"/>
+		<image name="main_button_half_width_low" filename="main_button_half_width_low"/>
+		<image name="tab_3" filename="tab_3"/>
+		<image name="tab_4" filename="tab_4"/>
+		<image name="file" filename="file" retainaspect="1"/>
+		<image name="folder" filename="folder" retainaspect="1"/>
+		<image name="unlock_icon" filename="unlock_icon" retainaspect="1"/>
+		<image name="home" filename="home" retainaspect="1"/>
+		<image name="back" filename="back" retainaspect="1"/>
+		<image name="console" filename="console" retainaspect="1"/>
+		<image name="kb_hide" filename="kb_hide" retainaspect="1"/>
+		<image name="kb_show" filename="kb_show" retainaspect="1"/>
+		<image name="checkbox_false" filename="checkbox_false" retainaspect="1"/>
+		<image name="checkbox_true" filename="checkbox_true" retainaspect="1"/>
+		<image name="radio_false" filename="radio_false" retainaspect="1"/>
+		<image name="radio_true" filename="radio_true" retainaspect="1"/>
+		<image name="sort_asc" filename="sort_asc"/>
+		<image name="sort_desc" filename="sort_desc"/>
+		<image name="sort_empty" filename="sort_empty"/>
+		<animation name="progress" filename="indeterminate"/>
+		<image name="progress_empty" filename="progress_empty"/>
+		<image name="progress_full" filename="progress_fill"/>
+		<image name="slider" filename="slider"/>
+		<image name="slider_used" filename="slider_used"/>
+		<image name="slider_touch" filename="slider_touch"/>
+		<image name="handle" filename="handle"/>
+		<image name="cursor" filename="cursor" retainaspect="1"/>
 
-		<resource name="backspace" type="image" filename="backspace" retainaspect="1" />
-		<resource name="enter" type="image" filename="enter" retainaspect="1" />
-		<resource name="shift" type="image" filename="shift" retainaspect="1" />
-		<resource name="shift_fill" type="image" filename="shift_fill" retainaspect="1" />
-		<resource name="space" type="image" filename="space" retainaspect="1" />
+		<image name="backspace" filename="backspace" retainaspect="1"/>
+		<image name="backspace_terminal" filename="backspace_terminal" retainaspect="1"/>
+		<image name="enter" filename="enter" retainaspect="1"/>
+		<image name="enter_terminal" filename="enter_terminal" retainaspect="1"/>
+		<image name="shift" filename="shift" retainaspect="1"/>
+		<image name="shift_terminal" filename="shift_terminal" retainaspect="1"/>
+		<image name="shift_fill" filename="shift_fill" retainaspect="1"/>
+		<image name="shift_terminal_fill" filename="shift_terminal_fill" retainaspect="1"/>
+		<image name="space" filename="space" retainaspect="1"/>
+		<image name="space_terminal" filename="space_terminal" retainaspect="1"/>
+		<image name="kb_arrow_left" filename="kb_arrow_left" retainaspect="1"/>
+		<image name="kb_arrow_right" filename="kb_arrow_right" retainaspect="1"/>
+		<image name="kb_arrow_up" filename="kb_arrow_up" retainaspect="1"/>
+		<image name="kb_arrow_down" filename="kb_arrow_down" retainaspect="1"/>
 	</resources>
 
 	<variables>
-		<variable name="tw_samsung_navbar" value="0" persist="1" />
-		<variable name="tw_navbar_button_position" value="0" persist="1" />
+		<variable name="tw_samsung_navbar" value="0" persist="1"/>
+		<variable name="tw_navbar_button_position" value="0" persist="1"/>
+		<variable name="tw_hide_kb" value="0" persist="1"/>
 
-		<variable name="screen_width" value="1920" />
-		<variable name="screen_height" value="1200" />
-		<variable name="status_height" value="48" />
-		<variable name="header_height" value="192" />
-		<variable name="navbar_height" value="96" />
-		<variable name="content_width" value="1824" />
-		<variable name="content_quarter_width" value="1416" />
-		<variable name="content_half_width" value="888" />
-		<variable name="content_overlay_width" value="912" />
-		<variable name="dialog_height" value="528" />
-		<variable name="dialog_width" value="960" />
-		<variable name="dialog_content_x" value="528" />
-		<variable name="back_button_x" value="633" />
-		<variable name="console_button_x" value="1287" />
-		<variable name="back_button_x_1" value="120" />
-		<variable name="home_button_x_1" value="320" />
-		<variable name="console_button_x_1" value="520" />
-		<variable name="back_button_x_2" value="1400" />
-		<variable name="home_button_x_2" value="1600" />
-		<variable name="console_button_x_2" value="1800" />
-		<variable name="col1_x_header" value="144" />
-		<variable name="indent" value="24" />
-		<variable name="col1_x_left" value="48" />
-		<variable name="col2_x_left" value="504" />
-		<variable name="center_x" value="960" />
-		<variable name="col1_x_right" value="984" />
-		<variable name="col2_x_right" value="1416" />
-		<variable name="col_button_right" value="1488" />
-		<variable name="indent_right" value="1896" />
-		<variable name="tab_height" value="72" />
-		<variable name="tab_indicator_height" value="4" />
-		<variable name="tab4_width" value="480" />
-		<variable name="tab5_width" value="384" />
-		<variable name="tab4_col2_x" value="480" />
-		<variable name="tab4_col4_x" value="1440" />
-		<variable name="tab5_col2_x" value="384" />
-		<variable name="tab5_col3_x" value="768" />
-		<variable name="tab5_col4_x" value="1152" />
-		<variable name="tab5_col5_x" value="1536" />
-		<variable name="btn4_col2_x_left" value="282" />
-		<variable name="btn4_col3_x_left" value="516" />
-		<variable name="btn4_col4_x_left" value="750" />
-		<variable name="btn4_col2_x_right" value="1218" />
-		<variable name="btn4_col3_x_right" value="1452" />
-		<variable name="btn4_col4_x_right" value="1686" />
-		<variable name="row1_header_y" value="0" />
-		<variable name="row2_header_y" value="48" />
-		<variable name="row3_header_y" value="60" />
-		<variable name="row4_header_y" value="126" />
-		<variable name="row1_y" value="192" />
-		<variable name="row1a_y" value="216" />
-		<variable name="row2_y" value="240" />
-		<variable name="row2a_y" value="264" />
-		<variable name="row_tab_y" value="260" />
-		<variable name="row2_input_y" value="286" />
-		<variable name="row3_y" value="288" />
-		<variable name="row3a_y" value="312" />
-		<variable name="row3_input_y" value="334" />
-		<variable name="row4_y" value="336" />
-		<variable name="row4a_y" value="360" />
-		<variable name="row4_input_y" value="382" />
-		<variable name="row5_y" value="384" />
-		<variable name="row5a_y" value="408" />
-		<variable name="row6_y" value="432" />
-		<variable name="row6a_y" value="456" />
-		<variable name="row7_y" value="480" />
-		<variable name="row7a_y" value="504" />
-		<variable name="row8_y" value="528" />
-		<variable name="row8a_y" value="552" />
-		<variable name="row9_y" value="576" />
-		<variable name="row9a_y" value="600" />
-		<variable name="row10_y" value="624" />
-		<variable name="row10a_y" value="648" />
-		<variable name="row11_y" value="672" />
-		<variable name="row11a_y" value="696" />
-		<variable name="row12_y" value="720" />
-		<variable name="row12a_y" value="744" />
-		<variable name="row13_y" value="768" />
-		<variable name="row13a_y" value="792" />
-		<variable name="row14_y" value="816" />
-		<variable name="row14a_y" value="840" />
-		<variable name="row15_y" value="864" />
-		<variable name="row15a_y" value="888" />
-		<variable name="row16_y" value="912" />
-		<variable name="row16a_y" value="936" />
-		<variable name="row17_y" value="960" />
-		<variable name="row17a_y" value="984" />
-		<variable name="row18_y" value="1008" />
-		<variable name="row18a_y" value="1032" />
-		<variable name="row19_y" value="1056" />
-		<variable name="row19a_y" value="1080" />
-		<variable name="row20_y" value="1104" />
-		<variable name="navbar_y" value="1104" />
-		<variable name="navbar_btn_y" value="1152" />
-		<variable name="keyboard_y" value="592" />
-		<variable name="background_color" value="#1A1A1A" />
-		<variable name="accent_color" value="#0090CA" />
-		<variable name="text_color" value="#EEEEEE" />
-		<variable name="text_button_color" value="#EEEEEE" />
-		<variable name="text_success_color" value="#76FF03" />
-		<variable name="text_fail_color" value="#FF0101" />
-		<variable name="highlight_color" value="#1A1A1A80" />
-		<variable name="caps_highlight_color" value="#22222280" />
-		<variable name="transparent" value="#00000000" />
-		<variable name="semi_transparent" value="#00000099" />
-		<variable name="warning" value="#F8F8A0" />
-		<variable name="error" value="#FF0101" />
-		<variable name="highlight" value="#0090CA" />
-		<variable name="fileselector_linecolor" value="#555555" />
-		<variable name="fileselector_highlight_color" value="#555555" />
-		<variable name="fileselector_separatorheight" value="2" />
-		<variable name="fileselector_spacing" value="0" />
-		<variable name="fileselector_install_height" value="840" />
-		<variable name="fileselector_install_width" value="960" />
-		<variable name="fileselector_install_folder_width" value="408" />
-		<variable name="fileselector_filemanager_height" value="840" />
-		<variable name="partitionlist_spacing" value="0" />
-		<variable name="partitionlist_storage_height" value="400" />
-		<variable name="partitionlist_flashimage_height" value="448" />
-		<variable name="partitionlist_wipe_height" value="600" />
-		<variable name="partitionlist_mount_height" value="552" />
-		<variable name="partitionlist_backup_height" value="528" />
-		<variable name="listbox_timezone_height" value="768" />
-		<variable name="listbox_settings_height" value="648" />
-		<variable name="fastscroll_w" value="18" />
-		<variable name="fastscroll_linew" value="2" />
-		<variable name="fastscroll_rectw" value="18" />
-		<variable name="fastscroll_recth" value="96" />
-		<variable name="slidervalue_lineh" value="3" />
-		<variable name="slidervalue_padding" value="0" />
-		<variable name="slidervalue_sliderw" value="72" />
-		<variable name="slidervalue_sliderh" value="96" />
-		<variable name="slideout_y" value="96" />
-		<variable name="slideout_height" value="960" />
-		<variable name="slideout_bg_height" value="1056" />
-		<variable name="input_height" value="48" />
-		<variable name="input_line_width" value="3" />
-		<variable name="console_height" value="624" />
-		<variable name="console_terminal_height" value="420" />
-		<variable name="dialog_button_x" value="1176" />
-		<variable name="date_button_x" value="552" />
-		<variable name="progress_x" value="552" />
-		<variable name="progress_text_x" value="96" />
-		<variable name="progress_text_y" value="900" />
-		<variable name="pattern_x" value="180" />
-		<variable name="pattern_dot_dia" value="32" />
-		<variable name="pattern_line_w" value="12" />
-		<variable name="pattern_size" value="648" />
+		<variable name="screen_width" value="1920"/>
+		<variable name="screen_height" value="1200"/>
+		<variable name="status_height" value="48"/>
+		<variable name="header_height" value="192"/>
+		<variable name="navbar_height" value="96"/>
+		<variable name="content_width" value="1824"/>
+		<variable name="content_quarter_width" value="1416"/>
+		<variable name="content_half_width" value="888"/>
+		<variable name="content_overlay_width" value="912"/>
+		<variable name="dialog_height" value="528"/>
+		<variable name="dialog_width" value="960"/>
+		<variable name="dialog_content_x" value="528"/>
+		<variable name="back_button_x" value="633"/>
+		<variable name="console_button_x" value="1287"/>
+		<variable name="back_button_x_1" value="120"/>
+		<variable name="home_button_x_1" value="320"/>
+		<variable name="console_button_x_1" value="520"/>
+		<variable name="back_button_x_2" value="1400"/>
+		<variable name="home_button_x_2" value="1600"/>
+		<variable name="console_button_x_2" value="1800"/>
+		<variable name="col1_x_header" value="144"/>
+		<variable name="indent" value="24"/>
+		<variable name="col1_x_left" value="48"/>
+		<variable name="col2_x_left" value="504"/>
+		<variable name="center_x" value="960"/>
+		<variable name="col1_x_right" value="984"/>
+		<variable name="col2_x_right" value="1416"/>
+		<variable name="col_button_right" value="1488"/>
+		<variable name="indent_right" value="1896"/>
+		<variable name="tab_height" value="72"/>
+		<variable name="tab_indicator_height" value="4"/>
+		<variable name="tab4_width" value="480"/>
+		<variable name="tab5_width" value="384"/>
+		<variable name="tab4_col2_x" value="480"/>
+		<variable name="tab4_col4_x" value="1440"/>
+		<variable name="tab5_col2_x" value="384"/>
+		<variable name="tab5_col3_x" value="768"/>
+		<variable name="tab5_col4_x" value="1152"/>
+		<variable name="tab5_col5_x" value="1536"/>
+		<variable name="btn4_col2_x_left" value="282"/>
+		<variable name="btn4_col3_x_left" value="516"/>
+		<variable name="btn4_col4_x_left" value="750"/>
+		<variable name="btn4_col2_x_right" value="1218"/>
+		<variable name="btn4_col3_x_right" value="1452"/>
+		<variable name="btn4_col4_x_right" value="1686"/>
+		<variable name="row1_header_y" value="0"/>
+		<variable name="row2_header_y" value="48"/>
+		<variable name="row3_header_y" value="60"/>
+		<variable name="row4_header_y" value="126"/>
+		<variable name="row1_y" value="192"/>
+		<variable name="row1a_y" value="216"/>
+		<variable name="row2_y" value="240"/>
+		<variable name="row2a_y" value="264"/>
+		<variable name="row_tab_y" value="260"/>
+		<variable name="row2_input_y" value="286"/>
+		<variable name="row3_y" value="288"/>
+		<variable name="row3a_y" value="312"/>
+		<variable name="row3_input_y" value="334"/>
+		<variable name="row4_y" value="336"/>
+		<variable name="row4a_y" value="360"/>
+		<variable name="row4_input_y" value="382"/>
+		<variable name="row5_y" value="384"/>
+		<variable name="row5a_y" value="408"/>
+		<variable name="row6_y" value="432"/>
+		<variable name="row6a_y" value="456"/>
+		<variable name="row7_y" value="480"/>
+		<variable name="row7a_y" value="504"/>
+		<variable name="row8_y" value="528"/>
+		<variable name="row8a_y" value="552"/>
+		<variable name="row9_y" value="576"/>
+		<variable name="row9a_y" value="600"/>
+		<variable name="row10_y" value="624"/>
+		<variable name="row10a_y" value="648"/>
+		<variable name="row11_y" value="672"/>
+		<variable name="row11a_y" value="696"/>
+		<variable name="row12_y" value="720"/>
+		<variable name="row12a_y" value="744"/>
+		<variable name="row13_y" value="768"/>
+		<variable name="row13a_y" value="792"/>
+		<variable name="row14_y" value="816"/>
+		<variable name="row14a_y" value="840"/>
+		<variable name="row15_y" value="864"/>
+		<variable name="row15a_y" value="888"/>
+		<variable name="row16_y" value="912"/>
+		<variable name="row16a_y" value="936"/>
+		<variable name="row17_y" value="960"/>
+		<variable name="row17a_y" value="984"/>
+		<variable name="row18_y" value="1008"/>
+		<variable name="row18a_y" value="1032"/>
+		<variable name="row19_y" value="1056"/>
+		<variable name="row19a_y" value="1080"/>
+		<variable name="row20_y" value="1104"/>
+		<variable name="navbar_y" value="1104"/>
+		<variable name="navbar_btn_y" value="1152"/>
+		<variable name="keyboard_y" value="592"/>
+		<variable name="background_color" value="#1A1A1A"/>
+		<variable name="accent_color" value="#0090CA"/>
+		<variable name="text_color" value="#EEEEEE"/>
+		<variable name="text_button_color" value="#EEEEEE"/>
+		<variable name="text_success_color" value="#76FF03"/>
+		<variable name="text_fail_color" value="#FF0101"/>
+		<variable name="highlight_color" value="#1A1A1A80"/>
+		<variable name="caps_highlight_color" value="#22222280"/>
+		<variable name="transparent" value="#00000000"/>
+		<variable name="semi_transparent" value="#00000099"/>
+		<variable name="warning" value="#F8F8A0"/>
+		<variable name="error" value="#FF0101"/>
+		<variable name="highlight" value="#0090CA"/>
+		<variable name="fileselector_linecolor" value="#555555"/>
+		<variable name="fileselector_highlight_color" value="#555555"/>
+		<variable name="fileselector_separatorheight" value="2"/>
+		<variable name="fileselector_spacing" value="0"/>
+		<variable name="fileselector_install_height" value="840"/>
+		<variable name="fileselector_install_width" value="960"/>
+		<variable name="fileselector_install_folder_width" value="408"/>
+		<variable name="fileselector_filemanager_height" value="840"/>
+		<variable name="partitionlist_spacing" value="0"/>
+		<variable name="partitionlist_storage_height" value="400"/>
+		<variable name="partitionlist_flashimage_height" value="448"/>
+		<variable name="partitionlist_wipe_height" value="600"/>
+		<variable name="partitionlist_mount_height" value="552"/>
+		<variable name="partitionlist_backup_height" value="528"/>
+		<variable name="listbox_timezone_height" value="768"/>
+		<variable name="listbox_settings_height" value="648"/>
+		<variable name="fastscroll_w" value="18"/>
+		<variable name="fastscroll_linew" value="2"/>
+		<variable name="fastscroll_rectw" value="18"/>
+		<variable name="fastscroll_recth" value="96"/>
+		<variable name="slidervalue_lineh" value="3"/>
+		<variable name="slidervalue_padding" value="0"/>
+		<variable name="slidervalue_sliderw" value="72"/>
+		<variable name="slidervalue_sliderh" value="96"/>
+		<variable name="slideout_y" value="96"/>
+		<variable name="slideout_height" value="960"/>
+		<variable name="slideout_bg_height" value="1056"/>
+		<variable name="input_height" value="48"/>
+		<variable name="input_line_width" value="3"/>
+		<variable name="console_height" value="624"/>
+		<variable name="console_terminal_height" value="420"/>
+		<variable name="terminal_s_height" value="520"/>
+		<variable name="terminal_l_height" value="1032"/>
+		<variable name="dialog_button_x" value="1176"/>
+		<variable name="date_button_x" value="552"/>
+		<variable name="progress_x" value="552"/>
+		<variable name="progress_text_x" value="96"/>
+		<variable name="progress_text_y" value="900"/>
+		<variable name="pattern_x" value="180"/>
+		<variable name="pattern_dot_dia" value="32"/>
+		<variable name="pattern_line_w" value="12"/>
+		<variable name="pattern_size" value="648"/>
 	</variables>
 
 	<mousecursor>
-		<placement w="15" h="15" />
-		<background color="#FFFF00FF" resource="cursor" />
-		<speed multiplier="2.5" />
+		<placement w="15" h="15"/>
+		<background color="#FFFF00FF" resource="cursor"/>
+		<speed multiplier="2.5"/>
 	</mousecursor>
 
 	<templates>
 		<template name="page">
-			<background color="%background_color%" />
+			<background color="%background_color%"/>
 
-			<object type="fill" color="%accent_color%">
-				<placement x="0" y="0" w="%screen_width%" h="%header_height%" />
-			</object>
+			<fill color="%accent_color%">
+				<placement x="0" y="0" w="%screen_width%" h="%header_height%"/>
+			</fill>
 
-			<object type="image">
-				<condition var1="tw_busy" var2="1" />
-				<image resource="logo" />
-				<placement x="0" y="0" />
-			</object>
+			<image>
+				<condition var1="tw_busy" var2="1"/>
+				<image resource="logo"/>
+				<placement x="0" y="0"/>
+			</image>
 
-			<object type="button">
-				<condition var1="tw_busy" var2="0" />
-				<placement x="0" y="0" />
-				<image resource="logo" />
+			<button>
+				<condition var1="tw_busy" var2="0"/>
+				<placement x="0" y="0"/>
+				<image resource="logo"/>
 				<action function="key">home</action>
-			</object>
+			</button>
 
-			<object type="fill" color="#00000030">
-				<condition var1="tw_simulate_actions" var2="0" />
-				<placement x="0" y="0" w="%screen_width%" h="%status_height%" />
-			</object>
+			<fill color="#00000030">
+				<condition var1="tw_simulate_actions" var2="0"/>
+				<placement x="0" y="0" w="%screen_width%" h="%status_height%"/>
+			</fill>
 
-			<object type="fill" color="%text_fail_color%">
-				<condition var1="tw_simulate_actions" var2="1" />
-				<placement x="0" y="0" w="%screen_width%" h="%status_height%" />
-			</object>
+			<fill color="%text_fail_color%">
+				<condition var1="tw_simulate_actions" var2="1"/>
+				<placement x="0" y="0" w="%screen_width%" h="%status_height%"/>
+			</fill>
 
-			<object type="text" color="%text_color%">
-				<condition var1="tw_no_cpu_temp" var2="1" />
-				<font resource="font_m" />
-				<placement x="%indent%" y="%row1_header_y%" />
+			<text color="%text_color%">
+				<condition var1="tw_no_cpu_temp" var2="1"/>
+				<font resource="font_m"/>
+				<placement x="%indent%" y="%row1_header_y%"/>
 				<text>%tw_version%</text>
-			</object>
+			</text>
 
-			<object type="text" color="%text_color%">
-				<condition var1="tw_no_cpu_temp" var2="0" />
-				<font resource="font_m" />
-				<placement x="%indent%" y="%row1_header_y%" />
-				<text>{@cpu_temp=CPU: %tw_cpu_temp% &#xB0;C}</text>
-			</object>
+			<text color="%text_color%">
+				<condition var1="tw_no_cpu_temp" var2="0"/>
+				<font resource="font_m"/>
+				<placement x="%indent%" y="%row1_header_y%"/>
+				<text>{@cpu_temp=CPU: %tw_cpu_temp% °C}</text>
+			</text>
 
-			<object type="text" color="%text_color%">
-				<font resource="font_m" />
-				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
+			<text color="%text_color%">
+				<font resource="font_m"/>
+				<placement x="%center_x%" y="%row1_header_y%" placement="5"/>
 				<text>%tw_time%</text>
-			</object>
+			</text>
 
-			<object type="text" color="%text_color%">
+			<text color="%text_color%">
 				<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" />
+					<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>
-				<font resource="font_m" />
-				<placement x="%indent_right%" y="%row1_header_y%" placement="1" />
+				<font resource="font_m"/>
+				<placement x="%indent_right%" y="%row1_header_y%" placement="1"/>
 				<text>{@battery_pct=Battery: %tw_battery%}</text>
-			</object>
+			</text>
 
-			<object type="fill" color="#000000">
-				<placement x="0" y="%navbar_y%" w="%screen_width%" h="%navbar_height%" />
-			</object>
+			<fill color="#000000">
+				<placement x="0" y="%navbar_y%" w="%screen_width%" h="%navbar_height%"/>
+			</fill>
 
-			<object type="button">
-				<condition var1="tw_navbar_button_position" op="=" var2="0" />
-				<condition var1="tw_samsung_navbar" op="!=" var2="1" />
-				<placement x="%back_button_x%" y="%navbar_btn_y%" placement="4" />
-				<image resource="back" />
-				<condition var1="tw_busy" var2="0" />
+			<button>
+				<condition var1="tw_navbar_button_position" op="=" var2="0"/>
+				<condition var1="tw_samsung_navbar" op="!=" var2="1"/>
+				<placement x="%back_button_x%" y="%navbar_btn_y%" placement="4"/>
+				<image resource="back"/>
+				<condition var1="tw_busy" var2="0"/>
 				<action function="key">back</action>
-			</object>
+			</button>
 
-			<object type="button">
-				<condition var1="tw_navbar_button_position" op="=" var2="0" />
-				<condition var1="tw_samsung_navbar" op="=" var2="1" />
-				<placement x="%back_button_x%" y="%navbar_btn_y%" placement="4" />
-				<image resource="console" />
-				<condition var1="tw_busy" var2="0" />
+			<button>
+				<condition var1="tw_navbar_button_position" op="=" var2="0"/>
+				<condition var1="tw_samsung_navbar" op="=" var2="1"/>
+				<placement x="%back_button_x%" y="%navbar_btn_y%" placement="4"/>
+				<image resource="console"/>
+				<condition var1="tw_busy" var2="0"/>
 				<action function="overlay">slideout</action>
-			</object>
+			</button>
 
-			<object type="button">
-				<condition var1="tw_navbar_button_position" op="=" var2="0" />
-				<placement x="%center_x%" y="%navbar_btn_y%" placement="4" />
-				<image resource="home" />
-				<condition var1="tw_busy" var2="0" />
+			<button>
+				<condition var1="tw_navbar_button_position" op="=" var2="0"/>
+				<placement x="%center_x%" y="%navbar_btn_y%" placement="4"/>
+				<image resource="home"/>
+				<condition var1="tw_busy" var2="0"/>
 				<action function="key">home</action>
-			</object>
+			</button>
 
-			<object type="button">
-				<condition var1="tw_navbar_button_position" op="=" var2="0" />
-				<condition var1="tw_samsung_navbar" op="!=" var2="1" />
-				<placement x="%console_button_x%" y="%navbar_btn_y%" placement="4" />
-				<image resource="console" />
-				<condition var1="tw_busy" var2="0" />
+			<button>
+				<condition var1="tw_navbar_button_position" op="=" var2="0"/>
+				<condition var1="tw_samsung_navbar" op="!=" var2="1"/>
+				<placement x="%console_button_x%" y="%navbar_btn_y%" placement="4"/>
+				<image resource="console"/>
+				<condition var1="tw_busy" var2="0"/>
 				<action function="overlay">slideout</action>
-			</object>
+			</button>
 
-			<object type="button">
-				<condition var1="tw_navbar_button_position" op="=" var2="0" />
-				<condition var1="tw_samsung_navbar" op="=" var2="1" />
-				<placement x="%console_button_x%" y="%navbar_btn_y%" placement="4" />
-				<image resource="back" />
-				<condition var1="tw_busy" var2="0" />
+			<button>
+				<condition var1="tw_navbar_button_position" op="=" var2="0"/>
+				<condition var1="tw_samsung_navbar" op="=" var2="1"/>
+				<placement x="%console_button_x%" y="%navbar_btn_y%" placement="4"/>
+				<image resource="back"/>
+				<condition var1="tw_busy" var2="0"/>
 				<action function="key">back</action>
-			</object>
+			</button>
 
-			<object type="button">
-				<condition var1="tw_navbar_button_position" op="=" var2="1" />
-				<condition var1="tw_samsung_navbar" op="!=" var2="1" />
-				<placement x="%back_button_x_1%" y="%navbar_btn_y%" placement="4" />
-				<image resource="back" />
-				<condition var1="tw_busy" var2="0" />
+			<button>
+				<condition var1="tw_navbar_button_position" op="=" var2="1"/>
+				<condition var1="tw_samsung_navbar" op="!=" var2="1"/>
+				<placement x="%back_button_x_1%" y="%navbar_btn_y%" placement="4"/>
+				<image resource="back"/>
+				<condition var1="tw_busy" var2="0"/>
 				<action function="key">back</action>
-			</object>
+			</button>
 
-			<object type="button">
-				<condition var1="tw_navbar_button_position" op="=" var2="1" />
-				<condition var1="tw_samsung_navbar" op="=" var2="1" />
-				<placement x="%back_button_x_1%" y="%navbar_btn_y%" placement="4" />
-				<image resource="console" />
-				<condition var1="tw_busy" var2="0" />
+			<button>
+				<condition var1="tw_navbar_button_position" op="=" var2="1"/>
+				<condition var1="tw_samsung_navbar" op="=" var2="1"/>
+				<placement x="%back_button_x_1%" y="%navbar_btn_y%" placement="4"/>
+				<image resource="console"/>
+				<condition var1="tw_busy" var2="0"/>
 				<action function="overlay">slideout</action>
-			</object>
+			</button>
 
-			<object type="button">
-				<condition var1="tw_navbar_button_position" op="=" var2="1" />
-				<placement x="%home_button_x_1%" y="%navbar_btn_y%" placement="4" />
-				<image resource="home" />
-				<condition var1="tw_busy" var2="0" />
+			<button>
+				<condition var1="tw_navbar_button_position" op="=" var2="1"/>
+				<placement x="%home_button_x_1%" y="%navbar_btn_y%" placement="4"/>
+				<image resource="home"/>
+				<condition var1="tw_busy" var2="0"/>
 				<action function="key">home</action>
-			</object>
+			</button>
 
-			<object type="button">
-				<condition var1="tw_navbar_button_position" op="=" var2="1" />
-				<condition var1="tw_samsung_navbar" op="!=" var2="1" />
-				<placement x="%console_button_x_1%" y="%navbar_btn_y%" placement="4" />
-				<image resource="console" />
-				<condition var1="tw_busy" var2="0" />
+			<button>
+				<condition var1="tw_navbar_button_position" op="=" var2="1"/>
+				<condition var1="tw_samsung_navbar" op="!=" var2="1"/>
+				<placement x="%console_button_x_1%" y="%navbar_btn_y%" placement="4"/>
+				<image resource="console"/>
+				<condition var1="tw_busy" var2="0"/>
 				<action function="overlay">slideout</action>
-			</object>
+			</button>
 
-			<object type="button">
-				<condition var1="tw_navbar_button_position" op="=" var2="1" />
-				<condition var1="tw_samsung_navbar" op="=" var2="1" />
-				<placement x="%console_button_x_1%" y="%navbar_btn_y%" placement="4" />
-				<image resource="back" />
-				<condition var1="tw_busy" var2="0" />
+			<button>
+				<condition var1="tw_navbar_button_position" op="=" var2="1"/>
+				<condition var1="tw_samsung_navbar" op="=" var2="1"/>
+				<placement x="%console_button_x_1%" y="%navbar_btn_y%" placement="4"/>
+				<image resource="back"/>
+				<condition var1="tw_busy" var2="0"/>
 				<action function="key">back</action>
-			</object>
+			</button>
 
-			<object type="button">
-				<condition var1="tw_navbar_button_position" op="=" var2="2" />
-				<condition var1="tw_samsung_navbar" op="!=" var2="1" />
-				<placement x="%back_button_x_2%" y="%navbar_btn_y%" placement="4" />
-				<image resource="back" />
-				<condition var1="tw_busy" var2="0" />
+			<button>
+				<condition var1="tw_navbar_button_position" op="=" var2="2"/>
+				<condition var1="tw_samsung_navbar" op="!=" var2="1"/>
+				<placement x="%back_button_x_2%" y="%navbar_btn_y%" placement="4"/>
+				<image resource="back"/>
+				<condition var1="tw_busy" var2="0"/>
 				<action function="key">back</action>
-			</object>
+			</button>
 
-			<object type="button">
-				<condition var1="tw_navbar_button_position" op="=" var2="2" />
-				<condition var1="tw_samsung_navbar" op="=" var2="1" />
-				<placement x="%back_button_x_2%" y="%navbar_btn_y%" placement="4" />
-				<image resource="console" />
-				<condition var1="tw_busy" var2="0" />
+			<button>
+				<condition var1="tw_navbar_button_position" op="=" var2="2"/>
+				<condition var1="tw_samsung_navbar" op="=" var2="1"/>
+				<placement x="%back_button_x_2%" y="%navbar_btn_y%" placement="4"/>
+				<image resource="console"/>
+				<condition var1="tw_busy" var2="0"/>
 				<action function="overlay">slideout</action>
-			</object>
+			</button>
 
-			<object type="button">
-				<condition var1="tw_navbar_button_position" op="=" var2="2" />
-				<placement x="%home_button_x_2%" y="%navbar_btn_y%" placement="4" />
-				<image resource="home" />
-				<condition var1="tw_busy" var2="0" />
+			<button>
+				<condition var1="tw_navbar_button_position" op="=" var2="2"/>
+				<placement x="%home_button_x_2%" y="%navbar_btn_y%" placement="4"/>
+				<image resource="home"/>
+				<condition var1="tw_busy" var2="0"/>
 				<action function="key">home</action>
-			</object>
+			</button>
 
-			<object type="button">
-				<condition var1="tw_navbar_button_position" op="=" var2="2" />
-				<condition var1="tw_samsung_navbar" op="!=" var2="1" />
-				<placement x="%console_button_x_2%" y="%navbar_btn_y%" placement="4" />
-				<image resource="console" />
-				<condition var1="tw_busy" var2="0" />
+			<button>
+				<condition var1="tw_navbar_button_position" op="=" var2="2"/>
+				<condition var1="tw_samsung_navbar" op="!=" var2="1"/>
+				<placement x="%console_button_x_2%" y="%navbar_btn_y%" placement="4"/>
+				<image resource="console"/>
+				<condition var1="tw_busy" var2="0"/>
 				<action function="overlay">slideout</action>
-			</object>
+			</button>
 
-			<object type="button">
-				<condition var1="tw_navbar_button_position" op="=" var2="2" />
-				<condition var1="tw_samsung_navbar" op="=" var2="1" />
-				<placement x="%console_button_x_2%" y="%navbar_btn_y%" placement="4" />
-				<image resource="back" />
-				<condition var1="tw_busy" var2="0" />
+			<button>
+				<condition var1="tw_navbar_button_position" op="=" var2="2"/>
+				<condition var1="tw_samsung_navbar" op="=" var2="1"/>
+				<placement x="%console_button_x_2%" y="%navbar_btn_y%" placement="4"/>
+				<image resource="back"/>
+				<condition var1="tw_busy" var2="0"/>
 				<action function="key">back</action>
-			</object>
+			</button>
 
-			<object type="action">
-				<touch key="power" />
+			<action>
+				<touch key="power"/>
 				<action function="overlay">lock</action>
-			</object>
+			</action>
 
-			<object type="action">
-				<touch key="power+voldown" />
-				<action function="screenshot" />
-			</object>
+			<action>
+				<touch key="power+voldown"/>
+				<action function="screenshot"/>
+			</action>
 		</template>
 
 		<template name="progress_bar">
-			<object type="progressbar">
-				<placement x="%progress_x%" y="%row16_y%" />
-				<resource empty="progress_empty" full="progress_full" />
-				<data name="ui_progress" />
-			</object>
+			<progressbar>
+				<placement x="%progress_x%" y="%row16_y%"/>
+				<resource empty="progress_empty" full="progress_full"/>
+				<data name="ui_progress"/>
+			</progressbar>
 
-			<object type="animation">
-				<placement x="%progress_x%" y="%row16_y%" />
-				<resource name="progress" />
-				<speed fps="24" render="2" />
-				<loop frame="1" />
-			</object>
+			<animation>
+				<placement x="%progress_x%" y="%row16_y%"/>
+				<resource name="progress"/>
+				<speed fps="24" render="2"/>
+				<loop frame="1"/>
+			</animation>
 		</template>
 
 		<template name="sort_options">
-			<object type="image">
-				<placement x="%col_button_right%" y="%row1a_y%" />
-				<image resource="main_button_half_width_low" />
-			</object>
+			<image>
+				<placement x="%col_button_right%" y="%row1a_y%"/>
+				<image resource="main_button_half_width_low"/>
+			</image>
 
-			<object type="image">
-				<placement x="%col_button_right%" y="%row4a_y%" />
-				<image resource="main_button_half_width_low" />
-			</object>
+			<image>
+				<placement x="%col_button_right%" y="%row4a_y%"/>
+				<image resource="main_button_half_width_low"/>
+			</image>
 
-			<object type="image">
-				<placement x="%col_button_right%" y="%row7a_y%" />
-				<image resource="main_button_half_width_low" />
-			</object>
+			<image>
+				<placement x="%col_button_right%" y="%row7a_y%"/>
+				<image resource="main_button_half_width_low"/>
+			</image>
 
-			<object type="button" style="sort_asc">
-				<condition var1="tw_gui_sort_order" op="=" var2="1" />
-				<placement x="%col_button_right%" y="%row1a_y%" />
+			<button style="sort_asc">
+				<condition var1="tw_gui_sort_order" op="=" var2="1"/>
+				<placement x="%col_button_right%" y="%row1a_y%"/>
 				<text>{@sort_by_name=Sort by Name}</text>
 				<action function="set">tw_gui_sort_order=-1</action>
-			</object>
+			</button>
 
-			<object type="button" style="sort_desc">
-				<condition var1="tw_gui_sort_order" op="=" var2="-1" />
-				<placement x="%col_button_right%" y="%row1a_y%" />
+			<button style="sort_desc">
+				<condition var1="tw_gui_sort_order" op="=" var2="-1"/>
+				<placement x="%col_button_right%" y="%row1a_y%"/>
 				<text>{@sort_by_name=Sort by Name}</text>
 				<action function="set">tw_gui_sort_order=1</action>
-			</object>
+			</button>
 
-			<object type="button" style="sort_empty">
+			<button style="sort_empty">
 				<conditions>
-					<condition var1="tw_gui_sort_order" op="!=" var2="1" />
-					<condition var1="tw_gui_sort_order" op="!=" var2="-1" />
+					<condition var1="tw_gui_sort_order" op="!=" var2="1"/>
+					<condition var1="tw_gui_sort_order" op="!=" var2="-1"/>
 				</conditions>
-				<placement x="%col_button_right%" y="%row1a_y%" />
+				<placement x="%col_button_right%" y="%row1a_y%"/>
 				<text>{@sort_by_name=Sort by Name}</text>
 				<action function="set">tw_gui_sort_order=1</action>
-			</object>
+			</button>
 
-			<object type="button" style="sort_asc">
-				<condition var1="tw_gui_sort_order" op="=" var2="2" />
-				<placement x="%col_button_right%" y="%row4a_y%" />
+			<button style="sort_asc">
+				<condition var1="tw_gui_sort_order" op="=" var2="2"/>
+				<placement x="%col_button_right%" y="%row4a_y%"/>
 				<text>{@sort_by_date=Sort by Date}</text>
 				<action function="set">tw_gui_sort_order=-2</action>
-			</object>
+			</button>
 
-			<object type="button" style="sort_desc">
-				<condition var1="tw_gui_sort_order" op="=" var2="-2" />
-				<placement x="%col_button_right%" y="%row4a_y%" />
+			<button style="sort_desc">
+				<condition var1="tw_gui_sort_order" op="=" var2="-2"/>
+				<placement x="%col_button_right%" y="%row4a_y%"/>
 				<text>{@sort_by_date=Sort by Date}</text>
 				<action function="set">tw_gui_sort_order=2</action>
-			</object>
+			</button>
 
-			<object type="button" style="sort_empty">
+			<button style="sort_empty">
 				<conditions>
-					<condition var1="tw_gui_sort_order" op="!=" var2="2" />
-					<condition var1="tw_gui_sort_order" op="!=" var2="-2" />
+					<condition var1="tw_gui_sort_order" op="!=" var2="2"/>
+					<condition var1="tw_gui_sort_order" op="!=" var2="-2"/>
 				</conditions>
-				<placement x="%col_button_right%" y="%row4a_y%" />
+				<placement x="%col_button_right%" y="%row4a_y%"/>
 				<text>{@sort_by_date=Sort by Date}</text>
 				<action function="set">tw_gui_sort_order=2</action>
-			</object>
+			</button>
 
-			<object type="button" style="sort_asc">
-				<condition var1="tw_gui_sort_order" op="=" var2="3" />
-				<placement x="%col_button_right%" y="%row7a_y%" />
+			<button style="sort_asc">
+				<condition var1="tw_gui_sort_order" op="=" var2="3"/>
+				<placement x="%col_button_right%" y="%row7a_y%"/>
 				<text>{@sort_by_size=Sort by Size}</text>
 				<action function="set">tw_gui_sort_order=-3</action>
-			</object>
+			</button>
 
-			<object type="button" style="sort_desc">
-				<condition var1="tw_gui_sort_order" op="=" var2="-3" />
-				<placement x="%col_button_right%" y="%row7a_y%" />
+			<button style="sort_desc">
+				<condition var1="tw_gui_sort_order" op="=" var2="-3"/>
+				<placement x="%col_button_right%" y="%row7a_y%"/>
 				<text>{@sort_by_size=Sort by Size}</text>
 				<action function="set">tw_gui_sort_order=3</action>
-			</object>
+			</button>
 
-			<object type="button" style="sort_empty">
+			<button style="sort_empty">
 				<conditions>
-					<condition var1="tw_gui_sort_order" op="!=" var2="3" />
-					<condition var1="tw_gui_sort_order" op="!=" var2="-3" />
+					<condition var1="tw_gui_sort_order" op="!=" var2="3"/>
+					<condition var1="tw_gui_sort_order" op="!=" var2="-3"/>
 				</conditions>
-				<placement x="%col_button_right%" y="%row7a_y%" />
+				<placement x="%col_button_right%" y="%row7a_y%"/>
 				<text>{@sort_by_size=Sort by Size}</text>
 				<action function="set">tw_gui_sort_order=3</action>
-			</object>
+			</button>
 		</template>
 
 		<template name="tabs_settings">
-			<object type="button" style="tab">
-				<placement x="0" y="%row1_y%" w="%tab5_width%" h="%tab_height%" />
+			<button style="tab">
+				<placement x="0" y="%row1_y%" w="%tab5_width%" h="%tab_height%"/>
 				<text>{@tab_general=GENERAL}</text>
 				<action function="page">settings</action>
-			</object>
+			</button>
 
-			<object type="button" style="tab">
-				<placement x="%tab5_col2_x%" y="%row1_y%" w="%tab5_width%" h="%tab_height%" />
+			<button style="tab">
+				<placement x="%tab5_col2_x%" y="%row1_y%" w="%tab5_width%" h="%tab_height%"/>
 				<text>{@tab_time_zone=TIME ZONE}</text>
 				<action function="page">settings_timezone</action>
-			</object>
+			</button>
 
-			<object type="button" style="tab">
-				<placement x="%tab5_col3_x%" y="%row1_y%" w="%tab5_width%" h="%tab_height%" />
+			<button style="tab">
+				<placement x="%tab5_col3_x%" y="%row1_y%" w="%tab5_width%" h="%tab_height%"/>
 				<text>{@tab_screen=SCREEN}</text>
 				<action function="page">settings_screen</action>
-			</object>
+			</button>
 
-			<object type="button" style="tab">
-				<placement x="%tab5_col4_x%" y="%row1_y%" w="%tab5_width%" h="%tab_height%" />
+			<button style="tab">
+				<placement x="%tab5_col4_x%" y="%row1_y%" w="%tab5_width%" h="%tab_height%"/>
 				<text>{@tab_vibration=VIBRATION}</text>
 				<action function="page">settings_vibration</action>
-			</object>
+			</button>
 
-			<object type="button" style="tab">
-				<placement x="%tab5_col5_x%" y="%row1_y%" w="%tab5_width%" h="%tab_height%" />
+			<button style="tab">
+				<placement x="%tab5_col5_x%" y="%row1_y%" w="%tab5_width%" h="%tab_height%"/>
 				<text>{@tab_language=LANGUAGE}</text>
 				<action function="page">settings_language</action>
-			</object>
+			</button>
 		</template>
 
 		<template name="console">
-			<object type="console">
-				<placement x="%col1_x_left%" y="%row2_y%" w="%content_width%" h="%console_height%" />
-			</object>
+			<console>
+				<placement x="%col1_x_left%" y="%row2_y%" w="%content_width%" h="%console_height%"/>
+			</console>
 
-			<object type="fill" color="%fileselector_linecolor%">
-				<placement x="%col1_x_left%" y="row2_y" w="%content_width%" h="input_line_width" placement="1" />
-			</object>
+			<fill color="%fileselector_linecolor%">
+				<placement x="%col1_x_left%" y="row2_y" w="%content_width%" h="input_line_width" placement="1"/>
+			</fill>
 
-			<object type="fill" color="%fileselector_linecolor%">
-				<placement x="%col1_x_left%" y="row15_y" w="%content_width%" h="input_line_width" />
-			</object>
+			<fill color="%fileselector_linecolor%">
+				<placement x="%col1_x_left%" y="row15_y" w="%content_width%" h="input_line_width"/>
+			</fill>
 		</template>
 
 		<template name="console_terminal">
-			<object type="console">
-				<placement x="%col1_x_left%" y="%row3_header_y%" w="content_width" h="%console_terminal_height%" />
-			</object>
+			<console>
+				<placement x="%col1_x_left%" y="%row3_header_y%" w="content_width" h="%console_terminal_height%"/>
+			</console>
 
-			<object type="fill" color="%fileselector_linecolor%">
-				<placement x="%col1_x_left%" y="%row3_header_y%" w="%content_width%" h="input_line_width" placement="1" />
-			</object>
+			<fill color="%fileselector_linecolor%">
+				<placement x="%col1_x_left%" y="%row3_header_y%" w="%content_width%" h="input_line_width" placement="1"/>
+			</fill>
 
-			<object type="fill" color="%fileselector_linecolor%">
-				<placement x="%col1_x_left%" y="row7_y" w="%content_width%" h="input_line_width" />
-			</object>
+			<fill color="%fileselector_linecolor%">
+				<placement x="%col1_x_left%" y="row7_y" w="%content_width%" h="input_line_width"/>
+			</fill>
+		</template>
+
+		<template name="keyboardterminaltemplate">
+			<keyboard>
+				<condition var1="tw_hide_kb" op="=" var2="0"/>
+				<placement x="0" y="%keyboard_y%" w="1920" h="512"/>
+				<keymargin x="6" y="6"/>
+				<background color="#111111"/>
+				<key-alphanumeric color="#111111" font="keylabel" textcolor="#EEEEEE"/>
+				<key-other color="#111111" font="keylabel-small" textcolor="#5b5b5bff"/>
+				<longpress font="keylabel-longpress" textcolor="#5b5b5bff" x="40" y="4"/>
+				<keylabel key="0:c:8" text="Bksp" resource="backspace_terminal"/>
+				<keylabel key="0:action" text="Enter" resource="enter_terminal"/>
+				<keylabel key=" " text="Space" resource="space_terminal"/>
+				<keylabel key="0:k:29" text="Ctrl"/>
+				<keylabel key="0:c:27" text="Esc"/>
+				<keylabel key="0:c:9" text="Tab"/>
+				<keylabel key="0:k:105" text="&lt;" resource="kb_arrow_left"/>
+				<keylabel key="0:k:108" text="v" resource="kb_arrow_down"/>
+				<keylabel key="0:k:103" text="^" resource="kb_arrow_up"/>
+				<keylabel key="0:k:106" text="&gt;" resource="kb_arrow_right"/>
+				<highlight color="%highlight_color%"/>
+				<capshighlight color="%highlight_color%"/>
+				<ctrlhighlight color="#0090CA80"/>
+				<layout1>
+					<keysize height="128" width="160"/>
+					<row1 key01="160:c:27" long01=":c:3" 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="160:k:103"/>
+					<row2 key01="160:c:9" key02="80:" key03="a" long03="@" key04="s" long04="#" key05="d" long05="$" key06="f" long06="%" key07="g" long07="&amp;" key08="h" long08="*" key09="j" long09="-" key10="k" long10="+" key11="l" long11="_" key12="80:" key13="160:k:105"/>
+					<row3 key01="160:" key02="240:layout2" key03="z" long03="!" key04="x" long04="&quot;" key05="c" long05="'" key06="v" long06=":" key07="b" long07=";" key08="n" long08="/" key09="m" long09="?" key10="240:c:8" key11="160:k:106"/>
+					<row4 key01="160:k:29" key02="240:layout3" key03="/" key04="800: " key05="." key06="240:action" key07="160:k:108"/>
+					<keylabel key="0:layout2" text="Shift" resource="shift_terminal"/>
+					<keylabel key="0:layout3" text="?123"/>
+				</layout1>
+				<layout2>
+					<keysize height="128" width="160" capslock="0" revert_layout="1"/>
+					<row1 key01="160:c:27" long01=":c:3" 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="160:k:103"/>
+					<row2 key01="160:c:9" key02="80:" key03="A" long03="@" key04="S" long04="#" key05="D" long05="$" key06="F" long06="%" key07="G" long07="&amp;" key08="H" long08="*" key09="J" long09="-" key10="K" long10="+" key11="L" long11="_" key12="80:" key13="160:k:105"/>
+					<row3 key01="160:" key02="240:layout1" key03="Z" long03="!" key04="X" long04="&quot;" key05="C" long05="'" key06="V" long06=":" key07="B" long07=";" key08="N" long08="/" key09="M" long09="?" key10="240:c:8" key11="160:k:106"/>
+					<row4 key01="160:k:29" key02="240:layout3" key03="/" key04="800: " key05="." key06="240:action" key07="160:k:108"/>
+					<keylabel key="0:layout1" text="Shift" resource="shift_terminal_fill"/>
+					<keylabel key="0:layout3" text="?123"/>
+				</layout2>
+				<layout3>
+					<keysize height="128" width="160"/>
+					<row1 key01="160:c:27" long01=":c:3" key02="1" key03="2" key04="3" key05="4" key06="5" key07="6" key08="7" key09="8" key10="9" key11="0" key12="160:k:103"/>
+					<row2 key01="160:c:9" key02="@" key03="#" key04="$" key05="%" key06="&amp;" key07="*" key08="-" key09="+" key10="(" key11=")" key12="160:k:105"/>
+					<row3 key01="160:" key02="240:layout4" key03="!" key04="160:c:34" key05="'" key06=":" key07=";" key08="/" key09="?" key10="240:c:8" key11="160:k:106"/>
+					<row4 key01="160:k:29" key02="240:layout1" key03="," key04="800: " key05="." key06="240:action" key07="160:k:108"/>
+					<keylabel key="0:layout1" text="ABC"/>
+					<keylabel key="0:layout4" text="~\{"/>
+				</layout3>
+				<layout4>
+					<keysize height="128" width="160"/>
+					<row1 key01="160:c:27" long01=":c:3" key02="~" key03="`" key04="|" key05="160:" key06="160:" key07="160:" key08="%" key09="160:" key10="{" key11="}" key12="160:k:103"/>
+					<row2 key01="160:c:9" key02="160:" key03="160:" key04="160:" key05="160:" key06="160:" key07="^" key08="_" key09="=" key10="[" key11="]" key12="160:k:105"/>
+					<row3 key01="160:" key02="240:layout3" key03="160:" key04="160:" key05="160:" key06="160:" key07="\" key08="&lt;" key09="&gt;" key10="240:c:8" key11="160:k:106"/>
+					<row4 key01="160:k:29" key02="240:layout1" key03="160:c:34" key04="800: " key05="." key06="240:action" key07="160:k:108"/>
+					<keylabel key="0:layout1" text="ABC"/>
+					<keylabel key="0:layout3" text="?123"/>
+				</layout4>
+			</keyboard>
 		</template>
 
 		<template name="keyboardtemplate">
-			<object type="keyboard">
-				<placement x="0" y="%keyboard_y%" w="1920" h="512" />
+			<keyboard>
+				<placement x="0" y="%keyboard_y%" w="1920" h="512"/>
 				<keymargin x="6" y="6"/>
 				<background color="#111111"/>
 				<key-alphanumeric color="#111111" font="keylabel" textcolor="#EEEEEE"/>
@@ -602,45 +676,45 @@
 				<keylabel key="0:c:8" text="Bksp" resource="backspace"/>
 				<keylabel key="0:action" text="Enter" resource="enter"/>
 				<keylabel key=" " text="Space" resource="space"/>
-				<highlight color="%highlight_color%" />
-				<capshighlight color="%highlight_color%" />
+				<highlight color="%highlight_color%"/>
+				<capshighlight color="%highlight_color%"/>
 				<layout1>
-					<keysize height="128" width="192" />
-					<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="96:" key02="a" long02="@" key03="s" long03="#" key04="d" long04="$" key05="f" long05="%" key06="g" long06="&amp;" key07="h" long07="*" key08="j" long08="-" key09="k" long09="+" key10="l" long10="_" key11="96:" />
-					<row3 key01="288:layout2" key02="z" long02="!" key03="x" long03='"' key04="c" long04="'" key05="v" long05=":" key06="b" long06=";" key07="n" long07="/" key08="m" long08="?" key09="288:c:8" />
-					<row4 key01="288:layout3" key02="/" key03="960: " key04="." key05="288:action" />
+					<keysize height="128" width="192"/>
+					<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="96:" key02="a" long02="@" key03="s" long03="#" key04="d" long04="$" key05="f" long05="%" key06="g" long06="&amp;" key07="h" long07="*" key08="j" long08="-" key09="k" long09="+" key10="l" long10="_" key11="96:"/>
+					<row3 key01="288:layout2" key02="z" long02="!" key03="x" long03="&quot;" key04="c" long04="'" key05="v" long05=":" key06="b" long06=";" key07="n" long07="/" key08="m" long08="?" key09="288:c:8"/>
+					<row4 key01="288:layout3" key02="/" key03="960: " key04="." key05="288:action"/>
 					<keylabel key="0:layout2" text="Shift" resource="shift"/>
 					<keylabel key="0:layout3" text="?123"/>
 				</layout1>
 				<layout2>
 					<keysize height="128" width="192" 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="96:" key02="A" long02="@" key03="S" long03="#" key04="D" long04="$" key05="F" long05="%" key06="G" long06="&amp;" key07="H" long07="*" key08="J" long08="-" key09="K" long09="+" key10="L" long10="_" key11="96:" />
-					<row3 key01="288:layout1" key02="Z" long02="!" key03="X" long03='"' key04="C" long04="'" key05="V" long05=":" key06="B" long06=";" key07="N" long07="/" key08="M" long08="?" key09="288:c:8" />
-					<row4 key01="288:layout3" key02="/" key03="960: " key04="." key05="288:action" />
+					<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="96:" key02="A" long02="@" key03="S" long03="#" key04="D" long04="$" key05="F" long05="%" key06="G" long06="&amp;" key07="H" long07="*" key08="J" long08="-" key09="K" long09="+" key10="L" long10="_" key11="96:"/>
+					<row3 key01="288:layout1" key02="Z" long02="!" key03="X" long03="&quot;" key04="C" long04="'" key05="V" long05=":" key06="B" long06=";" key07="N" long07="/" key08="M" long08="?" key09="288:c:8"/>
+					<row4 key01="288:layout3" key02="/" key03="960: " key04="." key05="288:action"/>
 					<keylabel key="0:layout1" text="Shift" resource="shift_fill"/>
 					<keylabel key="0:layout3" text="?123"/>
 				</layout2>
 				<layout3>
-					<keysize height="128" width="192" />
-					<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="288:layout4" key02="!" key03="192:c:34" key04="'" key05=":" key06=";" key07="/" key08="?" key09="288:c:8" />
-					<row4 key01="288:layout1" key02="," key03="960: " key04="." key05="288:action" />
+					<keysize height="128" width="192"/>
+					<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="288:layout4" key02="!" key03="192:c:34" key04="'" key05=":" key06=";" key07="/" key08="?" key09="288:c:8"/>
+					<row4 key01="288:layout1" key02="," key03="960: " key04="." key05="288:action"/>
 					<keylabel key="0:layout1" text="ABC"/>
 					<keylabel key="0:layout4" text="~\{"/>
 				</layout3>
 				<layout4>
-					<keysize height="128" width="192" />
-					<row1 key01="~" key02="`" key03="|" key04="192:" key05="192:" key06="192:" key07="%" key08="192:" key09="{" key10="}" />
-					<row2 key01="192:" key02="192:" key03="192:" key04="192:" key05="192:" key06="^" key07="_" key08="=" key09="[" key10="]" />
-					<row3 key01="288:layout3" key02="192:" key03="192:" key04="192:" key05="192:" key06="\" key07="&lt;" key08="&gt;" key09="288:c:8" />
-					<row4 key01="288:layout1" key02="192:c:34" key03="960: " key04="." key05="288:action" />
+					<keysize height="128" width="192"/>
+					<row1 key01="~" key02="`" key03="|" key04="192:" key05="192:" key06="192:" key07="%" key08="192:" key09="{" key10="}"/>
+					<row2 key01="192:" key02="192:" key03="192:" key04="192:" key05="192:" key06="^" key07="_" key08="=" key09="[" key10="]"/>
+					<row3 key01="288:layout3" key02="192:" key03="192:" key04="192:" key05="192:" key06="\" key07="&lt;" key08="&gt;" key09="288:c:8"/>
+					<row4 key01="288:layout1" key02="192:c:34" key03="960: " key04="." key05="288:action"/>
 					<keylabel key="0:layout1" text="ABC"/>
 					<keylabel key="0:layout3" text="?123"/>
 				</layout4>
-			</object>
+			</keyboard>
 		</template>
 	</templates>
 </recovery>
diff --git a/gui/theme/landscape_mdpi/images/backspace_terminal.png b/gui/theme/landscape_mdpi/images/backspace_terminal.png
new file mode 100644
index 0000000..89723d2
--- /dev/null
+++ b/gui/theme/landscape_mdpi/images/backspace_terminal.png
Binary files differ
diff --git a/gui/theme/landscape_mdpi/images/enter_terminal.png b/gui/theme/landscape_mdpi/images/enter_terminal.png
new file mode 100644
index 0000000..18def5b
--- /dev/null
+++ b/gui/theme/landscape_mdpi/images/enter_terminal.png
Binary files differ
diff --git a/gui/theme/landscape_mdpi/images/kb_arrow_down.png b/gui/theme/landscape_mdpi/images/kb_arrow_down.png
new file mode 100644
index 0000000..b21d474
--- /dev/null
+++ b/gui/theme/landscape_mdpi/images/kb_arrow_down.png
Binary files differ
diff --git a/gui/theme/landscape_mdpi/images/kb_arrow_left.png b/gui/theme/landscape_mdpi/images/kb_arrow_left.png
new file mode 100644
index 0000000..f349b93
--- /dev/null
+++ b/gui/theme/landscape_mdpi/images/kb_arrow_left.png
Binary files differ
diff --git a/gui/theme/landscape_mdpi/images/kb_arrow_right.png b/gui/theme/landscape_mdpi/images/kb_arrow_right.png
new file mode 100644
index 0000000..4087239
--- /dev/null
+++ b/gui/theme/landscape_mdpi/images/kb_arrow_right.png
Binary files differ
diff --git a/gui/theme/landscape_mdpi/images/kb_arrow_up.png b/gui/theme/landscape_mdpi/images/kb_arrow_up.png
new file mode 100644
index 0000000..ff57a32
--- /dev/null
+++ b/gui/theme/landscape_mdpi/images/kb_arrow_up.png
Binary files differ
diff --git a/gui/theme/landscape_mdpi/images/kb_hide.png b/gui/theme/landscape_mdpi/images/kb_hide.png
new file mode 100644
index 0000000..bd6e763
--- /dev/null
+++ b/gui/theme/landscape_mdpi/images/kb_hide.png
Binary files differ
diff --git a/gui/theme/landscape_mdpi/images/kb_show.png b/gui/theme/landscape_mdpi/images/kb_show.png
new file mode 100644
index 0000000..da52bd2
--- /dev/null
+++ b/gui/theme/landscape_mdpi/images/kb_show.png
Binary files differ
diff --git a/gui/theme/landscape_mdpi/images/shift_terminal.png b/gui/theme/landscape_mdpi/images/shift_terminal.png
new file mode 100644
index 0000000..0196627
--- /dev/null
+++ b/gui/theme/landscape_mdpi/images/shift_terminal.png
Binary files differ
diff --git a/gui/theme/landscape_mdpi/images/shift_terminal_fill.png b/gui/theme/landscape_mdpi/images/shift_terminal_fill.png
new file mode 100644
index 0000000..e84346a
--- /dev/null
+++ b/gui/theme/landscape_mdpi/images/shift_terminal_fill.png
Binary files differ
diff --git a/gui/theme/landscape_mdpi/images/space_terminal.png b/gui/theme/landscape_mdpi/images/space_terminal.png
new file mode 100644
index 0000000..722a4eb
--- /dev/null
+++ b/gui/theme/landscape_mdpi/images/space_terminal.png
Binary files differ
diff --git a/gui/theme/landscape_mdpi/ui.xml b/gui/theme/landscape_mdpi/ui.xml
index f4b34a7..ae40683 100644
--- a/gui/theme/landscape_mdpi/ui.xml
+++ b/gui/theme/landscape_mdpi/ui.xml
@@ -1,646 +1,720 @@
-<?xml version="1.0"?>

-

-<recovery>

-	<details>

-		<resolution width="800" height="480" />

-		<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_l" type="font"  filename="RobotoCondensed-Regular.ttf" size="18" />

-		<resource name="font_m" type="font" filename="RobotoCondensed-Regular.ttf" size="14" />

-		<resource name="font_s" type="font" filename="RobotoCondensed-Regular.ttf" size="12" />

-		<resource name="fixed" type="font" filename="DroidSansMono.ttf" size="12" />

-

-		<resource name="keylabel" type="font" filename="RobotoCondensed-Regular.ttf" size="21" />

-		<resource name="keylabel-small" type="font" filename="RobotoCondensed-Regular.ttf" size="18" />

-		<resource name="keylabel-longpress" type="font" filename="RobotoCondensed-Regular.ttf" size="11" />

-

-		<resource name="logo" type="image" filename="logo" retainaspect="1" />

-		<resource name="main_button" type="image" filename="main_button" />

-		<resource name="main_button_half_width" type="image" filename="main_button_half_width" />

-		<resource name="main_button_half_width_low" type="image" filename="main_button_half_width_low" />

-		<resource name="tab_3" type="image" filename="tab_3" />

-		<resource name="tab_4" type="image" filename="tab_4" />

-		<resource name="file" type="image" filename="file" retainaspect="1" />

-		<resource name="folder" type="image" filename="folder" retainaspect="1" />

-		<resource name="unlock_icon" type="image" filename="unlock_icon" retainaspect="1" />

-		<resource name="home" type="image" filename="home" retainaspect="1" />

-		<resource name="back" type="image" filename="back" retainaspect="1" />

-		<resource name="console" type="image" filename="console" retainaspect="1" />

-		<resource name="checkbox_false" type="image" filename="checkbox_false" retainaspect="1" />

-		<resource name="checkbox_true" type="image" filename="checkbox_true" retainaspect="1" />

-		<resource name="radio_false" type="image" filename="radio_false" retainaspect="1" />

-		<resource name="radio_true" type="image" filename="radio_true" retainaspect="1" />

-		<resource name="sort_asc" type="image" filename="sort_asc" />

-		<resource name="sort_desc" type="image" filename="sort_desc" />

-		<resource name="sort_empty" type="image" filename="sort_empty" />

-		<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="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="handle" type="image" filename="handle" />

-		<resource name="cursor" type="image" filename="cursor" retainaspect="1" />

-

-		<resource name="backspace" type="image" filename="backspace" retainaspect="1" />

-		<resource name="enter" type="image" filename="enter" retainaspect="1" />

-		<resource name="shift" type="image" filename="shift" retainaspect="1" />

-		<resource name="shift_fill" type="image" filename="shift_fill" retainaspect="1" />

-		<resource name="space" type="image" filename="space" retainaspect="1" />

-	</resources>

-

-	<variables>

-		<variable name="tw_samsung_navbar" value="0" persist="1" />

-		<variable name="tw_navbar_button_position" value="0" persist="1" />

-

-		<variable name="screen_width" value="800" />

-		<variable name="screen_height" value="480" />

-		<variable name="status_height" value="20" />

-		<variable name="header_height" value="80" />

-		<variable name="navbar_height" value="40" />

-		<variable name="content_width" value="760" />

-		<variable name="content_quarter_width" value="590" />

-		<variable name="content_half_width" value="370" />

-		<variable name="content_overlay_width" value="380" />

-		<variable name="dialog_height" value="207" />

-		<variable name="dialog_width" value="400" />

-		<variable name="dialog_content_x" value="220" />

-		<variable name="back_button_x" value="264" />

-		<variable name="console_button_x" value="536" />

-		<variable name="back_button_x_1" value="50" />

-		<variable name="home_button_x_1" value="130" />

-		<variable name="console_button_x_1" value="210" />

-		<variable name="back_button_x_2" value="590" />

-		<variable name="home_button_x_2" value="670" />

-		<variable name="console_button_x_2" value="750" />

-		<variable name="col1_x_header" value="60" />

-		<variable name="indent" value="10" />

-		<variable name="col1_x_left" value="20" />

-		<variable name="col2_x_left" value="210" />

-		<variable name="center_x" value="400" />

-		<variable name="col1_x_right" value="410" />

-		<variable name="col2_x_right" value="590" />

-		<variable name="col_button_right" value="620" />

-		<variable name="indent_right" value="790" />

-		<variable name="tab_height" value="30" />

-		<variable name="tab_indicator_height" value="2" />

-		<variable name="tab4_width" value="200" />

-		<variable name="tab5_width" value="160" />

-		<variable name="tab4_col2_x" value="200" />

-		<variable name="tab4_col4_x" value="600" />

-		<variable name="tab5_col2_x" value="160" />

-		<variable name="tab5_col3_x" value="320" />

-		<variable name="tab5_col4_x" value="480" />

-		<variable name="tab5_col5_x" value="640" />

-		<variable name="btn4_col2_x_left" value="117" />

-		<variable name="btn4_col3_x_left" value="216" />

-		<variable name="btn4_col4_x_left" value="313" />

-		<variable name="btn4_col2_x_right" value="507" />

-		<variable name="btn4_col3_x_right" value="606" />

-		<variable name="btn4_col4_x_right" value="703" />

-		<variable name="row1_header_y" value="0" />

-		<variable name="row2_header_y" value="20" />

-		<variable name="row3_header_y" value="24" />

-		<variable name="row4_header_y" value="52" />

-		<variable name="row1_y" value="80" />

-		<variable name="row1a_y" value="89" />

-		<variable name="row2_y" value="98" />

-		<variable name="row2a_y" value="107" />

-		<variable name="row_tab_y" value="108" />

-		<variable name="row2_input_y" value="116" />

-		<variable name="row3_y" value="116" />

-		<variable name="row3a_y" value="125" />

-		<variable name="row3_input_y" value="125" />

-		<variable name="row4_y" value="134" />

-		<variable name="row4a_y" value="143" />

-		<variable name="row4_input_y" value="143" />

-		<variable name="row5_y" value="152" />

-		<variable name="row5a_y" value="161" />

-		<variable name="row6_y" value="170" />

-		<variable name="row6a_y" value="179" />

-		<variable name="row7_y" value="188" />

-		<variable name="row7a_y" value="197" />

-		<variable name="row8_y" value="206" />

-		<variable name="row8a_y" value="215" />

-		<variable name="row9_y" value="224" />

-		<variable name="row9a_y" value="233" />

-		<variable name="row10_y" value="242" />

-		<variable name="row10a_y" value="251" />

-		<variable name="row11_y" value="260" />

-		<variable name="row11a_y" value="269" />

-		<variable name="row12_y" value="278" />

-		<variable name="row12a_y" value="288" />

-		<variable name="row13_y" value="296" />

-		<variable name="row13a_y" value="305" />

-		<variable name="row14_y" value="314" />

-		<variable name="row14a_y" value="323" />

-		<variable name="row15_y" value="332" />

-		<variable name="row15a_y" value="341" />

-		<variable name="row16_y" value="350" />

-		<variable name="row16a_y" value="359" />

-		<variable name="row17_y" value="368" />

-		<variable name="row17a_y" value="377" />

-		<variable name="row18_y" value="386" />

-		<variable name="row18a_y" value="395" />

-		<variable name="row19_y" value="404" />

-		<variable name="row19a_y" value="413" />

-		<variable name="row20_y" value="422" />

-		<variable name="navbar_y" value="440" />

-		<variable name="navbar_btn_y" value="460" />

-		<variable name="keyboard_y" value="248" />

-		<variable name="background_color" value="#1A1A1A" />

-		<variable name="accent_color" value="#0090CA" />

-		<variable name="text_color" value="#EEEEEE" />

-		<variable name="text_button_color" value="#EEEEEE" />

-		<variable name="text_success_color" value="#76FF03" />

-		<variable name="text_fail_color" value="#FF0101" />

-		<variable name="highlight_color" value="#1A1A1A80" />

-		<variable name="caps_highlight_color" value="#22222280" />

-		<variable name="transparent" value="#00000000" />

-		<variable name="semi_transparent" value="#00000099" />

-		<variable name="warning" value="#F8F8A0" />

-		<variable name="error" value="#FF0101" />

-		<variable name="highlight" value="#0090CA" />

-		<variable name="fileselector_linecolor" value="#555555" />

-		<variable name="fileselector_highlight_color" value="#555555" />

-		<variable name="fileselector_separatorheight" value="1" />

-		<variable name="fileselector_spacing" value="0" />

-		<variable name="fileselector_install_height" value="333" />

-		<variable name="fileselector_install_width" value="400" />

-		<variable name="fileselector_install_folder_width" value="170" />

-		<variable name="fileselector_filemanager_height" value="333" />

-		<variable name="partitionlist_spacing" value="0" />

-		<variable name="partitionlist_storage_height" value="160" />

-		<variable name="partitionlist_flashimage_height" value="144" />

-		<variable name="partitionlist_wipe_height" value="243" />

-		<variable name="partitionlist_mount_height" value="221" />

-		<variable name="partitionlist_backup_height" value="198" />

-		<variable name="listbox_timezone_height" value="306" />

-		<variable name="listbox_settings_height" value="243" />

-		<variable name="fastscroll_w" value="7" />

-		<variable name="fastscroll_linew" value="1" />

-		<variable name="fastscroll_rectw" value="7" />

-		<variable name="fastscroll_recth" value="45" />

-		<variable name="slidervalue_lineh" value="2" />

-		<variable name="slidervalue_padding" value="0" />

-		<variable name="slidervalue_sliderw" value="24" />

-		<variable name="slidervalue_sliderh" value="36" />

-		<variable name="slideout_y" value="40" />

-		<variable name="slideout_height" value="380" />

-		<variable name="slideout_bg_height" value="420" />

-		<variable name="input_height" value="18" />

-		<variable name="input_line_width" value="1" />

-		<variable name="console_height" value="234" />

-		<variable name="console_terminal_height" value="164" />

-		<variable name="dialog_button_x" value="480" />

-		<variable name="date_button_x" value="230" />

-		<variable name="progress_x" value="230" />

-		<variable name="progress_text_x" value="40" />

-		<variable name="progress_text_y" value="348" />

-		<variable name="pattern_x" value="84" />

-		<variable name="pattern_dot_dia" value="12" />

-		<variable name="pattern_line_w" value="4" />

-		<variable name="pattern_size" value="252" />

-	</variables>

-

-	<mousecursor>

-		<placement w="15" h="15" />

-		<background color="#FFFF00FF" resource="cursor" />

-		<speed multiplier="2.5" />

-	</mousecursor>

-

-	<templates>

-		<template name="page">

-			<background color="%background_color%" />

-

-			<object type="fill" color="%accent_color%">

-				<placement x="0" y="0" w="%screen_width%" h="%header_height%" />

-			</object>

-

-			<object type="image">

-				<condition var1="tw_busy" var2="1" />

-				<image resource="logo" />

-				<placement x="0" y="0" />

-			</object>

-

-			<object type="button">

-				<condition var1="tw_busy" var2="0" />

-				<placement x="0" y="0" />

-				<image resource="logo" />

-				<action function="key">home</action>

-			</object>

-

-			<object type="fill" color="#00000030">

-				<condition var1="tw_simulate_actions" var2="0" />

-				<placement x="0" y="0" w="%screen_width%" h="%status_height%" />

-			</object>

-

-			<object type="fill" color="%text_fail_color%">

-				<condition var1="tw_simulate_actions" var2="1" />

-				<placement x="0" y="0" w="%screen_width%" h="%status_height%" />

-			</object>

-

-			<object type="text" color="%text_color%">

-				<condition var1="tw_no_cpu_temp" var2="1" />

-				<font resource="font_m" />

-				<placement x="%indent%" y="%row1_header_y%" />

-				<text>%tw_version%</text>

-			</object>

-

-			<object type="text" color="%text_color%">

-				<condition var1="tw_no_cpu_temp" var2="0" />

-				<font resource="font_m" />

-				<placement x="%indent%" y="%row1_header_y%" />

-				<text>{@cpu_temp=CPU: %tw_cpu_temp% &#xB0;C}</text>

-			</object>

-

-			<object type="text" color="%text_color%">

-				<font resource="font_m" />

-				<placement x="%center_x%" y="%row1_header_y%" placement="5" />

-				<text>%tw_time%</text>

-			</object>

-

-			<object type="text" color="%text_color%">

-				<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>

-				<font resource="font_m" />

-				<placement x="%indent_right%" y="%row1_header_y%" placement="1" />

-				<text>{@battery_pct=Battery: %tw_battery%}</text>

-			</object>

-

-			<object type="fill" color="#000000">

-				<placement x="0" y="%navbar_y%" w="%screen_width%" h="%navbar_height%" />

-			</object>

-

-			<object type="button">

-				<condition var1="tw_navbar_button_position" op="=" var2="0" />

-				<condition var1="tw_samsung_navbar" op="!=" var2="1" />

-				<placement x="%back_button_x%" y="%navbar_btn_y%" placement="4" />

-				<image resource="back" />

-				<condition var1="tw_busy" var2="0" />

-				<action function="key">back</action>

-			</object>

-

-			<object type="button">

-				<condition var1="tw_navbar_button_position" op="=" var2="0" />

-				<condition var1="tw_samsung_navbar" op="=" var2="1" />

-				<placement x="%back_button_x%" y="%navbar_btn_y%" placement="4" />

-				<image resource="console" />

-				<condition var1="tw_busy" var2="0" />

-				<action function="overlay">slideout</action>

-			</object>

-

-			<object type="button">

-				<condition var1="tw_navbar_button_position" op="=" var2="0" />

-				<placement x="%center_x%" y="%navbar_btn_y%" placement="4" />

-				<image resource="home" />

-				<condition var1="tw_busy" var2="0" />

-				<action function="key">home</action>

-			</object>

-

-			<object type="button">

-				<condition var1="tw_navbar_button_position" op="=" var2="0" />

-				<condition var1="tw_samsung_navbar" op="!=" var2="1" />

-				<placement x="%console_button_x%" y="%navbar_btn_y%" placement="4" />

-				<image resource="console" />

-				<condition var1="tw_busy" var2="0" />

-				<action function="overlay">slideout</action>

-			</object>

-

-			<object type="button">

-				<condition var1="tw_navbar_button_position" op="=" var2="0" />

-				<condition var1="tw_samsung_navbar" op="=" var2="1" />

-				<placement x="%console_button_x%" y="%navbar_btn_y%" placement="4" />

-				<image resource="back" />

-				<condition var1="tw_busy" var2="0" />

-				<action function="key">back</action>

-			</object>

-

-			<object type="button">

-				<condition var1="tw_navbar_button_position" op="=" var2="1" />

-				<condition var1="tw_samsung_navbar" op="!=" var2="1" />

-				<placement x="%back_button_x_1%" y="%navbar_btn_y%" placement="4" />

-				<image resource="back" />

-				<condition var1="tw_busy" var2="0" />

-				<action function="key">back</action>

-			</object>

-

-			<object type="button">

-				<condition var1="tw_navbar_button_position" op="=" var2="1" />

-				<condition var1="tw_samsung_navbar" op="=" var2="1" />

-				<placement x="%back_button_x_1%" y="%navbar_btn_y%" placement="4" />

-				<image resource="console" />

-				<condition var1="tw_busy" var2="0" />

-				<action function="overlay">slideout</action>

-			</object>

-

-			<object type="button">

-				<condition var1="tw_navbar_button_position" op="=" var2="1" />

-				<placement x="%home_button_x_1%" y="%navbar_btn_y%" placement="4" />

-				<image resource="home" />

-				<condition var1="tw_busy" var2="0" />

-				<action function="key">home</action>

-			</object>

-

-			<object type="button">

-				<condition var1="tw_navbar_button_position" op="=" var2="1" />

-				<condition var1="tw_samsung_navbar" op="!=" var2="1" />

-				<placement x="%console_button_x_1%" y="%navbar_btn_y%" placement="4" />

-				<image resource="console" />

-				<condition var1="tw_busy" var2="0" />

-				<action function="overlay">slideout</action>

-			</object>

-

-			<object type="button">

-				<condition var1="tw_navbar_button_position" op="=" var2="1" />

-				<condition var1="tw_samsung_navbar" op="=" var2="1" />

-				<placement x="%console_button_x_1%" y="%navbar_btn_y%" placement="4" />

-				<image resource="back" />

-				<condition var1="tw_busy" var2="0" />

-				<action function="key">back</action>

-			</object>

-

-			<object type="button">

-				<condition var1="tw_navbar_button_position" op="=" var2="2" />

-				<condition var1="tw_samsung_navbar" op="!=" var2="1" />

-				<placement x="%back_button_x_2%" y="%navbar_btn_y%" placement="4" />

-				<image resource="back" />

-				<condition var1="tw_busy" var2="0" />

-				<action function="key">back</action>

-			</object>

-

-			<object type="button">

-				<condition var1="tw_navbar_button_position" op="=" var2="2" />

-				<condition var1="tw_samsung_navbar" op="=" var2="1" />

-				<placement x="%back_button_x_2%" y="%navbar_btn_y%" placement="4" />

-				<image resource="console" />

-				<condition var1="tw_busy" var2="0" />

-				<action function="overlay">slideout</action>

-			</object>

-

-			<object type="button">

-				<condition var1="tw_navbar_button_position" op="=" var2="2" />

-				<placement x="%home_button_x_2%" y="%navbar_btn_y%" placement="4" />

-				<image resource="home" />

-				<condition var1="tw_busy" var2="0" />

-				<action function="key">home</action>

-			</object>

-

-			<object type="button">

-				<condition var1="tw_navbar_button_position" op="=" var2="2" />

-				<condition var1="tw_samsung_navbar" op="!=" var2="1" />

-				<placement x="%console_button_x_2%" y="%navbar_btn_y%" placement="4" />

-				<image resource="console" />

-				<condition var1="tw_busy" var2="0" />

-				<action function="overlay">slideout</action>

-			</object>

-

-			<object type="button">

-				<condition var1="tw_navbar_button_position" op="=" var2="2" />

-				<condition var1="tw_samsung_navbar" op="=" var2="1" />

-				<placement x="%console_button_x_2%" y="%navbar_btn_y%" placement="4" />

-				<image resource="back" />

-				<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="%progress_x%" y="%row16_y%" />

-				<resource empty="progress_empty" full="progress_full" />

-				<data name="ui_progress" />

-			</object>

-

-			<object type="animation">

-				<placement x="%progress_x%" y="%row16_y%" />

-				<resource name="progress" />

-				<speed fps="24" render="2" />

-				<loop frame="1" />

-			</object>

-		</template>

-

-		<template name="sort_options">

-			<object type="image">

-				<placement x="%col_button_right%" y="%row1a_y%" />

-				<image resource="main_button_half_width_low" />

-			</object>

-

-			<object type="image">

-				<placement x="%col_button_right%" y="%row4a_y%" />

-				<image resource="main_button_half_width_low" />

-			</object>

-

-			<object type="image">

-				<placement x="%col_button_right%" y="%row7a_y%" />

-				<image resource="main_button_half_width_low" />

-			</object>

-

-			<object type="button" style="sort_asc">

-				<condition var1="tw_gui_sort_order" op="=" var2="1" />

-				<placement x="%col_button_right%" y="%row1a_y%" />

-				<text>{@sort_by_name=Sort by Name}</text>

-				<action function="set">tw_gui_sort_order=-1</action>

-			</object>

-

-			<object type="button" style="sort_desc">

-				<condition var1="tw_gui_sort_order" op="=" var2="-1" />

-				<placement x="%col_button_right%" y="%row1a_y%" />

-				<text>{@sort_by_name=Sort by Name}</text>

-				<action function="set">tw_gui_sort_order=1</action>

-			</object>

-

-			<object type="button" style="sort_empty">

-				<conditions>

-					<condition var1="tw_gui_sort_order" op="!=" var2="1" />

-					<condition var1="tw_gui_sort_order" op="!=" var2="-1" />

-				</conditions>

-				<placement x="%col_button_right%" y="%row1a_y%" />

-				<text>{@sort_by_name=Sort by Name}</text>

-				<action function="set">tw_gui_sort_order=1</action>

-			</object>

-

-			<object type="button" style="sort_asc">

-				<condition var1="tw_gui_sort_order" op="=" var2="2" />

-				<placement x="%col_button_right%" y="%row4a_y%" />

-				<text>{@sort_by_date=Sort by Date}</text>

-				<action function="set">tw_gui_sort_order=-2</action>

-			</object>

-

-			<object type="button" style="sort_desc">

-				<condition var1="tw_gui_sort_order" op="=" var2="-2" />

-				<placement x="%col_button_right%" y="%row4a_y%" />

-				<text>{@sort_by_date=Sort by Date}</text>

-				<action function="set">tw_gui_sort_order=2</action>

-			</object>

-

-			<object type="button" style="sort_empty">

-				<conditions>

-					<condition var1="tw_gui_sort_order" op="!=" var2="2" />

-					<condition var1="tw_gui_sort_order" op="!=" var2="-2" />

-				</conditions>

-				<placement x="%col_button_right%" y="%row4a_y%" />

-				<text>{@sort_by_date=Sort by Date}</text>

-				<action function="set">tw_gui_sort_order=2</action>

-			</object>

-

-			<object type="button" style="sort_asc">

-				<condition var1="tw_gui_sort_order" op="=" var2="3" />

-				<placement x="%col_button_right%" y="%row7a_y%" />

-				<text>{@sort_by_size=Sort by Size}</text>

-				<action function="set">tw_gui_sort_order=-3</action>

-			</object>

-

-			<object type="button" style="sort_desc">

-				<condition var1="tw_gui_sort_order" op="=" var2="-3" />

-				<placement x="%col_button_right%" y="%row7a_y%" />

-				<text>{@sort_by_size=Sort by Size}</text>

-				<action function="set">tw_gui_sort_order=3</action>

-			</object>

-

-			<object type="button" style="sort_empty">

-				<conditions>

-					<condition var1="tw_gui_sort_order" op="!=" var2="3" />

-					<condition var1="tw_gui_sort_order" op="!=" var2="-3" />

-				</conditions>

-				<placement x="%col_button_right%" y="%row7a_y%" />

-				<text>{@sort_by_size=Sort by Size}</text>

-				<action function="set">tw_gui_sort_order=3</action>

-			</object>

-		</template>

-

-		<template name="tabs_settings">

-			<object type="button" style="tab">

-				<placement x="0" y="%row1_y%" w="%tab5_width%" h="%tab_height%" />

-				<text>{@tab_general=GENERAL}</text>

-				<action function="page">settings</action>

-			</object>

-

-			<object type="button" style="tab">

-				<placement x="%tab5_col2_x%" y="%row1_y%" w="%tab5_width%" h="%tab_height%" />

-				<text>{@tab_time_zone=TIME ZONE}</text>

-				<action function="page">settings_timezone</action>

-			</object>

-

-			<object type="button" style="tab">

-				<placement x="%tab5_col3_x%" y="%row1_y%" w="%tab5_width%" h="%tab_height%" />

-				<text>{@tab_screen=SCREEN}</text>

-				<action function="page">settings_screen</action>

-			</object>

-

-			<object type="button" style="tab">

-				<placement x="%tab5_col4_x%" y="%row1_y%" w="%tab5_width%" h="%tab_height%" />

-				<text>{@tab_vibration=VIBRATION}</text>

-				<action function="page">settings_vibration</action>

-			</object>

-

-			<object type="button" style="tab">

-				<placement x="%tab5_col5_x%" y="%row1_y%" w="%tab5_width%" h="%tab_height%" />

-				<text>{@tab_language=LANGUAGE}</text>

-				<action function="page">settings_language</action>

-			</object>

-		</template>

-

-		<template name="console">

-			<object type="console">

-				<placement x="%col1_x_left%" y="%row2_y%" w="%content_width%" h="%console_height%" />

-			</object>

-

-			<object type="fill" color="%fileselector_linecolor%">

-				<placement x="%col1_x_left%" y="row2_y" w="%content_width%" h="input_line_width" placement="1" />

-			</object>

-

-			<object type="fill" color="%fileselector_linecolor%">

-				<placement x="%col1_x_left%" y="row15_y" w="%content_width%" h="input_line_width" />

-			</object>

-		</template>

-

-		<template name="console_terminal">

-			<object type="console">

-				<placement x="%col1_x_left%" y="%row3_header_y%" w="content_width" h="%console_terminal_height%" />

-			</object>

-

-			<object type="fill" color="%fileselector_linecolor%">

-				<placement x="%col1_x_left%" y="%row3_header_y%" w="%content_width%" h="input_line_width" placement="1" />

-			</object>

-

-			<object type="fill" color="%fileselector_linecolor%">

-				<placement x="%col1_x_left%" y="row7_y" w="%content_width%" h="input_line_width" />

-			</object>

-		</template>

-

-		<template name="keyboardtemplate">

-			<object type="keyboard">

-				<placement x="0" y="%keyboard_y%" w="800" h="192" />

-				<keymargin x="4" y="4"/>

-				<background color="#111111"/>

-				<key-alphanumeric color="#111111" font="keylabel" textcolor="#EEEEEE"/>

-				<key-other color="#111111" font="keylabel-small" textcolor="#5b5b5bff"/>

-				<longpress font="keylabel-longpress" textcolor="#5b5b5bff" x="14" y="2"/>

-				<keylabel key="0:c:8" text="Bksp" resource="backspace"/>

-				<keylabel key="0:action" text="Enter" resource="enter"/>

-				<keylabel key=" " text="Space" resource="space"/>

-				<highlight color="%highlight_color%" />

-				<capshighlight color="%highlight_color%" />

-				<layout1>

-					<keysize height="48" 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="40:" key02="a" long02="@" key03="s" long03="#" key04="d" long04="$" key05="f" long05="%" key06="g" long06="&amp;" key07="h" long07="*" key08="j" long08="-" key09="k" long09="+" key10="l" long10="_" key11="40:" />

-					<row3 key01="120:layout2" key02="z" long02="!" key03="x" long03='"' key04="c" long04="'" key05="v" long05=":" key06="b" long06=";" key07="n" long07="/" key08="m" long08="?" key09="120:c:8" />

-					<row4 key01="120:layout3" key02="/" key03="400: " key04="." key05="120:action" />

-					<keylabel key="0:layout2" text="Shift" resource="shift"/>

-					<keylabel key="0:layout3" text="?123"/>

-				</layout1>

-				<layout2>

-					<keysize height="48" 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="40:" key02="A" long02="@" key03="S" long03="#" key04="D" long04="$" key05="F" long05="%" key06="G" long06="&amp;" key07="H" long07="*" key08="J" long08="-" key09="K" long09="+" key10="L" long10="_" key11="40:" />

-					<row3 key01="120:layout1" key02="Z" long02="!" key03="X" long03='"' key04="C" long04="'" key05="V" long05=":" key06="B" long06=";" key07="N" long07="/" key08="M" long08="?" key09="120:c:8" />

-					<row4 key01="120:layout3" key02="/" key03="400: " key04="." key05="120:action" />

-					<keylabel key="0:layout1" text="Shift" resource="shift_fill"/>

-					<keylabel key="0:layout3" text="?123"/>

-				</layout2>

-				<layout3>

-					<keysize height="48" 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="120:layout4" key02="!" key03="80:c:34" key04="'" key05=":" key06=";" key07="/" key08="?" key09="120:c:8" />

-					<row4 key01="120:layout1" key02="," key03="400: " key04="." key05="120:action" />

-					<keylabel key="0:layout1" text="ABC"/>

-					<keylabel key="0:layout4" text="~\{"/>

-				</layout3>

-				<layout4>

-					<keysize height="48" width="80" />

-					<row1 key01="~" key02="`" key03="|" key04="80:" key05="80:" key06="80:" key07="%" key08="80:" key09="{" key10="}" />

-					<row2 key01="80:" key02="80:" key03="80:" key04="80:" key05="80:" key06="^" key07="_" key08="=" key09="[" key10="]" />

-					<row3 key01="120:layout3" key02="80:" key03="80:" key04="80:" key05="80:" key06="\" key07="&lt;" key08="&gt;" key09="120:c:8" />

-					<row4 key01="120:layout1" key02="80:c:34" key03="400: " key04="." key05="120:action" />

-					<keylabel key="0:layout1" text="ABC"/>

-					<keylabel key="0:layout3" text="?123"/>

-				</layout4>

-			</object>

-		</template>

-	</templates>

-</recovery>

+<?xml version="1.0"?>
+<recovery>
+	<details>
+		<resolution width="800" height="480"/>
+		<author>TeamWin</author>
+		<title>Backup Naowz</title>
+		<description>Default basic theme</description>
+		<preview>preview.jpg</preview>
+	</details>
+
+	<include>
+		<xmlfile name="landscape.xml"/>
+	</include>
+
+	<resources>
+		<font name="font_l" filename="RobotoCondensed-Regular.ttf" size="18"/>
+		<font name="font_m" filename="RobotoCondensed-Regular.ttf" size="14"/>
+		<font name="font_s" filename="RobotoCondensed-Regular.ttf" size="12"/>
+		<font name="fixed" filename="DroidSansMono.ttf" size="12"/>
+
+		<font name="keylabel" filename="RobotoCondensed-Regular.ttf" size="21"/>
+		<font name="keylabel-small" filename="RobotoCondensed-Regular.ttf" size="18"/>
+		<font name="keylabel-longpress" filename="RobotoCondensed-Regular.ttf" size="11"/>
+
+		<image name="logo" filename="logo" retainaspect="1"/>
+		<image name="main_button" filename="main_button"/>
+		<image name="main_button_half_width" filename="main_button_half_width"/>
+		<image name="main_button_half_width_low" filename="main_button_half_width_low"/>
+		<image name="tab_3" filename="tab_3"/>
+		<image name="tab_4" filename="tab_4"/>
+		<image name="file" filename="file" retainaspect="1"/>
+		<image name="folder" filename="folder" retainaspect="1"/>
+		<image name="unlock_icon" filename="unlock_icon" retainaspect="1"/>
+		<image name="home" filename="home" retainaspect="1"/>
+		<image name="back" filename="back" retainaspect="1"/>
+		<image name="console" filename="console" retainaspect="1"/>
+		<image name="kb_hide" filename="kb_hide" retainaspect="1"/>
+		<image name="kb_show" filename="kb_show" retainaspect="1"/>
+		<image name="checkbox_false" filename="checkbox_false" retainaspect="1"/>
+		<image name="checkbox_true" filename="checkbox_true" retainaspect="1"/>
+		<image name="radio_false" filename="radio_false" retainaspect="1"/>
+		<image name="radio_true" filename="radio_true" retainaspect="1"/>
+		<image name="sort_asc" filename="sort_asc"/>
+		<image name="sort_desc" filename="sort_desc"/>
+		<image name="sort_empty" filename="sort_empty"/>
+		<animation name="progress" filename="indeterminate"/>
+		<image name="progress_empty" filename="progress_empty"/>
+		<image name="progress_full" filename="progress_fill"/>
+		<image name="slider" filename="slider"/>
+		<image name="slider_used" filename="slider_used"/>
+		<image name="slider_touch" filename="slider_touch"/>
+		<image name="handle" filename="handle"/>
+		<image name="cursor" filename="cursor" retainaspect="1"/>
+
+		<image name="backspace" filename="backspace" retainaspect="1"/>
+		<image name="backspace_terminal" filename="backspace_terminal" retainaspect="1"/>
+		<image name="enter" filename="enter" retainaspect="1"/>
+		<image name="enter_terminal" filename="enter_terminal" retainaspect="1"/>
+		<image name="shift" filename="shift" retainaspect="1"/>
+		<image name="shift_terminal" filename="shift_terminal" retainaspect="1"/>
+		<image name="shift_fill" filename="shift_fill" retainaspect="1"/>
+		<image name="shift_terminal_fill" filename="shift_terminal_fill" retainaspect="1"/>
+		<image name="space" filename="space" retainaspect="1"/>
+		<image name="space_terminal" filename="space_terminal" retainaspect="1"/>
+		<image name="kb_arrow_left" filename="kb_arrow_left" retainaspect="1"/>
+		<image name="kb_arrow_right" filename="kb_arrow_right" retainaspect="1"/>
+		<image name="kb_arrow_up" filename="kb_arrow_up" retainaspect="1"/>
+		<image name="kb_arrow_down" filename="kb_arrow_down" retainaspect="1"/>
+	</resources>
+
+	<variables>
+		<variable name="tw_samsung_navbar" value="0" persist="1"/>
+		<variable name="tw_navbar_button_position" value="0" persist="1"/>
+		<variable name="tw_hide_kb" value="0" persist="1"/>
+
+		<variable name="screen_width" value="800"/>
+		<variable name="screen_height" value="480"/>
+		<variable name="status_height" value="20"/>
+		<variable name="header_height" value="80"/>
+		<variable name="navbar_height" value="40"/>
+		<variable name="content_width" value="760"/>
+		<variable name="content_quarter_width" value="590"/>
+		<variable name="content_half_width" value="370"/>
+		<variable name="content_overlay_width" value="380"/>
+		<variable name="dialog_height" value="207"/>
+		<variable name="dialog_width" value="400"/>
+		<variable name="dialog_content_x" value="220"/>
+		<variable name="back_button_x" value="264"/>
+		<variable name="console_button_x" value="536"/>
+		<variable name="back_button_x_1" value="50"/>
+		<variable name="home_button_x_1" value="130"/>
+		<variable name="console_button_x_1" value="210"/>
+		<variable name="back_button_x_2" value="590"/>
+		<variable name="home_button_x_2" value="670"/>
+		<variable name="console_button_x_2" value="750"/>
+		<variable name="col1_x_header" value="60"/>
+		<variable name="indent" value="10"/>
+		<variable name="col1_x_left" value="20"/>
+		<variable name="col2_x_left" value="210"/>
+		<variable name="center_x" value="400"/>
+		<variable name="col1_x_right" value="410"/>
+		<variable name="col2_x_right" value="590"/>
+		<variable name="col_button_right" value="620"/>
+		<variable name="indent_right" value="790"/>
+		<variable name="tab_height" value="30"/>
+		<variable name="tab_indicator_height" value="2"/>
+		<variable name="tab4_width" value="200"/>
+		<variable name="tab5_width" value="160"/>
+		<variable name="tab4_col2_x" value="200"/>
+		<variable name="tab4_col4_x" value="600"/>
+		<variable name="tab5_col2_x" value="160"/>
+		<variable name="tab5_col3_x" value="320"/>
+		<variable name="tab5_col4_x" value="480"/>
+		<variable name="tab5_col5_x" value="640"/>
+		<variable name="btn4_col2_x_left" value="117"/>
+		<variable name="btn4_col3_x_left" value="216"/>
+		<variable name="btn4_col4_x_left" value="313"/>
+		<variable name="btn4_col2_x_right" value="507"/>
+		<variable name="btn4_col3_x_right" value="606"/>
+		<variable name="btn4_col4_x_right" value="703"/>
+		<variable name="row1_header_y" value="0"/>
+		<variable name="row2_header_y" value="20"/>
+		<variable name="row3_header_y" value="24"/>
+		<variable name="row4_header_y" value="52"/>
+		<variable name="row1_y" value="80"/>
+		<variable name="row1a_y" value="89"/>
+		<variable name="row2_y" value="98"/>
+		<variable name="row2a_y" value="107"/>
+		<variable name="row_tab_y" value="108"/>
+		<variable name="row2_input_y" value="116"/>
+		<variable name="row3_y" value="116"/>
+		<variable name="row3a_y" value="125"/>
+		<variable name="row3_input_y" value="125"/>
+		<variable name="row4_y" value="134"/>
+		<variable name="row4a_y" value="143"/>
+		<variable name="row4_input_y" value="143"/>
+		<variable name="row5_y" value="152"/>
+		<variable name="row5a_y" value="161"/>
+		<variable name="row6_y" value="170"/>
+		<variable name="row6a_y" value="179"/>
+		<variable name="row7_y" value="188"/>
+		<variable name="row7a_y" value="197"/>
+		<variable name="row8_y" value="206"/>
+		<variable name="row8a_y" value="215"/>
+		<variable name="row9_y" value="224"/>
+		<variable name="row9a_y" value="233"/>
+		<variable name="row10_y" value="242"/>
+		<variable name="row10a_y" value="251"/>
+		<variable name="row11_y" value="260"/>
+		<variable name="row11a_y" value="269"/>
+		<variable name="row12_y" value="278"/>
+		<variable name="row12a_y" value="288"/>
+		<variable name="row13_y" value="296"/>
+		<variable name="row13a_y" value="305"/>
+		<variable name="row14_y" value="314"/>
+		<variable name="row14a_y" value="323"/>
+		<variable name="row15_y" value="332"/>
+		<variable name="row15a_y" value="341"/>
+		<variable name="row16_y" value="350"/>
+		<variable name="row16a_y" value="359"/>
+		<variable name="row17_y" value="368"/>
+		<variable name="row17a_y" value="377"/>
+		<variable name="row18_y" value="386"/>
+		<variable name="row18a_y" value="395"/>
+		<variable name="row19_y" value="404"/>
+		<variable name="row19a_y" value="413"/>
+		<variable name="row20_y" value="422"/>
+		<variable name="navbar_y" value="440"/>
+		<variable name="navbar_btn_y" value="460"/>
+		<variable name="keyboard_y" value="248"/>
+		<variable name="background_color" value="#1A1A1A"/>
+		<variable name="accent_color" value="#0090CA"/>
+		<variable name="text_color" value="#EEEEEE"/>
+		<variable name="text_button_color" value="#EEEEEE"/>
+		<variable name="text_success_color" value="#76FF03"/>
+		<variable name="text_fail_color" value="#FF0101"/>
+		<variable name="highlight_color" value="#1A1A1A80"/>
+		<variable name="caps_highlight_color" value="#22222280"/>
+		<variable name="transparent" value="#00000000"/>
+		<variable name="semi_transparent" value="#00000099"/>
+		<variable name="warning" value="#F8F8A0"/>
+		<variable name="error" value="#FF0101"/>
+		<variable name="highlight" value="#0090CA"/>
+		<variable name="fileselector_linecolor" value="#555555"/>
+		<variable name="fileselector_highlight_color" value="#555555"/>
+		<variable name="fileselector_separatorheight" value="1"/>
+		<variable name="fileselector_spacing" value="0"/>
+		<variable name="fileselector_install_height" value="333"/>
+		<variable name="fileselector_install_width" value="400"/>
+		<variable name="fileselector_install_folder_width" value="170"/>
+		<variable name="fileselector_filemanager_height" value="333"/>
+		<variable name="partitionlist_spacing" value="0"/>
+		<variable name="partitionlist_storage_height" value="160"/>
+		<variable name="partitionlist_flashimage_height" value="144"/>
+		<variable name="partitionlist_wipe_height" value="243"/>
+		<variable name="partitionlist_mount_height" value="221"/>
+		<variable name="partitionlist_backup_height" value="198"/>
+		<variable name="listbox_timezone_height" value="306"/>
+		<variable name="listbox_settings_height" value="243"/>
+		<variable name="fastscroll_w" value="7"/>
+		<variable name="fastscroll_linew" value="1"/>
+		<variable name="fastscroll_rectw" value="7"/>
+		<variable name="fastscroll_recth" value="45"/>
+		<variable name="slidervalue_lineh" value="2"/>
+		<variable name="slidervalue_padding" value="0"/>
+		<variable name="slidervalue_sliderw" value="24"/>
+		<variable name="slidervalue_sliderh" value="36"/>
+		<variable name="slideout_y" value="40"/>
+		<variable name="slideout_height" value="380"/>
+		<variable name="slideout_bg_height" value="420"/>
+		<variable name="input_height" value="18"/>
+		<variable name="input_line_width" value="1"/>
+		<variable name="console_height" value="234"/>
+		<variable name="console_terminal_height" value="164"/>
+		<variable name="terminal_s_height" value="220"/>
+		<variable name="terminal_l_height" value="412"/>
+		<variable name="dialog_button_x" value="480"/>
+		<variable name="date_button_x" value="230"/>
+		<variable name="progress_x" value="230"/>
+		<variable name="progress_text_x" value="40"/>
+		<variable name="progress_text_y" value="348"/>
+		<variable name="pattern_x" value="84"/>
+		<variable name="pattern_dot_dia" value="12"/>
+		<variable name="pattern_line_w" value="4"/>
+		<variable name="pattern_size" value="252"/>
+	</variables>
+
+	<mousecursor>
+		<placement w="15" h="15"/>
+		<background color="#FFFF00FF" resource="cursor"/>
+		<speed multiplier="2.5"/>
+	</mousecursor>
+
+	<templates>
+		<template name="page">
+			<background color="%background_color%"/>
+
+			<fill color="%accent_color%">
+				<placement x="0" y="0" w="%screen_width%" h="%header_height%"/>
+			</fill>
+
+			<image>
+				<condition var1="tw_busy" var2="1"/>
+				<image resource="logo"/>
+				<placement x="0" y="0"/>
+			</image>
+
+			<button>
+				<condition var1="tw_busy" var2="0"/>
+				<placement x="0" y="0"/>
+				<image resource="logo"/>
+				<action function="key">home</action>
+			</button>
+
+			<fill color="#00000030">
+				<condition var1="tw_simulate_actions" var2="0"/>
+				<placement x="0" y="0" w="%screen_width%" h="%status_height%"/>
+			</fill>
+
+			<fill color="%text_fail_color%">
+				<condition var1="tw_simulate_actions" var2="1"/>
+				<placement x="0" y="0" w="%screen_width%" h="%status_height%"/>
+			</fill>
+
+			<text color="%text_color%">
+				<condition var1="tw_no_cpu_temp" var2="1"/>
+				<font resource="font_m"/>
+				<placement x="%indent%" y="%row1_header_y%"/>
+				<text>%tw_version%</text>
+			</text>
+
+			<text color="%text_color%">
+				<condition var1="tw_no_cpu_temp" var2="0"/>
+				<font resource="font_m"/>
+				<placement x="%indent%" y="%row1_header_y%"/>
+				<text>{@cpu_temp=CPU: %tw_cpu_temp% °C}</text>
+			</text>
+
+			<text color="%text_color%">
+				<font resource="font_m"/>
+				<placement x="%center_x%" y="%row1_header_y%" placement="5"/>
+				<text>%tw_time%</text>
+			</text>
+
+			<text color="%text_color%">
+				<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>
+				<font resource="font_m"/>
+				<placement x="%indent_right%" y="%row1_header_y%" placement="1"/>
+				<text>{@battery_pct=Battery: %tw_battery%}</text>
+			</text>
+
+			<fill color="#000000">
+				<placement x="0" y="%navbar_y%" w="%screen_width%" h="%navbar_height%"/>
+			</fill>
+
+			<button>
+				<condition var1="tw_navbar_button_position" op="=" var2="0"/>
+				<condition var1="tw_samsung_navbar" op="!=" var2="1"/>
+				<placement x="%back_button_x%" y="%navbar_btn_y%" placement="4"/>
+				<image resource="back"/>
+				<condition var1="tw_busy" var2="0"/>
+				<action function="key">back</action>
+			</button>
+
+			<button>
+				<condition var1="tw_navbar_button_position" op="=" var2="0"/>
+				<condition var1="tw_samsung_navbar" op="=" var2="1"/>
+				<placement x="%back_button_x%" y="%navbar_btn_y%" placement="4"/>
+				<image resource="console"/>
+				<condition var1="tw_busy" var2="0"/>
+				<action function="overlay">slideout</action>
+			</button>
+
+			<button>
+				<condition var1="tw_navbar_button_position" op="=" var2="0"/>
+				<placement x="%center_x%" y="%navbar_btn_y%" placement="4"/>
+				<image resource="home"/>
+				<condition var1="tw_busy" var2="0"/>
+				<action function="key">home</action>
+			</button>
+
+			<button>
+				<condition var1="tw_navbar_button_position" op="=" var2="0"/>
+				<condition var1="tw_samsung_navbar" op="!=" var2="1"/>
+				<placement x="%console_button_x%" y="%navbar_btn_y%" placement="4"/>
+				<image resource="console"/>
+				<condition var1="tw_busy" var2="0"/>
+				<action function="overlay">slideout</action>
+			</button>
+
+			<button>
+				<condition var1="tw_navbar_button_position" op="=" var2="0"/>
+				<condition var1="tw_samsung_navbar" op="=" var2="1"/>
+				<placement x="%console_button_x%" y="%navbar_btn_y%" placement="4"/>
+				<image resource="back"/>
+				<condition var1="tw_busy" var2="0"/>
+				<action function="key">back</action>
+			</button>
+
+			<button>
+				<condition var1="tw_navbar_button_position" op="=" var2="1"/>
+				<condition var1="tw_samsung_navbar" op="!=" var2="1"/>
+				<placement x="%back_button_x_1%" y="%navbar_btn_y%" placement="4"/>
+				<image resource="back"/>
+				<condition var1="tw_busy" var2="0"/>
+				<action function="key">back</action>
+			</button>
+
+			<button>
+				<condition var1="tw_navbar_button_position" op="=" var2="1"/>
+				<condition var1="tw_samsung_navbar" op="=" var2="1"/>
+				<placement x="%back_button_x_1%" y="%navbar_btn_y%" placement="4"/>
+				<image resource="console"/>
+				<condition var1="tw_busy" var2="0"/>
+				<action function="overlay">slideout</action>
+			</button>
+
+			<button>
+				<condition var1="tw_navbar_button_position" op="=" var2="1"/>
+				<placement x="%home_button_x_1%" y="%navbar_btn_y%" placement="4"/>
+				<image resource="home"/>
+				<condition var1="tw_busy" var2="0"/>
+				<action function="key">home</action>
+			</button>
+
+			<button>
+				<condition var1="tw_navbar_button_position" op="=" var2="1"/>
+				<condition var1="tw_samsung_navbar" op="!=" var2="1"/>
+				<placement x="%console_button_x_1%" y="%navbar_btn_y%" placement="4"/>
+				<image resource="console"/>
+				<condition var1="tw_busy" var2="0"/>
+				<action function="overlay">slideout</action>
+			</button>
+
+			<button>
+				<condition var1="tw_navbar_button_position" op="=" var2="1"/>
+				<condition var1="tw_samsung_navbar" op="=" var2="1"/>
+				<placement x="%console_button_x_1%" y="%navbar_btn_y%" placement="4"/>
+				<image resource="back"/>
+				<condition var1="tw_busy" var2="0"/>
+				<action function="key">back</action>
+			</button>
+
+			<button>
+				<condition var1="tw_navbar_button_position" op="=" var2="2"/>
+				<condition var1="tw_samsung_navbar" op="!=" var2="1"/>
+				<placement x="%back_button_x_2%" y="%navbar_btn_y%" placement="4"/>
+				<image resource="back"/>
+				<condition var1="tw_busy" var2="0"/>
+				<action function="key">back</action>
+			</button>
+
+			<button>
+				<condition var1="tw_navbar_button_position" op="=" var2="2"/>
+				<condition var1="tw_samsung_navbar" op="=" var2="1"/>
+				<placement x="%back_button_x_2%" y="%navbar_btn_y%" placement="4"/>
+				<image resource="console"/>
+				<condition var1="tw_busy" var2="0"/>
+				<action function="overlay">slideout</action>
+			</button>
+
+			<button>
+				<condition var1="tw_navbar_button_position" op="=" var2="2"/>
+				<placement x="%home_button_x_2%" y="%navbar_btn_y%" placement="4"/>
+				<image resource="home"/>
+				<condition var1="tw_busy" var2="0"/>
+				<action function="key">home</action>
+			</button>
+
+			<button>
+				<condition var1="tw_navbar_button_position" op="=" var2="2"/>
+				<condition var1="tw_samsung_navbar" op="!=" var2="1"/>
+				<placement x="%console_button_x_2%" y="%navbar_btn_y%" placement="4"/>
+				<image resource="console"/>
+				<condition var1="tw_busy" var2="0"/>
+				<action function="overlay">slideout</action>
+			</button>
+
+			<button>
+				<condition var1="tw_navbar_button_position" op="=" var2="2"/>
+				<condition var1="tw_samsung_navbar" op="=" var2="1"/>
+				<placement x="%console_button_x_2%" y="%navbar_btn_y%" placement="4"/>
+				<image resource="back"/>
+				<condition var1="tw_busy" var2="0"/>
+				<action function="key">back</action>
+			</button>
+
+			<action>
+				<touch key="power"/>
+				<action function="overlay">lock</action>
+			</action>
+
+			<action>
+				<touch key="power+voldown"/>
+				<action function="screenshot"/>
+			</action>
+		</template>
+
+		<template name="progress_bar">
+			<progressbar>
+				<placement x="%progress_x%" y="%row16_y%"/>
+				<resource empty="progress_empty" full="progress_full"/>
+				<data name="ui_progress"/>
+			</progressbar>
+
+			<animation>
+				<placement x="%progress_x%" y="%row16_y%"/>
+				<resource name="progress"/>
+				<speed fps="24" render="2"/>
+				<loop frame="1"/>
+			</animation>
+		</template>
+
+		<template name="sort_options">
+			<image>
+				<placement x="%col_button_right%" y="%row1a_y%"/>
+				<image resource="main_button_half_width_low"/>
+			</image>
+
+			<image>
+				<placement x="%col_button_right%" y="%row4a_y%"/>
+				<image resource="main_button_half_width_low"/>
+			</image>
+
+			<image>
+				<placement x="%col_button_right%" y="%row7a_y%"/>
+				<image resource="main_button_half_width_low"/>
+			</image>
+
+			<button style="sort_asc">
+				<condition var1="tw_gui_sort_order" op="=" var2="1"/>
+				<placement x="%col_button_right%" y="%row1a_y%"/>
+				<text>{@sort_by_name=Sort by Name}</text>
+				<action function="set">tw_gui_sort_order=-1</action>
+			</button>
+
+			<button style="sort_desc">
+				<condition var1="tw_gui_sort_order" op="=" var2="-1"/>
+				<placement x="%col_button_right%" y="%row1a_y%"/>
+				<text>{@sort_by_name=Sort by Name}</text>
+				<action function="set">tw_gui_sort_order=1</action>
+			</button>
+
+			<button style="sort_empty">
+				<conditions>
+					<condition var1="tw_gui_sort_order" op="!=" var2="1"/>
+					<condition var1="tw_gui_sort_order" op="!=" var2="-1"/>
+				</conditions>
+				<placement x="%col_button_right%" y="%row1a_y%"/>
+				<text>{@sort_by_name=Sort by Name}</text>
+				<action function="set">tw_gui_sort_order=1</action>
+			</button>
+
+			<button style="sort_asc">
+				<condition var1="tw_gui_sort_order" op="=" var2="2"/>
+				<placement x="%col_button_right%" y="%row4a_y%"/>
+				<text>{@sort_by_date=Sort by Date}</text>
+				<action function="set">tw_gui_sort_order=-2</action>
+			</button>
+
+			<button style="sort_desc">
+				<condition var1="tw_gui_sort_order" op="=" var2="-2"/>
+				<placement x="%col_button_right%" y="%row4a_y%"/>
+				<text>{@sort_by_date=Sort by Date}</text>
+				<action function="set">tw_gui_sort_order=2</action>
+			</button>
+
+			<button style="sort_empty">
+				<conditions>
+					<condition var1="tw_gui_sort_order" op="!=" var2="2"/>
+					<condition var1="tw_gui_sort_order" op="!=" var2="-2"/>
+				</conditions>
+				<placement x="%col_button_right%" y="%row4a_y%"/>
+				<text>{@sort_by_date=Sort by Date}</text>
+				<action function="set">tw_gui_sort_order=2</action>
+			</button>
+
+			<button style="sort_asc">
+				<condition var1="tw_gui_sort_order" op="=" var2="3"/>
+				<placement x="%col_button_right%" y="%row7a_y%"/>
+				<text>{@sort_by_size=Sort by Size}</text>
+				<action function="set">tw_gui_sort_order=-3</action>
+			</button>
+
+			<button style="sort_desc">
+				<condition var1="tw_gui_sort_order" op="=" var2="-3"/>
+				<placement x="%col_button_right%" y="%row7a_y%"/>
+				<text>{@sort_by_size=Sort by Size}</text>
+				<action function="set">tw_gui_sort_order=3</action>
+			</button>
+
+			<button style="sort_empty">
+				<conditions>
+					<condition var1="tw_gui_sort_order" op="!=" var2="3"/>
+					<condition var1="tw_gui_sort_order" op="!=" var2="-3"/>
+				</conditions>
+				<placement x="%col_button_right%" y="%row7a_y%"/>
+				<text>{@sort_by_size=Sort by Size}</text>
+				<action function="set">tw_gui_sort_order=3</action>
+			</button>
+		</template>
+
+		<template name="tabs_settings">
+			<button style="tab">
+				<placement x="0" y="%row1_y%" w="%tab5_width%" h="%tab_height%"/>
+				<text>{@tab_general=GENERAL}</text>
+				<action function="page">settings</action>
+			</button>
+
+			<button style="tab">
+				<placement x="%tab5_col2_x%" y="%row1_y%" w="%tab5_width%" h="%tab_height%"/>
+				<text>{@tab_time_zone=TIME ZONE}</text>
+				<action function="page">settings_timezone</action>
+			</button>
+
+			<button style="tab">
+				<placement x="%tab5_col3_x%" y="%row1_y%" w="%tab5_width%" h="%tab_height%"/>
+				<text>{@tab_screen=SCREEN}</text>
+				<action function="page">settings_screen</action>
+			</button>
+
+			<button style="tab">
+				<placement x="%tab5_col4_x%" y="%row1_y%" w="%tab5_width%" h="%tab_height%"/>
+				<text>{@tab_vibration=VIBRATION}</text>
+				<action function="page">settings_vibration</action>
+			</button>
+
+			<button style="tab">
+				<placement x="%tab5_col5_x%" y="%row1_y%" w="%tab5_width%" h="%tab_height%"/>
+				<text>{@tab_language=LANGUAGE}</text>
+				<action function="page">settings_language</action>
+			</button>
+		</template>
+
+		<template name="console">
+			<console>
+				<placement x="%col1_x_left%" y="%row2_y%" w="%content_width%" h="%console_height%"/>
+			</console>
+
+			<fill color="%fileselector_linecolor%">
+				<placement x="%col1_x_left%" y="row2_y" w="%content_width%" h="input_line_width" placement="1"/>
+			</fill>
+
+			<fill color="%fileselector_linecolor%">
+				<placement x="%col1_x_left%" y="row15_y" w="%content_width%" h="input_line_width"/>
+			</fill>
+		</template>
+
+		<template name="console_terminal">
+			<console>
+				<placement x="%col1_x_left%" y="%row3_header_y%" w="content_width" h="%console_terminal_height%"/>
+			</console>
+
+			<fill color="%fileselector_linecolor%">
+				<placement x="%col1_x_left%" y="%row3_header_y%" w="%content_width%" h="input_line_width" placement="1"/>
+			</fill>
+
+			<fill color="%fileselector_linecolor%">
+				<placement x="%col1_x_left%" y="row7_y" w="%content_width%" h="input_line_width"/>
+			</fill>
+		</template>
+
+		<template name="keyboardterminaltemplate">
+			<keyboard>
+				<condition var1="tw_hide_kb" op="=" var2="0"/>
+				<placement x="0" y="%keyboard_y%" w="800" h="192"/>
+				<keymargin x="4" y="4"/>
+				<background color="#111111"/>
+				<key-alphanumeric color="#111111" font="keylabel" textcolor="#EEEEEE"/>
+				<key-other color="#111111" font="keylabel-small" textcolor="#5b5b5bff"/>
+				<longpress font="keylabel-longpress" textcolor="#5b5b5bff" x="14" y="2"/>
+				<keylabel key="0:c:8" text="Bksp" resource="backspace_terminal"/>
+				<keylabel key="0:action" text="Enter" resource="enter_terminal"/>
+				<keylabel key=" " text="Space" resource="space_terminal"/>
+				<keylabel key="0:k:29" text="Ctrl"/>
+				<keylabel key="0:c:27" text="Esc"/>
+				<keylabel key="0:c:9" text="Tab"/>
+				<keylabel key="0:k:105" text="&lt;" resource="kb_arrow_left"/>
+				<keylabel key="0:k:108" text="v" resource="kb_arrow_down"/>
+				<keylabel key="0:k:103" text="^" resource="kb_arrow_up"/>
+				<keylabel key="0:k:106" text="&gt;" resource="kb_arrow_right"/>
+				<highlight color="%highlight_color%"/>
+				<capshighlight color="%highlight_color%"/>
+				<ctrlhighlight color="#0090CA80"/>
+				<layout1>
+					<keysize height="48" width="68"/>
+					<row1 key01="60:c:27" long01=":c:3" 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="60:k:103"/>
+					<row2 key01="60:c:9" key02="34:" key03="a" long03="@" key04="s" long04="#" key05="d" long05="$" key06="f" long06="%" key07="g" long07="&amp;" key08="h" long08="*" key09="j" long09="-" key10="k" long10="+" key11="l" long11="_" key12="34:" key13="60:k:105"/>
+					<row3 key01="60:" key02="102:layout2" key03="z" long03="!" key04="x" long04="&quot;" key05="c" long05="'" key06="v" long06=":" key07="b" long07=";" key08="n" long08="/" key09="m" long09="?" key10="102:c:8" key11="60:k:106"/>
+					<row4 key01="60:k:29" key02="102:layout3" key03="/" key04="340: " key05="." key06="102:action" key07="60:k:108"/>
+					<keylabel key="0:layout2" text="Shift" resource="shift_terminal"/>
+					<keylabel key="0:layout3" text="?123"/>
+				</layout1>
+				<layout2>
+					<keysize height="48" width="68" capslock="0" revert_layout="1"/>
+					<row1 key01="60:c:27" long01=":c:3" 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="60:k:103"/>
+					<row2 key01="60:c:9" key02="34:" key03="A" long03="@" key04="S" long04="#" key05="D" long05="$" key06="F" long06="%" key07="G" long07="&amp;" key08="H" long08="*" key09="J" long09="-" key10="K" long10="+" key11="L" long11="_" key12="34:" key13="60:k:105"/>
+					<row3 key01="60:" key02="102:layout1" key03="Z" long03="!" key04="X" long04="&quot;" key05="C" long05="'" key06="V" long06=":" key07="B" long07=";" key08="N" long08="/" key09="M" long09="?" key10="102:c:8" key11="60:k:106"/>
+					<row4 key01="60:k:29" key02="102:layout3" key03="/" key04="340: " key05="." key06="102:action" key07="60:k:108"/>
+					<keylabel key="0:layout1" text="Shift" resource="shift_terminal_fill"/>
+					<keylabel key="0:layout3" text="?123"/>
+				</layout2>
+				<layout3>
+					<keysize height="48" width="68"/>
+					<row1 key01="60:c:27" long01=":c:3" key02="1" key03="2" key04="3" key05="4" key06="5" key07="6" key08="7" key09="8" key10="9" key11="0" key12="60:k:103"/>
+					<row2 key01="60:c:9" key02="@" key03="#" key04="$" key05="%" key06="&amp;" key07="*" key08="-" key09="+" key10="(" key11=")" key12="60:k:105"/>
+					<row3 key01="60:" key02="102:layout4" key03="!" key04="68:c:34" key05="'" key06=":" key07=";" key08="/" key09="?" key10="102:c:8" key11="60:k:106"/>
+					<row4 key01="60:k:29" key02="102:layout1" key03="," key04="340: " key05="." key06="102:action" key07="60:k:108"/>
+					<keylabel key="0:layout1" text="ABC"/>
+					<keylabel key="0:layout4" text="~\{"/>
+				</layout3>
+				<layout4>
+					<keysize height="48" width="68"/>
+					<row1 key01="60:c:27" long01=":c:3" key02="~" key03="`" key04="|" key05="160:" key06="160:" key07="160:" key08="%" key09="160:" key10="{" key11="}" key12="60:k:103"/>
+					<row2 key01="60:c:9" key02="68:" key03="68:" key04="68:" key05="68:" key06="68:" key07="^" key08="_" key09="=" key10="[" key11="]" key12="60:k:105"/>
+					<row3 key01="60:" key02="102:layout3" key03="68:" key04="68:" key05="68:" key06="68:" key07="\" key08="&lt;" key09="&gt;" key10="102:c:8" key11="60:k:106"/>
+					<row4 key01="60:k:29" key02="102:layout1" key03="68:c:34" key04="340: " key05="." key06="102:action" key07="60:k:108"/>
+					<keylabel key="0:layout1" text="ABC"/>
+					<keylabel key="0:layout3" text="?123"/>
+				</layout4>
+			</keyboard>
+		</template>
+
+		<template name="keyboardtemplate">
+			<keyboard>
+				<placement x="0" y="%keyboard_y%" w="800" h="192"/>
+				<keymargin x="4" y="4"/>
+				<background color="#111111"/>
+				<key-alphanumeric color="#111111" font="keylabel" textcolor="#EEEEEE"/>
+				<key-other color="#111111" font="keylabel-small" textcolor="#5b5b5bff"/>
+				<longpress font="keylabel-longpress" textcolor="#5b5b5bff" x="14" y="2"/>
+				<keylabel key="0:c:8" text="Bksp" resource="backspace"/>
+				<keylabel key="0:action" text="Enter" resource="enter"/>
+				<keylabel key=" " text="Space" resource="space"/>
+				<highlight color="%highlight_color%"/>
+				<capshighlight color="%highlight_color%"/>
+				<layout1>
+					<keysize height="48" 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="40:" key02="a" long02="@" key03="s" long03="#" key04="d" long04="$" key05="f" long05="%" key06="g" long06="&amp;" key07="h" long07="*" key08="j" long08="-" key09="k" long09="+" key10="l" long10="_" key11="40:"/>
+					<row3 key01="120:layout2" key02="z" long02="!" key03="x" long03="&quot;" key04="c" long04="'" key05="v" long05=":" key06="b" long06=";" key07="n" long07="/" key08="m" long08="?" key09="120:c:8"/>
+					<row4 key01="120:layout3" key02="/" key03="400: " key04="." key05="120:action"/>
+					<keylabel key="0:layout2" text="Shift" resource="shift"/>
+					<keylabel key="0:layout3" text="?123"/>
+				</layout1>
+				<layout2>
+					<keysize height="48" 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="40:" key02="A" long02="@" key03="S" long03="#" key04="D" long04="$" key05="F" long05="%" key06="G" long06="&amp;" key07="H" long07="*" key08="J" long08="-" key09="K" long09="+" key10="L" long10="_" key11="40:"/>
+					<row3 key01="120:layout1" key02="Z" long02="!" key03="X" long03="&quot;" key04="C" long04="'" key05="V" long05=":" key06="B" long06=";" key07="N" long07="/" key08="M" long08="?" key09="120:c:8"/>
+					<row4 key01="120:layout3" key02="/" key03="400: " key04="." key05="120:action"/>
+					<keylabel key="0:layout1" text="Shift" resource="shift_fill"/>
+					<keylabel key="0:layout3" text="?123"/>
+				</layout2>
+				<layout3>
+					<keysize height="48" 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="120:layout4" key02="!" key03="80:c:34" key04="'" key05=":" key06=";" key07="/" key08="?" key09="120:c:8"/>
+					<row4 key01="120:layout1" key02="," key03="400: " key04="." key05="120:action"/>
+					<keylabel key="0:layout1" text="ABC"/>
+					<keylabel key="0:layout4" text="~\{"/>
+				</layout3>
+				<layout4>
+					<keysize height="48" width="80"/>
+					<row1 key01="~" key02="`" key03="|" key04="80:" key05="80:" key06="80:" key07="%" key08="80:" key09="{" key10="}"/>
+					<row2 key01="80:" key02="80:" key03="80:" key04="80:" key05="80:" key06="^" key07="_" key08="=" key09="[" key10="]"/>
+					<row3 key01="120:layout3" key02="80:" key03="80:" key04="80:" key05="80:" key06="\" key07="&lt;" key08="&gt;" key09="120:c:8"/>
+					<row4 key01="120:layout1" key02="80:c:34" key03="400: " key04="." key05="120:action"/>
+					<keylabel key="0:layout1" text="ABC"/>
+					<keylabel key="0:layout3" text="?123"/>
+				</layout4>
+			</keyboard>
+		</template>
+	</templates>
+</recovery>
diff --git a/gui/theme/portrait_hdpi/images/kb_arrow_down.png b/gui/theme/portrait_hdpi/images/kb_arrow_down.png
new file mode 100644
index 0000000..9685d17
--- /dev/null
+++ b/gui/theme/portrait_hdpi/images/kb_arrow_down.png
Binary files differ
diff --git a/gui/theme/portrait_hdpi/images/kb_arrow_left.png b/gui/theme/portrait_hdpi/images/kb_arrow_left.png
new file mode 100644
index 0000000..bd658be
--- /dev/null
+++ b/gui/theme/portrait_hdpi/images/kb_arrow_left.png
Binary files differ
diff --git a/gui/theme/portrait_hdpi/images/kb_arrow_right.png b/gui/theme/portrait_hdpi/images/kb_arrow_right.png
new file mode 100644
index 0000000..66fe62e
--- /dev/null
+++ b/gui/theme/portrait_hdpi/images/kb_arrow_right.png
Binary files differ
diff --git a/gui/theme/portrait_hdpi/images/kb_arrow_up.png b/gui/theme/portrait_hdpi/images/kb_arrow_up.png
new file mode 100644
index 0000000..2e2deab
--- /dev/null
+++ b/gui/theme/portrait_hdpi/images/kb_arrow_up.png
Binary files differ
diff --git a/gui/theme/portrait_hdpi/images/kb_hide.png b/gui/theme/portrait_hdpi/images/kb_hide.png
new file mode 100644
index 0000000..218cdcc
--- /dev/null
+++ b/gui/theme/portrait_hdpi/images/kb_hide.png
Binary files differ
diff --git a/gui/theme/portrait_hdpi/images/kb_show.png b/gui/theme/portrait_hdpi/images/kb_show.png
new file mode 100644
index 0000000..dcbcf58
--- /dev/null
+++ b/gui/theme/portrait_hdpi/images/kb_show.png
Binary files differ
diff --git a/gui/theme/portrait_hdpi/ui.xml b/gui/theme/portrait_hdpi/ui.xml
index 1693735..cb92b9f 100644
--- a/gui/theme/portrait_hdpi/ui.xml
+++ b/gui/theme/portrait_hdpi/ui.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0"?>
-
 <recovery>
 	<details>
-		<resolution width="1080" height="1920" />
+		<resolution width="1080" height="1920"/>
 		<author>TeamWin</author>
 		<title>Backup Naowz</title>
 		<description>Default basic theme</description>
@@ -10,530 +9,564 @@
 	</details>
 
 	<include>
-		<xmlfile name="portrait.xml" />
+		<xmlfile name="portrait.xml"/>
 	</include>
 
 	<resources>
-		<resource name="font_l" type="font"  filename="RobotoCondensed-Regular.ttf" size="54" />
-		<resource name="font_m" type="font" filename="RobotoCondensed-Regular.ttf" size="42" />
-		<resource name="font_s" type="font" filename="RobotoCondensed-Regular.ttf" size="36" />
-		<resource name="fixed" type="font" filename="DroidSansMono.ttf" size="30" />
+		<font name="font_l" filename="RobotoCondensed-Regular.ttf" size="54"/>
+		<font name="font_m" filename="RobotoCondensed-Regular.ttf" size="42"/>
+		<font name="font_s" filename="RobotoCondensed-Regular.ttf" size="36"/>
+		<font name="fixed" filename="DroidSansMono.ttf" size="30"/>
 
-		<resource name="keylabel" type="font" filename="RobotoCondensed-Regular.ttf" size="64" />
-		<resource name="keylabel-small" type="font" filename="RobotoCondensed-Regular.ttf" size="46" />
-		<resource name="keylabel-longpress" type="font" filename="RobotoCondensed-Regular.ttf" size="32" />
+		<font name="keylabel" filename="RobotoCondensed-Regular.ttf" size="64"/>
+		<font name="keylabel-small" filename="RobotoCondensed-Regular.ttf" size="46"/>
+		<font name="keylabel-longpress" filename="RobotoCondensed-Regular.ttf" size="32"/>
 
-		<resource name="logo" type="image" filename="logo" retainaspect="1" />
-		<resource name="main_button" type="image" filename="main_button" />
-		<resource name="main_button_half_height" type="image" filename="main_button_half_height" />
-		<resource name="main_button_half_height_full_width" type="image" filename="main_button_half_height_full_width" />
-		<resource name="fab_selectfolder" type="image" filename="fab_selectfolder" retainaspect="1" />
-		<resource name="tab_3" type="image" filename="tab_3" />
-		<resource name="tab_4" type="image" filename="tab_4" />
-		<resource name="file" type="image" filename="file" retainaspect="1" />
-		<resource name="folder" type="image" filename="folder" retainaspect="1" />
-		<resource name="unlock_icon" type="image" filename="unlock_icon" retainaspect="1" />
-		<resource name="home" type="image" filename="home" retainaspect="1" />
-		<resource name="back" type="image" filename="back" retainaspect="1" />
-		<resource name="console" type="image" filename="console" retainaspect="1" />
-		<resource name="checkbox_false" type="image" filename="checkbox_false" retainaspect="1" />
-		<resource name="checkbox_true" type="image" filename="checkbox_true" retainaspect="1" />
-		<resource name="radio_false" type="image" filename="radio_false" retainaspect="1" />
-		<resource name="radio_true" type="image" filename="radio_true" retainaspect="1" />
-		<resource name="sort_asc" type="image" filename="sort_asc" />
-		<resource name="sort_desc" type="image" filename="sort_desc" />
-		<resource name="sort_empty" type="image" filename="sort_empty" />
-		<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="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="handle" type="image" filename="handle" />
-		<resource name="cursor" type="image" filename="cursor" retainaspect="1" />
+		<image name="logo" filename="logo" retainaspect="1"/>
+		<image name="main_button" filename="main_button"/>
+		<image name="main_button_half_height" filename="main_button_half_height"/>
+		<image name="main_button_half_height_full_width" filename="main_button_half_height_full_width"/>
+		<image name="fab_selectfolder" filename="fab_selectfolder" retainaspect="1"/>
+		<image name="tab_3" filename="tab_3"/>
+		<image name="tab_4" filename="tab_4"/>
+		<image name="file" filename="file" retainaspect="1"/>
+		<image name="folder" filename="folder" retainaspect="1"/>
+		<image name="unlock_icon" filename="unlock_icon" retainaspect="1"/>
+		<image name="home" filename="home" retainaspect="1"/>
+		<image name="back" filename="back" retainaspect="1"/>
+		<image name="console" filename="console" retainaspect="1"/>
+		<image name="kb_hide" filename="kb_hide" retainaspect="1"/>
+		<image name="kb_show" filename="kb_show" retainaspect="1"/>
+		<image name="checkbox_false" filename="checkbox_false" retainaspect="1"/>
+		<image name="checkbox_true" filename="checkbox_true" retainaspect="1"/>
+		<image name="radio_false" filename="radio_false" retainaspect="1"/>
+		<image name="radio_true" filename="radio_true" retainaspect="1"/>
+		<image name="sort_asc" filename="sort_asc"/>
+		<image name="sort_desc" filename="sort_desc"/>
+		<image name="sort_empty" filename="sort_empty"/>
+		<animation name="progress" filename="indeterminate"/>
+		<image name="progress_empty" filename="progress_empty"/>
+		<image name="progress_full" filename="progress_fill"/>
+		<image name="slider" filename="slider"/>
+		<image name="slider_used" filename="slider_used"/>
+		<image name="slider_touch" filename="slider_touch"/>
+		<image name="handle" filename="handle"/>
+		<image name="cursor" filename="cursor" retainaspect="1"/>
 
-		<resource name="backspace" type="image" filename="backspace" retainaspect="1" />
-		<resource name="enter" type="image" filename="enter" retainaspect="1" />
-		<resource name="shift" type="image" filename="shift" retainaspect="1" />
-		<resource name="shift_fill" type="image" filename="shift_fill" retainaspect="1" />
-		<resource name="space" type="image" filename="space" retainaspect="1" />
+		<image name="backspace" filename="backspace" retainaspect="1"/>
+		<image name="enter" filename="enter" retainaspect="1"/>
+		<image name="shift" filename="shift" retainaspect="1"/>
+		<image name="shift_fill" filename="shift_fill" retainaspect="1"/>
+		<image name="space" filename="space" retainaspect="1"/>
+		<image name="kb_arrow_left" filename="kb_arrow_left" retainaspect="1"/>
+		<image name="kb_arrow_right" filename="kb_arrow_right" retainaspect="1"/>
+		<image name="kb_arrow_up" filename="kb_arrow_up" retainaspect="1"/>
+		<image name="kb_arrow_down" filename="kb_arrow_down" retainaspect="1"/>
 	</resources>
 
 	<variables>
-		<variable name="tw_samsung_navbar" value="0" persist="1" />
+		<variable name="tw_samsung_navbar" value="0" persist="1"/>
+		<variable name="tw_hide_kb" value="0" persist="1"/>
 
-		<variable name="screen_width" value="1080" />
-		<variable name="screen_height" value="1920" />
-		<variable name="status_height" value="72" />
-		<variable name="header_height" value="256" />
-		<variable name="navbar_height" value="130" />
-		<variable name="content_width" value="1008" />
-		<variable name="content_overlay_width" value="936" />
-		<variable name="dialog_height" value="704" />
-		<variable name="back_button_x" value="240" />
-		<variable name="console_button_x" value="840" />
-		<variable name="indent" value="36" />
-		<variable name="col1_x_left" value="72" />
-		<variable name="col1_x_header" value="184" />
-		<variable name="center_x" value="540" />
-		<variable name="col1_x_right" value="576" />
-		<variable name="indent_right" value="1044" />
-		<variable name="tab_height" value="96" />
-		<variable name="tab_indicator_height" value="6" />
-		<variable name="tab3_width" value="360" />
-		<variable name="tab4_width" value="270" />
-		<variable name="tab5_width" value="216" />
-		<variable name="tab3_col2_x" value="360" />
-		<variable name="tab3_col3_x" value="720" />
-		<variable name="tab4_col2_x" value="270" />
-		<variable name="tab4_col4_x" value="810" />
-		<variable name="tab5_col2_x" value="216" />
-		<variable name="tab5_col3_x" value="432" />
-		<variable name="tab5_col4_x" value="648" />
-		<variable name="tab5_col5_x" value="864" />
-		<variable name="btn3_col2_x" value="384" />
-		<variable name="btn3_col3_x" value="732" />
-		<variable name="btn4_col2_x" value="297" />
-		<variable name="btn4_col3_x" value="558" />
-		<variable name="btn4_col4_x" value="819" />
-		<variable name="row1_header_y" value="4" />
-		<variable name="row2_header_y" value="72" />
-		<variable name="row3_header_y" value="90" />
-		<variable name="row4_header_y" value="168" />
-		<variable name="row1_y" value="256" />
-		<variable name="row1a_y" value="288" />
-		<variable name="row2_y" value="320" />
-		<variable name="row2a_y" value="352" />
-		<variable name="row_tab_y" value="346" />
-		<variable name="row2_input_y" value="381" />
-		<variable name="row3_y" value="384" />
-		<variable name="row3_input_y" value="413" />
-		<variable name="row3a_y" value="416" />
-		<variable name="row4_y" value="448" />
-		<variable name="row4_input_y" value="477" />
-		<variable name="row4a_y" value="480" />
-		<variable name="row5_y" value="512" />
-		<variable name="row5a_y" value="544" />
-		<variable name="row6_y" value="576" />
-		<variable name="row6a_y" value="608" />
-		<variable name="row7_y" value="640" />
-		<variable name="row7a_y" value="672" />
-		<variable name="row8_y" value="704" />
-		<variable name="row8a_y" value="736" />
-		<variable name="row9_y" value="768" />
-		<variable name="row9a_y" value="800" />
-		<variable name="row10_y" value="832" />
-		<variable name="row10a_y" value="864" />
-		<variable name="row11_y" value="896" />
-		<variable name="row11a_y" value="928" />
-		<variable name="row12_y" value="960" />
-		<variable name="row12a_y" value="992" />
-		<variable name="row13_y" value="1024" />
-		<variable name="row13a_y" value="1056" />
-		<variable name="row14_y" value="1088" />
-		<variable name="row14a_y" value="1120" />
-		<variable name="row15_y" value="1152" />
-		<variable name="row15a_y" value="1184" />
-		<variable name="row16_y" value="1216" />
-		<variable name="row16a_y" value="1248" />
-		<variable name="row17_y" value="1280" />
-		<variable name="row17a_y" value="1312" />
-		<variable name="row18_y" value="1344" />
-		<variable name="row18a_y" value="1376" />
-		<variable name="row19_y" value="1408" />
-		<variable name="row19a_y" value="1440" />
-		<variable name="row20_y" value="1472" />
-		<variable name="row20a_y" value="1504" />
-		<variable name="row21_y" value="1536" />
-		<variable name="row21a_y" value="1568" />
-		<variable name="row22_y" value="1600" />
-		<variable name="row22a_y" value="1632" />
-		<variable name="row23_y" value="1664" />
-		<variable name="row23a_y" value="1696" />
-		<variable name="row24_y" value="1728" />
-		<variable name="row24a_y" value="1760" />
-		<variable name="row25_y" value="1792" />
-		<variable name="navbar_y" value="1792" />
-		<variable name="navbar_btn_y" value="1856" />
-		<variable name="keyboard_y" value="1149" />
-		<variable name="background_color" value="#1A1A1A" />
-		<variable name="accent_color" value="#0090CA" />
-		<variable name="text_color" value="#EEEEEE" />
-		<variable name="text_button_color" value="#EEEEEE" />
-		<variable name="text_success_color" value="#76FF03" />
-		<variable name="text_fail_color" value="#FF0101" />
-		<variable name="highlight_color" value="#1A1A1A80" />
-		<variable name="caps_highlight_color" value="#22222280" />
-		<variable name="transparent" value="#00000000" />
-		<variable name="semi_transparent" value="#00000099" />
-		<variable name="warning" value="#F8F8A0" />
-		<variable name="error" value="#FF0101" />
-		<variable name="highlight" value="#0090CA" />
-		<variable name="fileselector_linecolor" value="#555555" />
-		<variable name="fileselector_highlight_color" value="#555555" />
-		<variable name="fileselector_separatorheight" value="2" />
-		<variable name="fileselector_spacing" value="0" />
-		<variable name="fileselector_install_height" value="1152" />
-		<variable name="fileselector_filemanager_height" value="1376" />
-		<variable name="partitionlist_spacing" value="0" />
-		<variable name="partitionlist_storage_height" value="544" />
-		<variable name="partitionlist_flashimage_height" value="448" />
-		<variable name="partitionlist_wipe_height" value="1088" />
-		<variable name="partitionlist_mount_height" value="832" />
-		<variable name="partitionlist_backup_height" value="768" />
-		<variable name="listbox_timezone_height" value="756" />
-		<variable name="listbox_settings_height" value="960" />
-		<variable name="fastscroll_w" value="24" />
-		<variable name="fastscroll_linew" value="2" />
-		<variable name="fastscroll_rectw" value="24" />
-		<variable name="fastscroll_recth" value="108" />
-		<variable name="slidervalue_lineh" value="3" />
-		<variable name="slidervalue_padding" value="0" />
-		<variable name="slidervalue_sliderw" value="72" />
-		<variable name="slidervalue_sliderh" value="108" />
-		<variable name="slideout_height" value="1670" />
-		<variable name="slideout_bg_height" value="1720" />
-		<variable name="input_height" value="64" />
-		<variable name="input_line_width" value="3" />
-		<variable name="console_height" value="960" />
-		<variable name="console_terminal_height" value="576" />
-		<variable name="dialog_button_x" value="696" />
-		<variable name="pattern_x" value="126" />
-		<variable name="pattern_dot_dia" value="32" />
-		<variable name="pattern_line_w" value="12" />
-		<variable name="pattern_size" value="828" />
+		<variable name="screen_width" value="1080"/>
+		<variable name="screen_height" value="1920"/>
+		<variable name="status_height" value="72"/>
+		<variable name="header_height" value="256"/>
+		<variable name="navbar_height" value="130"/>
+		<variable name="content_width" value="1008"/>
+		<variable name="content_overlay_width" value="936"/>
+		<variable name="dialog_height" value="704"/>
+		<variable name="back_button_x" value="240"/>
+		<variable name="console_button_x" value="840"/>
+		<variable name="indent" value="36"/>
+		<variable name="col1_x_left" value="72"/>
+		<variable name="col1_x_header" value="184"/>
+		<variable name="center_x" value="540"/>
+		<variable name="col1_x_right" value="576"/>
+		<variable name="indent_right" value="1044"/>
+		<variable name="tab_height" value="96"/>
+		<variable name="tab_indicator_height" value="6"/>
+		<variable name="tab3_width" value="360"/>
+		<variable name="tab4_width" value="270"/>
+		<variable name="tab5_width" value="216"/>
+		<variable name="tab3_col2_x" value="360"/>
+		<variable name="tab3_col3_x" value="720"/>
+		<variable name="tab4_col2_x" value="270"/>
+		<variable name="tab4_col4_x" value="810"/>
+		<variable name="tab5_col2_x" value="216"/>
+		<variable name="tab5_col3_x" value="432"/>
+		<variable name="tab5_col4_x" value="648"/>
+		<variable name="tab5_col5_x" value="864"/>
+		<variable name="btn3_col2_x" value="384"/>
+		<variable name="btn3_col3_x" value="732"/>
+		<variable name="btn4_col2_x" value="297"/>
+		<variable name="btn4_col3_x" value="558"/>
+		<variable name="btn4_col4_x" value="819"/>
+		<variable name="row1_header_y" value="4"/>
+		<variable name="row2_header_y" value="72"/>
+		<variable name="row3_header_y" value="90"/>
+		<variable name="row4_header_y" value="168"/>
+		<variable name="row1_y" value="256"/>
+		<variable name="row1a_y" value="288"/>
+		<variable name="row2_y" value="320"/>
+		<variable name="row2a_y" value="352"/>
+		<variable name="row_tab_y" value="346"/>
+		<variable name="row2_input_y" value="381"/>
+		<variable name="row3_y" value="384"/>
+		<variable name="row3_input_y" value="413"/>
+		<variable name="row3a_y" value="416"/>
+		<variable name="row4_y" value="448"/>
+		<variable name="row4_input_y" value="477"/>
+		<variable name="row4a_y" value="480"/>
+		<variable name="row5_y" value="512"/>
+		<variable name="row5a_y" value="544"/>
+		<variable name="row6_y" value="576"/>
+		<variable name="row6a_y" value="608"/>
+		<variable name="row7_y" value="640"/>
+		<variable name="row7a_y" value="672"/>
+		<variable name="row8_y" value="704"/>
+		<variable name="row8a_y" value="736"/>
+		<variable name="row9_y" value="768"/>
+		<variable name="row9a_y" value="800"/>
+		<variable name="row10_y" value="832"/>
+		<variable name="row10a_y" value="864"/>
+		<variable name="row11_y" value="896"/>
+		<variable name="row11a_y" value="928"/>
+		<variable name="row12_y" value="960"/>
+		<variable name="row12a_y" value="992"/>
+		<variable name="row13_y" value="1024"/>
+		<variable name="row13a_y" value="1056"/>
+		<variable name="row14_y" value="1088"/>
+		<variable name="row14a_y" value="1120"/>
+		<variable name="row15_y" value="1152"/>
+		<variable name="row15a_y" value="1184"/>
+		<variable name="row16_y" value="1216"/>
+		<variable name="row16a_y" value="1248"/>
+		<variable name="row17_y" value="1280"/>
+		<variable name="row17a_y" value="1312"/>
+		<variable name="row18_y" value="1344"/>
+		<variable name="row18a_y" value="1376"/>
+		<variable name="row19_y" value="1408"/>
+		<variable name="row19a_y" value="1440"/>
+		<variable name="row20_y" value="1472"/>
+		<variable name="row20a_y" value="1504"/>
+		<variable name="row21_y" value="1536"/>
+		<variable name="row21a_y" value="1568"/>
+		<variable name="row22_y" value="1600"/>
+		<variable name="row22a_y" value="1632"/>
+		<variable name="row23_y" value="1664"/>
+		<variable name="row23a_y" value="1696"/>
+		<variable name="row24_y" value="1728"/>
+		<variable name="row24a_y" value="1760"/>
+		<variable name="row25_y" value="1792"/>
+		<variable name="navbar_y" value="1792"/>
+		<variable name="navbar_btn_y" value="1856"/>
+		<variable name="keyboard_y" value="1149"/>
+		<variable name="keyboard_terminal_y" value="1053"/>
+		<variable name="background_color" value="#1A1A1A"/>
+		<variable name="accent_color" value="#0090CA"/>
+		<variable name="text_color" value="#EEEEEE"/>
+		<variable name="text_button_color" value="#EEEEEE"/>
+		<variable name="text_success_color" value="#76FF03"/>
+		<variable name="text_fail_color" value="#FF0101"/>
+		<variable name="highlight_color" value="#1A1A1A80"/>
+		<variable name="caps_highlight_color" value="#22222280"/>
+		<variable name="transparent" value="#00000000"/>
+		<variable name="semi_transparent" value="#00000099"/>
+		<variable name="warning" value="#F8F8A0"/>
+		<variable name="error" value="#FF0101"/>
+		<variable name="highlight" value="#0090CA"/>
+		<variable name="fileselector_linecolor" value="#555555"/>
+		<variable name="fileselector_highlight_color" value="#555555"/>
+		<variable name="fileselector_separatorheight" value="2"/>
+		<variable name="fileselector_spacing" value="0"/>
+		<variable name="fileselector_install_height" value="1152"/>
+		<variable name="fileselector_filemanager_height" value="1376"/>
+		<variable name="partitionlist_spacing" value="0"/>
+		<variable name="partitionlist_storage_height" value="544"/>
+		<variable name="partitionlist_flashimage_height" value="448"/>
+		<variable name="partitionlist_wipe_height" value="1088"/>
+		<variable name="partitionlist_mount_height" value="832"/>
+		<variable name="partitionlist_backup_height" value="768"/>
+		<variable name="listbox_timezone_height" value="756"/>
+		<variable name="listbox_settings_height" value="960"/>
+		<variable name="fastscroll_w" value="24"/>
+		<variable name="fastscroll_linew" value="2"/>
+		<variable name="fastscroll_rectw" value="24"/>
+		<variable name="fastscroll_recth" value="108"/>
+		<variable name="slidervalue_lineh" value="3"/>
+		<variable name="slidervalue_padding" value="0"/>
+		<variable name="slidervalue_sliderw" value="72"/>
+		<variable name="slidervalue_sliderh" value="108"/>
+		<variable name="slideout_height" value="1686"/>
+		<variable name="slideout_bg_height" value="1720"/>
+		<variable name="input_height" value="64"/>
+		<variable name="input_line_width" value="3"/>
+		<variable name="console_height" value="960"/>
+		<variable name="console_terminal_height" value="950"/>
+		<variable name="dialog_button_x" value="696"/>
+		<variable name="pattern_x" value="126"/>
+		<variable name="pattern_dot_dia" value="32"/>
+		<variable name="pattern_line_w" value="12"/>
+		<variable name="pattern_size" value="828"/>
 	</variables>
 
 	<mousecursor>
-		<placement w="15" h="15" />
-		<background color="#FFFF00FF" resource="cursor" />
-		<speed multiplier="2.5" />
+		<placement w="15" h="15"/>
+		<background color="#FFFF00FF" resource="cursor"/>
+		<speed multiplier="2.5"/>
 	</mousecursor>
 
 	<templates>
 		<template name="page">
-			<background color="%background_color%" />
+			<background color="%background_color%"/>
 
-			<object type="fill" color="%accent_color%">
-				<placement x="0" y="0" w="%screen_width%" h="%header_height%" />
-			</object>
+			<fill color="%accent_color%">
+				<placement x="0" y="0" w="%screen_width%" h="%header_height%"/>
+			</fill>
 
-			<object type="image">
-				<condition var1="tw_busy" var2="1" />
-				<image resource="logo" />
-				<placement x="0" y="0" />
-			</object>
+			<image>
+				<condition var1="tw_busy" var2="1"/>
+				<image resource="logo"/>
+				<placement x="0" y="0"/>
+			</image>
 
-			<object type="button">
-				<condition var1="tw_busy" var2="0" />
-				<placement x="0" y="0" />
-				<image resource="logo" />
+			<button>
+				<condition var1="tw_busy" var2="0"/>
+				<placement x="0" y="0"/>
+				<image resource="logo"/>
 				<action function="key">home</action>
-			</object>
+			</button>
 
-			<object type="fill" color="#00000030">
-				<condition var1="tw_simulate_actions" var2="0" />
-				<placement x="0" y="0" w="%screen_width%" h="%status_height%" />
-			</object>
+			<fill color="#00000030">
+				<condition var1="tw_simulate_actions" var2="0"/>
+				<placement x="0" y="0" w="%screen_width%" h="%status_height%"/>
+			</fill>
 
-			<object type="fill" color="%text_fail_color%">
-				<condition var1="tw_simulate_actions" var2="1" />
-				<placement x="0" y="0" w="%screen_width%" h="%status_height%" />
-			</object>
+			<fill color="%text_fail_color%">
+				<condition var1="tw_simulate_actions" var2="1"/>
+				<placement x="0" y="0" w="%screen_width%" h="%status_height%"/>
+			</fill>
 
-			<object type="text" color="%text_color%">
-				<condition var1="tw_no_cpu_temp" var2="1" />
-				<font resource="font_m" />
-				<placement x="%indent%" y="%row1_header_y%" />
+			<text color="%text_color%">
+				<condition var1="tw_no_cpu_temp" var2="1"/>
+				<font resource="font_m"/>
+				<placement x="%indent%" y="%row1_header_y%"/>
 				<text>%tw_version%</text>
-			</object>
+			</text>
 
-			<object type="text" color="%text_color%">
-				<condition var1="tw_no_cpu_temp" var2="0" />
-				<font resource="font_m" />
-				<placement x="%indent%" y="%row1_header_y%" />
-				<text>{@cpu_temp=CPU: %tw_cpu_temp% &#xB0;C}</text>
-			</object>
+			<text color="%text_color%">
+				<condition var1="tw_no_cpu_temp" var2="0"/>
+				<font resource="font_m"/>
+				<placement x="%indent%" y="%row1_header_y%"/>
+				<text>{@cpu_temp=CPU: %tw_cpu_temp% °C}</text>
+			</text>
 
-			<object type="text" color="%text_color%">
-				<font resource="font_m" />
-				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
+			<text color="%text_color%">
+				<font resource="font_m"/>
+				<placement x="%center_x%" y="%row1_header_y%" placement="5"/>
 				<text>%tw_time%</text>
-			</object>
+			</text>
 
-			<object type="text" color="%text_color%">
+			<text color="%text_color%">
 				<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" />
+					<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>
-				<font resource="font_m" />
-				<placement x="%indent_right%" y="%row1_header_y%" placement="1" />
+				<font resource="font_m"/>
+				<placement x="%indent_right%" y="%row1_header_y%" placement="1"/>
 				<text>{@battery_pct=Battery: %tw_battery%}</text>
-			</object>
+			</text>
 
-			<object type="fill" color="#000000">
-				<placement x="0" y="%navbar_y%" w="%screen_width%" h="%navbar_height%" />
-			</object>
+			<fill color="#000000">
+				<placement x="0" y="%navbar_y%" w="%screen_width%" h="%navbar_height%"/>
+			</fill>
 
-			<object type="button">
-				<condition var1="tw_samsung_navbar" op="!=" var2="1" />
-				<placement x="%back_button_x%" y="%navbar_btn_y%" placement="4" />
-				<image resource="back" />
-				<condition var1="tw_busy" var2="0" />
+			<button>
+				<condition var1="tw_samsung_navbar" op="!=" var2="1"/>
+				<placement x="%back_button_x%" y="%navbar_btn_y%" placement="4"/>
+				<image resource="back"/>
+				<condition var1="tw_busy" var2="0"/>
 				<action function="key">back</action>
-			</object>
+			</button>
 
-			<object type="button">
-				<condition var1="tw_samsung_navbar" op="=" var2="1" />
-				<placement x="%back_button_x%" y="%navbar_btn_y%" placement="4" />
-				<image resource="console" />
-				<condition var1="tw_busy" var2="0" />
+			<button>
+				<condition var1="tw_samsung_navbar" op="=" var2="1"/>
+				<placement x="%back_button_x%" y="%navbar_btn_y%" placement="4"/>
+				<image resource="console"/>
+				<condition var1="tw_busy" var2="0"/>
 				<action function="overlay">slideout</action>
-			</object>
+			</button>
 
-			<object type="button">
-				<placement x="%center_x%" y="%navbar_btn_y%" placement="4" />
-				<image resource="home" />
-				<condition var1="tw_busy" var2="0" />
+			<button>
+				<placement x="%center_x%" y="%navbar_btn_y%" placement="4"/>
+				<image resource="home"/>
+				<condition var1="tw_busy" var2="0"/>
 				<action function="key">home</action>
-			</object>
+			</button>
 
-			<object type="button">
-				<condition var1="tw_samsung_navbar" op="!=" var2="1" />
-				<placement x="%console_button_x%" y="%navbar_btn_y%" placement="4" />
-				<image resource="console" />
-				<condition var1="tw_busy" var2="0" />
+			<button>
+				<condition var1="tw_samsung_navbar" op="!=" var2="1"/>
+				<placement x="%console_button_x%" y="%navbar_btn_y%" placement="4"/>
+				<image resource="console"/>
+				<condition var1="tw_busy" var2="0"/>
 				<action function="overlay">slideout</action>
-			</object>
+			</button>
 
-			<object type="button">
-				<condition var1="tw_samsung_navbar" op="=" var2="1" />
-				<placement x="%console_button_x%" y="%navbar_btn_y%" placement="4" />
-				<image resource="back" />
-				<condition var1="tw_busy" var2="0" />
+			<button>
+				<condition var1="tw_samsung_navbar" op="=" var2="1"/>
+				<placement x="%console_button_x%" y="%navbar_btn_y%" placement="4"/>
+				<image resource="back"/>
+				<condition var1="tw_busy" var2="0"/>
 				<action function="key">back</action>
-			</object>
+			</button>
 
-			<object type="action">
-				<touch key="power" />
+			<action>
+				<touch key="power"/>
 				<action function="overlay">lock</action>
-			</object>
+			</action>
 
-			<object type="action">
-				<touch key="power+voldown" />
-				<action function="screenshot" />
-			</object>
+			<action>
+				<touch key="power+voldown"/>
+				<action function="screenshot"/>
+			</action>
 		</template>
 
 		<template name="progress_bar">
-			<object type="progressbar">
-				<placement x="%indent%" y="%row17a_y%" />
-				<resource empty="progress_empty" full="progress_full" />
-				<data name="ui_progress" />
-			</object>
+			<progressbar>
+				<placement x="%indent%" y="%row17a_y%"/>
+				<resource empty="progress_empty" full="progress_full"/>
+				<data name="ui_progress"/>
+			</progressbar>
 
-			<object type="animation">
-				<placement x="%indent%" y="%row17a_y%" />
-				<resource name="progress" />
-				<speed fps="24" render="2" />
-				<loop frame="1" />
-			</object>
+			<animation>
+				<placement x="%indent%" y="%row17a_y%"/>
+				<resource name="progress"/>
+				<speed fps="24" render="2"/>
+				<loop frame="1"/>
+			</animation>
 		</template>
 
 		<template name="sort_options">
-			<object type="image">
-				<placement x="%indent%" y="%row1a_y%" />
-				<image resource="tab_3" />
-			</object>
+			<image>
+				<placement x="%indent%" y="%row1a_y%"/>
+				<image resource="tab_3"/>
+			</image>
 
-			<object type="image">
-				<placement x="%btn3_col2_x%" y="%row1a_y%" />
-				<image resource="tab_3" />
-			</object>
+			<image>
+				<placement x="%btn3_col2_x%" y="%row1a_y%"/>
+				<image resource="tab_3"/>
+			</image>
 
-			<object type="image">
-				<placement x="%btn3_col3_x%" y="%row1a_y%" />
-				<image resource="tab_3" />
-			</object>
+			<image>
+				<placement x="%btn3_col3_x%" y="%row1a_y%"/>
+				<image resource="tab_3"/>
+			</image>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<condition var1="tw_gui_sort_order" op="=" var2="1" />
-				<placement x="%indent%" y="%row1a_y%" />
-				<font resource="font_s" color="%text_button_color%" />
+			<button>
+				<highlight color="%highlight_color%"/>
+				<condition var1="tw_gui_sort_order" op="=" var2="1"/>
+				<placement x="%indent%" y="%row1a_y%"/>
+				<font resource="font_s" color="%text_button_color%"/>
 				<text>{@sort_by_name_only=Name}</text>
-				<image resource="sort_asc" />
+				<image resource="sort_asc"/>
 				<action function="set">tw_gui_sort_order=-1</action>
-			</object>
+			</button>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<condition var1="tw_gui_sort_order" op="=" var2="-1" />
-				<placement x="%indent%" y="%row1a_y%" />
-				<font resource="font_s" color="%text_button_color%" />
+			<button>
+				<highlight color="%highlight_color%"/>
+				<condition var1="tw_gui_sort_order" op="=" var2="-1"/>
+				<placement x="%indent%" y="%row1a_y%"/>
+				<font resource="font_s" color="%text_button_color%"/>
 				<text>{@sort_by_name_only=Name}</text>
-				<image resource="sort_desc" />
+				<image resource="sort_desc"/>
 				<action function="set">tw_gui_sort_order=1</action>
-			</object>
+			</button>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
+			<button>
+				<highlight color="%highlight_color%"/>
 				<conditions>
-					<condition var1="tw_gui_sort_order" op="!=" var2="1" />
-					<condition var1="tw_gui_sort_order" op="!=" var2="-1" />
+					<condition var1="tw_gui_sort_order" op="!=" var2="1"/>
+					<condition var1="tw_gui_sort_order" op="!=" var2="-1"/>
 				</conditions>
-				<placement x="%indent%" y="%row1a_y%" />
-				<font resource="font_s" color="%text_button_color%" />
+				<placement x="%indent%" y="%row1a_y%"/>
+				<font resource="font_s" color="%text_button_color%"/>
 				<text>{@sort_by_name_only=Name}</text>
-				<image resource="sort_empty" />
+				<image resource="sort_empty"/>
 				<action function="set">tw_gui_sort_order=1</action>
-			</object>
+			</button>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<condition var1="tw_gui_sort_order" op="=" var2="2" />
-				<placement x="%btn3_col2_x%" y="%row1a_y%" />
-				<font resource="font_s" color="%text_button_color%" />
+			<button>
+				<highlight color="%highlight_color%"/>
+				<condition var1="tw_gui_sort_order" op="=" var2="2"/>
+				<placement x="%btn3_col2_x%" y="%row1a_y%"/>
+				<font resource="font_s" color="%text_button_color%"/>
 				<text>{@sort_by_date_only=Date}</text>
-				<image resource="sort_asc" />
+				<image resource="sort_asc"/>
 				<action function="set">tw_gui_sort_order=-2</action>
-			</object>
+			</button>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<condition var1="tw_gui_sort_order" op="=" var2="-2" />
-				<placement x="%btn3_col2_x%" y="%row1a_y%" />
-				<font resource="font_s" color="%text_button_color%" />
+			<button>
+				<highlight color="%highlight_color%"/>
+				<condition var1="tw_gui_sort_order" op="=" var2="-2"/>
+				<placement x="%btn3_col2_x%" y="%row1a_y%"/>
+				<font resource="font_s" color="%text_button_color%"/>
 				<text>{@sort_by_date_only=Date}</text>
-				<image resource="sort_desc" />
+				<image resource="sort_desc"/>
 				<action function="set">tw_gui_sort_order=2</action>
-			</object>
+			</button>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
+			<button>
+				<highlight color="%highlight_color%"/>
 				<conditions>
-					<condition var1="tw_gui_sort_order" op="!=" var2="2" />
-					<condition var1="tw_gui_sort_order" op="!=" var2="-2" />
+					<condition var1="tw_gui_sort_order" op="!=" var2="2"/>
+					<condition var1="tw_gui_sort_order" op="!=" var2="-2"/>
 				</conditions>
-				<placement x="%btn3_col2_x%" y="%row1a_y%" />
-				<font resource="font_s" color="%text_button_color%" />
+				<placement x="%btn3_col2_x%" y="%row1a_y%"/>
+				<font resource="font_s" color="%text_button_color%"/>
 				<text>{@sort_by_date_only=Date}</text>
-				<image resource="sort_empty" />
+				<image resource="sort_empty"/>
 				<action function="set">tw_gui_sort_order=2</action>
-			</object>
+			</button>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<condition var1="tw_gui_sort_order" op="=" var2="3" />
-				<placement x="%btn3_col3_x%" y="%row1a_y%" />
-				<font resource="font_s" color="%text_button_color%" />
+			<button>
+				<highlight color="%highlight_color%"/>
+				<condition var1="tw_gui_sort_order" op="=" var2="3"/>
+				<placement x="%btn3_col3_x%" y="%row1a_y%"/>
+				<font resource="font_s" color="%text_button_color%"/>
 				<text>{@sort_by_size_only=Size}</text>
-				<image resource="sort_asc" />
+				<image resource="sort_asc"/>
 				<action function="set">tw_gui_sort_order=-3</action>
-			</object>
+			</button>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<condition var1="tw_gui_sort_order" op="=" var2="-3" />
-				<placement x="%btn3_col3_x%" y="%row1a_y%" />
-				<font resource="font_s" color="%text_button_color%" />
+			<button>
+				<highlight color="%highlight_color%"/>
+				<condition var1="tw_gui_sort_order" op="=" var2="-3"/>
+				<placement x="%btn3_col3_x%" y="%row1a_y%"/>
+				<font resource="font_s" color="%text_button_color%"/>
 				<text>{@sort_by_size_only=Size}</text>
-				<image resource="sort_desc" />
+				<image resource="sort_desc"/>
 				<action function="set">tw_gui_sort_order=3</action>
-			</object>
+			</button>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
+			<button>
+				<highlight color="%highlight_color%"/>
 				<conditions>
-					<condition var1="tw_gui_sort_order" op="!=" var2="3" />
-					<condition var1="tw_gui_sort_order" op="!=" var2="-3" />
+					<condition var1="tw_gui_sort_order" op="!=" var2="3"/>
+					<condition var1="tw_gui_sort_order" op="!=" var2="-3"/>
 				</conditions>
-				<placement x="%btn3_col3_x%" y="%row1a_y%" />
-				<font resource="font_s" color="%text_button_color%" />
+				<placement x="%btn3_col3_x%" y="%row1a_y%"/>
+				<font resource="font_s" color="%text_button_color%"/>
 				<text>{@sort_by_size_only=Size}</text>
-				<image resource="sort_empty" />
+				<image resource="sort_empty"/>
 				<action function="set">tw_gui_sort_order=3</action>
-			</object>
+			</button>
 		</template>
 
 		<template name="tabs_backup">
-			<object type="button" style="tab">
-				<placement x="0" y="%row1_y%" w="%tab3_width%" h="%tab_height%" />
+			<button style="tab">
+				<placement x="0" y="%row1_y%" w="%tab3_width%" h="%tab_height%"/>
 				<text>{@tab_backup=BACKUP}</text>
 				<action function="page">backup</action>
-			</object>
+			</button>
 
-			<object type="button" style="tab">
-				<placement x="%tab3_col2_x%" y="%row1_y%" w="%tab3_width%" h="%tab_height%" />
+			<button style="tab">
+				<placement x="%tab3_col2_x%" y="%row1_y%" w="%tab3_width%" h="%tab_height%"/>
 				<text>{@tab_options=OPTIONS}</text>
 				<action function="page">backup_options</action>
-			</object>
+			</button>
 		</template>
 
 		<template name="tabs_settings">
-			<object type="button" style="tab">
-				<placement x="0" y="%row1_y%" w="%tab5_width%" h="%tab_height%" />
+			<button style="tab">
+				<placement x="0" y="%row1_y%" w="%tab5_width%" h="%tab_height%"/>
 				<text>{@tab_general=GENERAL}</text>
 				<action function="page">settings</action>
-			</object>
+			</button>
 
-			<object type="button" style="tab">
-				<placement x="%tab5_col2_x%" y="%row1_y%" w="%tab5_width%" h="%tab_height%" />
+			<button style="tab">
+				<placement x="%tab5_col2_x%" y="%row1_y%" w="%tab5_width%" h="%tab_height%"/>
 				<text>{@tab_time_zone=TIME ZONE}</text>
 				<action function="page">settings_timezone</action>
-			</object>
+			</button>
 
-			<object type="button" style="tab">
-				<placement x="%tab5_col3_x%" y="%row1_y%" w="%tab5_width%" h="%tab_height%" />
+			<button style="tab">
+				<placement x="%tab5_col3_x%" y="%row1_y%" w="%tab5_width%" h="%tab_height%"/>
 				<text>{@tab_screen=SCREEN}</text>
 				<action function="page">settings_screen</action>
-			</object>
+			</button>
 
-			<object type="button" style="tab">
-				<placement x="%tab5_col4_x%" y="%row1_y%" w="%tab5_width%" h="%tab_height%" />
+			<button style="tab">
+				<placement x="%tab5_col4_x%" y="%row1_y%" w="%tab5_width%" h="%tab_height%"/>
 				<text>{@tab_vibration=VIBRATION}</text>
 				<action function="page">settings_vibration</action>
-			</object>
+			</button>
 
-			<object type="button" style="tab">
-				<placement x="%tab5_col5_x%" y="%row1_y%" w="%tab5_width%" h="%tab_height%" />
+			<button style="tab">
+				<placement x="%tab5_col5_x%" y="%row1_y%" w="%tab5_width%" h="%tab_height%"/>
 				<text>{@tab_language=LANGUAGE}</text>
 				<action function="page">settings_language</action>
-			</object>
+			</button>
 		</template>
 
 		<template name="console">
-			<object type="console">
-				<placement x="%indent%" y="%row2_y%" w="%content_width%" h="%console_height%" />
-			</object>
+			<console>
+				<placement x="%indent%" y="%row2_y%" w="%content_width%" h="%console_height%"/>
+			</console>
 
-			<object type="fill" color="%fileselector_linecolor%">
-				<placement x="%indent%" y="row2_y" w="%content_width%" h="input_line_width" placement="1" />
-			</object>
+			<fill color="%fileselector_linecolor%">
+				<placement x="%indent%" y="row2_y" w="%content_width%" h="input_line_width" placement="1"/>
+			</fill>
 
-			<object type="fill" color="%fileselector_linecolor%">
-				<placement x="%indent%" y="row17_y" w="%content_width%" h="input_line_width" />
-			</object>
+			<fill color="%fileselector_linecolor%">
+				<placement x="%indent%" y="row17_y" w="%content_width%" h="input_line_width"/>
+			</fill>
 		</template>
 
 		<template name="console_terminal">
-			<object type="console">
-				<placement x="%indent%" y="%row2_y%" w="content_width" h="%console_terminal_height%" />
-			</object>
+			<console>
+				<placement x="%indent%" y="%row2_y%" w="content_width" h="%console_terminal_height%"/>
+			</console>
 
-			<object type="fill" color="%fileselector_linecolor%">
-				<placement x="%indent%" y="row2_y" w="%content_width%" h="input_line_width" placement="1" />
-			</object>
+			<fill color="%fileselector_linecolor%">
+				<placement x="%indent%" y="row2_y" w="%content_width%" h="input_line_width" placement="1"/>
+			</fill>
 
-			<object type="fill" color="%fileselector_linecolor%">
-				<placement x="%indent%" y="row11_y" w="%content_width%" h="input_line_width" />
-			</object>
+			<fill color="%fileselector_linecolor%">
+				<placement x="%indent%" y="row11_y" w="%content_width%" h="input_line_width"/>
+			</fill>
+		</template>
+
+		<template name="keyboardterminaltemplate">
+			<keyboard>
+				<condition var1="tw_hide_kb" var2="0"/>
+				<placement x="0" y="%keyboard_terminal_y%" w="%screen_width%" h="96"/>
+				<keymargin x="0" y="0"/>
+				<background color="#111111"/>
+				<key-alphanumeric color="#111111" font="keylabel" textcolor="#EEEEEE"/>
+				<key-other color="#111111" font="keylabel-small" textcolor="#5b5b5bff"/>
+				<longpress font="keylabel-longpress" textcolor="#5b5b5bff" x="12" y="0"/>
+				<keylabel key="0:k:29" text="Ctrl"/>
+				<keylabel key="0:c:27" text="Esc"/>
+				<keylabel key="0:c:9" text="Tab"/>
+				<keylabel key="0:k:105" text="&lt;" resource="kb_arrow_left"/>
+				<keylabel key="0:k:108" text="v" resource="kb_arrow_down"/>
+				<keylabel key="0:k:103" text="^" resource="kb_arrow_up"/>
+				<keylabel key="0:k:106" text="&gt;" resource="kb_arrow_right"/>
+				<highlight color="%highlight_color%"/>
+				<ctrlhighlight color="#0090CA80"/>
+				<layout1>
+					<keysize height="96" width="154"/>
+					<row1 key01="155:k:29" key02="155:c:27" long02=":c:3" key03="154:c:9" key04="154:k:105" key05="154:k:108" key06="154:k:103" key07="154:k:106"/>
+				</layout1>
+			</keyboard>
 		</template>
 
 		<template name="keyboardtemplate">
-			<object type="keyboard">
-				<placement x="0" y="%keyboard_y%" w="1080" h="644" />
+			<keyboard>
+				<condition var1="tw_hide_kb" var2="0"/>
+				<placement x="0" y="%keyboard_y%" w="1080" h="644"/>
 				<keymargin x="8" y="8"/>
 				<background color="#111111"/>
 				<key-alphanumeric color="#111111" font="keylabel" textcolor="#EEEEEE"/>
@@ -542,45 +575,45 @@
 				<keylabel key="0:c:8" text="Bksp" resource="backspace"/>
 				<keylabel key="0:action" text="Enter" resource="enter"/>
 				<keylabel key=" " text="Space" resource="space"/>
-				<highlight color="%highlight_color%" />
-				<capshighlight color="%highlight_color%" />
+				<highlight color="%highlight_color%"/>
+				<capshighlight color="%highlight_color%"/>
 				<layout1>
-					<keysize height="161" width="108" />
-					<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="54:" key02="a" long02="@" key03="s" long03="#" key04="d" long04="$" key05="f" long05="%" key06="g" long06="&amp;" key07="h" long07="*" key08="j" long08="-" key09="k" long09="+" key10="l" long10="_" key11="54:" />
-					<row3 key01="162:layout2" key02="z" long02="!" key03="x" long03='"' key04="c" long04="'" key05="v" long05=":" key06="b" long06=";" key07="n" long07="/" key08="m" long08="?" key09="162:c:8" />
-					<row4 key01="162:layout3" key02="/" key03="540: " key04="." key05="162:action" />
+					<keysize height="161" width="108"/>
+					<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="54:" key02="a" long02="@" key03="s" long03="#" key04="d" long04="$" key05="f" long05="%" key06="g" long06="&amp;" key07="h" long07="*" key08="j" long08="-" key09="k" long09="+" key10="l" long10="_" key11="54:"/>
+					<row3 key01="162:layout2" key02="z" long02="!" key03="x" long03="&quot;" key04="c" long04="'" key05="v" long05=":" key06="b" long06=";" key07="n" long07="/" key08="m" long08="?" key09="162:c:8"/>
+					<row4 key01="162:layout3" key02="/" key03="540: " key04="." key05="162:action"/>
 					<keylabel key="0:layout2" text="Shift" resource="shift"/>
 					<keylabel key="0:layout3" text="?123"/>
 				</layout1>
 				<layout2>
 					<keysize height="161" width="108" 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="54:" key02="A" long02="@" key03="S" long03="#" key04="D" long04="$" key05="F" long05="%" key06="G" long06="&amp;" key07="H" long07="*" key08="J" long08="-" key09="K" long09="+" key10="L" long10="_" key11="54:" />
-					<row3 key01="162:layout1" key02="Z" long02="!" key03="X" long03='"' key04="C" long04="'" key05="V" long05=":" key06="B" long06=";" key07="N" long07="/" key08="M" long08="?" key09="162:c:8" />
-					<row4 key01="162:layout3" key02="/" key03="540: " key04="." key05="162:action" />
+					<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="54:" key02="A" long02="@" key03="S" long03="#" key04="D" long04="$" key05="F" long05="%" key06="G" long06="&amp;" key07="H" long07="*" key08="J" long08="-" key09="K" long09="+" key10="L" long10="_" key11="54:"/>
+					<row3 key01="162:layout1" key02="Z" long02="!" key03="X" long03="&quot;" key04="C" long04="'" key05="V" long05=":" key06="B" long06=";" key07="N" long07="/" key08="M" long08="?" key09="162:c:8"/>
+					<row4 key01="162:layout3" key02="/" key03="540: " key04="." key05="162:action"/>
 					<keylabel key="0:layout1" text="Shift" resource="shift_fill"/>
 					<keylabel key="0:layout3" text="?123"/>
 				</layout2>
 				<layout3>
-					<keysize height="161" width="108" />
-					<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="162:layout4" key02="!" key03="108:c:34" key04="'" key05=":" key06=";" key07="/" key08="?" key09="162:c:8" />
-					<row4 key01="162:layout1" key02="," key03="540: " key04="." key05="162:action" />
+					<keysize height="161" width="108"/>
+					<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="162:layout4" key02="!" key03="108:c:34" key04="'" key05=":" key06=";" key07="/" key08="?" key09="162:c:8"/>
+					<row4 key01="162:layout1" key02="," key03="540: " key04="." key05="162:action"/>
 					<keylabel key="0:layout1" text="ABC"/>
 					<keylabel key="0:layout4" text="~\{"/>
 				</layout3>
 				<layout4>
-					<keysize height="161" width="108" />
-					<row1 key01="~" key02="`" key03="|" key04="108:" key05="108:" key06="108:" key07="%" key08="108:" key09="{" key10="}" />
-					<row2 key01="108:" key02="108:" key03="108:" key04="108:" key05="108:" key06="^" key07="_" key08="=" key09="[" key10="]" />
-					<row3 key01="162:layout3" key02="108:" key03="108:" key04="108:" key05="108:" key06="\" key07="&lt;" key08="&gt;" key09="162:c:8" />
-					<row4 key01="162:layout1" key02="108:c:34" key03="540: " key04="." key05="162:action" />
+					<keysize height="161" width="108"/>
+					<row1 key01="~" key02="`" key03="|" key04="108:" key05="108:" key06="108:" key07="%" key08="108:" key09="{" key10="}"/>
+					<row2 key01="108:" key02="108:" key03="108:" key04="108:" key05="108:" key06="^" key07="_" key08="=" key09="[" key10="]"/>
+					<row3 key01="162:layout3" key02="108:" key03="108:" key04="108:" key05="108:" key06="\" key07="&lt;" key08="&gt;" key09="162:c:8"/>
+					<row4 key01="162:layout1" key02="108:c:34" key03="540: " key04="." key05="162:action"/>
 					<keylabel key="0:layout1" text="ABC"/>
 					<keylabel key="0:layout3" text="?123"/>
 				</layout4>
-			</object>
+			</keyboard>
 		</template>
 	</templates>
 </recovery>
diff --git a/gui/theme/portrait_mdpi/images/kb_arrow_down.png b/gui/theme/portrait_mdpi/images/kb_arrow_down.png
new file mode 100644
index 0000000..1ea5c41
--- /dev/null
+++ b/gui/theme/portrait_mdpi/images/kb_arrow_down.png
Binary files differ
diff --git a/gui/theme/portrait_mdpi/images/kb_arrow_left.png b/gui/theme/portrait_mdpi/images/kb_arrow_left.png
new file mode 100644
index 0000000..5a29e94
--- /dev/null
+++ b/gui/theme/portrait_mdpi/images/kb_arrow_left.png
Binary files differ
diff --git a/gui/theme/portrait_mdpi/images/kb_arrow_right.png b/gui/theme/portrait_mdpi/images/kb_arrow_right.png
new file mode 100644
index 0000000..5635335
--- /dev/null
+++ b/gui/theme/portrait_mdpi/images/kb_arrow_right.png
Binary files differ
diff --git a/gui/theme/portrait_mdpi/images/kb_arrow_up.png b/gui/theme/portrait_mdpi/images/kb_arrow_up.png
new file mode 100644
index 0000000..973032f
--- /dev/null
+++ b/gui/theme/portrait_mdpi/images/kb_arrow_up.png
Binary files differ
diff --git a/gui/theme/portrait_mdpi/images/kb_hide.png b/gui/theme/portrait_mdpi/images/kb_hide.png
new file mode 100644
index 0000000..dffa7aa
--- /dev/null
+++ b/gui/theme/portrait_mdpi/images/kb_hide.png
Binary files differ
diff --git a/gui/theme/portrait_mdpi/images/kb_show.png b/gui/theme/portrait_mdpi/images/kb_show.png
new file mode 100644
index 0000000..2c2595e
--- /dev/null
+++ b/gui/theme/portrait_mdpi/images/kb_show.png
Binary files differ
diff --git a/gui/theme/portrait_mdpi/ui.xml b/gui/theme/portrait_mdpi/ui.xml
index 946132d..450860e 100644
--- a/gui/theme/portrait_mdpi/ui.xml
+++ b/gui/theme/portrait_mdpi/ui.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0"?>
-
 <recovery>
 	<details>
-		<resolution width="480" height="800" />
+		<resolution width="480" height="800"/>
 		<author>TeamWin</author>
 		<title>Backup Naowz</title>
 		<description>Default basic theme</description>
@@ -10,530 +9,564 @@
 	</details>
 
 	<include>
-		<xmlfile name="portrait.xml" />
+		<xmlfile name="portrait.xml"/>
 	</include>
 
 	<resources>
-		<resource name="font_l" type="font"  filename="RobotoCondensed-Regular.ttf" size="24" />
-		<resource name="font_m" type="font" filename="RobotoCondensed-Regular.ttf" size="18" />
-		<resource name="font_s" type="font" filename="RobotoCondensed-Regular.ttf" size="14" />
-		<resource name="fixed" type="font" filename="DroidSansMono.ttf" size="12" />
+		<font name="font_l" filename="RobotoCondensed-Regular.ttf" size="24"/>
+		<font name="font_m" filename="RobotoCondensed-Regular.ttf" size="18"/>
+		<font name="font_s" filename="RobotoCondensed-Regular.ttf" size="14"/>
+		<font name="fixed" filename="DroidSansMono.ttf" size="12"/>
 
-		<resource name="keylabel" type="font" filename="RobotoCondensed-Regular.ttf" size="30" />
-		<resource name="keylabel-small" type="font" filename="RobotoCondensed-Regular.ttf" size="20" />
-		<resource name="keylabel-longpress" type="font" filename="RobotoCondensed-Regular.ttf" size="14" />
+		<font name="keylabel" filename="RobotoCondensed-Regular.ttf" size="30"/>
+		<font name="keylabel-small" filename="RobotoCondensed-Regular.ttf" size="20"/>
+		<font name="keylabel-longpress" filename="RobotoCondensed-Regular.ttf" size="14"/>
 
-		<resource name="logo" type="image" filename="logo" retainaspect="1" />
-		<resource name="main_button" type="image" filename="main_button" />
-		<resource name="main_button_half_height" type="image" filename="main_button_half_height" />
-		<resource name="main_button_half_height_full_width" type="image" filename="main_button_half_height_full_width" />
-		<resource name="fab_selectfolder" type="image" filename="fab_selectfolder" retainaspect="1" />
-		<resource name="tab_3" type="image" filename="tab_3" />
-		<resource name="tab_4" type="image" filename="tab_4" />
-		<resource name="file" type="image" filename="file" retainaspect="1" />
-		<resource name="folder" type="image" filename="folder" retainaspect="1" />
-		<resource name="unlock_icon" type="image" filename="unlock_icon" retainaspect="1" />
-		<resource name="home" type="image" filename="home" retainaspect="1" />
-		<resource name="back" type="image" filename="back" retainaspect="1" />
-		<resource name="console" type="image" filename="console" retainaspect="1" />
-		<resource name="checkbox_false" type="image" filename="checkbox_false" retainaspect="1" />
-		<resource name="checkbox_true" type="image" filename="checkbox_true" retainaspect="1" />
-		<resource name="radio_false" type="image" filename="radio_false" retainaspect="1" />
-		<resource name="radio_true" type="image" filename="radio_true" retainaspect="1" />
-		<resource name="sort_asc" type="image" filename="sort_asc" />
-		<resource name="sort_desc" type="image" filename="sort_desc" />
-		<resource name="sort_empty" type="image" filename="sort_empty" />
-		<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="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="handle" type="image" filename="handle" />
-		<resource name="cursor" type="image" filename="cursor" retainaspect="1" />
+		<image name="logo" filename="logo" retainaspect="1"/>
+		<image name="main_button" filename="main_button"/>
+		<image name="main_button_half_height" filename="main_button_half_height"/>
+		<image name="main_button_half_height_full_width" filename="main_button_half_height_full_width"/>
+		<image name="fab_selectfolder" filename="fab_selectfolder" retainaspect="1"/>
+		<image name="tab_3" filename="tab_3"/>
+		<image name="tab_4" filename="tab_4"/>
+		<image name="file" filename="file" retainaspect="1"/>
+		<image name="folder" filename="folder" retainaspect="1"/>
+		<image name="unlock_icon" filename="unlock_icon" retainaspect="1"/>
+		<image name="home" filename="home" retainaspect="1"/>
+		<image name="back" filename="back" retainaspect="1"/>
+		<image name="console" filename="console" retainaspect="1"/>
+		<image name="kb_hide" filename="kb_hide" retainaspect="1"/>
+		<image name="kb_show" filename="kb_show" retainaspect="1"/>
+		<image name="checkbox_false" filename="checkbox_false" retainaspect="1"/>
+		<image name="checkbox_true" filename="checkbox_true" retainaspect="1"/>
+		<image name="radio_false" filename="radio_false" retainaspect="1"/>
+		<image name="radio_true" filename="radio_true" retainaspect="1"/>
+		<image name="sort_asc" filename="sort_asc"/>
+		<image name="sort_desc" filename="sort_desc"/>
+		<image name="sort_empty" filename="sort_empty"/>
+		<animation name="progress" filename="indeterminate"/>
+		<image name="progress_empty" filename="progress_empty"/>
+		<image name="progress_full" filename="progress_fill"/>
+		<image name="slider" filename="slider"/>
+		<image name="slider_used" filename="slider_used"/>
+		<image name="slider_touch" filename="slider_touch"/>
+		<image name="handle" filename="handle"/>
+		<image name="cursor" filename="cursor" retainaspect="1"/>
 
-		<resource name="backspace" type="image" filename="backspace" retainaspect="1" />
-		<resource name="enter" type="image" filename="enter" retainaspect="1" />
-		<resource name="shift" type="image" filename="shift" retainaspect="1" />
-		<resource name="shift_fill" type="image" filename="shift_fill" retainaspect="1" />
-		<resource name="space" type="image" filename="space" retainaspect="1" />
+		<image name="backspace" filename="backspace" retainaspect="1"/>
+		<image name="enter" filename="enter" retainaspect="1"/>
+		<image name="shift" filename="shift" retainaspect="1"/>
+		<image name="shift_fill" filename="shift_fill" retainaspect="1"/>
+		<image name="space" filename="space" retainaspect="1"/>
+		<image name="kb_arrow_left" filename="kb_arrow_left" retainaspect="1"/>
+		<image name="kb_arrow_right" filename="kb_arrow_right" retainaspect="1"/>
+		<image name="kb_arrow_up" filename="kb_arrow_up" retainaspect="1"/>
+		<image name="kb_arrow_down" filename="kb_arrow_down" retainaspect="1"/>
 	</resources>
 
 	<variables>
-		<variable name="tw_samsung_navbar" value="0" persist="1" />
+		<variable name="tw_samsung_navbar" value="0" persist="1"/>
+		<variable name="tw_hide_kb" value="0" persist="1"/>
 
-		<variable name="screen_width" value="480" />
-		<variable name="screen_height" value="800" />
-		<variable name="status_height" value="30" />
-		<variable name="header_height" value="110" />
-		<variable name="navbar_height" value="52" />
-		<variable name="content_width" value="450" />
-		<variable name="content_overlay_width" value="420" />
-		<variable name="dialog_height" value="286" />
-		<variable name="back_button_x" value="105" />
-		<variable name="console_button_x" value="375" />
-		<variable name="indent" value="15" />
-		<variable name="col1_x_left" value="30" />
-		<variable name="col1_x_header" value="82" />
-		<variable name="center_x" value="240" />
-		<variable name="col1_x_right" value="255" />
-		<variable name="indent_right" value="465" />
-		<variable name="tab_height" value="40" />
-		<variable name="tab_indicator_height" value="3" />
-		<variable name="tab3_width" value="160" />
-		<variable name="tab4_width" value="120" />
-		<variable name="tab5_width" value="96" />
-		<variable name="tab3_col2_x" value="160" />
-		<variable name="tab3_col3_x" value="320" />
-		<variable name="tab4_col2_x" value="120" />
-		<variable name="tab4_col4_x" value="360" />
-		<variable name="tab5_col2_x" value="96" />
-		<variable name="tab5_col3_x" value="192" />
-		<variable name="tab5_col4_x" value="288" />
-		<variable name="tab5_col5_x" value="384" />
-		<variable name="btn3_col2_x" value="170" />
-		<variable name="btn3_col3_x" value="325" />
-		<variable name="btn4_col2_x" value="131" />
-		<variable name="btn4_col3_x" value="247" />
-		<variable name="btn4_col4_x" value="363" />
-		<variable name="row1_header_y" value="2" />
-		<variable name="row2_header_y" value="30" />
-		<variable name="row3_header_y" value="40" />
-		<variable name="row4_header_y" value="74" />
-		<variable name="row1_y" value="110" />
-		<variable name="row1a_y" value="123" />
-		<variable name="row2_y" value="136" />
-		<variable name="row2a_y" value="149" />
-		<variable name="row_tab_y" value="147" />
-		<variable name="row2_input_y" value="162" />
-		<variable name="row3_y" value="162" />
-		<variable name="row3_input_y" value="175" />
-		<variable name="row3a_y" value="175" />
-		<variable name="row4_y" value="188" />
-		<variable name="row4_input_y" value="201" />
-		<variable name="row4a_y" value="201" />
-		<variable name="row5_y" value="214" />
-		<variable name="row5a_y" value="227" />
-		<variable name="row6_y" value="240" />
-		<variable name="row6a_y" value="253" />
-		<variable name="row7_y" value="266" />
-		<variable name="row7a_y" value="279" />
-		<variable name="row8_y" value="292" />
-		<variable name="row8a_y" value="305" />
-		<variable name="row9_y" value="318" />
-		<variable name="row9a_y" value="331" />
-		<variable name="row10_y" value="344" />
-		<variable name="row10a_y" value="357" />
-		<variable name="row11_y" value="370" />
-		<variable name="row11a_y" value="383" />
-		<variable name="row12_y" value="396" />
-		<variable name="row12a_y" value="409" />
-		<variable name="row13_y" value="422" />
-		<variable name="row13a_y" value="435" />
-		<variable name="row14_y" value="448" />
-		<variable name="row14a_y" value="461" />
-		<variable name="row15_y" value="474" />
-		<variable name="row15a_y" value="487" />
-		<variable name="row16_y" value="500" />
-		<variable name="row16a_y" value="513" />
-		<variable name="row17_y" value="526" />
-		<variable name="row17a_y" value="539" />
-		<variable name="row18_y" value="552" />
-		<variable name="row18a_y" value="565" />
-		<variable name="row19_y" value="578" />
-		<variable name="row19a_y" value="591" />
-		<variable name="row20_y" value="604" />
-		<variable name="row20a_y" value="617" />
-		<variable name="row21_y" value="630" />
-		<variable name="row21a_y" value="643" />
-		<variable name="row22_y" value="656" />
-		<variable name="row22a_y" value="669" />
-		<variable name="row23_y" value="682" />
-		<variable name="row23a_y" value="695" />
-		<variable name="row24_y" value="708" />
-		<variable name="row24a_y" value="721" />
-		<variable name="row25_y" value="734" />
-		<variable name="navbar_y" value="748" />
-		<variable name="navbar_btn_y" value="774" />
-		<variable name="keyboard_y" value="464" />
-		<variable name="background_color" value="#1A1A1A" />
-		<variable name="accent_color" value="#0090CA" />
-		<variable name="text_color" value="#EEEEEE" />
-		<variable name="text_button_color" value="#EEEEEE" />
-		<variable name="text_success_color" value="#76FF03" />
-		<variable name="text_fail_color" value="#FF0101" />
-		<variable name="highlight_color" value="#1A1A1A80" />
-		<variable name="caps_highlight_color" value="#22222280" />
-		<variable name="transparent" value="#00000000" />
-		<variable name="semi_transparent" value="#00000099" />
-		<variable name="warning" value="#F8F8A0" />
-		<variable name="error" value="#FF0101" />
-		<variable name="highlight" value="#0090CA" />
-		<variable name="fileselector_linecolor" value="#555555" />
-		<variable name="fileselector_highlight_color" value="#555555" />
-		<variable name="fileselector_separatorheight" value="1" />
-		<variable name="fileselector_spacing" value="0" />
-		<variable name="fileselector_install_height" value="468" />
-		<variable name="fileselector_filemanager_height" value="559" />
-		<variable name="partitionlist_spacing" value="0" />
-		<variable name="partitionlist_storage_height" value="221" />
-		<variable name="partitionlist_flashimage_height" value="182" />
-		<variable name="partitionlist_wipe_height" value="442" />
-		<variable name="partitionlist_mount_height" value="338" />
-		<variable name="partitionlist_backup_height" value="312" />
-		<variable name="listbox_timezone_height" value="306" />
-		<variable name="listbox_settings_height" value="400" />
-		<variable name="fastscroll_w" value="10" />
-		<variable name="fastscroll_linew" value="2" />
-		<variable name="fastscroll_rectw" value="10" />
-		<variable name="fastscroll_recth" value="52" />
-		<variable name="slidervalue_lineh" value="2" />
-		<variable name="slidervalue_padding" value="0" />
-		<variable name="slidervalue_sliderw" value="32" />
-		<variable name="slidervalue_sliderh" value="48" />
-		<variable name="slideout_height" value="700" />
-		<variable name="slideout_bg_height" value="718" />
-		<variable name="input_height" value="26" />
-		<variable name="input_line_width" value="2" />
-		<variable name="console_height" value="390" />
-		<variable name="console_terminal_height" value="234" />
-		<variable name="dialog_button_x" value="310" />
-		<variable name="pattern_x" value="60" />
-		<variable name="pattern_dot_dia" value="12" />
-		<variable name="pattern_line_w" value="4" />
-		<variable name="pattern_size" value="360" />
+		<variable name="screen_width" value="480"/>
+		<variable name="screen_height" value="800"/>
+		<variable name="status_height" value="30"/>
+		<variable name="header_height" value="110"/>
+		<variable name="navbar_height" value="52"/>
+		<variable name="content_width" value="450"/>
+		<variable name="content_overlay_width" value="420"/>
+		<variable name="dialog_height" value="286"/>
+		<variable name="back_button_x" value="105"/>
+		<variable name="console_button_x" value="375"/>
+		<variable name="indent" value="15"/>
+		<variable name="col1_x_left" value="30"/>
+		<variable name="col1_x_header" value="82"/>
+		<variable name="center_x" value="240"/>
+		<variable name="col1_x_right" value="255"/>
+		<variable name="indent_right" value="465"/>
+		<variable name="tab_height" value="40"/>
+		<variable name="tab_indicator_height" value="3"/>
+		<variable name="tab3_width" value="160"/>
+		<variable name="tab4_width" value="120"/>
+		<variable name="tab5_width" value="96"/>
+		<variable name="tab3_col2_x" value="160"/>
+		<variable name="tab3_col3_x" value="320"/>
+		<variable name="tab4_col2_x" value="120"/>
+		<variable name="tab4_col4_x" value="360"/>
+		<variable name="tab5_col2_x" value="96"/>
+		<variable name="tab5_col3_x" value="192"/>
+		<variable name="tab5_col4_x" value="288"/>
+		<variable name="tab5_col5_x" value="384"/>
+		<variable name="btn3_col2_x" value="170"/>
+		<variable name="btn3_col3_x" value="325"/>
+		<variable name="btn4_col2_x" value="131"/>
+		<variable name="btn4_col3_x" value="247"/>
+		<variable name="btn4_col4_x" value="363"/>
+		<variable name="row1_header_y" value="2"/>
+		<variable name="row2_header_y" value="30"/>
+		<variable name="row3_header_y" value="40"/>
+		<variable name="row4_header_y" value="74"/>
+		<variable name="row1_y" value="110"/>
+		<variable name="row1a_y" value="123"/>
+		<variable name="row2_y" value="136"/>
+		<variable name="row2a_y" value="149"/>
+		<variable name="row_tab_y" value="147"/>
+		<variable name="row2_input_y" value="162"/>
+		<variable name="row3_y" value="162"/>
+		<variable name="row3_input_y" value="175"/>
+		<variable name="row3a_y" value="175"/>
+		<variable name="row4_y" value="188"/>
+		<variable name="row4_input_y" value="201"/>
+		<variable name="row4a_y" value="201"/>
+		<variable name="row5_y" value="214"/>
+		<variable name="row5a_y" value="227"/>
+		<variable name="row6_y" value="240"/>
+		<variable name="row6a_y" value="253"/>
+		<variable name="row7_y" value="266"/>
+		<variable name="row7a_y" value="279"/>
+		<variable name="row8_y" value="292"/>
+		<variable name="row8a_y" value="305"/>
+		<variable name="row9_y" value="318"/>
+		<variable name="row9a_y" value="331"/>
+		<variable name="row10_y" value="344"/>
+		<variable name="row10a_y" value="357"/>
+		<variable name="row11_y" value="370"/>
+		<variable name="row11a_y" value="383"/>
+		<variable name="row12_y" value="396"/>
+		<variable name="row12a_y" value="409"/>
+		<variable name="row13_y" value="422"/>
+		<variable name="row13a_y" value="435"/>
+		<variable name="row14_y" value="448"/>
+		<variable name="row14a_y" value="461"/>
+		<variable name="row15_y" value="474"/>
+		<variable name="row15a_y" value="487"/>
+		<variable name="row16_y" value="500"/>
+		<variable name="row16a_y" value="513"/>
+		<variable name="row17_y" value="526"/>
+		<variable name="row17a_y" value="539"/>
+		<variable name="row18_y" value="552"/>
+		<variable name="row18a_y" value="565"/>
+		<variable name="row19_y" value="578"/>
+		<variable name="row19a_y" value="591"/>
+		<variable name="row20_y" value="604"/>
+		<variable name="row20a_y" value="617"/>
+		<variable name="row21_y" value="630"/>
+		<variable name="row21a_y" value="643"/>
+		<variable name="row22_y" value="656"/>
+		<variable name="row22a_y" value="669"/>
+		<variable name="row23_y" value="682"/>
+		<variable name="row23a_y" value="695"/>
+		<variable name="row24_y" value="708"/>
+		<variable name="row24a_y" value="721"/>
+		<variable name="row25_y" value="734"/>
+		<variable name="navbar_y" value="748"/>
+		<variable name="navbar_btn_y" value="774"/>
+		<variable name="keyboard_y" value="464"/>
+		<variable name="keyboard_terminal_y" value="422"/>
+		<variable name="background_color" value="#1A1A1A"/>
+		<variable name="accent_color" value="#0090CA"/>
+		<variable name="text_color" value="#EEEEEE"/>
+		<variable name="text_button_color" value="#EEEEEE"/>
+		<variable name="text_success_color" value="#76FF03"/>
+		<variable name="text_fail_color" value="#FF0101"/>
+		<variable name="highlight_color" value="#1A1A1A80"/>
+		<variable name="caps_highlight_color" value="#22222280"/>
+		<variable name="transparent" value="#00000000"/>
+		<variable name="semi_transparent" value="#00000099"/>
+		<variable name="warning" value="#F8F8A0"/>
+		<variable name="error" value="#FF0101"/>
+		<variable name="highlight" value="#0090CA"/>
+		<variable name="fileselector_linecolor" value="#555555"/>
+		<variable name="fileselector_highlight_color" value="#555555"/>
+		<variable name="fileselector_separatorheight" value="1"/>
+		<variable name="fileselector_spacing" value="0"/>
+		<variable name="fileselector_install_height" value="468"/>
+		<variable name="fileselector_filemanager_height" value="559"/>
+		<variable name="partitionlist_spacing" value="0"/>
+		<variable name="partitionlist_storage_height" value="221"/>
+		<variable name="partitionlist_flashimage_height" value="182"/>
+		<variable name="partitionlist_wipe_height" value="442"/>
+		<variable name="partitionlist_mount_height" value="338"/>
+		<variable name="partitionlist_backup_height" value="312"/>
+		<variable name="listbox_timezone_height" value="306"/>
+		<variable name="listbox_settings_height" value="400"/>
+		<variable name="fastscroll_w" value="10"/>
+		<variable name="fastscroll_linew" value="2"/>
+		<variable name="fastscroll_rectw" value="10"/>
+		<variable name="fastscroll_recth" value="52"/>
+		<variable name="slidervalue_lineh" value="2"/>
+		<variable name="slidervalue_padding" value="0"/>
+		<variable name="slidervalue_sliderw" value="32"/>
+		<variable name="slidervalue_sliderh" value="48"/>
+		<variable name="slideout_height" value="700"/>
+		<variable name="slideout_bg_height" value="718"/>
+		<variable name="input_height" value="26"/>
+		<variable name="input_line_width" value="2"/>
+		<variable name="console_height" value="390"/>
+		<variable name="console_terminal_height" value="369"/>
+		<variable name="dialog_button_x" value="310"/>
+		<variable name="pattern_x" value="60"/>
+		<variable name="pattern_dot_dia" value="12"/>
+		<variable name="pattern_line_w" value="4"/>
+		<variable name="pattern_size" value="360"/>
 	</variables>
 
 	<mousecursor>
-		<placement w="15" h="15" />
-		<background color="#FFFF00FF" resource="cursor" />
-		<speed multiplier="2.5" />
+		<placement w="15" h="15"/>
+		<background color="#FFFF00FF" resource="cursor"/>
+		<speed multiplier="2.5"/>
 	</mousecursor>
 
 	<templates>
 		<template name="page">
-			<background color="%background_color%" />
+			<background color="%background_color%"/>
 
-			<object type="fill" color="%accent_color%">
-				<placement x="0" y="0" w="%screen_width%" h="%header_height%" />
-			</object>
+			<fill color="%accent_color%">
+				<placement x="0" y="0" w="%screen_width%" h="%header_height%"/>
+			</fill>
 
-			<object type="image">
-				<condition var1="tw_busy" var2="1" />
-				<image resource="logo" />
-				<placement x="0" y="0" />
-			</object>
+			<image>
+				<condition var1="tw_busy" var2="1"/>
+				<image resource="logo"/>
+				<placement x="0" y="0"/>
+			</image>
 
-			<object type="button">
-				<condition var1="tw_busy" var2="0" />
-				<placement x="0" y="0" />
-				<image resource="logo" />
+			<button>
+				<condition var1="tw_busy" var2="0"/>
+				<placement x="0" y="0"/>
+				<image resource="logo"/>
 				<action function="key">home</action>
-			</object>
+			</button>
 
-			<object type="fill" color="#00000030">
-				<condition var1="tw_simulate_actions" var2="0" />
-				<placement x="0" y="0" w="%screen_width%" h="%status_height%" />
-			</object>
+			<fill color="#00000030">
+				<condition var1="tw_simulate_actions" var2="0"/>
+				<placement x="0" y="0" w="%screen_width%" h="%status_height%"/>
+			</fill>
 
-			<object type="fill" color="%text_fail_color%">
-				<condition var1="tw_simulate_actions" var2="1" />
-				<placement x="0" y="0" w="%screen_width%" h="%status_height%" />
-			</object>
+			<fill color="%text_fail_color%">
+				<condition var1="tw_simulate_actions" var2="1"/>
+				<placement x="0" y="0" w="%screen_width%" h="%status_height%"/>
+			</fill>
 
-			<object type="text" color="%text_color%">
-				<condition var1="tw_no_cpu_temp" var2="1" />
-				<font resource="font_m" />
-				<placement x="%indent%" y="%row1_header_y%" />
+			<text color="%text_color%">
+				<condition var1="tw_no_cpu_temp" var2="1"/>
+				<font resource="font_m"/>
+				<placement x="%indent%" y="%row1_header_y%"/>
 				<text>%tw_version%</text>
-			</object>
+			</text>
 
-			<object type="text" color="%text_color%">
-				<condition var1="tw_no_cpu_temp" var2="0" />
-				<font resource="font_m" />
-				<placement x="%indent%" y="%row1_header_y%" />
-				<text>{@cpu_temp=CPU: %tw_cpu_temp% &#xB0;C}</text>
-			</object>
+			<text color="%text_color%">
+				<condition var1="tw_no_cpu_temp" var2="0"/>
+				<font resource="font_m"/>
+				<placement x="%indent%" y="%row1_header_y%"/>
+				<text>{@cpu_temp=CPU: %tw_cpu_temp% °C}</text>
+			</text>
 
-			<object type="text" color="%text_color%">
-				<font resource="font_m" />
-				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
+			<text color="%text_color%">
+				<font resource="font_m"/>
+				<placement x="%center_x%" y="%row1_header_y%" placement="5"/>
 				<text>%tw_time%</text>
-			</object>
+			</text>
 
-			<object type="text" color="%text_color%">
+			<text color="%text_color%">
 				<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" />
+					<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>
-				<font resource="font_m" />
-				<placement x="%indent_right%" y="%row1_header_y%" placement="1" />
+				<font resource="font_m"/>
+				<placement x="%indent_right%" y="%row1_header_y%" placement="1"/>
 				<text>{@battery_pct=Battery: %tw_battery%}</text>
-			</object>
+			</text>
 
-			<object type="fill" color="#000000">
-				<placement x="0" y="%navbar_y%" w="%screen_width%" h="%navbar_height%" />
-			</object>
+			<fill color="#000000">
+				<placement x="0" y="%navbar_y%" w="%screen_width%" h="%navbar_height%"/>
+			</fill>
 
-			<object type="button">
-				<condition var1="tw_samsung_navbar" op="!=" var2="1" />
-				<placement x="%back_button_x%" y="%navbar_btn_y%" placement="4" />
-				<image resource="back" />
-				<condition var1="tw_busy" var2="0" />
+			<button>
+				<condition var1="tw_samsung_navbar" op="!=" var2="1"/>
+				<placement x="%back_button_x%" y="%navbar_btn_y%" placement="4"/>
+				<image resource="back"/>
+				<condition var1="tw_busy" var2="0"/>
 				<action function="key">back</action>
-			</object>
+			</button>
 
-			<object type="button">
-				<condition var1="tw_samsung_navbar" op="=" var2="1" />
-				<placement x="%back_button_x%" y="%navbar_btn_y%" placement="4" />
-				<image resource="console" />
-				<condition var1="tw_busy" var2="0" />
+			<button>
+				<condition var1="tw_samsung_navbar" op="=" var2="1"/>
+				<placement x="%back_button_x%" y="%navbar_btn_y%" placement="4"/>
+				<image resource="console"/>
+				<condition var1="tw_busy" var2="0"/>
 				<action function="overlay">slideout</action>
-			</object>
+			</button>
 
-			<object type="button">
-				<placement x="%center_x%" y="%navbar_btn_y%" placement="4" />
-				<image resource="home" />
-				<condition var1="tw_busy" var2="0" />
+			<button>
+				<placement x="%center_x%" y="%navbar_btn_y%" placement="4"/>
+				<image resource="home"/>
+				<condition var1="tw_busy" var2="0"/>
 				<action function="key">home</action>
-			</object>
+			</button>
 
-			<object type="button">
-				<condition var1="tw_samsung_navbar" op="!=" var2="1" />
-				<placement x="%console_button_x%" y="%navbar_btn_y%" placement="4" />
-				<image resource="console" />
-				<condition var1="tw_busy" var2="0" />
+			<button>
+				<condition var1="tw_samsung_navbar" op="!=" var2="1"/>
+				<placement x="%console_button_x%" y="%navbar_btn_y%" placement="4"/>
+				<image resource="console"/>
+				<condition var1="tw_busy" var2="0"/>
 				<action function="overlay">slideout</action>
-			</object>
+			</button>
 
-			<object type="button">
-				<condition var1="tw_samsung_navbar" op="=" var2="1" />
-				<placement x="%console_button_x%" y="%navbar_btn_y%" placement="4" />
-				<image resource="back" />
-				<condition var1="tw_busy" var2="0" />
+			<button>
+				<condition var1="tw_samsung_navbar" op="=" var2="1"/>
+				<placement x="%console_button_x%" y="%navbar_btn_y%" placement="4"/>
+				<image resource="back"/>
+				<condition var1="tw_busy" var2="0"/>
 				<action function="key">back</action>
-			</object>
+			</button>
 
-			<object type="action">
-				<touch key="power" />
+			<action>
+				<touch key="power"/>
 				<action function="overlay">lock</action>
-			</object>
+			</action>
 
-			<object type="action">
-				<touch key="power+voldown" />
-				<action function="screenshot" />
-			</object>
+			<action>
+				<touch key="power+voldown"/>
+				<action function="screenshot"/>
+			</action>
 		</template>
 
 		<template name="progress_bar">
-			<object type="progressbar">
-				<placement x="%indent%" y="%row17a_y%" />
-				<resource empty="progress_empty" full="progress_full" />
-				<data name="ui_progress" />
-			</object>
+			<progressbar>
+				<placement x="%indent%" y="%row17a_y%"/>
+				<resource empty="progress_empty" full="progress_full"/>
+				<data name="ui_progress"/>
+			</progressbar>
 
-			<object type="animation">
-				<placement x="%indent%" y="%row17a_y%" />
-				<resource name="progress" />
-				<speed fps="24" render="2" />
-				<loop frame="1" />
-			</object>
+			<animation>
+				<placement x="%indent%" y="%row17a_y%"/>
+				<resource name="progress"/>
+				<speed fps="24" render="2"/>
+				<loop frame="1"/>
+			</animation>
 		</template>
 
 		<template name="sort_options">
-			<object type="image">
-				<placement x="%indent%" y="%row1a_y%" />
-				<image resource="tab_3" />
-			</object>
+			<image>
+				<placement x="%indent%" y="%row1a_y%"/>
+				<image resource="tab_3"/>
+			</image>
 
-			<object type="image">
-				<placement x="%btn3_col2_x%" y="%row1a_y%" />
-				<image resource="tab_3" />
-			</object>
+			<image>
+				<placement x="%btn3_col2_x%" y="%row1a_y%"/>
+				<image resource="tab_3"/>
+			</image>
 
-			<object type="image">
-				<placement x="%btn3_col3_x%" y="%row1a_y%" />
-				<image resource="tab_3" />
-			</object>
+			<image>
+				<placement x="%btn3_col3_x%" y="%row1a_y%"/>
+				<image resource="tab_3"/>
+			</image>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<condition var1="tw_gui_sort_order" op="=" var2="1" />
-				<placement x="%indent%" y="%row1a_y%" />
-				<font resource="font_s" color="%text_button_color%" />
+			<button>
+				<highlight color="%highlight_color%"/>
+				<condition var1="tw_gui_sort_order" op="=" var2="1"/>
+				<placement x="%indent%" y="%row1a_y%"/>
+				<font resource="font_s" color="%text_button_color%"/>
 				<text>{@sort_by_name_only=Name}</text>
-				<image resource="sort_asc" />
+				<image resource="sort_asc"/>
 				<action function="set">tw_gui_sort_order=-1</action>
-			</object>
+			</button>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<condition var1="tw_gui_sort_order" op="=" var2="-1" />
-				<placement x="%indent%" y="%row1a_y%" />
-				<font resource="font_s" color="%text_button_color%" />
+			<button>
+				<highlight color="%highlight_color%"/>
+				<condition var1="tw_gui_sort_order" op="=" var2="-1"/>
+				<placement x="%indent%" y="%row1a_y%"/>
+				<font resource="font_s" color="%text_button_color%"/>
 				<text>{@sort_by_name_only=Name}</text>
-				<image resource="sort_desc" />
+				<image resource="sort_desc"/>
 				<action function="set">tw_gui_sort_order=1</action>
-			</object>
+			</button>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
+			<button>
+				<highlight color="%highlight_color%"/>
 				<conditions>
-					<condition var1="tw_gui_sort_order" op="!=" var2="1" />
-					<condition var1="tw_gui_sort_order" op="!=" var2="-1" />
+					<condition var1="tw_gui_sort_order" op="!=" var2="1"/>
+					<condition var1="tw_gui_sort_order" op="!=" var2="-1"/>
 				</conditions>
-				<placement x="%indent%" y="%row1a_y%" />
-				<font resource="font_s" color="%text_button_color%" />
+				<placement x="%indent%" y="%row1a_y%"/>
+				<font resource="font_s" color="%text_button_color%"/>
 				<text>{@sort_by_name_only=Name}</text>
-				<image resource="sort_empty" />
+				<image resource="sort_empty"/>
 				<action function="set">tw_gui_sort_order=1</action>
-			</object>
+			</button>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<condition var1="tw_gui_sort_order" op="=" var2="2" />
-				<placement x="%btn3_col2_x%" y="%row1a_y%" />
-				<font resource="font_s" color="%text_button_color%" />
+			<button>
+				<highlight color="%highlight_color%"/>
+				<condition var1="tw_gui_sort_order" op="=" var2="2"/>
+				<placement x="%btn3_col2_x%" y="%row1a_y%"/>
+				<font resource="font_s" color="%text_button_color%"/>
 				<text>{@sort_by_date_only=Date}</text>
-				<image resource="sort_asc" />
+				<image resource="sort_asc"/>
 				<action function="set">tw_gui_sort_order=-2</action>
-			</object>
+			</button>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<condition var1="tw_gui_sort_order" op="=" var2="-2" />
-				<placement x="%btn3_col2_x%" y="%row1a_y%" />
-				<font resource="font_s" color="%text_button_color%" />
+			<button>
+				<highlight color="%highlight_color%"/>
+				<condition var1="tw_gui_sort_order" op="=" var2="-2"/>
+				<placement x="%btn3_col2_x%" y="%row1a_y%"/>
+				<font resource="font_s" color="%text_button_color%"/>
 				<text>{@sort_by_date_only=Date}</text>
-				<image resource="sort_desc" />
+				<image resource="sort_desc"/>
 				<action function="set">tw_gui_sort_order=2</action>
-			</object>
+			</button>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
+			<button>
+				<highlight color="%highlight_color%"/>
 				<conditions>
-					<condition var1="tw_gui_sort_order" op="!=" var2="2" />
-					<condition var1="tw_gui_sort_order" op="!=" var2="-2" />
+					<condition var1="tw_gui_sort_order" op="!=" var2="2"/>
+					<condition var1="tw_gui_sort_order" op="!=" var2="-2"/>
 				</conditions>
-				<placement x="%btn3_col2_x%" y="%row1a_y%" />
-				<font resource="font_s" color="%text_button_color%" />
+				<placement x="%btn3_col2_x%" y="%row1a_y%"/>
+				<font resource="font_s" color="%text_button_color%"/>
 				<text>{@sort_by_date_only=Date}</text>
-				<image resource="sort_empty" />
+				<image resource="sort_empty"/>
 				<action function="set">tw_gui_sort_order=2</action>
-			</object>
+			</button>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<condition var1="tw_gui_sort_order" op="=" var2="3" />
-				<placement x="%btn3_col3_x%" y="%row1a_y%" />
-				<font resource="font_s" color="%text_button_color%" />
+			<button>
+				<highlight color="%highlight_color%"/>
+				<condition var1="tw_gui_sort_order" op="=" var2="3"/>
+				<placement x="%btn3_col3_x%" y="%row1a_y%"/>
+				<font resource="font_s" color="%text_button_color%"/>
 				<text>{@sort_by_size_only=Size}</text>
-				<image resource="sort_asc" />
+				<image resource="sort_asc"/>
 				<action function="set">tw_gui_sort_order=-3</action>
-			</object>
+			</button>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<condition var1="tw_gui_sort_order" op="=" var2="-3" />
-				<placement x="%btn3_col3_x%" y="%row1a_y%" />
-				<font resource="font_s" color="%text_button_color%" />
+			<button>
+				<highlight color="%highlight_color%"/>
+				<condition var1="tw_gui_sort_order" op="=" var2="-3"/>
+				<placement x="%btn3_col3_x%" y="%row1a_y%"/>
+				<font resource="font_s" color="%text_button_color%"/>
 				<text>{@sort_by_size_only=Size}</text>
-				<image resource="sort_desc" />
+				<image resource="sort_desc"/>
 				<action function="set">tw_gui_sort_order=3</action>
-			</object>
+			</button>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
+			<button>
+				<highlight color="%highlight_color%"/>
 				<conditions>
-					<condition var1="tw_gui_sort_order" op="!=" var2="3" />
-					<condition var1="tw_gui_sort_order" op="!=" var2="-3" />
+					<condition var1="tw_gui_sort_order" op="!=" var2="3"/>
+					<condition var1="tw_gui_sort_order" op="!=" var2="-3"/>
 				</conditions>
-				<placement x="%btn3_col3_x%" y="%row1a_y%" />
-				<font resource="font_s" color="%text_button_color%" />
+				<placement x="%btn3_col3_x%" y="%row1a_y%"/>
+				<font resource="font_s" color="%text_button_color%"/>
 				<text>{@sort_by_size_only=Size}</text>
-				<image resource="sort_empty" />
+				<image resource="sort_empty"/>
 				<action function="set">tw_gui_sort_order=3</action>
-			</object>
+			</button>
 		</template>
 
 		<template name="tabs_backup">
-			<object type="button" style="tab">
-				<placement x="0" y="%row1_y%" w="%tab3_width%" h="%tab_height%" />
+			<button style="tab">
+				<placement x="0" y="%row1_y%" w="%tab3_width%" h="%tab_height%"/>
 				<text>{@tab_backup=BACKUP}</text>
 				<action function="page">backup</action>
-			</object>
+			</button>
 
-			<object type="button" style="tab">
-				<placement x="%tab3_col2_x%" y="%row1_y%" w="%tab3_width%" h="%tab_height%" />
+			<button style="tab">
+				<placement x="%tab3_col2_x%" y="%row1_y%" w="%tab3_width%" h="%tab_height%"/>
 				<text>{@tab_options=OPTIONS}</text>
 				<action function="page">backup_options</action>
-			</object>
+			</button>
 		</template>
 
 		<template name="tabs_settings">
-			<object type="button" style="tab">
-				<placement x="0" y="%row1_y%" w="%tab5_width%" h="%tab_height%" />
+			<button style="tab">
+				<placement x="0" y="%row1_y%" w="%tab5_width%" h="%tab_height%"/>
 				<text>{@tab_general=GENERAL}</text>
 				<action function="page">settings</action>
-			</object>
+			</button>
 
-			<object type="button" style="tab">
-				<placement x="%tab5_col2_x%" y="%row1_y%" w="%tab5_width%" h="%tab_height%" />
+			<button style="tab">
+				<placement x="%tab5_col2_x%" y="%row1_y%" w="%tab5_width%" h="%tab_height%"/>
 				<text>{@tab_time_zone=TIME ZONE}</text>
 				<action function="page">settings_timezone</action>
-			</object>
+			</button>
 
-			<object type="button" style="tab">
-				<placement x="%tab5_col3_x%" y="%row1_y%" w="%tab5_width%" h="%tab_height%" />
+			<button style="tab">
+				<placement x="%tab5_col3_x%" y="%row1_y%" w="%tab5_width%" h="%tab_height%"/>
 				<text>{@tab_screen=SCREEN}</text>
 				<action function="page">settings_screen</action>
-			</object>
+			</button>
 
-			<object type="button" style="tab">
-				<placement x="%tab5_col4_x%" y="%row1_y%" w="%tab5_width%" h="%tab_height%" />
+			<button style="tab">
+				<placement x="%tab5_col4_x%" y="%row1_y%" w="%tab5_width%" h="%tab_height%"/>
 				<text>{@tab_vibration=VIBRATION}</text>
 				<action function="page">settings_vibration</action>
-			</object>
+			</button>
 
-			<object type="button" style="tab">
-				<placement x="%tab5_col5_x%" y="%row1_y%" w="%tab5_width%" h="%tab_height%" />
+			<button style="tab">
+				<placement x="%tab5_col5_x%" y="%row1_y%" w="%tab5_width%" h="%tab_height%"/>
 				<text>{@tab_language=LANGUAGE}</text>
 				<action function="page">settings_language</action>
-			</object>
+			</button>
 		</template>
 
 		<template name="console">
-			<object type="console">
-				<placement x="%indent%" y="%row2_y%" w="%content_width%" h="%console_height%" />
-			</object>
+			<console>
+				<placement x="%indent%" y="%row2_y%" w="%content_width%" h="%console_height%"/>
+			</console>
 
-			<object type="fill" color="%fileselector_linecolor%">
-				<placement x="%indent%" y="row2_y" w="%content_width%" h="input_line_width" placement="1" />
-			</object>
+			<fill color="%fileselector_linecolor%">
+				<placement x="%indent%" y="row2_y" w="%content_width%" h="input_line_width" placement="1"/>
+			</fill>
 
-			<object type="fill" color="%fileselector_linecolor%">
-				<placement x="%indent%" y="row17_y" w="%content_width%" h="input_line_width" />
-			</object>
+			<fill color="%fileselector_linecolor%">
+				<placement x="%indent%" y="row17_y" w="%content_width%" h="input_line_width"/>
+			</fill>
 		</template>
 
 		<template name="console_terminal">
-			<object type="console">
-				<placement x="%indent%" y="%row2_y%" w="content_width" h="%console_terminal_height%" />
-			</object>
+			<console>
+				<placement x="%indent%" y="%row2_y%" w="content_width" h="%console_terminal_height%"/>
+			</console>
 
-			<object type="fill" color="%fileselector_linecolor%">
-				<placement x="%indent%" y="row2_y" w="%content_width%" h="input_line_width" placement="1" />
-			</object>
+			<fill color="%fileselector_linecolor%">
+				<placement x="%indent%" y="row2_y" w="%content_width%" h="input_line_width" placement="1"/>
+			</fill>
 
-			<object type="fill" color="%fileselector_linecolor%">
-				<placement x="%indent%" y="row11_y" w="%content_width%" h="input_line_width" />
-			</object>
+			<fill color="%fileselector_linecolor%">
+				<placement x="%indent%" y="row11_y" w="%content_width%" h="input_line_width"/>
+			</fill>
+		</template>
+
+		<template name="keyboardterminaltemplate">
+			<keyboard>
+				<condition var1="tw_hide_kb" var2="0"/>
+				<placement x="0" y="%keyboard_terminal_y%" w="%screen_width%" h="42"/>
+				<keymargin x="0" y="0"/>
+				<background color="#111111"/>
+				<key-alphanumeric color="#111111" font="keylabel" textcolor="#EEEEEE"/>
+				<key-other color="#111111" font="keylabel-small" textcolor="#5b5b5bff"/>
+				<longpress font="keylabel-longpress" textcolor="#5b5b5bff" x="12" y="0"/>
+				<keylabel key="0:k:29" text="Ctrl"/>
+				<keylabel key="0:c:27" text="Esc"/>
+				<keylabel key="0:c:9" text="Tab"/>
+				<keylabel key="0:k:105" text="&lt;" resource="kb_arrow_left"/>
+				<keylabel key="0:k:108" text="v" resource="kb_arrow_down"/>
+				<keylabel key="0:k:103" text="^" resource="kb_arrow_up"/>
+				<keylabel key="0:k:106" text="&gt;" resource="kb_arrow_right"/>
+				<highlight color="%highlight_color%"/>
+				<ctrlhighlight color="#0090CA80"/>
+				<layout1>
+					<keysize height="42" width="69"/>
+					<row1 key01="68:k:29" key02="68:c:27" long02=":c:3" key03="68:c:9" key04="69:k:105" key05="69:k:108" key06="69:k:103" key07="69:k:106"/>
+				</layout1>
+			</keyboard>
 		</template>
 
 		<template name="keyboardtemplate">
-			<object type="keyboard">
-				<placement x="0" y="%keyboard_y%" w="480" h="284" />
+			<keyboard>
+				<condition var1="tw_hide_kb" var2="0"/>
+				<placement x="0" y="%keyboard_y%" w="480" h="284"/>
 				<keymargin x="4" y="4"/>
 				<background color="#111111"/>
 				<key-alphanumeric color="#111111" font="keylabel" textcolor="#EEEEEE"/>
@@ -542,45 +575,45 @@
 				<keylabel key="0:c:8" text="Bksp" resource="backspace"/>
 				<keylabel key="0:action" text="Enter" resource="enter"/>
 				<keylabel key=" " text="Space" resource="space"/>
-				<highlight color="%highlight_color%" />
-				<capshighlight color="%highlight_color%" />
+				<highlight color="%highlight_color%"/>
+				<capshighlight color="%highlight_color%"/>
 				<layout1>
-					<keysize height="71" 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="24:" key02="a" long02="@" key03="s" long03="#" key04="d" long04="$" key05="f" long05="%" key06="g" long06="&amp;" key07="h" long07="*" key08="j" long08="-" key09="k" long09="+" key10="l" long10="_" key11="24:" />
-					<row3 key01="72:layout2" key02="z" long02="!" key03="x" long03='"' key04="c" long04="'" key05="v" long05=":" key06="b" long06=";" key07="n" long07="/" key08="m" long08="?" key09="72:c:8" />
-					<row4 key01="72:layout3" key02="/" key03="240: " key04="." key05="72:action" />
+					<keysize height="71" 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="24:" key02="a" long02="@" key03="s" long03="#" key04="d" long04="$" key05="f" long05="%" key06="g" long06="&amp;" key07="h" long07="*" key08="j" long08="-" key09="k" long09="+" key10="l" long10="_" key11="24:"/>
+					<row3 key01="72:layout2" key02="z" long02="!" key03="x" long03="&quot;" key04="c" long04="'" key05="v" long05=":" key06="b" long06=";" key07="n" long07="/" key08="m" long08="?" key09="72:c:8"/>
+					<row4 key01="72:layout3" key02="/" key03="240: " key04="." key05="72:action"/>
 					<keylabel key="0:layout2" text="Shift" resource="shift"/>
 					<keylabel key="0:layout3" text="?123"/>
 				</layout1>
 				<layout2>
 					<keysize height="71" 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="24:" key02="A" long02="@" key03="S" long03="#" key04="D" long04="$" key05="F" long05="%" key06="G" long06="&amp;" key07="H" long07="*" key08="J" long08="-" key09="K" long09="+" key10="L" long10="_" key11="24:" />
-					<row3 key01="72:layout1" key02="Z" long02="!" key03="X" long03='"' key04="C" long04="'" key05="V" long05=":" key06="B" long06=";" key07="N" long07="/" key08="M" long08="?" key09="72:c:8" />
-					<row4 key01="72:layout3" key02="/" key03="240: " key04="." key05="72:action" />
+					<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="24:" key02="A" long02="@" key03="S" long03="#" key04="D" long04="$" key05="F" long05="%" key06="G" long06="&amp;" key07="H" long07="*" key08="J" long08="-" key09="K" long09="+" key10="L" long10="_" key11="24:"/>
+					<row3 key01="72:layout1" key02="Z" long02="!" key03="X" long03="&quot;" key04="C" long04="'" key05="V" long05=":" key06="B" long06=";" key07="N" long07="/" key08="M" long08="?" key09="72:c:8"/>
+					<row4 key01="72:layout3" key02="/" key03="240: " key04="." key05="72:action"/>
 					<keylabel key="0:layout1" text="Shift" resource="shift_fill"/>
 					<keylabel key="0:layout3" text="?123"/>
 				</layout2>
 				<layout3>
-					<keysize height="71" 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="," key03="240: " key04="." key05="72:action" />
+					<keysize height="71" 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="," key03="240: " key04="." key05="72:action"/>
 					<keylabel key="0:layout1" text="ABC"/>
 					<keylabel key="0:layout4" text="~\{"/>
 				</layout3>
 				<layout4>
-					<keysize height="71" 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="." key05="72:action" />
+					<keysize height="71" 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="." key05="72:action"/>
 					<keylabel key="0:layout1" text="ABC"/>
 					<keylabel key="0:layout3" text="?123"/>
 				</layout4>
-			</object>
+			</keyboard>
 		</template>
 	</templates>
 </recovery>
diff --git a/gui/theme/watch_mdpi/images/kb_arrow_down.png b/gui/theme/watch_mdpi/images/kb_arrow_down.png
new file mode 100644
index 0000000..5cdcb28
--- /dev/null
+++ b/gui/theme/watch_mdpi/images/kb_arrow_down.png
Binary files differ
diff --git a/gui/theme/watch_mdpi/images/kb_arrow_left.png b/gui/theme/watch_mdpi/images/kb_arrow_left.png
new file mode 100644
index 0000000..a7b0601
--- /dev/null
+++ b/gui/theme/watch_mdpi/images/kb_arrow_left.png
Binary files differ
diff --git a/gui/theme/watch_mdpi/images/kb_arrow_right.png b/gui/theme/watch_mdpi/images/kb_arrow_right.png
new file mode 100644
index 0000000..fd323ab
--- /dev/null
+++ b/gui/theme/watch_mdpi/images/kb_arrow_right.png
Binary files differ
diff --git a/gui/theme/watch_mdpi/images/kb_arrow_up.png b/gui/theme/watch_mdpi/images/kb_arrow_up.png
new file mode 100644
index 0000000..b54b43e
--- /dev/null
+++ b/gui/theme/watch_mdpi/images/kb_arrow_up.png
Binary files differ
diff --git a/gui/theme/watch_mdpi/images/kb_hide.png b/gui/theme/watch_mdpi/images/kb_hide.png
new file mode 100644
index 0000000..aa23f80
--- /dev/null
+++ b/gui/theme/watch_mdpi/images/kb_hide.png
Binary files differ
diff --git a/gui/theme/watch_mdpi/images/kb_show.png b/gui/theme/watch_mdpi/images/kb_show.png
new file mode 100644
index 0000000..97d9f6d
--- /dev/null
+++ b/gui/theme/watch_mdpi/images/kb_show.png
Binary files differ
diff --git a/gui/theme/watch_mdpi/ui.xml b/gui/theme/watch_mdpi/ui.xml
index 850a32f..4e4cc1f 100644
--- a/gui/theme/watch_mdpi/ui.xml
+++ b/gui/theme/watch_mdpi/ui.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0"?>
-
 <recovery>
 	<details>
-		<resolution width="320" height="320" />
-		<roundscreen offset_x="40" offset_y="40" />
+		<resolution width="320" height="320"/>
+		<roundscreen offset_x="40" offset_y="40"/>
 		<author>TeamWin</author>
 		<title>Backup Naowz</title>
 		<description>Default basic theme</description>
@@ -11,299 +10,335 @@
 	</details>
 
 	<include>
-		<xmlfile name="watch.xml" />
+		<xmlfile name="watch.xml"/>
 	</include>
 
 	<resources>
-		<resource name="font_l" type="font"  filename="RobotoCondensed-Regular.ttf" size="24" />
-		<resource name="font_m" type="font" filename="RobotoCondensed-Regular.ttf" size="14" />
-		<resource name="font_s" type="font" filename="RobotoCondensed-Regular.ttf" size="12" />
-		<resource name="fixed" type="font" filename="DroidSansMono.ttf" size="14" />
+		<font name="font_l" filename="RobotoCondensed-Regular.ttf" size="24"/>
+		<font name="font_m" filename="RobotoCondensed-Regular.ttf" size="14"/>
+		<font name="font_s" filename="RobotoCondensed-Regular.ttf" size="12"/>
+		<font name="fixed" filename="DroidSansMono.ttf" size="14"/>
 
-		<resource name="keylabel" type="font" filename="RobotoCondensed-Regular.ttf" size="18" />
-		<resource name="keylabel-small" type="font" filename="RobotoCondensed-Regular.ttf" size="14" />
-		<resource name="keylabel-longpress" type="font" filename="RobotoCondensed-Regular.ttf" size="12" />
+		<font name="keylabel" filename="RobotoCondensed-Regular.ttf" size="18"/>
+		<font name="keylabel-small" filename="RobotoCondensed-Regular.ttf" size="14"/>
+		<font name="keylabel-longpress" filename="RobotoCondensed-Regular.ttf" size="12"/>
 
-		<resource name="main_button" type="image" filename="main_button" />
-		<resource name="main_button_half_height" type="image" filename="main_button_half_height" />
-		<resource name="main_button_full_width" type="image" filename="main_button_full_width" />
-		<resource name="main_button_quarter_width" type="image" filename="main_button_quarter_width" />
-		<resource name="q_btn_arrow_right" type="image" filename="q_btn_arrow_right" retainaspect="1" />
-		<resource name="q_btn_arrow_left" type="image" filename="q_btn_arrow_left" retainaspect="1" />
-		<resource name="q_btn_storage" type="image" filename="q_btn_storage" retainaspect="1" />
-		<resource name="q_btn_refresh" type="image" filename="q_btn_refresh" retainaspect="1" />
-		<resource name="q_btn_accept" type="image" filename="q_btn_accept" retainaspect="1" />
-		<resource name="q_btn_accept_transp" type="image" filename="q_btn_accept_transp" retainaspect="1" />
-		<resource name="q_btn_addzip" type="image" filename="q_btn_addzip" retainaspect="1" />
-		<resource name="q_btn_encryption_dis" type="image" filename="q_btn_encryption_dis" retainaspect="1" />
-		<resource name="q_btn_encryption_en" type="image" filename="q_btn_encryption_en" retainaspect="1" />
-		<resource name="q_btn_delete" type="image" filename="q_btn_delete" retainaspect="1" />
-		<resource name="q_btn_reset" type="image" filename="q_btn_reset" retainaspect="1" />
-		<resource name="q_btn_folder" type="image" filename="q_btn_folder" retainaspect="1" />
-		<resource name="file" type="image" filename="file" retainaspect="1" />
-		<resource name="folder" type="image" filename="folder" retainaspect="1" />
-		<resource name="unlock_icon" type="image" filename="unlock_icon" retainaspect="1" />
-		<resource name="home" type="image" filename="home" retainaspect="1" />
-		<resource name="back" type="image" filename="back" retainaspect="1" />
-		<resource name="console" type="image" filename="console" retainaspect="1" />
-		<resource name="grid_less" type="image" filename="grid_less" retainaspect="1" />
-		<resource name="grid_more" type="image" filename="grid_more" retainaspect="1" />
-		<resource name="checkbox_false" type="image" filename="checkbox_false" retainaspect="1" />
-		<resource name="checkbox_false_small" type="image" filename="checkbox_false_small" retainaspect="1" />
-		<resource name="checkbox_true" type="image" filename="checkbox_true" retainaspect="1" />
-		<resource name="checkbox_true_small" type="image" filename="checkbox_true_small" retainaspect="1" />
-		<resource name="radio_false" type="image" filename="radio_false" retainaspect="1" />
-		<resource name="radio_true" type="image" filename="radio_true" 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" />
-		<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="handle" type="image" filename="handle" />
-		<resource name="backspace" type="image" filename="backspace" retainaspect="1" />
-		<resource name="enter" type="image" filename="enter" retainaspect="1" />
-		<resource name="shift" type="image" filename="shift" retainaspect="1" />
-		<resource name="shift_fill" type="image" filename="shift_fill" retainaspect="1" />
-		<resource name="space" type="image" filename="space" retainaspect="1" />
-		<resource name="close" type="image" filename="close" retainaspect="1" />
+		<image name="main_button" filename="main_button"/>
+		<image name="main_button_half_height" filename="main_button_half_height"/>
+		<image name="main_button_full_width" filename="main_button_full_width"/>
+		<image name="main_button_quarter_width" filename="main_button_quarter_width"/>
+		<image name="q_btn_arrow_right" filename="q_btn_arrow_right" retainaspect="1"/>
+		<image name="q_btn_arrow_left" filename="q_btn_arrow_left" retainaspect="1"/>
+		<image name="q_btn_storage" filename="q_btn_storage" retainaspect="1"/>
+		<image name="q_btn_refresh" filename="q_btn_refresh" retainaspect="1"/>
+		<image name="q_btn_accept" filename="q_btn_accept" retainaspect="1"/>
+		<image name="q_btn_accept_transp" filename="q_btn_accept_transp" retainaspect="1"/>
+		<image name="q_btn_addzip" filename="q_btn_addzip" retainaspect="1"/>
+		<image name="q_btn_encryption_dis" filename="q_btn_encryption_dis" retainaspect="1"/>
+		<image name="q_btn_encryption_en" filename="q_btn_encryption_en" retainaspect="1"/>
+		<image name="q_btn_delete" filename="q_btn_delete" retainaspect="1"/>
+		<image name="q_btn_reset" filename="q_btn_reset" retainaspect="1"/>
+		<image name="q_btn_folder" filename="q_btn_folder" retainaspect="1"/>
+		<image name="file" filename="file" retainaspect="1"/>
+		<image name="folder" filename="folder" retainaspect="1"/>
+		<image name="unlock_icon" filename="unlock_icon" retainaspect="1"/>
+		<image name="home" filename="home" retainaspect="1"/>
+		<image name="back" filename="back" retainaspect="1"/>
+		<image name="console" filename="console" retainaspect="1"/>
+		<image name="kb_hide" filename="kb_hide" retainaspect="1"/>
+		<image name="kb_show" filename="kb_show" retainaspect="1"/>
+		<image name="grid_less" filename="grid_less" retainaspect="1"/>
+		<image name="grid_more" filename="grid_more" retainaspect="1"/>
+		<image name="checkbox_false" filename="checkbox_false" retainaspect="1"/>
+		<image name="checkbox_false_small" filename="checkbox_false_small" retainaspect="1"/>
+		<image name="checkbox_true" filename="checkbox_true" retainaspect="1"/>
+		<image name="checkbox_true_small" filename="checkbox_true_small" retainaspect="1"/>
+		<image name="radio_false" filename="radio_false" retainaspect="1"/>
+		<image name="radio_true" filename="radio_true" retainaspect="1"/>
+		<animation name="progress" filename="indeterminate"/>
+		<image name="progress_empty" filename="progress_empty"/>
+		<image name="progress_full" filename="progress_fill"/>
+		<image name="slider" filename="slider"/>
+		<image name="slider_used" filename="slider_used"/>
+		<image name="slider_touch" filename="slider_touch"/>
+		<image name="handle" filename="handle"/>
+		<image name="backspace" filename="backspace" retainaspect="1"/>
+		<image name="enter" filename="enter" retainaspect="1"/>
+		<image name="shift" filename="shift" retainaspect="1"/>
+		<image name="shift_fill" filename="shift_fill" retainaspect="1"/>
+		<image name="space" filename="space" retainaspect="1"/>
+		<image name="close" filename="close" retainaspect="1"/>
+		<image name="kb_arrow_left" filename="kb_arrow_left" retainaspect="1"/>
+		<image name="kb_arrow_right" filename="kb_arrow_right" retainaspect="1"/>
+		<image name="kb_arrow_up" filename="kb_arrow_up" retainaspect="1"/>
+		<image name="kb_arrow_down" filename="kb_arrow_down" retainaspect="1"/>
 	</resources>
 
 	<variables>
-		<variable name="screen_width" value="320" />
-		<variable name="screen_half_width" value="160" />
-		<variable name="screen_height" value="320" />
-		<variable name="status_height" value="20" />
-		<variable name="header_height" value="20" />
-		<variable name="navbar_height" value="52" />
-		<variable name="content_width" value="304" />
-		<variable name="content_half_width" value="148" />
-		<variable name="back_button_x" value="70" />
-		<variable name="console_button_x" value="250" />
-		<variable name="indent" value="8" />
-		<variable name="col1_x_left" value="8" />
-		<variable name="col1_x_left_negative" value="156" />
-		<variable name="center_x" value="160" />
-		<variable name="col1_x_right" value="164" />
-		<variable name="indent_right" value="312" />
-		<variable name="btn4_col2_x" value="86" />
-		<variable name="btn4_col3_x" value="164" />
-		<variable name="btn4_col4_x" value="242" />
-		<variable name="row1_header_y" value="0" />
-		<variable name="row2_header_y" value="20" />
-		<variable name="row1_y" value="28" />
-		<variable name="row1a_y" value="36" />
-		<variable name="row2_y" value="44" />
-		<variable name="row2a_y" value="52" />
-		<variable name="row3_y" value="60" />
-		<variable name="row3_input_y" value="64" />
-		<variable name="row3a_y" value="68" />
-		<variable name="row4_y" value="76" />
-		<variable name="row4a_y" value="84" />
-		<variable name="row5_y" value="92" />
-		<variable name="row5a_y" value="100" />
-		<variable name="row6_y" value="108" />
-		<variable name="row6_input_y" value="112" />
-		<variable name="row6a_y" value="116" />
-		<variable name="row6a_input_y" value="120" />
-		<variable name="row7_y" value="124" />
-		<variable name="row7a_y" value="132" />
-		<variable name="row8_y" value="140" />
-		<variable name="row8a_y" value="148" />
-		<variable name="row9_y" value="156" />
-		<variable name="row9a_y" value="164" />
-		<variable name="row10_y" value="172" />
-		<variable name="row10a_y" value="180" />
-		<variable name="row11_y" value="188" />
-		<variable name="row11a_y" value="196" />
-		<variable name="row12_y" value="204" />
-		<variable name="row12a_y" value="212" />
-		<variable name="row13_y" value="220" />
-		<variable name="slider_y" value="224" />
-		<variable name="row13a_y" value="228" />
-		<variable name="row14_y" value="236" />
-		<variable name="row14a_y" value="244" />
-		<variable name="row15_y" value="252" />
-		<variable name="row15a_y" value="260" />
-		<variable name="navbar_y" value="268" />
-		<variable name="navbar_btn_y" value="294" />
-		<variable name="keyboard_y" value="124" />
-		<variable name="background_color" value="#1A1A1A" />
-		<variable name="accent_color" value="#0090CA" />
-		<variable name="text_color" value="#EEEEEE" />
-		<variable name="text_button_color" value="#EEEEEE" />
-		<variable name="text_success_color" value="#76FF03" />
-		<variable name="text_fail_color" value="#FF0101" />
-		<variable name="highlight_color" value="#1A1A1A80" />
-		<variable name="caps_highlight_color" value="#22222280" />
-		<variable name="transparent" value="#00000000" />
-		<variable name="semi_transparent" value="#00000099" />
-		<variable name="warning" value="#F8F8A0" />
-		<variable name="error" value="#FF0101" />
-		<variable name="highlight" value="#0090CA" />
-		<variable name="fileselector_linecolor" value="#555555" />
-		<variable name="fileselector_highlight_color" value="#555555" />
-		<variable name="fileselector_separatorheight" value="1" />
-		<variable name="fileselector_spacing" value="0" />
-		<variable name="fileselector_install_height" value="248" />
-		<variable name="fileselector_filemanager_height" value="248" />
-		<variable name="partitionlist_spacing" value="0" />
-		<variable name="partitionlist_storage_height" value="160" />
-		<variable name="partitionlist_wipe_height" value="160" />
-		<variable name="listbox_timezone_height" value="248" />
-		<variable name="listbox_settings_height" value="248" />
-		<variable name="fastscroll_w" value="10" />
-		<variable name="fastscroll_linew" value="1" />
-		<variable name="fastscroll_rectw" value="10" />
-		<variable name="fastscroll_recth" value="18" />
-		<variable name="slidervalue_lineh" value="4" />
-		<variable name="slidervalue_padding" value="0" />
-		<variable name="slidervalue_sliderw" value="70" />
-		<variable name="slidervalue_sliderh" value="72" />
-		<variable name="slideout_height" value="232" />
-		<variable name="slideout_bg_height" value="248" />
-		<variable name="input_height" value="16" />
-		<variable name="input_line_width" value="1" />
-		<variable name="input_line_console" value="272" />
-		<variable name="console_height" value="152" />
-		<variable name="console_terminal_height" value="64" />
-		<variable name="close_btn_x" value="280" />
-		<variable name="pattern_x" value="60" />
-		<variable name="pattern_dot_dia" value="12" />
-		<variable name="pattern_line_w" value="4" />
-		<variable name="pattern_size" value="200" />
+		<variable name="tw_hide_kb" value="0" persist="1"/>
+
+		<variable name="screen_width" value="320"/>
+		<variable name="screen_half_width" value="160"/>
+		<variable name="screen_height" value="320"/>
+		<variable name="status_height" value="20"/>
+		<variable name="header_height" value="20"/>
+		<variable name="navbar_height" value="52"/>
+		<variable name="content_width" value="304"/>
+		<variable name="content_half_width" value="148"/>
+		<variable name="back_button_x" value="70"/>
+		<variable name="console_button_x" value="250"/>
+		<variable name="indent" value="8"/>
+		<variable name="col1_x_left" value="8"/>
+		<variable name="col1_x_left_negative" value="156"/>
+		<variable name="center_x" value="160"/>
+		<variable name="col1_x_right" value="164"/>
+		<variable name="indent_right" value="312"/>
+		<variable name="btn4_col2_x" value="86"/>
+		<variable name="btn4_col3_x" value="164"/>
+		<variable name="btn4_col4_x" value="242"/>
+		<variable name="row1_header_y" value="0"/>
+		<variable name="row2_header_y" value="20"/>
+		<variable name="row1_y" value="28"/>
+		<variable name="row1a_y" value="36"/>
+		<variable name="row2_y" value="44"/>
+		<variable name="row2a_y" value="52"/>
+		<variable name="row3_y" value="60"/>
+		<variable name="row3_input_y" value="64"/>
+		<variable name="row3a_y" value="68"/>
+		<variable name="row4_y" value="76"/>
+		<variable name="row4a_y" value="84"/>
+		<variable name="row5_y" value="92"/>
+		<variable name="row5a_y" value="100"/>
+		<variable name="row6_y" value="108"/>
+		<variable name="row6_input_y" value="112"/>
+		<variable name="row6a_y" value="116"/>
+		<variable name="row6a_input_y" value="120"/>
+		<variable name="row7_y" value="124"/>
+		<variable name="row7a_y" value="132"/>
+		<variable name="row8_y" value="140"/>
+		<variable name="row8a_y" value="148"/>
+		<variable name="row9_y" value="156"/>
+		<variable name="row9a_y" value="164"/>
+		<variable name="row10_y" value="172"/>
+		<variable name="row10a_y" value="180"/>
+		<variable name="row11_y" value="188"/>
+		<variable name="row11a_y" value="196"/>
+		<variable name="row12_y" value="204"/>
+		<variable name="row12a_y" value="212"/>
+		<variable name="row13_y" value="220"/>
+		<variable name="slider_y" value="224"/>
+		<variable name="row13a_y" value="228"/>
+		<variable name="row14_y" value="236"/>
+		<variable name="row14a_y" value="244"/>
+		<variable name="row15_y" value="252"/>
+		<variable name="row15a_y" value="260"/>
+		<variable name="navbar_y" value="268"/>
+		<variable name="navbar_btn_y" value="294"/>
+		<variable name="keyboard_y" value="124"/>
+		<variable name="keyboard_terminal_y" value="100"/>
+		<variable name="background_color" value="#1A1A1A"/>
+		<variable name="accent_color" value="#0090CA"/>
+		<variable name="text_color" value="#EEEEEE"/>
+		<variable name="text_button_color" value="#EEEEEE"/>
+		<variable name="text_success_color" value="#76FF03"/>
+		<variable name="text_fail_color" value="#FF0101"/>
+		<variable name="highlight_color" value="#1A1A1A80"/>
+		<variable name="caps_highlight_color" value="#22222280"/>
+		<variable name="transparent" value="#00000000"/>
+		<variable name="semi_transparent" value="#00000099"/>
+		<variable name="warning" value="#F8F8A0"/>
+		<variable name="error" value="#FF0101"/>
+		<variable name="highlight" value="#0090CA"/>
+		<variable name="fileselector_linecolor" value="#555555"/>
+		<variable name="fileselector_highlight_color" value="#555555"/>
+		<variable name="fileselector_separatorheight" value="1"/>
+		<variable name="fileselector_spacing" value="0"/>
+		<variable name="fileselector_install_height" value="248"/>
+		<variable name="fileselector_filemanager_height" value="248"/>
+		<variable name="partitionlist_spacing" value="0"/>
+		<variable name="partitionlist_storage_height" value="160"/>
+		<variable name="partitionlist_wipe_height" value="160"/>
+		<variable name="listbox_timezone_height" value="248"/>
+		<variable name="listbox_settings_height" value="248"/>
+		<variable name="fastscroll_w" value="10"/>
+		<variable name="fastscroll_linew" value="1"/>
+		<variable name="fastscroll_rectw" value="10"/>
+		<variable name="fastscroll_recth" value="18"/>
+		<variable name="slidervalue_lineh" value="4"/>
+		<variable name="slidervalue_padding" value="0"/>
+		<variable name="slidervalue_sliderw" value="70"/>
+		<variable name="slidervalue_sliderh" value="72"/>
+		<variable name="slideout_height" value="232"/>
+		<variable name="slideout_bg_height" value="248"/>
+		<variable name="input_height" value="16"/>
+		<variable name="input_line_width" value="1"/>
+		<variable name="input_line_console" value="272"/>
+		<variable name="console_height" value="152"/>
+		<variable name="console_terminal_s_height" value="100"/>
+		<variable name="console_terminal_l_height" value="268"/>
+		<variable name="close_btn_x" value="280"/>
+		<variable name="pattern_x" value="60"/>
+		<variable name="pattern_dot_dia" value="12"/>
+		<variable name="pattern_line_w" value="4"/>
+		<variable name="pattern_size" value="200"/>
 	</variables>
 
 	<templates>
 		<template name="statusbar">
-			<object type="fill" color="%accent_color%">
-				<placement x="0" y="0" w="%screen_width%" h="%header_height%" />
-			</object>
+			<fill color="%accent_color%">
+				<placement x="0" y="0" w="%screen_width%" h="%header_height%"/>
+			</fill>
 
-			<object type="fill" color="%text_fail_color%">
-				<condition var1="tw_simulate_actions" var2="1" />
-				<placement x="0" y="0" w="%screen_width%" h="%status_height%" />
-			</object>  
+			<fill color="%text_fail_color%">
+				<condition var1="tw_simulate_actions" var2="1"/>
+				<placement x="0" y="0" w="%screen_width%" h="%status_height%"/>
+			</fill>  
 		</template>
 
 		<template name="page">
-			<background color="%background_color%" />
+			<background color="%background_color%"/>
 
-			<object type="template" name="statusbar" />
+			<template name="statusbar"/>
 
-			<object type="text" color="%text_color%">
-				<condition var1="tw_no_cpu_temp" var2="1" />
-				<font resource="font_m" />
-				<placement x="%indent%" y="%row1_header_y%" />
+			<text color="%text_color%">
+				<condition var1="tw_no_cpu_temp" var2="1"/>
+				<font resource="font_m"/>
+				<placement x="%indent%" y="%row1_header_y%"/>
 				<text>{@twrp_watch_header=TWRP %tw_version%}</text>
-			</object>
+			</text>
 
-			<object type="text" color="%text_color%">
-				<condition var1="tw_no_cpu_temp" var2="0" />
-				<font resource="font_m" />
-				<placement x="%indent%" y="%row1_header_y%" />
-				<text>{@cpu_temp=CPU: %tw_cpu_temp% &#xB0;C}</text>
-			</object>
+			<text color="%text_color%">
+				<condition var1="tw_no_cpu_temp" var2="0"/>
+				<font resource="font_m"/>
+				<placement x="%indent%" y="%row1_header_y%"/>
+				<text>{@cpu_temp=CPU: %tw_cpu_temp% °C}</text>
+			</text>
 
-			<object type="text" color="%text_color%">
-				<font resource="font_m" />
-				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
+			<text color="%text_color%">
+				<font resource="font_m"/>
+				<placement x="%center_x%" y="%row1_header_y%" placement="5"/>
 				<text>%tw_time%</text>
-			</object>
+			</text>
 
-			<object type="text" color="%text_color%">
+			<text color="%text_color%">
 				<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" />
+					<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>
-				<font resource="font_m" />
-				<placement x="%indent_right%" y="%row1_header_y%" placement="1" />
+				<font resource="font_m"/>
+				<placement x="%indent_right%" y="%row1_header_y%" placement="1"/>
 				<text>{@battery_pct=Battery: %tw_battery%}</text>
-			</object>
+			</text>
 
-			<object type="fill" color="#000000">
-				<placement x="0" y="%navbar_y%" w="%screen_width%" h="%navbar_height%" />
-			</object>
+			<fill color="#000000">
+				<placement x="0" y="%navbar_y%" w="%screen_width%" h="%navbar_height%"/>
+			</fill>
 
-			<object type="button">
-				<placement x="%back_button_x%" y="%navbar_btn_y%" placement="4" />
-				<image resource="back" />
-				<condition var1="tw_busy" var2="0" />
+			<button>
+				<placement x="%back_button_x%" y="%navbar_btn_y%" placement="4"/>
+				<image resource="back"/>
+				<condition var1="tw_busy" var2="0"/>
 				<action function="key">back</action>
-			</object>
+			</button>
 
-			<object type="button">
-				<placement x="%center_x%" y="%navbar_btn_y%" placement="4" />
-				<image resource="home" />
-				<condition var1="tw_busy" var2="0" />
+			<button>
+				<placement x="%center_x%" y="%navbar_btn_y%" placement="4"/>
+				<image resource="home"/>
+				<condition var1="tw_busy" var2="0"/>
 				<action function="key">home</action>
-			</object>
+			</button>
 
-			<object type="button">
-				<placement x="%console_button_x%" y="%navbar_btn_y%" placement="4" />
-				<image resource="console" />
-				<condition var1="tw_busy" var2="0" />
+			<button>
+				<placement x="%console_button_x%" y="%navbar_btn_y%" placement="4"/>
+				<image resource="console"/>
+				<condition var1="tw_busy" var2="0"/>
 				<action function="overlay">slideout</action>
-			</object>
+			</button>
 
-			<object type="action">
-				<touch key="power" />
+			<action>
+				<touch key="power"/>
 				<action function="overlay">lock</action>
-			</object>
+			</action>
 
-			<object type="action">
-				<touch key="power+voldown" />
-				<action function="screenshot" />
-			</object>
+			<action>
+				<touch key="power+voldown"/>
+				<action function="screenshot"/>
+			</action>
 		</template>
 
 		<template name="progress_bar">
-			<object type="progressbar">
-				<placement x="%indent%" y="%row11_y%" />
-				<resource empty="progress_empty" full="progress_full" />
-				<data name="ui_progress" />
-			</object>
+			<progressbar>
+				<placement x="%indent%" y="%row11_y%"/>
+				<resource empty="progress_empty" full="progress_full"/>
+				<data name="ui_progress"/>
+			</progressbar>
 
-			<object type="animation">
-				<placement x="%indent%" y="%row11_y%" />
-				<resource name="progress" />
-				<speed fps="24" render="2" />
-				<loop frame="1" />
-			</object>
+			<animation>
+				<placement x="%indent%" y="%row11_y%"/>
+				<resource name="progress"/>
+				<speed fps="24" render="2"/>
+				<loop frame="1"/>
+			</animation>
 		</template>
 
 		<template name="console">
-			<object type="console">
-				<placement x="%indent%" y="%row1_y%" w="%content_width%" h="%console_height%" />
-			</object>
+			<console>
+				<placement x="%indent%" y="%row1_y%" w="%content_width%" h="%console_height%"/>
+			</console>
 
-			<object type="fill" color="%fileselector_linecolor%">
-				<placement x="%indent%" y="row1_y" w="%content_width%" h="input_line_width" placement="1" />
-			</object>
+			<fill color="%fileselector_linecolor%">
+				<placement x="%indent%" y="row1_y" w="%content_width%" h="input_line_width" placement="1"/>
+			</fill>
 
-			<object type="fill" color="%fileselector_linecolor%">
-				<placement x="%indent%" y="row10a_y" w="%content_width%" h="input_line_width" />
-			</object>
+			<fill color="%fileselector_linecolor%">
+				<placement x="%indent%" y="row10a_y" w="%content_width%" h="input_line_width"/>
+			</fill>
 		</template>
 
 		<template name="console_terminal">
-			<object type="console">
-				<placement x="%indent%" y="%row1_y%" w="content_width" h="%console_terminal_height%" />
-			</object>
+			<console>
+				<placement x="%indent%" y="%row1_y%" w="content_width" h="%console_terminal_height%"/>
+			</console>
 
-			<object type="fill" color="%fileselector_linecolor%">
-				<placement x="%indent%" y="row1_y" w="%content_width%" h="input_line_width" placement="1" />
-			</object>
+			<fill color="%fileselector_linecolor%">
+				<placement x="%indent%" y="row1_y" w="%content_width%" h="input_line_width" placement="1"/>
+			</fill>
 
-			<object type="fill" color="%fileselector_linecolor%">
-				<placement x="%indent%" y="row5_y" w="%content_width%" h="input_line_width" />
-			</object>
+			<fill color="%fileselector_linecolor%">
+				<placement x="%indent%" y="row5_y" w="%content_width%" h="input_line_width"/>
+			</fill>
+		</template>
+
+		<template name="keyboardterminaltemplate">
+			<keyboard>
+				<condition var1="tw_hide_kb" var2="0"/>
+				<placement x="0" y="%keyboard_terminal_y%" w="%screen_width%" h="24"/>
+				<keymargin x="0" y="0"/>
+				<background color="#111111"/>
+				<key-alphanumeric color="#111111" font="keylabel" textcolor="#EEEEEE"/>
+				<key-other color="#111111" font="keylabel-small" textcolor="#5b5b5bff"/>
+				<longpress font="keylabel-longpress" textcolor="#5b5b5bff" x="0" y="0"/>
+				<keylabel key="0:k:29" text="Ctrl"/>
+				<keylabel key="0:c:27" text="Esc"/>
+				<keylabel key="0:c:9" text="Tab"/>
+				<keylabel key="0:k:105" text="&lt;" resource="kb_arrow_left"/>
+				<keylabel key="0:k:108" text="v" resource="kb_arrow_down"/>
+				<keylabel key="0:k:103" text="^" resource="kb_arrow_up"/>
+				<keylabel key="0:k:106" text="&gt;" resource="kb_arrow_right"/>
+				<highlight color="%highlight_color%"/>
+				<ctrlhighlight color="#0090CA80"/>
+				<layout1>
+					<keysize height="24" width="44"/>
+					<row1 key01="48:k:29" key02="48:c:27" long02=":c:3" key03="48:c:9" key04="44:k:105" key05="44:k:108" key06="44:k:103" key07="44:k:106"/>
+				</layout1>
+			</keyboard>
 		</template>
 
 		<template name="keyboardtemplate">
-			<object type="keyboard">
-				<placement x="0" y="%keyboard_y%" w="320" h="144" />
+			<keyboard>
+				<condition var1="tw_hide_kb" var2="0"/>
+				<placement x="0" y="%keyboard_y%" w="320" h="144"/>
 				<keymargin x="2" y="2"/>
 				<background color="#111111"/>
 				<key-alphanumeric color="#111111" font="keylabel" textcolor="#EEEEEE"/>
@@ -312,45 +347,45 @@
 				<keylabel key="0:c:8" text="Bksp" resource="backspace"/>
 				<keylabel key="0:action" text="Enter" resource="enter"/>
 				<keylabel key=" " text="Space" resource="space"/>
-				<highlight color="%highlight_color%" />
-				<capshighlight color="%highlight_color%" />
+				<highlight color="%highlight_color%"/>
+				<capshighlight color="%highlight_color%"/>
 				<layout1>
-					<keysize height="36" 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="16:" key02="a" long02="@" key03="s" long03="#" key04="d" long04="$" key05="f" long05="%" key06="g" long06="&amp;" key07="h" long07="*" key08="j" long08="-" key09="k" long09="+" key10="l" long10="_" key11="16:" />
-					<row3 key01="48:layout2" key02="z" long02="!" key03="x" long03='"' key04="c" long04="'" key05="v" long05=":" key06="b" long06=";" key07="n" long07="/" key08="m" long08="?" key09="48:c:8" />
-					<row4 key01="48:layout3" key02="/" key03="160: " key04="." key05="48:action" />
+					<keysize height="36" 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="16:" key02="a" long02="@" key03="s" long03="#" key04="d" long04="$" key05="f" long05="%" key06="g" long06="&amp;" key07="h" long07="*" key08="j" long08="-" key09="k" long09="+" key10="l" long10="_" key11="16:"/>
+					<row3 key01="48:layout2" key02="z" long02="!" key03="x" long03="&quot;" key04="c" long04="'" key05="v" long05=":" key06="b" long06=";" key07="n" long07="/" key08="m" long08="?" key09="48:c:8"/>
+					<row4 key01="48:layout3" key02="/" key03="160: " key04="." key05="48:action"/>
 					<keylabel key="0:layout2" text="Shift" resource="shift"/>
 					<keylabel key="0:layout3" text="?123"/>
 				</layout1>
 				<layout2>
 					<keysize height="36" 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="16:" key02="A" long02="@" key03="S" long03="#" key04="D" long04="$" key05="F" long05="%" key06="G" long06="&amp;" key07="H" long07="*" key08="J" long08="-" key09="K" long09="+" key10="L" long10="_" key11="16:" />
-					<row3 key01="48:layout1" key02="Z" long02="!" key03="X" long03='"' key04="C" long04="'" key05="V" long05=":" key06="B" long06=";" key07="N" long07="/" key08="M" long08="?" key09="48:c:8" />
-					<row4 key01="48:layout3" key02="/" key03="160: " key04="." key05="48:action" />
+					<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="16:" key02="A" long02="@" key03="S" long03="#" key04="D" long04="$" key05="F" long05="%" key06="G" long06="&amp;" key07="H" long07="*" key08="J" long08="-" key09="K" long09="+" key10="L" long10="_" key11="16:"/>
+					<row3 key01="48:layout1" key02="Z" long02="!" key03="X" long03="&quot;" key04="C" long04="'" key05="V" long05=":" key06="B" long06=";" key07="N" long07="/" key08="M" long08="?" key09="48:c:8"/>
+					<row4 key01="48:layout3" key02="/" key03="160: " key04="." key05="48:action"/>
 					<keylabel key="0:layout1" text="Shift" resource="shift_fill"/>
 					<keylabel key="0:layout3" text="?123"/>
 				</layout2>
 				<layout3>
-					<keysize height="36" 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="," key03="160: " key04="." key05="48:action" />
+					<keysize height="36" 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="," key03="160: " key04="." key05="48:action"/>
 					<keylabel key="0:layout1" text="ABC"/>
 					<keylabel key="0:layout4" text="~\{"/>
 				</layout3>
 				<layout4>
-					<keysize height="36" 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="." key05="48:action" />
+					<keysize height="36" 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="." key05="48:action"/>
 					<keylabel key="0:layout1" text="ABC"/>
 					<keylabel key="0:layout3" text="?123"/>
 				</layout4>
-			</object>
+			</keyboard>
 		</template>
 	</templates>
 </recovery>