--- a/client/js/twitter-bin.js	Thu Aug 30 18:11:25 2012 +0200
+++ b/client/js/twitter-bin.js	Mon Sep 03 17:21:35 2012 +0200
@@ -1,6 +1,36 @@
-Rkns.Bins.Twitter = Rkns.Utils.inherit(Rkns.Bins._Base);
+Rkns.Twitter = {
+	i18n: {
+		en: {
+			search_on_twitter: "Twitter"
+		}
+	}
+}
+
+Rkns.Twitter.Search = function(_renkan, _opts) {
+	this.renkan = _renkan;
+	this.opts = _opts;
+}
+
+Rkns.Twitter.Search.prototype.getBgClass = function() {
+	return "Rk-Twitter-Icon";
+}
 
-Rkns.Bins.Twitter.prototype.tweetTemplate = Rkns._.template(
+Rkns.Twitter.Search.prototype.getSearchTitle = function() {
+	var _lang = Rkns.Twitter.i18n[this.renkan.lang] || Rkns.Twitter.i18n['en'];
+	return _lang.search_on_twitter;
+}
+
+Rkns.Twitter.Search.prototype.search = function(_q) {
+    this.renkan.tabs.push(
+        new Rkns.Twitter.Bin(this.renkan, {
+            search: _q
+        })
+    );
+}
+
+Rkns.Twitter.Bin = Rkns.Utils.inherit(Rkns._BaseBin);
+
+Rkns.Twitter.Bin.prototype.tweetTemplate = Rkns._.template(
     '<li class="Rk-Twitter-Tweet Rk-Bin-Item" data-uri="http://twitter.com/<%=tweet.from_user%>/status/<%=tweet.id_str%>" '
     + 'data-title="Tweet by @<%=tweet.from_user%>" data-description="<%-tweet.text%>">'
     + '<img class="Rk-Twitter-TwImage" src="<%=tweet.profile_image_url%>" />'
@@ -13,9 +43,11 @@
     + '<a href="http://twitter.com/intent/favorite?tweet_id=<%=tweet.id_str%>" target="_blank">favorite</a></p></li>'
 );
 
-Rkns.Bins.Twitter.prototype._init = function(_renkan, _opts) {
+Rkns.Twitter.Bin.prototype._init = function(_renkan, _opts) {
     this.search = _opts.search;
-    this.title_$.html('Twitter: "' + this.search + '"');
+    var _lang = Rkns.Twitter.i18n[this.renkan.lang] || Rkns.Twitter.i18n['en'];
+    this.title_icon_$.addClass('Rk-Twitter-Title-Icon');
+    this.title_$.html(this.search).addClass("Rk-Twitter-Title");
     var _this = this;
     Rkns.$.getJSON(
         "http://search.twitter.com/search.json?q=" + encodeURIComponent(this.search) + "&callback=?",