diff --git a/content/assets/css/screen.sass b/content/assets/css/screen.sass
index a4ba756f..17d3d459 100644
--- a/content/assets/css/screen.sass
+++ b/content/assets/css/screen.sass
@@ -202,6 +202,7 @@ $height: 190px
 
 
 $box-background: #3D3D3D
+$footer-background: #3C0002
 $title-background: #292929
 
 .title
@@ -431,11 +432,19 @@ $title-background: #292929
   @include sticky-footer(80px)
   width: 100%
   +box-shadow
-  background: $box-background
+  background: $footer-background
   #footer-container
     +centered($container-width)
-    text-align: center
     font-size: 0.7em
     color: #CFC2B5
     a
       color: #CFC2B5
+    #footer-logos
+      float: right
+      #hosted-by
+        float: left
+        margin-right: 5em
+      #tested-with
+        float: right
+    #copyright
+      padding-top: 50px
diff --git a/content/assets/images/travis-ci.png b/content/assets/images/travis-ci.png
new file mode 100644
index 00000000..a0d07790
Binary files /dev/null and b/content/assets/images/travis-ci.png differ
diff --git a/content/assets/images/travis-tested-with.png b/content/assets/images/travis-tested-with.png
deleted file mode 100644
index 061ece86..00000000
Binary files a/content/assets/images/travis-tested-with.png and /dev/null differ
diff --git a/layouts/shared/footer.haml b/layouts/shared/footer.haml
index 3b3657f8..903143aa 100644
--- a/layouts/shared/footer.haml
+++ b/layouts/shared/footer.haml
@@ -1,26 +1,22 @@
 #footer
   #footer-container
-    ∞
-    Copyright
-    © 2009-2011
-    %a{:href => "https://github.com/wayneeseguin"} Wayne E. Seguin
-    © 2011-2014
-    %a{:href => "https://github.com/mpapis"} Michal Papis
-    ∞
-    Built with
-    %a{:href => "http://nanoc.ws"} Nanoc
-    ∞
-    Hosted by
-    %a{:href => "https://www.linode.com"} Linode, LLC
-    ∞
-    Tested By
-    %a{ :href => "http://www.travis-ci.org/" } Travis CI
-    %br
-    %div
-      %a{ :href => "https://www.linode.com" }
-        %img{:src => "/images/linode_logo_gray.png", :alt => "Linode, LLC", :height => "50px"}
-      %a{ :href => "http://www.travis-ci.org/" }
-        %img{:src => "/images/travis-tested-with.png", :alt => "Travis CI", :height => "50px"}
+    #footer-logos
+      #hosted-by
+        Hosted by:
+        %br
+          %a{ :href => "https://www.linode.com" }
+            %img{:src => "/images/linode_logo_gray.png", :alt => "Linode, LLC", :height => "50px"}
+      #tested-with
+        Tested with:
+        %br
+          %a{ :href => "http://www.travis-ci.org/" }
+            %img{:src => "/images/travis-ci.png", :alt => "Travis CI", :height => "50px"}
+    #copyright
+      Copyright
+      © 2009-2011
+      %a{:href => "https://github.com/wayneeseguin"} Wayne E. Seguin
+      © 2011-2015
+      %a{:href => "https://github.com/mpapis"} Michal Papis
 
 %script{:src => "https://www.google.com/jsapi", :type => "text/javascript"}
   :javascript