2 files changed, 6 insertions, 7 deletions

diff --git a/apps/gui/skin_engine/skin_tokens.h b/apps/gui/skin_engine/skin_tokens.h
index 9df2137ece..bfca7b7f8d 100644
--- a/apps/gui/skin_engine/skin_tokens.h
+++ b/apps/gui/skin_engine/skin_tokens.h
@@ -26,18 +26,17 @@
 #include "tag_table.h"
 
 struct wps_token {
-    enum skin_token_type type; /* enough to store the token type */
-    
-    /* Whether the tag (e.g. track name or the album) refers the
-       current or the next song (false=current, true=next) */
-    bool next;
-
     union {
         char c;
         unsigned short i;
         long l;
         void* data;
     } value;
+
+    enum skin_token_type type; /* enough to store the token type */
+    /* Whether the tag (e.g. track name or the album) refers the
+       current or the next song (false=current, true=next) */
+    bool next;
 };
 
 struct skin_token_list {
diff --git a/apps/gui/skin_engine/wps_internals.h b/apps/gui/skin_engine/wps_internals.h
index c16191c41d..ed09ad0938 100644
--- a/apps/gui/skin_engine/wps_internals.h
+++ b/apps/gui/skin_engine/wps_internals.h
@@ -135,7 +135,7 @@ struct align_pos {
 #define WPS_MAX_VIEWPORTS   24
 #define WPS_MAX_LINES       ((LCD_HEIGHT/5+1) * 2)
 #define WPS_MAX_SUBLINES    (WPS_MAX_LINES*3)
-#define WPS_MAX_TOKENS      1024
+#define WPS_MAX_TOKENS      1150
 #define WPS_MAX_STRINGS     128
 #define STRING_BUFFER_SIZE  1024
 #define WPS_MAX_COND_LEVEL  10