diff --git a/css/main.css b/css/main.css
index 38bc61d..c3d9b5a 100644
--- a/css/main.css
+++ b/css/main.css
@@ -326,7 +326,7 @@ LAYOUT
 #header h1#logo-text a:hover {
   border: none;
 }
-#header p#slogan {
+#header #slogan p{
   position: absolute;
   margin: 0;
   padding: 0;
diff --git a/page.tpl.php b/page.tpl.php
index b24d769..548ec3e 100644
--- a/page.tpl.php
+++ b/page.tpl.php
@@ -16,7 +16,7 @@
       <div id="header" class="container_16">
         <div id="header-main">
           <h1 id="logo-text"><a href="<?php print $front_page; ?>"><?php print $site_name; ?></a></h1>
-          <p id="slogan"><?php print $site_slogan; ?></p>
+          <div id="slogan"><?php print $site_slogan; ?></div>
         </div><!-- navigation -->
         <div id="nav">
           <?php print theme('links', $primary_links, array('class' => 'links primary-links')); ?>
diff --git a/template.php b/template.php
index 9bf7dd1..51dde6f 100644
--- a/template.php
+++ b/template.php
@@ -67,8 +67,25 @@ function ninesixtyrobots_preprocess_page(&$vars) {
       }
     }
     $tweet = $data->results[array_rand($data->results)];
-    // Create the actual variable finally.
-    $vars['site_slogan'] = check_plain(html_entity_decode($tweet->text));
+    // Create links out of urls, hashtags and @names - from twitter module
+    $tweet_text = check_plain(html_entity_decode($tweet->text));
+    $prefix = array('@', '#');
+    $destination = array('http://twitter.com/', 'http://search.twitter.com/search?q=%23');
+    for ($i = 0; $i < 2; $i++) {
+      $matches = array(
+        '/\>' . $prefix[$i] . '([a-z0-9_]+)/i',
+        '/^' . $prefix[$i] . '([a-z0-9_]+)/i',
+        '/(\s+)' . $prefix[$i] . '([a-z0-9_]+)/i',
+      );
+      $replacements = array(
+        '><a href="' . $destination[$i] . '${1}">' . $prefix[$i] . '${1}</a>',
+        '<a href="' . $destination[$i] . '${1}">' . $prefix[$i] . '${1}</a>',
+        '${1}<a href="' . $destination[$i] . '${2}">' . $prefix[$i] . '${2}</a>',
+      );
+      $tweet_text = preg_replace($matches, $replacements, $tweet_text); 
+    }
+  // Create the actual variable finally.
+    $vars['site_slogan'] = check_markup($tweet_text);
   }
 }