diff --git a/components/raop/raop_sink.c b/components/raop/raop_sink.c
index ea3f02f0..f5dec762 100644
--- a/components/raop/raop_sink.c
+++ b/components/raop/raop_sink.c
@@ -90,7 +90,7 @@ const static actrls_t controls = {
 	NULL, NULL,							// rew, fwd
 	raop_prev, raop_next,				// prev, next
 	NULL, NULL, NULL, NULL, // left, right, up, down
-	NULL, NULL, NULL, NULL, NULL, NULL, // pre1-6
+	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // pre1-10
 	raop_volume_down, raop_volume_up, raop_toggle// knob left, knob_right, knob push
 };
 
diff --git a/components/services/audio_controls.c b/components/services/audio_controls.c
index b8314955..bd338ba5 100644
--- a/components/services/audio_controls.c
+++ b/components/services/audio_controls.c
@@ -60,7 +60,7 @@ static const actrls_config_map_t actrls_config_map[] =
 static const char * actrls_action_s[ ] = { EP(ACTRLS_POWER),EP(ACTRLS_VOLUP),EP(ACTRLS_VOLDOWN),EP(ACTRLS_TOGGLE),EP(ACTRLS_PLAY),
 									EP(ACTRLS_PAUSE),EP(ACTRLS_STOP),EP(ACTRLS_REW),EP(ACTRLS_FWD),EP(ACTRLS_PREV),EP(ACTRLS_NEXT),
 									EP(BCTRLS_UP),EP(BCTRLS_DOWN),EP(BCTRLS_LEFT),EP(BCTRLS_RIGHT), 
-									EP(BCTRLS_PS1),EP(BCTRLS_PS2),EP(BCTRLS_PS3),EP(BCTRLS_PS4),EP(BCTRLS_PS5),EP(BCTRLS_PS6),EP(BCTRLS_PS7),EP(BCTRLS_PS8),EP(BCTRLS_PS9),EP(BCTRLS_PS10),
+									EP(BCTRLS_PS0),EP(BCTRLS_PS1),EP(BCTRLS_PS2),EP(BCTRLS_PS3),EP(BCTRLS_PS4),EP(BCTRLS_PS5),EP(BCTRLS_PS6),EP(BCTRLS_PS7),EP(BCTRLS_PS8),EP(BCTRLS_PS9),
 									EP(KNOB_LEFT),EP(KNOB_RIGHT),EP(KNOB_PUSH),
 									""} ;
 									
diff --git a/components/services/audio_controls.h b/components/services/audio_controls.h
index 02fac910..fd45784e 100644
--- a/components/services/audio_controls.h
+++ b/components/services/audio_controls.h
@@ -14,7 +14,7 @@
 typedef enum { 	ACTRLS_NONE = -1, ACTRLS_POWER,ACTRLS_VOLUP, ACTRLS_VOLDOWN, ACTRLS_TOGGLE, ACTRLS_PLAY, 
 				ACTRLS_PAUSE, ACTRLS_STOP, ACTRLS_REW, ACTRLS_FWD, ACTRLS_PREV, ACTRLS_NEXT, 
 				BCTRLS_UP, BCTRLS_DOWN, BCTRLS_LEFT, BCTRLS_RIGHT, 
-				BCTRLS_PS1,BCTRLS_PS2,BCTRLS_PS3,BCTRLS_PS4,BCTRLS_PS5,BCTRLS_PS6,BCTRLS_PS7,BCTRLS_PS8,BCTRLS_PS9,BCTRLS_PS10,
+				BCTRLS_PS0,BCTRLS_PS1,BCTRLS_PS2,BCTRLS_PS3,BCTRLS_PS4,BCTRLS_PS5,BCTRLS_PS6,BCTRLS_PS7,BCTRLS_PS8,BCTRLS_PS9,
 				KNOB_LEFT, KNOB_RIGHT, KNOB_PUSH,
 				ACTRLS_REMAP, ACTRLS_MAX 
 		} actrls_action_e;
diff --git a/components/spotify/cspot_sink.c b/components/spotify/cspot_sink.c
index e1fd20c4..64d112a5 100644
--- a/components/spotify/cspot_sink.c
+++ b/components/spotify/cspot_sink.c
@@ -85,7 +85,7 @@ const static actrls_t controls = {
 	NULL, NULL,							// rew, fwd
 	cspot_prev, cspot_next,				// prev, next
 	NULL, NULL, NULL, NULL, // left, right, up, down
-	NULL, NULL, NULL, NULL, NULL, NULL, // pre1-6
+	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // pre1-10
 	cspot_volume_down, cspot_volume_up, cspot_toggle// knob left, knob_right, knob push
 };
 
diff --git a/components/squeezelite/controls.c b/components/squeezelite/controls.c
index 7bd2ecfd..048eca83 100644
--- a/components/squeezelite/controls.c
+++ b/components/squeezelite/controls.c
@@ -21,7 +21,7 @@ static log_level loglevel = lINFO;
 enum { 	BUTN_POWER_FRONT = 0X0A, BUTN_ARROW_UP, BUTN_ARROW_DOWN, BUTN_ARROW_LEFT, BUTN_KNOB_PUSH, BUTN_SEARCH,
 		BUTN_REW, BUTN_FWD, BUTN_PLAY, BUTN_ADD, BUTN_BRIGHTNESS, BUTN_NOW_PLAYING,
 		BUTN_PAUSE = 0X17, BUTN_BROWSE, BUTN_VOLUP_FRONT, BUTN_VOLDOWN_FRONT, BUTN_SIZE, BUTN_VISUAL, BUTN_VOLUMEMODE,
-		BUTN_PRESET_1 = 0X23, BUTN_PRESET_2, BUTN_PRESET_3, BUTN_PRESET_4, BUTN_PRESET_5, BUTN_PRESET_6, BUTN_PRESET_7, BUTN_PRESET_8, BUTN_PRESET_9, BUTN_PRESET_10,
+		BUTN_PRESET_0 = 0x22, BUTN_PRESET_1, BUTN_PRESET_2, BUTN_PRESET_3, BUTN_PRESET_4, BUTN_PRESET_5, BUTN_PRESET_6, BUTN_PRESET_7, BUTN_PRESET_8, BUTN_PRESET_9, 
         BUTN_SNOOZE,
 		BUTN_KNOB_LEFT = 0X5A, BUTN_KNOB_RIGHT };
 
@@ -143,6 +143,7 @@ LMS_CALLBACK(down, ARROW_DOWN, arrow_down)
 LMS_CALLBACK(left, ARROW_LEFT, arrow_left)
 LMS_CALLBACK(right, ARROW_RIGHT, arrow_right)
 
+LMS_CALLBACK(pre0, PRESET_0, preset_0.single)
 LMS_CALLBACK(pre1, PRESET_1, preset_1.single)
 LMS_CALLBACK(pre2, PRESET_2, preset_2.single)
 LMS_CALLBACK(pre3, PRESET_3, preset_3.single)
@@ -152,7 +153,6 @@ LMS_CALLBACK(pre6, PRESET_6, preset_6.single)
 LMS_CALLBACK(pre7, PRESET_7, preset_7.single)
 LMS_CALLBACK(pre8, PRESET_8, preset_8.single)
 LMS_CALLBACK(pre9, PRESET_9, preset_9.single)
-LMS_CALLBACK(pre10, PRESET_10, preset_10.single)
 
 LMS_CALLBACK(knob_left, KNOB_LEFT, knob_left)
 LMS_CALLBACK(knob_right, KNOB_RIGHT, knob_right)
@@ -167,7 +167,7 @@ const actrls_t LMS_controls = {
 	lms_prev, lms_next,		// prev, next
 	lms_up, lms_down,
 	lms_left, lms_right, 
-	lms_pre1, lms_pre2, lms_pre3, lms_pre4, lms_pre5, lms_pre6, lms_pre7, lms_pre8, lms_pre9, lms_pre10,
+	lms_pre0, lms_pre1, lms_pre2, lms_pre3, lms_pre4, lms_pre5, lms_pre6, lms_pre7, lms_pre8, lms_pre9, 
 	lms_knob_left, lms_knob_right, lms_knob_push,
 };
 
diff --git a/components/squeezelite/opus.c b/components/squeezelite/opus.c
index e89e5af6..460c8479 100644
--- a/components/squeezelite/opus.c
+++ b/components/squeezelite/opus.c
@@ -44,7 +44,7 @@
 #define MAX_OPUS_FRAMES 5760
 
 struct opus {
-	enum {OGG_SYNC, OGG_HEADER, OGG_PCM, OGG_DECODE} status;
+	enum {OGG_SYNC, OGG_ID_HEADER, OGG_COMMENT_HEADER} status;
 	ogg_stream_state state;
 	ogg_packet packet;
 	ogg_sync_state sync;
@@ -186,18 +186,18 @@ static int read_opus_header(void) {
 		//bytes = min(bytes, size);
 		switch (u->status) {
 		case OGG_SYNC:
-			u->status = OGG_HEADER;
+			u->status = OGG_ID_HEADER;
 			OG(&gu, stream_reset_serialno, &u->state, OG(&gu, page_serialno, &u->page));
 			break;
-		case OGG_HEADER:
+		case OGG_ID_HEADER:
 			status = OG(&gu, stream_pagein, &u->state, &u->page);
 			if (OG(&gu, stream_packetout, &u->state, &u->packet)) {
-				u->status = OGG_PCM;
 				if (u->packet.bytes < 19 || memcmp(u->packet.packet, "OpusHead", 8)) {
 					LOG_ERROR("wrong opus header packet (size:%u)", u->packet.bytes);
 					status = -100;
 					break;
 				}
+				u->status = OGG_COMMENT_HEADER;                
 				u->channels = u->packet.packet[9];
 				u->pre_skip = parse_uint16(u->packet.packet + 10);
 				u->rate = parse_uint32(u->packet.packet + 12);
@@ -209,7 +209,7 @@ static int read_opus_header(void) {
 			}
 			u->fetch = true;
 			break;
-		case OGG_PCM:
+		case OGG_COMMENT_HEADER:
 			// loop until we have consumed VorbisComment and get ready for a new packet
 			u->fetch = true;
 			status = OG(&gu, page_packets, &u->page);