From: Jiang <jianghgr@yahoo.co.jp>
Date: Wed, 19 Nov 2014 08:31:21 +0000 (+0800)
Subject: embrj
X-Git-Url: http://git.osdn.net/view?p=embrj%2Fmaster.git;a=commitdiff_plain;h=8f0dd3ab0b2af541e891e92b6a986c98dda32a26

embrj
---

diff --git a/.htaccess b/.htaccess
index bf2a7a6..d05ed1e 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,10 +1,10 @@
-RewriteEngine On
-RewriteRule ^([a-zA-Z0-9_]+)$ user.php?id=$1 [L,QSA]
-RewriteRule ^(\d+)$ status.php?id=$1 [L,QSA]
-<IfModule mod_expires.c>
-ExpiresActive On
-ExpiresByType image/gif A2592000
-ExpiresByType image/png A2592000
-ExpiresByType text/css A2592000
-ExpiresByType application/x-javascript A2592000
+RewriteEngine On
+RewriteRule ^([a-zA-Z0-9_]+)$ user.php?id=$1 [L,QSA]
+RewriteRule ^(\d+)$ status.php?id=$1 [L,QSA]
+<IfModule mod_expires.c>
+ExpiresActive On
+ExpiresByType image/gif A2592000
+ExpiresByType image/png A2592000
+ExpiresByType text/css A2592000
+ExpiresByType application/x-javascript A2592000
 </IfModule>
\ No newline at end of file
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..7df6ef1
--- /dev/null
+++ b/README.md
@@ -0,0 +1,26 @@
+How to Install
+--------
+The installation of embrj is pretty much the same with embr's, you just need to get the source, rename `config.sample.php` in `/lib` to `config.php`, edit it with your own app information and upload it to your hosting directory.
+
+And here are some tips you may want to know:
+
+ * embrj requires `php-curl` and `php-bcmath`
+ * while not necessarily required, `php-mcrypt` is recommended
+ * embrj is compatible with PHP from version 5.2 to 5.5, we didn't test it on 5.1 or older versions
+
+Installing in sub-directory
+--------
+If you need to install embrj in a sub-directory of your website, say, in `/embrj`, you'll need to adjust the `.htaccess` file with `/embrj/user.php` and `/embrj/status.php` instead of `/user.php` and `/status.php`.
+
+nginx
+--------
+For nginx users, you'll need to add these lines to your nginx config file:
+
+    location / {
+        if (!-f $request_filename) {
+            rewrite ^/(\d+)$ /status.php?id=$1 last;
+            rewrite ^/(\w+)$ /user.php?id=$1 last;
+            break;
+        }
+    }
+And of course, adjust it if you are in a sub-directory.
diff --git a/ajax/addMembersToList.php b/ajax/addMembersToList.php
new file mode 100644
index 0000000..aa71ce9
--- /dev/null
+++ b/ajax/addMembersToList.php
@@ -0,0 +1,18 @@
+<?php
+        if(!isset($_SESSION)){
+                session_start();
+        }
+        include ('../lib/twitese.php');
+        $t = getTwitter();
+	$listId = $_POST['slug'];
+	$id = $_POST['owner'];
+	$members = $_POST['add_members'];
+	$result = $t->addListMember($listId, $id, $members);
+	if ($result) {
+		$ret = 'Followers: '.$result->subsriber_count.'&nbsp;&nbsp;';
+		$ret .= 'Members: '.$result->member_count.'&nbsp;&nbsp;';
+		$ret .= $result->mode == "private" ? "Private" : "Public";
+		echo $ret;
+	} else
+		echo 'error';
+?>
diff --git a/ajax/apiQuota.php b/ajax/apiQuota.php
index 0b9a962..bb1ff75 100644
--- a/ajax/apiQuota.php
+++ b/ajax/apiQuota.php
@@ -4,11 +4,18 @@
 		session_start();
 	}
 	$t = getTwitter();
-	$limit = $t->ratelimit();
-	$reset = intval((format_time($limit->reset_time) - time())/60);
-	$remaining = $limit->remaining_hits < 0 ? 0 : $limit->remaining_hits;
-	$hourly = $limit->hourly_limit;
+	$limit = get_object_vars($t->ratelimit()->resources->statuses);
+	$timeline_limit = $limit["/statuses/home_timeline"];
+	$mentions_limit = $limit['/statuses/mentions_timeline'];
+	$timeline_reset = intval($timeline_limit->reset - $_SERVER['REQUEST_TIME']);
+	$mentions_reset = intval($mentions_limit->reset - $_SERVER['REQUEST_TIME']);
+	$timeline_remaining = $timeline_limit->remaining < 0 ? 0 : $timeline_limit->remaining;
+	$mentions_remaining = $mentions_limit->remaining < 0 ? 0 : $mentions_limit->remaining;
+	$timeline_qlimit = $timeline_limit->limit;
+	$mentions_qlimit = $mentions_limit->limit;
 	header('Content-Type: text/html');
-	echo "<li><span style=\"color: #2276BB\">API: $remaining/$hourly</span></li>
-	<li><span style=\"color: #2276BB\">Reset in $reset min(s)</span></li>";
+	echo "<li><span style=\"color: #2276BB\">Timeline API remains: $timeline_remaining/$timeline_qlimit</span></li>
+	<li><span style=\"color: #2276BB\">Reset in $timeline_reset sec(s)</span></li>
+	<li><span style=\"color: #2276BB\">Mentions API remains: $mentions_remaining/$mentions_qlimit</span></li>
+	<li><span style=\"color: #2276BB\">Reset in $mentions_reset sec(s)</span></li>";
 ?>
diff --git a/ajax/delete.php b/ajax/delete.php
index f9e21ae..8a5abe9 100644
--- a/ajax/delete.php
+++ b/ajax/delete.php
@@ -19,14 +19,13 @@
 		if ($result) echo 'success';
 		else echo 'error';
 	}
-	elseif ( isset($_POST['list_id']) ) {
-		$result = $t->deleteList($_POST['list_id']);
+	elseif ( isset($_POST['list_slug']) ) {
+		$result = $t->deleteList($_POST['list_slug']);
 		if ($result) echo 'success';
 		else echo 'error';
 	}
 	elseif ( isset($_POST['list_member']) ) {
-		//$user = $t->showUser($_POST['list_member']);
-		$result = $t->deleteListMember($_POST['id'], $_POST['list_member']);
+		$result = $t->deleteListMember($_POST['slug'], $_POST['owner'], $_POST['list_member']);
 		if ($result) echo 'success';
 		else echo 'error';
 	}
diff --git a/ajax/expand.php b/ajax/expand.php
new file mode 100644
index 0000000..502d17a
--- /dev/null
+++ b/ajax/expand.php
@@ -0,0 +1,29 @@
+<?php
+
+include_once('../lib/config.php');
+include_once('../lib/twitese.php');
+
+if (parse_url($_SERVER['HTTP_REFERER'], PHP_URL_HOST) != parse_url(BASE_URL, PHP_URL_HOST)) {
+	echo '{"error":"Invalid referer."}';
+	exit();
+}
+
+$url = isset($_GET['url']) ? $_GET['url'] : false;
+if (!$url || empty($url)) {
+	echo '{"error":"No URL is provided."}';
+	exit();
+}
+if (!filter_var($url, FILTER_VALIDATE_URL)) {
+	echo '{"error":"Malformed URL."}';
+	exit();
+}
+
+$thehops = array();
+$answer = expandRedirect($url, $thehops);
+if (!$answer) {
+	echo '{"error":"No URL is provided."}';
+}
+else
+	echo "{\"expanded_url\":\"$answer\"}";
+
+?>
diff --git a/ajax/getRelationship.php b/ajax/getRelationship.php
deleted file mode 100644
index b10ee35..0000000
--- a/ajax/getRelationship.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-	if(!isset($_SESSION)){
-		session_start();
-	}
-	include_once("../lib/twitese.php");
-	if(!isset($_GET['target'])){
-		echo "error";
-		exit;
-	}
-	$target = trim($_GET['target']);
-	$t = getTwitter();
-	$source = isset($_GET['source']) ? trim($_GET['source']) : $t->username;
-	if($target == '' || $source == ''){
-		echo "error";
-		exit;
-	}
-	$analysis = getRelationship($target, $source);
-	switch($analysis){
-		case 1:
-			$result = '<h3 style="color:#00805F;text-shadow:1px 1px #FFFFFF;">They\'re following each other. How sweet!</h3>';
-			break;
-		case 2:
-			$result = '<h3 style="margin-top: 80px; text-shadow: 1px 1px rgb(255, 255, 255); color: rgb(0, 128, 95);">
-						<a href="user.php?id='.$source.'">@'.$source.'</a> is following <a href="user.php?id='.$target.'">@'.$target.'</a>
-						</h3>
-					   <h3 style="margin-top: 5px; color: rgb(131, 22, 31); text-shadow: 1px 1px rgb(255, 255, 255);">
-					   <a href="user.php?id='.$target.'">@'.$target.'</a> is NOT following <a href="user.php?id='.$source.'">@'.$source.'</a>
-						</h3>';
-			break;
-		case 3:
-			$result = '<h3 style="margin-top: 80px; text-shadow: 1px 1px rgb(255, 255, 255); color: rgb(0, 128, 95);">
-						<a href="user.php?id='.$target.'">@'.$target.'</a> is following <a href="user.php?id='.$source.'">@'.$source.'</a>
-						</h3>
-					   <h3 style="margin-top: 5px; color: rgb(131, 22, 31); text-shadow: 1px 1px rgb(255, 255, 255);">
-					   <a href="user.php?id='.$source.'">@'.$source.'</a> is NOT following <a href="user.php?id='.$target.'">@'.$target.'</a>
-						</h3>';
-			break;
-		case 4:
-			$result = '<h3 style="color: rgb(131, 22, 31); text-shadow: 1px 1px rgb(255, 255, 255);">
-						<a href="user.php?id='.$source.'">@'.$source.'</a> is blocking <a href="user.php?id='.$target.'">@'.$target.'</a>
-						</h3>';
-			break;
-		case 9:
-			$result = '<h3 style="color:#666666;text-shadow: 1px 1px rgb(255, 255, 255);">It seems that they don\'t know each other!</h3>';
-			break;
-	}
-	$html = $result;
-	echo $html;
-?>
\ No newline at end of file
diff --git a/ajax/modifyList.php b/ajax/modifyList.php
new file mode 100644
index 0000000..8fa8e41
--- /dev/null
+++ b/ajax/modifyList.php
@@ -0,0 +1,26 @@
+<?php
+        if(!isset($_SESSION)){
+                session_start();
+        }
+        include ('../lib/twitese.php');
+        $t = getTwitter();
+	$name = $_POST['name'];
+	$description = $_POST['description'];
+	$mode = $_POST['mode'];
+	if (isset($_POST['slug'])) {
+		$result = $t->editList($_POST['slug'], $name, $description, $mode);
+	}
+	else {
+		$result = $t->createList($name, $description, $mode);
+	}
+	if ($result) {
+		$ret = '{"result": "success"';
+		$ret .= ',"username":"'.$t->username.'"';
+		$ret .= ',"imgurl":"'.getAvatar($result->user->profile_image_url).'"';
+		$ret .= ',"contentid":"list'.$result->id_str.'"';
+		$ret .= ',"listuri":"'.substr($result->uri,1).'"';
+		$ret .= '}';
+		echo $ret;
+	}
+	else echo '{"result": "error"}';
+?>
diff --git a/ajax/retweet.php b/ajax/retweet.php
index 6099d33..4f50de6 100644
--- a/ajax/retweet.php
+++ b/ajax/retweet.php
@@ -3,7 +3,7 @@
 		session_start();
 	}
 	include('../lib/twitese.php');
-	include('timeline_format.php');
+	include('../lib/timeline_format.php');
 	$t = getTwitter();
 	if(isset($_POST['status_id'])){
 		$id = trim($_POST['status_id']);
diff --git a/ajax/savedSearches.php b/ajax/savedSearches.php
new file mode 100644
index 0000000..65b95a8
--- /dev/null
+++ b/ajax/savedSearches.php
@@ -0,0 +1,42 @@
+<?php
+	if(!isset($_SESSION)){
+		session_start();
+	}
+	include ('../lib/twitese.php');
+	$t = getTwitter();
+	if ($_GET['method'] == "list") {
+		$ss = $t->savedSearches();
+		$answer = '[';
+		$firsts = true;
+
+		foreach($ss as $onesearch){
+			if (!$firsts){
+				$answer .= ',';
+			}
+			else{
+				$firsts = false;
+			}
+			$answer .= '["'.$onesearch->id_str.'", "'.$onesearch->query.'"]';
+		}
+
+		$answer .=']';
+		echo $answer;
+	}
+	else if ($_GET['method'] == "delete") {
+		$ssid = $_GET['ssid'];
+		$dss = $t->deleteSavedSearch($ssid);
+		if (isset($dss->query))
+			echo "success";
+		else
+			echo "error";
+	}
+	else if ($_GET['method'] == "save") {
+		$query = $_GET['query'];
+		$ss = $t->saveSearch($query);
+		if (isset($ss->query))
+			echo '["'.$ss->id_str.'", "'.$ss->query.'"]';
+		else
+			echo "error";
+	}
+?>
+
diff --git a/ajax/status.php b/ajax/status.php
index 5b8a1d0..5ca32f6 100644
--- a/ajax/status.php
+++ b/ajax/status.php
@@ -40,7 +40,7 @@
 			</span>
 			<span class="status_body">
 			<span class="status_id">'.$status_id.'</span>
-			<span class="status_word" style="font-size: 12px;"><a class="user_name" href="user.php?id='.$user->screen_name.'">'.$user->screen_name.'</a> <span class="tweet">'.$text.'</span></span>
+			<span class="status_word" style="font-size: 12px;"><a class="user_name" href="user.php?id='.$user->screen_name.'" id="'.$user->screen_name.'">'.($_COOKIE['shownick']=='true' ? $user->name : $user->screen_name).'</a> <span class="tweet">'.$text.'</span></span>
 			<span class="status_info" style="font-size: 11px; margin: 0px;">';
 		if($end && isset($status->in_reply_to_user_id)){
 			$html .= '<span class="in_reply_to"> <a class="ajax_reply" href="ajax/status.php?id='.$status->in_reply_to_status_id_str.'&uid='.$user->id.'">in reply to '.$status->in_reply_to_screen_name.'</a></span>';
diff --git a/ajax/timeline_format.php b/ajax/timeline_format.php
deleted file mode 100644
index dd0d97d..0000000
--- a/ajax/timeline_format.php
+++ /dev/null
@@ -1,172 +0,0 @@
-<?php
-	function format_retweet($status, $retweetByMe = false){
-		$retweeter = $status->user;
-		$rt_status = $status->retweeted_status;
-		$status_owner = $rt_status->user;
-		$date = formatDate($status->created_at);
-		$text = formatText($rt_status->text);
-		$html = '<li>
-			<span class="status_author">'.initShortcutMenu($status_owner).'
-			<a href="user.php?id='.$status_owner->screen_name.'" target="_blank"><img src="'.getAvatar($status_owner->profile_image_url).'" title="'.$status_owner->screen_name.'" /></a>
-			</span>
-			<span class="status_body">
-			<span title="Retweets from people you follow appear in your timeline." class="big-retweet-icon"></span>
-			<span class="status_id">'.$status->id.'</span>
-			<span class="status_word">
-			<a class="user_name" href="user.php?id='.$status_owner->screen_name.'">'.$status_owner->screen_name.'</a><span class="tweet">&nbsp;'.$text.'</span></span>';
-		$html .= recoverShortens($text);
-		$html .= '<span class="actions">
-			<a class="replie_btn" title="Reply" href="a_reply.php?id='.$rt_status->id.'">Reply</a>
-			<a class="rt_btn" title="Retweet" href="a_rt.php?id='.$rt_status->id.'">Retweet</a>';
-		if($retweetByMe != true){
-			$html .= '<a class="retw_btn" title="New Retweet" href="javascript:void(0);">New Retweet</a>';
-		}
-		$html .= '<a class="favor_btn" title="Favorite" href="a_favor.php?id='.$rt_status->id.'">Favorite</a>
-					<a class="trans_btn" title="Translate" href="javascript:void(0);">Translate</a>';
-		if($retweetByMe == true){
-			$html .= '<a class="delete_btn" title="Delete" href="javascript:void(0)"><span class="rt_id" style="display: none;">'.$status->id.'</span></a>';
-		}
-		$html .='</span>
-			<span class="status_info"><span class="source">Retweeted by <a href="user.php?id='.$retweeter->screen_name.'">'.$retweeter->screen_name.'</a> from '.$status->source.'</span>
-			<span class="date"><a href="status.php?id='.$rt_status->id.'" title="'.date('Y-m-d H:i:s', strtotime($status->created_at)).'" target="_blank">'.$date.'</a></span>
-			</span>
-			</span>
-			</li>';
-		return $html;
-	}
-
-	function format_retweet_of_me($status){
-		$status_owner = $status->user;
-		$date = formatDate($status->created_at);
-		$text = formatText($status->text);
-		$html = '<li>
-			<span class="status_author">
-			<a href="user.php?id='.$status_owner->screen_name.'" target="_blank"><img src="'.getAvatar($status_owner->profile_image_url).'" title="'.$status_owner->screen_name.'" /></a>
-			</span>
-			<span class="status_body">
-			<span title="Retweets from people you follow appear in your timeline." class="big-retweet-icon"></span>
-			<span class="status_id">'.$status->id.'</span>
-			<span class="status_word">
-			<a class="user_name" href="user.php?id='.$status_owner->screen_name.'">'.$status_owner->screen_name.'</a><span class="tweet">&nbsp;'.$text.'</span></span>';
-		$html .= recoverShortens($text);
-		$html .= '<span class="actions">
-			<a class="replie_btn" title="Reply" href="a_reply.php?id='.$status->id.'">Reply</a>
-			<a class="rt_btn" title="Retweet" href="a_rt.php?id='.$status->id.'">Retweet</a>
-			<a class="favor_btn" title="Favorite" href="a_favor.php?id='.$status->id.'">Favorite</a>
-			<a class="trans_btn" title="Translate" href="javascript:void(0);">Translate</a>
-			<a class="delete_btn" title="Delete" href="a_del.php?id='.$status->id.'&t=s">Delete</a>
-			</span>
-			<span class="status_info">from '.$status->source.'
-			<span class="date"><a href="status.php?id='.$status->id.'" title="'.date('Y-m-d H:i:s', strtotime($status->created_at)).'" target="_blank">'.$date.'</a></span>
-			</span>
-			</span>
-			</li>';
-		return $html;
-	}
-
-	function getRetweeters($id, $count = 20){
-		$t = getTwitter();
-		$retweeters = $t->getRetweeters($id);
-		$html = '<span class="vcard">';
-		foreach($retweeters as $retweeter){
-			$user = $retweeter->user;
-			$html .= '<a class="url" title="'.$user->name.'" rel="contact" href="../user.php?id='.$user->screen_name.'">
-				<img class="photo fn" width="24" height="24" src="'.getAvatar($user->profile_image_url).'" alt="'.$user->name.'" />
-				</a>';
-		}
-		$html .= "</span>";
-		return $html;
-	}
-
-	// $updateStatus 标识是否为发推, 是则应用指定 css
-	function format_timeline($status, $screen_name, $updateStatus = false){
-		$user = $status->user;
-		$date = formatDate($status->created_at);
-		$text = formatText($status->text);
-
-		if(preg_match('/^\@'.getTwitter()->username.'/i', $text) == 1){
-			$output = "<li class=\"reply\">";
-		}elseif($updateStatus == true){
-			$output = "<li class=\"mine\">";
-		}else{
-			$output = "<li>";
-		}
-
-		$output .= "<span class=\"status_author\">".initShortcutMenu($user)."
-			<a href=\"user.php?id=$user->screen_name\" target=\"_blank\"><img src=\"".getAvatar($user->profile_image_url)."\" title=\"$user->screen_name\" /></a>
-			</span>
-			<span class=\"status_body\">
-			<span class=\"status_id\">$status->id </span>
-			<span class=\"status_word\"><a class=\"user_name\" href=\"user.php?id=$user->screen_name\">$user->screen_name</a><span class=\"tweet\"> $text </span></span>";
-		$output .= recoverShortens($text);
-		$output .= "<span class=\"actions\">
-			<a class=\"replie_btn\" title=\"Reply\" href=\"a_reply.php?id=$status->id\">回复</a>
-			<a class=\"rt_btn\" title=\"Retweet\" href=\"a_rt.php?id=$status->id\">回推</a>";
-		if($user->screen_name != $screen_name){
-			$output .= "<a class=\"retw_btn\" title=\"New Retweet\" href=\"javascript:void(0);\">New Retweet</a>";
-		}
-		$output .= "<a class=\"favor_btn\" title=\"Favorite\" href=\"a_favor.php?id=$status->id\">Favorite</a>
-					<a class=\"trans_btn\" title=\"Translate\" href=\"javascript:void(0);\">Translate</a>";
-		if ($user->screen_name == $screen_name) $output .= "<a class=\"delete_btn\" title=\"Delete\" href=\"a_del.php?id=$status->id&t=s\">Delete</a>";
-		$output .= "</span><span class=\"status_info\">";
-		if ($status->in_reply_to_status_id) $output .= "<span class=\"in_reply_to\"> <a class=\"ajax_reply\" href=\"ajax/status.php?id=$status->in_reply_to_status_id&uid=$user->id \">in reply to $status->in_reply_to_screen_name</a>&nbsp;</span>";
-		$output .= "<span class=\"source\">from $status->source</span>
-			<span class=\"date\"><a href=\"status.php?id=$status->id\" title=\"".date('Y-m-d H:i:s', strtotime($status->created_at))."\" target=\"_blank\">$date</a></span>
-			</span>
-			</span>
-			</li>";
-		return $output;
-	}
-
-	/* ---------- Sorting timeline ---------- */
-	function cmp($a, $b)
-	{
-		$a_date = strtotime($a->created_at);
-		$b_date = strtotime($b->created_at);
-		if ($a_date == $b_date) {
-			return 0;
-		}
-		return ($a_date > $b_date) ? -1 : 1;
-	}
-
-	function sort_timeline($timeline, $retweet){
-		$status = array_merge($timeline, $retweet);
-		usort($status, "cmp");
-		return $status;
-	}
-
-	/* ---------- Restore shortened urls ---------- */
-	function initShortcutMenu($user = false){
-		return '';
-		if(!$user && !isset($user->screen_name)){
-			return '';
-		}
-
-		$username = getEncryptCookie('twitese_name');
-		if($user->screen_name == $username){
-			return '';
-		}
-		$relationship = getRelationship($user->screen_name, $username);
-
-		$mention = $dm = $unfollow = $follow = $block = $spam = '';
-		$mention = '<li class="rm_mention"><a href="javascript:void(0);"><i></i>Mention <span>'.$user->screen_name.'</a></li>';
-		if($relationship == 1){
-			$dm = '<li class="rm_dm"><a href="javascript:void(0);"><i></i>Direct message <span>'.$user->screen_name.'</span></a></li>';
-		}
-		if($relationship == 1 || $relationship == 2){
-			$unfollow = '<li class="rm_unfollow"><a href="javascript:void(0);"><i></i>Unfollow <span>'.$user->screen_name.'</span></a></li>';
-		}
-		if($relationship == 3 || $relationship == 4 || $relationship == 9){
-			$follow = '<li class="rm_follow"><a href="javascript:void(0);"><i></i>Follow <span>'.$user->screen_name.'</span></a></li>';
-		}
-		if($relationship == 4){
-			$block = '<li class="rm_unblock"><a href="javascript:void(0);"><i></i>Unblock <span>'.$user->screen_name.'</span></a></li>';
-		}else{
-			$block = '<li class="rm_block"><a href="javascript:void(0);"><i></i>Block <span>'.$user->screen_name.'</span></a></li>';
-		}
-		$spam = '<li class="rm_spam"><a href="javascript:void(0);"><i></i>Report <span>'.$user->screen_name.'</span> for spam</a></li>';
-		$html = '<ul class="right_menu round">'.$mention.$dm.$unfollow.$follow.$block.$spam.'</ul>';
-		return $html;
-	}
-
-?>
\ No newline at end of file
diff --git a/ajax/updateFollowing.php b/ajax/updateFollowing.php
index 4c2eb74..b8b7060 100644
--- a/ajax/updateFollowing.php
+++ b/ajax/updateFollowing.php
@@ -5,8 +5,8 @@
 	include('../lib/twitese.php');
 
 	$t = getTwitter();
-	$MAX_COUNT = 36;
-	$friends = $t->friends(false, false, $MAX_COUNT)->users;
+	$skip_status = false;
+	$friends = $t->friends(false, false, $skip_status)->users;
 	$html = '';
 	foreach($friends as $friend){
 		$html .= '<span class="vcard">
diff --git a/ajax/updateList.php b/ajax/updateList.php
index bfa7941..1d135f8 100644
--- a/ajax/updateList.php
+++ b/ajax/updateList.php
@@ -6,7 +6,7 @@
 	$t = getTwitter();
 	if ( isset($_GET['since_id']) && isset($_GET['id'])) {
 
-		$statuses = $t->listStatus($_GET['id'], false, $_GET['since_id']);
+		$statuses = $t->listStatus($_GET['id'], $_GET['since_id']);
 
 		$empty = count($statuses) == 0? true: false;
 
@@ -33,12 +33,12 @@
 					</span>
 					<span class=\"status_body\">
 					<span class=\"status_id\">$status->id_str </span>
-					<span class=\"status_word\"><a class=\"user_name\" href=\"user.php?id=$user->screen_name\">$user->screen_name</a><span class=\"tweet\"> $text </span></span>
+					<span class=\"status_word\"><a class=\"user_name\" href=\"user.php?id=$user->screen_name\" id=\"$user->screen_name\">".($_COOKIE['shownick']=='true' ? $user->name : $user->screen_name)."</a><span class=\"tweet\"> $text </span></span>
 					<span class=\"actions\">
 					<a class=\"replie_btn\" title=\"Reply\" href=\"a_reply.php?id=$status->id_str\">Reply</a>
 					<a class=\"rt_btn\" title=\"Retweet\" href=\"a_rt.php?id=$status->id_str\">RT</a>
 					<a class=\"favor_btn\" title=\"Favorite\" href=\"a_favor.php?id=$status->id_str\">Favor</a>";
-				if ($user->screen_name == $t->username) $output .= "<a class=\"delete_btn\" title=\"Delete\" href=\"a_del.php?id=$status->id_str&t=s\">删除</a>";
+				if ($user->screen_name == $t->username) $output .= "<a class=\"delete_btn\" title=\"Delete\" href=\"a_del.php?id=$status->id_str&t=s\">Delete</a>";
 				$output .= "</span><span class=\"status_info\">";
 				if ($status->in_reply_to_status_id_str) $output .= "<span class=\"in_reply_to\"> <a class=\"ajax_reply\" href=\"ajax/status.php?id=$status->in_reply_to_status_id_str&uid=$user->id \">in reply to $status->in_reply_to_screen_name</a></span>";
 				$output .= "<span class=\"source\">via $status->source</span>
diff --git a/ajax/updateMessage.php b/ajax/updateMessage.php
index 632720d..cf05d61 100644
--- a/ajax/updateMessage.php
+++ b/ajax/updateMessage.php
@@ -7,7 +7,7 @@
 	$t = getTwitter();
 	if ( isset($_GET['since_id']) ) {
 
-		$messages = $t->directMessages(false, $_GET['since_id']);
+		$messages = $t->directMessages($_GET['since_id']);
 		$count = count($messages);
 		if ($count == 0) {
 			echo "empty";
diff --git a/ajax/updateReplies.php b/ajax/updateReplies.php
index 9083748..bf553bf 100644
--- a/ajax/updateReplies.php
+++ b/ajax/updateReplies.php
@@ -7,7 +7,7 @@
 	$t = getTwitter();
 	if ( isset($_GET['since_id']) ) {
 
-		$statuses = $t->replies(false, $_GET['since_id']);
+		$statuses = $t->replies($_GET['since_id']);
 		$count = count($statuses);
 		if ($count == 0) {
 			echo "empty";
diff --git a/ajax/updateTimeline.php b/ajax/updateTimeline.php
index 397a200..cf4ac20 100644
--- a/ajax/updateTimeline.php
+++ b/ajax/updateTimeline.php
@@ -6,7 +6,7 @@
 	include('../lib/timeline_format.php');
 	$t = getTwitter();
 	if ( isset($_GET['since_id']) ) {
-		$statuses = $t->homeTimeline(false, $_GET['since_id']);
+		$statuses = $t->homeTimeline($_GET['since_id']);
 		$count = count($statuses);
 		$html = "";
 		if ($count <= 0) {
diff --git a/ajax/uploadImage.php b/ajax/uploadImage.php
index 002b4a2..655a845 100644
--- a/ajax/uploadImage.php
+++ b/ajax/uploadImage.php
@@ -1,29 +1,48 @@
-<?php
-	if(!isset($_SESSION)){
-		session_start();
-	}
-	include ('../lib/twitese.php');
-	if (isset($_FILES['image'])) {
-		$image = "@{$_FILES['image']['tmp_name']};type={$_FILES['image']['type']};filename={$_FILES['image']['name']}";
-		switch($_GET['do']) {
-			case 'image':
-			$result = imageUpload($image);
-			if (isset($result->url)) {
-				echo '{"result": "success" , "url" : "' . $result->url . '"}';
-			} else {
-				echo '{"result": "error"}';
-			}
-			break;
-			case 'profile':
-			$t = getTwitter();
-			$skip_status = $_POST['skip_status'];
-			$result = $t->updateProfileImage($image,$skip_status);
-			if ($t->http_code == 200) {
-				echo '{"result": "success"}';
-			} else {
-				echo '{"result": "error"}';
-			}
-			break;
-		}
-	}
-?>
+<?php
+	if(!isset($_SESSION)){
+		session_start();
+	}
+	include ('../lib/twitese.php');
+	switch($_GET['do']) {
+		case 'image':
+		if (!isset($_FILES['image'])) break;
+		$image = "@{$_FILES['image']['tmp_name']};type={$_FILES['image']['type']};filename={$_FILES['image']['name']}";
+		$result = imageUpload($image);
+		if (isset($result->url)) {
+			echo '{"result": "success" , "url" : "' . $result->url . '"}';
+		} else {
+			echo '{"result": "error"}';
+		}
+		break;
+		case 'profile':
+		if (!isset($_FILES['image'])) break;
+		$image = file_get_contents($_FILES['image']['tmp_name']);
+		$image = base64_encode($image);
+		$t = getTwitter();
+		$skip_status = $_POST['skip_status'];
+		$result = $t->updateProfileImage($image,$skip_status);
+		if ($t->http_code == 200) {
+			echo '{"result": "success"}';
+		} else {
+			echo '{"result": "error"}';
+		}
+		break;
+		case 'background':
+		$t = getTwitter();
+		if (isset($_POST['tile'])) {
+			$tile = $_POST['tile'];
+			$result = $t->updateProfileBackground(false, $tile);
+		}
+		else {
+			$image = file_get_contents($_FILES['image']['tmp_name']);
+			$image = base64_encode($image);
+			$result = $t->updateProfileBackground($image);
+		}
+		if ($t->http_code == 200) {
+			echo '{"result": "success", "url": "'. getAvatar($result->profile_background_image_url) .'", "tile": "'. ($result->profile_background_tile ? "true" : "false") .'"}';
+		} else {
+			echo '{"result": "error"}';
+		}
+		break;
+	}
+?>
diff --git a/ajax/uploadPhoto.php b/ajax/uploadPhoto.php
deleted file mode 100644
index f7c0bf7..0000000
--- a/ajax/uploadPhoto.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-	if(!isset($_SESSION)){
-		session_start();
-	}
-	include ('../lib/twitese.php');
-	$t = getTwitter();
-	if (isset($_FILES["image"])) {
-		$image = $_FILES["image"]['tmp_name'];
-		$result = $t->imglyUpload($image);
-		if (isset($result->mediaurl)) {
-			echo '{"result": "success" , "url" : "' . $result->mediaurl . '"}';
-		} else {
-			echo '{"result": "error"}';
-		}
-	}
-
-?>
diff --git a/all.php b/all.php
index ce21752..0b21f86 100644
--- a/all.php
+++ b/all.php
@@ -1,85 +1,91 @@
-<?php 
-	include_once('lib/twitese.php');
-	$title = 'Updates';
-	include_once('inc/header.php');
-	include_once('lib/timeline_format.php');
-	if (!loginStatus()) header('location: login.php');
-?>
-<div id="statuses" class="column round-left">
-<?php
-	include('inc/sentForm.php');
-?>
-<script src="js/all.js"></script>
-<style>.timeline li {border-bottom:1px solid #EFEFEF;border-top:none !important}</style>
-			<div id="allNav">
-			<a class="allBtn allHighLight" id="allTimelineBtn" href="#">Updates</a>
-			<a class="allBtn" id="allRepliesBtn" href="#">Replies</a>
-			<a class="allBtn" id="allMessageBtn" href="#">Messages</a>
-		</div>
-<?php
-	$statuses = $t->homeTimeline();
-	if ($statuses === false) {
-		header('location: error.php');exit();
-	}
-	$empty = count($statuses) == 0? true: false;
-	if ($empty) {
-		echo "<div id=\"empty\">No tweet to display</div>";
-	} else {
-		$output = '<ol class="timeline" id="allTimeline">';
-		foreach ($statuses as $status) {
-			if(isset($status->retweeted_status)){
-				$output .= format_retweet($status);
-			}else{
-				$output .= format_timeline($status, $t->username);
-			}
-		}
-
-		$output .= "</ol>";
-
-		echo $output;
-	}
-
-	$statuses = $t->replies();
-	if ($statuses === false) {
-		header('location: error.php');exit();
-	}
-	$empty = count($statuses) == 0? true: false;
-	if ($empty) {
-		echo "<div id=\"empty\">No tweet to display</div>";
-	} else {
-		$output = '<ol class="timeline" id="allReplies">';
-
-		foreach ($statuses as $status) {
-			$output .= format_timeline($status, $t->username);
-		}
-
-		$output .= "</ol>";
-
-		echo $output;
-	}
-
-
-	$messages = $t->directMessages();
-	if ($messages === false) {
-		header('location: error.php');exit();
-	}
-	$empty = count($messages) == 0? true: false;
-	if ($empty) {
-		echo "<div id=\"empty\">No tweet to display</div>";
-	} else {
-		$output = '<ol class="timeline" id="allMessage">';
-
-		foreach ($messages as $message) {
-			$output .= format_message($message);
-		}
-
-		$output .= "</ol>";
-		echo $output;
-	}
-?>
-</div>
-
-<?php 
-	include ('inc/sidebar.php');
-	include ('inc/footer.php');
-?>
+<?php 
+	include_once('lib/twitese.php');
+	$title = 'Updates';
+	include_once('inc/header.php');
+	include_once('lib/timeline_format.php');
+	if (!loginStatus()) header('location: login.php');
+?>
+<div id="statuses" class="column round-left">
+<?php
+	include('inc/sentForm.php');
+?>
+<script src="js/all.js"></script>
+<style>.timeline li {border-bottom:1px solid #EFEFEF;border-top:none !important}</style>
+			<div id="allNav">
+			<a class="allBtn allHighLight" id="allTimelineBtn" href="#">Updates</a>
+			<a class="allBtn" id="allRepliesBtn" href="#">Replies</a>
+			<a class="allBtn" id="allMessageBtn" href="#">Messages</a>
+		</div>
+<?php
+	$statuses = $t->homeTimeline();
+	if ($statuses === false) {
+		header('location: error.php');exit();
+	}
+	$empty = count($statuses) == 0? true: false;
+	if ($empty) {
+		echo "<div id=\"empty\">No tweet to display</div>";
+	} else if ($t->http_code == 429) {
+		echo "<div id=\"empty\">API quota is used out, please wait for a moment before next refresh.</div>";
+	} else {
+		$output = '<ol class="timeline" id="allTimeline">';
+		foreach ($statuses as $status) {
+			if(isset($status->retweeted_status)){
+				$output .= format_retweet($status);
+			}else{
+				$output .= format_timeline($status, $t->username);
+			}
+		}
+
+		$output .= "</ol>";
+
+		echo $output;
+	}
+
+	$statuses = $t->replies();
+	if ($statuses === false) {
+		header('location: error.php');exit();
+	}
+	$empty = count($statuses) == 0? true: false;
+	if ($empty) {
+		echo "<div id=\"empty\">No tweet to display</div>";
+	} else if ($t->http_code == 429) {
+		echo "<div id=\"empty\">API quota is used out, please wait for a moment before next refresh.</div>";
+	} else {
+		$output = '<ol class="timeline" id="allReplies">';
+
+		foreach ($statuses as $status) {
+			$output .= format_timeline($status, $t->username);
+		}
+
+		$output .= "</ol>";
+
+		echo $output;
+	}
+
+
+	$messages = $t->directMessages();
+	if ($messages === false) {
+		header('location: error.php');exit();
+	}
+	$empty = count($messages) == 0? true: false;
+	if ($empty) {
+		echo "<div id=\"empty\">No tweet to display</div>";
+	} else if ($t->http_code == 429) {
+		echo "<div id=\"empty\">API quota is used out, please wait for a moment before next refresh.</div>";
+	} else {
+		$output = '<ol class="timeline" id="allMessage">';
+
+		foreach ($messages as $message) {
+			$output .= format_message($message);
+		}
+
+		$output .= "</ol>";
+		echo $output;
+	}
+?>
+</div>
+
+<?php 
+	include ('inc/sidebar.php');
+	include ('inc/footer.php');
+?>
diff --git a/authorize.php b/authorize.php
index 65dbcdf..d39c8d5 100644
--- a/authorize.php
+++ b/authorize.php
@@ -1,6 +1,6 @@
-<?php
-
-	include ('lib/twitese.php');
-	$url = 'https://api.twitter.com/oauth/authorize';
-	echo processCurl($url, http_build_query($_POST));
+<?php
+
+	include ('lib/twitese.php');
+	$url = 'https://api.twitter.com/oauth/authorize';
+	echo processCurl($url, http_build_query($_POST));
 ?>
\ No newline at end of file
diff --git a/basic_auth.php b/basic_auth.php
deleted file mode 100644
index 822bfd9..0000000
--- a/basic_auth.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/* from http://www.rooftopsolutions.nl/blog/223 */
-
-	$validUser = BASIC_AUTH_USER;
-	$validPass = BASIC_AUTH_PW;
-	
-	$realm = 'input your speicial username and password here from your sitemaster';
-	$nonce = uniqid(); 
-	$digest = getDigest();
-	if (is_null($digest)) requireLogin($realm,$nonce); 
-	$digestParts = digestParse($digest);
-	$A1 = md5("{$validUser}:{$realm}:{$validPass}");
-	$A2 = md5("{$_SERVER['REQUEST_METHOD']}:{$digestParts['uri']}");
-	$validResponse = md5("{$A1}:{$digestParts['nonce']}:{$digestParts['nc']}:{$digestParts['cnonce']}:{$digestParts['qop']}:{$A2}");
-	
-	if ($digestParts['response']!=$validResponse) requireLogin($realm,$nonce);
-	function getDigest() {
-    if (isset($_SERVER['PHP_AUTH_DIGEST'])) {
-        $digest = $_SERVER['PHP_AUTH_DIGEST'];
-    } elseif (isset($_SERVER['HTTP_AUTHENTICATION'])) {
-            if (strpos(strtolower($_SERVER['HTTP_AUTHENTICATION']),'digest')===0) 
-              $digest = substr($_SERVER['HTTP_AUTHORIZATION'], 7);
-    }
-    return $digest;
-	}
-
-function requireLogin($realm,$nonce) {
-    header('WWW-Authenticate: Digest realm="' . $realm . '",qop="auth",nonce="' . $nonce . '",opaque="' . md5($realm) . '"');
-    header('HTTP/1.0 401 Unauthorized');
-    die();
-}
-
-function digestParse($digest) {
-    $needed_parts = array('nonce'=>1, 'nc'=>1, 'cnonce'=>1, 'qop'=>1, 'username'=>1, 'uri'=>1, 'response'=>1);
-    $data = array();
-    preg_match_all('@(\w+)=(?:(?:")([^"]+)"|([^\s,$]+))@', $digest, $matches, PREG_SET_ORDER);
-    foreach ($matches as $m) {
-        $data[$m[1]] = $m[2] ? $m[2] : $m[3];
-        unset($needed_parts[$m[1]]);
-    }
-    return $needed_parts ? false : $data;
-}
-?>
\ No newline at end of file
diff --git a/block.php b/block.php
index d92d1c8..655e488 100644
--- a/block.php
+++ b/block.php
@@ -1,12 +1,12 @@
-<?php
-include('lib/twitese.php');
-$title = "Blocking";
-include('inc/header.php');
-if(!loginStatus()){
-	header('location: login.php');
-}
-$type = 'blocks';
-include('inc/userlist.php');
-include('inc/sidebar.php');
-include('inc/footer.php');
-?>
+<?php
+include('lib/twitese.php');
+$title = "Blocking";
+include('inc/header.php');
+if(!loginStatus()){
+	header('location: login.php');
+}
+$type = 'blocks';
+include('inc/userlist.php');
+include('inc/sidebar.php');
+include('inc/footer.php');
+?>
diff --git a/browse.php b/browse.php
deleted file mode 100644
index d91bbbf..0000000
--- a/browse.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php 
-	include ('lib/twitese.php');
-	$title = "Public";
-	include ('inc/header.php');
-	if (!loginStatus()) header('location: login.php');
-?>
-
-<script src="js/browse.js"></script>
-
-<div id="statuses" class="column round-left">
-	<h2 id="browse_title">See what people are saying about…</h2>
-	<div class="clear"></div>
-	
-	<?php
-	// selected from top 50 freqently used Han Chracter in http://www.cslog.cn/Content/word-frequency-list-of-chinese/
-		$seed = array(
-		'的', '一', '是', '不', '了', '我', '人', '在', '有', '这', '他', '来', '个', '上', '说', '中', '大', '为', '到', '道', '你', '们', '出', '就', '时', '以', '之', '那', '和', '子', '地', '得', '自', '要', '下', '可', '而', '学', '过', '对', '么', '然', '她', '国', '去', '里'
-	);
-		if(!isset($_COOKIE['browse_seed'])) {
-			$browse_seed = $seed[mt_rand(0,48)];
-			setcookie('browse_seed', $browse_seed, $_SERVER['REQUEST_TIME']+300, '/');
-		} else {
-			$browse_seed = $_COOKIE['browse_seed'];
-		}
-		$t = getTwitter();
-		$p = 1;
-		if (isset($_GET['p'])) {
-			$p = (int) $_GET['p'];
-			if ($p <= 0) $p = 1;
-		}
-	
-		$statuses = $t->search($browse_seed, $p, 50);
-		$resultCount = count($statuses->results);
-		if ($resultCount <= 0) {
-			echo "<div id=\"empty\">No tweet to display.</div>";
-		} else {
-			include_once('lib/timeline_format.php');
-			$output = '<ol class="timeline" id="allTimeline">';
-			foreach ($statuses->results as $status) {
-				if(!preg_match('/[\p{Hiragana}\p{Katakana}\p{Hangul}]+/u', $status->text) ) { // filter the Japanese and Korean tweets since some of Han Character included.
-					$output .= format_search($status);
-				}
-			}
-			$output .= "</ol><div id=\"pagination\">";
-
-			if ($p >1) $output .= "<a id=\"more\" class=\"round more\" style=\"float: left;\" href=\"browse.php?p=" . ($p-1) . "\">Back</a>";
-			if (!$empty) $output .= "<a id=\"more\" class=\"round more\" style=\"float: right;\" href=\"browse.php?p=" . ($p+1) . "\">Next</a>";
-			
-			$output .= "</div>";
-			echo $output;
-		}
-	?>
-</div>
-
-<?php 
-	include ('inc/sidebar.php');
-	include ('inc/footer.php');
-?>
diff --git a/css/main.css b/css/main.css
index 5d2d3c8..f79369a 100644
--- a/css/main.css
+++ b/css/main.css
@@ -239,7 +239,8 @@ td.column,#side .stats td{padding:0;vertical-align:top}
 #side hr{float:left;width:177px;display:block;border:0;height:1px;margin:7px 0 6px 11px;opacity:.7;background:#C0DEED;color:#C0DEED}
 .notify{text-align:center;line-height:1;padding:5px 0;background-repeat:no-repeat;background-position:left center;margin-bottom:8px}
 .notify div{background-color:#edffe5;font-size:.9em;margin:0 12px 0 24px;padding:10px 5px;border-radius:5px}
-#trend_entries, #apiquota_list{display:none;width:198px;float:left;margin-top:5px!important}
+#trend_entries, #apiquota_list{display:none;width:177px;float:left;margin-top:5px!important}
+#trend_entries li{word-break:break-all}
 #trends, #following, #apiquota, #version{margin-left:-2px}
 #trends_title, #following_title, #apiquota_title,#version_title{background:transparent url(../img/toggle_down_dark.png) no-repeat scroll right center;font-weight:400;font-size:110%;padding-left:3px;margin-bottom:0;margin-top:0;width:177px;cursor:pointer}
 #version_title{background:none!important}
@@ -315,14 +316,15 @@ footer li img{border:0 none;margin:-3px;padding:0}
 /*actions button*/
 .actions{border-width:0;bottom:8px;line-height:1.25em;position:absolute;right:0;display:none;z-index:9}
 .rt_btn,.replie_btn,.favor_btn,.delete_btn,.msg_replie_btn,.msg_delete_btn,.retw_btn,.trans_btn,.unfav_btn,.unrt_btn{display:inline-block;height:16px;width:21px;margin:-7px 0;overflow:hidden;text-indent:-9999em}
+.ss_delete_btn{display:inline-block;height:16px;width:21px;overflow:hidden;text-indent:-9999em;float:right}
 .replie_btn,.msg_replie_btn{background:url("../img/sprite_icons.png") no-repeat scroll 4px 1px transparent}
 .replie_btn:hover,.msg_replie_btn:hover{background:url("../img/sprite_icons.png") no-repeat scroll -17px 1px transparent}
 .retw_btn,.unrt_btn:hover{background:url("../img/sprite_icons.png") no-repeat scroll 0 -15px transparent}
 .retw_btn:hover,.unrt_btn{background:url("../img/sprite_icons.png") no-repeat scroll -21px -15px transparent}
 .favor_btn,.unfav_btn:hover{background:url("../img/sprite_icons.png") no-repeat scroll 2px -32px transparent}
 .favor_btn:hover,.unfav_btn{background:url("../img/sprite_icons.png") no-repeat scroll -19px -32px transparent}
-.delete_btn,.msg_delete_btn{background:url("../img/sprite_icons.png") no-repeat scroll 0 -47px transparent}
-.delete_btn:hover,.msg_delete_btn:hover{background:transparent url(../img/sprite_icons.png) no-repeat scroll -21px -47px}
+.ss_delete_btn,.delete_btn,.msg_delete_btn{background:url("../img/sprite_icons.png") no-repeat scroll 0 -47px transparent}
+.ss_delete_btn:hover,.delete_btn:hover,.msg_delete_btn:hover{background:transparent url(../img/sprite_icons.png) no-repeat scroll -21px -47px}
 .rt_btn{background:url("../img/sprite_icons.png") no-repeat scroll 0 -63px transparent}
 .rt_btn:hover{background:url("../img/sprite_icons.png") no-repeat scroll -21px -63px transparent}
 .trans_btn{background:url("../img/sprite_icons.png") no-repeat scroll -2px -79px transparent}
@@ -463,4 +465,4 @@ fieldset.common-form td[colspan=2]{text-align:right}
 .right_menu .rm_spam:hover i, .right_menu .ul_spam:hover i{background-position:-256px -32px}
 
 /*Twitter Buttons*/
-.btn-m,input[type=submit].btn-m,input[type=button].btn-m{background-position:0 -200px;font-size:15px;line-height:20px;padding:5px 15px 6px;border-radius:5px}.btn-l,input[type=submit].btn-l,input[type=button].btn-l{background-position:0 -400px;font-size:20px;line-height:26px;padding:7px 20px 9px;border-radius:6px}.btn-light{background-color:#add!important;background-image:url("https://s3.amazonaws.com/twitter_production/a/1261078355/images/buttons/bg-btn-light.gif")!important;border-color:#add #add #9cc!important;text-shadow:1px 1px 0 #dff!important}.btn-dark{background-color:#59a!important;background-image:url("https://s3.amazonaws.com/twitter_production/a/1261078355/images/buttons/bg-btn-dark.gif")!important;border-color:#59a #59a #489!important;color:#fff!important;text-shadow:-1px -1px 0 #59a!important}.btn-blue{background-color:#39d!important;background-image:url("https://s3.amazonaws.com/twitter_production/a/1261078355/images/buttons/bg-btn-blue.gif")!important;border-color:#39d #39d #28c!important;color:#fff!important;text-shadow:-1px -1px 0 #39d!important}.btn-chart{background-color:#9c2!important;background-image:url("https://s3.amazonaws.com/twitter_production/a/1261078355/images/buttons/bg-btn-chart.gif")!important;border-color:#9c2 #9c2 #8b1!important;text-shadow:1px 1px 0 #df6!important}.btn-mint{background-color:#a22!important;background-image:url("https://s3.amazonaws.com/twitter_production/a/1261078355/images/buttons/bg-btn-mint.gif")!important;border-color:#bdb #bdb #aca!important;text-shadow:1px 1px 0 #efe!important}.btn-green{background-color:#272!important;background-image:url("../img/bg-btn-green.gif")!important;border-color:#272 #272 #161!important;color:#fff!important;text-shadow:-1px -1px 0 #272!important}.btn-pink{background-color:#daa!important;background-image:url("https://s3.amazonaws.com/twitter_production/a/1261078355/images/buttons/bg-btn-pink.gif")!important;border-color:#daa #daa #c99!important;text-shadow:1px 1px 0 #fdd!important}.btn-red{background-color:#a22!important;background-image:url("../img/bg-btn-red.gif")!important;background-position:0 0;border-color:#a22 #a22 #911!important;text-shadow:-1px -1px 0 #a22!important;color:#fff!important}.btn:hover,.btn:focus,input[type=submit].btn:hover,input[type=submit].btn:focus,button.btn:hover,button.btn:focus{border-color:#999 #999 #888;background-position:0 -6px;color:#000}.btn-light:hover,.btn-light:focus{border-color:#7aa #7aa #699}.btn-dark:hover,.btn-dark:focus{border-color:#267 #267 #156;color:#fff}.btn-blue:hover,.btn-blue:focus{border-color:#17b #17b #06a;color:#fff}.btn-chart:hover,.btn-chart:focus{border-color:#7a1 #7a1 #690}.btn-mint:hover,.btn-mint:focus,input[type=submit].btn-mint:hover,input[type=submit].btn-mint:focus,button.btn-mint:hover,button.btn-mint:focus{border-color:#8a8 #8a8 #797!important}.btn-green:hover,.btn-green:focus,input[type=submit].btn-green:hover,input[type=submit].btn-green:focus,button.btn-green:hover,button.btn-green:focus{background-color:#272!important;border-color:#050 #050 #040!important;color:#fff}.btn-pink:hover,.btn-pink:focus,input[type=submit].btn-pink:hover,input[type=submit].btn-pink:focus,button.btn-pink:hover,button.btn-pink:focus{border-color:#a88 #a88 #977!important}.btn-red:hover,.btn-red:focus,input[type=submit].btn-red:hover,input[type=submit].btn-red:focus,button.btn-red:hover,button.btn-red:focus{background-color:#a22!important;border-color:#611 #611 #500!important;color:#fff}.btn-m:hover,.btn-m:focus,input[type=submit].btn-m:hover,input[type=submit].btn-m:focus,button.btn-m:hover,button.btn-m:focus{background-position:0 -206px}.btn-l:hover,.btn-l:focus,input[type=submit].btn-l:hover,input[type=submit].btn-l:focus,button.btn-l:hover,button.btn-l:focus{background-position:0 -406px}.dbtn,.dbtn:hover,.dbtn:focus,.dbtn:active,button.dbtn:hover,button.dbtn:focus{background:#eee;border-color:#ddd;color:#aaa;text-shadow:none}.btn-light.dbtn,.btn-light.dbtn:hover,.btn-light.dbtn:focus,.btn-light.dbtn:active{background:#dee;border-color:#cdd;color:#9aa}.btn-dark.dbtn,.btn-dark.dbtn:hover,.btn-dark.dbtn:focus,.btn-dark.dbtn:active{background:#aad5dd;border-color:#99c5cc;color:#ddf6f6}.btn-blue.dbtn,.btn-blue.dbtn:hover,.btn-blue.dbtn:focus,.btn-blue.dbtn:active{background:#bde;border-color:#acd;color:#def}.btn-chart.dbtn,.btn-chart.dbtn:hover,.btn-chart.dbtn:focus,.btn-chart.dbtn:active{background:#deb;border-color:#cda;color:#ab9}.btn-mint.dbtn,.btn-mint.dbtn:hover,.btn-mint.dbtn:focus,.btn-mint.dbtn:active{background:#ded;border-color:#cdc;color:#9a9}.btn-green.dbtn,.btn-green.dbtn:hover,.btn-green.dbtn:focus,.btn-green.dbtn:active{background:#aca;border-color:#9b9;color:#ded}.btn-pink.dbtn,.btn-pink.dbtn:hover,.btn-pink.dbtn:focus,.btn-pink.dbtn:active{background:#edd;border-color:#dcc;color:#a99}.btn-red.dbtn,.btn-red.dbtn:hover,.btn-red.dbtn:focus,.btn-red.dbtn:active{background:#caa;border-color:#b99;color:#edd}
\ No newline at end of file
+.btn-m,input[type=submit].btn-m,input[type=button].btn-m{background-position:0 -200px;font-size:15px;line-height:20px;padding:5px 15px 6px;border-radius:5px}.btn-l,input[type=submit].btn-l,input[type=button].btn-l{background-position:0 -400px;font-size:20px;line-height:26px;padding:7px 20px 9px;border-radius:6px}.btn-light{background-color:#add!important;background-image:url("https://s3.amazonaws.com/twitter_production/a/1261078355/images/buttons/bg-btn-light.gif")!important;border-color:#add #add #9cc!important;text-shadow:1px 1px 0 #dff!important}.btn-dark{background-color:#59a!important;background-image:url("https://s3.amazonaws.com/twitter_production/a/1261078355/images/buttons/bg-btn-dark.gif")!important;border-color:#59a #59a #489!important;color:#fff!important;text-shadow:-1px -1px 0 #59a!important}.btn-blue{background-color:#39d!important;background-image:url("https://s3.amazonaws.com/twitter_production/a/1261078355/images/buttons/bg-btn-blue.gif")!important;border-color:#39d #39d #28c!important;color:#fff!important;text-shadow:-1px -1px 0 #39d!important}.btn-chart{background-color:#9c2!important;background-image:url("https://s3.amazonaws.com/twitter_production/a/1261078355/images/buttons/bg-btn-chart.gif")!important;border-color:#9c2 #9c2 #8b1!important;text-shadow:1px 1px 0 #df6!important}.btn-mint{background-color:#a22!important;background-image:url("https://s3.amazonaws.com/twitter_production/a/1261078355/images/buttons/bg-btn-mint.gif")!important;border-color:#bdb #bdb #aca!important;text-shadow:1px 1px 0 #efe!important}.btn-green{background-color:#272!important;background-image:url("../img/bg-btn-green.gif")!important;border-color:#272 #272 #161!important;color:#fff!important;text-shadow:-1px -1px 0 #272!important}.btn-pink{background-color:#daa!important;background-image:url("https://s3.amazonaws.com/twitter_production/a/1261078355/images/buttons/bg-btn-pink.gif")!important;border-color:#daa #daa #c99!important;text-shadow:1px 1px 0 #fdd!important}.btn-red{background-color:#a22!important;background-image:url("../img/bg-btn-red.gif")!important;background-position:0 0;border-color:#a22 #a22 #911!important;text-shadow:-1px -1px 0 #a22!important;color:#fff!important}.btn:hover,.btn:focus,input[type=submit].btn:hover,input[type=submit].btn:focus,button.btn:hover,button.btn:focus{border-color:#999 #999 #888;background-position:0 -6px;color:#000}.btn-light:hover,.btn-light:focus{border-color:#7aa #7aa #699}.btn-dark:hover,.btn-dark:focus{border-color:#267 #267 #156;color:#fff}.btn-blue:hover,.btn-blue:focus{border-color:#17b #17b #06a;color:#fff}.btn-chart:hover,.btn-chart:focus{border-color:#7a1 #7a1 #690}.btn-mint:hover,.btn-mint:focus,input[type=submit].btn-mint:hover,input[type=submit].btn-mint:focus,button.btn-mint:hover,button.btn-mint:focus{border-color:#8a8 #8a8 #797!important}.btn-green:hover,.btn-green:focus,input[type=submit].btn-green:hover,input[type=submit].btn-green:focus,button.btn-green:hover,button.btn-green:focus{background-color:#272!important;border-color:#050 #050 #040!important;color:#fff}.btn-pink:hover,.btn-pink:focus,input[type=submit].btn-pink:hover,input[type=submit].btn-pink:focus,button.btn-pink:hover,button.btn-pink:focus{border-color:#a88 #a88 #977!important}.btn-red:hover,.btn-red:focus,input[type=submit].btn-red:hover,input[type=submit].btn-red:focus,button.btn-red:hover,button.btn-red:focus{background-color:#a22!important;border-color:#611 #611 #500!important;color:#fff}.btn-m:hover,.btn-m:focus,input[type=submit].btn-m:hover,input[type=submit].btn-m:focus,button.btn-m:hover,button.btn-m:focus{background-position:0 -206px}.btn-l:hover,.btn-l:focus,input[type=submit].btn-l:hover,input[type=submit].btn-l:focus,button.btn-l:hover,button.btn-l:focus{background-position:0 -406px}.dbtn,.dbtn:hover,.dbtn:focus,.dbtn:active,button.dbtn:hover,button.dbtn:focus{background:#eee;border-color:#ddd;color:#aaa;text-shadow:none}.btn-light.dbtn,.btn-light.dbtn:hover,.btn-light.dbtn:focus,.btn-light.dbtn:active{background:#dee;border-color:#cdd;color:#9aa}.btn-dark.dbtn,.btn-dark.dbtn:hover,.btn-dark.dbtn:focus,.btn-dark.dbtn:active{background:#aad5dd;border-color:#99c5cc;color:#ddf6f6}.btn-blue.dbtn,.btn-blue.dbtn:hover,.btn-blue.dbtn:focus,.btn-blue.dbtn:active{background:#bde;border-color:#acd;color:#def}.btn-chart.dbtn,.btn-chart.dbtn:hover,.btn-chart.dbtn:focus,.btn-chart.dbtn:active{background:#deb;border-color:#cda;color:#ab9}.btn-mint.dbtn,.btn-mint.dbtn:hover,.btn-mint.dbtn:focus,.btn-mint.dbtn:active{background:#ded;border-color:#cdc;color:#9a9}.btn-green.dbtn,.btn-green.dbtn:hover,.btn-green.dbtn:focus,.btn-green.dbtn:active{background:#aca;border-color:#9b9;color:#ded}.btn-pink.dbtn,.btn-pink.dbtn:hover,.btn-pink.dbtn:focus,.btn-pink.dbtn:active{background:#edd;border-color:#dcc;color:#a99}.btn-red.dbtn,.btn-red.dbtn:hover,.btn-red.dbtn:focus,.btn-red.dbtn:active{background:#caa;border-color:#b99;color:#edd}
diff --git a/error.php b/error.php
index c4f9779..f6d2621 100644
--- a/error.php
+++ b/error.php
@@ -1,29 +1,25 @@
-<?php 
-	include ('lib/twitese.php');
-	$title = "Error";
-	include ('inc/header.php');
-?>
-
-<div id="login_area">
-	<div id="error">
-		<?php
-		if ( isset($_GET['t'])){ 
-			switch($_GET['t']){
-				case 1:
-				echo '<p>Fail to connect Twitter right now. Please <a href="index.php">go back</a> or <a href="logout.php">sign in</a> minutes later.</p>';
-				if(loginStatus())
-				{
-				echo '<p> The API will reset in '.intval((format_time(getTwitter()->ratelimit()->reset_time) - time())/60).' min(s).';
-				break;
-				}
-				default:
-				echo '<p>Ooops, an unknown error occured. Please <a href="index.php">go back</a> or <a href="logout.php">sign in</a> again.</p>';
-			}
-		} else{
-			echo '<p>Ooops, an unknown error occured. Please <a href="index.php">go back</a> or <a href="logout.php">sign in</a> again.</p>';
-		}
-		?>
-	</div>
-</div>	
-
-<?php include ('inc/footer.php') ?>
+<?php 
+	include ('lib/twitese.php');
+	$title = "Error";
+	include ('inc/header.php');
+?>
+
+<div id="login_area">
+	<div id="error">
+		<?php
+		if ( isset($_GET['t'])){ 
+			switch($_GET['t']){
+				case 1:
+				echo '<p>Fail to connect Twitter right now. Please <a href="index.php">go back</a> or <a href="logout.php">sign in</a> minutes later.</p>';
+				break;
+				default:
+				echo '<p>Ooops, an unknown error occured. Please <a href="index.php">go back</a> or <a href="logout.php">sign in</a> again.</p>';
+			}
+		} else{
+			echo '<p>Ooops, an unknown error occured. Please <a href="index.php">go back</a> or <a href="logout.php">sign in</a> again.</p>';
+		}
+		?>
+	</div>
+</div>	
+
+<?php include ('inc/footer.php') ?>
diff --git a/favicon.gif b/favicon.gif
deleted file mode 100644
index e69de29..0000000
diff --git a/favicon.ico b/favicon.ico
deleted file mode 100644
index 379f3cd..0000000
Binary files a/favicon.ico and /dev/null differ
diff --git a/favor.php b/favor.php
index a0d16ed..08ae8b9 100644
--- a/favor.php
+++ b/favor.php
@@ -1,55 +1,61 @@
-<?php 
-	include ('lib/twitese.php');
-	$title = "My Favorites";
-	include ('inc/header.php');
-	if (!loginStatus()) header('location: login.php');
-?>
-
-<script src="js/btns.js"></script>
-
-<div id="statuses" class="column round-left">
-
-	<?php include('inc/sentForm.php')?>
-
-<?php 
-	$t = getTwitter();
-	$p = 1;
-	if (isset($_GET['p'])) {
-		$p = (int) $_GET['p'];
-		if ($p <= 0) $p = 1;
-	}
-
-	$statuses = $t->getFavorites($p);
-	if ($statuses === false) {
-		header('location: error.php');exit();
-	} 
-	$empty = count($statuses) == 0? true: false;
-	if ($empty) {
-		echo "<div id=\"empty\">No tweet to display.</div>";
-	} else {
-		$output = '<ol class="timeline" id="allTimeline">';
-		include('lib/timeline_format.php');
-		foreach ($statuses as $status) {
-			if (isset($status->retweeted_status)) {
-				$output .= format_retweet($status);
-			} else { 
-				$output .= format_timeline($status,$t->username);
-			}
-		}
-
-		$output .= "</ol><div id=\"pagination\">";
-
-		if ($p >1) $output .= "<a id=\"more\" class=\"round more\" style=\"float: left;\" href=\"favor.php?p=" . ($p-1) . "\">Back</a>";
-		if (!$empty) $output .= "<a id=\"more\" class=\"round more\" style=\"float: right;\" href=\"favor.php?p=" . ($p+1) . "\">Next</a>";
-
-		$output .= "</div>";
-
-		echo $output;
-	}
-?>
-</div>
-
-<?php 
-	include ('inc/sidebar.php');
-	include ('inc/footer.php');
-?>
+<?php 
+	include ('lib/twitese.php');
+	$title = "My Favorites";
+	include ('inc/header.php');
+	if (!loginStatus()) header('location: login.php');
+?>
+
+<script src="js/btns.js"></script>
+
+<div id="statuses" class="column round-left">
+
+	<?php include('inc/sentForm.php')?>
+
+<?php 
+	$t = getTwitter();
+	$user_id = isset($_GET['user_id']) ? $_GET['user_id'] : false;
+	$since_id = isset($_GET['since_id']) ? $_GET['since_id'] : false;
+	$max_id = isset($_GET['max_id']) ? $_GET['max_id'] : false;
+
+	$statuses = $t->getFavorites($user_id, $since_id, $max_id);
+	if ($statuses === false) {
+		header('location: error.php');exit();
+	} 
+	$empty = count($statuses) == 0 ? true : false;
+	if ($empty) {
+		echo "<div id=\"empty\">No tweet to display.</div>";
+	} else if ($t->http_code == 429) {
+		echo "<div id=\"empty\">API quota is used out, please wait for a moment before next refresh.</div>";
+	} else {
+		$output = '<ol class="timeline" id="allTimeline">';
+		include('lib/timeline_format.php');
+		$firstid = false;
+		$lastid = false;
+		foreach ($statuses as $status) {
+			if (isset($status->retweeted_status)) {
+				$output .= format_retweet($status);
+			} else { 
+				$output .= format_timeline($status,$t->username);
+			}
+			if(!$firstid)
+				$firstid = $status->id_str;
+			$lastid = $status->id_str;
+		}
+		$lastid = bcsub($lastid, "1");
+
+		$output .= "</ol><div id=\"pagination\">";
+
+		$output .= "<a id=\"less\" class=\"round more\" style=\"float: left;\" href=\"favor.php?since_id={$firstid}\">Back</a>";
+		$output .= "<a id=\"more\" class=\"round more\" style=\"float: right;\" href=\"favor.php?max_id={$lastid}\">Next</a>";
+
+		$output .= "</div>";
+
+		echo $output;
+	}
+?>
+</div>
+
+<?php 
+	include ('inc/sidebar.php');
+	include ('inc/footer.php');
+?>
diff --git a/followers.php b/followers.php
index a4a866a..0c9f6c2 100644
--- a/followers.php
+++ b/followers.php
@@ -1,11 +1,11 @@
-<?php 
-	include ('lib/twitese.php');
-	$title = "Followers";
-	include ('inc/header.php');
-	if (!loginStatus()) header('location: login.php');
-	
-	$type = 'followers';
-	include ('inc/userlist.php');
-	include ('inc/sidebar.php');
-	include ('inc/footer.php');
-?>
+<?php 
+	include ('lib/twitese.php');
+	$title = "Followers";
+	include ('inc/header.php');
+	if (!loginStatus()) header('location: login.php');
+	
+	$type = 'followers';
+	include ('inc/userlist.php');
+	include ('inc/sidebar.php');
+	include ('inc/footer.php');
+?>
diff --git a/friends.php b/friends.php
index 1e5094c..344dab1 100644
--- a/friends.php
+++ b/friends.php
@@ -1,10 +1,10 @@
-<?php 
-	include ('lib/twitese.php');
-	$title = "Following";
-	include ('inc/header.php');
-	if (!loginStatus()) header('location: login.php');
-	$type = 'friends';
-	include ('inc/userlist.php');
-	include ('inc/sidebar.php');
-	include ('inc/footer.php');
-?>
+<?php 
+	include ('lib/twitese.php');
+	$title = "Following";
+	include ('inc/header.php');
+	if (!loginStatus()) header('location: login.php');
+	$type = 'friends';
+	include ('inc/userlist.php');
+	include ('inc/sidebar.php');
+	include ('inc/footer.php');
+?>
diff --git a/img/3.gif b/img/3.gif
deleted file mode 100644
index 03cf895..0000000
Binary files a/img/3.gif and /dev/null differ
diff --git a/img/bg-front.gif b/img/bg-front.gif
deleted file mode 100644
index f0ad699..0000000
Binary files a/img/bg-front.gif and /dev/null differ
diff --git a/img/bg_faux.png b/img/bg_faux.png
deleted file mode 100644
index 51c15d9..0000000
Binary files a/img/bg_faux.png and /dev/null differ
diff --git a/img/bird.png b/img/bird.png
deleted file mode 100644
index 24df7c3..0000000
Binary files a/img/bird.png and /dev/null differ
diff --git a/img/faved.png b/img/faved.png
deleted file mode 100644
index e6ff4c4..0000000
Binary files a/img/faved.png and /dev/null differ
diff --git a/img/nexus_intro.png b/img/nexus_intro.png
deleted file mode 100644
index 1f36c1f..0000000
Binary files a/img/nexus_intro.png and /dev/null differ
diff --git a/img/nexus_logo.png b/img/nexus_logo.png
deleted file mode 100644
index 5e1c25a..0000000
Binary files a/img/nexus_logo.png and /dev/null differ
diff --git a/img/rabr_cry.gif b/img/rabr_cry.gif
deleted file mode 100644
index cacb63f..0000000
Binary files a/img/rabr_cry.gif and /dev/null differ
diff --git a/img/rabr_login.jpg b/img/rabr_login.jpg
deleted file mode 100644
index 2ae53cb..0000000
Binary files a/img/rabr_login.jpg and /dev/null differ
diff --git a/img/rabr_logo.png b/img/rabr_logo.png
deleted file mode 100644
index e272759..0000000
Binary files a/img/rabr_logo.png and /dev/null differ
diff --git a/inc/followingWall.php b/inc/followingWall.php
deleted file mode 100644
index 67b8730..0000000
--- a/inc/followingWall.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-	if(!isset($_SESSION)){
-		session_start();
-	}
-	include('../lib/twitese.php');
-
-	$t = getTwitter();
-	$friends = $t->friends()->users;
-	$html = '<div id="following_list">';
-	foreach($friends as $friend){
-		$html .= '<span class="vcard">
-			<a class="url" title="'.$friend->name.'" rel="contact" href="../user.php?id='.$friend->screen_name.'">
-			<img class="photo fn" width="24" height="24" src="'.getAvatar($friend->profile_image_url).'" alt="'.$friend->name.'" />
-			</a>
-			</span>';
-	}
-	echo $html.'</div>';
-?>
diff --git a/inc/footer.php b/inc/footer.php
index 7958d65..ccafcd8 100644
--- a/inc/footer.php
+++ b/inc/footer.php
@@ -1,19 +1,19 @@
-			</tr>
-          </tbody>
-        </table>
-		<div class="clear"></div>
-			<footer class="round">
-			<ul>
-			<li>&copy; 2013 Contributors incl. <a href="profile.php" title="It is you that make it!" target="_blank"><?php echo getEncryptCookie('twitese_name')?></a></li>
-			<?php if (BLOG_SITE) { ?><li><a href="<?php echo BLOG_SITE ?>" title="Site Owner's Blog" target="_blank">Blog</a></li><?php }?>
-			<li><a href="http://code.google.com/p/tuite/" target="_blank" title="Embr is proundly powered by the Open Source project - Twitese & Rabr">Twitese</a></li>
-			<li><a href="http://code.google.com/p/embr/" target="_blank">Open Source</a></li>
-			<?php if (SITE_OWNER) { ?><li>Run by <a href="https://twitter.com/<?php echo SITE_OWNER ?>" target="_blank"><?php echo SITE_OWNER ?></a></li><?php }?>
-			</ul>
-			</footer>
-		</div>
-	</div>
-<script>var nav=document.getElementById("primary_nav");var links=nav.getElementsByTagName("a");var currenturl=document.location.href;for(var i=0;i<links.length;i++){var linkurl=links[i].getAttribute("href");if(currenturl==links[i]){links[i].className="active";}}</script>
-</body>
-</html>
+			</tr>
+          </tbody>
+        </table>
+		<div class="clear"></div>
+			<footer class="round">
+			<ul>
+			<li>&copy; 2010-2013 Contributors incl. <a href="profile.php" title="It is you that make it!" target="_blank"><?php echo getEncryptCookie('twitese_name')?></a></li>
+			<?php if (BLOG_SITE) { ?><li><a href="<?php echo BLOG_SITE ?>" title="Site Owner's Blog" target="_blank">Blog</a></li><?php }?>
+			<li><a href="http://code.google.com/p/tuite/" target="_blank" title="Embr is proundly powered by the Open Source project - Twitese & Rabr">Twitese</a></li>
+			<li><a href="https://github.com/AstroProfundis/embrr" target="_blank">Open Source</a></li>
+			<?php if (SITE_OWNER) { ?><li>Run by <a href="https://twitter.com/<?php echo SITE_OWNER ?>" target="_blank"><?php echo SITE_OWNER ?></a></li><?php }?>
+			</ul>
+			</footer>
+		</div>
+	</div>
+<script>var nav=document.getElementById("primary_nav");var links=nav.getElementsByTagName("a");var currenturl=document.location.href;for(var i=0;i<links.length;i++){var linkurl=links[i].getAttribute("href");if(currenturl==links[i]){links[i].className="active";}}</script>
+</body>
+</html>
 <?php ob_end_flush(); ?>
\ No newline at end of file
diff --git a/inc/header.php b/inc/header.php
index 1be5161..636809e 100644
--- a/inc/header.php
+++ b/inc/header.php
@@ -1,72 +1,71 @@
-<?php
-	ob_start();
-	if(!isset($_SESSION)){
-		session_start();
-	}
-?>
-<!DOCTYPE HTML>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html" charset="utf-8" />
-<meta name="keywords" content="embr, open source, php, twitter, oauth" />
-<meta name="description" content="Vivid Interface for Twitter" />
-<meta name="author" content="Contributors" />
-<link rel="icon" href="img/favicon.ico" />
-<link id="css" href="css/main.css" rel="stylesheet" />
-<title>Embr / <?php echo $title ?></title>
-<?php 
-	$myCSS = getDefCookie("myCSS");
-	$theme = getDefCookie("theme");
-	$old_css = "ul.sidebar-menu li.active a";
-	$new_css = "ul.sidebar-menu a.active";
-	$myCSS = str_replace($old_css,$new_css,$myCSS);
-	$fontsize = getDefCookie("fontsize","13px");
-	$Bgcolor = getDefCookie("Bgcolor");
-	$Bgimage = getAvatar(getDefCookie("Bgimage"));
-	$Bgrepeat = getDefCookie("Bgrepeat","no-repeat");
-	
-	if ($title != 'Error' ){
-		setcookie('loginPage',$_SERVER['PHP_SELF'],$_SERVER['REQUEST_TIME']+3600*24);
-	}
-?>
-<style type="text/css">
-<?php echo $theme;echo $myCSS ?>
-a:active,a:focus {outline:none}
-body {font-size:<?php echo $fontsize ?> !important;<?php 
-	if ($Bgcolor != "") echo 'background-color:'.$Bgcolor.';';
- 	if ($Bgimage != "") echo 'background-image: url("'.$Bgimage.'");';
- ?>background-repeat:<?php echo $Bgrepeat ?>}
-</style>
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
-<script src="js/jquery.js"></script>
-<script src="js/mediaPreview.js"></script>
-<script src="js/public.js"></script>
-</head>
-<body>
-<div id="shortcutTip" style="display:none"></div>
-	<header>
-		<div class="wrapper">
-		<div id="sentTip" style="display:none"></div>
-			<a href="index.php"><img id="logo" style="float:left" width="155" height="49" src="img/logo.png" /></a>
-			<nav class="round">
-			<ul>
-				<?php $scheme=(!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != "on") ? 'http://' : 'https://';
-				$base_url=str_replace('http://',$scheme,BASE_URL);
-				?> 
-				<li><a class="share" title="Drag me to share!" href="javascript:var%20d=document,w=window,f='<?php echo $base_url."/share.php" ?>',l=d.location,e=encodeURIComponent,p='?u='+e(l.href)+'&t='+e(d.title)+'&d='+e(w.getSelection?w.getSelection().toString():d.getSelection?d.getSelection():d.selection.createRange().text)+'&s=bm';a=function(){if(!w.open(f+p,'sharer','toolbar=0,status=0,resizable=0,width=600,height=300,left=175,top=150'))l.href=f+'.new'+p};if(/Firefox/.test(navigator.userAgent))setTimeout(a,0);else{a()}void(0);">Share</a></li>
-				<li><a href="index.php">Home</a></li>
-				<li><a href="profile.php">Profile</a></li>
-				<li><a href="browse.php">Public</a></li>
-				<li><a href="setting.php">Settings</a></li>
-				<li><a href="logout.php">Logout</a></li>			
-			</ul>
-			</nav>
-		</div>
-	</header>
-	<div id="content">
-		<div class="wrapper">
-			<div class="content-bubble-arrow"></div>
-				<table cellspacing="0" class="columns">
-					<tbody>
-						<tr>
+<?php
+	ob_start();
+	if(!isset($_SESSION)){
+		session_start();
+	}
+?>
+<!DOCTYPE HTML>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html" charset="utf-8" />
+<meta name="keywords" content="embr, open source, php, twitter, oauth" />
+<meta name="description" content="Vivid Interface for Twitter" />
+<meta name="author" content="Contributors" />
+<link rel="icon" href="img/favicon.ico" />
+<link id="css" href="css/main.css" rel="stylesheet" />
+<title>Embr / <?php echo $title ?></title>
+<?php 
+	$myCSS = getDefCookie("myCSS");
+	$theme = getDefCookie("theme");
+	$old_css = "ul.sidebar-menu li.active a";
+	$new_css = "ul.sidebar-menu a.active";
+	$myCSS = str_replace($old_css,$new_css,$myCSS);
+	$fontsize = getDefCookie("fontsize","13px");
+	$Bgcolor = getDefCookie("Bgcolor");
+	$Bgimage = getAvatar(getDefCookie("Bgimage"));
+	$Bgrepeat = getDefCookie("Bgrepeat","no-repeat");
+	
+	if ($title != 'Error' ){
+		setcookie('loginPage',$_SERVER['PHP_SELF'],$_SERVER['REQUEST_TIME']+3600*24);
+	}
+?>
+<style type="text/css">
+<?php echo $theme;echo $myCSS ?>
+a:active,a:focus {outline:none}
+body {font-size:<?php echo $fontsize ?> !important;<?php 
+	if ($Bgcolor != "") echo 'background-color:'.$Bgcolor.';';
+ 	if ($Bgimage != "") echo 'background-image: url("'.$Bgimage.'");';
+ ?>background-repeat:<?php echo $Bgrepeat ?>}
+</style>
+<script src="https://ajax.aspnetcdn.com/ajax/jquery/jquery-1.8.3.min.js"></script>
+<script src="js/jquery.js"></script>
+<script src="js/mediaPreview.js"></script>
+<script src="js/public.js"></script>
+</head>
+<body>
+<div id="shortcutTip" style="display:none"></div>
+	<header>
+		<div class="wrapper">
+		<div id="sentTip" style="display:none"></div>
+			<a href="index.php"><img id="logo" style="float:left" width="155" height="49" src="img/logo.png" /></a>
+			<nav class="round">
+			<ul>
+				<?php $scheme=(!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != "on") ? 'http://' : 'https://';
+				$base_url=str_replace('http://',$scheme,BASE_URL);
+				?> 
+				<li><a class="share" title="Drag me to share!" href="javascript:var%20d=document,w=window,f='<?php echo $base_url."/share.php" ?>',l=d.location,e=encodeURIComponent,p='?u='+e(l.href)+'&t='+e(d.title)+'&d='+e(w.getSelection?w.getSelection().toString():d.getSelection?d.getSelection():d.selection.createRange().text)+'&s=bm';a=function(){if(!w.open(f+p,'sharer','toolbar=0,status=0,resizable=0,width=600,height=300,left=175,top=150'))l.href=f+'.new'+p};if(/Firefox/.test(navigator.userAgent))setTimeout(a,0);else{a()}void(0);">Share</a></li>
+				<li><a href="index.php">Home</a></li>
+				<li><a href="profile.php">Profile</a></li>
+				<li><a href="setting.php">Settings</a></li>
+				<li><a href="logout.php">Logout</a></li>			
+			</ul>
+			</nav>
+		</div>
+	</header>
+	<div id="content">
+		<div class="wrapper">
+			<div class="content-bubble-arrow"></div>
+				<table cellspacing="0" class="columns">
+					<tbody>
+						<tr>
 							<td id="left" class="column round-left">
\ No newline at end of file
diff --git a/inc/onlineUsers.php b/inc/onlineUsers.php
deleted file mode 100644
index b6dfbd3..0000000
--- a/inc/onlineUsers.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-$online_log="rabr_online_users.txt";
-$timeout=300;
-$entries=file($online_log);
-$temp=array();
-for($i=0;$i<count($entries);$i++){
-$entry=explode(",",trim($entries[$i]));
-if(($entry[0]!=getenv('REMOTE_ADDR'))&&($entry[1]>time())){
-array_push($temp,$entry[0].",".$entry[1]."\n");
-}
-}
-array_push($temp,getenv('REMOTE_ADDR').",".(time()+($timeout))."\n");
-$users_online=count($temp);
-$entries=implode("",$temp);
-$fp=fopen($online_log,"w");
-flock($fp,LOCK_EX);
-fputs($fp,$entries);
-flock($fp,LOCK_UN);
-fclose($fp);
-if($users_online==1){
-echo "Just you online!";
-}else{
-echo $users_online."  Users Online";
-}
-?>
\ No newline at end of file
diff --git a/inc/sidebar.php b/inc/sidebar.php
index 7f8b2c9..ecc90e2 100644
--- a/inc/sidebar.php
+++ b/inc/sidebar.php
@@ -11,11 +11,12 @@
 	<?php if (strrpos($_SERVER['PHP_SELF'], 'profile')) {
 		$t = getTwitter();
 	$user = $t->showUser();
+	$expanded_url = $user->entities->url->urls[0]->expanded_url ? $user->entities->url->urls[0]->expanded_url : $user->url;
 ?>
 	<ul id="user_info_profile">
 		<li><span>Name</span> <?php echo $user->name ?></li>
 		<?php if ($user->location) echo "<li><span>Location</span> $user->location</li>"; ?>
-		<?php if (($user->url) and (strlen($user->url)>20)) echo '<li><span>Web</span> <a href="' .$user->url. '" target="_blank">' .substr($user->url, 0, 20). '...</a></li>'; else if (($user->url) and (strlen($user->url)<=20)) echo '<li><span>Web</span> <a href="' .$user->url. '" target="_blank">' .$user->url. '</a></li>';?>
+		<?php if (($expanded_url) and (strlen($expanded_url)>20)) echo '<li><span>Web</span> <a href="' .$expanded_url. '" target="_blank">' .substr($expanded_url, 0, 20). '...</a></li>'; else if (($expanded_url) and (strlen($expanded_url)<=20)) echo '<li><span>Web</span> <a href="' .$expanded_url. '" target="_blank">' .$expanded_url. '</a></li>';?>
 		<?php if ($user->description) echo "<li><span>Bio</span> ".formatText($user->description)."</li>"; ?>
 		</ul>
 	<?php }?>
diff --git a/inc/sidepost.php b/inc/sidepost.php
index 6604a96..e706631 100644
--- a/inc/sidepost.php
+++ b/inc/sidepost.php
@@ -26,7 +26,6 @@
 </div>
 </div>
 <hr />
-<!-- 
 <div id="apiquota">
 <h2 id="apiquota_title">
 <span>API Quota</span>
@@ -34,7 +33,10 @@
 <ul id="apiquota_list" class="sidebar-menu">
 </ul>
 </div>
-!-->
+<hr />
+<div id="version">
+<h2 id="version_title"><span>Version: 0.6.2 (f-99)</span></h2>
+</div>
 <!--Preload Start-->
 <div class="preload" style="position: absolute; left: -9999em; top: -9999em;">
 <img src="img/spinner.gif" width="14" height="14"/>
@@ -46,4 +48,4 @@
 </td>
 </tr>
 </table>
-</td>
\ No newline at end of file
+</td>
diff --git a/inc/symbols.inc b/inc/symbols.inc
index 5776966..2211138 100644
--- a/inc/symbols.inc
+++ b/inc/symbols.inc
@@ -1,490 +1,490 @@
-<span title="花蕾无语">╮(╯_╰)╭</span>
-<span title=" 嗷~~">┗|｀O′|┛</span>
-<span title="~你给我回来！">o(°▽、°o)....+((￣﹏￣m )</span>
-<span title="“不明真相的围观群众”">槑槑槑槑呆槑槑槑槑槑槑槑槑……</span>
-<span title="『家』">～o(▽｀ o) =3 =3 =3</span>
-<span title="【TEL】">＜铃铃铃~ヾ(￣ ￣*)==3=3=3</span>
-<span title="【小黑屋】">ヽ(￣︿￣　)—C<(/;◇;)/ </span>
-<span title="555~他不起来……">ヾ( ┬o┬)┌θθθθ(;;＿ ＿).o○</span>
-<span title="aaa">o((>ω< ))o</span>
-<span title="aaa">o(≧口≦)o</span>
-<span title="ai">╮(￣▽￣")╭ </span>
-<span title="bai">ｍ(＿　＿)ｍ</span>
-<span title="bai">ヾ(￣▽￣)Bye~Bye~</span>
-<span title="baotou">▄︻┻┳═一…… ☆（>○<）</span>
-<span title="baoxiao">o(*≧▽≦)ツ</span>
-<span title="baoxiao">ヾ(≧▽≦*)o</span>
-<span title="bengkui">o(≧口≦)o</span>
-<span title="BINGO!">(o゜▽゜)o☆</span>
-<span title="biti">(￣ ‘i ￣;)</span>
-<span title="biti">(￣ ii ￣;) (￣＂￣;)</span>
-<span title="bizui">(⊙x⊙;)</span>
-<span title="bo">(*^ ^*)(^ *)</span>
-<span title="bqlz">(◎_x)</span>
-<span title="buhaoyisi">o(￣┰￣*)ゞ</span>
-<span title="buyao">°.°·(((p(≧□≦)q)))·°.°。</span>
-<span title="canle">X﹏X 惨了！</span>
-<span title="chaoxiao">q(≧▽≦q)</span>
-<span title="chouyan">（￣ c￣）y▂ξ。。。</span>
-<span title="chuai"><( ￣^￣)(θ(θ☆( >_< </span>
-<span title="dai">(￣△￣；)</span>
-<span title="dai">(￣旦￣；)</span>
-<span title="dai">━┳━　━┳━</span>
-<span title="dao">Σ(｀д′*ノ)ノ</span>
-<span title="dao">Σ(っ °Д °;)っ</span>
-<span title="dese">～(￣▽￣～)(～￣▽￣)～</span>
-<span title="deyi"><(￣ˇ￣)/</span>
-<span title="duo">┬┴┤_·)</span>
-<span title="e">("▔□▔)</span>
-<span title="e">(⊙﹏⊙)</span>
-<span title="e">-________-''</span>
-<span title="e">o(` · ~ · ′。)o</span>
-<span title="EXIT">______λ......_____</span>
-<span title="EXIT">λ…λλ…λ…λλλ…</span>
-<span title="fangp">○|￣|_ =3</span>
-<span title="fanzhuo">(╯′□｀)╯ ┫:·'∵:.┻┻:·'.:┣∵·:. ┳┳☆</span>
-<span title="fanzhuo">(╯‵□′)╯""┻━┻☆))>○<)</span>
-<span title="fanzhuo">┻━┻︵╰(‵□′)╯︵┻━┻ </span>
-<span title="fei">︿(￣︶￣)︿</span>
-<span title="fen">ヾ(≧奋≦)〃</span>
-<span title="fk">French (*￣(￣　*) Kiss!</span>
-<span title="fufu">(￣ˇ￣)v</span>
-<span title="fufu">fufu~ ^u^</span>
-<span title="gaozhuang">( σ'ω')σ </span>
-<span title="gaozhuang">o(>O<;; )σ</span>
-<span title="gfw">┳G┻┳F┳┻W┫</span>
-<span title="GiveMeFive!">(┘￣︶￣)┘└(￣︶￣└)</span>
-<span title="GO!"><(￣︶￣)↗</span>
-<span title="GO!"><(ï¿£OO,ï¿£)/</span>
-<span title="good">Good! o(￣▽￣)ｄ</span>
-<span title="gudan">______λ......_____</span>
-<span title="guilian">(￣┰￣*)</span>
-<span title="ha">(＃°Д°) </span>
-<span title="ha">O口O!</span>
-<span title="ha">Σ(⊙▽⊙"a...</span>
-<span title="haha">o(*≧▽≦)ツ</span>
-<span title="han">(ï¿£_ï¿£|||)</span>
-<span title="han">(￣▽￣")</span>
-<span title="han">(寒￣ii￣)彡…彡…彡</span>
-<span title="hehe">o(*￣▽￣*)o</span>
-<span title="heiban">【】\(·ω·`)o</span>
-<span title="heihei">o(*￣▽￣*)ゞ</span>
-<span title="heng">( －з)</span>
-<span title="heng">(；′⌒`)</span>
-<span title="heng">(ε－ )</span>
-<span title="heng">o(￣ヘ￣o＃) </span>
-<span title="hh">(￣▽￣")</span>
-<span title="hh">o(*￣▽￣*)o</span>
-<span title="hhh">^-^</span>
-<span title="hhh">^O^</span>
-<span title="hi">Hi~ o(*￣▽￣*)ブ</span>
-<span title="Hi~Hitler!">（ ·＿·)ノ＿·）ノ＿·）ノ＿·）ノ＿·）ノ</span>
-<span title="hiahia">○( ＾皿＾)っHiahiahia.... </span>
-<span title="hoho">(￣y▽￣)╭ Ohohoho.....</span>
-<span title="hoho">hoho ^O^</span>
-<span title="huhu">(_　_)。゜zｚＺ</span>
-<span title="jing">Σ( ° △ °|||)︴</span>
-<span title="jing">Σ(｀д′*ノ)ノ</span>
-<span title="jing">Σ(っ °Д °;)っ</span>
-<span title="jirou">┗|*｀0′*|┛</span>
-<span title="jiujie">( -'`-; ) </span>
-<span title="jiujie">o(′益`)o</span>
-<span title="jizhang">( ￣ー￣)人(^▽^ )</span>
-<span title="keai">n(*≧▽≦*)n</span>
-<span title="kedou">(°°)～　(°°)～　(°°)～　(°°)～</span>
-<span title="Kiss!"> (*￣(￣　*)</span>
-<span title="koushui">ˋ( ° ▽、° ) 口水ing...</span>
-<span title="K歌"> ...φ(0￣*)啦啦啦_φ(*￣0￣)></span>
-<span title="laohu">m( =∩王∩= )m</span>
-<span title="lei">(┳＿┳)...</span>
-<span title="lei">/(ㄒoㄒ)/~~</span>
-<span title="luanma">卐~%?…,# *'☆&℃$︿★?</span>
-<span title="manzu">o(*￣︶￣*)o</span>
-<span title="manzu">o(￣ˇ￣)o</span>
-<span title="mao">o( =·ω·= )m </span>
-<span title="mao">o(=·ェ·=)m</span>
-<span title="max">MIN■■■■■□□MAX</span>
-<span title="miehhh">(/￣ˇ￣)/</span>
-<span title="mimi">（。人。） </span>
-<span title="mmm">mmm...f('︶︿︶)o</span>
-<span title="mmm">mmm.....</span>
-<span title="mojiezuo">Capricorn</span>
-<span title="mua">mua! (*╯3╰)</span>
-<span title="niao">--\(˙<>˙)/--</span>
-<span title="nie">~(￣▽￣)~* </span>
-<span title="nu">(#‵′) </span>
-<span title="nu">(o#゜ 曲゜)o</span>
-<span title="nu">MIN■■■■■□□MAX(╯‵□′)╯︵┻━┻</span>
-<span title="nu">ε=怒ε=怒ε=怒ε=怒ε=( o｀ω′)ノ</span>
-<span title="o">(⊙o⊙)？</span>
-<span title="ohno">Oh~ no！！！！</span>
-<span title="ohye">Oh yeah！\(^&^)/</span>
-<span title="ok">OK</span>
-<span title="paidui">λ…λλ…λ…入λλ…</span>
-<span title="pao">ε = = (づ′▽`)づ</span>
-<span title="pao">ε=ε=ε=(~￣▽￣)~</span>
-<span title="pao">ヾ(*′▽｀*)ノ彡☆ノヽノヽノヽ</span>
-<span title="pdr">ヾ(′▽｀* )ノ~</span>
-<span title="pia">(￣ε(#￣)☆╰╮o(￣▽￣///) </span>
-<span title="pia">Pia!(ｏ ‵-′)ノ”(ノ﹏<。)</span>
-<span title="piao">(～￣▽￣)～</span>
-<span title="piao">(～o￣3￣)～</span>
-<span title="piao">.....((/- -)/</span>
-<span title="qiang">▄︻┻┳═一……</span>
-<span title="qie">(ˉ▽￣～) 切~~</span>
-<span title="qing">( ^ ^) _U~~</span>
-<span title="quan">(╬￣皿￣)＝○＃(￣＃)３￣)</span>
-<span title="quan">(Д゜(○=(゜ 皿゜)=○)゜Д゜)</span>
-<span title="shengqi"><(－︿－)></span>
-<span title="shy">shy~ o(*////▽////*)q</span>
-<span title="sigh">( ′ 3`) sigh~</span>
-<span title="S奥特曼">三三三三三三三三三4(o|o ) </span>
-<span title="S小孩!"> (ｏ ‵-′)ノ”(ノ_<。)</span>
-<span title="t"><( ￣^￣)(θ(θ☆( >_< </span>
-<span title="tanshou">╮( ╯ 3 ╰ )╭</span>
-<span title="tanshou">╮(￣▽￣")╭ </span>
-<span title="tanshou">╮(╯-╰)╭</span>
-<span title="tanshou">ㄟ( ▔, ▔ )ㄏ</span>
-<span title="tao">ε=ε=┏( >_<)┛</span>
-<span title="tao">ε=ε=ε=┏(゜ロ゜;)┛ </span>
-<span title="tao">ε=ε=ε=ε=ヽ(*￣o￣)ノ</span>
-<span title="tat">o(≧∩≦)o</span>
-<span title="tat">o(TヘTo)</span>
-<span title="thx">☆⌒(*＾-゜)v THX!!</span>
-<span title="toukui">|壁|_☆)</span>
-<span title="toukui">┬┴┤_·)</span>
-<span title="touxiang">n(→_←)┛</span>
-<span title="touxiang">o( >﹏<。)┛</span>
-<span title="tun">0＾）吞！</span>
-<span title="tushetou">(￣┰￣*)</span>
-<span title="wa">(PД`q。)·。'゜</span>
-<span title="wakkk"><(￣▽￣)/</span>
-<span title="wc">∥wc∥ o(- -o) =з =з =з</span>
-<span title="weiguan">(﹁"﹁)</span>
-<span title="weiqu">╥﹏╥...</span>
-<span title="wo">σ（⌒ー⌒）</span>
-<span title="woniu">@/"</span>
-<span title="wow">wow~⊙o⊙</span>
-<span title="xiaoxin">ㄟ( ▔, ▔ )ㄏ</span>
-<span title="xiey">( ﹁ ﹁ ) ~→</span>
-<span title="xiey">(ï¿£.ï¿£)+</span>
-<span title="xiey">(﹁"﹁)</span>
-<span title="xiezi">...ψ(。。 )</span>
-<span title="xingfu">o(*￣▽￣*)o</span>
-<span title="xiong">(*￣(エ)￣)</span>
-<span title="xiong">(+(工)+╬)</span>
-<span title="xiu">o(*////▽////*)q</span>
-<span title="xiu">p(#￣▽￣#)o</span>
-<span title="xxoo">卐~%?…,# *'☆&℃$︿★?……</span>
-<span title="xxoo">╳╳○○</span>
-<span title="y">(*￣︶￣)y</span>
-<span title="y">(*￣▽￣)y</span>
-<span title="y">^_^)y</span>
-<span title="yanshen">━┳━　━┳━</span>
-<span title="yanwenzi">ag108lau</span>
-<span title="yessir">Yes,sir! <(ï¿£Oï¿£)/</span>
-<span title="yiqi">╭(′▽`)╭(′▽`)╯</span>
-<span title="yiqi">ヽ(￣ω￣(￣ω￣〃)ゝ</span>
-<span title="yo">(＾Ｕ＾)ノ~ＹＯ </span>
-<span title="yu">>°)))>彡</span>
-<span title="yun">(((φ(◎ロ◎;)φ)))</span>
-<span title="zhaoxiang">Σ[ ◎ ]}</span>
-<span title="zhi"><(￣ ﹌ ￣)@m</span>
-<span title="zhu">^(*ï¿£(oo)ï¿£)^</span>
-<span title="zhua">W(ï¿£_ï¿£)W</span>
-<span title="zhuangqiang">┳G┻F┳W┫☆(ノ﹏<。)</span>
-<span title="zhuisha">--＝＝≡≡〈〈《( /￣皿￣)=Ｏ));>o<）/</span>
-<span title="zuomeng">ZZzz…(。-ω-)..ooO((【·:*:~夢~:*:·】))</span>
-<span title="哎哟哟……">(￣y▽,￣)╭ </span>
-<span title="安安啦~~~"> o(*￣▽￣*)ブ</span>
-<span title="凹凸曼……">(o|o)</span>
-<span title="嗷~">ヾ(≧O≦)〃</span>
-<span title="奥特曼……">(o|o) </span>
-<span title="拜佛">(-人-) </span>
-<span title="拜托啦……">(^人^)</span>
-<span title="包在我身上!">ヾ(′▽｀*)ゝ</span>
-<span title="包在我身上!">ヾ(′▽｀*)ゝ</span>
-<span title="抱抱">━((*′ ▽｀)爻(′▽｀*))━!!!</span>
-<span title="抱抱">━((*′д｀)爻(′д｀*))━!!!!</span>
-<span title="抱抱~">\(￣︶￣)/</span>
-<span title="抱抱~">\(￣︶￣*\))</span>
-<span title="鼻毛">(′゜c_，゜` ) </span>
-<span title="鄙视你！">╭∩╮(︶︿︶）╭∩╮</span>
-<span title="壁">( ￣ ￣)σ…( ＿ ＿)ノ｜</span>
-<span title="壁">( ￣ ￣)σ…( ＿ ＿)ノ｜</span>
-<span title="壁">ノ￣ー￣)ノ　⌒　>┼○"☆||</span>
-<span title="便秘">o(′益`)o </span>
-<span title="辫子">§(*￣▽￣*)§</span>
-<span title="表！"><(￣3￣)> </span>
-<span title="别走啊～～">______λ......___丬</span>
-<span title="瘪嘴">(*￣︿￣) </span>
-<span title="冰天雪地掩面泪奔……">(PД`q。)·。'゜</span>
-<span title="啵啵">(* ￣3)(ε￣ *) </span>
-<span title="不吃!">( *^-^)ρ(*╯^╰)</span>
-<span title="不懂">(＠_＠;)? </span>
-<span title="不满">(*￣︿￣) </span>
-<span title="不是我干的">ㄟ( ▔, ▔ )ㄏ </span>
-<span title="不屑">(￣_,￣ )</span>
-<span title="擦眼泪……">(ノへ￣、)</span>
-<span title="财神爷">(o′┏▽┓｀o) </span>
-<span title="草泥马">（　·ェ·）（·ェ·　）</span>
-<span title="蹭">(*≧︶≦))(￣▽￣* )ゞ</span>
-<span title="蹭">( *￣▽￣)((≧︶≦*) </span>
-<span title="叉腰"><)。(> </span>
-<span title="超强风扇吹">ε～( ～( ～ ( 卍 )＼(￣▽￣ ＼)</span>
-<span title="超远程BB枪！">(＃￣□￣)ｏ―∈‥oo━━━━━━━☆ </span>
-<span title="車">●┻┓⌒ Σ┌┘車└┐=3 =3 =3</span>
-<span title="吃饭去鸟">.....(((((ヾ(　o=^·ェ·)o　┏━┓</span>
-<span title="吃我一鞭!">( `０‘)ノ~~~~~~~~~ν</span>
-<span title="吃药">(。>︿<)_θ</span>
-<span title="冲出！！">___*\( ￣皿￣)/#____</span>
-<span title="抽!!">(￣ε(#￣)☆╰╮(￣▽￣///)</span>
-<span title="抽泣">(ノへ￣、)</span>
-<span title="抽泣">(ノへ￣、)</span>
-<span title="臭蚊子!">Pia!(ｏ ‵-′)ノ” </span>
-<span title="穿墙过去！">ε=ε┣G┻F┳ε=ヽ(*￣▽￣)ノ┻W┫</span>
-<span title="戳">→)╥﹏╥) </span>
-<span title="赐予你力量！">( *￣▽￣)o ─═≡※:☆▆▅▄▃▂＿</span>
-<span title="打呵欠">(_ _)( - . - )(~O~) ……( - . - ) </span>
-<span title="大鼻子">(′台｀ ) </span>
-<span title="呆滞"> ━┳━　━┳━</span>
-<span title="淡定">━━(￣ー￣*|||━━</span>
-<span title="当然！"><(ˉ^ˉ)></span>
-<span title="刀疤">(-_-メ)</span>
-<span title="等等我…我……我…………">...(*￣０￣)ノ</span>
-<span title="低落"> (#｀-_ゝ-)</span>
-<span title="低头">(。﹏。) </span>
-<span title="低头">(。_。) </span>
-<span title="点头">（￣ー￣（＿ ＿（￣ー￣（＿ ＿ </span>
-<span title="跌">(┬＿┬)↘ </span>
-<span title="顶!">d=====(￣▽￣*)b </span>
-<span title="动感光波">！！！( ￣O￣)ノノ……∞∞OOO)))</span>
-<span title="动感光波">！！！( ￣O￣)ノノ……∞∞OOO)))</span>
-<span title="抖">o((⊙﹏⊙))o. </span>
-<span title="嘟嘴">o(￣ε￣*) </span>
-<span title="嘟嘴">（○｀ 3′○） </span>
-<span title="对不起~"> <(＿　＿)></span>
-<span title="呃~被发现了......">(ˉ▽ˉ；)</span>
-<span title="呃~我……">σ(-_-メ)</span>
-<span title="翻桌！">(╯‵□′)╯︵┻━┻</span>
-<span title="防御！">(((＼(￣一￣)/)))</span>
-<span title="放我出去~~~"> ||Φ|(|T|Д|T|)|Φ|| </span>
-<span title="飞吻"> (*￣3￣)╭</span>
-<span title="分裂">＞(￣▽￣ = ￣︿￣)<</span>
-<span title="风魔法！"> (／-_-)／ξ ξ ξ ξ ξ ξ (+_+ ／)／～～～</span>
-<span title="去去去~">乀ˉεˉ乀...</span>
-<span title="扶眼镜">(-@y@) </span>
-<span title="扶眼镜">(-@y@) </span>
-<span title="复活!">...:.;::..;::: .:.;::….;:￣)…:.;:□￣)(￣□￣*)</span>
-<span title="嘎~嘎~嘎~">．<{=．．．．</span>
-<span title="干杯">(￣▽￣)～■□～(￣▽￣)</span>
-<span title="干杯！">~(￣▽￣)~* </span>
-<span title="感动！">o(*≧▽≦*)m</span>
-<span title="高~实在是高!">(*￣▽)u┌┐ ｄ(▽￣*)</span>
-<span title="告状">(′д｀σ)σ </span>
-<span title="跟你说厚~">╰(￣▽￣)╭</span>
-<span title="狗狗">U·ェ·*U </span>
-<span title="狗狗">U·ェ·U </span>
-<span title="鼓掌">””\\(￣ー￣) (￣ー￣)//””</span>
-<span title="鼓掌">└(￣ ￣└)(┘￣ ￣)┘</span>
-<span title="乖～">o(*^＠^*)o</span>
-<span title="滚来滚去">……~(～o￣▽￣)～o 。。。……o～(＿△＿o～) ~。。。</span>
-<span title="含泪挥手帕">(ToT)/~~~</span>
-<span title="好~~">o(*^▽^*)o </span>
-<span title="好吧">╮╯-╰╭"</span>
-<span title="好苦~">( ＞﹏＜)</span>
-<span title="好香~~">(╯▽╰ )</span>
-<span title="好主意!">(o゜▽゜)o☆</span>
-<span title="喝西北风">(　′Д`)彡</span>
-<span title="河马">（￣。。￣）</span>
-<span title="黑客帝国下腰!"> ┌(_Д_┌ )┐</span>
-<span title="黑客帝国下腰!"> ┌(_Д_┌ )┐</span>
-<span title="呼~幸好幸好……">ε=(￣。￣;A</span>
-<span title="呼唤">(/0￣)o </span>
-<span title="坏人……"> ～(　TロT)σ</span>
-<span title="幻影术！">(((￣(￣(￣(￣ー￣)￣)￣)￣))) </span>
-<span title="挥手帕">(@^^)/~~~</span>
-<span title="火箭筒，发射！">(*￣皿￣)=Σ口＞=Σ口＞=Σ口＞</span>
-<span title="获胜者是……">ヾ(￣ー￣)X(^▽^)ゞ</span>
-<span title="击掌">(〃￣︶￣)人(￣︶￣〃)</span>
-<span title="加油">o^^oo^^o</span>
-<span title="交通志愿老大妈指挥ing..."> (ｏ^~^)尸"</span>
-<span title="金盾!">||┣(—_＼) </span>
-<span title="就你！"><(￣ ﹌ ￣)@m</span>
-<span title="就你好了~"> (＠゜▽゜)</span>
-<span title="就是他!"> (＠｀д′)</span>
-<span title="举手">o(*^▽^*)┛</span>
-<span title="举手投降">┗( T﹏T )┛</span>
-<span title="嚼！">(￣～￣)</span>
-<span title="卡拉OK"> ...φ(0￣*)啦啦啦_φ(*￣0￣)′</span>
-<span title="看">(°ー°〃) </span>
-<span title="看好你哦！">(＠＾０＾)</span>
-<span title="看我忍者镖！">( ‵▽′)ノ'卍卍卍卍卍卍 Σ(゜д゜；)</span>
-<span title="靠！什么东西？！"> ( ｀д′)</span>
-<span title="咳咳">＞＜</span>
-<span title="苦恼"> ( -'`-; )</span>
-<span title="快使用双截棍，">┗(｀o′)┓哼┏(｀○′)┛哼┏(｀o′)┓哈┗(｀O′)┛兮！！</span>
-<span title="困，揉眼睛……">(o-ωｑ)).oO</span>
-<span title="啦啦啦">...φ(0￣*)_φ(*￣0￣)></span>
-<span title="来啦~">(～o￣▽￣)～o ~。。。</span>
-<span title="来人呐~">(o ;′Д`)ノ゛</span>
-<span title="冷笑">（ ￣ー￣）</span>
-<span title="脸红掩面">(*/ω＼*)</span>
-<span title="脸红掩面">(*/ω＼*)</span>
-<span title="两罐纸星星">(*ˉ﹃ˉ)_☆☆</span>
-<span title="列队">(*￣^￣(*￣^￣(*￣^￣)</span>
-<span title="铃铃铃">☆{{{Д}}} ☆!! </span>
-<span title="毛毛虫">(· ·)nnn </span>
-<span title="没办法~">╮(￣▽￣")╭</span>
-<span title="没人在哦?">||o(*°ω°*)o|Ю </span>
-<span title="媚眼">ο(=·ω＜=)ρ⌒☆</span>
-<span title="秘密">(一-一) </span>
-<span title="喵~">o( =∩ω∩= )m </span>
-<span title="喵~">＞▽＜</span>
-<span title="咩哈哈哈哈……"><(*￣▽￣*)/</span>
-<span title="蔑视">(￣_,￣ )</span>
-<span title="命苦...">ε(┬┬﹏┬┬)3</span>
-<span title="摸摸头">(～￣▽￣)ノ</span>
-<span title="摸摸头">╰(￣ω￣ｏ) </span>
-<span title="膜拜">＿|￣|○ → ＿|＼○＿ → ＿/＼○＿ → ＿__＿○＿</span>
-<span title="墓">┏┛墓┗┓...(((m -__-)m</span>
-<span title="哪~里跑?!">(///￣皿￣)○～</span>
-<span title="那边那个">(﹁ ﹁ )σ</span>
-<span title="嗯!">ヾ(≧へ≦)〃</span>
-<span title="嗯！">o(￣︶￣)n</span>
-<span title="嗯~">o(*￣▽￣*)o</span>
-<span title="你！！">Σ( ￣д￣；)</span>
-<span title="你回来啦~~">ヾ(^▽^*)))</span>
-<span title="你你你……"> ～(　TロT)σ</span>
-<span title="你你你……"> ～(　TロT)σ</span>
-<span title="溺水">゜゜┌┴o゜゜゜゜°</span>
-<span title="念力~"> ( -人-)···－～＝～≡～≡ ((+o+)))</span>
-<span title="念咒">（（（　(-h-)　）））</span>
-<span title="念咒">……(((＼(￣一￣)/)))</span>
-<span title="捏耳朵！"><( ‵□′)>───Ｃε(┬﹏┬)3</span>
-<span title="怒">ε=怒ε=怒ε=怒ε=怒ε=( o｀ω′)/</span>
-<span title="哦~">_(￣0￣)_</span>
-<span title="啪叽~摔一跟头……">((o_ _)'彡☆</span>
-<span title="怕怕">━((*′д｀)爻(′д｀*))━!!!!</span>
-<span title="拍手">└(￣ ￣└)(┘￣ ￣)┘</span>
-<span title="拍手拍手">””\\(￣ー￣) (￣ー￣)//””</span>
-<span title="拍桌狂笑!">o(*≧▽≦)ツ┏━┓</span>
-<span title="飘飘然……">︿(￣︶￣)︿</span>
-<span title="乒乓球">( ＾o)ρ┳┻┳°σ(o^ ) </span>
-<span title="期待"> (☆▽☆)</span>
-<span title="起床">(o￣Д￣)＜起床! ※=○☆(＿＿*)Ｚｚｚ</span>
-<span title="起床啦!">( *′д)/o(_ _)ozzZZ…</span>
-<span title="切~~">( ﹁ ﹁ ) ~~~</span>
-<span title="亲亲">o(*￣3￣)o</span>
-<span title="亲亲">(* ￣)(￣▽￣*)ゞ</span>
-<span title="去去去~">(づ￣ 3￣)づ...</span>
-<span title="去下厕厕……">∥WC||_·)╯</span>
-<span title="忍术~隐！"> （￣人￣）（￣人:.;:…（￣...:.;::..;::: .:;.…::;.:..:;.:...</span>
-<span title="撒花！">(￣▽￣)o∠※PAN!=.:*:'☆.:*:'★':* </span>
-<span title="撒花！">*★,°*:.☆\(￣▽￣)/$:*.°★* 。</span>
-<span title="散弹发射！！">▄︻┻┳═一∵∴∷∶∵ (∵_,∵)>>>></span>
-<span title="杀虫剂！">( ▼▼)/鹵〈 巛巛巛 ( ◎_x)/</span>
-<span title="闪人">(*￣▽￣)(￣▽:;.…::;.:.:::;..::;.:... </span>
-<span title="伤心">(；′⌒`)</span>
-<span title="蛇拳">z(-_-z)).....((s-_-)s</span>
-<span title="射箭">( ￣ー￣)——)-＝＝＝＝＝＝＝>-->></span>
-<span title="神啊~">\(￣0￣)/</span>
-<span title="失落">(。_。) </span>
-<span title="石化">━━∑(￣□￣*|||━━化</span>
-<span title="石化ing~">(ˉ▽ˉ；)...</span>
-<span title="视力表">┫♀旦￣)σ(呃……)</span>
-<span title="是不是你?!">(σ｀д′)σ</span>
-<span title="是不是你?!">(σ｀д′)σ</span>
-<span title="手榴弹!">σ～ (｀′メ　</span>
-<span title="手指戳戳">(～￣▽￣)→))*￣▽￣*)o </span>
-<span title="手肘戳戳">o(￣▽￣*)ゞ))￣▽￣*)o </span>
-<span title="衰">(′д｀ )…彡…彡</span>
-<span title="死亡中">(:D)┼─┤</span>
-<span title="太好笑了！！">……o((≧▽≦o)</span>
-<span title="太可怕了">ヽ(*。>Д<)o゜</span>
-<span title="逃命啊~~">\("▔□▔)/\("▔□▔)/ </span>
-<span title="陶醉">( *︾▽︾)</span>
-<span title="讨厌啦~">(ノω<。)ノ))☆.。</span>
-<span title="天旋地转">ヾ(　 　)ノ゛ヾ(　°д)ノ゛ヾ(°д°)ノ゛ヾ(д°　)ノ゛ヾ(　　)ノ゛</span>
-<span title="天助我也~"> ヾ(*′▽｀*)彡</span>
-<span title="挑衅"><(*￣ー￣)ゞ来呀~</span>
-<span title="挑衅"><(*￣ー￣)ゞ来啊~</span>
-<span title="偷看">(/ω＼*)……… (/ω·＼*) </span>
-<span title="偷看">(/ω·＼*) </span>
-<span title="偷拍 ">Σ[ ◎ ]}ー′）</span>
-<span title="怒">凸艹皿艹</span>
-<span title="靠">凸゜皿゜メ</span>
-<span title="吐">( >ρ < ”)</span>
-<span title="推推~起床啦!">(o￣ω￣)○))ｏ(＿＿*)Ｚｚｚ</span>
-<span title="拖走">ヽ(゜▽゜　)－C<(/;◇;)/~</span>
-<span title="哇卡卡卡卡卡……">o((≧▽≦o) 太好笑了！！</span>
-<span title="哇咧！">Σ(⊙▽⊙"a...</span>
-<span title="挖鼻屎"> (*￣rǒ￣)</span>
-<span title="万岁！">*★,°*:.☆\(￣▽￣)/$:*.°★* 。</span>
-<span title="围观！">(← ← )</span>
-<span title="围观！">( → →) </span>
-<span title="畏罪自杀…">…〒_〒…‵ｏ′-一┳═┻︻▄</span>
-<span title="喂！">(#`O′)</span>
-<span title="喂饭">( *^-^)ρ(^0^* )</span>
-<span title="吻别">(*￣;(￣ *)</span>
-<span title="我？">σ(· ·?)</span>
-<span title="我不看……">(/▽＼)</span>
-<span title="我错了……">(。﹏。*)</span>
-<span title="我回来啦~">||ヽ(*￣▽￣*)ノミ|Ю</span>
-<span title="我来了~">(～￣▽￣)～</span>
-<span title="我忍!">o(-"-;) </span>
-<span title="我闪！">|(·_·) |·_·) |_·) |·) | )</span>
-<span title="握拳!">o(￣ヘ￣o* )</span>
-<span title="握拳！">o(￣ヘ￣o＃)</span>
-<span title="呜呜呜……">( >﹏<。)～</span>
-<span title="无敌！">↑↑↓↓←→←→ＢＡ...┗( -o-)┛</span>
-<span title="无敌弹簧拳！">( ‵Д′)=○))~~~~~~Ю))>o<)/ </span>
-<span title="无敌幻影脚！">ヽ(ヽ `д′)ヽ`д′)ヽ`д′)┌┛┌┛┌┛★)`з゜)y</span>
-<span title="无敌捏脸功！"><( ‵□′)───C＜─___-)|| </span>
-<span title="无敌肉包拳！">(o ￣3)==@))゜ロ゜((@==(′ε′ )o　</span>
-<span title="无敌肉包拳！">(o ￣3)==@))゜ロ゜((@==(′ε′ )o</span>
-<span title="无敌影分身！">((≧(≧▽(≧▽≦(≧▽≦)≧▽≦)▽≦)≦))) </span>
-<span title="无力扶墙..."> ( ＿ ＿)ノ｜壁</span>
-<span title="无奈">╮(╯-╰)╭ </span>
-<span title="无影脚！">＜( ￣︿￣)︵θ︵θ︵θ︵θ︵☆(＞口＜－)</span>
-<span title="无影脚！">＜( ￣︿￣)︵θ︵θ︵θ︵θ︵☆(＞口＜－)</span>
-<span title="享受">(╯▽╰ ) </span>
-<span title="消失">(*￣□￣)(￣□:;.…::;.:.:::;..::;.:...</span>
-<span title="小新"><(￣︶￣)↗</span>
-<span title="邪恶">( ‵▽′)ψ</span>
-<span title="谢啦!!">☆⌒(*＾-゜)v </span>
-<span title="心神不宁...">(゜゜ )(。。)(゜゜ )(。。)</span>
-<span title="欣慰">( ╯▽╰)</span>
-<span title="要">不＞(￣ε￣ = ￣3￣)<</span>
-<span title="噎死">( *⊙~⊙) </span>
-<span title="噎住">( *⊙~⊙) </span>
-<span title="隐身！">(*￣□￣)(￣□:;.…::;.:.:::;..::;.:...</span>
-<span title="鹰钩鼻">(￣ム￣) </span>
-<span title="哟西！">（９￣＾￣）９</span>
-<span title="有了!">(o゜▽゜)o☆</span>
-<span title="有人吗?">||o(*°▽°*)o|Ю </span>
-<span title="御风_凌"></span>
-<span title="怨.念....">o(一︿一+)o</span>
-<span title="运动">╔囧╗╔囧╝╚囧╝╚囧╗</span>
-<span title="晕！">@o@"</span>
-<span title="糟糕！">X﹏X</span>
-<span title="早安呀~~~"> o(*￣▽￣*)ブ</span>
-<span title="早点回来哦~">(～￣(OO)￣)ブ</span>
-<span title="炸弹！">(╯‵□′)╯···*～●</span>
-<span title="斩!!">ˋ( ° ▽、° ) (o(￣▽￣///</span>
-<span title="涨">(￣︶￣)↗</span>
-<span title="这个……呃~~">-______-"</span>
-<span title="真哒?!"> o(〃'▽'〃)o</span>
-<span title="真空波动拳！">（ ｀o′）{ ···－＝≡))</span>
-<span title="真空波动拳！">（ ｀o′）{ ···－＝≡))</span>
-<span title="振奋">(o>ε(o>ｕ(≧∩≦) </span>
-<span title="振作!">━━(o_ _)o━━(o―_―)o━━(９￣ー￣)９</span>
-<span title="痣长毛">( ゜，_ゝ゜) </span>
-<span title="皱眉">(-"-)</span>
-<span title="抓狂">o((>ω< ))o</span>
-<span title="抓狂">o(>@<)o</span>
-<span title="足球">( · ·)L☆ ．．．..○ 冂 </span>
-<span title="醉拳">ヨロ (*~▽~)ノ ヨロ ヽ(~▽~*）ヨロ (*~▽~)―〇 ☆ バシ ))>口<)</span>
-<p style="display: block; float: left; margin-top: 25px; margin-bottom: -40px;">&copy; 2010 @ag108lau<br>Thanks @OnlyTiny<br />
-Last Update: 2010-11-13
+<span title="花蕾无语">╮(╯_╰)╭</span>
+<span title=" 嗷~~">┗|｀O′|┛</span>
+<span title="~你给我回来！">o(°▽、°o)....+((￣﹏￣m )</span>
+<span title="“不明真相的围观群众”">槑槑槑槑呆槑槑槑槑槑槑槑槑……</span>
+<span title="『家』">～o(▽｀ o) =3 =3 =3</span>
+<span title="【TEL】">＜铃铃铃~ヾ(￣ ￣*)==3=3=3</span>
+<span title="【小黑屋】">ヽ(￣︿￣　)—C<(/;◇;)/ </span>
+<span title="555~他不起来……">ヾ( ┬o┬)┌θθθθ(;;＿ ＿).o○</span>
+<span title="aaa">o((>ω< ))o</span>
+<span title="aaa">o(≧口≦)o</span>
+<span title="ai">╮(￣▽￣")╭ </span>
+<span title="bai">ｍ(＿　＿)ｍ</span>
+<span title="bai">ヾ(￣▽￣)Bye~Bye~</span>
+<span title="baotou">▄︻┻┳═一…… ☆（>○<）</span>
+<span title="baoxiao">o(*≧▽≦)ツ</span>
+<span title="baoxiao">ヾ(≧▽≦*)o</span>
+<span title="bengkui">o(≧口≦)o</span>
+<span title="BINGO!">(o゜▽゜)o☆</span>
+<span title="biti">(￣ ‘i ￣;)</span>
+<span title="biti">(￣ ii ￣;) (￣＂￣;)</span>
+<span title="bizui">(⊙x⊙;)</span>
+<span title="bo">(*^ ^*)(^ *)</span>
+<span title="bqlz">(◎_x)</span>
+<span title="buhaoyisi">o(￣┰￣*)ゞ</span>
+<span title="buyao">°.°·(((p(≧□≦)q)))·°.°。</span>
+<span title="canle">X﹏X 惨了！</span>
+<span title="chaoxiao">q(≧▽≦q)</span>
+<span title="chouyan">（￣ c￣）y▂ξ。。。</span>
+<span title="chuai"><( ￣^￣)(θ(θ☆( >_< </span>
+<span title="dai">(￣△￣；)</span>
+<span title="dai">(￣旦￣；)</span>
+<span title="dai">━┳━　━┳━</span>
+<span title="dao">Σ(｀д′*ノ)ノ</span>
+<span title="dao">Σ(っ °Д °;)っ</span>
+<span title="dese">～(￣▽￣～)(～￣▽￣)～</span>
+<span title="deyi"><(￣ˇ￣)/</span>
+<span title="duo">┬┴┤_·)</span>
+<span title="e">("▔□▔)</span>
+<span title="e">(⊙﹏⊙)</span>
+<span title="e">-________-''</span>
+<span title="e">o(` · ~ · ′。)o</span>
+<span title="EXIT">______λ......_____</span>
+<span title="EXIT">λ…λλ…λ…λλλ…</span>
+<span title="fangp">○|￣|_ =3</span>
+<span title="fanzhuo">(╯′□｀)╯ ┫:·'∵:.┻┻:·'.:┣∵·:. ┳┳☆</span>
+<span title="fanzhuo">(╯‵□′)╯""┻━┻☆))>○<)</span>
+<span title="fanzhuo">┻━┻︵╰(‵□′)╯︵┻━┻ </span>
+<span title="fei">︿(￣︶￣)︿</span>
+<span title="fen">ヾ(≧奋≦)〃</span>
+<span title="fk">French (*￣(￣　*) Kiss!</span>
+<span title="fufu">(￣ˇ￣)v</span>
+<span title="fufu">fufu~ ^u^</span>
+<span title="gaozhuang">( σ'ω')σ </span>
+<span title="gaozhuang">o(>O<;; )σ</span>
+<span title="gfw">┳G┻┳F┳┻W┫</span>
+<span title="GiveMeFive!">(┘￣︶￣)┘└(￣︶￣└)</span>
+<span title="GO!"><(￣︶￣)↗</span>
+<span title="GO!"><(ï¿£OO,ï¿£)/</span>
+<span title="good">Good! o(￣▽￣)ｄ</span>
+<span title="gudan">______λ......_____</span>
+<span title="guilian">(￣┰￣*)</span>
+<span title="ha">(＃°Д°) </span>
+<span title="ha">O口O!</span>
+<span title="ha">Σ(⊙▽⊙"a...</span>
+<span title="haha">o(*≧▽≦)ツ</span>
+<span title="han">(ï¿£_ï¿£|||)</span>
+<span title="han">(￣▽￣")</span>
+<span title="han">(寒￣ii￣)彡…彡…彡</span>
+<span title="hehe">o(*￣▽￣*)o</span>
+<span title="heiban">【】\(·ω·`)o</span>
+<span title="heihei">o(*￣▽￣*)ゞ</span>
+<span title="heng">( －з)</span>
+<span title="heng">(；′⌒`)</span>
+<span title="heng">(ε－ )</span>
+<span title="heng">o(￣ヘ￣o＃) </span>
+<span title="hh">(￣▽￣")</span>
+<span title="hh">o(*￣▽￣*)o</span>
+<span title="hhh">^-^</span>
+<span title="hhh">^O^</span>
+<span title="hi">Hi~ o(*￣▽￣*)ブ</span>
+<span title="Hi~Hitler!">（ ·＿·)ノ＿·）ノ＿·）ノ＿·）ノ＿·）ノ</span>
+<span title="hiahia">○( ＾皿＾)っHiahiahia.... </span>
+<span title="hoho">(￣y▽￣)╭ Ohohoho.....</span>
+<span title="hoho">hoho ^O^</span>
+<span title="huhu">(_　_)。゜zｚＺ</span>
+<span title="jing">Σ( ° △ °|||)︴</span>
+<span title="jing">Σ(｀д′*ノ)ノ</span>
+<span title="jing">Σ(っ °Д °;)っ</span>
+<span title="jirou">┗|*｀0′*|┛</span>
+<span title="jiujie">( -'`-; ) </span>
+<span title="jiujie">o(′益`)o</span>
+<span title="jizhang">( ￣ー￣)人(^▽^ )</span>
+<span title="keai">n(*≧▽≦*)n</span>
+<span title="kedou">(°°)～　(°°)～　(°°)～　(°°)～</span>
+<span title="Kiss!"> (*￣(￣　*)</span>
+<span title="koushui">ˋ( ° ▽、° ) 口水ing...</span>
+<span title="K歌"> ...φ(0￣*)啦啦啦_φ(*￣0￣)></span>
+<span title="laohu">m( =∩王∩= )m</span>
+<span title="lei">(┳＿┳)...</span>
+<span title="lei">/(ㄒoㄒ)/~~</span>
+<span title="luanma">卐~%?…,# *'☆&℃$︿★?</span>
+<span title="manzu">o(*￣︶￣*)o</span>
+<span title="manzu">o(￣ˇ￣)o</span>
+<span title="mao">o( =·ω·= )m </span>
+<span title="mao">o(=·ェ·=)m</span>
+<span title="max">MIN■■■■■□□MAX</span>
+<span title="miehhh">(/￣ˇ￣)/</span>
+<span title="mimi">（。人。） </span>
+<span title="mmm">mmm...f('︶︿︶)o</span>
+<span title="mmm">mmm.....</span>
+<span title="mojiezuo">Capricorn</span>
+<span title="mua">mua! (*╯3╰)</span>
+<span title="niao">--\(˙<>˙)/--</span>
+<span title="nie">~(￣▽￣)~* </span>
+<span title="nu">(#‵′) </span>
+<span title="nu">(o#゜ 曲゜)o</span>
+<span title="nu">MIN■■■■■□□MAX(╯‵□′)╯︵┻━┻</span>
+<span title="nu">ε=怒ε=怒ε=怒ε=怒ε=( o｀ω′)ノ</span>
+<span title="o">(⊙o⊙)？</span>
+<span title="ohno">Oh~ no！！！！</span>
+<span title="ohye">Oh yeah！\(^&^)/</span>
+<span title="ok">OK</span>
+<span title="paidui">λ…λλ…λ…入λλ…</span>
+<span title="pao">ε = = (づ′▽`)づ</span>
+<span title="pao">ε=ε=ε=(~￣▽￣)~</span>
+<span title="pao">ヾ(*′▽｀*)ノ彡☆ノヽノヽノヽ</span>
+<span title="pdr">ヾ(′▽｀* )ノ~</span>
+<span title="pia">(￣ε(#￣)☆╰╮o(￣▽￣///) </span>
+<span title="pia">Pia!(ｏ ‵-′)ノ”(ノ﹏<。)</span>
+<span title="piao">(～￣▽￣)～</span>
+<span title="piao">(～o￣3￣)～</span>
+<span title="piao">.....((/- -)/</span>
+<span title="qiang">▄︻┻┳═一……</span>
+<span title="qie">(ˉ▽￣～) 切~~</span>
+<span title="qing">( ^ ^) _U~~</span>
+<span title="quan">(╬￣皿￣)＝○＃(￣＃)３￣)</span>
+<span title="quan">(Д゜(○=(゜ 皿゜)=○)゜Д゜)</span>
+<span title="shengqi"><(－︿－)></span>
+<span title="shy">shy~ o(*////▽////*)q</span>
+<span title="sigh">( ′ 3`) sigh~</span>
+<span title="S奥特曼">三三三三三三三三三4(o|o ) </span>
+<span title="S小孩!"> (ｏ ‵-′)ノ”(ノ_<。)</span>
+<span title="t"><( ￣^￣)(θ(θ☆( >_< </span>
+<span title="tanshou">╮( ╯ 3 ╰ )╭</span>
+<span title="tanshou">╮(￣▽￣")╭ </span>
+<span title="tanshou">╮(╯-╰)╭</span>
+<span title="tanshou">ㄟ( ▔, ▔ )ㄏ</span>
+<span title="tao">ε=ε=┏( >_<)┛</span>
+<span title="tao">ε=ε=ε=┏(゜ロ゜;)┛ </span>
+<span title="tao">ε=ε=ε=ε=ヽ(*￣o￣)ノ</span>
+<span title="tat">o(≧∩≦)o</span>
+<span title="tat">o(TヘTo)</span>
+<span title="thx">☆⌒(*＾-゜)v THX!!</span>
+<span title="toukui">|壁|_☆)</span>
+<span title="toukui">┬┴┤_·)</span>
+<span title="touxiang">n(→_←)┛</span>
+<span title="touxiang">o( >﹏<。)┛</span>
+<span title="tun">0＾）吞！</span>
+<span title="tushetou">(￣┰￣*)</span>
+<span title="wa">(PД`q。)·。'゜</span>
+<span title="wakkk"><(￣▽￣)/</span>
+<span title="wc">∥wc∥ o(- -o) =з =з =з</span>
+<span title="weiguan">(﹁"﹁)</span>
+<span title="weiqu">╥﹏╥...</span>
+<span title="wo">σ（⌒ー⌒）</span>
+<span title="woniu">@/"</span>
+<span title="wow">wow~⊙o⊙</span>
+<span title="xiaoxin">ㄟ( ▔, ▔ )ㄏ</span>
+<span title="xiey">( ﹁ ﹁ ) ~→</span>
+<span title="xiey">(ï¿£.ï¿£)+</span>
+<span title="xiey">(﹁"﹁)</span>
+<span title="xiezi">...ψ(。。 )</span>
+<span title="xingfu">o(*￣▽￣*)o</span>
+<span title="xiong">(*￣(エ)￣)</span>
+<span title="xiong">(+(工)+╬)</span>
+<span title="xiu">o(*////▽////*)q</span>
+<span title="xiu">p(#￣▽￣#)o</span>
+<span title="xxoo">卐~%?…,# *'☆&℃$︿★?……</span>
+<span title="xxoo">╳╳○○</span>
+<span title="y">(*￣︶￣)y</span>
+<span title="y">(*￣▽￣)y</span>
+<span title="y">^_^)y</span>
+<span title="yanshen">━┳━　━┳━</span>
+<span title="yanwenzi">ag108lau</span>
+<span title="yessir">Yes,sir! <(ï¿£Oï¿£)/</span>
+<span title="yiqi">╭(′▽`)╭(′▽`)╯</span>
+<span title="yiqi">ヽ(￣ω￣(￣ω￣〃)ゝ</span>
+<span title="yo">(＾Ｕ＾)ノ~ＹＯ </span>
+<span title="yu">>°)))>彡</span>
+<span title="yun">(((φ(◎ロ◎;)φ)))</span>
+<span title="zhaoxiang">Σ[ ◎ ]}</span>
+<span title="zhi"><(￣ ﹌ ￣)@m</span>
+<span title="zhu">^(*ï¿£(oo)ï¿£)^</span>
+<span title="zhua">W(ï¿£_ï¿£)W</span>
+<span title="zhuangqiang">┳G┻F┳W┫☆(ノ﹏<。)</span>
+<span title="zhuisha">--＝＝≡≡〈〈《( /￣皿￣)=Ｏ));>o<）/</span>
+<span title="zuomeng">ZZzz…(。-ω-)..ooO((【·:*:~夢~:*:·】))</span>
+<span title="哎哟哟……">(￣y▽,￣)╭ </span>
+<span title="安安啦~~~"> o(*￣▽￣*)ブ</span>
+<span title="凹凸曼……">(o|o)</span>
+<span title="嗷~">ヾ(≧O≦)〃</span>
+<span title="奥特曼……">(o|o) </span>
+<span title="拜佛">(-人-) </span>
+<span title="拜托啦……">(^人^)</span>
+<span title="包在我身上!">ヾ(′▽｀*)ゝ</span>
+<span title="包在我身上!">ヾ(′▽｀*)ゝ</span>
+<span title="抱抱">━((*′ ▽｀)爻(′▽｀*))━!!!</span>
+<span title="抱抱">━((*′д｀)爻(′д｀*))━!!!!</span>
+<span title="抱抱~">\(￣︶￣)/</span>
+<span title="抱抱~">\(￣︶￣*\))</span>
+<span title="鼻毛">(′゜c_，゜` ) </span>
+<span title="鄙视你！">╭∩╮(︶︿︶）╭∩╮</span>
+<span title="壁">( ￣ ￣)σ…( ＿ ＿)ノ｜</span>
+<span title="壁">( ￣ ￣)σ…( ＿ ＿)ノ｜</span>
+<span title="壁">ノ￣ー￣)ノ　⌒　>┼○"☆||</span>
+<span title="便秘">o(′益`)o </span>
+<span title="辫子">§(*￣▽￣*)§</span>
+<span title="表！"><(￣3￣)> </span>
+<span title="别走啊～～">______λ......___丬</span>
+<span title="瘪嘴">(*￣︿￣) </span>
+<span title="冰天雪地掩面泪奔……">(PД`q。)·。'゜</span>
+<span title="啵啵">(* ￣3)(ε￣ *) </span>
+<span title="不吃!">( *^-^)ρ(*╯^╰)</span>
+<span title="不懂">(＠_＠;)? </span>
+<span title="不满">(*￣︿￣) </span>
+<span title="不是我干的">ㄟ( ▔, ▔ )ㄏ </span>
+<span title="不屑">(￣_,￣ )</span>
+<span title="擦眼泪……">(ノへ￣、)</span>
+<span title="财神爷">(o′┏▽┓｀o) </span>
+<span title="草泥马">（　·ェ·）（·ェ·　）</span>
+<span title="蹭">(*≧︶≦))(￣▽￣* )ゞ</span>
+<span title="蹭">( *￣▽￣)((≧︶≦*) </span>
+<span title="叉腰"><)。(> </span>
+<span title="超强风扇吹">ε～( ～( ～ ( 卍 )＼(￣▽￣ ＼)</span>
+<span title="超远程BB枪！">(＃￣□￣)ｏ―∈‥oo━━━━━━━☆ </span>
+<span title="車">●┻┓⌒ Σ┌┘車└┐=3 =3 =3</span>
+<span title="吃饭去鸟">.....(((((ヾ(　o=^·ェ·)o　┏━┓</span>
+<span title="吃我一鞭!">( `０‘)ノ~~~~~~~~~ν</span>
+<span title="吃药">(。>︿<)_θ</span>
+<span title="冲出！！">___*\( ￣皿￣)/#____</span>
+<span title="抽!!">(￣ε(#￣)☆╰╮(￣▽￣///)</span>
+<span title="抽泣">(ノへ￣、)</span>
+<span title="抽泣">(ノへ￣、)</span>
+<span title="臭蚊子!">Pia!(ｏ ‵-′)ノ” </span>
+<span title="穿墙过去！">ε=ε┣G┻F┳ε=ヽ(*￣▽￣)ノ┻W┫</span>
+<span title="戳">→)╥﹏╥) </span>
+<span title="赐予你力量！">( *￣▽￣)o ─═≡※:☆▆▅▄▃▂＿</span>
+<span title="打呵欠">(_ _)( - . - )(~O~) ……( - . - ) </span>
+<span title="大鼻子">(′台｀ ) </span>
+<span title="呆滞"> ━┳━　━┳━</span>
+<span title="淡定">━━(￣ー￣*|||━━</span>
+<span title="当然！"><(ˉ^ˉ)></span>
+<span title="刀疤">(-_-メ)</span>
+<span title="等等我…我……我…………">...(*￣０￣)ノ</span>
+<span title="低落"> (#｀-_ゝ-)</span>
+<span title="低头">(。﹏。) </span>
+<span title="低头">(。_。) </span>
+<span title="点头">（￣ー￣（＿ ＿（￣ー￣（＿ ＿ </span>
+<span title="跌">(┬＿┬)↘ </span>
+<span title="顶!">d=====(￣▽￣*)b </span>
+<span title="动感光波">！！！( ￣O￣)ノノ……∞∞OOO)))</span>
+<span title="动感光波">！！！( ￣O￣)ノノ……∞∞OOO)))</span>
+<span title="抖">o((⊙﹏⊙))o. </span>
+<span title="嘟嘴">o(￣ε￣*) </span>
+<span title="嘟嘴">（○｀ 3′○） </span>
+<span title="对不起~"> <(＿　＿)></span>
+<span title="呃~被发现了......">(ˉ▽ˉ；)</span>
+<span title="呃~我……">σ(-_-メ)</span>
+<span title="翻桌！">(╯‵□′)╯︵┻━┻</span>
+<span title="防御！">(((＼(￣一￣)/)))</span>
+<span title="放我出去~~~"> ||Φ|(|T|Д|T|)|Φ|| </span>
+<span title="飞吻"> (*￣3￣)╭</span>
+<span title="分裂">＞(￣▽￣ = ￣︿￣)<</span>
+<span title="风魔法！"> (／-_-)／ξ ξ ξ ξ ξ ξ (+_+ ／)／～～～</span>
+<span title="去去去~">乀ˉεˉ乀...</span>
+<span title="扶眼镜">(-@y@) </span>
+<span title="扶眼镜">(-@y@) </span>
+<span title="复活!">...:.;::..;::: .:.;::….;:￣)…:.;:□￣)(￣□￣*)</span>
+<span title="嘎~嘎~嘎~">．<{=．．．．</span>
+<span title="干杯">(￣▽￣)～■□～(￣▽￣)</span>
+<span title="干杯！">~(￣▽￣)~* </span>
+<span title="感动！">o(*≧▽≦*)m</span>
+<span title="高~实在是高!">(*￣▽)u┌┐ ｄ(▽￣*)</span>
+<span title="告状">(′д｀σ)σ </span>
+<span title="跟你说厚~">╰(￣▽￣)╭</span>
+<span title="狗狗">U·ェ·*U </span>
+<span title="狗狗">U·ェ·U </span>
+<span title="鼓掌">””\\(￣ー￣) (￣ー￣)//””</span>
+<span title="鼓掌">└(￣ ￣└)(┘￣ ￣)┘</span>
+<span title="乖～">o(*^＠^*)o</span>
+<span title="滚来滚去">……~(～o￣▽￣)～o 。。。……o～(＿△＿o～) ~。。。</span>
+<span title="含泪挥手帕">(ToT)/~~~</span>
+<span title="好~~">o(*^▽^*)o </span>
+<span title="好吧">╮╯-╰╭"</span>
+<span title="好苦~">( ＞﹏＜)</span>
+<span title="好香~~">(╯▽╰ )</span>
+<span title="好主意!">(o゜▽゜)o☆</span>
+<span title="喝西北风">(　′Д`)彡</span>
+<span title="河马">（￣。。￣）</span>
+<span title="黑客帝国下腰!"> ┌(_Д_┌ )┐</span>
+<span title="黑客帝国下腰!"> ┌(_Д_┌ )┐</span>
+<span title="呼~幸好幸好……">ε=(￣。￣;A</span>
+<span title="呼唤">(/0￣)o </span>
+<span title="坏人……"> ～(　TロT)σ</span>
+<span title="幻影术！">(((￣(￣(￣(￣ー￣)￣)￣)￣))) </span>
+<span title="挥手帕">(@^^)/~~~</span>
+<span title="火箭筒，发射！">(*￣皿￣)=Σ口＞=Σ口＞=Σ口＞</span>
+<span title="获胜者是……">ヾ(￣ー￣)X(^▽^)ゞ</span>
+<span title="击掌">(〃￣︶￣)人(￣︶￣〃)</span>
+<span title="加油">o^^oo^^o</span>
+<span title="交通志愿老大妈指挥ing..."> (ｏ^~^)尸"</span>
+<span title="金盾!">||┣(—_＼) </span>
+<span title="就你！"><(￣ ﹌ ￣)@m</span>
+<span title="就你好了~"> (＠゜▽゜)</span>
+<span title="就是他!"> (＠｀д′)</span>
+<span title="举手">o(*^▽^*)┛</span>
+<span title="举手投降">┗( T﹏T )┛</span>
+<span title="嚼！">(￣～￣)</span>
+<span title="卡拉OK"> ...φ(0￣*)啦啦啦_φ(*￣0￣)′</span>
+<span title="看">(°ー°〃) </span>
+<span title="看好你哦！">(＠＾０＾)</span>
+<span title="看我忍者镖！">( ‵▽′)ノ'卍卍卍卍卍卍 Σ(゜д゜；)</span>
+<span title="靠！什么东西？！"> ( ｀д′)</span>
+<span title="咳咳">＞＜</span>
+<span title="苦恼"> ( -'`-; )</span>
+<span title="快使用双截棍，">┗(｀o′)┓哼┏(｀○′)┛哼┏(｀o′)┓哈┗(｀O′)┛兮！！</span>
+<span title="困，揉眼睛……">(o-ωｑ)).oO</span>
+<span title="啦啦啦">...φ(0￣*)_φ(*￣0￣)></span>
+<span title="来啦~">(～o￣▽￣)～o ~。。。</span>
+<span title="来人呐~">(o ;′Д`)ノ゛</span>
+<span title="冷笑">（ ￣ー￣）</span>
+<span title="脸红掩面">(*/ω＼*)</span>
+<span title="脸红掩面">(*/ω＼*)</span>
+<span title="两罐纸星星">(*ˉ﹃ˉ)_☆☆</span>
+<span title="列队">(*￣^￣(*￣^￣(*￣^￣)</span>
+<span title="铃铃铃">☆{{{Д}}} ☆!! </span>
+<span title="毛毛虫">(· ·)nnn </span>
+<span title="没办法~">╮(￣▽￣")╭</span>
+<span title="没人在哦?">||o(*°ω°*)o|Ю </span>
+<span title="媚眼">ο(=·ω＜=)ρ⌒☆</span>
+<span title="秘密">(一-一) </span>
+<span title="喵~">o( =∩ω∩= )m </span>
+<span title="喵~">＞▽＜</span>
+<span title="咩哈哈哈哈……"><(*￣▽￣*)/</span>
+<span title="蔑视">(￣_,￣ )</span>
+<span title="命苦...">ε(┬┬﹏┬┬)3</span>
+<span title="摸摸头">(～￣▽￣)ノ</span>
+<span title="摸摸头">╰(￣ω￣ｏ) </span>
+<span title="膜拜">＿|￣|○ → ＿|＼○＿ → ＿/＼○＿ → ＿__＿○＿</span>
+<span title="墓">┏┛墓┗┓...(((m -__-)m</span>
+<span title="哪~里跑?!">(///￣皿￣)○～</span>
+<span title="那边那个">(﹁ ﹁ )σ</span>
+<span title="嗯!">ヾ(≧へ≦)〃</span>
+<span title="嗯！">o(￣︶￣)n</span>
+<span title="嗯~">o(*￣▽￣*)o</span>
+<span title="你！！">Σ( ￣д￣；)</span>
+<span title="你回来啦~~">ヾ(^▽^*)))</span>
+<span title="你你你……"> ～(　TロT)σ</span>
+<span title="你你你……"> ～(　TロT)σ</span>
+<span title="溺水">゜゜┌┴o゜゜゜゜°</span>
+<span title="念力~"> ( -人-)···－～＝～≡～≡ ((+o+)))</span>
+<span title="念咒">（（（　(-h-)　）））</span>
+<span title="念咒">……(((＼(￣一￣)/)))</span>
+<span title="捏耳朵！"><( ‵□′)>───Ｃε(┬﹏┬)3</span>
+<span title="怒">ε=怒ε=怒ε=怒ε=怒ε=( o｀ω′)/</span>
+<span title="哦~">_(￣0￣)_</span>
+<span title="啪叽~摔一跟头……">((o_ _)'彡☆</span>
+<span title="怕怕">━((*′д｀)爻(′д｀*))━!!!!</span>
+<span title="拍手">└(￣ ￣└)(┘￣ ￣)┘</span>
+<span title="拍手拍手">””\\(￣ー￣) (￣ー￣)//””</span>
+<span title="拍桌狂笑!">o(*≧▽≦)ツ┏━┓</span>
+<span title="飘飘然……">︿(￣︶￣)︿</span>
+<span title="乒乓球">( ＾o)ρ┳┻┳°σ(o^ ) </span>
+<span title="期待"> (☆▽☆)</span>
+<span title="起床">(o￣Д￣)＜起床! ※=○☆(＿＿*)Ｚｚｚ</span>
+<span title="起床啦!">( *′д)/o(_ _)ozzZZ…</span>
+<span title="切~~">( ﹁ ﹁ ) ~~~</span>
+<span title="亲亲">o(*￣3￣)o</span>
+<span title="亲亲">(* ￣)(￣▽￣*)ゞ</span>
+<span title="去去去~">(づ￣ 3￣)づ...</span>
+<span title="去下厕厕……">∥WC||_·)╯</span>
+<span title="忍术~隐！"> （￣人￣）（￣人:.;:…（￣...:.;::..;::: .:;.…::;.:..:;.:...</span>
+<span title="撒花！">(￣▽￣)o∠※PAN!=.:*:'☆.:*:'★':* </span>
+<span title="撒花！">*★,°*:.☆\(￣▽￣)/$:*.°★* 。</span>
+<span title="散弹发射！！">▄︻┻┳═一∵∴∷∶∵ (∵_,∵)>>>></span>
+<span title="杀虫剂！">( ▼▼)/鹵〈 巛巛巛 ( ◎_x)/</span>
+<span title="闪人">(*￣▽￣)(￣▽:;.…::;.:.:::;..::;.:... </span>
+<span title="伤心">(；′⌒`)</span>
+<span title="蛇拳">z(-_-z)).....((s-_-)s</span>
+<span title="射箭">( ￣ー￣)——)-＝＝＝＝＝＝＝>-->></span>
+<span title="神啊~">\(￣0￣)/</span>
+<span title="失落">(。_。) </span>
+<span title="石化">━━∑(￣□￣*|||━━化</span>
+<span title="石化ing~">(ˉ▽ˉ；)...</span>
+<span title="视力表">┫♀旦￣)σ(呃……)</span>
+<span title="是不是你?!">(σ｀д′)σ</span>
+<span title="是不是你?!">(σ｀д′)σ</span>
+<span title="手榴弹!">σ～ (｀′メ　</span>
+<span title="手指戳戳">(～￣▽￣)→))*￣▽￣*)o </span>
+<span title="手肘戳戳">o(￣▽￣*)ゞ))￣▽￣*)o </span>
+<span title="衰">(′д｀ )…彡…彡</span>
+<span title="死亡中">(:D)┼─┤</span>
+<span title="太好笑了！！">……o((≧▽≦o)</span>
+<span title="太可怕了">ヽ(*。>Д<)o゜</span>
+<span title="逃命啊~~">\("▔□▔)/\("▔□▔)/ </span>
+<span title="陶醉">( *︾▽︾)</span>
+<span title="讨厌啦~">(ノω<。)ノ))☆.。</span>
+<span title="天旋地转">ヾ(　 　)ノ゛ヾ(　°д)ノ゛ヾ(°д°)ノ゛ヾ(д°　)ノ゛ヾ(　　)ノ゛</span>
+<span title="天助我也~"> ヾ(*′▽｀*)彡</span>
+<span title="挑衅"><(*￣ー￣)ゞ来呀~</span>
+<span title="挑衅"><(*￣ー￣)ゞ来啊~</span>
+<span title="偷看">(/ω＼*)……… (/ω·＼*) </span>
+<span title="偷看">(/ω·＼*) </span>
+<span title="偷拍 ">Σ[ ◎ ]}ー′）</span>
+<span title="怒">凸艹皿艹</span>
+<span title="靠">凸゜皿゜メ</span>
+<span title="吐">( >ρ < ”)</span>
+<span title="推推~起床啦!">(o￣ω￣)○))ｏ(＿＿*)Ｚｚｚ</span>
+<span title="拖走">ヽ(゜▽゜　)－C<(/;◇;)/~</span>
+<span title="哇卡卡卡卡卡……">o((≧▽≦o) 太好笑了！！</span>
+<span title="哇咧！">Σ(⊙▽⊙"a...</span>
+<span title="挖鼻屎"> (*￣rǒ￣)</span>
+<span title="万岁！">*★,°*:.☆\(￣▽￣)/$:*.°★* 。</span>
+<span title="围观！">(← ← )</span>
+<span title="围观！">( → →) </span>
+<span title="畏罪自杀…">…〒_〒…‵ｏ′-一┳═┻︻▄</span>
+<span title="喂！">(#`O′)</span>
+<span title="喂饭">( *^-^)ρ(^0^* )</span>
+<span title="吻别">(*￣;(￣ *)</span>
+<span title="我？">σ(· ·?)</span>
+<span title="我不看……">(/▽＼)</span>
+<span title="我错了……">(。﹏。*)</span>
+<span title="我回来啦~">||ヽ(*￣▽￣*)ノミ|Ю</span>
+<span title="我来了~">(～￣▽￣)～</span>
+<span title="我忍!">o(-"-;) </span>
+<span title="我闪！">|(·_·) |·_·) |_·) |·) | )</span>
+<span title="握拳!">o(￣ヘ￣o* )</span>
+<span title="握拳！">o(￣ヘ￣o＃)</span>
+<span title="呜呜呜……">( >﹏<。)～</span>
+<span title="无敌！">↑↑↓↓←→←→ＢＡ...┗( -o-)┛</span>
+<span title="无敌弹簧拳！">( ‵Д′)=○))~~~~~~Ю))>o<)/ </span>
+<span title="无敌幻影脚！">ヽ(ヽ `д′)ヽ`д′)ヽ`д′)┌┛┌┛┌┛★)`з゜)y</span>
+<span title="无敌捏脸功！"><( ‵□′)───C＜─___-)|| </span>
+<span title="无敌肉包拳！">(o ￣3)==@))゜ロ゜((@==(′ε′ )o　</span>
+<span title="无敌肉包拳！">(o ￣3)==@))゜ロ゜((@==(′ε′ )o</span>
+<span title="无敌影分身！">((≧(≧▽(≧▽≦(≧▽≦)≧▽≦)▽≦)≦))) </span>
+<span title="无力扶墙..."> ( ＿ ＿)ノ｜壁</span>
+<span title="无奈">╮(╯-╰)╭ </span>
+<span title="无影脚！">＜( ￣︿￣)︵θ︵θ︵θ︵θ︵☆(＞口＜－)</span>
+<span title="无影脚！">＜( ￣︿￣)︵θ︵θ︵θ︵θ︵☆(＞口＜－)</span>
+<span title="享受">(╯▽╰ ) </span>
+<span title="消失">(*￣□￣)(￣□:;.…::;.:.:::;..::;.:...</span>
+<span title="小新"><(￣︶￣)↗</span>
+<span title="邪恶">( ‵▽′)ψ</span>
+<span title="谢啦!!">☆⌒(*＾-゜)v </span>
+<span title="心神不宁...">(゜゜ )(。。)(゜゜ )(。。)</span>
+<span title="欣慰">( ╯▽╰)</span>
+<span title="要">不＞(￣ε￣ = ￣3￣)<</span>
+<span title="噎死">( *⊙~⊙) </span>
+<span title="噎住">( *⊙~⊙) </span>
+<span title="隐身！">(*￣□￣)(￣□:;.…::;.:.:::;..::;.:...</span>
+<span title="鹰钩鼻">(￣ム￣) </span>
+<span title="哟西！">（９￣＾￣）９</span>
+<span title="有了!">(o゜▽゜)o☆</span>
+<span title="有人吗?">||o(*°▽°*)o|Ю </span>
+<span title="御风_凌"></span>
+<span title="怨.念....">o(一︿一+)o</span>
+<span title="运动">╔囧╗╔囧╝╚囧╝╚囧╗</span>
+<span title="晕！">@o@"</span>
+<span title="糟糕！">X﹏X</span>
+<span title="早安呀~~~"> o(*￣▽￣*)ブ</span>
+<span title="早点回来哦~">(～￣(OO)￣)ブ</span>
+<span title="炸弹！">(╯‵□′)╯···*～●</span>
+<span title="斩!!">ˋ( ° ▽、° ) (o(￣▽￣///</span>
+<span title="涨">(￣︶￣)↗</span>
+<span title="这个……呃~~">-______-"</span>
+<span title="真哒?!"> o(〃'▽'〃)o</span>
+<span title="真空波动拳！">（ ｀o′）{ ···－＝≡))</span>
+<span title="真空波动拳！">（ ｀o′）{ ···－＝≡))</span>
+<span title="振奋">(o>ε(o>ｕ(≧∩≦) </span>
+<span title="振作!">━━(o_ _)o━━(o―_―)o━━(９￣ー￣)９</span>
+<span title="痣长毛">( ゜，_ゝ゜) </span>
+<span title="皱眉">(-"-)</span>
+<span title="抓狂">o((>ω< ))o</span>
+<span title="抓狂">o(>@<)o</span>
+<span title="足球">( · ·)L☆ ．．．..○ 冂 </span>
+<span title="醉拳">ヨロ (*~▽~)ノ ヨロ ヽ(~▽~*）ヨロ (*~▽~)―〇 ☆ バシ ))>口<)</span>
+<p style="display: block; float: left; margin-top: 25px; margin-bottom: -40px;">&copy; 2010 @ag108lau<br>Thanks @OnlyTiny<br />
+Last Update: 2010-11-13
 </p>
\ No newline at end of file
diff --git a/inc/symbols.php b/inc/symbols.php
deleted file mode 100644
index 60959dd..0000000
--- a/inc/symbols.php
+++ /dev/null
@@ -1,489 +0,0 @@
-<span title=" 嗷~~">┗|｀O′|┛</span>
-<span title="~你给我回来！">o(°▽、°o)....+((￣﹏￣m )</span>
-<span title="“不明真相的围观群众”">槑槑槑槑呆槑槑槑槑槑槑槑槑……</span>
-<span title="『家』">～o(▽｀ o) =3 =3 =3</span>
-<span title="【TEL】">＜铃铃铃~ヾ(￣ ￣*)==3=3=3</span>
-<span title="【小黑屋】">ヽ(￣︿￣　)—C<(/;◇;)/ </span>
-<span title="555~他不起来……">ヾ( ┬o┬)┌θθθθ(;;＿ ＿).o○</span>
-<span title="aaa">o((>ω< ))o</span>
-<span title="aaa">o(≧口≦)o</span>
-<span title="ai">╮(￣▽￣")╭ </span>
-<span title="bai">ｍ(＿　＿)ｍ</span>
-<span title="bai">ヾ(￣▽￣)Bye~Bye~</span>
-<span title="baotou">▄︻┻┳═一…… ☆（>○<）</span>
-<span title="baoxiao">o(*≧▽≦)ツ</span>
-<span title="baoxiao">ヾ(≧▽≦*)o</span>
-<span title="bengkui">o(≧口≦)o</span>
-<span title="BINGO!">(o゜▽゜)o☆</span>
-<span title="biti">(￣ ‘i ￣;)</span>
-<span title="biti">(￣ ii ￣;) (￣＂￣;)</span>
-<span title="bizui">(⊙x⊙;)</span>
-<span title="bo">(*^ ^*)(^ *)</span>
-<span title="bqlz">(◎_x)</span>
-<span title="buhaoyisi">o(￣┰￣*)ゞ</span>
-<span title="buyao">°.°·(((p(≧□≦)q)))·°.°。</span>
-<span title="canle">X﹏X 惨了！</span>
-<span title="chaoxiao">q(≧▽≦q)</span>
-<span title="chouyan">（￣ c￣）y▂ξ。。。</span>
-<span title="chuai"><( ￣^￣)(θ(θ☆( >_< </span>
-<span title="dai">(￣△￣；)</span>
-<span title="dai">(￣旦￣；)</span>
-<span title="dai">━┳━　━┳━</span>
-<span title="dao">Σ(｀д′*ノ)ノ</span>
-<span title="dao">Σ(っ °Д °;)っ</span>
-<span title="dese">～(￣▽￣～)(～￣▽￣)～</span>
-<span title="deyi"><(￣ˇ￣)/</span>
-<span title="duo">┬┴┤_·)</span>
-<span title="e">("▔□▔)</span>
-<span title="e">(⊙﹏⊙)</span>
-<span title="e">-________-''</span>
-<span title="e">o(` · ~ · ′。)o</span>
-<span title="EXIT">______λ......_____</span>
-<span title="EXIT">λ…λλ…λ…λλλ…</span>
-<span title="fangp">○|￣|_ =3</span>
-<span title="fanzhuo">(╯′□｀)╯ ┫:·'∵:.┻┻:·'.:┣∵·:. ┳┳☆</span>
-<span title="fanzhuo">(╯‵□′)╯""┻━┻☆))>○<)</span>
-<span title="fanzhuo">┻━┻︵╰(‵□′)╯︵┻━┻ </span>
-<span title="fei">︿(￣︶￣)︿</span>
-<span title="fen">ヾ(≧奋≦)〃</span>
-<span title="fk">French (*￣(￣　*) Kiss!</span>
-<span title="fufu">(￣ˇ￣)v</span>
-<span title="fufu">fufu~ ^u^</span>
-<span title="gaozhuang">( σ'ω')σ </span>
-<span title="gaozhuang">o(>O<;; )σ</span>
-<span title="gfw">┳G┻┳F┳┻W┫</span>
-<span title="GiveMeFive!">(┘￣︶￣)┘└(￣︶￣└)</span>
-<span title="GO!"><(￣︶￣)↗</span>
-<span title="GO!"><(ï¿£OO,ï¿£)/</span>
-<span title="good">Good! o(￣▽￣)ｄ</span>
-<span title="gudan">______λ......_____</span>
-<span title="guilian">(￣┰￣*)</span>
-<span title="ha">(＃°Д°) </span>
-<span title="ha">O口O!</span>
-<span title="ha">Σ(⊙▽⊙"a...</span>
-<span title="haha">o(*≧▽≦)ツ</span>
-<span title="han">(ï¿£_ï¿£|||)</span>
-<span title="han">(￣▽￣")</span>
-<span title="han">(寒￣ii￣)彡…彡…彡</span>
-<span title="hehe">o(*￣▽￣*)o</span>
-<span title="heiban">【】\(·ω·`)o</span>
-<span title="heihei">o(*￣▽￣*)ゞ</span>
-<span title="heng">( －з)</span>
-<span title="heng">(；′⌒`)</span>
-<span title="heng">(ε－ )</span>
-<span title="heng">o(￣ヘ￣o＃) </span>
-<span title="hh">(￣▽￣")</span>
-<span title="hh">o(*￣▽￣*)o</span>
-<span title="hhh">^-^</span>
-<span title="hhh">^O^</span>
-<span title="hi">Hi~ o(*￣▽￣*)ブ</span>
-<span title="Hi~Hitler!">（ ·＿·)ノ＿·）ノ＿·）ノ＿·）ノ＿·）ノ</span>
-<span title="hiahia">○( ＾皿＾)っHiahiahia.... </span>
-<span title="hoho">(￣y▽￣)╭ Ohohoho.....</span>
-<span title="hoho">hoho ^O^</span>
-<span title="huhu">(_　_)。゜zｚＺ</span>
-<span title="jing">Σ( ° △ °|||)︴</span>
-<span title="jing">Σ(｀д′*ノ)ノ</span>
-<span title="jing">Σ(っ °Д °;)っ</span>
-<span title="jirou">┗|*｀0′*|┛</span>
-<span title="jiujie">( -'`-; ) </span>
-<span title="jiujie">o(′益`)o</span>
-<span title="jizhang">( ￣ー￣)人(^▽^ )</span>
-<span title="keai">n(*≧▽≦*)n</span>
-<span title="kedou">(°°)～　(°°)～　(°°)～　(°°)～</span>
-<span title="Kiss!"> (*￣(￣　*)</span>
-<span title="koushui">ˋ( ° ▽、° ) 口水ing...</span>
-<span title="K歌"> ...φ(0￣*)啦啦啦_φ(*￣0￣)></span>
-<span title="laohu">m( =∩王∩= )m</span>
-<span title="lei">(┳＿┳)...</span>
-<span title="lei">/(ㄒoㄒ)/~~</span>
-<span title="luanma">卐~%?…,# *'☆&℃$︿★?</span>
-<span title="manzu">o(*￣︶￣*)o</span>
-<span title="manzu">o(￣ˇ￣)o</span>
-<span title="mao">o( =·ω·= )m </span>
-<span title="mao">o(=·ェ·=)m</span>
-<span title="max">MIN■■■■■□□MAX</span>
-<span title="miehhh">(/￣ˇ￣)/</span>
-<span title="mimi">（。人。） </span>
-<span title="mmm">mmm...f('︶︿︶)o</span>
-<span title="mmm">mmm.....</span>
-<span title="mojiezuo">Capricorn</span>
-<span title="mua">mua! (*╯3╰)</span>
-<span title="niao">--\(˙<>˙)/--</span>
-<span title="nie">~(￣▽￣)~* </span>
-<span title="nu">(#‵′) </span>
-<span title="nu">(o#゜ 曲゜)o</span>
-<span title="nu">MIN■■■■■□□MAX(╯‵□′)╯︵┻━┻</span>
-<span title="nu">ε=怒ε=怒ε=怒ε=怒ε=( o｀ω′)ノ</span>
-<span title="o">(⊙o⊙)？</span>
-<span title="ohno">Oh~ no！！！！</span>
-<span title="ohye">Oh yeah！\(^&^)/</span>
-<span title="ok">OK</span>
-<span title="paidui">λ…λλ…λ…入λλ…</span>
-<span title="pao">ε = = (づ′▽`)づ</span>
-<span title="pao">ε=ε=ε=(~￣▽￣)~</span>
-<span title="pao">ヾ(*′▽｀*)ノ彡☆ノヽノヽノヽ</span>
-<span title="pdr">ヾ(′▽｀* )ノ~</span>
-<span title="pia">(￣ε(#￣)☆╰╮o(￣▽￣///) </span>
-<span title="pia">Pia!(ｏ ‵-′)ノ”(ノ﹏<。)</span>
-<span title="piao">(～￣▽￣)～</span>
-<span title="piao">(～o￣3￣)～</span>
-<span title="piao">.....((/- -)/</span>
-<span title="qiang">▄︻┻┳═一……</span>
-<span title="qie">(ˉ▽￣～) 切~~</span>
-<span title="qing">( ^ ^) _U~~</span>
-<span title="quan">(╬￣皿￣)＝○＃(￣＃)３￣)</span>
-<span title="quan">(Д゜(○=(゜ 皿゜)=○)゜Д゜)</span>
-<span title="shengqi"><(－︿－)></span>
-<span title="shy">shy~ o(*////▽////*)q</span>
-<span title="sigh">( ′ 3`) sigh~</span>
-<span title="S奥特曼">三三三三三三三三三4(o|o ) </span>
-<span title="S小孩!"> (ｏ ‵-′)ノ”(ノ_<。)</span>
-<span title="t"><( ￣^￣)(θ(θ☆( >_< </span>
-<span title="tanshou">╮( ╯ 3 ╰ )╭</span>
-<span title="tanshou">╮(￣▽￣")╭ </span>
-<span title="tanshou">╮(╯-╰)╭</span>
-<span title="tanshou">ㄟ( ▔, ▔ )ㄏ</span>
-<span title="tao">ε=ε=┏( >_<)┛</span>
-<span title="tao">ε=ε=ε=┏(゜ロ゜;)┛ </span>
-<span title="tao">ε=ε=ε=ε=ヽ(*￣o￣)ノ</span>
-<span title="tat">o(≧∩≦)o</span>
-<span title="tat">o(TヘTo)</span>
-<span title="thx">☆⌒(*＾-゜)v THX!!</span>
-<span title="toukui">|壁|_☆)</span>
-<span title="toukui">┬┴┤_·)</span>
-<span title="touxiang">n(→_←)┛</span>
-<span title="touxiang">o( >﹏<。)┛</span>
-<span title="tun">0＾）吞！</span>
-<span title="tushetou">(￣┰￣*)</span>
-<span title="wa">(PД`q。)·。'゜</span>
-<span title="wakkk"><(￣▽￣)/</span>
-<span title="wc">∥wc∥ o(- -o) =з =з =з</span>
-<span title="weiguan">(﹁"﹁)</span>
-<span title="weiqu">╥﹏╥...</span>
-<span title="wo">σ（⌒ー⌒）</span>
-<span title="woniu">@/"</span>
-<span title="wow">wow~⊙o⊙</span>
-<span title="xiaoxin">ㄟ( ▔, ▔ )ㄏ</span>
-<span title="xiey">( ﹁ ﹁ ) ~→</span>
-<span title="xiey">(ï¿£.ï¿£)+</span>
-<span title="xiey">(﹁"﹁)</span>
-<span title="xiezi">...ψ(。。 )</span>
-<span title="xingfu">o(*￣▽￣*)o</span>
-<span title="xiong">(*￣(エ)￣)</span>
-<span title="xiong">(+(工)+╬)</span>
-<span title="xiu">o(*////▽////*)q</span>
-<span title="xiu">p(#￣▽￣#)o</span>
-<span title="xxoo">卐~%?…,# *'☆&℃$︿★?……</span>
-<span title="xxoo">╳╳○○</span>
-<span title="y">(*￣︶￣)y</span>
-<span title="y">(*￣▽￣)y</span>
-<span title="y">^_^)y</span>
-<span title="yanshen">━┳━　━┳━</span>
-<span title="yanwenzi">ag108lau</span>
-<span title="yessir">Yes,sir! <(ï¿£Oï¿£)/</span>
-<span title="yiqi">╭(′▽`)╭(′▽`)╯</span>
-<span title="yiqi">ヽ(￣ω￣(￣ω￣〃)ゝ</span>
-<span title="yo">(＾Ｕ＾)ノ~ＹＯ </span>
-<span title="yu">>°)))>彡</span>
-<span title="yun">(((φ(◎ロ◎;)φ)))</span>
-<span title="zhaoxiang">Σ[ ◎ ]}</span>
-<span title="zhi"><(￣ ﹌ ￣)@m</span>
-<span title="zhu">^(*ï¿£(oo)ï¿£)^</span>
-<span title="zhua">W(ï¿£_ï¿£)W</span>
-<span title="zhuangqiang">┳G┻F┳W┫☆(ノ﹏<。)</span>
-<span title="zhuisha">--＝＝≡≡〈〈《( /￣皿￣)=Ｏ));>o<）/</span>
-<span title="zuomeng">ZZzz…(。-ω-)..ooO((【·:*:~夢~:*:·】))</span>
-<span title="哎哟哟……">(￣y▽,￣)╭ </span>
-<span title="安安啦~~~"> o(*￣▽￣*)ブ</span>
-<span title="凹凸曼……">(o|o)</span>
-<span title="嗷~">ヾ(≧O≦)〃</span>
-<span title="奥特曼……">(o|o) </span>
-<span title="拜佛">(-人-) </span>
-<span title="拜托啦……">(^人^)</span>
-<span title="包在我身上!">ヾ(′▽｀*)ゝ</span>
-<span title="包在我身上!">ヾ(′▽｀*)ゝ</span>
-<span title="抱抱">━((*′ ▽｀)爻(′▽｀*))━!!!</span>
-<span title="抱抱">━((*′д｀)爻(′д｀*))━!!!!</span>
-<span title="抱抱~">\(￣︶￣)/</span>
-<span title="抱抱~">\(￣︶￣*\))</span>
-<span title="鼻毛">(′゜c_，゜` ) </span>
-<span title="鄙视你！">╭∩╮(︶︿︶）╭∩╮</span>
-<span title="壁">( ￣ ￣)σ…( ＿ ＿)ノ｜</span>
-<span title="壁">( ￣ ￣)σ…( ＿ ＿)ノ｜</span>
-<span title="壁">ノ￣ー￣)ノ　⌒　>┼○"☆||</span>
-<span title="便秘">o(′益`)o </span>
-<span title="辫子">§(*￣▽￣*)§</span>
-<span title="表！"><(￣3￣)> </span>
-<span title="别走啊～～">______λ......___丬</span>
-<span title="瘪嘴">(*￣︿￣) </span>
-<span title="冰天雪地掩面泪奔……">(PД`q。)·。'゜</span>
-<span title="啵啵">(* ￣3)(ε￣ *) </span>
-<span title="不吃!">( *^-^)ρ(*╯^╰)</span>
-<span title="不懂">(＠_＠;)? </span>
-<span title="不满">(*￣︿￣) </span>
-<span title="不是我干的">ㄟ( ▔, ▔ )ㄏ </span>
-<span title="不屑">(￣_,￣ )</span>
-<span title="擦眼泪……">(ノへ￣、)</span>
-<span title="财神爷">(o′┏▽┓｀o) </span>
-<span title="草泥马">（　·ェ·）（·ェ·　）</span>
-<span title="蹭">(*≧︶≦))(￣▽￣* )ゞ</span>
-<span title="蹭">( *￣▽￣)((≧︶≦*) </span>
-<span title="叉腰"><)。(> </span>
-<span title="超强风扇吹">ε～( ～( ～ ( 卍 )＼(￣▽￣ ＼)</span>
-<span title="超远程BB枪！">(＃￣□￣)ｏ―∈‥oo━━━━━━━☆ </span>
-<span title="車">●┻┓⌒ Σ┌┘車└┐=3 =3 =3</span>
-<span title="吃饭去鸟">.....(((((ヾ(　o=^·ェ·)o　┏━┓</span>
-<span title="吃我一鞭!">( `０‘)ノ~~~~~~~~~ν</span>
-<span title="吃药">(。>︿<)_θ</span>
-<span title="冲出！！">___*\( ￣皿￣)/#____</span>
-<span title="抽!!">(￣ε(#￣)☆╰╮(￣▽￣///)</span>
-<span title="抽泣">(ノへ￣、)</span>
-<span title="抽泣">(ノへ￣、)</span>
-<span title="臭蚊子!">Pia!(ｏ ‵-′)ノ” </span>
-<span title="穿墙过去！">ε=ε┣G┻F┳ε=ヽ(*￣▽￣)ノ┻W┫</span>
-<span title="戳">→)╥﹏╥) </span>
-<span title="赐予你力量！">( *￣▽￣)o ─═≡※:☆▆▅▄▃▂＿</span>
-<span title="打呵欠">(_ _)( - . - )(~O~) ……( - . - ) </span>
-<span title="大鼻子">(′台｀ ) </span>
-<span title="呆滞"> ━┳━　━┳━</span>
-<span title="淡定">━━(￣ー￣*|||━━</span>
-<span title="当然！"><(ˉ^ˉ)></span>
-<span title="刀疤">(-_-メ)</span>
-<span title="等等我…我……我…………">...(*￣０￣)ノ</span>
-<span title="低落"> (#｀-_ゝ-)</span>
-<span title="低头">(。﹏。) </span>
-<span title="低头">(。_。) </span>
-<span title="点头">（￣ー￣（＿ ＿（￣ー￣（＿ ＿ </span>
-<span title="跌">(┬＿┬)↘ </span>
-<span title="顶!">d=====(￣▽￣*)b </span>
-<span title="动感光波">！！！( ￣O￣)ノノ……∞∞OOO)))</span>
-<span title="动感光波">！！！( ￣O￣)ノノ……∞∞OOO)))</span>
-<span title="抖">o((⊙﹏⊙))o. </span>
-<span title="嘟嘴">o(￣ε￣*) </span>
-<span title="嘟嘴">（○｀ 3′○） </span>
-<span title="对不起~"> <(＿　＿)></span>
-<span title="呃~被发现了......">(ˉ▽ˉ；)</span>
-<span title="呃~我……">σ(-_-メ)</span>
-<span title="翻桌！">(╯‵□′)╯︵┻━┻</span>
-<span title="防御！">(((＼(￣一￣)/)))</span>
-<span title="放我出去~~~"> ||Φ|(|T|Д|T|)|Φ|| </span>
-<span title="飞吻"> (*￣3￣)╭</span>
-<span title="分裂">＞(￣▽￣ = ￣︿￣)<</span>
-<span title="风魔法！"> (／-_-)／ξ ξ ξ ξ ξ ξ (+_+ ／)／～～～</span>
-<span title="去去去~">乀ˉεˉ乀...</span>
-<span title="扶眼镜">(-@y@) </span>
-<span title="扶眼镜">(-@y@) </span>
-<span title="复活!">...:.;::..;::: .:.;::….;:￣)…:.;:□￣)(￣□￣*)</span>
-<span title="嘎~嘎~嘎~">．<{=．．．．</span>
-<span title="干杯">(￣▽￣)～■□～(￣▽￣)</span>
-<span title="干杯！">~(￣▽￣)~* </span>
-<span title="感动！">o(*≧▽≦*)m</span>
-<span title="高~实在是高!">(*￣▽)u┌┐ ｄ(▽￣*)</span>
-<span title="告状">(′д｀σ)σ </span>
-<span title="跟你说厚~">╰(￣▽￣)╭</span>
-<span title="狗狗">U·ェ·*U </span>
-<span title="狗狗">U·ェ·U </span>
-<span title="鼓掌">””\\(￣ー￣) (￣ー￣)//””</span>
-<span title="鼓掌">└(￣ ￣└)(┘￣ ￣)┘</span>
-<span title="乖～">o(*^＠^*)o</span>
-<span title="滚来滚去">……~(～o￣▽￣)～o 。。。……o～(＿△＿o～) ~。。。</span>
-<span title="含泪挥手帕">(ToT)/~~~</span>
-<span title="好~~">o(*^▽^*)o </span>
-<span title="好吧">╮╯-╰╭"</span>
-<span title="好苦~">( ＞﹏＜)</span>
-<span title="好香~~">(╯▽╰ )</span>
-<span title="好主意!">(o゜▽゜)o☆</span>
-<span title="喝西北风">(　′Д`)彡</span>
-<span title="河马">（￣。。￣）</span>
-<span title="黑客帝国下腰!"> ┌(_Д_┌ )┐</span>
-<span title="黑客帝国下腰!"> ┌(_Д_┌ )┐</span>
-<span title="呼~幸好幸好……">ε=(￣。￣;A</span>
-<span title="呼唤">(/0￣)o </span>
-<span title="坏人……"> ～(　TロT)σ</span>
-<span title="幻影术！">(((￣(￣(￣(￣ー￣)￣)￣)￣))) </span>
-<span title="挥手帕">(@^^)/~~~</span>
-<span title="火箭筒，发射！">(*￣皿￣)=Σ口＞=Σ口＞=Σ口＞</span>
-<span title="获胜者是……">ヾ(￣ー￣)X(^▽^)ゞ</span>
-<span title="击掌">(〃￣︶￣)人(￣︶￣〃)</span>
-<span title="加油">o^^oo^^o</span>
-<span title="交通志愿老大妈指挥ing..."> (ｏ^~^)尸"</span>
-<span title="金盾!">||┣(—_＼) </span>
-<span title="就你！"><(￣ ﹌ ￣)@m</span>
-<span title="就你好了~"> (＠゜▽゜)</span>
-<span title="就是他!"> (＠｀д′)</span>
-<span title="举手">o(*^▽^*)┛</span>
-<span title="举手投降">┗( T﹏T )┛</span>
-<span title="嚼！">(￣～￣)</span>
-<span title="卡拉OK"> ...φ(0￣*)啦啦啦_φ(*￣0￣)′</span>
-<span title="看">(°ー°〃) </span>
-<span title="看好你哦！">(＠＾０＾)</span>
-<span title="看我忍者镖！">( ‵▽′)ノ'卍卍卍卍卍卍 Σ(゜д゜；)</span>
-<span title="靠！什么东西？！"> ( ｀д′)</span>
-<span title="咳咳">＞＜</span>
-<span title="苦恼"> ( -'`-; )</span>
-<span title="快使用双截棍，">┗(｀o′)┓哼┏(｀○′)┛哼┏(｀o′)┓哈┗(｀O′)┛兮！！</span>
-<span title="困，揉眼睛……">(o-ωｑ)).oO</span>
-<span title="啦啦啦">...φ(0￣*)_φ(*￣0￣)></span>
-<span title="来啦~">(～o￣▽￣)～o ~。。。</span>
-<span title="来人呐~">(o ;′Д`)ノ゛</span>
-<span title="冷笑">（ ￣ー￣）</span>
-<span title="脸红掩面">(*/ω＼*)</span>
-<span title="脸红掩面">(*/ω＼*)</span>
-<span title="两罐纸星星">(*ˉ﹃ˉ)_☆☆</span>
-<span title="列队">(*￣^￣(*￣^￣(*￣^￣)</span>
-<span title="铃铃铃">☆{{{Д}}} ☆!! </span>
-<span title="毛毛虫">(· ·)nnn </span>
-<span title="没办法~">╮(￣▽￣")╭</span>
-<span title="没人在哦?">||o(*°ω°*)o|Ю </span>
-<span title="媚眼">ο(=·ω＜=)ρ⌒☆</span>
-<span title="秘密">(一-一) </span>
-<span title="喵~">o( =∩ω∩= )m </span>
-<span title="喵~">＞▽＜</span>
-<span title="咩哈哈哈哈……"><(*￣▽￣*)/</span>
-<span title="蔑视">(￣_,￣ )</span>
-<span title="命苦...">ε(┬┬﹏┬┬)3</span>
-<span title="摸摸头">(～￣▽￣)ノ</span>
-<span title="摸摸头">╰(￣ω￣ｏ) </span>
-<span title="膜拜">＿|￣|○ → ＿|＼○＿ → ＿/＼○＿ → ＿__＿○＿</span>
-<span title="墓">┏┛墓┗┓...(((m -__-)m</span>
-<span title="哪~里跑?!">(///￣皿￣)○～</span>
-<span title="那边那个">(﹁ ﹁ )σ</span>
-<span title="嗯!">ヾ(≧へ≦)〃</span>
-<span title="嗯！">o(￣︶￣)n</span>
-<span title="嗯~">o(*￣▽￣*)o</span>
-<span title="你！！">Σ( ￣д￣；)</span>
-<span title="你回来啦~~">ヾ(^▽^*)))</span>
-<span title="你你你……"> ～(　TロT)σ</span>
-<span title="你你你……"> ～(　TロT)σ</span>
-<span title="溺水">゜゜┌┴o゜゜゜゜°</span>
-<span title="念力~"> ( -人-)···－～＝～≡～≡ ((+o+)))</span>
-<span title="念咒">（（（　(-h-)　）））</span>
-<span title="念咒">……(((＼(￣一￣)/)))</span>
-<span title="捏耳朵！"><( ‵□′)>───Ｃε(┬﹏┬)3</span>
-<span title="怒">ε=怒ε=怒ε=怒ε=怒ε=( o｀ω′)/</span>
-<span title="哦~">_(￣0￣)_</span>
-<span title="啪叽~摔一跟头……">((o_ _)'彡☆</span>
-<span title="怕怕">━((*′д｀)爻(′д｀*))━!!!!</span>
-<span title="拍手">└(￣ ￣└)(┘￣ ￣)┘</span>
-<span title="拍手拍手">””\\(￣ー￣) (￣ー￣)//””</span>
-<span title="拍桌狂笑!">o(*≧▽≦)ツ┏━┓</span>
-<span title="飘飘然……">︿(￣︶￣)︿</span>
-<span title="乒乓球">( ＾o)ρ┳┻┳°σ(o^ ) </span>
-<span title="期待"> (☆▽☆)</span>
-<span title="起床">(o￣Д￣)＜起床! ※=○☆(＿＿*)Ｚｚｚ</span>
-<span title="起床啦!">( *′д)/o(_ _)ozzZZ…</span>
-<span title="切~~">( ﹁ ﹁ ) ~~~</span>
-<span title="亲亲">o(*￣3￣)o</span>
-<span title="亲亲">(* ￣)(￣▽￣*)ゞ</span>
-<span title="去去去~">(づ￣ 3￣)づ...</span>
-<span title="去下厕厕……">∥WC||_·)╯</span>
-<span title="忍术~隐！"> （￣人￣）（￣人:.;:…（￣...:.;::..;::: .:;.…::;.:..:;.:...</span>
-<span title="撒花！">(￣▽￣)o∠※PAN!=.:*:'☆.:*:'★':* </span>
-<span title="撒花！">*★,°*:.☆\(￣▽￣)/$:*.°★* 。</span>
-<span title="散弹发射！！">▄︻┻┳═一∵∴∷∶∵ (∵_,∵)>>>></span>
-<span title="杀虫剂！">( ▼▼)/鹵〈 巛巛巛 ( ◎_x)/</span>
-<span title="闪人">(*￣▽￣)(￣▽:;.…::;.:.:::;..::;.:... </span>
-<span title="伤心">(；′⌒`)</span>
-<span title="蛇拳">z(-_-z)).....((s-_-)s</span>
-<span title="射箭">( ￣ー￣)——)-＝＝＝＝＝＝＝>-->></span>
-<span title="神啊~">\(￣0￣)/</span>
-<span title="失落">(。_。) </span>
-<span title="石化">━━∑(￣□￣*|||━━化</span>
-<span title="石化ing~">(ˉ▽ˉ；)...</span>
-<span title="视力表">┫♀旦￣)σ(呃……)</span>
-<span title="是不是你?!">(σ｀д′)σ</span>
-<span title="是不是你?!">(σ｀д′)σ</span>
-<span title="手榴弹!">σ～ (｀′メ　</span>
-<span title="手指戳戳">(～￣▽￣)→))*￣▽￣*)o </span>
-<span title="手肘戳戳">o(￣▽￣*)ゞ))￣▽￣*)o </span>
-<span title="衰">(′д｀ )…彡…彡</span>
-<span title="死亡中">(:D)┼─┤</span>
-<span title="太好笑了！！">……o((≧▽≦o)</span>
-<span title="太可怕了">ヽ(*。>Д<)o゜</span>
-<span title="逃命啊~~">\("▔□▔)/\("▔□▔)/ </span>
-<span title="陶醉">( *︾▽︾)</span>
-<span title="讨厌啦~">(ノω<。)ノ))☆.。</span>
-<span title="天旋地转">ヾ(　 　)ノ゛ヾ(　°д)ノ゛ヾ(°д°)ノ゛ヾ(д°　)ノ゛ヾ(　　)ノ゛</span>
-<span title="天助我也~"> ヾ(*′▽｀*)彡</span>
-<span title="挑衅"><(*￣ー￣)ゞ来呀~</span>
-<span title="挑衅"><(*￣ー￣)ゞ来啊~</span>
-<span title="偷看">(/ω＼*)……… (/ω·＼*) </span>
-<span title="偷看">(/ω·＼*) </span>
-<span title="偷拍 ">Σ[ ◎ ]}ー′）</span>
-<span title="怒">凸艹皿艹</span>
-<span title="靠">凸゜皿゜メ</span>
-<span title="吐">( >ρ < ”)</span>
-<span title="推推~起床啦!">(o￣ω￣)○))ｏ(＿＿*)Ｚｚｚ</span>
-<span title="拖走">ヽ(゜▽゜　)－C<(/;◇;)/~</span>
-<span title="哇卡卡卡卡卡……">o((≧▽≦o) 太好笑了！！</span>
-<span title="哇咧！">Σ(⊙▽⊙"a...</span>
-<span title="挖鼻屎"> (*￣rǒ￣)</span>
-<span title="万岁！">*★,°*:.☆\(￣▽￣)/$:*.°★* 。</span>
-<span title="围观！">(← ← )</span>
-<span title="围观！">( → →) </span>
-<span title="畏罪自杀…">…〒_〒…‵ｏ′-一┳═┻︻▄</span>
-<span title="喂！">(#`O′)</span>
-<span title="喂饭">( *^-^)ρ(^0^* )</span>
-<span title="吻别">(*￣;(￣ *)</span>
-<span title="我？">σ(· ·?)</span>
-<span title="我不看……">(/▽＼)</span>
-<span title="我错了……">(。﹏。*)</span>
-<span title="我回来啦~">||ヽ(*￣▽￣*)ノミ|Ю</span>
-<span title="我来了~">(～￣▽￣)～</span>
-<span title="我忍!">o(-"-;) </span>
-<span title="我闪！">|(·_·) |·_·) |_·) |·) | )</span>
-<span title="握拳!">o(￣ヘ￣o* )</span>
-<span title="握拳！">o(￣ヘ￣o＃)</span>
-<span title="呜呜呜……">( >﹏<。)～</span>
-<span title="无敌！">↑↑↓↓←→←→ＢＡ...┗( -o-)┛</span>
-<span title="无敌弹簧拳！">( ‵Д′)=○))~~~~~~Ю))>o<)/ </span>
-<span title="无敌幻影脚！">ヽ(ヽ `д′)ヽ`д′)ヽ`д′)┌┛┌┛┌┛★)`з゜)y</span>
-<span title="无敌捏脸功！"><( ‵□′)───C＜─___-)|| </span>
-<span title="无敌肉包拳！">(o ￣3)==@))゜ロ゜((@==(′ε′ )o　</span>
-<span title="无敌肉包拳！">(o ￣3)==@))゜ロ゜((@==(′ε′ )o</span>
-<span title="无敌影分身！">((≧(≧▽(≧▽≦(≧▽≦)≧▽≦)▽≦)≦))) </span>
-<span title="无力扶墙..."> ( ＿ ＿)ノ｜壁</span>
-<span title="无奈">╮(╯-╰)╭ </span>
-<span title="无影脚！">＜( ￣︿￣)︵θ︵θ︵θ︵θ︵☆(＞口＜－)</span>
-<span title="无影脚！">＜( ￣︿￣)︵θ︵θ︵θ︵θ︵☆(＞口＜－)</span>
-<span title="享受">(╯▽╰ ) </span>
-<span title="消失">(*￣□￣)(￣□:;.…::;.:.:::;..::;.:...</span>
-<span title="小新"><(￣︶￣)↗</span>
-<span title="邪恶">( ‵▽′)ψ</span>
-<span title="谢啦!!">☆⌒(*＾-゜)v </span>
-<span title="心神不宁"...">(゜゜ )(。。)(゜゜ )(。。)</span>
-<span title="欣慰">( ╯▽╰)</span>
-<span title="要">不＞(￣ε￣ = ￣3￣)<</span>
-<span title="噎死">( *⊙~⊙) </span>
-<span title="噎住">( *⊙~⊙) </span>
-<span title="隐身！">(*￣□￣)(￣□:;.…::;.:.:::;..::;.:...</span>
-<span title="鹰钩鼻">(￣ム￣) </span>
-<span title="哟西！">（９￣＾￣）９</span>
-<span title="有了!">(o゜▽゜)o☆</span>
-<span title="有人吗?">||o(*°▽°*)o|Ю </span>
-<span title="御风_凌"></span>
-<span title="怨.念....">o(一︿一+)o</span>
-<span title="运动">╔囧╗╔囧╝╚囧╝╚囧╗</span>
-<span title="晕！">@o@"</span>
-<span title="糟糕！">X﹏X</span>
-<span title="早安呀~~~"> o(*￣▽￣*)ブ</span>
-<span title="早点回来哦~">(～￣(OO)￣)ブ</span>
-<span title="炸弹！">(╯‵□′)╯···*～●</span>
-<span title="斩!!">ˋ( ° ▽、° ) (o(￣▽￣///</span>
-<span title="涨">(￣︶￣)↗</span>
-<span title="这个……呃~~">-______-"</span>
-<span title="真哒?!"> o(〃'▽'〃)o</span>
-<span title="真空波动拳！">（ ｀o′）{ ···－＝≡))</span>
-<span title="真空波动拳！">（ ｀o′）{ ···－＝≡))</span>
-<span title="振奋">(o>ε(o>ｕ(≧∩≦) </span>
-<span title="振作!">━━(o_ _)o━━(o―_―)o━━(９￣ー￣)９</span>
-<span title="痣长毛">( ゜，_ゝ゜) </span>
-<span title="皱眉">(-"-)</span>
-<span title="抓狂">o((>ω< ))o</span>
-<span title="抓狂">o(>@<)o</span>
-<span title="足球">( · ·)L☆ ．．．..○ 冂 </span>
-<span title="醉拳">ヨロ (*~▽~)ノ ヨロ ヽ(~▽~*）ヨロ (*~▽~)―〇 ☆ バシ ))>口<)</span>
-<p style="display: block; float: left; margin-top: 25px; margin-bottom: -40px;">&copy; 2010 @ag108lau<br>Thanks @OnlyTiny<br />
-Last Update: 2010-03-12
-</p>
\ No newline at end of file
diff --git a/inc/trends.php b/inc/trends.php
index 8e767db..8a9b6cf 100644
--- a/inc/trends.php
+++ b/inc/trends.php
@@ -1,29 +1,29 @@
-<?php
-	include_once('../lib/twitese.php');
-	function getTrends($format = 'json'){
-		if($format !== 'json' && $format !== 'xml'){
-			return false;
-		}
-		$url = 'http://search.twitter.com/trends.'.$format;
-		$response = objectifyJson(processCurl($url));
-		return $response;
-	}
-
-	function outputTrends($format = 'json'){
-		$trends = getTrends($format);
-		if(!isset($trends->trends)){
-			return false;
-		}
-		$html = '';
-		foreach ($trends->trends as $trend) {
-			$li = '
-				<li>
-				<a href="search.php?q='.rawurlencode($trend->name).'">'.$trend->name.'</a>
-				</li>
-				';
-			$html .= $li;
-		}
-
-		return $html;
-	}
-?>
+<?php
+	include_once('../lib/twitese.php');
+	function getTrends($format = 'json'){
+		if($format !== 'json' && $format !== 'xml'){
+			return false;
+		}
+		$url = 'http://search.twitter.com/trends.'.$format;
+		$response = objectifyJson(processCurl($url));
+		return $response;
+	}
+
+	function outputTrends($format = 'json'){
+		$trends = getTrends($format);
+		if(!isset($trends->trends)){
+			return false;
+		}
+		$html = '';
+		foreach ($trends->trends as $trend) {
+			$li = '
+				<li>
+				<a href="search.php?q='.rawurlencode($trend->name).'">'.$trend->name.'</a>
+				</li>
+				';
+			$html .= $li;
+		}
+
+		return $html;
+	}
+?>
diff --git a/inc/userlist.php b/inc/userlist.php
index 34b9af8..c75edb6 100644
--- a/inc/userlist.php
+++ b/inc/userlist.php
@@ -93,24 +93,23 @@
 	}
 
 	echo '<div class="clear"></div>';
-	$p = -1;
 	switch ($type) {
 		case 'blocks':
 			$userlist = $t->blockingList($id, $p);
-			$next_page = $userlist->next_cursor;
-			$previous_page = $userlist->previous_cursor;
+			$next_page = $userlist->next_cursor_str;
+			$previous_page = $userlist->previous_cursor_str;
 			$userlist = $userlist->users;
 			break;
 		case 'friends':
 			$userlist = $t->friends($id, $p);
-			$next_page = $userlist->next_cursor;
-			$previous_page = $userlist->previous_cursor;
+			$next_page = $userlist->next_cursor_str;
+			$previous_page = $userlist->previous_cursor_str;
 			$userlist = $userlist->users;
 			break;
 		case 'followers':
 			$userlist = $t->followers($id, $p);
-			$next_page = $userlist->next_cursor;
-			$previous_page = $userlist->previous_cursor;
+			$next_page = $userlist->next_cursor_str;
+			$previous_page = $userlist->previous_cursor_str;
 			$userlist = $userlist->users;
 			break;
 		case 'list_members':
@@ -129,7 +128,7 @@
 			$userlist = $t->followers($id, $p);
 			break;
 	}
-	$empty = count($userlist) == 0? true: false;
+	$empty = count($userlist) == 0 ? true : false;
 	if ($empty) {
 		echo "<div id=\"empty\">No user to display.</div>";
 	} else {
@@ -154,18 +153,18 @@
 		}
 		$output .= "</ol><div id=\"pagination\">";
 		if ($type == 'list_members' || $type == 'list_followers' || $type == 'blocks') {
-			if ($prelist != 0) $output .= "<a id=\"more\" class=\"round more\" style=\"float: left;\" href=\"list_members.php?id=$id&c=$prelist\">Back</a>";
+			if ($prelist != 0) $output .= "<a id=\"less\" class=\"round more\" style=\"float: left;\" href=\"list_members.php?id=$id&c=$prelist\">Back</a>";
 			if ($nextlist != 0) $output .= "<a id=\"more\" class=\"round more\" style=\"float: right;\" href=\"list_members.php?id=$id&c=$nextlist\">Next</a>";
 		} else {
 			if ($id) {
-				if ($p >0)
-					$output .= "<a id=\"more\" class=\"round more\" style=\"float: left;\" href=\"$type.php?id=$id&p=" . $previous_page . "\">Back</a>";
-				if ($next_page != 0)
+				if ($previous_page !== "0")
+					$output .= "<a id=\"less\" class=\"round more\" style=\"float: left;\" href=\"$type.php?id=$id&p=" . $previous_page . "\">Back</a>";
+				if ($next_page !== "0")
 					$output .= "<a id=\"more\" class=\"round more\" style=\"float: right;\" href=\"$type.php?id=$id&p=" . $next_page . "\">Next</a>";
 			} else {
-				if ($p >0)
-					$output .= "<a id=\"more\" class=\"round more\" style=\"float: left;\" href=\"$type.php?p=" . $previous_page . "\">Back</a>";
-				if ($next_page != 0)
+				if ($previous_page !== "0")
+					$output .= "<a id=\"less\" class=\"round more\" style=\"float: left;\" href=\"$type.php?p=" . $previous_page . "\">Back</a>";
+				if ($next_page !== "0")
 					$output .= "<a id=\"more\" class=\"round more\" style=\"float: right;\" href=\"$type.php?p=" . $next_page . "\">Next</a>";
 			}
 		}
diff --git a/index.php b/index.php
index ed9dc2c..1b5efad 100644
--- a/index.php
+++ b/index.php
@@ -31,31 +31,31 @@
 <?php
   include('inc/sentForm.php'); 
   
-	$p = 1;
-	if (isset($_GET['p']))
-	{
-		$p = (int) $_GET['p'];
-		if ($p <= 0) $p = 1;
-	}
+	$since_id = isset($_GET['since_id']) ? $_GET['since_id'] : false;
+	$max_id = isset($_GET['max_id']) ? $_GET['max_id'] : false;
 
-	$statuses = $t->homeTimeline($p);
+	$statuses = $t->homeTimeline($since_id, $max_id);
 	if ($statuses == false)
 	{
 		header('location: error.php');exit();
 	}
 	$count = count($statuses);
-	$empty = $count == 0 ? true: false;
+	$empty = $count == 0 ? true : false;
 	if ($empty)
 	{
 		echo "<div id=\"empty\">No tweet to display.</div>";
-	}
-	else
-	{
+	} else if ($t->http_code == 429) {
+		echo "<div id=\"empty\">API quota is used out, please wait for a moment before next refresh.</div>";
+	} else {
 		$output = '<ol class="timeline" id="allTimeline">';
 
 		include('lib/timeline_format.php');
 		$maxid = isset($_COOKIE['maxid']) ? $_COOKIE['maxid'] : '';
+		$firstid = false;
+		$lastid = false;
 		foreach ($statuses as $status) {
+			if (!$firstid) $firstid = $status->id_str;
+			$lastid = $status->id_str;
 			if($maxid == '' || $p == 1 || strcmp($status->id_str,$maxid) < 0) {
 				if (isset($status->retweeted_status)) {
 					$output .= format_retweet($status);
@@ -64,18 +64,19 @@
 				}
 			}
 		}
+		$lastid = bcsub($lastid, "1");
 
 		$output .= "</ol><div id=\"pagination\">";
 		$time = $_SERVER['REQUEST_TIME']+3600;
 		setcookie('maxid',$statuses[$count-1]->id_str,$time,'/');
 
-		if ($p >1) $output .= "<a id=\"more\" class=\"round more\" style=\"float: left;\" href=\"index.php?p=" . ($p-1) . "\">Back</a>";
-		if (!$empty) $output .= "<a id=\"more\" class=\"round more\" style=\"float: right;\" href=\"index.php?p=" . ($p+1) . "\">Next</a>";
+		$output .= "<a id=\"less\" class=\"round more\" style=\"float: left;\" href=\"index.php?since_id=" . $firstid . "\">Back</a>";
+		$output .= "<a id=\"more\" class=\"round more\" style=\"float: right;\" href=\"index.php?max_id=" . $lastid . "\">Next</a>";
+		$output .= "</div>";
 		echo $output;
 	}
 ?>
 </div>
-</div>
 <?php 
 	include ('inc/sidebar.php');
 	include ('inc/footer.php');
diff --git a/js/ajaxfileupload.js b/js/ajaxfileupload.js
deleted file mode 100644
index 94b7f0f..0000000
--- a/js/ajaxfileupload.js
+++ /dev/null
@@ -1,152 +0,0 @@
-jQuery.extend({
-	createUploadIframe: function (id, uri) {
-		//create frame
-		var frameId = 'jUploadFrame' + id;
-		if (window.ActiveXObject) {
-			var io = document.createElement('<iframe id="' + frameId + '" name="' + frameId + '" />');
-			if (typeof uri == 'boolean') {
-				io.src = 'javascript:false';
-			}
-			else if (typeof uri == 'string') {
-				io.src = uri;
-			}
-		}
-		else {
-			var io = document.createElement('iframe');
-			io.id = frameId;
-			io.name = frameId;
-		}
-		io.style.position = 'absolute';
-		io.style.top = '-1000px';
-		io.style.left = '-1000px';
-		document.body.appendChild(io);
-		return io
-	},
-	createUploadForm: function (id, fileElementId) {
-		//create form	
-		var formId = 'jUploadForm' + id;
-		var fileId = 'jUploadFile' + id;
-		var form = $('<form  action="" method="POST" name="' + formId + '" id="' + formId + '" enctype="multipart/form-data"></form>');
-		var oldElement = $('#' + fileElementId);
-		var newElement = $(oldElement).clone();
-		$(oldElement).attr('id', fileId);
-		$(oldElement).before(newElement);
-		$(oldElement).appendTo(form);
-		//set attributes
-		$(form).css('position', 'absolute');
-		$(form).css('top', '-1200px');
-		$(form).css('left', '-1200px');
-		$(form).appendTo('body');
-		return form;
-	},
-	ajaxFileUpload: function (s) {
-		// TODO introduce global settings, allowing the client to modify them for all requests, not only timeout		
-		s = jQuery.extend({}, jQuery.ajaxSettings, s);
-		var id = new Date().getTime()
-		var form = jQuery.createUploadForm(id, s.fileElementId);
-		var io = jQuery.createUploadIframe(id, s.secureuri);
-		var frameId = 'jUploadFrame' + id;
-		var formId = 'jUploadForm' + id;
-		// Watch for a new set of requests
-		if (s.global && !jQuery.active++) {
-			jQuery.event.trigger("ajaxStart");
-		}
-		var requestDone = false;
-		// Create the request object
-		var xml = {}
-		if (s.global) jQuery.event.trigger("ajaxSend", [xml, s]);
-		// Wait for a response to come back
-		var uploadCallback = function (isTimeout) {
-			var io = document.getElementById(frameId);
-			try {
-				if (io.contentWindow) {
-					xml.responseText = io.contentWindow.document.body ? io.contentWindow.document.body.innerHTML : null;
-					xml.responseXML = io.contentWindow.document.XMLDocument ? io.contentWindow.document.XMLDocument : io.contentWindow.document;
-				} else if (io.contentDocument) {
-					xml.responseText = io.contentDocument.document.body ? io.contentDocument.document.body.innerHTML : null;
-					xml.responseXML = io.contentDocument.document.XMLDocument ? io.contentDocument.document.XMLDocument : io.contentDocument.document;
-				}
-			} catch (e) {
-				jQuery.handleError(s, xml, null, e);
-			}
-			if (xml || isTimeout == "timeout") {
-				requestDone = true;
-				var status;
-				try {
-					status = isTimeout != "timeout" ? "success" : "error";
-					// Make sure that the request was successful or notmodified
-					if (status != "error") {
-						// process the data (runs the xml through httpData regardless of callback)
-						var data = jQuery.uploadHttpData(xml, s.dataType);
-						// If a local callback was specified, fire it and pass it the data
-						if (s.success) s.success(data, status);
-						// Fire the global callback
-						if (s.global) jQuery.event.trigger("ajaxSuccess", [xml, s]);
-					} else jQuery.handleError(s, xml, status);
-				} catch (e) {
-					status = "error";
-					jQuery.handleError(s, xml, status, e);
-				}
-				// The request was completed
-				if (s.global) jQuery.event.trigger("ajaxComplete", [xml, s]);
-				// Handle the global AJAX counter
-				if (s.global && !--jQuery.active) jQuery.event.trigger("ajaxStop");
-				// Process result
-				if (s.complete) s.complete(xml, status);
-				jQuery(io).unbind()
-				setTimeout(function () {
-					try {
-						$(io).remove();
-						$(form).remove();
-					} catch (e) {
-						jQuery.handleError(s, xml, null, e);
-					}
-				}, 100)
-				xml = null
-			}
-		}
-		// Timeout checker
-		if (s.timeout > 0) {
-			setTimeout(function () {
-				// Check to see if the request is still happening
-				if (!requestDone) uploadCallback("timeout");
-			}, s.timeout);
-		}
-		try {
-			// var io = $('#' + frameId);
-			var form = $('#' + formId);
-			$(form).attr('action', s.url);
-			$(form).attr('method', 'POST');
-			$(form).attr('target', frameId);
-			if (form.encoding) {
-				form.encoding = 'multipart/form-data';
-			}
-			else {
-				form.enctype = 'multipart/form-data';
-			}
-			$(form).submit();
-		} catch (e) {
-			jQuery.handleError(s, xml, null, e);
-		}
-		if (window.attachEvent) {
-			document.getElementById(frameId).attachEvent('onload', uploadCallback);
-		}
-		else {
-			document.getElementById(frameId).addEventListener('load', uploadCallback, false);
-		}
-		return {
-			abort: function () {}
-		};
-	},
-	uploadHttpData: function (r, type) {
-		var data = !type;
-		data = type == "xml" || data ? r.responseXML : r.responseText;
-		// If the type is "script", eval it in global context
-		if (type == "script") jQuery.globalEval(data);
-		// Get the JavaScript object, if JSON is used.
-		if (type == "json") eval("data = " + data);
-		// evaluate scripts within html
-		if (type == "html") jQuery("<div>").html(data).evalScripts();
-		return data;
-	}
-})
\ No newline at end of file
diff --git a/js/btns.js b/js/btns.js
index 663fdc7..004d12b 100644
--- a/js/btns.js
+++ b/js/btns.js
@@ -1,50 +1,50 @@
-$(function(){
-		formFunc();
-		$("ol.timeline").live("click", function(e) {
-			var $this = $(e.target);
-			var type = $this.attr('class');
-			switch(type) {
-				case 'rt_btn':
-					e.preventDefault();
-					onRT($this);
-					break;
-				case 'retw_btn':
-					e.preventDefault();
-					onNwRT($this);
-					break;
-				case 'replie_btn':
-					e.preventDefault();
-					onReplie($this,e);
-					break;
-				case 'favor_btn':
-					e.preventDefault();
-					onFavor($this);
-					break;
-				case 'unfav_btn':
-					e.preventDefault();
-					UnFavor($this);
-					break;
-				case 'delete_btn':
-					e.preventDefault();
-					onDelete($this);
-					break;
-				case 'rt_undo':
-				case 'unrt_btn':
-					e.preventDefault();
-					onUndoRt($this);
-					break;
-				case 'msg_replie_btn':
-					e.preventDefault();
-					onReplieDM($this);
-					break;
-				case 'msg_delete_btn':
-					e.preventDefault();
-					onDeleteMsg($this);
-					break;
-			}
-		});
-		$("#submit_btn").click(function(e){
-				updateStatus();
-				e.preventDefault();
-			});
-	});
+$(function(){
+		formFunc();
+		$("ol.timeline").live("click", function(e) {
+			var $this = $(e.target);
+			var type = $this.attr('class');
+			switch(type) {
+				case 'rt_btn':
+					e.preventDefault();
+					onRT($this);
+					break;
+				case 'retw_btn':
+					e.preventDefault();
+					onNwRT($this);
+					break;
+				case 'replie_btn':
+					e.preventDefault();
+					onReplie($this,e);
+					break;
+				case 'favor_btn':
+					e.preventDefault();
+					onFavor($this);
+					break;
+				case 'unfav_btn':
+					e.preventDefault();
+					UnFavor($this);
+					break;
+				case 'delete_btn':
+					e.preventDefault();
+					onDelete($this);
+					break;
+				case 'rt_undo':
+				case 'unrt_btn':
+					e.preventDefault();
+					onUndoRt($this);
+					break;
+				case 'msg_replie_btn':
+					e.preventDefault();
+					onReplieDM($this);
+					break;
+				case 'msg_delete_btn':
+					e.preventDefault();
+					onDeleteMsg($this);
+					break;
+			}
+		});
+		$("#submit_btn").click(function(e){
+				updateStatus();
+				e.preventDefault();
+			});
+	});
diff --git a/js/colorpicker3.js b/js/colorpicker3.js
deleted file mode 100644
index 99b48ec..0000000
--- a/js/colorpicker3.js
+++ /dev/null
@@ -1,484 +0,0 @@
-/**
- *
- * Color picker
- * Author: Stefan Petre www.eyecon.ro
- * 
- * Dual licensed under the MIT and GPL licenses
- * 
- */
-(function ($) {
-	var ColorPicker = function () {
-		var
-			ids = {},
-			inAction,
-			charMin = 65,
-			visible,
-			tpl = '<div class="colorpicker"><div class="colorpicker_color"><div><div></div></div></div><div class="colorpicker_hue"><div></div></div><div class="colorpicker_new_color"></div><div class="colorpicker_current_color"></div><div class="colorpicker_hex"><input type="text" maxlength="6" size="6" /></div><div class="colorpicker_rgb_r colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_rgb_g colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_rgb_b colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_hsb_h colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_hsb_s colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_hsb_b colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_submit"><button type="button" name="submit">Done</button></div></div>',
-			defaults = {
-				eventName: 'click',
-				onShow: function () {},
-				onBeforeShow: function(){},
-				onHide: function () {},
-				onChange: function () {},
-				onSubmit: function () {},
-				color: 'ff0000',
-				livePreview: true,
-				flat: false
-			},
-			fillRGBFields = function  (hsb, cal) {
-				var rgb = HSBToRGB(hsb);
-				$(cal).data('colorpicker').fields
-					.eq(1).val(rgb.r).end()
-					.eq(2).val(rgb.g).end()
-					.eq(3).val(rgb.b).end();
-			},
-			fillHSBFields = function  (hsb, cal) {
-				$(cal).data('colorpicker').fields
-					.eq(4).val(hsb.h).end()
-					.eq(5).val(hsb.s).end()
-					.eq(6).val(hsb.b).end();
-			},
-			fillHexFields = function (hsb, cal) {
-				$(cal).data('colorpicker').fields
-					.eq(0).val(HSBToHex(hsb)).end();
-			},
-			setSelector = function (hsb, cal) {
-				$(cal).data('colorpicker').selector.css('backgroundColor', '#' + HSBToHex({h: hsb.h, s: 100, b: 100}));
-				$(cal).data('colorpicker').selectorIndic.css({
-					left: parseInt(150 * hsb.s/100, 10),
-					top: parseInt(150 * (100-hsb.b)/100, 10)
-				});
-			},
-			setHue = function (hsb, cal) {
-				$(cal).data('colorpicker').hue.css('top', parseInt(150 - 150 * hsb.h/360, 10));
-			},
-			setCurrentColor = function (hsb, cal) {
-				$(cal).data('colorpicker').currentColor.css('backgroundColor', '#' + HSBToHex(hsb));
-			},
-			setNewColor = function (hsb, cal) {
-				$(cal).data('colorpicker').newColor.css('backgroundColor', '#' + HSBToHex(hsb));
-			},
-			keyDown = function (ev) {
-				var pressedKey = ev.charCode || ev.keyCode || -1;
-				if ((pressedKey > charMin && pressedKey <= 90) || pressedKey == 32) {
-					return false;
-				}
-				var cal = $(this).parent().parent();
-				if (cal.data('colorpicker').livePreview === true) {
-					change.apply(this);
-				}
-			},
-			change = function (ev) {
-				var cal = $(this).parent().parent(), col;
-				if (this.parentNode.className.indexOf('_hex') > 0) {
-					cal.data('colorpicker').color = col = HexToHSB(fixHex(this.value));
-				} else if (this.parentNode.className.indexOf('_hsb') > 0) {
-					cal.data('colorpicker').color = col = fixHSB({
-						h: parseInt(cal.data('colorpicker').fields.eq(4).val(), 10),
-						s: parseInt(cal.data('colorpicker').fields.eq(5).val(), 10),
-						b: parseInt(cal.data('colorpicker').fields.eq(6).val(), 10)
-					});
-				} else {
-					cal.data('colorpicker').color = col = RGBToHSB(fixRGB({
-						r: parseInt(cal.data('colorpicker').fields.eq(1).val(), 10),
-						g: parseInt(cal.data('colorpicker').fields.eq(2).val(), 10),
-						b: parseInt(cal.data('colorpicker').fields.eq(3).val(), 10)
-					}));
-				}
-				if (ev) {
-					fillRGBFields(col, cal.get(0));
-					fillHexFields(col, cal.get(0));
-					fillHSBFields(col, cal.get(0));
-				}
-				setSelector(col, cal.get(0));
-				setHue(col, cal.get(0));
-				setNewColor(col, cal.get(0));
-				cal.data('colorpicker').onChange.apply(cal, [col, HSBToHex(col), HSBToRGB(col)]);
-			},
-			blur = function (ev) {
-				var cal = $(this).parent().parent();
-				cal.data('colorpicker').fields.parent().removeClass('colorpicker_focus');
-			},
-			focus = function () {
-				charMin = this.parentNode.className.indexOf('_hex') > 0 ? 70 : 65;
-				$(this).parent().parent().data('colorpicker').fields.parent().removeClass('colorpicker_focus');
-				$(this).parent().addClass('colorpicker_focus');
-			},
-			downIncrement = function (ev) {
-				var field = $(this).parent().find('input').focus();
-				var current = {
-					el: $(this).parent().addClass('colorpicker_slider'),
-					max: this.parentNode.className.indexOf('_hsb_h') > 0 ? 360 : (this.parentNode.className.indexOf('_hsb') > 0 ? 100 : 255),
-					y: ev.pageY,
-					field: field,
-					val: parseInt(field.val(), 10),
-					preview: $(this).parent().parent().data('colorpicker').livePreview					
-				};
-				$(document).bind('mouseup', current, upIncrement);
-				$(document).bind('mousemove', current, moveIncrement);
-			},
-			moveIncrement = function (ev) {
-				ev.data.field.val(Math.max(0, Math.min(ev.data.max, parseInt(ev.data.val + ev.pageY - ev.data.y, 10))));
-				if (ev.data.preview) {
-					change.apply(ev.data.field.get(0), [true]);
-				}
-				return false;
-			},
-			upIncrement = function (ev) {
-				change.apply(ev.data.field.get(0), [true]);
-				ev.data.el.removeClass('colorpicker_slider').find('input').focus();
-				$(document).unbind('mouseup', upIncrement);
-				$(document).unbind('mousemove', moveIncrement);
-				return false;
-			},
-			downHue = function (ev) {
-				var current = {
-					cal: $(this).parent(),
-					y: $(this).offset().top
-				};
-				current.preview = current.cal.data('colorpicker').livePreview;
-				$(document).bind('mouseup', current, upHue);
-				$(document).bind('mousemove', current, moveHue);
-			},
-			moveHue = function (ev) {
-				change.apply(
-					ev.data.cal.data('colorpicker')
-						.fields
-						.eq(4)
-						.val(parseInt(360*(150 - Math.max(0,Math.min(150,(ev.pageY - ev.data.y))))/150, 10))
-						.get(0),
-					[ev.data.preview]
-				);
-				return false;
-			},
-			upHue = function (ev) {
-				fillRGBFields(ev.data.cal.data('colorpicker').color, ev.data.cal.get(0));
-				fillHexFields(ev.data.cal.data('colorpicker').color, ev.data.cal.get(0));
-				$(document).unbind('mouseup', upHue);
-				$(document).unbind('mousemove', moveHue);
-				return false;
-			},
-			downSelector = function (ev) {
-				var current = {
-					cal: $(this).parent(),
-					pos: $(this).offset()
-				};
-				current.preview = current.cal.data('colorpicker').livePreview;
-				$(document).bind('mouseup', current, upSelector);
-				$(document).bind('mousemove', current, moveSelector);
-			},
-			moveSelector = function (ev) {
-				change.apply(
-					ev.data.cal.data('colorpicker')
-						.fields
-						.eq(6)
-						.val(parseInt(100*(150 - Math.max(0,Math.min(150,(ev.pageY - ev.data.pos.top))))/150, 10))
-						.end()
-						.eq(5)
-						.val(parseInt(100*(Math.max(0,Math.min(150,(ev.pageX - ev.data.pos.left))))/150, 10))
-						.get(0),
-					[ev.data.preview]
-				);
-				return false;
-			},
-			upSelector = function (ev) {
-				fillRGBFields(ev.data.cal.data('colorpicker').color, ev.data.cal.get(0));
-				fillHexFields(ev.data.cal.data('colorpicker').color, ev.data.cal.get(0));
-				$(document).unbind('mouseup', upSelector);
-				$(document).unbind('mousemove', moveSelector);
-				return false;
-			},
-			enterSubmit = function (ev) {
-				$(this).addClass('colorpicker_focus');
-			},
-			leaveSubmit = function (ev) {
-				$(this).removeClass('colorpicker_focus');
-			},
-			clickSubmit = function (ev) {
-				var cal = $(this).parent();
-				var col = cal.data('colorpicker').color;
-				cal.data('colorpicker').origColor = col;
-				setCurrentColor(col, cal.get(0));
-				cal.data('colorpicker').onSubmit(col, HSBToHex(col), HSBToRGB(col), cal.data('colorpicker').el);
-			},
-			show = function (ev) {
-				var cal = $('#' + $(this).data('colorpickerId'));
-				cal.data('colorpicker').onBeforeShow.apply(this, [cal.get(0)]);
-				var pos = $(this).offset();
-				var viewPort = getViewport();
-				var top = pos.top + this.offsetHeight;
-				var left = pos.left;
-				if (top + 176 > viewPort.t + viewPort.h) {
-					top -= this.offsetHeight + 176;
-				}
-				if (left + 356 > viewPort.l + viewPort.w) {
-					left -= 356;
-				}
-				cal.css({left: left + 'px', top: top + 'px'});
-				if (cal.data('colorpicker').onShow.apply(this, [cal.get(0)]) != false) {
-					cal.show();
-				}
-				$(document).bind('mousedown', {cal: cal}, hide);
-				return false;
-			},
-			hide = function (ev) {
-				if (!isChildOf(ev.data.cal.get(0), ev.target, ev.data.cal.get(0))) {
-					if (ev.data.cal.data('colorpicker').onHide.apply(this, [ev.data.cal.get(0)]) != false) {
-						ev.data.cal.hide();
-					}
-					$(document).unbind('mousedown', hide);
-				}
-			},
-			isChildOf = function(parentEl, el, container) {
-				if (parentEl == el) {
-					return true;
-				}
-				if (parentEl.contains) {
-					return parentEl.contains(el);
-				}
-				if ( parentEl.compareDocumentPosition ) {
-					return !!(parentEl.compareDocumentPosition(el) & 16);
-				}
-				var prEl = el.parentNode;
-				while(prEl && prEl != container) {
-					if (prEl == parentEl)
-						return true;
-					prEl = prEl.parentNode;
-				}
-				return false;
-			},
-			getViewport = function () {
-				var m = document.compatMode == 'CSS1Compat';
-				return {
-					l : window.pageXOffset || (m ? document.documentElement.scrollLeft : document.body.scrollLeft),
-					t : window.pageYOffset || (m ? document.documentElement.scrollTop : document.body.scrollTop),
-					w : window.innerWidth || (m ? document.documentElement.clientWidth : document.body.clientWidth),
-					h : window.innerHeight || (m ? document.documentElement.clientHeight : document.body.clientHeight)
-				};
-			},
-			fixHSB = function (hsb) {
-				return {
-					h: Math.min(360, Math.max(0, hsb.h)),
-					s: Math.min(100, Math.max(0, hsb.s)),
-					b: Math.min(100, Math.max(0, hsb.b))
-				};
-			}, 
-			fixRGB = function (rgb) {
-				return {
-					r: Math.min(255, Math.max(0, rgb.r)),
-					g: Math.min(255, Math.max(0, rgb.g)),
-					b: Math.min(255, Math.max(0, rgb.b))
-				};
-			},
-			fixHex = function (hex) {
-				var len = 6 - hex.length;
-				if (len > 0) {
-					var o = [];
-					for (var i=0; i<len; i++) {
-						o.push('0');
-					}
-					o.push(hex);
-					hex = o.join('');
-				}
-				return hex;
-			}, 
-			HexToRGB = function (hex) {
-				var hex = parseInt(((hex.indexOf('#') > -1) ? hex.substring(1) : hex), 16);
-				return {r: hex >> 16, g: (hex & 0x00FF00) >> 8, b: (hex & 0x0000FF)};
-			},
-			HexToHSB = function (hex) {
-				return RGBToHSB(HexToRGB(hex));
-			},
-			RGBToHSB = function (rgb) {
-				var hsb = {
-					h: 0,
-					s: 0,
-					b: 0
-				};
-				var min = Math.min(rgb.r, rgb.g, rgb.b);
-				var max = Math.max(rgb.r, rgb.g, rgb.b);
-				var delta = max - min;
-				hsb.b = max;
-				if (max != 0) {
-					
-				}
-				hsb.s = max != 0 ? 255 * delta / max : 0;
-				if (hsb.s != 0) {
-					if (rgb.r == max) {
-						hsb.h = (rgb.g - rgb.b) / delta;
-					} else if (rgb.g == max) {
-						hsb.h = 2 + (rgb.b - rgb.r) / delta;
-					} else {
-						hsb.h = 4 + (rgb.r - rgb.g) / delta;
-					}
-				} else {
-					hsb.h = -1;
-				}
-				hsb.h *= 60;
-				if (hsb.h < 0) {
-					hsb.h += 360;
-				}
-				hsb.s *= 100/255;
-				hsb.b *= 100/255;
-				return hsb;
-			},
-			HSBToRGB = function (hsb) {
-				var rgb = {};
-				var h = Math.round(hsb.h);
-				var s = Math.round(hsb.s*255/100);
-				var v = Math.round(hsb.b*255/100);
-				if(s == 0) {
-					rgb.r = rgb.g = rgb.b = v;
-				} else {
-					var t1 = v;
-					var t2 = (255-s)*v/255;
-					var t3 = (t1-t2)*(h%60)/60;
-					if(h==360) h = 0;
-					if(h<60) {rgb.r=t1;	rgb.b=t2; rgb.g=t2+t3}
-					else if(h<120) {rgb.g=t1; rgb.b=t2;	rgb.r=t1-t3}
-					else if(h<180) {rgb.g=t1; rgb.r=t2;	rgb.b=t2+t3}
-					else if(h<240) {rgb.b=t1; rgb.r=t2;	rgb.g=t1-t3}
-					else if(h<300) {rgb.b=t1; rgb.g=t2;	rgb.r=t2+t3}
-					else if(h<360) {rgb.r=t1; rgb.g=t2;	rgb.b=t1-t3}
-					else {rgb.r=0; rgb.g=0;	rgb.b=0}
-				}
-				return {r:Math.round(rgb.r), g:Math.round(rgb.g), b:Math.round(rgb.b)};
-			},
-			RGBToHex = function (rgb) {
-				var hex = [
-					rgb.r.toString(16),
-					rgb.g.toString(16),
-					rgb.b.toString(16)
-				];
-				$.each(hex, function (nr, val) {
-					if (val.length == 1) {
-						hex[nr] = '0' + val;
-					}
-				});
-				return hex.join('');
-			},
-			HSBToHex = function (hsb) {
-				return RGBToHex(HSBToRGB(hsb));
-			},
-			restoreOriginal = function () {
-				var cal = $(this).parent();
-				var col = cal.data('colorpicker').origColor;
-				cal.data('colorpicker').color = col;
-				fillRGBFields(col, cal.get(0));
-				fillHexFields(col, cal.get(0));
-				fillHSBFields(col, cal.get(0));
-				setSelector(col, cal.get(0));
-				setHue(col, cal.get(0));
-				setNewColor(col, cal.get(0));
-			};
-		return {
-			init: function (opt) {
-				opt = $.extend({}, defaults, opt||{});
-				if (typeof opt.color == 'string') {
-					opt.color = HexToHSB(opt.color);
-				} else if (opt.color.r != undefined && opt.color.g != undefined && opt.color.b != undefined) {
-					opt.color = RGBToHSB(opt.color);
-				} else if (opt.color.h != undefined && opt.color.s != undefined && opt.color.b != undefined) {
-					opt.color = fixHSB(opt.color);
-				} else {
-					return this;
-				}
-				return this.each(function () {
-					if (!$(this).data('colorpickerId')) {
-						var options = $.extend({}, opt);
-						options.origColor = opt.color;
-						var id = 'collorpicker_' + parseInt(Math.random() * 1000);
-						$(this).data('colorpickerId', id);
-						var cal = $(tpl).attr('id', id);
-						if (options.flat) {
-							cal.appendTo(this).show();
-						} else {
-							cal.appendTo(document.body);
-						}
-						options.fields = cal
-											.find('input')
-												.bind('keyup', keyDown)
-												.bind('change', change)
-												.bind('blur', blur)
-												.bind('focus', focus);
-						cal
-							.find('span').bind('mousedown', downIncrement).end()
-							.find('>div.colorpicker_current_color').bind('click', restoreOriginal);
-						options.selector = cal.find('div.colorpicker_color').bind('mousedown', downSelector);
-						options.selectorIndic = options.selector.find('div div');
-						options.el = this;
-						options.hue = cal.find('div.colorpicker_hue div');
-						cal.find('div.colorpicker_hue').bind('mousedown', downHue);
-						options.newColor = cal.find('div.colorpicker_new_color');
-						options.currentColor = cal.find('div.colorpicker_current_color');
-						cal.data('colorpicker', options);
-						cal.find('div.colorpicker_submit')
-							.bind('mouseenter', enterSubmit)
-							.bind('mouseleave', leaveSubmit)
-							.bind('click', clickSubmit);
-						fillRGBFields(options.color, cal.get(0));
-						fillHSBFields(options.color, cal.get(0));
-						fillHexFields(options.color, cal.get(0));
-						setHue(options.color, cal.get(0));
-						setSelector(options.color, cal.get(0));
-						setCurrentColor(options.color, cal.get(0));
-						setNewColor(options.color, cal.get(0));
-						if (options.flat) {
-							cal.css({
-								position: 'relative',
-								display: 'block'
-							});
-						} else {
-							$(this).bind(options.eventName, show);
-						}
-					}
-				});
-			},
-			showPicker: function() {
-				return this.each( function () {
-					if ($(this).data('colorpickerId')) {
-						show.apply(this);
-					}
-				});
-			},
-			hidePicker: function() {
-				return this.each( function () {
-					if ($(this).data('colorpickerId')) {
-						$('#' + $(this).data('colorpickerId')).hide();
-					}
-				});
-			},
-			setColor: function(col) {
-				if (typeof col == 'string') {
-					col = HexToHSB(col);
-				} else if (col.r != undefined && col.g != undefined && col.b != undefined) {
-					col = RGBToHSB(col);
-				} else if (col.h != undefined && col.s != undefined && col.b != undefined) {
-					col = fixHSB(col);
-				} else {
-					return this;
-				}
-				return this.each(function(){
-					if ($(this).data('colorpickerId')) {
-						var cal = $('#' + $(this).data('colorpickerId'));
-						cal.data('colorpicker').color = col;
-						cal.data('colorpicker').origColor = col;
-						fillRGBFields(col, cal.get(0));
-						fillHSBFields(col, cal.get(0));
-						fillHexFields(col, cal.get(0));
-						setHue(col, cal.get(0));
-						setSelector(col, cal.get(0));
-						setCurrentColor(col, cal.get(0));
-						setNewColor(col, cal.get(0));
-					}
-				});
-			}
-		};
-	}();
-	$.fn.extend({
-		ColorPicker: ColorPicker.init,
-		ColorPickerHide: ColorPicker.hidePicker,
-		ColorPickerShow: ColorPicker.showPicker,
-		ColorPickerSetColor: ColorPicker.setColor
-	});
-})(jQuery)
\ No newline at end of file
diff --git a/js/favor.js b/js/favor.js
deleted file mode 100644
index e8930ba..0000000
--- a/js/favor.js
+++ /dev/null
@@ -1,19 +0,0 @@
-$(function(){
-	formFunc();
-	$(".rt_btn").live("click", function(e){
-		e.preventDefault();
-		onRT($(this));
-	});
-	$(".replie_btn").live("click", function(e){
-		e.preventDefault();
-		onReplie($(this));
-	});
-	$(".delete_btn").click(function(e){
-		e.preventDefault();
-		onDelete($(this), "收藏");
-	});
-	$(".retw_btn").live("click", function(e){
-		e.preventDefault();
-		onNwRT($(this));
-	});	
-});
diff --git a/js/formfunc.js b/js/formfunc.js
index 501e549..ac1e6ef 100644
--- a/js/formfunc.js
+++ b/js/formfunc.js
@@ -114,6 +114,7 @@ $(function (){
 						updateSentTip("Your image has been uploaded!", 3e3, "success");
 						$("#photoArea").slideToggle(100);
 					}else{
+						console.log(data);
 						updateSentTip("Failed to upload, please try again.", 3e3, "failure");
 						$("#photoArea").slideToggle(100);
 					}
@@ -121,6 +122,7 @@ $(function (){
 				error: function (data, status, e){
 					updateSentTip("Failed to upload, please try again.", 3e3, "failure");
 					$("#photoArea").slideToggle(100);
+					console.log(data);
 				}
 			})
 		return false;
diff --git a/js/jquery.js b/js/jquery.js
index bb67c85..2f8f845 100644
--- a/js/jquery.js
+++ b/js/jquery.js
@@ -29,11 +29,718 @@ jQuery.cookie=function(name,value,options){if(typeof value!='undefined'){options
 //Lazy Load
 (function(a){a.fn.lazyload=function(b){var c={threshold:0,failurelimit:0,event:"scroll",effect:"show",container:window};if(b){a.extend(c,b)}var d=this;if("scroll"==c.event){a(c.container).bind("scroll",function(b){var e=0;d.each(function(){if(a.abovethetop(this,c)||a.leftofbegin(this,c)){}else if(!a.belowthefold(this,c)&&!a.rightoffold(this,c)){a(this).trigger("appear")}else{if(e++>c.failurelimit){return false}}});var f=a.grep(d,function(a){return!a.loaded});d=a(f)})}this.each(function(){var b=this;if(undefined==a(b).attr("original")){a(b).attr("original",a(b).attr("src"))}if("scroll"!=c.event||undefined==a(b).attr("src")||c.placeholder==a(b).attr("src")||a.abovethetop(b,c)||a.leftofbegin(b,c)||a.belowthefold(b,c)||a.rightoffold(b,c)){if(c.placeholder){a(b).attr("src",c.placeholder)}else{a(b).removeAttr("src")}b.loaded=false}else{b.loaded=true}a(b).one("appear",function(){if(!this.loaded){a("<img />").bind("load",function(){a(b).hide().attr("src",a(b).attr("original"))[c.effect](c.effectspeed);b.loaded=true}).attr("src",a(b).attr("original"))}});if("scroll"!=c.event){a(b).bind(c.event,function(c){if(!b.loaded){a(b).trigger("appear")}})}});a(c.container).trigger(c.event);return this};a.belowthefold=function(b,c){if(c.container===undefined||c.container===window){var d=a(window).height()+a(window).scrollTop()}else{var d=a(c.container).offset().top+a(c.container).height()}return d<=a(b).offset().top-c.threshold};a.rightoffold=function(b,c){if(c.container===undefined||c.container===window){var d=a(window).width()+a(window).scrollLeft()}else{var d=a(c.container).offset().left+a(c.container).width()}return d<=a(b).offset().left-c.threshold};a.abovethetop=function(b,c){if(c.container===undefined||c.container===window){var d=a(window).scrollTop()}else{var d=a(c.container).offset().top}return d>=a(b).offset().top+c.threshold+a(b).height()};a.leftofbegin=function(b,c){if(c.container===undefined||c.container===window){var d=a(window).scrollLeft()}else{var d=a(c.container).offset().left}return d>=a(b).offset().left+c.threshold+a(b).width()};a.extend(a.expr[":"],{"below-the-fold":"$.belowthefold(a, {threshold : 0, container: window})","above-the-fold":"!$.belowthefold(a, {threshold : 0, container: window})","right-of-fold":"$.rightoffold(a, {threshold : 0, container: window})","left-of-fold":"!$.rightoffold(a, {threshold : 0, container: window})"})})(jQuery);
 
-//Infinite Scroll
-(function(a){a.fn.infinitescroll=function(b,c){function l(){if(n.isDone){i();return false}else{var b=o.children().get();if(b.length==0){return a.event.trigger("ajaxError",[{status:404}])}else{m.callback(o)}while(o[0].firstChild){p.appendChild(o[0].firstChild)}a(m.contentSelector)[0].appendChild(p);n.loadingMsg.fadeOut("normal");if(m.animate){var d=a(window).scrollTop()+a("#infscr-loading").height()+m.extraScrollPx+"px";a("html,body").animate({scrollTop:d},800,function(){n.isDuringAjax=false})}c.call(a(m.contentSelector)[0],b);if(!m.animate)n.isDuringAjax=false}}function k(){n.isDuringAjax=true;n.loadingMsg.appendTo(m.contentSelector).show();a(m.navSelector).hide();n.currPage++;d("heading into ajax",r);o=a(m.contentSelector).is("table")?a("<tbody/>"):a("<div/>");p=document.createDocumentFragment();o.load(r.join(n.currPage)+" "+m.itemSelector,null,l)}function j(){if(n.isDuringAjax||n.isInvalidPage||n.isDone)return;if(!h(m,n))return;a(document).trigger("retrieve.infscr")}function i(){n.loadingMsg.find("img").hide().parent().find("div").html(m.donetext).animate({opacity:1},2e3).fadeOut("normal");m.errorCallback()}function h(){var b=0+g()-(m.localMode?a(n.container).scrollTop():a(n.container).scrollTop()||a(n.container.ownerDocument.body).scrollTop())-a(m.localMode?n.container:window).height();d("math:",b,n.pixelsFromNavToBottom);var c=b;var e=n.pixelsFromNavToBottom;return b-m.bufferPx<n.pixelsFromNavToBottom}function g(){return m.localMode?a(n.container)[0].scrollHeight&&a(n.container)[0].scrollHeight:a(document).height()}function f(a){a.match(q)?a.match(q)[2]:a;if(a.match(/^(.*?)\b2\b(.*?$)/)){a=a.match(/^(.*?)\b2\b(.*?$)/).slice(1)}else if(a.match(/^(.*?)2(.*?$)/)){if(a.match(/^(.*?page=)2(\/.*|$)/)){a=a.match(/^(.*?page=)2(\/.*|$)/).slice(1);return a}d("Trying backup next selector parse technique. Treacherous waters here, matey.");a=a.match(/^(.*?)2(.*?$)/).slice(1)}else{if(a.match(/^(.*?page=)1(\/.*|$)/)){a=a.match(/^(.*?page=)1(\/.*|$)/).slice(1);return a}n.isInvalidPage=true}return a}function e(b){for(var c in b){if(c.indexOf&&c.indexOf("Selector")>-1&&a(b[c]).length===0){d("Your "+c+" found no elements.");return false}return true}}function d(){if(m.debug){window.console&&console.log.call(console,arguments)}}a.browser.ie6=a.browser.msie&&a.browser.version<7;var m=a.extend({},a.infinitescroll.defaults,b),n=a.infinitescroll,o,p;c=c||function(){};if(!e(m)){return false}n.container=m.localMode?this:document.documentElement;m.contentSelector=m.contentSelector||this;var q=/(.*?\/\/).*?(\/.*)/,r=a(m.nextSelector).attr("href");if(!r){d("Navigation selector not found");return}r=f(r);if(m.localMode)a(n.container)[0].scrollTop=0;n.pixelsFromNavToBottom=n.container==document.documentElement?300:g()+a(n.container).offset().top-a(m.navSelector).offset().top;n.loadingMsg=a('<li class="scro"><img alt="Loading..." src="'+m.loadingImg+'" /> '+m.loadingText+"</li>");(new Image).src=m.loadingImg;a(document).ajaxError(function(b,c,e){d("Page not found. Self-destructing...");if(c.status==404){i();n.isDone=true;a(m.localMode?this:window).unbind("scroll.infscr")}});a(m.localMode?this:window).bind("scroll.infscr",j).trigger("scroll.infscr");a(document).bind("retrieve.infscr",k);return this};a.infinitescroll={defaults:{debug:false,preload:false,nextSelector:"a#more:last",loadingImg:"img/square.gif",loadingText:" Please wait...",donetext:"Sorry, but we have no more loading for you!",navSelector:"div.navigation",contentSelector:null,extraScrollPx:150,itemSelector:"#allTimeline li",animate:false,localMode:false,bufferPx:400,errorCallback:function(){},callback:undefined},loadingImg:undefined,loadingMsg:undefined,container:undefined,currPage:1,currDOMChunk:null,isDuringAjax:false,isInvalidPage:false,isDone:false}})(jQuery);
+/*
+	--------------------------------
+	Infinite Scroll
+	--------------------------------
+	+ https://github.com/paulirish/infinite-scroll
+	+ version 2.0b2.111027
+	+ Copyright 2011 Paul Irish & Luke Shumard
+	+ Licensed under the MIT license
+	
+	+ Documentation: http://infinite-scroll.com/
+	
+*/
+
+(function (window, $, undefined) {
+	
+	$.infinitescroll = function infscr(options, callback, element) {
+		
+		this.element = $(element);
+		this._create(options, callback);
+	
+	};
+	
+	$.infinitescroll.defaults = {
+		loading: {
+			finished: undefined,
+			finishedMsg: "<em>Congratulations, you've reached the edge of the timeline.</em>",
+			img: "img/square.gif",
+			msg: null,
+			msgText: "<em>Loading more tweets...</em>",
+			selector: null,
+			speed: 'fast',
+			start: undefined
+		},
+		state: {
+			isDuringAjax: false,
+			isInvalidPage: false,
+			isDestroyed: false,
+			isDone: false, // For when it goes all the way through the archive.
+			isPaused: false,
+			currPage: 1
+		},
+		callback: undefined,
+		debug: false,
+		behavior: undefined,
+		binder: $(window), // used to cache the selector
+		nextSelector: "div.navigation a:first",
+		navSelector: "div.navigation",
+		contentSelector: null, // rename to pageFragment
+		extraScrollPx: 150,
+		itemSelector: "div.post",
+		animate: false,
+		pathParse: undefined,
+		dataType: 'html',
+		appendCallback: true,
+		bufferPx: 40,
+		errorCallback: function () { },
+		infid: 0, //Instance ID
+		pixelsFromNavToBottom: undefined,
+		path: undefined
+	};
+
+
+    $.infinitescroll.prototype = {
+
+        /*	
+        ----------------------------
+        Private methods
+        ----------------------------
+        */
+
+        // Bind or unbind from scroll
+        _binding: function infscr_binding(binding) {
+
+            var instance = this,
+				opts = instance.options;
+				
+			opts.v = '2.0b2.111027';
+
+            // if behavior is defined and this function is extended, call that instead of default
+			if (!!opts.behavior && this['_binding_'+opts.behavior] !== undefined) {
+				this['_binding_'+opts.behavior].call(this);
+				return;
+			}
+
+			if (binding !== 'bind' && binding !== 'unbind') {
+                this._debug('Binding value  ' + binding + ' not valid')
+                return false;
+            }
+
+            if (binding == 'unbind') {
+
+                (this.options.binder).unbind('smartscroll.infscr.' + instance.options.infid);
+
+            } else {
+
+                (this.options.binder)[binding]('smartscroll.infscr.' + instance.options.infid, function () {
+                    instance.scroll();
+                });
+
+            };
+
+            this._debug('Binding', binding);
+
+        },
+
+		// Fundamental aspects of the plugin are initialized
+		_create: function infscr_create(options, callback) {
+
+            // If selectors from options aren't valid, return false
+            if (!this._validate(options)) { return false; }
+            // Define options and shorthand
+            var opts = this.options = $.extend(true, {}, $.infinitescroll.defaults, options),
+				// get the relative URL - everything past the domain name.
+				relurl = /(.*?\/\/).*?(\/.*)/,
+				path = $(opts.nextSelector).attr('href');
+
+            // contentSelector is 'page fragment' option for .load() / .ajax() calls
+            opts.contentSelector = opts.contentSelector || this.element;
+
+            // loading.selector - if we want to place the load message in a specific selector, defaulted to the contentSelector
+            opts.loading.selector = opts.loading.selector || opts.contentSelector;
+
+            // if there's not path, return
+            if (!path) { this._debug('Navigation selector not found'); return; }
+
+            // Set the path to be a relative URL from root.
+            opts.path = this._determinepath(path);
+
+            // Define loading.msg
+            opts.loading.msg = $('<div id="infscr-loading"><img alt="Loading..." src="' + opts.loading.img + '" /><div>' + opts.loading.msgText + '</div></div>');
+
+            // Preload loading.img
+            (new Image()).src = opts.loading.img;
+
+            // distance from nav links to bottom
+            // computed as: height of the document + top offset of container - top offset of nav link
+            opts.pixelsFromNavToBottom = $(document).height() - $(opts.navSelector).offset().top;
+
+			// determine loading.start actions
+            opts.loading.start = opts.loading.start || function() {
+				
+				$(opts.navSelector).hide();
+				opts.loading.msg
+					.appendTo(opts.loading.selector)
+					.show(opts.loading.speed, function () {
+	                	beginAjax(opts);
+	            });
+			};
+			
+			// determine loading.finished actions
+			opts.loading.finished = opts.loading.finished || function() {
+				opts.loading.msg.fadeOut('normal');
+			};
+
+            // callback loading
+            opts.callback = function(instance,data) {
+				if (!!opts.behavior && instance['_callback_'+opts.behavior] !== undefined) {
+					instance['_callback_'+opts.behavior].call($(opts.contentSelector)[0], data);
+				}
+				if (callback) {
+					callback.call($(opts.contentSelector)[0], data, opts);
+				}
+			};
+
+            this._setup();
+
+        },
+
+        // Console log wrapper
+        _debug: function infscr_debug() {
+
+			if (this.options && this.options.debug) {
+                return window.console && console.log.call(console, arguments);
+            }
+
+        },
+
+        // find the number to increment in the path.
+        _determinepath: function infscr_determinepath(path) {
+
+            var opts = this.options;
+
+			// if behavior is defined and this function is extended, call that instead of default
+			if (!!opts.behavior && this['_determinepath_'+opts.behavior] !== undefined) {
+				this['_determinepath_'+opts.behavior].call(this,path);
+				return;
+			}
+
+            if (!!opts.pathParse) {
+
+                this._debug('pathParse manual');
+                return opts.pathParse(path, this.options.state.currPage+1);
+
+            } else if (path.match(/^(.*?)\b2\b(.*?$)/)) {
+                path = path.match(/^(.*?)\b2\b(.*?$)/).slice(1);
+
+                // if there is any 2 in the url at all.    
+            } else if (path.match(/^(.*?)2(.*?$)/)) {
+
+                // page= is used in django:
+                // http://www.infinite-scroll.com/changelog/comment-page-1/#comment-127
+                if (path.match(/^(.*?page=)2(\/.*|$)/)) {
+                    path = path.match(/^(.*?page=)2(\/.*|$)/).slice(1);
+                    return path;
+                }
+
+                path = path.match(/^(.*?)2(.*?$)/).slice(1);
+
+            } else {
+
+                // page= is used in drupal too but second page is page=1 not page=2:
+                // thx Jerod Fritz, vladikoff
+                if (path.match(/^(.*?page=)1(\/.*|$)/)) {
+                    path = path.match(/^(.*?page=)1(\/.*|$)/).slice(1);
+                    return path;
+                } else {
+                    this._debug('Sorry, we couldn\'t parse your Next (Previous Posts) URL. Verify your the css selector points to the correct A tag. If you still get this error: yell, scream, and kindly ask for help at infinite-scroll.com.');
+                    // Get rid of isInvalidPage to allow permalink to state
+                    opts.state.isInvalidPage = true;  //prevent it from running on this page.
+                }
+            }
+            this._debug('determinePath', path);
+            return path;
+
+        },
+
+        // Custom error
+        _error: function infscr_error(xhr) {
+
+            var opts = this.options;
+
+			// if behavior is defined and this function is extended, call that instead of default
+			if (!!opts.behavior && this['_error_'+opts.behavior] !== undefined) {
+				this['_error_'+opts.behavior].call(this,xhr);
+				return;
+			}
+
+            if (xhr !== 'destroy' && xhr !== 'end') {
+                xhr = 'unknown';
+            }
+
+            this._debug('Error', xhr);
+
+            if (xhr == 'end') {
+                this._showdonemsg();
+            }
+
+            opts.state.isDone = true;
+            opts.state.currPage = 1; // if you need to go back to this instance
+            opts.state.isPaused = false;
+            this._binding('unbind');
+
+        },
+
+        // Load Callback
+        _loadcallback: function infscr_loadcallback(box, data) {
+
+            var opts = this.options,
+	    		callback = this.options.callback, // GLOBAL OBJECT FOR CALLBACK
+	    		result = (opts.state.isDone) ? 'done' : (!opts.appendCallback) ? 'no-append' : 'append',
+	    		frag;
+	
+			// if behavior is defined and this function is extended, call that instead of default
+			if (!!opts.behavior && this['_loadcallback_'+opts.behavior] !== undefined) {
+				this['_loadcallback_'+opts.behavior].call(this,box,data);
+				return;
+			}
+
+            switch (result) {
+
+                case 'done':
+
+                    this._showdonemsg();
+                    return false;
+
+                    break;
+
+                case 'no-append':
+
+                    if (opts.dataType == 'html') {
+                        data = '<div>' + data + '</div>';
+                        data = $(data).find(opts.itemSelector);
+                    };
+
+                    break;
+
+                case 'append':
+
+                    var children = box.children();
+
+                    // if it didn't return anything
+                    if (children.length == 0) {
+                        return this._error('end');
+                    }
+					
+					// added by esmizzle 2012-01-26 - update the path to the link for the next set of elements
+					var nexturl = $(data).find(opts.nextSelector).attr('href');
+                    this._debug('nexturl: '+ nexturl)
+					this.options.path[0] = nexturl;
+					this.options.path[1] = '#pathcomplete';
+
+                    // use a documentFragment because it works when content is going into a table or UL
+                    frag = document.createDocumentFragment();
+                    while (box[0].firstChild) {
+                        frag.appendChild(box[0].firstChild);
+                    }
+
+                    this._debug('contentSelector', $(opts.contentSelector)[0])
+                    $(opts.contentSelector)[0].appendChild(frag);
+                    // previously, we would pass in the new DOM element as context for the callback
+                    // however we're now using a documentfragment, which doesnt havent parents or children,
+                    // so the context is the contentContainer guy, and we pass in an array
+                    //   of the elements collected as the first argument.
+
+                    data = children.get();
+
+
+                    break;
+
+            }
+
+            // loadingEnd function
+			opts.loading.finished.call($(opts.contentSelector)[0],opts)
+            
+
+            // smooth scroll to ease in the new content
+            if (opts.animate) {
+                var scrollTo = $(window).scrollTop() + $('#infscr-loading').height() + opts.extraScrollPx + 'px';
+                $('html,body').animate({ scrollTop: scrollTo }, 800, function () { opts.state.isDuringAjax = false; });
+            }
+
+            if (!opts.animate) opts.state.isDuringAjax = false; // once the call is done, we can allow it again.
+
+            callback(this,data);
+
+        },
+
+        _nearbottom: function infscr_nearbottom() {
+
+            var opts = this.options,
+	        	pixelsFromWindowBottomToBottom = 0 + $(document).height() - (opts.binder.scrollTop()) - $(window).height();
+
+            // if behavior is defined and this function is extended, call that instead of default
+			if (!!opts.behavior && this['_nearbottom_'+opts.behavior] !== undefined) {
+				return this['_nearbottom_'+opts.behavior].call(this);
+			}
+
+			this._debug('math:', pixelsFromWindowBottomToBottom, opts.pixelsFromNavToBottom);
+
+            // if distance remaining in the scroll (including buffer) is less than the orignal nav to bottom....
+            return (pixelsFromWindowBottomToBottom - opts.bufferPx < opts.pixelsFromNavToBottom);
+
+        },
+
+		// Pause / temporarily disable plugin from firing
+        _pausing: function infscr_pausing(pause) {
+
+            var opts = this.options;
+
+            // if behavior is defined and this function is extended, call that instead of default
+			if (!!opts.behavior && this['_pausing_'+opts.behavior] !== undefined) {
+				this['_pausing_'+opts.behavior].call(this,pause);
+				return;
+			}
+
+			// If pause is not 'pause' or 'resume', toggle it's value
+            if (pause !== 'pause' && pause !== 'resume' && pause !== null) {
+                this._debug('Invalid argument. Toggling pause value instead');
+            };
+
+            pause = (pause && (pause == 'pause' || pause == 'resume')) ? pause : 'toggle';
+
+            switch (pause) {
+                case 'pause':
+                    opts.state.isPaused = true;
+                    break;
+
+                case 'resume':
+                    opts.state.isPaused = false;
+                    break;
+
+                case 'toggle':
+                    opts.state.isPaused = !opts.state.isPaused;
+                    break;
+            }
+
+            this._debug('Paused', opts.state.isPaused);
+            return false;
+
+        },
+
+		// Behavior is determined
+		// If the behavior option is undefined, it will set to default and bind to scroll
+		_setup: function infscr_setup() {
+			
+			var opts = this.options;
+			
+			// if behavior is defined and this function is extended, call that instead of default
+			if (!!opts.behavior && this['_setup_'+opts.behavior] !== undefined) {
+				this['_setup_'+opts.behavior].call(this);
+				return;
+			}
+			
+			this._binding('bind');
+			
+			return false;
+			
+		},
+
+        // Show done message
+        _showdonemsg: function infscr_showdonemsg() {
+
+            var opts = this.options;
+
+			// if behavior is defined and this function is extended, call that instead of default
+			if (!!opts.behavior && this['_showdonemsg_'+opts.behavior] !== undefined) {
+				this['_showdonemsg_'+opts.behavior].call(this);
+				return;
+			}
+
+            opts.loading.msg
+	    		.find('img')
+	    		.hide()
+	    		.parent()
+	    		.find('div').html(opts.loading.finishedMsg).animate({ opacity: 1 }, 2000, function () {
+	    		    $(this).parent().fadeOut('normal');
+	    		});
+
+            // user provided callback when done    
+            opts.errorCallback.call($(opts.contentSelector)[0],'done');
+
+        },
+
+		// grab each selector option and see if any fail
+        _validate: function infscr_validate(opts) {
+
+            for (var key in opts) {
+                if (key.indexOf && key.indexOf('Selector') > -1 && $(opts[key]).length === 0) {
+                    this._debug('Your ' + key + ' found no elements.');
+                    return false;
+                }
+                return true;
+            }
+
+        },
+
+        /*	
+        ----------------------------
+        Public methods
+        ----------------------------
+        */
+
+		// Bind to scroll
+		bind: function infscr_bind() {
+			this._binding('bind');
+		},
+
+        // Destroy current instance of plugin
+        destroy: function infscr_destroy() {
+
+            this.options.state.isDestroyed = true;
+            return this._error('destroy');
+
+        },
+
+		// Set pause value to false
+		pause: function infscr_pause() {
+			this._pausing('pause');
+		},
+		
+		// Set pause value to false
+		resume: function infscr_resume() {
+			this._pausing('resume');
+		},
+
+        // Retrieve next set of content items
+        retrieve: function infscr_retrieve(pageNum) {
+
+            var instance = this,
+				opts = instance.options,
+				path = opts.path,
+				box, frag, desturl, method, condition,
+	    		pageNum = pageNum || null,
+				getPage = (!!pageNum) ? pageNum : opts.state.currPage;
+				beginAjax = function infscr_ajax(opts) {
+					
+					// increment the URL bit. e.g. /page/3/
+	                opts.state.currPage++;
+
+	                instance._debug('heading into ajax', path);
+
+	                // if we're dealing with a table we can't use DIVs
+	                box = $(opts.contentSelector).is('table') ? $('<tbody/>') : $('<div/>');
+
+					desturl = (path[1] == '#pathcomplete') ? path[0] : path.join(opts.state.currPage); // only throw the currPage in there if we need it
+	                instance._debug('desturl: '+desturl);
+
+	                method = (opts.dataType == 'html' || opts.dataType == 'json') ? opts.dataType : 'html+callback';
+	                if (opts.appendCallback && opts.dataType == 'html') method += '+callback'
+
+	                switch (method) {
+
+	                    case 'html+callback':
+	                        instance._debug('Using HTML via .load() method');
+							box.load(desturl + ' ' + opts.itemSelector, null, function infscr_ajax_callback(responseText) {
+								instance._loadcallback(box, responseText);
+							});
+
+	                        break;
+
+	                    case 'html':
+	                    case 'json':
+
+	                        instance._debug('Using ' + (method.toUpperCase()) + ' via $.ajax() method');
+	                        $.ajax({
+	                            // params
+	                            url: desturl,
+	                            dataType: opts.dataType,
+	                            complete: function infscr_ajax_callback(jqXHR, textStatus) {
+	                                condition = (typeof (jqXHR.isResolved) !== 'undefined') ? (jqXHR.isResolved()) : (textStatus === "success" || textStatus === "notmodified");
+	                                (condition) ? instance._loadcallback(box, jqXHR.responseText) : instance._error('end');
+	                            }
+	                        });
+	
+	                        break;
+	                }
+				};
+				
+			// if behavior is defined and this function is extended, call that instead of default
+			if (!!opts.behavior && this['retrieve_'+opts.behavior] !== undefined) {
+				this['retrieve_'+opts.behavior].call(this,pageNum);
+				return;
+			}
+
+            
+			// for manual triggers, if destroyed, get out of here
+			if (opts.state.isDestroyed) {
+                this._debug('Instance is destroyed');
+                return false;
+            };
+
+            // we dont want to fire the ajax multiple times
+            opts.state.isDuringAjax = true;
+
+            opts.loading.start.call($(opts.contentSelector)[0],opts);
+
+        },
+
+        // Check to see next page is needed
+        scroll: function infscr_scroll() {
+
+            var opts = this.options,
+				state = opts.state;
+
+            // if behavior is defined and this function is extended, call that instead of default
+			if (!!opts.behavior && this['scroll_'+opts.behavior] !== undefined) {
+				this['scroll_'+opts.behavior].call(this);
+				return;
+			}
+
+			if (state.isDuringAjax || state.isInvalidPage || state.isDone || state.isDestroyed || state.isPaused) return;
+
+            if (!this._nearbottom()) return;
+
+            this.retrieve();
+
+        },
+		
+		// Toggle pause value
+		toggle: function infscr_toggle() {
+			this._pausing();
+		},
+		
+		// Unbind from scroll
+		unbind: function infscr_unbind() {
+			this._binding('unbind');
+		},
+		
+		// update options
+		update: function infscr_options(key) {
+			if ($.isPlainObject(key)) {
+				this.options = $.extend(true,this.options,key);
+			}
+		}
+
+    }
+
+
+    /*	
+    ----------------------------
+    Infinite Scroll function
+    ----------------------------
+	
+    Borrowed logic from the following...
+	
+    jQuery UI
+    - https://github.com/jquery/jquery-ui/blob/master/ui/jquery.ui.widget.js
+	
+    jCarousel
+    - https://github.com/jsor/jcarousel/blob/master/lib/jquery.jcarousel.js
+	
+    Masonry
+    - https://github.com/desandro/masonry/blob/master/jquery.masonry.js		
+	
+    */
+
+    $.fn.infinitescroll = function infscr_init(options, callback) {
+
+
+        var thisCall = typeof options;
+
+        switch (thisCall) {
+
+            // method 
+            case 'string':
+
+                var args = Array.prototype.slice.call(arguments, 1);
+
+                this.each(function () {
+
+                    var instance = $.data(this, 'infinitescroll');
+
+                    if (!instance) {
+                        // not setup yet
+                        // return $.error('Method ' + options + ' cannot be called until Infinite Scroll is setup');
+						return false;
+                    }
+                    if (!$.isFunction(instance[options]) || options.charAt(0) === "_") {
+                        // return $.error('No such method ' + options + ' for Infinite Scroll');
+						return false;
+                    }
+
+                    // no errors!
+                    instance[options].apply(instance, args);
+
+                });
+
+                break;
+
+            // creation 
+            case 'object':
+
+                this.each(function () {
+
+                    var instance = $.data(this, 'infinitescroll');
+
+                    if (instance) {
+
+                        // update options of current instance
+                        instance.update(options);
+
+                    } else {
+
+                        // initialize new instance
+                        $.data(this, 'infinitescroll', new $.infinitescroll(options, callback, this));
+
+                    }
+
+                });
+
+                break;
+
+        }
+
+        return this;
+
+    };
+
+
+
+    /* 
+    * smartscroll: debounced scroll event for jQuery *
+    * https://github.com/lukeshumard/smartscroll
+    * Based on smartresize by @louis_remi: https://github.com/lrbabe/jquery.smartresize.js *
+    * Copyright 2011 Louis-Remi & Luke Shumard * Licensed under the MIT license. *
+    */
+
+    var event = $.event,
+		scrollTimeout;
+
+    event.special.smartscroll = {
+        setup: function () {
+            $(this).bind("scroll", event.special.smartscroll.handler);
+        },
+        teardown: function () {
+            $(this).unbind("scroll", event.special.smartscroll.handler);
+        },
+        handler: function (event, execAsap) {
+            // Save the context
+            var context = this,
+		      args = arguments;
+
+            // set correct event type
+            event.type = "smartscroll";
+
+            if (scrollTimeout) { clearTimeout(scrollTimeout); }
+            scrollTimeout = setTimeout(function () {
+                $.event.handle.apply(context, args);
+            }, execAsap === "execAsap" ? 0 : 100);
+        }
+    };
+
+    $.fn.smartscroll = function (fn) {
+        return fn ? this.bind("smartscroll", fn) : this.trigger("smartscroll", ["execAsap"]);
+    };
+
+
+})(window, jQuery);
+
 
 //Autocomplete
-(function(a){a.fn.extend({autocomplete:function(b,c){var d=typeof b=="string";c=a.extend({},a.Autocompleter.defaults,{url:d?b:null,data:d?null:b,delay:d?a.Autocompleter.defaults.delay:10,max:c&&!c.scroll?10:150},c);c.highlight=c.highlight||function(a){return a};c.formatMatch=c.formatMatch||c.formatItem;return this.each(function(){new a.Autocompleter(this,c)})},result:function(a){return this.bind("result",a)},search:function(a){return this.trigger("search",[a])},flushCache:function(){return this.trigger("flushCache")},setOptions:function(a){return this.trigger("setOptions",[a])},unautocomplete:function(){return this.trigger("unautocomplete")}});a.Autocompleter=function(b,c){function x(){e.removeClass(c.loadingClass)}function w(b){var d=[];var e=b.split("\n");for(var f=0;f<e.length;f++){var g=a.trim(e[f]);if(g){g=g.split("|");d[d.length]={data:g,value:g[0],result:c.formatResult&&c.formatResult(g,g[0])||g[0]}}}return d}function v(d,e,f){if(!c.matchCase)d=d.toLowerCase();var g=h.load(d);if(g&&g.length){e(d,g)}else if(typeof c.url=="string"&&c.url.length>0){var i={timestamp:+(new Date)};a.each(c.extraParams,function(a,b){i[a]=typeof b=="function"?b():b});a.ajax({mode:"abort",port:"autocomplete"+b.name,dataType:c.dataType,url:c.url,data:a.extend({q:q(d),limit:c.max},i),success:function(a){var b=c.parse&&c.parse(a)||w(a);h.add(d,b);e(d,b)}})}else{l.emptyList();f(d)}}function u(a,b){if(b&&b.length&&i){x();l.display(b,a);r(a,b[0].value);l.show()}else{t()}}function t(){var d=l.visible();l.hide();clearTimeout(f);x();if(c.mustMatch){e.search(function(a){if(!a){if(c.multiple){var b=p(e.val()).slice(0,-1);e.val(b.join(c.multipleSeparator)+(b.length?c.multipleSeparator:""))}else e.val("")}})}if(d)a.Autocompleter.Selection(b,b.value.length,b.value.length)}function s(){clearTimeout(f);f=setTimeout(t,200)}function r(f,h){if(c.autoFill&&q(e.val()).toLowerCase()==f.toLowerCase()&&j!=d.BACKSPACE){e.val(e.val()+h.substring(q(g).length));a.Autocompleter.Selection(b,g.length,g.length+h.length)}}function q(a){if(!c.multiple)return a;var b=p(a);return b[b.length-1]}function p(b){if(!b){return[""]}var d=b.split(c.multipleSeparator);var e=[];a.each(d,function(b,c){if(a.trim(c))e[b]=a.trim(c)});return e}function o(a,b){if(j==d.DEL){l.hide();return}var f=e.val();if(!b&&f==g)return;g=f;f=q(f);if(f.length>=c.minChars){e.addClass(c.loadingClass);if(!c.matchCase)f=f.toLowerCase();v(f,u,t)}else{x();l.hide()}}function n(){var a=l.selected();if(!a)return false;var b=a.result;g=b;if(c.multiple){var d=p(e.val());if(d.length>1){b=d.slice(0,d.length-1).join(c.multipleSeparator)+c.multipleSeparator+b}b+=c.multipleSeparator}e.val(b);t();e.trigger("result",[a.data,a.value]);return true}var d={UP:38,DOWN:40,DEL:46,TAB:9,RETURN:13,ESC:27,COMMA:188,PAGEUP:33,PAGEDOWN:34,BACKSPACE:8};var e=a(b).attr("autocomplete","off").addClass(c.inputClass);var f;var g="";var h=a.Autocompleter.Cache(c);var i=0;var j;var k={mouseDownOnSelect:false};var l=a.Autocompleter.Select(c,b,n,k);var m;a.browser.opera&&a(b.form).bind("submit.autocomplete",function(){if(m){m=false;return false}});e.bind((a.browser.opera?"keypress":"keydown")+".autocomplete",function(b){j=b.keyCode;switch(b.keyCode){case d.UP:b.preventDefault();if(l.visible()){l.prev()}else{o(0,true)}break;case d.DOWN:b.preventDefault();if(l.visible()){l.next()}else{o(0,true)}break;case d.PAGEUP:b.preventDefault();if(l.visible()){l.pageUp()}else{o(0,true)}break;case d.PAGEDOWN:b.preventDefault();if(l.visible()){l.pageDown()}else{o(0,true)}break;case c.multiple&&a.trim(c.multipleSeparator)==","&&d.COMMA:case d.TAB:case d.RETURN:if(n()){b.preventDefault();m=true;return false}break;case d.ESC:l.hide();break;default:clearTimeout(f);f=setTimeout(o,c.delay);break}}).focus(function(){i++}).blur(function(){i=0;if(!k.mouseDownOnSelect){s()}}).click(function(){if(i++>1&&!l.visible()){o(0,true)}}).bind("search",function(){function c(a,c){var d;if(c&&c.length){for(var f=0;f<c.length;f++){if(c[f].result.toLowerCase()==a.toLowerCase()){d=c[f];break}}}if(typeof b=="function")b(d);else e.trigger("result",d&&[d.data,d.value])}var b=arguments.length>1?arguments[1]:null;a.each(p(e.val()),function(a,b){v(b,c,c)})}).bind("flushCache",function(){h.flush()}).bind("setOptions",function(){a.extend(c,arguments[1]);if("data"in arguments[1])h.populate()}).bind("unautocomplete",function(){l.unbind();e.unbind();a(b.form).unbind(".autocomplete")});};a.Autocompleter.defaults={inputClass:"ac_input",resultsClass:"ac_results",loadingClass:"ac_loading",minChars:1,delay:400,matchCase:false,matchSubset:true,matchContains:false,cacheLength:10,max:100,mustMatch:false,extraParams:{},selectFirst:true,formatItem:function(a){return a[0]},formatMatch:null,autoFill:false,width:0,multiple:false,multipleSeparator:", ",highlight:function(a,b){return a.replace(new RegExp("(?![^&;]+;)(?!<[^<>]*)("+b.replace(/([\^\$\(\)\[\]\{\}\*\.\+\?\|\\])/gi,"\\$1")+")(?![^<>]*>)(?![^&;]+;)","gi"),"<strong>$1</strong>")},scroll:true,scrollHeight:180};a.Autocompleter.Cache=function(b){function h(){c={};d=0}function g(){if(!b.data)return false;var c={},d=0;if(!b.url)b.cacheLength=1;c[""]=[];for(var e=0,g=b.data.length;e<g;e++){var h=b.data[e];h=typeof h=="string"?[h]:h;var i=b.formatMatch(h,e+1,b.data.length);if(i===false)continue;var j=i.charAt(0).toLowerCase();if(!c[j])c[j]=[];var k={value:i,data:h,result:b.formatResult&&b.formatResult(h)||i};c[j].push(k);if(d++<b.max){c[""].push(k)}}a.each(c,function(a,c){b.cacheLength++;f(a,c)})}function f(a,e){if(d>b.cacheLength){h()}if(!c[a]){d++}c[a]=e}function e(a,c){if(!b.matchCase)a=a.toLowerCase();var d=a.indexOf(c);if(b.matchContains=="word"){d=a.toLowerCase().search("\\b"+c.toLowerCase())}if(d==-1)return false;return d==0||b.matchContains}var c={};var d=0;setTimeout(g,25);return{flush:h,add:f,populate:g,load:function(f){if(!b.cacheLength||!d)return null;if(!b.url&&b.matchContains){var g=[];for(var h in c){if(h.length>0){var i=c[h];a.each(i,function(a,b){if(e(b.value,f)){g.push(b)}})}}return g}else if(c[f]){return c[f]}else if(b.matchSubset){for(var j=f.length-1;j>=b.minChars;j--){var i=c[f.substr(0,j)];if(i){var g=[];a.each(i,function(a,b){if(e(b.value,f)){g[g.length]=b}});return g}}}return null}}};a.Autocompleter.Select=function(b,c,d,e){function s(){m.empty();var c=r(i.length);for(var d=0;d<c;d++){if(!i[d])continue;var e=b.formatItem(i[d].data,d+1,c,i[d].value,j);if(e===false)continue;var k=a("<li/>").html(b.highlight(e,j)).addClass(d%2==0?"ac_even":"ac_odd").appendTo(m)[0];a.data(k,"ac_data",i[d])}g=m.find("li");if(b.selectFirst){g.slice(0,1).addClass(f.ACTIVE);h=0}if(a.fn.bgiframe)m.bgiframe()}function r(a){return b.max&&b.max<a?b.max:a}function q(a){h+=a;if(h<0){h=g.size()-1}else if(h>=g.size()){h=0}}function p(a){g.slice(h,h+1).removeClass(f.ACTIVE);q(a);var c=g.slice(h,h+1).addClass(f.ACTIVE);if(b.scroll){var d=0;g.slice(0,h).each(function(){d+=this.offsetHeight});if(d+c[0].offsetHeight-m.scrollTop()>m[0].clientHeight){m.scrollTop(d+c[0].offsetHeight-m.innerHeight())}else if(d<m.scrollTop()){m.scrollTop(d)}}}function o(a){var b=a.target;while(b&&b.tagName!="LI")b=b.parentNode;if(!b)return[];return b}function n(){if(!k)return;l=a("<div/>").hide().addClass(b.resultsClass).css("position","absolute").appendTo(document.body);m=a("<ul/>").appendTo(l).mouseover(function(b){if(o(b).nodeName&&o(b).nodeName.toUpperCase()=="LI"){h=a("li",m).removeClass(f.ACTIVE).index(o(b));a(o(b)).addClass(f.ACTIVE)}}).click(function(b){a(o(b)).addClass(f.ACTIVE);d();c.focus();return false}).mousedown(function(){e.mouseDownOnSelect=true}).mouseup(function(){e.mouseDownOnSelect=false});if(b.width>0)l.css("width",b.width);k=false}var f={ACTIVE:"ac_over"};var g,h=-1,i,j="",k=true,l,m;return{display:function(a,b){n();i=a;j=b;s()},next:function(){p(1)},prev:function(){p(-1)},pageUp:function(){if(h!=0&&h-8<0){p(-h)}else{p(-8)}},pageDown:function(){if(h!=g.size()-1&&h+8>g.size()){p(g.size()-1-h)}else{p(8)}},hide:function(){l&&l.hide();g&&g.removeClass(f.ACTIVE);h=-1},visible:function(){return l&&l.is(":visible")},current:function(){return this.visible()&&(g.filter("."+f.ACTIVE)[0]||b.selectFirst&&g[0])},show:function(){var d=a(c).offset();l.css({width:typeof b.width=="string"||b.width>0?b.width:a(c).width(),top:d.top+c.offsetHeight,left:d.left}).show();if(b.scroll){m.scrollTop(0);m.css({maxHeight:b.scrollHeight,overflow:"auto"});if(a.browser.msie&&typeof document.body.style.maxHeight==="undefined"){var e=0;g.each(function(){e+=this.offsetHeight});var f=e>b.scrollHeight;m.css("height",f?b.scrollHeight:e);if(!f){g.width(m.width()-parseInt(g.css("padding-left"))-parseInt(g.css("padding-right")))}}}},selected:function(){var b=g&&g.filter("."+f.ACTIVE).removeClass(f.ACTIVE);return b&&b.length&&a.data(b[0],"ac_data")},emptyList:function(){m&&m.empty()},unbind:function(){l&&l.remove()}}};a.Autocompleter.Selection=function(a,b,c){if(a.createTextRange){var d=a.createTextRange();d.collapse(true);d.moveStart("character",b);d.moveEnd("character",c);d.select()}else if(a.setSelectionRange){a.setSelectionRange(b,c)}else{if(a.selectionStart){a.selectionStart=b;a.selectionEnd=c}}a.focus()}})(jQuery);
+(function(a){a.fn.extend({autocomplete:function(b,c){var d=typeof b=="string";c=a.extend({},a.Autocompleter.defaults,{url:d?b:null,data:d?null:b,delay:d?a.Autocompleter.defaults.delay:10,max:c&&!c.scroll?10:150},c);c.highlight=c.highlight||function(a){return a};c.formatMatch=c.formatMatch||c.formatItem;return this.each(function(){new a.Autocompleter(this,c)})},result:function(a){return this.bind("result",a)},search:function(a){return this.trigger("search",[a])},flushCache:function(){return this.trigger("flushCache")},setOptions:function(a){return this.trigger("setOptions",[a])},unautocomplete:function(){return this.trigger("unautocomplete")}});a.Autocompleter=function(b,c){function x(){e.removeClass(c.loadingClass)}function w(b){var d=[];var e=b.split("\n");for(var f=0;f<e.length;f++){var g=a.trim(e[f]);if(g){g=g.split("|");d[d.length]={data:g,value:g[0],result:c.formatResult&&c.formatResult(g,g[0])||g[0]}}}return d}function v(d,e,f){if(!c.matchCase)d=d.toLowerCase();var g=h.load(d);if(g&&g.length){e(d,g)}else if(typeof c.url=="string"&&c.url.length>0){var i={timestamp:+(new Date)};a.each(c.extraParams,function(a,b){i[a]=typeof b=="function"?b():b});a.ajax({mode:"abort",port:"autocomplete"+b.name,dataType:c.dataType,url:c.url,data:a.extend({q:q(d),limit:c.max},i),success:function(a){var b=c.parse&&c.parse(a)||w(a);h.add(d,b);e(d,b)}})}else{l.emptyList();f(d)}}function u(a,b){if(b&&b.length&&i){x();l.display(b,a);r(a,b[0].value);l.show()}else{t()}}function t(){var d=l.visible();l.hide();clearTimeout(f);x();if(c.mustMatch){e.search(function(a){if(!a){if(c.multiple){var b=p(e.val()).slice(0,-1);e.val(b.join(c.multipleSeparator)+(b.length?c.multipleSeparator:""))}else e.val("")}})}if(d)a.Autocompleter.Selection(b,b.value.length,b.value.length)}function s(){clearTimeout(f);f=setTimeout(t,200)}function r(f,h){if(c.autoFill&&q(e.val()).toLowerCase()==f.toLowerCase()&&j!=d.BACKSPACE){e.val(e.val()+h.substring(q(g).length));a.Autocompleter.Selection(b,g.length,g.length+h.length)}}function q(a){if(!c.multiple)return a;var b=p(a);return b[b.length-1]}function p(b){if(!b){return[""]}var d=b.split(c.multipleSeparator);var e=[];a.each(d,function(b,c){if(a.trim(c))e[b]=a.trim(c)});return e}function o(a,b){if(j==d.DEL){l.hide();return}var f=e.val();if(!b&&f==g)return;g=f;f=q(f);if(f.length>=c.minChars){e.addClass(c.loadingClass);if(!c.matchCase)f=f.toLowerCase();v(f,u,t)}else{x();l.hide()}}function n(){var a=l.selected();if(!a)return false;var b=a.result;g=b;if(c.multiple){var d=p(e.val());if(d.length>1){b=d.slice(0,d.length-1).join(c.multipleSeparator)+c.multipleSeparator+b}b+=c.multipleSeparator}e.val(b);t();e.trigger("result",[a.data,a.value]);return true}var d={UP:38,DOWN:40,DEL:46,TAB:9,RETURN:13,ESC:27,COMMA:188,PAGEUP:33,PAGEDOWN:34,BACKSPACE:8};var e=a(b).attr("autocomplete","off").addClass(c.inputClass);var f;var g="";var h=a.Autocompleter.Cache(c);var i=0;var j;var k={mouseDownOnSelect:false};var l=a.Autocompleter.Select(c,b,n,k);var m;a.browser.opera&&a(b.form).bind("submit.autocomplete",function(){if(m){m=false;return false}});e.bind((a.browser.opera?"keypress":"keydown")+".autocomplete",function(b){j=b.keyCode;switch(b.keyCode){case d.UP:b.preventDefault();if(l.visible()){l.prev()}else{o(0,true)}break;case d.DOWN:b.preventDefault();if(l.visible()){l.next()}else{o(0,true)}break;case d.PAGEUP:b.preventDefault();if(l.visible()){l.pageUp()}else{o(0,true)}break;case d.PAGEDOWN:b.preventDefault();if(l.visible()){l.pageDown()}else{o(0,true)}break;case c.multiple&&a.trim(c.multipleSeparator)==","&&d.COMMA:case d.TAB:case d.RETURN:if(n()){b.preventDefault();m=true;return false}break;case d.ESC:l.hide();break;default:clearTimeout(f);f=setTimeout(o,c.delay);break}}).focus(function(){i++}).blur(function(){i=0;if(!k.mouseDownOnSelect){s()}}).click(function(){if(i++>1&&!l.visible()){o(0,true)}}).bind("search",function(){function c(a,c){var d;if(c&&c.length){for(var f=0;f<c.length;f++){if(c[f].result.toLowerCase()==a.toLowerCase()){d=c[f];break}}}if(typeof b=="function")b(d);else e.trigger("result",d&&[d.data,d.value])}var b=arguments.length>1?arguments[1]:null;a.each(p(e.val()),function(a,b){v(b,c,c)})}).bind("flushCache",function(){h.flush()}).bind("setOptions",function(){a.extend(c,arguments[1]);if("data"in arguments[1])h.populate()}).bind("unautocomplete",function(){l.unbind();e.unbind();a(b.form).unbind(".autocomplete")});};a.Autocompleter.defaults={inputClass:"ac_input",resultsClass:"ac_results",loadingClass:"ac_loading",minChars:1,delay:400,matchCase:false,matchSubset:true,matchContains:false,cacheLength:10,max:100,mustMatch:false,extraParams:{},selectFirst:true,formatItem:function(a){return a[0]},formatMatch:null,autoFill:false,width:0,multiple:false,multipleSeparator:", ",highlight:function(a,b){return a.replace(new RegExp("(?![^&;]+;)(?!<[^<>]*)("+b.replace(/([\^\$\(\)\[\]\{\}\*\.\+\?\|\\])/gi,"\\$1")+")(?![^<>]*>)(?![^&;]+;)","gi"),"<strong>$1</strong>")},scroll:true,scrollHeight:180};a.Autocompleter.Cache=function(b){function h(){c={};d=0}function g(){if(!b.data)return false;var c={},d=0;if(!b.url)b.cacheLength=1;c[""]=[];for(var e=0,g=b.data.length;e<g;e++){var h=b.data[e];h=typeof h=="string"?[h]:h;var i=b.formatMatch(h,e+1,b.data.length);if(i===false)continue;var j=i.charAt(0).toLowerCase();if(!c[j])c[j]=[];var k={value:i,data:h,result:b.formatResult&&b.formatResult(h)||i};c[j].push(k);if(d++<b.max){c[""].push(k)}}a.each(c,function(a,c){b.cacheLength++;f(a,c)})}function f(a,e){if(d>b.cacheLength){h()}if(!c[a]){d++}c[a]=e}function e(a,c){if(!b.matchCase)a=a.toLowerCase();var d=a.indexOf(c);if(b.matchContains=="word"){d=a.toLowerCase().search("\\b"+c.toLowerCase())}if(d==-1)return false;return d==0||b.matchContains}var c={};var d=0;setTimeout(g,25);return{flush:h,add:f,populate:g,load:function(f){if(!b.cacheLength||!d)return null;if(!b.url&&b.matchContains){var g=[];for(var h in c){if(h.length>0){var i=c[h];a.each(i,function(a,b){if(e(b.value,f)){g.push(b)}})}}return g}else if(c[f]){return c[f]}else if(b.matchSubset){for(var j=f.length-1;j>=b.minChars;j--){var i=c[f.substr(0,j)];if(i){var g=[];a.each(i,function(a,b){if(e(b.value,f)){g[g.length]=b}});return g}}}return null}}};a.Autocompleter.Select=function(b,c,d,e){function s(){m.empty();var c=r(i.length);for(var d=0;d<c;d++){if(!i[d])continue;var e=b.formatItem(i[d].data,d+1,c,i[d].value,j);if(e===false)continue;var k=a("<li/>").html(b.highlight(e,j)).addClass(d%2==0?"ac_even":"ac_odd").appendTo(m)[0];a.data(k,"ac_data",i[d])}g=m.find("li");if(b.selectFirst){g.slice(0,1).addClass(f.ACTIVE);h=0}if(a.fn.bgiframe)m.bgiframe()}function r(a){return b.max&&b.max<a?b.max:a}function q(a){h+=a;if(h<0){h=g.size()-1}else if(h>=g.size()){h=0}}function p(a){g.slice(h,h+1).removeClass(f.ACTIVE);q(a);var c=g.slice(h,h+1).addClass(f.ACTIVE);if(b.scroll){var d=0;g.slice(0,h).each(function(){d+=this.offsetHeight});if(d+c[0].offsetHeight-m.scrollTop()>m[0].clientHeight){m.scrollTop(d+c[0].offsetHeight-m.innerHeight())}else if(d<m.scrollTop()){m.scrollTop(d)}}}function o(a){var b=a.target;while(b&&b.tagName!="LI")b=b.parentNode;if(!b)return[];return b}function n(){if(!k)return;l=a("<div/>").hide().addClass(b.resultsClass).css("position","absolute").appendTo(document.body);m=a("<ul/>").appendTo(l).mouseover(function(b){if(o(b).nodeName&&o(b).nodeName.toUpperCase()=="LI"){h=a("li",m).removeClass(f.ACTIVE).index(o(b));a(o(b)).addClass(f.ACTIVE)}}).click(function(b){b.preventDefault();a(o(b)).addClass(f.ACTIVE);d();c.focus()}).mousedown(function(){e.mouseDownOnSelect=true}).mouseup(function(){e.mouseDownOnSelect=false});if(b.width>0)l.css("width",b.width);k=false}var f={ACTIVE:"ac_over"};var g,h=-1,i,j="",k=true,l,m;return{display:function(a,b){n();i=a;j=b;s()},next:function(){p(1)},prev:function(){p(-1)},pageUp:function(){if(h!=0&&h-8<0){p(-h)}else{p(-8)}},pageDown:function(){if(h!=g.size()-1&&h+8>g.size()){p(g.size()-1-h)}else{p(8)}},hide:function(){l&&l.hide();g&&g.removeClass(f.ACTIVE);h=-1},visible:function(){return l&&l.is(":visible")},current:function(){return this.visible()&&(g.filter("."+f.ACTIVE)[0]||b.selectFirst&&g[0])},show:function(){var d=a(c).offset();l.css({width:typeof b.width=="string"||b.width>0?b.width:a(c).width(),top:d.top+c.offsetHeight,left:d.left}).show();if(b.scroll){m.scrollTop(0);m.css({maxHeight:b.scrollHeight,overflow:"auto"});if(a.browser.msie&&typeof document.body.style.maxHeight==="undefined"){var e=0;g.each(function(){e+=this.offsetHeight});var f=e>b.scrollHeight;m.css("height",f?b.scrollHeight:e);if(!f){g.width(m.width()-parseInt(g.css("padding-left"))-parseInt(g.css("padding-right")))}}}},selected:function(){var b=g&&g.filter("."+f.ACTIVE).removeClass(f.ACTIVE);return b&&b.length&&a.data(b[0],"ac_data")},emptyList:function(){m&&m.empty()},unbind:function(){l&&l.remove()}}};a.Autocompleter.Selection=function(a,b,c){if(a.createTextRange){var d=a.createTextRange();d.collapse(true);d.moveStart("character",b);d.moveEnd("character",c);d.select()}else if(a.setSelectionRange){a.setSelectionRange(b,c)}else{if(a.selectionStart){a.selectionStart=b;a.selectionEnd=c}}a.focus()}})(jQuery);
 
 //Timeago
 (function(a){function f(a){return(new Date).getTime()-a.getTime()}function e(a){return b.inWords(f(a))}function d(b){b=a(b);var c=a.trim(b.attr("id"));if(!b.data("timeago")){b.data("timeago",{datetime:new Date(c*1e3)})}return b.data("timeago")}function c(){var b=d(this);if(!isNaN(b.datetime)){a(this).text(e(b.datetime))}return this}a.timeago=function(a){if(a instanceof Date){return e(a)}};var b=a.timeago;a.extend(a.timeago,{settings:{refreshMillis:6e4,allowFuture:false,strings:{prefixAgo:null,prefixFromNow:null,suffixAgo:"ago",suffixFromNow:"from now",seconds:"%d seconds",minute:"about a minute",minutes:"%d minutes",hour:"about an hour",hours:"about %d hours",day:"a day",days:"%d days",month:"about a month",months:"%d months",year:"about a year",years:"%d years",numbers:[]}},inWords:function(b){function k(d,e){var f=a.isFunction(d)?d(e,b):d;var g=c.numbers&&c.numbers[e]||e;return f.replace(/%d/i,g)}var c=this.settings.strings;var d=c.prefixAgo;var e=c.suffixAgo;if(this.settings.allowFuture){if(b<0){d=c.prefixFromNow;e=c.suffixFromNow}b=Math.abs(b)}var f=b/1e3;var g=f/60;var h=g/60;var i=h/24;var j=i/365;var l=f<45&&k(c.seconds,Math.round(f))||f<90&&k(c.minute,1)||g<45&&k(c.minutes,Math.round(g))||g<90&&k(c.hour,1)||h<24&&k(c.hours,Math.round(h))||h<48&&k(c.day,1)||i<30&&k(c.days,Math.floor(i))||i<60&&k(c.month,1)||i<365&&k(c.months,Math.floor(i/30))||j<2&&k(c.year,1)||k(c.years,Math.floor(j));return a.trim([d,l,e].join(" "))}});a.fn.timeago=function(){var a=this;a.each(c);var d=b.settings;if(d.refreshMillis>0){setInterval(function(){a.each(c)},d.refreshMillis)}return a}})(jQuery);
@@ -42,4 +749,4 @@ jQuery.cookie=function(name,value,options){if(typeof value!='undefined'){options
 (function(a){a.extend(a.fn,{caret:function(a,b){var c=this[0];if(c){if(typeof a=="undefined"){if(c.selectionStart){a=c.selectionStart;b=c.selectionEnd}else if(document.selection){var d=this.val();var e=document.selection.createRange().duplicate();e.moveEnd("character",d.length);a=e.text==""?d.length:d.lastIndexOf(e.text);e=document.selection.createRange().duplicate();e.moveStart("character",-d.length);b=e.text.length}}else{var d=this.val();if(typeof a!="number")a=-1;if(typeof b!="number")b=-1;if(a<0)a=0;if(b>d.length)b=d.length;if(b<a)b=a;if(a>b)a=b;c.focus();if(c.selectionStart){c.selectionStart=a;c.selectionEnd=b}else if(document.selection){var e=c.createTextRange();e.collapse(true);e.moveStart("character",a);e.moveEnd("character",b-a);e.select()}}return{start:a,end:b}}}})})(jQuery);
 
 //ajaxFileupload
-jQuery.extend({createUploadIframe:function(a,b){var c="jUploadFrame"+a;var d='<iframe id="'+c+'" name="'+c+'" style="position:absolute; top:-9999px; left:-9999px"';if(window.ActiveXObject){if(typeof b=="boolean"){d+=' src="'+"javascript:false"+'"'}else if(typeof b=="string"){d+=' src="'+b+'"'}}d+=" />";jQuery(d).appendTo(document.body);return jQuery("#"+c).get(0)},createUploadForm:function(a,b,c){var d="jUploadForm"+a;var e="jUploadFile"+a;var f=jQuery('<form  action="" method="POST" name="'+d+'" id="'+d+'" enctype="multipart/form-data"></form>');if(c){for(var g in c){jQuery('<input type="hidden" name="'+g+'" value="'+c[g]+'" />').appendTo(f)}}var h=jQuery("#"+b);var i=jQuery(h).clone();jQuery(h).attr("id",e);jQuery(h).before(i);jQuery(h).appendTo(f);jQuery(f).css("position","absolute");jQuery(f).css("top","-1200px");jQuery(f).css("left","-1200px");jQuery(f).appendTo("body");return f},ajaxFileUpload:function(a){a=jQuery.extend({},jQuery.ajaxSettings,a);var b=(new Date).getTime();var c=jQuery.createUploadForm(b,a.fileElementId,typeof a.data=="undefined"?false:a.data);var d=jQuery.createUploadIframe(b,a.secureuri);var e="jUploadFrame"+b;var f="jUploadForm"+b;if(a.global&&!(jQuery.active++)){jQuery.event.trigger("ajaxStart")}var g=false;var h={};if(a.global)jQuery.event.trigger("ajaxSend",[h,a]);var i=function(b){var d=document.getElementById(e);try{if(d.contentWindow){h.responseText=d.contentWindow.document.body?d.contentWindow.document.body.innerHTML:null;h.responseXML=d.contentWindow.document.XMLDocument?d.contentWindow.document.XMLDocument:d.contentWindow.document}else if(d.contentDocument){h.responseText=d.contentDocument.document.body?d.contentDocument.document.body.innerHTML:null;h.responseXML=d.contentDocument.document.XMLDocument?d.contentDocument.document.XMLDocument:d.contentDocument.document}}catch(f){jQuery.handleError(a,h,null,f)}if(h||b=="timeout"){g=true;var i;try{i=b!="timeout"?"success":"error";if(i!="error"){var j=jQuery.uploadHttpData(h,a.dataType);if(a.success)a.success(j,i);if(a.global)jQuery.event.trigger("ajaxSuccess",[h,a])}else jQuery.handleError(a,h,i)}catch(f){i="error";jQuery.handleError(a,h,i,f)}if(a.global)jQuery.event.trigger("ajaxComplete",[h,a]);if(a.global&&!--jQuery.active)jQuery.event.trigger("ajaxStop");if(a.complete)a.complete(h,i);jQuery(d).unbind();setTimeout(function(){try{jQuery(d).remove();jQuery(c).remove()}catch(b){jQuery.handleError(a,h,null,b)}},100);h=null}};if(a.timeout>0){setTimeout(function(){if(!g)i("timeout")},a.timeout)}try{var c=jQuery("#"+f);jQuery(c).attr("action",a.url);jQuery(c).attr("method","POST");jQuery(c).attr("target",e);if(c.encoding){jQuery(c).attr("encoding","multipart/form-data")}else{jQuery(c).attr("enctype","multipart/form-data")}jQuery(c).submit()}catch(j){jQuery.handleError(a,h,null,j)}jQuery("#"+e).load(i);return{abort:function(){}}},uploadHttpData:function(r,type){var data=!type;data=type=="xml"||data?r.responseXML:r.responseText;if(type=="script")jQuery.globalEval(data);if(type=="json")eval("data = "+data);if(type=="html")jQuery("<div>").html(data).evalScripts();return data}});
\ No newline at end of file
+jQuery.extend({createUploadIframe:function(a,b){var c="jUploadFrame"+a;var d='<iframe id="'+c+'" name="'+c+'" style="position:absolute; top:-9999px; left:-9999px"';if(window.ActiveXObject){if(typeof b=="boolean"){d+=' src="'+"javascript:false"+'"'}else if(typeof b=="string"){d+=' src="'+b+'"'}}d+=" />";jQuery(d).appendTo(document.body);return jQuery("#"+c).get(0)},createUploadForm:function(a,b,c){var d="jUploadForm"+a;var e="jUploadFile"+a;var f=jQuery('<form  action="" method="POST" name="'+d+'" id="'+d+'" enctype="multipart/form-data"></form>');if(c){for(var g in c){jQuery('<input type="hidden" name="'+g+'" value="'+c[g]+'" />').appendTo(f)}}var h=jQuery("#"+b);var i=jQuery(h).clone();jQuery(h).attr("id",e);jQuery(h).before(i);jQuery(h).appendTo(f);jQuery(f).css("position","absolute");jQuery(f).css("top","-1200px");jQuery(f).css("left","-1200px");jQuery(f).appendTo("body");return f},ajaxFileUpload:function(a){a=jQuery.extend({},jQuery.ajaxSettings,a);var b=(new Date).getTime();var c=jQuery.createUploadForm(b,a.fileElementId,typeof a.data=="undefined"?false:a.data);var d=jQuery.createUploadIframe(b,a.secureuri);var e="jUploadFrame"+b;var f="jUploadForm"+b;if(a.global&&!(jQuery.active++)){jQuery.event.trigger("ajaxStart")}var g=false;var h={};if(a.global)jQuery.event.trigger("ajaxSend",[h,a]);var i=function(b){var d=document.getElementById(e);try{if(d.contentWindow){h.responseText=d.contentWindow.document.body?d.contentWindow.document.body.innerHTML:null;h.responseXML=d.contentWindow.document.XMLDocument?d.contentWindow.document.XMLDocument:d.contentWindow.document}else if(d.contentDocument){h.responseText=d.contentDocument.document.body?d.contentDocument.document.body.innerHTML:null;h.responseXML=d.contentDocument.document.XMLDocument?d.contentDocument.document.XMLDocument:d.contentDocument.document}}catch(f){jQuery.handleError(a,h,null,f)}if(h||b=="timeout"){g=true;var i;try{i=b!="timeout"?"success":"error";if(i!="error"){var j=jQuery.uploadHttpData(h,a.dataType);if(a.success)a.success(j,i);if(a.global)jQuery.event.trigger("ajaxSuccess",[h,a])}else jQuery.handleError(a,h,i)}catch(f){i="error";jQuery.handleError(a,h,i,f)}if(a.global)jQuery.event.trigger("ajaxComplete",[h,a]);if(a.global&&!--jQuery.active)jQuery.event.trigger("ajaxStop");if(a.complete)a.complete(h,i);jQuery(d).unbind();setTimeout(function(){try{jQuery(d).remove();jQuery(c).remove()}catch(b){jQuery.handleError(a,h,null,b)}},100);h=null}};if(a.timeout>0){setTimeout(function(){if(!g)i("timeout")},a.timeout)}try{var c=jQuery("#"+f);jQuery(c).attr("action",a.url);jQuery(c).attr("method","POST");jQuery(c).attr("target",e);if(c.encoding){jQuery(c).attr("encoding","multipart/form-data")}else{jQuery(c).attr("enctype","multipart/form-data")}jQuery(c).submit()}catch(j){jQuery.handleError(a,h,null,j)}jQuery("#"+e).load(i);return{abort:function(){}}},uploadHttpData:function(r,type){var data=!type;data=type=="xml"||data?r.responseXML:r.responseText;if(type=="script")jQuery.globalEval(data);if(type=="json")eval("data = "+data);if(type=="html")jQuery("<div>").html(data).evalScripts();return data}});
diff --git a/js/jquery.plugins.js b/js/jquery.plugins.js
deleted file mode 100644
index 8abb4dc..0000000
--- a/js/jquery.plugins.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/*!
- * jQuery Plugins Package for Rabr
- * https://rabr.in/
- *
- * Copyright 2010, Plugins Authors
- * Packaged by disinfeqt
- * http://www.zdxia.com/
- * 
- * Currently including:
- * - Cookie
- * - Color
- * - Tipsy
- * - Lazy Load
- * - Marquee
- */
-
-//Cookie
-jQuery.cookie=function(name,value,options){if(typeof value!='undefined'){options=options||{};if(value===null){value='';options=$.extend({},options);options.expires=-1}var expires='';if(options.expires&&(typeof options.expires=='number'||options.expires.toUTCString)){var date;if(typeof options.expires=='number'){date=new Date();date.setTime(date.getTime()+(options.expires*24*60*60*1000))}else{date=options.expires}expires='; expires='+date.toUTCString()}var path=options.path?'; path='+(options.path):'';var domain=options.domain?'; domain='+(options.domain):'';var secure=options.secure?'; secure':'';document.cookie=[name,'=',encodeURIComponent(value),expires,path,domain,secure].join('')}else{var cookieValue=null;if(document.cookie&&document.cookie!=''){var cookies=document.cookie.split(';');for(var i=0;i<cookies.length;i++){var cookie=jQuery.trim(cookies[i]);if(cookie.substring(0,name.length+1)==(name+'=')){cookieValue=decodeURIComponent(cookie.substring(name.length+1));break}}}return cookieValue}};
-
-//Color
-(function(d){d.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor","borderTopColor","color","outlineColor"],function(f,e){d.fx.step[e]=function(g){if(!g.colorInit){g.start=c(g.elem,e);g.end=b(g.end);g.colorInit=true}g.elem.style[e]="rgb("+[Math.max(Math.min(parseInt((g.pos*(g.end[0]-g.start[0]))+g.start[0]),255),0),Math.max(Math.min(parseInt((g.pos*(g.end[1]-g.start[1]))+g.start[1]),255),0),Math.max(Math.min(parseInt((g.pos*(g.end[2]-g.start[2]))+g.start[2]),255),0)].join(",")+")"}});function b(f){var e;if(f&&f.constructor==Array&&f.length==3){return f}if(e=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(f)){return[parseInt(e[1]),parseInt(e[2]),parseInt(e[3])]}if(e=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(f)){return[parseFloat(e[1])*2.55,parseFloat(e[2])*2.55,parseFloat(e[3])*2.55]}if(e=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(f)){return[parseInt(e[1],16),parseInt(e[2],16),parseInt(e[3],16)]}if(e=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(f)){return[parseInt(e[1]+e[1],16),parseInt(e[2]+e[2],16),parseInt(e[3]+e[3],16)]}if(e=/rgba\(0, 0, 0, 0\)/.exec(f)){return a.transparent}return a[d.trim(f).toLowerCase()]}function c(g,e){var f;do{f=d.curCSS(g,e);if(f!=""&&f!="transparent"||d.nodeName(g,"body")){break}e="backgroundColor"}while(g=g.parentNode);return b(f)}var a={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0],transparent:[255,255,255]}})(jQuery);
-
-//Tipsy
-(function($){$.fn.tipsy=function(options){options=$.extend({},$.fn.tipsy.defaults,options);return this.each(function(){var opts=$.fn.tipsy.elementOptions(this,options);$(this).hover(function(){$.data(this,'cancel.tipsy',true);var tip=$.data(this,'active.tipsy');if(!tip){tip=$('<div class="tipsy"><div class="tipsy-inner"/></div>');tip.css({position:'absolute',zIndex:100000});$.data(this,'active.tipsy',tip);}
-if($(this).attr('title')||typeof($(this).attr('original-title'))!='string'){$(this).attr('original-title',$(this).attr('title')||'').removeAttr('title');}
-var title;if(typeof opts.title=='string'){title=$(this).attr(opts.title=='title'?'original-title':opts.title);}else if(typeof opts.title=='function'){title=opts.title.call(this);}
-tip.find('.tipsy-inner')[opts.html?'html':'text'](title||opts.fallback);var pos=$.extend({},$(this).offset(),{width:this.offsetWidth,height:this.offsetHeight});tip.get(0).className='tipsy';tip.remove().css({top:0,left:0,visibility:'hidden',display:'block'}).appendTo(document.body);var actualWidth=tip[0].offsetWidth,actualHeight=tip[0].offsetHeight;var gravity=(typeof opts.gravity=='function')?opts.gravity.call(this):opts.gravity;switch(gravity.charAt(0)){case'n':tip.css({top:pos.top+pos.height,left:pos.left+pos.width/2-actualWidth/2}).addClass('tipsy-north');break;case's':tip.css({top:pos.top-actualHeight,left:pos.left+pos.width/2-actualWidth/2}).addClass('tipsy-south');break;case'e':tip.css({top:pos.top+pos.height/2-actualHeight/2,left:pos.left-actualWidth}).addClass('tipsy-east');break;case'w':tip.css({top:pos.top+pos.height/2-actualHeight/2,left:pos.left+pos.width}).addClass('tipsy-west');break;}
-if(opts.fade){tip.css({opacity:0,display:'block',visibility:'visible'}).animate({opacity:0.8});}else{tip.css({visibility:'visible'});}},function(){$.data(this,'cancel.tipsy',false);var self=this;setTimeout(function(){if($.data(this,'cancel.tipsy'))return;var tip=$.data(self,'active.tipsy');if(opts.fade){tip.stop().fadeOut(function(){$(this).remove();});}else{tip.remove();}},100);});});};$.fn.tipsy.elementOptions=function(ele,options){return $.metadata?$.extend({},options,$(ele).metadata()):options;};$.fn.tipsy.defaults={fade:false,fallback:'',gravity:'n',html:false,title:'title'};$.fn.tipsy.autoNS=function(){return $(this).offset().top>($(document).scrollTop()+$(window).height()/2)?'s':'n';};$.fn.tipsy.autoWE=function(){return $(this).offset().left>($(document).scrollLeft()+$(window).width()/2)?'e':'w';};})(jQuery);
-
-//Lazy Load
-(function($){$.fn.lazyload=function(options){var settings={threshold:0,failurelimit:0,event:"scroll",effect:"show",container:window};if(options){$.extend(settings,options);}
-var elements=this;if("scroll"==settings.event){$(settings.container).bind("scroll",function(event){var counter=0;elements.each(function(){if($.abovethetop(this,settings)||$.leftofbegin(this,settings)){}else if(!$.belowthefold(this,settings)&&!$.rightoffold(this,settings)){$(this).trigger("appear");}else{if(counter++>settings.failurelimit){return false;}}});var temp=$.grep(elements,function(element){return!element.loaded;});elements=$(temp);});}
-this.each(function(){var self=this;if(undefined==$(self).attr("original")){$(self).attr("original",$(self).attr("src"));}
-if("scroll"!=settings.event||undefined==$(self).attr("src")||settings.placeholder==$(self).attr("src")||($.abovethetop(self,settings)||$.leftofbegin(self,settings)||$.belowthefold(self,settings)||$.rightoffold(self,settings))){if(settings.placeholder){$(self).attr("src",settings.placeholder);}else{$(self).removeAttr("src");}
-self.loaded=false;}else{self.loaded=true;}
-$(self).one("appear",function(){if(!this.loaded){$("<img />").bind("load",function(){$(self).hide().attr("src",$(self).attr("original"))
-[settings.effect](settings.effectspeed);self.loaded=true;}).attr("src",$(self).attr("original"));};});if("scroll"!=settings.event){$(self).bind(settings.event,function(event){if(!self.loaded){$(self).trigger("appear");}});}});$(settings.container).trigger(settings.event);return this;};$.belowthefold=function(element,settings){if(settings.container===undefined||settings.container===window){var fold=$(window).height()+$(window).scrollTop();}else{var fold=$(settings.container).offset().top+$(settings.container).height();}
-return fold<=$(element).offset().top-settings.threshold;};$.rightoffold=function(element,settings){if(settings.container===undefined||settings.container===window){var fold=$(window).width()+$(window).scrollLeft();}else{var fold=$(settings.container).offset().left+$(settings.container).width();}
-return fold<=$(element).offset().left-settings.threshold;};$.abovethetop=function(element,settings){if(settings.container===undefined||settings.container===window){var fold=$(window).scrollTop();}else{var fold=$(settings.container).offset().top;}
-return fold>=$(element).offset().top+settings.threshold+$(element).height();};$.leftofbegin=function(element,settings){if(settings.container===undefined||settings.container===window){var fold=$(window).scrollLeft();}else{var fold=$(settings.container).offset().left;}
-return fold>=$(element).offset().left+settings.threshold+$(element).width();};$.extend($.expr[':'],{"below-the-fold":"$.belowthefold(a, {threshold : 0, container: window})","above-the-fold":"!$.belowthefold(a, {threshold : 0, container: window})","right-of-fold":"$.rightoffold(a, {threshold : 0, container: window})","left-of-fold":"!$.rightoffold(a, {threshold : 0, container: window})"});})(jQuery);
-
-//Marquee
-(function($){$.fn.rabrMarquee=function(options){var opts=$.extend({},$.fn.rabrMarquee.defaults,options);return this.each(function(){var $marquee=$(this);var _scrollObj=$marquee.get(0);var scrollW=$marquee.width();var scrollH=$marquee.height();var $element=$marquee.children();var $kids=$element.children();var scrollSize=0;var _type=(opts.direction=='left'||opts.direction=='right')?1:0;$element.css(_type?'width':'height',10000);if(opts.isEqual){scrollSize=$kids[_type?'outerWidth':'outerHeight']()*$kids.length;}else{$kids.each(function(){scrollSize+=$(this)[_type?'outerWidth':'outerHeight']();});}
-if(scrollSize<(_type?scrollW:scrollH))return;$element.append($kids.clone()).css(_type?'width':'height',scrollSize*2);var numMoved=0;function scrollFunc(){var _dir=(opts.direction=='left'||opts.direction=='right')?'scrollLeft':'scrollTop';if(opts.loop>0){numMoved+=opts.scrollAmount;if(numMoved>scrollSize*opts.loop){_scrollObj[_dir]=0;return clearInterval(moveId);}}
-if(opts.direction=='left'||opts.direction=='up'){_scrollObj[_dir]+=opts.scrollAmount;if(_scrollObj[_dir]>=scrollSize){_scrollObj[_dir]=0;}}else{_scrollObj[_dir]-=opts.scrollAmount;if(_scrollObj[_dir]<=0){_scrollObj[_dir]=scrollSize;}}}
-var moveId=setInterval(scrollFunc,opts.scrollDelay);$marquee.hover(function(){clearInterval(moveId);},function(){clearInterval(moveId);moveId=setInterval(scrollFunc,opts.scrollDelay);});});};$.fn.rabrMarquee.defaults={isEqual:true,loop:0,direction:'left',scrollAmount:1,scrollDelay:20};$.fn.rabrMarquee.setDefaults=function(settings){$.extend($.fn.rabrMarquee.defaults,settings);};})(jQuery);
\ No newline at end of file
diff --git a/js/jquery.tools.min.js b/js/jquery.tools.min.js
deleted file mode 100644
index d2347b9..0000000
--- a/js/jquery.tools.min.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * jquery.tools 1.1.2 - The missing UI library for the Web
- * 
- * [tools.tooltip-1.1.3, tools.overlay-1.1.2, tools.expose-1.0.5]
- * 
- * Copyright (c) 2009 Tero Piirainen
- * http://flowplayer.org/tools/
- *
- * Dual licensed under MIT and GPL 2+ licenses
- * http://www.opensource.org/licenses
- * 
- * -----
- * 
- * File generated: Thu Dec 24 07:22:44 GMT 2009
- */
-(function(c){var d=[];c.tools=c.tools||{};c.tools.tooltip={version:"1.1.3",conf:{effect:"toggle",fadeOutSpeed:"fast",tip:null,predelay:0,delay:30,opacity:1,lazy:undefined,position:["top","center"],offset:[0,0],cancelDefault:true,relative:false,oneInstance:true,events:{def:"mouseover,mouseout",input:"focus,blur",widget:"focus mouseover,blur mouseout",tooltip:"mouseover,mouseout"},api:false},addEffect:function(e,g,f){b[e]=[g,f]}};var b={toggle:[function(e){var f=this.getConf(),g=this.getTip(),h=f.opacity;if(h<1){g.css({opacity:h})}g.show();e.call()},function(e){this.getTip().hide();e.call()}],fade:[function(e){this.getTip().fadeIn(this.getConf().fadeInSpeed,e)},function(e){this.getTip().fadeOut(this.getConf().fadeOutSpeed,e)}]};function a(f,g){var p=this,k=c(this);f.data("tooltip",p);var l=f.next();if(g.tip){l=c(g.tip);if(l.length>1){l=f.nextAll(g.tip).eq(0);if(!l.length){l=f.parent().nextAll(g.tip).eq(0)}}}function o(u){var t=g.relative?f.position().top:f.offset().top,s=g.relative?f.position().left:f.offset().left,v=g.position[0];t-=l.outerHeight()-g.offset[0];s+=f.outerWidth()+g.offset[1];var q=l.outerHeight()+f.outerHeight();if(v=="center"){t+=q/2}if(v=="bottom"){t+=q}v=g.position[1];var r=l.outerWidth()+f.outerWidth();if(v=="center"){s-=r/2}if(v=="left"){s-=r}return{top:t,left:s}}var i=f.is(":input"),e=i&&f.is(":checkbox, :radio, select, :button"),h=f.attr("type"),n=g.events[h]||g.events[i?(e?"widget":"input"):"def"];n=n.split(/,\s*/);if(n.length!=2){throw"Tooltip: bad events configuration for "+h}f.bind(n[0],function(r){if(g.oneInstance){c.each(d,function(){this.hide()})}var q=l.data("trigger");if(q&&q[0]!=this){l.hide().stop(true,true)}r.target=this;p.show(r);n=g.events.tooltip.split(/,\s*/);l.bind(n[0],function(){p.show(r)});if(n[1]){l.bind(n[1],function(){p.hide(r)})}});f.bind(n[1],function(q){p.hide(q)});if(!c.browser.msie&&!i&&!g.predelay){f.mousemove(function(){if(!p.isShown()){f.triggerHandler("mouseover")}})}if(g.opacity<1){l.css("opacity",g.opacity)}var m=0,j=f.attr("title");if(j&&g.cancelDefault){f.removeAttr("title");f.data("title",j)}c.extend(p,{show:function(r){if(r){f=c(r.target)}clearTimeout(l.data("timer"));if(l.is(":animated")||l.is(":visible")){return p}function q(){l.data("trigger",f);var t=o(r);if(g.tip&&j){l.html(f.data("title"))}r=r||c.Event();r.type="onBeforeShow";k.trigger(r,[t]);if(r.isDefaultPrevented()){return p}t=o(r);l.css({position:"absolute",top:t.top,left:t.left});var s=b[g.effect];if(!s){throw'Nonexistent effect "'+g.effect+'"'}s[0].call(p,function(){r.type="onShow";k.trigger(r)})}if(g.predelay){clearTimeout(m);m=setTimeout(q,g.predelay)}else{q()}return p},hide:function(r){clearTimeout(l.data("timer"));clearTimeout(m);if(!l.is(":visible")){return}function q(){r=r||c.Event();r.type="onBeforeHide";k.trigger(r);if(r.isDefaultPrevented()){return}b[g.effect][1].call(p,function(){r.type="onHide";k.trigger(r)})}if(g.delay&&r){l.data("timer",setTimeout(q,g.delay))}else{q()}return p},isShown:function(){return l.is(":visible, :animated")},getConf:function(){return g},getTip:function(){return l},getTrigger:function(){return f},bind:function(q,r){k.bind(q,r);return p},onHide:function(q){return this.bind("onHide",q)},onBeforeShow:function(q){return this.bind("onBeforeShow",q)},onShow:function(q){return this.bind("onShow",q)},onBeforeHide:function(q){return this.bind("onBeforeHide",q)},unbind:function(q){k.unbind(q);return p}});c.each(g,function(q,r){if(c.isFunction(r)){p.bind(q,r)}})}c.prototype.tooltip=function(e){var f=this.eq(typeof e=="number"?e:0).data("tooltip");if(f){return f}var g=c.extend(true,{},c.tools.tooltip.conf);if(c.isFunction(e)){e={onBeforeShow:e}}else{if(typeof e=="string"){e={tip:e}}}e=c.extend(true,g,e);if(typeof e.position=="string"){e.position=e.position.split(/,?\s/)}if(e.lazy!==false&&(e.lazy===true||this.length>20)){this.one("mouseover",function(h){f=new a(c(this),e);f.show(h);d.push(f)})}else{this.each(function(){f=new a(c(this),e);d.push(f)})}return e.api?f:this}})(jQuery);
-(function(c){c.tools=c.tools||{};c.tools.overlay={version:"1.1.2",addEffect:function(e,f,g){b[e]=[f,g]},conf:{top:"10%",left:"center",absolute:false,speed:"normal",closeSpeed:"fast",effect:"default",close:null,oneInstance:true,closeOnClick:true,closeOnEsc:true,api:false,expose:null,target:null}};var b={};c.tools.overlay.addEffect("default",function(e){this.getOverlay().fadeIn(this.getConf().speed,e)},function(e){this.getOverlay().fadeOut(this.getConf().closeSpeed,e)});var d=[];function a(g,k){var o=this,m=c(this),n=c(window),j,i,h,e=k.expose&&c.tools.expose.version;var f=k.target||g.attr("rel");i=f?c(f):null||g;if(!i.length){throw"Could not find Overlay: "+f}if(g&&g.index(i)==-1){g.click(function(p){o.load(p);return p.preventDefault()})}c.each(k,function(p,q){if(c.isFunction(q)){m.bind(p,q)}});c.extend(o,{load:function(u){if(o.isOpened()){return o}var r=b[k.effect];if(!r){throw'Overlay: cannot find effect : "'+k.effect+'"'}if(k.oneInstance){c.each(d,function(){this.close(u)})}u=u||c.Event();u.type="onBeforeLoad";m.trigger(u);if(u.isDefaultPrevented()){return o}h=true;if(e){i.expose().load(u)}var t=k.top;var s=k.left;var p=i.outerWidth({margin:true});var q=i.outerHeight({margin:true});if(typeof t=="string"){t=t=="center"?Math.max((n.height()-q)/2,0):parseInt(t,10)/100*n.height()}if(s=="center"){s=Math.max((n.width()-p)/2,0)}if(!k.absolute){t+=n.scrollTop();s+=n.scrollLeft()}i.css({top:t,left:s,position:"absolute"});u.type="onStart";m.trigger(u);r[0].call(o,function(){if(h){u.type="onLoad";m.trigger(u)}});if(k.closeOnClick){c(document).bind("click.overlay",function(w){if(!o.isOpened()){return}var v=c(w.target);if(v.parents(i).length>1){return}c.each(d,function(){this.close(w)})})}if(k.closeOnEsc){c(document).unbind("keydown.overlay").bind("keydown.overlay",function(v){if(v.keyCode==27){c.each(d,function(){this.close(v)})}})}return o},close:function(q){if(!o.isOpened()){return o}q=q||c.Event();q.type="onBeforeClose";m.trigger(q);if(q.isDefaultPrevented()){return}h=false;b[k.effect][1].call(o,function(){q.type="onClose";m.trigger(q)});var p=true;c.each(d,function(){if(this.isOpened()){p=false}});if(p){c(document).unbind("click.overlay").unbind("keydown.overlay")}return o},getContent:function(){return i},getOverlay:function(){return i},getTrigger:function(){return g},getClosers:function(){return j},isOpened:function(){return h},getConf:function(){return k},bind:function(p,q){m.bind(p,q);return o},unbind:function(p){m.unbind(p);return o}});c.each("onBeforeLoad,onStart,onLoad,onBeforeClose,onClose".split(","),function(p,q){o[q]=function(r){return o.bind(q,r)}});if(e){if(typeof k.expose=="string"){k.expose={color:k.expose}}c.extend(k.expose,{api:true,closeOnClick:k.closeOnClick,closeOnEsc:false});var l=i.expose(k.expose);l.onBeforeClose(function(p){o.close(p)});o.onClose(function(p){l.close(p)})}j=i.find(k.close||".close");if(!j.length&&!k.close){j=c('<div class="close"></div>');i.prepend(j)}j.click(function(p){o.close(p)})}c.fn.overlay=function(e){var f=this.eq(typeof e=="number"?e:0).data("overlay");if(f){return f}if(c.isFunction(e)){e={onBeforeLoad:e}}var g=c.extend({},c.tools.overlay.conf);e=c.extend(true,g,e);this.each(function(){f=new a(c(this),e);d.push(f);c(this).data("overlay",f)});return e.api?f:this}})(jQuery);
-(function(b){b.tools=b.tools||{};b.tools.expose={version:"1.0.5",conf:{maskId:null,loadSpeed:"slow",closeSpeed:"fast",closeOnClick:true,closeOnEsc:true,zIndex:9998,opacity:0.8,color:"#456",api:false}};function a(){if(b.browser.msie){var f=b(document).height(),e=b(window).height();return[window.innerWidth||document.documentElement.clientWidth||document.body.clientWidth,f-e<20?e:f]}return[b(window).width(),b(document).height()]}function c(h,g){var e=this,j=b(this),d=null,f=false,i=0;b.each(g,function(k,l){if(b.isFunction(l)){j.bind(k,l)}});b(window).resize(function(){e.fit()});b.extend(this,{getMask:function(){return d},getExposed:function(){return h},getConf:function(){return g},isLoaded:function(){return f},load:function(n){if(f){return e}i=h.eq(0).css("zIndex");if(g.maskId){d=b("#"+g.maskId)}if(!d||!d.length){var l=a();d=b("<div/>").css({position:"absolute",top:0,left:0,width:l[0],height:l[1],display:"none",opacity:0,zIndex:g.zIndex});if(g.maskId){d.attr("id",g.maskId)}b("body").append(d);var k=d.css("backgroundColor");if(!k||k=="transparent"||k=="rgba(0, 0, 0, 0)"){d.css("backgroundColor",g.color)}if(g.closeOnEsc){b(document).bind("keydown.unexpose",function(o){if(o.keyCode==27){e.close()}})}if(g.closeOnClick){d.bind("click.unexpose",function(o){e.close(o)})}}n=n||b.Event();n.type="onBeforeLoad";j.trigger(n);if(n.isDefaultPrevented()){return e}b.each(h,function(){var o=b(this);if(!/relative|absolute|fixed/i.test(o.css("position"))){o.css("position","relative")}});h.css({zIndex:Math.max(g.zIndex+1,i=="auto"?0:i)});var m=d.height();if(!this.isLoaded()){d.css({opacity:0,display:"block"}).fadeTo(g.loadSpeed,g.opacity,function(){if(d.height()!=m){d.css("height",m)}n.type="onLoad";j.trigger(n)})}f=true;return e},close:function(k){if(!f){return e}k=k||b.Event();k.type="onBeforeClose";j.trigger(k);if(k.isDefaultPrevented()){return e}d.fadeOut(g.closeSpeed,function(){k.type="onClose";j.trigger(k);h.css({zIndex:b.browser.msie?i:null})});f=false;return e},fit:function(){if(d){var k=a();d.css({width:k[0],height:k[1]})}},bind:function(k,l){j.bind(k,l);return e},unbind:function(k){j.unbind(k);return e}});b.each("onBeforeLoad,onLoad,onBeforeClose,onClose".split(","),function(k,l){e[l]=function(m){return e.bind(l,m)}})}b.fn.expose=function(d){var e=this.eq(typeof d=="number"?d:0).data("expose");if(e){return e}if(typeof d=="string"){d={color:d}}var f=b.extend({},b.tools.expose.conf);d=b.extend(f,d);this.each(function(){e=new c(b(this),d);b(this).data("expose",e)});return d.api?e:this}})(jQuery);
diff --git a/js/list.js b/js/list.js
index 21bb4a3..969479b 100644
--- a/js/list.js
+++ b/js/list.js
@@ -1,128 +1,128 @@
-$(function(){
-	$(".rt_btn").click(function(e){
-		e.preventDefault();
-		if ($("#textbox").length > 0) {
-			onRT($(this));
-		} else {
-			$("#info_head").after('<h2>What are you doing?</h2>' + formHTML);
-			formFunc();
-			onRT($(this));
-		}
-	});
-	$(".retw_btn").live("click", function(e){
-			e.preventDefault();
-			onNwRT($(this));
-	});
-	$(".rt_undo").live("click", function(e){
-		e.preventDefault();
-		onUndoRt($(this));
-	});
-	$(".replie_btn").live("click", function(e){
-		e.preventDefault();
-		var replie_id = $(this).parent().parent().find(".status_word").find(".user_name").text();
-		if ($("#textbox").length > 0) {
-			onReplie($(this),e);
-		} else {
-			$("#info_head").after('<h2>In reply to ' + replie_id + '</h2>' + formHTML);
-			formFunc();
-			onReplie($(this),e);
-		}
-	});
-
-	$("#list_send_btn").click(function(e){
-		e.preventDefault();
-		if ($("#textbox").length == 0) {
-			$("#info_head").after('<h2>What are you doing?</h2>' + formHTML);
-		formFunc();
-		}
-	});
-	
-	$(".favor_btn").live("click", function(e){
-		e.preventDefault();
-		onFavor($(this));
-	});
-
-	$("#list_follow_btn").live("click", function(e){
-		e.preventDefault();
-		var $this = $(this);
-		var id = $("#info_name").text();
-		updateSentTip("Following list " + id + "...", 5000, "ing");
-		
-		$.ajax({
-			url: "ajax/list.php",
-			type: "POST",
-			data: "action=create&id=" + id,
-			success: function(msg) {
-				if (msg.indexOf("success") >= 0) {
-					updateSentTip("You have followed " + id + ".", 3000, "success");
-					$this.after('<a class="info_btn_hover" id="list_block_btn" href="#">Unfollow</a>');
-					$this.remove();
-				} else {
-					updateSentTip("Failed to follow list " + id + ".", 3000, "failure");
-				}
-			},
-			error: function(msg) {
-				updateSentTip("Failed to follow list " + id + ".", 3000, "failure");
-			}
-		});
-	});
-	
-	
-	$("#list_block_btn").live("click", function(e){
-		e.preventDefault();
-		var $this = $(this);
-		var id = $("#info_name").text();
-		updateSentTip("Unfollowing list " + id + "...");
-		$.ajax({
-			url: "ajax/list.php",
-			type: "POST",
-			data: "action=destory&id=" + id,
-			success: function(msg) {
-				if (msg.indexOf("success") >= 0) {
-					updateSentTip("You have unfollowed list " + id + ".", 3000, "success");
-					$this.after('<a class="info_btn" id="list_follow_btn" href="javascript:void(0)">Unfollow</a>');
-					$this.remove();
-				} else {
-					updateSentTip("Failed to unfollow list " + id + ".", 3000, "failure");
-				}
-			},
-			error: function(msg) {
-				updateSentTip("Failed to unfollow list " + id + ".", 3000, "failure");
-			}
-		});
-		
-	});
-	
-	document.onclick = function(){
-		document.title =document.title.replace(/(\([0-9]+\))/g, "");
-	}
-	var args = location.href.split("?")[1];	
-	if (!args.split("&")[1] || args.split("&")[1] == "p=1") {
-		setInterval(function(){
-				update();
-		}, 2000*60);
-	}
-});
-
-function update() {
-	var since_id = $(".timeline li:first-child").find(".status_id").text();
-	var list_id = $("#info_name").text();
-	$.ajax({
-		url: "ajax/updateList.php",
-		type: "GET",
-		dataType: "text",
-		data: "id=" + list_id + "&since_id=" + since_id,
-		success: function(msg) {
-			
-			if ($.trim(msg).indexOf("</li>") > 0) {
-				$(".timeline").prepend(msg);
-				var num = 0;
-				if (document.title.match(/\d+/) != null) {
-					num = parseInt(document.title.match(/\d+/));
-				}
-				document.title = "(" + (num+$(msg).length )+ ")" + document.title.replace(/(\([0-9]+\))/g, "");
-			}
-			
-		}
-	});
-}
\ No newline at end of file
+$(function(){
+	$(".rt_btn").click(function(e){
+		e.preventDefault();
+		if ($("#textbox").length > 0) {
+			onRT($(this));
+		} else {
+			$("#info_head").after('<h2>What are you doing?</h2>' + formHTML);
+			formFunc();
+			onRT($(this));
+		}
+	});
+	$(".retw_btn").live("click", function(e){
+			e.preventDefault();
+			onNwRT($(this));
+	});
+	$(".rt_undo").live("click", function(e){
+		e.preventDefault();
+		onUndoRt($(this));
+	});
+	$(".replie_btn").live("click", function(e){
+		e.preventDefault();
+		var replie_id = $(this).parent().parent().find(".status_word").find(".user_name").attr("id");
+		if ($("#textbox").length > 0) {
+			onReplie($(this),e);
+		} else {
+			$("#info_head").after('<h2>In reply to ' + replie_id + '</h2>' + formHTML);
+			formFunc();
+			onReplie($(this),e);
+		}
+	});
+
+	$("#list_send_btn").click(function(e){
+		e.preventDefault();
+		if ($("#textbox").length == 0) {
+			$("#info_head").after('<h2>What are you doing?</h2>' + formHTML);
+		formFunc();
+		}
+	});
+	
+	$(".favor_btn").live("click", function(e){
+		e.preventDefault();
+		onFavor($(this));
+	});
+
+	$("#list_follow_btn").live("click", function(e){
+		e.preventDefault();
+		var $this = $(this);
+		var id = $("#info_name").text();
+		updateSentTip("Following list " + id + "...", 5000, "ing");
+		
+		$.ajax({
+			url: "ajax/list.php",
+			type: "POST",
+			data: "action=create&id=" + id,
+			success: function(msg) {
+				if (msg.indexOf("success") >= 0) {
+					updateSentTip("You have followed " + id + ".", 3000, "success");
+					$this.after('<a class="info_btn_hover" id="list_block_btn" href="#">Unfollow</a>');
+					$this.remove();
+				} else {
+					updateSentTip("Failed to follow list " + id + ".", 3000, "failure");
+				}
+			},
+			error: function(msg) {
+				updateSentTip("Failed to follow list " + id + ".", 3000, "failure");
+			}
+		});
+	});
+	
+	
+	$("#list_block_btn").live("click", function(e){
+		e.preventDefault();
+		var $this = $(this);
+		var id = $("#info_name").text();
+		updateSentTip("Unfollowing list " + id + "...", 5000, "ing");
+		$.ajax({
+			url: "ajax/list.php",
+			type: "POST",
+			data: "action=destory&id=" + id,
+			success: function(msg) {
+				if (msg.indexOf("success") >= 0) {
+					updateSentTip("You have unfollowed list " + id + ".", 3000, "success");
+					$this.after('<a class="info_btn" id="list_follow_btn" href="#">Follow</a>');
+					$this.remove();
+				} else {
+					updateSentTip("Failed to unfollow list " + id + ".", 3000, "failure");
+				}
+			},
+			error: function(msg) {
+				updateSentTip("Failed to unfollow list " + id + ".", 3000, "failure");
+			}
+		});
+		
+	});
+	
+	document.onclick = function(){
+		document.title =document.title.replace(/(\([0-9]+\))/g, "");
+	}
+	var args = location.href.split("?")[1];	
+	if (!args.split("&")[1] || args.split("&")[1] == "p=1") {
+		setInterval(function(){
+				update();
+		}, 2000*60);
+	}
+});
+
+function update() {
+	var since_id = $(".timeline li:first-child").find(".status_id").text();
+	var list_id = $("#info_name").text();
+	$.ajax({
+		url: "ajax/updateList.php",
+		type: "GET",
+		dataType: "text",
+		data: "id=" + list_id + "&since_id=" + since_id,
+		success: function(msg) {
+			
+			if ($.trim(msg).indexOf("</li>") > 0) {
+				$(".timeline").prepend(msg);
+				var num = 0;
+				if (document.title.match(/\d+/) != null) {
+					num = parseInt(document.title.match(/\d+/));
+				}
+				document.title = "(" + (num+$(msg).length )+ ")" + document.title.replace(/(\([0-9]+\))/g, "");
+			}
+			
+		}
+	});
+}
diff --git a/js/list_members.js b/js/list_members.js
index f7d1abe..ec0c2f8 100644
--- a/js/list_members.js
+++ b/js/list_members.js
@@ -1,40 +1,42 @@
-$(function(){
-	$(".delete_btn").hide();
-	$(".rank_list").find("li").live("mouseover", function(){
-		$(this).find(".delete_btn").css("display", "inline-block");
-	});
-	
-	$(".rank_list").find("li").live("mouseout", function(){
-		$(this).find(".delete_btn").hide();
-	});
-	
-	$(".list_delete_btn").click(function(e){
-		e.preventDefault();
-		var $this = $(this);  
-		var list_id = $(".list_id").text();
-		var member_name = $.trim($(this).parent().parent().find(".rank_screenname").text());
-		member_name = member_name.replace("(","").replace(")","");
-		var member_id = $.trim($(this).parent().parent().find("#rank_id").text());
-		
-		var confirm = window.confirm("Are you sure to delete " + member_name + "?");
-		if (confirm) {
-			updateSentTip("Deleting " + member_name + "...", 5000, "ing");
-			$.ajax({
-				url: "ajax/delete.php",
-				type: "POST",
-				data: "id=" + list_id + "&list_member=" + member_id,
-				success: function(msg) {
-					if (msg.indexOf("success") >= 0) {
-						$this.parent().parent().parent().remove();
-						updateSentTip(member_name + " has been deleted.", 3000, "success");
-					} else {
-						updateSentTip("Failed to delete " + member_name + ".", 3000, "failure");
-					}
-				},
-				error: function(msg) {
-					updateSentTip("Failed to delete " + member_name + ".", 3000, "failure");
-				}
-			});
-		}
-	});
-});
+$(function(){
+	$(".delete_btn").hide();
+	$(".rank_list").find("li").live("mouseover", function(){
+		$(this).find(".delete_btn").css("display", "inline-block");
+	});
+	
+	$(".rank_list").find("li").live("mouseout", function(){
+		$(this).find(".delete_btn").hide();
+	});
+	
+	$(".list_delete_btn").click(function(e){
+		e.preventDefault();
+		var $this = $(this);  
+		var lidparts = $(".list_id").text().split("/");
+		var slug = lidparts[1];
+		var owner = lidparts[0].replace("@","");
+		var member_name = $.trim($(this).parent().parent().find(".rank_screenname").text());
+		member_name = member_name.replace("(","").replace(")","");
+		var member_id = $.trim($(this).parent().parent().find("#rank_id").text());
+		
+		var confirm = window.confirm("Are you sure to delete " + member_name + "?");
+		if (confirm) {
+			updateSentTip("Deleting " + member_name + "...", 5000, "ing");
+			$.ajax({
+				url: "ajax/delete.php",
+				type: "POST",
+				data: "slug=" + slug + "&owner=" + owner + "&list_member=" + member_id,
+				success: function(msg) {
+					if (msg.indexOf("success") >= 0) {
+						$this.parent().parent().parent().remove();
+						updateSentTip(member_name + " has been deleted.", 3000, "success");
+					} else {
+						updateSentTip("Failed to delete " + member_name + ".", 3000, "failure");
+					}
+				},
+				error: function(msg) {
+					updateSentTip("Failed to delete " + member_name + ".", 3000, "failure");
+				}
+			});
+		}
+	});
+});
diff --git a/js/lists.js b/js/lists.js
index 77e1a25..845a03e 100644
--- a/js/lists.js
+++ b/js/lists.js
@@ -1,114 +1,205 @@
-$(function(){
-	$(".rt_btn").live("click", function(e){
-		e.preventDefault();
-		onRT($(this));
-	});
-	
-	$(".replie_btn").live("click", function(e){
-		e.preventDefault();
-		onReplie($(this),e);
-	});
-	$(".favor_btn").live("click", function(e){
-		e.preventDefault();
-		onFavor($(this));
-	});
-	$(".unfollow_list").live("click",function(e){
-		e.preventDefault();
-		var $this = $(this);
-		var id = $(this).parent().parent().find(".rank_name").text().substr(1);
-		updateSentTip("Unfollowing lists...", 5000, "ing");
-		$.ajax({
-			url: "ajax/list.php",
-			type: "POST",
-			data: "action=destory&id=" + id,
-			success: function(msg) {
-				if (msg.indexOf("success") >= 0) {
-					updateSentTip("Successfully unfollowing list" + id, 3000, "success");
-					$this.remove();
-				} else {
-					updateSentTip("Unfollow failed. Please try again.", 3000, "failure");
-				}
-			},
-			error: function(msg) {
-				updateSentTip("Unfollow failed. Please try again.", 3000, "failure");
-			}
-		});
-		
-	});
-
-	$(".delete_list").click(function(e){
-		e.preventDefault();
-		var $this = $(this);  
-		var list_id = $(this).parent().parent().find(".rank_name").text().substr(1);
-		var confirm = window.confirm("Do you really want to delete" + list_id + "?");
-		if (confirm) {
-			updateSentTip("deleting list" + list_id + "...", 5000, "ing");
-			$.ajax({
-				url: "ajax/delete.php",
-				type: "POST",
-				data: "list_id=" + list_id,
-				success: function(msg) {
-					if (msg.indexOf("success") >= 0) {
-						$this.parent().parent().parent().remove();
-						updateSentTip("Successfully deleting" + list_id, 3000, "success");
-					} else {
-						updateSentTip("Delete failed. Please try again.", 3000, "failure");
-					}
-				},
-				error: function(msg) {
-					updateSentTip("Delete failed. Please try again.", 3000, "failure");
-				}
-			});
-		}
-	});
-	
-	$("#list_create_btn").click(function(e){
-		e.preventDefault();
-		$("#list_form").toggle("fast");
-		$("#list_name").focus().val("");
-		$("#list_description").val("");
-		$("#list_protect").removeAttr("checked");
-		$("#pre_list_name").val("");
-		$("#is_edit").val(0);
-	});
-	
-	$(".edit_list").click(function(e){
-		e.preventDefault();
-		var parent = $(this).parent().parent();
-		var list_name = parent.find(".rank_name").text().split("/")[1];
-		var list_description = parent.find(".rank_description").text().slice(3);
-		var list_protect = parent.find(".rank_count").text().indexOf("隐私群") > 0;
-
-		$("#list_form").show("fast");
-		$("#list_name").focus().val(list_name);
-		$("#list_description").val(list_description);
-		if (list_protect) { 
-			$("#list_protect").attr("checked", "checked");
-		} else {
-			$("#list_protect").removeAttr("checked");
-		}
-		$("#is_edit").val(1);
-		$("#pre_list_name").val(list_name);
-	})
-	
-	
-	
-	$(".add_member").click(function(e){
-		e.preventDefault();
-		$("#member_form").remove();
-		var position = $(this).position();
-		var liPosition = $(this).parent().parent().parent().position();
-		var list_name = $(this).parent().parent().find(".rank_name").text().split("/")[1];
-		$('<form method="POST" action="./lists.php?t=1" id="member_form">' +
-	    	'<span>User ID:(Saperated with comma, e.g. JLHwung,twitter)</span>' +
-	    	'<span><textarea type="text" name="list_members" id="list_members"></textarea></span>' +
-	    	'<input type="hidden" name="member_list_name" value="' + list_name + '" />' +
-	    	'<span><input type="submit" class="btn" id="member_submit" value="Submit" /> <input type="button" class="btn" id="member_cancel" value="Cancel" /></span>' +
-	    '</form>').appendTo("#statuses").css("left", liPosition.left + position.left).css("top", liPosition.top + position.top + 30);
-		
-		$("#member_cancel").click(function(){
-			$("#member_form").remove();
-		})
-	})
-	
-});
\ No newline at end of file
+$(function(){
+	$(".rt_btn").live("click", function(e){
+		e.preventDefault();
+		onRT($(this));
+	});
+	
+	$(".replie_btn").live("click", function(e){
+		e.preventDefault();
+		onReplie($(this),e);
+	});
+	$(".favor_btn").live("click", function(e){
+		e.preventDefault();
+		onFavor($(this));
+	});
+	$(".unfollow_list").live("click",function(e){
+		e.preventDefault();
+		var $this = $(this);
+		var id = $this.parent().parent().find(".rank_name").text().substr(1);
+		updateSentTip("Unfollowing lists...", 5000, "ing");
+		$.ajax({
+			url: "ajax/list.php",
+			type: "POST",
+			data: "action=destory&id=" + id,
+			success: function(msg) {
+				if (msg.indexOf("success") >= 0) {
+					updateSentTip("Successfully unfollowing list " + id, 3000, "success");
+					$this.parent().parent().parent().fadeOut("fast");
+				} else {
+					updateSentTip("Unfollow failed. Please try again.", 3000, "failure");
+				}
+			},
+			error: function(msg) {
+				updateSentTip("Unfollow failed. Please try again.", 3000, "failure");
+			}
+		});
+		
+	});
+
+	$(".delete_list").live("click", function(e){
+		e.preventDefault();
+		var $this = $(this);  
+		var list_slug = $this.parent().parent().find(".rank_name").text().split("/")[1];
+		var confirm = window.confirm("Do you really want to delete " + list_slug + "?");
+		if (confirm) {
+			updateSentTip("deleting list " + list_slug + "...", 5000, "ing");
+			$.ajax({
+				url: "ajax/delete.php",
+				type: "POST",
+				data: "list_slug=" + list_slug,
+				success: function(msg) {
+					if (msg.indexOf("success") >= 0) {
+						updateSentTip("Successfully deleting " + list_slug, 3000, "success");
+						$this.parent().parent().parent().fadeOut("fast");
+					} else {
+						updateSentTip("Delete failed. Please try again.", 3000, "failure");
+					}
+				},
+				error: function(msg) {
+					updateSentTip("Delete failed. Please try again.", 3000, "failure");
+				}
+			});
+		}
+	});
+	
+	$("#list_create_btn").live("click", function(e){
+		e.preventDefault();
+		$("#list_form").toggle("fast");
+		$("#list_name").focus().val("");
+		$("#list_description").val("");
+		$("#list_protect").removeAttr("checked");
+		$("#pre_list_name").val("");
+		$("#list_spanid").val("");
+		$("#is_edit").val(0);
+		$("#list_submit").val("Create");
+	});
+	
+	$(".edit_list").live("click", function(e){
+		e.preventDefault();
+		var parent = $(this).parent().parent();
+		var list_name = parent.find(".rank_name").text().split("/")[1];
+		var list_description = parent.find(".rank_description").text().slice(5);
+		var list_protect = parent.find(".rank_count").text().indexOf("Private") > 0;
+
+		$("#list_form").show("fast");
+		$("#list_name").focus().val(list_name);
+		$("#list_description").val(list_description);
+		if (list_protect) { 
+			$("#list_protect").attr("checked", "checked");
+		} else {
+			$("#list_protect").removeAttr("checked");
+		}
+		$("#list_spanid").val(parent.attr("id"));
+		$("#is_edit").val(1);
+		$("#list_submit").val("Edit");
+		$("#pre_list_name").val(list_name);
+	})
+	
+	$("#list_submit").live("click", function(e){
+		e.preventDefault();
+		var list_name = $("#list_name").val();
+		if (list_name.length == 0) {
+			window.alert("List name cannot be empty!");
+			return;
+		}
+		$('#list_form').slideToggle(300);
+		var list_description = $("#list_description").val();
+		var list_protect = $("#list_protect").attr("checked") == "checked" ? "private" : "public";
+		var pre_list_name = $("#pre_list_name").val();
+		var is_edit = $("#is_edit").val();
+		var postdata = {"name" : list_name,
+				"description" : list_description,
+				"mode" : list_protect};
+		if (is_edit == 1) {
+			postdata["slug"] = pre_list_name;
+			updateSentTip("editing list " + pre_list_name + "...", 5000, "ing");
+			var spanid = $("#list_spanid").val();
+		} else
+			updateSentTip("creating list " + list_name + "...", 5000, "ing");
+			
+		$.ajax({
+			url: "ajax/modifyList.php",
+			type: "POST",
+			dataType: "json",
+			data: postdata,
+			success: function(msg) {
+				if (msg.result == 'success') {
+					if (is_edit == 1) {
+						updateSentTip("Successfully modifying list " + pre_list_name, 3000, "success");
+						var rank_content = $("#"+spanid);
+						rank_content.find(".rank_name").html('<a href="list.php?id='+msg.listuri+'"><em>'+msg.username+'/</em>'+list_name+'</a>');
+						var rank_count = rank_content.find(".rank_count");
+						rank_count.html(rank_count.html().replace(/Public|Private/, list_protect == "public" ? "Public" : "Private"));
+						rank_content.find(".rank_description").html("Bio: "+list_description);
+					}
+					else {
+						updateSentTip("Successfully creating list " + list_name, 3000, "success");
+						var html = '<li><span class=\"rank_img\"><img src="'+msg.imgurl+'" /></span>';
+						html += '<div class="rank_content" id="'+msg.contentid+'"><span class="rank_num"><span class="rank_name">';
+						html +='<a href="list.php?id='+msg.listuri+'"><em>'+msg.username+'/</em>'+list_name+'</a>';
+						html += '</span></span><span class="rank_count">Followers: 0&nbsp;&nbsp;Members: 0&nbsp;&nbsp;'+(list_protect == "public" ? "Public" : "Private")+'</span>';
+						html += '<span class="rank_description">Bio: '+list_description+'</span>';
+						html += '<span id="list_action"><a id="btn" href="#" class="edit_list">Edit</a> <a id="btn" href="#" class="delete_list">Delete</a> <a id="btn" href="#" class="add_member">Add Members</a></span>';
+						html += "</div></li>";
+						$(html).prependTo($(".rank_list")).fadeIn('fast');
+					}
+				} else {
+					if (is_edit == 1)
+						updateSentTip("Editing failed. Please try again.", 3000, "failure");
+					else
+						updateSentTip("Creating failed. Please try again.", 3000, "failure");
+				}
+			}
+		});
+	});
+	
+	$(".add_member").live("click", function(e){
+		e.preventDefault();
+		$("#member_form").remove();
+		var position = $(this).position();
+		var liPosition = $(this).parent().parent().parent().position();
+		var list_name = $(this).parent().parent().find(".rank_name").text().split("/")[1];
+		var owner_name = $(this).parent().parent().find(".rank_name").text().split("/")[0];
+		var rank_count = $(this).parent().parent().find(".rank_count");
+		owner_name = owner_name.split("@")[1];
+		$('<form method="POST" action="./lists.php?t=1" id="member_form">' +
+	    	'<span>User ID:(Saperated with comma, e.g. JLHwung,twitter)</span>' +
+	    	'<span><textarea type="text" name="list_members" id="list_members"></textarea></span>' +
+	    	'<span><input type="submit" class="btn" id="member_submit" value="Submit" /> <input type="button" class="btn" id="member_cancel" value="Cancel" /></span>' +
+	    '</form>').appendTo("#statuses").css("left", liPosition.left + position.left).css("top", liPosition.top + position.top + 30);
+		
+		$("#member_cancel").click(function(){
+			$("#member_form").remove();
+		});
+		
+		$("#member_submit").click(function(e){
+			e.preventDefault();
+			var list_members = $("#list_members").val();
+			if (list_members.length <= 0) {
+				window.alert("User IDs cannot be empty!");
+				return;
+			}
+			$("#member_form").remove();
+			updateSentTip("adding members to list " + list_name + "...", 5000, "ing");
+                        $.ajax({
+                                url: "ajax/addMembersToList.php",
+                                type: "POST",
+                                data: {	"slug" : list_name,
+					"owner" : owner_name,
+					"add_members" : list_members},
+                                success: function(msg) {
+                                        if (msg.indexOf("error") >= 0) {
+                                                updateSentTip("Adding failed. Please try again.", 3000, "failure");
+                                        } else {
+                                                updateSentTip("Successfully adding members to list " + list_name, 3000, "success");
+						rank_count.html(msg);
+                                        }
+                                },
+                                error: function(msg) {
+                                        updateSentTip("Adding failed. Please try again.", 3000, "failure");
+                                }
+                        });
+		})
+	})
+	
+});
diff --git a/js/main.js b/js/main.js
deleted file mode 100644
index a084e73..0000000
--- a/js/main.js
+++ /dev/null
@@ -1,41 +0,0 @@
-$(function(){
-	document.getElementById("submit_btn").disabled=false;	
-	leaveWord();
-	$("#textbox").focus();
-	$("#textbox").keydown(leaveWord).keyup(leaveWord).keydown(function(event){
-		if (event.ctrlKey && event.keyCode==13) {
-			$("form:first").submit();
-		}
-		});
-	
-	$(".submit_btn").click(function(){
-		document.getElementById("submit_btn").disabled=true;	
-	});
-	
-	$(".rt_btn").live("click", function(){
-		$("#textbox").val("RT @" + $(this).parent().find(".status_word").text());
-		$("#textbox").focus();
-		leaveWord();
-	});
-	
-	$(".replie_btn").live("click", function(){
-		var replie_id = $(this).parent().find(".status_word").find(".user_name").text();
-		$("#textbox").val("@" + replie_id + " ");
-		$("#textbox").focus();
-		$("#in_reply_to").val($(this).parent().find(".status_id").text());
-		leaveWord();
-	});
-});
-
-function leaveWord() {
-	var leave = 140-$("#textbox").val().length;
-	if (leave < 0) {
-		$("#tip").css("color","#CC0000");
-		$("#tip b").css("color","#CC0000");
-		$("#tip").html("<b>" + (-leave) + "</b>");
-	} else {
-		$("#tip").css("color","#000000");
-		$("#tip b").css("color","#000000");
-		$("#tip").html("<b>" + leave + "</b>");
-	}
-}
\ No newline at end of file
diff --git a/js/message.js b/js/message.js
index 1470aa5..9949769 100644
--- a/js/message.js
+++ b/js/message.js
@@ -1,50 +1,50 @@
-//message function
-$(function () {
-	formFunc();
-	var temp = [];
-	var auto = [];
-	$("a.user_name").each(function(){
-		var u = this.text;
-		if (!(u in temp)) {
-			temp[u] = true;
-			auto.push(u);
-		}
-	});
-	$("#sent_id").autocomplete(auto);
-	$("#allMessage").click(function(e) {
-		var $this = $(e.target);
-		var type = $this.attr('class');
-		switch(type) {
-			case 'msg_replie_btn':
-				e.preventDefault();
-				$("#sent_id").val($this.parent().parent().find(".status_word").find(".user_name").text());
-				$("#textbox").focus();
-				break;
-			case 'msg_delete_btn':
-				e.preventDefault();
-				var message_id = $.trim($this.parent().parent().find(".status_id").text());
-				var confirm = window.confirm("Are you sure to delete this message?");
-
-				if (confirm) {
-					updateSentTip("Deleting message...", 5000, "ing");
-					$.ajax({
-						url: "ajax/delete.php",
-						type: "POST",
-						data: "message_id=" + message_id,
-						success: function(msg) {
-							if (msg.indexOf("success") >= 0) {
-								$this.parent().parent().parent().remove();
-								updateSentTip("Message deleted.", 3000, "success");
-							} else {
-								updateSentTip("Failed to delete this message!", 3000, "failure");
-							}
-						},
-						error: function(msg) {
-							updateSentTip("Failed to delete this message!", 3000, "failure");
-						}
-					});
-				}
-				break;
-		}
-	});
-});
\ No newline at end of file
+//message function
+$(function () {
+	formFunc();
+	var temp = [];
+	var auto = [];
+	$("a.user_name").each(function(){
+		var u = this.id;
+		if (!(u in temp)) {
+			temp[u] = true;
+			auto.push(u);
+		}
+	});
+	$("#sent_id").autocomplete(auto);
+	$("#allMessage").click(function(e) {
+		var $this = $(e.target);
+		var type = $this.attr('class');
+		switch(type) {
+			case 'msg_replie_btn':
+				e.preventDefault();
+				$("#sent_id").val($this.parent().parent().find(".status_word").find(".user_name").attr("id"));
+				$("#textbox").focus();
+				break;
+			case 'msg_delete_btn':
+				e.preventDefault();
+				var message_id = $.trim($this.parent().parent().find(".status_id").text());
+				var confirm = window.confirm("Are you sure to delete this message?");
+
+				if (confirm) {
+					updateSentTip("Deleting message...", 5000, "ing");
+					$.ajax({
+						url: "ajax/delete.php",
+						type: "POST",
+						data: "message_id=" + message_id,
+						success: function(msg) {
+							if (msg.indexOf("success") >= 0) {
+								$this.parent().parent().parent().remove();
+								updateSentTip("Message deleted.", 3000, "success");
+							} else {
+								updateSentTip("Failed to delete this message!", 3000, "failure");
+							}
+						},
+						error: function(msg) {
+							updateSentTip("Failed to delete this message!", 3000, "failure");
+						}
+					});
+				}
+				break;
+		}
+	});
+});
diff --git a/js/nexus.js b/js/nexus.js
deleted file mode 100644
index 8f128ee..0000000
--- a/js/nexus.js
+++ /dev/null
@@ -1,40 +0,0 @@
-$(function(){
-		$("#analyze").click(function(){
-				var user_1 = $.trim($("#user_1").val());
-				var user_2 = $.trim($("#user_2").val());
-				if(user_1 === $.trim($("#sideid").text())){
-					$("#descr").animate({opacity: 0}, 200, function(){
-					$("#descr").html("Due to the the limitation of API, you cannot enter your name in the first blank!").css("color", "#83161F").animate({opacity: 1}, 100);
-					});
-					return;
-				};
-				if(user_1 !== '' & user_2 !== ''){
-					$("#analyze").val("").addClass("loading");
-					$.ajax({
-							url: "ajax/getRelationship.php" + "?target=" + user_1 + "&source=" + user_2,
-							type: "GET",
-							dataType: "text",
-							data: "target=" + user_1 + "&source=" + user_2,
-							success: function(msg) {
-								msg = $.trim(msg);
-								if(msg.length > 0 && msg !== "error") {
-									$("#analyze").val("Analyze").removeClass("loading");
-									$("#descr").html("Rabr Nexus is a tool helps you analyze relationships between you or the others.").css("color", "#333333");
-									$("#result").animate({opacity: 0}, 500, function(){
-									$("#result").removeClass("intro").html(msg).animate({opacity: 1}, 500);
-									});
-								}else{
-									$("#descr").animate({opacity: 0}, 200, function(){
-									$("#descr").html("Something went wrong, please try again!").css("color", "#83161F").animate({opacity: 1}, 100);
-					});
-								}
-							},
-							error: function() {
-									$("#descr").animate({opacity: 0}, 200, function(){
-									$("#descr").html("Something went wrong, please try again!").css("color", "#83161F").animate({opacity: 1}, 100);
-					});
-							}
-						});
-				}
-			});
-	});
\ No newline at end of file
diff --git a/js/profile.js b/js/profile.js
deleted file mode 100644
index f099865..0000000
--- a/js/profile.js
+++ /dev/null
@@ -1,24 +0,0 @@
-$(document).ready(function(){
-		formFunc();
-		$(".rt_btn").live("click", function(e){
-				e.preventDefault();
-				onRT($(this));
-			});
-
-		$(".replie_btn").live("click", function(e){
-				e.preventDefault();
-				onReplie($(this),e);
-			});
-		$(".favor_btn").live("click", function(e){
-				e.preventDefault();
-				onFavor($(this));
-			});
-		$(".delete_btn").live("click", function(e){
-				e.preventDefault();
-				onDelete($(this), "Tweet");
-			});
-		$("#submit_btn").click(function(e){
-				updateStatus();
-				e.preventDefault();
-			});
-	});
diff --git a/js/public.js b/js/public.js
index 3a6ad4d..57369fa 100644
--- a/js/public.js
+++ b/js/public.js
@@ -141,13 +141,14 @@ var formFunc = function(){
 							source.hide().slideDown('fast');
 							var statusid = $.trim($(msg).find('.status_id').text());
 							var statusText = $.trim($(msg).find('.tweet').html());
+							var statusDate = $.trim($(msg).find('span.date a').attr('id'));
 							embrTweet(source);
 							$(".mine").slideDown("fast");
 							$("#full_status").fadeIn("fast");
 							$("#currently .status-text").hide().text(limitation(text)).fadeIn("fast");
-							$("#latest_meta").hide().html("<a target=\"_blank\" href=\"status.php?id="+statusid+"\">less than 5 seconds ago</a>").fadeIn("fast");
+							$("#latest_meta").hide().html("<a target=\"_blank\" href=\"status.php?id="+statusid+"\" id=\""+statusDate+"\">less than 5 seconds ago</a>").fadeIn("fast");
 							$("#currently .full-text").hide().html(statusText);
-							$("#full_meta").hide().html("<a target=\"_blank\" href=\"status.php?id="+statusid+"\">less than 5 seconds ago</a>");
+							$("#full_meta").hide().html("<a target=\"_blank\" href=\"status.php?id="+statusid+"\" id=\""+statusDate+"\">less than 5 seconds ago</a>");
 							$("#full_meta a,.full-text a").click(function (e){e.stopPropagation();});
 							previewMedia(source);
 							freshProfile();
@@ -321,7 +322,7 @@ function rminit($this){
 	if($rm.length > 0){
 		$rm.fadeIn('fast');
 	}else{
-		var id = $that.find(".status_word").find(".user_name").text();
+		var id = $that.find(".status_word").find(".user_name").attr("id");
 		$that.addClass("loading");
 		$.ajax({
 			url: 'ajax/relation.php',
@@ -359,10 +360,14 @@ function rminit($this){
 }
 
 function rmmention($this,e){
-	var replie_id = $this.parent().parent().parent().find(".status_word").find(".user_name").text();
+	var replie_id = $this.parent().parent().parent().find(".status_word").find(".user_name").attr("id");
 	var in_reply_id = $this.parent().parent().parent().find(".status_id").text();
 	var text = "@"+replie_id;
 	var mode = "In reply to ";
+	if ($("#textbox").length <= 0) {
+		$("#info_head").after('<h2>In reply to ' + replie_id + '</h2>' + formHTML);
+		formFunc();
+	}
 	scroll(0,0);
 	$("#textbox").focus().val($("#textbox").val()+text+' ');
 	$("#in_reply_to").val(in_reply_id);
@@ -371,8 +376,12 @@ function rmmention($this,e){
 	leaveWord();
 }
 function rmdm($this,e){
-	var replie_id = $this.parent().parent().parent().find(".status_word").find(".user_name").text();
+	var replie_id = $this.parent().parent().parent().find(".status_word").find(".user_name").attr("id");
 	var text = "D "+replie_id;
+	if ($("#textbox").length <= 0) {
+		$("#info_head").after('<h2>Send message to ' + replie_id + '</h2>' + formHTML);
+		formFunc();
+	}
 	scroll(0,0);
 	$("#textbox").focus().val($("#textbox").val()+text+' ');;
 	$("#in_reply_to").val(e.target.parent().parent().parent().find(".status_id").text());
@@ -381,7 +390,7 @@ function rmdm($this,e){
 	leaveWord();
 }
 function rmfollow($this){
-	var id = $this.parent().parent().parent().find(".status_word").find(".user_name").text();
+	var id = $this.parent().parent().parent().find(".status_word").find(".user_name").attr("id");
 	updateSentTip("Following "+id+"...",5e3,"ing");
 	$.ajax({
 		url: "ajax/relation.php",
@@ -400,7 +409,7 @@ function rmfollow($this){
 	});
 }
 function rmunfollow($this){
-	var id = $this.parent().parent().parent().find(".status_word").find(".user_name").text();
+	var id = $this.parent().parent().parent().find(".status_word").find(".user_name").attr("id");
 	if (confirm("Are you sure to unfollow "+id+" ?")){
 		updateSentTip("Unfollowing "+id+"...",5e3,"ing");
 		$.ajax({
@@ -421,7 +430,7 @@ function rmunfollow($this){
 	}
 }
 function rmblock($this){
-	var id = $this.parent().parent().parent().find(".status_word").find(".user_name").text();
+	var id = $this.parent().parent().parent().find(".status_word").find(".user_name").attr("id");
 	if (confirm("Are you sure to block "+id+" ?")){
 		updateSentTip("Blocking "+id+"...",5e3,"ing");
 		$.ajax({
@@ -442,7 +451,7 @@ function rmblock($this){
 	}
 }
 function rmunblock($this){
-	var id = $this.parent().parent().parent().find(".status_word").find(".user_name").text();
+	var id = $this.parent().parent().parent().find(".status_word").find(".user_name").attr("id");
 	if (confirm("Are you sure to unblock "+id+" ?")){
 		updateSentTip("Unblocking "+id+"...",5e3,"ing");
 		$.ajax({
@@ -463,7 +472,7 @@ function rmunblock($this){
 	}
 }
 function rmspam($this){
-	var id = $this.parent().parent().parent().find(".status_word").find(".user_name").text();
+	var id = $this.parent().parent().parent().find(".status_word").find(".user_name").attr("id");
 	if (confirm("Are you sure to report "+id+" ?")){
 		updateSentTip("Reporting "+id+" as a spammer...",5e3,"ing");
 		$.ajax({
@@ -507,7 +516,7 @@ function onFavor($this){
 }
 function onReplie($this,e){
 	var $word = $this.parent().parent().find(".status_word");
-	var replie_id = $word.find(".user_name").text();
+	var replie_id = $word.find(".user_name").attr("id");
 	var in_reply_id = $this.parent().parent().find(".status_id").text();
 	var text = "@"+replie_id;
 	var start = text.length+1;
@@ -544,19 +553,23 @@ function onReplie($this,e){
 	leaveWord();
 }
 function onRT($this){
-	var replie_id = $this.parent().parent().find(".status_word").find(".user_name").text();
+	var replie_id = $this.parent().parent().find(".status_word").find(".user_name").attr("id");
 	scroll(0,0);
 	var status_word = $this.parent().parent().find(".status_word").clone();
 	status_word.find('.tweet a[rel=noreferrer]').each(function(){
-		$(this).text($(this).attr('href'));
+		var imgsrc = $(this).attr('href');
+		if (imgsrc.indexOf('img.php') > -1) {
+			imgsrc = imgsrc.substr(15);
+		}
+		$(this).text(imgsrc);
 	});
-	$("#textbox").focus().val(" RT @"+replie_id+":"+status_word.text().replace(replie_id,"")).caret(0);
+	$("#textbox").focus().val(" RT @"+replie_id+":"+status_word.find('.tweet').text()).caret(0);
 	$("#full_status,#latest_meta,#full_meta,#currently .full-text,#latest_meta").hide();
 	$("#currently .status-text").html("Retweet @"+replie_id+"'s tweet with comment.");
 	leaveWord();
 }
 function onReplieDM($this){
-	var replie_id = $this.parent().parent().find(".status_word").find(".user_name").text();
+	var replie_id = $this.parent().parent().find(".status_word").find(".user_name").attr("id");
 	var text = "D "+replie_id;
 	scroll(0,0);
 	$("#textbox").focus().val($("#textbox").val()+text+' ');
@@ -579,11 +592,11 @@ function onNwRT($this){
 				if (msg.length >= 0){
 					statusBody.parent().addClass("retweet");
 					statusBody.find(".source").hide();
-					statusBody.find(".status_info").append("<span class=\"rt_source\">Retweeted by you from <a rel=\"nofollow\" href=\"http://code.google.com/p/embr/\">embr</a></span>").fadeIn("fast");
+					statusBody.find(".status_info").append("<span class=\"rt_source\">Retweeted by you.").fadeIn("fast");
 					statusBody.find(".date").hide();
-					statusBody.find(".status_info").append("<span class=\"rt_undo\" title=\"Your followers will no longer see the tweet as retweeted by you.\">&nbsp;<a href=\"#\">(Undo)</a><span class=\"rt_id\" style=\"display: none;\">"+msg+"</span></span>").fadeIn("fast");
+					statusBody.find(".status_info").append("<span class=\"rt_undos\" title=\"Your followers will no longer see the tweet as retweeted by you.\">&nbsp;<a class=\"rt_undo\" href=\"#\">(Undo)</a><span class=\"rt_id\" style=\"display: none;\">"+msg+"</span></span>").fadeIn("fast");
 					updateSentTip("This tweet has been retweeted!",3e3,"success");
-					$(".rt_undo").tipsy({
+					$(".rt_undos").tipsy({
 							gravity: 's'
 						});
 				}else{
@@ -673,7 +686,7 @@ function onUndoRt($this){
 					if (statusInfo.find(".rt_source").size() === 1){
 						statusInfo.find(".source").show().find(".date").show();
 						statusInfo.find(".rt_source").remove()
-						statusInfo.find(".rt_undo").remove();
+						statusInfo.find(".rt_undos").remove();
 						statusBody.removeClass("retweet");
 					}else{
 						statusBody.fadeOut("fast");
@@ -844,9 +857,9 @@ $(function (){
 				if(d == 't.cn' || d == 'goo.gl' || d == 'bit.ly' || d == 'j.mp' || d == 'is.gd' || d == '163.fm') {
 					e.preventDefault();
 					updateSentTip('Unshorting the URL...',3e3,'ing');
-					$.getJSON('http://api.longurl.org/v2/expand?url=' +encodeURIComponent($this.attr('href')) + '&format=json&callback=?', function(data) {
-						if('long-url' in data) {
-							var url = data['long-url'];
+					$.getJSON('ajax/expand.php?url=' +encodeURIComponent($this.attr('href')), function(data) {
+						if('expanded_url' in data) {
+							var url = data['expanded_url'];
 							if (url != $this.attr('href')) {
 								var tmp = url.split("://");
 								$this.text(tmp[1]);
@@ -1215,4 +1228,4 @@ var markReply = function(obj){
 			$(this).addClass("reply");
 		}
 	});
-};
\ No newline at end of file
+};
diff --git a/js/search.js b/js/search.js
index 86b320d..4c296eb 100644
--- a/js/search.js
+++ b/js/search.js
@@ -1,4 +1,101 @@
 $(function(){
+	var theAC = null;
+	var searches = null;
+
+	$("#btn_savesearch").click(function(e){
+		var nowsearch = $("#query").val().trim();
+		if (theAC == null || searches == null || nowsearch == '') {
+			updateSentTip("Error in saving search!", 3000, "failure");
+			return;
+		}
+
+		var sameone = false;
+		$.each(searches, function(){
+			if (nowsearch == this[1]) {
+				updateSentTip("Duplicated search!", 3000, "failure");
+				sameone = true;
+			}
+		});
+		if (sameone) return;
+
+		$.ajax({
+			url: "ajax/savedSearches.php",
+			data: {method: "save", query: nowsearch},
+			type: "GET",
+			success: function(msg) {
+				if (msg.indexOf("[") >= 0) {
+					updateSentTip("Successfully saved search!", 3000, "success");
+					var theData = eval("("+msg+")");
+					searches.push(theData);
+					theAC.flushCache();
+					theAC.setOptions({data:searches});
+				}
+				else
+					updateSentTip("Error in saving search!", 3000, "failure");
+			},
+			error: function(msg) {
+				updateSentTip("Error in saving search!", 3000, "failure");
+			}
+		});
+	});
+
+	$.ajax({
+		url: "ajax/savedSearches.php",
+		data: {method: "list"},
+		type: "GET",
+		success: function(msg) {
+			searches = eval("("+msg+")");
+			$(".ss_delete_btn").live("click",function(e){
+				e.preventDefault();
+				$("#query").val("");
+				if (theAC != null && searches != null) {
+					var selectedId = $(this).attr("id").substr(3);
+					var selectedIndex = -1;
+					$.each(searches, function(ind, ele){
+						if (ele[0] == selectedId)
+							selectedIndex = ind;
+					});
+					if (selectedIndex != -1) {
+						var cfm = window.confirm("Are you sure to delete the saved search \"" + searches[selectedIndex][1] + "\"?");
+						if (!cfm) return;
+						$.ajax({
+							url: "ajax/savedSearches.php",
+							data: {method: "delete", ssid: selectedId},
+							type: "GET",
+							success: function(m) {
+								if (m.indexOf("success") >= 0)
+									updateSentTip("Successfully deleted saved search!", 3000, "success");
+								else
+									updateSentTip("Error in deleting saved search!", 3000, "failure");
+								searches.splice(selectedIndex, 1);
+								theAC.flushCache();
+								theAC.setOptions({data:searches});
+							},
+							error: function(m) {
+								updateSentTip("Error in deleting saved search!", 3000, "failure");
+							}
+						});
+					}
+				}
+			});
+			theAC = $("#query").autocomplete(searches, {
+				minChars:0,
+				formatItem:function(data, i, total) {
+					return "<a class=\"ss_delete_btn\" href=\"#\" id=\"sgt" + data[0] + "\" >delete</a>" + data[1];
+				},
+				formatMatch:function(data, i, total) {
+					return data[1];
+				},
+				formatResult:function(data) {
+					return data[1];
+				}
+			});
+		},
+		error: function(msg) {
+			updateSentTip("Failed to fetch the saved searches!", 3000, "failure");
+		}
+	});
+
 	formHTML = "<h2>What are you doing?</h2>" + formHTML + "<div class=\"clear\"></div>";
 	$("#allTimeline").click(function(e) {
 		var $this = $(e.target);
diff --git a/js/setting.js b/js/setting.js
index c2390cc..dc9c124 100644
--- a/js/setting.js
+++ b/js/setting.js
@@ -15,6 +15,7 @@ $(function(){
 	checkbox('sidebarscroll',"#sidebarscroll",true,function(){
 		$(window).unbind('scroll',scroller);
 	});
+	checkbox('shownick',"#shownick",false);
 	checkbox('twitterbg',"#twitterbg",false,function(){
 		if($.cookie('twitterbg') === 'true'){
 			$.ajax({
@@ -61,6 +62,7 @@ $(function(){
 			$.cookie('Bgcolor', '');
 			$.cookie('Bgimage','');
 			$.cookie('showpic','true');
+			$.cookie('shownick','false');
 			$.cookie('mediaPre','true');
 			$.cookie('p_avatar','false');
 			$.cookie('homeInterval',1);
@@ -110,6 +112,10 @@ $(function(){
 		e.preventDefault();
 		ProfileImageUpload();
 	});
+	$("#BackgroundUpload").click(function (e) {
+		e.preventDefault();
+		ProfileBackgroundUpload();
+	});
 	$("#saveProfile").click(function(e){
 		e.preventDefault();
 		$.ajax({
@@ -135,6 +141,10 @@ $(function(){
 			}
 		});
 	});
+
+	$("#tile").click(function() {
+		ProfileBackgroundTile($(this).prop('checked'));
+	});
 });
 function checkbox(c,id,d,extra){
 	var $id = $(id);
@@ -178,7 +188,7 @@ function ProfileImageUpload() {
 						dataType: "json",
 						success: function(msg){
 							freshProfile();
-							$(".settings > img").attr("src",$.cookie("imgurl"));
+							$("#avatarimg").attr("src",$.cookie("imgurl"));
 						}
 					});
 					updateSentTip("Your profile image has been uploaded!", 3000, "success");
@@ -191,4 +201,75 @@ function ProfileImageUpload() {
 			}
 		})
 	return false;
-}
\ No newline at end of file
+}
+
+function ProfileBackgroundUpload() {
+	updateSentTip("Uploading your profile background...", 10000, "ing");
+	$.ajaxFileUpload({
+			url: 'ajax/uploadImage.php?do=background',
+			timeout: 60000,
+			secureuri: false,
+			fileElementId: 'profile_background',
+			dataType: 'json',
+			success: function (data, status) {
+				if (typeof(console) !== 'undefined' && console != null) {
+					console.info(data);
+				}
+				if (typeof(data.result) != 'undefined' && data.result == "success") {
+					if ($.cookie('twitterbg') === 'true') {
+						$.ajax({
+							url:'ajax/updateProfile.php?extra=bg',
+							dataType:'json',
+							success: function() { location.reload(); }
+						});
+					}
+					$("#backgroundimg").attr("src",data.url);
+					updateSentTip("Your profile background has been uploaded!", 3000, "success");
+				} else {
+					updateSentTip("Failed to upload, please try again.", 3000, "failure");
+				}
+			},
+			error: function (data, status, e) {
+				updateSentTip("Failed to upload, please try again.", 3000, "failure");
+			}
+		})
+	return false;
+}
+
+function ProfileBackgroundTile(tile) {
+	updateSentTip("Updating your profile background tile...", 3000, "ing");
+	$.ajax({
+			url: 'ajax/uploadImage.php?do=background',
+			type: 'POST',
+			data: {'tile': tile},
+			dataType: 'json',
+			success: function (data, status) {
+				if (typeof(console) !== 'undefined' && console != null) {
+					console.info(data);
+				}
+				if (typeof(data.result) != 'undefined' && data.result == "success") {
+					if ($.cookie('twitterbg') === 'true') {
+						$.ajax({
+							url:'ajax/updateProfile.php?extra=bg',
+							dataType:'json',
+							success: function() { location.reload(); }
+						});
+					}
+					var isok = data.tile === 'true';
+					if (isok != $("#tile").prop('checked')) {
+						$("#tile").prop('checked', isok);
+						updateSentTip("Failed to update, please try again.", 3000, "failure");
+					}
+					else {
+						updateSentTip("Your profile background tile has been updated!", 3000, "success");
+					}
+				} else {
+					updateSentTip("Failed to update, please try again.", 3000, "failure");
+				}
+			},
+			error: function (data, status, e) {
+				updateSentTip("Failed to update, please try again.", 3000, "failure");
+			}
+		})
+	return false;
+}
diff --git a/js/user.js b/js/user.js
index f0370a0..ed701a3 100644
--- a/js/user.js
+++ b/js/user.js
@@ -1,276 +1,243 @@
-$(function(){
-	$("#allTimeline").click(function(e) {
-		var $this = $(e.target);
-		var type = $this.attr('class');
-		switch(type) {
-			case 'rt_btn':
-				e.preventDefault();
-				if ($("#textbox").length > 0) {
-					onInfoRT($this);
-				} else {
-					$("#info_head").after('<h2>What\'s happening?</h2>' + formHTML);
-					formFunc();
-					onInfoRT($this);
-				}
-				break;
-			case 'retw_btn':
-				e.preventDefault();
-				onNwRT($this);
-				break;
-			case 'replie_btn':
-				e.preventDefault();
-				var replie_id = $this.parent().parent().find(".status_word").find(".user_name").text();
-				if ($("#textbox").length > 0) {
-					onInfoReplie($this,e);
-				} else {
-					$("#info_head").after('<h2>In reply to ' + replie_id + '</h2>' + formHTML);
-					formFunc();
-					onInfoReplie($this,e);
-				}
-				break;
-			case 'favor_btn':
-				e.preventDefault();
-				onFavor($this);
-				break;
-			case 'unfav_btn':
-				e.preventDefault();
-				UnFavor($this);
-				break;
-			case 'rt_undo':
-				e.preventDefault();
-				onUndoRt($this);
-				break;
-		}
-	});
-
-	$("#info_reply_btn").click(function(){
-		var replie_id = $("#info_name").text();
-		if ($("#textbox").length > 0) {
-			$("#textbox").val($("#textbox").val() + "@" + replie_id + " ");
-			$("#textbox").focus();
-			leaveWord();
-		} else {
-			$("#info_head").after('<h2>In reply to ' + replie_id + '</h2>' + formHTML);
-			formFunc();
-			$("#textbox").val($("#textbox").val() + "@" + replie_id + " ");
-			$("#textbox").focus();
-			leaveWord();
-		}
-	});
-	if (getCookie("infoShow") == "hide") {
-		onHide();
-	}
-	$("#info_hide_btn").click(function(){
-		onHide();
-	});
-
-	$("#info_follow_btn").click(function(e){
-		e.preventDefault();
-		var $this = $(this);
-		var id = $("#info_name").text();
-		updateSentTip("Following " + id + "...", 5000, "ing");
-		$.ajax({
-			url: "ajax/relation.php",
-			type: "POST",
-			data: "action=create&id=" + id,
-			success: function(msg) {
-				if (msg.indexOf("success") >= 0) {
-					updateSentTip("You have followed " + id + "!", 3000, "success");
-					$this.after('<a class="btn btn-red" id="info_block_btn" href="javascript:void(0)">Unfollow</a>');
-					$this.remove();
-					if($('#unblock') != null){
-						$('#unblock').after('<a class="btn" id="block_btn" href="javascript:void(0)">Block</a>');
-						$('#unblock').remove();
-					}
-				} else {
-					updateSentTip("Failed to follow " + id + ", please try again.", 3000, "failure");
-				}
-			},
-			error: function(msg) {
-				updateSentTip("Failed to follow " + id + ", please try again.", 3000, "failure");
-			}
-		});
-	});
-
-	$("#info_block_btn").click(function(e){
-		e.preventDefault();
-		var $this = $(this);
-		var id = $("#info_name").text();
-		if (confirm("Are you sure to unfollow " + id + " ?")) {
-		updateSentTip("Unfollowing " + id + "...", 5000, "ing");
-		$.ajax({
-			url: "ajax/relation.php",
-			type: "POST",
-			data: "action=destory&id=" + id,
-			success: function(msg) {
-				if (msg.indexOf("success") >= 0) {
-					updateSentTip("You have unfollowed " + id + "!", 3000, "success");
-					$this.after('<a class="btn btn-green" id="info_follow_btn" href="javascript:void(0)">Follow</a>');
-					$this.remove();
-				} else {
-					updateSentTip("Failed to unfollow " + id + ", please try again.", 3000, "failure");
-				}
-			},
-			error: function(msg) {
-				updateSentTip("Failed to unfollow " + id + ", please try again.", 3000, "failure");
-			}
-		});
-		}
-	});
-
-	$("#block_btn").click(function(e){
-		e.preventDefault();
-		var $this = $(this);
-		var id = $("#info_name").text();
-		if (confirm("Are you sure to block " + id + " ?")) {
-			updateSentTip("Blocking " + id + "...", 5000, "ing");
-			$.ajax({
-				url: "ajax/relation.php",
-				type: "POST",
-				data: "action=block&id=" + id,
-				success: function(msg) {
-					if (msg.indexOf("success") >= 0) {
-						updateSentTip("You have blocked " + id + "!", 3000, "success");
-						$this.after('<a class="btn" id="unblock_btn" href="javascript:void(0)">Unblock</a>');
-						$this.remove();
-						if($('#info_block_btn') != null){
-							$('#info_block_btn').after('<a class="btn btn-green" id="info_follow_btn" href="javascript:void(0)">Follow</a>');
-							$('#info_block_btn').remove();
-						}
-					} else {
-						updateSentTip("Failed to block " + id + ", please try again.", 3000, "failure");
-					}
-				},
-				error: function(msg) {
-					updateSentTip("Failed to block " + id + ", please try again.", 3000, "failure");
-				}
-			});
-		}
-	});
-
-	$("#unblock_btn").click(function(e){
-		e.preventDefault();
-		var $this = $(this);
-		var id = $("#info_name").text();
-		if (confirm("Are you sure to unblock " + id + " ?")) {
-			updateSentTip("Unblocking...", 5000, "ing");
-			$.ajax({
-				url: "ajax/relation.php",
-				type: "POST",
-				data: "action=unblock&id=" + id,
-				success: function(msg) {
-					if (msg.indexOf("success") >= 0) {
-						updateSentTip("Unblocked.", 3000, "success");
-						$this.after('<a class="btn" id="block_btn" href="javascript:void(0)">Block</a>');
-						$this.remove();
-					} else {
-						updateSentTip("Failed to unblock, please try again.", 3000, "failure");
-					}
-				},
-				error: function(msg) {
-					updateSentTip("Failed to unblock, please try again.", 3000, "failure");
-				}
-			});
-		}
-	});
-	
-	$("#report_btn").click(function(e){
-		e.preventDefault();
-		var $this = $(this);
-		var id = $("#info_name").text();
-		if (confirm("Are you sure to report " + id + " for spam?")) {
-			updateSentTip("Reporting " + id + " for spam...", 5000, "ing");
-			$.ajax({
-				url: "ajax/relation.php",
-				type: "POST",
-				data: "action=report&id=" + id,
-				success: function(msg) {
-					if (msg.indexOf("success") >= 0) {
-						updateSentTip("You have reported " + id + " for spam!", 3000, "success");
-						/*
-						$this.after('<a class="btn" id="unblock_btn" href="javascript:void(0)">Unblock</a>');
-						$this.remove();
-						
-						if($('#info_block_btn') != null){
-							$('#info_block_btn').after('<a class="btn btn-green" id="info_follow_btn" href="javascript:void(0)">Follow</a>');
-							$('#info_block_btn').remove();
-						}
-						*/
-					} else {
-						updateSentTip("Failed to report " + id + " for spam, please try again.", 3000, "failure");
-					}
-				},
-				error: function(msg) {
-					updateSentTip("Failed to report " + id + " for spam, please try again.", 3000, "failure");
-				}
-			});
-		}
-	});
-	$("#tweeting_button").click(function (e) {
-		e.preventDefault();
-		if ($("#textbox").val().length >0 ) {
-			updateStatus();
-		}		
-	});
-	
-});
-
-function onInfoReplie($this) {
-	var replie_id = $("#info_name").text();
-	$("#textbox").val("@" + replie_id + " ");
-	$("#textbox").focus();
-	$("#in_reply_to").val($this.parent().parent().find(".status_id").text());
-	leaveWord();
-}
-
-function onInfoRT($this) {
-	var replie_id = $("#info_name").text();
-	var status_word = $this.parent().parent().find(".status_word").clone();
-	status_word.find('.tweet a[rel=noreferrer]').each(function(){
-		$(this).text($(this).attr('href'));
-	});
-	$("#textbox").focus().val(" RT @" + replie_id + ":" + status_word.text().replace(replie_id, "")).caret(0);
-	leaveWord();
-}
-function getCookie(name){
-	var strCookie=document.cookie;
-	var arrCookie=strCookie.split("; ");
-	for(var i=0;i<arrCookie.length;i++){
-		var arr=arrCookie[i].split("=");
-		if(arr[0]==name)return unescape(arr[1]);
-	}
-return "";
-}
-function setCookie(name,value,expireHours){
-	var cookieString=name+"="+escape(value);
-	if(expireHours>0){
-		var date=new Date();
-		date.setTime(date.getTime+expireHours*3600*1000);
-		cookieString=cookieString+"; expire="+date.toGMTString();
-	}
-	document.cookie=cookieString;
-} 
-function onHide(){
-	$this = $("#info_hide_btn");
-	$this.after('<a class="btn" id="info_show_btn" href="javascript:void(0)">Show @</a>');
-	$this.remove();
-
-	$("#info_show_btn").click(function(){
-		$(".timeline li").each(function(i,o) {
-			$(this).show();
-		});
-		$(this).after('<a class="btn" id="info_hide_btn" href="javascript:void(0)">Hide @</a>');
-		$(this).remove();
-		$("#info_hide_btn").live("click", function(){
-			onHide();
-		});
-		setCookie("infoShow","show");
-	});
-
-	$(".timeline li").each(function(i,o) {
-		if ($(this).find(".status_word").text().indexOf("@") > -1) {
-			$(this).hide();
-		}
-	});
-	setCookie("infoShow","hide");
-}
\ No newline at end of file
+$(function(){
+	$("#allTimeline").click(function(e) {
+		var $this = $(e.target);
+		var type = $this.attr('class');
+		switch(type) {
+			case 'rt_btn':
+				e.preventDefault();
+				if ($("#textbox").length > 0) {
+					onRT($this);
+				} else {
+					$("#info_head").after('<h2>What\'s happening?</h2>' + formHTML);
+					formFunc();
+					onRT($this);
+				}
+				break;
+			case 'retw_btn':
+				e.preventDefault();
+				onNwRT($this);
+				break;
+			case 'replie_btn':
+				e.preventDefault();
+				var replie_id = $this.parent().parent().find(".status_word").find(".user_name").attr("id");
+				if ($("#textbox").length > 0) {
+					onReplie($this,e);
+				} else {
+					$("#info_head").after('<h2>In reply to ' + replie_id + '</h2>' + formHTML);
+					formFunc();
+					onReplie($this,e);
+				}
+				break;
+			case 'favor_btn':
+				e.preventDefault();
+				onFavor($this);
+				break;
+			case 'unfav_btn':
+				e.preventDefault();
+				UnFavor($this);
+				break;
+			case 'rt_undo':
+				e.preventDefault();
+				onUndoRt($this);
+				break;
+		}
+	});
+
+	$("#info_reply_btn").click(function(){
+		var replie_id = $("#info_name").text();
+		if ($("#textbox").length > 0) {
+			$("#textbox").val($("#textbox").val() + "@" + replie_id + " ");
+			$("#textbox").focus();
+			leaveWord();
+		} else {
+			$("#info_head").after('<h2>In reply to ' + replie_id + '</h2>' + formHTML);
+			formFunc();
+			$("#textbox").val($("#textbox").val() + "@" + replie_id + " ");
+			$("#textbox").focus();
+			leaveWord();
+		}
+	});
+	if (getCookie("infoShow") == "hide") {
+		onHide();
+	}
+	$("#info_hide_btn").click(function(){
+		onHide();
+	});
+
+	$("#info_follow_btn").click(function(e){
+		e.preventDefault();
+		var $this = $(this);
+		var id = $("#info_name").text();
+		updateSentTip("Following " + id + "...", 5000, "ing");
+		$.ajax({
+			url: "ajax/relation.php",
+			type: "POST",
+			data: "action=create&id=" + id,
+			success: function(msg) {
+				if (msg.indexOf("success") >= 0) {
+					updateSentTip("You have followed " + id + "!", 3000, "success");
+					$this.after('<a class="btn btn-red" id="info_block_btn" href="javascript:void(0)">Unfollow</a>');
+					$this.remove();
+					if($('#unblock') != null){
+						$('#unblock').after('<a class="btn" id="block_btn" href="javascript:void(0)">Block</a>');
+						$('#unblock').remove();
+					}
+				} else {
+					updateSentTip("Failed to follow " + id + ", please try again.", 3000, "failure");
+				}
+			},
+			error: function(msg) {
+				updateSentTip("Failed to follow " + id + ", please try again.", 3000, "failure");
+			}
+		});
+	});
+
+	$("#info_block_btn").click(function(e){
+		e.preventDefault();
+		var $this = $(this);
+		var id = $("#info_name").text();
+		if (confirm("Are you sure to unfollow " + id + " ?")) {
+		updateSentTip("Unfollowing " + id + "...", 5000, "ing");
+		$.ajax({
+			url: "ajax/relation.php",
+			type: "POST",
+			data: "action=destory&id=" + id,
+			success: function(msg) {
+				if (msg.indexOf("success") >= 0) {
+					updateSentTip("You have unfollowed " + id + "!", 3000, "success");
+					$this.after('<a class="btn btn-green" id="info_follow_btn" href="javascript:void(0)">Follow</a>');
+					$this.remove();
+				} else {
+					updateSentTip("Failed to unfollow " + id + ", please try again.", 3000, "failure");
+				}
+			},
+			error: function(msg) {
+				updateSentTip("Failed to unfollow " + id + ", please try again.", 3000, "failure");
+			}
+		});
+		}
+	});
+
+	$("#block_btn").click(function(e){
+		e.preventDefault();
+		var $this = $(this);
+		var id = $("#info_name").text();
+		if (confirm("Are you sure to block " + id + " ?")) {
+			updateSentTip("Blocking " + id + "...", 5000, "ing");
+			$.ajax({
+				url: "ajax/relation.php",
+				type: "POST",
+				data: "action=block&id=" + id,
+				success: function(msg) {
+					if (msg.indexOf("success") >= 0) {
+						updateSentTip("You have blocked " + id + "!", 3000, "success");
+						$this.after('<a class="btn" id="unblock_btn" href="javascript:void(0)">Unblock</a>');
+						$this.remove();
+						if($('#info_block_btn') != null){
+							$('#info_block_btn').after('<a class="btn btn-green" id="info_follow_btn" href="javascript:void(0)">Follow</a>');
+							$('#info_block_btn').remove();
+						}
+					} else {
+						updateSentTip("Failed to block " + id + ", please try again.", 3000, "failure");
+					}
+				},
+				error: function(msg) {
+					updateSentTip("Failed to block " + id + ", please try again.", 3000, "failure");
+				}
+			});
+		}
+	});
+
+	$("#unblock_btn").click(function(e){
+		e.preventDefault();
+		var $this = $(this);
+		var id = $("#info_name").text();
+		if (confirm("Are you sure to unblock " + id + " ?")) {
+			updateSentTip("Unblocking...", 5000, "ing");
+			$.ajax({
+				url: "ajax/relation.php",
+				type: "POST",
+				data: "action=unblock&id=" + id,
+				success: function(msg) {
+					if (msg.indexOf("success") >= 0) {
+						updateSentTip("Unblocked.", 3000, "success");
+						$this.after('<a class="btn" id="block_btn" href="javascript:void(0)">Block</a>');
+						$this.remove();
+					} else {
+						updateSentTip("Failed to unblock, please try again.", 3000, "failure");
+					}
+				},
+				error: function(msg) {
+					updateSentTip("Failed to unblock, please try again.", 3000, "failure");
+				}
+			});
+		}
+	});
+	
+	$("#report_btn").click(function(e){
+		e.preventDefault();
+		var $this = $(this);
+		var id = $("#info_name").text();
+		if (confirm("Are you sure to report " + id + " for spam?")) {
+			updateSentTip("Reporting " + id + " for spam...", 5000, "ing");
+			$.ajax({
+				url: "ajax/relation.php",
+				type: "POST",
+				data: "action=report&id=" + id,
+				success: function(msg) {
+					if (msg.indexOf("success") >= 0) {
+						updateSentTip("You have reported " + id + " for spam!", 3000, "success");
+					} else {
+						updateSentTip("Failed to report " + id + " for spam, please try again.", 3000, "failure");
+					}
+				},
+				error: function(msg) {
+					updateSentTip("Failed to report " + id + " for spam, please try again.", 3000, "failure");
+				}
+			});
+		}
+	});
+});
+
+function getCookie(name){
+	var strCookie=document.cookie;
+	var arrCookie=strCookie.split("; ");
+	for(var i=0;i<arrCookie.length;i++){
+		var arr=arrCookie[i].split("=");
+		if(arr[0]==name)return unescape(arr[1]);
+	}
+return "";
+}
+function setCookie(name,value,expireHours){
+	var cookieString=name+"="+escape(value);
+	if(expireHours>0){
+		var date=new Date();
+		date.setTime(date.getTime+expireHours*3600*1000);
+		cookieString=cookieString+"; expire="+date.toGMTString();
+	}
+	document.cookie=cookieString;
+} 
+function onHide(){
+	$this = $("#info_hide_btn");
+	$this.after('<a class="btn" id="info_show_btn" href="javascript:void(0)">Show @</a>');
+	$this.remove();
+
+	$("#info_show_btn").click(function(){
+		$(".timeline li").each(function(i,o) {
+			$(this).show();
+		});
+		$(this).after('<a class="btn" id="info_hide_btn" href="javascript:void(0)">Hide @</a>');
+		$(this).remove();
+		$("#info_hide_btn").live("click", function(){
+			onHide();
+		});
+		setCookie("infoShow","show");
+	});
+
+	$(".timeline li").each(function(i,o) {
+		if ($(this).find(".status_word").text().indexOf("@") > -1) {
+			$(this).hide();
+		}
+	});
+	setCookie("infoShow","hide");
+}
diff --git a/lib/config.php b/lib/config.php
deleted file mode 100644
index 75cb0d0..0000000
--- a/lib/config.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-	define('SECURE_KEY', 'YOUR_SECRET_KEY_PLZ_CHANGE_IT');
-	define('API_URL', 'http://twitter.com');
-	define('API_TWITTER', 'http://api.twitter.com');
-	define('TWITESE_API_URL', 'http://rabrapi0.appspot.com');
-	define('SITE_OWNER', 'YOUR_NAME');
-
-	// OAuth Config
-	define("CONSUMER_KEY", "YOUR_KEY");
-	define("CONSUMER_SECRET", "YOUR_SECRET");
-	define("OAUTH_CALLBACK", "http://www.YOUR_DOMAIN.com/YOUR_DIR/oauth.php");
-?>
diff --git a/lib/config.sample.php b/lib/config.sample.php
index 954654e..48b7e18 100644
--- a/lib/config.sample.php
+++ b/lib/config.sample.php
@@ -1,21 +1,16 @@
-<?php
-	define('API_URL', 'http://api.twitter.com/1.1');
-	
-	// Config
-	define('SECURE_KEY', 'YOU SHOULD CHANGE IT'); //You should NOT leave it blank
-	define('BASE_URL','http://embr.in'); //Where your embr is hosted, i.e. http://bugbug.tk
-	define("CONSUMER_KEY", "TEItTaPASySnYxziOyIdag");
-	define("CONSUMER_SECRET", "xJEoWvBumpqgiiBuviWTa7GT8KCvP7Kv3n0hixhJaZY");
-	
-	//Extra Auth
-	define('BASIC_AUTH', false); // if you set basic_auth true, u MUST set up the following BASIC_AUTH_USER and BASIC_AUTH_PW, and you d better reset your secure_key
-	define('BASIC_AUTH_USER', 'your_basic_auth_user');
-	define('BASIC_AUTH_PW', 'your_basic_auth_password');
-
-	define('ID_AUTH',false); // if you set id_auth true, u MUST set up the following AUTH_ID list
-	$AUTH_ID = array('username1','username2','username3','......');
-
-	//Optional Information
-	define('SITE_OWNER', 'TWITTER'); //Your Twitter ID  
-	define('BLOG_SITE',''); //blog_site
-?>
+<?php
+	define('API_URL', 'https://api.twitter.com/1.1');
+	
+	// Config
+	define('SECURE_KEY', 'YOU SHOULD CHANGE IT'); //You should NOT leave it blank
+	define('BASE_URL','http://embr.in'); //Where your embr is hosted, i.e. http://bugbug.tk
+	define("CONSUMER_KEY", "TEItTaPASySnYxziOyIdag");
+	define("CONSUMER_SECRET", "xJEoWvBumpqgiiBuviWTa7GT8KCvP7Kv3n0hixhJaZY");
+
+	define('ID_AUTH',false); // if you set id_auth true, u MUST set up the following AUTH_ID list
+	$AUTH_ID = array('username1','username2','username3','......');
+
+	//Optional Information
+	define('SITE_OWNER', 'TWITTER'); //Your Twitter ID  
+	define('BLOG_SITE',''); //blog_site
+?>
diff --git a/lib/image_uploader.php b/lib/image_uploader.php
deleted file mode 100644
index 4b2d947..0000000
--- a/lib/image_uploader.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-class image_uploader{
-	public $responseInfo;
-	public $type = 'xml';
-	public $user_agent = 'rabr';
-
-	public function imgly($image){
-		$postdata = array( 'media' => "@$image");
-		$request = 'http://img.ly/api/upload';
-		return $this->objectify( $this->process( $request, $postdata ) );
-	}
-
-	/**** request method ****/
-	function process($url,$postargs=false)
-	{
-		$ch = curl_init($url);
-		curl_setopt($ch, CURLOPT_HTTPHEADER, array("Expect:"));
-
-		if($postargs !== false)
-		{
-			curl_setopt ($ch, CURLOPT_POST, true);
-			curl_setopt ($ch, CURLOPT_POSTFIELDS, $postargs);
-		}
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-		curl_setopt($ch, CURLOPT_USERAGENT, $this->user_agent);
-		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 1);
-
-		$response = curl_exec($ch);
-
-		$this->responseInfo=curl_getinfo($ch);
-		curl_close($ch);
-		return $this->responseInfo['http_code'];
-		if( intval( $this->responseInfo['http_code'] ) == 200 )
-			return $response;    
-		else
-			return false;
-	}
-
-	function objectify( $data )
-	{
-		if( function_exists('simplexml_load_string') ) {
-			$obj = simplexml_load_string( $data );
-		}
-		if (isset($obj->error) || !$obj) return false;
-		else return $obj;
-	}
-}
-?>
diff --git a/lib/mobile_device_detect.php b/lib/mobile_device_detect.php
index f0f0fc9..a507b97 100644
--- a/lib/mobile_device_detect.php
+++ b/lib/mobile_device_detect.php
@@ -1,2 +1,2 @@
-<?php
+<?php
  function mobile_device_detect($iphone=true,$ipad=true,$android=true,$opera=true,$blackberry=true,$palm=true,$windows=true,$mobileredirect=false,$desktopredirect=false){ $mobile_browser = false; $user_agent = $_SERVER['HTTP_USER_AGENT']; $accept = $_SERVER['HTTP_ACCEPT']; switch(true){ case (preg_match('/ipad/i',$user_agent)); $mobile_browser = $ipad; $status = 'Apple iPad'; if(substr($ipad,0,4)=='http'){ $mobileredirect = $ipad; } break; case (preg_match('/ipod/i',$user_agent)||preg_match('/iphone/i',$user_agent)); $mobile_browser = $iphone; $status = 'Apple'; if(substr($iphone,0,4)=='http'){ $mobileredirect = $iphone; } break; case (preg_match('/android/i',$user_agent)); $mobile_browser = $android; $status = 'Android'; if(substr($android,0,4)=='http'){ $mobileredirect = $android; } break; case (preg_match('/opera mini/i',$user_agent)); $mobile_browser = $opera; $status = 'Opera'; if(substr($opera,0,4)=='http'){ $mobileredirect = $opera; } break; case (preg_match('/blackberry/i',$user_agent)); $mobile_browser = $blackberry; $status = 'Blackberry'; if(substr($blackberry,0,4)=='http'){ $mobileredirect = $blackberry; } break; case (preg_match('/(pre\/|palm os|palm|hiptop|avantgo|plucker|xiino|blazer|elaine)/i',$user_agent)); $mobile_browser = $palm; $status = 'Palm'; if(substr($palm,0,4)=='http'){ $mobileredirect = $palm; } break; case (preg_match('/(iris|3g_t|windows ce|opera mobi|windows ce; smartphone;|windows ce; iemobile)/i',$user_agent)); $mobile_browser = $windows; $status = 'Windows Smartphone'; if(substr($windows,0,4)=='http'){ $mobileredirect = $windows; } break; case (preg_match('/(mini 9.5|vx1000|lge |m800|e860|u940|ux840|compal|wireless| mobi|ahong|lg380|lgku|lgu900|lg210|lg47|lg920|lg840|lg370|sam-r|mg50|s55|g83|t66|vx400|mk99|d615|d763|el370|sl900|mp500|samu3|samu4|vx10|xda_|samu5|samu6|samu7|samu9|a615|b832|m881|s920|n210|s700|c-810|_h797|mob-x|sk16d|848b|mowser|s580|r800|471x|v120|rim8|c500foma:|160x|x160|480x|x640|t503|w839|i250|sprint|w398samr810|m5252|c7100|mt126|x225|s5330|s820|htil-g1|fly v71|s302|-x113|novarra|k610i|-three|8325rc|8352rc|sanyo|vx54|c888|nx250|n120|mtk |c5588|s710|t880|c5005|i;458x|p404i|s210|c5100|teleca|s940|c500|s590|foma|samsu|vx8|vx9|a1000|_mms|myx|a700|gu1100|bc831|e300|ems100|me701|me702m-three|sd588|s800|8325rc|ac831|mw200|brew |d88|htc\/|htc_touch|355x|m50|km100|d736|p-9521|telco|sl74|ktouch|m4u\/|me702|8325rc|kddi|phone|lg |sonyericsson|samsung|240x|x320|vx10|nokia|sony cmd|motorola|up.browser|up.link|mmp|symbian|smartphone|midp|wap|vodafone|o2|pocket|kindle|mobile|psp|treo)/i',$user_agent)); $mobile_browser = true; $status = 'Mobile matched on piped preg_match'; break; case ((strpos($accept,'text/vnd.wap.wml')>0)||(strpos($accept,'application/vnd.wap.xhtml+xml')>0)); $mobile_browser = true; $status = 'Mobile matched on content accept header'; break; case (isset($_SERVER['HTTP_X_WAP_PROFILE'])||isset($_SERVER['HTTP_PROFILE'])); $mobile_browser = true; $status = 'Mobile matched on profile headers being set'; break; case (in_array(strtolower(substr($user_agent,0,4)),array('1207'=>'1207','3gso'=>'3gso','4thp'=>'4thp','501i'=>'501i','502i'=>'502i','503i'=>'503i','504i'=>'504i','505i'=>'505i','506i'=>'506i','6310'=>'6310','6590'=>'6590','770s'=>'770s','802s'=>'802s','a wa'=>'a wa','acer'=>'acer','acs-'=>'acs-','airn'=>'airn','alav'=>'alav','asus'=>'asus','attw'=>'attw','au-m'=>'au-m','aur '=>'aur ','aus '=>'aus ','abac'=>'abac','acoo'=>'acoo','aiko'=>'aiko','alco'=>'alco','alca'=>'alca','amoi'=>'amoi','anex'=>'anex','anny'=>'anny','anyw'=>'anyw','aptu'=>'aptu','arch'=>'arch','argo'=>'argo','bell'=>'bell','bird'=>'bird','bw-n'=>'bw-n','bw-u'=>'bw-u','beck'=>'beck','benq'=>'benq','bilb'=>'bilb','blac'=>'blac','c55/'=>'c55/','cdm-'=>'cdm-','chtm'=>'chtm','capi'=>'capi','cond'=>'cond','craw'=>'craw','dall'=>'dall','dbte'=>'dbte','dc-s'=>'dc-s','dica'=>'dica','ds-d'=>'ds-d','ds12'=>'ds12','dait'=>'dait','devi'=>'devi','dmob'=>'dmob','doco'=>'doco','dopo'=>'dopo','el49'=>'el49','erk0'=>'erk0','esl8'=>'esl8','ez40'=>'ez40','ez60'=>'ez60','ez70'=>'ez70','ezos'=>'ezos','ezze'=>'ezze','elai'=>'elai','emul'=>'emul','eric'=>'eric','ezwa'=>'ezwa','fake'=>'fake','fly-'=>'fly-','fly_'=>'fly_','g-mo'=>'g-mo','g1 u'=>'g1 u','g560'=>'g560','gf-5'=>'gf-5','grun'=>'grun','gene'=>'gene','go.w'=>'go.w','good'=>'good','grad'=>'grad','hcit'=>'hcit','hd-m'=>'hd-m','hd-p'=>'hd-p','hd-t'=>'hd-t','hei-'=>'hei-','hp i'=>'hp i','hpip'=>'hpip','hs-c'=>'hs-c','htc '=>'htc ','htc-'=>'htc-','htca'=>'htca','htcg'=>'htcg','htcp'=>'htcp','htcs'=>'htcs','htct'=>'htct','htc_'=>'htc_','haie'=>'haie','hita'=>'hita','huaw'=>'huaw','hutc'=>'hutc','i-20'=>'i-20','i-go'=>'i-go','i-ma'=>'i-ma','i230'=>'i230','iac'=>'iac','iac-'=>'iac-','iac/'=>'iac/','ig01'=>'ig01','im1k'=>'im1k','inno'=>'inno','iris'=>'iris','jata'=>'jata','java'=>'java','kddi'=>'kddi','kgt'=>'kgt','kgt/'=>'kgt/','kpt '=>'kpt ','kwc-'=>'kwc-','klon'=>'klon','lexi'=>'lexi','lg g'=>'lg g','lg-a'=>'lg-a','lg-b'=>'lg-b','lg-c'=>'lg-c','lg-d'=>'lg-d','lg-f'=>'lg-f','lg-g'=>'lg-g','lg-k'=>'lg-k','lg-l'=>'lg-l','lg-m'=>'lg-m','lg-o'=>'lg-o','lg-p'=>'lg-p','lg-s'=>'lg-s','lg-t'=>'lg-t','lg-u'=>'lg-u','lg-w'=>'lg-w','lg/k'=>'lg/k','lg/l'=>'lg/l','lg/u'=>'lg/u','lg50'=>'lg50','lg54'=>'lg54','lge-'=>'lge-','lge/'=>'lge/','lynx'=>'lynx','leno'=>'leno','m1-w'=>'m1-w','m3ga'=>'m3ga','m50/'=>'m50/','maui'=>'maui','mc01'=>'mc01','mc21'=>'mc21','mcca'=>'mcca','medi'=>'medi','meri'=>'meri','mio8'=>'mio8','mioa'=>'mioa','mo01'=>'mo01','mo02'=>'mo02','mode'=>'mode','modo'=>'modo','mot '=>'mot ','mot-'=>'mot-','mt50'=>'mt50','mtp1'=>'mtp1','mtv '=>'mtv ','mate'=>'mate','maxo'=>'maxo','merc'=>'merc','mits'=>'mits','mobi'=>'mobi','motv'=>'motv','mozz'=>'mozz','n100'=>'n100','n101'=>'n101','n102'=>'n102','n202'=>'n202','n203'=>'n203','n300'=>'n300','n302'=>'n302','n500'=>'n500','n502'=>'n502','n505'=>'n505','n700'=>'n700','n701'=>'n701','n710'=>'n710','nec-'=>'nec-','nem-'=>'nem-','newg'=>'newg','neon'=>'neon','netf'=>'netf','noki'=>'noki','nzph'=>'nzph','o2 x'=>'o2 x','o2-x'=>'o2-x','opwv'=>'opwv','owg1'=>'owg1','opti'=>'opti','oran'=>'oran','p800'=>'p800','pand'=>'pand','pg-1'=>'pg-1','pg-2'=>'pg-2','pg-3'=>'pg-3','pg-6'=>'pg-6','pg-8'=>'pg-8','pg-c'=>'pg-c','pg13'=>'pg13','phil'=>'phil','pn-2'=>'pn-2','pt-g'=>'pt-g','palm'=>'palm','pana'=>'pana','pire'=>'pire','pock'=>'pock','pose'=>'pose','psio'=>'psio','qa-a'=>'qa-a','qc-2'=>'qc-2','qc-3'=>'qc-3','qc-5'=>'qc-5','qc-7'=>'qc-7','qc07'=>'qc07','qc12'=>'qc12','qc21'=>'qc21','qc32'=>'qc32','qc60'=>'qc60','qci-'=>'qci-','qwap'=>'qwap','qtek'=>'qtek','r380'=>'r380','r600'=>'r600','raks'=>'raks','rim9'=>'rim9','rove'=>'rove','s55/'=>'s55/','sage'=>'sage','sams'=>'sams','sc01'=>'sc01','sch-'=>'sch-','scp-'=>'scp-','sdk/'=>'sdk/','se47'=>'se47','sec-'=>'sec-','sec0'=>'sec0','sec1'=>'sec1','semc'=>'semc','sgh-'=>'sgh-','shar'=>'shar','sie-'=>'sie-','sk-0'=>'sk-0','sl45'=>'sl45','slid'=>'slid','smb3'=>'smb3','smt5'=>'smt5','sp01'=>'sp01','sph-'=>'sph-','spv '=>'spv ','spv-'=>'spv-','sy01'=>'sy01','samm'=>'samm','sany'=>'sany','sava'=>'sava','scoo'=>'scoo','send'=>'send','siem'=>'siem','smar'=>'smar','smit'=>'smit','soft'=>'soft','sony'=>'sony','t-mo'=>'t-mo','t218'=>'t218','t250'=>'t250','t600'=>'t600','t610'=>'t610','t618'=>'t618','tcl-'=>'tcl-','tdg-'=>'tdg-','telm'=>'telm','tim-'=>'tim-','ts70'=>'ts70','tsm-'=>'tsm-','tsm3'=>'tsm3','tsm5'=>'tsm5','tx-9'=>'tx-9','tagt'=>'tagt','talk'=>'talk','teli'=>'teli','topl'=>'topl','hiba'=>'hiba','up.b'=>'up.b','upg1'=>'upg1','utst'=>'utst','v400'=>'v400','v750'=>'v750','veri'=>'veri','vk-v'=>'vk-v','vk40'=>'vk40','vk50'=>'vk50','vk52'=>'vk52','vk53'=>'vk53','vm40'=>'vm40','vx98'=>'vx98','virg'=>'virg','vite'=>'vite','voda'=>'voda','vulc'=>'vulc','w3c '=>'w3c ','w3c-'=>'w3c-','wapj'=>'wapj','wapp'=>'wapp','wapu'=>'wapu','wapm'=>'wapm','wig '=>'wig ','wapi'=>'wapi','wapr'=>'wapr','wapv'=>'wapv','wapy'=>'wapy','wapa'=>'wapa','waps'=>'waps','wapt'=>'wapt','winc'=>'winc','winw'=>'winw','wonu'=>'wonu','x700'=>'x700','xda2'=>'xda2','xdag'=>'xdag','yas-'=>'yas-','your'=>'your','zte-'=>'zte-','zeto'=>'zeto','acs-'=>'acs-','alav'=>'alav','alca'=>'alca','amoi'=>'amoi','aste'=>'aste','audi'=>'audi','avan'=>'avan','benq'=>'benq','bird'=>'bird','blac'=>'blac','blaz'=>'blaz','brew'=>'brew','brvw'=>'brvw','bumb'=>'bumb','ccwa'=>'ccwa','cell'=>'cell','cldc'=>'cldc','cmd-'=>'cmd-','dang'=>'dang','doco'=>'doco','eml2'=>'eml2','eric'=>'eric','fetc'=>'fetc','hipt'=>'hipt','http'=>'http','ibro'=>'ibro','idea'=>'idea','ikom'=>'ikom','inno'=>'inno','ipaq'=>'ipaq','jbro'=>'jbro','jemu'=>'jemu','java'=>'java','jigs'=>'jigs','kddi'=>'kddi','keji'=>'keji','kyoc'=>'kyoc','kyok'=>'kyok','leno'=>'leno','lg-c'=>'lg-c','lg-d'=>'lg-d','lg-g'=>'lg-g','lge-'=>'lge-','libw'=>'libw','m-cr'=>'m-cr','maui'=>'maui','maxo'=>'maxo','midp'=>'midp','mits'=>'mits','mmef'=>'mmef','mobi'=>'mobi','mot-'=>'mot-','moto'=>'moto','mwbp'=>'mwbp','mywa'=>'mywa','nec-'=>'nec-','newt'=>'newt','nok6'=>'nok6','noki'=>'noki','o2im'=>'o2im','opwv'=>'opwv','palm'=>'palm','pana'=>'pana','pant'=>'pant','pdxg'=>'pdxg','phil'=>'phil','play'=>'play','pluc'=>'pluc','port'=>'port','prox'=>'prox','qtek'=>'qtek','qwap'=>'qwap','rozo'=>'rozo','sage'=>'sage','sama'=>'sama','sams'=>'sams','sany'=>'sany','sch-'=>'sch-','sec-'=>'sec-','send'=>'send','seri'=>'seri','sgh-'=>'sgh-','shar'=>'shar','sie-'=>'sie-','siem'=>'siem','smal'=>'smal','smar'=>'smar','sony'=>'sony','sph-'=>'sph-','symb'=>'symb','t-mo'=>'t-mo','teli'=>'teli','tim-'=>'tim-','tosh'=>'tosh','treo'=>'treo','tsm-'=>'tsm-','upg1'=>'upg1','upsi'=>'upsi','vk-v'=>'vk-v','voda'=>'voda','vx52'=>'vx52','vx53'=>'vx53','vx60'=>'vx60','vx61'=>'vx61','vx70'=>'vx70','vx80'=>'vx80','vx81'=>'vx81','vx83'=>'vx83','vx85'=>'vx85','wap-'=>'wap-','wapa'=>'wapa','wapi'=>'wapi','wapp'=>'wapp','wapr'=>'wapr','webc'=>'webc','whit'=>'whit','winw'=>'winw','wmlb'=>'wmlb','xda-'=>'xda-',))); $mobile_browser = true; $status = 'Mobile matched on in_array'; break; default; $mobile_browser = false; $status = 'Desktop / full capability browser'; break; } if($redirect = ($mobile_browser==true) ? $mobileredirect : $desktopredirect){ header('Location: '.$redirect); exit; }else{ if($mobile_browser==''){ return $mobile_browser; }else{ return array($mobile_browser,$status); } } } ?>
\ No newline at end of file
diff --git a/lib/oauth_lib.php b/lib/oauth_lib.php
index 6f84b07..7f7c693 100644
--- a/lib/oauth_lib.php
+++ b/lib/oauth_lib.php
@@ -1,571 +1,571 @@
-<?php
-
-/* Generic exception class
- */
-class OAuthException extends Exception {
-  // pass
-}
-
-class OAuthConsumer {
-  public $key;
-  public $secret;
-
-  function __construct($key, $secret) {
-    $this->key = $key;
-    $this->secret = $secret;
-  }
-
-  function __toString() {
-    return "OAuthConsumer[key=$this->key,secret=$this->secret]";
-  }
-}
-
-class OAuthToken {
-  // access tokens and request tokens
-  public $key;
-  public $secret;
-
-  /**
-   * key = the token
-   * secret = the token secret
-   */
-  function __construct($key, $secret) {
-    $this->key = $key;
-    $this->secret = $secret;
-  }
-
-  /**
-   * generates the basic string serialization of a token that a server
-   * would respond to request_token and access_token calls with
-   */
-  function to_string() {
-    return "oauth_token=" .
-           OAuthUtil::urlencode_rfc3986($this->key) .
-           "&oauth_token_secret=" .
-           OAuthUtil::urlencode_rfc3986($this->secret);
-  }
-
-  function __toString() {
-    return $this->to_string();
-  }
-}
-
-class OAuthSignatureMethod {
-  public function check_signature(&$request, $consumer, $token, $signature) {
-    $built = $this->build_signature($request, $consumer, $token);
-    return $built == $signature;
-  }
-}
-
-class OAuthSignatureMethod_HMAC_SHA1 extends OAuthSignatureMethod {
-  function get_name() {
-    return "HMAC-SHA1";
-  }
-
-  public function build_signature($request, $consumer, $token) {
-    $base_string = $request->get_signature_base_string();
-    $request->base_string = $base_string;
-
-    $key_parts = array(
-      $consumer->secret,
-      ($token) ? $token->secret : ""
-    );
-
-    $key_parts = OAuthUtil::urlencode_rfc3986($key_parts);
-    $key = implode('&', $key_parts);
-
-    return base64_encode(hash_hmac('sha1', $base_string, $key, true));
-  }
-}
-
-class OAuthSignatureMethod_PLAINTEXT extends OAuthSignatureMethod {
-  public function get_name() {
-    return "PLAINTEXT";
-  }
-
-  public function build_signature($request, $consumer, $token) {
-    $sig = array(
-      OAuthUtil::urlencode_rfc3986($consumer->secret)
-    );
-
-    if ($token) {
-      array_push($sig, OAuthUtil::urlencode_rfc3986($token->secret));
-    } else {
-      array_push($sig, '');
-    }
-
-    $raw = implode("&", $sig);
-    // for debug purposes
-    $request->base_string = $raw;
-
-    return OAuthUtil::urlencode_rfc3986($raw);
-  }
-}
-
-class OAuthSignatureMethod_RSA_SHA1 extends OAuthSignatureMethod {
-  public function get_name() {
-    return "RSA-SHA1";
-  }
-
-  protected function fetch_public_cert(&$request) {
-    // not implemented yet, ideas are:
-    // (1) do a lookup in a table of trusted certs keyed off of consumer
-    // (2) fetch via http using a url provided by the requester
-    // (3) some sort of specific discovery code based on request
-    //
-    // either way should return a string representation of the certificate
-    throw Exception("fetch_public_cert not implemented");
-  }
-
-  protected function fetch_private_cert(&$request) {
-    // not implemented yet, ideas are:
-    // (1) do a lookup in a table of trusted certs keyed off of consumer
-    //
-    // either way should return a string representation of the certificate
-    throw Exception("fetch_private_cert not implemented");
-  }
-
-  public function build_signature(&$request, $consumer, $token) {
-    $base_string = $request->get_signature_base_string();
-    $request->base_string = $base_string;
-
-    // Fetch the private key cert based on the request
-    $cert = $this->fetch_private_cert($request);
-
-    // Pull the private key ID from the certificate
-    $privatekeyid = openssl_get_privatekey($cert);
-
-    // Sign using the key
-    $ok = openssl_sign($base_string, $signature, $privatekeyid);
-
-    // Release the key resource
-    openssl_free_key($privatekeyid);
-
-    return base64_encode($signature);
-  }
-
-  public function check_signature(&$request, $consumer, $token, $signature) {
-    $decoded_sig = base64_decode($signature);
-
-    $base_string = $request->get_signature_base_string();
-
-    // Fetch the public key cert based on the request
-    $cert = $this->fetch_public_cert($request);
-
-    // Pull the public key ID from the certificate
-    $publickeyid = openssl_get_publickey($cert);
-
-    // Check the computed signature against the one passed in the query
-    $ok = openssl_verify($base_string, $decoded_sig, $publickeyid);
-
-    // Release the key resource
-    openssl_free_key($publickeyid);
-
-    return $ok == 1;
-  }
-}
-
-class OAuthRequest {
-  private $parameters;
-  private $http_method;
-  private $http_url;
-  public $http_header;
-  // for debug purposes
-  public $base_string;
-  public static $version = '1.0a';
-  public static $POST_INPUT = 'php://input';
-
-  function __construct($http_method, $http_url, $parameters = array(), $http_header= array()) {
-    //@$parameters or $parameters = array();
-    $this->parameters = $parameters;
-	//@$http_header or $http_header = array();
-	$this->http_header = $http_header;
-    $this->http_method = $http_method;
-    $this->http_url = $http_url;
-  }
-
-
-  /**
-   * attempt to build up a request from what was passed to the server
-   */
-  public static function from_request($http_method=NULL, $http_url=NULL, $parameters=NULL) {
-    $scheme = (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != "on")
-              ? 'http'
-              : 'https';
-    @$http_url or $http_url = $scheme .
-                              '://' . $_SERVER['HTTP_HOST'] .
-                              ':' .
-                              $_SERVER['SERVER_PORT'] .
-                              $_SERVER['REQUEST_URI'];
-    @$http_method or $http_method = $_SERVER['REQUEST_METHOD'];
-
-    // We weren't handed any parameters, so let's find the ones relevant to
-    // this request.
-    // If you run XML-RPC or similar you should use this to provide your own
-    // parsed parameter-list
-    if (!$parameters) {
-      // Find request headers
-      $request_headers = OAuthUtil::get_headers();
-
-      // Parse the query-string to find GET parameters
-      $parameters = OAuthUtil::parse_parameters($_SERVER['QUERY_STRING']);
-
-      // It's a POST request of the proper content-type, so parse POST
-      // parameters and add those overriding any duplicates from GET
-      if ($http_method == "POST"
-          && @strstr($request_headers["Content-Type"],
-                     "application/x-www-form-urlencoded")
-          ) {
-        $post_data = OAuthUtil::parse_parameters(
-          file_get_contents(self::$POST_INPUT)
-        );
-        $parameters = array_merge($parameters, $post_data);
-      }
-
-      // We have a Authorization-header with OAuth data. Parse the header
-      // and add those overriding any duplicates from GET or POST
-      if (@substr($request_headers['Authorization'], 0, 6) == "OAuth ") {
-        $header_parameters = OAuthUtil::split_header(
-          $request_headers['Authorization']
-        );
-        $parameters = array_merge($parameters, $header_parameters);
-      }
-
-    }
-
-    return new OAuthRequest($http_method, $http_url, $parameters);
-  }
-
-  /**
-   * pretty much a helper function to set up the request
-   */
-  public static function from_consumer_and_token($consumer, $token, $http_method, $http_url, $parameters=NULL) {
-    @$parameters or $parameters = array();
-    $defaults = array("oauth_version" => OAuthRequest::$version,
-                      "oauth_nonce" => OAuthRequest::generate_nonce(),
-                      "oauth_timestamp" => OAuthRequest::generate_timestamp(),
-                      "oauth_consumer_key" => $consumer->key);
-    if ($token)
-      $defaults['oauth_token'] = $token->key;
-
-    $parameters = array_merge($defaults, $parameters);
-
-    return new OAuthRequest($http_method, $http_url, $parameters);
-  }
-
-  public function set_parameter($name, $value, $allow_duplicates = true) {
-    if ($allow_duplicates && isset($this->parameters[$name])) {
-      // We have already added parameter(s) with this name, so add to the list
-      if (is_scalar($this->parameters[$name])) {
-        // This is the first duplicate, so transform scalar (string)
-        // into an array so we can add the duplicates
-        $this->parameters[$name] = array($this->parameters[$name]);
-      }
-
-      $this->parameters[$name][] = $value;
-    } else {
-      $this->parameters[$name] = $value;
-    }
-  }
-  
-
-  public function set_http_header(&$multipart = NULL) {
-	if (empty($this->parameters)) {
-		$this->http_header[] = 'Content-Type:';
-      $this->http_header[] = 'Content-Length:';
-	} else {
-	 	if($multipart) $this->http_header[] = $this->to_header(); //add OAuth header if we post multipart
-		$this->http_header[] = 'Expect: ';
-	}
-  }
-
-  public function get_parameter($name) {
-    return isset($this->parameters[$name]) ? $this->parameters[$name] : null;
-  }
-
-  public function get_parameters() {
-    return $this->parameters;
-  }
-
-  public function unset_parameter($name) {
-    unset($this->parameters[$name]);
-  }
-
-  /**
-   * The request parameters, sorted and concatenated into a normalized string.
-   * @return string
-   */
-  public function get_signable_parameters() {
-    // Grab all parameters
-    $params = $this->parameters;
-
-    // Remove oauth_signature if present
-    // Ref: Spec: 9.1.1 ("The oauth_signature parameter MUST be excluded.")
-    if (isset($params['oauth_signature'])) {
-      unset($params['oauth_signature']);
-    }
-
-    return OAuthUtil::build_http_query($params);
-  }
-
-  /**
-   * Returns the base string of this request
-   *
-   * The base string defined as the method, the url
-   * and the parameters (normalized), each urlencoded
-   * and the concated with &.
-   */
-  public function get_signature_base_string() {
-    $parts = array(
-      $this->get_normalized_http_method(),
-      $this->get_normalized_http_url(),
-      $this->get_signable_parameters()
-    );
-
-    $parts = OAuthUtil::urlencode_rfc3986($parts);
-
-    return implode('&', $parts);
-  }
-
-  /**
-   * just uppercases the http method
-   */
-  public function get_normalized_http_method() {
-    return strtoupper($this->http_method);
-  }
-
-  /**
-   * parses the url and rebuilds it to be
-   * scheme://host/path
-   */
-  public function get_normalized_http_url() {
-    $parts = parse_url($this->http_url);
-
-    $port = @$parts['port'];
-    $scheme = $parts['scheme'];
-    $host = $parts['host'];
-    $path = @$parts['path'];
-
-    $port or $port = ($scheme == 'https') ? '443' : '80';
-
-    if (($scheme == 'https' && $port != '443')
-        || ($scheme == 'http' && $port != '80')) {
-      $host = "$host:$port";
-    }
-    return "$scheme://$host$path";
-  }
-
-  /**
-   * builds a url usable for a GET request
-   */
-  public function to_url() {
-    $post_data = $this->to_postdata();
-    $out = $this->get_normalized_http_url();
-    if ($post_data) {
-      $out .= '?'.$post_data;
-    }
-    return $out;
-  }
-
-  /**
-   * builds the data one would send in a POST request
-   */
-  public function to_postdata() {
-    return OAuthUtil::build_http_query($this->parameters);
-  }
-
-  /**
-   * builds the Authorization: header
-   */
-  public function to_header($realm=NULL) {
-    $out = 'Authorization: OAuth ';
-	if ($realm) $out .= 'realm="'.$realm.'",';
-    $total = array();
-    foreach ($this->parameters as $k => $v) {
-      if (substr($k, 0, 5) != "oauth") continue;
-      if (is_array($v)) {
-        throw new OAuthException('Arrays not supported in headers');
-      }
-      $out .= OAuthUtil::urlencode_rfc3986($k) .
-              '="' .
-              OAuthUtil::urlencode_rfc3986($v) .
-              '",';
-    }
-    return substr($out,0,-1);
-  }
-
-  public function __toString() {
-    return $this->to_url();
-  }
-
-
-  public function sign_request($signature_method, $consumer, $token) {
-    $this->set_parameter(
-      "oauth_signature_method",
-      $signature_method->get_name(),
-      false
-    );
-    $signature = $this->build_signature($signature_method, $consumer, $token);
-    $this->set_parameter("oauth_signature", $signature, false);
-  }
-
-  public function build_signature($signature_method, $consumer, $token) {
-    $signature = $signature_method->build_signature($this, $consumer, $token);
-    return $signature;
-  }
-
-  /**
-   * util function: current timestamp
-   */
-  private static function generate_timestamp() {
-    return $_SERVER['REQUEST_TIME'];
-  }
-
-  /**
-   * util function: current nonce
-   */
-  private static function generate_nonce() {
-    $mt = microtime();
-    $rand = mt_rand();
-
-    return md5($mt . $rand); // md5s look nicer than numbers
-  }
-}
-
-class OAuthUtil {
-  public static function urlencode_rfc3986($input) {
-  if (is_array($input)) {
-    return array_map(array('OAuthUtil', 'urlencode_rfc3986'), $input);
-  } else if (is_scalar($input)) {
-    return str_replace(
-      '+',
-      ' ',
-      str_replace('%7E', '~', rawurlencode($input))
-    );
-  } else {
-    return '';
-  }
-}
-
-
-  // This decode function isn't taking into consideration the above
-  // modifications to the encoding process. However, this method doesn't
-  // seem to be used anywhere so leaving it as is.
-  public static function urldecode_rfc3986($string) {
-    return urldecode($string);
-  }
-
-  // Utility function for turning the Authorization: header into
-  // parameters, has to do some unescaping
-  // Can filter out any non-oauth parameters if needed (default behaviour)
-  public static function split_header($header, $only_allow_oauth_parameters = true) {
-    $pattern = '/(([-_a-z]*)=("([^"]*)"|([^,]*)),?)/';
-    $offset = 0;
-    $params = array();
-    while (preg_match($pattern, $header, $matches, PREG_OFFSET_CAPTURE, $offset) > 0) {
-      $match = $matches[0];
-      $header_name = $matches[2][0];
-      $header_content = (isset($matches[5])) ? $matches[5][0] : $matches[4][0];
-      if (preg_match('/^oauth_/', $header_name) || !$only_allow_oauth_parameters) {
-        $params[$header_name] = OAuthUtil::urldecode_rfc3986($header_content);
-      }
-      $offset = $match[1] + strlen($match[0]);
-    }
-
-    if (isset($params['realm'])) {
-      unset($params['realm']);
-    }
-
-    return $params;
-  }
-
-  // helper to try to sort out headers for people who aren't running apache
-  public static function get_headers() {
-    if (function_exists('apache_request_headers')) {
-      // we need this to get the actual Authorization: header
-      // because apache tends to tell us it doesn't exist
-      return apache_request_headers();
-    }
-    // otherwise we don't have apache and are just going to have to hope
-    // that $_SERVER actually contains what we need
-    $out = array();
-    foreach ($_SERVER as $key => $value) {
-      if (substr($key, 0, 5) == "HTTP_") {
-        // this is chaos, basically it is just there to capitalize the first
-        // letter of every word that is not an initial HTTP and strip HTTP
-        // code from przemek
-        $key = str_replace(
-          " ",
-          "-",
-          ucwords(strtolower(str_replace("_", " ", substr($key, 5))))
-        );
-        $out[$key] = $value;
-      }
-    }
-    return $out;
-  }
-
-  // This function takes a input like a=b&a=c&d=e and returns the parsed
-  // parameters like this
-  // array('a' => array('b','c'), 'd' => 'e')
-  public static function parse_parameters( $input ) {
-    if (!isset($input) || !$input) return array();
-
-    $pairs = explode('&', $input);
-
-    $parsed_parameters = array();
-    foreach ($pairs as $pair) {
-      $split = explode('=', $pair, 2);
-      $parameter = OAuthUtil::urldecode_rfc3986($split[0]);
-      $value = isset($split[1]) ? OAuthUtil::urldecode_rfc3986($split[1]) : '';
-
-      if (isset($parsed_parameters[$parameter])) {
-        // We have already recieved parameter(s) with this name, so add to the list
-        // of parameters with this name
-
-        if (is_scalar($parsed_parameters[$parameter])) {
-          // This is the first duplicate, so transform scalar (string) into an array
-          // so we can add the duplicates
-          $parsed_parameters[$parameter] = array($parsed_parameters[$parameter]);
-        }
-
-        $parsed_parameters[$parameter][] = $value;
-      } else {
-        $parsed_parameters[$parameter] = $value;
-      }
-    }
-    return $parsed_parameters;
-  }
-
-  public static function build_http_query($params,$multipart=NULL) {
-    if (!$params) return '';
-
-    // Urlencode both keys and values
-    $keys = OAuthUtil::urlencode_rfc3986(array_keys($params));
-    $values = OAuthUtil::urlencode_rfc3986(array_values($params));
-    $params = array_combine($keys, $values);
-
-    // Parameters are sorted by name, using lexicographical byte value ordering.
-    // Ref: Spec: 9.1.1 (1)
-    uksort($params, 'strcmp');
-
-    $pairs = array();
-    foreach ($params as $parameter => $value) {
-      if (is_array($value)) {
-        // If two or more parameters share the same name, they are sorted by their value
-        // Ref: Spec: 9.1.1 (1)
-        natsort($value);
-        foreach ($value as $duplicate_value) {
-          $pairs[] = $parameter . '=' . $duplicate_value;
-        }
-      } else {
-        $pairs[] = $parameter . '=' . $value;
-      }
-    }
-    // For each parameter, the name is separated from the corresponding value by an '=' character (ASCII code 61)
-    // Each name-value pair is separated by an '&' character (ASCII code 38)
-    return implode('&', $pairs);
-  }
-}
-
-?>
+<?php
+
+/* Generic exception class
+ */
+class OAuthException extends Exception {
+  // pass
+}
+
+class OAuthConsumer {
+  public $key;
+  public $secret;
+
+  function __construct($key, $secret) {
+    $this->key = $key;
+    $this->secret = $secret;
+  }
+
+  function __toString() {
+    return "OAuthConsumer[key=$this->key,secret=$this->secret]";
+  }
+}
+
+class OAuthToken {
+  // access tokens and request tokens
+  public $key;
+  public $secret;
+
+  /**
+   * key = the token
+   * secret = the token secret
+   */
+  function __construct($key, $secret) {
+    $this->key = $key;
+    $this->secret = $secret;
+  }
+
+  /**
+   * generates the basic string serialization of a token that a server
+   * would respond to request_token and access_token calls with
+   */
+  function to_string() {
+    return "oauth_token=" .
+           OAuthUtil::urlencode_rfc3986($this->key) .
+           "&oauth_token_secret=" .
+           OAuthUtil::urlencode_rfc3986($this->secret);
+  }
+
+  function __toString() {
+    return $this->to_string();
+  }
+}
+
+class OAuthSignatureMethod {
+  public function check_signature(&$request, $consumer, $token, $signature) {
+    $built = $this->build_signature($request, $consumer, $token);
+    return $built == $signature;
+  }
+}
+
+class OAuthSignatureMethod_HMAC_SHA1 extends OAuthSignatureMethod {
+  function get_name() {
+    return "HMAC-SHA1";
+  }
+
+  public function build_signature($request, $consumer, $token) {
+    $base_string = $request->get_signature_base_string();
+    $request->base_string = $base_string;
+
+    $key_parts = array(
+      $consumer->secret,
+      ($token) ? $token->secret : ""
+    );
+
+    $key_parts = OAuthUtil::urlencode_rfc3986($key_parts);
+    $key = implode('&', $key_parts);
+
+    return base64_encode(hash_hmac('sha1', $base_string, $key, true));
+  }
+}
+
+class OAuthSignatureMethod_PLAINTEXT extends OAuthSignatureMethod {
+  public function get_name() {
+    return "PLAINTEXT";
+  }
+
+  public function build_signature($request, $consumer, $token) {
+    $sig = array(
+      OAuthUtil::urlencode_rfc3986($consumer->secret)
+    );
+
+    if ($token) {
+      array_push($sig, OAuthUtil::urlencode_rfc3986($token->secret));
+    } else {
+      array_push($sig, '');
+    }
+
+    $raw = implode("&", $sig);
+    // for debug purposes
+    $request->base_string = $raw;
+
+    return OAuthUtil::urlencode_rfc3986($raw);
+  }
+}
+
+class OAuthSignatureMethod_RSA_SHA1 extends OAuthSignatureMethod {
+  public function get_name() {
+    return "RSA-SHA1";
+  }
+
+  protected function fetch_public_cert(&$request) {
+    // not implemented yet, ideas are:
+    // (1) do a lookup in a table of trusted certs keyed off of consumer
+    // (2) fetch via http using a url provided by the requester
+    // (3) some sort of specific discovery code based on request
+    //
+    // either way should return a string representation of the certificate
+    throw Exception("fetch_public_cert not implemented");
+  }
+
+  protected function fetch_private_cert(&$request) {
+    // not implemented yet, ideas are:
+    // (1) do a lookup in a table of trusted certs keyed off of consumer
+    //
+    // either way should return a string representation of the certificate
+    throw Exception("fetch_private_cert not implemented");
+  }
+
+  public function build_signature(&$request, $consumer, $token) {
+    $base_string = $request->get_signature_base_string();
+    $request->base_string = $base_string;
+
+    // Fetch the private key cert based on the request
+    $cert = $this->fetch_private_cert($request);
+
+    // Pull the private key ID from the certificate
+    $privatekeyid = openssl_get_privatekey($cert);
+
+    // Sign using the key
+    $ok = openssl_sign($base_string, $signature, $privatekeyid);
+
+    // Release the key resource
+    openssl_free_key($privatekeyid);
+
+    return base64_encode($signature);
+  }
+
+  public function check_signature(&$request, $consumer, $token, $signature) {
+    $decoded_sig = base64_decode($signature);
+
+    $base_string = $request->get_signature_base_string();
+
+    // Fetch the public key cert based on the request
+    $cert = $this->fetch_public_cert($request);
+
+    // Pull the public key ID from the certificate
+    $publickeyid = openssl_get_publickey($cert);
+
+    // Check the computed signature against the one passed in the query
+    $ok = openssl_verify($base_string, $decoded_sig, $publickeyid);
+
+    // Release the key resource
+    openssl_free_key($publickeyid);
+
+    return $ok == 1;
+  }
+}
+
+class OAuthRequest {
+  private $parameters;
+  private $http_method;
+  private $http_url;
+  public $http_header;
+  // for debug purposes
+  public $base_string;
+  public static $version = '1.0a';
+  public static $POST_INPUT = 'php://input';
+
+  function __construct($http_method, $http_url, $parameters = array(), $http_header= array()) {
+    //@$parameters or $parameters = array();
+    $this->parameters = $parameters;
+	//@$http_header or $http_header = array();
+	$this->http_header = $http_header;
+    $this->http_method = $http_method;
+    $this->http_url = $http_url;
+  }
+
+
+  /**
+   * attempt to build up a request from what was passed to the server
+   */
+  public static function from_request($http_method=NULL, $http_url=NULL, $parameters=NULL) {
+    $scheme = (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != "on")
+              ? 'http'
+              : 'https';
+    @$http_url or $http_url = $scheme .
+                              '://' . $_SERVER['HTTP_HOST'] .
+                              ':' .
+                              $_SERVER['SERVER_PORT'] .
+                              $_SERVER['REQUEST_URI'];
+    @$http_method or $http_method = $_SERVER['REQUEST_METHOD'];
+
+    // We weren't handed any parameters, so let's find the ones relevant to
+    // this request.
+    // If you run XML-RPC or similar you should use this to provide your own
+    // parsed parameter-list
+    if (!$parameters) {
+      // Find request headers
+      $request_headers = OAuthUtil::get_headers();
+
+      // Parse the query-string to find GET parameters
+      $parameters = OAuthUtil::parse_parameters($_SERVER['QUERY_STRING']);
+
+      // It's a POST request of the proper content-type, so parse POST
+      // parameters and add those overriding any duplicates from GET
+      if ($http_method == "POST"
+          && @strstr($request_headers["Content-Type"],
+                     "application/x-www-form-urlencoded")
+          ) {
+        $post_data = OAuthUtil::parse_parameters(
+          file_get_contents(self::$POST_INPUT)
+        );
+        $parameters = array_merge($parameters, $post_data);
+      }
+
+      // We have a Authorization-header with OAuth data. Parse the header
+      // and add those overriding any duplicates from GET or POST
+      if (@substr($request_headers['Authorization'], 0, 6) == "OAuth ") {
+        $header_parameters = OAuthUtil::split_header(
+          $request_headers['Authorization']
+        );
+        $parameters = array_merge($parameters, $header_parameters);
+      }
+
+    }
+
+    return new OAuthRequest($http_method, $http_url, $parameters);
+  }
+
+  /**
+   * pretty much a helper function to set up the request
+   */
+  public static function from_consumer_and_token($consumer, $token, $http_method, $http_url, $parameters=NULL) {
+    @$parameters or $parameters = array();
+    $defaults = array("oauth_version" => OAuthRequest::$version,
+                      "oauth_nonce" => OAuthRequest::generate_nonce(),
+                      "oauth_timestamp" => OAuthRequest::generate_timestamp(),
+                      "oauth_consumer_key" => $consumer->key);
+    if ($token)
+      $defaults['oauth_token'] = $token->key;
+
+    $parameters = array_merge($defaults, $parameters);
+
+    return new OAuthRequest($http_method, $http_url, $parameters);
+  }
+
+  public function set_parameter($name, $value, $allow_duplicates = true) {
+    if ($allow_duplicates && isset($this->parameters[$name])) {
+      // We have already added parameter(s) with this name, so add to the list
+      if (is_scalar($this->parameters[$name])) {
+        // This is the first duplicate, so transform scalar (string)
+        // into an array so we can add the duplicates
+        $this->parameters[$name] = array($this->parameters[$name]);
+      }
+
+      $this->parameters[$name][] = $value;
+    } else {
+      $this->parameters[$name] = $value;
+    }
+  }
+  
+
+  public function set_http_header(&$multipart = NULL) {
+	if (empty($this->parameters)) {
+		$this->http_header[] = 'Content-Type:';
+      $this->http_header[] = 'Content-Length:';
+	} else {
+	 	if($multipart) $this->http_header[] = $this->to_header(); //add OAuth header if we post multipart
+		$this->http_header[] = 'Expect: ';
+	}
+  }
+
+  public function get_parameter($name) {
+    return isset($this->parameters[$name]) ? $this->parameters[$name] : null;
+  }
+
+  public function get_parameters() {
+    return $this->parameters;
+  }
+
+  public function unset_parameter($name) {
+    unset($this->parameters[$name]);
+  }
+
+  /**
+   * The request parameters, sorted and concatenated into a normalized string.
+   * @return string
+   */
+  public function get_signable_parameters() {
+    // Grab all parameters
+    $params = $this->parameters;
+
+    // Remove oauth_signature if present
+    // Ref: Spec: 9.1.1 ("The oauth_signature parameter MUST be excluded.")
+    if (isset($params['oauth_signature'])) {
+      unset($params['oauth_signature']);
+    }
+
+    return OAuthUtil::build_http_query($params);
+  }
+
+  /**
+   * Returns the base string of this request
+   *
+   * The base string defined as the method, the url
+   * and the parameters (normalized), each urlencoded
+   * and the concated with &.
+   */
+  public function get_signature_base_string() {
+    $parts = array(
+      $this->get_normalized_http_method(),
+      $this->get_normalized_http_url(),
+      $this->get_signable_parameters()
+    );
+
+    $parts = OAuthUtil::urlencode_rfc3986($parts);
+
+    return implode('&', $parts);
+  }
+
+  /**
+   * just uppercases the http method
+   */
+  public function get_normalized_http_method() {
+    return strtoupper($this->http_method);
+  }
+
+  /**
+   * parses the url and rebuilds it to be
+   * scheme://host/path
+   */
+  public function get_normalized_http_url() {
+    $parts = parse_url($this->http_url);
+
+    $port = @$parts['port'];
+    $scheme = $parts['scheme'];
+    $host = $parts['host'];
+    $path = @$parts['path'];
+
+    $port or $port = ($scheme == 'https') ? '443' : '80';
+
+    if (($scheme == 'https' && $port != '443')
+        || ($scheme == 'http' && $port != '80')) {
+      $host = "$host:$port";
+    }
+    return "$scheme://$host$path";
+  }
+
+  /**
+   * builds a url usable for a GET request
+   */
+  public function to_url() {
+    $post_data = $this->to_postdata();
+    $out = $this->get_normalized_http_url();
+    if ($post_data) {
+      $out .= '?'.$post_data;
+    }
+    return $out;
+  }
+
+  /**
+   * builds the data one would send in a POST request
+   */
+  public function to_postdata() {
+    return OAuthUtil::build_http_query($this->parameters);
+  }
+
+  /**
+   * builds the Authorization: header
+   */
+  public function to_header($realm=NULL) {
+    $out = 'Authorization: OAuth ';
+	if ($realm) $out .= 'realm="'.$realm.'",';
+    $total = array();
+    foreach ($this->parameters as $k => $v) {
+      if (substr($k, 0, 5) != "oauth") continue;
+      if (is_array($v)) {
+        throw new OAuthException('Arrays not supported in headers');
+      }
+      $out .= OAuthUtil::urlencode_rfc3986($k) .
+              '="' .
+              OAuthUtil::urlencode_rfc3986($v) .
+              '",';
+    }
+    return substr($out,0,-1);
+  }
+
+  public function __toString() {
+    return $this->to_url();
+  }
+
+
+  public function sign_request($signature_method, $consumer, $token) {
+    $this->set_parameter(
+      "oauth_signature_method",
+      $signature_method->get_name(),
+      false
+    );
+    $signature = $this->build_signature($signature_method, $consumer, $token);
+    $this->set_parameter("oauth_signature", $signature, false);
+  }
+
+  public function build_signature($signature_method, $consumer, $token) {
+    $signature = $signature_method->build_signature($this, $consumer, $token);
+    return $signature;
+  }
+
+  /**
+   * util function: current timestamp
+   */
+  private static function generate_timestamp() {
+    return $_SERVER['REQUEST_TIME'];
+  }
+
+  /**
+   * util function: current nonce
+   */
+  private static function generate_nonce() {
+    $mt = microtime();
+    $rand = mt_rand();
+
+    return md5($mt . $rand); // md5s look nicer than numbers
+  }
+}
+
+class OAuthUtil {
+  public static function urlencode_rfc3986($input) {
+  if (is_array($input)) {
+    return array_map(array('OAuthUtil', 'urlencode_rfc3986'), $input);
+  } else if (is_scalar($input)) {
+    return str_replace(
+      '+',
+      ' ',
+      str_replace('%7E', '~', rawurlencode($input))
+    );
+  } else {
+    return '';
+  }
+}
+
+
+  // This decode function isn't taking into consideration the above
+  // modifications to the encoding process. However, this method doesn't
+  // seem to be used anywhere so leaving it as is.
+  public static function urldecode_rfc3986($string) {
+    return urldecode($string);
+  }
+
+  // Utility function for turning the Authorization: header into
+  // parameters, has to do some unescaping
+  // Can filter out any non-oauth parameters if needed (default behaviour)
+  public static function split_header($header, $only_allow_oauth_parameters = true) {
+    $pattern = '/(([-_a-z]*)=("([^"]*)"|([^,]*)),?)/';
+    $offset = 0;
+    $params = array();
+    while (preg_match($pattern, $header, $matches, PREG_OFFSET_CAPTURE, $offset) > 0) {
+      $match = $matches[0];
+      $header_name = $matches[2][0];
+      $header_content = (isset($matches[5])) ? $matches[5][0] : $matches[4][0];
+      if (preg_match('/^oauth_/', $header_name) || !$only_allow_oauth_parameters) {
+        $params[$header_name] = OAuthUtil::urldecode_rfc3986($header_content);
+      }
+      $offset = $match[1] + strlen($match[0]);
+    }
+
+    if (isset($params['realm'])) {
+      unset($params['realm']);
+    }
+
+    return $params;
+  }
+
+  // helper to try to sort out headers for people who aren't running apache
+  public static function get_headers() {
+    if (function_exists('apache_request_headers')) {
+      // we need this to get the actual Authorization: header
+      // because apache tends to tell us it doesn't exist
+      return apache_request_headers();
+    }
+    // otherwise we don't have apache and are just going to have to hope
+    // that $_SERVER actually contains what we need
+    $out = array();
+    foreach ($_SERVER as $key => $value) {
+      if (substr($key, 0, 5) == "HTTP_") {
+        // this is chaos, basically it is just there to capitalize the first
+        // letter of every word that is not an initial HTTP and strip HTTP
+        // code from przemek
+        $key = str_replace(
+          " ",
+          "-",
+          ucwords(strtolower(str_replace("_", " ", substr($key, 5))))
+        );
+        $out[$key] = $value;
+      }
+    }
+    return $out;
+  }
+
+  // This function takes a input like a=b&a=c&d=e and returns the parsed
+  // parameters like this
+  // array('a' => array('b','c'), 'd' => 'e')
+  public static function parse_parameters( $input ) {
+    if (!isset($input) || !$input) return array();
+
+    $pairs = explode('&', $input);
+
+    $parsed_parameters = array();
+    foreach ($pairs as $pair) {
+      $split = explode('=', $pair, 2);
+      $parameter = OAuthUtil::urldecode_rfc3986($split[0]);
+      $value = isset($split[1]) ? OAuthUtil::urldecode_rfc3986($split[1]) : '';
+
+      if (isset($parsed_parameters[$parameter])) {
+        // We have already recieved parameter(s) with this name, so add to the list
+        // of parameters with this name
+
+        if (is_scalar($parsed_parameters[$parameter])) {
+          // This is the first duplicate, so transform scalar (string) into an array
+          // so we can add the duplicates
+          $parsed_parameters[$parameter] = array($parsed_parameters[$parameter]);
+        }
+
+        $parsed_parameters[$parameter][] = $value;
+      } else {
+        $parsed_parameters[$parameter] = $value;
+      }
+    }
+    return $parsed_parameters;
+  }
+
+  public static function build_http_query($params,$multipart=NULL) {
+    if (!$params) return '';
+
+    // Urlencode both keys and values
+    $keys = OAuthUtil::urlencode_rfc3986(array_keys($params));
+    $values = OAuthUtil::urlencode_rfc3986(array_values($params));
+    $params = array_combine($keys, $values);
+
+    // Parameters are sorted by name, using lexicographical byte value ordering.
+    // Ref: Spec: 9.1.1 (1)
+    uksort($params, 'strcmp');
+
+    $pairs = array();
+    foreach ($params as $parameter => $value) {
+      if (is_array($value)) {
+        // If two or more parameters share the same name, they are sorted by their value
+        // Ref: Spec: 9.1.1 (1)
+        natsort($value);
+        foreach ($value as $duplicate_value) {
+          $pairs[] = $parameter . '=' . $duplicate_value;
+        }
+      } else {
+        $pairs[] = $parameter . '=' . $value;
+      }
+    }
+    // For each parameter, the name is separated from the corresponding value by an '=' character (ASCII code 61)
+    // Each name-value pair is separated by an '&' character (ASCII code 38)
+    return implode('&', $pairs);
+  }
+}
+
+?>
diff --git a/lib/timeline_format.php b/lib/timeline_format.php
index f60a10d..503e9a7 100644
--- a/lib/timeline_format.php
+++ b/lib/timeline_format.php
@@ -12,7 +12,7 @@
 			<span class="status_body">
 			<span title="Retweets from people you follow appear in your timeline." class="big-retweet-icon"></span>
 			<span class="status_id">'.$status->id_str.'</span>
-			<span class="status_word"><a class="user_name" href="user.php?id='.$status_owner->screen_name.'">'.$status_owner->screen_name.'</a> <span class="tweet">&nbsp;'.$text.'</span></span>
+			<span class="status_word"><a class="user_name" href="user.php?id='.$status_owner->screen_name.'" id="'.$status_owner->screen_name.'">'.($_COOKIE['shownick']=='true' ? $status_owner->name : $status_owner->screen_name).'</a> <span class="tweet">&nbsp;'.$text.'</span></span>
 			<span class="actions">
 			<a class="replie_btn" title="Reply" href="#">Reply</a>
 			<a class="rt_btn" title="Retweet" href="#">Retweet</a>';
@@ -46,7 +46,7 @@
 			<span class="status_body">
 			<span title="Retweets from people you follow appear in your timeline." class="big-retweet-icon"></span><span class="status_id">'.$status->id_str.'</span>
 			<span class="status_word">
-			<a class="user_name" href="user.php?id='.$status_owner->screen_name.'">'.$status_owner->screen_name.'</a><span class="tweet">&nbsp;'.$text.'</span></span>
+			<a class="user_name" href="user.php?id='.$status_owner->screen_name.'" id="'.$status_owner->screen_name.'">'.($_COOKIE['shownick']=='true' ? $status_owner->name : $status_owner->screen_name).'</a><span class="tweet">&nbsp;'.$text.'</span></span>
 			<span class="actions">
 			<a class="replie_btn" title="Reply" href="#">Reply</a>
 			<a class="rt_btn" title="Retweet" href="#">Retweet</a>';
@@ -55,6 +55,8 @@
 			</span>
 			<span class="status_info">via '.$status->source.'
 			<span class="date"><a href="status.php?id='.$status->id_str.'" id="'.$date.'" target="_blank">'.date('Y-m-d H:i:s', $date).'</a></span>
+			retweeted by '.$status->retweet_count.
+			(($status->retweet_count>1)?' persons':' person').'
 			</span>
 			</span>';
 		$html .= $status->favorited ? '<i class="faved"></i>' : '';
@@ -64,10 +66,10 @@
 
 	function getRetweeters($id, $count = 20){
 		$t = getTwitter();
-		$retweeters = $t->getRetweeters($id);
+		$retweets = $t->retweets($id, $count);
 		$html = '<span class="vcard">';
-		foreach($retweeters as $retweeter){
-			$user = $retweeter->user;
+		foreach($retweets as $retweet){
+			$user = $retweet->user;
 			$html .= '<a class="url" title="'.$user->name.'" rel="contact" href="../user.php?id='.$user->screen_name.'">
 				<img class="photo fn" width="24" height="24" src="'.getAvatar($user->profile_image_url).'" alt="'.$user->name.'" />
 				</a>';
@@ -93,7 +95,7 @@
 		</span>
 		<span class="status_body">
 		<span class="status_id">'.$status->id_str.'</span>
-		<span class="status_word"><a class="user_name" href="user.php?id='.$user->screen_name.'">'.$user->screen_name.'</a> <span class="tweet">&nbsp;'.$text.'</span></span>';
+		<span class="status_word"><a class="user_name" href="user.php?id='.$user->screen_name.'" id="'.$user->screen_name.'">'.($_COOKIE['shownick']=='true' ? $user->name : $user->screen_name).'</a> <span class="tweet">&nbsp;'.$text.'</span></span>';
 		$output .= "<span class=\"actions\">
 			<a class=\"replie_btn\" title=\"Reply\" href=\"#\">Reply</a>
 			<a class=\"rt_btn\" title=\"Retweet\" href=\"#\">Retweet</a>
@@ -118,10 +120,12 @@
 	function format_message($message,$isSentPage=false) {
 		if ($isSentPage) {
 			$name = $message->recipient_screen_name;
+			$nick = $message->recipient->name;
 			$imgurl = getAvatar($message->recipient->profile_image_url);
 			$messenger = $message->recipient;
 		} else {
 			$name = $message->sender_screen_name;
+			$nick = $message->sender->name;
 			$imgurl = getAvatar($message->sender->profile_image_url);
 			$messenger = $message->sender;
 		}
@@ -135,7 +139,7 @@
 				</span>
 				<span class=\"status_body\">
 					<span class=\"status_id\">$message->id </span>
-					<span class=\"status_word\"><a class=\"user_name\" href=\"user.php?id=$name\">$name</a> $text </span>
+					<span class=\"status_word\"><a class=\"user_name\" href=\"user.php?id=$name\" id=\"$name\">".($_COOKIE["shownick"]=='true' ? $nick : $name)."</a> $text </span>
 					<span class=\"actions\">
 		";
 		
diff --git a/lib/twitese.php b/lib/twitese.php
index 05fb287..e6875ca 100644
--- a/lib/twitese.php
+++ b/lib/twitese.php
@@ -1,288 +1,298 @@
-<?php
-	set_time_limit(15);
-	if(!isset($_SESSION)){
-		session_start();
-	}
-	include_once('mobile_device_detect.php');
-	mobile_device_detect(true,true,true,true,true,true,'https://t.orzdream.com/',false);
-	include_once('config.php');
-	include_once('utility.php');
-	include_once('twitteroauth.php');
-	include_once('oauth_lib.php');
-
-	function refreshProfile(){
-		$t = getTwitter();
-		$user = $t->veverify();
-		$time = $_SERVER['REQUEST_TIME']+3600*24*365;
-		setcookie('friends_count', $user->friends_count, $time, '/');
-		setcookie('statuses_count', $user->statuses_count, $time, '/');
-		setcookie('followers_count', $user->followers_count, $time, '/');
-		setcookie('imgurl', getAvatar($user->profile_image_url), $time, '/');
-		setcookie('name', $user->screen_name, $time, '/');
-		setcookie('listed_count', GetListed($t), $time, '/');
-	}
-
-	function getDefCookie($name, $default="") {
-		if (getCookie($name)) return getCookie($name);
-		else return $default;
-	}
-	function format_time($time){
-		date_default_timezone_set('UTC');
-		return strtotime($time);
-	}
-	function formatText($text) {
-		//如果开启了魔术引号\" \' 转回来
-		if (get_magic_quotes_gpc()) {
-			$text = stripslashes($text);
-		}
-
-		//添加url链接
-		$urlReg = '/(((http|https|ftp):\/\/){1}([[:alnum:]\-\.])+(\.)(([[:alnum:]]){2,4})?([[:alnum:]\/+=%#&@\:\;_\.~\?\!\-\,]*))/i';
-		$text = preg_replace($urlReg, '<a href="\1" target="_blank" rel="noreferrer">\1</a>', $text);
-
-		//添加@链接
-		$atReg = '/\B@{1}(([a-zA-Z0-9\_\.\-])+)/i';
-		$text = preg_replace($atReg,	'<a href="user.php?id=\1" target="_blank">\0</a>', $text);
-
-		//添加 list 链接
-		$listReg = '/(\<a[\w+=\:\%\#\&\.~\?\"\'\/\- ]+\>@{1}([a-zA-Z0-9_\.\-]+)<\/a\>([\/a-zA-Z0-9_\.\-]+))/i';
-		$text = preg_replace($listReg,	'<a href="list.php?id=\2\3" target="_blank">@\2\3</a>', $text);
-
-		//添加标签链接
-		$tagReg = "/\B(\#{1}([\w]*[\pN\pC\pL]+[\w]*))([\s]*)/u";
-		$text = preg_replace($tagReg, '<a target="_blank" href="search.php?q=%23\2">#<span class="hashtag">\2</span></a>\3', $text);
-
-		$text = formatTweetID($text);
-
-		return $text;
-	}
-
-	function formatEntities(&$entities,$html){
-		$user_mentions = $entities->user_mentions;
-		$hashtags = $entities->hashtags;
-		$urls = $entities->urls;
-		if(count($user_mentions) > 0) {
-			foreach($user_mentions as $user_mention) {
-				$name = $user_mention->screen_name;
-				$html = str_replace("@$name","<a href=\"user.php?id=$name\" target=\"_blank\">@$name</a>",$html);
-			}
-		}
-		if(count($hashtags) > 0) {
-			foreach($hashtags as $hashtag) {
-				$text = $hashtag->text;
-				$html = str_replace("#$text","<a target=\"_blank\" href=\"search.php?q=%23$text\">#<span class=\"hashtag\">$text</span></a>",$html);
-			}	
-		}
-		if(count($urls) > 0) {
-			$scheme = (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != "on") ? 'http' : 'https';
-			foreach($urls as $url) {
-				$exp = is_null($url->expanded_url) ? $url->url : $url->expanded_url;
-				if(substr($url->url,0,4) != 'http') $url->url = 'http://'.$url->url;
-				if(isset($url->display_url)) {
-					$dis = $url->display_url;
-				} else {
-					$tmp = explode('://', $url->url);
-					$dis = $tmp[1];
-				}
-				$html = str_replace($url->url,"<a href=\"$exp\" target=\"_blank\" rel=\"noreferrer\" class=\"tweet_url\">$dis</a>",$html);
-			}	
-		}
-		if(isset($entities->media)) {
-			$medias = $entities->media;
-			foreach($medias as $media) {
-				$url = $media->media_url_https;
-				if (getcookie('p_avatar') == 'true') {
-						$url = 'img.php?imgurl='.$url;
-				}
-				$html = str_replace($media->url,"<a href=\"$url\" target=\"_blank\" rel=\"noreferrer\">$media->display_url</a>",$html);
-			}
-		}
-		return $html;
-	}
-
-	function formatTweetID($text){
-		$reg = '/(\<a[\w+=@\:\%\#\&\.~\?\"\'\/\-\! ]+\>[\S]+<\/a\>)/i';
-		preg_match_all($reg, $text, $tmpMatches);
-		if(count($tmpMatches) > 0){
-			$text = preg_replace($reg, '$_holder_$', $text);
-		}
-		preg_match_all('/([\d]{10,})/', $text, $matches);
-		if(count($matches) > 0){
-			$matches = array_unique($matches[0]);
-			foreach($matches as $match){
-				$text = str_replace($match, '<a title="We think it\'s a tweet ID, isn\'t it?" href="status.php?id='.$match.'" target="_blank">'.$match.'</a>', $text);
-			}
-			$tmpReg = '/\$_holder_\$/i';
-			foreach($tmpMatches[0] as $match){
-				$text = preg_replace($tmpReg, $match, $text, 1);
-			}
-		}
-		return $text;
-	}
-
-	function processCurl($url,$postdata=false,$header=false)
-	{
-		$ch = curl_init($url);
-
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-		curl_setopt($ch, CURLOPT_VERBOSE, 1);
-		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
-		curl_setopt($ch, CURLOPT_TIMEOUT,120);
-		
-		if($postdata !== false) {
-			curl_setopt ($ch, CURLOPT_POST, true);
-			curl_setopt ($ch, CURLOPT_POSTFIELDS, $postdata);
-		}
-		
-		if($header !== false) {
-			curl_setopt($ch, CURLOPT_HTTPHEADER, $header);
-		}
-		
-		$response = curl_exec($ch);
-		$responseInfo=curl_getinfo($ch);
-		curl_close($ch);
-		if( intval( $responseInfo['http_code'] ) == 200 )
-			return $response;		
-		else
-			return false;
-	}
-
-	function objectifyXml( $data ){
-
-		if( function_exists('simplexml_load_string') ) {
-			$obj = simplexml_load_string( $data );
-		}
-		if (isset($obj->error) || !$obj) return false;
-		else return $obj;
-
-		return false;
-	}
-
-	function objectifyJson($data){
-		if(function_exists("json_decode")){
-			$obj = json_decode($data);
-		}
-		if(!isset($obj->error) || $obj){
-			return $obj;
-		}
-		return false;
-	}
-
-
-	function imageUpload($image){
-		$t = getTwitter();
-		$signingurl = 'https://api.twitter.com/1/account/verify_credentials.json';
-		$request = OAuthRequest::from_consumer_and_token($t->consumer, $t->token, 'GET', $signingurl, array());
-		$request->sign_request($t->sha1_method, $t->consumer, $t->token);
-		$r_header = $request->to_header("http://api.twitter.com/");
-		
-		$url = 'http://img.ly/api/2/upload.json';
-		$postdata = array('media' => $image);		
-		$ch = curl_init($url);		
-		if($postdata !== false)
-		{
-			curl_setopt ($ch, CURLOPT_POST, true);
-			curl_setopt ($ch, CURLOPT_POSTFIELDS, $postdata);
-		}
-		curl_setopt($ch, CURLOPT_HTTPHEADER, array('X-Auth-Service-Provider: '.$signingurl,'X-Verify-Credentials-'.$r_header)); 
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-		curl_setopt($ch, CURLOPT_USERAGENT, 'embr');
-		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
-		curl_setopt($ch, CURLOPT_TIMEOUT,120);
-		curl_setopt($ch, CURLOPT_CONNECTTIMEOUT,5);
-
-		$response = curl_exec($ch);
-		$response_info=curl_getinfo($ch);
-		curl_close($ch);
-		
-		if ($response_info['http_code'] == 200) {
-			return objectifyJson($response);
-		} else {
-			return null;
-		}
-	}
-	
-	function getTwitter() {
-		if(loginStatus()){
-			$access_token = $_SESSION['access_token'] ? $_SESSION['access_token'] : null;
-			$oauth_token = $access_token ? $access_token['oauth_token'] : $_COOKIE['oauth_token'];
-			$oauth_token_secret = $access_token ? $access_token['oauth_token_secret'] : $_COOKIE['oauth_token_secret'];
-			$oauth = new TwitterOAuth(CONSUMER_KEY, CONSUMER_SECRET, $access_token['oauth_token'], $access_token['oauth_token_secret']);
-			return $oauth;
-		}
-		return null;
-	}
-
-   function loginStatus() {
-	   if(isset($_SESSION['login_status'])){
-	      return $_SESSION['login_status'] == 'verified' ? true : false;
-	   }elseif(getEncryptCookie("oauth_token") != "" && getEncryptCookie("oauth_token_secret") != "" && getEncryptCookie("user_id") != "" && getEncryptCookie("twitese_name") != ""){
-	      $access_token = array("oauth_token" => getEncryptCookie("oauth_token"), "oauth_token_secret" => getEncryptCookie("oauth_token_secret"), "user_id" => getEncryptCookie("user_id"), "screen_name" => getEncryptCookie("twitese_name"));
-	      $_SESSION['access_token'] = $access_token;
-	      $_SESSION['login_status'] = 'verified';
-	      refreshProfile();
-	      return true;
-	   }
-	   return false;
-   }
-
-	function GetListed($t, $cursor = false){
-		$lists = $t->beAddedLists($t->username, $cursor);
-		$listed = count($lists->lists);
-		if($lists->next_cursor > 1){
-			$listed += GetListed($t, $lists->next_cursor);
-		}
-		return	$listed;
-	}
-
-	function getAvatar($profileImg){
-		if (getcookie('p_avatar') == 'true') {
-				return 'img.php?imgurl='.$profileImg;
-		}
-		return preg_replace('/https?:\/\/\w+([0-9])\.twimg\.com/i','https://s3.amazonaws.com/twitter_production',$profileImg);
-	}
-
-	// $target: can't be current user
-	// $source: use the current user as the source user implicitly if not specified
-	// 9 => no relationship
-	// 1 => fo each other
-	// 2 => $source fo $target
-	// 3 => $target fo $source
-	// 4 => $source blocking $target
-	function getRelationship($target, $source = false){
-		$relationship = getTwitter()->relationship($target, $source)->relationship;
-		$target = $relationship->target;
-		$source = $relationship->source;
-		if($source->blocking == 1){
-			return 4;
-		}
-		if($source->following == 1 && $target->following == 1){
-			return 1;
-		}
-		if($source->following == 1 && $target->following != 1){
-			return 2;
-		}
-		if($source->following != 1 && $target->following == 1){
-			return 3;
-		}
-		return 9;
-	}
-	
-	function urlshorten($url, $type='goo.gl'){
-		switch($type){
-			case 'goo.gl':
-			$data = json_encode(array('longUrl' => $url));
-			$api = 'https://www.googleapis.com/urlshortener/v1/url?key=AIzaSyDsX2BAo9Jc2yG3Pq1VbLQALqdrtDFvXkg';
-			$header = array('Content-type: application/json');
-			$result = objectifyJson(processCurl($api,$data,$header))->id;
-			break;
-			case 'zi.mu':
-			$api = 'http://zi.mu/api.php?format=simple&action=shorturl&url=';
-			$result = objectifyJson(processCurl($api.rawurlencode($url)));
-			break;
-			default:
-			break;
-		}
-		return $result;
-	}
-?>
+<?php
+	set_time_limit(15);
+	if(!isset($_SESSION)){
+		session_start();
+	}
+	include_once('mobile_device_detect.php');
+	mobile_device_detect(true,true,true,true,true,true,'https://t.orzdream.com/',false);
+	include_once('config.php');
+	include_once('utility.php');
+	include_once('twitteroauth.php');
+	include_once('oauth_lib.php');
+
+	function refreshProfile(){
+		$t = getTwitter();
+		$user = $t->veverify();
+		$time = $_SERVER['REQUEST_TIME']+3600*24*365;
+		setcookie('friends_count', $user->friends_count, $time, '/');
+		setcookie('statuses_count', $user->statuses_count, $time, '/');
+		setcookie('followers_count', $user->followers_count, $time, '/');
+		setcookie('imgurl', getAvatar($user->profile_image_url), $time, '/');
+		setcookie('name', $user->screen_name, $time, '/');
+		setcookie('listed_count', $user->listed_count, $time, '/');
+	}
+
+	function getDefCookie($name, $default="") {
+		if (getCookie($name)) return getCookie($name);
+		else return $default;
+	}
+	function format_time($time){
+		date_default_timezone_set('UTC');
+		return strtotime($time);
+	}
+	function formatText($text) {
+		//如果开启了魔术引号\" \' 转回来
+		if (get_magic_quotes_gpc()) {
+			$text = stripslashes($text);
+		}
+
+		//添加url链接
+		$urlReg = '/(((http|https|ftp):\/\/){1}([[:alnum:]\-\.])+(\.)(([[:alnum:]]){2,4})?([[:alnum:]\/+=%#&@\:\;_\.~\?\!\-\,]*))/i';
+		$text = preg_replace($urlReg, '<a href="\1" target="_blank" rel="noreferrer">\1</a>', $text);
+
+		//添加@链接
+		$atReg = '/\B@{1}(([a-zA-Z0-9\_\.\-])+)/i';
+		$text = preg_replace($atReg,	'<a href="user.php?id=\1" target="_blank">\0</a>', $text);
+
+		//添加 list 链接
+		$listReg = '/(\<a[\w+=\:\%\#\&\.~\?\"\'\/\- ]+\>@{1}([a-zA-Z0-9_\.\-]+)<\/a\>([\/a-zA-Z0-9_\.\-]+))/i';
+		$text = preg_replace($listReg,	'<a href="list.php?id=\2\3" target="_blank">@\2\3</a>', $text);
+
+		//添加标签链接
+		$tagReg = "/\B(\#{1}([\w]*[\pN\pC\pL]+[\w]*))([\s]*)/u";
+		$text = preg_replace($tagReg, '<a target="_blank" href="search.php?q=%23\2">#<span class="hashtag">\2</span></a>\3', $text);
+
+		$text = formatTweetID($text);
+
+		return $text;
+	}
+
+	function formatEntities(&$entities,$html){
+		$user_mentions = $entities->user_mentions;
+		$hashtags = $entities->hashtags;
+		$urls = $entities->urls;
+		if(count($user_mentions) > 0) {
+			foreach($user_mentions as $user_mention) {
+				$name = $user_mention->screen_name;
+				$html = str_replace("@$name","<a href=\"user.php?id=$name\" target=\"_blank\">@$name</a>",$html);
+			}
+		}
+		if(count($hashtags) > 0) {
+			foreach($hashtags as $hashtag) {
+				$text = $hashtag->text;
+				$html = str_replace("#$text","<a target=\"_blank\" href=\"search.php?q=%23$text\">#<span class=\"hashtag\">$text</span></a>",$html);
+			}	
+		}
+		if(count($urls) > 0) {
+			$scheme = (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != "on") ? 'http' : 'https';
+			foreach($urls as $url) {
+				$exp = is_null($url->expanded_url) ? $url->url : $url->expanded_url;
+				if(substr($url->url,0,4) != 'http') $url->url = 'http://'.$url->url;
+				if(isset($url->display_url)) {
+					$dis = $url->display_url;
+				} else {
+					$tmp = explode('://', $url->url);
+					$dis = $tmp[1];
+				}
+				$html = str_replace($url->url,"<a href=\"$exp\" target=\"_blank\" rel=\"noreferrer\" class=\"tweet_url\">$dis</a>",$html);
+			}	
+		}
+		if(isset($entities->media)) {
+			$medias = $entities->media;
+			foreach($medias as $media) {
+				$url = $media->media_url_https;
+				if (getcookie('p_avatar') == 'true') {
+						$url = 'img.php?imgurl='.$url;
+				}
+				$html = str_replace($media->url,"<a href=\"$url\" target=\"_blank\" rel=\"noreferrer\">$media->display_url</a>",$html);
+			}
+		}
+		return $html;
+	}
+
+	function formatTweetID($text){
+		$reg = '/(\<a[\w+=@\:\%\#\&\.~\?\"\'\/\-\! ]+\>[\S]+<\/a\>)/i';
+		preg_match_all($reg, $text, $tmpMatches);
+		if(count($tmpMatches) > 0){
+			$text = preg_replace($reg, '$_holder_$', $text);
+		}
+		preg_match_all('/([\d]{10,})/', $text, $matches);
+		if(count($matches) > 0){
+			$matches = array_unique($matches[0]);
+			foreach($matches as $match){
+				$text = str_replace($match, '<a title="We think it\'s a tweet ID, isn\'t it?" href="status.php?id='.$match.'" target="_blank">'.$match.'</a>', $text);
+			}
+			$tmpReg = '/\$_holder_\$/i';
+			foreach($tmpMatches[0] as $match){
+				$text = preg_replace($tmpReg, $match, $text, 1);
+			}
+		}
+		return $text;
+	}
+
+	function processCurl($url,$postdata=false,$header=false)
+	{
+		$ch = curl_init($url);
+
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+		curl_setopt($ch, CURLOPT_VERBOSE, 1);
+		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
+		curl_setopt($ch, CURLOPT_TIMEOUT,120);
+		
+		if($postdata !== false) {
+			curl_setopt ($ch, CURLOPT_POST, true);
+			curl_setopt ($ch, CURLOPT_POSTFIELDS, $postdata);
+		}
+		
+		if($header !== false) {
+			curl_setopt($ch, CURLOPT_HTTPHEADER, $header);
+		}
+		
+		$response = curl_exec($ch);
+		$responseInfo=curl_getinfo($ch);
+		curl_close($ch);
+		if( intval( $responseInfo['http_code'] ) == 200 )
+			return $response;		
+		else
+			return false;
+	}
+
+	function objectifyXml( $data ){
+
+		if( function_exists('simplexml_load_string') ) {
+			$obj = simplexml_load_string( $data );
+		}
+		if (isset($obj->error) || !$obj) return false;
+		else return $obj;
+
+		return false;
+	}
+
+	function objectifyJson($data){
+		if(function_exists("json_decode")){
+			$obj = json_decode($data);
+		}
+		if(!isset($obj->error) || $obj){
+			return $obj;
+		}
+		return false;
+	}
+
+
+	function imageUpload($image){
+		$t = getTwitter();
+		$signingurl = API_URL.'/account/verify_credentials.json';
+		$request = OAuthRequest::from_consumer_and_token($t->consumer, $t->token, 'GET', $signingurl, array());
+		$request->sign_request($t->sha1_method, $t->consumer, $t->token);
+		$r_header = $request->to_header("https://api.twitter.com/");
+		
+		$url = 'http://img.ly/api/2/upload.json';
+		$postdata = array('media' => $image);		
+		$ch = curl_init($url);		
+		if($postdata !== false)
+		{
+			curl_setopt ($ch, CURLOPT_POST, true);
+			curl_setopt ($ch, CURLOPT_POSTFIELDS, $postdata);
+		}
+		curl_setopt($ch, CURLOPT_HTTPHEADER, array('X-Auth-Service-Provider: '.$signingurl,'X-Verify-Credentials-'.$r_header)); 
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+		curl_setopt($ch, CURLOPT_USERAGENT, 'embr');
+		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
+		curl_setopt($ch, CURLOPT_TIMEOUT,120);
+		curl_setopt($ch, CURLOPT_CONNECTTIMEOUT,5);
+
+		$response = curl_exec($ch);
+		$response_info=curl_getinfo($ch);
+		curl_close($ch);
+		
+		if ($response_info['http_code'] == 200) {
+			return objectifyJson($response);
+		} else {
+			return $response_info['http_code'];
+		}
+	}
+	
+	function getTwitter() {
+		if(loginStatus()){
+			$access_token = $_SESSION['access_token'] ? $_SESSION['access_token'] : null;
+			$oauth_token = $access_token ? $access_token['oauth_token'] : $_COOKIE['oauth_token'];
+			$oauth_token_secret = $access_token ? $access_token['oauth_token_secret'] : $_COOKIE['oauth_token_secret'];
+			$oauth = new TwitterOAuth(CONSUMER_KEY, CONSUMER_SECRET, $access_token['oauth_token'], $access_token['oauth_token_secret']);
+			return $oauth;
+		}
+		return null;
+	}
+
+   function loginStatus() {
+	   if(isset($_SESSION['login_status'])){
+	      return $_SESSION['login_status'] == 'verified' ? true : false;
+	   }elseif(getEncryptCookie("oauth_token") != "" && getEncryptCookie("oauth_token_secret") != "" && getEncryptCookie("user_id") != "" && getEncryptCookie("twitese_name") != ""){
+	      $access_token = array("oauth_token" => getEncryptCookie("oauth_token"), "oauth_token_secret" => getEncryptCookie("oauth_token_secret"), "user_id" => getEncryptCookie("user_id"), "screen_name" => getEncryptCookie("twitese_name"));
+	      $_SESSION['access_token'] = $access_token;
+	      $_SESSION['login_status'] = 'verified';
+	      refreshProfile();
+	      return true;
+	   }
+	   return false;
+   }
+
+	function getAvatar($profileImg){
+		if (getcookie('p_avatar') == 'true') {
+				return 'img.php?imgurl='.$profileImg;
+		}
+		return preg_replace('/https?:\/\/\w+([0-9])\.twimg\.com/i','https://s3.amazonaws.com/twitter_production',$profileImg);
+	}
+
+	// $target: can't be current user
+	// $source: use the current user as the source user implicitly if not specified
+	// 9 => no relationship
+	// 1 => fo each other
+	// 2 => $source fo $target
+	// 3 => $target fo $source
+	// 4 => $source blocking $target
+	function getRelationship($target, $source = false){
+		$relationship = getTwitter()->relationship($target, $source)->relationship;
+		$target = $relationship->target;
+		$source = $relationship->source;
+		if($source->blocking != null){
+			return 4;
+		}
+		if($source->following == true && $target->following == true){
+			return 1;
+		}
+		if($source->following == true && $target->following == false){
+			return 2;
+		}
+		if($source->following == false && $target->following == true){
+			return 3;
+		}
+		return 9;
+	}
+	
+	function urlshorten($url, $type='goo.gl'){
+		switch($type){
+			case 'goo.gl':
+			$data = json_encode(array('longUrl' => $url));
+			$api = 'https://www.googleapis.com/urlshortener/v1/url?key=AIzaSyDsX2BAo9Jc2yG3Pq1VbLQALqdrtDFvXkg';
+			$header = array('Content-type: application/json');
+			$result = objectifyJson(processCurl($api,$data,$header))->id;
+			break;
+			case 'zi.mu':
+			$api = 'http://zi.mu/api.php?format=simple&action=shorturl&url=';
+			$result = objectifyJson(processCurl($api.rawurlencode($url)));
+			break;
+			default:
+			break;
+		}
+		return $result;
+	}
+
+	function expandRedirect($shorturl, &$hops) {
+		if (count($hops) >= 10) {
+			return false;
+		}
+		$head = array_change_key_case(get_headers($shorturl, TRUE), CASE_LOWER);
+		if (!isset($head['location']) || empty($head['location'])) {
+			return $shorturl;
+		}
+		$prevhop = $shorturl;
+		foreach((array)$head['location'] as $redir) {
+			if (substr($redir, 0, 1)=='/' || preg_match('/[\.\/]'.preg_quote(parse_url($prevhop, PHP_URL_HOST)).'$/', parse_url($redir, PHP_URL_HOST))) {
+				return $prevhop;
+			}
+			$hops[] = $prevhop;
+			$prevhop = $redir;
+		}
+		return expandRedirect($redir, $hops);
+	}
+?>
diff --git a/lib/twitter.php b/lib/twitter.php
deleted file mode 100644
index a61a02f..0000000
--- a/lib/twitter.php
+++ /dev/null
@@ -1,1169 +0,0 @@
-<?php
-if (get_magic_quotes_gpc()) {
-
-	$_REQUEST = array_map('stripslashes', $_REQUEST);
-	$_GET     = array_map('stripslashes', $_GET);
-	$_POST    = array_map('stripslashes', $_POST);
-	$_COOKIE  = array_map('stripslashes', $_COOKIE);
-
-}
-class twitter{
-	var $username='';
-	var $password='';
-	var $user_agent='API';
-	var $type='json';
-
-	var $headers=array('Expect:', 'X-Twitter-Client: ','X-Twitter-Client-Version: ','X-Twitter-Client-URL: ');
-	var $responseInfo=array();
-	var $suppress_response_code = false;
-	var $debug = false;
-	public $timeout = 5;
-	public $connecttimeout = 5;
-
-	function twitter($username = '', $password = '', $type = 'json')
-	{
-		if ($username != '' && $password != '') {
-			$this->username = $username;
-			$this->password = $password;
-			$this->type = $type;
-		}
-	}
-
-	function veverify()
-	{
-		$request = API_URL . '/account/verify_credentials.' . $this->type;
-		return $this->objectify( $this->process($request, false, 0) );
-	}
-
-	/**** Get user theme ****/
-	function getTheme()
-	{
-		$twit = $this->veverify();
-		$theme = array( 'background-color' => $twit->profile_background_color, 'background-image-url' => $twit->profile_background_image_url, 'background-tile' => $twit->profile_background_tile == true ? 'repeat' : 'no-repeat', 'link-color' => $twit->profile_link_color, 'sidebar-border-color' => $twit->profile_sidebar_border_color, 'sidebar-fill-color' => $twit->profile_sidebar_fill_color, 'text-color' => $twit->profile_text_color);
-		return $theme;
-	}
-
-
-	/**** Status Methods ****/
-
-	function showStatus( $id )
-	{
-		if( !in_array( $this->type, array( 'xml','json' ) ) )
-			return false;
-
-		$request = API_URL . '/statuses/show/'.$id . '.' . $this->type;
-		return $this->objectify( $this->process($request) );
-	}
-
-	function update( $status, $replying_to = false )
-	{
-		if( !in_array( $this->type, array( 'xml','json' ) ) )
-			return false;
-
-		$args = array();
-		if( $status )
-			$args['status'] = $status;
-		if( $replying_to )
-			$args['in_reply_to_status_id'] = $replying_to;
-		$args['source'] = 'API';
-
-		$qs = '';
-		if( !empty( $args ) )
-			$qs = $this->_glue( $args );
-
-		$request = API_URL . '/statuses/update.' . $this->type . $qs;
-
-		return $this->objectify( $this->process($request, true) );
-	}
-
-	function deleteStatus( $id ) {
-		if( !in_array( $this->type, array( 'xml','json' ) ) )
-			return false;
-
-		$request = API_URL . '/statuses/destroy/' . $id . '.' . $this->type;
-		return $this->objectify( $this->process( $request, true ) );
-	}
-
-
-	/**** Timeline Methods ****/
-
-	function publicTimeline( $sinceid = false )
-	{
-		if( !in_array( $this->type, array( 'xml','json','rss','atom' ) ) )
-			return false;
-
-		$qs='';
-		if( $sinceid !== false )
-			$qs = '?since_id=' . intval($sinceid);
-		$request = API_URL . '/statuses/public_timeline.' . $this->type . $qs;
-
-		return $this->objectify( $this->process($request) );
-	}
-
-	function userTimeline($page=false,$id=false,$count=false,$since_id=false)
-	{
-		if( !in_array( $this->type, array( 'xml','json','rss','atom' ) ) )
-			return false;
-
-		$args = array();
-		if( $id )
-			$args['id'] = $id;
-		if( $count )
-			$args['count'] = (int) $count;
-		if( $since_id )
-			$args['since_id'] = (int) $since_id;
-		if( $page )
-			$args['page'] = (int) $page;
-
-		$qs = '';
-		if( !empty( $args ) )
-			$qs = $this->_glue( $args );
-
-		if( $id === false )
-			$request = API_URL . '/statuses/user_timeline.' . $this->type . $qs;
-		else
-			$request = API_URL . '/statuses/user_timeline/' . rawurlencode($id) . '.' . $this->type . $qs;
-		$response = $this->process($request);
-		if($response == false){
-			return 'protected';
-		}
-		return $this->objectify($response);
-
-	}
-
-	function friendsTimeline( $page = false, $since_id = false,  $count = false )
-	{
-		if( !in_array( $this->type, array( 'xml','json','rss','atom' ) ) )
-			return false;
-
-		$args = array();
-		if( $count )
-			$args['count'] = $count;
-		if( $since_id )
-			$args['since_id'] = $since_id;
-		if( $page )
-			$args['page'] = (int) $page;
-
-		$qs = '';
-		if( !empty( $args ) )
-			$qs = $this->_glue( $args );
-
-		$request = API_URL . '/statuses/friends_timeline.' . $this->type . $qs;
-		return $this->objectify( $this->process($request) );
-
-	}
-
-	function replies( $page = false, $since_id = false )
-	{
-		if( !in_array( $this->type, array( 'xml','json','rss','atom' ) ) )
-			return false;
-
-		$args = array();
-		if( $page )
-			$args['page'] = (int) $page;
-		if( $since_id )
-			$args['since_id'] = $since_id;
-
-		$qs = '';
-		if( !empty( $args ) )
-			$qs = $this->_glue( $args );
-
-		$request = API_URL . '/statuses/mentions.' . $this->type . $qs;    
-
-		return $this->objectify( $this->process($request) );
-
-	}
-
-
-	/**** Direct Message Methods ****/
-
-	function directMessages( $page = false, $since_id = false, $count = null )
-	{
-		if( !in_array( $this->type, array( 'xml','json','rss','atom' ) ) )
-			return false;
-
-		$qs='?';
-		$qsparams = array();
-		if( $since_id )
-			$qsparams['since_id'] = $since_id;
-		if( $page )
-			$qsparams['page'] = (int) $page;
-
-		$request = API_URL . '/direct_messages.' . $this->type . '?' . $this->arrToStr($qsparams);
-
-		return $this->objectify( $this->process($request) );
-	}
-
-	function sentDirectMessage( $page = false, $since = false, $since_id = false )
-	{
-		if( !in_array( $this->type, array( 'xml','json' ) ) )
-			return false;
-
-		$qs = '?';
-		$qsparams = array();
-		if( $since !== false )
-			$qsparams['since'] = rawurlencode($since);
-		if( $since_id )
-			$qsparams['since_id'] = (int) $since_id;
-		if( $page )
-			$qsparams['page'] = (int) $page;
-
-		$request = API_URL . '/direct_messages/sent.' . $this->type  . '?' . $this->arrToStr($qsparams);
-		return $this->objectify( $this->process($request) );
-	}
-
-	function sendDirectMessage( $user, $text )
-	{
-		if( !in_array( $this->type, array( 'xml','json' ) ) )
-			return false;
-
-		$request = API_URL . '/direct_messages/new.' . $this->type;
-		$postargs = 'user=' . rawurlencode($user) . '&text=' . rawurlencode($text);
-
-		return $this->objectify( $this->process($request, $postargs) );
-	}
-
-	function deleteDirectMessage( $id )
-	{
-		if( !in_array( $this->type, array( 'xml','json' ) ) )
-			return false;
-
-		$request = API_URL . '/direct_messages/destroy/' . $id . '.' . $this->type;
-		return $this->objectify( $this->process( $request, true ) );
-	}
-
-
-	/**** User Methods ****/
-
-	function showUser( $id = false , $email = false, $user_id = false, $screen_name=false )
-	{
-		if( !in_array( $this->type, array( 'xml','json' ) ) )
-			return false;
-
-		if (!$id) 
-			$id = $this->username;
-		if( $user_id ) :
-			$qs = '?user_id=' . $user_id;
-		elseif ( $screen_name ) :
-			$qs = '?screen_name=' . (string) $screen_name;
-		elseif ( $email ) :
-			$qs = '?email=' . (string) $email;
-		else :
-			$qs = $id;
-
-endif;
-
-$request = API_URL . '/users/show/' . $qs . '.' . $this->type;
-
-return $this->objectify( $this->process($request) );
-	}
-
-	function friends( $id = false, $page = false , $count = 30 )
-	{
-		if( !in_array( $this->type, array( 'xml','json' ) ) )
-			return false;
-
-		$args = array();
-		if( $id )
-			$args['id'] = $id;
-		if( $count )
-			$args['count'] = (int) $count;
-		$args['cursor'] = $page ? $page : -1; // ¸ü»»ÁËÅжϱí´ïʽ
-		$qs = '';
-		if( !empty( $args ) )
-			$qs = $this->_glue( $args );
-
-		$request = API_URL . ($id ?  "/statuses/friends/$id.$this->type" : "/statuses/friends.$this->type");
-		$request .= $qs;
-		return $this->objectify( $this->process($request) );
-	}
-
-	function relationship($target, $source = false){
-		if($target == $this->username){
-			return -1;
-		}
-		$args = array();
-		$args['target_screen_name'] = $target;
-		if($source){
-			$args['source_screen_name'] = $source;
-		}
-		$request = API_TWITTER."/1/friendships/show.$this->type".$this->_glue($args);
-		return $this->objectify($this->process($request));
-	}
-
-	function followers( $id = false, $page = false , $count = 30 )
-	{
-		if( !in_array( $this->type, array( 'xml','json' ) ) )
-			return false;
-
-		$args = array();
-		if( $id )
-			$args['id'] = $id;
-		if( $count )
-			$args['count'] = (int) $count;
-		$args['cursor'] = $page ? $page : -1; // ¸ü»»ÁËÅжϱí´ïʽ
-		$qs = '';
-		if( !empty( $args ) )
-			$qs = $this->_glue( $args );
-
-		$request = API_URL . ($id ?  "/statuses/followers/$id.$this->type" : "/statuses/followers.$this->type");
-		$request .= $qs;
-
-		return $this->objectify( $this->process($request) );
-	}
-
-	/****** Favorites ******/
-
-	function getFavorites( $page=false )
-	{
-		if( !in_array( $this->type, array( 'xml','json','rss','atom' ) ) )
-			return false;
-
-		if( $page != false )
-			$qs = '?page=' . $page;
-
-		$request = API_URL . '/favorites.' . $this->type . $qs; 
-		return $this->objectify( $this->process($request) );
-	}
-
-	function makeFavorite( $id )
-	{
-		if( !in_array( $this->type, array( 'xml','json' ) ) )
-			return false;
-
-		$request = API_URL . '/favorites/create/' . $id . '.' . $this->type;
-		return $this->objectify( $this->process($request, $args) );
-	}
-
-	function removeFavorite( $id )
-	{
-		if( !in_array( $this->type, array( 'xml','json' ) ) )
-			return false;
-
-		$request = API_URL . '/favorites/destroy/' . $id . '.' . $this->type;
-		return $this->objectify( $this->process($request, true) );	
-	}
-
-
-	/**** Friendship Methods ****/
-
-	function isFriend( $user_a, $user_b )
-	{
-		if( !in_array( $this->type, array( 'xml','json' ) ) )
-			return false;
-
-		$args = array();
-		$args['user_a'] = $user_a;
-		$args['user_b'] = $user_b;
-		$qs = $this->_glue( $args );
-
-		$request = API_URL . '/friendships/exists.' . $this->type . $qs;
-		return $this->objectify( $this->process($request) );
-	}
-
-	function followUser( $id, $notifications = false )
-	{
-		if( !in_array( $this->type, array( 'xml','json' ) ) )
-			return false;
-
-		$request = API_URL . '/friendships/create/' . $id . '.' . $this->type;
-		if( $notifications )
-			$request .= '?follow=true';
-
-		return $this->objectify( $this->process($request, true) );
-	}
-
-	function destroyUser( $id )
-	{
-		if( !in_array( $this->type, array( 'xml','json' ) ) )
-			return false;
-
-		$request = API_URL . '/friendships/destroy/' . $id . '.' . $this->type;
-		return $this->objectify( $this->process($request, true) );
-	}
-
-	/****** Block Methods ******/
-	function blockingList($page = false){
-		$url = API_URL."/blocks/blocking.$this->type";
-		if($page){
-			$url .= "?page=$page";
-		}
-		return $this->objectify($this->process($url));
-	}
-
-	function blockingIDs(){
-		$url = API_URL."blocks/blocking/ids.$this->type";
-		return $this->objectify($this->process($url));
-	}
-
-	function blockUser($id)
-	{
-		if( !in_array( $this->type, array( 'xml','json' ) ) )
-			return false;
-		$request = API_URL . '/blocks/create/' . $id . '.' . $this->type;
-		$args = array();
-		$arps['post_method'] = 1;
-		$result = $this->curl_process($request, $args);
-		if($result->error == 'Not found'){
-			return false;
-		}else{
-			return $result;
-		}
-	}
-
-	function unblockUser($id)
-	{
-		if( !in_array( $this->type, array( 'xml','json' ) ) )
-			return false;
-		$request = API_URL . '/blocks/destroy/' . $id . '.' . $this->type;
-		$args = array();
-		$arps['post_method'] = 1;
-		$result = $this->curl_process($request, $args);
-		if($result->error == 'Not found'){
-			return false;
-		}else{
-			return $result;
-		}
-	}
-
-	function isBlocked($id)
-	{		
-		$request = API_URL . '/blocks/exists/' . $id . '.' . $this->type;
-		$result = $this->curl_process($request);
-		if($result->error == 'Not found'){
-			return "false";
-		}else{
-			return $result;
-		}
-	}
-
-	/****** Trends ******/
-	function trends(){
-		$url = "http://search.twitter.com/trends.$this->type";
-		return $this->curl_process($url);
-	}
-
-	/* ---------- Spam ---------- */
-	function reportSpam($screen_name){
-		$url = API_TWITTER."/1/report_spam.$this->type";
-		$args = array();
-		$args['screen_name'] = $screen_name;
-		return $this->curl_process($url, $args);
-	}
-
-	/****** Social Graph ******/
-
-	function socialGraphFollowing( $id = false)
-	{
-		if( !in_array( $this->type, array( 'xml','json' ) ) )
-			return false;
-
-		$request = API_URL . '/friends/ids';
-		if( $id )
-			$request .= '/' . (int) $id . '.' . $this->type;
-
-		return $this->objectify( $this->process($request) );
-	}
-
-	function socialGraphFollowedBy( $id = false )
-	{
-		if( !in_array( $this->type, array( 'xml','json' ) ) )
-			return false;
-
-		$request = API_URL . '/followers/ids';
-		if( $id )
-			$request .= '/' . (int) $id . '.' . $this->type;
-
-		return $this->objectify( $this->process($request) );
-	}
-
-
-	/****** Account Methods ******/
-
-	function updateDevice( $device )
-	{
-		if( !in_array( $this->type, array( 'xml','json' ) ) )
-			return false;
-
-		if( !in_array( $device, array('im','sms','none') ) )
-			return false;
-
-		$qs = '?device=' . $device;
-		$request = API_URL . '/account/update_delivery_device.' . $this->type . $qs;
-		return $this->objectify( $this->process( $request ) );
-	}
-
-	function updateAvatar( $file )
-	{
-		if( !in_array( $this->type, array( 'xml','json' ) ) )
-			return false;
-
-		// Adding @ ensures the POST will be raw multipart data encoded. This MUST be a file, not a URL. Handle it outside of the class.
-		$postdata = array( 'image' => "@$file");
-		$request = API_URL . '/account/update_profile_image.' . $this->type;
-		return $this->objectify( $this->process( $request, $postdata ) );
-	}
-
-	function updateBackground( $file )
-	{
-		if( !in_array( $this->type, array( 'xml','json' ) ) )
-			return false;
-
-		// Adding @ ensures the POST will be raw multipart data encoded. This MUST be a file, not a URL. Handle it outside of the class.
-		$postdata = array( 'image' => "@$file");
-		$request = API_URL . '/account/update_profile_background_image.' . $this->type;
-		return $this->objectify( $this->process( $request, $postdata ) );
-	}
-
-	function updateProfile( $fields = array() )
-	{
-		if( !in_array( $this->type, array( 'xml','json' ) ) )
-			return false;
-
-		$postdata = array();
-		foreach( $fields as $pk => $pv ) :
-			switch( $pk ) 
-			{
-			case 'name' :
-				$postdata[$pk] = (string) substr( $pv, 0, 20 );
-				break;
-			case 'email' :
-				if( preg_match( '/\b[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}\b/i', $pv ) )
-					$postdata[$pk] = (string) $pv;
-				break;
-			case 'url' :
-				$postdata[$pk] = (string) substr( $pv, 0, 100 );
-				break;
-			case 'location' :
-				$postdata[$pk] = (string) substr( $pv, 0, 30 );
-				break;
-			case 'description' :
-				$postdata[$pk] = (string) substr( $pv, 0, 160 );
-				break;
-			default :
-				break;
-			}
-endforeach;
-
-$request = API_URL . '/account/update_profile.' . $this->type;
-return $this->objectify( $this->process( $request, $postdata ) );
-	}
-
-	function updateColors( $colors = array() )
-	{
-		if( !in_array( $this->type, array( 'xml','json' ) ) )
-			return false;
-
-		$postdata = array();
-		foreach( $colors as $ck => $cv ) :
-			if( preg_match('/^(?:(?:[a-f\d]{3}){1,2})$/i', $hex) ) :
-				$postdata[$ck] = (string) $cv;
-endif;
-endforeach;
-
-$request = API_URL . '/account/update_profile_colors.' . $this->type;
-return $this->objectify( $this->process( $request, $postdata ) );
-	}
-
-
-	/**** Search Method ****/
-
-	function search( $q = false, $page = false, $rpp = false)
-	{
-		if( !$q )
-			return false;
-		$qs = '?q='.urlencode($q);
-		if( $page )
-			$qs .= '&page='.$page;
-		if($rpp){
-			$qs .= '&rpp='.$rpp;
-		}
-		$searchApiUrl = strpos(API_URL, "twitter.com") > 0 ? "http://search.twitter.com" : API_URL;
-		$request = $searchApiUrl . '/search.' . $this->type . $qs;
-
-		return $this->objectify( $this->process($request) );
-	}
-
-	/**** List Method ****/
-
-	function createdLists( $username = '', $cursor = false )
-	{
-		if( !in_array( $this->type, array( 'xml','json','rss','atom' ) ) )
-			return false;
-
-		$args = array();
-		if( $cursor )
-			$args['cursor'] = $cursor;
-
-		$qs = '';
-		if( !empty( $args ) )
-			$qs = $this->_glue( $args );
-
-		$request = API_URL . '/' . $username . '/lists.' . $this->type . $qs;    
-
-		return $this->objectify( $this->process($request) );
-
-	}
-
-	function followedLists( $username = '', $cursor = false )
-	{
-		if( !in_array( $this->type, array( 'xml','json','rss','atom' ) ) )
-			return false;
-
-		$args = array();
-		if( $cursor )
-			$args['cursor'] = $cursor;
-
-		$qs = '';
-		if( !empty( $args ) )
-			$qs = $this->_glue( $args );
-
-		$request = API_URL . '/' . $username . '/lists/subscriptions.' . $this->type . $qs;    
-
-		return $this->objectify( $this->process($request) );
-
-	}
-
-	function beAddedLists( $username = '', $cursor = false )
-	{
-		if( !in_array( $this->type, array( 'xml','json','rss','atom' ) ) )
-			return false;
-
-		$args = array();
-		if( $cursor )
-			$args['cursor'] = $cursor;
-
-		$qs = '';
-		if( !empty( $args ) )
-			$qs = $this->_glue( $args );
-
-		$request = API_URL . '/' . $username . '/lists/memberships.' . $this->type . $qs;    
-
-		return $this->objectify( $this->process($request) );
-
-	}
-
-	//id¸ñʽ£ºusername/listname Àý:bang590/temp ÏÂͬ
-	function listStatus( $id, $page = false, $since_id = false )
-	{
-		if( !in_array( $this->type, array( 'xml','json','rss','atom' ) ) )
-			return false;
-
-		if (!$id) {
-			return false;
-		}
-
-		$arr = explode('/', $id);
-		if (count($arr) != 2) return false;
-		$username = $arr[0];
-		$listname = $arr[1];
-
-		$args = array();
-		if( $page )
-			$args['page'] = (int) $page;
-		if( $since_id )
-			$args['since_id'] = $since_id;
-
-		$qs = '';
-		if( !empty( $args ) )
-			$qs = $this->_glue( $args );
-
-		$request = API_URL . "/$username/lists/$listname/statuses." . $this->type . $qs;    
-
-		return $this->objectify( $this->process($request) );
-
-	}
-
-	function listInfo( $id ) {
-		if( !in_array( $this->type, array( 'xml','json' ) ) )
-			return false;
-
-		if (!$id) {
-			return false;
-		}
-
-		$arr = explode('/', $id);
-		if (count($arr) != 2) return false;
-		$username = $arr[0];
-		$listname = $arr[1];
-
-		$request = API_URL . "/$username/lists/$listname." . $this->type;    
-		return $this->objectify( $this->process($request) );
-	}
-
-	function isFollowedList( $id )
-	{
-		if( !in_array( $this->type, array( 'xml','json' ) ) )
-			return false;
-
-		$arr = explode('/', $id);
-		if (count($arr) != 2) return false;
-		$username = $arr[0];
-		$listname = $arr[1];
-
-		$request = API_URL . "/$username/$listname/subscribers/$this->username." . $this->type;
-		return $this->objectify( $this->process($request) );
-	}
-
-
-	function listMembers( $id, $cursor = false )
-	{
-		if( !in_array( $this->type, array( 'xml','json' ) ) )
-			return false;
-
-		$arr = explode('/', $id);
-		if (count($arr) != 2) return false;
-		$username = $arr[0];
-		$listname = $arr[1];
-
-		$args = array();
-		if( $cursor )
-			$args['cursor'] = $cursor;
-		$qs = '';
-		if( !empty( $args ) )
-			$qs = $this->_glue( $args );
-
-		$request = API_URL . "/1/$username/$listname/members." . $this->type . $qs;  
-		return $this->objectify( $this->process($request) );
-	}
-
-	function listFollowers( $id, $cursor = false )
-	{
-		if( !in_array( $this->type, array( 'xml','json' ) ) )
-			return false;
-
-		$arr = explode('/', $id);
-		if (count($arr) != 2) return false;
-		$username = $arr[0];
-		$listname = $arr[1];
-
-		$args = array();
-		if( $cursor )
-			$args['cursor'] = $cursor;
-		$qs = '';
-		if( !empty( $args ) )
-			$qs = $this->_glue( $args );
-
-		$request = API_URL . "/1/$username/$listname/subscribers." . $this->type . $qs;  
-		return $this->objectify( $this->process($request) );
-	}
-
-	function followList( $id )
-	{
-		if( !in_array( $this->type, array( 'xml','json' ) ) )
-			return false;
-
-		$arr = explode('/', $id);
-		if (count($arr) != 2) return false;
-		$username = $arr[0];
-		$listname = $arr[1];
-
-		$request = API_URL . "/1/$username/$listname/subscribers." . $this->type;  
-		return $this->objectify( $this->process($request, true) );
-	}
-
-	function unfollowList( $id )
-	{
-		if( !in_array( $this->type, array( 'xml','json' ) ) )
-			return false;
-
-		$arr = explode('/', $id);
-		if (count($arr) != 2) return false;
-		$username = $arr[0];
-		$listname = $arr[1];
-
-		$request = API_URL . "/1/$username/$listname/subscribers." . $this->type;  
-		return $this->objectify( $this->process($request, "DELETE") );
-	}
-
-	function createList( $name, $description, $isProtect)
-	{
-		if( !in_array( $this->type, array( 'xml','json' ) ) )
-			return false;
-
-		$mode = $isProtect ? "private" : "public";
-		$args = array();
-		if( $name )
-			$args['name'] = $name;
-		if( $description )
-			$args['description'] = $description;
-		if( $isProtect )
-			$args['mode'] = $mode;
-		$qs = '';
-		if( !empty( $args ) )
-			$qs = $this->_glue( $args );
-
-		$request = API_URL . "/$this->username/lists." . $this->type . $qs; 
-
-		return $this->objectify( $this->process($request, true) );
-	}
-
-	function editList( $prename, $name, $description, $isProtect)
-	{
-		if( !in_array( $this->type, array( 'xml','json' ) ) )
-			return false;
-
-		$mode = $isProtect ? "private" : "public";
-		$args = array();
-		if( $name )
-			$args['name'] = $name;
-		if( $description )
-			$args['description'] = $description;
-		if( $isProtect )
-			$args['mode'] = $mode;
-		$qs = '';
-		if( !empty( $args ) )
-			$qs = $this->_glue( $args );
-
-		$request = API_URL . "/$this->username/lists/$prename." . $this->type . $qs; 
-
-		return $this->objectify( $this->process($request, true) );
-	}
-
-	function deleteList( $id)
-	{
-		if( !in_array( $this->type, array( 'xml','json' ) ) )
-			return false;
-
-		$arr = explode('/', $id);
-		if (count($arr) != 2) return false;
-		$username = $arr[0];
-		$listname = $arr[1];
-
-		$request = API_URL . "/$username/lists/$listname." . $this->type; 
-
-		return $this->objectify( $this->process($request, "DELETE") );
-	}
-
-
-	function deleteListMember( $id, $memberid )
-	{
-		if( !in_array( $this->type, array( 'xml','json' ) ) )
-			return false;
-
-		$arr = explode('/', $id);
-		if (count($arr) != 2) return false;
-		$username = $arr[0];
-		$listname = $arr[1];
-
-		$args = array();
-		if( $memberid )
-			$args['id'] = $memberid;
-		$qs = '';
-		if( !empty( $args ) )
-			$qs = $this->_glue( $args );
-
-		$request = API_URL . "/$username/$listname/members." . $this->type . $qs;  
-
-		return $this->objectify( $this->process($request, "DELETE") );
-	}
-
-	function addListMember( $listid, $memberid )
-	{
-		if( !in_array( $this->type, array( 'xml','json' ) ) )
-			return false;
-
-		$args = array();
-		if( $memberid )
-			$args['id'] = $memberid;
-		$qs = '';
-		if( !empty( $args ) )
-			$qs = $this->_glue( $args );
-
-		$request = API_URL . "/$this->username/$listid/members." . $this->type . $qs;  
-		return $this->objectify( $this->process($request, true) );
-	}
-
-	/* ---------- Retweet ---------- */
-	function getRetweeters($id, $count = false){
-		$url = "http://api.twitter.com/1/statuses/retweets/$id.$this->type";
-		if($count != false){
-			$url .= "?count=$count";
-		}
-		return $this->objectify($this->process($url, $args));
-	}
-
-	function retweet($id){
-		$url = "http://api.twitter.com/1/statuses/retweet/$id.$this->type";
-		$args = array();
-		$args['post_method'] = true;
-		return $this->curl_process($url, $args);
-	}
-
-	function retweets($id, $count = false){
-		$url = "http://api.twitter.com/1/statuses/retweets/id.$this->type";
-		if($count){
-			$url .= "?count=".($count > 100 ? 100 : $count);
-		}
-		return $this->curl_process($url);
-	}
-
-	function retweeted_by_me($page = false, $count = 20, $since_id = false, $max_id = false){
-		$url = "http://api.twitter.com/1/statuses/retweeted_by_me.$this->type";
-		$args = array();
-		if($since_id){
-			$args['since_id'] = $since_id;
-		}
-		if($max_id){
-			$args['max_id'] = $max_id;
-		}
-		if($count){
-			$args['count'] = $count;
-		}
-		if($page){
-			$args['page'] = $page;
-		}
-		$url .= $this->_glue($args);
-		return $this->curl_process($url);
-	}
-
-	function retweeted_to_me($page = false, $count = false, $since_id = false, $max_id = false){
-		$url = "http://api.twitter.com/1/statuses/retweeted_to_me.$this->type";
-		$args = array();
-		if($since_id){
-			$args['since_id'] = $since_id;
-		}
-		if($max_id){
-			$args['max_id'] = $max_id;
-		}
-		if($count){
-			$args['count'] = $count;
-		}
-		if($page){
-			$args['page'] = $page;
-		}
-		$url .= $this->_glue($args);
-		return $this->curl_process($url);
-	}
-
-	function retweets_of_me($page = false, $count = false, $since_id = false, $max_id = false){
-		$url = "http://api.twitter.com/1/statuses/retweets_of_me.$this->type";
-		$args = array();
-		if($since_id){
-			$args['since_id'] = $since_id;
-		}
-		if($max_id){
-			$args['max_id'] = $max_id;
-		}
-		if($count){
-			$args['count'] = $count;
-		}
-		if($page){
-			$args['page'] = $page;
-		}
-		$url .= $this->_glue($args);
-		return $this->curl_process($url);
-	}
-
-	/**** Twitese Method ****/
-
-	function rank( $page = false, $count = false )
-	{
-		$args = array();
-		if( $page )
-			$args['page'] = $page;
-		if( $count )
-			$args['count'] = $count;
-		$qs = $this->_glue( $args );
-
-		$request = TWITESE_API_URL . '/rank.' . $this->type . $qs;
-
-		return $this->objectify( $this->process($request) );
-	}
-
-	function browse( $page = false, $count = false )
-	{
-		$args = array();
-		if( $page )
-			$args['page'] = $page;
-		if( $count )
-			$args['count'] = $count;
-		$qs = $this->_glue( $args );
-
-		$request = TWITESE_API_URL . '/browse.' . $this->type . $qs;
-
-		return $this->objectify( $this->process($request) );
-	}
-	/**** API Rate Limit ****/
-	function ratelimit()
-	{
-		if( !in_array( $this->type, array( 'xml','json' ) ) )
-			return false;
-		$request = API_URL . '/account/rate_limit_status.' . $this->type;
-		return $this->objectify( $this->process($request) );
-	}
-
-	function ratelimit_status()
-	{
-		return $this->ratelimit();
-	}
-
-	/**** Upload Photo ****/
-	/****
-		function twitgooUpload( $image ) {
-				$postdata = array( 'media' => "@$image", 'username' => $this->username, 'password' => $this->password);
-			$request = 'http://twitgoo.com/api/upload';
-			$this->type = 'xml';
-			return $this->objectify( $this->process( $request, $postdata ) );
-		}
-	****/	
-	function imglyUpload( $image ) {
-		$postdata = array( 'media' => "@$image", 'username' => $this->username, 'password' => $this->password);
-		$request = 'http://img.ly/api/upload';
-		$this->type = 'xml';
-		$this->ssl_mode = 1;
-		return $this->objectify( $this->process( $request, $postdata ) );
-	}
-
-	/****** Tests ******/
-
-	function twitterAvailable()
-	{
-		if( !in_array( $this->type, array( 'xml','json' ) ) )
-			return false;
-
-		$request = API_URL . '/help/test.' . $this->type;
-		if( $this->objectify( $this->process($request) ) == 'ok' )
-			return true;
-
-		return false;
-	}
-
-
-	/**** request method ****/
-	function process($url,$postargs=false,$ssl_mode=0)
-	{
-		if ($this->debug) {
-			echo $url;
-		}
-		$url = ( $this->suppress_response_code ) ? $url . '&suppress_response_code=true' : $url;
-		$ch = curl_init($url);
-		curl_setopt($ch, CURLOPT_HTTPHEADER, array("Expect:"));
-
-		if($postargs !== false)
-		{
-			curl_setopt ($ch, CURLOPT_POST, true);
-			curl_setopt ($ch, CURLOPT_POSTFIELDS, $postargs);
-			if ($postargs === "DELETE") {
-				curl_setopt ($ch, CURLOPT_POSTFIELDS, "_method=DELETE");
-			}
-		}
-
-
-		if($this->username !== false && $this->password !== false)
-			curl_setopt($ch, CURLOPT_USERPWD, $this->username.':'.$this->password );
-
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-		//		    curl_setopt($ch, CURLOPT_VERBOSE, 1);
-		curl_setopt($ch, CURLOPT_USERAGENT, $this->user_agent);
-		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, $ssl_mode);
-
-		$response = curl_exec($ch);
-
-		$this->responseInfo=curl_getinfo($ch);
-		curl_close($ch);
-		if(intval($this->responseInfo['http_code'] ) == 200)
-			return $response;    
-		else
-			return false;
-	}
-
-	function curl_process($url, $postargs = false)
-	{
-		$url = ( $this->suppress_response_code ) ? $url . '&suppress_response_code=true' : $url;
-		$ch = curl_init($url);
-		curl_setopt($ch, CURLOPT_HTTPHEADER, array("Expect:"));
-
-		if($postargs !== false)
-		{
-			if(isset($postargs['post_method'])){
-				curl_setopt ($ch, CURLOPT_POST, true);
-			}else{
-				curl_setopt ($ch, CURLOPT_POST, true);
-				curl_setopt ($ch, CURLOPT_POSTFIELDS, $postargs);
-				if ($postargs === "DELETE") {
-					curl_setopt ($ch, CURLOPT_POSTFIELDS, "_method=DELETE");
-				}
-			}
-		}
-
-		if($this->username !== false && $this->password !== false)
-			curl_setopt($ch, CURLOPT_USERPWD, $this->username.':'.$this->password );
-
-		curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $this->connecttimeout);
-		curl_setopt($ch, CURLOPT_TIMEOUT, $this->timeout);
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-		curl_setopt($ch, CURLOPT_USERAGENT, $this->user_agent);
-		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
-
-		$response = curl_exec($ch);
-
-		$this->responseInfo = curl_getinfo($ch);
-		curl_close($ch);
-
-		if($response === false){
-			return false;
-		}
-		if($this->type == 'xml'){
-			return @simplexml_load_string($response);
-		}else if($this->type == 'json'){
-			return @json_decode($response);
-		}
-	}
-
-	// Ôö¼Ó $api_type ²ÎÊý
-	function objectify( $data )
-	{
-		if($date === false){
-			return;
-		}
-		if( $this->type ==  'json' ) {
-			$result = @json_decode( $data );
-			if ($this->debug) {
-				echo '<pre>';
-				print_r($result);
-				echo '</pre>';
-			}
-			if (isset($result->error)) {
-				if (substr_count($result->request, 'user_timeline') && $result->error == 'Not authorized') {
-					return 'protected';
-				}
-				return false;
-			}
-			else return $result;
-		}else if( $this->type == 'xml' ){
-			if( function_exists('simplexml_load_string') ) {
-				$obj = @simplexml_load_string( $data );
-			}
-			if ($this->debug) {
-				echo '<pre>';
-				print_r($obj);
-				echo '</pre>';
-			}
-			if (isset($obj->error) || !$obj) return false;
-			else return $obj;
-		}
-		else
-			return false;
-	}
-
-	function arrToStr($postargs) {
-		$post_str = '';
-		foreach ($postargs as $key=>$value) {
-			$post_str .= $key . "=" . $value . "&";
-		}
-		$post_str = substr($post_str, 0,-1);
-		return $post_str;
-	}
-
-	function _glue( $array )
-	{
-		$query_string = '';
-		foreach( $array as $key => $val ) :
-			$query_string .= $key . '=' . rawurlencode( $val ) . '&';
-endforeach;
-
-return '?' . substr( $query_string, 0, strlen( $query_string )-1 );
-	}
-}
-?>
diff --git a/lib/twitteroauth.php b/lib/twitteroauth.php
index 9dedf59..7c9157f 100644
--- a/lib/twitteroauth.php
+++ b/lib/twitteroauth.php
@@ -1,830 +1,765 @@
-<?php
-/*
- * Abraham Williams (abraham@abrah.am) http://abrah.am
- *
- * Basic lib to work with Twitter's OAuth beta. This is untested and should not
- * be used in production code. Twitter's beta could change at anytime.
- *
- * Code based on:
- * Fire Eagle code - http://github.com/myelin/fireeagle-php-lib
- * twitterlibphp - http://github.com/jdp/twitterlibphp
- */
-
-//require_once('config.php');
-//require_once('oauth_lib.php');
-
-/**
- * Twitter OAuth class
- */
-class TwitterOAuth {
-	/* Contains the last HTTP status code returned */
-	public $http_code;
-	/* Contains the last API call */
-	public $last_api_call;
-	/* Set up the API root URL */
-	//public $host = "https://api.twitter.com/1/";
-	public $host = API_URL;
-	/* Set timeout default */
-	public $timeout = 5;
-	/* Set connect timeout */
-	public $connecttimeout = 30;
-	/* Verify SSL Cert */
-	public $ssl_verifypeer = FALSE;
-	/* Response type */
-	public $type = 'json';
-	/* Decode return json data */
-	public $decode_json = TRUE;
-
-	public $source = 'embr';
-
-	// user info
-	public $username;
-	public $screen_name;
-	public $user_id;
-	
-	//for debug use
-	public $curl_info;
-	public $http_header;
-
-	/**
-	 * Set API URLS
-	 */
-	function accessTokenURL()  { return 'https://api.twitter.com/oauth/access_token'; }
-	function authenticateURL() { return 'https://api.twitter.com/oauth/authenticate'; }
-	function authorizeURL()    { return 'https://api.twitter.com/oauth/authorize'; }
-	function requestTokenURL() { return 'https://api.twitter.com/oauth/request_token'; }
-
-	/**
-	 * Debug helpers
-	 */
-	function lastStatusCode() { return $this->http_status; }
-	function lastAPICall() { return $this->last_api_call; }
-
-	/**
-	 * construct TwitterOAuth object
-	 */
-	function __construct($consumer_key, $consumer_secret, $oauth_token = NULL, $oauth_token_secret = NULL) {
-		$this->sha1_method = new OAuthSignatureMethod_HMAC_SHA1();
-		$this->consumer = new OAuthConsumer($consumer_key, $consumer_secret);
-		if (!empty($oauth_token) && !empty($oauth_token_secret)) {
-			$this->token = new OAuthConsumer($oauth_token, $oauth_token_secret);
-			$this->screen_name = $_SESSION['access_token']['screen_name'];
-			$this->username = $_SESSION['access_token']['screen_name'];
-			$this->user_id = $_SESSION['access_token']['user_id'];
-		} else {
-			$this->token = NULL;
-		}
-	}
-
-
-	/**
-	 * Get a request_token from Twitter
-	 *
-	 * @returns a key/value array containing oauth_token and oauth_token_secret
-	 */
-	function getRequestToken($oauth_callback = NULL) {
-		$parameters = array();
-		if (!empty($oauth_callback)) {
-			$parameters['oauth_callback'] = $oauth_callback;
-		} 
-		$request = $this->oAuthRequest($this->requestTokenURL(), 'GET', $parameters);
-		$token = OAuthUtil::parse_parameters($request);
-		$this->token = new OAuthConsumer($token['oauth_token'], $token['oauth_token_secret']);
-		return $token;
-	}
-
-	/**
-	 * Get the authorize URL
-	 *
-	 * @returns a string
-	 */
-	function getAuthorizeURL($token) {
-		if (is_array($token)) {
-			$token = $token['oauth_token'];
-		}
-		return $this->authorizeURL() . "?oauth_token={$token}";
-	}
-
-	/**
-	 * Exchange the request token and secret for an access token and
-	 * secret, to sign API calls.
-	 *
-	 * @returns array("oauth_token" => the access token,
-	 *                "oauth_token_secret" => the access secret)
-	 */
-	function getAccessToken($oauth_verifier = FALSE) {
-		$parameters = array();
-		if (!empty($oauth_verifier)) {
-			$parameters['oauth_verifier'] = $oauth_verifier;
-		}
-		$request = $this->oAuthRequest($this->accessTokenURL(), 'GET', $parameters);
-		$token = OAuthUtil::parse_parameters($request);
-		$this->token = new OAuthConsumer($token['oauth_token'], $token['oauth_token_secret']);
-		return $token;
-	}
-
-	/**
-	 * GET wrappwer for oAuthRequest.
-	 */
-	function get($url, $parameters = array()) {
-		$response = $this->oAuthRequest($url, 'GET', $parameters);
-		if($response == false){
-			return false;
-		}
-		if ($this->type == 'json' && $this->decode_json) {
-			return json_decode($response);
-		}elseif($this->type == 'xml' && function_exists('simplexml_load_string')){
-			return simplexml_load_string($response);
-		}
-		return $response;
-	}
-
-	/**
-	 * POST wreapper for oAuthRequest.
-	 */
-	function post($url, $parameters = array(), $multipart = NULL) {
-		$response = $this->oAuthRequest($url, 'POST', $parameters, $multipart);
-		if($response === false){
-			return false;
-		}
-		if ($this->type === 'json' && $this->decode_json) {
-			return json_decode($response);
-		}elseif($this->type == 'xml' && function_exists('simplexml_load_string')){
-			return simplexml_load_string($response);
-		}
-		return $response;
-	}
-
-	/**
-	 * DELTE wrapper for oAuthReqeust.
-	 */
-	function delete($url, $parameters = array()) {
-		$response = $this->oAuthRequest($url, 'DELETE', $parameters);
-		if($response === false){
-			return false;
-		}
-		if ($this->type === 'json' && $this->decode_json) {
-			return json_decode($response);
-		}elseif($this->type == 'xml' && function_exists('simplexml_load_string')){
-			return simplexml_load_string($response);
-		}
-		return $response;
-	}
-
-	/**
-	 * Format and sign an OAuth / API request, then make an HTTP request
-	 */
-	function oAuthRequest($url, $method, $parameters, $multipart=NULL) {
-		if ($url[0] == '/') { //non-twitter.com api shall offer the entire url.
-			$url = "{$this->host}{$url}.{$this->type}";
-		}
-		$request = OAuthRequest::from_consumer_and_token($this->consumer, $this->token, $method, $url, $parameters);
-		$request->sign_request($this->sha1_method, $this->consumer, $this->token);
-		$request->set_http_header($multipart);
-		
-		$ci = curl_init();
-		/* Curl settings */
-		curl_setopt($ci, CURLOPT_CONNECTTIMEOUT, $this->connecttimeout);
-		curl_setopt($ci, CURLOPT_TIMEOUT, $this->timeout);
-		curl_setopt($ci, CURLOPT_RETURNTRANSFER, TRUE);
-		curl_setopt($ci, CURLOPT_SSL_VERIFYPEER, $this->ssl_verifypeer);
-
-		switch ($method) {
-		case 'GET':
-			curl_setopt($ci, CURLOPT_URL, $request->to_url());
-			curl_setopt($ci, CURLOPT_HTTPHEADER, array('Expect:'));
-			break;
-		case 'POST':
-			$postfields = $multipart ? $multipart : $request->to_postdata();
-			curl_setopt($ci, CURLOPT_URL, $request->get_normalized_http_url());
-			curl_setopt($ci, CURLOPT_HTTPHEADER, $request->http_header);
-			curl_setopt($ci, CURLOPT_POST, TRUE);
-			if (!empty($postfields)) {
-				curl_setopt($ci, CURLOPT_POSTFIELDS, $postfields);
-			}
-			break;
-		case 'DELETE':
-			$postfields = $request->to_postdata($multipart);
-			$url = $request->get_normalized_http_url();
-			curl_setopt($ci, CURLOPT_CUSTOMREQUEST, 'DELETE');
-			curl_setopt($ci, CURLOPT_HTTPHEADER, array('Expect:'));
-			if (!empty($postfields)) {
-				$url = "{$url}?{$postfields}";
-				curl_setopt($ci, CURLOPT_URL, $url);
-			}
-		}
-
-		$response = curl_exec($ci);
-		$this->http_header = $request->http_header;
-		$this->curl_info = curl_getinfo($ci);
-		$this->http_code = curl_getinfo($ci, CURLINFO_HTTP_CODE);
-		$this->last_api_call = curl_getinfo($ci, CURLINFO_EFFECTIVE_URL);
-		
-		curl_close ($ci);
-		
-		return $response;
-	}
-	
-
-	/* ---------- API METHODS ---------- */
-	/*                                   */
-	/* ---------- Block ---------- */
-	function blockingIDs(){
-		$url = '/blocks/blocking/ids';
-		return $this->get($url);
-	}
-
-	function blockingList($id, $cursor=-1, $skip_status = 1){
-		$url = '/blocks/list';
-		$args = array();
-		if($id)
-			$args['user_id'] = $id;
-		if($cursor)
-			$args['cursor'] = $cursor;
-		$args['skip_status'] = $skip_status;
-		return $this->get($url, $args);
-	}
-
-	function blockUser($id){
-		$url = "/blocks/create/$id";
-		return $this->post($url);
-	}
-
-	function isBlocked($id){
-		$url = "/blocks/exists/$id";
-		return $this->get($url);
-	}
-
-	function unblockUser($id){
-		$url = "/blocks/destroy/$id";
-		return $this->delete($url);
-	}
-
-	/* ---------- Messages ---------- */
-	function deleteDirectMessage($id){
-		$url = "/direct_messages/destroy/$id";
-		return $this->delete($url);
-	}
-
-	function directMessages($page = false, $since_id = false, $count = null, $include_entities = true){
-		$url = '/direct_messages';
-		$args = array();
-		if( $since_id )
-			$args['since_id'] = $since_id;
-		if( $page )
-			$args['page'] = $page;
-		if($include_entities)
-			$args['include_entities'] = $include_entities;
-		return $this->get($url, $args);
-	}
-
-	function sendDirectMessage($user, $text){
-		$url = '/direct_messages/new';
-		$args = array();
-		$args['user'] = $user;
-		if($text)
-			$args['text'] = $text;
-		return $this->post($url, $args);
-	}
-
-	function sentDirectMessage($page = false, $since = false, $since_id = false){
-		$url = '/direct_messages/sent';
-		$args = array();
-		if($since)
-			$args['since'] = $since;
-		if($since_id)
-			$args['since_id'] = $since_id;
-		if($page)
-			$args['page'] = $page;
-		return $this->get($url, $args);
-	}
-
-	/* ---------- List ---------- */
-	function addListMember($listid, $memberid){
-		$url = "/lists/members/create_all";
-		$args = array();
-		if($listid) 
-			$args['slug'] = $listid;
-		if($memberid)
-			$args['user_id'] = $memberid;
-		
-		return $this->post($url, $args);
-	}
-
-	function beAddedLists($owner_screen_name = '', $cursor = false){
-		$url = "/lists/memberships";
-		$args = array();
-		if($owner_screen_name)
-			$args['owner_screen_name'] = $owner_screen_name;
-		if($cursor){
-			$args['cursor'] = $cursor;
-		}
-		return $this->get($url, $args);
-	}
-
-	function createList($name, $description, $isPortect){
-		$url = "/lists/create";
-		$args = array();
-		if($name)
-			$args['name'] = $name;
-		if($description)
-			$args['description'] = $description;
-		if($isProtect)
-			$args['mode'] = 'private';
-		
-		return $this->post($url, $args);
-	}
-
-	function createdLists($username = '', $cursor = false){
-		$url = "/lists/ownerships";
-		$args = array();
-		if($cursor)
-			$args['cursor'] = $cursor;
-		
-		return $this->get($url, $args);
-	}
-
-	function deleteList($id){
-		$url = "/lists/destroy";
-		$args = array();
-		$args['owner_screen_name'] = $arr[0];
-		$args['slug'] = $arr[1];
-		return $this->post($url, $args);
-	}
-
-	function deleteListMember($id, $memberid){
-		$arr = explode("/", $id);
-		$url = "/lists/members/destroy_all";
-		$args = array();
-		$args['slug'] = $arr[1];
-		if($memberid)
-			$args['id'] = $memberid;
-		
-		return $this->post($url, $args);
-	}
-
-	function editList($prename, $name, $description, $isProtect){
-		$url = "/lists/update";
-		$args = array();
-		if($prename)
-			$args['slug'] = $prename;
-		if($name)
-			$args['name'] = $name;
-		if($description)
-			$args['description'] = $description;
-		if($isProtect)
-			$args['mode'] = "private";
-		return $this->post($url, $args);
-	}
-
-	function followedLists($username = '', $cursor = false){
-		$url = "/lists/subscriptions";
-		$args = array();
-		if($username) 
-			$args['user_id'] = $username;
-		if($cursor)
-			$args['cursor'] = $cursor;
-		return $this->get($url, $args);
-	}
-
-	function followList($id){
-		$url = "/lists/subscribers/create";
-		$arr = explode("/", $id);
-		$args = array();
-		$args['owner_screen_name'] = $arr[0];
-		$args['slug'] = $arr[1];
-		return $this->post($url, $args);
-	}
-
-	function isFollowedList($id){
-		$url = "/lists/subscribers/show";
-		$arr = explode('/', $id);
-		$args = array();
-		$args['owner_screen_name'] = $arr[0];
-		$args['slug'] = $arr[1];
-		$args['user_id'] = $this->username;
-		return $this->get($url, $args);
-	}
-
-	function listFollowers($id, $cursor = false, $skip_status = 1){
-		$url = "/lists/subscribers";
-		$arr = explode('/', $id);
-		$args = array();
-		$args['owner_screen_name'] = $arr[0];
-		$args['slug'] = $arr[1];
-		if($cursor){
-			$args['cursor'] = $cursor;
-		}
-		$args['skip_status'] = $skip_status;
-		return $this->get($url, $args);
-	}
-
-	function listInfo($id){
-		$arr = explode('/', $id);
-		$url = "/lists/show";
-		$args = array();
-		$args['owner_screen_name'] = $arr[0];
-		$args['slug'] = $arr[1];
-		return $this->get($url, $args);
-	}
-
-	function listMembers($id, $cursor = false, $skip_status = 1){
-		$arr = explode("/", $id);
-		$url = "/lists/members";
-		$args = array();
-		$args['owner_screen_name'] = $arr[0];
-		$args['slug'] = $arr[1];
-		if($cursor){
-			$args['cursor'] = $cursor;
-		}
-		$args['skip_status'] = $skip_status;
-		return $this->get($url, $args);
-
-	}
-
-	function listStatus($id, $page = false, $since_id = false,$include_rts = true, $include_entities = true){
-		$arr = explode('/', $id);
-		$url = '/lists/statuses';
-		$args = array();
-		$args['slug'] = $arr[1];
-		$args['owner_screen_name'] = $arr[0];
-		if($page){
-			$args['page'] = $page;
-		}
-		if($since_id){
-			$args['since_id'] = $since_id;
-		}
-		if($include_rts)
-			$args['include_rts'] = $include_rts;
-		if($include_entities)
-			$args['include_entities'] = $include_entities;
-		return $this->get($url, $args);
-	}
-
-	function unfollowList($id){
-		$arr = explode("/", $id);
-		$url = "/lists/subscribers/destroy";
-		$args = array();
-		$args['owner_screen_name'] = $arr[0];
-		$args['slug'] = $arr[1];
-		return $this->post($url, $args);
-	}
-
-	/* ---------- Friendship ---------- */
-	function destroyUser($id){
-		$url = "/friendships/destroy/$id";
-		return $this->delete($url);
-	}
-
-	function followers($id = false, $page = false, $skip_status = true){
-		$url = 'followers/list';
-		if( $id )
-			$args['user_id'] = $id;
-		$args['cursor'] = $page ? $page : -1;
-		$args['skip_status'] = $skip_status;
-		return $this->get($url, $args);
-	}
-
-	function followUser($id, $notifications = false){
-		$url = "/friendships/create/$id";
-		$args = array();
-		if($notifications)
-			$args['follow'] = true;
-		return $this->post($url, $args);
-	}
-
-	function friends($id = false, $page = false, $skip_status = true){
-		$url = '/friends/list';
-		$args = array();
-		if( $id )
-			$args['user_id'] = $id;
-		$args['cursor'] = $page ? $page : -1;
-		$args['skip_status'] = $skip_status;
-		return $this->get($url, $args);
-	}
-
-	function isFriend($user_a, $user_b){
-		$url = '/friendships/exists';
-		$args = array();
-		$args['user_a'] = $user_a;
-		$args['user_b'] = $user_b;
-		return $this->get($url, $args);
-	}
-
-	function friendship($source_screen_name,$target_screen_name){
-		$url = '/friendships/show';
-		$args = array();
-		$args['source_screen_name'] = $source_screen_name;
-		$args['target_screen_name'] = $target_screen_name;
-		return $this->get($url, $args);
- 	}
- 	
-	function relationship($target, $source = false){
-		$url = '/friendships/show';
-		$args = array();
-		$args['target_screen_name'] = $target;
-		if($source){
-			$args['source_screen_name'] = $source;
-		}
-		return $this->get($url, $args);
-	}
-
-	function showUser($id = false, $email = false, $user_id = false, $screen_name = false,$include_entities = true){
-		$url = '/users/show';
-		$args = array();
-		if($id)
-			$args['id'] = $id;
-		elseif($screen_name)
-			$args['id'] = $screen_name;
-		else
-			$args['id'] = $this->user_id;
-
-		return $this->get($url, $args);
-	}
-
-	/* ---------- Ratelimit ---------- */
-	function ratelimit(){
-		$url = '/account/rate_limit_status';
-		return $this->get($url,array(),false);
-	}
-
-	/* ---------- Retweet ---------- */
-	function getRetweeters($id, $count = false){
-		$url = "/statuses/retweets/$id";
-		if($count != false) {
-			$url .= "?count=$count";
-		}
-		return $this->get($url);
-	}
-
-	function retweet($id){
-		$url = "/statuses/retweet/$id";
-		return $this->post($url);
-	}
-
-	function retweets($id, $count = 20,$include_entities = true){
-		if($count > 100){
-			$count = 100;
-		}
-		$url = "/statuses/retweets/$id";
-		$args = array();
-		$args['count'] = unt;
-		if($include_ities)
-			$args['include_entities'] = $include_entities;
-		return $this->get($url,$args);
-	}
-
-	function retweets_of_me($page = false, $count = false, $since_id = false, $max_id = false,$include_entities = true){
-		$url = '/statuses/retweets_of_me';
-		$args = array();
-		if($since_id)
-			$args['since_id'] = $since_id;
-		if($max_id)
-			$args['max_id'] = $max_id;
-		if($count)
-			$args['count'] = $count;
-		if($page)
-			$args['page'] = $page;
-		if($include_entities)
-			$args['include_entities'] = $include_entities;
-		return $this->get($url, $args);
-	}
-
-	/* ---------- Search ---------- */
-	function search($q = false, $max_id = false, $include_entities = true){
-		$url = "/search/tweets";
-		if(!$q) {
-			return false;
-		} else {
-			$args = array();
-			$args['q'] = $q;
-		}
-		if($max_id)
-			$args['max_id'] = $max_id;
-		if($include_entities)
-			$args['include_entities'] = $include_entities;
-		return $this->get($url, $args);
-	}
-
-	/* ---------- Spam ---------- */
-	function reportSpam($screen_name){
-		$url = '/report_spam';
-		$args = array();
-		$args['screen_name'] = $screen_name;
-		return $this->post($url, $args);
-	}
-
-	/* ---------- Timeline ---------- */
-	function deleteStatus($id){
-		$url = "/statuses/destroy/$id";
-		return $this->delete($url);
-	}
-
-	function homeTimeline($page = false, $since_id = false, $count = false, $include_entities = true) {
-		$url = '/statuses/home_timeline';
-		$args = array();
-		if($page)
-			$args['page'] = $page;
-		if($since_id)
-			$args['since_id'] = $since_id;
-		if($count)
-			$args['count'] = $count;
-		if($include_entities)
-			$args['include_entities'] = $include_entities;
-		return $this->get($url, $args);
-	}
-	
-	function friendsTimeline($page = false, $since_id = false, $count = false,$include_entities = true){
-		$url = '/statuses/friends_timeline';
-		$args = array();
-		if($page)
-			$args['page'] = $page;
-		if($since_id)
-			$args['since_id'] = $since_id;
-		if($count)
-			$args['count'] = $count;
-		if($include_entities)
-			$args['include_entities'] = $include_entities;
-		return $this->get($url, $args);
-	}
-
-	function getFavorites($page = false,$userid=false,$include_entities = true){
-		$url = '/favorites/list';
-		$args = array();
-		if($userid)
-			$args['user_id'] = $userid;
-		if($page)
-			$args['page'] = $page;
-		if($include_entities)
-			$args['include_entities'] = $include_entities;
-		return $this->get($url, $args);
-	}
-
-	function makeFavorite($id){
-		$url = "/favorites/create/$id";
-		return $this->post($url);
-	}
-
-	function publicTimeline($sinceid = false,$include_entities = true){
-		$url = '/statuses/public_timeline';
-		$args = array();
-		if($sinceid){
-			$args['since_id'] = $sinceid;
-		}
-		if($include_entities)
-			$args['include_entities'] = $include_entities;
-		return $this->get($url, $args);
-	}
-
-	function removeFavorite($id){
-		$url = "/favorites/destroy/$id";
-		return $this->post($url);
-	}
-
-	function replies($page = false, $since_id = false,$include_entities = true){
-		$url = '/statuses/mentions_timeline';
-		$args = array();
-		if($page)
-			$args['page'] = (int) $page;
-		if($since_id)
-			$args['since_id'] = $since_id;
-		if($include_entities)
-			$args['include_entities'] = $include_entities;
-		return $this->get($url, $args);
-	}
-
-	function showStatus($id,$include_entities = true){
-		$url = "/statuses/show/";
-		$args = array();
-		if($id)
-			$args['id'] = $id;
-		if($include_entities)
-			$args['include_entities'] = $include_entities;
-		return $this->get($url,$args);
-	}
-
-	function update($status, $replying_to = false,$include_entities = true){
-		try{
-			$url = '/statuses/update';
-			$args = array();
-			$args['status'] = $status;
-			if($replying_to)
-				$args['in_reply_to_status_id'] = $replying_to;
-			if($include_entities)
-				$args['include_entities'] = $include_entities;
-			return $this->post($url, $args);
-		}catch(Exception $ex){
-			echo $ex->getLine." : ".$ex->getMessage();
-		}
-	}
-
-	function userTimeline($page = false, $id = false, $count = false, $since_id = false, $include_rts = true, $include_entities = true){
-		$url = '/statuses/user_timeline';
-		$args = array();
-		if($page)
-			$args['page'] = $page;
-		if($id)
-			$args['id'] = $id;
-		if($count)
-			$args['count'] = $count;
-		if($since_id)
-			$args['since_id'] = $since_id;
-		if($include_rts)
-			$args['include_rts'] = $include_rts;
-		if($include_entities)
-			$args['include_entities'] = $include_entities;
-		$response = $this->get($url, $args);
-		return $response;
-	}
-
-	function trends_closest($lat = false, $long=false) {
-		$url = "/trends/closest";
-		$args = array();
-		if ($lat)
-			$args['lat'] = $lat;
-		if ($long)
-			$args['long'] = $long;
-		return $this->get($url, $args);
-	}
-	
-	function trends_place($id = 1) {
-		$url = "/trends/place";
-		$args = array();
-		if ($id)
-			$args['id'] = $id;
-		return $this->get($url, $args);
-	}
-	/* ---------- Misc. ---------- */
-	function twitterAvailable(){
-		$url = "/help/test";
-		if($this->get($url) == 'ok'){
-			return true;
-		}
-		return false;
-	}
-
-	function veverify($skip_status = false){
-		$url = '/account/verify_credentials';
-		$args = array('skip_status' => $skip_status);
-		return $this->get($url,$args);
-	}
-	
-	function updateProfile($fields = array(), $skip_status = true){
-		$url = '/account/update_profile';
-		$args = array();
-		foreach( $fields as $pk => $pv ){
-			switch( $pk ){
-			case 'name' :
-				$args[$pk] = (string) substr( $pv, 0, 20 );
-				break;
-			case 'url' :
-				$args[$pk] = (string) substr( $pv, 0, 100 );
-				break;
-			case 'location' :
-				$args[$pk] = (string) substr( $pv, 0, 30 );
-				break;
-			case 'description' :
-				$args[$pk] = (string) substr( $pv, 0, 160 );
-				break;
-			default :
-				break;
-			}
-			$args['skip_status'] = $skip_status;
-		}
-		return $this->post($url, $args);
-	}
-	
-	/* media */
-	function updateProfileImage($image, $skip_status=true) {
-		$url = '/account/update_profile_image';
-		$mul = array();
-		if($image){
-			$mul['image']=$image;
-		}
-		if($skip_status) {
-			$args['skip_status']=$skip_status;
-		}
-		return $this->post($url, $args, $mul);
-	}
-	
-	function updateProfileBackground($image, $skip_status=true) {
-		$url = '/account/update_profile_background_image';
-		$mul = array();
-		if($image){
-			$mul['image']=$image;
-			$mul['skip_status']=$skip_status;
-		}
-		return $this->post($url, NULL, $mul);
-	}
-	
-	function updateMedia($status,$image,$replying_to = false) {
-		$url = 'https://upload.twitter.com/1/statuses/update_with_media'.$this->type;
-		$args = array();
-		if($status) $args['status'] = $status;
-		if($replying_to) $args['in_reply_to_status_id'] = $replying_to;
-		$mul = array();
-		if($image) $mul['media'][] = $image;
-		return $this->post($url,$args,$mul);
-	}
-}
-
+<?php
+/*
+ * Abraham Williams (abraham@abrah.am) http://abrah.am
+ *
+ * Basic lib to work with Twitter's OAuth beta. This is untested and should not
+ * be used in production code. Twitter's beta could change at anytime.
+ *
+ * Code based on:
+ * Fire Eagle code - http://github.com/myelin/fireeagle-php-lib
+ * twitterlibphp - http://github.com/jdp/twitterlibphp
+ */
+
+//require_once('config.php');
+//require_once('oauth_lib.php');
+
+/**
+ * Twitter OAuth class
+ */
+class TwitterOAuth {
+	/* Contains the last HTTP status code returned */
+	public $http_code;
+	/* Contains the last API call */
+	public $last_api_call;
+	/* Set up the API root URL */
+	public $host = API_URL;
+	/* Set timeout default */
+	public $timeout = 5;
+	/* Set connect timeout */
+	public $connecttimeout = 30;
+	/* Verify SSL Cert */
+	public $ssl_verifypeer = FALSE;
+
+	public $source = 'embr';
+
+	// user info
+	public $username;
+	public $screen_name;
+	public $user_id;
+	
+	//for debug use
+	public $curl_info;
+	public $http_header;
+
+	/**
+	 * Set API URLS
+	 */
+	function accessTokenURL()  { return 'https://api.twitter.com/oauth/access_token'; }
+	function authenticateURL() { return 'https://api.twitter.com/oauth/authenticate'; }
+	function authorizeURL()    { return 'https://api.twitter.com/oauth/authorize'; }
+	function requestTokenURL() { return 'https://api.twitter.com/oauth/request_token'; }
+
+	/**
+	 * Debug helpers
+	 */
+	function lastStatusCode() { return $this->http_status; }
+	function lastAPICall() { return $this->last_api_call; }
+
+	/**
+	 * construct TwitterOAuth object
+	 */
+	function __construct($consumer_key, $consumer_secret, $oauth_token = NULL, $oauth_token_secret = NULL) {
+		$this->sha1_method = new OAuthSignatureMethod_HMAC_SHA1();
+		$this->consumer = new OAuthConsumer($consumer_key, $consumer_secret);
+		if (!empty($oauth_token) && !empty($oauth_token_secret)) {
+			$this->token = new OAuthConsumer($oauth_token, $oauth_token_secret);
+			$this->screen_name = $_SESSION['access_token']['screen_name'];
+			$this->username = $_SESSION['access_token']['screen_name'];
+			$this->user_id = $_SESSION['access_token']['user_id'];
+		} else {
+			$this->token = NULL;
+		}
+	}
+
+
+	/**
+	 * Get a request_token from Twitter
+	 *
+	 * @returns a key/value array containing oauth_token and oauth_token_secret
+	 */
+	function getRequestToken($oauth_callback = NULL) {
+		$parameters = array();
+		if (!empty($oauth_callback)) {
+			$parameters['oauth_callback'] = $oauth_callback;
+		} 
+		$request = $this->oAuthRequest($this->requestTokenURL(), 'GET', $parameters);
+		$token = OAuthUtil::parse_parameters($request);
+		$this->token = new OAuthConsumer($token['oauth_token'], $token['oauth_token_secret']);
+		return $token;
+	}
+
+	/**
+	 * Get the authorize URL
+	 *
+	 * @returns a string
+	 */
+	function getAuthorizeURL($token) {
+		if (is_array($token)) {
+			$token = $token['oauth_token'];
+		}
+		return $this->authorizeURL() . "?oauth_token={$token}";
+	}
+
+	/**
+	 * Exchange the request token and secret for an access token and
+	 * secret, to sign API calls.
+	 *
+	 * @returns array("oauth_token" => the access token,
+	 *                "oauth_token_secret" => the access secret)
+	 */
+	function getAccessToken($oauth_verifier = FALSE) {
+		$parameters = array();
+		if (!empty($oauth_verifier)) {
+			$parameters['oauth_verifier'] = $oauth_verifier;
+		}
+		$request = $this->oAuthRequest($this->accessTokenURL(), 'GET', $parameters);
+		$token = OAuthUtil::parse_parameters($request);
+		$this->token = new OAuthConsumer($token['oauth_token'], $token['oauth_token_secret']);
+		return $token;
+	}
+
+	/**
+	 * GET wrappwer for oAuthRequest.
+	 */
+	function get($url, $parameters = array()) {
+		$response = $this->oAuthRequest($url, 'GET', $parameters);
+		if($response == false){
+			return false;
+		}
+		return json_decode($response);
+	}
+
+	/**
+	 * POST wreapper for oAuthRequest.
+	 */
+	function post($url, $parameters = array(), $multipart = NULL) {
+		$response = $this->oAuthRequest($url, 'POST', $parameters, $multipart);
+		if($response === false){
+			return false;
+		}
+		return json_decode($response);
+	}
+
+	/**
+	 * Format and sign an OAuth / API request, then make an HTTP request
+	 */
+	function oAuthRequest($url, $method, $parameters, $multipart=NULL) {
+		if ($url[0] == '/') { //non-twitter.com api shall offer the entire url.
+			$url = "{$this->host}{$url}.json";
+		}
+		$request = OAuthRequest::from_consumer_and_token($this->consumer, $this->token, $method, $url, $parameters);
+		$request->sign_request($this->sha1_method, $this->consumer, $this->token);
+		$request->set_http_header($multipart);
+		
+		$ci = curl_init();
+		/* Curl settings */
+		curl_setopt($ci, CURLOPT_CONNECTTIMEOUT, $this->connecttimeout);
+		curl_setopt($ci, CURLOPT_TIMEOUT, $this->timeout);
+		curl_setopt($ci, CURLOPT_RETURNTRANSFER, TRUE);
+		curl_setopt($ci, CURLOPT_SSL_VERIFYPEER, $this->ssl_verifypeer);
+
+		switch ($method) {
+		case 'GET':
+			curl_setopt($ci, CURLOPT_URL, $request->to_url());
+			curl_setopt($ci, CURLOPT_HTTPHEADER, array('Expect:'));
+			break;
+		case 'POST':
+			$postfields = $multipart ? $multipart : $request->to_postdata();
+			curl_setopt($ci, CURLOPT_URL, $request->get_normalized_http_url());
+			curl_setopt($ci, CURLOPT_HTTPHEADER, $request->http_header);
+			curl_setopt($ci, CURLOPT_POST, TRUE);
+			if (!empty($postfields)) {
+				curl_setopt($ci, CURLOPT_POSTFIELDS, $postfields);
+			}
+		}
+
+		$response = curl_exec($ci);
+		$this->http_header = $request->http_header;
+		$this->curl_info = curl_getinfo($ci);
+		$this->http_code = curl_getinfo($ci, CURLINFO_HTTP_CODE);
+		$this->last_api_call = curl_getinfo($ci, CURLINFO_EFFECTIVE_URL);
+		
+		curl_close ($ci);
+		
+		return $response;
+	}
+	
+
+	/* ---------- API METHODS ---------- */
+	/*                                   */
+	/* ---------- Block ---------- */
+	function blockingList($id, $cursor=-1, $skip_status = true){
+		$url = '/blocks/list';
+		$args = array();
+		if($id)
+			$args['screen_name'] = $id;
+		if($cursor)
+			$args['cursor'] = $cursor;
+		$args['skip_status'] = $skip_status;
+		return $this->get($url, $args);
+	}
+
+	function blockUser($id){
+		$url = "/blocks/create";
+		$args = array();
+		$args['screen_name'] = $id;
+		return $this->post($url, $args);
+	}
+
+	function unblockUser($id){
+		$url = "/blocks/destroy";
+		$args = array();
+		$args['screen_name'] = $id;
+		return $this->post($url, $args);
+	}
+
+	/* ---------- Messages ---------- */
+	function deleteDirectMessage($id){
+		$url = "/direct_messages/destroy";
+		$args = array();
+		$args['id'] = $id;
+		return $this->post($url, $args);
+	}
+
+	function directMessages($since_id = false, $max_id = false, $count = false, $include_entities = true){
+		$url = '/direct_messages';
+		$args = array();
+		if( $since_id )
+			$args['since_id'] = $since_id;
+		if( $max_id )
+			$args['max_id'] = $max_id;
+		if( $count )
+			$args['count'] = $count;
+		if($include_entities)
+			$args['include_entities'] = $include_entities;
+		return $this->get($url, $args);
+	}
+
+	function sentDirectMessages($since_id = false, $max_id = false, $count = false, $include_entities = true){
+		$url = '/direct_messages/sent';
+		$args = array();
+		if($since_id)
+			$args['since_id'] = $since_id;
+		if( $max_id )
+			$args['max_id'] = $max_id;
+		if( $count )
+			$args['count'] = $count;
+		if($include_entities)
+			$args['include_entities'] = $include_entities;
+		return $this->get($url, $args);
+	}
+
+	/* ---------- List ---------- */
+	function addListMember($listid, $id, $memberid){
+		$url = "/lists/members/create_all";
+		$args = array();
+		if($listid)
+			$args['slug'] = $listid;
+		if($id)
+			$args['owner_screen_name'] = $id;
+		if($memberid){
+			$args['screen_name'] = $memberid;
+		}
+		return $this->post($url, $args);
+	}
+
+	function beAddedLists($username = '', $cursor = false){
+		$url = "/lists/memberships";
+		$args = array();
+		if($username)
+			$args['screen_name'] = $username;
+		if($cursor){
+			$args['cursor'] = $cursor;
+		}
+		return $this->get($url, $args);
+	}
+
+	function createList($name, $description, $isPortect){
+		$url = "/lists/create";
+		$args = array();
+		if($name)
+			$args['name'] = $name;
+		if($description)
+			$args['description'] = $description;
+		if($isProtect)
+			$args['mode'] = 'private';
+		
+		return $this->post($url, $args);
+	}
+
+	function myLists($username = false, $user_id = false, $count = false){
+		$url = "/lists/ownerships";
+		$args = array();
+		if($username){
+			$args['screen_name'] = $username;
+		} else {
+			$args['screen_name'] = $this->username;
+		}
+		
+		return $this->get($url, $args);
+	}
+
+	function deleteList($slug){
+		$url = "/lists/destroy";
+		$args = array();
+		$args['slug'] = $slug;
+		$args['owner_screen_name'] = $this->username;
+		return $this->post($url, $args);
+	}
+
+	function deleteListMember($slug, $owner, $memberid){
+		$url = "/lists/members/destroy_all";
+		$args = array();
+		$args['slug'] = $slug;
+		$args['owner_screen_name'] = $owner;
+		$args['user_id'] = $memberid;
+		
+		return $this->post($url, $args);
+	}
+
+	function editList($prename, $name, $description, $isProtect){
+		$url = "/lists/update";
+		$args = array();
+		if($prename)
+			$args['slug'] = $prename;
+		if($name)
+			$args['name'] = $name;
+		if($description)
+			$args['description'] = $description;
+		if($isProtect)
+			$args['mode'] = "private";
+		return $this->post($url, $args);
+	}
+
+	function followedLists($username = '', $cursor = false){
+		$url = "/lists/subscriptions";
+		$args = array();
+		if($username)
+			$args['screen_name'] = $username;
+		if($cursor)
+			$args['cursor'] = $cursor;
+		return $this->get($url, $args);
+	}
+
+	function followList($id){
+		$url = "/lists/subscribers/create";
+		$arr = explode("/", $id);
+		$args = array();
+		$args['slug'] = $arr[1];
+		$args['owner_screen_name'] = $arr[0];
+		return $this->post($url, $args);
+	}
+
+	function isFollowedList($id){
+		$url = "/lists/subscribers/show";
+		$arr = explode('/', $id);
+		$args = array();
+		$args['owner_screen_name'] = $arr[0];
+		$args['slug'] = $arr[1];
+		$args['screen_name'] = $this->username;
+		return isset($this->get($url, $args)->screen_name);
+	}
+
+	function listFollowers($id, $cursor = false, $skip_status = true){
+		$url = "/lists/subscribers";
+		$arr = explode('/', $id);
+		$args = array();
+		$args['slug'] = $arr[1];
+		$args['owner_screen_name'] = $arr[0];
+		if($cursor){
+			$args['cursor'] = $cursor;
+		}
+		$args['skip_status'] = $skip_status;
+		return $this->get($url, $args);
+	}
+
+	function listInfo($id){
+		$arr = explode('/', $id);
+		$url = "/lists/show";
+		$args = array();
+		$args['slug'] = $arr[1];
+		$args['owner_screen_name'] = $arr[0];
+		return $this->get($url, $args);
+	}
+
+	function listMembers($id, $cursor = false, $skip_status = true){
+		$url = "/lists/members";
+		$arr = explode("/", $id);
+		$args = array();
+		$args['slug'] = $arr[1];
+		$args['owner_screen_name'] = $arr[0];
+		if($cursor){
+			$args['cursor'] = $cursor;
+		}
+		$args['skip_status'] = $skip_status;
+		return $this->get($url, $args);
+
+	}
+
+	function listStatus($id, $since_id = false, $max_id = false, $include_rts = true, $include_entities = true){
+		$arr = explode('/', $id);
+		$url = "/lists/statuses";
+		$args = array();
+		$args['slug'] = $arr[1];
+		$args['owner_screen_name'] = $arr[0];
+		if($since_id)
+			$args['since_id'] = $since_id;
+		if($max_id)
+			$args['max_id'] = $max_id;
+		if($include_rts)
+			$args['include_rts'] = $include_rts;
+		if($include_entities)
+			$args['include_entities'] = $include_entities;
+		return $this->get($url, $args);
+	}
+
+	function unfollowList($id){
+		$url = "/lists/subscribers/destroy";
+		$arr = explode("/", $id);
+		$args = array();
+		$args['slug'] = $arr[1];
+		$args['owner_screen_name'] = $arr[0];
+		return $this->post($url, $args);
+	}
+
+	/* ---------- Friendship ---------- */
+	function destroyUser($id){
+		$url = "/friendships/destroy";
+		$args = array();
+		$args['screen_name'] = $id;
+		return $this->post($url, $args);
+	}
+
+	function followers($id = false, $cursor = -1, $skip_status = true){ // GET statuses/friends is removed, try GET followers/list instead
+		$url = '/followers/list';
+		$args = array();
+		if( $id )
+			$args['screen_name'] = $id;
+		if($cursor)
+			$args['cursor'] = $cursor;
+		$args['skip_status'] = $skip_status;
+		return $this->get($url, $args);
+	}
+
+	function followUser($id, $notifications = false){
+		$url = "/friendships/create";
+		$args = array();
+		$args['screen_name'] = $id;
+		if($notifications)
+			$args['follow'] = true;
+		return $this->post($url, $args);
+	}
+
+	function friends($id = false, $cursor = -1, $skip_status = true){ // GET statuses/friends is removed, try GET friends/list instead
+		$url = '/friends/list';
+		$args = array();
+		if( $id )
+			$args['screen_name'] = $id;
+		if($cursor)
+			$args['cursor'] = $cursor;
+		$args['skip_status'] = $skip_status;
+		return $this->get($url, $args);
+	}
+ 	
+	function relationship($target_screen_name, $source_screen_name = false){
+		$url = '/friendships/show';
+		$args = array();
+		$args['target_screen_name'] = $target_screen_name;
+		$args['source_screen_name'] = $source_screen_name ? $source_screen_name : $this->username;
+		return $this->get($url, $args);
+	}
+
+	function showUser($screen_name = false, $user_id = false, $include_entities = true){
+		$url = '/users/show';
+		$args = array();
+		if($screen_name)
+			$args['screen_name'] = $screen_name;
+		else
+			$args['user_id'] = $user_id ? $user_id : $this->user_id;
+		return $this->get($url, $args);
+	}
+
+	/* ---------- Ratelimit ---------- */
+	/* this API changed a lot due to the
+	 * update of twitter's limit policy,
+	 * get only status limits here by
+	 * default                        */
+	function ratelimit($resources = "statuses"){
+		$url = '/application/rate_limit_status';
+		$args = array();
+		$args['resources'] = $resources;
+		return $this->get($url, $args);
+	}
+
+	/* ---------- Retweet ---------- */
+	function retweet($id){
+		$url = "/statuses/retweet/$id";
+		return $this->post($url);
+	}
+
+	function retweets($id, $count = 20){
+		if($count > 100){
+			$count = 100;
+		}
+		$url = "/statuses/retweets/$id";
+		$args = array();
+		$args['count'] = $count;
+		return $this->get($url,$args);
+	}
+
+	function retweets_of_me($count = false, $since_id = false, $max_id = false, $include_entities = true){
+		$url = '/statuses/retweets_of_me';
+		$args = array();
+		if($since_id)
+			$args['since_id'] = $since_id;
+		if($max_id)
+			$args['max_id'] = $max_id;
+		if($count)
+			$args['count'] = $count;
+		if($include_entities)
+			$args['include_entities'] = $include_entities;
+		return $this->get($url, $args);
+	}
+
+	/* ---------- Search ---------- */
+	function savedSearches(){
+		$url = '/saved_searches/list';
+		return $this->get($url);
+	}
+
+	function deleteSavedSearch($ssid){
+		$url = "/saved_searches/destroy/{$ssid}";
+		return $this->post($url);
+	}
+
+	function saveSearch($query){
+		$url = "/saved_searches/create";
+		$args = array();
+		$args['query'] = $query;
+		return $this->post($url, $args);
+	}
+
+	function search($q = false, $since_id = false, $max_id = false, $include_entities = true){
+ 		$url = '/search/tweets';
+		if(!$q) {
+			return false;
+		} else {
+			$args = array();
+			$args['q'] = $q;
+		}
+		if($since_id){
+			$args['since_id'] = $since_id;
+		}
+		if($max_id){
+			$args['max_id'] = $max_id;
+		}
+		if($include_entities){
+			$args['include_entities'] = $include_entities;
+		}
+		return $this->get($url, $args);
+	}
+
+	/* ---------- Spam ---------- */
+	function reportSpam($screen_name){
+		$url = '/users/report_spam';
+		$args = array();
+		$args['screen_name'] = $screen_name;
+		return $this->post($url, $args);
+	}
+
+	/* ---------- Timeline ---------- */
+	function deleteStatus($id){
+		$url = "/statuses/destroy/$id";
+		return $this->post($url);
+	}
+
+	function homeTimeline($since_id = false, $max_id = false, $count = false, $include_entities = true) {
+		$url = '/statuses/home_timeline';
+		$args = array();
+		if($max_id)
+			$args['max_id'] = $max_id;
+		if($since_id)
+			$args['since_id'] = $since_id;
+		if($count)
+			$args['count'] = $count;
+		else
+			$args['count'] = 30;
+		if($include_entities)
+			$args['include_entities'] = $include_entities;
+		return $this->get($url, $args);
+	}
+	
+	function getFavorites($userid = false, $sinceid = false, $maxid = false, $count = false, $include_entities = true){
+		$url = '/favorites/list';
+		$args = array();
+		if($userid)
+			$args['screen_name'] = $userid;
+		if($sinceid)
+			$args['since_id'] = $sinceid;
+		if($maxid)
+			$args['max_id'] = $maxid;
+		if($count)
+			$args['count'] = $count;
+		if($include_entities)
+			$args['include_entities'] = $include_entities;
+		return $this->get($url, $args);
+	}
+
+	function makeFavorite($id){
+		$url = "/favorites/create";
+		$args = array();
+		if($id)
+			$args['id'] = $id;
+		return $this->post($url, $args);
+	}
+
+	function removeFavorite($id){
+		$url = "/favorites/destroy";
+		$args = array();
+		if($id)
+			$args['id'] = $id;
+		return $this->post($url, $args);
+	}
+
+	function replies($since_id = false, $max_id = false, $count = false, $include_entities = true){
+		$url = '/statuses/mentions_timeline';
+		$args = array();
+		if($max_id)
+			$args['max_id'] = $max_id;
+		if($since_id)
+			$args['since_id'] = $since_id;
+		if($count)
+			$args['count'] = $count;
+		if($include_entities)
+			$args['include_entities'] = $include_entities;
+		return $this->get($url, $args);
+	}
+
+	function showStatus($id,$include_entities = true){
+		$url = "/statuses/show";
+		$args = array();
+		if($id)
+			$args['id'] = $id;
+		if($include_entities)
+			$args['include_entities'] = $include_entities;
+		return $this->get($url,$args);
+	}
+
+	function update($status, $replying_to = false,$include_entities = true){
+		try{
+			$url = '/statuses/update';
+			$args = array();
+			$args['status'] = $status;
+			if($replying_to)
+				$args['in_reply_to_status_id'] = $replying_to;
+			if($include_entities)
+				$args['include_entities'] = $include_entities;
+			return $this->post($url, $args);
+		}catch(Exception $ex){
+			echo $ex->getLine." : ".$ex->getMessage();
+		}
+	}
+
+	function userTimeline($id = false, $since_id = false, $max_id = false, $count = false, $include_rts = true, $include_entities = true){
+		$url = '/statuses/user_timeline';
+		$args = array();
+		if($max_id)
+			$args['max_id'] = $max_id;
+		if($id)
+			$args['screen_name'] = $id;
+		if($count)
+			$args['count'] = $count;
+		if($since_id)
+			$args['since_id'] = $since_id;
+		if($include_rts)
+			$args['include_rts'] = $include_rts;
+		if($include_entities)
+			$args['include_entities'] = $include_entities;
+		$response = $this->get($url, $args);
+		return $response;
+	}
+
+	function trends_closest($lat = false, $long=false) {
+		$url = "/trends/closest";
+		$args = array();
+		if ($lat)
+			$args['lat'] = $lat;
+		if ($long)
+			$args['long'] = $long;
+		return $this->get($url, $args);
+	}
+	
+	function trends_place($id = 1) {
+		$url = "/trends/place";
+		$args = array();
+		if ($id)
+			$args['id'] = $id;
+		return $this->get($url, $args);
+	}
+	/* ---------- Misc. ---------- */
+	function veverify($skip_status = false){
+		$url = '/account/verify_credentials';
+		$args = array('skip_status' => $skip_status);
+		return $this->get($url,$args);
+	}
+	
+	function updateProfile($fields = array(), $skip_status = true){
+		$url = '/account/update_profile';
+		$args = array();
+		foreach( $fields as $pk => $pv ){
+			switch( $pk ){
+			case 'name' :
+				$args[$pk] = (string) substr( $pv, 0, 20 );
+				break;
+			case 'url' :
+				$args[$pk] = (string) substr( $pv, 0, 100 );
+				break;
+			case 'location' :
+				$args[$pk] = (string) substr( $pv, 0, 30 );
+				break;
+			case 'description' :
+				$args[$pk] = (string) substr( $pv, 0, 160 );
+				break;
+			default :
+				break;
+			}
+			$args['skip_status'] = $skip_status;
+		}
+		return $this->post($url, $args);
+	}
+	
+	/* media */
+	function updateProfileImage($image, $skip_status = true) {
+		$url = '/account/update_profile_image';
+		$args = array();
+		if($image){
+			$args['image']=$image;
+			$args['skip_status']=$skip_status;
+		}
+		return $this->post($url, $args);
+	}
+	
+	function updateProfileBackground($image, $tile = false, $skip_status = true) {
+		$url = '/account/update_profile_background_image';
+		$args = array();
+		if($image){
+			$args['image']=$image;
+		}
+		if($tile){
+			$args['tile']=($tile === 'true');
+		}
+		$args['skip_status']=$skip_status;
+		return $this->post($url, $args);
+	}
+	
+	function updateMedia($status,$image,$replying_to = false) {
+		$url = 'statuses/update_with_media';
+		$args = array();
+		if($status) $args['status'] = $status;
+		if($replying_to) $args['in_reply_to_status_id'] = $replying_to;
+		$mul = array();
+		if($image) $mul['media'][] = $image;
+		return $this->post($url,$args,$mul);
+	}
+}
+
diff --git a/lib/utility.php b/lib/utility.php
index 0811c46..a526af9 100644
--- a/lib/utility.php
+++ b/lib/utility.php
@@ -1,125 +1,125 @@
-<?php
-	function setEncryptCookie($key, $value, $time = 0, $path = '/') {
-		if (trim(SECURE_KEY) == '') {
-			setcookie($key, $value, $time, $path);
-		} else {
-			setcookie($key, encrypt($value), $time, $path);
-		}
-	}
-
-	function getEncryptCookie($key) {
-		if ( isset($_COOKIE[$key]) ) {
-			if (trim(SECURE_KEY) == '') {
-				return $_COOKIE[$key];
-			} else {
-				return decrypt($_COOKIE[$key]);
-			}
-		} else { 
-			return null;
-		}
-	}
-
-	function getCookie($key) {
-		if ( isset($_COOKIE[$key]) ) 
-			return $_COOKIE[$key];
-		else 
-			return null;
-	}
-
-	function delCookie($key) {
-		setcookie($key, '', $_SERVER['REQUEST_TIME']-300, '/');
-	}
-
-	function encrypt($plain_text) {
-		if ( !function_exists('mcrypt_module_open') ) {
-			return EDencrypt($plain_text, SECURE_KEY);
-		}
-		$td = mcrypt_module_open('blowfish', '', 'cfb', '');
-		$iv = mcrypt_create_iv(mcrypt_enc_get_iv_size($td), MCRYPT_RAND);
-		mcrypt_generic_init($td, SECURE_KEY, $iv);
-		$crypt_text = mcrypt_generic($td, $plain_text);
-		mcrypt_generic_deinit($td);
-		return base64_encode($iv.$crypt_text);
-	}
-
-	function decrypt($crypt_text) {
-		if ( !function_exists('mcrypt_module_open') ) {
-			return EDdecrypt($plain_text, SECURE_KEY);
-		}
-		$crypt_text = base64_decode($crypt_text);
-		$td = mcrypt_module_open('blowfish', '', 'cfb', '');
-		$ivsize = mcrypt_enc_get_iv_size($td);
-		$iv = substr($crypt_text, 0, $ivsize);
-		$crypt_text = substr($crypt_text, $ivsize);
-		mcrypt_generic_init($td, SECURE_KEY, $iv);
-		$plain_text = mdecrypt_generic($td, $crypt_text);
-		mcrypt_generic_deinit($td);
-
-		return $plain_text;
-	}
-
-	if ( !function_exists('mb_strlen') ) {
-		function mb_strlen($text, $encode) {
-			if (strtolower($encode) == 'utf-8') {
-				return preg_match_all('%(?:
-					[\x09\x0A\x0D\x20-\x7E]     # ASCII
-					| [\xC2-\xDF][\x80-\xBF]# non-overlong 2-byte
-					|  \xE0[\xA0-\xBF][\x80-\xBF] # excluding overlongs
-					| [\xE1-\xEC\xEE\xEF][\x80-\xBF]{2} # straight 3-byte
-					|  \xED[\x80-\x9F][\x80-\xBF] # excluding surrogates
-					|  \xF0[\x90-\xBF][\x80-\xBF]{2}    # planes 1-3
-					| [\xF1-\xF3][\x80-\xBF]{3}   # planes 4-15
-					|  \xF4[\x80-\x8F][\x80-\xBF]{2}    # plane 16
-				)%xs',$text,$out);
-			}else{
-				return strlen($text);
-			}
-		}
-	}
-	
-	function keyED($txt,$encrypt_key) {
-
-		$encrypt_key = md5($encrypt_key);
-		$ctr=0;
-		$tmp = "";
-
-		for ($i=0;$i<strlen($txt);$i++) {
-			if ($ctr==strlen($encrypt_key)) $ctr=0;
-			$tmp.= substr($txt,$i,1) ^ substr($encrypt_key,$ctr,1);
-			$ctr++;
-		}
-
-		return $tmp;
-	}
-
-	function EDencrypt($txt,$key) {
-
-		srand((double)microtime()*1000000);
-		$encrypt_key = md5(rand(0,32000));
-		$ctr=0;
-		$tmp = "";
-
-		for ($i=0;$i<strlen($txt);$i++) {
-			if ($ctr==strlen($encrypt_key)) $ctr=0;
-			$tmp.= substr($encrypt_key,$ctr,1) . (substr($txt,$i,1) ^ substr($encrypt_key,$ctr,1));
-			$ctr++;
-		}
-
-		return keyED($tmp,$key);
-	}
-
-	function EDdecrypt($txt,$key) {
-
-		$txt = keyED($txt,$key);
-		$tmp = "";
-
-		for ($i=0;$i<strlen($txt);$i++) {
-			$md5 = substr($txt,$i,1);
-			$i++;
-			$tmp.= (substr($txt,$i,1) ^ $md5);
-		}
-
-		return $tmp;
-
-	}
-?>
+<?php
+	function setEncryptCookie($key, $value, $time = 0, $path = '/') {
+		if (trim(SECURE_KEY) == '') {
+			setcookie($key, $value, $time, $path);
+		} else {
+			setcookie($key, encrypt($value), $time, $path);
+		}
+	}
+
+	function getEncryptCookie($key) {
+		if ( isset($_COOKIE[$key]) ) {
+			if (trim(SECURE_KEY) == '') {
+				return $_COOKIE[$key];
+			} else {
+				return decrypt($_COOKIE[$key]);
+			}
+		} else { 
+			return null;
+		}
+	}
+
+	function getCookie($key) {
+		if ( isset($_COOKIE[$key]) ) 
+			return $_COOKIE[$key];
+		else 
+			return null;
+	}
+
+	function delCookie($key) {
+		setcookie($key, '', $_SERVER['REQUEST_TIME']-300, '/');
+	}
+
+	function encrypt($plain_text) {
+		if ( !function_exists('mcrypt_module_open') ) {
+			return EDencrypt($plain_text, SECURE_KEY);
+		}
+		$td = mcrypt_module_open('blowfish', '', 'cfb', '');
+		$iv = mcrypt_create_iv(mcrypt_enc_get_iv_size($td), MCRYPT_RAND);
+		mcrypt_generic_init($td, SECURE_KEY, $iv);
+		$crypt_text = mcrypt_generic($td, $plain_text);
+		mcrypt_generic_deinit($td);
+		return base64_encode($iv.$crypt_text);
+	}
+
+	function decrypt($crypt_text) {
+		if ( !function_exists('mcrypt_module_open') ) {
+			return EDdecrypt($crypt_text, SECURE_KEY);
+		}
+		$crypt_text = base64_decode($crypt_text);
+		$td = mcrypt_module_open('blowfish', '', 'cfb', '');
+		$ivsize = mcrypt_enc_get_iv_size($td);
+		$iv = substr($crypt_text, 0, $ivsize);
+		$crypt_text = substr($crypt_text, $ivsize);
+		mcrypt_generic_init($td, SECURE_KEY, $iv);
+		$plain_text = mdecrypt_generic($td, $crypt_text);
+		mcrypt_generic_deinit($td);
+
+		return $plain_text;
+	}
+
+	if ( !function_exists('mb_strlen') ) {
+		function mb_strlen($text, $encode) {
+			if (strtolower($encode) == 'utf-8') {
+				return preg_match_all('%(?:
+					[\x09\x0A\x0D\x20-\x7E]     # ASCII
+					| [\xC2-\xDF][\x80-\xBF]# non-overlong 2-byte
+					|  \xE0[\xA0-\xBF][\x80-\xBF] # excluding overlongs
+					| [\xE1-\xEC\xEE\xEF][\x80-\xBF]{2} # straight 3-byte
+					|  \xED[\x80-\x9F][\x80-\xBF] # excluding surrogates
+					|  \xF0[\x90-\xBF][\x80-\xBF]{2}    # planes 1-3
+					| [\xF1-\xF3][\x80-\xBF]{3}   # planes 4-15
+					|  \xF4[\x80-\x8F][\x80-\xBF]{2}    # plane 16
+				)%xs',$text,$out);
+			}else{
+				return strlen($text);
+			}
+		}
+	}
+	
+	function keyED($txt,$encrypt_key) {
+
+		$encrypt_key = md5($encrypt_key);
+		$ctr=0;
+		$tmp = "";
+
+		for ($i=0;$i<strlen($txt);$i++) {
+			if ($ctr==strlen($encrypt_key)) $ctr=0;
+			$tmp.= substr($txt,$i,1) ^ substr($encrypt_key,$ctr,1);
+			$ctr++;
+		}
+
+		return $tmp;
+	}
+
+	function EDencrypt($txt,$key) {
+
+		srand((double)microtime()*1000000);
+		$encrypt_key = md5(rand(0,32000));
+		$ctr=0;
+		$tmp = "";
+
+		for ($i=0;$i<strlen($txt);$i++) {
+			if ($ctr==strlen($encrypt_key)) $ctr=0;
+			$tmp.= substr($encrypt_key,$ctr,1) . (substr($txt,$i,1) ^ substr($encrypt_key,$ctr,1));
+			$ctr++;
+		}
+
+		return keyED($tmp,$key);
+	}
+
+	function EDdecrypt($txt,$key) {
+
+		$txt = keyED($txt,$key);
+		$tmp = "";
+
+		for ($i=0;$i<strlen($txt);$i++) {
+			$md5 = substr($txt,$i,1);
+			$i++;
+			$tmp.= (substr($txt,$i,1) ^ $md5);
+		}
+
+		return $tmp;
+
+	}
+?>
diff --git a/list.php b/list.php
index d1df369..f12f7a6 100644
--- a/list.php
+++ b/list.php
@@ -1,79 +1,77 @@
-<?php 
-	include ('lib/twitese.php');
-	$title = "@{$_GET['id']}";
-	include ('inc/header.php');
-	if (!loginStatus()) header('location: login.php');
-?>
-
-<script src="js/list.js"></script>
-
-<div id="statuses">
-	<?php 
-		$p = 1;
-		if (isset($_GET['p'])) {
-			$p = (int) $_GET['p'];
-			if ($p <= 0) $p = 1;
-		}
-		
-		$id = isset($_GET['id'])? $_GET['id'] : false;
-		$t = getTwitter();
-		$statuses = $t->listStatus($id, $p);
-		$listInfo = $t->listInfo($id);
-		if ($statuses === false) {
-			header('location: error.php');exit();
-		} 
-		
-		$isFollower = false;
-		//$isFollower = $t->isFollowedList($id);
-		$empty = count($statuses) == 0? true: false;
-		if ($empty) {
-			echo "<div id=\"empty\">No Tweet To Display</div>";
-		} else {
-	?>
-	
-		
-	<div id="info_head">
-		<a href="https://twitter.com/<?php echo $userid ?>"><img id="info_headimg" src="<?php echo getAvatar($listInfo->user->profile_image_url); ?>" /></a>
-		<div id="info_name"><?php echo $id?></div>
-		<div id="info_relation">
-		<?php if ($isFollower) {?>
-			<a id="list_block_btn" class="info_btn_hover" href="#">Unfollow</a>
-		<?php } else { ?>
-			<a id="list_follow_btn" class="info_btn" href="#">Follow</a>
-		<?php } ?>
-			<a id="list_send_btn" class="info_btn" href="#">Tweet</a>
-			<a class="info_btn" href="list_followers.php?id=<?php echo $id?>">Followers (<?php echo $listInfo->subscriber_count?>)</a>
-			<a class="info_btn" href="list_members.php?id=<?php echo $id?>">Members (<?php echo $listInfo->member_count?>)</a>
-		</div>
-	</div>
-	<div class="clear"></div>
-	
-	<?php 
-		
-			$output = '<ol class="timeline" id="allTimeline">';
-			include('lib/timeline_format.php');
-			foreach ($statuses as $status) {
-				if (isset($status->retweeted_status)) {
-					$output .= format_retweet($status);
-				} else { 
-					$output .= format_timeline($status,$t->username);
-				}
-			}
-			
-			$output .= "</ol><div id=\"pagination\">";
-			
-			if ($p >1) $output .= "<a id=\"more\" class=\"round more\" style=\"float: left;\" href=\"list.php?id=$id&p=" . ($p-1) . "\">Back</a>";
-			if (!$empty) $output .= "<a id=\"more\" class=\"round more\" style=\"float: right;\" href=\"list.php?id=$id&p=" . ($p+1) . "\">Next</a>";
-			
-			$output .= "</div>";
-			
-			echo $output;
-		}
-
-	?>
-</div>
-
-<?php 
-	include ('inc/sidebar.php');
-	include ('inc/footer.php');
-?>
+<?php 
+	include ('lib/twitese.php');
+	$title = "@{$_GET['id']}";
+	include ('inc/header.php');
+	if (!loginStatus()) header('location: login.php');
+?>
+
+<script src="js/list.js"></script>
+
+<div id="statuses">
+	<?php 
+		$id = isset($_GET['id'])? $_GET['id'] : false;
+		$since_id = isset($_GET['since_id'])? $_GET['since_id'] : false;
+		$max_id = isset($_GET['max_id'])? $_GET['max_id'] : false;
+		$t = getTwitter();
+		$statuses = $t->listStatus($id, $since_id, $max_id);
+		$listInfo = $t->listInfo($id);
+		if ($statuses === false) {
+			header('location: error.php');exit();
+		} 
+		
+		$isFollower = $t->isFollowedList($id);
+	?>
+
+	<div id="info_head">
+		<a href="user.php?id=<?php echo $listInfo->user->screen_name ?>"><img id="info_headimg" src="<?php echo getAvatar($listInfo->user->profile_image_url); ?>" /></a>
+		<div id="info_name"><?php echo $id?></div>
+		<div id="info_relation">
+		<?php if ($isFollower) {?>
+			<a id="list_block_btn" class="info_btn_hover" href="#">Unfollow</a>
+		<?php } else { ?>
+			<a id="list_follow_btn" class="info_btn" href="#">Follow</a>
+		<?php } ?>
+			<a id="list_send_btn" class="info_btn" href="#">Tweet</a>
+			<a class="info_btn" href="list_followers.php?id=<?php echo $id?>">Followers (<?php echo $listInfo->subscriber_count?>)</a>
+			<a class="info_btn" href="list_members.php?id=<?php echo $id?>">Members (<?php echo $listInfo->member_count?>)</a>
+		</div>
+	</div>
+	<div class="clear"></div>
+
+	<?php 
+		$empty = count($statuses) == 0? true: false;
+		if ($empty) {
+			echo "<div id=\"empty\">No Tweet To Display</div>";
+		} else {
+			$output = '<ol class="timeline" id="allTimeline">';
+			include('lib/timeline_format.php');
+			$firstid = false;
+			$lastid = false;
+			foreach ($statuses as $status) {
+				if (!$firstid) $firstid = $status->id_str;
+				$lastid = $status->id_str;
+				if (isset($status->retweeted_status)) {
+					$output .= format_retweet($status);
+				} else { 
+					$output .= format_timeline($status,$t->username);
+				}
+			}
+			$lastid = bcsub($lastid, "1");
+			
+			$output .= "</ol><div id=\"pagination\">";
+			
+			$output .= "<a id=\"less\" class=\"round more\" style=\"float: left;\" href=\"list.php?id={$id}&since_id={$firstid}\">Back</a>";
+			$output .= "<a id=\"more\" class=\"round more\" style=\"float: right;\" href=\"list.php?id={$id}&max_id={$lastid}\">Next</a>";
+			
+			$output .= "</div>";
+			
+			echo $output;
+		}
+
+	?>
+</div>
+
+<?php 
+	include ('inc/sidebar.php');
+	include ('inc/footer.php');
+?>
diff --git a/list_followers.php b/list_followers.php
index 5ccda34..b29de0b 100644
--- a/list_followers.php
+++ b/list_followers.php
@@ -1,11 +1,11 @@
-<?php 
-	include ('lib/twitese.php');
-	$title = "@{$_GET['id']} - Followers";
-	include ('inc/header.php');
-	
-	$type = 'list_followers';
-	include ('inc/userlist.php');
-	
-	include ('inc/sidebar.php');
-	include ('inc/footer.php');
-?>
+<?php 
+	include ('lib/twitese.php');
+	$title = "@{$_GET['id']} - Followers";
+	include ('inc/header.php');
+	
+	$type = 'list_followers';
+	include ('inc/userlist.php');
+	
+	include ('inc/sidebar.php');
+	include ('inc/footer.php');
+?>
diff --git a/list_members.php b/list_members.php
index b8a4300..ba42223 100644
--- a/list_members.php
+++ b/list_members.php
@@ -1,12 +1,12 @@
-<?php
-include ('lib/twitese.php');
-$title = "@{$_GET['id']} - Following";
-include ('inc/header.php');
-?>
-<script src="js/list_members.js"></script>
-<?php
-$type = 'list_members';
-include ('inc/userlist.php');
-include ('inc/sidebar.php');
-include ('inc/footer.php');
-?>
+<?php
+include ('lib/twitese.php');
+$title = "@{$_GET['id']} - Following";
+include ('inc/header.php');
+?>
+<script src="js/list_members.js"></script>
+<?php
+$type = 'list_members';
+include ('inc/userlist.php');
+include ('inc/sidebar.php');
+include ('inc/footer.php');
+?>
diff --git a/lists.php b/lists.php
index 133209d..e2fbad6 100644
--- a/lists.php
+++ b/lists.php
@@ -1,181 +1,140 @@
-<?php 
-	include ('lib/twitese.php');
-	$title = "Lists";
-	include ('inc/header.php');
-	
-	if (!loginStatus()) header('location: login.php');
-?>
-
-<script src="js/lists.js"></script>
-
-<div id="statuses">
-	<?php 
-		$t = getTwitter();
-		if ( isset($_POST['list_name']) ) {
-			if ($_POST['is_edit'] == 0) {
-				if (trim($_POST['list_name']) == '') {
-						echo "<div id=\"otherTip\">Fail to create list, the name CANNOT be empty</div>";
-				} else {
-					$isProtect = isset($_POST['list_protect']) ? true : false;
-					$result = $t->createList($_POST['list_name'], $_POST['list_description'], $isProtect);
-					if ($result) {
-						echo "<div id=\"otherTip\">Success</div>";
-					} else {
-						echo "<div id=\"otherTip\">Failed, please retry</div>";
-					}
-				}
-			} else {
-				if (trim($_POST['list_name']) == '') {
-						echo "<div id=\"otherTip\">Fail to create list, the name CANNOT be empty</div>";
-				} else {
-					$isProtect = isset($_POST['list_protect']) ? true : false;
-					$result = $t->editList($_POST['pre_list_name'], $_POST['list_name'], $_POST['list_description'], $isProtect);
-					if ($result) {
-						echo "<div id=\"otherTip\">Success</div>";
-					} else {
-						echo "<div id=\"otherTip\">Failed, please retry</div>";
-					}
-				}
-			}
-		}
-		
-		if ( isset($_POST['list_members']) ) {
-			if (trim($_POST['list_members']) == '') {
-					echo "<div id=\"otherTip\">Fail to add members, the member list is empty!</div>";
-			} else {
-				$listId = $_POST['member_list_name'];
-				$result = $t->addListMember($listId, $_POST['list_members']);
-				if (isset($result->error)) {
-					echo "<div id=\"otherTip\">Failed, please retry!</div>";
-				} else {
-					echo "<div id=\"otherTip\">Success!</div>";
-				}
-			}
-		}
-	?>
-	<?php 
-		$isSelf = true;
-		if (isset($_GET['id'])) {
-			$id = $_GET['id'];
-			$isSelf = false;
-		} else {
-			$id = $t->username;
-		}
-		$type = isset($_GET['t'])? $_GET['t'] : 1;
-		$c = isset($_GET['c'])? $_GET['c'] : -1;
-		switch ($type) {
-			case 0:
-				$lists = $t->followedLists($id, $c);
-				break;
-			case 1:
-				$lists = $t->createdLists($id, $c);
-				break;
-			case 2:
-				$lists = $t->beAddedLists($id, $c);
-				break;
-			default:
-				$lists = false;
-		}
-		$nextlist = $lists->next_cursor;
-		$prelist = $lists->previous_cursor;
-		$lists = $lists->lists; 
-		if ($lists === false) {
-			header('location: error.php');exit();
-		} 
-		
-		
-	?>
-	<div id="subnav">
-	<?php if ($isSelf) { ?>
-		<?php if ($type == 0) {?>
-	       	<span class="subnavNormal">Lists you follow</span><span class="subnavLink"><a href="lists.php?t=1">Lists you created</a></span><span class="subnavLink"><a href="lists.php?t=2">Lists following you</a></span>
-		<?php } else if ($type == 1) {?>
-	       	<span class="subnavLink"><a href="lists.php?t=0">Lists you follow</a></span><span class="subnavNormal">Lists you created</span><span class="subnavLink"><a href="lists.php?t=2">Lists following you</a></span>
-		<?php } else {?>
-			<span class="subnavLink"><a href="lists.php?t=0">Lists you follow</a></span><span class="subnavLink"><a href="lists.php?t=1">Lists you created</a></span><span class="subnavNormal">Lists following you</span>
-		<?php } ?>
-	<?php } else {?>
-		<?php if ($type == 0) {?>
-	       	<span class="subnavNormal">Following Lists</span><span class="subnavLink"><a href="lists.php?id=<?php echo $id?>&t=1">Created Lists</a></span><span class="subnavLink"><a href="lists.php?id=<?php echo $id?>&t=2">Lists Following</a></span>
-		<?php } else if ($type == 1) {?>
-	       	<span class="subnavLink"><a href="lists.php?t=0&id=<?php echo $id?>">Following Lists</a></span><span class="subnavNormal">Created Lists</span><span class="subnavLink"><a href="lists.php?id=<?php echo $id?>&t=2">Lists Following</a></span>
-		<?php } else {?>
-			<span class="subnavLink"><a href="lists.php?t=0&id=<?php echo $id?>">Following Lists</a></span><span class="subnavLink"><a href="lists.php?id=<?php echo $id?>&t=1">Created Lists</a></span><span class="subnavNormal">Lists Following</span>
-		<?php } ?>
-	<?php } ?>
-    </div>
-    
-	<?php 
-		
-		$empty = count($lists) == 0? true: false;
-		if ($empty) {
-			echo "<div id=\"empty\">No Tweet To Display</div>";
-		} else {
-			$output = '<ol class="rank_list">';			
-			foreach ($lists as $list) {
-		
-				$listurl = substr($list->uri,1);
-				$user = $list->user;
-				$listname = explode('/',$list->full_name);
-				$mode = $list->mode == 'private' ? "Private" : "";
-				
-				$output .= "
-				<li>
-					<span class=\"rank_img\"><img src=\"".getAvatar($user->profile_image_url)."\" /></span>
-					<div class=\"rank_content\">
-						<span class=\"rank_num\"><span class=\"rank_name\"><a href=\"list.php?id=$listurl\"><em>$listname[0]/</em>$listname[1]</a></span></span>
-						<span class=\"rank_count\">Followers：$list->subscriber_count 　Members：$list->member_count 　$mode</span> 
-				";
-				if ($list->description != '') $output .= "<span class=\"rank_description\">Description: $list->description</span>";
-				if ($type == 0) $output .= "<span id=\"list_action\"><a id=\"btn\" href=\"javascript:void()\" class=\"unfollow_list\">Unfollow</a></span>";
-				if ($type == 1 && $isSelf) $output .= "<span id=\"list_action\"><a id=\"btn\" href=\"javascript:void()\" class=\"edit_list\">Edit</a> <a id=\"btn\" href=\"javascript:void()\" class=\"delete_list\">Delete</a> <a id=\"btn\" href=\"javascript:void()\" class=\"add_member\">Add Members</a></span>";
-				$output .= "
-					</div>
-				</li>
-				";
-			}
-			
-			$output .= "</ol>";
-			
-			echo $output;
-		}
-		
-	?>
-	
-	<?php if ($isSelf && $type == 1) {?>
-	    <a href="javascript:void()" class="more round" id="list_create_btn" style="margin: 20px auto;">Create a new list</a>
-	    <form method="POST" action="./lists.php?t=1" id="list_form">
-	    	<input type="hidden" name="pre_list_name" value="" id="pre_list_name" />
-	    	<input type="hidden" name="is_edit" value="0" id="is_edit" />
-	    	<span><label for="list_name">List name</label><input type="text" name="list_name" id="list_name" /></span>
-	    	<span><label for="list_description">Description</label><textarea type="text" name="list_description" id="list_description"></textarea></span>
-	    	<span><label for="list_protect">Private</label><input type="checkbox" name="list_protect" id="list_protect"  />
-			<a style="background: transparent url(img/sprite-icons.png) no-repeat scroll -272px -16px; -moz-background-clip: border; -moz-background-origin: padding; -moz-background-inline-policy: continuous; text-decoration: none; height: 10px; float: right; position: relative; width: 9px; left: 3px; top: -160px;" title="Close" onclick="$('#list_form').slideToggle(300)" href="#"></a>
-			<input type="submit" class="btn" id="list_submit" value="Creat" />
-			
-			</span>
-	    	<span></span>
-	    </form>
-	    
-	    
-	<?php }?>
-	
-	<div id="pagination">
-	<?php 
-	    if ($type == 0 || $type == 2) {
-	    	if ($isSelf) {
-				if ($prelist != 0) echo "<a id=\"more\" class=\"round more\" style=\"float: left;\" href=\"lists.php?t=$type&c=$prelist\">Back</a>";
-				if ($nextlist != 0) echo "<a id=\"more\" class=\"round more\" style=\"float: right;\" href=\"lists.php?t=$type&c=$nextlist\">Next</a>";
-	    	} else {
-				if ($prelist != 0) echo "<a id=\"more\" class=\"round more\" style=\"float: left;\" href=\"lists.php?id=$id&t=$type&c=$prelist\">Back</a>";
-				if ($nextlist != 0) echo "<a id=\"more\" class=\"round more\" style=\"float: right;\" href=\"lists.php?id=$id&t=$type&c=$nextlist\">Next</a>";
-	    	}
-		}
-	?>
-	</div>
-</div>
-
-<?php 
-	include ('inc/sidebar.php');
-	include ('inc/footer.php');
-?>
+<?php 
+	include ('lib/twitese.php');
+	$title = "Lists";
+	include ('inc/header.php');
+	
+	if (!loginStatus()) header('location: login.php');
+?>
+
+<script src="js/lists.js"></script>
+
+<div id="statuses">
+	<?php 
+		$t = getTwitter();
+
+		$isSelf = true;
+		if (isset($_GET['id'])) {
+			$id = $_GET['id'];
+			$isSelf = false;
+		} else {
+			$id = $t->username;
+		}
+		$type = isset($_GET['t'])? $_GET['t'] : 1;
+		$c = isset($_GET['c'])? $_GET['c'] : -1;   // cursor
+		switch ($type) {
+			case 0:
+				$lists = $t->followedLists($id, $c);
+				break;
+			case 1:
+				$lists = $t->myLists($id);
+				break;
+			case 2:
+				$lists = $t->beAddedLists($id, $c);
+				break;
+			default:
+				$lists = false;
+		}
+		$nextlist = $lists->next_cursor;
+		$prelist = $lists->previous_cursor;
+		$lists = $lists->lists; 
+		if ($lists === false) {
+			header('location: error.php');exit();
+		} 
+		
+		
+	?>
+	<div id="subnav">
+	<?php if ($isSelf) {
+		if ($type == 0) {?>
+	       	<span class="subnavNormal">Lists you follow</span><span class="subnavLink"><a href="lists.php?t=1">Lists you created</a></span><span class="subnavLink"><a href="lists.php?t=2">Lists following you</a></span>
+		<?php } else if ($type == 1) {?>
+	       	<span class="subnavLink"><a href="lists.php?t=0">Lists you follow</a></span><span class="subnavNormal">Lists you created</span><span class="subnavLink"><a href="lists.php?t=2">Lists following you</a></span>
+		<?php } else {?>
+			<span class="subnavLink"><a href="lists.php?t=0">Lists you follow</a></span><span class="subnavLink"><a href="lists.php?t=1">All your lists</a></span><span class="subnavNormal">Lists following you</span>
+		<?php }
+	} else {
+		if ($type == 0) {?>
+	       	<span class="subnavNormal">Following Lists</span><span class="subnavLink"><a href="lists.php?id=<?php echo $id?>&t=1">All Lists</a></span><span class="subnavLink"><a href="lists.php?id=<?php echo $id?>&t=2">Lists Following @<?php echo $id?></a></span>
+		<?php } else if ($type == 1) {?>
+	       	<span class="subnavLink"><a href="lists.php?t=0&id=<?php echo $id?>">Following Lists</a></span><span class="subnavNormal">All Lists</span><span class="subnavLink"><a href="lists.php?id=<?php echo $id?>&t=2">Lists Following @<?php echo $id?></a></span>
+		<?php } else {?>
+			<span class="subnavLink"><a href="lists.php?t=0&id=<?php echo $id?>">Following Lists</a></span><span class="subnavLink"><a href="lists.php?id=<?php echo $id?>&t=1">All Lists</a></span><span class="subnavNormal">Lists Following @<?php echo $id?></span>
+		<?php }
+	} ?>
+    </div>
+    
+	<?php 
+		
+		$empty = count($lists) == 0? true: false;
+		if ($empty) {
+			echo "<div id=\"empty\">No Tweet To Display</div>";
+		} else {
+			$output = '<ol class="rank_list">';			
+			foreach ($lists as $list) {
+		
+				$listurl = substr($list->uri,1);
+				$user = $list->user;
+				$listname = explode('/',$list->full_name);
+				$mode = $list->mode == 'private' ? "Private" : "Public";
+				
+				$output .= "
+				<li>
+					<span class=\"rank_img\"><img src=\"".getAvatar($user->profile_image_url)."\" /></span>
+					<div class=\"rank_content\" id=\"list{$list->id_str}\">
+						<span class=\"rank_num\"><span class=\"rank_name\"><a href=\"list.php?id=$listurl\"><em>$listname[0]/</em>$listname[1]</a></span></span>
+						<span class=\"rank_count\">Followers: {$list->subscriber_count}&nbsp;&nbsp;Members: {$list->member_count}&nbsp;&nbsp;$mode</span> 
+				";
+				if ($list->description != '') $output .= "<span class=\"rank_description\">Description: $list->description</span>";
+				if ($type == 0) $output .= "<span id=\"list_action\"><a id=\"btn\" href=\"javascript:void()\" class=\"unfollow_list\">Unfollow</a></span>";
+				if ($type == 1 && $isSelf) $output .= "<span id=\"list_action\"><a id=\"btn\" href=\"javascript:void()\" class=\"edit_list\">Edit</a> <a id=\"btn\" href=\"javascript:void()\" class=\"delete_list\">Delete</a> <a id=\"btn\" href=\"javascript:void()\" class=\"add_member\">Add Members</a></span>";
+				$output .= "
+					</div>
+				</li>
+				";
+			}
+			
+			$output .= "</ol>";
+			
+			echo $output;
+		}
+		
+	?>
+	
+	<?php if ($isSelf && $type == 1) {?>
+	    <a href="#" class="more round" id="list_create_btn" style="margin: 20px auto;">Create a new list</a>
+	    <form method="POST" action="./lists.php?t=1" id="list_form">
+	    	<input type="hidden" name="list_spanid" value="" id="list_spanid" />
+	    	<input type="hidden" name="pre_list_name" value="" id="pre_list_name" />
+	    	<input type="hidden" name="is_edit" value="0" id="is_edit" />
+	    	<span><label for="list_name">List name</label><input type="text" name="list_name" id="list_name" /></span>
+	    	<span><label for="list_description">Description</label><textarea type="text" name="list_description" id="list_description"></textarea></span>
+	    	<span><label for="list_protect">Private</label><input type="checkbox" name="list_protect" id="list_protect"  />
+			<a style="background: transparent url(img/sprite-icons.png) no-repeat scroll -272px -16px; -moz-background-clip: border; -moz-background-origin: padding; -moz-background-inline-policy: continuous; text-decoration: none; height: 10px; float: right; position: relative; width: 9px; left: 3px; top: -160px;" title="Close" onclick="$('#list_form').slideToggle(300)" href="#"></a>
+			<input type="submit" class="btn" id="list_submit" value="" />
+			
+			</span>
+	    	<span></span>
+	    </form>
+	    
+	    
+	<?php }?>
+	
+	<div id="pagination">
+	<?php 
+	    if ($type == 0 || $type == 2) {
+	    	if ($isSelf) {
+				if ($prelist != 0) echo "<a id=\"less\" class=\"round more\" style=\"float: left;\" href=\"lists.php?t=$type&c=$prelist\">Back</a>";
+				if ($nextlist != 0) echo "<a id=\"more\" class=\"round more\" style=\"float: right;\" href=\"lists.php?t=$type&c=$nextlist\">Next</a>";
+	    	} else {
+				if ($prelist != 0) echo "<a id=\"less\" class=\"round more\" style=\"float: left;\" href=\"lists.php?id=$id&t=$type&c=$prelist\">Back</a>";
+				if ($nextlist != 0) echo "<a id=\"more\" class=\"round more\" style=\"float: right;\" href=\"lists.php?id=$id&t=$type&c=$nextlist\">Next</a>";
+	    	}
+		}
+	?>
+	</div>
+</div>
+
+<?php 
+	include ('inc/sidebar.php');
+	include ('inc/footer.php');
+?>
diff --git a/login.php b/login.php
index adbb78c..38c823f 100644
--- a/login.php
+++ b/login.php
@@ -73,8 +73,7 @@ function register() {
 }
 </script>
 </head>
- 
-<?php if(BASIC_AUTH) require ('basic_auth.php'); ?>
+
 <body class="form-container">
 <div class="clear rounded_5px" id="container">
  <div id="header">
@@ -117,7 +116,7 @@ function register() {
 </fieldset>
 </form>
 <div style="background: none repeat scroll 0% 0% transparent;" id="footer">
-<p>&copy; 2013 Contributors <?php if(isset($_COOKIE['twitese_name'])) echo 'and '.$_COOKIE['twitese_name'];?> &middot; <a href="http://code.google.com/p/embr/" target="_blank" title="Embr Open Source">Open Source</a></p>
+<p>&copy; 2013 Contributors <?php if(isset($_COOKIE['twitese_name'])) echo 'and '.$_COOKIE['twitese_name'];?> &middot; <a href="https://github.com/AstroProfundis/embrr" target="_blank" title="Embrr Open Source">Open Source</a></p>
 </div>
 </div>
 </body>
diff --git a/login_action.php b/login_action.php
deleted file mode 100644
index 49b6ae0..0000000
--- a/login_action.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php 
-	include ('lib/twitese.php');
-	$title = "Sign In";
-	include ('inc/header.php');
-	
-?>
-
-<div id="login_area">
-	<div id="error">
-
-<?php
-	if ( isset($_POST['username']) && isset($_POST['password']) ) {
-		$remember = isset($_POST['remember']) ? true : false;
-		$result = verify($_POST['username'], $_POST['password'], $remember);
-		if ($result) {
-			header('location: all.php');
-		} else {
-			echo "<p>Login failed. Please check your username and password.</p>";
-		}
-	} else {
-		echo "<p>Illegal request. Please go back.</p>";
-	}
-?>
-
-	</div>
-</div>	
-
-<?php 
-	include ('inc/footer.php');
-?>
diff --git a/logout.php b/logout.php
index f0727fc..4eb5946 100644
--- a/logout.php
+++ b/logout.php
@@ -1,28 +1,28 @@
-<?php 
-	if(!isset($_SESSION)){
-		session_start();
-	}
-	$time = $_SERVER['REQUEST_TIME']-300;
-	setcookie('oauth_token',"",$time);
-	setcookie('oauth_token_secret',"",$time);
-	setcookie('user_id',"",$time);
-	setcookie('twitese_name',"",$time);
-	setcookie('friends_count',"",$time);
-	setcookie('statuses_count',"",$time);
-	setcookie('followers_count',"",$time);
-	setcookie('imgurl',"",$time);
-	setcookie('name',"",$time);
-	setcookie('listed_count',"",$time);
-	setcookie('recover',"",$time);
-	setcookie('homeInterval',"",$time);
-	setcookie('updatesInterval',"",$time);
-	setcookie('proxify',"",$time);	
-	setcookie('Bgimage',"",$time);
-	setcookie('BgColor',"",$time);
-	setcookie('Bgrepeat',"",$time);
-	setcookie('Tip_Title',"",$time);
-	setcookie('Tip_Content',"",$time);
-	setcookie('Tip_More',"",$time);
-	session_destroy();
-	header('location: login.php');
-?>
+<?php 
+	if(!isset($_SESSION)){
+		session_start();
+	}
+	$time = $_SERVER['REQUEST_TIME']-300;
+	setcookie('oauth_token',"",$time);
+	setcookie('oauth_token_secret',"",$time);
+	setcookie('user_id',"",$time);
+	setcookie('twitese_name',"",$time);
+	setcookie('friends_count',"",$time);
+	setcookie('statuses_count',"",$time);
+	setcookie('followers_count',"",$time);
+	setcookie('imgurl',"",$time);
+	setcookie('name',"",$time);
+	setcookie('listed_count',"",$time);
+	setcookie('recover',"",$time);
+	setcookie('homeInterval',"",$time);
+	setcookie('updatesInterval',"",$time);
+	setcookie('proxify',"",$time);	
+	setcookie('Bgimage',"",$time);
+	setcookie('BgColor',"",$time);
+	setcookie('Bgrepeat',"",$time);
+	setcookie('Tip_Title',"",$time);
+	setcookie('Tip_Content',"",$time);
+	setcookie('Tip_More',"",$time);
+	session_destroy();
+	header('location: login.php');
+?>
diff --git a/message.php b/message.php
index 0e7483f..6121966 100644
--- a/message.php
+++ b/message.php
@@ -31,23 +31,31 @@
 
 	<?php 
 		$t = getTwitter();
-		$p = 1;
-		if (isset($_GET['p'])) {
-			$p = (int) $_GET['p'];
-			if ($p <= 0) $p = 1;
-		}
+                $since_id = isset($_GET['since_id']) ? $_GET['since_id'] : false;
+                $max_id = isset($_GET['max_id']) ? $_GET['max_id'] : false;
 	
 		if ($isSentPage) {
-			$messages = $t->sentDirectMessage($p);
+			$messages = $t->sentDirectMessages($since_id, $max_id);
 		} else {
-			$messages = $t->directMessages($p);
+			$messages = $t->directMessages($since_id, $max_id);
 		}
 		if ($messages === false) {
 			header('location: error.php');exit();
-		} 
-		$empty = count($messages) == 0? true: false;
-		if ($empty) {
-			echo "<div id=\"empty\">No tweets to display.</div>";
+		}
+
+		$count_t = count($messages);
+		if ($count_t > 1) {
+			$empty = 0; // 0 for not empty
+		} else if ($count_t < 1) {
+			$empty = 1; // 1 for no tweet to display
+		} else {
+			$empty = $t->http_code == 429 ? 2 : 0;
+		}
+
+		if ($empty == 1) {
+			echo "<div id=\"empty\">No message to display.</div>";
+		} else if ($empty == 2) {
+			echo "<div id=\"empty\">API quota is used out, please wait for a moment before next refresh.</div>";
 		} else {
 			include ('lib/timeline_format.php');
 			$output = '<ol class="timeline" id="allMessage">';
@@ -58,13 +66,14 @@
 			
 			$output .= "</ol><div id=\"pagination\">";
 			
-			
+			$firstmsg = $messages[0]->id_str;
+			$lastmsg = bcsub($messages[count($messages)-1]->id_str, "1");
 			if ($isSentPage) {
-				if ($p >1) $output .= "<a id=\"more\" class=\"round more\" style=\"float: left;\" href=\"message.php?t=sent&p=" . ($p-1) . "\">Back</a>";
-				if (!$empty) $output .= "<a id=\"more\" class=\"round more\" style=\"float: right;\" href=\"message.php?t=sent&p=" . ($p+1) . "\">Next</a>";
+				$output .= "<a id=\"less\" class=\"round more\" style=\"float: left;\" href=\"message.php?t=sent&since_id=" . $firstmsg . "\">Back</a>";
+				$output .= "<a id=\"more\" class=\"round more\" style=\"float: right;\" href=\"message.php?t=sent&max_id=" . $lastmsg . "\">Next</a>";
 			} else {
-				if ($p >1) $output .= "<a id=\"more\" class=\"round more\" style=\"float: left;\" href=\"message.php?p=" . ($p-1) . "\">Back</a>";
-				if (!$empty) $output .= "<a id=\"more\" class=\"round more\" style=\"float: right;\" href=\"message.php?p=" . ($p+1) . "\">Next</a>";
+				$output .= "<a id=\"less\" class=\"round more\" style=\"float: left;\" href=\"message.php?since_id=" . $firstmsg ."\">Back</a>";
+				$output .= "<a id=\"more\" class=\"round more\" style=\"float: right;\" href=\"message.php?max_id=" . $lastmsg ."\">Next</a>";
 			}
 			
 			$output .= "</div>";	
diff --git a/nexus.php b/nexus.php
deleted file mode 100644
index 87f5b3e..0000000
--- a/nexus.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-	include ('lib/twitese.php');
-	$title = "Nexus";
-	include ('inc/header.php');	
-	if (!loginStatus()) header('location: login.php');	
-?>
-<style type="text/css">
-#analyze {
-display: block; 
-float: left; 
-width: 200px; 
-margin-left: 145px; 
-margin-top: 20px; 
-height: 40px;
-background-color:#FFFFFF;
-background-image:url("../img/more.gif");
-background-position:left top;
-background-repeat:repeat-x;
-border-color:#DDDDDD #AAAAAA #AAAAAA #DDDDDD;
-border-style:solid;
-border-width:1px;
-color:#666666;
-display:block;
-font-family:Tahoma,Arial,sans-serif;
-font-size:14px;
-font-weight:700;
-letter-spacing:1px;
-line-height:1.5em;
-margin-bottom:6px;
-outline-style:none;
-outline-width:medium;
-text-align:center;
-text-shadow:1px 1px 1px #FFFFFF;
-}
-#analyze:hover {
-background-position:left -78px;
-border:1px solid #BBBBBB;
-text-decoration:none;
-}
-#analyze:active {
-background-position:left -38px;
-color:#666666;
-}
-#analyze.loading  {
-background-color:transparent;
-background-image:url("../img/ajax.gif");
-background-position:50% 50%;
-background-repeat:no-repeat;
-border:medium none;
-cursor:default !important;
-}
-#analyze::-moz-focus-inner {
-border:0 none;}
-#users  {
-box-shadow:0 2px 10px #333333; 
--webkit-box-shadow: 0 2px 10px #333333;
--moz-box-shadow: 0 2px 10px #333333;
-background:url("../img/bg-front.gif") repeat-x scroll 0 bottom transparent;
-display:block;
-float:left;
-margin-bottom:10px;
-margin-left:25px;
-margin-top:25px;
-padding:15px 15px 20px 0;
-width:480px;
-}
-#users h2 {
-background:url("../img/nexus_logo.png") no-repeat scroll 0 0 transparent;
-color:#666666;
-height:44px;
-margin:0 0 0 15px;
-text-indent:-9999em;
-width:117px;
-}
-#descr {display: block; float: left; clear: both; text-shadow: 1px 1px rgb(238, 238, 238); margin: 10px 0 15px 15px; color: rgb(51, 51, 51);font-size:12px}
-.at_sym_1 {display: block; float: left; vertical-align: middle; clear: both; margin-top: 7px; font-size: 14px; margin-left: 55px; color: rgb(51, 51, 51);}
-.at_sym_2 {display: block; float: left; margin-left: 15px; vertical-align: middle; font-size: 14px; margin-top: 7px; color: rgb(51, 51, 51);}
-.and_sym {display: block; float: left; margin-left: 15px; vertical-align: middle; font-weight: bold; font-size: 14px; margin-top: 7px; color: rgb(102, 102, 102);}
-.user_input {
-border:1px solid #A7A6AA;
-color:#666666;
-display:block;
-float:left;
-font-family:tahoma;
-font-size:14px;
-font-weight:bold;
-letter-spacing:1px;
-margin-left:5px;
-margin-top:3px;
-padding:5px;
-vertical-align:top;
-width:130px;
-}
-#result {
-display:block;
-float:left;
-width:460px;
-height:200px;
-margin-left:20px;
-margin-top:10px;
-}
-.intro  {
-background:url("../img/nexus_intro.png") no-repeat scroll 0 0 transparent;
-}
-.sect {
-box-shadow:0px 0px 5px #c2c2c2; 
--webkit-box-shadow: 0px 0px 5px #c2c2c2;
--moz-box-shadow: 0px 0px 5px #c2c2c2;
-display: block; 
-float: left; 
-height: 0px; 
-margin-left: 15px; 
-color: #EEEEEE; 
-width: 464px; 
-margin-top: 10px;
-}
-#result h3  {
-color:red;
-display:block;
-font-size:20px;
-margin-top:90px;
-margin-left:0 !important;
-text-align:center;
-}
-</style>
-<script type="text/javascript" src="js/nexus.js"></script>
-<div id="statuses" class="column round-left">
-<div class="round" id="users">
-<h2>
-<span>Nexus</span>
-</h2>
-<hr class="sect" />
-<p id="result" class="intro"></p>
-<p id="descr">Rabr Nexus is a tool helps you analyze relationships between you or the others.</p>
-<label class="at_sym_1">@</label>
-<input type="text" id="user_1" name="user_1" class="user_input" onfocus="this.select()" onmouseover="this.focus()" value="<?php if (isset($_GET['target'])) echo $_GET['target'] ?>" />
-<label class="and_sym">and</label>
-<label class="at_sym_2">@</label>
-<input type="text" id="user_2" name="user_2" class="user_input" onfocus="this.select()" onmouseover="this.focus()" value="<?php if (isset($_GET['source'])) echo $_GET['source'] ?>"/>
-<input type="submit" id="analyze" class="round" value="Analyze" />
-</div>
-</div>
-
-<?php 
-	include ('inc/sidebar.php');
-?>
-
-<?php 
-	include ('inc/footer.php');
-?>
diff --git a/oauth.php b/oauth.php
index eae87c5..e0b09f5 100644
--- a/oauth.php
+++ b/oauth.php
@@ -1,106 +1,109 @@
-<?php
-	/* Start session and load lib */
-	if(!isset($_SESSION)){
-		session_start();
-	}
-	include_once('lib/twitese.php');
-	foreach ($AUTH_ID as &$id) {
-		$id = strtoupper($id);
-	}
-	if (isset($_REQUEST['oauth_token'])) {
-		if($_SESSION['oauth_token'] !== $_REQUEST['oauth_token']) {
-			$_SESSION['oauth_status'] = 'oldtoken';
-			session_destroy();
-			header('Location: login.php?oauth=old');exit();
-		}else{
-			/* Create TwitteroAuth object with app key/secret and token key/secret from default phase */
-			$connection = new TwitterOAuth(CONSUMER_KEY, CONSUMER_SECRET, $_SESSION['oauth_token'], $_SESSION['oauth_token_secret']);
-
-			/* Request access tokens from twitter */
-			$access_token = $connection->getAccessToken($_REQUEST['oauth_verifier']);
-
-			/* Save the access tokens. Normally these would be saved in a database for future use. */
-			$_SESSION['access_token'] = $access_token;
-
-			/* Remove no longer needed request tokens */
-			unset($_SESSION['oauth_token']);
-			unset($_SESSION['oauth_token_secret']);
-
-			/* If HTTP response is 200 continue otherwise send to connect page to retry */
-			if (200 == $connection->http_code) {
-				/* The user has been verified and the access tokens can be saved for future use */
-				$_SESSION['login_status'] = 'verified';
-				$t = getTwitter();
-				$user = $t->veverify();
-				
-				if ( ID_AUTH && (!in_array(strtoupper($t->screen_name),$AUTH_ID)) ){
-					session_destroy();
-					header("Location: login.php?oauth=denied");exit;
-				}
-				/* And set new cookies */
-				$time = $_SERVER['REQUEST_TIME']+3600*24*365;
-				setEncryptCookie('oauth_token', $access_token['oauth_token'], $time, '/');
-				setEncryptCookie('oauth_token_secret', $access_token['oauth_token_secret'], $time, '/');
-				setEncryptCookie('user_id', $access_token['user_id'], $time, '/');
-				setEncryptCookie('twitese_name', $t->screen_name, $time, '/');
-				refreshProfile();
-				
-				if(!isset($_COOKIE['showpic'])){
-					setcookie('showpic', 'true', $time, '/');
-				}
-				if(!isset($_COOKIE['mediaPre'])){
-					setcookie('mediaPre', 'true', $time, '/');
-				}
-				if(!isset($_COOKIE['loginPage'])) {
-					header('Location: index.php');exit();
-				} else {
-					$scheme = (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != "on") ? 'http' : 'https';
-					$port = $_SERVER['SERVER_PORT'] != 80 ? ':'.$_SERVER['SERVER_PORT'] : '';
-					$login_page = $scheme . '://' . $_SERVER['HTTP_HOST'] . $port . $_COOKIE['loginPage'];
-					header('Location: '. $login_page);exit();
-				}
-				
-			} else {
-				session_destroy();
-				header('Location: login.php?oauth=error');exit();
-			}
-		}
-	}else{
-		/* Create TwitterOAuth object and get request token */
-		$connection = new TwitterOAuth(CONSUMER_KEY, CONSUMER_SECRET);
-		
-		/* Get callback URL */
-		$scheme = (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != "on") ? 'http' : 'https';
-		$port = $_SERVER['SERVER_PORT'] != 80 ? ':'.$_SERVER['SERVER_PORT'] : '';
-		$oauth_callback = $scheme . '://' . $_SERVER['HTTP_HOST'] . $port . $_SERVER['REQUEST_URI'];
-	
-		/* Get request token */
-		$request_token = $connection->getRequestToken($oauth_callback);
-
-		/* Save request token to session */
-		$_SESSION['oauth_token'] = $token = $request_token['oauth_token'];
-		$_SESSION['oauth_token_secret'] = $request_token['oauth_token_secret'];
-
-		/* If last connection fails don't display authorization link */
-		switch ($connection->http_code) {
-			case 200:
-				
-				$time = $_SERVER['REQUEST_TIME']+3600*24*365;
-				$url = $connection->getAuthorizeURL($token);
-				if ( isset($_POST['proxify']) ) { 
-					$raw= processCurl($url);
-					$new = str_replace('https://api.twitter.com/oauth/authorize', 'authorize.php',$raw); 
-					$new = str_replace('html { display:none; }','.error,a.sign-up,input[name="deny"]{display:none !important;}',$new);
-					$new = preg_replace('/https?:\/\/\w+([0-9])\.twimg\.com/i','https://s3.amazonaws.com/twitter_production',$new);
-  				echo $new;
-				} //OAuth Proxy End
-				else {
-					header('Location: ' . $url); 
-				}
-				break;
-			default:
-				header('Location: error.php?t=1');exit();
-				break;
-		}
-	}
-?>
\ No newline at end of file
+<?php
+	/* Start session and load lib */
+	if(!isset($_SESSION)){
+		session_start();
+	}
+	include_once('lib/twitese.php');
+	foreach ($AUTH_ID as &$id) {
+		$id = strtoupper($id);
+	}
+	if (isset($_REQUEST['oauth_token'])) {
+		if($_SESSION['oauth_token'] !== $_REQUEST['oauth_token']) {
+			$_SESSION['oauth_status'] = 'oldtoken';
+			session_destroy();
+			header('Location: login.php?oauth=old');exit();
+		}else{
+			/* Create TwitteroAuth object with app key/secret and token key/secret from default phase */
+			$connection = new TwitterOAuth(CONSUMER_KEY, CONSUMER_SECRET, $_SESSION['oauth_token'], $_SESSION['oauth_token_secret']);
+
+			/* Request access tokens from twitter */
+			$access_token = $connection->getAccessToken($_REQUEST['oauth_verifier']);
+
+			/* Save the access tokens. Normally these would be saved in a database for future use. */
+			$_SESSION['access_token'] = $access_token;
+
+			/* Remove no longer needed request tokens */
+			unset($_SESSION['oauth_token']);
+			unset($_SESSION['oauth_token_secret']);
+
+			/* If HTTP response is 200 continue otherwise send to connect page to retry */
+			if (200 == $connection->http_code) {
+				/* The user has been verified and the access tokens can be saved for future use */
+				$_SESSION['login_status'] = 'verified';
+				$t = getTwitter();
+				$user = $t->veverify();
+				
+				if ( ID_AUTH && (!in_array(strtoupper($t->screen_name),$AUTH_ID)) ){
+					session_destroy();
+					header("Location: login.php?oauth=denied");exit;
+				}
+				/* And set new cookies */
+				$time = $_SERVER['REQUEST_TIME']+3600*24*365;
+				setEncryptCookie('oauth_token', $access_token['oauth_token'], $time, '/');
+				setEncryptCookie('oauth_token_secret', $access_token['oauth_token_secret'], $time, '/');
+				setEncryptCookie('user_id', $access_token['user_id'], $time, '/');
+				setEncryptCookie('twitese_name', $t->screen_name, $time, '/');
+				refreshProfile();
+				
+				if(!isset($_COOKIE['showpic'])){
+					setcookie('showpic', 'true', $time, '/');
+				}
+				if(!isset($_COOKIE['shownick'])){
+					setcookie('shownick', 'false', $time, '/');
+				}
+				if(!isset($_COOKIE['mediaPre'])){
+					setcookie('mediaPre', 'true', $time, '/');
+				}
+				if(!isset($_COOKIE['loginPage'])) {
+					header('Location: index.php');exit();
+				} else {
+					$scheme = (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != "on") ? 'http' : 'https';
+					$port = $_SERVER['SERVER_PORT'] != 80 ? ':'.$_SERVER['SERVER_PORT'] : '';
+					$login_page = $scheme . '://' . $_SERVER['HTTP_HOST'] . $port . $_COOKIE['loginPage'];
+					header('Location: '. $login_page);exit();
+				}
+				
+			} else {
+				session_destroy();
+				header('Location: login.php?oauth=error');exit();
+			}
+		}
+	}else{
+		/* Create TwitterOAuth object and get request token */
+		$connection = new TwitterOAuth(CONSUMER_KEY, CONSUMER_SECRET);
+		
+		/* Get callback URL */
+		$scheme = (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != "on") ? 'http' : 'https';
+		$port = $_SERVER['SERVER_PORT'] != 80 ? ':'.$_SERVER['SERVER_PORT'] : '';
+		$oauth_callback = $scheme . '://' . $_SERVER['HTTP_HOST'] . $port . $_SERVER['REQUEST_URI'];
+	
+		/* Get request token */
+		$request_token = $connection->getRequestToken($oauth_callback);
+
+		/* Save request token to session */
+		$_SESSION['oauth_token'] = $token = $request_token['oauth_token'];
+		$_SESSION['oauth_token_secret'] = $request_token['oauth_token_secret'];
+
+		/* If last connection fails don't display authorization link */
+		switch ($connection->http_code) {
+			case 200:
+				
+				$time = $_SERVER['REQUEST_TIME']+3600*24*365;
+				$url = $connection->getAuthorizeURL($token);
+				if ( isset($_POST['proxify']) ) { 
+					$raw= processCurl($url);
+					$new = str_replace('https://api.twitter.com/oauth/authorize', 'authorize.php',$raw); 
+					$new = str_replace('html { display:none; }','.error,a.sign-up,input[name="deny"]{display:none !important;}',$new);
+					$new = preg_replace('/https?:\/\/\w+([0-9])\.twimg\.com/i','https://s3.amazonaws.com/twitter_production',$new);
+  				echo $new;
+				} //OAuth Proxy End
+				else {
+					header('Location: ' . $url); 
+				}
+				break;
+			default:
+				header('Location: error.php?t=1');exit();
+				break;
+		}
+	}
+?>
diff --git a/profile.php b/profile.php
index b88cde9..c6e7b57 100644
--- a/profile.php
+++ b/profile.php
@@ -1,58 +1,63 @@
-<?php
-	include ('lib/twitese.php');
-	$title = "Profile";
-	include ('inc/header.php');
-	
-	if (!loginStatus()) header('location: login.php');
-?>
-
-<script src="js/btns.js"></script>
-
-<div id="statuses" class="column round-left">
-
-	<?php include('inc/sentForm.php');
-		$t = getTwitter();
-		$p = 1;
-		if (isset($_GET['p'])) {
-			$p = (int) $_GET['p'];
-			if ($p <= 0) $p = 1;
-		}
-	
-		$statuses = $t->userTimeline($p);
-		if ($statuses === false) {
-			header('location: error.php');exit();
-		} 
-		$empty = count($statuses) == 0? true: false;
-		if ($empty) {
-			echo "<div id=\"empty\">No tweet to display.</div>";
-		} else {
-			include_once('lib/timeline_format.php');
-			$output = '<ol class="timeline" id="allTimeline">';
-
-			foreach ($statuses as $status) {
-				if (isset($status->retweeted_status)) {
-					$output .= format_retweet($status,true);
-				} else { 
-					$output .= format_timeline($status,$t->username);
-				}
-			}
-
-			$output .= "</ol><div id=\"pagination\">";
-
-			if ($p >1) $output .= "<a id=\"more\" class=\"round more\" style=\"float: left;\" href=\"profile.php?p=" . ($p-1) . "\">Back</a>";
-			if (!$empty) $output .= "<a id=\"more\" class=\"round more\" style=\"float: right;\" href=\"profile.php?p=" . ($p+1) . "\">Next</a>";
-
-			$output .= "</div>";
-
-			echo $output;
-		}
-
-
-
-?>
-</div>
-
-<?php 
-		include ('inc/sidebar.php');
-		include ('inc/footer.php');
-?>
+<?php
+	include ('lib/twitese.php');
+	$title = "Profile";
+	include ('inc/header.php');
+	
+	if (!loginStatus()) header('location: login.php');
+?>
+
+<script src="js/btns.js"></script>
+
+<div id="statuses" class="column round-left">
+
+	<?php include('inc/sentForm.php');
+		$t = getTwitter();
+		$since_id = isset($_GET['since_id']) ? $_GET['since_id'] : false;
+		$max_id = isset($_GET['max_id']) ? $_GET['max_id'] : false;
+	
+		$statuses = $t->userTimeline(false, $since_id, $max_id);
+		if ($statuses === false) {
+			header('location: error.php');exit();
+		} 
+		$empty = count($statuses) == 0? true: false;
+		if ($empty) {
+			echo "<div id=\"empty\">No tweet to display.</div>";
+		} else if ($t->http_code == 429) {
+			echo "<div id=\"empty\">API quota is used out, please wait for a moment before next refresh.</div>";
+		} else {
+			include_once('lib/timeline_format.php');
+			$output = '<ol class="timeline" id="allTimeline">';
+
+			$firstid = false;
+			$lastid = false;
+			foreach ($statuses as $status) {
+				if (isset($status->retweeted_status)) {
+					$output .= format_retweet($status,true);
+				} else { 
+					$output .= format_timeline($status,$t->username);
+				}
+				if(!$firstid)
+					$firstid = $status->id_str;
+				$lastid = $status->id_str;
+			}
+			$lastid = bcsub($lastid, "1");
+
+			$output .= "</ol><div id=\"pagination\">";
+
+			$output .= "<a id=\"less\" class=\"round more\" style=\"float: left;\" href=\"profile.php?since_id={$firstid}\">Back</a>";
+			$output .= "<a id=\"more\" class=\"round more\" style=\"float: right;\" href=\"profile.php?max_id={$lastid}\">Next</a>";
+
+			$output .= "</div>";
+
+			echo $output;
+		}
+
+
+
+?>
+</div>
+
+<?php 
+		include ('inc/sidebar.php');
+		include ('inc/footer.php');
+?>
diff --git a/rank.php b/rank.php
deleted file mode 100644
index e405de7..0000000
--- a/rank.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-	include ('lib/twitese.php');
-	$title = "Ranking";
-	include ('inc/header.php');
-	
-	if (!loginStatus()) header('location: login.php');
-?>
-
-<script type="text/javascript" src="js/profile.js"></script>
-
-<div id="statuses" class="column round-left">
-
-	<h2>Rankings</h2>
-	<div class="clear"></div>
-	
-	<?php 
-		$t = getTwitter();
-		$p = 1;
-		if (isset($_GET['p'])) {
-			$p = (int) $_GET['p'];
-			if ($p <= 0) $p = 1;
-		}
-		$num = 20*($p-1);
-	
-		$users = $t->rank($p);
-		if ($users === false) {
-			header('location: error.php');
-		} 
-		$empty = count($users) == 0? true: false;
-		if ($empty) {
-			echo "<div id=\"empty\">No tweet to display.</div>";
-		} else {
-			$output = '<ol class="rank_list">';
-			
-			foreach ($users as $user) {
-				$num++;	
-				$output .= "
-				<li>
-					<span class=\"rank_img\"><a href=\"user.php?id=$user->screen_name\"><img src=\"$user->profile_img_url\" /></a></span>
-					<div class=\"rank_content\">
-						<span class=\"rank_num\">No. $num <span class=\"rank_name\"><a href=\"user.php?id=$user->screen_name\">$user->name</a></span><span class=\"rank_screenname\"> ($user->screen_name)</span></span>
-						<span class=\"rank_count\">Followers：$user->followers_count 　Friends：$user->friends_count 　Tweets：$user->statuses_count</span>
-						<span class=\"rank_description\">Bio：$user->description</span>
-					</div>
-				</li>
-				";
-			}
-			
-			$output .= "</ol><div id=\"pagination\">";
-			
-			if ($p >1) $output .= "<a id=\"more\" class=\"round more\" style=\"float: left;\" href=\"rank.php?p=" . ($p-1) . "\">Back</a>";
-			if (!$empty) $output .= "<a id=\"more\" class=\"round more\" style=\"float: right;\" href=\"rank.php?p=" . ($p+1) . "\">Next</a>";
-			
-			$output .= "</div>";
-			
-			echo $output;
-		}
-		
-	?>
-</div>
-
-<?php 
-	include ('inc/sidebar.php');
-?>
-
-<?php 
-	include ('inc/footer.php');
-?>
diff --git a/replies.php b/replies.php
index c88b949..a7b550d 100644
--- a/replies.php
+++ b/replies.php
@@ -1,50 +1,62 @@
-<?php
-	include ('lib/twitese.php');
-	$title = "Replies";
-	include ('inc/header.php');
-	if (!loginStatus()) header('location: login.php');
-?>
-
-<script src="js/btns.js"></script>
-
-<div id="statuses" class="column round-left">
-<?php 
-	include('inc/sentForm.php');
-	include('lib/timeline_format.php');
-		$t = getTwitter();
-		$p = 1;
-		if (isset($_GET['p'])) {
-			$p = (int) $_GET['p'];
-			if ($p <= 0) $p = 1;
-		}
-	
-		$statuses = $t->replies($p);
-		if ($statuses === false) {
-			header('location: error.php');exit();
-		} 
-		$empty = count($statuses) == 0? true: false;
-		if ($empty) {
-			echo "<div id=\"empty\">No tweet to display.</div>";
-		} else {
-			$output = '<ol class="timeline" id="allTimeline">';
-			
-			foreach ($statuses as $status) {
-				$output .= format_timeline($status,$t->username);
-			}
-			
-			$output .= "</ol><div id=\"pagination\">";
-			
-			if ($p >1) $output .= "<a id=\"more\" class=\"round more\" style=\"float: left;\" href=\"replies.php?p=" . ($p-1) . "\">Back</a>";
-			if (!$empty) $output .= "<a id=\"more\" class=\"round more\" style=\"float: right;\" href=\"replies.php?p=" . ($p+1) . "\">Next</a>";
-			
-			$output .= "</div>";
-			
-			echo $output;
-		}
-	?>
-</div>
-
-<?php 
-	include ('inc/sidebar.php');
-	include ('inc/footer.php');
-?>
+<?php
+	include ('lib/twitese.php');
+	$title = "Replies";
+	include ('inc/header.php');
+	if (!loginStatus()) header('location: login.php');
+?>
+
+<script src="js/btns.js"></script>
+
+<div id="statuses" class="column round-left">
+<?php 
+	include('inc/sentForm.php');
+	include('lib/timeline_format.php');
+		$t = getTwitter();
+		$since_id = isset($_GET['since_id']) ? $_GET['since_id'] : false;
+		$max_id = isset($_GET['max_id']) ? $_GET['max_id'] : false;
+	
+		$statuses = $t->replies($since_id, $max_id);
+		if ($statuses === false) {
+			header('location: error.php');exit();
+		} 
+
+		$count_t = count($statuses);
+		if ($count_t > 1) {
+			$empty = 0; // 0 for not empty
+		} else if ($count_t < 1) {
+			$empty = 1; // 1 for no tweets to display
+		} else {
+			$empty = $t->http_code == 429 ? 2 : 0; // 2 for API outage
+		}
+		if ($empty == 1) {
+			echo "<div id=\"empty\">No tweet to display.</div>";
+		} else if ($empty == 2) {
+			echo "<div id=\"empty\">API quota is used out, please wait for a moment before next refresh.</div>";
+		} else {
+			$output = '<ol class="timeline" id="allTimeline">';
+			
+			$firstid = false;
+			$lastid = false;
+			foreach ($statuses as $status) {
+				if (!$firstid) $firstid = $status->id_str;
+				$lastid = $status->id_str;
+				$output .= format_timeline($status,$t->username);
+			}
+			$lastid = bcsub($lastid, "1");
+			
+			$output .= "</ol><div id=\"pagination\">";
+			
+			$output .= "<a id=\"less\" class=\"round more\" style=\"float: left;\" href=\"replies.php?since_id=" . $firstid . "\">Back</a>";
+			$output .= "<a id=\"more\" class=\"round more\" style=\"float: right;\" href=\"replies.php?max_id=" . $lastid . "\">Next</a>";
+			
+			$output .= "</div>";
+			
+			echo $output;
+		}
+	?>
+</div>
+
+<?php 
+	include ('inc/sidebar.php');
+	include ('inc/footer.php');
+?>
diff --git a/retweets.php b/retweets.php
index 3e86cf3..46e73ad 100644
--- a/retweets.php
+++ b/retweets.php
@@ -1,39 +1,46 @@
-<?php
-	include_once('lib/twitese.php');
-	$title = "Retweets";
-	include_once('inc/header.php');
-	include_once('lib/timeline_format.php');
-	if (!loginStatus()) header('location: login.php');
-
-	$type = 'retweets';
-	$page = isset($_GET['p']) ? $_GET['p'] : 1;
-	$count = isset($_GET['count']) ? $_GET['count'] : 20;
-	$since_id = isset($_GET['since']) ? $_GET['since'] : false;
-	$max_id = isset($_GET['maxid']) ? $_GET['maxid'] : false;
-
-	$t = getTwitter();
-	$retweets = $t->retweets_of_me($page, $count, $since_id, $max_id);
-	echo '<div id="statuses" class="column round-left">';
-	include_once('inc/sentForm.php');
-	$html = '<script src="js/btns.js"></script>
-	<style>
-	.big-retweet-icon{display:none}
-	</style>';
-	$html .='<div class="clear"></div>';
-	$empty = count($retweets) == 0? true: false;
-	if ($empty) {
-		$html .= "<div id=\"empty\">No retweets to display.</div>";
-	} else {
-		$html .= '<ol class="timeline" id="allTimeline">';
-		foreach($retweets as $retweet){
-			$html .= format_retweet_of_me($retweet);
-		}
-		$html .= '</ol><div id="pagination">';
-			if ($page >1) $html .= "<a id=\"more\" class=\"round more\" style=\"float: left;\" href=\"retweets.php?p=" . ($page-1) . "\">Back</a>";
-			if (!$empty) $html .= "<a id=\"more\" class=\"round more\" style=\"float: right;\" href=\"retweets.php?p=" . ($page+1) . "\">Next</a>";
-		$html .= "</div>";
-	}
-	echo $html;
-	include_once('inc/sidebar.php');
-	include_once('inc/footer.php');
-?>
+<?php
+	include_once('lib/twitese.php');
+	$title = "Retweets";
+	include_once('inc/header.php');
+	include_once('lib/timeline_format.php');
+	if (!loginStatus()) header('location: login.php');
+
+	$count = isset($_GET['count']) ? $_GET['count'] : 20;
+	$since_id = isset($_GET['since_id']) ? $_GET['since_id'] : false;
+	$max_id = isset($_GET['max_id']) ? $_GET['max_id'] : false;
+
+	$t = getTwitter();
+
+	$retweets = $t->retweets_of_me($count, $since_id, $max_id);
+
+	echo '<div id="statuses" class="column round-left">';
+	include_once('inc/sentForm.php');
+	$html = '<script src="js/btns.js"></script>
+	<style>
+	.big-retweet-icon{display:none}
+	</style>';
+	$html .='<div class="clear"></div>';
+	$empty = count($retweets) == 0? true: false;
+	if ($empty) {
+		$html .= "<div id=\"empty\">No retweet to display.</div>";
+	} else if ($t->http_code == 429) {
+		$html .= "<div id=\"empty\">API quota is used out, please wait for a moment before next refresh.</div>";
+	} else {
+		$html .= '<ol class="timeline" id="allTimeline">';
+		$firstid = false;
+		$lastid = false;
+		foreach($retweets as $retweet){
+			if (!$firstid) $firstid = $retweet->id_str;
+			$lastid = $retweet->id_str;
+			$html .= format_retweet_of_me($retweet);
+		}
+		$lastid = bcsub($lastid, "1");
+		$html .= '</ol><div id="pagination">';
+			$html .= "<a id=\"less\" class=\"round more\" style=\"float: left;\" href=\"retweets.php?since_id={$firstid}\">Back</a>";
+			$html .= "<a id=\"more\" class=\"round more\" style=\"float: right;\" href=\"retweets.php?max_id={$lastid}\">Next</a>";
+		$html .= "</div>";
+	}
+	echo $html;
+	include_once('inc/sidebar.php');
+	include_once('inc/footer.php');
+?>
diff --git a/search.php b/search.php
index 1011803..274a7c4 100644
--- a/search.php
+++ b/search.php
@@ -6,22 +6,29 @@
 	$title = "Search";
 	include ('inc/header.php');
 
-	function getSearch($query, $max_id_str){
-		GLOBAL $output;
+	function getSearch($query, $sinceid, $maxid){
 		$t = getTwitter();
-		$result = $t->search($query, $max_id_str);
-		$statuses = $result->statuses;
-		$max_id_str = end($statuses)->id_str;
-		$resultCount = count($statuses);
+		$answer = $t->search($query,$sinceid,$maxid);
+
+		$resultCount = count($answer->statuses);
 		if ($resultCount <= 0) {
 			echo "<div id=\"empty\">No tweet to display.</div>";
 		} else {
 			include_once('lib/timeline_format.php');
 			$output = '<ol class="timeline" id="allTimeline">';
-			foreach ($statuses as $status) {
-				$output .= format_timeline($status, $t->username);
+			foreach ($answer->statuses as $status) {
+				if (isset($status->retweeted_status)) {
+                                        $output .= format_retweet($status);
+                                } else {
+                                        $output .= format_timeline($status,$t->username);
+                                }
 			}
-			$output .= "</ol><div id=\"pagination\"><a id=\"more\" class=\"round more\" style=\"float: right;\" href=\"search.php?q=".urlencode($query)."&maxid=" . $max_id_str . "\">Next</a></div>";
+			$output .= "</ol><div id=\"pagination\">";
+
+			$next_results = isset($answer->search_metadata->next_results) ? $answer->search_metadata->next_results : false;
+			if ($next_results) $output .= "<a id=\"more\" class=\"round more\" style=\"float: right;\" href=\"search.php". $next_results ."\">Next</a>";
+			$output .= "</div>";
+			echo $output;
 		}
 	}
 
@@ -32,22 +39,23 @@
 <div id="statuses" class="column round-left">
 
 	<form action="search.php" method="get" id="search_form">
-		<input type="text" name="q" id="query" value="<?php echo $_GET['q'] ?>" />
-		<input type="submit" class="more round" style="width: 103px; margin-left: 10px; display: block; float: left; height: 34px; font-family: tahoma; color: rgb(51, 51, 51);" value="Search">
+		<input type="text" name="q" id="query" value="<?php echo $_GET['q'] ?>" autocomplete="off" />
+		<input type="submit" class="more round" style="width: 73px; margin-left: 10px; display: block; float: left; height: 34px; font-family: tahoma; color: rgb(51, 51, 51);" value="Search">
+		<input type="button" class="more round" style="width: 73px; margin-left: 10px; display: block; float: right; height: 34px; font-family: tahoma; color: rgb(51, 51, 51);" value="Save" id="btn_savesearch">
 	</form>
 <?php
-	$p = 1;
+	$sinceid = false;
+	$maxid = false;
+	if (isset($_GET['since_id'])) {
+		$sinceid = $_GET['since_id'];
+	}
 	if (isset($_GET['max_id'])) {
-		$max_id = $_GET['max_id'];
-	} else {
-		$max_id = false;
+		$maxid = $_GET['max_id'];
 	}
-	$output = '';
 	if (isset($_GET['q'])) {
 		$q = $_GET['q'];
-		getSearch($q, $max_id);
+		getSearch($q, $sinceid, $maxid);
 	}
-	echo $output;
 ?>
 </div>
 
diff --git a/setting.php b/setting.php
index 1f35604..2ea1e59 100644
--- a/setting.php
+++ b/setting.php
@@ -34,31 +34,53 @@
 				<fieldset class="settings">
 				<legend>Avatar</legend>
 				<ol>
-				<li style="display:inline-block"><img src="<?php echo isset($_COOKIE['imgurl']) ? $_COOKIE['imgurl'] : getAvatar($user->profile_image_url)?>"></img></li>
+				<li style="display:inline-block"><img src="<?php echo isset($_COOKIE['imgurl']) ? $_COOKIE['imgurl'] : getAvatar($user->profile_image_url)?>" id="avatarimg"></img></li>
 				<ol style="margin-left:29px">
 					<li><input type="file" name="image" id="profile_image"/></li>
 					<li><input type="submit" id="AvatarUpload" class="btn" value="Upload"/><small style="margin-left:10px;vertical-align: middle;">BMP,JPG or PNG accepted, less than 800K.</small></li>
 				</ol></ol>
 				</fieldset>
 			</form>
+			<form id="setting_form" action="ajax/uploadImage.php?do=background" method="post" enctype="multipart/form-data">
+				<fieldset class="settings">
+				<legend>Background</legend>
+				<ol>
+				<li style="display:inline-block"><img src="<?php echo getAvatar($user->profile_background_image_url)?>" id="backgroundimg" style="max-width: 460px;"></img></li>
+				<li><input type="file" name="image" id="profile_background"/></li>
+				<li><input type="submit" id="BackgroundUpload" class="btn" value="Upload"/><small style="margin-left:10px;vertical-align: middle;">BMP,JPG or PNG accepted, less than 800K.</small></li>
+				<li>
+				<input id="tile" type="checkbox" <?php echo $user->profile_background_tile ? 'checked="checked"' : '' ?> />
+				<label>Tile the profile background</label>
+				</li>
+				</ol>
+				</fieldset>
+			</form>
 			<form id="setting_form" action="ajax/updateProfile.php" method="post">
 				<fieldset class="settings">
 				<legend>Literature</legend>
 				<table id="setting_table">
 				<tr>
-				<td class="setting_title">Name：</td>
+				<td class="setting_title">Name: </td>
 				<td><input class="setting_input" type="text" name="name" value="<?php echo isset($user->name) ? $user->name : ''?>" /></td>
 				</tr>
 				<tr>
-				<td class="setting_title">URL：</td>
-				<td><input class="setting_input" type="text" name="url" value="<?php echo isset($user->url) ? $user->url : '' ?>" /></td>
+				<td class="setting_title">URL: </td>
+				<td><input class="setting_input" type="text" name="url" value="<?php
+			if (!isset($user->url))
+				echo '';
+			else {
+				$hops = array();
+				$newurl = expandRedirect($user->url, $hops);
+				echo $newurl;
+			}
+		?>" /></td>
 				</tr>
 				<tr>
-				<td class="setting_title">Location：</td>
+				<td class="setting_title">Location: </td>
 				<td><input class="setting_input" type="text" name="location" value="<?php echo isset($user->location) ? $user->location : '' ?>" /></td>
 				</tr>
 				<tr>
-				<td class="setting_title">Bio：</td><td><small style="margin-left:5px;vertical-align: top;">*Max 160 chars</small></td>
+				<td class="setting_title">Bio: </td><td><small style="margin-left:5px;vertical-align: top;">*Max 160 chars</small></td>
 				</tr><tr>
 				<td></td>
 				<td><textarea id="setting_text" name="description"><?php echo isset($user->description) ? $user->description : '' ?></textarea></td>
@@ -111,8 +133,8 @@
 
 			<label>Home Page</label>
 			<select id="homeInterval" name="homeInterval" value="<?php echo getCookie('homeInterval')?>">
-				<option value="0.5">30 sec</option>
-				<option value="1" selected="selected">1 min(Default)</option>
+				<option value="1">1 min</option>
+				<option value="2" selected="selected">2 min (Default)</option>
 				<option value="3">3 min</option>
 				<option value="5">5 min</option>
 				<option value="10">10 min</option>
@@ -120,9 +142,9 @@
 			</select>
 			<label>Updates Page</label>
 			<select id="updatesInterval" name="updatesInterval" value="<?php echo getCookie('updatesInterval')?>">
-				<option value="0.5">30 sec</option>
 				<option value="1">1 min</option>
-				<option value="3" selected="selected">3 min(Default)</option>
+				<option value="2">2 min</option>
+				<option value="3" selected="selected">3 min (Default)</option>
 				<option value="5">5 min</option>
 				<option value="10">10 min</option>
 				<option value="0">Never</option>
@@ -137,6 +159,11 @@
 			<label>Use twitter account background</label>
 			
 			<br /><br />
+
+			<input id="shownick" type="checkbox" />
+			<label>Use nickname instead of username</label>
+
+			<br /><br />
 			
 			<label>Custom Themes</label>
 			<select id="styleSelect"></select>
diff --git a/share.php b/share.php
index 431ece5..5eda3b1 100644
--- a/share.php
+++ b/share.php
@@ -1,134 +1,135 @@
-<?php
-	if(!isset($_SESSION)){
-		session_start();
-	}
-	include ('lib/twitese.php');
-?>
-<!DOCTYPE HTML>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>Share to Embr</title>
-<style>
-body{background-color:#EEE;font-family:Tahoma,Helvetica,sans-serif;font-size:12px;margin:0}
-h2{color:#666;display:block;float:left;font-family:Helvetica;font-weight:700;margin:8px 0 0;text-shadow:1px 1px #EEE}
-p{margin:0;padding:0}
-a:active, a:focus{outline:medium none}
-a{color:#3280AB;text-decoration:none}
-a:hover{color:#000;text-decoration:underline}
-#tip{color:#999;float:right;font-size:12px}
-#tip b{font-family:Tahoma,Helvetica,sans-serif;font-size:24px;margin:3px}
-#share{border-radius:5px;box-shadow:0 0 5px #000;-moz-box-shadow:0 0 5px #000;-webkit-box-shadow:0 0 5px #000;background:url("../img/bg-front.gif") repeat-x scroll 0 0 transparent;height:230px;margin:20px 30px 0;padding:10px 20px;width:500px}
-#textbox{border-radius:2px;background-color:#FBFBFB;border:1px solid #A7A6AA;font-family:'Lucida Grande',Tahoma,sans-serif;font-size:14px;height:80px;margin:0;overflow:hidden;padding:3px;width:490px}
-#url{border-radius:2px;background-color:#FBFBFB;border:1px solid #A7A6AA;font-family:'Lucida Grande',Tahoma,sans-serif;font-size:12px;padding:3px;width:490px}
-.title{display:block;width:40px}
-table tr td{padding:5px 0}
-#message{font-size:14px;margin-top:100px;text-align:center}
-#textbox:hover, #url:hover{background-color:#FFF}
-.more{background-color:#FFF;background-image:url("../img/more.gif");background-position:left top;background-repeat:repeat-x;border-color:#DDD #AAA #AAA #DDD;border-style:solid;border-width:1px;display:block;font-family:Helvetica;font-size:18px;font-weight:700;height:22px;letter-spacing:1px;line-height:2em;margin-bottom:6px;outline-style:none;outline-width:medium;padding:6px 0;width:100%}
-.more:hover{background-position:left -78px;border:1px solid #bbb;text-decoration:none}
-.more:active{background-position:left -38px;color:#666}
-.more.loading{background-color:#fff;background-image:url(../img/ajax.gif);background-position:50% 50%;background-repeat:no-repeat;border:1px solid #eee;cursor:default!important}
-.more::-moz-focus-inner{border:0}
-.round{-moz-border-radius:8px;border-radius:8px}
-#shareBtn{color:#666;display:block;height:45px;margin:0 auto;text-shadow:0 1px 0 #FFF;vertical-align:top;width:300px;line-height:1em}
-</style>
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.3/jquery.min.js"></script>
-<script>
-$(function(){leaveWord();
-	$("#textbox").focus().bind("keyup","keydown",function(){leaveWord()});
-});
-
-function leaveWord(num){
-	if (!num) num = 140;
-	var leave = num-$("#textbox").val().length;
-	if (leave < 0){
-		$("#tip").html("<b>-" + (-leave) + "</b>");
-	} else{
-		$("#tip").html("<b>" + leave + "</b>");
-		if (leave > 40){ 
-			$("#tip, #tip b").css("color","#CCC");
-		} else if(leave > 20){
-			$("#tip, #tip b").css("color","#CAA");
-		} else if(leave > 10){
-			$("#tip, #tip b").css("color","#C88");
-		} else if(leave > 0){
-			$("#tip, #tip b").css("color","#C44");
-		} else{
-			$("#tip, #tip b").css("color","#E00");
-		}
-	}
-}
-</script>
-</head>
-
-<body>
-<?php
-	$t = getTwitter();
-	if ( isset($_POST['status']) ){
-		$status = $_POST['status'];
-		if (mb_strlen($status,'utf-8') > 140){
-			$status = mb_substr($status, 0, 140, 'utf-8');
-		}
-		$status .= $_POST['url'];
-		$result = $t->update($status);
-	}
-	
-	$text = '';
-	
-	if ( isset($_GET['u']) ){
-		$url = $_GET['u'];
-	}
-	
-	if ( isset($_GET['t']) ){
-		$title = $_GET['t'];
-		$text = $_GET['t'];
-	}
-	
-	if ( isset($_GET['d']) ){
-		$select = $_GET['d'];
-		if ( trim($select) != "" ) $text = $select;
-	}
-	
-	$text = $text;	
-	$siteUrl = str_replace('share', 'index', 'http://' . $_SERVER ['HTTP_HOST'] . $_SERVER['PHP_SELF']);
-	?>
-<div id="share">
-
-	<?php if ( !$t->username ){?>
-		<div id="message">Please <a href="login.php" target="_blank">login</a> first.</div>
-	<?php } else if ( isset($_POST['status']) ){ 
-			if ($result){
-	?>
-				<div id="message">Successfully shared your stuff on Embr! <a href="javascript:window.close()">Close</a></div>
-					<script type="text/javascript">
-					setTimeout("window.close()",1000);
-					</script>
-		<?php } else{ ?>
-				<div id="message">Failed to share your stuff, please try again. <a href="javascript:window.history.go(-1)">Go Back</a></div>
-		<?php 
-			}
-	   } else{ 
-	?>
-		<form action="share.php" method="post">
-		<table>
-			<tr>
-				<td colspan="2"><h2>Share to Embr</h2><span id="tip"><b>140</b></span></td>
-			</tr>
-			<tr>
-				<td><input type="text" name="url" id="url" disabled="ture" value="<?php echo $url?>"/></td>
-			</tr>
-			<tr>
-			<td><textarea name="status" id="textbox"><?php echo $text?> <?php if (strlen($url)>30) echo urlshorten($url); else echo $url ?></textarea></td>
-			</tr>
-			<tr>
-			<td>
-				<input class="more round" id="shareBtn" type="submit" value="Share" />
-				</td>
-			</tr>
-		</table>
-		</form>
-	<?php } ?>
-</div>
-</body>
-</html>
+<?php
+	if(!isset($_SESSION)){
+		session_start();
+	}
+	include ('lib/twitese.php');
+?>
+<!DOCTYPE HTML>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title>Share to Embr</title>
+<style>
+body{background-color:#EEE;font-family:Tahoma,Helvetica,sans-serif;font-size:12px;margin:0}
+h2{color:#666;display:block;float:left;font-family:Helvetica;font-weight:700;margin:8px 0 0;text-shadow:1px 1px #EEE}
+p{margin:0;padding:0}
+a:active, a:focus{outline:medium none}
+a{color:#3280AB;text-decoration:none}
+a:hover{color:#000;text-decoration:underline}
+#tip{color:#999;float:right;font-size:12px}
+#tip b{font-family:Tahoma,Helvetica,sans-serif;font-size:24px;margin:3px}
+#share{border-radius:5px;box-shadow:0 0 5px #000;-moz-box-shadow:0 0 5px #000;-webkit-box-shadow:0 0 5px #000;background:url("../img/bg-front.gif") repeat-x scroll 0 0 transparent;height:230px;margin:20px 30px 0;padding:10px 20px;width:500px}
+#textbox{border-radius:2px;background-color:#FBFBFB;border:1px solid #A7A6AA;font-family:'Lucida Grande',Tahoma,sans-serif;font-size:14px;height:80px;margin:0;overflow:hidden;padding:3px;width:490px}
+#url{border-radius:2px;background-color:#FBFBFB;border:1px solid #A7A6AA;font-family:'Lucida Grande',Tahoma,sans-serif;font-size:12px;padding:3px;width:490px}
+.title{display:block;width:40px}
+table tr td{padding:5px 0}
+#message{font-size:14px;margin-top:100px;text-align:center}
+#textbox:hover, #url:hover{background-color:#FFF}
+.more{background-color:#FFF;background-image:url("../img/more.gif");background-position:left top;background-repeat:repeat-x;border-color:#DDD #AAA #AAA #DDD;border-style:solid;border-width:1px;display:block;font-family:Helvetica;font-size:18px;font-weight:700;height:22px;letter-spacing:1px;line-height:2em;margin-bottom:6px;outline-style:none;outline-width:medium;padding:6px 0;width:100%}
+.more:hover{background-position:left -78px;border:1px solid #bbb;text-decoration:none}
+.more:active{background-position:left -38px;color:#666}
+.more.loading{background-color:#fff;background-image:url(../img/ajax.gif);background-position:50% 50%;background-repeat:no-repeat;border:1px solid #eee;cursor:default!important}
+.more::-moz-focus-inner{border:0}
+.round{-moz-border-radius:8px;border-radius:8px}
+#shareBtn{color:#666;display:block;height:45px;margin:0 auto;text-shadow:0 1px 0 #FFF;vertical-align:top;width:300px;line-height:1em}
+</style>
+<script src="https://ajax.aspnetcdn.com/ajax/jquery/jquery-1.8.3.min.js"></script>
+<script src="js/jquery.js"></script>
+<script>
+$(function(){leaveWord();
+	$("#textbox").focus().bind("keyup","keydown",function(){leaveWord()});
+});
+
+function leaveWord(num){
+	if (!num) num = 140;
+	var leave = num-$("#textbox").val().length;
+	if (leave < 0){
+		$("#tip").html("<b>-" + (-leave) + "</b>");
+	} else{
+		$("#tip").html("<b>" + leave + "</b>");
+		if (leave > 40){ 
+			$("#tip, #tip b").css("color","#CCC");
+		} else if(leave > 20){
+			$("#tip, #tip b").css("color","#CAA");
+		} else if(leave > 10){
+			$("#tip, #tip b").css("color","#C88");
+		} else if(leave > 0){
+			$("#tip, #tip b").css("color","#C44");
+		} else{
+			$("#tip, #tip b").css("color","#E00");
+		}
+	}
+}
+</script>
+</head>
+
+<body>
+<?php
+	$t = getTwitter();
+	if ( isset($_POST['status']) ){
+		$status = $_POST['status'];
+		if (mb_strlen($status,'utf-8') > 140){
+			$status = mb_substr($status, 0, 140, 'utf-8');
+		}
+		$status .= $_POST['url'];
+		$result = $t->update($status);
+	}
+	
+	$text = '';
+	
+	if ( isset($_GET['u']) ){
+		$url = $_GET['u'];
+	}
+	
+	if ( isset($_GET['t']) ){
+		$title = $_GET['t'];
+		$text = $_GET['t'];
+	}
+	
+	if ( isset($_GET['d']) ){
+		$select = $_GET['d'];
+		if ( trim($select) != "" ) $text = $select;
+	}
+	
+	$text = $text;	
+	$siteUrl = str_replace('share', 'index', 'http://' . $_SERVER ['HTTP_HOST'] . $_SERVER['PHP_SELF']);
+	?>
+<div id="share">
+
+	<?php if ( !$t->username ){?>
+		<div id="message">Please <a href="login.php" target="_blank">login</a> first.</div>
+	<?php } else if ( isset($_POST['status']) ){ 
+			if ($result){
+	?>
+				<div id="message">Successfully shared your stuff on Embr! <a href="javascript:window.close()">Close</a></div>
+					<script type="text/javascript">
+					setTimeout("window.close()",1000);
+					</script>
+		<?php } else{ ?>
+				<div id="message">Failed to share your stuff, please try again. <a href="javascript:window.history.go(-1)">Go Back</a></div>
+		<?php 
+			}
+	   } else{ 
+	?>
+		<form action="share.php" method="post">
+		<table>
+			<tr>
+				<td colspan="2"><h2>Share to Embr</h2><span id="tip"><b>140</b></span></td>
+			</tr>
+			<tr>
+				<td><input type="text" name="url" id="url" disabled="ture" value="<?php echo $url?>"/></td>
+			</tr>
+			<tr>
+			<td><textarea name="status" id="textbox"><?php echo $text?> <?php if (strlen($url)>30) echo urlshorten($url); else echo $url ?></textarea></td>
+			</tr>
+			<tr>
+			<td>
+				<input class="more round" id="shareBtn" type="submit" value="Share" />
+				</td>
+			</tr>
+		</table>
+		</form>
+	<?php } ?>
+</div>
+</body>
+</html>
diff --git a/signup/available.php b/signup/available.php
deleted file mode 100644
index bdbcf75..0000000
--- a/signup/available.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-include('common.php');
-echo req('https://twitter.com/users/'.$_GET['t'].'_available?'.$_GET['t'].'='.urlencode($_GET['v']));
-?>
diff --git a/signup/check.gif b/signup/check.gif
deleted file mode 100644
index 69fb804..0000000
Binary files a/signup/check.gif and /dev/null differ
diff --git a/signup/common.php b/signup/common.php
deleted file mode 100644
index e17aef1..0000000
--- a/signup/common.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-function req($url, $data=false, $cert=false) {
-	$c = curl_init();
-	curl_setopt_array($c, array(
-		CURLOPT_URL => $url,
-		CURLOPT_HTTPHEADER => array( 'User-Agent: Mozilla/5.0 (Windows NT 5.1; U; zh-cn; rv:1.8.1) Gecko/20091102 Firefox/3.5.5' ),
-		CURLOPT_RETURNTRANSFER => true,
-		CURLOPT_FOLLOWLOCATION => true,
-		CURLOPT_FRESH_CONNECT => true,
-		CURLOPT_DNS_USE_GLOBAL_CACHE => true
-	));
-	if (!strpos($url, 'https')) {
-		if ($cert) {
-			curl_setopt_array($c, array(
-				CURLOPT_SSL_VERIFYPEER => true,
-				CURLOPT_SSL_VERIFYHOST => 2,
-				CURLOPT_CAINFO, getcwd().$cert
-			));
-		} else {
-			curl_setopt($c, CURLOPT_SSL_VERIFYPEER, false);
-		}
-	}
-	if ($data) {
-		curl_setopt_array($c, array(
-			CURLOPT_POST => 1,
-			CURLOPT_POSTFIELDS => $data
-		));
-	}
-	$r = curl_exec($c);
-	curl_close($c);
-	return $r;
-}
-?>
\ No newline at end of file
diff --git a/signup/image.php b/signup/image.php
deleted file mode 100644
index 9ba3cab..0000000
--- a/signup/image.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-include('common.php');
-header('Content-Type: image/jpeg');
-echo req('https://api-secure.recaptcha.net/image?c='.$_GET['c']);
-?>
\ No newline at end of file
diff --git a/signup/index.php b/signup/index.php
deleted file mode 100644
index 536c4fb..0000000
--- a/signup/index.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-include('common.php');
-
-function between($str, $strStart, $strEnd) {
-    $posStart = strpos($str, $strStart);
-    $posEnd = strpos($str, $strEnd, $posStart);
-    return substr($str, $posStart + strlen($strStart), $posEnd - $posStart - strlen($strStart));
-}
-
-if ($_SERVER['REQUEST_METHOD'] == 'GET') {
-    $twitter = req('https://twitter.com/signup', false, false);
-    $recaptha_params = between($twitter, 'https://api-secure.recaptcha.net/challenge', '">');
-    $recaptcha = req('https://api-secure.recaptcha.net/challenge'.$recaptha_params, false, false);
-    
-    $auth_key = between($twitter, '<input name="authenticity_token" type="hidden" value="', '" />');
-    $challenge = between($recaptcha, "challenge : '", "',");
-    echo 
-'<!doctype html>
-<html>
-    <head>
-        <title>Let\'s tear down this wall!</title>
-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-        <link href="style.css" media="screen" rel="stylesheet" type="text/css" />
-    </head>
-    <body>
-        <form action="'.$_SERVER["REQUEST_URI"].'" method="POST">
-            <input name="authenticity_token" type="hidden" value="'.$auth_key.'" />
-            <input id="follow" name="follow" type="hidden" />
-            <input name="recaptcha_challenge_field" type="hidden" value="'.$challenge.'" />
-            <p>
-                <label for="user_name">姓名（可以为中文）</label><br/>
-                <input autocomplete="off" class="text_field" id="user_name" name="user[name]" size="30" type="text" /><span></span>
-            <p>
-            <p>
-                <label for="user_screen_name">用户名（用于登录，只能是英文字母、数字及下划线的组合）</label><br/>
-                <input autocomplete="off" class="text_field" id="user_screen_name" maxlength="15" name="user[screen_name]" size="15" type="text" /><span></span>
-            </p>
-            <p>
-                <label for="user_user_password">密码（至少六位）</label><br/>
-                <input autocomplete="off" class="text_field" id="user_user_password" name="user[user_password]" size="30" type="password" /><span></span>
-            </p>
-            <p>
-                <label for="user_email">邮箱（请填写真实邮箱，注册成功后会收到注册邮件）</label><br/>
-                <input autocomplete="off" class="text_field" id="user_email" name="user[email]" size="30" type="text" /><span></span>
-            </p>
-            <input name="user[send_email_newsletter]" type="hidden" value="1" />
-            <p>
-                <label for="recaptcha_response_field">输入下面的两个单词（以半角空格分开）</label><br/>
-                <img src="image.php?c='.$challenge.'" alt="recaptcha" /><br/>                
-            <input type="text" id="recaptcha_response_field" name="recaptcha_response_field" class="text_field">
-            </p>
-            <input name="user[send_email_newsletter]" type="hidden" value="0" />
-            <p><input alt="我同意。创建我的账号。" class="btn btn-m" id="user_create_submit" name="commit" onclick="this.disabled=true,this.form.submit();" type="submit" value="创建账号" /></p>
-        </form>
-        <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script>
-        <script type="text/javascript" src="main.js"></script>
-    </body>
-</html>';
-} else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-    $error_msg = false;
-    $fields = array( 'name', 'screen_name', 'user_password', 'email' );
-    foreach ($fields as $field) {
-        if (!strcmp($_POST['user'][$field], '')) {
-            $error_msg = '所有选项均为必填。';
-            break;
-        }
-    }
-    if (!$error_msg && strlen($_POST['user']['user_password']) < 6) {
-        $error_msg = '密码长度不够。';
-    }
-
-    if (!$error_msg) {
-        $r = req('https://twitter.com/account/create', @file_get_contents('php://input'), false);    
-        $err_msg = array(
-            'You can\'t do that right now.' => '出现未知错误。',
-            'Please try to match the 2 words shown above' => '验证码输入错误。',
-            'has already been taken' => '用户名或邮箱已有人使用。',
-            'is not a valid email address' => '邮箱格式不正确。'
-        );
-        foreach ($err_msg as $k => $v) {
-            if (strpos($r, $k) !== false) {
-                $error_msg = $v;
-                break;
-            }
-        }
-    }
-    if (!$error_msg) {
-        echo '注册成功，请到注册的邮箱中查收邮件。';
-    } else {
-        echo $error_msg.'请返回<a href="'.$_SERVER["REQUEST_URI"].'">注册页面</a>重试。';
-    }
-}
-?>
diff --git a/signup/main.js b/signup/main.js
deleted file mode 100644
index c5d34e0..0000000
--- a/signup/main.js
+++ /dev/null
@@ -1,79 +0,0 @@
-(function() {
-    
-    var translation = {
-        'Username has already been taken' : '用户名已经有人使用',
-        "Only use letters, numbers and '_'" : '只能使用英文字母、数字及下划线',
-        'Email has already been taken.' : '邮箱已经有人使用'
-    }
-
-    var err = function(textbox, msg) {
-        textbox.parent().find('span').addClass('error').html(msg);
-    }
-    
-    var ok = function(textbox) {
-        textbox.parent().find('span').removeClass('error').html('<img src="check.gif" alt="ok" />');
-    }
-    
-    var reEmpty = /^\s*$/;
-    var reEmail = /\w+([-+.']\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/;
-
-    var urlencode = function(str) {
-        return escape(str).replace('+', '%2B').replace('%20', '+').replace('*', '%2A').replace('/', '%2F').replace('@', '%40');
-    }
-    
-    $('#user_name').blur(function() {
-        var self = $(this);
-        if (reEmpty.test(self.val())) {
-            err(self, '姓名不能为空');
-            return;
-        }
-        ok(self);
-    });
-    
-    $('#user_screen_name').blur(function() {
-        var self = $(this);
-        if (reEmpty.test(self.val())) {
-            err(self, '用户名不能为空');
-            return;
-        }
-        $.getJSON('available.php?t=username&v=' + escape(self.val()), function(data) {
-            var span = self.parent().find('span');
-            if (data.valid) {
-                ok(self);
-            } else {
-                err(self, translation[data.msg] || data.msg);
-            }
-        });
-    });
-
-    $('#user_email').blur(function() {
-        var self = $(this);
-        var email = self.val();
-        if (!reEmail.test(email)) {
-            err(self, '输入的邮箱地址不合法');
-            return;
-        }
-        if (reEmpty.test(email)) {
-            err(self, '邮箱不能为空');
-            return;
-        }
-        $.getJSON('available.php?t=email&v=' + urlencode(email), function(data) {
-            var span = self.parent().find('span');
-            if (data.valid) {
-                ok(self);
-            } else {
-                err(self, translation[data.msg] || data.msg);
-            }
-        });
-    });
-    
-    $('#user_user_password').blur(function() {
-        var self = $(this);
-        if (self.val().length <= 6) {
-            err(self, '密码长度不能小于6位');
-            return;
-        }
-        ok(self);
-    });
-
-})();
diff --git a/signup/style.css b/signup/style.css
deleted file mode 100644
index 5d38138..0000000
--- a/signup/style.css
+++ /dev/null
@@ -1,7 +0,0 @@
-body { font-family: Tahoma,Arial,sans-serif; font-size: 13px; }
-form { border: 20px solid #EBEBEB; width: 450px; margin: auto; padding: 5px 20px; }
-p { clear: both; }
-p label { width: 100%; text-align: left; font-weight: bold; }
-p input.text_field { width: 200px; }
-p span { margin-left: 20px; }
-.error { color: #FF0000; }
\ No newline at end of file
diff --git a/status.php b/status.php
index 40df598..a71635e 100644
--- a/status.php
+++ b/status.php
@@ -13,7 +13,7 @@
 		}
 		$user = $status->user;
 		$date = format_time($status->created_at);
-		$text = formatEntities(&$status->entities,$status->text);
+		$text = formatEntities($status->entities,$status->text);
 	} else {
 		header('location: error.php');exit();
 	}
@@ -53,8 +53,9 @@ header {margin:1em auto;text-align:right;width:600px}
 .status_body {display:block;font-size:2em;line-height:30px;margin-left:58px;overflow:hidden;position:relative}
 .timeline li {cursor:default;margin:0px;overflow:hidden;padding:10px;position:relative}
 .status_author, .rank_img {left:10px;position:absolute;top:15px;width:50px}
+.retweet_info {color:#999;display:block;font-size:11px;margin:0;text-align:left;width:100%}
 </style>
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js"></script>
+<script src="https://ajax.aspnetcdn.com/ajax/jquery/jquery-1.8.3.min.js"></script>
 <script src="js/jquery.js"></script>
 <script src="js/mediaPreview.js"></script>
 <script src="js/public.js"></script>
@@ -68,7 +69,6 @@ header {margin:1em auto;text-align:right;width:600px}
 			<ul>
 				<li><a href="index.php">Home</a></li>
 				<li><a href="profile.php">Profile</a></li>
-				<li><a href="browse.php">Public</a></li>
 				<li><a href="setting.php">Settings</a></li>
 				<li><a href="logout.php">Logout</a></li>			
 			</ul>
@@ -91,12 +91,19 @@ header {margin:1em auto;text-align:right;width:600px}
 						</span>
 						<span class="status_body">
 							<span class="status_id"><?php echo $statusid ?></span>
-							<span class="status_word"><a class="user_name" href="user.php?id=<?php echo $user->screen_name ?>"><?php echo $user->screen_name ?></a> <span class="tweet"><?php echo $text ?></span></span>
+							<span class="status_word"><a class="user_name" href="user.php?id=<?php echo $user->screen_name ?>" id="<?php echo $user->screen_name ?>"><?php if ($_COOKIE['shownick']=='true') echo $user->name; else echo $user->screen_name; ?></a> <span class="tweet"><?php echo $text ?></span></span>
 							<span class="status_info">
 										<?php if ($status->in_reply_to_status_id_str) {?><span class="in_reply_to"> <a href="status.php?id=<?php echo $status->in_reply_to_status_id_str ?>">in reply to <?php echo $status->in_reply_to_screen_name?></a></span> <?php }?>
 										<span class="source">from <?php echo $status->source ?></span>
 										<span class="date"><a href="status.php?id=<?php echo $statusid ?>" id="<?php echo $date?>" target="_blank"><?php echo date('Y-m-d H:i:s', $date); ?></a></span>
 							</span>
+				<?php if ($status->retweet_count>0) { ?>
+				<span class="retweet_info">Retweeted by</span>
+				<?php 
+				include ('lib/timeline_format.php');
+				echo getRetweeters($status->id_str, 100);
+				}
+				?>
 						</span>
 				</li>
 		</ol>
diff --git a/themes/1.css b/themes/1.css
index d9130a9..772ad10 100644
--- a/themes/1.css
+++ b/themes/1.css
@@ -1,2 +1,2 @@
-/*Theme 9 from Twitter.com*/
+/*Theme 9 from Twitter.com*/
 body{background:#1A1B1F url(http://s3.amazonaws.com/twitter_production/images/themes/theme9/bg.gif) fixed no-repeat top left}a,#content tr.hentry:hover a,body#profile #content div.hentry:hover a,#side .stats a:hover span.stats_count,#side div.user_icon a:hover,li.verified-profile a:hover,#side .promotion .definition strong,p.list-numbers a:hover,#side div.user_icon a:hover span,#content .tabMenu li a,.translator-profile a:hover,#side_name{color:#2FC2EF}body,ul#tabMenu li a,#side .section h1,#side .stat a,#side .stats a span.stats_count,#side div.section-header h1,#side div.user_icon a,#side div.user_icon a:hover,#side div.section-header h3.faq-header,ul.sidebar-menu a.active,li.verified-profile a,#side .promotion a,body #content .list-header h2,p.list-numbers a,.bar h3 label,body.timeline #content h1,.list-header h2 a span,#content .tabMenu li.active a,body#direct_messages #content .tabMenu #inbox_tab a,body#inbox #content .tabMenu #inbox_tab a,body#sent #content .tabMenu #sent_tab a,body#direct_messages #content .tabMenu #inbox_tab a,body#retweets_by_others #content .tabMenu #retweets_by_others_tab a,body#retweets #content .tabMenu #retweets_tab a,body#retweeted_by_others #content .tabMenu #retweeted_by_others_tab a,body#retweeted_of_mine #content .tabMenu #retweeted_of_mine_tab a,.translator-profile a,#owners_lists h2 a{color:#666}#side_base{border-left:1px solid #181A1E;background-color:#252429}ul.sidebar-menu a.active,ul.sidebar-menu li a:hover,#side div#custom_search.active,#side .promotion,.notify div{background-color:#3D3C41}.list-header,.list-controls,ul.sidebar-list li.active a,ul.sidebar-list li a:hover{background-color:#252429!important}#side .actions,#side .promo{border:1px solid #181A1E}#side div.section-header h3{border-bottom:1px solid #181A1E}#side hr{background:#181A1E;color:#181A1E}ul.sidebar-menu li.loading a{background:#3D3C41 url(img/spinner.gif) no-repeat 171px .5em!important}#side .collapsible h2.sidebar-title{background:transparent url(img/toggle_up_light.png) no-repeat center right!important}#side .collapsible.collapsed h2.sidebar-title{background:transparent url(img/toggle_down_light.png) no-repeat center right!important}#side ul.lists-links li a em{background:url(https://s3.amazonaws.com/twitter_production/a/1257465343/images/arrow_right_light.png) no-repeat left top}#side span.pipe{border-left:1px solid #181A1E}#list_subscriptions span.view-all,#list_memberships span.view-all,#profile span.view-all,#profile_favorites span.view-all,#following span.view-all,#followers span.view-all{border-left:0}a.edit-list{border-right:1px solid #181A1E!important}nav:hover{box-shadow:0 0 10px #2FC2EF;-webkit-box-shadow:0 0 10px #2FC2EF}
\ No newline at end of file
diff --git a/themes/10.css b/themes/10.css
index 9a55648..c953641 100644
--- a/themes/10.css
+++ b/themes/10.css
@@ -1,2 +1,2 @@
-/*theme 19 from twitter.com*/
+/*theme 19 from twitter.com*/
 body{background:#FFF04D url(http://s3.amazonaws.com/twitter_production/images/themes/theme19/bg.gif) fixed no-repeat;background-position:0 0;padding-top:0!important;_padding-top:10px!important}body,ul#tabMenu li a,#side .section h1,#side .stat a,#side .stats a span.stats_count,#side div.section-header h1,#side div.user_icon a,#side div.user_icon a:hover,#side div.section-header h3.faq-header,ul.sidebar-menu a.active,li.verified-profile a,#side .promotion a,body #content .list-header h2,p.list-numbers a,.bar h3 label,body.timeline #content h1,.list-header h2 a span,#content .tabMenu li.active a,body#direct_messages #content .tabMenu #inbox_tab a,body#inbox #content .tabMenu #inbox_tab a,body#sent #content .tabMenu #sent_tab a,body#direct_messages #content .tabMenu #inbox_tab a,body#retweets_by_others #content .tabMenu #retweets_by_others_tab a,body#retweets #content .tabMenu #retweets_tab a,body#retweeted_by_others #content .tabMenu #retweeted_by_others_tab a,body#retweeted_of_mine #content .tabMenu #retweeted_of_mine_tab a,.translator-profile a,#owners_lists h2 a{color:#333}.unconfirmed-email-banner{border-bottom:solid 1px #fff8ad}#side_base{border-left:1px solid #fff8ad;background-color:#f6ffd1}ul.sidebar-menu a.active,ul.sidebar-menu li a:hover,#side div#custom_search.active,#side .promotion,.notify div{background-color:transparent}.list-header,.list-controls,ul.sidebar-list li.active a,ul.sidebar-list li a:hover,.list-header-inner{background-color:#f6ffd1!important}#side .actions,#side .promo{border:1px solid #fff8ad}#side div.section-header h3{border-bottom:1px solid #fff8ad}#side p.sidebar-location{border-bottom:1px dotted #fff8ad}#side hr{background:#fff8ad;color:#fff8ad}ul.sidebar-menu li.loading a{background:transparent url(https://s3.amazonaws.com/twitter_production/a/1265242857/images/spinner.gif) no-repeat 171px .5em!important}#side .collapsible h2.sidebar-title{background:transparent url(https://s3.amazonaws.com/twitter_production/a/1265242857/images/toggle_up_dark.png) no-repeat center right!important}#side .collapsible.collapsed h2.sidebar-title{background:transparent url(https://s3.amazonaws.com/twitter_production/a/1265242857/images/toggle_down_dark.png) no-repeat center right!important}#side ul.lists-links li a em{background:url(https://s3.amazonaws.com/twitter_production/a/1265242857/images/arrow_right_dark.png) no-repeat left top}#side span.pipe{border-left:1px solid #fff8ad}#list_subscriptions span.view-all,#list_memberships span.view-all,#profile span.view-all,#profile_favorites span.view-all,#following span.view-all,#followers span.view-all{border-left:0}a.edit-list{border-right:1px solid #fff8ad!important}body#show #content .meta a.screen-name,#content .shared-content .screen-name,#content .meta .byline a,a,#content tr.hentry:hover a,body#profile #content div.hentry:hover a,#side .stats a:hover span.stats_count,#side div.user_icon a:hover,li.verified-profile a:hover,#side .promotion .definition strong,p.list-numbers a:hover,#side div.user_icon a:hover span,#content .tabMenu li a,.translator-profile a:hover,#local_trend_locations li a,.modal-content .list-slug,#side_name{color:#09C}nav:hover{box-shadow:0 0 10px #09C;-webkit-box-shadow:0 0 10px #09C}
\ No newline at end of file
diff --git a/themes/11.css b/themes/11.css
index 415de96..5144917 100644
--- a/themes/11.css
+++ b/themes/11.css
@@ -1,2 +1,2 @@
-/*theme 20 #red from twitter.com*/
+/*theme 20 #red from twitter.com*/
 body{background:#BF1238 url(http://s3.amazonaws.com/twitter_production/images/themes/theme20/bg.png) fixed no-repeat;background-position:0 0;padding-top:0!important;_padding-top:10px!important}body,ul#tabMenu li a,#side .section h1,#side .stat a,#side .stats a span.stats_count,#side div.section-header h1,#side div.user_icon a,#side div.user_icon a:hover,#side div.section-header h3.faq-header,ul.sidebar-menu a.active,li.verified-profile a,#side .promotion a,body #content .list-header h2,p.list-numbers a,.bar h3 label,body.timeline #content h1,.list-header h2 a span,#content .tabMenu li.active a,body#direct_messages #content .tabMenu #inbox_tab a,body#inbox #content .tabMenu #inbox_tab a,body#sent #content .tabMenu #sent_tab a,body#direct_messages #content .tabMenu #inbox_tab a,body#retweets_by_others #content .tabMenu #retweets_by_others_tab a,body#retweets #content .tabMenu #retweets_tab a,body#retweeted_by_others #content .tabMenu #retweeted_by_others_tab a,body#retweeted_of_mine #content .tabMenu #retweeted_of_mine_tab a,.translator-profile a,#owners_lists h2 a{color:#333}.unconfirmed-email-banner{border-bottom:solid 1px #FFF}#side_base{border-left:1px solid #FFF;background-color:#EFEFEF}ul.sidebar-menu a.active,ul.sidebar-menu li a:hover,#side div#custom_search.active,#side .promotion,.notify div{background-color:transparent}.list-header,.list-controls,ul.sidebar-list li.active a,ul.sidebar-list li a:hover,.list-header-inner{background-color:#EFEFEF!important}#side .actions,#side .promo{border:1px solid #FFF}#side div.section-header h3{border-bottom:1px solid #FFF}#side p.sidebar-location{border-bottom:1px dotted #FFF}#side hr{background:#FFF;color:#FFF}ul.sidebar-menu li.loading a{background:transparent url(https://s3.amazonaws.com/twitter_production/a/1265242857/images/spinner.gif) no-repeat 171px .5em!important}#side .collapsible h2.sidebar-title{background:transparent url(https://s3.amazonaws.com/twitter_production/a/1265242857/images/toggle_up_dark.png) no-repeat center right!important}#side .collapsible.collapsed h2.sidebar-title{background:transparent url(https://s3.amazonaws.com/twitter_production/a/1265242857/images/toggle_down_dark.png) no-repeat center right!important}#side ul.lists-links li a em{background:url(https://s3.amazonaws.com/twitter_production/a/1265242857/images/arrow_right_dark.png) no-repeat left top}#side span.pipe{border-left:1px solid #FFF}#list_subscriptions span.view-all,#list_memberships span.view-all,#profile span.view-all,#profile_favorites span.view-all,#following span.view-all,#followers span.view-all{border-left:0}a.edit-list{border-right:1px solid #FFF!important}body#show #content .meta a.screen-name,#content .shared-content .screen-name,#content .meta .byline a,a,#content tr.hentry:hover a,body#profile #content div.hentry:hover a,#side .stats a:hover span.stats_count,#side div.user_icon a:hover,li.verified-profile a:hover,#side .promotion .definition strong,p.list-numbers a:hover,#side div.user_icon a:hover span,#content .tabMenu li a,.translator-profile a:hover,#local_trend_locations li a,.modal-content .list-slug,#side_name{color:#BF1238}nav:hover{box-shadow:0 0 10px #BF1238;-webkit-box-shadow:0 0 10px #BF1238}
\ No newline at end of file
diff --git a/themes/12.css b/themes/12.css
index 9b2c3f5..cc36682 100644
--- a/themes/12.css
+++ b/themes/12.css
@@ -1,2 +1,2 @@
-/*Storm theme by disinfeqt*/
+/*Storm theme by disinfeqt*/
 body{background:#969696 url(../themes/img/01602_sandringhambeach_1440x900.jpg) fixed no-repeat;background-position:center center;padding-top:0!important;_padding-top:10px!important}body,ul#tabMenu li a,#side .section h1,#side .stat a,#side .stats a span.stats_count,#side div.section-header h1,#side div.user_icon a,#side div.user_icon a:hover,#side div.section-header h3.faq-header,ul.sidebar-menu a.active,li.verified-profile a,#side .promotion a,body #content .list-header h2,p.list-numbers a,.bar h3 label,body.timeline #content h1,.list-header h2 a span,#content .tabMenu li.active a,body#direct_messages #content .tabMenu #inbox_tab a,body#inbox #content .tabMenu #inbox_tab a,body#sent #content .tabMenu #sent_tab a,body#direct_messages #content .tabMenu #inbox_tab a,body#retweets_by_others #content .tabMenu #retweets_by_others_tab a,body#retweets #content .tabMenu #retweets_tab a,body#retweeted_by_others #content .tabMenu #retweeted_by_others_tab a,body#retweeted_of_mine #content .tabMenu #retweeted_of_mine_tab a,.translator-profile a,#owners_lists h2 a{color:#424242}.unconfirmed-email-banner{border-bottom:solid 1px #A6A6A6}#side_base{border-left:1px solid #A6A6A6;background-color:#E2E2E2}ul.sidebar-menu a.active,ul.sidebar-menu li a:hover,#side div#custom_search.active,#side .promotion,.notify div{background-color:transparent}.list-header,.list-controls,ul.sidebar-list li.active a,ul.sidebar-list li a:hover,.list-header-inner{background-color:#E2E2E2!important}#side .actions,#side .promo{border:1px solid #A6A6A6}#side div.section-header h3{border-bottom:1px solid #A6A6A6}#side p.sidebar-location{border-bottom:1px dotted #A6A6A6}#side hr{background:#A6A6A6;color:#A6A6A6}ul.sidebar-menu li.loading a{background:transparent url(https://s3.amazonaws.com/twitter_production/a/1265242857/images/spinner.gif) no-repeat 171px .5em!important}#side .collapsible h2.sidebar-title{background:transparent url(https://s3.amazonaws.com/twitter_production/a/1265242857/images/toggle_up_dark.png) no-repeat center right!important}#side .collapsible.collapsed h2.sidebar-title{background:transparent url(https://s3.amazonaws.com/twitter_production/a/1265242857/images/toggle_down_dark.png) no-repeat center right!important}#side ul.lists-links li a em{background:url(https://s3.amazonaws.com/twitter_production/a/1265242857/images/arrow_right_dark.png) no-repeat left top}#side span.pipe{border-left:1px solid #A6A6A6}#list_subscriptions span.view-all,#list_memberships span.view-all,#profile span.view-all,#profile_favorites span.view-all,#following span.view-all,#followers span.view-all{border-left:0}a.edit-list{border-right:1px solid #A6A6A6!important}body#show #content .meta a.screen-name,#content .shared-content .screen-name,#content .meta .byline a,a,#content tr.hentry:hover a,body#profile #content div.hentry:hover a,#side .stats a:hover span.stats_count,#side div.user_icon a:hover,li.verified-profile a:hover,#side .promotion .definition strong,p.list-numbers a:hover,#side div.user_icon a:hover span,#content .tabMenu li a,.translator-profile a:hover,#local_trend_locations li a,.modal-content .list-slug,#side_name{color:#690200}nav:hover{box-shadow:0 0 10px #690200;-webkit-box-shadow:0 0 10px #690200}
\ No newline at end of file
diff --git a/themes/13.css b/themes/13.css
index 10daffc..6eb484c 100644
--- a/themes/13.css
+++ b/themes/13.css
@@ -1,2 +1,2 @@
-/*City theme by disinfeqt*/
+/*City theme by disinfeqt*/
 body{background-size: 100% 100%;background:#969696 url(../themes/img/01500_iceonthelake_1440x900.jpg) fixed no-repeat;background-position:center center;padding-top:0!important;_padding-top:10px!important}body,ul#tabMenu li a,#side .section h1,#side .stat a,#side .stats a span.stats_count,#side div.section-header h1,#side div.user_icon a,#side div.user_icon a:hover,#side div.section-header h3.faq-header,ul.sidebar-menu a.active,li.verified-profile a,#side .promotion a,body #content .list-header h2,p.list-numbers a,.bar h3 label,body.timeline #content h1,.list-header h2 a span,#content .tabMenu li.active a,body#direct_messages #content .tabMenu #inbox_tab a,body#inbox #content .tabMenu #inbox_tab a,body#sent #content .tabMenu #sent_tab a,body#direct_messages #content .tabMenu #inbox_tab a,body#retweets_by_others #content .tabMenu #retweets_by_others_tab a,body#retweets #content .tabMenu #retweets_tab a,body#retweeted_by_others #content .tabMenu #retweeted_by_others_tab a,body#retweeted_of_mine #content .tabMenu #retweeted_of_mine_tab a,.translator-profile a,#owners_lists h2 a{color:#3B3B3B}.unconfirmed-email-banner{border-bottom:solid 1px #BFFEFF}#side_base{border-left:1px solid #BFFEFF;background-color:#EDEDED}ul.sidebar-menu a.active,ul.sidebar-menu li a:hover,#side div#custom_search.active,#side .promotion,.notify div{background-color:transparent}.list-header,.list-controls,ul.sidebar-list li.active a,ul.sidebar-list li a:hover,.list-header-inner{background-color:#EDEDED!important}#side .actions,#side .promo{border:1px solid #BFFEFF}#side div.section-header h3{border-bottom:1px solid #BFFEFF}#side p.sidebar-location{border-bottom:1px dotted #BFFEFF}#side hr{background:#BFFEFF;color:#BFFEFF}ul.sidebar-menu li.loading a{background:transparent url(https://s3.amazonaws.com/twitter_production/a/1265242857/images/spinner.gif) no-repeat 171px .5em!important}#side .collapsible h2.sidebar-title{background:transparent url(https://s3.amazonaws.com/twitter_production/a/1265242857/images/toggle_up_dark.png) no-repeat center right!important}#side .collapsible.collapsed h2.sidebar-title{background:transparent url(https://s3.amazonaws.com/twitter_production/a/1265242857/images/toggle_down_dark.png) no-repeat center right!important}#side ul.lists-links li a em{background:url(https://s3.amazonaws.com/twitter_production/a/1265242857/images/arrow_right_dark.png) no-repeat left top}#side span.pipe{border-left:1px solid #BFFEFF}#list_subscriptions span.view-all,#list_memberships span.view-all,#profile span.view-all,#profile_favorites span.view-all,#following span.view-all,#followers span.view-all{border-left:0}a.edit-list{border-right:1px solid #BFFEFF!important}body#show #content .meta a.screen-name,#content .shared-content .screen-name,#content .meta .byline a,a,#content tr.hentry:hover a,body#profile #content div.hentry:hover a,#side .stats a:hover span.stats_count,#side div.user_icon a:hover,li.verified-profile a:hover,#side .promotion .definition strong,p.list-numbers a:hover,#side div.user_icon a:hover span,#content .tabMenu li a,.translator-profile a:hover,#local_trend_locations li a,.modal-content .list-slug,#side_name{color:#009294}nav:hover{box-shadow:0 0 10px #009294;-webkit-box-shadow:0 0 10px #009294}
\ No newline at end of file
diff --git a/themes/14.css b/themes/14.css
index 9dbea60..1216127 100644
--- a/themes/14.css
+++ b/themes/14.css
@@ -1,3 +1,3 @@
-/*Cosmos Theme by disinfeqt
-Image (c) Apple Inc*/
+/*Cosmos Theme by disinfeqt
+Image (c) Apple Inc*/
 body{background:#000 url(http://static.colourlovers.com/images/themeleon/twitter/themes/0/0/17-bg.jpg) fixed no-repeat;background-position:center center;padding-top:0!important;_padding-top:10px!important}body,ul#tabMenu li a,#side .section h1,#side .stat a,#side .stats a span.stats_count,#side div.section-header h1,#side div.user_icon a,#side div.user_icon a:hover,#side div.section-header h3.faq-header,ul.sidebar-menu a.active,li.verified-profile a,#side .promotion a,body #content .list-header h2,p.list-numbers a,.bar h3 label,body.timeline #content h1,.list-header h2 a span,#content .tabMenu li.active a,body#direct_messages #content .tabMenu #inbox_tab a,body#inbox #content .tabMenu #inbox_tab a,body#sent #content .tabMenu #sent_tab a,body#direct_messages #content .tabMenu #inbox_tab a,body#retweets_by_others #content .tabMenu #retweets_by_others_tab a,body#retweets #content .tabMenu #retweets_tab a,body#retweeted_by_others #content .tabMenu #retweeted_by_others_tab a,body#retweeted_of_mine #content .tabMenu #retweeted_of_mine_tab a,.translator-profile a,#owners_lists h2 a{color:#636363}.unconfirmed-email-banner{border-bottom:solid 1px #DEDEDE}#side_base{border-left:1px solid #DEDEDE;background-color:#2B2B2B}ul.sidebar-menu a.active,ul.sidebar-menu li a:hover,#side div#custom_search.active,#side .promotion,.notify div{background-color:transparent}.list-header,.list-controls,ul.sidebar-list li.active a,ul.sidebar-list li a:hover,.list-header-inner{background-color:#2B2B2B!important}#side .actions,#side .promo{border:1px solid #DEDEDE}#side div.section-header h3{border-bottom:1px solid #DEDEDE}#side p.sidebar-location{border-bottom:1px dotted #DEDEDE}#side hr{background:#DEDEDE;color:#DEDEDE}ul.sidebar-menu li.loading a{background:transparent url(https://s3.amazonaws.com/twitter_production/a/1265242857/images/spinner.gif) no-repeat 171px .5em!important}#side .collapsible h2.sidebar-title{background:transparent url(https://s3.amazonaws.com/twitter_production/a/1265242857/images/toggle_up_light.png) no-repeat center right!important}#side .collapsible.collapsed h2.sidebar-title{background:transparent url(https://s3.amazonaws.com/twitter_production/a/1265242857/images/toggle_down_light.png) no-repeat center right!important}#side ul.lists-links li a em{background:url(https://s3.amazonaws.com/twitter_production/a/1265242857/images/arrow_right_light.png) no-repeat left top}#side span.pipe{border-left:1px solid #DEDEDE}#list_subscriptions span.view-all,#list_memberships span.view-all,#profile span.view-all,#profile_favorites span.view-all,#following span.view-all,#followers span.view-all{border-left:0}a.edit-list{border-right:1px solid #DEDEDE!important}body#show #content .meta a.screen-name,#content .shared-content .screen-name,#content .meta .byline a,a,#content tr.hentry:hover a,body#profile #content div.hentry:hover a,#side .stats a:hover span.stats_count,#side div.user_icon a:hover,li.verified-profile a:hover,#side .promotion .definition strong,p.list-numbers a:hover,#side div.user_icon a:hover span,#content .tabMenu li a,.translator-profile a:hover,#local_trend_locations li a,.modal-content .list-slug,#side_name{color:#006A87}nav:hover{box-shadow:0 0 10px #006A87;-webkit-box-shadow:0 0 10px #006A87}
\ No newline at end of file
diff --git a/themes/15.css b/themes/15.css
index b53fad7..5d086bf 100644
--- a/themes/15.css
+++ b/themes/15.css
@@ -1,5 +1,5 @@
-/*Pride (Rainbow) Theme by disinfeqt
-Loving you ain't my fault, is it? */
-body{background:#000 url(../themes/img/rainbow.jpg) fixed no-repeat;background-position:center center;padding-top:0!important;_padding-top:10px!important}body,ul#tabMenu li a,#side .section h1,#side .stat a,#side .stats a span.stats_count,#side div.section-header h1,#side div.user_icon a,#side div.user_icon a:hover,#side div.section-header h3.faq-header,ul.sidebar-menu a.active,li.verified-profile a,#side .promotion a,body #content .list-header h2,p.list-numbers a,.bar h3 label,body.timeline #content h1,.list-header h2 a span,#content .tabMenu li.active a,body#direct_messages #content .tabMenu #inbox_tab a,body#inbox #content .tabMenu #inbox_tab a,body#sent #content .tabMenu #sent_tab a,body#direct_messages #content .tabMenu #inbox_tab a,body#retweets_by_others #content .tabMenu #retweets_by_others_tab a,body#retweets #content .tabMenu #retweets_tab a,body#retweeted_by_others #content .tabMenu #retweeted_by_others_tab a,body#retweeted_of_mine #content .tabMenu #retweeted_of_mine_tab a,.translator-profile a,#owners_lists h2 a{color:#525252}.unconfirmed-email-banner{border-bottom:solid 1px #333}#side_base{border-left:1px solid #333;background-color:#000}ul.sidebar-menu a.active,ul.sidebar-menu li a:hover,#side div#custom_search.active,#side .promotion,.notify div{background-color:transparent}.list-header,.list-controls,ul.sidebar-list li.active a,ul.sidebar-list li a:hover,.list-header-inner{background-color:#000!important}#side .actions,#side .promo{border:1px solid #333}#side div.section-header h3{border-bottom:1px solid #333}#side p.sidebar-location{border-bottom:1px dotted #333}#side hr{background:#333;color:#333}ul.sidebar-menu li.loading a{background:transparent url(https://s3.amazonaws.com/twitter_production/a/1265242857/images/spinner.gif) no-repeat 171px .5em!important}#side .collapsible h2.sidebar-title{background:transparent url(https://s3.amazonaws.com/twitter_production/a/1265242857/images/toggle_up_light.png) no-repeat center right!important}#side .collapsible.collapsed h2.sidebar-title{background:transparent url(https://s3.amazonaws.com/twitter_production/a/1265242857/images/toggle_down_light.png) no-repeat center right!important}#side ul.lists-links li a em{background:url(https://s3.amazonaws.com/twitter_production/a/1265242857/images/arrow_right_light.png) no-repeat left top}#side span.pipe{border-left:1px solid #333}#list_subscriptions span.view-all,#list_memberships span.view-all,#profile span.view-all,#profile_favorites span.view-all,#following span.view-all,#followers span.view-all{border-left:0}a.edit-list{border-right:1px solid #333!important}body#show #content .meta a.screen-name,#content .shared-content .screen-name,#content .meta .byline a,a,#content tr.hentry:hover a,body#profile #content div.hentry:hover a,#side .stats a:hover span.stats_count,#side div.user_icon a:hover,li.verified-profile a:hover,#side .promotion .definition strong,p.list-numbers a:hover,#side div.user_icon a:hover span,#content .tabMenu li a,.translator-profile a:hover,#local_trend_locations li a,.modal-content .list-slug{color:#4F4F4F}
-#side_name{background:url("../themes/img/pride_flag.png") no-repeat scroll 165px 4px transparent}
+/*Pride (Rainbow) Theme by disinfeqt
+Loving you ain't my fault, is it? */
+body{background:#000 url(../themes/img/rainbow.jpg) fixed no-repeat;background-position:center center;padding-top:0!important;_padding-top:10px!important}body,ul#tabMenu li a,#side .section h1,#side .stat a,#side .stats a span.stats_count,#side div.section-header h1,#side div.user_icon a,#side div.user_icon a:hover,#side div.section-header h3.faq-header,ul.sidebar-menu a.active,li.verified-profile a,#side .promotion a,body #content .list-header h2,p.list-numbers a,.bar h3 label,body.timeline #content h1,.list-header h2 a span,#content .tabMenu li.active a,body#direct_messages #content .tabMenu #inbox_tab a,body#inbox #content .tabMenu #inbox_tab a,body#sent #content .tabMenu #sent_tab a,body#direct_messages #content .tabMenu #inbox_tab a,body#retweets_by_others #content .tabMenu #retweets_by_others_tab a,body#retweets #content .tabMenu #retweets_tab a,body#retweeted_by_others #content .tabMenu #retweeted_by_others_tab a,body#retweeted_of_mine #content .tabMenu #retweeted_of_mine_tab a,.translator-profile a,#owners_lists h2 a{color:#525252}.unconfirmed-email-banner{border-bottom:solid 1px #333}#side_base{border-left:1px solid #333;background-color:#000}ul.sidebar-menu a.active,ul.sidebar-menu li a:hover,#side div#custom_search.active,#side .promotion,.notify div{background-color:transparent}.list-header,.list-controls,ul.sidebar-list li.active a,ul.sidebar-list li a:hover,.list-header-inner{background-color:#000!important}#side .actions,#side .promo{border:1px solid #333}#side div.section-header h3{border-bottom:1px solid #333}#side p.sidebar-location{border-bottom:1px dotted #333}#side hr{background:#333;color:#333}ul.sidebar-menu li.loading a{background:transparent url(https://s3.amazonaws.com/twitter_production/a/1265242857/images/spinner.gif) no-repeat 171px .5em!important}#side .collapsible h2.sidebar-title{background:transparent url(https://s3.amazonaws.com/twitter_production/a/1265242857/images/toggle_up_light.png) no-repeat center right!important}#side .collapsible.collapsed h2.sidebar-title{background:transparent url(https://s3.amazonaws.com/twitter_production/a/1265242857/images/toggle_down_light.png) no-repeat center right!important}#side ul.lists-links li a em{background:url(https://s3.amazonaws.com/twitter_production/a/1265242857/images/arrow_right_light.png) no-repeat left top}#side span.pipe{border-left:1px solid #333}#list_subscriptions span.view-all,#list_memberships span.view-all,#profile span.view-all,#profile_favorites span.view-all,#following span.view-all,#followers span.view-all{border-left:0}a.edit-list{border-right:1px solid #333!important}body#show #content .meta a.screen-name,#content .shared-content .screen-name,#content .meta .byline a,a,#content tr.hentry:hover a,body#profile #content div.hentry:hover a,#side .stats a:hover span.stats_count,#side div.user_icon a:hover,li.verified-profile a:hover,#side .promotion .definition strong,p.list-numbers a:hover,#side div.user_icon a:hover span,#content .tabMenu li a,.translator-profile a:hover,#local_trend_locations li a,.modal-content .list-slug{color:#4F4F4F}
+#side_name{background:url("../themes/img/pride_flag.png") no-repeat scroll 165px 4px transparent}
 nav:hover{box-shadow:0 0 10px #4F4F4F;-webkit-box-shadow:0 0 10px #4F4F4F}
\ No newline at end of file
diff --git a/themes/16.css b/themes/16.css
index 762f618..c1ad62a 100644
--- a/themes/16.css
+++ b/themes/16.css
@@ -1,2 +1,2 @@
-/*Drop Bombs by disinfeqt*/
+/*Drop Bombs by disinfeqt*/
 body{background:#1F1F1F url(../themes/img/drop_bombs.png) fixed no-repeat}body,ul#tabMenu li a,#side .section h1,#side .stat a,#side .stats a span.stats_count,#side div.section-header h1,#side div.user_icon a,#side div.user_icon a:hover,#side div.section-header h3.faq-header,ul.sidebar-menu a.active,li.verified-profile a,#side .promotion a,body #content .list-header h2,p.list-numbers a,.bar h3 label,body.timeline #content h1,.list-header h2 a span,#content .tabMenu li.active a,body#direct_messages #content .tabMenu #inbox_tab a,body#inbox #content .tabMenu #inbox_tab a,body#sent #content .tabMenu #sent_tab a,body#direct_messages #content .tabMenu #inbox_tab a,body#retweets_by_others #content .tabMenu #retweets_by_others_tab a,body#retweets #content .tabMenu #retweets_tab a,body#retweeted_by_others #content .tabMenu #retweeted_by_others_tab a,body#retweeted_of_mine #content .tabMenu #retweeted_of_mine_tab a,.translator-profile a,#owners_lists h2 a{color:#75715E}.unconfirmed-email-banner{border-bottom:solid 1px #000}#side_base{border-left:1px solid #000;background-color:#1F1F1F}ul.sidebar-menu a.active,ul.sidebar-menu li a:hover,#side div#custom_search.active,#side .promotion,.notify div{background-color:#373737}.list-header,.list-controls,ul.sidebar-list li.active a,ul.sidebar-list li a:hover,.list-header-inner{background-color:#1F1F1F!important}#side .actions,#side .promo,#design .side-section{border:1px solid #000}#side div.section-header h3{border-bottom:1px solid #000}#side p.sidebar-location{border-bottom:1px dotted #000}#side hr{background:#000;color:#000}ul.sidebar-menu li.loading a{background:#373737 url(https://s3.amazonaws.com/twitter_production/a/1267486213/images/spinner.gif) no-repeat 171px .5em!important}#side .collapsible h2.sidebar-title{background:transparent url(https://s3.amazonaws.com/twitter_production/a/1267486213/images/toggle_up_light.png) no-repeat center right!important}#side .collapsible.collapsed h2.sidebar-title{background:transparent url(https://s3.amazonaws.com/twitter_production/a/1267486213/images/toggle_down_light.png) no-repeat center right!important}#side ul.lists-links li a em{background:url(https://s3.amazonaws.com/twitter_production/a/1267486213/images/arrow_right_light.png) no-repeat left top}#side span.pipe{border-left:1px solid #000}#list_subscriptions span.view-all,#list_memberships span.view-all,#profile span.view-all,#profile_favorites span.view-all,#following span.view-all,#followers span.view-all{border-left:0}a.edit-list{border-right:1px solid #000!important}body#show #content .meta a.screen-name,#content .shared-content .screen-name,#content .meta .byline a,a,#content tr.hentry:hover a,body#profile #content div.hentry:hover a,#side .stats a:hover span.stats_count,#side div.user_icon a:hover,li.verified-profile a:hover,#side .promotion .definition strong,p.list-numbers a:hover,#side div.user_icon a:hover span,#content .tabMenu li a,.translator-profile a:hover,#local_trend_locations li a,.modal-content .list-slug,.tweet-label a:hover,#side_name{color:#858585}nav:hover{box-shadow:0 0 10px #858585;-webkit-box-shadow:0 0 10px #858585}}
\ No newline at end of file
diff --git a/themes/2.css b/themes/2.css
index 33dc1bf..ad67a17 100644
--- a/themes/2.css
+++ b/themes/2.css
@@ -1,2 +1,2 @@
-/*disinfeqt's Monokai Python Style*/
+/*disinfeqt's Monokai Python Style*/
 body{background:#272822 url(../themes/img/bg.py.png) fixed no-repeat top left}a,#content tr.hentry:hover a,body#profile #content div.hentry:hover a,#side .stats a:hover span.stats_count,#side div.user_icon a:hover,li.verified-profile a:hover,#side .promotion .definition strong,p.list-numbers a:hover,#side div.user_icon a:hover span,#content .tabMenu li a,.translator-profile a:hover,#side_name{color:#66D8EF}body,ul#tabMenu li a,#side .section h1,#side .stat a,#side .stats a span.stats_count,#side div.section-header h1,#side div.user_icon a,#side div.user_icon a:hover,#side div.section-header h3.faq-header,ul.sidebar-menu a.active,li.verified-profile a,#side .promotion a,body #content .list-header h2,p.list-numbers a,.bar h3 label,body.timeline #content h1,.list-header h2 a span,#content .tabMenu li.active a,body#direct_messages #content .tabMenu #inbox_tab a,body#inbox #content .tabMenu #inbox_tab a,body#sent #content .tabMenu #sent_tab a,body#direct_messages #content .tabMenu #inbox_tab a,body#retweets_by_others #content .tabMenu #retweets_by_others_tab a,body#retweets #content .tabMenu #retweets_tab a,body#retweeted_by_others #content .tabMenu #retweeted_by_others_tab a,body#retweeted_of_mine #content .tabMenu #retweeted_of_mine_tab a,.translator-profile a,#owners_lists h2 a{color:#75715E}#side_base{border-left:1px solid #F92673;background-color:#272822}ul.sidebar-menu a.active,ul.sidebar-menu li a:hover,#side div#custom_search.active,#side .promotion,.notify div{background-color:#3F403A}.list-header,.list-controls,ul.sidebar-list li.active a,ul.sidebar-list li a:hover{background-color:#272822!important}#side .actions,#side .promo{border:1px solid #F92673}#side div.section-header h3{border-bottom:1px solid #F92673}#side hr{background:#F92673;color:#F92673}ul.sidebar-menu li.loading a{background:#3F403A url(https://s3.amazonaws.com/twitter_production/a/1258070043/images/spinner.gif) no-repeat 171px .5em!important}#side .collapsible h2.sidebar-title{background:transparent url(https://s3.amazonaws.com/twitter_production/a/1258070043/images/toggle_up_light.png) no-repeat center right!important}#side .collapsible.collapsed h2.sidebar-title{background:transparent url(https://s3.amazonaws.com/twitter_production/a/1258070043/images/toggle_down_light.png) no-repeat center right!important}#side ul.lists-links li a em{background:url(https://s3.amazonaws.com/twitter_production/a/1258070043/images/arrow_right_light.png) no-repeat left top}#side span.pipe{border-left:1px solid #F92673}#list_subscriptions span.view-all,#list_memberships span.view-all,#profile span.view-all,#profile_favorites span.view-all,#following span.view-all,#followers span.view-all{border-left:0}a.edit-list{border-right:1px solid #F92673!important}nav:hover{box-shadow:0 0 10px #66D8EF;-webkit-box-shadow:0 0 10px #66D8EF}
\ No newline at end of file
diff --git a/themes/3.css b/themes/3.css
index fb3308c..8f38970 100644
--- a/themes/3.css
+++ b/themes/3.css
@@ -1,3 +1,3 @@
-/*Twitter Classic*/
-body{background:#9AE4E8 url(http://s3.amazonaws.com/twitter_production/images/themes/theme16/bg.gif) fixed no-repeat top left}body,ul#tabMenu li a,#side .section h1,#side .stat a,#side .stats a span.stats_count,#side div.section-header h1,#side div.user_icon a,#side div.user_icon a:hover,#side div.section-header h3.faq-header,ul.sidebar-menu li.active a,li.verified-profile a,#side .promotion a,body #content .list-header h2,p.list-numbers a,.bar h3 label,body.timeline #content h1,.list-header h2 a span,#content .tabMenu li.active a,body#direct_messages #content .tabMenu #inbox_tab a,body#inbox #content .tabMenu #inbox_tab a,body#sent #content .tabMenu #sent_tab a,body#direct_messages #content .tabMenu #inbox_tab a,body#retweets_by_others #content .tabMenu #retweets_by_others_tab a,body#retweets #content .tabMenu #retweets_tab a,body#retweeted_by_others #content .tabMenu #retweeted_by_others_tab a,body#retweeted_of_mine #content .tabMenu #retweeted_of_mine_tab a,.translator-profile a,#owners_lists h2 a{color:#333}#side_base{border-left:1px solid #BDDCAD;background-color:#DFC}ul.sidebar-menu li.active a,ul.sidebar-menu li a:hover,#side div#custom_search.active,#side .promotion,.notify div{background-color:#EDFFDC}.list-header,.list-controls,ul.sidebar-list li.active a,ul.sidebar-list li a:hover{background-color:#DFC!important}#side .actions,#side .promo{border:1px solid #BDDCAD}#side div.section-header h3{border-bottom:1px solid #BDDCAD}#side hr{background:#BDDCAD;color:#BDDCAD}ul.sidebar-menu li.loading a{background:#EDFFDC url(img/spinner.gif) no-repeat 171px .5em!important}#side .collapsible h2.sidebar-title{background:transparent url(img/toggle_up_dark.png) no-repeat center right!important}#side .collapsible.collapsed h2.sidebar-title{background:transparent url(img/toggle_down_dark.png) no-repeat center right!important}#side ul.lists-links li a em{background:url(https://s3.amazonaws.com/twitter_production/a/1258070043/images/arrow_right_dark.png) no-repeat left top}#side span.pipe{border-left:1px solid #BDDCAD}#list_subscriptions span.view-all,#list_memberships span.view-all,#profile span.view-all,#profile_favorites span.view-all,#following span.view-all,#followers span.view-all{border-left:0}a.edit-list{border-right:1px solid #BDDCAD!important}body#show #content .meta a.screen-name,#content .shared-content .screen-name,a,#content tr.hentry:hover a,body#profile #content div.hentry:hover a,#side .stats a:hover span.stats_count,#side div.user_icon a:hover,li.verified-profile a:hover,#side .promotion .definition strong,p.list-numbers a:hover,#side div.user_icon a:hover span,#content .tabMenu li a,.translator-profile a:hover,#side_name{color:#0084B4}nav:hover{box-shadow:0 0 10px #0084B4;-webkit-box-shadow:0 0 10px #0084B4}
+/*Twitter Classic*/
+body{background:#9AE4E8 url(http://s3.amazonaws.com/twitter_production/images/themes/theme16/bg.gif) fixed no-repeat top left}body,ul#tabMenu li a,#side .section h1,#side .stat a,#side .stats a span.stats_count,#side div.section-header h1,#side div.user_icon a,#side div.user_icon a:hover,#side div.section-header h3.faq-header,ul.sidebar-menu li.active a,li.verified-profile a,#side .promotion a,body #content .list-header h2,p.list-numbers a,.bar h3 label,body.timeline #content h1,.list-header h2 a span,#content .tabMenu li.active a,body#direct_messages #content .tabMenu #inbox_tab a,body#inbox #content .tabMenu #inbox_tab a,body#sent #content .tabMenu #sent_tab a,body#direct_messages #content .tabMenu #inbox_tab a,body#retweets_by_others #content .tabMenu #retweets_by_others_tab a,body#retweets #content .tabMenu #retweets_tab a,body#retweeted_by_others #content .tabMenu #retweeted_by_others_tab a,body#retweeted_of_mine #content .tabMenu #retweeted_of_mine_tab a,.translator-profile a,#owners_lists h2 a{color:#333}#side_base{border-left:1px solid #BDDCAD;background-color:#DFC}ul.sidebar-menu li.active a,ul.sidebar-menu li a:hover,#side div#custom_search.active,#side .promotion,.notify div{background-color:#EDFFDC}.list-header,.list-controls,ul.sidebar-list li.active a,ul.sidebar-list li a:hover{background-color:#DFC!important}#side .actions,#side .promo{border:1px solid #BDDCAD}#side div.section-header h3{border-bottom:1px solid #BDDCAD}#side hr{background:#BDDCAD;color:#BDDCAD}ul.sidebar-menu li.loading a{background:#EDFFDC url(img/spinner.gif) no-repeat 171px .5em!important}#side .collapsible h2.sidebar-title{background:transparent url(img/toggle_up_dark.png) no-repeat center right!important}#side .collapsible.collapsed h2.sidebar-title{background:transparent url(img/toggle_down_dark.png) no-repeat center right!important}#side ul.lists-links li a em{background:url(https://s3.amazonaws.com/twitter_production/a/1258070043/images/arrow_right_dark.png) no-repeat left top}#side span.pipe{border-left:1px solid #BDDCAD}#list_subscriptions span.view-all,#list_memberships span.view-all,#profile span.view-all,#profile_favorites span.view-all,#following span.view-all,#followers span.view-all{border-left:0}a.edit-list{border-right:1px solid #BDDCAD!important}body#show #content .meta a.screen-name,#content .shared-content .screen-name,a,#content tr.hentry:hover a,body#profile #content div.hentry:hover a,#side .stats a:hover span.stats_count,#side div.user_icon a:hover,li.verified-profile a:hover,#side .promotion .definition strong,p.list-numbers a:hover,#side div.user_icon a:hover span,#content .tabMenu li a,.translator-profile a:hover,#side_name{color:#0084B4}nav:hover{box-shadow:0 0 10px #0084B4;-webkit-box-shadow:0 0 10px #0084B4}
 /*Do you miss old times? XD*/
\ No newline at end of file
diff --git a/themes/4.css b/themes/4.css
index 0a60aea..3eea644 100644
--- a/themes/4.css
+++ b/themes/4.css
@@ -1,2 +1,2 @@
-/*Pink*/
+/*Pink*/
 body{background:#F69 url(http://s3.amazonaws.com/twitter_production/images/themes/theme11/bg.gif) fixed repeat top left}body,ul#tabMenu li a,#side .section h1,#side .stat a,#side .stats a span.stats_count,#side div.section-header h1,#side div.user_icon a,#side div.user_icon a:hover,#side div.section-header h3.faq-header,ul.sidebar-menu a.active,li.verified-profile a,#side .promotion a,body #content .list-header h2,p.list-numbers a,.bar h3 label,body.timeline #content h1,.list-header h2 a span,#content .tabMenu li.active a,body#direct_messages #content .tabMenu #inbox_tab a,body#inbox #content .tabMenu #inbox_tab a,body#sent #content .tabMenu #sent_tab a,body#direct_messages #content .tabMenu #inbox_tab a,body#retweets_by_others #content .tabMenu #retweets_by_others_tab a,body#retweets #content .tabMenu #retweets_tab a,body#retweeted_by_others #content .tabMenu #retweeted_by_others_tab a,body#retweeted_of_mine #content .tabMenu #retweeted_of_mine_tab a,.translator-profile a,#owners_lists h2 a{color:#362720}#side_base{border-left:1px solid #C36;background-color:#E5507E}ul.sidebar-menu a.active,ul.sidebar-menu li a:hover,#side div#custom_search.active,#side .promotion,.notify div{background-color:#FD6896}.list-header,.list-controls,ul.sidebar-list li.active a,ul.sidebar-list li a:hover{background-color:#E5507E!important}#side .actions,#side .promo{border:1px solid #C36}#side div.section-header h3{border-bottom:1px solid #C36}#side hr{background:#C36;color:#C36}ul.sidebar-menu li.loading a{background:#FD6896 url(https://s3.amazonaws.com/twitter_production/a/1258070043/images/spinner.gif) no-repeat 171px .5em!important}#side .collapsible h2.sidebar-title{background:transparent url(https://s3.amazonaws.com/twitter_production/a/1258070043/images/toggle_up_dark.png) no-repeat center right!important}#side .collapsible.collapsed h2.sidebar-title{background:transparent url(https://s3.amazonaws.com/twitter_production/a/1258070043/images/toggle_down_dark.png) no-repeat center right!important}#side ul.lists-links li a em{background:url(https://s3.amazonaws.com/twitter_production/a/1258070043/images/arrow_right_dark.png) no-repeat left top}#side span.pipe{border-left:1px solid #C36}#list_subscriptions span.view-all,#list_memberships span.view-all,#profile span.view-all,#profile_favorites span.view-all,#following span.view-all,#followers span.view-all{border-left:0}a.edit-list{border-right:1px solid #C36!important}body#show #content .meta a.screen-name,#content .shared-content .screen-name,a,#content tr.hentry:hover a,body#profile #content div.hentry:hover a,#side .stats a:hover span.stats_count,#side div.user_icon a:hover,li.verified-profile a:hover,#side .promotion .definition strong,p.list-numbers a:hover,#side div.user_icon a:hover span,#content .tabMenu li a,.translator-profile a:hover,#side_name{color:#B40B43}nav:hover{box-shadow:0 0 10px #B40B43;-webkit-box-shadow:0 0 10px #B40B43}
\ No newline at end of file
diff --git a/themes/5.css b/themes/5.css
index a5251b6..dc2fa14 100644
--- a/themes/5.css
+++ b/themes/5.css
@@ -1,2 +1,2 @@
-/*by @lgsoltek*/
+/*by @lgsoltek*/
 body{background:#F7AD71}body,ul#tabMenu li a,#side .section h1,#side .stat a,#side .stats a span.stats_count,#side div.section-header h1,#side div.user_icon a,#side div.user_icon a:hover,#side div.section-header h3.faq-header,ul.sidebar-menu a.active,li.verified-profile a,#side .promotion a,body #content .list-header h2,p.list-numbers a,.bar h3 label,body.timeline #content h1,.list-header h2 a span,#content .tabMenu li.active a,body#direct_messages #content .tabMenu #inbox_tab a,body#inbox #content .tabMenu #inbox_tab a,body#sent #content .tabMenu #sent_tab a,body#direct_messages #content .tabMenu #inbox_tab a,body#retweets_by_others #content .tabMenu #retweets_by_others_tab a,body#retweets #content .tabMenu #retweets_tab a,body#retweeted_by_others #content .tabMenu #retweeted_by_others_tab a,body#retweeted_of_mine #content .tabMenu #retweeted_of_mine_tab a,.translator-profile a,#owners_lists h2 a{color:#873800}#side_base{border-left:1px solid #D4A72A;background-color:#D4A386}ul.sidebar-menu a.active,ul.sidebar-menu li a:hover,#side div#custom_search.active,#side .promotion,.notify div{background-color:#E8B79A}.list-header,.list-controls,ul.sidebar-list li.active a,ul.sidebar-list li a:hover{background-color:#D4A386!important}#side .actions,#side .promo{border:1px solid #D4A72A}#side div.section-header h3{border-bottom:1px solid #D4A72A}#side hr{background:#D4A72A;color:#D4A72A}ul.sidebar-menu li.loading a{background:#E8B79A url(https://s3.amazonaws.com/twitter_production/a/1258070043/images/spinner.gif) no-repeat 171px .5em!important}#side .collapsible h2.sidebar-title{background:transparent url(https://s3.amazonaws.com/twitter_production/a/1258070043/images/toggle_up_dark.png) no-repeat center right!important}#side .collapsible.collapsed h2.sidebar-title{background:transparent url(https://s3.amazonaws.com/twitter_production/a/1258070043/images/toggle_down_dark.png) no-repeat center right!important}#side ul.lists-links li a em{background:url(https://s3.amazonaws.com/twitter_production/a/1258070043/images/arrow_right_dark.png) no-repeat left top}#side span.pipe{border-left:1px solid #D4A72A}#list_subscriptions span.view-all,#list_memberships span.view-all,#profile span.view-all,#profile_favorites span.view-all,#following span.view-all,#followers span.view-all{border-left:0}a.edit-list{border-right:1px solid #D4A72A!important}body#show #content .meta a.screen-name,#content .shared-content .screen-name,a,#content tr.hentry:hover a,body#profile #content div.hentry:hover a,#side .stats a:hover span.stats_count,#side div.user_icon a:hover,li.verified-profile a:hover,#side .promotion .definition strong,p.list-numbers a:hover,#side div.user_icon a:hover span,#content .tabMenu li a,.translator-profile a:hover,#side_name{color:#D94100}nav:hover{box-shadow:0 0 10px #D94100;-webkit-box-shadow:0 0 10px #D94100}
\ No newline at end of file
diff --git a/themes/6.css b/themes/6.css
index dd002b6..1270891 100644
--- a/themes/6.css
+++ b/themes/6.css
@@ -1,2 +1,2 @@
-/*by @lgsoltek*/
+/*by @lgsoltek*/
 body{background:#292945;background-position:0 0;padding-top:0!important;_padding-top:10px!important}body,ul#tabMenu li a,#side .section h1,#side .stat a,#side .stats a span.stats_count,#side div.section-header h1,#side div.user_icon a,#side div.user_icon a:hover,#side div.section-header h3.faq-header,ul.sidebar-menu a.active,li.verified-profile a,#side .promotion a,body #content .list-header h2,p.list-numbers a,.bar h3 label,body.timeline #content h1,.list-header h2 a span,#content .tabMenu li.active a,body#direct_messages #content .tabMenu #inbox_tab a,body#inbox #content .tabMenu #inbox_tab a,body#sent #content .tabMenu #sent_tab a,body#direct_messages #content .tabMenu #inbox_tab a,body#retweets_by_others #content .tabMenu #retweets_by_others_tab a,body#retweets #content .tabMenu #retweets_tab a,body#retweeted_by_others #content .tabMenu #retweeted_by_others_tab a,body#retweeted_of_mine #content .tabMenu #retweeted_of_mine_tab a,.translator-profile a,#owners_lists h2 a{color:#6F7194}#side_base{border-left:1px solid #F9E6FC;background-color:#0E0F21}ul.sidebar-menu a.active,ul.sidebar-menu li a:hover,#side div#custom_search.active,#side .promotion,.notify div{background-color:#262739}.list-header,.list-controls,ul.sidebar-list li.active a,ul.sidebar-list li a:hover,.list-header-inner{background-color:#0E0F21!important}#side .actions,#side .promo{border:1px solid #F9E6FC}#side div.section-header h3{border-bottom:1px solid #F9E6FC}#side p.sidebar-location{border-bottom:1px dotted #F9E6FC}#side hr{background:#F9E6FC;color:#F9E6FC}ul.sidebar-menu li.loading a{background:#262739 url(https://s3.amazonaws.com/twitter_production/a/1260817727/images/spinner.gif) no-repeat 171px .5em!important}#side .collapsible h2.sidebar-title{background:transparent url(https://s3.amazonaws.com/twitter_production/a/1260817727/images/toggle_up_light.png) no-repeat center right!important}#side .collapsible.collapsed h2.sidebar-title{background:transparent url(https://s3.amazonaws.com/twitter_production/a/1260817727/images/toggle_down_light.png) no-repeat center right!important}#side ul.lists-links li a em{background:url(https://s3.amazonaws.com/twitter_production/a/1260817727/images/arrow_right_light.png) no-repeat left top}#side span.pipe{border-left:1px solid #F9E6FC}#list_subscriptions span.view-all,#list_memberships span.view-all,#profile span.view-all,#profile_favorites span.view-all,#following span.view-all,#followers span.view-all{border-left:0}a.edit-list{border-right:1px solid #F9E6FC!important}body#show #content .meta a.screen-name,#content .shared-content .screen-name,#content .meta .byline a,a,#content tr.hentry:hover a,body#profile #content div.hentry:hover a,#side .stats a:hover span.stats_count,#side div.user_icon a:hover,li.verified-profile a:hover,#side .promotion .definition strong,p.list-numbers a:hover,#side div.user_icon a:hover span,#content .tabMenu li a,.translator-profile a:hover,#local_trend_locations li a,.modal-content .list-slug,#side_name{color:#6B5B78}nav:hover{box-shadow:0 0 10px #6B5B78;-webkit-box-shadow:0 0 10px #6B5B78}
\ No newline at end of file
diff --git a/themes/7.css b/themes/7.css
index 0741332..95b2556 100644
--- a/themes/7.css
+++ b/themes/7.css
@@ -1,2 +1,2 @@
-/*theme 13 from twitter.com*/
+/*theme 13 from twitter.com*/
 body{background:#B2DFDA url(http://s3.amazonaws.com/twitter_production/images/themes/theme13/bg.gif) fixed no-repeat;background-position:0 0;padding-top:0!important;_padding-top:10px!important}body,ul#tabMenu li a,#side .section h1,#side .stat a,#side .stats a span.stats_count,#side div.section-header h1,#side div.user_icon a,#side div.user_icon a:hover,#side div.section-header h3.faq-header,ul.sidebar-menu a.active,li.verified-profile a,#side .promotion a,body #content .list-header h2,p.list-numbers a,.bar h3 label,body.timeline #content h1,.list-header h2 a span,#content .tabMenu li.active a,body#direct_messages #content .tabMenu #inbox_tab a,body#inbox #content .tabMenu #inbox_tab a,body#sent #content .tabMenu #sent_tab a,body#direct_messages #content .tabMenu #inbox_tab a,body#retweets_by_others #content .tabMenu #retweets_by_others_tab a,body#retweets #content .tabMenu #retweets_tab a,body#retweeted_by_others #content .tabMenu #retweeted_by_others_tab a,body#retweeted_of_mine #content .tabMenu #retweeted_of_mine_tab a,.translator-profile a,#owners_lists h2 a{color:#333}.unconfirmed-email-banner{border-bottom:solid 1px #eee}#side_base{border-left:1px solid #eee;background-color:#fff}ul.sidebar-menu a.active,ul.sidebar-menu li a:hover,#side div#custom_search.active,#side .promotion,.notify div{background-color:transparent}.list-header,.list-controls,ul.sidebar-list li.active a,ul.sidebar-list li a:hover,.list-header-inner{background-color:#fff!important}#side .actions,#side .promo{border:1px solid #eee}#side div.section-header h3{border-bottom:1px solid #eee}#side p.sidebar-location{border-bottom:1px dotted #eee}#side hr{background:#eee;color:#eee}ul.sidebar-menu li.loading a{background:transparent url(https://s3.amazonaws.com/twitter_production/a/1265242857/images/spinner.gif) no-repeat 171px .5em!important}#side .collapsible h2.sidebar-title{background:transparent url(https://s3.amazonaws.com/twitter_production/a/1265242857/images/toggle_up_dark.png) no-repeat center right!important}#side .collapsible.collapsed h2.sidebar-title{background:transparent url(https://s3.amazonaws.com/twitter_production/a/1265242857/images/toggle_down_dark.png) no-repeat center right!important}#side ul.lists-links li a em{background:url(https://s3.amazonaws.com/twitter_production/a/1265242857/images/arrow_right_dark.png) no-repeat left top}#side span.pipe{border-left:1px solid #eee}#list_subscriptions span.view-all,#list_memberships span.view-all,#profile span.view-all,#profile_favorites span.view-all,#following span.view-all,#followers span.view-all{border-left:0}a.edit-list{border-right:1px solid #eee!important}body#show #content .meta a.screen-name,#content .shared-content .screen-name,#content .meta .byline a,a,#content tr.hentry:hover a,body#profile #content div.hentry:hover a,#side .stats a:hover span.stats_count,#side div.user_icon a:hover,li.verified-profile a:hover,#side .promotion .definition strong,p.list-numbers a:hover,#side div.user_icon a:hover span,#content .tabMenu li a,.translator-profile a:hover,#local_trend_locations li a,.modal-content .list-slug,#side_name{color:#93A644}nav:hover{box-shadow:0 0 10px #93A644;-webkit-box-shadow:0 0 10px #93A644}
\ No newline at end of file
diff --git a/themes/8.css b/themes/8.css
index a256f31..d3e43d0 100644
--- a/themes/8.css
+++ b/themes/8.css
@@ -1,2 +1,2 @@
-/*theme 15 from twitter.com*/
+/*theme 15 from twitter.com*/
 body{background:#022330 url(http://s3.amazonaws.com/twitter_production/images/themes/theme15/bg.png) fixed no-repeat;background-position:0 0;padding-top:0!important;_padding-top:10px!important}body,ul#tabMenu li a,#side .section h1,#side .stat a,#side .stats a span.stats_count,#side div.section-header h1,#side div.user_icon a,#side div.user_icon a:hover,#side div.section-header h3.faq-header,ul.sidebar-menu a.active,li.verified-profile a,#side .promotion a,body #content .list-header h2,p.list-numbers a,.bar h3 label,body.timeline #content h1,.list-header h2 a span,#content .tabMenu li.active a,body#direct_messages #content .tabMenu #inbox_tab a,body#inbox #content .tabMenu #inbox_tab a,body#sent #content .tabMenu #sent_tab a,body#direct_messages #content .tabMenu #inbox_tab a,body#retweets_by_others #content .tabMenu #retweets_by_others_tab a,body#retweets #content .tabMenu #retweets_tab a,body#retweeted_by_others #content .tabMenu #retweeted_by_others_tab a,body#retweeted_of_mine #content .tabMenu #retweeted_of_mine_tab a,.translator-profile a,#owners_lists h2 a{color:#333}.unconfirmed-email-banner{border-bottom:solid 1px #a8c7f7}#side_base{border-left:1px solid #a8c7f7;background-color:#C0DFEC}ul.sidebar-menu a.active,ul.sidebar-menu li a:hover,#side div#custom_search.active,#side .promotion,.notify div{background-color:transparent}.list-header,.list-controls,ul.sidebar-list li.active a,ul.sidebar-list li a:hover,.list-header-inner{background-color:#C0DFEC!important}#side .actions,#side .promo{border:1px solid #a8c7f7}#side div.section-header h3{border-bottom:1px solid #a8c7f7}#side p.sidebar-location{border-bottom:1px dotted #a8c7f7}#side hr{background:#a8c7f7;color:#a8c7f7}ul.sidebar-menu li.loading a{background:transparent url(https://s3.amazonaws.com/twitter_production/a/1265242857/images/spinner.gif) no-repeat 171px .5em!important}#side .collapsible h2.sidebar-title{background:transparent url(https://s3.amazonaws.com/twitter_production/a/1265242857/images/toggle_up_dark.png) no-repeat center right!important}#side .collapsible.collapsed h2.sidebar-title{background:transparent url(https://s3.amazonaws.com/twitter_production/a/1265242857/images/toggle_down_dark.png) no-repeat center right!important}#side ul.lists-links li a em{background:url(https://s3.amazonaws.com/twitter_production/a/1265242857/images/arrow_right_dark.png) no-repeat left top}#side span.pipe{border-left:1px solid #a8c7f7}#list_subscriptions span.view-all,#list_memberships span.view-all,#profile span.view-all,#profile_favorites span.view-all,#following span.view-all,#followers span.view-all{border-left:0}a.edit-list{border-right:1px solid #a8c7f7!important}body#show #content .meta a.screen-name,#content .shared-content .screen-name,#content .meta .byline a,a,#content tr.hentry:hover a,body#profile #content div.hentry:hover a,#side .stats a:hover span.stats_count,#side div.user_icon a:hover,li.verified-profile a:hover,#side .promotion .definition strong,p.list-numbers a:hover,#side div.user_icon a:hover span,#content .tabMenu li a,.translator-profile a:hover,#local_trend_locations li a,.modal-content .list-slug,#side_name{color:#0084B4}nav:hover{box-shadow:0 0 10px #0084B4;-webkit-box-shadow:0 0 10px #0084B4}
\ No newline at end of file
diff --git a/themes/9.css b/themes/9.css
index 46944ff..8e1f5a6 100644
--- a/themes/9.css
+++ b/themes/9.css
@@ -1,2 +1,2 @@
-/*theme 18 from twitter.com*/
+/*theme 18 from twitter.com*/
 body{background:#ACDED6 url(http://s3.amazonaws.com/twitter_production/images/themes/theme18/bg.gif) fixed no-repeat;background-position:0 0;padding-top:0!important;_padding-top:10px!important}body,ul#tabMenu li a,#side .section h1,#side .stat a,#side .stats a span.stats_count,#side div.section-header h1,#side div.user_icon a,#side div.user_icon a:hover,#side div.section-header h3.faq-header,ul.sidebar-menu a.active,li.verified-profile a,#side .promotion a,body #content .list-header h2,p.list-numbers a,.bar h3 label,body.timeline #content h1,.list-header h2 a span,#content .tabMenu li.active a,body#direct_messages #content .tabMenu #inbox_tab a,body#inbox #content .tabMenu #inbox_tab a,body#sent #content .tabMenu #sent_tab a,body#direct_messages #content .tabMenu #inbox_tab a,body#retweets_by_others #content .tabMenu #retweets_by_others_tab a,body#retweets #content .tabMenu #retweets_tab a,body#retweeted_by_others #content .tabMenu #retweeted_by_others_tab a,body#retweeted_of_mine #content .tabMenu #retweeted_of_mine_tab a,.translator-profile a,#owners_lists h2 a{color:#333}.unconfirmed-email-banner{border-bottom:solid 1px #EEE}#side_base{border-left:1px solid #EEE;background-color:#F6F6F6}ul.sidebar-menu a.active,ul.sidebar-menu li a:hover,#side div#custom_search.active,#side .promotion,.notify div{background-color:transparent}.list-header,.list-controls,ul.sidebar-list li.active a,ul.sidebar-list li a:hover,.list-header-inner{background-color:#F6F6F6!important}#side .actions,#side .promo{border:1px solid #EEE}#side div.section-header h3{border-bottom:1px solid #EEE}#side p.sidebar-location{border-bottom:1px dotted #EEE}#side hr{background:#EEE;color:#EEE}ul.sidebar-menu li.loading a{background:transparent url(https://s3.amazonaws.com/twitter_production/a/1265242857/images/spinner.gif) no-repeat 171px .5em!important}#side .collapsible h2.sidebar-title{background:transparent url(https://s3.amazonaws.com/twitter_production/a/1265242857/images/toggle_up_dark.png) no-repeat center right!important}#side .collapsible.collapsed h2.sidebar-title{background:transparent url(https://s3.amazonaws.com/twitter_production/a/1265242857/images/toggle_down_dark.png) no-repeat center right!important}#side ul.lists-links li a em{background:url(https://s3.amazonaws.com/twitter_production/a/1265242857/images/arrow_right_dark.png) no-repeat left top}#side span.pipe{border-left:1px solid #EEE}#list_subscriptions span.view-all,#list_memberships span.view-all,#profile span.view-all,#profile_favorites span.view-all,#following span.view-all,#followers span.view-all{border-left:0}a.edit-list{border-right:1px solid #EEE!important}body#show #content .meta a.screen-name,#content .shared-content .screen-name,#content .meta .byline a,a,#content tr.hentry:hover a,body#profile #content div.hentry:hover a,#side .stats a:hover span.stats_count,#side div.user_icon a:hover,li.verified-profile a:hover,#side .promotion .definition strong,p.list-numbers a:hover,#side div.user_icon a:hover span,#content .tabMenu li a,.translator-profile a:hover,#local_trend_locations li a,.modal-content .list-slug,#side_name{color:#038543}nav:hover{box-shadow:0 0 10px #038543;-webkit-box-shadow:0 0 10px #038543}
\ No newline at end of file
diff --git a/themes/minimal.css b/themes/minimal.css
index 7834a04..19e4b53 100644
--- a/themes/minimal.css
+++ b/themes/minimal.css
@@ -1,2 +1,2 @@
-/*Minimal Theme Inspired by @Ratoo*/
+/*Minimal Theme Inspired by @Ratoo*/
 body{background:#FFF}a,#content tr.hentry:hover a,body#profile #content div.hentry:hover a,#side .stats a:hover span.stats_count,#side div.user_icon a:hover,li.verified-profile a:hover,#side .promotion .definition strong,p.list-numbers a:hover,#side div.user_icon a:hover span,#content .tabMenu li a,.translator-profile a:hover,#side_name{color:#000;}body,ul#tabMenu li a,#side .section h1,#side .stat a,#side .stats a span.stats_count,#side div.section-header h1,#side div.user_icon a,#side div.user_icon a:hover,#side div.section-header h3.faq-header,ul.sidebar-menu a.active,li.verified-profile a,#side .promotion a,body #content .list-header h2,p.list-numbers a,.bar h3 label,body.timeline #content h1,.list-header h2 a span,#content .tabMenu li.active a,body#direct_messages #content .tabMenu #inbox_tab a,body#inbox #content .tabMenu #inbox_tab a,body#sent #content .tabMenu #sent_tab a,body#direct_messages #content .tabMenu #inbox_tab a,body#retweets_by_others #content .tabMenu #retweets_by_others_tab a,body#retweets #content .tabMenu #retweets_tab a,body#retweeted_by_others #content .tabMenu #retweeted_by_others_tab a,body#retweeted_of_mine #content .tabMenu #retweeted_of_mine_tab a,.translator-profile a,#owners_lists h2 a{color:#606060;}#side_base{border-left:1px solid gray;background-color:#FFF;}ul.sidebar-menu a.active,ul.sidebar-menu li a:hover,#side div#custom_search.active,#side .promotion,.notify div{background-color:#F7F7F7;}.list-header,.list-controls,ul.sidebar-list li.active a,ul.sidebar-list li a:hover{background-color:#FFF!important;}#side .actions,#side .promo{border:1px solid gray;}#side div.section-header h3{border-bottom:1px solid gray;}#side hr{background:gray;color:gray;}nav:hover{box-shadow:0 0 1px gray;-webkit-box-shadow:0 0 1px gray}
\ No newline at end of file
diff --git a/user.php b/user.php
index 3e9b6cb..3c43ea3 100644
--- a/user.php
+++ b/user.php
@@ -14,23 +14,25 @@
 		header('location: error.php');exit();
 	}
 
-	$p = 1;
-	if (isset($_GET['p'])) {
-		$p = (int) $_GET['p'];
-		if ($p <= 0) $p = 1;
-	}
-
 	$t = getTwitter();
 	$userid = $_GET['id'];
+	$since_id = isset($_GET['since_id']) ? $_GET['since_id'] : false;
+	$max_id = isset($_GET['max_id']) ? $_GET['max_id'] : false;
 	if (isset($_GET['fav'])) {
-		$statuses = $t->getFavorites($p, $userid);
+		$statuses = $t->getFavorites($userid, $since_id, $max_id);
 	} else {
-		$statuses = $t->userTimeline($p, $userid);
+		$statuses = $t->userTimeline($userid, $since_id, $max_id);
 	}
 	
 	if ($statuses === false) {
 		header('location: error.php');exit;
 	}
+	if ($t->http_code == 429) {
+		$apiout = true;
+	} else {
+		$aptout = false;
+	}
+
 	$user = $t->showUser($userid);
 	if (strcasecmp($userid,$t->username) == 0) {header('location: profile.php');exit();}
 
@@ -48,7 +50,7 @@
 		$userinfo['friends_count'] = $user->friends_count;
 		$userinfo['statuses_count'] = $user->statuses_count;
 		$userinfo['followers_count'] = $user->followers_count;
-		$userinfo['url'] = $user->url;
+		$userinfo['url'] = $user->entities->url->urls[0]->expanded_url ? $user->entities->url->urls[0]->expanded_url : $user->url;
 		$userinfo['description'] = formatText($user->description);
 		$userinfo['location'] = $user->location;
 		$userinfo['date_joined'] = date('Y-m-d', format_time($user->created_at)); //from dabr
@@ -89,22 +91,31 @@
 		$empty = count($statuses) == 0? true: false;
 		if ($empty) {
 			echo "<div id=\"empty\">No tweet to display.</div>";
+		} else if ($apiout) {
+			echo "<div id=\"empty\">API quota is used out, please wait for a moment before next refresh.</div>";
 		} else {
 			$output = '<ol class="timeline" id="allTimeline">';
+			$firstid = false;
+			$lastid = false;
 			foreach ($statuses as $status) {
 				if (isset($status->retweeted_status)) {
 					$output .= format_retweet($status);
 				} else { 
-				$output .= format_timeline($status,$t->username);
+					$output .= format_timeline($status,$t->username);
 				}
+				if(!$firstid)
+					$firstid = $status->id_str;
+				$lastid = $status->id_str;
 			}
+			$lastid = bcsub($lastid, "1");
+
 			$output .= "</ol><div id=\"pagination\">";
 			if ($_GET['fav'] == true) {
-				if ($p >1) $output .= "<a id=\"more\" class=\"round more\" style=\"float: left;\" href=\"user.php?id=$userid&fav=true&p=" . ($p-1) . "\">Back</a>";
-				if (!$empty) $output .= "<a id=\"more\" class=\"round more\" style=\"float: right;\" href=\"user.php?id=$userid&fav=true&p=" . ($p+1) . "\">Next</a>";
+				$output .= "<a id=\"less\" class=\"round more\" style=\"float: left;\" href=\"user.php?id=$userid&fav=true&since_id={$firstid}\">Back</a>";
+				$output .= "<a id=\"more\" class=\"round more\" style=\"float: right;\" href=\"user.php?id=$userid&fav=true&max_id={$lastid}\">Next</a>";
 			} else {
-				if ($p >1) $output .= "<a id=\"more\" class=\"round more\" style=\"float: left;\" href=\"user.php?id=$userid&p=" . ($p-1) . "\">Back</a>";
-				if (!$empty) $output .= "<a id=\"more\" class=\"round more\" style=\"float: right;\" href=\"user.php?id=$userid&p=" . ($p+1) . "\">Next</a>";
+				$output .= "<a id=\"less\" class=\"round more\" style=\"float: left;\" href=\"user.php?id=$userid&since_id={$firstid}\">Back</a>";
+				$output .= "<a id=\"more\" class=\"round more\" style=\"float: right;\" href=\"user.php?id=$userid&max_id={$lastid}\">Next</a>";
 			}
 			$output .= "</div>";
 			echo $output;