diff --git a/faq.html b/faq.html
index b9abb89..9d7f8f4 100644
--- a/faq.html
+++ b/faq.html
@@ -2,7 +2,6 @@
 <html>
 <head>
 	<meta charset="utf-8" />
-	<link rel="canonical" href="http://getpopcornti.me/faq/" />
 	<link rel="stylesheet" type="text/css" href="css/style.css" />
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<!--                                                                                                   
@@ -60,32 +59,22 @@
 
 	<title>Frequently Asked Questions - Popcorn Time</title>
 	<meta name="description" content="Stream movies from torrents. Skip the downloads. Launch, click, watch." />
-	<link rel="image_src" href="http://getpopcornti.me/images/header-ui.png" / >
+	<link rel="image_src" href="http://popcorn.cdnjd.com/images/header-ui.png" / >
   
 	<meta property="og:title" content="Popcorn Time" />
 	<meta property="og:type" content="website" />
-	<meta property="og:image" content="http://getpopcornti.me/images/header-ui.png" />
-	<meta property="og:url" content="http://getpopcornti.me" />
+	<meta property="og:image" content="http://popcorn.cdnjd.com/images/header-ui.png" />
+	<meta property="og:url" content="http://popcorn.cdnjd.com" />
 	<meta property="og:site_name" content="Popcorn Time" />
-
-	<script>
-	  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-	
-	  ga('create', 'UA-48382234-1', 'getpopcornti.me');
-	  ga('send', 'pageview');
-	</script>
 </head>
 <body id="page-faq" class="beta">
 	<section id="header">
 		<nav class="fixed-width fadeInDown wow">
-			<a href="http://getpopcornti.me" id="logo">Popcorn Time</a>
+			<a href="http://popcorn.cdnjd.com" id="logo">Popcorn Time</a>
 			<ul class="align-right">
 				<li class="social"><a href="https://facebook.com/getpopcorntime" target="_blank" class="icon-facebook"></a></li>
 				<li class="social"><a href="http://twitter.com/getpopcornapp" target="_blank" class="icon-twitter"></a></li>
-				<li class="social"><a href="http://github.com/popcorn-time" target="_blank" class="icon-github"></a></li>
+				<li class="social"><a href="http://github.com/popcorn-team" target="_blank" class="icon-github"></a></li>
 			</ul>
 
 			<ul class="align-left">
@@ -97,8 +86,8 @@
 
 	<div class="container fadeIn wow">
 		<section id="faq" class="fixed-width">
-			<p class="warning">To enjoy a great experience, always make sure you're running <a href="http://getpopcornti.me" target="_blank">the latest Popcorn Time version</a>. <br/>
-			Our only official site is <a href="http://getpopcornti.me" target="_blank">getpopcornti.me</a>. Do not get the app from anywhere else, as there's a few fake sites going around.</p>
+			<p class="warning">To enjoy a great experience, always make sure you're running <a href="http://popcorn.cdnjd.com" target="_blank">the latest Popcorn Time version</a>. <br/>
+			Our only official site is <a href="http://popcorn.cdnjd.com" target="_blank">popcorn.cdnjd.com</a> (for now). Do not get the app from anywhere else, as there's a few fake sites going around.</p>
 
 			<article id="what">
 				<h1>Frequently Asked Questions</h1>
@@ -169,20 +158,17 @@
 		<section id="footer" class="fadeInUp wow">
 			<hr style="display: none">
 			<nav class="clear-fix">
-				<a href="http://getpopcornti.me" class="logo">Popcorn time</a>
+				<a href="http://popcorn.cdnjd.com" class="logo">Popcorn time</a>
 				<ul>
 					<li class="social"><a href="https://facebook.com/getpopcorntime" target="_blank" class="icon-facebook"> </a></li>
 					<li class="social"><a href="http://twitter.com/getpopcornapp" target="_blank" class="icon-twitter"> </a></li>
-					<li class="github"><a href="http://github.com/popcorn-time" target="_blank" class="icon-github">Github</a></li>
-					<li class="download dl-mac"><a href="https://mega.co.nz/#!ENRlHJYT!BR7n4bQCN2oAW7fYYaJ6bcGT6pV36x7AxoTPkymbiP0" class="btn-main icon-mac" onclick="ga('send', 'event', 'Download', 'MacOS');" target="_blank">Download Beta 2</a><small>For Mac OSX 10.7 and above</small></li>
-					<li class="download dl-win"><a href="https://mega.co.nz/#!4dQQDZbD!Gqex3-IerB0jqWzKEH9O1XMqRr5sumdGoHM6dV7aIJ4" class="btn-main icon-win" onclick="ga('send', 'event', 'Download', 'Windows');" target="_blank">Download Beta 2</a><small>For Windows 7 and above</small></li>
-                    <li class="download dl-linux"><a href="https://mega.co.nz/#!PUg0EQZQ!GANw4x6k9Yz51gJKywUOI6mcRvpxMb36ANtJOZ1zWQc" class="btn-main icon-linux" onclick="ga('send', 'event', 'Download', 'Linux');" target="_blank">Download</a><small>For Linux (Beta)</small></li>
+					<li class="github"><a href="http://github.com/popcorn-team" target="_blank" class="icon-github">Github</a></li>
                 </ul>
 			</nav>
 			<footer>
 				<hr>
 				<i class="film"></i>
-				<p>Made with <span>&lt;3</span> by a bunch of geeks from Buenos Aires<br /> <small><a href="tos">Terms of Service</a> &mdash; <a href="faq">FAQ</a></small></p>
+				<p>Made with <span>&lt;3</span> by a bunch of geeks from All Around The World<br /> <small><a href="tos">Terms of Service</a> &mdash; <a href="faq">FAQ</a></small></p>
 			</footer>
 		</section>
 	</div>
diff --git a/tos.html b/tos.html
index 36cb66b..db59ba0 100644
--- a/tos.html
+++ b/tos.html
@@ -8,25 +8,20 @@
 	<link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
 	<link rel="icon" href="favicon.ico" type="image/x-icon">
 	<meta name="description" content="Enjoy movies everywhere on any OS. A whole new way to watch. From any OS play your favorite movies." />
-	<link rel="image_src" href="http://getpopcornti.me/images/header-ui.jpg" / >
+	<link rel="image_src" href="http://popcorn.cdnjd.com/images/header-ui.jpg" / >
 	<meta property="og:title" content="Popcorn Time" />
 	<meta property="og:type" content="website" />
-	<meta property="og:image" content="http://getpopcornti.me/images/header-ui.jpg" />
-	<meta property="og:url" content="http://getpopcornti.me" />
+	<meta property="og:image" content="http://popcorn.cdnjd.com/images/header-ui.jpg" />
+	<meta property="og:url" content="http://popcorn.cdnjd.com" />
 	<meta property="og:site_name" content="Popcorn Time" />
 
 	<title>Popcorn Time</title>
-	<script>
-	window.analytics||(window.analytics=[]),window.analytics.methods=["identify","track","trackLink","trackForm","trackClick","trackSubmit","page","pageview","ab","alias","ready","group","on","once","off"],window.analytics.factory=function(t){return function(){var a=Array.prototype.slice.call(arguments);return a.unshift(t),window.analytics.push(a),window.analytics}};for(var i=0;i<window.analytics.methods.length;i++){var method=window.analytics.methods[i];window.analytics[method]=window.analytics.factory(method)}window.analytics.load=function(t){var a=document.createElement("script");a.type="text/javascript",a.async=!0,a.src=("https:"===document.location.protocol?"https://":"http://")+"d2dq2ahtl5zl1z.cloudfront.net/analytics.js/v1/"+t+"/analytics.min.js";var n=document.getElementsByTagName("script")[0];n.parentNode.insertBefore(a,n)},window.analytics.SNIPPET_VERSION="2.0.8",
-	window.analytics.load("y52a9xtd91");
-	window.analytics.page();
-	</script>
 </head>
 <body class="tos">
 
 		<div class="text fadeInDown wow">
 			<nav class="fixed-width fadeInDown wow">
-				<a href="http://getpopcornti.me" id="logo">Popcorn Time</a>
+				<a href="http://popcorn.cdnjd.com" id="logo">Popcorn Time</a>
 			</nav>
 			<header>
 			<h1>Terms of service</h1>
