diff --git a/gui/action.cpp b/gui/action.cpp
index aa81dff..f9de4e9 100644
--- a/gui/action.cpp
+++ b/gui/action.cpp
@@ -226,9 +226,9 @@
 	}
 
 	// First, get the action
-	actions = node->first_node("actions");
-	if (actions)	child = actions->first_node("action");
-	else			child = node->first_node("action");
+	actions = FindNode(node, "actions");
+	if (actions)	child = FindNode(actions, "action");
+	else			child = FindNode(node, "action");
 
 	if (!child) return;
 
@@ -247,7 +247,7 @@
 	}
 
 	// Now, let's get either the key or region
-	child = node->first_node("touch");
+	child = FindNode(node, "touch");
 	if (child)
 	{
 		attr = child->first_attribute("key");
diff --git a/gui/animation.cpp b/gui/animation.cpp
index 1e9a87d..888b4ab 100644
--- a/gui/animation.cpp
+++ b/gui/animation.cpp
@@ -29,7 +29,6 @@
 GUIAnimation::GUIAnimation(xml_node<>* node) : GUIObject(node)
 {
 	xml_node<>* child;
-	xml_attribute<>* attr;
 
 	mAnimation = NULL;
 	mFrame = 1;
@@ -40,36 +39,26 @@
 
 	if (!node)  return;
 
-	child = node->first_node("resource");
-	if (child)
-	{
-		mAnimation = LoadAttrAnimation(child, "name");
-	}
+	mAnimation = LoadAttrAnimation(FindNode(node, "resource"), "name");
 
 	// Load the placement
-	LoadPlacement(node->first_node("placement"), &mRenderX, &mRenderY, NULL, NULL, &mPlacement);
+	LoadPlacement(FindNode(node, "placement"), &mRenderX, &mRenderY, NULL, NULL, &mPlacement);
 
-	child = node->first_node("speed");
+	child = FindNode(node, "speed");
 	if (child)
 	{
-		attr = child->first_attribute("fps");
-		if (attr)
-			mFPS = atoi(attr->value());
-		attr = child->first_attribute("render");
-		if (attr)
-			mRender = atoi(attr->value());
+		mFPS = LoadAttrInt(child, "fps", mFPS);
+		mRender = LoadAttrInt(child, "render", mRender);
 	}
 	if (mFPS > 30)  mFPS = 30;
 
-	child = node->first_node("loop");
+	child = FindNode(node, "loop");
 	if (child)
 	{
-		attr = child->first_attribute("frame");
+		xml_attribute<>* attr = child->first_attribute("frame");
 		if (attr)
 			mLoop = atoi(attr->value()) - 1;
-		attr = child->first_attribute("start");
-		if (attr)
-			mFrame = atoi(attr->value());
+		mFrame = LoadAttrInt(child, "start", mFrame);
 	}
 
 	// Fetch the render sizes
diff --git a/gui/button.cpp b/gui/button.cpp
index 6ea0bee..18b5560 100644
--- a/gui/button.cpp
+++ b/gui/button.cpp
@@ -63,15 +63,11 @@
 	mButtonLabel = new GUIText(node);
 	mAction = new GUIAction(node);
 
-	child = node->first_node("image");
-	if (child)
+	mButtonImg = new GUIImage(node);
+	if (mButtonImg->Render() < 0)
 	{
-		mButtonImg = new GUIImage(node);
-		if (mButtonImg->Render() < 0)
-		{
-			delete mButtonImg;
-			mButtonImg = NULL;
-		}
+		delete mButtonImg;
+		mButtonImg = NULL;
 	}
 	if (mButtonLabel->Render() < 0)
 	{
@@ -79,45 +75,22 @@
 		mButtonLabel = NULL;
 	}
 	// Load fill if it exists
-	memset(&mFillColor, 0, sizeof(COLOR));
-	child = node->first_node("fill");
-	if (child)
-	{
-		attr = child->first_attribute("color");
-		if (attr) {
-			hasFill = true;
-			std::string color = attr->value();
-			ConvertStrToColor(color, &mFillColor);
-		}
-	}
+	mFillColor = LoadAttrColor(FindNode(node, "fill"), "color", &hasFill);
 	if (!hasFill && mButtonImg == NULL) {
 		LOGERR("No image resource or fill specified for button.\n");
 	}
 
 	// The icon is a special case
-	child = node->first_node("icon");
-	if (child)
-	{
-		mButtonIcon = LoadAttrImage(child, "resource");
-	}
+	mButtonIcon = LoadAttrImage(FindNode(node, "icon"), "resource");
 
-	memset(&mHighlightColor, 0, sizeof(COLOR));
-	child = node->first_node("highlight");
-	if (child) {
-		attr = child->first_attribute("color");
-		if (attr) {
-			hasHighlightColor = true;
-			std::string color = attr->value();
-			ConvertStrToColor(color, &mHighlightColor);
-		}
-	}
+	mHighlightColor = LoadAttrColor(FindNode(node, "highlight"), "color", &hasHighlightColor);
 
 	int x, y, w, h;
 	TextPlacement = TOP_LEFT;
 	if (mButtonImg) {
 		mButtonImg->GetRenderPos(x, y, w, h);
 	} else if (hasFill) {
-		LoadPlacement(node->first_node("placement"), &x, &y, &w, &h, &TextPlacement);
+		LoadPlacement(FindNode(node, "placement"), &x, &y, &w, &h, &TextPlacement);
 	}
 	SetRenderPos(x, y, w, h);
 }
diff --git a/gui/checkbox.cpp b/gui/checkbox.cpp
index f4900ba..46a7708 100644
--- a/gui/checkbox.cpp
+++ b/gui/checkbox.cpp
@@ -45,7 +45,7 @@
 	mLabel = new GUIText(node);
 
 	// Read the check states
-	child = node->first_node("image");
+	child = FindNode(node, "image");
 	if (child)
 	{
 		mChecked = LoadAttrImage(child, "checked");
@@ -53,7 +53,7 @@
 	}
 
 	// Get the variable data
-	child = node->first_node("data");
+	child = FindNode(node, "data");
 	if (child)
 	{
 		attr = child->first_attribute("variable");
diff --git a/gui/console.cpp b/gui/console.cpp
index bb70400..3623f55 100644
--- a/gui/console.cpp
+++ b/gui/console.cpp
@@ -101,7 +101,6 @@
 
 GUIConsole::GUIConsole(xml_node<>* node) : GUIObject(node)
 {
-	xml_attribute<>* attr;
 	xml_node<>* child;
 
 	mFont = NULL;
@@ -126,13 +125,9 @@
 	}
 	else
 	{
-		child = node->first_node("font");
-		if (child)
-		{
-			mFont = LoadAttrFont(child, "resource");
-		}
+		mFont = LoadAttrFont(FindNode(node, "font"), "resource");
 
-		child = node->first_node("color");
+		child = FindNode(node, "color");
 		if (child)
 		{
 			mForegroundColor = LoadAttrColor(child, "foreground", mForegroundColor);
@@ -141,9 +136,9 @@
 		}
 
 		// Load the placement
-		LoadPlacement(node->first_node("placement"), &mConsoleX, &mConsoleY, &mConsoleW, &mConsoleH);
+		LoadPlacement(FindNode(node, "placement"), &mConsoleX, &mConsoleY, &mConsoleW, &mConsoleH);
 
-		child = node->first_node("slideout");
+		child = FindNode(node, "slideout");
 		if (child)
 		{
 			mSlideout = 1;
diff --git a/gui/devices/landscape/res/landscape.xml b/gui/devices/landscape/res/landscape.xml
index eb6d9dd..fd5fcfe 100644
--- a/gui/devices/landscape/res/landscape.xml
+++ b/gui/devices/landscape/res/landscape.xml
@@ -1,6 +1,107 @@
 <?xml version="1.0"?>
 
 <recovery>
+	<styles>
+		<style name="buttontext">
+			<highlight color="%highlight_color%" />
+			<font resource="font" color="%button_text_color%" />
+		</style>
+
+		<style name="button">
+			<style name="buttontext" />
+			<image resource="main_button" />
+		</style>
+
+		<style name="mediumbutton">
+			<style name="buttontext" />
+			<image resource="medium_button" />
+		</style>
+
+		<style name="mediumwidebutton">
+			<style name="buttontext" />
+			<image resource="mediumwide_button" />
+		</style>
+
+		<style name="fillbutton">
+			<style name="buttontext" />
+			<fill color="%button_fill_color%" />
+		</style>
+
+		<style name="rebootsystem">
+			<condition var1="tw_reboot_system" var2="1" />
+			<style name="button" />
+			<text>Reboot System</text>
+			<actions>
+				<action function="set">tw_back=main2</action>
+				<action function="set">tw_action=reboot</action>
+				<action function="set">tw_action_param=system</action>
+				<action function="set">tw_has_action2=0</action>
+				<action function="set">tw_text1=No OS Installed! Are you</action>
+				<action function="set">tw_text2=sure you wish to reboot?</action>
+				<action function="set">tw_text3=</action>
+				<action function="set">tw_text4=</action>
+				<action function="set">tw_action_text1=Rebooting...</action>
+				<action function="set">tw_action_text2=</action>
+				<action function="set">tw_complete_text1=Rebooting...</action>
+				<action function="set">tw_slider_text=Swipe to Reboot</action>
+				<action function="page">rebootcheck</action>
+			</actions>
+		</style>
+
+		<style name="scrolllist">
+			<highlight color="%fileselector_highlight_color%" />
+			<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
+			<fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" />
+			<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
+			<background color="%fileselector_background%" />
+			<font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
+		</style>
+
+		<style name="fileselector">
+			<style name="scrolllist" />
+			<icon folder="folder_icon" file="file_icon" />
+			<sort name="tw_gui_sort_order" />
+		</style>
+
+		<style name="partitionlist">
+			<style name="scrolllist" />
+			<icon selected="checkbox_true" unselected="checkbox_false" />
+		</style>
+
+		<style name="text">
+			<font resource="font" color="%text_color%" />
+		</style>
+
+		<style name="checkbox">
+			<font resource="font" color="%text_color%" />
+			<image checked="checkbox_true" unchecked="checkbox_false" />
+		</style>
+
+		<style name="slider">
+			<text>Swipe to Confirm</text>
+			<font resource="font" color="%text_color%" />
+			<placement x="%slider_x%" y="%slider_y%" placement="5" />
+			<resource base="slider" used="slider-used" touch="slider-touch" />
+		</style>
+
+		<style name="console">
+			<color foreground="%console_foreground%" background="%console_background%" scroll="%console_scroll%" />
+			<font resource="fixed" />
+		</style>
+
+		<style name="input">
+			<background color="%input_background_color%" />
+			<cursor color="%input_cursor_color%" hasfocus="1" width="%input_cursor_width%" />
+			<font resource="font" color="%text_color%" />
+		</style>
+
+		<style name="slidervalue">
+			<font resource="font" color="%text_color%" />
+			<colors line="%slidervalue_line_clr%" slider="%slidervalue_slider_clr%" />
+			<dimensions lineh="%slidervalue_lineh%" linepadding="%slidervalue_padding%" sliderw="%slidervalue_sliderw%" sliderh="%slidervalue_sliderh%" />
+		</style>
+	</styles>
+
 	<pages>
 		<page name="main">
 			<object type="action">
@@ -15,11 +116,8 @@
 			<object type="template" name="header" />
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row1_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Install</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="queueclear"></action>
 					<action function="page">install</action>
@@ -27,65 +125,44 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%row1_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Backup</text>
-				<image resource="main_button" />
 				<action function="page">backup</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col3_x%" y="%row1_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Restore</text>
-				<image resource="main_button" />
 				<action function="page">restore</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col4_x%" y="%row1_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Wipe</text>
-				<image resource="main_button" />
 				<action function="page">wipe</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Mount</text>
-				<image resource="main_button" />
 				<action function="page">mount</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Settings</text>
-				<image resource="main_button" />
 				<action function="page">settings</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col3_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Advanced</text>
-				<image resource="main_button" />
 				<action function="page">advanced</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col4_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Reboot</text>
-				<image resource="main_button" />
 				<action function="page">reboot</action>
 			</object>
 
@@ -95,17 +172,13 @@
 		<page name="install">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>Select Zip to Install</text>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<fill color="%button_fill_color%" />
+			<object type="button" style="fillbutton">
 				<placement x="%button_full_center_x%" y="%zipstorage_text_y%" w="%button_fill_full_width%" h="%button_fill_quarter_height%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Storage: %tw_storage_display_name% (%tw_storage_free_size% MB)</text>
 				<actions>
 					<action function="set">tw_back=install</action>
@@ -114,32 +187,16 @@
 			</object>
 
 			<object type="fileselector">
-				<highlight color="%fileselector_highlight_color%" />
 				<placement x="%fileselector_folder_x%" y="%fileselector_install_y%" w="%fileselector_folder_width%" h="%fileselector_install_height%" />
-				<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
-				<fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" />
 				<text>Folders:</text>
-				<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
-				<sort name="tw_gui_sort_order" />
-				<icon folder="folder_icon" file="file_icon" />
-				<background color="%fileselector_background%" />
-				<font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
 				<filter folders="1" files="0" />
 				<path name="tw_zip_location" default="/sdcard" />
 				<data name="select" />
 			</object>
 
 			<object type="fileselector">
-				<highlight color="%fileselector_highlight_color%" />
 				<placement x="%fileselector_file_x%" y="%fileselector_install_y%" w="%fileselector_file_width%" h="%fileselector_install_height%" />
-				<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
-				<fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" />
 				<text>%tw_zip_location%</text>
-				<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
-				<sort name="tw_gui_sort_order" />
-				<icon folder="folder_icon" file="file_icon" />
-				<background color="%fileselector_background%" />
-				<font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
 				<filter extn=".zip" folders="0" files="1" />
 				<path name="tw_zip_location" />
 				<data name="tw_filename" />
@@ -149,11 +206,8 @@
 			<object type="template" name="sort_options" />
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%filemanager_select_x%" y="%filemanager_select_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Images...</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="page">install_image</action>
 				</actions>
@@ -183,72 +237,57 @@
 		<page name="flash_confirm">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>WARNING: This operation may install incompatible software and render your device unusable.</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row2_text_y%" placement="5" />
 				<text>Folder:</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row3_text_y%" placement="5" />
 				<text>%tw_zip_location%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row4_text_y%" placement="5" />
 				<text>File to flash:</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row5_text_y%" placement="5" />
 				<text>%tw_file%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row6_text_y%" placement="5" />
 				<text>Press back to cancel adding this zip.</text>
 			</object>
 
 			<object type="checkbox">
 				<placement x="%col2_x%" y="%row7_text_y%" />
-				<font resource="font" color="%text_color%" />
 				<text>Zip file signature verification?</text>
 				<data variable="tw_signed_zip_verify" />
-				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row10_text_y%" placement="5" />
 				<text>File %tw_zip_queue_count% of max of 10</text>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
+			<object type="button" style="mediumwidebutton">
 				<condition var1="tw_zip_queue_count" op="!=" var2="10"></condition>
 				<placement x="%col2_x%" y="%row5_medium_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Add More Zips</text>
-				<image resource="mediumwide_button" />
 				<action function="page">install</action>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
+			<object type="button" style="mediumwidebutton">
 				<placement x="%col3_x%" y="%row5_medium_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Clear Queue</text>
-				<image resource="mediumwide_button" />
 				<actions>
 					<action function="queueclear"></action>
 					<action function="page">install</action>
@@ -256,15 +295,8 @@
 			</object>
 
 			<object type="slider">
-				<placement x="%slider_x%" y="%slider_y%" />
-				<resource base="slider" used="slider-used" touch="slider-touch" />
-				<action function="flash">flash_zip</action>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
 				<text>Swipe to Confirm Flash</text>
+				<action function="flash">flash_zip</action>
 			</object>
 
 			<object type="action">
@@ -288,14 +320,12 @@
 
 			<object type="template" name="flash_zip_console" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%col1_x%" y="%row16_text_y%" />
 				<text>Flashing file %tw_zip_index% of %tw_zip_queue_count%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%col1_x%" y="%row17_text_y%" />
 				<text>%tw_filename%</text>
 			</object>
@@ -313,26 +343,23 @@
 
 			<object type="template" name="flash_zip_console" />
 
-			<object type="text" color="%text_fail_color%">
+			<object type="text">
 				<condition var1="tw_operation_status" op="!=" var2="0" />
-				<font resource="font" />
+				<font resource="font" color="%text_fail_color%" />
 				<placement x="%center_x%" y="%row17_text_y%" placement="5" />
 				<text>Failed</text>
 			</object>
 
-			<object type="text" color="%text_success_color%">
+			<object type="text">
 				<condition var1="tw_operation_status" var2="0" />
-				<font resource="font" />
+				<font resource="font"  color="%text_success_color%" />
 				<placement x="%center_x%" y="%row17_text_y%" placement="5" />
 				<text>Successful</text>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%slider_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Wipe Cache/Dalvik</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=flash_done</action>
 					<action function="set">tw_action=wipe</action>
@@ -348,36 +375,13 @@
 				</actions>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<condition var1="tw_reboot_system" var2="1" />
+			<object type="button" style="rebootsystem">
 				<placement x="%col4_x%" y="%slider_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Reboot System</text>
-				<image resource="main_button" />
-				<actions>
-					<action function="set">tw_back=main2</action>
-					<action function="set">tw_action=reboot</action>
-					<action function="set">tw_action_param=system</action>
-					<action function="set">tw_has_action2=0</action>
-					<action function="set">tw_text1=No OS Installed! Are you</action>
-					<action function="set">tw_text2=sure you wish to reboot?</action>
-					<action function="set">tw_text3=</action>
-					<action function="set">tw_text4=</action>
-					<action function="set">tw_action_text1=Rebooting...</action>
-					<action function="set">tw_action_text2=</action>
-					<action function="set">tw_complete_text1=Rebooting...</action>
-					<action function="set">tw_slider_text=Swipe to Reboot</action>
-					<action function="page">rebootcheck</action>
-				</actions>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col_center_x%" y="%slider_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Home</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_clear_destination=main2</action>
 					<action function="page">clear_vars</action>
@@ -404,17 +408,13 @@
 		<page name="install_image">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>Select Image to Flash</text>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<fill color="%button_fill_color%" />
+			<object type="button" style="fillbutton">
 				<placement x="%button_full_center_x%" y="%zipstorage_text_y%" w="%button_fill_full_width%" h="%button_fill_quarter_height%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Storage: %tw_storage_display_name% (%tw_storage_free_size% MB)</text>
 				<actions>
 					<action function="set">tw_back=install_image</action>
@@ -423,32 +423,16 @@
 			</object>
 
 			<object type="fileselector">
-				<highlight color="%fileselector_highlight_color%" />
 				<placement x="%fileselector_folder_x%" y="%fileselector_install_y%" w="%fileselector_folder_width%" h="%fileselector_install_height%" />
-				<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
-				<fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" />
 				<text>Folders:</text>
-				<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
-				<sort name="tw_gui_sort_order" />
-				<icon folder="folder_icon" file="file_icon" />
-				<background color="%fileselector_background%" />
-				<font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
 				<filter folders="1" files="0" />
 				<path name="tw_zip_location" default="/sdcard" />
 				<data name="select" />
 			</object>
 
 			<object type="fileselector">
-				<highlight color="%fileselector_highlight_color%" />
 				<placement x="%fileselector_file_x%" y="%fileselector_install_y%" w="%fileselector_file_width%" h="%fileselector_install_height%" />
-				<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
-				<fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" />
 				<text>%tw_zip_location%</text>
-				<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
-				<sort name="tw_gui_sort_order" />
-				<icon folder="folder_icon" file="file_icon" />
-				<background color="%fileselector_background%" />
-				<font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
 				<filter extn=".img" folders="0" files="1" />
 				<path name="tw_zip_location" />
 				<data name="tw_filename" />
@@ -458,11 +442,8 @@
 			<object type="template" name="sort_options" />
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%filemanager_select_x%" y="%filemanager_select_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Zips...</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="page">install</action>
 				</actions>
@@ -490,46 +471,35 @@
 			<object type="template" name="header" />
 
 			<object type="partitionlist">
-				<highlight color="%fileselector_highlight_color%" />
 				<placement x="%col2_x%" y="%row1_text_y%" w="%listbox_width%" h="%flash_list_height%" />
-				<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
-				<fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" />
 				<text>Select Partition to Flash Image:</text>
 				<icon selected="radio_true" unselected="radio_false" />
-				<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
-				<background color="%listbox_background%" />
-				<font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
 				<data name="tw_flash_partition" />
 				<listtype name="flashimg" />
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row8_text_y%" placement="5" />
 				<text>Folder:</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row9_text_y%" placement="5" />
 				<text>%tw_zip_location%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row10_text_y%" placement="5" />
 				<text>File to flash:</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row11_text_y%" placement="5" />
 				<text>%tw_file%</text>
 			</object>
 
 			<object type="slider">
-				<placement x="%slider_x%" y="%slider_y%" placement="5" />
-				<resource base="slider" used="slider-used" touch="slider-touch" />
+				<text>Swipe to Confirm Flash</text>
 				<actions>
 					<action function="set">tw_back=flashimage_confirm</action>
 					<action function="set">tw_action=flashimage</action>
@@ -542,12 +512,6 @@
 				<action function="flashimage"></action>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
-				<text>Swipe to Confirm Flash</text>
-			</object>
-
 			<object type="action">
 				<touch key="back" />
 				<actions>
@@ -592,46 +556,34 @@
 		<page name="confirm_action">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>%tw_text1%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row2_text_y%" placement="5" />
 				<text>%tw_text2%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row3_text_y%" placement="5" />
 				<text>%tw_text3%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row4_text_y%" placement="5" />
 				<text>%tw_text4%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row12_text_y%" placement="5" />
 				<text>Press back button to cancel.</text>
 			</object>
 
 			<object type="slider">
-				<placement x="%slider_x%" y="%slider_y%" />
-				<resource base="slider" used="slider-used" touch="slider-touch" />
-				<action function="page">action_page</action>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
 				<text>%tw_slider_text%</text>
+				<action function="page">action_page</action>
 			</object>
 
 			<object type="action">
@@ -653,14 +605,12 @@
 		<page name="action_page">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>%tw_action_text1%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row2_text_y%" placement="5" />
 				<text>%tw_action_text2%</text>
 			</object>
@@ -668,12 +618,9 @@
 			<object type="template" name="action_page_console" />
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<condition var1="tw_has_cancel" var2="1" />
-                                <placement x="%col_center_x%" y="%cancel_button_y%" />
-				<font resource="font" color="%button_text_color%" />
+				<placement x="%col_center_x%" y="%cancel_button_y%" />
 				<text>Cancel</text>
-				<image resource="main_button" />
 				<action function="%tw_cancel_action%">%tw_cancel_param%</action>
 			</object>
 
@@ -705,14 +652,12 @@
 		<page name="singleaction_page">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>%tw_action_text1%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row2_text_y%" placement="5" />
 				<text>%tw_action_text2%</text>
 			</object>
@@ -747,22 +692,21 @@
 		<page name="action_complete">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>%tw_complete_text1%</text>
 			</object>
 
-			<object type="text" color="%text_fail_color%">
+			<object type="text">
 				<condition var1="tw_operation_status" op="!=" var2="0" />
-				<font resource="font" />
+				<font resource="font" color="%text_fail_color%" />
 				<placement x="%center_x%" y="%row2_text_y%" placement="5" />
 				<text>Failed</text>
 			</object>
 
-			<object type="text" color="%text_success_color%">
+			<object type="text">
 				<condition var1="tw_operation_status" var2="0" />
-				<font resource="font" />
+				<font resource="font" color="%text_success_color%" />
 				<placement x="%center_x%" y="%row2_text_y%" placement="5" />
 				<text>Successful</text>
 			</object>
@@ -770,40 +714,18 @@
 			<object type="template" name="action_page_console" />
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<condition var1="tw_show_reboot" var2="0" />
 				<placement x="%col_center_x%" y="%slider_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Back</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_clear_destination=%tw_back%</action>
 					<action function="page">clear_vars</action>
 				</actions>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
+			<object type="button" style="rebootsystem">
 				<condition var1="tw_show_reboot" var2="1" />
 				<placement x="%col_center_x%" y="%slider_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Reboot System</text>
-				<image resource="main_button" />
-				<actions>
-					<action function="set">tw_back=main2</action>
-					<action function="set">tw_action=reboot</action>
-					<action function="set">tw_action_param=system</action>
-					<action function="set">tw_has_action2=0</action>
-					<action function="set">tw_text1=No OS Installed! Are you</action>
-					<action function="set">tw_text2=sure you wish to reboot?</action>
-					<action function="set">tw_text3=</action>
-					<action function="set">tw_text4=</action>
-					<action function="set">tw_action_text1=Rebooting...</action>
-					<action function="set">tw_action_text2=</action>
-					<action function="set">tw_complete_text1=Rebooting...</action>
-					<action function="set">tw_slider_text=Swipe to Reboot</action>
-					<action function="page">rebootcheck</action>
-				</actions>
 			</object>
 
 			<object type="action">
@@ -866,40 +788,20 @@
 		<page name="reboot">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>Reboot Menu</text>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<condition var1="tw_reboot_system" var2="1" />
+			<object type="button" style="rebootsystem">
 				<placement x="%col1_x%" y="%row1_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>System</text>
-				<image resource="main_button" />
-				<actions>
-					<action function="set">tw_back=reboot</action>
-					<action function="set">tw_action=reboot</action>
-					<action function="set">tw_action_param=system</action>
-					<action function="set">tw_has_action2=0</action>
-					<action function="set">tw_text1=No OS Installed! Are you</action>
-					<action function="set">tw_text2=sure you wish to reboot?</action>
-					<action function="set">tw_action_text1=Rebooting...</action>
-					<action function="set">tw_complete_text1=Rebooting...</action>
-					<action function="set">tw_slider_text=Swipe to Reboot</action>
-					<action function="page">rebootcheck</action>
-				</actions>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<condition var1="tw_reboot_poweroff" var2="1" />
 				<placement x="%col2_x%" y="%row1_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Power Off</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=reboot</action>
 					<action function="set">tw_action=reboot</action>
@@ -915,12 +817,9 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<condition var1="tw_reboot_recovery" var2="1" />
 				<placement x="%col1_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Recovery</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=reboot</action>
 					<action function="set">tw_action=reboot</action>
@@ -936,12 +835,9 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<condition var1="tw_reboot_bootloader" var2="1" />
 				<placement x="%col2_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Bootloader</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=reboot</action>
 					<action function="set">tw_action=reboot</action>
@@ -957,12 +853,9 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<condition var1="tw_download_mode" var2="1" />
 				<placement x="%col3_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Download</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=reboot</action>
 					<action function="set">tw_action=reboot</action>
@@ -994,25 +887,16 @@
 			<object type="template" name="header" />
 
 			<object type="partitionlist">
-				<highlight color="%fileselector_highlight_color%" />
 				<placement x="%col2_x%" y="%fileselector_install_y%" w="%fileselector_folderonly_width%" h="%fileselector_install_height%" />
-				<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
-				<fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" />
 				<text>Select Storage:</text>
 				<icon selected="radio_true" unselected="radio_false" />
-				<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
-				<background color="%listbox_background%" />
-				<font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
 				<data name="tw_storage_path" />
 				<listtype name="storage" />
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%filemanager_select_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>OK</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_clear_destination=%tw_back%</action>
 					<action function="page">clear_vars</action>
@@ -1037,91 +921,66 @@
 		<page name="mount">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>Mount Menu</text>
 			</object>
 
 			<object type="partitionlist">
-				<highlight color="%fileselector_highlight_color%" />
 				<placement x="%backup_list_x%" y="%backup_list_y%" w="%backup_list_width%" h="%mount_list_height%" />
-				<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
-				<fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" />
 				<text>Select Partitions to Mount:</text>
-				<icon selected="checkbox_true" unselected="checkbox_false" />
-				<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
-				<background color="%listbox_background%" />
-				<font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
 				<listtype name="mount" />
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<conditions>
 					<condition var1="tw_is_encrypted" var2="1" />
 					<condition var1="tw_is_decrypted" var2="0" />
 				</conditions>
 				<placement x="%col3_x%" y="row1_y" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Decrypt Data</text>
-				<image resource="main_button" />
 				<action function="page">decrypt</action>
 			</object>
 
 			<object type="button">
 				<condition var1="tw_has_usb_storage" var2="1" />
 				<placement x="%col4_x%" y="%row1_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Mount USB Storage</text>
-				<image resource="main_button" />
 				<action function="page">usb_mount</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<conditions>
 					<condition var1="tw_has_mtp" var2="1" />
 					<condition var1="tw_mtp_enabled" var2="0" />
 				</conditions>
 				<placement x="%col3_x%" y="row1_y" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Enable MTP</text>
-				<image resource="main_button" />
 				<action function="startmtp"></action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<conditions>
 					<condition var1="tw_has_mtp" var2="1" />
 					<condition var1="tw_mtp_enabled" var2="1" />
 				</conditions>
 				<placement x="%col3_x%" y="row1_y" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Disable MTP</text>
-				<image resource="main_button" />
 				<action function="stopmtp"></action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<conditions>
 					<condition var1="tw_is_encrypted" var2="1" />
 					<condition var1="tw_is_decrypted" var2="0" />
 				</conditions>
 				<placement x="%col3_x%" y="row1_y" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Decrypt Data</text>
-				<image resource="main_button" />
 				<action function="page">decrypt</action>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<fill color="%button_fill_color%" />
+			<object type="button" style="fillbutton">
 				<placement x="%col3_x%" y="%backup_storage_y%" w="%button_fill_main_width%" h="%button_fill_half_height%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Storage: %tw_storage_display_name% (%tw_storage_free_size% MB)</text>
 				<actions>
 					<action function="set">tw_back=mount</action>
@@ -1145,24 +1004,14 @@
 		<page name="usb_mount">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
-				<font resource="font" />
 				<text>USB Storage Mounted -- Be sure to safely remove your device from your computer before unmounting!</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<placement x="%col1_x%" y="%row2_text_y%" />
-				<font resource="font" />
-				<text></text>
-			</object>
-
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col_center_x%" y="%row1_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Unmount</text>
-				<image resource="main_button" />
 				<action function="page">usb_umount</action>
 			</object>
 
@@ -1188,58 +1037,47 @@
 		<page name="wipe">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>Factory Reset: Wipes Data, Cache, and Dalvik</text>
 			</object>
 
-			<object type="text" color="%text_color%">
+			<object type="text">
 				<condition var1="tw_has_data_media" var2="1" />
-				<font resource="font" />
 				<placement x="%center_x%" y="%row2_text_y%" placement="5" />
 				<text>(not including internal storage)</text>
 			</object>
 
-			<object type="text" color="%text_color%">
+			<object type="text">
 				<conditions>
 					<condition var1="tw_has_android_secure" var2="1" />
 					<condition var1="fileexists" var2="/and-sec" />
 				</conditions>
-				<font resource="font" />
 				<placement x="%center_x%" y="%row3_text_y%" placement="1" />
 				<text>Android Secure  </text>
 			</object>
 
-			<object type="text" color="%text_color%">
+			<object type="text">
 				<condition var1="tw_has_sdext_partition" var2="1" />
-				<font resource="font" />
 				<placement x="%center_x%" y="%row3_text_y%" />
 				<text>  SD-EXT</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row4_text_y%" placement="5" />
 				<text>Most of the time this is the only wipe that you need.</text>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%wipe_button_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Advanced Wipe</text>
-				<image resource="main_button" />
 				<action function="page">advancedwipe</action>
 			</object>
 
 			<object type="button">
 				<condition var1="tw_has_data_media" var2="1" />
-				<highlight color="%highlight_color%" />
 				<placement x="%col3_x%" y="%wipe_button_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Format Data</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="page">formatdata</action>
 				</actions>
@@ -1250,11 +1088,8 @@
 					<condition var1="tw_is_encrypted" var2="1" />
 					<condition var1="tw_has_data_media" var2="0" />
 				</conditions>
-				<highlight color="%highlight_color%" />
 				<placement x="%col3_x%" y="%wipe_button_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Wipe Encryption</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=wipe</action>
 					<action function="set">tw_action=wipe</action>
@@ -1269,15 +1104,13 @@
 				</actions>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row12_text_y%" placement="5" />
 				<text>Press back button to cancel.</text>
 			</object>
 
 			<object type="slider">
-				<placement x="%slider_x%" y="%slider_y%" />
-				<resource base="slider" used="slider-used" touch="slider-touch" />
+				<text>Swipe to Factory Reset</text>
 				<actions>
 					<action function="set">tw_back=wipe</action>
 					<action function="set">tw_action=wipe</action>
@@ -1288,12 +1121,6 @@
 				</actions>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
-				<text>Swipe to Factory Reset</text>
-			</object>
-
 			<object type="action">
 				<touch key="home" />
 				<action function="page">main</action>
@@ -1311,24 +1138,14 @@
 			<object type="template" name="header" />
 
 			<object type="partitionlist">
-				<highlight color="%fileselector_highlight_color%" />
 				<placement x="%backup_list_x%" y="%backup_list_y%" w="%backup_list_width%" h="%backup_list_height%" />
-				<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
-				<fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" />
 				<text>Select Partitions to Wipe:</text>
-				<icon selected="checkbox_true" unselected="checkbox_false" />
-				<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
-				<background color="%listbox_background%" />
-				<font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
 				<data name="tw_wipe_list" />
 				<listtype name="wipe" />
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<fill color="%button_fill_color%" />
+			<object type="button" style="fillbutton">
 				<placement x="%col3_x%" y="%backup_storage_y%" w="%button_fill_main_width%" h="%button_fill_half_height%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Repair or Change File System</text>
 				<actions>
 					<action function="checkpartitionlist"></action>
@@ -1336,16 +1153,15 @@
 				</actions>
 			</object>
 
-			<object type="text" color="%text_fail_color%">
+			<object type="text">
 				<condition var1="partitionlisterror" var2="1" />
-				<font resource="font" />
+				<font resource="font" color="%text_fail_color%"/>
 				<placement x="%col3_x%" y="%backup_storage_y%" />
 				<text>Invalid partition selection</text>
 			</object>
 
 			<object type="slider">
-				<placement x="%slider_x%" y="%slider_y%" />
-				<resource base="slider" used="slider-used" touch="slider-touch" />
+				<text>Swipe to Wipe</text>
 				<actions>
 					<action function="set">tw_back=advancedwipe</action>
 					<action function="set">tw_action=wipe</action>
@@ -1357,12 +1173,6 @@
 				</actions>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
-				<text>Swipe to Wipe</text>
-			</object>
-
 			<object type="action">
 				<touch key="home" />
 				<action function="page">main</action>
@@ -1379,35 +1189,28 @@
 		<page name="formatdata">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>Format Data will wipe all of your apps, backups, pictures,</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row2_text_y%" placement="5" />
 				<text>videos, media, and removes encryption on internal storage.</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row3_text_y%" placement="5" />
 				<text>This cannot be undone. Press back to cancel.</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row4_text_y%" placement="5" />
 				<text>Type yes to continue.</text>
 			</object>
 
 			<object type="input">
 				<placement x="%input_x%" y="%row6_text_y%" w="%input_width%" h="%input_height%" placement="0" />
-				<background color="%input_background_color%" />
-				<cursor color="%input_cursor_color%" hasfocus="1" width="%input_cursor_width%" />
-				<font resource="font" color="%text_color%" />
 				<text>%tw_confirm_formatdata%</text>
 				<data name="tw_confirm_formatdata" />
 				<restrict minlen="3" maxlen="3" allow="yes" />
@@ -1471,83 +1274,69 @@
 		<page name="partitionoptions">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%col1_x%" y="%row1_text_y%" />
 				<text>Partition Options for: %tw_partition_name%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%col_right_x%" y="%row1_text_y%" placement="1" />
 				<text>Mount Point: %tw_partition_mount_point%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row2_text_y%" placement="5" />
 				<text>Current file system: %tw_partition_file_system%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
+			<object type="text">
 				<condition var1="tw_partition_is_present" op="!=" var2="0" />
-				<font resource="font" />
 				<placement x="%col2_x%" y="%row3_text_y%" />
 				<text>Present: Yes</text>
 			</object>
 
-			<object type="text" color="%text_color%">
+			<object type="text">
 				<condition var1="tw_partition_is_present" op="=" var2="0" />
-				<font resource="font" />
 				<placement x="%col2_x%" y="%row3_text_y%" />
 				<text>Present: No</text>
 			</object>
 
-			<object type="text" color="%text_color%">
+			<object type="text">
 				<condition var1="tw_partition_removable" op="!=" var2="0" />
-				<font resource="font" />
 				<placement x="%col3_x%" y="%row3_text_y%" />
 				<text>Removable: Yes</text>
 			</object>
 
-			<object type="text" color="%text_color%">
+			<object type="text">
 				<condition var1="tw_partition_removable" op="=" var2="0" />
-				<font resource="font" />
 				<placement x="%col3_x%" y="%row3_text_y%" />
 				<text>Removable: No</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%col1_x%" y="%row4_text_y%" />
 				<text>Size: %tw_partition_size%MB</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%col2_x%" y="%row4_text_y%" />
 				<text>Used: %tw_partition_used%MB</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%col3_x%" y="%row4_text_y%" />
 				<text>Free: %tw_partition_free%MB</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%col4_x%" y="%row4_text_y%" />
 				<text>Backup Size: %tw_partition_backup_size%MB</text>
 			</object>
 
 			<object type="button">
 				<condition var1="tw_partition_can_repair" op="=" var2="1" />
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Repair</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=partitionoptions</action>
 					<action function="set">tw_action=repair</action>
@@ -1563,11 +1352,8 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col3_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Change File System</text>
-				<image resource="main_button" />
 				<action function="page">selectfilesystem</action>
 			</object>
 
@@ -1607,37 +1393,30 @@
 		<page name="selectfilesystem">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%col1_x%" y="%row1_text_y%" />
 				<text>Change file system for: %tw_partition_name%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%col_right_x%" y="%row1_text_y%" placement="1" />
 				<text>Mount Point: %tw_partition_mount_point%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>Current file system: %tw_partition_file_system%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row2_text_y%" placement="5" />
 				<text>Some ROMs or kernels may not support some file systems. Proceed with caution!</text>
 			</object>
 
 			<object type="button">
 				<condition var1="tw_partition_ext" op="=" var2="1" />
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row1_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>EXT2</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=refreshfilesystem</action>
 					<action function="set">tw_action=changefilesystem</action>
@@ -1655,11 +1434,8 @@
 
 			<object type="button">
 				<condition var1="tw_partition_ext" op="=" var2="1" />
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%row1_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>EXT3</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=refreshfilesystem</action>
 					<action function="set">tw_action=changefilesystem</action>
@@ -1677,11 +1453,8 @@
 
 			<object type="button">
 				<condition var1="tw_partition_ext" op="=" var2="1" />
-				<highlight color="%highlight_color%" />
 				<placement x="%col3_x%" y="%row1_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>EXT4</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=refreshfilesystem</action>
 					<action function="set">tw_action=changefilesystem</action>
@@ -1699,11 +1472,8 @@
 
 			<object type="button">
 				<condition var1="tw_partition_f2fs" op="=" var2="1" />
-				<highlight color="%highlight_color%" />
 				<placement x="%col4_x%" y="%row1_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>F2FS</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=refreshfilesystem</action>
 					<action function="set">tw_action=changefilesystem</action>
@@ -1721,11 +1491,8 @@
 
 			<object type="button">
 				<condition var1="tw_partition_vfat" op="=" var2="1" />
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>FAT</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=refreshfilesystem</action>
 					<action function="set">tw_action=changefilesystem</action>
@@ -1743,11 +1510,8 @@
 
 			<object type="button">
 				<condition var1="tw_partition_exfat" op="=" var2="1" />
-				<highlight color="%highlight_color%" />
 				<placement x="%col3_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>exFAT</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=refreshfilesystem</action>
 					<action function="set">tw_action=changefilesystem</action>
@@ -1779,38 +1543,26 @@
 		<page name="backup">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>Back Up Device</text>
 			</object>
 
 			<object type="partitionlist">
-				<highlight color="%fileselector_highlight_color%" />
 				<placement x="%backup_list_x%" y="%backup_list_y%" w="%backup_list_width%" h="%backup_list_height%" />
-				<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
-				<fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" />
 				<text>Select Partitions to Back Up:</text>
-				<icon selected="checkbox_true" unselected="checkbox_false" />
-				<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
-				<background color="%listbox_background%" />
-				<font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
 				<data name="tw_backup_list" />
 				<listtype name="backup" />
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%col_right_x%" y="%row2_text_y%" placement="1" />
 				<text>Backup Name: %tw_backup_name%</text>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col3_x%" y="%row1_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Refresh Sizes</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="refreshsizes"></action>
 					<action function="page">backup</action>
@@ -1818,22 +1570,16 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col4_x%" y="%row1_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Set Backup Name</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_fileexists=0</action>
 					<action function="page">backupname1</action>
 				</actions>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<fill color="%button_fill_color%" />
+			<object type="button" style="fillbutton">
 				<placement x="%col3_x%" y="%backup_storage_y%" w="%button_fill_main_width%" h="%button_fill_half_height%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Storage: %tw_storage_display_name% (%tw_storage_free_size% MB)</text>
 				<actions>
 					<action function="set">tw_back=backup</action>
@@ -1841,30 +1587,24 @@
 				</actions>
 			</object>
 
-			<object type="button">
+			<object type="button" style="fillbutton">
 				<conditions>
 					<condition var1="tw_include_encrypted_backup" var2="1" />
 					<condition var1="tw_encrypt_backup" var2="0" />
 				</conditions>
-				<highlight color="%highlight_color%" />
-				<fill color="%button_fill_color%" />
 				<placement x="%col3_x%" y="%backup_encrypt_y%" w="%button_fill_main_width%" h="%button_fill_half_height%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>No Encryption</text>
 				<actions>
 					<action function="page">backupencryption</action>
 				</actions>
 			</object>
 
-			<object type="button">
+			<object type="button" style="fillbutton">
 				<conditions>
 					<condition var1="tw_include_encrypted_backup" var2="1" />
 					<condition var1="tw_encrypt_backup" var2="1" />
 				</conditions>
-				<highlight color="%highlight_color%" />
-				<fill color="%button_fill_color%" />
 				<placement x="%col3_x%" y="%backup_encrypt_y%" w="%button_fill_main_width%" h="%button_fill_half_height%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Using Encryption</text>
 				<actions>
 					<action function="page">backupencryption</action>
@@ -1873,35 +1613,24 @@
 
 			<object type="checkbox">
 				<placement x="%col3_x%" y="%nandcheck_row6%" />
-				<font resource="font" color="%text_color%" />
 				<text>Enable Compression (Requires more time)</text>
 				<data variable="tw_use_compression" />
-				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="checkbox">
 				<placement x="%col3_x%" y="%nandcheck_row7%" />
-				<font resource="font" color="%text_color%" />
 				<text>Skip MD5 generation on backups</text>
 				<data variable="tw_skip_md5_generate" />
-				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="slider">
-				<placement x="%slider_x%" y="%slider_y%" />
-				<resource base="slider" used="slider-used" touch="slider-touch" />
+				<text>Swipe to Back Up</text>
 				<actions>
 					<action function="set">tw_operation_state=0</action>
 					<action function="page">backup_run</action>
 				</actions>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
-				<text>Swipe to Back Up</text>
-			</object>
-
 			<object type="action">
 				<touch key="home" />
 				<action function="page">main</action>
@@ -1929,17 +1658,13 @@
 		<page name="backupname2">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
-				<font resource="font" />
 				<text>Please Enter a Backup Name</text>
 			</object>
 
 			<object type="input">
 				<placement x="%input_x%" y="%row3_text_y%" w="%input_width%" h="%input_height%" placement="0" />
-				<background color="%input_background_color%" />
-				<cursor color="%input_cursor_color%" hasfocus="1" width="%input_cursor_width%" />
-				<font resource="font" color="%text_color%" />
 				<text>%tw_backup_name%</text>
 				<data name="tw_backup_name" />
 				<restrict minlen="1" maxlen="64" allow=" abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_.{}[]" />
@@ -1951,28 +1676,22 @@
 				</actions>
 			</object>
 
-			<object type="text" color="%text_fail_color%">
+			<object type="text">
 				<condition var1="tw_fileexists" var2="1" />
 				<placement x="%center_x%" y="%row5_text_y%" placement="5" />
-				<font resource="font" />
+				<font resource="font" color="%text_fail_color%"/>
 				<text>A backup with that name already exists!</text>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%cancel_button_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Append Date</text>
-				<image resource="main_button" />
 				<action function="appenddatetobackupname"></action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col3_x%" y="%cancel_button_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Cancel / Clear</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_backup_name=(Auto Generate)</action>
 					<action function="page">backup</action>
@@ -2003,36 +1722,29 @@
 		<page name="backupencryption">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>Encrypt your backup? Please enter a password:</text>
 			</object>
 
 			<object type="input">
 				<placement x="%input_x%" y="%row3_text_y%" w="%input_width%" h="%input_height%" placement="0" />
-				<background color="%input_background_color%" />
-				<cursor color="%input_cursor_color%" hasfocus="1" width="%input_cursor_width%" />
-				<font resource="font" color="%text_color%" />
 				<text>%tw_backup_encrypt_display%</text>
 				<data name="tw_backup_password" mask="*" maskvariable="tw_backup_encrypt_display" />
 				<restrict minlen="1" maxlen="32" allow="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890_" />
 				<action function="page">backupencryption2</action>
 			</object>
 
-			<object type="text" color="%text_fail_color%">
+			<object type="text">
 				<condition var1="tw_password_not_match" var2="1" />
-				<font resource="font" />
+				<font resource="font" color="%text_fail_color%"/>
 				<placement x="%center_x%" y="%row4_text_y%" placement="5" />
 				<text>Passwords Do Not Match</text>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col_center_x%" y="%cancel_button_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Cancel</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_encrypt_backup=0</action>
 					<action function="set">tw_backup_password=</action>
@@ -2061,17 +1773,13 @@
 		<page name="backupencryption2">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>Encrypt your backup? Please Enter Password Again:</text>
 			</object>
 
 			<object type="input">
 				<placement x="%input_x%" y="%row3_text_y%" w="%input_width%" h="%input_height%" placement="0" />
-				<background color="%input_background_color%" />
-				<cursor color="%input_cursor_color%" hasfocus="1" width="%input_cursor_width%" />
-				<font resource="font" color="%text_color%" />
 				<text>%tw_backup_encrypt_display2%</text>
 				<data name="tw_backup_password2" mask="*" maskvariable="tw_backup_encrypt_display2" />
 				<restrict minlen="1" maxlen="32" allow="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890_" />
@@ -2081,11 +1789,8 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col_center_x%" y="%cancel_button_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Cancel</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_encrypt_backup=0</action>
 					<action function="set">tw_backup_password=</action>
@@ -2137,32 +1842,26 @@
 		<page name="backup_run">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>%tw_operation% %tw_partition%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%col1_x%" y="%row2_text_y%" />
 				<text>%tw_file_progress%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%col_right_x%" y="%row2_text_y%" placement="1" />
 				<text>%tw_size_progress%</text>
 			</object>
 
 			<object type="template" name="action_page_console" />
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<placement x="%col_center_medium_x%" y="%row3_y%" />
-				<font resource="font" color="%button_text_color%" />
+			<object type="button" style="mediumbutton">
+				<placement x="%filemanager_select_x%" y="%filemanager_select_y%" />
 				<text>Cancel</text>
-				<image resource="medium_button" />
 				<actions>
 					<action function="cancelbackup"></action>
 				</actions>
@@ -2202,11 +1901,8 @@
 		<page name="restore">
 			<object type="template" name="header" />
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<fill color="%button_fill_color%" />
+			<object type="button" style="fillbutton">
 				<placement x="%col2_x%" y="%zipstorage_text_y%" w="%fileselector_folderonly_width%" h="%button_fill_quarter_height%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Storage: %tw_storage_display_name% (%tw_storage_free_size% MB)</text>
 				<actions>
 					<action function="set">tw_back=restore</action>
@@ -2215,16 +1911,8 @@
 			</object>
 
 			<object type="fileselector">
-				<highlight color="%fileselector_highlight_color%" />
 				<placement x="%col2_x%" y="%fileselector_install_y%" w="%fileselector_folderonly_width%" h="%fileselector_install_height%" />
-				<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
-				<fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" />
 				<text>Select Package to Restore:</text>
-				<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
-				<sort name="tw_gui_sort_order" />
-				<font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
-				<icon folder="folder_icon" file="file_icon" />
-				<background color="%fileselector_background%" />
 				<filter folders="1" files="0" nav="0" />
 				<path name="tw_backups_folder" />
 				<data name="tw_restore" default="" />
@@ -2274,17 +1962,13 @@
 		<page name="restore_decrypt">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>Backup encrypted. Please enter your password:</text>
 			</object>
 
 			<object type="input">
 				<placement x="%input_x%" y="%row3_text_y%" w="%input_width%" h="%input_height%" placement="0" />
-				<background color="%input_background_color%" />
-				<cursor color="%input_cursor_color%" hasfocus="1" width="%input_cursor_width%" />
-				<font resource="font" color="%text_color%" />
 				<text>%tw_restore_display%</text>
 				<data name="tw_restore_password" mask="*" maskvariable="tw_restore_display" />
 				<restrict minlen="1" maxlen="32" allow="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890_" />
@@ -2293,19 +1977,16 @@
 				</actions>
 			</object>
 
-			<object type="text" color="%text_fail_color%">
+			<object type="text">
 				<condition var1="tw_password_fail" var2="1" />
-				<font resource="font" />
+				<font resource="font" color="%text_fail_color%" />
 				<placement x="%center_x%" y="%row4_text_y%" placement="5" />
 				<text>Password Failed, Please Try Again</text>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%cancel_button_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Cancel</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_page_done=1</action>
 					<action function="page">restore</action>
@@ -2313,11 +1994,8 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col3_x%" y="%cancel_button_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Delete</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=restore</action>
 					<action function="set">tw_action=cmd</action>
@@ -2349,8 +2027,7 @@
 		<page name="try_restore_decrypt">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>Trying Decryption with Your Password</text>
 			</object>
@@ -2389,46 +2066,32 @@
 		<page name="restore_select">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>Package to Restore: %tw_restore_name%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row2_text_y%" placement="5" />
 				<text>Package Date: %tw_restore_file_date%</text>
 			</object>
 
 			<object type="partitionlist">
-				<highlight color="%fileselector_highlight_color%" />
 				<placement x="%backup_list_x%" y="%restore_list_y%" w="%backup_list_width%" h="%restore_list_height%" />
-				<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
-				<fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" />
 				<text>Select Partitions to Restore:</text>
-				<icon selected="checkbox_true" unselected="checkbox_false" />
-				<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
-				<background color="%listbox_background%" />
-				<font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
 				<data name="tw_restore_list" selectedlist="tw_restore_selected" />
 				<listtype name="restore" />
 			</object>
 
 			<object type="checkbox">
 				<placement x="%col3_x%" y="%nandcheck_row6%" />
-				<font resource="font" color="%text_color%" />
 				<text>Enable MD5 checking of backup files</text>
 				<data variable="tw_skip_md5_check" />
-				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col4_x%" y="%row1_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Rename Backup</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_backup_rename=</action>
 					<action function="set">tw_fileexists=0</action>
@@ -2437,11 +2100,8 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col3_x%" y="%row1_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Delete Backup</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=restore</action>
 					<action function="set">tw_action=cmd</action>
@@ -2456,15 +2116,8 @@
 			</object>
 
 			<object type="slider">
-				<placement x="%slider_x%" y="%slider_y%" />
-				<resource base="slider" used="slider-used" touch="slider-touch" />
-				<action function="page">restore_run</action>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
 				<text>Swipe to Restore</text>
+				<action function="page">restore_run</action>
 			</object>
 
 			<object type="action">
@@ -2483,17 +2136,13 @@
 		<page name="renamebackup">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
-				<font resource="font" />
 				<text>Please Enter a New Backup Name</text>
 			</object>
 
 			<object type="input">
 				<placement x="%input_x%" y="%row3_text_y%" w="%input_width%" h="%input_height%" placement="0" />
-				<background color="%input_background_color%" />
-				<cursor color="%input_cursor_color%" hasfocus="1" width="%input_cursor_width%" />
-				<font resource="font" color="%text_color%" />
 				<text>%tw_backup_rename%</text>
 				<data name="tw_backup_rename" />
 				<restrict minlen="1" maxlen="64" allow=" abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_.{}[]" />
@@ -2513,19 +2162,16 @@
 				</actions>
 			</object>
 
-			<object type="text" color="%text_fail_color%">
+			<object type="text">
 				<condition var1="tw_fileexists" var2="1" />
 				<placement x="%center_x%" y="%row5_text_y%" placement="5" />
-				<font resource="font" />
+				<font resource="font" color="%text_fail_color%" />
 				<text>A backup with that name already exists!</text>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col_center_x%" y="%cancel_button_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Cancel</text>
-				<image resource="main_button" />
 				<action function="page">restore_select</action>
 			</object>
 
@@ -2547,14 +2193,12 @@
 		<page name="restore_run">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>%tw_operation% %tw_partition%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row2_text_y%" placement="5" />
 				<text>%tw_size_progress%</text>
 			</object>
@@ -2581,102 +2225,75 @@
 		<page name="settings">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>Settings</text>
 			</object>
 
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row2_text_y%" />
-				<font resource="font" color="%text_color%" />
 				<text>Zip file signature verification?</text>
-				<data variable="tw_signed_zip_verify" />
-				<image checked="checkbox_true" unchecked="checkbox_false" />
+				<data variable="tw_signed_zip_verify" />>
 			</object>
 
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row3_text_y%" />
-				<font resource="font" color="%text_color%" />
 				<text>Use rm -rf instead of formatting?</text>
 				<data variable="tw_rm_rf" />
-				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row4_text_y%" />
-				<font resource="font" color="%text_color%" />
 				<text>Skip MD5 generation on backups</text>
 				<data variable="tw_skip_md5_generate" />
-				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row5_text_y%" />
-				<font resource="font" color="%text_color%" />
 				<text>Enable MD5 checking of backup files</text>
 				<data variable="tw_skip_md5_check" />
-				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row6_text_y%" />
-				<font resource="font" color="%text_color%" />
 				<text>Use 24-hour clock</text>
 				<data variable="tw_military_time" />
-				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row7_text_y%" />
-				<font resource="font" color="%text_color%" />
 				<text>Simulate most actions for theme testing</text>
 				<data variable="tw_simulate_actions" />
-				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="checkbox">
 				<condition var1="tw_simulate_actions" var2="1" />
 				<placement x="%col1_x%" y="%row8_text_y%" />
-				<font resource="font" color="%text_color%" />
 				<text>Simulate failure for actions</text>
 				<data variable="tw_simulate_fail" />
-				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Time Zone</text>
-				<image resource="main_button" />
 				<action function="page">timezone</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Restore Defaults</text>
-				<image resource="main_button" />
 				<action function="restoredefaultsettings"></action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col3_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Vibration Duration</text>
-				<image resource="main_button" />
 				<action function="page">Vibrate</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col4_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Screen</text>
-				<image resource="main_button" />
 				<action function="page">screen</action>
 			</object>
 
@@ -2696,22 +2313,15 @@
 		<page name="timezone">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>Select Time Zone</text>
 			</object>
 
-			<object type="listbox">
-				<highlight color="%fileselector_highlight_color%" />
+			<object type="listbox" style="scrolllist">
 				<placement x="%listbox_x%" y="%listbox_y%" w="%listbox_width%" h="%listbox_tz_height%" />
-				<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
-				<fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" />
 				<text>Select Time Zone:</text>
 				<icon selected="radio_true" unselected="radio_false" />
-				<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
-				<background color="%listbox_background%" />
-				<font resource="font" spacing="%listbox_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
 				<data name="tw_time_zone_guisel" />
 				<listitem name="(UTC -11) Samoa, Midway Island">BST11;BDT</listitem>
 				<listitem name="(UTC -10) Hawaii">HST10;HDT</listitem>
@@ -2741,65 +2351,46 @@
 
 			<object type="checkbox">
 				<placement x="%col1_medium_x%" y="%row11_text_y%" />
-				<font resource="font" color="%text_color%" />
 				<text>Do you use daylight savings time (DST)?</text>
 				<data variable="tw_time_zone_guidst" />
-				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row13_text_y%" placement="5" />
 				<text>Offset (usually 0): %tw_time_zone_guioffset%</text>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
+			<object type="button" style="mediumbutton">
 				<placement x="%col1_medium_x%" y="%row_offsetmedium_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>0</text>
-				<image resource="medium_button" />
 				<action function="set">tw_time_zone_guioffset=0</action>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
+			<object type="button" style="mediumbutton">
 				<placement x="%col2_medium_x%" y="%row_offsetmedium_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>15</text>
-				<image resource="medium_button" />
 				<action function="set">tw_time_zone_guioffset=15</action>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
+			<object type="button" style="mediumbutton">
 				<placement x="%col3_medium_x%" y="%row_offsetmedium_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>30</text>
-				<image resource="medium_button" />
 				<action function="set">tw_time_zone_guioffset=30</action>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
+			<object type="button" style="mediumbutton">
 				<placement x="%col4_medium_x%" y="%row_offsetmedium_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>45</text>
-				<image resource="medium_button" />
 				<action function="set">tw_time_zone_guioffset=45</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col4_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Set Time Zone</text>
-				<image resource="main_button" />
 				<action function="setguitimezone"></action>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row17_text_y%" placement="5" />
 				<text>Current Time Zone: %tw_time_zone%</text>
 			</object>
@@ -2820,15 +2411,13 @@
 		<page name="screen">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>Screen Settings</text>
 			</object>
 
 			<object type="button">
 				<placement x="%slidervalue_x%" y="%row3_text_y%" />
-				<font resource="font" color="%text_color%" />
 				<condition var1="tw_screen_timeout_secs" op="=" var2="0" />
 				<condition var1="tw_no_screen_timeout" op="!=" var2="1" />
 				<text>Enable screen timeout.</text>
@@ -2838,7 +2427,6 @@
 
 			<object type="button">
 				<placement x="%slidervalue_x%" y="%row3_text_y%" />
-				<font resource="font" color="%text_color%" />
 				<condition var1="tw_screen_timeout_secs" op="!=" var2="0" />
 				<condition var1="tw_no_screen_timeout" op="!=" var2="1" />
 				<text>Enable screen timeout.</text>
@@ -2847,12 +2435,11 @@
 			</object>
 
 			<object type="slidervalue">
-				<condition var1="tw_screen_timeout_secs" op="!=" var2="0" />
-				<condition var1="tw_no_screen_timeout" op="!=" var2="1" />
+				<conditions>
+					<condition var1="tw_screen_timeout_secs" op="!=" var2="0" />
+					<condition var1="tw_no_screen_timeout" op="!=" var2="1" />
+				</conditions>
 				<placement x="slidervalue_x" y="%row5_text_y%" w="%slidervalue_w%" />
-				<font resource="font" color="%text_color%" />
-				<colors line="%slidervalue_line_clr%" slider="%slidervalue_slider_clr%" />
-				<dimensions lineh="%slidervalue_lineh%" linepadding="%slidervalue_padding%" sliderw="%slidervalue_sliderw%" sliderh="%slidervalue_sliderh%" />
 				<text>Screen timeout in seconds:</text>
 				<data variable="tw_screen_timeout_secs" min="15" max="300" />
 			</object>
@@ -2860,9 +2447,6 @@
 			<object type="slidervalue">
 				<condition var1="tw_has_brightnesss_file" var2="1" />
 				<placement x="slidervalue_x" y="%row12_text_y%" w="%slidervalue_w%" />
-				<font resource="font" color="%text_color%" />
-				<colors line="%slidervalue_line_clr%" slider="%slidervalue_slider_clr%" />
-				<dimensions lineh="%slidervalue_lineh%" linepadding="%slidervalue_padding%" sliderw="%slidervalue_sliderw%" sliderh="%slidervalue_sliderh%" />
 				<text>Brightness: %tw_brightness_pct%%</text>
 				<data variable="tw_brightness_pct" min="10" max="100" />
 				<actions>
@@ -2889,15 +2473,13 @@
 		<page name="Vibrate">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>Vibration Settings :</text>
 			</object>
 
 			<object type="slidervalue">
 				<placement x="slidervalue_x" y="%row3_text_y%" w="%slidervalue_w%" />
-				<font resource="font" color="%text_color%" />
 				<text>Button Vibration:</text>
 				<data variable="tw_button_vibrate" min="0" max="300" />
 				<colors line="%slidervalue_line_clr%" slider="%slidervalue_slider_clr%" />
@@ -2905,7 +2487,6 @@
 
 			<object type="slidervalue">
 				<placement x="slidervalue_x" y="%row7_text_y%" w="%slidervalue_w%" />
-				<font resource="font" color="%text_color%" />
 				<text>Keyboard Vibration:</text>
 				<data variable="tw_keyboard_vibrate" min="0" max="300" />
 				<colors line="%slidervalue_line_clr%" slider="%slidervalue_slider_clr%" />
@@ -2913,7 +2494,6 @@
 
 			<object type="slidervalue">
 				<placement x="slidervalue_x" y="%row11_text_y%" w="%slidervalue_w%" />
-				<font resource="font" color="%text_color%" />
 				<text>Action Vibration:</text>
 				<data variable="tw_action_vibrate" min="0" max="500" />
 				<colors line="%slidervalue_line_clr%" slider="%slidervalue_slider_clr%" />
@@ -2935,18 +2515,14 @@
 		<page name="advanced">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>Advanced</text>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row1_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Copy Log to SD</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=advanced</action>
 					<action function="set">tw_action=copylog</action>
@@ -2959,67 +2535,46 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%row1_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Fix Permissions</text>
-				<image resource="main_button" />
 				<action function="page">fixperms</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col3_x%" y="%row1_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Terminal Command</text>
-				<image resource="main_button" />
 				<action function="page">terminalfolder</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col4_x%" y="%row1_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>ADB Sideload</text>
-				<image resource="main_button" />
 				<action function="page">sideload</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<condition var1="tw_allow_partition_sdcard" var2="1" />
 				<placement x="%col1_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Partition SD Card</text>
-				<image resource="main_button" />
 				<action function="page">partsdcard</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>File Manager</text>
-				<image resource="main_button" />
 				<action function="page">filemanagerlist</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col3_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Reload Theme</text>
-				<image resource="main_button" />
 				<action function="reload"></action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<condition var1="tw_show_dumlock" var2="1" />
 				<placement x="%col4_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>HTC Dumlock</text>
-				<image resource="main_button" />
 				<action function="page">htcdumlock</action>
 			</object>
 
@@ -3039,100 +2594,79 @@
 		<page name="partsdcard">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>Partition SD Card</text>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_sdext_x%" y="%row1_sdext_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text></text>
 				<image resource="minus_button" />
 				<action function="addsubtract">tw_sdext_size-128</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_sdext_x%" y="%row1_sdext_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text></text>
 				<image resource="plus_button" />
 				<action function="addsubtract">tw_sdext_size+128</action>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row_extsize_y%" placement="5" />
 				<text>EXT Size: %tw_sdext_size%</text>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_sdext_x%" y="%row2_sdext_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text></text>
 				<image resource="minus_button" />
 				<action function="addsubtract">tw_swap_size-32</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_sdext_x%" y="%row2_sdext_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text></text>
 				<image resource="plus_button" />
 				<action function="addsubtract">tw_swap_size+32</action>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row_swapsize_y%" placement="5" />
 				<text>Swap Size: %tw_swap_size%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row8_text_y%" placement="5" />
 				<text>File system: %tw_sdpart_file_system%</text>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
+			<object type="button" style="mediumbutton">
 				<placement x="%col2_medium_x%" y="%row4_medium_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>EXT3</text>
-				<image resource="medium_button" />
 				<action function="set">tw_sdpart_file_system=ext3</action>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
+			<object type="button" style="mediumbutton">
 				<condition var1="tw_sdext_disable_ext4" var2="0" />
 				<placement x="%col3_medium_x%" y="%row4_medium_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>EXT4</text>
-				<image resource="medium_button" />
 				<action function="set">tw_sdpart_file_system=ext4</action>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row12_text_y%" placement="5" />
 				<text>You will lose all files on your SD card!</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row13_text_y%" placement="5" />
 				<text>This action cannot be undone!</text>
 			</object>
 
 			<object type="slider">
-				<placement x="%slider_x%" y="%slider_y%" />
-				<resource base="slider" used="slider-used" touch="slider-touch" />
+				<text>Swipe to Confirm Partition</text>
 				<actions>
 					<action function="set">tw_back=partsdcard</action>
 					<action function="set">tw_action=partitionsd</action>
@@ -3146,12 +2680,6 @@
 				</actions>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
-				<text>Swipe to Confirm Partition</text>
-			</object>
-
 			<object type="action">
 				<touch key="home" />
 				<action function="page">main</action>
@@ -3169,19 +2697,14 @@
 		<page name="htcdumlock">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>HTC Dumlock</text>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
-				<condition var1="tw_show_dumlock" var2="1" />
 				<placement x="%col1_x%" y="%row1_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Restore Original Boot</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=htcdumlock</action>
 					<action function="set">tw_action=htcdumlockrestoreboot</action>
@@ -3194,12 +2717,8 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
-				<condition var1="tw_show_dumlock" var2="1" />
 				<placement x="%col2_x%" y="%row1_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Reflash Recovery->Boot</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=htcdumlock</action>
 					<action function="set">tw_action=htcdumlockreflashrecovery</action>
@@ -3212,12 +2731,8 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
-				<condition var1="tw_show_dumlock" var2="1" />
 				<placement x="%col1_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Install HTC Dumlock</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=htcdumlock</action>
 					<action function="set">tw_action=installhtcdumlock</action>
@@ -3251,15 +2766,8 @@
 			</object>
 
 			<object type="slider">
-				<placement x="%slider_x%" y="%slider_y%" />
-				<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" />
 				<text>Swipe to Unlock</text>
+				<action function="overlay"></action>
 			</object>
 		</page>
 
@@ -3267,23 +2775,14 @@
 		<page name="filemanagerlist">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5"/>
 				<text>File Manager: Select a File or Folder</text>
 			</object>
 
 			<object type="fileselector">
-				<highlight color="%fileselector_highlight_color%" />
 				<placement x="%fileselector_folder_x%" y="%fileselector_install_y%" w="%fileselector_folder_width%" h="%fileselector_install_height%" />
-				<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
-				<fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" />
 				<text>Folders:</text>
-				<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
-				<sort name="tw_gui_sort_order" />
-				<icon folder="folder_icon" file="file_icon" />
-				<background color="%fileselector_background%" />
-				<font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
 				<filter folders="1" files="0" />
 				<path name="tw_file_location1" default="/sdcard" />
 				<data name="select" />
@@ -3291,16 +2790,8 @@
 			</object>
 
 			<object type="fileselector">
-				<highlight color="%fileselector_highlight_color%" />
 				<placement x="%fileselector_file_x%" y="%fileselector_install_y%" w="%fileselector_file_width%" h="%fileselector_install_height%" />
-				<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
-				<fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" />
 				<text>%tw_file_location1%</text>
-				<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
-				<sort name="tw_gui_sort_order" />
-				<icon folder="folder_icon" file="file_icon" />
-				<background color="%fileselector_background%" />
-				<font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
 				<filter folders="0" files="1" />
 				<path name="tw_file_location1" default="/" />
 				<data name="tw_filename1" />
@@ -3334,11 +2825,8 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%filemanager_select_x%" y="%filemanager_select_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Select Folder</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_filename1=tw_file_location1</action>
 					<action function="set">tw_fm_isfolder=1</action>
@@ -3353,25 +2841,20 @@
 		<page name="filemanageroptions">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5"/>
 				<text>%tw_fm_type% Selected:</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row2_text_y%" placement="5"/>
 				<text>%tw_filename1%</text>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<condition var1="tw_fm_isfolder" var2="0" />
 				<placement x="%col1_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Copy File</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_filemanager_command=cp</action>
 					<action function="set">tw_fm_text1=Copying</action>
@@ -3380,12 +2863,9 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<condition var1="tw_fm_isfolder" var2="1" />
 				<placement x="%col1_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Copy Folder</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_filemanager_command=cd &quot;%tw_file_location1%&quot; && cd .. && cp -R</action>
 					<action function="set">tw_fm_text1=Copying</action>
@@ -3394,11 +2874,8 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Move</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_filemanager_command=mv</action>
 					<action function="set">tw_fm_text1=Moving</action>
@@ -3407,11 +2884,8 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col3_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>chmod 755</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_filemanager_command=chmod 755</action>
 					<action function="set">tw_fm_text1=chmod 755</action>
@@ -3424,11 +2898,8 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col4_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>chmod</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_filemanager_rename=0000</action>
 					<action function="set">tw_fm_text2=</action>
@@ -3440,11 +2911,8 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row1_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Delete</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_filemanager_command=rm -rf</action>
 					<action function="set">tw_fm_text1=Deleting</action>
@@ -3457,12 +2925,9 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<condition var1="tw_fm_isfolder" var2="0" />
 				<placement x="%col4_x%" y="%row1_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Rename File</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_filemanager_rename=tw_selection1</action>
 					<action function="set">tw_fm_text1=Renaming</action>
@@ -3472,12 +2937,9 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<condition var1="tw_fm_isfolder" var2="1" />
 				<placement x="%col4_x%" y="%row1_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Rename Folder</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_filemanager_rename=tw_selection1</action>
 					<action function="set">tw_fm_text1=Renaming</action>
@@ -3502,22 +2964,14 @@
 		<page name="choosedestinationfolder">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5"/>
 				<text>Browse to Destination Folder & Press Select</text>
 			</object>
 
 			<object type="fileselector">
-				<highlight color="%fileselector_highlight_color%" />
 				<placement x="%col2_x%" y="%fileselector_install_y%" w="%fileselector_folderonly_width%" h="%fileselector_install_height%" />
-				<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
-				<fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" />
 				<text>%tw_file_location2%</text>
-				<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
-				<sort name="tw_gui_sort_order" />
-				<font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
-				<icon folder="folder_icon" file="file_icon" />
 				<background color="%fileselector_background%" />
 				<filter folders="1" files="0" />
 				<path name="tw_file_location2" default="/sdcard" />
@@ -3537,11 +2991,8 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%filemanager_select_x%" y="%filemanager_select_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Select Folder</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_fm_text2=to</action>
 					<action function="set">tw_fm_text3=%tw_file_location2%</action>
@@ -3557,17 +3008,14 @@
 		<page name="filemanagerrenamefile">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
-				<font resource="font" />
+				<font resource="font" color="%text_color%" />
 				<text>Please Enter a New %tw_fm_type% Name</text>
 			</object>
 
 			<object type="input">
 				<placement x="%input_x%" y="%row3_text_y%" w="%input_width%" h="%input_height%" placement="0" />
-				<background color="%input_background_color%" />
-				<cursor color="%input_cursor_color%" hasfocus="1" width="%input_cursor_width%" />
-				<font resource="font" color="%text_color%" />
 				<text>%tw_filemanager_rename%</text>
 				<data name="tw_filemanager_rename" />
 				<restrict minlen="1" maxlen="128" />
@@ -3581,11 +3029,8 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col_center_x%" y="%cancel_button_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Cancel</text>
-				<image resource="main_button" />
 				<action function="page">filemanageroptions</action>
 			</object>
 
@@ -3607,17 +3052,13 @@
 		<page name="filemanagerrenamefolder">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
-				<font resource="font" />
 				<text>Please Enter a New %tw_fm_type% Name</text>
 			</object>
 
 			<object type="input">
 				<placement x="%input_x%" y="%row3_text_y%" w="%input_width%" h="%input_height%" placement="0" />
-				<background color="%input_background_color%" />
-				<cursor color="%input_cursor_color%" hasfocus="1" width="%input_cursor_width%" />
-				<font resource="font" color="%text_color%" />
 				<text>%tw_filemanager_rename%</text>
 				<data name="tw_filemanager_rename" />
 				<restrict minlen="1" maxlen="128" />
@@ -3631,11 +3072,8 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col_center_x%" y="%cancel_button_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Cancel</text>
-				<image resource="main_button" />
 				<action function="page">filemanageroptions</action>
 			</object>
 
@@ -3657,17 +3095,13 @@
 		<page name="filemanagerchmod">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
-				<font resource="font" />
 				<text>Please Enter New Permissions</text>
 			</object>
 
 			<object type="input">
 				<placement x="%input_x%" y="%row3_text_y%" w="%input_width%" h="%input_height%" placement="0" />
-				<background color="%input_background_color%" />
-				<cursor color="%input_cursor_color%" hasfocus="1" width="%input_cursor_width%" />
-				<font resource="font" color="%text_color%" />
 				<text>%tw_filemanager_rename%</text>
 				<data name="tw_filemanager_rename" />
 				<restrict minlen="3" maxlen="4" allow="0123456789" />
@@ -3680,11 +3114,8 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col_center_x%" y="%cancel_button_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Cancel</text>
-				<image resource="main_button" />
 				<action function="page">filemanageroptions</action>
 			</object>
 
@@ -3706,48 +3137,35 @@
 		<page name="filemanagerconfirm">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5"/>
 				<text>%tw_fm_text1%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row2_text_y%" placement="5"/>
 				<text>%tw_filename1%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row3_text_y%" placement="5"/>
 				<text>%tw_fm_text2%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row4_text_y%" placement="5"/>
 				<text>%tw_fm_text3%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row10_text_y%" placement="5"/>
 				<text>Press back button to cancel.</text>
 			</object>
 
 			<object type="slider">
-				<placement x="%slider_x%" y="%slider_y%" />
-				<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" />
-				<text>Swipe to Confirm</text>
-			</object>
-
 			<object type="action">
 				<touch key="back" />
 				<action function="page">%tw_back%</action>
@@ -3764,8 +3182,7 @@
 		<page name="filemanageracction">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>%tw_fm_text1%</text>
 			</object>
@@ -3815,17 +3232,13 @@
 		<page name="decrypt">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>Please Enter Your Password</text>
 			</object>
 
 			<object type="input">
 				<placement x="%input_x%" y="%row3_text_y%" w="%input_width%" h="%input_height%" placement="0" />
-				<background color="%input_background_color%" />
-				<cursor color="%input_cursor_color%" hasfocus="1" width="%input_cursor_width%" />
-				<font resource="font" color="%text_color%" />
 				<text>%tw_crypto_display%</text>
 				<data name="tw_crypto_password" mask="*" maskvariable="tw_crypto_display" />
 				<restrict minlen="1" maxlen="254" />
@@ -3834,19 +3247,16 @@
 				</actions>
 			</object>
 
-			<object type="text" color="%text_fail_color%">
+			<object type="text">
 				<condition var1="tw_password_fail" var2="1" />
-				<font resource="font" />
+				<font resource="font" color="%text_fail_color%" />
 				<placement x="%center_x%" y="%row4_text_y%" placement="5" />
 				<text>Password Failed, Please Try Again</text>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col_center_x%" y="%cancel_button_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Cancel</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_page_done=1</action>
 					<action function="page">main</action>
@@ -3861,8 +3271,7 @@
 		<page name="trydecrypt">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>Trying Decryption with Your Password</text>
 			</object>
@@ -3901,23 +3310,14 @@
 		<page name="terminalfolder">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5"/>
 				<text>Browse to Starting Folder</text>
 			</object>
 
 			<object type="fileselector">
-				<highlight color="%fileselector_highlight_color%" />
 				<placement x="%col2_x%" y="%fileselector_install_y%" w="%fileselector_folderonly_width%" h="%fileselector_install_height%" />
-				<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
-				<fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" />
 				<text>%tw_terminal_location%</text>
-				<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
-				<sort name="tw_gui_sort_order" />
-				<icon folder="folder_icon" file="file_icon" />
-				<background color="%fileselector_background%" />
-				<font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
 				<filter folders="1" files="0" />
 				<path name="tw_terminal_location" default="/" />
 				<data name="tw_terminal" />
@@ -3937,11 +3337,8 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%filemanager_select_x%" y="%filemanager_select_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Select Folder</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="page">terminalcommand</action>
 				</actions>
@@ -3955,42 +3352,31 @@
 
 			<object type="console">
 				<placement x="%console_x%" y="%terminal_console_y%" w="%console_width%" h="%terminal_console_height%" />
-				<color foreground="%console_foreground%" background="%console_background%" scroll="%console_scroll%" />
-				<font resource="fixed" />
 			</object>
 
-			<object type="text" color="%text_color%">
+			<object type="text">
 				<placement x="%input_x%" y="%terminal_text_y%" placement="0" />
-				<font resource="font" />
 				<text>Starting Path: %tw_terminal_location%</text>
 			</object>
 
 			<object type="input">
 				<condition var1="tw_terminal_state" var2="0" />
 				<placement x="%input_x%" y="%terminal_text_y%" w="%terminal_input_width%" h="%input_height%" placement="0" />
-				<background color="%input_background_color%" />
-				<cursor color="%input_cursor_color%" hasfocus="1" width="%input_cursor_width%" />
-				<font resource="font" color="%text_color%" />
 				<text>%tw_terminal_command%</text>
 				<data name="tw_terminal_command" />
 				<restrict minlen="1" />
 				<action function="terminalcommand">%tw_terminal_command%</action>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
+			<object type="button" style="mediumbutton">
 				<condition var1="tw_terminal_state" var2="1" />
 				<placement x="%filemanager_select_x%" y="%terminal_button_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>KILL</text>
-				<image resource="medium_button" />
 				<action function="killterminal"></action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%home_button_x%" y="%terminal_button_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text></text>
 				<image resource="home_icon" />
 				<condition var1="tw_busy" var2="0" />
@@ -3998,9 +3384,7 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%back_button_x%" y="%terminal_button_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text></text>
 				<image resource="back_icon" />
 				<condition var1="tw_busy" var2="0" />
@@ -4033,31 +3417,25 @@
 		<page name="sideload">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5"/>
 				<text>ADB Sideload</text>
 			</object>
 
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row3_text_y%" />
-				<font resource="font" color="%text_color%" />
 				<text>Wipe Dalvik Cache.</text>
 				<data variable="tw_wipe_dalvik" />
-				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row4_text_y%" />
-				<font resource="font" color="%text_color%" />
 				<text>Wipe Cache.</text>
 				<data variable="tw_wipe_cache" />
-				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="slider">
-				<placement x="%slider_x%" y="%slider_y%" />
-				<resource base="slider" used="slider-used" touch="slider-touch" />
+				<text>Swipe to Start Sideload</text>
 				<actions>
 					<action function="set">tw_back=advanced</action>
 					<action function="set">tw_action=adbsideload</action>
@@ -4071,12 +3449,6 @@
 				</actions>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
-				<text>Swipe to Start Sideload</text>
-			</object>
-
 			<object type="action">
 				<touch key="home" />
 				<action function="page">main</action>
@@ -4093,35 +3465,29 @@
 		<page name="fixperms">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5"/>
 				<text>Fix Permissions</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%col2_x%" y="%row2_text_y%" />
 				<text>Note: Fixing permissions is rarely needed.</text>
 			</object>
 
 			<object type="checkbox">
 				<placement x="%col2_x%" y="%row3_text_y%" />
-				<font resource="font" color="%text_color%" />
 				<text>Also fix SELinux contexts</text>
 				<data variable="tw_fixperms_restorecon" />
-				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%col2_x%" y="%row4_text_y%" />
 				<text>Fixing SELinux contexts may cause your device to not boot properly.</text>
 			</object>
 
 			<object type="slider">
-				<placement x="%slider_x%" y="%slider_y%" />
-				<resource base="slider" used="slider-used" touch="slider-touch" />
+				<text>Swipe to Fix Permissions</text>
 				<actions>
 					<action function="set">tw_back=advanced</action>
 					<action function="set">tw_action=fixpermissions</action>
@@ -4133,12 +3499,6 @@
 				</actions>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
-				<text>Swipe to Fix Permissions</text>
-			</object>
-
 			<object type="action">
 				<touch key="home" />
 				<action function="page">main</action>
@@ -4155,36 +3515,29 @@
 		<page name="installsu">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5"/>
 				<text>Install SuperSU?</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row2_text_y%" placement="5"/>
 				<text>Your device does not appear to be rooted.</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row3_text_y%" placement="5"/>
 				<text>Install SuperSU now? This will root your device.</text>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col_center_x%" y="%row2_medium_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Do Not Install</text>
-				<image resource="main_button" />
 				<action function="set">tw_page_done=1</action>
 			</object>
 
 			<object type="slider">
-				<placement x="%slider_x%" y="%slider_y%" />
-				<resource base="slider" used="slider-used" touch="slider-touch" />
+				<text>Swipe to Install</text>
 				<actions>
 					<action function="set">tw_action=installsu</action>
 					<action function="set">tw_action_text1=Installing SuperSU</action>
@@ -4192,12 +3545,6 @@
 					<action function="page">singleaction_page</action>
 				</actions>
 			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
-				<text>Swipe to Install</text>
-			</object>
 		</page>
 	</pages>
 </recovery>
diff --git a/gui/devices/portrait/res/portrait.xml b/gui/devices/portrait/res/portrait.xml
index fe61671..6fb52f3 100644
--- a/gui/devices/portrait/res/portrait.xml
+++ b/gui/devices/portrait/res/portrait.xml
@@ -1,6 +1,102 @@
 <?xml version="1.0"?>
 
 <recovery>
+	<styles>
+		<style name="buttontext">
+			<highlight color="%highlight_color%" />
+			<font resource="font" color="%button_text_color%" />
+		</style>
+
+		<style name="button">
+			<style name="buttontext" />
+			<image resource="main_button" />
+		</style>
+
+		<style name="mediumbutton">
+			<style name="buttontext" />
+			<image resource="medium_button" />
+		</style>
+
+		<style name="fillbutton">
+			<style name="buttontext" />
+			<fill color="%button_fill_color%" />
+		</style>
+
+		<style name="rebootsystem">
+			<condition var1="tw_reboot_system" var2="1" />
+			<style name="button" />
+			<text>Reboot System</text>
+			<actions>
+				<action function="set">tw_back=main2</action>
+				<action function="set">tw_action=reboot</action>
+				<action function="set">tw_action_param=system</action>
+				<action function="set">tw_has_action2=0</action>
+				<action function="set">tw_text1=No OS Installed! Are you</action>
+				<action function="set">tw_text2=sure you wish to reboot?</action>
+				<action function="set">tw_text3=</action>
+				<action function="set">tw_text4=</action>
+				<action function="set">tw_action_text1=Rebooting...</action>
+				<action function="set">tw_action_text2=</action>
+				<action function="set">tw_complete_text1=Rebooting...</action>
+				<action function="set">tw_slider_text=Swipe to Reboot</action>
+				<action function="page">rebootcheck</action>
+			</actions>
+		</style>
+
+		<style name="scrolllist">
+			<highlight color="%fileselector_highlight_color%" />
+			<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
+			<fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" />
+			<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
+			<background color="%fileselector_background%" />
+			<font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
+		</style>
+
+		<style name="fileselector">
+			<style name="scrolllist" />
+			<icon folder="folder_icon" file="file_icon" />
+			<sort name="tw_gui_sort_order" />
+		</style>
+
+		<style name="partitionlist">
+			<style name="scrolllist" />
+			<icon selected="checkbox_true" unselected="checkbox_false" />
+		</style>
+
+		<style name="text">
+			<font resource="font" color="%text_color%" />
+		</style>
+
+		<style name="checkbox">
+			<font resource="font" color="%text_color%" />
+			<image checked="checkbox_true" unchecked="checkbox_false" />
+		</style>
+
+		<style name="slider">
+			<text>Swipe to Confirm</text>
+			<font resource="font" color="%text_color%" />
+			<placement x="%slider_x%" y="%slider_y%" placement="5" />
+			<resource base="slider" used="slider-used" touch="slider-touch" />
+		</style>
+
+		<style name="console">
+			<color foreground="%console_foreground%" background="%console_background%" scroll="%console_scroll%" />
+			<font resource="fixed" />
+		</style>
+
+		<style name="input">
+			<background color="%input_background_color%" />
+			<cursor color="%input_cursor_color%" hasfocus="1" width="%input_cursor_width%" />
+			<font resource="font" color="%text_color%" />
+		</style>
+
+		<style name="slidervalue">
+			<font resource="font" color="%text_color%" />
+			<colors line="%slidervalue_line_clr%" slider="%slidervalue_slider_clr%" />
+			<dimensions lineh="%slidervalue_lineh%" linepadding="%slidervalue_padding%" sliderw="%slidervalue_sliderw%" sliderh="%slidervalue_sliderh%" />
+		</style>
+	</styles>
+
 	<pages>
 		<page name="main">
 			<object type="action">
@@ -15,11 +111,8 @@
 			<object type="template" name="header" />
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row1_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Install</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="queueclear"></action>
 					<action function="page">install</action>
@@ -27,66 +120,44 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%row1_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Wipe</text>
-				<image resource="main_button" />
 				<action function="page">wipe</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Backup</text>
-				<image resource="main_button" />
 				<action function="page">backup</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Restore</text>
-				<image resource="main_button" />
 				<action function="page">restore</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row3_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Mount</text>
-				<image resource="main_button" />
 				<action function="page">mount</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%row3_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Settings</text>
-				<image resource="main_button" />
 				<action function="page">settings</action>
 			</object>
 
-
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row4_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Advanced</text>
-				<image resource="main_button" />
 				<action function="page">advanced</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%row4_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Reboot</text>
-				<image resource="main_button" />
 				<action function="page">reboot</action>
 			</object>
 
@@ -96,17 +167,13 @@
 		<page name="install">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
 				<text>Select Zip to Install</text>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<fill color="%button_fill_color%" />
+			<object type="button" style="fillbutton">
 				<placement x="%col1_x%" y="%row1_text_y%" w="%button_fill_full_width%" h="%button_fill_quarter_height%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Storage: %tw_storage_display_name% (%tw_storage_free_size% MB)</text>
 				<actions>
 					<action function="set">tw_back=install</action>
@@ -115,16 +182,8 @@
 			</object>
 
 			<object type="fileselector">
-				<highlight color="%fileselector_highlight_color%" />
 				<placement x="%fileselector_x%" y="%row3_text_y%" w="%fileselector_width%" h="%fileselector_install_height%" />
-				<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
-				<fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" />
 				<text>%tw_zip_location%</text>
-				<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
-				<sort name="tw_gui_sort_order" />
-				<icon folder="folder_icon" file="file_icon" />
-				<background color="%fileselector_background%" />
-				<font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
 				<filter extn=".zip" folders="1" files="1" />
 				<path name="tw_zip_location" default="/sdcard" />
 				<data name="tw_filename" />
@@ -133,12 +192,9 @@
 
 			<object type="template" name="sort_options" />
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
+			<object type="button" style="mediumbutton">
 				<placement x="%filemanager_select_x%" y="%filemanager_select_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Images...</text>
-				<image resource="medium_button" />
 				<actions>
 					<action function="page">install_image</action>
 				</actions>
@@ -168,99 +224,76 @@
 		<page name="flash_confirm">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>This operation may install incompatible</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row2_text_y%" placement="5" />
 				<text>software and render your device unusable.</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row3_text_y%" placement="5" />
 				<text>Folder:</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="mediumfont" />
+			<object type="text">
+				<font resource="mediumfont" color="%text_color%"/>
 				<placement x="%center_x%" y="%row4_text_y%" placement="5" />
 				<text>%tw_zip_location%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row5_text_y%" placement="5" />
 				<text>File to flash:</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="mediumfont" />
+			<object type="text">
+				<font resource="mediumfont" color="%text_color%"/>
 				<placement x="%center_x%" y="%row6_text_y%" placement="5" />
 				<text>%tw_file%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row7_text_y%" placement="5" />
 				<text>Press back to cancel adding this zip.</text>
 			</object>
 
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row8_text_y%" />
-				<font resource="font" color="%text_color%" />
 				<text>Zip file signature verification.</text>
 				<data variable="tw_signed_zip_verify" />
-				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="checkbox">
 				<condition var1="tw_has_injecttwrp" var2="1" />
 				<placement x="%col1_x%" y="%row10_text_y%" />
-				<font resource="font" color="%text_color%" />
 				<text>Inject TWRP after install.</text>
 				<data variable="tw_inject_after_zip" />
-				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row11_text_y%" placement="5" />
 				<text>File %tw_zip_queue_count% of max of 10</text>
 			</object>
 
 			<object type="slider">
-				<placement x="%slider_x%" y="%slider_y%" placement="5" />
-				<resource base="slider" used="slider-used" touch="slider-touch" />
+				<text>Swipe to Confirm Flash</text>
 				<action function="flash">flash_zip</action>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
-				<text>Swipe to Confirm Flash</text>
-			</object>
-
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<condition var1="tw_zip_queue_count" op="!=" var2="10"></condition>
 				<placement x="%col1_x%" y="%row_queue_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Add More Zips</text>
-				<image resource="main_button" />
 				<action function="page">install</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%row_queue_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Clear Zip Queue</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="queueclear"></action>
 					<action function="page">install</action>
@@ -288,18 +321,15 @@
 
 			<object type="console">
 				<placement x="%console_x%" y="%row1_y%" w="%console_width%" h="%console_install_height%" />
-				<color foreground="%console_foreground%" background="%console_background%" scroll="%console_scroll%" />
-				<font resource="fixed" />
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row17_text_y%" placement="5" />
 				<text>Flashing file %tw_zip_index% of %tw_zip_queue_count%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="mediumfont" />
+			<object type="text">
+				<font resource="mediumfont" color="%text_color%"/>
 				<placement x="%center_x%" y="%row18_text_y%" placement="5" />
 				<text>%tw_filename%</text>
 			</object>
@@ -315,24 +345,18 @@
 		<page name="flash_done">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
 				<text>Zip Install Complete</text>
 			</object>
 
 			<object type="console">
 				<placement x="%console_x%" y="%row1_y%" w="%console_width%" h="%console_installdone_height%" />
-				<color foreground="%console_foreground%" background="%console_background%" scroll="%console_scroll%" />
-				<font resource="fixed" />
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row4_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Wipe cache/dalvik</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=flash_done</action>
 					<action function="set">tw_action=wipe</action>
@@ -349,50 +373,29 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
+				<style name="rebootsystem" />
 				<placement x="%col2_x%" y="%row4_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Reboot System</text>
-				<image resource="main_button" />
-				<actions>
-					<action function="set">tw_back=main2</action>
-					<action function="set">tw_action=reboot</action>
-					<action function="set">tw_action_param=system</action>
-					<action function="set">tw_has_action2=0</action>
-					<action function="set">tw_text1=No OS Installed! Are you</action>
-					<action function="set">tw_text2=sure you wish to reboot?</action>
-					<action function="set">tw_text3=</action>
-					<action function="set">tw_text4=</action>
-					<action function="set">tw_action_text1=Rebooting...</action>
-					<action function="set">tw_action_text2=</action>
-					<action function="set">tw_complete_text1=Rebooting...</action>
-					<action function="set">tw_slider_text=Swipe to Reboot</action>
-					<action function="page">rebootcheck</action>
-				</actions>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col_center_x%" y="%row3_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Home</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_clear_destination=main2</action>
 					<action function="page">clear_vars</action>
 				</actions>
 			</object>
 
-			<object type="text" color="%text_fail_color%">
+			<object type="text">
 				<condition var1="tw_operation_status" op="!=" var2="0" />
-				<font resource="font" />
+				<font resource="font" color="%text_fail_color%"/>
 				<placement x="%center_x%" y="%zip_status_y%" placement="5" />
 				<text>Failed</text>
 			</object>
 
-			<object type="text" color="%text_success_color%">
+			<object type="text">
 				<condition var1="tw_operation_status" var2="0" />
-				<font resource="font" />
+				<font resource="font" color="%text_success_color%"/>
 				<placement x="%center_x%" y="%zip_status_y%" placement="5" />
 				<text>Successful</text>
 			</object>
@@ -417,17 +420,13 @@
 		<page name="install_image">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
 				<text>Select Image to Install</text>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<fill color="%button_fill_color%" />
+			<object type="button" style="fillbutton">
 				<placement x="%col1_x%" y="%row1_text_y%" w="%button_fill_full_width%" h="%button_fill_quarter_height%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Storage: %tw_storage_display_name% (%tw_storage_free_size% MB)</text>
 				<actions>
 					<action function="set">tw_back=install_image</action>
@@ -436,16 +435,8 @@
 			</object>
 
 			<object type="fileselector">
-				<highlight color="%fileselector_highlight_color%" />
 				<placement x="%fileselector_x%" y="%row3_text_y%" w="%fileselector_width%" h="%fileselector_install_height%" />
-				<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
-				<fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" />
 				<text>%tw_zip_location%</text>
-				<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
-				<sort name="tw_gui_sort_order" />
-				<icon folder="folder_icon" file="file_icon" />
-				<background color="%fileselector_background%" />
-				<font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
 				<filter extn=".img" folders="1" files="1" />
 				<path name="tw_zip_location" default="/sdcard" />
 				<data name="tw_filename" />
@@ -454,12 +445,9 @@
 
 			<object type="template" name="sort_options" />
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
+			<object type="button" style="mediumbutton">
 				<placement x="%filemanager_select_x%" y="%filemanager_select_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Zips...</text>
-				<image resource="medium_button" />
 				<actions>
 					<action function="page">install</action>
 				</actions>
@@ -487,46 +475,37 @@
 			<object type="template" name="header" />
 
 			<object type="partitionlist">
-				<highlight color="%fileselector_highlight_color%" />
 				<placement x="%listbox_x%" y="%row1_header_y%" w="%listbox_width%" h="%flash_list_height%" />
-				<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
-				<fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" />
 				<text>Select Partition to Flash Image:</text>
 				<icon selected="radio_true" unselected="radio_false" />
-				<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
-				<background color="%listbox_background%" />
-				<font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
 				<data name="tw_flash_partition" />
 				<listtype name="flashimg" />
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row8_text_y%" placement="5" />
 				<text>Folder:</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="mediumfont" />
+			<object type="text">
+				<font resource="mediumfont" color="%text_color%"/>
 				<placement x="%center_x%" y="%row9_text_y%" placement="5" />
 				<text>%tw_zip_location%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row10_text_y%" placement="5" />
 				<text>File to flash:</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="mediumfont" />
+			<object type="text">
+				<font resource="mediumfont" color="%text_color%"/>
 				<placement x="%center_x%" y="%row11_text_y%" placement="5" />
 				<text>%tw_file%</text>
 			</object>
 
 			<object type="slider">
-				<placement x="%slider_x%" y="%slider_y%" placement="5" />
-				<resource base="slider" used="slider-used" touch="slider-touch" />
+				<text>Swipe to Confirm Flash</text>
 				<actions>
 					<action function="set">tw_back=flashimage_confirm</action>
 					<action function="set">tw_action=flashimage</action>
@@ -536,13 +515,6 @@
 					<action function="set">tw_complete_text1=Image Flashed</action>
 					<action function="page">action_page</action>
 				</actions>
-				<action function="flashimage"></action>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
-				<text>Swipe to Confirm Flash</text>
 			</object>
 
 			<object type="action">
@@ -589,46 +561,34 @@
 		<page name="confirm_action">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>%tw_text1%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row2_text_y%" placement="5" />
 				<text>%tw_text2%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row3_text_y%" placement="5" />
 				<text>%tw_text3%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row4_text_y%" placement="5" />
 				<text>%tw_text4%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row15_text_y%" placement="5" />
 				<text>Press back button to cancel.</text>
 			</object>
 
 			<object type="slider">
-				<placement x="%slider_x%" y="%slider_y%" />
-				<resource base="slider" used="slider-used" touch="slider-touch" />
-				<action function="page">action_page</action>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
 				<text>%tw_slider_text%</text>
+				<action function="page">action_page</action>
 			</object>
 
 			<object type="action">
@@ -650,27 +610,22 @@
 		<page name="action_page">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>%tw_action_text1%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row2_text_y%" placement="5" />
 				<text>%tw_action_text2%</text>
 			</object>
 
 			<object type="template" name="action_page_console" />
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
+			<object type="button" style="mediumbutton">
 				<condition var1="tw_has_cancel" var2="1" />
 				<placement x="%col_center_medium_x%" y="%row4_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Cancel</text>
-				<image resource="medium_button" />
 				<action function="%tw_cancel_action%">%tw_cancel_param%</action>
 			</object>
 
@@ -702,14 +657,12 @@
 		<page name="singleaction_page">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>%tw_action_text1%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row3_text_y%" placement="5" />
 				<text>%tw_action_text2%</text>
 			</object>
@@ -744,22 +697,21 @@
 		<page name="action_complete">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>%tw_complete_text1%</text>
 			</object>
 
-			<object type="text" color="%text_fail_color%">
+			<object type="text">
 				<condition var1="tw_operation_status" op="!=" var2="0" />
-				<font resource="font" />
+				<font resource="font" color="%text_fail_color%"/>
 				<placement x="%center_x%" y="%row2_text_y%" placement="5" />
 				<text>Failed</text>
 			</object>
 
-			<object type="text" color="%text_success_color%">
+			<object type="text">
 				<condition var1="tw_operation_status" var2="0" />
-				<font resource="font" />
+				<font resource="font"  color="%text_success_color%"/>
 				<placement x="%center_x%" y="%row2_text_y%" placement="5" />
 				<text>Successful</text>
 			</object>
@@ -767,40 +719,18 @@
 			<object type="template" name="action_page_console" />
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<condition var1="tw_show_reboot" var2="0" />
 				<placement x="%col_center_x%" y="%row4_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Back</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_clear_destination=%tw_back%</action>
 					<action function="page">clear_vars</action>
 				</actions>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
+			<object type="button" style="rebootsystem">
 				<condition var1="tw_show_reboot" var2="1" />
 				<placement x="%col_center_x%" y="%row4_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Reboot System</text>
-				<image resource="main_button" />
-				<actions>
-					<action function="set">tw_back=main2</action>
-					<action function="set">tw_action=reboot</action>
-					<action function="set">tw_action_param=system</action>
-					<action function="set">tw_has_action2=0</action>
-					<action function="set">tw_text1=No OS Installed! Are you</action>
-					<action function="set">tw_text2=sure you wish to reboot?</action>
-					<action function="set">tw_text3=</action>
-					<action function="set">tw_text4=</action>
-					<action function="set">tw_action_text1=Rebooting...</action>
-					<action function="set">tw_action_text2=</action>
-					<action function="set">tw_complete_text1=Rebooting...</action>
-					<action function="set">tw_slider_text=Swipe to Reboot</action>
-					<action function="page">rebootcheck</action>
-				</actions>
 			</object>
 
 			<object type="action">
@@ -863,66 +793,55 @@
 		<page name="wipe">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>Factory Reset</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row2_text_y%" placement="5" />
 				<text>Wipes Data, Cache, and Dalvik</text>
 			</object>
 
-			<object type="text" color="%text_color%">
+			<object type="text">
 				<condition var1="tw_has_data_media" var2="1" />
-				<font resource="font" />
 				<placement x="%center_x%" y="%row3_text_y%" placement="5" />
 				<text>(not including internal storage)</text>
 			</object>
 
-			<object type="text" color="%text_color%">
+			<object type="text">
 				<conditions>
 					<condition var1="tw_has_android_secure" var2="1" />
 					<condition var1="fileexists" var2="/and-sec" />
 				</conditions>
-				<font resource="font" />
 				<placement x="%center_x%" y="%row4_text_y%" placement="5" />
 				<text>Android Secure</text>
 			</object>
 
-			<object type="text" color="%text_color%">
+			<object type="text">
 				<condition var1="tw_has_sdext_partition" var2="1" />
-				<font resource="font" />
 				<placement x="%center_x%" y="%row5_text_y%" placement="5" />
 				<text>SD-EXT</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row6_text_y%" placement="5" />
 				<text>Most of the time this is</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row7_text_y%" placement="5" />
 				<text>the only wipe that you need.</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row16_text_y%" placement="5" />
 				<text>Press back button to cancel.</text>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%wipe_button_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Advanced Wipe</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">partitionlisterror=0</action>
 					<action function="page">advancedwipe</action>
@@ -931,11 +850,8 @@
 
 			<object type="button">
 				<condition var1="tw_has_data_media" var2="1" />
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%wipe_button_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Format Data</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="page">formatdata</action>
 				</actions>
@@ -946,11 +862,8 @@
 					<condition var1="tw_is_encrypted" var2="1" />
 					<condition var1="tw_has_data_media" var2="0" />
 				</conditions>
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%wipe_button_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Wipe Encryption</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=wipe</action>
 					<action function="set">tw_action=wipe</action>
@@ -966,8 +879,7 @@
 			</object>
 
 			<object type="slider">
-				<placement x="%slider_x%" y="%slider_y%" />
-				<resource base="slider" used="slider-used" touch="slider-touch" />
+				<text>Swipe to Factory Reset</text>
 				<actions>
 					<action function="set">tw_back=wipe</action>
 					<action function="set">tw_action=wipe</action>
@@ -978,12 +890,6 @@
 				</actions>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
-				<text>Swipe to Factory Reset</text>
-			</object>
-
 			<object type="action">
 				<touch key="back" />
 				<action function="page">main</action>
@@ -1004,29 +910,20 @@
 				<action function="set">tw_wipe_list=</action>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
 				<text>Wipe Menu</text>
 			</object>
 
 			<object type="partitionlist">
-				<highlight color="%fileselector_highlight_color%" />
 				<placement x="%listbox_x%" y="%row1_header_y%" w="%listbox_width%" h="%wipe_list_height%" />
-				<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
-				<fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" />
 				<text>Select Partitions to Wipe:</text>
-				<icon selected="checkbox_true" unselected="checkbox_false" />
-				<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
-				<background color="%listbox_background%" />
-				<font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
 				<data name="tw_wipe_list" />
 				<listtype name="wipe" />
 			</object>
 
 			<object type="slider">
-				<placement x="%slider_x%" y="%slider_y%" />
-				<resource base="slider" used="slider-used" touch="slider-touch" />
+				<text>Swipe to Wipe</text>
 				<actions>
 					<action function="set">tw_back=advancedwipe</action>
 					<action function="set">tw_action=wipe</action>
@@ -1038,11 +935,8 @@
 				</actions>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<fill color="%button_fill_color%" />
+			<object type="button" style="fillbutton">
 				<placement x="%col1_x%" y="%wipe_button_row1%" w="%button_fill_full_width%" h="%button_fill_half_height%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Repair or Change File System</text>
 				<actions>
 					<action function="checkpartitionlist"></action>
@@ -1050,19 +944,13 @@
 				</actions>
 			</object>
 
-			<object type="text" color="%text_fail_color%">
+			<object type="text">
+				<font resource="font" color="%text_fail_color%"/>
 				<condition var1="partitionlisterror" var2="1" />
-				<font resource="font" />
 				<placement x="%center_x%" y="%wipe_button_row1%" placement="5" />
 				<text>Invalid partition selection</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
-				<text>Swipe to Wipe</text>
-			</object>
-
 			<object type="action">
 				<touch key="home" />
 				<action function="page">main</action>
@@ -1079,41 +967,33 @@
 		<page name="formatdata">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
 				<text>Format Data will wipe all of your apps,</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>backups, pictures, videos, media, and</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row2_text_y%" placement="5" />
 				<text>removes encryption on internal storage.</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row3_text_y%" placement="5" />
 				<text>This cannot be undone. Press back to cancel.</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row4_text_y%" placement="5" />
 				<text>Type yes to continue.</text>
 			</object>
 
 			<object type="input">
 				<placement x="%col1_x%" y="%row6_text_y%" w="%input_width%" h="%input_height%" placement="0" />
-				<background color="%input_background_color%" />
-				<cursor color="%input_cursor_color%" hasfocus="1" width="%input_cursor_width%" />
-				<font resource="font" color="%text_color%" />
 				<text>%tw_confirm_formatdata%</text>
 				<data name="tw_confirm_formatdata" />
 				<restrict minlen="3" maxlen="3" allow="yes" />
@@ -1177,83 +1057,69 @@
 		<page name="partitionoptions">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
 				<text>Partition Options for: %tw_partition_name%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>Mount Point: %tw_partition_mount_point%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row2_text_y%" placement="5" />
 				<text>Current file system: %tw_partition_file_system%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
+			<object type="text">
 				<condition var1="tw_partition_is_present" op="!=" var2="0" />
-				<font resource="font" />
 				<placement x="%col1_x%" y="%row3_text_y%" />
 				<text>Present: Yes</text>
 			</object>
 
-			<object type="text" color="%text_color%">
+			<object type="text">
 				<condition var1="tw_partition_is_present" op="=" var2="0" />
-				<font resource="font" />
 				<placement x="%col1_x%" y="%row3_text_y%" />
 				<text>Present: No</text>
 			</object>
 
-			<object type="text" color="%text_color%">
+			<object type="text">
 				<condition var1="tw_partition_removable" op="!=" var2="0" />
-				<font resource="font" />
 				<placement x="%col2_x%" y="%row3_text_y%" />
 				<text>Removable: Yes</text>
 			</object>
 
-			<object type="text" color="%text_color%">
+			<object type="text">
 				<condition var1="tw_partition_removable" op="=" var2="0" />
-				<font resource="font" />
 				<placement x="%col2_x%" y="%row3_text_y%" />
 				<text>Removable: No</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%col1_x%" y="%row4_text_y%" />
 				<text>Size: %tw_partition_size%MB</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%col2_x%" y="%row4_text_y%" />
 				<text>Used: %tw_partition_used%MB</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%col1_x%" y="%row5_text_y%" />
 				<text>Free: %tw_partition_free%MB</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%col2_x%" y="%row5_text_y%" />
 				<text>Backup Size: %tw_partition_backup_size%MB</text>
 			</object>
 
 			<object type="button">
 				<condition var1="tw_partition_can_repair" op="=" var2="1" />
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row4_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Repair</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=partitionoptions</action>
 					<action function="set">tw_action=repair</action>
@@ -1269,11 +1135,8 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%row4_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Change File System</text>
-				<image resource="main_button" />
 				<action function="page">selectfilesystem</action>
 			</object>
 
@@ -1313,43 +1176,35 @@
 		<page name="selectfilesystem">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
 				<text>Change file system for: %tw_partition_name%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>Mount Point: %tw_partition_mount_point%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row2_text_y%" placement="5" />
 				<text>Current file system: %tw_partition_file_system%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row3_text_y%" placement="5" />
 				<text>Some ROMs or kernels may not support some</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row4_text_y%" placement="5" />
 				<text>file systems. Proceed with caution!</text>
 			</object>
 
 			<object type="button">
 				<condition var1="tw_partition_ext" op="=" var2="1" />
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>EXT2</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=refreshfilesystem</action>
 					<action function="set">tw_action=changefilesystem</action>
@@ -1367,11 +1222,8 @@
 
 			<object type="button">
 				<condition var1="tw_partition_ext" op="=" var2="1" />
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>EXT3</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=refreshfilesystem</action>
 					<action function="set">tw_action=changefilesystem</action>
@@ -1389,11 +1241,8 @@
 
 			<object type="button">
 				<condition var1="tw_partition_ext" op="=" var2="1" />
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row3_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>EXT4</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=refreshfilesystem</action>
 					<action function="set">tw_action=changefilesystem</action>
@@ -1411,11 +1260,8 @@
 
 			<object type="button">
 				<condition var1="tw_partition_f2fs" op="=" var2="1" />
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%row3_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>F2FS</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=refreshfilesystem</action>
 					<action function="set">tw_action=changefilesystem</action>
@@ -1433,11 +1279,8 @@
 
 			<object type="button">
 				<condition var1="tw_partition_vfat" op="=" var2="1" />
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row4_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>FAT</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=refreshfilesystem</action>
 					<action function="set">tw_action=changefilesystem</action>
@@ -1455,11 +1298,8 @@
 
 			<object type="button">
 				<condition var1="tw_partition_exfat" op="=" var2="1" />
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%row4_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>exFAT</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=refreshfilesystem</action>
 					<action function="set">tw_action=changefilesystem</action>
@@ -1491,11 +1331,8 @@
 		<page name="backup">
 			<object type="template" name="header" />
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<fill color="%button_fill_color%" />
+			<object type="button" style="fillbutton">
 				<placement x="%col1_x%" y="%row1_header_y%" w="%button_fill_full_width%" h="%button_fill_quarter_height%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Backup Name: %tw_backup_name%</text>
 				<actions>
 					<action function="set">tw_fileexists=0</action>
@@ -1504,43 +1341,30 @@
 			</object>
 
 			<object type="partitionlist">
-				<highlight color="%fileselector_highlight_color%" />
 				<placement x="%listbox_x%" y="%row2_text_y%" w="%listbox_width%" h="%backup_list_height%" />
-				<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
-				<fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" />
 				<text>Select Partitions to Back Up:</text>
-				<icon selected="checkbox_true" unselected="checkbox_false" />
-				<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
-				<background color="%listbox_background%" />
-				<font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
 				<data name="tw_backup_list" />
 				<listtype name="backup" />
 			</object>
 
-			<object type="button">
+			<object type="button" style="fillbutton">
 				<conditions>
 					<condition var1="tw_include_encrypted_backup" var2="1" />
 					<condition var1="tw_encrypt_backup" var2="0" />
 				</conditions>
-				<highlight color="%highlight_color%" />
-				<fill color="%button_fill_color%" />
 				<placement x="%col1_x%" y="%backup_button_row1%" w="%button_fill_main_width%" h="%button_fill_quarter_height%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>No Encryption</text>
 				<actions>
 					<action function="page">backupencryption</action>
 				</actions>
 			</object>
 
-			<object type="button">
+			<object type="button" style="fillbutton">
 				<conditions>
 					<condition var1="tw_include_encrypted_backup" var2="1" />
 					<condition var1="tw_encrypt_backup" var2="1" />
 				</conditions>
-				<highlight color="%highlight_color%" />
-				<fill color="%button_fill_color%" />
 				<placement x="%col1_x%" y="%backup_button_row1%" w="%button_fill_main_width%" h="%button_fill_quarter_height%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Using Encryption</text>
 				<actions>
 					<action function="set">tw_password_not_match=0</action>
@@ -1548,11 +1372,8 @@
 				</actions>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<fill color="%button_fill_color%" />
+			<object type="button" style="fillbutton">
 				<placement x="%col2_x%" y="%backup_button_row1%" w="%button_fill_main_width%" h="%button_fill_quarter_height%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Refresh Sizes</text>
 				<actions>
 					<action function="refreshsizes"></action>
@@ -1560,11 +1381,8 @@
 				</actions>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<fill color="%button_fill_color%" />
+			<object type="button" style="fillbutton">
 				<placement x="%col1_x%" y="%backup_button_row2%" w="%button_fill_full_width%" h="%button_fill_quarter_height%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Storage: %tw_storage_display_name% (%tw_storage_free_size% MB)</text>
 				<actions>
 					<action function="set">tw_back=backup</action>
@@ -1574,30 +1392,19 @@
 
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row15_text_y%" />
-				<font resource="font" color="%text_color%" />
 				<text>Enable compression.</text>
 				<data variable="tw_use_compression" />
-				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row16_text_y%" />
-				<font resource="font" color="%text_color%" />
 				<text>Skip MD5 generation during backup.</text>
 				<data variable="tw_skip_md5_generate" />
-				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="slider">
-				<placement x="%slider_x%" y="%slider_y%" />
-				<resource base="slider" used="slider-used" touch="slider-touch" />
-				<action function="page">backup_run</action>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
 				<text>Swipe to Back Up</text>
+				<action function="page">backup_run</action>
 			</object>
 
 			<object type="action">
@@ -1627,17 +1434,13 @@
 		<page name="backupname2">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
-				<font resource="font" />
 				<text>Please Enter a Backup Name</text>
 			</object>
 
 			<object type="input">
 				<placement x="%col1_x%" y="%row3_text_y%" w="%input_width%" h="%input_height%" placement="0" />
-				<background color="%input_background_color%" />
-				<cursor color="%input_cursor_color%" hasfocus="1" width="%input_cursor_width%" />
-				<font resource="font" color="%text_color%" />
 				<text>%tw_backup_name%</text>
 				<data name="tw_backup_name" />
 				<restrict minlen="1" maxlen="64" allow=" abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_.{}[]" />
@@ -1649,28 +1452,22 @@
 				</actions>
 			</object>
 
-			<object type="text" color="%text_fail_color%">
+			<object type="text">
 				<condition var1="tw_fileexists" var2="1" />
 				<placement x="%center_x%" y="%row5_text_y%" placement="5" />
-				<font resource="font" />
+				<font resource="font" color="%text_fail_color%"/>
 				<text>A backup with that name already exists!</text>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Append Date</text>
-				<image resource="main_button" />
 				<action function="appenddatetobackupname"></action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Cancel</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_backup_name=(Auto Generate)</action>
 					<action function="page">backup</action>
@@ -1701,42 +1498,34 @@
 		<page name="backupencryption">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
 				<text>Encrypt your backup?</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row2_text_y%" placement="5" />
 				<text>Please Enter A Password:</text>
 			</object>
 
 			<object type="input">
 				<placement x="%col1_x%" y="%row3_text_y%" w="%input_width%" h="%input_height%" placement="0" />
-				<background color="%input_background_color%" />
-				<cursor color="%input_cursor_color%" hasfocus="1" width="%input_cursor_width%" />
-				<font resource="font" color="%text_color%" />
 				<text>%tw_backup_encrypt_display%</text>
 				<data name="tw_backup_password" mask="*" maskvariable="tw_backup_encrypt_display" />
 				<restrict minlen="1" maxlen="32" allow="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890_" />
 				<action function="page">backupencryption2</action>
 			</object>
 
-			<object type="text" color="%text_fail_color%">
+			<object type="text">
 				<condition var1="tw_password_not_match" var2="1" />
-				<font resource="font" />
+				<font resource="font" color="%text_fail_color%"/>
 				<placement x="%center_x%" y="%row4_text_y%" placement="5" />
 				<text>Passwords Do Not Match</text>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col_center_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Cancel</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_encrypt_backup=0</action>
 					<action function="set">tw_backup_password=</action>
@@ -1765,23 +1554,18 @@
 		<page name="backupencryption2">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
 				<text>Encrypt your backup?</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row2_text_y%" placement="5" />
 				<text>Please Enter Password Again:</text>
 			</object>
 
 			<object type="input">
 				<placement x="%col1_x%" y="%row3_text_y%" w="%input_width%" h="%input_height%" placement="0" />
-				<background color="%input_background_color%" />
-				<cursor color="%input_cursor_color%" hasfocus="1" width="%input_cursor_width%" />
-				<font resource="font" color="%text_color%" />
 				<text>%tw_backup_encrypt_display2%</text>
 				<data name="tw_backup_password2" mask="*" maskvariable="tw_backup_encrypt_display2" />
 				<restrict minlen="1" maxlen="32" allow="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890_" />
@@ -1791,11 +1575,8 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col_center_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Cancel</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_encrypt_backup=0</action>
 					<action function="set">tw_backup_password=</action>
@@ -1847,32 +1628,26 @@
 		<page name="backup_run">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>%tw_operation% %tw_partition%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row2_text_y%" placement="5" />
 				<text>%tw_file_progress%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row3_text_y%" placement="5" />
 				<text>%tw_size_progress%</text>
 			</object>
 
 			<object type="template" name="action_page_console" />
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
+			<object type="button" style="mediumbutton">
 				<placement x="%col_center_medium_x%" y="%row4_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Cancel</text>
-				<image resource="medium_button" />
 				<actions>
 					<action function="cancelbackup"></action>
 				</actions>
@@ -1910,11 +1685,8 @@
 		<page name="restore">
 			<object type="template" name="header" />
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<fill color="%button_fill_color%" />
+			<object type="button" style="fillbutton">
 				<placement x="%col1_x%" y="%row1_header_y%" w="%button_fill_full_width%" h="%button_fill_quarter_height%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Storage: %tw_storage_display_name% (%tw_storage_free_size% MB)</text>
 				<actions>
 					<action function="set">tw_back=restore</action>
@@ -1923,16 +1695,8 @@
 			</object>
 
 			<object type="fileselector">
-				<highlight color="%fileselector_highlight_color%" />
 				<placement x="%fileselector_x%" y="%row2_text_y%" w="%fileselector_width%" h="%fileselector_install_height%" />
-				<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
-				<fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" />
 				<text>Select Package to Restore:</text>
-				<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
-				<sort name="tw_gui_sort_order" />
-				<icon folder="folder_icon" file="file_icon" />
-				<background color="%fileselector_background%" />
-				<font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
 				<filter folders="1" files="0" nav="0" />
 				<path name="tw_backups_folder" />
 				<data name="tw_restore" default="" />
@@ -1982,23 +1746,17 @@
 		<page name="restore_decrypt">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
 				<text>Backup Encrypted</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row2_text_y%" placement="5" />
 				<text>Please Enter Your Password:</text>
 			</object>
 
 			<object type="input">
-				<placement x="%col1_x%" y="%row3_text_y%" w="%input_width%" h="%input_height%" placement="0" />
-				<background color="%input_background_color%" />
-				<cursor color="%input_cursor_color%" hasfocus="1" width="%input_cursor_width%" />
-				<font resource="font" color="%text_color%" />
 				<text>%tw_restore_display%</text>
 				<data name="tw_restore_password" mask="*" maskvariable="tw_restore_display" />
 				<restrict minlen="1" maxlen="32" allow="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890_" />
@@ -2007,19 +1765,16 @@
 				</actions>
 			</object>
 
-			<object type="text" color="%text_fail_color%">
+			<object type="text">
 				<condition var1="tw_password_fail" var2="1" />
-				<font resource="font" />
+				<font resource="font" color="%text_fail_color%"/>
 				<placement x="%center_x%" y="%row4_text_y%" placement="5" />
 				<text>Password Failed, Please Try Again</text>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Cancel</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_page_done=1</action>
 					<action function="page">restore</action>
@@ -2027,11 +1782,8 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Delete</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=restore</action>
 					<action function="set">tw_action=cmd</action>
@@ -2063,8 +1815,7 @@
 		<page name="try_restore_decrypt">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>Trying Decryption with Your Password</text>
 			</object>
@@ -2104,24 +1855,14 @@
 			<object type="template" name="header" />
 
 			<object type="partitionlist">
-				<highlight color="%fileselector_highlight_color%" />
 				<placement x="%listbox_x%" y="%row1_header_y%" w="%listbox_width%" h="%backup_list_height%" />
-				<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
-				<fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" />
 				<text>Restoring: %tw_restore_name%</text>
-				<icon selected="checkbox_true" unselected="checkbox_false" />
-				<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
-				<background color="%listbox_background%" />
-				<font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
 				<data name="tw_restore_list" selectedlist="tw_restore_selected" />
 				<listtype name="restore" />
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<fill color="%button_fill_color%" />
+			<object type="button" style="fillbutton">
 				<placement x="%col1_x%" y="%backup_button_row1%" w="%button_fill_main_width%" h="%button_fill_quarter_height%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Rename Backup</text>
 				<actions>
 					<action function="set">tw_backup_rename=</action>
@@ -2130,11 +1871,8 @@
 				</actions>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<fill color="%button_fill_color%" />
+			<object type="button" style="fillbutton">
 				<placement x="%col2_x%" y="%backup_button_row1%" w="%button_fill_main_width%" h="%button_fill_quarter_height%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Delete Backup</text>
 				<actions>
 					<action function="set">tw_back=restore</action>
@@ -2151,28 +1889,18 @@
 
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row15_text_y%" />
-				<font resource="font" color="%text_color%" />
 				<text>Enable MD5 verification of backup files.</text>
 				<data variable="tw_skip_md5_check" />
-				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row16_text_y%" placement="5" />
 				<text>Package Date: %tw_restore_file_date%</text>
 			</object>
 
 			<object type="slider">
-				<placement x="%slider_x%" y="%slider_y%" />
-				<resource base="slider" used="slider-used" touch="slider-touch" />
-				<action function="page">restore_run</action>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
 				<text>Swipe to Restore</text>
+				<action function="page">restore_run</action>
 			</object>
 
 			<object type="action">
@@ -2191,17 +1919,13 @@
 		<page name="renamebackup">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
-				<font resource="font" />
 				<text>Please Enter a New Backup Name</text>
 			</object>
 
 			<object type="input">
 				<placement x="%col1_x%" y="%row3_text_y%" w="%input_width%" h="%input_height%" placement="0" />
-				<background color="%input_background_color%" />
-				<cursor color="%input_cursor_color%" hasfocus="1" width="%input_cursor_width%" />
-				<font resource="font" color="%text_color%" />
 				<text>%tw_backup_rename%</text>
 				<data name="tw_backup_rename" />
 				<restrict minlen="1" maxlen="64" allow=" abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_.{}[]" />
@@ -2221,19 +1945,16 @@
 				</actions>
 			</object>
 
-			<object type="text" color="%text_fail_color%">
+			<object type="text">
 				<condition var1="tw_fileexists" var2="1" />
 				<placement x="%center_x%" y="%row5_text_y%" placement="5" />
-				<font resource="font" />
+				<font resource="font" color="%text_fail_color%"/>
 				<text>A backup with that name already exists!</text>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col_center_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Cancel</text>
-				<image resource="main_button" />
 				<action function="page">restore_select</action>
 			</object>
 
@@ -2255,14 +1976,12 @@
 		<page name="restore_run">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>%tw_operation% %tw_partition%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row2_text_y%" placement="5" />
 				<text>%tw_size_progress%</text>
 			</object>
@@ -2290,25 +2009,16 @@
 			<object type="template" name="header" />
 
 			<object type="partitionlist">
-				<highlight color="%fileselector_highlight_color%" />
 				<placement x="%listbox_x%" y="%row1_header_y%" w="%listbox_width%" h="%storage_list_height%" />
-				<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
-				<fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" />
 				<text>Select Storage:</text>
 				<icon selected="radio_true" unselected="radio_false" />
-				<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
-				<background color="%listbox_background%" />
-				<font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
 				<data name="tw_storage_path" />
 				<listtype name="storage" />
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col_center_x%" y="%row4_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>OK</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_clear_destination=%tw_back%</action>
 					<action function="page">clear_vars</action>
@@ -2334,23 +2044,13 @@
 			<object type="template" name="header" />
 
 			<object type="partitionlist">
-				<highlight color="%fileselector_highlight_color%" />
 				<placement x="%listbox_x%" y="%row1_header_y%" w="%listbox_width%" h="%mount_list_height%" />
-				<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
-				<fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" />
 				<text>Select Partitions to Mount:</text>
-				<icon selected="checkbox_true" unselected="checkbox_false" />
-				<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
-				<background color="%listbox_background%" />
-				<font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
 				<listtype name="mount" />
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<fill color="%button_fill_color%" />
+			<object type="button" style="fillbutton">
 				<placement x="%col1_x%" y="%mount_storage_row%" w="%button_fill_full_width%" h="%button_fill_quarter_height%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Storage: %tw_storage_display_name% (%tw_storage_free_size% MB)</text>
 				<actions>
 					<action function="set">tw_back=mount</action>
@@ -2359,51 +2059,39 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<condition var1="tw_has_usb_storage" var2="1" />
 				<placement x="%col1_x%" y="row4_y" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Mount USB Storage</text>
-				<image resource="main_button" />
 				<action function="page">usb_mount</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<conditions>
 					<condition var1="tw_has_mtp" var2="1" />
 					<condition var1="tw_mtp_enabled" var2="0" />
 				</conditions>
 				<placement x="%col2_x%" y="row4_y" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Enable MTP</text>
-				<image resource="main_button" />
 				<action function="startmtp"></action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<conditions>
 					<condition var1="tw_has_mtp" var2="1" />
 					<condition var1="tw_mtp_enabled" var2="1" />
 				</conditions>
 				<placement x="%col2_x%" y="row4_y" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Disable MTP</text>
-				<image resource="main_button" />
 				<action function="stopmtp"></action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<conditions>
 					<condition var1="tw_is_encrypted" var2="1" />
 					<condition var1="tw_is_decrypted" var2="0" />
 				</conditions>
 				<placement x="%col2_x%" y="row4_y" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Decrypt Data</text>
-				<image resource="main_button" />
 				<action function="page">decrypt</action>
 			</object>
 
@@ -2423,30 +2111,24 @@
 		<page name="usb_mount">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
 				<text>USB Storage Mounted</text>
 			</object>
 
-			<object type="text" color="%text_color%">
+			<object type="text">
 				<placement x="%col1_x%" y="%row1_text_y%" />
-				<font resource="font" />
 				<text>Be sure to safely remove your device</text>
 			</object>
 
-			<object type="text" color="%text_color%">
+			<object type="text">
 				<placement x="%col1_x%" y="%row2_text_y%" />
-				<font resource="font" />
 				<text>from your computer before unmounting!</text>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row3_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Unmount</text>
-				<image resource="main_button" />
 				<action function="page">usb_umount</action>
 			</object>
 
@@ -2472,40 +2154,21 @@
 		<page name="reboot">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
 				<text>Reboot Menu</text>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
+			<object type="button" style="rebootsystem">
 				<condition var1="tw_reboot_system" var2="1" />
 				<placement x="%col1_x%" y="%row1_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>System</text>
-				<image resource="main_button" />
-				<actions>
-					<action function="set">tw_back=reboot</action>
-					<action function="set">tw_action=reboot</action>
-					<action function="set">tw_action_param=system</action>
-					<action function="set">tw_has_action2=0</action>
-					<action function="set">tw_text1=No OS Installed! Are you</action>
-					<action function="set">tw_text2=sure you wish to reboot?</action>
-					<action function="set">tw_action_text1=Rebooting...</action>
-					<action function="set">tw_complete_text1=Rebooting...</action>
-					<action function="set">tw_slider_text=Swipe to Reboot</action>
-					<action function="page">rebootcheck</action>
-				</actions>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<condition var1="tw_reboot_poweroff" var2="1" />
 				<placement x="%col2_x%" y="%row1_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Power Off</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=reboot</action>
 					<action function="set">tw_action=reboot</action>
@@ -2521,12 +2184,9 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<condition var1="tw_reboot_recovery" var2="1" />
 				<placement x="%col1_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Recovery</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=reboot</action>
 					<action function="set">tw_action=reboot</action>
@@ -2542,12 +2202,9 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<condition var1="tw_reboot_bootloader" var2="1" />
 				<placement x="%col2_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Bootloader</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=reboot</action>
 					<action function="set">tw_action=reboot</action>
@@ -2563,12 +2220,9 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<condition var1="tw_download_mode" var2="1" />
 				<placement x="%col1_x%" y="%row3_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Download</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=reboot</action>
 					<action function="set">tw_action=reboot</action>
@@ -2599,102 +2253,75 @@
 		<page name="settings">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
 				<text>Settings</text>
 			</object>
 
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row1_text_y%" />
-				<font resource="font" color="%text_color%" />
 				<text>Zip file signature verification.</text>
 				<data variable="tw_signed_zip_verify" />
-				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row2_text_y%" />
-				<font resource="font" color="%text_color%" />
 				<text>Use rm -rf instead of formatting.</text>
 				<data variable="tw_rm_rf" />
-				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row3_text_y%" />
-				<font resource="font" color="%text_color%" />
 				<text>Skip MD5 generation during backup.</text>
 				<data variable="tw_skip_md5_generate" />
-				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row4_text_y%" />
-				<font resource="font" color="%text_color%" />
 				<text>Enable MD5 verification of backup files.</text>
 				<data variable="tw_skip_md5_check" />
-				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row5_text_y%" />
-				<font resource="font" color="%text_color%" />
 				<text>Use 24-hour clock.</text>
 				<data variable="tw_military_time" />
-				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row6_text_y%" />
-				<font resource="font" color="%text_color%" />
 				<text>Simulate actions for theme testing.</text>
 				<data variable="tw_simulate_actions" />
-				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="checkbox">
 				<condition var1="tw_simulate_actions" var2="1" />
 				<placement x="%col1_x%" y="%row7_text_y%" />
-				<font resource="font" color="%text_color%" />
 				<text>Simulate failure for actions.</text>
 				<data variable="tw_simulate_fail" />
-				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row3_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Time Zone</text>
-				<image resource="main_button" />
 				<action function="page">timezone</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%row3_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Screen</text>
-				<image resource="main_button" />
 				<action function="page">screen</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row4_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Restore Defaults</text>
-				<image resource="main_button" />
 				<action function="restoredefaultsettings"></action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%row4_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Vibration Duration</text>
-				<image resource="main_button" />
 				<action function="page">Vibrate</action>
 			</object>
 
@@ -2714,16 +2341,10 @@
 		<page name="timezone">
 			<object type="template" name="header" />
 
-			<object type="listbox">
-				<highlight color="%fileselector_highlight_color%" />
+			<object type="listbox" style="scrolllist">
 				<placement x="%listbox_x%" y="%row1_header_y%" w="%listbox_width%" h="%listbox_tz_height%" />
-				<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
-				<fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" />
 				<text>Select Time Zone:</text>
 				<icon selected="radio_true" unselected="radio_false" />
-				<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
-				<background color="%listbox_background%" />
-				<font resource="font" spacing="%listbox_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
 				<data name="tw_time_zone_guisel" />
 				<listitem name="(UTC -11) Samoa, Midway Island">BST11;BDT</listitem>
 				<listitem name="(UTC -10) Hawaii">HST10;HDT</listitem>
@@ -2753,65 +2374,46 @@
 
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row_dst_text_y%" />
-				<font resource="font" color="%text_color%" />
 				<text>Do you use daylight savings time (DST)?</text>
 				<data variable="tw_time_zone_guidst" />
-				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<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%" />
+			<object type="button" style="mediumbutton">
 				<placement x="%col1_medium_x%" y="%row_offset_medium_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>None</text>
-				<image resource="medium_button" />
 				<action function="set">tw_time_zone_guioffset=0</action>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
+			<object type="button" style="mediumbutton">
 				<placement x="%col2_medium_x%" y="%row_offset_medium_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>15</text>
-				<image resource="medium_button" />
 				<action function="set">tw_time_zone_guioffset=15</action>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
+			<object type="button" style="mediumbutton">
 				<placement x="%col3_medium_x%" y="%row_offset_medium_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>30</text>
-				<image resource="medium_button" />
 				<action function="set">tw_time_zone_guioffset=30</action>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
+			<object type="button" style="mediumbutton">
 				<placement x="%col4_medium_x%" y="%row_offset_medium_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>45</text>
-				<image resource="medium_button" />
 				<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%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Set Time Zone</text>
-				<image resource="main_button" />
 				<action function="setguitimezone"></action>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%tz_current_y%" placement="5" />
 				<text>Current Time Zone: %tw_time_zone%</text>
 			</object>
@@ -2832,8 +2434,7 @@
 		<page name="screen">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
 				<text>Screen Settings</text>
 			</object>
@@ -2859,12 +2460,11 @@
 			</object>
 
 			<object type="slidervalue">
-				<condition var1="tw_screen_timeout_secs" op="!=" var2="0" />
-				<condition var1="tw_no_screen_timeout" op="!=" var2="1" />
+				<conditions>
+					<condition var1="tw_screen_timeout_secs" op="!=" var2="0" />
+					<condition var1="tw_no_screen_timeout" op="!=" var2="1" />
+				</conditions>
 				<placement x="col1_x" y="%row4_text_y%" w="%slidervalue_w%" />
-				<font resource="font" color="%text_color%" />
-				<colors line="%slidervalue_line_clr%" slider="%slidervalue_slider_clr%" />
-				<dimensions lineh="%slidervalue_lineh%" linepadding="%slidervalue_padding%" sliderw="%slidervalue_sliderw%" sliderh="%slidervalue_sliderh%" />
 				<text>Screen timeout in seconds:</text>
 				<data variable="tw_screen_timeout_secs" min="15" max="300" />
 			</object>
@@ -2872,9 +2472,6 @@
 			<object type="slidervalue">
 				<condition var1="tw_has_brightnesss_file" var2="1" />
 				<placement x="col1_x" y="%row12_text_y%" w="%slidervalue_w%" />
-				<font resource="font" color="%text_color%" />
-				<colors line="%slidervalue_line_clr%" slider="%slidervalue_slider_clr%" />
-				<dimensions lineh="%slidervalue_lineh%" linepadding="%slidervalue_padding%" sliderw="%slidervalue_sliderw%" sliderh="%slidervalue_sliderh%" />
 				<text>Brightness: %tw_brightness_pct%%</text>
 				<data variable="tw_brightness_pct" min="10" max="100" />
 				<actions>
@@ -2901,34 +2498,27 @@
 		<page name="Vibrate">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
 				<text>Vibration Settings :</text>
 			</object>
 
 			<object type="slidervalue">
 				<placement x="col1_x" y="%row4_text_y%" w="%slidervalue_w%" />
-				<font resource="font" color="%text_color%" />
 				<text>Button Vibration:</text>
 				<data variable="tw_button_vibrate" min="0" max="300" />
-				<colors line="%slidervalue_line_clr%" slider="%slidervalue_slider_clr%" />
 			</object>
 
 			<object type="slidervalue">
 				<placement x="col1_x" y="%row8_text_y%" w="%slidervalue_w%" />
-				<font resource="font" color="%text_color%" />
 				<text>Keyboard Vibration:</text>
 				<data variable="tw_keyboard_vibrate" min="0" max="300" />
-				<colors line="%slidervalue_line_clr%" slider="%slidervalue_slider_clr%" />
 			</object>
 
 			<object type="slidervalue">
 				<placement x="col1_x" y="%row12_text_y%" w="%slidervalue_w%" />
-				<font resource="font" color="%text_color%" />
 				<text>Action Vibration:</text>
 				<data variable="tw_action_vibrate" min="0" max="500" />
-				<colors line="%slidervalue_line_clr%" slider="%slidervalue_slider_clr%" />
 			</object>
 
 			<object type="action">
@@ -2947,18 +2537,14 @@
 		<page name="advanced">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
 				<text>Advanced</text>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row1_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Copy Log to SD</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=advanced</action>
 					<action function="set">tw_action=copylog</action>
@@ -2971,77 +2557,53 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%row1_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Fix Permissions</text>
-				<image resource="main_button" />
 				<action function="page">fixperms</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<condition var1="tw_allow_partition_sdcard" var2="1" />
 				<placement x="%col1_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Partition SD Card</text>
-				<image resource="main_button" />
 				<action function="page">partsdcard</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>File Manager</text>
-				<image resource="main_button" />
 				<action function="page">filemanagerlist</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row3_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Terminal Command</text>
-				<image resource="main_button" />
 				<action function="page">terminalfolder</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%row3_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Reload Theme</text>
-				<image resource="main_button" />
 				<action function="reload"></action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row4_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>ADB Sideload</text>
-				<image resource="main_button" />
 				<action function="page">sideload</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<condition var1="tw_show_dumlock" var2="1" />
 				<placement x="%col2_x%" y="%row4_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>HTC Dumlock</text>
-				<image resource="main_button" />
 				<action function="page">htcdumlock</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<condition var1="tw_has_injecttwrp" var2="1" />
 				<placement x="%col2_x%" y="%row4_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Re-Inject TWRP</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=advanced</action>
 					<action function="set">tw_action=reinjecttwrp</action>
@@ -3069,100 +2631,79 @@
 		<page name="partsdcard">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
 				<text>Partition SD Card</text>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row1_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text></text>
 				<image resource="minus_button" />
 				<action function="addsubtract">tw_sdext_size-128</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%sd_plus_x%" y="%row1_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text></text>
 				<image resource="plus_button" />
 				<action function="addsubtract">tw_sdext_size+128</action>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%sdext_text_x%" y="%sdext_text_y%" />
 				<text>EXT Size: %tw_sdext_size%</text>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%sdswap_button_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text></text>
 				<image resource="minus_button" />
 				<action function="addsubtract">tw_swap_size-32</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%sd_plus_x%" y="%sdswap_button_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text></text>
 				<image resource="plus_button" />
 				<action function="addsubtract">tw_swap_size+32</action>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%sdswap_text_x%" y="%sdswap_text_y%" />
 				<text>Swap Size: %tw_swap_size%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%col1_x%" y="%sdfilesystem_text_y%" />
 				<text>File system: %tw_sdpart_file_system%</text>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%sdfilesystem_button_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>EXT3</text>
-				<image resource="main_button" />
 				<action function="set">tw_sdpart_file_system=ext3</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<condition var1="tw_sdext_disable_ext4" var2="0" />
 				<placement x="%col2_x%" y="%sdfilesystem_button_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>EXT4</text>
-				<image resource="main_button" />
 				<action function="set">tw_sdpart_file_system=ext4</action>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%col1_x%" y="%row12_text_y%" />
 				<text>You will lose all files on your SD card!</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%col1_x%" y="%row13_text_y%" />
 				<text>This action cannot be undone!</text>
 			</object>
 
 			<object type="slider">
-				<placement x="%slider_x%" y="%slider_y%" />
-				<resource base="slider" used="slider-used" touch="slider-touch" />
+				<text>Swipe to Partition</text>
 				<action function="page">partsdcardaction</action>
 				<actions>
 					<action function="set">tw_back=partsdcard</action>
@@ -3177,12 +2718,6 @@
 				</actions>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
-				<text>Swipe to Partition</text>
-			</object>
-
 			<object type="action">
 				<touch key="home" />
 				<action function="page">main</action>
@@ -3199,19 +2734,14 @@
 		<page name="htcdumlock">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
 				<text>HTC Dumlock</text>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
-				<condition var1="tw_show_dumlock" var2="1" />
 				<placement x="%col1_x%" y="%row1_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Restore Original Boot</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=htcdumlock</action>
 					<action function="set">tw_action=htcdumlockrestoreboot</action>
@@ -3224,12 +2754,8 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
-				<condition var1="tw_show_dumlock" var2="1" />
 				<placement x="%col2_x%" y="%row1_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Reflash Recovery</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=htcdumlock</action>
 					<action function="set">tw_action=htcdumlockreflashrecovery</action>
@@ -3242,12 +2768,8 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
-				<condition var1="tw_show_dumlock" var2="1" />
 				<placement x="%col1_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Install HTC Dumlock</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=htcdumlock</action>
 					<action function="set">tw_action=installhtcdumlock</action>
@@ -3281,38 +2803,22 @@
 			</object>
 
 			<object type="slider">
-				<placement x="%slider_x%" y="%slider_y%" />
-				<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" />
 				<text>Swipe to Unlock</text>
+				<action function="overlay"></action>
 			</object>
 		</page>
 
 		<page name="filemanagerlist">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
 				<text>File Manager: Select a File or Folder</text>
 			</object>
 
 			<object type="fileselector">
-				<highlight color="%fileselector_highlight_color%" />
 				<placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" />
-				<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
-				<fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" />
 				<text>%tw_file_location1%</text>
-				<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
-				<sort name="tw_gui_sort_order" />
-				<icon folder="folder_icon" file="file_icon" />
-				<background color="%fileselector_background%" />
-				<font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
 				<folders="1" files="1" />
 				<path name="tw_file_location1" default="/" />
 				<data name="tw_filename1" />
@@ -3345,12 +2851,9 @@
 				</actions>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
+			<object type="button" style="mediumbutton">
 				<placement x="%filemanager_select_x%" y="%filemanager_select_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Select</text>
-				<image resource="medium_button" />
 				<actions>
 					<action function="set">tw_filename1=tw_file_location1</action>
 					<action function="set">tw_fm_isfolder=1</action>
@@ -3365,25 +2868,20 @@
 		<page name="filemanageroptions">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5"/>
 				<text>%tw_fm_type% Selected:</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row2_text_y%" placement="5"/>
 				<text>%tw_filename1%</text>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<condition var1="tw_fm_isfolder" var2="0" />
 				<placement x="%col1_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Copy File</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_filemanager_command=cp</action>
 					<action function="set">tw_fm_text1=Copying</action>
@@ -3392,12 +2890,9 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<condition var1="tw_fm_isfolder" var2="1" />
 				<placement x="%col1_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Copy Folder</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_filemanager_command=cd &quot;%tw_file_location1%&quot; && cd .. && cp -R</action>
 					<action function="set">tw_fm_text1=Copying</action>
@@ -3406,11 +2901,8 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Move</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_filemanager_command=mv</action>
 					<action function="set">tw_fm_text1=Moving</action>
@@ -3419,11 +2911,8 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row3_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>chmod 755</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_filemanager_command=chmod 755</action>
 					<action function="set">tw_fm_text1=chmod 755</action>
@@ -3436,11 +2925,8 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%row3_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>chmod</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_filemanager_rename=0000</action>
 					<action function="set">tw_fm_text2=</action>
@@ -3452,11 +2938,8 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row4_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Delete</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_filemanager_command=rm -rf</action>
 					<action function="set">tw_fm_text1=Deleting</action>
@@ -3469,12 +2952,9 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<condition var1="tw_fm_isfolder" var2="0" />
 				<placement x="%col2_x%" y="%row4_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Rename File</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_filemanager_rename=tw_selection1</action>
 					<action function="set">tw_fm_text1=Renaming</action>
@@ -3484,12 +2964,9 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<condition var1="tw_fm_isfolder" var2="1" />
 				<placement x="%col2_x%" y="%row4_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Rename Folder</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_filemanager_rename=tw_selection1</action>
 					<action function="set">tw_fm_text1=Renaming</action>
@@ -3514,23 +2991,14 @@
 		<page name="choosedestinationfolder">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5"/>
 				<text>Browse to Destination Folder & Press Select</text>
 			</object>
 
 			<object type="fileselector">
-				<highlight color="%fileselector_highlight_color%" />
 				<placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" />
-				<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
-				<fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" />
 				<text>%tw_file_location2%</text>
-				<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
-				<sort name="tw_gui_sort_order" />
-				<icon folder="folder_icon" file="file_icon" />
-				<background color="%fileselector_background%" />
-				<font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
 				<filter folders="1" files="0" />
 				<path name="tw_file_location2" default="/" />
 				<data name="tw_filename2" />
@@ -3549,12 +3017,9 @@
 				<action function="page">filemanageroptions</action>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
+			<object type="button" style="mediumbutton">
 				<placement x="%filemanager_select_x%" y="%filemanager_select_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Select</text>
-				<image resource="medium_button" />
 				<actions>
 					<action function="set">tw_fm_text2=to</action>
 					<action function="set">tw_fm_text3=%tw_file_location2%</action>
@@ -3570,17 +3035,13 @@
 		<page name="filemanagerrenamefile">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
-				<font resource="font" />
 				<text>Please Enter a New %tw_fm_type% Name</text>
 			</object>
 
 			<object type="input">
 				<placement x="%col1_x%" y="%row3_text_y%" w="%input_width%" h="%input_height%" placement="0" />
-				<background color="%input_background_color%" />
-				<cursor color="%input_cursor_color%" hasfocus="1" width="%input_cursor_width%" />
-				<font resource="font" color="%text_color%" />
 				<text>%tw_filemanager_rename%</text>
 				<data name="tw_filemanager_rename" />
 				<restrict minlen="1" maxlen="128" />
@@ -3594,11 +3055,8 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col_center_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Cancel</text>
-				<image resource="main_button" />
 				<action function="page">filemanageroptions</action>
 			</object>
 
@@ -3620,17 +3078,13 @@
 		<page name="filemanagerrenamefolder">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
-				<font resource="font" />
 				<text>Please Enter a New %tw_fm_type% Name</text>
 			</object>
 
 			<object type="input">
 				<placement x="%col1_x%" y="%row3_text_y%" w="%input_width%" h="%input_height%" placement="0" />
-				<background color="%input_background_color%" />
-				<cursor color="%input_cursor_color%" hasfocus="1" width="%input_cursor_width%" />
-				<font resource="font" color="%text_color%" />
 				<text>%tw_filemanager_rename%</text>
 				<data name="tw_filemanager_rename" />
 				<restrict minlen="1" maxlen="128" />
@@ -3644,11 +3098,8 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col_center_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Cancel</text>
-				<image resource="main_button" />
 				<action function="page">filemanageroptions</action>
 			</object>
 
@@ -3670,17 +3121,13 @@
 		<page name="filemanagerchmod">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
-				<font resource="font" />
 				<text>Please Enter New Permissions</text>
 			</object>
 
 			<object type="input">
 				<placement x="%col1_x%" y="%row3_text_y%" w="%input_width%" h="%input_height%" placement="0" />
-				<background color="%input_background_color%" />
-				<cursor color="%input_cursor_color%" hasfocus="1" width="%input_cursor_width%" />
-				<font resource="font" color="%text_color%" />
 				<text>%tw_filemanager_rename%</text>
 				<data name="tw_filemanager_rename" />
 				<restrict minlen="3" maxlen="4" allow="0123456789" />
@@ -3693,11 +3140,8 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col_center_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Cancel</text>
-				<image resource="main_button" />
 				<action function="page">filemanageroptions</action>
 			</object>
 
@@ -3719,48 +3163,35 @@
 		<page name="filemanagerconfirm">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5"/>
 				<text>%tw_fm_text1%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row2_text_y%" placement="5"/>
 				<text>%tw_filename1%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row3_text_y%" placement="5"/>
 				<text>%tw_fm_text2%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row4_text_y%" placement="5"/>
 				<text>%tw_fm_text3%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row10_text_y%" placement="5"/>
 				<text>Press back button to cancel.</text>
 			</object>
 
 			<object type="slider">
-				<placement x="%slider_x%" y="%slider_y%" />
-				<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" />
-				<text>Swipe to Confirm</text>
-			</object>
-
 			<object type="action">
 				<touch key="back" />
 				<action function="page">%tw_back%</action>
@@ -3777,9 +3208,7 @@
 		<page name="filemanageracction">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>%tw_fm_text1%</text>
 			</object>
@@ -3829,17 +3258,13 @@
 		<page name="decrypt">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
 				<text>Please Enter Your Password</text>
 			</object>
 
 			<object type="input">
 				<placement x="%col1_x%" y="%row3_text_y%" w="%input_width%" h="%input_height%" placement="0" />
-				<background color="%input_background_color%" />
-				<cursor color="%input_cursor_color%" hasfocus="1" width="%input_cursor_width%" />
-				<font resource="font" color="%text_color%" />
 				<text>%tw_crypto_display%</text>
 				<data name="tw_crypto_password" mask="*" maskvariable="tw_crypto_display" />
 				<restrict minlen="1" maxlen="254" />
@@ -3848,19 +3273,16 @@
 				</actions>
 			</object>
 
-			<object type="text" color="%text_fail_color%">
+			<object type="text">
 				<condition var1="tw_password_fail" var2="1" />
-				<font resource="font" />
+				<font resource="font" color="%text_fail_color%"/>
 				<placement x="%center_x%" y="%row4_text_y%" placement="5" />
 				<text>Password Failed, Please Try Again</text>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col_center_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Cancel</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_page_done=1</action>
 					<action function="page">main</action>
@@ -3875,8 +3297,7 @@
 		<page name="trydecrypt">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>Trying Decryption with Your Password</text>
 			</object>
@@ -3915,23 +3336,14 @@
 		<page name="terminalfolder">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5"/>
 				<text>Browse to Starting Folder</text>
 			</object>
 
 			<object type="fileselector">
-				<highlight color="%fileselector_highlight_color%" />
 				<placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" />
-				<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
-				<fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" />
 				<text>%tw_terminal_location%</text>
-				<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
-				<sort name="tw_gui_sort_order" />
-				<icon folder="folder_icon" file="file_icon" />
-				<background color="%fileselector_background%" />
-				<font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
 				<filter folders="1" files="0" />
 				<path name="tw_terminal_location" default="/" />
 				<data name="tw_terminal" />
@@ -3950,12 +3362,9 @@
 				<action function="page">advanced</action>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
+			<object type="button" style="mediumbutton">
 				<placement x="%filemanager_select_x%" y="%filemanager_select_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Select</text>
-				<image resource="medium_button" />
 				<actions>
 					<action function="page">terminalcommand</action>
 				</actions>
@@ -3969,35 +3378,26 @@
 
 			<object type="console">
 				<placement x="%console_x%" y="0" w="%console_width%" h="%terminal_console_height%" />
-				<color foreground="%console_foreground%" background="%console_background%" scroll="%console_scroll%" />
-				<font resource="fixed" />
 			</object>
 
-			<object type="text" color="%text_color%">
+			<object type="text">
 				<placement x="%col1_x%" y="%terminal_text_y%" placement="0" />
-				<font resource="font" />
 				<text>Starting Path: %tw_terminal_location%</text>
 			</object>
 
 			<object type="input">
 				<condition var1="tw_terminal_state" var2="0" />
 				<placement x="%col1_x%" y="%terminal_text_y%" w="%input_width%" h="%input_height%" placement="0" />
-				<background color="%input_background_color%" />
-				<cursor color="%input_cursor_color%" hasfocus="1" width="%input_cursor_width%" />
-				<font resource="font" color="%text_color%" />
 				<text>%tw_terminal_command%</text>
 				<data name="tw_terminal_command" />
 				<restrict minlen="1" />
 				<action function="terminalcommand">%tw_terminal_command%</action>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
+			<object type="button" style="mediumbutton">
 				<condition var1="tw_terminal_state" var2="1" />
 				<placement x="%filemanager_select_x%" y="%terminal_button_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>KILL</text>
-				<image resource="medium_button" />
 				<action function="killterminal"></action>
 			</object>
 
@@ -4017,31 +3417,25 @@
 		<page name="sideload">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5"/>
 				<text>ADB Sideload</text>
 			</object>
 
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row2_text_y%" />
-				<font resource="font" color="%text_color%" />
 				<text>Wipe Dalvik Cache.</text>
 				<data variable="tw_wipe_dalvik" />
-				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row3_text_y%" />
-				<font resource="font" color="%text_color%" />
 				<text>Wipe Cache.</text>
 				<data variable="tw_wipe_cache" />
-				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="slider">
-				<placement x="%slider_x%" y="%slider_y%" />
-				<resource base="slider" used="slider-used" touch="slider-touch" />
+				<text>Swipe to Start Sideload</text>
 				<actions>
 					<action function="set">tw_back=advanced</action>
 					<action function="set">tw_action=adbsideload</action>
@@ -4055,12 +3449,6 @@
 				</actions>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
-				<text>Swipe to Start Sideload</text>
-			</object>
-
 			<object type="action">
 				<touch key="home" />
 				<action function="page">main</action>
@@ -4077,41 +3465,34 @@
 		<page name="fixperms">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5"/>
 				<text>Fix Permissions</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%col1_x%" y="%row2_text_y%" />
 				<text>Note: Fixing permissions is rarely needed.</text>
 			</object>
 
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row3_text_y%" />
-				<font resource="font" color="%text_color%" />
 				<text>Also fix SELinux contexts</text>
 				<data variable="tw_fixperms_restorecon" />
-				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%col1_x%" y="%row4_text_y%" />
 				<text>Fixing SELinux contexts may cause</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%col1_x%" y="%row5_text_y%" />
 				<text>your device to not boot properly.</text>
 			</object>
 
 			<object type="slider">
-				<placement x="%slider_x%" y="%slider_y%" />
-				<resource base="slider" used="slider-used" touch="slider-touch" />
+				<text>Swipe to Fix Permissions</text>
 				<actions>
 					<action function="set">tw_back=advanced</action>
 					<action function="set">tw_action=fixpermissions</action>
@@ -4123,12 +3504,6 @@
 				</actions>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
-				<text>Swipe to Fix Permissions</text>
-			</object>
-
 			<object type="action">
 				<touch key="home" />
 				<action function="page">main</action>
@@ -4145,42 +3520,34 @@
 		<page name="installsu">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5"/>
 				<text>Install SuperSU?</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row2_text_y%" placement="5"/>
 				<text>Your device does not appear to be rooted.</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row3_text_y%" placement="5"/>
 				<text>Install SuperSU now?</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row4_text_y%" placement="5"/>
 				<text>This will root your device.</text>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col_center_x%" y="%row3_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Do Not Install</text>
 				<image resource="main_button" />
-				<action function="set">tw_page_done=1</action>
 			</object>
 
 			<object type="slider">
-				<placement x="%slider_x%" y="%slider_y%" />
-				<resource base="slider" used="slider-used" touch="slider-touch" />
+				<text>Swipe to Install</text>
 				<actions>
 					<action function="set">tw_action=installsu</action>
 					<action function="set">tw_action_text1=Installing SuperSU</action>
@@ -4188,12 +3555,6 @@
 					<action function="page">singleaction_page</action>
 				</actions>
 			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
-				<text>Swipe to Install</text>
-			</object>
 		</page>
 	</pages>
 </recovery>
diff --git a/gui/devices/watch/res/watch.xml b/gui/devices/watch/res/watch.xml
index 49e172e..786049a 100644
--- a/gui/devices/watch/res/watch.xml
+++ b/gui/devices/watch/res/watch.xml
@@ -1,6 +1,102 @@
 <?xml version="1.0"?>
 
 <recovery>
+	<styles>
+		<style name="buttontext">
+			<highlight color="%highlight_color%" />
+			<font resource="font" color="%button_text_color%" />
+		</style>
+
+		<style name="button">
+			<style name="buttontext" />
+			<image resource="main_button" />
+		</style>
+
+		<style name="mediumbutton">
+			<style name="buttontext" />
+			<image resource="medium_button" />
+		</style>
+
+		<style name="fillbutton">
+			<style name="buttontext" />
+			<fill color="%button_fill_color%" />
+		</style>
+
+		<style name="rebootsystem">
+			<condition var1="tw_reboot_system" var2="1" />
+			<style name="button" />
+			<text>Reboot System</text>
+			<actions>
+				<action function="set">tw_back=main2</action>
+				<action function="set">tw_action=reboot</action>
+				<action function="set">tw_action_param=system</action>
+				<action function="set">tw_has_action2=0</action>
+				<action function="set">tw_text1=No OS Installed! Are you</action>
+				<action function="set">tw_text2=sure you wish to reboot?</action>
+				<action function="set">tw_text3=</action>
+				<action function="set">tw_text4=</action>
+				<action function="set">tw_action_text1=Rebooting...</action>
+				<action function="set">tw_action_text2=</action>
+				<action function="set">tw_complete_text1=Rebooting...</action>
+				<action function="set">tw_slider_text=Swipe to Reboot</action>
+				<action function="page">rebootcheck</action>
+			</actions>
+		</style>
+
+		<style name="scrolllist">
+			<highlight color="%fileselector_highlight_color%" />
+			<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
+			<fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" />
+			<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
+			<background color="%fileselector_background%" />
+			<font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
+		</style>
+
+		<style name="fileselector">
+			<style name="scrolllist" />
+			<icon folder="folder_icon" file="file_icon" />
+			<sort name="tw_gui_sort_order" />
+		</style>
+
+		<style name="partitionlist">
+			<style name="scrolllist" />
+			<icon selected="checkbox_true" unselected="checkbox_false" />
+		</style>
+
+		<style name="text">
+			<font resource="font" color="%text_color%" />
+		</style>
+
+		<style name="checkbox">
+			<font resource="font" color="%text_color%" />
+			<image checked="checkbox_true" unchecked="checkbox_false" />
+		</style>
+
+		<style name="slider">
+			<text>Swipe to Confirm</text>
+			<font resource="font" color="%text_color%" />
+			<placement x="%slider_x%" y="%slider_y%" placement="5" />
+			<resource base="slider" used="slider-used" touch="slider-touch" />
+		</style>
+
+		<style name="console">
+			<color foreground="%console_foreground%" background="%console_background%" scroll="%console_scroll%" />
+			<font resource="fixed" />
+		</style>
+
+		<style name="input">
+			<background color="%input_background_color%" />
+			<cursor color="%input_cursor_color%" hasfocus="1" width="%input_cursor_width%" />
+			<font resource="font" color="%text_color%" />
+		</style>
+
+		<style name="slidervalue">
+			<font resource="font" color="%text_color%" />
+			<colors line="%slidervalue_line_clr%" slider="%slidervalue_slider_clr%" />
+			<dimensions lineh="%slidervalue_lineh%" linepadding="%slidervalue_padding%" sliderw="%slidervalue_sliderw%" sliderh="%slidervalue_sliderh%" />
+		</style>
+	</styles>
+
 	<pages>
 		<page name="main">
 			<object type="action">
@@ -17,75 +113,51 @@
 			<object type="template" name="header" />
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row1_home_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Install</text>
-				<image resource="main_button" />
 				<action function="page">install_select</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%row1_home_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Wipe</text>
-				<image resource="main_button" />
 				<action function="page">wipe</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row2_home_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Backup</text>
-				<image resource="main_button" />
 				<action function="page">backup</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%row2_home_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Restore</text>
-				<image resource="main_button" />
 				<action function="page">restore</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row3_home_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Mount</text>
-				<image resource="main_button" />
 				<action function="page">mount</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%row3_home_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Settings</text>
-				<image resource="main_button" />
 				<action function="page">settings</action>
 			</object>
 
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row4_home_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Advanced</text>
-				<image resource="main_button" />
 				<action function="page">advanced</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%row4_home_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Reboot</text>
-				<image resource="main_button" />
 				<action function="page">reboot</action>
 			</object>
 
@@ -98,11 +170,8 @@
 			<object type="template" name="header" />
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row1_home_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Install Zips</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="queueclear"></action>
 					<action function="page">install</action>
@@ -110,11 +179,8 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%row1_home_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Install Images</text>
-				<image resource="main_button" />
 				<action function="page">install_image</action>
 			</object>
 
@@ -134,17 +200,13 @@
 		<page name="install">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
 				<text>Select Zip to Install</text>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<fill color="%button_fill_color%" />
+			<object type="button" style="fillbutton">
 				<placement x="%col1_x%" y="%row1_text_y%" w="%button_fill_full_width%" h="%button_fill_quarter_height%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Storage: %tw_storage_display_name% (%tw_storage_free_size% MB)</text>
 				<actions>
 					<action function="set">tw_back=install</action>
@@ -153,16 +215,8 @@
 			</object>
 
 			<object type="fileselector">
-				<highlight color="%fileselector_highlight_color%" />
 				<placement x="%fileselector_x%" y="%fileselector_y%" w="%fileselector_width%" h="%fileselector_install_height%" />
-				<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
-				<fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" />
 				<text>%tw_zip_location%</text>
-				<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
-				<sort name="tw_gui_sort_order" />
-				<icon folder="folder_icon" file="file_icon" />
-				<background color="%fileselector_background%" />
-				<font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
 				<filter extn=".zip" folders="1" files="1" />
 				<path name="tw_zip_location" default="/sdcard" />
 				<data name="tw_filename" />
@@ -195,93 +249,71 @@
 		<page name="flash_confirm">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
 				<text>This operation may install incompatible</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>software and render your device unusable.</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row2_text_y%" placement="5" />
 				<text>Folder and File:</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="mediumfont" />
+			<object type="text">
+				<font resource="mediumfont" color="%text_color%" />
 				<placement x="%center_x%" y="%row3_text_y%" placement="5" />
 				<text>%tw_zip_location%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="mediumfont" />
+			<object type="text">
+				<font resource="mediumfont" color="%text_color%" />
 				<placement x="%center_x%" y="%row4_text_y%" placement="5" />
 				<text>%tw_file%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row5_text_y%" placement="5" />
 				<text>Press back to cancel adding this zip.</text>
 			</object>
 
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row6_text_y%" />
-				<font resource="font" color="%text_color%" />
 				<text>Zip file signature verification.</text>
 				<data variable="tw_signed_zip_verify" />
-				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="checkbox">
 				<condition var1="tw_has_injecttwrp" var2="1" />
 				<placement x="%col1_x%" y="%row7_text_y%" />
-				<font resource="font" color="%text_color%" />
 				<text>Inject TWRP after install.</text>
 				<data variable="tw_inject_after_zip" />
-				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row11_text_y%" placement="5" />
 				<text>File %tw_zip_queue_count% of max of 10</text>
 			</object>
 
 			<object type="slider">
-				<placement x="%slider_x%" y="%slider_y%" placement="5" />
-				<resource base="slider" used="slider-used" touch="slider-touch" />
+				<text>Swipe to Confirm Flash</text>
 				<action function="flash">flash_zip</action>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
-				<text>Swipe to Confirm Flash</text>
-			</object>
-
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<condition var1="tw_zip_queue_count" op="!=" var2="10"></condition>
 				<placement x="%col1_x%" y="%row_queue_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Add More Zips</text>
-				<image resource="main_button" />
 				<action function="page">install</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%row_queue_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Clear Zip Queue</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="queueclear"></action>
 					<action function="page">install</action>
@@ -307,19 +339,16 @@
 
 			<object type="console">
 				<placement x="%console_x%" y="%row1_y%" w="%console_width%" h="%console_install_height%" />
-				<color foreground="%console_foreground%" background="%console_background%" scroll="%console_scroll%" />
-				<font resource="fixed" />
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="%center_x%" y="%row17_text_y%" placement="5" />
+			<object type="text">
+				<placement x="%center_x%" y="%row10_text_y%" placement="5" />
 				<text>Flashing file %tw_zip_index% of %tw_zip_queue_count%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="mediumfont" />
-				<placement x="%center_x%" y="%row18_text_y%" placement="5" />
+			<object type="text">
+				<font resource="mediumfont" color="%text_color%"/>
+				<placement x="%center_x%" y="%row11_text_y%" placement="5" />
 				<text>%tw_filename%</text>
 			</object>
 
@@ -334,24 +363,18 @@
 		<page name="flash_done">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
 				<text>Zip Install Complete</text>
 			</object>
 
 			<object type="console">
 				<placement x="%console_x%" y="%row1_y%" w="%console_width%" h="%console_installdone_height%" />
-				<color foreground="%console_foreground%" background="%console_background%" scroll="%console_scroll%" />
-				<font resource="fixed" />
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row4_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Wipe cache/dalvik</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=flash_done</action>
 					<action function="set">tw_action=wipe</action>
@@ -367,39 +390,20 @@
 				</actions>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
+			<object type="button" style="rebootsystem">
 				<placement x="%col2_x%" y="%row4_y%" />
-				<font resource="font" color="%button_text_color%" />
-				<text>Reboot System</text>
-				<image resource="main_button" />
-				<actions>
-					<action function="set">tw_back=main2</action>
-					<action function="set">tw_action=reboot</action>
-					<action function="set">tw_action_param=system</action>
-					<action function="set">tw_has_action2=0</action>
-					<action function="set">tw_text1=No OS Installed! Are you</action>
-					<action function="set">tw_text2=sure you wish to reboot?</action>
-					<action function="set">tw_text3=</action>
-					<action function="set">tw_text4=</action>
-					<action function="set">tw_action_text1=Rebooting...</action>
-					<action function="set">tw_action_text2=</action>
-					<action function="set">tw_complete_text1=Rebooting...</action>
-					<action function="set">tw_slider_text=Swipe to Reboot</action>
-					<action function="page">rebootcheck</action>
-				</actions>
 			</object>
 
-			<object type="text" color="%text_fail_color%">
+			<object type="text">
 				<condition var1="tw_operation_status" op="!=" var2="0" />
-				<font resource="font" />
+				<font resource="font" color="%text_fail_color%" />
 				<placement x="%center_x%" y="%zip_status_y%" placement="5" />
 				<text>Failed</text>
 			</object>
 
-			<object type="text" color="%text_success_color%">
+			<object type="text">
 				<condition var1="tw_operation_status" var2="0" />
-				<font resource="font" />
+				<font resource="font" color="%text_success_color%" />
 				<placement x="%center_x%" y="%zip_status_y%" placement="5" />
 				<text>Successful</text>
 			</object>
@@ -424,17 +428,13 @@
 		<page name="install_image">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
 				<text>Select Image to Install</text>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<fill color="%button_fill_color%" />
+			<object type="button" style="fillbutton">
 				<placement x="%col1_x%" y="%row1_text_y%" w="%button_fill_full_width%" h="%button_fill_quarter_height%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Storage: %tw_storage_display_name% (%tw_storage_free_size% MB)</text>
 				<actions>
 					<action function="set">tw_back=install_image</action>
@@ -443,16 +443,8 @@
 			</object>
 
 			<object type="fileselector">
-				<highlight color="%fileselector_highlight_color%" />
 				<placement x="%fileselector_x%" y="%row3_text_y%" w="%fileselector_width%" h="%fileselector_install_height%" />
-				<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
-				<fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" />
 				<text>%tw_zip_location%</text>
-				<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
-				<sort name="tw_gui_sort_order" />
-				<icon folder="folder_icon" file="file_icon" />
-				<background color="%fileselector_background%" />
-				<font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
 				<filter extn=".img" folders="1" files="1" />
 				<path name="tw_zip_location" default="/sdcard" />
 				<data name="tw_filename" />
@@ -483,46 +475,37 @@
 			<object type="template" name="header" />
 
 			<object type="partitionlist">
-				<highlight color="%fileselector_highlight_color%" />
 				<placement x="%listbox_x%" y="%row1_header_y%" w="%listbox_width%" h="%flash_list_height%" />
-				<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
-				<fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" />
 				<text>Select Partition to Flash Image:</text>
 				<icon selected="radio_true" unselected="radio_false" />
-				<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
-				<background color="%listbox_background%" />
-				<font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
 				<data name="tw_flash_partition" />
 				<listtype name="flashimg" />
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row8_text_y%" placement="5" />
 				<text>Folder:</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="mediumfont" />
+			<object type="text">
+				<font resource="mediumfont" color="%text_color%" />
 				<placement x="%center_x%" y="%row9_text_y%" placement="5" />
 				<text>%tw_zip_location%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row10_text_y%" placement="5" />
 				<text>File to flash:</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="mediumfont" />
+			<object type="text" >
+				<font resource="mediumfont" color="%text_color%" />
 				<placement x="%center_x%" y="%row11_text_y%" placement="5" />
 				<text>%tw_file%</text>
 			</object>
 
 			<object type="slider">
-				<placement x="%slider_x%" y="%slider_y%" placement="5" />
-				<resource base="slider" used="slider-used" touch="slider-touch" />
+				<text>Swipe to Confirm Flash</text>
 				<actions>
 					<action function="set">tw_back=flashimage_confirm</action>
 					<action function="set">tw_action=flashimage</action>
@@ -535,12 +518,6 @@
 				<action function="flashimage"></action>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
-				<text>Swipe to Confirm Flash</text>
-			</object>
-
 			<object type="action">
 				<touch key="back" />
 				<actions>
@@ -583,46 +560,34 @@
 		<page name="confirm_action">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>%tw_text1%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row2_text_y%" placement="5" />
 				<text>%tw_text2%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row3_text_y%" placement="5" />
 				<text>%tw_text3%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row4_text_y%" placement="5" />
 				<text>%tw_text4%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row15_text_y%" placement="5" />
 				<text>Press back button to cancel.</text>
 			</object>
 
 			<object type="slider">
-				<placement x="%slider_x%" y="%slider_y%" />
-				<resource base="slider" used="slider-used" touch="slider-touch" />
-				<action function="page">action_page</action>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
 				<text>%tw_slider_text%</text>
+				<action function="page">action_page</action>
 			</object>
 
 			<object type="action">
@@ -642,27 +607,22 @@
 		<page name="action_page">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>%tw_action_text1%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row2_text_y%" placement="5" />
 				<text>%tw_action_text2%</text>
 			</object>
 
 			<object type="template" name="action_page_console" />
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
+			<object type="button" style="mediumbutton">
 				<condition var1="tw_has_cancel" var2="1" />
 				<placement x="%col_center_medium_x%" y="%row4_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Cancel</text>
-				<image resource="medium_button" />
 				<action function="%tw_cancel_action%">%tw_cancel_param%</action>
 			</object>
 
@@ -694,14 +654,12 @@
 		<page name="singleaction_page">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>%tw_action_text1%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row3_text_y%" placement="5" />
 				<text>%tw_action_text2%</text>
 			</object>
@@ -736,22 +694,21 @@
 		<page name="action_complete">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>%tw_complete_text1%</text>
 			</object>
 
-			<object type="text" color="%text_fail_color%">
+			<object type="text">
 				<condition var1="tw_operation_status" op="!=" var2="0" />
-				<font resource="font" />
+				<font resource="font" color="%text_fail_color%" />
 				<placement x="%center_x%" y="%row2_text_y%" placement="5" />
 				<text>Failed</text>
 			</object>
 
-			<object type="text" color="%text_success_color%">
+			<object type="text">
 				<condition var1="tw_operation_status" var2="0" />
-				<font resource="font" />
+				<font resource="font" color="%text_success_color%" />
 				<placement x="%center_x%" y="%row2_text_y%" placement="5" />
 				<text>Successful</text>
 			</object>
@@ -818,66 +775,55 @@
 		<page name="wipe">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>Factory Reset</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row2_text_y%" placement="5" />
 				<text>Wipes Data, Cache, and Dalvik</text>
 			</object>
 
-			<object type="text" color="%text_color%">
+			<object type="text">
 				<condition var1="tw_has_data_media" var2="1" />
-				<font resource="font" />
 				<placement x="%center_x%" y="%row3_text_y%" placement="5" />
 				<text>(not including internal storage)</text>
 			</object>
 
-			<object type="text" color="%text_color%">
+			<object type="text">
 				<conditions>
 					<condition var1="tw_has_android_secure" var2="1" />
 					<condition var1="fileexists" var2="/and-sec" />
 				</conditions>
-				<font resource="font" />
 				<placement x="%col2_x%" y="%row4_text_y%" placement="1" />
 				<text>Android Secure  </text>
 			</object>
 
-			<object type="text" color="%text_color%">
+			<object type="text">
 				<condition var1="tw_has_sdext_partition" var2="1" />
-				<font resource="font" />
 				<placement x="%col2_x%" y="%row4_text_y%" />
 				<text>  SD-EXT</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row5_text_y%" placement="5" />
 				<text>Most of the time this is</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row6_text_y%" placement="5" />
 				<text>the only wipe that you need.</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row16_text_y%" placement="5" />
 				<text>Press back button to cancel.</text>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%wipe_button_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Advanced Wipe</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">partitionlisterror=0</action>
 					<action function="page">advancedwipe</action>
@@ -886,11 +832,8 @@
 
 			<object type="button">
 				<condition var1="tw_has_data_media" var2="1" />
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%wipe_button_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Format Data</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="page">formatdata</action>
 				</actions>
@@ -901,11 +844,8 @@
 					<condition var1="tw_is_encrypted" var2="1" />
 					<condition var1="tw_has_data_media" var2="0" />
 				</conditions>
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%wipe_button_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Wipe Encryption</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=wipe</action>
 					<action function="set">tw_action=wipe</action>
@@ -921,8 +861,7 @@
 			</object>
 
 			<object type="slider">
-				<placement x="%slider_x%" y="%slider_y%" />
-				<resource base="slider" used="slider-used" touch="slider-touch" />
+				<text>Swipe to Factory Reset</text>
 				<actions>
 					<action function="set">tw_back=wipe</action>
 					<action function="set">tw_action=wipe</action>
@@ -933,12 +872,6 @@
 				</actions>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
-				<text>Swipe to Factory Reset</text>
-			</object>
-
 			<object type="action">
 				<touch key="back" />
 				<action function="page">main</action>
@@ -957,29 +890,20 @@
 				<action function="set">tw_wipe_list=</action>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
 				<text>Wipe Menu</text>
 			</object>
 
 			<object type="partitionlist">
-				<highlight color="%fileselector_highlight_color%" />
 				<placement x="%listbox_x%" y="%row1_header_y%" w="%listbox_width%" h="%wipe_list_height%" />
-				<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
-				<fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" />
 				<text>Select Partitions to Wipe:</text>
-				<icon selected="checkbox_true" unselected="checkbox_false" />
-				<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
-				<background color="%listbox_background%" />
-				<font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
 				<data name="tw_wipe_list" />
 				<listtype name="wipe" />
 			</object>
 
 			<object type="slider">
-				<placement x="%slider_x%" y="%slider_y%" />
-				<resource base="slider" used="slider-used" touch="slider-touch" />
+				<text>Swipe to Wipe</text>
 				<actions>
 					<action function="set">tw_back=advancedwipe</action>
 					<action function="set">tw_action=wipe</action>
@@ -991,11 +915,8 @@
 				</actions>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<fill color="%button_fill_color%" />
+			<object type="button" style="fillbutton">
 				<placement x="%col1_x%" y="%wipe_button_row1%" w="%button_fill_full_width%" h="%button_fill_half_height%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Repair or Change File System</text>
 				<actions>
 					<action function="checkpartitionlist"></action>
@@ -1003,19 +924,13 @@
 				</actions>
 			</object>
 
-			<object type="text" color="%text_fail_color%">
+			<object type="text">
 				<condition var1="partitionlisterror" var2="1" />
-				<font resource="font" />
+				<font resource="font" color="%text_fail_color%" />
 				<placement x="%center_x%" y="%invalid_partition_y%" placement="5" />
 				<text>Invalid partition selection</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
-				<text>Swipe to Wipe</text>
-			</object>
-
 			<object type="action">
 				<touch key="home" />
 				<action function="page">main</action>
@@ -1030,41 +945,33 @@
 		<page name="formatdata">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
 				<text>Format Data will wipe all of your apps,</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>backups, pictures, videos, media, and</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row2_text_y%" placement="5" />
 				<text>removes encryption on internal storage.</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row3_text_y%" placement="5" />
 				<text>This cannot be undone. Press back to cancel.</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row4_text_y%" placement="5" />
 				<text>Type yes to continue.</text>
 			</object>
 
 			<object type="input">
 				<placement x="%col1_x%" y="%row6_text_y%" w="%input_width%" h="%input_height%" placement="0" />
-				<background color="%input_background_color%" />
-				<cursor color="%input_cursor_color%" hasfocus="1" width="%input_cursor_width%" />
-				<font resource="font" color="%text_color%" />
 				<text>%tw_confirm_formatdata%</text>
 				<data name="tw_confirm_formatdata" />
 				<restrict minlen="3" maxlen="3" allow="yes" />
@@ -1128,83 +1035,69 @@
 		<page name="partitionoptions">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
 				<text>Partition Options for: %tw_partition_name%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>Mount Point: %tw_partition_mount_point%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row2_text_y%" placement="5" />
 				<text>Current file system: %tw_partition_file_system%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
+			<object type="text">
 				<condition var1="tw_partition_is_present" op="!=" var2="0" />
-				<font resource="font" />
 				<placement x="%col1_x%" y="%row3_text_y%" />
 				<text>Present: Yes</text>
 			</object>
 
-			<object type="text" color="%text_color%">
+			<object type="text">
 				<condition var1="tw_partition_is_present" op="=" var2="0" />
-				<font resource="font" />
 				<placement x="%col1_x%" y="%row3_text_y%" />
 				<text>Present: No</text>
 			</object>
 
-			<object type="text" color="%text_color%">
+			<object type="text">
 				<condition var1="tw_partition_removable" op="!=" var2="0" />
-				<font resource="font" />
 				<placement x="%col2_x%" y="%row3_text_y%" />
 				<text>Removable: Yes</text>
 			</object>
 
-			<object type="text" color="%text_color%">
+			<object type="text">
 				<condition var1="tw_partition_removable" op="=" var2="0" />
-				<font resource="font" />
 				<placement x="%col2_x%" y="%row3_text_y%" />
 				<text>Removable: No</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%col1_x%" y="%row4_text_y%" />
 				<text>Size: %tw_partition_size%MB</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%col2_x%" y="%row4_text_y%" />
 				<text>Used: %tw_partition_used%MB</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%col1_x%" y="%row5_text_y%" />
 				<text>Free: %tw_partition_free%MB</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%col2_x%" y="%row5_text_y%" />
 				<text>Backup Size: %tw_partition_backup_size%MB</text>
 			</object>
 
 			<object type="button">
 				<condition var1="tw_partition_can_repair" op="=" var2="1" />
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row4_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Repair</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=partitionoptions</action>
 					<action function="set">tw_action=repair</action>
@@ -1220,11 +1113,8 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%row4_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Change File Sys</text>
-				<image resource="main_button" />
 				<action function="page">selectfilesystem</action>
 			</object>
 
@@ -1264,37 +1154,30 @@
 		<page name="selectfilesystem">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
 				<text>Change file system for: %tw_partition_name%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>Mount Point: %tw_partition_mount_point%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row2_text_y%" placement="5" />
 				<text>Current file system: %tw_partition_file_system%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row3_text_y%" placement="5" />
 				<text>Proceed with caution!</text>
 			</object>
 
 			<object type="button">
 				<condition var1="tw_partition_ext" op="=" var2="1" />
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>EXT2</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=refreshfilesystem</action>
 					<action function="set">tw_action=changefilesystem</action>
@@ -1312,11 +1195,8 @@
 
 			<object type="button">
 				<condition var1="tw_partition_ext" op="=" var2="1" />
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>EXT3</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=refreshfilesystem</action>
 					<action function="set">tw_action=changefilesystem</action>
@@ -1334,11 +1214,8 @@
 
 			<object type="button">
 				<condition var1="tw_partition_ext" op="=" var2="1" />
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row3_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>EXT4</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=refreshfilesystem</action>
 					<action function="set">tw_action=changefilesystem</action>
@@ -1356,11 +1233,8 @@
 
 			<object type="button">
 				<condition var1="tw_partition_f2fs" op="=" var2="1" />
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%row3_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>F2FS</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=refreshfilesystem</action>
 					<action function="set">tw_action=changefilesystem</action>
@@ -1378,11 +1252,8 @@
 
 			<object type="button">
 				<condition var1="tw_partition_vfat" op="=" var2="1" />
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row4_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>FAT</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=refreshfilesystem</action>
 					<action function="set">tw_action=changefilesystem</action>
@@ -1400,11 +1271,8 @@
 
 			<object type="button">
 				<condition var1="tw_partition_exfat" op="=" var2="1" />
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%row4_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>exFAT</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=refreshfilesystem</action>
 					<action function="set">tw_action=changefilesystem</action>
@@ -1436,11 +1304,8 @@
 		<page name="backup">
 			<object type="template" name="header" />
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<fill color="%button_fill_color%" />
+			<object type="button" style="fillbutton">
 				<placement x="%col1_x%" y="%row1_header_y%" w="%button_fill_full_width%" h="%button_fill_quarter_height%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Backup Name: %tw_backup_name%</text>
 				<actions>
 					<action function="set">tw_fileexists=0</action>
@@ -1449,33 +1314,20 @@
 			</object>
 
 			<object type="partitionlist">
-				<highlight color="%fileselector_highlight_color%" />
 				<placement x="%listbox_x%" y="%backup_list_y%" w="%listbox_width%" h="%backup_list_height%" />
-				<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
-				<fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" />
 				<text>Select Partitions to Back Up:</text>
-				<icon selected="checkbox_true" unselected="checkbox_false" />
-				<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
-				<background color="%listbox_background%" />
-				<font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
 				<data name="tw_backup_list" />
 				<listtype name="backup" />
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<fill color="%button_fill_color%" />
+			<object type="button" style="fillbutton">
 				<placement x="%col2_x%" y="%backup_button_row1%" w="%button_fill_main_width%" h="%button_fill_quarter_height%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>More...</text>
 				<action function="page">backupoptions</action>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<fill color="%button_fill_color%" />
+			<object type="button" style="fillbutton">
 				<placement x="%col1_x%" y="%backup_button_row2%" w="%button_fill_full_width%" h="%button_fill_quarter_height%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Storage: %tw_storage_display_name% (%tw_storage_free_size% MB)</text>
 				<actions>
 					<action function="set">tw_back=backup</action>
@@ -1485,22 +1337,13 @@
 
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%backup_button_row1%" />
-				<font resource="font" color="%text_color%" />
 				<text>Compression</text>
 				<data variable="tw_use_compression" />
-				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="slider">
-				<placement x="%slider_x%" y="%slider_y%" />
-				<resource base="slider" used="slider-used" touch="slider-touch" />
-				<action function="page">backup_run</action>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
 				<text>Swipe to Back Up</text>
+				<action function="page">backup_run</action>
 			</object>
 
 			<object type="action">
@@ -1517,36 +1360,29 @@
 		<page name="backupoptions">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
 				<text>More Backup Options</text>
 			</object>
 
-			<object type="button">
+			<object type="button" style="fillbutton">
 				<conditions>
 					<condition var1="tw_include_encrypted_backup" var2="1" />
 					<condition var1="tw_encrypt_backup" var2="0" />
 				</conditions>
-				<highlight color="%highlight_color%" />
-				<fill color="%button_fill_color%" />
 				<placement x="%col1_x%" y="%row6_text_y%" w="%button_fill_main_width%" h="%button_fill_quarter_height%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>No Encryption</text>
 				<actions>
 					<action function="page">backupencryption</action>
 				</actions>
 			</object>
 
-			<object type="button">
+			<object type="button" style="fillbutton">
 				<conditions>
 					<condition var1="tw_include_encrypted_backup" var2="1" />
 					<condition var1="tw_encrypt_backup" var2="1" />
 				</conditions>
-				<highlight color="%highlight_color%" />
-				<fill color="%button_fill_color%" />
 				<placement x="%col1_x%" y="%row6_text_y%" w="%button_fill_main_width%" h="%button_fill_quarter_height%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Using Encryption</text>
 				<actions>
 					<action function="set">tw_password_not_match=0</action>
@@ -1554,11 +1390,8 @@
 				</actions>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<fill color="%button_fill_color%" />
+			<object type="button" style="fillbutton">
 				<placement x="%col2_x%" y="%row6_text_y%" w="%button_fill_main_width%" h="%button_fill_quarter_height%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Refresh Sizes</text>
 				<actions>
 					<action function="refreshsizes"></action>
@@ -1566,11 +1399,8 @@
 				</actions>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<fill color="%button_fill_color%" />
+			<object type="button" style="fillbutton">
 				<placement x="%col1_x%" y="%backup_button_row2%" w="%button_fill_full_width%" h="%button_fill_quarter_height%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Storage: %tw_storage_display_name% (%tw_storage_free_size% MB)</text>
 				<actions>
 					<action function="set">tw_back=backupotions</action>
@@ -1580,18 +1410,14 @@
 
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row2_text_y%" />
-				<font resource="font" color="%text_color%" />
 				<text>Enable compression.</text>
 				<data variable="tw_use_compression" />
-				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row4_text_y%" />
-				<font resource="font" color="%text_color%" />
 				<text>Skip MD5 generation during backup.</text>
 				<data variable="tw_skip_md5_generate" />
-				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="action">
@@ -1619,17 +1445,13 @@
 		<page name="backupname2">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
-				<font resource="font" />
 				<text>Please Enter a Backup Name</text>
 			</object>
 
 			<object type="input">
 				<placement x="%col1_x%" y="%row3_text_y%" w="%input_width%" h="%input_height%" placement="0" />
-				<background color="%input_background_color%" />
-				<cursor color="%input_cursor_color%" hasfocus="1" width="%input_cursor_width%" />
-				<font resource="font" color="%text_color%" />
 				<text>%tw_backup_name%</text>
 				<data name="tw_backup_name" />
 				<restrict minlen="1" maxlen="64" allow=" abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_.{}[]" />
@@ -1641,28 +1463,22 @@
 				</actions>
 			</object>
 
-			<object type="text" color="%text_fail_color%">
+			<object type="text">
 				<condition var1="tw_fileexists" var2="1" />
 				<placement x="%center_x%" y="%row2_text_y%" placement="5" />
-				<font resource="font" />
+				<font resource="font" color="%text_fail_color%" />
 				<text>A backup with that name already exists!</text>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Append Date</text>
-				<image resource="main_button" />
 				<action function="appenddatetobackupname"></action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Cancel</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_backup_name=(Auto Generate)</action>
 					<action function="page">backup</action>
@@ -1693,42 +1509,34 @@
 		<page name="backupencryption">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
 				<text>Encrypt your backup?</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>Please Enter A Password:</text>
 			</object>
 
 			<object type="input">
 				<placement x="%col1_x%" y="%row3_text_y%" w="%input_width%" h="%input_height%" placement="0" />
-				<background color="%input_background_color%" />
-				<cursor color="%input_cursor_color%" hasfocus="1" width="%input_cursor_width%" />
-				<font resource="font" color="%text_color%" />
 				<text>%tw_backup_encrypt_display%</text>
 				<data name="tw_backup_password" mask="*" maskvariable="tw_backup_encrypt_display" />
 				<restrict minlen="1" maxlen="32" allow="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890_" />
 				<action function="page">backupencryption2</action>
 			</object>
 
-			<object type="text" color="%text_fail_color%">
+			<object type="text">
 				<condition var1="tw_password_not_match" var2="1" />
-				<font resource="font" />
+				<font resource="font" color="%text_fail_color%" />
 				<placement x="%center_x%" y="%row2_text_y%" placement="5" />
 				<text>Passwords Do Not Match</text>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col_center_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Cancel</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_encrypt_backup=0</action>
 					<action function="set">tw_backup_password=</action>
@@ -1757,23 +1565,18 @@
 		<page name="backupencryption2">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
 				<text>Encrypt your backup?</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>Please Enter Password Again:</text>
 			</object>
 
 			<object type="input">
 				<placement x="%col1_x%" y="%row3_text_y%" w="%input_width%" h="%input_height%" placement="0" />
-				<background color="%input_background_color%" />
-				<cursor color="%input_cursor_color%" hasfocus="1" width="%input_cursor_width%" />
-				<font resource="font" color="%text_color%" />
 				<text>%tw_backup_encrypt_display2%</text>
 				<data name="tw_backup_password2" mask="*" maskvariable="tw_backup_encrypt_display2" />
 				<restrict minlen="1" maxlen="32" allow="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890_" />
@@ -1783,11 +1586,8 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col_center_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Cancel</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_encrypt_backup=0</action>
 					<action function="set">tw_backup_password=</action>
@@ -1839,20 +1639,17 @@
 		<page name="backup_run">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>%tw_operation% %tw_partition%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row2_text_y%" placement="5" />
 				<text>%tw_file_progress%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row3_text_y%" placement="5" />
 				<text>%tw_size_progress%</text>
 			</object>
@@ -1863,12 +1660,9 @@
 
 			<object type="template" name="progress_bar" />
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
+			<object type="button" style="mediumbutton">
 				<placement x="%col_center_medium_x%" y="%row4_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Cancel</text>
-				<image resource="medium_button" />
 				<actions>
 					<action function="cancelbackup"></action>
 				</actions>
@@ -1906,11 +1700,8 @@
 		<page name="restore">
 			<object type="template" name="header" />
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<fill color="%button_fill_color%" />
+			<object type="button" style="fillbutton">
 				<placement x="%col1_x%" y="%row1_header_y%" w="%button_fill_full_width%" h="%button_fill_quarter_height%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Storage: %tw_storage_display_name% (%tw_storage_free_size% MB)</text>
 				<actions>
 					<action function="set">tw_back=restore</action>
@@ -1919,16 +1710,8 @@
 			</object>
 
 			<object type="fileselector">
-				<highlight color="%fileselector_highlight_color%" />
 				<placement x="%fileselector_x%" y="%row2_text_y%" w="%fileselector_width%" h="%fileselector_install_height%" />
-				<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
-				<fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" />
 				<text>Select Package to Restore:</text>
-				<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
-				<sort name="tw_gui_sort_order" />
-				<icon folder="folder_icon" file="file_icon" />
-				<background color="%fileselector_background%" />
-				<font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
 				<filter folders="1" files="0" nav="0" />
 				<path name="tw_backups_folder" />
 				<data name="tw_restore" default="" />
@@ -1978,23 +1761,18 @@
 		<page name="restore_decrypt">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
 				<text>Backup Encrypted</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>Please Enter Your Password:</text>
 			</object>
 
 			<object type="input">
 				<placement x="%col1_x%" y="%row3_text_y%" w="%input_width%" h="%input_height%" placement="0" />
-				<background color="%input_background_color%" />
-				<cursor color="%input_cursor_color%" hasfocus="1" width="%input_cursor_width%" />
-				<font resource="font" color="%text_color%" />
 				<text>%tw_restore_display%</text>
 				<data name="tw_restore_password" mask="*" maskvariable="tw_restore_display" />
 				<restrict minlen="1" maxlen="32" allow="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890_" />
@@ -2003,19 +1781,16 @@
 				</actions>
 			</object>
 
-			<object type="text" color="%text_fail_color%">
+			<object type="text">
 				<condition var1="tw_password_fail" var2="1" />
-				<font resource="font" />
+				<font resource="font" color="%text_fail_color%" />
 				<placement x="%center_x%" y="%row2_text_y%" placement="5" />
 				<text>Password Failed, Please Try Again</text>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Cancel</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_page_done=1</action>
 					<action function="page">restore</action>
@@ -2023,11 +1798,8 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Delete</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=restore</action>
 					<action function="set">tw_action=cmd</action>
@@ -2059,8 +1831,7 @@
 		<page name="try_restore_decrypt">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>Trying Decryption with Your Password</text>
 			</object>
@@ -2100,24 +1871,14 @@
 			<object type="template" name="header" />
 
 			<object type="partitionlist">
-				<highlight color="%fileselector_highlight_color%" />
 				<placement x="%listbox_x%" y="%row1_header_y%" w="%listbox_width%" h="%restore_list_height%" />
-				<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
-				<fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" />
 				<text>Restoring: %tw_restore_name%</text>
-				<icon selected="checkbox_true" unselected="checkbox_false" />
-				<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
-				<background color="%listbox_background%" />
-				<font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
 				<data name="tw_restore_list" selectedlist="tw_restore_selected" />
 				<listtype name="restore" />
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<fill color="%button_fill_color%" />
+			<object type="button" style="fillbutton">
 				<placement x="%col1_x%" y="%backup_button_row2%" w="%button_fill_main_width%" h="%button_fill_quarter_height%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Rename Backup</text>
 				<actions>
 					<action function="set">tw_backup_rename=</action>
@@ -2126,11 +1887,8 @@
 				</actions>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<fill color="%button_fill_color%" />
+			<object type="button" style="fillbutton">
 				<placement x="%col2_x%" y="%backup_button_row2%" w="%button_fill_main_width%" h="%button_fill_quarter_height%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Delete Backup</text>
 				<actions>
 					<action function="set">tw_back=restore</action>
@@ -2147,22 +1905,13 @@
 
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%backup_button_row1%" />
-				<font resource="font" color="%text_color%" />
 				<text>Enable MD5 verification of backup.</text>
 				<data variable="tw_skip_md5_check" />
-				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="slider">
-				<placement x="%slider_x%" y="%slider_y%" />
-				<resource base="slider" used="slider-used" touch="slider-touch" />
-				<action function="page">restore_run</action>
-			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
 				<text>Swipe to Restore</text>
+				<action function="page">restore_run</action>
 			</object>
 
 			<object type="action">
@@ -2179,17 +1928,13 @@
 		<page name="renamebackup">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
-				<font resource="font" />
 				<text>Please Enter a New Backup Name</text>
 			</object>
 
 			<object type="input">
 				<placement x="%col1_x%" y="%row3_text_y%" w="%input_width%" h="%input_height%" placement="0" />
-				<background color="%input_background_color%" />
-				<cursor color="%input_cursor_color%" hasfocus="1" width="%input_cursor_width%" />
-				<font resource="font" color="%text_color%" />
 				<text>%tw_backup_rename%</text>
 				<data name="tw_backup_rename" />
 				<restrict minlen="1" maxlen="64" allow=" abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_.{}[]" />
@@ -2209,19 +1954,16 @@
 				</actions>
 			</object>
 
-			<object type="text" color="%text_fail_color%">
+			<object type="text">
 				<condition var1="tw_fileexists" var2="1" />
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
-				<font resource="font" />
+				<font resource="font" color="%text_fail_color%" />
 				<text>A backup with that name already exists!</text>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col_center_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Cancel</text>
-				<image resource="main_button" />
 				<action function="page">restore_select</action>
 			</object>
 
@@ -2243,14 +1985,12 @@
 		<page name="restore_run">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>%tw_operation% %tw_partition%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row2_text_y%" placement="5" />
 				<text>%tw_size_progress%</text>
 			</object>
@@ -2278,25 +2018,16 @@
 			<object type="template" name="header" />
 
 			<object type="partitionlist">
-				<highlight color="%fileselector_highlight_color%" />
 				<placement x="%listbox_x%" y="%row1_header_y%" w="%listbox_width%" h="%storage_list_height%" />
-				<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
-				<fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" />
 				<text>Select Storage:</text>
 				<icon selected="radio_true" unselected="radio_false" />
-				<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
-				<background color="%listbox_background%" />
-				<font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
 				<data name="tw_storage_path" />
 				<listtype name="storage" />
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col_center_x%" y="%row4_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>OK</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_clear_destination=%tw_back%</action>
 					<action function="page">clear_vars</action>
@@ -2322,23 +2053,13 @@
 			<object type="template" name="header" />
 
 			<object type="partitionlist">
-				<highlight color="%fileselector_highlight_color%" />
 				<placement x="%listbox_x%" y="%row1_header_y%" w="%listbox_width%" h="%mount_list_height%" />
-				<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
-				<fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" />
 				<text>Select Partitions to Mount:</text>
-				<icon selected="checkbox_true" unselected="checkbox_false" />
-				<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
-				<background color="%listbox_background%" />
-				<font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
 				<listtype name="mount" />
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
-				<fill color="%button_fill_color%" />
+			<object type="button" style="fillbutton">
 				<placement x="%col1_x%" y="%mount_storage_row%" w="%button_fill_full_width%" h="%button_fill_quarter_height%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Storage: %tw_storage_display_name% (%tw_storage_free_size% MB)</text>
 				<actions>
 					<action function="set">tw_back=mount</action>
@@ -2347,51 +2068,39 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<condition var1="tw_has_usb_storage" var2="1" />
 				<placement x="%col1_x%" y="row4_y" />
-				<font resource="font" color="%button_text_color%" />
 				<text>USB Storage</text>
-				<image resource="main_button" />
 				<action function="page">usb_mount</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<conditions>
 					<condition var1="tw_has_mtp" var2="1" />
 					<condition var1="tw_mtp_enabled" var2="0" />
 				</conditions>
 				<placement x="%col2_x%" y="row4_y" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Enable MTP</text>
-				<image resource="main_button" />
 				<action function="startmtp"></action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<conditions>
 					<condition var1="tw_has_mtp" var2="1" />
 					<condition var1="tw_mtp_enabled" var2="1" />
 				</conditions>
 				<placement x="%col2_x%" y="row4_y" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Disable MTP</text>
-				<image resource="main_button" />
 				<action function="stopmtp"></action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<conditions>
 					<condition var1="tw_is_encrypted" var2="1" />
 					<condition var1="tw_is_decrypted" var2="0" />
 				</conditions>
 				<placement x="%col2_x%" y="row4_y" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Decrypt Data</text>
-				<image resource="main_button" />
 				<action function="page">decrypt</action>
 			</object>
 
@@ -2411,8 +2120,7 @@
 		<page name="usb_mount">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
 				<text>USB Storage Mounted</text>
 			</object>
@@ -2423,18 +2131,14 @@
 				<text>Be sure to safely remove your device</text>
 			</object>
 
-			<object type="text" color="%text_color%">
+			<object type="text">
 				<placement x="%col1_x%" y="%row2_text_y%" />
-				<font resource="font" />
 				<text>from your computer before unmounting!</text>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row3_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Unmount</text>
-				<image resource="main_button" />
 				<action function="page">usb_umount</action>
 			</object>
 
@@ -2458,40 +2162,20 @@
 		<page name="reboot">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
 				<text>Reboot Menu</text>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
-				<condition var1="tw_reboot_system" var2="1" />
 				<placement x="%col1_x%" y="%row1_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>System</text>
-				<image resource="main_button" />
-				<actions>
-					<action function="set">tw_back=reboot</action>
-					<action function="set">tw_action=reboot</action>
-					<action function="set">tw_action_param=system</action>
-					<action function="set">tw_has_action2=0</action>
-					<action function="set">tw_text1=No OS Installed! Are you</action>
-					<action function="set">tw_text2=sure you wish to reboot?</action>
-					<action function="set">tw_action_text1=Rebooting...</action>
-					<action function="set">tw_complete_text1=Rebooting...</action>
-					<action function="set">tw_slider_text=Swipe to Reboot</action>
-					<action function="page">rebootcheck</action>
-				</actions>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<condition var1="tw_reboot_poweroff" var2="1" />
 				<placement x="%col2_x%" y="%row1_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Power Off</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=reboot</action>
 					<action function="set">tw_action=reboot</action>
@@ -2507,12 +2191,9 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<condition var1="tw_reboot_recovery" var2="1" />
 				<placement x="%col1_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Recovery</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=reboot</action>
 					<action function="set">tw_action=reboot</action>
@@ -2528,12 +2209,9 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<condition var1="tw_reboot_bootloader" var2="1" />
 				<placement x="%col2_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Bootloader</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=reboot</action>
 					<action function="set">tw_action=reboot</action>
@@ -2549,12 +2227,9 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<condition var1="tw_download_mode" var2="1" />
 				<placement x="%col1_x%" y="%row3_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Download</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=reboot</action>
 					<action function="set">tw_action=reboot</action>
@@ -2587,94 +2262,68 @@
 
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row1_header_y%" />
-				<font resource="font" color="%text_color%" />
 				<text>Zip file signature verification.</text>
 				<data variable="tw_signed_zip_verify" />
-				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row1_text_y%" />
-				<font resource="font" color="%text_color%" />
 				<text>Use rm -rf instead of formatting.</text>
 				<data variable="tw_rm_rf" />
-				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row2_text_y%" />
-				<font resource="font" color="%text_color%" />
 				<text>Skip MD5 generation during backup.</text>
 				<data variable="tw_skip_md5_generate" />
-				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row3_text_y%" />
-				<font resource="font" color="%text_color%" />
 				<text>Enable MD5 verification of backup files.</text>
 				<data variable="tw_skip_md5_check" />
-				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row4_text_y%" />
-				<font resource="font" color="%text_color%" />
 				<text>Use 24-hour clock.</text>
 				<data variable="tw_military_time" />
-				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row5_text_y%" />
-				<font resource="font" color="%text_color%" />
 				<text>Simulate actions for theme testing.</text>
 				<data variable="tw_simulate_actions" />
-				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="checkbox">
 				<condition var1="tw_simulate_actions" var2="1" />
 				<placement x="%col1_x%" y="%row6_text_y%" />
-				<font resource="font" color="%text_color%" />
 				<text>Simulate failure for actions.</text>
 				<data variable="tw_simulate_fail" />
-				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row3_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Time Zone</text>
-				<image resource="main_button" />
 				<action function="page">timezone</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%row3_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Screen</text>
-				<image resource="main_button" />
 				<action function="page">screen</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row4_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Restore Defaults</text>
-				<image resource="main_button" />
 				<action function="restoredefaultsettings"></action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%row4_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Vibration</text>
-				<image resource="main_button" />
 				<action function="page">vibrate</action>
 			</object>
 
@@ -2694,16 +2343,10 @@
 		<page name="timezone">
 			<object type="template" name="header" />
 
-			<object type="listbox">
-				<highlight color="%fileselector_highlight_color%" />
+			<object type="listbox" style="scrolllist">
 				<placement x="%listbox_x%" y="%row1_header_y%" w="%listbox_width%" h="%listbox_tz_height%" />
-				<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
-				<fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" />
 				<text>Select Time Zone:</text>
 				<icon selected="radio_true" unselected="radio_false" />
-				<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
-				<background color="%listbox_background%" />
-				<font resource="font" spacing="%listbox_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
 				<data name="tw_time_zone_guisel" />
 				<listitem name="(UTC -11) Samoa, Midway Island">BST11;BDT</listitem>
 				<listitem name="(UTC -10) Hawaii">HST10;HDT</listitem>
@@ -2733,65 +2376,46 @@
 
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row_dst_text_y%" />
-				<font resource="font" color="%text_color%" />
 				<text>Do you use daylight savings time (DST)?</text>
 				<data variable="tw_time_zone_guidst" />
-				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<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%" />
+			<object type="button" style="mediumbutton">
 				<placement x="%col1_medium_x%" y="%row_offset_medium_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>None</text>
-				<image resource="medium_button" />
 				<action function="set">tw_time_zone_guioffset=0</action>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
+			<object type="button" style="mediumbutton">
 				<placement x="%col2_medium_x%" y="%row_offset_medium_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>15</text>
-				<image resource="medium_button" />
 				<action function="set">tw_time_zone_guioffset=15</action>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
+			<object type="button" style="mediumbutton">
 				<placement x="%col3_medium_x%" y="%row_offset_medium_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>30</text>
-				<image resource="medium_button" />
 				<action function="set">tw_time_zone_guioffset=30</action>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
+			<object type="button" style="mediumbutton">
 				<placement x="%col4_medium_x%" y="%row_offset_medium_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>45</text>
-				<image resource="medium_button" />
 				<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%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Set Time Zone</text>
-				<image resource="main_button" />
 				<action function="setguitimezone"></action>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%tz_current_y%" placement="5" />
 				<text>Current Time Zone: %tw_time_zone%</text>
 			</object>
@@ -2810,8 +2434,7 @@
 		<page name="screen">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
 				<text>Screen Settings</text>
 			</object>
@@ -2837,12 +2460,11 @@
 			</object>
 
 			<object type="slidervalue">
-				<condition var1="tw_screen_timeout_secs" op="!=" var2="0" />
-				<condition var1="tw_no_screen_timeout" op="!=" var2="1" />
+				<conditions>
+					<condition var1="tw_screen_timeout_secs" op="!=" var2="0" />
+					<condition var1="tw_no_screen_timeout" op="!=" var2="1" />
+				</conditions>
 				<placement x="col1_x" y="%row4_text_y%" w="%slidervalue_w%" />
-				<font resource="font" color="%text_color%" />
-				<colors line="%slidervalue_line_clr%" slider="%slidervalue_slider_clr%" />
-				<dimensions lineh="%slidervalue_lineh%" linepadding="%slidervalue_padding%" sliderw="%slidervalue_sliderw%" sliderh="%slidervalue_sliderh%" />
 				<text>Screen timeout in seconds:</text>
 				<data variable="tw_screen_timeout_secs" min="15" max="300" />
 			</object>
@@ -2850,9 +2472,6 @@
 			<object type="slidervalue">
 				<condition var1="tw_has_brightnesss_file" var2="1" />
 				<placement x="col1_x" y="%row8_text_y%" w="%slidervalue_w%" />
-				<font resource="font" color="%text_color%" />
-				<colors line="%slidervalue_line_clr%" slider="%slidervalue_slider_clr%" />
-				<dimensions lineh="%slidervalue_lineh%" linepadding="%slidervalue_padding%" sliderw="%slidervalue_sliderw%" sliderh="%slidervalue_sliderh%" />
 				<text>Brightness: %tw_brightness_pct%%</text>
 				<data variable="tw_brightness_pct" min="10" max="100" />
 				<actions>
@@ -2879,34 +2498,27 @@
 		<page name="vibrate">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
 				<text>Vibration Settings :</text>
 			</object>
 
 			<object type="slidervalue">
 				<placement x="col1_x" y="%row1_text_y%" w="%slidervalue_w%" />
-				<font resource="font" color="%text_color%" />
 				<text>Button Vibration:</text>
 				<data variable="tw_button_vibrate" min="0" max="300" />
-				<colors line="%slidervalue_line_clr%" slider="%slidervalue_slider_clr%" />
 			</object>
 
 			<object type="slidervalue">
 				<placement x="col1_x" y="%row5_text_y%" w="%slidervalue_w%" />
-				<font resource="font" color="%text_color%" />
 				<text>Keyboard Vibration:</text>
 				<data variable="tw_keyboard_vibrate" min="0" max="300" />
-				<colors line="%slidervalue_line_clr%" slider="%slidervalue_slider_clr%" />
 			</object>
 
 			<object type="slidervalue">
 				<placement x="col1_x" y="%row9_text_y%" w="%slidervalue_w%" />
-				<font resource="font" color="%text_color%" />
 				<text>Action Vibration:</text>
 				<data variable="tw_action_vibrate" min="0" max="500" />
-				<colors line="%slidervalue_line_clr%" slider="%slidervalue_slider_clr%" />
 			</object>
 
 			<object type="action">
@@ -2925,18 +2537,14 @@
 		<page name="advanced">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
 				<text>Advanced</text>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row1_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Copy Log to SD</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=advanced</action>
 					<action function="set">tw_action=copylog</action>
@@ -2949,77 +2557,53 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%row1_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Fix Permissions</text>
-				<image resource="main_button" />
 				<action function="page">fixperms</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<condition var1="tw_allow_partition_sdcard" var2="1" />
 				<placement x="%col1_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Partition SD Card</text>
-				<image resource="main_button" />
 				<action function="page">partsdcard</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>File Manager</text>
-				<image resource="main_button" />
 				<action function="page">filemanagerlist</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row3_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Terminal Command</text>
-				<image resource="main_button" />
 				<action function="page">terminalfolder</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%row3_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Reload Theme</text>
-				<image resource="main_button" />
 				<action function="reload"></action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row4_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>ADB Sideload</text>
-				<image resource="main_button" />
 				<action function="page">sideload</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<condition var1="tw_show_dumlock" var2="1" />
 				<placement x="%col2_x%" y="%row4_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>HTC Dumlock</text>
-				<image resource="main_button" />
 				<action function="page">htcdumlock</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<condition var1="tw_has_injecttwrp" var2="1" />
 				<placement x="%col2_x%" y="%row4_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Re-Inject TWRP</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=advanced</action>
 					<action function="set">tw_action=reinjecttwrp</action>
@@ -3047,101 +2631,81 @@
 		<page name="partsdcard">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
 				<text>Partition SD Card</text>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row1_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text></text>
 				<image resource="minus_button" />
 				<action function="addsubtract">tw_sdext_size-128</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%sd_plus_x%" y="%row1_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text></text>
 				<image resource="plus_button" />
 				<action function="addsubtract">tw_sdext_size+128</action>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%sdext_text_x%" y="%sdext_text_y%" />
 				<text>EXT Size: %tw_sdext_size%</text>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%sdswap_button_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text></text>
 				<image resource="minus_button" />
 				<action function="addsubtract">tw_swap_size-32</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%sd_plus_x%" y="%sdswap_button_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text></text>
 				<image resource="plus_button" />
 				<action function="addsubtract">tw_swap_size+32</action>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%sdswap_text_x%" y="%sdswap_text_y%" />
 				<text>Swap Size: %tw_swap_size%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%col1_x%" y="%sdfilesystem_text_y%" />
 				<text>File system: %tw_sdpart_file_system%</text>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%sdfilesystem_button_y%" />
 				<font resource="font" color="%button_text_color%" />
 				<text>EXT3</text>
-				<image resource="main_button" />
 				<action function="set">tw_sdpart_file_system=ext3</action>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<condition var1="tw_sdext_disable_ext4" var2="0" />
 				<placement x="%col2_x%" y="%sdfilesystem_button_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>EXT4</text>
 				<image resource="main_button" />
 				<action function="set">tw_sdpart_file_system=ext4</action>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%col1_x%" y="%row10_text_y%" />
 				<text>You will lose all files on your SD card!</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%col1_x%" y="%row11_text_y%" />
 				<text>This action cannot be undone!</text>
 			</object>
 
 			<object type="slider">
-				<placement x="%slider_x%" y="%slider_y%" />
-				<resource base="slider" used="slider-used" touch="slider-touch" />
-				<action function="page">partsdcardaction</action>
+				<text>Swipe to Partition</text>
 				<actions>
 					<action function="set">tw_back=partsdcard</action>
 					<action function="set">tw_action=partitionsd</action>
@@ -3155,12 +2719,6 @@
 				</actions>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
-				<text>Swipe to Partition</text>
-			</object>
-
 			<object type="action">
 				<touch key="home" />
 				<action function="page">main</action>
@@ -3175,19 +2733,14 @@
 		<page name="htcdumlock">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
 				<text>HTC Dumlock</text>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
-				<condition var1="tw_show_dumlock" var2="1" />
 				<placement x="%col1_x%" y="%row1_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Restore Original Boot</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=htcdumlock</action>
 					<action function="set">tw_action=htcdumlockrestoreboot</action>
@@ -3200,12 +2753,8 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
-				<condition var1="tw_show_dumlock" var2="1" />
 				<placement x="%col2_x%" y="%row1_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Reflash Recovery</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=htcdumlock</action>
 					<action function="set">tw_action=htcdumlockreflashrecovery</action>
@@ -3218,12 +2767,8 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
-				<condition var1="tw_show_dumlock" var2="1" />
 				<placement x="%col1_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Install HTC Dumlock</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_back=htcdumlock</action>
 					<action function="set">tw_action=installhtcdumlock</action>
@@ -3257,38 +2802,22 @@
 			</object>
 
 			<object type="slider">
-				<placement x="%slider_x%" y="%slider_y%" />
-				<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" />
 				<text>Swipe to Unlock</text>
+				<action function="overlay"></action>
 			</object>
 		</page>
 
 		<page name="filemanagerlist">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
 				<text>File Manager: Select a File or Folder</text>
 			</object>
 
 			<object type="fileselector">
-				<highlight color="%fileselector_highlight_color%" />
 				<placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" />
-				<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
-				<fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" />
 				<text>%tw_file_location1%</text>
-				<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
-				<sort name="tw_gui_sort_order" />
-				<icon folder="folder_icon" file="file_icon" />
-				<background color="%fileselector_background%" />
-				<font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
 				<folders="1" files="1" />
 				<path name="tw_file_location1" default="/" />
 				<data name="tw_filename1" />
@@ -3321,12 +2850,9 @@
 				</actions>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
+			<object type="button" style="mediumbutton">
 				<placement x="%filemanager_select_x%" y="%filemanager_select_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Select</text>
-				<image resource="medium_button" />
 				<actions>
 					<action function="set">tw_filename1=tw_file_location1</action>
 					<action function="set">tw_fm_isfolder=1</action>
@@ -3339,25 +2865,20 @@
 		<page name="filemanageroptions">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5"/>
 				<text>%tw_fm_type% Selected:</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row2_text_y%" placement="5"/>
 				<text>%tw_filename1%</text>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<condition var1="tw_fm_isfolder" var2="0" />
 				<placement x="%col1_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Copy File</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_filemanager_command=cp</action>
 					<action function="set">tw_fm_text1=Copying</action>
@@ -3366,12 +2887,9 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<condition var1="tw_fm_isfolder" var2="1" />
 				<placement x="%col1_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Copy Folder</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_filemanager_command=cd &quot;%tw_file_location1%&quot; && cd .. && cp -R</action>
 					<action function="set">tw_fm_text1=Copying</action>
@@ -3380,11 +2898,8 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Move</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_filemanager_command=mv</action>
 					<action function="set">tw_fm_text1=Moving</action>
@@ -3393,11 +2908,8 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row3_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>chmod 755</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_filemanager_command=chmod 755</action>
 					<action function="set">tw_fm_text1=chmod 755</action>
@@ -3410,11 +2922,8 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col2_x%" y="%row3_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>chmod</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_filemanager_rename=0000</action>
 					<action function="set">tw_fm_text2=</action>
@@ -3426,11 +2935,8 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row4_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Delete</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_filemanager_command=rm -rf</action>
 					<action function="set">tw_fm_text1=Deleting</action>
@@ -3443,12 +2949,9 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<condition var1="tw_fm_isfolder" var2="0" />
 				<placement x="%col2_x%" y="%row4_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Rename File</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_filemanager_rename=tw_selection1</action>
 					<action function="set">tw_fm_text1=Renaming</action>
@@ -3458,12 +2961,9 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<condition var1="tw_fm_isfolder" var2="1" />
 				<placement x="%col2_x%" y="%row4_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Rename Folder</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_filemanager_rename=tw_selection1</action>
 					<action function="set">tw_fm_text1=Renaming</action>
@@ -3488,23 +2988,14 @@
 		<page name="choosedestinationfolder">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5"/>
 				<text>Browse to Destination & Press Select</text>
 			</object>
 
 			<object type="fileselector">
-				<highlight color="%fileselector_highlight_color%" />
 				<placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" />
-				<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
-				<fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" />
 				<text>%tw_file_location2%</text>
-				<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
-				<sort name="tw_gui_sort_order" />
-				<icon folder="folder_icon" file="file_icon" />
-				<background color="%fileselector_background%" />
-				<font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
 				<filter folders="1" files="0" />
 				<path name="tw_file_location2" default="/" />
 				<data name="tw_filename2" />
@@ -3523,12 +3014,9 @@
 				<action function="page">filemanageroptions</action>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
+			<object type="button" style="mediumbutton">
 				<placement x="%filemanager_select_x%" y="%filemanager_select_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Select</text>
-				<image resource="medium_button" />
 				<actions>
 					<action function="set">tw_fm_text2=to</action>
 					<action function="set">tw_fm_text3=%tw_file_location2%</action>
@@ -3542,17 +3030,13 @@
 		<page name="filemanagerrenamefile">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
-				<font resource="font" />
 				<text>Please Enter a New %tw_fm_type% Name</text>
 			</object>
 
 			<object type="input">
 				<placement x="%col1_x%" y="%row3_text_y%" w="%input_width%" h="%input_height%" placement="0" />
-				<background color="%input_background_color%" />
-				<cursor color="%input_cursor_color%" hasfocus="1" width="%input_cursor_width%" />
-				<font resource="font" color="%text_color%" />
 				<text>%tw_filemanager_rename%</text>
 				<data name="tw_filemanager_rename" />
 				<restrict minlen="1" maxlen="128" />
@@ -3566,11 +3050,8 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col_center_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Cancel</text>
-				<image resource="main_button" />
 				<action function="page">filemanageroptions</action>
 			</object>
 
@@ -3592,17 +3073,13 @@
 		<page name="filemanagerrenamefolder">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
-				<font resource="font" />
 				<text>Please Enter a New %tw_fm_type% Name</text>
 			</object>
 
 			<object type="input">
 				<placement x="%col1_x%" y="%row3_text_y%" w="%input_width%" h="%input_height%" placement="0" />
-				<background color="%input_background_color%" />
-				<cursor color="%input_cursor_color%" hasfocus="1" width="%input_cursor_width%" />
-				<font resource="font" color="%text_color%" />
 				<text>%tw_filemanager_rename%</text>
 				<data name="tw_filemanager_rename" />
 				<restrict minlen="1" maxlen="128" />
@@ -3616,11 +3093,8 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col_center_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Cancel</text>
-				<image resource="main_button" />
 				<action function="page">filemanageroptions</action>
 			</object>
 
@@ -3650,9 +3124,6 @@
 
 			<object type="input">
 				<placement x="%col1_x%" y="%row3_text_y%" w="%input_width%" h="%input_height%" placement="0" />
-				<background color="%input_background_color%" />
-				<cursor color="%input_cursor_color%" hasfocus="1" width="%input_cursor_width%" />
-				<font resource="font" color="%text_color%" />
 				<text>%tw_filemanager_rename%</text>
 				<data name="tw_filemanager_rename" />
 				<restrict minlen="3" maxlen="4" allow="0123456789" />
@@ -3665,11 +3136,8 @@
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col_center_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Cancel</text>
-				<image resource="main_button" />
 				<action function="page">filemanageroptions</action>
 			</object>
 
@@ -3691,48 +3159,35 @@
 		<page name="filemanagerconfirm">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5"/>
 				<text>%tw_fm_text1%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row2_text_y%" placement="5"/>
 				<text>%tw_filename1%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row3_text_y%" placement="5"/>
 				<text>%tw_fm_text2%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row4_text_y%" placement="5"/>
 				<text>%tw_fm_text3%</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row10_text_y%" placement="5"/>
 				<text>Press back button to cancel.</text>
 			</object>
 
 			<object type="slider">
-				<placement x="%slider_x%" y="%slider_y%" />
-				<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" />
-				<text>Swipe to Confirm</text>
-			</object>
-
 			<object type="action">
 				<touch key="back" />
 				<action function="page">%tw_back%</action>
@@ -3747,9 +3202,7 @@
 		<page name="filemanageracction">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>%tw_fm_text1%</text>
 			</object>
@@ -3799,17 +3252,13 @@
 		<page name="decrypt">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5" />
 				<text>Please Enter Your Password</text>
 			</object>
 
 			<object type="input">
 				<placement x="%col1_x%" y="%row3_text_y%" w="%input_width%" h="%input_height%" placement="0" />
-				<background color="%input_background_color%" />
-				<cursor color="%input_cursor_color%" hasfocus="1" width="%input_cursor_width%" />
-				<font resource="font" color="%text_color%" />
 				<text>%tw_crypto_display%</text>
 				<data name="tw_crypto_password" mask="*" maskvariable="tw_crypto_display" />
 				<restrict minlen="1" maxlen="254" />
@@ -3818,19 +3267,16 @@
 				</actions>
 			</object>
 
-			<object type="text" color="%text_fail_color%">
+			<object type="text">
 				<condition var1="tw_password_fail" var2="1" />
-				<font resource="font" />
+				<font resource="font" color="%text_fail_color%" />
 				<placement x="%center_x%" y="%row2_text_y%" placement="5" />
 				<text>Password Failed, Please Try Again</text>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col_center_x%" y="%row2_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Cancel</text>
-				<image resource="main_button" />
 				<actions>
 					<action function="set">tw_page_done=1</action>
 					<action function="page">main</action>
@@ -3845,8 +3291,7 @@
 		<page name="trydecrypt">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
 				<text>Trying Decryption with Your Password</text>
 			</object>
@@ -3885,23 +3330,14 @@
 		<page name="terminalfolder">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5"/>
 				<text>Browse to Starting Folder</text>
 			</object>
 
 			<object type="fileselector">
-				<highlight color="%fileselector_highlight_color%" />
 				<placement x="%fileselector_x%" y="%row1_y%" w="%fileselector_width%" h="%fileselector_install_height%" />
-				<header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" />
-				<fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" />
 				<text>%tw_terminal_location%</text>
-				<separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" />
-				<sort name="tw_gui_sort_order" />
-				<icon folder="folder_icon" file="file_icon" />
-				<background color="%fileselector_background%" />
-				<font resource="filelist" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" />
 				<filter folders="1" files="0" />
 				<path name="tw_terminal_location" default="/" />
 				<data name="tw_terminal" />
@@ -3920,12 +3356,9 @@
 				<action function="page">advanced</action>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
+			<object type="button" style="mediumbutton">
 				<placement x="%filemanager_select_x%" y="%filemanager_select_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Select</text>
-				<image resource="medium_button" />
 				<actions>
 					<action function="page">terminalcommand</action>
 				</actions>
@@ -3937,35 +3370,26 @@
 
 			<object type="console">
 				<placement x="%console_x%" y="0" w="%console_width%" h="%terminal_console_height%" />
-				<color foreground="%console_foreground%" background="%console_background%" scroll="%console_scroll%" />
-				<font resource="fixed" />
 			</object>
 
-			<object type="text" color="%text_color%">
+			<object type="text">
 				<placement x="%col1_x%" y="%terminal_text_y%" placement="0" />
-				<font resource="font" />
 				<text>Starting Path: %tw_terminal_location%</text>
 			</object>
 
 			<object type="input">
 				<condition var1="tw_terminal_state" var2="0" />
 				<placement x="%col1_x%" y="%terminal_text_y%" w="%input_width%" h="%input_height%" placement="0" />
-				<background color="%input_background_color%" />
-				<cursor color="%input_cursor_color%" hasfocus="1" width="%input_cursor_width%" />
-				<font resource="font" color="%text_color%" />
 				<text>%tw_terminal_command%</text>
 				<data name="tw_terminal_command" />
 				<restrict minlen="1" />
 				<action function="terminalcommand">%tw_terminal_command%</action>
 			</object>
 
-			<object type="button">
-				<highlight color="%highlight_color%" />
+			<object type="button" style="mediumbutton">
 				<condition var1="tw_terminal_state" var2="1" />
 				<placement x="%filemanager_select_x%" y="%terminal_button_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>KILL</text>
-				<image resource="medium_button" />
 				<action function="killterminal"></action>
 			</object>
 
@@ -3985,31 +3409,25 @@
 		<page name="sideload">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5"/>
 				<text>ADB Sideload</text>
 			</object>
 
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row2_text_y%" />
-				<font resource="font" color="%text_color%" />
 				<text>Wipe Dalvik Cache.</text>
 				<data variable="tw_wipe_dalvik" />
-				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row3_text_y%" />
-				<font resource="font" color="%text_color%" />
 				<text>Wipe Cache.</text>
 				<data variable="tw_wipe_cache" />
-				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
 			<object type="slider">
-				<placement x="%slider_x%" y="%slider_y%" />
-				<resource base="slider" used="slider-used" touch="slider-touch" />
+				<text>Swipe to Start Sideload</text>
 				<actions>
 					<action function="set">tw_back=advanced</action>
 					<action function="set">tw_action=adbsideload</action>
@@ -4023,12 +3441,6 @@
 				</actions>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
-				<text>Swipe to Start Sideload</text>
-			</object>
-
 			<object type="action">
 				<touch key="home" />
 				<action function="page">main</action>
@@ -4043,41 +3455,34 @@
 		<page name="fixperms">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5"/>
 				<text>Fix Permissions</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%col1_x%" y="%row2_text_y%" />
 				<text>Note: Fixing permissions is rarely needed.</text>
 			</object>
 
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row3_text_y%" />
-				<font resource="font" color="%text_color%" />
 				<text>Also fix SELinux contexts</text>
 				<data variable="tw_fixperms_restorecon" />
-				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%col1_x%" y="%row4_text_y%" />
 				<text>Fixing SELinux contexts may cause</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%col1_x%" y="%row5_text_y%" />
 				<text>your device to not boot properly.</text>
 			</object>
 
 			<object type="slider">
-				<placement x="%slider_x%" y="%slider_y%" />
-				<resource base="slider" used="slider-used" touch="slider-touch" />
+				<text>Swipe to Fix Permissions</text>
 				<actions>
 					<action function="set">tw_back=advanced</action>
 					<action function="set">tw_action=fixpermissions</action>
@@ -4089,12 +3494,6 @@
 				</actions>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
-				<text>Swipe to Fix Permissions</text>
-			</object>
-
 			<object type="action">
 				<touch key="home" />
 				<action function="page">main</action>
@@ -4111,42 +3510,34 @@
 		<page name="installsu">
 			<object type="template" name="header" />
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row1_header_y%" placement="5"/>
 				<text>Install SuperSU?</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row2_text_y%" placement="5"/>
 				<text>Your device does not appear to be rooted.</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row3_text_y%" placement="5"/>
 				<text>Install SuperSU now?</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<font resource="font" />
+			<object type="text">
 				<placement x="%center_x%" y="%row4_text_y%" placement="5"/>
 				<text>This will root your device.</text>
 			</object>
 
 			<object type="button">
-				<highlight color="%highlight_color%" />
 				<placement x="%col_center_x%" y="%row3_y%" />
-				<font resource="font" color="%button_text_color%" />
 				<text>Do Not Install</text>
-				<image resource="main_button" />
 				<action function="set">tw_page_done=1</action>
 			</object>
 
 			<object type="slider">
-				<placement x="%slider_x%" y="%slider_y%" />
-				<resource base="slider" used="slider-used" touch="slider-touch" />
+				<text>Swipe to Install</text>
 				<actions>
 					<action function="set">tw_action=installsu</action>
 					<action function="set">tw_action_text1=Installing SuperSU</action>
@@ -4154,12 +3545,6 @@
 					<action function="page">singleaction_page</action>
 				</actions>
 			</object>
-
-			<object type="text" color="%text_color%">
-				<font resource="font" />
-				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
-				<text>Swipe to Install</text>
-			</object>
 		</page>
 	</pages>
 </recovery>
diff --git a/gui/fileselector.cpp b/gui/fileselector.cpp
index 5c287c3..2602eb2 100644
--- a/gui/fileselector.cpp
+++ b/gui/fileselector.cpp
@@ -70,8 +70,10 @@
 		if (attr)
 			mPathVar = attr->value();
 		attr = child->first_attribute("default");
-		if (attr)
+		if (attr) {
+			mPathDefault = attr->value();
 			DataManager::SetValue(mPathVar, attr->value());
+		}
 	}
 
 	// Handle the result variable
@@ -168,6 +170,8 @@
 		} else {
 			// Reset the list to the top
 			SetVisibleListLocation(0);
+			if (value.empty())
+				DataManager::SetValue(mPathVar, mPathDefault);
 		}
 		updateFileList = true;
 		mUpdate = 1;
@@ -288,6 +292,10 @@
 {
 	GUIScrollList::SetPageFocus(inFocus);
 	if (inFocus) {
+		std::string value;
+		DataManager::GetValue(mPathVar, value);
+		if (value.empty())
+			DataManager::SetValue(mPathVar, mPathDefault);
 		updateFileList = true;
 		mUpdate = 1;
 	}
diff --git a/gui/fill.cpp b/gui/fill.cpp
index 1ddefaa..b315cd0 100644
--- a/gui/fill.cpp
+++ b/gui/fill.cpp
@@ -27,23 +27,15 @@
 
 GUIFill::GUIFill(xml_node<>* node) : GUIObject(node)
 {
-	xml_attribute<>* attr;
-	xml_node<>* child;
-
-	if (!node)
-		return;
-
-	attr = node->first_attribute("color");
-	if (!attr) {
+	bool has_color = false;
+	mColor = LoadAttrColor(node, "color", &has_color);
+	if (!has_color) {
 		LOGERR("No color specified for fill\n");
 		return;
 	}
 
-	std::string color = attr->value();
-	ConvertStrToColor(color, &mColor);
-
 	// Load the placement
-	LoadPlacement(node->first_node("placement"), &mRenderX, &mRenderY, &mRenderW, &mRenderH);
+	LoadPlacement(FindNode(node, "placement"), &mRenderX, &mRenderY, &mRenderW, &mRenderH);
 
 	return;
 }
diff --git a/gui/image.cpp b/gui/image.cpp
index 60b1cb9..8b43aaa 100644
--- a/gui/image.cpp
+++ b/gui/image.cpp
@@ -27,9 +27,6 @@
 
 GUIImage::GUIImage(xml_node<>* node) : GUIObject(node)
 {
-	xml_attribute<>* attr;
-	xml_node<>* child;
-
 	mImage = NULL;
 	mHighlightImage = NULL;
 	isHighlighted = false;
@@ -37,15 +34,11 @@
 	if (!node)
 		return;
 
-	child = node->first_node("image");
-	if (child)
-	{
-		mImage = LoadAttrImage(child, "resource");
-		mHighlightImage = LoadAttrImage(child, "highlightresource");
-	}
+	mImage = LoadAttrImage(FindNode(node, "image"), "resource");
+	mHighlightImage = LoadAttrImage(FindNode(node, "image"), "highlightresource");
 
 	// Load the placement
-	LoadPlacement(node->first_node("placement"), &mRenderX, &mRenderY, NULL, NULL, &mPlacement);
+	LoadPlacement(FindNode(node, "placement"), &mRenderX, &mRenderY, NULL, NULL, &mPlacement);
 
 	if (mImage && mImage->GetResource())
 	{
diff --git a/gui/input.cpp b/gui/input.cpp
index 299034a..ca27ea8 100644
--- a/gui/input.cpp
+++ b/gui/input.cpp
@@ -85,7 +85,7 @@
 	}
 
 	// Load the background
-	child = node->first_node("background");
+	child = FindNode(node, "background");
 	if (child)
 	{
 		mBackground = LoadAttrImage(child, "resource");
@@ -98,7 +98,7 @@
 	}
 
 	// Load the cursor color
-	child = node->first_node("cursor");
+	child = FindNode(node, "cursor");
 	if (child)
 	{
 		mCursor = LoadAttrImage(child, "resource");
@@ -106,31 +106,26 @@
 		attr = child->first_attribute("hasfocus");
 		if (attr)
 		{
-			std::string color = attr->value();
-			SetInputFocus(atoi(color.c_str()));
+			std::string focus = attr->value();
+			SetInputFocus(atoi(focus.c_str()));
 		}
-		attr = child->first_attribute("width");
-		if (attr)
-		{
-			std::string cwidth = gui_parse_text(attr->value());
-			CursorWidth = scale_theme_x(atoi(cwidth.c_str()));
-		}
+		CursorWidth = LoadAttrIntScaleX(child, "width", CursorWidth);
 	}
 	DrawCursor = HasInputFocus;
 
 	// Load the font
-	child = node->first_node("font");
+	child = FindNode(node, "font");
 	if (child)
 	{
 		mFont = LoadAttrFont(child, "resource");
 		mFontHeight = mFont->GetHeight();
 	}
 
-	child = node->first_node("text");
+	child = FindNode(node, "text");
 	if (child)  mText = child->value();
 	mLastValue = gui_parse_text(mText);
 
-	child = node->first_node("data");
+	child = FindNode(node, "data");
 	if (child)
 	{
 		attr = child->first_attribute("name");
@@ -139,11 +134,8 @@
 		attr = child->first_attribute("default");
 		if (attr)
 			DataManager::SetValue(mVariable, attr->value());
-		attr = child->first_attribute("mask");
-		if (attr) {
-			mMask = attr->value();
-			HasMask = true;
-		}
+		mMask = LoadAttrString(child, "mask");
+		HasMask = !mMask.empty();
 		attr = child->first_attribute("maskvariable");
 		if (attr)
 			mMaskVariable = attr->value();
@@ -152,33 +144,19 @@
 	}
 
 	// Load input restrictions
-	child = node->first_node("restrict");
+	child = FindNode(node, "restrict");
 	if (child)
 	{
-		attr = child->first_attribute("minlen");
-		if (attr) {
-			std::string attrib = attr->value();
-			MinLen = atoi(attrib.c_str());
-		}
-		attr = child->first_attribute("maxlen");
-		if (attr) {
-			std::string attrib = attr->value();
-			MaxLen = atoi(attrib.c_str());
-		}
-		attr = child->first_attribute("allow");
-		if (attr) {
-			HasAllowed = true;
-			AllowedList = attr->value();
-		}
-		attr = child->first_attribute("disable");
-		if (attr) {
-			HasDisabled = true;
-			DisabledList = attr->value();
-		}
+		MinLen = LoadAttrInt(child, "minlen", MinLen);
+		MaxLen = LoadAttrInt(child, "maxlen", MaxLen);
+		AllowedList = LoadAttrString(child, "allow");
+		HasAllowed = !AllowedList.empty();
+		DisabledList = LoadAttrString(child, "disable");
+		HasDisabled = !DisabledList.empty();
 	}
 
 	// Load the placement
-	LoadPlacement(node->first_node("placement"), &mRenderX, &mRenderY, &mRenderW, &mRenderH);
+	LoadPlacement(FindNode(node, "placement"), &mRenderX, &mRenderY, &mRenderW, &mRenderH);
 	SetActionPos(mRenderX, mRenderY, mRenderW, mRenderH);
 
 	if (mInputText && mFontHeight && mFontHeight < (unsigned)mRenderH) {
diff --git a/gui/keyboard.cpp b/gui/keyboard.cpp
index 5528be9..d0262aa 100644
--- a/gui/keyboard.cpp
+++ b/gui/keyboard.cpp
@@ -48,7 +48,8 @@
 {
 	int layoutindex, rowindex, keyindex, Xindex, Yindex, keyHeight = 0, keyWidth = 0;
 	rowY = colX = -1;
-	highlightRenderCount = hasHighlight = hasCapsHighlight = 0;
+	highlightRenderCount = 0;
+	hasHighlight = hasCapsHighlight = false;
 	char resource[10], layout[8], row[5], key[6], longpress[7];
 	xml_attribute<>* attr;
 	xml_node<>* child;
@@ -66,36 +67,17 @@
 	if (!node)  return;
 
 	// Load the action
-	child = node->first_node("action");
+	child = FindNode(node, "action");
 	if (child)
 	{
 		mAction = new GUIAction(node);
 	}
 
-	memset(&mHighlightColor, 0, sizeof(COLOR));
-	child = node->first_node("highlight");
-	if (child) {
-		attr = child->first_attribute("color");
-		if (attr) {
-			hasHighlight = 1;
-			std::string color = attr->value();
-			ConvertStrToColor(color, &mHighlightColor);
-		}
-	}
-
-	memset(&mCapsHighlightColor, 0, sizeof(COLOR));
-	child = node->first_node("capshighlight");
-	if (child) {
-		attr = child->first_attribute("color");
-		if (attr) {
-			hasCapsHighlight = 1;
-			std::string color = attr->value();
-			ConvertStrToColor(color, &mCapsHighlightColor);
-		}
-	}
+	mHighlightColor = LoadAttrColor(FindNode(node, "highlight"), "color", &hasHighlight);
+	mCapsHighlightColor = LoadAttrColor(FindNode(node, "capshighlight"), "color", &hasCapsHighlight);
 
 	// Load the images for the different layouts
-	child = node->first_node("layout");
+	child = FindNode(node, "layout");
 	if (child)
 	{
 		layoutindex = 1;
@@ -120,7 +102,7 @@
 	// Load all of the layout maps
 	layoutindex = 1;
 	strcpy(layout, "layout1");
-	keylayout = node->first_node(layout);
+	keylayout = FindNode(node, layout);
 	while (keylayout)
 	{
 		if (layoutindex > MAX_KEYBOARD_LAYOUTS) {
@@ -212,12 +194,12 @@
 		}
 		layoutindex++;
 		layout[6] = (char)(layoutindex + 48);
-		keylayout = node->first_node(layout);
+		keylayout = FindNode(node, layout);
 	}
 
 	int x, y, w, h;
 	// Load the placement
-	LoadPlacement(node->first_node("placement"), &x, &y, &w, &h);
+	LoadPlacement(FindNode(node, "placement"), &x, &y, &w, &h);
 	SetActionPos(x, y, KeyboardWidth, KeyboardHeight);
 	SetRenderPos(x, y, w, h);
 	return;
diff --git a/gui/listbox.cpp b/gui/listbox.cpp
index 7c7afa9..625b4b7 100644
--- a/gui/listbox.cpp
+++ b/gui/listbox.cpp
@@ -37,7 +37,7 @@
 	mUpdate = 0;
 
 	// Get the icons, if any
-	child = node->first_node("icon");
+	child = FindNode(node, "icon");
 	if (child) {
 		mIconSelected = LoadAttrImage(child, "selected");
 		mIconUnselected = LoadAttrImage(child, "unselected");
@@ -47,7 +47,7 @@
 	SetMaxIconSize(iconWidth, iconHeight);
 
 	// Handle the result variable
-	child = node->first_node("data");
+	child = FindNode(node, "data");
 	if (child) {
 		attr = child->first_attribute("name");
 		if (attr)
@@ -60,7 +60,7 @@
 	}
 
 	// Get the data for the list
-	child = node->first_node("listitem");
+	child = FindNode(node, "listitem");
 	if (!child) return;
 	while (child) {
 		ListData data;
diff --git a/gui/mousecursor.cpp b/gui/mousecursor.cpp
index 6255886..84e6322 100644
--- a/gui/mousecursor.cpp
+++ b/gui/mousecursor.cpp
@@ -51,11 +51,11 @@
 	xml_attribute<>* attr;
 	xml_node<>* child;
 
-	child = node->first_node("placement");
+	child = FindNode(node, "placement");
 	if(child)
 		LoadPlacement(child, &mRenderX, &mRenderY, &mRenderW, &mRenderH);
 
-	child = node->first_node("background");
+	child = FindNode(node, "background");
 	if(child)
 	{
 		m_color = LoadAttrColor(child, "color", m_color);
@@ -67,7 +67,7 @@
 		}
 	}
 
-	child = node->first_node("speed");
+	child = FindNode(node, "speed");
 	if(child)
 	{
 		attr = child->first_attribute("multiplier");
diff --git a/gui/object.cpp b/gui/object.cpp
index d496414..7cce5db 100644
--- a/gui/object.cpp
+++ b/gui/object.cpp
@@ -35,9 +35,9 @@
 	if (!node)		return;
 
 	// First, get the action
-	xml_node<>* condition = node->first_node("conditions");
-	if (condition)  condition = condition->first_node("condition");
-	else			condition = node->first_node("condition");
+	xml_node<>* condition = FindNode(node, "conditions");
+	if (condition)  condition = FindNode(condition, "condition");
+	else			condition = FindNode(node, "condition");
 
 	if (!condition)	return;
 
diff --git a/gui/objects.hpp b/gui/objects.hpp
index b6937a2..ceb2c6c 100644
--- a/gui/objects.hpp
+++ b/gui/objects.hpp
@@ -649,6 +649,7 @@
 	std::vector<FileData> mFolderList;
 	std::vector<FileData> mFileList;
 	std::string mPathVar; // current path displayed, saved in the data manager
+	std::string mPathDefault; // default value for the path if none is set in mPathVar
 	std::string mExtn; // used for filtering the file list, for example, *.zip
 	std::string mVariable; // set when the user selects an item, pull path like /path/to/foo
 	std::string mSortVariable; // data manager variable used to change the sorting of files
@@ -812,6 +813,7 @@
 
 protected:
 	GUIAction* sAction;
+	GUIText* sSliderLabel;
 	ImageResource* sSlider;
 	ImageResource* sSliderUsed;
 	ImageResource* sTouch;
@@ -875,7 +877,8 @@
 	int currentLayout;
 	int row_heights[MAX_KEYBOARD_LAYOUTS][MAX_KEYBOARD_ROWS];
 	unsigned int KeyboardWidth, KeyboardHeight;
-	int rowY, colX, highlightRenderCount, hasHighlight, hasCapsHighlight;
+	int rowY, colX, highlightRenderCount;
+	bool hasHighlight, hasCapsHighlight;
 	GUIAction* mAction;
 	COLOR mHighlightColor;
 	COLOR mCapsHighlightColor;
@@ -1064,10 +1067,12 @@
 };
 
 // Helper APIs
+xml_node<>* FindNode(xml_node<>* parent, const char* nodename, int depth = 0);
 std::string LoadAttrString(xml_node<>* element, const char* attrname, const char* defaultvalue = "");
 int LoadAttrInt(xml_node<>* element, const char* attrname, int defaultvalue = 0);
 int LoadAttrIntScaleX(xml_node<>* element, const char* attrname, int defaultvalue = 0);
 int LoadAttrIntScaleY(xml_node<>* element, const char* attrname, int defaultvalue = 0);
+COLOR LoadAttrColor(xml_node<>* element, const char* attrname, bool* found_color, COLOR defaultvalue = COLOR(0,0,0,0));
 COLOR LoadAttrColor(xml_node<>* element, const char* attrname, COLOR defaultvalue = COLOR(0,0,0,0));
 FontResource* LoadAttrFont(xml_node<>* element, const char* attrname);
 ImageResource* LoadAttrImage(xml_node<>* element, const char* attrname);
diff --git a/gui/pages.cpp b/gui/pages.cpp
index 58e99e6..50c60a6 100644
--- a/gui/pages.cpp
+++ b/gui/pages.cpp
@@ -103,6 +103,56 @@
 }
 
 // Helper APIs
+xml_node<>* FindNode(xml_node<>* parent, const char* nodename, int depth /* = 0 */)
+{
+	xml_node<>* child = parent->first_node(nodename);
+	if (child)
+		return child;
+
+	if (depth == 10) {
+		LOGERR("Too many style loops detected.\n");
+		return NULL;
+	}
+
+	xml_node<>* style = parent->first_node("style");
+	if (style) {
+		while (style) {
+			if (!style->first_attribute("name")) {
+				LOGERR("No name given for style.\n");
+				continue;
+			} else {
+				std::string name = style->first_attribute("name")->value();
+				xml_node<>* node = PageManager::FindStyle(name);
+
+				if (node) {
+					// We found the style that was named
+					xml_node<>* stylenode = FindNode(node, nodename, depth + 1);
+					if (stylenode)
+						return stylenode;
+				}
+			}
+			style = style->next_sibling("style");
+		}
+	} else {
+		// Search for stylename in the parent node <object type="foo" stylename="foo2">
+		xml_attribute<>* attr = parent->first_attribute("style");
+		// If no style is found anywhere else and the node wasn't found in the object itself
+		// as a special case we will search for a style that uses the same style name as the
+		// object type, so <object type="button"> would search for a style named "button"
+		if (!attr)
+			attr = parent->first_attribute("type");
+		if (attr) {
+			xml_node<>* node = PageManager::FindStyle(attr->value());
+			if (node) {
+				xml_node<>* stylenode = FindNode(node, nodename, depth + 1);
+				if (stylenode)
+					return stylenode;
+			}
+		}
+	}
+	return NULL;
+}
+
 std::string LoadAttrString(xml_node<>* element, const char* attrname, const char* defaultvalue)
 {
 	if (!element)
@@ -130,9 +180,10 @@
 	return scale_theme_y(LoadAttrInt(element, attrname, defaultvalue));
 }
 
-COLOR LoadAttrColor(xml_node<>* element, const char* attrname, COLOR defaultvalue)
+COLOR LoadAttrColor(xml_node<>* element, const char* attrname, bool* found_color, COLOR defaultvalue)
 {
 	string value = LoadAttrString(element, attrname);
+	*found_color = !value.empty();
 	// resolve variables
 	DataManager::GetValue(value, value);
 	COLOR ret = defaultvalue;
@@ -142,6 +193,12 @@
 		return defaultvalue;
 }
 
+COLOR LoadAttrColor(xml_node<>* element, const char* attrname, COLOR defaultvalue)
+{
+	bool found_color = false;
+	return LoadAttrColor(element, attrname, &found_color, defaultvalue);
+}
+
 FontResource* LoadAttrFont(xml_node<>* element, const char* attrname)
 {
 	std::string name = LoadAttrString(element, attrname, "");
@@ -621,8 +678,7 @@
 	xml_node<>* parent;
 	xml_node<>* child;
 	xml_node<>* xmltemplate;
-	xml_node<>* blank_templates;
-	int pages_loaded = -1, ret;
+	xml_node<>* xmlstyle;
 
 	parent = mDoc.first_node("recovery");
 	if (!parent)
@@ -701,6 +757,11 @@
 	if (xmltemplate)
 		templates.push_back(xmltemplate);
 
+	// Load styles if present
+	xmlstyle = parent->first_node("styles");
+	if (xmlstyle)
+		styles.push_back(xmlstyle);
+
 	child = parent->first_node("pages");
 	if (child) {
 		if (LoadPages(child)) {
@@ -720,6 +781,7 @@
 	xml_node<>* parent;
 	xml_node<>* child;
 	xml_node<>* xmltemplate;
+	xml_node<>* xmlstyle;
 	long len;
 	char* xmlFile = NULL;
 	string filename;
@@ -817,6 +879,11 @@
 		if (xmltemplate)
 			templates.push_back(xmltemplate);
 
+		// Load styles if present
+		xmlstyle = parent->first_node("styles");
+		if (xmlstyle)
+			styles.push_back(xmlstyle);
+
 		child = parent->first_node("pages");
 		if (child && LoadPages(child))
 		{
@@ -1288,6 +1355,23 @@
 	return mHardwareKeyboard;
 }
 
+xml_node<>* PageManager::FindStyle(std::string name)
+{
+	for (std::vector<xml_node<>*>::iterator itr = mCurrentSet->styles.begin(); itr != mCurrentSet->styles.end(); itr++) {
+		xml_node<>* node = (*itr)->first_node("style");
+
+		while (node) {
+			if (!node->first_attribute("name"))
+				continue;
+
+			if (name == node->first_attribute("name")->value())
+				return node;
+			node = node->next_sibling("style");
+		}
+	}
+	return NULL;
+}
+
 MouseCursor *PageManager::GetMouseCursor()
 {
 	if(!mMouseCursor)
diff --git a/gui/pages.hpp b/gui/pages.hpp
index 31ccadb..8eec9a9 100644
--- a/gui/pages.hpp
+++ b/gui/pages.hpp
@@ -102,6 +102,8 @@
 	int SetKeyBoardFocus(int inFocus);
 	int NotifyVarChange(std::string varName, std::string value);
 
+	std::vector<xml_node<>*> styles;
+
 protected:
 	int LoadPages(xml_node<>* pages);
 	int LoadVariables(xml_node<>* vars);
@@ -153,6 +155,8 @@
 
 	static HardwareKeyboard *GetHardwareKeyboard();
 
+	static xml_node<>* FindStyle(std::string name);
+
 protected:
 	static PageSet* FindPackage(std::string name);
 
diff --git a/gui/partitionlist.cpp b/gui/partitionlist.cpp
index 8facfe7..ba8a94b 100644
--- a/gui/partitionlist.cpp
+++ b/gui/partitionlist.cpp
@@ -39,7 +39,7 @@
 	mUpdate = 0;
 	updateList = false;
 
-	child = node->first_node("icon");
+	child = FindNode(node, "icon");
 	if (child)
 	{
 		mIconSelected = LoadAttrImage(child, "selected");
@@ -47,7 +47,7 @@
 	}
 
 	// Handle the result variable
-	child = node->first_node("data");
+	child = FindNode(node, "data");
 	if (child)
 	{
 		attr = child->first_attribute("name");
@@ -62,7 +62,7 @@
 	int iconHeight = std::max(mIconSelected->GetHeight(), mIconUnselected->GetHeight());
 	SetMaxIconSize(iconWidth, iconHeight);
 
-	child = node->first_node("listtype");
+	child = FindNode(node, "listtype");
 	if (child && (attr = child->first_attribute("name"))) {
 		ListType = attr->value();
 		updateList = true;
diff --git a/gui/progressbar.cpp b/gui/progressbar.cpp
index a49e0ab..a478a40 100644
--- a/gui/progressbar.cpp
+++ b/gui/progressbar.cpp
@@ -42,7 +42,7 @@
 		return;
 	}
 
-	child = node->first_node("resource");
+	child = FindNode(node, "resource");
 	if (child)
 	{
 		mEmptyBar = LoadAttrImage(child, "empty");
@@ -50,10 +50,10 @@
 	}
 
 	// Load the placement
-	LoadPlacement(node->first_node("placement"), &mRenderX, &mRenderY);
+	LoadPlacement(FindNode(node, "placement"), &mRenderX, &mRenderY);
 
 	// Load the data
-	child = node->first_node("data");
+	child = FindNode(node, "data");
 	if (child)
 	{
 		mMinValVar = LoadAttrString(child, "min");
diff --git a/gui/scrolllist.cpp b/gui/scrolllist.cpp
index 8d9ab42..4b772d4 100644
--- a/gui/scrolllist.cpp
+++ b/gui/scrolllist.cpp
@@ -65,18 +65,9 @@
 	mLastHeaderValue = gui_parse_text(mHeaderText);
 	mHeaderIsStatic = (mLastHeaderValue == mHeaderText);
 
-	memset(&mHighlightColor, 0, sizeof(COLOR));
-	child = node->first_node("highlight");
-	if (child) {
-		attr = child->first_attribute("color");
-		if (attr) {
-			hasHighlightColor = true;
-			std::string color = attr->value();
-			ConvertStrToColor(color, &mHighlightColor);
-		}
-	}
+	mHighlightColor = LoadAttrColor(FindNode(node, "highlight"), "color", &hasHighlightColor);
 
-	child = node->first_node("background");
+	child = FindNode(node, "background");
 	if (child)
 	{
 		mBackground = LoadAttrImage(child, "resource");
@@ -84,11 +75,11 @@
 	}
 
 	// Load the placement
-	LoadPlacement(node->first_node("placement"), &mRenderX, &mRenderY, &mRenderW, &mRenderH);
+	LoadPlacement(FindNode(node, "placement"), &mRenderX, &mRenderY, &mRenderW, &mRenderH);
 	SetActionPos(mRenderX, mRenderY, mRenderW, mRenderH);
 
 	// Load the font, and possibly override the color
-	child = node->first_node("font");
+	child = FindNode(node, "font");
 	if (child)
 	{
 		mFont = LoadAttrFont(child, "resource");
@@ -98,7 +89,7 @@
 	}
 
 	// Load the separator if it exists
-	child = node->first_node("separator");
+	child = FindNode(node, "separator");
 	if (child)
 	{
 		mSeparatorColor = LoadAttrColor(child, "color");
@@ -106,7 +97,7 @@
 	}
 
 	// Fast scroll
-	child = node->first_node("fastscroll");
+	child = FindNode(node, "fastscroll");
 	if (child)
 	{
 		mFastScrollLineColor = LoadAttrColor(child, "linecolor");
@@ -123,7 +114,7 @@
 	actualItemHeight = mFontHeight + mItemSpacing + mSeparatorH;
 
 	// Load the header if it exists
-	child = node->first_node("header");
+	child = FindNode(node, "header");
 	if (child)
 	{
 		mHeaderH = mFontHeight;
diff --git a/gui/slider.cpp b/gui/slider.cpp
index c53dabc..2fd114d 100644
--- a/gui/slider.cpp
+++ b/gui/slider.cpp
@@ -33,6 +33,7 @@
 	xml_node<>* child;
 
 	sAction = NULL;
+	sSliderLabel = NULL;
 	sSlider = NULL;
 	sSliderUsed = NULL;
 	sTouch = NULL;
@@ -44,7 +45,8 @@
 		return;
 	}
 
-	child = node->first_node("resource");
+	// Load the resources
+	child = FindNode(node, "resource");
 	if (child)
 	{
 		sSlider = LoadAttrImage(child, "base");
@@ -52,11 +54,27 @@
 		sTouch = LoadAttrImage(child, "touch");
 	}
 
+	// Load the text label
+	sSliderLabel = new GUIText(node);
+	if (sSliderLabel->Render() < 0)
+	{
+		delete sSliderLabel;
+		sSliderLabel = NULL;
+	}
+
 	// Load the placement
-	LoadPlacement(node->first_node("placement"), &mRenderX, &mRenderY);
+	Placement TextPlacement = CENTER;
+	LoadPlacement(FindNode(node, "placement"), &mRenderX, &mRenderY, &mRenderW, &mRenderH, &TextPlacement);
 
 	mRenderW = sSlider->GetWidth();
 	mRenderH = sSlider->GetHeight();
+	if (sSliderLabel) {
+		int sTextX = mRenderX + (mRenderW / 2);
+		int w, h;
+		sSliderLabel->GetCurrentBounds(w, h);
+		int sTextY = mRenderY + ((mRenderH - h) / 2);
+		sSliderLabel->SetRenderPos(sTextX, sTextY);
+	}
 	if (sTouch && sTouch->GetResource())
 	{
 		sTouchW = sTouch->GetWidth();  // Width of the "touch image" that follows the touch (arrow)
@@ -78,6 +96,7 @@
 GUISlider::~GUISlider()
 {
 	delete sAction;
+	delete sSliderLabel;
 }
 
 int GUISlider::Render(void)
@@ -99,6 +118,11 @@
 	if (sTouch && sTouch->GetResource())
 		gr_blit(sTouch->GetResource(), 0, 0, sTouchW, sTouchH, sCurTouchX, (mRenderY + ((mRenderH - sTouchH) / 2)));
 
+	if (sSliderLabel) {
+		int ret = sSliderLabel->Render();
+		if (ret < 0)		return ret;
+	}
+
 	sUpdate = 0;
 	return 0;
 }
diff --git a/gui/slidervalue.cpp b/gui/slidervalue.cpp
index 5be58dc..3974c37 100644
--- a/gui/slidervalue.cpp
+++ b/gui/slidervalue.cpp
@@ -70,7 +70,7 @@
 
 	mAction = new GUIAction(node);
 
-	child = node->first_node("font");
+	child = FindNode(node, "font");
 	if (child)
 	{
 		mFont = LoadAttrFont(child, "resource");
@@ -78,21 +78,16 @@
 	}
 
 	// Load the placement
-	LoadPlacement(node->first_node("placement"), &mRenderX, &mRenderY, &mRenderW);
+	LoadPlacement(FindNode(node, "placement"), &mRenderX, &mRenderY, &mRenderW);
 
-	child = node->first_node("colors");
+	child = FindNode(node, "colors");
 	if (child)
 	{
-		attr = child->first_attribute("line");
-		if (attr)
-			ConvertStrToColor(attr->value(), &mLineColor);
-
-		attr = child->first_attribute("slider");
-		if (attr)
-			ConvertStrToColor(attr->value(), &mSliderColor);
+		mLineColor = LoadAttrColor(child, "line");
+		mSliderColor = LoadAttrColor(child, "slider");
 	}
 
-	child = node->first_node("resource");
+	child = FindNode(node, "resource");
 	if (child)
 	{
 		mBackgroundImage = LoadAttrImage(child, "background");
@@ -100,7 +95,7 @@
 		mHandleHoverImage = LoadAttrImage(child, "handlehover");
 	}
 
-	child = node->first_node("data");
+	child = FindNode(node, "data");
 	if (child)
 	{
 		attr = child->first_attribute("variable");
@@ -150,37 +145,13 @@
 			mChangeOnDrag = atoi(attr->value());
 	}
 
-	child = node->first_node("dimensions");
+	child = FindNode(node, "dimensions");
 	if (child)
 	{
-		attr = child->first_attribute("lineh");
-		if (attr)
-		{
-			string parsevalue = gui_parse_text(attr->value());
-			mLineH = scale_theme_y(atoi(parsevalue.c_str()));
-		}
-
-		attr = child->first_attribute("linepadding");
-		if (attr)
-		{
-			string parsevalue = gui_parse_text(attr->value());
-			mPadding = scale_theme_x(atoi(parsevalue.c_str()));
-			mLinePadding = mPadding;
-		}
-
-		attr = child->first_attribute("sliderw");
-		if (attr)
-		{
-			string parsevalue = gui_parse_text(attr->value());
-			mSliderW = scale_theme_x(atoi(parsevalue.c_str()));
-		}
-
-		attr = child->first_attribute("sliderh");
-		if (attr)
-		{
-			string parsevalue = gui_parse_text(attr->value());
-			mSliderH = scale_theme_y(atoi(parsevalue.c_str()));
-		}
+		mLineH = LoadAttrIntScaleY(child, "lineh", mLineH);
+		mLinePadding = LoadAttrIntScaleX(child, "linepadding", mLinePadding);
+		mSliderW = LoadAttrIntScaleX(child, "sliderw", mSliderW);
+		mSliderH = LoadAttrIntScaleY(child, "sliderh", mSliderH);
 	}
 
 	mFontHeight = mFont->GetHeight();
diff --git a/gui/text.cpp b/gui/text.cpp
index cc18b17..3487f7a 100644
--- a/gui/text.cpp
+++ b/gui/text.cpp
@@ -44,18 +44,14 @@
 	mHighlightColor = LoadAttrColor(node, "highlightcolor", mColor);
 
 	// Load the font, and possibly override the color
-	xml_node<>* child = node->first_node("font");
-	if (child)
-	{
-		mFont = LoadAttrFont(child, "resource");
-		mColor = LoadAttrColor(child, "color", mColor);
-		mHighlightColor = LoadAttrColor(child, "highlightcolor", mColor);
-	}
+	mFont = LoadAttrFont(FindNode(node, "font"), "resource");
+	mColor = LoadAttrColor(FindNode(node, "font"), "color", mColor);
+	mHighlightColor = LoadAttrColor(FindNode(node, "font"), "highlightcolor", mColor);
 
 	// Load the placement
-	LoadPlacement(node->first_node("placement"), &mRenderX, &mRenderY, &mRenderW, &mRenderH, &mPlacement);
+	LoadPlacement(FindNode(node, "placement"), &mRenderX, &mRenderY, &mRenderW, &mRenderH, &mPlacement);
 
-	child = node->first_node("text");
+	xml_node<>* child = FindNode(node, "text");
 	if (child)  mText = child->value();
 
 	// Simple way to check for static state