diff --git a/README.md b/README.md
index 940312549d..027c1a664b 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra
 
 ![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true)
 
-##### Current version: 0.9.10
+##### Current version: 0.9.11
 
 | Web | UI  | Preview  |
 |:-------------:|:-------:|:-------:|
diff --git a/gogs.go b/gogs.go
index 1906c176aa..bca4719f1b 100644
--- a/gogs.go
+++ b/gogs.go
@@ -17,7 +17,7 @@ import (
 	"github.com/gogits/gogs/modules/setting"
 )
 
-const APP_VER = "0.9.10.0315"
+const APP_VER = "0.9.11.0316"
 
 func init() {
 	runtime.GOMAXPROCS(runtime.NumCPU())
diff --git a/public/css/gogs.css b/public/css/gogs.css
index 7c7ea83c63..7f71924b15 100644
--- a/public/css/gogs.css
+++ b/public/css/gogs.css
@@ -1140,6 +1140,7 @@ footer .container .links > *:first-child {
   border-bottom: none;
 }
 .repository .filter.menu .label.color {
+  border-radius: 3px;
   margin-left: 15px;
   padding: 0 8px;
 }
diff --git a/public/less/_repository.less b/public/less/_repository.less
index 88df107e6e..c2b90fa93b 100644
--- a/public/less/_repository.less
+++ b/public/less/_repository.less
@@ -80,6 +80,7 @@
 	}
 	.filter.menu {
 		.label.color {
+			border-radius: 3px;
 			margin-left: 15px;
 			padding: 0 8px;
 		}
diff --git a/templates/.VERSION b/templates/.VERSION
index 466fc8e076..80cb769f90 100644
--- a/templates/.VERSION
+++ b/templates/.VERSION
@@ -1 +1 @@
-0.9.10.0315
\ No newline at end of file
+0.9.11.0316
\ No newline at end of file
diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl
index 30687a2bb8..e5c3d3d42d 100644
--- a/templates/repo/issue/view_content.tmpl
+++ b/templates/repo/issue/view_content.tmpl
@@ -246,7 +246,10 @@
 			<div class="ui labels list">
 				<span class="no-select item {{if .HasSelectedLabel}}hide{{end}}">{{.i18n.Tr "repo.issues.new.no_label"}}</span>
 				{{range .Labels}}
-					<a class="{{if not .IsChecked}}hide{{end}} item" id="label_{{.ID}}" href="{{$.RepoLink}}/issues?labels={{.ID}}"><span class="label color" style="background-color: {{.Color}}"></span> <span class="text">{{.Name}}</span></a>
+					<div class="item">
+						<a class="ui label {{if not .IsChecked}}hide{{end}}" id="label_{{.ID}}" href="{{$.RepoLink}}/issues?labels={{.ID}}" style="color: {{.ForegroundColor}}; background-color: {{.Color}}">{{.Name}}</a>
+					</div>
+					
 				{{end}}
 			</div>
 
diff --git a/templates/repo/settings/githook_edit.tmpl b/templates/repo/settings/githook_edit.tmpl
index 22c278fe4f..d139fd3f3e 100644
--- a/templates/repo/settings/githook_edit.tmpl
+++ b/templates/repo/settings/githook_edit.tmpl
@@ -20,7 +20,7 @@
 							</div>
 							<div class="field">
 								<label for="content">{{$.i18n.Tr "repo.settings.githook_content"}}</label>
-								<textarea id="content" name="content" rows="20" wrap="off">{{if .IsActive}}{{.Content}}{{else}}{{.Sample}}{{end}}</textarea>
+								<textarea id="content" name="content" rows="20" wrap="off" autofocus>{{if .IsActive}}{{.Content}}{{else}}{{.Sample}}{{end}}</textarea>
 							</div>
 
 							<div class="inline field">