From 829315385fddb4605acf949f4e31d82c74325c9c Mon Sep 17 00:00:00 2001
From: Matt Mower <mowerm@gmail.com>
Date: Fri, 27 Feb 2015 14:19:59 -0600
Subject: GUI: Use valid XML syntax

Safer handling:
& --> &amp;
> --> &gt;
< --> &lt;

Broken tags:
</function>      --> </action>
<folders="1"...> --> <filter folders="1"...>

Change-Id: Iaddaf9db163e08250cb4deefdfdb814c589ccb47
---
 gui/devices/1024x600/res/ui.xml         |  8 ++++----
 gui/devices/1024x768/res/ui.xml         |  8 ++++----
 gui/devices/1080x1920/res/ui.xml        | 12 ++++++------
 gui/devices/1200x1920/res/ui.xml        | 12 ++++++------
 gui/devices/1280x800/res/ui.xml         |  8 ++++----
 gui/devices/1440x2560/res/ui.xml        | 12 ++++++------
 gui/devices/1600x2560/res/ui.xml        | 12 ++++++------
 gui/devices/1920x1200/res/ui.xml        |  8 ++++----
 gui/devices/240x240/res/ui.xml          |  8 ++++----
 gui/devices/2560x1600/res/ui.xml        |  8 ++++----
 gui/devices/280x280/res/ui.xml          |  8 ++++----
 gui/devices/320x320/res/ui.xml          |  8 ++++----
 gui/devices/320x480/res/ui.xml          |  8 ++++----
 gui/devices/480x800/res/ui.xml          |  8 ++++----
 gui/devices/480x854/res/ui.xml          |  8 ++++----
 gui/devices/540x960/res/ui.xml          |  8 ++++----
 gui/devices/720x1280/res/ui.xml         |  8 ++++----
 gui/devices/800x1280/res/ui.xml         |  8 ++++----
 gui/devices/800x480/res/ui.xml          |  8 ++++----
 gui/devices/landscape/res/landscape.xml | 28 ++++++++++++++--------------
 gui/devices/portrait/res/portrait.xml   | 30 +++++++++++++++---------------
 gui/devices/watch/res/watch.xml         | 30 +++++++++++++++---------------
 22 files changed, 128 insertions(+), 128 deletions(-)

(limited to 'gui')

diff --git a/gui/devices/1024x600/res/ui.xml b/gui/devices/1024x600/res/ui.xml
index 725e11fcc..5147959ab 100644
--- a/gui/devices/1024x600/res/ui.xml
+++ b/gui/devices/1024x600/res/ui.xml
@@ -242,8 +242,8 @@
 				<placement x="200" y="30" />
 				<conditions>
 					<condition var1="tw_no_battery_percent" var2="0" />
-					<condition var1="tw_battery" op=">" var2="0" />
-					<condition var1="tw_battery" op="<" var2="101" />
+					<condition var1="tw_battery" op="&gt;" var2="0" />
+					<condition var1="tw_battery" op="&lt;" var2="101" />
 				</conditions>
 				<text>Battery Level: %tw_battery%</text>
 			</object>
@@ -424,8 +424,8 @@
 				<layout3>
 					<keysize height="65" width="92" />
 					<row1 key01="1" key02="2" key03="3" key04="4" key05="5" key06="6" key07="7" key08="8" key09="9" key10="0" key11="104:c:8" />
-					<row2 key01="138:#" key02="$" key03="%" key04="&" key05="*" key06="-" key07="+" key08="(" key09=")" key10="150:action" />
-					<row3 key01="102:layout4" key02="91:<" key03="91:>" key04="91:=" key05="91::" key06="91:;" key07="91:," key08="91:." key09="91:!" key10="91:?" key11="103:/" />
+					<row2 key01="138:#" key02="$" key03="%" key04="&amp;" key05="*" key06="-" key07="+" key08="(" key09=")" key10="150:action" />
+					<row3 key01="102:layout4" key02="91:&lt;" key03="91:&gt;" key04="91:=" key05="91::" key06="91:;" key07="91:," key08="91:." key09="91:!" key10="91:?" key11="103:/" />
 					<row4 key01="132:layout1" key02="92:" key03="@" key04="404: " key05="92:c:34" key06="_" />
 				</layout3>
 				<layout4>
diff --git a/gui/devices/1024x768/res/ui.xml b/gui/devices/1024x768/res/ui.xml
index 683be26f1..822b7f1ff 100644
--- a/gui/devices/1024x768/res/ui.xml
+++ b/gui/devices/1024x768/res/ui.xml
@@ -242,8 +242,8 @@
 				<placement x="200" y="30" />
 				<conditions>
 					<condition var1="tw_no_battery_percent" var2="0" />
-					<condition var1="tw_battery" op=">" var2="0" />
-					<condition var1="tw_battery" op="<" var2="101" />
+					<condition var1="tw_battery" op="&gt;" var2="0" />
+					<condition var1="tw_battery" op="&lt;" var2="101" />
 				</conditions>
 				<text>Battery Level: %tw_battery%</text>
 			</object>
@@ -424,8 +424,8 @@
 				<layout3>
 					<keysize height="90" width="85" />
 					<row1 key01="80:" key02="1" key03="2" key04="3" key05="4" key06="5" key07="6" key08="7" key09="8" key10="9" key11="0" key12="94:c:8" />
-					<row2 key01="115:layout1" key02="83:#" key03="83:$" key04="83:%" key05="83:&" key06="83:*" key07="83:-" key08="83:+" key09="83:(" key10="83:)" key11="162:action" />
-					<row3 key01="140:layout4" key02="82:<" key03="82:>" key04="82:=" key05="82:'" key06="82:;" key07="82:," key08="82:." key09="82:!" key10="82:?" key11="144:layout4" />
+					<row2 key01="115:layout1" key02="83:#" key03="83:$" key04="83:%" key05="83:&amp;" key06="83:*" key07="83:-" key08="83:+" key09="83:(" key10="83:)" key11="162:action" />
+					<row3 key01="140:layout4" key02="82:&lt;" key03="82:&gt;" key04="82:=" key05="82:'" key06="82:;" key07="82:," key08="82:." key09="82:!" key10="82:?" key11="144:layout4" />
 					<row4 key01="155:" key02="85:/" key03="85:@" key04="385: " key05="80:c:34" key06="_" />
 				</layout3>
 				<layout4>
diff --git a/gui/devices/1080x1920/res/ui.xml b/gui/devices/1080x1920/res/ui.xml
index f38462c40..5b70a146f 100644
--- a/gui/devices/1080x1920/res/ui.xml
+++ b/gui/devices/1080x1920/res/ui.xml
@@ -241,8 +241,8 @@
 				<placement x="405" y="114" />
 				<conditions>
 					<condition var1="tw_no_battery_percent" var2="0" />
-					<condition var1="tw_battery" op=">" var2="0" />
-					<condition var1="tw_battery" op="<" var2="101" />
+					<condition var1="tw_battery" op="&gt;" var2="0" />
+					<condition var1="tw_battery" op="&lt;" var2="101" />
 				</conditions>
 				<text>Battery: %tw_battery%</text>
 			</object>
@@ -396,21 +396,21 @@
 				<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="162:a" long01="@" key02="s" long02="#" key03="d" long03="$" key04="f" long04="%" key05="g" long05="&" key06="h" long06="*" key07="j" long07="-" key08="k" long08="+" key09="162:l" long09="_" />
+					<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" />
 				</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="162:A" long01="@" key02="S" long02="#" key03="D" long03="$" key04="F" long04="%" key05="G" long05="&" key06="H" long06="*" key07="J" long07="-" key08="K" long08="+" key09="162:L" long09="_" />
+					<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" />
 				</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="&" key06="*" key07="-" key08="+" key09="(" key10=")" />
+					<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" />
 				</layout3>
@@ -418,7 +418,7 @@
 					<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="<" key08=">" key09="162:c:8" />
+					<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" />
 				</layout4>
 			</object>
diff --git a/gui/devices/1200x1920/res/ui.xml b/gui/devices/1200x1920/res/ui.xml
index 782f0bd44..0a0b59614 100644
--- a/gui/devices/1200x1920/res/ui.xml
+++ b/gui/devices/1200x1920/res/ui.xml
@@ -244,8 +244,8 @@
 				<placement x="405" y="114" />
 				<conditions>
 					<condition var1="tw_no_battery_percent" var2="0" />
-					<condition var1="tw_battery" op=">" var2="0" />
-					<condition var1="tw_battery" op="<" var2="101" />
+					<condition var1="tw_battery" op="&gt;" var2="0" />
+					<condition var1="tw_battery" op="&lt;" var2="101" />
 				</conditions>
 				<text>Battery: %tw_battery%</text>
 			</object>
@@ -399,21 +399,21 @@
 				<layout1>
 					<keysize height="179" width="120" />
 					<row1 key01="q" long01="1" key02="w" long02="2" key03="e" long03="3" key04="r" long04="4" key05="t" long05="5" key06="y" long06="6" key07="u" long07="7" key08="i" long08="8" key09="o" long09="9" key10="p" long10="0" />
-					<row2 key01="180:a" long01="@" key02="s" long02="#" key03="d" long03="$" key04="f" long04="%" key05="g" long05="&" key06="h" long06="*" key07="j" long07="-" key08="k" long08="+" key09="162:l" long09="_" />
+					<row2 key01="180:a" long01="@" key02="s" long02="#" key03="d" long03="$" key04="f" long04="%" key05="g" long05="&amp;" key06="h" long06="*" key07="j" long07="-" key08="k" long08="+" key09="162:l" long09="_" />
 					<row3 key01="180:layout2" key02="z" long02="!" key03="x" key04="c" long04="'" key05="v" long05=":" key06="b" long06=";" key07="n" long07="/" key08="m" long08="?" key09="182:c:8" />
 					<row4 key01="180:layout3" key02="120:c:47" key03="600: " key04="." key05="180:action" />
 				</layout1>
 				<layout2>
 					<keysize height="179" width="120" capslock="0" revert_layout="1" />
 					<row1 key01="Q" long01="1" key02="W" long02="2" key03="E" long03="3" key04="R" long04="4" key05="T" long05="5" key06="Y" long06="6" key07="U" long07="7" key08="I" long08="8" key09="O" long09="9" key10="P" long10="0" />
-					<row2 key01="180:A" long01="@" key02="S" long02="#" key03="D" long03="$" key04="F" long04="%" key05="G" long05="&" key06="H" long06="*" key07="J" long07="-" key08="K" long08="+" key09="162:L" long09="_" />
+					<row2 key01="180:A" long01="@" key02="S" long02="#" key03="D" long03="$" key04="F" long04="%" key05="G" long05="&amp;" key06="H" long06="*" key07="J" long07="-" key08="K" long08="+" key09="162:L" long09="_" />
 					<row3 key01="180:layout1" key02="Z" long02="!" key03="X" key04="C" long04="'" key05="V" long05=":" key06="B" long06=";" key07="N" long07="/" key08="M" long08="?" key09="180:c:8" />
 					<row4 key01="180:layout3" key02="120:c:47" key03="600: " key04="." key05="180:action" />
 				</layout2>
 				<layout3>
 					<keysize height="179" width="120" />
 					<row1 key01="1" key02="2" key03="3" key04="4" key05="5" key06="6" key07="7" key08="8" key09="9" key10="0" />
-					<row2 key01="@" key02="#" key03="$" key04="%" key05="&" key06="*" key07="-" key08="+" key09="(" key10=")" />
+					<row2 key01="@" key02="#" key03="$" key04="%" key05="&amp;" key06="*" key07="-" key08="+" key09="(" key10=")" />
 					<row3 key01="180:layout4" key02="!" key03="120:c:34" key04="'" key05=":" key06=";" key07="/" key08="?" key09="180:c:8" />
 					<row4 key01="180:layout1" key02="," key03="600: " key04="." key05="180:action" />
 				</layout3>
@@ -421,7 +421,7 @@
 					<keysize height="179" width="120" />
 					<row1 key01="~" key02="`" key03="|" key04="120:" key05="120:" key06="120:" key07="%" key08="120:" key09="{" key10="}" />
 					<row2 key01="120:" key02="120:" key03="120:" key04="120:" key05="120:" key06="^" key07="_" key08="=" key09="[" key10="]" />
-					<row3 key01="180:layout3" key02="120:" key03="120:" key04="120:" key05="120:" key06="\" key07="<" key08=">" key09="180:c:8" />
+					<row3 key01="180:layout3" key02="120:" key03="120:" key04="120:" key05="120:" key06="\" key07="&lt;" key08="&gt;" key09="180:c:8" />
 					<row4 key01="180:layout1" key02="120:c:34" key03="600: " key04="." key05="180:action" />
 				</layout4>
 			</object>
diff --git a/gui/devices/1280x800/res/ui.xml b/gui/devices/1280x800/res/ui.xml
index ddcdb3f64..cb4bcb217 100644
--- a/gui/devices/1280x800/res/ui.xml
+++ b/gui/devices/1280x800/res/ui.xml
@@ -242,8 +242,8 @@
 				<placement x="250" y="30" />
 				<conditions>
 					<condition var1="tw_no_battery_percent" var2="0" />
-					<condition var1="tw_battery" op=">" var2="0" />
-					<condition var1="tw_battery" op="<" var2="101" />
+					<condition var1="tw_battery" op="&gt;" var2="0" />
+					<condition var1="tw_battery" op="&lt;" var2="101" />
 				</conditions>
 				<text>Battery Level: %tw_battery%</text>
 			</object>
@@ -424,8 +424,8 @@
 				<layout3>
 					<keysize height="90" width="106" />
 					<row1 key01="102:" key02="1" key03="2" key04="3" key05="4" key06="5" key07="6" key08="7" key09="8" key10="9" key11="0" key12="118:c:8" />
-					<row2 key01="142:layout1" key02="104:#" key03="104:$" key04="104:%" key05="104:&" key06="104:*" key07="104:-" key08="104:+" key09="104:(" key10="104:)" key11="202:action" />
-					<row3 key01="176:layout4" key02="103:<" key03="103:>" key04="103:=" key05="103:'" key06="103:;" key07="103:," key08="103:." key09="103:!" key10="103:?" key11="177:layout4" />
+					<row2 key01="142:layout1" key02="104:#" key03="104:$" key04="104:%" key05="104:&amp;" key06="104:*" key07="104:-" key08="104:+" key09="104:(" key10="104:)" key11="202:action" />
+					<row3 key01="176:layout4" key02="103:&lt;" key03="103:&gt;" key04="103:=" key05="103:'" key06="103:;" key07="103:," key08="103:." key09="103:!" key10="103:?" key11="177:layout4" />
 					<row4 key01="190:" key02="/" key03="104:@" key04="480: " key05="102:c:34" key06="_" />
 				</layout3>
 				<layout4>
diff --git a/gui/devices/1440x2560/res/ui.xml b/gui/devices/1440x2560/res/ui.xml
index 35bd4c624..35566e7ae 100644
--- a/gui/devices/1440x2560/res/ui.xml
+++ b/gui/devices/1440x2560/res/ui.xml
@@ -241,8 +241,8 @@
 				<placement x="489" y="132" />
 				<conditions>
 					<condition var1="tw_no_battery_percent" var2="0" />
-					<condition var1="tw_battery" op=">" var2="0" />
-					<condition var1="tw_battery" op="<" var2="101" />
+					<condition var1="tw_battery" op="&gt;" var2="0" />
+					<condition var1="tw_battery" op="&lt;" var2="101" />
 				</conditions>
 				<text>Battery: %tw_battery%</text>
 			</object>
@@ -396,21 +396,21 @@
 				<layout1>
 					<keysize height="215" width="144" />
 					<row1 key01="q" long01="1" key02="w" long02="2" key03="e" long03="3" key04="r" long04="4" key05="t" long05="5" key06="y" long06="6" key07="u" long07="7" key08="i" long08="8" key09="o" long09="9" key10="p" long10="0" />
-					<row2 key01="216:a" long01="@" key02="s" long02="#" key03="d" long03="$" key04="f" long04="%" key05="g" long05="&" key06="h" long06="*" key07="j" long07="-" key08="k" long08="+" key09="216:l" long09="_" />
+					<row2 key01="216:a" long01="@" key02="s" long02="#" key03="d" long03="$" key04="f" long04="%" key05="g" long05="&amp;" key06="h" long06="*" key07="j" long07="-" key08="k" long08="+" key09="216:l" long09="_" />
 					<row3 key01="216:layout2" key02="z" long02="!" key03="x" key04="c" long04="'" key05="v" long05=":" key06="b" long06=";" key07="n" long07="/" key08="m" long08="?" key09="216:c:8" />
 					<row4 key01="216:layout3" key02="/" key03="720: " key04="." key05="216:action" />
 				</layout1>
 				<layout2>
 					<keysize height="214" width="144" capslock="0" revert_layout="1" />
 					<row1 key01="Q" long01="1" key02="W" long02="2" key03="E" long03="3" key04="R" long04="4" key05="T" long05="5" key06="Y" long06="6" key07="U" long07="7" key08="I" long08="8" key09="O" long09="9" key10="P" long10="0" />
-					<row2 key01="216:A" long01="@" key02="S" long02="#" key03="D" long03="$" key04="F" long04="%" key05="G" long05="&" key06="H" long06="*" key07="J" long07="-" key08="K" long08="+" key09="216:L" long09="_" />
+					<row2 key01="216:A" long01="@" key02="S" long02="#" key03="D" long03="$" key04="F" long04="%" key05="G" long05="&amp;" key06="H" long06="*" key07="J" long07="-" key08="K" long08="+" key09="216:L" long09="_" />
 					<row3 key01="216:layout1" key02="Z" long02="!" key03="X" key04="C" long04="'" key05="V" long05=":" key06="B" long06=";" key07="N" long07="/" key08="M" long08="?" key09="216:c:8" />
 					<row4 key01="216:layout3" key02="/" key03="720: " key04="." key05="216:action" />
 				</layout2>
 				<layout3>
 					<keysize height="215" width="144" />
 					<row1 key01="1" key02="2" key03="3" key04="4" key05="5" key06="6" key07="7" key08="8" key09="9" key10="0" />
-					<row2 key01="@" key02="#" key03="$" key04="%" key05="&" key06="*" key07="-" key08="+" key09="(" key10=")" />
+					<row2 key01="@" key02="#" key03="$" key04="%" key05="&amp;" key06="*" key07="-" key08="+" key09="(" key10=")" />
 					<row3 key01="216:layout4" key02="!" key03="144:c:34" key04="'" key05=":" key06=";" key07="/" key08="?" key09="216:c:8" />
 					<row4 key01="216:layout1" key02="," key03="720: " key04="." key05="216:action" />
 				</layout3>
@@ -418,7 +418,7 @@
 					<keysize height="214" width="144" />
 					<row1 key01="~" key02="`" key03="|" key04="144:" key05="144:" key06="144:" key07="144:" key08="144:" key09="{" key10="}" />
 					<row2 key01="144:" key02="144:" key03="144:" key04="144:" key05="144:" key06="^" key07="_" key08="=" key09="[" key10="]" />
-					<row3 key01="216:layout3" key02="144:" key03="144:" key04="144:" key05="144:" key06="\" key07="<" key08=">" key09="216:c:8" />
+					<row3 key01="216:layout3" key02="144:" key03="144:" key04="144:" key05="144:" key06="\" key07="&lt;" key08="&gt;" key09="216:c:8" />
 					<row4 key01="216:layout1" key02="144:c:34" key03="720: " key04="." key05="216:action" />
 				</layout4>
 			</object>
diff --git a/gui/devices/1600x2560/res/ui.xml b/gui/devices/1600x2560/res/ui.xml
index 8c35ef8a8..404e6f123 100644
--- a/gui/devices/1600x2560/res/ui.xml
+++ b/gui/devices/1600x2560/res/ui.xml
@@ -244,8 +244,8 @@
 				<placement x="650" y="132" />
 				<conditions>
 					<condition var1="tw_no_battery_percent" var2="0" />
-					<condition var1="tw_battery" op=">" var2="0" />
-					<condition var1="tw_battery" op="<" var2="101" />
+					<condition var1="tw_battery" op="&gt;" var2="0" />
+					<condition var1="tw_battery" op="&lt;" var2="101" />
 				</conditions>
 				<text>Battery Level: %tw_battery%</text>
 			</object>
@@ -394,21 +394,21 @@
 				<layout1>
 					<keysize height="238" width="160" />
 					<row1 key01="q" long01="1" key02="w" long02="2" key03="e" long03="3" key04="r" long04="4" key05="t" long05="5" key06="y" long06="6" key07="u" long07="7" key08="i" long08="8" key09="o" long09="9" key10="p" long10="0" />
-					<row2 key01="238:a" long01="@" key02="s" long02="#" key03="d" long03="$" key04="f" long04="%" key05="g" long05="&" key06="h" long06="*" key07="j" long07="-" key08="k" long08="+" key09="162:l" long09="_" />
+					<row2 key01="238:a" long01="@" key02="s" long02="#" key03="d" long03="$" key04="f" long04="%" key05="g" long05="&amp;" key06="h" long06="*" key07="j" long07="-" key08="k" long08="+" key09="162:l" long09="_" />
 					<row3 key01="238:layout2" key02="z" long02="!" key03="x" key04="c" long04="'" key05="v" long05=":" key06="b" long06=";" key07="n" long07="/" key08="m" long08="?" key09="238:c:8" />
 					<row4 key01="238:layout3" key02="160:c:47" key03="800: " key04="." key05="238:action" />
 				</layout1>
 				<layout2>
 					<keysize height="238" width="160" capslock="0" revert_layout="1" />
 					<row1 key01="Q" long01="1" key02="W" long02="2" key03="E" long03="3" key04="R" long04="4" key05="T" long05="5" key06="Y" long06="6" key07="U" long07="7" key08="I" long08="8" key09="O" long09="9" key10="P" long10="0" />
-					<row2 key01="238:A" long01="@" key02="S" long02="#" key03="D" long03="$" key04="F" long04="%" key05="G" long05="&" key06="H" long06="*" key07="J" long07="-" key08="K" long08="+" key09="162:L" long09="_" />
+					<row2 key01="238:A" long01="@" key02="S" long02="#" key03="D" long03="$" key04="F" long04="%" key05="G" long05="&amp;" key06="H" long06="*" key07="J" long07="-" key08="K" long08="+" key09="162:L" long09="_" />
 					<row3 key01="238:layout1" key02="Z" long02="!" key03="X" key04="C" long04="'" key05="V" long05=":" key06="B" long06=";" key07="N" long07="/" key08="M" long08="?" key09="238:c:8" />
 					<row4 key01="238:layout3" key02="160:c:47" key03="800: " key04="." key05="238:action" />
 				</layout2>
 				<layout3>
 					<keysize height="238" width="160" />
 					<row1 key01="1" key02="2" key03="3" key04="4" key05="5" key06="6" key07="7" key08="8" key09="9" key10="0" />
-					<row2 key01="@" key02="#" key03="$" key04="%" key05="&" key06="*" key07="-" key08="+" key09="(" key10=")" />
+					<row2 key01="@" key02="#" key03="$" key04="%" key05="&amp;" key06="*" key07="-" key08="+" key09="(" key10=")" />
 					<row3 key01="238:layout4" key02="!" key03="160:c:34" key04="'" key05=":" key06=";" key07="/" key08="?" key09="238:c:8" />
 					<row4 key01="238:layout1" key02="," key03="800: " key04="." key05="238:action" />
 				</layout3>
@@ -416,7 +416,7 @@
 					<keysize height="238" width="160" />
 					<row1 key01="~" key02="`" key03="|" key04="160:" key05="160:" key06="160:" key07="%" key08="160:" key09="{" key10="}" />
 					<row2 key01="160:" key02="160:" key03="160:" key04="160:" key05="160:" key06="^" key07="_" key08="=" key09="[" key10="]" />
-					<row3 key01="238:layout3" key02="160:" key03="160:" key04="160:" key05="160:" key06="\" key07="<" key08=">" key09="238:c:8" />
+					<row3 key01="238:layout3" key02="160:" key03="160:" key04="160:" key05="160:" key06="\" key07="&lt;" key08="&gt;" key09="238:c:8" />
 					<row4 key01="238:layout1" key02="160:c:34" key03="800: " key04="." key05="238:action" />
 				</layout4>
 			</object>
diff --git a/gui/devices/1920x1200/res/ui.xml b/gui/devices/1920x1200/res/ui.xml
index 2407905bf..58ef573a9 100644
--- a/gui/devices/1920x1200/res/ui.xml
+++ b/gui/devices/1920x1200/res/ui.xml
@@ -242,8 +242,8 @@
 				<placement x="250" y="40" />
 				<conditions>
 					<condition var1="tw_no_battery_percent" var2="0" />
-					<condition var1="tw_battery" op=">" var2="0" />
-					<condition var1="tw_battery" op="<" var2="101" />
+					<condition var1="tw_battery" op="&gt;" var2="0" />
+					<condition var1="tw_battery" op="&lt;" var2="101" />
 				</conditions>
 				<text>Battery Level: %tw_battery%</text>
 			</object>
@@ -424,8 +424,8 @@
 				<layout3>
 					<keysize height="129" width="159" />
 					<row1 key01="153:" key02="1" key03="2" key04="3" key05="4" key06="5" key07="6" key08="7" key09="8" key10="9" key11="0" key12="177:c:8" />
-					<row2 key01="213:layout1" key02="156:#" key03="156:$" key04="156:%" key05="156:&" key06="156:*" key07="156:-" key08="156:+" key09="156:(" key10="156:)" key11="303:action" />
-					<row3 key01="269:layout4" key02="154:<" key03="154:>" key04="154:=" key05="154:'" key06="154:;" key07="154:," key08="154:." key09="154:!" key10="154:?" key11="265:layout4" />
+					<row2 key01="213:layout1" key02="156:#" key03="156:$" key04="156:%" key05="156:&amp;" key06="156:*" key07="156:-" key08="156:+" key09="156:(" key10="156:)" key11="303:action" />
+					<row3 key01="269:layout4" key02="154:&lt;" key03="154:&gt;" key04="154:=" key05="154:'" key06="154:;" key07="154:," key08="154:." key09="154:!" key10="154:?" key11="265:layout4" />
 					<row4 key01="282:" key02="/" key03="@" key04="720: " key05="159:c:34" key06="_" />
 				</layout3>
 				<layout4>
diff --git a/gui/devices/240x240/res/ui.xml b/gui/devices/240x240/res/ui.xml
index 9c3037354..2e88fe29e 100644
--- a/gui/devices/240x240/res/ui.xml
+++ b/gui/devices/240x240/res/ui.xml
@@ -236,8 +236,8 @@
 				<placement x="236" y="3" placement="1" />
 				<conditions>
 					<condition var1="tw_no_battery_percent" var2="0" />
-					<condition var1="tw_battery" op=">" var2="0" />
-					<condition var1="tw_battery" op="<" var2="101" />
+					<condition var1="tw_battery" op="&gt;" var2="0" />
+					<condition var1="tw_battery" op="&lt;" var2="101" />
 				</conditions>
 				<text>%tw_battery%</text>
 			</object>
@@ -401,7 +401,7 @@
 				<layout3>
 					<keysize height="32" width="24" />
 					<row1 key01="1" key02="2" key03="3" key04="4" key05="5" key06="6" key07="7" key08="8" key09="9" key10="0" />
-					<row2 key01="@" key02="#" key03="$" key04="%" key05="&" key06="*" key07="-" key08="+" key09="(" key10=")" />
+					<row2 key01="@" key02="#" key03="$" key04="%" key05="&amp;" key06="*" key07="-" key08="+" key09="(" key10=")" />
 					<row3 key01="36:layout4" key02="!" key03="24:c:34" key04="'" key05=":" key06=";" key07="/" key08="?" key09="36:c:8" />
 					<row4 key01="36:layout1" key02="24:," key03="120: " key04="24:." key05="36:action" />
 				</layout3>
@@ -409,7 +409,7 @@
 					<keysize height="32" width="24" />
 					<row1 key01="~" key02="`" key03="|" key04="24:" key05="24:" key06="24:" key07="%" key08="24:" key09="{" key10="}" />
 					<row2 key01="24:" key02="24:" key03="24:" key04="24:" key05="24:" key06="^" key07="_" key08="=" key09="[" key10="]" />
-					<row3 key01="36:layout3" key02="24:" key03="24:" key04="24:" key05="24:" key06="\" key07="<" key08=">" key09="36:c:8" />
+					<row3 key01="36:layout3" key02="24:" key03="24:" key04="24:" key05="24:" key06="\" key07="&lt;" key08="&gt;" key09="36:c:8" />
 					<row4 key01="36:layout1" key02="24:c:34" key03="120: " key04="24:." key05="36:action" />
 				</layout4>
 			</object>
diff --git a/gui/devices/2560x1600/res/ui.xml b/gui/devices/2560x1600/res/ui.xml
index 8f699ee28..58cede1bb 100644
--- a/gui/devices/2560x1600/res/ui.xml
+++ b/gui/devices/2560x1600/res/ui.xml
@@ -242,8 +242,8 @@
 				<placement x="400" y="55" />
 				<conditions>
 					<condition var1="tw_no_battery_percent" var2="0" />
-					<condition var1="tw_battery" op=">" var2="0" />
-					<condition var1="tw_battery" op="<" var2="101" />
+					<condition var1="tw_battery" op="&gt;" var2="0" />
+					<condition var1="tw_battery" op="&lt;" var2="101" />
 				</conditions>
 				<text>Battery Level: %tw_battery%</text>
 			</object>
@@ -424,8 +424,8 @@
 				<layout3>
 					<keysize height="172" width="212" />
 					<row1 key01="204:" key02="1" key03="2" key04="3" key05="4" key06="5" key07="6" key08="7" key09="8" key10="9" key11="0" key12="236:c:8" />
-					<row2 key01="286:layout1" key02="208:#" key03="208:$" key04="208:%" key05="208:&" key06="208:*" key07="208:-" key08="208:+" key09="208:(" key10="208:)" key11="402:action" />
-					<row3 key01="354:layout4" key02="206:<" key03="206:>" key04="206:=" key05="206:'" key06="206:;" key07="206:," key08="206:." key09="206:!" key10="206:?" key11="352:layout4" />
+					<row2 key01="286:layout1" key02="208:#" key03="208:$" key04="208:%" key05="208:&amp;" key06="208:*" key07="208:-" key08="208:+" key09="208:(" key10="208:)" key11="402:action" />
+					<row3 key01="354:layout4" key02="206:&lt;" key03="206:&gt;" key04="206:=" key05="206:'" key06="206:;" key07="206:," key08="206:." key09="206:!" key10="206:?" key11="352:layout4" />
 					<row4 key01="354:" key02="206:/" key03="206:@" key04="1030: " key05="206:c:34" key06="206:_" />
 				</layout3>
 				<layout4>
diff --git a/gui/devices/280x280/res/ui.xml b/gui/devices/280x280/res/ui.xml
index 5eaf1a9a7..2bab4b67e 100644
--- a/gui/devices/280x280/res/ui.xml
+++ b/gui/devices/280x280/res/ui.xml
@@ -236,8 +236,8 @@
 				<placement x="277" y="3" placement="1" />
 				<conditions>
 					<condition var1="tw_no_battery_percent" var2="0" />
-					<condition var1="tw_battery" op=">" var2="0" />
-					<condition var1="tw_battery" op="<" var2="101" />
+					<condition var1="tw_battery" op="&gt;" var2="0" />
+					<condition var1="tw_battery" op="&lt;" var2="101" />
 				</conditions>
 				<text>%tw_battery%</text>
 			</object>
@@ -401,7 +401,7 @@
 				<layout3>
 					<keysize height="32" width="28" />
 					<row1 key01="1" key02="2" key03="3" key04="4" key05="5" key06="6" key07="7" key08="8" key09="9" key10="0" />
-					<row2 key01="@" key02="#" key03="$" key04="%" key05="&" key06="*" key07="-" key08="+" key09="(" key10=")" />
+					<row2 key01="@" key02="#" key03="$" key04="%" key05="&amp;" key06="*" key07="-" key08="+" key09="(" key10=")" />
 					<row3 key01="42:layout4" key02="!" key03="28:c:34" key04="'" key05=":" key06=";" key07="/" key08="?" key09="42:c:8" />
 					<row4 key01="42:layout1" key02="28:," key03="140: " key04="28:." key05="42:action" />
 				</layout3>
@@ -409,7 +409,7 @@
 					<keysize height="32" width="28" />
 					<row1 key01="~" key02="`" key03="|" key04="28:" key05="28:" key06="28:" key07="%" key08="28:" key09="{" key10="}" />
 					<row2 key01="28:" key02="28:" key03="28:" key04="28:" key05="28:" key06="^" key07="_" key08="=" key09="[" key10="]" />
-					<row3 key01="42:layout3" key02="28:" key03="28:" key04="28:" key05="28:" key06="\" key07="<" key08=">" key09="42:c:8" />
+					<row3 key01="42:layout3" key02="28:" key03="28:" key04="28:" key05="28:" key06="\" key07="&lt;" key08="&gt;" key09="42:c:8" />
 					<row4 key01="42:layout1" key02="28:c:34" key03="140: " key04="28:." key05="42:action" />
 				</layout4>
 			</object>
diff --git a/gui/devices/320x320/res/ui.xml b/gui/devices/320x320/res/ui.xml
index 69d9cbd61..f2c8ec8a1 100644
--- a/gui/devices/320x320/res/ui.xml
+++ b/gui/devices/320x320/res/ui.xml
@@ -236,8 +236,8 @@
 				<placement x="316" y="3" placement="1" />
 				<conditions>
 					<condition var1="tw_no_battery_percent" var2="0" />
-					<condition var1="tw_battery" op=">" var2="0" />
-					<condition var1="tw_battery" op="<" var2="101" />
+					<condition var1="tw_battery" op="&gt;" var2="0" />
+					<condition var1="tw_battery" op="&lt;" var2="101" />
 				</conditions>
 				<text>%tw_battery%</text>
 			</object>
@@ -401,7 +401,7 @@
 				<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="&" key06="*" key07="-" key08="+" key09="(" key10=")" />
+					<row2 key01="@" key02="#" key03="$" key04="%" key05="&amp;" key06="*" key07="-" key08="+" key09="(" key10=")" />
 					<row3 key01="48:layout4" key02="!" key03="32:c:34" key04="'" key05=":" key06=";" key07="/" key08="?" key09="48:c:8" />
 					<row4 key01="48:layout1" key02="32:," key03="160: " key04="32:." key05="48:action" />
 				</layout3>
@@ -409,7 +409,7 @@
 					<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="<" key08=">" key09="48:c:8" />
+					<row3 key01="48:layout3" key02="32:" key03="32:" key04="32:" key05="32:" key06="\" key07="&lt;" key08="&gt;" key09="48:c:8" />
 					<row4 key01="48:layout1" key02="32:c:34" key03="160: " key04="32:." key05="48:action" />
 				</layout4>
 			</object>
diff --git a/gui/devices/320x480/res/ui.xml b/gui/devices/320x480/res/ui.xml
index de2c13632..019c9ca04 100644
--- a/gui/devices/320x480/res/ui.xml
+++ b/gui/devices/320x480/res/ui.xml
@@ -236,8 +236,8 @@
 				<placement x="135" y="39" />
 				<conditions>
 					<condition var1="tw_no_battery_percent" var2="0" />
-					<condition var1="tw_battery" op=">" var2="0" />
-					<condition var1="tw_battery" op="<" var2="101" />
+					<condition var1="tw_battery" op="&gt;" var2="0" />
+					<condition var1="tw_battery" op="&lt;" var2="101" />
 				</conditions>
 				<text>Battery: %tw_battery%</text>
 			</object>
@@ -397,7 +397,7 @@
 				<layout3>
 					<keysize height="52" width="32" />
 					<row1 key01="1" key02="2" key03="3" key04="4" key05="5" key06="6" key07="7" key08="8" key09="9" key10="0" />
-					<row2 key01="@" key02="#" key03="$" key04="%" key05="&" key06="*" key07="-" key08="+" key09="(" key10=")" />
+					<row2 key01="@" key02="#" key03="$" key04="%" key05="&amp;" key06="*" key07="-" key08="+" key09="(" key10=")" />
 					<row3 key01="48:layout4" key02="!" key03="32:c:34" key04="'" key05=":" key06=";" key07="/" key08="?" key09="48:c:8" />
 					<row4 key01="48:layout1" key02="32:," key03="160: " key04="32:." key05="48:action" />
 				</layout3>
@@ -405,7 +405,7 @@
 					<keysize height="52" width="32" />
 					<row1 key01="~" key02="`" key03="|" key04="32:" key05="32:" key06="32:" key07="%" key08="32:" key09="{" key10="}" />
 					<row2 key01="32:" key02="32:" key03="32:" key04="32:" key05="32:" key06="^" key07="_" key08="=" key09="[" key10="]" />
-					<row3 key01="48:layout3" key02="32:" key03="32:" key04="32:" key05="32:" key06="\" key07="<" key08=">" key09="48:c:8" />
+					<row3 key01="48:layout3" key02="32:" key03="32:" key04="32:" key05="32:" key06="\" key07="&lt;" key08="&gt;" key09="48:c:8" />
 					<row4 key01="48:layout1" key02="32:c:34" key03="160: " key04="32:." key05="48:action" />
 				</layout4>
 			</object>
diff --git a/gui/devices/480x800/res/ui.xml b/gui/devices/480x800/res/ui.xml
index b1880bad6..0f2dd448d 100644
--- a/gui/devices/480x800/res/ui.xml
+++ b/gui/devices/480x800/res/ui.xml
@@ -236,8 +236,8 @@
 				<placement x="190" y="70" />
 				<conditions>
 					<condition var1="tw_no_battery_percent" var2="0" />
-					<condition var1="tw_battery" op=">" var2="0" />
-					<condition var1="tw_battery" op="<" var2="101" />
+					<condition var1="tw_battery" op="&gt;" var2="0" />
+					<condition var1="tw_battery" op="&lt;" var2="101" />
 				</conditions>
 				<text>Battery: %tw_battery%</text>
 			</object>
@@ -397,7 +397,7 @@
 				<layout3>
 					<keysize height="78" width="48" />
 					<row1 key01="1" key02="2" key03="3" key04="4" key05="5" key06="6" key07="7" key08="8" key09="9" key10="0" />
-					<row2 key01="@" key02="#" key03="$" key04="%" key05="&" key06="*" key07="-" key08="+" key09="(" key10=")" />
+					<row2 key01="@" key02="#" key03="$" key04="%" key05="&amp;" key06="*" key07="-" key08="+" key09="(" key10=")" />
 					<row3 key01="72:layout4" key02="!" key03="48:c:34" key04="'" key05=":" key06=";" key07="/" key08="?" key09="72:c:8" />
 					<row4 key01="72:layout1" key02="48:," key03="240: " key04="48:." key05="72:action" />
 				</layout3>
@@ -405,7 +405,7 @@
 					<keysize height="78" width="48" />
 					<row1 key01="~" key02="`" key03="|" key04="48:" key05="48:" key06="48:" key07="%" key08="48:" key09="{" key10="}" />
 					<row2 key01="48:" key02="48:" key03="48:" key04="48:" key05="48:" key06="^" key07="_" key08="=" key09="[" key10="]" />
-					<row3 key01="72:layout3" key02="48:" key03="48:" key04="48:" key05="48:" key06="\" key07="<" key08=">" key09="72:c:8" />
+					<row3 key01="72:layout3" key02="48:" key03="48:" key04="48:" key05="48:" key06="\" key07="&lt;" key08="&gt;" key09="72:c:8" />
 					<row4 key01="72:layout1" key02="48:c:34" key03="240: " key04="48:." key05="72:action" />
 				</layout4>
 			</object>
diff --git a/gui/devices/480x854/res/ui.xml b/gui/devices/480x854/res/ui.xml
index 52a9f4b19..ccce3329f 100644
--- a/gui/devices/480x854/res/ui.xml
+++ b/gui/devices/480x854/res/ui.xml
@@ -236,8 +236,8 @@
 				<placement x="190" y="70" />
 				<conditions>
 					<condition var1="tw_no_battery_percent" var2="0" />
-					<condition var1="tw_battery" op=">" var2="0" />
-					<condition var1="tw_battery" op="<" var2="101" />
+					<condition var1="tw_battery" op="&gt;" var2="0" />
+					<condition var1="tw_battery" op="&lt;" var2="101" />
 				</conditions>
 				<text>Battery: %tw_battery%</text>
 			</object>
@@ -397,7 +397,7 @@
 				<layout3>
 					<keysize height="78" width="48" />
 					<row1 key01="1" key02="2" key03="3" key04="4" key05="5" key06="6" key07="7" key08="8" key09="9" key10="0" />
-					<row2 key01="@" key02="#" key03="$" key04="%" key05="&" key06="*" key07="-" key08="+" key09="(" key10=")" />
+					<row2 key01="@" key02="#" key03="$" key04="%" key05="&amp;" key06="*" key07="-" key08="+" key09="(" key10=")" />
 					<row3 key01="72:layout4" key02="!" key03="48:c:34" key04="'" key05=":" key06=";" key07="/" key08="?" key09="72:c:8" />
 					<row4 key01="72:layout1" key02="48:," key03="240: " key04="48:." key05="72:action" />
 				</layout3>
@@ -405,7 +405,7 @@
 					<keysize height="78" width="48" />
 					<row1 key01="~" key02="`" key03="|" key04="48:" key05="48:" key06="48:" key07="%" key08="48:" key09="{" key10="}" />
 					<row2 key01="48:" key02="48:" key03="48:" key04="48:" key05="48:" key06="^" key07="_" key08="=" key09="[" key10="]" />
-					<row3 key01="72:layout3" key02="48:" key03="48:" key04="48:" key05="48:" key06="\" key07="<" key08=">" key09="72:c:8" />
+					<row3 key01="72:layout3" key02="48:" key03="48:" key04="48:" key05="48:" key06="\" key07="&lt;" key08="&gt;" key09="72:c:8" />
 					<row4 key01="72:layout1" key02="48:c:34" key03="240: " key04="48:." key05="72:action" />
 				</layout4>
 			</object>
diff --git a/gui/devices/540x960/res/ui.xml b/gui/devices/540x960/res/ui.xml
index 5abe640ec..673d81040 100644
--- a/gui/devices/540x960/res/ui.xml
+++ b/gui/devices/540x960/res/ui.xml
@@ -236,8 +236,8 @@
 				<placement x="200" y="70" />
 				<conditions>
 					<condition var1="tw_no_battery_percent" var2="0" />
-					<condition var1="tw_battery" op=">" var2="0" />
-					<condition var1="tw_battery" op="<" var2="101" />
+					<condition var1="tw_battery" op="&gt;" var2="0" />
+					<condition var1="tw_battery" op="&lt;" var2="101" />
 				</conditions>
 				<text>Battery: %tw_battery%</text>
 			</object>
@@ -397,7 +397,7 @@
 				<layout3>
 					<keysize height="78" width="54" />
 					<row1 key01="1" key02="2" key03="3" key04="4" key05="5" key06="6" key07="7" key08="8" key09="9" key10="0" />
-					<row2 key01="@" key02="#" key03="$" key04="%" key05="&" key06="*" key07="-" key08="+" key09="(" key10=")" />
+					<row2 key01="@" key02="#" key03="$" key04="%" key05="&amp;" key06="*" key07="-" key08="+" key09="(" key10=")" />
 					<row3 key01="81:layout4" key02="!" key03="54:c:34" key04="'" key05=":" key06=";" key07="/" key08="?" key09="81:c:8" />
 					<row4 key01="81:layout1" key02="54:," key03="270: " key04="54:." key05="81:action" />
 				</layout3>
@@ -405,7 +405,7 @@
 					<keysize height="78" width="54" />
 					<row1 key01="~" key02="`" key03="|" key04="54:" key05="54:" key06="54:" key07="%" key08="54:" key09="{" key10="}" />
 					<row2 key01="54:" key02="54:" key03="54:" key04="54:" key05="54:" key06="^" key07="_" key08="=" key09="[" key10="]" />
-					<row3 key01="81:layout3" key02="54:" key03="54:" key04="54:" key05="54:" key06="\" key07="<" key08=">" key09="81:c:8" />
+					<row3 key01="81:layout3" key02="54:" key03="54:" key04="54:" key05="54:" key06="\" key07="&lt;" key08="&gt;" key09="81:c:8" />
 					<row4 key01="81:layout1" key02="54:c:34" key03="270: " key04="54:." key05="81:action" />
 				</layout4>
 			</object>
diff --git a/gui/devices/720x1280/res/ui.xml b/gui/devices/720x1280/res/ui.xml
index 714ca4c61..032db3778 100644
--- a/gui/devices/720x1280/res/ui.xml
+++ b/gui/devices/720x1280/res/ui.xml
@@ -241,8 +241,8 @@
 				<placement x="270" y="76" />
 				<conditions>
 					<condition var1="tw_no_battery_percent" var2="0" />
-					<condition var1="tw_battery" op=">" var2="0" />
-					<condition var1="tw_battery" op="<" var2="101" />
+					<condition var1="tw_battery" op="&gt;" var2="0" />
+					<condition var1="tw_battery" op="&lt;" var2="101" />
 				</conditions>
 				<text>Battery: %tw_battery%</text>
 			</object>
@@ -410,7 +410,7 @@
 				<layout3>
 					<keysize height="106" width="72" />
 					<row1 key01="1" key02="2" key03="3" key04="4" key05="5" key06="6" key07="7" key08="8" key09="9" key10="0" />
-					<row2 key01="@" key02="#" key03="$" key04="%" key05="&" key06="*" key07="-" key08="+" key09="(" key10=")" />
+					<row2 key01="@" key02="#" key03="$" key04="%" key05="&amp;" key06="*" key07="-" key08="+" key09="(" key10=")" />
 					<row3 key01="108:layout4" key02="!" key03="72:c:34" key04="'" key05=":" key06=";" key07="/" key08="?" key09="108:c:8" />
 					<row4 key01="100:layout1" key02="65:" key03="65:," key04="260: " key05="65:." key06="165:action" />
 				</layout3>
@@ -418,7 +418,7 @@
 					<keysize height="106" width="72" />
 					<row1 key01="~" key02="`" key03="|" key04="72:" key05="72:" key06="72:" key07="%" key08="72:" key09="{" key10="}" />
 					<row2 key01="72:" key02="72:" key03="72:" key04="72:" key05="72:" key06="^" key07="_" key08="=" key09="[" key10="]" />
-					<row3 key01="108:layout3" key02="72:" key03="72:" key04="72:" key05="72:" key06="\" key07="<" key08=">" key09="108:c:8" />
+					<row3 key01="108:layout3" key02="72:" key03="72:" key04="72:" key05="72:" key06="\" key07="&lt;" key08="&gt;" key09="108:c:8" />
 					<row4 key01="100:layout1" key02="65:" key03="65:c:34" key04="260: " key05="65:." key06="165:action" />
 				</layout4>
 			</object>
diff --git a/gui/devices/800x1280/res/ui.xml b/gui/devices/800x1280/res/ui.xml
index e4d8b299d..44fb4e756 100644
--- a/gui/devices/800x1280/res/ui.xml
+++ b/gui/devices/800x1280/res/ui.xml
@@ -238,8 +238,8 @@
 				<placement x="270" y="76" />
 				<conditions>
 					<condition var1="tw_no_battery_percent" var2="0" />
-					<condition var1="tw_battery" op=">" var2="0" />
-					<condition var1="tw_battery" op="<" var2="101" />
+					<condition var1="tw_battery" op="&gt;" var2="0" />
+					<condition var1="tw_battery" op="&lt;" var2="101" />
 				</conditions>
 				<text>Battery: %tw_battery%</text>
 			</object>
@@ -399,7 +399,7 @@
 				<layout3>
 					<keysize height="115" width="80" />
 					<row1 key01="1" key02="2" key03="3" key04="4" key05="5" key06="6" key07="7" key08="8" key09="9" key10="0" />
-					<row2 key01="@" key02="#" key03="$" key04="%" key05="&" key06="*" key07="-" key08="+" key09="(" key10=")" />
+					<row2 key01="@" key02="#" key03="$" key04="%" key05="&amp;" key06="*" key07="-" key08="+" key09="(" key10=")" />
 					<row3 key01="117:layout4" key02="!" key03="80:c:34" key04="'" key05=":" key06=";" key07="/" key08="?" key09="123:c:8" />
 					<row4 key01="117:layout1" key02="80:," key03="400: " key04="80:." key05="123:action" />
 				</layout3>
@@ -407,7 +407,7 @@
 					<keysize height="116" width="80" />
 					<row1 key01="~" key02="`" key03="|" key04="80:" key05="80:" key06="80:" key07="80:" key08="80:" key09="{" key10="}" />
 					<row2 key01="80:" key02="80:" key03="80:" key04="80:" key05="80:" key06="^" key07="_" key08="=" key09="[" key10="]" />
-					<row3 key01="117:layout3" key02="80:" key03="80:" key04="80:" key05="80:" key06="\" key07="<" key08=">" key09="123:c:8" />
+					<row3 key01="117:layout3" key02="80:" key03="80:" key04="80:" key05="80:" key06="\" key07="&lt;" key08="&gt;" key09="123:c:8" />
 					<row4 key01="117:layout1" key02="80:" key03="400: " key04="80:" key05="123:action" />
 				</layout4>
 			</object>
diff --git a/gui/devices/800x480/res/ui.xml b/gui/devices/800x480/res/ui.xml
index 5c9f07dfa..3c7cf183f 100644
--- a/gui/devices/800x480/res/ui.xml
+++ b/gui/devices/800x480/res/ui.xml
@@ -242,8 +242,8 @@
 				<placement x="250" y="37" />
 				<conditions>
 					<condition var1="tw_no_battery_percent" var2="0" />
-					<condition var1="tw_battery" op=">" var2="0" />
-					<condition var1="tw_battery" op="<" var2="101" />
+					<condition var1="tw_battery" op="&gt;" var2="0" />
+					<condition var1="tw_battery" op="&lt;" var2="101" />
 				</conditions>
 				<text>Battery Level: %tw_battery%</text>
 			</object>
@@ -432,8 +432,8 @@
 				<layout3>
 					<keysize height="51" width="73" />
 					<row1 key01="1" key02="2" key03="3" key04="4" key05="5" key06="6" key07="7" key08="8" key09="9" key10="0" key11="70:c:8" />
-					<row2 key01="107:#" key02="$" key03="%" key04="&" key05="*" key06="-" key07="+" key08="(" key09=")" key10="109:action" />
-					<row3 key01="79:layout4" key02="72:<" key03="72:>" key04="72:=" key05="72::" key06="72:;" key07="72:," key08="72:." key09="72:!" key10="72:?" key11="73:/" />
+					<row2 key01="107:#" key02="$" key03="%" key04="&amp;" key05="*" key06="-" key07="+" key08="(" key09=")" key10="109:action" />
+					<row3 key01="79:layout4" key02="72:&lt;" key03="72:&gt;" key04="72:=" key05="72::" key06="72:;" key07="72:," key08="72:." key09="72:!" key10="72:?" key11="73:/" />
 					<row4 key01="103:layout1" key02="72:" key03="@" key04="315: " key05="73:c:34" key06="_" />
 				</layout3>
 				<layout4>
diff --git a/gui/devices/landscape/res/landscape.xml b/gui/devices/landscape/res/landscape.xml
index c5d29966f..f6fb18993 100644
--- a/gui/devices/landscape/res/landscape.xml
+++ b/gui/devices/landscape/res/landscape.xml
@@ -367,9 +367,9 @@
 					<action function="set">tw_has_action2=1</action>
 					<action function="set">tw_action2=wipe</action>
 					<action function="set">tw_action2_param=dalvik</action>
-					<action function="set">tw_text1=Wipe Cache & Dalvik?</action>
-					<action function="set">tw_action_text1=Wiping Cache & Dalvik...</action>
-					<action function="set">tw_complete_text1=Cache & Dalvik Wipe Complete</action>
+					<action function="set">tw_text1=Wipe Cache &amp; Dalvik?</action>
+					<action function="set">tw_action_text1=Wiping Cache &amp; Dalvik...</action>
+					<action function="set">tw_complete_text1=Cache &amp; Dalvik Wipe Complete</action>
 					<action function="set">tw_slider_text=Swipe to Wipe</action>
 					<action function="page">confirm_action</action>
 				</actions>
@@ -775,12 +775,12 @@
 
 		<page name="rebootcheck">
 			<object type="action">
-				<condition var1="tw_backup_system_size" op=">=" var2="%tw_min_system%" />
+				<condition var1="tw_backup_system_size" op="&gt;=" var2="%tw_min_system%" />
 				<action function="reboot">%tw_action_param%</action>
 			</object>
 
 			<object type="action">
-				<condition var1="tw_backup_system_size" op="<" var2="%tw_min_system%" />
+				<condition var1="tw_backup_system_size" op="&lt;" var2="%tw_min_system%" />
 				<action function="page">confirm_action</action>
 			</object>
 		</page>
@@ -1247,7 +1247,7 @@
 
 			<object type="action">
 				<condition var1="tw_confirm_formatdata" op="!=" var2="yes" />
-				<action function="page">formatdata</function>
+				<action function="page">formatdata</action>
 			</object>
 		</page>
 
@@ -1655,11 +1655,11 @@
 		<page name="backupname1">
 			<object type="action">
 				<condition var1="tw_backup_name" op="=" var2="(Auto Generate)" />
-				<action function="generatebackupname"></function>
+				<action function="generatebackupname"></action>
 			</object>
 
 			<object type="action">
-				<action function="page">backupname2</function>
+				<action function="page">backupname2</action>
 			</object>
 		</page>
 
@@ -2007,7 +2007,7 @@
 				<actions>
 					<action function="set">tw_back=restore</action>
 					<action function="set">tw_action=cmd</action>
-					<action function="set">tw_action_param=cd %tw_backups_folder% && rm -rf &quot;%tw_restore_name%&quot;</action>
+					<action function="set">tw_action_param=cd %tw_backups_folder% &amp;&amp; rm -rf &quot;%tw_restore_name%&quot;</action>
 					<action function="set">tw_text1=Delete Backup? %tw_restore_name%</action>
 					<action function="set">tw_text2=This cannot be undone!</action>
 					<action function="set">tw_action_text1=Deleting Backup...</action>
@@ -2113,7 +2113,7 @@
 				<actions>
 					<action function="set">tw_back=restore</action>
 					<action function="set">tw_action=cmd</action>
-					<action function="set">tw_action_param=cd %tw_backups_folder% && rm -rf &quot;%tw_restore_name%&quot;</action>
+					<action function="set">tw_action_param=cd %tw_backups_folder% &amp;&amp; rm -rf &quot;%tw_restore_name%&quot;</action>
 					<action function="set">tw_text1=Delete Backup? %tw_restore_name%</action>
 					<action function="set">tw_text2=This cannot be undone!</action>
 					<action function="set">tw_action_text1=Deleting Backup...</action>
@@ -2157,7 +2157,7 @@
 				<actions>
 					<action function="set">tw_back=restore</action>
 					<action function="set">tw_action=cmd</action>
-					<action function="set">tw_action_param=cd %tw_backups_folder% && mv &quot;%tw_restore_name%&quot; &quot;%tw_backup_rename%&quot;</action>
+					<action function="set">tw_action_param=cd %tw_backups_folder% &amp;&amp; mv &quot;%tw_restore_name%&quot; &quot;%tw_backup_rename%&quot;</action>
 					<action function="set">tw_text1=Rename Backup?</action>
 					<action function="set">tw_text2=This cannot be undone!</action>
 					<action function="set">tw_action_text1=Renaming Backup...</action>
@@ -2875,7 +2875,7 @@
 				<placement x="%col1_x%" y="%row2_y%" />
 				<text>Copy Folder</text>
 				<actions>
-					<action function="set">tw_filemanager_command=cd &quot;%tw_file_location1%&quot; && cd .. && cp -R</action>
+					<action function="set">tw_filemanager_command=cd &quot;%tw_file_location1%&quot; &amp;&amp; cd .. &amp;&amp; cp -R</action>
 					<action function="set">tw_fm_text1=Copying</action>
 					<action function="page">choosedestinationfolder</action>
 				</actions>
@@ -2951,7 +2951,7 @@
 				<actions>
 					<action function="set">tw_filemanager_rename=tw_selection1</action>
 					<action function="set">tw_fm_text1=Renaming</action>
-					<action function="set">tw_filemanager_command=cd &quot;%tw_file_location1%&quot; && cd .. && mv</action>
+					<action function="set">tw_filemanager_command=cd &quot;%tw_file_location1%&quot; &amp;&amp; cd .. &amp;&amp; mv</action>
 					<action function="page">filemanagerrenamefolder</action>
 				</actions>
 			</object>
@@ -2974,7 +2974,7 @@
 
 			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5"/>
-				<text>Browse to Destination Folder & Press Select</text>
+				<text>Browse to Destination Folder &amp; Press Select</text>
 			</object>
 
 			<object type="fileselector">
diff --git a/gui/devices/portrait/res/portrait.xml b/gui/devices/portrait/res/portrait.xml
index 4b91c3168..369f95997 100644
--- a/gui/devices/portrait/res/portrait.xml
+++ b/gui/devices/portrait/res/portrait.xml
@@ -364,9 +364,9 @@
 					<action function="set">tw_has_action2=1</action>
 					<action function="set">tw_action2=wipe</action>
 					<action function="set">tw_action2_param=dalvik</action>
-					<action function="set">tw_text1=Wipe Cache & Dalvik?</action>
-					<action function="set">tw_action_text1=Wiping Cache & Dalvik...</action>
-					<action function="set">tw_complete_text1=Cache & Dalvik Wipe Complete</action>
+					<action function="set">tw_text1=Wipe Cache &amp; Dalvik?</action>
+					<action function="set">tw_action_text1=Wiping Cache &amp; Dalvik...</action>
+					<action function="set">tw_complete_text1=Cache &amp; Dalvik Wipe Complete</action>
 					<action function="set">tw_slider_text=Swipe to Wipe</action>
 					<action function="page">confirm_action</action>
 				</actions>
@@ -780,12 +780,12 @@
 
 		<page name="rebootcheck">
 			<object type="action">
-				<condition var1="tw_backup_system_size" op=">=" var2="%tw_min_system%" />
+				<condition var1="tw_backup_system_size" op="&gt;=" var2="%tw_min_system%" />
 				<action function="reboot">%tw_action_param%</action>
 			</object>
 
 			<object type="action">
-				<condition var1="tw_backup_system_size" op="<" var2="%tw_min_system%" />
+				<condition var1="tw_backup_system_size" op="&lt;" var2="%tw_min_system%" />
 				<action function="page">confirm_action</action>
 			</object>
 		</page>
@@ -1030,7 +1030,7 @@
 
 			<object type="action">
 				<condition var1="tw_confirm_formatdata" op="!=" var2="yes" />
-				<action function="page">formatdata</function>
+				<action function="page">formatdata</action>
 			</object>
 		</page>
 
@@ -1431,11 +1431,11 @@
 		<page name="backupname1">
 			<object type="action">
 				<condition var1="tw_backup_name" op="=" var2="(Auto Generate)" />
-				<action function="generatebackupname"></function>
+				<action function="generatebackupname"></action>
 			</object>
 
 			<object type="action">
-				<action function="page">backupname2</function>
+				<action function="page">backupname2</action>
 			</object>
 		</page>
 
@@ -1796,7 +1796,7 @@
 				<actions>
 					<action function="set">tw_back=restore</action>
 					<action function="set">tw_action=cmd</action>
-					<action function="set">tw_action_param=cd %tw_backups_folder% && rm -rf &quot;%tw_restore_name%&quot;</action>
+					<action function="set">tw_action_param=cd %tw_backups_folder% &amp;&amp; rm -rf &quot;%tw_restore_name%&quot;</action>
 					<action function="set">tw_text1=Delete Backup? %tw_restore_name%</action>
 					<action function="set">tw_text2=This cannot be undone!</action>
 					<action function="set">tw_action_text1=Deleting Backup...</action>
@@ -1886,7 +1886,7 @@
 				<actions>
 					<action function="set">tw_back=restore</action>
 					<action function="set">tw_action=cmd</action>
-					<action function="set">tw_action_param=cd %tw_backups_folder% && rm -rf &quot;%tw_restore_name%&quot;</action>
+					<action function="set">tw_action_param=cd %tw_backups_folder% &amp;&amp; rm -rf &quot;%tw_restore_name%&quot;</action>
 					<action function="set">tw_text1=Delete Backup? %tw_restore_name%</action>
 					<action function="set">tw_text2=This cannot be undone!</action>
 					<action function="set">tw_action_text1=Deleting Backup...</action>
@@ -1941,7 +1941,7 @@
 				<actions>
 					<action function="set">tw_back=restore</action>
 					<action function="set">tw_action=cmd</action>
-					<action function="set">tw_action_param=cd %tw_backups_folder% && mv &quot;%tw_restore_name%&quot; &quot;%tw_backup_rename%&quot;</action>
+					<action function="set">tw_action_param=cd %tw_backups_folder% &amp;&amp; mv &quot;%tw_restore_name%&quot; &quot;%tw_backup_rename%&quot;</action>
 					<action function="set">tw_text1=Rename Backup?</action>
 					<action function="set">tw_text2=This cannot be undone!</action>
 					<action function="set">tw_action_text1=Renaming Backup...</action>
@@ -2828,7 +2828,7 @@
 			<object type="fileselector">
 				<placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" />
 				<text>%tw_file_location1%</text>
-				<folders="1" files="1" />
+				<filter folders="1" files="1" />
 				<path name="tw_file_location1" default="/" />
 				<data name="tw_filename1" />
 				<selection name="tw_selection1" />
@@ -2903,7 +2903,7 @@
 				<placement x="%col1_x%" y="%row2_y%" />
 				<text>Copy Folder</text>
 				<actions>
-					<action function="set">tw_filemanager_command=cd &quot;%tw_file_location1%&quot; && cd .. && cp -R</action>
+					<action function="set">tw_filemanager_command=cd &quot;%tw_file_location1%&quot; &amp;&amp; cd .. &amp;&amp; cp -R</action>
 					<action function="set">tw_fm_text1=Copying</action>
 					<action function="page">choosedestinationfolder</action>
 				</actions>
@@ -2979,7 +2979,7 @@
 				<actions>
 					<action function="set">tw_filemanager_rename=tw_selection1</action>
 					<action function="set">tw_fm_text1=Renaming</action>
-					<action function="set">tw_filemanager_command=cd &quot;%tw_file_location1%&quot; && cd .. && mv</action>
+					<action function="set">tw_filemanager_command=cd &quot;%tw_file_location1%&quot; &amp;&amp; cd .. &amp;&amp; mv</action>
 					<action function="page">filemanagerrenamefolder</action>
 				</actions>
 			</object>
@@ -3002,7 +3002,7 @@
 
 			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5"/>
-				<text>Browse to Destination Folder & Press Select</text>
+				<text>Browse to Destination Folder &amp; Press Select</text>
 			</object>
 
 			<object type="fileselector">
diff --git a/gui/devices/watch/res/watch.xml b/gui/devices/watch/res/watch.xml
index dfbed16cd..a86b07c62 100644
--- a/gui/devices/watch/res/watch.xml
+++ b/gui/devices/watch/res/watch.xml
@@ -382,9 +382,9 @@
 					<action function="set">tw_has_action2=1</action>
 					<action function="set">tw_action2=wipe</action>
 					<action function="set">tw_action2_param=dalvik</action>
-					<action function="set">tw_text1=Wipe Cache & Dalvik?</action>
-					<action function="set">tw_action_text1=Wiping Cache & Dalvik...</action>
-					<action function="set">tw_complete_text1=Cache & Dalvik Wipe Complete</action>
+					<action function="set">tw_text1=Wipe Cache &amp; Dalvik?</action>
+					<action function="set">tw_action_text1=Wiping Cache &amp; Dalvik...</action>
+					<action function="set">tw_complete_text1=Cache &amp; Dalvik Wipe Complete</action>
 					<action function="set">tw_slider_text=Swipe to Wipe</action>
 					<action function="page">confirm_action</action>
 				</actions>
@@ -762,12 +762,12 @@
 
 		<page name="rebootcheck">
 			<object type="action">
-				<condition var1="tw_backup_system_size" op=">=" var2="%tw_min_system%" />
+				<condition var1="tw_backup_system_size" op="&gt;=" var2="%tw_min_system%" />
 				<action function="reboot">%tw_action_param%</action>
 			</object>
 
 			<object type="action">
-				<condition var1="tw_backup_system_size" op="<" var2="%tw_min_system%" />
+				<condition var1="tw_backup_system_size" op="&lt;" var2="%tw_min_system%" />
 				<action function="page">confirm_action</action>
 			</object>
 		</page>
@@ -1008,7 +1008,7 @@
 
 			<object type="action">
 				<condition var1="tw_confirm_formatdata" op="!=" var2="yes" />
-				<action function="page">formatdata</function>
+				<action function="page">formatdata</action>
 			</object>
 		</page>
 
@@ -1442,11 +1442,11 @@
 		<page name="backupname1">
 			<object type="action">
 				<condition var1="tw_backup_name" op="=" var2="(Auto Generate)" />
-				<action function="generatebackupname"></function>
+				<action function="generatebackupname"></action>
 			</object>
 
 			<object type="action">
-				<action function="page">backupname2</function>
+				<action function="page">backupname2</action>
 			</object>
 		</page>
 
@@ -1811,7 +1811,7 @@
 				<actions>
 					<action function="set">tw_back=restore</action>
 					<action function="set">tw_action=cmd</action>
-					<action function="set">tw_action_param=cd %tw_backups_folder% && rm -rf &quot;%tw_restore_name%&quot;</action>
+					<action function="set">tw_action_param=cd %tw_backups_folder% &amp;&amp; rm -rf &quot;%tw_restore_name%&quot;</action>
 					<action function="set">tw_text1=Delete Backup? %tw_restore_name%</action>
 					<action function="set">tw_text2=This cannot be undone!</action>
 					<action function="set">tw_action_text1=Deleting Backup...</action>
@@ -1901,7 +1901,7 @@
 				<actions>
 					<action function="set">tw_back=restore</action>
 					<action function="set">tw_action=cmd</action>
-					<action function="set">tw_action_param=cd %tw_backups_folder% && rm -rf &quot;%tw_restore_name%&quot;</action>
+					<action function="set">tw_action_param=cd %tw_backups_folder% &amp;&amp; rm -rf &quot;%tw_restore_name%&quot;</action>
 					<action function="set">tw_text1=Delete Backup? %tw_restore_name%</action>
 					<action function="set">tw_text2=This cannot be undone!</action>
 					<action function="set">tw_action_text1=Deleting Backup...</action>
@@ -1949,7 +1949,7 @@
 				<actions>
 					<action function="set">tw_back=restore</action>
 					<action function="set">tw_action=cmd</action>
-					<action function="set">tw_action_param=cd %tw_backups_folder% && mv &quot;%tw_restore_name%&quot; &quot;%tw_backup_rename%&quot;</action>
+					<action function="set">tw_action_param=cd %tw_backups_folder% &amp;&amp; mv &quot;%tw_restore_name%&quot; &quot;%tw_backup_rename%&quot;</action>
 					<action function="set">tw_text1=Rename Backup?</action>
 					<action function="set">tw_text2=This cannot be undone!</action>
 					<action function="set">tw_action_text1=Renaming Backup...</action>
@@ -2826,7 +2826,7 @@
 			<object type="fileselector">
 				<placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" />
 				<text>%tw_file_location1%</text>
-				<folders="1" files="1" />
+				<filter folders="1" files="1" />
 				<path name="tw_file_location1" default="/" />
 				<data name="tw_filename1" />
 				<selection name="tw_selection1" />
@@ -2899,7 +2899,7 @@
 				<placement x="%col1_x%" y="%row2_y%" />
 				<text>Copy Folder</text>
 				<actions>
-					<action function="set">tw_filemanager_command=cd &quot;%tw_file_location1%&quot; && cd .. && cp -R</action>
+					<action function="set">tw_filemanager_command=cd &quot;%tw_file_location1%&quot; &amp;&amp; cd .. &amp;&amp; cp -R</action>
 					<action function="set">tw_fm_text1=Copying</action>
 					<action function="page">choosedestinationfolder</action>
 				</actions>
@@ -2975,7 +2975,7 @@
 				<actions>
 					<action function="set">tw_filemanager_rename=tw_selection1</action>
 					<action function="set">tw_fm_text1=Renaming</action>
-					<action function="set">tw_filemanager_command=cd &quot;%tw_file_location1%&quot; && cd .. && mv</action>
+					<action function="set">tw_filemanager_command=cd &quot;%tw_file_location1%&quot; &amp;&amp; cd .. &amp;&amp; mv</action>
 					<action function="page">filemanagerrenamefolder</action>
 				</actions>
 			</object>
@@ -2998,7 +2998,7 @@
 
 			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5"/>
-				<text>Browse to Destination & Press Select</text>
+				<text>Browse to Destination &amp; Press Select</text>
 			</object>
 
 			<object type="fileselector">
-- 
cgit v1.2.3