82 files changed, 1679 insertions, 1614 deletions

diff --git a/apps/gui/skin_engine/skin_display.c b/apps/gui/skin_engine/skin_display.c
index 848a09eced..6759521473 100644
--- a/apps/gui/skin_engine/skin_display.c
+++ b/apps/gui/skin_engine/skin_display.c
@@ -755,7 +755,20 @@ static bool get_line(struct gui_wps *gwps,
                     skip to the end of the conditional structure */
                 i = find_conditional_end(data, i);
                 break;
-
+#if (LCD_DEPTH > 1) || (defined(HAVE_REMOTE_LCD) && (LCD_REMOTE_DEPTH > 1))
+            case WPS_TOKEN_VIEWPORT_FGCOLOUR:
+            {
+                struct viewport_colour *col = data->tokens[i].value.data;
+                col->vp->fg_pattern = col->colour;
+            }
+            break;
+            case WPS_TOKEN_VIEWPORT_BGCOLOUR:
+            {
+                struct viewport_colour *col = data->tokens[i].value.data;
+                col->vp->bg_pattern = col->colour;
+            }
+            break;
+#endif
 #ifdef HAVE_LCD_BITMAP
             case WPS_TOKEN_PEAKMETER:
                 data->peak_meter_enabled = true;
@@ -1208,14 +1221,16 @@ static bool skin_redraw(struct gui_wps *gwps, unsigned refresh_mode)
             }
         }
     }
-    int viewport_count = 0;
     for (viewport_list = data->viewports;
-         viewport_list; viewport_list = viewport_list->next, viewport_count++)
+         viewport_list; viewport_list = viewport_list->next)
     {
         struct skin_viewport *skin_viewport =
                         (struct skin_viewport *)viewport_list->token->value.data;
         unsigned vp_refresh_mode = refresh_mode;
-
+#if (LCD_DEPTH > 1) || (defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1)
+        skin_viewport->vp.fg_pattern = skin_viewport->start_fgcolour;
+        skin_viewport->vp.bg_pattern = skin_viewport->start_bgcolour;
+#endif
         display->set_viewport(&skin_viewport->vp);
 
         int hidden_vp = 0;
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c
index 158f2eb7b7..2f79c99144 100644
--- a/apps/gui/skin_engine/skin_parser.c
+++ b/apps/gui/skin_engine/skin_parser.c
@@ -168,6 +168,8 @@ static int parse_font_load(const char *wps_bufptr,
         struct wps_token *token, struct wps_data *wps_data);
 #endif /*HAVE_LCD_BITMAP */
 #if (LCD_DEPTH > 1) || (defined(HAVE_REMOTE_LCD) && (LCD_REMOTE_DEPTH > 1))
+static int parse_viewportcolour(const char *wps_bufptr,
+        struct wps_token *token, struct wps_data *wps_data);
 static int parse_image_special(const char *wps_bufptr,
        struct wps_token *token, struct wps_data *wps_data);
 #endif
@@ -400,6 +402,10 @@ static const struct wps_tag all_tags[] = {
     { WPS_TOKEN_LIST_TITLE_TEXT,          "Lt",  WPS_REFRESH_DYNAMIC, NULL },
     { WPS_TOKEN_LIST_TITLE_ICON,          "Li",  WPS_REFRESH_DYNAMIC, NULL },
 #endif
+#if (LCD_DEPTH > 1) || (defined(HAVE_REMOTE_LCD) && (LCD_REMOTE_DEPTH > 1))
+    { WPS_TOKEN_VIEWPORT_FGCOLOUR,        "Vf", WPS_REFRESH_STATIC, parse_viewportcolour },
+    { WPS_TOKEN_VIEWPORT_BGCOLOUR,        "Vb", WPS_REFRESH_STATIC, parse_viewportcolour },
+#endif
     { WPS_NO_TOKEN,                       "V",   0,    parse_viewport      },
 
 #if (LCD_DEPTH > 1) || (defined(HAVE_REMOTE_LCD) && (LCD_REMOTE_DEPTH > 1))
@@ -618,9 +624,11 @@ static int get_image_id(int c)
 char *get_image_filename(const char *start, const char* bmpdir,
                                 char *buf, int buf_size)
 {
-    const char *end = strchr(start, '|');
+    const char *end = start;
     int bmpdirlen = strlen(bmpdir);
 
+    while (*end && *end != ',' && *end != ')')
+        end++;
     if ( !end || (end - start) >= (buf_size - bmpdirlen - 2) )
     {
         buf[0] = '\0';
@@ -639,7 +647,7 @@ static int parse_image_display(const char *wps_bufptr,
                                struct wps_token *token,
                                struct wps_data *wps_data)
 {
-    char label = wps_bufptr[0];
+    char label = wps_bufptr[1];
     int subimage;
     struct gui_img *img;;
 
@@ -651,17 +659,17 @@ static int parse_image_display(const char *wps_bufptr,
         return WPS_ERROR_INVALID_PARAM;
     }
 
-    if ((subimage = get_image_id(wps_bufptr[1])) != -1)
+    if ((subimage = get_image_id(wps_bufptr[2])) != -1)
     {
         if (subimage >= img->num_subimages)
             return WPS_ERROR_INVALID_PARAM;
 
         /* Store sub-image number to display in high bits */
         token->value.i = label | (subimage << 8);
-        return 2; /* We have consumed 2 bytes */
+        return 4; /* We have consumed 2 bytes */
     } else {
         token->value.i = label;
-        return 1; /* We have consumed 1 byte */
+        return 3; /* We have consumed 1 byte */
     }
 }
 
@@ -670,10 +678,8 @@ static int parse_image_load(const char *wps_bufptr,
                             struct wps_data *wps_data)
 {
     const char *ptr = wps_bufptr;
-    const char *pos;
     const char* filename;
     const char* id;
-    const char *newline;
     int x,y;
     struct gui_img *img;
 
@@ -682,16 +688,16 @@ static int parse_image_load(const char *wps_bufptr,
        or %xl|n|filename.bmp|x|y|num_subimages|
     */
 
-    if (*ptr != '|')
+    if (*ptr != '(')
         return WPS_ERROR_INVALID_PARAM;
 
     ptr++;
 
-    if (!(ptr = parse_list("ssdd", NULL, '|', ptr, &id, &filename, &x, &y)))
+    if (!(ptr = parse_list("ssdd", NULL, ',', ptr, &id, &filename, &x, &y)))
         return WPS_ERROR_INVALID_PARAM;
 
-    /* Check there is a terminating | */
-    if (*ptr != '|')
+    /* Check there is a terminating ) */
+    if (*ptr != ')' && *ptr != ',')
         return WPS_ERROR_INVALID_PARAM;
 
     /* check the image number and load state */
@@ -718,15 +724,11 @@ static int parse_image_load(const char *wps_bufptr,
     {
         img->always_display = true;
     }
-    else
+    else if (*ptr == ',')
     {
         /* Parse the (optional) number of sub-images */
         ptr++;
-        newline = strchr(ptr, '\n');
-        pos = strchr(ptr, '|');
-        if (pos && pos < newline)
-            img->num_subimages = atoi(ptr);
-
+        img->num_subimages = atoi(ptr);
         if (img->num_subimages <= 0)
             return WPS_ERROR_INVALID_PARAM;
     }
@@ -751,16 +753,16 @@ static int parse_font_load(const char *wps_bufptr,
     int id;
     char *filename;
     
-    if (*ptr != '|')
+    if (*ptr != '(')
         return WPS_ERROR_INVALID_PARAM;
 
     ptr++;
 
-    if (!(ptr = parse_list("ds", NULL, '|', ptr, &id, &filename)))
+    if (!(ptr = parse_list("ds", NULL, ',', ptr, &id, &filename)))
         return WPS_ERROR_INVALID_PARAM;
 
     /* Check there is a terminating | */
-    if (*ptr != '|')
+    if (*ptr != ')')
         return WPS_ERROR_INVALID_PARAM;
         
     if (id <= FONT_UI || id >= MAXFONTS-1)
@@ -774,7 +776,7 @@ static int parse_font_load(const char *wps_bufptr,
     /* make sure the filename contains .fnt, 
      * we dont actually use it, but require it anyway */
     ptr = strchr(filename, '.');
-    if (!ptr || strncmp(ptr, ".fnt|", 5))
+    if (!ptr || strncmp(ptr, ".fnt)", 5))
         return WPS_ERROR_INVALID_PARAM;
     skinfonts[id-FONT_FIRSTUSERFONT].id = -1;
     skinfonts[id-FONT_FIRSTUSERFONT].name = filename;
@@ -788,7 +790,7 @@ static int parse_viewport_display(const char *wps_bufptr,
                                   struct wps_data *wps_data)
 {
     (void)wps_data;
-    char letter = wps_bufptr[0];
+    char letter = wps_bufptr[1];
 
     if (letter < 'a' || letter > 'z')
     {
@@ -796,7 +798,7 @@ static int parse_viewport_display(const char *wps_bufptr,
         return WPS_ERROR_INVALID_PARAM;
     }
     token->value.i = letter;
-    return 1;
+    return 3;
 }
 
 #ifdef HAVE_LCD_BITMAP
@@ -807,12 +809,12 @@ static int parse_playlistview_text(struct playlistviewer *viewer,
     const struct wps_tag *tag;
     int taglen = 0;
     const char *start = text;
-    if (*text != '|')
+    if (*text != ',')
         return -1;
     text++;
     viewer->lines[line].count = 0;
     viewer->lines[line].scroll = false;
-    while (*text != '|')
+    while (*text != ',' && *text != ')')
     {
         if (*text == '%') /* it is a token of some type */
         {
@@ -826,6 +828,9 @@ static int parse_playlistview_text(struct playlistviewer *viewer,
                 case '>':
                 case ';':
                 case '#':
+                case '(':
+                case ')':
+                case ',':
                     /* escaped characters */
                     viewer->lines[line].tokens[viewer->lines[line].count++] = WPS_TOKEN_CHARACTER;
                     viewer->lines[line].strings[cur_string][0] = *text;
@@ -850,7 +855,7 @@ static int parse_playlistview_text(struct playlistviewer *viewer,
                     int i = 0;
                     /* just copy the string */
                     viewer->lines[line].tokens[viewer->lines[line].count++] = WPS_TOKEN_STRING;
-                    while (i<(MAX_PLAYLISTLINE_STRLEN-1) && text[i] != '|' && text[i] != '%')
+                    while (i<(MAX_PLAYLISTLINE_STRLEN-1) && text[i] != ',' && text[i] != ')' && text[i] != '%')
                     {
                         viewer->lines[line].strings[cur_string][i] = text[i];
                         i++;
@@ -878,7 +883,7 @@ static int parse_playlistview_text(struct playlistviewer *viewer,
             int i = 0;
             /* just copy the string */
             viewer->lines[line].tokens[viewer->lines[line].count++] = WPS_TOKEN_STRING;
-            while (i<(MAX_PLAYLISTLINE_STRLEN-1) && text[i] != '|' && text[i] != '%')
+            while (i<(MAX_PLAYLISTLINE_STRLEN-1) && text[i] != ',' && text[i] != ')' && text[i] != '%')
             {
                 viewer->lines[line].strings[cur_string][i] = text[i];
                 i++;
@@ -891,14 +896,13 @@ static int parse_playlistview_text(struct playlistviewer *viewer,
     return text - start;
 }
 
-
 static int parse_playlistview(const char *wps_bufptr,
         struct wps_token *token, struct wps_data *wps_data)
 {
     (void)wps_data;
     /* %Vp|<use icons>|<start offset>|info line text|no info text| */
     struct playlistviewer *viewer = skin_buffer_alloc(sizeof(struct playlistviewer));
-    char *ptr = strchr(wps_bufptr, '|');
+    char *ptr = strchr(wps_bufptr, '(');
     int length;
     if (!viewer || !ptr)
         return WPS_ERROR_INVALID_PARAM;
@@ -906,7 +910,7 @@ static int parse_playlistview(const char *wps_bufptr,
     viewer->show_icons = true;
     viewer->start_offset = atoi(ptr+1);
     token->value.data = (void*)viewer;
-    ptr = strchr(ptr+1, '|');
+    ptr = strchr(ptr+1, ',');
     length = parse_playlistview_text(viewer, TRACK_HAS_INFO, ptr);
     if (length < 0)
         return WPS_ERROR_INVALID_PARAM;
@@ -944,7 +948,7 @@ static int parse_viewport(const char *wps_bufptr,
 
     if (*ptr == 'i')
     {
-        if (*(ptr+1) == '|')
+        if (*(ptr+1) == '(')
         {
             char label = *(ptr+2);
             if (label >= 'a' && label <= 'z')
@@ -955,9 +959,11 @@ static int parse_viewport(const char *wps_bufptr,
             }
             else
             {
+                if (label != '-')
+                    return WPS_ERROR_INVALID_PARAM;
                 skin_vp->label = VP_INFO_LABEL|VP_DEFAULT_LABEL;
                 skin_vp->hidden_flags = VP_NEVER_VISIBLE;
-                ++ptr;            
+                ptr += 3;
             }
         }
         else
@@ -966,7 +972,7 @@ static int parse_viewport(const char *wps_bufptr,
     }
     else if (*ptr == 'l')
     {
-        if (*(ptr+1) == '|')
+        if (*(ptr+1) == '(')
         {
             char label = *(ptr+2);
             if (label >= 'a' && label <= 'z')
@@ -979,17 +985,17 @@ static int parse_viewport(const char *wps_bufptr,
             ptr += 3;
         }
     }
-    if (*ptr != '|')
+    if (*ptr != ',' && *ptr != '(')
         return WPS_ERROR_INVALID_PARAM;
 
     ptr++;
     struct viewport *vp = &skin_vp->vp;
-    /* format: %V|x|y|width|height|font|fg_pattern|bg_pattern| */
-    if (!(ptr = viewport_parse_viewport(vp, curr_screen, ptr, '|')))
+    /* format: %V|x|y|width|height|font| */
+    if (!(ptr = viewport_parse_viewport(vp, curr_screen, ptr, ',')))
         return WPS_ERROR_INVALID_PARAM;
 
-    /* Check for trailing | */
-    if (*ptr != '|')
+    /* Check for trailing ) */
+    if (*ptr != ')')
         return WPS_ERROR_INVALID_PARAM;
 
     if (follow_lang_direction && lang_is_rtl())
@@ -999,6 +1005,11 @@ static int parse_viewport(const char *wps_bufptr,
     }
     else
         vp->flags &= ~VP_FLAG_ALIGN_RIGHT; /* ignore right-to-left languages */
+        
+#if (LCD_DEPTH > 1) || (defined(HAVE_REMOTE_LCD) && (LCD_REMOTE_DEPTH > 1))
+    skin_vp->start_fgcolour = vp->fg_pattern;
+    skin_vp->start_bgcolour = vp->bg_pattern;
+#endif
 
     struct skin_token_list *list = new_skin_token_list_item(NULL, skin_vp);
     if (!list)
@@ -1008,8 +1019,30 @@ static int parse_viewport(const char *wps_bufptr,
     /* Skip the rest of the line */
     return skip_end_of_line(wps_bufptr);
 }
-
 #if (LCD_DEPTH > 1) || (defined(HAVE_REMOTE_LCD) && (LCD_REMOTE_DEPTH > 1))
+static int parse_viewportcolour(const char *wps_bufptr,
+        struct wps_token *token, struct wps_data *wps_data)
+{
+    (void)wps_data;
+    const char *ptr = wps_bufptr;
+    struct viewport_colour *colour = skin_buffer_alloc(sizeof(struct viewport_colour));
+    int set;
+    if (*ptr != '(' || !colour)
+        return -1;
+    ptr++;
+    if (!(ptr = parse_list("c", &set, ',', ptr, &colour->colour)))
+        return -1;
+    if (*ptr != ')')
+        return -1;
+    if (!set)
+        colour->colour = get_viewport_default_colour(curr_screen,
+                                        token->type == WPS_TOKEN_VIEWPORT_FGCOLOUR);
+    colour->vp = &curr_vp->vp;
+    token->value.data = colour;
+    ptr++;
+    return ptr - wps_bufptr;
+}
+
 static int parse_image_special(const char *wps_bufptr,
                                struct wps_token *token,
                                struct wps_data *wps_data)
@@ -1020,7 +1053,7 @@ static int parse_image_special(const char *wps_bufptr,
     const char *newline;
     bool error = false;
 
-    pos = strchr(wps_bufptr + 1, '|');
+    pos = strchr(wps_bufptr + 1, ')');
     newline = strchr(wps_bufptr, '\n');
 
     error = (pos > newline);
@@ -1029,7 +1062,7 @@ static int parse_image_special(const char *wps_bufptr,
     if (token->type == WPS_TOKEN_IMAGE_BACKDROP)
     {
         /* format: %X|filename.bmp| or %Xd */
-        if (*(wps_bufptr) == 'd')
+        if (*(wps_bufptr+1) == 'd')
         {
             wps_data->backdrop = NULL;
             return skip_end_of_line(wps_bufptr);
@@ -1063,10 +1096,10 @@ static int parse_setting_and_lang(const char *wps_bufptr,
     char temp[64];
 
     /* Find the setting's cfg_name */
-    if (*ptr != '|')
+    if (*ptr != '(')
         return WPS_ERROR_INVALID_PARAM;
     ptr++;
-    end = strchr(ptr,'|');
+    end = strchr(ptr,')');
     if (!end || (size_t)(end-ptr+1) > sizeof temp)
         return WPS_ERROR_INVALID_PARAM;
     strlcpy(temp, ptr,end-ptr+1);
@@ -1103,10 +1136,12 @@ static int parse_dir_level(const char *wps_bufptr,
                            struct wps_token *token,
                            struct wps_data *wps_data)
 {
-    char val[] = { *wps_bufptr, '\0' };
+    char val[] = { wps_bufptr[1], '\0' };
+    if (wps_bufptr[0] != '(' || wps_bufptr[2] != ')')
+        return WPS_ERROR_INVALID_PARAM;
     token->value.i = atoi(val);
     (void)wps_data; /* Kill warnings */
-    return 1;
+    return 3;
 }
 
 static int parse_timeout(const char *wps_bufptr,
@@ -1119,28 +1154,31 @@ static int parse_timeout(const char *wps_bufptr,
     bool have_tenth = false;
 
     (void)wps_data; /* Kill the warning */
-
-    while ( isdigit(*wps_bufptr) || *wps_bufptr == '.' )
+    if (*wps_bufptr == '(')
     {
-        if (*wps_bufptr != '.')
+        while ( isdigit(*wps_bufptr) || *wps_bufptr == '.' )
         {
-            val *= 10;
-            val += *wps_bufptr - '0';
-            if (have_point)
+            if (*wps_bufptr != '.')
             {
-                have_tenth = true;
-                wps_bufptr++;
-                skip++;
-                break;
+                val *= 10;
+                val += *wps_bufptr - '0';
+                if (have_point)
+                {
+                    have_tenth = true;
+                    wps_bufptr++;
+                    skip++;
+                    break;
+                }
             }
-        }
-        else
-            have_point = true;
+            else
+                have_point = true;
 
-        wps_bufptr++;
-        skip++;
+            wps_bufptr++;
+            skip++;
+        }
+        if (*wps_bufptr != ')')
+            return -1;
     }
-
     if (have_tenth == false)
         val *= 10;
 
@@ -1203,7 +1241,7 @@ static int parse_progressbar(const char *wps_bufptr,
     pb->follow_lang_direction = follow_lang_direction > 0;
     pb->draw = false;
 
-    if (*wps_bufptr != '|') /* regular old style */
+    if (*wps_bufptr != '(') /* regular old style */
     {
         pb->x = 0;
         pb->width = vp->width;
@@ -1217,7 +1255,7 @@ static int parse_progressbar(const char *wps_bufptr,
     }
     ptr = wps_bufptr + 1;
 
-    if (!(ptr = parse_list("sdddd", &set, '|', ptr, &filename,
+    if (!(ptr = parse_list("sdddd", &set, ',', ptr, &filename,
                                                  &x, &y, &width, &height)))
     {
         /* If we are in a conditional then we probably don't want to fail
@@ -1298,9 +1336,8 @@ static int parse_progressbar(const char *wps_bufptr,
 #ifdef HAVE_ALBUMART
 static int parse_int(const char *newline, const char **_pos, int *num)
 {
-    *_pos = parse_list("d", NULL, '|', *_pos, num);
-
-    return (!*_pos || *_pos > newline || **_pos != '|');
+    *_pos = parse_list("d", NULL, ',', *_pos, num);
+    return (!*_pos || *_pos > newline || (**_pos != ',' && **_pos != ')'));
 }
 
 static int parse_albumart_load(const char *wps_bufptr,
@@ -1330,7 +1367,7 @@ static int parse_albumart_load(const char *wps_bufptr,
 
     _pos = wps_bufptr;
 
-    if (*_pos != '|')
+    if (*_pos != '(')
         return WPS_ERROR_INVALID_PARAM; /* malformed token: e.g. %Cl7  */
 
     ++_pos;
@@ -1387,7 +1424,7 @@ static int parse_albumart_load(const char *wps_bufptr,
         }
     }
     /* extract max width data */
-    if (*_pos != '|')
+    if (*_pos != ',')
     {
         if (parse_int(newline, &_pos, &aa->width))
             return WPS_ERROR_INVALID_PARAM;
@@ -1429,7 +1466,7 @@ static int parse_albumart_load(const char *wps_bufptr,
         }
     }
     /* extract max height data */
-    if (*_pos != '|')
+    if (*_pos != ',')
     {
         if (parse_int(newline, &_pos, &aa->height))
             return WPS_ERROR_INVALID_PARAM;
@@ -1537,15 +1574,15 @@ static int parse_touchregion(const char *wps_bufptr,
     */
 
 
-    if (*ptr != '|')
+    if (*ptr != '(')
         return WPS_ERROR_INVALID_PARAM;
     ptr++;
 
-    if (!(ptr = parse_list("dddds", NULL, '|', ptr, &x, &y, &w, &h, &action)))
+    if (!(ptr = parse_list("dddds", NULL, ',', ptr, &x, &y, &w, &h, &action)))
         return WPS_ERROR_INVALID_PARAM;
 
     /* Check there is a terminating | */
-    if (*ptr != '|')
+    if (*ptr != ')')
         return WPS_ERROR_INVALID_PARAM;
 
     region = skin_buffer_alloc(sizeof(struct touchregion));
@@ -1561,7 +1598,7 @@ static int parse_touchregion(const char *wps_bufptr,
     region->wvp = curr_vp;
     region->armed = false;
 
-    end = strchr(action, '|');
+    end = strchr(action, ')');
     if (!end || (size_t)(end-action+1) > sizeof temp)
         return WPS_ERROR_INVALID_PARAM;
     strlcpy(temp, action, end-action+1);
@@ -1621,6 +1658,9 @@ static int parse_token(const char *wps_bufptr, struct wps_data *wps_data)
         case '>':
         case ';':
         case '#':
+        case ')':
+        case '(':
+        case ',':
             /* escaped characters */
             token->type = WPS_TOKEN_CHARACTER;
             token->value.c = *wps_bufptr;
@@ -2276,6 +2316,10 @@ bool skin_data_load(enum screen_type screen, struct wps_data *wps_data,
     curr_vp->lines         = NULL;
     
     viewport_set_defaults(&curr_vp->vp, screen);
+#if (LCD_DEPTH > 1) || (defined(HAVE_REMOTE_LCD) && (LCD_REMOTE_DEPTH > 1))
+    curr_vp->start_fgcolour = curr_vp->vp.fg_pattern;
+    curr_vp->start_bgcolour = curr_vp->vp.bg_pattern;
+#endif
 #ifdef HAVE_LCD_BITMAP
     curr_vp->vp.font = FONT_UI;
 #endif
diff --git a/apps/gui/skin_engine/skin_tokens.h b/apps/gui/skin_engine/skin_tokens.h
index f25b123d9d..47311312db 100644
--- a/apps/gui/skin_engine/skin_tokens.h
+++ b/apps/gui/skin_engine/skin_tokens.h
@@ -56,6 +56,8 @@ enum wps_token_type {
     WPS_VIEWPORT_ENABLE,
     WPS_VIEWPORT_CUSTOMLIST,
     WPS_TOKEN_UIVIEWPORT_ENABLE,
+    WPS_TOKEN_VIEWPORT_FGCOLOUR,
+    WPS_TOKEN_VIEWPORT_BGCOLOUR,
     
     /* Battery */
   TOKEN_MARKER_BATTERY,
diff --git a/apps/gui/skin_engine/wps_internals.h b/apps/gui/skin_engine/wps_internals.h
index 945932a125..5501dd580b 100644
--- a/apps/gui/skin_engine/wps_internals.h
+++ b/apps/gui/skin_engine/wps_internals.h
@@ -209,8 +209,13 @@ struct skin_viewport {
     struct skin_line *lines;
     char hidden_flags;
     char label;
+    unsigned start_fgcolour;
+    unsigned start_bgcolour;
+};
+struct viewport_colour {
+    struct viewport *vp;
+    unsigned colour;
 };
-
 #ifdef HAVE_TOUCHSCREEN
 struct touchregion {
     struct skin_viewport* wvp;/* The viewport this region is in */
diff --git a/apps/gui/statusbar-skinned.c b/apps/gui/statusbar-skinned.c
index a53555a291..fcd4cfbd9e 100644
--- a/apps/gui/statusbar-skinned.c
+++ b/apps/gui/statusbar-skinned.c
@@ -200,7 +200,7 @@ void sb_create_from_settings(enum screen_type screen)
         {
             y = screens[screen].lcdheight - STATUSBAR_HEIGHT;
         }
-        len = snprintf(ptr, remaining, "%%V|0|%d|-|%d|0|-|-|\n%%wi\n", 
+        len = snprintf(ptr, remaining, "%%V(0,%d,-,%d,0)\n%%wi\n", 
                        y, height);
         remaining -= len;
         ptr += len;
@@ -215,9 +215,7 @@ void sb_create_from_settings(enum screen_type screen)
     
     if (ptr2[0] && ptr2[0] != '-') /* from ui viewport setting */
     {
-        len = snprintf(ptr, remaining, "%%ax%%Vi|%s|\n", ptr2);
-        while ((ptr2 = strchr(ptr, ',')))
-            *ptr2 = '|';
+        len = snprintf(ptr, remaining, "%%ax%%Vi(-,%s)\n", ptr2);
     }
     else
     {
@@ -232,7 +230,7 @@ void sb_create_from_settings(enum screen_type screen)
             default:
                 height = screens[screen].lcdheight;
         }
-        len = snprintf(ptr, remaining, "%%ax%%Vi|0|%d|-|%d|1|-|-|\n", 
+        len = snprintf(ptr, remaining, "%%ax%%Vi(-,0,%d,-,%d,1)\n", 
                        y, height);
     }
     sb_skin_data_load(screen, buf, false);
diff --git a/apps/gui/viewport.c b/apps/gui/viewport.c
index a100d56cd5..8731015c79 100644
--- a/apps/gui/viewport.c
+++ b/apps/gui/viewport.c
@@ -376,6 +376,34 @@ void viewport_set_defaults(struct viewport *vp,
 
 
 #ifdef HAVE_LCD_BITMAP
+
+int get_viewport_default_colour(enum screen_type screen, bool fgcolour)
+{
+    (void)screen;
+    int colour;
+#if (LCD_DEPTH > 1) || (defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1)
+    if (fgcolour)
+    {
+#if (defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1)
+        if (screen == SCREEN_REMOTE)
+            colour = REMOTE_FG_FALLBACK;
+        else
+#endif
+            colour = global_settings.fg_color;
+    }
+    else
+    {
+#if (defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1)
+        if (screen == SCREEN_REMOTE)
+            colour = REMOTE_BG_FALLBACK;
+        else
+#endif
+            colour = global_settings.bg_color;
+    }
+#endif /* LCD_DEPTH > 1 || LCD_REMOTE_DEPTH > 1 */
+    return colour;
+}
+
 const char* viewport_parse_viewport(struct viewport *vp,
                                     enum screen_type screen,
                                     const char *bufptr,
@@ -383,7 +411,6 @@ const char* viewport_parse_viewport(struct viewport *vp,
 {
     /* parse the list to the viewport struct */
     const char *ptr = bufptr;
-    int depth;
     uint32_t set = 0;
 
     enum {
@@ -392,33 +419,11 @@ const char* viewport_parse_viewport(struct viewport *vp,
         PL_WIDTH,
         PL_HEIGHT,
         PL_FONT,
-        PL_FG,
-        PL_BG,
     };
     
-    /* Work out the depth of this display */
-    depth = screens[screen].depth;
-#if (LCD_DEPTH == 1) || (defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH == 1)
-    if (depth == 1)
-    {
-        if (!(ptr = parse_list("ddddd", &set, separator, ptr,
-                    &vp->x, &vp->y, &vp->width, &vp->height, &vp->font)))
-            return NULL;
-    }
-    else
-#endif
-#if (LCD_DEPTH > 1) || (defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1)
-    if (depth >= 2)
-    {
-        if (!(ptr = parse_list(ARG_STRING(depth), &set, separator, ptr,
-                    &vp->x, &vp->y, &vp->width, &vp->height, &vp->font,
-                    &vp->fg_pattern,&vp->bg_pattern)))
-            return NULL;
-    }
-    else
-#endif
-    {}
-#undef ARG_STRING
+    if (!(ptr = parse_list("ddddd", &set, separator, ptr,
+                &vp->x, &vp->y, &vp->width, &vp->height, &vp->font)))
+        return NULL;
 
     /* X and Y *must* be set */
     if (!LIST_VALUE_PARSED(set, PL_X) || !LIST_VALUE_PARSED(set, PL_Y))
@@ -441,24 +446,8 @@ const char* viewport_parse_viewport(struct viewport *vp,
         vp->height = (vp->height + screens[screen].lcdheight) - vp->y;
 
 #if (LCD_DEPTH > 1) || (defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1)
-    if (!LIST_VALUE_PARSED(set, PL_FG))
-    {
-#if (defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1)
-        if (screen == SCREEN_REMOTE)
-            vp->fg_pattern = REMOTE_FG_FALLBACK;
-        else
-#endif
-            vp->fg_pattern = FG_FALLBACK;
-    }
-    if (!LIST_VALUE_PARSED(set, PL_BG))
-    {
-#if (defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1)
-        if (screen == SCREEN_REMOTE)
-            vp->bg_pattern = REMOTE_BG_FALLBACK;
-        else
-#endif
-            vp->bg_pattern = BG_FALLBACK;
-    }
+    vp->fg_pattern = get_viewport_default_colour(screen, true);
+    vp->bg_pattern = get_viewport_default_colour(screen, false);
 #endif /* LCD_DEPTH > 1 || LCD_REMOTE_DEPTH > 1 */
 
 #ifdef HAVE_LCD_COLOR
diff --git a/apps/gui/viewport.h b/apps/gui/viewport.h
index 6a4dd02654..943cac2451 100644
--- a/apps/gui/viewport.h
+++ b/apps/gui/viewport.h
@@ -48,6 +48,7 @@ void viewport_set_defaults(struct viewport *vp,
                             const enum screen_type screen);
 void viewport_set_fullscreen(struct viewport *vp,
                               const enum screen_type screen);
+int get_viewport_default_colour(enum screen_type screen, bool fgcolour);
 
 #ifdef HAVE_LCD_BITMAP
 void viewportmanager_theme_enable(enum screen_type screen, bool enable,
diff --git a/apps/gui/wps.c b/apps/gui/wps.c
index 7b84782477..fa97e50897 100644
--- a/apps/gui/wps.c
+++ b/apps/gui/wps.c
@@ -129,26 +129,26 @@ void wps_data_load(enum screen_type screen, const char *buf, bool isfile)
         char *skin_buf[NB_SCREENS] = {
 #ifdef HAVE_LCD_BITMAP
 #if LCD_DEPTH > 1
-            "%Xd\n"
+            "%X(d)\n"
 #endif
             "%s%?it<%?in<%in. |>%it|%fn>\n"
-            "%s%?ia<%ia|%?d2<%d2|(root)>>\n"
-            "%s%?id<%id|%?d1<%d1|(root)>> %?iy<(%iy)|>\n\n"
+            "%s%?ia<%ia|%?d(2)<%d(2)|%(root%)>>\n"
+            "%s%?id<%id|%?d(1)<%d(1)|%(root%)>> %?iy<%(%iy%)|>\n\n"
             "%al%pc/%pt%ar[%pp:%pe]\n"
-            "%fbkBit %?fv<avg|> %?iv<(id3v%iv)|(no id3)>\n"
+            "%fbkBit %?fv<avg|> %?iv<%(id3v%iv%)|%(no id3%)>\n"
             "%pb\n%pm\n",
 #else
-            "%s%pp/%pe: %?it<%it|%fn> - %?ia<%ia|%d2> - %?id<%id|%d1>\n"
+            "%s%pp/%pe: %?it<%it|%fn> - %?ia<%ia|%d(2)> - %?id<%id|%d(1)>\n"
             "%pc%?ps<*|/>%pt\n",
 #endif
 #ifdef HAVE_REMOTE_LCD
 #if LCD_REMOTE_DEPTH > 1
-            "%Xd\n"
+            "%X(d)\n"
 #endif
-            "%s%?ia<%ia|%?d2<%d2|(root)>>\n"
+            "%s%?ia<%ia|%?d(2)<%d(2)|%(root%)>>\n"
             "%s%?it<%?in<%in. |>%it|%fn>\n"
             "%al%pc/%pt%ar[%pp:%pe]\n"
-            "%fbkBit %?fv<avg|> %?iv<(id3v%iv)|(no id3)>\n"
+            "%fbkBit %?fv<avg|> %?iv<%(id3v%iv%)|%(no id3%)>\n"
             "%pb\n",
 #endif
         };
diff --git a/apps/misc.c b/apps/misc.c
index 747abe076b..d0300f0a4f 100644
--- a/apps/misc.c
+++ b/apps/misc.c
@@ -967,6 +967,7 @@ const char* parse_list(const char *fmt, uint32_t *set_vals,
     const char** s;
     int* d;
     bool set, is_negative;
+    bool is_last_var;
     int i=0;
 
     va_start(ap, str);
@@ -981,6 +982,7 @@ const char* parse_list(const char *fmt, uint32_t *set_vals,
                 goto err;
             p++;
         }
+        is_last_var = fmt[1] == '\0';
         set = false;
         switch (*fmt++) 
         {
@@ -988,9 +990,9 @@ const char* parse_list(const char *fmt, uint32_t *set_vals,
                 s = va_arg(ap, const char **);
 
                 *s = p;
-                while (*p && *p != sep)
+                while (*p && *p != sep && *p != ')')
                     p++;
-                set = (s[0][0]!='-') && (s[0][1]!=sep) ;
+                set = (s[0][0]!='-') && (s[0][1]!=sep && s[0][1]!=')') ;
                 break;
 
             case 'd': /* int */
@@ -1028,7 +1030,7 @@ const char* parse_list(const char *fmt, uint32_t *set_vals,
                 {
                     if (!set_vals || *p != '-')
                         goto err;
-                    while (*p && *p != sep)
+                    while (*p && *p != sep && (!is_last_var || (is_last_var && *p!=')')))
                         p++;
                 }
                 else
@@ -1053,7 +1055,7 @@ const char* parse_list(const char *fmt, uint32_t *set_vals,
                     goto err;
                 else
                 {
-                    while (*p && *p != sep)
+                    while (*p && *p != sep && (!is_last_var || (is_last_var && *p!=')')))
                         p++;
                 }
 
diff --git a/apps/radio/radio_skin.c b/apps/radio/radio_skin.c
index 2185c96b6c..838d1f96da 100644
--- a/apps/radio/radio_skin.c
+++ b/apps/radio/radio_skin.c
@@ -46,11 +46,11 @@ void fms_data_load(enum screen_type screen, const char *buf, bool isfile)
     if (!success ) /* load the default */
     {  
         const char default_fms[] =  "%s%?Ti<%Ti. |>%?Tn<%Tn|%Tf>\n"
-                                    "%Sx|Station:| %tf MHz\n"
-                                    "%?St|force fm mono|<%Sx|Force Mono||%?ts<%Sx|Stereo||%Sx|Mono|>>\n"
-                                    "%Sx|Mode:| %?tm<%Sx|Scan||%Sx|Preset|>\n"
+                                    "%Sx(Station:) %tf MHz\n"
+                                    "%?St(force fm mono)<%Sx(Force Mono)|%?ts<%Sx(Stereo)|%Sx(Mono)>>\n"
+                                    "%Sx(Mode:) %?tm<%Sx(Scan)|%Sx(Preset)>\n"
 #if CONFIG_CODEC != SWCODEC && !defined(SIMULATOR)
-                                    "%?Rr<%Sx|Time:| %Rh:%Rn:%Rs|%?St|prerecording time|<%pm|%Sx|Prerecord Time| %Rs>>\n"
+                                    "%?Rr<%Sx(Time:) %Rh:%Rn:%Rs|%?St(prerecording time)<%pm|%Sx(Prerecord Time) %Rs>>\n"
 #endif
                                     "%pb\n"
 #ifdef HAVE_RDS_CAP
diff --git a/wps/DancePuffDuo.128x64x1.wps b/wps/DancePuffDuo.128x64x1.wps
index ddf417efbf..080fe281d2 100644
--- a/wps/DancePuffDuo.128x64x1.wps
+++ b/wps/DancePuffDuo.128x64x1.wps
@@ -1,14 +1,14 @@
-%x|a|bg-r.bmp|0|0|
-%xl|A|playmode.bmp|59|0|5|
-%xl|B|repeat.bmp|114|0|4|
-%xl|C|Shf.bmp|101|0|
-%xl|D|Pow.bmp|5|53|
-%xl|E|battery.bmp|0|53|5|
-%xl|F|HoldM.bmp|36|0|
-%xl|G|HoldR.bmp|47|0|
+%x(a,bg-r.bmp,0,0)
+%xl(A,playmode.bmp,59,0,5)
+%xl(B,repeat.bmp,114,0,4)
+%xl(C,Shf.bmp,101,0)
+%xl(D,Pow.bmp,5,53)
+%xl(E,battery.bmp,0,53,5)
+%xl(F,HoldM.bmp,36,0)
+%xl(G,HoldR.bmp,47,0)
 %wd
-%al   %pv%?mh<%xdF|>%?mr<%xdG|>%ac%?mp<%xdAa|%xdAb|%xdAc|%xdAd|%xdAe>%?mm<|%xdBa|%xdBb|%xdBc|%xdBd>%?ps<%xdC|>
+%al   %pv%?mh<%xd(F)|>%?mr<%xd(G)|>%ac%?mp<%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)>%?mm<|%xd(Ba)|%xd(Bb)|%xd(Bc)|%xd(Bd)>%?ps<%xd(C)|>
 %ac%s%?in<%in. |>%?it<%it|%fn>
-%t3%ac%s%?ia<%ia|%d2>;%t3%ac%s%?id<%id|%d1>
+%t(3)%ac%s%?ia<%ia|%d(2)>%;%t(3)%ac%s%?id<%id|%d(1)>
 %pb
-%?bp<%xdD|%?bl<%xdEa|%xdEb|%xdEc|%xdEd|%xdEe>>     %bl%%%ar%pc/%pt
+%?bp<%xd(D)|%?bl<%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)|%xd(Ee)>>     %bl%%%ar%pc/%pt
diff --git a/wps/DancePuffDuo.160x128x1.wps b/wps/DancePuffDuo.160x128x1.wps
index acc65a8862..a413052508 100644
--- a/wps/DancePuffDuo.160x128x1.wps
+++ b/wps/DancePuffDuo.160x128x1.wps
@@ -1,27 +1,27 @@
-%x|a|bg.bmp|0|0|
-%xl|A|playmode.bmp|72|0|5|
-%xl|B|repeat.bmp|145|0|4|
-%xl|C|Shf.bmp|132|0|
-%xl|D|Pow.bmp|5|118|
-%xl|E|battery.bmp|0|118|5|
-%xl|F|DancePuff.bmp|129|65|4|
-%xl|G|DancePuff.bmp|5|65|4|
-%xl|H|HoldM.bmp|45|0|
-%xl|I|HoldR.bmp|56|0|
-%xl|J|rating.bmp|34|66|11|
-%xl|K|codec.bmp|70|66|22|
+%x(a,bg.bmp,0,0)
+%xl(A,playmode.bmp,72,0,5)
+%xl(B,repeat.bmp,145,0,4)
+%xl(C,Shf.bmp,132,0)
+%xl(D,Pow.bmp,5,118)
+%xl(E,battery.bmp,0,118,5)
+%xl(F,DancePuff.bmp,129,65,4)
+%xl(G,DancePuff.bmp,5,65,4)
+%xl(H,HoldM.bmp,45,0)
+%xl(I,HoldR.bmp,56,0)
+%xl(J,rating.bmp,34,66,11)
+%xl(K,codec.bmp,70,66,22)
 %wd
 %al   %pv
 %ac%s%?in<%in. |>%?it<%it|%fn>
-%ac%s%?ia<%ia|%d2>
-%ac%s%?id<%id|%d1>
-%ac%s%t2%?ig<%ig|> %?iy<(%iy)|>
+%ac%s%?ia<%ia|%d(2)>
+%ac%s%?id<%id|%d(1)>
+%ac%s%t(2)%?ig<%ig|> %?iy<%(%iy%)|>
 
-%t0.2%xdGc%xdFa%ac%pc/%pt;%t0.2%xdGd%xdFb%ac%pc/%pt;%t0.2%xdGc%xdFa%ac%pc/%pt;%t0.2%xdGd%xdFb%ac%pc/%pt;%t0.2%xdGa%xdFc%ac%pc/%pt;%t0.2%xdGb%xdFd%ac%pc/%pt;%t0.2%xdGa%xdFc%ac%pc/%pt;%t0.2%xdGb%xdFd%ac%pc/%pt
+%t(0.2)%xd(Gc)%xd(Fa)%ac%pc/%pt%;%t(0.2)%xd(Gd)%xd(Fb)%ac%pc/%pt%;%t(0.2)%xd(Gc)%xd(Fa)%ac%pc/%pt%;%t(0.2)%xd(Gd)%xd(Fb)%ac%pc/%pt%;%t(0.2)%xd(Ga)%xd(Fc)%ac%pc/%pt%;%t(0.2)%xd(Gb)%xd(Fd)%ac%pc/%pt%;%t(0.2)%xd(Ga)%xd(Fc)%ac%pc/%pt%;%t(0.2)%xd(Gb)%xd(Fd)%ac%pc/%pt
 %pb
-%ac%s%?In<%In. |>%?It<%It - |%Fn >%?Id<%Id |%D1 >
+%ac%s%?In<%In. |>%?It<%It - |%Fn >%?Id<%Id |%D(1) >
 %?bt<     %bt>%ar%?pp<[%pp/%pe]>
-%?mh<%xdH|>%?mr<%xdI|>%?mp<%xdAa|%xdAb|%xdAc|%xdAd|%xdAe>%?mm<|%xdBa|%xdBb|%xdBc|%xdBd>%?ps<%xdC|>
-%?bp<%xdD|%?bl<%xdEa|%xdEb|%xdEc|%xdEd|%xdEe>>
-%?rr<%xdJa|%xdJb|%xdJc|%xdJd|%xdJe|%xdJf|%xdJg|%xdJh|%xdJi|%xdJj|%xdJk>#escape line ending to not break drawing but break long line
-%?fc<%xdKa|%xdKb|%xdKc|%xdKd|%xdKe|%xdKf|%xdKg|%xdKh|%xdKi|%xdKj|%xdKk|%xdKl|%xdKm|%xdKn|%xdKo|%xdKp|%xdKq|%xdKr|%xdKs|%xdKt|%xdKu|%xdKv>
+%?mh<%xd(H)|>%?mr<%xd(I)|>%?mp<%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)>%?mm<|%xd(Ba)|%xd(Bb)|%xd(Bc)|%xd(Bd)>%?ps<%xd(C)|>
+%?bp<%xd(D)|%?bl<%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)|%xd(Ee)>>
+%?rr<%xd(Ja)|%xd(Jb)|%xd(Jc)|%xd(Jd)|%xd(Je)|%xd(Jf)|%xd(Jg)|%xd(Jh)|%xd(Ji)|%xd(Jj)|%xd(Jk)>#escape line ending to not break drawing but break long line
+%?fc<%xd(Ka)|%xd(Kb)|%xd(Kc)|%xd(Kd)|%xd(Ke)|%xd(Kf)|%xd(Kg)|%xd(Kh)|%xd(Ki)|%xd(Kj)|%xd(Kk)|%xd(Kl)|%xd(Km)|%xd(Kn)|%xd(Ko)|%xd(Kp)|%xd(Kq)|%xd(Kr)|%xd(Ks)|%xd(Kt)|%xd(Ku)|%xd(Kv)>
diff --git a/wps/DancePuffDuo.176x220x1.wps b/wps/DancePuffDuo.176x220x1.wps
index 1c394c2a1b..89465b6649 100644
--- a/wps/DancePuffDuo.176x220x1.wps
+++ b/wps/DancePuffDuo.176x220x1.wps
@@ -1,38 +1,38 @@
-%x|a|bg-176x220.bmp|0|0|
-%xl|A|playmode.bmp|82|0|5|
-%xl|B|repeat.bmp|205|0|4|
-%xl|C|Shf.bmp|192|0|
-%xl|D|Pow.bmp|5|157|
-%xl|E|battery.bmp|0|209|5|
-%xl|F|DancePuff.bmp|140|90|4|
-%xl|G|DancePuff.bmp|9|90|4|
-%xl|H|HoldM.bmp|45|0|
-%xl|I|HoldR.bmp|56|0|
-%xl|J|rating.bmp|42|90|11|
-%xl|K|codec.bmp|78|90|22|
+%x(a,bg-176x220.bmp,0,0)
+%xl(A,playmode.bmp,82,0,5)
+%xl(B,repeat.bmp,205,0,4)
+%xl(C,Shf.bmp,192,0)
+%xl(D,Pow.bmp,5,157)
+%xl(E,battery.bmp,0,209,5)
+%xl(F,DancePuff.bmp,140,90,4)
+%xl(G,DancePuff.bmp,9,90,4)
+%xl(H,HoldM.bmp,45,0)
+%xl(I,HoldR.bmp,56,0)
+%xl(J,rating.bmp,42,90,11)
+%xl(K,codec.bmp,78,90,22)
 %wd
 %al   %pv
 
 %ac%s%?in<%in. |>%?it<%it|%fn>
-%ac%s%?ia<%ia|%d2>
-%ac%s%?id<%id|%d1>
-%ac%s%t2%?ig<%ig|> %?iy<(%iy)|>
+%ac%s%?ia<%ia|%d(2)>
+%ac%s%?id<%id|%d(1)>
+%ac%s%t(2)%?ig<%ig|> %?iy<%(%iy%)|>
 
 
-%t0.2%xdGc%xdFa%ac%pc/%pt;%t0.2%xdGd%xdFb%ac%pc/%pt;%t0.2%xdGc%xdFa%ac%pc/%pt;%t0.2%xdGd%xdFb%ac%pc/%pt;%t0.2%xdGa%xdFc%ac%pc/%pt;%t0.2%xdGb%xdFd%ac%pc/%pt;%t0.2%xdGa%xdFc%ac%pc/%pt;%t0.2%xdGb%xdFd%ac%pc/%pt
+%t(0.2)%xd(Gc)%xd(Fa)%ac%pc/%pt%;%t(0.2)%xd(Gd)%xd(Fb)%ac%pc/%pt%;%t(0.2)%xd(Gc)%xd(Fa)%ac%pc/%pt%;%t(0.2)%xd(Gd)%xd(Fb)%ac%pc/%pt%;%t(0.2)%xd(Ga)%xd(Fc)%ac%pc/%pt%;%t(0.2)%xd(Gb)%xd(Fd)%ac%pc/%pt%;%t(0.2)%xd(Ga)%xd(Fc)%ac%pc/%pt%;%t(0.2)%xd(Gb)%xd(Fd)%ac%pc/%pt
 %pb
 
-%ac%s%Sx|Next Track:|
+%ac%s%Sx(Next Track:)
 %ac%s%?In<%In. |>%?It<%It|%Fn>
-%ac%s%?Ia<%Ia|%D2>
-%ac%s%?Id<%Id|%D1>
+%ac%s%?Ia<%Ia|%D(2)>
+%ac%s%?Id<%Id|%D(1)>
 
 %?bt<     %bt>%ar%?pp<[%pp/%pe]>
 
 
 
 
-%?mh<%xdH|>%?mr<%xdI|>%?mp<%xdAa|%xdAb|%xdAc|%xdAd|%xdAe>%?mm<|%xdBa|%xdBb|%xdBc|%xdBd>%?ps<%xdC|>
-%?bp<%xdD|%?bl<%xdEa|%xdEb|%xdEc|%xdEd|%xdEe>>
-%?rr<%xdJa|%xdJb|%xdJc|%xdJd|%xdJe|%xdJf|%xdJg|%xdJh|%xdJi|%xdJj|%xdJk>#escape line ending to not break drawing but break long line
-%?fc<%xdKa|%xdKb|%xdKc|%xdKd|%xdKe|%xdKf|%xdKg|%xdKh|%xdKi|%xdKj|%xdKk|%xdKl|%xdKm|%xdKn|%xdKo|%xdKp|%xdKq|%xdKr|%xdKs|%xdKt|%xdKu|%xdKv>
+%?mh<%xd(H)|>%?mr<%xd(I)|>%?mp<%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)>%?mm<|%xd(Ba)|%xd(Bb)|%xd(Bc)|%xd(Bd)>%?ps<%xd(C)|>
+%?bp<%xd(D)|%?bl<%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)|%xd(Ee)>>
+%?rr<%xd(Ja)|%xd(Jb)|%xd(Jc)|%xd(Jd)|%xd(Je)|%xd(Jf)|%xd(Jg)|%xd(Jh)|%xd(Ji)|%xd(Jj)|%xd(Jk)>#escape line ending to not break drawing but break long line
+%?fc<%xd(Ka)|%xd(Kb)|%xd(Kc)|%xd(Kd)|%xd(Ke)|%xd(Kf)|%xd(Kg)|%xd(Kh)|%xd(Ki)|%xd(Kj)|%xd(Kk)|%xd(Kl)|%xd(Km)|%xd(Kn)|%xd(Ko)|%xd(Kp)|%xd(Kq)|%xd(Kr)|%xd(Ks)|%xd(Kt)|%xd(Ku)|%xd(Kv)>
diff --git a/wps/DancePuffDuo.220x176x1.wps b/wps/DancePuffDuo.220x176x1.wps
index 00a47d17c2..420ef07cd2 100644
--- a/wps/DancePuffDuo.220x176x1.wps
+++ b/wps/DancePuffDuo.220x176x1.wps
@@ -1,30 +1,30 @@
-%x|a|bg-220x176.bmp|0|0|
-%xl|A|playmode.bmp|102|0|5|
-%xl|B|repeat.bmp|205|0|4|
-%xl|C|Shf.bmp|192|0|
-%xl|D|Pow.bmp|5|157|
-%xl|E|battery.bmp|0|157|5|
-%xl|F|DancePuff.bmp|180|90|4|
-%xl|G|DancePuff.bmp|14|90|4|
-%xl|H|HoldM.bmp|45|0|
-%xl|I|HoldR.bmp|56|0|
-%xl|J|rating.bmp|64|90|11|
-%xl|K|codec.bmp|100|90|22|
+%x(a,bg-220x176.bmp,0,0)
+%xl(A,playmode.bmp,102,0,5)
+%xl(B,repeat.bmp,205,0,4)
+%xl(C,Shf.bmp,192,0)
+%xl(D,Pow.bmp,5,157)
+%xl(E,battery.bmp,0,157,5)
+%xl(F,DancePuff.bmp,180,90,4)
+%xl(G,DancePuff.bmp,14,90,4)
+%xl(H,HoldM.bmp,45,0)
+%xl(I,HoldR.bmp,56,0)
+%xl(J,rating.bmp,64,90,11)
+%xl(K,codec.bmp,100,90,22)
 %wd
 %al   %pv
 
 %ac%s%?in<%in. |>%?it<%it|%fn>
-%ac%s%?ia<%ia|%d2>
-%ac%s%?id<%id|%d1>
-%ac%s%t2%?ig<%ig|> %?iy<(%iy)|>
+%ac%s%?ia<%ia|%d(2)>
+%ac%s%?id<%id|%d(1)>
+%ac%s%t(2)%?ig<%ig|> %?iy<%(%iy%)|>
 
 
-%t0.2%xdGc%xdFa%ac%pc/%pt;%t0.2%xdGd%xdFb%ac%pc/%pt;%t0.2%xdGc%xdFa%ac%pc/%pt;%t0.2%xdGd%xdFb%ac%pc/%pt;%t0.2%xdGa%xdFc%ac%pc/%pt;%t0.2%xdGb%xdFd%ac%pc/%pt;%t0.2%xdGa%xdFc%ac%pc/%pt;%t0.2%xdGb%xdFd%ac%pc/%pt
+%t(0.2)%xd(Gc)%xd(Fa)%ac%pc/%pt%;%t(0.2)%xd(Gd)%xd(Fb)%ac%pc/%pt%;%t(0.2)%xd(Gc)%xd(Fa)%ac%pc/%pt%;%t(0.2)%xd(Gd)%xd(Fb)%ac%pc/%pt%;%t(0.2)%xd(Ga)%xd(Fc)%ac%pc/%pt%;%t(0.2)%xd(Gb)%xd(Fd)%ac%pc/%pt%;%t(0.2)%xd(Ga)%xd(Fc)%ac%pc/%pt%;%t(0.2)%xd(Gb)%xd(Fd)%ac%pc/%pt
 %pb
-%ac%s%?In<%In. |>%?It<%It - |%Fn >%?Id<%Id |%D1 >
+%ac%s%?In<%In. |>%?It<%It - |%Fn >%?Id<%Id |%D(1) >
 
 %?bt<     %bt>%ar%?pp<[%pp/%pe]>
-%?mh<%xdH|>%?mr<%xdI|>%?mp<%xdAa|%xdAb|%xdAc|%xdAd|%xdAe>%?mm<|%xdBa|%xdBb|%xdBc|%xdBd>%?ps<%xdC|>
-%?bp<%xdD|%?bl<%xdEa|%xdEb|%xdEc|%xdEd|%xdEe>>
-%?rr<%xdJa|%xdJb|%xdJc|%xdJd|%xdJe|%xdJf|%xdJg|%xdJh|%xdJi|%xdJj|%xdJk>#escape line ending to not break drawing but break long line
-%?fc<%xdKa|%xdKb|%xdKc|%xdKd|%xdKe|%xdKf|%xdKg|%xdKh|%xdKi|%xdKj|%xdKk|%xdKl|%xdKm|%xdKn|%xdKo|%xdKp|%xdKq|%xdKr|%xdKs|%xdKt|%xdKu|%xdKv>
+%?mh<%xd(H)|>%?mr<%xd(I)|>%?mp<%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)>%?mm<|%xd(Ba)|%xd(Bb)|%xd(Bc)|%xd(Bd)>%?ps<%xd(C)|>
+%?bp<%xd(D)|%?bl<%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)|%xd(Ee)>>
+%?rr<%xd(Ja)|%xd(Jb)|%xd(Jc)|%xd(Jd)|%xd(Je)|%xd(Jf)|%xd(Jg)|%xd(Jh)|%xd(Ji)|%xd(Jj)|%xd(Jk)>#escape line ending to not break drawing but break long line
+%?fc<%xd(Ka)|%xd(Kb)|%xd(Kc)|%xd(Kd)|%xd(Ke)|%xd(Kf)|%xd(Kg)|%xd(Kh)|%xd(Ki)|%xd(Kj)|%xd(Kk)|%xd(Kl)|%xd(Km)|%xd(Kn)|%xd(Ko)|%xd(Kp)|%xd(Kq)|%xd(Kr)|%xd(Ks)|%xd(Kt)|%xd(Ku)|%xd(Kv)>
diff --git a/wps/Rockboxed.112x64x1.wps b/wps/Rockboxed.112x64x1.wps
index 17a1223680..2453b04089 100644
--- a/wps/Rockboxed.112x64x1.wps
+++ b/wps/Rockboxed.112x64x1.wps
@@ -1,23 +1,23 @@
 # (C) 2007, Roan Horning <roan@horning.us>
 # License: GNU GPL v2 or later.
-%x|a|bg-mono-small.bmp|42|49|
+%x(a,bg-mono-small.bmp,42,49)
 %wd
-%xl|A|mode-mono-small.bmp|57|49|5|
-%xl|B|shuffle-mono-small.bmp|29|49|2|
-%xl|C|volume-mono-small.bmp|0|49|10|
-%xl|D|battery-mono-small.bmp|93|49|11|
-%xl|E|repeat-mono-small.bmp|43|49|5|
-%xl|F|lock-mono-small.bmp|70|49|2|
-%al%s%ac%?ia<%ia|%d2>%ar
-%al%s%ac%?id<%id|%d1>%ar
+%xl(A,mode-mono-small.bmp,57,49,5)
+%xl(B,shuffle-mono-small.bmp,29,49,2)
+%xl(C,volume-mono-small.bmp,0,49,10)
+%xl(D,battery-mono-small.bmp,93,49,11)
+%xl(E,repeat-mono-small.bmp,43,49,5)
+%xl(F,lock-mono-small.bmp,70,49,2)
+%al%s%ac%?ia<%ia|%d(2)>%ar
+%al%s%ac%?id<%id|%d(1)>%ar
 %al%s%ac%?it<%it|%fn>%ar
-%ac%t3%ig;%ac%iy
-%pb|-|10|-|92|5|
+%ac%t(3)%ig%;%ac%iy
+%pb(-,10,-,92,5)
 %al %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|unknown>%ar%pt 
-%?ps<%xdBa|%xdBb>
-%?mp<%xdAa|%xdAb|%xdAc|%xdAd|%xdAe>
-%?mm<%xdEa|%xdEb|%xdEc|%xdEd|%xdEe>
-%?mh<%xdFa|%xdFb>
-%?pv<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi|%xdCj>
-%?bl<%xdDa|%xdDb|%xdDc|%xdDd|%xdDe|%xdDf|%xdDg|%xdDh|%xdDi|%xdDj|%xdDk>
+%?ps<%xd(Ba)|%xd(Bb)>
+%?mp<%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)>
+%?mm<%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)|%xd(Ee)>
+%?mh<%xd(Fa)|%xd(Fb)>
+%?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)>
+%?bl<%xd(Da)|%xd(Db)|%xd(Dc)|%xd(Dd)|%xd(De)|%xd(Df)|%xd(Dg)|%xd(Dh)|%xd(Di)|%xd(Dj)|%xd(Dk)>
 
diff --git a/wps/Rockboxed.128x128x16.wps b/wps/Rockboxed.128x128x16.wps
index 66b47459ab..da36165118 100644
--- a/wps/Rockboxed.128x128x16.wps
+++ b/wps/Rockboxed.128x128x16.wps
@@ -1,24 +1,24 @@
 # (C) 2007, Roan Horning <roan@horning.us>
 # License: GNU GPL v2 or later.
 %wd
-%X|bg-128x128x16.bmp|
-%xl|A|mode-color-small.bmp|62|109|4|
-%xl|B|shuffle-color-small.bmp|34|109|
-%xl|C|volume-color-small.bmp|15|111|9|
-%xl|D|battery-color-small.bmp|101|113|12|
-%xl|E|repeat-color-small.bmp|47|109|4|
-%xl|F|lock-color.bmp|78|109|
+%X(bg-128x128x16.bmp)
+%xl(A,mode-color-small.bmp,62,109,4)
+%xl(B,shuffle-color-small.bmp,34,109)
+%xl(C,volume-color-small.bmp,15,111,9)
+%xl(D,battery-color-small.bmp,101,113,12)
+%xl(E,repeat-color-small.bmp,47,109,4)
+%xl(F,lock-color.bmp,78,109)
 
-%al %s%ac%?ia<%ia|%d2>%ar 
-%al %s%ac%?id<%id|%d1>%ar 
+%al %s%ac%?ia<%ia|%d(2)>%ar 
+%al %s%ac%?id<%id|%d(1)>%ar 
 %al %s%ac%?it<%it|%fn>%ar 
 
-%ac%t3%ig;%ac%iy 
-%pb|pg-108.bmp|10|76|108|5|
+%ac%t(3)%ig%;%ac%iy 
+%pb(pg-108.bmp,10,76,108,5)
 %al %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|nsf|speex|spc|ape|wma|unknown>%ar%pt 
-%?ps<%xdB>
-%?mp<%xdAb|%xdAa|%xdAb|%xdAc|%xdAd>
-%?mm<|%xdEa|%xdEb|%xdEc|%xdEd>
-%?mh<%xdF>
-%?pv<|%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi>
-%?bl<%xdDa|%xdDb|%xdDc|%xdDd|%xdDe|%xdDf|%xdDg|%xdDh|%xdDi|%xdDj|%xdDk|%xdDl>
+%?ps<%xd(B)>
+%?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)>
+%?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+%?mh<%xd(F)>
+%?pv<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)>
+%?bl<%xd(Da)|%xd(Db)|%xd(Dc)|%xd(Dd)|%xd(De)|%xd(Df)|%xd(Dg)|%xd(Dh)|%xd(Di)|%xd(Dj)|%xd(Dk)|%xd(Dl)>
diff --git a/wps/Rockboxed.132x80x16.wps b/wps/Rockboxed.132x80x16.wps
index c4ec5a1cea..24af5b553b 100644
--- a/wps/Rockboxed.132x80x16.wps
+++ b/wps/Rockboxed.132x80x16.wps
@@ -1,22 +1,22 @@
 # (C) 2007, Roan Horning <roan@horning.us>
 # License: GNU GPL v2 or later.
 %wd
-%X|bg-132x80x16.bmp|
-%xl|A|mode-color-small.bmp|62|65|4|
-%xl|B|shuffle-color-small.bmp|34|65|
-%xl|C|volume-color-small.bmp|15|67|9|
-%xl|D|battery-color-small.bmp|105|69|12|
-%xl|E|repeat-color-small.bmp|47|65|4|
-%xl|F|lock-color.bmp|82|65|
+%X(bg-132x80x16.bmp)
+%xl(A,mode-color-small.bmp,62,65,4)
+%xl(B,shuffle-color-small.bmp,34,65)
+%xl(C,volume-color-small.bmp,15,67,9)
+%xl(D,battery-color-small.bmp,105,69,12)
+%xl(E,repeat-color-small.bmp,47,65,4)
+%xl(F,lock-color.bmp,82,65)
 
-%al %s%ac%?ia<%ia|%d2>%ar 
-%al %s%ac%?id<%id|%d1>%ar 
+%al %s%ac%?ia<%ia|%d(2)>%ar 
+%al %s%ac%?id<%id|%d(1)>%ar 
 %al %s%ac%?it<%it|%fn>%ar 
-%pb|pg-108.bmp|12|43|106|5|
+%pb(pg-108.bmp,12,43,106,5)
 %al  %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|unknown|nsf|speex|spc|ape|wma>%ar%pt  
-%?ps<%xdB>
-%?mp<%xdAb|%xdAa|%xdAb|%xdAc|%xdAd>
-%?mm<|%xdEa|%xdEb|%xdEc|%xdEd>
-%?mh<%xdF>
-%?pv<|%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi>
-%?bl<%xdDa|%xdDb|%xdDc|%xdDd|%xdDe|%xdDf|%xdDg|%xdDh|%xdDi|%xdDj|%xdDk|%xdDl>
+%?ps<%xd(B)>
+%?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)>
+%?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+%?mh<%xd(F)>
+%?pv<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)>
+%?bl<%xd(Da)|%xd(Db)|%xd(Dc)|%xd(Dd)|%xd(De)|%xd(Df)|%xd(Dg)|%xd(Dh)|%xd(Di)|%xd(Dj)|%xd(Dk)|%xd(Dl)>
diff --git a/wps/Rockboxed.138x110x2.wps b/wps/Rockboxed.138x110x2.wps
index e871b07feb..22f24808e2 100644
--- a/wps/Rockboxed.138x110x2.wps
+++ b/wps/Rockboxed.138x110x2.wps
@@ -1,23 +1,23 @@
 # (C) 2007, Roan Horning <roan@horning.us>
 # License: GNU GPL v2 or later.
 %wd
-%X|bg-138x110x2.bmp|
-%xl|A|mode-grey.bmp|68|91|4|
-%xl|B|shuffle-grey-medium.bmp|35|91|
-%xl|C|volume-grey.bmp|15|93|9|
-%xl|D|battery-grey-medium.bmp|111|95|11|
-%xl|E|repeat-grey-medium.bmp|51|91|4|
-%xl|F|lock-grey.bmp|88|90|
+%X(bg-138x110x2.bmp)
+%xl(A,mode-grey.bmp,68,91,4)
+%xl(B,shuffle-grey-medium.bmp,35,91)
+%xl(C,volume-grey.bmp,15,93,9)
+%xl(D,battery-grey-medium.bmp,111,95,11)
+%xl(E,repeat-grey-medium.bmp,51,91,4)
+%xl(F,lock-grey.bmp,88,90)
 
-%al %s%ac%?ia<%ia|%d2>%ar 
-%al %s%ac%?id<%id|%d1>%ar 
+%al %s%ac%?ia<%ia|%d(2)>%ar 
+%al %s%ac%?id<%id|%d(1)>%ar 
 %al %s%ac%?it<%it|%fn>%ar 
-%ac%t3%ig;%ac%iy 
-%pb|pg-grey-118.bmp|10|-|118|5|
+%ac%t(3)%ig%;%ac%iy 
+%pb(pg-grey-118.bmp,10,-,118,5)
 %al  %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|nsf|speex|spc|ape|wma|unknown>%ar%pt  
-%?ps<%xdB>
-%?mp<%xdAb|%xdAa|%xdAb|%xdAc|%xdAd>
-%?mm<|%xdEa|%xdEb|%xdEc|%xdEd>
-%?mh<%xdF>
-%?pv<|%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi>
-%?bl<|%xdDa|%xdDb|%xdDc|%xdDd|%xdDe|%xdDf|%xdDg|%xdDh|%xdDi|%xdDj|%xdDk>
+%?ps<%xd(B)>
+%?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)>
+%?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+%?mh<%xd(F)>
+%?pv<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)>
+%?bl<|%xd(Da)|%xd(Db)|%xd(Dc)|%xd(Dd)|%xd(De)|%xd(Df)|%xd(Dg)|%xd(Dh)|%xd(Di)|%xd(Dj)|%xd(Dk)>
diff --git a/wps/Rockboxed.160x128x16.wps b/wps/Rockboxed.160x128x16.wps
index 37e8256521..97d17dcbdf 100644
--- a/wps/Rockboxed.160x128x16.wps
+++ b/wps/Rockboxed.160x128x16.wps
@@ -1,24 +1,24 @@
 # (C) 2007, Roan Horning <roan@horning.us>
 # License: GNU GPL v2 or later.
 %wd
-%X|bg-160x128x16.bmp|
-%xl|A|mode-color-big.bmp|72|109|4|
-%xl|B|shuffle-color-big.bmp|36|109|
-%xl|C|volume-color-medium.bmp|15|111|9|
-%xl|D|battery-color-big.bmp|123|113|12|
-%xl|E|repeat-color-big.bmp|53|109|4|
-%xl|F|lock-color.bmp|95|108|
+%X(bg-160x128x16.bmp)
+%xl(A,mode-color-big.bmp,72,109,4)
+%xl(B,shuffle-color-big.bmp,36,109)
+%xl(C,volume-color-medium.bmp,15,111,9)
+%xl(D,battery-color-big.bmp,123,113,12)
+%xl(E,repeat-color-big.bmp,53,109,4)
+%xl(F,lock-color.bmp,95,108)
 
-%al %s%ac%?ia<%ia|%d2>%ar 
-%al %s%ac%?id<%id|%d1>%ar 
+%al %s%ac%?ia<%ia|%d(2)>%ar 
+%al %s%ac%?id<%id|%d(1)>%ar 
 %al %s%ac%?it<%it|%fn>%ar 
 
-%ac%t3%ig;%ac%iy 
-%pb|pg-140.bmp|10|76|140|5|
+%ac%t(3)%ig%;%ac%iy 
+%pb(pg-140.bmp,10,76,140,5)
 %al  %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|nsf|speex|spc|ape|wma|unknown>%ar%pt  
-%?ps<%xdB>
-%?mp<%xdAb|%xdAa|%xdAb|%xdAc|%xdAd>
-%?mm<|%xdEa|%xdEb|%xdEc|%xdEd>
-%?mh<%xdF>
-%?pv<|%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi>
-%?bl<%xdDa|%xdDb|%xdDc|%xdDd|%xdDe|%xdDf|%xdDg|%xdDh|%xdDi|%xdDj|%xdDk|%xdDl>
+%?ps<%xd(B)>
+%?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)>
+%?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+%?mh<%xd(F)>
+%?pv<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)>
+%?bl<%xd(Da)|%xd(Db)|%xd(Dc)|%xd(Dd)|%xd(De)|%xd(Df)|%xd(Dg)|%xd(Dh)|%xd(Di)|%xd(Dj)|%xd(Dk)|%xd(Dl)>
diff --git a/wps/Rockboxed.160x128x2.wps b/wps/Rockboxed.160x128x2.wps
index 2ee7c08502..4fc54d796f 100644
--- a/wps/Rockboxed.160x128x2.wps
+++ b/wps/Rockboxed.160x128x2.wps
@@ -1,24 +1,24 @@
 # (C) 2007, Roan Horning <roan@horning.us>
 # License: GNU GPL v2 or later.
 %wd
-%X|bg-160x128x2.bmp|
-%xl|A|mode-grey.bmp|72|109|4|
-%xl|B|shuffle-grey-big.bmp|36|109|
-%xl|C|volume-grey.bmp|15|111|9|
-%xl|D|battery-grey-big.bmp|123|113|11|
-%xl|E|repeat-grey-big.bmp|53|109|4|
-%xl|F|lock-grey.bmp|95|108|
+%X(bg-160x128x2.bmp)
+%xl(A,mode-grey.bmp,72,109,4)
+%xl(B,shuffle-grey-big.bmp,36,109)
+%xl(C,volume-grey.bmp,15,111,9)
+%xl(D,battery-grey-big.bmp,123,113,11)
+%xl(E,repeat-grey-big.bmp,53,109,4)
+%xl(F,lock-grey.bmp,95,108)
 
-%al %s%ac%?ia<%ia|%d2>%ar 
-%al %s%ac%?id<%id|%d1>%ar 
+%al %s%ac%?ia<%ia|%d(2)>%ar 
+%al %s%ac%?id<%id|%d(1)>%ar 
 %al %s%ac%?it<%it|%fn>%ar 
 
-%ac%t3%ig;%ac%iy 
-%pb|pg-grey-140.bmp|10|-|140|5|
+%ac%t(3)%ig%;%ac%iy 
+%pb(pg-grey-140.bmp,10,-,140,5)
 %al  %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|nsf|speex|spc|ape|wma|unknown>%ar%pt  
-%?ps<%xdB>
-%?mp<%xdAb|%xdAa|%xdAb|%xdAc|%xdAd>
-%?mm<|%xdEa|%xdEb|%xdEc|%xdEd>
-%?mh<%xdF>
-%?pv<|%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi>
-%?bl<|%xdDa|%xdDb|%xdDc|%xdDd|%xdDe|%xdDf|%xdDg|%xdDh|%xdDi|%xdDj|%xdDk>
+%?ps<%xd(B)>
+%?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)>
+%?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+%?mh<%xd(F)>
+%?pv<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)>
+%?bl<|%xd(Da)|%xd(Db)|%xd(Dc)|%xd(Dd)|%xd(De)|%xd(Df)|%xd(Dg)|%xd(Dh)|%xd(Di)|%xd(Dj)|%xd(Dk)>
diff --git a/wps/Rockboxed.176x132x16.wps b/wps/Rockboxed.176x132x16.wps
index 92cae29fe1..4a7e14ed5c 100644
--- a/wps/Rockboxed.176x132x16.wps
+++ b/wps/Rockboxed.176x132x16.wps
@@ -1,24 +1,24 @@
 # (C) 2007, Roan Horning <roan@horning.us>
 # License: GNU GPL v2 or later.
 %wd
-%X|bg-176x132x16.bmp|
-%xl|A|mode-color-big.bmp|81|113|4|
-%xl|B|shuffle-color-big.bmp|40|113|
-%xl|C|volume-color-big.bmp|15|115|11|
-%xl|D|battery-color-big.bmp|139|117|12|
-%xl|E|repeat-color-big.bmp|60|113|4|
-%xl|F|lock-color.bmp|110|112|
+%X(bg-176x132x16.bmp)
+%xl(A,mode-color-big.bmp,81,113,4)
+%xl(B,shuffle-color-big.bmp,40,113)
+%xl(C,volume-color-big.bmp,15,115,11)
+%xl(D,battery-color-big.bmp,139,117,12)
+%xl(E,repeat-color-big.bmp,60,113,4)
+%xl(F,lock-color.bmp,110,112)
 
-%al %s%ac%?ia<%ia|%d2>%ar 
-%al %s%ac%?id<%id|%d1>%ar 
+%al %s%ac%?ia<%ia|%d(2)>%ar 
+%al %s%ac%?id<%id|%d(1)>%ar 
 %al %s%ac%?it<%it|%fn>%ar 
 
-%ac%t3%ig;%ac%iy
-%pb|pg-156.bmp|10|75|156|5|
+%ac%t(3)%ig%;%ac%iy
+%pb(pg-156.bmp,10,75,156,5)
 %al %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|nsf|speex|spc|ape|wma|unknown>%ar%pt 
-%?ps<%xdB>
-%?mp<%xdAb|%xdAa|%xdAb|%xdAc|%xdAd>
-%?mm<|%xdEa|%xdEb|%xdEc|%xdEd>
-%?mh<%xdF>
-%?pv<|%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi|%xdCj|%xdCk>
-%?bl<%xdDa|%xdDb|%xdDc|%xdDd|%xdDe|%xdDf|%xdDg|%xdDh|%xdDi|%xdDj|%xdDk|%xdDl>
+%?ps<%xd(B)>
+%?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)>
+%?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+%?mh<%xd(F)>
+%?pv<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)|%xd(Ck)>
+%?bl<%xd(Da)|%xd(Db)|%xd(Dc)|%xd(Dd)|%xd(De)|%xd(Df)|%xd(Dg)|%xd(Dh)|%xd(Di)|%xd(Dj)|%xd(Dk)|%xd(Dl)>
diff --git a/wps/Rockboxed.176x220x16.wps b/wps/Rockboxed.176x220x16.wps
index ddbd790094..56f073ae0a 100644
--- a/wps/Rockboxed.176x220x16.wps
+++ b/wps/Rockboxed.176x220x16.wps
@@ -1,32 +1,32 @@
 # (C) 2007, Roan Horning <roan@horning.us>
 # License: GNU GPL v2 or later.
 %wd
-%X|bg-176x220x16.bmp|
-%xl|A|mode-color-big.bmp|81|201|4|
-%xl|B|shuffle-color-big.bmp|40|201|
-%xl|C|volume-color-big.bmp|15|203|11|
-%xl|D|battery-color-big.bmp|139|205|12|
-%xl|E|repeat-color-big.bmp|60|201|4|
-%xl|F|lock-color.bmp|107|201|
+%X(bg-176x220x16.bmp)
+%xl(A,mode-color-big.bmp,81,201,4)
+%xl(B,shuffle-color-big.bmp,40,201)
+%xl(C,volume-color-big.bmp,15,203,11)
+%xl(D,battery-color-big.bmp,139,205,12)
+%xl(E,repeat-color-big.bmp,60,201,4)
+%xl(F,lock-color.bmp,107,201)
 
 
 
 
 
-%al %s%ac%?ia<%ia|%d2>%ar 
-%al %s%ac%?id<%id|%d1>%ar 
+%al %s%ac%?ia<%ia|%d(2)>%ar 
+%al %s%ac%?id<%id|%d(1)>%ar 
 %al %s%ac%?it<%it|%fn>%ar 
 
-%ac%t3%ig;%ac%iy
+%ac%t(3)%ig%;%ac%iy
 
 
 
 
-%pb|pg-156.bmp|10|171|156|5|
+%pb(pg-156.bmp,10,171,156,5)
 %al %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|nsf|speex|spc|ape|wma|unknown>%ar%pt 
-%?ps<%xdB>
-%?mp<%xdAb|%xdAa|%xdAb|%xdAc|%xdAd>
-%?mm<|%xdEa|%xdEb|%xdEc|%xdEd>
-%?mh<%xdF>
-%?pv<|%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi|%xdCj|%xdCk>
-%?bl<%xdDa|%xdDb|%xdDc|%xdDd|%xdDe|%xdDf|%xdDg|%xdDh|%xdDi|%xdDj|%xdDk|%xdDl>
+%?ps<%xd(B)>
+%?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)>
+%?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+%?mh<%xd(F)>
+%?pv<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)|%xd(Ck)>
+%?bl<%xd(Da)|%xd(Db)|%xd(Dc)|%xd(Dd)|%xd(De)|%xd(Df)|%xd(Dg)|%xd(Dh)|%xd(Di)|%xd(Dj)|%xd(Dk)|%xd(Dl)>
diff --git a/wps/Rockboxed.220x176x16.wps b/wps/Rockboxed.220x176x16.wps
index 9814b1372b..8caa3d30ae 100644
--- a/wps/Rockboxed.220x176x16.wps
+++ b/wps/Rockboxed.220x176x16.wps
@@ -1,26 +1,26 @@
 # (C) 2007, Roan Horning <roan@horning.us>
 # License: GNU GPL v2 or later.
 %wd
-%X|bg-220x176x16.bmp|
-%xl|A|mode-color-big.bmp|102|156|4|
-%xl|B|shuffle-color-big.bmp|57|156|
-%xl|C|volume-color-big.bmp|15|158|11|
-%xl|D|battery-color-big.bmp|183|160|12|
-%xl|E|repeat-color-big.bmp|77|156|4|
-%xl|F|lock-color.bmp|142|156|
+%X(bg-220x176x16.bmp)
+%xl(A,mode-color-big.bmp,102,156,4)
+%xl(B,shuffle-color-big.bmp,57,156)
+%xl(C,volume-color-big.bmp,15,158,11)
+%xl(D,battery-color-big.bmp,183,160,12)
+%xl(E,repeat-color-big.bmp,77,156,4)
+%xl(F,lock-color.bmp,142,156)
 
 
 
-%al %s%ac%?ia<%ia|%d2>%ar 
-%al %s%ac%?id<%id|%d1>%ar 
+%al %s%ac%?ia<%ia|%d(2)>%ar 
+%al %s%ac%?id<%id|%d(1)>%ar 
 %al %s%ac%?it<%it|%fn>%ar 
 
-%ac%t3%ig;%ac%iy 
-%pb|pg-200.bmp|10|116|200|5|
+%ac%t(3)%ig%;%ac%iy 
+%pb(pg-200.bmp,10,116,200,5)
 %al  %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|nsf|speex|spc|ape|wma|unknown>%ar%pt  
-%?ps<%xdB>
-%?mp<%xdAb|%xdAa|%xdAb|%xdAc|%xdAd>
-%?mm<|%xdEa|%xdEb|%xdEc|%xdEd>
-%?mh<%xdF>
-%?pv<|%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi|%xdCj|%xdCk>
-%?bl<%xdDa|%xdDb|%xdDc|%xdDd|%xdDe|%xdDf|%xdDg|%xdDh|%xdDi|%xdDj|%xdDk|%xdDl>
+%?ps<%xd(B)>
+%?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)>
+%?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+%?mh<%xd(F)>
+%?pv<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)|%xd(Ck)>
+%?bl<%xd(Da)|%xd(Db)|%xd(Dc)|%xd(Dd)|%xd(De)|%xd(Df)|%xd(Dg)|%xd(Dh)|%xd(Di)|%xd(Dj)|%xd(Dk)|%xd(Dl)>
diff --git a/wps/Rockboxed.240x320x16.wps b/wps/Rockboxed.240x320x16.wps
index 291f1894fb..fdf9104b20 100644
--- a/wps/Rockboxed.240x320x16.wps
+++ b/wps/Rockboxed.240x320x16.wps
@@ -1,31 +1,31 @@
 # (C) 2007, Roan Horning <roan@horning.us>
 # License: GNU GPL v2 or later.
 %wd
-%X|bg-240x320x16.bmp|
-%xl|A|mode-color-big.bmp|112|300|4|
-%xl|B|shuffle-color-big.bmp|57|300|
-%xl|C|volume-color-big.bmp|15|302|11|
-%xl|D|battery-color-big.bmp|203|304|12|
-%xl|E|repeat-color-big.bmp|77|300|4|
-%xl|F|lock-color.bmp|152|300|
+%X(bg-240x320x16.bmp)
+%xl(A,mode-color-big.bmp,112,300,4)
+%xl(B,shuffle-color-big.bmp,57,300)
+%xl(C,volume-color-big.bmp,15,302,11)
+%xl(D,battery-color-big.bmp,203,304,12)
+%xl(E,repeat-color-big.bmp,77,300,4)
+%xl(F,lock-color.bmp,152,300)
 
 
 
 
 
-%al %s%ac%?ia<%ia|%d2>%ar 
-%al %s%ac%?id<%id|%d1>%ar 
+%al %s%ac%?ia<%ia|%d(2)>%ar 
+%al %s%ac%?id<%id|%d(1)>%ar 
 %al %s%ac%?it<%it|%fn>%ar 
 
 
 
-%ac%t3%ig;%ac%iy 
+%ac%t(3)%ig%;%ac%iy 
 
-%pb|pg-220.bmp|10|256|220|5|
+%pb(pg-220.bmp,10,256,220,5)
 %al %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|nsf|speex|spc|ape|wma|unknown>%ar%pt 
-%?ps<%xdB>
-%?mp<%xdAb|%xdAa|%xdAb|%xdAc|%xdAd>
-%?mm<|%xdEa|%xdEb|%xdEc|%xdEd>
-%?mh<%xdF>
-%?pv<|%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi|%xdCj|%xdCk>
-%?bl<%xdDa|%xdDb|%xdDc|%xdDd|%xdDe|%xdDf|%xdDg|%xdDh|%xdDi|%xdDj|%xdDk|%xdDl>
+%?ps<%xd(B)>
+%?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)>
+%?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+%?mh<%xd(F)>
+%?pv<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)|%xd(Ck)>
+%?bl<%xd(Da)|%xd(Db)|%xd(Dc)|%xd(Dd)|%xd(De)|%xd(Df)|%xd(Dg)|%xd(Dh)|%xd(Di)|%xd(Dj)|%xd(Dk)|%xd(Dl)>
diff --git a/wps/Rockboxed.320x240x16.wps b/wps/Rockboxed.320x240x16.wps
index 05d1077feb..51ab11c856 100644
--- a/wps/Rockboxed.320x240x16.wps
+++ b/wps/Rockboxed.320x240x16.wps
@@ -1,27 +1,27 @@
 # (C) 2007, Roan Horning <roan@horning.us>
 # License: GNU GPL v2 or later.
 %wd
-%X|bg-320x240x16.bmp|
-%xl|A|mode-color-big.bmp|153|220|4|
-%xl|B|shuffle-color-big.bmp|113|220|
-%xl|C|volume-color-big.bmp|15|222|11|
-%xl|D|battery-color-big.bmp|283|224|12|
-%xl|E|repeat-color-big.bmp|131|220|4|
-%xl|F|lock-color.bmp|220|220|
+%X(bg-320x240x16.bmp)
+%xl(A,mode-color-big.bmp,153,220,4)
+%xl(B,shuffle-color-big.bmp,113,220)
+%xl(C,volume-color-big.bmp,15,222,11)
+%xl(D,battery-color-big.bmp,283,224,12)
+%xl(E,repeat-color-big.bmp,131,220,4)
+%xl(F,lock-color.bmp,220,220)
 
 
 
-%al %s%ac%?ia<%ia|%d2>%ar 
-%al %s%ac%?id<%id|%d1>%ar 
+%al %s%ac%?ia<%ia|%d(2)>%ar 
+%al %s%ac%?id<%id|%d(1)>%ar 
 %al %s%ac%?it<%it|%fn>%ar 
 
 
-%ac%t3%ig;%ac%iy 
-%pb|pg-300.bmp|10|178|300|5|
+%ac%t(3)%ig%;%ac%iy 
+%pb(pg-300.bmp,10,178,300,5)
 %al %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|nsf|speex|spc|ape|wma|unknown>%ar%pt 
-%?ps<%xdB>
-%?mp<%xdAb|%xdAa|%xdAb|%xdAc|%xdAd>
-%?mm<|%xdEa|%xdEb|%xdEc|%xdEd>
-%?mh<%xdF>
-%?pv<|%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi|%xdCj|%xdCk>
-%?bl<%xdDa|%xdDb|%xdDc|%xdDd|%xdDe|%xdDf|%xdDg|%xdDh|%xdDi|%xdDj|%xdDk|%xdDl>
+%?ps<%xd(B)>
+%?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)>
+%?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+%?mh<%xd(F)>
+%?pv<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)|%xd(Ck)>
+%?bl<%xd(Da)|%xd(Db)|%xd(Dc)|%xd(Dd)|%xd(De)|%xd(Df)|%xd(Dg)|%xd(Dh)|%xd(Di)|%xd(Dj)|%xd(Dk)|%xd(Dl)>
diff --git a/wps/UniCatcher.128x64x1.wps b/wps/UniCatcher.128x64x1.wps
index 7239811c9e..6b561d7269 100644
--- a/wps/UniCatcher.128x64x1.wps
+++ b/wps/UniCatcher.128x64x1.wps
@@ -1,18 +1,18 @@
 %wd
 
-%t1 %?mp<%al%pp/%pe%ar-:--/-:--|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe%ar%pc/%pt>;%t1 %?mp<%al%pp/%pe%ar-:--/-:--|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe%ar%pc/%pt>
-%s%ac%?ia<%ia|%?d2<%d2|Unknown Artist>>
+%t(1) %?mp<%al%pp/%pe%ar-:--/-:--|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe%ar%pc/%pt>%;%t(1) %?mp<%al%pp/%pe%ar-:--/-:--|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe%ar%pc/%pt>
+%s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>>
 %s%ac%?in<%in|%pp> - %?it<%it|%fn>
 
-%xl|A|battery-s.bmp|109|3|5|
-%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAb|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAc|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAd|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAe|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>
-%xl|B|hold-s.bmp|86|2|3|
-%xl|C|repeat-s.bmp|66|2|4|
-%xl|D|shuffle-s.bmp|46|4|2|
-%xl|E|playmode-s.bmp|3|3|4|
-%?mh<%?mr<%xdBa|%xdBb>|%?mr<%xdBc|>>%?mm<|%xdCa|%xdCb|%xdCc|%xdCd>%?ps<%xdDa|%xdDb>%?mp<|%xdEa|%xdEb|%xdEc|%xdEd>
-%xl|F|volume-s.bmp|16|1|9|
-%xl|G|animation-s.bmp|16|1|8|
-%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGa|%xdGa|%xdGa>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGb|%xdGb|%xdGb>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGc|%xdGc|%xdGc>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGd|%xdGd|%xdGd>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGe|%xdGe|%xdGe>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGf|%xdGf|%xdGf>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGg|%xdGg|%xdGg>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGh|%xdGh|%xdGh>
-%x|W|line1-128.bmp|0|0|
-%x|X|line2-128.bmp|0|13|
+%xl(A,battery-s.bmp,109,3,5)
+%t(0.5) %?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ab)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ac)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ad)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ae)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>
+%xl(B,hold-s.bmp,86,2,3)
+%xl(C,repeat-s.bmp,66,2,4)
+%xl(D,shuffle-s.bmp,46,4,2)
+%xl(E,playmode-s.bmp,3,3,4)
+%?mh<%?mr<%xd(Ba)|%xd(Bb)>|%?mr<%xd(Bc)|>>%?mm<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)>%?ps<%xd(Da)|%xd(Db)>%?mp<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+%xl(F,volume-s.bmp,16,1,9)
+%xl(G,animation-s.bmp,16,1,8)
+%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ga)|%xd(Ga)|%xd(Ga)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gb)|%xd(Gb)|%xd(Gb)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gc)|%xd(Gc)|%xd(Gc)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gd)|%xd(Gd)|%xd(Gd)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ge)|%xd(Ge)|%xd(Ge)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gf)|%xd(Gf)|%xd(Gf)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gg)|%xd(Gg)|%xd(Gg)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gh)|%xd(Gh)|%xd(Gh)>
+%x(W,line1-128.bmp,0,0)
+%x(X,line2-128.bmp,0,13)
diff --git a/wps/UniCatcher.128x96x1.wps b/wps/UniCatcher.128x96x1.wps
index b96ff5b9e4..e9a79ae448 100644
--- a/wps/UniCatcher.128x96x1.wps
+++ b/wps/UniCatcher.128x96x1.wps
@@ -1,21 +1,21 @@
 %wd
 
-%t1 %?mp<%al%pp/%pe%ar-:--/-:--|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe%ar%pc/%pt>;%t1 %?mp<%al%pp/%pe%ar-:--/-:--|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe%ar%pc/%pt>
-%s%ac%?ia<%ia|%?d2<%d2|Unknown Artist>>
-%s%ac%?id<%id|%?d1<%d1|Unknown Album>>
-%pb|-|11|-|106|4|
+%t(1) %?mp<%al%pp/%pe%ar-:--/-:--|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe%ar%pc/%pt>%;%t(1) %?mp<%al%pp/%pe%ar-:--/-:--|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe%ar%pc/%pt>
+%s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>>
+%s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>>
+%pb(-,11,-,106,4)
 %s%ac%?in<%in|%pp> - %?it<%it|%fn>
 
-%xl|A|battery-s.bmp|109|3|5|
-%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAb|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAc|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAd|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAe|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>
-%xl|B|hold-s.bmp|86|2|3|
-%xl|C|repeat-s.bmp|66|2|4|
-%xl|D|shuffle-s.bmp|46|4|2|
-%xl|E|playmode-s.bmp|3|3|4|
-%?mh<%?mr<%xdBa|%xdBb>|%?mr<%xdBc|>>%?mm<|%xdCa|%xdCb|%xdCc|%xdCd>%?ps<%xdDa|%xdDb>%?mp<|%xdEa|%xdEb|%xdEc|%xdEd>
-%xl|F|volume-s.bmp|16|1|9|
-%xl|G|animation-s.bmp|16|1|8|
-%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGa|%xdGa|%xdGa>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGb|%xdGb|%xdGb>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGc|%xdGc|%xdGc>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGd|%xdGd|%xdGd>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGe|%xdGe|%xdGe>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGf|%xdGf|%xdGf>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGg|%xdGg|%xdGg>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGh|%xdGh|%xdGh>
-%x|W|line1-128.bmp|0|0|
-%x|X|line2-128.bmp|0|13|
-%x|Y|line1-128.bmp|0|79|
+%xl(A,battery-s.bmp,109,3,5)
+%t(0.5) %?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ab)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ac)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ad)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ae)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>
+%xl(B,hold-s.bmp,86,2,3)
+%xl(C,repeat-s.bmp,66,2,4)
+%xl(D,shuffle-s.bmp,46,4,2)
+%xl(E,playmode-s.bmp,3,3,4)
+%?mh<%?mr<%xd(Ba)|%xd(Bb)>|%?mr<%xd(Bc)|>>%?mm<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)>%?ps<%xd(Da)|%xd(Db)>%?mp<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+%xl(F,volume-s.bmp,16,1,9)
+%xl(G,animation-s.bmp,16,1,8)
+%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ga)|%xd(Ga)|%xd(Ga)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gb)|%xd(Gb)|%xd(Gb)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gc)|%xd(Gc)|%xd(Gc)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gd)|%xd(Gd)|%xd(Gd)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ge)|%xd(Ge)|%xd(Ge)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gf)|%xd(Gf)|%xd(Gf)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gg)|%xd(Gg)|%xd(Gg)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gh)|%xd(Gh)|%xd(Gh)>
+%x(W,line1-128.bmp,0,0)
+%x(X,line2-128.bmp,0,13)
+%x(Y,line1-128.bmp,0,79)
diff --git a/wps/UniCatcher.160x128x16.wps b/wps/UniCatcher.160x128x16.wps
index 4fe806f090..43ebc12526 100644
--- a/wps/UniCatcher.160x128x16.wps
+++ b/wps/UniCatcher.160x128x16.wps
@@ -1,26 +1,26 @@
 %wd
-%X|bg-160x128x16-u.bmp|
+%X(bg-160x128x16-u.bmp)
 
 
-%t1 %?mp<%al Stopped%ar-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >;%t1 %?mp<%al Stopped-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
-%s%ac%?ia<%ia|%?d2<%d2|Unknown Artist>>
-%s%ac%?id<%id|%?d1<%d1|Unknown Album>>
+%t(1) %?mp<%al Stopped%ar-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >%;%t(1) %?mp<%al Stopped-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
+%s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>>
+%s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>>
 %al %fbKbps
-%pb|-|10|-|140|4|
+%pb(-,10,-,140,4)
 %s%ac%?in<%in|%pp> - %?it<%it|%fn>
 
-%xl|A|battery.bmp|135|8|5|
-%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAb|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAc|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAd|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAe|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>
-%xl|B|hold.bmp|106|5|4|
-%?mh<%?mr<%xdBa|%xdBb>|%?mr<%xdBc|%xdBd>>
-%xl|C|repeat.bmp|83|6|5|
-%?mm<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe>
-%xl|D|shuffle.bmp|58|7|2|
-%?ps<%xdDa|%xdDb>
-%xl|E|playmode.bmp|6|7|4|
-%?mp<|%xdEa|%xdEb|%xdEc|%xdEd>
-%xl|F|volume.bmp|24|3|9|
-%xl|G|animation.bmp|24|3|8|
-%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGa|%xdGa|%xdGa>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGb|%xdGb|%xdGb>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGc|%xdGc|%xdGc>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGd|%xdGd|%xdGd>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGe|%xdGe|%xdGe>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGf|%xdGf|%xdGf>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGg|%xdGg|%xdGg>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGh|%xdGh|%xdGh>
-%xl|H|codec.bmp|115|82|22|
-%?fc<%xdHa|%xdHb|%xdHc|%xdHd|%xdHe|%xdHf|%xdHg|%xdHh|%xdHi|%xdHj|%xdHk|%xdHl|%xdHm|%xdHn|%xdHo|%xdHp|%xdHq|%xdHr|%xdHs|%xdHt|%xdHu|%xdHv>
+%xl(A,battery.bmp,135,8,5)
+%t(0.5) %?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ab)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ac)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ad)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ae)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>
+%xl(B,hold.bmp,106,5,4)
+%?mh<%?mr<%xd(Ba)|%xd(Bb)>|%?mr<%xd(Bc)|%xd(Bd)>>
+%xl(C,repeat.bmp,83,6,5)
+%?mm<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)>
+%xl(D,shuffle.bmp,58,7,2)
+%?ps<%xd(Da)|%xd(Db)>
+%xl(E,playmode.bmp,6,7,4)
+%?mp<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+%xl(F,volume.bmp,24,3,9)
+%xl(G,animation.bmp,24,3,8)
+%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ga)|%xd(Ga)|%xd(Ga)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gb)|%xd(Gb)|%xd(Gb)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gc)|%xd(Gc)|%xd(Gc)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gd)|%xd(Gd)|%xd(Gd)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ge)|%xd(Ge)|%xd(Ge)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gf)|%xd(Gf)|%xd(Gf)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gg)|%xd(Gg)|%xd(Gg)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gh)|%xd(Gh)|%xd(Gh)>
+%xl(H,codec.bmp,115,82,22)
+%?fc<%xd(Ha)|%xd(Hb)|%xd(Hc)|%xd(Hd)|%xd(He)|%xd(Hf)|%xd(Hg)|%xd(Hh)|%xd(Hi)|%xd(Hj)|%xd(Hk)|%xd(Hl)|%xd(Hm)|%xd(Hn)|%xd(Ho)|%xd(Hp)|%xd(Hq)|%xd(Hr)|%xd(Hs)|%xd(Ht)|%xd(Hu)|%xd(Hv)>
diff --git a/wps/UniCatcher.160x128x2.wps b/wps/UniCatcher.160x128x2.wps
index 85f964ac24..a0496e804d 100644
--- a/wps/UniCatcher.160x128x2.wps
+++ b/wps/UniCatcher.160x128x2.wps
@@ -1,26 +1,26 @@
 %wd
-%X|bg-160x128x2-u.bmp|
+%X(bg-160x128x2-u.bmp)
 
 
-%t1 %?mp<%al Stopped%ar-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >;%t1 %?mp<%al Stopped-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
-%s%ac%?ia<%ia|%?d2<%d2|Unknown Artist>>
-%s%ac%?id<%id|%?d1<%d1|Unknown Album>>
+%t(1) %?mp<%al Stopped%ar-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >%;%t(1) %?mp<%al Stopped-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
+%s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>>
+%s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>>
 %al %fbKbps
-%pb|-|10|-|140|4|
+%pb(-,10,-,140,4)
 %s%ac%?in<%in|%pp> - %?it<%it|%fn>
 
-%xl|A|battery-g.bmp|135|8|5|
-%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAb|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAc|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAd|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAe|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>
-%xl|B|hold-g.bmp|106|5|3|
-%?mh<%?mr<%xdBa|%xdBb>|%?mr<%xdBc|>>
-%xl|C|repeat-g.bmp|83|6|4|
-%?mm<|%xdCa|%xdCb|%xdCc|%xdCd>
-%xl|D|shuffle-g.bmp|58|7|2|
-%?ps<%xdDa|%xdDb>
-%xl|E|playmode-g.bmp|6|7|4|
-%?mp<|%xdEa|%xdEb|%xdEc|%xdEd>
-%xl|F|volume-g.bmp|24|4|9|
-%xl|G|animation-g.bmp|24|4|8|
-%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGa|%xdGa|%xdGa>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGb|%xdGb|%xdGb>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGc|%xdGc|%xdGc>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGd|%xdGd|%xdGd>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGe|%xdGe|%xdGe>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGf|%xdGf|%xdGf>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGg|%xdGg|%xdGg>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGh|%xdGh|%xdGh>
-%xl|H|codec-g.bmp|115|82|22|
-%?fc<%xdHa|%xdHb|%xdHc|%xdHd|%xdHe|%xdHf|%xdHg|%xdHh|%xdHi|%xdHj|%xdHk|%xdHl|%xdHm|%xdHn|%xdHo|%xdHp|%xdHq|%xdHr|%xdHs|%xdHt|%xdHu|%xdHv>
+%xl(A,battery-g.bmp,135,8,5)
+%t(0.5) %?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ab)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ac)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ad)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ae)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>
+%xl(B,hold-g.bmp,106,5,3)
+%?mh<%?mr<%xd(Ba)|%xd(Bb)>|%?mr<%xd(Bc)|>>
+%xl(C,repeat-g.bmp,83,6,4)
+%?mm<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)>
+%xl(D,shuffle-g.bmp,58,7,2)
+%?ps<%xd(Da)|%xd(Db)>
+%xl(E,playmode-g.bmp,6,7,4)
+%?mp<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+%xl(F,volume-g.bmp,24,4,9)
+%xl(G,animation-g.bmp,24,4,8)
+%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ga)|%xd(Ga)|%xd(Ga)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gb)|%xd(Gb)|%xd(Gb)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gc)|%xd(Gc)|%xd(Gc)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gd)|%xd(Gd)|%xd(Gd)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ge)|%xd(Ge)|%xd(Ge)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gf)|%xd(Gf)|%xd(Gf)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gg)|%xd(Gg)|%xd(Gg)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gh)|%xd(Gh)|%xd(Gh)>
+%xl(H,codec-g.bmp,115,82,22)
+%?fc<%xd(Ha)|%xd(Hb)|%xd(Hc)|%xd(Hd)|%xd(He)|%xd(Hf)|%xd(Hg)|%xd(Hh)|%xd(Hi)|%xd(Hj)|%xd(Hk)|%xd(Hl)|%xd(Hm)|%xd(Hn)|%xd(Ho)|%xd(Hp)|%xd(Hq)|%xd(Hr)|%xd(Hs)|%xd(Ht)|%xd(Hu)|%xd(Hv)>
diff --git a/wps/UniCatcher.176x132x16.wps b/wps/UniCatcher.176x132x16.wps
index df850d99b4..a9c45dcec9 100644
--- a/wps/UniCatcher.176x132x16.wps
+++ b/wps/UniCatcher.176x132x16.wps
@@ -1,26 +1,26 @@
 %wd
-%X|bg-176x132x16-u.bmp|
+%X(bg-176x132x16-u.bmp)
 
 
-%t1 %?mp<%al Stopped%ar-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >;%t1 %?mp<%al Stopped-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
-%s%ac%?ia<%ia|%?d2<%d2|Unknown Artist>>
-%s%ac%?id<%id|%?d1<%d1|Unknown Album>>
+%t(1) %?mp<%al Stopped%ar-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >%;%t(1) %?mp<%al Stopped-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
+%s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>>
+%s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>>
 %al %fbKbps
-%pb|-|10|-|156|4|
+%pb(-,10,-,156,4)
 %s%ac%?in<%in|%pp> - %?it<%it|%fn>
 
-%xl|A|battery.bmp|151|8|5|
-%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAb|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAc|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAd|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAe|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>
-%xl|B|hold.bmp|122|5|4|
-%?mh<%?mr<%xdBa|%xdBb>|%?mr<%xdBc|%xdBd>>
-%xl|C|repeat.bmp|91|6|5|
-%?mm<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe>
-%xl|D|shuffle.bmp|66|7|2|
-%?ps<%xdDa|%xdDb>
-%xl|E|playmode.bmp|6|7|4|
-%?mp<|%xdEa|%xdEb|%xdEc|%xdEd>
-%xl|F|volume.bmp|24|3|9|
-%xl|G|animation.bmp|24|3|8|
-%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGa|%xdGa|%xdGa>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGb|%xdGb|%xdGb>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGc|%xdGc|%xdGc>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGd|%xdGd|%xdGd>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGe|%xdGe|%xdGe>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGf|%xdGf|%xdGf>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGg|%xdGg|%xdGg>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGh|%xdGh|%xdGh>
-%xl|H|codec.bmp|131|82|22|
-%?fc<%xdHa|%xdHb|%xdHc|%xdHd|%xdHe|%xdHf|%xdHg|%xdHh|%xdHi|%xdHj|%xdHk|%xdHl|%xdHm|%xdHn|%xdHo|%xdHp|%xdHq|%xdHr|%xdHs|%xdHt|%xdHu|%xdHv>
+%xl(A,battery.bmp,151,8,5)
+%t(0.5) %?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ab)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ac)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ad)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ae)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>
+%xl(B,hold.bmp,122,5,4)
+%?mh<%?mr<%xd(Ba)|%xd(Bb)>|%?mr<%xd(Bc)|%xd(Bd)>>
+%xl(C,repeat.bmp,91,6,5)
+%?mm<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)>
+%xl(D,shuffle.bmp,66,7,2)
+%?ps<%xd(Da)|%xd(Db)>
+%xl(E,playmode.bmp,6,7,4)
+%?mp<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+%xl(F,volume.bmp,24,3,9)
+%xl(G,animation.bmp,24,3,8)
+%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ga)|%xd(Ga)|%xd(Ga)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gb)|%xd(Gb)|%xd(Gb)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gc)|%xd(Gc)|%xd(Gc)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gd)|%xd(Gd)|%xd(Gd)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ge)|%xd(Ge)|%xd(Ge)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gf)|%xd(Gf)|%xd(Gf)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gg)|%xd(Gg)|%xd(Gg)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gh)|%xd(Gh)|%xd(Gh)>
+%xl(H,codec.bmp,131,82,22)
+%?fc<%xd(Ha)|%xd(Hb)|%xd(Hc)|%xd(Hd)|%xd(He)|%xd(Hf)|%xd(Hg)|%xd(Hh)|%xd(Hi)|%xd(Hj)|%xd(Hk)|%xd(Hl)|%xd(Hm)|%xd(Hn)|%xd(Ho)|%xd(Hp)|%xd(Hq)|%xd(Hr)|%xd(Hs)|%xd(Ht)|%xd(Hu)|%xd(Hv)>
diff --git a/wps/UniCatcher.176x220x16.wps b/wps/UniCatcher.176x220x16.wps
index 9f441aa181..cb556fff11 100644
--- a/wps/UniCatcher.176x220x16.wps
+++ b/wps/UniCatcher.176x220x16.wps
@@ -1,31 +1,31 @@
 %wd
-%X|bg-176x220x16-u.bmp|
+%X(bg-176x220x16-u.bmp)
 
 
-%t1 %?mp<%al Stopped%ar-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >;%t1 %?mp<%al Stopped-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
+%t(1) %?mp<%al Stopped%ar-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >%;%t(1) %?mp<%al Stopped-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
 %al   %bl%%%ar%pp/%pe 
 
-%s%ac%?ia<%ia|%?d2<%d2|Unknown Artist>>
-%s%ac%?id<%id|%?d1<%d1|Unknown Album>>
+%s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>>
+%s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>>
 %s%ac%?in<%in|%pp> - %?it<%it|%fn>
 
 
 %al %fbKbps
-%pb|-|10|-|156|4|
-%s%ac%Sx|Next:| %?It<%It|%?Fn<%Fn|?>>
+%pb(-,10,-,156,4)
+%s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>
 
-%xl|A|battery.bmp|151|8|5|
-%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAb|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAc|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAd|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAe|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>
-%xl|B|hold.bmp|122|5|4|
-%?mh<%?mr<%xdBa|%xdBb>|%?mr<%xdBc|%xdBd>>
-%xl|C|repeat.bmp|91|6|5|
-%?mm<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe>
-%xl|D|shuffle.bmp|66|7|2|
-%?ps<%xdDa|%xdDb>
-%xl|E|playmode.bmp|6|7|4|
-%?mp<|%xdEa|%xdEb|%xdEc|%xdEd>
-%xl|F|volume.bmp|24|3|9|
-%xl|G|animation.bmp|24|3|8|
-%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGa|%xdGa|%xdGa>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGb|%xdGb|%xdGb>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGc|%xdGc|%xdGc>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGd|%xdGd|%xdGd>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGe|%xdGe|%xdGe>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGf|%xdGf|%xdGf>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGg|%xdGg|%xdGg>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGh|%xdGh|%xdGh>
-%xl|H|codec.bmp|131|164|22|
-%?fc<%xdHa|%xdHb|%xdHc|%xdHd|%xdHe|%xdHf|%xdHg|%xdHh|%xdHi|%xdHj|%xdHk|%xdHl|%xdHm|%xdHn|%xdHo|%xdHp|%xdHq|%xdHr|%xdHs|%xdHt|%xdHu|%xdHv>
+%xl(A,battery.bmp,151,8,5)
+%t(0.5) %?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ab)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ac)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ad)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ae)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>
+%xl(B,hold.bmp,122,5,4)
+%?mh<%?mr<%xd(Ba)|%xd(Bb)>|%?mr<%xd(Bc)|%xd(Bd)>>
+%xl(C,repeat.bmp,91,6,5)
+%?mm<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)>
+%xl(D,shuffle.bmp,66,7,2)
+%?ps<%xd(Da)|%xd(Db)>
+%xl(E,playmode.bmp,6,7,4)
+%?mp<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+%xl(F,volume.bmp,24,3,9)
+%xl(G,animation.bmp,24,3,8)
+%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ga)|%xd(Ga)|%xd(Ga)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gb)|%xd(Gb)|%xd(Gb)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gc)|%xd(Gc)|%xd(Gc)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gd)|%xd(Gd)|%xd(Gd)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ge)|%xd(Ge)|%xd(Ge)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gf)|%xd(Gf)|%xd(Gf)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gg)|%xd(Gg)|%xd(Gg)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gh)|%xd(Gh)|%xd(Gh)>
+%xl(H,codec.bmp,131,164,22)
+%?fc<%xd(Ha)|%xd(Hb)|%xd(Hc)|%xd(Hd)|%xd(He)|%xd(Hf)|%xd(Hg)|%xd(Hh)|%xd(Hi)|%xd(Hj)|%xd(Hk)|%xd(Hl)|%xd(Hm)|%xd(Hn)|%xd(Ho)|%xd(Hp)|%xd(Hq)|%xd(Hr)|%xd(Hs)|%xd(Ht)|%xd(Hu)|%xd(Hv)>
diff --git a/wps/UniCatcher.220x176x16.wps b/wps/UniCatcher.220x176x16.wps
index 6054503224..392fb02a30 100644
--- a/wps/UniCatcher.220x176x16.wps
+++ b/wps/UniCatcher.220x176x16.wps
@@ -1,29 +1,29 @@
 %wd
-%X|bg-220x176x16-u.bmp|
+%X(bg-220x176x16-u.bmp)
 
 
-%t1 %?mp<%al Stopped%ar-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >;%t1 %?mp<%al Stopped-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
+%t(1) %?mp<%al Stopped%ar-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >%;%t(1) %?mp<%al Stopped-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
 %al  %bl%%%ar%pp/%pe 
-%s%ac%?ia<%ia|%?d2<%d2|Unknown Artist>>
-%s%ac%?id<%id|%?d1<%d1|Unknown Album>>
+%s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>>
+%s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>>
 %s%ac%?in<%in|%pp> - %?it<%it|%fn>
 %al %fbKbps
-%pb|-|11|-|198|6|
+%pb(-,11,-,198,6)
 
-%s%ac%Sx|Next:| %?It<%It|%?Fn<%Fn|?>>
+%s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>
 
-%xl|A|battery.bmp|194|9|5|
-%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAb|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAc|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAd|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAe|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>
-%xl|B|hold.bmp|165|6|4|
-%?mh<%?mr<%xdBa|%xdBb>|%?mr<%xdBc|%xdBd>>
-%xl|C|repeat.bmp|114|7|5|
-%?mm<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe>
-%xl|D|shuffle.bmp|89|8|2|
-%?ps<%xdDa|%xdDb>
-%xl|E|playmode.bmp|8|7|4|
-%?mp<|%xdEa|%xdEb|%xdEc|%xdEd>
-%xl|F|volume.bmp|25|4|9|
-%xl|G|animation.bmp|25|4|8|
-%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGa|%xdGa|%xdGa>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGb|%xdGb|%xdGb>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGc|%xdGc|%xdGc>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGd|%xdGd|%xdGd>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGe|%xdGe|%xdGe>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGf|%xdGf|%xdGf>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGg|%xdGg|%xdGg>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGh|%xdGh|%xdGh>
-%xl|H|codec.bmp|173|115|22|
-%?fc<%xdHa|%xdHb|%xdHc|%xdHd|%xdHe|%xdHf|%xdHg|%xdHh|%xdHi|%xdHj|%xdHk|%xdHl|%xdHm|%xdHn|%xdHo|%xdHp|%xdHq|%xdHr|%xdHs|%xdHt|%xdHu|%xdHv>
+%xl(A,battery.bmp,194,9,5)
+%t(0.5) %?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ab)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ac)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ad)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ae)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>
+%xl(B,hold.bmp,165,6,4)
+%?mh<%?mr<%xd(Ba)|%xd(Bb)>|%?mr<%xd(Bc)|%xd(Bd)>>
+%xl(C,repeat.bmp,114,7,5)
+%?mm<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)>
+%xl(D,shuffle.bmp,89,8,2)
+%?ps<%xd(Da)|%xd(Db)>
+%xl(E,playmode.bmp,8,7,4)
+%?mp<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+%xl(F,volume.bmp,25,4,9)
+%xl(G,animation.bmp,25,4,8)
+%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ga)|%xd(Ga)|%xd(Ga)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gb)|%xd(Gb)|%xd(Gb)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gc)|%xd(Gc)|%xd(Gc)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gd)|%xd(Gd)|%xd(Gd)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ge)|%xd(Ge)|%xd(Ge)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gf)|%xd(Gf)|%xd(Gf)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gg)|%xd(Gg)|%xd(Gg)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gh)|%xd(Gh)|%xd(Gh)>
+%xl(H,codec.bmp,173,115,22)
+%?fc<%xd(Ha)|%xd(Hb)|%xd(Hc)|%xd(Hd)|%xd(He)|%xd(Hf)|%xd(Hg)|%xd(Hh)|%xd(Hi)|%xd(Hj)|%xd(Hk)|%xd(Hl)|%xd(Hm)|%xd(Hn)|%xd(Ho)|%xd(Hp)|%xd(Hq)|%xd(Hr)|%xd(Hs)|%xd(Ht)|%xd(Hu)|%xd(Hv)>
diff --git a/wps/UniCatcher.240x320x16.wps b/wps/UniCatcher.240x320x16.wps
index 16b3606f04..e345e1f7d7 100644
--- a/wps/UniCatcher.240x320x16.wps
+++ b/wps/UniCatcher.240x320x16.wps
@@ -1,37 +1,37 @@
 %wd
-%X|bg-240x320x16-u.bmp|
+%X(bg-240x320x16-u.bmp)
 
 
 
-%t1 %?mp<%al Stopped%ar-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >;%t1 %?mp<%al Stopped-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
+%t(1) %?mp<%al Stopped%ar-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >%;%t(1) %?mp<%al Stopped-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
 %al   %bl%%%ar%pp/%pe 
 
 
 
-%s%ac%?ia<%ia|%?d2<%d2|Unknown Artist>>
-%s%ac%?id<%id|%?d1<%d1|Unknown Album>>
+%s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>>
+%s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>>
 %s%ac%?in<%in|%pp> - %?it<%it|%fn>
 
 
 
 
 %al %fbKbps
-%pb|-|11|-|218|7|
-
-%s%ac%Sx|Next:| %?It<%It|%?Fn<%Fn|?>>
-
-%xl|A|battery-b.bmp|204|12|5|
-%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAb|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAc|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAd|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAe|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>
-%xl|B|hold-b.bmp|164|8|4|
-%?mh<%?mr<%xdBa|%xdBb>|%?mr<%xdBc|%xdBd>>
-%xl|C|repeat-b.bmp|126|9|5|
-%?mm<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe>
-%xl|D|shuffle-b.bmp|91|11|2|
-%?ps<%xdDa|%xdDb>
-%xl|E|playmode-b.bmp|11|10|4|
-%?mp<|%xdEa|%xdEb|%xdEc|%xdEd>
-%xl|F|volume-b.bmp|34|5|9|
-%xl|G|animation-b.bmp|34|5|8|
-%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGa|%xdGa|%xdGa>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGb|%xdGb|%xdGb>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGc|%xdGc|%xdGc>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGd|%xdGd|%xdGd>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGe|%xdGe|%xdGe>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGf|%xdGf|%xdGf>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGg|%xdGg|%xdGg>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGh|%xdGh|%xdGh>
-%xl|H|codec-b.bmp|168|236|22|
-%?fc<%xdHa|%xdHb|%xdHc|%xdHd|%xdHe|%xdHf|%xdHg|%xdHh|%xdHi|%xdHj|%xdHk|%xdHl|%xdHm|%xdHn|%xdHo|%xdHp|%xdHq|%xdHr|%xdHs|%xdHt|%xdHu|%xdHv>
+%pb(-,11,-,218,7)
+
+%s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>
+
+%xl(A,battery-b.bmp,204,12,5)
+%t(0.5) %?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ab)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ac)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ad)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ae)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>
+%xl(B,hold-b.bmp,164,8,4)
+%?mh<%?mr<%xd(Ba)|%xd(Bb)>|%?mr<%xd(Bc)|%xd(Bd)>>
+%xl(C,repeat-b.bmp,126,9,5)
+%?mm<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)>
+%xl(D,shuffle-b.bmp,91,11,2)
+%?ps<%xd(Da)|%xd(Db)>
+%xl(E,playmode-b.bmp,11,10,4)
+%?mp<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+%xl(F,volume-b.bmp,34,5,9)
+%xl(G,animation-b.bmp,34,5,8)
+%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ga)|%xd(Ga)|%xd(Ga)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gb)|%xd(Gb)|%xd(Gb)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gc)|%xd(Gc)|%xd(Gc)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gd)|%xd(Gd)|%xd(Gd)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ge)|%xd(Ge)|%xd(Ge)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gf)|%xd(Gf)|%xd(Gf)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gg)|%xd(Gg)|%xd(Gg)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gh)|%xd(Gh)|%xd(Gh)>
+%xl(H,codec-b.bmp,168,236,22)
+%?fc<%xd(Ha)|%xd(Hb)|%xd(Hc)|%xd(Hd)|%xd(He)|%xd(Hf)|%xd(Hg)|%xd(Hh)|%xd(Hi)|%xd(Hj)|%xd(Hk)|%xd(Hl)|%xd(Hm)|%xd(Hn)|%xd(Ho)|%xd(Hp)|%xd(Hq)|%xd(Hr)|%xd(Hs)|%xd(Ht)|%xd(Hu)|%xd(Hv)>
diff --git a/wps/UniCatcher.320x240x16.wps b/wps/UniCatcher.320x240x16.wps
index 7edcd67300..e8c80734fd 100644
--- a/wps/UniCatcher.320x240x16.wps
+++ b/wps/UniCatcher.320x240x16.wps
@@ -1,32 +1,32 @@
 %wd
-%X|bg-320x240x16-u.bmp|
+%X(bg-320x240x16-u.bmp)
 
 
-%t1 %?mp<%al Stopped%ar-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >;%t1 %?mp<%al Stopped-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
+%t(1) %?mp<%al Stopped%ar-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >%;%t(1) %?mp<%al Stopped-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
 %al   %bl%%%ar%pp/%pe 
 
-%s%ac%?ia<%ia|%?d2<%d2|Unknown Artist>>
-%s%ac%?id<%id|%?d1<%d1|Unknown Album>>
+%s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>>
+%s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>>
 %s%ac%?in<%in|%pp> - %?it<%it|%fn>
 
 
 %al %fbKbps
-%pb|-|11|-|298|7|
+%pb(-,11,-,298,7)
 
-%s%ac%Sx|Next:| %?It<%It|%?Fn<%Fn|?>>
+%s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>
 
-%xl|A|battery-b.bmp|284|12|5|
-%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAb|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAc|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAd|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAe|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>
-%xl|B|hold-b.bmp|244|8|4|
-%?mh<%?mr<%xdBa|%xdBb>|%?mr<%xdBc|%xdBd>>
-%xl|C|repeat-b.bmp|166|9|5|
-%?mm<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe>
-%xl|D|shuffle-b.bmp|131|11|2|
-%?ps<%xdDa|%xdDb>
-%xl|E|playmode-b.bmp|11|10|4|
-%?mp<|%xdEa|%xdEb|%xdEc|%xdEd>
-%xl|F|volume-b.bmp|34|5|9|
-%xl|G|animation-b.bmp|34|5|8|
-%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGa|%xdGa|%xdGa>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGb|%xdGb|%xdGb>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGc|%xdGc|%xdGc>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGd|%xdGd|%xdGd>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGe|%xdGe|%xdGe>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGf|%xdGf|%xdGf>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGg|%xdGg|%xdGg>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGh|%xdGh|%xdGh>
-%xl|H|codec-b.bmp|248|158|22|
-%?fc<%xdHa|%xdHb|%xdHc|%xdHd|%xdHe|%xdHf|%xdHg|%xdHh|%xdHi|%xdHj|%xdHk|%xdHl|%xdHm|%xdHn|%xdHo|%xdHp|%xdHq|%xdHr|%xdHs|%xdHt|%xdHu|%xdHv>
+%xl(A,battery-b.bmp,284,12,5)
+%t(0.5) %?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ab)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ac)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ad)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ae)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>
+%xl(B,hold-b.bmp,244,8,4)
+%?mh<%?mr<%xd(Ba)|%xd(Bb)>|%?mr<%xd(Bc)|%xd(Bd)>>
+%xl(C,repeat-b.bmp,166,9,5)
+%?mm<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)>
+%xl(D,shuffle-b.bmp,131,11,2)
+%?ps<%xd(Da)|%xd(Db)>
+%xl(E,playmode-b.bmp,11,10,4)
+%?mp<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+%xl(F,volume-b.bmp,34,5,9)
+%xl(G,animation-b.bmp,34,5,8)
+%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ga)|%xd(Ga)|%xd(Ga)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gb)|%xd(Gb)|%xd(Gb)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gc)|%xd(Gc)|%xd(Gc)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gd)|%xd(Gd)|%xd(Gd)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ge)|%xd(Ge)|%xd(Ge)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gf)|%xd(Gf)|%xd(Gf)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gg)|%xd(Gg)|%xd(Gg)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gh)|%xd(Gh)|%xd(Gh)>
+%xl(H,codec-b.bmp,248,158,22)
+%?fc<%xd(Ha)|%xd(Hb)|%xd(Hc)|%xd(Hd)|%xd(He)|%xd(Hf)|%xd(Hg)|%xd(Hh)|%xd(Hi)|%xd(Hj)|%xd(Hk)|%xd(Hl)|%xd(Hm)|%xd(Hn)|%xd(Ho)|%xd(Hp)|%xd(Hq)|%xd(Hr)|%xd(Hs)|%xd(Ht)|%xd(Hu)|%xd(Hv)>
diff --git a/wps/WPSLIST b/wps/WPSLIST
index 13cb263865..91b1034700 100644
--- a/wps/WPSLIST
+++ b/wps/WPSLIST
@@ -20,10 +20,12 @@
 # All sections should list what font and status bar setting they "like".
 
 <wps>
-# Name of the WPS _including_ extension
-Name: ipodVOL.wps
+# Name of the theme
+Name: ipodVOL
+# Name of the WPS _excluding_ extension
+WPS: ipodVOL
 # default RWPS for the theme (to be loaded with the same theme file)
-RWPS: rockbox_default.rwps
+RWPS: rockbox_default
 # Name of the creator of the WPS
 Author: xameius
 # preferred font
@@ -42,10 +44,9 @@ selector type: bar (inverse)
 </wps>
 
 <wps>
-Name: rockbox_default.wps
-RWPS: rockbox_default.rwps
-SBS:
-RSBS:
+Name: rockbox_default
+WPS: rockbox_default
+RWPS: rockbox_default
 Author: Rockbox team
 Font: 08-Schumacher-Clean.fnt
 Font.11x2x1:
@@ -59,10 +60,9 @@ selector type: bar (inverse)
 </wps>
 
 <wps>
-Name: boxes.wps
-rwps: boxes.rwps
-SBS:
-RSBS:
+Name: boxes
+WPS: boxes
+rwps: boxes
 Author: Christi Scarborough (after Magnus Westerlund)
 Font: 08-Schumacher-Clean.fnt
 Statusbar: top
@@ -78,8 +78,9 @@ remote ui viewport:
 </wps>
 
 <wps>
-Name: engineeer2.wps
-RWPS: engineeer2.rwps
+Name: engineeer2
+WPS: engineeer2
+RWPS: engineeer2
 SBS:
 RSBS:
 Author: Magnus Westerlund
@@ -94,8 +95,9 @@ remote ui viewport:
 </wps>
 
 <wps>
-Name: iAmp.wps
-RWPS: iAmp.rwps
+Name: iAmp
+WPS: iAmp
+RWPS: iAmp
 SBS:
 RSBS:
 Author: Raymond Hoh
@@ -110,8 +112,9 @@ remote ui viewport:
 </wps>
 
 <wps>
-Name: zezayer.wps
-RWPS: zezayer.rwps
+Name: zezayer
+WPS: zezayer
+RWPS: zezayer
 SBS:
 RSBS:
 Author: Jake Owen
@@ -126,43 +129,44 @@ remote ui viewport:
 </wps>
 
 <rwps>
-Name: zezayer.rwps
+Name: zezayer
 Author: Dominik Riebeling
 Font: 08-Nedore.fnt
 Statusbar: top
 </rwps>
 
 <rwps>
-Name: rockbox_default.rwps
+Name: rockbox_default
 Author: Rockbox team
 Font: 08-Schumacher-Clean.fnt
 Statusbar: top
 </rwps>
 
 <rwps>
-Name: iAmp.rwps
+Name: iAmp
 Author: Raymond Hoh
 Font: 12-Nimbus.fnt
 Statusbar: top
 </rwps>
 
 <rwps>
-Name: boxes.rwps
+Name: boxes
 Author: Christi Scarborough
 Font: 08-Schumacher-Clean.fnt
 Statusbar: top
 </rwps>
 
 <rwps>
-Name: engineeer2.rwps
+Name: engineeer2
 Author: Magnus Westerlund
 Font: 08-Nedore.fnt
 Statusbar: top
 </rwps>
 
 <wps>
-Name: DancePuffDuo.wps
-RWPS: DancePuffDuo.rwps
+Name: DancePuffDuo
+WPS: DancePuffDuo
+RWPS: DancePuffDuo
 SBS:
 RSBS:
 Author: Chris Oxtoby
@@ -179,15 +183,16 @@ remote ui viewport:
 </wps>
 
 <rwps>
-Name: DancePuffDuo.rwps
+Name: DancePuffDuo
 Author: Chris Oxtoby
 Font: 13-Nimbus.fnt
 Statusbar: top
 </rwps>
 
 <wps>
-Name: iCatcher.wps
-RWPS: iCatcher.rwps
+Name: iCatcher
+WPS: iCatcher
+RWPS: iCatcher
 SBS:
 RSBS:
 Author: Ioannis Koutoulakis
@@ -216,7 +221,7 @@ remote ui viewport:
 </wps>
 
 <rwps>
-Name: iCatcher.rwps
+Name: iCatcher
 Author: Ioannis Koutoulakis
 Font.160x128x2: 09-Nedore.fnt
 Font.220x176x16: 14-Nimbus.fnt
@@ -224,8 +229,9 @@ Statusbar: top
 </rwps>
 
 <wps>
-Name: UniCatcher.wps
-RWPS: UniCatcher.rwps
+Name: UniCatcher
+WPS: UniCatcher
+RWPS: UniCatcher
 SBS:
 RSBS:
 Author: Ioannis Koutoulakis
@@ -242,15 +248,16 @@ remote ui viewport:
 </wps>
 
 <rwps>
-Name: UniCatcher.rwps
+Name: UniCatcher
 Author: Ioannis Koutoulakis
 Font: 16-GNU-Unifont.fnt
 Statusbar: top
 </rwps>
 
 <wps>
-Name: Rockboxed.wps
-RWPS: rockbox_default.rwps
+Name: Rockboxed
+WPS: Rockboxed
+RWPS: rockbox_default
 SBS:
 RSBS:
 Author: Roan Horning
@@ -279,13 +286,15 @@ remote ui viewport:
 </wps>
 
 <wps>
-Name: progressive.wps
+Name: progressive
+WPS: progressive
 Author: Jens Arnold
 </wps>
 
 <wps>
-Name: cabbiev2.wps
-RWPS: cabbiev2.rwps
+Name: cabbiev2
+WPS: cabbiev2
+RWPS: cabbiev2
 SBS:
 RSBS:
 # Real name of the creator of the WPS
@@ -381,7 +390,7 @@ remote ui viewport:
 </wps>
 
 <rwps>
-Name: cabbiev2.rwps
+Name: cabbiev2
 Author: Johannes Voggenthaler, Apoo Maha, Marc Guay, Alex Vanderpol, Jerry Lange, Keith Perri, Mark Fawcus, and Marianne Arnold with support from Rockbox developers and forums. Based on Cabbie by Yohann Misquitta.
 Font: 12-Adobe-Helvetica.fnt
 Statusbar: top
diff --git a/wps/boxes.112x64x1.wps b/wps/boxes.112x64x1.wps
index e7ad7e50d7..f3ed61adec 100644
--- a/wps/boxes.112x64x1.wps
+++ b/wps/boxes.112x64x1.wps
@@ -1,19 +1,19 @@
-%x|a|bg-112x64.bmp|0|0|
-%xl|A|volume.bmp|12|1|11|
-%xl|B|battery-small.bmp|92|0|6|
-%xl|C|repeat-small.bmp|0|6|4|
-%xl|D|navi.bmp|68|2|5|
-%xl|E|shf.bmp|14|6|
+%x(a,bg-112x64.bmp,0,0)
+%xl(A,volume.bmp,12,1,11)
+%xl(B,battery-small.bmp,92,0,6)
+%xl(C,repeat-small.bmp,0,6,4)
+%xl(D,navi.bmp,68,2,5)
+%xl(E,shf.bmp,14,6)
 %wd
 
 
-%ac%t5%s%?it<%it|%fn>;%ac%t5%s%?ia<%ia|%?d2<%d2|(Unknown Artist)>>
-%ac%t5%pc / %pt;%ac%t5Track %?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>
+%ac%t(5)%s%?it<%it|%fn>%;%ac%t(5)%s%?ia<%ia|%?d(2)<%d(2)|%(Unknown Artist%)>>
+%ac%t(5)%pc / %pt%;%ac%t(5)Track %?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>
 %pb
 
-%ac%t5%s%?It<%It|%Fn>;%ac%t5%s%?Ia<%Ia|%D2>
-%?pv<%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAf|%xdAg|%xdAh|%xdAi|%xdAj|%xdAk>
-%?bp<%xdBa|%?bl<%xdBb|%xdBc|%xdBd|%xdBe|%xdBf>>
-%?mm<|%xdCa|%xdCb|%xdCc|%Cd>
-%?mp<%xdDa|%xdDb|%xdDc|%xdDd|%xdDe>
-%?ps<%xdE|>
+%ac%t(5)%s%?It<%It|%Fn>%;%ac%t(5)%s%?Ia<%Ia|%D(2)>
+%?pv<%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Af)|%xd(Ag)|%xd(Ah)|%xd(Ai)|%xd(Aj)|%xd(Ak)>
+%?bp<%xd(Ba)|%?bl<%xd(Bb)|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)>>
+%?mm<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%Cd>
+%?mp<%xd(Da)|%xd(Db)|%xd(Dc)|%xd(Dd)|%xd(De)>
+%?ps<%xd(E)|>
diff --git a/wps/boxes.128x64x1.wps b/wps/boxes.128x64x1.wps
index dbbc80d99f..968af924ec 100644
--- a/wps/boxes.128x64x1.wps
+++ b/wps/boxes.128x64x1.wps
@@ -1,23 +1,23 @@
-%x|a|r-bg.bmp|0|0|
-%xl|A|volume.bmp|12|1|11|
-%xl|B|battery-small.bmp|109|0|6|
-%xl|C|repeat-small.bmp|0|6|4|
-%xl|D|navi.bmp|68|2|5|
-%xl|E|shf.bmp|14|6|
-%xl|F|lock-m.bmp|86|0|
-%xl|G|lock-r.bmp|98|0|
+%x(a,r-bg.bmp,0,0)
+%xl(A,volume.bmp,12,1,11)
+%xl(B,battery-small.bmp,109,0,6)
+%xl(C,repeat-small.bmp,0,6,4)
+%xl(D,navi.bmp,68,2,5)
+%xl(E,shf.bmp,14,6)
+%xl(F,lock-m.bmp,86,0)
+%xl(G,lock-r.bmp,98,0)
 %wd
 
 
-%ac%t5%s%?it<%it|%fn>;%ac%t5%s%?ia<%ia|%?d2<%d2|(Unknown Artist)>>
-%ac%t5%pc / %pt;%ac%t5Track %?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>
+%ac%t(5)%s%?it<%it|%fn>%;%ac%t(5)%s%?ia<%ia|%?d(2)<%d(2)|%(Unknown Artist%)>>
+%ac%t(5)%pc / %pt%;%ac%t(5)Track %?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>
 %pb
 
-%ac%t5%s%?It<%It|%Fn>;%ac%t5%s%?Ia<%Ia|%D2>
-%?pv<%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAf|%xdAg|%xdAh|%xdAi|%xdAj|%xdAk>
-%?bp<%xdBa|%?bl<%xdBb|%xdBc|%xdBd|%xdBe|%xdBf>>
-%?mm<|%xdCa|%xdCb|%xdCc|%xdCd>
-%?mp<%xdDa|%xdDb|%xdDc|%xdDd|%xdDe>
-%?ps<%xdE|>
-%?mh<%xdF|>
-%?mr<%xdG|>
+%ac%t(5)%s%?It<%It|%Fn>%;%ac%t(5)%s%?Ia<%Ia|%D(2)>
+%?pv<%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Af)|%xd(Ag)|%xd(Ah)|%xd(Ai)|%xd(Aj)|%xd(Ak)>
+%?bp<%xd(Ba)|%?bl<%xd(Bb)|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)>>
+%?mm<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)>
+%?mp<%xd(Da)|%xd(Db)|%xd(Dc)|%xd(Dd)|%xd(De)>
+%?ps<%xd(E)|>
+%?mh<%xd(F)|>
+%?mr<%xd(G)|>
diff --git a/wps/boxes.160x128x1.wps b/wps/boxes.160x128x1.wps
index d0b19228da..57c7c185d0 100644
--- a/wps/boxes.160x128x1.wps
+++ b/wps/boxes.160x128x1.wps
@@ -1,37 +1,37 @@
-%x|a|bg-160x128.bmp|0|0|
-%xl|A|codec.bmp|40|70|22|
-%xl|B|encoding.bmp|40|76|2|
-%xl|C|repeat.bmp|99|0|4|
-%xl|D|navi.bmp|68|3|5|
-%xl|E|shf.bmp|99|17|
-%xl|F|lock-m.bmp|87|0|
-%xl|G|lock-r.bmp|87|12|
-%xl|H|volume.bmp|12|1|11|
-%xl|I|battery.bmp|149|1|6|
-%xl|J|rating.bmp|91|68|11|
+%x(a,bg-160x128.bmp,0,0)
+%xl(A,codec.bmp,40,70,22)
+%xl(B,encoding.bmp,40,76,2)
+%xl(C,repeat.bmp,99,0,4)
+%xl(D,navi.bmp,68,3,5)
+%xl(E,shf.bmp,99,17)
+%xl(F,lock-m.bmp,87,0)
+%xl(G,lock-r.bmp,87,12)
+%xl(H,volume.bmp,12,1,11)
+%xl(I,battery.bmp,149,1,6)
+%xl(J,rating.bmp,91,68,11)
 %wd
 
 
 
 
 %ac%s%?it<%it|%fn>
-%ac%t5%s%?ia<%ia|%?d2<%d2|(Unknown Artist)>>;%ac%t5%s%?id<%id|%?d1<%d1|(Unknown Album)>>
+%ac%t(5)%s%?ia<%ia|%?d(2)<%d(2)|%(Unknown Artist%)>>%;%ac%t(5)%s%?id<%id|%?d(1)<%d(1)|%(Unknown Album%)>>
 
-%ac%t5%pc / %pt;%ac%t5Track %?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>
+%ac%t(5)%pc / %pt%;%ac%t(5)Track %?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>
 
  %fbk
 
 %pb
 
 
-%ac%t5%s%?It<%It|%Fn>;%ac%t5%s%?Ia<%Ia|%D2>
-%?pv<%xdHa|%xdHb|%xdHc|%xdHd|%xdHe|%xdHf|%xdHg|%xdHh|%xdHi|%xdHj|%xdHk>
-%?bp<%xdIa|%?bl<%xdIb|%xdIc|%xdId|%xdIe|%xdIf>>
-%?fc<%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAf|%xdAg|%xdAh|%xdAi|%xdAj|%xdAk|%xdAl|%xdAm|%xdAn|%xdAo|%xdAp|%xdAq|%xdAr|%xdAs|%xdAt|%xdAu|%xdAv>
-%?fv<%xdBa|%xdBb>
-%?mm<|%xdCa|%xdCb|%xdCc|%xdCd>
-%?mp<%xdDa|%xdDb|%xdDc|%xdDd|%xdDe>
-%?ps<%xdE|>
-%?mh<%xdF|>
-%?mr<%xdG|>
-%?rr<%xdJa|%xdJb|%xdJc|%xdJd|%xdJe|%xdJf|%xdJg|%xdJh|%xdJi|%xdJj|%xdJk>
+%ac%t(5)%s%?It<%It|%Fn>%;%ac%t(5)%s%?Ia<%Ia|%D(2)>
+%?pv<%xd(Ha)|%xd(Hb)|%xd(Hc)|%xd(Hd)|%xd(He)|%xd(Hf)|%xd(Hg)|%xd(Hh)|%xd(Hi)|%xd(Hj)|%xd(Hk)>
+%?bp<%xd(Ia)|%?bl<%xd(Ib)|%xd(Ic)|%xd(Id)|%xd(Ie)|%xd(If)>>
+%?fc<%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Af)|%xd(Ag)|%xd(Ah)|%xd(Ai)|%xd(Aj)|%xd(Ak)|%xd(Al)|%xd(Am)|%xd(An)|%xd(Ao)|%xd(Ap)|%xd(Aq)|%xd(Ar)|%xd(As)|%xd(At)|%xd(Au)|%xd(Av)>
+%?fv<%xd(Ba)|%xd(Bb)>
+%?mm<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)>
+%?mp<%xd(Da)|%xd(Db)|%xd(Dc)|%xd(Dd)|%xd(De)>
+%?ps<%xd(E)|>
+%?mh<%xd(F)|>
+%?mr<%xd(G)|>
+%?rr<%xd(Ja)|%xd(Jb)|%xd(Jc)|%xd(Jd)|%xd(Je)|%xd(Jf)|%xd(Jg)|%xd(Jh)|%xd(Ji)|%xd(Jj)|%xd(Jk)>
diff --git a/wps/boxes.176x132x16.wps b/wps/boxes.176x132x16.wps
index 26fcf0505d..3996f5f098 100644
--- a/wps/boxes.176x132x16.wps
+++ b/wps/boxes.176x132x16.wps
@@ -1,37 +1,37 @@
-%X|backdrop-176x132.bmp|
-%xl|A|codec.bmp|40|70|22|
-%xl|B|encoding.bmp|40|76|2|
-%xl|C|repeat.bmp|99|0|4|
-%xl|D|navi-colour.bmp|68|3|5|
-%xl|E|shf.bmp|99|17|
-%xl|F|lock-m.bmp|87|0|
-%xl|G|lock-r.bmp|87|12|
-%xl|H|volume-colour.bmp|12|1|11|
-%xl|I|battery-colour.bmp|149|1|6|
-%xl|J|rating-colour.bmp|91|68|11|
+%X(backdrop-176x132.bmp)
+%xl(A,codec.bmp,40,70,22)
+%xl(B,encoding.bmp,40,76,2)
+%xl(C,repeat.bmp,99,0,4)
+%xl(D,navi-colour.bmp,68,3,5)
+%xl(E,shf.bmp,99,17)
+%xl(F,lock-m.bmp,87,0)
+%xl(G,lock-r.bmp,87,12)
+%xl(H,volume-colour.bmp,12,1,11)
+%xl(I,battery-colour.bmp,149,1,6)
+%xl(J,rating-colour.bmp,91,68,11)
 %wd
 
 
 
 
 %ac%s%?it<%it|%fn>
-%ac%t5%s%?ia<%ia|%?d2<%d2|(Unknown Artist)>>;%ac%t5%s%?id<%id|%?d1<%d1|(Unknown Album)>>
+%ac%t(5)%s%?ia<%ia|%?d(2)<%d(2)|%(Unknown Artist%)>>%;%ac%t(5)%s%?id<%id|%?d(1)<%d(1)|%(Unknown Album%)>>
 
-%ac%t5%pc / %pt;%ac%t5Track %?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>
+%ac%t(5)%pc / %pt%;%ac%t(5)Track %?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>
 
  %fbk
 
 %pb
 
 
-%ac%t5%s%?It<%It|%Fn>;%ac%t5%s%?Ia<%Ia|%D2>
-%?pv<%xdHa|%xdHb|%xdHc|%xdHd|%xdHe|%xdHf|%xdHg|%xdHh|%xdHi|%xdHj|%xdHk>
-%?bp<%xdIa|%?bl<%xdIb|%xdIc|%xdId|%xdIe|%xdIf>>
-%?fc<%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAf|%xdAg|%xdAh|%xdAi|%xdAj|%xdAk|%xdAl|%xdAm|%xdAn|%xdAo|%xdAp|%xdAq|%xdAr|%xdAs|%xdAt|%xdAu|%xdAv>
-%?fv<%xdBa|%xdBb>
-%?mm<|%xdCa|%xdCb|%xdCc|%xdCd>
-%?mp<%xdDa|%xdDb|%xdDc|%xdDd|%xdDe>
-%?ps<%xdE|>
-%?mh<%xdF|>
-%?mr<%xdG|>
-%?rr<%xdJa|%xdJb|%xdJc|%xdJd|%xdJe|%xdJf|%xdJg|%xdJh|%xdJi|%xdJj|%xdJk>
+%ac%t(5)%s%?It<%It|%Fn>%;%ac%t(5)%s%?Ia<%Ia|%D(2)>
+%?pv<%xd(Ha)|%xd(Hb)|%xd(Hc)|%xd(Hd)|%xd(He)|%xd(Hf)|%xd(Hg)|%xd(Hh)|%xd(Hi)|%xd(Hj)|%xd(Hk)>
+%?bp<%xd(Ia)|%?bl<%xd(Ib)|%xd(Ic)|%xd(Id)|%xd(Ie)|%xd(If)>>
+%?fc<%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Af)|%xd(Ag)|%xd(Ah)|%xd(Ai)|%xd(Aj)|%xd(Ak)|%xd(Al)|%xd(Am)|%xd(An)|%xd(Ao)|%xd(Ap)|%xd(Aq)|%xd(Ar)|%xd(As)|%xd(At)|%xd(Au)|%xd(Av)>
+%?fv<%xd(Ba)|%xd(Bb)>
+%?mm<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)>
+%?mp<%xd(Da)|%xd(Db)|%xd(Dc)|%xd(Dd)|%xd(De)>
+%?ps<%xd(E)|>
+%?mh<%xd(F)|>
+%?mr<%xd(G)|>
+%?rr<%xd(Ja)|%xd(Jb)|%xd(Jc)|%xd(Jd)|%xd(Je)|%xd(Jf)|%xd(Jg)|%xd(Jh)|%xd(Ji)|%xd(Jj)|%xd(Jk)>
diff --git a/wps/boxes.220x176x16.wps b/wps/boxes.220x176x16.wps
index a5aac8508e..39ffb67dbd 100644
--- a/wps/boxes.220x176x16.wps
+++ b/wps/boxes.220x176x16.wps
@@ -1,45 +1,45 @@
-%X|backdrop-220x176.bmp|
-%xl|A|codec.bmp|40|102|22|
-%xl|B|encoding.bmp|40|108|2|
-%xl|C|repeat.bmp|124|10|4|
-%xl|D|navi-colour.bmp|83|11|5|
-%xl|E|shf.bmp|124|24|
-%xl|F|lock-m.bmp|104|10|
-%xl|G|lock-r.bmp|104|21|
-%xl|H|volume-colour.bmp|12|3|11|
-%xl|I|battery-colour.bmp|198|10|6|
-%xl|J|led-colour.bmp|186|12|
+%X(backdrop-220x176.bmp)
+%xl(A,codec.bmp,40,102,22)
+%xl(B,encoding.bmp,40,108,2)
+%xl(C,repeat.bmp,124,10,4)
+%xl(D,navi-colour.bmp,83,11,5)
+%xl(E,shf.bmp,124,24)
+%xl(F,lock-m.bmp,104,10)
+%xl(G,lock-r.bmp,104,21)
+%xl(H,volume-colour.bmp,12,3,11)
+%xl(I,battery-colour.bmp,198,10,6)
+%xl(J,led-colour.bmp,186,12)
 %wd
-%V|6|0|208|176|1|000000|B6C6E5|
-%ar%ca, %cb %cd %cH:%cM
+%V(6,0,208,176,1)%Vf(000000)%Vb(B6C6E5)
+%ar%ca%, %cb %cd %cH:%cM
 
 
 
 
 
 %ac%s%?it<%it|%fn>
-%ac%t5%s%?ia<%ia|%?d2<%d2|(Unknown Artist)>>;%ac%t5%s%?id<%id|%?d1<%d1|(Unknown Album)>>
+%ac%t(5)%s%?ia<%ia|%?d(2)<%d(2)|%(Unknown Artist%)>>%;%ac%t(5)%s%?id<%id|%?d(1)<%d(1)|%(Unknown Album%)>>
 
-%ac%t5%pc / %pt;%ac%t5Track %?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>
+%ac%t(5)%pc / %pt%;%ac%t(5)Track %?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>
 
 
 
   %fbk
 
-%pb|pb-220.bmp|0|-|208|8|
+%pb(pb-220.bmp,0,-,208,8)
 
 
-%ac%t5%s%?It<%It|%Fn>;%ac%t5%s%?Ia<%Ia|%D2>
+%ac%t(5)%s%?It<%It|%Fn>%;%ac%t(5)%s%?Ia<%Ia|%D(2)>
 
 
 %pm
-%?pv<%xdHa|%xdHb|%xdHc|%xdHd|%xdHe|%xdHf|%xdHg|%xdHh|%xdHi|%xdHj|%xdHk>
-%?bp<%xdIa|%?bl<%xdIb|%xdIc|%xdId|%xdIe|%xdIf>>
-%?fc<%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAf|%xdAg|%xdAh|%xdAi|%xdAj|%xdAk|%xdAl|%xdAm|%xdAn|%xdAo|%xdAp|%xdAq|%xdAr|%xdAs|%xdAt|%xdAu|%xdAv>
-%?fv<%xdBa|%xdBb>
-%?mm<|%xdCa|%xdCb|%xdCc|%xdCd>
-%?mp<%xdDa|%xdDb|%xdDc|%xdDd|%xdDe>
-%?ps<%xdE|>
-%?mh<%xdF|>
-%?mr<%xdG|>
-%?lh<%xdJ|>
+%?pv<%xd(Ha)|%xd(Hb)|%xd(Hc)|%xd(Hd)|%xd(He)|%xd(Hf)|%xd(Hg)|%xd(Hh)|%xd(Hi)|%xd(Hj)|%xd(Hk)>
+%?bp<%xd(Ia)|%?bl<%xd(Ib)|%xd(Ic)|%xd(Id)|%xd(Ie)|%xd(If)>>
+%?fc<%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Af)|%xd(Ag)|%xd(Ah)|%xd(Ai)|%xd(Aj)|%xd(Ak)|%xd(Al)|%xd(Am)|%xd(An)|%xd(Ao)|%xd(Ap)|%xd(Aq)|%xd(Ar)|%xd(As)|%xd(At)|%xd(Au)|%xd(Av)>
+%?fv<%xd(Ba)|%xd(Bb)>
+%?mm<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)>
+%?mp<%xd(Da)|%xd(Db)|%xd(Dc)|%xd(Dd)|%xd(De)>
+%?ps<%xd(E)|>
+%?mh<%xd(F)|>
+%?mr<%xd(G)|>
+%?lh<%xd(J)|>
diff --git a/wps/boxes.320x240x16.wps b/wps/boxes.320x240x16.wps
index 68aa9dfd60..1f4651a240 100644
--- a/wps/boxes.320x240x16.wps
+++ b/wps/boxes.320x240x16.wps
@@ -1,25 +1,25 @@
-%X|backdrop-320x240.bmp|
-%xl|A|codec.bmp|40|86|22|
-%xl|B|encoding.bmp|40|92|2|
-%xl|C|repeat.bmp|110|1|4|
-%xl|D|shf.bmp|110|17|
-%xl|E|navi-colour.bmp|83|3|5|
-%xl|F|lock-m.bmp|87|0|
-%xl|G|lock-r.bmp|87|12|
-%xl|H|volume-colour.bmp|12|1|11|
-%xl|I|battery-colour.bmp|240|1|6|
-%xl|J|rating-colour.bmp|230|84|11|
+%X(backdrop-320x240.bmp)
+%xl(A,codec.bmp,40,86,22)
+%xl(B,encoding.bmp,40,92,2)
+%xl(C,repeat.bmp,110,1,4)
+%xl(D,shf.bmp,110,17)
+%xl(E,navi-colour.bmp,83,3,5)
+%xl(F,lock-m.bmp,87,0)
+%xl(G,lock-r.bmp,87,12)
+%xl(H,volume-colour.bmp,12,1,11)
+%xl(I,battery-colour.bmp,240,1,6)
+%xl(J,rating-colour.bmp,230,84,11)
 %wd
 
 
 
 
 %ac%s%?it<%it|%fn>
-%ac%s%?ia<%ia|%?d2<%d2|(Unknown Artist)>>
-%ac%s%?id<%id|%?d1<%d1|(Unknown Album)>>
+%ac%s%?ia<%ia|%?d(2)<%d(2)|%(Unknown Artist%)>>
+%ac%s%?id<%id|%?d(1)<%d(1)|%(Unknown Album%)>>
 
-%acTrack %?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>
-%ac%pc / %pt (-%pr)
+%acTrack %?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>
+%ac%pc / %pt %(-%pr%)
 
  %fbk
 
@@ -27,15 +27,15 @@
 
 
 %ac%s%?It<%It|%Fn>
-%ac%s%?Ia<%Ia|%D2>
-%ac%s%?Id<%Id|%D1>
-%?pv<%xdHa|%xdHb|%xdHc|%xdHd|%xdHe|%xdHf|%xdHg|%xdHh|%xdHi|%xdHj|%xdHk>
-%?bp<%xdIa|%?bl<%xdIb|%xdIc|%xdId|%xdIe|%xdIf>>
-%?fc<%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAf|%xdAg|%xdAh|%xdAi|%xdAj|%xdAk|%xdAl|%xdAm|%xdAn|%xdAo|%xdAp|%xdAq|%xdAr|%xdAs|%xdAt|%xdAu|%xdAv>
-%?fv<%xdBa|%xdBb>
-%?mm<|%xdCa|%xdCb|%xdCc|%xdCd>
-%?mp<%xdEa|%xdEb|%xdEc|%xdEd|%xdEe>
-%?ps<%xdD|>
-%?mh<%xdF|>
-%?mr<%xdG|>
-%?rr<%xdJa|%xdJb|%xdJc|%xdJd|%xdJe|%xdJf|%xdJg|%xdJh|%xdJi|%xdJj|%xdJk>
+%ac%s%?Ia<%Ia|%D(2)>
+%ac%s%?Id<%Id|%D(1)>
+%?pv<%xd(Ha)|%xd(Hb)|%xd(Hc)|%xd(Hd)|%xd(He)|%xd(Hf)|%xd(Hg)|%xd(Hh)|%xd(Hi)|%xd(Hj)|%xd(Hk)>
+%?bp<%xd(Ia)|%?bl<%xd(Ib)|%xd(Ic)|%xd(Id)|%xd(Ie)|%xd(If)>>
+%?fc<%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Af)|%xd(Ag)|%xd(Ah)|%xd(Ai)|%xd(Aj)|%xd(Ak)|%xd(Al)|%xd(Am)|%xd(An)|%xd(Ao)|%xd(Ap)|%xd(Aq)|%xd(Ar)|%xd(As)|%xd(At)|%xd(Au)|%xd(Av)>
+%?fv<%xd(Ba)|%xd(Bb)>
+%?mm<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)>
+%?mp<%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)|%xd(Ee)>
+%?ps<%xd(D)|>
+%?mh<%xd(F)|>
+%?mr<%xd(G)|>
+%?rr<%xd(Ja)|%xd(Jb)|%xd(Jc)|%xd(Jd)|%xd(Je)|%xd(Jf)|%xd(Jg)|%xd(Jh)|%xd(Ji)|%xd(Jj)|%xd(Jk)>
diff --git a/wps/cabbiev2.112x64x1.wps b/wps/cabbiev2.112x64x1.wps
index 4f8078c2b3..9f5055fd2d 100644
--- a/wps/cabbiev2.112x64x1.wps
+++ b/wps/cabbiev2.112x64x1.wps
@@ -1,25 +1,25 @@
 # cabbie 2.0 default for the Archos Series by Marianne Arnold
 # derived from cabbie 2.0 default (C) 2007, Johannes Voggenthaler (Zinc Alloy)
 %wd
-%x|z|wpsbackdrop-112x64x1.bmp|0|0|
-%xl|A|lock-112x64x1.bmp|4|56|2|
-%xl|B|battery-112x64x1.bmp|22|56|9|
-%xl|C|volume-112x64x1.bmp|41|56|9|
-%xl|D|shuffle-112x64x1.bmp|59|56|
-%xl|E|repeat-112x64x1.bmp|81|56|4|
-%xl|F|playmode-112x64x1.bmp|98|56|5|
+%x(z,wpsbackdrop-112x64x1.bmp,0,0)
+%xl(A,lock-112x64x1.bmp,4,56,2)
+%xl(B,battery-112x64x1.bmp,22,56,9)
+%xl(C,volume-112x64x1.bmp,41,56,9)
+%xl(D,shuffle-112x64x1.bmp,59,56)
+%xl(E,repeat-112x64x1.bmp,81,56,4)
+%xl(F,playmode-112x64x1.bmp,98,56,5)
 #NowPlaying
 
 %s%ac%?it<%it|%fn>
-%s%ac%?ia<%ia|%?d2<%d2|(root)>>
-%s%ac%?id<%id|%?d1<%d1|(root)>>
-%t5%ac%s%?Fn<%Sx|Next:| %?It<%It|%Fn>|%ac%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>>;%t5%ac%s%?Fn<%Sx|Next:| %?Ia<%Ia|%Fn>|%ac%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>>
-%pb|pb-112x64x1.bmp|1|42|110|4|
+%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
+%t(5)%ac%s%?Fn<%Sx(Next:) %?It<%It|%Fn>|%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>>%;%t(5)%ac%s%?Fn<%Sx(Next:) %?Ia<%Ia|%Fn>|%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>>
+%pb(pb-112x64x1.bmp,1,42,110,4)
 %pc%ar%pr
 #Bottom status bar
-%?mh<%xdAa|%xdAb>
-%?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi>>
-%?pv<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi>
-%?ps<%xdD>
-%?mm<|%xdEa|%xdEb|%xdEc|%xdEd>
-%?mp<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe>
+%?mh<%xd(Aa)|%xd(Ab)>
+%?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)>>
+%?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)>
+%?ps<%xd(D)>
+%?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+%?mp<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)>
diff --git a/wps/cabbiev2.128x128x16.wps b/wps/cabbiev2.128x128x16.wps
index e2677118a2..dc06bc5a31 100644
--- a/wps/cabbiev2.128x128x16.wps
+++ b/wps/cabbiev2.128x128x16.wps
@@ -2,42 +2,42 @@
 # (C) 2007, Johannes Voggenthaler (Zinc Alloy)
 #derived from "cabbie" (C) Yohann Misquitta
 %wd
-%X|wpsbackdrop-128x128x16.bmp|
-%xl|A|lock-128x128x16.bmp|3|110|2|
-%xl|B|battery-128x128x16.bmp|23|110|10|
-%xl|C|volume-128x128x16.bmp|51|110|10|
-%xl|D|shuffle-128x128x16.bmp|74|110|
-%xl|E|repeat-128x128x16.bmp|97|110|4|
-%xl|F|playmode-128x128x16.bmp|111|110|5|
-%ax%Cl|4|12|s60|s60|
-%pb|pb-128x128x16.bmp|3|87|122|6|
+%X(wpsbackdrop-128x128x16.bmp)
+%xl(A,lock-128x128x16.bmp,3,110,2)
+%xl(B,battery-128x128x16.bmp,23,110,10)
+%xl(C,volume-128x128x16.bmp,51,110,10)
+%xl(D,shuffle-128x128x16.bmp,74,110)
+%xl(E,repeat-128x128x16.bmp,97,110,4)
+%xl(F,playmode-128x128x16.bmp,111,110,5)
+%ax%Cl(4,12,60,60)
+%pb(pb-128x128x16.bmp,3,87,122,6)
 # images all in the default viewport
-%?mh<%xdAa|%xdAb>
-%?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj>>
-%?pv<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi|%xdCj>
-%?ps<%xdD>
-%?mm<|%xdEa|%xdEb|%xdEc|%xdEd>
-%?mp<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe>
+%?mh<%xd(Aa)|%xd(Ab)>
+%?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>>
+%?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)>
+%?ps<%xd(D)>
+%?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+%?mp<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)>
 
-%?C<%C%Vda|%Vdb>
+%?C<%C%Vd(a)|%Vd(b)>
 
 
 #NowPlaying - with AA
-%ax%Vl|a|70|12|-|50|1|-|-|
+%ax%Vl(a,70,12,-,50,1)
 %s%al%?it<%it|%fn>
-%s%al%?ia<%ia|%?d2<%d2|(root)>>
-%s%al%?id<%id|%?d1<%d1|(root)>>
+%s%al%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%al%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%al%iy
 
 #NowPlaying - without AA
-%Vl|b|0|12|-|50|1|-|-|
+%Vl(b,0,12,-,50,1)
 %s%ac%?it<%it|%fn>
-%s%ac%?ia<%ia|%?d2<%d2|(root)>>
-%s%ac%?id<%id|%?d1<%d1|(root)>>
+%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%ac%iy
 
 #next and playlist
-%V|3|70|122|12|1|-|-|
-%s%ac%Sx|Next:| %?It<%It|%Fn>
-%V|3|95|122|12|1|-|-|
-%al%pc%ac%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>%ar%pr
+%V(3,70,122,12,1)
+%s%ac%Sx(Next:) %?It<%It|%Fn>
+%V(3,95,122,12,1)
+%al%pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr
diff --git a/wps/cabbiev2.128x128x2.wps b/wps/cabbiev2.128x128x2.wps
index ba2d87e69e..d092c59da9 100644
--- a/wps/cabbiev2.128x128x2.wps
+++ b/wps/cabbiev2.128x128x2.wps
@@ -2,42 +2,42 @@
 # (C) 2007, Johannes Voggenthaler (Zinc Alloy)
 #derived from "cabbie" (C) Yohann Misquitta
 %wd
-%X|wpsbackdrop-128x128x2.bmp|
-%xl|A|lock-160x128x2.bmp|3|114|2|
-%xl|B|battery-160x128x2.bmp|26|115|10|
-%xl|C|volume-160x128x2.bmp|49|114|10|
-%xl|D|shuffle-160x128x2.bmp|72|115|
-%xl|E|repeat-160x128x2.bmp|93|113|4|
-%xl|F|playmode-160x128x2.bmp|112|114|5|
-%ax%Cl|4|12|s60|s60|
-%pb|pb-128x96x2.bmp|1|87|125|7|
+%X(wpsbackdrop-128x128x2.bmp)
+%xl(A,lock-160x128x2.bmp,3,114,2)
+%xl(B,battery-160x128x2.bmp,26,115,10)
+%xl(C,volume-160x128x2.bmp,49,114,10)
+%xl(D,shuffle-160x128x2.bmp,72,115)
+%xl(E,repeat-160x128x2.bmp,93,113,4)
+%xl(F,playmode-160x128x2.bmp,112,114,5)
+%ax%Cl(4,12,60,60)
+%pb(pb-128x96x2.bmp,1,87,125,7)
 # images all in the default viewport
-%?mh<%xdAa|%xdAb>
-%?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj>>
-%?pv<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi|%xdCj>
-%?ps<%xdD>
-%?mm<|%xdEa|%xdEb|%xdEc|%xdEd>
-%?mp<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe>
+%?mh<%xd(Aa)|%xd(Ab)>
+%?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>>
+%?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)>
+%?ps<%xd(D)>
+%?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+%?mp<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)>
 
-%?C<%C%Vda|%Vdb>
+%?C<%C%Vd(a)|%Vd(b)>
 
 
 #NowPlaying - with AA
-%ax%Vl|a|70|12|-|50|1|-|-|
+%ax%Vl(a,70,12,-,50,1)
 %s%al%?it<%it|%fn>
-%s%al%?ia<%ia|%?d2<%d2|(root)>>
-%s%al%?id<%id|%?d1<%d1|(root)>>
+%s%al%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%al%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%al%iy
 
 #NowPlaying - without AA
-%Vl|b|0|12|-|50|1|-|-|
+%Vl(b,0,12,-,50,1)
 %s%ac%?it<%it|%fn>
-%s%ac%?ia<%ia|%?d2<%d2|(root)>>
-%s%ac%?id<%id|%?d1<%d1|(root)>>
+%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%ac%iy
 
 #next and playlist
-%V|3|70|122|12|1|-|-|
-%s%ac%Sx|Next:| %?It<%It|%Fn>
-%V|3|96|122|12|1|-|-|
-%al%pc%ac%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>%ar%pr
+%V(3,70,122,12,1)
+%s%ac%Sx(Next:) %?It<%It|%Fn>
+%V(3,96,122,12,1)
+%al%pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr
diff --git a/wps/cabbiev2.128x64x1.wps b/wps/cabbiev2.128x64x1.wps
index e99a554acd..f5b89d24e6 100644
--- a/wps/cabbiev2.128x64x1.wps
+++ b/wps/cabbiev2.128x64x1.wps
@@ -4,38 +4,38 @@
 %wd
 
 # progressbar viewport
-%V|0|0|128|6|1|
-%x|a|pbbackground-128x64x1.bmp|1|0|
-%pb|pb-128x64x1.bmp|2|1|124|4|
+%V(0,0,128,6,1)
+%x(a,pbbackground-128x64x1.bmp,1,0)
+%pb(pb-128x64x1.bmp,2,1,124,4)
 
-%V|0|8|128|8|1|
-%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>%ar%pc
+%V(0,8,128,8,1)
+%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pc
 
 # tag info viewport
-%V|0|16|128|24|1|
+%V(0,16,128,24,1)
 %ac%s%?it<%it|%fn>
-%ac%s%?ia<%ia|%?d2<%d2|(root)>>
-%ac%s%?id<%id|%?d1<%d1|(root)>>
+%ac%s%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%ac%s%?id<%id|%?d(1)<%d(1)|%(root%)>>
 
 # next file viewport
-%V|0|42|128|8|1|
-%ac%s%Sx|Next:| %?It<%It|%Fn>
+%V(0,42,128,8,1)
+%ac%s%Sx(Next:) %?It<%It|%Fn>
 
 # playtime info and status bar
 
-%V|2|52|124|12|1|
-%x|b|bar-128x64x1.bmp|2|0|
-%xl|A|lock-128x64x1.bmp|1|4|2|
-%xl|B|battery-128x64x1.bmp|23|4|9|
-%xl|C|volume-128x64x1.bmp|46|4|9|
-%xl|D|shuffle-128x64x1.bmp|67|5|
-%xl|E|repeat-128x64x1.bmp|93|4|4|
-%xl|F|playmode-128x64x1.bmp|113|4|5|
+%V(2,52,124,12,1)
+%x(b,bar-128x64x1.bmp,2,0)
+%xl(A,lock-128x64x1.bmp,1,4,2)
+%xl(B,battery-128x64x1.bmp,23,4,9)
+%xl(C,volume-128x64x1.bmp,46,4,9)
+%xl(D,shuffle-128x64x1.bmp,67,5)
+%xl(E,repeat-128x64x1.bmp,93,4,4)
+%xl(F,playmode-128x64x1.bmp,113,4,5)
 
 # status bar
-%?mh<%xdAa|%xdAb>
-%?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi>>
-%?pv<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi>
-%?ps<%xdD>
-%?mm<|%xdEa|%xdEb|%xdEc|%xdEd>
-%?mp<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe>
+%?mh<%xd(Aa)|%xd(Ab)>
+%?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)>>
+%?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)>
+%?ps<%xd(D)>
+%?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+%?mp<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)>
diff --git a/wps/cabbiev2.128x96x2.wps b/wps/cabbiev2.128x96x2.wps
index 70ecf2d5b5..32b35f512b 100644
--- a/wps/cabbiev2.128x96x2.wps
+++ b/wps/cabbiev2.128x96x2.wps
@@ -1,25 +1,25 @@
 # cabbie 2.0 default for the iAudio X5 Series by Marc Guay
 # derived from cabbie 2.0 default (C) 2007, Johannes Voggenthaler (Zinc Alloy)
 %wd
-%X|wpsbackdrop-128x96x2.bmp|
-%xl|A|lock-160x128x2.bmp|3|1|2|
-%xl|B|battery-160x128x2.bmp|26|2|10|
-%xl|C|volume-160x128x2.bmp|49|1|10|
-%xl|D|shuffle-160x128x2.bmp|72|2|
-%xl|E|repeat-160x128x2.bmp|93|0|4|
-%xl|F|playmode-160x128x2.bmp|112|1|5|
-%pb|pb-128x96x2.bmp|1|61|125|7|
-%V|0|83|128|13|1|0|3|
-%?mh<%xdAa|%xdAb>
-%?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj>>
-%?pv<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi|%xdCj>
-%?ps<%xdD>
-%?mm<|%xdEa|%xdEb|%xdEc|%xdEd>
-%?mp<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe>
-%V|0|10|128|72|1|0|3|
+%X(wpsbackdrop-128x96x2.bmp)
+%xl(A,lock-160x128x2.bmp,3,1,2)
+%xl(B,battery-160x128x2.bmp,26,2,10)
+%xl(C,volume-160x128x2.bmp,49,1,10)
+%xl(D,shuffle-160x128x2.bmp,72,2)
+%xl(E,repeat-160x128x2.bmp,93,0,4)
+%xl(F,playmode-160x128x2.bmp,112,1,5)
+%pb(pb-128x96x2.bmp,1,61,125,7)
+%V(0,83,128,13,1)%Vf(0)%Vb(3)
+%?mh<%xd(Aa)|%xd(Ab)>
+%?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>>
+%?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)>
+%?ps<%xd(D)>
+%?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+%?mp<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)>
+%V(0,10,128,72,1)%Vf(0)%Vb(3)
 %s%ac%?it<%it|%fn>
-%s%ac%?ia<%ia|%?d2<%d2|(root)>>
-%s%ac%?id<%id|%?d1<%d1|(root)>>
-%s%Sx|Next:| %ac%It
+%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
+%s%Sx(Next:) %ac%It
 
-%al %pc%ac%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>%ar%pr 
+%al %pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr 
diff --git a/wps/cabbiev2.132x80x16.wps b/wps/cabbiev2.132x80x16.wps
index bdda779243..8878279925 100644
--- a/wps/cabbiev2.132x80x16.wps
+++ b/wps/cabbiev2.132x80x16.wps
@@ -1,35 +1,35 @@
 # cabbie 2.0 default for the Sansa c200 Series by Marc Guay
 # derived from cabbie 2.0 default (C) 2007, Johannes Voggenthaler (Zinc Alloy)
 %wd
-%X|wpsbackdrop-132x80x16.bmp|
-%xl|A|lock-132x80x16.bmp|36|69|2|
-%xl|B|battery-132x80x16.bmp|51|69|10|
-%xl|C|volume-132x80x16.bmp|69|69|10|
-%xl|D|shuffle-132x80x16.bmp|86|69|
-%xl|E|repeat-132x80x16.bmp|105|67|4|
-%xl|F|playmode-132x80x16.bmp|118|67|5|
-%ax%Cl|3|14|c40|c40|
-%pb|pb-132x80x16.bmp|2|58|127|6|
-%?C<%C%Vda|%Vdb>
+%X(wpsbackdrop-132x80x16.bmp)
+%xl(A,lock-132x80x16.bmp,36,69,2)
+%xl(B,battery-132x80x16.bmp,51,69,10)
+%xl(C,volume-132x80x16.bmp,69,69,10)
+%xl(D,shuffle-132x80x16.bmp,86,69)
+%xl(E,repeat-132x80x16.bmp,105,67,4)
+%xl(F,playmode-132x80x16.bmp,118,67,5)
+%ax%Cl(3,14,40,40,c,c)
+%pb(pb-132x80x16.bmp,2,58,127,6)
+%?C<%C%Vd(a)|%Vd(b)>
 
 #Images
-%?mh<%xdAa|%xdAb>
-%?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj>>
-%?pv<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi|%xdCj>
-%?ps<%xdD>
-%?mm<|%xdEa|%xdEb|%xdEc|%xdEd>
-%?mp<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe>
+%?mh<%xd(Aa)|%xd(Ab)>
+%?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>>
+%?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)>
+%?ps<%xd(D)>
+%?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+%?mp<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)>
 
 #NowPlaying - aa
-%ax%Vl|a|48|10|-|48|1|-|-|
+%ax%Vl(a,48,10,-,48,1)
 %s%al%?it<%it|%fn>
-%s%al%?ia<%ia|%?d2<%d2|(root)>>
-%s%al%?id<%id|%?d1<%d1|(root)>>
-%s%al%Sx|Next:| %?It<%It|%Fn>
+%s%al%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%al%?id<%id|%?d(1)<%d(1)|%(root%)>>
+%s%al%Sx(Next:) %?It<%It|%Fn>
 
 #NowPlaying - no aa
-%Vl|b|0|10|-|48|1|-|-|
+%Vl(b,0,10,-,48,1)
 %s%ac%?it<%it|%fn>
-%s%ac%?ia<%ia|%?d2<%d2|(root)>>
-%s%ac%?id<%id|%?d1<%d1|(root)>>
-%s%ac%Sx|Next:| %?It<%It|%Fn>
+%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
+%s%ac%Sx(Next:) %?It<%It|%Fn>
diff --git a/wps/cabbiev2.138x110x2.wps b/wps/cabbiev2.138x110x2.wps
index 12fbe0b4f9..6325461b4a 100644
--- a/wps/cabbiev2.138x110x2.wps
+++ b/wps/cabbiev2.138x110x2.wps
@@ -3,37 +3,37 @@
 # (C) 2007, Johannes Voggenthaler (Zinc Alloy)
 # derived from "cabbie" (C) Yohann Misquitta
 %wd
-%X|wpsbackdrop-138x110x2.bmp|
-%xl|A|lock-160x128x2.bmp|4|98|2|
-%xl|B|battery-160x128x2.bmp|28|99|10|
-%xl|C|volume-160x128x2.bmp|53|98|10|
-%xl|D|shuffle-160x128x2.bmp|78|97|
-%xl|E|repeat-160x128x2.bmp|102|97|4|
-%xl|F|playmode-160x128x2.bmp|123|98|5|
-%ax%Cl|5|15|s55|s55|
-%pb|pb-138x110x2.bmp|2|75|134|6|
+%X(wpsbackdrop-138x110x2.bmp)
+%xl(A,lock-160x128x2.bmp,4,98,2)
+%xl(B,battery-160x128x2.bmp,28,99,10)
+%xl(C,volume-160x128x2.bmp,53,98,10)
+%xl(D,shuffle-160x128x2.bmp,78,97)
+%xl(E,repeat-160x128x2.bmp,102,97,4)
+%xl(F,playmode-160x128x2.bmp,123,98,5)
+%ax%Cl(5,15,55,55)
+%pb(pb-138x110x2.bmp,2,75,134,6)
 #images
-%?mh<%xdAa|%xdAb>
-%?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj>>
-%?pv<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi|%xdCj>
-%?ps<%xdD>
-%?mm<|%xdEa|%xdEb|%xdEc|%xdEd>
-%?mp<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe>
-%?C<%C%Vda|%Vdb>
+%?mh<%xd(Aa)|%xd(Ab)>
+%?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>>
+%?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)>
+%?ps<%xd(D)>
+%?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+%?mp<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)>
+%?C<%C%Vd(a)|%Vd(b)>
 
-%ax%Vl|a|65|10|-|60|1|-|-|
+%ax%Vl(a,65,10,-,60,1)
 %s%al%?it<%it|%fn>
-%s%al%?ia<%ia|%?d2<%d2|(root)>>
-%s%al%?id<%id|%?d1<%d1|(root)>>
-%s%al%Sx|Next Track:|
+%s%al%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%al%?id<%id|%?d(1)<%d(1)|%(root%)>>
+%s%al%Sx(Next Track:)
 %s%al%?It<%It|%Fn>
 
-%Vl|b|0|10|-|60|1|-|-|
+%Vl(b,0,10,-,60,1)
 %s%ac%?it<%it|%fn>
-%s%ac%?ia<%ia|%?d2<%d2|(root)>>
-%s%ac%?id<%id|%?d1<%d1|(root)>>
-%s%ac%Sx|Next Track:|
+%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
+%s%ac%Sx(Next Track:)
 %s%ac%?It<%It|%Fn>
 
-%V|2|82|134|13|1|-|-|
-%al%pc%ac%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>%ar%pr
+%V(2,82,134,13,1)
+%al%pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr
diff --git a/wps/cabbiev2.160x128x1.wps b/wps/cabbiev2.160x128x1.wps
index d367a0ca59..6c7891151b 100644
--- a/wps/cabbiev2.160x128x1.wps
+++ b/wps/cabbiev2.160x128x1.wps
@@ -4,25 +4,25 @@
 # (C) 2007, Johannes Voggenthaler (Zinc Alloy)
 # derived from "cabbie" (C) Yohann Misquitta
 %wd
-%x|z|wpsbackdrop-160x128x1.bmp|0|0|
-%xl|A|lock-160x128x1.bmp|48|114|2|
-%xl|B|battery-160x128x1.bmp|66|115|10|
-%xl|C|volume-160x128x1.bmp|87|114|10|
-%xl|D|shuffle-160x128x1.bmp|107|115|
-%xl|E|repeat-160x128x1.bmp|127|113|4|
-%xl|F|playmode-160x128x1.bmp|145|114|5|
-%pb|pb-160x128x1.bmp|1|86|158|8|
+%x(z,wpsbackdrop-160x128x1.bmp,0,0)
+%xl(A,lock-160x128x1.bmp,48,114,2)
+%xl(B,battery-160x128x1.bmp,66,115,10)
+%xl(C,volume-160x128x1.bmp,87,114,10)
+%xl(D,shuffle-160x128x1.bmp,107,115)
+%xl(E,repeat-160x128x1.bmp,127,113,4)
+%xl(F,playmode-160x128x1.bmp,145,114,5)
+%pb(pb-160x128x1.bmp,1,86,158,8)
 %s%ac%?it<%it|%fn>
-%s%ac%?ia<%ia|%?d2<%d2|(root)>>
-%s%ac%?id<%id|%?d1<%d1|(root)>>
+%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 
-%s%ac%Sx|Next Track:|
+%s%ac%Sx(Next Track:)
 %s%ac%?It<%It|%Fn>
 
-%al %pc%ac%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>%ar%pr 
-%?mh<%xdAa|%xdAb>
-%?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj>>
-%?pv<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi|%xdCj>
-%?ps<%xdD>
-%?mm<|%xdEa|%xdEb|%xdEc|%xdEd>
-%?mp<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe>
+%al %pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr 
+%?mh<%xd(Aa)|%xd(Ab)>
+%?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>>
+%?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)>
+%?ps<%xd(D)>
+%?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+%?mp<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)>
diff --git a/wps/cabbiev2.160x128x16.wps b/wps/cabbiev2.160x128x16.wps
index f722acc555..4c5b112aaf 100644
--- a/wps/cabbiev2.160x128x16.wps
+++ b/wps/cabbiev2.160x128x16.wps
@@ -2,41 +2,41 @@
 # (C) 2007, Johannes Voggenthaler (Zinc Alloy)
 #derived from "cabbie" (C) Yohann Misquitta
 %wd
-%X|wpsbackdrop-160x128x16.bmp|
-%xl|A|lock-160x128x16.bmp|48|114|2|
-%xl|B|battery-160x128x16.bmp|66|115|10|
-%xl|C|volume-160x128x16.bmp|86|115|10|
-%xl|D|shuffle-160x128x16.bmp|104|116|
-%xl|E|repeat-160x128x16.bmp|125|112|4|
-%xl|F|playmode-160x128x16.bmp|142|114|5|
-%ax%Cl|7|16|c65|c65|
-%pb|pb-160x128x16.bmp|6|86|149|8|
-%?mh<%xdAa|%xdAb>
-%?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj>>
-%?pv<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi|%xdCj>
-%?ps<%xdD>
-%?mm<|%xdEa|%xdEb|%xdEc|%xdEd>
-%?mp<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe>
-%?C<%C%Vda|%Vdb>
+%X(wpsbackdrop-160x128x16.bmp)
+%xl(A,lock-160x128x16.bmp,48,114,2)
+%xl(B,battery-160x128x16.bmp,66,115,10)
+%xl(C,volume-160x128x16.bmp,86,115,10)
+%xl(D,shuffle-160x128x16.bmp,104,116)
+%xl(E,repeat-160x128x16.bmp,125,112,4)
+%xl(F,playmode-160x128x16.bmp,142,114,5)
+%ax%Cl(7,16,65,65,c,c)
+%pb(pb-160x128x16.bmp,6,86,149,8)
+%?mh<%xd(Aa)|%xd(Ab)>
+%?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>>
+%?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)>
+%?ps<%xd(D)>
+%?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+%?mp<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)>
+%?C<%C%Vd(a)|%Vd(b)>
 
 # NowPlaying - AA
-%ax%Vl|a|77|10|-|75|1|-|-|
+%ax%Vl(a,77,10,-,75,1)
 %s%al%?it<%it|%fn>
-%s%al%?ia<%ia|%?d2<%d2|(root)>>
-%s%al%?id<%id|%?d1<%d1|(root)>>
+%s%al%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%al%?id<%id|%?d(1)<%d(1)|%(root%)>>
 
-%Sx|Next Track:|
+%Sx(Next Track:)
 %s%?It<%It|%Fn>
 
 # NowPlaying - no AA
-%Vl|b|0|10|-|75|1|-|-|
+%Vl(b,0,10,-,75,1)
 %s%ac%?it<%it|%fn>
-%s%ac%?ia<%ia|%?d2<%d2|(root)>>
-%s%ac%?id<%id|%?d1<%d1|(root)>>
+%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 
-%Sx|Next Track:|
+%Sx(Next Track:)
 %s%?It<%It|%Fn>
 
-%V|6|96|149|10|1|-|-|
-%al%pc%ac%pc%ac%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>%ar%pr%ar%pr
+%V(6,96,149,10,1)
+%al%pc%ac%pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr%ar%pr
 
diff --git a/wps/cabbiev2.160x128x2.wps b/wps/cabbiev2.160x128x2.wps
index e0d01487ab..70e8bd5faf 100644
--- a/wps/cabbiev2.160x128x2.wps
+++ b/wps/cabbiev2.160x128x2.wps
@@ -4,39 +4,39 @@
 # (C) 2007, Johannes Voggenthaler (Zinc Alloy)
 # derived from "cabbie" (C) Yohann Misquitta
 %wd
-%X|wpsbackdrop-160x128x2.bmp|
-%xl|A|lock-160x128x2.bmp|48|114|2|
-%xl|B|battery-160x128x2.bmp|66|115|10|
-%xl|C|volume-160x128x2.bmp|87|114|10|
-%xl|D|shuffle-160x128x2.bmp|107|115|
-%xl|E|repeat-160x128x2.bmp|127|113|4|
-%xl|F|playmode-160x128x2.bmp|145|114|5|
-%ax%Cl|2|16|s64|s64|
-%pb|pb-160x128x2.bmp|1|86|158|8|
-%?mh<%xdAa|%xdAb>
-%?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj>>
-%?pv<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi|%xdCj>
-%?ps<%xdD>
-%?mm<|%xdEa|%xdEb|%xdEc|%xdEd>
-%?mp<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe>
-%?C<%C%Vda|%Vdb>
+%X(wpsbackdrop-160x128x2.bmp)
+%xl(A,lock-160x128x2.bmp,48,114,2)
+%xl(B,battery-160x128x2.bmp,66,115,10)
+%xl(C,volume-160x128x2.bmp,87,114,10)
+%xl(D,shuffle-160x128x2.bmp,107,115)
+%xl(E,repeat-160x128x2.bmp,127,113,4)
+%xl(F,playmode-160x128x2.bmp,145,114,5)
+%ax%Cl(2,16,64,64)
+%pb(pb-160x128x2.bmp,1,86,158,8)
+%?mh<%xd(Aa)|%xd(Ab)>
+%?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>>
+%?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)>
+%?ps<%xd(D)>
+%?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+%?mp<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)>
+%?C<%C%Vd(a)|%Vd(b)>
 
-%ax%Vl|a|70|10|-|75|1|-|-|
+%ax%Vl(a,70,10,-,75,1)
 %s%al%?it<%it|%fn>
-%s%al%?ia<%ia|%?d2<%d2|(root)>>
-%s%al%?id<%id|%?d1<%d1|(root)>>
+%s%al%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%al%?id<%id|%?d(1)<%d(1)|%(root%)>>
 
-%s%al%Sx|Next Track:|
+%s%al%Sx(Next Track:)
 %s%al%?It<%It|%Fn>
 
-%Vl|b|0|10|-|75|1|-|-|
+%Vl(b,0,10,-,75,1)
 %s%ac%?it<%it|%fn>
-%s%ac%?ia<%ia|%?d2<%d2|(root)>>
-%s%ac%?id<%id|%?d1<%d1|(root)>>
+%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 
-%s%ac%Sx|Next Track:|
+%s%ac%Sx(Next Track:)
 %s%ac%?It<%It|%Fn>
 
-%V|1|96|158|10|1|-|-|
-%al%pc%ac%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>%ar%pr
+%V(1,96,158,10,1)
+%al%pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr
 
diff --git a/wps/cabbiev2.176x132x16.wps b/wps/cabbiev2.176x132x16.wps
index 7db1212ba2..38dddd15c5 100644
--- a/wps/cabbiev2.176x132x16.wps
+++ b/wps/cabbiev2.176x132x16.wps
@@ -3,39 +3,39 @@
 #derived from "cabbie" (C) Yohann Misquitta
 #Ported to nano by crzyboyster
 %wd
-%X|wpsbackdrop-176x132x16.bmp|
-%xl|A|lock-176x132x16.bmp|65|116|2|
-%xl|B|battery-176x132x16.bmp|83|117|10|
-%xl|C|volume-176x132x16.bmp|102|117|10|
-%xl|D|shuffle-176x132x16.bmp|120|117|
-%xl|E|repeat-176x132x16.bmp|139|113|4|
-%xl|F|playmode-176x132x16.bmp|156|115|5|
-%ax%Cl|9|16|s65|s65|
-%pb|pb-176x132x16.bmp|8|86|160|8|
-%?mh<%xdAa|%xdAb>
-%?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj>>
-%?pv<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi|%xdCj>
-%?ps<%xdD>
-%?mm<|%xdEa|%xdEb|%xdEc|%xdEd>
-%?mp<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe>
-%?C<%C%Vda|%Vdb>
+%X(wpsbackdrop-176x132x16.bmp)
+%xl(A,lock-176x132x16.bmp,65,116,2)
+%xl(B,battery-176x132x16.bmp,83,117,10)
+%xl(C,volume-176x132x16.bmp,102,117,10)
+%xl(D,shuffle-176x132x16.bmp,120,117)
+%xl(E,repeat-176x132x16.bmp,139,113,4)
+%xl(F,playmode-176x132x16.bmp,156,115,5)
+%ax%Cl(9,16,65,65)
+%pb(pb-176x132x16.bmp,8,86,160,8)
+%?mh<%xd(Aa)|%xd(Ab)>
+%?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>>
+%?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)>
+%?ps<%xd(D)>
+%?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+%?mp<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)>
+%?C<%C%Vd(a)|%Vd(b)>
 
 #NowPlaying
-%ax%Vl|a|81|12|-|74|1|-|-|
+%ax%Vl(a,81,12,-,74,1)
 %s%al%?it<%it|%fn>
-%s%al%?ia<%ia|%?d2<%d2|(root)>>
-%s%al%?id<%id|%?d1<%d1|(root)>>
+%s%al%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%al%?id<%id|%?d(1)<%d(1)|%(root%)>>
 
-%s%al%Sx|Next Track:|
+%s%al%Sx(Next Track:)
 %s%al%?It<%It|%Fn>
 
-%Vl|b|0|12|-|74|1|-|-|
+%Vl(b,0,12,-,74,1)
 %s%ac%?it<%it|%fn>
-%s%ac%?ia<%ia|%?d2<%d2|(root)>>
-%s%ac%?id<%id|%?d1<%d1|(root)>>
+%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 
-%ac%Sx|Next Track:|
+%ac%Sx(Next Track:)
 %s%ac%?It<%It|%Fn>
 
-%V|8|96|160|12|1|-|-|
-%al%pc%ac%pc%ac%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>%ar%pr%ar%pr
+%V(8,96,160,12,1)
+%al%pc%ac%pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr%ar%pr
diff --git a/wps/cabbiev2.176x220x16.wps b/wps/cabbiev2.176x220x16.wps
index b53ed80f86..86838bef62 100644
--- a/wps/cabbiev2.176x220x16.wps
+++ b/wps/cabbiev2.176x220x16.wps
@@ -1,36 +1,36 @@
 # cabbie 2.0 default for the Sansa e200 Series by Marc Guay
 # derived from cabbie 2.0 default (C) 2007, Johannes Voggenthaler (Zinc Alloy)
 %wd
-%X|wpsbackdrop-176x220x16.bmp|
-%xl|A|lock-176x220x16.bmp|51|204|2|
-%xl|B|battery-176x220x16.bmp|73|206|10|
-%xl|C|volume-176x220x16.bmp|97|206|10|
-%xl|D|shuffle-176x220x16.bmp|119|207|
-%xl|E|repeat-176x220x16.bmp|144|204|4|
-%xl|F|playmode-176x220x16.bmp|159|204|5|
-%Cl|29|20|c120|c120|
-%pb|pb-176x220x16.bmp|5|182|166|8|
+%X(wpsbackdrop-176x220x16.bmp)
+%xl(A,lock-176x220x16.bmp,51,204,2)
+%xl(B,battery-176x220x16.bmp,73,206,10)
+%xl(C,volume-176x220x16.bmp,97,206,10)
+%xl(D,shuffle-176x220x16.bmp,119,207)
+%xl(E,repeat-176x220x16.bmp,144,204,4)
+%xl(F,playmode-176x220x16.bmp,159,204,5)
+%Cl(29,20,120,120,c,c)
+%pb(pb-176x220x16.bmp,5,182,166,8)
 #NowPlaying
 
 
 %?C<|%s%ac%?it<%it|%fn>>
-%?C<|%s%ac%?ia<%ia|%?d2<%d2|(root)>>>
-%?C<|%s%ac%?id<%id|%?d1<%d1|(root)>>>
+%?C<|%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>>
+%?C<|%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>>
 %?C<|%s%ac%?iy<%iy|>>
 
-%?C<|%s%ac%Sx|Next Track:|>
+%?C<|%s%ac%Sx(Next Track:)>
 %?C<|%s%ac%?It<%It|%Fn>>
 %?C<|%s%ac%?Ia<%Ia|>>
 
 %?C<%s%ac%?it<%it|%fn>|>
-%?C<%s%ac%?ia<%ia|%?d2<%d2|(root)>>|>
-%?C<%s%ac%?id<%id|%?d1<%d1|(root)>>|>
+%?C<%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>|>
+%?C<%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>|>
 
-%al    %pc%ac%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>%ar%pr   
-%?mh<%xdAa|%xdAb>
-%?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj>>
-%?pv<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi|%xdCj>
-%?ps<%xdD>
-%?mm<|%xdEa|%xdEb|%xdEc|%xdEd>
-%?mp<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe>
+%al    %pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr   
+%?mh<%xd(Aa)|%xd(Ab)>
+%?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>>
+%?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)>
+%?ps<%xd(D)>
+%?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+%?mp<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)>
 %?C<%C>
diff --git a/wps/cabbiev2.220x176x16.wps b/wps/cabbiev2.220x176x16.wps
index 0f20ed4eea..10fa408980 100644
--- a/wps/cabbiev2.220x176x16.wps
+++ b/wps/cabbiev2.220x176x16.wps
@@ -2,41 +2,41 @@
 # (C) 2007, Johannes Voggenthaler (Zinc Alloy)
 #derived from "cabbie" (C) Yohann Misquitta
 %wd
-%X|wpsbackdrop-220x176x16.bmp|
-%xl|A|lock-220x176x16.bmp|88|152|2|
-%xl|B|battery-220x176x16.bmp|110|153|10|
-%xl|C|volume-220x176x16.bmp|134|153|10|
-%xl|D|shuffle-220x176x16.bmp|155|153|
-%xl|E|repeat-220x176x16.bmp|182|151|4|
-%xl|F|playmode-220x176x16.bmp|200|152|5|
-%ax%Cl|15|32|s75|s75|
-%pb|pb-220x176x16.bmp|11|121|199|8|
-%?mh<%xdAa|%xdAb>
-%?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj>>
-%?pv<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi|%xdCj>
-%?ps<%xdD>
-%?mm<|%xdEa|%xdEb|%xdEc|%xdEd>
-%?mp<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe>
+%X(wpsbackdrop-220x176x16.bmp)
+%xl(A,lock-220x176x16.bmp,88,152,2)
+%xl(B,battery-220x176x16.bmp,110,153,10)
+%xl(C,volume-220x176x16.bmp,134,153,10)
+%xl(D,shuffle-220x176x16.bmp,155,153)
+%xl(E,repeat-220x176x16.bmp,182,151,4)
+%xl(F,playmode-220x176x16.bmp,200,152,5)
+%ax%Cl(15,32,75,75)
+%pb(pb-220x176x16.bmp,11,121,199,8)
+%?mh<%xd(Aa)|%xd(Ab)>
+%?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>>
+%?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)>
+%?ps<%xd(D)>
+%?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+%?mp<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)>
 
 #NowPlaying
-%?C<%Vda%C|%Vdb>
+%?C<%Vd(a)%C|%Vd(b)>
 
-%ax%Vl|a|105|30|-|90|1|-|-|
+%ax%Vl(a,105,30,-,90,1)
 %s%al%?it<%it|%fn>
-%s%al%?ia<%ia|%?d2<%d2|(root)>>
-%s%al%?id<%id|%?d1<%d1|(root)>>
+%s%al%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%al%?id<%id|%?d(1)<%d(1)|%(root%)>>
 
-%s%al%Sx|Next Track:|
+%s%al%Sx(Next Track:)
 %s%al%?It<%It|%Fn>
 
-%Vl|b|0|30|-|90|1|-|-|
+%Vl(b,0,30,-,90,1)
 %s%ac%?it<%it|%fn>
-%s%ac%?ia<%ia|%?d2<%d2|(root)>>
-%s%ac%?id<%id|%?d1<%d1|(root)>>
+%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 
-%ac%Sx|Next Track:|
+%ac%Sx(Next Track:)
 %s%ac%?It<%It|%Fn>
 
 
-%V|11|130|199|20|1|-|-|
-%al%pc%ac%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>%ar%pr
+%V(11,130,199,20,1)
+%al%pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr
diff --git a/wps/cabbiev2.240x320x16.mini2440.wps b/wps/cabbiev2.240x320x16.mini2440.wps
index 9b4dd89371..85f326428a 100644
--- a/wps/cabbiev2.240x320x16.mini2440.wps
+++ b/wps/cabbiev2.240x320x16.mini2440.wps
@@ -4,43 +4,43 @@
 #derived from "cabbie" (C) Yohann Misquitta
 %wd
 
-%T|206|292|24|24|play|
-%T|46|292|84|24|menu|
-%T|139|292|24|24|shuffle|
-%T|182|292|24|24|repmode|
-%T|22|254|199|13|progressbar|
-%X|wpsbackdrop-240x320x16.bmp|
-%xl|A|lock-240x320x16.bmp|11|292|2|
-%xl|B|battery-240x320x16.bmp|46|292|10|
-%xl|C|volume-240x320x16.bmp|98|292|10|
-%xl|D|shuffle-240x320x16.bmp|139|292|
-%xl|E|repeat-240x320x16.bmp|182|292|4|
-%xl|F|playmode-240x320x16.bmp|206|292|5|
-%Cl|55|30|c130|c130|
-%pb|pb-240x320x16.bmp|22|254|199|13|
+%T(206,292,24,24,play)
+%T(46,292,84,24,menu)
+%T(139,292,24,24,shuffle)
+%T(182,292,24,24,repmode)
+%T(22,254,199,13,progressbar)
+%X(wpsbackdrop-240x320x16.bmp)
+%xl(A,lock-240x320x16.bmp,11,292,2)
+%xl(B,battery-240x320x16.bmp,46,292,10)
+%xl(C,volume-240x320x16.bmp,98,292,10)
+%xl(D,shuffle-240x320x16.bmp,139,292)
+%xl(E,repeat-240x320x16.bmp,182,292,4)
+%xl(F,playmode-240x320x16.bmp,206,292,5)
+%Cl(55,30,130,130,c,c)
+%pb(pb-240x320x16.bmp,22,254,199,13)
 %?C<|>
 %?C<|%s%ac%?it<%it|%fn>>
-%?C<|%s%ac%?ia<%ia|%?d2<%d2|(root)>>>
-%?C<|%s%ac%?id<%id|%?d1<%d1|(root)>>>
+%?C<|%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>>
+%?C<|%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>>
 %?C<|%ac%?iy<%iy|>>
 %?C<|>
 %?C<|%ac%?ig<%ig|>>
-%?C<|%ac%?fv<(vbr) |>%fb kbit/s %fc>
+%?C<|%ac%?fv<%(vbr%) |>%fb kbit/s %fc>
 %?C<|>
 %?C<%s%ac%?it<%it|%fn>|>
-%?C<%s%ac%?ia<%ia|%?d2<%d2|(root)>>|%ac%Sx|Next Track:|>
-%?C<%s%ac%?id<%id|%?d1<%d1|(root)>>|%ac%s%?It<%It|%Fn>>
-%?C<|%s%ac%?Ia<%Ia|%?D2<%D2|(root)>>>
-%?C<%s%ac%Sx|Next:| %?Ia<%Ia|%?D2<%D2|(root)>> - %?It<%It|%Fn>|%s%ac%?Id<%Id|%?D1<%D1|(root)>>>
+%?C<%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>|%ac%Sx(Next Track:)>
+%?C<%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>|%ac%s%?It<%It|%Fn>>
+%?C<|%s%ac%?Ia<%Ia|%?D(2)<%D(2)|%(root%)>>>
+%?C<%s%ac%Sx(Next:) %?Ia<%Ia|%?D(2)<%D(2)|%(root%)>> - %?It<%It|%Fn>|%s%ac%?Id<%Id|%?D(1)<%D(1)|%(root%)>>>
 
 
-     %pc%ac%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>%ar%pr     
+     %pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr     
 
-%?mh<%xdAa|%xdAb>
-%?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj>>
-%?pv<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi|%xdCj>
-%?ps<%xdD>
-%?mm<|%xdEa|%xdEb|%xdEc|%xdEd>
-%?mp<%xdFa|%xdFc|%xdFb|%xdFd|%xdFe>
+%?mh<%xd(Aa)|%xd(Ab)>
+%?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>>
+%?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)>
+%?ps<%xd(D)>
+%?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+%?mp<%xd(Fa)|%xd(Fc)|%xd(Fb)|%xd(Fd)|%xd(Fe)>
 %?C<%C>
 
diff --git a/wps/cabbiev2.240x320x16.wps b/wps/cabbiev2.240x320x16.wps
index 4d906b5b7a..02d1a60800 100644
--- a/wps/cabbiev2.240x320x16.wps
+++ b/wps/cabbiev2.240x320x16.wps
@@ -4,38 +4,38 @@
 #derived from "cabbie" (C) Yohann Misquitta
 %wd
 
-%X|wpsbackdrop-240x320x16.bmp|
-%xl|A|lock-240x320x16.bmp|11|292|2|
-%xl|B|battery-240x320x16.bmp|46|292|10|
-%xl|C|volume-240x320x16.bmp|98|292|10|
-%xl|D|shuffle-240x320x16.bmp|139|292|
-%xl|E|repeat-240x320x16.bmp|182|292|4|
-%xl|F|playmode-240x320x16.bmp|206|292|5|
-%Cl|55|30|c130|c130|
-%pb|pb-240x320x16.bmp|22|254|199|13|
+%X(wpsbackdrop-240x320x16.bmp)
+%xl(A,lock-240x320x16.bmp,11,292,2)
+%xl(B,battery-240x320x16.bmp,46,292,10)
+%xl(C,volume-240x320x16.bmp,98,292,10)
+%xl(D,shuffle-240x320x16.bmp,139,292)
+%xl(E,repeat-240x320x16.bmp,182,292,4)
+%xl(F,playmode-240x320x16.bmp,206,292,5)
+%Cl(55,30,130,130,c,c)
+%pb(pb-240x320x16.bmp,22,254,199,13)
 %?C<|>
 %?C<|%s%ac%?it<%it|%fn>>
-%?C<|%s%ac%?ia<%ia|%?d2<%d2|(root)>>>
-%?C<|%s%ac%?id<%id|%?d1<%d1|(root)>>>
+%?C<|%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>>
+%?C<|%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>>
 %?C<|%ac%?iy<%iy|>>
 %?C<|>
 %?C<|%ac%?ig<%ig|>>
-%?C<|%ac%?fv<(vbr) |>%fb kbit/s %fc>
+%?C<|%ac%?fv<%(vbr%) |>%fb kbit/s %fc>
 %?C<|>
 %?C<%s%ac%?it<%it|%fn>|>
-%?C<%s%ac%?ia<%ia|%?d2<%d2|(root)>>|%ac%Sx|Next Track:|>
-%?C<%s%ac%?id<%id|%?d1<%d1|(root)>>|%ac%s%?It<%It|%Fn>>
-%?C<|%s%ac%?Ia<%Ia|%?D2<%D2|(root)>>>
-%?C<%s%ac%Sx|Next:| %?Ia<%Ia|%?D2<%D2|(root)>> - %?It<%It|%Fn>|%s%ac%?Id<%Id|%?D1<%D1|(root)>>>
+%?C<%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>|%ac%Sx(Next Track:)>
+%?C<%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>|%ac%s%?It<%It|%Fn>>
+%?C<|%s%ac%?Ia<%Ia|%?D(2)<%D(2)|%(root%)>>>
+%?C<%s%ac%Sx(Next:) %?Ia<%Ia|%?D(2)<%D(2)|%(root%)>> - %?It<%It|%Fn>|%s%ac%?Id<%Id|%?D(1)<%D(1)|%(root%)>>>
 
 
-     %pc%ac%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>%ar%pr     
+     %pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr     
 
-%?mh<%xdAa|%xdAb>
-%?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj>>
-%?pv<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi|%xdCj>
-%?ps<%xdD>
-%?mm<|%xdEa|%xdEb|%xdEc|%xdEd>
-%?mp<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe>
+%?mh<%xd(Aa)|%xd(Ab)>
+%?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>>
+%?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)>
+%?ps<%xd(D)>
+%?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+%?mp<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)>
 %?C<%C>
 
diff --git a/wps/cabbiev2.240x400x16.wps b/wps/cabbiev2.240x400x16.wps
index 1a8975c58d..6fedecaa8f 100644
--- a/wps/cabbiev2.240x400x16.wps
+++ b/wps/cabbiev2.240x400x16.wps
@@ -4,76 +4,76 @@
 # derived from "cabbie" (C) Yohann Misquitta
 
 %wd
-%X|wpsbackdrop-240x400x16.bmp|
-%Cl|55|50|c130|c130|
-%pb|pb-240x320x16.bmp|22|284|199|13|
-%T|22|284|199|13|progressbar|
-%T|90|238|60|20|playlist|
-%?Tl2.5<%Vdt|%Vdu>
-%V|0|0|240|330|1|-|-|
+%X(wpsbackdrop-240x400x16.bmp)
+%Cl(55,50,130,130,c,c)
+%pb(pb-240x320x16.bmp,22,284,199,13)
+%T(22,284,199,13,progressbar)
+%T(90,238,60,20,playlist)
+%?Tl(2.5)<%Vd(t)|%Vd(u)>
+%V(0,0,240,330,1)
 
 
 %?C<|>
 %?C<|>
 %?C<|%s%ac%?it<%it|%fn>>
-%?C<|%s%ac%?ia<%ia|%?d2<%d2|(root)>>>
-%?C<|%s%ac%?id<%id|%?d1<%d1|(root)>>>
+%?C<|%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>>
+%?C<|%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>>
 %?C<|%ac%?iy<%iy|>>
 %?C<|>
 %?C<|%ac%?ig<%ig|>>
-%?C<|%ac%?fv<(vbr) |>%fb kbit/s %fc>
+%?C<|%ac%?fv<%(vbr%) |>%fb kbit/s %fc>
 %?C<|>
 %?C<%s%ac%?it<%it|%fn>|>
-%?C<%s%ac%?ia<%ia|%?d2<%d2|(root)>>|%ac%Sx|Next Track:|>
-%?C<%s%ac%?id<%id|%?d1<%d1|(root)>>|%ac%s%?It<%It|%Fn>>
-%?C<|%s%ac%?Ia<%Ia|%?D2<%D2|(root)>>>
-%?C<%s%ac%Sx|Next:| %?Ia<%Ia|%?D2<%D2|(root)>> - %?It<%It|%Fn>|%s%ac%?Id<%Id|%?D1<%D1|(root)>>>
+%?C<%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>|%ac%Sx(Next Track:)>
+%?C<%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>|%ac%s%?It<%It|%Fn>>
+%?C<|%s%ac%?Ia<%Ia|%?D(2)<%D(2)|%(root%)>>>
+%?C<%s%ac%Sx(Next:) %?Ia<%Ia|%?D(2)<%D(2)|%(root%)>> - %?It<%It|%Fn>|%s%ac%?Id<%Id|%?D(1)<%D(1)|%(root%)>>>
 
 
-     %pc%ac%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>%ar%pr     
+     %pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr     
 
 %?C<%C>
 
-%xl|A|lock-240x320x16.bmp|11|0|2|
-%xl|B|battery-240x320x16.bmp|46|0|10|
-%xl|C|volume-240x320x16.bmp|98|0|10|
-%xl|D|shuffle-240x320x16.bmp|139|0|
-%xl|E|repeat-240x320x16.bmp|182|0|4|
-%xl|F|playmode-240x320x16.bmp|206|0|5|
+%xl(A,lock-240x320x16.bmp,11,0,2)
+%xl(B,battery-240x320x16.bmp,46,0,10)
+%xl(C,volume-240x320x16.bmp,98,0,10)
+%xl(D,shuffle-240x320x16.bmp,139,0)
+%xl(E,repeat-240x320x16.bmp,182,0,4)
+%xl(F,playmode-240x320x16.bmp,206,0,5)
 
-%V|0|372|240|-|1|-|-|
-%?mh<%xdAa|%xdAb>
-%?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj>>
-%?pv<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi|%xdCj>
-%?ps<%xdD>
-%?mm<|%xdEa|%xdEb|%xdEc|%xdEd>
-%?mp<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe>
+%V(0,372,240,-,1)
+%?mh<%xd(Aa)|%xd(Ab)>
+%?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>>
+%?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)>
+%?ps<%xd(D)>
+%?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+%?mp<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)>
 
-%T|206|0|24|24|play|
-%T|206|0|24|24|&stop|
-%T|182|0|18|92|repmode|
-%T|139|0|37|23|shuffle|
-%T|98|0|33|23|volume|
+%T(206,0,24,24,play)
+%T(206,0,24,24,&stop)
+%T(182,0,18,92,repmode)
+%T(139,0,37,23,shuffle)
+%T(98,0,33,23,volume)
 
 #viewport for the touch icons
-%xl|G|browser-320x240x16.bmp|0|0|
-%xl|I|pitch-320x240x16.bmp|39|0|
-%xl|H|context-320x240x16.bmp|58|0|
-%xl|J|quick-320x240x16.bmp|86|0|
-%xl|K|rew-320x240x16.bmp|115|0|
-%xl|L|ff-320x240x16.bmp|144|0|
+%xl(G,browser-320x240x16.bmp,0,0)
+%xl(I,pitch-320x240x16.bmp,39,0)
+%xl(H,context-320x240x16.bmp,58,0)
+%xl(J,quick-320x240x16.bmp,86,0)
+%xl(K,rew-320x240x16.bmp,115,0)
+%xl(L,ff-320x240x16.bmp,144,0)
 
-%Vl|t|70|335|-|30|1|-|-|
-%xdG %xdH %xdI %xdJ %xdK %xdL
-%T|0|0|37|24|browse|
-%T|39|5|24|24|pitch|
-%T|58|0|24|24|contextmenu|
-%T|86|0|24|24|quickscreen|
-%T|115|0|24|23|&rwd|
-%T|144|0|24|23|&ffwd|
-%T|115|0|24|23|prev|
-%T|144|0|24|23|next|
+%Vl(t,70,335,-,30,1)
+%xd(G) %xd(H) %xd(I) %xd(J) %xd(K) %xd(L)
+%T(0,0,37,24,browse)
+%T(39,5,24,24,pitch)
+%T(58,0,24,24,contextmenu)
+%T(86,0,24,24,quickscreen)
+%T(115,0,24,23,&rwd)
+%T(144,0,24,23,&ffwd)
+%T(115,0,24,23,prev)
+%T(144,0,24,23,next)
 
-%Vl|u|70|335|-|30|1|-|-|
+%Vl(u,70,335,-,30,1)
 #purposely left blank
 
diff --git a/wps/cabbiev2.320x240x16.mrobe500.wps b/wps/cabbiev2.320x240x16.mrobe500.wps
index f06f3ad73b..cec4fa73fb 100644
--- a/wps/cabbiev2.320x240x16.mrobe500.wps
+++ b/wps/cabbiev2.320x240x16.mrobe500.wps
@@ -2,75 +2,75 @@
 # (C) 2007, Johannes Voggenthaler (Zinc Alloy)
 #derived from "cabbie" (C) Yohann Misquitta
 %wd
-%T|286|207|24|24|play|
-%T|0|207|84|24|menu|
-%T|218|211|24|24|shuffle|
-%T|261|207|24|24|repmode|
-%T|10|162|300|15|progressbar|
-%X|wpsbackdrop-320x240x16.bmp|
-%xl|A|lock-320x240x16.bmp|91|207|2|
-%xl|B|battery-320x240x16.bmp|126|207|10|
-%xl|C|volume-320x240x16.bmp|177|207|10|
-%xl|D|shuffle-320x240x16.bmp|218|211|
-%xl|E|repeat-320x240x16.bmp|261|207|4|
-%xl|F|playmode-320x240x16.bmp|286|207|5|
+%T(286,207,24,24,play)
+%T(0,207,84,24,menu)
+%T(218,211,24,24,shuffle)
+%T(261,207,24,24,repmode)
+%T(10,162,300,15,progressbar)
+%X(wpsbackdrop-320x240x16.bmp)
+%xl(A,lock-320x240x16.bmp,91,207,2)
+%xl(B,battery-320x240x16.bmp,126,207,10)
+%xl(C,volume-320x240x16.bmp,177,207,10)
+%xl(D,shuffle-320x240x16.bmp,218,211)
+%xl(E,repeat-320x240x16.bmp,261,207,4)
+%xl(F,playmode-320x240x16.bmp,286,207,5)
 
 # toggle the touchscreen button viewport
-%?Tl2.5<%Vdt|%Vdu>
+%?Tl(2.5)<%Vd(t)|%Vd(u)>
 
-%Cl|16|32|s120|s120|
-%pb|pb-320x240x16.bmp|10|162|300|15|
-%?mh<%xdAa|%xdAb>
-%?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj>>
-%?pv<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi|%xdCj>
-%?ps<%xdD>
-%?mm<|%xdEa|%xdEb|%xdEc|%xdEd>
-%?mp<%xdFa|%xdFc|%xdFb|%xdFd|%xdFe>
-%?C<%Vda%C|%Vdb>
+%Cl(16,32,120,120)
+%pb(pb-320x240x16.bmp,10,162,300,15)
+%?mh<%xd(Aa)|%xd(Ab)>
+%?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>>
+%?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)>
+%?ps<%xd(D)>
+%?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+%?mp<%xd(Fa)|%xd(Fc)|%xd(Fb)|%xd(Fd)|%xd(Fe)>
+%?C<%Vd(a)%C|%Vd(b)>
 #NowPlaying
 
-%Vl|a|153|30|-|130|1|-|-|
+%Vl(a,153,30,-,130,1)
 %s%al%?it<%it|%fn>
-%s%al%?ia<%ia|%?d2<%d2|(root)>>
-%s%al%?id<%id|%?d1<%d1|(root)>>
+%s%al%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%al%?id<%id|%?d(1)<%d(1)|%(root%)>>
 #%s%al%iy
 
-%s%al%Sx|Next Track:|
+%s%al%Sx(Next Track:)
 %s%al%?It<%It|%Fn>
 %s%al%Ia
 
-%Vl|b|0|30|-|130|1|-|-|
+%Vl(b,0,30,-,130,1)
 %s%ac%?it<%it|%fn>
-%s%ac%?ia<%ia|%?d2<%d2|(root)>>
-%s%ac%?id<%id|%?d1<%d1|(root)>>
+%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%ac%iy
 
-%ac%Sx|Next Track:|
+%ac%Sx(Next Track:)
 %s%ac%?It<%It|%Fn>
 %s%ac%Ia
 
-%V|0|180|-|20|1|-|-|
+%V(0,180,-,20,1)
 #touch the X of X regions to let the playlist viewer pop up
-%T|130|0|60|20|playlist|
-%al   %pc%ac%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>%ar%pr   
+%T(130,0,60,20,playlist)
+%al   %pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr   
 
 #viewport for the touch icons
-%xl|G|browser-320x240x16.bmp|5|5|
-%xl|I|pitch-320x240x16.bmp|50|5|
-%xl|H|context-320x240x16.bmp|80|5|
-%xl|J|quick-320x240x16.bmp|110|5|
-%xl|K|rew-320x240x16.bmp|150|5|
-%xl|L|ff-320x240x16.bmp|175|5|
+%xl(G,browser-320x240x16.bmp,5,5)
+%xl(I,pitch-320x240x16.bmp,50,5)
+%xl(H,context-320x240x16.bmp,80,5)
+%xl(J,quick-320x240x16.bmp,110,5)
+%xl(K,rew-320x240x16.bmp,150,5)
+%xl(L,ff-320x240x16.bmp,175,5)
 
-%Vl|t|0|74|-|30|1|-|-|
-%xdG %xdH %xdI %xdJ %xdK %xdL
-%T|0|5|37|24|browse|
-%T|50|5|24|24|pitch|
-%T|80|5|24|24|contextmenu|
-%T|110|5|24|24|quickscreen|
-%T|150|5|24|24|&rwd|
-%T|175|5|24|24|&ffwd|
-%T|150|5|24|24|prev|
-%T|175|5|24|24|next|
-%Vl|u|0|74|-|30|1|-|-|
+%Vl(t,0,74,-,30,1)
+%xd(G) %xd(H) %xd(I) %xd(J) %xd(K) %xd(L)
+%T(0,5,37,24,browse)
+%T(50,5,24,24,pitch)
+%T(80,5,24,24,contextmenu)
+%T(110,5,24,24,quickscreen)
+%T(150,5,24,24,&rwd)
+%T(175,5,24,24,&ffwd)
+%T(150,5,24,24,prev)
+%T(175,5,24,24,next)
+%Vl(u,0,74,-,30,1)
 #purposly left blank
diff --git a/wps/cabbiev2.320x240x16.wps b/wps/cabbiev2.320x240x16.wps
index 29fe81af94..cf34a95572 100644
--- a/wps/cabbiev2.320x240x16.wps
+++ b/wps/cabbiev2.320x240x16.wps
@@ -2,45 +2,45 @@
 # (C) 2007, Johannes Voggenthaler (Zinc Alloy)
 #derived from "cabbie" (C) Yohann Misquitta
 %wd
-%X|wpsbackdrop-320x240x16.bmp|
-%xl|A|lock-320x240x16.bmp|91|207|2|
-%xl|B|battery-320x240x16.bmp|126|207|10|
-%xl|C|volume-320x240x16.bmp|177|207|10|
-%xl|D|shuffle-320x240x16.bmp|218|211|
-%xl|E|repeat-320x240x16.bmp|261|207|4|
-%xl|F|playmode-320x240x16.bmp|286|207|5|
-%ax%Cl|16|32|s120|s120|
-%pb|pb-320x240x16.bmp|10|162|300|15|
-%?mh<%xdAa|%xdAb>
-%?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj>>
-%?pv<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi|%xdCj>
-%?ps<%xdD>
-%?mm<|%xdEa|%xdEb|%xdEc|%xdEd>
-%?mp<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe>
+%X(wpsbackdrop-320x240x16.bmp)
+%xl(A,lock-320x240x16.bmp,91,207,2)
+%xl(B,battery-320x240x16.bmp,126,207,10)
+%xl(C,volume-320x240x16.bmp,177,207,10)
+%xl(D,shuffle-320x240x16.bmp,218,211)
+%xl(E,repeat-320x240x16.bmp,261,207,4)
+%xl(F,playmode-320x240x16.bmp,286,207,5)
+%ax%Cl(16,32,120,120)
+%pb(pb-320x240x16.bmp,10,162,300,15)
+%?mh<%xd(Aa)|%xd(Ab)>
+%?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>>
+%?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)>
+%?ps<%xd(D)>
+%?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+%?mp<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)>
 
-%?C<%Vda%C|%Vdb>
+%?C<%Vd(a)%C|%Vd(b)>
 #NowPlaying
 
-%ax%Vl|a|153|30|-|130|1|-|-|
+%ax%Vl(a,153,30,-,130,1)
 %s%al%?it<%it|%fn>
-%s%al%?ia<%ia|%?d2<%d2|(root)>>
-%s%al%?id<%id|%?d1<%d1|(root)>>
+%s%al%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%al%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%al%iy
 
-%s%al%Sx|Next Track:|
+%s%al%Sx(Next Track:)
 %s%al%?It<%It|%Fn>
 %s%al%Ia
 
-%ax%Vl|b|0|30|-|130|1|-|-|
+%ax%Vl(b,0,30,-,130,1)
 %s%ac%?it<%it|%fn>
-%s%ac%?ia<%ia|%?d2<%d2|(root)>>
-%s%ac%?id<%id|%?d1<%d1|(root)>>
+%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
+%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%ac%iy
 
-%ac%Sx|Next Track:|
+%ac%Sx(Next Track:)
 %s%ac%?It<%It|%Fn>
 %s%ac%Ia
 
-%V|10|180|300|20|1|-|-|
-%al%pc%ac%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>%ar%pr
+%V(10,180,300,20,1)
+%al%pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr
 
diff --git a/wps/engineeer2.128x64x1.wps b/wps/engineeer2.128x64x1.wps
index eda2ab0811..f04d6cdc57 100644
--- a/wps/engineeer2.128x64x1.wps
+++ b/wps/engineeer2.128x64x1.wps
@@ -1,26 +1,26 @@
-%x|a|background_r.bmp|0|0|
-%xl|A|codec.bmp|8|46|22|
-%xl|B|encoding.bmp|9|52|2|
-%xl|C|repeat.bmp|41|1|4|
-%xl|D|playmode_r.bmp|6|12|5|
-%xl|E|shuffle.bmp|26|1|
-%xl|F|lock_main.bmp|73|0|
-%xl|G|lock_remote.bmp|81|0|
-%xl|H|volume_r.bmp|0|0|10|
-%xl|I|battery.bmp|112|0|6|
+%x(a,background_r.bmp,0,0)
+%xl(A,codec.bmp,8,46,22)
+%xl(B,encoding.bmp,9,52,2)
+%xl(C,repeat.bmp,41,1,4)
+%xl(D,playmode_r.bmp,6,12,5)
+%xl(E,shuffle.bmp,26,1)
+%xl(F,lock_main.bmp,73,0)
+%xl(G,lock_remote.bmp,81,0)
+%xl(H,volume_r.bmp,0,0,10)
+%xl(I,battery.bmp,112,0,6)
 %wd
 
 
 
 %s%ac%?it<%it|%fn>
-%s%ac%?ia<%ia|%d2>
-%ar%pc/%pt %?fc<%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAf|%xdAg|%xdAh|%xdAi|%xdAj|%xdAk|%xdAl|%xdAm|%xdAn|%xdAo|%xdAp|%xdAq|%xdAr|%xdAs|%xdAt|%xdAu|%xdAv>
+%s%ac%?ia<%ia|%d(2)>
+%ar%pc/%pt %?fc<%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Af)|%xd(Ag)|%xd(Ah)|%xd(Ai)|%xd(Aj)|%xd(Ak)|%xd(Al)|%xd(Am)|%xd(An)|%xd(Ao)|%xd(Ap)|%xd(Aq)|%xd(Ar)|%xd(As)|%xd(At)|%xd(Au)|%xd(Av)>
         %fbk
-%?fv<%xdBa|%xdBb>
-%?pv<%xdHa|%xdHb|%xdHc|%xdHd|%xdHe|%xdHf|%xdHg|%xdHh|%xdHi|%xdHj>
-%t0.2%?bp<%xdIa|%?bl<%xdIb|%xdIc|%xdId|%xdIe|%xdIf>>;%t0.2%?bp<%xdIa|%?bl<|%xdIc|%xdId|%xdIe|%xdIf>>;%t0.2%?bp<%xdIa|%?bl<%xdIb||%xdId|%xdIe|%xdIf>>;%t0.2%?bp<%xdIa|%?bl<||%xdId|%xdIe|%xdIf>>
-%?mm<|%xdCa|%xdCb|%xdCc|%xdCd>
-%?mp<%xdDa|%xdDb|%xdDc|%xdDd|%xdDe>
-%?ps<%xdE|>
-%?mh<%xdF|>
-%?mr<%xdG|>
+%?fv<%xd(Ba)|%xd(Bb)>
+%?pv<%xd(Ha)|%xd(Hb)|%xd(Hc)|%xd(Hd)|%xd(He)|%xd(Hf)|%xd(Hg)|%xd(Hh)|%xd(Hi)|%xd(Hj)>
+%t(0.2)%?bp<%xd(Ia)|%?bl<%xd(Ib)|%xd(Ic)|%xd(Id)|%xd(Ie)|%xd(If)>>%;%t(0.2)%?bp<%xd(Ia)|%?bl<|%xd(Ic)|%xd(Id)|%xd(Ie)|%xd(If)>>%;%t(0.2)%?bp<%xd(Ia)|%?bl<%xd(Ib)||%xd(Id)|%xd(Ie)|%xd(If)>>%;%t(0.2)%?bp<%xd(Ia)|%?bl<||%xd(Id)|%xd(Ie)|%xd(If)>>
+%?mm<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)>
+%?mp<%xd(Da)|%xd(Db)|%xd(Dc)|%xd(Dd)|%xd(De)>
+%?ps<%xd(E)|>
+%?mh<%xd(F)|>
+%?mr<%xd(G)|>
diff --git a/wps/engineeer2.160x128x1.wps b/wps/engineeer2.160x128x1.wps
index e910556910..9f6e8445bf 100644
--- a/wps/engineeer2.160x128x1.wps
+++ b/wps/engineeer2.160x128x1.wps
@@ -1,20 +1,20 @@
-%x|a|background.bmp|0|0|
-%xl|A|codec.bmp|9|70|22|
-%xl|B|encoding.bmp|9|76|2|
-%xl|C|repeat.bmp|60|1|4|
-%xl|D|playmode.bmp|6|17|5|
-%xl|E|shuffle.bmp|43|1|
-%xl|F|lock_main.bmp|97|0|
-%xl|G|lock_remote.bmp|108|0|
-%xl|H|volume.bmp|0|0|10|
-%xl|I|battery.bmp|144|0|6|
+%x(a,background.bmp,0,0)
+%xl(A,codec.bmp,9,70,22)
+%xl(B,encoding.bmp,9,76,2)
+%xl(C,repeat.bmp,60,1,4)
+%xl(D,playmode.bmp,6,17,5)
+%xl(E,shuffle.bmp,43,1)
+%xl(F,lock_main.bmp,97,0)
+%xl(G,lock_remote.bmp,108,0)
+%xl(H,volume.bmp,0,0,10)
+%xl(I,battery.bmp,144,0,6)
 %wd
 
 
 
 
 %s%ac%?it<%it|%fn>
-%s%ac%?ia<%ia|%d2>
+%s%ac%?ia<%ia|%d(2)>
 
 %ac%pc / %pt
 
@@ -23,13 +23,13 @@
 
 
 
-%ac%t3%?It<%It|%Fn>;%ac%t3%?Ia<%Ia|%D2>
-%?pv<%xdHa|%xdHb|%xdHc|%xdHd|%xdHe|%xdHf|%xdHg|%xdHh|%xdHi|%xdHj>
-%t0.2%?bp<%xdIa|%?bl<%xdIb|%xdIc|%xdId|%xdIe|%xdIf>>;%t0.2%?bp<%xdIa|%?bl<|%xdIc|%xdId|%xdIe|%xdIf>>;%t0.2%?bp<%xdIa|%?bl<%xdIb||%xdId|%xdIe|%xdIf>>;%t0.2%?bp<%xdIa|%?bl<||%xdId|%xdIe|%xdIf>>
-%?fc<%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAf|%xdAg|%xdAh|%xdAi|%xdAj|%xdAk|%xdAl|%xdAm|%xdAn|%xdAo|%xdAp|%xdAq|%xdAr|%xdAs|%xdAt|%xdAu|%xdAv>
-%?fv<%xdBa|%xdBb>
-%?mm<|%xdCa|%xdCb|%xdCc|%xdCd>
-%?mp<%xdDa|%xdDb|%xdDc|%xdDd|%xdDe>
-%?ps<%xdE|>
-%?mh<%xdF|>
-%?mr<%xdG|>
+%ac%t(3)%?It<%It|%Fn>%;%ac%t(3)%?Ia<%Ia|%D(2)>
+%?pv<%xd(Ha)|%xd(Hb)|%xd(Hc)|%xd(Hd)|%xd(He)|%xd(Hf)|%xd(Hg)|%xd(Hh)|%xd(Hi)|%xd(Hj)>
+%t(0.2)%?bp<%xd(Ia)|%?bl<%xd(Ib)|%xd(Ic)|%xd(Id)|%xd(Ie)|%xd(If)>>%;%t(0.2)%?bp<%xd(Ia)|%?bl<|%xd(Ic)|%xd(Id)|%xd(Ie)|%xd(If)>>%;%t(0.2)%?bp<%xd(Ia)|%?bl<%xd(Ib)||%xd(Id)|%xd(Ie)|%xd(If)>>%;%t(0.2)%?bp<%xd(Ia)|%?bl<||%xd(Id)|%xd(Ie)|%xd(If)>>
+%?fc<%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Af)|%xd(Ag)|%xd(Ah)|%xd(Ai)|%xd(Aj)|%xd(Ak)|%xd(Al)|%xd(Am)|%xd(An)|%xd(Ao)|%xd(Ap)|%xd(Aq)|%xd(Ar)|%xd(As)|%xd(At)|%xd(Au)|%xd(Av)>
+%?fv<%xd(Ba)|%xd(Bb)>
+%?mm<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)>
+%?mp<%xd(Da)|%xd(Db)|%xd(Dc)|%xd(Dd)|%xd(De)>
+%?ps<%xd(E)|>
+%?mh<%xd(F)|>
+%?mr<%xd(G)|>
diff --git a/wps/iAmp.128x64x1.wps b/wps/iAmp.128x64x1.wps
index 8aec2cbe47..1a597d76e7 100644
--- a/wps/iAmp.128x64x1.wps
+++ b/wps/iAmp.128x64x1.wps
@@ -1,20 +1,20 @@
-%x|a|iAmp.bmp|100|0|
-%x|b|line-r.bmp|0|11|
-%x|c|pb.bmp|96|40|
+%x(a,iAmp.bmp,100,0)
+%x(b,line-r.bmp,0,11)
+%x(c,pb.bmp,96,40)
 %wd
 
-%s%?ia<%ia|%d1>
+%s%?ia<%ia|%d(1)>
 %s%?it<%?in<%in. >%it|%fn>
 %pb
-%xl|A|codec.bmp|102|48|21|
-%pc/%pt %ar%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>%t5;%pc/%pt%?fc<%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAf|%xdAg|%xdAh|%xdAi|%xdAj|%xdAk|%xdAl|%xdAm|%xdAn|%xdAo|%xdAp|%xdAq|%xdAr|%xdAs|%xdAt|%xdAu>%t3;%pc/%pt %ar%?fv<[VBR]|%fbkbps>%t3
-%xl|B|battery-small.bmp|0|0|6|
-%?bp<%xdBa|%?bl<%xdBb|%xdBc|%xdBd|%xdBe|%xdBf>>
-%xl|C|volume.bmp|24|0|9|
-%?pv<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi>
-%xl|D|repeatshuffle-small.bmp|54|1|6|
-%?mm<%?ps<%xdDa>|%?ps<%xdDb|%xdDc>|%xdDd|%?ps<%xdDe|%xdDc>|%xdDf>
-%xl|E|lock-small.bmp|79|0|3|
-%?mh<%?mr<%xdEa|%xdx>|%?mr<%xdy|>>
-%xl|F|playmode-small.bmp|74|48|3|
-%?mp<||%xdFa|%xdFb|%xdFc>
+%xl(A,codec.bmp,102,48,21)
+%pc/%pt %ar%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%t(5)%;%pc/%pt%?fc<%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Af)|%xd(Ag)|%xd(Ah)|%xd(Ai)|%xd(Aj)|%xd(Ak)|%xd(Al)|%xd(Am)|%xd(An)|%xd(Ao)|%xd(Ap)|%xd(Aq)|%xd(Ar)|%xd(As)|%xd(At)|%xd(Au)>%t(3)%;%pc/%pt %ar%?fv<[VBR]|%fbkbps>%t(3)
+%xl(B,battery-small.bmp,0,0,6)
+%?bp<%xd(Ba)|%?bl<%xd(Bb)|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)>>
+%xl(C,volume.bmp,24,0,9)
+%?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)>
+%xl(D,repeatshuffle-small.bmp,54,1,6)
+%?mm<%?ps<%xd(Da)>|%?ps<%xd(Db)|%xd(Dc)>|%xd(Dd)|%?ps<%xd(De)|%xd(Dc)>|%xd(Df)>
+%xl(E,lock-small.bmp,79,0,3)
+%?mh<%?mr<%xd(Ea)|%xd(x)>|%?mr<%xd(y)|>>
+%xl(F,playmode-small.bmp,74,48,3)
+%?mp<||%xd(Fa)|%xd(Fb)|%xd(Fc)>
diff --git a/wps/iAmp.160x128x1.wps b/wps/iAmp.160x128x1.wps
index 130f0e3ff8..ee42d62f0d 100644
--- a/wps/iAmp.160x128x1.wps
+++ b/wps/iAmp.160x128x1.wps
@@ -1,27 +1,27 @@
-%x|a|pb.bmp|128|100|
-%x|b|vl.bmp|27|1|
-%x|c|iAmp.bmp|129|3|
-%x|d|line.bmp|0|14|
+%x(a,pb.bmp,128,100)
+%x(b,vl.bmp,27,1)
+%x(c,iAmp.bmp,129,3)
+%x(d,line.bmp,0,14)
 %wd
             %pv
 
 %ac%s%?it<%it|%fn>
-%s%ac%?ia<%ia|%?d1<%d1|Unknown Artist>>
+%s%ac%?ia<%ia|%?d(1)<%d(1)|Unknown Artist>>
 
-%ac%s%?id<%?in<Track %#%in From The LP|From The Album>%t8|%t0>;%?ic<%acComposed by:%t6|%t0>;%ac%sTrack Info:%t6
-%ac%s%?id<"%id"%?iy< (%iy)>%t8|%t0>;%?ic<%ac%s%ic%t6|%t0>;%s%ac%fb kbps%?fv< VBR>, %ff Hz%t6
+%ac%s%?id<%?in<Track %#%in From The LP|From The Album>%t(8)|%t(0)>%;%?ic<%acComposed by:%t(6)|%t(0)>%;%ac%sTrack Info:%t(6)
+%ac%s%?id<"%id"%?iy< %(%iy%)>%t(8)|%t(0)>%;%?ic<%ac%s%ic%t(6)|%t(0)>%;%s%ac%fb kbps%?fv< VBR>%, %ff Hz%t(6)
 
 %pb
-%pc/%pt %ar%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>
-%xl|A|codec.bmp|68|87|22|
-%?fc<%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAf|%xdAg|%xdAh|%xdAi|%xdAj|%xdAk|%xdAl|%xdAm|%xdAn|%xdAo|%xdAp|%xdAq|%xdAr|%xdAs|%xdAt|%xdAu|%xdAv>
-%xl|B|battery.bmp|1|1|6|
-%?bp<%xdBa|%?bl<%xdBb|%xdBc|%xdBd|%xdBe|%xdBf>>
-%xl|C|lock.bmp|114|1|3|
-%?mh<%?mr<%xdCa|%xdCb>|%?mr<%xdCc|>>
-%xl|D|repeatshuffle.bmp|90|1|6|
-%?mm<%?ps<%xdDa>|%?ps<%xdDb|%xdDc>|%xdDd|%?ps<%xdDe|%xdDc>|%xdDf>
-%xl|E|playmode-bar.bmp|0|120|3|
-%xl|F|playmode.bmp|76|1|5|
-%?mp<||%xdEa|%xdEb|%xdEc>
-%?mp<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe>
+%pc/%pt %ar%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>
+%xl(A,codec.bmp,68,87,22)
+%?fc<%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Af)|%xd(Ag)|%xd(Ah)|%xd(Ai)|%xd(Aj)|%xd(Ak)|%xd(Al)|%xd(Am)|%xd(An)|%xd(Ao)|%xd(Ap)|%xd(Aq)|%xd(Ar)|%xd(As)|%xd(At)|%xd(Au)|%xd(Av)>
+%xl(B,battery.bmp,1,1,6)
+%?bp<%xd(Ba)|%?bl<%xd(Bb)|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)>>
+%xl(C,lock.bmp,114,1,3)
+%?mh<%?mr<%xd(Ca)|%xd(Cb)>|%?mr<%xd(Cc)|>>
+%xl(D,repeatshuffle.bmp,90,1,6)
+%?mm<%?ps<%xd(Da)>|%?ps<%xd(Db)|%xd(Dc)>|%xd(Dd)|%?ps<%xd(De)|%xd(Dc)>|%xd(Df)>
+%xl(E,playmode-bar.bmp,0,120,3)
+%xl(F,playmode.bmp,76,1,5)
+%?mp<||%xd(Ea)|%xd(Eb)|%xd(Ec)>
+%?mp<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)>
diff --git a/wps/iCatcher.112x64x1.wps b/wps/iCatcher.112x64x1.wps
index 3f1ebc3e06..60fc4857a1 100644
--- a/wps/iCatcher.112x64x1.wps
+++ b/wps/iCatcher.112x64x1.wps
@@ -1,23 +1,23 @@
 %wd
 
 
-%t1 %?mp<%al Stopped%ar-:--/-:-- |%al %pp/%pe%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >;%t1 %?mp<%al Stopped-:--/-:-- |%al %pp/%pe%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
-%s%ac%?ia<%ia|%?d2<%d2|Unknown Artist>>
-%s%ac%?id<%id|%?d1<%d1|Unknown Album>>
+%t(1) %?mp<%al Stopped%ar-:--/-:-- |%al %pp/%pe%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >%;%t(1) %?mp<%al Stopped-:--/-:-- |%al %pp/%pe%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
+%s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>>
+%s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>>
 %s%ac%?in<%in|%pp> - %?it<%it|%fn>
-%pb|-|11|-|90|3|
-%t6%s%ac%?Fm<%Sx|Next:| %?It<%It|%Fn>|%fbKbps %fc>;%t6%s%ac%?Fm<%Sx|Next:| %?It<%It|%Fn>|%fbKbps %fc>
+%pb(-,11,-,90,3)
+%t(6)%s%ac%?Fm<%Sx(Next:) %?It<%It|%Fn>|%fbKbps %fc>%;%t(6)%s%ac%?Fm<%Sx(Next:) %?It<%It|%Fn>|%fbKbps %fc>
 
-%xl|A|battery-s.bmp|93|3|5|
-%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAb|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAc|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAd|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAe|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>
-%xl|B|hold1-s.bmp|80|2|
-%xl|C|repeat-s.bmp|58|2|4|
-%xl|D|shuffle-s.bmp|38|4|2|
-%xl|E|playmode-s.bmp|3|3|4|
-%?mh<%xdB|>%?mm<|%xdCa|%xdCb|%xdCc|%xdCd>%?ps<%xdDa|%xdDb>%?mp<|%xdEa|%xdEb|%xdEc|%xdEd>
-%xl|F|volume-s.bmp|16|1|9|
-%xl|G|animation-s.bmp|16|1|8|
-%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGa|%xdGa|%xdGa>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGb|%xdGb|%xdGb>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGc|%xdGc|%xdGc>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGd|%xdGd|%xdGd>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGe|%xdGe|%xdGe>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGf|%xdGf|%xdGf>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGg|%xdGg|%xdGg>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGh|%xdGh|%xdGh>
-%x|W|line1-112.bmp|0|0|
-%x|X|line2-112.bmp|0|13|
-%x|Y|line1-112.bmp|0|54|
+%xl(A,battery-s.bmp,93,3,5)
+%t(0.5) %?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ab)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ac)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ad)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ae)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>
+%xl(B,hold1-s.bmp,80,2)
+%xl(C,repeat-s.bmp,58,2,4)
+%xl(D,shuffle-s.bmp,38,4,2)
+%xl(E,playmode-s.bmp,3,3,4)
+%?mh<%xd(B)|>%?mm<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)>%?ps<%xd(Da)|%xd(Db)>%?mp<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+%xl(F,volume-s.bmp,16,1,9)
+%xl(G,animation-s.bmp,16,1,8)
+%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ga)|%xd(Ga)|%xd(Ga)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gb)|%xd(Gb)|%xd(Gb)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gc)|%xd(Gc)|%xd(Gc)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gd)|%xd(Gd)|%xd(Gd)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ge)|%xd(Ge)|%xd(Ge)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gf)|%xd(Gf)|%xd(Gf)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gg)|%xd(Gg)|%xd(Gg)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gh)|%xd(Gh)|%xd(Gh)>
+%x(W,line1-112.bmp,0,0)
+%x(X,line2-112.bmp,0,13)
+%x(Y,line1-112.bmp,0,54)
diff --git a/wps/iCatcher.128x128x16.wps b/wps/iCatcher.128x128x16.wps
index 3b14cdf0a7..0bb8f762d9 100644
--- a/wps/iCatcher.128x128x16.wps
+++ b/wps/iCatcher.128x128x16.wps
@@ -1,29 +1,29 @@
 %wd
-%X|bg-128x128x16.bmp|
+%X(bg-128x128x16.bmp)
 
 
-%t1 %?mp<%al Stopped%ar-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >;%t1 %?mp<%al Stopped-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
+%t(1) %?mp<%al Stopped%ar-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >%;%t(1) %?mp<%al Stopped-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
 %al    %bl%%%ar%pp/%pe 
 
-%s%ac%?ia<%ia|%?d2<%d2|Unknown Artist>>
-%s%ac%?id<%id|%?d1<%d1|Unknown Album>>
+%s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>>
+%s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>>
 %s%ac%?in<%in|%pp> - %?it<%it|%fn>
 
 
 %al %fbKbps
-%pb|-|11|-|106|4|
+%pb(-,11,-,106,4)
 
-%s%ac%Sx|Next:| %?It<%It|%?Fn<%Fn|?>>
+%s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>
 
-%xl|A|battery-sc.bmp|111|5|5|
-%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAb|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAc|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAd|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAe|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>
-%xl|B|hold-sc.bmp|86|2|4|
-%xl|C|repeat-sc.bmp|66|2|5|
-%xl|D|shuffle-sc.bmp|46|4|2|
-%xl|E|playmode-sc.bmp|3|3|4|
-%?mh<%?mr<%xdBa|%xdBb>|%?mr<%xdBc|%xdBd>>%?mm<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe>%?ps<%xdDa|%xdDb>%?mp<|%xdEa|%xdEb|%xdEc|%xdEd>
-%xl|F|volume-sc.bmp|16|1|9|
-%xl|G|animation-sc.bmp|16|1|8|
-%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGa|%xdGa|%xdGa>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGb|%xdGb|%xdGb>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGc|%xdGc|%xdGc>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGd|%xdGd|%xdGd>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGe|%xdGe|%xdGe>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGf|%xdGf|%xdGf>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGg|%xdGg|%xdGg>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGh|%xdGh|%xdGh>
-%xl|H|codec-sc.bmp|92|88|22|
-%?fc<%xdHa|%xdHb|%xdHc|%xdHd|%xdHe|%xdHf|%xdHg|%xdHh|%xdHi|%xdHj|%xdHk|%xdHl|%xdHm|%xdHn|%xdHo|%xdHp|%xdHq|%xdHr|%xdHs|%xdHt|%xdHu|%xdHv>
+%xl(A,battery-sc.bmp,111,5,5)
+%t(0.5) %?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ab)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ac)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ad)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ae)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>
+%xl(B,hold-sc.bmp,86,2,4)
+%xl(C,repeat-sc.bmp,66,2,5)
+%xl(D,shuffle-sc.bmp,46,4,2)
+%xl(E,playmode-sc.bmp,3,3,4)
+%?mh<%?mr<%xd(Ba)|%xd(Bb)>|%?mr<%xd(Bc)|%xd(Bd)>>%?mm<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)>%?ps<%xd(Da)|%xd(Db)>%?mp<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+%xl(F,volume-sc.bmp,16,1,9)
+%xl(G,animation-sc.bmp,16,1,8)
+%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ga)|%xd(Ga)|%xd(Ga)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gb)|%xd(Gb)|%xd(Gb)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gc)|%xd(Gc)|%xd(Gc)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gd)|%xd(Gd)|%xd(Gd)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ge)|%xd(Ge)|%xd(Ge)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gf)|%xd(Gf)|%xd(Gf)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gg)|%xd(Gg)|%xd(Gg)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gh)|%xd(Gh)|%xd(Gh)>
+%xl(H,codec-sc.bmp,92,88,22)
+%?fc<%xd(Ha)|%xd(Hb)|%xd(Hc)|%xd(Hd)|%xd(He)|%xd(Hf)|%xd(Hg)|%xd(Hh)|%xd(Hi)|%xd(Hj)|%xd(Hk)|%xd(Hl)|%xd(Hm)|%xd(Hn)|%xd(Ho)|%xd(Hp)|%xd(Hq)|%xd(Hr)|%xd(Hs)|%xd(Ht)|%xd(Hu)|%xd(Hv)>
diff --git a/wps/iCatcher.128x64x1.160x128x2.wps b/wps/iCatcher.128x64x1.160x128x2.wps
index 3d0702644c..1951732917 100644
--- a/wps/iCatcher.128x64x1.160x128x2.wps
+++ b/wps/iCatcher.128x64x1.160x128x2.wps
@@ -1,22 +1,22 @@
 %wd
 
 
-%t1 %?mp<%al %pp/%pe%ar-:--/-:-- |%al %pp/%pe%ar%pc/%pt |%al %pp/%pe%ar%pc/%pt |%al %pp/%pe%ar%pc/%pt |%al %pp/%pe%ar%pc/%pt >;%t1 %?mp<%al %pp/%pe%ar-:--/-:-- |%al %pp/%pe%ar%pc/%pt |%al %pp/%pe|%al %pp/%pe%ar%pc/%pt |%al %pp/%pe%ar%pc/%pt >
-%s%ac%?ia<%ia|%?d2<%d2|Unknown Artist>>
-%s%ac%?id<%id|%?d1<%d1|Unknown Album>>
-%pb|-|11|-|106|4|
+%t(1) %?mp<%al %pp/%pe%ar-:--/-:-- |%al %pp/%pe%ar%pc/%pt |%al %pp/%pe%ar%pc/%pt |%al %pp/%pe%ar%pc/%pt |%al %pp/%pe%ar%pc/%pt >%;%t(1) %?mp<%al %pp/%pe%ar-:--/-:-- |%al %pp/%pe%ar%pc/%pt |%al %pp/%pe|%al %pp/%pe%ar%pc/%pt |%al %pp/%pe%ar%pc/%pt >
+%s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>>
+%s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>>
+%pb(-,11,-,106,4)
 %s%ac%?in<%in|%pp> - %?it<%it|%fn>
 
-%xl|A|battery-s.bmp|109|3|5|
-%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAb|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAc|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAd|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAe|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>
-%xl|B|hold-s.bmp|86|2|3|
-%xl|C|repeat-s.bmp|66|2|4|
-%xl|D|shuffle-s.bmp|46|4|2|
-%xl|E|playmode-s.bmp|3|3|4|
-%?mh<%?mr<%xdBa|%xdBb>|%?mr<%xdBc|>>%?mm<|%xdCa|%xdCb|%xdCc|%xdCd>%?ps<%xdDa|%xdDb>%?mp<|%xdEa|%xdEb|%xdEc|%xdEd>
-%xl|F|volume-s.bmp|16|1|9|
-%xl|G|animation-s.bmp|16|1|8|
-%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGa|%xdGa|%xdGa>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGb|%xdGb|%xdGb>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGc|%xdGc|%xdGc>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGd|%xdGd|%xdGd>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGe|%xdGe|%xdGe>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGf|%xdGf|%xdGf>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGg|%xdGg|%xdGg>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGh|%xdGh|%xdGh>
-%x|W|line1-128.bmp|0|0|
-%x|X|line2-128.bmp|0|13|
-%x|Y|line1-128.bmp|0|52|
+%xl(A,battery-s.bmp,109,3,5)
+%t(0.5) %?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ab)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ac)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ad)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ae)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>
+%xl(B,hold-s.bmp,86,2,3)
+%xl(C,repeat-s.bmp,66,2,4)
+%xl(D,shuffle-s.bmp,46,4,2)
+%xl(E,playmode-s.bmp,3,3,4)
+%?mh<%?mr<%xd(Ba)|%xd(Bb)>|%?mr<%xd(Bc)|>>%?mm<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)>%?ps<%xd(Da)|%xd(Db)>%?mp<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+%xl(F,volume-s.bmp,16,1,9)
+%xl(G,animation-s.bmp,16,1,8)
+%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ga)|%xd(Ga)|%xd(Ga)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gb)|%xd(Gb)|%xd(Gb)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gc)|%xd(Gc)|%xd(Gc)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gd)|%xd(Gd)|%xd(Gd)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ge)|%xd(Ge)|%xd(Ge)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gf)|%xd(Gf)|%xd(Gf)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gg)|%xd(Gg)|%xd(Gg)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gh)|%xd(Gh)|%xd(Gh)>
+%x(W,line1-128.bmp,0,0)
+%x(X,line2-128.bmp,0,13)
+%x(Y,line1-128.bmp,0,52)
diff --git a/wps/iCatcher.128x64x1.220x176x16.wps b/wps/iCatcher.128x64x1.220x176x16.wps
index ac57104d89..134a604214 100644
--- a/wps/iCatcher.128x64x1.220x176x16.wps
+++ b/wps/iCatcher.128x64x1.220x176x16.wps
@@ -1,18 +1,18 @@
 %wd
 
-%t1 %?mp<%al%pp/%pe%ar-:--/-:--|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe%ar%pc/%pt>;%t1 %?mp<%al%pp/%pe%ar-:--/-:--|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe%ar%pc/%pt>
-%s%ac%?ia<%ia|%?d2<%d2|Unknown Artist>>
+%t(1) %?mp<%al%pp/%pe%ar-:--/-:--|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe%ar%pc/%pt>%;%t(1) %?mp<%al%pp/%pe%ar-:--/-:--|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe%ar%pc/%pt>
+%s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>>
 %s%ac%?in<%in|%pp> - %?it<%it|%fn>
 
-%xl|A|battery-s.bmp|109|2|5|
-%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAb|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAc|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAd|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAe|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>
-%xl|B|hold-s.bmp|86|1|3|
-%xl|C|repeat-s.bmp|66|1|4|
-%xl|D|shuffle-s.bmp|46|3|2|
-%xl|E|playmode-s.bmp|3|2|4|
-%?mh<%?mr<%xdBa|%xdBb>|%?mr<%xdBc|>>%?mm<|%xdCa|%xdCb|%xdCc|%xdCd>%?ps<%xdDa|%xdDb>%?mp<|%xdEa|%xdEb|%xdEc|%xdEd>
-%xl|F|volume-s.bmp|16|0|9|
-%xl|G|animation-s.bmp|16|0|8|
-%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGa|%xdGa|%xdGa>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGb|%xdGb|%xdGb>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGc|%xdGc|%xdGc>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGd|%xdGd|%xdGd>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGe|%xdGe|%xdGe>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGf|%xdGf|%xdGf>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGg|%xdGg|%xdGg>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGh|%xdGh|%xdGh>
-%x|X|line2-128.bmp|0|12|
-%x|Y|line1-128.bmp|0|57|
+%xl(A,battery-s.bmp,109,2,5)
+%t(0.5) %?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ab)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ac)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ad)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ae)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>
+%xl(B,hold-s.bmp,86,1,3)
+%xl(C,repeat-s.bmp,66,1,4)
+%xl(D,shuffle-s.bmp,46,3,2)
+%xl(E,playmode-s.bmp,3,2,4)
+%?mh<%?mr<%xd(Ba)|%xd(Bb)>|%?mr<%xd(Bc)|>>%?mm<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)>%?ps<%xd(Da)|%xd(Db)>%?mp<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+%xl(F,volume-s.bmp,16,0,9)
+%xl(G,animation-s.bmp,16,0,8)
+%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ga)|%xd(Ga)|%xd(Ga)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gb)|%xd(Gb)|%xd(Gb)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gc)|%xd(Gc)|%xd(Gc)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gd)|%xd(Gd)|%xd(Gd)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ge)|%xd(Ge)|%xd(Ge)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gf)|%xd(Gf)|%xd(Gf)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gg)|%xd(Gg)|%xd(Gg)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gh)|%xd(Gh)|%xd(Gh)>
+%x(X,line2-128.bmp,0,12)
+%x(Y,line1-128.bmp,0,57)
diff --git a/wps/iCatcher.128x96x1.wps b/wps/iCatcher.128x96x1.wps
index 4a9acb9cae..8e9b819fda 100644
--- a/wps/iCatcher.128x96x1.wps
+++ b/wps/iCatcher.128x96x1.wps
@@ -1,25 +1,25 @@
 %wd
 
 
-%t1 %?mp<%al %pp/%pe%ar-:--/-:-- |%al %pp/%pe%ar%pc/%pt |%al %pp/%pe%ar%pc/%pt |%al %pp/%pe%ar%pc/%pt |%al %pp/%pe%ar%pc/%pt >;%t1 %?mp<%al %pp/%pe%ar-:--/-:-- |%al %pp/%pe%ar%pc/%pt |%al %pp/%pe|%al %pp/%pe%ar%pc/%pt |%al %pp/%pe%ar%pc/%pt >
+%t(1) %?mp<%al %pp/%pe%ar-:--/-:-- |%al %pp/%pe%ar%pc/%pt |%al %pp/%pe%ar%pc/%pt |%al %pp/%pe%ar%pc/%pt |%al %pp/%pe%ar%pc/%pt >%;%t(1) %?mp<%al %pp/%pe%ar-:--/-:-- |%al %pp/%pe%ar%pc/%pt |%al %pp/%pe|%al %pp/%pe%ar%pc/%pt |%al %pp/%pe%ar%pc/%pt >
 
-%s%ac%?ia<%ia|%?d2<%d2|Unknown Artist>>
-%s%ac%?id<%id|%?d1<%d1|Unknown Album>>
+%s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>>
+%s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>>
 %s%ac%?in<%in|%pp> - %?it<%it|%fn>
-%pb|-|11|-|106|4|
+%pb(-,11,-,106,4)
 
-%s%ac%Sx|Next:| %?It<%It|%?Fn<%Fn|?>>
+%s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>
 
-%xl|A|battery-s.bmp|109|3|5|
-%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAb|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAc|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAd|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAe|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>
-%xl|B|hold-s.bmp|86|2|3|
-%xl|C|repeat-s.bmp|66|2|4|
-%xl|D|shuffle-s.bmp|46|4|2|
-%xl|E|playmode-s.bmp|3|3|4|
-%?mh<%?mr<%xdBa|%xdBb>|%?mr<%xdBc|>>%?mm<|%xdCa|%xdCb|%xdCc|%xdCd>%?ps<%xdDa|%xdDb>%?mp<|%xdEa|%xdEb|%xdEc|%xdEd>
-%xl|F|volume-s.bmp|16|1|9|
-%xl|G|animation-s.bmp|16|1|8|
-%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGa|%xdGa|%xdGa>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGb|%xdGb|%xdGb>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGc|%xdGc|%xdGc>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGd|%xdGd|%xdGd>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGe|%xdGe|%xdGe>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGf|%xdGf|%xdGf>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGg|%xdGg|%xdGg>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGh|%xdGh|%xdGh>
-%x|W|line1-128.bmp|0|0|
-%x|X|line2-128.bmp|0|13|
-%x|Y|line1-128.bmp|0|77|
+%xl(A,battery-s.bmp,109,3,5)
+%t(0.5) %?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ab)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ac)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ad)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ae)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>
+%xl(B,hold-s.bmp,86,2,3)
+%xl(C,repeat-s.bmp,66,2,4)
+%xl(D,shuffle-s.bmp,46,4,2)
+%xl(E,playmode-s.bmp,3,3,4)
+%?mh<%?mr<%xd(Ba)|%xd(Bb)>|%?mr<%xd(Bc)|>>%?mm<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)>%?ps<%xd(Da)|%xd(Db)>%?mp<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+%xl(F,volume-s.bmp,16,1,9)
+%xl(G,animation-s.bmp,16,1,8)
+%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ga)|%xd(Ga)|%xd(Ga)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gb)|%xd(Gb)|%xd(Gb)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gc)|%xd(Gc)|%xd(Gc)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gd)|%xd(Gd)|%xd(Gd)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ge)|%xd(Ge)|%xd(Ge)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gf)|%xd(Gf)|%xd(Gf)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gg)|%xd(Gg)|%xd(Gg)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gh)|%xd(Gh)|%xd(Gh)>
+%x(W,line1-128.bmp,0,0)
+%x(X,line2-128.bmp,0,13)
+%x(Y,line1-128.bmp,0,77)
diff --git a/wps/iCatcher.132x80x16.wps b/wps/iCatcher.132x80x16.wps
index 9cff56775e..e6f3578a31 100644
--- a/wps/iCatcher.132x80x16.wps
+++ b/wps/iCatcher.132x80x16.wps
@@ -1,22 +1,22 @@
 %wd
-%X|bg-132x80x16.bmp|
+%X(bg-132x80x16.bmp)
 
 
-%t1 %?mp<%al Stopped%ar-:--/-:-- |%al %pp/%pe%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >;%t1 %?mp<%al Stopped-:--/-:-- |%al %pp/%pe%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
-%s%ac%?ia<%ia|%?d2<%d2|Unknown Artist>>
-%s%ac%?id<%id|%?d1<%d1|Unknown Album>>
+%t(1) %?mp<%al Stopped%ar-:--/-:-- |%al %pp/%pe%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >%;%t(1) %?mp<%al Stopped-:--/-:-- |%al %pp/%pe%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
+%s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>>
+%s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>>
 %s%ac%?in<%in|%pp> - %?it<%it|%fn>
-%pb|-|11|-|106|4|
+%pb(-,11,-,106,4)
 
-%s%ac%Sx|Next:| %?It<%It|%?Fn<%Fn|?>>
+%s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>
 
-%xl|A|battery-sc.bmp|115|5|5|
-%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAb|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAc|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAd|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAe|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>
-%xl|B|hold-sc.bmp|90|2|4|
-%xl|C|repeat-sc.bmp|68|2|5|
-%xl|D|shuffle-sc.bmp|48|4|2|
-%xl|E|playmode-sc.bmp|3|3|4|
-%?mh<%?mr<%xdBa|%xdBb>|%?mr<%xdBc|%xdBd>>%?mm<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe>%?ps<%xdDa|%xdDb>%?mp<|%xdEa|%xdEb|%xdEc|%xdEd>
-%xl|F|volume-sc.bmp|16|1|9|
-%xl|G|animation-sc.bmp|16|1|8|
-%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGa|%xdGa|%xdGa>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGb|%xdGb|%xdGb>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGc|%xdGc|%xdGc>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGd|%xdGd|%xdGd>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGe|%xdGe|%xdGe>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGf|%xdGf|%xdGf>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGg|%xdGg|%xdGg>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGh|%xdGh|%xdGh>
+%xl(A,battery-sc.bmp,115,5,5)
+%t(0.5) %?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ab)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ac)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ad)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ae)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>
+%xl(B,hold-sc.bmp,90,2,4)
+%xl(C,repeat-sc.bmp,68,2,5)
+%xl(D,shuffle-sc.bmp,48,4,2)
+%xl(E,playmode-sc.bmp,3,3,4)
+%?mh<%?mr<%xd(Ba)|%xd(Bb)>|%?mr<%xd(Bc)|%xd(Bd)>>%?mm<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)>%?ps<%xd(Da)|%xd(Db)>%?mp<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+%xl(F,volume-sc.bmp,16,1,9)
+%xl(G,animation-sc.bmp,16,1,8)
+%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ga)|%xd(Ga)|%xd(Ga)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gb)|%xd(Gb)|%xd(Gb)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gc)|%xd(Gc)|%xd(Gc)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gd)|%xd(Gd)|%xd(Gd)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ge)|%xd(Ge)|%xd(Ge)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gf)|%xd(Gf)|%xd(Gf)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gg)|%xd(Gg)|%xd(Gg)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gh)|%xd(Gh)|%xd(Gh)>
diff --git a/wps/iCatcher.138x110x2.wps b/wps/iCatcher.138x110x2.wps
index 267d726015..20e5ce2e84 100644
--- a/wps/iCatcher.138x110x2.wps
+++ b/wps/iCatcher.138x110x2.wps
@@ -1,31 +1,31 @@
 %wd
-%X|bg-138x110x2.bmp|
+%X(bg-138x110x2.bmp)
 
 
 
-%t1 %?mp<%al Stopped%ar-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >;%t1 %?mp<%al Stopped-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
+%t(1) %?mp<%al Stopped%ar-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >%;%t(1) %?mp<%al Stopped-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
 %s%al    %bl%%%ar%pp/%pe 
-%s%ac%?ia<%ia|%?d2<%d2|Unknown Artist>>
-%s%ac%?id<%id|%?d1<%d1|Unknown Album>>
+%s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>>
+%s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>>
 %s%ac%?in<%in|%pp> - %?it<%it|%fn>
 
 %al %fbKbps
-%pb|-|10|-|118|4|
+%pb(-,10,-,118,4)
 
-%s%ac%Sx|Next:| %?It<%It|%?Fn<%Fn|?>>
+%s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>
 
-%xl|A|battery-g.bmp|116|8|5|
-%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAb|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAc|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAd|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAe|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>
-%xl|B|hold-g.bmp|88|5|3|
-%?mh<%?mr<%xdBa|%xdBb>|%?mr<%xdBc|>>
-%xl|C|repeat-g.bmp|65|6|4|
-%?mm<|%xdCa|%xdCb|%xdCc|%xdCd>
-%xl|D|shuffle-g.bmp|40|7|2|
-%?ps<%xdDa|%xdDb>
-%xl|E|playmode-g.bmp|4|7|4|
-%?mp<|%xdEa|%xdEb|%xdEc|%xdEd>
-%xl|F|volume-g.bmp|19|4|9|
-%xl|G|animation-g.bmp|19|4|8|
-%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGa|%xdGa|%xdGa>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGb|%xdGb|%xdGb>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGc|%xdGc|%xdGc>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGd|%xdGd|%xdGd>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGe|%xdGe|%xdGe>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGf|%xdGf|%xdGf>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGg|%xdGg|%xdGg>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGh|%xdGh|%xdGh>
-%xl|H|codec-g.bmp|95|66|22|
-%?fc<%xdHa|%xdHb|%xdHc|%xdHd|%xdHe|%xdHf|%xdHg|%xdHh|%xdHi|%xdHj|%xdHk|%xdHl|%xdHm|%xdHn|%xdHo|%xdHp|%xdHq|%xdHr|%xdHs|%xdHt|%xdHu|%xdHv>
+%xl(A,battery-g.bmp,116,8,5)
+%t(0.5) %?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ab)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ac)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ad)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ae)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>
+%xl(B,hold-g.bmp,88,5,3)
+%?mh<%?mr<%xd(Ba)|%xd(Bb)>|%?mr<%xd(Bc)|>>
+%xl(C,repeat-g.bmp,65,6,4)
+%?mm<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)>
+%xl(D,shuffle-g.bmp,40,7,2)
+%?ps<%xd(Da)|%xd(Db)>
+%xl(E,playmode-g.bmp,4,7,4)
+%?mp<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+%xl(F,volume-g.bmp,19,4,9)
+%xl(G,animation-g.bmp,19,4,8)
+%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ga)|%xd(Ga)|%xd(Ga)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gb)|%xd(Gb)|%xd(Gb)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gc)|%xd(Gc)|%xd(Gc)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gd)|%xd(Gd)|%xd(Gd)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ge)|%xd(Ge)|%xd(Ge)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gf)|%xd(Gf)|%xd(Gf)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gg)|%xd(Gg)|%xd(Gg)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gh)|%xd(Gh)|%xd(Gh)>
+%xl(H,codec-g.bmp,95,66,22)
+%?fc<%xd(Ha)|%xd(Hb)|%xd(Hc)|%xd(Hd)|%xd(He)|%xd(Hf)|%xd(Hg)|%xd(Hh)|%xd(Hi)|%xd(Hj)|%xd(Hk)|%xd(Hl)|%xd(Hm)|%xd(Hn)|%xd(Ho)|%xd(Hp)|%xd(Hq)|%xd(Hr)|%xd(Hs)|%xd(Ht)|%xd(Hu)|%xd(Hv)>
diff --git a/wps/iCatcher.160x128x16.wps b/wps/iCatcher.160x128x16.wps
index 7baea2395d..1c51906fcb 100644
--- a/wps/iCatcher.160x128x16.wps
+++ b/wps/iCatcher.160x128x16.wps
@@ -1,32 +1,32 @@
 %wd
-%X|bg-160x128x16.bmp|
+%X(bg-160x128x16.bmp)
 
 
 
-%t1 %?mp<%al Stopped%ar-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >;%t1 %?mp<%al Stopped-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
+%t(1) %?mp<%al Stopped%ar-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >%;%t(1) %?mp<%al Stopped-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
 %al    %bl%%%ar%pp/%pe 
 
-%s%ac%?ia<%ia|%?d2<%d2|Unknown Artist>>
-%s%ac%?id<%id|%?d1<%d1|Unknown Album>>
+%s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>>
+%s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>>
 %s%ac%?in<%in|%pp> - %?it<%it|%fn>
 
 %al %fbKbps
-%pb|-|10|-|140|4|
+%pb(-,10,-,140,4)
 
-%s%ac%Sx|Next:| %?It<%It|%?Fn<%Fn|?>>
+%s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>
 
-%xl|A|battery.bmp|135|8|5|
-%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAb|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAc|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAd|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAe|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>
-%xl|B|hold.bmp|106|5|4|
-%?mh<%?mr<%xdBa|%xdBb>|%?mr<%xdBc|%xdBd>>
-%xl|C|repeat.bmp|83|6|5|
-%?mm<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe>
-%xl|D|shuffle.bmp|58|7|2|
-%?ps<%xdDa|%xdDb>
-%xl|E|playmode.bmp|6|7|4|
-%?mp<|%xdEa|%xdEb|%xdEc|%xdEd>
-%xl|F|volume.bmp|24|3|9|
-%xl|G|animation.bmp|24|3|8|
-%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGa|%xdGa|%xdGa>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGb|%xdGb|%xdGb>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGc|%xdGc|%xdGc>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGd|%xdGd|%xdGd>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGe|%xdGe|%xdGe>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGf|%xdGf|%xdGf>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGg|%xdGg|%xdGg>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGh|%xdGh|%xdGh>
-%xl|H|codec.bmp|115|85|22|
-%?fc<%xdHa|%xdHb|%xdHc|%xdHd|%xdHe|%xdHf|%xdHg|%xdHh|%xdHi|%xdHj|%xdHk|%xdHl|%xdHm|%xdHn|%xdHo|%xdHp|%xdHq|%xdHr|%xdHs|%xdHt|%xdHu|%xdHv>
+%xl(A,battery.bmp,135,8,5)
+%t(0.5) %?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ab)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ac)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ad)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ae)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>
+%xl(B,hold.bmp,106,5,4)
+%?mh<%?mr<%xd(Ba)|%xd(Bb)>|%?mr<%xd(Bc)|%xd(Bd)>>
+%xl(C,repeat.bmp,83,6,5)
+%?mm<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)>
+%xl(D,shuffle.bmp,58,7,2)
+%?ps<%xd(Da)|%xd(Db)>
+%xl(E,playmode.bmp,6,7,4)
+%?mp<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+%xl(F,volume.bmp,24,3,9)
+%xl(G,animation.bmp,24,3,8)
+%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ga)|%xd(Ga)|%xd(Ga)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gb)|%xd(Gb)|%xd(Gb)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gc)|%xd(Gc)|%xd(Gc)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gd)|%xd(Gd)|%xd(Gd)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ge)|%xd(Ge)|%xd(Ge)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gf)|%xd(Gf)|%xd(Gf)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gg)|%xd(Gg)|%xd(Gg)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gh)|%xd(Gh)|%xd(Gh)>
+%xl(H,codec.bmp,115,85,22)
+%?fc<%xd(Ha)|%xd(Hb)|%xd(Hc)|%xd(Hd)|%xd(He)|%xd(Hf)|%xd(Hg)|%xd(Hh)|%xd(Hi)|%xd(Hj)|%xd(Hk)|%xd(Hl)|%xd(Hm)|%xd(Hn)|%xd(Ho)|%xd(Hp)|%xd(Hq)|%xd(Hr)|%xd(Hs)|%xd(Ht)|%xd(Hu)|%xd(Hv)>
diff --git a/wps/iCatcher.160x128x2.wps b/wps/iCatcher.160x128x2.wps
index 310c6ab3ff..dd13ee5a39 100644
--- a/wps/iCatcher.160x128x2.wps
+++ b/wps/iCatcher.160x128x2.wps
@@ -1,32 +1,32 @@
 %wd
-%X|bg-160x128x2.bmp|
+%X(bg-160x128x2.bmp)
 
 
 
-%t1 %?mp<%al Stopped%ar-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >;%t1 %?mp<%al Stopped-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
+%t(1) %?mp<%al Stopped%ar-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >%;%t(1) %?mp<%al Stopped-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
 %s%al    %bl%%%ar%pp/%pe 
 
-%s%ac%?ia<%ia|%?d2<%d2|Unknown Artist>>
-%s%ac%?id<%id|%?d1<%d1|Unknown Album>>
+%s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>>
+%s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>>
 %s%ac%?in<%in|%pp> - %?it<%it|%fn>
 
 %al %fbKbps
-%pb|-|10|-|140|4|
+%pb(-,10,-,140,4)
 
-%s%ac%Sx|Next:| %?It<%It|%?Fn<%Fn|?>>
+%s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>
 
-%xl|A|battery-g.bmp|135|8|5|
-%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAb|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAc|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAd|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAe|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>
-%xl|B|hold-g.bmp|106|5|3|
-%?mh<%?mr<%xdBa|%xdBb>|%?mr<%xdBc|>>
-%xl|C|repeat-g.bmp|83|6|4|
-%?mm<|%xdCa|%xdCb|%xdCc|%xdCd>
-%xl|D|shuffle-g.bmp|58|7|2|
-%?ps<%xdDa|%xdDb>
-%xl|E|playmode-g.bmp|6|7|4|
-%?mp<|%xdEa|%xdEb|%xdEc|%xdEd>
-%xl|F|volume-g.bmp|24|4|9|
-%xl|G|animation-g.bmp|24|4|8|
-%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGa|%xdGa|%xdGa>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGb|%xdGb|%xdGb>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGc|%xdGc|%xdGc>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGd|%xdGd|%xdGd>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGe|%xdGe|%xdGe>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGf|%xdGf|%xdGf>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGg|%xdGg|%xdGg>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGh|%xdGh|%xdGh>
-%xl|H|codec-g.bmp|115|85|22|
-%?fc<%xdHa|%xdHb|%xdHc|%xdHd|%xdHe|%xdHf|%xdHg|%xdHh|%xdHi|%xdHj|%xdHk|%xdHl|%xdHm|%xdHn|%xdHo|%xdHp|%xdHq|%xdHr|%xdHs|%xdHt|%xdHu|%xdHv>
+%xl(A,battery-g.bmp,135,8,5)
+%t(0.5) %?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ab)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ac)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ad)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ae)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>
+%xl(B,hold-g.bmp,106,5,3)
+%?mh<%?mr<%xd(Ba)|%xd(Bb)>|%?mr<%xd(Bc)|>>
+%xl(C,repeat-g.bmp,83,6,4)
+%?mm<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)>
+%xl(D,shuffle-g.bmp,58,7,2)
+%?ps<%xd(Da)|%xd(Db)>
+%xl(E,playmode-g.bmp,6,7,4)
+%?mp<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+%xl(F,volume-g.bmp,24,4,9)
+%xl(G,animation-g.bmp,24,4,8)
+%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ga)|%xd(Ga)|%xd(Ga)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gb)|%xd(Gb)|%xd(Gb)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gc)|%xd(Gc)|%xd(Gc)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gd)|%xd(Gd)|%xd(Gd)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ge)|%xd(Ge)|%xd(Ge)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gf)|%xd(Gf)|%xd(Gf)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gg)|%xd(Gg)|%xd(Gg)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gh)|%xd(Gh)|%xd(Gh)>
+%xl(H,codec-g.bmp,115,85,22)
+%?fc<%xd(Ha)|%xd(Hb)|%xd(Hc)|%xd(Hd)|%xd(He)|%xd(Hf)|%xd(Hg)|%xd(Hh)|%xd(Hi)|%xd(Hj)|%xd(Hk)|%xd(Hl)|%xd(Hm)|%xd(Hn)|%xd(Ho)|%xd(Hp)|%xd(Hq)|%xd(Hr)|%xd(Hs)|%xd(Ht)|%xd(Hu)|%xd(Hv)>
diff --git a/wps/iCatcher.176x132x16.wps b/wps/iCatcher.176x132x16.wps
index ab7ed3d91b..0e53a10bb9 100644
--- a/wps/iCatcher.176x132x16.wps
+++ b/wps/iCatcher.176x132x16.wps
@@ -1,32 +1,32 @@
 %wd
-%X|bg-176x132x16.bmp|
+%X(bg-176x132x16.bmp)
 
 
 
-%t1 %?mp<%al Stopped%ar-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >;%t1 %?mp<%al Stopped-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
+%t(1) %?mp<%al Stopped%ar-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >%;%t(1) %?mp<%al Stopped-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
 %al    %bl%%%ar%pp/%pe 
 
-%s%ac%?ia<%ia|%?d2<%d2|Unknown Artist>>
-%s%ac%?id<%id|%?d1<%d1|Unknown Album>>
+%s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>>
+%s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>>
 %s%ac%?in<%in|%pp> - %?it<%it|%fn>
 
 %al %fbKbps
-%pb|-|10|-|156|4|
+%pb(-,10,-,156,4)
 
-%s%ac%Sx|Next:| %?It<%It|%?Fn<%Fn|?>>
+%s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>
 
-%xl|A|battery.bmp|151|8|5|
-%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAb|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAc|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAd|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAe|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>
-%xl|B|hold.bmp|122|5|4|
-%?mh<%?mr<%xdBa|%xdBb>|%?mr<%xdBc|%xdBd>>
-%xl|C|repeat.bmp|91|6|5|
-%?mm<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe>
-%xl|D|shuffle.bmp|66|7|2|
-%?ps<%xdDa|%xdDb>
-%xl|E|playmode.bmp|6|7|4|
-%?mp<|%xdEa|%xdEb|%xdEc|%xdEd>
-%xl|F|volume.bmp|24|3|9|
-%xl|G|animation.bmp|24|3|8|
-%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGa|%xdGa|%xdGa>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGb|%xdGb|%xdGb>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGc|%xdGc|%xdGc>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGd|%xdGd|%xdGd>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGe|%xdGe|%xdGe>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGf|%xdGf|%xdGf>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGg|%xdGg|%xdGg>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGh|%xdGh|%xdGh>
-%xl|H|codec.bmp|131|85|22|
-%?fc<%xdHa|%xdHb|%xdHc|%xdHd|%xdHe|%xdHf|%xdHg|%xdHh|%xdHi|%xdHj|%xdHk|%xdHl|%xdHm|%xdHn|%xdHo|%xdHp|%xdHq|%xdHr|%xdHs|%xdHt|%xdHu|%xdHv>
+%xl(A,battery.bmp,151,8,5)
+%t(0.5) %?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ab)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ac)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ad)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ae)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>
+%xl(B,hold.bmp,122,5,4)
+%?mh<%?mr<%xd(Ba)|%xd(Bb)>|%?mr<%xd(Bc)|%xd(Bd)>>
+%xl(C,repeat.bmp,91,6,5)
+%?mm<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)>
+%xl(D,shuffle.bmp,66,7,2)
+%?ps<%xd(Da)|%xd(Db)>
+%xl(E,playmode.bmp,6,7,4)
+%?mp<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+%xl(F,volume.bmp,24,3,9)
+%xl(G,animation.bmp,24,3,8)
+%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ga)|%xd(Ga)|%xd(Ga)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gb)|%xd(Gb)|%xd(Gb)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gc)|%xd(Gc)|%xd(Gc)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gd)|%xd(Gd)|%xd(Gd)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ge)|%xd(Ge)|%xd(Ge)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gf)|%xd(Gf)|%xd(Gf)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gg)|%xd(Gg)|%xd(Gg)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gh)|%xd(Gh)|%xd(Gh)>
+%xl(H,codec.bmp,131,85,22)
+%?fc<%xd(Ha)|%xd(Hb)|%xd(Hc)|%xd(Hd)|%xd(He)|%xd(Hf)|%xd(Hg)|%xd(Hh)|%xd(Hi)|%xd(Hj)|%xd(Hk)|%xd(Hl)|%xd(Hm)|%xd(Hn)|%xd(Ho)|%xd(Hp)|%xd(Hq)|%xd(Hr)|%xd(Hs)|%xd(Ht)|%xd(Hu)|%xd(Hv)>
diff --git a/wps/iCatcher.176x220x16.wps b/wps/iCatcher.176x220x16.wps
index 8370b0a97f..33421b817b 100644
--- a/wps/iCatcher.176x220x16.wps
+++ b/wps/iCatcher.176x220x16.wps
@@ -1,36 +1,36 @@
 %wd
-%X|bg-176x220x16.bmp|
+%X(bg-176x220x16.bmp)
 
 
 
-%t1 %?mp<%al Stopped%ar-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >;%t1 %?mp<%al Stopped-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
+%t(1) %?mp<%al Stopped%ar-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >%;%t(1) %?mp<%al Stopped-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
 %al   %bl%%%ar%pp/%pe 
 
 
-%s%ac%?ia<%ia|%?d2<%d2|Unknown Artist>>
-%s%ac%?id<%id|%?d1<%d1|Unknown Album>>
+%s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>>
+%s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>>
 %s%ac%?in<%in|%pp> - %?it<%it|%fn>
 
 
 
 
 %al %fbKbps
-%pb|-|10|-|156|4|
-
-%s%ac%Sx|Next:| %?It<%It|%?Fn<%Fn|?>>
-
-%xl|A|battery.bmp|151|8|5|
-%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAb|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAc|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAd|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAe|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>
-%xl|B|hold.bmp|122|5|4|
-%?mh<%?mr<%xdBa|%xdBb>|%?mr<%xdBc|%xdBd>>
-%xl|C|repeat.bmp|91|6|5|
-%?mm<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe>
-%xl|D|shuffle.bmp|66|7|2|
-%?ps<%xdDa|%xdDb>
-%xl|E|playmode.bmp|6|7|4|
-%?mp<|%xdEa|%xdEb|%xdEc|%xdEd>
-%xl|F|volume.bmp|24|3|9|
-%xl|G|animation.bmp|24|3|8|
-%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGa|%xdGa|%xdGa>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGb|%xdGb|%xdGb>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGc|%xdGc|%xdGc>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGd|%xdGd|%xdGd>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGe|%xdGe|%xdGe>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGf|%xdGf|%xdGf>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGg|%xdGg|%xdGg>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGh|%xdGh|%xdGh>
-%xl|H|codec.bmp|131|167|22|
-%?fc<%xdHa|%xdHb|%xdHc|%xdHd|%xdHe|%xdHf|%xdHg|%xdHh|%xdHi|%xdHj|%xdHk|%xdHl|%xdHm|%xdHn|%xdHo|%xdHp|%xdHq|%xdHr|%xdHs|%xdHt|%xdHu|%xdHv>
+%pb(-,10,-,156,4)
+
+%s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>
+
+%xl(A,battery.bmp,151,8,5)
+%t(0.5) %?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ab)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ac)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ad)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ae)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>
+%xl(B,hold.bmp,122,5,4)
+%?mh<%?mr<%xd(Ba)|%xd(Bb)>|%?mr<%xd(Bc)|%xd(Bd)>>
+%xl(C,repeat.bmp,91,6,5)
+%?mm<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)>
+%xl(D,shuffle.bmp,66,7,2)
+%?ps<%xd(Da)|%xd(Db)>
+%xl(E,playmode.bmp,6,7,4)
+%?mp<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+%xl(F,volume.bmp,24,3,9)
+%xl(G,animation.bmp,24,3,8)
+%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ga)|%xd(Ga)|%xd(Ga)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gb)|%xd(Gb)|%xd(Gb)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gc)|%xd(Gc)|%xd(Gc)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gd)|%xd(Gd)|%xd(Gd)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ge)|%xd(Ge)|%xd(Ge)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gf)|%xd(Gf)|%xd(Gf)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gg)|%xd(Gg)|%xd(Gg)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gh)|%xd(Gh)|%xd(Gh)>
+%xl(H,codec.bmp,131,167,22)
+%?fc<%xd(Ha)|%xd(Hb)|%xd(Hc)|%xd(Hd)|%xd(He)|%xd(Hf)|%xd(Hg)|%xd(Hh)|%xd(Hi)|%xd(Hj)|%xd(Hk)|%xd(Hl)|%xd(Hm)|%xd(Hn)|%xd(Ho)|%xd(Hp)|%xd(Hq)|%xd(Hr)|%xd(Hs)|%xd(Ht)|%xd(Hu)|%xd(Hv)>
diff --git a/wps/iCatcher.220x176x16.wps b/wps/iCatcher.220x176x16.wps
index b58455f82d..a15bf1e2ec 100644
--- a/wps/iCatcher.220x176x16.wps
+++ b/wps/iCatcher.220x176x16.wps
@@ -1,30 +1,30 @@
 %wd
-%X|bg-220x176x16.bmp|
+%X(bg-220x176x16.bmp)
 
 
-%t1 %?mp<%al Stopped%ar-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >;%t1 %?mp<%al Stopped-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
+%t(1) %?mp<%al Stopped%ar-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >%;%t(1) %?mp<%al Stopped-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
 %al    %bl%%%ar%pp/%pe 
-%s%ac%?ia<%ia|%?d2<%d2|Unknown Artist>>
-%s%ac%?id<%id|%?d1<%d1|Unknown Album>>
+%s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>>
+%s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>>
 %s%ac%?in<%in|%pp> - %?it<%it|%fn>
 
 %al %fbKbps
-%pb|-|11|-|198|6|
+%pb(-,11,-,198,6)
 
-%s%ac%Sx|Next:| %?It<%It|%?Fn<%Fn|?>>
+%s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>
 
-%xl|A|battery.bmp|194|9|5|
-%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>
-%xl|B|hold.bmp|165|6|4|
-%?mh<%?mr<%xdBa|%xdBb>|%?mr<%xdBc|%xdBd>>
-%xl|C|repeat.bmp|114|7|5|
-%?mm<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe>
-%xl|D|shuffle.bmp|89|8|2|
-%?ps<%xdDa|%xdDb>
-%xl|E|playmode.bmp|8|7|4|
-%?mp<|%xdEa|%xdEb|%xdEc|%xdEd>
-%xl|F|volume.bmp|25|4|9|
-%xl|G|animation.bmp|25|4|8|
-%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGa|%xdGa|%xdGa>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGb|%xdGb|%xdGb>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGc|%xdGc|%xdGc>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGd|%xdGd|%xdGd>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGe|%xdGe|%xdGe>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGf|%xdGf|%xdGf>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGg|%xdGg|%xdGg>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGh|%xdGh|%xdGh>
-%xl|H|codec.bmp|173|112|22|
-%?fc<%xdHa|%xdHb|%xdHc|%xdHd|%xdHe|%xdHf|%xdHg|%xdHh|%xdHi|%xdHj|%xdHk|%xdHl|%xdHm|%xdHn|%xdHo|%xdHp|%xdHq|%xdHr|%xdHs|%xdHt|%xdHu|%xdHv>
+%xl(A,battery.bmp,194,9,5)
+%t(0.5) %?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>
+%xl(B,hold.bmp,165,6,4)
+%?mh<%?mr<%xd(Ba)|%xd(Bb)>|%?mr<%xd(Bc)|%xd(Bd)>>
+%xl(C,repeat.bmp,114,7,5)
+%?mm<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)>
+%xl(D,shuffle.bmp,89,8,2)
+%?ps<%xd(Da)|%xd(Db)>
+%xl(E,playmode.bmp,8,7,4)
+%?mp<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+%xl(F,volume.bmp,25,4,9)
+%xl(G,animation.bmp,25,4,8)
+%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ga)|%xd(Ga)|%xd(Ga)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gb)|%xd(Gb)|%xd(Gb)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gc)|%xd(Gc)|%xd(Gc)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gd)|%xd(Gd)|%xd(Gd)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ge)|%xd(Ge)|%xd(Ge)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gf)|%xd(Gf)|%xd(Gf)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gg)|%xd(Gg)|%xd(Gg)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gh)|%xd(Gh)|%xd(Gh)>
+%xl(H,codec.bmp,173,112,22)
+%?fc<%xd(Ha)|%xd(Hb)|%xd(Hc)|%xd(Hd)|%xd(He)|%xd(Hf)|%xd(Hg)|%xd(Hh)|%xd(Hi)|%xd(Hj)|%xd(Hk)|%xd(Hl)|%xd(Hm)|%xd(Hn)|%xd(Ho)|%xd(Hp)|%xd(Hq)|%xd(Hr)|%xd(Hs)|%xd(Ht)|%xd(Hu)|%xd(Hv)>
diff --git a/wps/iCatcher.240x320x16.wps b/wps/iCatcher.240x320x16.wps
index fc1e730c4c..98c2e52f46 100644
--- a/wps/iCatcher.240x320x16.wps
+++ b/wps/iCatcher.240x320x16.wps
@@ -1,34 +1,34 @@
 %wd
-%X|bg-240x320x16.bmp|
+%X(bg-240x320x16.bmp)
 
 
-%t1 %?mp<%al Stopped%ar-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >;%t1 %?mp<%al Stopped-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
+%t(1) %?mp<%al Stopped%ar-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >%;%t(1) %?mp<%al Stopped-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
 %al   %bl%%%ar%pp/%pe 
 
 
-%s%ac%?ia<%ia|%?d2<%d2|Unknown Artist>>
-%s%ac%?id<%id|%?d1<%d1|Unknown Album>>
+%s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>>
+%s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>>
 %s%ac%?in<%in|%pp> - %?it<%it|%fn>
 
 
 
 %al %fbKbps
-%pb|-|11|-|218|7|
-
-%s%ac%Sx|Next:| %?It<%It|%?Fn<%Fn|?>>
-
-%xl|A|battery-b.bmp|204|12|5|
-%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAb|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAc|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAd|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAe|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>
-%xl|B|hold-b.bmp|164|8|4|
-%?mh<%?mr<%xdBa|%xdBb>|%?mr<%xdBc|%xdBd>>
-%xl|C|repeat-b.bmp|126|9|5|
-%?mm<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe>
-%xl|D|shuffle-b.bmp|91|11|2|
-%?ps<%xdDa|%xdDb>
-%xl|E|playmode-b.bmp|11|10|4|
-%?mp<|%xdEa|%xdEb|%xdEc|%xdEd>
-%xl|F|volume-b.bmp|34|5|9|
-%xl|G|animation-b.bmp|34|5|8|
-%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGa|%xdGa|%xdGa>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGb|%xdGb|%xdGb>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGc|%xdGc|%xdGc>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGd|%xdGd|%xdGd>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGe|%xdGe|%xdGe>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGf|%xdGf|%xdGf>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGg|%xdGg|%xdGg>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGh|%xdGh|%xdGh>
-%xl|H|codec-b.bmp|168|229|22|
-%?fc<%xdHa|%xdHb|%xdHc|%xdHd|%xdHe|%xdHf|%xdHg|%xdHh|%xdHi|%xdHj|%xdHk|%xdHl|%xdHm|%xdHn|%xdHo|%xdHp|%xdHq|%xdHr|%xdHs|%xdHt|%xdHu|%xdHv>
+%pb(-,11,-,218,7)
+
+%s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>
+
+%xl(A,battery-b.bmp,204,12,5)
+%t(0.5) %?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ab)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ac)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ad)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ae)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>
+%xl(B,hold-b.bmp,164,8,4)
+%?mh<%?mr<%xd(Ba)|%xd(Bb)>|%?mr<%xd(Bc)|%xd(Bd)>>
+%xl(C,repeat-b.bmp,126,9,5)
+%?mm<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)>
+%xl(D,shuffle-b.bmp,91,11,2)
+%?ps<%xd(Da)|%xd(Db)>
+%xl(E,playmode-b.bmp,11,10,4)
+%?mp<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+%xl(F,volume-b.bmp,34,5,9)
+%xl(G,animation-b.bmp,34,5,8)
+%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ga)|%xd(Ga)|%xd(Ga)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gb)|%xd(Gb)|%xd(Gb)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gc)|%xd(Gc)|%xd(Gc)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gd)|%xd(Gd)|%xd(Gd)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ge)|%xd(Ge)|%xd(Ge)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gf)|%xd(Gf)|%xd(Gf)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gg)|%xd(Gg)|%xd(Gg)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gh)|%xd(Gh)|%xd(Gh)>
+%xl(H,codec-b.bmp,168,229,22)
+%?fc<%xd(Ha)|%xd(Hb)|%xd(Hc)|%xd(Hd)|%xd(He)|%xd(Hf)|%xd(Hg)|%xd(Hh)|%xd(Hi)|%xd(Hj)|%xd(Hk)|%xd(Hl)|%xd(Hm)|%xd(Hn)|%xd(Ho)|%xd(Hp)|%xd(Hq)|%xd(Hr)|%xd(Hs)|%xd(Ht)|%xd(Hu)|%xd(Hv)>
diff --git a/wps/iCatcher.320x240x16.wps b/wps/iCatcher.320x240x16.wps
index 1eb2e23712..97d69bfe92 100644
--- a/wps/iCatcher.320x240x16.wps
+++ b/wps/iCatcher.320x240x16.wps
@@ -1,30 +1,30 @@
 %wd
-%X|bg-320x240x16.bmp|
+%X(bg-320x240x16.bmp)
 
 
-%t1 %?mp<%al Stopped%ar-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >;%t1 %?mp<%al Stopped-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
+%t(1) %?mp<%al Stopped%ar-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused%ar%pc/%pt |%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >%;%t(1) %?mp<%al Stopped-:--/-:-- |%al %pv dB%ar%pc/%pt |%al Paused|%al Seeking%ar%pc/%pt |%al Seeking%ar%pc/%pt >
 %al   %bl%%%ar%pp/%pe 
-%s%ac%?ia<%ia|%?d2<%d2|Unknown Artist>>
-%s%ac%?id<%id|%?d1<%d1|Unknown Album>>
+%s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>>
+%s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>>
 %s%ac%?in<%in|%pp> - %?it<%it|%fn>
 
 %al %fbKbps
-%pb|-|11|-|298|7|
+%pb(-,11,-,298,7)
 
-%s%ac%Sx|Next:| %?It<%It|%?Fn<%Fn|?>>
+%s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>
 
-%xl|A|battery-b.bmp|284|12|5|
-%t0.5 %?bp<%?bc<%xdAa|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAb|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAc|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAd|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>;%t0.5 %?bp<%?bc<%xdAe|%xdAe>|%?bl<%xdAa|%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAe>>
-%xl|B|hold-b.bmp|244|8|4|
-%?mh<%?mr<%xdBa|%xdBb>|%?mr<%xdBc|%xdBd>>
-%xl|C|repeat-b.bmp|166|9|5|
-%?mm<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe>
-%xl|D|shuffle-b.bmp|131|11|2|
-%?ps<%xdDa|%xdDb>
-%xl|E|playmode-b.bmp|11|10|4|
-%?mp<|%xdEa|%xdEb|%xdEc|%xdEd>
-%xl|F|volume-b.bmp|34|5|9|
-%xl|G|animation-b.bmp|34|5|8|
-%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGa|%xdGa|%xdGa>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGb|%xdGb|%xdGb>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGc|%xdGc|%xdGc>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGd|%xdGd|%xdGd>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGe|%xdGe|%xdGe>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGf|%xdGf|%xdGf>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGg|%xdGg|%xdGg>;%t0.1 %?mp<%xdFa|%?pv<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe|%xdFf|%xdFg|%xdFh|%xdFi>|%xdGh|%xdGh|%xdGh>
-%xl|H|codec-b.bmp|248|153|22|
-%?fc<%xdHa|%xdHb|%xdHc|%xdHd|%xdHe|%xdHf|%xdHg|%xdHh|%xdHi|%xdHj|%xdHk|%xdHl|%xdHm|%xdHn|%xdHo|%xdHp|%xdHq|%xdHr|%xdHs|%xdHt|%xdHu|%xdHv>
+%xl(A,battery-b.bmp,284,12,5)
+%t(0.5) %?bp<%?bc<%xd(Aa)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ab)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ac)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ad)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>%;%t(0.5) %?bp<%?bc<%xd(Ae)|%xd(Ae)>|%?bl<%xd(Aa)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Ae)>>
+%xl(B,hold-b.bmp,244,8,4)
+%?mh<%?mr<%xd(Ba)|%xd(Bb)>|%?mr<%xd(Bc)|%xd(Bd)>>
+%xl(C,repeat-b.bmp,166,9,5)
+%?mm<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)>
+%xl(D,shuffle-b.bmp,131,11,2)
+%?ps<%xd(Da)|%xd(Db)>
+%xl(E,playmode-b.bmp,11,10,4)
+%?mp<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
+%xl(F,volume-b.bmp,34,5,9)
+%xl(G,animation-b.bmp,34,5,8)
+%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ga)|%xd(Ga)|%xd(Ga)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gb)|%xd(Gb)|%xd(Gb)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gc)|%xd(Gc)|%xd(Gc)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gd)|%xd(Gd)|%xd(Gd)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Ge)|%xd(Ge)|%xd(Ge)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gf)|%xd(Gf)|%xd(Gf)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gg)|%xd(Gg)|%xd(Gg)>%;%t(0.1) %?mp<%xd(Fa)|%?pv<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)|%xd(Ff)|%xd(Fg)|%xd(Fh)|%xd(Fi)>|%xd(Gh)|%xd(Gh)|%xd(Gh)>
+%xl(H,codec-b.bmp,248,153,22)
+%?fc<%xd(Ha)|%xd(Hb)|%xd(Hc)|%xd(Hd)|%xd(He)|%xd(Hf)|%xd(Hg)|%xd(Hh)|%xd(Hi)|%xd(Hj)|%xd(Hk)|%xd(Hl)|%xd(Hm)|%xd(Hn)|%xd(Ho)|%xd(Hp)|%xd(Hq)|%xd(Hr)|%xd(Hs)|%xd(Ht)|%xd(Hu)|%xd(Hv)>
diff --git a/wps/ipodVOL.160x128x1.wps b/wps/ipodVOL.160x128x1.wps
index 4d56a12299..a920410003 100644
--- a/wps/ipodVOL.160x128x1.wps
+++ b/wps/ipodVOL.160x128x1.wps
@@ -1,20 +1,20 @@
-%xl|A|playmode.bmp|0|2|4|
-%xl|B|hold.bmp|20|2|
-%xl|C|repeat.bmp|141|18|4|
-%xl|D|battery.bmp|136|2|6|
-%x|a|bg.bmp|0|0|
+%xl(A,playmode.bmp,0,2,4)
+%xl(B,hold.bmp,20,2)
+%xl(C,repeat.bmp,141,18,4)
+%xl(D,battery.bmp,136,2,6)
+%x(a,bg.bmp,0,0)
 %wd
-%ac%?mp<Now Stopped|Now Playing|Now Paused|Now Playing|Now Playing>%?mp<|%?ps< (S)|>>
+%ac%?mp<Now Stopped|Now Playing|Now Paused|Now Playing|Now Playing>%?mp<|%?ps< %(S%)|>>
 
-%al%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe> 
+%al%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe> 
 
 %s%ac%?it<%it|%fn>
-%s%t3%ac%?ia<%ia|%d2>
-%s%t3%ac%?id<%id|%d1>
+%s%t(3)%ac%?ia<%ia|%d(2)>
+%s%t(3)%ac%?id<%id|%d(1)>
 
 %pb
 %al%pc %ac      %pv %ar-%pr
-%?mp<|%xdAa|%xdAb|%xdAc|%xdAd>
-%?mh<%xdB|>
-%?bp<%xdDa|%?bl<%xdDb|%xdDc|%xdDd|%xdDe|%xdDf>>
-%?mm<|%xdCa|%xdCb|%xdCc|%xdCd>
+%?mp<|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)>
+%?mh<%xd(B)|>
+%?bp<%xd(Da)|%?bl<%xd(Db)|%xd(Dc)|%xd(Dd)|%xd(De)|%xd(Df)>>
+%?mm<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)>
diff --git a/wps/progressive.11x2x1.wps b/wps/progressive.11x2x1.wps
index 1e5d853726..e2c0711052 100644
--- a/wps/progressive.11x2x1.wps
+++ b/wps/progressive.11x2x1.wps
@@ -1,3 +1,3 @@
 #wps for the archos player with text alignment
-%s%pp/%pe: %?it<%it|%fn> - %?ia<%ia|%d2> - %?id<%id|%d1>
+%s%pp/%pe: %?it<%it|%fn> - %?ia<%ia|%d(2)> - %?id<%id|%d(1)>
 %al%pc%ac%pb%ar%pt
\ No newline at end of file
diff --git a/wps/wpsbuild.pl b/wps/wpsbuild.pl
index 57dc3de283..f07ad6dc01 100755
--- a/wps/wpsbuild.pl
+++ b/wps/wpsbuild.pl
@@ -226,7 +226,7 @@ sub copywps
 
            open(WPSFILE, "$dir/$req_g_wps");
            while (<WPSFILE>) {
-              $filelist[$#filelist + 1] = $1 if (/\|([^|]*?.bmp)\|/);
+              $filelist[$#filelist + 1] = $1 if (/[\(,]([^,]*?.bmp)[\),]/);
            }
            close(WPSFILE);
 
diff --git a/wps/zezayer.128x64x1.wps b/wps/zezayer.128x64x1.wps
index 4ca1d7bd2e..1c770f3aee 100644
--- a/wps/zezayer.128x64x1.wps
+++ b/wps/zezayer.128x64x1.wps
@@ -1,8 +1,8 @@
 %we
-* %?ia<%ia|%d2>
-* %?id<%id|%d1>
-* %?in<(%in) |>%?it<%it|%fn>
-%?ig<%t8* Genre: %ig %?iy<(%iy)|%t0>|%?iy<%t8* Year: %iy|%t0>%t0>;%?ic<%t8* By: %ic|%t0>
+* %?ia<%ia|%d(2)>
+* %?id<%id|%d(1)>
+* %?in<%(%in%) |>%?it<%it|%fn>
+%?ig<%t(8)* Genre: %ig %?iy<%(%iy%)|%t(0)>|%?iy<%t(8)* Year: %iy|%t(0)>%t(0)>%;%?ic<%t(8)* By: %ic|%t(0)>
 %ac%pr/%pt        %?pp<[%pp/%pe]|>
 %pb
 %ar%fc   %?fb<%?fv<%fbK VBR| %fbK >|>
diff --git a/wps/zezayer.160x128x1.wps b/wps/zezayer.160x128x1.wps
index f83f03ba7c..e8aad7d726 100644
--- a/wps/zezayer.160x128x1.wps
+++ b/wps/zezayer.160x128x1.wps
@@ -1,18 +1,18 @@
-%x|a|RockBoxWPSd.bmp|0|0|
+%x(a,RockBoxWPSd.bmp,0,0)
 %wd
 %ar  %?mp<Stop|Play|Pause|%>%>|%<%<>     
 
-* %?ia<%ia|%d2>
-* %?id<%id|%d1>
-* %?in<(%in) |>%?it<%it|%fn>
-%?ig<%t8* Genre: %ig %?iy<(%iy)|%t0>|%?iy<%t8* Year: %iy|%t0>%t0>;%?ic<%t8* By: %ic|%t0>
+* %?ia<%ia|%d(2)>
+* %?id<%id|%d(1)>
+* %?in<%(%in%) |>%?it<%it|%fn>
+%?ig<%t(8)* Genre: %ig %?iy<%(%iy%)|%t(0)>|%?iy<%t(8)* Year: %iy|%t(0)>%t(0)>%;%?ic<%t(8)* By: %ic|%t(0)>
 
 %ac%pr/%pt        %?pp<[%pp/%pe]|>
 %pb
 %ar%fc   %?fb<%?fv<%fbK VBR| %fbK >|>   
 
-%?Ia<* %Ia|%?D2<* %D2|>>
-%?It<* %?In<(%In) |>%It|%?Fn<* %?In<(%In) |>%Fn|>>
+%?Ia<* %Ia|%?D(2)<* %D(2)|>>
+%?It<* %?In<%(%In%) |>%It|%?Fn<* %?In<%(%In%) |>%Fn|>>
 
-%al     %pv  %?mm<%?ps<(Shuffle)|>|%?ps<(Sfl All)|(Rpt All)>|(Rpt 1)|%?ps<(Shuffle)|(Rpt Sfl)>|(A-B Rpt)>
-%al     %t15%bl  (%bt) 
+%al     %pv  %?mm<%?ps<%(Shuffle%)|>|%?ps<%(Sfl All%)|%(Rpt All%)>|%(Rpt 1%)|%?ps<%(Shuffle%)|%(Rpt Sfl%)>|%(A-B Rpt%)>
+%al     %t(15)%bl  %(%bt%)