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 a874ede..592907a 100644
--- a/libarmbox/hardware_caps.c
+++ b/libarmbox/hardware_caps.c
@@ -42,9 +42,9 @@ hw_caps_t *get_hwcaps(void)
 	caps.display_xres = 480;
 	caps.display_yres = 320;
 	caps.display_type = HW_DISPLAY_GFX;
+	caps.display_can_umlauts = 0;   /* need 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_can_umlauts = 0;   /* need test */
 	caps.display_has_statusline = 0;    // 0 because we use graphlcd/lcd4linux
 	caps.display_has_colon = 0;
 	caps.has_button_timer = 1;
@@ -64,9 +64,9 @@ hw_caps_t *get_hwcaps(void)
 	caps.display_xres = 480;
 	caps.display_yres = 320;
 	caps.display_type = HW_DISPLAY_GFX;
+	caps.display_can_umlauts = 0;   /* need 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_can_umlauts = 0;   /* need test */
 	caps.display_has_statusline = 0;    // 0 because we use graphlcd/lcd4linux
 	caps.display_has_colon = 0;
 	caps.has_button_timer = 1;
@@ -85,9 +85,9 @@ hw_caps_t *get_hwcaps(void)
 	caps.display_xres = 480;
 	caps.display_yres = 320;
 	caps.display_type = HW_DISPLAY_GFX;
+	caps.display_can_umlauts = 0;   /* need 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_can_umlauts = 0;   /* need test */
 	caps.display_has_statusline = 0;    // 0 because we use graphlcd/lcd4linux
 	caps.display_has_colon = 0;
 	caps.has_button_timer = 1;
@@ -107,9 +107,9 @@ hw_caps_t *get_hwcaps(void)
 	caps.display_xres = 800;
 	caps.display_yres = 480;
 	caps.display_type = HW_DISPLAY_GFX;
+	caps.display_can_umlauts = 0;   /* need 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_can_umlauts = 0;   /* need test */
 	caps.display_has_statusline = 0;    // 0 because we use graphlcd/lcd4linux
 	caps.display_has_colon = 0;
 	caps.has_button_timer = 1;
@@ -127,9 +127,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;
@@ -148,9 +148,9 @@ hw_caps_t *get_hwcaps(void)
 	caps.display_xres = 400;
 	caps.display_yres = 240;
 	caps.display_type = HW_DISPLAY_GFX;
+	caps.display_can_umlauts = 0;   /* need 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_can_umlauts = 0;   /* need test */
 	caps.display_has_statusline = 0;    // 0 because we use graphlcd/lcd4linux
 	caps.display_has_colon = 0;
 	caps.has_button_timer = 1;
@@ -168,9 +168,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;
@@ -188,9 +188,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;
@@ -208,9 +208,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;
@@ -228,9 +228,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;
@@ -248,9 +248,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;
@@ -267,9 +267,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;
@@ -286,9 +286,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;
@@ -306,9 +306,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;
@@ -326,9 +326,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;
@@ -347,9 +347,9 @@ hw_caps_t *get_hwcaps(void)
 	caps.display_xres = 128;
 	caps.display_yres = 64;
 	caps.display_type = HW_DISPLAY_GFX;
+	caps.display_can_umlauts = 0;   /* need 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_can_umlauts = 0;   /* need test */
 	caps.display_has_statusline = 0;    // 0 because we use graphlcd/lcd4linux
 	caps.display_has_colon = 0;
 	caps.has_button_timer = 1;