diff -r 5dccd1d8d817 -r 012576d7386d thermferm/server.c
--- a/thermferm/server.c	Fri Jul 11 13:29:26 2014 +0200
+++ b/thermferm/server.c	Fri Jul 11 22:53:33 2014 +0200
@@ -209,7 +209,7 @@
 	i = 0;
 	for (unit = Config.units; unit; unit = unit->next) {
 	    i++;
-	    srv_send((char *)"%02d %s %-20s %-7s", i, unit->uuid, unit->name, UNITMODE[unit->mode]);
+	    srv_send((char *)"%d,%s,%s,%s", i, unit->uuid, unit->name, UNITMODE[unit->mode]);
 	}
 	srv_send((char *)".");
 	return 0;
@@ -223,17 +223,17 @@
 	    while ((de = readdir(fd))) {
 		if (de->d_name[0] != '.') {
 		    if (strncmp(de->d_name, (char *)"w1", 2) == 0) {
-			srv_send((char *)"%-15s       system device", de->d_name);
+			srv_send((char *)"%s,N/A,System device", de->d_name);
 		    } else if (strncmp(de->d_name, (char *)"10", 2) == 0) {
-			srv_send((char *)"%-15s 18S20 digital thermometer", de->d_name);
+			srv_send((char *)"%s,18S20,Digital thermometer", de->d_name);
 		    } else if (strncmp(de->d_name, (char *)"28", 2) == 0) {
-			srv_send((char *)"%-15s 18B20 digital thermometer", de->d_name);
+			srv_send((char *)"%s,18B20,Digital thermometer", de->d_name);
 		    } else if (strncmp(de->d_name, (char *)"29", 2) == 0) {
-			srv_send((char *)"%-15s 2408  8-channel addressable switch/LCD", de->d_name);
+			srv_send((char *)"%s,2408,8 Channel addressable switch/LCD", de->d_name);
 		    } else if (strncmp(de->d_name, (char *)"3a", 2) == 0) {
-			srv_send((char *)"%-15s 2413  dual channel addressable switchs", de->d_name);
+			srv_send((char *)"%s,2413,Dual channel addressable switchs", de->d_name);
 		    } else {
-			srv_send((char *)"%-15s       unknown device", de->d_name);
+			srv_send((char *)"%s,N/A,Unknown device", de->d_name);
 		    }
 		}
 	    }
@@ -253,7 +253,7 @@
 	i = 0;
 	for (profile = Config.profiles; profile; profile = profile->next) {
 	    i++;
-	    srv_send((char *)"%02d %s %s", i, profile->uuid, profile->name);
+	    srv_send((char *)"%d,%s,%s", i, profile->uuid, profile->name);
 	}
 	srv_send((char *)".");
 	return 0;
@@ -272,39 +272,41 @@
 	for (unit = Config.units; unit; unit = unit->next) {
 	    i++;
 	    if (i == current_unit) {
-		srv_send((char *)"Name of the unit/beer      %s", unit->name);
-		srv_send((char *)"UUID of this unit          %s", unit->uuid);
+		srv_send((char *)"NAME,%s", unit->name);
+		srv_send((char *)"UUID,%s", unit->uuid);
 		if (unit->air_address) {
-		    srv_send((char *)"1-wire address air sensor  %s", unit->air_address);
-		    srv_send((char *)"Air temperature            %.1f", unit->air_temp);
+		    srv_send((char *)"AIR_ADDRESS,%s", unit->air_address);
+		    srv_send((char *)"AIR_TEMP,%.1f", unit->air_temp);
 		}
 		if (unit->beer_address) {
-		    srv_send((char *)"1-wire address beer sensor %s", unit->air_address);
-		    srv_send((char *)"Beer temperature           %.1f", unit->air_temp);
+		    srv_send((char *)"BEER_ADDRESS,%s", unit->beer_address);
+		    srv_send((char *)"BEER_TEMP,%.1f", unit->beer_temp);
 		}
 		if (unit->io1_address) {
-		    srv_send((char *)"1-wire address cool/heat   %s", unit->io1_address);
+		    srv_send((char *)"IO1_ADDRESS,%s", unit->io1_address);
 		}
 		if (unit->io2_address) {
-		    srv_send((char *)"1-wire address fan/door    %s", unit->io2_address);
+		    srv_send((char *)"IO2_ADDRESS,%s", unit->io2_address);
 		}
 		if (unit->heater_available) {
-		    srv_send((char *)"Heater available           %s", unit->heater_available);
+		    srv_send((char *)"HEATER_AVAILABLE,%s", unit->heater_available);
 		}
 		if (unit->cooler_available) {
-		    srv_send((char *)"Cooler available           %s", unit->cooler_available);
+		    srv_send((char *)"COOLER_AVAILABLE,%s", unit->cooler_available);
 		}
 		if (unit->fan_available) {
-		    srv_send((char *)"Fan available              %s", unit->fan_available);
+		    srv_send((char *)"FAN_AVAILABLE,%s", unit->fan_available);
 		}
-		srv_send((char *)"Unit mode                  %s", UNITMODE[unit->mode]);
-		srv_send((char *)"Fridge temperature set to  %.1f", unit->fridge_set);
-		srv_send((char *)"Beer temperature set to    %.1f", unit->beer_set);
+		srv_send((char *)"MODE,%s", UNITMODE[unit->mode]);
+		srv_send((char *)"FRIDGE_SET,%.1f", unit->fridge_set);
+		srv_send((char *)"BEER_SET,%.1f", unit->beer_set);
 		if (unit->profile) {
-		    srv_send((char *)"Profile name               %s", unit->profile);
+		    srv_send((char *)"PROFILE,%s", unit->profile);
 		}
-		srv_send((char *)"Temperature range          %.1f .. %.1f", unit->temp_set_min, unit->temp_set_max);
-		srv_send((char *)"Idle temperature range     %.1f .. %.1f", unit->idle_rangeL, unit->idle_rangeH);
+		srv_send((char *)"TEMP_SET_MIN,%.1f", unit->temp_set_min);
+		srv_send((char *)"TEMP_SET_MAX,%.1f", unit->temp_set_max);
+		srv_send((char *)"IDLE_RANGE_L,%.1f", unit->idle_rangeL);
+		srv_send((char *)"IDLE_RANGE_H,%.1f", unit->idle_rangeH);
 	    }
 	}
 	srv_send((char *)".");