diff --git a/SparkleLib/SparkleLib.csproj b/SparkleLib/SparkleLib.csproj
index 9e286ba7..9acc8b73 100644
--- a/SparkleLib/SparkleLib.csproj
+++ b/SparkleLib/SparkleLib.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -9,7 +9,6 @@
     <OutputType>Library</OutputType>
     <RootNamespace>SparkleLib</RootNamespace>
     <AssemblyName>SparkleLib</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -81,7 +80,7 @@
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <MonoDevelop>
-      <Properties>
+      <Properties InternalTargetFrameworkVersion="3.5">
         <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am">
           <BuildFilesVar Sync="true" Name="SOURCES" />
           <DeployFilesVar />
diff --git a/SparkleShare.sln b/SparkleShare.sln
index d8c0081e..07519e92 100644
--- a/SparkleShare.sln
+++ b/SparkleShare.sln
@@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleShare", "SparkleShare\SparkleShare.csproj", "{728483AA-E34B-4441-BF2C-C8BC2901E4E0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NotifySharp", "NotifySharp\NotifySharp.csproj", "{005CCA8E-DFBF-464A-B6DA-452C62D4589C}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleLib", "SparkleLib\SparkleLib.csproj", "{2C914413-B31C-4362-93C7-1AE34F09112A}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GitSharp", "GitSharp", "{E3C59A13-2E21-4547-856C-BFD295C9E156}"
@@ -19,10 +17,6 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{005CCA8E-DFBF-464A-B6DA-452C62D4589C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{005CCA8E-DFBF-464A-B6DA-452C62D4589C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{005CCA8E-DFBF-464A-B6DA-452C62D4589C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{005CCA8E-DFBF-464A-B6DA-452C62D4589C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2C914413-B31C-4362-93C7-1AE34F09112A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2C914413-B31C-4362-93C7-1AE34F09112A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2C914413-B31C-4362-93C7-1AE34F09112A}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/SparkleShare/SparkleShare.cs b/SparkleShare/SparkleShare.cs
index bd4b34e3..f8ae303a 100644
--- a/SparkleShare/SparkleShare.cs
+++ b/SparkleShare/SparkleShare.cs
@@ -59,7 +59,8 @@ namespace SparkleShare {
 
 			}
 
-
+			
+			// Parse the command line options
 			bool hide_ui   = false;
 			bool show_help = false;
 
@@ -84,7 +85,8 @@ namespace SparkleShare {
 			if (show_help)
 				ShowHelp (p);
 			
-
+			
+			// Load the right controller for the OS
 			string controller_name;
 			switch (SparkleShare.Platform) {
 
@@ -95,7 +97,6 @@ namespace SparkleShare {
 
 				case PlatformID.MacOSX:
 					controller_name = "Mac";
-					
 				break;
 				
 				case PlatformID.Win32NT:
@@ -108,7 +109,9 @@ namespace SparkleShare {
 
 			}
 
-			
+			controller_name="Lin";
+			// Initialize the controller this way so that
+			// there aren't any exceptions in the OS specific UI's
 			Controller = (SparkleController) Activator.CreateInstance (
 				Type.GetType ("SparkleShare.Sparkle" + controller_name + "Controller"));
 		
diff --git a/SparkleShare/SparkleShare.csproj b/SparkleShare/SparkleShare.csproj
index 9e1fcc74..3b4d5e73 100644
--- a/SparkleShare/SparkleShare.csproj
+++ b/SparkleShare/SparkleShare.csproj
@@ -29,13 +29,10 @@
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
     <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>gtk-sharp-2.0</Package>
     </Reference>
     <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>gtk-sharp-2.0</Package>
     </Reference>
     <Reference Include="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>gtk-sharp-2.0</Package>
     </Reference>
     <Reference Include="System" />
     <Reference Include="Mono.Posix" />
@@ -49,17 +46,15 @@
     <Compile Include="SparkleUI.cs" />
     <Compile Include="SparkleWindow.cs" />
     <Compile Include="SparkleEntry.cs" />
-    <Compile Include="SparkleInvitation.cs" />
     <Compile Include="SparkleLink.cs" />
     <Compile Include="SparkleLog.cs" />
     <Compile Include="SparkleUIHelpers.cs" />
     <Compile Include="SparkleInfobar.cs" />
+    <Compile Include="SparkleController.cs" />
+    <Compile Include="SparkleDialog.cs" />
+    <Compile Include="SparkleLinController.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\NotifySharp\NotifySharp.csproj">
-      <Project>{005CCA8E-DFBF-464A-B6DA-452C62D4589C}</Project>
-      <Name>NotifySharp</Name>
-    </ProjectReference>
     <ProjectReference Include="..\SparkleLib\SparkleLib.csproj">
       <Project>{2C914413-B31C-4362-93C7-1AE34F09112A}</Project>
       <Name>SparkleLib</Name>