Index: utils/themeeditor/models/parsetreenode.cpp
===================================================================
--- utils/themeeditor/models/parsetreenode.cpp	(revision 27267)
+++ utils/themeeditor/models/parsetreenode.cpp	(working copy)
@@ -31,6 +31,7 @@
 #include <iostream>
 
 int ParseTreeNode::openConditionals = 0;
+bool ParseTreeNode::breakFlag = false;
 
 /* Root element constructor */
 ParseTreeNode::ParseTreeNode(struct skin_element* data)
@@ -520,8 +521,11 @@
     {
         for(int i = 0; i < children.count(); i++)
             children[i]->render(info, viewport);
-        if(!noBreak)
+        if(!noBreak && !breakFlag)
             viewport->newLine();
+
+        if(breakFlag)
+            breakFlag = false;
     }
     else if(element->type == TEXT)
     {
@@ -531,6 +535,8 @@
     {
         if(!execTag(info, viewport))
             viewport->write(evalTag(info).toString());
+        if(element->tag->flags & NOBREAK)
+            breakFlag = true;
     }
     else if(element->type == CONDITIONAL)
     {
Index: utils/themeeditor/models/parsetreenode.h
===================================================================
--- utils/themeeditor/models/parsetreenode.h	(revision 27267)
+++ utils/themeeditor/models/parsetreenode.h	(working copy)
@@ -79,6 +79,7 @@
     QList<ParseTreeNode*> children;
 
     static int openConditionals;
+    static bool breakFlag;
     QGraphicsItem* rendered;
 
 };
Index: lib/skin_parser/skin_parser.c
===================================================================
--- lib/skin_parser/skin_parser.c	(revision 27267)
+++ lib/skin_parser/skin_parser.c	(working copy)
@@ -459,21 +459,9 @@
         return 1;
     }
 
-    /* Eating a newline if necessary */
-    if(tag_args[0] == '\n')
-    {
-        while (*cursor && *cursor != '\n')
-            cursor++;
-        if (*cursor)
-            cursor++;
-        skin_line++;
-        *document = cursor;
-        return 1;
-    }
 
     /* Checking the number of arguments and allocating args */
-    if(*cursor != ARGLISTOPENSYM && tag_args[0] != '|'
-       && tag_args[0] != '\n')
+    if(*cursor != ARGLISTOPENSYM && tag_args[0] != '|')
     {
         skin_error(ARGLIST_EXPECTED);
         return 0;
@@ -521,7 +509,7 @@
     for(i = 0; i < num_args; i++)
     {
         /* Making sure we haven't run out of arguments */
-        if(*tag_args == '\0' || *tag_args == '\n')
+        if(*tag_args == '\0')
         {
             skin_error(TOO_MANY_ARGS);
             return 0;
@@ -620,27 +608,11 @@
     }
 
     /* Checking for a premature end */
-    if(*tag_args != '\0' && *tag_args != '\n' && !optional)
+    if(*tag_args != '\0' && !optional)
     {
         skin_error(INSUFFICIENT_ARGS);
         return 0;
     }
-
-    if(*tag_args == '\n')
-    {
-        while (*cursor && *cursor != '\n')
-            cursor++;
-        if (*cursor)
-            cursor++;
-        skin_line++;
-    }
-
-    if((strcmp(tag->name, "Vf") == 0 || strcmp(tag->name, "Vb") == 0)
-        && *cursor == '\n' && skin_line == viewport_line)
-    {
-        cursor++;
-        skin_line++;
-    }
     
     *document = cursor;
 
Index: lib/skin_parser/tag_table.c
===================================================================
--- lib/skin_parser/tag_table.c	(revision 27267)
+++ lib/skin_parser/tag_table.c	(working copy)
@@ -26,191 +26,191 @@
 /* The tag definition table */
 struct tag_info legal_tags[] = 
 {
-    { SKIN_TOKEN_ALIGN_CENTER,          "ac", "" },
-    { SKIN_TOKEN_ALIGN_LEFT,            "al", "" },
-    { SKIN_TOKEN_ALIGN_LEFT_RTL,        "aL", "" },
-    { SKIN_TOKEN_ALIGN_RIGHT,           "ar", "" },
-    { SKIN_TOKEN_ALIGN_RIGHT_RTL,       "aR", "" },
-    { SKIN_TOKEN_ALIGN_LANGDIRECTION,   "ax", "" },
+    { SKIN_TOKEN_ALIGN_CENTER,          "ac", "", NOFLAGS },
+    { SKIN_TOKEN_ALIGN_LEFT,            "al", "", NOFLAGS },
+    { SKIN_TOKEN_ALIGN_LEFT_RTL,        "aL", "", NOFLAGS },
+    { SKIN_TOKEN_ALIGN_RIGHT,           "ar", "", NOFLAGS },
+    { SKIN_TOKEN_ALIGN_RIGHT_RTL,       "aR", "", NOFLAGS },
+    { SKIN_TOKEN_ALIGN_LANGDIRECTION,   "ax", "", NOFLAGS },
     
-    { SKIN_TOKEN_BATTERY_PERCENT,       "bl" , BAR_PARAMS },
-    { SKIN_TOKEN_BATTERY_VOLTS,         "bv", "" },
-    { SKIN_TOKEN_BATTERY_TIME,          "bt", "" },
-    { SKIN_TOKEN_BATTERY_SLEEPTIME,     "bs", "" },
-    { SKIN_TOKEN_BATTERY_CHARGING,      "bc", "" },
-    { SKIN_TOKEN_BATTERY_CHARGER_CONNECTED, "bp", "" },
-    { SKIN_TOKEN_USB_POWERED,           "bu", "" },
+    { SKIN_TOKEN_BATTERY_PERCENT,       "bl" , BAR_PARAMS, NOFLAGS },
+    { SKIN_TOKEN_BATTERY_VOLTS,         "bv", "", NOFLAGS },
+    { SKIN_TOKEN_BATTERY_TIME,          "bt", "", NOFLAGS },
+    { SKIN_TOKEN_BATTERY_SLEEPTIME,     "bs", "", NOFLAGS },
+    { SKIN_TOKEN_BATTERY_CHARGING,      "bc", "", NOFLAGS },
+    { SKIN_TOKEN_BATTERY_CHARGER_CONNECTED, "bp", "", NOFLAGS },
+    { SKIN_TOKEN_USB_POWERED,           "bu", "", NOFLAGS },
     
     
-    { SKIN_TOKEN_RTC_PRESENT,           "cc", "" },
-    { SKIN_TOKEN_RTC_DAY_OF_MONTH,      "cd", "" },
-    { SKIN_TOKEN_RTC_DAY_OF_MONTH_BLANK_PADDED, "ce", "" },
-    { SKIN_TOKEN_RTC_12HOUR_CFG,        "cf", "" },
-    { SKIN_TOKEN_RTC_HOUR_24_ZERO_PADDED, "cH", "" },
-    { SKIN_TOKEN_RTC_HOUR_24,           "ck", "" },
-    { SKIN_TOKEN_RTC_HOUR_12_ZERO_PADDED, "cI", "" },
-    { SKIN_TOKEN_RTC_HOUR_12,           "cl", "" },
-    { SKIN_TOKEN_RTC_MONTH,             "cm", "" },
-    { SKIN_TOKEN_RTC_MINUTE,            "cM", "" },
-    { SKIN_TOKEN_RTC_SECOND,            "cS", "" },
-    { SKIN_TOKEN_RTC_YEAR_2_DIGITS,     "cy", "" },
-    { SKIN_TOKEN_RTC_YEAR_4_DIGITS,     "cY", "" },
-    { SKIN_TOKEN_RTC_AM_PM_UPPER,       "cP", "" },
-    { SKIN_TOKEN_RTC_AM_PM_LOWER,       "cp", "" },
-    { SKIN_TOKEN_RTC_WEEKDAY_NAME,      "ca", "" },
-    { SKIN_TOKEN_RTC_MONTH_NAME,        "cb", "" },
-    { SKIN_TOKEN_RTC_DAY_OF_WEEK_START_MON, "cu", "" },
-    { SKIN_TOKEN_RTC_DAY_OF_WEEK_START_SUN, "cw", "" },
+    { SKIN_TOKEN_RTC_PRESENT,           "cc", "", NOFLAGS },
+    { SKIN_TOKEN_RTC_DAY_OF_MONTH,      "cd", "", NOFLAGS },
+    { SKIN_TOKEN_RTC_DAY_OF_MONTH_BLANK_PADDED, "ce", "", NOFLAGS },
+    { SKIN_TOKEN_RTC_12HOUR_CFG,        "cf", "", NOFLAGS },
+    { SKIN_TOKEN_RTC_HOUR_24_ZERO_PADDED, "cH", "", NOFLAGS },
+    { SKIN_TOKEN_RTC_HOUR_24,           "ck", "", NOFLAGS },
+    { SKIN_TOKEN_RTC_HOUR_12_ZERO_PADDED, "cI", "", NOFLAGS },
+    { SKIN_TOKEN_RTC_HOUR_12,           "cl", "", NOFLAGS },
+    { SKIN_TOKEN_RTC_MONTH,             "cm", "", NOFLAGS },
+    { SKIN_TOKEN_RTC_MINUTE,            "cM", "", NOFLAGS },
+    { SKIN_TOKEN_RTC_SECOND,            "cS", "", NOFLAGS },
+    { SKIN_TOKEN_RTC_YEAR_2_DIGITS,     "cy", "", NOFLAGS },
+    { SKIN_TOKEN_RTC_YEAR_4_DIGITS,     "cY", "", NOFLAGS },
+    { SKIN_TOKEN_RTC_AM_PM_UPPER,       "cP", "", NOFLAGS },
+    { SKIN_TOKEN_RTC_AM_PM_LOWER,       "cp", "", NOFLAGS },
+    { SKIN_TOKEN_RTC_WEEKDAY_NAME,      "ca", "", NOFLAGS },
+    { SKIN_TOKEN_RTC_MONTH_NAME,        "cb", "", NOFLAGS },
+    { SKIN_TOKEN_RTC_DAY_OF_WEEK_START_MON, "cu", "", NOFLAGS },
+    { SKIN_TOKEN_RTC_DAY_OF_WEEK_START_SUN, "cw", "", NOFLAGS },
         
-    { SKIN_TOKEN_FILE_BITRATE,          "fb", "" },
-    { SKIN_TOKEN_FILE_CODEC,            "fc", "" },
-    { SKIN_TOKEN_FILE_FREQUENCY,        "ff", "" },
-    { SKIN_TOKEN_FILE_FREQUENCY_KHZ,    "fk", "" },
-    { SKIN_TOKEN_FILE_NAME_WITH_EXTENSION,  "fm", "" },
-    { SKIN_TOKEN_FILE_NAME,             "fn", "" },
-    { SKIN_TOKEN_FILE_PATH,             "fp", "" },
-    { SKIN_TOKEN_FILE_SIZE,             "fs", "" },
-    { SKIN_TOKEN_FILE_VBR,              "fv", "" },
-    { SKIN_TOKEN_FILE_DIRECTORY,        "d"  , "I" },
+    { SKIN_TOKEN_FILE_BITRATE,          "fb", "", NOFLAGS },
+    { SKIN_TOKEN_FILE_CODEC,            "fc", "", NOFLAGS },
+    { SKIN_TOKEN_FILE_FREQUENCY,        "ff", "", NOFLAGS },
+    { SKIN_TOKEN_FILE_FREQUENCY_KHZ,    "fk", "", NOFLAGS },
+    { SKIN_TOKEN_FILE_NAME_WITH_EXTENSION,  "fm", "", NOFLAGS },
+    { SKIN_TOKEN_FILE_NAME,             "fn", "", NOFLAGS },
+    { SKIN_TOKEN_FILE_PATH,             "fp", "", NOFLAGS },
+    { SKIN_TOKEN_FILE_SIZE,             "fs", "", NOFLAGS },
+    { SKIN_TOKEN_FILE_VBR,              "fv", "", NOFLAGS },
+    { SKIN_TOKEN_FILE_DIRECTORY,        "d"  , "I", NOFLAGS },
     
-    { SKIN_TOKEN_FILE_BITRATE,          "Fb", "" },
-    { SKIN_TOKEN_FILE_CODEC,            "Fc", "" },
-    { SKIN_TOKEN_FILE_FREQUENCY,        "Ff", "" },
-    { SKIN_TOKEN_FILE_FREQUENCY_KHZ,    "Fk", "" },
-    { SKIN_TOKEN_FILE_NAME_WITH_EXTENSION,  "Fm", "" },
-    { SKIN_TOKEN_FILE_NAME,             "Fn", "" },
-    { SKIN_TOKEN_FILE_PATH,             "Fp", "" },
-    { SKIN_TOKEN_FILE_SIZE,             "Fs", "" },
-    { SKIN_TOKEN_FILE_VBR,              "Fv", "" },
-    { SKIN_TOKEN_FILE_DIRECTORY,        "D"  , "I" },
+    { SKIN_TOKEN_FILE_BITRATE,          "Fb", "", NOFLAGS },
+    { SKIN_TOKEN_FILE_CODEC,            "Fc", "", NOFLAGS },
+    { SKIN_TOKEN_FILE_FREQUENCY,        "Ff", "", NOFLAGS },
+    { SKIN_TOKEN_FILE_FREQUENCY_KHZ,    "Fk", "", NOFLAGS },
+    { SKIN_TOKEN_FILE_NAME_WITH_EXTENSION,  "Fm", "", NOFLAGS },
+    { SKIN_TOKEN_FILE_NAME,             "Fn", "", NOFLAGS },
+    { SKIN_TOKEN_FILE_PATH,             "Fp", "", NOFLAGS },
+    { SKIN_TOKEN_FILE_SIZE,             "Fs", "", NOFLAGS },
+    { SKIN_TOKEN_FILE_VBR,              "Fv", "", NOFLAGS },
+    { SKIN_TOKEN_FILE_DIRECTORY,        "D"  , "I", NOFLAGS },
     
     
-    { SKIN_TOKEN_METADATA_ARTIST,       "ia", "" },
-    { SKIN_TOKEN_METADATA_COMPOSER,     "ic", "" },
-    { SKIN_TOKEN_METADATA_ALBUM,        "id", "" },
-    { SKIN_TOKEN_METADATA_ALBUM_ARTIST, "iA", "" },
-    { SKIN_TOKEN_METADATA_GROUPING,     "iG", "" },
-    { SKIN_TOKEN_METADATA_GENRE,        "ig", "" },
-    { SKIN_TOKEN_METADATA_DISC_NUMBER,  "ik", "" },
-    { SKIN_TOKEN_METADATA_TRACK_NUMBER, "in", "" },
-    { SKIN_TOKEN_METADATA_TRACK_TITLE,  "it", "" },
-    { SKIN_TOKEN_METADATA_VERSION,      "iv", "" },
-    { SKIN_TOKEN_METADATA_YEAR,         "iy", "" },
-    { SKIN_TOKEN_METADATA_COMMENT,      "iC", "" },
+    { SKIN_TOKEN_METADATA_ARTIST,       "ia", "", NOFLAGS },
+    { SKIN_TOKEN_METADATA_COMPOSER,     "ic", "", NOFLAGS },
+    { SKIN_TOKEN_METADATA_ALBUM,        "id", "", NOFLAGS },
+    { SKIN_TOKEN_METADATA_ALBUM_ARTIST, "iA", "", NOFLAGS },
+    { SKIN_TOKEN_METADATA_GROUPING,     "iG", "", NOFLAGS },
+    { SKIN_TOKEN_METADATA_GENRE,        "ig", "", NOFLAGS },
+    { SKIN_TOKEN_METADATA_DISC_NUMBER,  "ik", "", NOFLAGS },
+    { SKIN_TOKEN_METADATA_TRACK_NUMBER, "in", "", NOFLAGS },
+    { SKIN_TOKEN_METADATA_TRACK_TITLE,  "it", "", NOFLAGS },
+    { SKIN_TOKEN_METADATA_VERSION,      "iv", "", NOFLAGS },
+    { SKIN_TOKEN_METADATA_YEAR,         "iy", "", NOFLAGS },
+    { SKIN_TOKEN_METADATA_COMMENT,      "iC", "", NOFLAGS },
     
-    { SKIN_TOKEN_METADATA_ARTIST,       "Ia", "" },
-    { SKIN_TOKEN_METADATA_COMPOSER,     "Ic", "" },
-    { SKIN_TOKEN_METADATA_ALBUM,        "Id", "" },
-    { SKIN_TOKEN_METADATA_ALBUM_ARTIST, "IA", "" },
-    { SKIN_TOKEN_METADATA_GROUPING,     "IG", "" },
-    { SKIN_TOKEN_METADATA_GENRE,        "Ig", "" },
-    { SKIN_TOKEN_METADATA_DISC_NUMBER,  "Ik", "" },
-    { SKIN_TOKEN_METADATA_TRACK_NUMBER, "In", "" },
-    { SKIN_TOKEN_METADATA_TRACK_TITLE,  "It", "" },
-    { SKIN_TOKEN_METADATA_VERSION,      "Iv", "" },
-    { SKIN_TOKEN_METADATA_YEAR,         "Iy", "" },
-    { SKIN_TOKEN_METADATA_COMMENT,      "IC", "" },
+    { SKIN_TOKEN_METADATA_ARTIST,       "Ia", "", NOFLAGS },
+    { SKIN_TOKEN_METADATA_COMPOSER,     "Ic", "", NOFLAGS },
+    { SKIN_TOKEN_METADATA_ALBUM,        "Id", "", NOFLAGS },
+    { SKIN_TOKEN_METADATA_ALBUM_ARTIST, "IA", "", NOFLAGS },
+    { SKIN_TOKEN_METADATA_GROUPING,     "IG", "", NOFLAGS },
+    { SKIN_TOKEN_METADATA_GENRE,        "Ig", "", NOFLAGS },
+    { SKIN_TOKEN_METADATA_DISC_NUMBER,  "Ik", "", NOFLAGS },
+    { SKIN_TOKEN_METADATA_TRACK_NUMBER, "In", "", NOFLAGS },
+    { SKIN_TOKEN_METADATA_TRACK_TITLE,  "It", "", NOFLAGS },
+    { SKIN_TOKEN_METADATA_VERSION,      "Iv", "", NOFLAGS },
+    { SKIN_TOKEN_METADATA_YEAR,         "Iy", "", NOFLAGS },
+    { SKIN_TOKEN_METADATA_COMMENT,      "IC", "", NOFLAGS },
     
-    { SKIN_TOKEN_SOUND_PITCH,           "Sp", "" },
-    { SKIN_TOKEN_SOUND_SPEED,           "Ss", "" },
+    { SKIN_TOKEN_SOUND_PITCH,           "Sp", "", NOFLAGS },
+    { SKIN_TOKEN_SOUND_SPEED,           "Ss", "", NOFLAGS },
     
-    { SKIN_TOKEN_VLED_HDD,              "lh", "" },
+    { SKIN_TOKEN_VLED_HDD,              "lh", "", NOFLAGS },
     
-    { SKIN_TOKEN_MAIN_HOLD,             "mh", "" },
-    { SKIN_TOKEN_REMOTE_HOLD,           "mr", "" },
-    { SKIN_TOKEN_REPEAT_MODE,           "mm", "" },
-    { SKIN_TOKEN_PLAYBACK_STATUS,       "mp", "" },
-    { SKIN_TOKEN_BUTTON_VOLUME,         "mv", "|S" },
+    { SKIN_TOKEN_MAIN_HOLD,             "mh", "", NOFLAGS },
+    { SKIN_TOKEN_REMOTE_HOLD,           "mr", "", NOFLAGS },
+    { SKIN_TOKEN_REPEAT_MODE,           "mm", "", NOFLAGS },
+    { SKIN_TOKEN_PLAYBACK_STATUS,       "mp", "", NOFLAGS },
+    { SKIN_TOKEN_BUTTON_VOLUME,         "mv", "|S", NOFLAGS },
     
-    { SKIN_TOKEN_PEAKMETER,             "pm", "" },
-    { SKIN_TOKEN_PLAYER_PROGRESSBAR,    "pf", "" },
-    { SKIN_TOKEN_PROGRESSBAR,           "pb" , "*|iiiis" },
-    { SKIN_TOKEN_VOLUME,                "pv" , BAR_PARAMS },
+    { SKIN_TOKEN_PEAKMETER,             "pm", "", NOFLAGS },
+    { SKIN_TOKEN_PLAYER_PROGRESSBAR,    "pf", "", NOFLAGS },
+    { SKIN_TOKEN_PROGRESSBAR,           "pb" , "*|iiiis", NOFLAGS },
+    { SKIN_TOKEN_VOLUME,                "pv" , BAR_PARAMS, NOFLAGS },
     
-    { SKIN_TOKEN_TRACK_ELAPSED_PERCENT, "px", "" },
-    { SKIN_TOKEN_TRACK_TIME_ELAPSED,    "pc", "" },
-    { SKIN_TOKEN_TRACK_TIME_REMAINING,  "pr", "" },
-    { SKIN_TOKEN_TRACK_LENGTH,          "pt", "" },
-    { SKIN_TOKEN_TRACK_STARTING,        "pS" , "|S"},
-    { SKIN_TOKEN_TRACK_ENDING,          "pE" , "|S"},
-    { SKIN_TOKEN_PLAYLIST_POSITION,     "pp", "" },
-    { SKIN_TOKEN_PLAYLIST_ENTRIES,      "pe", "" },
-    { SKIN_TOKEN_PLAYLIST_NAME,         "pn", "" },
-    { SKIN_TOKEN_PLAYLIST_SHUFFLE,      "ps", "" },
+    { SKIN_TOKEN_TRACK_ELAPSED_PERCENT, "px", "", NOFLAGS },
+    { SKIN_TOKEN_TRACK_TIME_ELAPSED,    "pc", "", NOFLAGS },
+    { SKIN_TOKEN_TRACK_TIME_REMAINING,  "pr", "", NOFLAGS },
+    { SKIN_TOKEN_TRACK_LENGTH,          "pt", "", NOFLAGS },
+    { SKIN_TOKEN_TRACK_STARTING,        "pS" , "|S", NOFLAGS },
+    { SKIN_TOKEN_TRACK_ENDING,          "pE" , "|S", NOFLAGS },
+    { SKIN_TOKEN_PLAYLIST_POSITION,     "pp", "", NOFLAGS },
+    { SKIN_TOKEN_PLAYLIST_ENTRIES,      "pe", "", NOFLAGS },
+    { SKIN_TOKEN_PLAYLIST_NAME,         "pn", "", NOFLAGS },
+    { SKIN_TOKEN_PLAYLIST_SHUFFLE,      "ps", "", NOFLAGS },
     
-    { SKIN_TOKEN_DATABASE_PLAYCOUNT,    "rp", "" },
-    { SKIN_TOKEN_DATABASE_RATING,       "rr", "" },
-    { SKIN_TOKEN_DATABASE_AUTOSCORE,    "ra", "" },
+    { SKIN_TOKEN_DATABASE_PLAYCOUNT,    "rp", "", NOFLAGS },
+    { SKIN_TOKEN_DATABASE_RATING,       "rr", "", NOFLAGS },
+    { SKIN_TOKEN_DATABASE_AUTOSCORE,    "ra", "", NOFLAGS },
     
-    { SKIN_TOKEN_REPLAYGAIN,            "rg", "" },
-    { SKIN_TOKEN_CROSSFADE,             "xf", "" },
+    { SKIN_TOKEN_REPLAYGAIN,            "rg", "", NOFLAGS },
+    { SKIN_TOKEN_CROSSFADE,             "xf", "", NOFLAGS },
     
-    { SKIN_TOKEN_HAVE_TUNER,            "tp", "" },
-    { SKIN_TOKEN_TUNER_TUNED,           "tt", "" },
-    { SKIN_TOKEN_TUNER_SCANMODE,        "tm", "" },
-    { SKIN_TOKEN_TUNER_STEREO,          "ts", "" },
-    { SKIN_TOKEN_TUNER_MINFREQ,         "ta", "" },
-    { SKIN_TOKEN_TUNER_MAXFREQ,         "tb", "" },
-    { SKIN_TOKEN_TUNER_CURFREQ,         "tf", "" },
-    { SKIN_TOKEN_PRESET_ID,             "Ti", "" },
-    { SKIN_TOKEN_PRESET_NAME,           "Tn", "" },
-    { SKIN_TOKEN_PRESET_FREQ,           "Tf", "" },
-    { SKIN_TOKEN_PRESET_COUNT,          "Tc", "" },
-    { SKIN_TOKEN_HAVE_RDS,              "tx", "" },
-    { SKIN_TOKEN_RDS_NAME,              "ty", "" },
-    { SKIN_TOKEN_RDS_TEXT,              "tz", "" },
+    { SKIN_TOKEN_HAVE_TUNER,            "tp", "", NOFLAGS },
+    { SKIN_TOKEN_TUNER_TUNED,           "tt", "", NOFLAGS },
+    { SKIN_TOKEN_TUNER_SCANMODE,        "tm", "", NOFLAGS },
+    { SKIN_TOKEN_TUNER_STEREO,          "ts", "", NOFLAGS },
+    { SKIN_TOKEN_TUNER_MINFREQ,         "ta", "", NOFLAGS },
+    { SKIN_TOKEN_TUNER_MAXFREQ,         "tb", "", NOFLAGS },
+    { SKIN_TOKEN_TUNER_CURFREQ,         "tf", "", NOFLAGS },
+    { SKIN_TOKEN_PRESET_ID,             "Ti", "", NOFLAGS },
+    { SKIN_TOKEN_PRESET_NAME,           "Tn", "", NOFLAGS },
+    { SKIN_TOKEN_PRESET_FREQ,           "Tf", "", NOFLAGS },
+    { SKIN_TOKEN_PRESET_COUNT,          "Tc", "", NOFLAGS },
+    { SKIN_TOKEN_HAVE_RDS,              "tx", "", NOFLAGS },
+    { SKIN_TOKEN_RDS_NAME,              "ty", "", NOFLAGS },
+    { SKIN_TOKEN_RDS_TEXT,              "tz", "", NOFLAGS },
     
-    { SKIN_TOKEN_SUBLINE_SCROLL,        "s", "" },
-    { SKIN_TOKEN_SUBLINE_TIMEOUT,       "t"  , "S" },
+    { SKIN_TOKEN_SUBLINE_SCROLL,        "s", "", NOFLAGS },
+    { SKIN_TOKEN_SUBLINE_TIMEOUT,       "t"  , "S", NOFLAGS },
     
-    { SKIN_TOKEN_ENABLE_THEME,          "we", "\n" },
-    { SKIN_TOKEN_DISABLE_THEME,         "wd", "\n" },
-    { SKIN_TOKEN_DRAW_INBUILTBAR,       "wi", "\n" },
+    { SKIN_TOKEN_ENABLE_THEME,          "we", "", NOBREAK },
+    { SKIN_TOKEN_DISABLE_THEME,         "wd", "", NOBREAK },
+    { SKIN_TOKEN_DRAW_INBUILTBAR,       "wi", "", NOBREAK },
     
-    { SKIN_TOKEN_IMAGE_PRELOAD,         "xl", "SFII|I\n" },
-    { SKIN_TOKEN_IMAGE_PRELOAD_DISPLAY, "xd", "S" },
-    { SKIN_TOKEN_IMAGE_PRELOAD,         "x", "SFII\n" },
+    { SKIN_TOKEN_IMAGE_PRELOAD,         "xl", "SFII|I", NOBREAK },
+    { SKIN_TOKEN_IMAGE_PRELOAD_DISPLAY, "xd", "S", NOFLAGS },
+    { SKIN_TOKEN_IMAGE_PRELOAD,         "x", "SFII", NOBREAK },
     
-    { SKIN_TOKEN_LOAD_FONT,             "Fl" , "IF\n"},
-    { SKIN_TOKEN_ALBUMART_LOAD,         "Cl" , "IIII|ss\n"},
-    { SKIN_TOKEN_ALBUMART_DISPLAY,      "Cd" , ""},
-    { SKIN_TOKEN_ALBUMART_FOUND,        "C" , ""},
+    { SKIN_TOKEN_LOAD_FONT,             "Fl" , "IF", NOBREAK },
+    { SKIN_TOKEN_ALBUMART_LOAD,         "Cl" , "IIII|ss", NOBREAK },
+    { SKIN_TOKEN_ALBUMART_DISPLAY,      "Cd" , "", NOFLAGS },
+    { SKIN_TOKEN_ALBUMART_FOUND,        "C" , "", NOFLAGS },
     
-    { SKIN_TOKEN_VIEWPORT_ENABLE,       "Vd" , "S"},
-    { SKIN_TOKEN_UIVIEWPORT_ENABLE,     "VI" , "S"},
+    { SKIN_TOKEN_VIEWPORT_ENABLE,       "Vd" , "S", NOFLAGS },
+    { SKIN_TOKEN_UIVIEWPORT_ENABLE,     "VI" , "S", NOFLAGS },
     
-    { SKIN_TOKEN_VIEWPORT_CUSTOMLIST,   "Vp" , "ICC\n"},
-    { SKIN_TOKEN_LIST_TITLE_TEXT,       "Lt" , ""},
-    { SKIN_TOKEN_LIST_TITLE_ICON,       "Li" , ""},
+    { SKIN_TOKEN_VIEWPORT_CUSTOMLIST,   "Vp" , "ICC", NOBREAK },
+    { SKIN_TOKEN_LIST_TITLE_TEXT,       "Lt" , "", NOFLAGS },
+    { SKIN_TOKEN_LIST_TITLE_ICON,       "Li" , "", NOFLAGS },
     
-    { SKIN_TOKEN_VIEWPORT_FGCOLOUR,       "Vf" , "S"},
-    { SKIN_TOKEN_VIEWPORT_BGCOLOUR,       "Vb" , "S"},
+    { SKIN_TOKEN_VIEWPORT_FGCOLOUR,       "Vf" , "S", NOBREAK },
+    { SKIN_TOKEN_VIEWPORT_BGCOLOUR,       "Vb" , "S", NOBREAK },
     
-    { SKIN_TOKEN_VIEWPORT_CONDITIONAL,  "Vl" , "SIIiii"},
-    { SKIN_TOKEN_UIVIEWPORT_LOAD,       "Vi" , "sIIiii"},
-    { SKIN_TOKEN_VIEWPORT_LOAD,         "V"  , "IIiii"},
+    { SKIN_TOKEN_VIEWPORT_CONDITIONAL,  "Vl" , "SIIiii", NOFLAGS },
+    { SKIN_TOKEN_UIVIEWPORT_LOAD,       "Vi" , "sIIiii", NOFLAGS },
+    { SKIN_TOKEN_VIEWPORT_LOAD,         "V"  , "IIiii", NOFLAGS },
     
-    { SKIN_TOKEN_IMAGE_BACKDROP,        "X"  , "f\n"},
+    { SKIN_TOKEN_IMAGE_BACKDROP,        "X"  , "f", NOBREAK },
     
-    { SKIN_TOKEN_SETTING,               "St" , "S"},
-    { SKIN_TOKEN_TRANSLATEDSTRING,      "Sx" , "S"},
-    { SKIN_TOKEN_LANG_IS_RTL,           "Sr" , ""},
+    { SKIN_TOKEN_SETTING,               "St" , "S", NOFLAGS },
+    { SKIN_TOKEN_TRANSLATEDSTRING,      "Sx" , "S", NOFLAGS },
+    { SKIN_TOKEN_LANG_IS_RTL,           "Sr" , "", NOFLAGS },
     
-    { SKIN_TOKEN_LASTTOUCH,             "Tl" , "|S"},
-    { SKIN_TOKEN_CURRENT_SCREEN,        "cs", "" },
-    { SKIN_TOKEN_TOUCHREGION,           "T"  , "IIiiS\n"},
+    { SKIN_TOKEN_LASTTOUCH,             "Tl" , "|S", NOFLAGS },
+    { SKIN_TOKEN_CURRENT_SCREEN,        "cs", "", NOFLAGS },
+    { SKIN_TOKEN_TOUCHREGION,           "T"  , "IIiiS", NOBREAK },
     
-    { SKIN_TOKEN_HAVE_RECORDING,        "Rp"   , ""},
-    { SKIN_TOKEN_IS_RECORDING,          "Rr"   , ""},
-    { SKIN_TOKEN_REC_FREQ,              "Rf"   , ""},
-    { SKIN_TOKEN_REC_ENCODER,           "Re"   , ""},
-    { SKIN_TOKEN_REC_BITRATE,           "Rb"   , ""},
-    { SKIN_TOKEN_REC_MONO,              "Rm"   , ""},
-    { SKIN_TOKEN_REC_SECONDS,           "Rs"   , ""},
-    { SKIN_TOKEN_REC_MINUTES,           "Rn"   , ""},
-    { SKIN_TOKEN_REC_HOURS,             "Rh"   , ""},
+    { SKIN_TOKEN_HAVE_RECORDING,        "Rp"   , "", NOFLAGS },
+    { SKIN_TOKEN_IS_RECORDING,          "Rr"   , "", NOFLAGS },
+    { SKIN_TOKEN_REC_FREQ,              "Rf"   , "", NOFLAGS },
+    { SKIN_TOKEN_REC_ENCODER,           "Re"   , "", NOFLAGS },
+    { SKIN_TOKEN_REC_BITRATE,           "Rb"   , "", NOFLAGS },
+    { SKIN_TOKEN_REC_MONO,              "Rm"   , "", NOFLAGS },
+    { SKIN_TOKEN_REC_SECONDS,           "Rs"   , "", NOFLAGS },
+    { SKIN_TOKEN_REC_MINUTES,           "Rn"   , "", NOFLAGS },
+    { SKIN_TOKEN_REC_HOURS,             "Rh"   , "", NOFLAGS },
     
-    { SKIN_TOKEN_UNKNOWN,                ""   , ""}
+    { SKIN_TOKEN_UNKNOWN,                ""   , "", NOFLAGS }
     /* Keep this here to mark the end of the table */
 };
 
Index: lib/skin_parser/tag_table.h
===================================================================
--- lib/skin_parser/tag_table.h	(revision 27267)
+++ lib/skin_parser/tag_table.h	(working copy)
@@ -27,7 +27,11 @@
 {
 #endif
 
+#define NOFLAGS 0
+    /* Flag to tell the renderer not to insert a line break */
+#define NOBREAK 0x1
 
+
 enum skin_token_type {
     
     SKIN_TOKEN_UNKNOWN,
@@ -271,7 +275,7 @@
     enum skin_token_type type;
     char* name;
     char* params;
-
+    int flags;
 };
 
 /*