XML Cleanup: Button and Edittext parents

Removed duplicated instances of button and edittext styles
but making one the parent for the other.

12 files changed, 101 insertions, 126 deletions

diff --git a/main/res/layout-land/coords.xml b/main/res/layout-land/coords.xml
index c25a2c0..c2dc9c5 100644
--- a/main/res/layout-land/coords.xml
+++ b/main/res/layout-land/coords.xml
@@ -31,8 +31,8 @@
 		            android:layout_weight="1">
 		        <TableRow android:id="@+id/tableRow1">
 		            <Button android:id="@+id/ButtonLat"
-		                    style="@style/button"/>
-		            <EditText style="@style/edittext"
+		                    style="@style/button_full"/>
+		            <EditText style="@style/edittext_full"
 		                    android:id="@+id/EditTextLatDeg"
 		                    android:gravity="right"
 		                    android:inputType="number"
@@ -40,63 +40,63 @@
 		            <TextView android:id="@+id/LatSeparator1"
 		                    android:text="°" />
 		            <EditText android:id="@+id/EditTextLatMin"
-		                    style="@style/edittext"
+		                    style="@style/edittext_full"
 		                    android:gravity="right"
 		                    android:inputType="number"
 		                    android:selectAllOnFocus="true" />
 		            <TextView android:id="@+id/LatSeparator2"
 		                    android:text="," />
 		            <EditText android:id="@+id/EditTextLatSec"
-		                    style="@style/edittext"
+		                    style="@style/edittext_full"
 		                    android:gravity="right"
 		                    android:inputType="number"
 		                    android:selectAllOnFocus="true" />
 		            <TextView android:id="@+id/LatSeparator3"
 		                    android:text="," />
 		            <EditText android:id="@+id/EditTextLatSecFrac"
-		                    style="@style/edittext"
+		                    style="@style/edittext_full"
 		                    android:inputType="number"
 		                    android:selectAllOnFocus="true" />
 		        </TableRow>
 		        <TableRow android:id="@+id/tableRow2">
 		            <Button android:id="@+id/ButtonLon"
-		                    style="@style/button"/>
+		                    style="@style/button_full"/>
 		            <EditText android:id="@+id/EditTextLonDeg"
-		                    style="@style/edittext"
+		                    style="@style/edittext_full"
 		                    android:gravity="right"
 		                    android:inputType="number"
 		                    android:selectAllOnFocus="true" />
 		            <TextView android:id="@+id/LonSeparator1"
 		                    android:text="°" />
 		            <EditText android:id="@+id/EditTextLonMin"
-		                    style="@style/edittext"
+		                    style="@style/edittext_full"
 		                    android:gravity="right"
 		                    android:inputType="number"
 		                    android:selectAllOnFocus="true" />
 		            <TextView android:id="@+id/LonSeparator2"
 		                    android:text="," />
 		            <EditText android:id="@+id/EditTextLonSec"
-		                    style="@style/edittext"
+		                    style="@style/edittext_full"
 		                    android:gravity="right"
 		                    android:inputType="number"
 		                    android:selectAllOnFocus="true" />
 		            <TextView android:id="@+id/LonSeparator3"
 		                    android:text="," />
 		            <EditText android:id="@+id/EditTextLonSecFrac"
-		                    style="@style/edittext"
+		                    style="@style/edittext_full"
 		                    android:inputType="number"
 		                    android:selectAllOnFocus="true" />
 		        </TableRow>
 		    </TableLayout>
 	        <EditText
 	            android:id="@+id/latitude"
-	            style="@style/edittext"
+	            style="@style/edittext_full"
 	            android:layout_width="fill_parent"
 	            android:layout_height="wrap_content"
 	            android:hint="@string/latitude" />
 	        <EditText
 	            android:id="@+id/longitude"
-	            style="@style/edittext"
+	            style="@style/edittext_full"
 	            android:layout_width="fill_parent"
 	            android:layout_height="wrap_content"
 	            android:hint="@string/longitude" />
@@ -104,20 +104,20 @@
 		        android:id="@+id/linearLayout2"
 		        android:layout_width="fill_parent"
 		        android:layout_height="wrap_content" >
-			    <Button style="@style/button"
+			    <Button style="@style/button_full"
 			            android:layout_width="fill_parent"
 			            android:layout_height="wrap_content"
 			            android:id="@+id/current"
 			            android:layout_weight="1"
 			            android:text="@string/waypoint_my_coordinates" />
-			    <Button style="@style/button"
+			    <Button style="@style/button_full"
 			            android:layout_width="fill_parent"
 			            android:layout_height="wrap_content"
 			            android:id="@+id/cache"
 			            android:layout_weight="1"
 			            android:text="@string/waypoint_cache_coordinates" />
 		    </LinearLayout>
-		    <Button style="@style/button"
+		    <Button style="@style/button_full"
 		            android:layout_width="fill_parent"
 		            android:layout_height="wrap_content"
 		            android:id="@+id/done"
diff --git a/main/res/layout/about.xml b/main/res/layout/about.xml
index 0065bdd..53ed03d 100644
--- a/main/res/layout/about.xml
+++ b/main/res/layout/about.xml
@@ -65,7 +65,7 @@
 					android:layout_marginTop="10dip"
 					android:orientation="horizontal"
 					android:gravity="center_horizontal" >
-				<Button style="@style/button"
+				<Button style="@style/button_full"
 						android:id="@+id/donation_more"
 						android:layout_width="280dip"
 						android:singleLine="false"
diff --git a/main/res/layout/auth.xml b/main/res/layout/auth.xml
index 51c7d03..d94b08a 100644
--- a/main/res/layout/auth.xml
+++ b/main/res/layout/auth.xml
@@ -64,15 +64,15 @@
 					android:layout_height="wrap_content"
 					android:orientation="vertical"
 					android:padding="7dip" >
-				<Button style="@style/button"
+				<Button style="@style/button_full"
 						android:id="@+id/start"
 						android:text="@string/auth_authorize" />
-				<EditText style="@style/edittext"
+				<EditText style="@style/edittext_full"
 						android:id="@+id/pin"
 						android:visibility="gone"
 						android:inputType="number"
 						android:hint="@string/auth_pin_hint" />
-				<Button style="@style/button"
+				<Button style="@style/button_full"
 						android:id="@+id/pin_button"
 						android:visibility="gone"
 						android:text="@string/auth_finish" />
diff --git a/main/res/layout/cacheview_waypoints.xml b/main/res/layout/cacheview_waypoints.xml
index 9ce5b57..faf90f5 100644
--- a/main/res/layout/cacheview_waypoints.xml
+++ b/main/res/layout/cacheview_waypoints.xml
@@ -18,7 +18,7 @@
 

         <Button

             android:id="@+id/add_waypoint"

-            style="@style/button"

+            style="@style/button_full"

             android:text="@string/cache_waypoints_add"

             android:layout_marginTop="9dp" />

     </LinearLayout>

diff --git a/main/res/layout/coords.xml b/main/res/layout/coords.xml
index d673d00..3adcb2a 100644
--- a/main/res/layout/coords.xml
+++ b/main/res/layout/coords.xml
@@ -31,8 +31,8 @@
 		            android:layout_weight="1">
 		        <TableRow android:id="@+id/tableRow1">
 		            <Button android:id="@+id/ButtonLat"
-		                    style="@style/button"/>
-		            <EditText style="@style/edittext"
+		                    style="@style/button_full"/>
+		            <EditText style="@style/edittext_full"
 		                    android:id="@+id/EditTextLatDeg"
 		                    android:gravity="right"
 		                    android:inputType="number"
@@ -40,75 +40,75 @@
 		            <TextView android:id="@+id/LatSeparator1"
 		                    android:text="°" />
 		            <EditText android:id="@+id/EditTextLatMin"
-		                    style="@style/edittext"
+		                    style="@style/edittext_full"
 		                    android:gravity="right"
 		                    android:inputType="number"
 		                    android:selectAllOnFocus="true" />
 		            <TextView android:id="@+id/LatSeparator2"
 		                    android:text="," />
 		            <EditText android:id="@+id/EditTextLatSec"
-		                    style="@style/edittext"
+		                    style="@style/edittext_full"
 		                    android:gravity="right"
 		                    android:inputType="number"
 		                    android:selectAllOnFocus="true" />
 		            <TextView android:id="@+id/LatSeparator3"
 		                    android:text="," />
 		            <EditText android:id="@+id/EditTextLatSecFrac"
-		                    style="@style/edittext"
+		                    style="@style/edittext_full"
 		                    android:inputType="number"
 		                    android:selectAllOnFocus="true" />
 		        </TableRow>
 		        <TableRow android:id="@+id/tableRow2">
 		            <Button android:id="@+id/ButtonLon"
-		                    style="@style/button"/>
+		                    style="@style/button_full"/>
 		            <EditText android:id="@+id/EditTextLonDeg"
-		                    style="@style/edittext"
+		                    style="@style/edittext_full"
 		                    android:gravity="right"
 		                    android:inputType="number"
 		                    android:selectAllOnFocus="true" />
 		            <TextView android:id="@+id/LonSeparator1"
 		                    android:text="°" />
 		            <EditText android:id="@+id/EditTextLonMin"
-		                    style="@style/edittext"
+		                    style="@style/edittext_full"
 		                    android:gravity="right"
 		                    android:inputType="number"
 		                    android:selectAllOnFocus="true" />
 		            <TextView android:id="@+id/LonSeparator2"
 		                    android:text="," />
 		            <EditText android:id="@+id/EditTextLonSec"
-		                    style="@style/edittext"
+		                    style="@style/edittext_full"
 		                    android:gravity="right"
 		                    android:inputType="number"
 		                    android:selectAllOnFocus="true" />
 		            <TextView android:id="@+id/LonSeparator3"
 		                    android:text="," />
 		            <EditText android:id="@+id/EditTextLonSecFrac"
-		                    style="@style/edittext"
+		                    style="@style/edittext_full"
 		                    android:inputType="number"
 		                    android:selectAllOnFocus="true" />
 		        </TableRow>
 		    </TableLayout>
-        	<EditText style="@style/edittext"
+        	<EditText style="@style/edittext_full"
 		            android:layout_width="fill_parent"
 		            android:layout_height="wrap_content"
 		            android:id="@+id/latitude"
 		            android:hint="@string/latitude" />
-		    <EditText style="@style/edittext"
+		    <EditText style="@style/edittext_full"
 		            android:layout_width="fill_parent"
 		            android:layout_height="wrap_content"
 		            android:id="@+id/longitude"
 		            android:hint="@string/longitude" />
-		    <Button style="@style/button"
+		    <Button style="@style/button_full"
 		            android:layout_width="fill_parent"
 		            android:layout_height="wrap_content"
 		            android:id="@+id/current"
 		            android:text="@string/waypoint_my_coordinates" />
-		    <Button style="@style/button"
+		    <Button style="@style/button_full"
 		            android:layout_width="fill_parent"
 		            android:layout_height="wrap_content"
 		            android:id="@+id/cache"
 		            android:text="@string/waypoint_cache_coordinates" />
-		    <Button style="@style/button"
+		    <Button style="@style/button_full"
 		            android:layout_width="fill_parent"
 		            android:layout_height="wrap_content"
 		            android:id="@+id/done"
diff --git a/main/res/layout/init.xml b/main/res/layout/init.xml
index bbcc33f..f5dbd2d 100644
--- a/main/res/layout/init.xml
+++ b/main/res/layout/init.xml
@@ -43,14 +43,14 @@
 					android:textColorLink="?text_color_link"
 					android:linksClickable="true"
 					android:text="@string/legal_note" />
-			<EditText style="@style/edittext"
+			<EditText style="@style/edittext_full"
 					android:id="@+id/username"
 					android:hint="@string/init_username" />
-			<EditText style="@style/edittext"
+			<EditText style="@style/edittext_full"
 					android:id="@+id/password"
 					android:hint="@string/init_password"
 					android:password="true" />
-			<Button style="@style/button"
+			<Button style="@style/button_full"
 					android:id="@+id/log_me_in"
                     android:lines="2"
                     android:singleLine="false"
@@ -62,7 +62,7 @@
 				<TextView style="@style/separator_horizontal_headline"
 						android:text="@string/init_gcvote" />
 			</RelativeLayout>
-			<EditText style="@style/edittext"
+			<EditText style="@style/edittext_full"
 					android:id="@+id/passvote"
 					android:hint="@string/init_passvote"
 					android:password="true" />
@@ -126,7 +126,7 @@
 					android:textColorLink="?text_color_link"
 					android:linksClickable="true"
 					android:text="@string/about_twitter" />
-			<Button style="@style/button"
+			<Button style="@style/button_full"
 					android:id="@+id/authorize_twitter"
 					android:text="@string/init_twitter_authorize" />
 			<LinearLayout
@@ -157,7 +157,7 @@
 				<TextView style="@style/separator_horizontal_headline"
 						android:text="@string/init_signature" />
 			</RelativeLayout>
-			<EditText style="@style/edittext"
+			<EditText style="@style/edittext_full"
 					android:id="@+id/signature"
 					android:hint="@string/init_signature"
 					android:singleLine="false"
@@ -167,13 +167,13 @@
 			<LinearLayout android:layout_width="fill_parent"
 					android:layout_height="wrap_content"
 					android:orientation="horizontal" >
-				<Button style="@style/button"
+				<Button style="@style/button_full"
 						android:id="@+id/signature_template"
 						android:layout_width="wrap_content"
 						android:layout_weight="2"
 						android:textSize="14dip"
 						android:text="@string/init_signature_template_button" />
-				<Button style="@style/button"
+				<Button style="@style/button_full"
 						android:id="@+id/signature_help"
 						android:layout_width="wrap_content"
 						android:layout_weight="1"
@@ -651,7 +651,7 @@
 				<TextView style="@style/separator_horizontal_headline"
 						android:text="@string/init_showwaypoints" />
 			</RelativeLayout>
-			<EditText style="@style/edittext"
+			<EditText style="@style/edittext_full"
 					android:id="@+id/showwaypointsthreshold"
 					android:singleLine="true"
 					android:lines="1"
@@ -698,11 +698,11 @@
 					android:layout_width="fill_parent"
 					android:layout_height="wrap_content"
 					android:orientation="horizontal" >
-				<Button style="@style/button"
+				<Button style="@style/button_full"
 						android:id="@+id/select_mapfile"
 						android:text="@string/init_select_mapfile"
 						android:layout_width="wrap_content" />
-				<EditText style="@style/edittext"
+				<EditText style="@style/edittext_full"
 						android:id="@+id/mapfile"
 						android:singleLine="true"
 						android:lines="1"
@@ -715,7 +715,7 @@
 				<TextView style="@style/separator_horizontal_headline"
 						android:text="@string/init_altitude" />
 			</RelativeLayout>
-			<EditText style="@style/edittext"
+			<EditText style="@style/edittext_full"
 					android:id="@+id/altitude"
 					android:singleLine="true"
 					android:lines="1"
@@ -795,7 +795,7 @@
 					android:textColorLink="?text_color_link"
 					android:linksClickable="true"
 					android:text="@string/init_sendToCgeo_name" />
-            <EditText style="@style/edittext"
+            <EditText style="@style/edittext_full"
 					android:id="@+id/webDeviceName"
 					android:singleLine="true"
 					android:lines="1"
@@ -815,7 +815,7 @@
 					android:textColorLink="?text_color_link"
 					android:linksClickable="true"
 					android:text="@string/init_sendToCgeo_description" />
-			<Button style="@style/button"
+			<Button style="@style/button_full"
 					android:id="@+id/sendToCgeo_register"
 					android:text="@string/init_sendToCgeo_register" />
 <!-- ** -->
@@ -843,13 +843,13 @@
 					android:layout_margin="3dip"
 					android:orientation="horizontal"
 					android:padding="3dip" >
-				<Button style="@style/button"
+				<Button style="@style/button_full"
 						android:id="@+id/backup_backup"
 						android:layout_width="0dip"
 						android:layout_weight="1"
 						android:text="@string/init_backup_backup"
 						android:onClick="backup" />
-				<Button style="@style/button"
+				<Button style="@style/button_full"
 						android:id="@+id/backup_restore"
 						android:layout_width="0dip"
 						android:layout_weight="1"
diff --git a/main/res/layout/point_controls.xml b/main/res/layout/point_controls.xml
index 4ec685d..22d05c7 100644
--- a/main/res/layout/point_controls.xml
+++ b/main/res/layout/point_controls.xml
@@ -16,17 +16,17 @@
 
     <Button
         android:id="@+id/buttonLatitude"
-        style="@style/button"
+        style="@style/button_full"
         android:hint="@string/latitude" />
 
     <Button
         android:id="@+id/buttonLongitude"
-        style="@style/button"
+        style="@style/button_full"
         android:hint="@string/longitude" />
 
     <Button
         android:id="@+id/current"
-        style="@style/button"
+        style="@style/button_full"
         android:text="@string/waypoint_my_coordinates" />
 
     <RelativeLayout style="@style/separator_horizontal_layout" >
@@ -40,7 +40,7 @@
 
     <EditText
         android:id="@+id/bearing"
-        style="@style/edittext"
+        style="@style/edittext_full"
         android:hint="@string/waypoint_bearing"
         android:inputType="numberDecimal" />
 
@@ -51,7 +51,7 @@
 
         <EditText
             android:id="@+id/distance"
-            style="@style/edittext"
+            style="@style/edittext_full"
             android:layout_width="0dip"
             android:layout_weight="1"
             android:hint="@string/waypoint_distance"
diff --git a/main/res/layout/search.xml b/main/res/layout/search.xml
index 82fdac6..09fb886 100644
--- a/main/res/layout/search.xml
+++ b/main/res/layout/search.xml
@@ -30,13 +30,13 @@
 				<TextView style="@style/separator_horizontal_headline"
 						android:text="@string/search_coordinates" />
 			</RelativeLayout>
-			<Button style="@style/button" 
+			<Button style="@style/button_full" 
 				android:hint="@string/latitude"
 				android:id="@+id/buttonLatitude"/>
-			<Button style="@style/button" 
+			<Button style="@style/button_full" 
 				android:hint="@string/longitude"
 				android:id="@+id/buttonLongitude"/>
-			<Button style="@style/button"
+			<Button style="@style/button_full"
 					android:id="@+id/search_coordinates"
 					android:text="@string/search_coordinates_button" />
 <!-- ** -->
@@ -45,11 +45,11 @@
 				<TextView style="@style/separator_horizontal_headline"
 						android:text="@string/search_address" />
 			</RelativeLayout>
-			<EditText style="@style/edittext"
+			<EditText style="@style/edittext_full"
 					android:id="@+id/address"
 					android:hint="@string/search_address"
 					android:imeOptions="actionGo" />
-			<Button style="@style/button"
+			<Button style="@style/button_full"
 					android:id="@+id/search_address"
 					android:text="@string/search_address_button" />
 <!-- ** -->
@@ -58,13 +58,13 @@
 				<TextView style="@style/separator_horizontal_headline"
 						android:text="@string/search_gc" />
 			</RelativeLayout>
-			<AutoCompleteTextView style="@style/edittext"
+			<AutoCompleteTextView style="@style/edittext_full"
 					android:id="@+id/geocode"
 					android:hint="@string/search_gc"
 					android:imeOptions="actionGo"
 					android:text="GC"
 					android:inputType="textCapCharacters" />
-			<Button style="@style/button"
+			<Button style="@style/button_full"
 					android:id="@+id/display_geocode"
 					android:text="@string/search_gc_button" />
 <!-- ** -->
@@ -73,11 +73,11 @@
 				<TextView style="@style/separator_horizontal_headline"
 						android:text="@string/search_kw" />
 			</RelativeLayout>
-			<EditText style="@style/edittext"
+			<EditText style="@style/edittext_full"
 					android:id="@+id/keyword"
 					android:hint="@string/search_kw_prefill"
 					android:imeOptions="actionGo" />
-			<Button style="@style/button"
+			<Button style="@style/button_full"
 					android:id="@+id/search_keyword"
 					android:text="@string/search_kw_button" />
 <!-- ** -->
@@ -86,11 +86,11 @@
 				<TextView style="@style/separator_horizontal_headline"
 						android:text="@string/search_fbu" />
 			</RelativeLayout>
-			<EditText style="@style/edittext"
+			<EditText style="@style/edittext_full"
 					android:id="@+id/username"
 					android:hint="@string/search_fbu_prefill"
 					android:imeOptions="actionGo" />
-			<Button style="@style/button"
+			<Button style="@style/button_full"
 					android:id="@+id/search_username"
 					android:text="@string/search_fbu_button" />
 <!-- ** -->
@@ -99,11 +99,11 @@
 				<TextView style="@style/separator_horizontal_headline"
 						android:text="@string/search_hbu" />
 			</RelativeLayout>
-			<EditText style="@style/edittext"
+			<EditText style="@style/edittext_full"
 					android:id="@+id/owner"
 					android:hint="@string/search_hbu_prefill"
 					android:imeOptions="actionGo" />
-			<Button style="@style/button"
+			<Button style="@style/button_full"
 					android:id="@+id/search_owner"
 					android:text="@string/search_hbu_button" />
 <!-- ** -->
@@ -112,12 +112,12 @@
 				<TextView style="@style/separator_horizontal_headline"
 						android:text="@string/search_tb" />
 			</RelativeLayout>
-			<EditText style="@style/edittext"
+			<EditText style="@style/edittext_full"
 					android:id="@+id/trackable"
 					android:hint="@string/search_tb_hint"
 					android:imeOptions="actionGo"
 					android:inputType="textCapCharacters" />
-			<Button style="@style/button"
+			<Button style="@style/button_full"
 					android:id="@+id/display_trackable"
 					android:text="@string/search_tb_button" />
 		</LinearLayout>
diff --git a/main/res/layout/touch.xml b/main/res/layout/touch.xml
index de17c3d..06a9d25 100644
--- a/main/res/layout/touch.xml
+++ b/main/res/layout/touch.xml
@@ -30,20 +30,20 @@
 					android:layout_width="fill_parent"
 					android:layout_height="wrap_content"
 					android:orientation="horizontal" >
-				<Button style="@style/button"
+				<Button style="@style/button_full"
 						android:id="@+id/type"
 						android:layout_width="0dip"
 						android:layout_weight="1"/>
-				<Button style="@style/button"
+				<Button style="@style/button_full"
 						android:id="@+id/date"
 						android:layout_width="0dip"
 						android:layout_weight="1"/>
 			</LinearLayout>
-			<EditText style="@style/edittext"
+			<EditText style="@style/edittext_full"
 					android:id="@+id/tracking"
 					android:inputType="textCapCharacters"
 					android:hint="@string/trackable_code" />
-			<EditText style="@style/edittext"
+			<EditText style="@style/edittext_full"
 					android:id="@+id/log"
                        android:hint="@string/log_new_log_text"
 					android:singleLine="false"
@@ -73,7 +73,7 @@
 						android:textColor="?text_color"
 						android:text="@string/visit_tweet" />
 			</LinearLayout>
-			<Button style="@style/button"
+			<Button style="@style/button_full"
 					android:id="@+id/post"
 					android:text="@string/log_post" />
 		</LinearLayout>
diff --git a/main/res/layout/visit.xml b/main/res/layout/visit.xml
index 80a3a5c..8018d48 100644
--- a/main/res/layout/visit.xml
+++ b/main/res/layout/visit.xml
@@ -35,16 +35,16 @@
 						android:layout_width="fill_parent"
 						android:layout_height="wrap_content"
 						android:orientation="horizontal" >
-					<Button style="@style/button"
+					<Button style="@style/button_full"
 							android:id="@+id/type"
 							android:layout_width="0dip"
 							android:layout_weight="1"/>
-					<Button style="@style/button"
+					<Button style="@style/button_full"
 							android:id="@+id/date"
 							android:layout_width="0dip"
 							android:layout_weight="1"/>
 				</LinearLayout>
-				<EditText style="@style/edittext"
+				<EditText style="@style/edittext_full"
 						android:id="@+id/log"
 						android:hint="@string/log_new_log_text"
 						android:singleLine="false"
@@ -75,7 +75,7 @@
 							android:textColor="?text_color"
 							android:text="@string/visit_tweet" />
 				</LinearLayout>
-				<Button style="@style/button"
+				<Button style="@style/button_full"
 						android:id="@+id/post"
 						android:text="@string/log_post" />
 				<RelativeLayout style="@style/separator_horizontal_layout" >
@@ -87,12 +87,12 @@
 						android:layout_width="fill_parent"
 						android:layout_height="wrap_content"
 						android:orientation="horizontal" >
-					<Button style="@style/button"
+					<Button style="@style/button_full"
 							android:id="@+id/save"
 							android:layout_width="0dip"
 							android:layout_weight="1"
 							android:text="@string/log_save" />
-					<Button style="@style/button"
+					<Button style="@style/button_full"
 							android:id="@+id/clear"
 							android:layout_width="0dip"
 							android:layout_weight="1"
@@ -122,7 +122,7 @@
 						android:layout_height="wrap_content"
 						android:gravity="right"
 						android:orientation="vertical" >
-					<Button style="@style/button"
+					<Button style="@style/button_full"
 							android:id="@+id/changebutton"
 							android:layout_width="wrap_content"
 							android:layout_weight="1"
diff --git a/main/res/layout/waypoint_new.xml b/main/res/layout/waypoint_new.xml
index b8237ea..397f0ee 100644
--- a/main/res/layout/waypoint_new.xml
+++ b/main/res/layout/waypoint_new.xml
@@ -37,17 +37,17 @@
 
             <Button
                 android:id="@+id/buttonLatitude"
-                style="@style/button"
+                style="@style/button_full"
                 android:hint="@string/latitude" />
 
             <Button
                 android:id="@+id/buttonLongitude"
-                style="@style/button"
+                style="@style/button_full"
                 android:hint="@string/longitude" />
 
             <EditText
                 android:id="@+id/bearing"
-                style="@style/edittext"
+                style="@style/edittext_full"
                 android:hint="@string/waypoint_bearing"
                 android:inputType="numberDecimal" />
 
@@ -58,7 +58,7 @@
             
 	            <EditText
                 	android:id="@+id/distance"
-                	style="@style/edittext"
+                	style="@style/edittext_full"
                 	android:hint="@string/waypoint_distance"
                 	android:inputType="numberDecimal"
                 	android:layout_width="0dip"
@@ -73,7 +73,7 @@
 
 	        <AutoCompleteTextView
                 android:id="@+id/name"
-                style="@style/edittext"
+                style="@style/edittext_full"
                 android:hint="@string/waypoint_name" />
             
             <Spinner 
@@ -83,7 +83,7 @@
 
             <EditText
                 android:id="@+id/note"
-                style="@style/edittext"
+                style="@style/edittext_full"
                 android:layout_height="wrap_content"
                 android:capitalize="sentences"
                 android:hint="@string/waypoint_note"
@@ -92,7 +92,7 @@
 
             <Button
                 android:id="@+id/add_waypoint"
-                style="@style/button"
+                style="@style/button_full"
                 android:text="@string/waypoint_save" />
         </LinearLayout>
     </ScrollView>
diff --git a/main/res/values/styles.xml b/main/res/values/styles.xml
index ad3fc8d..394e3d0 100644
--- a/main/res/values/styles.xml
+++ b/main/res/values/styles.xml
@@ -2,7 +2,6 @@
 <resources>
 
     <!-- system definitions -->
-    <style name="cgeo" parent="android:Theme.NoTitleBar"></style>
 
     <style name="button" parent="@android:style/Widget.Button">
         <item name="android:padding">6dip</item>
@@ -13,9 +12,6 @@
         <item name="android:textSize">22dip</item>
         <item name="android:textColor">?text_color</item>
         <item name="android:background">?button</item>
-        <item name="android:focusable">true</item>
-        <item name="android:clickable">true</item>
-        <item name="android:gravity">center</item>
     </style>
 
     <style name="edittext" parent="@android:style/Widget.EditText">
@@ -26,7 +22,6 @@
         <item name="android:textColor">?text_color</item>
         <item name="android:textColorHint">?text_color_hint</item>
         <item name="android:background">?input</item>
-        <item name="android:focusable">true</item>
         <item name="android:gravity">top|left</item>
         <item name="android:capitalize">none</item>
     </style>
@@ -92,7 +87,7 @@
     </style>
 
     <!-- button: full width -->
-    <style name="button">
+    <style name="button_full" parent="button">
         <item name="android:layout_width">fill_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_marginLeft">10dip</item>
@@ -101,7 +96,7 @@
     </style>
 
     <!-- button: small -->
-    <style name="button_small">
+    <style name="button_small" parent="button">
         <item name="android:layout_width">125dip</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_gravity">right</item>
@@ -114,7 +109,7 @@
     </style>
 
     <!-- edittext -->
-    <style name="edittext">
+    <style name="edittext_full" parent="edittext">
         <item name="android:layout_width">fill_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_marginLeft">10dip</item>
@@ -122,7 +117,7 @@
         <item name="android:layout_marginBottom">5dip</item>
     </style>
 
-    <style name="edittext_dialog">
+    <style name="edittext_dialog" parent="edittext">
         <item name="android:layout_width">fill_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_marginLeft">10dip</item>
@@ -199,11 +194,10 @@
         <item name="android:background">@drawable/icon_bcg</item>
     </style>
 
-    <style name="location_current_type">
+    <style name="location_current_style">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_alignParentBottom">true</item>
-        <item name="android:layout_alignParentRight">true</item>
         <item name="android:layout_gravity">right</item>
         <item name="android:paddingLeft">3dip</item>
         <item name="android:paddingRight">3dip</item>
@@ -215,36 +209,17 @@
         <item name="android:textColor">@color/text_dark</item>
     </style>
 
-    <style name="location_current_accuracy">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_alignParentBottom">true</item>
+    <style name="location_current_type" parent="location_current_style">
+        <item name="android:layout_alignParentRight">true</item>
+    </style>
+
+    <style name="location_current_accuracy" parent="location_current_style">
         <item name="android:layout_centerHorizontal">true</item>
-        <item name="android:layout_gravity">right</item>
-        <item name="android:paddingLeft">3dip</item>
-        <item name="android:paddingRight">3dip</item>
-        <item name="android:lines">1</item>
-        <item name="android:singleLine">true</item>
-        <item name="android:scrollHorizontally">true</item>
-        <item name="android:ellipsize">marquee</item>
-        <item name="android:textSize">12dip</item>
-        <item name="android:textColor">@color/text_dark</item>
     </style>
 
-    <style name="location_current_satellites">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_alignParentBottom">true</item>
+    <style name="location_current_satellites" parent="location_current_style">
         <item name="android:layout_alignParentLeft">true</item>
         <item name="android:layout_gravity">left</item>
-        <item name="android:paddingLeft">3dip</item>
-        <item name="android:paddingRight">3dip</item>
-        <item name="android:lines">1</item>
-        <item name="android:singleLine">true</item>
-        <item name="android:scrollHorizontally">true</item>
-        <item name="android:ellipsize">marquee</item>
-        <item name="android:textSize">12dip</item>
-        <item name="android:textColor">@color/text_dark</item>
     </style>
 
     <!-- separators -->