diff --git a/Appcast.xml b/Appcast.xml
index 3f04294..6eab790 100755
--- a/Appcast.xml
+++ b/Appcast.xml
@@ -7,16 +7,14 @@
       <language>en</language>
       <item>
         <title>Version 2.1.0 (Added Mentions)</title>
-				<sparkle:minimumSystemVersion>10.5.0</sparkle:minimumSystemVersion>
-				<sparkle:releaseNotesLink>
-					http://jeenaparadies.net/twittia/ReleaseNotes.html
-				</sparkle:releaseNotesLink>
-	      <pubDate>Sun, 25 Apr 2010 16:30:00 +0000</pubDate>
-	      <enclosure	url="http://jeenaparadies.net/twittia/Twittia.app.zip"
-						sparkle:version="2.1.0"
-						length="488877"
-						type="application/octet-stream"
-						sparkle:dsaSignature="MCwCFHrvMjy3m0F/ST/R9Y1RFD5q3bfzAhQiSDKToDkWtmJZILgQUNM0yXBSig==" />
+		<sparkle:minimumSystemVersion>10.5.0</sparkle:minimumSystemVersion>
+		<sparkle:releaseNotesLink>http://jeenaparadies.net/twittia/ReleaseNotes.html</sparkle:releaseNotesLink>
+		<pubDate>Sun, 25 Apr 2010 18:00:00 +0000</pubDate>
+		<enclosure	url="http://jeenaparadies.net/twittia/Twittia.app.zip"
+					sparkle:version="2.1.0"
+					length="490811"
+					type="application/octet-stream"
+					sparkle:dsaSignature="MC0CFBhmqxktwcqIqFM2F/blXAIfBmHhAhUAq19o2TB8v7f7nU9i+KFC3VrsWc0=" />
       </item>
    </channel>
 </rss>
\ No newline at end of file
diff --git a/Controller.h b/Controller.h
index f0f25dc..f050b5b 100644
--- a/Controller.h
+++ b/Controller.h
@@ -11,6 +11,7 @@
 #import "ViewDelegate.h"
 #import <Carbon/Carbon.h>
 
+
 @interface Controller : NSObject {
 	IBOutlet WebView *timelineView;
 	IBOutlet WebView *mentionsView;
@@ -24,6 +25,7 @@
 - (void)initWebViews;
 - (void)openNewTweetWindowInReplyTo:(NSString *)userName statusId:(NSString *)statusId;
 - (NSString *)pluginURL;
+- (void)handleGetURLEvent:(NSAppleEventDescriptor *)event withReplyEvent:(NSAppleEventDescriptor *)replyEvent;
 
 OSStatus handler(EventHandlerCallRef nextHandler, EventRef theEvent, void* userData);
 
diff --git a/Controller.m b/Controller.m
index 431ff08..d8ee728 100644
--- a/Controller.m
+++ b/Controller.m
@@ -16,7 +16,6 @@
 
 - (void)awakeFromNib {
 	[self initWebViews];
-
 	
 	/* CARBON from http://github.com/Xjs/drama-button/blob/carbon/Drama_ButtonAppDelegate.m */
 	
@@ -46,7 +45,10 @@
 			 object:nil];
 	
 	NSAppleEventManager *appleEventManager = [NSAppleEventManager sharedAppleEventManager];
-	[appleEventManager setEventHandler:self andSelector:@selector(handleGetURLEvent:withReplyEvent:) forEventClass:kInternetEventClass andEventID:kAEGetURL];
+	[appleEventManager setEventHandler:self
+						   andSelector:@selector(handleGetURLEvent:withReplyEvent:)
+						 forEventClass:kInternetEventClass
+							andEventID:kAEGetURL];
 }
 
 - (void)initWebViews {
@@ -90,17 +92,16 @@
 	[newTweet inReplyTo:userName statusId:statusId];
 }
 
-
 - (void)openNewTweetWindowWithString:(NSString *)aString {
+	NSLog(@"testing");
 	[NSApp activateIgnoringOtherApps:YES]; 
 	MyDocument *newTweet = (MyDocument *)[[NSDocumentController sharedDocumentController] openUntitledDocumentAndDisplay:YES error:nil];
 	[newTweet withString:aString];
 }
 
-- (void)handleGetURLEvent:(NSAppleEventDescriptor *)event withReplyEvent:(NSAppleEventDescriptor *)replyEvent
-{
-	NSString *text = [[event paramDescriptorForKeyword:keyDirectObject] stringValue];
-	[self openNewTweetWindowWithString:[text substringFromIndex:8]];
+- (void)handleGetURLEvent:(NSAppleEventDescriptor *)event withReplyEvent:(NSAppleEventDescriptor *)replyEvent {
+	NSString *text = [[[event paramDescriptorForKeyword:keyDirectObject] stringValue] substringFromIndex:8];
+	[self openNewTweetWindowWithString:[text stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]];
 }
 
 - (IBAction)sendTweet:(id)sender {
diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib
index baa9c48..343e6e2 100644
--- a/English.lproj/MainMenu.xib
+++ b/English.lproj/MainMenu.xib
@@ -22,8 +22,8 @@
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
 			<integer value="559"/>
-			<integer value="81"/>
 			<integer value="536"/>
+			<integer value="81"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1291,6 +1291,14 @@
 					</object>
 					<int key="connectionID">563</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="1021"/>
+						<reference key="destination" ref="408500656"/>
+					</object>
+					<int key="connectionID">564</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -2310,7 +2318,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">563</int>
+			<int key="maxID">564</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -2325,14 +2333,12 @@
 							<string>mentionsView</string>
 							<string>timelineView</string>
 							<string>viewDelegate</string>
-							<string>viewDelegate2</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>WebView</string>
 							<string>WebView</string>
-							<string>id</string>
-							<string>id</string>
+							<string>ViewDelegate</string>
 						</object>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -2340,6 +2346,14 @@
 						<string key="minorKey">Controller.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">ViewDelegate</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">ViewDelegate.h</string>
+					</object>
+				</object>
 			</object>
 			<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.1+">
 				<bool key="EncodedWithXMLCoder">YES</bool>
diff --git a/ReleaseNotes.html b/ReleaseNotes.html
index 786bfee..84ecc70 100644
--- a/ReleaseNotes.html
+++ b/ReleaseNotes.html
@@ -7,25 +7,30 @@
 		body { font-family: "Lucida Grande", sans-serif; font-size: 0.75em; }
 		h1 { font-size: 1.2em; }
 		h2 { font-size: 1em; margin-top: 2em; }
+		hr { margin: 3em 0; }
 	</style>
 </head>
 <body>
 
-<h1>Twittia Release Notes</h1>
-
-<h2>Twittia 2.1.0</h2>
+<h1>Twittia 2.1.0</h1>
 <p>Fixed some wrong links.</p>
 <p>Fixed problem with closed timeline window.</p>
 <p>Implemented a mentions view.</p>
 
-<h2>Twittia 2.0.2</h2>
+<hr />
+
+<h1>Twittia 2.0.2</h1>
 <p>Added the <code>twittia:</code> URL scheme.</p>
 <p>Added a JavaScript-plugin API.</p>
 
-<h2>Twittia 2.0.1</h2>
+<hr />
+
+<h1>Twittia 2.0.1</h1>
 <p>Added Sparcle so the updates will be less efford for the user.</p>
 
-<h2>Twittia 2.0</h2>
+<hr />
+
+<h1>Twittia 2.0</h1>
 <p>This is a complete rewrite, I cut 80% of the functionality and
 	now it only has functionality which I care for.</p>
 <p>This is also the first version I try to distribute Sparcle, so
diff --git a/Twittia 2.xcodeproj/project.pbxproj b/Twittia 2.xcodeproj/project.pbxproj
index f4015b3..ebd4f10 100644
--- a/Twittia 2.xcodeproj/project.pbxproj	
+++ b/Twittia 2.xcodeproj/project.pbxproj	
@@ -10,9 +10,6 @@
 		1DDD582C0DA1D0D100B32029 /* MyDocument.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1DDD58280DA1D0D100B32029 /* MyDocument.xib */; };
 		1DDD582D0DA1D0D100B32029 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1DDD582A0DA1D0D100B32029 /* MainMenu.xib */; };
 		1F1990C6117BCA960049BEA7 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1F1990C5117BCA960049BEA7 /* ApplicationServices.framework */; };
-		1F4673E31180F519006CC37C /* jQuery.js in Sources */ = {isa = PBXBuildFile; fileRef = 1F4673E21180F519006CC37C /* jQuery.js */; };
-		1F4673E51180F590006CC37C /* jQuery-Plugins.js in Sources */ = {isa = PBXBuildFile; fileRef = 1F4673E41180F590006CC37C /* jQuery-Plugins.js */; };
-		1F4673E71180F654006CC37C /* TwittiaCore.js in Sources */ = {isa = PBXBuildFile; fileRef = 1F4673E61180F654006CC37C /* TwittiaCore.js */; };
 		1F4673FE1180F7EA006CC37C /* TwittiaCore.js in Resources */ = {isa = PBXBuildFile; fileRef = 1F4673E61180F654006CC37C /* TwittiaCore.js */; };
 		1F4674081180F7EE006CC37C /* jQuery.js in Resources */ = {isa = PBXBuildFile; fileRef = 1F4673E21180F519006CC37C /* jQuery.js */; };
 		1F4674091180F7F3006CC37C /* jQuery-Plugins.js in Resources */ = {isa = PBXBuildFile; fileRef = 1F4673E41180F590006CC37C /* jQuery-Plugins.js */; };
@@ -249,16 +246,16 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				1F4674091180F7F3006CC37C /* jQuery-Plugins.js in Resources */,
-				1F4674081180F7EE006CC37C /* jQuery.js in Resources */,
 				1F4673FE1180F7EA006CC37C /* TwittiaCore.js in Resources */,
 				8D15AC2C0486D014006FF6A4 /* Credits.rtf in Resources */,
 				8D15AC2F0486D014006FF6A4 /* InfoPlist.strings in Resources */,
 				1DDD582C0DA1D0D100B32029 /* MyDocument.xib in Resources */,
 				1DDD582D0DA1D0D100B32029 /* MainMenu.xib in Resources */,
 				1FFA36CD1177D861006C8562 /* even-bg.png in Resources */,
+				1F4674091180F7F3006CC37C /* jQuery-Plugins.js in Resources */,
 				1FFA36CE1177D861006C8562 /* index.html in Resources */,
 				1FFA36CF1177D861006C8562 /* odd-bg.png in Resources */,
+				1F4674081180F7EE006CC37C /* jQuery.js in Resources */,
 				1FFA36D01177D861006C8562 /* default.css in Resources */,
 				1F705EA6117889FA00C85707 /* sprite-icons.png in Resources */,
 			);
@@ -275,9 +272,6 @@
 				8D15AC320486D014006FF6A4 /* main.m in Sources */,
 				1FFA36D71177D879006C8562 /* Controller.m in Sources */,
 				1FFA36D81177D879006C8562 /* ViewDelegate.m in Sources */,
-				1F4673E31180F519006CC37C /* jQuery.js in Sources */,
-				1F4673E51180F590006CC37C /* jQuery-Plugins.js in Sources */,
-				1F4673E71180F654006CC37C /* TwittiaCore.js in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/Twittia_2-Info.plist b/Twittia_2-Info.plist
index 4737052..81d3b06 100644
--- a/Twittia_2-Info.plist
+++ b/Twittia_2-Info.plist
@@ -60,6 +60,8 @@
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
+			<key>CFBundleURLName</key>
+			<string>net.jeena.apps.twittia.handler</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
 				<string>twittia</string>