diff --git a/SparkleShare/SparkleDialog.cs b/SparkleShare/SparkleDialog.cs
index 22684f82..461a189b 100644
--- a/SparkleShare/SparkleDialog.cs
+++ b/SparkleShare/SparkleDialog.cs
@@ -124,11 +124,13 @@ namespace SparkleShare {
 			Process.StartInfo.WorkingDirectory =
 				SparklePaths.SparkleTmpPath;
 
-			Process.StartInfo.Arguments =
-				"clone " + SparkleHelpers.CombineMore (RepoRemoteUrl, RepoName)
-				           .Substring (2);
+			Process.StartInfo.Arguments =	"clone ";
+			Process.StartInfo.Arguments +=
+				SparkleHelpers.CombineMore (RepoRemoteUrl, RepoName).Substring (2);
 
 			Process.Start ();
+
+			// Move the folder to the SparkleShare folder when done cloning
 			Process.Exited += delegate {
 				Directory.Move (
 					SparkleHelpers.CombineMore (SparklePaths.SparkleTmpPath,
@@ -137,10 +139,6 @@ namespace SparkleShare {
 					                            RepoName)
 				);
 
-				// Enable notifications by default				
-				File.Create (
-					SparkleHelpers.CombineMore (SparklePaths.SparkleConfigPath,
-				                               "sparkleshare.notify"));
 				Destroy ();
 			};
 		
diff --git a/SparkleShare/SparkleUI.cs b/SparkleShare/SparkleUI.cs
new file mode 100644
index 00000000..1b734f73
--- /dev/null
+++ b/SparkleShare/SparkleUI.cs
@@ -0,0 +1,166 @@
+//   SparkleShare, an instant update workflow to Git.
+//   Copyright (C) 2010  Hylke Bons <hylkebons@gmail.com>
+//
+//   This program is free software: you can redistribute it and/or modify
+//   it under the terms of the GNU General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   This program is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU General Public License for more details.
+//
+//   You should have received a copy of the GNU General Public License
+//   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+using Gtk;
+using SparkleShare;
+using System;
+using System.Diagnostics;
+using System.IO;
+
+namespace SparkleShare {
+
+	public class SparkleUI {
+
+		public static SparkleStatusIcon NotificationIcon;
+
+		public SparkleUI (bool HideUI) {
+
+			Process Process = new Process();
+			Process.EnableRaisingEvents = false;
+			Process.StartInfo.RedirectStandardOutput = true;
+			Process.StartInfo.UseShellExecute = false;
+
+			string SparklePath = SparklePaths.SparklePath;
+
+			// Create 'SparkleShare' folder in the user's home folder
+			// if it's not there already
+			if (!Directory.Exists (SparklePath)) {
+				Directory.CreateDirectory (SparklePath);
+				Console.WriteLine ("[Config] Created '" + SparklePath + "'");
+
+				if (SparklePlatform.Name.Equals ("GNOME")) {
+					
+					// Add a special icon to the SparkleShare folder
+					Process.StartInfo.FileName = "gvfs-set-attribute";
+					Process.StartInfo.Arguments = SparklePath +
+						                           " metadata::custom-icon " +
+							                        "file:///usr/share/icons/hicolor/" +
+							                        "48x48/places/" +
+							                        "folder-sparkleshare.png";
+					Process.Start();
+
+					// Add the SparkleShare folder to the bookmarks
+					string BookmarksFileName =
+						Path.Combine (SparklePaths.HomePath, ".gtk-bookmarks");
+					if (File.Exists (BookmarksFileName)) {
+						TextWriter TextWriter = File.AppendText (BookmarksFileName);
+						TextWriter.WriteLine ("file://" + SparklePath + " SparkleShare");
+						TextWriter.Close();
+					}
+
+				}
+
+			}
+
+			// Get all the repos in ~/SparkleShare
+			SparkleRepo [] TmpRepos =
+				new SparkleRepo [Directory.GetDirectories (SparklePath).Length];
+
+			int i = 0;
+			foreach (string Folder in Directory.GetDirectories (SparklePath)) {
+
+				// Check if the folder is a git repo
+				if (Directory.Exists (SparkleHelpers.CombineMore (Folder,
+				                                                  ".git"))) {
+					TmpRepos [i] = new SparkleRepo (Folder);
+					i++;
+
+					// Attach emblems
+					if (SparklePlatform.Name.Equals ("GNOME")) {
+						Process.StartInfo.FileName = "gvfs-set-attribute";
+						Process.StartInfo.Arguments = " file://" + Folder + 
+								                        " metadata::emblems " +
+																"[synced]";
+						Process.Start();				
+					}
+				
+				}
+
+			}
+			
+			SparkleShare.Repositories = new SparkleRepo [i];
+			Array.Copy (TmpRepos, SparkleShare.Repositories, i);
+
+			// Don't create the window and status 
+			// icon when --disable-gui was given
+			if (!HideUI) {
+
+				// Create the status icon
+				NotificationIcon = new SparkleStatusIcon ();
+				
+				// Show a notification if there are no folders yet
+				if (SparkleShare.Repositories.Length == 0) {
+
+					SparkleBubble NoFoldersBubble;
+					NoFoldersBubble = new SparkleBubble ("Welcome to SparkleShare!",
+					                                     "You don't have any " +
+					                                     "folders set up yet.\n" +
+					                                     "Please create some in " +
+					                                     "the SparkleShare folder.");
+
+					NoFoldersBubble.IconName = "folder-sparkleshare";
+					NoFoldersBubble.AddAction ("", "Open SparkleShare Folder", delegate {
+						Process.StartInfo.FileName = "xdg-open";
+						Process.StartInfo.Arguments = SparklePaths.SparklePath;
+						Process.Start();
+					} );
+
+				}
+
+			}
+			
+			// Watch the SparkleShare folder and pop up the 
+			// Add dialog when a new folder is created
+			FileSystemWatcher Watcher = new FileSystemWatcher (SparklePaths.SparklePath);
+			Watcher.IncludeSubdirectories = false;
+			Watcher.EnableRaisingEvents = true;
+			Watcher.Created += delegate (object o, FileSystemEventArgs args) {
+			   WatcherChangeTypes wct = args.ChangeType;
+				Console.WriteLine ("[Event][SparkleShare] " + wct.ToString() + 
+				                   " '" + args.Name + "'");
+				SparkleDialog SparkleDialog = new SparkleDialog ();
+				SparkleDialog.ShowAll ();
+			};
+
+			// Create place to store configuration user's home folder
+			string ConfigPath = SparklePaths.SparkleConfigPath;
+			string AvatarPath = SparklePaths.SparkleAvatarPath;
+
+			if (!Directory.Exists (ConfigPath)) {
+
+				Directory.CreateDirectory (ConfigPath);
+				Console.WriteLine ("[Config] Created '" + ConfigPath + "'");
+
+				// Create a place to store the avatars
+				Directory.CreateDirectory (AvatarPath);
+				Console.WriteLine ("[Config] Created '" + AvatarPath + "avatars'");
+
+			}
+			
+			string NotifySettingFile =
+				SparkleHelpers.CombineMore (SparklePaths.SparkleConfigPath,
+					                         "sparkleshare.notify");
+
+			// Enable notifications by default				
+			if (!File.Exists (NotifySettingFile))
+				File.Create (NotifySettingFile);
+
+
+		}
+
+	}
+
+}