diff --git a/administrator/language/en-GB/en-GB.com_content.ini b/administrator/language/en-GB/en-GB.com_content.ini
index 3d1d876c06fc6..27959eb1f2cf1 100644
--- a/administrator/language/en-GB/en-GB.com_content.ini
+++ b/administrator/language/en-GB/en-GB.com_content.ini
@@ -27,11 +27,11 @@ COM_CONTENT_CONFIGURATION="Articles: Options"
 COM_CONTENT_CREATE_ARTICLE_CANCEL_REDIRECT_MENU_DESC="Select the page the user will be redirected to after Canceling article submission. The default is to redirect to the same article submission page (cleaning form)."
 COM_CONTENT_CREATE_ARTICLE_CANCEL_REDIRECT_MENU_LABEL="Cancel Redirect"
 COM_CONTENT_CREATE_ARTICLE_CATEGORY_LABEL="Default Category"
-COM_CONTENT_CREATE_ARTICLE_CUSTOM_CANCEL_REDIRECT_DESC="If set to 'Yes', you can set a redirection page, distinct from above 'Submission Redirect', to redirect to when user Cancels article submission.<br />If set to 'No', when user Cancels article submission he is redirected to the above 'Submission Redirect' page."
+COM_CONTENT_CREATE_ARTICLE_CUSTOM_CANCEL_REDIRECT_DESC="If set to 'Yes', you can set a redirection page, distinct from above 'Submission Redirect', to redirect to when user Cancels article submission.<br>If set to 'No', when user Cancels article submission he is redirected to the above 'Submission Redirect' page."
 COM_CONTENT_CREATE_ARTICLE_CUSTOM_CANCEL_REDIRECT_LABEL="Custom Redirect on Cancel"
 COM_CONTENT_CREATE_ARTICLE_REDIRECTMENU_DESC="Select the page the user will be redirected to after a successful article submission and after cancel (if not set differently below). The default is to redirect to the home page."
 COM_CONTENT_CREATE_ARTICLE_REDIRECTMENU_LABEL="Submission/Cancel Redirect"
-COM_CONTENT_DRILL_CATEGORIES_LABEL="List or Blog: after choosing the display,<br />make sure you define the Options in the desired layout."
+COM_CONTENT_DRILL_CATEGORIES_LABEL="List or Blog: after choosing the display,<br>make sure you define the Options in the desired layout."
 COM_CONTENT_DRILL_DOWN_LAYOUT_DESC="When drilling down to a category, show articles in a list or blog layout."
 COM_CONTENT_DRILL_DOWN_LAYOUT_LABEL="List or Blog Layout"
 COM_CONTENT_EDIT_ARTICLE="Edit Article"
diff --git a/administrator/language/en-GB/en-GB.com_languages.ini b/administrator/language/en-GB/en-GB.com_languages.ini
index 5e4699b0c31dc..53e99651fee35 100644
--- a/administrator/language/en-GB/en-GB.com_languages.ini
+++ b/administrator/language/en-GB/en-GB.com_languages.ini
@@ -92,8 +92,8 @@ COM_LANGUAGES_N_ITEMS_PUBLISHED="%d Content Languages published."
 COM_LANGUAGES_N_ITEMS_PUBLISHED_1="%d Content Language published."
 COM_LANGUAGES_N_ITEMS_TRASHED="%d Content Languages trashed."
 COM_LANGUAGES_N_ITEMS_TRASHED_1="%d Content Language trashed."
-COM_LANGUAGES_N_ITEMS_UNPUBLISHED="%d Content Languages unpublished. <br /><strong class=\"red\">Warning!</strong> When using the multilingual functionality (ie when the plugin System - Language Filter is enabled) the Site Default Language also has to be a published Content language."
-COM_LANGUAGES_N_ITEMS_UNPUBLISHED_1="%d Content Language unpublished. <br /><strong class=\"red\">Warning!</strong> When using the multilingual functionality (ie when the plugin System - Language Filter is enabled) the Site Default Language also has to be a published Content language."
+COM_LANGUAGES_N_ITEMS_UNPUBLISHED="%d Content Languages unpublished. <br><strong class=\"red\">Warning!</strong> When using the multilingual functionality (ie when the plugin System - Language Filter is enabled) the Site Default Language also has to be a published Content language."
+COM_LANGUAGES_N_ITEMS_UNPUBLISHED_1="%d Content Language unpublished. <br><strong class=\"red\">Warning!</strong> When using the multilingual functionality (ie when the plugin System - Language Filter is enabled) the Site Default Language also has to be a published Content language."
 COM_LANGUAGES_NO_ITEM_SELECTED="No languages selected."
 COM_LANGUAGES_SAVE_SUCCESS="Content Language saved."
 COM_LANGUAGES_SEARCH_IN_TITLE="Search in title."
diff --git a/administrator/language/en-GB/en-GB.com_media.ini b/administrator/language/en-GB/en-GB.com_media.ini
index 92b215bbcff39..bf42668f90ce6 100644
--- a/administrator/language/en-GB/en-GB.com_media.ini
+++ b/administrator/language/en-GB/en-GB.com_media.ini
@@ -43,7 +43,7 @@ COM_MEDIA_FIELD_RESTRICT_UPLOADS_LABEL="Restrict Uploads"
 COM_MEDIA_FIELDSET_OPTIONS_LABEL="Media"
 COM_MEDIA_FOLDER="Folder"
 COM_MEDIA_FOLDERS="Media Folders"
-COM_MEDIA_FOLDERS_PATH_LABEL="<strong>Warning! Path Folder</strong><br />Changing the 'Path to files folder' from the default of 'images' may break your links.<br />The 'Path to images' folder has to be the same or a subfolder of 'Path to files'."
+COM_MEDIA_FOLDERS_PATH_LABEL="<strong>Warning! Path Folder</strong><br>Changing the 'Path to files folder' from the default of 'images' may break your links.<br>The 'Path to images' folder has to be the same or a subfolder of 'Path to files'."
 COM_MEDIA_MEDIA_CREATED_AT="Created at"
 COM_MEDIA_MEDIA_DIMENSION="Dimensions"
 COM_MEDIA_MEDIA_EXTENSION="Extension"
diff --git a/administrator/language/en-GB/en-GB.ini b/administrator/language/en-GB/en-GB.ini
index 8450172208b0f..6e0d8f446a2d6 100644
--- a/administrator/language/en-GB/en-GB.ini
+++ b/administrator/language/en-GB/en-GB.ini
@@ -410,7 +410,7 @@ JGLOBAL_FILTER_GROUPS_DESC="This sets the user groups that you want filters appl
 JGLOBAL_FILTER_GROUPS_LABEL="Filter Groups"
 JGLOBAL_FILTER_TAGS_DESC="2. List additional tags, separating each tag name with a space or comma. For example: <i>p,div,span</i>."
 JGLOBAL_FILTER_TAGS_LABEL="Filter Tags<sup>2</sup>"
-JGLOBAL_FILTER_TYPE_DESC="1. Blacklist allows all tags and attributes except for those in the blacklist.<br><strong>--</strong> Tags for the Default Blacklist include: 'applet', 'body', 'bgsound', 'base', 'basefont', 'canvas', 'embed', 'frame', 'frameset', 'head', 'html', 'id', 'iframe', 'ilayer', 'layer', 'link', 'meta', 'name', 'object', 'script', 'style', 'title', 'xml'<br><strong>--</strong> Attributes for the Default Blacklist include: 'action', 'background', 'codebase', 'dynsrc', 'lowsrc', 'formaction'<br><strong>--</strong> You can blacklist additional tags and attributes by adding to the Filter Tags and Filter Attributes fields, separating each tag or attribute name with a comma.<br><strong>--</strong> Custom Blacklist allows you to override the Default Blacklist. Add the tags and attributes to be blacklisted in the Filter Tags and Filter Attributes fields.</p><p>Whitelist allows only the tags listed in the Filter Tags and Filter Attributes fields.</p><p>No HTML removes all HTML tags from the content when it is saved.</p><p>Please note that these settings work regardless of the editor that you are using. <br />Even if you are using a WYSIWYG editor, the filtering settings may strip additional tags and attributes prior to saving information in the database."
+JGLOBAL_FILTER_TYPE_DESC="1. Blacklist allows all tags and attributes except for those in the blacklist.<br><strong>--</strong> Tags for the Default Blacklist include: 'applet', 'body', 'bgsound', 'base', 'basefont', 'canvas', 'embed', 'frame', 'frameset', 'head', 'html', 'id', 'iframe', 'ilayer', 'layer', 'link', 'meta', 'name', 'object', 'script', 'style', 'title', 'xml'<br><strong>--</strong> Attributes for the Default Blacklist include: 'action', 'background', 'codebase', 'dynsrc', 'lowsrc', 'formaction'<br><strong>--</strong> You can blacklist additional tags and attributes by adding to the Filter Tags and Filter Attributes fields, separating each tag or attribute name with a comma.<br><strong>--</strong> Custom Blacklist allows you to override the Default Blacklist. Add the tags and attributes to be blacklisted in the Filter Tags and Filter Attributes fields.</p><p>Whitelist allows only the tags listed in the Filter Tags and Filter Attributes fields.</p><p>No HTML removes all HTML tags from the content when it is saved.</p><p>Please note that these settings work regardless of the editor that you are using. <br>Even if you are using a WYSIWYG editor, the filtering settings may strip additional tags and attributes prior to saving information in the database."
 JGLOBAL_FILTER_TYPE_LABEL="Filter Type<sup>1</sup>"
 JGLOBAL_FULL_TEXT="Full Text"
 JGLOBAL_GT="&gt;"
@@ -957,8 +957,8 @@ JWARNING_ARCHIVE_MUST_SELECT="You must select at least one item to archive."
 JWARNING_UNPUBLISH_MUST_SELECT="You must select at least one item to unpublish."
 JWARNING_TRASH_MUST_SELECT="You must select at least one item to remove."
 JWARNING_DELETE_MUST_SELECT="You must select at least one item to permanently delete."
-JWARNING_REMOVE_ROOT_USER="You are logged-in using the emergency Root User setting in configuration.php.<br>You should remove $root_user from the configuration.php as soon as you have restored control to your site to avoid future security breaches.<br /><a href='%s'>Select here to try to do it automatically.</a>"
-JWARNING_REMOVE_ROOT_USER_ADMIN="The emergency Root User setting is currently enabled for the user(id): %s.<br />You should remove $root_user from the configuration.php as soon as you have restored control to your site to avoid future security breaches.<br /><a href='%s'>Select here to try to do it automatically.</a>"
+JWARNING_REMOVE_ROOT_USER="You are logged-in using the emergency Root User setting in configuration.php.<br>You should remove $root_user from the configuration.php as soon as you have restored control to your site to avoid future security breaches.<br><a href='%s'>Select here to try to do it automatically.</a>"
+JWARNING_REMOVE_ROOT_USER_ADMIN="The emergency Root User setting is currently enabled for the user(id): %s.<br>You should remove $root_user from the configuration.php as soon as you have restored control to your site to avoid future security breaches.<br><a href='%s'>Select here to try to do it automatically.</a>"
 
 ; Date format
 
diff --git a/administrator/templates/system/error.php b/administrator/templates/system/error.php
index 4a9a3534b4eb2..2ea5cc4754ffa 100644
--- a/administrator/templates/system/error.php
+++ b/administrator/templates/system/error.php
@@ -31,7 +31,7 @@
 				<p>
 					<?php echo htmlspecialchars($this->error->getMessage(), ENT_QUOTES, 'UTF-8'); ?>
 					<?php if ($this->debug) : ?>
-						<br/><?php echo htmlspecialchars($this->error->getFile(), ENT_QUOTES, 'UTF-8');?>:<?php echo $this->error->getLine(); ?>
+						<br><?php echo htmlspecialchars($this->error->getFile(), ENT_QUOTES, 'UTF-8');?>:<?php echo $this->error->getLine(); ?>
 					<?php endif; ?>
 				</p>
 				<p><a href="<?php echo JRoute::_('index.php'); ?>"><?php echo JText::_('JGLOBAL_TPL_CPANEL_LINK_TEXT'); ?></a></p>
@@ -48,7 +48,7 @@
 								<p><strong><?php echo JText::_('JERROR_LAYOUT_PREVIOUS_ERROR'); ?></strong></p>
 								<p>
 									<?php echo htmlspecialchars($this->_error->getMessage(), ENT_QUOTES, 'UTF-8'); ?>
-									<br/><?php echo htmlspecialchars($this->_error->getFile(), ENT_QUOTES, 'UTF-8');?>:<?php echo $this->_error->getLine(); ?>
+									<br><?php echo htmlspecialchars($this->_error->getFile(), ENT_QUOTES, 'UTF-8');?>:<?php echo $this->_error->getLine(); ?>
 								</p>
 								<?php echo $this->renderBacktrace(); ?>
 								<?php $loop = $this->setError($this->_error->getPrevious()); ?>
diff --git a/media/system/js/fields/simplecolors.js b/media/system/js/fields/simplecolors.js
index 0395f371d75e3..8b0ff37387742 100644
--- a/media/system/js/fields/simplecolors.js
+++ b/media/system/js/fields/simplecolors.js
@@ -21,7 +21,7 @@
 			var option = $(this);
 			var color = option.val();
 			if (option.text() == '-') {
-				list += '<br />';
+				list += '<br>';
 			} else {
 				var clss = 'simplecolors-swatch';
 				if (color == 'none') {
diff --git a/media/system/js/fields/simplecolors.min.js b/media/system/js/fields/simplecolors.min.js
index d727f8cca8c7e..8126476cfd0d8 100644
--- a/media/system/js/fields/simplecolors.min.js
+++ b/media/system/js/fields/simplecolors.min.js
@@ -1 +1 @@
-!function(t){var s=function(s,e){this.select=t(s),this.options=t.extend({},t.fn.simplecolors.defaults,e),this.select.hide();var o="";t("option",this.select).each(function(){var s=t(this),e=s.val();if("-"==s.text())o+="<br />";else{var n="simplecolors-swatch";"none"==e&&(n+=" nocolor",e="transparent"),s.attr("selected")&&(n+=" active"),o+='<span class="'+n+'"><span style="background-color: '+e+';" tabindex="0"></span></span>'}});var n=this.select.val(),i="simplecolors-swatch";"none"==n&&(i+=" nocolor",n="transparent"),this.icon=t('<span class="'+i+'"><span style="background-color: '+n+';" tabindex="0"></span></span>').insertAfter(this.select),this.icon.on("click",t.proxy(this.show,this)),this.panel=t('<span class="simplecolors-panel"></span>').appendTo(document.body),this.panel.html(o),this.panel.on("click",t.proxy(this.click,this)),t(document).on("mousedown",t.proxy(this.hide,this)),this.panel.on("mousedown",t.proxy(this.mousedown,this))};s.prototype={constructor:s,show:function(){var t=this.icon.offset();switch(this.select.attr("data-position")){case"top":this.panel.css({left:t.left-7,top:t.top-this.panel.outerHeight()-1});break;case"bottom":this.panel.css({left:t.left-7,top:t.top+this.icon.outerHeight()});break;case"left":this.panel.css({left:t.left-this.panel.outerWidth(),top:t.top-(this.panel.outerHeight()-this.icon.outerHeight())/2-1});break;case"right":default:this.panel.css({left:t.left+this.icon.outerWidth(),top:t.top-(this.panel.outerHeight()-this.icon.outerHeight())/2-1})}this.panel.show(this.options.delay)},hide:function(){"none"!=this.panel.css("display")&&this.panel.hide(this.options.delay)},click:function(s){var e=t(s.target);if(1===e.length&&"span"===e[0].nodeName.toLowerCase()){var o="",n="",i="";e.parent().hasClass("nocolor")?(o="none",n="transparent",i="nocolor"):n=o=this.rgb2hex(e.css("background-color")),e.parent().siblings().removeClass("active"),e.parent().addClass("active"),this.icon.removeClass("nocolor").addClass(i),this.icon.find("span").css("background-color",n),this.hide(),this.select.val(o).change()}},mousedown:function(t){t.stopPropagation(),t.preventDefault()},rgb2hex:function(t){function s(t){return("0"+parseInt(t,10).toString(16)).slice(-2)}var e=t.match(/^rgb\((\d+),\s*(\d+),\s*(\d+)\)$/);return null===e?t:"#"+s(e[1])+s(e[2])+s(e[3])}},t.fn.simplecolors=function(e){return this.each(function(){var o=t(this),n=o.data("simplecolors"),i="object"==typeof e&&e;n||o.data("simplecolors",n=new s(this,i)),"string"==typeof e&&n[e]()})},t.fn.simplecolors.Constructor=s,t.fn.simplecolors.defaults={delay:0}}(jQuery);
\ No newline at end of file
+!function(t){var s=function(s,e){this.select=t(s),this.options=t.extend({},t.fn.simplecolors.defaults,e),this.select.hide();var o="";t("option",this.select).each(function(){var s=t(this),e=s.val();if("-"==s.text())o+="<br>";else{var n="simplecolors-swatch";"none"==e&&(n+=" nocolor",e="transparent"),s.attr("selected")&&(n+=" active"),o+='<span class="'+n+'"><span style="background-color: '+e+';" tabindex="0"></span></span>'}});var n=this.select.val(),i="simplecolors-swatch";"none"==n&&(i+=" nocolor",n="transparent"),this.icon=t('<span class="'+i+'"><span style="background-color: '+n+';" tabindex="0"></span></span>').insertAfter(this.select),this.icon.on("click",t.proxy(this.show,this)),this.panel=t('<span class="simplecolors-panel"></span>').appendTo(document.body),this.panel.html(o),this.panel.on("click",t.proxy(this.click,this)),t(document).on("mousedown",t.proxy(this.hide,this)),this.panel.on("mousedown",t.proxy(this.mousedown,this))};s.prototype={constructor:s,show:function(){var t=this.icon.offset();switch(this.select.attr("data-position")){case"top":this.panel.css({left:t.left-7,top:t.top-this.panel.outerHeight()-1});break;case"bottom":this.panel.css({left:t.left-7,top:t.top+this.icon.outerHeight()});break;case"left":this.panel.css({left:t.left-this.panel.outerWidth(),top:t.top-(this.panel.outerHeight()-this.icon.outerHeight())/2-1});break;case"right":default:this.panel.css({left:t.left+this.icon.outerWidth(),top:t.top-(this.panel.outerHeight()-this.icon.outerHeight())/2-1})}this.panel.show(this.options.delay)},hide:function(){"none"!=this.panel.css("display")&&this.panel.hide(this.options.delay)},click:function(s){var e=t(s.target);if(1===e.length&&"span"===e[0].nodeName.toLowerCase()){var o="",n="",i="";e.parent().hasClass("nocolor")?(o="none",n="transparent",i="nocolor"):n=o=this.rgb2hex(e.css("background-color")),e.parent().siblings().removeClass("active"),e.parent().addClass("active"),this.icon.removeClass("nocolor").addClass(i),this.icon.find("span").css("background-color",n),this.hide(),this.select.val(o).change()}},mousedown:function(t){t.stopPropagation(),t.preventDefault()},rgb2hex:function(t){function s(t){return("0"+parseInt(t,10).toString(16)).slice(-2)}var e=t.match(/^rgb\((\d+),\s*(\d+),\s*(\d+)\)$/);return null===e?t:"#"+s(e[1])+s(e[2])+s(e[3])}},t.fn.simplecolors=function(e){return this.each(function(){var o=t(this),n=o.data("simplecolors"),i="object"==typeof e&&e;n||o.data("simplecolors",n=new s(this,i)),"string"==typeof e&&n[e]()})},t.fn.simplecolors.Constructor=s,t.fn.simplecolors.defaults={delay:0}}(jQuery);
\ No newline at end of file
diff --git a/templates/system/error.php b/templates/system/error.php
index e3e893087c494..303b7d4d1f54d 100644
--- a/templates/system/error.php
+++ b/templates/system/error.php
@@ -56,7 +56,7 @@
 			<p>
 				<?php echo htmlspecialchars($this->error->getMessage(), ENT_QUOTES, 'UTF-8'); ?>
 				<?php if ($this->debug) : ?>
-					<br/><?php echo htmlspecialchars($this->error->getFile(), ENT_QUOTES, 'UTF-8');?>:<?php echo $this->error->getLine(); ?>
+					<br><?php echo htmlspecialchars($this->error->getFile(), ENT_QUOTES, 'UTF-8');?>:<?php echo $this->error->getLine(); ?>
 				<?php endif; ?>
 			</p>
 			<?php if ($this->debug) : ?>
@@ -72,7 +72,7 @@
 							<p><strong><?php echo JText::_('JERROR_LAYOUT_PREVIOUS_ERROR'); ?></strong></p>
 							<p>
 								<?php echo htmlspecialchars($this->_error->getMessage(), ENT_QUOTES, 'UTF-8'); ?>
-								<br/><?php echo htmlspecialchars($this->_error->getFile(), ENT_QUOTES, 'UTF-8');?>:<?php echo $this->_error->getLine(); ?>
+								<br><?php echo htmlspecialchars($this->_error->getFile(), ENT_QUOTES, 'UTF-8');?>:<?php echo $this->_error->getLine(); ?>
 							</p>
 							<?php echo $this->renderBacktrace(); ?>
 							<?php $loop = $this->setError($this->_error->getPrevious()); ?>