diff --git a/src/xfpm-power-common.c b/src/xfpm-power-common.c
index 922e22e..63fcfb2 100644
--- a/src/xfpm-power-common.c
+++ b/src/xfpm-power-common.c
@@ -45,13 +45,13 @@ xfpm_power_enumerate_devices (DBusGProxy *proxy)
     g_type_array = dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_OBJECT_PATH);
     
     ret = dbus_g_proxy_call (proxy, "EnumerateDevices", &error,
-			     G_TYPE_INVALID,
-			     g_type_array, &array,
-			     G_TYPE_INVALID);
+                 G_TYPE_INVALID,
+                 g_type_array, &array,
+                 G_TYPE_INVALID);
     if (!ret) 
     {
-	g_critical ("Couldn't enumerate power devices: %s", error->message);
-	g_error_free (error);
+    g_critical ("Couldn't enumerate power devices: %s", error->message);
+    g_error_free (error);
     }
     
     return array;
@@ -70,15 +70,15 @@ GHashTable *xfpm_power_get_interface_properties (DBusGProxy *proxy_prop, const g
     props = NULL;
 
     ret = dbus_g_proxy_call (proxy_prop, "GetAll", &error,
-			     G_TYPE_STRING, iface_name,
-			     G_TYPE_INVALID,
-			     dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE), &props,
-			     G_TYPE_INVALID);
-			    
+                 G_TYPE_STRING, iface_name,
+                 G_TYPE_INVALID,
+                 dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE), &props,
+                 G_TYPE_INVALID);
+                
     if (!ret) 
     {
-	g_warning ("Unable to get interface properties for : %s : %s", iface_name, error->message);
-	g_error_free (error);
+    g_warning ("Unable to get interface properties for : %s : %s", iface_name, error->message);
+    g_error_free (error);
     }
     
     return props;
@@ -95,15 +95,15 @@ GValue xfpm_power_get_interface_property (DBusGProxy *proxy, const gchar *iface_
     GValue value = { 0, };
 
     ret = dbus_g_proxy_call (proxy, "Get", &error,
-			     G_TYPE_STRING, iface_name,
-			     G_TYPE_STRING, prop_name,
-			     G_TYPE_INVALID,
-			     G_TYPE_VALUE, &value, G_TYPE_INVALID);
-							
+                 G_TYPE_STRING, iface_name,
+                 G_TYPE_STRING, prop_name,
+                 G_TYPE_INVALID,
+                 G_TYPE_VALUE, &value, G_TYPE_INVALID);
+                            
     if (!ret) 
     {
-	g_warning ("Unable to get property %s on interface  %s : %s", prop_name, iface_name, error->message);
-	g_error_free (error);
+    g_warning ("Unable to get property %s on interface  %s : %s", prop_name, iface_name, error->message);
+    g_error_free (error);
     }
     
     return value;
@@ -128,14 +128,14 @@ xfpm_power_translate_device_type (guint type)
             return _("Mouse");
         case XFPM_DEVICE_TYPE_KBD:
             return _("Keyboard");
-	case XFPM_DEVICE_TYPE_MONITOR:
-	    return _("Monitor");
-	case XFPM_DEVICE_TYPE_PDA:
-	    return _("PDA");
-	case XFPM_DEVICE_TYPE_PHONE:
-	    return _("Phone");
-	case XFPM_DEVICE_TYPE_UNKNOWN:
-	    return _("Unknown");
+    case XFPM_DEVICE_TYPE_MONITOR:
+        return _("Monitor");
+    case XFPM_DEVICE_TYPE_PDA:
+        return _("PDA");
+    case XFPM_DEVICE_TYPE_PHONE:
+        return _("Phone");
+    case XFPM_DEVICE_TYPE_UNKNOWN:
+        return _("Unknown");
     }
     
     return _("Battery");
@@ -152,7 +152,7 @@ const gchar *xfpm_power_translate_technology (guint value)
         case 0:
             return _("Unknown");
         case 1:
-            return _("Lithium ion");
+            return _("Lithium-ion");
         case 2:
             return _("Lithium polymer");
         case 3:
@@ -160,9 +160,9 @@ const gchar *xfpm_power_translate_technology (guint value)
         case 4:
             return _("Lead acid");
         case 5:
-            return _("Nickel cadmium");
+            return _("Nickel-cadmium");
         case 6:
-            return _("Nickel metal hybride");
+            return _("Nickel-metal hydride");
     }
     
     return _("Unknown");
@@ -182,14 +182,14 @@ const gchar *xfpm_power_get_icon_name (guint device_type)
             return XFPM_MOUSE_ICON;
         case XFPM_DEVICE_TYPE_KBD:
             return XFPM_KBD_ICON;
-	case XFPM_DEVICE_TYPE_MONITOR:
-	    return "monitor";
-	case XFPM_DEVICE_TYPE_PDA:
-	    return XFPM_PDA_ICON;
-	case XFPM_DEVICE_TYPE_PHONE:
-	    return XFPM_PHONE_ICON;
-	case XFPM_DEVICE_TYPE_UNKNOWN:
-	    return XFPM_BATTERY_ICON;
+    case XFPM_DEVICE_TYPE_MONITOR:
+        return "monitor";
+    case XFPM_DEVICE_TYPE_PDA:
+        return XFPM_PDA_ICON;
+    case XFPM_DEVICE_TYPE_PHONE:
+        return XFPM_PHONE_ICON;
+    case XFPM_DEVICE_TYPE_UNKNOWN:
+        return XFPM_BATTERY_ICON;
     }
     
     return XFPM_BATTERY_ICON;