diff --git a/roles/git/files/home/gitea/custom/templates/base/footer_content.tmpl b/roles/git/files/home/gitea/custom/templates/base/footer_content.tmpl
index c2054ed..3a76b4b 100644
--- a/roles/git/files/home/gitea/custom/templates/base/footer_content.tmpl
+++ b/roles/git/files/home/gitea/custom/templates/base/footer_content.tmpl
@@ -1,3 +1,6 @@
+{{/* Template last updated based on:
+     commit: 5b1d0a7701f94f2292ebdfc6c542b91fd906e6ea
+     date:   2021-07-12 */}}
 <footer>
 	<div class="ui container">
 		<div class="ui left">
@@ -8,11 +11,11 @@
 				<a target="_blank" rel="noopener noreferrer" href="https://github.com/go-gitea/gitea"><i class="fa fa-github-square"></i><span class="sr-only">GitHub</span></a>
 			{{end}}
 			<div class="ui language bottom floating slide up dropdown link item">
-				<i class="world icon"></i>
+				{{svg "octicon-globe"}}
 				<div class="text">{{.LangName}}</div>
-				<div class="menu">
+				<div class="menu language-menu">
 					{{range .AllLangs}}
-						<a lang="{{.Lang}}" class="item {{if eq $.Lang .Lang}}active selected{{end}}" href="{{if eq $.Lang .Lang}}#{{else}}{{$.Link}}?lang={{.Lang}}{{end}}">{{.Name}}</a>
+						<a lang="{{.Lang}}" data-url="{{AppSubUrl}}/?lang={{.Lang}}" class="item {{if eq $.Lang .Lang}}active selected{{end}}">{{.Name}}</a>
 					{{end}}
 				</div>
 			</div>
diff --git a/roles/git/files/home/gitea/custom/templates/base/head_navbar.tmpl b/roles/git/files/home/gitea/custom/templates/base/head_navbar.tmpl
index e52b089..2131e80 100644
--- a/roles/git/files/home/gitea/custom/templates/base/head_navbar.tmpl
+++ b/roles/git/files/home/gitea/custom/templates/base/head_navbar.tmpl
@@ -1,7 +1,10 @@
+{{/* Template last updated based on:
+     commit: 5b1d0a7701f94f2292ebdfc6c542b91fd906e6ea
+     date:   2021-07-12 */}}
 <div class="ui container" id="navbar">
 	<div class="item brand" style="justify-content: space-between;">
 		<a href="{{AppSubUrl}}/">
-			<img class="ui mini image" src="{{StaticUrlPrefix}}/img/codesignd.svg">
+			<img class="ui mini image" width="30" height="30" src="{{StaticUrlPrefix}}/img/codesignd.svg">
 		</a>
 		<div class="ui basic icon button mobile-only" id="navbar-expand-toggle">
 			<i class="sidebar icon"></i>
@@ -33,11 +36,11 @@
 
 	{{template "custom/extra_links" .}}
 
-	{{/*
+	{{/* TODO
 		<div class="item">
 		<div class="ui icon input">
 		<input class="searchbox" type="text" placeholder="{{.i18n.Tr "search_project"}}">
-		<i class="search icon"></i>
+		<i class="icon df ac jc">{{svg "octicon-search" 16}}</i>
 		</div>
 		</div>
 	*/}}
@@ -47,10 +50,10 @@
 		<div class="right stackable menu">
 			<div class="ui dropdown jump item poping up" tabindex="-1" data-content="{{.i18n.Tr "user_profile_and_more"}}" data-variation="tiny inverted">
 				<span class="text">
-					<img class="ui tiny avatar image" width="24" height="24" src="{{.SignedUser.RelAvatarLink}}">
+					{{avatar .SignedUser 24 "tiny"}}
 					<span class="sr-only">{{.i18n.Tr "user_profile_and_more"}}</span>
 					<span class="mobile-only">{{.SignedUser.Name}}</span>
-					<span class="fitted not-mobile" tabindex="-1">{{svg "octicon-triangle-down" 16}}</span>
+					<span class="fitted not-mobile" tabindex="-1">{{svg "octicon-triangle-down"}}</span>
 				</span>
 				<div class="menu user-menu" tabindex="-1">
 					<div class="ui header">
@@ -59,7 +62,7 @@
 
 					<div class="divider"></div>
 					<a class="item link-action" href data-url="{{AppSubUrl}}/user/logout" data-redirect="{{AppSubUrl}}/">
-						{{svg "octicon-sign-out" 16}}
+						{{svg "octicon-sign-out"}}
 						{{.i18n.Tr "sign_out"}}<!-- Sign Out -->
 					</a>
 				</div><!-- end content avatar menu -->
@@ -67,9 +70,47 @@
 		</div>
 	{{else if .IsSigned}}
 		<div class="right stackable menu">
+			{{$issueURL := Printf "%s/%s/issues/%d" AppSubUrl .ActiveStopwatch.RepoSlug .ActiveStopwatch.IssueIndex}}
+ 			<a class="active-stopwatch-trigger item ui label {{if not .ActiveStopwatch}}hidden{{end}}" href="{{$issueURL}}">
+ 				<span class="text">
+ 					<span class="fitted item">
+ 						{{svg "octicon-stopwatch"}}
+ 						<span class="red" style="position:absolute; right:-0.6em; top:-0.6em;">{{svg "octicon-dot-fill"}}</span>
+ 					</span>
+ 					<span class="sr-mobile-only">{{.i18n.Tr "active_stopwatch"}}</span>
+ 				</span>
+ 			</a>
+ 			<div class="ui popup very wide">
+ 				<div class="df ac">
+ 					<a class="stopwatch-link df ac" href="{{$issueURL}}">
+ 						{{svg "octicon-issue-opened"}}
+ 						<span class="stopwatch-issue">{{.ActiveStopwatch.RepoSlug}}#{{.ActiveStopwatch.IssueIndex}}</span>
+ 						<span class="ui label blue stopwatch-time my-0 mx-4" data-seconds="{{.ActiveStopwatch.Seconds}}">
+ 							{{if .ActiveStopwatch}}{{Sec2Time .ActiveStopwatch.Seconds}}{{end}}
+ 						</span>
+ 					</a>
+ 					<form class="stopwatch-commit" method="POST" action="{{$issueURL}}/times/stopwatch/toggle">
+ 						{{.CsrfTokenHtml}}
+ 						<button
+ 							class="ui button mini compact basic icon fitted poping up"
+ 							data-content="{{.i18n.Tr "repo.issues.stop_tracking"}}"
+ 							data-position="top right" data-variation="small inverted"
+ 						>{{svg "octicon-square-fill"}}</button>
+ 					</form>
+ 					<form class="stopwatch-cancel" method="POST" action="{{$issueURL}}/times/stopwatch/cancel">
+ 						{{.CsrfTokenHtml}}
+ 						<button
+ 							class="ui button mini compact basic icon fitted poping up"
+ 							data-content="{{.i18n.Tr "repo.issues.cancel_tracking"}}"
+ 							data-position="top right" data-variation="small inverted"
+ 						>{{svg "octicon-trash"}}</button>
+ 					</form>
+ 				</div>
+ 			</div>
+
 			<a href="{{AppSubUrl}}/notifications" class="item poping up" data-content='{{.i18n.Tr "notifications"}}' data-variation="tiny inverted">
 				<span class="text">
-					<span class="fitted">{{svg "octicon-bell" 16}}</span>
+					<span class="fitted">{{svg "octicon-bell"}}</span>
 					<span class="sr-mobile-only">{{.i18n.Tr "notifications"}}</span>
 					{{$notificationUnreadCount := 0}}
 					{{if .NotificationUnreadCount}}{{$notificationUnreadCount = call .NotificationUnreadCount}}{{end}}
@@ -81,20 +122,22 @@
 
 			<div class="ui dropdown jump item poping up" data-content="{{.i18n.Tr "create_new"}}" data-variation="tiny inverted">
 				<span class="text">
-					<span class="fitted">{{svg "octicon-plus" 16}}</span>
+					<span class="fitted">{{svg "octicon-plus"}}</span>
 					<span class="sr-mobile-only">{{.i18n.Tr "create_new"}}</span>
-					<span class="fitted not-mobile">{{svg "octicon-triangle-down" 16}}</span>
+					<span class="fitted not-mobile">{{svg "octicon-triangle-down"}}</span>
 				</span>
 				<div class="menu">
 					<a class="item" href="{{AppSubUrl}}/repo/create">
-						<span class="fitted">{{svg "octicon-plus" 16}}</span> {{.i18n.Tr "new_repo"}}
-					</a>
-					<a class="item" href="{{AppSubUrl}}/repo/migrate">
-						<span class="fitted">{{svg "octicon-repo-clone" 16}}</span> {{.i18n.Tr "new_migrate"}}
+						<span class="fitted">{{svg "octicon-plus"}}</span> {{.i18n.Tr "new_repo"}}
 					</a>
+					{{if not .DisableMigrations}}
+ 						<a class="item" href="{{AppSubUrl}}/repo/migrate">
+ 							<span class="fitted">{{svg "octicon-repo-push"}}</span> {{.i18n.Tr "new_migrate"}}
+ 						</a>
+ 					{{end}}
 					{{if .SignedUser.CanCreateOrganization}}
 					<a class="item" href="{{AppSubUrl}}/org/create">
-						<span class="fitted">{{svg "octicon-organization" 16}}</span> {{.i18n.Tr "new_org"}}
+						<span class="fitted">{{svg "octicon-organization"}}</span> {{.i18n.Tr "new_org"}}
 					</a>
 					{{end}}
 				</div><!-- end content create new menu -->
@@ -102,10 +145,10 @@
 
 			<div class="ui dropdown jump item poping up" tabindex="-1" data-content="{{.i18n.Tr "user_profile_and_more"}}" data-variation="tiny inverted">
 				<span class="text">
-					<img class="ui tiny avatar image" width="24" height="24" src="{{.SignedUser.RelAvatarLink}}">
+					{{avatar .SignedUser 24 "tiny"}}
 					<span class="sr-only">{{.i18n.Tr "user_profile_and_more"}}</span>
 					<span class="mobile-only">{{.SignedUser.Name}}</span>
-					<span class="fitted not-mobile" tabindex="-1">{{svg "octicon-triangle-down" 16}}</span>
+					<span class="fitted not-mobile" tabindex="-1">{{svg "octicon-triangle-down"}}</span>
 				</span>
 				<div class="menu user-menu" tabindex="-1">
 					<div class="ui header">
@@ -114,33 +157,35 @@
 
 					<div class="divider"></div>
 					<a class="item" href="{{AppSubUrl}}/{{.SignedUser.Name}}">
-						{{svg "octicon-person" 16}}
+						{{svg "octicon-person"}}
 						{{.i18n.Tr "your_profile"}}<!-- Your profile -->
 					</a>
-					<a class="item" href="{{AppSubUrl}}/{{.SignedUser.Name}}?tab=stars">
-						{{svg "octicon-star" 16}}
-						{{.i18n.Tr "your_starred"}}
-					</a>
+					{{if not .DisableStars}}
+ 						<a class="item" href="{{AppSubUrl}}/{{.SignedUser.Name}}?tab=stars">
+ 							{{svg "octicon-star"}}
+ 							{{.i18n.Tr "your_starred"}}
+ 						</a>
+ 					{{end}}
 					<a class="{{if .PageIsUserSettings}}active{{end}} item" href="{{AppSubUrl}}/user/settings">
-						{{svg "octicon-settings" 16}}
+						{{svg "octicon-tools"}}
 						{{.i18n.Tr "your_settings"}}<!-- Your settings -->
 					</a>
 					<a class="item" target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io">
-						{{svg "octicon-question" 16}}
+						{{svg "octicon-question"}}
 						{{.i18n.Tr "help"}}<!-- Help -->
 					</a>
 					{{if .IsAdmin}}
 						<div class="divider"></div>
 
 						<a class="{{if .PageIsAdmin}}active{{end}} item" href="{{AppSubUrl}}/admin">
-							<i class="icon settings"></i>
+							{{svg "octicon-server"}}
 							{{.i18n.Tr "admin_panel"}}<!-- Admin Panel -->
 						</a>
 					{{end}}
 
 					<div class="divider"></div>
 					<a class="item link-action" href data-url="{{AppSubUrl}}/user/logout" data-redirect="{{AppSubUrl}}/">
-						{{svg "octicon-sign-out" 16}}
+						{{svg "octicon-sign-out"}}
 						{{.i18n.Tr "sign_out"}}<!-- Sign Out -->
 					</a>
 				</div><!-- end content avatar menu -->
@@ -150,11 +195,11 @@
 		<div class="right stackable menu">
 			{{if .ShowRegistrationButton}}
 				<a class="item{{if .PageIsSignUp}} active{{end}}" href="{{AppSubUrl}}/user/sign_up">
-					{{svg "octicon-person" 16}} {{.i18n.Tr "register"}}
+					{{svg "octicon-person"}} {{.i18n.Tr "register"}}
 				</a>
 			{{end}}
 			<a class="item{{if .PageIsSignIn}} active{{end}}" rel="nofollow" href="{{AppSubUrl}}/user/login?redirect_to={{.CurrentURL}}">
-				{{svg "octicon-sign-in" 16}} {{.i18n.Tr "sign_in"}}
+				{{svg "octicon-sign-in"}} {{.i18n.Tr "sign_in"}}
 			</a>
 		</div><!-- end anonymous right menu -->
 	{{end}}
diff --git a/roles/git/templates/app.ini.j2 b/roles/git/templates/app.ini.j2
index 9d7d033..ed0dbda 100644
--- a/roles/git/templates/app.ini.j2
+++ b/roles/git/templates/app.ini.j2
@@ -1,6 +1,6 @@
 ; Config last updated based on:
-;  commit: bcb722daec4bdd45303da97173a2b8a3c4c95dcd
-;  date:   2020-01-19
+;  commit: 5b1d0a7701f94f2292ebdfc6c542b91fd906e6ea
+;  date:   2021-07-12
 
 APP_NAME = codesignd Git
 RUN_USER = {{ ansible_facts.user_id }}
@@ -67,6 +67,11 @@ COOKIE_SECURE = true
 [ui]
 THEME_COLOR_META_TAG = `#eb8e2e`
 
+[ui.meta]
+AUTHOR = codesignd, Lukas Bestle
+DESCRIPTION = Self-hosted Git repositories of codesignd, Lukas Bestle
+KEYWORDS = "codesignd, git"
+
 [other]
 SHOW_FOOTER_BRANDING           = false
 SHOW_FOOTER_VERSION            = false