diff --git a/boot.php b/boot.php
index 06813099f..4ed5d34c4 100755
--- a/boot.php
+++ b/boot.php
@@ -1553,7 +1553,7 @@ function login($register = false, $form_id = 'main-login', $hiddens=false) {
 		'$form_id'      => $form_id,
 		'$lname'        => array('username', t('Email') , '', ''),
 		'$lpassword'    => array('password', t('Password'), '', ''),
-		'$remember'     => array('remember', t('Remember me'), '', ''),
+		'$remember'     => array('remember', t('Remember me'), '', '',array(t('No'),t('Yes'))),
 		'$hiddens'      => $hiddens,
 		'$register'     => $reg,
 		'$lostpass'     => t('Forgot your password?'),
@@ -2339,4 +2339,4 @@ function check_cron_broken() {
 		. 'Content-transfer-encoding: 8bit' );
 	set_config('system','lastpollcheck',datetime_convert());
 	return;
-}
\ No newline at end of file
+}
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index a27de499f..787deb6ea 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -81,7 +81,11 @@ a.btn-default {
 	color: #333;
 }
 
-a.btn-success {
+a.btn-success,
+a.btn-danger,
+a.btn-info,
+a.btn-warning,
+a.btn-primary {
 	color: #fff;
 }
 
@@ -111,8 +115,8 @@ input[type="submit"] {
 	padding: 6px 12px;
 }
 
-button, input, optgroup, select, textarea {
-	color: #000;
+input, optgroup, select, textarea {
+	color: #333;
 }
 
 pre code {
@@ -2331,5 +2335,5 @@ aside .nav > li > a:hover, aside .nav > li > a:focus {
 
 .field.checkbox > div > input:checked + label .onoffswitch-switch {
     right: 0px;
-    background-color: $link_colour;
+    background-color: #337AB7;
 }
diff --git a/view/tpl/login.tpl b/view/tpl/login.tpl
index 7bde90c23..9472bd961 100755
--- a/view/tpl/login.tpl
+++ b/view/tpl/login.tpl
@@ -1,29 +1,19 @@
 <form action="{{$dest_url}}" id="{{$form_id}}" method="post" >
 	<input type="hidden" name="auth-params" value="login" />
 	<div id="login-main">
-		<div id="login_standard">
-		{{include file="field_input.tpl" field=$lname}}
-		{{include file="field_password.tpl" field=$lpassword}}
+		<div id="login-input" class="form-group">
+			{{include file="field_input.tpl" field=$lname}}
+			{{include file="field_password.tpl" field=$lpassword}}
+			{{include file="field_checkbox.tpl" field=$remember}}
+			<button type="submit" name="submit" class="btn btn-block btn-primary">{{$login}}</button>
 		</div>
-	
 		<div id="login-extra-links">
-			{{if $register}}<a href="{{$register.link}}" title="{{$register.title}}" id="register-link">{{$register.desc}}</a>&nbsp;|{{/if}}
+			{{if $register}}<a href="{{$register.link}}" title="{{$register.title}}" id="register-link" class="pull-right">{{$register.desc}}</a>{{/if}}
 			<a href="lostpass" title="{{$lostpass}}" id="lost-password-link" >{{$lostlink}}</a>
 		</div>
-		<div class="clear"></div>
-
-		{{include file="field_checkbox.tpl" field=$remember}}
-	
-		<div class="clear"></div>
-
-		<div id="login-submit-wrapper" >
-			<input type="submit" name="submit" id="login-submit-button" class="btn btn-default" value="{{$login}}" />
-		</div>
 	</div>
-
 	{{foreach $hiddens as $k=>$v}}
 		<input type="hidden" name="{{$k}}" value="{{$v}}" />
 	{{/foreach}}
 </form>
-
 <script type="text/javascript"> $(document).ready(function() { $("#id_{{$lname.0}}").focus();} );</script>
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index 02937e4b2..6ad23b007 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -1,6 +1,6 @@
 <div class="generic-content-wrapper">
 	<div class="section-title-wrapper">
-		<button title="{{$permanent}}" class="btn btn-danger btn-xs pull-right" type="submit" formaction="removeme"><i class="icon-trash"></i>&nbsp;{{$removeme}}</button>
+		<a title="{{$permanent}}" class="btn btn-danger btn-xs pull-right" href="removeme"><i class="icon-trash"></i>&nbsp;{{$removeme}}</a>
 		<h2>{{$ptitle}}</h2>
 		<div class="clear"></div>
 	</div>