diff --git a/RetailCoder.VBE/Common/Dispatch/DispatcherEventArgs.cs b/RetailCoder.VBE/Common/Dispatch/DispatcherEventArgs.cs
index 6091125dfc..ba4ca0daa7 100644
--- a/RetailCoder.VBE/Common/Dispatch/DispatcherEventArgs.cs
+++ b/RetailCoder.VBE/Common/Dispatch/DispatcherEventArgs.cs
@@ -1,9 +1,8 @@
 using System;
-using Rubberduck.Parsing;
 
 namespace Rubberduck.Common.Dispatch
 {
-    public class DispatcherEventArgs<T> : EventArgs, IDispatcherEventArgs<T>
+    public class DispatcherEventArgs<T> : EventArgs
         where T : class
     {
         private readonly T _item;
diff --git a/RetailCoder.VBE/Common/Dispatch/DispatcherRenamedEventArgs.cs b/RetailCoder.VBE/Common/Dispatch/DispatcherRenamedEventArgs.cs
index d84ac94b64..c69774882a 100644
--- a/RetailCoder.VBE/Common/Dispatch/DispatcherRenamedEventArgs.cs
+++ b/RetailCoder.VBE/Common/Dispatch/DispatcherRenamedEventArgs.cs
@@ -1,8 +1,6 @@
-using Rubberduck.Parsing;
-
-namespace Rubberduck.Common.Dispatch
+namespace Rubberduck.Common.Dispatch
 {
-    public class DispatcherRenamedEventArgs<T> : DispatcherEventArgs<T>, IDispatcherRenamedEventArgs<T>
+    public class DispatcherRenamedEventArgs<T> : DispatcherEventArgs<T>
         where T : class
     {
         private readonly string _oldName;
diff --git a/RetailCoder.VBE/Extension.cs b/RetailCoder.VBE/Extension.cs
index f3db33a08f..a57ba82a93 100644
--- a/RetailCoder.VBE/Extension.cs
+++ b/RetailCoder.VBE/Extension.cs
@@ -11,6 +11,7 @@
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
 using Ninject.Extensions.Interception;
+using NLog;
 
 namespace Rubberduck
 {
@@ -26,6 +27,7 @@ public class _Extension : IDTExtensibility2
 
         private IKernel _kernel;
         private App _app;
+        private readonly Logger _logger = LogManager.GetCurrentClassLogger();
 
         public void OnAddInsUpdate(ref Array custom)
         {
@@ -50,6 +52,7 @@ public void OnConnection(object Application, ext_ConnectMode ConnectMode, object
             }
             catch (Exception exception)
             {
+                _logger.Fatal(exception);
                 System.Windows.Forms.MessageBox.Show(exception.ToString(), RubberduckUI.RubberduckLoadFailure, MessageBoxButtons.OK, MessageBoxIcon.Error);
             }
         }
diff --git a/RetailCoder.VBE/Rubberduck.csproj b/RetailCoder.VBE/Rubberduck.csproj
index 0046866c26..7dfbbe5ef7 100644
--- a/RetailCoder.VBE/Rubberduck.csproj
+++ b/RetailCoder.VBE/Rubberduck.csproj
@@ -256,7 +256,6 @@
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="PresentationFramework.Aero" />
-    <Reference Include="PresentationFramework.Aero2" />
     <Reference Include="ReachFramework" />
     <Reference Include="stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <EmbedInteropTypes>False</EmbedInteropTypes>
diff --git a/RetailCoder.VBE/Sinks.cs b/RetailCoder.VBE/Sinks.cs
index 315a3e8e78..3e5e78dc23 100644
--- a/RetailCoder.VBE/Sinks.cs
+++ b/RetailCoder.VBE/Sinks.cs
@@ -1,12 +1,67 @@
 using System;
 using System.Collections.Generic;
 using System.Runtime.InteropServices.ComTypes;
+using System.Threading.Tasks;
 using Microsoft.Vbe.Interop;
 using Rubberduck.Common.Dispatch;
 using Rubberduck.Parsing;
+using Rubberduck.VBEditor.Extensions;
 
 namespace Rubberduck
 {
+    public class ProjectEventArgs : EventArgs, IProjectEventArgs
+    {
+        public ProjectEventArgs(string projectId)
+        {
+            _projectId = projectId;
+        }
+
+        private readonly string _projectId;
+        public string ProjectId { get { return _projectId; } }
+    }
+
+    public class ProjectRenamedEventArgs : ProjectEventArgs, IProjectRenamedEventArgs
+    {
+        public ProjectRenamedEventArgs(string projectId, string oldName) : base(projectId)
+        {
+            _oldName = oldName;
+        }
+
+        private readonly string _oldName;
+        public string OldName { get { return _oldName; } }
+    }
+
+    public class ComponentEventArgs : EventArgs, IComponentEventArgs
+    {
+        public ComponentEventArgs(string projectId, string componentName, vbext_ComponentType type)
+        {
+            _projectId = projectId;
+            _componentName = componentName;
+            _type = type;
+        }
+
+        private readonly string _projectId;
+        public string ProjectId { get { return _projectId; } }
+
+        private readonly string _componentName;
+        public string ComponentName { get { return _componentName; } }
+
+        private readonly vbext_ComponentType _type;
+        public vbext_ComponentType Type { get { return _type; } }
+    }
+
+    public class ComponentRenamedEventArgs : ComponentEventArgs, IComponentRenamedEventArgs
+    {
+        public ComponentRenamedEventArgs(string projectId, string componentName, vbext_ComponentType type, string oldName)
+            : base(projectId, componentName, type)
+        {
+            _oldName = oldName;
+        }
+
+        private readonly string _oldName;
+        public string OldName { get { return _oldName; } }
+    }
+
     public class Sinks : ISinks, IDisposable
     {
         private VBProjectsEventsSink _sink;
@@ -18,11 +73,6 @@ public class Sinks : ISinks, IDisposable
         private readonly IDictionary<string, Tuple<IConnectionPoint, int>> _componentsEventsConnectionPoints =
             new Dictionary<string, Tuple<IConnectionPoint, int>>();
 
-        private readonly IDictionary<string, ReferencesEventsSink> _referencesEventsSinks =
-            new Dictionary<string, ReferencesEventsSink>();
-        private readonly IDictionary<string, Tuple<IConnectionPoint, int>> _referencesEventsConnectionPoints =
-            new Dictionary<string, Tuple<IConnectionPoint, int>>();
-
         public bool IsEnabled { get; set; }
 
         public Sinks(VBE vbe)
@@ -43,59 +93,78 @@ public Sinks(VBE vbe)
 
         #region ProjectEvents
 
-        public event EventHandler<IDispatcherEventArgs<VBProject>> ProjectActivated;
-        public event EventHandler<IDispatcherEventArgs<VBProject>> ProjectAdded;
-        public event EventHandler<IDispatcherEventArgs<VBProject>> ProjectRemoved;
-        public event EventHandler<IDispatcherRenamedEventArgs<VBProject>> ProjectRenamed;
+        public event EventHandler<IProjectEventArgs> ProjectActivated;
+        public event EventHandler<IProjectEventArgs> ProjectAdded;
+        public event EventHandler<IProjectEventArgs> ProjectRemoved;
+        public event EventHandler<IProjectRenamedEventArgs> ProjectRenamed;
 
         private void _sink_ProjectActivated(object sender, DispatcherEventArgs<VBProject> e)
         {
             if (!IsEnabled) { return; }
+            var projectId = e.Item.HelpFile;
 
-            var handler = ProjectActivated;
-            if (handler != null)
+            Task.Run(() =>
             {
-                handler(sender, e);
-            }
+                var handler = ProjectActivated;
+                if (handler != null)
+                {
+                    handler(sender, new ProjectEventArgs(projectId));
+                }
+            });
         }
 
         private void _sink_ProjectAdded(object sender, DispatcherEventArgs<VBProject> e)
         {
             if (!IsEnabled) { return; }
 
-            var handler = ProjectAdded;
-            if (handler != null)
-            {
-                handler(sender, e);
-            }
+            e.Item.AssignProjectId();
+            var projectId = e.Item.HelpFile;
 
-            RegisterComponentsEventSink(e.Item.VBComponents, e.Item.HelpFile);
-            //RegisterReferencesEventSink(e.Item.References, e.Item.HelpFile);
+            Task.Run(() =>
+            {
+                var handler = ProjectAdded;
+                if (handler != null)
+                {
+                    handler(sender, new ProjectEventArgs(projectId));
+                }
+
+                RegisterComponentsEventSink(e.Item.VBComponents, e.Item.HelpFile);
+            });
         }
 
         private void _sink_ProjectRemoved(object sender, DispatcherEventArgs<VBProject> e)
         {
             if (!IsEnabled) { return; }
 
-            var handler = ProjectRemoved;
-            if (handler != null)
-            {
-                handler(sender, e);
-            }
+            var projectId = e.Item.HelpFile;
 
-            UnregisterComponentsEventSink(e.Item.HelpFile);
-            //UnregisterReferencesEventSink(e.Item.HelpFile);
+            Task.Run(() =>
+            {
+                var handler = ProjectRemoved;
+                if (handler != null)
+                {
+                    handler(sender, new ProjectEventArgs(projectId));
+                }
+
+                UnregisterComponentsEventSink(e.Item.HelpFile);
+            });
         }
 
         private void _sink_ProjectRenamed(object sender, DispatcherRenamedEventArgs<VBProject> e)
         {
             if (!IsEnabled) { return; }
 
-            var handler = ProjectRenamed;
-            if (handler != null)
+            var projectId = e.Item.HelpFile;
+            var oldName = e.OldName;
+
+            Task.Run(() =>
             {
-                handler(sender, e);
-            }
+                var handler = ProjectRenamed;
+                if (handler != null)
+                {
+                    handler(sender, new ProjectRenamedEventArgs(projectId, oldName));
+                }
+            });
         }
 
         #endregion
@@ -148,21 +217,24 @@ private void UnregisterComponentsEventSink(string projectId)
             _componentsEventsConnectionPoints.Remove(projectId);
         }
 
-        public event EventHandler<IDispatcherEventArgs<VBComponent>> ComponentActivated;
-        public event EventHandler<IDispatcherEventArgs<VBComponent>> ComponentAdded;
-        public event EventHandler<IDispatcherEventArgs<VBComponent>> ComponentReloaded;
-        public event EventHandler<IDispatcherEventArgs<VBComponent>> ComponentRemoved;
-        public event EventHandler<IDispatcherRenamedEventArgs<VBComponent>> ComponentRenamed;
-        public event EventHandler<IDispatcherEventArgs<VBComponent>> ComponentSelected;
+        public event EventHandler<IComponentEventArgs> ComponentActivated;
+        public event EventHandler<IComponentEventArgs> ComponentAdded;
+        public event EventHandler<IComponentEventArgs> ComponentReloaded;
+        public event EventHandler<IComponentEventArgs> ComponentRemoved;
+        public event EventHandler<IComponentRenamedEventArgs> ComponentRenamed;
+        public event EventHandler<IComponentEventArgs> ComponentSelected;
 
         private void ComponentsSink_ComponentActivated(object sender, DispatcherEventArgs<VBComponent> e)
         {
             if (!IsEnabled) { return; }
 
+            var projectId = e.Item.Collection.Parent.HelpFile;
+            var componentName = e.Item.Name;
+
             var handler = ComponentActivated;
             if (handler != null)
             {
-                handler(sender, e);
+                handler(sender, new ComponentEventArgs(projectId, componentName, e.Item.Type));
             }
         }
 
@@ -170,10 +242,13 @@ private void ComponentsSink_ComponentAdded(object sender, DispatcherEventArgs<VB
         {
             if (!IsEnabled) { return; }
 
+            var projectId = e.Item.Collection.Parent.HelpFile;
+            var componentName = e.Item.Name;
+
             var handler = ComponentAdded;
             if (handler != null)
             {
-                handler(sender, e);
+                handler(sender, new ComponentEventArgs(projectId, componentName, e.Item.Type));
             }
         }
 
@@ -181,10 +256,13 @@ private void ComponentsSink_ComponentReloaded(object sender, DispatcherEventArgs
         {
             if (!IsEnabled) { return; }
 
+            var projectId = e.Item.Collection.Parent.HelpFile;
+            var componentName = e.Item.Name;
+
             var handler = ComponentReloaded;
             if (handler != null)
             {
-                handler(sender, e);
+                handler(sender, new ComponentEventArgs(projectId, componentName, e.Item.Type));
             }
         }
 
@@ -192,10 +270,13 @@ private void ComponentsSink_ComponentRemoved(object sender, DispatcherEventArgs<
         {
             if (!IsEnabled) { return; }
 
+            var projectId = e.Item.Collection.Parent.HelpFile;
+            var componentName = e.Item.Name;
+
             var handler = ComponentRemoved;
             if (handler != null)
             {
-                handler(sender, e);
+                handler(sender, new ComponentEventArgs(projectId, componentName, e.Item.Type));
             }
         }
 
@@ -203,10 +284,14 @@ private void ComponentsSink_ComponentRenamed(object sender, DispatcherRenamedEve
         {
             if (!IsEnabled) { return; }
 
+            var projectId = e.Item.Collection.Parent.HelpFile;
+            var componentName = e.Item.Name;
+            var oldName = e.OldName;
+
             var handler = ComponentRenamed;
             if (handler != null)
             {
-                handler(sender, e);
+                handler(sender, new ComponentRenamedEventArgs(projectId, componentName, e.Item.Type, oldName));
             }
         }
 
@@ -214,81 +299,17 @@ private void ComponentsSink_ComponentSelected(object sender, DispatcherEventArgs
         {
             if (!IsEnabled) { return; }
 
+            var projectId = e.Item.Collection.Parent.HelpFile;
+            var componentName = e.Item.Name;
+
             var handler = ComponentSelected;
             if (handler != null)
             {
-                handler(sender, e);
+                handler(sender, new ComponentEventArgs(projectId, componentName, e.Item.Type));
             }
         }
         #endregion
 
-        // todo figure out why that cast fails
-        //#region ReferenceEvents
-        //private void RegisterReferencesEventSink(References references, string projectId)
-        //{
-        //    if (_referencesEventsSinks.ContainsKey(projectId))
-        //    {
-        //        // already registered - this is caused by the initial load+rename of a project in the VBE
-        //        return;
-        //    }
-
-        //    var connectionPointContainer = (IConnectionPointContainer)references;
-        //    var interfaceId = typeof(_dispReferencesEvents).GUID;
-
-        //    IConnectionPoint connectionPoint;
-        //    connectionPointContainer.FindConnectionPoint(ref interfaceId, out connectionPoint);
-
-        //    var referencesSink = new ReferencesEventsSink();
-        //    referencesSink.ReferenceAdded += ReferencesSink_ReferenceAdded;
-        //    referencesSink.ReferenceRemoved += ReferencesSink_ReferenceRemoved;
-        //    _referencesEventsSinks.Add(projectId, referencesSink);
-
-        //    int cookie;
-        //    connectionPoint.Advise(referencesSink, out cookie);
-
-        //    _referencesEventsConnectionPoints.Add(projectId, Tuple.Create(connectionPoint, cookie));
-        //}
-
-        //private void UnregisterReferencesEventSink(string projectId)
-        //{
-        //    var referencesEventSink = _referencesEventsSinks[projectId];
-
-        //    referencesEventSink.ReferenceAdded -= ReferencesSink_ReferenceAdded;
-        //    referencesEventSink.ReferenceRemoved -= ReferencesSink_ReferenceRemoved;
-        //    _referencesEventsSinks.Remove(projectId);
-
-        //    var referenceConnectionPoint = _referencesEventsConnectionPoints[projectId];
-        //    referenceConnectionPoint.Item1.Unadvise(referenceConnectionPoint.Item2);
-
-        //    _referencesEventsConnectionPoints.Remove(projectId);
-        //}
-
-        //public event EventHandler<IDispatcherEventArgs<Reference>> ReferenceAdded;
-        //public event EventHandler<IDispatcherEventArgs<Reference>> ReferenceRemoved;
-
-        //private void ReferencesSink_ReferenceAdded(object sender, DispatcherEventArgs<Reference> e)
-        //{
-        //    if (!IsEnabled) { return; }
-
-        //    var handler = ReferenceAdded;
-        //    if (handler != null)
-        //    {
-        //        handler(sender, e);
-        //    }
-        //}
-
-        //private void ReferencesSink_ReferenceRemoved(object sender, DispatcherEventArgs<Reference> e)
-        //{
-        //    if (!IsEnabled) { return; }
-
-        //    var handler = ReferenceRemoved;
-        //    if (handler != null)
-        //    {
-        //        handler(sender, e);
-        //    }
-        //}
-        //#endregion
-
         public void Dispose()
         {
             if (_sink != null)
@@ -315,21 +336,10 @@ public void Dispose()
                 item.Value.ComponentSelected -= ComponentsSink_ComponentSelected;
             }
 
-            /*foreach (var item in _referencesEventsSinks)
-            {
-                item.Value.ReferenceAdded -= ReferencesSink_ReferenceAdded;
-                item.Value.ReferenceRemoved -= ReferencesSink_ReferenceRemoved;
-            }*/
-
             foreach (var item in _componentsEventsConnectionPoints)
             {
                 item.Value.Item1.Unadvise(item.Value.Item2);
             }
-
-            foreach (var item in _referencesEventsConnectionPoints)
-            {
-                item.Value.Item1.Unadvise(item.Value.Item2);
-            }
         }
     }
 }
\ No newline at end of file
diff --git a/RetailCoder.VBE/UI/RubberduckUI.de.resx b/RetailCoder.VBE/UI/RubberduckUI.de.resx
index 27210a323c..c0f2878211 100644
--- a/RetailCoder.VBE/UI/RubberduckUI.de.resx
+++ b/RetailCoder.VBE/UI/RubberduckUI.de.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -59,7 +59,7 @@
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+  <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
@@ -705,9 +705,6 @@ Warnung: Alle eigenen Einstellungen gehen dabei verloren. Die Originaldatei wird
   <data name="SourceControl_IgnoreFile" xml:space="preserve">
     <value>'.gitignore' Datei</value>
   </data>
-  <data name="SourceControl_InitRepoButtonToolTip" xml:space="preserve">
-    <value>Neues Repo auf Basis dieses Projektes erstellen</value>
-  </data>
   <data name="SourceControl_RefreshButtonToolTip" xml:space="preserve">
     <value>Ausstehende Änderungen aktualisieren</value>
   </data>
@@ -1099,7 +1096,7 @@ Warnung: Alle eigenen Einstellungen gehen dabei verloren. Die Originaldatei wird
     <value>Spätes Binden</value>
   </data>
   <data name="UnitTestSettings_PermissiveAssert" xml:space="preserve">
-    <value>Tolereante Forderung</value>
+    <value>Tolerante Forderung</value>
   </data>
   <data name="UnitTestSettings_StrictAssert" xml:space="preserve">
     <value>Strikte Forderung</value>
@@ -1276,9 +1273,6 @@ Fugue Icons von Yusuke Kamiyamane</value>
 Allen Sternguckern, Likern &amp; Followern, für das warme Kribbeln
 … und jedem der dies leist.</value>
   </data>
-  <data name="SourceControl_CloneRepoButtonToolTip" xml:space="preserve">
-    <value>Repository löschen</value>
-  </data>
   <data name="SourceControl_BranchName" xml:space="preserve">
     <value>Zweigname:</value>
   </data>
@@ -1354,9 +1348,6 @@ Allen Sternguckern, Likern &amp; Followern, für das warme Kribbeln
   <data name="ParserState_ResolverError" xml:space="preserve">
     <value>Fehler beim Auflösen</value>
   </data>
-  <data name="ParserState_Resolving" xml:space="preserve">
-    <value>Löse auf ...</value>
-  </data>
   <data name="AboutWindow_BlogsHeader" xml:space="preserve">
     <value>Blogs:</value>
   </data>
@@ -1499,7 +1490,7 @@ Allen Sternguckern, Likern &amp; Followern, für das warme Kribbeln
     <value>Ordner-Trennzeichen:</value>
   </data>
   <data name="GeneralSettings_SlashDelimiter" xml:space="preserve">
-    <value>Slash (/)</value>
+    <value>Schrägstrich (/)</value>
   </data>
   <data name="SourceControl_MissingCredentials" xml:space="preserve">
     <value>Fehlende Zugangsdaten</value>
@@ -1516,9 +1507,6 @@ Allen Sternguckern, Likern &amp; Followern, für das warme Kribbeln
   <data name="SourceControl_CommitStatus" xml:space="preserve">
     <value>Commit Status.</value>
   </data>
-  <data name="SortStyle_BySelection" xml:space="preserve">
-    <value>Nach Auswahl</value>
-  </data>
   <data name="SortStyle_ByType" xml:space="preserve">
     <value>Nach Typ</value>
   </data>
@@ -1556,10 +1544,10 @@ Allen Sternguckern, Likern &amp; Followern, für das warme Kribbeln
     <value>Parserfehler</value>
   </data>
   <data name="GeneralSettings_MinimumLogLevelLabel" xml:space="preserve">
-    <value>Minimum Log Level</value>
+    <value>Minimale Logging-Empfindlichkeit</value>
   </data>
   <data name="GeneralSettings_DebugLogLevel" xml:space="preserve">
-    <value>Debug</value>
+    <value>Debugging</value>
   </data>
   <data name="GeneralSettings_ErrorLogLevel" xml:space="preserve">
     <value>Fehler</value>
@@ -1568,13 +1556,13 @@ Allen Sternguckern, Likern &amp; Followern, für das warme Kribbeln
     <value>Fatal</value>
   </data>
   <data name="GeneralSettings_InfoLogLevel" xml:space="preserve">
-    <value>Info</value>
+    <value>Informationen</value>
   </data>
   <data name="GeneralSettings_OffLogLevel" xml:space="preserve">
     <value>Kein Logging</value>
   </data>
   <data name="GeneralSettings_TraceLogLevel" xml:space="preserve">
-    <value>Trace</value>
+    <value>Spuren</value>
   </data>
   <data name="GeneralSettings_WarnLogLevel" xml:space="preserve">
     <value>Warnung</value>
@@ -1583,24 +1571,132 @@ Allen Sternguckern, Likern &amp; Followern, für das warme Kribbeln
     <value>Logging-Ordner anzeigen</value>
   </data>
   <data name="information" xml:space="preserve">
-    <value />
+    <value>..\Resources\information.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="CodeExplorer_CopyToolTip" xml:space="preserve">
     <value>In Zwischenablage kopieren</value>
   </data>
   <data name="cross_circle" xml:space="preserve">
-    <value />
+    <value>..\Resources\cross-circle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="SourceControl_PublishRepo_FailureTitle" xml:space="preserve">
     <value>Veröffentliche Repository</value>
   </data>
-  <data name="SourceControl_PublishRepoButtonToolTip" xml:space="preserve">
-    <value>Veröffentliche Repository auf Github</value>
-  </data>
   <data name="SourceControl_PublishRepo_NoOpenRepo" xml:space="preserve">
     <value>Kein geöffnetes Repository verfügbar, um es auf den Remote-Pfad zu veröffentlichen</value>
   </data>
   <data name="SourceControl_ExternalModifications" xml:space="preserve">
     <value>Eine Quelldatei wurde außerhalb des VBA-Editors geändert. Soll Rubberduck diese nachladen?</value>
   </data>
-</root>
\ No newline at end of file
+  <data name="SourceControl_InitializeRepositoryTitle">
+    <value>Neues Repository initialisieren</value>
+  </data>
+  <data name="SourceControl_OpenCommandPromptFailureTitle">
+    <value>Fehler beim öffnen der Eingabeaufforderung</value>
+  </data>
+  <data name="SourceControl_FileStatus_Unaltered">
+    <value>Unverändert</value>
+  </data>
+  <data name="SourceControl_FileStatus_Missing">
+    <value>Fehlt</value>
+  </data>
+  <data name="SourceControl_FileStatus_RenamedInWorkDir">
+    <value>Im Arbeitsverzeichnis umbenannt</value>
+  </data>
+  <data name="SourceControl_PublishRepositoryDescription">
+    <value>Veröffentlicht ein existierendes Repository zu einem entfernten Repository. Das offene Projekt muss dazu mit einem Repository verbunden sein.</value>
+  </data>
+  <data name="SourceControl_FilePickerDefaultRepoHeader">
+    <value>Standard Repository-Pfad</value>
+  </data>
+  <data name="SourceControl_UnknownErrorMessage">
+    <value>Bitte setzen Sie die Logging-Empfindlichkeit auf Fatal oder niedriger und erstellen Sie ein Ticket auf unserer GitHub-Seite mit dem Inhalt Ihrer Logdatei in C:\Users\{username}\AppData\Roaming\Rubberduck\Logs.</value>
+  </data>
+  <data name="SourceControl_FileStatus_Unreadable">
+    <value>Unlesbar</value>
+  </data>
+  <data name="SourceControl_FileStatus_RenamedInIndex">
+    <value>Im Index umbenannt</value>
+  </data>
+  <data name="SourceControl_InitializeRepositoryDescription">
+    <value>Neues Repository mit dem geöffneten Projekt erstellen.</value>
+  </data>
+  <data name="SourceControl_FileStatus_Staged">
+    <value>Vorgemerkt</value>
+  </data>
+  <data name="SourceControl_FileStatus_Untracked">
+    <value>Nicht verfolgt</value>
+  </data>
+  <data name="SourceControl_CommandPromptExeLabel">
+    <value>Speicherort der Eingabeaufforderung (cmd.exe / powershell.exe)</value>
+  </data>
+  <data name="SourceControl_CloneRepositoryDescription">
+    <value>Klont das entfernte Repository von der angegebenen URL. Dazu muss ein leeres Projekt in der VBE geöffnet sein.</value>
+  </data>
+  <data name="SourceControl_CloneRepositoryTitle">
+    <value>Klone entferntes Repository</value>
+  </data>
+  <data name="CodeExplorer_OpenProjectProperties">
+    <value>Projekteigenschaften öffnen</value>
+  </data>
+  <data name="SourceControl_NoActiveProject">
+    <value>Kein aktives VBProject</value>
+  </data>
+  <data name="SourceControl_ActivateProject">
+    <value>Bitte öffnen oder aktivieren Sie ein Projekt und versuchen Sie es erneut.</value>
+  </data>
+  <data name="SourceControl_OpenRepositoryTitle">
+    <value>Existierendes Repository öffnen.</value>
+  </data>
+  <data name="SourceControl_PublishRepositoryTitle">
+    <value>Existierendes Repository Veröffentlichen</value>
+  </data>
+  <data name="SourceControl_FileStatus_Ignored">
+    <value>Ignoriert</value>
+  </data>
+  <data name="SourceControl_UnknownErrorTitle">
+    <value>Ein unbekannter Fehler ist aufgetreten.</value>
+  </data>
+  <data name="SourceControl_OpenCommandPromptButtonToolTip">
+    <value>Eingabeaufforderung öffnen</value>
+  </data>
+  <data name="SortStyle_ByCodeOrder">
+    <value>Nach Deklarationsreihenfolge</value>
+  </data>
+  <data name="SourceControl_FileStatus_Removed">
+    <value>Gelöscht</value>
+  </data>
+  <data name="ParserState_ResolvingReferences">
+    <value>Löse Referenzen auf...</value>
+  </data>
+  <data name="SourceControl_FileStatus_TypeChanged">
+    <value>Typ geändert</value>
+  </data>
+  <data name="SourceControl_FilePickerCommandPromptHeader">
+    <value>Eingabeaufforderung</value>
+  </data>
+  <data name="SourceControl_OpenRepositoryDescription">
+    <value>Repository von der Festplatte öffnen. Dazu muss ein leeres Projekt in der VBE geöffnet sein.</value>
+  </data>
+  <data name="SourceControl_FileStatus_Nonexistent">
+    <value>Nicht Vorhanden</value>
+  </data>
+  <data name="SourceControl_FileStatus_Modified">
+    <value>Geändert</value>
+  </data>
+  <data name="SourceControl_ManageRepositories">
+    <value>Verwalten</value>
+  </data>
+  <data name="SourceControl_FileStatus_StagedTypeChange">
+    <value>Änderung der Vormerkung</value>
+  </data>
+  <data name="ParserState_ResolvingDeclarations">
+    <value>Löse Deklarationen auf...</value>
+  </data>
+  <data name="SourceControl_FileStatus_Added">
+    <value>Hinzugefügt</value>
+  </data>
+  <data name="RubberduckFatalError">
+    <value>In Rubberduck ist ein Fehler aufgetreten. Bitte speichern Sie Ihre Arbeit und starten Sie das Hostprogramm neu. Laden Sie dann Ihre Logdatei zu unserer GitHub-Seite hoch.</value>
+  </data>
+</root>
diff --git a/RetailCoder.VBE/UI/SourceControl/SourceControlView.xaml b/RetailCoder.VBE/UI/SourceControl/SourceControlView.xaml
index 3a596f7a81..ce26a7f3f6 100644
--- a/RetailCoder.VBE/UI/SourceControl/SourceControlView.xaml
+++ b/RetailCoder.VBE/UI/SourceControl/SourceControlView.xaml
@@ -1,4 +1,4 @@
-<UserControl
+<UserControl x:Class="Rubberduck.UI.SourceControl.SourceControlView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -6,7 +6,6 @@
              xmlns:themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero"
              xmlns:sourceControl="clr-namespace:Rubberduck.UI.SourceControl"
              xmlns:controls="clr-namespace:Rubberduck.UI.Controls"
-             xmlns:Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero2" x:Class="Rubberduck.UI.SourceControl.SourceControlView"
              mc:Ignorable="d" 
              d:DesignHeight="600" d:DesignWidth="300"
              d:DataContext="{d:DesignInstance {x:Type sourceControl:SourceControlViewViewModel}, IsDesignTimeCreatable=False}">
@@ -289,7 +288,7 @@
                                             <DockPanel x:Name="Header">
                                                 <ContentPresenter ContentSource="Header" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
                                                 <Popup x:Name="PART_Popup" AllowsTransparency="true" Focusable="false" HorizontalOffset="-1" IsOpen="{Binding IsSubmenuOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{DynamicResource {x:Static SystemParameters.MenuPopupAnimationKey}}" Placement="Bottom">
-                                                    <Themes:SystemDropShadowChrome x:Name="Shdw" Color="Transparent">
+                                                    <themes:SystemDropShadowChrome x:Name="Shdw" Color="Transparent">
                                                         <Border x:Name="SubMenuBorder" BorderBrush="{StaticResource ToolBarMenuBorder}" BorderThickness="1" Background="{StaticResource ToolBarSubMenuBackground}">
                                                             <Grid>
                                                                 <Rectangle Fill="{StaticResource ToolBarSubMenuBackground}" HorizontalAlignment="Left" Height="1" Margin="0,-1,0,0" VerticalAlignment="Top" Width="{Binding ActualWidth, ElementName=Header}"/>
@@ -307,7 +306,7 @@
                                                                 </ScrollViewer>
                                                             </Grid>
                                                         </Border>
-                                                    </Themes:SystemDropShadowChrome>
+                                                    </themes:SystemDropShadowChrome>
                                                 </Popup>
                                             </DockPanel>
                                         </Border>
@@ -380,7 +379,7 @@
                                             <ContentPresenter Grid.Column="0" ContentSource="Header" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
                                             <Path Grid.Column="1" DockPanel.Dock="Right" Data="{StaticResource RightArrow}" Fill="{TemplateBinding Foreground}" Margin="4,0,6,0" VerticalAlignment="Center"/>
                                             <Popup x:Name="PART_Popup" AllowsTransparency="true" Focusable="false" IsOpen="{Binding IsSubmenuOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{DynamicResource {x:Static SystemParameters.MenuPopupAnimationKey}}" Placement="Right">
-                                                <Themes:SystemDropShadowChrome x:Name="Shdw" Color="Transparent">
+                                                <themes:SystemDropShadowChrome x:Name="Shdw" Color="Transparent">
                                                     <Border x:Name="SubMenuBorder" BorderBrush="{StaticResource ToolBarMenuBorder}" BorderThickness="1" Background="{StaticResource ToolBarSubMenuBackground}" Grid.IsSharedSizeScope="true">
                                                         <ScrollViewer x:Name="SubMenuScrollViewer" Style="{DynamicResource {ComponentResourceKey ResourceId=MenuScrollViewer, TypeInTargetAssembly={x:Type FrameworkElement}}}">
                                                             <Grid RenderOptions.ClearTypeHint="Enabled">
@@ -395,7 +394,7 @@
                                                             </Grid>
                                                         </ScrollViewer>
                                                     </Border>
-                                                </Themes:SystemDropShadowChrome>
+                                                </themes:SystemDropShadowChrome>
                                             </Popup>
                                         </Grid>
                                         <ControlTemplate.Triggers>
diff --git a/RetailCoder.VBE/UI/SourceControl/SourceControlViewViewModel.cs b/RetailCoder.VBE/UI/SourceControl/SourceControlViewViewModel.cs
index 0fdb9b808b..61d139d009 100644
--- a/RetailCoder.VBE/UI/SourceControl/SourceControlViewViewModel.cs
+++ b/RetailCoder.VBE/UI/SourceControl/SourceControlViewViewModel.cs
@@ -115,50 +115,50 @@ public void SetTab(SourceControlTab tab)
             SelectedItem = TabItems.First(t => t.ViewModel.Tab == tab);
         }
 
-        private void ComponentAdded(object sender, IDispatcherEventArgs<VBComponent> e)
+        private void ComponentAdded(object sender, IComponentEventArgs e)
         {
             if (Provider == null || !Provider.HandleVbeSinkEvents) { return; }
 
-            if (e.Item.Collection.Parent.HelpFile != Provider.CurrentRepository.Id)
+            if (e.ProjectId != Provider.CurrentRepository.Id)
             {
                 return;
             }
 
-            Logger.Trace("Component {0} added", e.Item.Name);
-            var fileStatus = Provider.Status().SingleOrDefault(stat => stat.FilePath.Split('.')[0] == e.Item.Name);
+            Logger.Trace("Component {0} added", e.ComponentName);
+            var fileStatus = Provider.Status().SingleOrDefault(stat => stat.FilePath.Split('.')[0] == e.ComponentName);
             if (fileStatus != null)
             {
                 Provider.AddFile(fileStatus.FilePath);
             }
         }
 
-        private void ComponentRemoved(object sender, IDispatcherEventArgs<VBComponent> e)
+        private void ComponentRemoved(object sender, IComponentEventArgs e)
         {
             if (Provider == null || !Provider.HandleVbeSinkEvents) { return; }
 
-            if (e.Item.Collection.Parent.HelpFile != Provider.CurrentRepository.Id)
+            if (e.ProjectId != Provider.CurrentRepository.Id)
             {
                 return;
             }
 
-            Logger.Trace("Component {0] removed", e.Item.Name);
-            var fileStatus = Provider.Status().SingleOrDefault(stat => stat.FilePath.Split('.')[0] == e.Item.Name);
+            Logger.Trace("Component {0] removed", e.ComponentName);
+            var fileStatus = Provider.Status().SingleOrDefault(stat => stat.FilePath.Split('.')[0] == e.ComponentName);
             if (fileStatus != null)
             {
                 Provider.RemoveFile(fileStatus.FilePath, true);
             }
         }
 
-        private void ComponentRenamed(object sender, IDispatcherRenamedEventArgs<VBComponent> e)
+        private void ComponentRenamed(object sender, IComponentRenamedEventArgs e)
         {
             if (Provider == null || !Provider.HandleVbeSinkEvents) { return; }
 
-            if (e.Item.Collection.Parent.HelpFile != Provider.CurrentRepository.Id)
+            if (e.ProjectId != Provider.CurrentRepository.Id)
             {
                 return;
             }
 
-            Logger.Trace("Component {0} renamed to {1}", e.OldName, e.Item.Name);
+            Logger.Trace("Component {0} renamed to {1}", e.OldName, e.ComponentName);
             var fileStatus = Provider.LastKnownStatus().SingleOrDefault(stat => stat.FilePath.Split('.')[0] == e.OldName);
             if (fileStatus != null)
             {
@@ -168,11 +168,11 @@ private void ComponentRenamed(object sender, IDispatcherRenamedEventArgs<VBCompo
                 var fileExt = "." + fileStatus.FilePath.Split('.').Last();
 
                 _fileSystemWatcher.EnableRaisingEvents = false;
-                File.Move(directory + fileStatus.FilePath, directory + e.Item.Name + fileExt);
+                File.Move(directory + fileStatus.FilePath, directory + e.ComponentName + fileExt);
                 _fileSystemWatcher.EnableRaisingEvents = true;
 
                 Provider.RemoveFile(e.OldName + fileExt, false);
-                Provider.AddFile(e.Item.Name + fileExt);
+                Provider.AddFile(e.ComponentName + fileExt);
             }
         }
 
diff --git a/Rubberduck.Parsing/ISinks.cs b/Rubberduck.Parsing/ISinks.cs
index 6c13f2b1e6..147ed3e7e9 100644
--- a/Rubberduck.Parsing/ISinks.cs
+++ b/Rubberduck.Parsing/ISinks.cs
@@ -3,14 +3,24 @@
 
 namespace Rubberduck.Parsing
 {
-    public interface IDispatcherEventArgs<T>
-        where T : class
+    public interface IProjectEventArgs
     {
-        T Item { get; }
+        string ProjectId { get; }
     }
 
-    public interface IDispatcherRenamedEventArgs<T> : IDispatcherEventArgs<T>
-        where T : class
+    public interface IProjectRenamedEventArgs : IProjectEventArgs
+    {
+        string OldName { get; }
+    }
+
+    public interface IComponentEventArgs
+    {
+        string ProjectId { get; }
+        string ComponentName { get; }
+        vbext_ComponentType Type { get; }
+    }
+
+    public interface IComponentRenamedEventArgs : IComponentEventArgs
     {
         string OldName { get; }
     }
@@ -19,17 +29,17 @@ public interface ISinks
     {
         bool IsEnabled { get; set; }
 
-        event EventHandler<IDispatcherEventArgs<VBProject>> ProjectActivated;
-        event EventHandler<IDispatcherEventArgs<VBProject>> ProjectAdded;
-        event EventHandler<IDispatcherEventArgs<VBProject>> ProjectRemoved;
-        event EventHandler<IDispatcherRenamedEventArgs<VBProject>> ProjectRenamed;
-
-        event EventHandler<IDispatcherEventArgs<VBComponent>> ComponentActivated;
-        event EventHandler<IDispatcherEventArgs<VBComponent>> ComponentAdded;
-        event EventHandler<IDispatcherEventArgs<VBComponent>> ComponentReloaded;
-        event EventHandler<IDispatcherEventArgs<VBComponent>> ComponentRemoved;
-        event EventHandler<IDispatcherRenamedEventArgs<VBComponent>> ComponentRenamed;
-        event EventHandler<IDispatcherEventArgs<VBComponent>> ComponentSelected;
+        event EventHandler<IProjectEventArgs> ProjectActivated;
+        event EventHandler<IProjectEventArgs> ProjectAdded;
+        event EventHandler<IProjectEventArgs> ProjectRemoved;
+        event EventHandler<IProjectRenamedEventArgs> ProjectRenamed;
+
+        event EventHandler<IComponentEventArgs> ComponentActivated;
+        event EventHandler<IComponentEventArgs> ComponentAdded;
+        event EventHandler<IComponentEventArgs> ComponentReloaded;
+        event EventHandler<IComponentEventArgs> ComponentRemoved;
+        event EventHandler<IComponentRenamedEventArgs> ComponentRenamed;
+        event EventHandler<IComponentEventArgs> ComponentSelected;
 
         //event EventHandler<IDispatcherEventArgs<Reference>> ReferenceAdded;
         //event EventHandler<IDispatcherEventArgs<Reference>> ReferenceRemoved;
diff --git a/Rubberduck.Parsing/VBA/RubberduckParser.cs b/Rubberduck.Parsing/VBA/RubberduckParser.cs
index 5d349f41b1..a911561776 100644
--- a/Rubberduck.Parsing/VBA/RubberduckParser.cs
+++ b/Rubberduck.Parsing/VBA/RubberduckParser.cs
@@ -106,7 +106,7 @@ public void Parse()
             {
                 foreach (var project in _vbe.VBProjects.UnprotectedProjects())
                 {
-                    State.AddProject(project);
+                    State.AddProject(project.HelpFile);
                 }
             }
 
@@ -188,7 +188,7 @@ private void ParseAll()
             {
                 foreach (var project in _vbe.VBProjects.UnprotectedProjects())
                 {
-                    State.AddProject(project);
+                    State.AddProject(project.HelpFile);
                 }
             }
 
diff --git a/Rubberduck.Parsing/VBA/RubberduckParserState.cs b/Rubberduck.Parsing/VBA/RubberduckParserState.cs
index 7215d263ce..89a15bba8a 100644
--- a/Rubberduck.Parsing/VBA/RubberduckParserState.cs
+++ b/Rubberduck.Parsing/VBA/RubberduckParserState.cs
@@ -90,38 +90,27 @@ public RubberduckParserState(VBE vbe, ISinks sinks)
             sinks.ComponentRenamed += Sinks_ComponentRenamed;
         }
 
-        private void Sinks_ProjectAdded(object sender, IDispatcherEventArgs<VBProject> e)
+        private void Sinks_ProjectAdded(object sender, IProjectEventArgs e)
         {
             if (!_vbe.IsInDesignMode()) { return; }
 
-            Logger.Debug("Project '{0}' was added.", e.Item.Name);
-            if (e.Item.Protection == vbext_ProjectProtection.vbext_pp_locked)
-            {
-                Logger.Debug("Project is protected and will not be added to parser state.");
-                return;
-            }
+            Logger.Debug("Project '{0}' was added.", e.ProjectId);
 
-            AddProject(e.Item); // note side-effect: assigns ProjectId/HelpFile
+            AddProject(e.ProjectId); // note side-effect: assigns ProjectId/HelpFile
             OnParseRequested(sender);
         }
 
-        private void Sinks_ProjectRemoved(object sender, IDispatcherEventArgs<VBProject> e)
+        private void Sinks_ProjectRemoved(object sender, IProjectEventArgs e)
         {
             if (!_vbe.IsInDesignMode()) { return; }
-
-            if (e.Item.Protection == vbext_ProjectProtection.vbext_pp_locked)
-            {
-                return;
-            }
             
-            var projectId = e.Item.HelpFile;
-            Debug.Assert(projectId != null);
+            Debug.Assert(e.ProjectId != null);
 
-            RemoveProject(e.Item);
+            RemoveProject(e.ProjectId);
             OnParseRequested(sender);
         }
 
-        private void Sinks_ProjectRenamed(object sender, IDispatcherRenamedEventArgs<VBProject> e)
+        private void Sinks_ProjectRenamed(object sender, IProjectRenamedEventArgs e)
         {
             if (!_vbe.IsInDesignMode()) { return; }
 
@@ -130,15 +119,15 @@ private void Sinks_ProjectRenamed(object sender, IDispatcherRenamedEventArgs<VBP
                 return;
             }
 
-            Logger.Debug("Project '{0}' (ID {1}) was renamed to '{2}'.", e.OldName, e.Item.HelpFile, e.Item.Name);
+            Logger.Debug("Project {1} renamed.", e.ProjectId);
 
-            RemoveProject(e.Item.HelpFile);
-            AddProject(e.Item);
+            RemoveProject(e.ProjectId);
+            AddProject(e.ProjectId);
 
             OnParseRequested(sender);
         }
 
-        private void Sinks_ComponentAdded(object sender, IDispatcherEventArgs<VBComponent> e)
+        private void Sinks_ComponentAdded(object sender, IComponentEventArgs e)
         {
             if (!_vbe.IsInDesignMode()) { return; }
 
@@ -147,11 +136,11 @@ private void Sinks_ComponentAdded(object sender, IDispatcherEventArgs<VBComponen
                 return;
             }
 
-            Logger.Debug("Component '{0}' was added.", e.Item.Name);
-            OnParseRequested(sender, e.Item);
+            Logger.Debug("Component '{0}' was added.", e.ComponentName);
+            OnParseRequested(sender);
         }
 
-        private void Sinks_ComponentRemoved(object sender, IDispatcherEventArgs<VBComponent> e)
+        private void Sinks_ComponentRemoved(object sender, IComponentEventArgs e)
         {
             if (!_vbe.IsInDesignMode()) { return; }
 
@@ -160,11 +149,11 @@ private void Sinks_ComponentRemoved(object sender, IDispatcherEventArgs<VBCompon
                 return;
             }
 
-            Logger.Debug("Component '{0}' was removed.", e.Item.Name);
-            ClearStateCache(e.Item, true);
+            Logger.Debug("Component '{0}' was removed.", e.ComponentName);
+            OnParseRequested(sender);
         }
 
-        private void Sinks_ComponentRenamed(object sender, IDispatcherRenamedEventArgs<VBComponent> e)
+        private void Sinks_ComponentRenamed(object sender, IComponentRenamedEventArgs e)
         {
             if (!_vbe.IsInDesignMode()) { return; }
 
@@ -173,9 +162,40 @@ private void Sinks_ComponentRenamed(object sender, IDispatcherRenamedEventArgs<V
                 return;
             }
 
-            Logger.Debug("Component '{0}' was renamed to '{1}'.", e.OldName, e.Item.Name);
-            
-            RemoveRenamedComponent(e.Item, e.OldName);
+            Logger.Debug("Component '{0}' was renamed to '{1}'.", e.OldName, e.ComponentName);
+
+            var componentIsWorksheet = false;
+            foreach (var declaration in AllUserDeclarations)
+            {
+                if (declaration.ProjectId == e.ProjectId &&
+                    declaration.DeclarationType == DeclarationType.ClassModule &&
+                    declaration.IdentifierName == e.OldName)
+                {
+                    foreach (var superType in ((ClassModuleDeclaration) declaration).Supertypes)
+                    {
+                        if (superType.IdentifierName == "Worksheet")
+                        {
+                            componentIsWorksheet = true;
+                            break;
+                        }
+                    }
+
+                    break;
+                }
+            }
+
+            if (componentIsWorksheet)
+            {
+                RemoveProject(e.ProjectId);
+                Logger.Debug("Project '{0}' was removed.", e.ComponentName);
+
+                AddProject(e.ProjectId);
+            }
+            else
+            {
+                RemoveRenamedComponent(e.ProjectId, e.OldName);
+            }
+
             OnParseRequested(sender);
         }
 
@@ -189,52 +209,53 @@ public void OnStatusMessageUpdate(string message)
             }
         }
 
-        public void AddProject(VBProject project)
+        public void AddProject(string projectId)
         {
-            if (project.Protection == vbext_ProjectProtection.vbext_pp_locked)
+            var projects = new List<VBProject>();
+            foreach (VBProject p in _vbe.VBProjects)
             {
-                // adding protected project to parser state is asking for COMExceptions..
-                return;
-            }
+                if (p.HelpFile != null && _projects.Keys.Contains(p.HelpFile))
+                {
+                    continue;
+                }
 
-            //assign a hashcode if no helpfile is present
-            if (string.IsNullOrEmpty(project.HelpFile))
-            {
-                project.HelpFile = project.GetHashCode().ToString();
+                projects.Add(p);
             }
 
-            //loop until the helpfile is unique for this host session
-            while (!IsProjectIdUnique(project.HelpFile))
+            if (projects.Count == 0)
             {
-                project.HelpFile = (project.GetHashCode() ^ project.HelpFile.GetHashCode()).ToString();
+                Logger.Debug("Project was not found and will not be added to parser state.");
+                return;
             }
 
-            var projectId = project.HelpFile;
-            if (!_projects.ContainsKey(projectId))
+            foreach (var project in projects)
             {
-                _projects.Add(projectId, project);
-            }
+                if (project.Protection == vbext_ProjectProtection.vbext_pp_locked)
+                {
+                    // adding protected project to parser state is asking for COMExceptions..
+                    Logger.Debug("Project is protected and will not be added to parser state.");
+                    return;
+                }
 
-            foreach (VBComponent component in project.VBComponents)
-            {
-                _moduleStates.TryAdd(new QualifiedModuleName(component), new ModuleState(ParserState.Pending));
-            }
-        }
+                if (string.IsNullOrEmpty(project.HelpFile))
+                {
+                    // assigns the help file and returns the value to reduce COM calls
+                    projectId = project.AssignProjectId();
+                }
 
-        private bool IsProjectIdUnique(string id)
-        {
-            foreach (var project in _projects)
-            {
-                if (project.Key == id)
+                if (!_projects.ContainsKey(projectId))
                 {
-                    return false;
+                    _projects.Add(projectId, project);
                 }
-            }
 
-            return true;
+                foreach (VBComponent component in project.VBComponents)
+                {
+                    _moduleStates.TryAdd(new QualifiedModuleName(component), new ModuleState(ParserState.Pending));
+                }
+            }
         }
 
-        public void RemoveProject(string projectId)
+        private void RemoveProject(string projectId)
         {
             VBProject project = null;
             foreach (var p in Projects)
@@ -257,12 +278,6 @@ public void RemoveProject(string projectId)
             }
         }
 
-        public void RemoveProject(VBProject project)
-        {
-            RemoveProject(project.HelpFile);
-            ClearStateCache(project);
-        }
-
         public List<VBProject> Projects
         {
             get
@@ -666,7 +681,7 @@ public void AddDeclaration(Declaration declaration)
             }
         }
 
-        public void ClearStateCache(VBProject project, bool notifyStateChanged = false)
+        private void ClearStateCache(VBProject project, bool notifyStateChanged = false)
         {
             try
             {
@@ -817,13 +832,12 @@ public bool ClearStateCache(QualifiedModuleName component, bool notifyStateChang
             return success;
         }
 
-        public bool RemoveRenamedComponent(VBComponent component, string oldComponentName)
+        private bool RemoveRenamedComponent(string projectId, string oldComponentName)
         {
-            var match = new QualifiedModuleName(component, oldComponentName);
             var keys = new List<QualifiedModuleName>();
             foreach (var key in _moduleStates.Keys)
             {
-                if (key.ComponentName == oldComponentName && key.ProjectId == match.ProjectId)
+                if (key.ComponentName == oldComponentName && key.ProjectId == projectId)
                 {
                     keys.Add(key);
                 }
@@ -837,9 +851,6 @@ public bool RemoveRenamedComponent(VBComponent component, string oldComponentNam
                 OnStateChanged(ParserState.Ready);   // trigger find all references &c. updates
             }
 
-            _projects.Remove(match.ProjectId);
-            _projects.Add(match.ProjectId, component.Collection.Parent);
-
             return success;
         }
 
diff --git a/Rubberduck.VBEEditor/Extensions/VbProjectExtensions.cs b/Rubberduck.VBEEditor/Extensions/VbProjectExtensions.cs
index 29ecec15dc..8ac4e716cf 100644
--- a/Rubberduck.VBEEditor/Extensions/VbProjectExtensions.cs
+++ b/Rubberduck.VBEEditor/Extensions/VbProjectExtensions.cs
@@ -7,6 +7,38 @@ namespace Rubberduck.VBEditor.Extensions
 {
     public static class ProjectExtensions
     {
+        public static string AssignProjectId(this VBProject project)
+        {
+            //assign a hashcode if no helpfile is present
+            if (string.IsNullOrEmpty(project.HelpFile))
+            {
+                project.HelpFile = project.GetHashCode().ToString();
+            }
+
+            //loop until the helpfile is unique for this host session
+            while (!IsProjectIdUnique(project.HelpFile, project.VBE))
+            {
+                project.HelpFile = (project.GetHashCode() ^ project.HelpFile.GetHashCode()).ToString();
+            }
+
+            return project.HelpFile;
+        }
+
+        private static bool IsProjectIdUnique(string id, VBE vbe)
+        {
+            var projectsWithId = 0;
+
+            foreach (VBProject project in vbe.VBProjects)
+            {
+                if (project.HelpFile == id)
+                {
+                    projectsWithId++;
+                }
+            }
+
+            return projectsWithId == 1;
+        }
+
         public static IEnumerable<VBProject> UnprotectedProjects(this VBProjects projects)
         {
             return projects.Cast<VBProject>().Where(project => project.Protection == vbext_ProjectProtection.vbext_pp_none);
diff --git a/Rubberduck.VBEEditor/QualifiedModuleName.cs b/Rubberduck.VBEEditor/QualifiedModuleName.cs
index 14247ba752..004e63bf16 100644
--- a/Rubberduck.VBEEditor/QualifiedModuleName.cs
+++ b/Rubberduck.VBEEditor/QualifiedModuleName.cs
@@ -181,16 +181,6 @@ public QualifiedModuleName(VBComponent component, string oldComponentName)
             _projectId = GetProjectId(_project);
 
             _contentHashCode = 0;
-            if (component == null)
-            {
-                return;
-            }
-
-            var module = component.CodeModule;
-            _contentHashCode = module.CountOfLines > 0
-                // ReSharper disable once UseIndexedProperty
-                ? module.get_Lines(1, module.CountOfLines).GetHashCode()
-                : 0;
         }
 
         /// <summary>