Whitespace and minor code cleanup

This is by no means comprehensive, but is quite a bit better already.

Change-Id: Ibc8654a5dfb0eec39cbd0b64bdb52bb4fbfe2f7e
diff --git a/gui/devices/1024x600/res/ui.xml b/gui/devices/1024x600/res/ui.xml
index 92a33c0..c0880a7 100755
--- a/gui/devices/1024x600/res/ui.xml
+++ b/gui/devices/1024x600/res/ui.xml
@@ -279,7 +279,7 @@
 		<template name="progress_bar">
 			<object type="progressbar">
 				<placement x="%col_progressbar_x%" y="%row_progressbar_y%" />
-				<resource  empty="progress_empty" full="progress_full" />
+				<resource empty="progress_empty" full="progress_full" />
 				<data name="ui_progress" />
 			</object>
 
@@ -560,7 +560,7 @@
 				<data name="tw_filename" />
 				<selection name="tw_file" />
 			</object>
-			
+
 			<object type="template" name="sort_options" />
 
 			<object type="action">
@@ -616,7 +616,7 @@
 				<placement x="%center_x%" y="%row5_text_y%" placement="5" />
 				<text>%tw_file%</text>
 			</object>
-			
+
 			<object type="text" color="%text_color%">
 				<font resource="font" />
 				<placement x="%center_x%" y="%row6_text_y%" placement="5" />
@@ -2806,13 +2806,13 @@
 				<touch key="back" />
 				<action function="page">main</action>
 			</object>
-			
+
 			<object type="template" name="footer" />
 		</page>
 
 		<page name="timezone">
 			<object type="template" name="header" />
-			
+
 			<object type="text" color="%text_color%">
 				<font resource="font" />
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
@@ -3291,7 +3291,7 @@
 			<object type="template" name="footer" />
 		</page>
 
-		
+
 		<page name="htcdumlock">
 			<object type="template" name="header" />
 
@@ -3381,7 +3381,7 @@
 				<resource base="slider" used="slider-used" touch="slider-touch" />
 				<action function="overlay"></action>
 			</object>
-			
+
 			<object type="text" color="%text_color%">
 				<font resource="font" />
 				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
@@ -3389,7 +3389,7 @@
 			</object>
 		</page>
 
-		
+
 		<page name="filemanagerlist">
 			<object type="template" name="header" />
 
@@ -3867,7 +3867,7 @@
 				<resource base="slider" used="slider-used" touch="slider-touch" />
 				<action function="page">filemanageracction</action>
 			</object>
-			
+
 			<object type="text" color="%text_color%">
 				<font resource="font" />
 				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
@@ -3883,7 +3883,7 @@
 				<touch key="home" />
 				<action function="page">main</action>
 			</object>
-				
+
 			<object type="template" name="footer" />
 		</page>
 
diff --git a/gui/devices/1024x768/res/ui.xml b/gui/devices/1024x768/res/ui.xml
index 2d8b07c..3409972 100644
--- a/gui/devices/1024x768/res/ui.xml
+++ b/gui/devices/1024x768/res/ui.xml
@@ -279,7 +279,7 @@
 		<template name="progress_bar">
 			<object type="progressbar">
 				<placement x="%col_progressbar_x%" y="%row_progressbar_y%" />
-				<resource  empty="progress_empty" full="progress_full" />
+				<resource empty="progress_empty" full="progress_full" />
 				<data name="ui_progress" />
 			</object>
 
@@ -560,7 +560,7 @@
 				<data name="tw_filename" />
 				<selection name="tw_file" />
 			</object>
-			
+
 			<object type="template" name="sort_options" />
 
 			<object type="action">
@@ -616,7 +616,7 @@
 				<placement x="%center_x%" y="%row5_text_y%" placement="5" />
 				<text>%tw_file%</text>
 			</object>
-			
+
 			<object type="text" color="%text_color%">
 				<font resource="font" />
 				<placement x="%center_x%" y="%row6_text_y%" placement="5" />
@@ -2806,13 +2806,13 @@
 				<touch key="back" />
 				<action function="page">main</action>
 			</object>
-			
+
 			<object type="template" name="footer" />
 		</page>
 
 		<page name="timezone">
 			<object type="template" name="header" />
-			
+
 			<object type="text" color="%text_color%">
 				<font resource="font" />
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
@@ -3291,7 +3291,7 @@
 			<object type="template" name="footer" />
 		</page>
 
-		
+
 		<page name="htcdumlock">
 			<object type="template" name="header" />
 
@@ -3381,7 +3381,7 @@
 				<resource base="slider" used="slider-used" touch="slider-touch" />
 				<action function="overlay"></action>
 			</object>
-			
+
 			<object type="text" color="%text_color%">
 				<font resource="font" />
 				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
@@ -3389,7 +3389,7 @@
 			</object>
 		</page>
 
-		
+
 		<page name="filemanagerlist">
 			<object type="template" name="header" />
 
@@ -3867,7 +3867,7 @@
 				<resource base="slider" used="slider-used" touch="slider-touch" />
 				<action function="page">filemanageracction</action>
 			</object>
-			
+
 			<object type="text" color="%text_color%">
 				<font resource="font" />
 				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
@@ -3883,7 +3883,7 @@
 				<touch key="home" />
 				<action function="page">main</action>
 			</object>
-				
+
 			<object type="template" name="footer" />
 		</page>
 
diff --git a/gui/devices/1080x1920/res/ui.xml b/gui/devices/1080x1920/res/ui.xml
index b11e6c1..21498a7 100644
--- a/gui/devices/1080x1920/res/ui.xml
+++ b/gui/devices/1080x1920/res/ui.xml
@@ -268,7 +268,7 @@
 		<template name="progress_bar">
 			<object type="progressbar">
 				<placement x="%col_progressbar_x%" y="%row_progressbar_y%" />
-				<resource  empty="progress_empty" full="progress_full" />
+				<resource empty="progress_empty" full="progress_full" />
 				<data name="ui_progress" />
 			</object>
 
@@ -3894,7 +3894,7 @@
 				<resource base="slider" used="slider-used" touch="slider-touch" />
 				<action function="page">filemanageracction</action>
 			</object>
-			
+
 			<object type="text" color="%text_color%">
 				<font resource="font" />
 				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
@@ -3910,7 +3910,7 @@
 				<touch key="home" />
 				<action function="page">main</action>
 			</object>
-				
+
 			<object type="template" name="footer" />
 		</page>
 
diff --git a/gui/devices/1200x1920/res/ui.xml b/gui/devices/1200x1920/res/ui.xml
index 313706c..9faff14 100644
--- a/gui/devices/1200x1920/res/ui.xml
+++ b/gui/devices/1200x1920/res/ui.xml
@@ -271,7 +271,7 @@
 		<template name="progress_bar">
 			<object type="progressbar">
 				<placement x="%col_progressbar_x%" y="%row_progressbar_y%" />
-				<resource  empty="progress_empty" full="progress_full" />
+				<resource empty="progress_empty" full="progress_full" />
 				<data name="ui_progress" />
 			</object>
 
@@ -3897,7 +3897,7 @@
 				<resource base="slider" used="slider-used" touch="slider-touch" />
 				<action function="page">filemanageracction</action>
 			</object>
-			
+
 			<object type="text" color="%text_color%">
 				<font resource="font" />
 				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
@@ -3913,7 +3913,7 @@
 				<touch key="home" />
 				<action function="page">main</action>
 			</object>
-				
+
 			<object type="template" name="footer" />
 		</page>
 
diff --git a/gui/devices/1280x800/res/ui.xml b/gui/devices/1280x800/res/ui.xml
index d52d3ef..eeb5923 100644
--- a/gui/devices/1280x800/res/ui.xml
+++ b/gui/devices/1280x800/res/ui.xml
@@ -279,7 +279,7 @@
 		<template name="progress_bar">
 			<object type="progressbar">
 				<placement x="%col_progressbar_x%" y="%row_progressbar_y%" />
-				<resource  empty="progress_empty" full="progress_full" />
+				<resource empty="progress_empty" full="progress_full" />
 				<data name="ui_progress" />
 			</object>
 
@@ -560,7 +560,7 @@
 				<data name="tw_filename" />
 				<selection name="tw_file" />
 			</object>
-			
+
 			<object type="template" name="sort_options" />
 
 			<object type="action">
@@ -616,7 +616,7 @@
 				<placement x="%center_x%" y="%row5_text_y%" placement="5" />
 				<text>%tw_file%</text>
 			</object>
-			
+
 			<object type="text" color="%text_color%">
 				<font resource="font" />
 				<placement x="%center_x%" y="%row6_text_y%" placement="5" />
@@ -2806,13 +2806,13 @@
 				<touch key="back" />
 				<action function="page">main</action>
 			</object>
-			
+
 			<object type="template" name="footer" />
 		</page>
 
 		<page name="timezone">
 			<object type="template" name="header" />
-			
+
 			<object type="text" color="%text_color%">
 				<font resource="font" />
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
@@ -3291,7 +3291,7 @@
 			<object type="template" name="footer" />
 		</page>
 
-		
+
 		<page name="htcdumlock">
 			<object type="template" name="header" />
 
@@ -3381,7 +3381,7 @@
 				<resource base="slider" used="slider-used" touch="slider-touch" />
 				<action function="overlay"></action>
 			</object>
-			
+
 			<object type="text" color="%text_color%">
 				<font resource="font" />
 				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
@@ -3389,7 +3389,7 @@
 			</object>
 		</page>
 
-		
+
 		<page name="filemanagerlist">
 			<object type="template" name="header" />
 
@@ -3867,7 +3867,7 @@
 				<resource base="slider" used="slider-used" touch="slider-touch" />
 				<action function="page">filemanageracction</action>
 			</object>
-			
+
 			<object type="text" color="%text_color%">
 				<font resource="font" />
 				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
@@ -3883,7 +3883,7 @@
 				<touch key="home" />
 				<action function="page">main</action>
 			</object>
-				
+
 			<object type="template" name="footer" />
 		</page>
 
diff --git a/gui/devices/1600x2560/res/ui.xml b/gui/devices/1600x2560/res/ui.xml
index bb28c0a..a8e919d 100644
--- a/gui/devices/1600x2560/res/ui.xml
+++ b/gui/devices/1600x2560/res/ui.xml
@@ -271,7 +271,7 @@
 		<template name="progress_bar">
 			<object type="progressbar">
 				<placement x="%col_progressbar_x%" y="%row_progressbar_y%" />
-				<resource  empty="progress_empty" full="progress_full" />
+				<resource empty="progress_empty" full="progress_full" />
 				<data name="ui_progress" />
 			</object>
 
diff --git a/gui/devices/1920x1200/res/ui.xml b/gui/devices/1920x1200/res/ui.xml
index d0ab977..4573ded 100644
--- a/gui/devices/1920x1200/res/ui.xml
+++ b/gui/devices/1920x1200/res/ui.xml
@@ -279,7 +279,7 @@
 		<template name="progress_bar">
 			<object type="progressbar">
 				<placement x="%col_progressbar_x%" y="%row_progressbar_y%" />
-				<resource  empty="progress_empty" full="progress_full" />
+				<resource empty="progress_empty" full="progress_full" />
 				<data name="ui_progress" />
 			</object>
 
@@ -560,7 +560,7 @@
 				<data name="tw_filename" />
 				<selection name="tw_file" />
 			</object>
-			
+
 			<object type="template" name="sort_options" />
 
 			<object type="action">
@@ -616,7 +616,7 @@
 				<placement x="%center_x%" y="%row5_text_y%" placement="5" />
 				<text>%tw_file%</text>
 			</object>
-			
+
 			<object type="text" color="%text_color%">
 				<font resource="font" />
 				<placement x="%center_x%" y="%row6_text_y%" placement="5" />
@@ -2806,13 +2806,13 @@
 				<touch key="back" />
 				<action function="page">main</action>
 			</object>
-			
+
 			<object type="template" name="footer" />
 		</page>
 
 		<page name="timezone">
 			<object type="template" name="header" />
-			
+
 			<object type="text" color="%text_color%">
 				<font resource="font" />
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
@@ -3291,7 +3291,7 @@
 			<object type="template" name="footer" />
 		</page>
 
-		
+
 		<page name="htcdumlock">
 			<object type="template" name="header" />
 
@@ -3381,7 +3381,7 @@
 				<resource base="slider" used="slider-used" touch="slider-touch" />
 				<action function="overlay"></action>
 			</object>
-			
+
 			<object type="text" color="%text_color%">
 				<font resource="font" />
 				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
@@ -3389,7 +3389,7 @@
 			</object>
 		</page>
 
-		
+
 		<page name="filemanagerlist">
 			<object type="template" name="header" />
 
@@ -3867,7 +3867,7 @@
 				<resource base="slider" used="slider-used" touch="slider-touch" />
 				<action function="page">filemanageracction</action>
 			</object>
-			
+
 			<object type="text" color="%text_color%">
 				<font resource="font" />
 				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
@@ -3883,7 +3883,7 @@
 				<touch key="home" />
 				<action function="page">main</action>
 			</object>
-				
+
 			<object type="template" name="footer" />
 		</page>
 
diff --git a/gui/devices/240x240/res/ui.xml b/gui/devices/240x240/res/ui.xml
index 3246a40..c353d01 100644
--- a/gui/devices/240x240/res/ui.xml
+++ b/gui/devices/240x240/res/ui.xml
@@ -255,7 +255,7 @@
 		<template name="progress_bar">
 			<object type="progressbar">
 				<placement x="%col_progressbar_x%" y="%row_progressbar_y%" />
-				<resource  empty="progress_empty" full="progress_full" />
+				<resource empty="progress_empty" full="progress_full" />
 				<data name="ui_progress" />
 			</object>
 
@@ -1487,7 +1487,7 @@
 				<text>Append Date</text>
 				<action function="appenddatetobackupname"></action>
 			</object>
-			
+
 			<object type="button">
 				<highlight color="%highlight_color%" />
 				<fill color="%button_fill_color%" />
@@ -2505,7 +2505,7 @@
 				<placement x="%center_x%" y="%row_offset_text_y%" placement="5" />
 				<text>Offset (usually 0): %tw_time_zone_guioffset%</text>
 			</object>
-			
+
 			<object type="button">
 				<highlight color="%highlight_color%" />
 				<fill color="%button_fill_color%" />
@@ -2514,7 +2514,7 @@
 				<text>None</text>
 				<action function="set">tw_time_zone_guioffset=0</action>
 			</object>
-			
+
 			<object type="button">
 				<highlight color="%highlight_color%" />
 				<fill color="%button_fill_color%" />
@@ -2523,7 +2523,7 @@
 				<text>15</text>
 				<action function="set">tw_time_zone_guioffset=15</action>
 			</object>
-			
+
 			<object type="button">
 				<highlight color="%highlight_color%" />
 				<fill color="%button_fill_color%" />
@@ -2532,7 +2532,7 @@
 				<text>30</text>
 				<action function="set">tw_time_zone_guioffset=30</action>
 			</object>
-			
+
 			<object type="button">
 				<highlight color="%highlight_color%" />
 				<fill color="%button_fill_color%" />
@@ -2541,7 +2541,7 @@
 				<text>45</text>
 				<action function="set">tw_time_zone_guioffset=45</action>
 			</object>
-			
+
 			<object type="button">
 				<highlight color="%highlight_color%" />
 				<placement x="%col_center_x%" y="%tz_set_y%" />
@@ -3452,7 +3452,7 @@
 				<resource base="slider" used="slider-used" touch="slider-touch" />
 				<action function="page">filemanageracction</action>
 			</object>
-			
+
 			<object type="text" color="%text_color%">
 				<font resource="font" />
 				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
@@ -3468,7 +3468,7 @@
 				<touch key="home" />
 				<action function="page">main</action>
 			</object>
-				
+
 			<object type="template" name="footer" />
 		</page>
 
diff --git a/gui/devices/2560x1600/res/ui.xml b/gui/devices/2560x1600/res/ui.xml
index 65dc8e8..531e43f 100644
--- a/gui/devices/2560x1600/res/ui.xml
+++ b/gui/devices/2560x1600/res/ui.xml
@@ -279,7 +279,7 @@
 		<template name="progress_bar">
 			<object type="progressbar">
 				<placement x="%col_progressbar_x%" y="%row_progressbar_y%" />
-				<resource  empty="progress_empty" full="progress_full" />
+				<resource empty="progress_empty" full="progress_full" />
 				<data name="ui_progress" />
 			</object>
 
@@ -560,7 +560,7 @@
 				<data name="tw_filename" />
 				<selection name="tw_file" />
 			</object>
-			
+
 			<object type="template" name="sort_options" />
 
 			<object type="action">
@@ -616,7 +616,7 @@
 				<placement x="%center_x%" y="%row5_text_y%" placement="5" />
 				<text>%tw_file%</text>
 			</object>
-			
+
 			<object type="text" color="%text_color%">
 				<font resource="font" />
 				<placement x="%center_x%" y="%row6_text_y%" placement="5" />
@@ -2806,13 +2806,13 @@
 				<touch key="back" />
 				<action function="page">main</action>
 			</object>
-			
+
 			<object type="template" name="footer" />
 		</page>
 
 		<page name="timezone">
 			<object type="template" name="header" />
-			
+
 			<object type="text" color="%text_color%">
 				<font resource="font" />
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
@@ -3291,7 +3291,7 @@
 			<object type="template" name="footer" />
 		</page>
 
-		
+
 		<page name="htcdumlock">
 			<object type="template" name="header" />
 
@@ -3381,7 +3381,7 @@
 				<resource base="slider" used="slider-used" touch="slider-touch" />
 				<action function="overlay"></action>
 			</object>
-			
+
 			<object type="text" color="%text_color%">
 				<font resource="font" />
 				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
@@ -3389,7 +3389,7 @@
 			</object>
 		</page>
 
-		
+
 		<page name="filemanagerlist">
 			<object type="template" name="header" />
 
@@ -3867,7 +3867,7 @@
 				<resource base="slider" used="slider-used" touch="slider-touch" />
 				<action function="page">filemanageracction</action>
 			</object>
-			
+
 			<object type="text" color="%text_color%">
 				<font resource="font" />
 				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
@@ -3883,7 +3883,7 @@
 				<touch key="home" />
 				<action function="page">main</action>
 			</object>
-				
+
 			<object type="template" name="footer" />
 		</page>
 
diff --git a/gui/devices/320x480/res/ui.xml b/gui/devices/320x480/res/ui.xml
index f8903a5..e29245a 100644
--- a/gui/devices/320x480/res/ui.xml
+++ b/gui/devices/320x480/res/ui.xml
@@ -261,7 +261,7 @@
 		<template name="progress_bar">
 			<object type="progressbar">
 				<placement x="%col_progressbar_x%" y="%row_progressbar_y%" />
-				<resource  empty="progress_empty" full="progress_full" />
+				<resource empty="progress_empty" full="progress_full" />
 				<data name="ui_progress" />
 			</object>
 
@@ -3881,7 +3881,7 @@
 				<resource base="slider" used="slider-used" touch="slider-touch" />
 				<action function="page">filemanageracction</action>
 			</object>
-			
+
 			<object type="text" color="%text_color%">
 				<font resource="font" />
 				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
@@ -3897,7 +3897,7 @@
 				<touch key="home" />
 				<action function="page">main</action>
 			</object>
-				
+
 			<object type="template" name="footer" />
 		</page>
 
diff --git a/gui/devices/480x800/res/ui.xml b/gui/devices/480x800/res/ui.xml
index db78cd7..54069f9 100644
--- a/gui/devices/480x800/res/ui.xml
+++ b/gui/devices/480x800/res/ui.xml
@@ -261,7 +261,7 @@
 		<template name="progress_bar">
 			<object type="progressbar">
 				<placement x="%col_progressbar_x%" y="%row_progressbar_y%" />
-				<resource  empty="progress_empty" full="progress_full" />
+				<resource empty="progress_empty" full="progress_full" />
 				<data name="ui_progress" />
 			</object>
 
@@ -3881,7 +3881,7 @@
 				<resource base="slider" used="slider-used" touch="slider-touch" />
 				<action function="page">filemanageracction</action>
 			</object>
-			
+
 			<object type="text" color="%text_color%">
 				<font resource="font" />
 				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
@@ -3897,7 +3897,7 @@
 				<touch key="home" />
 				<action function="page">main</action>
 			</object>
-				
+
 			<object type="template" name="footer" />
 		</page>
 
diff --git a/gui/devices/480x854/res/ui.xml b/gui/devices/480x854/res/ui.xml
index 617c196..48fe8d6 100644
--- a/gui/devices/480x854/res/ui.xml
+++ b/gui/devices/480x854/res/ui.xml
@@ -260,7 +260,7 @@
 		<template name="progress_bar">
 			<object type="progressbar">
 				<placement x="%col_progressbar_x%" y="%row_progressbar_y%" />
-				<resource  empty="progress_empty" full="progress_full" />
+				<resource empty="progress_empty" full="progress_full" />
 				<data name="ui_progress" />
 			</object>
 
@@ -3880,7 +3880,7 @@
 				<resource base="slider" used="slider-used" touch="slider-touch" />
 				<action function="page">filemanageracction</action>
 			</object>
-			
+
 			<object type="text" color="%text_color%">
 				<font resource="font" />
 				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
@@ -3896,7 +3896,7 @@
 				<touch key="home" />
 				<action function="page">main</action>
 			</object>
-				
+
 			<object type="template" name="footer" />
 		</page>
 
diff --git a/gui/devices/540x960/res/ui.xml b/gui/devices/540x960/res/ui.xml
index b6fcc60..665e676 100644
--- a/gui/devices/540x960/res/ui.xml
+++ b/gui/devices/540x960/res/ui.xml
@@ -261,7 +261,7 @@
 		<template name="progress_bar">
 			<object type="progressbar">
 				<placement x="%col_progressbar_x%" y="%row_progressbar_y%" />
-				<resource  empty="progress_empty" full="progress_full" />
+				<resource empty="progress_empty" full="progress_full" />
 				<data name="ui_progress" />
 			</object>
 
@@ -3881,7 +3881,7 @@
 				<resource base="slider" used="slider-used" touch="slider-touch" />
 				<action function="page">filemanageracction</action>
 			</object>
-			
+
 			<object type="text" color="%text_color%">
 				<font resource="font" />
 				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
@@ -3897,7 +3897,7 @@
 				<touch key="home" />
 				<action function="page">main</action>
 			</object>
-				
+
 			<object type="template" name="footer" />
 		</page>
 
diff --git a/gui/devices/720x1280/res/ui.xml b/gui/devices/720x1280/res/ui.xml
index 763fa44..3d69a35 100644
--- a/gui/devices/720x1280/res/ui.xml
+++ b/gui/devices/720x1280/res/ui.xml
@@ -268,7 +268,7 @@
 		<template name="progress_bar">
 			<object type="progressbar">
 				<placement x="%col_progressbar_x%" y="%row_progressbar_y%" />
-				<resource  empty="progress_empty" full="progress_full" />
+				<resource empty="progress_empty" full="progress_full" />
 				<data name="ui_progress" />
 			</object>
 
@@ -3894,7 +3894,7 @@
 				<resource base="slider" used="slider-used" touch="slider-touch" />
 				<action function="page">filemanageracction</action>
 			</object>
-			
+
 			<object type="text" color="%text_color%">
 				<font resource="font" />
 				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
@@ -3910,7 +3910,7 @@
 				<touch key="home" />
 				<action function="page">main</action>
 			</object>
-				
+
 			<object type="template" name="footer" />
 		</page>
 
diff --git a/gui/devices/800x1280/res/ui.xml b/gui/devices/800x1280/res/ui.xml
index 134b899..7194373 100755
--- a/gui/devices/800x1280/res/ui.xml
+++ b/gui/devices/800x1280/res/ui.xml
@@ -262,7 +262,7 @@
 		<template name="progress_bar">
 			<object type="progressbar">
 				<placement x="%col_progressbar_x%" y="%row_progressbar_y%" />
-				<resource  empty="progress_empty" full="progress_full" />
+				<resource empty="progress_empty" full="progress_full" />
 				<data name="ui_progress" />
 			</object>
 
@@ -345,7 +345,7 @@
 		</template>
 
 		<template name="footer">
-			<object type="console"> 
+			<object type="console">
 				<slideout resource="slideout" x="355" y="1220" />
 				<placement x="%console_x%" y="0" w="%console_width%" h="1220" />
 				<color foreground="%console_foreground%" background="%console_background%" scroll="%console_scroll%" />
@@ -3882,7 +3882,7 @@
 				<resource base="slider" used="slider-used" touch="slider-touch" />
 				<action function="page">filemanageracction</action>
 			</object>
-			
+
 			<object type="text" color="%text_color%">
 				<font resource="font" />
 				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
@@ -3898,7 +3898,7 @@
 				<touch key="home" />
 				<action function="page">main</action>
 			</object>
-				
+
 			<object type="template" name="footer" />
 		</page>
 
diff --git a/gui/devices/800x480/res/ui.xml b/gui/devices/800x480/res/ui.xml
index 2af9c9c..ac9abc9 100755
--- a/gui/devices/800x480/res/ui.xml
+++ b/gui/devices/800x480/res/ui.xml
@@ -281,7 +281,7 @@
 		<template name="progress_bar">
 			<object type="progressbar">
 				<placement x="%col_progressbar_x%" y="%row_progressbar_y%" />
-				<resource  empty="progress_empty" full="progress_full" />
+				<resource empty="progress_empty" full="progress_full" />
 				<data name="ui_progress" />
 			</object>
 
@@ -568,7 +568,7 @@
 				<data name="tw_filename" />
 				<selection name="tw_file" />
 			</object>
-			
+
 			<object type="template" name="sort_options" />
 
 			<object type="action">
@@ -624,7 +624,7 @@
 				<placement x="%center_x%" y="%row5_text_y%" placement="5" />
 				<text>%tw_file%</text>
 			</object>
-			
+
 			<object type="text" color="%text_color%">
 				<font resource="font" />
 				<placement x="%center_x%" y="%row6_text_y%" placement="5" />
@@ -2814,13 +2814,13 @@
 				<touch key="back" />
 				<action function="page">main</action>
 			</object>
-			
+
 			<object type="template" name="footer" />
 		</page>
 
 		<page name="timezone">
 			<object type="template" name="header" />
-			
+
 			<object type="text" color="%text_color%">
 				<font resource="font" />
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
@@ -3299,7 +3299,7 @@
 			<object type="template" name="footer" />
 		</page>
 
-		
+
 		<page name="htcdumlock">
 			<object type="template" name="header" />
 
@@ -3389,7 +3389,7 @@
 				<resource base="slider" used="slider-used" touch="slider-touch" />
 				<action function="overlay"></action>
 			</object>
-			
+
 			<object type="text" color="%text_color%">
 				<font resource="font" />
 				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
@@ -3397,7 +3397,7 @@
 			</object>
 		</page>
 
-		
+
 		<page name="filemanagerlist">
 			<object type="template" name="header" />
 
@@ -3875,7 +3875,7 @@
 				<resource base="slider" used="slider-used" touch="slider-touch" />
 				<action function="page">filemanageracction</action>
 			</object>
-			
+
 			<object type="text" color="%text_color%">
 				<font resource="font" />
 				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
@@ -3891,7 +3891,7 @@
 				<touch key="home" />
 				<action function="page">main</action>
 			</object>
-				
+
 			<object type="template" name="footer" />
 		</page>