diff --git a/README.md b/README.md
index 9b238efd..c745e512 100644
--- a/README.md
+++ b/README.md
@@ -113,7 +113,7 @@ socket.emit("networks", {
   networks: [{
     id: 0,
     host: "",
-    nick: "",
+		name: "",
     channels: [],
   }]
 });
diff --git a/client/css/style.css b/client/css/style.css
index 64d82572..afd337d4 100644
--- a/client/css/style.css
+++ b/client/css/style.css
@@ -130,7 +130,6 @@ button {
 	color: #84d1ff !important;
 	font-size: 15px;
 	font-weight: bold;
-	text-transform: capitalize;
 }
 #sidebar .close {
 	background: no-repeat url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTYiIGhlaWdodD0iMTYiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+DQogPGc+DQogIDx0aXRsZT5MYXllciAxPC90aXRsZT4NCiAgPHBhdGggZmlsbD0iI2ZmZmZmZiIgaWQ9InN2Z18xIiBkPSJtMTIuODcyLDEuNTYyYzAuMTk1MDAxLDAuMTk0IDAuMTk1MDAxLDAuNTEzIDAsMC43MDdsLTMuODg5LDMuODkxYy0wLjE5MywwLjE5NCAtMC4xOTMsMC41MTMgMCwwLjcwOGwzLjg4NywzLjg5MmMwLjE5NSwwLjE5NCAwLjE5NSwwLjUxMyAwLDAuNzA3bC0xLjQxNTk5OSwxLjQxM2MtMC4xOTMwMDEsMC4xOTQgLTAuNTEyLDAuMTk0IC0wLjcwNzAwMSwwbC0zLjg4NSwtMy44OTJjLTAuMTk0LC0wLjE5NCAtMC41MTMsLTAuMTk0IC0wLjcwNywwbC0zLjg4OSwzLjg4OWMtMC4xOTQsMC4xOTUgLTAuNTEzLDAuMTk1IC0wLjcwNywwbC0xLjQxNCwtMS40MTU5OTljLTAuMTk0LC0wLjE5MzAwMSAtMC4xOTQsLTAuNTEyIDAsLTAuNzA3MDAxbDMuODksLTMuODg5YzAuMTk0LC0wLjE5NCAwLjE5NCwtMC41MTMgMCwtMC43MDhsLTMuODg3LC0zLjg5MWMtMC4xOTQsLTAuMTk1IC0wLjE5NCwtMC41MTMgMCwtMC43MDdsMS40MTUsLTEuNDE0YzAuMTk0LC0wLjE5NCAwLjUxMywtMC4xOTQgMC43MDcsMGwzLjg4NSwzLjg5MWMwLjE5NCwwLjE5NSAwLjUxMywwLjE5NSAwLjcwNywwLjAwMWwzLjg4OCwtMy44OWMwLjE5NSwtMC4xOTMgMC41MTQsLTAuMTkzIDAuNzA3LDBsMS40MTUsMS40MTV6Ii8+DQogPC9nPg0KPC9zdmc+);
diff --git a/client/img/apple-icon-144x144.png b/client/img/apple-icon-144x144.png
index 8f15cf22..26ffe3d1 100644
Binary files a/client/img/apple-icon-144x144.png and b/client/img/apple-icon-144x144.png differ
diff --git a/client/img/favicon.png b/client/img/favicon.png
index 5c7533e9..31325a2e 100644
Binary files a/client/img/favicon.png and b/client/img/favicon.png differ
diff --git a/client/index.html b/client/index.html
index b9ebb3aa..1bb822c0 100644
--- a/client/index.html
+++ b/client/index.html
@@ -69,7 +69,7 @@
 		
 		<script type="text/html" class="channels">
 		{{#each channels}}
-		<a href="#window-{{id}}" id="channel-{{id}}" class="{{type}}">
+		<a href="#window-{{id}}" id="channel-{{id}}" class="{{type}}" data-name="{{name}}">
 			<span class="badge"></span>
 			<span class="close"></span>
 			{{name}}
diff --git a/client/js/chat.js b/client/js/chat.js
index 94862c19..28daab4b 100644
--- a/client/js/chat.js
+++ b/client/js/chat.js
@@ -204,6 +204,7 @@ $(function() {
 			.empty();
 		
 		$.cookie("current", target);
+		document.title = link.data("name") + " — Shout";
 		
 		if (sidebar.find(".highlight").length == 0) {
 			favicon.badge("");
diff --git a/lib/models/network.js b/lib/models/network.js
index 0b2a6aad..3bd3f47e 100644
--- a/lib/models/network.js
+++ b/lib/models/network.js
@@ -9,12 +9,10 @@ function Network(attr) {
 		client: null,
 		connected: false,
 		host: "",
-		nick: "",
+		name: attr.host.split(".")[1].capitalize() || attr.host,
 		channels: [],
 	}, attr));
 	
-	this.name = this.host.split(".")[1] || clone.host;
-	
 	// Add lobby
 	this.channels.unshift(
 		new Chan({name: this.name, type: "lobby"})
@@ -33,3 +31,7 @@ Network.prototype.toJSON = function() {
 	]);
 	return clone;
 };
+
+String.prototype.capitalize = function() {
+	return this.charAt(0).toUpperCase() + this.slice(1);
+}