diff --git a/amadeus/static/js/socket.js b/amadeus/static/js/socket.js
index 5c22a17..6bf982f 100644
--- a/amadeus/static/js/socket.js
+++ b/amadeus/static/js/socket.js
@@ -4,7 +4,7 @@ if (("Notification" in window)) {
 	}
 }
 
-socket = new WebSocket("ws://" + window.location.host + "/");
+socket = new WebSocket("wss://" + window.location.host + "/");
 
 socket.onmessage = function(e) {
 	content = JSON.parse(e.data);
@@ -46,7 +46,7 @@ function muralNotificationPost(content) {
 			$(content.container).prepend(content.complete);
 
 	        $('.no-subjects').attr('style', 'display:none');
-		}	
+		}
 	} else {
 		$('.mural_badge').each(function () {
 			var actual = $(this).text();
@@ -257,7 +257,7 @@ function messageReceived(content) {
 			talk_notifies.text(actual_count);
 
 			actual_date.html(content.last_date);
-	
+
 		$('.chat_badge').each(function () {
 			var actual = $(this).text();
 
@@ -303,7 +303,7 @@ function messageReceived(content) {
 
 	    	setTimeout(notification.close.bind(notification), 3000);
 	    }
-  	}	
+  	}
 }
 
 function changeUserStatus(content) {
@@ -318,4 +318,4 @@ function changeUserStatus(content) {
 	}
 
 	elem.attr('data-original-title', content.status);
-}
\ No newline at end of file
+}
diff --git a/amadeus/templates/base.html b/amadeus/templates/base.html
index 0ae0fd0..c49c662 100644
--- a/amadeus/templates/base.html
+++ b/amadeus/templates/base.html
@@ -14,7 +14,7 @@
 	<meta http-equiv="Cache-Control" content="no-cache, no-store" />
 	<link href="{{ theme.favicon_url }}" rel="shortcut icon" />
 	<!-- Roboto font -->
-	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Roboto:300,400,500,700" type="text/css">
+	<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700" type="text/css">
 	<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
 
   	<!-- Bootstrap and themes (material) -->
--
libgit2 0.21.2