Index: apps/gui/gwps-common.c
===================================================================
--- apps/gui/gwps-common.c	(revision 19218)
+++ apps/gui/gwps-common.c	(working copy)
@@ -1359,8 +1359,44 @@
             }
             return buf;
         }
-#endif  /* (CONFIG_CODEC == SWCODEC) */
 
+        case WPS_TOKEN_CROSSFEED:	/* New Token */
+        {
+			int val = global_settings.crossfeed ? 1 : 0;
+            if (intval)
+                *intval = val + 1;
+            snprintf(buf, buf_size, "%d", val);
+            return buf;
+		}
+
+        case WPS_TOKEN_EQUALISER:	/* New Token */
+        {
+			int val = global_settings.eq_enabled ? 1 : 0;
+            if (intval)
+                *intval = val + 1;
+            snprintf(buf, buf_size, "%d", val);
+            return buf;
+		}
+
+		case WPS_TOKEN_DITHERING:	/* New Token */
+		{
+			int val = global_settings.dithering_enabled ? 1 : 0;
+            if (intval)
+                *intval = val + 1;
+            snprintf(buf, buf_size, "%d", val);
+            return buf;
+		}
+ #endif  /* (CONFIG_CODEC == SWCODEC) */
+
+		case WPS_TOKEN_FADEONSTOP:	/* New Token */
+		{
+			int val = global_settings.fade_on_stop ? 1 : 0;
+            if (intval)
+                *intval = val + 1;
+            snprintf(buf, buf_size, "%d", val);
+            return buf;
+		}
+
 #if (CONFIG_CODEC != MAS3507D)
         case WPS_TOKEN_SOUND_PITCH:
         {
Index: apps/gui/wps_debug.c
===================================================================
--- apps/gui/wps_debug.c	(revision 19218)
+++ apps/gui/wps_debug.c	(working copy)
@@ -209,8 +209,24 @@
         case WPS_TOKEN_REPLAYGAIN:
             snprintf(buf, bufsize, "replaygain");
             break;
+
+        case WPS_TOKEN_CROSSFEED:
+            snprintf(buf, bufsize, "crossfeed");	/* New Token */
+			break;
+
+        case WPS_TOKEN_EQUALISER:
+            snprintf(buf, bufsize, "equaliser");	/* New Token */
+			break;
+
+        case WPS_TOKEN_DITHERING:
+            snprintf(buf, bufsize, "dithering");	/* New Token */
+			break;
 #endif
 
+		case WPS_TOKEN_FADEONSTOP:
+            snprintf(buf, bufsize, "fadeonstop");	/* New Token */
+			break;
+
 #ifdef HAVE_ALBUMART
         case WPS_TOKEN_ALBUMART_DISPLAY:
             snprintf(buf, bufsize, "album art display");
Index: apps/gui/gwps.h
===================================================================
--- apps/gui/gwps.h	(revision 19218)
+++ apps/gui/gwps.h	(working copy)
@@ -163,7 +163,11 @@
 #if (CONFIG_CODEC == SWCODEC)
     WPS_TOKEN_REPLAYGAIN,
     WPS_TOKEN_CROSSFADE,
+	WPS_TOKEN_CROSSFEED,	/* New Token */
+	WPS_TOKEN_EQUALISER,	/* New Token */
+	WPS_TOKEN_DITHERING,	/* New Token */
 #endif
+	WPS_TOKEN_FADEONSTOP,	/* New Token */
 
     /* Time */
 
Index: apps/gui/wps_parser.c
===================================================================
--- apps/gui/wps_parser.c	(revision 19218)
+++ apps/gui/wps_parser.c	(working copy)
@@ -312,8 +312,12 @@
 #if CONFIG_CODEC == SWCODEC
     { WPS_TOKEN_REPLAYGAIN,               "rg",  WPS_REFRESH_STATIC,  NULL },
     { WPS_TOKEN_CROSSFADE,                "xf",  WPS_REFRESH_DYNAMIC, NULL },
+    { WPS_TOKEN_CROSSFEED,                "af",  WPS_REFRESH_DYNAMIC, NULL },	/* New token */
+    { WPS_TOKEN_EQUALISER,                "eq",  WPS_REFRESH_DYNAMIC, NULL },	/* New token */
+    { WPS_TOKEN_DITHERING,                "ad",  WPS_REFRESH_DYNAMIC, NULL },	/* New token */
 #endif
 
+    { WPS_TOKEN_FADEONSTOP,               "as",  WPS_REFRESH_DYNAMIC, NULL },	/* New token */
     { WPS_NO_TOKEN,                       "s",   WPS_REFRESH_SCROLL,  NULL },
     { WPS_TOKEN_SUBLINE_TIMEOUT,          "t",   0,  parse_timeout },