diff -ruN gkacpi-0.3/gkacpi.c gkacpi-0.3-cpbotha/gkacpi.c
--- gkacpi-0.3/gkacpi.c	Wed Apr  3 11:31:36 2002
+++ gkacpi-0.3-cpbotha/gkacpi.c	Sun Aug  4 16:10:16 2002
@@ -33,7 +33,10 @@
 static Decal  *decal_ac, *decal_batt, *decal_temp, *decal_term, *decal_throt;
 
 static gint style_id;
-static gint info_type = INFO_TIME;
+/* I find percentage more meaningful as the time measurement can be quite
+ * difficult to keep accurate.  People can always middle-click to change
+ * this */
+static gint info_type = INFO_PERCENTAGE; 
 static gint temperature_mode;
 
 //------------------------------------------------------------------------------
@@ -107,8 +110,6 @@
 						default:
 							break;
 					}
-					if (info_type == INFO_TIME)
-							info_type = INFO_PERCENTAGE;
 					break;
 				case AC_OFF:
 					switch (acpi_info.batt) {
diff -ruN gkacpi-0.3/libacpi.c gkacpi-0.3-cpbotha/libacpi.c
--- gkacpi-0.3/libacpi.c	Wed Apr  3 11:22:47 2002
+++ gkacpi-0.3-cpbotha/libacpi.c	Sat Jul 13 00:13:25 2002
@@ -76,34 +76,34 @@
 		sprintf(acpi_files.batt_state, "/proc/acpi/battery/BAT0/state");
 	}
 	
-  f = fopen("/proc/acpi/ac_adapter/AC/state", "r");
+  f = fopen("/proc/acpi/ac_adapter/ADP0/state", "r");
   if (!f) {
 			fprintf(stderr, "Can't find AC adapter.\n");
 			
 			return 0;
 	}
 	else {
-		sprintf(acpi_files.ac_state, "/proc/acpi/ac_adapter/AC/state");		
+		sprintf(acpi_files.ac_state, "/proc/acpi/ac_adapter/ADP0/state");		
 	}
 	
-  f = fopen("/proc/acpi/thermal_zone/THRM/temperature", "r");
+  f = fopen("/proc/acpi/thermal_zone/THM0/temperature", "r");
   if (!f) {
 			fprintf(stderr, "Can't find thermal zone.\n");
 			
 			return 0;
 	}
 	else {
-		sprintf(acpi_files.thrm_temp, "/proc/acpi/thermal_zone/THRM/temperature");		
+		sprintf(acpi_files.thrm_temp, "/proc/acpi/thermal_zone/THM0/temperature");		
 	}
 	
-  f = fopen("/proc/acpi/thermal_zone/THRM/trip_points", "r");
+  f = fopen("/proc/acpi/thermal_zone/THM0/trip_points", "r");
   if (!f) {
 			fprintf(stderr, "Can't find thermal zone.\n");
 			
 			return 0;
 	}
 	else {
-		sprintf(acpi_files.thrm_crit, "/proc/acpi/thermal_zone/THRM/trip_points");		
+		sprintf(acpi_files.thrm_crit, "/proc/acpi/thermal_zone/THM0/trip_points");
 	}
 
   f = fopen("/proc/acpi/processor/CPU0/throttling", "r");