diff --git a/MyTracks/res/layout/about.xml b/MyTracks/res/layout/about.xml
index 38ca8638f..d50ec9442 100644
--- a/MyTracks/res/layout/about.xml
+++ b/MyTracks/res/layout/about.xml
@@ -48,7 +48,7 @@ limitations under the License.
     <TableRow style="@style/AboutTableRow">
       <TextView
         android:text="@string/about_team"
-        style="@style/AboutTextView.Column1"/>
+        style="@style/AboutTextView.Column0"/>
       <LinearLayout
         android:layout_column="1"
         android:layout_height="wrap_content"
@@ -77,7 +77,7 @@ limitations under the License.
     <TableRow style="@style/AboutTableRow">
       <TextView
         android:text="@string/about_version"
-        style="@style/AboutTextView.Column1"/>
+        style="@style/AboutTextView.Column0"/>
       <TextView
         android:id="@+id/about_version"
         style="@style/AboutTextView"/>
@@ -85,7 +85,7 @@ limitations under the License.
     <TableRow style="@style/AboutTableRow">
       <TextView
         android:text="@string/about_support"
-        style="@style/AboutTextView.Column1"/>
+        style="@style/AboutTextView.Column0"/>
       <TextView
         android:text="@string/my_tracks_web_url"
         style="@style/AboutTextView.Url"/>
@@ -93,7 +93,7 @@ limitations under the License.
     <TableRow style="@style/AboutTableRow">
       <TextView
         android:text="@string/about_privacy"
-        style="@style/AboutTextView.Column1"/>
+        style="@style/AboutTextView.Column0"/>
       <TextView
         android:text="@string/my_tracks_privacy_url"
         style="@style/AboutTextView.Url"/>
diff --git a/MyTracks/res/layout/track_widget.xml b/MyTracks/res/layout/track_widget.xml
index 8a0e17e75..f76763000 100644
--- a/MyTracks/res/layout/track_widget.xml
+++ b/MyTracks/res/layout/track_widget.xml
@@ -48,10 +48,10 @@ limitations under the License.
         android:layout_width="fill_parent"
         android:orientation="horizontal">
         <TextView
-          style="@style/WidgetText.Register"
+          style="@style/WidgetTextView.Value"
           android:id="@+id/appwidget_distance_text" />
         <TextView
-          style="@style/WidgetText"
+          style="@style/WidgetTextView"
           android:text="@string/stat_total_distance" />
       </LinearLayout>
       <ImageView
@@ -64,10 +64,10 @@ limitations under the License.
         android:orientation="horizontal"
         android:paddingBottom="2px">
         <TextView
-          style="@style/WidgetText.Register"
+          style="@style/WidgetTextView.Value"
           android:id="@+id/appwidget_time_text" />
         <TextView
-          style="@style/WidgetText"
+          style="@style/WidgetTextView"
           android:text="@string/stat_moving_time" />
       </LinearLayout>
       <ImageView
@@ -79,10 +79,10 @@ limitations under the License.
         android:layout_width="fill_parent"
         android:orientation="horizontal">
         <TextView
-          style="@style/WidgetText.Register"
+          style="@style/WidgetTextView.Value"
           android:id="@+id/appwidget_speed_text" />
         <TextView
-          style="@style/WidgetText"
+          style="@style/WidgetTextView"
           android:text="@string/stat_speed" />
       </LinearLayout>
     </LinearLayout>
diff --git a/MyTracks/res/layout/welcome.xml b/MyTracks/res/layout/welcome.xml
index 815e9bcc9..ac0c05a95 100644
--- a/MyTracks/res/layout/welcome.xml
+++ b/MyTracks/res/layout/welcome.xml
@@ -35,106 +35,106 @@ limitations under the License.
         android:src="@drawable/arrow_icon"/>
       <TextView
         android:text="@string/welcome_my_tracks_question"
-        style="@style/WelcomeText.Question"/>
+        style="@style/WelcomeTextView.Question"/>
       <TextView
         android:text="@string/welcome_my_tracks_answer"
-        style="@style/WelcomeText"/>
+        style="@style/WelcomeTextView"/>
       <TextView
         android:text="@string/welcome_app_navigation_question"
-        style="@style/WelcomeText.Question"/>
+        style="@style/WelcomeTextView.Question"/>
       <TextView
         android:text="@string/welcome_app_navigation_answer"
-        style="@style/WelcomeText"/>
+        style="@style/WelcomeTextView"/>
       <TextView
         android:text="@string/welcome_add_graph_question"
-        style="@style/WelcomeText.Question"/>
+        style="@style/WelcomeTextView.Question"/>
       <TextView
         android:text="@string/welcome_add_graph_answer"
-        style="@style/WelcomeText"/>
+        style="@style/WelcomeTextView"/>
       <TextView
         android:text="@string/welcome_gps_fix_question"
-        style="@style/WelcomeText.Question"/>
+        style="@style/WelcomeTextView.Question"/>
       <TextView
         android:text="@string/welcome_gps_fix_answer"
-        style="@style/WelcomeText"/>
+        style="@style/WelcomeTextView"/>
       <TextView
         android:text="@string/welcome_send_google_question"
-        style="@style/WelcomeText.Question"/>
+        style="@style/WelcomeTextView.Question"/>
       <TextView
         android:text="@string/welcome_send_google_answer"
-        style="@style/WelcomeText"/>
+        style="@style/WelcomeTextView"/>
       <TextView
         android:text="@string/welcome_share_friends_question"
-        style="@style/WelcomeText.Question"/>
+        style="@style/WelcomeTextView.Question"/>
       <TextView
         android:text="@string/welcome_share_friends_answer"
-        style="@style/WelcomeText"/>
+        style="@style/WelcomeTextView"/>
       <TextView
         android:text="@string/welcome_waypoint_marker_question"
-        style="@style/WelcomeText.Question"/>
+        style="@style/WelcomeTextView.Question"/>
       <TextView
         android:text="@string/welcome_waypoint_marker_answer"
-        style="@style/WelcomeText"/>
+        style="@style/WelcomeTextView"/>
       <TextView
         android:text="@string/welcome_statistics_marker_question"
-        style="@style/WelcomeText.Question"/>
+        style="@style/WelcomeTextView.Question"/>
       <TextView
         android:text="@string/welcome_statistics_marker_answer"
-        style="@style/WelcomeText"/>      
+        style="@style/WelcomeTextView"/>      
       <TextView
         android:text="@string/welcome_data_connection_question"
-        style="@style/WelcomeText.Question"/>
+        style="@style/WelcomeTextView.Question"/>
       <TextView
         android:text="@string/welcome_data_connection_answer"
-        style="@style/WelcomeText"/>  
+        style="@style/WelcomeTextView"/>  
       <TextView
         android:text="@string/welcome_battery_life_question"
-        style="@style/WelcomeText.Question"/>
+        style="@style/WelcomeTextView.Question"/>
       <TextView
         android:text="@string/welcome_battery_life_answer"
-        style="@style/WelcomeText"/> 
+        style="@style/WelcomeTextView"/> 
       <TextView
         android:text="@string/welcome_share_file_question"
-        style="@style/WelcomeText.Question"/>
+        style="@style/WelcomeTextView.Question"/>
       <TextView
         android:text="@string/welcome_share_file_answer"
-        style="@style/WelcomeText"/> 
+        style="@style/WelcomeTextView"/> 
       <TextView
         android:text="@string/welcome_location_precision_question"
-        style="@style/WelcomeText.Question"/>
+        style="@style/WelcomeTextView.Question"/>
       <TextView
         android:text="@string/welcome_location_precision_answer"
-        style="@style/WelcomeText"/> 
+        style="@style/WelcomeTextView"/> 
       <TextView
         android:text="@string/welcome_elevation_precision_question"
-        style="@style/WelcomeText.Question"/>
+        style="@style/WelcomeTextView.Question"/>
       <TextView
         android:text="@string/welcome_elevation_precision_answer"
-        style="@style/WelcomeText"/>                               
+        style="@style/WelcomeTextView"/>                               
       <TextView
         android:text="@string/welcome_edit_accuracy_question"
-        style="@style/WelcomeText.Question"/>
+        style="@style/WelcomeTextView.Question"/>
       <TextView
         android:text="@string/welcome_edit_accuracy_answer"
-        style="@style/WelcomeText"/>     
+        style="@style/WelcomeTextView"/>     
       <TextView
         android:text="@string/welcome_split_track_question"
-        style="@style/WelcomeText.Question"/>
+        style="@style/WelcomeTextView.Question"/>
       <TextView
         android:text="@string/welcome_split_track_answer"
-        style="@style/WelcomeText"/>           
+        style="@style/WelcomeTextView"/>           
       <TextView
         android:text="@string/welcome_delete_all_question"
-        style="@style/WelcomeText.Question"/>
+        style="@style/WelcomeTextView.Question"/>
       <TextView
         android:text="@string/welcome_delete_all_answer"
-        style="@style/WelcomeText"/>     
+        style="@style/WelcomeTextView"/>     
       <TextView
         android:text="@string/welcome_my_maps_sharing_question"
-        style="@style/WelcomeText.Question"/>
+        style="@style/WelcomeTextView.Question"/>
       <TextView
         android:text="@string/welcome_my_maps_sharing_answer"
-        style="@style/WelcomeText"/>    
+        style="@style/WelcomeTextView"/>    
     </LinearLayout>
   </ScrollView>
   <LinearLayout style="@style/ButtonLayout">
diff --git a/MyTracks/res/values/styles.xml b/MyTracks/res/values/styles.xml
index 5094df6b1..94440dc6d 100644
--- a/MyTracks/res/values/styles.xml
+++ b/MyTracks/res/values/styles.xml
@@ -28,8 +28,8 @@ limitations under the License.
     <item name="android:textSize">20sp</item>  
   </style>
 
-  <!--  About dialog TextView Column1 -->
-  <style name="AboutTextView.Column1">
+  <!--  About dialog TextView column 0 -->
+  <style name="AboutTextView.Column0">
     <item name="android:gravity">right</item>
     <item name="android:layout_column">0</item>
     <item name="android:paddingLeft">10dp</item>
@@ -42,24 +42,42 @@ limitations under the License.
     <item name="android:textSize">18sp</item>  
   </style>
   
-  <!-- The style for the unit on the statistics activity. -->
-  <style name="StatsUnit" parent="@android:Widget.TextView">
-    <item name="android:gravity">bottom</item>
+  <!-- Button -->
+  <style name="Button">
+    <item name="android:layout_height">48dip</item>
+    <item name="android:layout_weight">1</item>
+    <item name="android:layout_width">0dip</item>
+    <item name="android:maxLines">2</item>
+    <item name="android:textSize">14dip</item>
+  </style>
+  
+  <!-- Button layout -->
+  <style name="ButtonLayout">
+    <item name="android:background">@drawable/list_bar</item>
     <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_marginBottom">-2dip</item>
-    <item name="android:layout_marginTop">-2dip</item>
-    <item name="android:layout_width">wrap_content</item>
-    <item name="android:textColor">@color/stat_label_text</item>
+    <item name="android:layout_width">fill_parent</item>
+    <item name="android:orientation">horizontal</item>
+    <item name="android:paddingLeft">2dip</item>
+    <item name="android:paddingRight">2dip</item>
+    <item name="android:paddingTop">4dip</item>
   </style>
-
-  <!-- The style for the unit on the statistics activity where there is only one string. -->
-  <style name="StatsUnitSolo" parent="@android:Widget.TextView">
-    <item name="android:gravity">right</item>
-    <item name="android:layout_marginBottom">-9dip</item>
-    <item name="android:layout_marginTop">-9dip</item>
-    <item name="android:textColor">@color/stat_label_text</item>
+  
+  <!-- Button spacer -->
+  <style name="ButtonSpacer">
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:layout_weight">0.25</item>
+    <item name="android:layout_width">0dip</item>
+    <item name="android:orientation">horizontal</item>
+    <item name="android:visibility">gone</item>
   </style>
-
+  
+  <!-- The style for a view which divides the numerator and denominator of the units on the statistics activity. -->
+  <style name="StatsDivider" parent="@android:Widget.TextView">
+    <item name="android:background">@color/black</item>
+    <item name="android:layout_height">3dip</item>
+    <item name="android:layout_width">fill_parent</item>
+  </style>
+  
   <!-- The style for a text view for displaying a value on the statistics activity. -->
   <style name="StatsRegister" parent="@android:Widget.TextView">
     <item name="android:gravity">right</item>
@@ -94,55 +112,27 @@ limitations under the License.
     <item name="android:layout_width">5dip</item>
     <item name="android:textSize">40sp</item>
   </style>
-
-  <!-- The style for a view which divides the numerator and denominator of the units on the statistics activity. -->
-  <style name="StatsDivider" parent="@android:Widget.TextView">
-    <item name="android:background">@color/black</item>
-    <item name="android:layout_height">3dip</item>
-    <item name="android:layout_width">fill_parent</item>
-  </style>
   
-  <!-- The style for the track widget. -->
-  <style name="WidgetText" parent="@android:Widget.TextView">
+  <!-- The style for the unit on the statistics activity. -->
+  <style name="StatsUnit" parent="@android:Widget.TextView">
+    <item name="android:gravity">bottom</item>
     <item name="android:layout_height">wrap_content</item>
+    <item name="android:layout_marginBottom">-2dip</item>
+    <item name="android:layout_marginTop">-2dip</item>
     <item name="android:layout_width">wrap_content</item>
-    <item name="android:textColor">@color/appwidget_text</item>
-    <item name="android:textSize">14sp</item>
-  </style>
-  <style name="WidgetText.Register">
-    <item name="android:width">160px</item>
+    <item name="android:textColor">@color/stat_label_text</item>
   </style>
+
+  <!-- The style for the unit on the statistics activity where there is only one string. -->
+  <style name="StatsUnitSolo" parent="@android:Widget.TextView">
+    <item name="android:gravity">right</item>
+    <item name="android:layout_marginBottom">-9dip</item>
+    <item name="android:layout_marginTop">-9dip</item>
+    <item name="android:textColor">@color/stat_label_text</item>
+  </style>  
   
-  <!-- The style for the layout of the bottom buttons. -->
-  <style name="ButtonLayout">
-    <item name="android:background">@drawable/list_bar</item>
-    <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_width">fill_parent</item>
-    <item name="android:orientation">horizontal</item>
-    <item name="android:paddingLeft">2dip</item>
-    <item name="android:paddingRight">2dip</item>
-    <item name="android:paddingTop">4dip</item>
-  </style>
-    
-  <!-- The style for the bottom button. -->
-  <style name="Button">
-    <item name="android:layout_height">48dip</item>
-    <item name="android:layout_weight">1</item>
-    <item name="android:layout_width">0dip</item>
-    <item name="android:maxLines">2</item>
-    <item name="android:textSize">14dip</item>
-  </style>
-  
-  <!--  The style for the spacer on the left and right of the bottom buttons. -->
-  <style name="ButtonSpacer">
-    <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_weight">0.25</item>
-    <item name="android:layout_width">0dip</item>
-    <item name="android:orientation">horizontal</item>
-    <item name="android:visibility">gone</item>
-  </style>
-  
-  <style name="WelcomeText">
+  <!-- Welcome page TextView -->
+  <style name="WelcomeTextView">
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_width">fill_parent</item>
     <item name="android:paddingLeft">10sp</item>
@@ -151,8 +141,22 @@ limitations under the License.
     <item name="android:textSize">16sp</item>
   </style>  
   
-  <style name="WelcomeText.Question">
+  <!-- Welcome page TextView question -->
+  <style name="WelcomeTextView.Question">
     <item name="android:paddingTop">10sp</item>
     <item name="android:textStyle">bold</item>
   </style>    
+
+  <!-- Widget TextView -->
+  <style name="WidgetTextView">
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:layout_width">wrap_content</item>
+    <item name="android:textColor">@color/appwidget_text</item>
+    <item name="android:textSize">14sp</item>
+  </style>
+  
+  <!-- Widget TextView value  -->
+  <style name="WidgetTextView.Value">
+    <item name="android:width">160px</item>
+  </style>
 </resources>
\ No newline at end of file