diff --git a/libraries/joomla/document/renderer/html/head.php b/libraries/joomla/document/renderer/html/head.php
index 5a20cd3bd9b2f..7be362e83588b 100644
--- a/libraries/joomla/document/renderer/html/head.php
+++ b/libraries/joomla/document/renderer/html/head.php
@@ -194,7 +194,7 @@ public function fetchHead($document)
 
 		if (!empty($scriptOptions))
 		{
-			$buffer .= $tab . '<script type="application/json" id="joomla-script-options">';
+			$buffer .= $tab . '<script type="application/json" class="joomla-script-options new">';
 
 			$prettyPrint = (JDEBUG && defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : false);
 			$jsonOptions = json_encode($scriptOptions, $prettyPrint);
diff --git a/media/system/js/core-uncompressed.js b/media/system/js/core-uncompressed.js
index 8a6c5b858ac28..b2fdaa5c9caa8 100644
--- a/media/system/js/core-uncompressed.js
+++ b/media/system/js/core-uncompressed.js
@@ -109,7 +109,7 @@ Joomla.editors.instances = Joomla.editors.instances || {};
 	Joomla.loadOptions = function( options ) {
 		// Load form the script container
 		if (!options) {
-			var elements = document.getElementsByClassName('joomla-script-options-new'),
+			var elements = document.querySelectorAll('.joomla-script-options.new'),
 				str, element, option;
 
 			for (var i = 0, l = elements.length; i < l; i++) {
@@ -119,7 +119,7 @@ Joomla.editors.instances = Joomla.editors.instances || {};
 
 				option ? Joomla.loadOptions(option) : null;
 
-				element.className = 'joomla-script-options-loaded';
+				element.className = element.className.replace(' new', ' loaded');
 			}
 
 			return;
diff --git a/media/system/js/core.js b/media/system/js/core.js
index f67fd8f5dc7ee..58712a54faa94 100644
--- a/media/system/js/core.js
+++ b/media/system/js/core.js
@@ -1 +1 @@
-Joomla=window.Joomla||{};Joomla.editors=Joomla.editors||{};Joomla.editors.instances=Joomla.editors.instances||{};(function(Joomla,document){"use strict";Joomla.submitform=function(task,form,validate){if(!form){form=document.getElementById("adminForm")}if(task){form.task.value=task}form.noValidate=!validate;form.setAttribute("novalidate",!validate);var button=document.createElement("input");button.style.display="none";button.type="submit";form.appendChild(button).click();form.removeChild(button)};Joomla.submitbutton=function(pressbutton){Joomla.submitform(pressbutton)};Joomla.JText={strings:{},_:function(key,def){return typeof this.strings[key.toUpperCase()]!=="undefined"?this.strings[key.toUpperCase()]:def},load:function(object){for(var key in object){if(!object.hasOwnProperty(key))continue;this.strings[key.toUpperCase()]=object[key]}return this}};Joomla.optionsStorage=Joomla.optionsStorage||null;Joomla.getOptions=function(key,def){if(!Joomla.optionsStorage){Joomla.loadOptions()}return Joomla.optionsStorage[key]!==undefined?Joomla.optionsStorage[key]:def};Joomla.loadOptions=function(options){if(!options){var elements=document.getElementsByClassName("joomla-script-options-new"),str,element,option;for(var i=0,l=elements.length;i<l;i++){element=elements[i];str=element.text||element.textContent;option=JSON.parse(str);option?Joomla.loadOptions(option):null;element.className="joomla-script-options-loaded"}return}if(!Joomla.optionsStorage){Joomla.optionsStorage=options}else{for(var p in options){if(options.hasOwnProperty(p)){Joomla.optionsStorage[p]=options[p]}}}};Joomla.replaceTokens=function(newToken){if(!/^[0-9A-F]{32}$/i.test(newToken)){return}var els=document.getElementsByTagName("input"),i,el,n;for(i=0,n=els.length;i<n;i++){el=els[i];if(el.type=="hidden"&&el.value=="1"&&el.name.length==32){el.name=newToken}}};Joomla.isEmail=function(text){var regex=/^[\w.!#$%&‚Äô*+\/=?^`{|}~-]+@[a-z0-9-]+(?:\.[a-z0-9-]{2,})+$/i;return regex.test(text)};Joomla.checkAll=function(checkbox,stub){if(!checkbox.form)return false;stub=stub?stub:"cb";var c=0,i,e,n;for(i=0,n=checkbox.form.elements.length;i<n;i++){e=checkbox.form.elements[i];if(e.type==checkbox.type&&e.id.indexOf(stub)===0){e.checked=checkbox.checked;c+=e.checked?1:0}}if(checkbox.form.boxchecked){checkbox.form.boxchecked.value=c}return true};Joomla.renderMessages=function(messages){Joomla.removeMessages();var messageContainer=document.getElementById("system-message-container"),type,typeMessages,messagesBox,title,titleWrapper,i,messageWrapper,alertClass;for(type in messages){if(!messages.hasOwnProperty(type)){continue}typeMessages=messages[type];messagesBox=document.createElement("div");alertClass=type=="notice"?"alert-info":"alert-"+type;alertClass=type=="message"?"alert-success":alertClass;messagesBox.className="alert "+alertClass;var buttonWrapper=document.createElement("button");buttonWrapper.setAttribute("type","button");buttonWrapper.setAttribute("data-dismiss","alert");buttonWrapper.className="close";buttonWrapper.innerHTML="×";messagesBox.appendChild(buttonWrapper);title=Joomla.JText._(type);if(typeof title!="undefined"){titleWrapper=document.createElement("h4");titleWrapper.className="alert-heading";titleWrapper.innerHTML=Joomla.JText._(type);messagesBox.appendChild(titleWrapper)}for(i=typeMessages.length-1;i>=0;i--){messageWrapper=document.createElement("div");messageWrapper.innerHTML=typeMessages[i];messagesBox.appendChild(messageWrapper)}messageContainer.appendChild(messagesBox)}};Joomla.removeMessages=function(){var messageContainer=document.getElementById("system-message-container");while(messageContainer.firstChild)messageContainer.removeChild(messageContainer.firstChild);messageContainer.style.display="none";messageContainer.offsetHeight;messageContainer.style.display=""};Joomla.ajaxErrorsMessages=function(jqXHR,textStatus,error){var msg={};if(textStatus=="parsererror"){var encodedJson=jqXHR.responseText.trim();var buf=[];for(var i=encodedJson.length-1;i>=0;i--){buf.unshift(["&#",encodedJson[i].charCodeAt(),";"].join(""))}encodedJson=buf.join("");msg.error=[Joomla.JText._("JLIB_JS_AJAX_ERROR_PARSE").replace("%s",encodedJson)]}else if(textStatus=="nocontent"){msg.error=[Joomla.JText._("JLIB_JS_AJAX_ERROR_NO_CONTENT")]}else if(textStatus=="timeout"){msg.error=[Joomla.JText._("JLIB_JS_AJAX_ERROR_TIMEOUT")]}else if(textStatus=="abort"){msg.error=[Joomla.JText._("JLIB_JS_AJAX_ERROR_CONNECTION_ABORT")]}else{msg.error=[Joomla.JText._("JLIB_JS_AJAX_ERROR_OTHER").replace("%s",jqXHR.status)]}return msg};Joomla.isChecked=function(isitchecked,form){if(typeof form==="undefined"){form=document.getElementById("adminForm")}form.boxchecked.value=isitchecked?parseInt(form.boxchecked.value)+1:parseInt(form.boxchecked.value)-1;if(!form.elements["checkall-toggle"])return;var c=true,i,e,n;for(i=0,n=form.elements.length;i<n;i++){e=form.elements[i];if(e.type=="checkbox"&&e.name!="checkall-toggle"&&!e.checked){c=false;break}}form.elements["checkall-toggle"].checked=c};Joomla.popupWindow=function(mypage,myname,w,h,scroll){var winl=(screen.width-w)/2,wint=(screen.height-h)/2,winprops="height="+h+",width="+w+",top="+wint+",left="+winl+",scrollbars="+scroll+",resizable";window.open(mypage,myname,winprops).window.focus()};Joomla.tableOrdering=function(order,dir,task,form){if(typeof form==="undefined"){form=document.getElementById("adminForm")}form.filter_order.value=order;form.filter_order_Dir.value=dir;Joomla.submitform(task,form)};window.writeDynaList=function(selectParams,source,key,orig_key,orig_val){var html="<select "+selectParams+">",hasSelection=key==orig_key,i=0,selected,x,item;for(x in source){if(!source.hasOwnProperty(x)){continue}item=source[x];if(item[0]!=key){continue}selected="";if(hasSelection&&orig_val==item[1]||!hasSelection&&i===0){selected='selected="selected"'}html+='<option value="'+item[1]+'" '+selected+">"+item[2]+"</option>";i++}html+="</select>";document.writeln(html)};window.changeDynaList=function(listname,source,key,orig_key,orig_val){var list=document.adminForm[listname],hasSelection=key==orig_key,i,x,item,opt;while(list.firstChild)list.removeChild(list.firstChild);i=0;for(x in source){if(!source.hasOwnProperty(x)){continue}item=source[x];if(item[0]!=key){continue}opt=new Option;opt.value=item[1];opt.text=item[2];if(hasSelection&&orig_val==opt.value||!hasSelection&&i===0){opt.selected=true}list.options[i++]=opt}list.length=i};window.radioGetCheckedValue=function(radioObj){if(!radioObj){return""}var n=radioObj.length,i;if(n===undefined){return radioObj.checked?radioObj.value:""}for(i=0;i<n;i++){if(radioObj[i].checked){return radioObj[i].value}}return""};window.getSelectedValue=function(frmName,srcListName){var srcList=document[frmName][srcListName],i=srcList.selectedIndex;if(i!==null&&i>-1){return srcList.options[i].value}else{return null}};window.listItemTask=function(id,task){var f=document.adminForm,i=0,cbx,cb=f[id];if(!cb)return false;while(true){cbx=f["cb"+i];if(!cbx)break;cbx.checked=false;i++}cb.checked=true;f.boxchecked.value=1;window.submitform(task);return false};window.submitbutton=function(pressbutton){Joomla.submitbutton(pressbutton)};window.submitform=function(pressbutton){Joomla.submitform(pressbutton)};window.saveorder=function(n,task){window.checkAll_button(n,task)};window.checkAll_button=function(n,task){task=task?task:"saveorder";var j,box;for(j=0;j<=n;j++){box=document.adminForm["cb"+j];if(box){box.checked=true}else{alert("You cannot change the order of items, as an item in the list is `Checked Out`");return}}Joomla.submitform(task)};Joomla.loadingLayer=function(task,parentElement){task=task||"show";parentElement=parentElement||document.body;if(task=="load"){var basePath=document.getElementsByTagName("body")[0].getAttribute("data-basepath")||"";var loadingDiv=document.createElement("div");loadingDiv.id="loading-logo";loadingDiv.style["position"]="fixed";loadingDiv.style["top"]="0";loadingDiv.style["left"]="0";loadingDiv.style["width"]="100%";loadingDiv.style["height"]="100%";loadingDiv.style["opacity"]="0.8";loadingDiv.style["filter"]="alpha(opacity=80)";loadingDiv.style["overflow"]="hidden";loadingDiv.style["z-index"]="10000";loadingDiv.style["display"]="none";loadingDiv.style["background-color"]="#fff";loadingDiv.style["background-image"]='url("'+basePath+'/media/jui/images/ajax-loader.gif")';loadingDiv.style["background-position"]="center";loadingDiv.style["background-repeat"]="no-repeat";loadingDiv.style["background-attachment"]="fixed";parentElement.appendChild(loadingDiv)}else{if(!document.getElementById("loading-logo")){Joomla.loadingLayer("load",parentElement)}document.getElementById("loading-logo").style["display"]=task=="show"?"block":"none"}return document.getElementById("loading-logo")}})(Joomla,document);
\ No newline at end of file
+Joomla=window.Joomla||{};Joomla.editors=Joomla.editors||{};Joomla.editors.instances=Joomla.editors.instances||{};(function(Joomla,document){"use strict";Joomla.submitform=function(task,form,validate){if(!form){form=document.getElementById("adminForm")}if(task){form.task.value=task}form.noValidate=!validate;form.setAttribute("novalidate",!validate);var button=document.createElement("input");button.style.display="none";button.type="submit";form.appendChild(button).click();form.removeChild(button)};Joomla.submitbutton=function(pressbutton){Joomla.submitform(pressbutton)};Joomla.JText={strings:{},_:function(key,def){return typeof this.strings[key.toUpperCase()]!=="undefined"?this.strings[key.toUpperCase()]:def},load:function(object){for(var key in object){if(!object.hasOwnProperty(key))continue;this.strings[key.toUpperCase()]=object[key]}return this}};Joomla.optionsStorage=Joomla.optionsStorage||null;Joomla.getOptions=function(key,def){if(!Joomla.optionsStorage){Joomla.loadOptions()}return Joomla.optionsStorage[key]!==undefined?Joomla.optionsStorage[key]:def};Joomla.loadOptions=function(options){if(!options){var elements=document.querySelectorAll(".joomla-script-options.new"),str,element,option;for(var i=0,l=elements.length;i<l;i++){element=elements[i];str=element.text||element.textContent;option=JSON.parse(str);option?Joomla.loadOptions(option):null;element.className=element.className.replace(" new"," loaded")}return}if(!Joomla.optionsStorage){Joomla.optionsStorage=options}else{for(var p in options){if(options.hasOwnProperty(p)){Joomla.optionsStorage[p]=options[p]}}}};Joomla.replaceTokens=function(newToken){if(!/^[0-9A-F]{32}$/i.test(newToken)){return}var els=document.getElementsByTagName("input"),i,el,n;for(i=0,n=els.length;i<n;i++){el=els[i];if(el.type=="hidden"&&el.value=="1"&&el.name.length==32){el.name=newToken}}};Joomla.isEmail=function(text){var regex=/^[\w.!#$%&‚Äô*+\/=?^`{|}~-]+@[a-z0-9-]+(?:\.[a-z0-9-]{2,})+$/i;return regex.test(text)};Joomla.checkAll=function(checkbox,stub){if(!checkbox.form)return false;stub=stub?stub:"cb";var c=0,i,e,n;for(i=0,n=checkbox.form.elements.length;i<n;i++){e=checkbox.form.elements[i];if(e.type==checkbox.type&&e.id.indexOf(stub)===0){e.checked=checkbox.checked;c+=e.checked?1:0}}if(checkbox.form.boxchecked){checkbox.form.boxchecked.value=c}return true};Joomla.renderMessages=function(messages){Joomla.removeMessages();var messageContainer=document.getElementById("system-message-container"),type,typeMessages,messagesBox,title,titleWrapper,i,messageWrapper,alertClass;for(type in messages){if(!messages.hasOwnProperty(type)){continue}typeMessages=messages[type];messagesBox=document.createElement("div");alertClass=type=="notice"?"alert-info":"alert-"+type;alertClass=type=="message"?"alert-success":alertClass;messagesBox.className="alert "+alertClass;var buttonWrapper=document.createElement("button");buttonWrapper.setAttribute("type","button");buttonWrapper.setAttribute("data-dismiss","alert");buttonWrapper.className="close";buttonWrapper.innerHTML="×";messagesBox.appendChild(buttonWrapper);title=Joomla.JText._(type);if(typeof title!="undefined"){titleWrapper=document.createElement("h4");titleWrapper.className="alert-heading";titleWrapper.innerHTML=Joomla.JText._(type);messagesBox.appendChild(titleWrapper)}for(i=typeMessages.length-1;i>=0;i--){messageWrapper=document.createElement("div");messageWrapper.innerHTML=typeMessages[i];messagesBox.appendChild(messageWrapper)}messageContainer.appendChild(messagesBox)}};Joomla.removeMessages=function(){var messageContainer=document.getElementById("system-message-container");while(messageContainer.firstChild)messageContainer.removeChild(messageContainer.firstChild);messageContainer.style.display="none";messageContainer.offsetHeight;messageContainer.style.display=""};Joomla.ajaxErrorsMessages=function(jqXHR,textStatus,error){var msg={};if(textStatus=="parsererror"){var encodedJson=jqXHR.responseText.trim();var buf=[];for(var i=encodedJson.length-1;i>=0;i--){buf.unshift(["&#",encodedJson[i].charCodeAt(),";"].join(""))}encodedJson=buf.join("");msg.error=[Joomla.JText._("JLIB_JS_AJAX_ERROR_PARSE").replace("%s",encodedJson)]}else if(textStatus=="nocontent"){msg.error=[Joomla.JText._("JLIB_JS_AJAX_ERROR_NO_CONTENT")]}else if(textStatus=="timeout"){msg.error=[Joomla.JText._("JLIB_JS_AJAX_ERROR_TIMEOUT")]}else if(textStatus=="abort"){msg.error=[Joomla.JText._("JLIB_JS_AJAX_ERROR_CONNECTION_ABORT")]}else{msg.error=[Joomla.JText._("JLIB_JS_AJAX_ERROR_OTHER").replace("%s",jqXHR.status)]}return msg};Joomla.isChecked=function(isitchecked,form){if(typeof form==="undefined"){form=document.getElementById("adminForm")}form.boxchecked.value=isitchecked?parseInt(form.boxchecked.value)+1:parseInt(form.boxchecked.value)-1;if(!form.elements["checkall-toggle"])return;var c=true,i,e,n;for(i=0,n=form.elements.length;i<n;i++){e=form.elements[i];if(e.type=="checkbox"&&e.name!="checkall-toggle"&&!e.checked){c=false;break}}form.elements["checkall-toggle"].checked=c};Joomla.popupWindow=function(mypage,myname,w,h,scroll){var winl=(screen.width-w)/2,wint=(screen.height-h)/2,winprops="height="+h+",width="+w+",top="+wint+",left="+winl+",scrollbars="+scroll+",resizable";window.open(mypage,myname,winprops).window.focus()};Joomla.tableOrdering=function(order,dir,task,form){if(typeof form==="undefined"){form=document.getElementById("adminForm")}form.filter_order.value=order;form.filter_order_Dir.value=dir;Joomla.submitform(task,form)};window.writeDynaList=function(selectParams,source,key,orig_key,orig_val){var html="<select "+selectParams+">",hasSelection=key==orig_key,i=0,selected,x,item;for(x in source){if(!source.hasOwnProperty(x)){continue}item=source[x];if(item[0]!=key){continue}selected="";if(hasSelection&&orig_val==item[1]||!hasSelection&&i===0){selected='selected="selected"'}html+='<option value="'+item[1]+'" '+selected+">"+item[2]+"</option>";i++}html+="</select>";document.writeln(html)};window.changeDynaList=function(listname,source,key,orig_key,orig_val){var list=document.adminForm[listname],hasSelection=key==orig_key,i,x,item,opt;while(list.firstChild)list.removeChild(list.firstChild);i=0;for(x in source){if(!source.hasOwnProperty(x)){continue}item=source[x];if(item[0]!=key){continue}opt=new Option;opt.value=item[1];opt.text=item[2];if(hasSelection&&orig_val==opt.value||!hasSelection&&i===0){opt.selected=true}list.options[i++]=opt}list.length=i};window.radioGetCheckedValue=function(radioObj){if(!radioObj){return""}var n=radioObj.length,i;if(n===undefined){return radioObj.checked?radioObj.value:""}for(i=0;i<n;i++){if(radioObj[i].checked){return radioObj[i].value}}return""};window.getSelectedValue=function(frmName,srcListName){var srcList=document[frmName][srcListName],i=srcList.selectedIndex;if(i!==null&&i>-1){return srcList.options[i].value}else{return null}};window.listItemTask=function(id,task){var f=document.adminForm,i=0,cbx,cb=f[id];if(!cb)return false;while(true){cbx=f["cb"+i];if(!cbx)break;cbx.checked=false;i++}cb.checked=true;f.boxchecked.value=1;window.submitform(task);return false};window.submitbutton=function(pressbutton){Joomla.submitbutton(pressbutton)};window.submitform=function(pressbutton){Joomla.submitform(pressbutton)};window.saveorder=function(n,task){window.checkAll_button(n,task)};window.checkAll_button=function(n,task){task=task?task:"saveorder";var j,box;for(j=0;j<=n;j++){box=document.adminForm["cb"+j];if(box){box.checked=true}else{alert("You cannot change the order of items, as an item in the list is `Checked Out`");return}}Joomla.submitform(task)};Joomla.loadingLayer=function(task,parentElement){task=task||"show";parentElement=parentElement||document.body;if(task=="load"){var basePath=document.getElementsByTagName("body")[0].getAttribute("data-basepath")||"";var loadingDiv=document.createElement("div");loadingDiv.id="loading-logo";loadingDiv.style["position"]="fixed";loadingDiv.style["top"]="0";loadingDiv.style["left"]="0";loadingDiv.style["width"]="100%";loadingDiv.style["height"]="100%";loadingDiv.style["opacity"]="0.8";loadingDiv.style["filter"]="alpha(opacity=80)";loadingDiv.style["overflow"]="hidden";loadingDiv.style["z-index"]="10000";loadingDiv.style["display"]="none";loadingDiv.style["background-color"]="#fff";loadingDiv.style["background-image"]='url("'+basePath+'/media/jui/images/ajax-loader.gif")';loadingDiv.style["background-position"]="center";loadingDiv.style["background-repeat"]="no-repeat";loadingDiv.style["background-attachment"]="fixed";parentElement.appendChild(loadingDiv)}else{if(!document.getElementById("loading-logo")){Joomla.loadingLayer("load",parentElement)}document.getElementById("loading-logo").style["display"]=task=="show"?"block":"none"}return document.getElementById("loading-logo")}})(Joomla,document);
\ No newline at end of file
diff --git a/tests/javascript/core/fixtures/fixture.html b/tests/javascript/core/fixtures/fixture.html
index f6282b70ad599..0891220c0976d 100644
--- a/tests/javascript/core/fixtures/fixture.html
+++ b/tests/javascript/core/fixtures/fixture.html
@@ -37,7 +37,7 @@
 		</form>
 	</div>
 	<div id="get-options">
-		<script type="application/json" class="joomla-script-options-new">{
+		<script type="application/json" class="joomla-script-options new">{
 			"com_foobar": ["my options"],
 			"com_foobar2": "Alert message!",
 			"com_foobar3": false
diff --git a/tests/javascript/core/spec.js b/tests/javascript/core/spec.js
index 54f02a35da62c..5b0e41d21ea64 100644
--- a/tests/javascript/core/spec.js
+++ b/tests/javascript/core/spec.js
@@ -216,20 +216,20 @@ define(['jquery', 'testsRoot/core/spec-setup', 'jasmineJquery'], function ($) {
 			expect(Joomla.getOptions("com_foobar4", 123)).toEqual(123)
 		});
 
-        // Test dynamically added options
-        it('should return dynamically added options Joomla.getOptions("com_foobar5")', function () {
+		// Test dynamically added options
+		it('should return dynamically added options Joomla.getOptions("com_foobar5")', function () {
             $('#get-options').append($('<script>', {
-                type: 'application/json',
-                'class': 'joomla-script-options-new',
-                text: '{"com_foobar5": true}'
+				type: 'application/json',
+				'class': 'joomla-script-options new',
+				text: '{"com_foobar5": true}'
             }));
             Joomla.loadOptions();
 
             expect(Joomla.getOptions("com_foobar5")).toEqual(true)
-        });
-        it('amount of the loaded options containers should equal 2', function () {
-            expect($('.joomla-script-options-loaded').length).toEqual(2)
-        });
+		});
+		it('amount of the loaded options containers should equal 2', function () {
+            expect($('.joomla-script-options.loaded').length).toEqual(2)
+		});
 
 	});
 });