4 files changed, 539 insertions, 102 deletions

diff --git a/gui/theme/common/landscape.xml b/gui/theme/common/landscape.xml
index ebee0a8eb..ff6babe1c 100755
--- a/gui/theme/common/landscape.xml
+++ b/gui/theme/common/landscape.xml
@@ -2655,6 +2655,12 @@
 				</actions>
 			</button>
 
+			<button style="main_button_half_width">
+				<placement x="%col2_x_left%" y="%row15a_y%"/>
+				<text>{@sel_lang_btn=Select Language}</text>
+				<action function="overlay">select_language</action>
+			</button>
+
 			<slider>
 				<text>{@swipe_allow_mod=Swipe to Allow Modifications}</text>
 				<actions>
@@ -3973,6 +3979,12 @@
 				</actions>
 			</button>
 
+			<button style="main_button_half_width_low">
+				<placement x="%indent_right%" y="%row6_y%" placement="1"/>
+				<text>{@sel_lang_btn=Select Language}</text>
+				<action function="overlay">select_language</action>
+			</button>
+
 			<template name="keyboardtemplate"/>
 		</page>
 
@@ -4033,6 +4045,12 @@
 			</button>
 
 			<button style="main_button_half_width">
+				<placement x="%col1_x_right%" y="%row15a_y%"/>
+				<text>{@sel_lang_btn=Select Language}</text>
+				<action function="overlay">select_language</action>
+			</button>
+
+			<button style="main_button_half_width">
 				<placement x="%col2_x_right%" y="%row15a_y%"/>
 				<text>{@cancel_btn=Cancel}</text>
 				<actions>
@@ -4109,7 +4127,7 @@
 				<placement x="0" y="%navbar_y%" w="%screen_width%" h="%navbar_height%" />
 			</object>
 
-			<object type="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" />
@@ -4119,9 +4137,9 @@
 					<action function="set">tw_hide_kb=0</action>
 					<action function="page">advanced</action>
 				</actions>
-			</object>
+			</button>
 
-			<object type="button">
+			<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" />
@@ -4132,9 +4150,9 @@
 					<action function="set">tw_hide_kb=1</action>
 					<action function="page">terminalcommand</action>
 				</actions>
-			</object>
+			</button>
 
-			<object type="button">
+			<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" />
@@ -4145,9 +4163,9 @@
 					<action function="set">tw_hide_kb=0</action>
 					<action function="page">terminalcommand</action>
 				</actions>
-			</object>
+			</button>
 
-			<object type="button">
+			<button>
 				<condition var1="tw_navbar_button_position" op="=" var2="0" />
 				<placement x="%center_x%" y="%navbar_btn_y%" placement="4" />
 				<image resource="home" />
@@ -4156,9 +4174,9 @@
 					<action function="set">tw_hide_kb=0</action>
 					<action function="key">home</action>
 				</actions>
-			</object>
+			</button>
 
-			<object type="button">
+			<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" />
@@ -4169,9 +4187,9 @@
 					<action function="set">tw_hide_kb=1</action>
 					<action function="page">terminalcommand</action>
 				</actions>
-			</object>
+			</button>
 
-			<object type="button">
+			<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" />
@@ -4182,9 +4200,9 @@
 					<action function="set">tw_hide_kb=0</action>
 					<action function="page">terminalcommand</action>
 				</actions>
-			</object>
+			</button>
 
-			<object type="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" />
@@ -4194,9 +4212,9 @@
 					<action function="set">tw_hide_kb=0</action>
 					<action function="page">advanced</action>
 				</actions>
-			</object>
+			</button>
 
-			<object type="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" />
@@ -4206,9 +4224,9 @@
 					<action function="set">tw_hide_kb=0</action>
 					<action function="page">advanced</action>
 				</actions>
-			</object>
+			</button>
 
-			<object type="button">
+			<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" />
@@ -4219,9 +4237,9 @@
 					<action function="set">tw_hide_kb=1</action>
 					<action function="page">terminalcommand</action>
 				</actions>
-			</object>
+			</button>
 
-			<object type="button">
+			<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" />
@@ -4232,9 +4250,9 @@
 					<action function="set">tw_hide_kb=0</action>
 					<action function="page">terminalcommand</action>
 				</actions>
-			</object>
+			</button>
 
-			<object type="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" />
@@ -4243,9 +4261,9 @@
 					<action function="set">tw_hide_kb=0</action>
 					<action function="key">home</action>
 				</actions>
-			</object>
+			</button>
 
-			<object type="button">
+			<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" />
@@ -4256,9 +4274,9 @@
 					<action function="set">tw_hide_kb=1</action>
 					<action function="page">terminalcommand</action>
 				</actions>
-			</object>
+			</button>
 
-			<object type="button">
+			<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" />
@@ -4269,9 +4287,9 @@
 					<action function="set">tw_hide_kb=0</action>
 					<action function="page">terminalcommand</action>
 				</actions>
-			</object>
+			</button>
 
-			<object type="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" />
@@ -4281,9 +4299,9 @@
 					<action function="set">tw_hide_kb=0</action>
 					<action function="page">advanced</action>
 				</actions>
-			</object>
+			</button>
 
-			<object type="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" />
@@ -4293,9 +4311,9 @@
 					<action function="set">tw_hide_kb=0</action>
 					<action function="page">advanced</action>
 				</actions>
-			</object>
+			</button>
 
-			<object type="button">
+			<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" />
@@ -4306,9 +4324,9 @@
 					<action function="set">tw_hide_kb=1</action>
 					<action function="page">terminalcommand</action>
 				</actions>
-			</object>
+			</button>
 
-			<object type="button">
+			<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" />
@@ -4319,9 +4337,9 @@
 					<action function="set">tw_hide_kb=0</action>
 					<action function="page">terminalcommand</action>
 				</actions>
-			</object>
+			</button>
 
-			<object type="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" />
@@ -4330,9 +4348,9 @@
 					<action function="set">tw_hide_kb=0</action>
 					<action function="key">home</action>
 				</actions>
-			</object>
+			</button>
 
-			<object type="button">
+			<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" />
@@ -4343,9 +4361,9 @@
 					<action function="set">tw_hide_kb=1</action>
 					<action function="page">terminalcommand</action>
 				</actions>
-			</object>
+			</button>
 
-			<object type="button">
+			<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" />
@@ -4356,9 +4374,9 @@
 					<action function="set">tw_hide_kb=0</action>
 					<action function="page">terminalcommand</action>
 				</actions>
-			</object>
+			</button>
 
-			<object type="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" />
@@ -4368,7 +4386,7 @@
 					<action function="set">tw_hide_kb=0</action>
 					<action function="page">advanced</action>
 				</actions>
-			</object>
+			</button>
 
 			<action>
 				<touch key="home"/>
@@ -4597,10 +4615,205 @@
 			</fill>
 
 			<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"/>
+				<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="overlay"/>
+					<action function="key">%tw_back%</action>
+				</actions>
+			</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" />
+				<actions>
+					<action function="overlay"/>
+					<action function="key">home</action>
+				</actions>
+			</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" />
+				<actions>
+					<action function="overlay"/>
+					<action function="key">%tw_back%</action>
+				</actions>
+			</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" />
+				<actions>
+					<action function="overlay"/>
+					<action function="key">%tw_back%</action>
+				</actions>
+			</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" />
+				<actions>
+					<action function="overlay"/>
+					<action function="key">home</action>
+				</actions>
+			</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" />
+				<actions>
+					<action function="overlay"/>
+					<action function="key">%tw_back%</action>
+				</actions>
+			</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" />
+				<actions>
+					<action function="overlay"/>
+					<action function="key">%tw_back%</action>
+				</actions>
+			</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" />
+				<actions>
+					<action function="overlay"/>
+					<action function="key">home</action>
+				</actions>
+			</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" />
+				<actions>
+					<action function="overlay"/>
+					<action function="key">%tw_back%</action>
+				</actions>
+			</button>
+
+			<action>
+				<touch key="power+voldown"/>
+				<action function="screenshot"/>
+			</action>
+		</page>
+
+		<page name="select_language">
+			<fill color="%semi_transparent%">
+				<placement x="0" y="0" w="%screen_width%" h="%screen_height%"/>
+			</fill>
+
+			<fill color="%background_color%">
+				<placement x="%col2_x_left%" y="row4_y" w="%dialog_width%" h="%dialog_height%"/>
+			</fill>
+
+			<listbox>
+				<placement x="%dialog_content_x%" y="%row4_y%" w="%content_overlay_width%" h="%partitionlist_storage_height%"/>
+				<text>{@select_language=Select Language:}</text>
+				<icon selected="radio_true" unselected="radio_false" />
+				<data name="tw_language" />
+			</listbox>
+
+			<button style="button_third_width">
+				<placement x="%dialog_button_x%" y="%row13_y%"/>
+				<text>{@ok_btn=OK}</text>
+				<actions>
+					<action function="overlay"/>
+					<action function="setlanguage"></action>
+				</actions>
+			</button>
+
+			<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" />
 				<actions>
 					<action function="overlay"/>
 					<action function="key">%tw_back%</action>
@@ -4608,17 +4821,19 @@
 			</button>
 
 			<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"/>
+				<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>
-				<placement x="%center_x%" y="%navbar_btn_y%" placement="4"/>
-				<image resource="home"/>
-				<condition var1="tw_busy" var2="0"/>
+				<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="overlay"/>
 					<action function="key">home</action>
@@ -4626,18 +4841,126 @@
 			</button>
 
 			<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"/>
+				<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_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"/>
+				<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="overlay"/>
+					<action function="key">%tw_back%</action>
+				</actions>
+			</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" />
+				<actions>
+					<action function="overlay"/>
+					<action function="key">%tw_back%</action>
+				</actions>
+			</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" />
+				<actions>
+					<action function="overlay"/>
+					<action function="key">home</action>
+				</actions>
+			</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" />
+				<actions>
+					<action function="overlay"/>
+					<action function="key">%tw_back%</action>
+				</actions>
+			</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" />
+				<actions>
+					<action function="overlay"/>
+					<action function="key">%tw_back%</action>
+				</actions>
+			</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" />
+				<actions>
+					<action function="overlay"/>
+					<action function="key">home</action>
+				</actions>
+			</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" />
 				<actions>
 					<action function="overlay"/>
 					<action function="key">%tw_back%</action>
diff --git a/gui/theme/common/languages/en.xml b/gui/theme/common/languages/en.xml
index 92350d42b..5d7a5ac03 100755
--- a/gui/theme/common/languages/en.xml
+++ b/gui/theme/common/languages/en.xml
@@ -358,6 +358,7 @@
 		<string name="kb_vibration">Keyboard Vibration:</string>
 		<string name="act_vibration">Action Vibration:</string>
 		<string name="select_language">Select Language:</string>
+		<string name="sel_lang_btn">Select Language</string>
 		<string name="set_language_btn">Set Language</string>
 		<string name="advanced_hdr">Advanced</string>
 		<string name="copy_log_confirm">Copy Log to SD Card?</string>
@@ -434,7 +435,7 @@
 		<string name="fm_perms">Permissions:</string>
 		<string name="fm_complete">File Operation Complete</string>
 		<string name="decrypt_data_hdr">Decrypt Data</string>
-		<string name="decrypt_data_enter_pass"></string>
+		<string name="decrypt_data_enter_pass">Enter Password.</string>
 		<string name="decryt_data_failed">Password failed, please try again!</string>
 		<string name="decryt_data_failed_pattern">Pattern failed, please try again!</string>
 		<string name="decrypt_data_enter_pattern">Enter Pattern.</string>
diff --git a/gui/theme/common/portrait.xml b/gui/theme/common/portrait.xml
index fdcbb08bd..3f1b581cd 100755
--- a/gui/theme/common/portrait.xml
+++ b/gui/theme/common/portrait.xml
@@ -2779,6 +2779,12 @@
 				</actions>
 			</button>
 
+			<button style="main_button_half_height">
+				<placement x="%center_x%" y="%row18a_y%"/>
+				<text>{@sel_lang_btn=Select Language}</text>
+				<action function="overlay">select_language</action>
+			</button>
+
 			<slider>
 				<text>{@swipe_allow_mod=Swipe to Allow Modifications}</text>
 				<actions>
@@ -4044,6 +4050,12 @@
 				</actions>
 			</button>
 
+			<button style="main_button_half_height">
+				<placement x="%center_x%" y="%row10_y%"/>
+				<text>{@sel_lang_btn=Select Language}</text>
+				<action function="overlay">select_language</action>
+			</button>
+
 			<template name="keyboardtemplate"/>
 		</page>
 
@@ -4111,6 +4123,12 @@
 					<action function="page">main</action>
 				</actions>
 			</button>
+
+			<button style="main_button_half_height">
+				<placement x="%center_x%" y="%row21a_y%"/>
+				<text>{@sel_lang_btn=Select Language}</text>
+				<action function="overlay">select_language</action>
+			</button>
 		</page>
 
 		<page name="trydecrypt">
@@ -4178,11 +4196,11 @@
 
 			<template name="keyboardtemplate"/>
 
-			<object type="fill" color="#000000">
+			<fill color="#000000">
 				<placement x="0" y="%navbar_y%" w="%screen_width%" h="%navbar_height%" />
-			</object>
+			</fill>
 
-			<object type="button">
+			<button>
 				<condition var1="tw_samsung_navbar" op="!=" var2="1" />
 				<placement x="%back_button_x%" y="%navbar_btn_y%" placement="4" />
 				<image resource="back" />
@@ -4191,9 +4209,9 @@
 					<action function="set">tw_hide_kb=0</action>
 					<action function="key">back</action>
 				</actions>
-			</object>
+			</button>
 
-			<object type="button">
+			<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" />
@@ -4203,9 +4221,9 @@
 					<action function="set">tw_hide_kb=1</action>
 					<action function="page">terminalcommand</action>
 				</actions>
-			</object>
+			</button>
 
-			<object type="button">
+			<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" />
@@ -4215,9 +4233,9 @@
 					<action function="set">tw_hide_kb=0</action>
 					<action function="page">terminalcommand</action>
 				</actions>
-			</object>
+			</button>
 
-			<object type="button">
+			<button>
 				<placement x="%center_x%" y="%navbar_btn_y%" placement="4" />
 				<image resource="home" />
 				<condition var1="tw_busy" var2="0" />
@@ -4225,9 +4243,9 @@
 					<action function="set">tw_hide_kb=0</action>
 					<action function="key">home</action>
 				</actions>
-			</object>
+			</button>
 
-			<object type="button">
+			<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" />
@@ -4237,9 +4255,9 @@
 					<action function="set">tw_hide_kb=1</action>
 					<action function="page">terminalcommand</action>
 				</actions>
-			</object>
+			</button>
 
-			<object type="button">
+			<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" />
@@ -4249,9 +4267,9 @@
 					<action function="set">tw_hide_kb=0</action>
 					<action function="page">terminalcommand</action>
 				</actions>
-			</object>
+			</button>
 
-			<object type="button">
+			<button>
 				<condition var1="tw_samsung_navbar" op="=" var2="1" />
 				<placement x="%console_button_x%" y="%navbar_btn_y%" placement="4" />
 				<image resource="back" />
@@ -4260,7 +4278,7 @@
 					<action function="set">tw_hide_kb=0</action>
 					<action function="key">back</action>
 				</actions>
-			</object>
+			</button>
 
 			<action>
 				<touch key="home"/>
@@ -4278,10 +4296,10 @@
 				</actions>
 			</action>
 
-			<object type="action">
+			<action>
 				<touch key="power+voldown" />
 				<action function="screenshot" />
-			</object>
+			</action>
 		</page>
 
 		<page name="sideload">
@@ -4541,5 +4559,88 @@
 				<action function="screenshot"/>
 			</action>
 		</page>
+
+		<page name="select_language">
+			<fill color="%semi_transparent%">
+				<placement x="0" y="0" w="%screen_width%" h="%screen_height%"/>
+			</fill>
+
+			<fill color="%background_color%">
+				<placement x="%indent%" y="row5_y" w="%content_width%" h="%dialog_height%"/>
+			</fill>
+
+			<listbox>
+				<placement x="%col1_x_left%" y="%row5_y%" w="%content_overlay_width%" h="%partitionlist_storage_height%"/>
+				<text>{@select_language=Select Language:}</text>
+				<icon selected="radio_true" unselected="radio_false" />
+				<data name="tw_language" />
+			</listbox>
+
+			<button style="button_third_width">
+				<placement x="%dialog_button_x%" y="%row14_y%"/>
+				<text>{@ok_btn=OK}</text>
+				<actions>
+					<action function="overlay"/>
+					<action function="setlanguage"></action>
+				</actions>
+			</button>
+
+			<fill color="#000000">
+				<placement x="0" y="row25_y" w="%screen_width%" h="%navbar_height"/>
+			</fill>
+
+			<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="overlay"/>
+					<action function="key">%tw_back%</action>
+				</actions>
+			</button>
+
+			<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>
+			</button>
+
+			<button>
+				<placement x="%center_x%" y="%navbar_btn_y%" placement="4"/>
+				<image resource="home"/>
+				<condition var1="tw_busy" var2="0"/>
+				<actions>
+					<action function="overlay"/>
+					<action function="key">home</action>
+				</actions>
+			</button>
+
+			<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>
+			</button>
+
+			<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="overlay"/>
+					<action function="key">%tw_back%</action>
+				</actions>
+			</button>
+
+			<action>
+				<touch key="power+voldown"/>
+				<action function="screenshot"/>
+			</action>
+		</page>
 	</pages>
 </recovery>
diff --git a/gui/theme/common/watch.xml b/gui/theme/common/watch.xml
index 7f951bca3..4a4c1c65f 100755
--- a/gui/theme/common/watch.xml
+++ b/gui/theme/common/watch.xml
@@ -3284,18 +3284,24 @@
 			</text>
 
 			<text style="text_m_fail">
-				<placement x="%center_x%" y="%row7_y%" placement="5"/>
+				<placement x="%center_x%" y="%row6_y%" placement="5"/>
 				<text>{@sys_rop5=Installing zips or performing adb operations may still}</text>
 			</text>
 
 			<text style="text_m_fail">
-				<placement x="%center_x%" y="%row8_y%" placement="5"/>
+				<placement x="%center_x%" y="%row7_y%" placement="5"/>
 				<text>{@sys_rop6=modify the system partition.}</text>
 			</text>
 
+			<button style="main_button_half_height">
+				<placement x="%col1_x_right%" y="%row8a_y%"/>
+				<text>{@sel_lang_btn=Select Language}</text>
+				<action function="page">settings_language</action>
+			</button>
+
 			<checkbox>
 				<condition var1="tw_is_encrypted" var2="0"/>
-				<placement x="%indent%" y="%row10_y%"/>
+				<placement x="%indent%" y="%row11_y%"/>
 				<text>{@sys_ro_never_show_chk=Never show this screen during boot again}</text>
 				<data variable="tw_never_show_system_ro_page"/>
 			</checkbox>
@@ -3840,28 +3846,28 @@
 				<text>{@settings_hdr=Settings} &gt; {@language_hdr=Language} - %tw_language_display%</text>
 			</text>
 
-			<object type="listbox" style="scrolllist">
+			<listbox style="scrolllist">
 				<placement x="%col1_x_left%" y="%row2_header_y%" w="%content_width%" h="%fileselector_filemanager_height%"/>
 				<icon selected="radio_true" unselected="radio_false" />
 				<data name="tw_language" />
-			</object>
+			</listbox>
 
 			<button>
 				<placement x="%btn4_col4_x%" y="%row11_y%"/>
 				<highlight color="%highlight_color%"/>
-				<image resource="q_btn_folder"/>
+				<image resource="q_btn_accept_transp"/>
 				<action function="setlanguage"></action>
 			</button>
 
-			<object type="action">
+			<action>
 				<touch key="home" />
 				<action function="page">main</action>
-			</object>
+			</action>
 
-			<object type="action">
+			<action>
 				<touch key="back" />
 				<action function="page">settings</action>
-			</object>
+			</action>
 		</page>
 
 		<page name="advanced">
@@ -4848,6 +4854,12 @@
 			</text>
 
 			<button style="main_button_half_height">
+				<placement x="%col1_x_left%" y="%row4_y%"/>
+				<text>{@sel_lang_btn=Select Language}</text>
+				<action function="page">settings_language</action>
+			</button>
+
+			<button style="main_button_half_height">
 				<placement x="%col1_x_right%" y="%row4_y%"/>
 				<text>{@cancel_btn=Cancel}</text>
 				<actions>
@@ -5025,11 +5037,11 @@
 
 			<template name="keyboardtemplate"/>
 
-			<object type="fill" color="#000000">
+			<fill color="#000000">
 				<placement x="0" y="%navbar_y%" w="%screen_width%" h="%navbar_height%" />
-			</object>
+			</fill>
 
-			<object type="button">
+			<button>
 				<placement x="%back_button_x%" y="%navbar_btn_y%" placement="4" />
 				<image resource="back" />
 				<condition var1="tw_busy" var2="0" />
@@ -5037,9 +5049,9 @@
 					<action function="set">tw_hide_kb=0</action>
 					<action function="key">back</action>
 				</actions>
-			</object>
+			</button>
 
-			<object type="button">
+			<button>
 				<placement x="%center_x%" y="%navbar_btn_y%" placement="4" />
 				<image resource="home" />
 				<condition var1="tw_busy" var2="0" />
@@ -5047,9 +5059,9 @@
 					<action function="set">tw_hide_kb=0</action>
 					<action function="key">home</action>
 				</actions>
-			</object>
+			</button>
 
-			<object type="button">
+			<button>
 				<condition var1="tw_hide_kb" var2="0"/>
 				<placement x="%console_button_x%" y="%navbar_btn_y%" placement="4" />
 				<image resource="kb_hide" />
@@ -5058,9 +5070,9 @@
 					<action function="set">tw_hide_kb=1</action>
 					<action function="page">terminalcommand</action>
 				</actions>
-			</object>
+			</button>
 
-			<object type="button">
+			<button>
 				<condition var1="tw_hide_kb" var2="1"/>
 				<placement x="%console_button_x%" y="%navbar_btn_y%" placement="4" />
 				<image resource="kb_show" />
@@ -5069,7 +5081,7 @@
 					<action function="set">tw_hide_kb=0</action>
 					<action function="page">terminalcommand</action>
 				</actions>
-			</object>
+			</button>
 
 			<action>
 				<touch key="home"/>
@@ -5087,10 +5099,10 @@
 				</actions>
 			</action>
 
-			<object type="action">
+			<action>
 				<touch key="power+voldown" />
 				<action function="screenshot" />
-			</object>
+			</action>
 		</page>
 
 		<page name="sideload">