diff --git a/front-page.php b/front-page.php
index 48ffb53..4a0e82e 100644
--- a/front-page.php
+++ b/front-page.php
@@ -57,14 +57,12 @@
  		<?php endwhile; ?>
 
 		<div class="fl-col">
-			<?php get_template_part('tweets', 'aegisprog') ?>
+			<?php get_template_part('tweets', 'FluidProject') ?>
 			<?php get_template_part('tweets', 'SNOWocad') ?>
 
 		</div>
 
 		<div class="fl-col">
-			<?php get_template_part('tweets', 'FluidProject') ?>
-
 			<div class="idi-box">
 				<div class="idi-mailing-list">
 					<?php get_template_part("mailing-list-form"); ?>
diff --git a/style.css b/style.css
index cadd665..3ca5891 100644
--- a/style.css
+++ b/style.css
@@ -883,6 +883,8 @@ h3,
     list-style: none;
 }
 .twitter-feed-group .tweet-date {
+    margin-top: 0.5em;
+    color: #959595;
     font-style: italic;
     text-decoration: none;
 }
@@ -1815,4 +1817,4 @@ a.idi-project-link {
 :-webkit-full-screen .fl-videoPlayer-video-play,
 :-webkit-full-screen .fl-videoPlayer-overlay { 
     max-width: none;
-}
\ No newline at end of file
+}
diff --git a/tweets-FluidProject.php b/tweets-FluidProject.php
index eb9f423..d4be3e7 100644
--- a/tweets-FluidProject.php
+++ b/tweets-FluidProject.php
@@ -21,12 +21,12 @@
 */
 
     require_once("wp-content/plugins/twitteroauth/twitteroauth/twitteroauth.php");
-    $twitter_un = "SNOWocad";
-    $num_tweets = 3;
-    $consumerkey = "fHDGIckUSPpd4koYiBVOw";
-    $consumersecret = "I3KKfzDT34eR9TXekZsXod750SdC2JydGVKj0ZFlU";
-    $accesstoken = "199785294-UB4hnT6tsbbRD2bKSUGNgryPnS4hDJjtQpPtFGx7";
-    $accesstokensecret = "kcXrb0WzyUYijk97u1RdFrG7hSS5vpyUbWxpfls";
+    $twitter_un = "FluidProject";
+    $num_tweets = 1;
+    $consumerkey = "luK78NyRjDEmMVhi6sgIw";
+    $consumersecret = "E6bY0ShFmtibIqWU0oHokCVZKYtPEvZcNyACBPzYqo";
+    $accesstoken = "123905660-DBVNC6meqlD4KgZrQcAuynwYaMxJsLqLiyrtkArR";
+    $accesstokensecret = "UhlTPgNowuNOsC0Oaw89PM29PcVRD4N14sAdkAUk";
     $connection = new TwitterOAuth($consumerkey, $consumersecret, $accesstoken, $accesstokensecret);
     $tweets = $connection->get("https://api.twitter.com/1.1/statuses/user_timeline.json?screen_name=".$twitter_un."&count=".$num_tweets);
     //print_r($tweets);
@@ -39,7 +39,8 @@
 					$tweets = array_filter($tweets);
 					if(!empty($tweets)){
 					        foreach($tweets as $tweet) {
-                                echo '<li class="even">'.$tweet->text.'<br><a href="https://twitter.com/intent/retweet?tweet_id='.$tweet->id.'">retweet</a><hr style="height:1px;"></li>';
+                                echo '<li class="tweet">'.$tweet->text.'<br/>
+                                <span class="tweet-date">'.substr($tweet->created_at, 0, 16).'</span></li>';
                                 
                             } 
                     } else{
diff --git a/tweets-SNOWocad.php b/tweets-SNOWocad.php
index 7c1eb70..f049286 100644
--- a/tweets-SNOWocad.php
+++ b/tweets-SNOWocad.php
@@ -20,7 +20,7 @@
 */
     require_once("wp-content/plugins/twitteroauth/twitteroauth/twitteroauth.php");
     $twitter_un = "SNOWocad";
-    $num_tweets = 3;
+    $num_tweets = 1;
     $consumerkey = "fHDGIckUSPpd4koYiBVOw";
     $consumersecret = "I3KKfzDT34eR9TXekZsXod750SdC2JydGVKj0ZFlU";
     $accesstoken = "199785294-UB4hnT6tsbbRD2bKSUGNgryPnS4hDJjtQpPtFGx7";
@@ -35,8 +35,8 @@
 					$tweets = array_filter($tweets);
 					if(!empty($tweets)){
 					        foreach($tweets as $tweet) {
-                                echo '<li class="even">'.$tweet->text.'<br><a href="https://twitter.com/intent/retweet?tweet_id='.$tweet->id.'">retweet</a><hr style="height:1px;"></li>';
-                                
+                                echo '<li class="tweet">'.$tweet->text.'<br/>
+                                <span class="tweet-date">'.substr($tweet->created_at, 0, 16).'</span></li>';
                             } 
                     } else{
                         echo "<p>no tweets found</p>";
diff --git a/tweets-aegisprog.php b/tweets-aegisprog.php
deleted file mode 100644
index 529993a..0000000
--- a/tweets-aegisprog.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/*
-Feeds must be authenticated for twitter API 1.1. Do the following, then enter the values
-for the valiable below:
-
-1) Register at https://dev.twitter.com/apps/new and create a new app.
-
-2) After registering, fill in App name, e.g. "_domain name_ App",
-description, e.g "My Twitter App", and write the address of your
-website. Check "I agree" next to their terms of service and click
-"create your Twitter application"
-
-3) After this you app will be created. Click "Create my access token"
-and you should see at the bottom "access token" and "access token
-secret". Refresh the page if you don't see them.
-
-4) Copy to module settings "Consumer key", "Consumer secret", "Access
-token" and "Access secret"
-
-*/
-    require_once("wp-content/plugins/twitteroauth/twitteroauth/twitteroauth.php");
-    $twitter_un = "aegisproj";
-    $num_tweets = 3;
-    $consumerkey = "";
-    $consumersecret = "";
-    $accesstoken = "";
-    $accesstokensecret = "";
-    $connection = new TwitterOAuth($consumerkey, $consumersecret, $accesstoken, $accesstokensecret);
-    $tweets = $connection->get("https://api.twitter.com/1.1/statuses/user_timeline.json?screen_name=".$twitter_un."&count=".$num_tweets);
-    //print_r($tweets);
-?>
-				<div class="idi-box idi-highlight-box twitter-feed-group">
-				<div class="idi-box-text">
-					<a class="twitter-follow-button" rel="external nofollow" href="http://twitter.com/aegisproj" title="Follow @aegisproj">@aegisproj</a>
-					<ul>     <?php   
-					$tweets = array_filter($tweets);
-					if(!empty($tweets)){
-					        foreach($tweets as $tweet) {
-                                echo '<li class="even">'.$tweet->text.'<br><a href="https://twitter.com/intent/retweet?tweet_id='.$tweet->id.'">retweet</a><hr style="height:1px;"></li>';
-                                
-                            } 
-                    } else{
-                        echo "<p>no tweets found</p>";
-                    }
-                          ?>
-                    </ul>
-				</div>
-			</div>
-