diff --git a/skin-schema.json b/skin-schema.json
index fc0330b..14fb92f 100644
--- a/skin-schema.json
+++ b/skin-schema.json
@@ -535,7 +535,7 @@
     "skipControls": {
       "description": "Toolbar which contains buttons that allow skipping back or forward and switching to the previous or next videos.",
       "type": "object",
-      "required": [ "enabled", "skipBackwardTime", "skipForwardTime", "buttons" ],
+      "required": [ "enabled", "skipBackwardTime", "skipForwardTime", "buttons", "controlBarButtons" ],
       "properties": {
         "enabled": {
           "description": "Show the \"Skip Controls\" toolbar if set to true, hide if set to false.",
@@ -574,6 +574,32 @@
               "$ref": "#/definitions/skipControlsButton"
             }
           }
+        },
+        "controlBarButtons": {
+          "description": "The collection of skip controls buttons that can be displayed in the control bar.",
+          "type": "object",
+          "properties": {
+            "previousVideo": {
+              "description": "Button that allows switching to the last video that was played or to the previous video in a playlist.",
+              "$ref": "#/definitions/skipControlsButton"
+            },
+            "skipBackward": {
+              "description": "Button that allows skipping the video backward the amount of seconds defined in \"skipBackwardTime\".",
+              "$ref": "#/definitions/skipControlsButton"
+            },
+            "skipForward": {
+              "description": "Button that allows skipping the video forward the amount of seconds defined in \"skipForwardTime\".",
+              "$ref": "#/definitions/skipControlsButton"
+            },
+            "nextVideo": {
+              "description": "Button that allows switching to the next video recommendation or to the next video in a playlist.",
+              "$ref": "#/definitions/skipControlsButton"
+            },
+            "playPause": {
+              "description": "Button that allows playback or pausing of the video.",
+              "$ref": "#/definitions/skipControlsButton"
+            }
+          }
         }
       }
     },
@@ -805,6 +831,11 @@
           "description": "Set the default audio language. This is a string of the form \"en\" for English, \"fr\" for French, etc.",
           "type": "string",
           "default": "en"
+        },
+        "audioOnly": {
+          "description": "Set to true to enable the audio only player",
+          "type": "boolean",
+          "default": "false"
         }
       }
     },
@@ -826,12 +857,13 @@
       "description": "Defines the buttons that can appear on the controlBar and/or the moreOptions panel. Desktop and Mobile platforms can be configured individually.",
       "type": "object",
       "additionalProperties": false,
-      "required": ["desktopContent", "mobileContent"],
+      "required": ["desktopContent", "mobileContent", "audioOnly"],
       "properties": {
         "desktopContent": { "$ref": "#/definitions/buttonArray" },
         "desktopAd": { "$ref": "#/definitions/buttonArray" },
         "mobileContent": { "$ref": "#/definitions/buttonArray" },
-        "mobileAd": { "$ref": "#/definitions/buttonArray" }
+        "mobileAd": { "$ref": "#/definitions/buttonArray" },
+        "audioOnly": { "$ref": "#/definitions/buttonArray" }
       }
     },
     "icons": {
diff --git a/skin.json b/skin.json
index 382ba80..5c7f6f6 100644
--- a/skin.json
+++ b/skin.json
@@ -64,7 +64,7 @@
   },
   "responsive": {
     "breakpoints": {
-      "audioOnly": {"id": "audioOnly", "name": "oo-xsmall", "multiplier": 0.7},
+      "audio-only-xs": {"id": "audio-only-xs", "name": "oo-xsmall", "multiplier": 0.7},
       "xs": {"id": "xs", "name": "oo-xsmall", "maxWidth": 559, "multiplier": 0.7},
       "sm": {"id": "sm", "name": "oo-small", "minWidth": 560, "maxWidth": 839, "multiplier": 1},
       "md": {"id": "md", "name": "oo-medium", "minWidth": 840, "maxWidth": 1279, "multiplier": 1},
@@ -201,7 +201,7 @@
         "index": 4
       }
     },
-    "buttonsWithPlayPause": {
+    "controlBarButtons": {
       "previousVideo": {
         "enabled": true,
         "index": 1
@@ -278,7 +278,7 @@
   },
   "audio": {
     "audioLanguage": "none",
-    "audioOnly": false
+    "audioOnly": true
   },
   "animationDurations": {
     "vrNotification": 5,