diff --git a/public/css/index.css b/public/css/index.css
index 91bea62694..a05802118f 100644
--- a/public/css/index.css
+++ b/public/css/index.css
@@ -857,7 +857,7 @@ footer .ui.language .menu {
   font-size: 3em;
 }
 .home .hero .octicon {
-  color: #d9453d;
+  color: #5aa509;
   font-size: 40px;
   width: 50px;
 }
@@ -871,7 +871,7 @@ footer .ui.language .menu {
   padding-top: 30px;
 }
 .home a {
-  color: #d9453d;
+  color: #5aa509;
 }
 .signup {
   padding-top: 15px;
diff --git a/public/img/gogs-large-resize.png b/public/img/gogs-large-resize.png
deleted file mode 100644
index dc66c1ab32..0000000000
Binary files a/public/img/gogs-large-resize.png and /dev/null differ
diff --git a/public/img/gogs-lg.png b/public/img/gogs-lg.png
deleted file mode 100644
index 9fa0a9da35..0000000000
Binary files a/public/img/gogs-lg.png and /dev/null differ
diff --git a/public/less/_home.less b/public/less/_home.less
index 01165249c2..65f1256615 100644
--- a/public/less/_home.less
+++ b/public/less/_home.less
@@ -14,7 +14,7 @@
 			font-size: 3em;
 		}
 		.octicon {
-			color: #d9453d;
+			color: #5aa509;
 			font-size: 40px;
 			width: 50px;
 		}
@@ -29,7 +29,7 @@
 		padding-top: 30px;
 	}
 	a {
-		color: #d9453d;
+		color: #5aa509;
 	}
 }
 
diff --git a/templates/home.tmpl b/templates/home.tmpl
index 4ed06d3a7c..9b6561e22b 100644
--- a/templates/home.tmpl
+++ b/templates/home.tmpl
@@ -3,11 +3,11 @@
 	<div class="ui stackable middle very relaxed page grid">
 		<div class="sixteen wide center aligned centered column">
 			<div>
-				<img class="logo" src="{{AppSubUrl}}/img/gogs-lg.png" />
+				<img class="logo" src="{{AppSubUrl}}/img/gitea-lg.png" />
 			</div>
 			<div class="hero">
 				<h1 class="ui icon header title">
-					Gogs - Go Git Service
+					Gitea - Git with a cup of tea
 				</h1>
 				<h2>{{.i18n.Tr "app_desc"}}</h2>
 			</div>
@@ -20,7 +20,7 @@
 					<i class="octicon octicon-flame"></i> Einfach zu installieren
 				</h1>
 				<p class="large">
-					Starte einfach <a target="_blank" href="https://gogs.io/docs/installation/install_from_binary.html">die Anwendung</a> für deine Plattform. Gogs gibt es auch für <a target="_blank" href="https://github.com/go-gitea/gitea/tree/master/docker">Docker</a>, <a target="_blank" href="https://github.com/geerlingguy/ansible-vagrant-examples/tree/master/gogs">Vagrant</a> oder als <a target="_blank" href="https://gogs.io/docs/installation/install_from_packages.html">Installationspaket</a>.
+					Starte einfach <a target="_blank" href="https://gogs.io/docs/installation/install_from_binary.html">die Anwendung</a> für deine Plattform. Gitea gibt es auch für <a target="_blank" href="https://github.com/go-gitea/gitea/tree/master/docker">Docker</a>, <a target="_blank" href="https://github.com/geerlingguy/ansible-vagrant-examples/tree/master/gogs">Vagrant</a> oder als <a target="_blank" href="https://gogs.io/docs/installation/install_from_packages.html">Installationspaket</a>.
 				</p>
 			</div>
 			<div class="eight wide center column">
@@ -28,7 +28,7 @@
 					<i class="octicon octicon-device-desktop"></i> Plattformübergreifend
 				</h1>
 				<p class="large">
-					Gogs läuft überall. <a target="_blank" href="http://golang.org/">Go</a> kompiliert für: Windows, Mac OS X, Linux, ARM, etc. Wähle dasjenige System, was dir am meisten gefällt!
+					Gitea läuft überall. <a target="_blank" href="http://golang.org/">Go</a> kompiliert für: Windows, Mac OS X, Linux, ARM, etc. Wähle dasjenige System, was dir am meisten gefällt!
 				</p>
 			</div>
 		</div>
@@ -38,7 +38,7 @@
 					<i class="octicon octicon-rocket"></i> Leichtgewicht
 				</h1>
 				<p class="large">
-					Gogs hat minimale Systemanforderungen und kann selbst auf einem günstigen und stromsparenden Raspberry Pi betrieben werden.
+					Gitea hat minimale Systemanforderungen und kann selbst auf einem günstigen und stromsparenden Raspberry Pi betrieben werden.
 				</p>
 			</div>
 			<div class="eight wide center column">
@@ -65,7 +65,7 @@
 					<i class="octicon octicon-device-desktop"></i> 跨平台
 				</h1>
 				<p class="large">
-					任何 <a target="_blank" href="http://golang.org/">Go 语言</a> 支持的平台都可以运行 Gogs,包括 Windows、Mac、Linux 以及 ARM。挑一个您喜欢的就行!
+					任何 <a target="_blank" href="http://golang.org/">Go 语言</a> 支持的平台都可以运行 Gitea,包括 Windows、Mac、Linux 以及 ARM。挑一个您喜欢的就行!
 				</p>
 			</div>
 		</div>
@@ -75,7 +75,7 @@
 					<i class="octicon octicon-rocket"></i> 轻量级
 				</h1>
 				<p class="large">
-					一个廉价的树莓派的配置足以满足 Gogs 的最低系统硬件要求。最大程度上节省您的服务器资源!
+					一个廉价的树莓派的配置足以满足 Gitea 的最低系统硬件要求。最大程度上节省您的服务器资源!
 				</p>
 			</div>
 			<div class="eight wide center column">
@@ -94,8 +94,8 @@
 					<i class="octicon octicon-flame"></i> Facile à installer
 				</h1>
 				<p class="large">
-				    Il suffit de <a target="_blank" href="https://gogs.io/docs/installation/install_from_binary.html">lancer l'exécutable</a> correspondant à votre système. 
-                    Ou d'utiliser Gogs avec <a target="_blank" href="https://github.com/go-gitea/gitea/tree/master/docker">Docker</a> ou 
+				    Il suffit de <a target="_blank" href="https://gogs.io/docs/installation/install_from_binary.html">lancer l'exécutable</a> correspondant à votre système.
+                    Ou d'utiliser Gitea avec <a target="_blank" href="https://github.com/go-gitea/gitea/tree/master/docker">Docker</a> ou
                     <a target="_blank" href="https://github.com/geerlingguy/ansible-vagrant-examples/tree/master/gogs">Vagrant</a>
                     ou en l'installant depuis un <a target="_blank" href="https://gogs.io/docs/installation/install_from_packages.html">package</a>.
 				</p>
@@ -105,7 +105,7 @@
 					<i class="octicon octicon-device-desktop"></i> Multi-plateforme
 				</h1>
 				<p class="large">
-					Gogs tourne partout où <a target="_blank" href="http://golang.org/">Go</a> peut être compilé : Windows, Mac OS X, Linux, ARM, etc. Choisissez votre préféré !
+					Gitea tourne partout où <a target="_blank" href="http://golang.org/">Go</a> peut être compilé : Windows, Mac OS X, Linux, ARM, etc. Choisissez votre préféré !
 				</p>
 			</div>
 		</div>
@@ -115,7 +115,7 @@
 					<i class="octicon octicon-rocket"></i> Léger
 				</h1>
 				<p class="large">
-					Gogs utilise peu de ressources. Il peut même tourner sur un Raspberry Pi très bon marché. Économisez l'énergie de vos serveurs !
+					Gitea utilise peu de ressources. Il peut même tourner sur un Raspberry Pi très bon marché. Économisez l'énergie de vos serveurs !
 				</p>
 			</div>
 			<div class="eight wide center column">
@@ -134,7 +134,7 @@
 					<i class="octicon octicon-flame"></i> Fácil de instalar
 				</h1>
 				<p class="large">
-					Simplemente <a target="_blank" href="https://gogs.io/docs/installation/install_from_binary.html">arranca el binario</a> para tu plataforma. O usa Gogs con <a target="_blank" href="https://github.com/go-gitea/gitea/tree/master/docker">Docker</a> o <a target="_blank" href="https://github.com/geerlingguy/ansible-vagrant-examples/tree/master/gogs">Vagrant</a>, o utilice el <a target="_blank" href="https://gogs.io/docs/installation/install_from_packages.html">paquete</a>.
+					Simplemente <a target="_blank" href="https://gogs.io/docs/installation/install_from_binary.html">arranca el binario</a> para tu plataforma. O usa Gitea con <a target="_blank" href="https://github.com/go-gitea/gitea/tree/master/docker">Docker</a> o <a target="_blank" href="https://github.com/geerlingguy/ansible-vagrant-examples/tree/master/gogs">Vagrant</a>, o utilice el <a target="_blank" href="https://gogs.io/docs/installation/install_from_packages.html">paquete</a>.
 				</p>
 			</div>
 			<div class="eight wide center column">
@@ -142,7 +142,7 @@
 					<i class="octicon octicon-device-desktop"></i> Multiplatforma
 				</h1>
 				<p class="large">
-					Gogs funciona en cualquier parte, <a target="_blank" href="http://golang.org/">Go</a> puede compilarse en: Windows, Mac OS X, Linux, ARM, etc. !Elige tu favorita!
+					Gitea funciona en cualquier parte, <a target="_blank" href="http://golang.org/">Go</a> puede compilarse en: Windows, Mac OS X, Linux, ARM, etc. !Elige tu favorita!
 				</p>
 			</div>
 		</div>
@@ -152,7 +152,7 @@
 					<i class="octicon octicon-rocket"></i> Ligero
 				</h1>
 				<p class="large">
-					Gogs tiene pocos requisitos y puede funcionar en una Raspberry Pi barata. !Ahorra energía!
+					Gitea tiene pocos requisitos y puede funcionar en una Raspberry Pi barata. !Ahorra energía!
 				</p>
 			</div>
 			<div class="eight wide center column">
@@ -171,7 +171,7 @@
 					<i class="octicon octicon-flame"></i> Fácil de instalar
 				</h1>
 				<p class="large">
-					Simplesmente <a target="_blank" href="https://gogs.io/docs/installation/install_from_binary.html">rode o executável</a> para o seu sistema operacional. Ou obtenha o Gogs com o <a target="_blank" href="https://github.com/go-gitea/gitea/tree/master/docker">Docker</a> ou <a target="_blank" href="https://github.com/geerlingguy/ansible-vagrant-examples/tree/master/gogs">Vagrant</a>, ou baixe o <a target="_blank" href="https://gogs.io/docs/installation/install_from_packages.html">pacote</a>.
+					Simplesmente <a target="_blank" href="https://gogs.io/docs/installation/install_from_binary.html">rode o executável</a> para o seu sistema operacional. Ou obtenha o Gitea com o <a target="_blank" href="https://github.com/go-gitea/gitea/tree/master/docker">Docker</a> ou <a target="_blank" href="https://github.com/geerlingguy/ansible-vagrant-examples/tree/master/gogs">Vagrant</a>, ou baixe o <a target="_blank" href="https://gogs.io/docs/installation/install_from_packages.html">pacote</a>.
 				</p>
 			</div>
 			<div class="eight wide center column">
@@ -179,7 +179,7 @@
 					<i class="octicon octicon-device-desktop"></i> Multi-plataforma
 				</h1>
 				<p class="large">
-					Gogs roda em qualquer sistema operacional em que <a target="_blank" href="http://golang.org/">Go</a> consegue compilar: Windows, Mac OS X, Linux, ARM, etc. Escolha qual você gosta mais!
+					Gitea roda em qualquer sistema operacional em que <a target="_blank" href="http://golang.org/">Go</a> consegue compilar: Windows, Mac OS X, Linux, ARM, etc. Escolha qual você gosta mais!
 				</p>
 			</div>
 		</div>
@@ -189,7 +189,7 @@
 					<i class="octicon octicon-rocket"></i> Leve e rápido
 				</h1>
 				<p class="large">
-					Gogs utiliza poucos recursos e consegue mesmo rodar no barato Raspberry Pi. Economize energia elétrica da sua máquina!
+					Gitea utiliza poucos recursos e consegue mesmo rodar no barato Raspberry Pi. Economize energia elétrica da sua máquina!
 				</p>
 			</div>
 			<div class="eight wide center column">
@@ -208,7 +208,7 @@
 					<i class="octicon octicon-flame"></i> Простой в установке
 				</h1>
 				<p class="large">
-					Просто <a target="_blank" href="https://gogs.io/docs/installation/install_from_binary.html">запустите исполняемый файл</a> для вашей платформы. Изпользуйте Gogs с <a target="_blank" href="https://github.com/go-gitea/gitea/tree/master/docker">Docker</a> или <a target="_blank" href="https://github.com/geerlingguy/ansible-vagrant-examples/tree/master/gogs">Vagrant</a>, или загрузите <a target="_blank" href="https://gogs.io/docs/installation/install_from_packages.html">пакет</a>.
+					Просто <a target="_blank" href="https://gogs.io/docs/installation/install_from_binary.html">запустите исполняемый файл</a> для вашей платформы. Изпользуйте Gitea с <a target="_blank" href="https://github.com/go-gitea/gitea/tree/master/docker">Docker</a> или <a target="_blank" href="https://github.com/geerlingguy/ansible-vagrant-examples/tree/master/gogs">Vagrant</a>, или загрузите <a target="_blank" href="https://gogs.io/docs/installation/install_from_packages.html">пакет</a>.
 				</p>
 			</div>
 			<div class="eight wide center column">
@@ -216,7 +216,7 @@
 					<i class="octicon octicon-device-desktop"></i> Кроссплатформенный
 				</h1>
 				<p class="large">
-					Gogs работает на любой операционной системе, которая может компилировать <a target="_blank" href="http://golang.org/">Go</a>: Windows, Mac OS X, Linux, ARM и т. д. Выбирайте, что вам больше нравится!
+					Gitea работает на любой операционной системе, которая может компилировать <a target="_blank" href="http://golang.org/">Go</a>: Windows, Mac OS X, Linux, ARM и т. д. Выбирайте, что вам больше нравится!
 				</p>
 			</div>
 		</div>
@@ -226,7 +226,7 @@
 					<i class="octicon octicon-rocket"></i> Легковесный
 				</h1>
 				<p class="large">
-					Gogs имеет низкие системные требования и может работать на недорогом Raspberry Pi. Экономьте энергию вашей машины!
+					Gitea имеет низкие системные требования и может работать на недорогом Raspberry Pi. Экономьте энергию вашей машины!
 				</p>
 			</div>
 			<div class="eight wide center column">
@@ -245,7 +245,7 @@
 					<i class="octicon octicon-flame"></i> Easy to install
 				</h1>
 				<p class="large">
-					Simply <a target="_blank" href="https://gogs.io/docs/installation/install_from_binary.html">run the binary</a> for your platform. Or ship Gogs with <a target="_blank" href="https://github.com/go-gitea/gitea/tree/master/docker">Docker</a> or <a target="_blank" href="https://github.com/geerlingguy/ansible-vagrant-examples/tree/master/gogs">Vagrant</a>, or get it <a target="_blank" href="https://gogs.io/docs/installation/install_from_packages.html">packaged</a>.
+					Simply <a target="_blank" href="https://gogs.io/docs/installation/install_from_binary.html">run the binary</a> for your platform. Or ship Gitea with <a target="_blank" href="https://github.com/go-gitea/gitea/tree/master/docker">Docker</a> or <a target="_blank" href="https://github.com/geerlingguy/ansible-vagrant-examples/tree/master/gogs">Vagrant</a>, or get it <a target="_blank" href="https://gogs.io/docs/installation/install_from_packages.html">packaged</a>.
 				</p>
 			</div>
 			<div class="eight wide center column">
@@ -253,7 +253,7 @@
 					<i class="octicon octicon-device-desktop"></i> Cross-platform
 				</h1>
 				<p class="large">
-					Gogs runs anywhere <a target="_blank" href="http://golang.org/">Go</a> can compile for: Windows, Mac OS X, Linux, ARM, etc. Choose the one you love!
+					Gitea runs anywhere <a target="_blank" href="http://golang.org/">Go</a> can compile for: Windows, Mac OS X, Linux, ARM, etc. Choose the one you love!
 				</p>
 			</div>
 		</div>
@@ -263,7 +263,7 @@
 					<i class="octicon octicon-rocket"></i> Lightweight
 				</h1>
 				<p class="large">
-					Gogs has low minimal requirements and can run on an inexpensive Raspberry Pi. Save your machine energy!
+					Gitea has low minimal requirements and can run on an inexpensive Raspberry Pi. Save your machine energy!
 				</p>
 			</div>
 			<div class="eight wide center column">