diff --git a/administrator/modules/mod_login/tmpl/default.php b/administrator/modules/mod_login/tmpl/default.php
index 0f7fd1a4b70ba..56530ef1bbe36 100644
--- a/administrator/modules/mod_login/tmpl/default.php
+++ b/administrator/modules/mod_login/tmpl/default.php
@@ -83,8 +83,8 @@
 		<?php endif; ?>
 		<div class="control-group">
 			<div class="controls">
-				<div class="btn-group pull-left">
-					<button tabindex="3" class="btn btn-primary btn-large">
+				<div class="btn-group">
+					<button tabindex="3" class="btn btn-primary btn-block btn-large">
 						<i class="icon-lock icon-white"></i> <?php echo JText::_('MOD_LOGIN_LOGIN'); ?>
 					</button>
 				</div>
diff --git a/administrator/templates/isis/css/template-rtl.css b/administrator/templates/isis/css/template-rtl.css
index 9bdc790ea96a1..47868d728cf73 100644
--- a/administrator/templates/isis/css/template-rtl.css
+++ b/administrator/templates/isis/css/template-rtl.css
@@ -6428,7 +6428,6 @@ dl.article-info dd.hits span[class*=" icon-"] {
 .icon-plus-2:before {
 	content: "\5d";
 }
-.icon-ban-circle:before,
 .icon-minus-sign:before,
 .icon-minus-2:before {
 	content: "\5e";
@@ -6455,6 +6454,7 @@ dl.article-info dd.hits span[class*=" icon-"] {
 .icon-not-ok:before {
 	content: "\4b";
 }
+.icon-ban-circle:before,
 .icon-minus-circle:before {
 	content: "\e216";
 }
@@ -6583,7 +6583,6 @@ dl.article-info dd.hits span[class*=" icon-"] {
 .icon-file-plus:before {
 	content: "\29";
 }
-.icon-file-remove:before,
 .icon-file-minus:before {
 	content: "\e017";
 }
@@ -7025,39 +7024,44 @@ a:focus {
 .view-login .navbar-fixed-bottom,
 .view-login .navbar-fixed-bottom a {
 	color: #FCFCFC;
-	text-shadow: 1px 1px 1px rgba(0,0,0,0.5);
+}
+.view-login .navbar-fixed-bottom.navbar-inverse,
+.view-login .navbar-fixed-bottom a.navbar-inverse {
+	color: #555;
 }
 .view-login .well {
 	padding-bottom: 0;
-	-webkit-box-shadow: 0px 0px 60px rgba(0, 0, 0, 0.5), 0px 1px 0px rgba(255, 255, 255, 0.9) inset;
-	-moz-box-shadow: 0px 0px 60px rgba(0, 0, 0, 0.5), 0px 1px 0px rgba(255, 255, 255, 0.9) inset;
-	box-shadow: 0px 0px 60px rgba(0, 0, 0, 0.5), 0px 1px 0px rgba(255, 255, 255, 0.9) inset;
 }
 .view-login .login-joomla {
 	position: absolute;
 	left: 50%;
 	height: 24px;
 	width: 24px;
-	text-indent: -9999px;
-	background: url('../images/login-joomla.png') no-repeat;
 	margin-left: -12px;
+	font-size: 24px;
+}
+.navbar-inverse .view-login .login-joomla {
+	background: url('../images/login-joomla-inverse.png') no-repeat;
 }
 .view-login .navbar-fixed-bottom {
 	position: absolute;
 }
 .view-login .input-medium {
-	width: 184px;
+	width: 176px;
 }
 .login .chzn-single {
-	width: 230px !important;
+	width: 222px !important;
 }
 .login .chzn-container,
 .login .chzn-drop {
-	width: 238px !important;
-	max-width: 238px !important;
+	width: 230px !important;
+	max-width: 230px !important;
 }
 .login .btn-large {
-	margin-top: 10px;
+	margin-top: 15px;
+}
+.login .form-inline .btn-group {
+	display: block;
 }
 .small {
 	font-size: 11px;
@@ -7074,12 +7078,20 @@ body .navbar-fixed-top {
 }
 .navbar-inner {
 	min-height: 0;
+	background: #f2f2f2;
+	background-image: none;
+	filter: none;
 }
 .navbar-inner .container-fluid {
 	padding-left: 10px;
 	padding-right: 10px;
 	font-size: 15px;
 }
+.navbar-inverse .navbar-inner {
+	background: #10223e;
+	background-image: none;
+	filter: none;
+}
 .navbar .navbar-text {
 	line-height: 30px;
 }
@@ -7111,27 +7123,27 @@ body .navbar-fixed-top {
 .navbar .nav-user {
 	font-size: 13px;
 }
+.navbar-fixed-top .navbar-inner,
+.navbar-static-top .navbar-inner {
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
+	box-shadow: none;
+}
+.navbar-fixed-bottom {
+	bottom: 0;
+}
+.navbar-fixed-bottom .navbar-inner {
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
+	box-shadow: none;
+}
 .header {
-	background-color: #184a7d;
-	background-image: -moz-linear-gradient(top,#17568c,#1a3867);
-	background-image: -webkit-gradient(linear,0 0,0 100%,from(#17568c),to(#1a3867));
-	background-image: -webkit-linear-gradient(top,#17568c,#1a3867);
-	background-image: -o-linear-gradient(top,#17568c,#1a3867);
-	background-image: linear-gradient(to bottom,#17568c,#1a3867);
-	background-repeat: repeat-x;
-	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff17568c', endColorstr='#ff1a3867', GradientType=0);
+	background-color: #1a3867;
 	border-top: 1px solid rgba(255,255,255,0.2);
 	padding: 5px 25px;
 }
 .navbar .btn-navbar {
 	background: #17568c;
-	background: -moz-linear-gradient(top,#17568c 0%,#1a3867 100%);
-	background: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#17568c),color-stop(100%,#1a3867));
-	background: -webkit-linear-gradient(top,#17568c 0%,#1a3867 100%);
-	background: -o-linear-gradient(top,#17568c 0%,#1a3867 100%);
-	background: -ms-linear-gradient(top,#17568c 0%,#1a3867 100%);
-	background: linear-gradient(top,#17568c 0%,#1a3867 100%);
-	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#17568c',endColorstr='#1a3867',GradientType=0);
 	border: 1px solid #0D2242;
 	margin-bottom: 2px;
 }
@@ -7172,7 +7184,6 @@ body .navbar-fixed-top {
 }
 .page-title {
 	color: white;
-	text-shadow: 1px 1px 1px rgba(0,0,0,0.8);
 	font-weight: normal;
 	font-size: 20px;
 	line-height: 36px;
@@ -7202,15 +7213,8 @@ body .navbar-fixed-top {
 	margin-top: 0;
 }
 .subhead {
-	background: #ffffff;
-	background: -moz-linear-gradient(top,#ffffff 0%,#ededed 100%);
-	background: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#ffffff),color-stop(100%,#ededed));
-	background: -webkit-linear-gradient(top,#ffffff 0%,#ededed 100%);
-	background: -o-linear-gradient(top,#ffffff 0%,#ededed 100%);
-	background: -ms-linear-gradient(top,#ffffff 0%,#ededed 100%);
-	background: linear-gradient(top,#ffffff 0%,#ededed 100%);
-	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff',endColorstr='#ededed',GradientType=0);
-	border-bottom: 1px solid #D3D3D3;
+	background: #f5f5f5;
+	border-bottom: 1px solid #e3e3e3;
 	color: #0C192E;
 	text-shadow: 0 1px 0 #FFF;
 	margin-bottom: 10px;
@@ -7235,9 +7239,6 @@ body .navbar-fixed-top {
 	width: 100%;
 	top: 30px;
 	z-index: 100;
-	-moz-box-shadow: 0px 2px 5px rgba(0,0,0,0.2);
-	-webkit-box-shadow: 0px 2px 5px rgba(0,0,0,0.2);
-	box-shadow: 0px 2px 5px rgba(0,0,0,0.2);
 }
 @media (max-width: 767px) {
 	.subhead {
@@ -7309,6 +7310,7 @@ h6 {
 }
 .sidebar-nav .nav-list > li.active > a {
 	color: #fff;
+	margin-right: -16px;
 }
 .quick-icons .nav li + .nav-header {
 	margin-top: 12px;
@@ -7526,19 +7528,14 @@ html[dir=rtl] .quick-icons .nav-list [class*=" icon-"] {
 	}
 	.btn-toolbar .btn-wrapper {
 		display: block;
-		margin-left: 0;
-		margin-bottom: 5px;
+		margin: 0px 10px 5px 10px;
 	}
 	.btn-toolbar .btn-wrapper .btn {
-		width: 95% !important;
-		margin-left: 10px;
-	}
-	.subhead-fixed {
-		box-shadow: 0 0 0 rgba(0,0,0,0.2);
+		width: 100% !important;
 	}
 	.subhead {
 		background: none repeat scroll 0 0 transparent;
-		border-bottom: 0 solid #D3D3D3;
+		border-bottom: 0 solid #e3e3e3;
 	}
 	.btn-group + .btn-group {
 		margin-left: 10px;
@@ -7556,7 +7553,7 @@ html[dir=rtl] .quick-icons .nav-list [class*=" icon-"] {
 		display: none;
 	}
 	.btn-toolbar .btn-wrapper .btn {
-		width: 93% !important;
+		width: 100% !important;
 	}
 }
 .nav-collapse .nav li a,
@@ -7601,13 +7598,6 @@ html[dir=rtl] .quick-icons .nav-list [class*=" icon-"] {
 	}
 	.nav-collapse .nav > li > a.dropdown-toggle {
 		background-color: rgba(255,255,255,0.07);
-		background-image: -moz-linear-gradient(top,rgba(255,255,255,0.15),rgba(255,255,255,0.05));
-		background-image: -webkit-gradient(linear,0 0,0 100%,from(rgba(255,255,255,0.15)),to(rgba(255,255,255,0.05)));
-		background-image: -webkit-linear-gradient(top,rgba(255,255,255,0.15),rgba(255,255,255,0.05));
-		background-image: -o-linear-gradient(top,rgba(255,255,255,0.15),rgba(255,255,255,0.05));
-		background-image: linear-gradient(to bottom,rgba(255,255,255,0.15),rgba(255,255,255,0.05));
-		background-repeat: repeat-x;
-		filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#26ffffff', endColorstr='#0cffffff', GradientType=0);
 		font-size: 12px;
 		font-weight: bold;
 		color: #eee;
@@ -8009,17 +7999,14 @@ a.grid_true {
 	left: -16.5%;
 	width: 16.5%;
 	margin: -10px 0 0 -1px;
-	padding-top: 10px;
-	background: #fff;
-	background: -moz-linear-gradient(top,#ffffff 0%,#ededed 100%);
-	background: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#ffffff),color-stop(100%,#ededed));
-	background: -webkit-linear-gradient(top,#ffffff 0%,#ededed 100%);
-	background: -o-linear-gradient(top,#ffffff 0%,#ededed 100%);
-	background: -ms-linear-gradient(top,#ffffff 0%,#ededed 100%);
-	background: linear-gradient(top,#ffffff 0%,#ededed 100%);
-	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff',endColorstr='#ededed',GradientType=0);
-	border-right: 1px solid #d3d3d3;
-	border-bottom: 1px solid #d3d3d3;
+	padding-top: 28px;
+	padding-bottom: 10px;
+	background-color: #f5f5f5;
+	border-bottom: 1px solid #e3e3e3;
+	border-right: 1px solid #e3e3e3;
+	-webkit-border-radius: 0 0 4px 0;
+	-moz-border-radius: 0 0 4px 0;
+	border-radius: 0 0 4px 0;
 }
 .j-sidebar-container.j-sidebar-hidden {
 	left: -16.5%;
@@ -8027,33 +8014,23 @@ a.grid_true {
 .j-sidebar-container.j-sidebar-visible {
 	left: 0;
 }
-.j-toggle-sidebar-header {
-	color: #999;
-	margin: -11px 0 7px 0;
-	padding: 10px 0 10px 19px;
-	border-top: 1px solid #d3d3d3;
-	border-bottom: 1px solid #eee;
-}
-.sidebar {
-	padding: 3px 3px 3px 4px;
-}
 .j-sidebar-container .filter-select {
 	padding: 0 14px;
 }
 .j-toggle-button-wrapper {
 	position: absolute;
 	display: block;
-	margin-top: 11px;
+	top: 7px;
 	padding: 0;
 }
 .j-toggle-button-wrapper.j-toggle-hidden {
-	right: -20px;
+	right: -24px;
 }
 .j-toggle-button-wrapper.j-toggle-visible {
-	right: 10px;
+	right: 7px;
 }
 .j-toggle-sidebar-button {
-	font-size: 14px;
+	font-size: 16px;
 	color: #08c;
 	text-decoration: none;
 	cursor: pointer;
@@ -8081,7 +8058,7 @@ a.grid_true {
 }
 @media (max-width: 979px) {
 	.j-toggle-button-wrapper.j-toggle-hidden {
-		right: -16px;
+		right: -20px;
 	}
 }
 @media (max-width: 767px) {
@@ -8104,11 +8081,20 @@ a.grid_true {
 	.j-toggle-button-wrapper {
 		display: none;
 	}
+	.view-login select {
+		width: 232px;
+	}
 }
 @media (max-width: 420px) {
 	.j-sidebar-container {
 		margin: 0;
 	}
+	.view-login .input-medium {
+		width: 180px;
+	}
+	.view-login select {
+		width: 232px;
+	}
 }
 .break-word {
 	word-break: break-all;
@@ -8800,6 +8786,23 @@ a.grid_true {
 	background: url('../images/login-joomla.png') no-repeat;
 	margin-right: -12px;
 }
+.view-login .input-medium {
+	width: 169px;
+}
+.login .chzn-single {
+	width: 219px !important;
+}
+.login .chzn-container,
+.login .chzn-drop {
+	width: 227px !important;
+	max-width: 227px !important;
+}
+.login .input-prepend .chzn-container-single .chzn-single {
+	-webkit-border-radius: 3px 0 0 3px;
+	-moz-border-radius: 3px 0 0 3px;
+	border-radius: 3px 0 0 3px;
+	border-right: 0px;
+}
 .j-sidebar-container {
 	left: auto;
 	right: -16.5%;
@@ -8857,6 +8860,9 @@ a.grid_true {
 		margin-left: auto;
 		margin-right: 0;
 	}
+	.view-login select {
+		width: 229px;
+	}
 }
 #j-main-container.expanded {
 	margin-right: 0;
@@ -8873,3 +8879,23 @@ a.grid_true {
 .row-fluid .modal-batch [class*="span"] {
 	margin-right: 0;
 }
+@media (max-width: 480px) {
+	.btn-toolbar .btn-wrapper .btn {
+		width: 100% !important;
+		margin-right: 0px;
+	}
+	.btn-toolbar .btn-wrapper {
+		margin: 0 10px 5px 10px;
+	}
+}
+@media (max-width: 420px) {
+	.j-sidebar-container {
+		margin: 0;
+	}
+	.view-login .input-medium {
+		width: 173px;
+	}
+	.view-login select {
+		width: 229px;
+	}
+}
diff --git a/administrator/templates/isis/css/template.css b/administrator/templates/isis/css/template.css
index 2ace56f3842a5..33b66ca7aa563 100644
--- a/administrator/templates/isis/css/template.css
+++ b/administrator/templates/isis/css/template.css
@@ -6428,7 +6428,6 @@ dl.article-info dd.hits span[class*=" icon-"] {
 .icon-plus-2:before {
 	content: "\5d";
 }
-.icon-ban-circle:before,
 .icon-minus-sign:before,
 .icon-minus-2:before {
 	content: "\5e";
@@ -6455,6 +6454,7 @@ dl.article-info dd.hits span[class*=" icon-"] {
 .icon-not-ok:before {
 	content: "\4b";
 }
+.icon-ban-circle:before,
 .icon-minus-circle:before {
 	content: "\e216";
 }
@@ -6583,7 +6583,6 @@ dl.article-info dd.hits span[class*=" icon-"] {
 .icon-file-plus:before {
 	content: "\29";
 }
-.icon-file-remove:before,
 .icon-file-minus:before {
 	content: "\e017";
 }
@@ -7025,39 +7024,44 @@ a:focus {
 .view-login .navbar-fixed-bottom,
 .view-login .navbar-fixed-bottom a {
 	color: #FCFCFC;
-	text-shadow: 1px 1px 1px rgba(0,0,0,0.5);
+}
+.view-login .navbar-fixed-bottom.navbar-inverse,
+.view-login .navbar-fixed-bottom a.navbar-inverse {
+	color: #555;
 }
 .view-login .well {
 	padding-bottom: 0;
-	-webkit-box-shadow: 0px 0px 60px rgba(0, 0, 0, 0.5), 0px 1px 0px rgba(255, 255, 255, 0.9) inset;
-	-moz-box-shadow: 0px 0px 60px rgba(0, 0, 0, 0.5), 0px 1px 0px rgba(255, 255, 255, 0.9) inset;
-	box-shadow: 0px 0px 60px rgba(0, 0, 0, 0.5), 0px 1px 0px rgba(255, 255, 255, 0.9) inset;
 }
 .view-login .login-joomla {
 	position: absolute;
 	left: 50%;
 	height: 24px;
 	width: 24px;
-	text-indent: -9999px;
-	background: url('../images/login-joomla.png') no-repeat;
 	margin-left: -12px;
+	font-size: 24px;
+}
+.navbar-inverse .view-login .login-joomla {
+	background: url('../images/login-joomla-inverse.png') no-repeat;
 }
 .view-login .navbar-fixed-bottom {
 	position: absolute;
 }
 .view-login .input-medium {
-	width: 184px;
+	width: 176px;
 }
 .login .chzn-single {
-	width: 230px !important;
+	width: 222px !important;
 }
 .login .chzn-container,
 .login .chzn-drop {
-	width: 238px !important;
-	max-width: 238px !important;
+	width: 230px !important;
+	max-width: 230px !important;
 }
 .login .btn-large {
-	margin-top: 10px;
+	margin-top: 15px;
+}
+.login .form-inline .btn-group {
+	display: block;
 }
 .small {
 	font-size: 11px;
@@ -7074,12 +7078,20 @@ body .navbar-fixed-top {
 }
 .navbar-inner {
 	min-height: 0;
+	background: #f2f2f2;
+	background-image: none;
+	filter: none;
 }
 .navbar-inner .container-fluid {
 	padding-left: 10px;
 	padding-right: 10px;
 	font-size: 15px;
 }
+.navbar-inverse .navbar-inner {
+	background: #10223e;
+	background-image: none;
+	filter: none;
+}
 .navbar .navbar-text {
 	line-height: 30px;
 }
@@ -7111,27 +7123,27 @@ body .navbar-fixed-top {
 .navbar .nav-user {
 	font-size: 13px;
 }
+.navbar-fixed-top .navbar-inner,
+.navbar-static-top .navbar-inner {
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
+	box-shadow: none;
+}
+.navbar-fixed-bottom {
+	bottom: 0;
+}
+.navbar-fixed-bottom .navbar-inner {
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
+	box-shadow: none;
+}
 .header {
-	background-color: #184a7d;
-	background-image: -moz-linear-gradient(top,#17568c,#1a3867);
-	background-image: -webkit-gradient(linear,0 0,0 100%,from(#17568c),to(#1a3867));
-	background-image: -webkit-linear-gradient(top,#17568c,#1a3867);
-	background-image: -o-linear-gradient(top,#17568c,#1a3867);
-	background-image: linear-gradient(to bottom,#17568c,#1a3867);
-	background-repeat: repeat-x;
-	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff17568c', endColorstr='#ff1a3867', GradientType=0);
+	background-color: #1a3867;
 	border-top: 1px solid rgba(255,255,255,0.2);
 	padding: 5px 25px;
 }
 .navbar .btn-navbar {
 	background: #17568c;
-	background: -moz-linear-gradient(top,#17568c 0%,#1a3867 100%);
-	background: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#17568c),color-stop(100%,#1a3867));
-	background: -webkit-linear-gradient(top,#17568c 0%,#1a3867 100%);
-	background: -o-linear-gradient(top,#17568c 0%,#1a3867 100%);
-	background: -ms-linear-gradient(top,#17568c 0%,#1a3867 100%);
-	background: linear-gradient(top,#17568c 0%,#1a3867 100%);
-	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#17568c',endColorstr='#1a3867',GradientType=0);
 	border: 1px solid #0D2242;
 	margin-bottom: 2px;
 }
@@ -7172,7 +7184,6 @@ body .navbar-fixed-top {
 }
 .page-title {
 	color: white;
-	text-shadow: 1px 1px 1px rgba(0,0,0,0.8);
 	font-weight: normal;
 	font-size: 20px;
 	line-height: 36px;
@@ -7202,15 +7213,8 @@ body .navbar-fixed-top {
 	margin-top: 0;
 }
 .subhead {
-	background: #ffffff;
-	background: -moz-linear-gradient(top,#ffffff 0%,#ededed 100%);
-	background: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#ffffff),color-stop(100%,#ededed));
-	background: -webkit-linear-gradient(top,#ffffff 0%,#ededed 100%);
-	background: -o-linear-gradient(top,#ffffff 0%,#ededed 100%);
-	background: -ms-linear-gradient(top,#ffffff 0%,#ededed 100%);
-	background: linear-gradient(top,#ffffff 0%,#ededed 100%);
-	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff',endColorstr='#ededed',GradientType=0);
-	border-bottom: 1px solid #D3D3D3;
+	background: #f5f5f5;
+	border-bottom: 1px solid #e3e3e3;
 	color: #0C192E;
 	text-shadow: 0 1px 0 #FFF;
 	margin-bottom: 10px;
@@ -7235,9 +7239,6 @@ body .navbar-fixed-top {
 	width: 100%;
 	top: 30px;
 	z-index: 100;
-	-moz-box-shadow: 0px 2px 5px rgba(0,0,0,0.2);
-	-webkit-box-shadow: 0px 2px 5px rgba(0,0,0,0.2);
-	box-shadow: 0px 2px 5px rgba(0,0,0,0.2);
 }
 @media (max-width: 767px) {
 	.subhead {
@@ -7309,6 +7310,7 @@ h6 {
 }
 .sidebar-nav .nav-list > li.active > a {
 	color: #fff;
+	margin-right: -16px;
 }
 .quick-icons .nav li + .nav-header {
 	margin-top: 12px;
@@ -7526,19 +7528,14 @@ html[dir=rtl] .quick-icons .nav-list [class*=" icon-"] {
 	}
 	.btn-toolbar .btn-wrapper {
 		display: block;
-		margin-left: 0;
-		margin-bottom: 5px;
+		margin: 0px 10px 5px 10px;
 	}
 	.btn-toolbar .btn-wrapper .btn {
-		width: 95% !important;
-		margin-left: 10px;
-	}
-	.subhead-fixed {
-		box-shadow: 0 0 0 rgba(0,0,0,0.2);
+		width: 100% !important;
 	}
 	.subhead {
 		background: none repeat scroll 0 0 transparent;
-		border-bottom: 0 solid #D3D3D3;
+		border-bottom: 0 solid #e3e3e3;
 	}
 	.btn-group + .btn-group {
 		margin-left: 10px;
@@ -7556,7 +7553,7 @@ html[dir=rtl] .quick-icons .nav-list [class*=" icon-"] {
 		display: none;
 	}
 	.btn-toolbar .btn-wrapper .btn {
-		width: 93% !important;
+		width: 100% !important;
 	}
 }
 .nav-collapse .nav li a,
@@ -7601,13 +7598,6 @@ html[dir=rtl] .quick-icons .nav-list [class*=" icon-"] {
 	}
 	.nav-collapse .nav > li > a.dropdown-toggle {
 		background-color: rgba(255,255,255,0.07);
-		background-image: -moz-linear-gradient(top,rgba(255,255,255,0.15),rgba(255,255,255,0.05));
-		background-image: -webkit-gradient(linear,0 0,0 100%,from(rgba(255,255,255,0.15)),to(rgba(255,255,255,0.05)));
-		background-image: -webkit-linear-gradient(top,rgba(255,255,255,0.15),rgba(255,255,255,0.05));
-		background-image: -o-linear-gradient(top,rgba(255,255,255,0.15),rgba(255,255,255,0.05));
-		background-image: linear-gradient(to bottom,rgba(255,255,255,0.15),rgba(255,255,255,0.05));
-		background-repeat: repeat-x;
-		filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#26ffffff', endColorstr='#0cffffff', GradientType=0);
 		font-size: 12px;
 		font-weight: bold;
 		color: #eee;
@@ -8009,17 +7999,14 @@ a.grid_true {
 	left: -16.5%;
 	width: 16.5%;
 	margin: -10px 0 0 -1px;
-	padding-top: 10px;
-	background: #fff;
-	background: -moz-linear-gradient(top,#ffffff 0%,#ededed 100%);
-	background: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#ffffff),color-stop(100%,#ededed));
-	background: -webkit-linear-gradient(top,#ffffff 0%,#ededed 100%);
-	background: -o-linear-gradient(top,#ffffff 0%,#ededed 100%);
-	background: -ms-linear-gradient(top,#ffffff 0%,#ededed 100%);
-	background: linear-gradient(top,#ffffff 0%,#ededed 100%);
-	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff',endColorstr='#ededed',GradientType=0);
-	border-right: 1px solid #d3d3d3;
-	border-bottom: 1px solid #d3d3d3;
+	padding-top: 28px;
+	padding-bottom: 10px;
+	background-color: #f5f5f5;
+	border-bottom: 1px solid #e3e3e3;
+	border-right: 1px solid #e3e3e3;
+	-webkit-border-radius: 0 0 4px 0;
+	-moz-border-radius: 0 0 4px 0;
+	border-radius: 0 0 4px 0;
 }
 .j-sidebar-container.j-sidebar-hidden {
 	left: -16.5%;
@@ -8027,30 +8014,20 @@ a.grid_true {
 .j-sidebar-container.j-sidebar-visible {
 	left: 0;
 }
-.j-toggle-sidebar-header {
-	color: #999;
-	margin: -11px 0 7px 0;
-	padding: 10px 0 10px 19px;
-	border-top: 1px solid #d3d3d3;
-	border-bottom: 1px solid #eee;
-}
-.sidebar {
-	padding: 3px 3px 3px 4px;
-}
 .j-sidebar-container .filter-select {
 	padding: 0 14px;
 }
 .j-toggle-button-wrapper {
 	position: absolute;
 	display: block;
-	margin-top: 11px;
+	top: 7px;
 	padding: 0;
 }
 .j-toggle-button-wrapper.j-toggle-hidden {
 	right: -24px;
 }
 .j-toggle-button-wrapper.j-toggle-visible {
-	right: 10px;
+	right: 7px;
 }
 .j-toggle-sidebar-button {
 	font-size: 16px;
@@ -8104,11 +8081,20 @@ a.grid_true {
 	.j-toggle-button-wrapper {
 		display: none;
 	}
+	.view-login select {
+		width: 232px;
+	}
 }
 @media (max-width: 420px) {
 	.j-sidebar-container {
 		margin: 0;
 	}
+	.view-login .input-medium {
+		width: 180px;
+	}
+	.view-login select {
+		width: 232px;
+	}
 }
 .break-word {
 	word-break: break-all;
diff --git a/administrator/templates/isis/less/template-rtl.less b/administrator/templates/isis/less/template-rtl.less
index 9047b0303b6d0..e39d6f6e3b0f4 100644
--- a/administrator/templates/isis/less/template-rtl.less
+++ b/administrator/templates/isis/less/template-rtl.less
@@ -17,11 +17,13 @@
 		}
 	}
 }
+
 .container-logo {
 	padding-top: 0;
 	float: left;
 	text-align: left;
 }
+
 .page-title {
 	[class^="icon-"],
 	[class*=" icon-"] {
@@ -29,6 +31,7 @@
 		margin-left: 16px;
 	}
 }
+
 @media (max-width: 767px) {
 	.navbar {
 		.admin-logo {
@@ -46,9 +49,11 @@
 			margin-right: 0;
 		}
 	}
+
 	.nav-collapse .nav > li {
 		float: none;
 	}
+
 	.page-title {
 		[class^="icon-"],
 		[class*=" icon-"] {
@@ -56,14 +61,17 @@
 		}
 	}
 }
+
 /* Status module */
 #status .badge {
 	margin-left: 0;
 }
+
 /* Menus */
 .dropdown-menu > li > a {
 	text-align: right;
 }
+
 /* Dropdown toggle icon align */
 .btn-group > .btn + .dropdown-toggle {
 	float: none;
@@ -76,6 +84,7 @@ a.grid_false {
 	width: 16px;
 	background-image: url('../images/admin/publish_r.png');
 }
+
 a.grid_true {
 	display: inline-block;
 	height: 16px;
@@ -84,14 +93,33 @@ a.grid_true {
 }
 
 /* Login */
-.view-login .login-joomla {
-	position: absolute;
-	right: 50%;
-	height: 24px;
-	width: 24px;
-	text-indent: -9999px;
-	background: url('../images/login-joomla.png') no-repeat;
-	margin-right: -12px;
+.view-login {
+	.login-joomla {
+		position: absolute;
+		right: 50%;
+		height: 24px;
+		width: 24px;
+		text-indent: -9999px;
+		background: url('../images/login-joomla.png') no-repeat;
+		margin-right: -12px;
+	}
+	.input-medium {
+		width: 169px;
+	}
+}
+.login {
+	.chzn-single {
+		width: 219px !important;
+	}
+	.chzn-container,
+	.chzn-drop {
+		width: 227px !important;
+		max-width: 227px !important;
+	}
+	.input-prepend .chzn-container-single .chzn-single {
+		.border-radius(3px 0 0 3px);
+		border-right:0px;
+	}
 }
 
 /* For collapsible sidebar */
@@ -102,56 +130,75 @@ a.grid_true {
 	border-right: 0;
 	border-left: 1px solid #d3d3d3;
 }
+
 .j-sidebar-container.j-sidebar-hidden {
 	left: auto;
 	right: -16.5%;
 }
+
 .j-sidebar-container.j-sidebar-visible {
 	left: auto;
 	right: 0;
 }
+
 .j-toggle-sidebar-header {
 	padding: 10px 19px 10px 0;
 }
+
 .sidebar {
 	padding: 3px 4px 3px 3px;
 }
-.j-toggle-button-wrapper.j-toggle-hidden {
-	right: auto;
-	left: -24px;
-}
-.j-toggle-button-wrapper.j-toggle-visible {
-	right: auto;
-	left: 10px;
+
+.j-toggle-button-wrapper {
+	&.j-toggle-hidden {
+		right: auto;
+		left: -24px;
+	}
+	&.j-toggle-visible {
+		right: auto;
+		left: 10px;
+	}
 }
+
 #system-message-container,
 #j-main-container {
 	padding: 0 5px 0 0;
 }
+
 #system-message-container.j-toggle-main,
 #j-main-container.j-toggle-main,
 #system-debug.j-toggle-main {
 	float: left;
 }
+
 @media (max-width: 979px) {
 	.j-toggle-button-wrapper.j-toggle-hidden {
 		right: auto;
 		left: -20px;
 	}
 }
+
 @media (max-width: 767px) {
 	.j-sidebar-container {
 		border-right: 0;
 		border-left: 0;
 	}
+
 	.j-sidebar-container.j-sidebar-hidden {
 		margin-left: auto;
 		margin-right: 16.5%;
 	}
+
 	.j-sidebar-container.j-sidebar-visible {
 		margin-left: auto;
 		margin-right: 0;
 	}
+	/* login */
+	.view-login {
+		select {
+			width: 229px
+		}
+	}
 }
 
 #j-main-container.expanded {
@@ -160,14 +207,42 @@ a.grid_true {
 
 /* Modal batch */
 @media (min-width: 768px) {
-	.row-fluid [class*="span"]{
+	.row-fluid [class*="span"] {
 		margin-right: 15px;
 		margin-left: 0;
 	}
+
 	.row-fluid .modal-batch [class*="span"] {
 		margin-right: 0;
 	}
 }
+
 .row-fluid .modal-batch [class*="span"] {
 	margin-right: 0;
 }
+
+/* Extended Responsive Styles */
+@media (max-width: 480px) {
+	.btn-toolbar .btn-wrapper .btn {
+		width: 100% !important;
+		margin-right:0px;
+	}
+	.btn-toolbar .btn-wrapper {
+		margin:0 10px 5px 10px;
+	}
+}
+
+@media (max-width: 420px) {
+	.j-sidebar-container {
+		margin: 0;
+	}
+	/* login */
+	.view-login {
+		.input-medium {
+			width: 173px;
+		}
+		select {
+			width: 229px
+		}
+	}
+}
\ No newline at end of file
diff --git a/administrator/templates/isis/less/template.less b/administrator/templates/isis/less/template.less
index 2bd303c6748dc..34d150a57ae4f 100644
--- a/administrator/templates/isis/less/template.less
+++ b/administrator/templates/isis/less/template.less
@@ -1,45 +1,39 @@
 // CSS Reset
 @import "../../../../media/jui/less/reset.less";
-
 // Core variables and mixins
-@import "variables.less"; // Custom for this template
+@import "variables.less";
+// Custom for this template
 @import "../../../../media/jui/less/mixins.less";
-
 // Grid system and page structure
 @import "../../../../media/jui/less/scaffolding.less";
 @import "../../../../media/jui/less/grid.less";
 @import "../../../../media/jui/less/layouts.less";
-
 // Base CSS
 @import "../../../../media/jui/less/type.less";
 @import "../../../../media/jui/less/code.less";
 @import "../../../../media/jui/less/forms.less";
 @import "../../../../media/jui/less/tables.less";
-
 // Components: common
 // @import "../../../../media/jui/less/sprites.less";
 @import "../../../../media/jui/less/dropdowns.less";
 @import "../../../../media/jui/less/wells.less";
 @import "../../../../media/jui/less/component-animations.less";
 @import "../../../../media/jui/less/close.less";
-
 // Components: Buttons & Alerts
 @import "../../../../media/jui/less/buttons.less";
 @import "../../../../media/jui/less/button-groups.less";
-@import "../../../../media/jui/less/alerts.less"; // Note: alerts share common CSS with buttons and thus have styles in buttons.less
-
+@import "../../../../media/jui/less/alerts.less";
+// Note: alerts share common CSS with buttons and thus have styles in buttons.less
 // Components: Nav
 @import "../../../../media/jui/less/navs.less";
 @import "../../../../media/jui/less/navbar.less";
 @import "../../../../media/jui/less/breadcrumbs.less";
 @import "../../../../media/jui/less/pagination.less";
 @import "../../../../media/jui/less/pager.less";
-
 // Components: Popovers
 @import "../../../../media/jui/less/modals.less";
 @import "../../../../media/jui/less/tooltip.less";
 @import "../../../../media/jui/less/popovers.less";
-
 // Components: Misc
 @import "../../../../media/jui/less/thumbnails.less";
 @import "../../../../media/jui/less/labels-badges.less";
@@ -47,63 +41,53 @@
 @import "../../../../media/jui/less/accordion.less";
 @import "../../../../media/jui/less/carousel.less";
 @import "../../../../media/jui/less/hero-unit.less";
-
 // Utility classes
 @import "../../../../media/jui/less/utilities.less";
-
 // RESPONSIVE CLASSES
 // ------------------
-
 @import "../../../../media/jui/less/responsive-utilities.less";
-
-
 // MEDIA QUERIES
 // ------------------
-
 // Phones to portrait tablets and narrow desktops
 @import "../../../../media/jui/less/responsive-767px-max.less";
-
 // Tablets to regular desktops
 @import "../../../../media/jui/less/responsive-768px-979px.less";
-
 // Large desktops
 @import "../../../../media/jui/less/responsive-1200px-min.less";
-
-
 // RESPONSIVE NAVBAR
 // ------------------
-
 // From 979px and below, show a button to toggle navbar contents
 @import "../../../../media/jui/less/responsive-navbar.less";
-
 // Extended for JUI
-@import "../../../../media/jui/less/bootstrap-extended.less"; // Has to be last to override when necessary
+@import "../../../../media/jui/less/bootstrap-extended.less";
+// Has to be last to override when necessary
 // div.modal (instead of .modal)
 @import "../../../../media/jui/less/modals.joomla.less";
 @import "../../../../media/jui/less/responsive-767px-max.joomla.less";
-
 // Icon Font
 @import "icomoon.less";
-
 /* Body */
 html {
-    height: 100%;
+	height: 100%;
 }
+
 body {
-    height: 100%;
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
+	height: 100%;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
 }
+
 a:hover,
 a:active,
 a:focus {
 	outline: none;
 }
+
 /* Login */
-.view-login{
+.view-login {
 	padding-top: 0;
 
-	.container{
+	.container {
 		width: 300px;
 		position: absolute;
 		top: 50%;
@@ -111,72 +95,95 @@ a:focus {
 		margin-top: -206px;
 		margin-left: -150px;
 	}
-	.navbar-fixed-bottom{
+	.navbar-fixed-bottom {
 		padding-left: 20px;
 		padding-right: 20px;
 		text-align: center;
 	}
 	.navbar-fixed-bottom,
-	.navbar-fixed-bottom a{
+	.navbar-fixed-bottom a {
 		color: #FCFCFC;
-		text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
+		&.navbar-inverse {
+			color: @gray;
+		}
 	}
-	.well{
+	.well {
 		padding-bottom: 0;
-		.box-shadow(~"0px 0px 60px rgba(0, 0, 0, 0.5), 0px 1px 0px rgba(255, 255, 255, 0.9) inset");
 	}
-	.login-joomla{
+	.login-joomla {
 		position: absolute;
 		left: 50%;
 		height: 24px;
 		width: 24px;
-		text-indent: -9999px;
-		background: url('../images/login-joomla.png') no-repeat;
 		margin-left: -12px;
+		font-size:24px;
+		.navbar-inverse & {
+			background: url('../images/login-joomla-inverse.png') no-repeat;
+		}
 	}
-	.navbar-fixed-bottom{
+	.navbar-fixed-bottom {
 		position: absolute;
 	}
-	.input-medium{
-		width: 184px;
+	.input-medium {
+		width: 176px;
 	}
 }
+
 .login {
 	.chzn-single {
-		width: 230px !important;
+		width: 222px !important;
 	}
 	.chzn-container,
 	.chzn-drop {
-		width: 238px !important;
-		max-width: 238px !important;
+		width: 230px !important;
+		max-width: 230px !important;
 	}
 	.btn-large {
-		margin-top: 10px;
+		margin-top: 15px;
+	}
+	.form-inline .btn-group {
+		display:block;
 	}
 }
+
 /* Typography */
-.small{
+.small {
 	font-size: 11px;
 }
+
 .row-even .small,
 .row-odd .small,
 .row-even .small a,
-.row-odd .small a{
+.row-odd .small a {
 	color: #888;
 }
+
 /* Navbar */
 body .navbar,
-body .navbar-fixed-top{
+body .navbar-fixed-top {
 	margin-bottom: 0;
 }
-.navbar-inner{
+
+.navbar-inner {
 	min-height: 0;
+	background: @navbarBackground;
+	background-image: none;
+	filter: none;
 	.container-fluid {
 		padding-left: 10px;
 		padding-right: 10px;
 		font-size: 15px;
 	}
 }
+
+.navbar-inverse {
+	.navbar-inner {
+		background: @navbarInverseBackground;
+		background-image: none;
+		filter: none;
+	}
+}
+
 .navbar {
 	.navbar-text {
 		line-height: 30px;
@@ -210,67 +217,82 @@ body .navbar-fixed-top{
 		font-size: 13px;
 	}
 }
+
+.navbar-fixed-top,
+.navbar-static-top {
+	.navbar-inner {
+		.box-shadow(none);
+	}
+}
+
+// Fixed to bottom
+.navbar-fixed-bottom {
+	bottom: 0;
+	.navbar-inner {
+		.box-shadow(none);
+	}
+}
+
 /* Header */
-.header{
-	#gradient > .vertical(@headerBackgroundHighlight, @headerBackground);
+.header {
+	background-color: @headerBackground;
 	border-top: 1px solid rgba(255, 255, 255, 0.2);
 	padding: 5px 25px;
 }
-.navbar .btn-navbar{
-	background: #17568c; /* Old browsers */
-	background: -moz-linear-gradient(top,  #17568c 0%, #1a3867 100%); /* FF3.6+ */
-	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#17568c), color-stop(100%,#1a3867)); /* Chrome,Safari4+ */
-	background: -webkit-linear-gradient(top,  #17568c 0%,#1a3867 100%); /* Chrome10+,Safari5.1+ */
-	background: -o-linear-gradient(top,  #17568c 0%,#1a3867 100%); /* Opera 11.10+ */
-	background: -ms-linear-gradient(top,  #17568c 0%,#1a3867 100%); /* IE10+ */
-	background: linear-gradient(top,  #17568c 0%,#1a3867 100%); /* W3C */
-	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#17568c', endColorstr='#1a3867',GradientType=0 ); /* IE6-9 */
+
+.navbar .btn-navbar {
+	background: #17568c;
 	border: 1px solid #0D2242;
 	margin-bottom: 2px;
 }
+
 @media (max-width: 767px) {
-	.header{
+	.header {
 		padding: 4px 18px;
 		margin-left: -20px;
 		margin-right: -20px;
 	}
+
 	.navbar .admin-logo {
 		margin-left: 10px;
 		padding: 9px 9px 0 9px;
 	}
 }
-.header .navbar-search{
+
+.header .navbar-search {
 	margin-top: 0;
 }
+
 @media (max-width: 979px) {
-	.header .navbar-search{
+	.header .navbar-search {
 		border-top: 0;
-	    border-bottom: 0;
-	    -webkit-box-shadow: none;
-	    -moz-box-shadow: none;
-	    box-shadow: none;
+		border-bottom: 0;
+		.box-shadow(none);
 	}
 }
+
 /* Search Module */
-.navbar-search .search-query{
+.navbar-search .search-query {
 	background: rgba(255, 255, 255, 0.3);
 }
+
 /* Logo */
-.container-logo{
+.container-logo {
 	float: right;
 	text-align: right;
 }
-.logo{
+
+.logo {
 	width: 100%;
 	max-width: 143px;
 	height: auto;
 }
+
 /* Page Title */
-.page-title{
-	color:white;
-	text-shadow:1px 1px 1px rgba(0, 0, 0, 0.8);
-	font-weight:normal;
-	font-size:20px;
+.page-title {
+	color: white;
+	font-weight: normal;
+	font-size: 20px;
 	line-height: 36px;
 	margin: 0;
 	[class^="icon-"],
@@ -278,10 +300,12 @@ body .navbar-fixed-top{
 		margin-right: 16px;
 	}
 }
+
 @media (max-width: 767px) {
 	.container-logo {
 		display: none;
 	}
+
 	.page-title {
 		font-size: 18px;
 		line-height: 28px;
@@ -291,6 +315,7 @@ body .navbar-fixed-top{
 		}
 	}
 }
+
 /* Page Title in Content */
 .content-title {
 	font-size: 24px;
@@ -298,29 +323,26 @@ body .navbar-fixed-top{
 	line-height: 26px;
 	margin-top: 0;
 }
+
 /* Subhead */
-.subhead{
-	background: #ffffff; /* Old browsers */
-	background: -moz-linear-gradient(top,  #ffffff 0%, #ededed 100%); /* FF3.6+ */
-	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#ededed)); /* Chrome,Safari4+ */
-	background: -webkit-linear-gradient(top,  #ffffff 0%,#ededed 100%); /* Chrome10+,Safari5.1+ */
-	background: -o-linear-gradient(top,  #ffffff 0%,#ededed 100%); /* Opera 11.10+ */
-	background: -ms-linear-gradient(top,  #ffffff 0%,#ededed 100%); /* IE10+ */
-	background: linear-gradient(top,  #ffffff 0%,#ededed 100%); /* W3C */
-	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#ededed',GradientType=0 ); /* IE6-9 */
-	border-bottom: 1px solid #D3D3D3;
+.subhead {
+	background: @wellBackground;
+	border-bottom: 1px solid darken(@wellBackground, 7%);
 	color: #0C192E;
 	text-shadow: 0 1px 0 #FFF;
 	margin-bottom: 10px;
-	min-height:43px;
+	min-height: 43px;
 }
+
 .subhead-collapse {
 	margin-bottom: 11px;
 }
+
 .subhead-collapse.collapse {
 	height: auto;
 	overflow: visible;
 }
+
 .btn-toolbar {
 	margin-bottom: 5px;
 	.btn-wrapper {
@@ -328,143 +350,175 @@ body .navbar-fixed-top{
 		margin: 0 0 5px 5px;
 	}
 }
-.subhead-fixed{
+
+.subhead-fixed {
 	position: fixed;
 	width: 100%;
 	top: 30px;
 	z-index: 100;
-	-moz-box-shadow: 0px 2px 5px rgba(0, 0, 0, 0.2);
-	-webkit-box-shadow: 0px 2px 5px rgba(0, 0, 0, 0.2);
-	box-shadow: 0px 2px 5px rgba(0, 0, 0, 0.2);
 }
-
 @media (max-width: 767px) {
-	.subhead{
+	.subhead {
 		margin-left: -20px;
 		margin-right: -20px;
 		padding-left: 10px;
 		padding-right: 10px;
 	}
 }
-.subhead h1{
+
+.subhead h1 {
 	font-size: 17px;
 	font-weight: normal;
 	margin-left: 10px;
 	margin-top: 6px;
 }
+
 /* Toolbar */
-#toolbar .btn-success{
+#toolbar .btn-success {
 	width: 148px;
 }
+
 #toolbar #toolbar-options,
 #toolbar #toolbar-help {
 	float: right;
 }
+
 html[dir=rtl] #toolbar #toolbar-options,
 html[dir=rtl] #toolbar #toolbar-help {
 	float: left;
 }
+
 /* Content */
-.well .page-header{
+.well .page-header {
 	margin: -10px 0 18px 0;
 	padding-bottom: 5px;
 }
+
 .well .row-even p,
-.well .row-odd p{
+.well .row-odd p {
 	margin-bottom: 0;
 }
-
 /* Headings */
 
 h1, h2, h3, h4, h5, h6 {
-  margin: (@baseLineHeight / 1.5) 0;
+	margin: (@baseLineHeight / 1.5) 0;
+}
+
+h1 {
+	font-size: 26px;
+	line-height: 28px;
+}
+
+h2 {
+	font-size: 22px;
+	line-height: 24px;
+}
+
+h3 {
+	font-size: 18px;
+	line-height: 20px;
+}
+
+h4 {
+	font-size: 14px;
+	line-height: 16px;
+}
+
+h5 {
+	font-size: 13px;
+	line-height: 15px;
+}
+
+h6 {
+	font-size: 12px;
+	line-height: 14px;
 }
-h1 { font-size: 26px; line-height: 28px; }
-h2 { font-size: 22px; line-height: 24px; }
-h3 { font-size: 18px; line-height: 20px; }
-h4 { font-size: 14px; line-height: 16px; }
-h5 { font-size: 13px; line-height: 15px; }
-h6 { font-size: 12px; line-height: 14px; }
 
 /* Sidebar */
-.sidebar-nav .nav-list > li > a{
+.sidebar-nav .nav-list > li > a {
 	color: #555;
 }
-.sidebar-nav .nav-list > li.active > a{
+
+.sidebar-nav .nav-list > li.active > a {
 	color: #fff;
+	margin-right: -16px;
 }
-
 /* Quick-icons */
 .quick-icons .nav li + .nav-header {
-  margin-top: 12px;
-  margin-bottom: 2px;
+	margin-top: 12px;
+	margin-bottom: 2px;
 }
+
 .quick-icons .nav-list > li > a {
-  padding: 5px 15px;
+	padding: 5px 15px;
 }
+
 .quick-icons {
-  font-size: 14px;
-  margin-bottom: 20px;
+	font-size: 14px;
+	margin-bottom: 20px;
 }
+
 .quick-icons .nav-header, .well .module-title.nav-header {
-  font-size: 13px;
+	font-size: 13px;
 }
+
 .quick-icons h2.nav-header {
-  margin: 12px 0 5px;
+	margin: 12px 0 5px;
 }
+
 .quick-icons h2.nav-header:first-child {
-  margin: 0px 0 5px;
+	margin: 0px 0 5px;
 }
+
 .well .module-title.nav-header {
-  padding: 0px 15px 7px;
-  margin: 0px;
+	padding: 0px 15px 7px;
+	margin: 0px;
 }
+
 .quick-icons [class^="icon-"]:before, .quick-icons [class*=" icon-"]:before {
-  font-size: 16px;
-  margin-bottom: 20px;
-  line-height: 18px;
-}
-.quick-icons .nav-list [class^="icon-"],.quick-icons .nav-list [class*=" icon-"] {
-  margin-right: 9px;
+	font-size: 16px;
+	margin-bottom: 20px;
+	line-height: 18px;
 }
-html[dir=rtl] .quick-icons .nav-list [class^="icon-"],html[dir=rtl] .quick-icons .nav-list [class*=" icon-"] {
-  margin-left: 9px;
-  margin-right: 0px;
+
+.quick-icons .nav-list [class^="icon-"], .quick-icons .nav-list [class*=" icon-"] {
+	margin-right: 9px;
 }
 
+html[dir=rtl] .quick-icons .nav-list [class^="icon-"], html[dir=rtl] .quick-icons .nav-list [class*=" icon-"] {
+	margin-left: 9px;
+	margin-right: 0px;
+}
 /* Links */
 .j-links-separator {
-  margin: 20px 0px;
-  width: 100%;
-  height: 0px;
-  border-top: 2px solid #DDDDDD;
+	margin: 20px 0px;
+	width: 100%;
+	height: 0px;
+	border-top: 2px solid #DDDDDD;
 }
-
 /* Main Container & System Debug Padding */
 .container-main,
 #system-debug {
 	padding-bottom: 50px;
 }
-
 /* Status Module */
-#status{
+#status {
 	background: #EDEDED;
 	border-top: 1px solid #DDDDDD;
 	padding: 2px 10px 4px 10px;
 	.box-shadow(~"0px 1px 0px rgba(255, 255, 255, 0.8) inset, 0px -15px 15px rgba(255, 255, 255, 0.6)");
 	color: #999999;
 
-	.btn-toolbar,p{
+	.btn-toolbar, p {
 		margin: 0px;
 	}
 	.btn-toolbar, .btn-group {
 		font-size: 12px;
 	}
-	a{
+	a {
 		color: #999999;
 	}
 }
-
 /* Status Module in top position */
 #status.status-top {
 	background: @headerBackground;
@@ -473,45 +527,39 @@ html[dir=rtl] .quick-icons .nav-list [class^="icon-"],html[dir=rtl] .quick-icons
 	color: @navbarInverseText;
 	padding: 2px 20px 6px 20px;
 
-	a{
+	a {
 		color: @navbarInverseLinkColor;
 	}
 }
-
 /* Pagination in toolbar */
-.pagination-toolbar{
+.pagination-toolbar {
 	margin: 0;
 }
-.pagination-toolbar a{
+
+.pagination-toolbar a {
 	line-height: 26px;
 }
-
 /* Toolbar dropdown */
-.pull-right > .dropdown-menu{
+.pull-right > .dropdown-menu {
 	left: auto;
 	right: 0;
 }
-
 /* Disabled (generic) */
 .disabled {
 	cursor: default;
 	background-image: none;
-	opacity: 0.65;
-	filter: alpha(opacity=65);
-	-webkit-box-shadow: none;
-	-moz-box-shadow: none;
-	box-shadow: none;
+	.opacity(65);
+	.box-shadow(none);
 }
+
 /* Nav list filters */
-.nav-filters hr{
+.nav-filters hr {
 	margin: 5px 0;
 }
-
 /* Module Assignment Tab */
-#assignment.tab-pane{
+#assignment.tab-pane {
 	min-height: 500px;
 }
-
 // Button color
 .btn-primary.active,
 .btn-warning.active,
@@ -519,17 +567,15 @@ html[dir=rtl] .quick-icons .nav-list [class^="icon-"],html[dir=rtl] .quick-icons
 .btn-success.active,
 .btn-info.active,
 .btn-inverse.active {
-	color: rgba(255,255,255,.95);
+	color: rgba(255, 255, 255, .95);
 }
-
 /* Chosen Max Width */
 .chzn-container,
-.chzn-drop{
+.chzn-drop {
 	max-width: 100% !important;
 }
-
 @media (max-width: 979px) {
-	.navbar{
+	.navbar {
 		.nav {
 			font-size: 13px;
 			margin: 0 2px 0 0;
@@ -540,67 +586,77 @@ html[dir=rtl] .quick-icons .nav-list [class^="icon-"],html[dir=rtl] .quick-icons
 			}
 		}
 	}
+
 	.container-fluid {
 		padding-left: 10px;
 		padding-right: 10px;
 	}
 }
+
 @media (min-width: 768px) {
 	body {
 		padding-top: 30px;
 	}
+
 	body.component {
 		padding-top: 0;
 	}
-	.row-fluid [class*="span"]{
+
+	.row-fluid [class*="span"] {
 		margin-left: 15px;
 	}
+
 	.row-fluid .modal-batch [class*="span"] {
 		margin-left: 0;
 	}
+
 	.nav-collapse.collapse.in {
 		height: auto !important;
 	}
 }
+
 @media (max-width: 767px) {
-	.navbar-search.pull-right{
+	.navbar-search.pull-right {
 		float: none;
 		text-align: center;
 	}
-	.subhead-fixed{
+
+	.subhead-fixed {
 		position: static;
 		width: auto;
 	}
+
 	.container-fluid {
 		padding-left: 0;
 		padding-right: 0;
 	}
 }
+
 @media (min-width: 738px) {
 	body.component {
-			padding-top: 0;
+		padding-top: 0;
 	}
 }
+
 @media (max-width: 738px) {
-	.navbar{
+	.navbar {
 		.brand {
 			font-size: 16px;
 
 		}
 	}
 }
+
 /* Subhead (toolbar) Collapse Button */
-.btn-subhead{
+.btn-subhead {
 	display: none;
 }
-
 @media (min-width: 481px) {
 	#filter-bar {
 		// Fix for Firefox
 		height: 29px;
 	}
 }
-
 /* Extended Responsive Styles */
 @media (max-width: 480px) {
 	.table th:nth-of-type(n+5),
@@ -608,129 +664,149 @@ html[dir=rtl] .quick-icons .nav-list [class^="icon-"],html[dir=rtl] .quick-icons
 	.table th:nth-of-type(2),
 	.table td:nth-of-type(n+5),
 	.table td:nth-of-type(2),
-	.table td:nth-of-type(3){
+	.table td:nth-of-type(3) {
 		white-space: normal;
 	}
-	.pagination a{
+
+	.pagination a {
 		padding: 5px;
 	}
+
 	.btn-group.divider,
 	.header .row-fluid .span3,
 	.header .row-fluid .span7 {
 		display: none;
 	}
-	.navbar .btn{
+
+	.navbar .btn {
 		margin: 0;
 	}
-	.btn-subhead{
+
+	.btn-subhead {
 		display: block;
 		margin: 10px 0;
 	}
+
 	.chzn-container,
 	.chzn-container .chzn-results,
 	.chzn-container-single .chzn-drop {
 		width: 99% !important;
 	}
+
 	.subhead-collapse.collapse {
 		height: 0;
 		overflow: hidden;
 	}
+
 	.btn-toolbar .btn-wrapper {
 		display: block;
-		margin-left: 0;
-		margin-bottom: 5px;
+		margin:0px 10px 5px 10px;
 	}
+
 	.btn-toolbar .btn-wrapper .btn {
-		width: 95% !important;
-		margin-left: 10px;
-	}
-	.subhead-fixed {
-		box-shadow: 0 0 0 rgba(0, 0, 0, 0.2);
+		width: 100% !important;
 	}
+
 	.subhead {
 		background: none repeat scroll 0 0 transparent;
-		border-bottom: 0 solid #D3D3D3;
+		border-bottom: 0 solid darken(@wellBackground, 7%);
 	}
+
 	.btn-group + .btn-group {
-	  margin-left: 10px;
+		margin-left: 10px;
 	}
+
 	.login .chzn-single {
-	width: 222px !important;
+		width: 222px !important;
 	}
+
 	.login .chzn-container,
 	.login .chzn-drop {
 		width: 230px !important;
 	}
 }
 
-@media (max-width: 320px){
-	.view-login .navbar-fixed-bottom{
+@media (max-width: 320px) {
+	.view-login .navbar-fixed-bottom {
 		display: none;
 	}
+
 	.btn-toolbar .btn-wrapper .btn {
-	  width: 93% !important;
+	  width: 100% !important;
 	}
 }
-
 // Navbar
 .nav-collapse .nav li a,
 .dropdown-menu a {
 	background-image: none;
 }
+
 .nav-collapse .dropdown-menu > li > span {
 	display: block;
 	padding: 3px 20px;
 }
+
 @media (max-width: @navbarCollapseWidth) {
 	.navbar-fixed-top .navbar-inner,
 	.navbar-fixed-top .navbar-inner .container-fluid {
 		padding: 0;
 	}
+
 	.navbar .brand {
 		margin-top: 2px;
 		float: none;
 		text-align: center;
 	}
+
 	.navbar .btn-navbar {
 		margin-top: 3px;
 		margin-right: 3px;
 		margin-bottom: 3px;
 	}
+
 	.nav-collapse .nav .nav-header {
 		color: @white;
 	}
+
 	.nav-collapse .nav,
 	.navbar .nav-collapse .nav.pull-right {
 		margin: 0;
 	}
+
 	.nav-collapse .dropdown-menu {
 		margin: 0;
 	}
+
 	.nav-collapse .dropdown-menu > li > span {
 		display: block;
 		padding: 4px 15px;
 	}
+
 	.navbar-inverse .nav-collapse .dropdown-menu > li > span {
 		color: @navbarInverseLinkColor;
 	}
+
 	.nav-collapse .nav > li > a.dropdown-toggle {
-		#gradient > .vertical(rgba(255, 255, 255, 0.15), rgba(255, 255, 255, 0.05));
+		background-color: rgba(255, 255, 255, 0.07);
 		font-size: 12px;
 		font-weight: bold;
 		color: @grayLighter;
 		text-transform: uppercase;
 		padding-left: 15px;
 	}
+
 	.nav-collapse .nav li a {
 		margin-bottom: 0;
 		border-top: 1px solid rgba(255, 255, 255, 0.25);
 		border-bottom: 1px solid rgba(0, 0, 0, 0.5);
 	}
+
 	.nav-collapse .nav li ul li ul.dropdown-menu,
 	.nav-collapse .nav li ul li:hover ul.dropdown-menu,
 	.nav-collapse .caret {
 		display: none !important;
 	}
+
 	.nav-collapse .nav > li > a,
 	.nav-collapse .dropdown-menu a {
 		font-size: 15px;
@@ -738,30 +814,29 @@ html[dir=rtl] .quick-icons .nav-list [class^="icon-"],html[dir=rtl] .quick-icons
 		color: @white;
 		.border-radius(0);
 	}
+
 	.navbar .nav-collapse .nav > li > .dropdown-menu::before,
 	.navbar .nav-collapse .nav > li > .dropdown-menu::after,
 	.navbar .nav-collapse .dropdown-submenu > a::after {
 		display: none;
 	}
+
 	.nav-collapse .dropdown-menu li + li a {
 		margin-bottom: 0;
 	}
 }
-
 /* Sortable list*/
 .sortable-handler.inactive {
 	opacity: 0.3;
 	filter: alpha(opacity=30);
 }
-
 /* Joomla and Extension update message */
 .alert-joomlaupdate {
-  text-align: center;
-  button {
-    vertical-align: baseline;
-  }
+	text-align: center;
+	button {
+		vertical-align: baseline;
+	}
 }
-
 // Normalize LTR Label (JBS request)
 // --------------------------
 
@@ -783,6 +858,7 @@ html[dir=rtl] .quick-icons .nav-list [class^="icon-"],html[dir=rtl] .quick-icons
 		vertical-align: middle;
 	}
 }
+
 .form-vertical {
 	.control-label {
 		> label {
@@ -794,7 +870,6 @@ html[dir=rtl] .quick-icons .nav-list [class^="icon-"],html[dir=rtl] .quick-icons
 		margin-left: 0;
 	}
 }
-
 @media (max-width: 979px) {
 	.form-horizontal-desktop {
 		.control-label {
@@ -813,6 +888,7 @@ html[dir=rtl] .quick-icons .nav-list [class^="icon-"],html[dir=rtl] .quick-icons
 		}
 	}
 }
+
 @media (max-width: 1200px) {
 	.row-fluid .row-fluid .form-horizontal-desktop {
 		.control-label {
@@ -831,6 +907,7 @@ html[dir=rtl] .quick-icons .nav-list [class^="icon-"],html[dir=rtl] .quick-icons
 		}
 	}
 }
+
 .form-inline-header {
 	margin: 5px 0;
 	.control-group,
@@ -847,15 +924,14 @@ html[dir=rtl] .quick-icons .nav-list [class^="icon-"],html[dir=rtl] .quick-icons
 		padding-right: 20px;
 	}
 }
-
 /* Display checkboxes without bullets in list */
 fieldset.checkboxes input {
 	float: left;
 }
+
 fieldset.checkboxes li {
 	list-style: none;
 }
-
 /* Media Manager folder icon override */
 ul.manager .height-50 .icon-folder-2 {
 	height: 35px;
@@ -863,136 +939,142 @@ ul.manager .height-50 .icon-folder-2 {
 	line-height: 35px;
 	font-size: 30px;
 }
+
 /* Flash uploader */
 .upload-queue > li > span,
 .upload-queue > li > a {
 	margin: 0 2px;
 }
+
 .upload-queue .file-remove {
 	float: right;
 }
-
 /* z-index issues */
 .moor-box {
 	z-index: 3;
 }
+
 .admin .chzn-container .chzn-drop {
 	z-index: 1040;
 }
-
 /* Tree Select */
 ul.treeselect,
 ul.treeselect li {
 	margin: 0;
 	padding: 0;
 }
+
 ul.treeselect {
 	margin-top: 8px;
 }
+
 ul.treeselect li {
 	padding: 2px 10px 2px;
 	list-style: none;
 }
+
 ul.treeselect i.treeselect-toggle {
 	line-height: 18px;
 }
+
 ul.treeselect label {
 	font-size: 1em;
 	margin-left: 8px;
 }
+
 ul.treeselect label.nav-header {
 	padding: 0;
 }
+
 ul.treeselect input {
 	margin: 2px 0 0 8px;
 }
+
 ul.treeselect .treeselect-menu {
 	margin: 0 6px;
 }
+
 ul.treeselect ul.dropdown-menu {
 	margin: 0;
 }
+
 ul.treeselect ul.dropdown-menu li {
 	padding: 0 5px;
 	border: none;
 }
-
 /* Tables */
 td.has-context {
 	// Fixes difference in height between normal and hover on cell with context
 	height: 23px;
 }
-td.nowrap.has-context{
-  width:  45%;
-}
 
+td.nowrap.has-context {
+	width: 45%;
+}
 /* Item associations */
 .item-associations {
 	margin: 0;
 }
+
 .item-associations li {
 	list-style: none;
 	display: inline-block;
 	margin: 0 0 3px 0;
 }
+
 .item-associations li a {
 	color: #ffffff;
 }
-
 /* Content Languages flag */
 #flag img {
 	padding-top: 6px;
 	vertical-align: top;
 }
-
 /* Tweaking of tooltips */
 .tooltip {
 	max-width: 400px;
 }
+
 .tooltip-inner {
 	max-width: none;
 	text-align: left;
 	text-shadow: none;
 }
+
 th .tooltip-inner {
 	font-weight: normal;
 }
+
 .tooltip.hasimage {
 	opacity: 1;
 }
-
 /* Permissions dropdown display */
 #permissions-sliders .chzn-container {
 	position: absolute;
 }
-
 /* Component pop-up */
 .container-popup {
 	padding: 15px;
 }
-
 /* Min-width on buttons */
 .controls .btn-group > .btn {
 	min-width: 50px;
 }
+
 .controls .btn-group.btn-group-yesno > .btn {
 	min-width: 84px;
 	padding: 2px 12px;
 }
-
 .img-preview > img {
 	max-height: 100%;
 }
-
 /* Help site refresh button*/
 #helpsite-refresh {
 	vertical-align: top;
 }
-
 .alert-no-items {
 	margin-top: 20px;
 }
-
 @media (max-width: 767px) {
 	html[dir=rtl] #toolbar #toolbar-options,
 	html[dir=rtl] #toolbar #toolbar-help,
@@ -1001,20 +1083,17 @@ th .tooltip-inner {
 		float: none;
 	}
 }
-
 /* Title field */
 input.input-large-text {
 	font-size: 18px;
 	line-height: 22px;
 	height: auto;
 }
-
 /* Extension type labels */
 .info-labels {
 	margin-top: -5px;
 	margin-bottom: 10px;
 }
-
 /* Chosen color styles */
 [class^="chzn-color"].chzn-single,
 [class*=" chzn-color"].chzn-single,
@@ -1022,11 +1101,13 @@ input.input-large-text {
 [class*=" chzn-color"].chzn-single .chzn-single-with-drop {
 	.box-shadow(none);
 }
+
 .chzn-color.chzn-single[rel="value_1"],
 .chzn-color-reverse.chzn-single[rel="value_0"],
 .chzn-color-state.chzn-single[rel="value_1"] {
 	.buttonBackground(@btnSuccessBackground, @btnSuccessBackgroundHighlight);
 }
+
 .chzn-color.chzn-single[rel="value_0"],
 .chzn-color-reverse.chzn-single[rel="value_1"],
 .chzn-color-state.chzn-single[rel="value_0"],
@@ -1034,20 +1115,18 @@ input.input-large-text {
 .chzn-color-state.chzn-single[rel="value_-2"] {
 	.buttonBackground(@btnDangerBackground, @btnDangerBackgroundHighlight);
 }
-
 /* Widen the drop downs for the Permissions Field */
 #permissions-sliders .input-small {
 	width: 120px;
 }
-
 .editor {
 	overflow: hidden;
 	position: relative
 }
+
 .editor textarea.mce_editable {
 	box-sizing: border-box;
 }
-
 /* For grid.boolean */
 a.grid_false {
 	display: inline-block;
@@ -1055,13 +1134,13 @@ a.grid_false {
 	width: 16px;
 	background-image: url('../images/admin/publish_r.png');
 }
+
 a.grid_true {
 	display: inline-block;
 	height: 16px;
 	width: 16px;
 	background-image: url('../images/admin/icon-16-allow.png');
 }
-
 /* For collapsible sidebar */
 .j-sidebar-container {
 	position: absolute;
@@ -1069,81 +1148,70 @@ a.grid_true {
 	left: -16.5%;
 	width: 16.5%;
 	margin: -10px 0 0 -1px;
-	padding-top: 10px;
-	background: #fff;
-	background: -moz-linear-gradient(top,#ffffff 0%,#ededed 100%);
-	background: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#ffffff),color-stop(100%,#ededed));
-	background: -webkit-linear-gradient(top,#ffffff 0%,#ededed 100%);
-	background: -o-linear-gradient(top,#ffffff 0%,#ededed 100%);
-	background: -ms-linear-gradient(top,#ffffff 0%,#ededed 100%);
-	background: linear-gradient(top,#ffffff 0%,#ededed 100%);
-	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff',endColorstr='#ededed',GradientType=0);
-	border-right: 1px solid #d3d3d3;
-	border-bottom: 1px solid #d3d3d3;
-}
-.j-sidebar-container.j-sidebar-hidden {
-	left: -16.5%;
-}
-.j-sidebar-container.j-sidebar-visible {
-	left: 0;
-}
-.j-toggle-sidebar-header {
-	color: #999;
-	margin: -11px 0 7px 0;
-	padding: 10px 0 10px 19px;
-	border-top: 1px solid #d3d3d3;
-	border-bottom: 1px solid #eee;
-}
-.sidebar {
-	padding: 3px 3px 3px 4px;
-}
-.j-sidebar-container .filter-select {
-	padding: 0 14px;
+	padding-top: 28px;
+	padding-bottom: 10px;
+	background-color: @wellBackground;
+	border-bottom: 1px solid darken(@wellBackground, 7%);
+	border-right: 1px solid darken(@wellBackground, 7%);
+	.border-radius(0 0 @baseBorderRadius 0);
+	&.j-sidebar-hidden {
+		left: -16.5%;
+	}
+	&.j-sidebar-visible {
+		left: 0;
+	}
+	.filter-select {
+		padding: 0 14px;
+	}
 }
+
 .j-toggle-button-wrapper {
 	position: absolute;
 	display: block;
-	margin-top: 11px;
+	top: 7px;
 	padding: 0;
+	&.j-toggle-hidden {
+		right: -24px;
+	}
+	&.j-toggle-visible {
+		right: 7px;
+	}
 }
-.j-toggle-button-wrapper.j-toggle-hidden {
-	right: -24px;
-}
-.j-toggle-button-wrapper.j-toggle-visible {
-	right: 10px;
-}
+
 .j-toggle-sidebar-button {
 	font-size: 16px;
-	color: #08c;
+	color: @linkColor;
 	text-decoration: none;
 	cursor: pointer;
+	&:hover {
+		color: @linkColorHover;
+	}
 }
-.j-toggle-sidebar-button:hover {
-	color: #005580;
-}
+
 #system-message-container,
 #j-main-container {
 	padding: 0 0 0 5px;
 	min-height: 0;
 }
+
 #system-message-container.j-toggle-main,
 #j-main-container.j-toggle-main,
 #system-debug.j-toggle-main {
 	float: right;
 }
+
 @media (min-width: 768px) {
 	.j-toggle-transition {
-		-webkit-transition: all 0.3s ease;
-		-moz-transition: all 0.3s ease;
-		-o-transition: all 0.3s ease;
-		transition: all 0.3s ease;
+		.transition(all 0.3s ease);
 	}
 }
+
 @media (max-width: 979px) {
 	.j-toggle-button-wrapper.j-toggle-hidden {
 		right: -20px;
 	}
 }
+
 @media (max-width: 767px) {
 	.j-sidebar-container {
 		position: relative;
@@ -1154,33 +1222,54 @@ a.grid_true {
 		border-right: 0;
 		border-bottom: 0;
 	}
+
 	.j-sidebar-container.j-sidebar-hidden {
 		margin-left: 16.5%;
 	}
+
 	.j-sidebar-container.j-sidebar-visible {
 		margin-left: 0;
 	}
+
 	.j-toggle-sidebar-header,
 	.j-toggle-button-wrapper {
 		display: none;
 	}
+	.view-login {
+		select {
+			width: 232px;
+		}
+	}
 }
+
 @media (max-width: 420px) {
 	.j-sidebar-container {
 		margin: 0;
 	}
+	.view-login {
+		.input-medium {
+			width: 180px;
+		}
+		select {
+			width: 232px
+		}
+	}
 }
+
 .break-word {
 	word-break: break-all;
 	word-wrap: break-word;
 }
+
 /* Customize Textarea Resizing */
 textarea {
-	resize:both;
+	resize: both;
 }
+
 textarea.vert {
-	resize:vertical;
+	resize: vertical;
 }
+
 textarea.noResize {
-	resize:none;
+	resize: none;
 }
diff --git a/administrator/templates/isis/login.php b/administrator/templates/isis/login.php
index 59123c6314529..9a613e2a1f70c 100644
--- a/administrator/templates/isis/login.php
+++ b/administrator/templates/isis/login.php
@@ -17,12 +17,14 @@
 $headerColor   = $this->params->get('headerColor', '#184A7D');
 $templateColor = $this->params->get('templateColor', '#13294A');
 
+$template_is_light = ($this->params->get('templateColor') && colorIsLight($this->params->get('templateColor')));
+
 // Add JavaScript Frameworks
 JHtml::_('bootstrap.framework');
 JHtml::_('bootstrap.tooltip');
 
 // Add Stylesheets
-$doc->addStyleSheet($this->baseurl . '/templates/' . $this->template . '/css/template.css');
+$doc->addStyleSheetVersion($this->baseurl . '/templates/' . $this->template . '/css/template' . ($this->direction == 'rtl' ? '-rtl' : '') . '.css');
 
 // Load optional RTL Bootstrap CSS
 JHtml::_('bootstrap.loadCss', false, $this->direction);
@@ -43,6 +45,15 @@
 $itemid   = $app->input->getCmd('Itemid', '');
 $sitename = $app->get('sitename');
 
+function colorIsLight($color)
+{
+	$r = hexdec(substr($color, 1, 2));
+	$g = hexdec(substr($color, 3, 2));
+	$b = hexdec(substr($color, 5, 2));
+	$yiq = (($r * 299) + ($g * 587) + ($b * 114)) / 1000;
+
+	return $yiq >= 200;
+}
 ?>
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->language; ?>" lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>" >
@@ -58,11 +69,6 @@
 	<style type="text/css">
 		.view-login {
 			background-color: <?php echo $templateColor; ?>;
-			background-image: -webkit-gradient(radial,center center,0,center center,460,from(<?php echo $headerColor; ?>),to(<?php echo $templateColor; ?>));
-			background-image: -webkit-radial-gradient(circle,<?php echo $headerColor; ?>,<?php echo $templateColor; ?>);
-			background-image: -moz-radial-gradient(circle,<?php echo $headerColor; ?>,<?php echo $templateColor; ?>);
-			background-image: -o-radial-gradient(circle,<?php echo $headerColor; ?>,<?php echo $templateColor; ?>);
-			background-repeat: no-repeat;
 		}
 		/* Responsive Styles */
 		@media (max-width: 480px) {
@@ -113,11 +119,11 @@
 			<!-- End Content -->
 		</div>
 	</div>
-	<div class="navbar navbar-fixed-bottom hidden-phone">
+	<div class="navbar<?php echo $template_is_light ? ' navbar-inverse' : ''; ?> navbar-fixed-bottom hidden-phone">
 		<p class="pull-right">
 			&copy; <?php echo date('Y'); ?> <?php echo $sitename; ?>
 		</p>
-		<a class="login-joomla hasTooltip" href="http://www.joomla.org" target="_blank" title="<?php echo JHtml::tooltipText('TPL_ISIS_ISFREESOFTWARE'); ?>">Joomla!&#174;</a>
+		<a class="login-joomla hasTooltip" href="http://www.joomla.org" target="_blank" title="<?php echo JHtml::tooltipText('TPL_ISIS_ISFREESOFTWARE'); ?>"><i class="icon-joomla"></i></a>
 		<a href="<?php echo JUri::root(); ?>" target="_blank" class="pull-left"><i class="icon-out-2"></i> <?php echo JText::_('COM_LOGIN_RETURN_TO_SITE_HOME_PAGE'); ?></a>
 	</div>
 	<jdoc:include type="modules" name="debug" style="none" />