diff --git a/include/hardware_caps.h b/include/hardware_caps.h
index 4b9cf16..88f1e77 100644
--- a/include/hardware_caps.h
+++ b/include/hardware_caps.h
@@ -41,9 +41,9 @@ typedef struct hw_caps
 	display_type_t display_type;
 	int display_xres;   /* x resolution or chars per line */
 	int display_yres;
+	int display_can_umlauts;
 	int display_can_deepstandby;
 	int display_can_set_brightness;
-	int display_can_umlauts;
 	int display_has_statusline;
 	int display_has_colon;
 	int has_button_timer;
diff --git a/libarmbox/hardware_caps.c b/libarmbox/hardware_caps.c
index 8ff208b..d345ee5 100644
--- a/libarmbox/hardware_caps.c
+++ b/libarmbox/hardware_caps.c
@@ -43,10 +43,10 @@ hw_caps_t *get_hwcaps(void)
 	caps.display_xres = 480;
 	caps.display_yres = 320;
 	caps.display_type = HW_DISPLAY_GFX;
-	caps.display_can_deepstandby = 0;   // 0 because we use graphlcd/lcd4linux
-	caps.display_can_set_brightness = 0;    // 0 because we use graphlcd/lcd4linux
-	caps.display_can_umlauts = 0;   /* need test */
-	caps.display_has_statusline = 0;    // 0 because we use graphlcd/lcd4linux
+	caps.display_can_umlauts = 0;        // needs test
+	caps.display_can_deepstandby = 0;    // 0 because we use graphlcd/lcd4linux
+	caps.display_can_set_brightness = 0; // 0 because we use graphlcd/lcd4linux
+	caps.display_has_statusline = 0;     // 0 because we use graphlcd/lcd4linux
 	caps.display_has_colon = 0;
 	caps.has_button_timer = 1;
 	caps.has_button_vformat = 0;
@@ -65,10 +65,10 @@ hw_caps_t *get_hwcaps(void)
 	caps.display_xres = 480;
 	caps.display_yres = 320;
 	caps.display_type = HW_DISPLAY_GFX;
-	caps.display_can_deepstandby = 0;   // 0 because we use graphlcd/lcd4linux
-	caps.display_can_set_brightness = 0;    // 0 because we use graphlcd/lcd4linux
-	caps.display_can_umlauts = 0;   /* need test */
-	caps.display_has_statusline = 0;    // 0 because we use graphlcd/lcd4linux
+	caps.display_can_umlauts = 0;        // needs test
+	caps.display_can_deepstandby = 0;    // 0 because we use graphlcd/lcd4linux
+	caps.display_can_set_brightness = 0; // 0 because we use graphlcd/lcd4linux
+	caps.display_has_statusline = 0;     // 0 because we use graphlcd/lcd4linux
 	caps.display_has_colon = 0;
 	caps.has_button_timer = 1;
 	caps.has_button_vformat = 0;
@@ -86,10 +86,10 @@ hw_caps_t *get_hwcaps(void)
 	caps.display_xres = 480;
 	caps.display_yres = 320;
 	caps.display_type = HW_DISPLAY_GFX;
-	caps.display_can_deepstandby = 0;   // 0 because we use graphlcd/lcd4linux
-	caps.display_can_set_brightness = 0;    // 0 because we use graphlcd/lcd4linux
-	caps.display_can_umlauts = 0;   /* need test */
-	caps.display_has_statusline = 0;    // 0 because we use graphlcd/lcd4linux
+	caps.display_can_umlauts = 0;        // needs test
+	caps.display_can_deepstandby = 0;    // 0 because we use graphlcd/lcd4linux
+	caps.display_can_set_brightness = 0; // 0 because we use graphlcd/lcd4linux
+	caps.display_has_statusline = 0;     // 0 because we use graphlcd/lcd4linux
 	caps.display_has_colon = 0;
 	caps.has_button_timer = 1;
 	caps.has_button_vformat = 0;
@@ -108,10 +108,10 @@ hw_caps_t *get_hwcaps(void)
 	caps.display_xres = 800;
 	caps.display_yres = 480;
 	caps.display_type = HW_DISPLAY_GFX;
-	caps.display_can_deepstandby = 0;   // 0 because we use graphlcd/lcd4linux
-	caps.display_can_set_brightness = 0;    // 0 because we use graphlcd/lcd4linux
-	caps.display_can_umlauts = 0;   /* need test */
-	caps.display_has_statusline = 0;    // 0 because we use graphlcd/lcd4linux
+	caps.display_can_umlauts = 0;        // needs test
+	caps.display_can_deepstandby = 0;    // 0 because we use graphlcd/lcd4linux
+	caps.display_can_set_brightness = 0; // 0 because we use graphlcd/lcd4linux
+	caps.display_has_statusline = 0;     // 0 because we use graphlcd/lcd4linux
 	caps.display_has_colon = 0;
 	caps.has_button_timer = 1;
 	caps.has_button_vformat = 0;
@@ -128,9 +128,9 @@ hw_caps_t *get_hwcaps(void)
 	caps.can_cpufreq = 0;
 	caps.can_shutdown = 1;
 	caps.display_type = HW_DISPLAY_LED_ONLY;
+	caps.display_can_umlauts = 0;
 	caps.display_can_deepstandby = 0;
 	caps.display_can_set_brightness = 1;
-	caps.display_can_umlauts = 0;
 	caps.display_has_statusline = 0;
 	caps.display_has_colon = 0;
 	caps.has_button_timer = 1;
@@ -149,10 +149,10 @@ hw_caps_t *get_hwcaps(void)
 	caps.display_xres = 400;
 	caps.display_yres = 240;
 	caps.display_type = HW_DISPLAY_GFX;
-	caps.display_can_deepstandby = 0;   // 0 because we use graphlcd/lcd4linux
-	caps.display_can_set_brightness = 0;    // 0 because we use graphlcd/lcd4linux
-	caps.display_can_umlauts = 0;   /* need test */
-	caps.display_has_statusline = 0;    // 0 because we use graphlcd/lcd4linux
+	caps.display_can_umlauts = 0;        // needs test
+	caps.display_can_deepstandby = 0;    // 0 because we use graphlcd/lcd4linux
+	caps.display_can_set_brightness = 0; // 0 because we use graphlcd/lcd4linux
+	caps.display_has_statusline = 0;     // 0 because we use graphlcd/lcd4linux
 	caps.display_has_colon = 0;
 	caps.has_button_timer = 1;
 	caps.has_button_vformat = 0;
@@ -169,9 +169,9 @@ hw_caps_t *get_hwcaps(void)
 	caps.can_cpufreq = 0;
 	caps.can_shutdown = 1;
 	caps.display_type = HW_DISPLAY_LED_ONLY;
+	caps.display_can_umlauts = 0;
 	caps.display_can_deepstandby = 0;
 	caps.display_can_set_brightness = 1;
-	caps.display_can_umlauts = 0;
 	caps.display_has_statusline = 0;
 	caps.display_has_colon = 0;
 	caps.has_button_timer = 1;
@@ -189,9 +189,9 @@ hw_caps_t *get_hwcaps(void)
 	caps.can_shutdown = 1;
 	caps.display_xres = 16;
 	caps.display_type = HW_DISPLAY_LINE_TEXT;
+	caps.display_can_umlauts = 1;
 	caps.display_can_deepstandby = 0;
 	caps.display_can_set_brightness = 1;
-	caps.display_can_umlauts = 1;
 	caps.display_has_statusline = 0;
 	caps.display_has_colon = 0;
 	caps.has_button_timer = 1;
@@ -209,9 +209,9 @@ hw_caps_t *get_hwcaps(void)
 	caps.can_shutdown = 1;
 	caps.display_xres = 4;
 	caps.display_type = HW_DISPLAY_LED_NUM;
+	caps.display_can_umlauts = 0;
 	caps.display_can_deepstandby = 0;
 	caps.display_can_set_brightness = 1;
-	caps.display_can_umlauts = 0;
 	caps.display_has_statusline = 0;
 	caps.display_has_colon = 1;
 	caps.has_button_timer = 1;
@@ -229,9 +229,9 @@ hw_caps_t *get_hwcaps(void)
 	caps.can_shutdown = 1;
 	caps.display_xres = 4;
 	caps.display_type = HW_DISPLAY_LED_NUM;
+	caps.display_can_umlauts = 0;
 	caps.display_can_deepstandby = 0;
 	caps.display_can_set_brightness = 1;
-	caps.display_can_umlauts = 0;
 	caps.display_has_statusline = 0;
 	caps.display_has_colon = 1;
 	caps.has_button_timer = 1;
@@ -249,9 +249,9 @@ hw_caps_t *get_hwcaps(void)
 	caps.can_shutdown = 1;
 	caps.display_xres = 4;
 	caps.display_type = HW_DISPLAY_LED_NUM;
+	caps.display_can_umlauts = 0;
 	caps.display_can_deepstandby = 0;
 	caps.display_can_set_brightness = 1;
-	caps.display_can_umlauts = 0;
 	caps.display_has_statusline = 0;
 	caps.display_has_colon = 1;
 	caps.has_button_timer = 1;
@@ -268,9 +268,9 @@ hw_caps_t *get_hwcaps(void)
 	caps.can_shutdown = 1;
 	caps.display_xres = 4;
 	caps.display_type = HW_DISPLAY_LED_NUM;
+	caps.display_can_umlauts = 0;
 	caps.display_can_deepstandby = 0;
 	caps.display_can_set_brightness = 1;
-	caps.display_can_umlauts = 0;
 	caps.display_has_statusline = 0;
 	caps.has_button_timer = 1;
 	caps.has_button_vformat = 0;
@@ -287,9 +287,9 @@ hw_caps_t *get_hwcaps(void)
 	caps.can_shutdown = 1;
 	caps.display_xres = 0;
 	caps.display_type = HW_DISPLAY_NONE;
+	caps.display_can_umlauts = 0;
 	caps.display_can_deepstandby = 0;
 	caps.display_can_set_brightness = 0;
-	caps.display_can_umlauts = 0;
 	caps.display_has_statusline = 0;
 	caps.display_has_colon = 0;
 	caps.has_button_timer = 1;
@@ -307,9 +307,9 @@ hw_caps_t *get_hwcaps(void)
 	caps.can_shutdown = 1;
 	caps.display_xres = 4;
 	caps.display_type = HW_DISPLAY_LED_NUM;
+	caps.display_can_umlauts = 0;
 	caps.display_can_deepstandby = 0;
 	caps.display_can_set_brightness = 1;
-	caps.display_can_umlauts = 0;
 	caps.display_has_statusline = 1;
 	caps.display_has_colon = 1;
 	caps.has_button_timer = 1;
@@ -327,9 +327,9 @@ hw_caps_t *get_hwcaps(void)
 	caps.can_shutdown = 1;
 	caps.display_xres = 4;
 	caps.display_type = HW_DISPLAY_LED_NUM;
+	caps.display_can_umlauts = 0;
 	caps.display_can_deepstandby = 0;
 	caps.display_can_set_brightness = 1;
-	caps.display_can_umlauts = 0;
 	caps.display_has_statusline = 1;
 	caps.display_has_colon = 1;
 	caps.has_button_timer = 1;
@@ -348,10 +348,10 @@ hw_caps_t *get_hwcaps(void)
 	caps.display_xres = 128;
 	caps.display_yres = 64;
 	caps.display_type = HW_DISPLAY_GFX;
-	caps.display_can_deepstandby = 0;   // 0 because we use graphlcd/lcd4linux
-	caps.display_can_set_brightness = 0;    // 0 because we use graphlcd/lcd4linux
-	caps.display_can_umlauts = 0;   /* need test */
-	caps.display_has_statusline = 0;    // 0 because we use graphlcd/lcd4linux
+	caps.display_can_umlauts = 0;        // needs test
+	caps.display_can_deepstandby = 0;    // 0 because we use graphlcd/lcd4linux
+	caps.display_can_set_brightness = 0; // 0 because we use graphlcd/lcd4linux
+	caps.display_has_statusline = 0;     // 0 because we use graphlcd/lcd4linux
 	caps.display_has_colon = 0;
 	caps.has_button_timer = 1;
 	caps.has_button_vformat = 1;